diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml
new file mode 100644
index 00000000000..861f6ccd4b0
--- /dev/null
+++ b/.github/workflows/exakat.yml
@@ -0,0 +1,17 @@
+# See syntax file on https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions
+name: "Exakat analysis"
+
+on:
+  schedule:
+  - cron: "0 20 * * *"
+
+jobs:
+  exakat:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Exakat
+      uses: docker://exakat/exakat-ga
+      with:
+        ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/WrongNumberOfArguments,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Structures/MergeIfThen,Structures/ElseIfElseif,Structures/RepeatedPrint,Structures/UselessParenthesis,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UseConstant' 
+        ignore_dirs: '/htdocs/includes,/htdocs/build,/htdocs/dev,/htdocs/doc,/htdocs/scripts,/htdocs/test'        
\ No newline at end of file
diff --git a/.github/workflows/stale-issues-safe.yml b/.github/workflows/stale-issues-safe.yml
index ed37c9aadc2..844b19c7a3f 100644
--- a/.github/workflows/stale-issues-safe.yml
+++ b/.github/workflows/stale-issues-safe.yml
@@ -14,11 +14,11 @@ jobs:
     - uses: Dolibarr/stale@staleunstale
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 15 days (you should still be able to re-open it if required).'
+        stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 10 days (you should still be able to re-open it if required).'
         stale-label: 'Issue Stale (automatic label)'
         exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,Hacktoberfest,good first issue,Bug Security (CVE),Analysis of PR in progres'
         days-before-stale: 365
-        days-before-close: 15
+        days-before-close: 10
         operations-per-run: 100
         dry-run: false
         
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 30151359365..b49fdf8dc86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,21 @@ htdocs/includes/jakub-onderka/
 htdocs/includes/phpdocumentor/
 htdocs/includes/phpspec/
 htdocs/includes/phpunit/
+htdocs/includes/php-parallel-lint/
 htdocs/includes/sebastian/
 htdocs/includes/squizlabs/
-htdocs/includes/symfony/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
+
+# Node Modules
+build/yarn-error.log
+build/node_modules/
+node_modules/
+
+#yarn
+yarn.lock
+
+#package-lock
+package-lock.json
+
+doc/install.lock
diff --git a/.travis.yml b/.travis.yml
index 688d706331d..16d3403f554 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,9 @@
 # We use dist: xenial to have php 5.6+ available
 os: linux
 dist: xenial
-sudo: required
+#dist: bionic
+# Deprecated: The key sudo has no effect anymore.
+#sudo: required
 
 language: php
 
@@ -118,24 +120,18 @@ install:
   echo
 
 - |
-  echo "Installing Composer dependencies (PHP Unit, Parallel Lint & PHP CodeSniffer"
-  if [ "$TRAVIS_PHP_VERSION" = '5.4' ] || [ "$TRAVIS_PHP_VERSION" = '5.5' ]; then
-    composer -n require phpunit/phpunit ^4 \
-                        jakub-onderka/php-parallel-lint ^0 \
-                        jakub-onderka/php-console-highlighter ^0 \
-                        squizlabs/php_codesniffer ^3
-  fi
+  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
     composer -n require phpunit/phpunit ^5 \
-                        jakub-onderka/php-parallel-lint ^0 \
-                        jakub-onderka/php-console-highlighter ^0 \
+                        php-parallel-lint/php-parallel-lint ^0 \
+                        php-parallel-lint/php-console-highlighter ^0 \
                         squizlabs/php_codesniffer ^3
   fi
   if [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
       composer -n require --ignore-platform-reqs phpunit/phpunit ^5 \
-                                                 jakub-onderka/php-parallel-lint ^0 \
-                                                 jakub-onderka/php-console-highlighter ^0 \
+                                                 php-parallel-lint/php-parallel-lint ^1 \
+                                                 php-parallel-lint/php-console-highlighter ^0 \
                                                  squizlabs/php_codesniffer ^3
     fi
   echo
@@ -282,7 +278,11 @@ script:
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame .
+  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
+  	--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
+  	--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
+  	--exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
+  	--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
   set +e
   echo
 
@@ -291,7 +291,7 @@ script:
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  #phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
+  #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
   set +e
   echo
@@ -404,6 +404,10 @@ script:
   php upgrade.php 11.0.0 12.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade11001200.log
   php upgrade2.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-2.log
   php step5.php 11.0.0 12.0.0 > $TRAVIS_BUILD_DIR/upgrade11001200-3.log
+  php upgrade.php 12.0.0 13.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade12001300.log
+  php upgrade2.php 12.0.0 13.0.0 > $TRAVIS_BUILD_DIR/upgrade12001300-2.log
+  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
   echo $?
diff --git a/.tx/config b/.tx/config
index 5c52849c29c..696ff858394 100644
--- a/.tx/config
+++ b/.tx/config
@@ -326,6 +326,12 @@ source_file = htdocs/langs/en_US/receptions.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.recruitment]
+file_filter = htdocs/langs/<lang>/recruitment.lang
+source_file = htdocs/langs/en_US/recruitment.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.resource]
 file_filter = htdocs/langs/<lang>/resource.lang
 source_file = htdocs/langs/en_US/resource.lang
diff --git a/COPYRIGHT b/COPYRIGHT
index 2964c915ec1..d8cefedcd65 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -21,7 +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
-PHPDebugBar            1.15.0        MIT License	             Yes             Used only by the module "debugbar" for developers
+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
 php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
@@ -39,7 +39,7 @@ TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes
 JS libraries:
 Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
 ChartJS				   2.9.3         MIT License                 Yes             JS library for graph
-jQuery                 3.4.1         MIT License                 Yes             JS library
+jQuery                 3.5.1         MIT License                 Yes             JS library
 jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
 jQuery select2         4.0.13         GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
 jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
diff --git a/ChangeLog b/ChangeLog
index e7abb3f7cd6..60aa376f96d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,31 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+
+***** ChangeLog for 13.0.0 compared to 12.0.0 *****
+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.
+
+
+WARNING:
+
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* Properties ->contactid have been renamed into ->contact_id
+* Properties ->titre have been renamed into ->title 
+* Property $paiementid in API 'api_supplier_invoices.php' has been renamed into into $payment_mode_id (english)
+* The deprecated subsitution key __SIGNATURE__ has been removed. Replace with __USER_SIGNATURE__ if you used the old syntax in
+  your email templates. 
+* The hidden option HOLIDAY_MORE_PUBLIC_HOLIDAYS has been removed. Use instead the dictionary table if you need to define custom
+  days of holiday.
+* Property 'num_paiement' has been renamed 'num_payment' everywhere for better code consistency.
+* If you build a class that implement CommonObject to use the incoterm properties or methods (->fk_incoterm, ->label_incoterm, ->location_incoterm),
+  you must now also include declaration of the Trait 'CommonIncoterm' in your class. All incoterm functions were moved into this Trait. 
+* The GETPOST(..., 'alpha') has now the same behaviour than GETPOST(..., 'alphanohtml') so no html will be allowed. Use GETPOST(..., 'restricthtml') to accept HTML.
+* If you have links in your code with '&action=delete' as a parameter, you must also add '&token='.newToken() as another parameter to avoid CSRF protection errors.
+* The API addPayment for api_invoice has evolved to accept amount into a foreign currency. You must provide array(amount=>X,mutlicurrency_ammount=>Y) instead of amount.
+* The method select_thirdparty(), deprecated since 3.8, into html.form.class.php has been removed.
+
 ***** ChangeLog for 12.0.3 compared to 12.0.2 *****
 FIX: 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename
 FIX: 11.0 - expenses lines overlapping the total amounts frame
@@ -373,14 +398,14 @@ Following changes may create regressions for some external modules, but were nec
 
 WARNING FOR DOLIWAMP USERS ONLY:
 
-Only people that installed Dolibarr using the all-in-one autoinstaller for Windows called "DoliWAMP" are concerned by the following warnings:
+Only people that installed Dolibarr using the all-in-one auto-installer for Windows called "DoliWAMP" are concerned by the following warnings:
  
-* DoliWAMP autoinstaller for Windows is not more available on 32bits systems. Use standard package if you need to use such architecture.
-* It is not possible to migrate from an installation done with the old DoliWAMP autoinstaller for Windows by using this new one. You must make a backup 
-  of your database, make a fresh installation using the new installer and reload.
-* Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but was never recommanded as a production
-  solution on a local desktop since a desktop computer has not a backup and security policy as good as on a server (when there is one). 
-  DoliWAMP remains a solution for fast test or demo purposes.
+* DoliWAMP auto-installer for Windows is no more available on 32 bits systems. Use standard package if you need to use such architecture.
+* It is not possible to migrate from an installation done with the old DoliWAMP auto-installer for Windows by using this new one. 
+  You must make a backup of your database, make a fresh installation using the new installer and reload your backup. 
+  Don't forget that DoliWAMP is a good solution to make a quick test of Dolibarr on your local computer but is not recommended as a production 
+  solution on a local desktop since a local desktop computer has often no backup and security policy, or not as good as on a server (when there is one). 
+  DoliWAMP remains a solution for fast test or demo purposes. Prefer using standard packages for production.
 
 
 ***** ChangeLog for 11.0.5 compared to 11.0.4 *****
diff --git a/README.md b/README.md
index fa5326079ec..648d5ef003d 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,15 @@
 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
 ![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
 
-Dolibarr ERP & CRM is a modern software package to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
+Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
-It's an Open Source Software (written in PHP language) designed for small, medium or large companies, foundations and freelancers.
+It's an Open Source Software suite (written in PHP with optional JavaScript enhancements) designed for small, medium or large companies, foundations and freelancers.
 
-You can freely use, study, modify or distribute it according to its Free Software licence.
+You can freely use, study, modify or distribute it according to its licence.
 
-You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN.
+You can use it as a standalone application or as a web application to access it from the Internet or a LAN.
+
+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)
 
@@ -27,19 +29,23 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
 
-- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp)
-- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian
+- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_DoliWamp)
+- [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
 - DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
 Releases can be downloaded from [official website](https://www.dolibarr.org/).
 
 ### Advanced setup
 
-You can use a Web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
+You can use a web server and a supported database (MariaDB, MySQL or PostgreSQL) to install the standard version.
+
+On GNU/Linux, first check if your distribution has already packaged Dolibarr.
+
+#### Generic install steps:
 
 - Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Versions).
 
-- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you known git):
+- Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you know git as it makes it easier if you want to upgrade later):
 
   `git clone https://github.com/dolibarr/dolibarr -b x.y`     (where x.y is main version like 3.6, 9.0, ...)
 
@@ -70,13 +76,13 @@ If you don't have time to install it yourself, you can try some commercial 'read
 
 ## UPGRADING
 
-- At first make a backup of your Dolibarr files & than see https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr
+Dolibarr supports upgrading usually wihtout the need for any (commercial) support (depending on if you use any commercial extensions) and supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
+ 
+- At first make a backup of your Dolibarr files & than [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
 - Check that your installed PHP version is supported by the new version [see PHP support](./doc/phpmatrix.md).
 - Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
-- At first next access, Dolibarr will redirect your to the "install/" page to follow the upgrade process.
-  If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file into the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
-
-*Note: migration process can be safely done multiple times by calling the `/install/index.php` page*
+- At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
+  If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
 
 ## WHAT'S NEW
 
@@ -139,7 +145,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
 
 - APIs
-- An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
+- Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
 - Support a lot of country specific features:
   - Spanish Tax RE and ISPF
   - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
@@ -149,7 +155,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
   - Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
   - Compatible with European GDPR rules
   - ...
-- PDF or ODT generation for invoice, proposals, orders...
+- Flexible PDF & ODT generation for invoices, proposals, orders...
 - …
 
 ### System Environment / Requirements
@@ -167,12 +173,12 @@ These are features that Dolibarr does **not** yet fully support:
 
 - Tasks dependencies in projects
 - Payroll module
-- No native embedded Webmail
+- No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
 - Dolibarr can't do coffee (yet)
 
 ## DOCUMENTATION
 
-Administrator, user, developer and translator's documentations are available along with other community resources on the [Wiki](https://wiki.dolibarr.org).
+Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
 
 ## CONTRIBUTING
 
@@ -182,7 +188,7 @@ This project exists thanks to all the people who contribute. [[Contribute](https
 
 ## CREDITS
 
-Dolibarr is the work of many contributors over the years and uses some fine libraries.
+Dolibarr is the work of many contributors over the years and uses some fine PHP libraries.
 
 See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
 
diff --git a/SECURITY.md b/SECURITY.md
index e5493805733..56e1da679ed 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,13 +1,115 @@
 # Security Policy
 
-## Supported Versions
+This file contains some policies about the security reports on Dolibarr ERP CRM project, one of the most popular Open Source ERP and CRM in the world.
+
+## Supported Versions for security reports
+
+| Version   | Supported          |
+| --------- | ------------------ |
+| <= 9.0.*  | :x:                |
+| >= 10.0.* | :white_check_mark: |
 
-| Version  | Supported          |
-| -------- | ------------------ |
-| <= 8.0.* | :x: |
-| >= 9.0.* | :white_check_mark: |
 
 ## Reporting a Vulnerability
 
 To report a vulnerability, please send an email to security@dolibarr.org
 In most cases, after fixing the security, we make an answer by email to say the issue has been fixed.
+
+
+## Hunting vulnerabilities on Dolibarr
+
+We believe that future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
+
+If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly and ensure you are fairly rewarded for your discovery.
+
+Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
+
+We recommand to install Dolibarr ERP CRM on you own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.
+
+### User Agent
+
+If you try to find bug on Dolibarr, we recommend to append to your user-agent header the following value: '-BugHunting-dolibarr'.
+
+### Account access
+
+You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from https://www.dolibarr.org/download
+
+
+## Eligibility and Responsible Disclosure
+
+We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr however, only those that meet the following eligibility requirements may receive a monetary reward:
+
+You must be the first reporter of a vulnerability.
+
+The vulnerability must be a qualifying vulnerability (see below)
+
+Any vulnerability found must be reported no later than 24 hours after discovery
+
+You must send a clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
+
+You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install softwate on your own platform.
+
+You must not leak, manipulate, or destroy any user data.
+
+You must not be a former or current employee of Dolibarr or one of its contractor.
+
+Reports about vulnerabilities are examined by our security analysts.
+
+Our analysis is always based on worst case exploitation of the vulnerability, as is the reward we pay.
+
+No vulnerability disclosure, including partial is allowed for the moment.
+
+
+## Scope for qualified vulnerabilities
+
+ONLY vulnerabilities discovered, when the following setup on test platform is used, are accepted:
+
+* $dolibarr_main_prod must be set to 1 into conf.php
+* $dolibarr_nocsrfcheck must be kept to the value 0 into conf.php (this is the default value)
+* $dolibarr_main_force_https must be set to something else than 0.
+* The constant MAIN_SECURITY_CSRF_WITH_TOKEN must be set to 1 into backoffice menu Home - Setup - Other (this protection should be enabled soon by default)
+* The module DebugBar must NOT be enabled (by default, this module is not enabled. This is a developer tool)
+* The module ModuleBuilder must NOT be enabled (by default, this module is not enabled. This is a developer tool)
+* ONLY security reports on modules provided by default and with the "stable" status are allowed (troubles into "experimental", "developement" or external modules are not accepted).
+* The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
+* The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.
+* CSRF attacks are accepted for all when using a POST URL, but are accepted only for creating or updating data resctricted to the admin user when using GET URL.
+* Ability for a high level user to edit web site pages in the CMS by including javascript is an expected feature.
+
+Scope is the web application (back office) and the APIs.
+
+
+## Qualifying vulnerabilities for Bug bounty programs
+* Remote code execution (RCE)
+* Local files access and manipulation (LFI, RFI, XXE, SSRF, XSPA)
+* Code injections (HTML, JS, SQL, PHP, ...)
+* Cross-Site Scripting (XSS)
+* Cross-Site Requests Forgery (CSRF) with real security impact
+* Open redirect
+* Broken authentication & session management
+* Insecure direct object references
+* CORS with real security impact
+* Horizontal and vertical privilege escalation
+* "HTTP Host Header" XSS
+* Software version disclosure (for non admin users only)
+* Stack traces or path disclosure (for non admin users only)
+
+
+## Non-qualifying vulnerabilities for Bug bounty programs, but qualified for reporting
+* "Self" XSS
+* SSL/TLS best practices
+* Denial of Service attacks
+* Clickjacking/UI redressing
+* Physical or social engineering attempts or issues that require physical access to a victim’s computer/device
+* Presence of autocomplete attribute on web forms
+* Vulnerabilities affecting outdated browsers or platforms
+* Logout and other instances of low-severity Cross-Site Request Forgery
+* Missing cookie flags
+* Missing security-related HTTP headers which do not lead directly to a vulnerability
+* Reports from automated web vulnerability scanners (Acunetix, Vega, etc.) that have not been validated
+* Invalid or missing SPF (Sender Policy Framework) records (Incomplete or missing SPF/DKIM/DMARC)
+* Reports on features flagged as "experimental" or "development"
+* Software version or private IP disclosure when logged user is admin
+* Stack traces or path disclosure when logged user is admin
+* Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".
+
diff --git a/build/README b/build/README
index 67ceb05c8d2..f7e8ebfe60b 100644
--- a/build/README
+++ b/build/README
@@ -19,30 +19,34 @@ Note: Prerequisites to build autoexe DoliWamp package:
 > Launch "wine cmd" to check a drive Z: pointing to / exists.
 > Install InnoSetup
    For example by running isetup-5.3.9.exe (http://www.jrsoftware.org)
-> Install WampServer into "C:\Program Files\Wamp"
-   For example by running wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe (http://www.wampserver.com)
-> Install WampServer addon to have versions: Mysql5.0.45
-   For example by running WampServer2-MYSQL5045.exe (http://www.wampserver.com)
-> To build from Windows (running from makepack-dolibarr.pl script is however
-  recommanded), open file build/exe/doliwamp.iss and click on button "Compile".
-  The .exe file will be build into directory build.
+> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
+   For example by running wampserver3.2.0_x64.exe (http://www.wampserver.com). See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
 > Add path to ISCC into PATH windows var:
   Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
+> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), 
+  open file build/exe/doliwamp.iss and click on button "Compile".
+  The .exe file will be build into directory build.
+
+
   
 - To build a theme package, launch the script
 > perl makepack-dolibarrtheme.pl
 
+
+
 - To build a package for a module, launch the script
 > perl makepack-dolibarrmodule.pl
 
+
+
 - To build developper documentation, launch the script
 > perl dolibarr-doxygen-build.pl
 
 
+
 Note: 
-The build directory and all its contents is absolutely not required to make
-Dolibarr working. It is here only to build Dolibarr packages, and those
-generated packages will not contains this "build" directory.
+The build directory and all its contents is absolutely not required to make Dolibarr working. 
+It is here only to build Dolibarr packages, and those generated packages will not contains this "build" directory.
 
 
 You can find in "build", following sub-directories:
@@ -59,6 +63,9 @@ To build Mac OS package (not ready yet).
 * doap:
 To build Doap descriptor to promote/describe Dolibarr releases.
 
+* docker:
+To deploy Dolibarr with docker.
+
 * doxygen:
 Dir with config file to build doxygen documentation.
 
@@ -66,12 +73,12 @@ Dir with config file to build doxygen documentation.
 To build exe package for Windows that distribute Dolibarr sources or
 to build the complete DoliWamp package.
 
+* gource:
+To build the video of history of git changes.
+
 * launchpad:
 Doc file to explain how to use launchpad.
 
-* live:
-Doc file to explain how to create a demo live CD.
-
 * obs:
 Doc file to explain how to push release onto OBS.
 
@@ -90,5 +97,8 @@ To build Redhat, Opensuse or Mandriva package.
 * tgz:
 To build a tgz package.
 
+* travis-ci:
+Used by travis to make CI.
+
 * zip:
 To build a zip package.
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 4b1df7e0876..2be287c2db9 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -1,38 +1,50 @@
-FROM php:7.2-apache
+FROM php:7.3-apache
 
-ENV HOST_USER_ID 33
 ENV PHP_INI_DATE_TIMEZONE 'UTC'
+ENV PHP_INI_MEMORY_LIMIT 256M
 
-RUN apt-get update && apt-get install -y libpng-dev libjpeg-dev libldap2-dev libzip-dev zlib1g-dev libicu-dev g++\
-	&& rm -rf /var/lib/apt/lists/* \
-	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-	&& docker-php-ext-install gd \
-	&& docker-php-ext-install zip \
-	&& docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
-        && docker-php-ext-install ldap \
-        && docker-php-ext-install mysqli \
-        && docker-php-ext-install calendar \
-        && docker-php-ext-configure intl \
-        && docker-php-ext-install intl \
-        && apt-get autoremove --purge -y libjpeg-dev libldap2-dev zlib1g-dev libicu-dev g++
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libjpeg62-turbo \
+        libpng-dev \
+        libpng16-16 \
+        libldap2-dev \
+        libxml2-dev \
+        libzip-dev \
+        zlib1g-dev \
+        libicu-dev \
+        g++ \
+        default-mysql-client \
+        unzip \
+        curl \
+        apt-utils \
+    && apt-get autoremove -y \
+    && rm -rf /var/lib/apt/lists/* \
+    && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+    && docker-php-ext-install -j$(nproc) calendar intl mysqli pdo_mysql gd soap zip \
+    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
+    && docker-php-ext-install -j$(nproc) ldap && \
+    mv ${PHP_INI_DIR}/php.ini-development ${PHP_INI_DIR}/php.ini
 
 RUN mkdir /var/documents
-RUN chown www-data /var/documents
+RUN chown www-data:www-data /var/documents
 
 COPY docker-run.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-run.sh
 
 RUN pecl install xdebug && docker-php-ext-enable xdebug
-RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20151012/xdebug.so"' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_autostart=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_enable=1' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.default_enable=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_host=docker.host' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_port=9000' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_connect_back=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.profiler_enable=0' >> /usr/local/etc/php/php.ini
-RUN echo 'xdebug.remote_log="/tmp/xdebug.log"' >> /usr/local/etc/php/php.ini
-RUN echo '172.17.0.1 docker.host' >> /etc/hosts
+RUN echo 'zend_extension="/usr/local/lib/php/extensions/no-debug-non-zts-20180731/xdebug.so"' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_autostart=1' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.remote_enable=1' >> ${PHP_INI_DIR}/php.ini
+RUN echo 'xdebug.default_enable=1' >> ${PHP_INI_DIR}/php.ini
+#RUN echo 'xdebug.remote_host=docker.host' >> ${PHP_INI_DIR}/php.ini
+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
 
 EXPOSE 80
 
diff --git a/build/docker/README.md b/build/docker/README.md
index 616cbd8fa78..2fd278a531f 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -1,6 +1,8 @@
 # How to use it ?
 
 The docker-compose.yml file is used to build and run Dolibarr in the current workspace.
+This docker image intended for developpement usage.
+For production usage you should consider other contributor reference like https://hub.docker.com/r/tuxgasy/dolibarr 
 
 Before build/run, define the variable HOST_USER_ID as following:
 
@@ -26,3 +28,4 @@ The URL to go to PhpMyAdmin is (login/password is root/root) :
 
 Setup the database connection during the installation process, please use mariad
 b (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 3fe6125a874..7e4ceda902e 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -1,25 +1,54 @@
-mariadb:
-    build: mariadb
-    environment:
-        MYSQL_ROOT_PASSWORD: root
-        MYSQL_DATABASE: dolibarr
+version: '3'
 
-phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    environment:
-        PMA_HOST: mariadb
-    links:
-        - mariadb
-    ports:
-        - "8080:80"
+networks:
+    internal-pod:
+        internal: true
+    external-pod:
+        internal: false
 
-web:
-    build: .
-    environment:
-        HOST_USER_ID: $HOST_USER_ID
-    volumes:
-        - ../../htdocs:/var/www/html
-    links:
-        - mariadb
-    ports:
-        - "80:80"
+services:
+    mariadb:
+        image: mariadb:latest
+        environment:
+            MYSQL_ROOT_PASSWORD: root
+            MYSQL_DATABASE: dolibarr
+        ports:
+            - "3306:3306"
+        networks:
+            - internal-pod
+            - external-pod
+
+    phpmyadmin:
+        image: phpmyadmin/phpmyadmin
+        environment:
+            PMA_HOST: mariadb
+        depends_on:
+            - mariadb
+        ports:
+            - "8080:80"
+        networks:
+            - internal-pod
+            - external-pod
+
+    web:
+        build: .
+        environment:
+            HOST_USER_ID: $HOST_USER_ID
+        volumes:
+            - ../../htdocs:/var/www/html/
+            - ../../documents:/var/documents
+        ports:
+            - "80:80"
+            - "9000:9000"
+        depends_on:
+            - mariadb
+            - mail
+        networks:
+            - internal-pod
+            - external-pod
+
+    mail:
+        image: maildev/maildev
+        ports:
+            - "8081:80"
+            - "25:25"
diff --git a/build/docker/docker-run.sh b/build/docker/docker-run.sh
index df7272c317d..e57d9adfad0 100644
--- a/build/docker/docker-run.sh
+++ b/build/docker/docker-run.sh
@@ -1,15 +1,21 @@
 #!/bin/bash
 
-usermod -u $HOST_USER_ID www-data
-groupmod -g $HOST_USER_ID www-data
+usermod -u ${HOST_USER_ID} www-data
+groupmod -g ${HOST_USER_ID} www-data
 
 chgrp -hR www-data /var/www/html
 chmod g+rwx /var/www/html/conf
 
+if [ ! -d /var/documents ]; then
+	echo "[docker-run] => create volume directory /var/documents ..."
+  	mkdir -p /var/documents
+fi
+echo "[docker-run] => Set Permission to www-data for /var/documents"
+chown -R www-data:www-data /var/documents
+
 if [ ! -f /usr/local/etc/php/php.ini ]; then
   cat <<EOF > /usr/local/etc/php/php.ini
 date.timezone = $PHP_INI_DATE_TIMEZONE
-display_errors = On
 EOF
 fi
 
diff --git a/build/exe/doliwamp/README.md b/build/exe/doliwamp/README.md
index 87d3371f9bb..be8cf1f3ac5 100644
--- a/build/exe/doliwamp/README.md
+++ b/build/exe/doliwamp/README.md
@@ -5,6 +5,7 @@ It's a dedicated Dolibarr version for Windows newbies with no technical knowledg
 
 This directory contains files used by *makepack-dolibarr.pl* script to build the all-in-on .EXE package DoliWamp, ready
 to be distributed (for Windows).
+The build of .exe files need to have some windows executable files already installed (Apache, MariaDb). The package to install to get this files are defined into the file *doliwamp.iss* (searhc line starting with "; Value OK:")
 
 If you have technical knowledge in web administration and plan to share your server instance (Apache, Mysql or PHP) with other projects than Dolibarr or want to use Dolibarr other components (PostgreSQL), you should not use this assistant and make a manual installation of Dolibarr on your existing server by downloading the standard package (.tgz or .zip file).
 
diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index 976f2cb6ba3..581353b758b 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -110,7 +110,7 @@ print "Working on files into          : ".DOL_DOCUMENT_ROOT."\n";
 print "Include custom in signature    : ".$includecustom."\n";
 print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp) {
-    foreach($tmp as $constname => $constvalue) {
+    foreach ($tmp as $constname => $constvalue) {
         print $constname.'='.$constvalue." ";
     }
 }
@@ -130,7 +130,7 @@ fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now
 
 foreach ($includeconstants as $countrycode => $tmp) {
     fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
-    foreach($tmp as $constname => $constvalue) {
+    foreach ($tmp as $constname => $constvalue) {
         $valueforchecksum=(empty($constvalue)?'0':$constvalue);
         $checksumconcat[]=$valueforchecksum;
         fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 24b32dcff91..85212d9c5ba 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -620,6 +620,9 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
+
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;
+
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
 	}
 
diff --git a/build/pdf/README.txt b/build/pdf/README.txt
index 2335ff4b7f7..7a5424ca3d5 100644
--- a/build/pdf/README.txt
+++ b/build/pdf/README.txt
@@ -1,9 +1,10 @@
-To make htmldoc working from wiki.dolibarr.org, them must be modified to have
+To make htmldoc working from wiki.dolibarr.org, the wiki must be modified to have
 
-$_SERVER["HTTP_USER_AGENT"] is "HTMLDOC/x.y.z"
-$_COOKIE["htmldoc"] may also be defined if set on command line.
-
-To disable part, add 
-class="htmldoc-ignore" with css
+To disable part of content, add: 
+class="htmldoc-ignore" 
+with css
 .htmldoc-ignore { display: none; }
 
+Note:
+$_SERVER["HTTP_USER_AGENT"] is "HTMLDOC/x.y.z"
+$_COOKIE["htmldoc"] may also be defined if set on command line.
diff --git a/build/sitemap/urllist-wiki.txt b/build/sitemap/urllist-wiki.txt
index ae13bb96d87..2a70e61f146 100644
--- a/build/sitemap/urllist-wiki.txt
+++ b/build/sitemap/urllist-wiki.txt
@@ -1 +1 @@
-http://wiki.dolibarr.org/
+https://wiki.dolibarr.org/
diff --git a/composer.json b/composer.json
index d26bbb05ad9..9fede994525 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
 		"vendor-dir" : "htdocs/includes"
 	},
 	"require" : {
-		"php" : ">=5.5.0",
+		"php" : ">=5.6.0",
 		"ext-curl" : "*",
 		"ckeditor/ckeditor" : "4.12.1",
 		"mike42/escpos-php" : "2.2",
@@ -33,11 +33,13 @@
 		"restler/framework" : "3.0.0-RC6",
 		"tecnickcom/tcpdf" : "6.3.2",
 		"nnnick/chartjs" : "^2.9",
-		"stripe/stripe-php" : "6.43.1"
+		"stripe/stripe-php" : "6.43.1",
+		"maximebf/debugbar" : "1.15.1",
+		"symfony/var-dumper": "3"
 	},
 	"require-dev" : {
-		"jakub-onderka/php-parallel-lint" : "^0",
-		"jakub-onderka/php-console-highlighter" : "^0",
+		"php-parallel-lint/php-parallel-lint" : "^0",
+		"php-parallel-lint/php-console-highlighter" : "^0",
 		"phpunit/phpunit" : "^4",
 		"squizlabs/php_codesniffer" : "^2",
 		"phpunit/phpunit-selenium" : "^2"
diff --git a/composer.lock b/composer.lock
index 09c71674512..5afe0ca34f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "17e906996157e8a94564f686a6096dc5",
+    "content-hash": "1dbd2d05cc0836acfca5988f29005cf2",
     "packages": [
         {
             "name": "ckeditor/ckeditor",
@@ -47,6 +47,67 @@
             ],
             "time": "2019-06-28T10:41:23+00:00"
         },
+        {
+            "name": "maximebf/debugbar",
+            "version": "v1.15.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maximebf/php-debugbar.git",
+                "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e",
+                "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "psr/log": "^1.0",
+                "symfony/var-dumper": "^2.6|^3|^4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5"
+            },
+            "suggest": {
+                "kriswallsmith/assetic": "The best way to manage assets",
+                "monolog/monolog": "Log using Monolog",
+                "predis/predis": "Redis storage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.15-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DebugBar\\": "src/DebugBar/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maxime Bouroumeau-Fuseau",
+                    "email": "maxime.bouroumeau@gmail.com",
+                    "homepage": "http://maximebf.com"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Debug bar in the browser for php application",
+            "homepage": "https://github.com/maximebf/php-debugbar",
+            "keywords": [
+                "debug",
+                "debugbar"
+            ],
+            "time": "2019-09-24T14:55:42+00:00"
+        },
         {
             "name": "mike42/escpos-php",
             "version": "v2.2",
@@ -253,6 +314,53 @@
             "abandoned": "phpoffice/phpspreadsheet",
             "time": "2015-05-01T07:00:55+00:00"
         },
+        {
+            "name": "psr/log",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2020-03-23T09:12:05+00:00"
+        },
         {
             "name": "restler/framework",
             "version": "3.0.0-RC6",
@@ -260,12 +368,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Luracast/Restler-Framework.git",
-                "reference": "0f6b0f26152f83e43a2a86820206c455095fb2b0"
+                "reference": "d52e61600d153bca60a287c35141c5c01863127b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/0f6b0f26152f83e43a2a86820206c455095fb2b0",
-                "reference": "0f6b0f26152f83e43a2a86820206c455095fb2b0",
+                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/d52e61600d153bca60a287c35141c5c01863127b",
+                "reference": "d52e61600d153bca60a287c35141c5c01863127b",
                 "shasum": ""
             },
             "require": {
@@ -312,7 +420,7 @@
                 "rest",
                 "server"
             ],
-            "time": "2019-05-12T15:15:11+00:00"
+            "time": "2020-02-13T16:05:12+00:00"
         },
         {
             "name": "stripe/stripe-php",
@@ -370,6 +478,146 @@
             ],
             "time": "2019-08-29T16:56:12+00:00"
         },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.18.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
+        },
+        {
+            "name": "symfony/var-dumper",
+            "version": "v3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-dumper.git",
+                "reference": "737e07704cca83f9dd0af926d45ce27eedc25657"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/737e07704cca83f9dd0af926d45ce27eedc25657",
+                "reference": "737e07704cca83f9dd0af926d45ce27eedc25657",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "twig/twig": "~1.20|~2.0"
+            },
+            "suggest": {
+                "ext-symfony_debug": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "Resources/functions/dump.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\VarDumper\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony mechanism for exploring and dumping PHP variables",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "debug",
+                "dump"
+            ],
+            "time": "2015-11-18T13:48:51+00:00"
+        },
         {
             "name": "tecnickcom/tcpdf",
             "version": "6.3.2",
@@ -489,16 +737,16 @@
             "time": "2015-06-14T21:17:01+00:00"
         },
         {
-            "name": "jakub-onderka/php-console-color",
+            "name": "php-parallel-lint/php-console-color",
             "version": "v0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/JakubOnderka/PHP-Console-Color.git",
+                "url": "https://github.com/php-parallel-lint/PHP-Console-Color.git",
                 "reference": "d5deaecff52a0d61ccb613bb3804088da0307191"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191",
                 "reference": "d5deaecff52a0d61ccb613bb3804088da0307191",
                 "shasum": ""
             },
@@ -531,28 +779,31 @@
             "time": "2018-09-29T17:23:10+00:00"
         },
         {
-            "name": "jakub-onderka/php-console-highlighter",
-            "version": "v0.4",
+            "name": "php-parallel-lint/php-console-highlighter",
+            "version": "v0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git",
-                "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547"
+                "url": "https://github.com/php-parallel-lint/PHP-Console-Highlighter.git",
+                "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547",
-                "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8",
+                "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "jakub-onderka/php-console-color": "~0.2",
-                "php": ">=5.4.0"
+                "php": ">=5.4.0",
+                "php-parallel-lint/php-console-color": "~0.2"
+            },
+            "replace": {
+                "jakub-onderka/php-console-highlighter": "*"
             },
             "require-dev": {
-                "jakub-onderka/php-code-style": "~1.0",
-                "jakub-onderka/php-parallel-lint": "~1.0",
-                "jakub-onderka/php-var-dump-check": "~0.1",
+                "php-parallel-lint/php-code-style": "~1.0",
+                "php-parallel-lint/php-parallel-lint": "~1.0",
+                "php-parallel-lint/php-var-dump-check": "~0.1",
                 "phpunit/phpunit": "~4.0",
                 "squizlabs/php_codesniffer": "~1.5"
             },
@@ -574,19 +825,19 @@
                 }
             ],
             "description": "Highlight PHP code in terminal",
-            "time": "2018-09-29T18:48:56+00:00"
+            "time": "2020-05-13T07:37:49+00:00"
         },
         {
-            "name": "jakub-onderka/php-parallel-lint",
+            "name": "php-parallel-lint/php-parallel-lint",
             "version": "v0.9.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git",
+                "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git",
                 "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa",
                 "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa",
                 "shasum": ""
             },
@@ -1082,6 +1333,7 @@
             "keywords": [
                 "tokenizer"
             ],
+            "abandoned": true,
             "time": "2017-12-04T08:55:13+00:00"
         },
         {
@@ -1785,6 +2037,159 @@
             ],
             "time": "2019-08-06T08:03:45+00:00"
         },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.18.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.18.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
+        },
         {
             "name": "symfony/yaml",
             "version": "v3.4.32",
@@ -1903,8 +2308,9 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.5.0",
+        "php": ">=5.6.0",
         "ext-curl": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index cdb0999e53f..5f09d9536be 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -28,19 +28,6 @@ With
 
 
 
-DEBUGBAR:
----------
-
-Move
-    this.options = {
-                bodyMarginBottom: true,
-                bodyMarginBottomHeight: parseInt($('body').css('margin-bottom')),
-    };
-few line lower in the  
-	initialize: function() {
-
-
-
 ESCPOS:
 -------
 Replace
@@ -181,6 +168,7 @@ In htdocs/includes/tecnickcom/tcpdf/tcpdf.php
 TCPDI:
 ------
 Add fpdf_tpl.php 1.2
+
 Add tcpdi.php
 
 Add tcpdi_parser.php and replace:
@@ -219,8 +207,6 @@ with
 
 
 
-
-
 JCROP:
 ------
 * Remove analytics tag into file index.html
diff --git a/dev/examples/code/create_invoice.php b/dev/examples/code/create_invoice.php
index 1b212e0a5d7..1acf181a4ba 100755
--- a/dev/examples/code/create_invoice.php
+++ b/dev/examples/code/create_invoice.php
@@ -87,14 +87,11 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$obj->validate($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
+	else {
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
-}
-else
-{
+} else {
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -106,9 +103,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_order.php b/dev/examples/code/create_order.php
index 703254ad5e9..7fe1a82251a 100755
--- a/dev/examples/code/create_order.php
+++ b/dev/examples/code/create_order.php
@@ -85,14 +85,11 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$com->valid($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
+	else {
 		$error++;
 		dol_print_error($db, $com->error);
 	}
-}
-else
-{
+} else {
 	$error++;
 	dol_print_error($db, $com->error);
 }
@@ -104,9 +101,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_product.php b/dev/examples/code/create_product.php
index 234658388df..20b898a92aa 100755
--- a/dev/examples/code/create_product.php
+++ b/dev/examples/code/create_product.php
@@ -82,9 +82,7 @@ $idobject = $myproduct->create($user);
 if ($idobject > 0)
 {
 	print "OK Object created with id ".$idobject."\n";
-}
-else
-{
+} else {
 	$error++;
 	dol_print_error($db, $myproduct->error);
 }
@@ -95,9 +93,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/code/create_user.php b/dev/examples/code/create_user.php
index 96d369085d2..d585b490a9c 100755
--- a/dev/examples/code/create_user.php
+++ b/dev/examples/code/create_user.php
@@ -74,18 +74,14 @@ if ($idobject > 0)
 	// Change status to validated
 	$result=$obj->setStatut(1);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
+	else {
 		$error++;
 		dol_print_error($db, $obj->error);
 	}
-}
-elseif ($obj->error == 'ErrorLoginAlreadyExists')
+} elseif ($obj->error == 'ErrorLoginAlreadyExists')
 {
      print "User with login ".$obj->login." already exists\n";
-}
-else
-{
+} else {
 	$error++;
 	dol_print_error($db, $obj->error);
 }
@@ -97,9 +93,7 @@ if (! $error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/dev/examples/mail/source_email_ticket_1_to_create.txt b/dev/examples/mail/source_email_ticket_1_to_create.txt
new file mode 100644
index 00000000000..94d4cb620b9
--- /dev/null
+++ b/dev/examples/mail/source_email_ticket_1_to_create.txt
@@ -0,0 +1,89 @@
+Delivered-To: testldrdev@gmail.com
+Received: by 2002:a2e:9b9a:0:0:0:0:0 with SMTP id z26csp1425223lji;
+        Thu, 20 Aug 2020 08:29:02 -0700 (PDT)
+X-Received: by 2002:a05:620a:1292:: with SMTP id w18mr2938234qki.158.1597937342304;
+        Thu, 20 Aug 2020 08:29:02 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1597937342; cv=none;
+        d=google.com; s=arc-20160816;
+        b=FhT/+rJ/zNYgVQ5Nt/rLZJycGd/Ntkhm6LwI16YUfmEmxeGrP/cXXQULrqQ1LhBr9B
+         oRKweltTdnpyA14gm0kzbs1vUkf5HxLUuGk8IqqJWAPMUZoN8oUPkzq2BuKNQGxPiE+y
+         Hsg/fnYp8WzcAlZOLsEP2kcFIdA95Dyy5LkM8HgphI1jSS1d6gkx6nDGIMIpDD9D+w4X
+         ISxRUXp5JlDwFCUMOPoAvHIBUdJ3jpLsjesbMEnU4ssFqhxU21pBq+Fc+csSPeY5DL0M
+         HR1o+ChEAXIdDOrDqa0ohHfqR216juGCzH8YuEQ88LT0Qbst9IkOYWiAQv4TIh7vHtvQ
+         TMvA==
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
+        h=to:subject:message-id:date:from:mime-version:dkim-signature;
+        bh=sojOjnIKAXmsZ9zvMk5MGvY3qyOaFgnpRe6YPMYutOI=;
+        b=CRlrRPfoGkfmz6iXKy4HdxKQ4SeJTiIxjC2jNkgQPSnIDFJgDkJcwASJVpcjTmlVmH
+         Z9WnHKVUPRIHGDEoMRlx6eUx9QfelWqPYu3BBQGFry9sgth0BR/1s6tmQ+P+bAj23ryo
+         aL3UkF6KCSx4GhEk3MfHA5Ex81YDFHvHL3BZ2kb3XCVSlPiBq2szw1ETmRAsDdS5Gbu+
+         ZlzBbl4pRtUWgi1fB5H4Wcv7e90F4Et1SBP8IKSCa23qu2nV9xefgjfMw2ndxCj1zgCL
+         c3l7Ul6pw32nqf6+vxfZTstwIwgu6dXZXCHDqJqesI2g8RGxeba+LfKZEDpBuSeINS9r
+         GMvw==
+ARC-Authentication-Results: i=1; mx.google.com;
+       dkim=pass header.i=@destailleur.fr header.s=google header.b=IPMz90Yj;
+       spf=pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) smtp.mailfrom=contact@destailleur.fr;
+       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=destailleur.fr
+Return-Path: <contact@destailleur.fr>
+Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
+        by mx.google.com with SMTPS id w14sor2138230qtb.9.2020.08.20.08.29.00
+        for <testldrdev@gmail.com>
+        (Google Transport Security);
+        Thu, 20 Aug 2020 08:29:01 -0700 (PDT)
+Received-SPF: pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
+Authentication-Results: mx.google.com;
+       dkim=pass header.i=@destailleur.fr header.s=google header.b=IPMz90Yj;
+       spf=pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) smtp.mailfrom=contact@destailleur.fr;
+       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=destailleur.fr
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=destailleur.fr; s=google;
+        h=mime-version:from:date:message-id:subject:to;
+        bh=sojOjnIKAXmsZ9zvMk5MGvY3qyOaFgnpRe6YPMYutOI=;
+        b=IPMz90Yjw1Mf57/rYWUYGtpc+IazEWcy6/bqxf1j0h6rxDH/wjhxsCWzfARgqqlfVj
+         ACg4IbPpZZlKFIYDSCbfMlWF65rbKfNre56HldfQgy0Tq3LC434zHz2ZZMOVCM52w3J9
+         VGBpASUlSL1o+YRmzOpRtHVu7I9aNwGxHuA070Yka8XLV76vV3P0vdL8PcoHq0jUUEoi
+         +dCZ9NCPuAFtGK2IavNoM2qQrLdfYIi+RwgWBtqjTwzyvDEJR+p5fIPK142ynMbHgWYO
+         RVtMqAgxjvL4sfyKZ5KuzKXkQNM3zyzMinWK89scBl+QLFCcWA4Qqc0dJjqLCBhh8lmq
+         n67g==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=1e100.net; s=20161025;
+        h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
+        bh=sojOjnIKAXmsZ9zvMk5MGvY3qyOaFgnpRe6YPMYutOI=;
+        b=H0GsrFAi9JmRTKQ2budtDeLBqCaTisHKYCVVziyxmv+/tIcrSZBA4tdKwm+wR80r50
+         zMJXmyVS2DMDWfnIlOv39wcwQjYN3WK1aRJfV0bVuEWrQuzt5MMWbskf6xbzo201nhr9
+         ZlqATsEV7v1u5EHmfYwRhR8+AOmENdnm0g9RXPJVrFS58WNEJUSotS5Y5rZPjnT943y0
+         62Kf4Bd6uWvXhPFXWQoZLtWrPpkbcYPWIBmpftKhD0PD9c6rKaVduV0WhbigYsDoxb3F
+         iIafGPOyq91hiHR2gTLHiMmTDm+IDQ4n6gSkS7HKpZlLQhHoBMnpqJZYoxMJTxdpAbSy
+         mY+A==
+X-Gm-Message-State: AOAM5325RcN4/ThWbYCO3vWRMFFBrfzJUHC1bd1Z9VB3/2Q3RuF9lmIJ +SjshEErhK68Of2pHDZQ3aPU4rzDfV8ozbvRsgChdfZg8aA=
+X-Google-Smtp-Source: ABdhPJxUOUdurKEQfLldtiQGRkgC/h8gKQG1zhS+8k93p6N1SsOn517+GeRyT3E+/Uw536pmReO29la3EIAS6VT33SE=
+X-Received: by 2002:aed:3e8e:: with SMTP id n14mr3191190qtf.67.1597937340509; Thu, 20 Aug 2020 08:29:00 -0700 (PDT)
+MIME-Version: 1.0
+From: John Tester <customer@customercompany.fr>
+Date: Thu, 20 Aug 2020 17:28:34 +0200
+Message-ID: <CALeEO_kij-ogXKzrjV_pTgqVbUB9j=287VkX34iVSWgDHFA8eg@mail.gmail.com>
+Subject: Support besoin
+To: testldrdev@gmail.com
+Content-Type: multipart/alternative; boundary="0000000000008e099705ad50c772"
+
+--0000000000008e099705ad50c772
+Content-Type: text/plain; charset="UTF-8"
+
+adfsdfsdfds
+
+-- 
+Laurent.
+------------------------------------------------------------------------------------
+Twitter: https://www.twitter.com/eldy10
+
+--0000000000008e099705ad50c772
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">adfsdfsdfds<br clear=3D"all"><div><br></div>-- <br><div di=
+r=3D"ltr" class=3D"gmail_signature" data-smartmail=3D"gmail_signature">Laur=
+ent.<br>-------------------------------------------------------------------=
+-----------------<br>Twitter: <a href=3D"https://www.twitter.com/eldy10" ta=
+rget=3D"_blank">https://www.twitter.com/eldy10</a></div></div>
+
+--0000000000008e099705ad50c772--
diff --git a/dev/examples/mail/source_email_ticket_2_answer_from_ticket.txt b/dev/examples/mail/source_email_ticket_2_answer_from_ticket.txt
new file mode 100644
index 00000000000..350b9a93cad
--- /dev/null
+++ b/dev/examples/mail/source_email_ticket_2_answer_from_ticket.txt
@@ -0,0 +1,57 @@
+Return-Path: <testldrdev@gmail.com>
+Received: from smtp.gmail.com ([2a01:e0a:7e:4ae0:329c:23ff:feb8:dc8d])
+        by smtp.gmail.com with ESMTPSA id 32sm5811196wrh.18.2020.08.20.09.31.37
+        for <customer@customercompany.fr>
+        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
+        Thu, 20 Aug 2020 09:31:37 -0700 (PDT)
+From: testldrdev@gmail.com
+X-Google-Original-From: <aa@aa.comg>
+To: customer@customercompany.fr
+Subject: [MyBigCompany - Ticket #TS2008-0040] Nouveau message
+Date: Thu, 20 Aug 2020 18:31:37 +0200
+Message-ID: <1597941097.SMTPs-dolibarr-tic58@83b5bc91f83a56e458db71e0adac2b62>
+References: <1597941097.SMTPs-dolibarr-tic58@83b5bc91f83a56e458db71e0adac2b62>
+X-Dolibarr-TRACKID: tic58@83b5bc91f83a56e458db71e0adac2b62
+X-RemoteAddr: 127.0.0.1
+X-Mailer: Dolibarr version 13.0.0-alpha (using SMTPs Mailer)
+X-Dolibarr-Option: MAIN_MAIL_USE_MULTI_PART
+Mime-Version: 1.0
+Content-Type: multipart/mixed; boundary="multipart_x.1597941097.x_boundary"
+Content-Transfer-Encoding: 8bit
+
+--multipart_x.1597941097.x_boundary
+Content-Type: multipart/alternative; boundary="mul_872cdd6a64216735955664484832b075"
+
+--mul_872cdd6a64216735955664484832b075
+Content-Type: text/plain; charset=UTF-8
+
+Bonjour 
+
+ 
+Une nouvelle réponse a été ajoutée à un ticket que vous suivez. Voici
+le message :PredefinedMailContentTicket_send 
+ 
+ 
+Vous pouvez voir la progression du ticket en cliquant sur le lien
+ci-dessus. : fr5uw2yospypn2rz 
+ Cordialement, 
+ 
+--
+--mul_872cdd6a64216735955664484832b075
+Content-Type: text/html; charset=UTF-8
+
+<html><head><title></title></head><body>Bonjour<br>
+
+<br>
+Une nouvelle réponse a été ajoutée à un ticket que vous suivez. Voici
+le message :PredefinedMailContentTicket_send<br>
+<br>
+<br>
+Vous pouvez voir la progression du ticket en cliquant sur le lien
+ci-dessus. : <a
+href="http://localhostgit/dolibarr_dev/htdocs/public/ticket/view.php?track_id=fr5uw2yospypn2rz">fr5uw2yospypn2rz</a><br>
+<br>Cordialement,<br>
+<br>
+--</body></html>
+--mul_872cdd6a64216735955664484832b075--
+--multipart_x.1597941097.x_boundary--
diff --git a/dev/examples/mail/source_email_ticket_3_answer_from_mailer.txt b/dev/examples/mail/source_email_ticket_3_answer_from_mailer.txt
new file mode 100644
index 00000000000..6c2ac1bb2af
--- /dev/null
+++ b/dev/examples/mail/source_email_ticket_3_answer_from_mailer.txt
@@ -0,0 +1,48 @@
+MIME-Version: 1.0
+Date: Thu, 20 Aug 2020 18:34:01 +0200
+References: <CALeEO_kij-ogXKzrjV_pTgqVbUB9j=287VkX34iVSWgDHFA8eg@mail.gmail.com>
+In-Reply-To: <CALeEO_kij-ogXKzrjV_pTgqVbUB9j=287VkX34iVSWgDHFA8eg@mail.gmail.com>
+Message-ID: <CAC8+=32ccpEo12RR-juT=FW6+gNV-DcvNjxs_0s6Wn40xmfhug@mail.gmail.com>
+Subject: Re: Support besoin
+From: John Tester <testldrdev@gmail.com>
+To: John Tester <customer@customercompany.fr>
+Content-Type: multipart/alternative; boundary="0000000000001620dd05ad51b075"
+
+--0000000000001620dd05ad51b075
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+Merci pour votre question.
+Voici la rep.
+
+Le jeu. 20 ao=C3=BBt 2020 =C3=A0 17:29, John Tester <laurent@destai=
+lleur.fr>
+a =C3=A9crit :
+
+> adfsdfsdfds
+>
+> --
+> Laurent.
+>
+> -------------------------------------------------------------------------=
+-----------
+> Twitter: https://www.twitter.com/eldy10
+>
+
+--0000000000001620dd05ad51b075
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Merci pour votre question.<div>Voici la rep.</div></div><b=
+r><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">Le=C2=A0=
+jeu. 20 ao=C3=BBt 2020 =C3=A0=C2=A017:29, John Tester &lt;<a href=
+=3D"mailto:customer@customercompany.fr">customer@customercompany.fr</a>&gt; a =C3=A9c=
+rit=C2=A0:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0=
+px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div =
+dir=3D"ltr">adfsdfsdfds<br clear=3D"all"><div><br></div>-- <br><div dir=3D"=
+ltr">Laurent.<br>----------------------------------------------------------=
+--------------------------<br>Twitter: <a href=3D"https://www.twitter.com/e=
+ldy10" target=3D"_blank">https://www.twitter.com/eldy10</a></div></div>
+</blockquote></div>
+
+--0000000000001620dd05ad51b075--
diff --git a/dev/examples/mail/source_email_ticket_4_answer_of_answer_from_mailer.txt b/dev/examples/mail/source_email_ticket_4_answer_of_answer_from_mailer.txt
new file mode 100644
index 00000000000..314e9cda20f
--- /dev/null
+++ b/dev/examples/mail/source_email_ticket_4_answer_of_answer_from_mailer.txt
@@ -0,0 +1,134 @@
+Delivered-To: testldrdev@gmail.com
+Received: by 2002:a2e:9b9a:0:0:0:0:0 with SMTP id z26csp1483607lji;
+        Thu, 20 Aug 2020 09:56:03 -0700 (PDT)
+X-Received: by 2002:ac8:3868:: with SMTP id r37mr3301993qtb.95.1597942563252;
+        Thu, 20 Aug 2020 09:56:03 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1597942563; cv=none;
+        d=google.com; s=arc-20160816;
+        b=skUGL+keim3FdNXfKGgQokCfj85gnhYhuLbMM61qY5W6ixSH9s8I6uoNh3gzVy89XM
+         NGbZiajjDiPMBryl87PhD+ACBjv8WoZAQiojAga0ELPPmVDnhrtWKANLbRrkUI3Xtfoj
+         b1o2iHP2Q12Vqs6xiAy86yxURlIKGM3tw91WryWiIPiAL7bRZPn49N3XbO2ULE0QKTBq
+         BI5YnOxt9NfTj0xhKaLLIJ9M1qa4e1QyOHl56WuEv3Gx6uHDAQDYz+C5G0VgdjBvwRzH
+         pJaiAulc1uW/V9TcRMwvwIWtI7eWygvU2PiuI/c05G1KVKibAubHE55IjOJCn2O2UaH4
+         WMNQ==
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
+        h=to:subject:message-id:date:from:in-reply-to:references:mime-version
+         :dkim-signature;
+        bh=j6+rsx5MBsg1/s7LIIfByV7u0jGK09n72bnK4XcN6ZQ=;
+        b=Ps5kk+tBGQzMP6ugDCwKf4hzn8fn3DU4AFz1dJvkHdDestLZWN99Qtr6iNMdslsHJm
+         ov378c+8oCfcV7shyBYjlAFfikFi7o4RM/evh3yqqjAnhyVfcYH7c9cexVvDo/AXUAZ7
+         N7Mh7EOvyDXXsaHK2l89XiAxZx/hZh/O+/HR2EoVEGre1eYRYwI/aEfPN8d4/fL2VtCD
+         0wzAwnUrINuXmcaUDT30Twjk9kwGjjTsM6Z531vKM6L3y48a7f3GTE7V+vo2QxHdUT54
+         fQVue9OO7b4VKTEj/x/dmNr+92sHRAMMS7dj/VXMmzM+WttUCAPNxZ27/bvt4bBc5oBp
+         QPEA==
+ARC-Authentication-Results: i=1; mx.google.com;
+       dkim=pass header.i=@destailleur.fr header.s=google header.b=SEYSmxbT;
+       spf=pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) smtp.mailfrom=contact@destailleur.fr;
+       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=destailleur.fr
+Return-Path: <contact@destailleur.fr>
+Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41])
+        by mx.google.com with SMTPS id q3sor2285165qtn.34.2020.08.20.09.56.02
+        for <testldrdev@gmail.com>
+        (Google Transport Security);
+        Thu, 20 Aug 2020 09:56:03 -0700 (PDT)
+Received-SPF: pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41;
+Authentication-Results: mx.google.com;
+       dkim=pass header.i=@destailleur.fr header.s=google header.b=SEYSmxbT;
+       spf=pass (google.com: domain of contact@destailleur.fr designates 209.85.220.41 as permitted sender) smtp.mailfrom=contact@destailleur.fr;
+       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=destailleur.fr
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=destailleur.fr; s=google;
+        h=mime-version:references:in-reply-to:from:date:message-id:subject:to;
+        bh=j6+rsx5MBsg1/s7LIIfByV7u0jGK09n72bnK4XcN6ZQ=;
+        b=SEYSmxbTKCuc1baQZzjIJwm7WXvgjt/nEGhMLqWxQCU3beM3qhH8wYlSeMyB8Z/9pi
+         tszZFZhZ3cjnIbbJnjzsMYJgBnYbkf6hz14+BsFwyPU030EkDjJy2i3DSXzYK7A+GbBn
+         G9I9foG/4+pcx0LnFsjchGsRhLFkTKJIsP2SVfOx0wlim3WHMIqIXvKsxY05PoPyf8Tp
+         IwQi7iNl/+nTyjNHl2DQh+ty3CRTmUw9uEbY+jRRvIg5i/7cfREekK98d7qi/5HQycr6
+         aptRDdCVHXpe47q+c7OPiMEEQWs+mFJhBqPXIlU54fwFApEEnLn/jwGbrPsrPYJaswgI
+         vd/g==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=1e100.net; s=20161025;
+        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
+         :message-id:subject:to;
+        bh=j6+rsx5MBsg1/s7LIIfByV7u0jGK09n72bnK4XcN6ZQ=;
+        b=M6a4k1gKc4e7TwKncuNPy0b3KxutR1FLFJGWxd4NyW84b7f3LfIR94IeInLQIWmY8C
+         Ddus0upZJI4+NN9XBGvXCdsiiYlwFGBJRWwjv82XFKVAKL5DD94RJNQZJUiE39hgJ2aa
+         6V9gasiP+nUAX4ZV9bZmw21CgKEZrZVXh5unmW2ABrfcx8lHjp/DUw5XEkym1J92Wo1l
+         g0H3XrC2FL+aQuj+WpCynMNkY9ljw71oqyv3SP9pjnVNHArAdZiPMHkNxiuPdq7q41fg
+         eIbdRCQXYZL5O48QsjDdiXwaQzx+NcYtrKAH0RIVD1lG6zc9pxqDJsbGxP9VLs8jGDTT
+         mSdQ==
+X-Gm-Message-State: AOAM532LuATWDKbo1HImMWshHVqb0kC0isehf3owfYUKq5J68o3juKbm kCgUMt25A2C7QoNMDXcjfJyteBNQD7ZhSh3yeYTGoLSvsD4=
+X-Google-Smtp-Source: ABdhPJyQYCpCHSwA87x030i8YChySZqcNXxT1qVlZyEA+XM6DTyPZusa8gtbDUVcMyx7Jma/7toh+4EEE2bWg0bG+2E=
+X-Received: by 2002:aed:3e8e:: with SMTP id n14mr3547383qtf.67.1597942562373; Thu, 20 Aug 2020 09:56:02 -0700 (PDT)
+MIME-Version: 1.0
+References: <CALeEO_kij-ogXKzrjV_pTgqVbUB9j=287VkX34iVSWgDHFA8eg@mail.gmail.com> <CAC8+=32ccpEo12RR-juT=FW6+gNV-DcvNjxs_0s6Wn40xmfhug@mail.gmail.com>
+In-Reply-To: <CAC8+=32ccpEo12RR-juT=FW6+gNV-DcvNjxs_0s6Wn40xmfhug@mail.gmail.com>
+From: John Tester <customer@customercompany.fr>
+Date: Thu, 20 Aug 2020 18:55:36 +0200
+Message-ID: <CALeEO_nLUY8Tk+o7WoaHtBkxvOy0dhvt+fL0MwPrApGty_AG_g@mail.gmail.com>
+Subject: Re: Support besoin
+To: John Tester <testldrdev@gmail.com>
+Content-Type: multipart/alternative; boundary="000000000000cd54be05ad51fe67"
+
+--000000000000cd54be05ad51fe67
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+Merci
+
+Le jeu. 20 ao=C3=BBt 2020 =C3=A0 18:34, John Tester <testldrdev@gma=
+il.com> a
+=C3=A9crit :
+
+> Merci pour votre question.
+> Voici la rep.
+>
+> Le jeu. 20 ao=C3=BBt 2020 =C3=A0 17:29, John Tester <laurent@dest=
+ailleur.fr>
+> a =C3=A9crit :
+>
+>> adfsdfsdfds
+>>
+>> --
+>> Laurent.
+>>
+>> ------------------------------------------------------------------------=
+------------
+>> Twitter: https://www.twitter.com/eldy10
+>>
+>
+
+--=20
+Laurent.
+---------------------------------------------------------------------------=
+---------
+Twitter: https://www.twitter.com/eldy10
+
+--000000000000cd54be05ad51fe67
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Merci</div><br><div class=3D"gmail_quote"><div dir=3D"ltr"=
+ class=3D"gmail_attr">Le=C2=A0jeu. 20 ao=C3=BBt 2020 =C3=A0=C2=A018:34, Lau=
+rent Destailleur &lt;<a href=3D"mailto:testldrdev@gmail.com">testldrdev@gma=
+il.com</a>&gt; a =C3=A9crit=C2=A0:<br></div><blockquote class=3D"gmail_quot=
+e" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204)=
+;padding-left:1ex"><div dir=3D"ltr">Merci pour votre question.<div>Voici la=
+ rep.</div></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"g=
+mail_attr">Le=C2=A0jeu. 20 ao=C3=BBt 2020 =C3=A0=C2=A017:29, Laurent Destai=
+lleur &lt;<a href=3D"mailto:customer@customercompany.fr" target=3D"_blank">laure=
+nt@destailleur.fr</a>&gt; a =C3=A9crit=C2=A0:<br></div><blockquote class=3D=
+"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(2=
+04,204,204);padding-left:1ex"><div dir=3D"ltr">adfsdfsdfds<br clear=3D"all"=
+><div><br></div>-- <br><div dir=3D"ltr">Laurent.<br>-----------------------=
+-------------------------------------------------------------<br>Twitter: <=
+a href=3D"https://www.twitter.com/eldy10" target=3D"_blank">https://www.twi=
+tter.com/eldy10</a></div></div>
+</blockquote></div>
+</blockquote></div><br clear=3D"all"><div><br></div>-- <br><div dir=3D"ltr"=
+ class=3D"gmail_signature">Laurent.<br>------------------------------------=
+------------------------------------------------<br>Twitter: <a href=3D"htt=
+ps://www.twitter.com/eldy10" target=3D"_blank">https://www.twitter.com/eldy=
+10</a></div>
+
+--000000000000cd54be05ad51fe67--
\ No newline at end of file
diff --git a/dev/initdata/dbf/importdb-products.php b/dev/initdata/dbf/importdb-products.php
index 845064f0688..2c06c07e103 100644
--- a/dev/initdata/dbf/importdb-products.php
+++ b/dev/initdata/dbf/importdb-products.php
@@ -227,8 +227,7 @@ while ($fields = $db->fetch_array($resql)) {
 		$error++;    // $errorrecord will be reset
 	}
 	$j++;
-} else
-    die("error : $sql");
+} else die("error : $sql");
 
 
 
diff --git a/dev/initdata/dbf/importdb-thirdparties.php b/dev/initdata/dbf/importdb-thirdparties.php
index 8f0eb0635f0..a6b2697eed8 100644
--- a/dev/initdata/dbf/importdb-thirdparties.php
+++ b/dev/initdata/dbf/importdb-thirdparties.php
@@ -179,8 +179,7 @@ while ($fields = $db->fetch_array($resql)) {
 	$object->town = trim($fields['FVILLE']);
 	if ($fields['FPAYS'])
 		$object->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['FPAYS']))), 'c_country', 'label', 'rowid');
-	else
-		$object->country_id = 1;
+	else $object->country_id = 1;
 	$object->phone = trim($fields['FTEL']) ? trim($fields['FTEL']) : trim($fields['FCONTACT']);
 	$object->phone = substr($object->phone, 0, 20);
 	$object->fax = trim($fields['FFAX']) ? trim($fields['FFAX']) : trim($fields['FCONTACT']);
@@ -299,8 +298,7 @@ while ($fields = $db->fetch_array($resql)) {
 		$contact->town = trim($fields['LVILLE']);
 		if ($fields['FPAYS'])
 			$contact->country_id = dol_getIdFromCode($db, trim(ucwords(strtolower($fields['LPAYS']))), 'c_country', 'label', 'rowid');
-		else
-			$contact->country_id = 1;
+		else $contact->country_id = 1;
 		$contact->email = $fields['LMAIL'];
 		$contact->phone = trim($fields['LTEL']) ? trim($fields['LTEL']) : trim($fields['LCONTACT']);
 		$contact->fax = trim($fields['LFAX']) ? trim($fields['LFAX']) : trim($fields['LCONTACT']);
@@ -340,8 +338,7 @@ while ($fields = $db->fetch_array($resql)) {
 		$error++;    // $errorrecord will be reset
 	}
 	$j++;
-} else
-    die("error : $sql");
+} else die("error : $sql");
 
 $db->commit();
 
diff --git a/dev/initdata/dbf/includes/dbase.class.php b/dev/initdata/dbf/includes/dbase.class.php
index 0c2f6820a96..e70f18087c4 100644
--- a/dev/initdata/dbf/includes/dbase.class.php
+++ b/dev/initdata/dbf/includes/dbase.class.php
@@ -207,8 +207,7 @@ class DBase
                     $value = true;
                 elseif ($value == 'f' || $value == 'n')
                     $value = false;
-                else
-                    $value = null;
+                else $value = null;
             }
             $record[$i] = $value;
         }
@@ -295,8 +294,7 @@ class DBase
         $i = unpack("S$n", $data);
         if ($n == 1)
             return (int) $i[1];
-        else
-            return array_merge($i);
+        else return array_merge($i);
     }
 
     private static function putInt16($fd, $value)
@@ -310,8 +308,7 @@ class DBase
         $i = unpack("L$n", $data);
         if ($n == 1)
             return (int) $i[1];
-        else
-            return array_merge($i);
+        else return array_merge($i);
     }
 
     private static function putInt32($fd, $value)
diff --git a/dev/initdata/generate-invoice.php b/dev/initdata/generate-invoice.php
index 3fe058e8d3e..c35fe2440ef 100755
--- a/dev/initdata/generate-invoice.php
+++ b/dev/initdata/generate-invoice.php
@@ -179,14 +179,10 @@ while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 		if ($result)
 		{
 			print " OK with ref ".$object->ref."\n";;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db, $object->error);
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/dev/initdata/generate-order.php b/dev/initdata/generate-order.php
index 1dc56aa5582..c421e39ffe3 100755
--- a/dev/initdata/generate-order.php
+++ b/dev/initdata/generate-order.php
@@ -124,8 +124,7 @@ if ($resql) {
         $row = $db->fetch_row($resql);
         $societesid[$i] = $row[0];
     }
-}
-else { print "err"; }
+} else { print "err"; }
 
 $commandesid = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
@@ -138,8 +137,7 @@ if ($resql) {
         $row = $db->fetch_row($resql);
         $commandesid[$i] = $row[0];
     }
-}
-else { print "err"; }
+} else { print "err"; }
 
 $prodids = array();
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE tosell=1";
@@ -206,16 +204,12 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
         {
             $db->commit();
             print " OK with ref ".$object->ref."\n";
-        }
-        else
-        {
+        } else {
             print " KO\n";
             $db->rollback();
             dol_print_error($db, $object->error);
         }
-    }
-    else
-    {
+    } else {
         print " KO\n";
         $db->rollback();
         dol_print_error($db, $object->error);
diff --git a/dev/initdata/generate-proposal.php b/dev/initdata/generate-proposal.php
index 4c5d70aadc4..42c0c4098f2 100755
--- a/dev/initdata/generate-proposal.php
+++ b/dev/initdata/generate-proposal.php
@@ -210,16 +210,12 @@ while ($i < GEN_NUMBER_PROPAL && $result >= 0)
 		{
 		    $db->commit();
 		    print " OK with ref ".$object->ref."\n";
-		}
-		else
-		{
+		} else {
 		    print " KO\n";
 		    $db->rollback();
 		    dol_print_error($db, $object->error);
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/dev/initdata/generate-thirdparty.php b/dev/initdata/generate-thirdparty.php
index 05ac6416aa3..a13e2351e9c 100755
--- a/dev/initdata/generate-thirdparty.php
+++ b/dev/initdata/generate-thirdparty.php
@@ -136,9 +136,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
         }
 
         print "Company ".$s." created nom=".$soc->name."\n";
-    }
-    else
-    {
+    } else {
     	print "Error: ".$soc->error."\n";
     }
 }
diff --git a/dev/initdata/import-products.php b/dev/initdata/import-products.php
index 4288c5bf3b1..fb07143f972 100755
--- a/dev/initdata/import-products.php
+++ b/dev/initdata/import-products.php
@@ -163,9 +163,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     {
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
-    }
-	else
-	{
+    } else {
 	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
 	}
 
@@ -180,9 +178,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - updatePrice OK";
     	}
 	}
@@ -200,9 +196,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - setMultiLangs OK";
     	}
 	}
@@ -227,9 +221,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
-{
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/import-thirdparties.php b/dev/initdata/import-thirdparties.php
index ef1dfcc99ab..a0ddaac7674 100755
--- a/dev/initdata/import-thirdparties.php
+++ b/dev/initdata/import-thirdparties.php
@@ -181,9 +181,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - Creation OK with name ".$object->name." - id = ".$ret;
     	}
     }
@@ -212,9 +210,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     	{
     	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
     	    $errorrecord++;
-    	}
-    	else
-    	{
+    	} else {
     	    print " - create link sale representative OK";
     	}
 	}
@@ -243,9 +239,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - create contact OK";
     	}
 	}
@@ -277,9 +271,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
-        }
-    	else
-    	{
+        } else {
     	    print " - create contact OK";
     	}
 	}
@@ -305,9 +297,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
-{
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/import-users.php b/dev/initdata/import-users.php
index 4247415288c..8e4878577a1 100755
--- a/dev/initdata/import-users.php
+++ b/dev/initdata/import-users.php
@@ -142,9 +142,7 @@ while ($fields=fgetcsv($fhandle, $linelength, $delimiter, $enclosure, $escape))
     {
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
-    }
-	else
-	{
+    } else {
 	    print " - Creation OK with login ".$object->login." - id = ".$ret;
 	}
 
@@ -168,9 +166,7 @@ if ($mode != 'confirmforced' && ($error || $mode != 'confirm'))
 {
     print "Rollback any changes.\n";
     $db->rollback();
-}
-else
-{
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index b1aadd56ed8..e6a67aa73c8 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -26,7 +26,7 @@
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path=__DIR__.'/';
 
 // Test si mode batch
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -198,7 +198,7 @@ if (empty($option))
 if ($option != 'all')
 {
     $listofoptions=explode(',', $option);
-    foreach($listofoptions as $cursoroption)
+    foreach ($listofoptions as $cursoroption)
     {
         if (! in_array($cursoroption, array_keys($sqls))) {
             print "Usage:  $script_file (test|confirm) (all|option) (all|YYYY-MM-DD) [dbtype dbhost dbuser dbpassword dbname dbport]\n";
@@ -264,7 +264,7 @@ function processfamily($family, $date)
     global $db, $sqls;
 
     $error=0;
-    foreach($sqls[$family] as $sql)
+    foreach ($sqls[$family] as $sql)
     {
         if (preg_match('/^@/', $sql))
         {
@@ -302,10 +302,10 @@ function processfamily($family, $date)
 $db->begin();
 
 $listofoptions=explode(',', $option);
-foreach($listofoptions as $cursoroption)
+foreach ($listofoptions as $cursoroption)
 {
     $oldfamily='';
-    foreach($sqls as $family => $familysql)
+    foreach ($sqls as $family => $familysql)
     {
         if ($cursoroption && $cursoroption != 'all' && $cursoroption != $family) continue;
 
@@ -325,9 +325,7 @@ if ($error || $mode != 'confirm')
 {
     print "\nRollback any changes.\n";
     $db->rollback();
-}
-else
-{
+} else {
     print "Commit all changes.\n";
     $db->commit();
 }
diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index 7fd9eb551d4..1b32161b44b 100755
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -69,6 +69,7 @@ then
 	  255)
 	exit;;
 	esac
+	rm $fichtemp
 	
 	# ----------------------------- database name
 	DIALOG=${DIALOG=dialog}
@@ -86,6 +87,7 @@ then
 	  255)
 	exit;;
 	esac
+	rm $fichtemp
 	
 	# ---------------------------- database port
 	DIALOG=${DIALOG=dialog}
@@ -104,6 +106,7 @@ then
 	  255)
 	exit;;
 	esac
+	rm $fichtemp
 	
 	# ---------------------------- compte admin mysql
 	DIALOG=${DIALOG=dialog}
@@ -122,6 +125,7 @@ then
 	  255)
 	exit;;
 	esac
+	rm $fichtemp
 	
 	# ---------------------------- mot de passe admin mysql
 	DIALOG=${DIALOG=dialog}
@@ -140,6 +144,7 @@ then
 	  255)
 	exit;;
 	esac
+	rm $fichtemp
 	
 	
 	export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
new file mode 100755
index 00000000000..d5aa9c1ef0e
--- /dev/null
+++ b/dev/initdemo/initdemopassword.sh
@@ -0,0 +1,166 @@
+#!/bin/sh
+#------------------------------------------------------
+# Script to reinit admin password.
+# Note: "dialog" tool need to be available if no parameter provided.
+#
+# Laurent Destailleur - eldy@users.sourceforge.net
+#------------------------------------------------------
+# Usage: initdemopassword.sh confirm 
+# usage: initdemopassword.sh confirm base port login pass
+#------------------------------------------------------
+
+
+export mydir=`echo "$0" | sed -e 's/initdemopassword.sh//'`;
+if [ "x$mydir" = 'x' -o "x$mydir" = 'x./' ]
+then
+    export mydir="."
+fi
+export id=`id -u`;
+
+
+# ----------------------------- check if root
+if [ "x$id" != "x0" -a "x$id" != "x1001" ]
+then
+	echo "Script must be ran as root"
+	exit
+fi
+
+
+# ----------------------------- command line params
+confirm=$1;
+base=$2;
+port=$3;
+demologin=$4;
+demopass=$5;
+
+# ----------------------------- check params
+if [ "x$confirm" != "xconfirm" ]
+then
+	echo "----- $0 -----"
+	echo "Usage: initdemopassword.sh confirm [base port login pass]"
+	exit
+fi
+
+
+# ----------------------------- if no params on command line
+if [ "x$demopass" = "x" ]
+then
+	export dumpfile=`ls -v $mydir/mysqldump_dolibarr_*.sql | tail -n 1`
+	export dumpfile=`basename $dumpfile`
+
+	# ----------------------------- database name
+	DIALOG=${DIALOG=dialog}
+	DIALOG="$DIALOG --ascii-lines"
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	        --inputbox "Mysql database name :" 16 55 dolibarrdemo 2> $fichtemp
+	valret=$?
+	case $valret in
+	  0)
+	base=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	rm $fichtemp
+	
+	# ---------------------------- database port
+	DIALOG=${DIALOG=dialog}
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Init Dolibarr with demo values" --clear \
+	        --inputbox "Mysql port (ex: 3306):" 16 55 3306 2> $fichtemp
+	
+	valret=$?
+	
+	case $valret in
+	  0)
+	port=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	rm $fichtemp
+	
+	
+	# ----------------------------- demo login
+	DIALOG=${DIALOG=dialog}
+	DIALOG="$DIALOG --ascii-lines"
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Reset login password" --clear \
+	        --inputbox "Login to reset :" 16 55 dolibarrdemologin 2> $fichtemp
+	valret=$?
+	case $valret in
+	  0)
+	demologin=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	rm fichtemp
+	
+	# ----------------------------- demo pass
+	DIALOG=${DIALOG=dialog}
+	DIALOG="$DIALOG --ascii-lines"
+	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
+	trap "rm -f $fichtemp" 0 1 2 5 15
+	$DIALOG --title "Reset login password" --clear \
+	        --inputbox "Pass to set :" 16 55 dolibarrdemopass 2> $fichtemp
+	valret=$?
+	case $valret in
+	  0)
+	demopass=`cat $fichtemp`;;
+	  1)
+	exit;;
+	  255)
+	exit;;
+	esac
+	rm fichtemp
+	
+	
+	export documentdir=`cat $mydir/../../htdocs/conf/conf.php | grep '^\$dolibarr_main_data_root' | sed -e 's/$dolibarr_main_data_root=//' | sed -e 's/;//' | sed -e "s/'//g" | sed -e 's/"//g' `
+
+
+	# ---------------------------- confirmation
+	DIALOG=${DIALOG=dialog}
+	$DIALOG --title "Init demo login with demo values" --clear \
+	        --yesno "Do you confirm ? \n Mysql database : '$base' \n Mysql port : '$port' \n Demo login: '$demologin' \n Demo password : '$demopass'" 15 55
+	
+	case $? in
+	        0)      echo "Ok, start process...";;
+	        1)      exit;;
+	        255)    exit;;
+	esac
+
+fi
+
+
+# ---------------------------- run sql file
+if [ "x$passwd" != "x" ]
+then
+	export passwd="-p$passwd"
+fi
+#echo "mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile"
+#mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
+echo "echo \"UPDATE llx_user SET pass_crypted = MD5('$demopass') WHERE login = '$demologin';\" | mysql -P$port $base"
+echo "UPDATE llx_user SET pass_crypted = MD5('$demopass') WHERE login = '$demologin';" | mysql -P$port $base
+export res=$?
+
+if [ $res -ne 0 ]; then
+	echo "Error to execute sql with mysql -P$port -u$admin -p***** $base"
+	exit
+fi 
+
+
+if [ "x$res" = "x0" ]
+then
+	echo "Success, file successfully loaded."
+else
+	echo "Error, load failed."
+fi
+echo
diff --git a/dev/initdemo/sftpget_and_loaddump.php b/dev/initdemo/sftpget_and_loaddump.php
index 5b16d3afe9b..4da5ffaad58 100755
--- a/dev/initdemo/sftpget_and_loaddump.php
+++ b/dev/initdemo/sftpget_and_loaddump.php
@@ -95,8 +95,7 @@ if ($connection)
 		dol_syslog("Could not authenticate with username ".$login." . and password ".preg_replace('/./', '*', $password), LOG_ERR);
 		exit(-5);
 	}
-	else
-	{
+	else {
 		//$stream = ssh2_exec($connection, '/usr/bin/php -i');
 		/*
 		print "Generate dump ".$filesys1.'.bz2'."\n";
@@ -125,14 +124,13 @@ if ($connection)
 		$return_var=0;
 		print strftime("%Y%m%d-%H%M%S").' '.$fullcommand."\n";
 		exec($fullcommand, $output, $return_var);
-		foreach($output as $line) print $line."\n";
+		foreach ($output as $line) print $line."\n";
 
 		//ssh2_sftp_unlink($sftp, $fileinstalllock);
 		//print $output;
 	}
 }
-else
-{
+else {
 	print 'Failed to connect to ssh2 to '.$server;
 	exit(-6);
 }
diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php
index 51a5310a694..5da0d4a2498 100755
--- a/dev/initdemo/updatedemo.php
+++ b/dev/initdemo/updatedemo.php
@@ -87,7 +87,7 @@ while ($year <= $currentyear)
 
     if ($delta1)
     {
-        foreach($tables as $tablekey => $tableval)
+        foreach ($tables as $tablekey => $tableval)
         {
             print "Correct ".$tablekey." for year ".$year." and move them to current year ".$currentyear." ";
             $sql="select rowid from ".MAIN_DB_PREFIX.$tablekey." where ".$tableval[0]." between '".$year."-01-01' and '".$year."-12-31' and ".$tableval[0]." < DATE_ADD(NOW(), INTERVAL -1 YEAR)";
@@ -105,7 +105,7 @@ while ($year <= $currentyear)
                         print ".";
                         $sql2="UPDATE ".MAIN_DB_PREFIX.$tablekey." set ";
                         $j=0;
-                        foreach($tableval as $field)
+                        foreach ($tableval as $field)
                         {
                             if ($j) $sql2.=", ";
                             $sql2.= $field." = ".$db->ifsql("DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR) > NOW()", "DATE_ADD(".$field.", INTERVAL ".$delta2." YEAR)", "DATE_ADD(".$field.", INTERVAL ".$delta1." YEAR)");
diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml
index e726df6db7c..03104270dcf 100644
--- a/dev/setup/codesniffer/ruleset.xml
+++ b/dev/setup/codesniffer/ruleset.xml
@@ -27,7 +27,7 @@
 
 
 	<!-- Rules from Generic Standard -->
-	
+
 	<!-- We want to allow empty statement: It allows to put some code comments into the else for examples -->
 	<rule ref="Generic.CodeAnalysis.EmptyStatement">
         <exclude name="Generic.CodeAnalysis.EmptyStatement.DetectedIf"/>
@@ -101,7 +101,7 @@
 			<property name="error" value="false"/>
 		</properties>
 		</rule>
-	-->    
+	-->
 	<!--  We want to allow 'if () { ...small code... }' on same line for better code compacity and readability -->
 	<rule ref="Generic.Formatting.DisallowMultipleStatements">
 		<severity>0</severity>
@@ -117,7 +117,7 @@
 		</properties>
 		</rule>
 	-->
-	
+
 	<rule ref="Generic.Formatting.SpaceAfterCast" />
 
     <rule ref="Generic.Functions.CallTimePassByReference" />
@@ -188,8 +188,8 @@
 	</rule>
 
     <!-- Check for duplicate class names -->
-    <!-- Disabled: We need this for dependency injection. 
-    <rule ref="Generic.Classes.DuplicateClassName" /> 
+    <!-- Disabled: We need this for dependency injection.
+    <rule ref="Generic.Classes.DuplicateClassName" />
     -->
 
 
@@ -213,6 +213,10 @@
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen" />
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose" />
 
+    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis" /> -->
+    <!-- <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace" /> -->
+    <rule ref="Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword" />
+
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceAfterOpen" />
     <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceBeforeClose" />
 
@@ -309,16 +313,16 @@
     <rule ref="PEAR.Files.IncludingFile.UseInclude">
         <severity>0</severity>
     </rule>
-    
+
     <!-- We disable this. We must be allowed to use strict require instead of non strict include anywhere -->
     <rule ref="PEAR.Files.IncludingFile.UseIncludeOnce">
         <severity>0</severity>
     </rule>
-    
+
     <rule ref="PEAR.Files.IncludingFile.UseRequire">
      	<severity>0</severity>
     </rule>
-    
+
     <!-- We disable this: We want to allow include_once -->
     <rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
         <severity>0</severity>
@@ -332,7 +336,7 @@
     <rule ref="PEAR.Functions.FunctionCallSignature.CloseBracketLine">
         <severity>0</severity>
     </rule>
-    
+
     <!-- We disable this: We want to allow small function on 1 line -->
     <rule ref="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket">
         <severity>0</severity>
@@ -385,7 +389,7 @@
 	<!--<rule ref="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps">
         <severity>0</severity>
 	</rule>-->
-	
+
 	<!-- We disable this: We don't want to have private methods prefixed with an underscore -->
 	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
         <severity>0</severity>
@@ -426,5 +430,5 @@
 	<rule ref="PSR2.Classes.PropertyDeclaration.VarUsed" />
     <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
     <rule ref="PSR2.Files.ClosingTag"/>
-	
+
 </ruleset>
diff --git a/dev/tools/dolibarr-postgres2mysql.php b/dev/tools/dolibarr-postgres2mysql.php
index f2794455ca3..fd30540c019 100644
--- a/dev/tools/dolibarr-postgres2mysql.php
+++ b/dev/tools/dolibarr-postgres2mysql.php
@@ -76,14 +76,12 @@ function getfieldname($l)
 	if (preg_match("/`(.*)`/", $l, $regs)) {
 		if ($regs[1])
 			return $regs[1];
-		else
-			return null;
+		else return null;
 	} // if its not in quotes, then it should (we hope!) be the first "word" on the line, up to the first space.
 	elseif (preg_match("/([^\ ]*)/", trim($l), $regs)) {
 		if ($regs[1])
 			return $regs[1];
-		else
-			return null;
+		else return null;
 	}
 }
 
@@ -102,8 +100,7 @@ function formatsize($s)
 		return sprintf("%.1f", round($s / 1024, 1)) . "K";
 	elseif ($s < pow(2, 30))
 		return sprintf("%.1f", round($s / 1024 / 1024, 1)) . "M";
-	else
-		return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
+	else return sprintf("%.1f", round($s / 1024 / 1024 / 1024, 1)) . "G";
 }
 
 /**
@@ -146,8 +143,7 @@ function pg2mysql_large($infilename, $outfilename)
 		if ($c % 2 != 0) {
 			if ($inquotes)
 				$inquotes = false;
-			else
-				$inquotes = true;
+			else $inquotes = true;
 		}
 
 		if ($linenum % 10000 == 0) {
@@ -329,8 +325,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$num = $regs[1];
 				if ($num <= 255)
 					$line = preg_replace("/ character varying\([0-9]*\)/", " varchar($num)", $line);
-				else
-					$line = preg_replace("/ character varying\([0-9]*\)/", " text", $line);
+				else $line = preg_replace("/ character varying\([0-9]*\)/", " text", $line);
 			}
 			// character varying with no size, we will default to varchar(255)
 			if (preg_match("/ character varying/", $line)) {
@@ -352,8 +347,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 				$num = $regs[1];
 				if ($num <= 255)
 					$line = preg_replace("/ character\([0-9]*\)/", " varchar($num)", $line);
-				else
-					$line = preg_replace("/ character\([0-9]*\)/", " text", $line);
+				else $line = preg_replace("/ character\([0-9]*\)/", " text", $line);
 			}
 			// timestamps
 			$line = str_replace(" timestamp with time zone", " datetime", $line);
@@ -363,8 +357,8 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 			$line = str_replace(" time with time zone", " time", $line);
 			$line = str_replace(" time without time zone", " time", $line);
 
-			$line = str_replace(" timestamp DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP", $line);
-			$line = str_replace(" timestamp without time zone DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP", $line);
+			$line = str_replace(" timestamp DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP", $line);
+			$line = str_replace(" timestamp without time zone DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP", $line);
 
 			if (strstr($line, "auto_increment") || preg_match('/ rowid int/', $line) || preg_match('/ id int/', $line)) {
 				$field = getfieldname($line);
@@ -465,8 +459,7 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 					if ($c % 2 != 0) {
 						if ($inquotes)
 							$inquotes = false;
-						else
-							$inquotes = true;
+						else $inquotes = true;
 						// echo "inquotes=$inquotes\n";
 					}
 				} while (substr($lines[$linenumber], - 3, - 1) != ");" || $inquotes);
diff --git a/dev/tools/test/testperf.php b/dev/tools/test/testperf.php
new file mode 100755
index 00000000000..f49e8a4ca0d
--- /dev/null
+++ b/dev/tools/test/testperf.php
@@ -0,0 +1,21 @@
+<?php
+
+$a = microtime(true);
+
+$i = 0;
+while ($i < 1000000)
+{
+	$key = '1234567890111213141516171819'.$i;
+	if ($i == 1000) $key = 'MAIN_MODULE_AAAAAiiiiiiiiiiiiiiiiiiiiiiiiiiiii';
+
+	//if (preg_match('/^MAIN_MODULE_/', $key)) {
+	//if (substr($key, 0, 12) == 'MAIN_MODULE_') {
+	if (strpos($key, 'MAIN_MODULE_') === 0) {
+		print "Found\n";
+	}
+	$i++;
+}
+
+$b = microtime(true);
+
+print $b - $a."\n";
diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php
index f9657482c86..b51515a42cb 100644
--- a/dev/translation/autotranslator.class.php
+++ b/dev/translation/autotranslator.class.php
@@ -77,7 +77,7 @@ class autoTranslator
 
 		$files = $this->getTranslationFilesArray($this->_refLang);
 		$counter = 1;
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if ($this->_limittofile && $this->_limittofile != $file) continue;
 			$counter++;
@@ -94,7 +94,7 @@ class autoTranslator
 
 				// If we must process all languages
 				$arraytmp=dol_dir_list($this->_langDir, 'directories', 0);
-				foreach($arraytmp as $dirtmp)
+				foreach ($arraytmp as $dirtmp)
 				{
 					if ($dirtmp['name'] === $this->_refLang) continue;	// We discard source language
 					$tmppart=explode('_', $dirtmp['name']);
@@ -112,7 +112,7 @@ class autoTranslator
 			}
 
 			// Process translation of source file for each target languages
-			foreach($targetlangs as $my_destlang)
+			foreach ($targetlangs as $my_destlang)
 			{
 				$this->_translatedFiles = array();
 
@@ -124,15 +124,14 @@ class autoTranslator
 					echo "File not found: " . $destPath . ". We generate it.<br>\n";
 					$this->createTranslationFile($destPath, $my_destlang);
 				}
-				else
-				{
+				else {
 					echo "Updating file: " . $destPath . "<br>\n";
 				}
 
 				// Translate lines
 				$fileContentDest = file($destPath, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
 				$newlines=0;
-				foreach($fileContent as $line){
+				foreach ($fileContent as $line){
 					$key = $this->getLineKey($line);
 					$value = $this->getLineValue($line);
 					if ($key && $value)
@@ -167,7 +166,7 @@ class autoTranslator
 			fwrite($fp, "\n");
 			fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n");
 			fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n");
-			foreach($this->_translatedFiles[$file] as $line) {
+			foreach ($this->_translatedFiles[$file] as $line) {
 				fwrite($fp, $line . "\n");
 			}
 			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
@@ -209,7 +208,7 @@ class autoTranslator
 	{
 
 		//print "key    =".$key."\n";
-		foreach($content as $line) {
+		foreach ($content as $line) {
 			$destKey = $this->getLineKey($line);
 			$destValue = $this->getLineValue($line);
 			// If translated return
@@ -273,8 +272,8 @@ class autoTranslator
 	private function getTranslationFilesArray($lang)
 	{
 		$dir = new DirectoryIterator($this->_langDir.$lang);
-		while($dir->valid()) {
-			if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
+		while ($dir->valid()) {
+			if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
 				$files[] =  $dir->getFilename();
 			}
 			$dir->next();
diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index f568ba2b04b..0268fc94ed8 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -360,16 +360,14 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
    			$unused[$value] = $line;
        		echo $line;        // $trad contains the \n
 		}
-		else
-		{
+		else {
 		    unset($output);
 		    //print 'X'.$output.'Y';
 		}
 	}
 
 	if (empty($unused)) print "No string not used found.\n";
-	else
-	{
+	else {
         $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang';
         print "Strings in en_US that are never used are saved into file ".$filetosave.":\n";
         file_put_contents($filetosave, implode("", $unused));
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index f2263b1d18b..adc5a706d06 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -80,8 +80,8 @@ $aEnglish = array();
 if ($filesToProcess == 'all')
 {
 	$dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
-	while($dir->valid()) {
-		if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
+	while ($dir->valid()) {
+		if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
 			$files[] =  $dir->getFilename();
 		}
 		$dir->next();
@@ -94,7 +94,7 @@ else $filesToProcess=explode(',', $filesToProcess);
 
 
 // Loop on each file
-foreach($filesToProcess as $fileToProcess)
+foreach ($filesToProcess as $fileToProcess)
 {
 	$lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
 	$lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
@@ -285,8 +285,7 @@ foreach($filesToProcess as $fileToProcess)
 				print "Key $key is redundant in file $lPrimaryFile (line: $cnt) - Already found into ".$fileFirstFound[$key]." (line: ".$lineFirstFound[$key].").\n";
 				continue;
 			}
-			else
-			{
+			else {
 				$fileFirstFound[$key] = $fileToProcess;
 				$lineFirstFound[$key] = $cnt;
 			}
diff --git a/doc/images/invoice.png b/doc/images/invoice.png
new file mode 100644
index 00000000000..9be03a52ed8
Binary files /dev/null and b/doc/images/invoice.png differ
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index cf00519e9d7..88282447c51 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -54,8 +54,8 @@ if (!$user->rights->accounting->chartofaccount) accessforbidden();
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -119,8 +119,7 @@ if (empty($reshook))
 			{
 				$obj = $db->fetch_object($resql);
 				$country_code = $obj->code;
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 
 			// Try to load sql file
 			if ($country_code)
@@ -143,9 +142,7 @@ if (empty($reshook))
 				if ($result > 0)
 				{
 					setEventMessages($langs->trans("ChartLoaded"), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans("ErrorDuringChartLoad"), null, 'warnings');
 				}
 			}
@@ -233,10 +230,9 @@ if (strlen(trim($search_account))) {
 				$search_account_tmp_clean = preg_replace('/^\^/', '', $search_account_tmp);
 				$search_account_clean = preg_replace('/^\^/', '', $search_account);
 			}
-			$sql .= " AND (aa.account_number LIKE '".$startchar.$search_account_tmp_clean."'";
-			$sql .= " OR aa.account_number LIKE '".$startchar.$search_account_clean."%')";
-		}
-		else $sql .= natural_search("aa.account_number", $search_account_tmp);
+			$sql .= " AND (aa.account_number LIKE '".$db->escape($startchar.$search_account_tmp_clean)."'";
+			$sql .= " OR aa.account_number LIKE '".$db->escape($startchar.$search_account_clean)."%')";
+		} else $sql .= natural_search("aa.account_number", $search_account_tmp);
 	}
 }
 if (strlen(trim($search_label)))			$sql .= natural_search("aa.label", $search_label);
@@ -267,15 +263,15 @@ if ($resql)
 {
 	$num = $db->num_rows($resql);
 
-    $param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$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_account) $param .= '&search_account='.urlencode($search_account);
 	if ($search_label) $param .= '&search_label='.urlencode($search_label);
 	if ($search_labelshort) $param .= '&search_labelshort='.urlencode($search_labelshort);
 	if ($search_accountparent > 0 || $search_accountparent == '0') $param .= '&search_accountparent='.urlencode($search_accountparent);
 	if ($search_pcgtype) $param .= '&search_pcgtype='.urlencode($search_pcgtype);
-	if ($optioncss != '') $param .= '&optioncss='.$optioncss;
+	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 
     if (!empty($conf->use_javascript_ajax))
     {
@@ -298,13 +294,11 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
     $newcardbutton .= dolGetButtonTitle($langs->trans("New"), $langs->trans("Addanaccount"), 'fa fa-plus-circle', './card.php?action=create');
 
-
-    print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
+    print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	// Box to select active chart of account
     print $langs->trans("Selectchartofaccounts")." : ";
@@ -328,8 +322,7 @@ if ($resql)
 
             $i++;
         }
-    }
-    else dol_print_error($db);
+    } 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")).'">';
@@ -348,15 +341,15 @@ if ($resql)
 
 	// Line for search fields
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="'.$search_account.'"></td>';
-	if (!empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="'.$search_label.'"></td>';
-	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_labelshort" value="'.$search_labelshort.'"></td>';
+	if (!empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat width100" name="search_account" value="'.$search_account.'"></td>';
+	if (!empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$search_label.'"></td>';
+	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat width100" name="search_labelshort" value="'.$search_labelshort.'"></td>';
 	if (!empty($arrayfields['aa.account_parent']['checked'])) {
 		print '<td class="liste_titre">';
 		print $formaccounting->select_account($search_accountparent, 'search_accountparent', 2);
 		print '</td>';
 	}
-	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
+	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat width100" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['aa.reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
 	if (!empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
@@ -395,7 +388,7 @@ if ($resql)
 		if (!empty($arrayfields['aa.account_number']['checked']))
 		{
 			print "<td>";
-			print $accountstatic->getNomUrl(1, 0, 0, '', 0, 1);
+			print $accountstatic->getNomUrl(1, 0, 0, '', 0, 1, 0, 'accountcard');
 			print "</td>\n";
 			if (!$i) $totalarray['nbfield']++;
 		}
@@ -421,20 +414,24 @@ if ($resql)
 		// Account parent
 		if (!empty($arrayfields['aa.account_parent']['checked']))
 		{
-			if (!empty($obj->account_parent))
+			// Note: obj->account_parent is a foreign key to a rowid. It is field in child table and obj->rowid2 is same, but in parent table.
+			// So for orphans, obj->account_parent is set but not obj->rowid2
+			if (!empty($obj->account_parent) && !empty($obj->rowid2))
 			{
+				print "<td>";
+				print '<!-- obj->account_parent = '.$obj->account_parent.' obj->rowid2 = '.$obj->rowid2.' -->';
 				$accountparent->id = $obj->rowid2;
 				$accountparent->label = $obj->label2;
-				$accountparent->account_number = $obj->account_number2;
-
-				print "<td>";
+				$accountparent->account_number = $obj->account_number2;	// Sotre an account number for output
 				print $accountparent->getNomUrl(1);
 				print "</td>\n";
 				if (!$i) $totalarray['nbfield']++;
-			}
-			else
-			{
-				print '<td>&nbsp;</td>';
+			} else {
+				print '<td>';
+				if (!empty($obj->account_parent)) {
+					print '<!-- Bad value for obj->account_parent = '.$obj->account_parent.': is a rowid that does not exists -->';
+				}
+				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 		}
@@ -488,11 +485,11 @@ if ($resql)
 		// Action
 		print '<td class="center">';
 		if ($user->rights->accounting->chartofaccount) {
-			print '<a class="editfielda" href="./card.php?action=update&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">';
+			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
 			print img_edit();
 			print '</a>';
 			print '&nbsp;';
-			print '<a class="marginleftonly" href="./card.php?action=delete&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">';
+			print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
 			print img_delete();
 			print '</a>';
 		}
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index b31cd23dfa4..d3bd17d95a5 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -228,8 +228,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			}
-			elseif ($value == 'entity') {
+			} elseif ($value == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) $sql .= ",";
@@ -245,13 +244,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-		}
-		else
-		{
+		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -260,8 +256,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	// Si verif ok et action modify, on modifie la ligne
 	if ($ok && GETPOST('actionmodify', 'alpha'))
 	{
-		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-		else { $rowidcol = "rowid"; }
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 		// Modify entry
 		$sql = "UPDATE ".$tabname[$id]." SET ";
@@ -276,8 +271,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			}
-			elseif ($field == 'entity') {
+			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) $sql .= ",";
@@ -286,7 +280,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
 			$i++;
 		}
-		$sql .= " WHERE ".$rowidcol." = '".$rowid."'";
+		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 
 		dol_syslog("actionmodify", LOG_DEBUG);
 		//print $sql;
@@ -306,10 +300,9 @@ if (GETPOST('actioncancel', 'alpha'))
 
 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."='".$rowid."'";
+	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 
 	dol_syslog("delete", LOG_DEBUG);
 	$result = $db->query($sql);
@@ -318,9 +311,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
 		{
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -329,14 +320,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // 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."='".$rowid."'";
-	}
-	elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
+		$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);
@@ -349,14 +338,12 @@ if ($action == $acts[0])
 // 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."='".$rowid."'";
-	}
-	elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
+		$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);
@@ -369,14 +356,12 @@ if ($action == $acts[1])
 // 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."='".$rowid."'";
-	}
-	elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".$code."'";
+		$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);
@@ -389,14 +374,12 @@ if ($action == 'activate_favorite')
 // 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."='".$rowid."'";
-	}
-	elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".$code."'";
+		$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);
@@ -581,9 +564,7 @@ if ($id)
 					print '<td class="liste_titre">';
 					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
 					print '</td>';
-				}
-				else
-				{
+				} else {
 					print '<td class="liste_titre"></td>';
 				}
 			}
@@ -629,9 +610,7 @@ if ($id)
 
 					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
-				}
-				else
-				{
+				} 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
@@ -652,26 +631,20 @@ if ($id)
 							if ($value == 'element')
 							{
 								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-							}
-							elseif ($value == 'source')
+							} elseif ($value == 'source')
 							{
 								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
-							}
-							elseif ($valuetoshow == 'all') {
+							} elseif ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
-							}
-							elseif ($fieldlist[$field] == 'country') {
+							} elseif ($fieldlist[$field] == 'country') {
 								if (empty($obj->country_code))
 								{
 									$valuetoshow = '-';
-								}
-								else
-								{
+								} 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] == 'country_id') {
+							} elseif ($fieldlist[$field] == 'country_id') {
 								$showfield = 0;
 							}
 
@@ -696,11 +669,11 @@ if ($id)
 					print "</td>";
 
 					// Modify link
-					if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+					if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
 					else print '<td>&nbsp;</td>';
 
 					// Delete link
-					if ($iserasable) print '<td class="center"><a href="'.$url.'action=delete">'.img_delete().'</a></td>';
+					if ($iserasable) print '<td class="center"><a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
 					else print '<td>&nbsp;</td>';
 
 					print "</tr>\n";
@@ -708,8 +681,7 @@ if ($id)
 				$i++;
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -761,8 +733,7 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 			$fieldname = 'country';
 			print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : '')), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'country_id')
+		} elseif ($fieldlist[$field] == 'country_id')
 		{
 			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
@@ -771,8 +742,7 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		}
-		elseif ($fieldlist[$field] == 'type_cdr') {
+		} elseif ($fieldlist[$field] == 'type_cdr') {
 			if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
 			else print '<td>';
 			if ($fieldlist[$field] == 'type_cdr') {
@@ -781,12 +751,9 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 				print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" size="10" name="'.$fieldlist[$field].'"></td>';
-		}
-		else
-		{
+		} else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 708165fc757..29ed90bb7be 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -44,6 +44,8 @@ $cancel = GETPOST('cancel', 'alpha');
 $accountingaccount = GETPOST('accountingaccount', 'alpha');
 
 // Security check
+if ($user->socid > 0) accessforbidden();
+if (!$user->rights->accounting->chartofaccount) accessforbidden();
 
 
 $object = new AccountingAccount($db);
@@ -75,18 +77,14 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
 		{
 			$account_number = GETPOST('account_number', 'string');
-		}
-		else
-		{
+		} else {
 			$account_number = clean_account(GETPOST('account_number', 'string'));
 		}
 
 		if (GETPOST('account_parent', 'int') <= 0)
 		{
 			$account_parent = 0;
-		}
-		else
-		{
+		} else {
 			$account_parent = GETPOST('account_parent', 'int');
 		}
 
@@ -104,13 +102,11 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 			$error = 1;
 			$action = "create";
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		elseif ($res == - 4) {
+		} elseif ($res == - 4) {
 			$error = 2;
 			$action = "create";
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		elseif ($res < 0)
+		} elseif ($res < 0)
 		{
 		    $error++;
 		    setEventMessages($object->error, $object->errors, 'errors');
@@ -140,18 +136,14 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 		if ($conf->global->ACCOUNTING_MANAGE_ZERO == 1)
 		{
 			$account_number = GETPOST('account_number', 'string');
-		}
-		else
-		{
+		} else {
 			$account_number = clean_account(GETPOST('account_number', 'string'));
 		}
 
 		if (GETPOST('account_parent', 'int') <= 0)
 		{
 			$account_parent = 0;
-		}
-		else
-		{
+		} else {
 			$account_parent = GETPOST('account_parent', 'int');
 		}
 
@@ -269,8 +261,7 @@ if ($action == 'create') {
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($id > 0 || $ref) {
+} elseif ($id > 0 || $ref) {
 	$result = $object->fetch($id, $ref, 1);
 
 	if ($result > 0) {
@@ -381,13 +372,13 @@ elseif ($id > 0 || $ref) {
 			print '<div class="tabsAction">';
 
 			if (!empty($user->rights->accounting->chartofaccount)) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=update&id='.$id.'">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=update&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
 			}
 
 			if (!empty($user->rights->accounting->chartofaccount)) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
 			}
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index 909d633c487..f68fbc18905 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -170,9 +170,9 @@ if ($action == 'display' || $action == 'delete') {
 				print '<td>'.length_accountg($cpt->account_number).'</td>';
 				print '<td>'.$cpt->label.'</td>';
 				print '<td class="right">';
-				print "<a href= '".$_SERVER['PHP_SELF']."?action=delete&account_category=".$cat_id."&cptid=".$cpt->rowid."'>";
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&account_category='.$cat_id.'&cptid='.$cpt->rowid.'">';
 				print $langs->trans("DeleteFromCat");
-				print img_picto($langs->trans("DeleteFromCat"), 'unlink');
+				print img_picto($langs->trans("DeleteFromCat"), 'unlink', 'class="paddingleft"');
 				print "</a>";
 				print "</td>";
 				print "</tr>\n";
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index 1b2733e2045..9469a1e64f1 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -235,13 +235,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         {
             setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
         	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        }
-        else
-        {
+        } else {
             if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
                 setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            }
-            else {
+            } else {
                 dol_print_error($db);
             }
         }
@@ -250,8 +247,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
     // Si verif ok et action modify, on modifie la ligne
     if ($ok && GETPOST('actionmodify', 'alpha'))
     {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-        else { $rowidcol = "rowid"; }
+        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
         // Modify entry
         $sql = "UPDATE ".$tabname[$id]." SET ";
@@ -266,8 +262,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
         {
             if ($field == 'fk_country' && $_POST['country'] > 0) {
             	$_POST[$listfieldvalue[$i]] = $_POST['country'];
-            }
-            elseif ($field == 'entity') {
+            } elseif ($field == 'entity') {
             	$_POST[$listfieldvalue[$i]] = $conf->entity;
             }
             if ($i) $sql .= ",";
@@ -276,7 +271,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
             else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
             $i++;
         }
-        $sql .= " WHERE ".$rowidcol." = '".$rowid."'";
+        $sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 
         dol_syslog("actionmodify", LOG_DEBUG);
         //print $sql;
@@ -296,10 +291,9 @@ if (GETPOST('actioncancel', 'alpha'))
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+    $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 
     dol_syslog("delete", LOG_DEBUG);
     $result = $db->query($sql);
@@ -308,9 +302,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
         if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
         {
             setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
@@ -319,13 +311,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+        $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)."'";
     }
 
@@ -339,13 +329,11 @@ if ($action == $acts[0])
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    	$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)."'";
     }
 
@@ -359,13 +347,11 @@ if ($action == $acts[1])
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    	$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)."'";
     }
 
@@ -379,13 +365,11 @@ if ($action == 'activate_favorite')
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
     if ($rowid) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-    }
-    elseif ($code) {
+    	$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)."'";
     }
 
@@ -597,9 +581,7 @@ if ($id)
                     print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
                     print '</td>';
                     $filterfound++;
-                }
-                else
-                {
+                } else {
                     print '<td class="liste_titre"></td>';
                 }
             }
@@ -726,10 +708,8 @@ if ($id)
                     print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
                     print '<td></td>';
-                }
-                else
-                {
-	              	$tmpaction = 'view';
+                } 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
 
@@ -745,35 +725,27 @@ if ($id)
                             if ($value == 'category_type')
                             {
                                 $valuetoshow = yn($valuetoshow);
-                            }
-                            elseif ($valuetoshow == 'all') {
+                            } elseif ($valuetoshow == 'all') {
                                 $valuetoshow = $langs->trans('All');
-                            }
-                            elseif ($fieldlist[$field] == 'country') {
+                            } elseif ($fieldlist[$field] == 'country') {
                                 if (empty($obj->country_code))
                                 {
                                     $valuetoshow = '-';
-                                }
-                                else
-                                {
+                                } 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') {
+                            } 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') {
+                            } 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') {
+                            } 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') {
+                            } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
                                 $showfield = 0;
                             }
 
@@ -799,8 +771,7 @@ if ($id)
                     // Active
                     print '<td class="center" class="nowrap">';
                     if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else
-                 	{
+                    else {
                     	print $langs->trans("AlwaysActive");
                     }
                     print "</td>";
@@ -816,8 +787,7 @@ if ($id)
                         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>';
+                    } else print '<td>&nbsp;</td>';
 
                     // Link to setup the group
                     print '<td class="center">';
@@ -833,8 +803,7 @@ if ($id)
                 $i++;
             }
         }
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 
@@ -882,14 +851,11 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 			{
 				$fieldname = 'country_id';
 				print $form->select_country(GETPOST('country_id', 'int'), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
-			}
-			else
-			{
+			} else {
 				print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : $mysoc->country_code)), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'country_id')
+		} elseif ($fieldlist[$field] == 'country_id')
 		{
 			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
@@ -898,17 +864,13 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		}
-		elseif ($fieldlist[$field] == 'category_type') {
+		} elseif ($fieldlist[$field] == 'category_type') {
 		    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]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		}
-		else
-		{
+		} else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index 63b2131f309..a425fd45768 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -92,7 +92,7 @@ print '<span class="opacitymedium">'.$langs->trans("DefaultClosureDesc").'</span
 print '<br>';
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 
 // Define main accounts for closure
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index ad22a88f415..b9377ce4431 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -47,9 +47,9 @@ $action = GETPOST('action', 'aZ09');
 
 
 $list_account_main = array(
-    'ACCOUNTING_ACCOUNT_CUSTOMER',
-    'ACCOUNTING_ACCOUNT_SUPPLIER',
-    'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
+	'ACCOUNTING_ACCOUNT_CUSTOMER',
+	'ACCOUNTING_ACCOUNT_SUPPLIER',
+	'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
 );
 
 $list_account = array();
@@ -75,7 +75,7 @@ if ($mysoc->isInEEC()) {
 	$list_account[] = 'ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT';
 }
 $list_account[] = 'ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT';
-$list_account[] = '---Other---';
+$list_account[] = '---Others---';
 $list_account[] = 'ACCOUNTING_VAT_BUY_ACCOUNT';
 $list_account[] = 'ACCOUNTING_VAT_SOLD_ACCOUNT';
 $list_account[] = 'ACCOUNTING_VAT_PAY_ACCOUNT';
@@ -94,26 +94,13 @@ if ($conf->loan->enabled) {
 	$list_account[] = 'LOAN_ACCOUNTING_ACCOUNT_INTEREST';
 	$list_account[] = 'LOAN_ACCOUNTING_ACCOUNT_INSURANCE';
 }
+if ($conf->societe->enabled) {
+	$list_account[] = 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT';
+}
 
 /*
  * Actions
  */
-
-$accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE;
-
-if (GETPOST('change_chart', 'alpha'))
-{
-    $chartofaccounts = GETPOST('chartofaccounts', 'int');
-
-    if (!empty($chartofaccounts)) {
-        if (!dolibarr_set_const($db, 'CHARTOFACCOUNTS', $chartofaccounts, 'chaine', 0, '', $conf->entity)) {
-            $error++;
-        }
-    } else {
-        $error++;
-    }
-}
-
 if ($action == 'update') {
 	$error = 0;
 
@@ -133,9 +120,9 @@ if ($action == 'update') {
 
 		$constvalue = GETPOST($constname, 'alpha');
 
-	    if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-	        $error++;
-	    }
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
 	}
 
 	if (!$error) {
@@ -172,20 +159,20 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("ThirdParties").' | '.$langs->trans("Users").'</td><td></td></tr>';
 
 foreach ($list_account_main as $key) {
-    print '<tr class="oddeven value">';
-    // Param
-    $label = $langs->trans($key);
-    $keydesc = $key.'_Desc';
+	print '<tr class="oddeven value">';
+	// Param
+	$label = $langs->trans($key);
+	$keydesc = $key.'_Desc';
 
-    $htmltext = $langs->trans($keydesc);
-    print '<td class="fieldrequired" width="50%">';
-    print $form->textwithpicto($label, $htmltext);
-    print '</td>';
-    // Value
-    print '<td>'; // Do not force class=right, or it align also the content of the select box
-    print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-    print '</td>';
-    print '</tr>';
+	$htmltext = $langs->trans($keydesc);
+	print '<td class="fieldrequired" width="50%">';
+	print $form->textwithpicto($label, $htmltext);
+	print '</td>';
+	// Value
+	print '<td>'; // Do not force class=right, or it align also the content of the select box
+	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print '</td>';
+	print '</tr>';
 }
 
 
@@ -193,8 +180,7 @@ foreach ($list_account as $key) {
 	$reg = array();
 	if (preg_match('/---(.*)---/', $key, $reg)) {
 		print '<tr class="liste_titre"><td>'.$langs->trans($reg[1]).'</td><td></td></tr>';
-	}
-	else {
+	} else {
 		print '<tr class="oddeven value">';
 		// Param
 		$label = $langs->trans($key);
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index b5cc46a3d0d..1ddcddf13e6 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -29,8 +29,8 @@ $action = GETPOST('action', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -79,6 +79,7 @@ $object = new Fiscalyear($db);
 $max = 100;
 
 $form = new Form($db);
+$fiscalyearstatic = new Fiscalyear($db);
 
 $title = $langs->trans('AccountingPeriods');
 $helpurl = "";
@@ -132,13 +133,15 @@ if ($result)
 	print '</tr>';
 
 	if ($num) {
-		$fiscalyearstatic = new Fiscalyear($db);
-
 		while ($i < $num && $i < $max) {
 			$obj = $db->fetch_object($result);
+
 			$fiscalyearstatic->id = $obj->rowid;
+
 			print '<tr class="oddeven">';
-			print '<td><a href="fiscalyear_card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowFiscalYear"), "technic").' '.$obj->rowid.'</a></td>';
+			print '<td>';
+			print $fiscalyearstatic->getNomUrl(1);
+			print '</td>';
 			print '<td class="left">'.$obj->label.'</td>';
 			print '<td class="left">'.dol_print_date($db->jdate($obj->date_start), 'day').'</td>';
 			print '<td class="left">'.dol_print_date($db->jdate($obj->date_end), 'day').'</td>';
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 88890aa004f..a4227a761a4 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -71,9 +71,7 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-}
-
-elseif ($action == 'add') {
+} elseif ($action == 'add') {
 	if (!GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
@@ -302,16 +300,16 @@ if ($action == 'create')
 
 			if (!empty($user->rights->accounting->fiscalyear->write))
 			{
-    			/*
+				/*
     			 * Barre d'actions
     			 */
-    			print '<div class="tabsAction">';
+				print '<div class="tabsAction">';
 
-    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
 
-    			// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
+				// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&token='.newToken().'&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
 
-    			print '</div>';
+				print '</div>';
 			}
 		}
 	} else {
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 006db08fe9c..516af988334 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -31,9 +31,10 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "admin", "accountancy"));
+$langs->loadLangs(array("compta", "bills", "admin", "accountancy", "other"));
 
 // Security access
 if (empty($user->rights->accounting->chartofaccount))
@@ -45,78 +46,95 @@ $action = GETPOST('action', 'aZ09');
 
 // Parameters ACCOUNTING_* and others
 $list = array(
-    'ACCOUNTING_LENGTH_GACCOUNT',
-    'ACCOUNTING_LENGTH_AACCOUNT',
+	'ACCOUNTING_LENGTH_GACCOUNT',
+	'ACCOUNTING_LENGTH_AACCOUNT',
 //    'ACCOUNTING_LENGTH_DESCRIPTION',         // adjust size displayed for lines description for dol_trunc
 //    'ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT', // adjust size displayed for select account description for dol_trunc
 );
 
-
+$list_binding = array(
+	'ACCOUNTING_DATE_START_BINDING',
+	'ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER'
+);
 
 /*
  * Actions
  */
 
-$accounting_mode = empty($conf->global->ACCOUNTING_MODE) ? 'RECETTES-DEPENSES' : $conf->global->ACCOUNTING_MODE;
-
 if ($action == 'update') {
 	$error = 0;
 
 	if (!$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 ($error) {
-	    	setEventMessages($langs->trans("Error"), null, 'errors');
-	    }
+			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		}
+		if ($error) {
+			setEventMessages($langs->trans("Error"), null, 'errors');
+		}
+
+		foreach ($list_binding as $constname)
+		{
+			$constvalue = GETPOST($constname, 'alpha');
+
+			if ($constname == 'ACCOUNTING_DATE_START_BINDING') {
+				$constvalue = dol_mktime(12, 0, 0, GETPOST($constname.'month', 'int'), GETPOST($constname.'day', 'int'), GETPOST($constname.'year', 'int'));
+			}
+
+			if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+		}
+		if ($error) {
+			setEventMessages($langs->trans("Error"), null, 'errors');
+		}
 	}
 
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
 }
 
 if ($action == 'setlistsorttodo') {
-    $setlistsorttodo = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_TODO", $setlistsorttodo, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0)
-        $error++;
+	$setlistsorttodo = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_TODO", $setlistsorttodo, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0)
+		$error++;
 
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'mesgs');
-    }
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
 }
 
 if ($action == 'setlistsortdone') {
-    $setlistsortdone = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_DONE", $setlistsortdone, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0)
-        $error++;
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'mesgs');
-    }
+	$setlistsortdone = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_DONE", $setlistsortdone, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0)
+		$error++;
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
 }
 
 if ($action == 'setmanagezero') {
-    $setmanagezero = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "ACCOUNTING_MANAGE_ZERO", $setmanagezero, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0)
-        $error++;
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'mesgs');
-    }
+	$setmanagezero = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_MANAGE_ZERO", $setmanagezero, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0)
+		$error++;
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
 }
 
 if ($action == 'setdisabledirectinput') {
@@ -144,20 +162,57 @@ if ($action == 'setenabledraftexport') {
 }
 
 if ($action == 'setenablesubsidiarylist') {
-    $setenablesubsidiarylist = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "ACCOUNTANCY_COMBO_FOR_AUX", $setenablesubsidiarylist, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0)
-        $error++;
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'mesgs');
-    }
+	$setenablesubsidiarylist = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTANCY_COMBO_FOR_AUX", $setenablesubsidiarylist, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0)
+		$error++;
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
+}
+
+if ($action == 'setdisablebindingonsales') {
+	$setdisablebindingonsales = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_SALES", $setdisablebindingonsales, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0)
+		$error++;
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
+}
+
+if ($action == 'setdisablebindingonpurchases') {
+	$setdisablebindingonpurchases = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_PURCHASES", $setdisablebindingonpurchases, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0)
+		$error++;
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
+}
+
+if ($action == 'setdisablebindingonexpensereports') {
+	$setdisablebindingonexpensereports = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS", $setdisablebindingonexpensereports, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0)
+		$error++;
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
 }
 
 /*
  * View
  */
+$form = new Form($db);
 
 $title = $langs->trans('ConfigAccountingExpert');
 llxHeader('', $title);
@@ -170,155 +225,187 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 
-// Default mode for calculating turnover (parameter ACCOUNTING_MODE)
-/*
+// Params
 print '<table class="noborder centpercent">';
-
 print '<tr class="liste_titre">';
-print '<td>' . $langs->trans('OptionMode') . '</td><td>' . $langs->trans('Description') . '</td>';
+print '<td colspan="2">'.$langs->trans('Options').'</td>';
 print "</tr>\n";
-print '<tr ' . $bc[false] . '><td width="200"><input type="radio" name="accounting_mode" value="RECETTES-DEPENSES"' . ($accounting_mode != 'CREANCES-DETTES' ? ' checked' : '') . '> ' . $langs->trans('OptionModeTrue') . '</td>';
-print '<td colspan="2">' . nl2br($langs->trans('OptionModeTrueDesc'));
-// Write info on way to count VAT
-// if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
-// {
-// // print "<br>\n";
-// // print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite'));
-// }
-// else
-// {
-// // print "<br>\n";
-// // print nl2br($langs->trans('OptionModeTrueInfoExpert'));
-// }
-print "</td></tr>\n";
-print '<tr ' . $bc[true] . '><td width="200"><input type="radio" name="accounting_mode" value="CREANCES-DETTES"' . ($accounting_mode == 'CREANCES-DETTES' ? ' checked' : '') . '> ' . $langs->trans('OptionModeVirtual') . '</td>';
-print '<td colspan="2">' . nl2br($langs->trans('OptionModeVirtualDesc')) . "</td></tr>\n";
 
-print "</table>\n";
+// TO DO Mutualize code for yes/no constants
 
-
-print '<br>';
+/* Set this option as a hidden option but keep it for some needs.
+print '<tr>';
+print '<td>'.$langs->trans("ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL").'</td>';
+if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&enabledraftexport&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&enabledraftexport&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
 */
 
-// Others params
-
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td colspan="2">'.$langs->trans('OtherOptions').'</td>';
-print "</tr>\n";
-
-if (!empty($user->admin))
-{
-    // TO DO Mutualize code for yes/no constants
-    print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO").'</td>';
-    if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
-        print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlistsorttodo&value=0">';
-        print img_picto($langs->trans("Activated"), 'switch_on');
-        print '</a></td>';
-    } else {
-        print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlistsorttodo&value=1">';
-        print img_picto($langs->trans("Disabled"), 'switch_off');
-        print '</a></td>';
-    }
-    print '</tr>';
-
-    print '<tr>';
-    print '<td>'.$langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE").'</td>';
-    if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
-        print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlistsortdone&value=0">';
-        print img_picto($langs->trans("Activated"), 'switch_on');
-        print '</a></td>';
-    } else {
-        print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setlistsortdone&value=1">';
-        print img_picto($langs->trans("Disabled"), 'switch_off');
-        print '</a></td>';
-    }
-    print '</tr>';
-
-    /* Set this option as a hidden option but keep it for some needs.
-	print '<tr>';
-	print '<td>'.$langs->trans("ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL").'</td>';
-	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL)) {
-		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setenabledraftexport&value=0">';
-		print img_picto($langs->trans("Activated"), 'switch_on');
-		print '</a></td>';
-	} else {
-		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setenabledraftexport&value=1">';
-		print img_picto($langs->trans("Disabled"), 'switch_off');
-		print '</a></td>';
-	}
-	print '</tr>';
-	*/
-
-	print '<tr>';
-	print '<td>'.$langs->trans("BANK_DISABLE_DIRECT_INPUT").'</td>';
-	if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
-		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisabledirectinput&value=0">';
-		print img_picto($langs->trans("Activated"), 'switch_on');
-		print '</a></td>';
-	} else {
-		print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setdisabledirectinput&value=1">';
-		print img_picto($langs->trans("Disabled"), 'switch_off');
-		print '</a></td>';
-	}
-	print '</tr>';
-
-    print '<tr>';
-    print '<td>'.$langs->trans("ACCOUNTANCY_COMBO_FOR_AUX").'</td>';
-    if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-        print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setenablesubsidiarylist&value=0">';
-        print img_picto($langs->trans("Activated"), 'switch_on');
-        print '</a></td>';
-    } else {
-        print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setenablesubsidiarylist&value=1">';
-        print img_picto($langs->trans("Disabled"), 'switch_off');
-        print '</a></td>';
-    }
-    print '</tr>';
-
-    print '<tr>';
-    print '<td>'.$langs->trans("ACCOUNTING_MANAGE_ZERO").'</td>';
-    if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
-        print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setmanagezero&value=0">';
-        print img_picto($langs->trans("Activated"), 'switch_on');
-        print '</a></td>';
-    } else {
-        print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setmanagezero&value=1">';
-        print img_picto($langs->trans("Disabled"), 'switch_off');
-        print '</a></td>';
-    }
-    print '</tr>';
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("BANK_DISABLE_DIRECT_INPUT").'</td>';
+if (!empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disabledirectinput&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disabledirectinput&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
 }
+print '</tr>';
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTANCY_COMBO_FOR_AUX").'</td>';
+if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&enablesubsidiarylist&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&enablesubsidiarylist&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTING_MANAGE_ZERO").'</td>';
+if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&managezero&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&managezero&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
 
 // Param a user $user->rights->accounting->chartofaccount can access
 foreach ($list as $key)
 {
-    print '<tr class="oddeven value">';
+	print '<tr class="oddeven value">';
 
-    if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue;
 
-    // Param
-    $label = $langs->trans($key);
-    print '<td>'.$label.'</td>';
-    // Value
-    print '<td class="right">';
-    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="right">';
+	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
 
-    print '</tr>';
+	print '</td>';
+	print '</tr>';
+}
+print '</table>';
+print '<br>';
+
+// Binding params
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td colspan="2">'.$langs->trans('BindingOptions').'</td>';
+print "</tr>\n";
+
+// TO DO Mutualize code for yes/no constants
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_TODO").'</td>';
+if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsorttodo&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTING_LIST_SORT_VENTILATION_DONE").'</td>';
+if (!empty($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsortdone&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&listsortdone&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
+// Param a user $user->rights->accounting->chartofaccount can access
+foreach ($list_binding as $key)
+{
+	print '<tr class="oddeven value">';
+
+	// Param
+	$label = $langs->trans($key);
+	print '<td>'.$label.'</td>';
+	// Value
+	print '<td class="right">';
+	if ($key == 'ACCOUNTING_DATE_START_BINDING') {
+		print $form->selectDate(($conf->global->$key ? $db->idate($conf->global->$key) : -1), $key, 0, 0, 1);
+	} elseif ($key == 'ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER') {
+		$array = array(0=>$langs->trans("PreviousMonth"), 1=>$langs->trans("CurrentMonth"), 2=>$langs->trans("Fiscalyear"));
+		print $form->selectarray($key, $array, (isset($conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER) ? $conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER : 0));
+	} else {
+		print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	}
+
+	print '</td>';
+	print '</tr>';
 }
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTING_DISABLE_BINDING_ON_SALES").'</td>';
+if (!empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disablebindingonsales&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disablebindingonsales&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTING_DISABLE_BINDING_ON_PURCHASES").'</td>';
+if (!empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disablebindingonpurchases&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disablebindingonpurchases&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS").'</td>';
+if (!empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disablebindingonexpensereports&value=0">';
+	print img_picto($langs->trans("Activated"), 'switch_on');
+	print '</a></td>';
+} else {
+	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&disablebindingonexpensereports&value=1">';
+	print img_picto($langs->trans("Disabled"), 'switch_off');
+	print '</a></td>';
+}
+print '</tr>';
 
 print '</table>';
 
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
-print '<br>';
-print '<br>';
-
-print '<br>';
 print '</form>';
 
 // End of page
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index e34ce8094dd..819160e7d23 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -22,6 +22,8 @@
  * \brief		Setup page to configure journals
  */
 
+if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -238,13 +240,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-		}
-		else
-		{
+		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -253,8 +252,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	// Si verif ok et action modify, on modifie la ligne
 	if ($ok && GETPOST('actionmodify', 'alpha'))
 	{
-		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-		else { $rowidcol = "rowid"; }
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
 		// Modify entry
 		$sql = "UPDATE ".$tabname[$id]." SET ";
@@ -269,8 +267,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		{
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			}
-			elseif ($field == 'entity') {
+			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) $sql .= ",";
@@ -279,7 +276,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
 			$i++;
 		}
-		$sql .= " WHERE ".$rowidcol." = '".$rowid."'";
+		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 		$sql .= " AND entity = ".$conf->entity;
 
 		dol_syslog("actionmodify", LOG_DEBUG);
@@ -300,10 +297,9 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 
 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."='".$rowid."'";
+	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 	$sql .= " AND entity = ".$conf->entity;
 
 	dol_syslog("delete", LOG_DEBUG);
@@ -313,9 +309,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
 		{
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -324,14 +318,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 // 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."='".$rowid."'";
-	}
-	elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".$code."'";
+		$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)."'";
 	}
 	$sql .= " AND entity = ".$conf->entity;
 
@@ -345,14 +337,12 @@ if ($action == $acts[0])
 // 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."='".$rowid."'";
-	}
-	elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".$code."'";
+		$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)."'";
 	}
 	$sql .= " AND entity = ".$conf->entity;
 
@@ -595,9 +585,7 @@ if ($id)
 					print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 					print '</td>';
-				}
-				else
-				{
+				} 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
@@ -614,12 +602,10 @@ if ($id)
 							$valuetoshow = $obj->{$fieldlist[$field]};
 							if ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
-							}
-							elseif ($fieldlist[$field] == 'nature' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
+							} elseif ($fieldlist[$field] == 'nature' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
 								$key = $langs->trans("AccountingJournalType".strtoupper($obj->nature));
 								$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') {
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'accounting_journal') {
 								$valuetoshow = $langs->trans($obj->label);
                             }
 
@@ -652,23 +638,22 @@ if ($id)
 
 					// Active
 					print '<td class="nowrap center">';
-					if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+					if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'&token='.newToken().'">'.$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>';
+					if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
 					else print '<td>&nbsp;</td>';
 
 					// Delete link
 					if ($iserasable)
 					{
 						print '<td class="center">';
-						if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+						if ($user->admin) print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
 						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 						print '</td>';
-					}
-					else print '<td>&nbsp;</td>';
+					} else print '<td>&nbsp;</td>';
 
 					print '<td></td>';
 
@@ -679,8 +664,7 @@ if ($id)
 				$i++;
 			}
 		}
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -724,12 +708,9 @@ function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectarray('nature', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		}
-		else
-		{
+		} else {
 			print '<td>';
 			$size = ''; $class = '';
 			if ($fieldlist[$field] == 'code')  $class = 'maxwidth100';
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index e32e47b169d..d88800016a8 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -57,6 +57,7 @@ $changeaccount_sell = GETPOST('changeaccount_sell', 'array');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_desc = GETPOST('search_desc', 'alpha');
+$search_vat = GETPOST('search_vat', 'alpha');
 $search_current_account = GETPOST('search_current_account', 'alpha');
 $search_current_account_valid = GETPOST('search_current_account_valid', 'alpha');
 if ($search_current_account_valid == '') $search_current_account_valid = 'withoutvalidaccount';
@@ -102,6 +103,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
     $search_ref = '';
     $search_label = '';
     $search_desc = '';
+	$search_vat = '';
     $search_onsell = '';
     $search_onpurchase = '';
     $search_current_account = '';
@@ -136,7 +138,7 @@ if ($action == 'update') {
 		if (!empty($chk_prod)) {
 			$accounting = new AccountingAccount($db);
 
-			//$msg .= '<div><span  class="accountingprocessing">' . count($chk_prod) . ' ' . $langs->trans("SelectedLines") . '</span></div>';
+			//$msg .= '<div><span class="accountingprocessing">' . count($chk_prod) . ' ' . $langs->trans("SelectedLines") . '</span></div>';
 			$arrayofdifferentselectedvalues = array();
 
 			$cpt = 0; $ok = 0; $ko = 0;
@@ -152,7 +154,7 @@ if ($action == 'update') {
 				}
 				if ($result <= 0) {
 					// setEventMessages(null, $accounting->errors, 'errors');
-					$msg .= '<div><font color="red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Product").' '.$productid.' '.$langs->trans("NotVentilatedinAccount").' : id='.$accounting_account_id.'<br/> <pre>'.$sql.'</pre></font></div>';
+					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Product").' '.$productid.' '.$langs->trans("NotVentilatedinAccount").' : id='.$accounting_account_id.'<br/> <pre>'.$sql.'</pre></span></div>';
 					$ko++;
 				} else {
 					$db->begin();
@@ -176,7 +178,7 @@ if ($action == 'update') {
                     if ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
                         $sql .= " SET accountancy_code_sell_export = ".$accounting->account_number;
                     }
-					$sql .= " WHERE rowid = ".$productid;
+					$sql .= " WHERE rowid = ".((int) $productid);
 
 					dol_syslog("/accountancy/admin/productaccount.php sql=".$sql, LOG_DEBUG);
 					if ($db->query($sql))
@@ -243,7 +245,7 @@ $pcgverid = $conf->global->CHARTOFACCOUNTS;
 $pcgvercode = dol_getIdFromCode($db, $pcgverid, 'accounting_system', 'rowid', 'pcg_version');
 if (empty($pcgvercode)) $pcgvercode = $pcgverid;
 
-$sql = "SELECT p.rowid, p.ref, p.label, p.description, p.tosell, p.tobuy,";
+$sql = "SELECT p.rowid, p.ref, p.label, p.description, p.tosell, p.tobuy, p.tva_tx,";
 $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 .= " p.tms, p.fk_product_type as product_type,";
@@ -251,27 +253,21 @@ $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 = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA')
+    $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 = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
+	$sql .= " p.accountancy_code_buy_intra = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
 {
-	$sql .= " p.accountancy_code_buy_export = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL')
+	$sql .= " p.accountancy_code_buy_export = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL')
 {
-    $sql .= " p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA')
+	$sql .= " p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA')
 {
-    $sql .= " p.accountancy_code_sell_intra = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
-}
-else
-{
-    $sql .= " p.accountancy_code_sell_export = aa.account_number AND aa.fk_pcg_version = '".$pcgvercode."'";
+	$sql .= " p.accountancy_code_sell_intra = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
+} else {
+	$sql .= " p.accountancy_code_sell_export = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
 }
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
@@ -290,13 +286,11 @@ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_sell", $search_current_account);
     }
-}
-elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_sell_intra", $search_current_account);
     }
-}
-else {
+} else {
     if (strlen(trim($search_current_account))) {
         $sql .= natural_search("p.accountancy_code_sell_export", $search_current_account);
     }
@@ -319,6 +313,9 @@ if (strlen(trim($search_label))) {
 if (strlen(trim($search_desc))) {
 	$sql .= natural_search("p.description", $search_desc);
 }
+if (strlen(trim($search_vat))) {
+	$sql .= natural_search("p.tva_tx", price2num($search_vat), 1);
+}
 if ($search_onsell != '' && $search_onsell != '-1') $sql .= natural_search('p.tosell', $search_onsell, 1);
 if ($search_onpurchase != '' && $search_onpurchase != '-1') $sql .= natural_search('p.tobuy', $search_onpurchase, 1);
 
@@ -351,6 +348,7 @@ if ($result)
     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);
@@ -419,6 +417,8 @@ if ($result)
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat" size="8" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
+	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" size="5" name="search_vat" placeholder="%" value="'.dol_escape_htmltag($search_vat).'"></td>';
+
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
 	// On sell
 	if ($accounting_product_mode == 'ACCOUNTANCY_SELL' || $accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
@@ -445,7 +445,8 @@ if ($result)
 	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);
-    // On sell / On purchase
+	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";
@@ -492,34 +493,27 @@ if ($result)
 			if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 				$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') {
+			} 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;
-			}
-        	elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+			} 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 {
+        	} else {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_prodsell;
 			}
-		}
-		else {
+		} else {
 			if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell_intra;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell_export;
-			}
-			else {
+			} else {
 				$compta_prodsell = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodsell_id = $aarowid_servsell;
 			}
@@ -530,34 +524,27 @@ if ($result)
 			if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy_intra;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy_export;
-			}
-			else {
+			} else {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_prodbuy;
 			}
-		}
-		else {
+		} else {
 			if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy_intra;
-			}
-			elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+			} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy_export;
-			}
-			else {
+			} else {
 				$compta_prodbuy = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
 				$compta_prodbuy_id = $aarowid_servbuy;
 			}
@@ -575,11 +562,16 @@ if ($result)
 		{
 		    // TODO ADJUST DESCRIPTION SIZE
     		// print '<td class="left">' . $obj->description . '</td>';
-    		// TODO: we shoul set a user defined value to adjust user square / wide screen size
-    		$trunclengh = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
-    		print '<td>'.nl2br(dol_trunc($obj->description, $trunclengh)).'</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
+		print '<td class="right">';
+		print vatrate($obj->tva_tx);
+		print '</td>';
+
 		if ($accounting_product_mode == 'ACCOUNTANCY_SELL' || $accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT')
 			print '<td class="center">'.$product_static->getLibStatut(3, 0).'</td>';
 
@@ -620,21 +612,21 @@ if ($result)
 			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>';
-		}  elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 			// Accounting account buy 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_prodbuy_intra;
+			if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy;
 			$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 '</td>';
-		}  elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 			// Accounting account buy 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_prodbuy_export;
+			if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy;
 			$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
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
new file mode 100644
index 00000000000..4b44bd35149
--- /dev/null
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -0,0 +1,419 @@
+<?php
+/* Copyright (C) 2013-2016 Olivier Geffroy      <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2020 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2018 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file 		htdocs/accountancy/admin/subaccount.php
+ * \ingroup     Accountancy (Double entries)
+ * \brief		List of accounting sub-account (auxiliary accounts)
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("compta", "bills", "admin", "accountancy", "salaries", "hrm", "errors"));
+
+$mesg = '';
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'alpha');
+$id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'int');
+$massaction = GETPOST('massaction', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'accountingsubaccountlist'; // To manage different context of search
+
+$search_subaccount = GETPOST('search_subaccount', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
+$search_type = GETPOST('search_type', 'int');
+
+// Security check
+if ($user->socid > 0) accessforbidden();
+if (!$user->rights->accounting->chartofaccount) accessforbidden();
+
+// Load variable for pagination
+$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');
+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 = "label";
+if (!$sortorder) $sortorder = "ASC";
+
+$arrayfields = array(
+	'subaccount'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
+	'label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1)
+);
+
+if ($conf->global->MAIN_FEATURES_LEVEL < 2) unset($arrayfields['reconcilable']);
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha')) { $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))
+{
+	if (!empty($cancel)) $action = '';
+
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$search_subaccount = "";
+		$search_label = "";
+		$search_type = "";
+		$search_array_options = array();
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans('ChartOfIndividualAccountsOfSubsidiaryLedger');
+
+llxHeader('', $title);
+
+// Customer
+$sql = "SELECT sa.rowid, sa.nom as label, sa.code_compta as subaccount, '0' as type, sa.entity";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe sa";
+$sql .= " WHERE sa.entity IN (".getEntity('societe').")";
+$sql .= " AND sa.code_compta <> ''";
+//print $sql;
+if (strlen(trim($search_subaccount))) {
+	$lengthpaddingaccount = 0;
+	if ($conf->global->ACCOUNTING_LENGTH_AACCOUNT) {
+		$lengthpaddingaccount = max($conf->global->ACCOUNTING_LENGTH_AACCOUNT);
+	}
+	$search_subaccount_tmp = $search_subaccount;
+	$weremovedsomezero = 0;
+	if (strlen($search_subaccount_tmp) <= $lengthpaddingaccount) {
+		for ($i = 0; $i < $lengthpaddingaccount; $i++) {
+			if (preg_match('/0$/', $search_subaccount_tmp)) {
+				$weremovedsomezero++;
+				$search_subaccount_tmp = preg_replace('/0$/', '', $search_subaccount_tmp);
+			}
+		}
+	}
+
+	//var_dump($search_subaccount); exit;
+	if ($search_subaccount_tmp) {
+		if ($weremovedsomezero) {
+			$search_subaccount_tmp_clean = $search_subaccount_tmp;
+			$search_subaccount_clean = $search_subaccount;
+			$startchar = '%';
+			if (strpos($search_subaccount_tmp, '^') === 0)
+			{
+				$startchar = '';
+				$search_subaccount_tmp_clean = preg_replace('/^\^/', '', $search_subaccount_tmp);
+				$search_subaccount_clean = preg_replace('/^\^/', '', $search_subaccount);
+			}
+			$sql .= " AND (sa.code_compta LIKE '".$db->escape($startchar.$search_subaccount_tmp_clean)."'";
+			$sql .= " OR sa.code_compta LIKE '".$db->escape($startchar.$search_subaccount_clean)."%')";
+		} else $sql .= natural_search("sa.code_compta", $search_subaccount_tmp);
+	}
+}
+if (strlen(trim($search_label)))				$sql .= natural_search("sa.nom", $search_label);
+if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+
+// Supplier
+$sql .= " UNION ";
+$sql .= " SELECT sa.rowid, sa.nom as label, sa.code_compta_fournisseur as subaccount, '1' as type, sa.entity FROM ".MAIN_DB_PREFIX."societe sa";
+$sql .= " WHERE sa.entity IN (".getEntity('societe').")";
+$sql .= " AND sa.code_compta_fournisseur <> ''";
+//print $sql;
+if (strlen(trim($search_subaccount))) {
+	$lengthpaddingaccount = 0;
+	if ($conf->global->ACCOUNTING_LENGTH_AACCOUNT) {
+		$lengthpaddingaccount = max($conf->global->ACCOUNTING_LENGTH_AACCOUNT);
+	}
+	$search_subaccount_tmp = $search_subaccount;
+	$weremovedsomezero = 0;
+	if (strlen($search_subaccount_tmp) <= $lengthpaddingaccount) {
+		for ($i = 0; $i < $lengthpaddingaccount; $i++) {
+			if (preg_match('/0$/', $search_subaccount_tmp)) {
+				$weremovedsomezero++;
+				$search_subaccount_tmp = preg_replace('/0$/', '', $search_subaccount_tmp);
+			}
+		}
+	}
+
+	//var_dump($search_subaccount); exit;
+	if ($search_subaccount_tmp) {
+		if ($weremovedsomezero) {
+			$search_subaccount_tmp_clean = $search_subaccount_tmp;
+			$search_subaccount_clean = $search_subaccount;
+			$startchar = '%';
+			if (strpos($search_subaccount_tmp, '^') === 0)
+			{
+				$startchar = '';
+				$search_subaccount_tmp_clean = preg_replace('/^\^/', '', $search_subaccount_tmp);
+				$search_subaccount_clean = preg_replace('/^\^/', '', $search_subaccount);
+			}
+			$sql .= " AND (sa.code_compta_fournisseur LIKE '".$db->escape($startchar.$search_subaccount_tmp_clean)."'";
+			$sql .= " OR sa.code_compta_fournisseur LIKE '".$db->escape($startchar.$search_subaccount_clean)."%')";
+		} else $sql .= natural_search("sa.code_compta_fournisseur", $search_subaccount_tmp);
+	}
+}
+if (strlen(trim($search_label)))				$sql .= natural_search("sa.nom", $search_label);
+if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+
+// User
+$sql .= " UNION ";
+$sql .= " SELECT u.rowid, u.lastname as label, u.accountancy_code as subaccount, '2' as type, u.entity FROM ".MAIN_DB_PREFIX."user u";
+$sql .= " WHERE u.entity IN (".getEntity('user').")";
+$sql .= " AND u.accountancy_code <> ''";
+//print $sql;
+if (strlen(trim($search_subaccount))) {
+	$lengthpaddingaccount = 0;
+	if ($conf->global->ACCOUNTING_LENGTH_AACCOUNT) {
+		$lengthpaddingaccount = max($conf->global->ACCOUNTING_LENGTH_AACCOUNT);
+	}
+	$search_subaccount_tmp = $search_subaccount;
+	$weremovedsomezero = 0;
+	if (strlen($search_subaccount_tmp) <= $lengthpaddingaccount) {
+		for ($i = 0; $i < $lengthpaddingaccount; $i++) {
+			if (preg_match('/0$/', $search_subaccount_tmp)) {
+				$weremovedsomezero++;
+				$search_subaccount_tmp = preg_replace('/0$/', '', $search_subaccount_tmp);
+			}
+		}
+	}
+
+	//var_dump($search_subaccount); exit;
+	if ($search_subaccount_tmp) {
+		if ($weremovedsomezero) {
+			$search_subaccount_tmp_clean = $search_subaccount_tmp;
+			$search_subaccount_clean = $search_subaccount;
+			$startchar = '%';
+			if (strpos($search_subaccount_tmp, '^') === 0)
+			{
+				$startchar = '';
+				$search_subaccount_tmp_clean = preg_replace('/^\^/', '', $search_subaccount_tmp);
+				$search_subaccount_clean = preg_replace('/^\^/', '', $search_subaccount);
+			}
+			$sql .= " AND (u.accountancy_code LIKE '".$db->escape($startchar.$search_subaccount_tmp_clean)."'";
+			$sql .= " OR u.accountancy_code LIKE '".$db->escape($startchar.$search_subaccount_clean)."%')";
+		} else $sql .= natural_search("u.accountancy_code", $search_subaccount_tmp);
+	}
+}
+if (strlen(trim($search_label)))				$sql .= natural_search("u.lastname", $search_label);
+if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+
+$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 resultset is smaller then paging size (filtering), goto and load page 0
+	{
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+dol_syslog('accountancy/admin/subaccount.php:: $sql='.$sql);
+$resql = $db->query($sql);
+
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($search_subaccount) $param .= '&search_subaccount='.urlencode($search_subaccount);
+	if ($search_label) $param .= '&search_label='.urlencode($search_label);
+	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+
+	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.'">';
+
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 0, 0, 1);
+
+	print '<div class="warning">'.$langs->trans("WarningCreateSubAccounts").'</div>';
+
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+
+	$moreforfilter = '';
+	$massactionbutton = '';
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	// Line for search fields
+	print '<tr class="liste_titre_filter">';
+	if (!empty($arrayfields['subaccount']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_subaccount" value="'.$search_subaccount.'"></td>';
+	if (!empty($arrayfields['label']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="'.$search_label.'"></td>';
+	if (!empty($arrayfields['type']['checked']))		print '<td class="liste_titre center">'.$form->selectarray('search_type', array('0'=>$langs->trans('Customer'), '1'=>$langs->trans('Supplier'), '2'=>$langs->trans('Employee')), $search_type, 1).'</td>';
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
+
+	print '<tr class="liste_titre">';
+	if (!empty($arrayfields['subaccount']['checked']))	print_liste_field_titre($arrayfields['subaccount']['label'], $_SERVER["PHP_SELF"], "subaccount", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['label']['checked']))		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], "label", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['type']['checked']))		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'center ');
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['reconcilable']['checked']))	print_liste_field_titre($arrayfields['reconcilable']['label'], $_SERVER["PHP_SELF"], 'reconcilable', '', $param, '', $sortfield, $sortorder, 'center '); }
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	print "</tr>\n";
+
+	$totalarray = array();
+	$i = 0;
+	while ($i < min($num, $limit))
+	{
+		$obj = $db->fetch_object($resql);
+
+		print '<tr class="oddeven">';
+
+		// Account number
+		if (!empty($arrayfields['subaccount']['checked']))
+		{
+			print "<td>";
+			print length_accounta($obj->subaccount);
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Subaccount label
+		if (!empty($arrayfields['label']['checked']))
+		{
+			print "<td>";
+			print $obj->label;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Type
+		if (!empty($arrayfields['type']['checked']))
+		{
+			print '<td class="center">';
+			$s = '';
+			// Customer
+			if ($obj->type == 0)
+			{
+				$s .= '<a class="customer-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->rowid.'">'.$langs->trans("Customer").'</a>';
+			}
+			// Supplier
+			elseif ($obj->type == 1)
+			{
+				$s .= '<a class="vendor-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->rowid.'">'.$langs->trans("Supplier").'</a>';
+			}
+			// User
+			elseif ($obj->type == 2)
+			{
+				$s .= '<a class="user-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->id.'">'.$langs->trans("Employee").'</a>';
+			}
+			print $s;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+			// Activated or not reconciliation on accounting account
+			if (!empty($arrayfields['reconcilable']['checked'])) {
+				print '<td class="center">';
+				if (empty($obj->reconcilable)) {
+					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&mode=1">';
+					print img_picto($langs->trans("Disabled"), 'switch_off');
+					print '</a>';
+				} else {
+					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=disable&mode=1">';
+					print img_picto($langs->trans("Activated"), 'switch_on');
+					print '</a>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+		}
+
+		// Action
+		print '<td class="center">';
+			$e = '';
+			// Customer
+		if ($obj->type == 0)
+			{
+			$e .= '<a class="editfielda" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
+		}
+			// Supplier
+		elseif ($obj->type == 1)
+			{
+			$e .= '<a class="editfielda" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
+		}
+			// User
+		elseif ($obj->type == 2)
+			{
+			$e .= '<a class="editfielda" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
+		}
+			print $e;
+		print '</td>'."\n";
+		if (!$i) $totalarray['nbfield']++;
+
+		print '</tr>'."\n";
+		$i++;
+	}
+
+	$db->free($resql);
+
+	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print "</table>";
+	print "</div>";
+
+	print '</form>';
+} else {
+	dol_print_error($db);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index a9a1f1d12cf..c3e225e5399 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016       Olivier Geffroy         <jeff@jeffinfo.com>
  * Copyright (C) 2016       Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2016-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-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
@@ -31,6 +31,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -45,8 +46,8 @@ $action = GETPOST('action', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -55,7 +56,7 @@ $pagenext = $page + 1;
 //if (! $sortfield) $sortfield="p.date_fin";
 //if (! $sortorder) $sortorder="DESC";
 
-
+$show_subgroup = GETPOST('show_subgroup', 'alpha');
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 $search_date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 
@@ -130,10 +131,11 @@ if (!empty($search_accountancy_code_end)) {
 
 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_accountancy_code_start = '';
-	$search_accountancy_code_end = '';
+	$show_subgroup = '';
 	$search_date_start = '';
 	$search_date_end = '';
+	$search_accountancy_code_start = '';
+	$search_accountancy_code_end = '';
 	$filter = array();
 }
 
@@ -223,6 +225,12 @@ if ($action != 'export_csv')
 	$moreforfilter .= $form->selectDate($search_date_start ? $search_date_start : -1, 'date_start', 0, 0, 1, '', 1, 0);
 	$moreforfilter .= $langs->trans('DateEnd').': ';
 	$moreforfilter .= $form->selectDate($search_date_end ? $search_date_end : -1, 'date_end', 0, 0, 1, '', 1, 0);
+
+	$moreforfilter .= ' - ';
+	$moreforfilter .= $langs->trans('ShowSubtotalByGroup').': ';
+	$moreforfilter .= '<input type="checkbox" name="show_subgroup" value="show_subgroup"'.($show_subgroup == 'show_subgroup' ? ' checked' : '').'>';
+
+
 	$moreforfilter .= '</div>';
 
 	if (!empty($moreforfilter)) {
@@ -237,15 +245,15 @@ if ($action != 'export_csv')
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre" colspan="6">';
+	print '<td class="liste_titre" colspan="5">';
 	print $langs->trans('From');
 	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, '');
 	print ' ';
 	print $langs->trans('to');
 	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
 	print '</td>';
-	print '<td class="liste_titre right">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print '<td class="liste_titre center">';
+	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 
@@ -253,7 +261,6 @@ if ($action != 'export_csv')
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
@@ -267,6 +274,8 @@ if ($action != 'export_csv')
 	$sous_total_credit = 0;
 	$displayed_account = "";
 
+    $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
@@ -283,44 +292,54 @@ 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);
+        }
+
 		$link = '';
 		$total_debit += $line->debit;
 		$total_credit += $line->credit;
-		$description = $object->get_compte_desc($line->numero_compte); // Search description of the account
 		$root_account_description = $object->get_compte_racine($line->numero_compte);
-		if (empty($description)) {
+		if (empty($accountingaccountstatic->account_number)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
 		}
 		print '<tr class="oddeven">';
 
-		// Display the accounting account
-		if (empty($displayed_account) || $root_account_description != $displayed_account)
+		if (!empty($show_subgroup))
 		{
-			// Display a sub-total per account
-			if ($displayed_account != "") {
-				print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
-				print "<td>&nbsp;</td>\n";
+			// Show accounting account
+			if (empty($displayed_account) || $root_account_description != $displayed_account) {
+				// Show subtotal per accounting account
+				if ($displayed_account != "") {
+					print '<tr class="liste_total">';
+					print '<td class="right" colspan="2">'.$langs->trans("SubTotal").':</td>';
+					print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
+					print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
+					print '<td class="nowrap right">'.price(price2num($sous_total_credit - $sous_total_debit)).'</td>';
+					print "<td></td>\n";
+					print '</tr>';
+				}
+
+				// Show first line of a break
+				print '<tr class="trforbreak">';
+				print '<td colspan="6" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
 				print '</tr>';
+
+				$displayed_account = $root_account_description;
+				$sous_total_debit = 0;
+				$sous_total_credit = 0;
 			}
-
-			// Show first line of a break
-			print '<tr class="trforbreak">';
-			print '<td colspan="7" style="font-weight:bold; border-bottom: 1pt solid black;">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
-			print '</tr>';
-
-			$displayed_account = $root_account_description;
-			$sous_total_debit = 0;
-			$sous_total_credit = 0;
 		}
 
 		// $object->get_compte_racine($line->numero_compte);
-
-		print '<td>'.length_accountg($line->numero_compte).'</td>';
-		print '<td>'.$description.'</td>';
+		print '<td>'.$accounting_account.'</td>';
 		print '<td class="nowraponall right">'.price($opening_balances["'".$line->numero_compte."'"]).'</td>';
 		print '<td class="nowraponall right">'.price($line->debit).'</td>';
 		print '<td class="nowraponall right">'.price($line->credit).'</td>';
-		print '<td class="nowraponall right">'.price($line->debit - $line->credit).'</td>';
+		print '<td class="nowraponall right">'.price(price2num($line->debit - $line->credit, 'MT')).'</td>';
 		print '<td class="center">'.$link;
 		print '</td>';
 		print "</tr>\n";
@@ -330,12 +349,15 @@ if ($action != 'export_csv')
 		$sous_total_credit += $line->credit;
 	}
 
-	print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_debit - $sous_total_credit)).'</td>';
-	print "<td>&nbsp;</td>\n";
-	print '</tr>';
+	if (!empty($show_subgroup))
+	{
+		print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("SubTotal").':</td><td class="nowrap right">'.price($sous_total_debit).'</td><td class="nowrap right">'.price($sous_total_credit).'</td><td class="nowrap right">'.price(price2num($sous_total_debit - $sous_total_credit)).'</td>';
+		print "<td></td>\n";
+		print '</tr>';
+	}
 
-	print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("AccountBalance").':</td><td class="nowrap right">'.price($total_debit).'</td><td class="nowrap right">'.price($total_credit).'</td><td class="nowrap right">'.price(price2num($total_debit - $total_credit)).'</td>';
-	print "<td>&nbsp;</td>\n";
+	print '<tr class="liste_total"><td class="right" colspan="2">'.$langs->trans("AccountBalance").':</td><td class="nowrap right">'.price($total_debit).'</td><td class="nowrap right">'.price($total_credit).'</td><td class="nowrap right">'.price(price2num($total_debit - $total_credit)).'</td>';
+	print "<td></td>\n";
 	print '</tr>';
 
 	print "</table>";
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index ba4c7260519..8ca880de25f 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -114,11 +114,13 @@ if ($action == "confirm_update") {
 			$object->credit = $credit;
 
 			if (floatval($debit) != 0.0) {
-				$object->montant = $debit;
+				$object->montant = $debit;	// deprecated
+				$object->amount = $debit;
 				$object->sens = 'D';
 			}
 			if (floatval($credit) != 0.0) {
-				$object->montant = $credit;
+				$object->montant = $credit;	// deprecated
+				$object->amount = $credit;
 				$object->sens = 'C';
 			}
 
@@ -138,9 +140,7 @@ if ($action == "confirm_update") {
 			}
 		}
 	}
-}
-
-elseif ($action == "add") {
+} elseif ($action == "add") {
 	$error = 0;
 
 	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0))
@@ -175,12 +175,14 @@ elseif ($action == "add") {
 		$object->fk_docdet = (int) GETPOST('fk_docdet', 'int');
 
 		if (floatval($debit) != 0.0) {
-			$object->montant = $debit;
+			$object->montant = $debit;	// deprecated
+			$object->amount = $debit;
 			$object->sens = 'D';
 		}
 
 		if (floatval($credit) != 0.0) {
-			$object->montant = $credit;
+			$object->montant = $credit;	// deprecated
+			$object->amount = $credit;
 			$object->sens = 'C';
 		}
 
@@ -199,9 +201,7 @@ elseif ($action == "add") {
 			$action = '';
 		}
 	}
-}
-
-elseif ($action == "confirm_delete") {
+} elseif ($action == "confirm_delete") {
 	$object = new BookKeeping($db);
 
 	$result = $object->fetch($id, null, $mode);
@@ -216,9 +216,7 @@ elseif ($action == "confirm_delete") {
 		}
 	}
 	$action = '';
-}
-
-elseif ($action == "confirm_create") {
+} elseif ($action == "confirm_create") {
 	$error = 0;
 
 	$object = new BookKeeping($db);
@@ -247,7 +245,8 @@ elseif ($action == "confirm_create") {
 		$object->journal_label = $journal_label;
 		$object->fk_doc = 0;
 		$object->fk_docdet = 0;
-		$object->montant = 0;
+		$object->montant = 0;	// deprecated
+		$object->amount = 0;
 
 		$result = $object->createStd($user, 0, $mode);
 		if ($result < 0) {
@@ -293,7 +292,7 @@ if ($action == 'setjournal') {
 }
 
 if ($action == 'setdocref') {
-	$refdoc = trim(GETPOST('doc_ref', 'alpha'));
+	$refdoc = GETPOST('doc_ref', 'alpha');
 	$result = $object->updateByMvt($piece_num, 'doc_ref', $refdoc, $mode);
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -329,7 +328,7 @@ llxHeader('', $langs->trans("CreateMvts"));
 
 // Confirmation to delete the command
 if ($action == 'delete') {
-	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
+	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'confirm_delete', '', 0, 1);
 	print $formconfirm;
 }
 
@@ -628,9 +627,7 @@ if ($action == 'create')
 						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 						{
 							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1);
-						}
-						else
-						{
+						} else {
 							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'">';
 						}
 						print '</td>';
@@ -685,9 +682,7 @@ if ($action == 'create')
 					if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 					{
 						print $formaccounting->select_auxaccount('', 'subledger_account', 1);
-					}
-					else
-					{
+					} else {
 						print '<input type="text" class="maxwidth150" name="subledger_account" value="">';
 					}
 					print '</td>';
@@ -707,9 +702,7 @@ if ($action == 'create')
 					if ($total_debit == $total_credit)
 					{
 						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
 					}
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 2889fbf4ef1..d89d0dca60c 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -91,8 +91,8 @@ $search_not_reconciled = GETPOST('search_reconciled_option', 'alpha');
 
 // 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', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$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;
@@ -108,7 +108,7 @@ $hookmanager->initHooks(array('bookkeepinglist'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !isset($_POST['begin']) && !isset($_GET['begin']) && !isset($_POST['formfilteraction']) && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export)
+if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !isset($_POST['formfilteraction']) && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export)
 {
 	if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values'))
 	{
@@ -351,18 +351,14 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
 		header("Location: list.php".($param ? '?'.$param : ''));
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
 	}
 }
@@ -373,9 +369,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
@@ -418,7 +412,7 @@ $sql .= " t.label_operation,";
 $sql .= " t.debit,";
 $sql .= " t.credit,";
 $sql .= " t.lettering_code,";
-$sql .= " t.montant,";
+$sql .= " t.montant as amount,";
 $sql .= " t.sens,";
 $sql .= " t.fk_user_author,";
 $sql .= " t.import_key,";
@@ -480,9 +474,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 	if ($result < 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
-	}
-	else
-	{
+	} else {
 	    // Export files
 		$accountancyexport = new AccountancyExport($db);
 		$accountancyexport->export($object->lines, $formatexportset);
@@ -490,9 +482,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
         if (!empty($accountancyexport->errors))
         {
             setEventMessages('', $accountancyexport->errors, 'errors');
-        }
-        else
-        {
+        } else {
             // Specify as export : update field date_export
             $error = 0;
             $db->begin();
@@ -521,9 +511,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
             {
             	$db->commit();
             	// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
-            }
-            else
-            {
+            } else {
             	$error++;
             	$db->rollback();
             	setEventMessages($langs->trans("NotAllExportedMovementsCouldBeRecordedAsExported"), null, 'errors');
@@ -541,7 +529,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 
-$title_page = $langs->trans("Bookkeeping");
+$title_page = $langs->trans("Operations").' - '.$langs->trans("Journals");
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -559,9 +547,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -622,41 +608,43 @@ if ($action == 'delbookkeepingyear') {
 			'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
 	print $formconfirm;
 }
 
 //$param='';	param started before
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.urlencode($optioncss).'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="sortfield" value="'.urlencode($sortfield).'">';
+print '<input type="hidden" name="sortorder" value="'.urlencode($sortorder).'">';
 
 if (count($filter)) $buttonLabel = $langs->trans("ExportFilteredList");
 else $buttonLabel = $langs->trans("ExportList");
 
 // Button re-export
 if (!empty($conf->global->ACCOUNTING_REEXPORT)) {
-    $newcardbutton = '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?action=setreexport&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&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>';
 
 $newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export);
 
-$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param);
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param, '', 1, array('morecss'=>'marginleftonly btnTitleSelected'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss'=>'marginleftonly'));
 
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', './card.php?action=create', '', $user->rights->accounting->mouvements->creer);
+$url = './card.php?action=create';
+if (!empty($socid)) $url .= '&socid='.$socid;
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->rights->accounting->mouvements->creer);
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -682,12 +670,10 @@ if (!empty($arrayfields['t.doc_date']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -715,29 +701,25 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
+		print $langs->trans('From').' ';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-	}
-	else
-	{
-		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
+	} else {
+		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'" placeholder="'.$langs->trans("From").'">';
 	}
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
+		print $langs->trans('to').' ';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
-	}
-	else
-	{
-		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
+	} else {
+		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'" placeholder="'.$langs->trans("to").'">';
 	}
 	print '</div>';
 	print '</td>';
@@ -787,12 +769,10 @@ if (!empty($arrayfields['t.date_creation']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_creation_start, 'date_creation_start', 0, 0, 1);
+	print $form->selectDate($search_date_creation_start, 'date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_creation_end, 'date_creation_end', 0, 0, 1);
+	print $form->selectDate($search_date_creation_end, 'date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -801,12 +781,10 @@ if (!empty($arrayfields['t.tms']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_modification_start, 'date_modification_start', 0, 0, 1);
+	print $form->selectDate($search_date_modification_start, 'date_modification_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_modification_end, 'date_modification_end', 0, 0, 1);
+	print $form->selectDate($search_date_modification_end, 'date_modification_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '</td>';
 }
@@ -815,12 +793,10 @@ if (!empty($arrayfields['t.date_export']['checked']))
 {
     print '<td class="liste_titre center">';
     print '<div class="nowrap">';
-    print $langs->trans('From').' ';
-    print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1);
+    print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
     print '</div>';
     print '<div class="nowrap">';
-    print $langs->trans('to').' ';
-    print $form->selectDate($search_date_export_end, 'date_export_end', 0, 0, 1);
+    print $form->selectDate($search_date_export_end, 'date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
     print '</div>';
     print '</td>';
 }
@@ -878,7 +854,8 @@ while ($i < min($num, $limit))
 	$line->label_operation = $obj->label_operation;
 	$line->debit = $obj->debit;
 	$line->credit = $obj->credit;
-	$line->montant = $obj->montant;
+	$line->montant = $obj->amount;	// deprecated
+	$line->amount = $obj->amount;
 	$line->sens = $obj->sens;
 	$line->lettering_code = $obj->lettering_code;
 	$line->fk_user_author = $obj->fk_user_author;
@@ -929,8 +906,7 @@ while ($i < min($num, $limit))
             $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')
+        } elseif ($line->doc_type == 'supplier_invoice')
         {
             $langs->loadLangs(array('bills'));
 
@@ -943,8 +919,7 @@ while ($i < min($num, $limit))
             $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')
+        } elseif ($line->doc_type == 'expense_report')
         {
             $langs->loadLangs(array('trips'));
 
@@ -957,9 +932,7 @@ while ($i < min($num, $limit))
             $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
-        {
+        } else {
             // Other type
         }
 
@@ -1068,10 +1041,10 @@ while ($i < min($num, $limit))
 	print '<td class="nowraponall center">';
 	if (empty($line->date_export)) {
 		if ($user->rights->accounting->mouvements->creer) {
-			print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+			print '<a class="editfielda paddingleft marginrightonly" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
 		}
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
 		}
 	}
 	print '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 5a1056f8d50..4ed055be0b1 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("accountancy"));
 
-$action = GETPOST('action', 'alpha');
+$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'));
@@ -54,6 +54,7 @@ if ($search_accountancy_code_end == - 1) {
 }
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
+$search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 $search_debit = GETPOST('search_debit', 'alpha');
@@ -67,8 +68,8 @@ if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_
 
 // 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', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$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;
@@ -79,12 +80,13 @@ 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('bookkeepingbyaccountlist'));
 
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (empty($search_date_start) && empty($search_date_end) && GETPOSTISSET('search_date_startday') && GETPOSTISSET('search_date_startmonth') && GETPOSTISSET('search_date_starthour')) {
+if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('search_date_startday') && !GETPOSTISSET('search_date_startmonth') && !GETPOSTISSET('search_date_starthour')) {
 	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
 	$sql .= $db->plimit(1);
@@ -147,6 +149,7 @@ if (empty($reshook))
 		$search_label_account = '';
 		$search_doc_ref = '';
 		$search_label_operation = '';
+		$search_mvt_num = '';
 		$search_direction = '';
 		$search_ledger_code = '';
 		$search_date_start = '';
@@ -191,6 +194,10 @@ if (empty($reshook))
 		$filter['t.label_compte'] = $search_label_account;
 		$param .= '&search_label_compte=' . urlencode($search_label_account);
 	}
+	if (!empty($search_mvt_num)) {
+		$filter['t.piece_num'] = $search_mvt_num;
+		$param .= '&search_mvt_num=' . urlencode($search_mvt_num);
+	}
 	if (!empty($search_doc_ref)) {
 		$filter['t.doc_ref'] = $search_doc_ref;
 		$param .= '&search_doc_ref=' . urlencode($search_doc_ref);
@@ -255,18 +262,14 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 
 		// Make a redirect to avoid to launch the delete later after a back button
 		header("Location: listbyaccount.php".($param ? '?'.$param : ''));
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages("NoRecordDeleted", null, 'warnings');
 	}
 }
@@ -277,9 +280,7 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
 
@@ -298,7 +299,7 @@ $formfile = new FormFile($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
-$title_page = $langs->trans("Bookkeeping").' '.strtolower($langs->trans("By")).' '.strtolower($langs->trans("AccountAccounting"));
+$title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccounting").' ('.$langs->trans("Bookkeeping").')';
 
 llxHeader('', $title_page);
 
@@ -362,7 +363,7 @@ if ($action == 'delbookkeepingyear') {
 		'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
 	print $formconfirm;
 }
 
@@ -374,16 +375,19 @@ if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$opt
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
 
 
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
+$newcardbutton .= dolGetButtonTitle($langs->trans('VueByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss'=>'marginleftonly btnTitleSelected'));
+
+$newcardbutton .= ' &nbsp; ';
+
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', './card.php?action=create');
 
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -398,10 +402,10 @@ $moreforfilter = '';
 // Accountancy account
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('AccountAccounting').': ';
-$moreforfilter .= '<div class="nowrap">';
+$moreforfilter .= '<div class="nowrap inline-block">';
 $moreforfilter .= $langs->trans('From').' ';
 $moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, 'maxwidth200');
-$moreforfilter .= $langs->trans('to').' ';
+$moreforfilter .= ' '.$langs->trans('to').' ';
 $moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
 $moreforfilter .= '</div>';
 $moreforfilter .= '</div>';
@@ -429,12 +433,10 @@ if (!empty($arrayfields['t.code_journal']['checked'])) {
 if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From') . ': ';
-	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1);
+	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to') . ': ';
-	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1);
+	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -539,9 +541,7 @@ while ($i < min($num, $limit))
 				print price($sous_total_debit - $sous_total_credit);
 				print '</td>';
 				print '<td></td>';
-			}
-			else
-			{
+			} else {
 				print '<td></td>';
 				print '<td class="nowraponall right">';
 				print price($sous_total_credit - $sous_total_debit);
@@ -613,8 +613,7 @@ while ($i < min($num, $limit))
 			$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')
+		} elseif ($line->doc_type == 'supplier_invoice')
 		{
 			$langs->loadLangs(array('bills'));
 
@@ -627,8 +626,7 @@ while ($i < min($num, $limit))
 			$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')
+		} elseif ($line->doc_type == 'expense_report')
 		{
 			$langs->loadLangs(array('trips'));
 
@@ -641,9 +639,7 @@ while ($i < min($num, $limit))
 			$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
-		{
+		} else {
 			// Other type
 		}
 
@@ -707,10 +703,10 @@ while ($i < min($num, $limit))
 	print '<td class="nowraponall center">';
 	if (empty($line->date_export)) {
 		if ($user->rights->accounting->mouvements->creer) {
-			print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
 		}
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print ' &nbsp; <a class="paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
 		}
 	}
 	print '</td>';
@@ -744,9 +740,7 @@ if ($balance > 0 )
 	print price($sous_total_debit - $sous_total_credit);
 	print '</td>';
 	print '<td></td>';
-}
-else
-{
+} else {
 	print '<td></td>';
 	print '<td class="nowraponall right">';
 	print price($sous_total_credit - $sous_total_debit);
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 0b3d98a2742..321ef282dff 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -147,7 +147,7 @@ $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, ";
 $sql .= " bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering_code ";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account =  '".$object->code_compta."' AND bk.numero_compte = '".$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER."' )";
+$sql .= " WHERE (bk.subledger_account =  '".$db->escape($object->code_compta)."' AND bk.numero_compte = '".$db->escape($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)."' )";
 
 /*
 if (dol_strlen($search_date_start) || dol_strlen($search_date_end)) {
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index c6ab2fa81d6..144c2595d25 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -146,7 +146,7 @@ $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, ";
 $sql .= " bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering_code, bk.date_validated ";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account =  '".$object->code_compta_fournisseur."' AND bk.numero_compte = '".$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER."' )";
+$sql .= " WHERE (bk.subledger_account =  '".$db->escape($object->code_compta_fournisseur)."' AND bk.numero_compte = '".$db->escape($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)."' )";
 if (dol_strlen($search_date_start) || dol_strlen($search_date_end)) {
 	$sql .= " AND (bk.doc_date BETWEEN '".$db->idate($search_date_start)."' AND  '".$db->idate($search_date_end)."' )";
 }
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index cc93232dcdc..c7f7f8cf68c 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -209,9 +209,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -241,8 +239,7 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as t";
 		if ($id)   $sql .= " WHERE t.rowid = ".$id;
-		else
-		{
+		else {
 			$sql .= " WHERE t.entity IN (".getEntity('c_accounting_category').")"; // Dont't use entity if you use rowid
 			if ($code) $sql .= " AND t.code = '".$this->db->escape($code)."'";
 			elseif ($label) $sql .= " AND t.label = '".$this->db->escape($label)."'";
@@ -270,9 +267,7 @@ class AccountancyCategory // extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -335,9 +330,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -375,9 +368,7 @@ class AccountancyCategory // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -709,9 +700,7 @@ class AccountancyCategory // extends CommonObject
 				$listofaccount .= "'".$cptcursor."'";
 			}
 			$sql .= " AND t.numero_compte IN (".$listofaccount.")";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND t.numero_compte = '".$this->db->escape($cpt)."'";
 		}
 		if (!empty($date_start) && !empty($date_end) && (empty($month) || empty($year)))	// If month/year provided, it is stronger than filter date_start/date_end
@@ -833,9 +822,7 @@ class AccountancyCategory // extends CommonObject
 			$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
 			$sql .= " AND t.entity = ".$conf->entity;
 			$sql .= " ORDER BY t.account_number";
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
 			$sql .= " WHERE ".$predefinedgroupwhere;
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 9c23ccbf781..0204602438f 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -362,7 +362,7 @@ class AccountancyExport
 			if ($line->sens == 'D') {
 				print price($line->montant).$separator;
 				print ''.$separator;
-			}elseif ($line->sens == 'C') {
+			} elseif ($line->sens == 'C') {
 				print ''.$separator;
 				print price($line->montant).$separator;
 			}
@@ -518,11 +518,12 @@ class AccountancyExport
 			$Tab['contrepartie'] = str_repeat(' ', 8);
 
 			// elarifr:  date format must be fixed format : 6 char ddmmyy = %d%m%yand not defined by user / dolibarr setting
-			if (!empty($data->date_echeance))
+			if (!empty($data->date_echeance)) {
 				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
 				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%y'); // elarifr:  format must be ddmmyy
-			else
+			} else {
 				$Tab['date_echeance'] = '000000';
+			}
 
 			//elarifr please keep quadra named field lettrage(2) + codestat(3) instead of fake lettrage(5)
 			//$Tab['lettrage'] = str_repeat(' ', 5);
@@ -597,12 +598,11 @@ class AccountancyExport
 
 			$Tab['num_compte'] = str_pad(self::trunc($code_compta, 6), 6, '0');
 
-			if($data->sens == 'D'){
+			if ($data->sens == 'D') {
 				$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{
+			} else {
 				$Tab['montant_debit']  = str_pad(number_format(0, 2, ',', ''), 13, ' ', STR_PAD_LEFT);
 
 				$Tab['montant_crebit'] = str_pad(number_format(abs($data->montant), 2, ',', ''), 13, ' ', STR_PAD_LEFT);
@@ -616,11 +616,12 @@ class AccountancyExport
 
 			$Tab['code_stat'] = str_repeat(' ', 4);
 
-			if (!empty($data->date_echeance))
+			if (!empty($data->date_echeance)) {
 				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
 				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%Y');
-			else
+			} else {
 				$Tab['date_echeance'] = dol_print_date($data->doc_date, '%d%m%Y');
+			}
 
 			$Tab['monnaie'] = '1';
 
@@ -897,12 +898,10 @@ class AccountancyExport
             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)
+            } elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
             {
                 $sammelBuchung = true;
-            }
-            elseif ($aIndex + 1 < $aSize
+            } elseif ($aIndex + 1 < $aSize
                     && $objectLines[$aIndex + 1]->piece_num == $line->piece_num
                     && $aIndex - 1 < $aSize
                     && $objectLines[$aIndex - 1]->piece_num == $line->piece_num
@@ -924,9 +923,7 @@ class AccountancyExport
             if ($line->sens == 'D')
             {
                 print 'S'.$this->separator;
-            }
-            else
-            {
+            } else {
                 print 'H'.$this->separator;
             }
             //Grp
@@ -937,14 +934,10 @@ class AccountancyExport
                 if ($line->piece_num == $thisPieceNum)
                 {
                     print length_accounta($thisPieceAccountNr).$this->separator;
-                }
-                else
-                {
+                } else {
                     print "div".$this->separator;
                 }
-            }
-            else
-            {
+            } else {
                 print length_accounta($line->code_tiers).$this->separator;
             }
             //SId
@@ -960,9 +953,7 @@ class AccountancyExport
             if ($sammelBuchung)
             {
                 print "2".$this->separator;
-            }
-            else
-            {
+            } else {
                 print "1".$this->separator;
             }
             // Code
@@ -971,9 +962,7 @@ class AccountancyExport
             if ($line->montant >= 0)
             {
                 print $line->montant.$this->separator;
-            }
-            else
-            {
+            } else {
                 print ($line->montant * -1).$this->separator;
             }
             // Steuer
@@ -1171,7 +1160,8 @@ class AccountancyExport
 			// TYPE C
 			if ($last_codeinvoice != $line->doc_ref) {
 				//recherche societe en fonction de son code client
-				$sql = "SELECT code_client, fk_forme_juridique, nom, address, zip, town, fk_pays, phone, siret FROM ".MAIN_DB_PREFIX."societe WHERE code_client = '".$line->thirdparty_code."'";
+				$sql = "SELECT code_client, fk_forme_juridique, nom, address, zip, town, fk_pays, phone, siret FROM ".MAIN_DB_PREFIX."societe";
+				$sql .= " WHERE code_client = '".$this->db->escape($line->thirdparty_code)."'";
 				$resql = $this->db->query($sql);
 
 				if ($resql && $this->db->num_rows($resql) > 0)
@@ -1458,7 +1448,9 @@ class AccountancyExport
 			print self::trunc($line->code_journal, 6).$separator; //Journal code
 
 			if (!empty($line->subledger_account)) $account = $line->subledger_account;
-			else  $account = $line->numero_compte;
+			else {
+				$account = $line->numero_compte;
+			}
 			print self::trunc($account, 15).$separator; //Account number
 
 			print self::trunc($line->label_compte, 60).$separator; //Account label
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index 719d33c8574..c2f3468016c 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -101,7 +101,7 @@ class AccountancySystem
 	        $sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
 	        $sql .= " WHERE";
 	        if ($rowid) {
-	            $sql .= " a.rowid = '".$rowid."'";
+	            $sql .= " a.rowid = ".((int) $rowid);
 	        } elseif ($ref) {
 	            $sql .= " a.pcg_version = '".$this->db->escape($ref)."'";
 	        }
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 27d4fd115ea..199899f89d5 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -448,9 +448,10 @@ class AccountingAccount extends CommonObject
 	 * @param	int  	$notooltip					1=Disable tooltip
      * @param	int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 * @param	int     $withcompletelabel		    0=Short label (field short label), 1=Complete label (field label)
+	 * @param	string	$option						'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)
+    public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
 	{
 		global $langs, $conf, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -459,7 +460,16 @@ class AccountingAccount extends CommonObject
 
 		$result = '';
 
-		$url = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$this->id;
+		if (empty($option) || $option == 'ledger') {
+			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
+			$labelurl = $langs->trans("ShowAccountingAccountInLedger");
+		} elseif ($option == 'journals') {
+			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
+			$labelurl = $langs->trans("ShowAccountingAccountInJournals");
+		} elseif ($option == 'accountcard') {
+			$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
+			$labelurl = $langs->trans("ShowAccountingAccount");
+		}
 
 		// Add param to save lastsearch_values or not
 		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
@@ -476,7 +486,7 @@ class AccountingAccount extends CommonObject
 			$labeltoshow = $this->labelshort;
 		}
 
-		$label = '<u>'.$langs->trans("ShowAccountingAccount").'</u>';
+		$label = '<u>'.$labelurl.'</u>';
 		if (!empty($this->account_number))
 			$label .= '<br><b>'.$langs->trans('AccountAccounting').':</b> '.length_accountg($this->account_number);
 		if (!empty($labeltoshow))
@@ -488,7 +498,7 @@ class AccountingAccount extends CommonObject
 		{
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 			{
-				$label = $langs->trans("ShowAccountingAccount");
+				$label = $labelurl;
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
@@ -609,8 +619,7 @@ class AccountingAccount extends CommonObject
         if ($mode == 0)
         {
             $fieldtouse = 'active';
-        }
-        elseif ($mode == 1)
+        } elseif ($mode == 1)
         {
             $fieldtouse = 'reconcilable';
         }
@@ -661,28 +670,23 @@ class AccountingAccount extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 727e68346fa..882eee71769 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -108,9 +108,8 @@ class AccountingJournal extends CommonObject
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE";
 			if ($rowid) {
-				$sql .= " rowid = ".(int) $rowid;
-			}
-			elseif ($journal_code)
+				$sql .= " rowid = ".((int) $rowid);
+			} elseif ($journal_code)
 			{
 				$sql .= " code = '".$this->db->escape($journal_code)."'";
 				$sql .= " AND entity  = ".$conf->entity;
@@ -136,9 +135,7 @@ class AccountingJournal extends CommonObject
 				} else {
 					return 0;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = "Error ".$this->db->lasterror();
 				$this->errors[] = "Error ".$this->db->lasterror();
 			}
@@ -311,8 +308,7 @@ class AccountingJournal extends CommonObject
 			elseif ($nature == 3) return $langs->trans('AccountingJournalType3');
 			elseif ($nature == 2) return $langs->trans('AccountingJournalType2');
 			elseif ($nature == 1) return $langs->trans('AccountingJournalType1');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($nature == 9) return $langs->trans('AccountingJournalType9');
 			elseif ($nature == 5) return $langs->trans('AccountingJournalType5');
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index a700ebecb1b..f5f4bf80221 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2014-2017  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2015-2017  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2017  Florian Henry       <florian.henry@open-concept.pro>
- * 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
@@ -57,109 +57,115 @@ class BookKeeping extends CommonObject
 	 */
 	public $id;
 
-    /**
-     * @var string Date of source document, in db date NOT NULL
-     */
+	/**
+	 * @var string Date of source document, in db date NOT NULL
+	 */
 	public $doc_date;
 
-    /**
-     * @var int Deadline for payment
-     */
+	/**
+	 * @var int Deadline for payment
+	 */
 	public $date_lim_reglement;
 
-    /**
-     * @var string doc_type
-     */
-    public $doc_type;
+	/**
+	 * @var string doc_type
+	 */
+	public $doc_type;
 
-    /**
-     * @var string doc_ref
-     */
+	/**
+	 * @var string doc_ref
+	 */
 	public $doc_ref;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_doc;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_docdet;
 
-    /**
-     * @var string thirdparty code
-     */
-    public $thirdparty_code;
+	/**
+	 * @var string thirdparty code
+	 */
+	public $thirdparty_code;
 
-    /**
-     * @var string subledger account
-     */
+	/**
+	 * @var string subledger account
+	 */
 	public $subledger_account;
 
-    /**
-     * @var string subledger label
-     */
+	/**
+	 * @var string subledger label
+	 */
 	public $subledger_label;
 
-    /**
-     * @var string  doc_type
-     */
+	/**
+	 * @var string  doc_type
+	 */
 	public $numero_compte;
 
-    /**
-     * @var string label compte
-     */
-    public $label_compte;
+	/**
+	 * @var string label compte
+	 */
+	public $label_compte;
 
-    /**
-     * @var string label operation
-     */
-    public $label_operation;
+	/**
+	 * @var string label operation
+	 */
+	public $label_operation;
 
-    /**
-     * @var float FEC:Debit
-     */
+	/**
+	 * @var float FEC:Debit
+	 */
 	public $debit;
 
-    /**
-     * @var float FEC:Credit
-     */
+	/**
+	 * @var float FEC:Credit
+	 */
 	public $credit;
 
-    /**
-     * @var float FEC:Amount (Not necessary)
-     */
+	/**
+	 * @var float FEC:Amount (Not necessary)
+	 * @deprecated Use $amount
+	 */
 	public $montant;
 
-    /**
-     * @var string FEC:Sens (Not necessary)
-     */
+	/**
+	 * @var float FEC:Amount (Not necessary)
+	 */
+	public $amount;
+
+	/**
+	 * @var string FEC:Sens (Not necessary)
+	 */
 	public $sens;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
-    /**
-     * @var string key for import
-     */
+	/**
+	 * @var string key for import
+	 */
 	public $import_key;
 
-    /**
-     * @var string code journal
-     */
+	/**
+	 * @var string code journal
+	 */
 	public $code_journal;
 
-    /**
-     * @var string label journal
-     */
+	/**
+	 * @var string label journal
+	 */
 	public $journal_label;
 
-    /**
-     * @var int accounting transaction id
-     */
+	/**
+	 * @var int accounting transaction id
+	 */
 	public $piece_num;
 
 	/**
@@ -173,8 +179,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param DoliDb $db Database handler
 	 */
-    public function __construct(DoliDB $db)
-    {
+	public function __construct(DoliDB $db)
+	{
 		$this->db = $db;
 	}
 
@@ -185,8 +191,8 @@ class BookKeeping extends CommonObject
 	 * @param  bool	$notrigger	false=launch triggers after, true=disable triggers
 	 * @return int				<0 if KO, Id of created object if OK
 	 */
-    public function create(User $user, $notrigger = false)
-    {
+	public function create(User $user, $notrigger = false)
+	{
 		global $conf, $langs;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -258,9 +264,7 @@ class BookKeeping extends CommonObject
 			if (in_array($this->doc_type, array('bank', 'expense_report')))
 			{
 				$this->errors[] = $langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet, $this->doc_type);
-			}
-			else
-			{
+			} else {
 				//$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
 				$mesg = $this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
 				if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
@@ -477,8 +481,7 @@ class BookKeeping extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -501,11 +504,11 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode 	   Mode
 	 * @return int				 <0 if KO, Id of created object if OK
 	 */
-    public function createStd(User $user, $notrigger = false, $mode = '')
-    {
+	public function createStd(User $user, $notrigger = false, $mode = '')
+	{
 		global $conf, $langs;
 
-        $langs->loadLangs(array("accountancy", "bills", "compta"));
+		$langs->loadLangs(array("accountancy", "bills", "compta"));
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -575,7 +578,7 @@ class BookKeeping extends CommonObject
 		$now = dol_now();
 
 		// Check parameters
-        $this->journal_label = $langs->trans($this->journal_label);
+		$this->journal_label = $langs->trans($this->journal_label);
 
 		// Insert request
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.$mode.' (';
@@ -670,8 +673,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function fetch($id, $ref = null, $mode = '')
-    {
+	public function fetch($id, $ref = null, $mode = '')
+	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -768,8 +771,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return int <0 if KO, >=0 if OK
 	 */
-    public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-    {
+	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -901,11 +904,11 @@ class BookKeeping extends CommonObject
 	 * @param int 			$offset                         Offset limit
 	 * @param array 		$filter                         Filter array
 	 * @param string 		$filtermode                     Filter mode (AND or OR)
-     * @param int           $showAlreadyExportMovements     Show movements when field 'date_export' is not empty (0:No / 1:Yes (Default))
+	 * @param int           $showAlreadyExportMovements     Show movements when field 'date_export' is not empty (0:No / 1:Yes (Default))
 	 * @return int                                          <0 if KO, >0 if OK
 	 */
-    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $showAlreadyExportMovements = 1)
-    {
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $showAlreadyExportMovements = 1)
+	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -937,7 +940,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.date_creation,";
 		$sql .= " t.date_lim_reglement,";
 		$sql .= " t.tms as date_modification,";
-        $sql .= " t.date_export";
+		$sql .= " t.date_export";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
 		$sqlwhere = array();
@@ -957,8 +960,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-                } elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
-                    $sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
 				} else {
@@ -967,9 +970,9 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('accountancy').')';
-        if ($showAlreadyExportMovements == 0) {
-            $sql .= " AND t.date_export IS NULL";
-        }
+		if ($showAlreadyExportMovements == 0) {
+			$sql .= " AND t.date_export IS NULL";
+		}
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
@@ -1017,7 +1020,7 @@ class BookKeeping extends CommonObject
 				$line->date_creation = $this->db->jdate($obj->date_creation);
 				$line->date_lim_reglement = $this->db->jdate($obj->date_lim_reglement);
 				$line->date_modification = $this->db->jdate($obj->date_modification);
-                $line->date_export = $this->db->jdate($obj->date_export);
+				$line->date_export = $this->db->jdate($obj->date_export);
 
 				$this->lines[] = $line;
 
@@ -1130,8 +1133,8 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode       Mode ('' or _tmp')
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = false, $mode = '')
-    {
+	public function update(User $user, $notrigger = false, $mode = '')
+	{
 		$error = 0;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -1297,8 +1300,8 @@ class BookKeeping extends CommonObject
 	 * @param string $mode Mode
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function delete(User $user, $notrigger = false, $mode = '')
-    {
+	public function delete(User $user, $notrigger = false, $mode = '')
+	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -1345,8 +1348,8 @@ class BookKeeping extends CommonObject
 	 * @param  string		$importkey		Import key
 	 * @return int Result
 	 */
-    public function deleteByImportkey($importkey)
-    {
+	public function deleteByImportkey($importkey)
+	{
 		$this->db->begin();
 
 		// first check if line not yet in bookkeeping
@@ -1376,11 +1379,11 @@ class BookKeeping extends CommonObject
 	 * @param  int	  $delmonth     Month
 	 * @return int					<0 if KO, >0 if OK
 	 */
-    public function deleteByYearAndJournal($delyear = 0, $journal = '', $mode = '', $delmonth = 0)
-    {
-    	global $langs;
+	public function deleteByYearAndJournal($delyear = 0, $journal = '', $mode = '', $delmonth = 0)
+	{
+		global $langs;
 
-    	if (empty($delyear) && empty($journal))
+		if (empty($delyear) && empty($journal))
 		{
 			$this->error = 'ErrorOneFieldRequired';
 			return -1;
@@ -1425,8 +1428,8 @@ class BookKeeping extends CommonObject
 	 * @param 	int 	$piecenum 	Piecenum to delete
 	 * @return 	int 				Result
 	 */
-    public function deleteMvtNum($piecenum)
-    {
+	public function deleteMvtNum($piecenum)
+	{
 		global $conf;
 
 		$this->db->begin();
@@ -1460,8 +1463,8 @@ class BookKeeping extends CommonObject
 	 * @param   int     $fromid     Id of object to clone
 	 * @return  int                 New id of clone
 	 */
-    public function createFromClone(User $user, $fromid)
-    {
+	public function createFromClone(User $user, $fromid)
+	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -1508,8 +1511,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return void
 	 */
-    public function initAsSpecimen()
-    {
+	public function initAsSpecimen()
+	{
 		global $user;
 
 		$now = dol_now();
@@ -1545,8 +1548,8 @@ class BookKeeping extends CommonObject
 	 * @param string $mode Mode
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function fetchPerMvt($piecenum, $mode = '')
-    {
+	public function fetchPerMvt($piecenum, $mode = '')
+	{
 		global $conf;
 
 		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type,date_creation";
@@ -1610,8 +1613,8 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode       Mode
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-    public function fetchAllPerMvt($piecenum, $mode = '')
-    {
+	public function fetchAllPerMvt($piecenum, $mode = '')
+	{
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
@@ -1661,16 +1664,16 @@ class BookKeeping extends CommonObject
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Export bookkeeping
 	 *
 	 * @param	string	$model	Model
 	 * @return	int				Result
 	 */
-    public function export_bookkeeping($model = 'ebp')
-    {
-        // phpcs:enable
+	public function export_bookkeeping($model = 'ebp')
+	{
+		// phpcs:enable
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
@@ -1736,10 +1739,10 @@ class BookKeeping extends CommonObject
 
 		$this->db->begin();
 
-        if ($direction == 0)
+		if ($direction == 0)
 		{
 			$next_piecenum = $this->getNextNumMvt();
-            $now = dol_now();
+			$now = dol_now();
 
 			if ($next_piecenum < 0) {
 				$error++;
@@ -1752,14 +1755,14 @@ class BookKeeping extends CommonObject
 			$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
 			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.$next_piecenum.", '".$this->db->idate($now)."'";
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.$this->db->escape($piece_num);
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error++;
 				$this->errors[] = 'Error '.$this->db->lasterror();
 				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 			}
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.$this->db->escape($piece_num);
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error++;
@@ -1767,7 +1770,7 @@ class BookKeeping extends CommonObject
 				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 			}
 		} elseif ($direction == 1) {
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error++;
@@ -1782,14 +1785,14 @@ class BookKeeping extends CommonObject
 			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
 			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE piece_num = '.$piece_num;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE piece_num = '.((int) $piece_num);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error++;
 				$this->errors[] = 'Error '.$this->db->lasterror();
 				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 			}
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.$piece_num;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
 			$resql = $this->db->query($sql);
 			if (!$resql) {
 				$error++;
@@ -1816,22 +1819,22 @@ class BookKeeping extends CommonObject
 		*/
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	* Return list of accounts with label by chart of accounts
-	*
-	* @param string     $selectid   Preselected chart of accounts
-	* @param string     $htmlname	Name of field in html form
-	* @param int		$showempty	Add an empty field
-	* @param array		$event		Event options
-	* @param int		$select_in	Value is a aa.rowid (0 default) or aa.account_number (1)
-	* @param int		$select_out	Set value returned by select 0=rowid (default), 1=account_number
-	* @param int		$aabase		Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
-	* @return string	String with HTML select
-    */
-    public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '')
-    {
-        // phpcs:enable
+	 * Return list of accounts with label by chart of accounts
+	 *
+	 * @param string     $selectid   Preselected chart of accounts
+	 * @param string     $htmlname	Name of field in html form
+	 * @param int		$showempty	Add an empty field
+	 * @param array		$event		Event options
+	 * @param int		$select_in	Value is a aa.rowid (0 default) or aa.account_number (1)
+	 * @param int		$select_out	Set value returned by select 0=rowid (default), 1=account_number
+	 * @param int		$aabase		Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
+	 * @return string	String with HTML select
+	 */
+	public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '')
+	{
+		// phpcs:enable
 		global $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -1888,7 +1891,7 @@ class BookKeeping extends CommonObject
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Description of a root accounting account
 	 *
@@ -1897,7 +1900,7 @@ class BookKeeping extends CommonObject
 	 */
 	public function get_compte_racine($account = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 
@@ -1907,7 +1910,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND asy.rowid = ".$pcgver;
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as parent ON aa.account_parent = parent.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as root ON parent.account_parent = root.rowid";
-		$sql .= " WHERE aa.account_number = '".$account."'";
+		$sql .= " WHERE aa.account_number = '".$this->db->escape($account)."'";
 		$sql .= " AND parent.active = 1";
 		$sql .= " AND root.active = 1";
 		$sql .= " AND aa.entity IN (".getEntity('accountancy').")";
@@ -1929,24 +1932,24 @@ class BookKeeping extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Description of accounting account
 	 *
 	 * @param	string	$account	Accounting account
 	 * @return	string				Account desc
 	 */
-    public function get_compte_desc($account = null)
-    {
-        // phpcs:enable
+	public function get_compte_desc($account = null)
+	{
+		// phpcs:enable
 		global $conf;
 
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 		$sql  = "SELECT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version, cat.label as category";
 		$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 aa.account_number = '".$account."'";
-		$sql .= " AND asy.rowid = ".$pcgver;
+		$sql .= " AND aa.account_number = '".$this->db->escape($account)."'";
+		$sql .= " AND asy.rowid = ".((int) $pcgver);
 		$sql .= " AND aa.active = 1";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
 		$sql .= " WHERE aa.entity IN (".getEntity('accountancy').")";
@@ -1986,13 +1989,13 @@ class BookKeepingLine
 	public $doc_ref;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_doc;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_docdet;
 
 	public $thirdparty_code;
@@ -2003,13 +2006,27 @@ class BookKeepingLine
 	public $label_operation;
 	public $debit;
 	public $credit;
-	public $montant;
-	public $sens;
-    public $lettering_code;
 
 	/**
-     * @var int ID
-     */
+	 * @var float Amount
+	 * @deprecated see $amount
+	 */
+	public $montant;
+
+	/**
+	 * @var float Amount
+	 */
+	public $amount;
+
+	/**
+	 * @var string Sens
+	 */
+	public $sens;
+	public $lettering_code;
+
+	/**
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	public $import_key;
@@ -2018,17 +2035,17 @@ class BookKeepingLine
 	public $piece_num;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
 	 * @var integer|string $date_modification;
 	 */
-    public $date_modification;
+	public $date_modification;
 
-    /**
-     * @var integer|string $date_export;
-     */
-    public $date_export;
+	/**
+	 * @var integer|string $date_export;
+	 */
+	public $date_export;
 }
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index d663e0ec9c4..cfe9bf635ae 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -68,11 +68,11 @@ class Lettering extends BookKeeping
 		$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."bank_url as bu ON(bk.fk_doc = bu.fk_bank AND bu.type IN ('payment', 'payment_supplier') ) ";
 		$sql .= " WHERE ( ";
 		if ($object->code_compta != "")
-			$sql .= " bk.subledger_account = '".$object->code_compta."'  ";
+			$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta)."'  ";
 		if ($object->code_compta != "" && $object->code_compta_fournisseur != "")
 			$sql .= " OR ";
 		if ($object->code_compta_fournisseur != "")
-			$sql .= " bk.subledger_account = '".$object->code_compta_fournisseur."' ";
+			$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta_fournisseur)."' ";
 
 		$sql .= " ) AND (bk.date_lettering ='' OR bk.date_lettering IS NULL) ";
 		$sql .= "  AND (bk.lettering_code != '' OR bk.lettering_code IS NULL) ";
@@ -95,19 +95,19 @@ class Lettering extends BookKeeping
 					$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn facf ";
 					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
 					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."paiementfourn as payf ON  payfacf.fk_paiementfourn=payf.rowid";
-					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_bookkeeping as bk ON (bk.fk_doc = payf.fk_bank AND bk.code_journal='".$obj->code_journal."')";
-					$sql .= " WHERE payfacf.fk_paiementfourn = '".$obj->url_id."' ";
+					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_bookkeeping as bk ON (bk.fk_doc = payf.fk_bank AND bk.code_journal='".$this->db->escape($obj->code_journal)."')";
+					$sql .= " WHERE payfacf.fk_paiementfourn = '".$this->db->escape($obj->url_id)."' ";
 					$sql .= " AND facf.entity = ".$conf->entity;
 					$sql .= " AND code_journal IN (SELECT code FROM ".MAIN_DB_PREFIX."accounting_journal WHERE nature=4 AND entity=".$conf->entity.") ";
 					$sql .= " AND ( ";
 					if ($object->code_compta != "") {
-						$sql .= "  bk.subledger_account = '".$object->code_compta."'  ";
+						$sql .= "  bk.subledger_account = '".$this->db->escape($object->code_compta)."'  ";
 					}
 					if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
 						$sql .= "  OR  ";
 					}
 					if ($object->code_compta_fournisseur != "") {
-						$sql .= "   bk.subledger_account = '".$object->code_compta_fournisseur."' ";
+						$sql .= "   bk.subledger_account = '".$this->db->escape($object->code_compta_fournisseur)."' ";
 					}
 					$sql .= " )  ";
 
@@ -129,13 +129,13 @@ class Lettering extends BookKeeping
 						$sql .= " AND facf.entity = ".$conf->entity;
 						$sql .= " AND ( ";
 						if ($object->code_compta != "") {
-							$sql .= " bk.subledger_account = '".$object->code_compta."'  ";
+							$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta)."'  ";
 						}
 						if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
 							$sql .= " OR ";
 						}
 						if ($object->code_compta_fournisseur != "") {
-							$sql .= " bk.subledger_account = '".$object->code_compta_fournisseur."' ";
+							$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta_fournisseur)."' ";
 						}
 						$sql .= ") ";
 
@@ -154,19 +154,19 @@ class Lettering extends BookKeeping
 					$sql .= " FROM ".MAIN_DB_PREFIX."facture fac ";
 					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."paiement_facture as payfac ON  payfac.fk_facture=fac.rowid";
 					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as pay ON  payfac.fk_paiement=pay.rowid";
-					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_bookkeeping as bk ON (bk.fk_doc = pay.fk_bank AND bk.code_journal='".$obj->code_journal."')";
-					$sql .= " WHERE payfac.fk_paiement = '".$obj->url_id."' ";
+					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_bookkeeping as bk ON (bk.fk_doc = pay.fk_bank AND bk.code_journal='".$this->db->escape($obj->code_journal)."')";
+					$sql .= " WHERE payfac.fk_paiement = '".$this->db->escape($obj->url_id)."' ";
 					$sql .= " AND bk.code_journal IN (SELECT code FROM ".MAIN_DB_PREFIX."accounting_journal WHERE nature=4 AND entity=".$conf->entity.") ";
 					$sql .= " AND fac.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
 					$sql .= " AND ( ";
 					if ($object->code_compta != "") {
-						$sql .= "  bk.subledger_account = '".$object->code_compta."'  ";
+						$sql .= "  bk.subledger_account = '".$this->db->escape($object->code_compta)."'  ";
 					}
 					if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
 						$sql .= "  OR  ";
 					}
 					if ($object->code_compta_fournisseur != "") {
-						$sql .= "   bk.subledger_account = '".$object->code_compta_fournisseur."' ";
+						$sql .= "   bk.subledger_account = '".$this->db->escape($object->code_compta_fournisseur)."' ";
 					}
 					$sql .= " )";
 
@@ -188,13 +188,13 @@ class Lettering extends BookKeeping
 						$sql .= " AND fac.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
 						$sql .= " AND ( ";
 						if ($object->code_compta != "") {
-							$sql .= "  bk.subledger_account = '".$object->code_compta."'  ";
+							$sql .= "  bk.subledger_account = '".$this->db->escape($object->code_compta)."'  ";
 						}
 						if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
 							$sql .= "  OR  ";
 						}
 						if ($object->code_compta_fournisseur != "") {
-							$sql .= "   bk.subledger_account = '".$object->code_compta_fournisseur."' ";
+							$sql .= "   bk.subledger_account = '".$this->db->escape($object->code_compta_fournisseur)."' ";
 						}
 						$sql .= " )  ";
 
@@ -238,7 +238,7 @@ class Lettering extends BookKeeping
 		$lettre = 'AAA';
 
 		$sql = "SELECT DISTINCT lettering_code FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE ";
-		$sql .= " lettering_code != '' ORDER BY lettering_code DESC limit 1;  ";
+		$sql .= " lettering_code != '' ORDER BY lettering_code DESC limit 1";
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -252,7 +252,7 @@ class Lettering extends BookKeeping
 		}
 
 		$sql = "SELECT SUM(ABS(debit)) as deb, SUM(ABS(credit)) as cred FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE ";
-		$sql .= " rowid IN (".implode(',', $ids).") AND date_validated IS NULL ";
+		$sql .= " rowid IN (".implode(',', $ids).") AND date_validated IS NULL";
 		$result = $this->db->query($sql);
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
@@ -272,7 +272,7 @@ class Lettering extends BookKeeping
 		if (!$error)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping SET";
-			$sql .= " lettering_code='".$lettre."'";
+			$sql .= " lettering_code='".$this->db->escape($lettre)."'";
 			$sql .= " , date_lettering = '".$this->db->idate($now)."'"; // todo correct date it's false
 			$sql .= "  WHERE rowid IN (".implode(',', $ids).") AND date_validated IS NULL ";
 			$this->db->begin();
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index 39ed325b5fe..ed8fc8ecc7e 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -42,8 +42,7 @@ if (!$user->rights->accounting->fiscalyear->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$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
 }
diff --git a/htdocs/accountancy/closure/validate.php b/htdocs/accountancy/closure/validate.php
index fe7fda5054f..808ccfba0ef 100644
--- a/htdocs/accountancy/closure/validate.php
+++ b/htdocs/accountancy/closure/validate.php
@@ -42,8 +42,7 @@ if ($user->socid > 0)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$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
 }
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 591606a7e26..ed8f347a177 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "accountancy"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -59,9 +59,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		else
-		{
+		} else {
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 		    if ($backtopage)
 		    {
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 06ad1cddfa5..1a5098bda38 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -47,8 +47,7 @@ if (!$user->rights->accounting->bind->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$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
 }
@@ -132,9 +131,9 @@ if ($action == 'validatehistory') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$chartaccountcode."' AND aa2.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$chartaccountcode."' AND aa3.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
 	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 	$sql .= " AND l.product_type <= 2";
 
@@ -202,8 +201,7 @@ if ($action == 'validatehistory') {
 	if ($error)
 	{
 		$db->rollback();
-	}
-	else {
+	} else {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
 	}
@@ -258,6 +256,10 @@ $sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 $sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '".$db->idate($search_date_start)."'";
 $sql .= "  AND f.datef <= '".$db->idate($search_date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 $sql .= " AND f.fk_statut > 0";
 $sql .= " AND fd.product_type <= 2";
 $sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
@@ -279,15 +281,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -334,6 +334,10 @@ $sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 $sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " WHERE f.datef >= '".$db->idate($search_date_start)."'";
 $sql .= "  AND f.datef <= '".$db->idate($search_date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 $sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0";
 $sql .= " AND fd.product_type <= 2";
@@ -355,16 +359,14 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
 
 		for ($i = 2; $i <= 12; $i++) {
@@ -400,7 +402,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-	$sql = "SELECT '".$langs->trans("TotalVente")."' AS total,";
+	$sql = "SELECT '".$db->escape($langs->trans("TotalVente"))."' AS total,";
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 		if ($j > 12) $j -= 12;
@@ -411,6 +413,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 	$sql .= " WHERE f.datef >= '".$db->idate($search_date_start)."'";
 	$sql .= "  AND f.datef <= '".$db->idate($search_date_end)."'";
+	// Define begin binding date
+	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	}
 	$sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
 	$sql .= " AND f.fk_statut > 0";
 	$sql .= " AND fd.product_type <= 2";
@@ -453,7 +459,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 		}
 		print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-		$sql = "SELECT '".$langs->trans("Vide")."' AS marge,";
+		$sql = "SELECT '".$db->escape($langs->trans("Vide"))."' AS marge,";
 		for ($i = 1; $i <= 12; $i++) {
 			$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
 			if ($j > 12) $j -= 12;
@@ -464,6 +470,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 		$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 		$sql .= " WHERE f.datef >= '".$db->idate($search_date_start)."'";
 		$sql .= "  AND f.datef <= '".$db->idate($search_date_end)."'";
+		// Define begin binding date
+		if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+			$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+		}
 		$sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
 		$sql .= " AND f.fk_statut > 0";
 		$sql .= " AND fd.product_type <= 2";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index c45e7b27b0a..5d35040f6ab 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -61,8 +61,8 @@ $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // 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', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$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;
@@ -93,7 +93,7 @@ $formaccounting = new FormAccounting($db);
 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_societe = '';
-    $search_lineid = '';
+	$search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -203,7 +203,7 @@ if ($search_societe) {
 	$sql .= natural_search('s.nom', $search_societe);
 }
 if ($search_lineid) {
-    $sql .= natural_search("fd.rowid", $search_lineid, 1);
+	$sql .= natural_search("fd.rowid", $search_lineid, 1);
 }
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.ref", $search_invoice);
@@ -251,13 +251,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);
@@ -309,9 +309,9 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="'.dol_escape_htmltag($search_lineid).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
 	print '<td class="liste_titre center nowraponall">';
-    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-        print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
-    }
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
+	}
    	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
    	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
@@ -344,22 +344,23 @@ if ($result) {
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	$checkpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
-	$thirdpartystatic		 = new Societe($db);
-	$facture_static			 = new Facture($db);
-	$product_static			 = new Product($db);
+	$thirdpartystatic = new Societe($db);
+	$facturestatic = new Facture($db);
+	$productstatic = new Product($db);
 	$accountingaccountstatic = new AccountingAccount($db);
 
+	$i = 0;
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
-		$facture_static->ref = $objp->ref;
-		$facture_static->id = $objp->facid;
-		$facture_static->type = $objp->ftype;
+		$facturestatic->ref = $objp->ref;
+		$facturestatic->id = $objp->facid;
+		$facturestatic->type = $objp->ftype;
 
 		$thirdpartystatic->id = $objp->socid;
 		$thirdpartystatic->name = $objp->name;
@@ -372,10 +373,10 @@ if ($result) {
 		$thirdpartystatic->email = $objp->email;
 		$thirdpartystatic->country_code = $objp->country_code;
 
-		$product_static->ref = $objp->product_ref;
-		$product_static->id = $objp->product_id;
-		$product_static->label = $objp->product_label;
-		$product_static->type = $objp->line_type;
+		$productstatic->ref = $objp->product_ref;
+		$productstatic->id = $objp->product_id;
+		$productstatic->label = $objp->product_label;
+		$productstatic->type = $objp->line_type;
 
 		$accountingaccountstatic->rowid = $objp->fk_compte;
 		$accountingaccountstatic->label = $objp->label;
@@ -388,15 +389,15 @@ if ($result) {
 		print '<td>'.$objp->rowid.'</td>';
 
 		// Ref Invoice
-		print '<td class="nowraponall">'.$facture_static->getNomUrl(1).'</td>';
+		print '<td class="nowraponall">'.$facturestatic->getNomUrl(1).'</td>';
 
 		// Date invoice
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day').'</td>';
 
 		// Ref Product
 		print '<td class="tdoverflowmax100">';
-		if ($product_static->id > 0) print $product_static->getNomUrl(1);
-		if ($product_static->id > 0 && $objp->product_label) print '<br>';
+		if ($productstatic->id > 0) print $productstatic->getNomUrl(1);
+		if ($productstatic->id > 0 && $objp->product_label) print '<br>';
 		if ($objp->product_label) print '<span class="opacitymedium">'.$objp->product_label.'</span>';
 		print '</td>';
 
@@ -411,7 +412,7 @@ if ($result) {
 		print '<td class="right">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
 		// Thirdparty
-		print '<td class="tdoverflowmax100">' . $thirdpartystatic->getNomUrl(1, 'customer') . '</td>';
+		print '<td class="tdoverflowmax100">'.$thirdpartystatic->getNomUrl(1, 'customer').'</td>';
 
 		// Country
 		print '<td>';
@@ -423,8 +424,9 @@ if ($result) {
 
 		print '<td>'.$objp->tva_intra.'</td>';
 
-		print '<td>';
-		print $accountingaccountstatic->getNomUrl(0, 1, 1).' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
+		print '<td class="center">';
+		print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
+		print ' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';
@@ -432,14 +434,14 @@ if ($result) {
 		print '</tr>';
 		$i++;
 	}
-    print '</table>';
-    print "</div>";
+	print '</table>';
+	print "</div>";
 
-    if ($nbtotalofrecords > $limit) {
-        print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
-    }
+	if ($nbtotalofrecords > $limit) {
+		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
+	}
 
-    print '</form>';
+	print '</form>';
 } else {
 	print $db->lasterror();
 }
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 1d93a0fea17..a06d2f25d8c 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "productbatch"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -69,8 +69,8 @@ $btn_ventil = GETPOST('ventil', 'alpha');
 
 // 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', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$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;
@@ -114,7 +114,7 @@ if (empty($reshook))
 	// 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_societe='';
+		$search_societe = '';
 		$search_lineid = '';
 		$search_ref = '';
 		$search_invoice = '';
@@ -140,50 +140,48 @@ if (empty($reshook))
 
 
 if ($massaction == 'ventil') {
-    $msg = '';
+	$msg = '';
 
-    //print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
-    if (!empty($mesCasesCochees)) {
-        $msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
-        $msg .= '<div class="detail">';
-        $cpt = 0;
-        $ok = 0;
-        $ko = 0;
+	//print '<div><span style="color:red">' . $langs->trans("Processing") . '...</span></div>';
+	if (!empty($mesCasesCochees)) {
+		$msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
+		$msg .= '<div class="detail">';
+		$cpt = 0;
+		$ok = 0;
+		$ko = 0;
 
-        foreach ($mesCasesCochees as $maLigneCochee) {
-            $maLigneCourante = explode("_", $maLigneCochee);
-            $monId = $maLigneCourante[0];
-            $monCompte = GETPOST('codeventil'.$monId);
+		foreach ($mesCasesCochees as $maLigneCochee) {
+			$maLigneCourante = explode("_", $maLigneCochee);
+			$monId = $maLigneCourante[0];
+			$monCompte = GETPOST('codeventil'.$monId);
 
-            if ($monCompte <= 0)
-            {
-                $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
-                $ko++;
-            }
-            else
-            {
-                $sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
-                $sql .= " SET fk_code_ventilation = ".$monCompte;
-                $sql .= " WHERE rowid = ".$monId;
+			if ($monCompte <= 0)
+			{
+				$msg .= '<div><span style="color:red">'.$langs->trans("Lineofinvoice", $monId).' - '.$langs->trans("NoAccountSelected").'</span></div>';
+				$ko++;
+			} else {
+				$sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
+				$sql .= " SET fk_code_ventilation = ".((int) $monCompte);
+				$sql .= " WHERE rowid = ".((int) $monId);
 
-                $accountventilated = new AccountingAccount($db);
-                $accountventilated->fetch($monCompte, '');
+				$accountventilated = new AccountingAccount($db);
+				$accountventilated->fetch($monCompte, '', 1);
 
-                dol_syslog("accountancy/customer/list.php sql=".$sql, LOG_DEBUG);
-                if ($db->query($sql)) {
-                    $msg .= '<div><font color="green">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</font></div>';
-                    $ok++;
-                } else {
-                    $msg .= '<div><font color="red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br> <pre>'.$sql.'</pre></font></div>';
-                    $ko++;
-                }
-            }
+				dol_syslog("accountancy/customer/list.php sql=".$sql, LOG_DEBUG);
+				if ($db->query($sql)) {
+					$msg .= '<div><span style="color:green">'.$langs->trans("Lineofinvoice", $monId).' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</span></div>';
+					$ok++;
+				} else {
+					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice", $monId).' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br> <pre>'.$sql.'</pre></span></div>';
+					$ko++;
+				}
+			}
 
-            $cpt++;
-        }
-        $msg .= '</div>';
-        $msg .= '<div>'.$langs->trans("EndProcessing").'</div>';
-    }
+			$cpt++;
+		}
+		$msg .= '</div>';
+		$msg .= '<div>'.$langs->trans("EndProcessing").'</div>';
+	}
 }
 
 
@@ -201,8 +199,8 @@ if (empty($chartaccountcode))
 {
 	print $langs->trans("ErrorChartOfAccountSystemNotSelected");
 	// End of page
-    llxFooter();
-    $db->close();
+	llxFooter();
+	$db->close();
 	exit;
 }
 
@@ -224,38 +222,42 @@ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$chartaccountcode."' AND aa2.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$chartaccountcode."' AND aa3.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
 $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql .= " AND l.product_type <= 2";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 // Add search filter like
 if ($search_societe) {
 	$sql .= natural_search('s.nom', $search_societe);
 }
 if ($search_lineid) {
-    $sql .= natural_search("l.rowid", $search_lineid, 1);
+	$sql .= natural_search("l.rowid", $search_lineid, 1);
 }
 if (strlen(trim($search_invoice))) {
-    $sql .= natural_search("f.ref", $search_invoice);
+	$sql .= natural_search("f.ref", $search_invoice);
 }
 if (strlen(trim($search_ref))) {
-    $sql .= natural_search("p.ref", $search_ref);
+	$sql .= natural_search("p.ref", $search_ref);
 }
 if (strlen(trim($search_label))) {
-    $sql .= natural_search("p.label", $search_label);
+	$sql .= natural_search("p.label", $search_label);
 }
 if (strlen(trim($search_desc))) {
-    $sql .= natural_search("l.description", $search_desc);
+	$sql .= natural_search("l.description", $search_desc);
 }
 if (strlen(trim($search_amount))) {
-    $sql .= natural_search("l.total_ht", $search_amount, 1);
+	$sql .= natural_search("l.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-    $sql .= natural_search("aa.account_number", $search_account);
+	$sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-    $sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
+	$sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
 }
 $sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
 if (strlen(trim($search_country))) {
@@ -293,13 +295,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);
@@ -334,9 +336,9 @@ if ($result) {
 	if ($search_tvaintra)	 $param .= "&search_tvaintra=".urlencode($search_tvaintra);
 
 	$arrayofmassactions = array(
-	    'ventil'=>$langs->trans("Ventilate")
-	    //'presend'=>$langs->trans("SendByMail"),
-	    //'builddoc'=>$langs->trans("PDFMerge"),
+		'ventil'=>$langs->trans("Ventilate")
+		//'presend'=>$langs->trans("SendByMail"),
+		//'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	//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();
@@ -374,8 +376,8 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
 	print '<td class="liste_titre center nowraponall minwidth100imp">';
    	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-        print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-    }
+		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
+	}
    	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
    	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
@@ -384,9 +386,9 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_vat" placeholder="%" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth75imp" name="search_societe" value="' . dol_escape_htmltag($search_societe) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth75imp" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 	print '<td class="liste_titre">';
-	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1);
+	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1);
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
@@ -409,7 +411,7 @@ if ($result) {
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("VATIntraShort", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
 	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
 	$checkpicto = '';
@@ -423,7 +425,7 @@ if ($result) {
 
 	$isSellerInEEC = isInEEC($mysoc);
 
-    $accountingaccount_codetotid_cache = array();
+	$accountingaccount_codetotid_cache = array();
 
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
@@ -462,29 +464,29 @@ if ($result) {
 		$code_sell_p_notset = '';
 		$objp->aarowid_suggest = ''; // Will be set later
 
-        $isBuyerInEEC = isInEEC($objp);
+		$isBuyerInEEC = isInEEC($objp);
 
-        // Search suggested default account for product/service
-        $suggestedaccountingaccountbydefaultfor = '';
-    	if ($objp->type_l == 1) {
-    		if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-    			$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
-    			$suggestedaccountingaccountbydefaultfor = '';
-    		} else {
-    			if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) {    // European intravat sale, but with a VAT
+		// Search suggested default account for product/service
+		$suggestedaccountingaccountbydefaultfor = '';
+		if ($objp->type_l == 1) {
+			if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
+				$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
+				$suggestedaccountingaccountbydefaultfor = '';
+			} else {
+				if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) {    // European intravat sale, but with a VAT
 					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
 					$suggestedaccountingaccountbydefaultfor = 'eecwithvat';
-    			} elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) {    // European intravat sale, without VAT intra community number
-    				$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
-    				$suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
+				} elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) {    // European intravat sale, without VAT intra community number
+					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : '');
+					$suggestedaccountingaccountbydefaultfor = 'eecwithoutvatnumber';
 				} elseif ($isSellerInEEC && $isBuyerInEEC) {    // European intravat sale
-    				$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : '');
-    				$suggestedaccountingaccountbydefaultfor = 'eec';
-	    		} else {                                        // Foreign sale
-	    			$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : '');
-	    			$suggestedaccountingaccountbydefaultfor = 'export';
-	    		}
-    		}
+					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT : '');
+					$suggestedaccountingaccountbydefaultfor = 'eec';
+				} else {                                        // Foreign sale
+					$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT : '');
+					$suggestedaccountingaccountbydefaultfor = 'export';
+				}
+			}
 		} elseif ($objp->type_l == 0) {
 			if ($objp->country_code == $mysoc->country_code || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
 				$objp->code_sell_l = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : '');
@@ -510,28 +512,36 @@ if ($result) {
 		// Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
 		$suggestedaccountingaccountfor = '';
 		if (($objp->country_code == $mysoc->country_code) || empty($objp->country_code)) {  // If buyer in same country than seller (if not defined, we assume it is same country)
-            $objp->code_sell_p = $objp->code_sell;
-            $objp->aarowid_suggest = $objp->aarowid;
-            $suggestedaccountingaccountfor = '';
-        } else {
-        	if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) {	// European intravat sale, but with VAT
+			$objp->code_sell_p = $objp->code_sell;
+			$objp->aarowid_suggest = $objp->aarowid;
+			$suggestedaccountingaccountfor = '';
+		} else {
+			if ($isSellerInEEC && $isBuyerInEEC && $objp->tva_tx_line != 0) {	// European intravat sale, but with VAT
 				$objp->code_sell_p = $objp->code_sell;
 				$objp->aarowid_suggest = $objp->aarowid;
 				$suggestedaccountingaccountfor = 'eecwithvat';
-        	} elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) {	// European intravat sale, without VAT intra community number
-        		$objp->code_sell_p = $objp->code_sell;
-        		$objp->aarowid_suggest = $objp->aarowid; // There is a doubt for this case. Is it an error on vat or we just forgot to fill vat number ?
-        		$suggestedaccountingaccountfor = 'eecwithoutvatnumber';
+			} elseif ($isSellerInEEC && $isBuyerInEEC && empty($objp->tva_intra)) {	// European intravat sale, without VAT intra community number
+				$objp->code_sell_p = $objp->code_sell;
+				$objp->aarowid_suggest = $objp->aarowid; // There is a doubt for this case. Is it an error on vat or we just forgot to fill vat number ?
+				$suggestedaccountingaccountfor = 'eecwithoutvatnumber';
 			} elseif ($isSellerInEEC && $isBuyerInEEC) {          // European intravat sale
-                $objp->code_sell_p = $objp->code_sell_intra;
-                $objp->aarowid_suggest = $objp->aarowid_intra;
-                $suggestedaccountingaccountfor = 'eec';
-            } else {                                        // Foreign sale
-                $objp->code_sell_p = $objp->code_sell_export;
-                $objp->aarowid_suggest = $objp->aarowid_export;
-                $suggestedaccountingaccountfor = 'export';
-            }
-        }
+				$objp->code_sell_p = $objp->code_sell_intra;
+				$objp->aarowid_suggest = $objp->aarowid_intra;
+				$suggestedaccountingaccountfor = 'eec';
+			} else {                                        // Foreign sale
+				$objp->code_sell_p = $objp->code_sell_export;
+				$objp->aarowid_suggest = $objp->aarowid_export;
+				$suggestedaccountingaccountfor = 'export';
+			}
+		}
+
+		// Manage Deposit
+		if ($objp->description == "(DEPOSIT)") {
+			$accountdeposittoventilated = new AccountingAccount($db);
+			$accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
+			$objp->code_sell_l = $accountdeposittoventilated->ref;
+			$objp->aarowid_suggest = $accountdeposittoventilated->rowid;
+		}
 
 		if (!empty($objp->code_sell_p)) {
 			// Value was defined previously
@@ -555,14 +565,14 @@ if ($result) {
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day').'</td>';
 
 		// Ref Product
-		print '<td>';
+		print '<td class="tdoverflowmax150">';
 		if ($product_static->id > 0) {
 			print $product_static->getNomUrl(1);
 		}
-		if ($objp->product_label) print '<br><span class="opacitymedium">'.$objp->product_label.'</span>';
+		if ($objp->product_label) print '<br><span class="opacitymedium small">'.$objp->product_label.'</span>';
 		print '</td>';
 
-		print '<td class="tdoverflowonsmartphone">';
+		print '<td class="tdoverflowonsmartphone small">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
@@ -580,35 +590,35 @@ if ($result) {
 		print '</td>';
 
 		// Thirdparty
-		print '<td class="tdoverflowmax100">' . $thirdpartystatic->getNomUrl(1, 'customer') . '</td>';
+		print '<td class="tdoverflowmax100">'.$thirdpartystatic->getNomUrl(1, 'customer').'</td>';
 
 		// Country
-        print '<td>';
-        $labelcountry = ($objp->country_code && ($langs->trans("Country".$objp->country_code) != "Country".$objp->country_code)) ? $langs->trans("Country".$objp->country_code) : $objp->country_label;
-        print $labelcountry;
-        print '</td>';
+		print '<td>';
+		$labelcountry = ($objp->country_code && ($langs->trans("Country".$objp->country_code) != "Country".$objp->country_code)) ? $langs->trans("Country".$objp->country_code) : $objp->country_label;
+		print $labelcountry;
+		print '</td>';
 
 		print '<td>'.$objp->tva_intra.'</td>';
 
 		// Found accounts
 		print '<td>';
-	    $s = '<span class="small">'.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
-	    $shelp = '';
-	    if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp .= $langs->trans("SaleEEC");
-	    elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp .= $langs->trans("SaleExport");
-	    $s .= ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>');
-	    print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
-	    if ($objp->product_id > 0)
+		$s = '<span class="small">'.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
+		$shelp = '';
+		if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp .= $langs->trans("SaleEEC");
+		elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp .= $langs->trans("SaleExport");
+		$s .= ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>');
+		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+		if ($objp->product_id > 0)
 		{
-		    print '<br>';
-		    $s = '<span class="small">'.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
-		    $shelp = '';
-		    if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
-		    elseif ($suggestedaccountingaccountfor == 'eecwithvat') $shelp = $langs->trans("SaleEECWithVAT");
-		    elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') $shelp = $langs->trans("SaleEECWithoutVATNumber");
-		    elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
-		    $s .= (empty($objp->code_sell_p) ? '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_sell_p));
-		    print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+			print '<br>';
+			$s = '<span class="small">'.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
+			$shelp = '';
+			if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
+			elseif ($suggestedaccountingaccountfor == 'eecwithvat') $shelp = $langs->trans("SaleEECWithVAT");
+			elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') $shelp = $langs->trans("SaleEECWithoutVATNumber");
+			elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
+			$s .= (empty($objp->code_sell_p) ? '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_sell_p));
+			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		}
 		print '</td>';
 
@@ -629,8 +639,7 @@ if ($result) {
 					$suggestedid = $tmpaccount->id;
 				}
 				$accountingaccount_codetotid_cache[$objp->code_sell_l] = $tmpaccount->id;
-			}
-			else {
+			} else {
 				$suggestedid = $accountingaccount_codetotid_cache[$objp->code_sell_l];
 			}
 		}
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 9d7c504354f..ab02592f6b8 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "accountancy", "trips"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -63,9 +63,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 			if ($backtopage)
 			{
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 387cfd0fb8e..6edb8d86a07 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -43,8 +43,7 @@ if (!$user->rights->accounting->bind->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$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
 }
@@ -162,7 +161,7 @@ for ($i = 1; $i <= 12; $i++) {
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-$sql = "SELECT  ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
+$sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
@@ -175,6 +174,10 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport as er ON er.rowid = erd.fk_e
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
 $sql .= " WHERE er.date_debut >= '".$db->idate($search_date_start)."'";
 $sql .= " AND er.date_debut <= '".$db->idate($search_date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 $sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.")";
 $sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
@@ -190,26 +193,24 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
-    	for ($i = 2; $i <= 12; $i++) {
-            print '<td class="nowrap right">'.price($row[$i]).'</td>';
-        }
-        print '<td class="nowrap right">'.price($row[13]).'</td>';
-        print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
-        print '</tr>';
-    }
-    $db->free($resql);
+		for ($i = 2; $i <= 12; $i++) {
+			print '<td class="nowrap right">'.price($row[$i]).'</td>';
+		}
+		print '<td class="nowrap right">'.price($row[13]).'</td>';
+		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
+		print '</tr>';
+	}
+	$db->free($resql);
 } else {
-    print $db->lasterror(); // Show last sql error
+	print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
 print '</div>';
@@ -233,7 +234,7 @@ for ($i = 1; $i <= 12; $i++) {
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-$sql = "SELECT  ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
+$sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
@@ -246,6 +247,10 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport as er ON er.rowid = erd.fk_e
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
 $sql .= " WHERE er.date_debut >= '".$db->idate($search_date_start)."'";
 $sql .= " AND er.date_debut <= '".$db->idate($search_date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 $sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.")";
 $sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NOT NULL";
@@ -261,27 +266,25 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
-    	for ($i = 2; $i <= 12; $i++) {
-            print '<td class="nowrap right">'.price($row[$i]).'</td>';
-        }
-        print '<td class="nowrap right">'.price($row[13]).'</td>';
-        print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
-        print '</tr>';
-    }
-    $db->free($resql);
+		for ($i = 2; $i <= 12; $i++) {
+			print '<td class="nowrap right">'.price($row[$i]).'</td>';
+		}
+		print '<td class="nowrap right">'.price($row[13]).'</td>';
+		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
+		print '</tr>';
+	}
+	$db->free($resql);
 } else {
-    print $db->lasterror(); // Show last sql error
+	print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
 print '</div>';
@@ -290,56 +293,60 @@ print '</div>';
 
 if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report where results depends on next step (so not yet available) ?
 {
-    print '<br>';
-    print '<br>';
+	print '<br>';
+	print '<br>';
 
-    print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
-    //print load_fiche_titre($langs->trans("OtherInfo"), '', '');
+	print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+	//print load_fiche_titre($langs->trans("OtherInfo"), '', '');
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("Total").'</td>';
-    for ($i = 1; $i <= 12; $i++) {
-    	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-    	if ($j > 12) $j -= 12;
-    	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
-    }
-    print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("Total").'</td>';
+	for ($i = 1; $i <= 12; $i++) {
+		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+		if ($j > 12) $j -= 12;
+		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+	}
+	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-    $sql = "SELECT '".$langs->trans("TotalExpenseReport")."' AS label,";
-    for ($i = 1; $i <= 12; $i++) {
-    	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-    	if ($j > 12) $j -= 12;
-    	$sql .= " SUM(".$db->ifsql('MONTH(er.date_create)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
-    }
-    $sql .= " SUM(erd.total_ht) as total";
-    $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport as er ON er.rowid = erd.fk_expensereport";
-    $sql .= " WHERE er.date_debut >= '".$db->idate($search_date_start)."'";
-    $sql .= " AND er.date_debut <= '".$db->idate($search_date_end)."'";
-    $sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.")";
-    $sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
+	$sql = "SELECT '".$db->escape($langs->trans("TotalExpenseReport"))."' AS label,";
+	for ($i = 1; $i <= 12; $i++) {
+		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+		if ($j > 12) $j -= 12;
+		$sql .= " SUM(".$db->ifsql('MONTH(er.date_create)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+	}
+	$sql .= " SUM(erd.total_ht) as total";
+	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport as er ON er.rowid = erd.fk_expensereport";
+	$sql .= " WHERE er.date_debut >= '".$db->idate($search_date_start)."'";
+	$sql .= " AND er.date_debut <= '".$db->idate($search_date_end)."'";
+	// Define begin binding date
+	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+		$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	}
+	$sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.")";
+	$sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 
-    dol_syslog('htdocs/accountancy/expensereport/index.php');
-    $resql = $db->query($sql);
-    if ($resql) {
-        $num = $db->num_rows($resql);
+	dol_syslog('htdocs/accountancy/expensereport/index.php');
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
 
-    	while ($row = $db->fetch_row($resql)) {
-    		print '<tr><td>'.$row[0].'</td>';
-            for ($i = 1; $i <= 12; $i++) {
-    			print '<td class="nowrap right">'.price($row[$i]).'</td>';
-    		}
-    		print '<td class="nowrap right"><b>'.price($row[13]).'</b></td>';
-    		print '</tr>';
-    	}
+		while ($row = $db->fetch_row($resql)) {
+			print '<tr><td>'.$row[0].'</td>';
+			for ($i = 1; $i <= 12; $i++) {
+				print '<td class="nowrap right">'.price($row[$i]).'</td>';
+			}
+			print '<td class="nowrap right"><b>'.price($row[13]).'</b></td>';
+			print '</tr>';
+		}
 
-    	$db->free($resql);
-    } else {
-    	print $db->lasterror(); // Show last sql error
-    }
-    print "</table>\n";
-    print '</div>';
+		$db->free($resql);
+	} else {
+		print $db->lasterror(); // Show last sql error
+	}
+	print "</table>\n";
+	print '</div>';
 }
 
 // End of page
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 7a45b70a4e4..f99f1148044 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -26,21 +26,23 @@
  */
 require '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("compta", "bills", "other", "accountancy", "trips", "productbatch"));
+$langs->loadLangs(array("compta", "bills", "other", "accountancy", "trips", "productbatch", "hrm"));
 
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $account_parent = GETPOST('account_parent', 'int');
 $changeaccount = GETPOST('changeaccount');
 // Search Getpost
+$search_login = GETPOST('search_login', 'alpha');
 $search_expensereport = GETPOST('search_expensereport', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_desc = GETPOST('search_desc', 'alpha');
@@ -53,8 +55,8 @@ $search_year = GETPOST("search_year", "int");
 
 // 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', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) $page = 0;
 $pageprev = $page - 1;
@@ -84,6 +86,7 @@ $formaccounting = new FormAccounting($db);
 // 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
 {
+	$search_login = '';
 	$search_expensereport = '';
 	$search_label = '';
 	$search_desc = '';
@@ -162,14 +165,21 @@ print '<script type="text/javascript">
  */
 $sql = "SELECT er.ref, er.rowid as erid,";
 $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht, erd.fk_code_ventilation, erd.tva_tx, erd.vat_src_code, erd.date,";
-$sql .= " aa.label, aa.labelshort, aa.account_number,";
-$sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label";
+$sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label,";
+$sql .= " u.rowid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
+$sql .= " aa.label, aa.labelshort, aa.account_number";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
-$sql .= " , ".MAIN_DB_PREFIX."accounting_account as aa";
-$sql .= " , ".MAIN_DB_PREFIX."expensereport_det as erd";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
+$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as f ON f.id = erd.fk_c_type_fees";
-$sql .= " WHERE er.rowid = erd.fk_expensereport and er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <> 0 ";
-$sql .= " AND aa.rowid = erd.fk_code_ventilation";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = er.fk_user_author";
+$sql .= " WHERE erd.fk_code_ventilation > 0";
+$sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
+$sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.")";
+// Add search filter like
+if (strlen(trim($search_login))) {
+	$sql .= natural_search("u.login", $search_login);
+}
 if (strlen(trim($search_expensereport))) {
 	$sql .= natural_search("er.ref", $search_expensereport);
 }
@@ -197,13 +207,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);
@@ -218,6 +228,7 @@ if ($result) {
 	$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_login)       $param .= '&search_login='.urlencode($search_login);
 	if ($search_expensereport) $param .= "&search_expensereport=".urlencode($search_expensereport);
 	if ($search_label)		$param .= "&search_label=".urlencode($search_label);
 	if ($search_desc)		$param .= "&search_desc=".urlencode($search_desc);
@@ -246,13 +257,14 @@ if ($result) {
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
+	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"><input type="text" name="search_login" class="maxwidth50" value="'.$search_login.'"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td><input type="text" class="flat maxwidth50" name="search_expensereport" value="'.dol_escape_htmltag($search_expensereport).'"></td>';
-	if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+	if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
 		print '<td class="liste_titre"></td>';
 	}
 	print '<td class="liste_titre center">';
@@ -266,15 +278,16 @@ if ($result) {
 	print '<td class="liste_titre center"><input type="text" class="flat maxwidth50" name="search_vat" size="1" placeholder="%" value="'.dol_escape_htmltag($search_vat).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_account" value="'.dol_escape_htmltag($search_account).'"></td>';
 	print '<td class="liste_titre center">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
+	print_liste_field_titre("Employees", $_SERVER['PHP_SELF'], "u.login", $param, "", "", $sortfield, $sortorder);
 	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
-	if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+	if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
 		print_liste_field_titre("DateValidation", $_SERVER["PHP_SELF"], "er.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
 	print_liste_field_titre("DateOfLine", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -282,19 +295,32 @@ if ($result) {
 	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "erd.comments", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "erd.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "erd.tva_tx", "", $param, '', $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	$checkpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
-	$expensereport_static		= new ExpenseReport($db);
-	$accountingaccountstatic	= new AccountingAccount($db);
+	$expensereportstatic = new ExpenseReport($db);
+	$accountingaccountstatic = new AccountingAccount($db);
+	$userstatic = new User($db);
 
+	$i = 0;
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
-		$expensereport_static->ref = $objp->ref;
-		$expensereport_static->id = $objp->erid;
+		$expensereportstatic->ref = $objp->ref;
+		$expensereportstatic->id = $objp->erid;
+
+		$userstatic->id = $objp->rowid;
+		$userstatic->ref = $objp->label;
+		$userstatic->login = $objp->login;
+		$userstatic->statut = $objp->statut;
+		$userstatic->email = $objp->email;
+		$userstatic->gender = $objp->gender;
+		$userstatic->firstname = $objp->firstname;
+		$userstatic->lastname = $objp->lastname;
+		$userstatic->employee = $objp->employee;
+		$userstatic->photo = $objp->photo;
 
 		$accountingaccountstatic->rowid = $objp->fk_compte;
 		$accountingaccountstatic->label = $objp->label;
@@ -303,32 +329,44 @@ if ($result) {
 
 		print '<tr class="oddeven">';
 
+		// Login
+		print '<td class="nowraponall">';
+		print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
+		print '</td>';
+
+		// Line id
 		print '<td>'.$objp->rowid.'</td>';
 
-		// Ref Invoice
-		print '<td>'.$expensereport_static->getNomUrl(1).'</td>';
+		// Ref Expense report
+		print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
 
 		// Date validation
-		if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+		if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
 			print '<td class="center">'.dol_print_date($db->jdate($objp->date_valid), 'day').'</td>';
 		}
 
 		print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>';
 
+		// Fees label
 		print '<td class="tdoverflow">'.($langs->trans($objp->type_fees_code) == $objp->type_fees_code ? $objp->type_fees_label : $langs->trans(($objp->type_fees_code))).'</td>';
 
+		// Fees description -- Can be null
 		print '<td>';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
 
+		// Amount without taxes
 		print '<td class="nowrap right">'.price($objp->total_ht).'</td>';
 
+		// Vat rate
 		print '<td class="center">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
-		print '<td>';
-		print $accountingaccountstatic->getNomUrl(0, 1, 1).' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
+		// Accounting account affected
+		print '<td class="center">';
+		print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
+		print ' <a class="editfielda reposition marginleftonly marginrightonly" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';
@@ -341,7 +379,7 @@ if ($result) {
 	print "</div>";
 
 	if ($nbtotalofrecords > $limit) {
-	    print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
+		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
 	}
 
 	print '</form>';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 96eebd49b36..c2fb21a911b 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -28,6 +28,7 @@
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -35,14 +36,14 @@ 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("bills", "companies", "compta", "accountancy", "other", "trips", "productbatch"));
+$langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "trips", "productbatch", "hrm"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'expensereportlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 
@@ -50,6 +51,7 @@ $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always ''
 $mesCasesCochees = GETPOST('toselect', 'array');
 
 // Search Getpost
+$search_login = GETPOST('search_login', 'alpha');
 $search_lineid = GETPOST('search_lineid', 'alpha');
 $search_expensereport = GETPOST('search_expensereport', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
@@ -63,8 +65,8 @@ $search_year = GETPOST("search_year", "int");
 
 // 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', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$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;
@@ -100,15 +102,16 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 // 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_expensereport = '';
-    $search_label = '';
-    $search_desc = '';
-    $search_amount = '';
-    $search_account = '';
-    $search_vat = '';
-    $search_day = '';
-    $search_month = '';
-    $search_year = '';
+	$search_login = '';
+	$search_expensereport = '';
+	$search_label = '';
+	$search_desc = '';
+	$search_amount = '';
+	$search_account = '';
+	$search_vat = '';
+	$search_day = '';
+	$search_month = '';
+	$search_year = '';
 }
 
 // Mass actions
@@ -121,48 +124,46 @@ include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 if ($massaction == 'ventil') {
 	$msg = '';
-    //print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
-    if (!empty($mesCasesCochees)) {
-        $msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
-        $msg .= '<div class="detail">';
-        $cpt = 0;
-        $ok = 0;
-        $ko = 0;
+	//print '<div><span style="color:red">' . $langs->trans("Processing") . '...</span></div>';
+	if (!empty($mesCasesCochees)) {
+		$msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
+		$msg .= '<div class="detail">';
+		$cpt = 0;
+		$ok = 0;
+		$ko = 0;
 
-        foreach ($mesCasesCochees as $maLigneCochee) {
-            $maLigneCourante = explode("_", $maLigneCochee);
-            $monId = $maLigneCourante[0];
-            $monCompte = GETPOST('codeventil'.$monId);
+		foreach ($mesCasesCochees as $maLigneCochee) {
+			$maLigneCourante = explode("_", $maLigneCochee);
+			$monId = $maLigneCourante[0];
+			$monCompte = GETPOST('codeventil'.$monId);
 
-            if ($monCompte <= 0)
-            {
-                $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
-                $ko++;
-            }
-            else
-            {
-                $sql = " UPDATE ".MAIN_DB_PREFIX."expensereport_det";
-                $sql .= " SET fk_code_ventilation = ".$monCompte;
-                $sql .= " WHERE rowid = ".$monId;
+			if ($monCompte <= 0)
+			{
+				$msg .= '<div><span style="color:red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</span></div>';
+				$ko++;
+			} else {
+				$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport_det";
+				$sql .= " SET fk_code_ventilation = ".$monCompte;
+				$sql .= " WHERE rowid = ".$monId;
 
-                $accountventilated = new AccountingAccount($db);
-                $accountventilated->fetch($monCompte, '');
+				$accountventilated = new AccountingAccount($db);
+				$accountventilated->fetch($monCompte, '', 1);
 
-                dol_syslog('accountancy/expensereport/list.php:: sql='.$sql, LOG_DEBUG);
-                if ($db->query($sql)) {
-                    $msg .= '<div><font color="green">'.$langs->trans("LineOfExpenseReport").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</font></div>';
-                    $ok++;
-                } else {
-                    $msg .= '<div><font color="red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br/> <pre>'.$sql.'</pre></font></div>';
-                    $ko++;
-                }
-            }
+				dol_syslog('accountancy/expensereport/list.php:: sql='.$sql, LOG_DEBUG);
+				if ($db->query($sql)) {
+					$msg .= '<div><span style="color:green">'.$langs->trans("LineOfExpenseReport").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</span></div>';
+					$ok++;
+				} else {
+					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br/> <pre>'.$sql.'</pre></span></div>';
+					$ko++;
+				}
+			}
 
-            $cpt++;
-        }
-        $msg .= '</div>';
-        $msg .= '<div>'.$langs->trans("EndProcessing").'</div>';
-    }
+			$cpt++;
+		}
+		$msg .= '</div>';
+		$msg .= '<div>'.$langs->trans("EndProcessing").'</div>';
+	}
 }
 
 
@@ -180,8 +181,8 @@ if (empty($chartaccountcode))
 {
 	print $langs->trans("ErrorChartOfAccountSystemNotSelected");
 	// End of page
-    llxFooter();
-    $db->close();
+	llxFooter();
+	$db->close();
 	exit;
 }
 
@@ -189,30 +190,39 @@ if (empty($chartaccountcode))
 $sql = "SELECT er.ref, er.rowid as erid, er.date_debut, er.date_valid,";
 $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.vat_src_code, erd.date,";
 $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,";
+$sql .= " u.rowid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
 $sql .= " aa.rowid as aarowid";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as f ON f.id = erd.fk_c_type_fees";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON f.accountancy_code = aa.account_number AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = er.fk_user_author";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON f.accountancy_code = aa.account_number AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
 $sql .= " WHERE er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseReport::STATUS_CLOSED.") AND erd.fk_code_ventilation <= 0";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 // Add search filter like
+if (strlen(trim($search_login))) {
+	$sql .= natural_search("u.login", $search_login);
+}
 if (strlen(trim($search_expensereport))) {
-    $sql .= natural_search("er.ref", $search_expensereport);
+	$sql .= natural_search("er.ref", $search_expensereport);
 }
 if (strlen(trim($search_label))) {
-    $sql .= natural_search("f.label", $search_label);
+	$sql .= natural_search("f.label", $search_label);
 }
 if (strlen(trim($search_desc))) {
-    $sql .= natural_search("erd.comments", $search_desc);
+	$sql .= natural_search("erd.comments", $search_desc);
 }
 if (strlen(trim($search_amount))) {
-    $sql .= natural_search("erd.total_ht", $search_amount, 1);
+	$sql .= natural_search("erd.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-    $sql .= natural_search("aa.account_number", $search_account);
+	$sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-    $sql .= natural_search("erd.tva_tx", $search_vat, 1);
+	$sql .= natural_search("erd.tva_tx", $search_vat, 1);
 }
 $sql .= dolSqlDateFilter('erd.date', $search_day, $search_month, $search_year);
 $sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
@@ -223,13 +233,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);
@@ -245,6 +255,7 @@ if ($result) {
 	$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_login)       $param .= '&search_login='.urlencode($search_login);
 	if ($search_lineid)      $param .= '&search_lineid='.urlencode($search_lineid);
 	if ($search_day)         $param .= '&search_day='.urlencode($search_day);
 	if ($search_month)       $param .= '&search_month='.urlencode($search_month);
@@ -256,7 +267,7 @@ if ($result) {
 	if ($search_vat)         $param .= '&search_vat='.urlencode($search_vat);
 
 	$arrayofmassactions = array(
-	    'ventil' => $langs->trans("Ventilate")
+		'ventil' => $langs->trans("Ventilate")
 	);
 	$massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
 
@@ -284,14 +295,15 @@ if ($result) {
 
 	$moreforfilter = '';
 
-    print '<div class="div-table-responsive">';
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// We add search filter
 	print '<tr class="liste_titre_filter">';
+	print '<td class="liste_titre"><input type="text" name="search_login" class="maxwidth50" value="'.$search_login.'"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_expensereport" value="'.dol_escape_htmltag($search_expensereport).'"></td>';
-	if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+	if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
 		print '<td class="liste_titre"></td>';
 	}
 	print '<td class="liste_titre center nowraponall minwidth100imp">';
@@ -312,9 +324,10 @@ if ($result) {
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
+	print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.login", $param, "", "", $sortfield, $sortorder);
 	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "erd.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("ExpenseReport", $_SERVER["PHP_SELF"], "er.ref", "", $param, '', $sortfield, $sortorder);
-	if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+	if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
 		print_liste_field_titre("DateValidation", $_SERVER["PHP_SELF"], "er.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
 	print_liste_field_titre("DateOfLine", $_SERVER["PHP_SELF"], "erd.date, erd.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -331,6 +344,7 @@ if ($result) {
 
 
 	$expensereport_static = new ExpenseReport($db);
+	$userstatic = new User($db);
 	$form = new Form($db);
 
 	while ($i < min($num_lines, $limit)) {
@@ -342,8 +356,24 @@ if ($result) {
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 
+		$userstatic->id = $objp->rowid;
+		$userstatic->ref = $objp->label;
+		$userstatic->login = $objp->login;
+		$userstatic->statut = $objp->statut;
+		$userstatic->email = $objp->email;
+		$userstatic->gender = $objp->gender;
+		$userstatic->firstname = $objp->firstname;
+		$userstatic->lastname = $objp->lastname;
+		$userstatic->employee = $objp->employee;
+		$userstatic->photo = $objp->photo;
+
 		print '<tr class="oddeven">';
 
+		// Login
+		print '<td class="nowraponall">';
+		print $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
+		print '</td>';
+
 		// Line id
 		print '<td>'.$objp->rowid.'</td>';
 
@@ -351,7 +381,7 @@ if ($result) {
 		print '<td>'.$expensereport_static->getNomUrl(1).'</td>';
 
 		// Date validation
-		if (! empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
+		if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
 			print '<td class="center">'.dol_print_date($db->jdate($objp->date_valid), 'day').'</td>';
 		}
 
@@ -370,6 +400,7 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
 
+		// Amount without taxes
 		print '<td class="nowrap right">';
 		print price($objp->price);
 		print '</td>';
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index f44b5bc72f8..80ed833b828 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -38,6 +38,7 @@ if ($user->socid > 0)
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
 $hookmanager->initHooks(array('accountancyindex'));
 
+
 /*
  * Actions
  */
@@ -54,6 +55,7 @@ if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax dis
     if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
 }
 
+
 /*
  * View
  */
@@ -240,9 +242,7 @@ if ($conf->accounting->enabled)
     print $boxlist;
 
     print '</div>';
-}
-else
-{
+} else {
     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 4af83a1f121..0ed6db948a2 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -90,17 +90,19 @@ if ($user->socid > 0 && empty($id_journal))
 
 $error = 0;
 
-$year_current = strftime("%Y", dol_now());
-$pastmonth = strftime("%m", dol_now()) - 1;
-$pastmonthyear = $year_current;
-if ($pastmonth == 0) {
-	$pastmonth = 12;
-	$pastmonthyear--;
-}
-
 $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);
 
+if (empty($date_startmonth) || empty($date_endmonth))
+{
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
+	$date_start = $dates['date_start'];
+	$date_end = $dates['date_end'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+
 if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
 {
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
@@ -124,6 +126,10 @@ $sql .= " WHERE ba.fk_accountancy_journal=".$id_journal;
 $sql .= ' AND b.amount != 0 AND ba.entity IN ('.getEntity('bank_account', 0).')'; // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND b.dateo >= '".$db->idate($date_start)."' AND b.dateo <= '".$db->idate($date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND b.dateo >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 // Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
 {
@@ -231,7 +237,7 @@ if ($result) {
 		);
 
 		// Set accountancy code for user
-		$compta_user = (!empty($obj->accountancy_code) ? $obj->accountancy_code : $account_employee);
+		$compta_user = (!empty($obj->accountancy_code) ? $obj->accountancy_code : '');
 
 		$tabuser[$obj->rowid] = array(
 				'id' => $obj->userid,
@@ -278,8 +284,7 @@ if ($result) {
 					// We save tabtype for a future use, to remember what kind of payment it is
 					$tabpay[$obj->rowid]['type'] = $links[$key]['type'];
 					$tabtype[$obj->rowid] = $links[$key]['type'];
-				}
-				elseif (in_array($links[$key]['type'], array('company', 'user')))
+				} elseif (in_array($links[$key]['type'], array('company', 'user')))
 				{
 					if ($tabpay[$obj->rowid]['type'] == 'unknown')
 					{
@@ -554,9 +559,7 @@ if (!$error && $action == 'writebookkeeping') {
 							$error++;
 							$errorforline++;
 							setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -580,9 +583,7 @@ if (!$error && $action == 'writebookkeeping') {
 						if ($tabtype[$key] == 'banktransfert')
 						{
 							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
-						}
-						else
-						{
+						} else {
 							$reflabel .= dol_string_nohtmltag($val['soclib']);
 						}
 
@@ -704,9 +705,7 @@ if (!$error && $action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -714,8 +713,7 @@ if (!$error && $action == 'writebookkeeping') {
 						}
 					}
 				}
-			}
-			else {	// If thirdparty unknown, output the waiting account
+			} else {	// If thirdparty unknown, output the waiting account
 				foreach ($tabbq[$key] as $k => $mt) {
 					if ($mt)
 					{
@@ -752,9 +750,7 @@ if (!$error && $action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -775,9 +771,7 @@ if (!$error && $action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			//print 'KO for line '.$key.' '.$error.'<br>';
 			$db->rollback();
 
@@ -792,13 +786,10 @@ if (!$error && $action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -884,9 +875,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					if ($tabtype[$key] == 'banktransfert')
 					{
 						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
-					}
-					else
-					{
+					} else {
 						$reflabel .= dol_string_nohtmltag($val['soclib']);
 					}
 
@@ -981,11 +970,11 @@ if (empty($action) || $action == 'view') {
 		$obj = $db->fetch_object($resql);
 		if ($obj->nb > 0)
 		{
-			print '<br>'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
+			print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
 			print ' : '.$langs->trans("AccountancyAreaDescBank", 9, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>');
+			print '</div>';
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 
 	// Button to write into Ledger
@@ -1004,8 +993,7 @@ if (empty($action) || $action == 'view') {
 	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").'" />';
-	}
-	else {
+	} 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>';
 	}
@@ -1077,8 +1065,7 @@ if (empty($action) || $action == 'view') {
 				if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
-				}
-				else print $accounttoshow;
+				} else print $accounttoshow;
 				print "</td>";
 				// Subledger account
 				print "<td>";
@@ -1109,9 +1096,7 @@ if (empty($action) || $action == 'view') {
 					if ($tabtype[$key] == 'banktransfert')
 					{
 						$reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
-					}
-					else
-					{
+					} else {
 						$reflabel .= $val['soclib'];
 					}
 
@@ -1139,14 +1124,10 @@ if (empty($action) || $action == 'view') {
 							if (empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) || $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE == '-1')
 							{
 								print '<span class="error">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
-							}
-							else
-							{
+							} else {
 								print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will use a waiting account
 							}
-						}
-						else
-						{
+						} else {
 							// We will refuse writing
 							$errorstring = 'UnknownAccountForThirdpartyBlocking';
 							if ($tabtype[$key] == 'payment')				$errorstring = 'MainAccountForCustomersNotDefined';
@@ -1157,8 +1138,7 @@ if (empty($action) || $action == 'view') {
 							if ($tabtype[$key] == 'member')					$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
 							print '<span class="error">'.$langs->trans($errorstring).'</span>';
 						}
-					}
-					else print $accounttoshow;
+					} else print $accounttoshow;
 					print "</td>";
 
 					// Subledger account
@@ -1182,13 +1162,10 @@ if (empty($action) || $action == 'view') {
 									} else {
 										print '<span class="warning">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
 									}
-								}
-								else
-								{
+								} else {
 									print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
 								}
-							}
-							else print $accounttoshowsubledger;
+							} else print $accounttoshowsubledger;
 						}
 					}
 					print "</td>";
@@ -1294,57 +1271,49 @@ function getSourceDocRef($val, $typerecord)
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac, ".MAIN_DB_PREFIX."facture as f";
 		$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=".$val["paymentid"];
 		$ref = $langs->transnoentitiesnoconv("Invoice");
-	}
-	elseif ($typerecord == 'payment_supplier')
+	} elseif ($typerecord == 'payment_supplier')
 	{
 		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".$val["paymentsupplierid"];
 		$ref = $langs->transnoentitiesnoconv("SupplierInvoice");
-	}
-	elseif ($typerecord == 'payment_expensereport')
+	} elseif ($typerecord == 'payment_expensereport')
 	{
 		$sqlmid = 'SELECT e.rowid as id, e.ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
 		$sqlmid .= " WHERE pe.rowid=".$val["paymentexpensereport"]." AND pe.fk_expensereport = e.rowid";
 		$ref = $langs->transnoentitiesnoconv("ExpenseReport");
-	}
-	elseif ($typerecord == 'payment_salary')
+	} elseif ($typerecord == 'payment_salary')
 	{
 		$sqlmid = 'SELECT s.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 		$sqlmid .= " WHERE s.rowid=".$val["paymentsalid"];
 		$ref = $langs->transnoentitiesnoconv("SalaryPayment");
-	}
-	elseif ($typerecord == 'sc')
+	} elseif ($typerecord == 'sc')
 	{
 		$sqlmid = 'SELECT sc.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementcharge as sc";
 		$sqlmid .= " WHERE sc.rowid=".$val["paymentscid"];
 		$ref = $langs->transnoentitiesnoconv("SocialContribution");
-	}
-	elseif ($typerecord == 'payment_vat')
+	} elseif ($typerecord == 'payment_vat')
 	{
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
 		$sqlmid .= " WHERE v.rowid=".$val["paymentvatid"];
 		$ref = $langs->transnoentitiesnoconv("PaymentVat");
-	}
-	elseif ($typerecord == 'payment_donation')
+	} elseif ($typerecord == 'payment_donation')
 	{
 		$sqlmid = 'SELECT payd.fk_donation as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
 		$sqlmid .= " WHERE payd.fk_donation=".$val["paymentdonationid"];
 		$ref = $langs->transnoentitiesnoconv("Donation");
-	}
-	elseif ($typerecord == 'payment_loan')
+	} elseif ($typerecord == 'payment_loan')
 	{
 		$sqlmid = 'SELECT l.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_loan as l";
 		$sqlmid .= " WHERE l.rowid=".$val["paymentloanid"];
 		$ref = $langs->transnoentitiesnoconv("LoanPayment");
-	}
-	elseif ($typerecord == 'payment_various')
+	} elseif ($typerecord == 'payment_various')
 	{
 		$sqlmid = 'SELECT v.rowid as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
@@ -1367,8 +1336,7 @@ function getSourceDocRef($val, $typerecord)
 			{
 				$ref .= ' '.$objmid->ref;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 
 	$ref = dol_trunc($langs->transnoentitiesnoconv("BankId").' '.$val['fk_bank'].' - '.$ref, 295); // 295 + 3 dots (...) is < than max size of 300
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 9d8d13b2aec..bf8275cee1c 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -70,17 +70,19 @@ $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
 $journal_label = $accountingjournalstatic->label;
 
-$year_current = strftime("%Y", dol_now());
-$pastmonth = strftime("%m", dol_now()) - 1;
-$pastmonthyear = $year_current;
-if ($pastmonth == 0) {
-	$pastmonth = 12;
-	$pastmonthyear--;
-}
-
 $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);
 
+if (empty($date_startmonth) || empty($date_endmonth))
+{
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
+	$date_start = $dates['date_start'];
+	$date_end = $dates['date_end'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+
 if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
 {
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
@@ -101,6 +103,10 @@ $sql .= " AND erd.fk_code_ventilation > 0";
 $sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 if ($date_start && $date_end)
 	$sql .= " AND er.date_debut >= '".$db->idate($date_start)."' AND er.date_debut <= '".$db->idate($date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 // Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
 {
@@ -231,9 +237,7 @@ if ($action == 'writebookkeeping') {
 							$error++;
 							$errorforline++;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -281,9 +285,7 @@ if ($action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -341,9 +343,7 @@ if ($action == 'writebookkeeping') {
 								$error++;
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
@@ -365,9 +365,7 @@ if ($action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -382,13 +380,10 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -511,8 +506,7 @@ 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 (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -582,8 +576,7 @@ if (empty($action) || $action == 'view') {
 				if (($accountoshow == "") || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("FeeAccountNotDefined").'</span>';
-				}
-				else print $accountoshow;
+				} else print $accountoshow;
 				print '</td>';
 				// Subledger account
 				print "<td>";
@@ -612,8 +605,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForUsersNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -621,8 +613,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("UserAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
@@ -649,8 +640,7 @@ if (empty($action) || $action == 'view') {
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 42bff74097f..8e409b497b5 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -75,17 +75,19 @@ $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
 $journal_label = $accountingjournalstatic->label;
 
-$year_current = strftime("%Y", dol_now());
-$pastmonth = strftime("%m", dol_now()) - 1;
-$pastmonthyear = $year_current;
-if ($pastmonth == 0) {
-	$pastmonth = 12;
-	$pastmonthyear--;
-}
-
 $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);
 
+if (empty($date_startmonth) || empty($date_endmonth))
+{
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
+	$date_start = $dates['date_start'];
+	$date_end = $dates['date_end'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+
 if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
 {
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
@@ -111,6 +113,10 @@ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 }
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 // Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
 {
@@ -152,8 +158,9 @@ if ($result) {
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
 				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
-			else
+			else {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : 'NotDefined';
+			}
 		}
 
 		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
@@ -226,8 +233,7 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		{
 			$errorforinvoice[$key] = 'somelinesarenotbound';
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 //var_dump($errorforinvoice);exit;
 
@@ -331,9 +337,7 @@ if ($action == 'writebookkeeping') {
 						$errorforline++;
 						$errorforinvoice[$key] = 'alreadyjournalized';
 						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-					}
-					else
-					{
+					} else {
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'other';
@@ -383,9 +387,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -446,9 +448,7 @@ if ($action == 'writebookkeeping') {
 								$errorforline++;
 								$errorforinvoice[$key] = 'alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'other';
@@ -499,9 +499,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -524,9 +522,7 @@ if ($action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -541,13 +537,10 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -743,8 +736,7 @@ 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_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 {
+	} else {
 		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -871,8 +863,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForSuppliersNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			// Subledger account
 			print "<td>";
@@ -880,8 +871,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
@@ -904,8 +894,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -937,8 +926,7 @@ if (empty($action) || $action == 'view') {
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").')</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
@@ -968,8 +956,7 @@ if (empty($action) || $action == 'view') {
 					if ($accountoshow == '' || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print '</td>';
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index c3c9f45ed5a..589bad72749 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -78,17 +78,19 @@ $accountingjournalstatic->fetch($id_journal);
 $journal = $accountingjournalstatic->code;
 $journal_label = $accountingjournalstatic->label;
 
-$year_current = strftime("%Y", dol_now());
-$pastmonth = strftime("%m", dol_now()) - 1;
-$pastmonthyear = $year_current;
-if ($pastmonth == 0) {
-	$pastmonth = 12;
-	$pastmonthyear--;
-}
-
 $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);
 
+if (empty($date_startmonth) || empty($date_endmonth))
+{
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
+	$date_start = $dates['date_start'];
+	$date_end = $dates['date_end'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+
 if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
 {
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
@@ -115,6 +117,10 @@ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Non common s
 $sql .= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 // Already in bookkeeping or not
 if ($in_bookkeeping == 'already')
 {
@@ -158,8 +164,9 @@ if ($result) {
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
 				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : 'NotDefined';
-			else
+			else {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : 'NotDefined';
+			}
 		}
 
 		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
@@ -240,8 +247,7 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 		{
 			$errorforinvoice[$key] = 'somelinesarenotbound';
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 //var_dump($errorforinvoice);exit;
 
@@ -342,9 +348,7 @@ if ($action == 'writebookkeeping') {
 						$errorforline++;
 						$errorforinvoice[$key] = 'alreadyjournalized';
 						//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-					}
-					else
-					{
+					} else {
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'other';
@@ -394,9 +398,7 @@ if ($action == 'writebookkeeping') {
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
-						{
+						} else {
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'other';
@@ -456,9 +458,7 @@ if ($action == 'writebookkeeping') {
 								$errorforline++;
 								$errorforinvoice[$key] = 'alreadyjournalized';
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
-							{
+							} else {
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'other';
@@ -482,9 +482,7 @@ if ($action == 'writebookkeeping') {
 		if (!$errorforline)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 
 			if ($error >= 10)
@@ -499,13 +497,9 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
-	{
+	} elseif (count($tabpay) == $error) {
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
@@ -659,8 +653,9 @@ if (empty($action) || $action == 'view') {
 	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 		$description .= $langs->trans("DepositsAreNotIncluded");
-	else
+	else {
 		$description .= $langs->trans("DepositsAreIncluded");
+	}
 
 	$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);
@@ -680,8 +675,7 @@ 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') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	}
-	else {
+	} else {
 		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
 	}
@@ -807,8 +801,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			// Subledger account
 			print "<td>";
@@ -816,8 +809,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
@@ -841,8 +833,7 @@ if (empty($action) || $action == 'view') {
 			if (($accountoshow == "") || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
-			}
-			else print $accountoshow;
+			} else print $accountoshow;
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -875,8 +866,7 @@ if (empty($action) || $action == 'view') {
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").')</span>';
-					}
-					else print $accountoshow;
+					} else print $accountoshow;
 					print "</td>";
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 699459ad63a..4a4747cfaf4 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "accountancy"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -63,9 +63,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 		$resql = $db->query($sql);
 		if (!$resql) {
 			setEventMessages($db->lasterror(), null, 'errors');
-		}
-		else
-		{
+		} else {
 		    setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 		    if ($backtopage)
 		    {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 7e8a9a6a261..0dbe09fa468 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -45,8 +45,7 @@ if (!$user->rights->accounting->bind->write)
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else
-{
+else {
 	$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
 }
@@ -129,9 +128,9 @@ if ($action == 'validatehistory') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$chartaccountcode."' AND aa2.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$chartaccountcode."' AND aa3.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
 	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 	$sql .= " AND l.product_type <= 2";
 
@@ -192,8 +191,7 @@ if ($action == 'validatehistory') {
 	if ($error)
 	{
 		$db->rollback();
-	}
-	else {
+	} else {
 		$db->commit();
 		setEventMessages($langs->trans('AutomaticBindingDone'), null, 'mesgs');
 	}
@@ -234,7 +232,7 @@ for ($i = 1; $i <= 12; $i++) {
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-$sql = "SELECT  ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
+$sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
@@ -247,6 +245,10 @@ $sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as ff ON ff.rowid = ffd.fk_
 $sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = ffd.fk_code_ventilation";
 $sql .= " WHERE ff.datef >= '".$db->idate($search_date_start)."'";
 $sql .= "  AND ff.datef <= '".$db->idate($search_date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND ff.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 $sql .= "  AND ff.fk_statut > 0";
 $sql .= "  AND ffd.product_type <= 2";
 $sql .= " AND ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
@@ -263,15 +265,13 @@ if ($resql) {
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -305,7 +305,7 @@ for ($i = 1; $i <= 12; $i++) {
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-$sql = "SELECT  ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
+$sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
@@ -318,6 +318,10 @@ $sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as ff ON ff.rowid = ffd.fk_
 $sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = ffd.fk_code_ventilation";
 $sql .= " WHERE ff.datef >= '".$db->idate($search_date_start)."'";
 $sql .= "  AND ff.datef <= '".$db->idate($search_date_end)."'";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND ff.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 $sql .= "  AND ff.fk_statut > 0";
 $sql .= "  AND ffd.product_type <= 2";
 $sql .= " AND ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
@@ -327,33 +331,31 @@ $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 dol_syslog('htdocs/accountancy/supplier/index.php');
 $resql = $db->query($sql);
 if ($resql) {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    while ($row = $db->fetch_row($resql)) {
+	while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
-		}
-		else print length_accountg($row[0]);
+		} else print length_accountg($row[0]);
 		print '</td>';
 		print '<td class="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		}
-		else print $row[1];
+		} else print $row[1];
 		print '</td>';
-    	for ($i = 2; $i <= 12; $i++) {
-            print '<td class="nowrap right">'.price($row[$i]).'</td>';
-        }
-        print '<td class="nowrap right">'.price($row[13]).'</td>';
-        print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
-        print '</tr>';
-    }
-    $db->free($resql);
+		for ($i = 2; $i <= 12; $i++) {
+			print '<td class="nowrap right">'.price($row[$i]).'</td>';
+		}
+		print '<td class="nowrap right">'.price($row[13]).'</td>';
+		print '<td class="nowrap right"><b>'.price($row[14]).'</b></td>';
+		print '</tr>';
+	}
+	$db->free($resql);
 } else {
-    print $db->lasterror(); // Show last sql error
+	print $db->lasterror(); // Show last sql error
 }
 print "</table>\n";
 print '</div>';
@@ -362,56 +364,60 @@ print '</div>';
 
 if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report that should rely on result of this step ?
 {
-    print '<br>';
-    print '<br>';
+	print '<br>';
+	print '<br>';
 
-    print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
-    //print load_fiche_titre($langs->trans("OtherInfo"), '', '');
+	print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+	//print load_fiche_titre($langs->trans("OtherInfo"), '', '');
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("Total").'</td>';
-    for ($i = 1; $i <= 12; $i++) {
-    	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-    	if ($j > 12) $j -= 12;
-    	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
-    }
-    print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("Total").'</td>';
+	for ($i = 1; $i <= 12; $i++) {
+		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+		if ($j > 12) $j -= 12;
+		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+	}
+	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-    $sql = "SELECT '".$langs->trans("CAHTF")."' AS label,";
-    for ($i = 1; $i <= 12; $i++) {
-    	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-    	if ($j > 12) $j -= 12;
-    	$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
-    }
-    $sql .= "  SUM(ffd.total_ht) as total";
-    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as ffd";
-    $sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as ff ON ff.rowid = ffd.fk_facture_fourn";
-    $sql .= " WHERE ff.datef >= '".$db->idate($search_date_start)."'";
-    $sql .= "  AND ff.datef <= '".$db->idate($search_date_end)."'";
-    $sql .= "  AND ff.fk_statut > 0";
+	$sql = "SELECT '".$db->escape($langs->trans("CAHTF"))."' AS label,";
+	for ($i = 1; $i <= 12; $i++) {
+		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+		if ($j > 12) $j -= 12;
+		$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+	}
+	$sql .= "  SUM(ffd.total_ht) as total";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as ffd";
+	$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as ff ON ff.rowid = ffd.fk_facture_fourn";
+	$sql .= " WHERE ff.datef >= '".$db->idate($search_date_start)."'";
+	$sql .= "  AND ff.datef <= '".$db->idate($search_date_end)."'";
+	// Define begin binding date
+	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+		$sql .= " AND ff.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+	}
+	$sql .= "  AND ff.fk_statut > 0";
 	$sql .= "  AND ffd.product_type <= 2";
-    $sql .= " AND ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
+	$sql .= " AND ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
 
-    dol_syslog('htdocs/accountancy/supplier/index.php');
-    $resql = $db->query($sql);
-    if ($resql) {
-    	$num = $db->num_rows($resql);
+	dol_syslog('htdocs/accountancy/supplier/index.php');
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
 
-    	while ($row = $db->fetch_row($resql)) {
-    		print '<tr><td>'.$row[0].'</td>';
-            for ($i = 1; $i <= 12; $i++) {
-    			print '<td class="nowrap right">'.price($row[$i]).'</td>';
-    		}
-    		print '<td class="nowrap right"><b>'.price($row[13]).'</b></td>';
-    		print '</tr>';
-    	}
-        $db->free($resql);
-    } else {
-        print $db->lasterror(); // Show last sql error
-    }
-    print "</table>\n";
-    print '</div>';
+		while ($row = $db->fetch_row($resql)) {
+			print '<tr><td>'.$row[0].'</td>';
+			for ($i = 1; $i <= 12; $i++) {
+				print '<td class="nowrap right">'.price($row[$i]).'</td>';
+			}
+			print '<td class="nowrap right"><b>'.price($row[13]).'</b></td>';
+			print '</tr>';
+		}
+		$db->free($resql);
+	} else {
+		print $db->lasterror(); // Show last sql error
+	}
+	print "</table>\n";
+	print '</div>';
 }
 
 // End of page
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 30976287769..903d2188a80 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -62,8 +62,8 @@ $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 
 // 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', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$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;
@@ -94,7 +94,7 @@ $formaccounting = new FormAccounting($db);
 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_societe = '';
-    $search_lineid = '';
+	$search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
 	$search_label = '';
@@ -177,7 +177,7 @@ print '<script type="text/javascript">
  */
 $sql = "SELECT f.rowid as facid, f.ref as ref, f.ref_supplier, f.libelle as invoice_label, f.datef, f.fk_soc,";
 $sql .= " l.rowid, l.fk_product, l.product_type as line_type, l.description, l.total_ht , l.qty, l.tva_tx, l.vat_src_code,";
-$sql .= " aa.label, aa.labelshort, aa.account_number, ";
+$sql .= " aa.label, aa.labelshort, aa.account_number,";
 $sql .= " p.rowid as product_id, p.fk_product_type as product_type, p.ref as product_ref, p.label as product_label, p.fk_product_type as type,";
 $sql .= " co.code as country_code, co.label as country,";
 $sql .= " s.rowid as socid, s.nom as name, s.tva_intra, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur";
@@ -196,7 +196,7 @@ if ($search_societe) {
 	$sql .= natural_search('s.nom', $search_societe);
 }
 if ($search_lineid) {
-    $sql .= natural_search("l.rowid", $search_lineid, 1);
+	$sql .= natural_search("l.rowid", $search_lineid, 1);
 }
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.ref", $search_invoice);
@@ -250,13 +250,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);
@@ -318,7 +318,7 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth75imp" name="search_societe" value="' . dol_escape_htmltag($search_societe) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth75imp" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 	print '<td class="liste_titre">';
 	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1);
 	//	print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
@@ -343,17 +343,19 @@ if ($result) {
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("AccountAccounting", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	$checkpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
-	$thirdpartystatic			= new Societe($db);
-	$facturefournisseur_static	= new FactureFournisseur($db);
-	$product_static				= new ProductFournisseur($db);
-	$accountingaccountstatic	= new AccountingAccount($db);
+	$thirdpartystatic = new Societe($db);
+	$facturefournisseur_static = new FactureFournisseur($db);
+	$productstatic = new ProductFournisseur($db);
+	$accountingaccountstatic = new AccountingAccount($db);
 
-	while ($i < min($num_lines, $limit)) {
+	$i = 0;
+	while ($i < min($num_lines, $limit))
+	{
 		$objp = $db->fetch_object($result);
 
 		$facturefournisseur_static->ref = $objp->ref;
@@ -370,10 +372,10 @@ if ($result) {
 		$thirdpartystatic->email = $objp->email;
 		$thirdpartystatic->country_code = $objp->country_code;
 
-		$product_static->ref = $objp->product_ref;
-		$product_static->id = $objp->product_id;
-		$product_static->label = $objp->product_label;
-		$product_static->type = $objp->line_type;
+		$productstatic->ref = $objp->product_ref;
+		$productstatic->id = $objp->product_id;
+		$productstatic->label = $objp->product_label;
+		$productstatic->type = $objp->line_type;
 
 		$accountingaccountstatic->rowid = $objp->fk_compte;
 		$accountingaccountstatic->label = $objp->label;
@@ -397,8 +399,8 @@ if ($result) {
 
 		// Ref Product
 		print '<td class="tdoverflowmax100">';
-		if ($product_static->id > 0) print $product_static->getNomUrl(1);
-		if ($product_static->id > 0 && $objp->product_label) print '<br>';
+		if ($productstatic->id > 0) print $productstatic->getNomUrl(1);
+		if ($productstatic->id > 0 && $objp->product_label) print '<br>';
 		if ($objp->product_label) print '<span class="opacitymedium">'.$objp->product_label.'</span>';
 		print '</td>';
 
@@ -413,7 +415,7 @@ if ($result) {
 		print '<td class="right">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
 		// Thirdparty
-		print '<td class="tdoverflowmax100">' . $thirdpartystatic->getNomUrl(1, 'supplier') . '</td>';
+		print '<td class="tdoverflowmax100">'.$thirdpartystatic->getNomUrl(1, 'supplier').'</td>';
 
 		// Country
 		print '<td>';
@@ -425,8 +427,9 @@ if ($result) {
 
 		print '<td>'.$objp->tva_intra.'</td>';
 
-		print '<td>';
-		print $accountingaccountstatic->getNomUrl(0, 1, 1).' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
+		print '<td class="center">';
+		print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
+		print ' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';
@@ -434,14 +437,14 @@ if ($result) {
 		print '</tr>';
 		$i++;
 	}
-    print '</table>';
-    print "</div>";
+	print '</table>';
+	print "</div>";
 
-    if ($nbtotalofrecords > $limit) {
-        print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
-    }
+	if ($nbtotalofrecords > $limit) {
+		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, '', 0, '', '', $limit, 1);
+	}
 
-    print '</form>';
+	print '</form>';
 } else {
 	print $db->lasterror();
 }
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 6ef942bea89..96b36fa8fa3 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "companies", "compta", "accountancy", "other", "productbatch"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -69,8 +69,8 @@ $btn_ventil = GETPOST('ventil', 'alpha');
 
 // 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', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$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;
@@ -118,7 +118,7 @@ if (empty($reshook))
 	// 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_societe='';
+		$search_societe = '';
 		$search_lineid = '';
 		$search_ref = '';
 		$search_invoice = '';
@@ -144,50 +144,48 @@ if (empty($reshook))
 
 
 if ($massaction == 'ventil') {
-    $msg = '';
+	$msg = '';
 
-    //print '<div><font color="red">' . $langs->trans("Processing") . '...</font></div>';
-    if (!empty($mesCasesCochees)) {
-        $msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
-        $msg .= '<div class="detail">';
-        $cpt = 0;
-        $ok = 0;
-        $ko = 0;
+	//print '<div><span style="color:red">' . $langs->trans("Processing") . '...</span></div>';
+	if (!empty($mesCasesCochees)) {
+		$msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
+		$msg .= '<div class="detail">';
+		$cpt = 0;
+		$ok = 0;
+		$ko = 0;
 
-        foreach ($mesCasesCochees as $maLigneCochee) {
-            $maLigneCourante = explode("_", $maLigneCochee);
-            $monId = $maLigneCourante[0];
-            $monCompte = GETPOST('codeventil'.$monId);
+		foreach ($mesCasesCochees as $maLigneCochee) {
+			$maLigneCourante = explode("_", $maLigneCochee);
+			$monId = $maLigneCourante[0];
+			$monCompte = GETPOST('codeventil'.$monId);
 
-            if ($monCompte <= 0)
-            {
-                $msg .= '<div><font color="red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</font></div>';
-                $ko++;
-            }
-            else
-            {
-                $sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
-                $sql .= " SET fk_code_ventilation = ".$monCompte;
-                $sql .= " WHERE rowid = ".$monId;
+			if ($monCompte <= 0)
+			{
+				$msg .= '<div><span style="color:red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</span></div>';
+				$ko++;
+			} else {
+				$sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
+				$sql .= " SET fk_code_ventilation = ".$monCompte;
+				$sql .= " WHERE rowid = ".$monId;
 
-                $accountventilated = new AccountingAccount($db);
-                $accountventilated->fetch($monCompte, '');
+				$accountventilated = new AccountingAccount($db);
+				$accountventilated->fetch($monCompte, '', 1);
 
-                dol_syslog('accountancy/supplier/list.php:: sql='.$sql, LOG_DEBUG);
-                if ($db->query($sql)) {
-                    $msg .= '<div><font color="green">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</font></div>';
-                    $ok++;
-                } else {
-                    $msg .= '<div><font color="red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br/> <pre>'.$sql.'</pre></font></div>';
-                    $ko++;
-                }
-            }
+				dol_syslog('accountancy/supplier/list.php:: sql='.$sql, LOG_DEBUG);
+				if ($db->query($sql)) {
+					$msg .= '<div><span style="color:green">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</span></div>';
+					$ok++;
+				} else {
+					$msg .= '<div><span style="color:red">'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'<br/> <pre>'.$sql.'</pre></span></div>';
+					$ko++;
+				}
+			}
 
-            $cpt++;
-        }
-        $msg .= '</div>';
-        $msg .= '<div>'.$langs->trans("EndProcessing").'</div>';
-    }
+			$cpt++;
+		}
+		$msg .= '</div>';
+		$msg .= '<div>'.$langs->trans("EndProcessing").'</div>';
+	}
 }
 
 
@@ -205,8 +203,8 @@ if (empty($chartaccountcode))
 {
 	print $langs->trans("ErrorChartOfAccountSystemNotSelected");
 	// End of page
-    llxFooter();
-    $db->close();
+	llxFooter();
+	$db->close();
 	exit;
 }
 
@@ -228,38 +226,42 @@ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn_det as l ON f.rowid = l.fk_facture_fourn";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$chartaccountcode."' AND aa.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$chartaccountcode."' AND aa2.entity = ".$conf->entity;
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$chartaccountcode."' AND aa3.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON p.accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON p.accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON p.accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
 $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
 $sql .= " AND l.product_type <= 2";
+// Define begin binding date
+if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+}
 // Add search filter like
 if ($search_societe) {
 	$sql .= natural_search('s.nom', $search_societe);
 }
 if ($search_lineid) {
-    $sql .= natural_search("l.rowid", $search_lineid, 1);
+	$sql .= natural_search("l.rowid", $search_lineid, 1);
 }
 if (strlen(trim($search_invoice))) {
-    $sql .= natural_search("f.ref", $search_invoice);
+	$sql .= natural_search("f.ref", $search_invoice);
 }
 if (strlen(trim($search_label))) {
 	$sql .= natural_search("f.libelle", $search_label);
 }
 if (strlen(trim($search_ref))) {
-    $sql .= natural_search("p.ref", $search_ref);
+	$sql .= natural_search("p.ref", $search_ref);
 }
 if (strlen(trim($search_desc))) {
-    $sql .= natural_search("l.description", $search_desc);
+	$sql .= natural_search("l.description", $search_desc);
 }
 if (strlen(trim($search_amount))) {
-    $sql .= natural_search("l.total_ht", $search_amount, 1);
+	$sql .= natural_search("l.total_ht", $search_amount, 1);
 }
 if (strlen(trim($search_account))) {
-    $sql .= natural_search("aa.account_number", $search_account);
+	$sql .= natural_search("aa.account_number", $search_account);
 }
 if (strlen(trim($search_vat))) {
-    $sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
+	$sql .= natural_search("l.tva_tx", price2num($search_vat), 1);
 }
 $sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
 if (strlen(trim($search_country))) {
@@ -297,13 +299,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);
@@ -320,7 +322,7 @@ if ($result) {
 	$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_societe)     $param.='&search_societe='.urlencode($search_societe);
+	if ($search_societe)     $param .= '&search_societe='.urlencode($search_societe);
 	if ($search_lineid)      $param .= '&search_lineid='.urlencode($search_lineid);
 	if ($search_day)         $param .= '&search_day='.urlencode($search_day);
 	if ($search_month)       $param .= '&search_month='.urlencode($search_month);
@@ -335,9 +337,9 @@ if ($result) {
 	if ($search_tvaintra)	 $param .= "&search_tvaintra=".urlencode($search_tvaintra);
 
 	$arrayofmassactions = array(
-	    'ventil'=>$langs->trans("Ventilate")
-	    //'presend'=>$langs->trans("SendByMail"),
-	    //'builddoc'=>$langs->trans("PDFMerge"),
+		'ventil'=>$langs->trans("Ventilate")
+		//'presend'=>$langs->trans("SendByMail"),
+		//'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	//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();
@@ -373,7 +375,7 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="'.dol_escape_htmltag($search_lineid).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
+	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre center nowraponall minwidth100imp">';
    	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
    	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
@@ -383,9 +385,9 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
-	print '<td class="liste_titre"><input type="text" class="flat maxwidth75imp" name="search_societe" value="' . dol_escape_htmltag($search_societe) . '"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth75imp" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 	print '<td class="liste_titre">';
-	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth150', 'code2', 1, 0, 1);
+	print $form->select_country($search_country, 'search_country', '', 0, 'maxwidth125', 'code2', 1, 0, 1);
 	//print '<input type="text" class="flat maxwidth50" name="search_country" value="' . dol_escape_htmltag($search_country) . '">';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_tvaintra" value="'.dol_escape_htmltag($search_tvaintra).'"></td>';
@@ -400,7 +402,7 @@ if ($result) {
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
@@ -409,7 +411,7 @@ if ($result) {
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("VATIntraShort", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
 	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
 	$checkpicto = '';
@@ -417,7 +419,7 @@ if ($result) {
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
-	$thirdpartystatic=new Societe($db);
+	$thirdpartystatic = new Societe($db);
 	$facturefourn_static = new FactureFournisseur($db);
 	$product_static = new Product($db);
 
@@ -461,6 +463,7 @@ if ($result) {
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
 		$facturefourn_static->type = $objp->type;
+		$facturefourn_static->label = $objp->invoice_label;
 
 		$code_buy_p_notset = '';
 		$objp->aarowid_suggest = ''; // Will be set later
@@ -533,21 +536,22 @@ if ($result) {
 		// Ref Invoice
 		print '<td class="nowraponall">'.$facturefourn_static->getNomUrl(1).'</td>';
 
-		print '<td class="tdoverflowonsmartphone">';
+		/*print '<td class="tdoverflowonsmartphone">';
 		print $objp->invoice_label;
 		print '</td>';
+		*/
 
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datef), 'day').'</td>';
 
 		// Ref Product
-		print '<td>';
+		print '<td class="tdoverflowmax150">';
 		if ($product_static->id > 0)
 			print $product_static->getNomUrl(1);
-		if ($objp->product_label) print '<br><span class="opacitymedium">'.$objp->product_label.'</span>';
+		if ($objp->product_label) print '<br><span class="opacitymedium small">'.$objp->product_label.'</span>';
 		print '</td>';
 
 		// Description
-		print '<td class="tdoverflowonsmartphone">';
+		print '<td class="tdoverflowonsmartphone small">';
 		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
@@ -565,15 +569,15 @@ if ($result) {
 		print '</td>';
 
 		// Thirdparty
-		print '<td class="tdoverflowmax100">' . $thirdpartystatic->getNomUrl(1, 'supplier') . '</td>';
+		print '<td class="tdoverflowmax100">'.$thirdpartystatic->getNomUrl(1, 'supplier').'</td>';
 
 		// Country
-        print '<td>';
-        $labelcountry = ($objp->country_code && ($langs->trans("Country".$objp->country_code) != "Country".$objp->country_code)) ? $langs->trans("Country".$objp->country_code) : $objp->country_label;
-        print $labelcountry;
-        print '</td>';
+		print '<td>';
+		$labelcountry = ($objp->country_code && ($langs->trans("Country".$objp->country_code) != "Country".$objp->country_code)) ? $langs->trans("Country".$objp->country_code) : $objp->country_label;
+		print $labelcountry;
+		print '</td>';
 
-        // VAT Num
+		// VAT Num
 		print '<td>'.$objp->tva_intra.'</td>';
 
 		// Found accounts
@@ -609,8 +613,7 @@ if ($result) {
 					$suggestedid = $tmpaccount->id;
 				}
 				$accountingaccount_codetotid_cache[$objp->code_buy_l] = $tmpaccount->id;
-			}
-			else {
+			} else {
 				$suggestedid = $accountingaccount_codetotid_cache[$objp->code_buy_l];
 			}
 		}
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index fb957db2233..44e103059d7 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -58,9 +58,7 @@ if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$
 	$endaccountingperiod = dol_print_date(dol_get_last_day($tmparray['year'], $tmparray['mon']), 'dayxcard');
 
 	$completefilename = $siren."FEC".$endaccountingperiod.".txt";
-}
-else
-{
+} else {
 	$completefilename = ($code ? $code."_" : "").($prefix ? $prefix."_" : "").$filename.($nodateexport ? "" : $date_export).".".$format;
 }
 
diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 6b2d432fe46..f2c52daa4b0 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -41,7 +41,7 @@ if (!$user->admin) accessforbidden();
 
 $type = array('yesno', 'texte', 'chaine');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -49,8 +49,7 @@ $action = GETPOST('action', 'alpha');
  */
 
 //
-if ($action == 'updateall')
-{
+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);
@@ -58,36 +57,29 @@ if ($action == 'updateall')
     $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)
-    {
+    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))
-        {
+        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)
-    {
+    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0) {
         setEventMessages('ErrorFailedToSaveDate', null, 'errors');
         $db->rollback();
-    }
-    else
-    {
+    } else {
         setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
         $db->commit();
     }
 }
 
 // Action to update or add a constant
-if ($action == 'update' || $action == 'add')
-{
+if ($action == 'update' || $action == 'add') {
 	$constname = GETPOST('constname', 'alpha');
 	$constvalue = (GETPOST('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname) : GETPOST('constvalue'));
 
 	if (($constname == 'ADHERENT_CARD_TYPE' || $constname == 'ADHERENT_ETIQUETTE_TYPE' || $constname == 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS') && $constvalue == -1) $constvalue = '';
-	if ($constname == 'ADHERENT_LOGIN_NOT_REQUIRED') // Invert choice
-	{
+	if ($constname == 'ADHERENT_LOGIN_NOT_REQUIRED') { // Invert choice
 		if ($constvalue) $constvalue = 0;
 		else $constvalue = 1;
 	}
@@ -98,32 +90,25 @@ if ($action == 'update' || $action == 'add')
 
 	if (!$res > 0) $error++;
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
 // Action to enable of a submodule of the adherent module
-if ($action == 'set')
-{
+if ($action == 'set') {
     $result = dolibarr_set_const($db, GETPOST('name', 'alpha'), GETPOST('value'), '', 0, '', $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
 
 // Action to disable a submodule of the adherent module
-if ($action == 'unset')
-{
+if ($action == 'unset') {
     $result = dolibarr_del_const($db, GETPOST('name', 'alpha'), $conf->entity);
-    if ($result < 0)
-    {
+    if ($result < 0) {
         print $db->error();
     }
 }
@@ -183,33 +168,27 @@ if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty(
 if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) $arraychoices['bankviainvoice'] = $langs->trans("MoreActionBankViaInvoice");
 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')
-{
+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 '</td>';
 print "</tr>\n";
 
 // Use vat for invoice creation
-if ($conf->facture->enabled)
-{
+if ($conf->facture->enabled) {
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<td>';
 		print $form->selectarray('ADHERENT_VAT_FOR_SUBSCRIPTIONS', array('0'=>$langs->trans("NoVatOnSubscription"), 'defaultforfoundationcountry'=>$langs->trans("Default")), (empty($conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS) ? '0' : $conf->global->ADHERENT_VAT_FOR_SUBSCRIPTIONS), 0);
 		print '</td>';
-	}
-	else
-	{
+	} else {
 		print '<td class="right">';
 		print $langs->trans("WarningModuleNotActive", $langs->transnoentities("Module85Name"));
 		print '</td>';
 	}
 	print "</tr>\n";
 
-	if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-	{
+	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 		print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
 		print '<td>';
 		$form->select_produits($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
@@ -234,12 +213,12 @@ print '<br>';
  */
 $constantes = array(
 		'ADHERENT_CARD_TYPE',
-//		'ADHERENT_CARD_BACKGROUND',
+		//'ADHERENT_CARD_BACKGROUND',
 		'ADHERENT_CARD_HEADER_TEXT',
 		'ADHERENT_CARD_TEXT',
 		'ADHERENT_CARD_TEXT_RIGHT',
 		'ADHERENT_CARD_FOOTER_TEXT'
-		);
+);
 
 print load_fiche_titre($langs->trans("MembersCards"), '', '');
 
diff --git a/htdocs/adherents/admin/adherent_emails.php b/htdocs/adherents/admin/adherent_emails.php
index c58dea54a93..a3550e4a35a 100644
--- a/htdocs/adherents/admin/adherent_emails.php
+++ b/htdocs/adherents/admin/adherent_emails.php
@@ -41,21 +41,21 @@ if (!$user->admin) accessforbidden();
 
 $oldtypetonewone = array('texte'=>'text', 'chaine'=>'string'); // old type to new ones
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $error = 0;
 
 // Editing global variables not related to a specific theme
 $constantes = array(
-    'MEMBER_REMINDER_EMAIL'=>array('type'=>'yesno', 'label'=>$langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))),
-    'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' =>'emailtemplate:member',
-    'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'		=>'emailtemplate:member', /* old was ADHERENT_AUTOREGISTER_MAIL */
-    'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'	=>'emailtemplate:member', /* old was ADHERENT_MAIL_VALID */
-    'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'		=>'emailtemplate:member', /* old was ADHERENT_MAIL_COTIS */
-    'ADHERENT_EMAIL_TEMPLATE_CANCELATION'		=>'emailtemplate:member', /* old was ADHERENT_MAIL_RESIL */
-    'ADHERENT_MAIL_FROM'=>'string',
-    'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'=>'string',
-    'ADHERENT_AUTOREGISTER_NOTIF_MAIL'=>'html',
+	'MEMBER_REMINDER_EMAIL'=>array('type'=>'yesno', 'label'=>$langs->trans('MEMBER_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"))),
+	'ADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION' =>'emailtemplate:member',
+	'ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER'		=>'emailtemplate:member', /* old was ADHERENT_AUTOREGISTER_MAIL */
+	'ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION'	=>'emailtemplate:member', /* old was ADHERENT_MAIL_VALID */
+	'ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION'		=>'emailtemplate:member', /* old was ADHERENT_MAIL_COTIS */
+	'ADHERENT_EMAIL_TEMPLATE_CANCELATION'		=>'emailtemplate:member', /* old was ADHERENT_MAIL_RESIL */
+	'ADHERENT_MAIL_FROM'=>'string',
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT'=>'string',
+	'ADHERENT_AUTOREGISTER_NOTIF_MAIL'=>'html',
 );
 
 
@@ -65,32 +65,27 @@ $constantes = array(
  */
 
 //
-if ($action == 'updateall')
-{
-    $db->begin();
-    $res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
-    $res1 = dolibarr_set_const($db, 'XXXX', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', '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();
-    }
+if ($action == 'updateall') {
+	$db->begin();
+	$res1 = $res2 = $res3 = $res4 = $res5 = $res6 = 0;
+	$res1 = dolibarr_set_const($db, 'XXXX', GETPOST('ADHERENT_LOGIN_NOT_REQUIRED', '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
-if ($action == 'update' || $action == 'add')
-{
+if ($action == 'update' || $action == 'add') {
 	$constlineid = GETPOST('rowid', 'int');
 	$constname = GETPOST('constname', 'alpha');
 
-	$constvalue = (GETPOSTISSET('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname, 'alpha') : GETPOST('constvalue'));
+	$constvalue = (GETPOSTISSET('constvalue_'.$constname) ? GETPOST('constvalue_'.$constname, 'alphanohtml') : GETPOST('constvalue'));
 	$consttype = (GETPOSTISSET('consttype_'.$constname) ? GETPOST('consttype_'.$constname, 'alphanohtml') : GETPOST('consttype'));
-	$constnote = (GETPOSTISSET('constnote_'.$constname) ? GETPOST('constnote_'.$constname, 'none') : GETPOST('constnote'));
+	$constnote = (GETPOSTISSET('constnote_'.$constname) ? GETPOST('constnote_'.$constname, 'restricthtml') : GETPOST('constnote'));
 
 	$typetouse = empty($oldtypetonewone[$consttype]) ? $consttype : $oldtypetonewone[$consttype];
 	$constvalue = preg_replace('/:member$/', '', $constvalue);
@@ -99,18 +94,14 @@ if ($action == 'update' || $action == 'add')
 
 	if (!$res > 0) $error++;
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
 
-
 /*
  * View
  */
diff --git a/htdocs/adherents/admin/adherent_extrafields.php b/htdocs/adherents/admin/adherent_extrafields.php
index 73e1a519c59..8ca29286cab 100644
--- a/htdocs/adherents/admin/adherent_extrafields.php
+++ b/htdocs/adherents/admin/adherent_extrafields.php
@@ -39,7 +39,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'adherent'; //Must be the $table_element of the class that manage extrafield
 
@@ -78,8 +78,7 @@ dol_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+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>";
@@ -92,8 +91,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -105,8 +103,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print '<div name="topofform"></div><br>';
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 7864505f2e1..5546a99a334 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -42,7 +42,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'adherent_type'; //Must be the $table_element of the class that manage extrafield
 
@@ -81,8 +81,7 @@ dol_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+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>";
@@ -95,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -108,8 +106,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index a8cdc06784e..d030c73f530 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "members"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if (!$user->admin) accessforbidden();
 
@@ -42,14 +42,12 @@ if (!$user->admin) accessforbidden();
  * Actions
  */
 
-if ($action == 'setMEMBER_ENABLE_PUBLIC')
-{
+if ($action == 'setMEMBER_ENABLE_PUBLIC') {
 	if (GETPOST('value')) dolibarr_set_const($db, 'MEMBER_ENABLE_PUBLIC', 1, 'chaine', 0, '', $conf->entity);
 	else dolibarr_set_const($db, 'MEMBER_ENABLE_PUBLIC', 0, 'chaine', 0, '', $conf->entity);
 }
 
-if ($action == 'update')
-{
+if ($action == 'update') {
 	$public = GETPOST('MEMBER_ENABLE_PUBLIC');
 	$amount = GETPOST('MEMBER_NEWFORM_AMOUNT');
 	$editamount = GETPOST('MEMBER_NEWFORM_EDITAMOUNT');
@@ -61,16 +59,15 @@ if ($action == 'update')
     $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);
+    else {
+        $res = dolibarr_set_const($db, "MEMBER_NEWFORM_FORCETYPE", $forcetype, 'chaine', 0, '', $conf->entity);
+    }
 
     if (!$res > 0) $error++;
 
- 	if (!$error)
-    {
+ 	if (!$error) {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -99,8 +96,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 
 dol_fiche_head($head, 'website', $langs->trans("Members"), -1, 'user');
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
     print "\n".'<script type="text/javascript" language="javascript">';
     print 'jQuery(document).ready(function () {
                 function initemail()
@@ -139,17 +135,14 @@ print '<span class="opacitymedium">'.$langs->trans("BlankSubscriptionFormDesc").
 
 
 $enabledisablehtml = $langs->trans("EnablePublicSubscriptionForm").' ';
-if (empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	// Button off, click to enable
-	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&value=1'.$param.'">';
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&token='.newToken().'&value=1'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
 	$enabledisablehtml .= '</a>';
-}
-else
-{
+} else {
 	// Button on, click to disable
-	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&value=0'.$param.'">';
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMEMBER_ENABLE_PUBLIC&token='.newToken().'&value=0'.$param.'">';
 	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
 	$enabledisablehtml .= '</a>';
 }
@@ -159,8 +152,7 @@ print '<input type="hidden" id="MEMBER_ENABLE_PUBLIC" name="MEMBER_ENABLE_PUBLIC
 
 print '<br>';
 
-if (!empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 
 	print '<table class="noborder centpercent">';
@@ -221,8 +213,7 @@ dol_fiche_end();
 print '</form>';
 
 
-if (!empty($conf->global->MEMBER_ENABLE_PUBLIC))
-{
+if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
 	print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':<br>';
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index 20d712e6179..a7e7a6f3634 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -49,13 +49,10 @@ $pagenext = $page + 1;
 if (!$sortfield) $sortfield = 'a.datep,a.id';
 if (!$sortorder) $sortorder = 'DESC';
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -65,8 +62,7 @@ $result = restrictedArea($user, 'adherent', $id);
 
 $object = new Adherent($db);
 $result = $object->fetch($id);
-if ($result > 0)
-{
+if ($result > 0) {
 	$object->fetch_thirdparty();
 
     $adht = new AdherentType($db);
@@ -82,19 +78,16 @@ $parameters = array('id'=>$id, 'objcanvas'=>$objcanvas);
 $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))
-{
+if (empty($reshook)) {
     // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
+    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 = '';
+    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 = '';
     }
 }
@@ -112,8 +105,7 @@ $form = new Form($db);
 /*
  * Customer and/or supplier category sheet
  */
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
@@ -149,13 +141,11 @@ if ($object->id > 0)
 
 
 	$newcardbutton = '';
-    if (!empty($conf->agenda->enabled))
-    {
+    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)))
-    {
+    if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
     	print '<br>';
 
     	$param = '&id='.$id;
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index eeee48e2138..aa9797959a7 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -91,18 +91,15 @@ abstract class ActionsAdherentCardCommon
 
         if ($action == 'add' || $action == 'update') $this->assign_post();
 
-        foreach ($this->object as $key => $value)
-        {
+        foreach ($this->object as $key => $value) {
             $this->tpl[$key] = $value;
         }
 
         $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() {
@@ -114,13 +111,10 @@ abstract class ActionsAdherentCardCommon
 				</script>'."\n";
 			}
 
-        	if (is_object($objsoc) && $objsoc->id > 0)
-        	{
+        	if (is_object($objsoc) && $objsoc->id > 0) {
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         		$this->tpl['company_id'] = $objsoc->id;
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
         	}
 
@@ -128,8 +122,7 @@ abstract class ActionsAdherentCardCommon
         	$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 ((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;
@@ -161,38 +154,30 @@ abstract class ActionsAdherentCardCommon
             $this->tpl['select_morphy'] = $form->selectarray('morphy', $selectarray, $this->object->morphy, 0);
         }
 
-        if ($action == 'view' || $action == 'edit' || $action == 'delete')
-        {
+        if ($action == 'view' || $action == 'edit' || $action == 'delete') {
         	// Emailing
-        	if (!empty($conf->mailing->enabled))
-			{
+        	if (!empty($conf->mailing->enabled)) {
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
 
         	// Dolibarr user
-        	if ($this->object->user_id)
-			{
+        	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");
+			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
         }
 
-        if ($action == 'view' || $action == 'delete')
-        {
+        if ($action == 'view' || $action == 'delete') {
         	$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
 
-        	if ($this->object->socid > 0)
-        	{
+        	if ($this->object->socid > 0) {
         		$objsoc = new Societe($this->db);
 
         		$objsoc->fetch($this->object->socid);
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $langs->trans("AdherentNotLinkedToThirdParty");
         	}
 
@@ -214,8 +199,7 @@ abstract class ActionsAdherentCardCommon
             $this->tpl['note'] = nl2br($this->object->note);
         }
 
-        if ($action == 'create_user')
-        {
+        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';
@@ -263,19 +247,15 @@ abstract class ActionsAdherentCardCommon
         $this->object->canvas = $_POST["canvas"];
 
         // We set country_id, and country_code label of the chosen country
-        if ($this->object->country_id)
-        {
+        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)
-            {
+            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
-            {
+            } 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 60bb2ecd034..db2473c55d9 100644
--- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
+++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
@@ -90,8 +90,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
         $this->tpl['error'] = $this->error;
         $this->tpl['errors'] = $this->errors;
 
-		if ($action == 'view')
-		{
+		if ($action == 'view') {
             // Card header
             $head = member_prepare_head($this->object);
             $title = $this->getTitle($action);
@@ -105,18 +104,14 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
             $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
-		{
+        } else {
 			// Confirm delete contact
-        	if ($action == 'delete' && $user->rights->adherent->supprimer)
-        	{
+        	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')
-		{
+		if ($action == 'list') {
 	        $this->LoadListDatas($limit, $offset, $sortfield, $sortorder);
 		}
 	}
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
index 92f1e11d7a2..b6c0b542d27 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
index 36e2deab14c..92a4fbddd38 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index b738f549247..8789b2fcb34 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 93c548cef62..d0a67153209 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -25,7 +25,7 @@
 /**
  *  \file       htdocs/adherents/card.php
  *  \ingroup    member
- *  \brief      Page of member
+ *  \brief      Page of a member
  */
 
 require '../main.inc.php';
@@ -45,7 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "bills", "members", "users", "other", "paypal"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
@@ -55,8 +55,7 @@ $typeid = GETPOST('typeid', 'int');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 
-if (!empty($conf->mailmanspip->enabled))
-{
+if (!empty($conf->mailmanspip->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
 
 	$langs->load('mailmanspip');
@@ -76,26 +75,23 @@ $socialnetworks = getArrayOfSocialNetworks();
 $object->getCanvas($id);
 $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('adherent', 'membercard', $canvas);
 }
 
 // Security check
-$result = restrictedArea($user, 'adherent', $id, '', '', 'socid', 'rowid', $objcanvas);
+$result = restrictedArea($user, 'adherent', $id, '', '', 'socid', 'rowid', 0);
 
-if ($id > 0)
-{
+if ($id > 0) {
 	// Load member
 	$result = $object->fetch($id);
 
 	// 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)
-	{
+	if ($object->user_id) {
 		// $User is the user who edits, $object->user_id is the id of the related user in the edited member
 		$caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
 				|| (($user->id != $object->user_id) && $user->rights->user->user->creer));
@@ -107,8 +103,7 @@ if ($id > 0)
 // Define variables to determine what the current user can do on the members
 $canaddmember = $user->rights->adherent->creer;
 // Define variables to determine what the current user can do on the properties of a member
-if ($id)
-{
+if ($id) {
 	$caneditfieldmember = $user->rights->adherent->creer;
 }
 
@@ -125,34 +120,26 @@ $parameters = array('id'=>$id, 'rowid'=>$id, 'objcanvas'=>$objcanvas, 'confirm'=
 $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))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 		$action = '';
 	}
 
-	if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-	{
+	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
-		{
-			if ($userid != $user->id && $userid != $object->user_id)
-			{
+		if (empty($user->rights->user->user->creer)) {	// If can edit only itself user, we can link to itself only
+			if ($userid != $user->id && $userid != $object->user_id) {
 				$error++;
 				setEventMessages($langs->trans("ErrorUserPermissionAllowsToLinksToItselfOnly"), null, 'errors');
 			}
 		}
 
-		if (!$error)
-		{
-			if ($userid != $object->user_id)	// If link differs from currently in database
-			{
+		if (!$error) {
+			if ($userid != $object->user_id) {	// If link differs from currently in database
 				$result = $object->setUserId($userid);
 				if ($result < 0) dol_print_error($object->db, $object->error);
 				$action = '';
@@ -160,22 +147,17 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'setsocid')
-	{
+	if ($action == 'setsocid') {
 		$error = 0;
-		if (!$error)
-		{
-			if ($socid != $object->socid)	// If link differs from currently in database
-			{
+		if (!$error) {
+			if ($socid != $object->socid) {	// If link differs from currently in database
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
-				$sql .= " WHERE socid = '".$socid."'";
+				$sql .= " WHERE socid = ".((int) $socid);
 				$sql .= " AND entity = ".$conf->entity;
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $db->fetch_object($resql);
-					if ($obj && $obj->rowid > 0)
-					{
+					if ($obj && $obj->rowid > 0) {
 						$othermember = new Adherent($db);
 						$othermember->fetch($obj->rowid);
 						$thirdparty = new Societe($db);
@@ -185,8 +167,7 @@ if (empty($reshook))
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $object->setThirdPartyId($socid);
 					if ($result < 0) dol_print_error($object->db, $object->error);
 					$action = '';
@@ -196,50 +177,39 @@ if (empty($reshook))
 	}
 
 	// Create user from a member
-	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-	{
-		if ($result > 0)
-		{
+	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) {
+		if ($result > 0) {
 			// Creation user
 			$nuser = new User($db);
 			$result = $nuser->create_from_member($object, GETPOST('login', 'alphanohtml'));
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($nuser->error), null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
 	// Create third party from a member
-	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-	{
-		if ($result > 0)
-		{
+	if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer) {
+		if ($result > 0) {
 			// User creation
 			$company = new Societe($db);
 			$result = $company->create_from_member($object, GETPOST('companyname', 'alpha'), GETPOST('companyalias', 'alpha'));
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				setEventMessages($langs->trans($company->error), null, 'errors');
 				setEventMessages($company->error, $company->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	if ($action == 'update' && !$cancel && $user->rights->adherent->creer)
-	{
+	if ($action == 'update' && !$cancel && $user->rights->adherent->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$birthdate = '';
@@ -269,16 +239,14 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Company")), null, 'errors');
 		}
 		// Check if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			if (empty($login)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
 			}
 		}
 		// Create new object
-		if ($result > 0 && !$error)
-		{
+		if ($result > 0 && !$error) {
 			$object->oldcopy = clone $object;
 
 			// Change values
@@ -331,32 +299,27 @@ if (empty($reshook))
 
 			// Check if we need to also synchronize user information
 			$nosyncuser = 0;
-			if ($object->user_id)	// If linked to a user
-			{
+			if ($object->user_id) {	// If linked to a user
 				if ($user->id != $object->user_id && empty($user->rights->user->user->creer)) $nosyncuser = 1; // Disable synchronizing
 			}
 
 			// Check if we need to also synchronize password information
 			$nosyncuserpass = 0;
-			if ($object->user_id)	// If linked to a user
-			{
+			if ($object->user_id) {	// If linked to a user
 				if ($user->id != $object->user_id && empty($user->rights->user->user->password)) $nosyncuserpass = 1; // Disable synchronizing
 			}
 
 			$result = $object->update($user, 0, $nosyncuser, $nosyncuserpass);
 
-			if ($result >= 0 && !count($object->errors))
-			{
+			if ($result >= 0 && !count($object->errors)) {
 				$categories = GETPOST('memcats', 'array');
 				$object->setCategories($categories);
 
 				// Logo/Photo save
 				$dir = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos';
 				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-				if ($file_OK)
-				{
-					if (GETPOST('deletephoto'))
-					{
+				if ($file_OK) {
+					if (GETPOST('deletephoto')) {
 						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 						$fileimg = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos/'.$object->photo;
 						$dirthumbs = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'member').'/photos/thumbs';
@@ -364,33 +327,23 @@ if (empty($reshook))
 						dol_delete_dir_recursive($dirthumbs);
 					}
 
-					if (image_format_supported($_FILES['photo']['name']) > 0)
-					{
+					if (image_format_supported($_FILES['photo']['name']) > 0) {
 						dol_mkdir($dir);
 
-						if (@is_dir($dir))
-						{
+						if (@is_dir($dir)) {
 							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-							if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0)
-							{
+							if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
-							}
-							else
-							{
-							    // Create thumbs
-							    $object->addThumbs($newfile);
+							} else {
+								// Create thumbs
+								$object->addThumbs($newfile);
 							}
 						}
-					}
-					else
-					{
+					} else {
 						setEventMessages("ErrorBadImageFormat", null, 'errors');
 					}
-				}
-				else
-				{
-					switch ($_FILES['photo']['error'])
-					{
+				} else {
+					switch ($_FILES['photo']['error']) {
 						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 							$errors[] = "ErrorFileSizeTooLarge";
@@ -401,41 +354,33 @@ if (empty($reshook))
 					}
 				}
 
-	            $rowid = $object->id;
-	            $id = $object->id;
+				$rowid = $object->id;
+				$id = $object->id;
 				$action = '';
 
-				if (!empty($backtopage))
-				{
+				if (!empty($backtopage)) {
 					header("Location: ".$backtopage);
 					exit;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = '';
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'edit';
 		}
 	}
 
-	if ($action == 'add' && $user->rights->adherent->creer)
-	{
+	if ($action == 'add' && $user->rights->adherent->creer) {
 		if ($canvas) $object->canvas = $canvas;
 		$birthdate = '';
 		if (isset($_POST["birthday"]) && $_POST["birthday"]
 				&& isset($_POST["birthmonth"]) && $_POST["birthmonth"]
-				&& isset($_POST["birthyear"]) && $_POST["birthyear"])
-		{
+				&& isset($_POST["birthyear"]) && $_POST["birthyear"]) {
 			$birthdate = dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
 		}
 		$datesubscription = '';
-		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"]))
-		{
+		if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"])) {
 			$datesubscription = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 		}
 
@@ -457,12 +402,11 @@ if (empty($reshook))
 		// $skype=GETPOST("member_skype", 'alpha');
 		// $twitter=GETPOST("member_twitter", 'alpha');
 		// $facebook=GETPOST("member_facebook", 'alpha');
-        // $linkedin=GETPOST("member_linkedin", 'alpha');
+		// $linkedin=GETPOST("member_linkedin", 'alpha');
 		$email = preg_replace('/\s+/', '', GETPOST("member_email", 'alpha'));
 		$login = GETPOST("member_login", 'alphanohtml');
 		$pass = GETPOST("password", 'alpha');
 		$photo = GETPOST("photo", 'alpha');
-		//$comment=GETPOST("comment",'none');
 		$morphy = GETPOST("morphy", 'alphanohtml');
 		$public = GETPOST("public", 'alphanohtml');
 
@@ -519,13 +463,11 @@ if (empty($reshook))
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MemberNature")), null, 'errors');
 		}
 		// Tests if the login already exists
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			if (empty($login)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login")), null, 'errors');
-			}
-			else {
+			} else {
 				$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape($login)."'";
 				$result = $db->query($sql);
 				if ($result) {
@@ -569,14 +511,12 @@ if (empty($reshook))
 		$public = 0;
 		if (isset($public)) $public = 1;
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// Email about right and login does not exist
 			$result = $object->create($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Foundation categories
 				$memcats = GETPOST('memcats', 'array');
 				$object->setCategories($memcats);
@@ -585,9 +525,7 @@ if (empty($reshook))
 				$rowid = $object->id;
 				$id = $object->id;
 				$action = '';
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				if ($object->error) {
@@ -598,36 +536,27 @@ if (empty($reshook))
 
 				$action = 'create';
 			}
-		}
-		else {
+		} else {
 			$action = 'create';
 		}
 	}
 
-	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
-	{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes') {
 		$result = $object->delete($id, $user);
-		if ($result > 0)
-		{
-			if (!empty($backtopage))
-			{
+		if ($result > 0) {
+			if (!empty($backtopage)) {
 				header("Location: ".$backtopage);
 				exit;
-			}
-			else
-			{
+			} else {
 				header("Location: list.php");
 				exit;
 			}
-		}
-		else
-		{
+		} else {
 			$errmesg = $object->error;
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes')
-	{
+	if ($user->rights->adherent->creer && $action == 'confirm_valid' && $confirm == 'yes') {
 		$error = 0;
 
 		$db->begin();
@@ -637,11 +566,9 @@ if (empty($reshook))
 
 		$result = $object->validate($user);
 
-		if ($result >= 0 && !count($object->errors))
-		{
+		if ($result >= 0 && !count($object->errors)) {
 			// Send confirmation email (according to parameters of member type. Otherwise generic)
-			if ($object->email && GETPOST("send_mail"))
-			{
+			if ($object->email && GETPOST("send_mail")) {
 				$subject = '';
 				$msg = '';
 
@@ -659,8 +586,7 @@ if (empty($reshook))
 
 				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-				{
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 					$subject = $arraydefaultmessage->topic;
 					$msg     = $arraydefaultmessage->content;
 				}
@@ -669,8 +595,7 @@ if (empty($reshook))
 					//fallback on the old configuration.
 					setEventMessages('WarningMandatorySetupNotComplete', null, 'errors');
 					$error++;
-				}
-				else {
+				} else {
 					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
@@ -679,16 +604,13 @@ if (empty($reshook))
 					$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
 
 					$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			if ($object->error) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -697,32 +619,25 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 		$action = '';
 	}
 
-	if ($user->rights->adherent->supprimer && $action == 'confirm_resign')
-	{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_resign') {
 		$error = 0;
 
-		if ($confirm == 'yes')
-		{
+		if ($confirm == 'yes') {
 			$adht = new AdherentType($db);
 			$adht->fetch($object->typeid);
 
 			$result = $object->resiliate($user);
 
-			if ($result >= 0 && !count($object->errors))
-			{
-				if ($object->email && GETPOST("send_mail"))
-				{
+			if ($result >= 0 && !count($object->errors)) {
+				if ($object->email && GETPOST("send_mail")) {
 					$subject = '';
 					$msg = '';
 
@@ -740,8 +655,7 @@ if (empty($reshook))
 
 					if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-					{
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 						$subject = $arraydefaultmessage->topic;
 						$msg     = $arraydefaultmessage->content;
 					}
@@ -750,8 +664,7 @@ if (empty($reshook))
 						//fallback on the old configuration.
 						setEventMessages('WarningMandatorySetupNotComplete', null, 'errors');
 						$error++;
-					}
-					else {
+					} else {
 						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 						complete_substitutions_array($substitutionarray, $outputlangs, $object);
 						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
@@ -760,16 +673,13 @@ if (empty($reshook))
 						$moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/card.php'."\r\n";
 
 						$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 
 				if ($object->error) {
@@ -780,31 +690,24 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-		if (!empty($backtopage) && !$error)
-		{
+		if (!empty($backtopage) && !$error) {
 			header("Location: ".$backtopage);
 			exit;
 		}
 	}
 
 	// SPIP Management
-	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes')
-	{
-		if (!count($object->errors))
-		{
-			if (!$mailmanspip->del_to_spip($object))
-			{
+	if ($user->rights->adherent->supprimer && $action == 'confirm_del_spip' && $confirm == 'yes') {
+		if (!count($object->errors)) {
+			if (!$mailmanspip->del_to_spip($object)) {
 				setEventMessages($langs->trans('DeleteIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
 	}
 
-	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes')
-	{
-		if (!count($object->errors))
-		{
-			if (!$mailmanspip->add_to_spip($object))
-			{
+	if ($user->rights->adherent->creer && $action == 'confirm_add_spip' && $confirm == 'yes') {
+		if (!count($object->errors)) {
+			if (!$mailmanspip->add_to_spip($object)) {
 				setEventMessages($langs->trans('AddIntoSpipError').': '.$mailmanspip->error, null, 'errors');
 			}
 		}
@@ -841,28 +744,23 @@ llxHeader('', $title, $help_url);
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS
 	// -----------------------------------------
-	if (empty($object->error) && $id)
-	{
+	if (empty($object->error) && $id) {
 		$object = new Adherent($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
-}
-else
-{
+	$objcanvas->display_canvas($action); // Show template
+} else {
 	// -----------------------------------------
 	// When used in standard mode
 	// -----------------------------------------
 
-	if ($action == 'create')
-	{
+	if ($action == 'create') {
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* Creation mode                                                              */
@@ -873,31 +771,28 @@ else
 
 		// We set country_id, country_code and country for the selected country
 		$object->country_id = GETPOST('country_id', 'int') ?GETPOST('country_id', 'int') : $mysoc->country_id;
-		if ($object->country_id)
-		{
+		if ($object->country_id) {
 			$tmparray = getCountry($object->country_id, 'all');
 			$object->country_code = $tmparray['code'];
 			$object->country = $tmparray['label'];
 		}
 
-        if (!empty($socid)) {
-            $object = new Societe($db);
-            if ($socid > 0) $object->fetch($socid);
+		if (!empty($socid)) {
+			$object = new Societe($db);
+			if ($socid > 0) $object->fetch($socid);
 
-            if (!($object->id > 0))
-            {
-                $langs->load("errors");
-                print($langs->trans('ErrorRecordNotFound'));
-                exit;
-            }
-        }
+			if (!($object->id > 0)) {
+				$langs->load("errors");
+				print($langs->trans('ErrorRecordNotFound'));
+				exit;
+			}
+		}
 
 		$adht = new AdherentType($db);
 
 		print load_fiche_titre($langs->trans("NewMember"), '', 'members');
 
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -933,20 +828,18 @@ else
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
 		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
 
-        dol_fiche_head('');
+		dol_fiche_head('');
 
 		print '<table class="border centpercent">';
 		print '<tbody>';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="member_login" class="minwidth300" maxlength="50" value="'.(GETPOSTISSET("member_login") ? GETPOST("member_login", 'alphanohtml', 2) : $object->login).'" autofocus="autofocus"></td></tr>';
 		}
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$generated_password = getRandomPassword(false);
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
@@ -956,10 +849,9 @@ else
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberType").'</td><td>';
-		$listetype = $adht->liste_array();
-		if (count($listetype))
-		{
-			print $form->selectarray("typeid", $listetype, GETPOST('typeid', 'int') ?GETPOST('typeid', 'int') : $typeid, count($listetype) > 1 ? 1 : 0);
+		$listetype = $adht->liste_array(1);
+		if (count($listetype)) {
+			print $form->selectarray("typeid", $listetype, (GETPOST('typeid', 'int') ? GETPOST('typeid', 'int') : $typeid), (count($listetype) > 1 ? 1 : 0), 0, 0, '', 0, 0, 0, '', '', 1);
 		} else {
 			print '<font class="error">'.$langs->trans("NoTypeDefinedGoToSetup").'</font>';
 		}
@@ -969,7 +861,7 @@ else
 		$morphys["phy"] = $langs->trans("Physical");
 		$morphys["mor"] = $langs->trans("Moral");
 		print '<tr><td class="fieldrequired">'.$langs->trans("MemberNature")."</td><td>\n";
-		print $form->selectarray("morphy", $morphys, GETPOST('morphy', 'alpha') ?GETPOST('morphy', 'alpha') : $object->morphy, 1);
+		print $form->selectarray("morphy", $morphys, (GETPOST('morphy', 'alpha') ?GETPOST('morphy', 'alpha') : $object->morphy), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print "</td>\n";
 
 		// Company
@@ -977,7 +869,7 @@ else
 
 		// Civility
 		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-		print $formcompany->select_civility(GETPOST('civility_id', 'int') ?GETPOST('civility_id', 'int') : $object->civility_id, 'civility_id').'</td>';
+		print $formcompany->select_civility(GETPOST('civility_id', 'int') ? GETPOST('civility_id', 'int') : $object->civility_id, 'civility_id', 'maxwidth150', 1).'</td>';
 		print '</tr>';
 
 		// Lastname
@@ -991,8 +883,8 @@ else
 		// Gender
 		print '<tr><td>'.$langs->trans("Gender").'</td>';
 		print '<td>';
-		$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
-		print $form->selectarray('gender', $arraygender, GETPOST('gender', 'alphanohtml'), 1);
+		$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
+		print $form->selectarray('gender', $arraygender, GETPOST('gender', 'alphanohtml'), 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td></tr>';
 
 		// EMail
@@ -1019,15 +911,11 @@ else
 		print '</td></tr>';
 
 		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
+		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
-			if ($object->country_id)
-			{
+			if ($object->country_id) {
 				print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOST('state_id', 'int') : $object->state_id, $object->country_code);
-			}
-			else
-			{
+			} else {
 				print $countrynotdefined;
 			}
 			print '</td></tr>';
@@ -1045,15 +933,15 @@ else
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
 		print '<td>'.img_picto('', 'object_phoning_mobile').' <input type="text" name="phone_mobile" size="20" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td></tr>';
 
-	    if (!empty($conf->socialnetworks->enabled)) {
+		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
-                if (!$value['active']) break;
+				if (!$value['active']) break;
 				print '<tr><td>'.$langs->trans($value['label']).'</td><td><input type="text" name="member_'.$key.'" size="40" value="'.(GETPOSTISSET('member_'.$key) ? GETPOST('member_'.$key, 'alpha') : $object->socialnetworks[$key]).'"></td></tr>';
 			}
 		}
 
-	    // Birth Date
-		print "<tr><td>".$langs->trans("DateToBirth")."</td><td>\n";
+		// Birth Date
+		print "<tr><td>".$langs->trans("DateOfBirth")."</td><td>\n";
 		print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc');
 		print "</td></tr>\n";
 
@@ -1063,8 +951,7 @@ else
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
 			print $form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, null, null, '100%');
@@ -1082,12 +969,9 @@ else
 		print '<div class="center">';
 		print '<input type="submit" name="button" class="button" value="'.$langs->trans("AddMember").'">';
 		print '&nbsp;&nbsp;';
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-		}
-		else
-		{
+		} else {
 			print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		}
 		print '</div>';
@@ -1095,8 +979,7 @@ else
 		print "</form>\n";
 	}
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		/********************************************
 		*
 		* Edition mode
@@ -1117,16 +1000,12 @@ else
 
 		// We set country_id, and country_code, country of the chosen country
 		$country = GETPOST('country', 'int');
-		if (!empty($country) || $object->country_id)
-		{
+		if (!empty($country) || $object->country_id) {
 			$sql = "SELECT rowid, code, label from ".MAIN_DB_PREFIX."c_country where rowid = ".(!empty($country) ? $country : $object->country_id);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 			$object->country_id = $obj->rowid;
@@ -1137,8 +1016,7 @@ else
 		$head = member_prepare_head($object);
 
 
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
 				jQuery("#selectcountry_id").change(function() {
@@ -1183,31 +1061,26 @@ else
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td class="valeur">'.$object->id.'</td></tr>';
 
 		// Login
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Login").' / '.$langs->trans("Id").'</span></td><td><input type="text" name="login" class="minwidth300" maxlength="50" value="'.(GETPOSTISSET("login") ? GETPOST("login", 'alphanohtml', 2) : $object->login).'"></td></tr>';
 		}
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="minwidth300" maxlength="50" value="'.(isset($_POST["pass"]) ?GETPOST("pass", '', 2) : $object->pass).'"></td></tr>';
 		}
 		// Morphy
 		$morphys["phy"] = $langs->trans("Physical");
 		$morphys["mor"] = $langs->trans("Moral");
 		print '<tr><td><span class="fieldrequired">'.$langs->trans("MemberNature").'</span></td><td>';
-		print $form->selectarray("morphy", $morphys, (GETPOSTISSET("morphy") ? GETPOST("morphy", 'alpha') : $object->morphy));
+		print $form->selectarray("morphy", $morphys, (GETPOSTISSET("morphy") ? GETPOST("morphy", 'alpha') : $object->morphy), 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		print "</td></tr>";
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-		if ($user->rights->adherent->creer)
-		{
-			print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $object->typeid));
-		}
-		else
-		{
+		if ($user->rights->adherent->creer) {
+			print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ? GETPOST("typeid", 'int') : $object->typeid), 0, 0, 0, '', 0, 0, 0, '', '', 1);
+		} else {
 			print $adht->getNomUrl(1);
 			print '<input type="hidden" name="typeid" value="'.$object->typeid.'">';
 		}
@@ -1218,7 +1091,7 @@ else
 
 		// Civility
 		print '<tr><td>'.$langs->trans("UserTitle").'</td><td>';
-		print $formcompany->select_civility(GETPOSTISSET("civility_id") ? GETPOST("civility_id", 'alpha') : $object->civility_id)."\n";
+		print $formcompany->select_civility(GETPOSTISSET("civility_id") ? GETPOST("civility_id", 'alpha') : $object->civility_id, 'civility_id', 'maxwidth150', 1);
 		print '</td>';
 		print '</tr>';
 
@@ -1233,16 +1106,15 @@ else
 		// Gender
 		print '<tr><td>'.$langs->trans("Gender").'</td>';
 		print '<td>';
-		$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
-		print $form->selectarray('gender', $arraygender, GETPOSTISSET('gender') ? GETPOST('gender', 'alphanohtml') : $object->gender, 1);
+		$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
+		print $form->selectarray('gender', $arraygender, GETPOSTISSET('gender') ? GETPOST('gender', 'alphanohtml') : $object->gender, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td></tr>';
 
 		// Photo
 		print '<tr><td>'.$langs->trans("Photo").'</td>';
 		print '<td class="hideonsmartphone" valign="middle">';
 		print $form->showphoto('memberphoto', $object)."\n";
-		if ($caneditfieldmember)
-		{
+		if ($caneditfieldmember) {
 			if ($object->photo) print "<br>\n";
 			print '<table class="nobordernopadding">';
 			if ($object->photo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
@@ -1276,8 +1148,7 @@ else
 		print '</td></tr>';
 
 		// State
-		if (empty($conf->global->MEMBER_DISABLE_STATE))
-		{
+		if (empty($conf->global->MEMBER_DISABLE_STATE)) {
 			print '<tr><td>'.$langs->trans('State').'</td><td>';
 			print $formcompany->select_state($object->state_id, isset($_POST["country_id"]) ?GETPOST("country_id") : $object->country_id);
 			print '</td></tr>';
@@ -1292,18 +1163,18 @@ else
 		print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone_perso" value="'.(GETPOSTISSET("phone_perso") ? GETPOST("phone_perso") : $object->phone_perso).'"></td></tr>';
 
 		// Mobile phone
-		print '<tr><td>'.img_picto('', 'object_phoning_mobile').' '.$langs->trans("PhoneMobile").'</td>';
+		print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
 		print '<td>'.img_picto('', 'object_phoning_mobile').' <input type="text" name="phone_mobile" value="'.(GETPOSTISSET("phone_mobile") ? GETPOST("phone_mobile") : $object->phone_mobile).'"></td></tr>';
 
-        if (!empty($conf->socialnetworks->enabled)) {
+		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
-                if (!$value['active']) break;
+				if (!$value['active']) break;
 				print '<tr><td>'.$langs->trans($value['label']).'</td><td><input type="text" name="'.$key.'" class="minwidth100" value="'.(GETPOSTISSET($key) ? GETPOST($key, 'alphanohtml') : $object->socialnetworks[$key]).'"></td></tr>';
 			}
 		}
 
-	    // Birth Date
-		print "<tr><td>".$langs->trans("DateToBirth")."</td><td>\n";
+		// Birth Date
+		print "<tr><td>".$langs->trans("DateOfBirth")."</td><td>\n";
 		print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc');
 		print "</td></tr>\n";
 
@@ -1313,8 +1184,7 @@ else
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td>';
 			print '<td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
@@ -1331,17 +1201,13 @@ else
 		}
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
-			if ($object->socid)
-			{
+			if ($object->socid) {
 				$company = new Societe($db);
 				$result = $company->fetch($object->socid);
 				print $company->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoThirdPartyAssociatedToMember");
 			}
 			print '</td></tr>';
@@ -1349,11 +1215,9 @@ else
 
 		// Login Dolibarr
 		print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td colspan="2" class="valeur">';
-		if ($object->user_id)
-		{
+		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
-		}
-		else print $langs->trans("NoDolibarrAccess");
+		} else print $langs->trans("NoDolibarrAccess");
 		print '</td></tr>';
 
 		// Other attributes. Fields from hook formObjectOptions and Extrafields.
@@ -1371,8 +1235,7 @@ else
 		print '</form>';
 	}
 
-	if ($id > 0 && $action != 'edit')
-	{
+	if ($id > 0 && $action != 'edit') {
 		/* ************************************************************************** */
 		/*                                                                            */
 		/* View mode                                                                  */
@@ -1403,11 +1266,9 @@ else
 		dol_fiche_head($head, 'general', $langs->trans("Member"), -1, 'user');
 
 		// Confirm create user
-		if ($action == 'create_user')
-		{
+		if ($action == 'create_user') {
 			$login = $object->login;
-			if (empty($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);
@@ -1419,8 +1280,7 @@ else
 					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
 			);
 			$text = $langs->trans("ConfirmCreateLogin").'<br>';
-			if (!empty($conf->societe->enabled))
-			{
+			if (!empty($conf->societe->enabled)) {
 				if ($object->socid > 0) $text .= $langs->trans("UserWillBeExternalUser");
 				else $text .= $langs->trans("UserWillBeInternalUser");
 			}
@@ -1428,18 +1288,14 @@ else
 		}
 
 		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
+		if ($action == 'create_thirdparty') {
 			$companyalias = '';
 			$fullname = $object->getFullName($langs);
 
-			if ($object->morphy == 'mor')
-			{
+			if ($object->morphy == 'mor') {
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
-			}
-			else
-			{
+			} else {
 				$companyname = $fullname;
 				if (!empty($object->company)) $companyalias = $object->company;
 			}
@@ -1454,8 +1310,7 @@ else
 		}
 
 		// Confirm validate member
-		if ($action == 'valid')
-		{
+		if ($action == 'valid') {
 			$langs->load("mails");
 
 			$adht = new AdherentType($db);
@@ -1478,8 +1333,7 @@ else
 
 			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-			{
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 				$subject = $arraydefaultmessage->topic;
 				$msg     = $arraydefaultmessage->content;
 			}
@@ -1515,8 +1369,7 @@ else
 		}
 
 		// Confirm terminate
-		if ($action == 'resign')
-		{
+		if ($action == 'resign') {
 			$langs->load("mails");
 
 			$adht = new AdherentType($db);
@@ -1539,8 +1392,7 @@ else
 
 			if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-			{
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 				$subject = $arraydefaultmessage->topic;
 				$msg     = $arraydefaultmessage->content;
 			}
@@ -1571,21 +1423,18 @@ else
 		}
 
 		// Confirm remove member
-		if ($action == 'delete')
-		{
+		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("DeleteMember"), $langs->trans("ConfirmDeleteMember"), "confirm_delete", $formquestion, 'no', 1);
 		}
 
 		// Confirm add in spip
-		if ($action == 'add_spip')
-		{
+		if ($action == 'add_spip') {
 			print $form->formconfirm("card.php?rowid=".$id, $langs->trans('AddIntoSpip'), $langs->trans('AddIntoSpipConfirmation'), 'confirm_add_spip');
 		}
 		// Confirm removed from spip
-		if ($action == 'del_spip')
-		{
+		if ($action == 'del_spip') {
 			print $form->formconfirm("card.php?rowid=$id", $langs->trans('DeleteIntoSpip'), $langs->trans('DeleteIntoSpipConfirmation'), 'confirm_del_spip');
 		}
 
@@ -1597,16 +1446,15 @@ else
 
 		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 '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield centpercent">';
 
 		// 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>';
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+			print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.dol_escape_htmltag($object->login).'</td></tr>';
 		}
 
 		// Type
@@ -1623,53 +1471,42 @@ else
 		print '</td></tr>';
 
 		// Company
-		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
+		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.dol_escape_htmltag($object->company).'</td></tr>';
 
 		// Civility
-		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+		print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'</td>';
 		print '</tr>';
 
 		// Password
-		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-		{
+		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
 			if ($object->pass) print preg_replace('/./i', '*', $object->pass);
-			else
-			{
-			    if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
-			    else print $langs->trans("Hidden");
+			else {
+				if ($user->admin) print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
+				else print $langs->trans("Hidden");
 			}
-			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');
+			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');
 			}
 			print '</td></tr>';
 		}
 
 		// Date end subscription
 		print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-		if ($object->datefin)
-		{
+		if ($object->datefin) {
 			print dol_print_date($object->datefin, 'day');
 			if ($object->hasDelay()) {
 				print " ".img_warning($langs->trans("Late"));
 			}
-		}
-		else
-		{
-			if ($object->need_subscription == 0)
-            {
-                print $langs->trans("SubscriptionNotNeeded");
-            }
-            elseif (!$adht->subscription)
-			{
+		} else {
+			if ($object->need_subscription == 0) {
+				print $langs->trans("SubscriptionNotNeeded");
+			} elseif (!$adht->subscription) {
 				print $langs->trans("SubscriptionNotRecorded");
 				if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
-			}
-			else
-			{
+			} else {
 				print $langs->trans("SubscriptionNotReceived");
 				if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			}
@@ -1677,14 +1514,12 @@ else
 		print '</td></tr>';
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			print '<tr><td>';
 			$editenable = $user->rights->adherent->creer;
 			print $form->editfieldkey('LinkedToDolibarrThirdParty', 'thirdparty', '', $object, $editenable);
 			print '</td><td colspan="2" class="valeur">';
-			if ($action == 'editthirdparty')
-			{
+			if ($action == 'editthirdparty') {
 				$htmlname = 'socid';
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
 				print '<input type="hidden" name="rowid" value="'.$object->id.'">';
@@ -1696,17 +1531,12 @@ else
 				print '</td>';
 				print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 				print '</tr></table></form>';
-			}
-			else
-			{
-				if ($object->socid)
-				{
+			} else {
+				if ($object->socid) {
 					$company = new Societe($db);
 					$result = $company->fetch($object->socid);
 					print $company->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print $langs->trans("NoThirdPartyAssociatedToMember");
 				}
 			}
@@ -1718,53 +1548,58 @@ else
 		$editenable = $user->rights->adherent->creer && $user->rights->user->user->creer;
 		print $form->editfieldkey('LinkedToDolibarrUser', 'login', '', $object, $editenable);
 		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editlogin')
-		{
+		if ($action == 'editlogin') {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
-		}
-		else
-		{
-			if ($object->user_id)
-			{
+		} else {
+			if ($object->user_id) {
 				$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
+			} else {
+				print $langs->trans("NoDolibarrAccess");
 			}
-			else print $langs->trans("NoDolibarrAccess");
 		}
 		print '</td></tr>';
 
-        print '</table>';
+		print '</table>';
 
-        print '</div>';
+		print '</div>';
 
-        print '<div class="fichehalfright"><div class="ficheaddleft">';
-        print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border tableforfield tableforfield" width="100%">';
+		print '<table class="border tableforfield tableforfield" width="100%">';
 
 		// Birth Date
-		print '<tr><td class="titlefield">'.$langs->trans("DateToBirth").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("DateOfBirth").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
 
 		// Public
 		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$langs->trans("Categories").'</td>';
 			print '<td colspan="2">';
 			print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
 			print '</td></tr>';
 		}
 
+		//VCard
+		print '<tr><td>';
+		print $langs->trans("VCard").'</td><td colspan="3">';
+		print '<a href="'.DOL_URL_ROOT.'/adherents/vcard.php?id='.$object->id.'">';
+		print img_picto($langs->trans("Download"), 'vcard.png', 'class="paddingrightonly"');
+		print $langs->trans("Download");
+		print '</a>';
+		print '</td></tr>';
+
 		// Other attributes
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print "</table>\n";
 
 		print "</div></div></div>\n";
-        print '<div style="clear:both"></div>';
+		print '<div style="clear:both"></div>';
 
-        dol_fiche_end();
+		dol_fiche_end();
 
 
 		/*
@@ -1775,8 +1610,7 @@ else
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 		if (empty($reshook)) {
-			if ($action != 'editlogin' && $action != 'editthirdparty')
-			{
+			if ($action != 'editlogin' && $action != 'editthirdparty') {
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut == 1) {
@@ -1805,103 +1639,74 @@ else
 				}*/
 
 				// Modify
-				if ($user->rights->adherent->creer)
-				{
+				if ($user->rights->adherent->creer) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=edit">'.$langs->trans("Modify")."</a></div>";
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Modify").'</font></div>';
 				}
 
 				// Validate
-				if ($object->statut == -1)
-				{
-					if ($user->rights->adherent->creer)
-					{
+				if ($object->statut == -1) {
+					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Validate")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Validate").'</font></div>';
 					}
 				}
 
 				// Reactivate
-				if ($object->statut == 0)
-				{
-					if ($user->rights->adherent->creer)
-					{
+				if ($object->statut == 0) {
+					if ($user->rights->adherent->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=valid">'.$langs->trans("Reenable")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Reenable")."</font></div>";
 					}
 				}
 
 				// Terminate
-				if ($object->statut >= 1)
-				{
-					if ($user->rights->adherent->supprimer)
-					{
+				if ($object->statut >= 1) {
+					if ($user->rights->adherent->supprimer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$id.'&action=resign">'.$langs->trans("Resiliate")."</a></div>\n";
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("Resiliate")."</font></div>";
 					}
 				}
 
 				// Create third party
-				if (!empty($conf->societe->enabled) && !$object->socid)
-				{
-					if ($user->rights->societe->creer)
-					{
+				if (!empty($conf->societe->enabled) && !$object->socid) {
+					if ($user->rights->societe->creer) {
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrThirdParty")."</font></div>";
 					}
 				}
 
 				// Create user
-				if (!$user->socid && !$object->user_id)
-				{
-					if ($user->rights->user->user->creer)
-					{
+				if (!$user->socid && !$object->user_id) {
+					if ($user->rights->user->user->creer) {
 						if ($object->statut != -1) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
 						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ValidateBefore")).'">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><font class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("CreateDolibarrLogin")."</font></div>";
 					}
 				}
 
 				// Delete
-				if ($user->rights->adherent->supprimer)
-				{
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>\n";
-				}
-				else
-				{
+				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))
-				{
+				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP)) {
 					$isinspip = $mailmanspip->is_in_spip($object);
 
-					if ($isinspip == 1)
-					{
+					if ($isinspip == 1) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=del_spip">'.$langs->trans("DeleteIntoSpip")."</a></div>\n";
 					}
-					if ($isinspip == 0)
-					{
+					if ($isinspip == 0) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?rowid='.$object->id.'&action=add_spip">'.$langs->trans("AddIntoSpip")."</a></div>\n";
 					}
 				}
@@ -1909,8 +1714,7 @@ else
 		}
 		print '</div>';
 
-		if ($isinspip == -1)
-		{
+		if ($isinspip == -1) {
 			print '<br><br><font class="error">'.$langs->trans('SPIPConnectionFailed').': '.$mailmanspip->error.'</font>';
 		}
 
@@ -1920,8 +1724,7 @@ else
 			$action = 'presend';
 		}
 
-		if ($action != 'presend')
-		{
+		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 
@@ -1934,7 +1737,7 @@ else
 			$genallowed = $user->rights->adherent->lire;
 			$delallowed = $user->rights->adherent->creer;
 
-			print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
+			print $formfile->showdocuments('member', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $object->default_lang, '', $object);
 			$somethingshown = $formfile->numoffiles;
 
 			// Show links to link elements
@@ -1949,8 +1752,7 @@ else
 			// Shon online payment link
 			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-			if ($useonlinepayment)
-			{
+			if ($useonlinepayment) {
 				print '<br>';
 
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
@@ -1966,7 +1768,7 @@ else
 			$morehtmlright .= '</a>';
 
 			// List of actions on element
-	        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 			$formactions = new FormActions($db);
 			$somethingshown = $formactions->showactions($object, 'member', $socid, 1, 'listactions', $MAX, '', $morehtmlright);
 
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 86bf523ac51..958750178f1 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -55,13 +55,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
  * Actions
  */
 
-if ($mode == 'cardlogin' && empty($foruserlogin))
-{
+if ($mode == 'cardlogin' && empty($foruserlogin)) {
     $mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"));
 }
 
-if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
-{
+if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
     $arrayofmembers = array();
 
     // request taking into account member with up to date subscriptions
@@ -83,12 +81,10 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
 
     dol_syslog("Search members", LOG_DEBUG);
     $result = $db->query($sql);
-    if ($result)
-    {
+    if ($result) {
     	$num = $db->num_rows($result);
     	$i = 0;
-    	while ($i < $num)
-    	{
+    	while ($i < $num) {
     		$objp = $db->fetch_object($result);
 
     		if ($objp->country == '-') $objp->country = '';
@@ -98,14 +94,11 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
     		$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']))
-            {
+    		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)
-                {
+                foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
                     $tmpkey = 'options_'.$key;
-                    if (!empty($objp->$tmpkey))
-                    {
+                    if (!empty($objp->$tmpkey)) {
                         $adherentstatic->array_options[$tmpkey] = $objp->$tmpkey;
                     }
                     //if (!empty($objp->$key))
@@ -139,20 +132,17 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
             complete_substitutions_array($substitutionarray, $langs, $adherentstatic);
 
             // For business cards
-            if (empty($mode) || $mode == 'card' || $mode == 'cardlogin')
-            {
+            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)
-                {
+                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++)
-                    {
+                    for ($j = 0; $j < $nb; $j++) {
                         $arrayofmembers[] = array(
                         	'textleft'=>$textleft,
                             'textheader'=>$textheader,
@@ -162,11 +152,9 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
                             'photo'=>$objp->photo
                         );
                     }
-                }
-                else
-                {
+                } else {
                     $arrayofmembers[] = array(
-                    	'textleft'=>$textleft,
+                        'textleft'=>$textleft,
                         'textheader'=>$textheader,
                         'textfooter'=>$textfooter,
                         'textright'=>$textright,
@@ -177,8 +165,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
             }
 
             // For labels
-            if ($mode == 'label')
-            {
+            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 = '';
@@ -197,43 +184,32 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg)
     	}
 
     	// Build and output PDF
-        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin')
-        {
-            if (!count($arrayofmembers))
-            {
+        if (empty($mode) || $mode == 'card' || $mode == 'cardlogin') {
+            if (!count($arrayofmembers)) {
                 $mesg = $langs->trans("ErrorRecordNotFound");
             }
-            if (empty($model) || $model == '-1')
-            {
+            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))
-            {
+        } elseif ($mode == 'label') {
+            if (!count($arrayofmembers)) {
                 $mesg = $langs->trans("ErrorRecordNotFound");
             }
-        	if (empty($modellabel) || $modellabel == '-1')
-    		{
+        	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)
-    	{
+    	if ($result <= 0) {
     		dol_print_error('', $result);
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 
-    if (!$mesg)
-    {
+    if (!$mesg) {
     	$db->close();
     	exit;
     }
@@ -266,8 +242,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_CARD_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
@@ -285,8 +260,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_CARD_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
@@ -305,8 +279,7 @@ print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_ETIQUETTE_TYPE").' ';
 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
 }
 asort($arrayoflabels);
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 1621ca63e7a..95ca2017b21 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -282,7 +282,7 @@ class Adherent extends CommonObject
 		'phone' => array('type' => 'varchar(30)', 'label' => 'Phone', 'enabled' => 1, 'visible' => -1, 'position' => 115),
 		'phone_perso' => array('type' => 'varchar(30)', 'label' => 'Phone perso', 'enabled' => 1, 'visible' => -1, 'position' => 120),
 		'phone_mobile' => array('type' => 'varchar(30)', 'label' => 'Phone mobile', 'enabled' => 1, 'visible' => -1, 'position' => 125),
-		'birth' => array('type' => 'date', 'label' => 'DateToBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130),
+		'birth' => array('type' => 'date', 'label' => 'DateOfBirth', 'enabled' => 1, 'visible' => -1, 'position' => 130),
 		'photo' => array('type' => 'varchar(255)', 'label' => 'Photo', 'enabled' => 1, 'visible' => -1, 'position' => 135),
 		'public' => array('type' => 'smallint(6)', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 145),
 		'datefin' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => 1, 'visible' => -1, 'position' => 150),
@@ -421,7 +421,8 @@ class Adherent extends CommonObject
 			'__PASSWORD__' => $msgishtml ? dol_htmlentitiesbr($this->pass) : ($this->pass ? $this->pass : ''),
 			'__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 : ''));
+			'__PHONEMOBILE__' => $msgishtml ? dol_htmlentitiesbr($this->phone_mobile) : ($this->phone_mobile ? $this->phone_mobile : ''),
+			'__TYPE__' => $msgishtml ? dol_htmlentitiesbr($this->type) : ($this->type ? $this->type : ''));
 
 		complete_substitutions_array($substitutionarray, $langs, $this);
 
@@ -660,8 +661,7 @@ class Adherent extends CommonObject
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
 				if ($result < 0) {
 					$error++;
@@ -704,8 +704,7 @@ class Adherent extends CommonObject
 				}
 			}
 
-			if (!$error && $nbrowsaffected) // If something has change in main data
-			{
+			if (!$error && $nbrowsaffected) { // If something has change in main data
 				// Update information on linked user if it is an update
 				if (!$error && $this->user_id > 0 && !$nosyncuser) {
 					require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -1118,7 +1117,7 @@ class Adherent extends CommonObject
 		// Remove link to third party onto any other members
 		if ($thirdpartyid > 0) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET fk_soc = null";
-			$sql .= " WHERE fk_soc = '".$thirdpartyid."'";
+			$sql .= " WHERE fk_soc = ".((int) $thirdpartyid);
 			$sql .= " AND entity = ".$conf->entity;
 			dol_syslog(get_class($this)."::setThirdPartyId", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1282,10 +1281,11 @@ class Adherent extends CommonObject
 
 				$this->country_id = $obj->country_id;
 				$this->country_code = $obj->country_code;
-				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code)
+				if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) {
 					$this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
-				else
+				} else {
 					$this->country = $obj->country;
+				}
 
 				$this->phone = $obj->phone;
 				$this->phone_perso = $obj->phone_perso;
@@ -1554,8 +1554,7 @@ class Adherent extends CommonObject
 			$customer = new Societe($this->db);
 
 			if (!$error) {
-				if (!($this->fk_soc > 0)) // If not yet linked to a company
-				{
+				if (!($this->fk_soc > 0)) { // If not yet linked to a company
 					if ($autocreatethirdparty) {
 						// Create a linked thirdparty to member
 						$companyalias = '';
@@ -1725,7 +1724,7 @@ class Adherent extends CommonObject
 				// Generate PDF (whatever is option MAIN_DISABLE_PDF_AUTOUPDATE) so we can include it into email
 				//if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 
-				$invoice->generateDocument($invoice->modelpdf, $outputlangs);
+				$invoice->generateDocument($invoice->model_pdf, $outputlangs);
 			}
 		}
 
@@ -2037,12 +2036,13 @@ class Adherent extends CommonObject
 		if ($withpictoimg > -2 && $withpictoimg != 2) {
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '<span class="nopadding valignmiddle'.((!isset($this->statut) || $this->statut) ? '' : ' strikefordisabled').
 				($morecss ? ' usertext'.$morecss : '').'">';
-			if ($mode == 'login')
+			if ($mode == 'login') {
 				$result .= dol_trunc($this->login, $maxlen);
-			elseif ($mode == 'ref')
+			} elseif ($mode == 'ref') {
 				$result .= $this->id;
-			else
+			} else {
 				$result .= $this->getFullName($langs, '', ($mode == 'firstname' ? 2 : -1), $maxlen);
+			}
 			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $result .= '</span>';
 		}
 		if ($withpictoimg) $result .= '</div>';
@@ -2257,8 +2257,8 @@ class Adherent extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'standard';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->ADHERENT_ADDON_PDF)) {
 				$modele = $conf->global->ADHERENT_ADDON_PDF;
 			}
@@ -2418,8 +2418,7 @@ class Adherent extends CommonObject
 			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
 			if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
 		} // Set LDAP password if possible
-		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
-		{
+		elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') { // If ldap key is modified and LDAPv3 we use ldap_rename function for avoid lose encrypt password
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
 				// Just for the default MD5 !
 				if (empty($conf->global->MAIN_SECURITY_HASH_ALGO)) {
@@ -2618,8 +2617,7 @@ class Adherent extends CommonObject
 
 		$blockingerrormsg = '';
 
-		if (empty($conf->adherent->enabled)) // Should not happen. If module disabled, cron job should not be visible.
-		{
+		if (empty($conf->adherent->enabled)) { // Should not happen. If module disabled, cron job should not be visible.
 			$langs->load("agenda");
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Adherent"));
 			return 0;
@@ -2638,8 +2636,7 @@ class Adherent extends CommonObject
 		$listofmembersko = array();
 
 		$arraydaysbeforeend = explode(';', $daysbeforeendlist);
-		foreach ($arraydaysbeforeend as $daysbeforeend) // Loop on each delay
-		{
+		foreach ($arraydaysbeforeend as $daysbeforeend) { // Loop on each delay
 			dol_syslog(__METHOD__.' - Process delta = '.$daysbeforeend, LOG_DEBUG);
 
 			if (!is_numeric($daysbeforeend)) {
@@ -2751,7 +2748,7 @@ class Adherent extends CommonObject
 								$actioncomm->datef = $now;
 								$actioncomm->percentage = -1; // Not applicable
 								$actioncomm->socid = $adherent->thirdparty->id;
-								$actioncomm->contactid = 0;
+								$actioncomm->contact_id = 0;
 								$actioncomm->authorid = $user->id; // User saving action
 								$actioncomm->userownerid = $user->id; // Owner of action
 								// Fields when action is en email (content should be added into note)
@@ -2803,10 +2800,11 @@ class Adherent extends CommonObject
 						$listofids .= ', ...';
 						break;
 					}
-					if (empty($listofids))
+					if (empty($listofids)) {
 						$listofids .= ' [';
-					else
+					} else {
 						$listofids .= ', ';
+					}
 					$listofids .= $idmember;
 					$i++;
 				}
@@ -2823,10 +2821,11 @@ class Adherent extends CommonObject
 							$listofids .= ', ...';
 							break;
 						}
-						if (empty($listofids))
+						if (empty($listofids)) {
 							$listofids .= ' [';
-						else
+						} else {
 							$listofids .= ', ';
+						}
 						$listofids .= $idmember;
 						$i++;
 					}
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 4af80ab4a63..94bf34208ff 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -62,26 +62,26 @@ class AdherentType extends CommonObject
 	public $libelle;
 
 	/**
-     * @var string Adherent type label
-     */
-    public $label;
+	 * @var string Adherent type label
+	 */
+	public $label;
 
-    /**
-     * @var string Adherent type nature
-     */
-    public $morphy;
+	/**
+	 * @var string Adherent type nature
+	 */
+	public $morphy;
 
-    public $duration;
+	public $duration;
 
-    /*
+	/*
     * type expiration
     */
-    public $duration_value;
+	public $duration_value;
 
-    /**
-     * Expiration unit
-     */
-    public $duration_unit;
+	/**
+	 * Expiration unit
+	 */
+	public $duration_unit;
 
 	/**
 	 * @var int Subsription required (0 or 1)
@@ -101,7 +101,7 @@ class AdherentType extends CommonObject
 	/** @var array Array of members */
 	public $members = array();
 
-    public $multilangs = array();
+	public $multilangs = array();
 
 
 	/**
@@ -112,176 +112,160 @@ class AdherentType extends CommonObject
 	public function __construct($db)
 	{
 		$this->db = $db;
-		$this->statut = 1;
+		$this->status = 1;
 	}
 
-    /**
-     *    Load array this->multilangs
-     *
-     * @return int        <0 if KO, >0 if OK
-     */
-    public function getMultiLangs()
-    {
-        global $langs;
+	/**
+	 *    Load array this->multilangs
+	 *
+	 * @return int        <0 if KO, >0 if OK
+	 */
+	public function getMultiLangs()
+	{
+		global $langs;
 
-        $current_lang = $langs->getDefaultLang();
+		$current_lang = $langs->getDefaultLang();
 
-        $sql = "SELECT lang, label, description, email";
-        $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-        $sql .= " WHERE fk_type=".$this->id;
+		$sql = "SELECT lang, label, description, email";
+		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
+		$sql .= " WHERE fk_type=".$this->id;
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            while ($obj = $this->db->fetch_object($result))
-            {
-                //print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
-                if ($obj->lang == $current_lang)  // si on a les traduct. dans la langue courante on les charge en infos principales.
-                {
-                    $this->label        = $obj->label;
-                    $this->description = $obj->description;
-                    $this->email        = $obj->email;
-                }
-                $this->multilangs["$obj->lang"]["label"] = $obj->label;
-                $this->multilangs["$obj->lang"]["description"] = $obj->description;
-                $this->multilangs["$obj->lang"]["email"] = $obj->email;
-            }
-            return 1;
-        }
-        else
-        {
-            $this->error = "Error: ".$this->db->lasterror()." - ".$sql;
-            return -1;
-        }
-    }
+		$result = $this->db->query($sql);
+		if ($result) {
+			while ($obj = $this->db->fetch_object($result)) {
+				//print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
+				if ($obj->lang == $current_lang) {  // si on a les traduct. dans la langue courante on les charge en infos principales.
+					$this->label        = $obj->label;
+					$this->description = $obj->description;
+					$this->email        = $obj->email;
+				}
+				$this->multilangs["$obj->lang"]["label"] = $obj->label;
+				$this->multilangs["$obj->lang"]["description"] = $obj->description;
+				$this->multilangs["$obj->lang"]["email"] = $obj->email;
+			}
+			return 1;
+		} else {
+			$this->error = "Error: ".$this->db->lasterror()." - ".$sql;
+			return -1;
+		}
+	}
 
-    /**
-     *    Update or add a translation for a product
-     *
-     * @param  User $user Object user making update
-     * @return int        <0 if KO, >0 if OK
-     */
-    public function setMultiLangs($user)
-    {
-        global $conf, $langs;
+	/**
+	 *    Update or add a translation for a product
+	 *
+	 * @param  User $user Object user making update
+	 * @return int        <0 if KO, >0 if OK
+	 */
+	public function setMultiLangs($user)
+	{
+		global $conf, $langs;
 
-        $langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 0, 2);
-        $current_lang = $langs->getDefaultLang();
+		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 0, 2);
+		$current_lang = $langs->getDefaultLang();
 
-        foreach ($langs_available as $key => $value)
-        {
-            if ($key == $current_lang) {
-                $sql = "SELECT rowid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-                $sql .= " WHERE fk_type=".$this->id;
-                $sql .= " AND lang='".$key."'";
+		foreach ($langs_available as $key => $value) {
+			if ($key == $current_lang) {
+				$sql = "SELECT rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
+				$sql .= " WHERE fk_type=".$this->id;
+				$sql .= " AND lang='".$key."'";
 
-                $result = $this->db->query($sql);
+				$result = $this->db->query($sql);
 
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
-                    $sql2 .= " SET ";
-                    $sql2 .= " label='".$this->db->escape($this->label)."',";
-                    $sql2 .= " description='".$this->db->escape($this->description)."'";
-                    $sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
-                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
-                    $sql2 .= ")";
-                    $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
-                    $sql2 .= " '".$this->db->escape($this->description)."'";
-                    $sql2 .= ")";
-                }
-                dol_syslog(get_class($this).'::setMultiLangs key = current_lang = '.$key);
-                if (!$this->db->query($sql2)) {
-                    $this->error = $this->db->lasterror();
-                    return -1;
-                }
-            }
-            elseif (isset($this->multilangs[$key])) {
-                $sql = "SELECT rowid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-                $sql .= " WHERE fk_type=".$this->id;
-                $sql .= " AND lang='".$key."'";
+				if ($this->db->num_rows($result)) { // if there is already a description line for this language
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
+					$sql2 .= " SET ";
+					$sql2 .= " label='".$this->db->escape($this->label)."',";
+					$sql2 .= " description='".$this->db->escape($this->description)."'";
+					$sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
+				} else {
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
+					$sql2 .= ")";
+					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
+					$sql2 .= " '".$this->db->escape($this->description)."'";
+					$sql2 .= ")";
+				}
+				dol_syslog(get_class($this).'::setMultiLangs key = current_lang = '.$key);
+				if (!$this->db->query($sql2)) {
+					$this->error = $this->db->lasterror();
+					return -1;
+				}
+			} elseif (isset($this->multilangs[$key])) {
+				$sql = "SELECT rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type_lang";
+				$sql .= " WHERE fk_type=".$this->id;
+				$sql .= " AND lang='".$key."'";
 
-                $result = $this->db->query($sql);
+				$result = $this->db->query($sql);
 
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
-                    $sql2 .= " SET ";
-                    $sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
-                    $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
-                    $sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
-                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
-                    $sql2 .= ")";
-                    $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
-                    $sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
-                    $sql2 .= ")";
-                }
+				if ($this->db->num_rows($result)) { // if there is already a description line for this language
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."adherent_type_lang";
+					$sql2 .= " SET ";
+					$sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					$sql2 .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($key)."'";
+				} else {
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type_lang (fk_type, lang, label, description";
+					$sql2 .= ")";
+					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					$sql2 .= ")";
+				}
 
-                // We do not save if main fields are empty
-                if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"]) {
-                    if (!$this->db->query($sql2)) {
-                        $this->error = $this->db->lasterror();
-                        return -1;
-                    }
-                }
-            }
-            else
-            {
-                // language is not current language and we didn't provide a multilang description for this language
-            }
-        }
+				// We do not save if main fields are empty
+				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"]) {
+					if (!$this->db->query($sql2)) {
+						$this->error = $this->db->lasterror();
+						return -1;
+					}
+				}
+			} else {
+				// language is not current language and we didn't provide a multilang description for this language
+			}
+		}
 
-        // Call trigger
-        $result = $this->call_trigger('MEMBER_TYPE_SET_MULTILANGS', $user);
-        if ($result < 0) {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-        // End call triggers
+		// Call trigger
+		$result = $this->call_trigger('MEMBER_TYPE_SET_MULTILANGS', $user);
+		if ($result < 0) {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+		// End call triggers
 
-        return 1;
-    }
+		return 1;
+	}
 
-       /**
-     *    Delete a language for this product
-     *
-     * @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)
-    {
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type_lang";
-        $sql .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
+	   /**
+	    *    Delete a language for this product
+	    *
+	    * @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)
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type_lang";
+		$sql .= " WHERE fk_type=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
 
-        dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result) {
-            // Call trigger
-            $result = $this->call_trigger('ADHERENT_TYPE_DEL_MULTILANGS', $user);
-            if ($result < 0) {
-                $this->error = $this->db->lasterror();
-                dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
-                return -1;
-            }
-            // End call triggers
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			// Call trigger
+			$result = $this->call_trigger('ADHERENT_TYPE_DEL_MULTILANGS', $user);
+			if ($result < 0) {
+				$this->error = $this->db->lasterror();
+				dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
+				return -1;
+			}
+			// End call triggers
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
 	/**
 	 *  Fonction qui permet de creer le status de l'adherent
@@ -296,7 +280,7 @@ class AdherentType extends CommonObject
 
 		$error = 0;
 
-		$this->statut = (int) $this->statut;
+		$this->status = (int) $this->status;
 		$this->label = trim($this->label);
 
 		$this->db->begin();
@@ -313,39 +297,31 @@ class AdherentType extends CommonObject
 
 		dol_syslog("Adherent_type::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."adherent_type");
 
 			$result = $this->update($user, 1);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				return -3;
 			}
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('MEMBER_TYPE_CREATE', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -361,7 +337,7 @@ class AdherentType extends CommonObject
 	 */
 	public function update($user, $notrigger = 0)
 	{
-        global $langs, $conf, $hookmanager;
+		global $langs, $conf, $hookmanager;
 
 		$error = 0;
 
@@ -371,7 +347,7 @@ class AdherentType extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
 		$sql .= "SET ";
-		$sql .= "statut = ".$this->statut.",";
+		$sql .= "statut = ".$this->status.",";
 		$sql .= "libelle = '".$this->db->escape($this->label)."',";
 		$sql .= "morphy = '".$this->db->escape($this->morphy)."',";
 		$sql .= "subscription = '".$this->db->escape($this->subscription)."',";
@@ -382,52 +358,43 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE rowid =".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-            $this->description = $this->db->escape($this->note);
+		if ($result) {
+			$this->description = $this->db->escape($this->note);
 
-            // Multilangs
-            if (!empty($conf->global->MAIN_MULTILANGS)) {
-                if ($this->setMultiLangs($user) < 0) {
-                    $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
-                    return -2;
-                }
-            }
+			// Multilangs
+			if (!empty($conf->global->MAIN_MULTILANGS)) {
+				if ($this->setMultiLangs($user) < 0) {
+					$this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+					return -2;
+				}
+			}
 
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('MEMBER_TYPE_MODIFY', $user);
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 				return -$error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -449,8 +416,7 @@ class AdherentType extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('MEMBER_TYPE_DELETE', $user);
 			if ($result < 0) { $error++; $this->db->rollback(); return -2; }
@@ -458,9 +424,7 @@ class AdherentType extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -475,7 +439,7 @@ class AdherentType extends CommonObject
 	 */
 	public function fetch($rowid)
 	{
-        global $langs, $conf;
+		global $langs, $conf;
 
 		$sql = "SELECT d.rowid, d.libelle as label, d.morphy, d.statut as status, d.duration, d.subscription, d.mail_valid, d.note, d.vote";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
@@ -484,17 +448,14 @@ class AdherentType extends CommonObject
 		dol_syslog("Adherent_type::fetch", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id             = $obj->rowid;
 				$this->ref            = $obj->rowid;
 				$this->label          = $obj->label;
 				$this->morphy         = $obj->morphy;
-				$this->statut         = $obj->status; // deprecated
 				$this->status         = $obj->status;
 				$this->duration       = $obj->duration;
 				$this->duration_value = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
@@ -504,30 +465,29 @@ class AdherentType extends CommonObject
 				$this->note           = $obj->note;
 				$this->vote           = $obj->vote;
 
-                // multilangs
-                if (!empty($conf->global->MAIN_MULTILANGS)) {
-                    $this->getMultiLangs();
-                }
+				// multilangs
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
+					$this->getMultiLangs();
+				}
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of members' type
 	 *
-	 *  @return 	array	List of types of members
+	 *  @param	int		$status			Filter on status of type
+	 *  @return array					List of types of members
 	 */
-	public function liste_array()
+	public function liste_array($status = -1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$adherenttypes = array();
@@ -535,26 +495,22 @@ class AdherentType extends CommonObject
 		$sql = "SELECT rowid, libelle as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type";
 		$sql .= " WHERE entity IN (".getEntity('member_type').")";
+		if ($status >= 0) $sql .= " AND statut = ".((int) $status);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 
 					$adherenttypes[$obj->rowid] = $langs->trans($obj->label);
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print $this->db->error();
 		}
 		return $adherenttypes;
@@ -583,14 +539,10 @@ class AdherentType extends CommonObject
 
 		dol_syslog(get_class($this)."::listUsersForGroup", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if (!array_key_exists($obj->rowid, $ret))
-				{
-					if ($mode < 2)
-					{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!array_key_exists($obj->rowid, $ret)) {
+					if ($mode < 2) {
 						$memberstatic = new Adherent($this->db);
 						if ($mode == 1) {
 							$memberstatic->fetch($obj->rowid, '', '', '', false, false);
@@ -598,8 +550,7 @@ class AdherentType extends CommonObject
 							$memberstatic->fetch($obj->rowid);
 						}
 						$ret[$obj->rowid] = $memberstatic;
-					}
-					else $ret[$obj->rowid] = $obj->rowid;
+					} else $ret[$obj->rowid] = $obj->rowid;
 				}
 			}
 
@@ -608,9 +559,7 @@ class AdherentType extends CommonObject
 			$this->members = $ret;
 
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -625,37 +574,35 @@ 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("MorPhy");
 		//return $morphy;
 	}
 
-    /**
-     *  Return clicable name (with picto eventually)
-     *
-     *  @param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     *  @param		int		$maxlen			length max label
-     *  @param		int  	$notooltip		1=Disable tooltip
-     *  @return		string					String with URL
-     */
-    public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0)
-    {
-        global $langs;
+	/**
+	 *  Return clicable name (with picto eventually)
+	 *
+	 *  @param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 *  @param		int		$maxlen			length max label
+	 *  @param		int  	$notooltip		1=Disable tooltip
+	 *  @return		string					String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0)
+	{
+		global $langs;
 
-        $result = '';
-        $label = $langs->trans("ShowTypeCard", $this->label);
+		$result = '';
+		$label = $langs->trans("ShowTypeCard", $this->label);
 
-        $linkstart = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?rowid='.$this->id.'" 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 .= ($maxlen ?dol_trunc($this->label, $maxlen) : $this->label);
-        $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->label, $maxlen) : $this->label);
+		$result .= $linkend;
 
-        return $result;
-    }
+		return $result;
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
@@ -664,7 +611,7 @@ class AdherentType 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);
 	}
@@ -676,17 +623,16 @@ class AdherentType 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');
 
 		$statusType = 'status4';
 		if ($status == 0) $statusType = 'status5';
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			$this->labelStatus[0] = $langs->trans("ActivityCeased");
 			$this->labelStatus[1] = $langs->trans("InActivity");
 			$this->labelStatusShort[0] = $langs->trans("ActivityCeased");
@@ -694,10 +640,10 @@ class AdherentType extends CommonObject
 		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+	}
 
-    // 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
 	 *
@@ -709,7 +655,7 @@ class AdherentType 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_MEMBERS_TYPES."=".$info[$conf->global->LDAP_KEY_MEMBERS_TYPES].",".$conf->global->LDAP_MEMBER_TYPE_DN;
@@ -719,8 +665,8 @@ class AdherentType 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
 	/**
 	 *	Initialize the info array (array of LDAP values) that will be used to call LDAP functions
 	 *
@@ -728,7 +674,7 @@ class AdherentType extends CommonObject
 	 */
 	public function _load_ldap_info()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$info = array();
@@ -739,11 +685,9 @@ class AdherentType extends CommonObject
 		// Champs
 		if ($this->label && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_FULLNAME] = $this->label;
 		if ($this->note && !empty($conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_TYPE_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note, 0, 'UTF-8', 1);
-		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS))
-		{
+		if (!empty($conf->global->LDAP_MEMBER_TYPE_FIELD_GROUPMEMBERS)) {
 			$valueofldapfield = array();
-			foreach ($this->members as $key=>$val)    // This is array of users for group into dolibarr database.
-			{
+			foreach ($this->members as $key=>$val) {    // This is array of users for group into dolibarr database.
 				$member = new Adherent($this->db);
 				$member->fetch($val->id, '', '', '', false, false);
 				$info2 = $member->_load_ldap_info();
@@ -776,7 +720,7 @@ class AdherentType extends CommonObject
 		$this->subscription = 1;
 		$this->vote = 0;
 
-		$this->statut = 1;
+		$this->status = 1;
 
 		// Members of this member type is just me
 		$this->members = array(
@@ -793,8 +737,7 @@ class AdherentType extends CommonObject
 	{
 		global $conf;
 
-		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid)))
-		{
+		if (!empty($this->mail_valid) && trim(dol_htmlentitiesbr_decode($this->mail_valid))) {
 			return $this->mail_valid;
 		}
 
@@ -811,8 +754,7 @@ class AdherentType extends CommonObject
 		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
-		{
+		if (!empty($this->mail_subscription) && trim(dol_htmlentitiesbr_decode($this->mail_subscription))) {  // Property not yet defined
 			return $this->mail_subscription;
 		}
 
@@ -824,16 +766,15 @@ class AdherentType extends CommonObject
 	 *
 	 *     @return string     Return mail model content of type or empty
 	 */
-    public function getMailOnResiliate()
-    {
-        global $conf;
+	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;
-        }
+		// 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;
+		}
 
-        return '';
-    }
+		return '';
+	}
 }
diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php
index eff42f92a43..d86a9e21d8c 100644
--- a/htdocs/adherents/class/adherentstats.class.php
+++ b/htdocs/adherents/class/adherentstats.class.php
@@ -71,8 +71,7 @@ class AdherentStats extends Stats
 		$this->where .= " m.statut != -1";
 		$this->where .= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent').")";
 		//if (!$user->rights->societe->client->voir && !$user->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
-		if ($this->memberid)
-		{
+		if ($this->memberid) {
 			$this->where .= " AND m.rowid = ".$this->memberid;
 		}
         //if ($this->userid > 0) $this->where.=' AND fk_user_author = '.$this->userid;
@@ -93,7 +92,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, count(*)";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE date_format(p.dateadh,'%Y') = '".$year."'";
+		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
         $sql .= $this->db->order('dm', 'DESC');
@@ -134,7 +133,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%m') as dm, sum(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
 		//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-		$sql .= " WHERE date_format(p.dateadh,'%Y') = '".$year."'";
+		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
         $sql .= $this->db->order('dm', 'DESC');
@@ -155,7 +154,7 @@ class AdherentStats extends Stats
 		$sql = "SELECT date_format(p.dateadh,'%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 .= " WHERE date_format(p.dateadh,'%Y') = '".$year."'";
+		$sql .= " WHERE date_format(p.dateadh,'%Y') = ".((int) $year);
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
         $sql .= $this->db->order('dm', 'DESC');
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 8e2e0d278f0..230b839f726 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -1,6 +1,7 @@
 <?php
 /* 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>
  *
  * 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
@@ -18,6 +19,7 @@
 
 use Luracast\Restler\RestException;
 
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -76,6 +78,117 @@ class Members extends DolibarrApi
         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);
+        }
+
+        $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);
+        }
+
+        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);
+        }
+
+        $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');
+        }
+
+        if ( ! DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        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);
+        }
+
+        $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');
+        }
+
+        if ( ! DolibarrApi::_checkAccessToResource('adherent', $member->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        return $this->_cleanObjectDatas($member);
+    }
+
     /**
      * List members
      *
@@ -109,55 +222,48 @@ class Members extends DolibarrApi
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_member as c";
     	}
         $sql .= ' WHERE t.entity IN ('.getEntity('adherent').')';
-        if (!empty($typeid))
-        {
+        if (!empty($typeid)) {
             $sql .= ' AND t.fk_adherent_type='.$typeid;
         }
     	// Select members of given category
     	if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$db->escape($category);
+			$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))
-            {
+        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 .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
-        if ($result)
-        {
+        $result = $this->db->query($sql);
+        if ($result) {
             $i = 0;
-            $num = $db->num_rows($result);
+            $num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $db->fetch_object($result);
+            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 : '.$db->lasterror());
+        } else {
+        	throw new RestException(503, 'Error when retrieve member list : '.$this->db->lasterror());
         }
         if (!count($obj_ret)) {
             throw new RestException(404, 'No member found');
@@ -236,13 +342,10 @@ class Members extends DolibarrApi
 
         // 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)
-        {
+        if ($member->update(DolibarrApiAccess::$user) >= 0) {
             return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $member->error);
+        } else {
+            throw new RestException(500, $member->error);
         }
     }
 
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 98cb25b7fc3..682fb9d707c 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -101,45 +101,39 @@ class MembersTypes extends DolibarrApi
         $sql .= ' WHERE t.entity IN ('.getEntity('member_type').')';
 
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        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 .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
-        if ($result)
-        {
+        $result = $this->db->query($sql);
+        if ($result) {
             $i = 0;
-            $num = $db->num_rows($result);
+            $num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-            	$obj = $db->fetch_object($result);
+            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 : '.$db->lasterror());
+        } 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');
@@ -204,13 +198,10 @@ class MembersTypes extends DolibarrApi
 
         // 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)
-        {
+        if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
             return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $membertype->error);
+        } else {
+            throw new RestException(500, $membertype->error);
         }
     }
 
@@ -302,7 +293,7 @@ class MembersTypes extends DolibarrApi
         unset($object->cond_reglement);
         unset($object->fk_delivery_address);
         unset($object->shipping_method_id);
-        unset($object->modelpdf);
+        unset($object->model_pdf);
         unset($object->fk_account);
         unset($object->note_public);
         unset($object->note_private);
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index c9804e5d802..d5adbb0bc5b 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -99,44 +99,38 @@ class Subscriptions extends DolibarrApi
         $sql .= " FROM ".MAIN_DB_PREFIX."subscription as t";
         $sql .= ' WHERE 1 = 1';
         // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
+        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 .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
-            if ($page < 0)
-            {
+            if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
-        if ($result)
-        {
+        $result = $this->db->query($sql);
+        if ($result) {
             $i = 0;
-            $num = $db->num_rows($result);
-            while ($i < min($limit, $num))
-            {
-                $obj = $db->fetch_object($result);
+            $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 : '.$db->lasterror());
+        } else {
+        	throw new RestException(503, 'Error when retrieve subscription list : '.$this->db->lasterror());
         }
         if (!count($obj_ret)) {
             throw new RestException(404, 'No Subscription found');
@@ -193,13 +187,10 @@ class Subscriptions extends DolibarrApi
             $subscription->$field = $value;
         }
 
-        if ($subscription->update(DolibarrApiAccess::$user) > 0)
-        {
+        if ($subscription->update(DolibarrApiAccess::$user) > 0) {
             return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $subscription->error);
+        } else {
+            throw new RestException(500, $subscription->error);
         }
     }
 
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index e512e1152bb..5a75fdbae2e 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -99,7 +99,7 @@ class Subscription extends CommonObject
     	'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'=>'date', 'label'=>'DateEndSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
+    	'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),
@@ -136,8 +136,7 @@ class Subscription extends CommonObject
         $now = dol_now();
 
         // Check parameters
-        if ($this->datef <= $this->dateh)
-        {
+        if ($this->datef <= $this->dateh) {
             $this->error = $langs->trans("ErrorBadValueForDate");
             return -1;
         }
@@ -169,14 +168,12 @@ class Subscription extends CommonObject
             $this->errors[] = $this->db->lasterror();
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
             $this->fk_type = $type;
         }
 
-        if (!$error && !$notrigger)
-        {
+        if (!$error && !$notrigger) {
         	$this->context = array('member'=>$member);
         	// Call triggers
             $result = $this->call_trigger('MEMBER_SUBSCRIPTION_CREATE', $user);
@@ -213,10 +210,8 @@ class Subscription extends CommonObject
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
+        if ($resql) {
+            if ($this->db->num_rows($resql)) {
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id             = $obj->rowid;
@@ -232,14 +227,10 @@ class Subscription extends CommonObject
                 $this->note           = $obj->note;
                 $this->fk_bank        = $obj->fk_bank;
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -272,8 +263,7 @@ class Subscription extends CommonObject
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-        if ($resql)
-        {
+        if ($resql) {
             require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
             $member = new Adherent($this->db);
             $result = $member->fetch($this->fk_adherent);
@@ -286,9 +276,7 @@ class Subscription extends CommonObject
                 if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
                 // End call triggers
             }
-        }
-        else
-        {
+        } else {
             $error++;
             $this->error = $this->db->lasterror();
         }
@@ -315,8 +303,7 @@ class Subscription extends CommonObject
         $error = 0;
 
         // It subscription is linked to a bank transaction, we get it
-        if ($this->fk_bank > 0)
-        {
+        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);
@@ -333,50 +320,37 @@ class Subscription extends CommonObject
             }
         }
 
-        if (!$error)
-        {
+        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)
-            {
+            if ($resql) {
                 $num = $this->db->affected_rows($resql);
-                if ($num)
-                {
+                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)
-                    {
-                        $result = $accountline->delete($user); // Return false if refused because line is conciliated
-                        if ($result > 0)
-                        {
+                    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
-                        {
+                        } else {
                             $this->error = $accountline->error;
                             $this->db->rollback();
                             return -1;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $this->db->commit();
                         return 1;
                     }
-                }
-                else
-                {
+                } else {
                     $this->db->commit();
                     return 0;
                 }
-            }
-            else
-            {
+            } else {
                 $error++;
                 $this->error = $this->db->lasterror();
             }
@@ -414,8 +388,7 @@ class Subscription extends CommonObject
 
         $url = DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id;
 
-        if ($option != 'nolink')
-        {
+        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;
@@ -476,10 +449,8 @@ class Subscription extends CommonObject
         $sql .= ' WHERE c.rowid = '.$id;
 
         $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
+        if ($result) {
+            if ($this->db->num_rows($result)) {
                 $obj = $this->db->fetch_object($result);
                 $this->id = $obj->rowid;
 
@@ -488,9 +459,7 @@ class Subscription extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 05ccf20169c..32630b9e478 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array("companies", "members", "other"));
 
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -61,8 +61,7 @@ $form = new Form($db);
 $object = new Adherent($db);
 $membert = new AdherentType($db);
 $result = $object->fetch($id);
-if ($result < 0)
-{
+if ($result < 0) {
 	dol_print_error($db);
 	exit;
 }
@@ -86,16 +85,13 @@ $title = $langs->trans("Member")." - ".$langs->trans("Documents");
 $helpurl = "EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros";
 llxHeader("", $title, $helpurl);
 
-if ($id > 0)
-{
+if ($id > 0) {
     $result = $membert->fetch($object->typeid);
-	if ($result > 0)
-	{
+	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);
 		$totalsize = 0;
-		foreach ($filearray as $key => $file)
-		{
+		foreach ($filearray as $key => $file) {
 			$totalsize += $file['size'];
 		}
 
@@ -118,8 +114,7 @@ if ($id > 0)
 		$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))
-        {
+        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>';
         }
 
@@ -158,14 +153,10 @@ if ($id > 0)
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 		print "<br><br>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
     $langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index b7aa8da5d14..fc9b2eaf7f9 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -40,13 +40,11 @@ $now = dol_now();
 
 if (empty($sortorder)) {  $sortorder = "ASC"; }
 if (empty($sortfield)) {  $sortfield = "d.login"; }
-if (!isset($statut))
-{
+if (!isset($statut)) {
 	$statut = 1;
 }
 
-if (!isset($cotis))
-{
+if (!isset($cotis)) {
 	// by default, members must be up to date of subscription
 	$cotis = 1;
 }
@@ -55,33 +53,28 @@ if (!isset($cotis))
 $sql = "SELECT d.login, d.pass, d.datefin";
 $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d ";
 $sql .= " WHERE d.statut = ".$statut;
-if ($cotis == 1)
-{
+if ($cotis == 1) {
 	$sql .= " AND datefin > '".$db->idate($now)."'";
 }
 $sql .= $db->order($sortfield, $sortorder);
 //$sql.=$db->plimit($conf->liste_limit, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
 	print_barre_liste($langs->trans("HTPasswordExport"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0);
 
 	print "<hr>\n";
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 		$htpass = crypt($objp->pass, makesalt());
 		print $objp->login.":".$htpass."<br>\n";
 		$i++;
 	}
 	print "<hr>\n";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 6d069386592..c63bb9049ca 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -73,12 +73,10 @@ $sql .= " GROUP BY t.rowid, t.libelle, t.subscription, d.statut";
 
 dol_syslog("index.php::select nb of members per type", LOG_DEBUG);
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 
 		$adhtype = new AdherentType($db);
@@ -110,12 +108,10 @@ $sql .= " GROUP BY d.fk_adherent_type";
 
 dol_syslog("index.php::select nb of uptodate members by type", LOG_DEBUG);
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 		$MemberUpToDate[$objp->fk_adherent_type] = $objp->somme;
 		$i++;
@@ -127,23 +123,19 @@ if ($result)
 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)
-    {
+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 (count($listofsearchfields))
-    {
+    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)
-    	{
+    	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>';
@@ -163,8 +155,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
  * Statistics
  */
 
-if ($conf->use_javascript_ajax)
-{
+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>';
@@ -177,8 +168,7 @@ if ($conf->use_javascript_ajax)
     $total = 0;
     $dataval = array();
     $i = 0;
-    foreach ($AdherentType as $key => $adhtype)
-    {
+    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);
@@ -232,12 +222,10 @@ $sql .= " AND d.rowid = c.fk_adherent";
 
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
     $num = $db->num_rows($result);
     $i = 0;
-    while ($i < $num)
-    {
+    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;
@@ -259,10 +247,8 @@ print "</tr>\n";
 
 krsort($Total);
 $i = 0;
-foreach ($Total as $key=>$value)
-{
-	if ($i >= 8)
-	{
+foreach ($Total as $key=>$value) {
+	if ($i >= 8) {
 		print '<tr class="oddeven">';
 		print "<td>...</td>";
 		print "<td class=\"right\"></td>";
@@ -296,7 +282,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 /*
  * Latest modified members
  */
-$max = 5;
+$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 .= " a.tms as datem, datefin as date_end_subscription,";
@@ -308,32 +294,26 @@ $sql .= $db->order("a.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+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("LastMembersModified", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			$staticmember->id = $obj->rowid;
 			$staticmember->lastname = $obj->lastname;
 			$staticmember->firstname = $obj->firstname;
-			if (!empty($obj->fk_soc))
-			{
+			if (!empty($obj->fk_soc)) {
 				$staticmember->fk_soc = $obj->fk_soc;
 				$staticmember->fetch_thirdparty();
 				$staticmember->name = $staticmember->thirdparty->name;
-			}
-			else
-			{
+			} else {
 				$staticmember->name = $obj->company;
 			}
 			$staticmember->ref = $staticmember->getFullName($langs);
@@ -349,9 +329,7 @@ if ($resql)
 	}
 	print "</table></div>";
 	print "<br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -359,7 +337,7 @@ else
 /*
  * Last modified subscriptions
  */
-$max = 5;
+$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 .= " datefin as date_end_subscription,";
@@ -371,19 +349,16 @@ $sql .= $db->order("c.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($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("LastSubscriptionsModified", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			$subscriptionstatic->id = $obj->cid;
@@ -411,9 +386,7 @@ if ($resql)
 	}
 	print "</table></div>";
 	print "<br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -429,8 +402,7 @@ print '<th class=right>'.$langs->trans("MenuMembersUpToDate").'</th>';
 print '<th class=right>'.$langs->trans("MembersStatusResiliated").'</th>';
 print "</tr>\n";
 
-foreach ($AdherentType as $key => $adhtype)
-{
+foreach ($AdherentType as $key => $adhtype) {
 	print '<tr class="oddeven">';
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
 	print '<td class="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0 ? $MemberToValidate[$key] : '').' '.$staticmember->LibStatut(-1, $adhtype->subscription, 0, 3).'</td>';
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 6a49f99fbf4..3094c6a50ac 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -37,15 +37,13 @@ $action = GETPOST('action', 'aZ09');
 
 // Protection
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $socid = $user->socid;
 }
 
 $object = new Adherent($db);
 $result = $object->fetch($rowid);
-if (!$result)
-{
+if (!$result) {
 	dol_print_error($db, "Failed to get adherent: ".$object->error);
 	exit;
 }
@@ -55,13 +53,11 @@ if (!$result)
  * Actions
  */
 
-if ($action == 'dolibarr2ldap')
-{
+if ($action == 'dolibarr2ldap') {
 	$ldap = new Ldap();
 	$result = $ldap->connect_bind();
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$info = $object->_load_ldap_info();
 		$dn = $object->_load_ldap_dn($info);
 		$olddn = $dn; // We can say that old dn = dn as we force synchro
@@ -71,8 +67,7 @@ if ($action == 'dolibarr2ldap')
 
 	if ($result >= 0) {
 		setEventMessages($langs->trans("MemberSynchronized"), null, 'mesgs');
-	}
-	else {
+	} else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 	}
 }
@@ -104,8 +99,7 @@ print '<table class="border centpercent tableforfield">';
 print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
 
 // If there is a link to password not crypted, we show value in database here so we can compare because it is shown nowhere else
-if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))
-{
+if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD)) {
 	print '<tr><td>'.$langs->trans("LDAPFieldPasswordNotCrypted").'</td>';
 	print '<td class="valeur">'.$object->pass.'</td>';
 	print "</tr>\n";
@@ -142,8 +136,7 @@ dol_fiche_end();
 
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr')
-{
+if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && $conf->global->LDAP_MEMBER_ACTIVE != 'ldap2dolibarr') {
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a></div>';
 }
 
@@ -166,46 +159,34 @@ print '</tr>';
 // Lecture LDAP
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
-if ($result > 0)
-{
+if ($result > 0) {
 	$info = $object->_load_ldap_info();
 	$dn = $object->_load_ldap_dn($info, 1);
 	$search = "(".$object->_load_ldap_dn($info, 2).")";
 
-	if (empty($dn))
-	{
+	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>';
-	}
-    else
-    {
+	} else {
     	$records = $ldap->getAttribute($dn, $search);
 
     	//print_r($records);
 
     	// Show tree
-    	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
-    	{
-    		if (!is_array($records))
-    		{
+    	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
-    		{
+    		} else {
     			$result = show_ldap_content($records, 0, $records['count'], true);
     		}
-    	}
-    	else
-    	{
+    	} else {
     		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
     	}
     }
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index bf8353da5c9..ef4639e4b5e 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -44,8 +44,6 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'mem
 // Security check
 $result = restrictedArea($user, 'adherent');
 
-$filter = GETPOST("filter", 'alpha');
-$statut = GETPOST("statut", 'intcomma');
 $search = GETPOST("search", 'alpha');
 $search_ref = GETPOST("search_ref", 'alpha');
 $search_lastname = GETPOST("search_lastname", 'alpha');
@@ -65,12 +63,19 @@ $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha');
 $search_type = GETPOST("search_type", 'alpha');
 $search_email = GETPOST("search_email", 'alpha');
 $search_categ = GETPOST("search_categ", 'int');
+$search_filter = GETPOST("search_filter", 'alpha');
+$search_status = GETPOST("search_status", 'intcomma');
 $catid        = GETPOST("catid", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 
+$filter = GETPOST("filter", 'alpha');
+if ($filter) $search_filter = $filter; // For backward compatibility
+$statut = GETPOST("statut", 'alpha');
+if ($statut != '') $search_status = $statut; // For backward compatibility
+
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 
-if ($statut < -1) $statut = '';
+if ($search_status < -1) $search_status = '';
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -121,7 +126,7 @@ $arrayfields = array(
 	'd.gender'=>array('label'=>$langs->trans("Gender"), 'checked'=>0),
 	'd.company'=>array('label'=>$langs->trans("Company"), 'checked'=>1),
 	'd.login'=>array('label'=>$langs->trans("Login"), 'checked'=>1),
-	'd.morphy'=>array('label'=>$langs->trans("MorPhy"), 'checked'=>1),
+	'd.morphy'=>array('label'=>$langs->trans("MemberNature"), 'checked'=>1),
 	't.libelle'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
 	'd.email'=>array('label'=>$langs->trans("Email"), 'checked'=>1),
 	'd.address'=>array('label'=>$langs->trans("Address"), 'checked'=>0),
@@ -141,10 +146,8 @@ $arrayfields = array(
 	'd.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)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
+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]));
 	}
@@ -162,14 +165,15 @@ $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))
-{
+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
-	{
+	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
+		$statut = '';
+		$filter = '';
+
 		$search = "";
 		$search_ref = "";
 		$search_lastname = "";
@@ -190,45 +194,38 @@ if (empty($reshook))
 		$search_phone_mobile = '';
 		$search_morphy = "";
 		$search_categ = "";
+		$search_filter = "";
+		$search_status = "";
 		$catid = "";
 		$sall = "";
-		$statut = '';
 		$toselect = '';
 		$search_array_options = array();
 	}
 
 	// Close
-	if ($massaction == 'close' && $user->rights->adherent->creer)
-	{
+	if ($massaction == 'close' && $user->rights->adherent->creer) {
 	    $tmpmember = new Adherent($db);
 	    $error = 0;
 	    $nbclose = 0;
 
 	    $db->begin();
 
-        foreach ($toselect as $idtoclose)
-        {
+        foreach ($toselect as $idtoclose) {
             $tmpmember->fetch($idtoclose);
             $result = $tmpmember->resiliate($user);
 
-            if ($result < 0 && !count($tmpmember->errors))
-    	    {
+            if ($result < 0 && !count($tmpmember->errors)) {
     	        setEventMessages($tmpmember->error, $tmpmember->errors, 'errors');
-    	    }
-    	    else
-    	    {
+    	    } else {
     	        if ($result > 0) $nbclose++;
     	    }
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             setEventMessages($langs->trans("XMembersClosed", $nbclose), null, 'mesgs');
 
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
 	}
@@ -285,19 +282,22 @@ if ($search_categ == -2) $sql .= " AND cm.fk_categorie IS NULL";
 $sql .= " AND d.entity IN (".getEntity('adherent').")";
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($search_type > 0) $sql .= " AND t.rowid=".$db->escape($search_type);
-if ($statut != '') $sql .= " AND d.statut in (".$db->escape($statut).")"; // Peut valoir un nombre ou liste de nombre separes par virgules
-if ($search_ref)
-{
+if ($search_filter == 'withoutsubscription') $sql .= " AND (datefin IS NULL OR t.subscription = 0)";
+if ($search_filter == 'uptodate') $sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = 0)";
+if ($search_filter == 'outofdate') $sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
+if ($search_status != '') $sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")"; // Peut valoir un nombre ou liste de nombre separes par virgules
+if ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (d.rowid = ".$db->escape($search_ref).")";
 	else $sql .= " AND 1 = 2"; // Always wrong
 }
 if ($search_civility) $sql .= natural_search("d.civility", $search_civility);
 if ($search_firstname) $sql .= natural_search("d.firstname", $search_firstname);
 if ($search_lastname) $sql .= natural_search(array("d.firstname", "d.lastname", "d.societe"), $search_lastname);
-if ($search_gender != '' && $search_gender != '-1') $sql .= " AND d.gender = '".$search_gender."'";
+if ($search_gender != '' && $search_gender != '-1') $sql .= natural_search("d.gender", $search_gender);
 if ($search_login) $sql .= natural_search("d.login", $search_login);
 if ($search_company) $sql .= natural_search("s.nom", $search_company);
 if ($search_email) $sql .= natural_search("d.email", $search_email);
+if ($search_address) $sql .= natural_search("d.address", $search_address);
 if ($search_town)     $sql .= natural_search("d.town", $search_town);
 if ($search_zip)      $sql .= natural_search("d.zip", $search_zip);
 if ($search_state)    $sql .= natural_search("state.nom", $search_state);
@@ -305,8 +305,6 @@ if ($search_phone)      $sql .= natural_search("d.phone", $search_phone);
 if ($search_phone_perso)      $sql .= natural_search("d.phone_perso", $search_phone_perso);
 if ($search_phone_mobile)      $sql .= natural_search("d.phone_mobile", $search_phone_mobile);
 if ($search_country) $sql .= " AND d.country IN (".$search_country.')';
-if ($filter == 'uptodate') $sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = 0)";
-if ($filter == 'outofdate') $sql .= " AND ((datefin IS NULL OR datefin < '".$db->idate($now)."') AND t.subscription = 1)";
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -320,13 +318,11 @@ $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))
-{
+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
-	{
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -336,8 +332,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("get list", LOG_DEBUG);
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -346,8 +341,7 @@ $num = $db->num_rows($resql);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/adherents/card.php?id='.$id);
@@ -357,22 +351,19 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
 
 $titre = $langs->trans("MembersList");
-if (GETPOSTISSET("statut"))
-{
-	if ($statut == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
-	if ($statut == '-1') { $titre = $langs->trans("MembersListToValid"); }
-	if ($statut == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); }
-	if ($statut == '1' && $filter == 'uptodate') { $titre = $langs->trans("MembersListUpToDate"); }
-	if ($statut == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
-	if ($statut == '0') { $titre = $langs->trans("MembersListResiliated"); }
-}
-elseif ($action == 'search')
-{
+if (GETPOSTISSET("search_status")) {
+	if ($search_status == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
+	if ($search_status == '-1') { $titre = $langs->trans("MembersListToValid"); }
+	if ($search_status == '1' && $filter == '') { $titre = $langs->trans("MembersValidated"); }
+	if ($search_status == '1' && $filter == 'withoutsubscription') { $titre = $langs->trans("MembersWithSubscriptionToReceive"); }
+	if ($search_status == '1' && $filter == 'uptodate') { $titre = $langs->trans("MembersListUpToDate"); }
+	if ($search_status == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
+	if ($search_status == '0') { $titre = $langs->trans("MembersListResiliated"); }
+} elseif ($action == 'search') {
 	$titre = $langs->trans("MembersListQualified");
 }
 
-if ($search_type > 0)
-{
+if ($search_type > 0) {
 	$membertype = new AdherentType($db);
 	$result = $membertype->fetch(GETPOST("type", 'int'));
 	$titre .= " (".$membertype->label.")";
@@ -382,7 +373,6 @@ $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 ($statut != "") $param .= "&statut=".urlencode($statut);
 if ($search_ref)   $param .= "&search_ref=".urlencode($search_ref);
 if ($search_civility) $param .= "&search_civility=".urlencode($search_civility);
 if ($search_firstname) $param .= "&search_firstname=".urlencode($search_firstname);
@@ -390,6 +380,7 @@ if ($search_lastname)  $param .= "&search_lastname=".urlencode($search_lastname)
 if ($search_gender)  $param .= "&search_gender=".urlencode($search_gender);
 if ($search_login)   $param .= "&search_login=".urlencode($search_login);
 if ($search_email)   $param .= "&search_email=".urlencode($search_email);
+if ($search_categ)   $param .= "&search_categ=".urlencode($search_categ);
 if ($search_company) $param .= "&search_company=".urlencode($search_company);
 if ($search_address != '') $param .= "&search_address=".urlencode($search_address);
 if ($search_town != '') $param .= "&search_town=".urlencode($search_town);
@@ -399,7 +390,8 @@ if ($search_country != '') $param .= "&search_country=".urlencode($search_countr
 if ($search_phone != '') $param .= "&search_phone=".urlencode($search_phone);
 if ($search_phone_perso != '') $param .= "&search_phone_perso=".urlencode($search_phone_perso);
 if ($search_phone_mobile != '') $param .= "&search_phone_mobile=".urlencode($search_phone_mobile);
-if ($filter)         $param .= "&filter=".urlencode($filter);
+if ($search_filter && $search_filter != '-1') $param .= "&search_filter=".urlencode($search_filter);
+if ($search_status != "" && $search_status != '-1') $param .= "&search_status=".urlencode($search_status);
 if ($search_type > 0)       $param .= "&search_type=".urlencode($search_type);
 if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -416,8 +408,7 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-if ($user->rights->adherent->creer)
-{
+if ($user->rights->adherent->creer) {
     $newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
 }
 
@@ -438,16 +429,14 @@ $objecttmp = new Adherent($db);
 $trackid = 'mem'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
+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 = '';
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('Categories').': ';
@@ -458,8 +447,7 @@ $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 (!empty($moreforfilter))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -477,121 +465,103 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 print '<tr class="liste_titre_filter">';
 
 // Line numbering
-if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-{
+if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
 // Ref
-if (!empty($arrayfields['d.ref']['checked']))
-{
+if (!empty($arrayfields['d.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['d.civility']['checked']))
-{
+if (!empty($arrayfields['d.civility']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50imp" type="text" name="search_civility" value="'.dol_escape_htmltag($search_civility).'"></td>';
 }
-if (!empty($arrayfields['d.firstname']['checked']))
-{
+if (!empty($arrayfields['d.firstname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
-if (!empty($arrayfields['d.lastname']['checked']))
-{
+if (!empty($arrayfields['d.lastname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
-if (!empty($arrayfields['d.gender']['checked']))
-{
+if (!empty($arrayfields['d.gender']['checked'])) {
 	print '<td class="liste_titre">';
-	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
+	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
 }
-if (!empty($arrayfields['d.company']['checked']))
-{
+if (!empty($arrayfields['d.company']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
 }
-if (!empty($arrayfields['d.login']['checked']))
-{
+if (!empty($arrayfields['d.login']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75imp" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
 }
-if (!empty($arrayfields['d.morphy']['checked']))
-{
+if (!empty($arrayfields['d.morphy']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '</td>';
 }
-if (!empty($arrayfields['t.libelle']['checked']))
-{
+if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	$listetype = $membertypestatic->liste_array();
 	print $form->selectarray("search_type", $listetype, $type, 1, 0, 0, '', 0, 32);
 	print '</td>';
 }
 
-if (!empty($arrayfields['d.address']['checked']))
-{
+if (!empty($arrayfields['d.address']['checked'])) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat maxwidth75imp" type="text" name="search_address" value="'.$search_address.'"></td>';
+	print '<input class="flat maxwidth75imp" type="text" name="search_address" value="'.dol_escape_htmltag($search_address).'"></td>';
 }
 
-if (!empty($arrayfields['d.zip']['checked']))
-{
+if (!empty($arrayfields['d.zip']['checked'])) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat maxwidth50imp" type="text" name="search_zip" value="'.$search_zip.'"></td>';
+	print '<input class="flat maxwidth50imp" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 }
-if (!empty($arrayfields['d.town']['checked']))
-{
+if (!empty($arrayfields['d.town']['checked'])) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat maxwidth75imp" type="text" name="search_town" value="'.$search_town.'"></td>';
+	print '<input class="flat maxwidth75imp" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 }
 // State
-if (!empty($arrayfields['state.nom']['checked']))
-{
+if (!empty($arrayfields['state.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring maxwidth75imp" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 	print '</td>';
 }
 // Country
-if (!empty($arrayfields['country.code_iso']['checked']))
-{
+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>';
 }
 // Phone pro
-if (!empty($arrayfields['d.phone']['checked']))
-{
+if (!empty($arrayfields['d.phone']['checked'])) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat maxwidth75imp" type="text" name="search_phone" value="'.$search_phone.'"></td>';
+	print '<input class="flat maxwidth75imp" type="text" name="search_phone" value="'.dol_escape_htmltag($search_phone).'"></td>';
 }
 // Phone perso
-if (!empty($arrayfields['d.phone_perso']['checked']))
-{
+if (!empty($arrayfields['d.phone_perso']['checked'])) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat maxwidth50" type="text" name="search_phone_perso" value="'.$search_phone_perso.'"></td>';
+	print '<input class="flat maxwidth50" type="text" name="search_phone_perso" value="'.dol_escape_htmltag($search_phone_perso).'"></td>';
 }
 // Phone mobile
-if (!empty($arrayfields['d.phone_mobile']['checked']))
-{
+if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat maxwidth75imp" type="text" name="search_phone_mobile" value="'.$search_phone_mobile.'"></td>';
+	print '<input class="flat maxwidth75imp" type="text" name="search_phone_mobile" value="'.dol_escape_htmltag($search_phone_mobile).'"></td>';
 }
 // Email
-if (!empty($arrayfields['d.email']['checked']))
-{
+if (!empty($arrayfields['d.email']['checked'])) {
 	print '<td class="liste_titre left">';
-	print '<input class="flat maxwidth75imp" type="text" name="search_email" value="'.$search_email.'"></td>';
+	print '<input class="flat maxwidth75imp" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'"></td>';
 }
-
-if (!empty($arrayfields['d.datefin']['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"));
+	print $form->selectarray('search_filter', $selectarray, $search_filter);
 	print '</td>';
 }
 // Extra fields
@@ -602,33 +572,29 @@ $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['d.datec']['checked']))
-{
+if (!empty($arrayfields['d.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
-//Birthday
-if (!empty($arrayfields['d.birth']['checked']))
-{
+// Birthday
+if (!empty($arrayfields['d.birth']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['d.tms']['checked']))
-{
+if (!empty($arrayfields['d.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Status
-if (!empty($arrayfields['d.statut']['checked']))
-{
+if (!empty($arrayfields['d.statut']['checked'])) {
 	print '<td class="liste_titre right maxwidthonsmartphone">';
 	$liststatus = array(
 		'-1'=>$langs->trans("Draft"),
 		'1'=>$langs->trans("Validated"),
 		'0'=>$langs->trans("Resiliated")
 	);
-	print $form->selectarray('statut', $liststatus, $statut, -2);
+	print $form->selectarray('search_status', $liststatus, $search_status, -2);
 	print '</td>';
 }
 // Action column
@@ -676,8 +642,7 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$datefin = $db->jdate($obj->datefin);
@@ -705,74 +670,75 @@ while ($i < min($num, $limit))
 
 	print '<tr class="oddeven">';
 
-	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-	{
+	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 		print '<td class="center">'.$obj->rowid.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Ref
-	if (!empty($arrayfields['d.ref']['checked']))
-	{
+	if (!empty($arrayfields['d.ref']['checked'])) {
 		print "<td>";
 		print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1);
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Civility
-	if (!empty($arrayfields['d.civility']['checked']))
-	{
+	if (!empty($arrayfields['d.civility']['checked'])) {
 		print "<td>";
 		print $obj->civility;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked']))
-	{
+	if (!empty($arrayfields['d.firstname']['checked'])) {
 		print "<td>";
 		print $obj->firstname;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked']))
-	{
+	if (!empty($arrayfields['d.lastname']['checked'])) {
 		print "<td>";
 		print $obj->lastname;
 		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Gender
-	if (!empty($arrayfields['d.gender']['checked']))
-	{
+	if (!empty($arrayfields['d.gender']['checked'])) {
 		print '<td>';
 		if ($obj->gender) print $langs->trans("Gender".$obj->gender);
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Company
-	if (!empty($arrayfields['d.company']['checked']))
-	{
+	if (!empty($arrayfields['d.company']['checked'])) {
 		print "<td>";
 		print $companyname;
 		print "</td>\n";
 	}
 	// Login
-	if (!empty($arrayfields['d.login']['checked']))
-	{
+	if (!empty($arrayfields['d.login']['checked'])) {
 		print "<td>".$obj->login."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
-	// Moral/Physique
-	if (!empty($arrayfields['d.morphy']['checked']))
-	{
-		print "<td>".$memberstatic->getmorphylib($obj->morphy)."</td>\n";
+	// Nature (Moral/Physical)
+	if (!empty($arrayfields['d.morphy']['checked'])) {
+		print '<td class="center">';
+		$s = '';
+		if ($obj->morphy == 'phy')
+		{
+			$s .= '<span class="customer-back" title="'.$langs->trans("Physical").'">'.dol_substr($langs->trans("Physical"), 0, 1).'</span>';
+		}
+		if ($obj->morphy == 'mor')
+		{
+			$s .= '<span class="vendor-back" title="'.$langs->trans("Moral").'">'.dol_substr($langs->trans("Moral"), 0, 1).'</span>';
+		}
+		print $s;
+		print "</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Type label
-	if (!empty($arrayfields['t.libelle']['checked']))
-	{
+	if (!empty($arrayfields['t.libelle']['checked'])) {
 		$membertypestatic->id = $obj->type_id;
 		$membertypestatic->label = $obj->type;
 		print '<td class="nowrap">';
@@ -781,38 +747,33 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Address
-	if (!empty($arrayfields['d.address']['checked']))
-	{
+	if (!empty($arrayfields['d.address']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->address;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Zip
-	if (!empty($arrayfields['d.zip']['checked']))
-	{
+	if (!empty($arrayfields['d.zip']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->zip;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Town
-	if (!empty($arrayfields['d.town']['checked']))
-	{
+	if (!empty($arrayfields['d.town']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->town;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print "<td>".$obj->state_name."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="center">';
 		$tmparray = getCountry($obj->country, 'all');
 		print $tmparray['label'];
@@ -820,40 +781,34 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone pro
-	if (!empty($arrayfields['d.phone']['checked']))
-	{
+	if (!empty($arrayfields['d.phone']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone perso
-	if (!empty($arrayfields['d.phone_perso']['checked']))
-	{
+	if (!empty($arrayfields['d.phone_perso']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_perso;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Phone mobile
-	if (!empty($arrayfields['d.phone_mobile']['checked']))
-	{
+	if (!empty($arrayfields['d.phone_mobile']['checked'])) {
 		print '<td class="nocellnopadd">';
 		print $obj->phone_mobile;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// EMail
-	if (!empty($arrayfields['d.email']['checked']))
-	{
+	if (!empty($arrayfields['d.email']['checked'])) {
 		print "<td>".dol_print_email($obj->email, 0, 0, 1)."</td>\n";
 	}
 	// End of subscription date
 	$datefin = $db->jdate($obj->datefin);
-	if (!empty($arrayfields['d.datefin']['checked']))
-	{
-		if ($datefin)
-		{
+	if (!empty($arrayfields['d.datefin']['checked'])) {
+		if ($datefin) {
 			print '<td class="nowrap center">';
 			print dol_print_date($datefin, 'day');
 			if ($memberstatic->hasDelay()) {
@@ -861,17 +816,12 @@ while ($i < min($num, $limit))
 				print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="nowrap left">';
-			if ($obj->subscription == 'yes')
-			{
+			if ($obj->subscription == 'yes') {
 				print $langs->trans("SubscriptionNotReceived");
 				if ($obj->statut > 0) print " ".img_warning();
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -884,32 +834,28 @@ while ($i < min($num, $limit))
 	$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.datec']['checked']))
-	{
+	if (!empty($arrayfields['d.datec']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Birth
-	if (!empty($arrayfields['d.birth']['checked']))
-	{
+	if (!empty($arrayfields['d.birth']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->birth), 'day', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (!empty($arrayfields['d.tms']['checked']))
-	{
+	if (!empty($arrayfields['d.tms']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Status
-	if (!empty($arrayfields['d.statut']['checked']))
-	{
+	if (!empty($arrayfields['d.statut']['checked'])) {
 		print '<td class="nowrap right">';
 		print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5);
 		print '</td>';
@@ -917,8 +863,7 @@ while ($i < min($num, $limit))
 	}
 	// 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
-	{
+	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"' : '').'>';
@@ -935,8 +880,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+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>';
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index ee72c920e2f..85becb0aa3d 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "members", "bills"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 
 // Security check
@@ -39,8 +39,7 @@ $result = restrictedArea($user, 'adherent', $id);
 
 $object = new Adherent($db);
 $result = $object->fetch($id);
-if ($result > 0)
-{
+if ($result > 0) {
     $adht = new AdherentType($db);
     $result = $adht->fetch($object->typeid);
 }
@@ -64,8 +63,7 @@ llxHeader("", $title, $helpurl);
 
 $form = new Form($db);
 
-if ($id)
-{
+if ($id) {
 	$head = member_prepare_head($object);
 
 	dol_fiche_head($head, 'note', $langs->trans("Member"), -1, 'user');
@@ -83,8 +81,7 @@ if ($id)
 	print '<table class="border centpercent tableforfield">';
 
     // Login
-    if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-    {
+    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>';
     }
 
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index 3a6a7eb0342..62e503f8170 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -33,8 +33,7 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -62,40 +61,67 @@ print load_fiche_titre($title, '', 'object_group');
 
 dol_mkdir($dir);
 
-$tab = 'byproperties';
-
 $data = array();
-$sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, d.morphy as code";
+
+$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions,";
+$sql .= " MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate,";
+$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";
+$sql .= " AND d.statut != -1";	// Not draft
 $sql .= " GROUP BY d.morphy";
-
 $foundphy = $foundmor = 0;
 
 // Define $data array
 dol_syslog("Count member", LOG_DEBUG);
 $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);
 
 		if ($obj->code == 'phy') $foundphy++;
 		if ($obj->code == 'mor') $foundmor++;
 
-		$data[] = array('label'=>$obj->code, 'nb'=>$obj->nb, 'lastdate'=>$db->jdate($obj->lastdate), 'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate));
+		$data[$obj->code] = array('label'=>$obj->code, 'nb'=>$obj->nb, 'nbsubscriptions'=>$obj->nbsubscriptions, 'lastdate'=>$db->jdate($obj->lastdate), 'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate));
 
 		$i++;
 	}
 	$db->free($resql);
+} else {
+	dol_print_error($db);
 }
-else
-{
+
+$sql = "SELECT COUNT(DISTINCT d.rowid) as nb, COUNT(s.rowid) as nbsubscriptions,";
+$sql .= " MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate,";
+$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 .= " GROUP BY d.morphy";
+$foundphy = $foundmor = 0;
+
+// Define $data array
+dol_syslog("Count member still active", 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->code == 'phy') $foundphy++;
+		if ($obj->code == 'mor') $foundmor++;
+
+		$data[$obj->code]['nbactive'] = $obj->nb;
+
+		$i++;
+	}
+	$db->free($resql);
+} else {
 	dol_print_error($db);
 }
 
@@ -106,41 +132,46 @@ dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'use
 
 
 // Print title
-if (!count($data))
-{
+if (!count($data)) {
 	print '<span class="opacitymedium">'.$langs->trans("NoValidatedMemberYet").'</span><br>';
 	print '<br>';
-}
-else
-{
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("MembersByNature").'</span><br>';
 	print '<br>';
 }
 
 // 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>'.$langs->trans("MemberNature").'</td>';
-print '<td class="right">'.$langs->trans("NbOfMembers").'</td>';
+print '<td class="right">'.$langs->trans("NbOfMembers").' <span class="opacitymedium">('.$langs->trans("AllTime").')</span></td>';
+print '<td class="right">'.$langs->trans("NbOfActiveMembers").'</td>';
 print '<td class="center">'.$langs->trans("LastMemberDate").'</td>';
+print '<td class="right">'.$langs->trans("NbOfSubscriptions").'</td>';
 print '<td class="center">'.$langs->trans("LatestSubscriptionDate").'</td>';
 print '</tr>';
 
-if (!$foundphy) $data[] = array('label'=>'phy', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
-if (!$foundmor) $data[] = array('label'=>'mor', 'nb'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
+if (!$foundphy) $data[] = array('label'=>'phy', 'nb'=>'0', 'nbactive'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
+if (!$foundmor) $data[] = array('label'=>'mor', 'nb'=>'0', 'nbactive'=>'0', 'lastdate'=>'', 'lastsubscriptiondate'=>'');
+
+foreach ($data as $val) {
+	$nb = $val['nb'];
+	$nbsubscriptions = $val['nbsubscriptions'];
+	$nbactive = $val['nbactive'];
 
-foreach ($data as $val)
-{
 	print '<tr class="oddeven">';
 	print '<td>'.$memberstatic->getmorphylib($val['label']).'</td>';
-	print '<td class="right">'.$val['nb'].'</td>';
+	print '<td class="right">'.$nb.'</td>';
+	print '<td class="right">'.$nbactive.'</td>';
 	print '<td class="center">'.dol_print_date($val['lastdate'], 'dayhour').'</td>';
+	print '<td class="right">'.$nbsubscriptions.'</td>';
 	print '<td class="center">'.dol_print_date($val['lastsubscriptiondate'], 'dayhour').'</td>';
 	print '</tr>';
 }
 
 print '</table>';
-
+print '</div>';
 
 dol_fiche_end();
 
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index db556c0eea7..f7001656bd9 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -34,8 +34,7 @@ $mode = GETPOST('mode') ?GETPOST('mode') : '';
 
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -46,7 +45,7 @@ $startyear = $year - 2;
 $endyear = $year;
 
 // Load translation files required by the page
-$langs->loadLangs(array("companies", "members"));
+$langs->loadLangs(array("companies", "members", "banks"));
 
 
 /*
@@ -68,74 +67,69 @@ print load_fiche_titre($title, '', 'object_group');
 
 dol_mkdir($dir);
 
-if ($mode)
-{
+if ($mode) {
     // Define sql
-    if ($mode == 'memberbycountry')
-    {
+    if ($mode == 'memberbycountry') {
         $label = $langs->trans("Country");
         $tab = 'statscountry';
 
         $data = array();
-        $sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label";
+        $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 .= " AND d.statut != -1";
         $sql .= " GROUP BY c.label, c.code";
         //print $sql;
     }
 
-	if ($mode == 'memberbystate')
-    {
+	if ($mode == 'memberbystate') {
         $label = $langs->trans("Country");
         $label2 = $langs->trans("State");
         $tab = 'statsstate';
 
         $data = array();
-        $sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, c.nom as label2"; //
+        $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 .= " AND d.statut != -1";
         $sql .= " GROUP BY co.label, co.code, c.nom";
         //print $sql;
     }
-    if ($mode == 'memberbyregion') //
-    {
-        $label = $langs->trans("Country");
+    if ($mode == 'memberbyregion') { //
+		$label = $langs->trans("Country");
         $label2 = $langs->trans("Region"); //département
         $tab = 'statsregion'; //onglet
 
         $data = array(); //tableau de donnée
-        $sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, co.code, co.label, r.nom as label2";
+        $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 .= " AND d.statut != -1";
         $sql .= " GROUP BY co.label, co.code, r.nom"; //+
         //print $sql;
     }
-    if ($mode == 'memberbytown')
-    {
+    if ($mode == 'memberbytown') {
         $label = $langs->trans("Country");
         $label2 = $langs->trans("Town");
         $tab = 'statstown';
 
         $data = array();
-        $sql .= "SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, MAX(s.dateadh) as lastsubscriptiondate, c.code, c.label, d.town as label2";
+        $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 .= " AND d.statut != -1";
         $sql .= " GROUP BY c.label, c.code, d.town";
         //print $sql;
     }
@@ -148,15 +142,12 @@ if ($mode)
     // Define $data array
     dol_syslog("Count member", LOG_DEBUG);
     $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);
-            if ($mode == 'memberbycountry')
-            {
+            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,
@@ -165,9 +156,8 @@ if ($mode)
                             'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
             }
-            if ($mode == 'memberbyregion') //+
-            {
-                $data[] = array(
+            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")),
@@ -176,8 +166,7 @@ if ($mode)
                     'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
 	        }
-            if ($mode == 'memberbystate')
-            {
+            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")),
@@ -186,8 +175,7 @@ if ($mode)
                             'lastsubscriptiondate'=>$db->jdate($obj->lastsubscriptiondate)
                 );
             }
-            if ($mode == 'memberbytown')
-            {
+            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")),
@@ -200,9 +188,7 @@ if ($mode)
             $i++;
         }
         $db->free($resql);
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -214,19 +200,15 @@ dol_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
 
 
 // Print title
-if ($mode && !count($data))
-{
+if ($mode && !count($data)) {
     print $langs->trans("NoValidatedMemberYet").'<br>';
     print '<br>';
-}
-else
-{
+} 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
-    {
+    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>';
@@ -242,8 +224,7 @@ else
 
 
 // Show graphics
-if (count($arrayjs) && $mode == 'memberbycountry')
-{
+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;
 
@@ -261,8 +242,7 @@ if (count($arrayjs) && $mode == 'memberbycountry')
 
     // loop and dump
     $i = 0;
-    foreach ($data as $val)
-    {
+    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)
@@ -291,20 +271,19 @@ if (count($arrayjs) && $mode == 'memberbycountry')
     print '<br>';
 }
 
-if ($mode)
-{
-    // Print array / Affiche le tableau
-    print '<table class="liste centpercent">';
+if ($mode) {
+    // 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").'</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)
-    {
+    foreach ($data as $val) {
         $year = $val['year'];
         print '<tr class="oddeven">';
         print '<td>'.$val['label'].'</td>';
@@ -316,6 +295,7 @@ if ($mode)
     }
 
     print '</table>';
+    print '</div>';
 }
 
 
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index cc1427b7410..c6748538264 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -35,8 +35,7 @@ $userid = GETPOST('userid', 'int'); if ($userid < 0) $userid = 0;
 $socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
     $action = '';
     $socid = $user->socid;
 }
@@ -79,12 +78,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscripti
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
     $px1->SetData($data);
     $i = $startyear;
-    while ($i <= $endyear)
-    {
+    while ($i <= $endyear) {
         $legend[] = $i;
         $i++;
     }
@@ -112,12 +109,10 @@ $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=memberstats&file=subscr
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
     $px2->SetData($data);
     $i = $startyear;
-    while ($i <= $endyear)
-    {
+    while ($i <= $endyear) {
         $legend[] = $i;
         $i++;
     }
@@ -175,11 +170,9 @@ print '<td class="right">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
     $year = $val['year'];
-    while ($oldyear > $year + 1)
-    {	// If we have empty year
+    while ($oldyear > $year + 1) {	// If we have empty year
         $oldyear--;
         print '<tr class="oddeven" height="24">';
         print '<td class="center">';
@@ -214,8 +207,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 47866fc8981..67880c303cb 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -40,15 +40,15 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 $langs->loadLangs(array("companies", "bills", "members", "users", "mails", 'other'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $rowid = GETPOST('rowid', 'int') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
 $typeid = GETPOST('typeid', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -75,16 +75,14 @@ $errmsg = '';
 $defaultdelay = 1;
 $defaultdelayunit = 'y';
 
-if ($rowid)
-{
+if ($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)
-    {
+    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));
@@ -96,8 +94,7 @@ if ($rowid)
 // 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)
-{
+if ($rowid) {
     $caneditfieldmember = $user->rights->adherent->creer;
 }
 
@@ -115,47 +112,35 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
  */
 
 // Create third party from a member
-if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer)
-{
-	if ($result > 0)
-	{
+if ($action == 'confirm_create_thirdparty' && $confirm == 'yes' && $user->rights->societe->creer) {
+	if ($result > 0) {
 		// Creation of thirdparty
 		$company = new Societe($db);
 		$result = $company->create_from_member($object, GETPOST('companyname', 'alpha'), GETPOST('companyalias', 'alpha'), GETPOST('customercode', 'alpha'));
 
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$langs->load("errors");
 			setEventMessages($company->error, $company->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			$action = 'addsubscription';
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
-if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights->user->user->creer))
-{
+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
-    {
-        if ($_POST["userid"] != $user->id && $_POST["userid"] != $object->user_id)
-        {
+    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');
-        }
+		}
     }
 
-    if (!$error)
-    {
-        if ($_POST["userid"] != $object->user_id)  // If link differs from currently in database
-        {
-            $result = $object->setUserId($_POST["userid"]);
+    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 = '';
@@ -163,21 +148,16 @@ if ($action == 'setuserid' && ($user->rights->user->self->creer || $user->rights
     }
 }
 
-if ($action == 'setsocid')
-{
+if ($action == 'setsocid') {
     $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";
+    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)
-            {
+            if ($resql) {
                 $obj = $db->fetch_object($resql);
-                if ($obj && $obj->rowid > 0)
-                {
+                if ($obj && $obj->rowid > 0) {
                     $othermember = new Adherent($db);
                     $othermember->fetch($obj->rowid);
                     $thirdparty = new Societe($db);
@@ -187,8 +167,7 @@ if ($action == 'setsocid')
                 }
             }
 
-            if (!$error)
-            {
+            if (!$error) {
                 $result = $object->setThirdPartyId(GETPOST('socid', 'int'));
                 if ($result < 0) dol_print_error('', $object->error);
                 $_POST['action'] = '';
@@ -198,8 +177,7 @@ if ($action == 'setsocid')
     }
 }
 
-if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"])
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !$_POST["cancel"]) {
     $error = 0;
 
     $langs->load("banks");
@@ -211,16 +189,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     $datesubscription = 0;
     $datesubend = 0;
     $paymentdate = 0;
-    if ($_POST["reyear"] && $_POST["remonth"] && $_POST["reday"])
-    {
+    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"])
-    {
+    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"])
-    {
+    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
@@ -237,28 +212,24 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     $sendalsoemail = GETPOST("sendmail", 'alpha');
 
     // Check parameters
-    if (!$datesubscription)
-    {
+    if (!$datesubscription) {
         $error++;
         $langs->load("errors");
         $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateSubscription"));
         setEventMessages($errmsg, null, 'errors');
         $action = 'addsubscription';
     }
-    if (GETPOST('end') && !$datesubend)
-    {
+    if (GETPOST('end') && !$datesubend) {
         $error++;
         $langs->load("errors");
         $errmsg = $langs->trans("ErrorBadDateFormat", $langs->transnoentitiesnoconv("DateEndSubscription"));
         setEventMessages($errmsg, null, 'errors');
         $action = 'addsubscription';
     }
-    if (!$datesubend)
-    {
+    if (!$datesubend) {
         $datesubend = dol_time_plus_duree(dol_time_plus_duree($datesubscription, $defaultdelay, $defaultdelayunit), -1, 'd');
     }
-    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate)
-    {
+    if (($option == 'bankviainvoice' || $option == 'bankdirect') && !$paymentdate) {
         $error++;
         $errmsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment"));
         setEventMessages($errmsg, null, 'errors');
@@ -266,32 +237,23 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     }
 
     // Check if a payment is mandatory or not
-    if (!$error && $adht->subscription)	// Member type need subscriptions
-    {
-        if (!is_numeric($amount))
-        {
+    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';
-        }
-        else
-        {
-            if (!empty($conf->banque->enabled) && $_POST["paymentsave"] != 'none')
-            {
-                if ($_POST["subscription"])
-                {
+		} 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
-                {
+                } else {
                     if ($_POST["accountid"])   $errmsg = $langs->trans("ErrorDoNotProvideAccountsIfNullAmount");
                 }
-                if ($errmsg)
-                {
+                if ($errmsg) {
                 	$error++;
         			setEventMessages($errmsg, null, 'errors');
         			$error++;
@@ -302,55 +264,43 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
     }
 
     // Record the subscription then complementary actions
-    if (!$error && $action == 'subscription')
-    {
+    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)
-        {
+        if ($crowid <= 0) {
             $error++;
             $errmsg = $object->error;
 	        setEventMessages($object->error, $object->errors, 'errors');
         }
 
-        if (!$error)
-        {
+        if (!$error) {
         	$result = $object->subscriptionComplementaryActions($crowid, $option, $accountid, $datesubscription, $paymentdate, $operation, $label, $amount, $num_chq, $emetteur_nom, $emetteur_banque);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				// If an invoice was created, it is into $object->invoice
 			}
         }
 
-        if (!$error)
-        {
+        if (!$error) {
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
             $action = 'addsubscription';
         }
 
-        if (!$error)
-        {
+        if (!$error) {
         	setEventMessages("SubscriptionRecorded", null, 'mesgs');
         }
 
         // Send email
-        if (!$error)
-        {
+        if (!$error) {
             // Send confirmation Email
-            if ($object->email && $sendalsoemail)   // $object is 'Adherent'
-            {
-            	$subject = '';
+            if ($object->email && $sendalsoemail) {   // $object is 'Adherent'
+				$subject = '';
             	$msg = '';
 
             	// Send subscription email
@@ -368,8 +318,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
 
             	if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-            	{
+            	if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
             		$subject = $arraydefaultmessage->topic;
             		$msg     = $arraydefaultmessage->content;
             	}
@@ -384,8 +333,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 $listofpaths = array();
                 $listofnames = array();
                 $listofmimes = array();
-                if (is_object($object->invoice))
-                {
+                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'];
@@ -398,25 +346,19 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
                 $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)
-                {
+                if ($result < 0) {
                 	$errmsg = $object->error;
                 	setEventMessages($object->error, $object->errors, 'errors');
-                }
-                else
-                {
+                } else {
                 	setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
                 }
-            }
-            else
-            {
+            } else {
             	setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
             }
         }
 
         // Clean some POST vars
-        if (!$error)
-        {
+        if (!$error) {
             $_POST["subscription"] = '';
             $_POST["accountid"] = '';
             $_POST["operation"] = '';
@@ -450,8 +392,7 @@ if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 //include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 
-if ($rowid > 0)
-{
+if ($rowid > 0) {
     $res = $object->fetch($rowid);
     if ($res < 0) { dol_print_error($db, $object->error); exit; }
 
@@ -480,8 +421,7 @@ if ($rowid > 0)
     print '<table class="border centpercent tableforfield">';
 
 	// Login
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
+	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>';
 	}
 
@@ -500,11 +440,9 @@ if ($rowid > 0)
 	print '</tr>';
 
 	// Password
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
-	{
+	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))
-		{
+		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');
@@ -527,8 +465,7 @@ if ($rowid > 0)
 	print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-	{
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 		print '<tr><td>'.$langs->trans("Categories").'</td>';
 		print '<td colspan="2">';
 		print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
@@ -541,22 +478,16 @@ if ($rowid > 0)
 
 	// Date end subscription
 	print '<tr><td>'.$langs->trans("SubscriptionEndDate").'</td><td class="valeur">';
-	if ($object->datefin)
-	{
+	if ($object->datefin) {
 	    print dol_print_date($object->datefin, 'day');
 	    if ($object->hasDelay()) {
 	        print " ".img_warning($langs->trans("Late"));
 	    }
-	}
-	else
-	{
-	    if (!$adht->subscription)
-	    {
+	} 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
-	    {
+	    } 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
 	    }
@@ -564,8 +495,7 @@ if ($rowid > 0)
 	print '</td></tr>';
 
 	// Third party Dolibarr
-	if (!empty($conf->societe->enabled))
-	{
+	if (!empty($conf->societe->enabled)) {
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans("LinkedToDolibarrThirdParty");
@@ -573,8 +503,7 @@ if ($rowid > 0)
 		if ($action != 'editthirdparty' && $user->rights->adherent->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editthirdparty&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="2" class="valeur">';
-		if ($action == 'editthirdparty')
-		{
+		if ($action == 'editthirdparty') {
 			$htmlname = 'socid';
 			print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="form'.$htmlname.'">';
 			print '<input type="hidden" name="rowid" value="'.$object->id.'">';
@@ -586,17 +515,12 @@ if ($rowid > 0)
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else
-		{
-			if ($object->fk_soc)
-			{
+		} else {
+			if ($object->fk_soc) {
 				$company = new Societe($db);
 				$result = $company->fetch($object->fk_soc);
 				print $company->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoThirdPartyAssociatedToMember");
 			}
 		}
@@ -608,28 +532,21 @@ if ($rowid > 0)
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans("LinkedToDolibarrUser");
 	print '</td>';
-	if ($action != 'editlogin' && $user->rights->adherent->creer)
-	{
+	if ($action != 'editlogin' && $user->rights->adherent->creer) {
 		print '<td class="right">';
-		if ($user->rights->user->user->creer)
-		{
+		if ($user->rights->user->user->creer) {
 			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlogin&amp;rowid='.$object->id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).'</a>';
 		}
 		print '</td>';
 	}
 	print '</tr></table>';
 	print '</td><td colspan="2" class="valeur">';
-	if ($action == 'editlogin')
-	{
+	if ($action == 'editlogin') {
 		$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
-	}
-	else
-	{
-		if ($object->user_id)
-		{
+	} else {
+		if ($object->user_id) {
 			$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
-		}
-		else print $langs->trans("NoDolibarrAccess");
+		} else print $langs->trans("NoDolibarrAccess");
 	}
 	print '</td></tr>';
 
@@ -648,10 +565,8 @@ if ($rowid > 0)
      */
 
     // Button to create a new subscription if member no draft neither resiliated
-    if ($user->rights->adherent->cotisation->creer)
-    {
-        if ($action != 'addsubscription' && $action != 'create_thirdparty')
-        {
+    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>";
@@ -664,8 +579,7 @@ if ($rowid > 0)
     /*
      * List of subscriptions
      */
-    if ($action != 'addsubscription' && $action != 'create_thirdparty')
-    {
+    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,";
@@ -681,8 +595,7 @@ if ($rowid > 0)
 		$sql .= $db->order($sortfield, $sortorder);
 
         $result = $db->query($sql);
-        if ($result)
-        {
+        if ($result) {
             $subscriptionstatic = new Subscription($db);
 
             $num = $db->num_rows($result);
@@ -696,8 +609,7 @@ if ($rowid > 0)
             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))
-            {
+            if (!empty($conf->banque->enabled)) {
             	print_liste_field_titre('Account', $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
             }
             print "</tr>\n";
@@ -707,8 +619,7 @@ if ($rowid > 0)
             $adht = new AdherentType($db);
 
             $i = 0;
-            while ($i < $num)
-            {
+            while ($i < $num) {
                 $objp = $db->fetch_object($result);
 
                 $adh->id = $objp->rowid;
@@ -717,9 +628,8 @@ if ($rowid > 0)
                 $subscriptionstatic->ref = $objp->crowid;
                 $subscriptionstatic->id = $objp->crowid;
 
-                $typeid = ($objp->cfk_type > 0 ? $objp->cfk_type : $adh->typeid);
-                if ($typeid > 0)
-                {
+                $typeid = $objp->cfk_type;
+                if ($typeid > 0) {
                     $adht->fetch($typeid);
                 }
 
@@ -734,19 +644,16 @@ if ($rowid > 0)
                 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))
-				{
+				if (!empty($conf->banque->enabled)) {
 					print '<td class="right">';
-					if ($objp->bid)
-					{
+					if ($objp->bid) {
 						$accountstatic->label = $objp->label;
 						$accountstatic->id = $objp->baid;
 						$accountstatic->number = $objp->number;
 						$accountstatic->account_number = $objp->account_number;
 						$accountstatic->currency_code = $objp->currency_code;
 
-						if (!empty($conf->accounting->enabled) && $objp->fk_accountancy_journal > 0)
-						{
+						if (!empty($conf->accounting->enabled) && $objp->fk_accountancy_journal > 0) {
 							$accountingjournal = new AccountingJournal($db);
 							$accountingjournal->fetch($objp->fk_accountancy_journal);
 
@@ -755,9 +662,7 @@ if ($rowid > 0)
 
                         $accountstatic->ref = $objp->ref;
                         print $accountstatic->getNomUrl(1);
-                    }
-                    else
-                    {
+                    } else {
                         print '&nbsp;';
                     }
                     print '</td>';
@@ -773,21 +678,17 @@ if ($rowid > 0)
             }
 
             print "</table>";
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
 
 
-    if (($action != 'addsubscription' && $action != 'create_thirdparty'))
-    {
+    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)
-	    {
+	    if ($useonlinepayment) {
 	    	print '<br>';
 
 	    	require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
@@ -799,8 +700,7 @@ if ($rowid > 0)
     /*
      * Add new subscription form
      */
-    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer)
-    {
+    if (($action == 'addsubscription' || $action == 'create_thirdparty') && $user->rights->adherent->cotisation->creer) {
         print '<br>';
 
         print load_fiche_titre($langs->trans("NewCotisation"));
@@ -809,14 +709,11 @@ if ($rowid > 0)
         $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')) {
         	if (GETPOST('paymentsave') == 'bankdirect')     $bankdirect = 1;
         	if (GETPOST('paymentsave') == 'invoiceonly')    $invoiceonly = 1;
         	if (GETPOST('paymentsave') == 'bankviainvoice') $bankviainvoice = 1;
-        }
-        else
-        {
+        } 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;
@@ -824,8 +721,7 @@ if ($rowid > 0)
 
         print "\n\n<!-- Form add subscription -->\n";
 
-        if ($conf->use_javascript_ajax)
-        {
+        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 () {
@@ -861,18 +757,14 @@ if ($rowid > 0)
 
 
 		// Confirm create third party
-		if ($action == 'create_thirdparty')
-		{
+		if ($action == 'create_thirdparty') {
 			$companyalias = '';
 			$fullname = $object->getFullName($langs);
 
-			if ($object->morphy == 'mor')
-			{
+			if ($object->morphy == 'mor') {
 				$companyname = $object->company;
 				if (!empty($fullname)) $companyalias = $fullname;
-			}
-			else
-			{
+			} else {
 				$companyname = $fullname;
 				if (!empty($object->company)) $companyalias = $object->company;
 			}
@@ -883,8 +775,7 @@ if ($rowid > 0)
 				array('label' => $langs->trans("AliasNames"), 'type' => 'text', 'name' => 'companyalias', 'value' => $companyalias, 'morecss' => 'minwidth300', 'moreattr' => 'maxlength="128"')
 			);
 			// If customer code was forced to "required", we ask it at creation to avoid error later
-			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-			{
+			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 				$tmpcompany = new Societe($db);
 				$tmpcompany->name = $companyname;
                 $tmpcompany->get_codeclient($tmpcompany, 0);
@@ -922,23 +813,19 @@ if ($rowid > 0)
         $paymentdate = -1;
 
         // Date payment
-        if (GETPOST('paymentyear') && GETPOST('paymentmonth') && GETPOST('paymentday'))
-        {
+        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'))
-        {
+        if (GETPOST('reday')) {
             $datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
         }
-        if (!$datefrom)
-        {
+        if (!$datefrom) {
         	$datefrom = $object->datevalid;
-        	if ($object->datefin > 0)
-            {
+        	if ($object->datefin > 0) {
                 $datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
             }
         }
@@ -946,20 +833,17 @@ if ($rowid > 0)
         print "</td></tr>";
 
         // Date end subscription
-        if (GETPOST('endday'))
-        {
+        if (GETPOST('endday')) {
             $dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
         }
-        if (!$dateto)
-        {
+        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)
-        {
+        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>';
 
@@ -970,11 +854,9 @@ if ($rowid > 0)
             print '"></td></tr>';
 
             // Complementary action
-            if (!empty($conf->banque->enabled) || !empty($conf->facture->enabled))
-            {
+            if ((!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
                 $company = new Societe($db);
-                if ($object->fk_soc)
-                {
+                if ($object->fk_soc) {
                     $result = $company->fetch($object->fk_soc);
                 }
 
@@ -987,20 +869,17 @@ if ($rowid > 0)
                 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))
-                {
+                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))
-                {
+                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
-					{
+                    else {
                     	print ' (';
                     	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
                     	print $langs->trans("NoThirdPartyAssociatedToMember");
@@ -1009,23 +888,23 @@ if ($rowid > 0)
                     	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)))
-					{
+					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
-						$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+						if ($result < 0) {
+							setEventMessage($prodtmp->error, 'errors');
+						}
 						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))
-                {
+                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
-					{
+                    else {
                     	print ' (';
                     	if (empty($object->fk_soc)) print img_warning($langs->trans("NoThirdPartyAssociatedToMember"));
                     	print $langs->trans("NoThirdPartyAssociatedToMember");
@@ -1034,10 +913,12 @@ if ($rowid > 0)
                     	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)))
-					{
+					if (!empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 						$prodtmp = new Product($db);
-						$prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+						$result = $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+						if ($result < 0) {
+							setEventMessage($prodtmp->error, 'errors');
+						}
 						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>';
@@ -1080,12 +961,9 @@ if ($rowid > 0)
 
         print '<tr><td>'.$langs->trans("SendAcknowledgementByMail").'</td>';
         print '<td>';
-        if (!$object->email)
-        {
+        if (!$object->email) {
             print $langs->trans("NoEMail");
-        }
-        else
-        {
+        } else {
             $adht = new AdherentType($db);
             $adht->fetch($object->typeid);
 
@@ -1107,8 +985,7 @@ if ($rowid > 0)
 
             if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
 
-            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0)
-            {
+            if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
             	$subject = $arraydefaultmessage->topic;
             	$msg     = $arraydefaultmessage->content;
             }
@@ -1158,9 +1035,7 @@ if ($rowid > 0)
 
     //print '</td></tr>';
     //print '</table>';
-}
-else
-{
+} else {
     $langs->load("errors");
     print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 02941cb9967..017962701e4 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -66,41 +66,33 @@ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, n
 //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
 
-if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cancel)
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cancel) {
 	// Load current object
 	$result = $object->fetch($rowid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->begin();
 
 		$errmsg = '';
 
-		if ($object->fk_bank)
-		{
+		if ($object->fk_bank) {
 			$accountline = new AccountLine($db);
 			$result = $accountline->fetch($object->fk_bank);
 
 			// If transaction consolidated
-			if ($accountline->rappro)
-			{
+			if ($accountline->rappro) {
 				$errmsg = $langs->trans("SubscriptionLinkedToConciliatedTransaction");
-			}
-			else
-			{
+			} 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"];
 				$result = $accountline->update($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$errmsg = $accountline->error;
 				}
 			}
 		}
 
-		if (!$errmsg)
-		{
+		if (!$errmsg) {
 			// 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']);
@@ -110,52 +102,39 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			//print 'datef='.$object->datef.' '.$_POST['datesubendday'];
 
 			$result = $object->update($user);
-			if ($result >= 0 && !count($object->errors))
-			{
+			if ($result >= 0 && !count($object->errors)) {
 				$db->commit();
 
 				header("Location: card.php?rowid=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
-			    if ($object->error)
-				{
+				if ($object->error) {
 					$errmsg = $object->error;
-				}
-				else
-				{
-					foreach ($object->errors as $error)
-					{
+				} else {
+					foreach ($object->errors as $error) {
 						if ($errmsg) $errmsg .= '<br>';
 						$errmsg .= $error;
 					}
 				}
 				$action = '';
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer) {
 	$result = $object->fetch($rowid);
-    $result = $object->delete($user);
-    if ($result > 0)
-    {
-    	header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
-    	exit;
-    }
-    else
-    {
-    	$mesg = $adh->error;
-    }
+	$result = $object->delete($user);
+	if ($result > 0) {
+		header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
+		exit;
+	} else {
+		$mesg = $adh->error;
+	}
 }
 
 
@@ -173,15 +152,14 @@ llxHeader('', $langs->trans("SubscriptionCard"), 'EN:Module_Foundations|FR:Modul
 dol_htmloutput_errors($errmsg);
 
 
-if ($user->rights->adherent->cotisation->creer && $action == 'edit')
-{
+if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	/********************************************
 	 *
 	 * Subscription card in edit mode
 	 *
 	 ********************************************/
 
-    $object->fetch($rowid);
+	$object->fetch($rowid);
 	$result = $adh->fetch($object->fk_adherent);
 
 	$head = subscription_prepare_head($object);
@@ -194,13 +172,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 
 	dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    print "\n";
+	print "\n";
 	print '<table class="border centpercent">';
 
-    // Ref
-    print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td>';
+	// Ref
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td>';
 	print '<td class="valeur" colspan="3">';
 	print $form->showrefnav($object, 'rowid', $linkback, 1);
 	print '</td></tr>';
@@ -217,40 +195,35 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 	print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ? GETPOST("typeid") : $object->fk_type));
 	print'</td></tr>';
 
-    // Date start subscription
-    print '<tr><td>'.$langs->trans("DateSubscription").'</td><td class="valeur" colspan="2">';
+	// Date start subscription
+	print '<tr><td>'.$langs->trans("DateSubscription").'</td><td class="valeur" colspan="2">';
 	print $form->selectDate($object->dateh, 'datesub', 1, 1, 0, 'update', 1);
 	print '</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Date end subscription
-    print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur" colspan="2">';
+	// Date end subscription
+	print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur" colspan="2">';
 	print $form->selectDate($object->datef, 'datesubend', 0, 0, 0, 'update', 1);
 	print '</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Amount
-    print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur" colspan="2">';
+	// Amount
+	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur" colspan="2">';
 	print '<input type="text" class="flat" size="10" name="amount" value="'.price($object->amount).'"></td></tr>';
 
-    // Label
-    print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="2">';
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="2">';
 	print '<input type="text" class="flat" size="60" name="note" value="'.$object->note.'"></td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled))
-	{
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)
-		{
+	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)
-			{
+			if ($object->fk_bank) {
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoneF");
 			}
 			print '</td></tr>';
@@ -261,176 +234,164 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
 
 	dol_fiche_end();
 
-    print '<div class="center">';
-    print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; &nbsp; ';
 	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '</div>';
 
 	print '</form>';
 	print "\n";
 }
 
-if ($rowid && $action != 'edit')
-{
+if ($rowid && $action != 'edit') {
 	/********************************************
 	 *
 	 * Subscription card in view mode
 	 *
 	 ********************************************/
 
-    $result = $object->fetch($rowid);
+	$result = $object->fetch($rowid);
 	$result = $adh->fetch($object->fk_adherent);
 
 	$head = subscription_prepare_head($object);
 
 	dol_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment');
 
-    // Confirmation to delete subscription
-    if ($action == 'delete')
-    {
+	// Confirmation to delete subscription
+	if ($action == 'delete') {
 		//$formquestion=array();
-        //$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
+		//$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
 		$text = $langs->trans("ConfirmDeleteSubscription");
 		if (!empty($conf->banque->enabled) && !empty($conf->global->ADHERENT_BANK_USE)) $text .= '<br>'.img_warning().' '.$langs->trans("ThisWillAlsoDeleteBankRecord");
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id, $langs->trans("DeleteSubscription"), $text, "confirm_delete", $formquestion, 0, 1);
-    }
+	}
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'rowid', $linkback, 1);
+	dol_banner_tab($object, 'rowid', $linkback, 1);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    // Member
-    $adh->ref = $adh->getFullName($langs);
-    print '<tr>';
-    print '<td class="titlefield">'.$langs->trans("Member").'</td><td class="valeur">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
-    print '</tr>';
+	// Member
+	$adh->ref = $adh->getFullName($langs);
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("Member").'</td><td class="valeur">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
+	print '</tr>';
 
-    // Type
-    print '<tr>';
-    print '<td class="titlefield">'.$langs->trans("Type").'</td>';
-    print '<td class="valeur">';
-    if ($object->fk_type > 0 || $adh->typeid > 0) {
-    	$typeid = ($object->fk_type > 0 ? $object->fk_type : $adh->typeid);
-    	$adht->fetch($typeid);
-        print $adht->getNomUrl(1);
-    } else {
-        print $langs->trans("NoType");
-    }
-    print '</td></tr>';
+	// Type
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("Type").'</td>';
+	print '<td class="valeur">';
+	if ($object->fk_type > 0 || $adh->typeid > 0) {
+		$typeid = ($object->fk_type > 0 ? $object->fk_type : $adh->typeid);
+		$adht->fetch($typeid);
+		print $adht->getNomUrl(1);
+	} else {
+		print $langs->trans("NoType");
+	}
+	print '</td></tr>';
 
-    // Date subscription
-    print '<tr>';
+	// Date subscription
+	print '<tr>';
 	print '<td>'.$langs->trans("DateSubscription").'</td><td class="valeur">'.dol_print_date($object->dateh, 'day').'</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Date end subscription
-    print '<tr>';
+	// Date end subscription
+	print '<tr>';
 	print '<td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur">'.dol_print_date($object->datef, 'day').'</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Amount
-    print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur">'.price($object->amount).'</td></tr>';
+	// Amount
+	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur">'.price($object->amount).'</td></tr>';
 
-    // Label
-    print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
 
 	// Bank line
-	if (!empty($conf->banque->enabled))
-	{
-		if ($conf->global->ADHERENT_BANK_USE || $object->fk_bank)
-		{
+	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)
-			{
+			if ($object->fk_bank) {
 				$bankline = new AccountLine($db);
 				$result = $bankline->fetch($object->fk_bank);
 				print $bankline->getNomUrl(1, 0, 'showall');
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NoneF");
 			}
 			print '</td></tr>';
 		}
 	}
 
-    print "</table>\n";
-    print '</div>';
+	print "</table>\n";
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    /*
+	/*
      * Barre d'actions
      *
      */
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 
-    if ($user->rights->adherent->cotisation->creer)
-	{
-		if (!$bankline->rappro)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=edit\">".$langs->trans("Modify")."</a></div>";
-		}
-		else
-		{
+	if ($user->rights->adherent->cotisation->creer) {
+		if (!$bankline->rappro) {
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify")."</a></div>";
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.$langs->trans("BankLineConciliated")."\" href=\"#\">".$langs->trans("Modify")."</a></div>";
 		}
 	}
 
-    // Delete
-    if ($user->rights->adherent->cotisation->creer)
-    {
-        print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id."&action=delete\">".$langs->trans("Delete")."</a></div>\n";
-    }
+	// Delete
+	if ($user->rights->adherent->cotisation->creer) {
+		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>\n";
+	}
 
-    print '</div>';
+	print '</div>';
 
 
-    print '<div class="fichecenter"><div class="fichehalfleft">';
-    print '<a name="builddoc"></a>'; // ancre
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
 
-    // Documents generes
-    /*
+	// Documents generes
+	/*
     $filename = dol_sanitizeFileName($object->ref);
     $filedir = $conf->facture->dir_output . '/' . dol_sanitizeFileName($object->ref);
     $urlsource = $_SERVER['PHP_SELF'] . '?facid=' . $object->id;
     $genallowed = $user->rights->facture->lire;
     $delallowed = $user->rights->facture->creer;
 
-    print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+    print $formfile->showdocuments('facture', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
     $somethingshown = $formfile->numoffiles;
     */
 	// Show links to link elements
 	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
-    $somethingshown = $form->showLinkedObjectBlock($object, '');
+	$somethingshown = $form->showLinkedObjectBlock($object, '');
 
-    // Show links to link elements
-    /*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
+	// Show links to link elements
+	/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
 	if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
     */
 
-    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-    // List of actions on element
-    /*
+	// List of actions on element
+	/*
     include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
     $formactions = new FormActions($db);
     $somethingshown = $formactions->showactions($object, 'invoice', $socid, 1);
     */
 
-    print '</div></div></div>';
+	print '</div></div></div>';
 }
 
 // End of page
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index d2fd59b8ce5..364a7854fb7 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -33,10 +33,9 @@ $langs->loadLangs(array("members", "companies"));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'subscriptionlist'; // To manage different context of search
 
 $statut = (GETPOSTISSET("statut") ?GETPOST("statut", "alpha") : 1);
 $search_ref = GETPOST('search_ref', 'alpha');
@@ -110,15 +109,13 @@ $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))
-{
+if (empty($reshook)) {
     // Selection of new fields
     include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-	    $search_type = "";
+    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 = "";
@@ -149,17 +146,17 @@ $sql .= " c.rowid as crowid, c.fk_type, c.subscription,";
 $sql .= " c.dateadh, c.datef, c.datec as date_creation, c.tms as date_update,";
 $sql .= " c.fk_bank as bank, c.note,";
 $sql .= " b.fk_account";
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+$sql .= " JOIN ".MAIN_DB_PREFIX."subscription as c on d.rowid = c.fk_adherent";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank=b.rowid";
-$sql .= " WHERE d.rowid = c.fk_adherent";
-$sql .= " AND d.entity IN (".getEntity('adherent').")";
+$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
 if (isset($date_select) && $date_select != '')
 {
-    $sql .= " AND c.dateadh >= '".$date_select."-01-01 00:00:00'";
-    $sql .= " AND c.dateadh < '".($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 ($search_ref) {
 	if (is_numeric($search_ref)) $sql .= " AND (c.rowid = ".$db->escape($search_ref).")";
 	else $sql .= " AND 1 = 2"; // Always wrong
 }
@@ -183,14 +180,12 @@ $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))
-{
+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
-    {
-    	$page = 0;
+    if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
     	$offset = 0;
     }
 }
@@ -198,8 +193,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if (!$result)
-{
+if (!$result) {
 	dol_print_error($db);
 	exit;
 }
@@ -208,8 +202,7 @@ $num = $db->num_rows($result);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/adherents/subscription/card.php?id='.$id);
@@ -247,8 +240,7 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = '';
-if ($user->rights->adherent->cotisation->creer)
-{
+if ($user->rights->adherent->cotisation->creer) {
     $newcardbutton .= dolGetButtonTitle($langs->trans('NewSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/list.php?status=-1,1');
 }
 
@@ -269,8 +261,7 @@ $objecttmp = new Subscription($db);
 $trackid = 'sub'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
+if ($sall) {
 	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
@@ -289,70 +280,59 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 print '<tr class="liste_titre_filter">';
 
 // Line numbering
-if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-{
+if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
 // Ref
-if (!empty($arrayfields['d.ref']['checked']))
-{
+if (!empty($arrayfields['d.ref']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 }
 
 // Type
-if (!empty($arrayfields['d.fk_type']['checked']))
-{
+if (!empty($arrayfields['d.fk_type']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth50" type="text" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
 	print'</td>';
 }
 
-if (!empty($arrayfields['d.lastname']['checked']))
-{
+if (!empty($arrayfields['d.lastname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'"></td>';
 }
 
-if (!empty($arrayfields['d.firstname']['checked']))
-{
+if (!empty($arrayfields['d.firstname']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_firstname" value="'.dol_escape_htmltag($search_firstname).'"></td>';
 }
 
-if (!empty($arrayfields['d.login']['checked']))
-{
+if (!empty($arrayfields['d.login']['checked'])) {
 	print '<td class="liste_titre left">';
 	print '<input class="flat maxwidth75" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'"></td>';
 }
 
-if (!empty($arrayfields['t.libelle']['checked']))
-{
+if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '<td class="liste_titre">';
 	print '';
 	print '</td>';
 }
 
-if (!empty($arrayfields['d.bank']['checked']))
-{
+if (!empty($arrayfields['d.bank']['checked'])) {
 	print '<td class="liste_titre">';
 	$form->select_comptes($search_account, 'search_account', 0, '', 1, '', 0, 'maxwidth150');
 	print '</td>';
 }
 
-if (!empty($arrayfields['c.dateadh']['checked']))
-{
+if (!empty($arrayfields['c.dateadh']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
-if (!empty($arrayfields['c.datef']['checked']))
-{
+if (!empty($arrayfields['c.datef']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 
-if (!empty($arrayfields['d.amount']['checked']))
-{
+if (!empty($arrayfields['d.amount']['checked'])) {
 	print '<td class="liste_titre right">';
 	print '<input class="flat" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'" size="4">';
 	print '</td>';
@@ -365,14 +345,12 @@ $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['c.datec']['checked']))
-{
+if (!empty($arrayfields['c.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['c.tms']['checked']))
-{
+if (!empty($arrayfields['c.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -412,8 +390,7 @@ print "</tr>\n";
 
 
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($result);
 
 	$subscription->ref = $obj->crowid;
@@ -435,17 +412,14 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 
 	// Ref
-	if (!empty($arrayfields['d.ref']['checked']))
-	{
+	if (!empty($arrayfields['d.ref']['checked'])) {
 		print '<td>'.$subscription->getNomUrl(1).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
     // Type
-    if (!empty($arrayfields['d.fk_type']['checked']))
-	{
+    if (!empty($arrayfields['d.fk_type']['checked'])) {
         print '<td class="nowraponall">';
-        if ($typeid > 0)
-        {
+        if ($typeid > 0) {
         	print $adht->getNomUrl(1);
         }
         print '</td>';
@@ -453,30 +427,26 @@ while ($i < min($num, $limit))
 	}
 
 	// Lastname
-	if (!empty($arrayfields['d.lastname']['checked']))
-	{
+	if (!empty($arrayfields['d.lastname']['checked'])) {
 		$adherent->firstname = '';
 		print '<td>'.$adherent->getNomUrl(-1).'</td>';
 		$adherent->firstname = $obj->firstname;
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Firstname
-	if (!empty($arrayfields['d.firstname']['checked']))
-	{
+	if (!empty($arrayfields['d.firstname']['checked'])) {
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->firstname).'">'.$adherent->firstname.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Login
-	if (!empty($arrayfields['d.login']['checked']))
-	{
+	if (!empty($arrayfields['d.login']['checked'])) {
 		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($adherent->login).'">'.$adherent->login.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 
 	// Label
-	if (!empty($arrayfields['t.libelle']['checked']))
-	{
+	if (!empty($arrayfields['t.libelle']['checked'])) {
 		print '<td>';
 		print dol_trunc($obj->note, 128);
 		print '</td>';
@@ -484,11 +454,9 @@ while ($i < min($num, $limit))
 	}
 
 	// Banque
-	if (!empty($arrayfields['d.bank']['checked']))
-	{
+	if (!empty($arrayfields['d.bank']['checked'])) {
 		print '<td class="tdmaxoverflow150">';
-		if ($obj->fk_account > 0)
-		{
+		if ($obj->fk_account > 0) {
 			$accountstatic->id = $obj->fk_account;
 			$accountstatic->fetch($obj->fk_account);
 			//$accountstatic->label=$obj->label;
@@ -499,20 +467,17 @@ while ($i < min($num, $limit))
 	}
 
 	// Date start
-	if (!empty($arrayfields['c.dateadh']['checked']))
-	{
+	if (!empty($arrayfields['c.dateadh']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->dateadh), 'day')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date end
-	if (!empty($arrayfields['c.datef']['checked']))
-	{
+	if (!empty($arrayfields['c.datef']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datef), 'day')."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Price
-	if (!empty($arrayfields['d.amount']['checked']))
-	{
+	if (!empty($arrayfields['d.amount']['checked'])) {
 		print '<td class="right">'.price($obj->subscription).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.amount';
@@ -525,16 +490,14 @@ while ($i < min($num, $limit))
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['c.datec']['checked']))
-	{
+	if (!empty($arrayfields['c.datec']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	// Date modification
-	if (!empty($arrayfields['c.tms']['checked']))
-	{
+	if (!empty($arrayfields['c.tms']['checked'])) {
 		print '<td class="nowrap center">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
@@ -542,8 +505,7 @@ while ($i < min($num, $limit))
 	}
 	// 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
-	{
+	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"' : '').'>';
@@ -560,8 +522,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+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>';
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 16b600bfeeb..136c1dab8f4 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -18,8 +18,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -33,8 +32,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 $langs->load("members");
 
 $total = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
     echo '<tr class="oddeven">';
     echo '<td>'.$langs->trans("Subscription").'</td>';
     echo '<td>'.$objectlink->getNomUrl(1).'</td>';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index c190398c1db..ecd709bdd17 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 $langs->load("members");
 
 $rowid  = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -61,13 +61,13 @@ if (!$sortfield) {  $sortfield = "d.lastname"; }
 
 $label = GETPOST("label", "alpha");
 $morphy = GETPOST("morphy", "alpha");
-$statut = GETPOST("statut", "int");
+$status = GETPOST("status", "int");
 $subscription = GETPOST("subscription", "int");
 $duration_value = GETPOST('duration_value', 'int');
 $duration_unit = GETPOST('duration_unit', 'alpha');
 $vote = GETPOST("vote", "int");
-$comment = GETPOST("comment", 'none');
-$mail_valid = GETPOST("mail_valid", 'none');
+$comment = GETPOST("comment", 'restricthtml');
+$mail_valid = GETPOST("mail_valid", 'restricthtml');
 
 // Security check
 $result = restrictedArea($user, 'adherent', $rowid, 'adherent_type');
@@ -79,13 +79,12 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-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_lastname = "";
-    $search_login = "";
-    $search_email = "";
-    $type = "";
-    $sall = "";
+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_lastname = "";
+	$search_login = "";
+	$search_email = "";
+	$type = "";
+	$sall = "";
 }
 
 
@@ -109,7 +108,7 @@ if ($cancel) {
 if ($action == 'add' && $user->rights->adherent->configurer) {
 	$object->label = trim($label);
 	$object->morphy         = trim($morphy);
-	$object->statut         = (int) $statut;
+	$object->status         = (int) $status;
 	$object->subscription   = (int) $subscription;
 	$object->duration_value     	 = $duration_value;
 	$object->duration_unit      	 = $duration_unit;
@@ -124,8 +123,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 	if (empty($object->label)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-	}
-	else {
+	} else {
 		$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
 		$result = $db->query($sql);
 		if ($result) {
@@ -138,35 +136,28 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$id = $object->create($user);
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'create';
 	}
 }
 
-if ($action == 'update' && $user->rights->adherent->configurer)
-{
+if ($action == 'update' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 
 	$object->oldcopy = clone $object;
 
 	$object->label			= trim($label);
 	$object->morphy = trim($morphy);
-	$object->statut = (int) $statut;
+	$object->status = (int) $status;
 	$object->subscription = (int) $subscription;
 	$object->duration_value     	 = $duration_value;
 	$object->duration_unit      	 = $duration_unit;
@@ -180,12 +171,9 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 
 	$ret = $object->update($user);
 
-	if ($ret >= 0 && !count($object->errors))
-	{
+	if ($ret >= 0 && !count($object->errors)) {
 		setEventMessages($langs->trans("MemberTypeModified"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -193,19 +181,15 @@ if ($action == 'update' && $user->rights->adherent->configurer)
 	exit;
 }
 
-if ($action == 'confirm_delete' && $user->rights->adherent->configurer)
-{
+if ($action == 'confirm_delete' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 	$res = $object->delete();
 
-	if ($res > 0)
-	{
+	if ($res > 0) {
 		setEventMessages($langs->trans("MemberTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("MemberTypeCanNotBeDeleted"), null, 'errors');
 		$action = '';
 	}
@@ -221,10 +205,8 @@ $formproduct = new FormProduct($db);
 
 llxHeader('', $langs->trans("MembersTypeSetup"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
 
-
 // List of members type
-if (!$rowid && $action != 'create' && $action != 'edit')
-{
+if (!$rowid && $action != 'create' && $action != 'edit') {
 	//dol_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote, d.statut as status, d.morphy";
@@ -232,8 +214,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 	$sql .= " WHERE d.entity IN (".getEntity('member_type').")";
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$nbtotalofrecords = $num;
 
@@ -244,10 +225,9 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
 		$newcardbutton = '';
-		if ($user->rights->adherent->configurer)
-		{
-            $newcardbutton .= dolGetButtonTitle($langs->trans('NewMemberType'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/type.php?action=create');
-        }
+		if ($user->rights->adherent->configurer) {
+			$newcardbutton .= dolGetButtonTitle($langs->trans('NewMemberType'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/type.php?action=create');
+		}
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -267,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("MemberNature").'</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>';
@@ -290,18 +270,17 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 			//<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
 			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");
-            print '</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");
+			print '</td>';
 			print '<td class="center">'.yn($objp->subscription).'</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
 			print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
 			if ($user->rights->adherent->configurer)
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			else
+			else {
 				print '<td class="right">&nbsp;</td>';
+			}
 			print "</tr>";
 			$i++;
 		}
@@ -309,9 +288,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		print '</div>';
 
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -322,8 +299,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 /* Creation mode                                                              */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$object = new AdherentType($db);
 
 	print load_fiche_titre($langs->trans("NewMemberType"), '', 'members');
@@ -332,7 +308,7 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
-    dol_fiche_head('');
+	dol_fiche_head('');
 
 	print '<table class="border centpercent">';
 	print '<tbody>';
@@ -340,13 +316,13 @@ if ($action == 'create')
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
-  	print $form->selectarray('statut', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1);
+  	print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1);
   	print '</td></tr>';
 
-    // Morphy
+	// Morphy
   	$morphys = array();
-    $morphys[""] = $langs->trans("MorPhy");
-    $morphys["phy"] = $langs->trans("Physical");
+	$morphys[""] = $langs->trans("MorPhy");
+	$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", 'aZ09') : 'morphy');
@@ -398,10 +374,8 @@ if ($action == 'create')
 /* View mode                                                                  */
 /*                                                                            */
 /* ************************************************************************** */
-if ($rowid > 0)
-{
-	if ($action != 'edit')
-	{
+if ($rowid > 0) {
+	if ($action != 'edit') {
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
@@ -409,8 +383,7 @@ if ($rowid > 0)
 		/*
 		 * Confirmation deletion
 		 */
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id, $langs->trans("DeleteAMemberType"), $langs->trans("ConfirmDeleteMemberType", $object->label), "confirm_delete", '', 0, 1);
 		}
 
@@ -440,12 +413,9 @@ if ($rowid > 0)
 		print '</tr>';
 
 		print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
-		if ($object->duration_value > 1)
-		{
+		if ($object->duration_value > 1) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-		}
-		elseif ($object->duration_value > 0)
-		{
+		} elseif ($object->duration_value > 0) {
 			$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 		}
 		print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
@@ -472,23 +442,20 @@ if ($rowid > 0)
 		print '<div class="tabsAction">';
 
 		// Edit
-		if ($user->rights->adherent->configurer)
-		{
+		if ($user->rights->adherent->configurer) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 		}
 
 		// Add
-        if ($user->rights->adherent->configurer && !empty($object->statut))
-		{
-            print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&typeid='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';
-        } else {
-		    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoAddMember")).'">'.$langs->trans("AddMember").'</a></div>';
-        }
+		if ($user->rights->adherent->configurer && !empty($object->status)) {
+			print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=create&typeid='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';
+		} else {
+			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoAddMember")).'">'.$langs->trans("AddMember").'</a></div>';
+		}
 
 		// Delete
-		if ($user->rights->adherent->configurer)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
+		if ($user->rights->adherent->configurer) {
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
 		}
 
 		print "</div>";
@@ -502,120 +469,110 @@ if ($rowid > 0)
 
 		$sql = "SELECT d.rowid, d.login, d.firstname, d.lastname, d.societe as company,";
 		$sql .= " d.datefin,";
-		$sql .= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
+		$sql .= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut as status,";
 		$sql .= " t.libelle as type, t.subscription";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";
 		$sql .= " WHERE d.fk_adherent_type = t.rowid ";
 		$sql .= " AND d.entity IN (".getEntity('adherent').")";
 		$sql .= " AND t.rowid = ".$object->id;
-		if ($sall)
-		{
+		if ($sall) {
 			$sql .= natural_search(array("f.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
 		}
-		if ($status != '')
-		{
-		    $sql .= natural_search('d.statut', $status, 2);
+		if ($status != '') {
+			$sql .= natural_search('d.statut', $status, 2);
 		}
-		if ($action == 'search')
-		{
-			if (GETPOST('search', 'alpha'))
-			{
+		if ($action == 'search') {
+			if (GETPOST('search', 'alpha')) {
 		  		$sql .= natural_search(array("d.firstname", "d.lastname"), GETPOST('search', 'alpha'));
 		  	}
 		}
-		if (!empty($search_lastname))
-		{
+		if (!empty($search_lastname)) {
 			$sql .= natural_search(array("d.firstname", "d.lastname"), $search_lastname);
 		}
-		if (!empty($search_login))
-		{
+		if (!empty($search_login)) {
 			$sql .= natural_search("d.login", $search_login);
 		}
-		if (!empty($search_email))
-		{
+		if (!empty($search_email)) {
 			$sql .= natural_search("d.email", $search_email);
 		}
-        if ($filter == 'uptodate')
-        {
-            $sql .= " AND (datefin >= '".$db->idate($now)."') OR t.subscription = 0)";
-        }
-        if ($filter == 'outofdate')
-        {
-            $sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
-        }
+		if ($filter == 'uptodate') {
+			$sql .= " AND (datefin >= '".$db->idate($now)."') OR t.subscription = 0)";
+		}
+		if ($filter == 'outofdate') {
+			$sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
+		}
 
 		$sql .= " ".$db->order($sortfield, $sortorder);
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-		{
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			$resql = $db->query($sql);
-		    if ($resql) $nbtotalofrecords = $db->num_rows($result);
-		    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;
-		    }
+			if ($resql) $nbtotalofrecords = $db->num_rows($result);
+			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;
+			}
 		}
 
 		$sql .= " ".$db->plimit($conf->liste_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;
 
-		    $titre = $langs->trans("MembersList");
-		    if ($status != '')
-		    {
-		        if ($status == '-1,1') { $titre = $langs->trans("MembersListQualified"); }
-		        elseif ($status == '-1') { $titre = $langs->trans("MembersListToValid"); }
-		        elseif ($status == '1' && !$filter) { $titre = $langs->trans("MembersListValid"); }
-		        elseif ($status == '1' && $filter == 'uptodate') { $titre = $langs->trans("MembersListUpToDate"); }
-		        elseif ($status == '1' && $filter == 'outofdate') { $titre = $langs->trans("MembersListNotUpToDate"); }
-		        elseif ($status == '0') { $titre = $langs->trans("MembersListResiliated"); }
-		    }
-		    elseif ($action == 'search')
-		    {
-		        $titre = $langs->trans("MembersListQualified");
-		    }
+			$titre = $langs->trans("MembersList");
+			if ($status != '') {
+				if ($status == '-1,1') {
+					$titre = $langs->trans("MembersListQualified");
+				} elseif ($status == '-1') {
+					$titre = $langs->trans("MembersListToValid");
+				} elseif ($status == '1' && !$filter) {
+					$titre = $langs->trans("MembersListValid");
+				} elseif ($status == '1' && $filter == 'uptodate') {
+					$titre = $langs->trans("MembersListUpToDate");
+				} elseif ($status == '1' && $filter == 'outofdate') {
+					$titre = $langs->trans("MembersListNotUpToDate");
+				} elseif ($status == '0') {
+					$titre = $langs->trans("MembersListResiliated");
+				}
+			} elseif ($action == 'search') {
+				$titre = $langs->trans("MembersListQualified");
+			}
 
-		    if ($type > 0)
-		    {
+			if ($type > 0) {
 				$membertype = new AdherentType($db);
-		        $result = $membertype->fetch($type);
+				$result = $membertype->fetch($type);
 				$titre .= " (".$membertype->label.")";
-		    }
+			}
 
-		    $param = "&rowid=".$object->id;
-		    if (!empty($status))			$param .= "&status=".$status;
-		    if (!empty($search_lastname))	$param .= "&search_lastname=".$search_lastname;
-		    if (!empty($search_firstname))	$param .= "&search_firstname=".$search_firstname;
-		    if (!empty($search_login))		$param .= "&search_login=".$search_login;
-		    if (!empty($search_email))		$param .= "&search_email=".$search_email;
-		    if (!empty($filter))			$param .= "&filter=".$filter;
+			$param = "&rowid=".$object->id;
+			if (!empty($status))			$param .= "&status=".$status;
+			if (!empty($search_lastname))	$param .= "&search_lastname=".$search_lastname;
+			if (!empty($search_firstname))	$param .= "&search_firstname=".$search_firstname;
+			if (!empty($search_login))		$param .= "&search_login=".$search_login;
+			if (!empty($search_email))		$param .= "&search_email=".$search_email;
+			if (!empty($filter))			$param .= "&filter=".$filter;
 
-		    if ($sall)
-		    {
-		        print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
-		    }
+			if ($sall) {
+				print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;
+			}
 
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input class="flat" type="hidden" name="rowid" value="'.$object->id.'" size="12"></td>';
 
 			print '<br>';
-            print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
+			print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
 
-            $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";
 
-            // Fields title search
+			// Fields title search
 			print '<tr class="liste_titre_filter">';
 
 			print '<td class="liste_titre left">';
@@ -633,123 +590,105 @@ if ($rowid > 0)
 
 			print '<td class="liste_titre right" colspan="2">';
 			print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-		    print '&nbsp; ';
-		    print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/searchclear.png" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+			print '&nbsp; ';
+			print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/searchclear.png" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 			print '</td>';
 
 			print "</tr>\n";
 
 			print '<tr class="liste_titre">';
-            print_liste_field_titre("NameSlashCompany", $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
-		    print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
-		    print_liste_field_titre("MemberNature", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
-		    print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);
-		    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.statut,d.datefin", $param, "", "", $sortfield, $sortorder);
-		    print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", 'align="center"', $sortfield, $sortorder);
-		    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
-		    print "</tr>\n";
+			print_liste_field_titre("NameSlashCompany", $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
+			print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
+			print_liste_field_titre("MemberNature", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
+			print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);
+			print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.statut,d.datefin", $param, "", "", $sortfield, $sortorder);
+			print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", 'align="center"', $sortfield, $sortorder);
+			print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
+			print "</tr>\n";
 
-		    while ($i < $num && $i < $conf->liste_limit)
-		    {
-		        $objp = $db->fetch_object($resql);
+			while ($i < $num && $i < $conf->liste_limit) {
+				$objp = $db->fetch_object($resql);
 
-		        $datefin = $db->jdate($objp->datefin);
+				$datefin = $db->jdate($objp->datefin);
 
-		        $adh = new Adherent($db);
-		        $adh->lastname = $objp->lastname;
-		        $adh->firstname = $objp->firstname;
+				$adh = new Adherent($db);
+				$adh->lastname = $objp->lastname;
+				$adh->firstname = $objp->firstname;
 
-		        // 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";
-		        }
-		        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";
-		        }
+				// 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";
+				} 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";
+				}
 
-		        // Login
-		        print "<td>".$objp->login."</td>\n";
+				// Login
+				print "<td>".$objp->login."</td>\n";
 
-		        // Type
-		        /*print '<td class="nowrap">';
+				// Type
+				/*print '<td class="nowrap">';
 		        $membertypestatic->id=$objp->type_id;
 		        $membertypestatic->label=$objp->type;
 		        print $membertypestatic->getNomUrl(1,12);
 		        print '</td>';
 				*/
 
-		        // Moral/Physique
-		        print "<td>".$adh->getmorphylib($objp->morphy)."</td>\n";
+				// Moral/Physique
+				print "<td>".$adh->getmorphylib($objp->morphy)."</td>\n";
 
-		        // EMail
-		        print "<td>".dol_print_email($objp->email, 0, 0, 1)."</td>\n";
+				// EMail
+				print "<td>".dol_print_email($objp->email, 0, 0, 1)."</td>\n";
 
-		        // Statut
-		        print '<td class="nowrap">';
-		        print $adh->LibStatut($objp->statut, $objp->subscription, $datefin, 2);
-		        print "</td>";
+				// Statut
+				print '<td class="nowrap">';
+				print $adh->LibStatut($objp->status, $objp->subscription, $datefin, 2);
+				print "</td>";
 
-		        // Date end subscription
-		        if ($datefin)
-		        {
-			        print '<td class="nowrap center">';
-		            if ($datefin < dol_now() && $objp->statut > 0)
-		            {
-		                print dol_print_date($datefin, 'day')." ".img_warning($langs->trans("SubscriptionLate"));
-		            }
-		            else
-		            {
-		                print dol_print_date($datefin, 'day');
-		            }
-		            print '</td>';
-		        }
-		        else
-		        {
-			        print '<td class="nowrap left">';
-			        if ($objp->subscription == 'yes')
-			        {
-		                print $langs->trans("SubscriptionNotReceived");
-		                if ($objp->statut > 0) print " ".img_warning();
-			        }
-			        else
-			        {
-			            print '&nbsp;';
-			        }
-		            print '</td>';
-		        }
+				// Date end subscription
+				if ($datefin) {
+					print '<td class="nowrap center">';
+					if ($datefin < dol_now() && $objp->status > 0) {
+						print dol_print_date($datefin, 'day')." ".img_warning($langs->trans("SubscriptionLate"));
+					} else {
+						print dol_print_date($datefin, 'day');
+					}
+					print '</td>';
+				} else {
+					print '<td class="nowrap left">';
+					if ($objp->subscription == 'yes') {
+						print $langs->trans("SubscriptionNotReceived");
+						if ($objp->status > 0) print " ".img_warning();
+					} else {
+						print '&nbsp;';
+					}
+					print '</td>';
+				}
 
-		        // Actions
-		        print '<td class="center">';
-				if ($user->rights->adherent->creer)
-				{
+				// 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 '&nbsp;';
-				if ($user->rights->adherent->supprimer)
-				{
+				if ($user->rights->adherent->supprimer) {
 					print '<a href="card.php?rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';
-		        }
+				}
 				print "</td>";
 
-		        print "</tr>\n";
-		        $i++;
-		    }
-
-		    print "</table>\n";
-            print '</div>';
-            print '</form>';
-
-			if ($num > $conf->liste_limit)
-			{
-			    print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
+				print "</tr>\n";
+				$i++;
 			}
-		}
-		else
-		{
-		    dol_print_error($db);
+
+			print "</table>\n";
+			print '</div>';
+			print '</form>';
+
+			if ($num > $conf->liste_limit) {
+				print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
+			}
+		} else {
+			dol_print_error($db);
 		}
 	}
 
@@ -759,8 +698,7 @@ if ($rowid > 0)
 	/*                                                                            */
 	/* ************************************************************************** */
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		$object = new AdherentType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
@@ -781,18 +719,18 @@ if ($rowid > 0)
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("Status").'</td><td>';
-    	print $form->selectarray('statut', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->statut);
-    	print '</td></tr>';
+		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status);
+		print '</td></tr>';
 
-        // Morphy
-        $morphys[""] = $langs->trans("MorPhy");
-        $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 "</td></tr>";
+		// Morphy
+		$morphys[""] = $langs->trans("MorPhy");
+		$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 "</td></tr>";
 
-    	print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
+		print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
 		print $form->selectyesno("subscription", $object->subscription, 1);
 		print '</td></tr>';
 
@@ -802,7 +740,7 @@ if ($rowid > 0)
 
 		print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
 		print '<input name="duration_value" size="5" value="'.$object->duration_value.'"> ';
-		print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
+		print $formproduct->selectMeasuringUnits("duration_unit", "time", ($object->duration_unit === '' ? 'y' : $object->duration_unit), 0, 1);
 		print '</td></tr>';
 
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
diff --git a/htdocs/adherents/type_ldap.php b/htdocs/adherents/type_ldap.php
index bfb81e8d5c4..5e745293050 100644
--- a/htdocs/adherents/type_ldap.php
+++ b/htdocs/adherents/type_ldap.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
 $langs->loadLangs(array("admin", "members", "ldap"));
 
 $id = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 $result = restrictedArea($user, 'adherent', $id, 'adherent_type');
@@ -53,15 +53,12 @@ $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))
-{
-	if ($action == 'dolibarr2ldap')
-	{
+if (empty($reshook)) {
+	if ($action == 'dolibarr2ldap') {
 		$ldap = new Ldap();
 		$result = $ldap->connect_bind();
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$object->listMembersForMemberType('', 1);
 
 			$info = $object->_load_ldap_info();
@@ -73,8 +70,7 @@ if (empty($reshook))
 
 		if ($result >= 0) {
 			setEventMessages($langs->trans("MemberTypeSynchronized"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -126,8 +122,7 @@ dol_fiche_end();
 
 print '<div class="tabsAction">';
 
-if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1)
-{
+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>';
 }
 
@@ -150,8 +145,7 @@ print '</tr>';
 // LDAP reading
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
-if ($result > 0)
-{
+if ($result > 0) {
     $info = $object->_load_ldap_info();
     $dn = $object->_load_ldap_dn($info, 1);
     $search = "(".$object->_load_ldap_dn($info, 2).")";
@@ -161,27 +155,19 @@ if ($result > 0)
     //print_r($records);
 
     // Show tree
-    if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
-    {
-        if (!is_array($records))
-        {
+    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
-        {
+        } else {
             $result = show_ldap_content($records, 0, $records['count'], true);
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
     }
 
     $ldap->unbind();
     $ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 4c68b82784f..10c43dadbe3 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 $langs->loadLangs(array('members', 'languages'));
 
 $id = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
 // Security check
@@ -51,99 +51,78 @@ $result = restrictedArea($user, 'adherent', $id, 'adherent_type');
  */
 
 // return to translation display if cancellation
-if ($cancel == $langs->trans("Cancel"))
-{
+if ($cancel == $langs->trans("Cancel")) {
 	$action = '';
 }
 
-if ($action == 'delete' && GETPOST('langtodelete', 'alpha'))
-{
+if ($action == 'delete' && GETPOST('langtodelete', 'alpha')) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$object->delMultiLangs(GETPOST('langtodelete', 'alpha'), $user);
 }
 
 // Add translation
-if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
 	// update of object
-	if ($_POST["forcelangprod"] == $current_lang)
-	{
+	if ($_POST["forcelangprod"] == $current_lang) {
 		$object->label			= $_POST["libelle"];
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
-	}
-	else
-	{
+	} else {
 		$object->multilangs[$_POST["forcelangprod"]]["label"]		= $_POST["libelle"];
 		$object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
 	}
 
 	// backup into database
-	if ($object->setMultiLangs($user) > 0)
-	{
+	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'add';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
 // Edit translation
-if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
-	foreach ($object->multilangs as $key => $value) // saving new values in the object
-	{
-		if ($key == $current_lang)
-		{
+	foreach ($object->multilangs as $key => $value) { // saving new values in the object
+		if ($key == $current_lang) {
 			$object->label			= $_POST["libelle-".$key];
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
-		}
-		else
-		{
+		} else {
 			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
 			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr($_POST["other-".$key]);
 		}
 	}
 
-	if ($object->setMultiLangs($user) > 0)
-	{
+	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
 // Delete translation
-if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer)
-{
+if ($action == 'vdelete' && $cancel != $langs->trans("Cancel") && $user->rights->adherent->configurer) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
 	$langtodelete = GETPOST('langdel', 'alpha');
 
 
-	if ($object->delMultiLangs($langtodelete, $user) > 0)
-	{
+	if ($object->delMultiLangs($langtodelete, $user) > 0) {
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -174,10 +153,8 @@ $titre = $langs->trans("MemberType".$object->type);
 
 // Calculate $cnt_trans
 $cnt_trans = 0;
-if (!empty($object->multilangs))
-{
-    foreach ($object->multilangs as $key => $value)
-    {
+if (!empty($object->multilangs)) {
+    foreach ($object->multilangs as $key => $value) {
         $cnt_trans++;
     }
 }
@@ -201,10 +178,8 @@ dol_fiche_end();
 
 print "\n<div class=\"tabsAction\">\n";
 
-if ($action == '')
-{
-    if ($user->rights->produit->creer || $user->rights->service->creer)
-    {
+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>';
     }
@@ -214,8 +189,7 @@ print "\n</div>\n";
 
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -224,12 +198,10 @@ if ($action == 'edit')
 	print '<input type="hidden" name="action" value="vedit">';
 	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
 
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
-			print "<br>".($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
+			print '<br>'.($s ? $s.' ' : '').' <b>'.$langs->trans('Language_'.$key).':</b> <a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
 
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border centpercent">';
@@ -252,15 +224,11 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($action != 'add')
-{
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+} elseif ($action != 'add') {
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
-			print ($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
+			print ($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
@@ -280,8 +248,7 @@ elseif ($action != 'add')
  * Form to add a new translation
  */
 
-if ($action == 'add' && $user->rights->adherent->configurer)
-{
+if ($action == 'add' && $user->rights->adherent->configurer) {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
diff --git a/htdocs/adherents/vcard.php b/htdocs/adherents/vcard.php
new file mode 100644
index 00000000000..6f2a274aed9
--- /dev/null
+++ b/htdocs/adherents/vcard.php
@@ -0,0 +1,137 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * 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>
+ *
+ * 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/adherent/vcard.php
+ *      \ingroup    societe
+ *		\brief      Onglet vcard d'un adherent
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/vcard.class.php';
+
+$adherent = new adherent($db);
+
+
+$id = GETPOST('id', 'int');
+
+// Security check
+$result = restrictedArea($user, 'adherent', $id, '', '', 'socid', 'rowid', $objcanvas);
+
+
+$result = $adherent->fetch($id);
+if ($result <= 0)
+{
+	dol_print_error($adherent->error);
+	exit;
+}
+
+$physicalperson = 1;
+
+$company = new Societe($db);
+if ($adherent->socid)
+{
+	$result = $company->fetch($adherent->socid);
+}
+
+// We create VCard
+$v = new vCard();
+$v->setProdId('Dolibarr '.DOL_VERSION);
+
+$v->setUid('DOLIBARR-ADHERENTID-'.$adherent->id);
+$v->setName($adherent->lastname, $adherent->firstname, "", $adherent->civility, "");
+$v->setFormattedName($adherent->getFullName($langs, 1));
+
+$v->setPhoneNumber($adherent->phone_pro, "TYPE=WORK;VOICE");
+//$v->setPhoneNumber($adherent->phone_perso,"TYPE=HOME;VOICE");
+$v->setPhoneNumber($adherent->phone_mobile, "TYPE=CELL;VOICE");
+$v->setPhoneNumber($adherent->fax, "TYPE=WORK;FAX");
+
+$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->setTitle($adherent->poste);
+
+// Data from linked company
+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");
+
+	// when company e-mail is empty, use only adherent e-mail
+	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)))
+	{
+		$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))))
+	{
+		$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 {
+		$v->setEmail($company->email);
+
+		// support by Microsoft Outlook (2019 and possible earlier)
+		$v->setEmail($adherent->email, 'INTERNET');
+	}
+
+	// Si adherent lie a un tiers non de type "particulier"
+	if ($adherent->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);
+
+$db->close();
+
+
+// Renvoi la VCard au navigateur
+
+$output = $v->getVCard();
+
+$filename = trim(urldecode($v->getFileName()));      // "Nom prenom.vcf"
+$filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
+//$filename = dol_sanitizeFileName($filename);
+
+
+header("Content-Disposition: attachment; filename=\"".$filename."\"");
+header("Content-Length: ".dol_strlen($output));
+header("Connection: close");
+header("Content-Type: text/x-vcard; name=\"".$filename."\"");
+
+print $output;
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index c8c082db6ae..b039032b9c2 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -62,7 +62,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alpha'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alpha'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'none'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity);
 
 	if ($action != 'updateedit' && !$error)
 	{
@@ -164,7 +164,7 @@ print '<input name="code" id="code" class="minwidth100" value="'.($conf->global-
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index b6231a45a10..2cc79be297d 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -34,7 +34,7 @@ if (!$user->admin)
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'agenda'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
 $search_event = GETPOST('search_event', 'alpha');
@@ -61,9 +61,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -107,9 +105,7 @@ if ($action == "save" && empty($cancel))
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
         $db->commit();
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
         $db->rollback();
     }
@@ -169,6 +165,7 @@ if (!empty($triggers))
 		if ($module == 'member') $module = 'adherent';
 		if ($module == 'project') $module = 'projet';
 		if ($module == 'proposal_supplier') $module = 'supplier_proposal';
+		if ($module == 'contact') $module = 'societe';
 
 		// If 'element' value is myobject@mymodule instead of mymodule
 		$tmparray = explode('@', $module);
@@ -176,7 +173,7 @@ if (!empty($triggers))
 			$module = $tmparray[1];
 		}
 
-		//print 'module='.$module.'<br>';
+		//print 'module='.$module.' code='.$trigger['code'].'<br>';
 		if (!empty($conf->$module->enabled))
 		{
 			// Discard special case: If option FICHINTER_CLASSIFY_BILLED is not set, we discard both trigger FICHINTER_CLASSIFY_BILLED and FICHINTER_CLASSIFY_UNBILLED
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index a0197f70274..605f3c76519 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -45,7 +45,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'actioncomm'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 77113ff1e13..e7e5edefaab 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -107,9 +107,7 @@ if ($actionsave)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
         if (empty($errorsaved))	setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -162,15 +160,11 @@ print '<td class="center">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('AGENDA_DISABLE_EXT', array('enabled'=>array(0=>'.hideifnotset')), null, 1);
-}
-else
-{
+} else {
 	if (empty($conf->global->AGENDA_DISABLE_EXT))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?save=1&AGENDA_DISABLE_EXT=1">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?save=1&AGENDA_DISABLE_EXT=0">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 }
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index c5b196146d5..48368af45f2 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -37,7 +37,7 @@ if (!$user->admin)
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'agenda', 'users'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
@@ -59,9 +59,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -73,9 +71,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -87,8 +83,7 @@ if ($action == 'set')
     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
+} elseif ($action == 'specimen')  // For orders
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -120,15 +115,11 @@ elseif ($action == 'specimen')  // For orders
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -139,9 +130,7 @@ elseif ($action == 'setmodel')
 {
 	//print "sssd".$value;
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -213,9 +202,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -263,8 +250,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			$module = new $classname($db, $specimenthirdparty);
             			if (method_exists($module, 'info'))
             				print $module->info($langs);
-            			else
-            				print $module->description;
+            			else print $module->description;
             			print "</td>\n";
 
             			// Active
@@ -276,17 +262,13 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             				    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
-            			    {
+            			    } else {
             				    print img_picto($langs->trans("Enabled"), 'switch_on');
             			    }
             				print "</td>";
-            			}
-            			else
-            			{
+            			} else {
             				print '<td class="center">'."\n";
-            				print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmodel&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 '<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>";
             			}
 
@@ -295,10 +277,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
             			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;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>';
+            			} 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>';
 
@@ -345,11 +325,9 @@ print '<td class="right">'."\n";
 //print ajax_constantonoff('AGENDA_USE_EVENT_TYPE');	Do not use ajax here, we need to reload page to change other combo list
 if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-}
-else
-{
-	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_USE_EVENT_TYPE&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+} else {
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_USE_EVENT_TYPE&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 print '</td></tr>'."\n";
 
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 3d51bd3158c..e4b3c59781c 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -32,7 +32,7 @@ if (!$user->admin)
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "agenda"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
@@ -54,9 +54,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -68,9 +66,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -80,8 +76,7 @@ if ($action == 'set')
     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
+} elseif ($action == 'specimen')  // For orders
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -113,15 +108,11 @@ elseif ($action == 'specimen')  // For orders
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=action&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -132,9 +123,7 @@ elseif ($action == 'setmodel')
 {
 	//print "sssd".$value;
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -200,10 +189,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2)
 	print '<td class="right">'."\n";
 
 	if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_EMAIL">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_EMAIL&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_EMAIL">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_REMINDER_EMAIL&amp;token='.newToken().'">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
 		print '</td></tr>'."\n";
 	}
 }
@@ -217,10 +206,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2)
     print '<td class="right">'."\n";
 
     if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
-        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_REMINDER_BROWSER">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+        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">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+        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";
@@ -229,9 +218,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2)
         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">'.img_picto($langs->trans('Disabled'), 'switch_off').'</a>';
+            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">'.img_picto($langs->trans('Enabled'), 'switch_on').'</a>';
+            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";
@@ -242,7 +231,7 @@ print '</table>';
 
 dol_fiche_end();
 
-print '<div class="center"><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+//print '<div class="center"><input class="button" type="submit" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 7df74ba6a9d..5b747260a05 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -54,9 +54,7 @@ if ($actionsave)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
         setEventMessages($langs->trans("SaveFailed"), null, 'errors');
     }
@@ -156,17 +154,20 @@ print "<br>";
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
+$getentity = ($conf->entity > 1 ? "&entity=".$conf->entity : "");
 
 // Show message
 $message = '';
-$urlvcal = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlvcal = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlvcal .= $urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'vcal', $urlvcal);
 $message .= '<br>';
-$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlical .=$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'ical/ics', $urlical);
 $message .= '<br>';
-$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlrss .= $urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'rss', $urlrss);
 $message .= '<br>';
 $message .= '<br>';
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index b048dea9565..772ef604ab5 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -35,9 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 $langs->loadLangs(array("admin", "companies", "bills", "other", "banks"));
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $actionsave = GETPOST('save', 'alpha');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
@@ -51,160 +51,147 @@ $type = 'bankaccount';
 
 // Order display of bank account
 if ($action == 'setbankorder') {
-    if (dolibarr_set_const($db, "BANK_SHOW_ORDER_OPTION", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else {
-        dol_print_error($db);
-    }
+	if (dolibarr_set_const($db, "BANK_SHOW_ORDER_OPTION", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 
 // Auto report last num releve on conciliate
 if ($action == 'setreportlastnumreleve') {
-    if (dolibarr_set_const($db, "BANK_REPORT_LAST_NUM_RELEVE", 1, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else {
-        dol_print_error($db);
-    }
-}
-elseif ($action == 'unsetreportlastnumreleve') {
-    if (dolibarr_set_const($db, "BANK_REPORT_LAST_NUM_RELEVE", 0, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else {
-        dol_print_error($db);
-    }
+	if (dolibarr_set_const($db, "BANK_REPORT_LAST_NUM_RELEVE", 1, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
+} elseif ($action == 'unsetreportlastnumreleve') {
+	if (dolibarr_set_const($db, "BANK_REPORT_LAST_NUM_RELEVE", 0, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 
 // Colorize movements
 if ($action == 'setbankcolorizemovement') {
-    if (dolibarr_set_const($db, "BANK_COLORIZE_MOVEMENT", 1, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else {
-        dol_print_error($db);
-    }
-}
-elseif ($action == 'unsetbankcolorizemovement') {
-    if (dolibarr_set_const($db, "BANK_COLORIZE_MOVEMENT", 0, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else {
-        dol_print_error($db);
-    }
+	if (dolibarr_set_const($db, "BANK_COLORIZE_MOVEMENT", 1, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
+} elseif ($action == 'unsetbankcolorizemovement') {
+	if (dolibarr_set_const($db, "BANK_COLORIZE_MOVEMENT", 0, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 
 if ($actionsave)
 {
-    $db->begin();
+	$db->begin();
 
-    $i = 1; $errorsaved = 0;
-    $error = 0;
+	$i = 1; $errorsaved = 0;
+	$error = 0;
 
-    // Save colors
-    while ($i <= 2)
-    {
-        $color = trim(GETPOST('BANK_COLORIZE_MOVEMENT_COLOR'.$i, 'alpha'));
-        if ($color == '-1') $color = '';
+	// Save colors
+	while ($i <= 2)
+	{
+		$color = GETPOST('BANK_COLORIZE_MOVEMENT_COLOR'.$i, 'alpha');
+		if ($color == '-1') $color = '';
 
-        $res = dolibarr_set_const($db, 'BANK_COLORIZE_MOVEMENT_COLOR'.$i, $color, 'chaine', 0, '', $conf->entity);
-        if (!$res > 0) $error++;
-        $i++;
-    }
+		$res = dolibarr_set_const($db, 'BANK_COLORIZE_MOVEMENT_COLOR'.$i, $color, 'chaine', 0, '', $conf->entity);
+		if (!$res > 0) $error++;
+		$i++;
+	}
 
-    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');
+	}
 }
 
 
 if ($action == 'specimen') {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    if ($modele == 'sepamandate') {
-        $object = new CompanyBankAccount($db);
-    }
-    else {
-        $object = new Account($db);
-    }
-    $object->initAsSpecimen();
+	if ($modele == 'sepamandate') {
+		$object = new CompanyBankAccount($db);
+	} else {
+		$object = new Account($db);
+	}
+	$object->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/bank/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/bank/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($object, $langs) > 0) {
-            header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bank&file=SPECIMEN.pdf");
-            return;
-        }
-        else {
-            setEventMessages($module->error, null, '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($object, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bank&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
 }
 
 // Activate a model
 if ($action == 'set') {
-    $ret = addDocumentModel($value, $type, $label, $scandir);
-}
-elseif ($action == 'del') {
-    $ret = delDocumentModel($value, $type);
-    if ($ret > 0) {
-        if ($conf->global->BANKADDON_PDF == "$value")
-            dolibarr_del_const($db, 'BANKADDON_PDF', $conf->entity);
-    }
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del') {
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0) {
+		if ($conf->global->BANKADDON_PDF == "$value")
+			dolibarr_del_const($db, 'BANKADDON_PDF', $conf->entity);
+	}
 }
 // Set default model
 elseif ($action == 'setdoc') {
-    if (dolibarr_set_const($db, "BANKADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
-        // The constant that was read before the new set
-        // We therefore requires a variable to have a coherent view
-        $conf->global->BANKADDON_PDF = $value;
-    }
+	if (dolibarr_set_const($db, "BANKADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
+		// The constant that was read before the new set
+		// We therefore requires a variable to have a coherent view
+		$conf->global->BANKADDON_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);
+	}
 }
 
 
@@ -253,32 +240,31 @@ $i = 0;
 
 $nbofbank = count($bankorder);
 while ($i < $nbofbank) {
-    print '<tr class="oddeven">';
-    print '<td>'.$bankorder[$i][0]."</td><td>\n";
-    print $bankorder[$i][1];
-    print '</td>';
-    print '<td class="nowrap">';
-    $tmparray = explode(' ', $bankorder[$i][2]);
-    foreach ($tmparray as $key => $val) {
-        if ($key > 0)
-            print ', ';
-        print $langs->trans($val);
-    }
-    print "</td>\n";
+	print '<tr class="oddeven">';
+	print '<td>'.$bankorder[$i][0]."</td><td>\n";
+	print $bankorder[$i][1];
+	print '</td>';
+	print '<td class="nowrap">';
+	$tmparray = explode(' ', $bankorder[$i][2]);
+	foreach ($tmparray as $key => $val) {
+		if ($key > 0)
+			print ', ';
+		print $langs->trans($val);
+	}
+	print "</td>\n";
 
-    if ($conf->global->BANK_SHOW_ORDER_OPTION == $i) {
-        print '<td class="center">';
-        print img_picto($langs->trans("Activated"), 'on');
-        print '</td>';
-    }
-    else {
-        print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&amp;value='.$i.'">';
-        print img_picto($langs->trans("Disabled"), 'off');
-        print '</a></td>';
-    }
-    print '<td>&nbsp;</td>';
-    print '</tr>'."\n";
-    $i++;
+	if ($conf->global->BANK_SHOW_ORDER_OPTION == $i) {
+		print '<td class="center">';
+		print img_picto($langs->trans("Activated"), 'on');
+		print '</td>';
+	} else {
+		print '<td class="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setbankorder&amp;token='.newToken().'&amp;value='.$i.'">';
+		print img_picto($langs->trans("Disabled"), 'off');
+		print '</a></td>';
+	}
+	print '<td>&nbsp;</td>';
+	print '</tr>'."\n";
+	$i++;
 }
 
 print '</table>'."\n";
@@ -297,20 +283,19 @@ print load_fiche_titre($langs->trans("BankAccountModelModule"), '', '');
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $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++;
-    }
-}
-else {
-    dol_print_error($db);
+	$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);
 }
 
 print "<table class=\"noborder\" width=\"100%\">\n";
@@ -326,104 +311,100 @@ print "</tr>\n";
 clearstatcache();
 
 foreach ($dirmodels as $reldir) {
-    foreach (array('', '/doc') as $valdir) {
-        $dir = dol_buildpath($reldir."core/modules/bank".$valdir);
+	foreach (array('', '/doc') as $valdir) {
+		$dir = dol_buildpath($reldir."core/modules/bank".$valdir);
 
-        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&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&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 class="reposition" 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 class="center">'."\n";
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;token='.newToken().'&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->BANKADDON_PDF == $name) {
-                                    print img_picto($langs->trans("Default"), 'on');
-                                }
-                                else {
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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->BANKADDON_PDF == $name) {
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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("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("Discounts").': '.yn($module->option_escompte,1,1);
-                                // $htmltooltip.='<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1);
-                                //$htmltooltip .= '<br>' . $langs->trans("WatermarkOnDraftOrders") . ': ' . yn($module->option_draft_watermark, 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("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("Discounts").': '.yn($module->option_escompte,1,1);
+								// $htmltooltip.='<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,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>';
+								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>';
 //}
@@ -442,40 +423,38 @@ print $langs->trans('BankColorizeMovementDesc');
 print "</td>";
 // Active
 if ($conf->global->BANK_COLORIZE_MOVEMENT) {
-    print '<td class="center">'."\n";
-    print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetbankcolorizemovement">';
-    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=setbankcolorizemovement">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-    print "</td>";
+	print '<td class="center">'."\n";
+	print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetbankcolorizemovement&amp;token='.newToken().'">';
+	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=setbankcolorizemovement&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print "</td>";
 }
 
 print "</tr>\n";
 
 if (!empty($conf->global->BANK_COLORIZE_MOVEMENT))
 {
-    $i = 1;
-    while ($i <= 2)
-    {
-        $key = $i;
-        $color = 'BANK_COLORIZE_MOVEMENT_COLOR'.$key;
+	$i = 1;
+	while ($i <= 2)
+	{
+		$key = $i;
+		$color = 'BANK_COLORIZE_MOVEMENT_COLOR'.$key;
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        // Label
-        print '<td colspan="4" width="180" class="nowrap">'.$langs->trans("BankColorizeMovementName".$key)."</td>";
-        // Color
-        print '<td class="nowrap right">';
-        print $formother->selectColor((GETPOST("BANK_COLORIZE_MOVEMENT_COLOR".$key) ?GETPOST("BANK_COLORIZE_MOVEMENT_COLOR".$key) : $conf->global->$color), "BANK_COLORIZE_MOVEMENT_COLOR".$key, 'bankmovementcolorconfig', 1, '', 'right hideifnotset');
-        print '</td>';
-        print "</tr>";
-        $i++;
-    }
+		// Label
+		print '<td colspan="4" width="180" class="nowrap">'.$langs->trans("BankColorizeMovementName".$key)."</td>";
+		// Color
+		print '<td class="nowrap right">';
+		print $formother->selectColor((GETPOST("BANK_COLORIZE_MOVEMENT_COLOR".$key) ?GETPOST("BANK_COLORIZE_MOVEMENT_COLOR".$key) : $conf->global->$color), "BANK_COLORIZE_MOVEMENT_COLOR".$key, 'bankmovementcolorconfig', 1, '', 'right hideifnotset');
+		print '</td>';
+		print "</tr>";
+		$i++;
+	}
 }
 print '</table>';
 
@@ -503,17 +482,15 @@ print $langs->trans('AutoReportLastAccountStatement');
 print '</td>';
 // Active
 if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
-    print '<td class="center">'."\n";
-    print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetreportlastnumreleve">';
-    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=setreportlastnumreleve">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-    print "</td>";
+	print '<td class="center">'."\n";
+	print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetreportlastnumreleve&amp;token='.newToken().'">';
+	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=setreportlastnumreleve">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print "</td>";
 }
 
 print "</tr>\n";
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index 940e0a7313e..312da228f50 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'bank_account'; //Must be the $element of the class that manage extrafield
 
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index e577942ab21..529e3289a31 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -33,7 +33,7 @@ $langs->load("admin");
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -50,8 +50,7 @@ if ($action == 'setbarcodeproducton')
 	{
 	    $res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
 	}
-}
-elseif ($action == 'setbarcodeproductoff')
+} elseif ($action == 'setbarcodeproductoff')
 {
 	$res = dolibarr_del_const($db, "BARCODE_PRODUCT_ADDON_NUM", $conf->entity);
 }
@@ -59,16 +58,15 @@ elseif ($action == 'setbarcodeproductoff')
 if ($action == 'setcoder')
 {
 	$coder = GETPOST('coder', 'alpha');
-	$code_id = GETPOST('code_id', 'alpha');
+	$code_id = GETPOST('code_id', 'int');
 	$sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
-	$sqlp .= " SET coder = '".$coder."'";
-	$sqlp .= " WHERE rowid = ".$code_id;
+	$sqlp .= " SET coder = '".$db->escape($coder)."'";
+	$sqlp .= " WHERE rowid = ".((int) $code_id);
 	$sqlp .= " AND entity = ".$conf->entity;
 
 	$resql = $db->query($sqlp);
 	if (!$resql) dol_print_error($db);
-}
-elseif ($action == 'update')
+} elseif ($action == 'update')
 {
 	$location = GETPOST('GENBARCODE_LOCATION', 'alpha');
 	$res = dolibarr_set_const($db, "GENBARCODE_LOCATION", $location, 'chaine', 0, '', $conf->entity);
@@ -80,13 +78,10 @@ elseif ($action == 'update')
 	if ($res > 0)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif ($action == 'updateengine')
+} elseif ($action == 'updateengine')
 {
     $sql = "SELECT rowid, coder";
     $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
@@ -109,8 +104,8 @@ elseif ($action == 'updateengine')
 	            $code_id = $obj->rowid;
 
 	            $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
-	            $sqlp .= " SET coder = '".$coder."'";
-	            $sqlp .= " WHERE rowid = ".$code_id;
+	            $sqlp .= " SET coder = '".$db->escape($coder)."'";
+	            $sqlp .= " WHERE rowid = ".((int) $code_id);
 	            $sqlp .= " AND entity = ".$conf->entity;
 
 	            $upsql = $db->query($sqlp);
@@ -264,20 +259,14 @@ if ($resql)
 						$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;
 						print '<img src="'.$url.'" title="'.$obj->example.'" border="0">';
-					}
-					else
-					{
+					} else {
 						print $langs->trans("FormatNotSupportedByGenerator");
 					}
-				}
-				else
-				{
+				} else {
 					print 'ErrorClassNotFoundInModule '.$classname.' '.$obj->coder;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ChooseABarCode");
 		}
 		print '</td>';
@@ -392,8 +381,7 @@ if ($conf->product->enabled)
 
 	    		    try {
 	        			dol_include_once($dirroot.$file.'.php');
-	    			}
-	    			catch (Exception $e)
+	    			} catch (Exception $e)
 	    			{
 	    			    dol_syslog($e->getMessage(), LOG_ERR);
 	    			}
@@ -408,13 +396,11 @@ if ($conf->product->enabled)
 
 	    			if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file")
 	    			{
-	    				print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodeproductoff&amp;value='.$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=setbarcodeproducton&amp;value='.$file.'">';
+	    			} 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>';
 	    			}
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 6d37def3187..3f331286aa2 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array('admin', 'errors', 'mrp', 'other'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -55,16 +55,12 @@ if ($action == 'updateMask')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
-elseif ($action == 'specimen')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -76,7 +72,7 @@ elseif ($action == 'specimen')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/bom/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/bom/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -95,15 +91,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bom&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -113,14 +105,12 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->BOM_ADDON_PDF == "$value") dolibarr_del_const($db, 'BOM_ADDON_PDF', $conf->entity);
+		if ($conf->global->BOM_ADDON_PDF == "$value") dolibarr_del_const($db, 'BOM_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -140,17 +130,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "BOM_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_BOM_DRAFT_WATERMARK')
+} elseif ($action == 'set_BOM_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("BOM_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "BOM_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -158,31 +144,25 @@ elseif ($action == 'set_BOM_DRAFT_WATERMARK')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
-elseif ($action == 'set_BOM_FREE_TEXT')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'set_BOM_FREE_TEXT')
 {
-	$freetext = GETPOST("BOM_FREE_TEXT", 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST("BOM_FREE_TEXT", 'restricthtml'); // No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "BOM_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -231,7 +211,7 @@ foreach ($dirmodels as $reldir)
 		{
 			while (($file = readdir($handle)) !== false)
 			{
-			    if (substr($file, 0, 8) == 'mod_bom_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
+				if (substr($file, 0, 8) == 'mod_bom_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
 				{
 					$file = substr($file, 0, dol_strlen($file) - 4);
 
@@ -249,22 +229,20 @@ 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->BOM_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -278,16 +256,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$bom->type = 0;
 						$nextval = $module->getNextValue($mysoc, $bom);
-                        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);
@@ -314,7 +292,7 @@ print load_fiche_titre($langs->trans("BOMsModelModule"), '', '');
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -327,9 +305,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -348,114 +324,108 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/bom".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/bom".$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&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&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 class="reposition" 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 class="center">'."\n";
+									print '<a class="reposition" 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->BOM_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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->BOM_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftBOMs").': '.yn($module->option_draft_watermark, 1, 1);
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftBOMs").': '.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>';
@@ -487,13 +457,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnBOMs"), $langs->trans("
 $variablename = 'BOM_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    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();
+	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();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/bom_extrafields.php b/htdocs/admin/bom_extrafields.php
index 70d7720e994..7ec50d9d7db 100644
--- a/htdocs/admin/bom_extrafields.php
+++ b/htdocs/admin/bom_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'bom_bom';
 
@@ -68,7 +68,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup');
 
 
-$head = bomAdminPrepareHead(null);
+$head = bomAdminPrepareHead();
 
 dol_fiche_head($head, 'bom_extrafields', $langs->trans("ExtraFields"), -1, 'account');
 
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 7f222547deb..31723888e44 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array('admin', 'boxes', 'accountancy'));
 if (!$user->admin) accessforbidden();
 
 $rowid = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 // Define possible position of boxes
@@ -48,104 +48,99 @@ $boxes = array();
 
 if ($action == 'addconst')
 {
-    dolibarr_set_const($db, "MAIN_BOXES_MAXLINES", $_POST["MAIN_BOXES_MAXLINES"], '', 0, '', $conf->entity);
-    dolibarr_set_const($db, "MAIN_ACTIVATE_FILECACHE", $_POST["MAIN_ACTIVATE_FILECACHE"], 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_BOXES_MAXLINES", $_POST["MAIN_BOXES_MAXLINES"], '', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_ACTIVATE_FILECACHE", $_POST["MAIN_ACTIVATE_FILECACHE"], 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'add') {
-    $error = 0;
-    $db->begin();
-    if (isset($_POST['boxid']) && is_array($_POST['boxid']))
-    {
-        foreach ($_POST['boxid'] as $boxid)
-        {
-            if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0)	// 0=Home, 1=...
-            {
-                $pos = $boxid['pos'];
+	$error = 0;
+	$db->begin();
+	if (isset($_POST['boxid']) && is_array($_POST['boxid']))
+	{
+		foreach ($_POST['boxid'] as $boxid)
+		{
+			if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0)	// 0=Home, 1=...
+			{
+				$pos = $boxid['pos'];
 
-                // Initialize distinct fk_user with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
-                $distinctfkuser = array();
-                if (!$error)
-                {
-                    $sql = "SELECT fk_user";
-                    $sql .= " FROM ".MAIN_DB_PREFIX."user_param";
-                    $sql .= " WHERE param = 'MAIN_BOXES_".$db->escape($pos)."' AND value = '1'";
-                    $sql .= " AND entity = ".$conf->entity;
-                    dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG);
-                    $resql = $db->query($sql);
-                    if ($resql)
-                    {
-                        $num = $db->num_rows($resql);
-                        $i = 0;
-                        while ($i < $num)
-                        {
-                            $obj = $db->fetch_object($resql);
-                            $distinctfkuser[$obj->fk_user] = $obj->fk_user;
-                            $i++;
-                        }
-                    }
-                    else
-                    {
-                        setEventMessages($db->lasterror(), null, 'errors');
-                        $error++;
-                    }
-                }
+				// Initialize distinct fk_user with all already existing values of fk_user (user that use a personalized view of boxes for page "pos")
+				$distinctfkuser = array();
+				if (!$error)
+				{
+					$sql = "SELECT fk_user";
+					$sql .= " FROM ".MAIN_DB_PREFIX."user_param";
+					$sql .= " WHERE param = 'MAIN_BOXES_".$db->escape($pos)."' AND value = '1'";
+					$sql .= " AND entity = ".$conf->entity;
+					dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG);
+					$resql = $db->query($sql);
+					if ($resql)
+					{
+						$num = $db->num_rows($resql);
+						$i = 0;
+						while ($i < $num)
+						{
+							$obj = $db->fetch_object($resql);
+							$distinctfkuser[$obj->fk_user] = $obj->fk_user;
+							$i++;
+						}
+					} else {
+						setEventMessages($db->lasterror(), null, 'errors');
+						$error++;
+					}
+				}
 
-                $distinctfkuser['0'] = '0'; // Add entry for fk_user = 0. We must use string as key and val
+				$distinctfkuser['0'] = '0'; // Add entry for fk_user = 0. We must use string as key and val
 
-                foreach ($distinctfkuser as $fk_user)
-                {
-                    if (!$error && $fk_user != '')
-                    {
-                    	$arrayofexistingboxid = array();
-                        $nbboxonleft = $nbboxonright = 0;
-                        $sql = "SELECT box_id, box_order FROM ".MAIN_DB_PREFIX."boxes";
-                        $sql .= " WHERE position = ".$pos." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
-                        dol_syslog("boxes.php activate box", LOG_DEBUG);
-                        $resql = $db->query($sql);
-                        if ($resql)
-                        {
-                            while ($obj = $db->fetch_object($resql))
-                            {
-                                $boxorder = $obj->box_order;
-                                if (preg_match('/A/', $boxorder)) $nbboxonleft++;
-                                if (preg_match('/B/', $boxorder)) $nbboxonright++;
-                                $arrayofexistingboxid[$obj->box_id] = 1;
-                            }
-                        }
-                        else dol_print_error($db);
+				foreach ($distinctfkuser as $fk_user)
+				{
+					if (!$error && $fk_user != '')
+					{
+						$arrayofexistingboxid = array();
+						$nbboxonleft = $nbboxonright = 0;
+						$sql = "SELECT box_id, box_order FROM ".MAIN_DB_PREFIX."boxes";
+						$sql .= " WHERE position = ".$pos." AND fk_user = ".$fk_user." AND entity = ".$conf->entity;
+						dol_syslog("boxes.php activate box", LOG_DEBUG);
+						$resql = $db->query($sql);
+						if ($resql)
+						{
+							while ($obj = $db->fetch_object($resql))
+							{
+								$boxorder = $obj->box_order;
+								if (preg_match('/A/', $boxorder)) $nbboxonleft++;
+								if (preg_match('/B/', $boxorder)) $nbboxonright++;
+								$arrayofexistingboxid[$obj->box_id] = 1;
+							}
+						} else dol_print_error($db);
 
-                        if (empty($arrayofexistingboxid[$boxid['value']])) {
-	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
-	                        $sql .= "box_id, position, box_order, fk_user, entity";
-	                        $sql .= ") values (";
-	                        $sql .= $boxid['value'].", ".$pos.", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
-	                        $sql .= ")";
+						if (empty($arrayofexistingboxid[$boxid['value']])) {
+							$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (";
+							$sql .= "box_id, position, box_order, fk_user, entity";
+							$sql .= ") values (";
+							$sql .= $boxid['value'].", ".$pos.", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity;
+							$sql .= ")";
 
-	                        dol_syslog("boxes.php activate box", LOG_DEBUG);
-	                        $resql = $db->query($sql);
-	                        if (!$resql)
-	                        {
-	                            setEventMessages($db->lasterror(), null, 'errors');
-	                            $error++;
-	                        }
-                        } else {
-                        	dol_syslog("boxes.php activate box - already exists in database", LOG_DEBUG);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    if (!$error)
-    {
-        $db->commit();
-        $action = '';
-    }
-    else
-    {
-        $db->rollback();
-    }
+							dol_syslog("boxes.php activate box", LOG_DEBUG);
+							$resql = $db->query($sql);
+							if (!$resql)
+							{
+								setEventMessages($db->lasterror(), null, 'errors');
+								$error++;
+							}
+						} else {
+							dol_syslog("boxes.php activate box - already exists in database", LOG_DEBUG);
+						}
+					}
+				}
+			}
+		}
+	}
+	if (!$error)
+	{
+		$db->commit();
+		$action = '';
+	} else {
+		$db->rollback();
+	}
 }
 
 if ($action == 'delete')
@@ -155,23 +150,23 @@ if ($action == 'delete')
 
 	$resql = $db->query($sql);
 	$obj = $db->fetch_object($resql);
-    if (!empty($obj->box_id))
-    {
-	    $db->begin();
+	if (!empty($obj->box_id))
+	{
+		$db->begin();
 
-    	// Remove all personalized setup when a box is activated or disabled (why removing all ? We removed only removed boxes)
-        //	$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
-        //	$sql.= " WHERE param LIKE 'MAIN_BOXES_%'";
-        //	$resql = $db->query($sql);
+		// Remove all personalized setup when a box is activated or disabled (why removing all ? We removed only removed boxes)
+		//	$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
+		//	$sql.= " WHERE param LIKE 'MAIN_BOXES_%'";
+		//	$resql = $db->query($sql);
 
-	    $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-	    $sql .= " WHERE entity = ".$conf->entity;
-    	$sql .= " AND box_id=".$obj->box_id;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
+		$sql .= " WHERE entity = ".$conf->entity;
+		$sql .= " AND box_id=".$obj->box_id;
 
-    	$resql = $db->query($sql);
+		$resql = $db->query($sql);
 
-    	$db->commit();
-    }
+		$db->commit();
+	}
 }
 
 if ($action == 'switch')
@@ -180,29 +175,29 @@ if ($action == 'switch')
 	$db->begin();
 
 	$objfrom = new ModeleBoxes($db);
-	$objfrom->fetch($_GET["switchfrom"]);
+	$objfrom->fetch(GETPOST("switchfrom", 'int'));
 
 	$objto = new ModeleBoxes($db);
-	$objto->fetch($_GET["switchto"]);
+	$objto->fetch(GETPOST('switchto', 'int'));
 
 	$resultupdatefrom = 0;
 	$resultupdateto = 0;
 	if (is_object($objfrom) && is_object($objto))
 	{
-	    $newfirst = $objto->box_order;
+		$newfirst = $objto->box_order;
 		$newsecond = $objfrom->box_order;
-	    if ($newfirst == $newsecond)
-	    {
-	         $newsecondchar = preg_replace('/[0-9]+/', '', $newsecond);
-	         $newsecondnum = preg_replace('/[a-zA-Z]+/', '', $newsecond);
-	         $newsecond = sprintf("%s%02d", $newsecondchar ? $newsecondchar : 'A', $newsecondnum + 1);
-	    }
-		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$newfirst."' WHERE rowid=".$objfrom->rowid;
+		if ($newfirst == $newsecond)
+		{
+			 $newsecondchar = preg_replace('/[0-9]+/', '', $newsecond);
+			 $newsecondnum = preg_replace('/[a-zA-Z]+/', '', $newsecond);
+			 $newsecond = sprintf("%s%02d", $newsecondchar ? $newsecondchar : 'A', $newsecondnum + 1);
+		}
+		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($newfirst)."' WHERE rowid=".((int) $objfrom->rowid);
 		dol_syslog($sql);
 		$resultupdatefrom = $db->query($sql);
 		if (!$resultupdatefrom) { dol_print_error($db); }
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$newsecond."' WHERE rowid=".$objto->rowid;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($newsecond)."' WHERE rowid=".((int) $objto->rowid);
 		dol_syslog($sql);
 		$resultupdateto = $db->query($sql);
 		if (!$resultupdateto) { dol_print_error($db); }
@@ -211,9 +206,7 @@ if ($action == 'switch')
 	if ($resultupdatefrom && $resultupdateto)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -268,14 +261,14 @@ if ($resql)
 		// This occurs just after an insert.
 		if ($decalage)
 		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$decalage."' WHERE rowid=".$obj->rowid;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order='".$db->escape($decalage)."' WHERE rowid=".$obj->rowid;
 			$db->query($sql);
 		}
 	}
 
 	if ($decalage)
 	{
-	    // If we have renumbered, we correct the field box_order
+		// If we have renumbered, we correct the field box_order
 		// This occurs just after an insert.
 		$sql = "SELECT box_order";
 		$sql .= " FROM ".MAIN_DB_PREFIX."boxes";
@@ -293,28 +286,25 @@ if ($resql)
 					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "A0".$record['box_order'];
-						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
+						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
-					}
-					elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "B0".$record['box_order'];
-						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
+						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
 					}
-				}
-				elseif (dol_strlen($record['box_order']) == 2)
+				} elseif (dol_strlen($record['box_order']) == 2)
 				{
 					if (preg_match("/[13579]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "A".$record['box_order'];
-						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
+						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
-					}
-					elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
+					} elseif (preg_match("/[02468]{1}/", substr($record['box_order'], -1)))
 					{
 						$box_order = "B".$record['box_order'];
-						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$box_order."' WHERE entity = ".$conf->entity." AND box_order = '".$record['box_order']."'";
+						$sql = "UPDATE ".MAIN_DB_PREFIX."boxes SET box_order = '".$db->escape($box_order)."' WHERE entity = ".$conf->entity." AND box_order = '".$db->escape($record['box_order'])."'";
 						$resql = $db->query($sql);
 					}
 				}
@@ -349,37 +339,34 @@ print "</tr>\n";
 
 foreach ($boxtoadd as $box)
 {
-    if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
-    {
-        $logo = $box->boximg;
-    }
-    else
-    {
-        $logo = preg_replace("/^object_/i", "", $box->boximg);
-    }
+	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
+	{
+		$logo = $box->boximg;
+	} else {
+		$logo = preg_replace("/^object_/i", "", $box->boximg);
+	}
 
-    print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
-    print '<tr class="oddeven">'."\n";
-    print '<td>'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
-    if (!empty($box->class) && preg_match('/graph_/', $box->class)) print ' ('.$langs->trans("Graph").')';
-    print '</td>'."\n";
-    print '<td>';
-    if ($box->note == '(WarningUsingThisBoxSlowDown)')
-    {
-    	$langs->load("errors");
-    	print $langs->trans("WarningUsingThisBoxSlowDown");
-    }
-	else print ($box->note ? $box->note : '&nbsp;');
-    print '</td>'."\n";
-    print '<td>'.$box->sourcefile.'</td>'."\n";
+	print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
+	print '<tr class="oddeven">'."\n";
+	print '<td>'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
+	if (!empty($box->class) && preg_match('/graph_/', $box->class)) print ' ('.$langs->trans("Graph").')';
+	print '</td>'."\n";
+	print '<td>';
+	if ($box->note == '(WarningUsingThisBoxSlowDown)')
+	{
+		$langs->load("errors");
+		print $langs->trans("WarningUsingThisBoxSlowDown");
+	} else print ($box->note ? $box->note : '&nbsp;');
+	print '</td>'."\n";
+	print '<td>'.$box->sourcefile.'</td>'."\n";
 
-    // For each possible position, an activation link is displayed if the box is not already active for that position
-    print '<td class="center">';
-    print $form->selectarray("boxid[".$box->box_id."][pos]", $pos_name, -1, 1, 0, 0, '', 1)."\n";
-    print '<input type="hidden" name="boxid['.$box->box_id.'][value]" value="'.$box->box_id.'">'."\n";
-    print '</td>';
+	// For each possible position, an activation link is displayed if the box is not already active for that position
+	print '<td class="center">';
+	print $form->selectarray("boxid[".$box->box_id."][pos]", $pos_name, -1, 1, 0, 0, '', 1)."\n";
+	print '<input type="hidden" name="boxid['.$box->box_id.'][value]" value="'.$box->box_id.'">'."\n";
+	print '</td>';
 
-    print '</tr>'."\n";
+	print '</tr>'."\n";
 }
 if (!count($boxtoadd) && count($boxactivated))
 {
@@ -417,13 +404,11 @@ foreach ($boxactivated as $key => $box)
 	if (preg_match('/^([^@]+)@([^@]+)$/i', $box->boximg))
 	{
 		$logo = $box->boximg;
-	}
-	else
-	{
+	} else {
 		$logo = preg_replace("/^object_/i", "", $box->boximg);
 	}
 
-    print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
+	print "\n".'<!-- Box '.$box->boxcode.' -->'."\n";
 	print '<tr class="oddeven">';
 	print '<td>'.img_object("", $logo, 'height="14px"').' '.$langs->transnoentitiesnoconv($box->boxlabel);
 	if (!empty($box->class) && preg_match('/graph_/', $box->class)) print ' ('.$langs->trans("Graph").')';
@@ -433,8 +418,7 @@ foreach ($boxactivated as $key => $box)
 	{
 		$langs->load("errors");
 		print img_warning('', 0).' '.$langs->trans("WarningUsingThisBoxSlowDown");
-	}
-	else print ($box->note ? $box->note : '&nbsp;');
+	} else print ($box->note ? $box->note : '&nbsp;');
 	print '</td>';
 	print '<td class="center">'.(empty($pos_name[$box->position]) ? '' : $langs->trans($pos_name[$box->position])).'</td>';
 	$hasnext = ($key < (count($boxactivated) - 1));
@@ -445,7 +429,7 @@ foreach ($boxactivated as $key => $box)
 	print ($hasprevious ? '<a href="boxes.php?action=switch&amp;switchfrom='.$box->rowid.'&amp;switchto='.$boxactivated[$key - 1]->rowid.'">'.img_up().'</a>' : '');
 	print '</td>';
 	print '<td class="center">';
-	print '<a href="boxes.php?rowid='.$box->rowid.'&amp;action=delete">'.img_delete().'</a>';
+	print '<a href="boxes.php?rowid='.$box->rowid.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
 	print '</td>';
 
 	print '</tr>'."\n";
@@ -481,10 +465,10 @@ print '</tr>';
 
 // Activate FileCache - Developement
 if ($conf->global->MAIN_FEATURES_LEVEL == 2 || !empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-    print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
-    print $form->selectyesno('MAIN_ACTIVATE_FILECACHE', $conf->global->MAIN_ACTIVATE_FILECACHE, 1);
-    print '</td>';
-    print '</tr>';
+	print '<tr class="oddeven"><td width="35%">'.$langs->trans("EnableFileCache").'</td><td>';
+	print $form->selectyesno('MAIN_ACTIVATE_FILECACHE', $conf->global->MAIN_ACTIVATE_FILECACHE, 1);
+	print '</td>';
+	print '</tr>';
 }
 
 print '</table>';
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 8b5e7c433bf..6de752518c0 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("admin", "companies", "bills", "other", "banks"));
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 
 
@@ -60,9 +60,7 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -74,7 +72,7 @@ if ($action == 'setmod')
 
 if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
 {
-	$freetext = GETPOST('BANK_CHEQUERECEIPT_FREE_TEXT', 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST('BANK_CHEQUERECEIPT_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "BANK_CHEQUERECEIPT_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
@@ -83,9 +81,7 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -181,10 +177,8 @@ foreach ($dirmodels as $reldir)
 							if ($conf->global->CHEQUERECEIPTS_ADDON == $file || $conf->global->CHEQUERECEIPTS_ADDON.'.php' == $file)
 							{
 								print img_picto($langs->trans("Activated"), 'switch_on');
-							}
-							else
-							{
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&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>';
+							} else {
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&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>';
 
@@ -259,9 +253,7 @@ $variablename = 'BANK_CHEQUERECEIPT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
 	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-}
-else
-{
+} else {
 	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/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 13efb42af1a..5fa7b78ca8b 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -50,9 +50,7 @@ if ($action == 'setvalue' && $user->admin)
     if ($result1 >= 0 && $result2 >= 0)
     {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -141,9 +139,7 @@ if (!empty($conf->global->CLICKTODIAL_URL))
 	if ($setupcomplete)
 	{
 		print $langs->trans("LinkToTest", $user->login).': '.dol_print_phone($phonefortest, '', 0, 0, 'AC_TEL');
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		print '<div class="warning">'.$langs->trans("WarningClickToDialUserSetupNotComplete").'</div>';
 	}
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 76f04d94c15..b920d9e6f9e 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -41,7 +41,7 @@ $langs->loadLangs(array('admin', 'errors', 'orders', 'other'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -64,16 +64,12 @@ if ($action == 'updateMask')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
-elseif ($action == 'specimen')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -85,7 +81,7 @@ elseif ($action == 'specimen')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/commande/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/commande/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -104,15 +100,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -122,14 +114,12 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->COMMANDE_ADDON_PDF == "$value") dolibarr_del_const($db, 'COMMANDE_ADDON_PDF', $conf->entity);
+		if ($conf->global->COMMANDE_ADDON_PDF == "$value") dolibarr_del_const($db, 'COMMANDE_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -149,17 +139,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "COMMANDE_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
+} elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("COMMANDE_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "COMMANDE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -167,44 +153,36 @@ elseif ($action == 'set_COMMANDE_DRAFT_WATERMARK')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
-elseif ($action == 'set_ORDER_FREE_TEXT')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'set_ORDER_FREE_TEXT')
 {
-	$freetext = GETPOST("ORDER_FREE_TEXT", 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST("ORDER_FREE_TEXT", 'restricthtml'); // No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "ORDER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-elseif ($action == "setshippableiconinlist") {
-    // Activate Set Shippable Icon In List
-    $setshippableiconinlist = GETPOST('value', 'int');
-    $res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist, 'yesno', 0, '', $conf->entity);
-    if (!$res > 0) $error++;
-    if (!$error) {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    } else {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-elseif ($action == 'setribchq')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == "setshippableiconinlist") {
+	// Activate Set Shippable Icon In List
+	$setshippableiconinlist = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "SHIPPABLE_ORDER_ICON_IN_LIST", $setshippableiconinlist, 'yesno', 0, '', $conf->entity);
+	if (!$res > 0) $error++;
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'setribchq')
 {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
@@ -217,9 +195,7 @@ elseif ($action == 'setribchq')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -227,35 +203,31 @@ elseif ($action == 'setribchq')
 // Activate ask for payment bank
 elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_ORDER')
 {
-    $res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_ORDER", $value, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "BANK_ASK_PAYMENT_BANK_DURING_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');
+	}
 }
 
 // Activate ask for warehouse
 elseif ($action == 'set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER')
 {
-    $res = dolibarr_set_const($db, "WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER", $value, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "WAREHOUSE_ASK_WAREHOUSE_DURING_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');
+	}
 }
 
 
@@ -322,22 +294,20 @@ 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->COMMANDE_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+						} else {
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -351,16 +321,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$commande->type = 0;
 						$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>';
-                            }
-                        }
+						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);
@@ -387,7 +357,7 @@ print load_fiche_titre($langs->trans("OrdersModelModule"), '', '');
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -400,9 +370,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -421,119 +389,113 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/commande".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/commande".$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&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&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 class="reposition" 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 class="reposition" 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->COMMANDE_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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->COMMANDE_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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>'.$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("Discounts").': '.yn($module->option_escompte,1,1);
-					    		//$htmltooltip .= '<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1);
-					    		$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
+								$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("Discounts").': '.yn($module->option_escompte,1,1);
+								//$htmltooltip .= '<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,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>';
+								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>';
@@ -594,19 +556,14 @@ if (empty($conf->facture->enabled))
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
 			}
 		}
-	}
-	else
-	{
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("BankModuleNotActive").'</span>';
 	}
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -643,8 +600,7 @@ if (empty($conf->facture->enabled))
 		}
 	}
 	print "</select>";
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -680,13 +636,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans
 $variablename = '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>';
-}
-else
-{
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
+	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();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
@@ -716,10 +670,10 @@ print '<td>'.$langs->trans("ShippableOrderIconInList").'</td>';
 print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
-    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&value=0">';
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&amp;token='.newToken().'&amp;value=0">';
     print img_picto($langs->trans("Activated"),'switch_on');
 } else {
-    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&value=1">';
+    print '<a href="'.$_SERVER['PHP_SELF'].'?action=setshippableiconinlist&amp;token='.newToken().'&amp;value=1">';
     print img_picto($langs->trans("Disabled"),'switch_off');
 }
 print '</a></td>';
@@ -741,11 +695,11 @@ if ($conf->banque->enabled)
     {
         if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER))
         {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&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_ORDER&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_ORDER&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
         }
     }
     print '</td></tr>';
@@ -771,11 +725,11 @@ if ($conf->stock->enabled)
     {
         if (empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER))
         {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER&amp;token='.newToken().'&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
         }
         else
         {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
         }
     }
     print '</td></tr>';
diff --git a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
index 8d5925e363d..e1ec33c02d4 100644
--- a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
+++ b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
@@ -50,7 +50,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->trans($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'commande_fournisseur_dispatch'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 00bd17e865f..7ab04adf923 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -84,9 +84,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 		$s = $mysoc->state_id.':'.$mysoc->state_code.':'.$mysoc->state_label;
 		dolibarr_set_const($db, "MAIN_INFO_SOCIETE_STATE", $s, 'chaine', 0, '', $conf->entity);
-	}
-	else
-	{
+	} else {
 		dolibarr_del_const($db, "MAIN_INFO_SOCIETE_STATE", $conf->entity);
 	}
 
@@ -102,7 +100,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FAX", GETPOST("fax", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MAIL", GETPOST("mail", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_WEB", GETPOST("web", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE", GETPOST("note", 'none'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOTE", GETPOST("note", 'restricthtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_GENCOD", GETPOST("barcode", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
 	$dirforimage = $conf->mycompany->dir_output.'/logos/';
@@ -111,7 +109,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	foreach ($arrayofimages as $varforimage)
 	{
-		if ($_FILES[$varforimage]["name"] && ! preg_match('/(\.jpeg|\.jpg|\.png)$/i', $_FILES[$varforimage]["name"])) {	// Logo can be used on a lot of different places. Only jpg and png can be supported.
+		if ($_FILES[$varforimage]["name"] && !preg_match('/(\.jpeg|\.jpg|\.png)$/i', $_FILES[$varforimage]["name"])) {	// Logo can be used on a lot of different places. Only jpg and png can be supported.
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 			break;
@@ -152,8 +150,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 							{
 								$imgThumbSmall = $reg[1]; // Save only basename
 								dolibarr_set_const($db, $constant."_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
-							}
-							else dol_syslog($imgThumbSmall);
+							} else dol_syslog($imgThumbSmall);
 
 							// Create mini thumb, Used on menu or for setup page for example
 							$imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
@@ -161,24 +158,18 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 							{
 								$imgThumbMini = $reg[1]; // Save only basename
 								dolibarr_set_const($db, $constant."_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
-							}
-							else dol_syslog($imgThumbMini);
-						}
-						else dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
+							} else dol_syslog($imgThumbMini);
+						} else dol_syslog("ErrorImageFormatNotSupported", LOG_WARNING);
 					} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result)) {
 						$error++;
 						$langs->load("errors");
 						$tmparray = explode(':', $result);
 						setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
-					}
-					else
-					{
+					} else {
 						$error++;
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -234,9 +225,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		if (!isset($_REQUEST['lt1']))
 		{
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", 0, 'chaine', 0, '', $conf->entity);
-		}
-		else
-		{
+		} else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX1", GETPOST('lt1', 'aZ09'), 'chaine', 0, '', $conf->entity);
 		}
 		dolibarr_set_const($db, "MAIN_INFO_LOCALTAX_CALC1", GETPOST("clt1", 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -246,9 +235,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		if (!isset($_REQUEST['lt2']))
 		{
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", 0, 'chaine', 0, '', $conf->entity);
-		}
-		else
-		{
+		} else {
 			dolibarr_set_const($db, "MAIN_INFO_VALUE_LOCALTAX2", GETPOST('lt2', 'aZ09'), 'chaine', 0, '', $conf->entity);
 		}
 		dolibarr_set_const($db, "MAIN_INFO_LOCALTAX_CALC2", GETPOST("clt2", 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -257,9 +244,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 
@@ -293,8 +278,7 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 			{
 				$imgThumbSmall = $reg[1]; // Save only basename
 				dolibarr_set_const($db, $constant."_SMALL", $imgThumbSmall, 'chaine', 0, '', $conf->entity);
-			}
-			else dol_syslog($imgThumbSmall);
+			} else dol_syslog($imgThumbSmall);
 
 			// Create mini thumbs. Used on menu or for setup page for example
 			$imgThumbMini = vignette($conf->mycompany->dir_output.'/logos/'.$_GET["file"], $maxwidthmini, $maxheightmini, '_mini', $quality);
@@ -302,22 +286,17 @@ if ($action == 'addthumb' || $action == 'addthumbsquarred')  // Regenerate thumb
 			{
 				$imgThumbMini = $reg[1]; // Save only basename
 				dolibarr_set_const($db, $constant."_MINI", $imgThumbMini, 'chaine', 0, '', $conf->entity);
-			}
-			else dol_syslog($imgThumbMini);
+			} else dol_syslog($imgThumbMini);
 
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else
-		{
+		} else {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
 			dol_syslog($langs->transnoentities("ErrorBadImageFormat"), LOG_INFO);
 		}
-	}
-	else
-	{
+	} else {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFileDoesNotExists", $_GET["file"]), null, 'errors');
@@ -493,22 +472,22 @@ print '<tr class="oddeven"><td><label for="logo">'.$form->textwithpicto($langs->
 print '<div class="centpertent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">';
 print '<input type="file" class="flat minwidth200" name="logo" id="logo" accept="image/*">';
 print '</div>';
-if (!empty($mysoc->logo_mini)) {
-	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
+if (!empty($mysoc->logo_small)) {
+	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
 		print '</div>';
 	}
 	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 } elseif (!empty($mysoc->logo)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 60px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo).'">';
 		print '</div>';
 		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 	} else {
 		print '<div class="inline-block valignmiddle">';
-		print '<img height="60" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
 		print '</div>';
 	}
 }
@@ -520,23 +499,23 @@ print '<tr class="oddeven"><td><label for="logo_squarred">'.$form->textwithpicto
 print '<div class="centpertent nobordernopadding valignmiddle"><div class="inline-block marginrightonly">';
 print '<input type="file" class="flat minwidth200" name="logo_squarred" id="logo_squarred" accept="image/*">';
 print '</div>';
-if (!empty($mysoc->logo_squarred_mini)) {
-	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
+if (!empty($mysoc->logo_squarred_small)) {
+	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_small)) {
 		print '<div class="inline-block valignmiddle marginrightonly">';
-		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_small).'">';
 		print '</div>';
 	}
 	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 } elseif (!empty($mysoc->logo_squarred)) {
 	if (file_exists($conf->mycompany->dir_output.'/logos/'.$mysoc->logo_squarred)) {
 		print '<div class="inline-block valignmiddle">';
-		print '<img style="max-height: 60px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo_squarred).'">';
+		print '<img style="max-height: 80px" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo_squarred).'">';
 		print '</div>';
 		print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete"), '', 'marginleftonly').'</a></div>';
 	}
 	else {
 		print '<div class="inline-block valignmiddle">';
-		print '<img height="60" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+		print '<img height="80" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
 		print '</div>';
 	}
 }
@@ -545,7 +524,7 @@ print '</td></tr>';
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
-print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_SOCIETE_NOTE).'</textarea></td></tr>';
+print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : $conf->global->MAIN_INFO_SOCIETE_NOTE).'</textarea></td></tr>';
 print '</td></tr>';
 
 print '</table>';
@@ -579,7 +558,7 @@ $langs->load("companies");
 
 // Managing Director(s)
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
 
 // GDPR contact
 print '<tr class="oddeven"><td>';
@@ -589,7 +568,7 @@ print '<input name="MAIN_INFO_GDPR" id="director" class="minwidth500" value="'.d
 
 // Capital
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
-print '<input name="capital" id="capital" class="minwidth100" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_CAPITAL).'"></td></tr>';
+print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_CAPITAL).'"></td></tr>';
 
 // Juridical Status
 print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
@@ -607,9 +586,7 @@ if ($langs->transcountry("ProfId1", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="siren" id="profid1" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIREN) ? $conf->global->MAIN_INFO_SIREN : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -622,9 +599,7 @@ if ($langs->transcountry("ProfId2", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="siret" id="profid2" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -637,9 +612,7 @@ if ($langs->transcountry("ProfId3", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="ape" id="profid3" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_APE) ? $conf->global->MAIN_INFO_APE : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -652,9 +625,7 @@ if ($langs->transcountry("ProfId4", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="rcs" id="profid4" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_RCS) ? $conf->global->MAIN_INFO_RCS : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -667,9 +638,7 @@ if ($langs->transcountry("ProfId5", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="MAIN_INFO_PROFID5" id="profid5" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID5) ? $conf->global->MAIN_INFO_PROFID5 : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -682,9 +651,7 @@ if ($langs->transcountry("ProfId6", $mysoc->country_code) != '-')
 	if (!empty($mysoc->country_code))
 	{
 		print '<input name="MAIN_INFO_PROFID6" id="profid6" class="minwidth200" value="'.dol_escape_htmltag(!empty($conf->global->MAIN_INFO_PROFID6) ? $conf->global->MAIN_INFO_PROFID6 : '').'">';
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 3ccc2a213ac..faf38f44b16 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('admin', 'compta', 'accountancy'));
 if (!$user->admin)
 accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Other parameters ACCOUNTING_*
 $list = array(
@@ -101,9 +101,7 @@ if ($action == 'update')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 8e666c4be93..3f1eb8d9651 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('admin', 'sendings', 'deliveries'));
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -70,8 +70,7 @@ if ($action == 'activate_delivery')
 	dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1", 'chaine', 0, '', $conf->entity);
 	header("Location: confexped.php");
 	exit;
-}
-elseif ($action == 'disable_delivery')
+} elseif ($action == 'disable_delivery')
 {
 	dolibarr_del_const($db, "MAIN_SUBMODULE_LIVRAISON", $conf->entity);
 	header("Location: confexped.php");
@@ -135,9 +134,7 @@ print '<td class="center">';
 if (empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
 {
 	print '<a href="confexped.php?action=activate_delivery">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-}
-else
-{
+} else {
 	print '<a href="confexped.php?action=disable_delivery">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index bc22a2020fb..4aacdb3cfc2 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -35,19 +35,19 @@ if (!$user->admin)
 
 $rowid = GETPOST('rowid', 'int');
 $entity = GETPOST('entity', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $update = GETPOST('update', 'alpha');
 $delete = GETPOST('delete', 'none'); // Do not use alpha here
 $debug = GETPOST('debug', 'int');
 $consts = GETPOST('const', 'array');
 $constname = GETPOST('constname', 'alphanohtml');
-$constvalue = GETPOST('constvalue', 'none'); // We shoul dbe able to send everything here
+$constvalue = GETPOST('constvalue', 'restricthtml'); // We should be able to send everything here
 $constnote = GETPOST('constnote', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -85,9 +85,7 @@ if ($action == 'add' || (GETPOST('add') && $action != 'update'))
 			$constname = "";
 			$constvalue = "";
 			$constnote = "";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -104,9 +102,7 @@ if (!empty($consts) && $action == 'update')
 			if (dolibarr_set_const($db, $const["name"], $const["value"], $const["type"], 1, $const["note"], $const["entity"]) >= 0)
 			{
 				$nbmodified++;
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -126,9 +122,7 @@ if (!empty($consts) && $action == 'delete')
 			if (dolibarr_del_const($db, $const["rowid"], -1) >= 0)
 			{
 				$nbdeleted++;
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -143,9 +137,7 @@ if ($action == 'delete')
 	if (dolibarr_del_const($db, $rowid, $entity) >= 0)
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -215,10 +207,13 @@ print "</tr>\n";
 // Line to add new record
 print "\n";
 
-print '<tr class="oddeven nohover"><td><input type="text" class="flat minwidth100" name="constname" value="'.$constname.'"></td>'."\n";
+print '<tr class="oddeven nohover"><td>';
+print '<input type="text" class="flat minwidth300" name="constname" value="'.$constname.'">';
+print '</td>'."\n";
 print '<td>';
 print '<input type="text" class="flat minwidth100" name="constvalue" value="'.$constvalue.'">';
-print '</td><td>';
+print '</td>';
+print '<td>';
 print '<input type="text" class="flat minwidth100" name="constnote" value="'.$constnote.'">';
 print '</td>';
 print '<td>';
@@ -230,9 +225,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
 	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
 	print '<td class="center">';
-}
-else
-{
+} else {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 }
@@ -297,9 +290,7 @@ if ($result)
 			print '<input type="text" class="flat" size="1" name="const['.$i.'][entity]" value="'.$obj->entity.'">';
 			print '</td>';
 			print '<td class="center">';
-		}
-		else
-		{
+		} else {
 			print '<td class="center">';
 			print '<input type="hidden" name="const['.$i.'][entity]" value="'.$obj->entity.'">';
 		}
@@ -307,10 +298,8 @@ if ($result)
 		if ($conf->use_javascript_ajax)
 		{
 			print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
-		}
-		else
-		{
-			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 		}
 
 		print "</td></tr>\n";
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ae0c9c89b38..e8440963f9f 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array("admin", "errors", "contracts"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -41,7 +41,7 @@ $type = 'contract';
 
 if (empty($conf->global->CONTRACT_ADDON))
 {
-    $conf->global->CONTRACT_ADDON = 'mod_contract_serpis';
+	$conf->global->CONTRACT_ADDON = 'mod_contract_serpis';
 }
 
 
@@ -53,23 +53,19 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask')
 {
-    $maskconst = GETPOST('maskconstcontract', 'alpha');
-    $maskvalue = GETPOST('maskcontract', 'alpha');
-    if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+	$maskconst = GETPOST('maskconstcontract', 'alpha');
+	$maskvalue = GETPOST('maskcontract', 'alpha');
+	if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, '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');
-    }
-}
-
-elseif ($action == 'specimen') // For contract
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen') // For contract
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -81,7 +77,7 @@ elseif ($action == 'specimen') // For contract
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/contract/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/contract/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -100,15 +96,11 @@ elseif ($action == 'specimen') // For contract
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=contract&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -118,14 +110,12 @@ elseif ($action == 'specimen') // For contract
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->CONTRACT_ADDON_PDF == "$value") dolibarr_del_const($db, 'CONTRACT_ADDON_PDF', $conf->entity);
+		if ($conf->global->CONTRACT_ADDON_PDF == "$value") dolibarr_del_const($db, 'CONTRACT_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -145,34 +135,31 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "CONTRACT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_other')
+} elseif ($action == 'set_other')
 {
-	$freetext = GETPOST('CONTRACT_FREE_TEXT', 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST('CONTRACT_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "CONTRACT_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
 	$draft = GETPOST('CONTRACT_DRAFT_WATERMARK', 'alpha');
 	$res2 = dolibarr_set_const($db, "CONTRACT_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res1 > 0 || !$res2 > 0) $error++;
+	$value = GETPOST('activate_hideClosedServiceByDefault', 'alpha');
+	$res3 = dolibarr_set_const($db, "CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT", $value, 'chaine', 0, '', $conf->entity);
+
+	if (!$res1 > 0 || !$res2 > 0 || !$res3 > 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');
+	}
 }
 
 
@@ -242,8 +229,7 @@ foreach ($dirmodels as $reldir)
 						// 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);
+						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";
 
@@ -251,10 +237,8 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->CONTRACT_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -267,16 +251,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($mysoc, $contract);
-                        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);
@@ -303,7 +287,7 @@ print load_fiche_titre($langs->trans("TemplatePDFContracts"), '', '');
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -316,9 +300,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -337,117 +319,111 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/contract".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/contract".$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&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&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 class="reposition" 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 class="reposition" 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->CONTRACT_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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->CONTRACT_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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>'.$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);
+								$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>';
+								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>';
@@ -481,13 +457,11 @@ print '<br>';
 $variablename = 'CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    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();
+	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();
 }
 print '</td></tr>'."\n";
 
@@ -499,6 +473,13 @@ print '</td><td>';
 print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
 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 '</td>';
+print '</tr>';
+
 print '</table>';
 
 print '<div class="center">';
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index bb7e82901f5..0438d5759ad 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -32,7 +32,7 @@ if (!$user->admin)
     accessforbidden();
 
 // Parameters
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 
@@ -96,13 +96,10 @@ if ($action == 'edit')
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
 		    print $langs->trans("AlwaysActive");
-		}
-		elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
+		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print $form->selectyesno($key, $conf->global->$key, 1);
-		}
-		else
-		{
+		} else {
 			print '<input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'">';
 		}
 		print '</td></tr>';
@@ -116,9 +113,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else
-{
+} else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
@@ -136,13 +131,10 @@ else
 		if ($key == 'DAV_ALLOW_PRIVATE_DIR')
 		{
 		    print $langs->trans("AlwaysActive");
-		}
-		elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
+		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR')
 		{
 			print yn($conf->global->$key);
-		}
-		else
-		{
+		} else {
 			print $conf->global->$key;
 		}
 		print '</td></tr>';
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 926080cb9b5..88115195328 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -58,9 +58,7 @@ if ($action == 'set')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($error, null, 'errors');
 	}
@@ -78,8 +76,6 @@ $form = new Form($db);
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("DebugBarSetup"), $linkback, 'title_setup');
 
-//print load_fiche_titre($langs->trans("DebugBar"));
-
 if (!function_exists('mb_check_encoding'))
 {
     $langs->load("errors");
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 6e315f4f23c..6e172656930 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('companies', 'products', 'admin', 'sms', 'other', 'error
 if (!$user->admin) accessforbidden();
 
 $id = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $optioncss = GETPOST('optionscss', 'alphanohtml');
 
 $mode = GETPOST('mode', 'aZ09') ?GETPOST('mode', 'aZ09') : 'createform'; // 'createform', 'filters', 'sortorder', 'focus'
@@ -61,7 +61,7 @@ $defaulturl = preg_replace('/^\//', '', $defaulturl);
 
 $urlpage = GETPOST('urlpage', 'alphanohtml');
 $key = GETPOST('key', 'alphanohtml');
-$value = GETPOST('value', 'none');
+$value = GETPOST('value', 'restricthtml');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admindefaultvalues', 'globaladmin'));
@@ -83,17 +83,17 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $defaulturl = '';
-    $defaultkey = '';
-    $defaultvalue = '';
-    $toselect = '';
-    $search_array_options = array();
+	$defaulturl = '';
+	$defaultkey = '';
+	$defaultvalue = '';
+	$toselect = '';
+	$search_array_options = array();
 }
 
 if ($action == 'setMAIN_ENABLE_DEFAULT_VALUES')
 {
-    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
-    else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
+	if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
 }
 
 if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify'))
@@ -102,59 +102,57 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 
 	if (($action == 'add' || (GETPOST('add') && $action != 'update')))
 	{
-    	if (empty($defaulturl))
-    	{
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
-    		$error++;
-    	}
-    	if (empty($defaultkey))
-    	{
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
-    		$error++;
-    	}
+		if (empty($defaulturl))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+			$error++;
+		}
+		if (empty($defaultkey))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+			$error++;
+		}
 	}
 	if (GETPOST('actionmodify'))
 	{
-	    if (empty($urlpage))
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
-	        $error++;
-	    }
-	    if (empty($key))
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
-	        $error++;
-	    }
+		if (empty($urlpage))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+			$error++;
+		}
+		if (empty($key))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+			$error++;
+		}
 	}
 
 	if (!$error)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    if ($action == 'add' || (GETPOST('add') && $action != 'update'))
-	    {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
-	    }
-	    if (GETPOST('actionmodify'))
-	    {
-		    $sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
-		    $sql .= " WHERE rowid = ".$id;
-	    }
+		if ($action == 'add' || (GETPOST('add') && $action != 'update'))
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
+		}
+		if (GETPOST('actionmodify'))
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
+			$sql .= " WHERE rowid = ".$id;
+		}
 
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
-		    $db->commit();
+			$db->commit();
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action = "";
 			$defaulturl = '';
 			$defaultkey = '';
 			$defaultvalue = '';
-		}
-		else
-		{
-	        $db->rollback();
-		    setEventMessages($db->lasterror(), null, 'errors');
+		} else {
+			$db->rollback();
+			setEventMessages($db->lasterror(), null, 'errors');
 			$action = '';
 		}
 	}
@@ -169,9 +167,7 @@ if ($action == 'delete')
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -193,17 +189,15 @@ $param = '&mode='.$mode;
 $enabledisablehtml .= $langs->trans("EnableDefaultValues").' ';
 if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 {
-    // Button off, click to enable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=1'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $enabledisablehtml .= '</a>';
-}
-else
-{
-    // Button on, click to disable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&value=0'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
-    $enabledisablehtml .= '</a>';
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
+} else {
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
 }
 
 print load_fiche_titre($langs->trans("DefaultValues"), $enabledisablehtml, 'title_setup');
@@ -234,7 +228,7 @@ dol_fiche_head($head, $mode, '', -1, '');
 
 if ($mode == 'sortorder')
 {
-    print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
+	print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
 }
 if ($mode == 'mandatory')
 {
@@ -259,34 +253,30 @@ print_liste_field_titre($texturl, $_SERVER["PHP_SELF"], 'page,param', '', $param
 $texthelp = $langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder')
 {
-    $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
-}
-else
-{
-    $texthelp = 'field or alias.field';
-    $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
+	$textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
+} else {
+	$texthelp = 'field or alias.field';
+	$textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 }
 print_liste_field_titre($textkey, $_SERVER["PHP_SELF"], 'param', '', $param, '', $sortfield, $sortorder);
 // Value
 if ($mode != 'focus' && $mode != 'mandatory')
 {
-    if ($mode != 'sortorder')
-    {
-        $substitutionarray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount')); // Must match list into GETPOST
+	if ($mode != 'sortorder')
+	{
+		$substitutionarray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount')); // Must match list into GETPOST
 		unset($substitutionarray['__USER_SIGNATURE__']);
-        $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-        foreach ($substitutionarray as $key => $val)
-        {
-            $texthelp .= $key.' -> '.$val.'<br>';
-        }
-        $textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
-    }
-    else
-    {
-        $texthelp = 'ASC or DESC';
-        $textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
-    }
-    print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
+		$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+		foreach ($substitutionarray as $key => $val)
+		{
+			$texthelp .= $key.' -> '.$val.'<br>';
+		}
+		$textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
+	} else {
+		$texthelp = 'ASC or DESC';
+		$textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
+	}
+	print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 }
 // Entity
 if (!empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,page', '', $param, '', $sortfield, $sortorder);
@@ -311,9 +301,9 @@ print '</td>';
 // Value
 if ($mode != 'focus' && $mode != 'mandatory')
 {
-    print '<td>';
-    print '<input type="text" class="flat maxwidth100onsmartphone" name="defaultvalue" value="">';
-    print '</td>';
+	print '<td>';
+	print '<input type="text" class="flat maxwidth100onsmartphone" name="defaultvalue" value="">';
+	print '</td>';
 }
 // Limit to superadmin
 if (!empty($conf->multicompany->enabled) && !$user->entity)
@@ -321,9 +311,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity)
 	print '<td>';
 	print '<input type="text" class="flat" size="1" disabled name="entity" value="'.$conf->entity.'">'; // We see environment, but to change it we must switch on other entity
 	print '</td>';
-}
-else
-{
+} else {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
@@ -373,34 +361,32 @@ if ($result)
 		// Value
 		if ($mode != 'focus' && $mode != 'mandatory')
 		{
-    		print '<td>';
-    		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
+			print '<td>';
+			/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
     		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
     		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
     		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
     		*/
-    		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print dol_escape_htmltag($obj->value);
-    		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
-    		print '</td>';
+			if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print dol_escape_htmltag($obj->value);
+			else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
+			print '</td>';
 		}
 
-	    print '<td></td>';
+		print '<td></td>';
 
 		// Actions
 		print '<td class="center">';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
 		{
-    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
-    		print ' &nbsp; ';
-    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
-		}
-		else
-		{
-		    print '<input type="hidden" name="page" value="'.$page.'">';
-		    print '<input type="hidden" name="rowid" value="'.$id.'">';
-		    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
-		    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+			print ' &nbsp; ';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+		} else {
+			print '<input type="hidden" name="page" value="'.$page.'">';
+			print '<input type="hidden" name="rowid" value="'.$id.'">';
+			print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
+			print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</td>';
 
@@ -408,10 +394,8 @@ if ($result)
 		print "\n";
 		$i++;
 	}
-}
-else
-{
-    dol_print_error($db);
+} else {
+	dol_print_error($db);
 }
 
 print '</table>';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 3ee262b464a..d6c708c124e 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -32,7 +32,7 @@ $langs->load("admin");
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $modules = array(
 		'agenda' => array(
@@ -48,7 +48,7 @@ $modules = array(
 				),
 				array(
 						'code' => 'MAIN_DELAY_TASKS_TODO',
-						'img' => 'task'
+						'img' => 'projecttask'
 				)
 		),
         'propal' => array(
@@ -107,10 +107,6 @@ $modules = array(
 				array(
 						'code' => 'MAIN_DELAY_MEMBERS',
 						'img' => 'user'
-				),
-        array(
-						'code' => 'MAIN_DELAY_MEMBERS_SHIFT',
-						'img' => 'user'
 				)
 		),
 		'expensereport' => array(
@@ -229,7 +225,7 @@ if ($action == 'edit')
 				$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>';
+    			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>';
     		}
     	}
@@ -249,9 +245,7 @@ if ($action == 'edit')
 	print '</td></tr>';
 
 	print '</table>';
-}
-else
-{
+} else {
     /*
      * Show parameters
      */
@@ -292,148 +286,150 @@ else
 
 print '<br>';
 
-// Show logo for weather
-print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
 
-if ($action == 'edit') {
-	$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
-	$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
-	if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
-	else $str_mode_enabled = $str_mode_percentage;
-	print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
-	print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
+if ($conf->global->MAIN_DISABLE_METEO != 1) {
+	// Show logo for weather
+	print '<span class="opacitymedium">'.$langs->trans("DescWeather").'</span> ';
 
-	print '<br><br>';
-} else {
-	if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
-	else print $langs->trans('MeteoPercentageModEnabled');
-	print '<br><br>';
-}
+	if ($action == 'edit') {
+		$str_mode_std = $langs->trans('MeteoStdModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoPercentageMod'));
+		$str_mode_percentage = $langs->trans('MeteoPercentageModEnabled').' : '.$langs->trans('MeteoUseMod', $langs->transnoentitiesnoconv('MeteoStdMod'));
+		if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $str_mode_enabled = $str_mode_std;
+		else $str_mode_enabled = $str_mode_percentage;
+		print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
+		print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.$conf->global->MAIN_USE_METEO_WITH_PERCENTAGE.'" />';
 
-$offset = 0;
-$cursor = 10; // By default
-//if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
-//if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
-$level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) $level0 = $conf->global->MAIN_METEO_LEVEL0;
-$level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
-$level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
-$level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
-$text = ''; $options = 'class="valignmiddle" height="60px"';
+		print '<br><br>';
+	} else {
+		if (empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) print $langs->trans('MeteoStdModEnabled');
+		else print $langs->trans('MeteoPercentageModEnabled');
+		print '<br><br>';
+	}
+
+	$offset = 0;
+	$cursor = 10; // By default
+	//if (! empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
+	//if (! empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
+	$level0 = $offset; if (!empty($conf->global->MAIN_METEO_LEVEL0)) $level0 = $conf->global->MAIN_METEO_LEVEL0;
+	$level1 = $offset + 1 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL1)) $level1 = $conf->global->MAIN_METEO_LEVEL1;
+	$level2 = $offset + 2 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL2)) $level2 = $conf->global->MAIN_METEO_LEVEL2;
+	$level3 = $offset + 3 * $cursor; if (!empty($conf->global->MAIN_METEO_LEVEL3)) $level3 = $conf->global->MAIN_METEO_LEVEL3;
+	$text = ''; $options = 'class="valignmiddle" height="60px"';
 
 
-if ($action == 'edit') {
-	print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
+	if ($action == 'edit') {
+		print '<div id="standard" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '' : 'style="display:none;"').'>';
 
-	print '<div>';
-	print '<div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 0, $options);
-	print '= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 1, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 2, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 3, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
-	print '</div>';
-	print '</div>';
+		print '<div>';
+		print '<div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 0, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL0" value="'.$level0.'"/></td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 1, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL1" value="'.$level1.'"/></td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 2, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL2" value="'.$level2.'"/></td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 3, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_LEVEL3" value="'.$level3.'"/></td>';
+		print '</div>';
+		print '</div>';
 
-	print '</div>';
+		print '</div>';
 
-	print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
+		print '<div id="percentage" '.(empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? 'style="display:none;"' : '').'>';
 
-	print '<div>';
-	print '<div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 0, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 1, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 2, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
-	print '</div><div class="inline-block" style="padding-right: 20px">';
-	print img_weather($text, 3, $options);
-	print '&lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
-	print '</div>';
-	print '</div>';
+		print '<div>';
+		print '<div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 0, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL0" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'"/>&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 1, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL1" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'"/>&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 2, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL2" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'"/>&nbsp;%</td>';
+		print '</div><div class="inline-block" style="padding-right: 20px">';
+		print img_weather($text, 3, $options);
+		print ' &lt;= <input type="text" size="2" name="MAIN_METEO_PERCENTAGE_LEVEL3" value="'.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'"/>&nbsp;%</td>';
+		print '</div>';
+		print '</div>';
 
-	print '</div>';
+		print '</div>';
 
-	?>
+		?>
 
-	<script type="text/javascript">
+		<script type="text/javascript">
 
-		$(document).ready(function() {
+			$(document).ready(function() {
 
-			$("#change_mode").click(function() {
-				var use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
-				var str_mode_std = "<?php print $str_mode_std; ?>";
-				var str_mode_percentage = "<?php print $str_mode_percentage; ?>";
+				$("#change_mode").click(function() {
+					var use_percent = $("#MAIN_USE_METEO_WITH_PERCENTAGE");
+					var str_mode_std = "<?php print $str_mode_std; ?>";
+					var str_mode_percentage = "<?php print $str_mode_percentage; ?>";
+
+					if(use_percent.val() == 1) {
+						use_percent.val(0);
+						$("#standard").show();
+						$("#percentage").hide();
+						$(this).html(str_mode_std);
+					} else {
+						use_percent.val(1);
+						$("#standard").hide();
+						$("#percentage").show();
+						$(this).html(str_mode_percentage);
+					}
+				});
 
-				if(use_percent.val() == 1) {
-					use_percent.val(0);
-					$("#standard").show();
-					$("#percentage").hide();
-					$(this).html(str_mode_std);
-				} else {
-					use_percent.val(1);
-					$("#standard").hide();
-					$("#percentage").show();
-					$(this).html(str_mode_percentage);
-				}
 			});
 
-		});
+		</script>
 
-	</script>
-
-	<?php
-} else {
-	if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-		print '<div>';
-		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 0, $options);
-		print '= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 1, $options);
-		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 2, $options);
-		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 3, $options);
-		print '&lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 4, $options);
-		print '&gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
-		print '</div>';
-		print '</div>';
+		<?php
 	} else {
-		print '<div>';
-		print '<div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 0, $options);
-		print '= '.$level0;
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 1, $options);
-		print '&lt;= '.$level1;
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 2, $options);
-		print '&lt;= '.$level2;
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 3, $options);
-		print '&lt;= '.$level3;
-		print '</div><div class="inline-block" style="padding-right: 20px">';
-		print img_weather($text, 4, $options);
-		print '&gt; '.$level3;
-		print '</div>';
-		print '</div>';
+		if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+			print '<div>';
+			print '<div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 0, $options);
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL0.'&nbsp;%</td>';
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 1, $options);
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL1.'&nbsp;%</td>';
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 2, $options);
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL2.'&nbsp;%</td>';
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 3, $options);
+			print ' &lt;= '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 4, $options);
+			print ' &gt; '.$conf->global->MAIN_METEO_PERCENTAGE_LEVEL3.'&nbsp;%</td>';
+			print '</div>';
+			print '</div>';
+		} else {
+			print '<div>';
+			print '<div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 0, $options);
+			print ' &lt;= '.$level0;
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 1, $options);
+			print ' &lt;= '.$level1;
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 2, $options);
+			print ' &lt;= '.$level2;
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 3, $options);
+			print ' &lt;= '.$level3;
+			print '</div><div class="inline-block" style="padding-right: 20px">';
+			print img_weather($text, 4, $options);
+			print ' &gt; '.$level3;
+			print '</div>';
+			print '</div>';
+		}
 	}
 }
 
-print '</div>';
 
 if ($action == 'edit') {
 	print '<br><div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index cce441c4052..6e9c63ca6cf 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020		Open-Dsi				<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -90,7 +91,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 27, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 0, 15, 30, 0, 37, 0, 25, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 0, 15, 30, 0, 37, 0, 25, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
@@ -128,11 +129,12 @@ $tabname[30] = MAIN_DB_PREFIX."c_format_cards";
 $tabname[32] = MAIN_DB_PREFIX."c_hrm_public_holiday";
 $tabname[33] = MAIN_DB_PREFIX."c_hrm_department";
 $tabname[34] = MAIN_DB_PREFIX."c_hrm_function";
-
 $tabname[35] = MAIN_DB_PREFIX."c_exp_tax_cat";
 $tabname[36] = MAIN_DB_PREFIX."c_exp_tax_range";
 $tabname[37] = MAIN_DB_PREFIX."c_units";
 $tabname[38] = MAIN_DB_PREFIX."c_socialnetworks";
+$tabname[39] = MAIN_DB_PREFIX."c_prospectcontactlevel";
+$tabname[40] = MAIN_DB_PREFIX."c_stcommcontact";
 
 // Dictionary labels
 $tablib = array();
@@ -174,6 +176,8 @@ $tablib[35] = "DictionaryExpenseTaxCat";
 $tablib[36] = "DictionaryExpenseTaxRange";
 $tablib[37] = "DictionaryMeasuringUnits";
 $tablib[38] = "DictionarySocialNetworks";
+$tablib[39] = "DictionaryProspectContactLevel";
+$tablib[40] = "DictionaryProspectContactStatus";
 
 // Requests to extract data
 $tabsql = array();
@@ -203,7 +207,7 @@ $tabsql[23] = "SELECT t.rowid as rowid, t.taux, t.revenuestamp_type, c.label as
 $tabsql[24] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
 $tabsql[25] = "SELECT rowid   as rowid, code, label, active, module FROM ".MAIN_DB_PREFIX."c_type_container as t WHERE t.entity IN (".getEntity('c_type_container').")";
 //$tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
-$tabsql[27] = "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_stcomm";
+$tabsql[27] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcomm";
 $tabsql[28] = "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
 $tabsql[29] = "SELECT rowid   as rowid, code, label, percent, position, active FROM ".MAIN_DB_PREFIX."c_lead_status";
 $tabsql[30] = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards";
@@ -215,6 +219,8 @@ $tabsql[35] = "SELECT c.rowid, c.label, c.active, c.entity FROM ".MAIN_DB_PREFIX
 $tabsql[36] = "SELECT r.rowid, r.fk_c_exp_tax_cat, r.range_ik, r.active, r.entity FROM ".MAIN_DB_PREFIX."c_exp_tax_range r";
 $tabsql[37] = "SELECT r.rowid, r.code, r.label, r.short_label, r.unit_type, r.scale, r.active FROM ".MAIN_DB_PREFIX."c_units r";
 $tabsql[38] = "SELECT rowid, entity, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
+$tabsql[39] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
+$tabsql[40] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcommcontact";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -256,6 +262,8 @@ $tabsqlsort[35] = "c.label ASC";
 $tabsqlsort[36] = "r.fk_c_exp_tax_cat ASC, r.range_ik ASC";
 $tabsqlsort[37] = "r.unit_type ASC, r.scale ASC, r.code ASC";
 $tabsqlsort[38] = "rowid, code ASC";
+$tabsqlsort[39] = "sortorder ASC";
+$tabsqlsort[40] = "code ASC";
 
 // Field names in select result for dictionary display
 $tabfield = array();
@@ -285,7 +293,7 @@ $tabfield[23] = "country_id,country,taux,revenuestamp_type,accountancy_code_sell
 $tabfield[24] = "code,label";
 $tabfield[25] = "code,label";
 //$tabfield[26]= "code,label,short_label";
-$tabfield[27] = "code,libelle";
+$tabfield[27] = "code,libelle,picto";
 $tabfield[28] = "code,label,affect,delay,newbymonth,country_id,country";
 $tabfield[29] = "code,label,percent,position";
 $tabfield[30] = "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
@@ -297,6 +305,8 @@ $tabfield[35] = "label";
 $tabfield[36] = "range_ik,fk_c_exp_tax_cat";
 $tabfield[37] = "code,label,short_label,unit_type,scale";
 $tabfield[38] = "code,label,url,icon,entity";
+$tabfield[39] = "code,libelle,sortorder";
+$tabfield[40] = "code,libelle,picto";
 
 // Edit field names for editing a record
 $tabfieldvalue = array();
@@ -326,7 +336,7 @@ $tabfieldvalue[23] = "country,taux,revenuestamp_type,accountancy_code_sell,accou
 $tabfieldvalue[24] = "code,label";
 $tabfieldvalue[25] = "code,label";
 //$tabfieldvalue[26]= "code,label,short_label";
-$tabfieldvalue[27] = "code,libelle";
+$tabfieldvalue[27] = "code,libelle,picto";
 $tabfieldvalue[28] = "code,label,affect,delay,newbymonth,country";
 $tabfieldvalue[29] = "code,label,percent,position";
 $tabfieldvalue[30] = "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
@@ -338,6 +348,8 @@ $tabfieldvalue[35] = "label";
 $tabfieldvalue[36] = "range_ik,fk_c_exp_tax_cat";
 $tabfieldvalue[37] = "code,label,short_label,unit_type,scale";
 $tabfieldvalue[38] = "code,label,url,icon";
+$tabfieldvalue[39] = "code,libelle,sortorder";
+$tabfieldvalue[40] = "code,libelle,picto";
 
 // Field names in the table for inserting a record
 $tabfieldinsert = array();
@@ -367,7 +379,7 @@ $tabfieldinsert[23] = "fk_pays,taux,revenuestamp_type,accountancy_code_sell,acco
 $tabfieldinsert[24] = "code,label";
 $tabfieldinsert[25] = "code,label";
 //$tabfieldinsert[26]= "code,label,short_label";
-$tabfieldinsert[27] = "code,libelle";
+$tabfieldinsert[27] = "code,libelle,picto";
 $tabfieldinsert[28] = "code,label,affect,delay,newbymonth,fk_country";
 $tabfieldinsert[29] = "code,label,percent,position";
 $tabfieldinsert[30] = "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
@@ -380,6 +392,8 @@ $tabfieldinsert[35] = "label";
 $tabfieldinsert[36] = "range_ik,fk_c_exp_tax_cat";
 $tabfieldinsert[37] = "code,label,short_label,unit_type,scale";
 $tabfieldinsert[38] = "code,label,url,icon,entity";
+$tabfieldinsert[39] = "code,label,sortorder";
+$tabfieldinsert[40] = "code,libelle,picto";
 
 // Rowid name of field depending if field is autoincrement on or off..
 // Use "" if id field is "rowid" and has autoincrement on
@@ -423,6 +437,8 @@ $tabrowid[35] = "";
 $tabrowid[36] = "";
 $tabrowid[37] = "";
 $tabrowid[38] = "";
+$tabrowid[39] = "code";
+$tabrowid[40] = "id";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
@@ -464,6 +480,8 @@ $tabcond[35] = !empty($conf->expensereport->enabled);
 $tabcond[36] = !empty($conf->expensereport->enabled);
 $tabcond[37] = !empty($conf->product->enabled);
 $tabcond[38] = !empty($conf->socialnetworks->enabled);
+$tabcond[39] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
+$tabcond[40] = (!empty($conf->societe->enabled) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
 
 // List of help for fields
 $tabhelp = array();
@@ -493,7 +511,7 @@ $tabhelp[23] = array('revenuestamp_type'=>'FixedOrPercent');
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[25] = array('code'=>$langs->trans('EnterAnyCode'));
 //$tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
 $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"), 'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"));
 $tabhelp[29] = array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[30] = array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"));
@@ -505,6 +523,8 @@ $tabhelp[35] = array();
 $tabhelp[36] = array('range_ik'=>$langs->trans('PrevRangeToThisRange'));
 $tabhelp[37] = array('code'=>$langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('MeasuringUnitTypeDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'));
 $tabhelp[38] = array('code'=>$langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'));
+$tabhelp[39] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[40] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
@@ -546,6 +566,8 @@ $tabfieldcheck[35] = array();
 $tabfieldcheck[36] = array();
 $tabfieldcheck[37] = array();
 $tabfieldcheck[38] = array();
+$tabfieldcheck[39] = array();
+$tabfieldcheck[40] = array();
 
 // Complete all arrays with entries found into modules
 complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck);
@@ -554,9 +576,9 @@ complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqls
 // Defaut sortorder
 if (empty($sortfield))
 {
-    $tmp1 = explode(',', $tabsqlsort[$id]);
-    $tmp2 = explode(' ', $tmp1[0]);
-    $sortfield = preg_replace('/^.*\./', '', $tmp2[0]);
+	$tmp1 = explode(',', $tabsqlsort[$id]);
+	$tmp2 = explode(' ', $tmp1[0]);
+	$sortfield = preg_replace('/^.*\./', '', $tmp2[0]);
 }
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
@@ -564,27 +586,27 @@ $elementList = array();
 $sourceList = array();
 if ($id == 11)
 {
-    $elementList = array(
-        '' => '',
-        'societe' => $langs->trans('ThirdParty'),
-        // 'proposal' => $langs->trans('Proposal'),
-        // 'order' => $langs->trans('Order'),
-        // 'invoice' => $langs->trans('Bill'),
-        'supplier_proposal' => $langs->trans('SupplierProposal'),
-        'order_supplier' => $langs->trans('SupplierOrder'),
-        'invoice_supplier' => $langs->trans('SupplierBill'),
-        // 'intervention' => $langs->trans('InterventionCard'),
-        // 'contract' => $langs->trans('Contract'),
-        'project' => $langs->trans('Project'),
-        'project_task' => $langs->trans('Task'),
-        'agenda' => $langs->trans('Agenda'),
-        'dolresource' => $langs->trans('Resource'),
-        // old deprecated
-        'propal' => $langs->trans('Proposal'),
-        'commande' => $langs->trans('Order'),
-        'facture' => $langs->trans('Bill'),
-        'fichinter' => $langs->trans('InterventionCard'),
-        'contrat' => $langs->trans('Contract'),
+	$elementList = array(
+		'' => '',
+		'societe' => $langs->trans('ThirdParty'),
+		// 'proposal' => $langs->trans('Proposal'),
+		// 'order' => $langs->trans('Order'),
+		// 'invoice' => $langs->trans('Bill'),
+		'supplier_proposal' => $langs->trans('SupplierProposal'),
+		'order_supplier' => $langs->trans('SupplierOrder'),
+		'invoice_supplier' => $langs->trans('SupplierBill'),
+		// 'intervention' => $langs->trans('InterventionCard'),
+		// 'contract' => $langs->trans('Contract'),
+		'project' => $langs->trans('Project'),
+		'project_task' => $langs->trans('Task'),
+		'agenda' => $langs->trans('Agenda'),
+		'dolresource' => $langs->trans('Resource'),
+		// old deprecated
+		'propal' => $langs->trans('Proposal'),
+		'commande' => $langs->trans('Order'),
+		'facture' => $langs->trans('Bill'),
+		'fichinter' => $langs->trans('InterventionCard'),
+		'contrat' => $langs->trans('Contract'),
 	);
 	if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
 
@@ -620,354 +642,329 @@ if ($id == 10)
 
 if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha'))
 {
-    $search_country_id = '';
-    $search_code = '';
+	$search_country_id = '';
+	$search_code = '';
 }
 
 // Actions add or modify an entry into a dictionary
 if (GETPOST('actionadd') || GETPOST('actionmodify'))
 {
-    $listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
-    $listfieldinsert = explode(',', $tabfieldinsert[$id]);
-    $listfieldmodify = explode(',', $tabfieldinsert[$id]);
-    $listfieldvalue = explode(',', $tabfieldvalue[$id]);
+	$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
+	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
+	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
+	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-    // Check that all fields are filled
-    $ok = 1;
-    foreach ($listfield as $f => $value)
-    {
-    	// Discard check of mandatory fields for country for some tables
-        if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) continue; // For some pages, country is not mandatory
-    	if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
-        // Discard check of mandatory fiedls for other fields
-    	if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
-        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
-        if ($value == 'color' && empty($_POST['color'])) continue;
+	// Check that all fields are filled
+	$ok = 1;
+	foreach ($listfield as $f => $value)
+	{
+		// Discard check of mandatory fields for country for some tables
+		if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) continue; // For some pages, country is not mandatory
+		if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
+		// Discard check of mandatory fiedls for other fields
+		if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
+		if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
+		if ($value == 'color' && empty($_POST['color'])) continue;
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
 		if ($value == 'dayrule' && empty($_POST['dayrule'])) continue;
 		if ($value == 'sortorder') continue; // For a column name 'sortorder', we use the field name 'position'
 		if ((!isset($_POST[$value]) || $_POST[$value] == '')
-        	&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking'))  // Fields that are not mandatory
-        	&& (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
-        	)
+			&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto'))  // Fields that are not mandatory
+			&& (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
+			)
 		) {
-            $ok = 0;
-            $fieldnamekey = $listfield[$f];
-            // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
-            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'nbjour')   $fieldnamekey = 'NbOfDays';
-            if ($fieldnamekey == 'decalage') $fieldnamekey = 'Offset';
-            if ($fieldnamekey == 'module')   $fieldnamekey = 'Module';
-            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
-            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
-            if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-            if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
-            if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
-            if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
+			$ok = 0;
+			$fieldnamekey = $listfield[$f];
+			// We take translate key of field
+			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
+			if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+			if ($fieldnamekey == 'nbjour')   $fieldnamekey = 'NbOfDays';
+			if ($fieldnamekey == 'decalage') $fieldnamekey = 'Offset';
+			if ($fieldnamekey == 'module')   $fieldnamekey = 'Module';
+			if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+			if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+			if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
+			if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
+			if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
+			if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
+			if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
+			if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
 			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
 			if ($fieldnamekey == 'revenuestamp_type') $fieldnamekey = 'TypeOfRevenueStamp';
 			if ($fieldnamekey == 'use_default') $fieldnamekey = 'UseByDefault';
 
-            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-        }
-    }
-    // Other checks
-    if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
-        $ok = 0;
-        setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
-    }
-    if (GETPOSTISSET("code"))
-    {
-    	if (GETPOST("code") == '0')
-    	{
-        	$ok = 0;
-    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
-        }
-        /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+		}
+	}
+	// Other checks
+	if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
+		$ok = 0;
+		setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
+	}
+	if (GETPOSTISSET("code"))
+	{
+		if (GETPOST("code") == '0')
+		{
+			$ok = 0;
+			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+		}
+		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
     	{
 	    	$ok = 0;
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
 	    }*/
-    }
-    if (GETPOSTISSET("country") && ($_POST["country"] == '0') && ($id != 2))
-    {
-    	if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
-    	{
-    		$_POST["country"] = '';
-    	}
-    	else
-    	{
-        	$ok = 0;
-        	setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
-    	}
-    }
-    if ($id == 3 && !is_numeric($_POST["code"]))
-    {
-       	$ok = 0;
-       	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
-    }
+	}
+	if (GETPOSTISSET("country") && ($_POST["country"] == '0') && ($id != 2))
+	{
+		if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
+		{
+			$_POST["country"] = '';
+		} else {
+			$ok = 0;
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
+		}
+	}
+	if ($id == 3 && !is_numeric($_POST["code"]))
+	{
+	   	$ok = 0;
+	   	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
+	}
 
 	// Clean some parameters
-    if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"] = '0'; // If empty, we force to 0
-    if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"] = '0'; // If empty, we force to 0
+	if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"] = '0'; // If empty, we force to 0
+	if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"] = '0'; // If empty, we force to 0
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
-    if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code
-    {
-        $_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
-    }
+	if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code
+	{
+		$_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
+	}
 
-    // If check ok and action add, add the line
-    if ($ok && GETPOST('actionadd'))
-    {
-        if ($tabrowid[$id])
-        {
-            // Get free id for insert
-            $newid = 0;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $obj = $db->fetch_object($result);
-                $newid = ($obj->newid + 1);
-            } else {
-                dol_print_error($db);
-            }
-        }
+	// If check ok and action add, add the line
+	if ($ok && GETPOST('actionadd'))
+	{
+		if ($tabrowid[$id])
+		{
+			// Get free id for insert
+			$newid = 0;
+			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$obj = $db->fetch_object($result);
+				$newid = ($obj->newid + 1);
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-        // Add new entry
-        $sql = "INSERT INTO ".$tabname[$id]." (";
-        // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $tabrowid[$id].",";
-        $sql .= $tabfieldinsert[$id];
-        $sql .= ",active)";
-        $sql .= " VALUES(";
+		// Add new entry
+		$sql = "INSERT INTO ".$tabname[$id]." (";
+		// List of fields
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $tabrowid[$id].",";
+		$sql .= $tabfieldinsert[$id];
+		$sql .= ",active)";
+		$sql .= " VALUES(";
 
-        // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $newid.",";
-        $i = 0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-        	$keycode = $listfieldvalue[$i];
-        	if (empty($keycode)) $keycode = $value;
+		// List of values
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $newid.",";
+		$i = 0;
+		foreach ($listfieldinsert as $f => $value)
+		{
+			$keycode = $listfieldvalue[$i];
+			if (empty($keycode)) $keycode = $value;
 
-            if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
-            	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            }
-            elseif ($value == 'entity') {
-            	$_POST[$keycode] = getEntity($tabname[$id]);
-            }
+			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
+				$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
+			} elseif ($value == 'entity') {
+				$_POST[$keycode] = getEntity($tabname[$id]);
+			}
 
-            if ($i) $sql .= ",";
+			if ($i) $sql .= ",";
 
-            if ($keycode == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
-            {
-            	$sql .= "'".(int) GETPOST('position', 'int')."'";
-            }
-            elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
-            elseif ($keycode == 'content') {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            }
-            elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
-            	$sql .= (int) GETPOST($keycode, 'int');
-            }
-            else {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
-            }
+			if ($keycode == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
+			{
+				$sql .= "'".(int) GETPOST('position', 'int')."'";
+			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+			elseif ($keycode == 'content') {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+			} elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+				$sql .= (int) GETPOST($keycode, 'int');
+			} else {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+			}
 
-            $i++;
-        }
-        $sql .= ",1)";
+			$i++;
+		}
+		$sql .= ",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)	// Add is ok
-        {
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        }
-        else
-        {
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            }
-            else {
-                dol_print_error($db);
-            }
-        }
-    }
+		dol_syslog("actionadd", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)	// Add is ok
+		{
+			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
+		} else {
+			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
+	}
 
-    // If verif ok and action modify, modify the line
-    if ($ok && GETPOST('actionmodify'))
-    {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-        else { $rowidcol = "rowid"; }
+	// If verif ok and action modify, modify the line
+	if ($ok && GETPOST('actionmodify'))
+	{
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-        // Modify entry
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-        {
-            $sql .= $tabrowid[$id]."=";
-            $sql .= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-        	$keycode = $listfieldvalue[$i];
-        	if (empty($keycode)) $keycode = $field;
+		// Modify entry
+		$sql = "UPDATE ".$tabname[$id]." SET ";
+		// Modifie valeur des champs
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
+		{
+			$sql .= $tabrowid[$id]."=";
+			$sql .= "'".$db->escape($rowid)."', ";
+		}
+		$i = 0;
+		foreach ($listfieldmodify as $field)
+		{
+			$keycode = $listfieldvalue[$i];
+			if (empty($keycode)) $keycode = $field;
 
-            if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
-            	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            }
-            elseif ($field == 'entity') {
-            	$_POST[$keycode] = getEntity($tabname[$id]);
-            }
+			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
+				$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
+			} elseif ($field == 'entity') {
+				$_POST[$keycode] = getEntity($tabname[$id]);
+			}
 
-            if ($i) $sql .= ",";
-            $sql .= $field."=";
-            if ($listfieldvalue[$i] == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
-            {
-            	$sql .= (int) GETPOST('position', 'int');
-            }
-            elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
-            elseif ($keycode == 'content') {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            }
-            elseif (in_array($keycode, array('private', 'position', 'scale'))) {
-            	$sql .= (int) GETPOST($keycode, 'int');
-            }
-            else {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
-            }
+			if ($i) $sql .= ",";
+			$sql .= $field."=";
+			if ($listfieldvalue[$i] == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
+			{
+				$sql .= (int) GETPOST('position', 'int');
+			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+			elseif ($keycode == 'content') {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+			} elseif (in_array($keycode, array('private', 'position', 'scale'))) {
+				$sql .= (int) GETPOST($keycode, 'int');
+			} else {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+			}
 
-            $i++;
-        }
-        $sql .= " WHERE ".$rowidcol." = ".(int) $db->escape($rowid);
-        if (in_array('entity', $listfieldmodify)) $sql .= " AND entity = '".getEntity($tabname[$id])."'";
+			$i++;
+		}
+		$sql .= " WHERE ".$rowidcol." = ".(int) $db->escape($rowid);
+		if (in_array('entity', $listfieldmodify)) $sql .= " AND entity = '".getEntity($tabname[$id])."'";
 
-        dol_syslog("actionmodify", LOG_DEBUG);
-        //print $sql;
-        $resql = $db->query($sql);
-        if (!$resql)
-        {
-            setEventMessages($db->error(), null, 'errors');
-        }
-    }
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+		dol_syslog("actionmodify", LOG_DEBUG);
+		//print $sql;
+		$resql = $db->query($sql);
+		if (!$resql)
+		{
+			setEventMessages($db->error(), null, 'errors');
+		}
+	}
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if (GETPOST('actioncancel'))
 {
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    $sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	$sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 
-    dol_syslog("delete", LOG_DEBUG);
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-        {
-            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        }
-        else
-        {
-            dol_print_error($db);
-        }
-    }
+	dol_syslog("delete", LOG_DEBUG);
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+		{
+			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+		} else {
+			dol_print_error($db);
+		}
+	}
 }
 
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
-    elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -985,28 +982,28 @@ llxHeader('', $title);
 $linkback = '';
 if ($id)
 {
-    $title .= ' - '.$langs->trans($tablib[$id]);
-    $linkback = '<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
+	$title .= ' - '.$langs->trans($tablib[$id]);
+	$linkback = '<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
 }
 $titlepicto = 'title_setup';
 if ($id == 10 && GETPOST('from') == 'accountancy')
 {
-    $title = $langs->trans("MenuVatAccounts");
-    $titlepicto = 'accountancy';
+	$title = $langs->trans("MenuVatAccounts");
+	$titlepicto = 'accountancy';
 }
 if ($id == 7 && GETPOST('from') == 'accountancy')
 {
-    $title = $langs->trans("MenuTaxAccounts");
-    $titlepicto = 'accountancy';
+	$title = $langs->trans("MenuTaxAccounts");
+	$titlepicto = 'accountancy';
 }
 
 print load_fiche_titre($title, $linkback, $titlepicto);
 
 if (empty($id))
 {
-    print '<span class="opacitymedium">'.$langs->trans("DictionaryDesc");
-    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
-    print '</span><br>';
+	print '<span class="opacitymedium">'.$langs->trans("DictionaryDesc");
+	print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+	print '</span><br>';
 }
 
 
@@ -1023,7 +1020,7 @@ if (GETPOST('from')) $paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alp
 // Confirmation of the deletion of the line
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.urlencode($rowid).'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.urlencode($rowid).'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
@@ -1032,127 +1029,126 @@ if ($action == 'delete')
  */
 if ($id)
 {
-    // Complete search values request with sort criteria
-    $sql = $tabsql[$id];
+	// Complete search values request with sort criteria
+	$sql = $tabsql[$id];
 
-    if (!preg_match('/ WHERE /', $sql)) $sql .= " WHERE 1 = 1";
-    if ($search_country_id > 0) $sql .= " AND c.rowid = ".$search_country_id;
-    if ($search_code != '' && $id == 9)     $sql .= natural_search("code_iso", $search_code);
-    elseif ($search_code != '' && $id == 28)    $sql .= natural_search("h.code", $search_code);
-    elseif ($search_code != '' && $id == 32)    $sql .= natural_search("a.code", $search_code);
-    elseif ($search_code != '' && $id == 3)     $sql .= natural_search("r.code_region", $search_code);
-    elseif ($search_code != '' && $id != 9)     $sql .= natural_search("code", $search_code);
+	if (!preg_match('/ WHERE /', $sql)) $sql .= " WHERE 1 = 1";
+	if ($search_country_id > 0) $sql .= " AND c.rowid = ".$search_country_id;
+	if ($search_code != '' && $id == 9)     $sql .= natural_search("code_iso", $search_code);
+	elseif ($search_code != '' && $id == 28)    $sql .= natural_search("h.code", $search_code);
+	elseif ($search_code != '' && $id == 32)    $sql .= natural_search("a.code", $search_code);
+	elseif ($search_code != '' && $id == 3)     $sql .= natural_search("r.code_region", $search_code);
+	elseif ($search_code != '' && $id != 9)     $sql .= natural_search("code", $search_code);
 
-    if ($sortfield)
-    {
-        // If sort order is "country", we use country_code instead
-    	if ($sortfield == 'country') $sortfield = 'country_code';
-        $sql .= " ORDER BY ".$db->escape($sortfield);
-        if ($sortorder)
-        {
-        	$sql .= " ".strtoupper($db->escape($sortorder));
-        }
-        $sql .= ", ";
-        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
-    }
-    else {
-        $sql .= " ORDER BY ";
-    }
-    $sql .= $tabsqlsort[$id];
-    $sql .= $db->plimit($listlimit + 1, $offset);
-    //print $sql;
+	if ($sortfield)
+	{
+		// If sort order is "country", we use country_code instead
+		if ($sortfield == 'country') $sortfield = 'country_code';
+		$sql .= " ORDER BY ".$db->escape($sortfield);
+		if ($sortorder)
+		{
+			$sql .= " ".strtoupper($db->escape($sortorder));
+		}
+		$sql .= ", ";
+		// Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+		$tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
+		$tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
+	} else {
+		$sql .= " ORDER BY ";
+	}
+	$sql .= $tabsqlsort[$id];
+	$sql .= $db->plimit($listlimit + 1, $offset);
+	//print $sql;
 
-    if (empty($tabfield[$id]))
-    {
-    	dol_print_error($db, 'The table with id '.$id.' has no array tabfield defined');
-    	exit;
-    }
-    $fieldlist = explode(',', $tabfield[$id]);
+	if (empty($tabfield[$id]))
+	{
+		dol_print_error($db, 'The table with id '.$id.' has no array tabfield defined');
+		exit;
+	}
+	$fieldlist = explode(',', $tabfield[$id]);
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
-    if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION))
-    {
-    	print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation")));
-    	print "<br>\n";
-    }
+	if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION))
+	{
+		print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation")));
+		print "<br>\n";
+	}
 
-    // Form to add a new line
-    if ($tabname[$id])
-    {
-        $alabelisused = 0;
-        $withentity = null;
+	// Form to add a new line
+	if ($tabname[$id])
+	{
+		$alabelisused = 0;
+		$withentity = null;
 
-        $fieldlist = explode(',', $tabfield[$id]);
+		$fieldlist = explode(',', $tabfield[$id]);
 
-	    print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder centpercent">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
 
-        // Line for title
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-        	if ($fieldlist[$field] == 'entity') {
-        		$withentity = getEntity($tabname[$id]);
-        		continue;
-        	}
+		// Line for title
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			if ($fieldlist[$field] == 'entity') {
+				$withentity = getEntity($tabname[$id]);
+				continue;
+			}
 
-            // Define field friendly name from its technical name
-            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            $class = '';
+			// Define field friendly name from its technical name
+			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			$class = '';
 
-            if ($fieldlist[$field] == 'pos') { $valuetoshow = $langs->trans("Position"); $class = 'maxwidth100'; }
-            if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
-            if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
-            if ($fieldlist[$field] == 'taux') {
+			if ($fieldlist[$field] == 'pos') { $valuetoshow = $langs->trans("Position"); $class = 'maxwidth100'; }
+			if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
+			if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
+			if ($fieldlist[$field] == 'taux') {
 				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow = $langs->trans("Rate");
 				else $valuetoshow = $langs->trans("Amount");
 				$class = 'center';
-            }
-            if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $class = "center"; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $class = "center"; }
-            if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $class = "center"; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $class = "center"; }
-            if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
-            if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-            if ($fieldlist[$field] == 'type') {
+			}
+			if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $class = "center"; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $class = "center"; }
+			if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $class = "center"; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $class = "center"; }
+			if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
+			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+			if ($fieldlist[$field] == 'type') {
 				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
 				else $valuetoshow = $langs->trans("Type");
-            }
-            if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); $class = 'maxwidth100'; }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-            {
-            	$valuetoshow = $form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
-            }
-            if ($fieldlist[$field] == 'libelle_facture') {
-                $valuetoshow = $form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
-            }
-            if ($fieldlist[$field] == 'country') {
-                if (in_array('region_id', $fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
-                $valuetoshow = $langs->trans("Country");
-            }
-            if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $class = "center"; }
-            if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
-            if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $class = "center"; }
-            if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
-            if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
-            if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
-            if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $valuetoshow = ''; }
-            if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
-            if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); }
-            if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); }
-            if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
-            if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountparent"); }
-            if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
-            if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
-	        if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
+			}
+			if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); $class = 'maxwidth100'; }
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
+			{
+				$valuetoshow = $form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
+			}
+			if ($fieldlist[$field] == 'libelle_facture') {
+				$valuetoshow = $form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
+			}
+			if ($fieldlist[$field] == 'country') {
+				if (in_array('region_id', $fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
+				$valuetoshow = $langs->trans("Country");
+			}
+			if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $class = "center"; }
+			if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
+			if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $class = "center"; }
+			if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
+			if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
+			if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
+			if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $valuetoshow = ''; }
+			if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
+			if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); }
+			if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); }
+			if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
+			if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountparent"); }
+			if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
+			if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
+			if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
+			if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
 			if ($fieldlist[$field] == 'range_account') { $valuetoshow = $langs->trans("Range"); }
 			if ($fieldlist[$field] == 'sens') { $valuetoshow = $langs->trans("Sens"); }
 			if ($fieldlist[$field] == 'category_type') { $valuetoshow = $langs->trans("Calculated"); }
@@ -1176,200 +1172,197 @@ if ($id)
 			if ($fieldlist[$field] == 'revenuestamp_type') { $valuetoshow = $langs->trans('TypeOfRevenueStamp'); }
 			if ($fieldlist[$field] == 'use_default') { $valuetoshow = $langs->trans('Default'); }
 
-            if ($id == 2)	// Special case for state page
-            {
-                if ($fieldlist[$field] == 'region_id') { $valuetoshow = '&nbsp;'; $showfield = 1; }
-                if ($fieldlist[$field] == 'region') { $valuetoshow = $langs->trans("Country").'/'.$langs->trans("Region"); $showfield = 1; }
-            }
+			if ($id == 2)	// Special case for state page
+			{
+				if ($fieldlist[$field] == 'region_id') { $valuetoshow = '&nbsp;'; $showfield = 1; }
+				if ($fieldlist[$field] == 'region') { $valuetoshow = $langs->trans("Country").'/'.$langs->trans("Region"); $showfield = 1; }
+			}
 
-            if ($valuetoshow != '')
-            {
-                print '<td'.($class ? ' class="'.$class.'"' : '').'>';
-                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-                elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-                else print $valuetoshow;
-                print '</td>';
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
-        }
+			if ($valuetoshow != '')
+			{
+				print '<td'.($class ? ' class="'.$class.'"' : '').'>';
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				else print $valuetoshow;
+				print '</td>';
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
+		}
 
-        if ($id == 4) print '<td></td>';
-        print '<td>';
-        print '<input type="hidden" name="id" value="'.$id.'">';
-        if (!is_null($withentity))
-        	print '<input type="hidden" name="entity" value="'.$withentity.'">';
-        print '</td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '</tr>';
+		if ($id == 4) print '<td></td>';
+		print '<td>';
+		print '<input type="hidden" name="id" value="'.$id.'">';
+		if (!is_null($withentity))
+			print '<input type="hidden" name="entity" value="'.$withentity.'">';
+		print '</td>';
+		print '<td style="min-width: 26px;"></td>';
+		print '<td style="min-width: 26px;"></td>';
+		print '</tr>';
 
-        // Line to enter new values
-        print '<!-- line to add new entry -->';
-        print '<tr class="oddeven nodrag nodrop nohover">';
+		// Line to enter new values
+		print '<!-- line to add new entry -->';
+		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'))
-        {
-            foreach ($fieldlist as $key=>$val)
-            {
-                if (GETPOST($val) != '')
-                	$obj->$val = GETPOST($val);
-            }
-        }
+		$obj = new stdClass();
+		// If data was already input, we define them in obj to populate input fields.
+		if (GETPOST('actionadd'))
+		{
+			foreach ($fieldlist as $key=>$val)
+			{
+				if (GETPOST($val) != '')
+					$obj->$val = GETPOST($val);
+			}
+		}
 
-        $tmpaction = 'create';
-        $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-        $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-        $error = $hookmanager->error; $errors = $hookmanager->errors;
+		$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 ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionary Regions
+		if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionary Regions
 
-        if (empty($reshook))
-        {
-       		fieldList($fieldlist, $obj, $tabname[$id], 'add');
-        }
+		if (empty($reshook))
+		{
+	   		fieldList($fieldlist, $obj, $tabname[$id], 'add');
+		}
 
-        if ($id == 4) print '<td></td>';
-        print '<td colspan="3" class="center">';
-        if ($action != 'edit')
-        {
-        	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-        }
-        print '</td>';
-        print "</tr>";
+		if ($id == 4) print '<td></td>';
+		print '<td colspan="3" class="center">';
+		if ($action != 'edit')
+		{
+			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		}
+		print '</td>';
+		print "</tr>";
 
-        $colspan = count($fieldlist) + 3;
-        if ($id == 4) $colspan++;
+		$colspan = count($fieldlist) + 3;
+		if ($id == 4) $colspan++;
 
-        print '</table>';
+		print '</table>';
 		print '</div>';
-    }
+	}
 
-    print '</form>';
+	print '</form>';
 
 
-    print '<br>';
+	print '<br>';
 
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
-    // List of available record in database
-    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+	// List of available record in database
+	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-        // There is several pages
-        if ($num > $listlimit || $page)
-        {
-            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
-            print '<div class="clearboth"></div>';
-        }
+		// There is several pages
+		if ($num > $listlimit || $page)
+		{
+			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
+			print '<div class="clearboth"></div>';
+		}
 
-	    print '<div class="div-table-responsive">';
-        print '<table class="noborder centpercent">';
+		print '<div class="div-table-responsive">';
+		print '<table class="noborder centpercent">';
 
-        // Title line with search input fields
-        print '<tr class="liste_titre_filter">';
-        $filterfound = 0;
-        foreach ($fieldlist as $field => $value)
-        {
-        	if ($fieldlist[$field] == 'entity') continue;
+		// Title line with search input fields
+		print '<tr class="liste_titre_filter">';
+		$filterfound = 0;
+		foreach ($fieldlist as $field => $value)
+		{
+			if ($fieldlist[$field] == 'entity') continue;
 
-            $showfield = 1; // By default
+			$showfield = 1; // By default
 
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
 
-            if ($showfield)
-            {
-                if ($value == 'country')
-                {
-                    print '<td class="liste_titre">';
-                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
-                    print '</td>';
-                    $filterfound++;
-                }
-                elseif ($value == 'code')
-                {
-                    print '<td class="liste_titre">';
-                    print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
-                    print '</td>';
-                    $filterfound++;
-                }
-                else
-                {
-                    print '<td class="liste_titre">';
-                    print '</td>';
-                }
-            }
-        }
-        if ($id == 4) print '<td></td>';
-        print '<td class="liste_titre"></td>';
-    	print '<td class="liste_titre right" colspan="2">';
-    	if ($filterfound)
-    	{
-        	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-        	print $searchpicto;
-    	}
-    	print '</td>';
-        print '</tr>';
+			if ($showfield)
+			{
+				if ($value == 'country')
+				{
+					print '<td class="liste_titre">';
+					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
+					print '</td>';
+					$filterfound++;
+				} elseif ($value == 'code')
+				{
+					print '<td class="liste_titre">';
+					print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
+					print '</td>';
+					$filterfound++;
+				} else {
+					print '<td class="liste_titre">';
+					print '</td>';
+				}
+			}
+		}
+		if ($id == 4) print '<td></td>';
+		print '<td class="liste_titre"></td>';
+		print '<td class="liste_titre right" colspan="2">';
+		if ($filterfound)
+		{
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+		}
+		print '</td>';
+		print '</tr>';
 
-        // Title of lines
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-        	if ($fieldlist[$field] == 'entity') continue;
+		// Title of lines
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			if ($fieldlist[$field] == 'entity') continue;
 
-            // Determines the name of the field in relation to the possible names
-            // in data dictionaries
-            $showfield = 1; // By defaut
-            $cssprefix = '';
-            $sortable = 1;
-            $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
+			// Determines the name of the field in relation to the possible names
+			// in data dictionaries
+			$showfield = 1; // By defaut
+			$cssprefix = '';
+			$sortable = 1;
+			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 
-            // Special cases
-            if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
-            if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
-            if ($fieldlist[$field] == 'taux') {
+			// Special cases
+			if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
+			if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
+			if ($fieldlist[$field] == 'taux') {
 				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow = $langs->trans("Rate");
 				else $valuetoshow = $langs->trans("Amount");
 				$cssprefix = 'center ';
-            }
-            if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
-            if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-            if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
-            if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
-            if ($fieldlist[$field] == 'position') { $cssprefix = 'right '; }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Label"); }
-            if ($fieldlist[$field] == 'libelle_facture') { $valuetoshow = $langs->trans("LabelOnDocuments"); }
-            if ($fieldlist[$field] == 'country') { $valuetoshow = $langs->trans("Country"); }
-            if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $cssprefix = "center "; }
-            if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
-            if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $cssprefix = "center "; }
-            if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
-            if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
-            if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
-            if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
-            if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
-            if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); $sortable = 0; }
-            if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); $sortable = 0; }
+			}
+			if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
+			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+			if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+			if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+			if ($fieldlist[$field] == 'position') { $cssprefix = 'right '; }
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Label"); }
+			if ($fieldlist[$field] == 'libelle_facture') { $valuetoshow = $langs->trans("LabelOnDocuments"); }
+			if ($fieldlist[$field] == 'country') { $valuetoshow = $langs->trans("Country"); }
+			if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $cssprefix = "center "; }
+			if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
+			if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $cssprefix = "center "; }
+			if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
+			if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
+			if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
+			if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
+			if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
+			if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); $sortable = 0; }
+			if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); $sortable = 0; }
 			if ($fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
-            if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountsparent"); }
-            if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
-            if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
-            if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
+			if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountsparent"); }
+			if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
+			if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
+			if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
+			if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
 			if ($fieldlist[$field] == 'range_account') { $valuetoshow = $langs->trans("Range"); }
 			if ($fieldlist[$field] == 'sens') { $valuetoshow = $langs->trans("Sens"); }
 			if ($fieldlist[$field] == 'category_type') { $valuetoshow = $langs->trans("Calculated"); }
@@ -1395,237 +1388,198 @@ if ($id)
 
 			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
 
-            // Show field title
-            if ($showfield)
-            {
-                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $cssprefix);
-            }
-        }
+			// Show field title
+			if ($showfield)
+			{
+				print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $cssprefix);
+			}
+		}
 		// Favorite - Only activated on country dictionary
-        if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+		if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
 
 		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print '</tr>';
+		print getTitleFieldOfList('');
+		print getTitleFieldOfList('');
+		print '</tr>';
 
-        if ($num)
-        {
-            // Lines with values
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-                if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-                {
-                    $tmpaction = 'edit';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+		if ($num)
+		{
+			// Lines with values
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				//print_r($obj);
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
+				{
+					$tmpaction = 'edit';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    // Show fields
-                    if (empty($reshook)) {
-                    	$withentity = fieldList($fieldlist, $obj, $tabname[$id], 'edit');
-                    }
+					// Show fields
+					if (empty($reshook)) {
+						$withentity = fieldList($fieldlist, $obj, $tabname[$id], 'edit');
+					}
 
-                    print '<td colspan="3" class="center">';
-                    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
-                    print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
-                    print '<input type="hidden" name="rowid" value="'.dol_escape_htmltag($rowid).'">';
-                    if (!is_null($withentity))
-                    	print '<input type="hidden" name="entity" value="'.$withentity.'">';
-                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-                    print '</td>';
-                }
-                else
-                {
-	              	$tmpaction = 'view';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					print '<td colspan="3" class="center">';
+					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
+					print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
+					print '<input type="hidden" name="rowid" value="'.dol_escape_htmltag($rowid).'">';
+					if (!is_null($withentity))
+						print '<input type="hidden" name="entity" value="'.$withentity.'">';
+					print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+					print '</td>';
+				} else {
+				  	$tmpaction = 'view';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook))
-                    {
-                    	$withentity = null;
+					if (empty($reshook))
+					{
+						$withentity = null;
 
-                        foreach ($fieldlist as $field => $value)
-                        {
-                        	//var_dump($fieldlist);
-                        	$class = '';
-                        	$showfield = 1;
-                        	$valuetoshow = $obj->{$fieldlist[$field]};
+						foreach ($fieldlist as $field => $value)
+						{
+							//var_dump($fieldlist);
+							$class = '';
+							$showfield = 1;
+							$valuetoshow = $obj->{$fieldlist[$field]};
 
-                        	if ($fieldlist[$field] == 'entity') {
-                        		$withentity = $valuetoshow;
-                        		continue;
-                        	}
-
-                            if ($value == 'element')
-                            {
-                                $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-                            }
-                            elseif ($value == 'source')
-                            {
-                                $valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
-                            }
-                            elseif ($valuetoshow == 'all') {
-                                $valuetoshow = $langs->trans('All');
-                            }
-                            elseif ($fieldlist[$field] == 'country') {
-                                if (empty($obj->country_code))
-                                {
-                                    $valuetoshow = '-';
-                                }
-                                else
-                                {
-                                    $key = $langs->trans("Country".strtoupper($obj->country_code));
-                                    $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
-                                }
-                            }
-                            elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-                                $valuetoshow = yn($valuetoshow);
-                                $class = "center";
-                            }
-                            elseif ($fieldlist[$field] == 'type_cdr') {
-                				if (empty($valuetoshow)) $valuetoshow = $langs->trans('None');
-                				elseif ($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
-                				elseif ($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
-                                $class = "center";
-                            } elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
-                                $valuetoshow = price($valuetoshow);
-                            }
-                            if ($value == 'private')
-                            {
-                                $valuetoshow = yn($elementList[$valuetoshow]);
-                            }
-                            elseif ($fieldlist[$field] == 'libelle_facture') {
-                                $langs->load("bills");
-                                $key = $langs->trans("PaymentCondition".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                                $valuetoshow = nl2br($valuetoshow);
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
-                                $key = $langs->trans("Country".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
-                                $langs->load("propal");
-                                $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
-                                $key = $langs->trans("Action".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
-                                $key = $langs->trans("Currency".strtoupper($obj->code_iso));
-                                $valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
-                                $key = $langs->trans(strtoupper($obj->code));
-                                $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
-                                $key = $langs->trans(strtoupper($obj->code));
-                                $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
-                                $key = $langs->trans("Civility".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
-                            	$langs->load('agenda');
-                                $key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
-                                $langs->load("bills");
-                                $key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
-                                $langs->load("bills");
-                                $key = $langs->trans("PaymentType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
-                            	$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
-                            	$valuetoshow = $payment_type_list[$valuetoshow];
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
-                                $key = $langs->trans("DemandReasonType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
-                                $langs->load("orders");
-                                $key = $langs->trans($obj->code);
-                                $valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
-                                $langs->load("sendings");
-                                $key = $langs->trans("SendingMethod".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
-                            {
-                                $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
-                            {
-                                $langs->load('trips');
-                                $key = $langs->trans(strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
-                                $showfield = 0;
-                            }
-                            elseif ($fieldlist[$field] == 'unicode') {
-                            	$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-                            }
-                            elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
-	                            $langs->load("products");
-	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            }
-                            elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
-	                            $langs->load("products");
-	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            }
-                            elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
-                            {
-                            	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
-                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
-                            }
-							elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
-							    $class = "center";
+							if ($fieldlist[$field] == 'entity') {
+								$withentity = $valuetoshow;
+								continue;
 							}
-							elseif ($fieldlist[$field] == 'localtax1_type') {
-                                if ($obj->localtax1 != 0)
-							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else
-							        $valuetoshow = '';
-							    $class = "center";
+
+							if ($value == 'element')
+							{
+								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+							} elseif ($value == 'source')
+							{
+								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
+							} elseif ($valuetoshow == 'all') {
+								$valuetoshow = $langs->trans('All');
+							} elseif ($fieldlist[$field] == 'country') {
+								if (empty($obj->country_code))
+								{
+									$valuetoshow = '-';
+								} else {
+									$key = $langs->trans("Country".strtoupper($obj->country_code));
+									$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
+								}
+							} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+								$valuetoshow = yn($valuetoshow);
+								$class = "center";
+							} elseif ($fieldlist[$field] == 'type_cdr') {
+								if (empty($valuetoshow)) $valuetoshow = $langs->trans('None');
+								elseif ($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
+								elseif ($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
+								$class = "center";
+							} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+								$valuetoshow = price($valuetoshow);
 							}
-							elseif ($fieldlist[$field] == 'localtax2_type') {
-							    if ($obj->localtax2 != 0)
-							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else
-							        $valuetoshow = '';
-							    $class = "center";
-							}
-							elseif ($fieldlist[$field] == 'taux') {
-                                $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
-							    $class = "center";
+							if ($value == 'private')
+							{
+								$valuetoshow = yn($elementList[$valuetoshow]);
+							} elseif ($fieldlist[$field] == 'libelle_facture') {
+								$langs->load("bills");
+								$key = $langs->trans("PaymentCondition".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+								$valuetoshow = nl2br($valuetoshow);
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+								$key = $langs->trans("Country".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+								$langs->load("propal");
+								$key = $langs->trans("AvailabilityType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+								$key = $langs->trans("Action".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
+								$key = $langs->trans("Currency".strtoupper($obj->code_iso));
+								$valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
+								$key = $langs->trans(strtoupper($obj->code));
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
+								$key = $langs->trans(strtoupper($obj->code));
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
+								$key = $langs->trans("Civility".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
+								$langs->load('agenda');
+								$key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
+								$langs->load("bills");
+								$key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+								$langs->load("bills");
+								$key = $langs->trans("PaymentType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+								$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
+								$valuetoshow = $payment_type_list[$valuetoshow];
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
+								$key = $langs->trans("DemandReasonType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
+								$langs->load("orders");
+								$key = $langs->trans($obj->code);
+								$valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
+								$langs->load("sendings");
+								$key = $langs->trans("SendingMethod".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
+							{
+								$key = $langs->trans('PaperFormat'.strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
+							{
+								$langs->load('trips');
+								$key = $langs->trans(strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+								$showfield = 0;
+							} elseif ($fieldlist[$field] == 'unicode') {
+								$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+								$langs->load("products");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+								$langs->load("products");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+							} elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
+							{
+								$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
+								$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
+								$class = "center";
+							} elseif ($fieldlist[$field] == 'localtax1_type') {
+								if ($obj->localtax1 != 0)
+									$valuetoshow = $localtax_typeList[$valuetoshow];
+								else $valuetoshow = '';
+								$class = "center";
+							} elseif ($fieldlist[$field] == 'localtax2_type') {
+								if ($obj->localtax2 != 0)
+									$valuetoshow = $localtax_typeList[$valuetoshow];
+								else $valuetoshow = '';
+								$class = "center";
+							} elseif ($fieldlist[$field] == 'taux') {
+								$valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
+								$class = "center";
 							} elseif (in_array($fieldlist[$field], array('recuperableonly'))) {
 								$class = "center";
-							}
-							elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
-                                $valuetoshow = length_accountg($valuetoshow);
-                            }
-							elseif ($fieldlist[$field] == 'fk_tva')
+							} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
+								$valuetoshow = length_accountg($valuetoshow);
+							} elseif ($fieldlist[$field] == 'fk_tva')
 							{
 								foreach ($form->cache_vatrates as $key => $Tab)
 								{
@@ -1635,70 +1589,64 @@ if ($id)
 										break;
 									}
 								}
-							}
-							elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
+							} elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
 							{
 								$valuetoshow = getDictvalue(MAIN_DB_PREFIX.'c_exp_tax_cat', 'label', $valuetoshow);
 								$valuetoshow = $langs->trans($valuetoshow);
-							}
-							elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat')
+							} elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat')
 							{
 								$valuetoshow = $langs->trans($valuetoshow);
-							}
-							elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units')
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units')
 							{
 								$langs->load('other');
 								$key = $langs->trans($obj->label);
 								$valuetoshow = ($obj->label && $key != strtoupper($obj->label) ? $key : $obj->{$fieldlist[$field]});
-							}
-							elseif ($fieldlist[$field] == 'code' && $id == 3) {
+							} elseif ($fieldlist[$field] == 'code' && $id == 3) {
 								$valuetoshow = $obj->state_code;
 							}
-                            $class .= ($class ? ' ' : '').'tddict';
-                            if ($fieldlist[$field] == 'note' && $id == 10) $class .= ' tdoverflowmax200';
-                            if ($fieldlist[$field] == 'tracking') $class .= ' tdoverflowauto';
-                            if ($fieldlist[$field] == 'position') $class .= ' right';
-                            if ($fieldlist[$field] == 'localtax1_type') $class .= ' nowrap';
-                            if ($fieldlist[$field] == 'localtax2_type') $class .= ' nowrap';
-                            // Show value for field
+							$class .= ($class ? ' ' : '').'tddict';
+							if ($fieldlist[$field] == 'note' && $id == 10) $class .= ' tdoverflowmax200';
+							if ($fieldlist[$field] == 'tracking') $class .= ' tdoverflowauto';
+							if ($fieldlist[$field] == 'position') $class .= ' right';
+							if ($fieldlist[$field] == 'localtax1_type') $class .= ' nowrap';
+							if ($fieldlist[$field] == 'localtax2_type') $class .= ' nowrap';
+							// Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
-                        }
-                    }
+						}
+					}
 
-                    // Can an entry be erased or disabled ?
-                    // all true by default
-                    $iserasable = 1;
-                    $canbedisabled = 1;
-                    $canbemodified = 1;
-                    if (isset($obj->code) && $id != 10)
-                    {
-                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; }
-                    	elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; }
-                    	elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
-                    }
+					// Can an entry be erased or disabled ?
+					// all true by default
+					$iserasable = 1;
+					$canbedisabled = 1;
+					$canbemodified = 1;
+					if (isset($obj->code) && $id != 10)
+					{
+						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
+					}
 					if ($id == 25 && in_array($obj->code, array('banner', 'blogpost', 'other', 'page')))
 					{
 						$iserasable = 0; $canbedisabled = 0;
 						if (in_array($obj->code, array('banner'))) $canbedisabled = 1;
 					}
-                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable = 0; }
-                    if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled = 0; $canbedisabled = 0; }
-                    $canbemodified = $iserasable;
-                    if ($obj->code == 'RECEP') $canbemodified = 1;
-                    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified = 1;
+					if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable = 0; }
+					if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled = 0; $canbedisabled = 0; }
+					$canbemodified = $iserasable;
+					if ($obj->code == 'RECEP') $canbemodified = 1;
+					if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified = 1;
 
-                    // Build Url. The table is id=, the id of line is rowid=
-                    $rowidcol = $tabrowid[$id];
-                    // If rowidcol not defined
-                    if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27, 32))) $rowidcol = 'rowid';
-                    $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol}:(!empty($obj->code) ?urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
-                    if (!empty($param)) $url .= '&'.$param;
-                    if (!is_null($withentity)) $url .= '&entity='.$withentity;
-                    $url .= '&';
+					// Build Url. The table is id=, the id of line is rowid=
+					$rowidcol = $tabrowid[$id];
+					// If rowidcol not defined
+					if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27, 32))) $rowidcol = 'rowid';
+					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol}:(!empty($obj->code) ?urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
+					if (!empty($param)) $url .= '&'.$param;
+					if (!is_null($withentity)) $url .= '&entity='.$withentity;
+					$url .= '&';
 
 					// Favorite
 					// Only activated on country dictionary
-                    if ($id == 4)
+					if ($id == 4)
 					{
 						print '<td class="nowrap center">';
 						if ($iserasable) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
@@ -1706,107 +1654,98 @@ if ($id)
 						print '</td>';
 					}
 
-                    // Active
-                    print '<td class="nowrap center">';
-                    if ($canbedisabled) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else
-                 	{
-                 		if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
-                 		elseif (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
-                  		elseif (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
-                    	else print $langs->trans("AlwaysActive");
-                    }
-                    print "</td>";
+					// Active
+					print '<td class="nowrap center">';
+					if ($canbedisabled) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+					else {
+				 		if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
+				 		elseif (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+				  		elseif (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
+						else print $langs->trans("AlwaysActive");
+					}
+					print "</td>";
 
-                    // Modify link
-                    if ($canbemodified) print '<td align="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
-                    else print '<td>&nbsp;</td>';
+					// Modify link
+					if ($canbemodified) print '<td align="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					else print '<td>&nbsp;</td>';
 
-                    // Delete link
-                    if ($iserasable)
-                    {
-                        print '<td class="center">';
-                        if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
-                        print '</td>';
-                    }
-                    else print '<td>&nbsp;</td>';
+					// Delete link
+					if ($iserasable)
+					{
+						print '<td class="center">';
+						if ($user->admin) print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
+						print '</td>';
+					} else print '<td>&nbsp;</td>';
 
-                    print "</tr>\n";
-                }
-                $i++;
-            }
-        }
+					print "</tr>\n";
+				}
+				$i++;
+			}
+		}
 
-        print '</table>';
-        print '</div>';
-    }
-    else {
-        dol_print_error($db);
-    }
+		print '</table>';
+		print '</div>';
+	} else {
+		dol_print_error($db);
+	}
 
-    print '</form>';
-}
-else
-{
-    /*
+	print '</form>';
+} else {
+	/*
      * Show list of dictionary to show
      */
 
-    $lastlineisempty = false;
+	$lastlineisempty = false;
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
-    print '<td>'.$langs->trans("Table").'</td>';
-    print '</tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
+	print '<td>'.$langs->trans("Table").'</td>';
+	print '</tr>';
 
-    $showemptyline = '';
-    foreach ($taborder as $i)
-    {
-        if (isset($tabname[$i]) && empty($tabcond[$i])) continue;
+	$showemptyline = '';
+	foreach ($taborder as $i)
+	{
+		if (isset($tabname[$i]) && empty($tabcond[$i])) continue;
 
-        if ($i)
-        {
-        	if ($showemptyline)
-        	{
-        		print '<tr class="oddeven"><td width="50%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
-        		$showemptyline = 0;
-        	}
+		if ($i)
+		{
+			if ($showemptyline)
+			{
+				print '<tr class="oddeven"><td width="50%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+				$showemptyline = 0;
+			}
 
 
-            $value = $tabname[$i];
-            print '<tr class="oddeven"><td width="50%">';
-            if (!empty($tabcond[$i]))
-            {
-                print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
-            }
-            else
-            {
-                print $langs->trans($tablib[$i]);
-            }
-            print '</td>';
-            print '<td>';
-            /*if (empty($tabcond[$i]))
+			$value = $tabname[$i];
+			print '<tr class="oddeven"><td width="50%">';
+			if (!empty($tabcond[$i]))
+			{
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
+			} else {
+				print $langs->trans($tablib[$i]);
+			}
+			print '</td>';
+			print '<td>';
+			/*if (empty($tabcond[$i]))
              {
              print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
              }*/
-            print '</td>';
-            print '<td>'.$tabname[$i].'</td></tr>';
-            $lastlineisempty = false;
-        }
-        else
-        {
-            if (!$lastlineisempty)
-            {
-                $showemptyline = 1;
-                $lastlineisempty = true;
-            }
-        }
-    }
-    print '</table>';
-    print '</div>';
+			print '</td>';
+			print '<td>'.$tabname[$i].'</td></tr>';
+			$lastlineisempty = false;
+		} else {
+			if (!$lastlineisempty)
+			{
+				$showemptyline = 1;
+				$lastlineisempty = true;
+			}
+		}
+	}
+	print '</table>';
+	print '</div>';
 }
 
 print '<br>';
@@ -1845,15 +1784,14 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			continue;
 		}
 
-	    if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto')))
-        {
-            $hidden = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'');
-            print '<td>';
-            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
-            print $langs->trans($hidden);
-            print '</td>';
-        }
-	    elseif ($fieldlist[$field] == 'country')
+		if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto')))
+		{
+			$hidden = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'');
+			print '<td>';
+			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
+			print $langs->trans($hidden);
+			print '</td>';
+		} elseif ($fieldlist[$field] == 'country')
 		{
 			if (in_array('region_id', $fieldlist))
 			{
@@ -1865,8 +1803,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			$fieldname = 'country';
 			print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : '')), $fieldname, '', 28, 'maxwidth150 maxwidthonsmartphone');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'country_id')
+		} elseif ($fieldlist[$field] == 'country_id')
 		{
 			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
 			{
@@ -1875,21 +1812,18 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
-		}
-		elseif ($fieldlist[$field] == 'region')
+		} elseif ($fieldlist[$field] == 'region')
 		{
 			print '<td>';
 			$formcompany->select_region($region_id, 'region');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'region_id')
+		} elseif ($fieldlist[$field] == 'region_id')
 		{
 			$region_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:0);
 			print '<td>';
 			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$region_id.'">';
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'lang')
+		} elseif ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
@@ -1908,75 +1842,65 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectarray('source', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'private')
+		} elseif ($fieldlist[$field] == 'private')
 		{
 			print '<td>';
 			print $form->selectyesno("private", (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
+		} elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm")
 		{
 			$type = (!empty($obj->type) ? $obj->type : 'user'); // Check if type is different of 'user' (external module)
 			print '<td>';
 			print $type.'<input type="hidden" name="type" value="'.$type.'">';
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX.'c_paiement')
+		} elseif ($fieldlist[$field] == 'type' && $tabname == MAIN_DB_PREFIX.'c_paiement')
 		{
 			print '<td>';
 			$select_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
 			print $form->selectarray($fieldlist[$field], $select_list, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'2'));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-		    if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
-		    else print '<td>';
+		} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+			if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
+			else print '<td>';
 			if ($fieldlist[$field] == 'type_cdr') {
 				print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			} else {
 				print $form->selectyesno($fieldlist[$field], (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 			}
 			print '</td>';
-		}
-		elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
+		} elseif (in_array($fieldlist[$field], array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
 			$class = "left";
 			if (in_array($fieldlist[$field], array('taux', 'localtax1', 'localtax2'))) $class = "center"; // Fields aligned on right
 			print '<td class="'.$class.'">';
 			print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
-		}
-		elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
-		    print '<td>';
-		    $transfound = 0;
-		    $transkey = '';
-	        // Special case for labels
-	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term')
-	        {
-	            $langs->load("bills");
-	            $transkey = "PaymentCondition".strtoupper($obj->code);
-    	        if ($langs->trans($transkey) != $transkey)
-                {
-                    $transfound = 1;
-                    print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
-                }
-	        }
-		    if (!$transfound)
-		    {
-		        print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'</textarea>';
-		    }
-            else {
-                print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
-            }
-		    print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+		} elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
+			print '<td>';
+			$transfound = 0;
+			$transkey = '';
+			// Special case for labels
+			if ($tabname == MAIN_DB_PREFIX.'c_payment_term')
+			{
+				$langs->load("bills");
+				$transkey = "PaymentCondition".strtoupper($obj->code);
+				if ($langs->trans($transkey) != $transkey)
+				{
+					$transfound = 1;
+					print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+				}
+			}
+			if (!$transfound)
+			{
+				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'</textarea>';
+			} else {
+				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
+			}
+			print '</td>';
+		} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
 			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
 			print '<td><input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'"></td>';
-		}
-		elseif ($fieldlist[$field] == 'unit') {
+		} elseif ($fieldlist[$field] == 'unit') {
 			print '<td>';
 			$units = array(
 					'mm' => $langs->trans('SizeUnitmm'),
@@ -1993,49 +1917,41 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td class="center">';
 			print $form->selectarray($fieldlist[$field], $localtax_typeList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
+		} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy')
 		{
 			print '<td>';
 			if (!empty($conf->accounting->enabled))
 			{
-			    $fieldname = $fieldlist[$field];
+				$fieldname = $fieldlist[$field];
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
 				print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
-			}
-			else
-			{
-			    $fieldname = $fieldlist[$field];
-			    print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
+			} else {
+				$fieldname = $fieldlist[$field];
+				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'fk_tva')
+		} elseif ($fieldlist[$field] == 'fk_tva')
 		{
 			print '<td>';
 			print $form->load_tva('fk_tva', $obj->taux, $mysoc, new Societe($db), 0, 0, '', false, -1);
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
+		} elseif ($fieldlist[$field] == 'fk_c_exp_tax_cat')
 		{
 			print '<td>';
 			print $form->selectExpenseCategories($obj->fk_c_exp_tax_cat);
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'fk_range')
+		} elseif ($fieldlist[$field] == 'fk_range')
 		{
 			print '<td>';
 			print $form->selectExpenseRanges($obj->fk_range);
 			print '</td>';
-		}
-		else
-		{
-            $fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
+		} else {
+			$fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
 
 			if ($fieldlist[$field] == 'sortorder')
-            {
-                $fieldlist[$field] = 'position';
-            }
+			{
+				$fieldlist[$field] = 'position';
+			}
 
 			$classtd = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
@@ -2043,30 +1959,29 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if (in_array($fieldlist[$field], array('libelle', 'label', 'tracking'))) $class = 'quatrevingtpercent';
 			print '<td class="'.$classtd.'">';
 			$transfound = 0;
-            $transkey = '';
+			$transkey = '';
 			if (in_array($fieldlist[$field], array('label', 'libelle')))		// For label
 			{
-			    // Special case for labels
-			    if ($tabname == MAIN_DB_PREFIX.'c_civility') {
-			        $transkey = "Civility".strtoupper($obj->code);
-			    }
-			    if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
-			        $langs->load("bills");
-			        $transkey = "PaymentConditionShort".strtoupper($obj->code);
-			    }
-			    if ($transkey && $langs->trans($transkey) != $transkey)
-			    {
-			        $transfound = 1;
-			        print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
-			    }
+				// Special case for labels
+				if ($tabname == MAIN_DB_PREFIX.'c_civility') {
+					$transkey = "Civility".strtoupper($obj->code);
+				}
+				if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
+					$langs->load("bills");
+					$transkey = "PaymentConditionShort".strtoupper($obj->code);
+				}
+				if ($transkey && $langs->trans($transkey) != $transkey)
+				{
+					$transfound = 1;
+					print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+				}
 			}
 			if (!$transfound)
 			{
-                print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
+				print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
+			} else {
+				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
 			}
-            else {
-                print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
-            }
 			print '</td>';
 		}
 	}
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 3c735707c4a..0227db8d969 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -136,8 +136,9 @@ class PrestaShopWebservice
 		{
 			if (isset($curl_params[$defkey]))
 				$curl_options[$defkey] = $curl_params[$defkey];
-			else
+			else {
 				$curl_options[$defkey] = $defaultParams[$defkey];
+			}
 		}
 		foreach ($curl_params as $defkey => $defval)
 			if (!isset($curl_options[$defkey]))
@@ -236,9 +237,9 @@ class PrestaShopWebservice
 				throw new PrestaShopWebserviceException('HTTP XML response is not parsable: '.$msg);
 			}
 			return $xml;
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('HTTP response is empty');
+		}
 	}
 
 	/**
@@ -264,9 +265,7 @@ class PrestaShopWebservice
 				$url .= '&id_shop='.$options['id_shop'];
 			if (isset($options['id_group_shop']))
 				$url .= '&id_group_shop='.$options['id_group_shop'];
-		}
-		else
-		{
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'POST', CURLOPT_POSTFIELDS => $xml));
@@ -323,9 +322,9 @@ class PrestaShopWebservice
 						$url_params[$k] = $options[$k];
 			if (count($url_params) > 0)
 				$url .= '?'.http_build_query($url_params);
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given ');
+		}
 
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
 		self::checkStatusCode($request['status_code']); // check the response validity
@@ -356,9 +355,9 @@ class PrestaShopWebservice
 						$url_params[$k] = $options[$k];
 			if (count($url_params) > 0)
 				$url .= '?'.http_build_query($url_params);
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
+		}
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true));
 		self::checkStatusCode($request['status_code']); // check the response validity
 		return $request['header'];
@@ -387,9 +386,9 @@ class PrestaShopWebservice
 				$url .= '&id_shop='.$options['id_shop'];
 			if (isset($options['id_group_shop']))
 				$url .= '&id_group_shop='.$options['id_group_shop'];
-		}
-		else
+		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
+		}
 
 		$request = self::executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml));
 		self::checkStatusCode($request['status_code']); // check the response validity
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index a229f3c985d..1d764a849be 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -101,8 +101,7 @@ class Dolistore
 	        $trace = $e->getTrace();
 	        if ($trace[0]['args'][0] == 404) die('Bad ID');
 	        elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
-	        else
-	        {
+	        else {
 	            print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
 	            print $e->getMessage();
 	        }
@@ -183,8 +182,7 @@ class Dolistore
 			$trace = $e->getTrace();
 			if ($trace[0]['args'][0] == 404) die('Bad ID');
 			elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
-			else
-			{
+			else {
 				print 'Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'<br>';
 				print $e->getMessage();
 			}
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 0c348b25f60..e11434c45d6 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -23,6 +23,7 @@
  */
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 // Load translation files required by the page
@@ -41,9 +42,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -55,9 +54,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -74,6 +71,10 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("ECMSetup"), $linkback, 'title_setup');
 print '<br>';
 
+$head = ecm_admin_prepare_head();
+
+dol_fiche_head($head, 'ecm', $langs->trans("ECM"), -1, 'ecm');
+
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Description").'</td>';
@@ -93,16 +94,13 @@ print '<td class="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
-}
-else
-{
+} else {
 	if (empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_ENABLED">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	elseif (!empty($conf->global->USER_MAIL_REQUIRED))
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ECM_AUTO_TREE_ENABLED&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	} elseif (!empty($conf->global->USER_MAIL_REQUIRED))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ECM_AUTO_TREE_ENABLED">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ECM_AUTO_TREE_ENABLED&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td></tr>';
diff --git a/htdocs/admin/ecm_directories_extrafields.php b/htdocs/admin/ecm_directories_extrafields.php
new file mode 100644
index 00000000000..77e21963e4c
--- /dev/null
+++ b/htdocs/admin/ecm_directories_extrafields.php
@@ -0,0 +1,123 @@
+<?php
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2004-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/admin/ecm_directories_extrafields.php
+ *  \ingroup    ecm
+ *  \brief      Page to setup extra fields of ecm
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+
+if (!$user->admin)
+	accessforbidden();
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'other', 'ecm'));
+
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
+
+$action = GETPOST('action', 'aZ09');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'ecm_directories'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+/*
+ * View
+ */
+
+$textobject = $langs->transnoentitiesnoconv("ECM");
+
+llxHeader('', $langs->trans("ECMSetup"));
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ECMSetup"), $linkback, 'title_setup');
+print "<br>\n";
+
+$head = ecm_admin_prepare_head();
+
+dol_fiche_head($head, 'attributes_ecm_directories', $langs->trans("ECM"), -1, 'ecm');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit') {
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation of an optional field                                              */
+/*                                                                            */
+/* ************************************************************************** */
+
+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';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition of an optional field                                                */
+/*                                                                            */
+/* ************************************************************************** */
+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';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/ecm_files_extrafields.php b/htdocs/admin/ecm_files_extrafields.php
new file mode 100644
index 00000000000..aaa507ca7c4
--- /dev/null
+++ b/htdocs/admin/ecm_files_extrafields.php
@@ -0,0 +1,123 @@
+<?php
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2004-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Philippe Grand          <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/admin/ecm_files_extrafields.php
+ *  \ingroup    ecm
+ *  \brief      Page to setup extra fields of ecm
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+
+if (!$user->admin)
+	accessforbidden();
+
+// Load translation files required by the page
+$langs->loadLangs(array('admin', 'other', 'ecm'));
+
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
+
+$action = GETPOST('action', 'aZ09');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'ecm_files'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+/*
+ * View
+ */
+
+$textobject = $langs->transnoentitiesnoconv("ECM");
+
+llxHeader('', $langs->trans("ECMSetup"));
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ECMSetup"), $linkback, 'title_setup');
+print "<br>\n";
+
+$head = ecm_admin_prepare_head();
+
+dol_fiche_head($head, 'attributes_ecm_files', $langs->trans("ECM"), -1, 'ecm');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit') {
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Creation of an optional field                                              */
+/*                                                                            */
+/* ************************************************************************** */
+
+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';
+}
+
+/* ************************************************************************** */
+/*                                                                            */
+/* Edition of an optional field                                                */
+/*                                                                            */
+/* ************************************************************************** */
+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';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 80161eaadc6..eb9ffb52831 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -45,7 +45,7 @@ $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'emailcollectorcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $operationid = GETPOST('operationid', 'int');
@@ -62,7 +62,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$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');
@@ -126,9 +126,7 @@ if (GETPOST('addfilter', 'alpha'))
 	if ($result > 0)
 	{
 		$object->fetchFilters();
-	}
-	else
-	{
+	} else {
 		setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
 	}
 }
@@ -141,9 +139,7 @@ if ($action == 'deletefilter')
 	if ($result > 0)
 	{
 		$object->fetchFilters();
-	}
-	else
-	{
+	} else {
 		setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
 	}
 }
@@ -152,7 +148,7 @@ if (GETPOST('addoperation', 'alpha'))
 {
 	$emailcollectoroperation = new EmailCollectorAction($db);
 	$emailcollectoroperation->type = GETPOST('operationtype', 'aZ09');
-	$emailcollectoroperation->actionparam = GETPOST('operationparam', 'none');
+	$emailcollectoroperation->actionparam = GETPOST('operationparam', 'restricthtml');
 	$emailcollectoroperation->fk_emailcollector = $object->id;
 	$emailcollectoroperation->status = 1;
 	$emailcollectoroperation->position = 50;
@@ -162,30 +158,26 @@ if (GETPOST('addoperation', 'alpha'))
 	if ($result > 0)
 	{
 		$object->fetchActions();
-	}
-	else
-	{
+	} else {
 		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
 	}
 }
 
 if ($action == 'updateoperation')
 {
-    $emailcollectoroperation = new EmailCollectorAction($db);
-    $emailcollectoroperation->fetch(GETPOST('rowidoperation2', 'int'));
+	$emailcollectoroperation = new EmailCollectorAction($db);
+	$emailcollectoroperation->fetch(GETPOST('rowidoperation2', 'int'));
 
-    $emailcollectoroperation->actionparam = GETPOST('operationparam2', 'none');
+	$emailcollectoroperation->actionparam = GETPOST('operationparam2', 'restricthtml');
 
-    $result = $emailcollectoroperation->update($user);
+	$result = $emailcollectoroperation->update($user);
 
-    if ($result > 0)
-    {
-        $object->fetchActions();
-    }
-    else
-    {
-        setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
-    }
+	if ($result > 0)
+	{
+		$object->fetchActions();
+	} else {
+		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+	}
 }
 if ($action == 'deleteoperation')
 {
@@ -195,9 +187,7 @@ if ($action == 'deleteoperation')
 	if ($result > 0)
 	{
 		$object->fetchActions();
-	}
-	else
-	{
+	} else {
 		setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
 	}
 }
@@ -209,13 +199,11 @@ if ($action == 'confirm_collect')
 	$res = $object->doCollectOneCollector();
 	if ($res > 0)
 	{
-	    $debuginfo = $object->debuginfo;
-	    setEventMessages($object->lastresult, null, 'mesgs');
-	}
-	else
-	{
-	    $debuginfo = $object->debuginfo;
-	    setEventMessages($object->error, null, 'errors');
+		$debuginfo = $object->debuginfo;
+		setEventMessages($object->lastresult, null, 'mesgs');
+	} else {
+		$debuginfo = $object->debuginfo;
+		setEventMessages($object->error, null, 'errors');
 	}
 
 	$action = '';
@@ -325,7 +313,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$object->fetchActions();
 
 	$head = emailcollectorPrepareHead($object);
-	dol_fiche_head($head, 'card', $langs->trans("EmailCollector"), -1, 'emailcollector');
+	dol_fiche_head($head, 'card', $langs->trans("EmailCollector"), -1, 'email');
 
 	$formconfirm = '';
 
@@ -432,25 +420,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			$connection = imap_open($connectstringsource, $object->login, $object->password);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			print $e->getMessage();
 		}
 
 		$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
-	}
-	else
-	{
+	} else {
 		$morehtml .= 'IMAP functions not available on your PHP';
 	}
 
 	if (!$connection)
 	{
 		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
-	}
-	else
-	{
+	} else {
 		$morehtml .= imap_num_msg($connection);
 	}
 
@@ -483,6 +466,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
 	// Filters
+	print '<div class="div-table-responsive">';
 	print '<table class="border centpercent tableforfield">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Filters").'</td><td></td><td></td>';
@@ -491,29 +475,34 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<tr class="oddeven">';
 	print '<td>';
 	$arrayoftypes = array(
-	    'from'=>array('label'=>'MailFrom', 'data-placeholder'=>$langs->trans('SearchString')),
-	    'to'=>array('label'=>'MailTo', 'data-placeholder'=>$langs->trans('SearchString')),
-	    'cc'=>array('label'=>'Cc', 'data-placeholder'=>$langs->trans('SearchString')),
-	    'bcc'=>array('label'=>'Bcc', 'data-placeholder'=>$langs->trans('SearchString')),
-	    'subject'=>array('label'=>'Subject', 'data-placeholder'=>$langs->trans('SearchString')),
-	    'body'=>array('label'=>'Body', 'data-placeholder'=>$langs->trans('SearchString')),
-	    // disabled because PHP imap_search is not compatible IMAPv4, only IMAPv2
-	    //'header'=>array('label'=>'Header', 'data-placeholder'=>'HeaderKey SearchString'),                // HEADER key value
-	    //'X1'=>'---',
-	    //'notinsubject'=>array('label'=>'SubjectNotIn', 'data-placeholder'=>'SearchString'),
-	    //'notinbody'=>array('label'=>'BodyNotIn', 'data-placeholder'=>'SearchString'),
-	    'X2'=>'---',
-	    'seen'=>array('label'=>'AlreadyRead', 'data-noparam'=>1),
-	    'unseen'=>array('label'=>'NotRead', 'data-noparam'=>1),
-	    'unanswered'=>array('label'=>'Unanswered', 'data-noparam'=>1),
-	    'answered'=>array('label'=>'Answered', 'data-noparam'=>1),
-	    'smaller'=>array('label'=>'SmallerThan', 'data-placeholder'=>$langs->trans('NumberOfBytes')),
-	    'larger'=>array('label'=>'LargerThan', 'data-placeholder'=>$langs->trans('NumberOfBytes')),
-	    'X3'=>'---',
-	    'withtrackingid'=>array('label'=>'WithDolTrackingID', 'data-noparam'=>1),
-	    'withouttrackingid'=>array('label'=>'WithoutDolTrackingID', 'data-noparam'=>1)
+		'from'=>array('label'=>'MailFrom', 'data-placeholder'=>$langs->trans('SearchString')),
+		'to'=>array('label'=>'MailTo', 'data-placeholder'=>$langs->trans('SearchString')),
+		'cc'=>array('label'=>'Cc', 'data-placeholder'=>$langs->trans('SearchString')),
+		'bcc'=>array('label'=>'Bcc', 'data-placeholder'=>$langs->trans('SearchString')),
+		'subject'=>array('label'=>'Subject', 'data-placeholder'=>$langs->trans('SearchString')),
+		'body'=>array('label'=>'Body', 'data-placeholder'=>$langs->trans('SearchString')),
+		// disabled because PHP imap_search is not compatible IMAPv4, only IMAPv2
+		//'header'=>array('label'=>'Header', 'data-placeholder'=>'HeaderKey SearchString'),                // HEADER key value
+		//'X1'=>'---',
+		//'notinsubject'=>array('label'=>'SubjectNotIn', 'data-placeholder'=>'SearchString'),
+		//'notinbody'=>array('label'=>'BodyNotIn', 'data-placeholder'=>'SearchString'),
+		'X2'=>'---',
+		'seen'=>array('label'=>'AlreadyRead', 'data-noparam'=>1),
+		'unseen'=>array('label'=>'NotRead', 'data-noparam'=>1),
+		'unanswered'=>array('label'=>'Unanswered', 'data-noparam'=>1),
+		'answered'=>array('label'=>'Answered', 'data-noparam'=>1),
+		'smaller'=>array('label'=>'SmallerThan', 'data-placeholder'=>$langs->trans('NumberOfBytes')),
+		'larger'=>array('label'=>'LargerThan', 'data-placeholder'=>$langs->trans('NumberOfBytes')),
+		'X3'=>'---',
+		'withtrackingid'=>array('label'=>'WithDolTrackingID', 'data-noparam'=>1),
+		'withouttrackingid'=>array('label'=>'WithoutDolTrackingID', 'data-noparam'=>1),
+		'withtrackingidinmsgid'=>array('label'=>'WithDolTrackingIDInMsgId', 'data-noparam'=>1),
+		'withouttrackingidinmsgid'=>array('label'=>'WithoutDolTrackingIDInMsgId', 'data-noparam'=>1),
+		'X4'=>'---',
+		'isnotanswer'=>array('label'=>'IsNotAnAnswer', 'data-noparam'=>1),
+		'isanswer'=>array('label'=>'IsAnAnswer', 'data-noparam'=>1)
 	);
-	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', '', 0, '', 2);
+	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth500', 0, '', 2);
 
 	print "\n";
 	print '<script>';
@@ -551,17 +540,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</td>';
 		print '<td>'.$rulefilter['rulevalue'].'</td>';
 		print '<td class="right">';
-		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletefilter&filterid='.$rulefilter['id'].'">'.img_delete().'</a>';
+		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletefilter&token='.urlencode(newToken()).'&filterid='.$rulefilter['id'].'">'.img_delete().'</a>';
 		print '</td>';
 		print '</tr>';
 	}
 
 	print '</tr>';
 	print '</table>';
+	print '</div>';
 
 	print '<div class="clearboth"></div><br>';
 
 	// Operations
+	print '<div class="div-table-responsive">';
 	print '<table id="tablelines" class="noborder noshadow tableforfield">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("EmailcollectorOperations").'</td><td></td><td></td><td></td>';
@@ -570,11 +561,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<tr class="oddeven">';
 	print '<td>';
 	$arrayoftypes = array(
-	    'loadthirdparty'=>$langs->trans('LoadThirdPartyFromName', $langs->transnoentities("ThirdPartyName")),
-	    'loadandcreatethirdparty'=>$langs->trans('LoadThirdPartyFromNameOrCreate', $langs->transnoentities("ThirdPartyName")),
-	    'recordevent'=>'RecordEvent');
+		'loadthirdparty'=>$langs->trans('LoadThirdPartyFromName', $langs->transnoentities("ThirdPartyName")),
+		'loadandcreatethirdparty'=>$langs->trans('LoadThirdPartyFromNameOrCreate', $langs->transnoentities("ThirdPartyName")),
+		'recordevent'=>'RecordEvent');
 	if ($conf->projet->enabled) $arrayoftypes['project'] = 'CreateLeadAndThirdParty';
 	if ($conf->ticket->enabled) $arrayoftypes['ticket'] = 'CreateTicketAndThirdParty';
+	if ($conf->recruitment->enabled) $arrayoftypes['candidature'] = 'CreateCandidature';
 
 	// support hook for add action
 	$parameters = array('arrayoftypes' => $arrayoftypes);
@@ -582,19 +574,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($res)
 		$arrayoftypes = $hookmanager->resArray;
-	else
-		foreach ($hookmanager->resArray as $k=>$desc)
+	else foreach ($hookmanager->resArray as $k=>$desc)
 			$arrayoftypes[$k] = $desc;
 
 
 	print $form->selectarray('operationtype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth300');
 	print '</td><td>';
 	print '<input type="text" name="operationparam">';
+	print '</td>';
+	print '<td>';
 	$htmltext = $langs->transnoentitiesnoconv("OperationParamDesc");
-	//var_dump($htmltext);
 	print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'operationparamtt');
 	print '</td>';
-	print '<td></td>';
 	print '<td class="right"><input type="submit" name="addoperation" id="addoperation" class="flat button" value="'.$langs->trans("Add").'"></td>';
 	print '</tr>';
 	// List operations
@@ -613,22 +604,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print $langs->trans($arrayoftypes[$ruleaction['type']]);
 		if (in_array($ruleaction['type'], array('recordevent')))
 		{
-            print $form->textwithpicto('', $langs->transnoentitiesnoconv('IfTrackingIDFoundEventWillBeLinked'));
-		}
-		elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
+			print $form->textwithpicto('', $langs->transnoentitiesnoconv('IfTrackingIDFoundEventWillBeLinked'));
+		} elseif (in_array($ruleaction['type'], array('loadthirdparty', 'loadandcreatethirdparty'))) {
 			print $form->textwithpicto('', $langs->transnoentitiesnoconv('EmailCollectorLoadThirdPartyHelp'));
 		}
 		print '</td>';
 		print '<td class="wordbreak">';
 		if ($action == 'editoperation' && $ruleaction['id'] == $operationid)
 		{
-		    print '<input type="text" class="quatrevingtquinzepercent" name="operationparam2" value="'.$ruleaction['actionparam'].'"><br>';
-		    print '<input type="hidden" name="rowidoperation2" value="'.$ruleaction['id'].'"><br>';
-		    print '<input type="submit" class="button" name="saveoperation2" value="'.$langs->trans("Save").'"> <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-		}
-		else
-		{
-		    print $ruleaction['actionparam'];
+			print '<input type="text" class="quatrevingtquinzepercent" name="operationparam2" value="'.$ruleaction['actionparam'].'"><br>';
+			print '<input type="hidden" name="rowidoperation2" value="'.$ruleaction['id'].'"><br>';
+			print '<input type="submit" class="button" name="saveoperation2" value="'.$langs->trans("Save").'"> <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+		} else {
+			print $ruleaction['actionparam'];
 		}
 		print '</td>';
 		// Move up/down
@@ -644,7 +632,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// Delete
 		print '<td class="right nowraponall">';
 		print '<a class="editfielda marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editoperation&operationid='.$ruleaction['id'].'">'.img_edit().'</a>';
-		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteoperation&operationid='.$ruleaction['id'].'">'.img_delete().'</a>';
+		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteoperation&token='.newToken().'&operationid='.$ruleaction['id'].'">'.img_delete().'</a>';
 		print '</td>';
 		print '</tr>';
 		$i++;
@@ -652,9 +640,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '</tr>';
 	print '</table>';
+	print '</div>';
 
 	if (!empty($conf->use_javascript_ajax)) {
-	    $urltorefreshaftermove = DOL_URL_ROOT.'/admin/emailcollector_card.php?id='.$id;
+		$urltorefreshaftermove = DOL_URL_ROOT.'/admin/emailcollector_card.php?id='.$id;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 	}
 
@@ -677,21 +666,27 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		if (empty($reshook))
 		{
+			// Edit
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Edit").'</a></div>';
 
 			// Clone
-		    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
 
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=collect">'.$langs->trans("CollectNow").'</a></div>';
+			// Collect now
+			if (count($object->actions) > 0) {
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=collect">'.$langs->trans("CollectNow").'</a></div>';
+			} else {
+				print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoOperations")).'">'.$langs->trans("CollectNow").'</a></div>';
+			}
 
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.urlencode(newToken()).'">'.$langs->trans('Delete').'</a></div>';
 		}
 		print '</div>'."\n";
 	}
 
 	if (!empty($debuginfo))
 	{
-	    print info_admin($debuginfo);
+		print info_admin($debuginfo);
 	}
 
 
@@ -712,7 +707,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
 	    $genallowed = $user->rights->emailcollector->read;	// If you can read, you can build the PDF to read content
 	    $delallowed = $user->rights->emailcollector->create;	// If you can create/edit, you can remove a file on card
-	    print $formfile->showdocuments('emailcollector', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+	    print $formfile->showdocuments('emailcollector', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 		*/
 	/*
 		// Show links to link elements
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index f180cdf10cf..d44f96e0877 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -31,10 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 dol_include_once('/emailcollector/class/emailcollector.class.php');
 
-if (!$user->admin) accessforbidden();
-if (empty($conf->emailcollector->enabled)) accessforbidden();
-
-// Load traductions files required by page
+// Load translation files required by page
 $langs->loadLangs(array("admin", "other"));
 
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
@@ -51,10 +48,10 @@ $id = GETPOST('id', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -86,11 +83,11 @@ if ($user->socid > 0)	// Protection if external user
 //$result = restrictedArea($user, 'emailcollector', $id, '');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alphanohtml');
 $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"
@@ -100,25 +97,47 @@ foreach ($object->fields as $key => $val)
 	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
 
-// Definition of fields for list
+// Definition of array of fields for columns
 $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 (!empty($val['visible'])) {
+		$visible = dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'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]));
+		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]),
+				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key]
+			);
+		}
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+$permissiontoread = $user->rights->emailcollector->read;
+$permissiontoadd = $user->rights->emailcollector->write;
+$permissiontodelete = $user->rights->emailcollector->delete;
+
+if (!$user->admin) accessforbidden();
+if (empty($conf->emailcollector->enabled)) accessforbidden('Module not enabled');
+
 
 
 /*
@@ -182,13 +201,14 @@ foreach ($object->fields as $key => $val)
 	$sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
-if (!empty($extrafields->attributes[$object->table_element]['label']))
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+}
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
-$sql = preg_replace('/, $/', '', $sql);
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $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).")";
@@ -197,6 +217,10 @@ 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 (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+		if ($search[$key] == '-1') $search[$key] = '';
+		$mode_search = 2;
+	}
 	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);
@@ -208,14 +232,15 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
-$sql.= " GROUP BY "
-foreach($object->fields as $key => $val)
+$sql.= " GROUP BY ";
+foreach ($object->fields as $key => $val)
 {
 	$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.', ' : '');
+}
 // Add where from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
@@ -238,13 +263,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	}
 }
 // 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)
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
-	$sql .= $db->plimit($limit + 1, $offset);
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
 	if (!$resql)
@@ -257,7 +280,7 @@ else
 }
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page)
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
@@ -293,7 +316,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)
 {
-	$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
@@ -304,7 +328,7 @@ $arrayofmassactions = array(
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->emailcollector->delete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+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();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
@@ -320,13 +344,9 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 
-$newcardbutton = '';
-//if ($user->rights->emailcollector->creer)
-//{
-$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', 'emailcollector_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']));
-//}
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', 'emailcollector_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, $newcardbutton.' '.$linkback, '', $limit);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'email', 0, $newcardbutton.' '.$linkback, '', $limit, 0, 0, 1);
 
 // Add code for pre mass action (confirmation or email presend form)
 /*$topicmail="";
@@ -335,12 +355,6 @@ $objecttmp=new EmailCollector($db);
 $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>';
-}
-
 $moreforfilter = '';
 /*$moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
@@ -363,7 +377,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
@@ -371,11 +385,20 @@ 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 ($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 = (empty($val['css']) ? '' : $val['css']);
+	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';
+	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 '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		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]).'">';
+		print '</td>';
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -397,11 +420,12 @@ 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 ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-    if (!empty($arrayfields['t.'.$key]['checked']))
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	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';
+	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";
     }
@@ -412,6 +436,7 @@ 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;
+// Action column
 print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 print '</tr>'."\n";
 
@@ -431,52 +456,46 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
+while ($i < ($limit ? min($num, $limit) : $num))
 {
 	$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 (property_exists($obj, $key)) $object->$key = $obj->$key;
-	}
+	$object->setVarsFromFetchObj($obj);
 
 	// 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';
+		$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('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';
-	        if ($cssforfield || $val['css']) print ' class="';
-	        print $cssforfield;
-	        if ($cssforfield && $val['css']) print ' ';
-	        print $val['css'];
-	        if ($cssforfield || $val['css']) print '"';
-	        print '>';
-			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;
-			}
+	    	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
 	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);
+	$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;
 	// Action column
@@ -484,13 +503,13 @@ while ($i < min($num, $limit))
 	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"' : '').'>';
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) $totalarray['nbfield']++;
 
-	print '</tr>';
+	print '</tr>'."\n";
 
 	$i++;
 }
@@ -532,8 +551,8 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	$urlsource .= str_replace('&amp;', '&', $param);
 
 	$filedir = $diroutputmassaction;
-	$genallowed = $user->rights->emailcollector->read;
-	$delallowed = $user->rights->emailcollector->create;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
 
 	print $formfile->showdocuments('massfilesarea_emailcollector', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php
index 75976f0b07b..37d1a795428 100644
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.php
@@ -36,13 +36,13 @@ if (!$user->admin) {
 $langs->loadLangs(array("users", "admin", "other"));
 
 $action = GETPOST('action', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'auditeventslist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
@@ -102,7 +102,7 @@ print '<input type="hidden" name="action" value="save">';
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'audit', $langs->trans("Security"), -1);
+dol_fiche_head($head, 'audit', '', -1);
 
 print '<table class="noborder" width="100%">';
 print "<tr class=\"liste_titre\">";
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 4fc0e241dc0..56f4f5a9be2 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array("admin", "sendings", "deliveries", "other"));
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -48,7 +48,7 @@ $type = 'shipping';
 
 if (empty($conf->global->EXPEDITION_ADDON_NUMBER))
 {
-    $conf->global->EXPEDITION_ADDON_NUMBER = 'mod_expedition_safor';
+	$conf->global->EXPEDITION_ADDON_NUMBER = 'mod_expedition_safor';
 }
 
 
@@ -69,14 +69,11 @@ if ($action == 'updateMask')
 	{
 		if ($res > 0)
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("Error"), null, 'errors');
+		else setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'set_param')
+} elseif ($action == 'set_param')
 {
-	$freetext = GETPOST('SHIPPING_FREE_TEXT', 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST('SHIPPING_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 	if ($res <= 0)
 	{
@@ -96,9 +93,7 @@ elseif ($action == 'set_param')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -110,7 +105,7 @@ elseif ($action == 'specimen')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/expedition/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/expedition/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -129,15 +124,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expedition&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -147,14 +138,12 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->EXPEDITION_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPEDITION_ADDON_PDF', $conf->entity);
+		if ($conf->global->EXPEDITION_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPEDITION_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -174,9 +163,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmodel')
+} elseif ($action == 'setmodel')
 {
 	dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
@@ -244,24 +231,21 @@ 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)) {
+						// 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";
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->EXPEDITION_ADDON_NUMBER == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;token='.newToken().'&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -274,16 +258,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($mysoc, $expedition);
-                        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);
@@ -312,7 +296,7 @@ $def = array();
 
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 
 $resql = $db->query($sql);
@@ -326,9 +310,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -346,113 +328,107 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$dir = dol_buildpath($reldir."core/modules/expedition".$valdir);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$dir = dol_buildpath($reldir."core/modules/expedition".$valdir);
 
-        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><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><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&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 class="reposition" 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 class="reposition" 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->EXPEDITION_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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->EXPEDITION_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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("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);
+								// 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("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>';
+								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.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($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.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
@@ -485,13 +461,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnShippings"), $langs->tr
 $variablename = 'SHIPPING_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    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();
+	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();
 }
 print "</td></tr>\n";
 
diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
index e40519f9104..d9bf58027f8 100644
--- a/htdocs/admin/expedition_extrafields.php
+++ b/htdocs/admin/expedition_extrafields.php
@@ -47,7 +47,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'expedition'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php
index 03cd140d0ee..a00816d9d75 100644
--- a/htdocs/admin/expeditiondet_extrafields.php
+++ b/htdocs/admin/expeditiondet_extrafields.php
@@ -48,7 +48,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'expeditiondet'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index d076e77bf44..3ac71cfa6b0 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('admin', 'errors', 'trips', 'other'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -63,14 +63,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For fiche inter
+} elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -103,15 +99,11 @@ elseif ($action == 'specimen') // For fiche inter
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -125,9 +117,7 @@ elseif ($action == 'set')
 	{
 		dolibarr_set_const($db, 'EXPENSEREPORT_ADDON_PDF', $value, 'chaine', 0, '', $conf->entity);
 	}
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -152,21 +142,17 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "EXPENSEREPORT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'setoptions')
+} elseif ($action == 'setoptions')
 {
     $db->begin();
 
-	$freetext = GETPOST('EXPENSEREPORT_FREE_TEXT', 'none'); // No alpha here, we want exact string
+	$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);
 
 	$draft = GETPOST('EXPENSEREPORT_DRAFT_WATERMARK', 'alpha');
@@ -178,9 +164,7 @@ elseif ($action == 'setoptions')
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -263,10 +247,8 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->EXPENSEREPORT_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -315,7 +297,7 @@ $type = 'expensereport';
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -328,9 +310,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -391,15 +371,13 @@ foreach ($dirmodels as $reldir)
 		    				if (in_array($name, $def))
 		    				{
 		    					print '<td class="center">'."\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+		    					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
-		    				{
+		    				} else {
 		    					print '<td class="center">'."\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+		    					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>";
 		    				}
 
@@ -408,10 +386,8 @@ foreach ($dirmodels as $reldir)
 		    				if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
-		    				}
-		    				else
-		    				{
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</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).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
 
@@ -434,9 +410,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($module->type == 'pdf')
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -484,9 +458,7 @@ $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>';
-}
-else
-{
+} else {
     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/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index bc0f52120fb..ba29df4b766 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -44,7 +44,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'expensereport'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index 83bb28ca440..f55e78d4105 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -35,13 +35,11 @@ $langs->loadLangs(array("admin", "trips", "errors", "other", "dict"));
 
 if (!$user->admin) accessforbidden();
 
-//Init error
-$error = false;
-$message = false;
+$error = 0;
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
-$offset = GETPOST('offset', 'int');
+$ikoffset = GETPOST('ikoffset', 'int');
 $coef = GETPOST('coef', 'int');
 
 $fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat');
@@ -59,12 +57,14 @@ if ($action == 'updateik')
 	$expIk->setValues($_POST);
 	$result = $expIk->create($user);
 
-	if ($result > 0) setEventMessages('SetupSaved', null, 'mesgs');
-
-	header('Location: '.$_SERVER['PHP_SELF']);
-	exit;
-}
-elseif ($action == 'delete') // TODO add confirm
+	if ($result > 0) {
+		setEventMessages('SetupSaved', null, 'mesgs');
+		header('Location: '.$_SERVER['PHP_SELF']);
+		exit;
+	} else {
+		setEventMessages($expIk->error, $expIk->errors, 'errors');
+	}
+} elseif ($action == 'delete') // TODO add confirm
 {
 	$expIk = new ExpenseReportIk($db);
 	if ($id > 0)
@@ -82,6 +82,7 @@ elseif ($action == 'delete') // TODO add confirm
 
 $rangesbycateg = ExpenseReportIk::getAllRanges();
 
+
 /*
  * View
  */
@@ -91,12 +92,13 @@ llxHeader('', $langs->trans("ExpenseReportsSetup"));
 $form = new Form($db);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ExpenseReportsIkSetup"), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
 
 $head = expensereport_admin_prepare_head();
 dol_fiche_head($head, 'expenseik', $langs->trans("ExpenseReportsIk"), -1, 'trip');
 
-echo $langs->trans('ExpenseReportIkDesc');
+echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportIkDesc').'</span>';
+print '<br><br>';
 
 echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
 
@@ -137,21 +139,23 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 		echo '<tr class="oddeven">';
 
 		// Label
-		echo '<td width="20%"><b>['.$langs->trans('RangeNum', $tranche++).']</b> - '.$label.'</td>';
+		echo '<td class="nowraponall"><b>['.$langs->trans('RangeNum', $tranche++).']</b> - '.$label.'</td>';
 
 		// Offset
-		echo '<td width="20%">';
-		if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) echo '<input type="text" name="offset" value="'.$range->ik->offset.'" />';
-		else echo $range->ik->offset;
+		echo '<td class="nowraponall">';
+		if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) echo '<input type="text" class="maxwidth100" name="ikoffset" value="'.$range->ik->ikoffset.'" />';
+		else {
+			echo $range->ik->ikoffset;
+		}
 		echo '</td>';
 		// Coef
-		echo '<td width="20%">';
-		if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) echo '<input type="text" name="coef" value="'.$range->ik->coef.'" />';
+		echo '<td class="nowraponall">';
+		if ($action == 'edit' && $range->ik->id == $id && $range->rowid == $fk_range && $range->fk_c_exp_tax_cat == $fk_c_exp_tax_cat) echo '<input type="text" class="maxwidth100" name="coef" value="'.$range->ik->coef.'" />';
 		else echo ($range->ik->id > 0 ? $range->ik->coef : $langs->trans('expenseReportCoefUndefined'));
 		echo '</td>';
 
 		// Total for one
-		echo '<td width="30%">'.$langs->trans('expenseReportPrintExample', price($range->ik->offset + 5 * $range->ik->coef)).'</td>';
+		echo '<td class="nowraponall">'.$langs->trans('expenseReportPrintExample', price($range->ik->ikoffset + 5 * $range->ik->coef)).'</td>';
 
 		// Action
 		echo '<td class="right">';
@@ -161,11 +165,9 @@ foreach ($rangesbycateg as $fk_c_exp_tax_cat => $Tab)
 			{
 				echo '<input id="" class="button" name="save" value="'.$langs->trans('Save').'" type="submit" />';
 				echo '<input class="button" value="'.$langs->trans('Cancel').'" onclick="javascript:history.go(-1)" type="button" />';
-			}
-			else
-			{
-				echo '<a href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$range->ik->id.'&fk_c_exp_tax_cat='.$range->fk_c_exp_tax_cat.'&fk_range='.$range->rowid.'">'.img_edit().'</a>';
-				if (!empty($range->ik->id)) echo '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$range->ik->id.'">'.img_delete().'</a>';
+			} else {
+				echo '<a class="editfielda marginrightonly paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$range->ik->id.'&fk_c_exp_tax_cat='.$range->fk_c_exp_tax_cat.'&fk_range='.$range->rowid.'">'.img_edit().'</a>';
+				if (!empty($range->ik->id)) echo '<a class="paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$range->ik->id.'">'.img_delete().'</a>';
 				// TODO add delete link
 			}
 		}
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index a40e8d95520..e0012139154 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -40,7 +40,7 @@ if (!$user->admin) accessforbidden();
 $error = false;
 $message = false;
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 
 $apply_to = GETPOST('apply_to');
@@ -100,11 +100,11 @@ if ($action == 'save')
 			$object->fk_user = (int) $fk_user;
 			$object->fk_usergroup = 0;
 			$object->is_for_all = 0;
-		}elseif ($apply_to == 'G') {
+		} elseif ($apply_to == 'G') {
 			$object->fk_usergroup = (int) $fk_usergroup;
 			$object->fk_user = 0;
 			$object->is_for_all = 0;
-		}elseif ($apply_to == 'A') {
+		} elseif ($apply_to == 'A') {
 			$object->is_for_all = 1;
 			$object->fk_user = 0;
 			$object->fk_usergroup = 0;
@@ -122,8 +122,7 @@ if ($action == 'save')
 		header('Location: '.$_SERVER['PHP_SELF']);
 		exit;
 	}
-}
-elseif ($action == 'delete')
+} elseif ($action == 'delete')
 {
 	// TODO add confirm
 	$res = $object->delete($user);
@@ -139,6 +138,7 @@ $rules = ExpenseReportRule::getAllRule();
 $tab_apply = array('A' => $langs->trans('All'), 'G' => $langs->trans('Group'), 'U' => $langs->trans('User'));
 $tab_rules_type = array('EX_DAY' => $langs->trans('Day'), 'EX_MON' => $langs->trans('Month'), 'EX_YEA' => $langs->trans('Year'), 'EX_EXP' => $langs->trans('OnExpense'));
 
+
 /*
  * View
  */
@@ -148,12 +148,13 @@ llxHeader('', $langs->trans("ExpenseReportsSetup"));
 $form = new Form($db);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ExpenseReportsRulesSetup"), $linkback, 'title_setup');
+print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
 
 $head = expensereport_admin_prepare_head();
 dol_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
 
-echo $langs->trans('ExpenseReportRulesDesc');
+echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportRulesDesc').'</span>';
+print '<br><br>';
 
 if ($action != 'edit')
 {
@@ -165,7 +166,7 @@ if ($action != 'edit')
 
 	echo '<tr class="liste_titre">';
 	echo '<th>'.$langs->trans('ExpenseReportApplyTo').'</th>';
-	echo '<th>'.$langs->trans('ExpenseReportDomain').'</th>';
+	echo '<th>'.$langs->trans('Type').'</th>';
 	echo '<th>'.$langs->trans('ExpenseReportLimitOn').'</th>';
 	echo '<th>'.$langs->trans('ExpenseReportDateStart').'</th>';
 	echo '<th>'.$langs->trans('ExpenseReportDateEnd').'</th>';
@@ -185,7 +186,7 @@ if ($action != 'edit')
 	echo '<td>'.$form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0).'</td>';
 	echo '<td>'.$form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0).'</td>';
 	echo '<td>'.$form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0).'</td>';
-	echo '<td><input type="text" value="" name="amount" class="amount" />'.$conf->currency.'</td>';
+	echo '<td><input type="text" value="" class="maxwidth100" name="amount" class="amount" /> '.$conf->currency.'</td>';
 	echo '<td>'.$form->selectyesno('restrictive', 0, 1).'</td>';
 	echo '<td class="right"><input type="submit" class="button" value="'.$langs->trans('Add').'" /></td>';
 	echo '</tr>';
@@ -208,7 +209,7 @@ echo '<table class="noborder centpercent">';
 
 echo '<tr class="liste_titre">';
 echo '<th>'.$langs->trans('ExpenseReportApplyTo').'</th>';
-echo '<th>'.$langs->trans('ExpenseReportDomain').'</th>';
+echo '<th>'.$langs->trans('Type').'</th>';
 echo '<th>'.$langs->trans('ExpenseReportLimitOn').'</th>';
 echo '<th>'.$langs->trans('ExpenseReportDateStart').'</th>';
 echo '<th>'.$langs->trans('ExpenseReportDateEnd').'</th>';
@@ -228,9 +229,7 @@ foreach ($rules as $rule)
 		echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, $selected, 0).'</div>';
 		echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>';
 		echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>';
-	}
-	else
-	{
+	} else {
 		if ($rule->is_for_all > 0) echo $tab_apply['A'];
 		elseif ($rule->fk_usergroup > 0) echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
 		elseif ($rule->fk_user > 0) echo $tab_apply['U'].' ('.$rule->getUserName().')';
@@ -242,12 +241,9 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
-	}
-	else
-	{
+	} else {
 		if ($rule->fk_c_type_fees == -1) echo $langs->trans('AllExpenseReport');
-		else
-		{
+		else {
 			$key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
 			if ($key != $langs->trans($key)) echo $langs->trans($key);
 			else echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
@@ -260,9 +256,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo $form->selectarray('code_expense_rules_type', $tab_rules_type, $object->code_expense_rules_type, 0);
-	}
-	else
-	{
+	} else {
 		echo $tab_rules_type[$rule->code_expense_rules_type];
 	}
 	echo '</td>';
@@ -272,9 +266,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0);
-	}
-	else
-	{
+	} else {
 		echo dol_print_date($rule->dates, 'day');
 	}
 	echo '</td>';
@@ -284,9 +276,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
-	}
-	else
-	{
+	} else {
 		echo dol_print_date($rule->datee, 'day');
 	}
 	echo '</td>';
@@ -296,9 +286,7 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount" />'.$conf->currency;
-	}
-	else
-	{
+	} else {
 		echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
 	}
 	echo '</td>';
@@ -308,22 +296,18 @@ foreach ($rules as $rule)
 	if ($action == 'edit' && $object->id == $rule->id)
 	{
 		echo $form->selectyesno('restrictive', $object->restrictive, 1);
-	}
-	else
-	{
+	} else {
 		echo yn($rule->restrictive, 1, 1);
 	}
 	echo '</td>';
 
 
-	echo '<td>';
+	echo '<td class="center">';
 	if ($object->id != $rule->id)
 	{
-		echo '<a href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
-		echo '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$rule->id.'">'.img_delete().'</a>';
-	}
-	else
-	{
+		echo '<a class="editfielda paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
+		echo '<a class="paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$rule->id.'">'.img_delete().'</a>';
+	} else {
 		echo '<input type="submit" class="button" value="'.$langs->trans('Update').'" />&nbsp;';
 		echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button">'.$langs->trans('Cancel').'</a>';
 	}
diff --git a/htdocs/admin/export.php b/htdocs/admin/export.php
index ef6a7c3108f..ae7faafa937 100644
--- a/htdocs/admin/export.php
+++ b/htdocs/admin/export.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('admin', 'exports', 'other'));
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -90,12 +90,12 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("EXPORTS_SHARE_MODELS").'</td>';
 print '<td class="center" width="20">&nbsp;</td>';
 print '<td class="center" width="100">';
-echo ajax_constantonoff('EXPORTS_SHARE_MODELS');
+print ajax_constantonoff('EXPORTS_SHARE_MODELS');
 print '</td></tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ExportCsvSeparator").'</td>';
-print '<td width="60" align="center">'."<input size=\"3\" class=\"flat\" type=\"text\" name=\"EXPORT_CSV_SEPARATOR_TO_USE\" value=\"".(empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->EXPORT_CSV_SEPARATOR_TO_USE)."\"></td>";
+print '<td width="60" align="center"><input class="flat width50" maxlength="3" type="text" name="EXPORT_CSV_SEPARATOR_TO_USE" value="'.(empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE) ? ',' : $conf->global->EXPORT_CSV_SEPARATOR_TO_USE).'"></td>';
 print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 print '</tr>';
 
diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php
index 8aa1a425778..7f5bcde4b3d 100644
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.php
@@ -60,9 +60,7 @@ if ($result)
         preg_match('/([0-9]+)$/i', $obj->name, $reg);
         if ($reg[1] && $reg[1] > $lastexternalrss) $lastexternalrss = $reg[1];
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -82,8 +80,8 @@ if ($action == 'add' || GETPOST("modify"))
 		{
 			// Supprime boite box_external_rss de definition des boites
             /* $sql = "UPDATE ".MAIN_DB_PREFIX."boxes_def";
-			$sql.= " SET name = '".$boxlabel."'";
-	        $sql.= " WHERE file ='box_external_rss.php' AND note like '".$_POST["norss"]." %'";
+			$sql.= " SET name = '".$db->escape($boxlabel)."'";
+	        $sql.= " WHERE file ='box_external_rss.php' AND note like '".$db->escape($_POST["norss"])." %'";
 
 			$resql=$db->query($sql);
 			if (! $resql)
@@ -92,9 +90,7 @@ if ($action == 'add' || GETPOST("modify"))
 				exit;
 	        }
             */
-		}
-		else
-		{
+		} else {
 			// Ajoute boite box_external_rss dans definition des boites
 	        $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')).")')";
@@ -113,9 +109,7 @@ if ($action == 'add' || GETPOST("modify"))
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -161,9 +155,7 @@ if ($_POST["delete"])
 			}
 
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			dol_print_error($db, "sql=".$sql);
 			exit;
@@ -178,9 +170,7 @@ if ($_POST["delete"])
             $db->commit();
             header("Location: external_rss.php");
             exit;
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -292,9 +282,7 @@ if ($resql)
 	    if ($result > 0 && empty($rss->error))
 	    {
 			print '<font class="ok">'.$langs->trans("Online").'</div>';
-		}
-		else
-		{
+		} else {
 			print '<font class="error">'.$langs->trans("Offline");
 			$langs->load("errors");
 			if ($rssparser->error) print ' - '.$langs->trans($rssparser->error);
@@ -331,9 +319,7 @@ if ($resql)
 
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 1a484ec8c7e..0c12f11b4a3 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('admin', 'errors', 'other', 'bills'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -53,86 +53,77 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask')
 {
-    $maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
-    $maskconstreplacement = GETPOST('maskconstreplacement', 'alpha');
-    $maskconstcredit = GETPOST('maskconstcredit', 'alpha');
+	$maskconstinvoice = GETPOST('maskconstinvoice', 'alpha');
+	$maskconstreplacement = GETPOST('maskconstreplacement', 'alpha');
+	$maskconstcredit = GETPOST('maskconstcredit', 'alpha');
 	$maskconstdeposit = GETPOST('maskconstdeposit', 'alpha');
-    $maskinvoice = GETPOST('maskinvoice', 'alpha');
-    $maskreplacement = GETPOST('maskreplacement', 'alpha');
-    $maskcredit = GETPOST('maskcredit', 'alpha');
+	$maskinvoice = GETPOST('maskinvoice', 'alpha');
+	$maskreplacement = GETPOST('maskreplacement', 'alpha');
+	$maskcredit = GETPOST('maskcredit', 'alpha');
 	$maskdeposit = GETPOST('maskdeposit', 'alpha');
-    if ($maskconstinvoice) $res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
-    if ($maskconstreplacement) $res = dolibarr_set_const($db, $maskconstreplacement, $maskreplacement, 'chaine', 0, '', $conf->entity);
-    if ($maskconstcredit)  $res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
+	if ($maskconstinvoice) $res = dolibarr_set_const($db, $maskconstinvoice, $maskinvoice, 'chaine', 0, '', $conf->entity);
+	if ($maskconstreplacement) $res = dolibarr_set_const($db, $maskconstreplacement, $maskreplacement, 'chaine', 0, '', $conf->entity);
+	if ($maskconstcredit)  $res = dolibarr_set_const($db, $maskconstcredit, $maskcredit, 'chaine', 0, '', $conf->entity);
 	if ($maskconstdeposit)  $res = dolibarr_set_const($db, $maskconstdeposit, $maskdeposit, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-elseif ($action == 'specimen')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen')
 {
-    $modele = GETPOST('module', 'alpha');
+	$modele = GETPOST('module', 'alpha');
 
-    $facture = new Facture($db);
-    $facture->initAsSpecimen();
+	$facture = new Facture($db);
+	$facture->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/facture/doc/pdf_".$modele.".modules.php", 0);
-    	if (file_exists($file))
-    	{
-    		$filefound = 1;
-    		$classname = "pdf_".$modele;
-    		break;
-    	}
-    }
+		$file = dol_buildpath($reldir."core/modules/facture/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($facture, $langs) > 0)
-    	{
-    		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture&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&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
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->FACTURE_ADDON_PDF == "$value") dolibarr_del_const($db, 'FACTURE_ADDON_PDF', $conf->entity);
+		if ($conf->global->FACTURE_ADDON_PDF == "$value") dolibarr_del_const($db, 'FACTURE_ADDON_PDF', $conf->entity);
 	}
 }
 // Set default model
@@ -151,108 +142,91 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-elseif ($action == 'setmod')
+} 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, "FACTURE_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'setribchq')
+	dolibarr_set_const($db, "FACTURE_ADDON", $value, 'chaine', 0, '', $conf->entity);
+} elseif ($action == 'setribchq')
 {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
 
 	$res = dolibarr_set_const($db, "FACTURE_RIB_NUMBER", $rib, 'chaine', 0, '', $conf->entity);
-    $res = dolibarr_set_const($db, "FACTURE_CHQ_NUMBER", $chq, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "FACTURE_CHQ_NUMBER", $chq, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-elseif ($action == 'set_FACTURE_DRAFT_WATERMARK')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'set_FACTURE_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('FACTURE_DRAFT_WATERMARK', 'alpha');
 
-    $res = dolibarr_set_const($db, "FACTURE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "FACTURE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
-elseif ($action == 'set_INVOICE_FREE_TEXT')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'set_INVOICE_FREE_TEXT')
 {
-	$freetext = GETPOST('INVOICE_FREE_TEXT', 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST('INVOICE_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 
-    $res = dolibarr_set_const($db, "INVOICE_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "INVOICE_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-elseif ($action == 'setforcedate')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'setforcedate')
 {
 	$forcedate = GETPOST('forcedate', 'alpha');
 
-    $res = dolibarr_set_const($db, "FAC_FORCE_DATE_VALIDATION", $forcedate, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "FAC_FORCE_DATE_VALIDATION", $forcedate, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-elseif ($action == 'setDefaultPDFModulesByType')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'setDefaultPDFModulesByType')
 {
-    $invoicetypemodels = GETPOST('invoicetypemodels');
+	$invoicetypemodels = GETPOST('invoicetypemodels');
 
-    if (!empty($invoicetypemodels) && is_array($invoicetypemodels))
-    {
-        $error = 0;
+	if (!empty($invoicetypemodels) && is_array($invoicetypemodels))
+	{
+		$error = 0;
 
-        foreach ($invoicetypemodels as $type => $value)
-        {
-            $res = dolibarr_set_const($db, 'FACTURE_ADDON_PDF_'.intval($type), $value, 'chaine', 0, '', $conf->entity);
-            if (!$res > 0) $error++;
-        }
+		foreach ($invoicetypemodels as $type => $value)
+		{
+			$res = dolibarr_set_const($db, 'FACTURE_ADDON_PDF_'.intval($type), $value, 'chaine', 0, '', $conf->entity);
+			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');
+		}
+	}
 }
 
 
@@ -293,146 +267,144 @@ clearstatcache();
 foreach ($dirmodels as $reldir)
 {
 	$dir = dol_buildpath($reldir."core/modules/facture/");
-    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_facture_".$file;
-                    }
-                    // Check if there is a filter on country
-                    preg_match('/\-(.*)_(.*)$/', $classname, $reg);
-                    if (!empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue;
+	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_facture_".$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_facture_/', '', preg_replace('/\.php$/', '', $file)));
-                            print "</td><td>\n";
+						if ($module->isEnabled())
+						{
+							print '<tr class="oddeven"><td width="100">';
+							echo preg_replace('/\-.*$/', '', preg_replace('/mod_facture_/', '', 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->FACTURE_ADDON." - ".$file;
-                            if ($conf->global->FACTURE_ADDON == $file || $conf->global->FACTURE_ADDON.'.php' == $file)
-                            {
-                                print img_picto($langs->trans("Activated"), 'switch_on');
-                            }
-                            else
-                            {
-                                print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&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->FACTURE_ADDON." - ".$file;
+							if ($conf->global->FACTURE_ADDON == $file || $conf->global->FACTURE_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).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							}
+							print '</td>';
 
-                            $facture = new Facture($db);
-                            $facture->initAsSpecimen();
+							$facture = new Facture($db);
+							$facture->initAsSpecimen();
 
-                            // Example for standard invoice
-                            $htmltooltip = '';
-                            $htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                            $facture->type = 0;
-                            $nextval = $module->getNextValue($mysoc, $facture);
-                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                                $htmltooltip .= $langs->trans("NextValueForInvoices").': ';
-                                if ($nextval) {
-                                    if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                        $nextval = $langs->trans($nextval);
-                                    $htmltooltip .= $nextval.'<br>';
-                                } else {
-                                    $htmltooltip .= $langs->trans($module->error).'<br>';
-                                }
-                            }
-                            // Example for remplacement
-                            $facture->type = 1;
-                            $nextval = $module->getNextValue($mysoc, $facture);
-                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                                $htmltooltip .= $langs->trans("NextValueForReplacements").': ';
-                                if ($nextval) {
-                                    if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                        $nextval = $langs->trans($nextval);
-                                    $htmltooltip .= $nextval.'<br>';
-                                } else {
-                                    $htmltooltip .= $langs->trans($module->error).'<br>';
-                                }
-                            }
+							// Example for standard invoice
+							$htmltooltip = '';
+							$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+							$facture->type = 0;
+							$nextval = $module->getNextValue($mysoc, $facture);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+								$htmltooltip .= $langs->trans("NextValueForInvoices").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval.'<br>';
+								} else {
+									$htmltooltip .= $langs->trans($module->error).'<br>';
+								}
+							}
+							// Example for remplacement
+							$facture->type = 1;
+							$nextval = $module->getNextValue($mysoc, $facture);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+								$htmltooltip .= $langs->trans("NextValueForReplacements").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval.'<br>';
+								} else {
+									$htmltooltip .= $langs->trans($module->error).'<br>';
+								}
+							}
 
-                            // Example for credit invoice
-                            $facture->type = 2;
-                            $nextval = $module->getNextValue($mysoc, $facture);
-                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                                $htmltooltip .= $langs->trans("NextValueForCreditNotes").': ';
-                                if ($nextval) {
-                                    if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                        $nextval = $langs->trans($nextval);
-                                    $htmltooltip .= $nextval.'<br>';
-                                } else {
-                                    $htmltooltip .= $langs->trans($module->error).'<br>';
-                                }
-                            }
-                            // Example for deposit invoice
-                            $facture->type = 3;
-                            $nextval = $module->getNextValue($mysoc, $facture);
-                            if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
-                                $htmltooltip .= $langs->trans("NextValueForDeposit").': ';
-                                if ($nextval) {
-                                    if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
-                                        $nextval = $langs->trans($nextval);
-                                    $htmltooltip .= $nextval;
-                                } else {
-                                    $htmltooltip .= $langs->trans($module->error);
-                                }
-                            }
+							// Example for credit invoice
+							$facture->type = 2;
+							$nextval = $module->getNextValue($mysoc, $facture);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+								$htmltooltip .= $langs->trans("NextValueForCreditNotes").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval.'<br>';
+								} else {
+									$htmltooltip .= $langs->trans($module->error).'<br>';
+								}
+							}
+							// Example for deposit invoice
+							$facture->type = 3;
+							$nextval = $module->getNextValue($mysoc, $facture);
+							if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+								$htmltooltip .= $langs->trans("NextValueForDeposit").': ';
+								if ($nextval) {
+									if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										$nextval = $langs->trans($nextval);
+									$htmltooltip .= $nextval;
+								} else {
+									$htmltooltip .= $langs->trans($module->error);
+								}
+							}
 
-                            print '<td class="center">';
-                            print $form->textwithpicto('', $htmltooltip, 1, 0);
+							print '<td class="center">';
+							print $form->textwithpicto('', $htmltooltip, 1, 0);
 
-                            if ($conf->global->FACTURE_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->FACTURE_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>';
@@ -449,23 +421,21 @@ $type = 'invoice';
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $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++;
-    }
-}
-else
-{
-    dol_print_error($db);
+	$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);
 }
 
 print '<table class="noborder centpercent">';
@@ -484,162 +454,156 @@ $activatedModels = array();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/facture".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/facture".$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&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&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("SetAsDefault"), 'switch_off').'</a>';
-	                                print "</td>";
-	                            }
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a class="reposition" 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 class="center">'."\n";
+									print '<a class="reposition" 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("SetAsDefault"), 'switch_off').'</a>';
+									print "</td>";
+								}
 
-	                            // Defaut
-	                            print '<td class="center">';
-	                            if ($conf->global->FACTURE_ADDON_PDF == "$name")
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("SetAsDefault"), 'off').'</a>';
-	                            }
-	                            print '</td>';
+								// Defaut
+								print '<td class="center">';
+								if ($conf->global->FACTURE_ADDON_PDF == "$name")
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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("SetAsDefault"), '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>'.$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("Discounts").': '.yn($module->option_escompte, 1, 1);
-	                            $htmltooltip .= '<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note, 1, 1);
-	                            $htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-	                            $htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftInvoices").': '.yn($module->option_draft_watermark, 1, 1);
+								$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("Discounts").': '.yn($module->option_escompte, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("CreditNote").': '.yn($module->option_credit_note, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftInvoices").': '.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>';
 
 if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
 {
-    /*
+	/*
      *  Document templates generators
      */
-    print '<br>';
-    print load_fiche_titre($langs->trans("BillsPDFModulesAccordindToInvoiceType"), '', '');
-    print '<form action="'.$_SERVER["PHP_SELF"].'#default-pdf-modules-by-type-table" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'" />';
-    print '<input type="hidden" name="action" value="setDefaultPDFModulesByType" >';
-    print '<table id="default-pdf-modules-by-type-table" class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Type").'</td>';
-    print '<td>'.$langs->trans("Name").'</td>';
-    print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-    print "</tr>\n";
+	print '<br>';
+	print load_fiche_titre($langs->trans("BillsPDFModulesAccordindToInvoiceType"), '', '');
+	print '<form action="'.$_SERVER["PHP_SELF"].'#default-pdf-modules-by-type-table" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'" />';
+	print '<input type="hidden" name="action" value="setDefaultPDFModulesByType" >';
+	print '<table id="default-pdf-modules-by-type-table" class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Type").'</td>';
+	print '<td>'.$langs->trans("Name").'</td>';
+	print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
+	print "</tr>\n";
 
-    $listtype = array(
-        Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
-        Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
-        Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
-        Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
-    );
-    if (!empty($conf->global->INVOICE_USE_SITUATION))
-    {
-        $listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
-    }
+	$listtype = array(
+		Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
+		Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"),
+		Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
+		Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
+	);
+	if (!empty($conf->global->INVOICE_USE_SITUATION))
+	{
+		$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
+	}
 
-    foreach ($listtype as $type => $trans)
-    {
-        $thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
-        $current = !empty($conf->global->{$thisTypeConfName}) ? $conf->global->{$thisTypeConfName}:$conf->global->FACTURE_ADDON_PDF;
-        print '<tr >';
-        print '<td>'.$trans.'</td>';
-        print '<td colspan="2" >'.$form->selectarray('invoicetypemodels['.$type.']', ModelePDFFactures::liste_modeles($db), $current, 0, 0, 0).'</td>';
-        print "</tr>\n";
-    }
+	foreach ($listtype as $type => $trans)
+	{
+		$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
+		$current = !empty($conf->global->{$thisTypeConfName}) ? $conf->global->{$thisTypeConfName}:$conf->global->FACTURE_ADDON_PDF;
+		print '<tr >';
+		print '<td>'.$trans.'</td>';
+		print '<td colspan="2" >'.$form->selectarray('invoicetypemodels['.$type.']', ModelePDFFactures::liste_modeles($db), $current, 0, 0, 0).'</td>';
+		print "</tr>\n";
+	}
 
-    print '</table>';
-    print "</form>";
+	print '</table>';
+	print "</form>";
 }
 
 /*
@@ -665,41 +629,37 @@ print "<td>".$langs->trans("SuggestPaymentByRIBOnAccount")."</td>";
 print "<td>";
 if (!empty($conf->banque->enabled))
 {
-    $sql = "SELECT rowid, label";
-    $sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
-    $sql .= " WHERE clos = 0";
-    $sql .= " AND courant = 1";
-    $sql .= " AND entity IN (".getEntity('bank_account').")";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num > 0)
-        {
-        	print '<select name="rib" class="flat" id="rib">';
-        	print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
-            while ($i < $num)
-            {
-                $row = $db->fetch_row($resql);
+	$sql = "SELECT rowid, label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
+	$sql .= " WHERE clos = 0";
+	$sql .= " AND courant = 1";
+	$sql .= " AND entity IN (".getEntity('bank_account').")";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num > 0)
+		{
+			print '<select name="rib" class="flat" id="rib">';
+			print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
+			while ($i < $num)
+			{
+				$row = $db->fetch_row($resql);
 
-                print '<option value="'.$row[0].'"';
-                print $conf->global->FACTURE_RIB_NUMBER == $row[0] ? ' selected' : '';
-                print '>'.$row[1].'</option>';
+				print '<option value="'.$row[0].'"';
+				print $conf->global->FACTURE_RIB_NUMBER == $row[0] ? ' selected' : '';
+				print '>'.$row[1].'</option>';
 
-                $i++;
-            }
-            print "</select>";
-        }
-        else
-        {
-        	print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
-        }
-    }
-}
-else
-{
-    print $langs->trans("BankModuleNotActive");
+				$i++;
+			}
+			print "</select>";
+		} else {
+			print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
+		}
+	}
+} else {
+	print $langs->trans("BankModuleNotActive");
 }
 print "</td></tr>";
 
@@ -719,18 +679,18 @@ $sql .= " AND entity IN (".getEntity('bank_account').")";
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
-    while ($i < $num)
-    {
-        $row = $db->fetch_row($resql);
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
 
-        print '<option value="'.$row[0].'"';
-        print $conf->global->FACTURE_CHQ_NUMBER == $row[0] ? ' selected' : '';
-        print '>'.$langs->trans("OwnerOfBankAccount", $row[1]).'</option>';
+		print '<option value="'.$row[0].'"';
+		print $conf->global->FACTURE_CHQ_NUMBER == $row[0] ? ' selected' : '';
+		print '>'.$langs->trans("OwnerOfBankAccount", $row[1]).'</option>';
 
-        $i++;
-    }
+		$i++;
+	}
 }
 print "</select>";
 print "</td></tr>";
@@ -775,13 +735,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->tra
 $variablename = '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>';
-}
-else
-{
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
+	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();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php
index 223045db2e9..61969651634 100644
--- a/htdocs/admin/facture_situation.php
+++ b/htdocs/admin/facture_situation.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('admin', 'errors', 'other', 'bills'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -246,10 +246,9 @@ function _printInputFormPart($confkey, $title = false, $desc = '', $metas = arra
     print '<input type="hidden" name="action" value="setModuleOptions">';
     if ($type == 'textarea') {
         print '<textarea '.$metascompil.'  >'.dol_htmlentities($conf->global->{$confkey}).'</textarea>';
-	}elseif ($type == 'input') {
+	} elseif ($type == 'input') {
         print '<input '.$metascompil.'  />';
-    }
-	else {
+    } else {
 		// custom
 		print $type;
     }
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 00995a302a5..4c1e495939a 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'fckeditor'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 // Possible modes are:
 // dolibarr_details
 // dolibarr_notes
@@ -126,9 +126,7 @@ if (GETPOST('save', 'alpha'))
 	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -146,9 +144,7 @@ print '<br>';
 if (empty($conf->use_javascript_ajax))
 {
 	setEventMessages(array($langs->trans("NotAvailable"), $langs->trans("JavascriptDisabled")), null, 'errors');
-}
-else
-{
+} else {
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre">';
     print '<td colspan="2">'.$langs->trans("ActivateFCKeditor").'</td>';
@@ -170,8 +166,7 @@ else
         if ($value == 0)
         {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=activate_'.strtolower($const).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-        }
-        elseif ($value == 1)
+        } elseif ($value == 1)
         {
             print '<a href="'.$_SERVER['PHP_SELF'].'?action=disable_'.strtolower($const).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
         }
@@ -211,9 +206,7 @@ else
         $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
-    {
+    } else {
         print '<div style="border: 1px solid #888;" contenteditable="true">';
         print $conf->global->FCKEDITOR_TEST;
         print '</div>';
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index 055384c0084..5199165d4f4 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('admin', 'errors', 'interventions', 'other'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -63,14 +63,10 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'specimen') // For fiche inter
+} elseif ($action == 'specimen') // For fiche inter
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -101,15 +97,11 @@ elseif ($action == 'specimen') // For fiche inter
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=ficheinter&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -119,9 +111,7 @@ elseif ($action == 'specimen') // For fiche inter
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -146,19 +136,15 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "FICHEINTER_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_FICHINTER_FREE_TEXT')
+} elseif ($action == 'set_FICHINTER_FREE_TEXT')
 {
-	$freetext = GETPOST('FICHINTER_FREE_TEXT', 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST('FICHINTER_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "FICHINTER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
@@ -166,14 +152,10 @@ elseif ($action == 'set_FICHINTER_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
+} elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
 {
 	$draft = GETPOST('FICHINTER_DRAFT_WATERMARK', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -183,14 +165,10 @@ elseif ($action == 'set_FICHINTER_DRAFT_WATERMARK')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-
-elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
+} elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
 {
 	$val = GETPOST('FICHINTER_PRINT_PRODUCTS', 'alpha');
 	$res = dolibarr_set_const($db, "FICHINTER_PRINT_PRODUCTS", ($val == 'on' ? 1 : 0), 'bool', 0, '', $conf->entity);
@@ -200,9 +178,7 @@ elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 } elseif ($action == 'set_FICHINTER_USE_SERVICE_DURATION') {
@@ -324,10 +300,8 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->FICHEINTER_ADDON == $classname)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
@@ -375,7 +349,7 @@ $type = 'ficheinter';
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -388,9 +362,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -453,15 +425,13 @@ foreach ($dirmodels as $reldir)
 		    				if (in_array($name, $def))
 		    				{
 		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+		    					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
-		    				{
+		    				} else {
 		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+		    					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>";
 		    				}
 
@@ -470,10 +440,8 @@ foreach ($dirmodels as $reldir)
 		    				if ($conf->global->FICHEINTER_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
-		    				}
-		    				else
-		    				{
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</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).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
 
@@ -498,9 +466,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($module->type == 'pdf')
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'intervention').'</a>';
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -544,9 +510,7 @@ $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>';
-}
-else
-{
+} else {
     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/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index a661f3a8e9a..6b8fe0ab3b7 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -47,7 +47,12 @@ if ($action == 'set')
 
 	$gimcdf = GETPOST("GEOIPMAXMIND_COUNTRY_DATAFILE");
 
-	if (!$gimcdf && !file_exists($gimcdf))
+	if (!$error && $gimcdf && ! preg_match('/\.(dat|mmdb)$/', $gimcdf)) {
+		setEventMessages($langs->trans("ErrorFileMustHaveFormat", '.dat|.mmdb'), null, 'errors');
+		$error++;
+	}
+
+	if (!$error && $gimcdf && !file_exists($gimcdf))
 	{
 		setEventMessages($langs->trans("ErrorFileNotFound", $gimcdf), null, 'errors');
 		$error++;
@@ -64,9 +69,7 @@ if ($action == 'set')
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -128,7 +131,7 @@ if ($conf->global->GEOIP_VERSION == 'php')
 {
 	print 'Using geoip PHP internal functions. Value must be '.geoip_db_filename(GEOIP_COUNTRY_EDITION).' or '.geoip_db_filename(GEOIP_CITY_EDITION_REV1).' or /pathtodatafile/GeoLite2-Country.mmdb<br>';
 }
-print '<input size="50" type="text" name="GEOIPMAXMIND_COUNTRY_DATAFILE" value="'.$conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE.'">';
+print '<input size="50" type="text" name="GEOIPMAXMIND_COUNTRY_DATAFILE" value="'.dol_escape_htmltag($conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE).'">';
 print '</td></tr>';
 
 print '</table>';
@@ -150,7 +153,7 @@ print $langs->trans("YouCanDownloadAdvancedDatFileTo", '<a href="'.$url2.'" targ
 if ($geoip)
 {
 	print '<br><br>';
-	print '<br>'.$langs->trans("TestGeoIPResult", $ip).':';
+	print '<br><span class="opacitymedium">'.$langs->trans("TestGeoIPResult", $ip).':</span>';
 
 	$ip = '24.24.24.24';
 	print '<br>'.$ip.' -> ';
@@ -182,9 +185,7 @@ if ($geoip)
 		$result = dol_print_ip($ip, 1);
 		if ($result) print $result;
 		else print $langs->trans("Error");
-	}
-	else
-	{
+	} else {
 		print '<br>'.$ip.' -> ';
 		$result = dol_print_ip($ip, 1);
 		if ($result) print $result;
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index aafe01bf5bd..23a0cec8130 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array("admin", "errors", "holiday"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -43,7 +43,7 @@ $type = 'contract';
 
 if (empty($conf->global->HOLIDAY_ADDON))
 {
-    $conf->global->HOLIDAY_ADDON = 'mod_holiday_madonna';
+	$conf->global->HOLIDAY_ADDON = 'mod_holiday_madonna';
 }
 
 
@@ -55,23 +55,19 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask')
 {
-    $maskconst = GETPOST('maskconstholiday', 'alpha');
-    $maskvalue = GETPOST('maskholiday', 'alpha');
-    if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+	$maskconst = GETPOST('maskconstholiday', 'alpha');
+	$maskvalue = GETPOST('maskholiday', 'alpha');
+	if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, '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');
-    }
-}
-
-elseif ($action == 'specimen') // For contract
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen') // For contract
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -83,7 +79,7 @@ elseif ($action == 'specimen') // For contract
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/holiday/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/holiday/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -102,15 +98,11 @@ elseif ($action == 'specimen') // For contract
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=holiday&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -120,14 +112,12 @@ elseif ($action == 'specimen') // For contract
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->HOLIDAY_ADDON_PDF == "$value") dolibarr_del_const($db, 'HOLIDAY_ADDON_PDF', $conf->entity);
+		if ($conf->global->HOLIDAY_ADDON_PDF == "$value") dolibarr_del_const($db, 'HOLIDAY_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -147,19 +137,15 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "HOLIDAY_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_other')
+} elseif ($action == 'set_other')
 {
-	$freetext = GETPOST('HOLIDAY_FREE_TEXT', 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST('HOLIDAY_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$res1 = dolibarr_set_const($db, "HOLIDAY_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
 	$draft = GETPOST('HOLIDAY_DRAFT_WATERMARK', 'alpha');
@@ -168,13 +154,11 @@ elseif ($action == 'set_other')
 	if (!$res1 > 0 || !$res2 > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -245,8 +229,7 @@ foreach ($dirmodels as $reldir)
 						// 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);
+						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";
 
@@ -254,10 +237,8 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->HOLIDAY_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -270,16 +251,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($mysoc, $holiday);
-                        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);
@@ -301,11 +282,11 @@ print '<br>';
 
 
 if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
-    dol_fiche_end();
-    // End of page
-    llxFooter();
-    $db->close();
-    exit;
+	dol_fiche_end();
+	// End of page
+	llxFooter();
+	$db->close();
+	exit;
 }
 
 /*
@@ -318,22 +299,20 @@ print load_fiche_titre($langs->trans("TemplatePDFHolidays"), '', '');
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
 {
-    $i = 0;
-    $num_rows = $db->num_rows($resql);
+	$i = 0;
+	$num_rows = $db->num_rows($resql);
 	while ($i < $num_rows)
 	{
 		$array = $db->fetch_array($resql);
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -353,117 +332,111 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/holiday".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/holiday".$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&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&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 class="reposition" 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 class="reposition" 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->HOLIDAY_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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->HOLIDAY_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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>'.$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);
+								$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>';
+								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>';
@@ -500,13 +473,11 @@ print '<br>';
 $variablename = 'HOLIDAY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    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();
+	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();
 }
 print '</td></tr>'."\n";
 
diff --git a/htdocs/admin/holiday_extrafields.php b/htdocs/admin/holiday_extrafields.php
index fc0bac8a019..30eb707782b 100644
--- a/htdocs/admin/holiday_extrafields.php
+++ b/htdocs/admin/holiday_extrafields.php
@@ -44,7 +44,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'holiday'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index d4868ed68ac..f220d83ebcd 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -164,8 +164,8 @@ if ($action == 'update')
 
 	dolibarr_set_const($db, "MAIN_FIRSTNAME_NAME_POSITION", GETPOST("MAIN_FIRSTNAME_NAME_POSITION", 'aZ09'), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr(GETPOST("main_motd", 'none')), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr(GETPOST("main_home", 'none')), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MOTD", dol_htmlcleanlastbr(GETPOST("main_motd", 'restricthtml')), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_HOME", dol_htmlcleanlastbr(GETPOST("main_home", 'restricthtml')), 'chaine', 0, '', $conf->entity);
 	//dolibarr_set_const($db, "MAIN_BUGTRACK_ENABLELINK", GETPOST('MAIN_BUGTRACK_ENABLELINK', 'aZ09'), 'chaine', 0, '', $conf->entity);
 	//dolibarr_set_const($db, "MAIN_HELP_DISABLELINK", GETPOST("MAIN_HELP_DISABLELINK", 'aZ09'), 'chaine', 0, '', 0); // Param for all entities
 
@@ -189,22 +189,17 @@ if ($action == 'update')
 				if ($result > 0)
 				{
 					dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND", $original_file, 'chaine', 0, '', $conf->entity);
-				}
-				elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result))
+				} elseif (preg_match('/^ErrorFileIsInfectedWithAVirus/', $result))
 				{
 					$error++;
 					$langs->load("errors");
 					$tmparray = explode(':', $result);
 					setEventMessages($langs->trans('ErrorFileIsInfectedWithAVirus', $tmparray[1]), null, 'errors');
-				}
-				else
-				{
+				} else {
 					$error++;
 					setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
@@ -253,7 +248,7 @@ print '</tr>';
 
 // Default language
 print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("DefaultLanguage").'</td><td>';
-print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, 0, 0, 0, 0, 'minwidth300', 2);
+print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2);
 print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">';
 print '</td>';
 print '<td width="20">&nbsp;</td>';
diff --git a/htdocs/admin/import.php b/htdocs/admin/import.php
index 37c9b205424..d36ffd5265f 100644
--- a/htdocs/admin/import.php
+++ b/htdocs/admin/import.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('admin', 'exports', 'other'));
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 
 /*
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index bd24e793374..951b93f908c 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -76,9 +76,7 @@ if (empty($reshook))
 		{
 			$db->commit();
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -214,9 +212,7 @@ print '<tr class="oddeven"><td>'.$langs->trans("LDAPServerPort").'</td><td>';
 if (!empty($conf->global->LDAP_SERVER_PORT))
 {
 	print '<input size="25" type="text" name="port" value="'.$conf->global->LDAP_SERVER_PORT.'">';
-}
-else
-{
+} else {
 	print '<input size="25" type="text" name="port" value="389">';
 }
 print '</td><td>'.$langs->trans("LDAPServerPortExample").'</td></tr>';
@@ -248,9 +244,7 @@ print '<tr class="oddeven"><td>'.$langs->trans("LDAPPassword").'</td><td>';
 if (!empty($conf->global->LDAP_ADMIN_PASS))
 {
 	print '<input size="25" type="password" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">'; // je le met en visible pour test
-}
-else
-{
+} else {
 	print '<input size="25" type="text" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">';
 }
 print '</td><td>'.$langs->trans('Password').' (ex: secret)</td></tr>';
@@ -295,18 +289,14 @@ if (function_exists("ldap_connect"))
 					print img_picto('', 'info').' ';
 					print '<font class="ok">'.$langs->trans("LDAPBindOK", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
 					print '<br>';
-				}
-				else
-				{
+				} else {
 					print img_picto('', 'error').' ';
 					print '<font class="error">'.$langs->trans("LDAPBindKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT, $conf->global->LDAP_ADMIN_DN, preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)).'</font>';
 					print '<br>';
 					print $langs->trans("Error").' '.$ldap->error;
 					print '<br>';
 				}
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'warning').' ';
 				print '<font class="warning">'.$langs->trans("LDAPNoUserOrPasswordProvidedAccessIsReadOnly").'</font>';
 				print '<br>';
@@ -319,18 +309,14 @@ if (function_exists("ldap_connect"))
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion3").'</font>';
 				print '<br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSetupForVersion2").'</font>';
 				print '<br>';
 			}
 
 			$unbind = $ldap->unbind();
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPTCPConnectKO", $conf->global->LDAP_SERVER_HOST, $conf->global->LDAP_SERVER_PORT).'</font>';
 			print '<br>';
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 834bde4eea5..54de74c6371 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -78,9 +78,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -292,9 +290,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -306,9 +302,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index fb49c947411..4e0c430fb90 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -70,9 +70,7 @@ if ($action == 'setvalue' && $user->admin)
     {
     	$db->commit();
     	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
     	$db->rollback();
     	dol_print_error($db);
     }
@@ -233,9 +231,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -247,9 +243,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index f6fa74cb79d..0cd09d27f7e 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -95,9 +95,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -415,9 +413,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -429,9 +425,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_members_types.php b/htdocs/admin/ldap_members_types.php
index 6628dd4d144..371437e1640 100644
--- a/htdocs/admin/ldap_members_types.php
+++ b/htdocs/admin/ldap_members_types.php
@@ -68,9 +68,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -215,9 +213,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -229,9 +225,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 7781cf45676..d5778fbfb1c 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -89,9 +89,7 @@ if ($action == 'setvalue' && $user->admin)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -357,8 +355,7 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
 	$objectclass = $conf->global->LDAP_USER_OBJECT_CLASS;
 
 	show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
-}
-elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
+} elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
 {
 	$butlabel = $langs->trans("LDAPTestSearch");
 	$testlabel = 'testsearchuser';
@@ -395,9 +392,7 @@ if (function_exists("ldap_connect"))
 			{
 				print img_picto('', 'info').' ';
 				print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
-			}
-			else
-			{
+			} else {
 				print img_picto('', 'error').' ';
 				print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
 				print ': '.$ldap->error;
@@ -409,9 +404,7 @@ if (function_exists("ldap_connect"))
 			print "LDAP input file used for test:<br><br>\n";
 			print nl2br($ldap->dump_content($dn, $info));
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
@@ -476,9 +469,7 @@ if (function_exists("ldap_connect"))
 					}
 					$liste[$key] = $label;
 				}
-			}
-			else
-		    {
+			} else {
 				setEventMessages($ldap->error, $ldap->errors, 'errors');
 			}
 
@@ -490,9 +481,7 @@ if (function_exists("ldap_connect"))
 			print "required_fields: ".implode(',', $required_fields)."<br>\n";
 			print "=> ".count($liste)." records<br>\n";
 			print "\n<br>";
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'error').' ';
 			print '<font class="error">'.$langs->trans("LDAPSynchroKO");
 			print ': '.$ldap->error;
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index caf2192a9a3..db29deef9d7 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -31,7 +31,7 @@ $langs->loadLangs(array('companies', 'products', 'admin'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $currencycode = GETPOST('currencycode', 'alpha');
 
 if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY_USE_LIMIT_BY_CURRENCY)) {
@@ -243,7 +243,7 @@ if (empty($mysoc->country_code))
 
 	$sql = "SELECT taux as vat_rate, t.code as vat_code, t.localtax1 as localtax_rate1, t.localtax2 as localtax_rate2";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$mysoc->country_code."' AND (t.taux <> 0 OR t.localtax1 <>0 OR t.localtax2 <>0)";
+	$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$db->escape($mysoc->country_code)."' AND (t.taux <> 0 OR t.localtax1 <>0 OR t.localtax2 <>0)";
 	$sql .= " ORDER BY t.taux ASC";
 	$resql = $db->query($sql);
 	if ($resql)
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 83e2e3b7d54..f3477e151a2 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -63,16 +63,14 @@ if ($action == 'updateMask')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
 if ($action == 'set_DELIVERY_FREE_TEXT')
 {
-    $free = GETPOST('DELIVERY_FREE_TEXT', 'none'); // No alpha here, we want exact string
+    $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++;
@@ -80,9 +78,7 @@ if ($action == 'set_DELIVERY_FREE_TEXT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -118,15 +114,11 @@ if ($action == 'specimen')
         {
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=livraison&file=SPECIMEN.pdf");
             return;
-        }
-        else
-        {
+        } else {
             setEventMessages($module->error, $module->errors, 'errors');
             dol_syslog($module->error, LOG_ERR);
         }
-    }
-    else
-    {
+    } else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -240,8 +232,7 @@ foreach ($dirmodels as $reldir)
                         $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);
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -249,10 +240,8 @@ foreach ($dirmodels as $reldir)
                         if ($conf->global->LIVRAISON_ADDON_NUMBER == "$file")
                         {
                             print img_picto($langs->trans("Activated"), 'switch_on');
-                        }
-                        else
-                        {
-                            print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                        } 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>';
 
@@ -302,7 +291,7 @@ $def = array();
 
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 
 $resql = $db->query($sql);
@@ -316,9 +305,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -379,15 +366,13 @@ foreach ($dirmodels as $reldir)
 		    				if (in_array($name, $def))
 		    				{
 		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+		    					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
-		    				{
+		    				} else {
 		    					print "<td align=\"center\">\n";
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+		    					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>";
 		    				}
 
@@ -396,10 +381,8 @@ foreach ($dirmodels as $reldir)
 		    				if ($conf->global->LIVRAISON_ADDON_PDF == "$name")
 		    				{
 		    					print img_picto($langs->trans("Default"), 'on');
-		    				}
-		    				else
-		    				{
-		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</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).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		    				}
 		    				print '</td>';
 
@@ -417,9 +400,7 @@ foreach ($dirmodels as $reldir)
 		    				if ($module->type == 'pdf')
 		    				{
 		    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'sending').'</a>';
-		    				}
-		    				else
-		    				{
+		    				} else {
 		    					print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 		    				}
 		    				print '</td>';
@@ -462,9 +443,7 @@ $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>';
-}
-else
-{
+} else {
     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/admin/livraison_extrafields.php b/htdocs/admin/livraison_extrafields.php
index 3b6d03ac98e..d30635333be 100644
--- a/htdocs/admin/livraison_extrafields.php
+++ b/htdocs/admin/livraison_extrafields.php
@@ -47,7 +47,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'livraison'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/livraisondet_extrafields.php b/htdocs/admin/livraisondet_extrafields.php
index ebed8de9608..cc9dfa1c49f 100644
--- a/htdocs/admin/livraisondet_extrafields.php
+++ b/htdocs/admin/livraisondet_extrafields.php
@@ -48,7 +48,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'livraisondet'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 45202de342b..a138d9d0bf2 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('admin', 'loan'));
 if (!$user->admin)
     accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Other parameters LOAN_*
 $list = array(
@@ -63,9 +63,7 @@ if ($action == 'update')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -107,9 +105,7 @@ foreach ($list as $key)
 	if (!empty($conf->accounting->enabled))
 	{
 		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-	}
-	else
-	{
+	} else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
 	}
 	print '</td></tr>';
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 921a4a6338c..30b92412719 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array("admin", "mails"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 
@@ -65,9 +65,7 @@ if ($action == 'setvalue')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php
index 05c36128e8d..d9d3ae8142d 100644
--- a/htdocs/admin/mailman.php
+++ b/htdocs/admin/mailman.php
@@ -65,9 +65,7 @@ if ($action == 'update' || $action == 'add')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -99,9 +97,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
     {
         $langs->load("errors");
         setEventMessages($langs->trans("ErrorBadEMail", $email), null, 'errors');
-    }
-    else
-    {
+    } else {
         include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
         $mailmanspip = new MailmanSpip($db);
 
@@ -118,9 +114,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 			{
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("MailmanCreationSuccess"), null);
 			}
         }
@@ -131,9 +125,7 @@ if (($action == 'testsubscribe' || $action == 'testunsubscribe') && !empty($conf
 			{
 				$error++;
 				setEventMessages($mailmanspip->error, $mailmanspip->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("MailmanDeletionSuccess"), null);
 			}
         }
@@ -164,7 +156,7 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
     dol_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&value=0&name=ADHERENT_USE_MAILMAN">';
+    $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>';
@@ -211,12 +203,10 @@ if (!empty($conf->global->ADHERENT_USE_MAILMAN))
     print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
     print '</form>';
-}
-else
-{
+} else {
     dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user');
 
-    $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_MAILMAN">';
+    $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>';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 305c7f65851..8971f5a69d4 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "products", "admin", "mails", "other", "errors"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if (!$user->admin) accessforbidden();
 
@@ -77,6 +77,7 @@ if ($action == 'update' && empty($_POST["cancel"]))
 	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", 'int'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED", GETPOST("MAIN_MAIL_EMAIL_DKIM_ENABLED", 'int'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_DOMAIN", GETPOST("MAIN_MAIL_EMAIL_DKIM_DOMAIN", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -156,6 +157,8 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_EMAIL_TLS").prop("disabled", true);
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val(0);
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS").prop("disabled", true);
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").val(0);
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").prop("disabled", true);
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").val(0);
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").prop("disabled", true);
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").prop("disabled", true);
@@ -170,9 +173,7 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_SMTP_PORT").hide();
                             jQuery("#smtp_server_mess").show();
                             jQuery("#smtp_port_mess").show();';
-		}
-		else
-		{
+		} else {
             print '
                             jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true);
                             jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true);
@@ -189,6 +190,8 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val('.$conf->global->MAIN_MAIL_EMAIL_STARTTLS.');
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").val('.$conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED.');
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").val(0);
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").prop("disabled", true);
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").prop("disabled", true);
@@ -213,6 +216,8 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val('.$conf->global->MAIN_MAIL_EMAIL_STARTTLS.');
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").val('.$conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED.');
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").val('.$conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED.');
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").removeAttr("disabled");
@@ -235,12 +240,16 @@ if ($action == 'edit')
                         initfields();
                     });
                     jQuery("#MAIN_MAIL_EMAIL_TLS").change(function() {
-						if (jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val() == 1)
+						if (jQuery("#MAIN_MAIL_EMAIL_TLS").val() == 1)
 							jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val(0);
+						else
+							jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").val(0);
 					});
 					jQuery("#MAIN_MAIL_EMAIL_STARTTLS").change(function() {
-						if (jQuery("#MAIN_MAIL_EMAIL_TLS").val() == 1)
+						if (jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val() == 1)
 							jQuery("#MAIN_MAIL_EMAIL_TLS").val(0);
+						else
+							jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").val(0);
                     });
                })';
         print '</script>'."\n";
@@ -271,14 +280,12 @@ if ($action == 'edit')
 	print '<input class="flat" name="MAIN_MAIL_FORCE_SENDTO" size="32" value="'.(!empty($conf->global->MAIN_MAIL_FORCE_SENDTO) ? $conf->global->MAIN_MAIL_FORCE_SENDTO : '').'" />';
 	print '</td></tr>';
 
+	print '</table>';
 
-	//Add user to select destinaries list
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>';
-	print $form->selectyesno('MAIN_MAIL_ENABLED_USER_DEST_SELECT', $conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT, 1);
-	print '</td></tr>';
+	print '<br>';
 
-	// Separator
-	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td></td></tr>';
 
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
@@ -287,9 +294,7 @@ if ($action == 'edit')
 	if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
 	{
 		print $form->selectarray('MAIN_MAIL_SENDMODE', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE);
-	}
-	else
-	{
+	} else {
 		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 		if (empty($text)) $text = $langs->trans("Undefined");
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -305,9 +310,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-	}
-	else
-	{
+	} else {
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -319,9 +322,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER" name="MAIN_MAIL_SMTP_SERVER" size="18" value="'.$mainserver.'" autocomplete="off">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_sav" name="MAIN_MAIL_SMTP_SERVER_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else
-		{
+		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -337,9 +338,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-	}
-	else
-	{
+	} else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
@@ -351,9 +350,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT" name="MAIN_MAIL_SMTP_PORT" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_sav" name="MAIN_MAIL_SMTP_PORT_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else
-		{
+		} else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -371,9 +368,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID" size="32" value="'.$mainstmpid.'">';
-		}
-		else
-		{
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID" value="'.$mainstmpid.'">';
@@ -392,9 +387,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW" size="32" value="'.$mainsmtppw.'" autocomplete="off">';
-		}
-		else
-		{
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW" value="'.$mainsmtppw.'">';
@@ -409,10 +402,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_TLS', (!empty($conf->global->MAIN_MAIL_EMAIL_TLS) ? $conf->global->MAIN_MAIL_EMAIL_TLS : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
 	// STARTTLS
@@ -422,10 +413,19 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_STARTTLS', (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
+	print '</td></tr>';
+
+	// SMTP_ALLOW_SELF_SIGNED
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</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'))
+		{
+			print $form->selectyesno('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED', (!empty($conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED) ? $conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED : 0), 1);
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
 	// DKIM
@@ -435,10 +435,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_DKIM_ENABLED', (!empty($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED) ? $conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
     // DKIM Domain
@@ -456,8 +454,12 @@ if ($action == 'edit')
     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>';
 
-    // Separator
-	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
+	print '</table>';
+
+	print '<br>';
+
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("OtherOptions").'</td><td></td></tr>';
 
 	// From
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).'</td>';
@@ -473,9 +475,6 @@ if ($action == 'edit')
 	print $form->selectarray('MAIN_MAIL_DEFAULT_FROMTYPE', $liste, $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE, 0);
 	print '</td></tr>';
 
-	// Separator
-	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
-
 	// From
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td><input class="flat" name="MAIN_MAIL_ERRORS_TO" size="32" value="'.(!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : '');
@@ -486,6 +485,11 @@ if ($action == 'edit')
 	print '<td><input class="flat" name="MAIN_MAIL_AUTOCOPY_TO" size="32" value="'.(!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) ? $conf->global->MAIN_MAIL_AUTOCOPY_TO : '');
 	print '"></td></tr>';
 
+	// Add user to select destinaries list
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>';
+	print $form->selectyesno('MAIN_MAIL_ENABLED_USER_DEST_SELECT', $conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT, 1);
+	print '</td></tr>';
+
 	print '</table>';
 
 	dol_fiche_end();
@@ -497,9 +501,7 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-else
-{
+} else {
 	dol_fiche_head($head, 'common', '', -1);
 
 	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
@@ -522,26 +524,30 @@ else
 	}
 	print '</td></tr>';
 
-	//Add user to select destinaries list
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>'.yn($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT).'</td></tr>';
+	print '</table>';
 
-	// Separator
-	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
+	print '<br>';
+
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td></td></tr>';
 
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
 	$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
 	if (empty($text)) $text = $langs->trans("Undefined").img_warning();
 	print $text;
+
+	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+		print $form->textwithpicto('', $langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC"), 1, 'warning');
+	}
+
 	print '</td></tr>';
 
 	// Host server
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'</td></tr>';
 	}
 
@@ -549,9 +555,7 @@ else
 	if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
 	{
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
 	}
 
@@ -574,10 +578,8 @@ else
 		if (function_exists('openssl_open'))
 		{
 			print yn($conf->global->MAIN_MAIL_EMAIL_TLS);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
 	print '</td></tr>';
 
 	// STARTTLS
@@ -587,10 +589,19 @@ else
 		if (function_exists('openssl_open'))
 		{
 			print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
+	print '</td></tr>';
+
+	// SMTP_ALLOW_SELF_SIGNED
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</td><td>';
+	if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
+	{
+		if (function_exists('openssl_open'))
+		{
+			print yn($conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED);
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
 	print '</td></tr>';
 
 
@@ -603,10 +614,8 @@ else
 			if (function_exists('openssl_open'))
 			{
 				print yn($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED);
-			}
-			else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		}
-		else print yn(0).' ('.$langs->trans("NotSupported").')';
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
 		print '</td></tr>';
 
 	    // Domain
@@ -625,8 +634,16 @@ else
 	    print '</td></tr>';
 	}
 
-    // Separator
-	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
+	print '</table>';
+
+	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+		print info_admin($langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC"), 0, 0, 'warning');
+	}
+
+	print '<br>';
+
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("OtherOptions").'</td><td></td></tr>';
 
 	// From
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).'</td>';
@@ -654,24 +671,20 @@ else
 			}
 			$i++;
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	print '<tr class="oddeven"><td>'.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').'</td>';
 	print '<td>';
 	if ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'robot')
 	{
 		print $langs->trans('RobotEmail');
-	}
-	elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user')
+	} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user')
 	{
 		print $langs->trans('UserEmail');
-	}
-	elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'company')
+	} elseif ($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'company')
 	{
 		print $langs->trans('CompanyEmail').' '.dol_escape_htmltag('<'.$mysoc->email.'>');
-	}
-	else {
+	} else {
 		$id = preg_replace('/senderprofile_/', '', $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE);
 		if ($id > 0)
 		{
@@ -683,9 +696,6 @@ else
 	}
 	print '</td></tr>';
 
-	// Separator
-	print '<tr class="oddeven"><td colspan="2">&nbsp;</td></tr>';
-
 	// Errors To
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ERRORS_TO").'</td>';
 	print '<td>'.$conf->global->MAIN_MAIL_ERRORS_TO;
@@ -699,13 +709,14 @@ else
 	{
 		print $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 		if (!isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
-	}
-	else
-	{
+	} else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
 
+	//Add user to select destinaries list
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_ENABLED_USER_DEST_SELECT").'</td><td>'.yn($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT).'</td></tr>';
+
 	print '</table>';
 
 	dol_fiche_end();
@@ -722,9 +733,7 @@ else
 		{
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect#formmailbeforetitle">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 	}
 
@@ -759,7 +768,7 @@ else
 		$text = '';
 		if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
 		{
-			$text .= $langs->trans("WarningPHPMail"); // To encourage to use SMTPS
+			//$text .= $langs->trans("WarningPHPMail"); // To encourage to use SMTPS
 		}
 
 		if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
@@ -802,8 +811,7 @@ else
 		$mail = new CMailFile('', '', '', '', array(), array(), array(), '', '', 0, '', '', '', '', $trackid, $sendcontext);
 		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
-		else
-		{
+		else {
 			$errormsg = $langs->trans("ServerNotAvailableOnIPOrPort", $server, $port);
 
 			if ($mail->error) {
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 84a0d2a0893..b97437216d6 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'products', 'admin', 'mails', 'other', 'errors'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if (!$user->admin) accessforbidden();
 
@@ -68,6 +68,7 @@ if ($action == 'update' && empty($_POST["cancel"]))
 	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW_EMAILING", GETPOST("MAIN_MAIL_SMTPS_PW_EMAILING"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS_EMAILING", GETPOST("MAIN_MAIL_EMAIL_TLS_EMAILING"), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS_EMAILING", GETPOST("MAIN_MAIL_EMAIL_STARTTLS_EMAILING"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING"), 'chaine', 0, '', $conf->entity);
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 	exit;
@@ -120,7 +121,7 @@ $listofmethods['default'] = $langs->trans('DefaultOutgoingEmailSetup');
 $listofmethods['mail'] = 'PHP mail function';
 //$listofmethods['simplemail']='Simplemail class';
 $listofmethods['smtps'] = 'SMTP/SMTPS socket library';
-$listofmethods['swiftmailer'] = 'Swift Mailer socket library';
+if (version_compare(phpversion(), '7.0', '>=')) $listofmethods['swiftmailer'] = 'Swift Mailer socket library';
 
 
 if ($action == 'edit')
@@ -147,6 +148,8 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_EMAIL_TLS_EMAILING").prop("disabled", true);
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").val(0);
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").prop("disabled", true);
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val(0);
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").prop("disabled", true);
                             ';
 		if ($linuxlike)
 		{
@@ -156,9 +159,7 @@ if ($action == 'edit')
 			               jQuery("#smtp_server_mess").show();
 			               jQuery("#smtp_port_mess").show();
 			               ';
-		}
-		else
-		{
+		} else {
 			print '
 			               jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").prop("disabled", true);
 			               jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").prop("disabled", true);
@@ -175,6 +176,8 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_EMAIL_TLS_EMAILING").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").val('.$conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING.');
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val('.$conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING.');
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").show();
@@ -189,6 +192,8 @@ if ($action == 'edit')
                             jQuery("#MAIN_MAIL_EMAIL_TLS_EMAILING").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").val('.$conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING.');
                             jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val('.$conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING.');
+                            jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").removeAttr("disabled");
                             jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").show();
@@ -201,13 +206,17 @@ if ($action == 'edit')
                     jQuery("#MAIN_MAIL_SENDMODE_EMAILING").change(function() {
                         initfields();
                     });
-					jQuery("#MAIN_MAIL_EMAIL_TLS").change(function() {
-						if (jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").val() == 1)
+					jQuery("#MAIN_MAIL_EMAIL_TLS_EMAILING").change(function() {
+						if (jQuery("#MAIN_MAIL_EMAIL_TLS_EMAILING").val() == 1)
 							jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").val(0);
+						else
+							jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val(0);
 					});
 					jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").change(function() {
-						if (jQuery("#MAIN_MAIL_EMAIL_TLS_EMAILING").val() == 1)
+						if (jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").val() == 1)
 							jQuery("#MAIN_MAIL_EMAIL_TLS_EMAILING").val(0);
+						else
+							jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val(0);
 					});
                })';
 		print '</script>'."\n";
@@ -236,9 +245,7 @@ if ($action == 'edit')
 	if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
 	{
 		print $form->selectarray('MAIN_MAIL_SENDMODE_EMAILING', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE_EMAILING);
-	}
-	else
-	{
+	} else {
 		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE_EMAILING];
 		if (empty($text)) $text = $langs->trans("Undefined");
 		$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -255,9 +262,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print $langs->trans("SeeLocalSendMailSetup");
-	}
-	else
-	{
+	} else {
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
@@ -269,9 +274,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" size="18" value="'.$mainserver.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" name="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" value="'.$mainserver.'">';
 			print '<span id="smtp_server_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else
-		{
+		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -288,9 +291,7 @@ if ($action == 'edit')
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
 		print $langs->trans("SeeLocalSendMailSetup");
-	}
-	else
-	{
+	} else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
 		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
@@ -302,9 +303,7 @@ if ($action == 'edit')
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT_EMAILING" name="MAIN_MAIL_SMTP_PORT_EMAILING" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_EMAILING_sav" name="MAIN_MAIL_SMTP_PORT_EMAILING_sav" value="'.$mainport.'">';
 			print '<span id="smtp_port_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
-		}
-		else
-		{
+		} else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
@@ -322,9 +321,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID_EMAILING" size="32" value="'.$mainstmpid.'">';
-		}
-		else
-		{
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID_EMAILING, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID_EMAILING" value="'.$mainstmpid.'">';
@@ -341,9 +338,7 @@ if ($action == 'edit')
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
 		{
 			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_EMAILING" size="32" value="'.$mainsmtppw.'">';
-		}
-		else
-		{
+		} else {
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW_EMAILING, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW_EMAILING" value="'.$mainsmtppw.'">';
@@ -359,10 +354,8 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_TLS_EMAILING', (!empty($conf->global->MAIN_MAIL_EMAIL_TLS_EMAILING) ? $conf->global->MAIN_MAIL_EMAIL_TLS_EMAILING : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
 	// STARTTLS
@@ -373,10 +366,20 @@ if ($action == 'edit')
 		if (function_exists('openssl_open'))
 		{
 			print $form->selectyesno('MAIN_MAIL_EMAIL_STARTTLS_EMAILING', (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING) ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING : 0), 1);
-		}
-		else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-	}
-	else print yn(0).' ('.$langs->trans("NotSupported").')';
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
+	print '</td></tr>';
+
+	// SMTP_ALLOW_SELF_SIGNED_EMAILING
+
+	print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</td><td>';
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))))
+	{
+		if (function_exists('openssl_open'))
+		{
+			print $form->selectyesno('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING', (!empty($conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING) ? $conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING : 0), 1);
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
 	print '</td></tr>';
 
     print '</table>';
@@ -390,9 +393,7 @@ if ($action == 'edit')
     print '</div>';
 
 	print '</form>';
-}
-else
-{
+} else {
     dol_fiche_head($head, 'common_emailing', '', -1);
 
     print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
@@ -414,9 +415,7 @@ else
 		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail'))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '').'</td></tr>';
 		}
 
@@ -424,9 +423,7 @@ else
 		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail'))
 		{
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '').'</td></tr>';
 		}
 
@@ -449,10 +446,8 @@ else
 			if (function_exists('openssl_open'))
 			{
 				print yn($conf->global->MAIN_MAIL_EMAIL_TLS_EMAILING);
-			}
-			else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		}
-		else print yn(0).' ('.$langs->trans("NotSupported").')';
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
 		print '</td></tr>';
 
 		// STARTTLS
@@ -462,10 +457,19 @@ else
 			if (function_exists('openssl_open'))
 			{
 				print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS_EMAILING);
-			}
-			else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
-		}
-		else print yn(0).' ('.$langs->trans("NotSupported").')';
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
+		print '</td></tr>';
+
+		// SMTP_ALLOW_SELF_SIGNED_EMAILING
+		print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").'</td><td>';
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))
+		{
+			if (function_exists('openssl_open'))
+			{
+				print yn($conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING);
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
 		print '</td></tr>';
 	}
 
@@ -506,9 +510,7 @@ else
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect">'.$langs->trans("DoTestServerAvailability").'</a>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
 		}
 
@@ -539,8 +541,7 @@ else
 
 		$result = $mail->check_server_port($server, $port);
 		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
-		else
-		{
+		else {
 			$errormsg = $langs->trans("ServerNotAvailableOnIPOrPort", $server, $port);
 
 			if ($mail->error) {
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 1c50ebf0949..16ae12ffcc5 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -43,11 +43,12 @@ $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $id = GETPOST('id', 'int');
+$rowid = GETPOST('rowid', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -79,7 +80,7 @@ if ($user->socid > 0)	// Protection if external user
 //$result = restrictedArea($user, 'mymodule', $id, '');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -122,6 +123,10 @@ $permissiontoread = $user->admin;
 $permissiontoadd = $user->admin;
 $permissiontodelete = $user->admin;
 
+if ($id > 0) {
+	$object->fetch($id);
+}
+
 
 /*
  * Actions
@@ -171,8 +176,7 @@ if (empty($reshook))
 		$resql = $db->query($sql);
 		if ($resql) {
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("Error").' '.$db->lasterror(), null, 'errors');
 		}
 	}
@@ -192,7 +196,6 @@ $now = dol_now();
 $help_url = '';
 $title = $langs->trans("EMailsSetup");
 
-
 llxHeader('', $title);
 
 $linkback = '';
@@ -231,7 +234,7 @@ 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 (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+	if (strpos($object->fields[$key]['type'], 'integer:') === 0 || $key == 'active') {
 		if ($search[$key] == '-1') $search[$key] = '';
 		$mode_search = 2;
 	}
@@ -281,9 +284,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -350,15 +351,41 @@ 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="'.($action == 'create' ? 'add' : 'list').'">';
+print '<input type="hidden" name="action" value="'.($action == 'create' ? 'add' : ($action == 'edit' ? 'update' : 'list')).'">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="id" value="'.$id.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = '';
 if ($action != 'create') {
 	$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', $_SERVER['PHP_SELF'].'?action=create', '', $permissiontoadd);
+
+	if ($action == 'edit') {
+		print '<table class="border centpercent tableforfield">';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" value="'.(GETPOSTISSET('label') ? GETPOST('label', 'alphanohtml') : $object->label).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Email").'</td><td><input type="text" name="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alphanohtml') : $object->email).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Signature").'</td><td>';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$doleditor = new DolEditor('signature', (GETPOSTISSET('signature') ? GETPOST('signature', 'restricthtml') : $object->signature), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
+		print $doleditor->Create(1);
+		print '</td></tr>';
+		print '<tr><td>'.$langs->trans("User").'</td><td>';
+		print $form->select_dolusers((GETPOSTISSET('private') ? GETPOST('private', 'int') : $object->private), 'private', 1, null, 0, ($user->admin ? '' : $user->id));
+		print '</td></tr>';
+		print '<tr><td>'.$langs->trans("Position").'</td><td><input type="text" name="position" class="maxwidth50" value="'.(GETPOSTISSET('position') ? GETPOST('position', 'int') : $object->position).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Status").'</td><td>';
+		print $form->selectarray('active', $object->fields['active']['arrayofkeyval'], (GETPOSTISSET('active') ? GETPOST('active', 'int') : $object->active), 0, 0, 0, '', 1);
+		print '</td></tr>';
+		print '</table>';
+		print '<br>';
+		print '<div class="center">';
+		print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
+		print ' &nbsp; ';
+		print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+		print '</div>';
+	}
 } else {
 	/*print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -370,7 +397,7 @@ if ($action != 'create') {
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	*/
 	print '<table class="border centpercent tableforfield">';
-	print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="label" value="'.GETPOST('label', 'alphanohtml').'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" value="'.GETPOST('label', 'alphanohtml').'"></td></tr>';
 	print '<tr><td>'.$langs->trans("Email").'</td><td><input type="text" name="email" value="'.GETPOST('email', 'alphanohtml').'"></td></tr>';
 	print '<tr><td>'.$langs->trans("Signature").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -450,8 +477,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
@@ -535,7 +561,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		if (!empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') print $object->getLibStatut(5);
+			if ($key == 'status' || $key == 'active') print $object->getLibStatut(5);
 			else print $object->showOutputField($val, $key, $object->$key, '');
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
@@ -554,14 +580,14 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	$url = $_SERVER["PHP_SELF"].'?action=list&id='.$obj->rowid;
+	$url = $_SERVER["PHP_SELF"].'?id='.$obj->rowid;
 	if ($limit) $url .= '&limit='.urlencode($limit);
 	if ($page) $url .= '&page='.urlencode($page);
 	if ($sortfield) $url .= '&sortfield='.urlencode($sortfield);
 	if ($sortorder) $url .= '&page='.urlencode($sortorder);
-	//print '<a class="reposition" href="'.$url.'&action=edit">'.img_edit().'</a>';
+	print '<a class="editfielda reposition marginrightonly marginleftonly" href="'.$url.'&action=edit&rowid='.$obj->rowid.'">'.img_edit().'</a>';
 	//print ' &nbsp; ';
-	print '<a href="'.$url.'&action=delete">'.img_delete().'</a>  &nbsp; ';
+	print '<a class=" marginrightonly marginleftonly" href="'.$url.'&action=delete&token='.newToken().'">'.img_delete().'</a>  &nbsp; ';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
 		$selected = 0;
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index a26e0801238..1158ee56655 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -45,7 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("errors", "admin", "mails", "languages"));
 
-$action = GETPOST('action', 'alpha') ?GETPOST('action', 'alpha') : 'view';
+$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
 $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
 
 $id = GETPOST('id', 'int');
@@ -113,31 +113,29 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 $formmail = new FormMail($db);
 if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
 {
-    $tmp = FormMail::getAvailableSubstitKey('formemail');
-    $tmp['__(AnyTranslationKey)__'] = 'Translation';
-    $helpsubstit = $langs->trans("AvailableVariables").':<br>';
-    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
-    foreach ($tmp as $key => $val)
-    {
-    	$helpsubstit .= $key.' -> '.$val.'<br>';
-    	$helpsubstitforlines .= $key.' -> '.$val.'<br>';
-    }
-}
-else
-{
-    $tmp = FormMail::getAvailableSubstitKey('formemailwithlines');
-    $tmp['__(AnyTranslationKey)__'] = 'Translation';
-    $helpsubstit = $langs->trans("AvailableVariables").':<br>';
-    $helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
-    foreach ($tmp as $key => $val)
-    {
-    	$helpsubstit .= $key.' -> '.$val.'<br>';
-    }
-    $tmp = FormMail::getAvailableSubstitKey('formemailforlines');
-    foreach ($tmp as $key => $val)
-    {
-    	$helpsubstitforlines .= $key.' -> '.$val.'<br>';
-    }
+	$tmp = FormMail::getAvailableSubstitKey('formemail');
+	$tmp['__(AnyTranslationKey)__'] = 'Translation';
+	$helpsubstit = $langs->trans("AvailableVariables").':<br>';
+	$helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
+	foreach ($tmp as $key => $val)
+	{
+		$helpsubstit .= $key.' -> '.$val.'<br>';
+		$helpsubstitforlines .= $key.' -> '.$val.'<br>';
+	}
+} else {
+	$tmp = FormMail::getAvailableSubstitKey('formemailwithlines');
+	$tmp['__(AnyTranslationKey)__'] = 'Translation';
+	$helpsubstit = $langs->trans("AvailableVariables").':<br>';
+	$helpsubstitforlines = $langs->trans("AvailableVariables").':<br>';
+	foreach ($tmp as $key => $val)
+	{
+		$helpsubstit .= $key.' -> '.$val.'<br>';
+	}
+	$tmp = FormMail::getAvailableSubstitKey('formemailforlines');
+	foreach ($tmp as $key => $val)
+	{
+		$helpsubstitforlines .= $key.' -> '.$val.'<br>';
+	}
 }
 
 
@@ -169,6 +167,8 @@ if ($conf->adherent->enabled && $user->rights->adherent->lire)          $element
 if ($conf->contrat->enabled && $user->rights->contrat->lire)           $elementList['contract'] = $langs->trans('MailToSendContract');
 if ($conf->projet->enabled)            $elementList['project'] = $langs->trans('MailToProject');
 if ($conf->ticket->enabled && $user->rights->ticket->read)            $elementList['ticket_send'] = $langs->trans('MailToTicket');
+if ($conf->recruitment->enabled && $user->rights->recruitment->recruitmentjobposition->read)            $elementList['recruitmentcandidature_send'] = $langs->trans('RecruitmentCandidatures');
+if ($conf->agenda->enabled)            $elementList['actioncomm_send'] = $langs->trans('MailToSendEventPush');
 $elementList['user'] = $langs->trans('MailToUser');
 
 $parameters = array('elementList'=>$elementList);
@@ -201,217 +201,206 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 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_label = '';
-        $search_type_template = '';
-        $search_lang = '';
-        $search_fk_user = '';
-        $search_topic = '';
-        $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_label = '';
+		$search_type_template = '';
+		$search_lang = '';
+		$search_fk_user = '';
+		$search_topic = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 
-    // 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]);
+	// 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]);
 
-        // Check that all fields are filled
-        $ok = 1;
-        foreach ($listfield as $f => $value)
-        {
-        	// Not mandatory fields
-            if ($value == 'joinfiles') continue;
-            if ($value == 'content') continue;
-            if ($value == 'content_lines') continue;
+		// Check that all fields are filled
+		$ok = 1;
+		foreach ($listfield as $f => $value)
+		{
+			// Not mandatory fields
+			if ($value == 'joinfiles') continue;
+			if ($value == 'content') continue;
+			if ($value == 'content_lines') continue;
 
-            if (GETPOST('actionmodify', 'alpha') && $value == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid];
+			if (GETPOST('actionmodify', 'alpha') && $value == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid];
 
-            if ((!isset($_POST[$value]) || $_POST[$value] == '' || $_POST[$value] == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
-            {
-                $ok = 0;
-                $fieldnamekey = $listfield[$f];
-                // We take translate key of field
-                if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Code';
-                if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-                if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-                if ($fieldnamekey == 'type_template') $fieldnamekey = 'TypeOfTemplate';
-                if ($fieldnamekey == 'fk_user') $fieldnamekey = 'Owner';
-                if ($fieldnamekey == 'private') $fieldnamekey = 'Private';
-                if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-                if ($fieldnamekey == 'topic') $fieldnamekey = 'Topic';
+			if ((!isset($_POST[$value]) || $_POST[$value] == '' || $_POST[$value] == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position')
+			{
+				$ok = 0;
+				$fieldnamekey = $listfield[$f];
+				// We take translate key of field
+				if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Code';
+				if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+				if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+				if ($fieldnamekey == 'type_template') $fieldnamekey = 'TypeOfTemplate';
+				if ($fieldnamekey == 'fk_user') $fieldnamekey = 'Owner';
+				if ($fieldnamekey == 'private') $fieldnamekey = 'Private';
+				if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
+				if ($fieldnamekey == 'topic') $fieldnamekey = 'Topic';
 
-                setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-            }
-        }
+				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+			}
+		}
 
-        // Si verif ok et action add, on ajoute la ligne
-        if ($ok && GETPOST('actionadd'))
-        {
-            // Add new entry
-            $sql = "INSERT INTO ".$tabname[$id]." (";
-            // List of fields
-            $sql .= $tabfieldinsert[$id];
-            $sql .= ",active)";
-            $sql .= " VALUES(";
+		// Si verif ok et action add, on ajoute la ligne
+		if ($ok && GETPOST('actionadd'))
+		{
+			// Add new entry
+			$sql = "INSERT INTO ".$tabname[$id]." (";
+			// List of fields
+			$sql .= $tabfieldinsert[$id];
+			$sql .= ",active)";
+			$sql .= " VALUES(";
 
-            // List of values
-            $i = 0;
-            foreach ($listfieldinsert as $f => $value)
-            {
-            	$keycode = $listfieldvalue[$i];
-            	if ($value == 'lang') $keycode = 'langcode';
-            	if (empty($keycode)) $keycode = $value;
+			// List of values
+			$i = 0;
+			foreach ($listfieldinsert as $f => $value)
+			{
+				$keycode = $listfieldvalue[$i];
+				if ($value == 'lang') $keycode = 'langcode';
+				if (empty($keycode)) $keycode = $value;
 
-                if ($value == 'entity') $_POST[$keycode] = $conf->entity;
-                if ($value == 'fk_user' && !($_POST[$keycode] > 0)) $_POST[$keycode] = '';
-                if ($value == 'private' && !is_numeric($_POST[$keycode])) $_POST[$keycode] = '0';
-                if ($value == 'position' && !is_numeric($_POST[$keycode])) $_POST[$keycode] = '1';
-                //var_dump($keycode.' '.$value);
+				if ($value == 'entity') $_POST[$keycode] = $conf->entity;
+				if ($value == 'fk_user' && !($_POST[$keycode] > 0)) $_POST[$keycode] = '';
+				if ($value == 'private' && !is_numeric($_POST[$keycode])) $_POST[$keycode] = '0';
+				if ($value == 'position' && !is_numeric($_POST[$keycode])) $_POST[$keycode] = '1';
+				//var_dump($keycode.' '.$value);
 
-                if ($i) $sql .= ", ";
-                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 == 'content') {
-                	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-                }
-                elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
-                	$sql .= (int) GETPOST($keycode, 'int');
-                }
-                else {
-                	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
-                }
+				if ($i) $sql .= ", ";
+				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 == 'content') {
+					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+				} elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+					$sql .= (int) GETPOST($keycode, 'int');
+				} else {
+					$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+				}
+				$i++;
+			}
+			$sql .= ", 1)";
 
-                $i++;
-            }
-            $sql .= ", 1)";
+			dol_syslog("actionadd", LOG_DEBUG);
+			$result = $db->query($sql);
+			if ($result)	// Add is ok
+			{
+				setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+				$_POST = array('id'=>$id); // Clean $_POST array, we keep only id
+			} 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 id
-            }
-            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'))
+		{
+			$rowidcol = "rowid";
 
-        // Si verif ok et action modify, on modifie la ligne
-        if ($ok && GETPOST('actionmodify'))
-        {
-            $rowidcol = "rowid";
+			// Modify entry
+			$sql = "UPDATE ".$tabname[$id]." SET ";
+			// Modifie valeur des champs
+			$i = 0;
+			foreach ($listfieldmodify as $field)
+			{
+				$keycode = $listfieldvalue[$i];
+				if ($field == 'lang') $keycode = 'langcode';
+				if (empty($keycode)) $keycode = $field;
 
-            // Modify entry
-            $sql = "UPDATE ".$tabname[$id]." SET ";
-            // Modifie valeur des champs
-            $i = 0;
-            foreach ($listfieldmodify as $field)
-            {
-            	$keycode = $listfieldvalue[$i];
-            	if ($field == 'lang') $keycode = 'langcode';
-            	if (empty($keycode)) $keycode = $field;
+				if ($field == 'fk_user' && !($_POST['fk_user'] > 0)) $_POST['fk_user'] = '';
+				if ($field == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid];
+				if ($field == 'joinfiles') $_POST['joinfiles'] = $_POST['joinfiles-'.$rowid];
+				if ($field == 'content') $_POST['content'] = $_POST['content-'.$rowid];
+				if ($field == 'content_lines') $_POST['content_lines'] = $_POST['content_lines-'.$rowid];
+				if ($field == 'entity') $_POST[$keycode] = $conf->entity;
 
-                if ($field == 'fk_user' && !($_POST['fk_user'] > 0)) $_POST['fk_user'] = '';
-            	if ($field == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid];
-            	if ($field == 'joinfiles') $_POST['joinfiles'] = $_POST['joinfiles-'.$rowid];
-            	if ($field == 'content') $_POST['content'] = $_POST['content-'.$rowid];
-            	if ($field == 'content_lines') $_POST['content_lines'] = $_POST['content_lines-'.$rowid];
-                if ($field == 'entity') $_POST[$keycode] = $conf->entity;
+				if ($i) $sql .= ", ";
+				$sql .= $field."=";
 
-                if ($i) $sql .= ", ";
-                $sql .= $field."=";
+				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 == 'content') {
+					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+				} elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+					$sql .= (int) GETPOST($keycode, 'int');
+				} else {
+					$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+				}
 
-                if (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 == 'content') {
-                	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-                }
-                elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
-                	$sql .= (int) GETPOST($keycode, 'int');
-                }
-                else {
-                	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
-                }
+				$i++;
+			}
 
-                $i++;
-            }
-            $sql .= " WHERE ".$rowidcol." = '".$rowid."'";
-            //print $sql;exit;
-            dol_syslog("actionmodify", LOG_DEBUG);
-            //print $sql;
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-            	setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-            }
-            else
-            {
-                setEventMessages($db->error(), null, 'errors');
-            }
-        }
-    }
+			$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+			//print $sql;exit;
+			dol_syslog("actionmodify", LOG_DEBUG);
+			//print $sql;
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			} else {
+				setEventMessages($db->error(), null, 'errors');
+			}
+		}
+	}
 
-    if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
-    {
-        $rowidcol = "rowid";
+	if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
+	{
+		$rowidcol = "rowid";
 
-        $sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."='".$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])
-    {
-        $rowidcol = "rowid";
+	// activate
+	if ($action == $acts[0])
+	{
+		$rowidcol = "rowid";
 
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$rowid."'";
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."=".((int) $rowid);
 
-        $result = $db->query($sql);
-        if (!$result)
-        {
-            dol_print_error($db);
-        }
-    }
+		$result = $db->query($sql);
+		if (!$result)
+		{
+			dol_print_error($db);
+		}
+	}
 
-    // disable
-    if ($action == $acts[1])
-    {
-        $rowidcol = "rowid";
+	// disable
+	if ($action == $acts[1])
+	{
+		$rowidcol = "rowid";
 
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$rowid."'";
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."=".((int) $rowid);
 
-        $result = $db->query($sql);
-        if (!$result)
-        {
-            dol_print_error($db);
-        }
-    }
+		$result = $db->query($sql);
+		if (!$result)
+		{
+			dol_print_error($db);
+		}
+	}
 }
 
 
@@ -422,13 +411,15 @@ if (empty($reshook))
 $form = new Form($db);
 $formadmin = new FormAdmin($db);
 
-llxHeader();
+$help_url = '';
+$title = $langs->trans("EMailsSetup");
+
+llxHeader('', $title);
 
-$titre = $langs->trans("EMailsSetup");
 $linkback = '';
 $titlepicto = 'title_setup';
 
-print load_fiche_titre($titre, $linkback, $titlepicto);
+print load_fiche_titre($title, $linkback, $titlepicto);
 
 $head = email_admin_prepare_head();
 
@@ -437,7 +428,7 @@ dol_fiche_head($head, 'templates', '', -1);
 // 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, $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, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
@@ -452,7 +443,7 @@ if (!$user->admin)
 }
 if (empty($conf->global->MAIN_MULTILANGS))
 {
-	$sql .= " AND (lang = '".$langs->defaultlang."' OR lang IS NULL OR lang = '')";
+	$sql .= " AND (lang = '".$db->escape($langs->defaultlang)."' OR lang IS NULL OR lang = '')";
 }
 if ($search_label) $sql .= natural_search('label', $search_label);
 if ($search_type_template != '' && $search_type_template != '-1') $sql .= natural_search('type_template', $search_type_template);
@@ -467,154 +458,149 @@ $sql .= $db->plimit($listlimit + 1, $offset);
 
 $fieldlist = explode(',', $tabfield[$id]);
 
-// Form to add a new line
-print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+if ($action == 'view') {
+	// Form to add a new line
+	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-no-min">';
-print '<table class="noborder centpercent">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
 
-// Line to enter new values (title)
-print '<tr class="liste_titre">';
-foreach ($fieldlist as $field => $value)
-{
-	// Determine le nom du champ par rapport aux noms possibles
-	// dans les dictionnaires de donnees
-	$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-	$valuetoshow = $langs->trans($valuetoshow); // try to translate
-	$align = "left";
-	if ($fieldlist[$field] == 'fk_user') { $valuetoshow = $langs->trans("Owner"); }
-	if ($fieldlist[$field] == 'lang') { $valuetoshow = (empty($conf->global->MAIN_MULTILANGS) ? '&nbsp;' : $langs->trans("Language")); }
-	if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
-	if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
-	if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Code"); }
-	if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); }
-	if ($fieldlist[$field] == 'private') { $align = 'center'; }
-	if ($fieldlist[$field] == 'position') { $align = 'center'; }
-
-	if ($fieldlist[$field] == 'topic') { $valuetoshow = ''; }
-	if ($fieldlist[$field] == 'joinfiles') { $valuetoshow = ''; }
-	if ($fieldlist[$field] == 'content') { $valuetoshow = ''; }
-	if ($fieldlist[$field] == 'content_lines') { $valuetoshow = ''; }
-
-	if ($valuetoshow != '')
+	// Line to enter new values (title)
+	print '<tr class="liste_titre">';
+	foreach ($fieldlist as $field => $value)
 	{
-		print '<td align="'.$align.'">';
-		if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-		elseif (!empty($tabhelp[$id][$value]))
+		// Determine le nom du champ par rapport aux noms possibles
+		// dans les dictionnaires de donnees
+		$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+		$valuetoshow = $langs->trans($valuetoshow); // try to translate
+		$align = "left";
+		if ($fieldlist[$field] == 'fk_user') { $valuetoshow = $langs->trans("Owner"); }
+		if ($fieldlist[$field] == 'lang') { $valuetoshow = (empty($conf->global->MAIN_MULTILANGS) ? '&nbsp;' : $langs->trans("Language")); }
+		if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+		if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+		if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Code"); }
+		if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); }
+		if ($fieldlist[$field] == 'private') { $align = 'center'; }
+		if ($fieldlist[$field] == 'position') { $align = 'center'; }
+
+		if ($fieldlist[$field] == 'topic') { $valuetoshow = ''; }
+		if ($fieldlist[$field] == 'joinfiles') { $valuetoshow = ''; }
+		if ($fieldlist[$field] == 'content') { $valuetoshow = ''; }
+		if ($fieldlist[$field] == 'content_lines') { $valuetoshow = ''; }
+
+		if ($valuetoshow != '')
 		{
-			if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
-			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2); // Tooltip on hover
+			print '<td align="'.$align.'">';
+			if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+			elseif (!empty($tabhelp[$id][$value]))
+			{
+				if (in_array($value, array('topic'))) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, $value); // Tooltip on click
+				else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2); // Tooltip on hover
+			} else print $valuetoshow;
+			print '</td>';
 		}
-		else print $valuetoshow;
-		print '</td>';
 	}
-}
-print '<td>';
-print '<input type="hidden" name="id" value="'.$id.'">';
-print '</td>';
-print '</tr>';
+	print '<td>';
+	print '<input type="hidden" name="id" value="'.$id.'">';
+	print '</td>';
+	print '</tr>';
 
-$obj = new stdClass();
-// If data was already input, we define them in obj to populate input fields.
-if (GETPOST('actionadd'))
-{
-	foreach ($fieldlist as $key => $val) {
-		if (GETPOST($val) != '')
+	$obj = new stdClass();
+	// If data was already input, we define them in obj to populate input fields.
+	if (GETPOST('actionadd'))
+	{
+		foreach ($fieldlist as $key => $val) {
+			if (GETPOST($val) != '')
 			$obj->$val = GETPOST($val);
+		}
 	}
-}
 
-$tmpaction = 'create';
-$parameters = array(
+	$tmpaction = 'create';
+	$parameters = array(
 	'fieldlist' => $fieldlist,
 	'tabname' => $tabname[$id]
-);
-$reshook = $hookmanager->executeHooks('createEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-$error = $hookmanager->error;
-$errors = $hookmanager->errors;
+	);
+	$reshook = $hookmanager->executeHooks('createEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+	$error = $hookmanager->error;
+	$errors = $hookmanager->errors;
 
 
-// Line to enter new values (input fields)
-print '<tr class="oddeven">';
+	// Line to enter new values (input fields)
+	print '<tr class="oddeven">';
 
-if (empty($reshook))
-{
-	if ($action == 'edit') {
-		fieldList($fieldlist, $obj, $tabname[$id], 'hide');
-	} else {
-		fieldList($fieldlist, $obj, $tabname[$id], 'add');
-	}
-}
-
-print '<td class="right">';
-print '</td>';
-print "</tr>";
-
-// Show fields for topic, join files and body
-$fieldsforcontent = array('topic', 'joinfiles', 'content');
-if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('content', 'content_lines'); }
-foreach ($fieldsforcontent as $tmpfieldlist)
-{
-	print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';
-
-	// Label
-	if ($tmpfieldlist == 'topic')
+	if (empty($reshook))
 	{
-		print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+		if ($action == 'edit') {
+			fieldList($fieldlist, $obj, $tabname[$id], 'hide');
+		} else {
+			fieldList($fieldlist, $obj, $tabname[$id], 'add');
+		}
 	}
-	if ($tmpfieldlist == 'joinfiles')
+
+	print '<td class="right">';
+	print '</td>';
+	print "</tr>";
+
+	// Show fields for topic, join files and body
+	$fieldsforcontent = array('topic', 'joinfiles', 'content');
+	if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) { $fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines'); }
+	foreach ($fieldsforcontent as $tmpfieldlist)
 	{
-		print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
-	}
-	if ($tmpfieldlist == 'content')
+		print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';
+
+		// Label
+		if ($tmpfieldlist == 'topic')
+		{
+			print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+		}
+		if ($tmpfieldlist == 'joinfiles')
+		{
+			print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+		}
+		if ($tmpfieldlist == 'content')
 		print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
-	if ($tmpfieldlist == 'content_lines')
+		if ($tmpfieldlist == 'content_lines')
 		print $form->textwithpicto($langs->trans("ContentForLines"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
 
-	// Input field
-	if ($tmpfieldlist == 'topic') {
-		print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
-	}
-	elseif ($tmpfieldlist == 'joinfiles') {
-		print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(isset($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '1').'">';
-	}
-	else
-	{
-		if ($context != 'hide') {
-			// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
-			$okforextended = true;
-			if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
+		// Input field
+		if ($tmpfieldlist == 'topic') {
+			print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
+		} elseif ($tmpfieldlist == 'joinfiles') {
+			print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(isset($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '1').'">';
+		} else {
+			if ($context != 'hide') {
+				// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
+				$okforextended = true;
+				if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
 				$okforextended = false;
-			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 120, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
-			print $doleditor->Create(1);
-		}
-		else
-			print '&nbsp;';
-	}
-	print '</td>';
-	if ($tmpfieldlist == 'topic') {
-		print '<td class="center" rowspan="'.(count($fieldsforcontent)).'">';
-		if ($action != 'edit') {
-			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+				$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
+				print $doleditor->Create(1);
+			} else print '&nbsp;';
 		}
 		print '</td>';
+		if ($tmpfieldlist == 'topic') {
+			print '<td class="center" rowspan="'.(count($fieldsforcontent)).'">';
+			if ($action != 'edit') {
+				print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+			}
+			print '</td>';
+		}
+		// else print '<td></td>';
+		print '</tr>';
 	}
-	// else print '<td></td>';
-	print '</tr>';
-}
 
 
 
-$colspan = count($fieldlist) + 1;
-//print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';	// Keep &nbsp; to have a line with enough height
-
-print '</table>';
-print '</div>';
-print '</form>';
-print '<br>';
+	$colspan = count($fieldlist) + 1;
+	//print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';  // Keep &nbsp; to have a line with enough height
 
+	print '</table>';
+	print '</div>';
+	print '</form>';
+	print '<br>';
+} // END IF not edit
 
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -628,90 +614,90 @@ dol_syslog("htdocs/admin/dict", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    $param = '&id='.$id;
-    if ($search_label)                 $param .= '&search_label='.urlencode($search_label);
-    if ($search_lang > 0)              $param .= '&search_lang='.urlencode($search_lang);
-    if ($search_type_template != '-1') $param .= '&search_type_template='.urlencode($search_type_template);
-    if ($search_fk_user > 0)           $param .= '&search_fk_user='.urlencode($search_fk_user);
-    if ($search_topic)                 $param .= '&search_topic='.urlencode($search_topic);
+	$param = '&id='.$id;
+	if ($search_label)                 $param .= '&search_label='.urlencode($search_label);
+	if ($search_lang > 0)              $param .= '&search_lang='.urlencode($search_lang);
+	if ($search_type_template != '-1') $param .= '&search_type_template='.urlencode($search_type_template);
+	if ($search_fk_user > 0)           $param .= '&search_fk_user='.urlencode($search_fk_user);
+	if ($search_topic)                 $param .= '&search_topic='.urlencode($search_topic);
 
-    $paramwithsearch = $param;
-    if ($sortorder) $paramwithsearch .= '&sortorder='.urlencode($sortorder);
-    if ($sortfield) $paramwithsearch .= '&sortfield='.urlencode($sortfield);
-    if (GETPOST('from', 'alpha')) $paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
+	$paramwithsearch = $param;
+	if ($sortorder) $paramwithsearch .= '&sortorder='.urlencode($sortorder);
+	if ($sortfield) $paramwithsearch .= '&sortfield='.urlencode($sortfield);
+	if (GETPOST('from', 'alpha')) $paramwithsearch .= '&from='.urlencode(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>';
-    }
+	// 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">';
+	// Title line with search boxes
+	print '<tr class="liste_titre">';
 
-    $filterfound = 0;
-    foreach ($fieldlist as $field => $value)
-    {
-    	if ($value == 'label') {
-    		print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth100" value="'.dol_escape_htmltag($search_label).'"></td>';
-    	} elseif ($value == 'lang') {
-        	print '<td class="liste_titre">';
-        	print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth100');
-        	print '</td>';
-        } elseif ($value == 'fk_user') {
-        	print '<td class="liste_titre">';
-        	$restrictid = array();
-        	if (!$user->admin) $restrictid = array($user->id);
-        	//var_dump($restrictid);
-        	print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth100');
-        	print '</td>';
-        } elseif ($value == 'topic') {
-        	print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
-        } elseif ($value == 'type_template') {
-        	print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 maxwidth100onsmartphone').'</td>';
-        } elseif (!in_array($value, array('content', 'content_lines'))) {
-        	print '<td class="liste_titre"></td>';
-        }
-    }
+	$filterfound = 0;
+	foreach ($fieldlist as $field => $value)
+	{
+		if ($value == 'label') {
+			print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth200" value="'.dol_escape_htmltag($search_label).'"></td>';
+		} elseif ($value == 'lang') {
+			print '<td class="liste_titre">';
+			print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth100');
+			print '</td>';
+		} elseif ($value == 'fk_user') {
+			print '<td class="liste_titre">';
+			$restrictid = array();
+			if (!$user->admin) $restrictid = array($user->id);
+			//var_dump($restrictid);
+			print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth100');
+			print '</td>';
+		} elseif ($value == 'topic') {
+			print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
+		} elseif ($value == 'type_template') {
+			print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 maxwidth100onsmartphone').'</td>';
+		} elseif (!in_array($value, array('content', 'content_lines'))) {
+			print '<td class="liste_titre"></td>';
+		}
+	}
 
-    if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
+	if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) print '<td class="liste_titre"></td>';
 
-    // Action column
-    print '<td class="liste_titre right" width="64">';
-    $searchpicto = $form->showFilterButtons();
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+	// Action column
+	print '<td class="liste_titre right" width="64">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    // Title of lines
-    print '<tr class="liste_titre">';
-    foreach ($fieldlist as $field => $value)
-    {
-        $showfield = 1; // By defaut
-        $align = "left";
-        $sortable = 1;
-        $valuetoshow = '';
-        $forcenowrap = 1;
-        /*
+	// Title of lines
+	print '<tr class="liste_titre">';
+	foreach ($fieldlist as $field => $value)
+	{
+		$showfield = 1; // By defaut
+		$align = "left";
+		$sortable = 1;
+		$valuetoshow = '';
+		$forcenowrap = 1;
+		/*
         $tmparray=getLabelOfField($fieldlist[$field]);
         $showfield=$tmp['showfield'];
         $valuetoshow=$tmp['valuetoshow'];
         $align=$tmp['align'];
         $sortable=$tmp['sortable'];
 		*/
-        $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
-        $valuetoshow = $langs->trans($valuetoshow); // try to translate
-        if ($fieldlist[$field] == 'fk_user') { $valuetoshow = $langs->trans("Owner"); }
-        if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-        if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
-        if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Code"); }
-    	if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); }
+		$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+		$valuetoshow = $langs->trans($valuetoshow); // try to translate
+		if ($fieldlist[$field] == 'fk_user') { $valuetoshow = $langs->trans("Owner"); }
+		if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+		if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+		if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Code"); }
+		if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); }
 		if ($fieldlist[$field] == 'private') { $align = 'center'; }
 		if ($fieldlist[$field] == 'position') { $align = 'center'; }
 
@@ -719,101 +705,99 @@ if ($resql)
 		if ($fieldlist[$field] == 'content') { $valuetoshow = $langs->trans("Content"); $showfield = 0; }
 		if ($fieldlist[$field] == 'content_lines') { $valuetoshow = $langs->trans("ContentLines"); $showfield = 0; }
 
-        // Show fields
-        if ($showfield)
-        {
-            if (!empty($tabhelp[$id][$value]))
-            {
-            	if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value, $forcenowrap); // Tooltip on click
-                else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', $forcenowrap); // Tooltip on hover
-            }
-            print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "align=".$align, $sortfield, $sortorder);
-        }
-    }
+		// Show fields
+		if ($showfield)
+		{
+			if (!empty($tabhelp[$id][$value]))
+			{
+				if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value, $forcenowrap); // Tooltip on click
+				else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', $forcenowrap); // Tooltip on hover
+			}
+			print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "align=".$align, $sortfield, $sortorder);
+		}
+	}
 
-    print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
-    print getTitleFieldOfList('');
-    print '</tr>';
+	print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+	print getTitleFieldOfList('');
+	print '</tr>';
 
-    if ($num)
-    {
-        // Lines with values
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+	if ($num)
+	{
+		// Lines with values
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-            {
-            	print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+			if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
+			{
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 
-            	$tmpaction = 'edit';
-                $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                $reshook = $hookmanager->executeHooks('editEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-                $error = $hookmanager->error; $errors = $hookmanager->errors;
+				$tmpaction = 'edit';
+				$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$reshook = $hookmanager->executeHooks('editEmailTemplateFieldlist', $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)) fieldList($fieldlist, $obj, $tabname[$id], 'edit');
+				// Show fields
+				if (empty($reshook)) fieldList($fieldlist, $obj, $tabname[$id], 'edit');
 
-                print '<td></td><td></td><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 buttongen" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
-                print '<input type="submit" class="button buttongen" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-                print '</td>';
+				print '<td></td><td></td><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 buttongen" name="actionmodify" value="'.$langs->trans("Modify").'">';
+				print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
+				print '<input type="submit" class="button buttongen" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+				print '</td>';
 
-                $fieldsforcontent = array('topic', 'joinfiles', 'content');
-                if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
-                {
-                    $fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
-                }
-                foreach ($fieldsforcontent as $tmpfieldlist)
-                {
-                    $showfield = 1;
-                    $align = "left";
-                    $valuetoshow = $obj->{$tmpfieldlist};
+				$fieldsforcontent = array('topic', 'joinfiles', 'content');
+				if (!empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
+				{
+					$fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
+				}
+				foreach ($fieldsforcontent as $tmpfieldlist)
+				{
+					$showfield = 1;
+					$align = "left";
+					$valuetoshow = $obj->{$tmpfieldlist};
 
-                    $class = 'tddict';
-                    // Show value for field
-                    if ($showfield) {
+					$class = 'tddict';
+					// Show value for field
+					if ($showfield) {
 						// Show line for topic, joinfiles and content
-                        print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' ">';
-                        print '<td colspan="8">';
-                        if ($tmpfieldlist == 'topic')
-                        {
-	                        print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
-    	                    print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
-                        }
-                        if ($tmpfieldlist == 'joinfiles')
-                        {
-                        	print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
-                        	print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
-                        }
-                        if ($tmpfieldlist == 'content')
-                        {
-                        	print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
-                        	$okforextended = true;
-                        	if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended = false;
-                        	$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
-                        	print $doleditor->Create(1);
-                        }
-                        print '</td>';
-                        print '<td></td>';
-                        print '<td></td>';
-                    }
-                }
+						print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' ">';
+						print '<td colspan="8">';
+						if ($tmpfieldlist == 'topic')
+						{
+							print '<strong>'.$form->textwithpicto($langs->trans("Topic"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+							print '<input type="text" class="flat minwidth500" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
+						}
+						if ($tmpfieldlist == 'joinfiles')
+						{
+							print '<strong>'.$form->textwithpicto($langs->trans("FilesAttachedToEmail"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'</strong> ';
+							print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'-'.$rowid.'" value="'.(!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '').'">';
+						}
+						if ($tmpfieldlist == 'content')
+						{
+							print $form->textwithpicto($langs->trans("Content"), $tabhelp[$id][$tmpfieldlist], 1, 'help', '', 0, 2, $tmpfieldlist).'<br>';
+							$okforextended = true;
+							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended = false;
+							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+							print $doleditor->Create(1);
+						}
+						print '</td>';
+						print '<td></td>';
+						print '<td></td>';
+					}
+				}
 
-                print "</tr>\n";
-            }
-            else
-            {
-            	$keyforobj = 'type_template';
-            	if (!in_array($obj->$keyforobj, array_keys($elementList)))
-            	{
-            		$i++;
-            		continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
-            	}
+				print "</tr>\n";
+			} else {
+				$keyforobj = 'type_template';
+				if (!in_array($obj->$keyforobj, array_keys($elementList)))
+				{
+					$i++;
+					continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
+				}
 				// Test on 'enabled'
 				if (!dol_eval($obj->enabled, 1))
 				{
@@ -821,100 +805,100 @@ if ($resql)
 					continue; // Email template not qualified
 				}
 
-            	print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 
-            	$tmpaction = 'view';
-                $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                $reshook = $hookmanager->executeHooks('viewEmailTemplateFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+				$tmpaction = 'view';
+				$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+				$reshook = $hookmanager->executeHooks('viewEmailTemplateFieldlist', $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)
-                    {
-                        if (in_array($fieldlist[$field], array('content', 'content_lines'))) continue;
-                        $showfield = 1;
-                    	$align = "left";
-                        $valuetoshow = $obj->{$fieldlist[$field]};
-                        if ($value == 'label' || $value == 'topic')
-                        {
-                            $valuetoshow = dol_escape_htmltag($valuetoshow);
-                        }
-                        if ($value == 'type_template')
-                        {
-                            $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-                        }
-                        if ($value == 'lang' && $valuetoshow)
-                        {
-                        	$valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
-                        }
-                        if ($value == 'fk_user')
-                        {
-                        	if ($valuetoshow > 0)
-                        	{
-                        		$fuser = new User($db);
-                        		$fuser->fetch($valuetoshow);
-                        		$valuetoshow = $fuser->getNomUrl(1);
-                        	}
-                        }
-                        if ($value == 'private')
-                        {
-                        	$align = "center";
-                        	if ($valuetoshow) $valuetoshow = yn($valuetoshow);
-                        	else $valuetoshow = '';
-                        }
-                        if ($value == 'position')
-                        {
-                        	$align = "center";
-                        }
-                        if ($value == 'joinfiles')
-                        {
-                        	$align = "center";
-                        	if ($valuetoshow) $valuetoshow = 1;
-                        	else $valuetoshow = '';
-                        }
+				if (empty($reshook))
+				{
+					foreach ($fieldlist as $field => $value)
+					{
+						if (in_array($fieldlist[$field], array('content', 'content_lines'))) continue;
+						$showfield = 1;
+						$align = "left";
+						$valuetoshow = $obj->{$fieldlist[$field]};
+						if ($value == 'label' || $value == 'topic')
+						{
+							$valuetoshow = dol_escape_htmltag($valuetoshow);
+						}
+						if ($value == 'type_template')
+						{
+							$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+						}
+						if ($value == 'lang' && $valuetoshow)
+						{
+							$valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
+						}
+						if ($value == 'fk_user')
+						{
+							if ($valuetoshow > 0)
+							{
+								$fuser = new User($db);
+								$fuser->fetch($valuetoshow);
+								$valuetoshow = $fuser->getNomUrl(1);
+							}
+						}
+						if ($value == 'private')
+						{
+							$align = "center";
+							if ($valuetoshow) $valuetoshow = yn($valuetoshow);
+							else $valuetoshow = '';
+						}
+						if ($value == 'position')
+						{
+							$align = "center";
+						}
+						if ($value == 'joinfiles')
+						{
+							$align = "center";
+							if ($valuetoshow) $valuetoshow = 1;
+							else $valuetoshow = '';
+						}
 
-                        $class = 'tddict';
+						$class = 'tddict';
 						// Show value for field
 						if ($showfield)
 						{
-                           	print '<!-- '.$fieldlist[$field].' -->';
-                           	print '<td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
+						   	print '<!-- '.$fieldlist[$field].' -->';
+						   	print '<td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
 						}
-                    }
-                }
+					}
+				}
 
-                // Can an entry be erased or disabled ?
-                $iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
-                if (!$user->admin && $obj->fk_user != $user->id)
-                {
-                	$iserasable = 0;
-                	$canbedisabled = 0;
-                	$canbemodified = 0;
-                }
+				// Can an entry be erased or disabled ?
+				$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
+				if (!$user->admin && $obj->fk_user != $user->id)
+				{
+					$iserasable = 0;
+					$canbedisabled = 0;
+					$canbemodified = 0;
+				}
 
-                $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 .= '&';
 
-                // Status / Active
-                print '<td class="center nowrap">';
-                if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                else print '<span class="opacitymedium">'.$actl[$obj->active].'</span>';
-                print "</td>";
+				// Status / Active
+				print '<td class="center nowrap">';
+				if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+				else print '<span class="opacitymedium">'.$actl[$obj->active].'</span>';
+				print "</td>";
 
-                // Modify link / Delete link
-                print '<td class="center nowraponall" width="64">';
-                if ($canbemodified) print '<a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a>';
-                if ($iserasable)
-                {
-                    print '<a class="marginleftonly" 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>';
+				// Modify link / Delete link
+				print '<td class="center nowraponall" width="64">';
+				if ($canbemodified) print '<a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a>';
+				if ($iserasable)
+				{
+					print '<a class="marginleftonly" href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+					//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
+				}
+				print '</td>';
 
-                /*
+				/*
                 $fieldsforcontent = array('content');
                 if (! empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES))
                 {
@@ -942,16 +926,15 @@ if ($resql)
                     }
                 }*/
 
-                print "</tr>\n";
-            }
+				print "</tr>\n";
+			}
 
 
-            $i++;
-        }
-    }
-}
-else {
-    dol_print_error($db);
+			$i++;
+		}
+	}
+} else {
+	dol_print_error($db);
 }
 
 print '</table>';
@@ -992,25 +975,19 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			if ($user->admin)
 			{
 				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, '', null, 0, 0, 1, '', 0, '', 'maxwidth200');
-			}
-			else
-			{
+			} else {
 				if ($context == 'add')	// I am not admin and we show the add form
 				{
 					print $user->getNomUrl(1); // Me
 					$forcedvalue = $user->id;
-				}
-				else
-				{
+				} else {
 					if ($obj && !empty($obj->{$fieldlist[$field]}) && $obj->{$fieldlist[$field]} > 0)
 					{
 						$fuser = new User($db);
 						$fuser->fetch($obj->{$fieldlist[$field]});
 						print $fuser->getNomUrl(1);
 						$forcedvalue = $fuser->id;
-					}
-					else
-					{
+					} else {
 						$forcedvalue = $obj->{$fieldlist[$field]};
 					}
 				}
@@ -1018,8 +995,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				print '<input type="hidden" value="'.$forcedvalue.'" name="'.$keyname.'">';
 			}
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'lang')
+		} elseif ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
 			if (!empty($conf->global->MAIN_MULTILANGS))
@@ -1027,9 +1003,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				$selectedlang = GETPOSTISSET('langcode') ?GETPOST('langcode', 'aZ09') : $langs->defaultlang;
 				if ($context == 'edit') $selectedlang = $obj->{$fieldlist[$field]};
 				print $formadmin->select_language($selectedlang, 'langcode', 0, null, 1, 0, 0, 'maxwidth150');
-			}
-			else
-			{
+			} else {
 				if (!empty($obj->{$fieldlist[$field]}))
 				{
 					print $obj->{$fieldlist[$field]}.' - '.$langs->trans('Language_'.$obj->{$fieldlist[$field]});
@@ -1049,21 +1023,17 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				// Current tempalte type is an unknown type, so we must keep it as it is.
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
 				print $obj->{$fieldlist[$field]};
-			}
-			else
-			{
+			} else {
 				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150 maxwidth100onsmartphone');
 			}
 			print '</td>';
-		}
-		elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
+		} elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		elseif ($context == 'edit' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
 		elseif ($context == 'hide' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
-		else
-		{
+		else {
 			$size = ''; $class = ''; $classtd = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
-			if ($fieldlist[$field] == 'label') $class = 'maxwidth100';
+			if ($fieldlist[$field] == 'label') $class = 'maxwidth200';
 			if ($fieldlist[$field] == 'private') { $class = 'maxwidth50'; $classtd = 'center'; }
 			if ($fieldlist[$field] == 'position') { $class = 'maxwidth50'; $classtd = 'center'; }
 			if ($fieldlist[$field] == 'libelle') $class = 'quatrevingtpercent';
@@ -1076,15 +1046,11 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				if (empty($user->admin))
 				{
 					print $form->selectyesno($fieldlist[$field], '1', 1);
-				}
-				else
-				{
+				} else {
 					//print '<input type="text" '.$size.'class="flat'.($class?' '.$class:'').'" value="1" name="'.$fieldlist[$field].'">';
 					print $form->selectyesno($fieldlist[$field], (isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1);
 				}
-			}
-			else
-			{
+			} else {
 				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
new file mode 100644
index 00000000000..39e159535ba
--- /dev/null
+++ b/htdocs/admin/mails_ticket.php
@@ -0,0 +1,574 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2013	   Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2016      Jonathan TISSEAU     <jonathan.tisseau@86dev.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/admin/mails_ticket.php
+ *       \brief      Page to setup mails for ticket
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('companies', 'products', 'admin', 'mails', 'other', 'errors'));
+
+$action = GETPOST('action', 'aZ09');
+
+if (!$user->admin) accessforbidden();
+
+$usersignature = $user->signature;
+// For action = test or send, we ensure that content is not html, even for signature, because this we want a test with NO html.
+if ($action == 'test' || $action == 'send')
+{
+	$usersignature = dol_string_nohtmltag($usersignature);
+}
+
+$substitutionarrayfortest = array(
+'__LOGIN__' => $user->login,
+'__ID__' => 'TESTIdRecord',
+'__EMAIL__' => 'TESTEMail',
+'__LASTNAME__' => 'TESTLastname',
+'__FIRSTNAME__' => 'TESTFirstname',
+'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''),
+//'__PERSONALIZED__' => 'TESTPersonalized'	// Hiden because not used yet
+);
+complete_substitutions_array($substitutionarrayfortest, $langs);
+
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'update' && empty($_POST["cancel"]))
+{
+    // 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);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID_TICKET", GETPOST("MAIN_MAIL_SMTPS_ID_TICKET"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW_TICKET", GETPOST("MAIN_MAIL_SMTPS_PW_TICKET"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS_TICKET", GETPOST("MAIN_MAIL_EMAIL_TLS_TICKET"), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS_TICKET", GETPOST("MAIN_MAIL_EMAIL_STARTTLS_TICKET"), 'chaine', 0, '', $conf->entity);
+
+	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
+
+// Actions to send emails
+$id = 0;
+$actiontypecode = ''; // Not an event for agenda
+$triggersendname = ''; // Disable triggers
+$paramname = 'id';
+$mode = 'emailfortest';
+$trackid = (($action == 'testhtml') ? "testhtml" : "test");
+$sendcontext = 'ticket'; // Force to use dedicated context of setup for ticket
+include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
+if ($action == 'presend' && GETPOST('trackid') == 'test')       $action = 'test';
+if ($action == 'presend' && GETPOST('trackid') == 'testhtml')   $action = 'testhtml';
+
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$linuxlike = 1;
+if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
+if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+
+if (empty($conf->global->MAIN_MAIL_SENDMODE_TICKET)) $conf->global->MAIN_MAIL_SENDMODE_TICKET = 'default';
+$port = !empty($conf->global->MAIN_MAIL_SMTP_PORT_TICKET) ? $conf->global->MAIN_MAIL_SMTP_PORT_TICKET : ini_get('smtp_port');
+if (!$port) $port = 25;
+$server = !empty($conf->global->MAIN_MAIL_SMTP_SERVER_TICKET) ? $conf->global->MAIN_MAIL_SMTP_SERVER_TICKET : ini_get('SMTP');
+if (!$server) $server = '127.0.0.1';
+
+
+$wikihelp = 'EN:Setup_EMails|FR:Paramétrage_EMails|ES:Configuración_EMails';
+llxHeader('', $langs->trans("Setup"), $wikihelp);
+
+print load_fiche_titre($langs->trans("EMailsSetup"), '', 'title_setup');
+
+$head = email_admin_prepare_head();
+
+// List of sending methods
+$listofmethods = array();
+$listofmethods['default'] = $langs->trans('DefaultOutgoingEmailSetup');
+$listofmethods['mail'] = 'PHP mail function';
+//$listofmethods['simplemail']='Simplemail class';
+$listofmethods['smtps'] = 'SMTP/SMTPS socket library';
+if (version_compare(phpversion(), '7.0', '>=')) $listofmethods['swiftmailer'] = 'Swift Mailer socket library';
+
+
+if ($action == 'edit')
+{
+	if ($conf->use_javascript_ajax)
+	{
+		print "\n".'<script type="text/javascript" language="javascript">';
+		print 'jQuery(document).ready(function () {
+                    function initfields()
+                    {
+                        if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'default\')
+                        {
+                            jQuery(".hideifdefault").hide();
+						}
+						else
+						{
+                            jQuery(".hideifdefault").show();
+						}
+
+						if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'mail\')
+                        {
+                            jQuery(".drag").hide();
+                            jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").val(0);
+                            jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").prop("disabled", true);
+                            jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val(0);
+                            jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").prop("disabled", true);
+                            ';
+		if ($linuxlike)
+		{
+			print '
+			               jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").hide();
+			               jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").hide();
+			               jQuery("#smtp_server_mess").show();
+			               jQuery("#smtp_port_mess").show();
+			               ';
+		} else {
+			print '
+			               jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").prop("disabled", true);
+			               jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").prop("disabled", true);
+			               jQuery("#smtp_server_mess").hide();
+			               jQuery("#smtp_port_mess").hide();
+			               ';
+		}
+		print '
+                        }
+                        if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'smtps\')
+                        {
+                            jQuery(".drag").show();
+                            jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").val('.$conf->global->MAIN_MAIL_EMAIL_TLS_TICKET.');
+                            jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val('.$conf->global->MAIN_MAIL_EMAIL_STARTTLS_TICKET.');
+                            jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").show();
+                            jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").show();
+                            jQuery("#smtp_server_mess").hide();
+			                jQuery("#smtp_port_mess").hide();
+						}
+                        if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'swiftmailer\')
+                        {
+                            jQuery(".drag").show();
+                            jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").val('.$conf->global->MAIN_MAIL_EMAIL_TLS_TICKET.');
+                            jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val('.$conf->global->MAIN_MAIL_EMAIL_STARTTLS_TICKET.');
+                            jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").removeAttr("disabled");
+                            jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").show();
+                            jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").show();
+                            jQuery("#smtp_server_mess").hide();
+                            jQuery("#smtp_port_mess").hide();
+                        }
+                    }
+                    initfields();
+                    jQuery("#MAIN_MAIL_SENDMODE_TICKET").change(function() {
+                        initfields();
+                    });
+					jQuery("#MAIN_MAIL_EMAIL_TLS").change(function() {
+						if (jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val() == 1)
+							jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val(0);
+					});
+					jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").change(function() {
+						if (jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").val() == 1)
+							jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").val(0);
+					});
+               })';
+		print '</script>'."\n";
+	}
+
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+
+	dol_fiche_head($head, 'common_ticket', '', -1);
+
+	print '<span class="opacitymedium">'.$langs->trans("EMailsDesc")."</span><br>\n";
+	print "<br>\n";
+
+
+	clearstatcache();
+
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+	// Method
+
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
+
+	// SuperAdministrator access only
+	if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity))
+	{
+		print $form->selectarray('MAIN_MAIL_SENDMODE_TICKET', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE_TICKET);
+	} else {
+		$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE_TICKET];
+		if (empty($text)) $text = $langs->trans("Undefined");
+		$htmltext = $langs->trans("ContactSuperAdminForChange");
+		print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
+		print '<input type="hidden" name="MAIN_MAIL_SENDMODE_TICKET" value="'.$conf->global->MAIN_MAIL_SENDMODE_TICKET.'">';
+	}
+	print '</td></tr>';
+
+	// Host server
+
+	print '<tr class="oddeven hideifdefault"><td>';
+	if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail')
+	{
+		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
+		print '</td><td>';
+		print $langs->trans("SeeLocalSendMailSetup");
+	} else {
+		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER_TICKET) ? $conf->global->MAIN_MAIL_SMTP_SERVER_TICKET : '');
+		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
+		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
+		else print $langs->trans("MAIN_MAIL_SMTP_SERVER", $smtpserver);
+		print '</td><td>';
+		// SuperAdministrator access only
+		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
+		{
+			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER_TICKET" name="MAIN_MAIL_SMTP_SERVER_TICKET" size="18" value="'.$mainserver.'">';
+			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_TICKET_sav" name="MAIN_MAIL_SMTP_SERVER_TICKET_sav" value="'.$mainserver.'">';
+			print '<span id="smtp_server_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+		} else {
+			$text = !empty($mainserver) ? $mainserver : $smtpserver;
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
+			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_TICKET" name="MAIN_MAIL_SMTP_SERVER_TICKET" value="'.$mainserver.'">';
+		}
+	}
+	print '</td></tr>';
+
+	// Port
+
+	print '<tr class="oddeven hideifdefault"><td>';
+	if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail')
+	{
+		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
+		print '</td><td>';
+		print $langs->trans("SeeLocalSendMailSetup");
+	} else {
+		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT_TICKET) ? $conf->global->MAIN_MAIL_SMTP_PORT_TICKET : '');
+		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
+		if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
+		else print $langs->trans("MAIN_MAIL_SMTP_PORT", $smtpport);
+		print '</td><td>';
+		// SuperAdministrator access only
+		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
+		{
+			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT_TICKET" name="MAIN_MAIL_SMTP_PORT_TICKET" size="3" value="'.$mainport.'">';
+			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_TICKET_sav" name="MAIN_MAIL_SMTP_PORT_TICKET_sav" value="'.$mainport.'">';
+			print '<span id="smtp_port_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+		} else {
+			$text = (!empty($mainport) ? $mainport : $smtpport);
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
+			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_TICKET" name="MAIN_MAIL_SMTP_PORT_TICKET" value="'.$mainport.'">';
+		}
+	}
+	print '</td></tr>';
+
+	// ID
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))))
+	{
+		$mainstmpid = (!empty($conf->global->MAIN_MAIL_SMTPS_ID_TICKET) ? $conf->global->MAIN_MAIL_SMTPS_ID_TICKET : '');
+		print '<tr class="drag drop oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>';
+		// SuperAdministrator access only
+		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
+		{
+			print '<input class="flat" name="MAIN_MAIL_SMTPS_ID_TICKET" size="32" value="'.$mainstmpid.'">';
+		} else {
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID_TICKET, $htmltext, 1, 'superadmin');
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_ID_TICKET" value="'.$mainstmpid.'">';
+		}
+		print '</td></tr>';
+	}
+
+	// PW
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))))
+	{
+		$mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW_TICKET) ? $conf->global->MAIN_MAIL_SMTPS_PW_TICKET : '');
+		print '<tr class="drag drop oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>';
+		// SuperAdministrator access only
+		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity))
+		{
+			print '<input class="flat" type="password" name="MAIN_MAIL_SMTPS_PW_TICKET" size="32" value="'.$mainsmtppw.'">';
+		} else {
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW_TICKET, $htmltext, 1, 'superadmin');
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_PW_TICKET" value="'.$mainsmtppw.'">';
+		}
+		print '</td></tr>';
+	}
+
+	// TLS
+
+	print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))))
+	{
+		if (function_exists('openssl_open'))
+		{
+			print $form->selectyesno('MAIN_MAIL_EMAIL_TLS_TICKET', (!empty($conf->global->MAIN_MAIL_EMAIL_TLS_TICKET) ? $conf->global->MAIN_MAIL_EMAIL_TLS_TICKET : 0), 1);
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
+	print '</td></tr>';
+
+	// STARTTLS
+
+	print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))))
+	{
+		if (function_exists('openssl_open'))
+		{
+			print $form->selectyesno('MAIN_MAIL_EMAIL_STARTTLS_TICKET', (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS_TICKET) ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS_TICKET : 0), 1);
+		} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+	} else print yn(0).' ('.$langs->trans("NotSupported").')';
+	print '</td></tr>';
+
+    print '</table>';
+
+    dol_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 '</form>';
+} else {
+    dol_fiche_head($head, 'common_ticket', '', -1);
+
+    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>';
+
+	// Method
+	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
+	$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE_TICKET];
+	if (empty($text)) $text = $langs->trans("Undefined").img_warning();
+	print $text;
+	print '</td></tr>';
+
+	if (!empty($conf->global->MAIN_MAIL_SENDMODE_TICKET) && $conf->global->MAIN_MAIL_SENDMODE_TICKET != 'default')
+	{
+		// Host server
+		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && $conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail'))
+		{
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
+		} else {
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER_TICKET) ? $conf->global->MAIN_MAIL_SMTP_SERVER_TICKET : '').'</td></tr>';
+		}
+
+		// Port
+		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && $conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail'))
+		{
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td>'.$langs->trans("SeeLocalSendMailSetup").'</td></tr>';
+		} else {
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT_TICKET) ? $conf->global->MAIN_MAIL_SMTP_PORT_TICKET : '').'</td></tr>';
+		}
+
+		// SMTPS ID
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))
+		{
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID_TICKET.'</td></tr>';
+		}
+
+		// SMTPS PW
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))
+		{
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW_TICKET).'</td></tr>';
+		}
+
+		// TLS
+		print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))
+		{
+			if (function_exists('openssl_open'))
+			{
+				print yn($conf->global->MAIN_MAIL_EMAIL_TLS_TICKET);
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
+		print '</td></tr>';
+
+		// STARTTLS
+		print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))
+		{
+			if (function_exists('openssl_open'))
+			{
+				print yn($conf->global->MAIN_MAIL_EMAIL_STARTTLS_TICKET);
+			} else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
+		} else print yn(0).' ('.$langs->trans("NotSupported").')';
+		print '</td></tr>';
+	}
+
+	print '</table>';
+
+	dol_fiche_end();
+
+
+    if ($conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+    {
+        print '<br>';
+        /*
+	    // Warning 1
+    	if ($linuxlike)
+    	{
+    		$sendmailoption=ini_get('mail.force_extra_parameters');
+    		if (empty($sendmailoption) || ! preg_match('/ba/',$sendmailoption))
+    		{
+    			print info_admin($langs->trans("SendmailOptionNotComplete"));
+    		}
+    	}*/
+    	// Warning 2
+   	    print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
+    }
+
+
+    // Buttons for actions
+
+	print '<div class="tabsAction">';
+
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+
+	if (!empty($conf->global->MAIN_MAIL_SENDMODE_TICKET) && $conf->global->MAIN_MAIL_SENDMODE_TICKET != 'default')
+	{
+		if ($conf->global->MAIN_MAIL_SENDMODE_TICKET != 'mail' || !$linuxlike)
+		{
+			if (function_exists('fsockopen') && $port && $server)
+			{
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testconnect">'.$langs->trans("DoTestServerAvailability").'</a>';
+			}
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("FeatureNotAvailableOnLinux").'">'.$langs->trans("DoTestServerAvailability").'</a>';
+		}
+
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test&amp;mode=init">'.$langs->trans("DoTestSend").'</a>';
+
+		if (!empty($conf->fckeditor->enabled))
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=testhtml&amp;mode=init">'.$langs->trans("DoTestSendHTML").'</a>';
+		}
+	}
+
+	print '</div>';
+
+
+	if ($conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail' && !in_array($action, array('testconnect', 'test', 'testhtml')))
+	{
+        $text = $langs->trans("WarningPHPMail");
+	    print info_admin($text);
+	}
+
+	// Run the test to connect
+	if ($action == 'testconnect')
+	{
+		print load_fiche_titre($langs->trans("DoTestServerAvailability"));
+
+		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mail = new CMailFile('', '', '', '', array(), array(), array(), '', '', 0, '', '', '', '', $trackid, $sendcontext);
+
+		$result = $mail->check_server_port($server, $port);
+		if ($result) print '<div class="ok">'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'</div>';
+		else {
+			$errormsg = $langs->trans("ServerNotAvailableOnIPOrPort", $server, $port);
+
+			if ($mail->error) {
+				$errormsg .= ' - '.$mail->error;
+			}
+
+			setEventMessages($errormsg, null, 'errors');
+		}
+		print '<br>';
+	}
+
+	// Show email send test form
+	if ($action == 'test' || $action == 'testhtml')
+	{
+	    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+		print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend"));
+
+		dol_fiche_head('');
+
+		// Cree l'objet formulaire mail
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
+		$formmail->withfromreadonly = 0;
+		$formmail->withsubstit = 0;
+		$formmail->withfrom = 1;
+		$formmail->witherrorsto = 1;
+		$formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1));
+		$formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty
+		$formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty
+		$formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test"));
+		$formmail->withtopicreadonly = 0;
+		$formmail->withfile = 2;
+		$formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
+		$formmail->withbodyreadonly = 0;
+		$formmail->withcancel = 1;
+		$formmail->withdeliveryreceipt = 1;
+		$formmail->withfckeditor = ($action == 'testhtml' ? 1 : 0);
+		$formmail->ckeditortoolbar = 'dolibarr_mailings';
+		// Tableau des substitutions
+		$formmail->substit = $substitutionarrayfortest;
+		// Tableau des parametres complementaires du post
+		$formmail->param["action"] = "send";
+		$formmail->param["models"] = "body";
+		$formmail->param["mailid"] = 0;
+		$formmail->param["returnurl"] = $_SERVER["PHP_SELF"];
+
+		// Init list of files
+        if (GETPOST("mode") == 'init')
+		{
+			$formmail->clear_attached_files();
+		}
+
+		print $formmail->get_form('addfile', 'removefile');
+
+		dol_fiche_end();
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 7e734a5b093..ff15bbdcd40 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -96,9 +96,7 @@ if ($action == 'update' && !$cancel)
 				if ($result > 0)
 				{
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					$error++;
 					setEventMessages($langs->trans("FailedToInitializeMenu").' '.$key, null, 'errors');
 					$db->rollback();
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index ef58c1042d4..31e0f896633 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -31,7 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("other", "admin"));
 
-$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$cancel = GETPOST('cancel', 'alphanohtml'); // We click on a Cancel button
+$confirm = GETPOST('confirm');
 
 if (!$user->admin) accessforbidden();
 
@@ -40,8 +41,8 @@ $dirsmartphone = array();
 $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
 foreach ($dirmenus as $dirmenu)
 {
-    $dirstandard[] = $dirmenu.'standard';
-    $dirsmartphone[] = $dirmenu.'smartphone';
+	$dirstandard[] = $dirmenu.'standard';
+	$dirsmartphone[] = $dirmenu.'smartphone';
 }
 
 $action = GETPOST('action', 'aZ09');
@@ -66,208 +67,193 @@ if (GETPOST("menu_handler"))    $menu_handler = GETPOST("menu_handler");
 
 if ($action == 'update')
 {
-    if (!$cancel)
-    {
-        $leftmenu = ''; $mainmenu = '';
-        if (GETPOST('menuIdParent', 'alpha') && !is_numeric(GETPOST('menuIdParent', 'alpha')))
-        {
-        	$tmp = explode('&', GETPOST('menuIdParent', 'alpha'));
-            foreach ($tmp as $s)
-            {
-                if (preg_match('/fk_mainmenu=/', $s))
-                {
-                    $mainmenu = preg_replace('/fk_mainmenu=/', '', $s);
-                }
-                if (preg_match('/fk_leftmenu=/', $s))
-                {
-                    $leftmenu = preg_replace('/fk_leftmenu=/', '', $s);
-                }
-            }
-        }
+	if (!$cancel)
+	{
+		$leftmenu = ''; $mainmenu = '';
+		if (GETPOST('menuIdParent', 'alphanohtml') && !is_numeric(GETPOST('menuIdParent', 'alphanohtml')))
+		{
+			$tmp = explode('&', GETPOST('menuIdParent', 'alphanohtml'));
+			foreach ($tmp as $s)
+			{
+				if (preg_match('/fk_mainmenu=/', $s))
+				{
+					$mainmenu = preg_replace('/fk_mainmenu=/', '', $s);
+				}
+				if (preg_match('/fk_leftmenu=/', $s))
+				{
+					$leftmenu = preg_replace('/fk_leftmenu=/', '', $s);
+				}
+			}
+		}
 
-        $menu = new Menubase($db);
-        $result = $menu->fetch(GETPOST('menuId', 'int'));
-        if ($result > 0)
-        {
-            $menu->titre = GETPOST('titre', 'alpha'); // deprecated
-            $menu->title = GETPOST('titre', 'alpha');
-            $menu->leftmenu = GETPOST('leftmenu', 'aZ09');
-            $menu->url = GETPOST('url', 'alpha');
-            $menu->langs = GETPOST('langs', 'alpha');
-            $menu->position = GETPOST('position', 'int');
-            $menu->enabled = GETPOST('enabled', 'alpha');
-            $menu->perms = GETPOST('perms', 'alpha');
-            $menu->target = GETPOST('target', 'alpha');
-            $menu->user = GETPOST('user', 'alpha');
-            $menu->mainmenu = GETPOST('propertymainmenu', 'alpha');
-            if (is_numeric(GETPOST('menuIdParent', 'alpha')))
-            {
-            	$menu->fk_menu = GETPOST('menuIdParent', 'alpha');
-            }
-            else
-            {
-    	       	if (GETPOST('type', 'alpha') == 'top') $menu->fk_menu = 0;
-    	       	else $menu->fk_menu = -1;
-            	$menu->fk_mainmenu = $mainmenu;
-            	$menu->fk_leftmenu = $leftmenu;
-            }
+		$menu = new Menubase($db);
+		$result = $menu->fetch(GETPOST('menuId', 'int'));
+		if ($result > 0)
+		{
+			$menu->title = GETPOST('titre', 'alphanohtml');
+			$menu->leftmenu = GETPOST('leftmenu', 'aZ09');
+			$menu->url = GETPOST('url', 'alphanohtml');
+			$menu->langs = GETPOST('langs', 'alphanohtml');
+			$menu->position = GETPOST('position', 'int');
+			$menu->enabled = GETPOST('enabled', 'alphanohtml');
+			$menu->perms = GETPOST('perms', 'alphanohtml');
+			$menu->target = GETPOST('target', 'alphanohtml');
+			$menu->user = GETPOST('user', 'alphanohtml');
+			$menu->mainmenu = GETPOST('propertymainmenu', 'alphanohtml');
+			if (is_numeric(GETPOST('menuIdParent', 'alphanohtml')))
+			{
+				$menu->fk_menu = GETPOST('menuIdParent', 'alphanohtml');
+			} else {
+			   	if (GETPOST('type', 'alphanohtml') == 'top') $menu->fk_menu = 0;
+			   	else $menu->fk_menu = -1;
+				$menu->fk_mainmenu = $mainmenu;
+				$menu->fk_leftmenu = $leftmenu;
+			}
 
-            $result = $menu->update($user);
-            if ($result > 0)
-            {
-	            setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-            }
-            else
-            {
-	            setEventMessages($menu->error, $menu->errors, 'errors');
-            }
-        }
-        else
-        {
-	        setEventMessages($menu->error, $menu->errors, 'errors');
-        }
-        $action = "edit";
+			$result = $menu->update($user);
+			if ($result > 0)
+			{
+				setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+			} else {
+				setEventMessages($menu->error, $menu->errors, 'errors');
+			}
+		} else {
+			setEventMessages($menu->error, $menu->errors, 'errors');
+		}
+		$action = "edit";
 
-        header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
-        exit;
-    }
-    else
-    {
-        header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
-        exit;
-    }
+		header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
+		exit;
+	} else {
+		header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
+		exit;
+	}
 }
 
 if ($action == 'add')
 {
-    if ($cancel)
-    {
-        header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
-        exit;
-    }
+	if ($cancel)
+	{
+		header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".$menu_handler);
+		exit;
+	}
 
-    $leftmenu = ''; $mainmenu = '';
-    if (GETPOST('menuId', 'alpha', 3) && !is_numeric(GETPOST('menuId', 'alpha', 3)))
-    {
-	    $tmp = explode('&', GETPOST('menuId', 'alpha', 3));
-	    foreach ($tmp as $s)
-	    {
-	    	if (preg_match('/fk_mainmenu=/', $s))
-	    	{
+	$leftmenu = ''; $mainmenu = '';
+	if (GETPOST('menuId', 'alphanohtml', 3) && !is_numeric(GETPOST('menuId', 'alphanohtml', 3)))
+	{
+		$tmp = explode('&', GETPOST('menuId', 'alphanohtml', 3));
+		foreach ($tmp as $s)
+		{
+			if (preg_match('/fk_mainmenu=/', $s))
+			{
 				$mainmenu = preg_replace('/fk_mainmenu=/', '', $s);
-	    	}
-	    	if (preg_match('/fk_leftmenu=/', $s))
-	    	{
-	    		$leftmenu = preg_replace('/fk_leftmenu=/', '', $s);
-	    	}
-	    }
-    }
+			}
+			if (preg_match('/fk_leftmenu=/', $s))
+			{
+				$leftmenu = preg_replace('/fk_leftmenu=/', '', $s);
+			}
+		}
+	}
 
-    $langs->load("errors");
+	$langs->load("errors");
 
-    $error = 0;
-    if (!$error && !$_POST['menu_handler'])
-    {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("MenuHandler")), null, 'errors');
-        $action = 'create';
-        $error++;
-    }
-    if (!$error && !$_POST['type'])
-    {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
-        $action = 'create';
-        $error++;
-    }
-    if (!$error && !$_POST['url'])
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
-        $action = 'create';
-        $error++;
-    }
-    if (!$error && !$_POST['titre'])
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
-        $action = 'create';
-        $error++;
-    }
-    if (!$error && $_POST['menuId'] && $_POST['type'] == 'top')
-    {
-	    setEventMessages($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), null, 'errors');
-        $action = 'create';
-        $error++;
-    }
-    if (!$error && !$_POST['menuId'] && $_POST['type'] == 'left')
-    {
-	    setEventMessages($langs->trans("ErrorLeftMenuMustHaveAParentId"), null, 'errors');
-        $action = 'create';
-        $error++;
-    }
+	$error = 0;
+	if (!$error && !$_POST['menu_handler'])
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("MenuHandler")), null, 'errors');
+		$action = 'create';
+		$error++;
+	}
+	if (!$error && !$_POST['type'])
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
+		$action = 'create';
+		$error++;
+	}
+	if (!$error && !$_POST['url'])
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
+		$action = 'create';
+		$error++;
+	}
+	if (!$error && !$_POST['titre'])
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
+		$action = 'create';
+		$error++;
+	}
+	if (!$error && $_POST['menuId'] && $_POST['type'] == 'top')
+	{
+		setEventMessages($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), null, 'errors');
+		$action = 'create';
+		$error++;
+	}
+	if (!$error && !$_POST['menuId'] && $_POST['type'] == 'left')
+	{
+		setEventMessages($langs->trans("ErrorLeftMenuMustHaveAParentId"), null, 'errors');
+		$action = 'create';
+		$error++;
+	}
 
-    if (!$error)
-    {
-        $menu = new Menubase($db);
-        $menu->menu_handler = preg_replace('/_menu$/', '', GETPOST('menu_handler', 'aZ09'));
-        $menu->type = GETPOST('type', 'alpha');
-        $menu->titre = GETPOST('titre', 'alpha'); // deprecated
-        $menu->title = GETPOST('titre', 'alpha');
-        $menu->url = GETPOST('url', 'alpha');
-        $menu->langs = GETPOST('langs', 'alpha');
-        $menu->position = GETPOST('position', 'int');
-        $menu->enabled = GETPOST('enabled', 'alpha');
-        $menu->perms = GETPOST('perms', 'alpha');
-        $menu->target = GETPOST('target', 'alpha');
-        $menu->user = GETPOST('user', 'alpha');
-        $menu->mainmenu = GETPOST('propertymainmenu', 'alpha');
-        if (is_numeric(GETPOST('menuId', 'alpha', 3)))
-        {
-        	$menu->fk_menu = GETPOST('menuId', 'alpha', 3);
-        }
-        else
-        {
-            if (GETPOST('type', 'alpha') == 'top') $menu->fk_menu = 0;
-            else $menu->fk_menu = -1;
-            $menu->fk_mainmenu = $mainmenu;
-            $menu->fk_leftmenu = $leftmenu;
-        }
+	if (!$error)
+	{
+		$menu = new Menubase($db);
+		$menu->menu_handler = preg_replace('/_menu$/', '', GETPOST('menu_handler', 'aZ09'));
+		$menu->type = GETPOST('type', 'alphanohtml');
+		$menu->title = GETPOST('titre', 'alphanohtml');
+		$menu->url = GETPOST('url', 'alphanohtml');
+		$menu->langs = GETPOST('langs', 'alphanohtml');
+		$menu->position = GETPOST('position', 'int');
+		$menu->enabled = GETPOST('enabled', 'alphanohtml');
+		$menu->perms = GETPOST('perms', 'alphanohtml');
+		$menu->target = GETPOST('target', 'alphanohtml');
+		$menu->user = GETPOST('user', 'alphanohtml');
+		$menu->mainmenu = GETPOST('propertymainmenu', 'alphanohtml');
+		if (is_numeric(GETPOST('menuId', 'alphanohtml', 3)))
+		{
+			$menu->fk_menu = GETPOST('menuId', 'alphanohtml', 3);
+		} else {
+			if (GETPOST('type', 'alphanohtml') == 'top') $menu->fk_menu = 0;
+			else $menu->fk_menu = -1;
+			$menu->fk_mainmenu = $mainmenu;
+			$menu->fk_leftmenu = $leftmenu;
+		}
 
-        $result = $menu->create($user);
-        if ($result > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".GETPOST('menu_handler', 'aZ09'));
-            exit;
-        }
-        else
-        {
-            $action = 'create';
-	        setEventMessages($menu->error, $menu->errors, 'errors');
-        }
-    }
+		$result = $menu->create($user);
+		if ($result > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/admin/menus/index.php?menu_handler=".GETPOST('menu_handler', 'aZ09'));
+			exit;
+		} else {
+			$action = 'create';
+			setEventMessages($menu->error, $menu->errors, 'errors');
+		}
+	}
 }
 
 // delete
-if ($action == 'confirm_delete' && $_POST["confirm"] == 'yes')
+if ($action == 'confirm_delete' && $confirm == 'yes')
 {
-    $this->db->begin();
+	$db->begin();
 
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".GETPOST('menuId', 'int');
-    $result = $db->query($sql);
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".GETPOST('menuId', 'int');
+	$result = $db->query($sql);
 
-    if ($result == 0)
-    {
-        $this->db->commit();
+	if ($result == 0)
+	{
+		$db->commit();
 
-        llxHeader();
-	    setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs');
-        llxFooter();
-        exit;
-    }
-    else
-    {
-        $this->db->rollback();
+		llxHeader();
+		setEventMessages($langs->trans("MenuDeleted"), null, 'mesgs');
+		llxFooter();
+		exit;
+	} else {
+		$db->rollback();
 
-        $reload = 0;
-        $_GET["action"] = '';
-    }
+		$reload = 0;
+		$_GET["action"] = '';
+		$action = '';
+	}
 }
 
 
@@ -284,7 +270,7 @@ llxHeader('', $langs->trans("Menu"));
 
 if ($action == 'create')
 {
-    print '<script type="text/javascript" language="javascript">
+	print '<script type="text/javascript" language="javascript">
     jQuery(document).ready(function() {
     	function init_topleft()
     	{
@@ -308,236 +294,231 @@ if ($action == 'create')
     });
     </script>';
 
-    print load_fiche_titre($langs->trans("NewMenu"), '', 'title_setup');
+	print load_fiche_titre($langs->trans("NewMenu"), '', 'title_setup');
 
-    print '<form action="./edit.php?action=add&menuId='.GETPOST('menuId', 'int').'" method="post" name="formmenucreate">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<form action="./edit.php?action=add&menuId='.GETPOST('menuId', 'int').'" method="post" name="formmenucreate">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-    dol_fiche_head();
+	dol_fiche_head();
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    // Id
-    $parent_rowid = GETPOST('menuId', 'int');
-    if (GETPOST('menuId', 'int'))
-    {
-        $sql = "SELECT m.rowid, m.mainmenu, m.leftmenu, m.level, m.langs FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".GETPOST('menuId', 'int');
-        $res = $db->query($sql);
-        if ($res)
-        {
-            while ($menu = $db->fetch_array($res))
-            {
-                $parent_rowid = $menu['rowid'];
-                $parent_mainmenu = $menu['mainmenu'];
-                $parent_leftmenu = $menu['leftmenu'];
-                $parent_langs = $menu['langs'];
-                $parent_level = $menu['level'];
-            }
-        }
-    }
+	// Id
+	$parent_rowid = GETPOST('menuId', 'int');
+	if (GETPOST('menuId', 'int'))
+	{
+		$sql = "SELECT m.rowid, m.mainmenu, m.leftmenu, m.level, m.langs FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".GETPOST('menuId', 'int');
+		$res = $db->query($sql);
+		if ($res)
+		{
+			while ($menu = $db->fetch_array($res))
+			{
+				$parent_rowid = $menu['rowid'];
+				$parent_mainmenu = $menu['mainmenu'];
+				$parent_leftmenu = $menu['leftmenu'];
+				$parent_langs = $menu['langs'];
+				$parent_level = $menu['level'];
+			}
+		}
+	}
 
-    // Handler
-    print '<tr><td class="fieldrequired">'.$langs->trans('MenuHandler').'</td>';
-    print '<td>';
-    $formadmin->select_menu_families($menu_handler.(preg_match('/_menu/', $menu_handler) ? '' : '_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone));
-    print '</td>';
-    print '<td>'.$langs->trans('DetailMenuHandler').'</td></tr>';
+	// Handler
+	print '<tr><td class="fieldrequired">'.$langs->trans('MenuHandler').'</td>';
+	print '<td>';
+	$formadmin->select_menu_families($menu_handler.(preg_match('/_menu/', $menu_handler) ? '' : '_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone));
+	print '</td>';
+	print '<td>'.$langs->trans('DetailMenuHandler').'</td></tr>';
 
-    // User
-    print '<tr><td class="nowrap fieldrequired">'.$langs->trans('MenuForUsers').'</td>';
-    print '<td><select class="flat" name="user">';
-    print '<option value="2" selected>'.$langs->trans("AllMenus").'</option>';
-    print '<option value="0">'.$langs->trans('Internal').'</option>';
-    print '<option value="1">'.$langs->trans('External').'</option>';
-    print '</select></td>';
-    print '<td>'.$langs->trans('DetailUser').'</td></tr>';
+	// User
+	print '<tr><td class="nowrap fieldrequired">'.$langs->trans('MenuForUsers').'</td>';
+	print '<td><select class="flat" name="user">';
+	print '<option value="2" selected>'.$langs->trans("AllMenus").'</option>';
+	print '<option value="0">'.$langs->trans('Internal').'</option>';
+	print '<option value="1">'.$langs->trans('External').'</option>';
+	print '</select></td>';
+	print '<td>'.$langs->trans('DetailUser').'</td></tr>';
 
-    // Type
-    print '<tr><td class="fieldrequired">'.$langs->trans('Type').'</td><td>';
-    if ($parent_rowid)
-    {
-        print $langs->trans('Left');
-        print '<input type="hidden" name="type" value="left">';
-    }
-    else
-    {
-        print '<select name="type" class="flat" id="topleft">';
-        print '<option value="">&nbsp;</option>';
-        print '<option value="top"'.($_POST["type"] && $_POST["type"] == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
-        print '<option value="left"'.($_POST["type"] && $_POST["type"] == 'left' ? ' selected' : '').'>'.$langs->trans('Left').'</option>';
-        print '</select>';
-    }
-    print '</td><td>'.$langs->trans('DetailType').'</td></tr>';
+	// Type
+	print '<tr><td class="fieldrequired">'.$langs->trans('Type').'</td><td>';
+	if ($parent_rowid)
+	{
+		print $langs->trans('Left');
+		print '<input type="hidden" name="type" value="left">';
+	} else {
+		print '<select name="type" class="flat" id="topleft">';
+		print '<option value="">&nbsp;</option>';
+		print '<option value="top"'.($_POST["type"] && $_POST["type"] == 'top' ? ' selected' : '').'>'.$langs->trans('Top').'</option>';
+		print '<option value="left"'.($_POST["type"] && $_POST["type"] == 'left' ? ' selected' : '').'>'.$langs->trans('Left').'</option>';
+		print '</select>';
+	}
+	print '</td><td>'.$langs->trans('DetailType').'</td></tr>';
 
-    // Mainmenu code
-    print '<tr><td class="fieldrequired">'.$langs->trans('MainMenuCode').'</td>';
-   	print '<td><input type="text" class="minwidth300" id="propertymainmenu" name="propertymainmenu" value="'.(GETPOST("propertymainmenu", 'alpha') ?GETPOST("propertymainmenu", 'alpha') : '').'"></td>';
-    print '<td>';
-    print $langs->trans("Example").': mytopmenukey';
-    print '</td></tr>';
+	// Mainmenu code
+	print '<tr><td class="fieldrequired">'.$langs->trans('MainMenuCode').'</td>';
+   	print '<td><input type="text" class="minwidth300" id="propertymainmenu" name="propertymainmenu" value="'.(GETPOSTISSET("propertymainmenu") ? GETPOST("propertymainmenu", 'alphanohtml') : '').'"></td>';
+	print '<td>';
+	print $langs->trans("Example").': mytopmenukey';
+	print '</td></tr>';
 
-    // MenuId Parent
-    print '<tr><td class="fieldrequired">'.$langs->trans('MenuIdParent').'</td>';
-    if ($parent_rowid)
-    {
-        print '<td>'.$parent_rowid.'<input type="hidden" name="menuId" value="'.$parent_rowid.'"></td>';
-    }
-    else
-    {
-        print '<td><input type="text" class="minwidth300" id="menuId" name="menuId" value="'.(GETPOST("menuId", 'int') ?GETPOST("menuId", 'int') : '').'"></td>';
-    }
-    print '<td>'.$langs->trans('DetailMenuIdParent');
-    print ', '.$langs->trans("Example").': fk_mainmenu=abc&fk_leftmenu=def';
-    print '</td></tr>';
+	// MenuId Parent
+	print '<tr><td class="fieldrequired">'.$langs->trans('MenuIdParent').'</td>';
+	if ($parent_rowid)
+	{
+		print '<td>'.$parent_rowid.'<input type="hidden" name="menuId" value="'.$parent_rowid.'"></td>';
+	} else {
+		print '<td><input type="text" class="minwidth300" id="menuId" name="menuId" value="'.(GETPOSTISSET("menuId") ? GETPOST("menuId", 'int') : '').'"></td>';
+	}
+	print '<td>'.$langs->trans('DetailMenuIdParent');
+	print ', '.$langs->trans("Example").': fk_mainmenu=abc&fk_leftmenu=def';
+	print '</td></tr>';
 
-    // Title
-    print '<tr><td class="fieldrequired">'.$langs->trans('Title').'</td><td><input type="text" class="minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", 'alpha')).'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
+	// Title
+	print '<tr><td class="fieldrequired">'.$langs->trans('Title').'</td><td><input type="text" class="minwidth300" name="titre" value="'.dol_escape_htmltag(GETPOST("titre", 'alphanohtml')).'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
 
-    // URL
-    print '<tr><td class="fieldrequired">'.$langs->trans('URL').'</td><td><input type="text" class="minwidth500" name="url" value="'.GETPOST("url", 'alpha').'"></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
+	// URL
+	print '<tr><td class="fieldrequired">'.$langs->trans('URL').'</td><td><input type="text" class="minwidth500" name="url" value="'.GETPOST("url", 'alphanohtml').'"></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
 
-    // Langs
-    print '<tr><td>'.$langs->trans('LangFile').'</td><td><input type="text" class="minwidth300" name="langs" value="'.$parent_langs.'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>';
+	// Langs
+	print '<tr><td>'.$langs->trans('LangFile').'</td><td><input type="text" class="minwidth300" name="langs" value="'.$parent_langs.'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>';
 
-    // Position
-    print '<tr><td>'.$langs->trans('Position').'</td><td><input type="text" class="width100" name="position" value="'.dol_escape_htmltag(isset($_POST["position"]) ? $_POST["position"] : 100).'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
+	// Position
+	print '<tr><td>'.$langs->trans('Position').'</td><td><input type="text" class="width100" name="position" value="'.dol_escape_htmltag(GETPOSTISSET("position") ? GETPOST("position", 'int') : 100).'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
 
-    // Target
-    print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
-    print '<option value=""'.($menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
-    print '<option value="_blank"'.($menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
-    print '</select></td></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
+	// Target
+	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
+	print '<option value=""'.($menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
+	print '<option value="_blank"'.($menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
+	print '</select></td></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
 
-    // Enabled
-    print '<tr><td>'.$langs->trans('Enabled').'</td><td><input type="text" class="minwidth500" name="enabled" value="'.(GETPOSTISSET('enabled') ?GETPOST("enabled", 'alpha') : '1').'"></td><td>'.$langs->trans('DetailEnabled').'</td></tr>';
+	// Enabled
+	print '<tr><td>'.$langs->trans('Enabled').'</td><td><input type="text" class="minwidth500" name="enabled" value="'.(GETPOSTISSET('enabled') ? GETPOST("enabled", 'alphanohtml') : '1').'"></td><td>'.$langs->trans('DetailEnabled').'</td></tr>';
 
-    // Perms
-    print '<tr><td>'.$langs->trans('Rights').'</td><td><input type="text" class="minwidth500" name="perms" value="'.(GETPOSTISSET('perms') ?GETPOST('perms', 'alpha') : '1').'"></td><td>'.$langs->trans('DetailRight').'</td></tr>';
+	// Perms
+	print '<tr><td>'.$langs->trans('Rights').'</td><td><input type="text" class="minwidth500" name="perms" value="'.(GETPOSTISSET('perms') ? GETPOST('perms', 'alphanohtml') : '1').'"></td><td>'.$langs->trans('DetailRight').'</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    print '<div class="center">';
+	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 '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
-}
-elseif ($action == 'edit')
+	print '</form>';
+} elseif ($action == 'edit')
 {
-    print load_fiche_titre($langs->trans("ModifMenu"), '', 'title_setup');
-    print '<br>';
+	print load_fiche_titre($langs->trans("ModifMenu"), '', 'title_setup');
+	print '<br>';
 
-    print '<form action="./edit.php?action=update" method="POST" name="formmenuedit">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="handler_origine" value="'.$menu_handler.'">';
-    print '<input type="hidden" name="menuId" value="'.GETPOST('menuId', 'int').'">';
+	print '<form action="./edit.php?action=update" method="POST" name="formmenuedit">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="handler_origine" value="'.$menu_handler.'">';
+	print '<input type="hidden" name="menuId" value="'.GETPOST('menuId', 'int').'">';
 
-    dol_fiche_head();
+	dol_fiche_head();
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    $menu = new Menubase($db);
-    $result = $menu->fetch(GETPOST('menuId', 'int'));
-    //var_dump($menu);
+	$menu = new Menubase($db);
+	$result = $menu->fetch(GETPOST('menuId', 'int'));
+	//var_dump($menu);
 
-    // Id
-    print '<tr><td>'.$langs->trans('Id').'</td><td>'.$menu->id.'</td><td>'.$langs->trans('DetailId').'</td></tr>';
+	// Id
+	print '<tr><td>'.$langs->trans('Id').'</td><td>'.$menu->id.'</td><td>'.$langs->trans('DetailId').'</td></tr>';
 
-    // Module
-    print '<tr><td>'.$langs->trans('MenuModule').'</td><td>'.$menu->module.'</td><td>'.$langs->trans('DetailMenuModule').'</td></tr>';
+	// Module
+	print '<tr><td>'.$langs->trans('MenuModule').'</td><td>'.$menu->module.'</td><td>'.$langs->trans('DetailMenuModule').'</td></tr>';
 
-    // Handler
-    if ($menu->menu_handler == 'all') $handler = $langs->trans('AllMenus');
-    else $handler = $menu->menu_handler;
-    print '<tr><td class="fieldrequired">'.$langs->trans('MenuHandler').'</td><td>'.$handler.'</td><td>'.$langs->trans('DetailMenuHandler').'</td></tr>';
+	// Handler
+	if ($menu->menu_handler == 'all') $handler = $langs->trans('AllMenus');
+	else $handler = $menu->menu_handler;
+	print '<tr><td class="fieldrequired">'.$langs->trans('MenuHandler').'</td><td>'.$handler.'</td><td>'.$langs->trans('DetailMenuHandler').'</td></tr>';
 
-    // User
-    print '<tr><td class="nowrap fieldrequired">'.$langs->trans('MenuForUsers').'</td><td><select class="flat" name="user">';
-    print '<option value="2"'.($menu->user == 2 ? ' selected' : '').'>'.$langs->trans("AllMenus").'</option>';
-    print '<option value="0"'.($menu->user == 0 ? ' selected' : '').'>'.$langs->trans('Internal').'</option>';
-    print '<option value="1"'.($menu->user == 1 ? ' selected' : '').'>'.$langs->trans('External').'</option>';
-    print '</select></td><td>'.$langs->trans('DetailUser').'</td></tr>';
+	// User
+	print '<tr><td class="nowrap fieldrequired">'.$langs->trans('MenuForUsers').'</td><td><select class="flat" name="user">';
+	print '<option value="2"'.($menu->user == 2 ? ' selected' : '').'>'.$langs->trans("AllMenus").'</option>';
+	print '<option value="0"'.($menu->user == 0 ? ' selected' : '').'>'.$langs->trans('Internal').'</option>';
+	print '<option value="1"'.($menu->user == 1 ? ' selected' : '').'>'.$langs->trans('External').'</option>';
+	print '</select></td><td>'.$langs->trans('DetailUser').'</td></tr>';
 
-    // Type
-    print '<tr><td class="fieldrequired">'.$langs->trans('Type').'</td><td>'.$langs->trans(ucfirst($menu->type)).'</td><td>'.$langs->trans('DetailType').'</td></tr>';
+	// Type
+	print '<tr><td class="fieldrequired">'.$langs->trans('Type').'</td><td>'.$langs->trans(ucfirst($menu->type)).'</td><td>'.$langs->trans('DetailType').'</td></tr>';
 
-    // Mainmenu code
-    if ($menu->type == 'top')
-    {
-	    print '<tr><td class="fieldrequired">'.$langs->trans('MainMenuCode').'</td>';
-	    /*if ($parent_rowid)
+	// Mainmenu code
+	if ($menu->type == 'top')
+	{
+		print '<tr><td class="fieldrequired">'.$langs->trans('MainMenuCode').'</td>';
+		/*if ($parent_rowid)
 	     {
 	     print '<td>'.$parent_rowid.'<input type="hidden" name="propertyleftmenu" value="'.$parent_rowid.'"></td>';
 	     }
 	     else
 	     {*/
-	    print '<td><input type="text" class="minwidth300" id="propertymainmenu" name="propertymainmenu" value="'.(GETPOST("propertymainmenu", 'alpha') ?GETPOST("propertymainmenu", 'alpha') : $menu->mainmenu).'"></td>';
-	    //}
-	    print '<td>';
-	    print $langs->trans("Example").': mytopmenukey';
-	    print '</td></tr>';
-    }
+		print '<td><input type="text" class="minwidth300" id="propertymainmenu" name="propertymainmenu" value="'.(GETPOST("propertymainmenu", 'alphanohtml') ?GETPOST("propertymainmenu", 'alphanohtml') : $menu->mainmenu).'"></td>';
+		//}
+		print '<td>';
+		print $langs->trans("Example").': mytopmenukey';
+		print '</td></tr>';
+	}
 
-    // MenuId Parent
-    print '<tr><td class="fieldrequired">'.$langs->trans('MenuIdParent');
-    print '</td>';
-    $valtouse = $menu->fk_menu;
-    if ($menu->fk_mainmenu) $valtouse = 'fk_mainmenu='.$menu->fk_mainmenu;
-    if ($menu->fk_leftmenu) $valtouse .= '&fk_leftmenu='.$menu->fk_leftmenu;
-    print '<td><input type="text" name="menuIdParent" value="'.$valtouse.'" class="minwidth300"></td>';
-    print '<td>'.$langs->trans('DetailMenuIdParent');
-    print ', '.$langs->trans("Example").': fk_mainmenu=abc&fk_leftmenu=def';
-    print '</td></tr>';
+	// MenuId Parent
+	print '<tr><td class="fieldrequired">'.$langs->trans('MenuIdParent');
+	print '</td>';
+	$valtouse = $menu->fk_menu;
+	if ($menu->fk_mainmenu) $valtouse = 'fk_mainmenu='.$menu->fk_mainmenu;
+	if ($menu->fk_leftmenu) $valtouse .= '&fk_leftmenu='.$menu->fk_leftmenu;
+	print '<td><input type="text" name="menuIdParent" value="'.$valtouse.'" class="minwidth300"></td>';
+	print '<td>'.$langs->trans('DetailMenuIdParent');
+	print ', '.$langs->trans("Example").': fk_mainmenu=abc&fk_leftmenu=def';
+	print '</td></tr>';
 
-    // Niveau
-    //print '<tr><td>'.$langs->trans('Level').'</td><td>'.$menu->level.'</td><td>'.$langs->trans('DetailLevel').'</td></tr>';
+	// Niveau
+	//print '<tr><td>'.$langs->trans('Level').'</td><td>'.$menu->level.'</td><td>'.$langs->trans('DetailLevel').'</td></tr>';
 
-    // Title
-    print '<tr><td class="fieldrequired">'.$langs->trans('Title').'</td><td><input type="text" class="minwidth300" name="titre" value="'.dol_escape_htmltag($menu->titre ? $menu->titre : $menu->title).'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
+	// Title
+	print '<tr><td class="fieldrequired">'.$langs->trans('Title').'</td><td><input type="text" class="minwidth300" name="titre" value="'.dol_escape_htmltag($menu->title).'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
 
-    // Url
-    print '<tr><td class="fieldrequired">'.$langs->trans('URL').'</td><td><input type="text" class="quatrevingtpercent" name="url" value="'.$menu->url.'"></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
+	// Url
+	print '<tr><td class="fieldrequired">'.$langs->trans('URL').'</td><td><input type="text" class="quatrevingtpercent" name="url" value="'.$menu->url.'"></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
 
-    // Langs
-    print '<tr><td>'.$langs->trans('LangFile').'</td><td><input type="text" class="minwidth300" name="langs" value="'.dol_escape_htmltag($menu->langs).'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>';
+	// Langs
+	print '<tr><td>'.$langs->trans('LangFile').'</td><td><input type="text" class="minwidth300" name="langs" value="'.dol_escape_htmltag($menu->langs).'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>';
 
-    // Position
-    print '<tr><td>'.$langs->trans('Position').'</td><td><input type="text" class="minwidth100" name="position" value="'.$menu->position.'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
+	// Position
+	print '<tr><td>'.$langs->trans('Position').'</td><td><input type="text" class="minwidth100" name="position" value="'.$menu->position.'"></td><td>'.$langs->trans('DetailPosition').'</td></tr>';
 
-    // Target
-    print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
-    print '<option value=""'.($menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
-    print '<option value="_blank"'.($menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
-    print '</select></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
+	// Target
+	print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
+	print '<option value=""'.($menu->target == "" ? ' selected' : '').'>&nbsp;</option>';
+	print '<option value="_blank"'.($menu->target == "_blank" ? ' selected' : '').'>'.$langs->trans('_blank').'</option>';
+	print '</select></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
 
-    // Enabled
-    print '<tr><td>'.$langs->trans('Enabled').'</td><td><input type="text" class="minwidth500" name="enabled" value="'.dol_escape_htmltag($menu->enabled).'"></td><td>'.$langs->trans('DetailEnabled');
-    if (!empty($menu->enabled)) print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->enabled, 1)).')';
-    print '</td></tr>';
+	// Enabled
+	print '<tr><td>'.$langs->trans('Enabled').'</td><td><input type="text" class="minwidth500" name="enabled" value="'.dol_escape_htmltag($menu->enabled).'"></td><td>'.$langs->trans('DetailEnabled');
+	if (!empty($menu->enabled)) print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->enabled, 1)).')';
+	print '</td></tr>';
 
-    // Perms
-    print '<tr><td>'.$langs->trans('Rights').'</td><td><input type="text" class="minwidth500" name="perms" value="'.dol_escape_htmltag($menu->perms).'"></td><td>'.$langs->trans('DetailRight');
-    if (!empty($menu->perms)) print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->perms, 1)).')';
-    print '</td></tr>';
+	// Perms
+	print '<tr><td>'.$langs->trans('Rights').'</td><td><input type="text" class="minwidth500" name="perms" value="'.dol_escape_htmltag($menu->perms).'"></td><td>'.$langs->trans('DetailRight');
+	if (!empty($menu->perms)) print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->perms, 1)).')';
+	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    // Bouton
-    print '<div class="center">';
+	// Bouton
+	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 '&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>';
+	print '<br>';
 }
 
 // End of page
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 0cb69efdf4a..f83507c37aa 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
  * Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2019       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019      Frédéric France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ foreach ($dirmenus as $dirmenu)
     $dirsmartphone[] = $dirmenu.'smartphone';
 }
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 $menu_handler_top = $conf->global->MAIN_MENU_STANDARD;
@@ -118,9 +118,7 @@ if ($action == 'up')
 	$sql .= " WHERE m.rowid = ".$previous['rowid']; // Descend celui du dessus
 	dol_syslog("admin/menus/index.php ".$sql);
 	$db->query($sql);
-}
-
-elseif ($action == 'down')
+} elseif ($action == 'down')
 {
 	$current = array();
 	$next = array();
@@ -174,9 +172,7 @@ elseif ($action == 'down')
 	$sql .= " WHERE m.rowid = ".$next['rowid'];
 	dol_syslog("admin/menus/index.php ".$sql);
 	$db->query($sql);
-}
-
-elseif ($action == 'confirm_delete' && $confirm == 'yes')
+} elseif ($action == 'confirm_delete' && $confirm == 'yes')
 {
 	$db->begin();
 
@@ -191,9 +187,7 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes')
 
 		header("Location: ".DOL_URL_ROOT.'/admin/menus/index.php?menu_handler='.$menu_handler);
 		exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 
 		$reload = 0;
@@ -326,20 +320,20 @@ if ($conf->use_javascript_ajax)
 			$titre = $langs->trans($menu['titre']);
 
 			$entry = '<table class="nobordernopadding centpercent"><tr><td>';
-			$entry .= '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.$titre.'</a></strong>';
+			$entry .= '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&token='.newToken().'&menuId='.$menu['rowid'].'">'.$titre.'</a></strong>';
 			$entry .= '</td><td class="right">';
-			$entry .= '<a class="editfielda marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> ';
-			$entry .= '<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
-			$entry .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
+			$entry .= '<a class="editfielda marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> ';
+			$entry .= '<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
+			$entry .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
 			$entry .= '&nbsp; &nbsp; &nbsp;';
-			$entry .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
+			$entry .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
 			$entry .= '</td></tr></table>';
 
-			$buttons = '<a class="editfielda marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> ';
-			$buttons .=	'<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
-			$buttons .=	'<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
-			$buttons .=	'&nbsp; &nbsp; &nbsp;';
-			$buttons .=	'<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
+			$buttons = '<a class="editfielda marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> ';
+			$buttons .= '<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
+			$buttons .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
+			$buttons .= '&nbsp; &nbsp; &nbsp;';
+			$buttons .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
 
 			$data[] = array(
 				'rowid'=>$menu['rowid'],
@@ -408,9 +402,7 @@ if ($conf->use_javascript_ajax)
 	}
 
 	print '</div>';
-}
-else
-{
+} else {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorFeatureNeedJavascript"), null, 'errors');
 }
diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index bed6c2a3b4e..cd8c7cccfa6 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -29,7 +29,7 @@ $langs->loadLangs(array("user", "other", "admin"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -41,8 +41,7 @@ if ($action == 'activate_hidemenu')
 	dolibarr_set_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", '1', 'chaine', 0, '', $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]);
 	exit;
-}
-elseif ($action == 'disable_hidemenu')
+} elseif ($action == 'disable_hidemenu')
 {
 	dolibarr_del_const($db, "MAIN_MENU_HIDE_UNAUTHORIZED", $conf->entity);
 	header("Location: ".$_SERVER["PHP_SELF"]);
@@ -94,9 +93,7 @@ print '<td class="center">';
 if (empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))
 {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=activate_hidemenu">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-}
-else
-{
+} else {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?action=disable_hidemenu">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 }
 print "</td>";
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index ec0e5d8bb9b..c788eca01d3 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 $langs->loadLangs(array('errors', 'admin', 'modulebuilder'));
 
 $mode = GETPOST('mode', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 if (empty($mode)) $mode = 'desc';
 
@@ -105,8 +105,7 @@ foreach ($modulesdir as $dir)
 						continue;
 		        	}
 
-		            try
-		            {
+		            try {
 		                $res = include_once $dir.$file;
 		                if (class_exists($modName))
 						{
@@ -140,9 +139,7 @@ foreach ($modulesdir as $dir)
 		    					        if ($publisher)
 		    					        {
 		    					            $arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
-		    					        }
-		    					        else
-		    					        {
+		    					        } else {
 		    					            $arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
 		    					        }
 		    					    }
@@ -180,20 +177,15 @@ foreach ($modulesdir as $dir)
 		    			            else $categ[$specialstring] = 1;
 		    						$j++;
 		    			            $i++;
-		    					}
-		    					else dol_syslog("Module ".get_class($objMod)." not qualified");
-							}
-		            		catch (Exception $e)
+		    					} else dol_syslog("Module ".get_class($objMod)." not qualified");
+							} catch (Exception $e)
 		            		{
 		            		     dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 		            		}
-						}
-		            	else
-						{
+						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
-					}
-		            catch (Exception $e)
+					} catch (Exception $e)
 		            {
 		                 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 		            }
@@ -201,9 +193,7 @@ foreach ($modulesdir as $dir)
 		    }
 		}
 		closedir($handle);
-	}
-	else
-	{
+	} else {
 		dol_syslog("htdocs/admin/modulehelp.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 	}
 }
@@ -331,9 +321,7 @@ if ($mode == 'desc')
         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
-    {
+    } else {
         $text .= '<br><span class="opacitymedium">'.$langs->trans("Origin").':</span> '.$langs->trans("Core").'<br>';
     }
 
@@ -353,7 +341,7 @@ if ($mode == 'feature')
     $text .= '<br><br>';
 
     $text .= '<br><strong>'.$langs->trans("AddDataTables").':</strong> ';
-	$sqlfiles = dol_dir_list(dol_buildpath($moduledir.'/sql/'), 'files', 0, 'llx.*\.sql', array('\.key\.sql'));
+	$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").' (';
@@ -364,8 +352,7 @@ if ($mode == 'feature')
     		$i++;
     	}
     	$text .= ')';
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -378,8 +365,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').$val;
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -388,8 +374,7 @@ if ($mode == 'feature')
     if (dol_is_file($filedata))
     {
         $text .= $langs->trans("Yes").' ('.$moduledir.'/sql/data.sql)';
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -407,8 +392,7 @@ if ($mode == 'feature')
            		$i++;
         	}
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -416,8 +400,7 @@ if ($mode == 'feature')
     if (isset($objMod->module_parts) && isset($objMod->module_parts['models']) && $objMod->module_parts['models'])
     {
         $text .= $langs->trans("Yes");
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -425,8 +408,7 @@ if ($mode == 'feature')
     if (isset($objMod->module_parts) && isset($objMod->module_parts['substitutions']) && $objMod->module_parts['substitutions'])
     {
         $text .= $langs->trans("Yes");
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -439,8 +421,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val['label']);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -449,9 +430,7 @@ if ($mode == 'feature')
     if (isset($objMod->module_parts) && isset($objMod->module_parts['triggers']) && $objMod->module_parts['triggers'])
     {
     	$yesno = 'Yes';
-    }
-    else
-    {
+    } else {
     	$yesno = 'No';
     }
     require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
@@ -479,8 +458,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val['file'] ? $val['file'] : $val[0]);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -510,8 +488,7 @@ if ($mode == 'feature')
         	$text .= ($i ? ', ' : '').($val);
         	$i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -524,8 +501,7 @@ if ($mode == 'feature')
         	$text .= ($i ? ', ' : '').($val[1]);
         	$i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -533,8 +509,7 @@ if ($mode == 'feature')
     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");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -547,8 +522,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
@@ -561,8 +535,7 @@ if ($mode == 'feature')
             $text .= ($i ? ', ' : '').($val);
             $i++;
         }
-    }
-    else $text .= $langs->trans("No");
+    } else $text .= $langs->trans("No");
 
     $text .= '<br>';
 
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index af689b1165d..c61e352aad8 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array("errors", "admin", "modulebuilder"));
 
 $mode = GETPOSTISSET('mode') ? GETPOST('mode', 'alpha') : (empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : 'common');
 if (empty($mode)) $mode = 'common';
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 //var_dump($_POST);exit;
 $value = GETPOST('value', 'alpha');
 $page_y = GETPOST('page_y', 'int');
@@ -126,9 +126,7 @@ if ($action == 'install')
 		$langs->load("Error");
 		setEventMessages($langs->trans("ErrorModuleFileRequired"), null, 'warnings');
 		$error++;
-	}
-	else
-	{
+	} else {
 		if (!$error && !preg_match('/\.zip$/i', $original_file))
 		{
 			$langs->load("errors");
@@ -174,9 +172,7 @@ if ($action == 'install')
 				$langs->load("errors");
 				setEventMessages($langs->trans($result['error'], $original_file), null, 'errors');
 				$error++;
-			}
-			else
-			{
+			} else {
 				// Now we move the dir of the module
 				$modulename = preg_replace('/module_/', '', $original_file);
 				$modulename = preg_replace('/\-([0-9][0-9\.]*)\.zip$/i', '', $modulename);
@@ -231,9 +227,7 @@ if ($action == 'install')
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorFailToRenameFile", $_FILES['fileinstall']['tmp_name'], $newfile), null, 'errors');
 			$error++;
 		}
@@ -249,8 +243,7 @@ if ($action == 'set' && $user->admin)
 {
 	$resarray = activateModule($value);
 	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
-	else
-	{
+	else {
 		//var_dump($resarray);exit;
 		if ($resarray['nbperms'] > 0)
 		{
@@ -265,14 +258,12 @@ if ($action == 'set' && $user->admin)
 					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
 					setEventMessages($msg, null, 'warnings');
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
-}
-elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes')
+} elseif ($action == 'reset' && $user->admin && GETPOST('confirm') == 'yes')
 {
 	$result = unActivateModule($value);
 	if ($result) setEventMessages($result, null, 'errors');
@@ -342,8 +333,7 @@ foreach ($modulesdir as $dir)
 						continue;
 					}
 
-					try
-					{
+					try {
 						$res = include_once $dir.$file; // A class already exists in a different file will send a non catchable fatal error.
 						if (class_exists($modName))
 						{
@@ -376,9 +366,7 @@ foreach ($modulesdir as $dir)
 										if ($publisher)
 										{
 											$arrayofnatures['external_'.$publisher] = $langs->trans("External").' - '.$publisher;
-										}
-										else
-										{
+										} else {
 											$arrayofnatures['external_'] = $langs->trans("External").' - '.$langs->trans("UnknownPublishers");
 										}
 									}
@@ -431,20 +419,15 @@ foreach ($modulesdir as $dir)
 									else $categ[$specialstring] = 1;
 									$j++;
 									$i++;
-								}
-								else dol_syslog("Module ".get_class($objMod)." not qualified");
-							}
-							catch (Exception $e)
+								} else dol_syslog("Module ".get_class($objMod)." not qualified");
+							} catch (Exception $e)
 							{
 								 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
-						}
-						else
-						{
+						} else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						 dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 					}
@@ -452,9 +435,7 @@ foreach ($modulesdir as $dir)
 			}
 		}
 		closedir($handle);
-	}
-	else
-	{
+	} else {
 		dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 	}
 }
@@ -479,8 +460,9 @@ asort($orders);
 //var_dump($modules);
 
 $nbofactivatedmodules = count($conf->modules);
-$moreinfo = $langs->trans("TotalNumberOfActivatedModules", ($nbofactivatedmodules - 1), count($modules));
-if ($nbofactivatedmodules <= 1) $moreinfo .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
+$moreinfo = $langs->trans("TitleNumberOfActivatedModules");
+$moreinfo2 = ($nbofactivatedmodules - 1)." / ".count($modules);
+if ($nbofactivatedmodules <= 1) $moreinfo2 .= ' '.img_warning($langs->trans("YouMustEnableOneModule"));
 
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 
@@ -515,11 +497,19 @@ if ($mode == 'common' || $mode == 'commonkanban')
 	dol_fiche_head($head, $newmode, '', -1);
 
 	$moreforfilter = '<div class="valignmiddle">';
+
+	$moreforfilter .= '<div class="floatright right pagination"><ul><li>';
+	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'common' ? '' : ' btnTitleSelected')));
+	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'commonkanban' ? '' : ' btnTitleSelected')));
+	$moreforfilter .= '</li></ul></div>';
+
+	$moreforfilter .= '<div class="floatright center marginrightonly hideonsmartphone" style="padding-top: 3px"><span class="">'.$moreinfo.'</span><br><b class="largenumber">'.$moreinfo2.'</b></div>';
+
 	$moreforfilter .= '<div class="colorbacktimesheet float valignmiddle">';
-	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= '<div class="divsearchfield paddingtop">';
 	$moreforfilter .= $langs->trans('Keyword').': <input type="text" id="search_keyword" name="search_keyword" class="maxwidth100" value="'.dol_escape_htmltag($search_keyword).'">';
 	$moreforfilter .= '</div>';
-	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= '<div class="divsearchfield paddingtop">';
 	$moreforfilter .= $langs->trans('Origin').': '.$form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 	$moreforfilter .= '</div>';
 	if (!empty($conf->global->MAIN_FEATURES_LEVEL))
@@ -528,11 +518,11 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		if ($conf->global->MAIN_FEATURES_LEVEL < 0) $array_version['deprecated'] = $langs->trans("Deprecated");
 		if ($conf->global->MAIN_FEATURES_LEVEL > 0) $array_version['experimental'] = $langs->trans("Experimental");
 		if ($conf->global->MAIN_FEATURES_LEVEL > 1) $array_version['development'] = $langs->trans("Development");
-		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= '<div class="divsearchfield paddingtop">';
 		$moreforfilter .= $langs->trans('Version').': '.$form->selectarray('search_version', $array_version, $search_version, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 		$moreforfilter .= '</div>';
 	}
-	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= '<div class="divsearchfield paddingtop">';
 	$moreforfilter .= $langs->trans('Status').': '.$form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
 	$moreforfilter .= '</div>';
 	$moreforfilter .= ' ';
@@ -543,13 +533,6 @@ if ($mode == 'common' || $mode == 'commonkanban')
 	$moreforfilter .= '</div>';
 	$moreforfilter .= '</div>';
 
-	$moreforfilter .= '<div class="floatright right">';
-	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list paddingleft imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'common' ? '' : ' btnTitleSelected')));
-	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt paddingleft imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'commonkanban' ? '' : ' btnTitleSelected')));
-	$moreforfilter .= '</div>';
-
-	$moreforfilter .= '<div class="floatright right margintoponly marginrightonly" style="padding-top: 3px">'.$moreinfo.'</div>';
-
 	$moreforfilter .= '</div>';
 
 	if (!empty($moreforfilter))
@@ -708,8 +691,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			if (!empty($objMod->disabled))
 			{
 				$codeenabledisable .= $langs->trans("Disabled");
-			}
-			elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
+			} elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
 			{
 				if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) $codeenabledisable .= $langs->trans("Used");
 				else {
@@ -717,15 +699,12 @@ if ($mode == 'common' || $mode == 'commonkanban')
 					//print $langs->trans("Required");
 				}
 				if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
-			}
-			else
-			{
+			} else {
 				if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
-				}
-				else {
+				} else {
 					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
@@ -753,49 +732,36 @@ if ($mode == 'common' || $mode == 'commonkanban')
 						{
 							$codetoconfig .= '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 							//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
-						}
-						else
-						{
+						} else {
 							if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
 							{
 								$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
-							}
-							else
-							{
+							} else {
 								$urltouse = $urlpage;
 								$codetoconfig .= '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 							}
 						}
 					}
-				}
-				elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
+				} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
 				{
 					$codetoconfig .= '<a class="valignmiddle" href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
-				}
-				else
-				{
+				} else {
 					$codetoconfig .= '<a class="valignmiddle" href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"', false, 0, 0, '', 'fa-15').'</a>';
 				}
-			}
-			else
-			{
+			} else {
 				$codetoconfig .= img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"', false, 0, 0, '', 'fa-15');
 			}
-		}
-		else	// Module not yet activated
+		} else // Module not yet activated
 		{
 			// Set $codeenabledisable
 			if (!empty($objMod->always_enabled))
 			{
 				// Should never happened
-			}
-			elseif (!empty($objMod->disabled))
+			} elseif (!empty($objMod->disabled))
 			{
 				$codeenabledisable .= $langs->trans("Disabled");
-			}
-			else
-			{
+			} else {
 				// Module qualified for activation
 				$warningmessage = '';
 				if (!empty($arrayofwarnings[$modName]))
@@ -831,7 +797,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 					}
 				}
 				$codeenabledisable .= '<!-- Message to show: '.$warningmessage.' -->'."\n";
-				$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value='.$modName.'&amp;mode='.$mode.$param.'"';
+				$codeenabledisable .= '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=set&amp;value='.$modName.'&amp;mode='.$mode.$param.'"';
 				if ($warningmessage) $codeenabledisable .= ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
 				$codeenabledisable .= '>';
 				$codeenabledisable .= img_picto($langs->trans("Disabled"), 'switch_off');
@@ -858,9 +824,7 @@ if ($mode == 'common' || $mode == 'commonkanban')
 			{
 				if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"', 1);
 				else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule paddingrightonly"');
-			}
-			else
-			{
+			} else {
 				print img_object($alttext, 'generic', 'class="valignmiddle paddingrightonly"');
 			}
 			print ' <span class="valignmiddle">'.$objMod->getName().'</span>';
@@ -1029,9 +993,7 @@ if ($mode == 'deploy')
 		{
 			$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 			$allowfromweb = -1;
-		}
-		else
-		{
+		} else {
 			if ($dirins_ok)
 			{
 				if (!is_writable(dol_osencode($dirins)))
@@ -1040,16 +1002,12 @@ if ($mode == 'deploy')
 					$message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins), 0, 0, '1', 'warning');
 					$allowfromweb = 0;
 				}
-			}
-			else
-			{
+			} else {
 				$message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
 				$allowfromweb = 0;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock'));
 		$allowfromweb = 0;
 	}
@@ -1069,9 +1027,7 @@ if ($mode == 'deploy')
 		if ($allowfromweb == 1)
 		{
 			//print $langs->trans("ThisIsProcessToFollow").'<br>';
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ThisIsAlternativeProcessToFollow").'<br>';
 			print '<b>'.$langs->trans("StepNb", 1).'</b>: ';
 			print $langs->trans("FindPackageFromWebSite", $fullurl).'<br>';
@@ -1151,9 +1107,7 @@ if ($mode == 'deploy')
 					print ' ';
 					print info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow, $maxphptoshowparam), 1);
 				}
-			}
-			else
-			{
+			} else {
 				print ' ('.$langs->trans("UploadDisabled").')';
 			}
 
@@ -1163,9 +1117,7 @@ if ($mode == 'deploy')
 			print '<br>';
 
 			print '<div class="center"><div class="logo_setup"></div></div>';
-		}
-		else
-		{
+		} else {
 			print $langs->trans("UnpackPackageInModulesRoot", $dirins).'<br>';
 			print '<b>'.$langs->trans("StepNb", 4).'</b>: ';
 			print $langs->trans("SetupIsReadyForUse").'<br>';
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index 9c59b5cf6da..863633176bd 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array('admin', 'errors', 'mrp', 'other'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -56,16 +56,12 @@ if ($action == 'updateMask')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
-elseif ($action == 'specimen')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -77,7 +73,7 @@ elseif ($action == 'specimen')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/mrp/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/mrp/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -96,15 +92,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mrp&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -114,14 +106,12 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->MRP_MO_ADDON_PDF == "$value") dolibarr_del_const($db, 'MRP_MO_ADDON_PDF', $conf->entity);
+		if ($conf->global->MRP_MO_ADDON_PDF == "$value") dolibarr_del_const($db, 'MRP_MO_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -141,17 +131,13 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "MRP_MO_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
+} elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
 {
 	$draft = GETPOST("MRP_MO_DRAFT_WATERMARK");
 	$res = dolibarr_set_const($db, "MRP_MO_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -159,31 +145,25 @@ elseif ($action == 'set_MRP_MO_DRAFT_WATERMARK')
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
-}
-
-elseif ($action == 'set_MRP_MO_FREE_TEXT')
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'set_MRP_MO_FREE_TEXT')
 {
-	$freetext = GETPOST("MRP_MO_FREE_TEXT", 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST("MRP_MO_FREE_TEXT", 'restricthtml'); // No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "MRP_MO_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
 
  	if (!$error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
@@ -232,7 +212,7 @@ foreach ($dirmodels as $reldir)
 		{
 			while (($file = readdir($handle)) !== false)
 			{
-			    if (substr($file, 0, 7) == 'mod_mo_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
+				if (substr($file, 0, 7) == 'mod_mo_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
 				{
 					$file = substr($file, 0, dol_strlen($file) - 4);
 
@@ -250,22 +230,20 @@ 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->MRP_MO_ADDON == $file)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -279,16 +257,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$mrp->type = 0;
 						$nextval = $module->getNextValue($mysoc, $mrp);
-                        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);
@@ -315,7 +293,7 @@ print load_fiche_titre($langs->trans("MOsModelModule"), '', '');
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -328,9 +306,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -349,114 +325,108 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/mrp".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/mrp".$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&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&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 class="reposition" 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 class="center">'."\n";
+									print '<a class="reposition" 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->MRP_MO_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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->MRP_MO_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
-					    		$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftMOs").': '.yn($module->option_draft_watermark, 1, 1);
+								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("WatermarkOnDraftMOs").': '.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>';
@@ -488,13 +458,11 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnMOs"), $langs->trans("A
 $variablename = 'MRP_MO_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    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();
+	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();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/mrp_extrafields.php b/htdocs/admin/mrp_extrafields.php
index 55df2a065d0..b0bd0e522ab 100644
--- a/htdocs/admin/mrp_extrafields.php
+++ b/htdocs/admin/mrp_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'mrp_mo';
 
@@ -68,7 +68,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("MrpSetupPage"), $linkback, 'title_setup');
 
 
-$head = mrpAdminPrepareHead(null);
+$head = mrpAdminPrepareHead();
 
 dol_fiche_head($head, 'mrp_extrafields', $langs->trans("ExtraFields"), -1, 'account');
 
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 4ba581398ee..a447551b04e 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -38,7 +38,7 @@ if (!$user->admin) {
 }
 
 // Parameters
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -53,9 +53,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	if (dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity) > 0)
 	{
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
         setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -66,9 +64,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	if (dolibarr_del_const($db, $code, 0) > 0)
 	{
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
         setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -96,11 +92,9 @@ if ($action == 'add_currency')
 		{
 			if ($currency->addRate($rate)) setEventMessages($langs->trans('RecordSaved'), array());
 			else setEventMessages($langs->trans('ErrorAddRateFail'), array(), 'errors');
-		}
-		else setEventMessages($langs->trans('ErrorAddCurrencyFail'), $currency->errors, 'errors');
+		} else setEventMessages($langs->trans('ErrorAddCurrencyFail'), $currency->errors, 'errors');
 	}
-}
-elseif ($action == 'update_currency')
+} elseif ($action == 'update_currency')
 {
 	$error = 0;
 
@@ -125,8 +119,7 @@ elseif ($action == 'update_currency')
 				}
 			}
 		}
-	}
-	elseif (GETPOST('deletecurrency', 'alpha'))
+	} elseif (GETPOST('deletecurrency', 'alpha'))
 	{
 		$fk_multicurrency = GETPOST('fk_multicurrency', 'int');
 		$currency = new MultiCurrency($db);
@@ -137,17 +130,14 @@ elseif ($action == 'update_currency')
 			else setEventMessages($langs->trans('ErrorDeleteCurrencyFail'), array(), 'errors');
 		}
 	}
-}
-elseif ($action == 'setapilayer')
+} 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
-    {
+    } else {
         $result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
         if ($result > 0) {
         	setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index ba92aa1ec21..b484e7acea9 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -84,9 +84,7 @@ if ($action == 'settemplates')
 		$db->commit();
 
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -97,7 +95,7 @@ if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 
-	$result = dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", GETPOST("email_from", "none"), 'chaine', 0, '', $conf->entity);
+	$result = dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", GETPOST("email_from", "restricthtml"), 'chaine', 0, '', $conf->entity);
     if ($result < 0) $error++;
 
 
@@ -106,9 +104,7 @@ if ($action == 'setvalue' && $user->admin)
     	$db->commit();
 
     	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
     	$db->rollback();
 
     	setEventMessages($langs->trans("Error"), null, 'errors');
@@ -140,8 +136,7 @@ if ($action == 'setfixednotif' && $user->admin)
 				$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))
+	    	} elseif (preg_match('/^NOTIF_(.*)_new_key/', $key, $reg))
 	    	{
 	    		// Add a new entry
 	    		$newkey = 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount'));
@@ -160,9 +155,7 @@ if ($action == 'setfixednotif' && $user->admin)
     	$db->commit();
 
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-	{
+    } else {
 		$db->rollback();
 
         setEventMessages($langs->trans("Error"), null, 'errors');
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 785a77ac043..8b0e9516abd 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('admin', 'oauth'));
 if (!$user->admin)
     accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -119,9 +119,7 @@ foreach ($list as $key)
         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
-    {
+    } else {
         print '<tr class="oddeven value">';
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
         print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index d8c65f9a2c5..2c8f2070724 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2014-2018  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2020		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
@@ -33,7 +34,7 @@ $langs->loadLangs(array('admin', 'printing', 'oauth'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
 $value = GETPOST('value', 'alpha');
 $varname = GETPOST('varname', 'alpha');
@@ -57,54 +58,50 @@ if (!$mode) $mode = 'setup';
 
 if ($action == 'setconst' && $user->admin)
 {
-    $error = 0;
-    $db->begin();
+	$error = 0;
+	$db->begin();
 
-    $setupconstarray = GETPOST('setupdriver', 'array');
+	$setupconstarray = GETPOST('setupdriver', 'array');
 
-    foreach ($setupconstarray as $setupconst) {
-        //print '<pre>'.print_r($setupconst, true).'</pre>';
+	foreach ($setupconstarray as $setupconst) {
+		//print '<pre>'.print_r($setupconst, true).'</pre>';
 
-    	$constname = dol_escape_htmltag($setupconst['varname']);
-    	$constvalue = dol_escape_htmltag($setupconst['value']);
-    	$consttype = dol_escape_htmltag($setupconst['type']);
-    	$constnote = dol_escape_htmltag($setupconst['note']);
+		$constname = dol_escape_htmltag($setupconst['varname']);
+		$constvalue = dol_escape_htmltag($setupconst['value']);
+		$consttype = dol_escape_htmltag($setupconst['type']);
+		$constnote = dol_escape_htmltag($setupconst['note']);
 
-    	$result = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
-        if (!$result > 0) $error++;
-    }
+		$result = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
+		if (!$result > 0) $error++;
+	}
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else
-    {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 if ($action == 'setvalue' && $user->admin)
 {
-    $db->begin();
+	$db->begin();
 
-    $result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else
-    {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 
@@ -134,283 +131,275 @@ if (GETPOST('error')) {
 
 if ($mode == 'setup' && $user->admin)
 {
-    print '<span class="opacitymedium">'.$langs->trans("OAuthSetupForLogin")."</span><br><br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("OAuthSetupForLogin")."</span><br><br>\n";
 
-    foreach ($list as $key)
-    {
-        $supported = 0;
-        if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
-        if (!$supported) continue; // show only supported
+	foreach ($list as $key)
+	{
+		$supported = 0;
+		if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
+		if (!$supported) continue; // show only supported
 
 
-        $OAUTH_SERVICENAME = 'Unknown';
-        if ($key[0] == 'OAUTH_GITHUB_NAME')
-        {
-            $OAUTH_SERVICENAME = 'GitHub';
-            // List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
-            // We pass this param list in to 'state' because we need it before and after the redirect.
-            $shortscope = 'user,public_repo';
-            $urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltocheckperms = 'https://github.com/settings/applications/';
-        }
-        elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
-        {
-            $OAUTH_SERVICENAME = 'Google';
-            // List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
-            // We pass this param list in to 'state' because we need it before and after the redirect.
-            $shortscope = 'userinfo_email,userinfo_profile,cloud_print';
-            //$scope.=',gmail_full';
-            $urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltocheckperms = 'https://security.google.com/settings/security/permissions';
-        }
-        elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
-        {
-        	$OAUTH_SERVICENAME = 'StripeTest';
-        	$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-        	$urltodelete = '';
-        	$urltocheckperms = '';
-        }
-        elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
-        {
-        	$OAUTH_SERVICENAME = 'StripeLive';
-        	$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-        	$urltodelete = '';
-        	$urltocheckperms = '';
-        }
-        else
+		$OAUTH_SERVICENAME = 'Unknown';
+		if ($key[0] == 'OAUTH_GITHUB_NAME')
 		{
+			$OAUTH_SERVICENAME = 'GitHub';
+			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
+			// We pass this param list in to 'state' because we need it before and after the redirect.
+			$shortscope = 'user,public_repo';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltocheckperms = 'https://github.com/settings/applications/';
+		} elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
+		{
+			$OAUTH_SERVICENAME = 'Google';
+			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
+			// We pass this param list in to 'state' because we need it before and after the redirect.
+			$shortscope = 'userinfo_email,userinfo_profile,cloud_print';
+			if (!empty($conf->global->OAUTH_GSUITE)){
+				$shortscope .= ',admin_directory_user';
+			}
+			//$scope.=',gmail_full';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltocheckperms = 'https://security.google.com/settings/security/permissions';
+		} elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
+		{
+			$OAUTH_SERVICENAME = 'StripeTest';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = '';
+			$urltocheckperms = '';
+		} elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
+		{
+			$OAUTH_SERVICENAME = 'StripeLive';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = '';
+			$urltocheckperms = '';
+		} else {
 			$urltorenew = '';
 			$urltodelete = '';
 			$urltocheckperms = '';
 		}
 
 
-        // Show value of token
-        $tokenobj = null;
-        // Token
-        require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
-        require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
-        // Dolibarr storage
-        $storage = new DoliStorage($db, $conf);
-        try
-        {
-            $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
-        }
-        catch (Exception $e)
-        {
-            // Return an error if token not found
-        }
+		// Show value of token
+		$tokenobj = null;
+		// Token
+		require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+		require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+		// Dolibarr storage
+		$storage = new DoliStorage($db, $conf);
+		try {
+			$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
+		} catch (Exception $e)
+		{
+			// Return an error if token not found
+		}
 
-        // Set other properties
-        $refreshtoken = false;
-        $expiredat = '';
+		// Set other properties
+		$refreshtoken = false;
+		$expiredat = '';
 
-        $expire = false;
-        // Is token expired or will token expire in the next 30 seconds
-        if (is_object($tokenobj)) {
-            $expire = ($tokenobj->getEndOfLife() !== $tokenobj::EOL_NEVER_EXPIRES && $tokenobj->getEndOfLife() !== $tokenobj::EOL_UNKNOWN && time() > ($tokenobj->getEndOfLife() - 30));
-        }
+		$expire = false;
+		// Is token expired or will token expire in the next 30 seconds
+		if (is_object($tokenobj)) {
+			$expire = ($tokenobj->getEndOfLife() !== $tokenobj::EOL_NEVER_EXPIRES && $tokenobj->getEndOfLife() !== $tokenobj::EOL_UNKNOWN && time() > ($tokenobj->getEndOfLife() - 30));
+		}
 
-        if ($key[1] != '' && $key[2] != '') {
-            if (is_object($tokenobj)) {
-                $refreshtoken = $tokenobj->getRefreshToken();
+		if ($key[1] != '' && $key[2] != '') {
+			if (is_object($tokenobj)) {
+				$refreshtoken = $tokenobj->getRefreshToken();
 
-                $endoflife = $tokenobj->getEndOfLife();
-                if ($endoflife == $tokenobj::EOL_NEVER_EXPIRES)
-                {
-                    $expiredat = $langs->trans("Never");
-                }
-                elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
-                {
-                    $expiredat = $langs->trans("Unknown");
-                }
-                else
-                {
-                    $expiredat = dol_print_date($endoflife, "dayhour");
-                }
-            }
-        }
+				$endoflife = $tokenobj->getEndOfLife();
+				if ($endoflife == $tokenobj::EOL_NEVER_EXPIRES)
+				{
+					$expiredat = $langs->trans("Never");
+				} elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
+				{
+					$expiredat = $langs->trans("Unknown");
+				} else {
+					$expiredat = dol_print_date($endoflife, "dayhour");
+				}
+			}
+		}
 
-        $submit_enabled = 0;
+		$submit_enabled = 0;
 
-        print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="setconst">';
+		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setconst">';
 
 
-        print '<table class="noborder centpercent">'."\n";
+		print '<table class="noborder centpercent">'."\n";
 
-        print '<tr class="liste_titre">';
-        print '<th class="titlefieldcreate">'.$langs->trans($key[0]).'</th>';
-        print '<th></th>';
-        print '<th></th>';
-        print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print '<th class="titlefieldcreate">'.$langs->trans($key[0]).'</th>';
+		print '<th></th>';
+		print '<th></th>';
+		print "</tr>\n";
 
-        print '<tr class="oddeven">';
-        print '<td'.($key['required'] ? ' class="required"' : '').'>';
-        //var_dump($key);
-        print $langs->trans("OAuthIDSecret").'</td>';
-        print '<td>';
-        print $langs->trans("SeePreviousTab");
-        print '</td>';
-        print '<td>';
-        print '</td>';
-        print '</tr>'."\n";
+		print '<tr class="oddeven">';
+		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		//var_dump($key);
+		print $langs->trans("OAuthIDSecret").'</td>';
+		print '<td>';
+		print $langs->trans("SeePreviousTab");
+		print '</td>';
+		print '<td>';
+		print '</td>';
+		print '</tr>'."\n";
 
-        print '<tr class="oddeven">';
-        print '<td'.($key['required'] ? ' class="required"' : '').'>';
-        //var_dump($key);
-        print $langs->trans("IsTokenGenerated");
-        print '</td>';
-        print '<td>';
-        if (is_object($tokenobj)) print $langs->trans("HasAccessToken");
-        else print $langs->trans("NoAccessToken");
-        print '</td>';
-        print '<td>';
-        // Links to delete/checks token
-        if (is_object($tokenobj))
-        {
-            //test on $storage->hasAccessToken($OAUTH_SERVICENAME) ?
-            print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
-        }
-        // Request remote token
-        if ($urltorenew)
-        {
-        	print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
-        }
-        // Check remote access
-        if ($urltocheckperms)
-        {
-            print '<br>'.$langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME).': <a href="'.$urltocheckperms.'" target="_'.strtolower($OAUTH_SERVICENAME).'">'.$urltocheckperms.'</a>';
-        }
-        print '</td>';
-        print '</tr>';
+		print '<tr class="oddeven">';
+		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		//var_dump($key);
+		print $langs->trans("IsTokenGenerated");
+		print '</td>';
+		print '<td>';
+		if (is_object($tokenobj)) print $langs->trans("HasAccessToken");
+		else print $langs->trans("NoAccessToken");
+		print '</td>';
+		print '<td>';
+		// Links to delete/checks token
+		if (is_object($tokenobj))
+		{
+			//test on $storage->hasAccessToken($OAUTH_SERVICENAME) ?
+			print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
+		}
+		// Request remote token
+		if ($urltorenew)
+		{
+			print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
+		}
+		// Check remote access
+		if ($urltocheckperms)
+		{
+			print '<br>'.$langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME).': <a href="'.$urltocheckperms.'" target="_'.strtolower($OAUTH_SERVICENAME).'">'.$urltocheckperms.'</a>';
+		}
+		print '</td>';
+		print '</tr>';
 
-        print '<tr class="oddeven">';
-        print '<td'.($key['required'] ? ' class="required"' : '').'>';
-        //var_dump($key);
-        print $langs->trans("Token").'</td>';
-        print '<td colspan="2">';
-        if (is_object($tokenobj))
-        {
-            //var_dump($tokenobj);
-            print $tokenobj->getAccessToken().'<br>';
-            //print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
-            //print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
-            //var_dump($tokenobj->getExtraParams());
-            /*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
+		print '<tr class="oddeven">';
+		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		//var_dump($key);
+		print $langs->trans("Token").'</td>';
+		print '<td colspan="2">';
+		if (is_object($tokenobj))
+		{
+			//var_dump($tokenobj);
+			print $tokenobj->getAccessToken().'<br>';
+			//print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
+			//print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
+			//var_dump($tokenobj->getExtraParams());
+			/*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
             print ''.join(',',$tokenobj->getExtraParams());
             print '</textarea>';*/
-        }
-        print '</td>';
-        print '</tr>'."\n";
+		}
+		print '</td>';
+		print '</tr>'."\n";
 
-        if (is_object($tokenobj))
-        {
-            // Token refresh
-            print '<tr class="oddeven">';
-            print '<td'.($key['required'] ? ' class="required"' : '').'>';
-            //var_dump($key);
-            print $langs->trans("TOKEN_REFRESH").'</td>';
-            print '<td colspan="2">';
-            print yn($refreshtoken);
-            print '</td>';
-            print '</tr>';
+		if (is_object($tokenobj))
+		{
+			// Token refresh
+			print '<tr class="oddeven">';
+			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			//var_dump($key);
+			print $langs->trans("TOKEN_REFRESH").'</td>';
+			print '<td colspan="2">';
+			print yn($refreshtoken);
+			print '</td>';
+			print '</tr>';
 
-            // Token expired
-            print '<tr class="oddeven">';
-            print '<td'.($key['required'] ? ' class="required"' : '').'>';
-            //var_dump($key);
-            print $langs->trans("TOKEN_EXPIRED").'</td>';
-            print '<td colspan="2">';
-            print yn($expire);
-            print '</td>';
-            print '</tr>';
+			// Token expired
+			print '<tr class="oddeven">';
+			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			//var_dump($key);
+			print $langs->trans("TOKEN_EXPIRED").'</td>';
+			print '<td colspan="2">';
+			print yn($expire);
+			print '</td>';
+			print '</tr>';
 
-            // Token expired at
-            print '<tr class="oddeven">';
-            print '<td'.($key['required'] ? ' class="required"' : '').'>';
-            //var_dump($key);
-            print $langs->trans("TOKEN_EXPIRE_AT").'</td>';
-            print '<td colspan="2">';
-            print $expiredat;
-            print '</td>';
-            print '</tr>';
-        }
+			// Token expired at
+			print '<tr class="oddeven">';
+			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			//var_dump($key);
+			print $langs->trans("TOKEN_EXPIRE_AT").'</td>';
+			print '<td colspan="2">';
+			print $expiredat;
+			print '</td>';
+			print '</tr>';
+		}
 
-        print '</table>';
+		print '</table>';
 
-        if (!empty($driver))
-        {
-            if ($submit_enabled) {
-                print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
-            }
-        }
+		if (!empty($driver))
+		{
+			if ($submit_enabled) {
+				print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
+			}
+		}
 
 
-        print '</form>';
-    }
+		print '</form>';
+	}
 }
 
 if ($mode == 'test' && $user->admin)
 {
-    print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    if (!empty($driver))
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
-        $classname = 'printing_'.$driver;
-        $langs->load($driver);
-        $printer = new $classname($db);
-        //print '<pre>'.print_r($printer, true).'</pre>';
-        if (count($printer->getlistAvailablePrinters())) {
-            if ($printer->listAvailablePrinters() == 0) {
-                print $printer->resprint;
-            } else {
-                setEventMessages($printer->error, $printer->errors, 'errors');
-            }
-        }
-        else {
-            print $langs->trans('PleaseConfigureDriverfromList');
-        }
-    }
+	print '<table class="noborder centpercent">';
+	if (!empty($driver))
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
+		$classname = 'printing_'.$driver;
+		$langs->load($driver);
+		$printer = new $classname($db);
+		//print '<pre>'.print_r($printer, true).'</pre>';
+		if (count($printer->getlistAvailablePrinters())) {
+			if ($printer->listAvailablePrinters() == 0) {
+				print $printer->resprint;
+			} else {
+				setEventMessages($printer->error, $printer->errors, 'errors');
+			}
+		} else {
+			print $langs->trans('PleaseConfigureDriverfromList');
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 }
 
 if ($mode == 'userconf' && $user->admin)
 {
-    print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("User").'</th>';
-    print '<th>'.$langs->trans("PrintModule").'</th>';
-    print '<th>'.$langs->trans("PrintDriver").'</th>';
-    print '<th>'.$langs->trans("Printer").'</th>';
-    print '<th>'.$langs->trans("PrinterLocation").'</th>';
-    print '<th>'.$langs->trans("PrinterId").'</th>';
-    print '<th>'.$langs->trans("NumberOfCopy").'</th>';
-    print '<th class="center">'.$langs->trans("Delete").'</th>';
-    print "</tr>\n";
-    $sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
-    $resql = $db->query($sql);
-    while ($row = $db->fetch_array($resql)) {
-        print '<tr class="oddeven">';
-        print '<td>'.$row['login'].'</td>';
-        print '<td>'.$row['module'].'</td>';
-        print '<td>'.$row['driver'].'</td>';
-        print '<td>'.$row['printer_name'].'</td>';
-        print '<td>'.$row['printer_location'].'</td>';
-        print '<td>'.$row['printer_id'].'</td>';
-        print '<td>'.$row['copy'].'</td>';
-        print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
-        print "</tr>\n";
-    }
-    print '</table>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("User").'</th>';
+	print '<th>'.$langs->trans("PrintModule").'</th>';
+	print '<th>'.$langs->trans("PrintDriver").'</th>';
+	print '<th>'.$langs->trans("Printer").'</th>';
+	print '<th>'.$langs->trans("PrinterLocation").'</th>';
+	print '<th>'.$langs->trans("PrinterId").'</th>';
+	print '<th>'.$langs->trans("NumberOfCopy").'</th>';
+	print '<th class="center">'.$langs->trans("Delete").'</th>';
+	print "</tr>\n";
+	$sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
+	$resql = $db->query($sql);
+	while ($row = $db->fetch_array($resql)) {
+		print '<tr class="oddeven">';
+		print '<td>'.$row['login'].'</td>';
+		print '<td>'.$row['module'].'</td>';
+		print '<td>'.$row['driver'].'</td>';
+		print '<td>'.$row['printer_name'].'</td>';
+		print '<td>'.$row['printer_location'].'</td>';
+		print '<td>'.$row['printer_id'].'</td>';
+		print '<td>'.$row['copy'].'</td>';
+		print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
+		print "</tr>\n";
+	}
+	print '</table>';
 }
 
 dol_fiche_end();
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index 2c72c55697f..1b2bb0c0cd0 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -45,7 +45,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'commande'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index 55732a40a51..1f645241646 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -46,7 +46,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'commandedet'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index e740150e1d5..92b5c9511d5 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2015  Juanjo Menent				<jmenent@2byte.es>
+ * Copyright (C) 2020  Maxime DEMAREST              <maxime@indelog.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,7 +32,7 @@ $langs->loadLangs(array("admin", "other", "errors", "bills"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -55,9 +56,7 @@ if ($action == 'updateMask')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -69,12 +68,13 @@ if ($action == 'setmod')
 
 if ($action == 'setparams')
 {
-	$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS', 'none'); // No alpha here, we want exact string
-
+	$freetext = GETPOST('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS', 'restricthtml'); // No alpha here, we want exact string
 	$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++;
+
 	if ($error)
 	{
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -181,10 +181,8 @@ foreach ($dirmodels as $reldir)
                             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=setmod&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>';
+                            } 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>';
 
@@ -253,6 +251,14 @@ print $form->selectyesno("FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $co
 print '</td><td class="right">';
 print "</td></tr>\n";
 
+// Allow to group payments by mod in rapports
+print '<tr class="oddeven"><td>';
+print $langs->trans("GroupPaymentsByModOnReports");
+print '</td><td width="60" align="center">';
+print $form->selectyesno("PAYMENTS_REPORT_GROUP_BY_MOD", $conf->global->PAYMENTS_REPORT_GROUP_BY_MOD, 1);
+print '</td><td class="right">';
+print "</td></tr>\n";
+
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 3464a0857b7..718e64e6446 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("admin", "withdrawals"));
 // Security check
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $type = 'paymentorder';
 
 
@@ -210,7 +210,7 @@ print load_fiche_titre($langs->trans("OrdersModelModule"),'','');
 $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql.= " WHERE type = '".$type."'";
+$sql.= " WHERE type = '".$db->escape($type)."'";
 $sql.= " AND entity = ".$conf->entity;
 $resql=$db->query($sql);
 if ($resql)
@@ -291,7 +291,7 @@ foreach ($dirmodels as $reldir)
                                 if (in_array($name, $def))
                                 {
                                     print '<td class="center">'."\n";
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+                                    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
                                     print img_picto($langs->trans("Enabled"),'switch_on');
                                     print '</a>';
                                     print '</td>';
@@ -299,7 +299,7 @@ foreach ($dirmodels as $reldir)
                                 else
                                 {
                                     print '<td class="center">'."\n";
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+                                    print '<a class="reposition" 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>";
                                 }
 
@@ -311,7 +311,7 @@ foreach ($dirmodels as $reldir)
                                 }
                                 else
                                 {
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+                                    print '<a class="reposition" 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>';
 
@@ -465,7 +465,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
 	        print '<td>'.dolGetFirstLastname($obj->firstname,$obj->lastname).'</td>';
 	        $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
 	        print '<td>'.$label.'</td>';
-	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=deletenotif&amp;notif='.$obj->rowid.'">'.img_delete().'</a></td>';
+	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=deletenotif&token='.newToken().'&notif='.$obj->rowid.'">'.img_delete().'</a></td>';
 	        print '</tr>';
 	        $i++;
 	    }
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 496a32923f7..363edca6c80 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('admin', 'languages', 'other', 'companies', 'products',
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
 
@@ -72,6 +72,7 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DESC"], 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_REF"], 'chaine', 0, '', $conf->entity);
 
+	dolibarr_set_const($db, "MAIN_DOCUMENTS_LOGO_HEIGHT", GETPOST("MAIN_DOCUMENTS_LOGO_HEIGHT", 'int'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INVERT_SENDER_RECIPIENT", $_POST["MAIN_INVERT_SENDER_RECIPIENT"], 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION", $_POST["MAIN_PDF_USE_ISO_LOCATION"], 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS", $_POST["MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS"], 'chaine', 0, '', $conf->entity);
@@ -82,24 +83,12 @@ if ($action == 'update')
 
     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');
 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 	exit;
 }
 
-if ($action == 'activate_pdfsecurity')
-{
-	dolibarr_set_const($db, "PDF_SECURITY_ENCRYPTION", "1", 'chaine', 0, '', $conf->entity);
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-elseif ($action == 'disable_pdfsecurity')
-{
-	dolibarr_del_const($db, "PDF_SECURITY_ENCRYPTION", $conf->entity);
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
-}
-
 
 
 /*
@@ -120,9 +109,41 @@ $arraydetailsforpdffoot = array(
 	3 => $langs->transnoentitiesnoconv('DisplayCompanyInfoAndManagers')
 );
 
+$s = $langs->trans("LibraryToBuildPDF")."<br>";
+$i = 0;
+$pdf = pdf_getInstance('A4');
+if (class_exists('FPDF') && !class_exists('TCPDF'))
+{
+	if ($i) $s .= ' + ';
+	$s .= 'FPDF';
+	$s .= ' ('.@constant('FPDF_PATH').')';
+	$i++;
+}
+if (class_exists('TCPDF'))
+{
+	if ($i) $s .= ' + ';
+	$s .= 'TCPDF';
+	$s .= ' ('.@constant('TCPDF_PATH').')';
+	$i++;
+}
+if (class_exists('FPDI'))
+{
+	if ($i) $s .= ' + ';
+	$s .= 'FPDI';
+	$s .= ' ('.@constant('FPDI_PATH').')';
+	$i++;
+}
+if (class_exists('TCPDI'))
+{
+	if ($i) $s .= ' + ';
+	$s .= 'TCPDI';
+	$s .= ' ('.@constant('TCPDI_PATH').')';
+	$i++;
+}
+
 print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
 
-print '<span class="opacitymedium">'.$langs->trans("PDFDesc")."</span><br>\n";
+print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFDesc"), $s)."</span><br>\n";
 print "<br>\n";
 
 $noCountryCode = (empty($mysoc->country_code) ? true : false);
@@ -189,9 +210,7 @@ for ($i = 1; $i <= 6; $i++)
 	{
 		$pid = $langs->transcountry("ProfId".$i, $mysoc->country_code);
 		if ($pid == '-') $pid = false;
-	}
-	else
-	{
+	} else {
 		$pid = img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 	}
 	if ($pid)
@@ -264,6 +283,12 @@ print '<div class="div-table-responsive-no-min">';
 print '<table summary="more" class="noborder centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
+// Height of logo
+
+print '<tr class="oddeven"><td>'.$langs->trans("MAIN_DOCUMENTS_LOGO_HEIGHT").'</td><td>';
+print '<input type="text" class="maxwidth50" name="MAIN_DOCUMENTS_LOGO_HEIGHT" value="'.(!empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT : 20).'">';
+print '</td></tr>';
+
 //Desc
 
 print '<tr class="oddeven"><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
@@ -312,62 +337,6 @@ print '</td></tr>';
 print '</table>';
 print '</div>';
 
-
-/*
- *  Library
- */
-
-print '<br>';
-print load_fiche_titre($langs->trans("Library"), '', '');
-
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">'."\n";
-
-print '<tr class="liste_titre">'."\n";
-print '<td>'.$langs->trans("Name").'</td>'."\n";
-print '<td>'.$langs->trans("Value").'</td>'."\n";
-print "</tr>\n";
-
-print '<tr class="oddeven">'."\n";
-print '<td>'.$langs->trans("LibraryToBuildPDF").'</td>'."\n";
-print '<td>';
-$i = 0;
-$pdf = pdf_getInstance('A4');
-if (class_exists('FPDF') && !class_exists('TCPDF'))
-{
-	if ($i) print ' + ';
-	print 'FPDF';
-	print ' ('.@constant('FPDF_PATH').')';
-	$i++;
-}
-if (class_exists('TCPDF'))
-{
-	if ($i) print ' + ';
-	print 'TCPDF';
-	print ' ('.@constant('TCPDF_PATH').')';
-	$i++;
-}
-if (class_exists('FPDI'))
-{
-	if ($i) print ' + ';
-	print 'FPDI';
-	print ' ('.@constant('FPDI_PATH').')';
-	$i++;
-}
-if (class_exists('TCPDI'))
-{
-	if ($i) print ' + ';
-	print 'TCPDI';
-	print ' ('.@constant('TCPDI_PATH').')';
-	$i++;
-}
-print '</td>'."\n";
-print '</tr>'."\n";
-
-print "</table>\n";
-print '</div>';
-
-
 print '<br><div class="center">';
 print '<input class="button" type="submit" name="save" value="'.$langs->trans("Save").'">';
 print '</div>';
diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 0486edebeec..cd9d290b828 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -116,7 +116,7 @@ $db->commit();
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'default', $langs->trans("Security"), -1);
+dol_fiche_head($head, 'default', '', -1);
 
 
 // Show warning about external users
@@ -128,9 +128,10 @@ print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Module").'</td>';
-print '<td class="center">&nbsp;</td>';
 print '<td class="center">'.$langs->trans("Default").'</td>';
+print '<td class="center">&nbsp;</td>';
 print '<td>'.$langs->trans("Permissions").'</td>';
+if ($user->admin) print '<td class="right">'.$langs->trans("ID").'</td>';
 print '</tr>'."\n";
 
 //print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS;
@@ -178,7 +179,6 @@ if ($result)
         $found = false;
         foreach ($modules[$obj->module]->rights as $key => $val)
         {
-        	$rights_class = $objMod->rights_class;
         	if ($val[4] == $obj->perms && (empty($val[5]) || $val[5] == $obj->subperms))
         	{
         		$found = true;
@@ -209,6 +209,8 @@ if ($result)
            	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";
         }
 
@@ -223,17 +225,21 @@ if ($result)
 		// Tick
 		if ($obj->bydefault == 1)
 		{
-			print '<td>';
-			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=remove">'.img_edit_remove().'</a>';
+			print '<td class="center">';
+			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=remove">';
+			//print img_edit_remove();
+			print img_picto('', 'switch_on');
+			print '</a>';
 			print '</td>';
 			print '<td class="center">';
-			print img_picto($langs->trans("Active"), 'tick');
+			//print img_picto($langs->trans("Active"), 'tick');
 			print '</td>';
-		}
-		else
-		{
-			print '<td>';
-			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=add">'.img_edit_add().'</a>';
+		} else {
+			print '<td class="center">';
+			print '<a class="reposition" href="perms.php?pid='.$obj->id.'&amp;action=add">';
+			//print img_edit_add();
+			print img_picto('', 'switch_off');
+			print '</a>';
 			print '</td>';
 			print '<td class="center">';
 			print '&nbsp;';
@@ -243,12 +249,14 @@ if ($result)
 		// Permission and tick
         print '<td>'.$perm_libelle.'</td>';
 
+        // Permission id
+        if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
+
         print '</tr>'."\n";
 
         $i++;
     }
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 0cfd03b7148..50d01924364 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("admin", "withdrawals"));
 // Security check
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $type = 'paymentorder';
 
 
@@ -70,8 +70,7 @@ if ($action == "set")
         $res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         */
-	}
-	else $error++;
+	} else $error++;
 
 	$res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
 	if (!$res > 0) $error++;
@@ -100,9 +99,7 @@ if ($action == "set")
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -220,7 +217,7 @@ print load_fiche_titre($langs->trans("OrdersModelModule"),'','');
 $def = array();
 $sql = "SELECT nom";
 $sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql.= " WHERE type = '".$type."'";
+$sql.= " WHERE type = '".$db->escape($type)."'";
 $sql.= " AND entity = ".$conf->entity;
 $resql=$db->query($sql);
 if ($resql)
@@ -301,7 +298,7 @@ foreach ($dirmodels as $reldir)
                                 if (in_array($name, $def))
                                 {
                                     print '<td class="center">'."\n";
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+                                    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
                                     print img_picto($langs->trans("Enabled"),'switch_on');
                                     print '</a>';
                                     print '</td>';
@@ -309,7 +306,7 @@ foreach ($dirmodels as $reldir)
                                 else
                                 {
                                     print '<td class="center">'."\n";
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+                                    print '<a class="reposition" 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>";
                                 }
 
@@ -321,7 +318,7 @@ foreach ($dirmodels as $reldir)
                                 }
                                 else
                                 {
-                                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+                                    print '<a class="reposition" 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>';
 
@@ -475,7 +472,7 @@ if (! empty($conf->global->MAIN_MODULE_NOTIFICATION))
 	        print '<td>'.dolGetFirstLastname($obj->firstname,$obj->lastname).'</td>';
 	        $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
 	        print '<td>'.$label.'</td>';
-	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=deletenotif&amp;notif='.$obj->rowid.'">'.img_delete().'</a></td>';
+	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=deletenotif&token='.newToken().'&notif='.$obj->rowid.'">'.img_delete().'</a></td>';
 	        print '</tr>';
 	        $i++;
 	    }
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 73703829b8c..3b574956cd0 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array("admin", "other", "errors", "propal"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -52,8 +52,7 @@ $type = 'propal';
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 $error = 0;
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
 	$maskconstpropal = GETPOST('maskconstpropal', 'alpha');
 	$maskpropal = GETPOST('maskpropal', 'alpha');
 	if ($maskconstpropal) $res = dolibarr_set_const($db, $maskconstpropal, $maskpropal, 'chaine', 0, '', $conf->entity);
@@ -63,14 +62,10 @@ if ($action == 'updateMask')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'specimen')
-{
+} elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
 
 	$propal = new Propal($db);
@@ -90,8 +85,7 @@ elseif ($action == 'specimen')
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
@@ -100,21 +94,15 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=propal&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-elseif ($action == 'setribchq')
-{
+} elseif ($action == 'setribchq') {
 	$rib = GETPOST('rib', 'alpha');
 	$chq = GETPOST('chq', 'alpha');
 
@@ -126,14 +114,10 @@ elseif ($action == 'setribchq')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'set_PROPALE_DRAFT_WATERMARK')
-{
+} elseif ($action == 'set_PROPALE_DRAFT_WATERMARK') {
 	$draft = GETPOST('PROPALE_DRAFT_WATERMARK', 'alpha');
 
 	$res = dolibarr_set_const($db, "PROPALE_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
@@ -142,15 +126,11 @@ elseif ($action == 'set_PROPALE_DRAFT_WATERMARK')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'set_PROPOSAL_FREE_TEXT')
-{
-	$freetext = GETPOST('PROPOSAL_FREE_TEXT', 'none'); // No alpha here, we want exact string
+} elseif ($action == 'set_PROPOSAL_FREE_TEXT') {
+	$freetext = GETPOST('PROPOSAL_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "PROPOSAL_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
@@ -159,14 +139,10 @@ elseif ($action == 'set_PROPOSAL_FREE_TEXT')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-elseif ($action == 'setdefaultduration')
-{
+} elseif ($action == 'setdefaultduration') {
 	$res = dolibarr_set_const($db, "PROPALE_VALIDITY_DURATION", $value, 'chaine', 0, '', $conf->entity);
 
 	if (!$res > 0) $error++;
@@ -174,59 +150,38 @@ elseif ($action == 'setdefaultduration')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL')
-{
+} 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);
 
     if (!$res > 0) $error++;
 
-    if (!$error)
-    {
+    if (!$error) {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-// Activate a model
-elseif ($action == 'set')
-{
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
         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))
-	{
+} elseif ($action == 'setdoc') {
+    if (dolibarr_set_const($db, "PROPALE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
 		$conf->global->PROPALE_ADDON_PDF = $value;
 	}
 
 	// On active le modele
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
@@ -310,10 +265,8 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->PROPALE_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -363,7 +316,7 @@ print load_fiche_titre($langs->trans("ProposalsPDFModules"), '', '');
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -376,9 +329,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -444,15 +395,13 @@ foreach ($dirmodels as $reldir)
 	                            if (in_array($name, $def))
 	                            {
 	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
+	                            	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
-	                            {
+	                            } else {
 	                                print "<td align=\"center\">\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	                                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>";
 	                            }
 
@@ -461,10 +410,8 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->PROPALE_ADDON_PDF == "$name")
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</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).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
 
@@ -496,9 +443,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -571,19 +516,14 @@ if (empty($conf->facture->enabled))
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				print "<i>".$langs->trans("NoActiveBankAccountDefined")."</i>";
 			}
 		}
-	}
-	else
-	{
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("BankModuleNotActive").'</span>';
 	}
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -620,8 +560,7 @@ if (empty($conf->facture->enabled))
 		}
 	}
 	print "</select>";
-}
-else {
+} else {
 	print '<span class="opacitymedium">'.$langs->trans("SeeSetupOfModule", $langs->transnoentitiesnoconv("Module30Name")).'</span>';
 }
 print "</td></tr>";
@@ -685,9 +624,7 @@ $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>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
@@ -724,11 +661,11 @@ if ($conf->banque->enabled)
     {
         if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL))
         {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_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_PROPOSAL&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
         }
     }
     print '</td></tr>';
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index bf1283daa6d..795cbec5ede 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -94,7 +94,7 @@ print '<input type="hidden" name="action" value="set_proxy">';
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'proxy', $langs->trans("Security"), -1);
+dol_fiche_head($head, 'proxy', '', -1);
 
 
 if ($conf->use_javascript_ajax)
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 3cb6c4d68d1..350d4a3dc15 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("admin", "receiptprinter"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
 
 $printername = GETPOST('printername', 'alpha');
@@ -53,16 +53,16 @@ if (!$mode) $mode = 'config';
 
 // used in library escpos maybe useful if php doesn't support gzdecode
 if (!function_exists('gzdecode')) {
-    /**
-     * Gzdecode
-     *
-     * @param string    $data   data to deflate
-     * @return string           data deflated
-     */
-    function gzdecode($data)
-    {
-        return gzinflate(substr($data, 10, -8));
-    }
+	/**
+	 * Gzdecode
+	 *
+	 * @param string    $data   data to deflate
+	 * @return string           data deflated
+	 */
+	function gzdecode($data)
+	{
+		return gzinflate(substr($data, 10, -8));
+	}
 }
 
 
@@ -71,171 +71,167 @@ if (!function_exists('gzdecode')) {
  */
 
 if ($action == 'addprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printername)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterNameEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printername)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterNameEmpty"), null, 'errors');
+	}
 
-    if (empty($parameter)) {
-        setEventMessages($langs->trans("PrinterParameterEmpty"), null, 'warnings');
-    }
+	if (empty($parameter)) {
+		setEventMessages($langs->trans("PrinterParameterEmpty"), null, 'warnings');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->addPrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->addPrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter);
+		if ($result > 0) $error++;
 
-        if (!$error)
-        {
-            $db->commit();
-            setEventMessages($langs->trans("PrinterAdded", $printername), null);
-        }
-        else
-        {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessages($langs->trans("PrinterAdded", $printername), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'deleteprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printerid)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printerid)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->deletePrinter($printerid);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->deletePrinter($printerid);
+		if ($result > 0) $error++;
 
-        if (!$error)
-        {
-            $db->commit();
-            setEventMessages($langs->trans("PrinterDeleted", $printername), null);
-        }
-        else
-        {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessages($langs->trans("PrinterDeleted", $printername), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'updateprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printerid)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printerid)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->updatePrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter, $printerid);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->updatePrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter, $printerid);
+		if ($result > 0) $error++;
 
-        if (!$error) {
-            $db->commit();
-            setEventMessages($langs->trans("PrinterUpdated", $printername), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error) {
+			$db->commit();
+			setEventMessages($langs->trans("PrinterUpdated", $printername), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'testprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printerid)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printerid)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-        // test
-        $ret = $printer->sendTestToPrinter($printerid);
-        if ($ret == 0) {
-            setEventMessages($langs->trans("TestSentToPrinter", $printername), null);
-        } else {
-            setEventMessages($printer->error, $printer->errors, 'errors');
-        }
-    }
-    $action = '';
+	if (!$error) {
+		// test
+		$ret = $printer->sendTestToPrinter($printerid);
+		if ($ret == 0) {
+			setEventMessages($langs->trans("TestSentToPrinter", $printername), null);
+		} else {
+			setEventMessages($printer->error, $printer->errors, 'errors');
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'testtemplate' && $user->admin) {
-    $error = 0;
-    // if (empty($printerid)) {
-    //     $error++;
-    //     setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    // }
+	$error = 0;
+	// if (empty($printerid)) {
+	//     $error++;
+	//     setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	// }
 
-    // if (! $error) {
+	// if (! $error) {
 	// test
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$object = new Facture($db);
 	//$object->initAsSpecimen();
 	$object->fetch(18);
 	//var_dump($object->lines);
-    $ret = $printer->sendToPrinter($object, $templateid, 1);
-    if ($ret == 0) {
-        setEventMessages($langs->trans("TestTemplateToPrinter", $printername), null);
-    } else {
-        setEventMessages($printer->error, $printer->errors, 'errors');
-    }
-    //}
-    $action = '';
+	$ret = $printer->sendToPrinter($object, $templateid, 1);
+	if ($ret == 0) {
+		setEventMessages($langs->trans("TestTemplateToPrinter", $printername), null);
+	} else {
+		setEventMessages($printer->error, $printer->errors, 'errors');
+	}
+	//}
+	$action = '';
 }
 
 if ($action == 'updatetemplate' && $user->admin) {
-    $error = 0;
-    if (empty($templateid)) {
-        $error++;
-        setEventMessages($langs->trans("TemplateIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($templateid)) {
+		$error++;
+		setEventMessages($langs->trans("TemplateIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->updateTemplate($templatename, $template, $templateid);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->updateTemplate($templatename, $template, $templateid);
+		if ($result > 0) $error++;
 
-        if (!$error) {
-            $db->commit();
-            setEventMessages($langs->trans("TemplateUpdated", $templatename), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error) {
+			$db->commit();
+			setEventMessages($langs->trans("TemplateUpdated", $templatename), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'addtemplate' && $user->admin) {
-    $error = 0;
-    if (empty($templatename)) {
-        $error++;
-        setEventMessages($langs->trans("TemplateNameEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($templatename)) {
+		$error++;
+		setEventMessages($langs->trans("TemplateNameEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->addTemplate($templatename, $template);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->addTemplate($templatename, $template);
+		if ($result > 0) $error++;
 
-        if (!$error) {
-            $db->commit();
-            setEventMessages($langs->trans("TemplateAdded", $templatename), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error) {
+			$db->commit();
+			setEventMessages($langs->trans("TemplateAdded", $templatename), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'deletetemplate' && $user->admin) {
@@ -277,116 +273,116 @@ $head = receiptprinteradmin_prepare_head($mode);
 
 // mode = config
 if ($mode == 'config' && $user->admin) {
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    if ($action != 'editprinter') {
-        print '<input type="hidden" name="action" value="addprinter">';
-    } else {
-        print '<input type="hidden" name="action" value="updateprinter">';
-    }
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if ($action != 'editprinter') {
+		print '<input type="hidden" name="action" value="addprinter">';
+	} else {
+		print '<input type="hidden" name="action" value="updateprinter">';
+	}
 
 
-    dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print '<span class="opacitymedium">'.$langs->trans("ReceiptPrinterDesc")."</span><br><br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("ReceiptPrinterDesc")."</span><br><br>\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Name").'</th>';
-    print '<th>'.$langs->trans("Type").'</th>';
-    print '<th>'.$langs->trans("Profile").'</th>';
-    print '<th>'.$langs->trans("Parameters").'</th>';
-    print '<th></th>';
-    print "</tr>\n";
-    $ret = $printer->listprinters();
-    $nbofprinters = count($printer->listprinters);
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Name").'</th>';
+	print '<th>'.$langs->trans("Type").'</th>';
+	print '<th>'.$langs->trans("Profile").'</th>';
+	print '<th>'.$langs->trans("Parameters").'</th>';
+	print '<th></th>';
+	print "</tr>\n";
+	$ret = $printer->listprinters();
+	$nbofprinters = count($printer->listprinters);
 
-    if ($action != 'editprinter') {
-    	print '<tr>';
-    	print '<td><input size="50" type="text" name="printername"></td>';
-    	$ret = $printer->selectTypePrinter();
-    	print '<td>'.$printer->resprint.'</td>';
-    	$ret = $printer->selectProfilePrinter();
-    	print '<td>'.$printer->profileresprint.'</td>';
-    	print '<td><input size="60" type="text" name="parameter"></td>';
-    	print '<td class="right">';
-    	if ($action != 'editprinter') {
-    		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
-    	}
-    	print '</td>';
-    	print '</tr>';
-    }
+	if ($action != 'editprinter') {
+		print '<tr>';
+		print '<td><input size="50" type="text" name="printername"></td>';
+		$ret = $printer->selectTypePrinter();
+		print '<td>'.$printer->resprint.'</td>';
+		$ret = $printer->selectProfilePrinter();
+		print '<td>'.$printer->profileresprint.'</td>';
+		print '<td><input size="60" type="text" name="parameter"></td>';
+		print '<td class="right">';
+		if ($action != 'editprinter') {
+			print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
+		}
+		print '</td>';
+		print '</tr>';
+	}
 
-    if ($ret > 0) {
-        setEventMessages($printer->error, $printer->errors, 'errors');
-    } else {
-        for ($line = 0; $line < $nbofprinters; $line++) {
-            print '<tr class="oddeven">';
-            if ($action == 'editprinter' && $printer->listprinters[$line]['rowid'] == $printerid) {
-                print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
-                print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
-                $ret = $printer->selectTypePrinter($printer->listprinters[$line]['fk_type']);
-                print '<td>'.$printer->resprint.'</td>';
-                $ret = $printer->selectProfilePrinter($printer->listprinters[$line]['fk_profile']);
-                print '<td>'.$printer->profileresprint.'</td>';
-                print '<td><input size="60" type="text" name="parameter" value="'.$printer->listprinters[$line]['parameter'].'"></td>';
-                print '<td>';
-                print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
-                print '</td>';
-                print '</tr>';
-            } else {
-                print '<td>'.$printer->listprinters[$line]['name'].'</td>';
-                print '<td>'.$langs->trans($printer->listprinters[$line]['fk_type_name']).'</td>';
-                print '<td>'.$langs->trans($printer->listprinters[$line]['fk_profile_name']).'</td>';
-                print '<td>'.$printer->listprinters[$line]['parameter'].'</td>';
-                // edit icon
-                print '<td class="right"><a class="editfielda marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
-                print img_picto($langs->trans("Edit"), 'edit');
-                print '</a>';
-                // delete icon
-                print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=deleteprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
-                print img_picto($langs->trans("Delete"), 'delete');
-                print '</a>';
-                // test icon
-                print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=testprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
-                print img_picto($langs->trans("TestPrinter"), 'printer');
-                print '</a></td>';
-                print '</tr>';
-            }
-        }
-    }
+	if ($ret > 0) {
+		setEventMessages($printer->error, $printer->errors, 'errors');
+	} else {
+		for ($line = 0; $line < $nbofprinters; $line++) {
+			print '<tr class="oddeven">';
+			if ($action == 'editprinter' && $printer->listprinters[$line]['rowid'] == $printerid) {
+				print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
+				print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
+				$ret = $printer->selectTypePrinter($printer->listprinters[$line]['fk_type']);
+				print '<td>'.$printer->resprint.'</td>';
+				$ret = $printer->selectProfilePrinter($printer->listprinters[$line]['fk_profile']);
+				print '<td>'.$printer->profileresprint.'</td>';
+				print '<td><input size="60" type="text" name="parameter" value="'.$printer->listprinters[$line]['parameter'].'"></td>';
+				print '<td>';
+				print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+				print '</td>';
+				print '</tr>';
+			} else {
+				print '<td>'.$printer->listprinters[$line]['name'].'</td>';
+				print '<td>'.$langs->trans($printer->listprinters[$line]['fk_type_name']).'</td>';
+				print '<td>'.$langs->trans($printer->listprinters[$line]['fk_profile_name']).'</td>';
+				print '<td>'.$printer->listprinters[$line]['parameter'].'</td>';
+				// edit icon
+				print '<td class="right"><a class="editfielda marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
+				print img_picto($langs->trans("Edit"), 'edit');
+				print '</a>';
+				// delete icon
+				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=deleteprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+				print img_picto($langs->trans("Delete"), 'delete');
+				print '</a>';
+				// test icon
+				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=testprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+				print img_picto($langs->trans("TestPrinter"), 'printer');
+				print '</a></td>';
+				print '</tr>';
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    print '</form>';
+	print '</form>';
 
-    print '<br>';
+	print '<br>';
 
 
-    print load_fiche_titre($langs->trans("ReceiptPrinterTypeDesc"), '', '')."\n";
+	print load_fiche_titre($langs->trans("ReceiptPrinterTypeDesc"), '', '')."\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_DUMMY").':</td><td>'.$langs->trans("CONNECTOR_DUMMY_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT").':</td><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_FILE_PRINT").':</td><td>'.$langs->trans("CONNECTOR_FILE_PRINT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_CUPS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_CUPS_PRINT_HELP").'</td></tr>';
-    print '</table>';
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_DUMMY").':</td><td>'.$langs->trans("CONNECTOR_DUMMY_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT").':</td><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_FILE_PRINT").':</td><td>'.$langs->trans("CONNECTOR_FILE_PRINT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_CUPS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_CUPS_PRINT_HELP").'</td></tr>';
+	print '</table>';
 
-    print '<br>';
+	print '<br>';
 
 
-    print load_fiche_titre($langs->trans("ReceiptPrinterProfileDesc"), '', '')."\n";
+	print load_fiche_titre($langs->trans("ReceiptPrinterProfileDesc"), '', '')."\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_DEFAULT").':</td><td>'.$langs->trans("PROFILE_DEFAULT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_SIMPLE").':</td><td>'.$langs->trans("PROFILE_SIMPLE_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_EPOSTEP").':</td><td>'.$langs->trans("PROFILE_EPOSTEP_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_P822D").':</td><td>'.$langs->trans("PROFILE_P822D_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_STAR").':</td><td>'.$langs->trans("PROFILE_STAR_HELP").'</td></tr>';
-    print '</table>';
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_DEFAULT").':</td><td>'.$langs->trans("PROFILE_DEFAULT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_SIMPLE").':</td><td>'.$langs->trans("PROFILE_SIMPLE_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_EPOSTEP").':</td><td>'.$langs->trans("PROFILE_EPOSTEP_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_P822D").':</td><td>'.$langs->trans("PROFILE_P822D_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_STAR").':</td><td>'.$langs->trans("PROFILE_STAR_HELP").'</td></tr>';
+	print '</table>';
 }
 
 // mode = template
@@ -394,56 +390,56 @@ if ($mode == 'template' && $user->admin) {
 	dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=template" autocomplete="off">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    if ($action != 'edittemplate') {
-        print '<input type="hidden" name="action" value="addtemplate">';
-    } else {
-        print '<input type="hidden" name="action" value="updatetemplate">';
-    }
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if ($action != 'edittemplate') {
+		print '<input type="hidden" name="action" value="addtemplate">';
+	} else {
+		print '<input type="hidden" name="action" value="updatetemplate">';
+	}
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Name").'</th>';
-    print '<th>'.$langs->trans("Template").'</th>';
-    print '<th></th>';
-    print "</tr>\n";
-    $ret = $printer->listPrintersTemplates();
-    //print '<pre>'.print_r($printer->listprinterstemplates, true).'</pre>';
-    if ($ret > 0) {
-        setEventMessages($printer->error, $printer->errors, 'errors');
-    } else {
-        $max = count($printer->listprinterstemplates);
-        for ($line = 0; $line < $max; $line++) {
-            print '<tr class="oddeven">';
-            if ($action == 'edittemplate' && $printer->listprinterstemplates[$line]['rowid'] == $templateid) {
-                print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
-                print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
-                print '<td>';
-                print '<textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
-                print '</td>';
-                print '<td></td>';
-            } else {
-                print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
-                print '<td>'.nl2br(htmlentities($printer->listprinterstemplates[$line]['template'])).'</td>';
-                // edit icon
-                print '<td><a class="editfielda paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=edittemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
-                print img_picto($langs->trans("Edit"), 'edit');
-                print '</a>';
-                // delete icon
-                print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
-                print img_picto($langs->trans("Delete"), 'delete');
-                print '</a>';
-                // test icon
-                print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
-                print img_picto($langs->trans("TestPrinterTemplate"), 'printer');
-                print '</a></td>';
-            }
-            print '</tr>';
-        }
-    }
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Name").'</th>';
+	print '<th>'.$langs->trans("Template").'</th>';
+	print '<th></th>';
+	print "</tr>\n";
+	$ret = $printer->listPrintersTemplates();
+	//print '<pre>'.print_r($printer->listprinterstemplates, true).'</pre>';
+	if ($ret > 0) {
+		setEventMessages($printer->error, $printer->errors, 'errors');
+	} else {
+		$max = count($printer->listprinterstemplates);
+		for ($line = 0; $line < $max; $line++) {
+			print '<tr class="oddeven">';
+			if ($action == 'edittemplate' && $printer->listprinterstemplates[$line]['rowid'] == $templateid) {
+				print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
+				print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
+				print '<td>';
+				print '<textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
+				print '</td>';
+				print '<td></td>';
+			} else {
+				print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
+				print '<td>'.nl2br(htmlentities($printer->listprinterstemplates[$line]['template'])).'</td>';
+				// edit icon
+				print '<td><a class="editfielda paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=edittemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
+				print img_picto($langs->trans("Edit"), 'edit');
+				print '</a>';
+				// delete icon
+				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
+				print img_picto($langs->trans("Delete"), 'delete');
+				print '</a>';
+				// test icon
+				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
+				print img_picto($langs->trans("TestPrinterTemplate"), 'printer');
+				print '</a></td>';
+			}
+			print '</tr>';
+		}
+	}
 
-    if ($action != 'edittemplate') {
-    	print '<tr>';
+	if ($action != 'edittemplate') {
+		print '<tr>';
 		print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
 		print '<td>';
 		print '<textarea name="template" wrap="soft" cols="120" rows="12">';
@@ -452,35 +448,35 @@ if ($mode == 'template' && $user->admin) {
 		print '</td>';
 		print '<td></td>';
 		print '</tr>';
-    }
+	}
 
-    print '</table>';
+	print '</table>';
 
-    if ($action != 'edittemplate') {
+	if ($action != 'edittemplate') {
 		print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
 		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
-    } else {
-        print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
-    }
-    print '</form>';
+	} else {
+		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+	}
+	print '</form>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Tag").'</th>';
-    print '<th>'.$langs->trans("Description").'</th>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Tag").'</th>';
+	print '<th>'.$langs->trans("Description").'</th>';
+	print "</tr>\n";
 
-    $langs->loadLangs(array("bills", "companies"));
-    foreach ($printer->tags as $key => $val) {
-        print '<tr class="oddeven">';
-        print '<td>&lt;'.$key.'&gt;</td><td>'.$langs->trans($val).'</td>';
-        print '</tr>';
-    }
-    print '</table>';
+	$langs->loadLangs(array("bills", "companies"));
+	foreach ($printer->tags as $key => $val) {
+		print '<tr class="oddeven">';
+		print '<td>&lt;'.$key.'&gt;</td><td>'.$langs->trans($val).'</td>';
+		print '</tr>';
+	}
+	print '</table>';
 }
 
 // End of page
diff --git a/htdocs/admin/reception_extrafields.php b/htdocs/admin/reception_extrafields.php
index ce5cbcd7179..d9babd5d95b 100644
--- a/htdocs/admin/reception_extrafields.php
+++ b/htdocs/admin/reception_extrafields.php
@@ -50,7 +50,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->trans($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'reception'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 312038d3fcc..f84d9a3a7f9 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array("admin", "receptions", 'other'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -45,13 +45,13 @@ $type = 'reception';
 
 if (!empty($conf->reception->enabled) && empty($conf->global->MAIN_SUBMODULE_RECEPTION))
 {
-    // This option should always be set to on when module is on.
-    dolibarr_set_const($db, "MAIN_SUBMODULE_RECEPTION", "1", 'chaine', 0, '', $conf->entity);
+	// This option should always be set to on when module is on.
+	dolibarr_set_const($db, "MAIN_SUBMODULE_RECEPTION", "1", 'chaine', 0, '', $conf->entity);
 }
 
 if (empty($conf->global->RECEPTION_ADDON_NUMBER))
 {
-    $conf->global->RECEPTION_ADDON_NUMBER = 'mod_reception_beryl';
+	$conf->global->RECEPTION_ADDON_NUMBER = 'mod_reception_beryl';
 }
 
 
@@ -72,14 +72,11 @@ if ($action == 'updateMask')
 	{
 		if ($res > 0)
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("Error"), null, 'errors');
+		else setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'set_param')
+} elseif ($action == 'set_param')
 {
-	$freetext = GETPOST('RECEPTION_FREE_TEXT', 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST('RECEPTION_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 	$res = dolibarr_set_const($db, "RECEPTION_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 	if ($res <= 0)
 	{
@@ -99,9 +96,7 @@ elseif ($action == 'set_param')
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -113,7 +108,7 @@ elseif ($action == 'specimen')
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 	foreach ($dirmodels as $reldir)
 	{
-	    $file = dol_buildpath($reldir."core/modules/reception/doc/pdf_".$modele.".modules.php", 0);
+		$file = dol_buildpath($reldir."core/modules/reception/doc/pdf_".$modele.".modules.php", 0);
 		if (file_exists($file))
 		{
 			$filefound = 1;
@@ -132,15 +127,11 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=reception&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -150,14 +141,12 @@ elseif ($action == 'specimen')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
 	{
-        if ($conf->global->RECEPTION_ADDON_PDF == "$value") dolibarr_del_const($db, 'RECEPTION_ADDON_PDF', $conf->entity);
+		if ($conf->global->RECEPTION_ADDON_PDF == "$value") dolibarr_del_const($db, 'RECEPTION_ADDON_PDF', $conf->entity);
 	}
 }
 
@@ -177,9 +166,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmodel')
+} elseif ($action == 'setmodel')
 {
 	dolibarr_set_const($db, "RECEPTION_ADDON_NUMBER", $value, 'chaine', 0, '', $conf->entity);
 }
@@ -249,24 +236,21 @@ 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)) {
+						// 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";
+						} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+						else print $tmp;
+						print '</td>'."\n";
 
 						print '<td class="center">';
 						if ($conf->global->RECEPTION_ADDON_NUMBER == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;value='.$file.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&amp;token='.newToken().'&amp;value='.urlencode($file).'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -279,16 +263,16 @@ foreach ($dirmodels as $reldir)
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$nextval = $module->getNextValue($mysoc, $reception);
-                        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);
@@ -317,7 +301,7 @@ $def = array();
 
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 
 $resql = $db->query($sql);
@@ -331,9 +315,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -351,116 +333,110 @@ clearstatcache();
 
 foreach ($dirmodels as $reldir)
 {
-    foreach (array('', '/doc') as $valdir)
-    {
-    	$realpath = $reldir."core/modules/reception".$valdir;
-    	$dir = dol_buildpath($realpath);
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/reception".$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><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><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&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 class="reposition" 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 class="center">'."\n";
+									print '<a class="reposition" 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->RECEPTION_ADDON_PDF == $name)
-	                            {
-	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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->RECEPTION_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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>'.$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);
+								$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>';
+								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.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').'</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.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').'</a>';
+								} else {
+									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+								}
+								print '</td>';
 
-	                            print "</tr>\n";
-	                        }
-                    	}
-                    }
-                }
-            }
-        }
-    }
+								print "</tr>\n";
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 }
 
 print '</table>';
@@ -511,7 +487,7 @@ print "</td></tr>\n";
 */
 print '</table>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+//print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index c700c2c9cf1..b57e41ddfd4 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("admin", "resource"));
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -91,9 +91,7 @@ if (empty($conf->use_javascript_ajax))
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print '</td>';
-}
-else
-{
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array(
 			'0'=>$langs->trans("No"),
diff --git a/htdocs/admin/resource_extrafields.php b/htdocs/admin/resource_extrafields.php
index 57eaa0d245c..61b0bf900df 100644
--- a/htdocs/admin/resource_extrafields.php
+++ b/htdocs/admin/resource_extrafields.php
@@ -44,7 +44,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'resource'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index d9d61673c5e..f25cdf25958 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -45,9 +45,7 @@ if ($action == 'setgeneraterule')
 	if (!dolibarr_set_const($db, 'USER_PASSWORD_GENERATED', $_GET["value"], 'chaine', 0, '', $conf->entity))
 	{
 		dol_print_error($db);
-	}
-	else
-	{
+	} else {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	}
@@ -91,8 +89,7 @@ if ($action == 'activate_encrypt')
                 $i++;
             }
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 
 	//print $error." ".$sql;
     //exit;
@@ -101,14 +98,11 @@ if ($action == 'activate_encrypt')
 		$db->commit();
 		header("Location: security.php");
 	    exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db, '');
 	}
-}
-elseif ($action == 'disable_encrypt')
+} elseif ($action == 'disable_encrypt')
 {
 	//On n'autorise pas l'annulation de l'encryption car les mots de passe ne peuvent pas etre decodes
 	//Do not allow "disable encryption" as passwords cannot be decrypted
@@ -131,13 +125,10 @@ if ($action == 'activate_encryptdbpassconf')
 		//dolibarr_set_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED", "1");
 		header("Location: security.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('InstrucToEncodePass', dol_encode($dolibarr_main_db_pass)), null, 'warnings');
 	}
-}
-elseif ($action == 'disable_encryptdbpassconf')
+} elseif ($action == 'disable_encryptdbpassconf')
 {
 	$result = encodedecode_dbpassconf(0);
 	if ($result > 0)
@@ -148,9 +139,7 @@ elseif ($action == 'disable_encryptdbpassconf')
 		//dolibarr_del_const($db, "MAIN_DATABASE_PWD_CONFIG_ENCRYPTED",$conf->entity);
 		header("Location: security.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('InstrucToClearPass', $dolibarr_main_db_pass), null, 'warnings');
 	}
 }
@@ -160,8 +149,7 @@ if ($action == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 	dolibarr_set_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", '1', 'chaine', 0, '', $conf->entity);
 	header("Location: security.php");
 	exit;
-}
-elseif ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
+} elseif ($action == 'disable_MAIN_SECURITY_DISABLEFORGETPASSLINK')
 {
 	dolibarr_del_const($db, "MAIN_SECURITY_DISABLEFORGETPASSLINK", $conf->entity);
 	header("Location: security.php");
@@ -209,7 +197,7 @@ print "<br>\n";
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'passwords', $langs->trans("Security"), -1);
+dol_fiche_head($head, 'passwords', '', -1);
 
 
 // Choix du gestionnaire du generateur de mot de passe
@@ -268,8 +256,7 @@ foreach ($arrayhandler as $key => $module)
         // 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);
+        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";
 
@@ -277,10 +264,8 @@ foreach ($arrayhandler as $key => $module)
         if ($conf->global->USER_PASSWORD_GENERATED == $key)
         {
             print img_picto('', 'tick');
-        }
-        else
-        {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
+        } else {
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=setgeneraterule&amp;token='.newToken().'&amp;value='.$key.'">'.$langs->trans("Activate").'</a>';
         }
         print "</td></tr>\n";
 	}
@@ -435,9 +420,7 @@ if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 		//On n'autorise pas l'annulation de l'encryption car les mots de passe ne peuvent pas etre decodes
 	  	//Do not allow "disable encryption" as passwords cannot be decrypted
 	  	print '<a href="security.php?action=disable_encrypt">'.$langs->trans("Disable").'</a>';
-	}
-	else
-	{
+	} else {
 		print '-';
 	}
 	print "</td>";
@@ -462,9 +445,7 @@ if (empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass))
 {
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningPassIsEmpty"));
-}
-else
-{
+} else {
 	if (empty($dolibarr_main_db_encrypted_pass))
 	{
 		print '<a href="security.php?action=activate_encryptdbpassconf">'.$langs->trans("Activate").'</a>';
@@ -515,9 +496,7 @@ 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
-    {
+    } 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";
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 0f3c5e4a851..a2e97b45869 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array('users', 'admin', 'other'));
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $upload_dir = $conf->admin->dir_temp;
 
@@ -45,15 +45,15 @@ $upload_dir = $conf->admin->dir_temp;
 
 if (GETPOST('sendit') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    dol_add_file_process($upload_dir, 0, 0, 'userfile');
+	dol_add_file_process($upload_dir, 1, 0, 'userfile');
 }
 
 if ($action == 'updateform')
 {
-	$antivircommand = GETPOST('MAIN_ANTIVIRUS_COMMAND', 'none'); // Use GETPOST none because we must accept ". Example c:\Progra~1\ClamWin\bin\clamscan.exe
-	$antivirparam = GETPOST('MAIN_ANTIVIRUS_PARAM', 'none'); // Use GETPOST none because we must accept ". Example --database="C:\Program Files (x86)\ClamWin\lib"
+	$antivircommand = GETPOST('MAIN_ANTIVIRUS_COMMAND', 'restricthtml'); // Use GETPOST restricthtml because we must accept ". Example c:\Progra~1\ClamWin\bin\clamscan.exe
+	$antivirparam = GETPOST('MAIN_ANTIVIRUS_PARAM', 'restricthtml'); // Use GETPOST restricthtml because we must accept ". Example --database="C:\Program Files (x86)\ClamWin\lib"
 	$antivircommand = dol_string_nospecial($antivircommand, '', array("|", ";", "<", ">", "&")); // Sanitize command
 	$antivirparam = dol_string_nospecial($antivirparam, '', array("|", ";", "<", ">", "&")); // Sanitize params
 
@@ -100,7 +100,7 @@ print '<input type="hidden" name="action" value="updateform">';
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'file', $langs->trans("Security"), -1);
+dol_fiche_head($head, 'file', '', -1);
 
 
 // Upload options
@@ -144,16 +144,19 @@ print '</td>';
 print '<td>';
 if (ini_get('safe_mode') && !empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 {
-    $langs->load("errors");
-    $basedir = preg_replace('/"/', '', dirname($conf->global->MAIN_ANTIVIRUS_COMMAND));
-    $listdir = explode(';', ini_get('safe_mode_exec_dir'));
-    if (!in_array($basedir, $listdir))
-    {
-        print img_warning($langs->trans('WarningSafeModeOnCheckExecDir'));
-        dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
-    }
+	$langs->load("errors");
+	$basedir = preg_replace('/"/', '', dirname($conf->global->MAIN_ANTIVIRUS_COMMAND));
+	$listdir = explode(';', ini_get('safe_mode_exec_dir'));
+	if (!in_array($basedir, $listdir))
+	{
+		print img_warning($langs->trans('WarningSafeModeOnCheckExecDir'));
+		dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
+	}
 }
 print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
+if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+	print '<br><span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
+}
 print "</td>";
 print '</tr>';
 
@@ -165,6 +168,9 @@ print '<span class="opacitymedium">'.$langs->trans("AntiVirusParamExample").'</s
 print '</td>';
 print '<td>';
 print '<input type="text" name="MAIN_ANTIVIRUS_PARAM" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_PARAM) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_PARAM) : '').'">';
+if (defined('MAIN_ANTIVIRUS_PARAM')) {
+	print '<br><span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
+}
 print "</td>";
 print '</tr>';
 
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index f642cd64182..4eb6af14843 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("users", "admin", "other"));
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 
@@ -50,9 +50,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 } elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
@@ -61,14 +59,10 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-
-elseif ($action == 'updateform')
+} elseif ($action == 'updateform')
 {
 	$res1 = dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", GETPOST("MAIN_APPLICATION_TITLE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	$res2 = dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", GETPOST("MAIN_SESSION_TIMEOUT", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
@@ -99,7 +93,7 @@ print '<input type="hidden" name="action" value="updateform">';
 
 $head = security_prepare_head();
 
-dol_fiche_head($head, 'misc', $langs->trans("Security"), -1);
+dol_fiche_head($head, 'misc', '', -1);
 
 
 // Other Options
@@ -118,21 +112,15 @@ if (function_exists("imagecreatefrompng"))
 	if (!empty($conf->use_javascript_ajax))
 	{
 		print ajax_constantonoff('MAIN_SECURITY_ENABLECAPTCHA');
-	}
-	else
-	{
+	} else {
 		if (empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
 		{
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		}
-		else
-		{
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_SECURITY_ENABLECAPTCHA">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_SECURITY_ENABLECAPTCHA&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_SECURITY_ENABLECAPTCHA&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		}
 	}
-}
-else
-{
+} else {
     $desc = $form->textwithpicto('', $langs->transnoentities("EnableGDLibraryDesc"), 1, 'warning');
     print $desc;
 }
@@ -145,16 +133,12 @@ print '<td class="right">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('MAIN_USE_ADVANCED_PERMS');
-}
-else
-{
+} else {
 	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_USE_ADVANCED_PERMS">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MAIN_USE_ADVANCED_PERMS&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MAIN_USE_ADVANCED_PERMS&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print "</td></tr>";
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 09cc0debfd5..e09304a4921 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -52,7 +52,7 @@ if ($action == 'update' && !$cancel)
 {
 	dolibarr_set_const($db, "MAIN_DISABLE_ALL_SMS", GETPOST("MAIN_DISABLE_ALL_SMS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_SMS_SENDMODE", GETPOST("MAIN_SMS_SENDMODE", 'alphahtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_SMS_SENDMODE", GETPOST("MAIN_SMS_SENDMODE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "MAIN_MAIL_SMS_FROM", GETPOST("MAIN_MAIL_SMS_FROM", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
@@ -122,9 +122,7 @@ if ($action == 'send' && !$_POST['cancel'])
 		{
 			setEventMessages($langs->trans("SmsSuccessfulySent", $smsfrom, $sendto), null, 'mesgs');
 			setEventMessages($smsfile->error, $smsfile->errors, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ResultKo"), null, 'errors');
 			setEventMessages($smsfile->error, $smsfile->errors, 'errors');
 		}
@@ -205,9 +203,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else
-{
+} else {
 	if (!count($listofmethods)) print '<div class="warning">'.$langs->trans("NoSmsEngine", '<a target="_blank" href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=smsmanager">DoliStore</a>').'</div>';
 
 	print '<table class="noborder centpercent">';
@@ -264,9 +260,7 @@ else
 	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>';
-	}
-	else
-	{
+	} else {
         print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("DoTestSend").'</a>';
 	}
 	print '</div>';
@@ -306,12 +300,12 @@ else
 		$formsms = new FormSms($db);
         $formsms->fromtype = 'user';
         $formsms->fromid = $user->id;
-        $formsms->fromsms = (isset($_POST['fromsms']) ? $_POST['fromsms'] : ($conf->global->MAIN_MAIL_SMS_FROM ? $conf->global->MAIN_MAIL_SMS_FROM : $user->user_mobile));
+        $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;
-		$formsms->withto = (isset($_POST['sendto']) ? $_POST['sendto'] : $user->user_mobile ? $user->user_mobile : 1);
-		$formsms->withbody = (isset($_POST['message']) ? (empty($_POST['message']) ? 1 : $_POST['message']) : $langs->trans("ThisIsATestMessage"));
+		$formsms->withto = (GETPOSTISSET('sendto') ? $_POST['sendto'] : ($user->user_mobile ? $user->user_mobile : 1));
+		$formsms->withbody = (GETPOSTISSET('message') ? (empty($_POST['message']) ? 1 : $_POST['message']) : $langs->trans("ThisIsATestMessage"));
 		$formsms->withbodyreadonly = 0;
 		$formsms->withcancel = 1;
 		// Tableau des substitutions
diff --git a/htdocs/admin/socialnetworks.php b/htdocs/admin/socialnetworks.php
index d2a92aed9e8..b848dccd998 100644
--- a/htdocs/admin/socialnetworks.php
+++ b/htdocs/admin/socialnetworks.php
@@ -48,9 +48,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -62,9 +60,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php
index 2ed43e97efd..ca44caac258 100644
--- a/htdocs/admin/spip.php
+++ b/htdocs/admin/spip.php
@@ -73,9 +73,7 @@ if ($action == 'update' || $action == 'add')
      	if (!$error)
         {
             setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-        }
-        else
-        {
+        } else {
             setEventMessages($langs->trans("Error"), null, 'errors');
         }
     }
@@ -131,7 +129,7 @@ if (!empty($conf->global->ADHERENT_USE_SPIP))
 	dol_fiche_head($head, 'spip', $langs->trans("Setup"), -1, 'user');
 
     //$link=img_picto($langs->trans("Active"),'tick').' ';
-    $link = '<a href="'.$_SERVER["PHP_SELF"].'?action=unset&value=0&name=ADHERENT_USE_SPIP">';
+    $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>';
@@ -153,12 +151,10 @@ if (!empty($conf->global->ADHERENT_USE_SPIP))
     print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
 
     print '</form>';
-}
-else
-{
+} else {
     dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user');
 
-    $link = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&value=1&name=ADHERENT_USE_SPIP">';
+    $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>';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 3ae74ca0609..20b1252456e 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -23,11 +23,12 @@
 /**
  *	\file       htdocs/admin/stock.php
  *	\ingroup    stock
- *	\brief      Page d'administration/configuration du module gestion de stock
+ *	\brief      Page to setup module stock
  */
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "stocks"));
@@ -35,7 +36,11 @@ $langs->loadLangs(array("admin", "stocks"));
 // Securit check
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'stock';
 
 
 /*
@@ -46,52 +51,132 @@ $reg = array();
 
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code = $reg[1];
+	$code = $reg[1];
 
-    // If constant is for a unique choice, delete other choices
-    if (in_array($code, array('STOCK_CALCULATE_ON_BILL', 'STOCK_CALCULATE_ON_VALIDATE_ORDER', 'STOCK_CALCULATE_ON_SHIPMENT', 'STOCK_CALCULATE_ON_SHIPMENT_CLOSE'))) {
-    	dolibarr_del_const($db, 'STOCK_CALCULATE_ON_BILL', $conf->entity);
-    	dolibarr_del_const($db, 'STOCK_CALCULATE_ON_VALIDATE_ORDER', $conf->entity);
-    	dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SHIPMENT', $conf->entity);
-    	dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SHIPMENT_CLOSE', $conf->entity);
-    }
-    if (in_array($code, array('STOCK_CALCULATE_ON_SUPPLIER_BILL', 'STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER', 'STOCK_CALCULATE_ON_RECEPTION', 'STOCK_CALCULATE_ON_RECEPTION_CLOSE', 'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER'))) {
-    	dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SUPPLIER_BILL', $conf->entity);
-    	dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER', $conf->entity);
-    	dolibarr_del_const($db, 'STOCK_CALCULATE_ON_RECEPTION', $conf->entity);
-    	dolibarr_del_const($db, 'STOCK_CALCULATE_ON_RECEPTION_CLOSE', $conf->entity);
-    	dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER', $conf->entity);
-    }
+	// If constant is for a unique choice, delete other choices
+	if (in_array($code, array('STOCK_CALCULATE_ON_BILL', 'STOCK_CALCULATE_ON_VALIDATE_ORDER', 'STOCK_CALCULATE_ON_SHIPMENT', 'STOCK_CALCULATE_ON_SHIPMENT_CLOSE'))) {
+		dolibarr_del_const($db, 'STOCK_CALCULATE_ON_BILL', $conf->entity);
+		dolibarr_del_const($db, 'STOCK_CALCULATE_ON_VALIDATE_ORDER', $conf->entity);
+		dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SHIPMENT', $conf->entity);
+		dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SHIPMENT_CLOSE', $conf->entity);
+	}
+	if (in_array($code, array('STOCK_CALCULATE_ON_SUPPLIER_BILL', 'STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER', 'STOCK_CALCULATE_ON_RECEPTION', 'STOCK_CALCULATE_ON_RECEPTION_CLOSE', 'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER'))) {
+		dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SUPPLIER_BILL', $conf->entity);
+		dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER', $conf->entity);
+		dolibarr_del_const($db, 'STOCK_CALCULATE_ON_RECEPTION', $conf->entity);
+		dolibarr_del_const($db, 'STOCK_CALCULATE_ON_RECEPTION_CLOSE', $conf->entity);
+		dolibarr_del_const($db, 'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER', $conf->entity);
+	}
 
-    if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-    {
-    	header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	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);
+	}
 }
 
+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)){
+		$res = dolibarr_del_const($db, "MAIN_DEFAULT_WAREHOUSE", $conf->entity);
+	}
+	if (!$res > 0) $error++;
+}
+
+if ($action == 'specimen')
+{
+	$modele = GETPOST('module', 'alpha');
+
+	$object = new Entrepot($db);
+	$object->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/stock/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($object, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=stock&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+// Activate a model
+elseif ($action == 'set') {
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del') {
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		if ($conf->global->STOCK_ADDON_PDF == "$value") dolibarr_del_const($db, 'STOCK_ADDON_PDF', $conf->entity);
+	}
+}
+
+// Set default model
+elseif ($action == 'setdoc')
+{
+	if (dolibarr_set_const($db, "STOCK_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
+	{
+		// The constant that was read before the new set
+		// We therefore requires a variable to have a coherent view
+		$conf->global->STOCK_ADDON_PDF = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+}
+
+
 /*
  * View
  */
 
+$form = new Form($db);
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
 llxHeader('', $langs->trans("StockSetup"));
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -102,6 +187,8 @@ $head = stock_admin_prepare_head();
 dol_fiche_head($head, 'general', $langs->trans("StockSetup"), -1, 'stock');
 
 $form = new Form($db);
+$formproduct = new FormProduct($db);
+
 
 
 $disabled = '';
@@ -118,6 +205,11 @@ print info_admin($langs->trans("IfYouUsePointOfSaleCheckModule"));
 print '<br>';
 //}
 
+
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="warehouse">';
+
 // Title rule for stock decrease
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -132,16 +224,14 @@ print '<td>'.$langs->trans("DeStockOnBill").'</td>';
 print '<td class="right">';
 if (!empty($conf->facture->enabled))
 {
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('STOCK_CALCULATE_ON_BILL', array(), null, 0, 0, 0, 2, 1);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_CALCULATE_ON_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_BILL);
-    }
-}
-else
-{
-    print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module30Name"));
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_CALCULATE_ON_BILL', array(), null, 0, 0, 0, 2, 1);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_CALCULATE_ON_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_BILL);
+	}
+} else {
+	print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module30Name"));
 }
 print "</td>\n</tr>\n";
 $found++;
@@ -152,16 +242,14 @@ print '<td>'.$langs->trans("DeStockOnValidateOrder").'</td>';
 print '<td class="right">';
 if (!empty($conf->commande->enabled))
 {
-    if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('STOCK_CALCULATE_ON_VALIDATE_ORDER', array(), null, 0, 0, 0, 2, 1);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_CALCULATE_ON_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER);
-    }
-}
-else
-{
-    print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module25Name"));
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_CALCULATE_ON_VALIDATE_ORDER', array(), null, 0, 0, 0, 2, 1);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_CALCULATE_ON_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER);
+	}
+} else {
+	print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module25Name"));
 }
 print "</td>\n</tr>\n";
 $found++;
@@ -174,16 +262,14 @@ print '<td>'.$langs->trans("DeStockOnShipment").'</td>';
 print '<td class="right">';
 if (!empty($conf->expedition->enabled))
 {
-    if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT', array(), null, 0, 0, 0, 2, 1);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT);
-    }
-}
-else
-{
-    print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT', array(), null, 0, 0, 0, 2, 1);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT);
+	}
+} else {
+	print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
 }
 print "</td>\n</tr>\n";
 $found++;
@@ -194,16 +280,14 @@ print '<td>'.$langs->trans("DeStockOnShipmentOnClosing").'</td>';
 print '<td class="right">';
 if (!empty($conf->expedition->enabled))
 {
-    if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT_CLOSE', array(), null, 0, 0, 0, 2, 1);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE);
-    }
-}
-else
-{
-    print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT_CLOSE', array(), null, 0, 0, 0, 2, 1);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE);
+	}
+} else {
+	print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module80Name"));
 }
 print "</td>\n</tr>\n";
 $found++;
@@ -228,16 +312,14 @@ print '<td>'.$langs->trans("ReStockOnBill").'</td>';
 print '<td class="right">';
 if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 {
-    if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_BILL', array(), null, 0, 0, 0, 2, 1);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL);
-    }
-}
-else
-{
-    print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_BILL', array(), null, 0, 0, 0, 2, 1);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL);
+	}
+} else {
+	print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 }
 print "</td>\n</tr>\n";
 $found++;
@@ -249,16 +331,14 @@ print '<td>'.$langs->trans("ReStockOnValidateOrder").'</td>';
 print '<td class="right">';
 if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 {
-    if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER', array(), null, 0, 0, 0, 2, 1);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER);
-    }
-}
-else
-{
-    print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER', array(), null, 0, 0, 0, 2, 1);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER);
+	}
+} else {
+	print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 }
 print "</td>\n</tr>\n";
 $found++;
@@ -267,62 +347,50 @@ if (!empty($conf->reception->enabled))
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockOnReception").'</td>';
-    print '<td class="right">';
+	print '<td class="right">';
 
-    if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION', array(), null, 0, 0, 0, 2, 1);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION', array(), null, 0, 0, 0, 2, 1);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION);
+	}
 
 	print "</td>\n</tr>\n";
 	$found++;
 
 
-    print '<tr class="oddeven">';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockOnReceptionOnClosing").'</td>';
-    print '<td class="right">';
+	print '<td class="right">';
 
-    if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION_CLOSE', array(), null, 0, 0, 0, 2, 1);
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE);
-    }
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION_CLOSE', array(), null, 0, 0, 0, 2, 1);
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE);
+	}
 	print "</td>\n</tr>\n";
 	$found++;
-}
-else
-{
+} else {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ReStockOnDispatchOrder").'</td>';
-    print '<td class="right">';
+	print '<td class="right">';
 	if (!empty($conf->fournisseur->enabled))
 	{
-        if ($conf->use_javascript_ajax) {
-        	print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER', array(), null, 0, 0, 0, 2, 1);
-        } else {
-            $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-            print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER);
-        }
-	}
-	else
-	{
+		if ($conf->use_javascript_ajax) {
+			print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER', array(), null, 0, 0, 0, 2, 1);
+		} else {
+			$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+			print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER);
+		}
+	} else {
 		print $langs->trans("ModuleMustBeEnabledFirst", $langs->transnoentitiesnoconv("Module40Name"));
 	}
 	print "</td>\n</tr>\n";
 	$found++;
 }
 
-/*if (! $found)
-{
-
-	print '<tr class="oddeven">';
-	print '<td colspan="2">'.$langs->trans("NoModuleToManageStockIncrease").'</td>';
-	print "</tr>\n";
-}*/
-
 print '</table>';
 
 print '<br>';
@@ -338,10 +406,10 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("WarehouseAllowNegativeTransfer").'</td>';
 print '<td class="right">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('STOCK_ALLOW_NEGATIVE_TRANSFER');
+	print ajax_constantonoff('STOCK_ALLOW_NEGATIVE_TRANSFER');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("STOCK_ALLOW_NEGATIVE_TRANSFER", $arrval, $conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("STOCK_ALLOW_NEGATIVE_TRANSFER", $arrval, $conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER);
 }
 print "</td>\n";
 print "</tr>\n";
@@ -351,28 +419,28 @@ if ($conf->invoice->enabled)
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
-    print '<td class="right">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_INVOICE');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_INVOICE", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE);
-    }
-    print "</td>\n";
-    print "</tr>\n";
+	print '<td class="right">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_INVOICE');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_INVOICE", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE);
+	}
+	print "</td>\n";
+	print "</tr>\n";
 }
 
 if ($conf->order->enabled)
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
-    print '<td class="right">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_ORDER');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_ORDER", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER);
-    }
+	print '<td class="right">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_ORDER');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_ORDER", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER);
+	}
 	print "</td>\n";
 	print "</tr>\n";
 }
@@ -381,13 +449,13 @@ if ($conf->expedition->enabled)
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
-    print '<td class="right">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT);
-    }
+	print '<td class="right">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT);
+	}
 	print "</td>\n";
 	print "</tr>\n";
 }
@@ -403,32 +471,199 @@ 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.
 }
 
 if ($virtualdiffersfromphysical)
 {
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
 	print "<td>".$langs->trans("RuleForStockReplenishment")." ".img_help('help', $langs->trans("VirtualDiffersFromPhysical"))."</td>\n";
-    print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
+	print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
 	print '</tr>'."\n";
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("UseVirtualStockByDefault").'</td>';
-    print '<td class="right">';
-    if ($conf->use_javascript_ajax) {
-        print ajax_constantonoff('STOCK_USE_VIRTUAL_STOCK');
-    } else {
-        $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-        print $form->selectarray("STOCK_USE_VIRTUAL_STOCK", $arrval, $conf->global->STOCK_USE_VIRTUAL_STOCK);
-    }
+	print '<td class="right">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_USE_VIRTUAL_STOCK');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_USE_VIRTUAL_STOCK", $arrval, $conf->global->STOCK_USE_VIRTUAL_STOCK);
+	}
 	print "</td>\n";
 	print "</tr>\n";
 	print '</table>';
+
 	print '<br>';
 }
 
+print '<form>';
+
+
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="warehouse">';
+
+
+/*
+ * Document templates generators
+ */
+
+print load_fiche_titre($langs->trans("WarehouseModelModules"), '', '');
+
+// Load array def with activated templates
+$def = array();
+$sql = "SELECT nom";
+$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql .= " WHERE type = '".$db->escape($type)."'";
+$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++;
+	}
+} else {
+	dol_print_error($db);
+}
+
+
+print "<table class=\"noborder\" width=\"100%\">\n";
+print "<tr class=\"liste_titre\">\n";
+print '<td>'.$langs->trans("Name").'</td>';
+print '<td>'.$langs->trans("Description").'</td>';
+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="38">'.$langs->trans("ShortInfo").'</td>';
+print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+print "</tr>\n";
+
+clearstatcache();
+
+foreach ($dirmodels as $reldir)
+{
+	foreach (array('', '/doc') as $valdir)
+	{
+		$realpath = $reldir."core/modules/stock".$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);
+
+				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);
+
+							$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>';
+
+								// Active
+								if (in_array($name, $def))
+								{
+									print '<td class="center">'."\n";
+									print '<a class="reposition" 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 class="center">'."\n";
+									print '<a class="reposition" 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->STOCK_ADDON_PDF == $name)
+								{
+									print img_picto($langs->trans("Default"), 'on');
+								} else {
+									print '<a class="reposition" 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;
+
+								$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>';
+
+								// 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 '</table>';
+
+print '</form>';
+
+
+// Other
+
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="warehouse">';
+
+print load_fiche_titre($langs->trans("Other"), '', '');
 
 print '<table class="noborder centpercent">';
 
@@ -438,27 +673,62 @@ print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
 print '</tr>'."\n";
 
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("UserWarehouseAutoCreate").'</td>';
+print '<td>'.$langs->trans("MainDefaultWarehouse").'</td>';
+print '<td class="right">';
+print $formproduct->selectWarehouses($conf->global->MAIN_DEFAULT_WAREHOUSE, 'default_warehouse', '', 1, 0, 0, '', 0, 0, array(), 'left reposition');
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+print "</td>";
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("UserDefaultWarehouse").'</td>';
 print '<td class="right">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('STOCK_USERSTOCK_AUTOCREATE');
+	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("STOCK_USERSTOCK_AUTOCREATE", $arrval, $conf->global->STOCK_USERSTOCK_AUTOCREATE);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MAIN_DEFAULT_WAREHOUSE_USER", $arrval, $conf->global->MAIN_DEFAULT_WAREHOUSE_USER);
 }
 print "</td>\n";
 print "</tr>\n";
 
+if (! empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->trans("UserWarehouseAutoCreate").'</td>';
+	print '<td class="right">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STOCK_USERSTOCK_AUTOCREATE');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STOCK_USERSTOCK_AUTOCREATE", $arrval, $conf->global->STOCK_USERSTOCK_AUTOCREATE);
+	}
+	print "</td>\n";
+	print "</tr>\n";
+}
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("WarehouseAskWarehouseDuringOrder").'</td>';
+print '<td class="right">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER", $arrval, $conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER);
+}
+print "</td>";
+print '</td>';
+print "</tr>\n";
+
 print '<tr class="oddeven">';
 print '<td>';
 print $form->textwithpicto($langs->trans("StockSupportServices"), $langs->trans("StockSupportServicesDesc"));
 print '</td>';
 print '<td class="right">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('STOCK_SUPPORTS_SERVICES');
+	print ajax_constantonoff('STOCK_SUPPORTS_SERVICES');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("STOCK_SUPPORTS_SERVICES", $arrval, $conf->global->STOCK_SUPPORTS_SERVICES);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("STOCK_SUPPORTS_SERVICES", $arrval, $conf->global->STOCK_SUPPORTS_SERVICES);
 }
 print "</td>\n";
 print "</tr>\n";
@@ -467,85 +737,28 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("AllowAddLimitStockByWarehouse").'</td>';
 print '<td class="right">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE');
+	print ajax_constantonoff('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE');
 } else {
-    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE", $arrval, $conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE);
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE", $arrval, $conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE);
 }
 print "</td>\n";
 print "</tr>\n";
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("AlwaysShowFullArbo").'</td>';
+print '<td class="right">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('STOCK_ALWAYS_SHOW_FULL_ARBO');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("STOCK_ALWAYS_SHOW_FULL_ARBO", $arrval, $conf->global->STOCK_ALWAYS_SHOW_FULL_ARBO);
+}
+print "</td>\n";
+print "</tr>\n";
 print '</table>';
 
-/*
-print '<br>';
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-{
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Inventory").'</td>'."\n";
-	print '<td class="right">'.$langs->trans("Status").'</td>'."\n";
-	print '</tr>'."\n";
-
-	// Example with a yes / no select
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("INVENTORY_DISABLE_VIRTUAL").'</td>';
-	print '<td class="center">';
-	if ($conf->use_javascript_ajax) {
-		print ajax_constantonoff('INVENTORY_DISABLE_VIRTUAL');
-	} else {
-		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("INVENTORY_DISABLE_VIRTUAL", $arrval, $conf->global->INVENTORY_DISABLE_VIRTUAL);
-	}
-	print '</td></tr>';
-
-
-	// Example with a yes / no select
-    print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").'</td>';
-	print '<td class="center">';
-  	if ($conf->use_javascript_ajax) {
-  		print ajax_constantonoff('INVENTORY_USE_MIN_PA_IF_NO_LAST_PA');
-  	} else {
-  		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-  		print $form->selectarray("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA", $arrval, $conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA);
-  	}
-  	print '</td></tr>';
-
-
-  	// Example with a yes / no select
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT").'</td>';
-	print '<td class="right">';
-	if ($conf->use_javascript_ajax) {
-    	print ajax_constantonoff('INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT');
-	} else {
-    	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    	print $form->selectarray("INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT", $arrval, $conf->global->INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT);
-	}
-	print '</td></tr>';
-
-	print '</table>';
-}
-*/
-
-/* I keep the option/feature, but hidden to end users for the moment. If feature is used by module, no need to have users see it.
-If not used by a module, I still need to understand in which case user may need this now we can set rule on product page.
-if ($conf->global->PRODUIT_SOUSPRODUITS)
-{
-	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("IndependantSubProductStock").'</td>';
-	print '<td class="right">';
-	print "<form method=\"post\" action=\"stock.php\">";
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print "<input type=\"hidden\" name=\"action\" value=\"INDEPENDANT_SUBPRODUCT_STOCK\">";
-	print $form->selectyesno("INDEPENDANT_SUBPRODUCT_STOCK",$conf->global->INDEPENDANT_SUBPRODUCT_STOCK,1);
-	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	print '</form>';
-	print "</td>\n";
-	print "</tr>\n";
-}
-*/
+print '</form>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 977b99d0c99..c4f2e48ff4a 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -42,7 +42,7 @@ accessforbidden();
 
 $type = GETPOST('type', 'alpha');
 $value = GETPOST('value', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -70,9 +70,7 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -109,15 +107,11 @@ if ($action == 'specimen')  // For invoices
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=facture_fournisseur&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -127,9 +121,7 @@ if ($action == 'specimen')  // For invoices
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -154,8 +146,7 @@ elseif ($action == 'setdoc')
     {
         $ret = addDocumentModel($value, $type, $label, $scandir);
     }
-}
-elseif ($action == 'unsetdoc')
+} elseif ($action == 'unsetdoc')
 {
     dolibarr_del_const($db, "INVOICE_SUPPLIER_ADDON_PDF", $conf->entity);
 }
@@ -176,7 +167,7 @@ if ($action == 'addcat')
 
 if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 {
-    $freetext = GETPOST('SUPPLIER_INVOICE_FREE_TEXT', 'none'); // 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);
 
@@ -185,9 +176,7 @@ if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -263,8 +252,7 @@ foreach ($dirmodels as $reldir)
                         $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);
+                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -272,10 +260,8 @@ foreach ($dirmodels as $reldir)
                         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;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                        } 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>';
 
@@ -340,9 +326,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -409,11 +393,9 @@ foreach ($dirmodels as $reldir)
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
                         print "</td>";
-                    }
-                    else
-                    {
+                    } else {
                         print '<td class="center">'."\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&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 '<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>";
                     }
 
@@ -423,11 +405,9 @@ foreach ($dirmodels as $reldir)
                     {
                         //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;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;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 '<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>';
 
@@ -487,9 +467,7 @@ $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>';
-}
-else
-{
+} else {
     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/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index db9b3e257f6..9afa2bb2d1f 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -43,7 +43,7 @@ accessforbidden();
 $type = GETPOST('type', 'alpha');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $scandir = GETPOST('scan_dir', 'alpha');
 
 $specimenthirdparty = new Societe($db);
@@ -68,14 +68,10 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'specimen')  // For orders
+} elseif ($action == 'specimen')  // For orders
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -107,15 +103,11 @@ elseif ($action == 'specimen')  // For orders
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=commande_fournisseur&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
     	dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -125,9 +117,7 @@ elseif ($action == 'specimen')  // For orders
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -152,25 +142,19 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
     // 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);
-}
-
-elseif ($action == 'addcat')
+} elseif ($action == 'addcat')
 {
     $fourn = new Fournisseur($db);
     $fourn->CreateCategory($user, GETPOST('cat', 'alphanohtml'));
-}
-
-elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
+} elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
 {
-    $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT', 'none'); // 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);
 
@@ -196,9 +180,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
 
     	// Insert
     	$newmodule->insert_permissions(1);
-    }
-    else
-    {
+    } else {
     	// Remove all rights with Permission1190
     	$newmodule->delete_permissions();
 
@@ -217,9 +199,7 @@ elseif ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -295,8 +275,7 @@ foreach ($dirmodels as $reldir)
                         $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);
+                        } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
                         else print $tmp;
                         print '</td>'."\n";
 
@@ -304,10 +283,8 @@ foreach ($dirmodels as $reldir)
                         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;value='.$file.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+                        } 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>';
 
@@ -370,9 +347,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -429,17 +404,13 @@ foreach ($dirmodels as $reldir)
                             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
-                        {
+                        } else {
                             print img_picto($langs->trans("Enabled"), 'switch_on');
                         }
                         print "</td>";
-                    }
-                    else
-                    {
+                    } else {
                         print '<td class="center">'."\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&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 '<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>";
                     }
 
@@ -448,10 +419,8 @@ foreach ($dirmodels as $reldir)
                     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;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>';
+                    } 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>';
 
@@ -524,11 +493,11 @@ if ($conf->banque->enabled)
     {
         if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER))
         {
-            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&amp;value=1">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&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_ORDER&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
+            print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER&amp;token='.newToken().'&amp;value=0">'.img_picto($langs->trans("Enabled"),'switch_on').'</a>';
         }
     }
     print '</td></tr>';
@@ -553,9 +522,7 @@ $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>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
@@ -572,9 +539,7 @@ print '<td class="center">';
 if ($conf->reception->enabled)
 {
 	print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
-}
-else
-{
+} else {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
 	} else {
diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php
index d533ba0d8eb..003c0247f20 100644
--- a/htdocs/admin/supplier_payment.php
+++ b/htdocs/admin/supplier_payment.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015  Juanjo Menent				<jmenent@2byte.es>
  * Copyright (C) 2016  Laurent Destailleur          <eldy@users.sourceforge.net>
+ * Copyright (C) 2020  Maxime DEMAREST              <maxime@indelog.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,10 +33,10 @@ $langs->loadLangs(array("admin", "errors", "other", "bills", "orders"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
-$scandir = GETPOST('scan_dir', 'alpha');
+$scandir = GETPOST('scandir', 'alpha');
 $type = 'supplier_payment';
 
 
@@ -56,12 +57,10 @@ if ($action == 'updateMask')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
     dolibarr_set_const($db, "SUPPLIER_PAYMENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
 }
@@ -70,9 +69,7 @@ if ($action == 'updateMask')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -97,9 +94,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
     $modele = GETPOST('module', 'alpha');
 
@@ -130,18 +125,27 @@ elseif ($action == 'specimen')
     	{
     		header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_payment&file=SPECIMEN.pdf");
     		return;
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($module->error, $module->errors, 'errors');
     		dol_syslog($module->error, LOG_ERR);
     	}
-    }
-    else
-    {
+    } 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++;
+
+	if ($error)
+       {
+			setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+	if (!$error)
+       {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
 }
 
 /*
@@ -175,7 +179,7 @@ print load_fiche_titre($langs->trans("PaymentsNumberingModule"), '', '');
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -188,9 +192,7 @@ if ($resql)
         array_push($def, $array[0]);
         $i++;
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -264,10 +266,8 @@ foreach ($dirmodels as $reldir)
                             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&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>';
+                            } 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>';
 
@@ -380,11 +380,9 @@ foreach ($dirmodels as $reldir)
                             print img_picto($langs->trans("Enabled"),'switch_on');
                         }*/
                         print "</td>";
-                    }
-                    else
-                    {
+                    } else {
                         print '<td class="center">'."\n";
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&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 '<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>";
                     }
 
@@ -394,11 +392,9 @@ foreach ($dirmodels as $reldir)
                     {
                         //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;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;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 '<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>';
 
@@ -428,8 +424,46 @@ foreach ($dirmodels as $reldir)
 
 print '</table>';
 
+/*
+ *  Other Options
+ */
+
+print "<br>";
+
+print load_fiche_titre($langs->trans("OtherOptions"), '', '');
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.newToken().'" />';
+print '<input type="hidden" name="action" value="setparams" />';
+
+print '<div class="div-table-responsive-no-min">';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Parameter").'</td>';
+print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
+print '<td width="80">&nbsp;</td>';
+print "</tr>\n";
+
+// Allow to group payments by mod in rapports
+print '<tr class="oddeven"><td>';
+print $langs->trans("GroupPaymentsByModOnReports");
+print '</td><td width="60" align="center">';
+print $form->selectyesno("PAYMENTS_FOURN_REPORT_GROUP_BY_MOD", $conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD, 1);
+print '</td><td class="right">';
+print "</td></tr>\n";
+
+print '</table>';
+
 dol_fiche_end();
 
+print '<br>';
+print '<div class="center">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print '</div>';
+print '<br>';
+
+print '</form>';
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index c1007623a54..7bf34fa669a 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("admin", "errors", "other", "supplier_proposal"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -60,9 +60,7 @@ if ($action == 'updateMask')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -98,15 +96,11 @@ if ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=supplier_proposal&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($module->error, null, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -122,16 +116,14 @@ if ($action == 'set_SUPPLIER_PROPOSAL_DRAFT_WATERMARK')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
 if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
 {
-	$freetext = GETPOST('SUPPLIER_PROPOSAL_FREE_TEXT', 'none'); // No alpha here, we want exact string
+	$freetext = GETPOST('SUPPLIER_PROPOSAL_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "SUPPLIER_PROPOSAL_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
@@ -140,9 +132,7 @@ if ($action == 'set_SUPPLIER_PROPOSAL_FREE_TEXT')
  	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -156,9 +146,7 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -167,18 +155,14 @@ if ($action == 'set_BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL')
 if ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$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);
 	}
-}
-
-elseif ($action == 'setdoc')
+} elseif ($action == 'setdoc')
 {
     if (dolibarr_set_const($db, "SUPPLIER_PROPOSAL_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
@@ -191,9 +175,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
@@ -278,10 +260,8 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->SUPPLIER_PROPOSAL_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value='.$file.'">';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -330,7 +310,7 @@ print load_fiche_titre($langs->trans("SupplierProposalPDFModules"), '', '');
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -343,9 +323,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -410,15 +388,13 @@ foreach ($dirmodels as $reldir)
 	                            if (in_array($name, $def))
 	                            {
 	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'">';
+	                            	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
-	                            {
+	                            } else {
 	                                print "<td align=\"center\">\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	                                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>";
 	                            }
 
@@ -427,10 +403,8 @@ foreach ($dirmodels as $reldir)
 	                            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;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</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).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
 
@@ -462,9 +436,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -511,9 +483,7 @@ $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>';
-}
-else
-{
+} else {
     include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
     $doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
     print $doleditor->Create();
@@ -543,22 +513,16 @@ if ($conf->banque->enabled)
     if (!empty($conf->use_javascript_ajax))
     {
         print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL');
-    }
-    else
-    {
+    } 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;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;value=0">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+            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
-{
+} 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>';
 }
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index 172f243a22c..50e2fbbbb91 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -45,7 +45,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facture_fourn'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index a9fa9c1b09d..15a96009392 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -47,7 +47,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facture_fourn_det'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index c280e56ac86..17d866d8f94 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -45,7 +45,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'commande_fournisseur'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index 59cc6783db8..1bcfcec05c4 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -46,7 +46,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'commande_fournisseurdet'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 16b273cd6db..60de87d2d2e 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -126,9 +126,7 @@ if ($action == 'set')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
 	}
@@ -155,18 +153,17 @@ if ($action == 'setlevel')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
+
 /*
  * View
  */
 
-llxHeader();
+llxHeader('', $langs->trans("SyslogSetup"));
 
 $form = new Form($db);
 
@@ -174,8 +171,6 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_valu
 print load_fiche_titre($langs->trans("SyslogSetup"), $linkback, 'title_setup');
 print '<br>';
 
-$def = array();
-
 $syslogfacility = $defaultsyslogfacility = dolibarr_get_const($db, "SYSLOG_FACILITY", 0);
 $syslogfile = $defaultsyslogfile = dolibarr_get_const($db, "SYSLOG_FILE", 0);
 
@@ -192,7 +187,7 @@ if ($conf->global->MAIN_MODULE_MULTICOMPANY && $user->entity)
 //print "conf->global->MAIN_FEATURES_LEVEL = ".$conf->global->MAIN_FEATURES_LEVEL."<br><br>\n";
 
 // Output mode
-print load_fiche_titre($langs->trans("SyslogOutput"));
+print load_fiche_titre($langs->trans("SyslogOutput"), '', '');
 
 // Mode
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
@@ -217,6 +212,12 @@ foreach ($syslogModules as $moduleName)
 	print '<td width="140">';
 	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()) {
+			$langs->load("errors");
+			print $form->textwithpicto('', $langs->trans("ErrorPHPNeedModule", 'SysLog'));
+		}
+	}
 	print '</td>';
 
 	print '<td class="nowrap">';
@@ -230,8 +231,7 @@ foreach ($syslogModules as $moduleName)
 		    {
     			if (isset($_POST[$tmpoption])) $value = $_POST[$tmpoption];
     			elseif (!empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption;
-		    }
-			else $value = (isset($option['default']) ? $option['default'] : '');
+		    } 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'];
@@ -265,7 +265,7 @@ print "</form>\n";
 
 print '<br>'."\n\n";
 
-print load_fiche_titre($langs->trans("SyslogLevel"));
+print load_fiche_titre($langs->trans("SyslogLevel"), '', '');
 
 // Level
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index 3d0dddd6d10..bbac6bdfe0c 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("help", "members", "other", "admin"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if (!$user->admin) accessforbidden();
 
@@ -200,9 +200,7 @@ if ($showpromotemessage)
             print '<textarea style="width:80%; min-height: 60px">';
             print $langs->trans("ExampleOfNewsMessageForMajorRelease", DOL_VERSION, DOL_VERSION);
             print '</textarea>';
-        }
-        else
-        {
+        } else {
             print $langs->trans("TitleExampleForMaintenanceRelease").':<br>';
             print '<textarea style="width:80%; min-height: 60px">';
             print $langs->trans("ExampleOfNewsMessageForMaintenanceRelease", DOL_VERSION, DOL_VERSION);
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index c52af371dbc..b3be7fcf267 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -84,7 +84,6 @@ $configfileparameters = array(
 							'?dolibarr_js_CKEDITOR',
 							'?dolibarr_js_JQUERY',
 							'?dolibarr_js_JQUERY_UI',
-							'?dolibarr_js_JQUERY_FLOT',
 							'?dolibarr_font_DOL_DEFAULT_TTF',
 							'?dolibarr_font_DOL_DEFAULT_TTF_BOLD',
 							'separator',
@@ -132,7 +131,6 @@ $configfilelib = array(
 					'dolibarr_js_CKEDITOR',
 					'dolibarr_js_JQUERY',
 					'dolibarr_js_JQUERY_UI',
-					'dolibarr_js_JQUERY_FLOT',
 					'dolibarr_font_DOL_DEFAULT_TTF',
 					'dolibarr_font_DOL_DEFAULT_TTF_BOLD',
 					'separator',
@@ -173,9 +171,7 @@ foreach ($configfileparameters as $key)
 		if ($newkey == 'separator')
 		{
 			print '<td colspan="3">&nbsp;</td>';
-		}
-		else
-		{
+		} else {
 			// Label
 			print "<td>".$configfilelib[$i].'</td>';
 			// Key
@@ -219,9 +215,7 @@ if (empty($conf->multicompany->enabled))
 {
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
-}
-else
-{
+} else {
 	// If multicompany mode, superadmin (user->entity=0) can see everything, admin are limited to their entities.
 	if ($user->entity) $sql .= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 }
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index e20347b954c..683fc3c4f3a 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -32,7 +32,7 @@ if (!$user->admin) {
 	accessforbidden();
 }
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 if ($action == 'convert')
@@ -67,18 +67,15 @@ if (preg_match('/mysql/i', $conf->db->type))
 {
 	$sql = "SHOW TABLE STATUS";
 	$base = 1;
-}
-elseif ($conf->db->type == 'pgsql')
+} elseif ($conf->db->type == 'pgsql')
 {
 	$sql = "SELECT conname, contype FROM pg_constraint;";
 	$base = 2;
-}
-elseif ($conf->db->type == 'mssql')
+} elseif ($conf->db->type == 'mssql')
 {
 	//$sqls[0] = "";
 	//$base=3;
-}
-elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
+} elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
 {
 	//$sql = "SELECT name, type FROM sqlite_master";
 	$base = 4;
@@ -88,9 +85,7 @@ elseif ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
 if (!$base)
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
-}
-else
-{
+} else {
 	if ($base == 1)
 	{
 		print '<div class="div-table-responsive-no-min">';
@@ -123,18 +118,14 @@ else
 
 				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>';
-				}
-				else
-				{
+				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>';
+				} else {
 					print '<td>&nbsp;</td>';
 				}
 				print '<td>';
 				print $obj->Row_format;
-				if (isset($obj->Row_format) && (in_array($obj->Row_format, array("Compact"))))
-				{
+				if (isset($obj->Row_format) && (in_array($obj->Row_format, array("Compact")))) {
 					print '<br><a class="reposition" href="database-tables.php?action=convertdynamic&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' Dynamic</a>';
 				}
 				print '</td>';
@@ -146,8 +137,7 @@ else
 				print '<td align="right">'.$obj->Auto_increment.'</td>';
 				print '<td align="right">'.$obj->Check_time.'</td>';
 				print '<td align="right">'.$obj->Collation;
-				if (isset($obj->Collation) && (in_array($obj->Collation, array("utf8mb4_general_ci", "utf8mb4_unicode_ci", "latin1_swedish_ci"))))
-				{
+				if (isset($obj->Collation) && (in_array($obj->Collation, array("utf8mb4_general_ci", "utf8mb4_unicode_ci", "latin1_swedish_ci")))) {
 					print '<br><a class="reposition" href="database-tables.php?action=convertutf8&amp;table='.$obj->Name.'">'.$langs->trans("Convert").' UTF8</a>';
 				}
 				print '</td>';
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index ef62c9aa34e..6b08fc4fe8f 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -73,9 +73,7 @@ $arraylist = array('listofvars', 'listofstatus');
 if (!count($listofvars) && !count($listofstatus))
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
-}
-else
-{
+} else {
 	foreach ($arraylist as $listname)
 	{
 		print '<br>';
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 90f788f3825..59b16d8ad93 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -49,8 +49,7 @@ if (preg_match('/mysql/i', $conf->db->type))
 {
 	$sql = "SHOW TABLE STATUS LIKE '".$db->escape($table)."'";
 	$base = 1;
-}
-elseif ($conf->db->type == 'pgsql')
+} elseif ($conf->db->type == 'pgsql')
 {
 	$sql = "SELECT conname,contype FROM pg_constraint";
 	$base = 2;
@@ -59,9 +58,7 @@ elseif ($conf->db->type == 'pgsql')
 if (!$base)
 {
 	print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
-}
-else
-{
+} else {
 	$resql = $db->query($sql);
 	if ($resql)
 	{
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 97e7370a148..41c8dcbd198 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2007		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2007-2012	Regis Houssin			<regis.houssin@inodbox.com>
  *
@@ -19,7 +19,7 @@
 
 /**
  *  \file       htdocs/admin/system/dolibarr.php
- *  \brief      Page to show Dolibarr informations
+ *  \brief      Page to show Dolibarr information
  */
 
 require '../../main.inc.php';
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("install", "other", "admin"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if (!$user->admin)
 	accessforbidden();
@@ -76,9 +76,7 @@ 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));
-}
-else
-{
+} 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));
 }
@@ -107,14 +105,10 @@ if (function_exists('curl_init'))
 
             // Show version
             print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b>';
-        }
-        else
-        {
+        } else {
             print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b>';
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="butAction">'.$langs->trans("Check").'</a>';
     }
 }
@@ -323,7 +317,6 @@ $configfileparameters = array(
 		'?dolibarr_js_CKEDITOR' => 'dolibarr_js_CKEDITOR',
 		'?dolibarr_js_JQUERY' => 'dolibarr_js_JQUERY',
 		'?dolibarr_js_JQUERY_UI' => 'dolibarr_js_JQUERY_UI',
-		'?dolibarr_js_JQUERY_FLOT' => 'dolibarr_js_JQUERY_FLOT',
 		'?dolibarr_font_DOL_DEFAULT_TTF' => 'dolibarr_font_DOL_DEFAULT_TTF',
 		'?dolibarr_font_DOL_DEFAULT_TTF_BOLD' => 'dolibarr_font_DOL_DEFAULT_TTF_BOLD',
 		'separator4' => '',
@@ -365,16 +358,19 @@ foreach ($configfileparameters as $key => $value)
 		if (strpos($newkey, 'separator') !== false)
 		{
 			print '<td colspan="3">&nbsp;</td>';
-		}
-		else
-		{
+		} else {
 			// Label
 			print "<td>".$value.'</td>';
 			// Key
 			print '<td>'.$newkey.'</td>';
 			// Value
 			print "<td>";
-			if ($newkey == 'dolibarr_main_db_pass') print preg_replace('/./i', '*', ${$newkey});
+			if (in_array($newkey, array('dolibarr_main_db_pass', 'dolibarr_main_auth_ldap_admin_pass'))) {
+				if (empty($dolibarr_main_prod)) {
+					print '<!-- '.${$newkey}.' -->';
+				}
+				print '**********';
+			}
 			elseif ($newkey == 'dolibarr_main_url_root' && preg_match('/__auto__/', ${$newkey})) print ${$newkey}.' => '.constant('DOL_MAIN_URL_ROOT');
 			elseif ($newkey == 'dolibarr_main_document_root_alt') {
 				$tmparray = explode(',', ${$newkey});
@@ -404,7 +400,14 @@ foreach ($configfileparameters as $key => $value)
 
 				$valuetoshow = ${$newkey};
 				if (empty($valuetoshow)) {
-					print img_warning($langs->trans('SwitchThisForABetterSecurity'));
+					print img_warning($langs->trans('SwitchThisForABetterSecurity', 1));
+				}
+			} elseif ($newkey == 'dolibarr_nocsrfcheck') {
+				print ${$newkey};
+
+				$valuetoshow = ${$newkey};
+				if (!empty($valuetoshow)) {
+					print img_warning($langs->trans('SwitchThisForABetterSecurity', 0));
 				}
 			} else {
 			    print ${$newkey};
@@ -443,9 +446,7 @@ if (empty($conf->multicompany->enabled))
 {
 	// If no multicompany mode, admins can see global and their constantes
 	$sql .= " WHERE entity IN (0,".$conf->entity.")";
-}
-else
-{
+} else {
 	// If multicompany mode, superadmin (user->entity=0) can see everything, admin are limited to their entities.
 	if ($user->entity) $sql .= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 }
@@ -462,7 +463,16 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 		print '<td class="tdoverflowmax300">'.$obj->name.'</td>'."\n";
-		print '<td class="tdoverflowmax300">'.dol_escape_htmltag($obj->value).'</td>'."\n";
+		print '<td class="tdoverflowmax300">';
+		if (isASecretKey($obj->name)) {
+			if (empty($dolibarr_main_prod)) {
+				print '<!-- '.$obj->value.' -->';
+			}
+			print '**********';
+		} else {
+			print dol_escape_htmltag($obj->value);
+		}
+		print '</td>'."\n";
 		if (empty($conf->multicompany->enabled) || !$user->entity) print '<td class="center" width="80px">'.$obj->entity.'</td>'."\n"; // If superadmin or multicompany disabled
 		print "</tr>\n";
 
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index b1124e88add..a3d54104a02 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2007       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2007-2012  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2019  Frederic France         <frederic.france@netlogic.fr>
@@ -91,6 +91,7 @@ if (preg_match('/beta|alpha|rc/i', DOL_VERSION) || !empty($conf->global->MAIN_AL
 $enableremotecheck = true;
 
 print '<form name="check" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print $langs->trans("MakeIntegrityAnalysisFrom").':<br>';
 print '<!-- for a local check target=local&xmlshortfile=... -->'."\n";
 if (dol_is_file($xmlfile))
@@ -98,9 +99,7 @@ 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>';
-}
-else
-{
+} 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>';
@@ -111,9 +110,7 @@ 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>';
-}
-else
-{
+} 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>';
@@ -140,9 +137,7 @@ if (GETPOST('target') == 'local')
     		}
     	}
         $xml = simplexml_load_file($xmlfile);
-    }
-    else
-    {
+    } else {
         print $langs->trans('XmlNotFound').': '.$xmlfile;
         $error++;
     }
@@ -157,9 +152,7 @@ if (GETPOST('target') == 'remote')
         $xmlfile = $xmlarray['content'];
         //print "xmlfilestart".$xmlfile."xmlfileend";
         $xml = simplexml_load_string($xmlfile);
-    }
-    else
-    {
+    } else {
         $errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
         setEventMessages($errormsg, null, 'errors');
         $error++;
@@ -203,9 +196,9 @@ if (!$error && $xml)
             $i++;
             $out .= '<tr class="oddeven">';
             $out .= '<td>'.$i.'</td>'."\n";
-            $out .= '<td>'.$constname.'</td>'."\n";
-            $out .= '<td class="center">'.$constvalue.'</td>'."\n";
-            $out .= '<td class="center">'.$valueforchecksum.'</td>'."\n";
+            $out .= '<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";
         }
 
@@ -263,16 +256,14 @@ if (!$error && $xml)
 	            $i++;
 	            $out .= '<tr class="oddeven">';
 	            $out .= '<td>'.$i.'</td>'."\n";
-	            $out .= '<td>'.$file['filename'].'</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">'.$file['expectedmd5'].'</td>'."\n";
+	            $out .= '<td class="center">'.dol_escape_htmltag($file['expectedmd5']).'</td>'."\n";
 	            $out .= "</tr>\n";
 	        }
-        }
-        else
-        {
+        } else {
             $out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -304,9 +295,9 @@ if (!$error && $xml)
 	            $i++;
 	            $out .= '<tr class="oddeven">';
 	            $out .= '<td>'.$i.'</td>'."\n";
-	            $out .= '<td>'.$file['filename'].'</td>'."\n";
-	            $out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-	            $out .= '<td class="center">'.$file['md5'].'</td>'."\n";
+	            $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";
@@ -325,9 +316,7 @@ if (!$error && $xml)
             $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
             $out .= '<td class="right"></td>'."\n";
             $out .= "</tr>\n";
-        }
-        else
-        {
+        } else {
             $out .= '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -358,14 +347,14 @@ if (!$error && $xml)
                 $i++;
                 $out .= '<tr class="oddeven">';
                 $out .= '<td>'.$i.'</td>'."\n";
-                $out .= '<td>'.$file['filename'];
+                $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">'.$file['expectedmd5'].'</td>'."\n";
-                $out .= '<td class="center">'.$file['md5'].'</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";
@@ -380,9 +369,7 @@ if (!$error && $xml)
             $out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
             $out .= '<td class="right"></td>'."\n";
             $out .= "</tr>\n";
-        }
-        else
-        {
+        } else {
             $out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         }
         $out .= '</table>';
@@ -393,14 +380,10 @@ if (!$error && $xml)
         if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
         {
             setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-        }
-        else
-        {
+        } else {
             setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
         }
-    }
-    else
-    {
+    } else {
         print 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile;
         $error++;
     }
@@ -433,16 +416,12 @@ if (!$error && $xml)
     		$resultcode = 'warning';
     		$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
     		$outcurrentchecksum = $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    	}
-    	else
-    	{
+    	} else {
     		$resultcode = 'ok';
     		$resultcomment = 'Success';
     		$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
     	}
-    }
-    else
-    {
+    } else {
     	$resultcode = 'error';
     	$resultcomment = 'Error';
     	$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 61de00287e9..28dcb6641ef 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -25,73 +25,95 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
+if (!$user->admin) {
+	accessforbidden();
+}
+
 // Load translation files required by the page
 $langs->loadLangs(array("install", "other", "admin"));
 
-if (!$user->admin)
-	accessforbidden();
+$optioncss = GETPOST('optioncss', 'alpha');
+$contextpage		= GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'moduleoverview';
+
+$search_name		= GETPOST("search_name", 'alpha');
+$search_id = GETPOST("search_id", 'alpha');
+$search_version = GETPOST("search_version", 'alpha');
+$search_permission = GETPOST("search_permission", 'alpha');
+
+$sortfield			= GETPOST("sortfield", 'alpha');
+$sortorder			= GETPOST("sortorder", 'alpha');
+
+if (!$sortfield) $sortfield = "id";
+if (!$sortorder) $sortorder = "asc";
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
+$hookmanager->initHooks(array('moduleoverview'));
+$form = new Form($db);
+$object = new stdClass();
+
+// Definition of fields for lists
+$arrayfields = array(
+	'name'=>array('label'=>$langs->trans("Modules"), 'checked'=>1, 'position'=>10),
+	'version'=>array('label'=>$langs->trans("Version"), 'checked'=>1, 'position'=>20),
+	'id'=>array('label'=>$langs->trans("IdModule"), 'checked'=>1, 'position'=>30),
+	'module_position'=>array('label'=>$langs->trans("Position"), 'checked'=>1, 'position'=>35),
+	'permission'=>array('label'=>$langs->trans("IdPermissions"), 'checked'=>1, 'position'=>40)
+);
+
+$arrayfields = dol_sort_array($arrayfields, 'position');
 
 
 /*
- * View
+ * Actions
  */
 
-llxHeader();
+$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');
 
-print load_fiche_titre($langs->trans("AvailableModules"), '', 'title_setup');
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+}
 
-print '<span class="opacitymedium">'.$langs->trans("ToActivateModule").'</span><br>';
-print "<br>\n";
 
+// Load list of modules
+$moduleList = array();
 $modules = array();
-$modules_names = array();
 $modules_files = array();
 $modules_fullpath = array();
 $modulesdir = dolGetModulesDirs();
+$rights_ids = array();
 
-// Load list of modules
-$i = 0;
-foreach ($modulesdir as $dir)
-{
+foreach ($modulesdir as $dir) {
 	$handle = @opendir(dol_osencode($dir));
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle)) !== false)
-		{
-			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-			{
+	if (is_resource($handle)) {
+		while (($file = readdir($handle)) !== false) {
+			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php') {
 				$modName = substr($file, 0, dol_strlen($file) - 10);
 
-				if ($modName)
-				{
+				if ($modName) {
 					//print 'xx'.$dir.$file.'<br>';
-					if (in_array($file, $modules_files))
-					{
+					if (in_array($file, $modules_files)) {
 						// File duplicate
 						print "Warning duplicate file found : ".$file." (Found ".$dir.$file.", already found ".$modules_fullpath[$file].")<br>";
 					}
-					else
-					{
+					else {
 						// File to load
 						$res = include_once $dir.$file;
-						if (class_exists($modName))
-						{
+						if (class_exists($modName)) {
 							try {
 								$objMod = new $modName($db);
 
 								$modules[$objMod->numero] = $objMod;
-								$modules_names[$objMod->numero] = $objMod->name;
 								$modules_files[$objMod->numero] = $file;
 								$modules_fullpath[$file] = $dir.$file;
-								$picto[$objMod->numero] = (isset($objMod->picto) && $objMod->picto) ? $objMod->picto : 'generic';
 							}
-							catch (Exception $e)
-							{
+							catch (Exception $e) {
 								dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
 							}
 						}
-						else
-						{
+						else {
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					}
@@ -102,62 +124,294 @@ foreach ($modulesdir as $dir)
 	}
 }
 
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Modules").'</td>';
-print '<td>'.$langs->trans("Version").'</td>';
-print '<td class="center">'.$langs->trans("IdModule").'</td>';
-print '<td>'.$langs->trans("IdPermissions").'</td>';
-print '</tr>';
-$var = false;
-$sortorder = $modules_names;
-ksort($sortorder);
-$rights_ids = array();
-foreach ($sortorder as $numero=>$name)
-{
-	$idperms = "";
-	// Module
-	print '<tr class="oddeven"><td width="300" class="nowrap">';
-	$alt = $name.' - '.$modules_files[$numero];
-	if (!empty($picto[$numero]))
-	{
-	   	if (preg_match('/^\//', $picto[$numero])) print img_picto($alt, $picto[$numero], 'width="14px"', 1);
-	   	else print img_object($alt, $picto[$numero], 'width="14px"');
+// create pre-filtered list for modules
+foreach ($modules as $key=>$module) {
+	$newModule = new stdClass();
+
+	$newModule->name = $module->getName();
+	$newModule->version = $module->getVersion();
+	$newModule->id = $key;
+	$newModule->module_position = $module->module_position;
+
+	$alt = $module->name.' - '.$modules_files[$key];
+
+	if (!empty($module->picto)) {
+		if (preg_match('/^\//', $module->picto)) $newModule->picto = img_picto($alt, $module->picto, 'width="14px"', 1);
+		else $newModule->picto = img_object($alt, $module->picto, 'width="14px"');
 	}
-	else
-	{
-	  	print img_object($alt, $picto[$numero], 'width="14px"');
+	else {
+		$newModule->picto = img_object($alt, 'generic', 'width="14px"');
 	}
-	print ' '.$modules[$numero]->getName();
-	print "</td>";
-	// Version
-	print '<td>'.$modules[$numero]->getVersion().'</td>';
-	// Id
-	print '<td class="center">'.$numero.'</td>';
-	// Permissions
-	if ($modules[$numero]->rights)
-	{
-		foreach ($modules[$numero]->rights as $rights)
-		{
-			$idperms .= ($idperms ? ", " : "").$rights[0];
+
+	$permission = array();
+	if ($module->rights) {
+		foreach ($module->rights as $rights) {
+			if (empty($rights[0])) {
+				continue;
+			}
+
+			$permission[] = $rights[0];
+
 			array_push($rights_ids, $rights[0]);
 		}
 	}
-	print '<td>'.($idperms ? $idperms : "&nbsp;").'</td>';
-	print "</tr>\n";
+
+	$newModule->permission = $permission;
+
+	// pre-filter list
+	if ($search_name && !stristr($newModule->name, $search_name))			continue;
+	if ($search_version && !stristr($newModule->version, $search_version))	continue;
+	if ($search_id && !stristr($newModule->id, $search_id))					continue;
+
+	if ($search_permission) {
+		$found = false;
+
+		foreach ($newModule->permission as $permission) {
+			if (stristr($permission, $search_permission)) {
+				$found = true;
+				break;
+			}
+		}
+
+		if (!$found) continue;
+	}
+
+	$moduleList[] = $newModule;
 }
+
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+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="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($langs->trans("AvailableModules"), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $massactionbutton, -1, '', 'title_setup', 0, '', '', 0, 1, 1);
+
+print '<span class="opacitymedium">'.$langs->trans("ToActivateModule").'</span>';
+print '<br>';
+print '<br>';
+
+$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-no-min">';
+print '<table class="noborder centpercent">';
+
+// Lines with input filters
+print '<tr class="liste_titre_filter">';
+
+if ($arrayfields['name']['checked']) {
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="search_name" size="8" value="'.$search_name.'">';
+	print '</td>';
+}
+if ($arrayfields['version']['checked']) {
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="search_version" size="8" value="'.$search_version.'">';
+	print '</td>';
+}
+if ($arrayfields['id']['checked']) {
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="search_id" size="8" value="'.$search_id.'">';
+	print '</td>';
+}
+if ($arrayfields['module_position']['checked']) {
+	print '<td class="liste_titre left">';
+	print '</td>';
+}
+if ($arrayfields['permission']['checked']) {
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" name="search_permission" size="8" value="'.$search_permission.'">';
+	print '</td>';
+}
+
+print '<td class="liste_titre center maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+
+print '</tr>';
+
+print '<tr class="liste_titre">';
+
+if ($arrayfields['name']['checked']) {
+	print_liste_field_titre($arrayfields['name']['label'], $_SERVER["PHP_SELF"], "name", "", "", "", $sortfield, $sortorder);
+}
+if ($arrayfields['version']['checked']) {
+	print_liste_field_titre($arrayfields['version']['label'], $_SERVER["PHP_SELF"], "version", "", "", "", $sortfield, $sortorder);
+}
+if ($arrayfields['id']['checked']) {
+	print_liste_field_titre($arrayfields['id']['label'], $_SERVER["PHP_SELF"], "id", "", "", "", $sortfield, $sortorder);
+}
+if ($arrayfields['module_position']['checked']) {
+	print_liste_field_titre($arrayfields['module_position']['label'], $_SERVER["PHP_SELF"], "module_position", "", "", "", $sortfield, $sortorder);
+}
+if ($arrayfields['permission']['checked']) {
+	print_liste_field_titre($arrayfields['permission']['label'], $_SERVER["PHP_SELF"], "permission", "", "", "", $sortfield, $sortorder);
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $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>';
+
+// sort list
+if ($sortfield == "name" && $sortorder == "asc") usort($moduleList, function (stdClass $a, stdClass $b) {
+	return strcasecmp($a->name, $b->name); });
+if ($sortfield == "name" && $sortorder == "desc") usort($moduleList, function (stdClass $a, stdClass $b) {
+	return strcasecmp($b->name, $a->name); });
+if ($sortfield == "version" && $sortorder == "asc") usort($moduleList, function (stdClass $a, stdClass $b) {
+	return strcasecmp($a->version, $b->version); });
+if ($sortfield == "version" && $sortorder == "desc") usort($moduleList, function (stdClass $a, stdClass $b) {
+	return strcasecmp($b->version, $a->version); });
+if ($sortfield == "id" && $sortorder == "asc") usort($moduleList, "compareIdAsc");
+if ($sortfield == "id" && $sortorder == "desc") usort($moduleList, "compareIdDesc");
+if ($sortfield == "permission" && $sortorder == "asc") usort($moduleList, "comparePermissionIdsAsc");
+if ($sortfield == "permission" && $sortorder == "desc") usort($moduleList, "comparePermissionIdsDesc");
+
+$moduleList = dol_sort_array($moduleList, 'module_position');
+
+foreach ($moduleList as $module) {
+	print '<tr class="oddeven">';
+
+	if ($arrayfields['name']['checked']) {
+		print '<td width="300" class="nowrap">';
+		print $module->picto;
+		print ' '.$module->name;
+		print "</td>";
+	}
+
+	if ($arrayfields['version']['checked']) {
+		print '<td>'.$module->version.'</td>';
+	}
+
+	if ($arrayfields['id']['checked']) {
+		print '<td class="center">'.$module->id.'</td>';
+	}
+
+	if ($arrayfields['module_position']['checked']) {
+		print '<td class="center">'.$module->module_position.'</td>';
+	}
+
+	if ($arrayfields['permission']['checked']) {
+		$idperms = '';
+
+		foreach ($module->permission as $permission) {
+			$idperms .= ($idperms ? ", " : "").$permission;
+			$translationKey = "Permission".$permission;
+
+			if (!empty($conf->global->MAIN_SHOW_PERMISSION)) {
+				if (empty($langs->tab_translate[$translationKey])) {
+					$tooltip = 'Missing translation (key '.$translationkey.' not found in admin.lang)';
+					$idperms .= ' <img src="../../theme/eldy/img/warning.png" alt="Warning" title="'.$tooltip.'">';
+				}
+			}
+		}
+
+		print '<td>'.($idperms ? $idperms : "&nbsp;").'</td>';
+	}
+
+	print '<td></td>';
+	print '</tr>';
+}
+
 print '</table>';
 print '</div>';
+print '</form>';
 print '<br>';
+
 sort($rights_ids);
 $old = '';
-foreach ($rights_ids as $right_id)
-{
-	if ($old == $right_id) print "Warning duplicate id on permission : ".$right_id."<br>";
+
+foreach ($rights_ids as $right_id) {
+	if ($old == $right_id) {
+		print "Warning duplicate id on permission : ".$right_id."<br>";
+	}
+
 	$old = $right_id;
 }
 
 // End of page
 llxFooter();
 $db->close();
+
+
+ /**
+  * Compare two modules by their ID for a ascending order
+  *
+  * @param	stdClass 	$a		First module
+  * @param	stdClass 	$b		Second module
+  * @return	int					Compare result (-1, 0, 1)
+  */
+function compareIdAsc(stdClass $a, stdClass $b)
+{
+	if ($a->id == $b->id) return 0;
+
+	return $a->id > $b->id ? -1 : 1;
+}
+
+ /**
+  * Compare two modules by their ID for a descending order
+  *
+  * @param	stdClass 	$a		First module
+  * @param	stdClass 	$b		Second module
+  * @return	int					Compare result (-1, 0, 1)
+  */
+function compareIdDesc(stdClass $a, stdClass $b)
+{
+	if ($a->id == $b->id) return 0;
+
+	return $b->id > $a->id ? -1 : 1;
+}
+
+ /**
+  * Compare two modules by their ID for a ascending order
+  *
+  * @param	stdClass 	$a		First module
+  * @param	stdClass 	$b		Second module
+  * @return	int					Compare result (-1, 0, 1)
+  */
+function comparePermissionIdsAsc(stdClass $a, stdClass $b)
+{
+	if (empty($a->permission) && empty($b->permission)) return compareIdAsc($a, $b);
+
+	if (empty($a->permission)) return 1;
+	if (empty($b->permission)) return -1;
+
+	if ($a->permission[0] == $b->permission[0]) return 0;
+
+	return $a->permission[0] > $b->permission[0] ? -1 : 1;
+}
+
+ /**
+  * Compare two modules by their permissions for a descending order
+  *
+  * @param	stdClass 	$a		First module
+  * @param	stdClass 	$b		Second module
+  * @return	int					Compare result (-1, 0, 1)
+  */
+function comparePermissionIdsDesc(stdClass $a, stdClass $b)
+{
+	if (empty($a->permission) && empty($b->permission)) return compareIdDesc($a, $b);
+
+	if (empty($a->permission)) return -1;
+	if (empty($b->permission)) return 1;
+
+	if ($a->permission[0] == $b->permission[0]) return 0;
+
+	return $a->permission[0] > $b->permission[0] ? 1 : -1;
+}
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 8d4360b37c0..ec6dc9d4a88 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -63,8 +63,7 @@ print '<br>';
 print '<strong>'.$langs->trans("XDebug").'</strong>: ';
 $test = !function_exists('xdebug_is_enabled');
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
-else
-{
+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>';
 }
@@ -75,8 +74,7 @@ print '<br>';
 print '<strong>'.$langs->trans("Syslog").'</strong>: ';
 $test = empty($conf->syslog->enabled);
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
-else
-{
+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>';
 }
@@ -87,8 +85,7 @@ print '<br>';
 print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
 $test = empty($conf->debugbar->enabled);
 if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
-else
-{
+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>';
 }
@@ -104,14 +101,11 @@ if ($test)
 	{
 		print img_picto('', 'tick.png').' '.$langs->trans("MemcachedAvailableAndSetup");
 		print ' '.$langs->trans("MoreInformation").' <a href="'.dol_buildpath('/memcached/admin/memcached.php', 1).'">Memcached module admin page</a>';
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'warning').' '.$langs->trans("MemcachedModuleAvailableButNotSetup");
 		print ' <a href="'.dol_buildpath('/memcached/admin/memcached.php', 1).'">Memcached module admin page</a>';
 	}
-}
-else print img_picto('', 'warning').' '.$langs->trans("MemcachedNotAvailable");
+} else print img_picto('', 'warning').' '.$langs->trans("MemcachedNotAvailable");
 print '</br>';
 
 // OPCode cache
@@ -147,9 +141,7 @@ if (!$foundcache && $test)
 	{
 		$foundcache++;
 		print img_picto('', 'tick.png').' '.$langs->trans("APCInstalled");
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'warning').' '.$langs->trans("APCCacheInstalledButDisabled");
 	}
 }
@@ -162,9 +154,7 @@ if (ini_get('opcache.preload'))
 	print '<br>';
 	print '<strong>'.$langs->trans("PreloadOPCode").'</strong>: ';
 	print ini_get('opcache.preload');
-}
-else
-{
+} else {
 	print '<br>';
 	print '<strong>'.$langs->trans("PreloadOPCode").'</strong>: ';
 	print $langs->trans("No");
@@ -468,9 +458,7 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
 	if ($test)
 	{
 		print img_picto('', 'tick.png').' '.$langs->trans("YouUseBestDriver", $conf->db->type);
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'warning.png').' '.$langs->trans("YouDoNotUseBestDriver", $conf->db->type, 'mysqli');
 	}
 	print '<br>';
@@ -495,14 +483,10 @@ if ($resql)
 		if (empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
 		{
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE');
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
 		}
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"));
 	}
 	print '<br>';
@@ -525,14 +509,10 @@ if ($resql)
 		if (empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))
 		{
 			print img_picto('', 'warning.png').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE');
-		}
-		else
-		{
+		} else {
 			print img_picto('', 'tick.png').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
 		}
-	}
-	else
-	{
+	} else {
 		print img_picto('', 'tick.png').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties"));
 	}
 	print '<br>';
@@ -545,9 +525,7 @@ print '<strong>'.$langs->trans("Browser").'</strong>:<br>';
 if (!in_array($conf->browser->name, array('chrome', 'opera', 'safari', 'firefox')))
 {
 	print img_picto('', 'warning.png').' '.$langs->trans("BrowserIsKO", $conf->browser->name);
-}
-else
-{
+} else {
 	print img_picto('', 'tick.png').' '.$langs->trans("BrowserIsOK", $conf->browser->name);
 }
 print '<br>';
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 3627daab7d9..05038c13bbc 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -85,13 +85,10 @@ $arrayphpminversionwarning = array(5, 6, 0);
 if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)
 {
 	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
-}
-elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)
+} elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
-}
-else
-{
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.versiontostring(versionphparray());
 }
 
@@ -102,9 +99,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["main
 {
 	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo");
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
-}
-else
-{
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk");
 }
 
@@ -114,25 +109,34 @@ print '<tr><td>Sessions support</td><td>';
 if (!function_exists("session_id"))
 {
 	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions");
-}
-else
-{
+} else {
 	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportSessions");
 }
 
 print '</td></tr>';
+
 print '<tr><td>UTF-8 support</td><td>';
 
 if (!function_exists("utf8_encode"))
 {
-	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8");
-}
-else
-{
-	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportUTF8");
+	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupport", "UTF8");
+} else {
+	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupport", "UTF8");
 }
 
 print '</td></tr>';
+
+print '<tr><td>MBString support</td><td>';
+
+if (!function_exists("mb_check_encoding"))
+{
+	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupport", "mbstring");
+} else {
+	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupport", "mbstring");
+}
+
+print '</td></tr>';
+
 print '</table>';
 
 print '<br>';
@@ -228,9 +232,7 @@ foreach ($phparray as $key => $value)
 			print $valtoshow;
 			print '</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven">';
 			print '<td>'.$keyparam.'</td>';
 			$i = 0;
@@ -348,9 +350,7 @@ function getTableColumn($name, array $list)
 	{
 		if ($name == 'xdebug') $html .= '<img src="../../theme/eldy/img/warning.png" title="'.$langs->trans("ModuleActivated", "xdebug").'">';
 		else $html .= '<img src="../../theme/eldy/img/tick.png" title="Ok">';
-	}
-	else
-	{
+	} else {
 		if ($name == 'xdebug') $html .= yn(0);
 		else $html .= '<img src="../../theme/eldy/img/warning.png" title="Warning">';
 	}
@@ -385,9 +385,7 @@ function getTableColumnFunction(array $functions)
 	if ($result)
 	{
 		$html .= '<img src="../../theme/eldy/img/tick.png" alt="Ok">';
-	}
-	else
-	{
+	} else {
 		$html .= '<img src="../../theme/eldy/img/warning.png" alt="Warning">';
 	}
 
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 5e4e9eff82f..aef15f11f5d 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -108,17 +108,13 @@ xdebug.auto_trace=0
 	         XDebug with same port than in php.ini<br>
 	         Allow Remote debug=yes or prompt<br>'."\n";
 		print "<br>\n";
-	}
-	else
-	{
+	} else {
 		print socket_strerror(socket_last_error());
 		echo "Failed to connect to address=".$address." port=".$port."<br>\n";
 		echo "There is no Remote debug server at this address.\n";
 	}
 	socket_close($socket);
-}
-else
-{
+} else {
 	print "Can't test if PHPDebug is OK as PHP socket functions are not enabled.";
 }
 
diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php
index f9bb8f39641..51a089336c6 100644
--- a/htdocs/admin/taxes.php
+++ b/htdocs/admin/taxes.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array('admin', 'objects', 'companies', 'products'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 
@@ -130,9 +130,7 @@ print load_fiche_titre($langs->trans('TaxSetup'), $linkback, 'title_setup');
 if (empty($mysoc->tva_assuj))
 {
 	print $langs->trans("YourCompanyDoesNotUseVAT").'<br>';
-}
-else
-{
+} else {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -150,9 +148,7 @@ else
 		print '<td class="nowrap right">';
 		print $langs->trans("NotAvailableWhenAjaxDisabled");
 		print "</td>";
-	}
-	else
-	{
+	} else {
 		print '<td width="120">';
 		$listval = array(
 			'0'=>$langs->trans(""),
@@ -205,9 +201,7 @@ else
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else
-	{
+	} else {
 		print $langs->trans("OnDelivery");
 		print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
 	}
@@ -217,9 +211,7 @@ else
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else
-	{
+	} else {
 		print $langs->trans("OnDelivery");
 		print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
 	}
@@ -232,9 +224,7 @@ else
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else
-	{
+	} else {
 		print $langs->trans("OnInvoice");
 		print ' ('.$langs->trans("InvoiceDateUsed").')';
 	}
@@ -244,9 +234,7 @@ else
 	{
 		print $langs->trans("OnPayment");
 		print ' ('.$langs->trans("SupposedToBePaymentDate").')';
-	}
-	else
-	{
+	} else {
 		print $langs->trans("OnInvoice");
 		print ' ('.$langs->trans("InvoiceDateUsed").')';
 	}
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 68b22e60bd0..b30dd9c5f13 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -37,7 +37,7 @@ if (!$user->admin) {
 
 // Parameters
 $value = GETPOST('value', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'ticket';
@@ -63,9 +63,7 @@ if ($action == 'updateMask') {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 } elseif ($action == 'setmod') {
@@ -255,7 +253,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->TICKET_ADDON == 'mod_'.$classname) {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
diff --git a/htdocs/admin/ticket_extrafields.php b/htdocs/admin/ticket_extrafields.php
index a01996b31ac..91e5df44180 100644
--- a/htdocs/admin/ticket_extrafields.php
+++ b/htdocs/admin/ticket_extrafields.php
@@ -39,7 +39,7 @@ foreach ($tmptype2label as $key => $val) {
 	$type2label[$key] = $langs->trans($val);
 }
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'ticket'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 6b8a23c94fc..011de9422bf 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -37,7 +37,7 @@ if (!$user->admin) {
 
 // Parameters
 $value = GETPOST('value', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'ticket';
@@ -106,6 +106,12 @@ if ($action == 'setvar') {
     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);
+	if (!$res > 0) {
+		$error++;
+	}
 }
 
 if ($action == 'setvarother') {
@@ -176,14 +182,12 @@ $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&value=1'.$param.'">';
+    $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
-{
+} else {
     // Button on, click to disable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setTICKET_ENABLE_PUBLIC_INTERFACE&value=0'.$param.'">';
+    $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>';
 }
@@ -379,7 +383,31 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
     print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
     print '</td></tr>';
 
-    print '</table>';
+	// Activate email notification when a new message is added
+	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');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED", $arrval, $conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED);
+	}
+	print '</td>';
+	print '<td align="center">';
+	print $form->textwithpicto('', $langs->trans("TicketsPublicNotificationNewMessageHelp"), 1, 'help');
+	print '</td>';
+	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 '</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 '</td>';
+	print '<td align="center">';
+	print $form->textwithpicto('', $langs->trans("TicketPublicNotificationNewMessageDefaultEmailHelp"), 1, 'help');
+	print '</td></tr>';
+
+	print '</table>';
 	print '</div>';
 
     print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 6c376b02300..5e990709d19 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -29,10 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 $langs->load("admin");
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "date";
@@ -56,9 +56,7 @@ if ($action == 'delete')
 		$ret = dol_delete_file($file, 1);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
-	else
-	{
+	} else {
 		$file = $conf->admin->dir_output.'/documents/'.basename(GETPOST('urlfile', 'alpha'));
 		$ret = dol_delete_file($file, 1);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
@@ -67,6 +65,7 @@ if ($action == 'delete')
 	$action = '';
 }
 
+
 /*
  * View
  */
@@ -121,7 +120,9 @@ if (in_array($type, array('pgsql'))) {
 print "});\n";
 print "</script>\n";
 
-print load_fiche_titre($langs->trans("Backup"), '', 'title_setup');
+$title = $langs->trans("Backup");
+
+print load_fiche_titre($title, '', 'title_setup');
 //print_barre_liste($langs->trans("Backup"), '', '', '', '', '', $langs->trans("BackupDesc",DOL_DATA_ROOT), 0, 0, 'title_setup');
 
 print '<div class="center opacitymedium">';
@@ -141,7 +142,9 @@ print '<br>';
 
 print '<div id="backupdatabaseleft" class="fichehalfleft" >';
 
-print load_fiche_titre($title ? $title : $langs->trans("BackupDumpWizard"));
+$title = $langs->trans("BackupDumpWizard");
+
+print load_fiche_titre($title);
 
 print '<table width="100%" class="'.($useinecm ? 'nobordernopadding' : 'liste').' nohover">';
 print '<tr class="liste_titre">';
@@ -149,7 +152,7 @@ print '<td class="liste_titre">';
 print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b><br>';
 print '</td>';
 print '</tr>';
-print '<tr '.$bc[false].'><td style="padding-left: 8px">';
+print '<tr class="oddeven nohover"><td style="padding-left: 8px" class="nohover">';
 print '<table class="centpercent">';
 print '<tr>';
 print '<td class="tdtop">';
@@ -157,19 +160,19 @@ print '<td class="tdtop">';
 print '<div id="div_container_exportoptions">';
 print '<fieldset id="exportoptions"><legend>'.$langs->trans("ExportMethod").'</legend>';
 if (in_array($type, array('mysql', 'mysqli'))) {
-    print '<div class="formelementrow"><input type="radio" name="what" value="mysql" id="radio_dump_mysql" />';
-    print '<label for="radio_dump_mysql">MySQL	Dump (mysqldump)</label>';
-    print '</div>';
-    print '<br>';
-    print '<div class="formelementrow"><input type="radio" name="what" value="mysqlnobin" id="radio_dump_mysql_nobin" />';
-    print '<label for="radio_dump_mysql">MySQL Dump (php) '.img_warning($langs->trans('BackupPHPWarning')).'</label>';
-    print '</div>';
+	print '<div class="formelementrow"><input type="radio" name="what" value="mysql" id="radio_dump_mysql" />';
+	print '<label for="radio_dump_mysql">MySQL	Dump (mysqldump)</label>';
+	print '</div>';
+	print '<br>';
+	print '<div class="formelementrow"><input type="radio" name="what" value="mysqlnobin" id="radio_dump_mysql_nobin" />';
+	print '<label for="radio_dump_mysql_nobin">MySQL Dump (php) '.img_warning($langs->trans('BackupPHPWarning')).'</label>';
+	print '</div>';
 } elseif (in_array($type, array('pgsql'))) {
-    print '<div class="formelementrow"><input type="radio" name="what"	value="postgresql" id="radio_dump_postgresql" />';
-    print '<label for="radio_dump_postgresql">PostgreSQL Dump (pg_dump)</label>';
-    print '</div>';
+	print '<div class="formelementrow"><input type="radio" name="what" value="postgresql" id="radio_dump_postgresql" />';
+	print '<label for="radio_dump_postgresql">PostgreSQL Dump (pg_dump)</label>';
+	print '</div>';
 } else {
-    print 'No method available with database '.$label;
+	print 'No method available with database '.$label;
 }
 print '</fieldset>';
 print '</div>';
@@ -180,204 +183,200 @@ print '<td class="tdtop">';
 
 print '<div id="div_container_sub_exportoptions">';
 if (in_array($type, array('mysql', 'mysqli'))) {
-    print "<!--  Fieldset mysqldump -->\n";
-    print '<fieldset id="mysql_options"><legend>'.$langs->trans("MySqlExportParameters").'</legend>';
+	print "<!--  Fieldset mysqldump -->\n";
+	print '<fieldset id="mysql_options"><legend>'.$langs->trans("MySqlExportParameters").'</legend>';
 
-    print '<div class="formelementrow">'.$langs->trans("FullPathToMysqldumpCommand");
-    if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
-    {
-        $fullpathofmysqldump = $db->getPathOfDump();
-    }
-    else
-    {
-        $fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
-    }
-    print '<br>';
-    print '<input type="text" name="mysqldump" style="width: 80%" value="'.$fullpathofmysqldump.'" /></div>';
+	print '<div class="formelementrow">'.$langs->trans("FullPathToMysqldumpCommand");
+	if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
+	{
+		$fullpathofmysqldump = $db->getPathOfDump();
+	} else {
+		$fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
+	}
+	print '<br>';
+	print '<input type="text" name="mysqldump" style="width: 80%" value="'.$fullpathofmysqldump.'" /></div>';
 
-    print '<br>';
-    print '<fieldset><legend>'.$langs->trans("ExportOptions").'</legend>';
-    print '<div class="formelementrow">';
-    print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" />';
-    print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
-    print '</div>';
+	print '<br>';
+	print '<fieldset><legend>'.$langs->trans("ExportOptions").'</legend>';
+	print '<div class="formelementrow">';
+	print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" />';
+	print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
+	print '</div>';
 
-    if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
-        print '<div class="formelementrow">';
-        print '<input type="checkbox" name="disable_fk" value="yes" id="checkbox_disable_fk" checked />';
-        print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
-        print '</div>';
-    }
+	if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
+		print '<div class="formelementrow">';
+		print '<input type="checkbox" name="disable_fk" value="yes" id="checkbox_disable_fk" checked />';
+		print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
+		print '</div>';
+	}
 
-    print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
+	print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
 
-    print '<select name="sql_compat" id="select_sql_compat" class="flat">';
-    print '<option value="NONE" selected>NONE</option>';
-    print '<option value="ANSI">ANSI</option>';
-    print '<option value="DB2">DB2</option>';
-    print '<option value="MAXDB">MAXDB</option>';
-    print '<option value="MYSQL323">MYSQL323</option>';
-    print '<option value="MYSQL40">MYSQL40</option>';
-    print '<option value="MSSQL">MSSQL</option>';
-    print '<option value="ORACLE">ORACLE</option>';
-    print '<option value="POSTGRESQL">POSTGRESQL</option>';
-    print '</select>';
-    print '<br>';
+	print '<select name="sql_compat" id="select_sql_compat" class="flat">';
+	print '<option value="NONE" selected>NONE</option>';
+	print '<option value="ANSI">ANSI</option>';
+	print '<option value="DB2">DB2</option>';
+	print '<option value="MAXDB">MAXDB</option>';
+	print '<option value="MYSQL323">MYSQL323</option>';
+	print '<option value="MYSQL40">MYSQL40</option>';
+	print '<option value="MSSQL">MSSQL</option>';
+	print '<option value="ORACLE">ORACLE</option>';
+	print '<option value="POSTGRESQL">POSTGRESQL</option>';
+	print '</select>';
+	print '<br>';
 
-    print '<input type="checkbox" name="use_mysql_quick_param" value="yes" id="checkbox_use_quick" />';
-    print '<label for="checkbox_use_quick">';
-    print $form->textwithpicto($langs->trans('ExportUseMySQLQuickParameter'), $langs->trans('ExportUseMySQLQuickParameterHelp'));
+	print '<input type="checkbox" name="use_mysql_quick_param" value="yes" id="checkbox_use_quick" />';
+	print '<label for="checkbox_use_quick">';
+	print $form->textwithpicto($langs->trans('ExportUseMySQLQuickParameter'), $langs->trans('ExportUseMySQLQuickParameterHelp'));
 	print '</label>';
 	print '<br/>';
 
-    print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
-    print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
-    print '-->';
-    print '</fieldset>';
+	print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
+	print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
+	print '-->';
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
-    print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
-    print '</legend>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
+	print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
+	print '</legend>';
 
-    print '<input type="checkbox" name="drop"'.((! GETPOSTISSET("drop") || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
-    print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
-    print '<br>';
-    print '</fieldset>';
+	print '<input type="checkbox" name="drop"'.((! GETPOSTISSET("drop") || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
+	print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
+	print '<br>';
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
-    print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
-    print '</legend>';
-    print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
-    print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
-    print '<br>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
+	print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
+	print '</legend>';
+	print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
+	print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" checked />';
-    print '<label for="checkbox_dump_extended_ins">'.$langs->trans("ExtendedInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" checked />';
+	print '<label for="checkbox_dump_extended_ins">'.$langs->trans("ExtendedInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="disable-add-locks" value="no" id="checkbox_dump_disable-add-locks" />';
-    print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="disable-add-locks" value="no" id="checkbox_dump_disable-add-locks" />';
+	print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="delayed" value="yes" id="checkbox_dump_delayed" />';
-    print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="delayed" value="yes" id="checkbox_dump_delayed" />';
+	print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="sql_ignore" value="yes" id="checkbox_dump_ignore" />';
-    print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="sql_ignore" value="yes" id="checkbox_dump_ignore" />';
+	print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="hexforbinary" value="yes" id="checkbox_hexforbinary" checked />';
-    print '<label for="checkbox_hexforbinary">'.$langs->trans("EncodeBinariesInHexa").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="hexforbinary" value="yes" id="checkbox_hexforbinary" checked />';
+	print '<label for="checkbox_hexforbinary">'.$langs->trans("EncodeBinariesInHexa").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
-    print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
+	print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
+	print '<br>';
 
-    print '</fieldset>';
-    print '</fieldset>';
-    print "<!--  Fieldset mysql_nobin -->\n";
-    print '<fieldset id="mysql_nobin_options">';
-    print '<legend>'.$langs->trans("MySqlExportParameters").'</legend>';
-    print '<fieldset>';
-    print '<legend>'.$langs->trans("ExportOptions").'</legend>';
-    print '<div class="formelementrow">';
-    print '<input type="checkbox" name="nobin_use_transaction" value="yes" id="checkbox_use_transaction" />';
-    print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
+	print '</fieldset>';
+	print '</fieldset>';
+	print "<!--  Fieldset mysql_nobin -->\n";
+	print '<fieldset id="mysql_nobin_options">';
+	print '<legend>'.$langs->trans("MySqlExportParameters").'</legend>';
+	print '<fieldset>';
+	print '<legend>'.$langs->trans("ExportOptions").'</legend>';
+	print '<div class="formelementrow">';
+	print '<input type="checkbox" name="nobin_use_transaction" value="yes" id="checkbox_use_transaction" />';
+	print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
 
-    print '</div>';
-    if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
-        print '<div class="formelementrow">';
-        print '<input type="checkbox" name="nobin_disable_fk" value="yes" id="checkbox_disable_fk" checked />';
-        print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
-        print '</div>';
-    }
-    print '</fieldset>';
+	print '</div>';
+	if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
+		print '<div class="formelementrow">';
+		print '<input type="checkbox" name="nobin_disable_fk" value="yes" id="checkbox_disable_fk" checked />';
+		print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
+		print '</div>';
+	}
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset><legend>'.$langs->trans('ExportStructure').'</legend>';
-    print '<input type="checkbox" name="nobin_drop"'.((! GETPOSTISSET("nobin_drop") || GETPOST('nobin_drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
-    print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
-    print '<br>';
-    print '</fieldset>';
+	print '<br>';
+	print '<fieldset><legend>'.$langs->trans('ExportStructure').'</legend>';
+	print '<input type="checkbox" name="nobin_drop"'.((! GETPOSTISSET("nobin_drop") || GETPOST('nobin_drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
+	print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
+	print '<br>';
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>'.$langs->trans("Datas").'</legend>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>'.$langs->trans("Datas").'</legend>';
 
-    print '<input type="checkbox" name="nobin_nolocks" value="no" id="checkbox_dump_disable-add-locks" />';
-    print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_nolocks" value="no" id="checkbox_dump_disable-add-locks" />';
+	print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="nobin_delayed" value="yes" id="checkbox_dump_delayed" />';
-    print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_delayed" value="yes" id="checkbox_dump_delayed" />';
+	print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="nobin_sql_ignore" value="yes" id="checkbox_dump_ignore" />';
-    print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_sql_ignore" value="yes" id="checkbox_dump_ignore" />';
+	print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="nobin_charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
-    print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
+	print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
+	print '<br>';
 
-    print '</fieldset>';
-    print '</fieldset>';
+	print '</fieldset>';
+	print '</fieldset>';
 }
 
 if (in_array($type, array('pgsql'))) {
-    print "<!--  Fieldset pg_dump -->\n";
-    print '<fieldset id="postgresql_options"><legend>'.$langs->trans("PostgreSqlExportParameters").'</legend>';
+	print "<!--  Fieldset pg_dump -->\n";
+	print '<fieldset id="postgresql_options"><legend>'.$langs->trans("PostgreSqlExportParameters").'</legend>';
 
-    print '<div class="formelementrow">'.$langs->trans("FullPathToPostgreSQLdumpCommand");
-    if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
-        $fullpathofpgdump = $db->getPathOfDump();
-    }
-    else
-    {
-        $fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
-    }
-    print '<br>';
-    print '<input type="text" name="postgresqldump" style="width: 80%" value="'.$fullpathofpgdump.'" /></div>';
+	print '<div class="formelementrow">'.$langs->trans("FullPathToPostgreSQLdumpCommand");
+	if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
+		$fullpathofpgdump = $db->getPathOfDump();
+	} else {
+		$fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+	}
+	print '<br>';
+	print '<input type="text" name="postgresqldump" style="width: 80%" value="'.$fullpathofpgdump.'" /></div>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>'.$langs->trans("ExportOptions").'</legend>';
-    print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
-    print '<select name="sql_compat" id="select_sql_compat" class="flat">';
-    print '<option value="POSTGRESQL" selected>POSTGRESQL</option>';
-    print '<option value="ANSI">ANSI</option>';
-    print '</select>';
-    print '<br>';
-    print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
-    print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
-    print '-->';
-    print '</fieldset>';
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
-    print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
-    print '</legend>';
-    print '</fieldset>';
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
-    print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
-    print '</legend>';
-    print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
-    print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
-    print '<br>';
-    print '</fieldset>';
-    print '</fieldset>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>'.$langs->trans("ExportOptions").'</legend>';
+	print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
+	print '<select name="sql_compat" id="select_sql_compat" class="flat">';
+	print '<option value="POSTGRESQL" selected>POSTGRESQL</option>';
+	print '<option value="ANSI">ANSI</option>';
+	print '</select>';
+	print '<br>';
+	print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
+	print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
+	print '-->';
+	print '</fieldset>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
+	print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
+	print '</legend>';
+	print '</fieldset>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
+	print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
+	print '</legend>';
+	print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
+	print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
+	print '<br>';
+	print '</fieldset>';
+	print '</fieldset>';
 }
 print '</div>';
 
@@ -424,19 +423,17 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	//     'id' => 'radio_compression_zip',
 	//     'label' => $langs->trans("FormatZip")
 	// );
-    $compression['bz'] = array(
+	$compression['bz'] = array(
 		'function' => 'bzopen',
 		'id' => 'radio_compression_bzip',
 		'label' => $langs->trans("Bzip2")
 	);
-    $compression['none'] = array(
-    	'function' => '',
-    	'id' => 'radio_compression_none',
-    	'label' => $langs->trans("None")
-    );
-}
-else
-{
+	$compression['none'] = array(
+		'function' => '',
+		'id' => 'radio_compression_none',
+		'label' => $langs->trans("None")
+	);
+} else {
 	$compression['none'] = array(
 		'function' => '',
 		'id' => 'radio_compression_none',
@@ -464,9 +461,7 @@ foreach ($compression as $key => $val)
 		if ($key == 'gz') $checked = ' checked';
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-	}
-	else
-	{
+	} else {
 		// Disabled export format
 		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
 		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
@@ -490,14 +485,14 @@ print '<br>';
 
 if (!empty($_SESSION["commandbackuplastdone"]))
 {
-    print '<br><b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
-    print '<textarea rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuplastdone"].'</textarea><br>'."\n";
-    print '<br>';
+	print '<br><b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
+	print '<textarea rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuplastdone"].'</textarea><br>'."\n";
+	print '<br>';
 
-    //print $paramclear;
+	//print $paramclear;
 
-    // Now show result
-    print '<b>'.$langs->trans("BackupResult").':</b> ';
+	// Now show result
+	print '<b>'.$langs->trans("BackupResult").':</b> ';
 	print $_SESSION["commandbackupresult"];
 
 	$_SESSION["commandbackuplastdone"] = '';
@@ -578,21 +573,20 @@ $filecompression['zip'] = array('function' => 'dol_compress_dir', 'id' => 'radio
 $i = 0;
 foreach ($filecompression as $key => $val)
 {
-    if (!$val['function'] || function_exists($val['function']))	// Enabled export format
-    {
-    	$checked = '';
-    	if ($key == 'gz') $checked = ' checked';
-        print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
-        print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-    }
-    else	// Disabled export format
-    {
-        print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
-        print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-        print ' <span class="opacitymedium">('.$langs->trans("NotAvailable").')</span>';
-    }
-    print ' &nbsp; &nbsp; ';
-    $i++;
+	if (!$val['function'] || function_exists($val['function']))	// Enabled export format
+	{
+		$checked = '';
+		if ($key == 'gz') $checked = ' checked';
+		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
+		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
+	} else // Disabled export format
+	{
+		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
+		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
+		print ' <span class="opacitymedium">('.$langs->trans("NotAvailable").')</span>';
+	}
+	print ' &nbsp; &nbsp; ';
+	$i++;
 }
 
 print '</div>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index e9885e82bfe..224bbc14b56 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -105,8 +105,7 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
         <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">
@@ -114,9 +113,7 @@ print $langs->trans("RestoreDesc3", $dolibarr_main_db_name).'<br><br>';
         <label for="radio_dump_postgresql">PostgreSQL Restore (pg_restore or psql)</label>
     </div>
         <?php
-    }
-    else
-    {
+    } else {
         print 'No method available with database '.$label;
     }
     ?>
@@ -161,8 +158,7 @@ if (in_array($type, array('mysql', 'mysqli')))
     //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')))
+} elseif (in_array($type, array('pgsql')))
 {
     print '<fieldset id="postgresql_options">';
     print '<legend>Restore PostgreSQL</legend>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index dc0f7a27f8a..7ab26f6f6e0 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -30,15 +30,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 $langs->load("admin");
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $what = GETPOST('what', 'alpha');
 $export_type = GETPOST('export_type', 'alpha');
 $file = GETPOST('filename_template', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -122,7 +122,7 @@ $utils = new Utils($db);
 // MYSQL
 if ($what == 'mysql')
 {
-    $cmddump = GETPOST("mysqldump"); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
+    $cmddump = GETPOST("mysqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
     $cmddump = dol_sanitizePathName($cmddump);
 
     if (!empty($dolibarr_main_restrict_os_commands))
@@ -163,7 +163,7 @@ if ($what == 'mysqlnobin')
 // POSTGRESQL
 if ($what == 'postgresql')
 {
-    $cmddump = GETPOST("postgresqldump"); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
+    $cmddump = GETPOST("postgresqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
     $cmddump = dol_sanitizePathName($cmddump);
 
     /* Not required, the command is output on screen but not ran for pgsql
@@ -203,9 +203,7 @@ if ($errormsg)
     $resultstring .= '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
 
     $_SESSION["commandbackupresult"] = $resultstring;
-}
-else
-{
+} else {
 	if ($what)
 	{
         setEventMessages($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"), null, 'mesgs');
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index de10759c92d..28eaa2d9d54 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -30,22 +30,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 $langs->load("admin");
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $what = GETPOST('what', 'alpha');
 $export_type = GETPOST('export_type', 'alpha');
-$file = trim(GETPOST('zipfilename_template', 'alpha'));
+$file = GETPOST('zipfilename_template', 'alpha');
 $compression = GETPOST('compression');
 
 $file = dol_sanitizeFileName($file);
 $file = preg_replace('/(\.zip|\.tar|\.tgz|\.gz|\.tar\.gz|\.bz2)$/i', '', $file);
 
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "date";
-if ($page < 0) { $page = 0; }
-elseif (empty($page)) $page = 0;
+if ($page < 0) { $page = 0; } elseif (empty($page)) $page = 0;
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
@@ -114,20 +113,18 @@ $utils = new Utils($db);
 if ($compression == 'zip')
 {
 	$file .= '.zip';
-    $ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.log|\/temp\/|documents\/admin\/documents\/)/');
+    $ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.back|\.old|\.log|[\\\/]temp[\\\/]|documents[\\\/]admin[\\\/]documents[\\\/])/i');
     if ($ret < 0)
     {
     	if ($ret == -2) {
     		$langs->load("errors");
     		$errormsg = $langs->trans("ErrNoZipEngine");
-    	}
-    	else {
+    	} else {
     		$langs->load("errors");
     		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir);
     	}
     }
-}
-elseif (in_array($compression, array('gz', 'bz')))
+} elseif (in_array($compression, array('gz', 'bz')))
 {
 	$userlogin = ($user->login ? $user->login : 'unknown');
 
@@ -145,9 +142,7 @@ elseif (in_array($compression, array('gz', 'bz')))
         $langs->load("errors");
         dol_syslog("Documents tar retval after exec=".$retval, LOG_ERR);
         $errormsg = 'Error tar generation return '.$retval;
-    }
-    else
-    {
+    } else {
         if ($compression == 'gz')
         {
             $cmd = "gzip -f ".$outputdir."/".$file;
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index f57a16332df..82111e0716d 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2004-2017  Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2020  Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015       Bahfir Abbes		<bafbes@gmail.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.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
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -46,8 +46,8 @@ $langs->loadLangs(array("companies", "admin", "users", "other"));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -60,8 +60,8 @@ $search_code = GETPOST("search_code", "alpha");
 $search_ip   = GETPOST("search_ip", "alpha");
 $search_user = GETPOST("search_user", "alpha");
 $search_desc = GETPOST("search_desc", "alpha");
-$search_ua   = GETPOST("search_ua", "none");
-$search_prefix_session = GETPOST("search_prefix_session", "none");
+$search_ua   = GETPOST("search_ua", "restricthtml");
+$search_prefix_session = GETPOST("search_prefix_session", "restricthtml");
 
 if (GETPOST("date_startmonth") == '' || GETPOST("date_startmonth") > 0) $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 else $date_start = -1;
@@ -146,9 +146,7 @@ if ($action == 'confirm_purge' && $confirm == 'yes' && $user->admin)
 	{
 	    $db->commit();
 		dol_syslog($text, LOG_WARNING);
-	}
-	else
-	{
+	} else {
 		$error++;
 		dol_syslog($securityevent->error, LOG_ERR);
 		$db->rollback();
@@ -169,7 +167,7 @@ $usefilter = 0;
 
 $sql = "SELECT e.rowid, e.type, e.ip, e.user_agent, e.dateevent,";
 $sql .= " e.fk_user, e.description, e.prefix_session,";
-$sql .= " u.login";
+$sql .= " u.login, u.admin, u.entity, u.firstname, u.lastname, u.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."events as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
 $sql .= " WHERE e.entity IN (".getEntity('event').")";
@@ -228,6 +226,7 @@ if ($result)
     }
 
 	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);
 
@@ -237,6 +236,20 @@ if ($result)
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('PurgeAuditEvents'), $langs->trans('ConfirmPurgeAuditEvents'), 'confirm_purge', $formquestion, 'no', 1);
 	}
 
+	// Check some parameters
+	// TODO Add a tab with this and other information
+	/*
+	global $dolibarr_main_prod, $dolibarr_nocsrfcheck;
+	if (empty($dolibarr_main_prod)) {
+		print $langs->trans("Warning").' dolibarr_main_prod = '.$dolibarr_main_prod;
+		print ' '.img_warning($langs->trans('SwitchThisForABetterSecurity', 1)).'<br>';
+	}
+	if (!empty($dolibarr_nocsrfcheck)) {
+		print $langs->trans("Warning").' dolibarr_nocsrfcheck = '.$dolibarr_nocsrfcheck;
+		print ' '.img_warning($langs->trans('SwitchThisForABetterSecurity', 0)).'<br>';
+	}
+	*/
+
 	print '<div class="div-table-responsive">';
 	print '<table class="liste centpercent">';
 
@@ -324,9 +337,19 @@ if ($result)
 		{
 			$userstatic->id = $obj->fk_user;
 			$userstatic->login = $obj->login;
+			$userstatic->admin = $obj->admin;
+			$userstatic->entity = $obj->entity;
+			$userstatic->status = $obj->status;
+
 			print $userstatic->getLoginUrl(1);
-		}
-		else print '&nbsp;';
+			if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
+			{
+				print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
+			} elseif ($userstatic->admin)
+			{
+				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
+			}
+		} else print '&nbsp;';
 		print '</td>';
 
 		// Description
@@ -379,9 +402,7 @@ if ($result)
 
 	print "</form>";
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 253f4919092..aedc41e0b23 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -31,7 +31,7 @@ $langs->loadLangs(array("companies", "install", "users", "other"));
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -115,8 +115,7 @@ if ($action == 'purge')
 {
 	$formquestion = array();
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('PurgeSessions'), $langs->trans('ConfirmPurgeSessions'), 'confirm_purge', $formquestion, 'no', 2);
-}
-elseif ($action == 'lock')
+} elseif ($action == 'lock')
 {
 	$formquestion = array();
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?noparam=noparam', $langs->trans('LockNewSessions'), $langs->trans('ConfirmLockNewSessions', $user->login), 'confirm_lock', $formquestion, 'no', 1);
@@ -171,9 +170,7 @@ if ($savehandler == 'files')
 		print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoSessionFound", $savepath, $openbasedir).'</td></tr>';
 	}
 	print "</table>";
-}
-else
-{
+} else {
 	print $langs->trans("NoSessionListWithThisHandler");
 }
 
@@ -187,9 +184,7 @@ print '<div class="tabsAction">';
 if (empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=lock">'.$langs->trans("LockNewSessions").'</a>';
-}
-else
-{
+} else {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=confirm_unlock">'.$langs->trans("UnlockNewSessions").'</a>';
 }
 
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 9898e290ddc..c41b43b3b48 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -29,7 +29,7 @@ $langs->load("admin");
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $choice = GETPOST('choice', 'aZ09');
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 260b4afe2d0..27b53e8266e 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if (!$user->admin) accessforbidden();
 
@@ -98,14 +98,10 @@ if (function_exists('curl_init'))
 
 			// Show version
 			print $langs->trans("LastStableVersion").' : <b>'.(($version != '0.0') ? $version : $langs->trans("Unknown")).'</b><br>';
-		}
-		else
-		{
+		} else {
 			print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("UpdateServerOffline").'</b><br>';
 		}
-	}
-	else
-	{
+	} else {
 		print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">'.$langs->trans("Check").'</a><br>';
 	}
 }
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 8f764a93b98..c962a9fb776 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -33,11 +33,11 @@ $langs->loadLangs(array("companies", "products", "admin", "sms", "other", "error
 if (!$user->admin) accessforbidden();
 
 $id = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $langcode = GETPOST('langcode', 'alphanohtml');
 $transkey = GETPOST('transkey', 'alphanohtml');
-$transvalue = GETPOST('transvalue', 'none');
+$transvalue = GETPOST('transvalue', 'restricthtml');
 
 
 $mode = GETPOST('mode', 'aZ09') ?GETPOST('mode', 'aZ09') : 'searchkey';
@@ -73,16 +73,16 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $transkey = '';
-    $transvalue = '';
-    $toselect = '';
-    $search_array_options = array();
+	$transkey = '';
+	$transvalue = '';
+	$toselect = '';
+	$search_array_options = array();
 }
 
 if ($action == 'setMAIN_ENABLE_OVERWRITE_TRANSLATION')
 {
-    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, 'chaine', 0, '', $conf->entity);
-    else dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 0, 'chaine', 0, '', $conf->entity);
+	if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 0, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'update')
@@ -105,16 +105,12 @@ if ($action == 'update')
 			$action = "";
 			$transkey = "";
 			$transvalue = "";
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
-			}
-			else
-			{
+			} else {
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
 			$action = '';
@@ -143,29 +139,25 @@ if ($action == 'add')
 	}
 	if (!$error)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    $sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
-		    $db->commit();
-		    setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			$db->commit();
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action = "";
 			$transkey = "";
 			$transvalue = "";
-		}
-		else
-		{
-		    $db->rollback();
-		    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		    {
-		        setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
-		    }
-		    else
-		    {
-		        setEventMessages($db->lasterror(), null, 'errors');
-            }
+		} else {
+			$db->rollback();
+			if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
+			} else {
+				setEventMessages($db->lasterror(), null, 'errors');
+			}
 			$action = '';
 		}
 	}
@@ -179,9 +171,7 @@ if ($action == 'delete')
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -206,17 +196,15 @@ $enabledisablehtml = '';
 $enabledisablehtml .= $langs->trans("EnableOverwriteTranslation").' ';
 if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
 {
-    // Button off, click to enable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=1'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $enabledisablehtml .= '</a>';
-}
-else
-{
-    // Button on, click to disable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&value=0'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
-    $enabledisablehtml .= '</a>';
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
+} else {
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
 }
 
 print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_setup');
@@ -259,43 +247,43 @@ if ($mode == 'overwrite')
 	if ($action == 'edit' || empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) $disablededit = ' disabled';
 
 	print '<div class="justify"><span class="opacitymedium">';
-    print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
-    $urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
-    print ' ('.$langs->trans("SeeAlso", '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>').')<br>';
-    print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
-    print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
-    print '</span></div>';
+	print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
+	$urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
+	print ' ('.$langs->trans("SeeAlso", '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>').')<br>';
+	print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
+	print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
+	print '</span></div>';
 
-    print '<br>';
+	print '<br>';
 
 
 	print '<input type="hidden" name="action" value="'.($action == 'edit' ? 'update' : 'add').'">';
-    print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
-    print '<td align="center"></td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
+	//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
+	print '<td align="center"></td>';
+	print "</tr>\n";
 
 
-    // Line to add new record
-    print "\n";
+	// Line to add new record
+	print "\n";
 
-    print '<tr class="oddeven"><td>';
-    print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit ? 1 : 0, 'maxwidthonsmartphone', 1);
-    print '</td>'."\n";
-    print '<td>';
-    print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" id="transkey" value="'.(!empty($transkey) ? $transkey : "").'">';
-    print '</td><td>';
-    print '<input type="text" class="quatrevingtpercent"'.$disablededit.' name="transvalue" id="transvalue" value="'.(!empty($transvalue) ? $transvalue : "").'">';
-    print '</td>';
-    // Limit to superadmin
-    /*if (! empty($conf->multicompany->enabled) && !$user->entity)
+	print '<tr class="oddeven"><td>';
+	print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit ? 1 : 0, 'maxwidthonsmartphone', 1);
+	print '</td>'."\n";
+	print '<td>';
+	print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" id="transkey" value="'.(!empty($transkey) ? $transkey : "").'">';
+	print '</td><td>';
+	print '<input type="text" class="quatrevingtpercent"'.$disablededit.' name="transvalue" id="transvalue" value="'.(!empty($transvalue) ? $transvalue : "").'">';
+	print '</td>';
+	// Limit to superadmin
+	/*if (! empty($conf->multicompany->enabled) && !$user->entity)
     {
     	print '<td>';
     	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
@@ -304,124 +292,118 @@ if ($mode == 'overwrite')
     }
     else
     {*/
-    	print '<td class="center">';
-    	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-    //}
-    print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
-    print "</td>\n";
-    print '</tr>';
+		print '<td class="center">';
+		print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
+	//}
+	print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
+	print "</td>\n";
+	print '</tr>';
 
 
-    // Show constants
-    $sql = "SELECT rowid, entity, lang, transkey, transvalue";
-    $sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-    $sql .= " WHERE 1 = 1";
-    $sql .= " AND entity IN (".getEntity('overwrite_trans').")";
-    $sql .= $db->order($sortfield, $sortorder);
+	// Show constants
+	$sql = "SELECT rowid, entity, lang, transkey, transvalue";
+	$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
+	$sql .= " WHERE 1 = 1";
+	$sql .= " AND entity IN (".getEntity('overwrite_trans').")";
+	$sql .= $db->order($sortfield, $sortorder);
 
-    dol_syslog("translation::select from table", LOG_DEBUG);
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
+	dol_syslog("translation::select from table", LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
 
-    	while ($i < $num)
-    	{
-    		$obj = $db->fetch_object($result);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($result);
 
-    		print "\n";
+			print "\n";
 
-    		print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-    		print '<td>'.$obj->lang.'</td>'."\n";
-    		print '<td>'.$obj->transkey.'</td>'."\n";
+			print '<td>'.$obj->lang.'</td>'."\n";
+			print '<td>'.$obj->transkey.'</td>'."\n";
 
-    		// Value
-    		print '<td>';
-    		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
+			// Value
+			print '<td>';
+			/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
     		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
     		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
     		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
     		*/
-    		if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
-    		{
-    			print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
-    		}
-    		else
-    		{
-    			print dol_escape_htmltag($obj->transvalue);
-    		}
-    		print '</td>';
+			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
+			{
+				print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
+			} else {
+				print dol_escape_htmltag($obj->transvalue);
+			}
+			print '</td>';
 
-    		print '<td class="center">';
-    		if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
-    		{
-    			print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';
-    			print '<input type="submit" class="button buttongen" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-    			print ' &nbsp; ';
-    			print '<input type="submit" class="button buttongen" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-    		}
-    		else
-    		{
-    			print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+			print '<td class="center">';
+			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
+			{
+				print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';
+				print '<input type="submit" class="button buttongen" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
-    		}
-    		print '</td>';
+				print '<input type="submit" class="button buttongen" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+			} else {
+				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+				print ' &nbsp; ';
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+			}
+			print '</td>';
 
-    		print "</tr>\n";
-    		print "\n";
-    		$i++;
-    	}
-    }
+			print "</tr>\n";
+			print "\n";
+			$i++;
+		}
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
 if ($mode == 'searchkey')
 {
-    $langcode = GETPOST('langcode') ?GETPOST('langcode') : $langs->defaultlang;
+	$langcode = GETPOST('langcode') ?GETPOST('langcode') : $langs->defaultlang;
 
-    $newlang = new Translate('', $conf);
-    $newlang->setDefaultLang($langcode);
+	$newlang = new Translate('', $conf);
+	$newlang->setDefaultLang($langcode);
 
-    $newlangfileonly = new Translate('', $conf);
-    $newlangfileonly->setDefaultLang($langcode);
+	$newlangfileonly = new Translate('', $conf);
+	$newlangfileonly->setDefaultLang($langcode);
 
-    $recordtoshow = array();
+	$recordtoshow = array();
 
-    // Search modules dirs
-    $modulesdir = dolGetModulesDirs();
+	// Search modules dirs
+	$modulesdir = dolGetModulesDirs();
 
-    $nbtotaloffiles = 0;
-    $nbempty = 0;
-    /*var_dump($langcode);
+	$nbtotaloffiles = 0;
+	$nbempty = 0;
+	/*var_dump($langcode);
      var_dump($transkey);
      var_dump($transvalue);*/
-    if (empty($langcode) || $langcode == '-1') $nbempty++;
-    if (empty($transkey)) $nbempty++;
-    if (empty($transvalue)) $nbempty++;
-    if ($action == 'search' && ($nbempty > 999))    // 999 to disable this
-    {
-        setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
-    }
-    else
-    {
-        // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
-        $i = 0;
-        foreach ($modulesdir as $keydir => $tmpsearchdir)
-        {
-        	$searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
+	if (empty($langcode) || $langcode == '-1') $nbempty++;
+	if (empty($transkey)) $nbempty++;
+	if (empty($transvalue)) $nbempty++;
+	if ($action == 'search' && ($nbempty > 999))    // 999 to disable this
+	{
+		setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
+	} else {
+		// Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
+		$i = 0;
+		foreach ($modulesdir as $keydir => $tmpsearchdir)
+		{
+			$searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
 
-        	// Directory of translation files
-        	$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
-        	$dir_lang_osencoded = dol_osencode($dir_lang);
+			// Directory of translation files
+			$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
+			$dir_lang_osencoded = dol_osencode($dir_lang);
 
-        	$filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
-        	foreach ($filearray as $file)
-        	{
+			$filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
+			foreach ($filearray as $file)
+			{
 				$tmpfile = preg_replace('/.lang/i', '', basename($file['name']));
 				$moduledirname = (basename(dirname(dirname($dir_lang))));
 
@@ -434,138 +416,135 @@ if ($mode == 'searchkey')
 				if ($result < 0) print 'Failed to load language file '.$tmpfile.'<br>'."\n";
 				else $nbtotaloffiles++;
 				//print 'After loading lang '.$langkey.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
-        	}
-        	$i++;
-        }
+			}
+			$i++;
+		}
 
-        // Now search into translation array
-        foreach ($newlang->tab_translate as $key => $val)
-        {
-            if ($transkey && !preg_match('/'.preg_quote($transkey, '/').'/i', $key)) continue;
-            if ($transvalue && !preg_match('/'.preg_quote($transvalue, '/').'/i', $val)) continue;
-            $recordtoshow[$key] = $val;
-        }
-    }
+		// Now search into translation array
+		foreach ($newlang->tab_translate as $key => $val)
+		{
+			if ($transkey && !preg_match('/'.preg_quote($transkey, '/').'/i', $key)) continue;
+			if ($transvalue && !preg_match('/'.preg_quote($transvalue, '/').'/i', $val)) continue;
+			$recordtoshow[$key] = $val;
+		}
+	}
 
-    //print '<br>';
-    $nbtotalofrecordswithoutfilters = count($newlang->tab_translate);
-    $nbtotalofrecords = count($recordtoshow);
-    $num = $limit + 1;
-    if (($offset + $num) > $nbtotalofrecords) $num = $limit;
+	//print '<br>';
+	$nbtotalofrecordswithoutfilters = count($newlang->tab_translate);
+	$nbtotalofrecords = count($recordtoshow);
+	$num = $limit + 1;
+	if (($offset + $num) > $nbtotalofrecords) $num = $limit;
 
-    //print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
-    $title = $langs->trans("TranslationKeySearch");
-    if ($nbtotalofrecords > 0) $title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')</span>';
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+	//print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
+	$title = $langs->trans("TranslationKeySearch");
+	if ($nbtotalofrecords > 0) $title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')</span>';
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-    print '<input type="hidden" id="action" name="action" value="search">';
-    print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" id="action" name="action" value="search">';
+	print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
-    print '<td align="center"></td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
+	//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
+	print '<td align="center"></td>';
+	print "</tr>\n";
 
-    // Line to search new record
-    print "\n";
+	// Line to search new record
+	print "\n";
 
-    print '<tr class="oddeven"><td>';
-    //print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
-    print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
-    print '</td>'."\n";
-    print '<td>';
-    print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.$transkey.'">';
-    print '</td><td>';
-    print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">';
-    // Limit to superadmin
-    /*if (! empty($conf->multicompany->enabled) && !$user->entity)
+	print '<tr class="oddeven"><td>';
+	//print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
+	print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
+	print '</td>'."\n";
+	print '<td>';
+	print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.$transkey.'">';
+	print '</td><td>';
+	print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">';
+	// Limit to superadmin
+	/*if (! empty($conf->multicompany->enabled) && !$user->entity)
     {
         print '</td><td>';
         print '<input type="text" class="flat" size="1" name="entitysearch" value="'.$conf->entity.'">';
     }
     else
     {*/
-        print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
-    //}
-    print '</td>';
-    // Action column
-    print '<td class="nowrap right">';
-    $searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+		print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
+	//}
+	print '</td>';
+	// Action column
+	print '<td class="nowrap right">';
+	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    if ($sortfield == 'transkey' && strtolower($sortorder) == 'asc') ksort($recordtoshow);
-    if ($sortfield == 'transkey' && strtolower($sortorder) == 'desc') krsort($recordtoshow);
-    if ($sortfield == 'transvalue' && strtolower($sortorder) == 'asc') asort($recordtoshow);
-    if ($sortfield == 'transvalue' && strtolower($sortorder) == 'desc') arsort($recordtoshow);
+	if ($sortfield == 'transkey' && strtolower($sortorder) == 'asc') ksort($recordtoshow);
+	if ($sortfield == 'transkey' && strtolower($sortorder) == 'desc') krsort($recordtoshow);
+	if ($sortfield == 'transvalue' && strtolower($sortorder) == 'asc') asort($recordtoshow);
+	if ($sortfield == 'transvalue' && strtolower($sortorder) == 'desc') arsort($recordtoshow);
 
-    // Show result
-    $i = 0;
-    foreach ($recordtoshow as $key => $val)
-    {
-        $i++;
-        if ($i <= $offset) continue;
-        if ($i > ($offset + $limit)) break;
-        print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
-        print dol_escape_htmltag($val);
-        print '</td><td class="right nowraponall">';
-        if (!empty($newlangfileonly->tab_translate[$key]))
-        {
-            if ($val != $newlangfileonly->tab_translate[$key])
-            {
-                // retrieve rowid
-                $sql = "SELECT rowid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-                $sql .= " WHERE transkey = '".$key."'";
-                $sql .= " AND entity IN (".getEntity('overwrite_trans').")";
-                dol_syslog("translation::select from table", LOG_DEBUG);
-                $result = $db->query($sql);
-                if ($result)
-                {
-                    $obj = $db->fetch_object($result);
-                }
-                print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
-                print ' ';
-                print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete">'.img_delete().'</a>';
-                print '&nbsp;&nbsp;';
-                $htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
-                print $form->textwithpicto('', $htmltext, 1, 'info');
-            }
-            elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
-            {
-            	//print $key.'-'.$val;
-                print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
-            }
+	// Show result
+	$i = 0;
+	foreach ($recordtoshow as $key => $val)
+	{
+		$i++;
+		if ($i <= $offset) continue;
+		if ($i > ($offset + $limit)) break;
+		print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
+		print dol_escape_htmltag($val);
+		print '</td><td class="right nowraponall">';
+		if (!empty($newlangfileonly->tab_translate[$key]))
+		{
+			if ($val != $newlangfileonly->tab_translate[$key])
+			{
+				// retrieve rowid
+				$sql = "SELECT rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
+				$sql .= " WHERE transkey = '".$key."'";
+				$sql .= " AND entity IN (".getEntity('overwrite_trans').")";
+				dol_syslog("translation::select from table", LOG_DEBUG);
+				$result = $db->query($sql);
+				if ($result)
+				{
+					$obj = $db->fetch_object($result);
+				}
+				print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
+				print ' ';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
+				print '&nbsp;&nbsp;';
+				$htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
+				print $form->textwithpicto('', $htmltext, 1, 'info');
+			} elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
+			{
+				//print $key.'-'.$val;
+				print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
+			}
 
-            if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-            {
-            	$transifexlangfile = '$'; // $ means 'All'
-            	//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
-            	$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
+			if (!empty($conf->global->MAIN_FEATURES_LEVEL))
+			{
+				$transifexlangfile = '$'; // $ means 'All'
+				//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
+				$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
 
-            	print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto($langs->trans('FixOnTransifex'), 'globe').'</a>';
-            }
-        }
-        else
-        {
-            $htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
-            print $form->textwithpicto('', $htmltext, 1, 'warning');
-        }
-        /*if (! empty($conf->multicompany->enabled) && !$user->entity)
+				print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto($langs->trans('FixOnTransifex'), 'globe').'</a>';
+			}
+		} else {
+			$htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
+			print $form->textwithpicto('', $htmltext, 1, 'warning');
+		}
+		/*if (! empty($conf->multicompany->enabled) && !$user->entity)
         {
             print '<td>'.$val.'</td>';
         }*/
-        print '</td></tr>'."\n";
-    }
+		print '</td></tr>'."\n";
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
 dol_fiche_end();
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 60cbadcdd3a..620efb0540e 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -38,7 +38,7 @@ if (!$user->admin) accessforbidden();
 
 $extrafields = new ExtraFields($db);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
@@ -55,9 +55,7 @@ if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
-}
-
-elseif ($action == 'del_default')
+} elseif ($action == 'del_default')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -84,31 +82,24 @@ elseif ($action == 'setdoc')
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
 	$res = true;
-}
-elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
+} 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
-    {
+    } else {
         dol_print_error($db);
     }
-}
-
-elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
+} 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
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -121,9 +112,7 @@ elseif ($action == 'sethideinactiveuser')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -163,16 +152,12 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('USER_MAIL_REQUIRED');
-}
-else
-{
+} else {
 	if (empty($conf->global->USER_MAIL_REQUIRED))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_MAIL_REQUIRED">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_MAIL_REQUIRED">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_MAIL_REQUIRED&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_MAIL_REQUIRED&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td></tr>';
@@ -187,15 +172,11 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('USER_HIDE_INACTIVE_IN_COMBOBOX');
-}
-else
-{
+} else {
 	if (empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_USER_HIDE_INACTIVE_IN_COMBOBOX">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -211,7 +192,7 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -224,9 +205,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -290,15 +269,13 @@ foreach ($dirmodels as $reldir)
 	                            if (in_array($name, $def))
 	                            {
 	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&value='.$name.'">';
+	                            	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
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	                                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>";
 	                            }
 
@@ -307,10 +284,8 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->USER_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</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).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
 
@@ -335,9 +310,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 4f556ff19b3..9ae01790bb2 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -38,7 +38,7 @@ if (!$user->admin) accessforbidden();
 
 $extrafields = new ExtraFields($db);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $type = 'group';
 
@@ -52,9 +52,7 @@ if ($action == 'set_default')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
-}
-
-elseif ($action == 'del_default')
+} elseif ($action == 'del_default')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -81,31 +79,24 @@ elseif ($action == 'setdoc')
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
 	$res = true;
-}
-elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
+} 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
-    {
+    } else {
         dol_print_error($db);
     }
-}
-
-elseif (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
+} 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
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -133,7 +124,7 @@ $form = new Form($db);
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -146,9 +137,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -212,15 +201,13 @@ foreach ($dirmodels as $reldir)
 	                            if (in_array($name, $def))
 	                            {
 	                            	print '<td class="center">'."\n";
-	                            	print '<a href="'.$_SERVER["PHP_SELF"].'?action=del_default&value='.$name.'">';
+	                            	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
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	                                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>";
 	                            }
 
@@ -229,10 +216,8 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->USERGROUP_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scandir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</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).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
 
@@ -257,9 +242,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index dd7fd353ea2..19d71ebb1d9 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -49,18 +49,19 @@ $acts[1] = "disable";
 $actl[0] = img_picto($langs->trans("Disabled"), 'switch_off');
 $actl[1] = img_picto($langs->trans("Activated"), 'switch_on');
 
-$status = 1;
-
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
+if (empty($sortfield)) $sortfield = 'position, ref';
+if (empty($sortorder)) $sortorder = 'ASC';
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('website'));
 
@@ -74,7 +75,7 @@ $tablib[1] = "Websites";
 
 // Requests to extract data
 $tabsql = array();
-$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.status FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
+$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.position, f.status FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -82,15 +83,15 @@ $tabsqlsort[1] = "ref ASC";
 
 // Nom des champs en resultat de select pour affichage du dictionnaire
 $tabfield = array();
-$tabfield[1] = "ref,description,virtualhost";
+$tabfield[1] = "ref,description,virtualhost,position";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue = array();
-$tabfieldvalue[1] = "ref,description,virtualhost";
+$tabfieldvalue[1] = "ref,description,virtualhost,position";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert = array();
-$tabfieldinsert[1] = "ref,description,virtualhost,entity";
+$tabfieldinsert[1] = "ref,description,virtualhost,position,entity";
 
 // Nom du rowid si le champ n'est pas de type autoincrement
 // Example: "" if id field is "rowid" and has autoincrement on
@@ -123,270 +124,252 @@ $sourceList = array();
 // Actions add or modify a website
 if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 {
-    $listfield = explode(',', $tabfield[$id]);
-    $listfieldinsert = explode(',', $tabfieldinsert[$id]);
-    $listfieldmodify = explode(',', $tabfieldinsert[$id]);
-    $listfieldvalue = explode(',', $tabfieldvalue[$id]);
+	$listfield = explode(',', $tabfield[$id]);
+	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
+	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
+	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-    // Check that all fields are filled
-    $ok = 1;
-    foreach ($listfield as $f => $value)
-    {
-    	if ($value == 'ref' && (!GETPOSTISSET($value) || GETPOST($value) == ''))
-	    {
-    	    $ok = 0;
-        	$fieldnamekey = $listfield[$f];
-	        setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-	        break;
-    	}
-		elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
-	    {
+	// Check that all fields are filled
+	$ok = 1;
+	foreach ($listfield as $f => $value)
+	{
+		if ($value == 'ref' && (!GETPOSTISSET($value) || GETPOST($value) == ''))
+		{
 			$ok = 0;
-    	    $fieldnamekey = $listfield[$f];
+			$fieldnamekey = $listfield[$f];
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+			break;
+		} elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
+		{
+			$ok = 0;
+			$fieldnamekey = $listfield[$f];
 			setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities($fieldnamekey)), null, 'errors');
 			break;
-	    }
-    }
+		}
+	}
 
-    // Clean parameters
-    if (!empty($_POST['ref']))
-    {
-    	$websitekey = strtolower($_POST['ref']);
-    }
+	// Clean parameters
+	if (!empty($_POST['ref']))
+	{
+		$websitekey = strtolower($_POST['ref']);
+	}
 
-    // Si verif ok et action add, on ajoute la ligne
-    if ($ok && GETPOST('actionadd', 'alpha'))
-    {
-        if ($tabrowid[$id])
-        {
-            // Recupere id libre pour insertion
-            $newid = 0;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $obj = $db->fetch_object($result);
-                $newid = ($obj->newid + 1);
-            } else {
-                dol_print_error($db);
-            }
-        }
+	// Si verif ok et action add, on ajoute la ligne
+	if ($ok && GETPOST('actionadd', 'alpha'))
+	{
+		if ($tabrowid[$id])
+		{
+			// Recupere id libre pour insertion
+			$newid = 0;
+			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$obj = $db->fetch_object($result);
+				$newid = ($obj->newid + 1);
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-        /* $website=new Website($db);
+		/* $website=new Website($db);
         $website->ref=
         $website->description=
         $website->virtualhost=
         $website->create($user); */
 
-        // Add new entry
-        $sql = "INSERT INTO ".$tabname[$id]." (";
-        // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $tabrowid[$id].",";
-        $sql .= $tabfieldinsert[$id];
-        $sql .= ",status)";
-        $sql .= " VALUES(";
+		// Add new entry
+		$sql = "INSERT INTO ".$tabname[$id]." (";
+		// List of fields
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $tabrowid[$id].",";
+		$sql .= $tabfieldinsert[$id];
+		$sql .= ",status)";
+		$sql .= " VALUES(";
 
-        // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $newid.",";
-        $i = 0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-            if ($value == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($value == 'ref') {
-            	$_POST[$listfieldvalue[$i]] = strtolower($_POST[$listfieldvalue[$i]]);
-            }
-            if ($i) $sql .= ",";
-            if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= ",1)";
+		// List of values
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $newid.",";
+		$i = 0;
+		foreach ($listfieldinsert as $f => $value)
+		{
+			if ($value == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($value == 'ref') {
+				$_POST[$listfieldvalue[$i]] = strtolower($_POST[$listfieldvalue[$i]]);
+			}
+			if ($i) $sql .= ",";
+			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= ",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)	// Add is ok
-        {
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	unset($_POST); // Clean $_POST array, we keep only
-        }
-        else
-        {
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            }
-            else {
-                dol_print_error($db);
-            }
-        }
-    }
+		dol_syslog("actionadd", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)	// Add is ok
+		{
+			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			unset($_POST); // Clean $_POST array, we keep only
+		} else {
+			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
+	}
 
-    // Si verif ok et action modify, on modifie la ligne
-    if ($ok && GETPOST('actionmodify', 'alpha'))
-    {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-        else { $rowidcol = "rowid"; }
+	// Si verif ok et action modify, on modifie la ligne
+	if ($ok && GETPOST('actionmodify', 'alpha'))
+	{
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-        $db->begin();
+		$db->begin();
 
-        $website = new Website($db);
-        $rowid = GETPOST('rowid', 'int');
-        $website->fetch($rowid);
+		$website = new Website($db);
+		$rowid = GETPOST('rowid', 'int');
+		$website->fetch($rowid);
 
-        // Modify entry
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-        {
-            $sql .= $tabrowid[$id]."=";
-            $sql .= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-            if ($field == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($i) $sql .= ",";
-            $sql .= $field."=";
-            if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= " WHERE ".$rowidcol." = '".$rowid."'";
+		// Modify entry
+		$sql = "UPDATE ".$tabname[$id]." SET ";
+		// Modifie valeur des champs
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
+		{
+			$sql .= $tabrowid[$id]."=";
+			$sql .= "'".$db->escape($rowid)."', ";
+		}
+		$i = 0;
+		foreach ($listfieldmodify as $field)
+		{
+			if ($field == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($i) $sql .= ",";
+			$sql .= $field."=";
+			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 
-        dol_syslog("actionmodify", LOG_DEBUG);
-        //print $sql;
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $newname = dol_sanitizeFileName(GETPOST('ref', 'aZ09'));
-            if ($newname != $website->ref)
-            {
-	            $srcfile = DOL_DATA_ROOT.'/website/'.$website->ref;
-	            $destfile = DOL_DATA_ROOT.'/website/'.$newname;
+		dol_syslog("actionmodify", LOG_DEBUG);
+		//print $sql;
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$newname = dol_sanitizeFileName(GETPOST('ref', 'aZ09'));
+			if ($newname != $website->ref)
+			{
+				$srcfile = DOL_DATA_ROOT.'/website/'.$website->ref;
+				$destfile = DOL_DATA_ROOT.'/website/'.$newname;
 
-            	if (dol_is_dir($destfile))
-            	{
-            		$error++;
-            		setEventMessages($langs->trans('ErrorDirAlreadyExists', $destfile), null, 'errors');
-            	}
-            	else
-            	{
-	                @rename($srcfile, $destfile);
+				if (dol_is_dir($destfile))
+				{
+					$error++;
+					setEventMessages($langs->trans('ErrorDirAlreadyExists', $destfile), null, 'errors');
+				} else {
+					@rename($srcfile, $destfile);
 
-		            // We must now rename $website->ref into $newname inside files
-		            $arrayreplacement = array($website->ref.'/htmlheader.html' => $newname.'/htmlheader.html');
-		            $listofilestochange = dol_dir_list($destfile, 'files', 0, '\.php$');
+					// We must now rename $website->ref into $newname inside files
+					$arrayreplacement = array($website->ref.'/htmlheader.html' => $newname.'/htmlheader.html');
+					$listofilestochange = dol_dir_list($destfile, 'files', 0, '\.php$');
 					foreach ($listofilestochange as $key => $value)
-		            {
-		            	dolReplaceInFile($value['fullname'], $arrayreplacement);
-		            }
-            	}
-            }
-        }
-        else
-        {
-        	$error++;
-            setEventMessages($db->lasterror(), null, 'errors');
-        }
+					{
+						dolReplaceInFile($value['fullname'], $arrayreplacement);
+					}
+				}
+			}
+		} else {
+			$error++;
+			setEventMessages($db->lasterror(), null, 'errors');
+		}
 
-        if (!$error)
-        {
-        	$db->commit();
-        }
-        else
-        {
-        	$db->rollback();
-        }
-    }
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+		if (!$error)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if (GETPOST('actioncancel', 'alpha'))
 {
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    $website = new Website($db);
-    $website->fetch($rowid);
+	$website = new Website($db);
+	$website->fetch($rowid);
 
-    if ($website->id > 0)
-    {
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website_account WHERE fk_website ='".$rowid."'";
-    	$result = $db->query($sql);
+	if ($website->id > 0)
+	{
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website_account WHERE fk_website = ".((int) $rowid);
+		$result = $db->query($sql);
 
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website_page WHERE fk_website ='".$rowid."'";
-    	$result = $db->query($sql);
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website_page WHERE fk_website = ".((int) $rowid);
+		$result = $db->query($sql);
 
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website_extrafields WHERE fk_object ='".$rowid."'";
-    	$result = $db->query($sql);
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website_extrafields WHERE fk_object = ".((int) $rowid);
+		$result = $db->query($sql);
 
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website WHERE rowid ='".$rowid."'";
-	    $result = $db->query($sql);
-	    if (!$result)
-	    {
-	        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-	        {
-	            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-	        }
-	        else
-	        {
-	            dol_print_error($db);
-	        }
-	    }
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website WHERE rowid = ".((int) $rowid);
+		$result = $db->query($sql);
+		if (!$result)
+		{
+			if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+			{
+				setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-	    if ($website->ref)
-	    {
-	    	dol_delete_dir_recursive($conf->website->dir_output.'/'.$website->ref);
-	    }
-    }
-    else
-    {
-    	dol_print_error($db, 'Failed to load website with id '.$rowid);
-    }
+		if ($website->ref)
+		{
+			dol_delete_dir_recursive($conf->website->dir_output.'/'.$website->ref);
+		}
+	} else {
+		dol_print_error($db, 'Failed to load website with id '.$rowid);
+	}
 }
 
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET status = 1 WHERE rowid ='".$rowid."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET status = 1 WHERE rowid = ".((int) $rowid);
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; }
-    else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET status = 0 WHERE rowid ='".$rowid."'";
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET status = 0 WHERE rowid = ".((int) $rowid);
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -428,7 +411,7 @@ print "<br>\n";
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete', '', 0, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete', '', 0, 1, 220);
 }
 //var_dump($elementList);
 
@@ -437,209 +420,205 @@ if ($action == 'delete')
  */
 if ($id)
 {
-    // Complete requete recherche valeurs avec critere de tri
-    $sql = $tabsql[$id];
-    $sql .= $db->order($sortfield, $sortorder);
-    $sql .= $db->plimit($limit + 1, $offset);
-    //print $sql;
+	// Complete requete recherche valeurs avec critere de tri
+	$sql = $tabsql[$id];
+	$sql .= $db->order($sortfield, $sortorder);
+	$sql .= $db->plimit($limit + 1, $offset);
+	//print $sql;
 
-    $fieldlist = explode(',', $tabfield[$id]);
+	$fieldlist = explode(',', $tabfield[$id]);
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<table class="noborder centpercent">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<table class="noborder centpercent">';
 
-    // Form to add a new line
-    if ($tabname[$id])
-    {
-        $alabelisused = 0;
-        $var = false;
+	// Form to add a new line
+	if ($tabname[$id])
+	{
+		$alabelisused = 0;
+		$var = false;
 
-        $fieldlist = explode(',', $tabfield[$id]);
+		$fieldlist = explode(',', $tabfield[$id]);
 
-        // Line for title
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-            // Determine le nom du champ par rapport aux noms possibles
-            // dans les dictionnaires de donnees
-            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            $align = '';
-            if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-            if ($valuetoshow != '')
-            {
-                print '<td class="'.$align.'">';
-            	if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-            	elseif (!empty($tabhelp[$id][$value]))
-           		{
-           			if ($value == 'virtualhost') print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltipvirtual');
-           			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-           		}
-            	else print $valuetoshow;
-                print '</td>';
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
-        }
+		// Line for title
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			// Determine le nom du champ par rapport aux noms possibles
+			// dans les dictionnaires de donnees
+			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			$align = '';
+			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+			if ($valuetoshow != '')
+			{
+				print '<td class="'.$align.'">';
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value]))
+		   		{
+		   			if ($value == 'virtualhost') print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltipvirtual');
+		   			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+		   		} else print $valuetoshow;
+				print '</td>';
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
+		}
 
-        print '<td colspan="4">';
-        print '</td>';
-        print '</tr>';
+		print '<td colspan="4">';
+		print '</td>';
+		print '</tr>';
 
-        // Line to enter new values
-        print "<tr ".$bcnd[$var].">";
+		// Line to enter new values
+		print "<tr ".$bcnd[$var].">";
 
-        $obj = new stdClass();
-        // If data was already input, we define them in obj to populate input fields.
-        if (GETPOST('actionadd', 'alpha'))
-        {
-            foreach ($fieldlist as $key=>$val)
-            {
-                if (GETPOST($val, 'alpha'))
-                	$obj->$val = GETPOST($val);
-            }
-        }
+		$obj = new stdClass();
+		// If data was already input, we define them in obj to populate input fields.
+		if (GETPOST('actionadd', 'alpha'))
+		{
+			foreach ($fieldlist as $key=>$val)
+			{
+				if (GETPOST($val, 'alpha'))
+					$obj->$val = GETPOST($val);
+			}
+		}
 
-        fieldListWebsites($fieldlist, $obj, $tabname[$id], 'add');
+		fieldListWebsites($fieldlist, $obj, $tabname[$id], 'add');
 
-        print '<td colspan="3" class="right">';
-        if ($action != 'edit')
-        {
-        	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-        }
-        print '</td>';
-        print "</tr>";
+		print '<td colspan="3" class="right">';
+		if ($action != 'edit')
+		{
+			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		}
+		print '</td>';
+		print "</tr>";
 
-        $colspan = count($fieldlist) + 2;
-    }
+		$colspan = count($fieldlist) + 2;
+	}
 
-    print '</table>';
-    print '</form>';
+	print '</table>';
+	print '</form>';
 
 
-    // List of websites in database
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            print '<br>';
+	// List of websites in database
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			print '<br>';
 
-            print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="page" value="'.$page.'">';
-            print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+			print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="page" value="'.$page.'">';
+			print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 
-            print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            // Title of lines
-            print '<tr class="liste_titre">';
-            foreach ($fieldlist as $field => $value)
-            {
-                // Determine le nom du champ par rapport aux noms possibles
-                // dans les dictionnaires de donnees
-                $showfield = 1; // Par defaut
-                $align = "left";
-                $sortable = 1;
-                $valuetoshow = '';
-                /*
+			// Title of lines
+			print '<tr class="liste_titre">';
+			foreach ($fieldlist as $field => $value)
+			{
+				// Determine le nom du champ par rapport aux noms possibles
+				// dans les dictionnaires de donnees
+				$showfield = 1; // Par defaut
+				$align = "left";
+				$sortable = 1;
+				$valuetoshow = '';
+				/*
                 $tmparray=getLabelOfField($fieldlist[$field]);
                 $showfield=$tmp['showfield'];
                 $valuetoshow=$tmp['valuetoshow'];
                 $align=$tmp['align'];
                 $sortable=$tmp['sortable'];
 				*/
-                $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-                $valuetoshow = $langs->trans($valuetoshow); // try to translate
-                if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-                if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
-                if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+				$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+				$valuetoshow = $langs->trans($valuetoshow); // try to translate
+				if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+				if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+				if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
 
-                // Affiche nom du champ
-                if ($showfield)
-                {
-                    print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", "align=".$align, $sortfield, $sortorder);
-                }
-            }
+				// Affiche nom du champ
+				if ($showfield)
+				{
+					print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", "align=".$align, $sortfield, $sortorder);
+				}
+			}
 
 			print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "status", ($page ? 'page='.$page.'&' : ''), "", 'align="center"', $sortfield, $sortorder);
-            print getTitleFieldOfList('');
-            print getTitleFieldOfList('');
-            print '</tr>';
+			print getTitleFieldOfList('');
+			print getTitleFieldOfList('');
+			print '</tr>';
 
-            // Lines with values
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-                if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-                {
-                    $tmpaction = 'edit';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+			// Lines with values
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				//print_r($obj);
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
+				{
+					$tmpaction = 'edit';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('editWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook)) fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
+					if (empty($reshook)) fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
 
-                    print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
-                }
-                else
-                {
-	              	$tmpaction = 'view';
-                    $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
+				} else {
+				  	$tmpaction = 'view';
+					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook))
-                    {
-                        foreach ($fieldlist as $field => $value)
-                        {
-                            $showfield = 1;
-                        	$align = "left";
-                        	$fieldname = $fieldlist[$field];
-                            $valuetoshow = $obj->$fieldname;
+					if (empty($reshook))
+					{
+						foreach ($fieldlist as $field => $value)
+						{
+							$showfield = 1;
+							$align = "left";
+							$fieldname = $fieldlist[$field];
+							$valuetoshow = $obj->$fieldname;
 
 							// Show value for field
 							if ($showfield) print '<td align="'.$align.'">'.$valuetoshow.'</td>';
-                        }
-                    }
+						}
+					}
 
-                    // Can an entry be erased or disabled ?
-                    $iserasable = 1; $isdisable = 1; // true by default
-                    if ($obj->status) $iserasable = 0; // We can't delete a website on. Disable it first.
+					// Can an entry be erased or disabled ?
+					$iserasable = 1; $isdisable = 1; // true by default
+					if ($obj->status) $iserasable = 0; // We can't delete a website on. Disable it first.
 
-                    $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&amp;code='.(!empty($obj->code) ?urlencode($obj->code) : '').'&amp;';
+					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&amp;code='.(!empty($obj->code) ?urlencode($obj->code) : '').'&amp;';
 
-                    // Active
-                    print '<td align="center" class="nowrap">';
-                    print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status ? 1 : 0)].'">'.$actl[($obj->status ? 1 : 0)].'</a>';
-                    print "</td>";
+					// Active
+					print '<td align="center" class="nowrap">';
+					print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status ? 1 : 0)].'">'.$actl[($obj->status ? 1 : 0)].'</a>';
+					print "</td>";
 
-                    // Modify link
-                    print '<td align="center"><a class="reposition" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+					// Modify link
+					print '<td align="center"><a class="reposition" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
 
-                    // Delete link
-                    if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=delete">'.img_delete().'</a></td>';
-                    else print '<td class="center">'.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'</td>';
+					// Delete link
+					if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
+					else print '<td class="center">'.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'</td>';
 
-                    print "</tr>\n";
-                }
-                $i++;
-            }
+					print "</tr>\n";
+				}
+				$i++;
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</form>';
-        }
-    }
-    else {
-        dol_print_error($db);
-    }
+			print '</form>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 dol_fiche_end();
@@ -670,18 +649,15 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 
 	foreach ($fieldlist as $field => $value)
 	{
-	    $fieldname = $fieldlist[$field];
+		$fieldname = $fieldlist[$field];
 		if ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
 			print '</td>';
-		}
-		elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldname)) {
+		} elseif ($fieldlist[$field] == 'code' && isset($obj->$fieldname)) {
 			print '<td><input type="text" class="flat" value="'.(!empty($obj->$fieldname) ? $obj->$fieldname : '').'" size="10" name="'.$fieldlist[$field].'"></td>';
-		}
-		else
-		{
+		} else {
 			print '<td>';
 			$size = '';
 			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index 7d16aa3963b..1df7642b646 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -46,8 +46,8 @@ $status = 1;
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -121,9 +121,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else
-{
+} else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 99185cce733..a8bcbcf8172 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,177 +19,220 @@
  */
 
 /**
- *	\file       htdocs/admin/workflow.php
- *	\ingroup    company
- *	\brief      Workflows setup page
+ *	\file		htdocs/admin/workflow.php
+ *	\ingroup	company
+ *	\brief		Workflows setup page
  */
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-// Load translation files required by the page
-$langs->loadLangs(array("admin", "workflow", "propal", "workflow", "orders", "supplier_proposals", "receptions"));
-
+// security check
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "workflow", "propal", "workflow", "orders", "supplier_proposal", "receptions", "errors"));
+
+$action = GETPOST('action', 'aZ09');
 
 
 /*
  * Actions
  */
 
-if (preg_match('/set(.*)/', $action, $reg))
-{
-    if (!dolibarr_set_const($db, $reg[1], '1', 'chaine', 0, '', $conf->entity) > 0)
-    {
-        dol_print_error($db);
-    }
+if (preg_match('/set(.*)/', $action, $reg)) {
+	if (!dolibarr_set_const($db, $reg[1], '1', 'chaine', 0, '', $conf->entity) > 0) {
+		dol_print_error($db);
+	}
 }
 
-if (preg_match('/del(.*)/', $action, $reg))
-{
-    if (!dolibarr_set_const($db, $reg[1], '0', 'chaine', 0, '', $conf->entity) > 0)
-    {
-        dol_print_error($db);
-    }
+if (preg_match('/del(.*)/', $action, $reg)) {
+	if (!dolibarr_set_const($db, $reg[1], '0', 'chaine', 0, '', $conf->entity) > 0) {
+		dol_print_error($db);
+	}
 }
 
+// List of workflow we can enable
+clearstatcache();
+
+$workflowcodes = array(
+	// Automatic creation
+	'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array(
+		'family'=>'create',
+		'position'=>10,
+		'enabled'=>(!empty($conf->propal->enabled) && !empty($conf->commande->enabled)),
+		'picto'=>'order'
+	),
+	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array(
+		'family'=>'create',
+		'position'=>20,
+		'enabled'=>(!empty($conf->commande->enabled) && !empty($conf->facture->enabled)),
+		'picto'=>'bill'
+	),
+
+	'separator1'=>array('family'=>'separator', 'position'=>25),
+
+	// Automatic classification of proposal
+	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array(
+		'family'=>'classify_proposal',
+		'position'=>30,
+		'enabled'=>(!empty($conf->propal->enabled) && !empty($conf->commande->enabled)),
+		'picto'=>'propal',
+		'warning'=>''
+	),
+	'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL'=>array(
+		'family'=>'classify_proposal',
+		'position'=>31,
+		'enabled'=>(!empty($conf->propal->enabled) && !empty($conf->facture->enabled)),
+		'picto'=>'propal',
+		'warning'=>''
+	),
+
+	// Automatic classification of order
+	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array(
+		'family'=>'classify_order',
+		'position'=>40,
+		'enabled'=>(!empty($conf->expedition->enabled) && !empty($conf->commande->enabled)),
+		'picto'=>'order'
+	),
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
+		'family'=>'classify_order',
+		'position'=>41,
+		'enabled'=>(!empty($conf->facture->enabled) && !empty($conf->commande->enabled)),
+		'picto'=>'order',
+		'warning'=>''
+	), // For this option, if module invoice is disabled, it does not exists, so "Classify billed" for order must be done manually from order card.
+
+	'separator2'=>array('family'=>'separator', 'position'=>50),
+
+	// Automatic classification supplier proposal
+	'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL'=>array(
+		'family'=>'classify_supplier_proposal',
+		'position'=>60,
+		'enabled'=>(!empty($conf->supplier_proposal->enabled) && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
+		'picto'=>'propal',
+		'warning'=>''
+	),
+
+	// Automatic classification supplier order
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER'=>array(
+		'family'=>'classify_supplier_order',
+		'position'=>62,
+		'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
+		'picto'=>'order',
+		'warning'=>''
+	),
+
+	// Automatic classification reception
+	'WORKFLOW_BILL_ON_RECEPTION'=>array(
+		'family'=>'classify_reception',
+		'position'=>64,
+		'enabled'=>(!empty($conf->reception->enabled) && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
+		'picto'=>'bill'
+	),
+);
+
+if (!empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow'])) {
+	foreach ($conf->modules_parts['workflow'] as $workflow) {
+		$workflowcodes = array_merge($workflowcodes, $workflow);
+	}
+}
+
+// remove not available workflows (based on activated modules and global defined keys)
+$workflowcodes  = array_filter($workflowcodes, function ($var) {
+	return $var['enabled']; });
 
 /*
- * 	View
+ * View
  */
 
-llxHeader('', $langs->trans("WorkflowSetup"), '');
+llxHeader('', $langs->trans("WorkflowSetup"), "EN:Module_Workflow_En|FR:Module_Workflow|ES:Módulo_Workflow");
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("WorkflowSetup"), $linkback, 'title_setup');
 
-print '<span class="opacitymedium">'.$langs->trans("WorkflowDesc").'</span><br>';
-print "<br>";
+print '<span class="opacitymedium">'.$langs->trans("WorkflowDesc").'</span>';
+print '<br>';
+print '<br>';
 
-// List of workflow we can enable
+// current module setup don't support any automatic workflow of this module
+if (count($workflowcodes) < 1) {
+	print $langs->trans("ThereIsNoWorkflowToModify");
 
-clearstatcache();
-
-$workflowcodes = array(
-    // Automatic creation
-    'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array('family'=>'create', 'position'=>10, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order'),
-	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array('family'=>'create', 'position'=>20, 'enabled'=>'! empty($conf->commande->enabled) && ! empty($conf->facture->enabled)', 'picto'=>'bill'),
-    'separator1'=>array('family'=>'separator', 'position'=>25),
-	// Automatic classification of proposal
-	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('family'=>'classify_proposal', 'position'=>30, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'propal', 'warning'=>''),
-	'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL'=>array('family'=>'classify_proposal', 'position'=>31, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->facture->enabled)', 'picto'=>'propal', 'warning'=>''),
-	// Automatic classification of order
-	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array('family'=>'classify_order', 'position'=>40, 'enabled'=>'! empty($conf->expedition->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order'),
-	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array('family'=>'classify_order', 'position'=>41, 'enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order', 'warning'=>''), // For this option, if module invoice is disabled, it does not exists, so "Classify billed" for order must be done manually from order card.
-    'separator2'=>array('family'=>'separator', 'position'=>50),
-	// Automatic classification supplier proposal
-	'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL'=>array('family'=>'classify_supplier_proposal', 'position'=>60, 'enabled'=>'! empty($conf->supplier_proposal->enabled) && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))', 'picto'=>'propal', 'warning'=>''),
-	// Automatic classification supplier order
-	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER'=>array('family'=>'classify_supplier_order', 'position'=>62, 'enabled'=>'!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)', 'picto'=>'order', 'warning'=>''),
-	//Automatic classification reception
-	'WORKFLOW_BILL_ON_RECEPTION'=>array('family'=>'classify_reception', 'position'=>64, 'enabled'=>'! empty($conf->reception->enabled) && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))', 'picto'=>'bill'),
-);
-
-if (!empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow']))
-{
-	foreach ($conf->modules_parts['workflow'] as $workflow)
-	{
-		$workflowcodes = array_merge($workflowcodes, $workflow);
-	}
+	llxFooter();
+	$db->close();
+	return;
 }
 
 // Sort on position
 $workflowcodes = dol_sort_array($workflowcodes, 'position');
 
-$nbqualified = 0;
+print '<table class="noborder centpercent">';
+
 $oldfamily = '';
 
-print '<table class="noborder centpercent">'."\n";
-
-foreach ($workflowcodes as $key => $params)
-{
-	$picto = $params['picto'];
-	$enabled = $params['enabled'];
-	$family = $params['family'];
-
-	if ($family == 'separator')
-	{
-		print '</table><br>';
-		print '<table class="noborder centpercent">'."\n";
+foreach ($workflowcodes as $key => $params) {
+	if ($params['family'] == 'separator') {
+		print '</table>';
+		print '<br>';
+		print '<table class="noborder centpercent">';
 
 		continue;
 	}
 
-	if (!verifCond($enabled)) continue;
-
-   	$nbqualified++;
-
-
-   	if ($oldfamily != $family)
-   	{
-	   	print '<tr class="liste_titre">'."\n";
-		print '  <td>';
-		if ($family == 'create')
-		{
-			print $langs->trans("AutomaticCreation");
+	if ($oldfamily != $params['family']) {
+		if ($params['family'] == 'create') {
+			$header = $langs->trans("AutomaticCreation");
+		} elseif (preg_match('/classify_(.*)/', $params['family'], $reg)) {
+			$header = $langs->trans("AutomaticClassification");
+			if ($reg[1] == 'proposal') 			$header .= ' - '.$langs->trans('Proposal');
+			if ($reg[1] == 'order') 			$header .= ' - '.$langs->trans('Order');
+			if ($reg[1] == 'supplier_proposal')	$header .= ' - '.$langs->trans('SupplierProposal');
+			if ($reg[1] == 'supplier_order')	$header .= ' - '.$langs->trans('SupplierOrder');
+			if ($reg[1] == 'reception')			$header .= ' - '.$langs->trans('Reception');
+		} else {
+			$header = $langs->trans("Description");
 		}
-		elseif (preg_match('/classify_(.*)/', $family, $reg))
-		{
-			print $langs->trans("AutomaticClassification");
-			if ($reg[1] == 'proposal') print ' - '.$langs->trans('Proposal');
-			if ($reg[1] == 'order') print ' - '.$langs->trans('Order');
-			if ($reg[1] == 'supplier_proposal') print ' - '.$langs->trans('SupplierProposal');
-			if ($reg[1] == 'supplier_order') print ' - '.$langs->trans('SupplierOrder');
-			if ($reg[1] == 'reception') print ' - '.$langs->trans('Reception');
-		}
-		else
-		{
-			print $langs->trans("Description");
-		}
-		print '</td>';
-		print '  <td align="center">'.$langs->trans("Status").'</td>';
-		print "</tr>\n";
-		$oldfamily = $family;
-   	}
 
-   	print "<tr class=\"oddeven\">\n";
-   	print "<td>".img_object('', $picto).$langs->trans('desc'.$key);
-   	if (!empty($params['warning']))
-   	{
-   		$langs->load("errors");
-   		print ' '.img_warning($langs->transnoentitiesnoconv($params['warning']));
-   	}
-   	print "</td>\n";
-   	print '<td class="center">';
-   	if (!empty($conf->use_javascript_ajax))
-   	{
-   		print ajax_constantonoff($key);
-   	}
-   	else
-   	{
-   		if (!empty($conf->global->$key))
-   		{
-   			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'">';
-  			print img_picto($langs->trans("Activated"), 'switch_on');
-   			print '</a>';
-   		}
-   		else
-   		{
-   			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set'.$key.'">';
-  			print img_picto($langs->trans("Disabled"), 'switch_off');
-   			print '</a>';
-   		}
-   	}
-   	print '</td>';
-   	print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<th>'.$header.'</th>';
+		print '<th align="center">'.$langs->trans("Status").'</th>';
+		print '</tr>';
+
+		$oldfamily = $params['family'];
+	}
+
+	print '<tr class="oddeven">';
+	print '<td>';
+	print img_object('', $params['picto']);
+	print ' '.$langs->trans('desc'.$key);
+
+	if (!empty($params['warning'])) {
+		print ' '.img_warning($langs->transnoentitiesnoconv($params['warning']));
+	}
+
+	print '</td>';
+
+	print '<td class="center">';
+
+	if (!empty($conf->use_javascript_ajax)) {
+		print ajax_constantonoff($key);
+	} else {
+		if (!empty($conf->global->$key)) {
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del'.$key.'&amp;token='.newToken().'">';
+			print img_picto($langs->trans("Activated"), 'switch_on');
+			print '</a>';
+		} else {
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set'.$key.'&amp;token='.newToken().'">';
+			print img_picto($langs->trans("Disabled"), 'switch_off');
+			print '</a>';
+		}
+	}
+
+	print '</td>';
+	print '</tr>';
 }
 
-if ($nbqualified == 0)
-{
-    print '<tr><td colspan="3">'.$langs->trans("ThereIsNoWorkflowToModify");
-}
 print '</table>';
 
 // End of page
diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php
index d0a0e79c855..a7eab61211d 100644
--- a/htdocs/api/admin/index.php
+++ b/htdocs/api/admin/index.php
@@ -54,9 +54,7 @@ if ($action == 'setproductionmode')
 				setEventMessages($langs->trans("ErrorFailedToCreateDir", $conf->api->dir_temp), null, 'errors');
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			// Delete the cache file otherwise it does not update
 			$result = dol_delete_file($conf->api->dir_temp.'/routes.php');
 			if ($result < 0)
@@ -71,9 +69,7 @@ if ($action == 'setproductionmode')
     		header("Location: ".$_SERVER["PHP_SELF"]);
 	   	    exit;
 	    }
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -116,13 +112,11 @@ 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&value='.($i + 1).'&status=0">';
+    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&value='.($i + 1).'&status=1">';
+} 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>';
 }
@@ -165,9 +159,7 @@ if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/e
 {
     $url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer';
     print img_picto('', 'globe').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
-}
-else
-{
+} else {
     print $langs->trans("NotAvailableWithThisDistribution");
 }
 
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 16e7fba5470..554edbb892e 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -250,8 +250,7 @@ class DolibarrApi
 		$featuresarray = array($resource);
 		if (preg_match('/&/', $resource)) {
 			$featuresarray = explode("&", $resource);
-		}
-		elseif (preg_match('/\|/', $resource)) {
+		} elseif (preg_match('/\|/', $resource)) {
 			$featuresarray = explode("|", $resource);
 		}
 
@@ -317,9 +316,7 @@ class DolibarrApi
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
 	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    }
-	    else
-	    {
+	    } 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 339ddfd2ad6..84f7bf303e7 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -59,6 +59,16 @@ class DolibarrApiAccess implements iAuthenticate
 	 */
 	public static $user = '';
 
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
+
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName
 	/**
 	 * Check access
@@ -107,15 +117,15 @@ class DolibarrApiAccess implements iAuthenticate
 			$sql = "SELECT u.login, u.datec, u.api_key, ";
 			$sql .= " u.tms as date_modification, u.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-			$sql .= " WHERE u.api_key = '".$db->escape($api_key)."'";
+			$sql .= " WHERE u.api_key = '".$this->db->escape($api_key)."'";
 			// TODO Check if 2 users has same API key.
 
-			$result = $db->query($sql);
+			$result = $this->db->query($sql);
 			if ($result)
 			{
-				if ($db->num_rows($result))
+				if ($this->db->num_rows($result))
 				{
-					$obj = $db->fetch_object($result);
+					$obj = $this->db->fetch_object($result);
 					$login = $obj->login;
 					$stored_key = $obj->api_key;
 					$userentity = $obj->entity;
@@ -125,12 +135,11 @@ class DolibarrApiAccess implements iAuthenticate
 						$conf->entity = ($obj->entity ? $obj->entity : 1);
 						// We must also reload global conf to get params from the entity
 						dol_syslog("Entity was not set on http header with HTTP_DOLAPIENTITY (recommanded for performance purpose), so we switch now on entity of user (".$conf->entity.") and we have to reload configuration.", LOG_WARNING);
-						$conf->setValues($db);
+						$conf->setValues($this->db);
 					}
 				}
-			}
-			else {
-				throw new RestException(503, 'Error when fetching user api_key :'.$db->error_msg);
+			} else {
+				throw new RestException(503, 'Error when fetching user api_key :'.$this->db->error_msg);
 			}
 
 			if ($stored_key != $api_key) {		// This should not happen since we did a search on api_key
@@ -142,7 +151,7 @@ class DolibarrApiAccess implements iAuthenticate
 			{
 			    throw new RestException(503, 'Error when searching login user from api key');
 			}
-			$fuser = new User($db);
+			$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)
 			if ($result <= 0) {
 				throw new RestException(503, 'Error when fetching user :'.$fuser->error.' (conf->entity='.$conf->entity.')');
@@ -157,9 +166,7 @@ class DolibarrApiAccess implements iAuthenticate
 			if ($fuser->admin) {
 				static::$role = 'admin';
             }
-        }
-		else
-		{
+        } else {
 		    throw new RestException(401, "Failed to login to API. No parameter 'HTTP_DOLAPIKEY' on HTTP header (and no parameter DOLAPIKEY in URL).");
 		}
 
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index ce734aadeb5..9605f46f219 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -196,7 +196,7 @@ class Documents extends DolibarrApi
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$templateused = $doctemplate ? $doctemplate : $this->invoice->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->invoice->model_pdf;
 			$result = $this->invoice->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
@@ -210,7 +210,7 @@ class Documents extends DolibarrApi
 			if (!$result) {
 				throw new RestException(404, 'Order not found');
 			}
-			$templateused = $doctemplate ? $doctemplate : $this->order->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->order->model_pdf;
 			$result = $this->order->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
@@ -224,7 +224,7 @@ class Documents extends DolibarrApi
 			if (!$result) {
 				throw new RestException(404, 'Proposal not found');
 			}
-			$templateused = $doctemplate ? $doctemplate : $this->propal->modelpdf;
+			$templateused = $doctemplate ? $doctemplate : $this->propal->model_pdf;
 			$result = $this->propal->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0) {
 				throw new RestException(500, 'Error generating document');
@@ -419,8 +419,10 @@ class Documents extends DolibarrApi
 
 			$object = new Product($this->db);
 			$result = $object->fetch($id, $ref);
-			if (!$result) {
+			if ($result==0) {
 				throw new RestException(404, 'Product not found');
+			} elseif ($result<0) {
+				throw new RestException(500, 'Error while fetching object: '.$object->error);
 			}
 
 			$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
@@ -630,7 +632,7 @@ class Documents extends DolibarrApi
 			    }
 				elseif ($result < 0)
 				{
-					throw new RestException(500, 'Error while fetching object.');
+					throw new RestException(500, 'Error while fetching object: '.$object->error);
 				}
 			}
 
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index 74aeec42dc1..8627808a679 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -40,7 +40,7 @@ class Login
 	 *
 	 * Request the API token for a couple username / password.
 	 * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file).
-	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API key (DOLAPIKEY) can be found/set on the user page.
+	 * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API token (DOLAPIKEY) can be found/set on the user page.
 	 *
 	 * @param   string  $login			User login
 	 * @param   string  $password		User password
@@ -122,9 +122,7 @@ class Login
     		{
     			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
     		}
-		}
-		else
-		{
+		} else {
             $token = $tmpuser->api_key;
 		}
 
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index fd6432b553f..8177fbf7e1e 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -4,7 +4,7 @@
  * 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-2019   Thibault FOUCART        <support@ptibogxiv.net>
+ * Copyright (C) 2018-2020   Thibault FOUCART        <support@ptibogxiv.net>
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,7 @@
 use Luracast\Restler\RestException;
 
 require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/cstate.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
 
 /**
@@ -34,1744 +35,1865 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
  */
 class Setup extends DolibarrApi
 {
-    private $translations = null;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
-
-    /**
-     * Get the list of ordering methods.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
-     *
-     * @url     GET dictionary/ordering_methods
-     *
-     * @return array [List of ordering methods]
-     *
-     * @throws RestException 400
-     */
-    public function getOrderingMethods($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, libelle as label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_input_method as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of payments types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'CHQ')"
-     *
-     * @url     GET dictionary/payment_types
-     *
-     * @return array [List of payment types]
-     *
-     * @throws RestException 400
-     */
-    public function getPaymentTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT id, code, type, libelle as label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-              $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of countries.
-     *
-     * The names of the countries will be translated to the given language if
-     * the $lang parameter is provided. The value of $lang must be a language
-     * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
-     * The returned list is sorted by country ID.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $filter     To filter the countries by name
-     * @param string    $lang       Code of the language the label of the countries must be translated to
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array                List of countries
-     *
-     * @url     GET dictionary/countries
-     *
-     * @throws RestException
-     */
-    public function getListOfCountries($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $lang = '', $sqlfilters = '')
-    {
-        $list = array();
-
-        // Note: The filter is not applied in the SQL request because it must
-        // be applied to the translated names, not to the names in database.
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_country as t";
-        $sql .= " WHERE 1 = 1";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $obj = $this->db->fetch_object($result);
-                $country = new Ccountry($this->db);
-                if ($country->fetch($obj->rowid) > 0) {
-                    // Translate the name of the country if needed
-                    // and then apply the filter if there is one.
-                    $this->translateLabel($country, $lang, 'Country');
-
-                    if (empty($filter) || stripos($country->label, $filter) !== false) {
-                        $list[] = $this->_cleanObjectDatas($country);
-                    }
-                }
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of countries');
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get country by ID.
-     *
-     * @param int       $id        ID of country
-     * @param string    $lang      Code of the language the name of the
-     *                             country must be translated to
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/countries/{id}
-     *
-     * @throws RestException
-     */
-    public function getCountryByID($id, $lang = '')
-    {
-        return $this->_fetchCcountry($id, '', '', $lang);
-    }
-
-    /**
-     * Get country by Code.
-     *
-     * @param string    $code      Code of country
-     * @param string    $lang      Code of the language the name of the
-     *                             country must be translated to
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/countries/byCode/{code}
-     *
-     * @throws RestException
-     */
-    public function getCountryByCode($code, $lang = '')
-    {
-        return $this->_fetchCcountry('', $code, '', $lang);
-    }
-
-    /**
-     * Get country by Iso.
-     *
-     * @param string    $iso       ISO of country
-     * @param string    $lang      Code of the language the name of the
-     *                             country must be translated to
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/countries/byISO/{iso}
-     *
-     * @throws RestException
-     */
-    public function getCountryByISO($iso, $lang = '')
-    {
-        return $this->_fetchCcountry('', '', $iso, $lang);
-    }
-
-    /**
-    * Get country.
-    *
-    * @param int       $id        ID of country
-    * @param string    $code      Code of country
-    * @param string    $iso       ISO of country
-    * @param string    $lang      Code of the language the name of the
-    *                             country must be translated to
-    * @return array 			   Array of cleaned object properties
-    *
-    * @throws RestException
-    */
-    private function _fetchCcountry($id, $code = '', $iso = '', $lang = '')
-    {
-        $country = new Ccountry($this->db);
-
-        $result = $country->fetch($id, $code, $iso);
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieving country : '.$country->error);
-        } elseif ($result == 0) {
-            throw new RestException(404, 'country not found');
-        }
-
-        $this->translateLabel($country, $lang, 'Country');
-
-        return $this->_cleanObjectDatas($country);
-    }
-
-    /**
-     * Get the list of delivery times.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Delivery times is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with.
-     *
-     * @url     GET dictionary/availability
-     *
-     * @return array [List of availability]
-     *
-     * @throws RestException 400
-     */
-    public function getAvailability($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_availability as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-                  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param object    $object    Object to clean
-     * @return array 				Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
-
-        unset($object->error);
-        unset($object->errors);
-
-        return $object;
-    }
-
-    /**
-     * Translate the name of the object to the given language.
-     *
-     * @param object   $object    Object with label to translate
-     * @param string   $lang      Code of the language the name of the object must be translated to
-     * @param string   $prefix 	  Prefix for translation key
-     *
-     * @return void
-     */
-    private function translateLabel($object, $lang, $prefix = 'Country')
-    {
-        if (!empty($lang)) {
-            // Load the translations if this is a new language.
-            if ($this->translations == null || $this->translations->getDefaultLang() !== $lang) {
-                global $conf;
-                $this->translations = new Translate('', $conf);
-                $this->translations->setDefaultLang($lang);
-                $this->translations->load('dict');
-            }
-            if ($object->code) {
-                $key = $prefix.$object->code;
-
-                $translation = $this->translations->trans($key);
-                if ($translation != $key) {
-                    $object->label = html_entity_decode($translation);
-                }
-            }
-        }
-    }
-
-    /**
-     * Get the list of shipment methods.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     *
-     * @return array List of shipment methods
-     *
-     * @url     GET dictionary/shipment_methods
-     *
-     * @throws RestException
-     */
-    public function getListOfShipmentMethods($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-        $sql = "SELECT t.rowid, t.code, t.libelle, t.description, t.tracking";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of shipment methods : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of events types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $type       To filter on type of event
-     * @param string    $module     To filter on module events
-     * @param int       $active     Event's type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of events types
-     *
-     * @url     GET dictionary/event_types
-     *
-     * @throws RestException
-     */
-    public function getListOfEventTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT id, code, type, libelle as label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
-        $sql .= " WHERE t.active = ".$active;
-        if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
-        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of events types : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-
-    /**
-     * Get the list of Expense Report types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $module     To filter on module
-     * @param int       $active     Event's type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of expense report types
-     *
-     * @url     GET dictionary/expensereport_types
-     *
-     * @throws RestException
-     */
-    public function getListOfExpenseReportsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT id, code, label, accountancy_code, active, module, position";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t";
-    	$sql .= " WHERE t.active = ".$active;
-    	if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of expense report types : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-
-    /**
-     * Get the list of contacts types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $type       To filter on type of contact
-     * @param string    $module     To filter on module contacts
-     * @param int       $active     Contact's type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array	  List of Contacts types
-     *
-     * @url     GET dictionary/contact_types
-     *
-     * @throws RestException
-     */
-    public function getListOfContactTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, element as type, libelle as label, source, module, position";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
-        $sql .= " WHERE t.active = ".$active;
-        if ($type) $sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
-        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of contacts types : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of civilities.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $module     To filter on module events
-     * @param int       $active     Civility is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array		List of civility types
-     *
-     * @url     GET dictionary/civilities
-     *
-     * @throws RestException
-     */
-    public function getListOfCivilities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
-        $sql .= " WHERE t.active = ".$active;
-        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of civility : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of currencies.
-     *
-     * @param int       $multicurrency  Multicurrency rates (0: no multicurrency, 1: last rate, 2: all rates) {@min 0} {@max 2}
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of currencies
-     *
-     * @url     GET dictionary/currencies
-     *
-     * @throws RestException
-     */
-    public function getListOfCurrencies($multicurrency = 0, $sortfield = "code_iso", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-        $sql = "SELECT t.code_iso, t.label, t.unicode";
-        if (!empty($multicurrency)) $sql .= " , cr.date_sync, cr.rate ";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
-        if (!empty($multicurrency)) {
-            $sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
-            $sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
-        }
-        $sql .= " WHERE t.active = ".$active;
-        if (!empty($multicurrency)) {
-            $sql .= " AND m.entity IN (".getEntity('multicurrency').")";
-            if (!empty($multicurrency) && $multicurrency != 2) {
-                $sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
-            }
-        }
-
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of currency : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of extra fields.
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param string    $type       Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'SO-%')"
-     * @return array				List of extra fields
-     *
-     * @url     GET extrafields
-     *
-     * @throws RestException
-     */
-    public function getListOfExtrafields($sortfield = "t.pos", $sortorder = 'ASC', $type = '', $sqlfilters = '')
-    {
-        $list = array();
-
-        if ($type == 'thirdparty') $type = 'societe';
-        if ($type == 'contact') $type = 'socpeople';
-
-        $sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
-        $sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
-        $sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
-        if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-        	if (!DolibarrApi::_checkFilters($sqlfilters))
-        	{
-        		throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-        	}
-        	$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-        	$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	if ($this->db->num_rows($resql))
-        	{
-        		while ($tab = $this->db->fetch_object($resql))
-        		{
-        			// New usage
-        			$list[$tab->elementtype][$tab->name]['type'] = $tab->type;
-        			$list[$tab->elementtype][$tab->name]['label'] = $tab->label;
-        			$list[$tab->elementtype][$tab->name]['size'] = $tab->size;
-        			$list[$tab->elementtype][$tab->name]['elementtype'] = $tab->elementtype;
-        			$list[$tab->elementtype][$tab->name]['default'] = $tab->fielddefault;
-        			$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
-        			$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
-        			$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
-        			$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? unserialize($tab->param) : '');
-        			$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
-        			$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
-        			$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
-        			$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
-        		}
-        	}
-        }
-        else
-        {
-            throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
-        }
-
-        if (!count($list))
-        {
-        	throw new RestException(404, 'No extrafield found');
-        }
-
-        return $list;
-    }
-
-
-    /**
-     * Get the list of towns.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $zipcode    To filter on zipcode
-     * @param string    $town       To filter on city name
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of towns
-     *
-     * @url     GET dictionary/towns
-     *
-     * @throws RestException
-     */
-    public function getListOfTowns($sortfield = "zip,town", $sortorder = 'ASC', $limit = 100, $page = 0, $zipcode = '', $town = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
-        $sql .= " AND t.active = ".$active;
-        if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
-        if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of towns : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of payments terms.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
-     *
-     * @url     GET dictionary/payment_terms
-     *
-     * @return array List of payment terms
-     *
-     * @throws RestException 400
-     */
-    public function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of shipping methods.
-     *
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Shipping methodsm is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
-     *
-     * @url     GET dictionary/shipping_methods
-     *
-     * @return array List of shipping methods
-     *
-     * @throws RestException 400
-     */
-    public function getShippingModes($limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        //$sql.= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of measuring units.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Measuring unit is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of measuring unit
-     *
-     * @url     GET dictionary/units
-     *
-     * @throws RestException
-     */
-    public function getListOfMeasuringUnits($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-        //TODO link with multicurrency module
-        $sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of measuring units: '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of social networks.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Social network is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of social networks
-     *
-     * @url     GET dictionary/socialnetworks
-     *
-     * @throws RestException
-     */
-    public function getListOfsocialNetworks($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        global $conf;
-
-        if (empty($conf->socialnetworks->enabled)) {
-            throw new RestException(400, 'API not available: this dictionary is not enabled by setup');
-        }
+	private $translations = null;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
+
+	/**
+	 * Get the list of ordering methods.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
+	 *
+	 * @url     GET dictionary/ordering_methods
+	 *
+	 * @return array [List of ordering methods]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getOrderingMethods($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid, code, libelle as label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of payments types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'CHQ')"
+	 *
+	 * @url     GET dictionary/payment_types
+	 *
+	 * @return array [List of payment types]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getPaymentTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->propal->lire && !DolibarrApiAccess::$user->rights->commande->lire && !DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT id, code, type, libelle as label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of states/provinces.
+	 *
+	 * The names of the states will be translated to the given language if
+	 * the $lang parameter is provided. The value of $lang must be a language
+	 * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
+	 * The returned list is sorted by state ID.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $filter     To filter the countries by name
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array                List of countries
+	 *
+	 * @url     GET dictionary/states
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfStates($sortfield = "code_departement", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		// Note: The filter is not applied in the SQL request because it must
+		// be applied to the translated names, not to the names in database.
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
+		$sql .= " WHERE 1 = 1";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$state = new Cstate($this->db);
+				if ($state->fetch($obj->rowid) > 0) {
+					if (empty($filter) || stripos($state->label, $filter) !== false) {
+						$list[] = $this->_cleanObjectDatas($state);
+					}
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of states');
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get state by ID.
+	 *
+	 * @param int       $id        ID of state
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/states/{id}
+	 *
+	 * @throws RestException
+	 */
+	public function getStateByID($id)
+	{
+		return $this->_fetchCstate($id, '');
+	}
+
+	/**
+	 * Get state by Code.
+	 *
+	 * @param string    $code      Code of state
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/states/byCode/{code}
+	 *
+	 * @throws RestException
+	 */
+	public function getStateByCode($code)
+	{
+		return $this->_fetchCstate('', $code);
+	}
+
+	/**
+	 * Get the list of countries.
+	 *
+	 * The names of the countries will be translated to the given language if
+	 * the $lang parameter is provided. The value of $lang must be a language
+	 * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
+	 * The returned list is sorted by country ID.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $filter     To filter the countries by name
+	 * @param string    $lang       Code of the language the label of the countries must be translated to
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array                List of countries
+	 *
+	 * @url     GET dictionary/countries
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfCountries($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $lang = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		// Note: The filter is not applied in the SQL request because it must
+		// be applied to the translated names, not to the names in database.
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_country as t";
+		$sql .= " WHERE 1 = 1";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$country = new Ccountry($this->db);
+				if ($country->fetch($obj->rowid) > 0) {
+					// Translate the name of the country if needed
+					// and then apply the filter if there is one.
+					$this->translateLabel($country, $lang, 'Country');
+
+					if (empty($filter) || stripos($country->label, $filter) !== false) {
+						$list[] = $this->_cleanObjectDatas($country);
+					}
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of countries');
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get country by ID.
+	 *
+	 * @param int       $id        ID of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/countries/{id}
+	 *
+	 * @throws RestException
+	 */
+	public function getCountryByID($id, $lang = '')
+	{
+		return $this->_fetchCcountry($id, '', '', $lang);
+	}
+
+	/**
+	 * Get country by Code.
+	 *
+	 * @param string    $code      Code of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/countries/byCode/{code}
+	 *
+	 * @throws RestException
+	 */
+	public function getCountryByCode($code, $lang = '')
+	{
+		return $this->_fetchCcountry('', $code, '', $lang);
+	}
+
+	/**
+	 * Get country by Iso.
+	 *
+	 * @param string    $iso       ISO of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/countries/byISO/{iso}
+	 *
+	 * @throws RestException
+	 */
+	public function getCountryByISO($iso, $lang = '')
+	{
+		return $this->_fetchCcountry('', '', $iso, $lang);
+	}
+
+	/**
+	 * Get state.
+	 *
+	 * @param int       $id        ID of state
+	 * @param string    $code      Code of state
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @throws RestException
+	 */
+	private function _fetchCstate($id, $code = '')
+	{
+		$state = new Cstate($this->db);
+
+		$result = $state->fetch($id, $code);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieving state : '.$state->error);
+		} elseif ($result == 0) {
+			throw new RestException(404, 'State not found');
+		}
+
+		return $this->_cleanObjectDatas($state);
+	}
+
+	/**
+	 * Get country.
+	 *
+	 * @param int       $id        ID of country
+	 * @param string    $code      Code of country
+	 * @param string    $iso       ISO of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @throws RestException
+	 */
+	private function _fetchCcountry($id, $code = '', $iso = '', $lang = '')
+	{
+		$country = new Ccountry($this->db);
+
+		$result = $country->fetch($id, $code, $iso);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieving country : '.$country->error);
+		} elseif ($result == 0) {
+			throw new RestException(404, 'country not found');
+		}
+
+		$this->translateLabel($country, $lang, 'Country');
+
+		return $this->_cleanObjectDatas($country);
+	}
+
+	/**
+	 * Get the list of delivery times.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Delivery times is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with.
+	 *
+	 * @url     GET dictionary/availability
+	 *
+	 * @return array [List of availability]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getAvailability($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid, code, label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_availability as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+				  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param object    $object    Object to clean
+	 * @return array 				Array of cleaned object properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->error);
+		unset($object->errors);
+
+		return $object;
+	}
+
+	/**
+	 * Translate the name of the object to the given language.
+	 *
+	 * @param object   $object    Object with label to translate
+	 * @param string   $lang      Code of the language the name of the object must be translated to
+	 * @param string   $prefix 	  Prefix for translation key
+	 *
+	 * @return void
+	 */
+	private function translateLabel($object, $lang, $prefix = 'Country')
+	{
+		if (!empty($lang)) {
+			// Load the translations if this is a new language.
+			if ($this->translations == null || $this->translations->getDefaultLang() !== $lang) {
+				global $conf;
+				$this->translations = new Translate('', $conf);
+				$this->translations->setDefaultLang($lang);
+				$this->translations->load('dict');
+			}
+			if ($object->code) {
+				$key = $prefix.$object->code;
+
+				$translation = $this->translations->trans($key);
+				if ($translation != $key) {
+					$object->label = html_entity_decode($translation);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the list of shipment methods.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 *
+	 * @return array List of shipment methods
+	 *
+	 * @url     GET dictionary/shipment_methods
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfShipmentMethods($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+		$sql = "SELECT t.rowid, t.code, t.libelle, t.description, t.tracking";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of shipment methods : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of events types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $type       To filter on type of event
+	 * @param string    $module     To filter on module events
+	 * @param int       $active     Event's type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of events types
+	 *
+	 * @url     GET dictionary/event_types
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfEventTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT id, code, type, libelle as label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of events types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+
+	/**
+	 * Get the list of Expense Report types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $module     To filter on module
+	 * @param int       $active     Event's type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of expense report types
+	 *
+	 * @url     GET dictionary/expensereport_types
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfExpenseReportsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT id, code, label, accountancy_code, active, module, position";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of expense report types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+
+	/**
+	 * Get the list of contacts types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $type       To filter on type of contact
+	 * @param string    $module     To filter on module contacts
+	 * @param int       $active     Contact's type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array	  List of Contacts types
+	 *
+	 * @url     GET dictionary/contact_types
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfContactTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, element as type, libelle as label, source, module, position";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($type) $sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of contacts types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of civilities.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $module     To filter on module events
+	 * @param int       $active     Civility is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array		List of civility types
+	 *
+	 * @url     GET dictionary/civilities
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfCivilities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of civility : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of currencies.
+	 *
+	 * @param int       $multicurrency  Multicurrency rates (0: no multicurrency, 1: last rate, 2: all rates) {@min 0} {@max 2}
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of currencies
+	 *
+	 * @url     GET dictionary/currencies
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfCurrencies($multicurrency = 0, $sortfield = "code_iso", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+		$sql = "SELECT t.code_iso, t.label, t.unicode";
+		if (!empty($multicurrency)) $sql .= " , cr.date_sync, cr.rate ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
+		if (!empty($multicurrency)) {
+			$sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
+			$sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
+		}
+		$sql .= " WHERE t.active = ".$active;
+		if (!empty($multicurrency)) {
+			$sql .= " AND m.entity IN (".getEntity('multicurrency').")";
+			if (!empty($multicurrency) && $multicurrency != 2) {
+				$sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
+			}
+		}
+
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of currency : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of extra fields.
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param string    $type       Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'SO-%')"
+	 * @return array				List of extra fields
+	 *
+	 * @url     GET extrafields
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfExtrafields($sortfield = "t.pos", $sortorder = 'ASC', $type = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->admin) {
+			throw new RestException(401, 'Only an admin user can get list of extrafields');
+		}
+
+		if ($type == 'thirdparty') $type = 'societe';
+		if ($type == 'contact') $type = 'socpeople';
+
+		$sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
+		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
+		$sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
+		if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				while ($tab = $this->db->fetch_object($resql))
+				{
+					// New usage
+					$list[$tab->elementtype][$tab->name]['type'] = $tab->type;
+					$list[$tab->elementtype][$tab->name]['label'] = $tab->label;
+					$list[$tab->elementtype][$tab->name]['size'] = $tab->size;
+					$list[$tab->elementtype][$tab->name]['elementtype'] = $tab->elementtype;
+					$list[$tab->elementtype][$tab->name]['default'] = $tab->fielddefault;
+					$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
+					$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
+					$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
+					$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? unserialize($tab->param) : '');
+					$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
+					$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
+					$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
+					$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
+		}
+
+		if (!count($list))
+		{
+			throw new RestException(404, 'No extrafield found');
+		}
+
+		return $list;
+	}
+
+
+	/**
+	 * Get the list of towns.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $zipcode    To filter on zipcode
+	 * @param string    $town       To filter on city name
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of towns
+	 *
+	 * @url     GET dictionary/towns
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfTowns($sortfield = "zip,town", $sortorder = 'ASC', $limit = 100, $page = 0, $zipcode = '', $town = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
+		$sql .= " AND t.active = ".$active;
+		if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
+		if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of towns : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of payments terms.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+	 *
+	 * @url     GET dictionary/payment_terms
+	 *
+	 * @return array List of payment terms
+	 *
+	 * @throws RestException 400
+	 */
+	public function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->propal->lire && !DolibarrApiAccess::$user->rights->commande->lire && !DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of shipping methods.
+	 *
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Shipping methodsm is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+	 *
+	 * @url     GET dictionary/shipping_methods
+	 *
+	 * @return array List of shipping methods
+	 *
+	 * @throws RestException 400
+	 */
+	public function getShippingModes($limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		//$sql.= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of measuring units.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Measuring unit is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of measuring unit
+	 *
+	 * @url     GET dictionary/units
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfMeasuringUnits($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+		//TODO link with multicurrency module
+		$sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of measuring units: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of social networks.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Social network is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of social networks
+	 *
+	 * @url     GET dictionary/socialnetworks
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfsocialNetworks($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		global $conf;
+
+		if (empty($conf->socialnetworks->enabled)) {
+			throw new RestException(400, 'API not available: this dictionary is not enabled by setup');
+		}
 
 		$list = array();
-        //TODO link with multicurrency module
-        $sql = "SELECT t.rowid, t.entity, t.code, t.label, t.url, t.icon, t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_socialnetworks as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_socialnetworks').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of social networks: '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-     /**
-     * Get the list of tickets categories.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of ticket categories
-     *
-     * @url     GET dictionary/ticket_categories
-     *
-     * @throws RestException
-     */
-    public function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
-        $sql .= " WHERE t.active = ".$active;
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket categories : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-    /**
-     * Get the list of tickets severity.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of ticket severities
-     *
-     * @url     GET dictionary/ticket_severities
-     *
-     * @throws RestException
-     */
-    public function getTicketsSeverities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
-        $sql .= " WHERE t.active = ".$active;
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket severities : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-    /**
-     * Get the list of tickets types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of ticket types
-     *
-     * @url     GET dictionary/ticket_types
-     *
-     * @throws RestException
-     */
-    public function getTicketsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
-        $sql .= " WHERE t.active = ".(int) $active;
-    	// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
-    	// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket types : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-    /**
-     * Get properties of company
-     *
-     * @url	GET /company
-     *
-     * @return  array|mixed Data without useless information
-     *
-     */
-    public function getCompany()
-    {
-        global $mysoc;
-
-        return $this->_cleanObjectDatas($mysoc);
-    }
-
-
-    /**
-     * Get value of a setup variables
-     *
-     * Note that conf variables that stores security key or password hashes can't be loaded with API.
-     *
-     * @param	string			$constantname	Name of conf variable to get
-     * @return  array|mixed 				Data without useless information
-     *
-     * @url     GET conf/{constantname}
-     *
-     * @throws RestException 403 Forbidden
-     * @throws RestException 500 Error Bad or unknown value for constantname
-     */
-    public function getConf($constantname)
-    {
-    	global $conf;
-
-    	if (!DolibarrApiAccess::$user->admin
-    		&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_ADMIN_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_ADMIN_CHECK)) {
-    		throw new RestException(403, 'Error API open to admin users only or to the login user defined with constant API_LOGIN_ALLOWED_FOR_ADMIN_CHECK');
-    	}
-
-    	if (!preg_match('/^[a-zA-Z0-9_]+$/', $constantname) || !isset($conf->global->$constantname)) {
-    		throw new RestException(500, 'Error Bad or unknown value for constantname');
-    	}
-    	if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $constantname)) {
-    		throw new RestException(403, 'Forbidden');
-    	}
-
-    	return $conf->global->$constantname;
-    }
-
-    /**
-     * Do a test of integrity for files and setup.
-     *
-     * @param string	$target			Can be 'local' or 'default' or Url of the signatures file to use for the test. Must be reachable by the tested Dolibarr.
-     * @return array					Result of file and setup integrity check
-     *
-     * @url     GET checkintegrity
-     *
-     * @throws RestException 404 Signature file not found
-     * @throws RestException 500 Technical error
-     * @throws RestException 503 Forbidden
-     */
-    public function getCheckIntegrity($target)
-    {
-    	global $langs, $conf;
-
-    	if (!DolibarrApiAccess::$user->admin
-    		&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
-    	{
-    		throw new RestException(503, 'Error API open to admin users only or to the login user defined with constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
-    	}
-
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-
-    	$langs->load("admin");
-
-    	$outexpectedchecksum = '';
-    	$outcurrentchecksum = '';
-
-    	// Modified or missing files
-    	$file_list = array('missing' => array(), 'updated' => array());
-
-    	// Local file to compare to
-    	$xmlshortfile = GETPOST('xmlshortfile') ?GETPOST('xmlshortfile') : '/install/filelist-'.DOL_VERSION.'.xml';
-    	$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
-    	// Remote file to compare to
-    	$xmlremote = ($target == 'default' ? '' : $target);
-    	if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
-    	$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
-    	if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
-    	if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
-
-    	if ($target == 'local')
-    	{
-    		if (dol_is_file($xmlfile))
-    		{
-    			$xml = simplexml_load_file($xmlfile);
-    		}
-    		else
-    		{
-    			throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
-    		}
-    	}
-    	else
-    	{
-    		$xmlarray = getURLContent($xmlremote);
-
-    		// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-    		if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
-    		{
-    			$xmlfile = $xmlarray['content'];
-    			//print "xmlfilestart".$xmlfile."endxmlfile";
-    			$xml = simplexml_load_string($xmlfile);
-    		}
-    		else
-    		{
-    			$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
-    			throw new RestException(500, $errormsg);
-    		}
-    	}
-
-
-
-    	if ($xml)
-    	{
-    		$checksumconcat = array();
-    		$file_list = array();
-    		$out = '';
-
-    		// Forced constants
-    		if (is_object($xml->dolibarr_constants[0]))
-    		{
-    			$out .= load_fiche_titre($langs->trans("ForcedConstants"));
-
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Constant").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("Value").'</td>';
-    			$out .= '</tr>'."\n";
-
-    			$i = 0;
-    			foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
-    			{
-    				$constname = $constant['name'];
-    				$constvalue = (string) $constant;
-    				$constvalue = (empty($constvalue) ? '0' : $constvalue);
-    				// Value found
-    				$value = '';
-    				if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
-    				$valueforchecksum = (empty($value) ? '0' : $value);
-
-    				$checksumconcat[] = $valueforchecksum;
-
-    				$i++;
-    				$out .= '<tr class="oddeven">';
-    				$out .= '<td>'.$i.'</td>'."\n";
-    				$out .= '<td>'.$constname.'</td>'."\n";
-    				$out .= '<td class="center">'.$constvalue.'</td>'."\n";
-    				$out .= '<td class="center">'.$valueforchecksum.'</td>'."\n";
-    				$out .= "</tr>\n";
-    			}
-
-    			if ($i == 0)
-    			{
-    				$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-    			$out .= '<br>';
-    		}
-
-    		// Scan htdocs
-    		if (is_object($xml->dolibarr_htdocs_dir[0]))
-    		{
-    			//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
-    			$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
-
-    			// Defined qualified files (must be same than into generate_filelist_xml.php)
-    			$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-    			$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
-    			$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
-
-    			// Fill file_list with files in signature, new files, modified files
-    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
-    			// Complete with list of new files
-    			foreach ($scanfiles as $keyfile => $valfile)
-    			{
-    				$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
-    				if (!in_array($tmprelativefilename, $file_list['insignature']))
-    				{
-    					$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
-    					$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
-    				}
-    			}
-
-    			// Files missings
-    			$out .= load_fiche_titre($langs->trans("FilesMissing"));
-
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Filename").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-    			$out .= '</tr>'."\n";
-    			$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
-    			if (is_array($tmpfilelist) && count($tmpfilelist))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist as $file)
-    				{
-    					$i++;
-    					$out .= '<tr class="oddeven">';
-    					$out .= '<td>'.$i.'</td>'."\n";
-    					$out .= '<td>'.$file['filename'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-    					$out .= "</tr>\n";
-    				}
-    			}
-    			else
-    			{
-    				$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-    			$out .= '<br>';
-
-    			// Files modified
-    			$out .= load_fiche_titre($langs->trans("FilesModified"));
-
-    			$totalsize = 0;
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Filename").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("Size").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-    			$out .= '</tr>'."\n";
-    			$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
-    			if (is_array($tmpfilelist2) && count($tmpfilelist2))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist2 as $file)
-    				{
-    					$i++;
-    					$out .= '<tr class="oddeven">';
-    					$out .= '<td>'.$i.'</td>'."\n";
-    					$out .= '<td>'.$file['filename'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
-    					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-    					$totalsize += $size;
-    					$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-    					$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-    					$out .= "</tr>\n";
-    				}
-    				$out .= '<tr class="liste_total">';
-    				$out .= '<td></td>'."\n";
-    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-    				$out .= '<td class="right"></td>'."\n";
-    				$out .= "</tr>\n";
-    			}
-    			else
-    			{
-    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-    			$out .= '<br>';
-
-    			// Files added
-    			$out .= load_fiche_titre($langs->trans("FilesAdded"));
-
-    			$totalsize = 0;
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Filename").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("Size").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-    			$out .= '</tr>'."\n";
-    			$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
-    			if (is_array($tmpfilelist3) && count($tmpfilelist3))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist3 as $file)
-    				{
-    					$i++;
-    					$out .= '<tr class="oddeven">';
-    					$out .= '<td>'.$i.'</td>'."\n";
-    					$out .= '<td>'.$file['filename'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
-    					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-    					$totalsize += $size;
-    					$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-    					$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-    					$out .= "</tr>\n";
-    				}
-    				$out .= '<tr class="liste_total">';
-    				$out .= '<td></td>'."\n";
-    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-    				$out .= '<td class="right"></td>'."\n";
-    				$out .= "</tr>\n";
-    			}
-    			else
-    			{
-    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-
-    			// Show warning
-    			if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
-    			{
-    				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-    			}
-    			else
-    			{
-    				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
-    			}
-    		}
-    		else
-    		{
-    			throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
-    		}
-
-
-    		// Scan scripts
-
-
-    		asort($checksumconcat); // Sort list of checksum
-    		//var_dump($checksumconcat);
-    		$checksumget = md5(join(',', $checksumconcat));
-    		$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
-
-    		$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
-    		if ($checksumget == $checksumtoget)
-    		{
-    			if (count($file_list['added']))
-    			{
-    				$resultcode = 'warning';
-    				$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
-    				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    				$outcurrentchecksum = $checksumget;
-    			}
-    			else
-    			{
-    				$resultcode = 'ok';
-    				$resultcomment = 'Success';
-    				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    				$outcurrentchecksum = $checksumget;
-    			}
-    		}
-    		else
-    		{
-    			$resultcode = 'error';
-    			$resultcomment = 'Error';
-    			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    			$outcurrentchecksum = $checksumget;
-    		}
-    	}
-    	else {
-    		throw new RestException(404, 'No signature file known');
-    	}
-
-    	return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
-    }
+		//TODO link with multicurrency module
+		$sql = "SELECT t.rowid, t.entity, t.code, t.label, t.url, t.icon, t.active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_socialnetworks as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_socialnetworks').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of social networks: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	 /**
+	  * Get the list of tickets categories.
+	  *
+	  * @param string    $sortfield  Sort field
+	  * @param string    $sortorder  Sort order
+	  * @param int       $limit      Number of items per page
+	  * @param int       $page       Page number (starting from zero)
+	  * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	  * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	  * @return array				List of ticket categories
+	  *
+	  * @url     GET dictionary/ticket_categories
+	  *
+	  * @throws RestException
+	  */
+	public function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, pos,  label, use_default, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of ticket categories : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of tickets severity.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of ticket severities
+	 *
+	 * @url     GET dictionary/ticket_severities
+	 *
+	 * @throws RestException
+	 */
+	public function getTicketsSeverities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of ticket severities : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of tickets types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of ticket types
+	 *
+	 * @url     GET dictionary/ticket_types
+	 *
+	 * @throws RestException
+	 */
+	public function getTicketsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, pos,  label, use_default, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
+		$sql .= " WHERE t.active = ".(int) $active;
+		// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of ticket types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get properties of company
+	 *
+	 * @url	GET /company
+	 *
+	 * @return  array|mixed Data without useless information
+	 *
+	 */
+	public function getCompany()
+	{
+		global $mysoc;
+
+		return $this->_cleanObjectDatas($mysoc);
+	}
+
+
+	/**
+	 * Get value of a setup variables
+	 *
+	 * Note that conf variables that stores security key or password hashes can't be loaded with API.
+	 *
+	 * @param	string			$constantname	Name of conf variable to get
+	 * @return  array|mixed 				Data without useless information
+	 *
+	 * @url     GET conf/{constantname}
+	 *
+	 * @throws RestException 403 Forbidden
+	 * @throws RestException 404 Error Bad or unknown value for constantname
+	 */
+	public function getConf($constantname)
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->admin
+			&& (empty($conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ)) {
+			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_CONST_READ');
+		}
+
+		if (!preg_match('/^[a-zA-Z0-9_]+$/', $constantname) || !isset($conf->global->$constantname)) {
+			throw new RestException(404, 'Error Bad or unknown value for constantname');
+		}
+		if (isASecretKey($constantname)) {
+			throw new RestException(403, 'Forbidden. This parameter cant be read with APIs');
+		}
+
+		return $conf->global->$constantname;
+	}
+
+	/**
+	 * Do a test of integrity for files and setup.
+	 *
+	 * @param string	$target			Can be 'local' or 'default' or Url of the signatures file to use for the test. Must be reachable by the tested Dolibarr.
+	 * @return array					Result of file and setup integrity check
+	 *
+	 * @url     GET checkintegrity
+	 *
+	 * @throws RestException 404 Signature file not found
+	 * @throws RestException 500 Technical error
+	 * @throws RestException 503 Forbidden
+	 */
+	public function getCheckIntegrity($target)
+	{
+		global $langs, $conf;
+
+		if (!DolibarrApiAccess::$user->admin
+			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
+		{
+			throw new RestException(503, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+		$langs->load("admin");
+
+		$outexpectedchecksum = '';
+		$outcurrentchecksum = '';
+
+		// Modified or missing files
+		$file_list = array('missing' => array(), 'updated' => array());
+
+		// Local file to compare to
+		$xmlshortfile = GETPOST('xmlshortfile') ?GETPOST('xmlshortfile') : '/install/filelist-'.DOL_VERSION.'.xml';
+		$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
+		// Remote file to compare to
+		$xmlremote = ($target == 'default' ? '' : $target);
+		if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+		$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
+		if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
+		if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+
+		if ($target == 'local')
+		{
+			if (dol_is_file($xmlfile))
+			{
+				$xml = simplexml_load_file($xmlfile);
+			} else {
+				throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
+			}
+		} else {
+			$xmlarray = getURLContent($xmlremote);
+
+			// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
+			if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
+			{
+				$xmlfile = $xmlarray['content'];
+				//print "xmlfilestart".$xmlfile."endxmlfile";
+				$xml = simplexml_load_string($xmlfile);
+			} else {
+				$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
+				throw new RestException(500, $errormsg);
+			}
+		}
+
+
+
+		if ($xml)
+		{
+			$checksumconcat = array();
+			$file_list = array();
+			$out = '';
+
+			// Forced constants
+			if (is_object($xml->dolibarr_constants[0]))
+			{
+				$out .= load_fiche_titre($langs->trans("ForcedConstants"));
+
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Constant").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
+				$out .= '<td class="center">'.$langs->trans("Value").'</td>';
+				$out .= '</tr>'."\n";
+
+				$i = 0;
+				foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+				{
+					$constname = $constant['name'];
+					$constvalue = (string) $constant;
+					$constvalue = (empty($constvalue) ? '0' : $constvalue);
+					// Value found
+					$value = '';
+					if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
+					$valueforchecksum = (empty($value) ? '0' : $value);
+
+					$checksumconcat[] = $valueforchecksum;
+
+					$i++;
+					$out .= '<tr class="oddeven">';
+					$out .= '<td>'.$i.'</td>'."\n";
+					$out .= '<td>'.$constname.'</td>'."\n";
+					$out .= '<td class="center">'.$constvalue.'</td>'."\n";
+					$out .= '<td class="center">'.$valueforchecksum.'</td>'."\n";
+					$out .= "</tr>\n";
+				}
+
+				if ($i == 0)
+				{
+					$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+				$out .= '<br>';
+			}
+
+			// Scan htdocs
+			if (is_object($xml->dolibarr_htdocs_dir[0]))
+			{
+				//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
+				$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
+
+				// Defined qualified files (must be same than into generate_filelist_xml.php)
+				$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
+				$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
+				$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
+
+				// Fill file_list with files in signature, new files, modified files
+				$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
+				// Complete with list of new files
+				foreach ($scanfiles as $keyfile => $valfile)
+				{
+					$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
+					if (!in_array($tmprelativefilename, $file_list['insignature']))
+					{
+						$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
+						$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+					}
+				}
+
+				// Files missings
+				$out .= load_fiche_titre($langs->trans("FilesMissing"));
+
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Filename").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+				$out .= '</tr>'."\n";
+				$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
+				if (is_array($tmpfilelist) && count($tmpfilelist))
+				{
+					$i = 0;
+					foreach ($tmpfilelist as $file)
+					{
+						$i++;
+						$out .= '<tr class="oddeven">';
+						$out .= '<td>'.$i.'</td>'."\n";
+						$out .= '<td>'.$file['filename'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
+						$out .= "</tr>\n";
+					}
+				} else {
+					$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+				$out .= '<br>';
+
+				// Files modified
+				$out .= load_fiche_titre($langs->trans("FilesModified"));
+
+				$totalsize = 0;
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Filename").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+				$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+				$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+				$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+				$out .= '</tr>'."\n";
+				$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
+				if (is_array($tmpfilelist2) && count($tmpfilelist2))
+				{
+					$i = 0;
+					foreach ($tmpfilelist2 as $file)
+					{
+						$i++;
+						$out .= '<tr class="oddeven">';
+						$out .= '<td>'.$i.'</td>'."\n";
+						$out .= '<td>'.$file['filename'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
+						$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+						$totalsize += $size;
+						$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+						$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+						$out .= "</tr>\n";
+					}
+					$out .= '<tr class="liste_total">';
+					$out .= '<td></td>'."\n";
+					$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+					$out .= '<td class="right"></td>'."\n";
+					$out .= "</tr>\n";
+				} else {
+					$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+				$out .= '<br>';
+
+				// Files added
+				$out .= load_fiche_titre($langs->trans("FilesAdded"));
+
+				$totalsize = 0;
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Filename").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+				$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+				$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+				$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+				$out .= '</tr>'."\n";
+				$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
+				if (is_array($tmpfilelist3) && count($tmpfilelist3))
+				{
+					$i = 0;
+					foreach ($tmpfilelist3 as $file)
+					{
+						$i++;
+						$out .= '<tr class="oddeven">';
+						$out .= '<td>'.$i.'</td>'."\n";
+						$out .= '<td>'.$file['filename'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
+						$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+						$totalsize += $size;
+						$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+						$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+						$out .= "</tr>\n";
+					}
+					$out .= '<tr class="liste_total">';
+					$out .= '<td></td>'."\n";
+					$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+					$out .= '<td class="right"></td>'."\n";
+					$out .= "</tr>\n";
+				} else {
+					$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+
+				// Show warning
+				if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
+				{
+					//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
+				} else {
+					//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
+				}
+			} else {
+				throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
+			}
+
+
+			// Scan scripts
+
+
+			asort($checksumconcat); // Sort list of checksum
+			//var_dump($checksumconcat);
+			$checksumget = md5(join(',', $checksumconcat));
+			$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
+
+			$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
+			if ($checksumget == $checksumtoget)
+			{
+				if (count($file_list['added']))
+				{
+					$resultcode = 'warning';
+					$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
+					//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
+					$outcurrentchecksum = $checksumget;
+				} else {
+					$resultcode = 'ok';
+					$resultcomment = 'Success';
+					//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+					$outcurrentchecksum = $checksumget;
+				}
+			} else {
+				$resultcode = 'error';
+				$resultcomment = 'Error';
+				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+				$outcurrentchecksum = $checksumget;
+			}
+		} else {
+			throw new RestException(404, 'No signature file known');
+		}
+
+		return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
+	}
 }
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index b5b34658551..1ae504f523a 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -205,14 +205,11 @@ if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $
                                     {
                                         //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))
+                                    } 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
-                                    {
+                                    } else {
                                         dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
                                     }
                                 }
diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php
index be36482c295..0bdbff93569 100644
--- a/htdocs/asset/admin/assets_extrafields.php
+++ b/htdocs/asset/admin/assets_extrafields.php
@@ -37,7 +37,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'don'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/asset/admin/assets_type_extrafields.php b/htdocs/asset/admin/assets_type_extrafields.php
index 2f10938d356..ba42a3374dc 100644
--- a/htdocs/asset/admin/assets_type_extrafields.php
+++ b/htdocs/asset/admin/assets_type_extrafields.php
@@ -36,7 +36,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'adherent_type'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 752d569c7d1..64e2bc2b5ad 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array("admin", "assets"));
 if (!$user->admin) accessforbidden();
 
 // Parameters
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array('FIXEDASSETS_MYPARAM1'=>array('css'=>'minwidth200'), 'FIXEDASSETS_MYPARAM2'=>array('css'=>'minwidth500'));
@@ -87,9 +87,7 @@ if ($action == 'edit')
 
 	print '</form>';
 	print '<br>';
-}
-else
-{
+} else {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 110d662c9e8..7ef3d9c011e 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -37,7 +37,7 @@ $ref        = GETPOST('ref', 'alpha');
 $action     = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'assetcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
@@ -53,7 +53,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -65,6 +65,9 @@ if (empty($action) && empty($id) && empty($ref)) $action = 'view';
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
+// Security check
+if (!empty($user->socid)) $socid = $user->socid;
+$result = restrictedArea($user, 'asset', $id);
 
 $permissiontoread = $user->rights->asset->read;
 $permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
@@ -314,18 +317,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($user->rights->asset->write)
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 			}
 
 			if ($user->rights->asset->delete)
 			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-			}
-			else
-			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
 			}
 		}
@@ -350,7 +349,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
 		$genallowed = $user->rights->asset->read;	// If you can read, you can build the PDF to read content
 		$delallowed = $user->rights->asset->create;	// If you can create/edit, you can remove a file on card
-		print $formfile->showdocuments('asset', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		print $formfile->showdocuments('asset', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 		*/
 
 		// Show links to link elements
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index 21cd3b6393e..2cc48489f7f 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -55,6 +55,10 @@ class Asset extends CommonObject
 	public $picto = 'asset';
 
 
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+
+
 	/**
 	 *  'type' if the field format.
 	 *  'label' the translation key.
@@ -331,7 +335,7 @@ class Asset extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		$url = dol_buildpath('/assets/card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/asset/card.php', 1).'?id='.$this->id;
 
 		if ($option != 'nolink')
 		{
@@ -351,8 +355,7 @@ class Asset extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -391,36 +394,16 @@ class Asset extends CommonObject
         // phpcs:enable
 		global $langs;
 
-		if ($mode == 0 || $mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
+		$langs->load("contracts");
+		$labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
+		$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+		$labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
+		$labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+
+		$statusType = 'status0';
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+
+		return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 	/**
@@ -469,9 +452,7 @@ class Asset extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index bfb0c7d073a..db2407a9376 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -154,16 +154,12 @@ class AssetType extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -223,16 +219,12 @@ class AssetType extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 				return -$error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -263,9 +255,7 @@ class AssetType extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -303,9 +293,7 @@ class AssetType extends CommonObject
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -344,9 +332,7 @@ class AssetType extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print $this->db->error();
 		}
 		return $assettypes;
@@ -390,8 +376,7 @@ class AssetType extends CommonObject
 							$assetstatic->fetch($obj->rowid);
 						}
 						$ret[$obj->rowid] = $assetstatic;
-					}
-					else $ret[$obj->rowid] = $obj->rowid;
+					} else $ret[$obj->rowid] = $obj->rowid;
 				}
 			}
 
@@ -400,9 +385,7 @@ class AssetType extends CommonObject
 			$this->asset = $ret;
 
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 4724173cd19..b43ec8d40cf 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -68,6 +68,10 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
+// Security check
+if (!empty($user->socid)) $socid = $user->socid;
+$result = restrictedArea($user, 'asset', $id);
+
 //if ($id > 0 || ! empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity] . "/packages/" . dol_sanitizeFileName($object->id);
 if ($id > 0 || !empty($ref)) $upload_dir = $conf->sellyoursaas->multidir_output[$object->entity]."/packages/".dol_sanitizeFileName($object->ref);
 
@@ -144,9 +148,7 @@ if ($object->id)
 	$relativepathwithnofile = 'asset/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/asset/info.php b/htdocs/asset/info.php
index 900bbc61bf2..801a7c85b36 100644
--- a/htdocs/asset/info.php
+++ b/htdocs/asset/info.php
@@ -31,19 +31,21 @@ $langs->loadLangs(array("asset"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'asset', $id, '');
+$result = restrictedArea($user, 'asset', $id);
 
 $object = new Asset($db);
 $object->fetch($id);
 
+
 /*
  * Actions
  */
 
+// None
 
 
 /*
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 39fd0e0761d..d9bfea71510 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -39,7 +39,7 @@ $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk
 $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') : 'assetslist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'assetlist'; // 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')
 
@@ -47,8 +47,8 @@ $id = GETPOST('id', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -73,15 +73,18 @@ if (!$sortorder) $sortorder = "ASC";
 
 // Security check
 $socid = 0;
+if ($user->socid) $socid = $user->socid;
 if ($user->socid > 0)	// Protection if external user
 {
 	//$socid = $user->socid;
 	accessforbidden();
 }
-//$result = restrictedArea($user, 'asset', $id,'');
+// Security check
+$result = restrictedArea($user, 'asset', $id);
+
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -253,9 +256,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -273,7 +274,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
-	header("Location: ".DOL_URL_ROOT.'/assets/card.php?id='.$id);
+	header("Location: ".DOL_URL_ROOT.'/asset/card.php?id='.$id);
 	exit;
 }
 
@@ -388,8 +389,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 7b92e1dab92..f19249ce1d2 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array("asset", "companies"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -54,6 +54,10 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id > 0 || !empty($ref)) $upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id;
 
+// Security check
+if (!empty($user->socid)) $socid = $user->socid;
+$result = restrictedArea($user, 'asset', $id);
+
 $permissionnote = 1;
 //$permissionnote=$user->rights->asset->creer;	// Used by the include of actions_setnotes.inc.php
 
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 8df5ffe8c40..1045e9135ee 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -34,7 +34,7 @@ if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/account
 $langs->load("assets");
 
 $rowid  = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -77,6 +77,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x'
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('assettypecard', 'globalcard'));
 
+$permissiontoadd = $user->rights->asset->setup_advance;
 
 /*
  *	Actions
@@ -107,8 +108,7 @@ if ($action == 'add' && $user->rights->asset->write)
 	if (empty($object->label)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-	}
-	else {
+	} else {
 		$sql = "SELECT label FROM ".MAIN_DB_PREFIX."asset_type WHERE label='".$db->escape($object->label)."'";
 		$result = $db->query($sql);
 		if ($result) {
@@ -128,15 +128,11 @@ if ($action == 'add' && $user->rights->asset->write)
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'create';
 	}
 }
@@ -162,9 +158,7 @@ if ($action == 'update' && $user->rights->asset->write)
 	if ($ret >= 0 && !count($object->errors))
 	{
 		setEventMessages($langs->trans("AssetsTypeModified"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -182,9 +176,7 @@ if ($action == 'confirm_delete' && $user->rights->asset->write)
 		setEventMessages($langs->trans("AssetsTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
 		$action = '';
 	}
@@ -220,14 +212,6 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 
 		$param = '';
 
-        $newcardbutton = '';
-        if ($user->rights->asset->configurer)
-        {
-            $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/asset/type.php?action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans('NewAssetType').'</span>';
-            $newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';
-            $newcardbutton .= '</a>';
-        }
-
 		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().'">';
@@ -237,6 +221,8 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		print '<input type="hidden" name="page" value="'.$page.'">';
 		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
+		$newcardbutton = dolGetButtonTitle($langs->trans('NewAssetType'), '', 'fa fa-plus-circle', dol_buildpath('/asset/type.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
 		print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'accountancy', 0, $newcardbutton, '', $limit);
 
 		$moreforfilter = '';
@@ -247,9 +233,9 @@ 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 align="center">'.$langs->trans("AccountancyCodeAsset").'</th>';
-		print '<th align="center">'.$langs->trans("AccountancyCodeDepreciationAsset").'</th>';
-		print '<th align="center">'.$langs->trans("AccountancyCodeDepreciationExpense").'</th>';
+		print '<th class="center">'.$langs->trans("AccountancyCodeAsset").'</th>';
+		print '<th class="center">'.$langs->trans("AccountancyCodeDepreciationAsset").'</th>';
+		print '<th class="center">'.$langs->trans("AccountancyCodeDepreciationExpense").'</th>';
 		print '<th>&nbsp;</th>';
 		print "</tr>\n";
 
@@ -276,7 +262,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch('', $objp->accountancy_code_asset, 1);
 
-				print $accountingaccount->getNomUrl(0, 0, 0, '', 0);
+				print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
 			} else {
 				print $objp->accountancy_code_asset;
 			}
@@ -288,7 +274,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 				$accountingaccount2 = new AccountingAccount($db);
 				$accountingaccount2->fetch('', $objp->accountancy_code_depreciation_asset, 1);
 
-				print $accountingaccount2->getNomUrl(0, 0, 0, '', 0);
+				print $accountingaccount2->getNomUrl(0, 1, 1, '', 0);
 			} else {
 				print $objp->accountancy_code_depreciation_asset;
 			}
@@ -300,7 +286,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 				$accountingaccount3 = new AccountingAccount($db);
 				$accountingaccount3->fetch('', $objp->accountancy_code_depreciation_expense, 1);
 
-				print $accountingaccount3->getNomUrl(0, 0, 0, '', 0);
+				print $accountingaccount3->getNomUrl(0, 1, 1, '', 0);
 			} else {
 				print $objp->accountancy_code_depreciation_expense;
 			}
@@ -308,8 +294,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 
 			if ($user->rights->asset->write)
 				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			else
-				print '<td class="right">&nbsp;</td>';
+			else print '<td class="right">&nbsp;</td>';
 			print "</tr>";
 			$i++;
 		}
@@ -317,9 +302,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		print '</div>';
 
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -367,8 +350,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		// Accountancy_code_asset
 		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
@@ -525,7 +507,7 @@ if ($rowid > 0)
 		// Delete
 		if ($user->rights->asset->write)
 		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
 		}
 
 		print "</div>";
@@ -578,8 +560,7 @@ if ($rowid > 0)
 			print '<td>';
 			print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
 			print '</td></tr>';
-		}
-		else // For external software
+		} else // For external software
 		{
 			// Accountancy_code_asset
 			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index fd27abb6ceb..87aaeb6d46f 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -67,9 +67,7 @@ if ($resql)
 		$found = $notfound;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db, 'Error');
 	$found = 'Error';
 }
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 5facd5d1bbf..ecc7c4fee6c 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -137,9 +137,7 @@ if ($resql)
 		$found = $notfound;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db, 'Error');
 	$found = 'Error';
 }
@@ -164,9 +162,7 @@ if (!empty($number))
             print $txt;
             dol_syslog($txt, LOG_ERR);
             print '</body>'."\n";
-        }
-        else
-        {
+        } else {
             $txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login;
             dol_syslog($txt);
             print '<body onload="javascript:history.go(-1);">'."\n";
@@ -188,8 +184,7 @@ if (!empty($number))
             print '</body>'."\n";
         }
     }
-}
-else {
+} else {
     print 'Bad parameters in URL. Must be '.$_SERVER['PHP_SELF'].'?caller=99999&called=99999&login=xxxxx&password=xxxxx';
 }
 
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index a75aaa5543d..52a11e78bdd 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -71,8 +71,7 @@ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
 
 					try {
 						dol_include_once($dirroot.$file.'.php');
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
@@ -109,15 +108,11 @@ if ($action == 'initbarcodeproducts')
 			if ($resql)
 			{
 				setEventMessages($langs->trans("AllBarcodeReset"), null, 'mesgs');
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($db);
 			}
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT rowid, ref, fk_product_type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product";
 			$sql .= " WHERE barcode IS NULL or barcode = ''";
@@ -150,9 +145,7 @@ if ($action == 'initbarcodeproducts')
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($db);
 			}
@@ -167,9 +160,7 @@ if ($action == 'initbarcodeproducts')
 		{
 			//$db->rollback();
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -220,8 +211,7 @@ if ($conf->societe->enabled)
 	{
 		$obj = $db->fetch_object($resql);
 		$nbno = $obj->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe";
 	$resql = $db->query($sql);
@@ -229,8 +219,7 @@ if ($conf->societe->enabled)
 	{
 		$obj = $db->fetch_object($resql);
 		$nbtotal = $obj->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ThirdParties")).'<br>'."\n";
 
@@ -274,8 +263,7 @@ if ($conf->product->enabled || $conf->product->service)
 
 			$i++;
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product";
 	$resql = $db->query($sql);
@@ -283,8 +271,7 @@ if ($conf->product->enabled || $conf->product->service)
 	{
 		$obj = $db->fetch_object($resql);
 		$nbtotal = $obj->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ProductsOrServices")).'<br>'."\n";
 
@@ -294,9 +281,7 @@ if ($conf->product->enabled || $conf->product->service)
 		$objproduct = new Product($db);
 		print '<b>'.(isset($modBarCodeProduct->name) ? $modBarCodeProduct->name : $modBarCodeProduct->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
 		$disabled = 0;
-	}
-	else
-	{
+	} else {
 		$disabled = 1;
 		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
 		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index cf74a46bb2a..dabd05bf745 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -36,10 +36,10 @@ $now = dol_now();
 $year = dol_print_date($now, '%Y');
 $month = dol_print_date($now, '%m');
 $day = dol_print_date($now, '%d');
-$forbarcode = GETPOST('forbarcode');
-$fk_barcode_type = GETPOST('fk_barcode_type');
-$mode = GETPOST('mode');
-$modellabel = GETPOST("modellabel"); // Doc template to use
+$forbarcode = GETPOST('forbarcode', 'alphanohtml');
+$fk_barcode_type = GETPOST('fk_barcode_type', 'int');
+$mode = GETPOST('mode', 'aZ09');
+$modellabel = GETPOST("modellabel", 'aZ09'); // Doc template to use
 $numberofsticker = GETPOST('numberofsticker', 'int');
 
 $mesg = '';
@@ -57,9 +57,11 @@ $thirdpartytmp = new Societe($db);
 if (GETPOST('submitproduct') && GETPOST('submitproduct'))
 {
 	$action = ''; // We reset because we don't want to build doc
-	if (GETPOST('productid') > 0)
-	{
-		$producttmp->fetch(GETPOST('productid'));
+	if (GETPOST('productid', 'int') > 0) {
+		$result = $producttmp->fetch(GETPOST('productid', 'int'));
+		if ($result < 0) {
+			setEventMessage($producttmp->error, 'errors');
+		}
 		$forbarcode = $producttmp->barcode;
 		$fk_barcode_type = $producttmp->barcode_type;
 
@@ -74,9 +76,9 @@ if (GETPOST('submitproduct') && GETPOST('submitproduct'))
 if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty'))
 {
 	$action = ''; // We reset because we don't want to build doc
-	if (GETPOST('socid') > 0)
+	if (GETPOST('socid', 'int') > 0)
 	{
-		$thirdpartytmp->fetch(GETPOST('socid'));
+		$thirdpartytmp->fetch(GETPOST('socid', 'int'));
 		$forbarcode = $thirdpartytmp->barcode;
 		$fk_barcode_type = $thirdpartytmp->barcode_type_code;
 
@@ -161,9 +163,7 @@ if ($action == 'builddoc')
 					setEventMessages('Failed to generate image file of barcode for code='.$code.' encoding='.$encoding.' file='.basename($barcodeimage), null, 'errors');
 					setEventMessages($module->error, null, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages("Error, encoding ".$encoding." is not supported by encoder ".$generator.'. You must choose another barcode type or install a barcode generation engine that support '.$encoding, null, 'errors');
 			}
@@ -381,7 +381,7 @@ 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'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
+    $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>';
 }
@@ -391,7 +391,7 @@ 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'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
+    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>';
 }
diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php
index 1ef35942d1e..051f8bb049a 100644
--- a/htdocs/blockedlog/admin/blockedlog.php
+++ b/htdocs/blockedlog/admin/blockedlog.php
@@ -32,7 +32,7 @@ $langs->loadLangs(array("admin", "other", "blockedlog"));
 
 if (!$user->admin || empty($conf->blockedlog->enabled)) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 
@@ -51,9 +51,7 @@ if (preg_match('/set_(.*)/', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -65,9 +63,7 @@ if (preg_match('/del_(.*)/', $action, $reg))
 	{
 		Header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 66cc3b44848..d0bee7c613c 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array("admin", "other", "blockedlog", "bills"));
 
 if ((!$user->admin && !$user->rights->blockedlog->read) || empty($conf->blockedlog->enabled)) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'blockedloglist'; // 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')
@@ -56,8 +56,8 @@ if (($search_start == -1 || empty($search_start)) && !GETPOSTISSET('search_start
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -133,15 +133,11 @@ if ($action === 'downloadblockchain') {
 			{
 				$previoushash = $block_static->getPreviousHash(0, $obj->rowid);
 				$firstid = $obj->rowid;
-			}
-			else
-			{	// If not data found for filter, we do not need previoushash neither firstid
+			} else {	// If not data found for filter, we do not need previoushash neither firstid
 				$previoushash = 'nodata';
 				$firstid = '';
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			setEventMessages($db->lasterror, null, 'errors');
 		}
@@ -211,9 +207,7 @@ if ($action === 'downloadblockchain') {
 					$statusofrecord = 'Valid';
 					if ($loweridinerror > 0) $statusofrecordnote = 'ValidButFoundAPreviousKO';
 					else $statusofrecordnote = '';
-				}
-				else
-				{
+				} else {
 					$statusofrecord = 'KO';
 					$statusofrecordnote = 'LineCorruptedOrNotMatchingPreviousOne';
 					$loweridinerror = $obj->rowid;
@@ -245,9 +239,7 @@ if ($action === 'downloadblockchain') {
 			}
 
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
@@ -263,9 +255,7 @@ $form = new Form($db);
 if (GETPOST('withtab', 'alpha'))
 {
 	$title = $langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog');
-}
-else
-{
+} else {
 	$title = $langs->trans("BrowseBlockedLog");
 }
 
@@ -279,9 +269,7 @@ if (!is_array($blocks))
 	if ($blocks == -2)
 	{
 		setEventMessages($langs->trans("TooManyRecordToScanRestrictFilters", $MAXLINES), null, 'errors');
-	}
-	else
-	{
+	} else {
 		dol_print_error($block_static->db, $block_static->error, $block_static->errors);
 		exit;
 	}
@@ -323,6 +311,7 @@ if (GETPOST('withtab', 'alpha')) $param .= '&withtab='.urlencode(GETPOST('withta
 //include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 
 print '<div class="right">';
 print $langs->trans("RestrictYearToExport").': ';
@@ -440,9 +429,7 @@ if (!empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) {
 
 	// TODO Make a full scan of table in reverse order of id of $block, so we can use the parameter $previoushash into checkSignature to save requests
 	// to find the $loweridinerror.
-}
-else
-{
+} else {
 	// This is version that optimize the memory (but will not report errors that are outside the filter range)
 	$loweridinerror = 0;
 	$checkresult = array();
@@ -510,9 +497,7 @@ if (is_array($blocks))
 		   	{
 		   		if ($checkresult[$block->id]) print img_picto($langs->trans('OkCheckFingerprintValidityButChainIsKo'), 'statut4');
 		   		else print img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8');
-		   	}
-		   	else
-		   	{
+		   	} else {
 		   		print img_picto($langs->trans('OkCheckFingerprintValidity'), 'statut4');
 		   	}
 
diff --git a/htdocs/blockedlog/ajax/authority.php b/htdocs/blockedlog/ajax/authority.php
index 936ad5edb9c..64992bb33d6 100644
--- a/htdocs/blockedlog/ajax/authority.php
+++ b/htdocs/blockedlog/ajax/authority.php
@@ -52,18 +52,15 @@ if ($auth->fetch(0, $signature) <= 0) {
 
 if (!empty($hash)) {
 	echo $auth->checkBlockchain($hash) ? 'hashisok' : 'hashisjunk';
-}
-elseif (!empty($newblock)) {
+} elseif (!empty($newblock)) {
 	if ($auth->checkBlock($newblock)) {
 		$auth->addBlock($newblock);
 		$auth->update($user);
 
 		echo 'blockadded';
-	}
-	else {
+	} else {
 		echo 'blockalreadyadded';
 	}
-}
-else {
+} else {
 	echo 'idontunderstandwhatihavetodo';
 }
diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
index 5aa344c0237..1102438f5b5 100644
--- a/htdocs/blockedlog/ajax/block-add.php
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -34,7 +34,7 @@ $res = require '../../main.inc.php';
 
 $id = GETPOST('id', 'int');
 $element = GETPOST('element', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if ($element === 'facture') {
 	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index eaf1b17ed08..e83a71ea9b7 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -51,8 +51,7 @@ if ($block->fetch($id) > 0)
 {
 	$objtoshow = $block->object_data;
 	print formatObject($objtoshow, '');
-}
-else {
+} else {
 	print 'Error, failed to get unalterable log with id '.$id;
 }
 
@@ -94,18 +93,14 @@ function formatObject($objtoshow, $prefix)
 					var_dump(@get_class($val));
 					var_dump($val);*/
 					$s .= dol_print_date($val, 'dayhour');
-				}
-				else
-				{
+				} else {
 					$s .= $val;
 				}
 				$s .= '</td></tr>';
-			}
-			elseif (is_array($val))
+			} elseif (is_array($val))
 			{
 				$s .= formatObject($val, ($prefix ? $prefix.' > ' : '').$key);
-			}
-			elseif (is_object($val))
+			} elseif (is_object($val))
 			{
 				$s .= formatObject($val, ($prefix ? $prefix.' > ' : '').$key);
 			}
diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php
index 234aeceb2a6..69967d503a1 100644
--- a/htdocs/blockedlog/class/authority.class.php
+++ b/htdocs/blockedlog/class/authority.class.php
@@ -128,8 +128,7 @@ class BlockedLogAuthority
 
 		if (!in_array($block, $blocks)) {
 			return true;
-		}
-		else {
+		} else {
 			return false;
 		}
     }
@@ -179,15 +178,11 @@ class BlockedLogAuthority
 				$this->tms = $this->db->jdate($obj->tms);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -232,15 +227,11 @@ class BlockedLogAuthority
 				$this->db->commit();
 
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -276,9 +267,7 @@ class BlockedLogAuthority
 			$this->db->commit();
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -316,8 +305,7 @@ class BlockedLogAuthority
 			echo $block->signature.' '.$url.' '.$res.'<br>';
 			if ($res === 'blockalreadyadded' || $res === 'blockadded') {
 				$block->setCertified();
-			}
-			else {
+			} else {
 				$this->error = $langs->trans('ImpossibleToContactAuthority ', $url);
 				return -1;
 			}
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index be017f22600..b8d0304c5eb 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -185,6 +185,13 @@ class BlockedLog
 		// $conf->global->BANK_ENABLE_POS_CASHCONTROL must be set to 1 by all POS modules
 		$moduleposenabled = ($conf->cashdesk->enabled || $conf->takepos->enabled || !empty($conf->global->BANK_ENABLE_POS_CASHCONTROL));
 		if ($moduleposenabled) $this->trackedevents['CASHCONTROL_VALIDATE'] = 'logCASHCONTROL_VALIDATE';
+
+		if (!empty($conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED)) {
+			$tmparrayofmoresupportedevents = explode(',', $conf->global->BLOCKEDLOG_ADD_ACTIONS_SUPPORTED);
+			foreach ($tmparrayofmoresupportedevents as $val) {
+				$this->trackedevents[$val] = 'log'.$val;
+			}
+		}
 	}
 
 	/**
@@ -201,8 +208,7 @@ class BlockedLog
 			$object = new Facture($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
 		}
@@ -212,99 +218,80 @@ class BlockedLog
 			$object = new FactureFournisseur($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment') {
+		} elseif ($this->element === 'payment') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 			$object = new Paiement($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment_supplier') {
+		} elseif ($this->element === 'payment_supplier') {
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 
 			$object = new PaiementFourn($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment_donation') {
+		} elseif ($this->element === 'payment_donation') {
 			require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
 
 			$object = new PaymentDonation($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'payment_various') {
+		} elseif ($this->element === 'payment_various') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 
 			$object = new PaymentVarious($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'don' || $this->element === 'donation') {
+		} elseif ($this->element === 'don' || $this->element === 'donation') {
 			require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 			$object = new Don($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'subscription') {
+		} elseif ($this->element === 'subscription') {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 
 			$object = new Subscription($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->element === 'cashcontrol') {
+		} elseif ($this->element === 'cashcontrol') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
 
 			$object = new CashControl($this->db);
 			if ($object->fetch($this->fk_object) > 0) {
 				return $object->getNomUrl(1);
-			}
-			else {
+			} else {
 				$this->error++;
 			}
-		}
-		elseif ($this->action == 'MODULE_SET')
+		} elseif ($this->action == 'MODULE_SET')
 		{
 			return '<i class="opacitymedium">System to track events into unalterable logs were enabled</i>';
-		}
-		elseif ($this->action == 'MODULE_RESET')
+		} elseif ($this->action == 'MODULE_RESET')
 		{
 			if ($this->signature == '0000000000') {
 				return '<i class="opacitymedium">System to track events into unalterable logs were disabled after some recording were done. We saved a special Fingerprint to track the chain as broken.</i>';
-			}
-			else
-			{
+			} else {
 				return '<i class="opacitymedium">System to track events into unalterable logs were disabled. This is possible because no record were done yet.</i>';
 			}
 		}
@@ -361,24 +348,19 @@ class BlockedLog
 		if ($object->element == 'payment' || $object->element == 'payment_supplier')
 		{
 			$this->date_object = $object->datepaye;
-		}
-		elseif ($object->element == 'payment_salary')
+		} elseif ($object->element == 'payment_salary')
 		{
 			$this->date_object = $object->datev;
-		}
-		elseif ($object->element == 'payment_donation' || $object->element == 'payment_various')
+		} elseif ($object->element == 'payment_donation' || $object->element == 'payment_various')
 		{
 			$this->date_object = $object->datepaid ? $object->datepaid : $object->datep;
-		}
-		elseif ($object->element == 'subscription')
+		} elseif ($object->element == 'subscription')
 		{
 			$this->date_object = $object->dateh;
-		}
-		elseif ($object->element == 'cashcontrol')
+		} elseif ($object->element == 'cashcontrol')
 		{
 			$this->date_object = $object->date_creation;
-		}
-		else {
+		} else {
 			$this->date_object = $object->date;
 		}
 		// ref
@@ -393,7 +375,7 @@ class BlockedLog
 		$this->object_data = new stdClass();
 		// Add fields to exclude
 		$arrayoffieldstoexclude = array(
-			'table_element', 'fields', 'ref_previous', 'ref_next', 'origin', 'origin_id', 'oldcopy', 'picto', 'error', 'errors', 'modelpdf', 'last_main_doc', 'civility_id', 'contact', 'contact_id',
+			'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',
@@ -477,13 +459,11 @@ class BlockedLog
 							$this->object_data->invoiceline[$lineid]->{$keyline} = $valueline;
 						}
 					}
-				}
-				elseif (!is_object($value)) $this->object_data->{$key} = $value;
+				} elseif (!is_object($value)) $this->object_data->{$key} = $value;
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'invoice_supplier')
+		} elseif ($this->element == 'invoice_supplier')
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -495,8 +475,7 @@ class BlockedLog
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'payment' || $this->element == 'payment_supplier' || $this->element == 'payment_donation' || $this->element == 'payment_various')
+		} elseif ($this->element == 'payment' || $this->element == 'payment_supplier' || $this->element == 'payment_donation' || $this->element == 'payment_various')
 		{
 			$datepayment = $object->datepaye ? $object->datepaye : ($object->datepaid ? $object->datepaid : $object->datep);
 			$paymenttypeid = $object->paiementid ? $object->paiementid : ($object->paymenttype ? $object->paymenttype : $object->type_payment);
@@ -504,7 +483,7 @@ class BlockedLog
 			$this->object_data->ref = $object->ref;
 			$this->object_data->date = $datepayment;
 			$this->object_data->type_code = dol_getIdFromCode($this->db, $paymenttypeid, 'c_paiement', 'id', 'code');
-			$this->object_data->payment_num = ($object->num_paiement ? $object->num_paiement : $object->num_payment);
+			$this->object_data->payment_num = $object->num_payment;
 			//$this->object_data->fk_account = $object->fk_account;
 			$this->object_data->note = $object->note;
 			//var_dump($this->object_data);exit;
@@ -528,18 +507,15 @@ class BlockedLog
 				{
 					include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 					$tmpobject = new FactureFournisseur($this->db);
-				}
-				elseif ($this->element == 'payment')
+				} elseif ($this->element == 'payment')
 				{
 					include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 					$tmpobject = new Facture($this->db);
-				}
-				elseif ($this->element == 'payment_donation')
+				} elseif ($this->element == 'payment_donation')
 				{
 					include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 					$tmpobject = new Don($this->db);
-				}
-				elseif ($this->element == 'payment_various')
+				} elseif ($this->element == 'payment_various')
 				{
 					include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 					$tmpobject = new PaymentVarious($this->db);
@@ -572,8 +548,7 @@ class BlockedLog
 						$this->errors[] = $this->error;
 						dol_syslog("Failed to fetch thirdparty for object with id ".$tmpobject->id, LOG_ERR);
 						return -1;
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->error = $tmpobject->error;
 						$this->errors = $tmpobject->errors;
@@ -620,14 +595,12 @@ class BlockedLog
 			$this->object_data->amount = $totalamount;
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'payment_salary')
+		} elseif ($this->element == 'payment_salary')
 		{
 			$this->object_data->amounts = array($object->amount);
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		elseif ($this->element == 'subscription')
+		} elseif ($this->element == 'subscription')
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -639,8 +612,7 @@ class BlockedLog
 			}
 
 			if (!empty($object->newref)) $this->object_data->ref = $object->newref;
-		}
-		else 	// Generic case
+		} else // Generic case
 		{
 			foreach ($object as $key=>$value)
 			{
@@ -713,15 +685,11 @@ class BlockedLog
 				$this->certified		= ($obj->certified == 1);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -864,15 +832,11 @@ class BlockedLog
 				$this->db->commit();
 
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -953,9 +917,7 @@ class BlockedLog
 	 		{
 	 			$previoussignature = $obj->signature;
 	 		}
-	 	}
-	 	else
-	 	{
+	 	} else {
 	 		dol_print_error($this->db);
 	 		exit;
 	 	}
@@ -995,16 +957,13 @@ class BlockedLog
 		if ($element == 'all') {
 	 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity;
-		}
-		elseif ($element == 'not_certified') {
+		} elseif ($element == 'not_certified') {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 0";
-		}
-		elseif ($element == 'just_certified') {
+		} elseif ($element == 'just_certified') {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND certified = 1";
-		}
-		else {
+		} else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog
 	         WHERE entity=".$conf->entity." AND element='".$element."' AND fk_object=".(int) $fk_object;
 		}
@@ -1097,8 +1056,7 @@ class BlockedLog
 		{
 			$obj = $this->db->fetch_object($res);
 			if ($obj) $result = true;
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		dol_syslog("Module Blockedlog alreadyUsed with ignoresystem=".$ignoresystem." is ".$result);
 
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index e2386dcee0b..d8361d30258 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("mrp", "other"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -45,9 +45,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -216,9 +214,7 @@ if ($object->id > 0)
     	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
-    	{
+    	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 591e9a69d88..7daf29416c2 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -57,11 +57,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 if (empty($action) && empty($id) && empty($ref)) $action = 'view';
@@ -92,18 +92,18 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    $backurlforlist = DOL_URL_ROOT.'/bom/bom_list.php';
+	$backurlforlist = DOL_URL_ROOT.'/bom/bom_list.php';
 
-    if (empty($backtopage) || ($cancel && empty($id))) {
-    	if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
-    		if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-    		else $backtopage = dol_buildpath('/bom/bom_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
-    	}
-    }
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+			else $backtopage = dol_buildpath('/bom/bom_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
 
-    $triggermodname = 'BOM_MODIFY'; // Name of trigger action code to execute when we modify record
+	$triggermodname = 'BOM_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';
@@ -149,43 +149,41 @@ if (empty($reshook))
 		}
 
 		if ($object->fk_product == $idprod) {
-		    setEventMessages($langs->trans('TheProductXIsAlreadyTheProductToProduce'), null, 'errors');
-		    $error++;
+			setEventMessages($langs->trans('TheProductXIsAlreadyTheProductToProduce'), null, 'errors');
+			$error++;
 		}
 
 		if (!$error)
 		{
 			$lastposition = 0;
 
-    		$bomline = new BOMLine($db);
-    		$bomline->fk_bom = $id;
-    		$bomline->fk_product = $idprod;
-    		$bomline->qty = $qty;
-    		$bomline->qty_frozen = (int) $qty_frozen;
-    		$bomline->disable_stock_change = (int) $disable_stock_change;
-    		$bomline->efficiency = $efficiency;
+			$bomline = new BOMLine($db);
+			$bomline->fk_bom = $id;
+			$bomline->fk_product = $idprod;
+			$bomline->qty = $qty;
+			$bomline->qty_frozen = (int) $qty_frozen;
+			$bomline->disable_stock_change = (int) $disable_stock_change;
+			$bomline->efficiency = $efficiency;
 
-    		// Rang to use
+			// Rang to use
    			$rangmax = $object->line_max(0);
    			$ranktouse = $rangmax + 1;
 
    			$bomline->position = ($ranktouse + 1);
 
-    		$result = $bomline->create($user);
-    		if ($result <= 0)
-    		{
-    			setEventMessages($bomline->error, $bomline->errors, 'errors');
-    			$action = '';
-    		}
-    		else
-    		{
-    			unset($_POST['idprod']);
-    			unset($_POST['qty']);
-    			unset($_POST['qty_frozen']);
-    		    unset($_POST['disable_stock_change']);
+			$result = $bomline->create($user);
+			if ($result <= 0)
+			{
+				setEventMessages($bomline->error, $bomline->errors, 'errors');
+				$action = '';
+			} else {
+				unset($_POST['idprod']);
+				unset($_POST['qty']);
+				unset($_POST['qty_frozen']);
+				unset($_POST['disable_stock_change']);
 
-    		    $object->fetchLines();
-    		}
+				$object->fetchLines();
+			}
 		}
 	}
 
@@ -218,15 +216,13 @@ if (empty($reshook))
 		{
 			setEventMessages($bomline->error, $bomline->errors, 'errors');
 			$action = '';
-		}
-		else
-		{
+		} else {
 			unset($_POST['idprod']);
 			unset($_POST['qty']);
 			unset($_POST['qty_frozen']);
-		    unset($_POST['disable_stock_change']);
+			unset($_POST['disable_stock_change']);
 
-		    $object->fetchLines();
+			$object->fetchLines();
 		}
 	}
 }
@@ -296,7 +292,7 @@ if (($id || $ref) && $action == 'edit')
 	print load_fiche_titre($langs->trans("BillOfMaterials"), '', 'cubes');
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
@@ -327,7 +323,7 @@ if (($id || $ref) && $action == 'edit')
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-    $res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
 	$head = bomPrepareHead($object);
 	dol_fiche_head($head, 'card', $langs->trans("BillOfMaterials"), -1, 'bom');
@@ -337,7 +333,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('DeleteBillOfMaterials'), $langs->trans('ConfirmDeleteBillOfMaterials'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBillOfMaterials'), $langs->trans('ConfirmDeleteBillOfMaterials'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
@@ -457,7 +453,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$text = $langs->trans('ConfirmSetToDraft', $object->ref);
 
 		$formquestion = array();
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetToDraft'), $text, 'confirm_setdraft', $formquestion, 0, 1, 220);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetToDraft'), $text, 'confirm_setdraft', $formquestion, 0, 1, 220);
 	}
 
 	// Call Hook formConfirm
@@ -549,133 +545,129 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (!empty($object->table_element_line))
 	{
-	    print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '').'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '').'" method="POST">
     	<input type="hidden" name="token" value="' . newToken().'">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
     	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
-	    if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-	        include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
-	    }
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+		}
 
-	    print '<div class="div-table-responsive-no-min">';
-	    if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
-	    {
-	        print '<table id="tablelines" class="noborder noshadow" width="100%">';
-	    }
+		print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
 
-	    if (!empty($object->lines))
-	    {
-	        $object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
-	    }
+		if (!empty($object->lines))
+		{
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/bom/tpl');
+		}
 
-	    // Form to add new line
-	    if ($object->status == 0 && $permissiontoadd && $action != 'selectlines')
-	    {
-	        if ($action != 'editline')
-	        {
-	            // Add products/services form
-	            $object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines')
+		{
+			if ($action != 'editline')
+			{
+				// Add products/services form
+				$object->formAddObjectLine(1, $mysoc, null, '/bom/tpl');
 
-	            $parameters = array();
-	            $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	        }
-	    }
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			}
+		}
 
-	    if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
-	    {
-	        print '</table>';
-	    }
-	    print '</div>';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '</table>';
+		}
+		print '</div>';
 
-	    print "</form>\n";
+		print "</form>\n";
 	}
 
 
 	// Buttons for actions
 
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
-    	    // Send
-    		//if (empty($user->socid)) {
-    		//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
-    		//}
+		if (empty($reshook))
+		{
+			// Send
+			//if (empty($user->socid)) {
+			//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
+			//}
 
-    		// Back to draft
-    		if ($object->status == $object::STATUS_VALIDATED)
-    		{
-	    		if ($permissiontoadd)
-	    		{
-	    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft">'.$langs->trans("SetToDraft").'</a>';
-	    		}
-    		}
+			// Back to draft
+			if ($object->status == $object::STATUS_VALIDATED)
+			{
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>';
+				}
+			}
 
-            // Modify
-    		if ($object->status == $object::STATUS_DRAFT)
-    		{
-	    		if ($permissiontoadd)
-	    		{
-	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-	    		}
-	    		else
-	    		{
-	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-	    		}
-    		}
+			// Modify
+			if ($object->status == $object::STATUS_DRAFT)
+			{
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit&amp;token='.newToken().'">'.$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 (is_array($object->lines) && count($object->lines) > 0)
-	    			{
-	    				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-	    			}
-	    			else
-	    			{
-	    				$langs->load("errors");
-	    				print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
-	    			}
-	    		}
-    		}
+			// Validate
+			if ($object->status == $object::STATUS_DRAFT)
+			{
+				if ($permissiontoadd)
+				{
+					if (is_array($object->lines) && count($object->lines) > 0)
+					{
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate&amp;token='.newToken().'">'.$langs->trans("Validate").'</a>';
+					} else {
+						$langs->load("errors");
+						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+					}
+				}
+			}
 
-    		// Close / Cancel
-    		if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED)
-    		{
-    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close">'.$langs->trans("Disable").'</a>';
-    		}
+			// Close / Cancel
+			if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close">'.$langs->trans("Disable").'</a>';
+			}
 
-    		// Re-open
-    		if ($permissiontoadd && $object->status == $object::STATUS_CANCELED)
-    		{
-    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen">'.$langs->trans("ReOpen").'</a>';
-    		}
+			// Re-open
+			if ($permissiontoadd && $object->status == $object::STATUS_CANCELED)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen">'.$langs->trans("ReOpen").'</a>';
+			}
 
-    		// Create MO
-    		if ($conf->mrp->enabled)
-    		{
-	    		if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write))
-	    		{
-	    			print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>';
-	    		}
-    		}
+			// Create MO
+			if ($conf->mrp->enabled)
+			{
+				if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write))
+				{
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>';
+				}
+			}
 
-    		// Clone
-    		if ($permissiontoadd)
-    		{
-    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&object=bom">'.$langs->trans("ToClone").'</a>';
-    		}
+			// Clone
+			if ($permissiontoadd)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&object=bom">'.$langs->trans("ToClone").'</a>';
+			}
 
-    		/*
+			/*
     		if ($user->rights->bom->write)
     		{
     			if ($object->status == 1)
@@ -689,16 +681,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($permissiontodelete)
-    		{
-    			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else
-    		{
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			if ($permissiontodelete)
+			{
+				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";
 	}
 
 
@@ -709,41 +699,41 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($action != 'presend')
 	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    // Documents
-	    $objref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $objref.'/'.$objref.'.pdf';
-	    $filedir = $conf->bom->dir_output.'/'.$objref;
-	    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-	    $genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
-	    $delallowed = $user->rights->bom->write; // If you can create/edit, you can remove a file on card
-	    print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		// Documents
+		$objref = dol_sanitizeFileName($object->ref);
+		$relativepath = $objref.'/'.$objref.'.pdf';
+		$filedir = $conf->bom->dir_output.'/'.$objref;
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed = $user->rights->bom->read; // If you can read, you can build the PDF to read content
+		$delallowed = $user->rights->bom->write; // If you can create/edit, you can remove a file on card
+		print $formfile->showdocuments('bom', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('bom'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    $MAXEVENT = 10;
+		$MAXEVENT = 10;
 
-	    $morehtmlright = '<a href="'.dol_buildpath('/bom/bom_agenda.php', 1).'?id='.$object->id.'">';
-	    $morehtmlright .= $langs->trans("SeeAll");
-	    $morehtmlright .= '</a>';
+		$morehtmlright = '<a href="'.dol_buildpath('/bom/bom_agenda.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'bom', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'bom', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 	//Select mail models is same action as presend
-    if (GETPOST('modelselected')) $action = 'presend';
+	if (GETPOST('modelselected')) $action = 'presend';
 
 	// Presend form
 	$modelmail = 'bom';
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index a7dca41fff6..45aedbe8ee2 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -141,9 +141,7 @@ if ($object->id)
 	$relativepathwithnofile = 'bom/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index e2bafbecb48..121517b2544 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -45,8 +45,8 @@ $id = GETPOST('id', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -81,7 +81,7 @@ if ($user->socid > 0)	// Protection if external user
 //$result = restrictedArea($user, 'bom', $id, '');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -196,11 +196,8 @@ if (empty($reshook))
 						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 						break;
-					}
-					else $nbok++;
-				}
-				else
-				{
+					} else $nbok++;
+				} else {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
@@ -212,9 +209,7 @@ if (empty($reshook))
 				if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 			//var_dump($listofobjectthirdparties);exit;
@@ -251,11 +246,8 @@ if (empty($reshook))
 						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 						break;
-					}
-					else $nbok++;
-				}
-				else
-				{
+					} else $nbok++;
+				} else {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
@@ -267,9 +259,7 @@ if (empty($reshook))
 				if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 			//var_dump($listofobjectthirdparties);exit;
@@ -364,9 +354,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -500,8 +488,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index dce9bc82b06..df1693e84b0 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array("mrp", "companies"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 806b75cb9eb..b9123b8c226 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -99,7 +99,7 @@ class Boms extends DolibarrApi
         global $db, $conf;
 
         $obj_ret = array();
-        $tmpobject = new BOM($db);
+        $tmpobject = new BOM($this->db);
 
         $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
@@ -139,7 +139,7 @@ class Boms extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -147,25 +147,24 @@ class Boms extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $i = 0;
             while ($i < $num)
             {
-                $obj = $db->fetch_object($result);
-                $bom_static = new BOM($db);
+            	$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 {
+        } else {
             throw new RestException(503, 'Error when retrieve bom list');
         }
         if (!count($obj_ret)) {
@@ -228,9 +227,7 @@ class Boms extends DolibarrApi
         if ($this->bom->update($id, DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->bom->error);
         }
     }
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index aea05d59a15..bd67f311d19 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -251,7 +251,7 @@ class BOM extends CommonObject
 	    if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
 
 	    // Get lines so they will be clone
-	    //foreach($object->lines as $line)
+	    //foreach ($object->lines as $line)
 	    //	$line->fetch_optionals();
 
 	    // Reset some properties
@@ -383,14 +383,11 @@ class BOM extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -515,16 +512,12 @@ class BOM extends CommonObject
 	        if ($numref != "")
 	        {
 	            return $numref;
-	        }
-	        else
-	        {
+	        } else {
 	            $this->error = $obj->error;
 	            //dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 	            return "";
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        print $langs->trans("Error")." ".$langs->trans("Error_BOM_ADDON_NotDefined");
 	        return "";
 	    }
@@ -569,9 +562,7 @@ class BOM extends CommonObject
 	    {
 	        $this->fetch_product();
 	        $num = $this->getNextNumRef($this->product);
-	    }
-	    else
-	    {
+	    } else {
 	        $num = $this->ref;
 	    }
 	    $this->newref = dol_sanitizeFileName($num);
@@ -652,9 +643,7 @@ class BOM extends CommonObject
 	    {
 	        $this->db->commit();
 	        return 1;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->db->rollback();
 	        return -1;
 	    }
@@ -756,7 +745,7 @@ class BOM extends CommonObject
 
         $result = '';
 
-        $label = '<u>'.$langs->trans("BillOfMaterials").'</u>';
+        $label = img_picto('', $this->picto).' <u>'.$langs->trans("BillOfMaterials").'</u>';
         $label .= '<br>';
         $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
         if (isset($this->status)) {
@@ -790,8 +779,7 @@ class BOM extends CommonObject
              $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.'>';
@@ -897,9 +885,7 @@ class BOM extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -921,9 +907,7 @@ class BOM extends CommonObject
 	        $this->error = $this->error;
 	        $this->errors = $this->errors;
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->lines = $result;
 	        return $this->lines;
 	    }
@@ -950,8 +934,8 @@ class BOM extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'standard';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->BOM_ADDON_PDF)) {
 				$modele = $conf->global->BOM_ADDON_PDF;
 			}
@@ -1021,7 +1005,11 @@ class BOM extends CommonObject
 
 		foreach ($this->lines as &$line) {
 			$tmpproduct = new Product($this->db);
-			$tmpproduct->fetch($line->fk_product);
+			$result= $tmpproduct->fetch($line->fk_product);
+			if ($result < 0) {
+				$this->error=$tmpproduct->error;
+				return -1;
+			}
 			$line->unit_cost = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
 			if (empty($line->unit_cost)) {
 				if ($productFournisseur->find_min_price_product_fournisseur($line->fk_product) > 0)
@@ -1225,14 +1213,11 @@ class BOMLine extends CommonObjectLine
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -1346,8 +1331,7 @@ class BOMLine extends CommonObjectLine
              $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.'>';
@@ -1440,9 +1424,7 @@ class BOMLine extends CommonObjectLine
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/bom/tpl/linkedobjectblock.tpl.php b/htdocs/bom/tpl/linkedobjectblock.tpl.php
index d6b8ebf9a7c..45340577228 100644
--- a/htdocs/bom/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/bom/tpl/linkedobjectblock.tpl.php
@@ -52,8 +52,15 @@ foreach ($linkedObjectBlock as $key => $objectlink)
     }
     echo '</td>';
     echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
-    $product_static->fetch($objectlink->fk_product);
-    echo '<td class="linkedcol-ref" align="center">'.$product_static->getNomUrl(1).'</td>';
+
+    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)  {
+		$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) {
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index eeffb625381..2a675cc60e1 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -31,8 +31,8 @@
 
 // Protection to avoid direct call of template
 if (empty($object) || !is_object($object)) {
-    print "Error: this template page cannot be called directly as an URL";
-    exit;
+	print "Error: this template page cannot be called directly as an URL";
+	exit;
 }
 
 
@@ -52,35 +52,34 @@ print "<!-- BEGIN PHP TEMPLATE objectline_create.tpl.php -->\n";
 
 $nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
 if ($nolinesbefore) {
-    print '<tr class="liste_titre nodrag nodrop">';
-    if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-        print '<td class="linecolnum center"></td>';
-    }
-    print '<td class="linecoldescription minwidth500imp">';
+	print '<tr class="liste_titre nodrag nodrop">';
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+		print '<td class="linecolnum center"></td>';
+	}
+	print '<td class="linecoldescription minwidth500imp">';
 	print '<div id="add"></div><span class="hideonsmartphone">'.$langs->trans('AddNewLine').'</span>';
-	// echo $langs->trans("FreeZone");
 	print '</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 	if ($conf->global->PRODUCT_USE_UNITS)
 	{
-	    print '<td class="linecoluseunit left">';
-	    print '<span id="title_units">';
-	    print $langs->trans('Unit');
-	    print '</span></td>';
+		print '<td class="linecoluseunit left">';
+		print '<span id="title_units">';
+		print $langs->trans('Unit');
+		print '</span></td>';
 	}
 	print '<td class="linecolqtyfrozen right">'.$form->textwithpicto($langs->trans('QtyFrozen'), $langs->trans("QuantityConsumedInvariable")).'</td>';
 	print '<td class="linecoldisablestockchange right">'.$form->textwithpicto($langs->trans('DisableStockChange'), $langs->trans('DisableStockChangeHelp')).'</td>';
 	print '<td class="linecollost right">'.$form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')).'</td>';
 	print '<td class="linecoledit" colspan="'.$colspan.'">&nbsp;</td>';
-    print '</tr>';
+	print '</tr>';
 }
 print '<tr class="pair nodrag nodrop nohoverpair'.(($nolinesbefore || $object->element == 'contrat') ? '' : ' liste_titre_create').'">';
 $coldisplay = 0;
 
 // Adds a line numbering column
 if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
-    $coldisplay++;
-    echo '<td class="bordertop nobottom linecolnum center"></td>';
+	$coldisplay++;
+	echo '<td class="bordertop nobottom linecolnum center"></td>';
 }
 
 $coldisplay++;
@@ -99,9 +98,7 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
 	{
 		// hide products in closed warehouse, but show products for internal transfer
 		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-	}
-	else
-	{
+	} else {
 		$form->select_produits(GETPOST('idprod', 'int'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 	}
 
@@ -114,9 +111,9 @@ print '</td>';
 
 if ($conf->global->PRODUCT_USE_UNITS)
 {
-    $coldisplay++;
+	$coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	print $form->selectUnits($line->fk_unit, "units");
+	print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
 	print '</td>';
 }
 
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index e1e94dc2076..05682dc3da6 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -111,21 +111,21 @@ print '</td>';
 if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
 	print '<td class="linecoledit center">';
 	$coldisplay++;
-    if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
-    } else {
-        print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'">'.img_edit().'</a>';
-    }
-    print '</td>';
+	if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
+	} else {
+		print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'">'.img_edit().'</a>';
+	}
+	print '</td>';
 
-    print '<td class="linecoldelete center">';
-    $coldisplay++;
-    if (($line->fk_prev_id == null) && empty($disableremove)) {
-        //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
-        print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;lineid='.$line->id.'">';
-        print img_delete();
-        print '</a>';
-    }
-    print '</td>';
+	print '<td class="linecoldelete center">';
+	$coldisplay++;
+	if (($line->fk_prev_id == null) && empty($disableremove)) {
+		//La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$line->id.'">';
+		print img_delete();
+		print '</a>';
+	}
+	print '</td>';
 
 	if ($num > 1 && $conf->browser->layout != 'phone' && empty($disablemove)) {
 		print '<td class="linecolmove tdlineupdown center">';
@@ -146,14 +146,14 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
 		$coldisplay++;
 	}
 } else {
-    print '<td colspan="3"></td>';
-    $coldisplay = $coldisplay + 3;
+	print '<td colspan="3"></td>';
+	$coldisplay = $coldisplay + 3;
 }
 
 if ($action == 'selectlines') {
-    print '<td class="linecolcheck center">';
-    print '<input type="checkbox" class="linecheckbox" name="line_checkbox['.($i + 1).']" value="'.$line->id.'" >';
-    print '</td>';
+	print '<td class="linecolcheck center">';
+	print '<input type="checkbox" class="linecheckbox" name="line_checkbox['.($i + 1).']" value="'.$line->id.'" >';
+	print '</td>';
 }
 
 print '</tr>';
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index bc0c0c37fc2..9aa1989fa2e 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -31,7 +31,7 @@ $langs->load("admin");
 if (!$user->admin)
 accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if ($action == 'setvalue')
 {
@@ -44,9 +44,7 @@ if ($action == 'setvalue')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 06f0b0e8fe7..994bf13c031 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -41,9 +41,7 @@ function printDropdownBookmarksList()
     if (!empty($_SERVER["QUERY_STRING"]))
     {
         $url .= (dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '');
-    }
-    else
-    {
+    } else {
         global $sortfield, $sortorder;
         $tmpurl = '';
         // No urlencode, all param $url will be urlencoded later
@@ -122,9 +120,7 @@ function printDropdownBookmarksList()
     		}
     		$searchForm .= '</select>';
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 411c2c8175f..93926e4ba92 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -100,23 +100,17 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 			if (empty($backtopage)) $backtopage = ($urlsource ? $urlsource : ((!empty($url) && !preg_match('/^http/i', $url)) ? $url : DOL_URL_ROOT.'/bookmarks/list.php'));
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else
-		{
+		} else {
 			if ($object->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$langs->load("errors");
 				setEventMessages($langs->transnoentities("WarningBookmarkAlreadyExists"), null, 'warnings');
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 			$action = $invertedaction;
 		}
-	}
-	else
-	{
+	} else {
 		$action = $invertedaction;
 	}
 }
@@ -257,7 +251,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 		print '</span>';
 	}
 	print '</td><td>';
-	if ($action == 'edit') print '<input class="flat" name="url" size="80" value="'.(isset($_POST["url"]) ? $_POST["url"] : $object->url).'">';
+	if ($action == 'edit') print '<input class="flat minwidth500" name="url" value="'.(isset($_POST["url"]) ? $_POST["url"] : $object->url).'">';
 	else print '<a href="'.(preg_match('/^http/i', $object->url) ? $object->url : DOL_URL_ROOT.$object->url).'"'.($object->target ? ' target="_blank"' : '').'>'.$object->url.'</a>';
 	print '</td></tr>';
 
@@ -266,9 +260,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	{
 		$liste = array(1=>$langs->trans("OpenANewWindow"), 0=>$langs->trans("ReplaceWindow"));
 		print $form->selectarray('target', $liste, isset($_POST["target"]) ? $_POST["target"] : $object->target);
-	}
-	else
-	{
+	} else {
 		if ($object->target == 0) print $langs->trans("ReplaceWindow");
 		if ($object->target == 1) print $langs->trans("OpenANewWindow");
 	}
@@ -278,17 +270,13 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	if ($action == 'edit' && $user->admin)
 	{
 		print img_picto('', 'user').' '.$form->select_dolusers(isset($_POST['userid']) ? $_POST['userid'] : ($object->fk_user ? $object->fk_user : ''), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-	}
-	else
-	{
+	} else {
 		if ($object->fk_user > 0)
 		{
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user);
 			print $fuser->getNomUrl(1);
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Public");
 		}
 	}
@@ -323,13 +311,13 @@ if ($id > 0 && !preg_match('/^add/i', $action))
 	// Edit
 	if ($user->rights->bookmark->creer && $action != 'edit')
 	{
-		print "  <a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?id=".$object->id."&amp;action=edit\">".$langs->trans("Edit")."</a>\n";
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit&amp;token='.newToken().'">'.$langs->trans("Edit").'</a>'."\n";
 	}
 
 	// Remove
 	if ($user->rights->bookmark->supprimer && $action != 'edit')
 	{
-		print "  <a class=\"butActionDelete\" href=\"list.php?bid=".$object->id."&amp;action=delete\">".$langs->trans("Delete")."</a>\n";
+		print '<a class="butActionDelete" href="list.php?bid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>'."\n";
 	}
 
 	print '</div>';
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 2667208fc44..5fab4496f6e 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -127,9 +127,7 @@ class Bookmark extends CommonObject
 
             $this->db->free($resql);
             return $this->id;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -174,17 +172,13 @@ class Bookmark extends CommonObject
                 $this->id = $id;
                 $this->db->commit();
                 return $id;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->errno = $this->db->lasterrno();
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->errno = $this->db->lasterrno();
             $this->db->rollback();
@@ -218,9 +212,7 @@ class Bookmark extends CommonObject
         if ($this->db->query($sql))
         {
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -242,9 +234,7 @@ class Bookmark extends CommonObject
         if ($resql)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -320,8 +310,7 @@ class Bookmark extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index 1cc6029dbc9..7f70d74f5d9 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -27,12 +27,12 @@ require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bookmarks', 'admin'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bookmarklist'; // To manage different context of search
 
 // Security check
 if (!$user->rights->bookmark->lire) {
@@ -42,8 +42,8 @@ $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -72,9 +72,7 @@ if ($action == 'delete')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -115,9 +113,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -230,9 +226,7 @@ while ($i < min($num, $limit))
 		}
 		$tmpuser = $cacheOfUsers[$obj->fk_user];
 		print $tmpuser->getNomUrl(1);
-	}
-	else
-	{
+	} else {
 		print $langs->trans("Public");
 	}
 	print "</td>\n";
@@ -247,14 +241,12 @@ while ($i < min($num, $limit))
 	print '<td class="nowrap right">';
 	if ($user->rights->bookmark->creer)
 	{
-		print '<a class="editfielda" href="'.DOL_URL_ROOT."/bookmarks/card.php?action=edit&id=".$obj->rowid."&backtopage=".urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
+		print '<a class="editfielda" href="'.DOL_URL_ROOT."/bookmarks/card.php?action=edit&token='.newToken().'&id=".$obj->rowid."&backtopage=".urlencode($_SERVER["PHP_SELF"]).'">'.img_edit()."</a>";
 	}
 	if ($user->rights->bookmark->supprimer)
 	{
-		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$obj->rowid.'">'.img_delete().'</a>';
-	}
-	else
-	{
+		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$obj->rowid.'">'.img_delete().'</a>';
+	} else {
 		print "&nbsp;";
 	}
 	print "</td>";
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 7c72858387a..dfd6e99a9ea 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -68,9 +68,7 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -149,9 +147,7 @@ if (!empty($conf->stock->enabled))
 	print '<td colspan="2">';
 	if (empty($conf->productbatch->enabled)) {
 	    print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
-	}
-	else
-	{
+	} else {
 	    if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
 	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
 	    }
@@ -169,9 +165,7 @@ if (!empty($conf->stock->enabled))
 	{
 		print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE, 'CASHDESK_ID_WAREHOUSE', '', 1, $disabled);
 		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">('.$langs->trans("Create").')</a>';
-	}
-	else
-	{
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}
 	print '</td></tr>';
diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 41ba5ffcb39..7b513ada33c 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -36,9 +36,7 @@ if (isset($_SESSION['serObjFacturation']))
 {
     $obj_facturation = unserialize($_SESSION['serObjFacturation']);
     unset($_SESSION['serObjFacturation']);
-}
-else
-{
+} else {
 	// ... sinon, c'est une nouvelle vente
 	$obj_facturation = new Facturation();
 }
@@ -47,7 +45,7 @@ else
 
 $obj_facturation->calculTotaux(); // Redefine prix_total_ttc, prix_total_ht et montant_tva from $_SESSION['poscart']
 
-$total_ttc = $obj_facturation->prixTotalTtc();
+$total_ttc = $obj_facturation->amountWithTax();
 
 /*var_dump($obj_facturation);
 var_dump($_SESSION['poscart']);
@@ -72,9 +70,7 @@ if (in_array(
 	))
 {
 	include $page.'.php';
-}
-else
-{
+} else {
 	dol_print_error('', 'menu param '.$page.' is not inside allowed list');
 }
 
diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php
index 164d229cf8d..cc71d1c20d8 100644
--- a/htdocs/cashdesk/class/Auth.class.php
+++ b/htdocs/cashdesk/class/Auth.class.php
@@ -129,9 +129,7 @@ class Auth
                 $this->login($aLogin);
                 $this->passwd($aPasswd);
                 $ret = 0;
-            }
-            else
-            {
+            } else {
                 $ret = -1;
             }
         }
diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 10573f9d917..f2223b0b45d 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -140,7 +140,7 @@ class Facturation
             $remise_percent = 0;
         }
         $montant_remise_ht = ($resultarray[6] - $resultarray[0]);
-        $this->montantRemise($montant_remise_ht);
+        $this->amountDiscount($montant_remise_ht);
 
         $newcartarray = $_SESSION['poscart'];
 
@@ -256,7 +256,7 @@ class Facturation
         $this->qte('RESET');
         $this->stock('RESET');
         $this->remisePercent('RESET');
-        $this->montantRemise('RESET');
+        $this->amountDiscount('RESET');
         $this->prix('RESET');
         $this->tva('RESET');
     }
@@ -270,13 +270,13 @@ class Facturation
     {
         $this->numInvoice('RESET');
         $this->getSetPaymentMode('RESET');
-        $this->montantEncaisse('RESET');
-        $this->montantRendu('RESET');
+        $this->amountCollected('RESET');
+        $this->amountReturned('RESET');
         $this->paiementLe('RESET');
 
-        $this->prixTotalHt('RESET');
-        $this->montantTva('RESET');
-        $this->prixTotalTtc('RESET');
+        $this->amountWithoutTax('RESET');
+        $this->amountVat('RESET');
+        $this->amountWithTax('RESET');
     }
 
 
@@ -294,13 +294,10 @@ class Facturation
         if (!$aId)
         {
             return $this->id;
-        }
-        elseif ($aId == 'RESET')
+        } elseif ($aId == 'RESET')
         {
             $this->id = null;
-        }
-        else
-        {
+        } else {
             $this->id = $aId;
         }
     }
@@ -317,13 +314,10 @@ class Facturation
         if (is_null($aRef))
         {
             return $this->ref;
-        }
-        elseif ($aRef == 'RESET')
+        } elseif ($aRef == 'RESET')
         {
             $this->ref = null;
-        }
-        else
-        {
+        } else {
             $this->ref = $aRef;
         }
     }
@@ -339,13 +333,10 @@ class Facturation
         if (is_null($aQte))
         {
             return $this->qte;
-        }
-        elseif ($aQte == 'RESET')
+        } elseif ($aQte == 'RESET')
         {
             $this->qte = null;
-        }
-        else
-        {
+        } else {
             $this->qte = $aQte;
         }
     }
@@ -362,13 +353,10 @@ class Facturation
         if (is_null($aStock))
         {
             return $this->stock;
-        }
-        elseif ($aStock == 'RESET')
+        } elseif ($aStock == 'RESET')
         {
             $this->stock = null;
-        }
-        else
-        {
+        } else {
             $this->stock = $aStock;
         }
     }
@@ -385,13 +373,10 @@ class Facturation
         if (is_null($aRemisePercent))
         {
             return $this->remise_percent;
-        }
-        elseif ($aRemisePercent == 'RESET')
+        } elseif ($aRemisePercent == 'RESET')
         {
             $this->remise_percent = null;
-        }
-        else
-        {
+        } else {
             $this->remise_percent = $aRemisePercent;
         }
     }
@@ -402,7 +387,7 @@ class Facturation
      * @param	int		$aMontantRemise		Amount
      * @return	string						Amount
      */
-    public function montantRemise($aMontantRemise = null)
+    public function amountDiscount($aMontantRemise = null)
     {
 
         if (is_null($aMontantRemise)) {
@@ -490,7 +475,7 @@ class Facturation
      * @param	int		$aMontantEncaisse		Amount
      * @return	int								Amount
      */
-    public function montantEncaisse($aMontantEncaisse = null)
+    public function amountCollected($aMontantEncaisse = null)
     {
 
         if (is_null($aMontantEncaisse)) {
@@ -508,7 +493,7 @@ class Facturation
      * @param	int			$aMontantRendu		Amount
      * @return	int								Amount
      */
-    public function montantRendu($aMontantRendu = null)
+    public function amountReturned($aMontantRendu = null)
     {
 
         if (is_null($aMontantRendu)) {
@@ -543,7 +528,7 @@ class Facturation
      * @param	int		$aTotalHt		Total amount
      * @return	int						Total amount
      */
-    public function prixTotalHt($aTotalHt = null)
+    public function amountWithoutTax($aTotalHt = null)
     {
         if (is_null($aTotalHt)) {
             return $this->prix_total_ht;
@@ -560,7 +545,7 @@ class Facturation
      * @param	int		$aMontantTva	Amount vat
      * @return	int						Amount vat
      */
-    public function montantTva($aMontantTva = null)
+    public function amountVat($aMontantTva = null)
     {
         if (is_null($aMontantTva)) {
             return $this->montant_tva;
@@ -577,18 +562,15 @@ class Facturation
      * @param	int		$aTotalTtc		Amount ttc
      * @return	int						Amount ttc
      */
-    public function prixTotalTtc($aTotalTtc = null)
+    public function amountWithTax($aTotalTtc = null)
     {
         if (is_null($aTotalTtc))
         {
             return $this->prix_total_ttc;
-        }
-        elseif ($aTotalTtc == 'RESET')
+        } elseif ($aTotalTtc == 'RESET')
         {
             $this->prix_total_ttc = null;
-        }
-        else
-        {
+        } else {
             $this->prix_total_ttc = $aTotalTtc;
         }
     }
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index 3c4a4dd6c7a..85347e4c7ff 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -42,7 +42,7 @@ if (GETPOST('filtre', 'alpha')) {
 	$sql = "SELECT p.rowid, p.ref, p.label, p.tva_tx, p.fk_product_type";
 	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= ", ps.reel";
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
+	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
 	$sql .= " WHERE p.entity IN (".getEntity('product').")";
 	$sql .= " AND p.tosell = 1";
 	if (!$conf->global->CASHDESK_SERVICES) $sql .= " AND p.fk_product_type = 0";
@@ -80,9 +80,7 @@ if (GETPOST('filtre', 'alpha')) {
 			$i++;
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	$tab_designations = $ret;
@@ -94,7 +92,7 @@ if (GETPOST('filtre', 'alpha')) {
 	$sql = "SELECT p.rowid, ref, label, tva_tx, p.fk_product_type";
 	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= ", ps.reel";
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
+	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
 	$sql .= " WHERE p.entity IN (".getEntity('product').")";
 	$sql .= " AND p.tosell = 1";
 	if (!$conf->global->CASHDESK_SERVICES) $sql .= " AND p.fk_product_type = 0";
@@ -115,9 +113,7 @@ if (GETPOST('filtre', 'alpha')) {
 			$i++;
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	$tab_designations = $ret;
@@ -130,18 +126,13 @@ if ($nbr_enreg > 1)
 	if ($nbr_enreg > $conf_taille_listes)
 	{
 		$top_liste_produits = '----- '.$conf_taille_listes.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
-	}
-	else
-	{
+	} else {
 		$top_liste_produits = '----- '.$nbr_enreg.' '.$langs->transnoentitiesnoconv("CashDeskProducts").' '.$langs->trans("CashDeskOn").' '.$nbr_enreg.' -----';
 	}
-}
-elseif ($nbr_enreg == 1)
+} elseif ($nbr_enreg == 1)
 {
 	$top_liste_produits = '----- 1 '.$langs->transnoentitiesnoconv("ProductFound").' -----';
-}
-else
-{
+} else {
 	$top_liste_produits = '----- '.$langs->transnoentitiesnoconv("NoProductFound").' -----';
 }
 
@@ -154,8 +145,8 @@ $i = 0;
 
 // Reinitialisation du mode de paiement, en cas de retour aux achats apres validation
 $obj_facturation->getSetPaymentMode('RESET');
-$obj_facturation->montantEncaisse('RESET');
-$obj_facturation->montantRendu('RESET');
+$obj_facturation->amountCollected('RESET');
+$obj_facturation->amountReturned('RESET');
 $obj_facturation->paiementLe('RESET');
 
 
diff --git a/htdocs/cashdesk/facturation_dhtml.php b/htdocs/cashdesk/facturation_dhtml.php
index 98ed2bf0173..9ee4bdb856c 100644
--- a/htdocs/cashdesk/facturation_dhtml.php
+++ b/htdocs/cashdesk/facturation_dhtml.php
@@ -45,7 +45,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 	$sql = "SELECT p.rowid, p.ref, p.label, p.tva_tx";
 	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= ", ps.reel";
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$conf_fkentrepot."'";
+	if (!empty($conf->stock->enabled) && !empty($conf_fkentrepot)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '".$db->escape($conf_fkentrepot)."'";
 	$sql .= " WHERE p.entity IN (".getEntity('product').")";
 	$sql .= " AND p.tosell = 1";
 	$sql .= " AND p.fk_product_type = 0";
@@ -55,9 +55,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 		$sql .= " AND (p.ref LIKE '".$db->escape($search)."%' OR p.label LIKE '".$db->escape($search)."%'";
 		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$db->escape($search)."%'";
 		$sql .= ")";
-	}
-	else
-	{
+	} else {
 		$sql .= " AND (p.ref LIKE '%".$db->escape($search)."%' OR p.label LIKE '%".$db->escape($search)."%'";
 		if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '%".$db->escape($search)."%'";
 		$sql .= ")";
@@ -98,9 +96,7 @@ if (dol_strlen($search) >= 0)	// If search criteria is on char length at least
 			$resultat .= '</ul>';
 
 			print $resultat;
-		}
-		else
-		{
+		} else {
 			$langs->load("cashdesk");
 
 			print '<ul class="dhtml_bloc">';
diff --git a/htdocs/cashdesk/facturation_verif.php b/htdocs/cashdesk/facturation_verif.php
index 6a7a9bae366..16b4bfec017 100644
--- a/htdocs/cashdesk/facturation_verif.php
+++ b/htdocs/cashdesk/facturation_verif.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/cashdesk/class/Facturation.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $obj_facturation = unserialize($_SESSION['serObjFacturation']);
 unset($_SESSION['serObjFacturation']);
@@ -50,8 +50,7 @@ switch ($action)
 			if ($_POST['hdnSource'] == 'LISTE')
 			{
 				$sql .= " AND p.rowid = ".((int) GETPOST('selProduit', 'int'));
-			}
-			elseif ($_POST['hdnSource'] == 'REF')
+			} elseif ($_POST['hdnSource'] == 'REF')
 			{
 				$sql .= " AND p.ref = '".$db->escape(GETPOST('txtRef', 'alpha'))."'";
 			}
@@ -101,8 +100,7 @@ switch ($action)
 					        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))
+					} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					{
 					    require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -123,9 +121,7 @@ switch ($action)
 					            $tva_npr = $prodcustprice->lines[0]->recuperableonly;
 					            if (empty($tva_tx)) $tva_npr = 0;
 					        }
-					    }
-					    else
-					    {
+					    } else {
 					        setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					    }
 					}
@@ -162,35 +158,26 @@ switch ($action)
 					if ($_POST['hdnSource'] == 'LISTE')
 					{
 						$filtre = $ret['ref'];
-					}
-					elseif ($_POST['hdnSource'] == 'REF')
+					} elseif ($_POST['hdnSource'] == 'REF')
 					{
 						$filtre = $_POST['txtRef'];
 					}
 
 					$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.$filtre;
-				}
-				else
-				{
+				} else {
 					$obj_facturation->raz();
 
 					if ($_POST['hdnSource'] == 'REF')
 					{
 						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&filtre='.$_POST['txtRef'];
-					}
-					else
-					{
+					} else {
 						$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
-		}
-		else
-		{
+		} else {
 			$redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation';
 		}
 
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 6c74b268ec9..9d8bfc9b735 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -75,9 +75,7 @@ if (is_array($hookmanager->resArray) && !empty($hookmanager->resArray)) {
 if (!empty($mysoc->logo_small))
 {
 	print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
-}
-else
-{
+} else {
 	print '<div class="logopos">'.$mysoc->name.'</div>';
 }
 ?>
@@ -113,8 +111,7 @@ if (!empty($morelogincontent)) {
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -203,9 +200,7 @@ if ($_GET['err'] < 0)
 	echo ('<script type="text/javascript">');
 	echo ('	document.getElementById(\'frmLogin\').pwdPassword.focus();');
 	echo ('</script>');
-}
-else
-{
+} else {
 	echo ('<script type="text/javascript">');
 	echo ('	document.getElementById(\'frmLogin\').txtUsername.focus();');
 	echo ('</script>');
diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php
index 251b3f2e997..e8366e981cc 100644
--- a/htdocs/cashdesk/index_verif.php
+++ b/htdocs/cashdesk/index_verif.php
@@ -89,7 +89,7 @@ if ($retour >= 0)
 
 	$sql = "SELECT rowid, lastname, firstname";
 	$sql .= " FROM ".MAIN_DB_PREFIX."user";
-	$sql .= " WHERE login = '".$username."'";
+	$sql .= " WHERE login = '".$db->escape($username)."'";
 	$sql .= " AND entity IN (0,".$conf->entity.")";
 
 	$result = $db->query($sql);
@@ -116,14 +116,10 @@ if ($retour >= 0)
 
 		header('Location: '.DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=facturation&id=NOUV');
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
 	// Load translation files required by the page
     $langs->loadLangs(array("other", "errors"));
 	$retour = $langs->trans("ErrorBadLoginPassword");
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index f1e19b4df20..e1dc53ed6e8 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -149,7 +149,7 @@ for ($i = 0; $i < $nbtoshow; $i++)
 			<tr><th class="label1"><?php echo $langs->trans("TotalTicket"); ?></th><th class="label1"><?php echo $langs->trans("Received"); ?></th><th class="label1"><?php echo $langs->trans("Change"); ?></th></tr>
 			<tr>
 			<!-- Affichage du montant du -->
-			<td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->prixTotalTtc(), 'MT'); ?>" disabled /></td>
+			<td><input class="texte2_off maxwidth100onsmartphone" type="text" name="txtDu" value="<?php echo price2num($obj_facturation->amountWithTax(), 'MT'); ?>" disabled /></td>
 			<!-- Choix du montant encaisse -->
 			<td><input class="texte2 maxwidth100onsmartphone" type="text" id="txtEncaisse" name="txtEncaisse" value="" onkeyup="javascript: verifDifference();" onfocus="javascript: this.select();" />
 <?php print genkeypad("txtEncaisse", "frmDifference"); ?>
@@ -169,24 +169,21 @@ for ($i = 0; $i < $nbtoshow; $i++)
 			{
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
-			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
+			} else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
 			print '</div>';
 			print '<div class="inline-block" style="margin: 6px;">';
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
 			{
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("CashDesk"))).'" />';
-			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
+			} else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
 			print '</div>';
 			print '<div class="inline-block" style="margin: 6px;">';
 			if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
 			{
 				$langs->load("errors");
 				print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete"), $langs->transnoentitiesnoconv("CashDesk")).'" />';
-			}
-			else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
+			} else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
 			print '</div>';
 			print '<div class="clearboth">';
 			print '<div class="inline-block" style="margin: 6px;">';
diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php
index 6fffbd3ed52..bd73954f6a0 100644
--- a/htdocs/cashdesk/tpl/liste_articles.tpl.php
+++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php
@@ -49,8 +49,7 @@ $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
-{
+else {
     for ($i = 0; $i < $tab_size; $i++)
     {
         echo ('<div class="cadre_article">'."\n");
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index 8c97796f430..b5994456252 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -102,13 +102,13 @@ $object->fetch($facid);
 <table class="totaux">
 <tr>
     <th class="nowrap"><?php echo $langs->trans("TotalHT"); ?></th>
-    <td class="nowrap"><?php echo price(price2num($obj_facturation->prixTotalHt(), 'MT'), '', $langs, 0, -1, -1, $conf->currency)."\n"; ?></td>
+    <td class="nowrap"><?php echo price(price2num($obj_facturation->amountWithoutTax(), 'MT'), '', $langs, 0, -1, -1, $conf->currency)."\n"; ?></td>
 </tr>
 <tr>
-    <th class="nowrap"><?php echo $langs->trans("TotalVAT").'</th><td class="nowrap">'.price(price2num($obj_facturation->montantTva(), 'MT'), '', $langs, 0, -1, -1, $conf->currency)."\n"; ?></td>
+    <th class="nowrap"><?php echo $langs->trans("TotalVAT").'</th><td class="nowrap">'.price(price2num($obj_facturation->amountVat(), 'MT'), '', $langs, 0, -1, -1, $conf->currency)."\n"; ?></td>
 </tr>
 <tr>
-    <th class="nowrap"><?php echo ''.$langs->trans("TotalTTC").'</th><td class="nowrap">'.price(price2num($obj_facturation->prixTotalTtc(), 'MT'), '', $langs, 0, -1, -1, $conf->currency)."\n"; ?></td>
+    <th class="nowrap"><?php echo ''.$langs->trans("TotalTTC").'</th><td class="nowrap">'.price(price2num($obj_facturation->amountWithTax(), 'MT'), '', $langs, 0, -1, -1, $conf->currency)."\n"; ?></td>
 </tr>
 </table>
 
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index 3b38aba3159..0434473d359 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -35,18 +35,16 @@ $langs->loadLangs(array("main", "bills", "banks"));
 	<table class="table_resume">
 
 		<tr><td class="resume_label"><?php echo $langs->trans("Invoice"); ?></td><td><?php  echo $obj_facturation->numInvoice(); ?></td></tr>
-		<tr><td class="resume_label"><?php echo $langs->trans("TotalHT"); ?></td><td><?php echo price(price2num($obj_facturation->prixTotalHt(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?></td></tr>
+		<tr><td class="resume_label"><?php echo $langs->trans("TotalHT"); ?></td><td><?php echo price(price2num($obj_facturation->amountWithoutTax(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?></td></tr>
 <?php
 // Affichage de la tva par taux
-if ($obj_facturation->montantTva()) {
-	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price(price2num($obj_facturation->montantTva(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
-}
-else
-{
+if ($obj_facturation->amountVat()) {
+	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price(price2num($obj_facturation->amountVat(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
+} else {
 	echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.$langs->trans("NoVAT").'</td></tr>');
 }
 ?>
-		<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price(price2num($obj_facturation->prixTotalTtc(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?></td></tr>
+		<tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price(price2num($obj_facturation->amountWithTax(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency); ?></td></tr>
 		<tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td>
 		<?php
 		switch ($obj_facturation->getSetPaymentMode())
@@ -87,12 +85,12 @@ else
 if ($obj_facturation->getsetPaymentMode() == 'DIF') {
 	echo ('<tr><td class="resume_label">'.$langs->trans("DateDue").'</td><td>'.$obj_facturation->paiementLe().'</td></tr>');
 } else {
-	echo ('<tr><td class="resume_label">'.$langs->trans("Received").'</td><td>'.price(price2num($obj_facturation->montantEncaisse(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
+	echo ('<tr><td class="resume_label">'.$langs->trans("Received").'</td><td>'.price(price2num($obj_facturation->amountCollected(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
 }
 
 // Affichage du montant rendu (reglement en especes)
-if ($obj_facturation->montantRendu()) {
-	echo ('<tr><td class="resume_label">'.$langs->trans("Change").'</td><td>'.price(price2num($obj_facturation->montantRendu(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
+if ($obj_facturation->amountReturned()) {
+	echo ('<tr><td class="resume_label">'.$langs->trans("Change").'</td><td>'.price(price2num($obj_facturation->amountReturned(), 'MT'), 0, $langs, 0, 0, -1, $conf->currency).'</td></tr>');
 }
 
 ?>
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index bc67350bbf1..6b8e9af94f1 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -83,22 +83,20 @@ switch ($action)
 		// Si paiement autre qu'en especes, montant encaisse = prix total
 		$mode_reglement = $obj_facturation->getSetPaymentMode();
 		if ($mode_reglement != 'ESP') {
-			$montant = $obj_facturation->prixTotalTtc();
+			$montant = $obj_facturation->amountWithTax();
 		} else {
 			$montant = $_POST['txtEncaisse'];
 		}
 
 		if ($mode_reglement != 'DIF') {
-			$obj_facturation->montantEncaisse($montant);
+			$obj_facturation->amountCollected($montant);
 
 			//Determination de la somme rendue
-			$total = $obj_facturation->prixTotalTtc();
-			$encaisse = $obj_facturation->montantEncaisse();
+			$total = $obj_facturation->amountWithTax();
+			$encaisse = $obj_facturation->amountCollected();
 
-			$obj_facturation->montantRendu($encaisse - $total);
-		}
-		else
-		{
+			$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');
@@ -139,8 +137,8 @@ switch ($action)
 				$mode_reglement_id = dol_getIdFromCode($db, 'LIQ', 'c_paiement', 'code', 'id', 1);
 				$cond_reglement_id = 0;
 				$note .= $langs->trans("Cash")."\n";
-				$note .= $langs->trans("Received").' : '.$obj_facturation->montantEncaisse()." ".$conf->currency."\n";
-				$note .= $langs->trans("Rendu").' : '.$obj_facturation->montantRendu()." ".$conf->currency."\n";
+				$note .= $langs->trans("Received").' : '.$obj_facturation->amountCollected()." ".$conf->currency."\n";
+				$note .= $langs->trans("Rendu").' : '.$obj_facturation->amountReturned()." ".$conf->currency."\n";
 				$note .= "\n";
 				$note .= '--------------------------------------'."\n\n";
 				break;
@@ -209,9 +207,9 @@ switch ($action)
 		$invoice->date_creation = $now;
 		$invoice->date = $now;
 		$invoice->date_lim_reglement = 0;
-		$invoice->total_ht = $obj_facturation->prixTotalHt();
-		$invoice->total_tva = $obj_facturation->montantTva();
-		$invoice->total_ttc = $obj_facturation->prixTotalTtc();
+		$invoice->total_ht = $obj_facturation->amountWithoutTax();
+		$invoice->total_tva = $obj_facturation->amountVat();
+		$invoice->total_ttc = $obj_facturation->amountWithTax();
 		$invoice->note_private = $note;
 		$invoice->cond_reglement_id = $cond_reglement_id;
 		$invoice->mode_reglement_id = $mode_reglement_id;
@@ -252,17 +250,13 @@ switch ($action)
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
 			    $error++;
 			}
 
 			$id = $invoice->id;
-		}
-		else
-		{
+		} else {
 		    $resultcreate = $invoice->create($user, 0, 0);
 			if ($resultcreate > 0)
 			{
@@ -300,9 +294,8 @@ switch ($action)
 				// Add the payment
 				$payment = new Paiement($db);
 				$payment->datepaye = $now;
-				$payment->bank_account = $conf_fkaccount;
-				$payment->amounts[$invoice->id] = $obj_facturation->prixTotalTtc();
-				$payment->note = $langs->trans("Payment").' '.$langs->trans("Invoice").' '.$obj_facturation->numInvoice();
+				$payment->amounts[$invoice->id] = $obj_facturation->amountWithTax();
+				$payment->note_public = $langs->trans("Payment").' '.$langs->trans("Invoice").' '.$obj_facturation->numInvoice();
 				$payment->paiementid = $invoice->mode_reglement_id;
 				$payment->num_paiement = '';
 				$payment->num_payment = '';
@@ -322,7 +315,7 @@ switch ($action)
 
                     if (!$error)
                     {
-                    	if ($invoice->total_ttc == $obj_facturation->prixTotalTtc()
+                    	if ($invoice->total_ttc == $obj_facturation->amountWithTax()
                     		&& $obj_facturation->getSetPaymentMode() != 'DIFF')
                     	{
                     		// We set status to payed
@@ -330,15 +323,11 @@ switch ($action)
                   			//print 'set paid';exit;
                     	}
                     }
-				}
-				else
-				{
+				} else {
 				    setEventMessages($invoice->error, $invoice->errors, 'errors');
 				    $error++;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($invoice->error, $invoice->errors, 'errors');
 			    $error++;
 			}
@@ -349,9 +338,7 @@ switch ($action)
 		{
 			$db->commit();
 			$redirection = 'affIndex.php?menutpl=validation_ok&facid='.$id; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			$redirection = 'affIndex.php?facid='.$id.'&error=1&mesg=ErrorFailedToCreateInvoice'; // Ajout de l'id de la facture, pour l'inclure dans un lien pointant directement vers celle-ci dans Dolibarr
 		}
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 6dd313692db..eb8af1ee44a 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -47,9 +47,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         setEventMessages($db->lasterror(), null, 'errors');
     }
 }
@@ -61,9 +59,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
          setEventMessages($db->lasterror(), null, 'errors');
     }
 }
@@ -107,15 +103,11 @@ print '<td align="center" width="100">';
 if ($conf->use_javascript_ajax)
 {
 	print ajax_constantonoff('CATEGORIE_RECURSIV_ADD');
-}
-else
-{
+} else {
 	if (empty($conf->global->CATEGORIE_RECURSIV_ADD))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index bd285e5efaf..72151abdcdb 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -39,7 +39,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'categorie'; //Must be the $element of the class that manage extrafield
 
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 67adacb5aae..096a5497efd 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -88,39 +88,35 @@ if ($action == 'add' && $user->rights->categorie->creer)
 		{
 			header("Location: ".$urlfrom);
 			exit;
-		}
-		elseif ($idProdOrigin)
+		} elseif ($backtopage)
+		{
+			header("Location: ".$backtopage);
+			exit;
+		} 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
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
 			exit;
 		}
@@ -155,9 +151,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 		{
 			$action = 'confirmed';
 			$_POST["addcat"] = '';
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -173,38 +167,31 @@ if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->cr
 		{
 			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.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idCompanyOrigin)
+		} elseif ($idCompanyOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idSupplierOrigin)
+		} elseif ($idSupplierOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idMemberOrigin)
+		} elseif ($idMemberOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idContactOrigin)
+		} elseif ($idContactOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		}
-		elseif ($idProjectOrigin)
+		} elseif ($idProjectOrigin)
 		{
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
@@ -252,13 +239,13 @@ if ($user->rights->categorie->creer)
 
 		// Ref
 		print '<tr>';
-		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="minwidth100" name="label" value="'.$label.'">';
+		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" class="minwidth100" name="label" value="'.dol_escape_htmltag($label).'">';
 		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('description', $description, '', 200, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_6, '90%');
+		$doleditor = new DolEditor('description', $description, '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_5, '90%');
 		$doleditor->Create();
 		print '</td></tr>';
 
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index d6eff682908..5f0a28340f9 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -20,10 +20,12 @@ use Luracast\Restler\RestException;
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
+
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/api_members.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/api_products.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/api_contacts.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/api_thirdparties.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/api_projects.class.php';
 
 /**
  * API class for categories
@@ -33,727 +35,727 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/api_thirdparties.class.php';
  */
 class Categories extends DolibarrApi
 {
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'label',
-        'type'
-    );
-
-    static $TYPES = array(
-        0 => 'product',
-        1 => 'supplier',
-        2 => 'customer',
-        3 => 'member',
-        4 => 'contact',
-        5 => 'account',
-        //6 => 'project',
-        //7 => 'user',
-        //8 => 'bank_line',
-        //9 => 'warehouse',
-        //10 => 'actioncomm',
-    );
-
-    /**
-     * @var Categorie $category {@type Categorie}
-     */
-    public $category;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->category = new Categorie($this->db);
-    }
-
-    /**
-     * Get properties of a category object
-     *
-     * Return an array with category informations
-     *
-     * @param 	int 	$id ID of category
-     * @param 	bool 	$include_childs Include child categories list (true or false)
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id, $include_childs = false)
-    {
-        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
-            throw new RestException(401);
-        }
-
-        $result = $this->category->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        if ($include_childs) {
-            $cats = $this->category->get_filles();
-            if (!is_array($cats)) {
-                throw new RestException(500, 'Error when fetching child categories', array_merge(array($this->category->error), $this->category->errors));
-            }
-            $this->category->childs = [];
-            foreach ($cats as $cat) {
-                $this->category->childs[] = $this->_cleanObjectDatas($cat);
-            }
-        }
-
-        return $this->_cleanObjectDatas($this->category);
-    }
-
-    /**
-     * List categories
-     *
-     * Get a list of categories
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact')
-     * @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 category objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $sqlfilters = '')
-    {
-        global $db, $conf;
-
-        $obj_ret = array();
-
-        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
-            throw new RestException(401);
-        }
-
-        $sql = "SELECT t.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."categorie as t";
-        $sql .= ' WHERE t.entity IN ('.getEntity('category').')';
-        if (!empty($type))
-        {
-            $sql .= ' AND t.type='.array_search($type, Categories::$TYPES);
-        }
-        // 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 .= $db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $i = 0;
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $category_static = new Categorie($db);
-                if ($category_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($category_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve category list : '.$db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No category found');
-        }
-        return $obj_ret;
-    }
-
-    /**
-     * Create category object
-     *
-     * @param array $request_data   Request data
-     * @return int  ID of category
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->categorie->creer) {
-            throw new RestException(401);
-        }
-
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-
-        foreach ($request_data as $field => $value) {
-            $this->category->$field = $value;
-        }
-        if ($this->category->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, 'Error when creating category', array_merge(array($this->category->error), $this->category->errors));
-        }
-        return $this->category->id;
-    }
-
-    /**
-     * Update category
-     *
-     * @param int   $id             Id of category to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->categorie->creer) {
-            throw new RestException(401);
-        }
-
-        $result = $this->category->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->category->$field = $value;
-        }
-
-        if ($this->category->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        }
-        else
-        {
-            throw new RestException(500, $this->category->error);
-        }
-    }
-
-    /**
-     * Delete category
-     *
-     * @param int $id   Category ID
-     * @return array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->categorie->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->category->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        if (!$this->category->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(401, 'error when delete category');
-        }
-
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Category deleted'
-            )
-        );
-    }
-
-    /**
-     * List categories of an object
-     *
-     * Get the list of categories linked to an object
-     *
-     * @param int       $id         Object ID
-     * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact')
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param int		$limit		Limit for list
-     * @param int		$page		Page number
-     * @return array                Array of category objects
-     *
-     * @throws RestException
-     *
-     * @url GET /object/{type}/{id}
-     */
-    public function getListForObject($id, $type, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
-    {
-        if (!in_array($type, [
-            Categorie::TYPE_PRODUCT,
-            Categorie::TYPE_CONTACT,
-            Categorie::TYPE_CUSTOMER,
-            Categorie::TYPE_SUPPLIER,
-            Categorie::TYPE_MEMBER
-        ])) {
-            throw new RestException(401);
-        }
-
-        if ($type == Categorie::TYPE_PRODUCT && !(DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
-            throw new RestException(401);
-        } elseif ($type == Categorie::TYPE_CONTACT && !DolibarrApiAccess::$user->rights->contact->lire) {
-            throw new RestException(401);
-        } elseif ($type == Categorie::TYPE_CUSTOMER && !DolibarrApiAccess::$user->rights->societe->lire) {
-            throw new RestException(401);
-        } elseif ($type == Categorie::TYPE_SUPPLIER && !DolibarrApiAccess::$user->rights->fournisseur->lire) {
-            throw new RestException(401);
-        } elseif ($type == Categorie::TYPE_MEMBER && !DolibarrApiAccess::$user->rights->adherent->lire) {
-            throw new RestException(401);
-        }
-
-        $categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
-
-        if (!is_array($categories)) {
-            if ($categories == 0) {
-                throw new RestException(404, 'No category found for this object');
-            }
-            throw new RestException(500, 'Error when fetching object categories', array_merge(array($this->category->error), $this->category->errors));
-        }
-        return $categories;
-    }
-
-    /**
-     * Link an object to a category by id
-     *
-     * @param int $id  ID of category
-     * @param string   $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
-     * @param int      $object_id ID of object
-     *
-     * @return array
-     * @throws RestException
-     *
-     * @url POST {id}/objects/{type}/{object_id}
-     */
-    public function linkObjectById($id, $type, $object_id)
-    {
-        if (empty($type) || empty($object_id)) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
-            throw new RestException(401);
-        }
-
-        $result = $this->category->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
-
-        if ($type === Categorie::TYPE_PRODUCT) {
-            if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
-                throw new RestException(401);
-            }
-            $object = new Product($this->db);
-        } elseif ($type === Categorie::TYPE_CUSTOMER) {
-            if (!DolibarrApiAccess::$user->rights->societe->creer) {
-                throw new RestException(401);
-            }
-            $object = new Societe($this->db);
-        } elseif ($type === Categorie::TYPE_SUPPLIER) {
-            if (!DolibarrApiAccess::$user->rights->societe->creer) {
-                throw new RestException(401);
-            }
-            $object = new Societe($this->db);
-        } elseif ($type === Categorie::TYPE_CONTACT) {
-            if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
-                throw new RestException(401);
-            }
-            $object = new Contact($this->db);
-        } elseif ($type === Categorie::TYPE_MEMBER) {
-            if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-                throw new RestException(401);
-            }
-            $object = new Adherent($this->db);
-        } else {
-            throw new RestException(401, "this type is not recognized yet.");
-        }
-
-        if (!empty($object)) {
-            $result = $object->fetch($object_id);
-            if ($result > 0) {
-                $result = $this->category->add_type($object, $type);
-                if ($result < 0) {
-                    if ($this->category->error != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                        throw new RestException(500, 'Error when linking object', array_merge(array($this->category->error), $this->category->errors));
-                    }
-                }
-            } else {
-                throw new RestException(500, 'Error when fetching object', array_merge(array($object->error), $object->errors));
-            }
-
-            return array(
-                'success' => array(
-                    'code' => 200,
-                    'message' => 'Objects succefully linked to the category'
-                )
-            );
-        }
-
-        throw new RestException(401);
-    }
-
-    /**
-     * Link an object to a category by ref
-     *
-     * @param int $id  ID of category
-     * @param string   $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
-     * @param string   $object_ref Reference of object
-     *
-     * @return array
-     * @throws RestException
-     *
-     * @url POST {id}/objects/{type}/ref/{object_ref}
-     */
-    public function linkObjectByRef($id, $type, $object_ref)
-    {
-        if (empty($type) || empty($object_ref)) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
-            throw new RestException(401);
-        }
-
-        $result = $this->category->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
-
-        if ($type === Categorie::TYPE_PRODUCT) {
-            if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
-                throw new RestException(401);
-            }
-            $object = new Product($this->db);
-        } elseif ($type === Categorie::TYPE_CUSTOMER) {
-            if (!DolibarrApiAccess::$user->rights->societe->creer) {
-                throw new RestException(401);
-            }
-            $object = new Societe($this->db);
-        } elseif ($type === Categorie::TYPE_SUPPLIER) {
-            if (!DolibarrApiAccess::$user->rights->societe->creer) {
-                throw new RestException(401);
-            }
-            $object = new Societe($this->db);
-        } elseif ($type === Categorie::TYPE_CONTACT) {
-            if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
-                throw new RestException(401);
-            }
-            $object = new Contact($this->db);
-        } elseif ($type === Categorie::TYPE_MEMBER) {
-            if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-                throw new RestException(401);
-            }
-            $object = new Adherent($this->db);
-        } else {
-            throw new RestException(401, "this type is not recognized yet.");
-        }
-
-        if (!empty($object)) {
-            $result = $object->fetch('', $object_ref);
-            if ($result > 0) {
-                $result = $this->category->add_type($object, $type);
-                if ($result < 0) {
-                    if ($this->category->error != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                        throw new RestException(500, 'Error when linking object', array_merge(array($this->category->error), $this->category->errors));
-                    }
-                }
-            } else {
-                throw new RestException(500, 'Error when fetching object', array_merge(array($object->error), $object->errors));
-            }
-
-            return array(
-                'success' => array(
-                    'code' => 200,
-                    'message' => 'Objects succefully linked to the category'
-                )
-            );
-        }
-
-        throw new RestException(401);
-    }
-
-    /**
-     * Unlink an object from a category by id
-     *
-     * @param int      $id        ID of category
-     * @param string   $type      Type of category ('member', 'customer', 'supplier', 'product', 'contact')
-     * @param int      $object_id ID of the object
-     *
-     * @return array
-     * @throws RestException
-     *
-     * @url DELETE {id}/objects/{type}/{object_id}
-     */
-    public function unlinkObjectById($id, $type, $object_id)
-    {
-        if (empty($type) || empty($object_id)) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
-            throw new RestException(401);
-        }
-
-        $result = $this->category->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
-
-        if ($type === Categorie::TYPE_PRODUCT) {
-            if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
-                throw new RestException(401);
-            }
-            $object = new Product($this->db);
-        } elseif ($type === Categorie::TYPE_CUSTOMER) {
-            if (!DolibarrApiAccess::$user->rights->societe->creer) {
-                throw new RestException(401);
-            }
-            $object = new Societe($this->db);
-        } elseif ($type === Categorie::TYPE_SUPPLIER) {
-            if (!DolibarrApiAccess::$user->rights->societe->creer) {
-                throw new RestException(401);
-            }
-            $object = new Societe($this->db);
-        } elseif ($type === Categorie::TYPE_CONTACT) {
-            if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
-                throw new RestException(401);
-            }
-            $object = new Contact($this->db);
-        } elseif ($type === Categorie::TYPE_MEMBER) {
-            if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-                throw new RestException(401);
-            }
-            $object = new Adherent($this->db);
-        } else {
-            throw new RestException(401, "this type is not recognized yet.");
-        }
-
-        if (!empty($object)) {
-            $result = $object->fetch((int) $object_id);
-            if ($result > 0) {
-                $result = $this->category->del_type($object, $type);
-                if ($result < 0) {
-                    throw new RestException(500, 'Error when unlinking object', array_merge(array($this->category->error), $this->category->errors));
-                }
-            } else {
-                throw new RestException(500, 'Error when fetching object', array_merge(array($object->error), $object->errors));
-            }
-
-            return array(
-                'success' => array(
-                    'code' => 200,
-                    'message' => 'Objects succefully unlinked from the category'
-                )
-            );
-        }
-
-        throw new RestException(401);
-    }
-
-    /**
-     * Unlink an object from a category by ref
-     *
-     * @param int      $id         ID of category
-     * @param string   $type Type  of category ('member', 'customer', 'supplier', 'product', 'contact')
-     * @param string   $object_ref Reference of the object
-     *
-     * @return array
-     * @throws RestException
-     *
-     * @url DELETE {id}/objects/{type}/ref/{object_ref}
-     */
-    public function unlinkObjectByRef($id, $type, $object_ref)
-    {
-        if (empty($type) || empty($object_ref)) {
-            throw new RestException(401);
-        }
-
-        if (!DolibarrApiAccess::$user->rights->categorie->lire) {
-            throw new RestException(401);
-        }
-
-        $result = $this->category->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
-
-        if ($type === Categorie::TYPE_PRODUCT) {
-            if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
-                throw new RestException(401);
-            }
-            $object = new Product($this->db);
-        } elseif ($type === Categorie::TYPE_CUSTOMER) {
-            if (!DolibarrApiAccess::$user->rights->societe->creer) {
-                throw new RestException(401);
-            }
-            $object = new Societe($this->db);
-        } elseif ($type === Categorie::TYPE_SUPPLIER) {
-            if (!DolibarrApiAccess::$user->rights->societe->creer) {
-                throw new RestException(401);
-            }
-            $object = new Societe($this->db);
-        } elseif ($type === Categorie::TYPE_CONTACT) {
-            if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
-                throw new RestException(401);
-            }
-            $object = new Contact($this->db);
-        } elseif ($type === Categorie::TYPE_MEMBER) {
-            if (!DolibarrApiAccess::$user->rights->adherent->creer) {
-                throw new RestException(401);
-            }
-            $object = new Adherent($this->db);
-        } else {
-            throw new RestException(401, "this type is not recognized yet.");
-        }
-
-        if (!empty($object)) {
-            $result = $object->fetch('', (string) $object_ref);
-            if ($result > 0) {
-                $result = $this->category->del_type($object, $type);
-                if ($result < 0) {
-                    throw new RestException(500, 'Error when unlinking object', array_merge(array($this->category->error), $this->category->errors));
-                }
-            } else {
-                throw new RestException(500, 'Error when fetching object', array_merge(array($object->error), $object->errors));
-            }
-
-            return array(
-                'success' => array(
-                    'code' => 200,
-                    'message' => 'Objects succefully unlinked from the category'
-                )
-            );
-        }
-
-        throw new RestException(401);
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   Categorie  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
-
-        // Remove fields not relevent to categories
-        unset($object->country);
-        unset($object->country_id);
-        unset($object->country_code);
-        unset($object->total_ht);
-        unset($object->total_ht);
-        unset($object->total_localtax1);
-        unset($object->total_localtax2);
-        unset($object->total_ttc);
-        unset($object->total_tva);
-        unset($object->lines);
-        unset($object->fk_incoterms);
-        unset($object->label_incoterms);
-        unset($object->location_incoterms);
-        unset($object->civility_id);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->shipping_method_id);
-        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->canvas);
-        unset($object->cats);
-        unset($object->motherof);
-        unset($object->context);
-        unset($object->socid);
-        unset($object->thirdparty);
-        unset($object->contact);
-        unset($object->contact_id);
-        unset($object->user);
-        unset($object->fk_account);
-        unset($object->fk_project);
-        unset($object->note);
-        unset($object->statut);
-
-        return $object;
-    }
-
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array|null    $data    Data to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $category = array();
-        foreach (Categories::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $category[$field] = $data[$field];
-        }
-        return $category;
-    }
-
-    /**
-     * Get the list of objects in a category.
-     *
-     * @param int        $id         ID of category
-     * @param string     $type       Type of category ('member', 'customer', 'supplier', 'product', 'contact')
-     * @param int        $onlyids    Return only ids of objects (consume less memory)
-     *
-     * @return mixed
-     *
-     * @url GET {id}/objects
-     */
-    public function getObjects($id, $type, $onlyids = 0)
-    {
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'label',
+		'type'
+	);
+
+	static $TYPES = array(
+		0 => 'product',
+		1 => 'supplier',
+		2 => 'customer',
+		3 => 'member',
+		4 => 'contact',
+		5 => 'account',
+		6 => 'project',
+		//7 => 'user',
+		//8 => 'bank_line',
+		//9 => 'warehouse',
+		//10 => 'actioncomm',
+	);
+
+	/**
+	 * @var Categorie $category {@type Categorie}
+	 */
+	public $category;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->category = new Categorie($this->db);
+	}
+
+	/**
+	 * Get properties of a category object
+	 *
+	 * Return an array with category informations
+	 *
+	 * @param 	int 	$id ID of category
+	 * @param 	bool 	$include_childs Include child categories list (true or false)
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id, $include_childs = false)
+	{
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->category->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if ($include_childs) {
+			$cats = $this->category->get_filles();
+			if (!is_array($cats)) {
+				throw new RestException(500, 'Error when fetching child categories', array_merge(array($this->category->error), $this->category->errors));
+			}
+			$this->category->childs = [];
+			foreach ($cats as $cat) {
+				$this->category->childs[] = $this->_cleanObjectDatas($cat);
+			}
+		}
+
+		return $this->_cleanObjectDatas($this->category);
+	}
+
+	/**
+	 * List categories
+	 *
+	 * Get a list of categories
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact')
+	 * @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 category objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $sqlfilters = '')
+	{
+		global $db, $conf;
+
+		$obj_ret = array();
+
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT t.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as t";
+		$sql .= ' WHERE t.entity IN ('.getEntity('category').')';
+		if (!empty($type))
+		{
+			$sql .= ' AND t.type='.array_search($type, Categories::$TYPES);
+		}
+		// 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)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $this->db->fetch_object($result);
+				$category_static = new Categorie($this->db);
+				if ($category_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($category_static);
+				}
+				$i++;
+			}
+		}
+		else {
+			throw new RestException(503, 'Error when retrieve category list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No category found');
+		}
+		return $obj_ret;
+	}
+
+	/**
+	 * Create category object
+	 *
+	 * @param array $request_data   Request data
+	 * @return int  ID of category
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->categorie->creer) {
+			throw new RestException(401);
+		}
+
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		foreach ($request_data as $field => $value) {
+			$this->category->$field = $value;
+		}
+		if ($this->category->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, 'Error when creating category', array_merge(array($this->category->error), $this->category->errors));
+		}
+		return $this->category->id;
+	}
+
+	/**
+	 * Update category
+	 *
+	 * @param int   $id             Id of category to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->categorie->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->category->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->category->$field = $value;
+		}
+
+		if ($this->category->update(DolibarrApiAccess::$user) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->category->error);
+		}
+	}
+
+	/**
+	 * Delete category
+	 *
+	 * @param int $id   Category ID
+	 * @return array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->categorie->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->category->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if (!$this->category->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(401, 'error when delete category');
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Category deleted'
+			)
+		);
+	}
+
+	/**
+	 * List categories of an object
+	 *
+	 * Get the list of categories linked to an object
+	 *
+	 * @param int       $id         Object ID
+	 * @param string	$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact', 'project')
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param int		$limit		Limit for list
+	 * @param int		$page		Page number
+	 * @return array                Array of category objects
+	 *
+	 * @throws RestException
+	 *
+	 * @url GET /object/{type}/{id}
+	 */
+	public function getListForObject($id, $type, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	{
+		if (!in_array($type, [
+			Categorie::TYPE_PRODUCT,
+			Categorie::TYPE_CONTACT,
+			Categorie::TYPE_CUSTOMER,
+			Categorie::TYPE_SUPPLIER,
+			Categorie::TYPE_MEMBER,
+			Categorie::TYPE_PROJECT
+		])) {
+			throw new RestException(401);
+		}
+
+		if ($type == Categorie::TYPE_PRODUCT && !(DolibarrApiAccess::$user->rights->produit->lire || DolibarrApiAccess::$user->rights->service->lire)) {
+			throw new RestException(401);
+		} elseif ($type == Categorie::TYPE_CONTACT && !DolibarrApiAccess::$user->rights->contact->lire) {
+			throw new RestException(401);
+		} elseif ($type == Categorie::TYPE_CUSTOMER && !DolibarrApiAccess::$user->rights->societe->lire) {
+			throw new RestException(401);
+		} elseif ($type == Categorie::TYPE_SUPPLIER && !DolibarrApiAccess::$user->rights->fournisseur->lire) {
+			throw new RestException(401);
+		} elseif ($type == Categorie::TYPE_MEMBER && !DolibarrApiAccess::$user->rights->adherent->lire) {
+			throw new RestException(401);
+		} elseif ($type == Categorie::TYPE_PROJECT && !DolibarrApiAccess::$user->rights->projet->lire) {
+			throw new RestException(401);
+		}
+
+		$categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
+
+		if (!is_array($categories)) {
+			if ($categories == 0) {
+				throw new RestException(404, 'No category found for this object');
+			}
+			throw new RestException(600, 'Error when fetching object categories', array_merge(array($this->category->error), $this->category->errors));
+		}
+		return $categories;
+	}
+
+	/**
+	 * Link an object to a category by id
+	 *
+	 * @param int $id  ID of category
+	 * @param string   $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
+	 * @param int      $object_id ID of object
+	 *
+	 * @return array
+	 * @throws RestException
+	 *
+	 * @url POST {id}/objects/{type}/{object_id}
+	 */
+	public function linkObjectById($id, $type, $object_id)
+	{
+		if (empty($type) || empty($object_id)) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->category->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
+
+		if ($type === Categorie::TYPE_PRODUCT) {
+			if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+				throw new RestException(401);
+			}
+			$object = new Product($this->db);
+		} elseif ($type === Categorie::TYPE_CUSTOMER) {
+			if (!DolibarrApiAccess::$user->rights->societe->creer) {
+				throw new RestException(401);
+			}
+			$object = new Societe($this->db);
+		} elseif ($type === Categorie::TYPE_SUPPLIER) {
+			if (!DolibarrApiAccess::$user->rights->societe->creer) {
+				throw new RestException(401);
+			}
+			$object = new Societe($this->db);
+		} elseif ($type === Categorie::TYPE_CONTACT) {
+			if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
+				throw new RestException(401);
+			}
+			$object = new Contact($this->db);
+		} elseif ($type === Categorie::TYPE_MEMBER) {
+			if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+				throw new RestException(401);
+			}
+			$object = new Adherent($this->db);
+		} else {
+			throw new RestException(401, "this type is not recognized yet.");
+		}
+
+		if (!empty($object)) {
+			$result = $object->fetch($object_id);
+			if ($result > 0) {
+				$result = $this->category->add_type($object, $type);
+				if ($result < 0) {
+					if ($this->category->error != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+						throw new RestException(500, 'Error when linking object', array_merge(array($this->category->error), $this->category->errors));
+					}
+				}
+			} else {
+				throw new RestException(500, 'Error when fetching object', array_merge(array($object->error), $object->errors));
+			}
+
+			return array(
+				'success' => array(
+					'code' => 200,
+					'message' => 'Objects succefully linked to the category'
+				)
+			);
+		}
+
+		throw new RestException(401);
+	}
+
+	/**
+	 * Link an object to a category by ref
+	 *
+	 * @param int $id  ID of category
+	 * @param string   $type Type of category ('member', 'customer', 'supplier', 'product', 'contact')
+	 * @param string   $object_ref Reference of object
+	 *
+	 * @return array
+	 * @throws RestException
+	 *
+	 * @url POST {id}/objects/{type}/ref/{object_ref}
+	 */
+	public function linkObjectByRef($id, $type, $object_ref)
+	{
+		if (empty($type) || empty($object_ref)) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->category->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
+
+		if ($type === Categorie::TYPE_PRODUCT) {
+			if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+				throw new RestException(401);
+			}
+			$object = new Product($this->db);
+		} elseif ($type === Categorie::TYPE_CUSTOMER) {
+			if (!DolibarrApiAccess::$user->rights->societe->creer) {
+				throw new RestException(401);
+			}
+			$object = new Societe($this->db);
+		} elseif ($type === Categorie::TYPE_SUPPLIER) {
+			if (!DolibarrApiAccess::$user->rights->societe->creer) {
+				throw new RestException(401);
+			}
+			$object = new Societe($this->db);
+		} elseif ($type === Categorie::TYPE_CONTACT) {
+			if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
+				throw new RestException(401);
+			}
+			$object = new Contact($this->db);
+		} elseif ($type === Categorie::TYPE_MEMBER) {
+			if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+				throw new RestException(401);
+			}
+			$object = new Adherent($this->db);
+		} else {
+			throw new RestException(401, "this type is not recognized yet.");
+		}
+
+		if (!empty($object)) {
+			$result = $object->fetch('', $object_ref);
+			if ($result > 0) {
+				$result = $this->category->add_type($object, $type);
+				if ($result < 0) {
+					if ($this->category->error != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+						throw new RestException(500, 'Error when linking object', array_merge(array($this->category->error), $this->category->errors));
+					}
+				}
+			} else {
+				throw new RestException(500, 'Error when fetching object', array_merge(array($object->error), $object->errors));
+			}
+
+			return array(
+				'success' => array(
+					'code' => 200,
+					'message' => 'Objects succefully linked to the category'
+				)
+			);
+		}
+
+		throw new RestException(401);
+	}
+
+	/**
+	 * Unlink an object from a category by id
+	 *
+	 * @param int      $id        ID of category
+	 * @param string   $type      Type of category ('member', 'customer', 'supplier', 'product', 'contact')
+	 * @param int      $object_id ID of the object
+	 *
+	 * @return array
+	 * @throws RestException
+	 *
+	 * @url DELETE {id}/objects/{type}/{object_id}
+	 */
+	public function unlinkObjectById($id, $type, $object_id)
+	{
+		if (empty($type) || empty($object_id)) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->category->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
+
+		if ($type === Categorie::TYPE_PRODUCT) {
+			if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+				throw new RestException(401);
+			}
+			$object = new Product($this->db);
+		} elseif ($type === Categorie::TYPE_CUSTOMER) {
+			if (!DolibarrApiAccess::$user->rights->societe->creer) {
+				throw new RestException(401);
+			}
+			$object = new Societe($this->db);
+		} elseif ($type === Categorie::TYPE_SUPPLIER) {
+			if (!DolibarrApiAccess::$user->rights->societe->creer) {
+				throw new RestException(401);
+			}
+			$object = new Societe($this->db);
+		} elseif ($type === Categorie::TYPE_CONTACT) {
+			if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
+				throw new RestException(401);
+			}
+			$object = new Contact($this->db);
+		} elseif ($type === Categorie::TYPE_MEMBER) {
+			if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+				throw new RestException(401);
+			}
+			$object = new Adherent($this->db);
+		} else {
+			throw new RestException(401, "this type is not recognized yet.");
+		}
+
+		if (!empty($object)) {
+			$result = $object->fetch((int) $object_id);
+			if ($result > 0) {
+				$result = $this->category->del_type($object, $type);
+				if ($result < 0) {
+					throw new RestException(500, 'Error when unlinking object', array_merge(array($this->category->error), $this->category->errors));
+				}
+			} else {
+				throw new RestException(500, 'Error when fetching object', array_merge(array($object->error), $object->errors));
+			}
+
+			return array(
+				'success' => array(
+					'code' => 200,
+					'message' => 'Objects succefully unlinked from the category'
+				)
+			);
+		}
+
+		throw new RestException(401);
+	}
+
+	/**
+	 * Unlink an object from a category by ref
+	 *
+	 * @param int      $id         ID of category
+	 * @param string   $type Type  of category ('member', 'customer', 'supplier', 'product', 'contact')
+	 * @param string   $object_ref Reference of the object
+	 *
+	 * @return array
+	 * @throws RestException
+	 *
+	 * @url DELETE {id}/objects/{type}/ref/{object_ref}
+	 */
+	public function unlinkObjectByRef($id, $type, $object_ref)
+	{
+		if (empty($type) || empty($object_ref)) {
+			throw new RestException(401);
+		}
+
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->category->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
+
+		if ($type === Categorie::TYPE_PRODUCT) {
+			if (!(DolibarrApiAccess::$user->rights->produit->creer || DolibarrApiAccess::$user->rights->service->creer)) {
+				throw new RestException(401);
+			}
+			$object = new Product($this->db);
+		} elseif ($type === Categorie::TYPE_CUSTOMER) {
+			if (!DolibarrApiAccess::$user->rights->societe->creer) {
+				throw new RestException(401);
+			}
+			$object = new Societe($this->db);
+		} elseif ($type === Categorie::TYPE_SUPPLIER) {
+			if (!DolibarrApiAccess::$user->rights->societe->creer) {
+				throw new RestException(401);
+			}
+			$object = new Societe($this->db);
+		} elseif ($type === Categorie::TYPE_CONTACT) {
+			if (!DolibarrApiAccess::$user->rights->societe->contact->creer) {
+				throw new RestException(401);
+			}
+			$object = new Contact($this->db);
+		} elseif ($type === Categorie::TYPE_MEMBER) {
+			if (!DolibarrApiAccess::$user->rights->adherent->creer) {
+				throw new RestException(401);
+			}
+			$object = new Adherent($this->db);
+		} else {
+			throw new RestException(401, "this type is not recognized yet.");
+		}
+
+		if (!empty($object)) {
+			$result = $object->fetch('', (string) $object_ref);
+			if ($result > 0) {
+				$result = $this->category->del_type($object, $type);
+				if ($result < 0) {
+					throw new RestException(500, 'Error when unlinking object', array_merge(array($this->category->error), $this->category->errors));
+				}
+			} else {
+				throw new RestException(500, 'Error when fetching object', array_merge(array($object->error), $object->errors));
+			}
+
+			return array(
+				'success' => array(
+					'code' => 200,
+					'message' => 'Objects succefully unlinked from the category'
+				)
+			);
+		}
+
+		throw new RestException(401);
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Categorie  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
+
+		// Remove fields not relevent to categories
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->total_ht);
+		unset($object->total_ht);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
+		unset($object->total_tva);
+		unset($object->lines);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		unset($object->civility_id);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->shipping_method_id);
+		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->canvas);
+		unset($object->cats);
+		unset($object->motherof);
+		unset($object->context);
+		unset($object->socid);
+		unset($object->thirdparty);
+		unset($object->contact);
+		unset($object->contact_id);
+		unset($object->user);
+		unset($object->fk_account);
+		unset($object->fk_project);
+		unset($object->note);
+		unset($object->statut);
+
+		return $object;
+	}
+
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array|null    $data    Data to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$category = array();
+		foreach (Categories::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$category[$field] = $data[$field];
+		}
+		return $category;
+	}
+
+	/**
+	 * Get the list of objects in a category.
+	 *
+	 * @param int        $id         ID of category
+	 * @param string     $type       Type of category ('member', 'customer', 'supplier', 'product', 'contact', 'project')
+	 * @param int        $onlyids    Return only ids of objects (consume less memory)
+	 *
+	 * @return mixed
+	 *
+	 * @url GET {id}/objects
+	 */
+	public function getObjects($id, $type, $onlyids = 0)
+	{
 		dol_syslog("getObjects($id, $type, $onlyids)", LOG_DEBUG);
 
 		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 
-        if (empty($type))
-        {
+		if (empty($type))
+		{
 			throw new RestException(500, 'The "type" parameter is required.');
-        }
+		}
 
-        $result = $this->category->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'category not found');
-        }
+		$result = $this->category->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'category not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('categorie', $this->category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
@@ -766,8 +768,8 @@ class Categories extends DolibarrApi
 		}
 
 		$objects = $result;
-        $cleaned_objects = array();
-        if ($type == 'member') {
+		$cleaned_objects = array();
+		if ($type == 'member') {
 			$objects_api = new Members();
 		} elseif ($type == 'customer' || $type == 'supplier') {
 			$objects_api = new Thirdparties();
@@ -775,14 +777,15 @@ class Categories extends DolibarrApi
 			$objects_api = new Products();
 		} elseif ($type == 'contact') {
 			$objects_api = new Contacts();
+		} elseif ($type == 'project') {
+			$objects_api = new Projects();
 		}
-		if (is_object($objects_api))
-		{
-    		foreach ($objects as $obj) {
-    			$cleaned_objects[] = $objects_api->_cleanObjectDatas($obj);
-    		}
+		if (is_object($objects_api)) {
+			foreach ($objects as $obj) {
+				$cleaned_objects[] = $objects_api->_cleanObjectDatas($obj);
+			}
 		}
 
 		return $cleaned_objects;
-    }
+	}
 }
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 2dceee2831c..1bc9f47ded4 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -52,10 +52,10 @@ class Categorie extends CommonObject
 	const TYPE_USER      = 'user';
 	const TYPE_PROJECT   = 'project';
 	const TYPE_ACCOUNT   = 'bank_account';
-    const TYPE_BANK_LINE = 'bank_line';
-    const TYPE_WAREHOUSE = 'warehouse';
-    const TYPE_ACTIONCOMM = 'actioncomm';
-    const TYPE_WEBSITE_PAGE = 'website_page';
+	const TYPE_BANK_LINE = 'bank_line';
+	const TYPE_WAREHOUSE = 'warehouse';
+	const TYPE_ACTIONCOMM = 'actioncomm';
+	const TYPE_WEBSITE_PAGE = 'website_page';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -73,15 +73,15 @@ class Categorie extends CommonObject
 		'member'       => 3,
 		'contact'      => 4,
 		'bank_account' => 5,
-        'project'      => 6,
+		'project'      => 6,
 		'user'         => 7,
 		'bank_line'    => 8,
 		'warehouse'    => 9,
-        'actioncomm'   => 10,
+		'actioncomm'   => 10,
 		'website_page' => 11
 	);
 
-    /**
+	/**
 	 * @var array Code mapping from ID
 	 *
 	 * @note This array should be removed in future, once previous constants are moved to the string value. Deprecated
@@ -97,7 +97,7 @@ class Categorie extends CommonObject
 		7 => 'user',
 		8 => 'bank_line',
 		9 => 'warehouse',
-        10 => 'actioncomm',
+		10 => 'actioncomm',
 	);
 
 	/**
@@ -109,10 +109,10 @@ class Categorie extends CommonObject
 		'customer' => 'soc',
 		'supplier' => 'soc',
 		'contact'  => 'socpeople',
-        'bank_account' => 'account',
-    );
+		'bank_account' => 'account',
+	);
 
-    /**
+	/**
 	 * @var array Category tables mapping from type string (llx_categorie_...) when value does not match
 	 *
 	 * @note Move to const array when PHP 5.6 will be our minimum target
@@ -120,10 +120,10 @@ class Categorie extends CommonObject
 	protected $MAP_CAT_TABLE = array(
 		'customer' => 'societe',
 		'supplier' => 'fournisseur',
-        'bank_account'=> 'account',
+		'bank_account'=> 'account',
 	);
 
-    /**
+	/**
 	 * @var array Object class mapping from type string
 	 *
 	 * @note Move to const array when PHP 5.6 will be our minimum target
@@ -137,33 +137,33 @@ class Categorie extends CommonObject
 		'user'     => 'User',
 		'account'  => 'Account', // old for bank account
 		'bank_account'  => 'Account',
-        'project'  => 'Project',
-        'warehouse'=> 'Entrepot',
-        'actioncomm' => 'ActionComm',
+		'project'  => 'Project',
+		'warehouse'=> 'Entrepot',
+		'actioncomm' => 'ActionComm',
 		'website_page' => 'WebsitePage'
 	);
 
-    /**
-     * @var array Title Area mapping from type string
-     *
-     * @note Move to const array when PHP 5.6 will be our minimum target
-     */
-    public static $MAP_TYPE_TITLE_AREA = array(
-        'product' => 'ProductsCategoriesArea',
-        'customer' => 'CustomersCategoriesArea',
-        'supplier' => 'SuppliersCategoriesArea',
-        'member' => 'MembersCategoriesArea',
-        'contact' => 'ContactsCategoriesArea',
-        'user' => 'UsersCategoriesArea',
-        'account' => 'AccountsCategoriesArea', // old for bank account
-        'bank_account' => 'AccountsCategoriesArea',
-        'project' => 'ProjectsCategoriesArea',
-        'warehouse'=> 'StocksCategoriesArea',
-        'actioncomm' => 'ActioncommCategoriesArea',
-        'website_page' => 'WebsitePageCategoriesArea'
-    );
+	/**
+	 * @var array Title Area mapping from type string
+	 *
+	 * @note Move to const array when PHP 5.6 will be our minimum target
+	 */
+	public static $MAP_TYPE_TITLE_AREA = array(
+		'product' => 'ProductsCategoriesArea',
+		'customer' => 'CustomersCategoriesArea',
+		'supplier' => 'SuppliersCategoriesArea',
+		'member' => 'MembersCategoriesArea',
+		'contact' => 'ContactsCategoriesArea',
+		'user' => 'UsersCategoriesArea',
+		'account' => 'AccountsCategoriesArea', // old for bank account
+		'bank_account' => 'AccountsCategoriesArea',
+		'project' => 'ProjectsCategoriesArea',
+		'warehouse'=> 'StocksCategoriesArea',
+		'actioncomm' => 'ActioncommCategoriesArea',
+		'website_page' => 'WebsitePageCategoriesArea'
+	);
 
-    /**
+	/**
 	 * @var array Object table mapping from type string (table llx_...) when value of key does not match table name.
 	 *
 	 * @note Move to const array when PHP 5.6 will be our minimum target
@@ -175,7 +175,7 @@ class Categorie extends CommonObject
 		'contact'  => 'socpeople',
 		'account'  => 'bank_account', // old for bank account
 		'project'  => 'projet',
-        'warehouse'=> 'entrepot'
+		'warehouse'=> 'entrepot'
 	);
 
 	/**
@@ -189,13 +189,13 @@ class Categorie extends CommonObject
 	public $table_element = 'categorie';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_parent;
 
 	/**
-     * @var string Category label
-     */
+	 * @var string Category label
+	 */
    	public $label;
 
 	/**
@@ -225,8 +225,8 @@ class Categorie extends CommonObject
 	 * @see Categorie::TYPE_USER
 	 * @see Categorie::TYPE_PROJECT
 	 * @see Categorie::TYPE_BANK_LINE
-     * @see Categorie::TYPE_WAREHOUSE
-     * @see Categorie::TYPE_ACTIONCOMM
+	 * @see Categorie::TYPE_WAREHOUSE
+	 * @see Categorie::TYPE_ACTIONCOMM
 	 */
 	public $type;
 
@@ -235,7 +235,7 @@ class Categorie extends CommonObject
 	 */
 	public $cats = array();
 
-    /**
+	/**
 	 * @var array Mother of table
 	 */
 	public $motherof = array();
@@ -315,13 +315,10 @@ class Categorie extends CommonObject
 		if ($id > 0)
 		{
 			$sql .= " WHERE rowid = ".$id;
-		}
-		elseif (!empty($ref_ext))
+		} elseif (!empty($ref_ext))
 		{
 			$sql .= " WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."'";
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
 			if (!is_null($type)) $sql .= " AND type = ".$this->db->escape($type);
 		}
@@ -360,14 +357,10 @@ class Categorie extends CommonObject
 				if (!empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -471,31 +464,25 @@ class Categorie extends CommonObject
 
 				if (!$error)
 				{
-	                // Call trigger
-    	            $result = $this->call_trigger('CATEGORY_CREATE', $user);
-        	        if ($result < 0) { $error++; }
-            	    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('CATEGORY_CREATE', $user);
+					if ($result < 0) { $error++; }
+					// End call triggers
 				}
 
-                if (!$error)
-                {
-    				$this->db->commit();
-    				return $id;
-                }
-                else
-              	{
-                	$this->db->rollback();
-                    return -3;
-                }
-			}
-			else
-			{
+				if (!$error)
+				{
+					$this->db->commit();
+					return $id;
+				} else {
+					$this->db->rollback();
+					return -3;
+				}
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -563,18 +550,16 @@ class Categorie extends CommonObject
 
 			if (!$error)
 			{
-	            // Call trigger
-    	        $result = $this->call_trigger('CATEGORY_MODIFY', $user);
-        	    if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-            	// End call triggers
+				// Call trigger
+				$result = $this->call_trigger('CATEGORY_MODIFY', $user);
+				if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+				// End call triggers
 			}
 
 			$this->db->commit();
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_print_error($this->db);
 			return -1;
@@ -585,7 +570,7 @@ class Categorie extends CommonObject
 	 * 	Delete a category from database
 	 *
 	 * 	@param	User	$user		Object user that ask to delete
-     *	@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 KO >0 OK
 	 */
 	public function delete($user, $notrigger = 0)
@@ -594,7 +579,7 @@ class Categorie extends CommonObject
 
 		$error = 0;
 
-        // Clean parameters
+		// Clean parameters
 		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);
 
 		dol_syslog(get_class($this)."::remove");
@@ -603,10 +588,10 @@ class Categorie extends CommonObject
 
 		if (!$error && !$notrigger)
 		{
-		    // Call trigger
-		    $result = $this->call_trigger('CATEGORY_DELETE', $user);
-		    if ($result < 0) $error++;
-		    // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('CATEGORY_DELETE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		/* FIX #1317 : Check for child category and move up 1 level*/
@@ -623,26 +608,26 @@ class Categorie extends CommonObject
 			}
 		}
 
-        $arraydelete = array(
-            'categorie_societe' => 'fk_categorie',
-            'categorie_fournisseur' => 'fk_categorie',
-            'categorie_product' => 'fk_categorie',
-            'categorie_member' => 'fk_categorie',
-            'categorie_contact' => 'fk_categorie',
-            'categorie_account' => 'fk_categorie',
-            'bank_class' => 'fk_categ',
-            'categorie_lang' => 'fk_category',
-            'categorie' => 'rowid',
-        );
-        foreach ($arraydelete as $key => $value) {
-            $sql  = "DELETE FROM ".MAIN_DB_PREFIX.$key;
-            $sql .= " WHERE ".$value." = ".$this->id;
-            if (!$this->db->query($sql)) {
-                $this->errors[] = $this->db->lasterror();
-                dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
-                $error++;
-            }
-        }
+		$arraydelete = array(
+			'categorie_societe' => 'fk_categorie',
+			'categorie_fournisseur' => 'fk_categorie',
+			'categorie_product' => 'fk_categorie',
+			'categorie_member' => 'fk_categorie',
+			'categorie_contact' => 'fk_categorie',
+			'categorie_account' => 'fk_categorie',
+			'bank_class' => 'fk_categ',
+			'categorie_lang' => 'fk_category',
+			'categorie' => 'rowid',
+		);
+		foreach ($arraydelete as $key => $value) {
+			$sql  = "DELETE FROM ".MAIN_DB_PREFIX.$key;
+			$sql .= " WHERE ".$value." = ".$this->id;
+			if (!$this->db->query($sql)) {
+				$this->errors[] = $this->db->lasterror();
+				dol_syslog("Error sql=".$sql." ".$this->error, LOG_ERR);
+				$error++;
+			}
+		}
 
 		// Removed extrafields
 		if (!$error)
@@ -659,34 +644,34 @@ class Categorie extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Link an object to the category
 	 *
 	 * @param   CommonObject 	$obj  	Object to link to category
-	 * @param   string     		$type 	Type of category ('product', ...)
+	 * @param   string     		$type 	Type of category ('product', ...). Use '' to take $obj->element.
 	 * @return  int                		1 : OK, -1 : erreur SQL, -2 : id not defined, -3 : Already linked
 	 */
-	public function add_type($obj, $type)
+	public function add_type($obj, $type = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf;
 
 		$error = 0;
 
 		if ($this->id == -1) return -2;
 
-        $this->db->begin();
+		if (empty($type)) $type = $obj->element;
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
+		$this->db->begin();
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
 		$sql .= " (fk_categorie, fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]).")";
 		$sql .= " VALUES (".$this->id.", ".$obj->id.")";
 
@@ -704,7 +689,7 @@ class Categorie extends CommonObject
 				{
 					if ($this->db->num_rows($resql) > 0)
 					{
-                        $objparent = $this->db->fetch_object($resql);
+						$objparent = $this->db->fetch_object($resql);
 
 						if (!empty($objparent->fk_parent))
 						{
@@ -720,56 +705,48 @@ class Categorie extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
 
 				if ($error)
 				{
-				    $this->db->rollback();
+					$this->db->rollback();
 					return -1;
 				}
 			}
 
 
 
-            // Call trigger
+			// Call trigger
 			$this->context = array('linkto'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_LINK', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			if ($result < 0) { $error++; }
+			// End call triggers
 
 			if (!$error)
 			{
-			    $this->db->commit();
-			    return 1;
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -2;
 			}
-			else
-			{
-			    $this->db->rollback();
-			    return -2;
-			}
-		}
-		else
-		{
-		    $this->db->rollback();
+		} else {
+			$this->db->rollback();
 			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error = $this->db->lasterrno();
 				return -3;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 			}
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Delete object from category
 	 *
@@ -780,7 +757,7 @@ class Categorie extends CommonObject
 	 */
 	public function del_type($obj, $type)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf;
 
 		$error = 0;
@@ -794,35 +771,31 @@ class Categorie extends CommonObject
 			dol_syslog(get_class($this)."::del_type(): type 'fournisseur' is deprecated, please use 'supplier' instead", LOG_WARNING);
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
 		$sql .= " WHERE fk_categorie = ".$this->id;
 		$sql .= " AND fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".$obj->id;
 
 		dol_syslog(get_class($this).'::del_type', LOG_DEBUG);
 		if ($this->db->query($sql))
 		{
-            // Call trigger
+			// Call trigger
 			$this->context = array('unlinkoff'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_UNLINK', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			if ($result < 0) { $error++; }
+			// End call triggers
 
 			if (!$error)
 			{
-			    $this->db->commit();
-			    return 1;
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -2;
 			}
-			else
-			{
-			    $this->db->rollback();
-                return -2;
-			}
-		}
-		else
-		{
-		    $this->db->rollback();
+		} else {
+			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -869,24 +842,19 @@ class Categorie extends CommonObject
 		{
 			while ($rec = $this->db->fetch_array($resql))
 			{
-			    if ($onlyids)
-			    {
-			    	$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
-			    }
-			    else
-			    {
-			        $classnameforobj = $this->MAP_OBJ_CLASS[$type];
+				if ($onlyids) {
+					$objs[] = $rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])];
+				} else {
+					$classnameforobj = $this->MAP_OBJ_CLASS[$type];
 
-			        $obj = new $classnameforobj($this->db);
-				    $obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
+					$obj = new $classnameforobj($this->db);
+					$obj->fetch($rec['fk_'.(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])]);
 
-				    $objs[] = $obj;
-			    }
+					$objs[] = $obj;
+				}
 			}
 			return $objs;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1011,8 +979,7 @@ class Categorie extends CommonObject
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1023,7 +990,7 @@ class Categorie extends CommonObject
 		return $categories;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return direct childs id of a category into an array
 	 *
@@ -1031,7 +998,7 @@ class Categorie extends CommonObject
 	 */
 	public function get_filles()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
 		$sql .= " WHERE fk_parent = ".$this->id;
 		$sql .= " AND entity IN (".getEntity('category').")";
@@ -1047,15 +1014,13 @@ class Categorie extends CommonObject
 				$cats[] = $cat;
 			}
 			return $cats;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Load the array this->motherof that is array(id_son=>id_parent, ...)
 	 *
@@ -1063,8 +1028,8 @@ class Categorie extends CommonObject
 	 */
 	protected function load_motherof()
 	{
-        // phpcs:enable
-	    $this->motherof = array();
+		// phpcs:enable
+		$this->motherof = array();
 
 		// Load array[child]=parent
 		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
@@ -1081,15 +1046,13 @@ class Categorie extends CommonObject
 				$this->motherof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Rebuilding the category tree as an array
 	 * Return an array of table('id','id_mere',...) trie selon arbre et avec:
@@ -1102,17 +1065,17 @@ class Categorie extends CommonObject
 	 *
 	 * @param   string                  $type                   Type of categories ('customer', 'supplier', 'contact', 'product', 'member', ...)
 	 * @param   int|string|array        $markafterid            Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
-     *                                                          $markafterid can be an :
-     *                                                          - int (id of category)
-     *                                                          - string (categories ids separated by comma)
-     *                                                          - array (list of categories ids)
-     * @param   int                     $include                [=0] Removed or 1=Keep only
+	 *                                                          $markafterid can be an :
+	 *                                                          - int (id of category)
+	 *                                                          - string (categories ids separated by comma)
+	 *                                                          - array (list of categories ids)
+	 * @param   int                     $include                [=0] Removed or 1=Keep only
 	 * @return  array|int               Array of categories. this->cats and this->motherof are set, -1 on error
 	 */
 	public function get_full_arbo($type, $markafterid = 0, $include = 0)
 	{
-        // phpcs:enable
-	    global $conf, $langs;
+		// phpcs:enable
+		global $conf, $langs;
 
 		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
 		if (is_null($type)) {
@@ -1120,27 +1083,23 @@ class Categorie extends CommonObject
 			return -1;
 		}
 
-        if (is_string($markafterid))
-        {
-            $markafterid = explode(',', $markafterid);
-        }
-        elseif (is_numeric($markafterid))
-        {
-            if ($markafterid > 0)
-            {
-                $markafterid = array($markafterid);
-            }
-            else
-            {
-                $markafterid = array();
-            }
-        }
-        elseif (!is_array($markafterid))
-        {
-            $markafterid = array();
-        }
+		if (is_string($markafterid))
+		{
+			$markafterid = explode(',', $markafterid);
+		} elseif (is_numeric($markafterid))
+		{
+			if ($markafterid > 0)
+			{
+				$markafterid = array($markafterid);
+			} else {
+				$markafterid = array();
+			}
+		} elseif (!is_array($markafterid))
+		{
+			$markafterid = array();
+		}
 
-        $this->cats = array();
+		$this->cats = array();
 
 		// Init this->motherof that is array(id_son=>id_parent, ...)
 		$this->load_motherof();
@@ -1171,9 +1130,7 @@ class Categorie extends CommonObject
 				$this->cats[$obj->rowid]['ref_ext'] = $obj->ref_ext;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1186,27 +1143,27 @@ class Categorie extends CommonObject
 			$this->build_path_from_id_categ($key, 0); // Process a branch from the root category key (this category has no parent)
 		}
 
-        // Include or exclude leaf including $markafterid from tree
-        if (count($markafterid) > 0)
-        {
-            $keyfiltercatid = '('.implode('|', $markafterid).')';
+		// Include or exclude leaf including $markafterid from tree
+		if (count($markafterid) > 0)
+		{
+			$keyfiltercatid = '('.implode('|', $markafterid).')';
 
-            //print "Look to discard category ".$markafterid."\n";
-            $keyfilter1 = '^'.$keyfiltercatid.'$';
-            $keyfilter2 = '_'.$keyfiltercatid.'$';
-            $keyfilter3 = '^'.$keyfiltercatid.'_';
-            $keyfilter4 = '_'.$keyfiltercatid.'_';
-            foreach ($this->cats as $key => $val)
-            {
-                $test = (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
-                    || preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath']));
+			//print "Look to discard category ".$markafterid."\n";
+			$keyfilter1 = '^'.$keyfiltercatid.'$';
+			$keyfilter2 = '_'.$keyfiltercatid.'$';
+			$keyfilter3 = '^'.$keyfiltercatid.'_';
+			$keyfilter4 = '_'.$keyfiltercatid.'_';
+			foreach ($this->cats as $key => $val)
+			{
+				$test = (preg_match('/'.$keyfilter1.'/', $val['fullpath']) || preg_match('/'.$keyfilter2.'/', $val['fullpath'])
+					|| preg_match('/'.$keyfilter3.'/', $val['fullpath']) || preg_match('/'.$keyfilter4.'/', $val['fullpath']));
 
-                if (($test && !$include) || (!$test && $include))
-                {
-                    unset($this->cats[$key]);
-                }
-            }
-        }
+				if (($test && !$include) || (!$test && $include))
+				{
+					unset($this->cats[$key]);
+				}
+			}
+		}
 
 		dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);
 		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);
@@ -1216,7 +1173,7 @@ class Categorie extends CommonObject
 		return $this->cats;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	For category id_categ and its childs available in this->cats, define property fullpath and fulllabel.
 	 *  It is called by get_full_arbo()
@@ -1227,10 +1184,10 @@ class Categorie extends CommonObject
 	 *	@return		void
 	 *  @see get_full_arbo()
 	 */
-    public function build_path_from_id_categ($id_categ, $protection = 1000)
-    {
-        // phpcs:enable
-        dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);
+	public function build_path_from_id_categ($id_categ, $protection = 1000)
+	{
+		// phpcs:enable
+		dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);
 
 		if (!empty($this->cats[$id_categ]['fullpath']))
 		{
@@ -1258,12 +1215,13 @@ class Categorie extends CommonObject
 		//print 'Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].'<br>'."\n";
 
 		// We count number of _ to have level
-		$this->cats[$id_categ]['level'] = dol_strlen(preg_replace('/[^_]/i', '', $this->cats[$id_categ]['fullpath']));
+		$nbunderscore = substr_count($this->cats[$id_categ]['fullpath'], '_');
+		$this->cats[$id_categ]['level'] = ($nbunderscore ? $nbunderscore : null);
 
-        return;
-    }
+		return;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Display content of $this->cats
 	 *
@@ -1271,7 +1229,7 @@ class Categorie extends CommonObject
 	 */
 	public function debug_cats()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Display $this->cats
 		foreach ($this->cats as $key => $val)
 		{
@@ -1286,7 +1244,7 @@ class Categorie extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Returns all categories
 	 *
@@ -1296,7 +1254,7 @@ class Categorie extends CommonObject
 	 */
 	public function get_all_categories($type = null, $parent = false)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
@@ -1317,9 +1275,7 @@ class Categorie extends CommonObject
 				$cats[$rec['rowid']] = $cat;
 			}
 			return $cats;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1334,11 +1290,11 @@ class Categorie extends CommonObject
 	 */
 	public function get_main_categories($type = null)
 	{
-	    // phpcs:enable
-	    return $this->get_all_categories($type, true);
+		// phpcs:enable
+		return $this->get_all_categories($type, true);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Check if no category with same label already exists for this cat's parent or root and for this cat's type
 	 *
@@ -1346,7 +1302,7 @@ class Categorie extends CommonObject
 	 */
 	public function already_exists()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$type = $this->type;
 
 		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
@@ -1381,29 +1337,27 @@ class Categorie extends CommonObject
 			}
 			dol_syslog(get_class($this)."::already_exists no category with same name=".$this->label." and same parent ".$this->fk_parent." than category id=".$this->id, LOG_DEBUG);
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Returns the path of the category, with the names of the categories
 	 * separated by $sep (" >> " by default)
 	 *
 	 * @param	string	$sep	     Separator
-	 * @param	string	$url	     Url
+	 * @param	string	$url	     Url ('', 'none' or 'urltouse')
 	 * @param   int     $nocolor     0
 	 * @param	string	$addpicto	 Add picto into link
 	 * @return	array
 	 */
 	public function print_all_ways($sep = ' &gt;&gt; ', $url = '', $nocolor = 0, $addpicto = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$ways = array();
 
 		$allways = $this->get_all_ways(); // Load array of categories
@@ -1414,31 +1368,32 @@ class Categorie extends CommonObject
 			$forced_color = '';
 			foreach ($way as $cat)
 			{
-			    $i++;
+				$i++;
 
-			    if (empty($nocolor))
-			    {
-    			    $forced_color = 'toreplace';
-    			    if ($i == count($way))
-    			    {
-    			        // Check contrast with background and correct text color
-    			        $forced_color = 'categtextwhite';
-    			        if ($cat->color)
-    			        {
-    			            if (colorIsLight($cat->color)) $forced_color = 'categtextblack';
-    			        }
-    			    }
-			    }
-
-				if ($url == '')
+				if (empty($nocolor))
 				{
-			        $link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
-			        $linkend = '</a>';
-			        $w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
+					$forced_color = 'toreplace';
+					if ($i == count($way))
+					{
+						// Check contrast with background and correct text color
+						$forced_color = 'categtextwhite';
+						if ($cat->color)
+						{
+							if (colorIsLight($cat->color)) $forced_color = 'categtextblack';
+						}
+					}
 				}
-				else
-				{
-					$w[] = "<a href='".DOL_URL_ROOT."/".$url."?catid=".$cat->id."'>".($addpicto ? img_object('', 'category') : '').$cat->label."</a>";
+
+				if ($url == '') {
+					$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$cat->id.'&type='.$cat->type.'" class="'.$forced_color.'">';
+					$linkend = '</a>';
+					$w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
+				} elseif ($url == 'none') {
+					$link = '<span class="'.$forced_color.'">';
+					$linkend = '</span>';
+					$w[] = $link.($addpicto ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
+				} else {
+					$w[] = '<a class="'.$forced_color.'" href="'.DOL_URL_ROOT.'/'.$url.'?catid='.$cat->id.'">'.($addpicto ? img_object('', 'category') : '').$cat->label.'</a>';
 				}
 			}
 			$newcategwithpath = preg_replace('/toreplace/', $forced_color, implode($sep, $w));
@@ -1450,7 +1405,7 @@ class Categorie extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Returns an array containing the list of parent categories
 	 *
@@ -1458,7 +1413,7 @@ class Categorie extends CommonObject
 	 */
 	public function get_meres()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$parents = array();
 
 		$sql = "SELECT fk_parent FROM ".MAIN_DB_PREFIX."categorie";
@@ -1478,15 +1433,13 @@ class Categorie extends CommonObject
 				}
 			}
 			return $parents;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Returns in a table all possible paths to get to the category
 	 * 	starting with the major categories represented by Tables of categories
@@ -1495,7 +1448,7 @@ class Categorie extends CommonObject
 	 */
 	public function get_all_ways()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$ways = array();
 
 		$parents = $this->get_meres();
@@ -1537,66 +1490,60 @@ class Categorie extends CommonObject
 
 		if ($type === Categorie::TYPE_BANK_LINE)   // TODO Remove this with standard category code
 		{
-		    // Load bank groups
-		    $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 .= " ORDER BY c.label";
+			// Load bank groups
+			$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 .= " ORDER BY c.label";
 
-		    $res = $this->db->query($sql);
-		    if ($res)
-		    {
-		        while ($obj = $this->db->fetch_object($res))
-		        {
-    				if ($mode == 'id') {
-    				    $cats[] = $obj->rowid;
-    				} elseif ($mode == 'label') {
-    				    $cats[] = $obj->label;
-    				} else {
-    				    $cat = new Categorie($this->db);
-    				    $cat->id = $obj->rowid;
-    				    $cat->label = $obj->label;
-    				    $cats[] = $cat;
-    				}
-		        }
-		    }
-		    else
-		    {
-		        dol_print_error($this->db);
-		        return -1;
-		    }
+			$res = $this->db->query($sql);
+			if ($res)
+			{
+				while ($obj = $this->db->fetch_object($res))
+				{
+					if ($mode == 'id') {
+						$cats[] = $obj->rowid;
+					} elseif ($mode == 'label') {
+						$cats[] = $obj->label;
+					} else {
+						$cat = new Categorie($this->db);
+						$cat->id = $obj->rowid;
+						$cat->label = $obj->label;
+						$cats[] = $cat;
+					}
+				}
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
+		} else {
+			$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
+			$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
+			$sql .= " AND c.entity IN (".getEntity('category').")";
+
+			$res = $this->db->query($sql);
+			if ($res)
+			{
+				while ($obj = $this->db->fetch_object($res))
+				{
+					if ($mode == 'id') {
+						$cats[] = $obj->rowid;
+					} elseif ($mode == 'label') {
+						$cats[] = $obj->label;
+					} else {
+						$cat = new Categorie($this->db);
+						$cat->fetch($obj->fk_categorie);
+						$cats[] = $cat;
+					}
+				}
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
 		}
-        else
-        {
-    		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
-    		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type])." as ct, ".MAIN_DB_PREFIX."categorie as c";
-    		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type])." = ".(int) $id." AND c.type = ".$this->MAP_ID[$type];
-    		$sql .= " AND c.entity IN (".getEntity('category').")";
 
-    		$res = $this->db->query($sql);
-    		if ($res)
-    		{
-    			while ($obj = $this->db->fetch_object($res))
-    			{
-    				if ($mode == 'id') {
-    					$cats[] = $obj->rowid;
-    				} elseif ($mode == 'label') {
-    					$cats[] = $obj->label;
-    				} else {
-    					$cat = new Categorie($this->db);
-    					$cat->fetch($obj->fk_categorie);
-    					$cats[] = $cat;
-    				}
-    			}
-    		}
-    		else
-    		{
-    			dol_print_error($this->db);
-    			return -1;
-    		}
-        }
-
-        return $cats;
+		return $cats;
 	}
 
 
@@ -1606,7 +1553,7 @@ class Categorie extends CommonObject
 	 *
 	 * 	@param		int			$id			Id
 	 * 	@param		string		$nom		Name
- 	 * 	@param		string		$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.
+	 * 	@param		string		$type		Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.
 	 * 	@param		boolean		$exact		Exact string search (true/false)
 	 * 	@param		boolean		$case		Case sensitive (true/false)
 	 * 	@return		Categorie[]|int			Array of Categorie, -1 if error
@@ -1620,15 +1567,15 @@ class Categorie extends CommonObject
 
 		$cats = array();
 
-        // For backward compatibility
-        if (is_numeric($type)) {
-            // We want to reverse lookup
-            $map_type = array_flip($this->MAP_ID);
-            $type = $map_type[$type];
-            dol_syslog(get_class($this)."::rechercher(): numeric types are deprecated, please use string instead", LOG_WARNING);
-        }
+		// For backward compatibility
+		if (is_numeric($type)) {
+			// We want to reverse lookup
+			$map_type = array_flip($this->MAP_ID);
+			$type = $map_type[$type];
+			dol_syslog(get_class($this)."::rechercher(): numeric types are deprecated, please use string instead", LOG_WARNING);
+		}
 
-        // Generation requete recherche
+		// Generation requete recherche
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
 		$sql .= " WHERE type = ".$this->MAP_ID[$type];
 		$sql .= " AND entity IN (".getEntity('category').")";
@@ -1638,8 +1585,7 @@ class Categorie extends CommonObject
 				$nom = '%'.str_replace('*', '%', $nom).'%';
 			if (!$case)
 				$sql .= " AND label LIKE '".$this->db->escape($nom)."'";
-			else
-				$sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
+			else $sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
 		}
 		if ($id)
 		{
@@ -1657,9 +1603,7 @@ class Categorie extends CommonObject
 			}
 
 			return $cats;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1672,9 +1616,10 @@ class Categorie extends CommonObject
 	 *	@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param		string	$option			Sur quoi pointe le lien ('', 'xyz')
 	 * 	@param		int		$maxlength		Max length of text
+	 *  @param		string	$moreparam		More param on URL link
 	 *	@return		string					Chaine avec URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $moreparam = '')
 	{
 		global $langs;
 
@@ -1688,20 +1633,20 @@ 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.'&backtopage='.urlencode($_SERVER['PHP_SELF']).'" 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';
 
 
-        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.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;
 		return $result;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Deplace fichier uploade sous le nom $files dans le repertoire sdir
 	 *
@@ -1711,7 +1656,7 @@ class Categorie extends CommonObject
 	 */
 	public function add_photo($sdir, $file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, 'category').$this->id."/";
@@ -1751,7 +1696,7 @@ class Categorie extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return tableau de toutes les photos de la categorie
 	 *
@@ -1761,7 +1706,7 @@ class Categorie extends CommonObject
 	 */
 	public function liste_photos($dir, $nbmax = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$nbphoto = 0;
@@ -1772,43 +1717,43 @@ class Categorie extends CommonObject
 		if (file_exists($dir))
 		{
 			$handle = opendir($dir);
-            if (is_resource($handle))
-            {
-    			while (($file = readdir($handle)) !== false)
-    			{
-    				if (dol_is_file($dir.$file) && preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file))
-    				{
-    					$nbphoto++;
-    					$photo = $file;
+			if (is_resource($handle))
+			{
+				while (($file = readdir($handle)) !== false)
+				{
+					if (dol_is_file($dir.$file) && preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $dir.$file))
+					{
+						$nbphoto++;
+						$photo = $file;
 
-    					// On determine nom du fichier vignette
-    					$photo_vignette = '';
-    					if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $photo, $regs))
-    					{
-    						$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
-    					}
+						// On determine nom du fichier vignette
+						$photo_vignette = '';
+						if (preg_match('/(\.jpeg|\.jpg|\.bmp|\.gif|\.png|\.tiff)$/i', $photo, $regs))
+						{
+							$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
+						}
 
-    					// Objet
-    					$obj = array();
-    					$obj['photo'] = $photo;
-    					if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
-    					else $obj['photo_vignette'] = "";
+						// Objet
+						$obj = array();
+						$obj['photo'] = $photo;
+						if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
+						else $obj['photo_vignette'] = "";
 
-    					$tabobj[$nbphoto - 1] = $obj;
+						$tabobj[$nbphoto - 1] = $obj;
 
-    					// On continue ou on arrete de boucler
-    					if ($nbmax && $nbphoto >= $nbmax) break;
-    				}
-    			}
+						// On continue ou on arrete de boucler
+						if ($nbmax && $nbphoto >= $nbmax) break;
+					}
+				}
 
-    			closedir($handle);
-            }
+				closedir($handle);
+			}
 		}
 
 		return $tabobj;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Efface la photo de la categorie et sa vignette
 	 *
@@ -1817,10 +1762,10 @@ class Categorie extends CommonObject
 	 */
 	public function delete_photo($file)
 	{
-        // phpcs:enable
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		// phpcs:enable
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
+		$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
 		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
 		$filename = preg_replace('/'.preg_quote($dir, '/').'/i', '', $file); // Nom du fichier
 
@@ -1838,7 +1783,7 @@ class Categorie extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load size of image file
 	 *
@@ -1847,7 +1792,7 @@ class Categorie extends CommonObject
 	 */
 	public function get_image_size($file)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$infoImg = getimagesize($file); // Recuperation des infos de l'image
 		$this->imgWidth = $infoImg[0]; // Largeur de l'image
 		$this->imgHeight = $infoImg[1]; // Hauteur de l'image
@@ -1862,68 +1807,63 @@ class Categorie extends CommonObject
 	 */
 	public function setMultiLangs($user)
 	{
-	    global $langs;
+		global $langs;
 
-	    $langs_available = $langs->get_available_languages();
-	    $current_lang = $langs->getDefaultLang();
+		$langs_available = $langs->get_available_languages();
+		$current_lang = $langs->getDefaultLang();
 
-	    foreach ($langs_available as $key => $value)
-	    {
-	        $sql = "SELECT rowid";
-	        $sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
-	        $sql .= " WHERE fk_category=".$this->id;
-	        $sql .= " AND lang='".$key."'";
+		foreach ($langs_available as $key => $value)
+		{
+			$sql = "SELECT rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
+			$sql .= " WHERE fk_category=".$this->id;
+			$sql .= " AND lang='".$key."'";
 
-	        $result = $this->db->query($sql);
+			$result = $this->db->query($sql);
 
-	        if ($key == $current_lang)
-	        {
-	            if ($this->db->num_rows($result)) // si aucune ligne dans la base
-	            {
-	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
-	                $sql2 .= " SET label='".$this->db->escape($this->label)."',";
-	                $sql2 .= " description='".$this->db->escape($this->description)."'";
-	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
-	            }
-	            else
-	            {
-	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
-	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->label);
-	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
-	            }
-	            dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
-	            if (!$this->db->query($sql2))
-	            {
-	                $this->error = $this->db->lasterror();
-	                return -1;
-	            }
-	        }
-	        elseif (isset($this->multilangs["$key"]))
-	        {
-	            if ($this->db->num_rows($result)) // si aucune ligne dans la base
-	            {
-	                $sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
-	                $sql2 .= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
-	                $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
-	                $sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
-	            }
-	            else
-	            {
-	                $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
-	                $sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->multilangs["$key"]["label"]);
-	                $sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
-	            }
+			if ($key == $current_lang)
+			{
+				if ($this->db->num_rows($result)) // si aucune ligne dans la base
+				{
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
+					$sql2 .= " SET label='".$this->db->escape($this->label)."',";
+					$sql2 .= " description='".$this->db->escape($this->description)."'";
+					$sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
+				} else {
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
+					$sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->label);
+					$sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
+				}
+				dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
+				if (!$this->db->query($sql2))
+				{
+					$this->error = $this->db->lasterror();
+					return -1;
+				}
+			} elseif (isset($this->multilangs["$key"]))
+			{
+				if ($this->db->num_rows($result)) // si aucune ligne dans la base
+				{
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."categorie_lang";
+					$sql2 .= " SET label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					$sql2 .= " WHERE fk_category=".$this->id." AND lang='".$this->db->escape($key)."'";
+				} else {
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."categorie_lang (fk_category, lang, label, description)";
+					$sql2 .= " VALUES(".$this->id.",'".$key."','".$this->db->escape($this->multilangs["$key"]["label"]);
+					$sql2 .= "','".$this->db->escape($this->multilangs["$key"]["description"])."')";
+				}
 
-	            // on ne sauvegarde pas des champs vides
-	            if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"])
-	                dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
-	            if (!$this->db->query($sql2))
-	            {
-	                $this->error = $this->db->lasterror();
-	                return -1;
-	            }
-	        }
-	    }
+				// on ne sauvegarde pas des champs vides
+				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"])
+					dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
+				if (!$this->db->query($sql2))
+				{
+					$this->error = $this->db->lasterror();
+					return -1;
+				}
+			}
+		}
 
 		// Call trigger
 		$result = $this->call_trigger('CATEGORY_SET_MULTILANGS', $user);
@@ -1933,7 +1873,7 @@ class Categorie extends CommonObject
 		}
 		// End call triggers
 
-	    return 1;
+		return 1;
 	}
 
 	/**
@@ -1943,35 +1883,33 @@ class Categorie extends CommonObject
 	 */
 	public function getMultiLangs()
 	{
-	    global $langs;
+		global $langs;
 
-	    $current_lang = $langs->getDefaultLang();
+		$current_lang = $langs->getDefaultLang();
 
-	    $sql = "SELECT lang, label, description";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
-	    $sql .= " WHERE fk_category=".$this->id;
+		$sql = "SELECT lang, label, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
+		$sql .= " WHERE fk_category=".$this->id;
 
-	    $result = $this->db->query($sql);
-	    if ($result)
-	    {
-	        while ($obj = $this->db->fetch_object($result))
-	        {
-	            //print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
-	            if ($obj->lang == $current_lang) // si on a les traduct. dans la langue courante on les charge en infos principales.
-	            {
-	                $this->label = $obj->label;
-	                $this->description = $obj->description;
-	            }
-	            $this->multilangs["$obj->lang"]["label"] = $obj->label;
-	            $this->multilangs["$obj->lang"]["description"] = $obj->description;
-	        }
-	        return 1;
-	    }
-	    else
-	    {
-	        $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
-	        return -1;
-	    }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			while ($obj = $this->db->fetch_object($result))
+			{
+				//print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
+				if ($obj->lang == $current_lang) // si on a les traduct. dans la langue courante on les charge en infos principales.
+				{
+					$this->label = $obj->label;
+					$this->description = $obj->description;
+				}
+				$this->multilangs["$obj->lang"]["label"] = $obj->label;
+				$this->multilangs["$obj->lang"]["description"] = $obj->description;
+			}
+			return 1;
+		} else {
+			$this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+			return -1;
+		}
 	}
 
 	/**
@@ -1982,47 +1920,47 @@ class Categorie extends CommonObject
 	 */
 	public function getLibStatut($mode)
 	{
-	    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
-     */
-    public function initAsSpecimen()
-    {
-        dol_syslog(get_class($this)."::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()
+	{
+		dol_syslog(get_class($this)."::initAsSpecimen");
 
-        // Initialise parametres
-        $this->id = 0;
-        $this->fk_parent = 0;
-        $this->label = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->description = 'This is a description';
-        $this->socid = 1;
-        $this->type = self::TYPE_PRODUCT;
-    }
+		// Initialise parametres
+		$this->id = 0;
+		$this->fk_parent = 0;
+		$this->label = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->description = 'This is a description';
+		$this->socid = 1;
+		$this->type = self::TYPE_PRODUCT;
+	}
 
-    /**
-     * 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(
-            'categorie_societe'
-        );
+	/**
+	 * 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(
+			'categorie_societe'
+		);
 
-        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables, 1);
-    }
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables, 1);
+	}
 
 	/**
 	 * Return the addtional SQL JOIN query for filtering a list by a category
@@ -2060,8 +1998,7 @@ class Categorie extends CommonObject
 			if (intval($searchCategory) == -2)
 			{
 				$searchCategorySqlList[] = " cp.fk_categorie IS NULL";
-			}
-			elseif (intval($searchCategory) > 0)
+			} elseif (intval($searchCategory) > 0)
 			{
 				$searchCategorySqlList[] = " ".$rowIdName
 										." IN (SELECT fk_".$type." FROM ".MAIN_DB_PREFIX."categorie_".$type
@@ -2072,10 +2009,29 @@ class Categorie extends CommonObject
 		if (!empty($searchCategorySqlList))
 		{
 			return " AND (".implode(' AND ', $searchCategorySqlList).")";
-		}
-		else
-		{
+		} else {
 			return "";
 		}
 	}
+
+	/**
+	 *      Count all categories
+	 *
+	 *      @return int                             Number of categories, -1 on error
+	 */
+	public function countNbOfCategories()
+	{
+		dol_syslog(get_class($this)."::count_all_categories", LOG_DEBUG);
+		$sql = "SELECT COUNT(rowid) FROM ".MAIN_DB_PREFIX."categorie";
+		$sql .= " WHERE entity IN (".getEntity('category').")";
+
+		$res = $this->db->query($sql);
+		if ($res) {
+			$obj = $this->db->fetch_object($res);
+			return $obj->count;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 48bd82b9326..7c8c683bf18 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -33,16 +33,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->load("categories");
 
 $id = GETPOST('id', 'int');
-$ref = GETPOST('ref');
-$type = GETPOST('type');
+$ref = GETPOST('ref', 'alphanohtml');
+$type = GETPOST('type', 'alphanohtml');
 $action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
 
 $socid = GETPOST('socid', 'int');
-$label = GETPOST('label');
-$description = GETPOST('description');
-$color = GETPOST('color', 'alpha');
+$label = GETPOST('label', 'alphanohtml');
+$description = GETPOST('description', 'restricthtml');
+$color = preg_replace('/[^0-9a-f#]/i', '', GETPOST('color', 'alphanohtml'));
 $visible = GETPOST('visible');
 $parent = GETPOST('parent');
 
@@ -90,8 +90,7 @@ if ($action == 'update' && $user->rights->categorie->creer)
 
 	if ($parent != "-1")
 		$object->fk_parent = $parent;
-	else
-		$object->fk_parent = "";
+	else $object->fk_parent = "";
 
 
 	if (empty($object->label))
@@ -109,14 +108,10 @@ if ($action == 'update' && $user->rights->categorie->creer)
 		{
 			header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index db6f5a2eec4..35420759ded 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -39,6 +39,7 @@ if (!$user->rights->categorie->lire) accessforbidden();
 $id = GETPOST('id', 'int');
 $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
 $catname = GETPOST('catname', 'alpha');
+$nosearch = GETPOST('nosearch', 'int');
 
 $categstatic = new Categorie($db);
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
@@ -50,83 +51,85 @@ if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backwar
 
 $form = new Form($db);
 
+$moreparam = ($nosearch ? '&nosearch=1' : '');
+
 $typetext = $type;
 if ($type == Categorie::TYPE_ACCOUNT) 			$title = $langs->trans('AccountsCategoriesArea');
 elseif ($type == Categorie::TYPE_WAREHOUSE) 	$title = $langs->trans('StocksCategoriesArea');
 elseif ($type == Categorie::TYPE_ACTIONCOMM)	$title = $langs->trans('ActionCommCategoriesArea');
 elseif ($type == Categorie::TYPE_WEBSITE_PAGE)	$title = $langs->trans('WebsitePagesCategoriesArea');
-else 											$title = $langs->trans(ucfirst($type).'sCategoriesArea');
+else {
+	$title = $langs->trans(ucfirst($type).'sCategoriesArea');
+}
 
 $arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
 
 llxHeader('', $title, '', '', 0, 0, $arrayofjs, $arrayofcss);
 
-
 $newcardbutton = '';
 if (!empty($user->rights->categorie->creer)) {
-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewCategory'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/categories/card.php?action=create&type='.$type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewCategory'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/categories/card.php?action=create&type='.$type.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam).$moreparam);
 }
 
 print load_fiche_titre($title, $newcardbutton, 'object_category');
 
-print '<div class="fichecenter"><div class="fichethirdleft">';
+// Search categories
+if (empty($nosearch)) {
+	print '<div class="fichecenter"><div class="fichehalfleft">';
 
 
-/*
- * Zone recherche produit/service
- */
-print '<form method="post" action="index.php?type='.$type.'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<form method="post" action="index.php?type='.$type.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="nosearch" value="'.$nosearch.'">';
 
 
-print '<table class="noborder nohover centpercent">';
-print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans("Search").'</td>';
-print '</tr>';
-print '<tr class="oddeven nohover"><td>';
-print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
-print '</table></form>';
+	print '<table class="noborder nohover centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="3">'.$langs->trans("Search").'</td>';
+	print '</tr>';
+	print '<tr class="oddeven nohover"><td>';
+	print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
+	print '</table></form>';
 
 
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright">';
 
 
-/*
- * Categories found
- */
-if ($catname || $id > 0)
-{
-	$cats = $categstatic->rechercher($id, $catname, $typetext);
-
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("FoundCats").'</td></tr>';
-
-	foreach ($cats as $cat)
+	/*
+	 * Categories found
+	 */
+	if ($catname || $id > 0)
 	{
-		print "\t".'<tr class="oddeven">'."\n";
-		print "\t\t<td>";
-		$categstatic->id = $cat->id;
-		$categstatic->ref = $cat->label;
-		$categstatic->label = $cat->label;
-		$categstatic->type = $cat->type;
-		$categstatic->color = $cat->color;
-		print '<span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>';
-		print $categstatic->getNomUrl(1, '');
-		print '</span>';
-		print "</td>\n";
-		print "\t\t<td>";
-		print dolGetFirstLineOfText($cat->description);
-		print "</td>\n";
-		print "\t</tr>\n";
-	}
-	print "</table>";
+		$cats = $categstatic->rechercher($id, $catname, $typetext);
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("FoundCats").'</td></tr>';
+
+		foreach ($cats as $cat)
+		{
+			print "\t".'<tr class="oddeven">'."\n";
+			print "\t\t<td>";
+			$categstatic->id = $cat->id;
+			$categstatic->ref = $cat->label;
+			$categstatic->label = $cat->label;
+			$categstatic->type = $cat->type;
+			$categstatic->color = $cat->color;
+			print '<span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>';
+			print $categstatic->getNomUrl(1, '');
+			print '</span>';
+			print "</td>\n";
+			print "\t\t<td>";
+			print dolGetFirstLineOfText($cat->description);
+			print "</td>\n";
+			print "\t</tr>\n";
+		}
+		print "</table>";
+	} else print '&nbsp;';
+
+	print '</div></div>';
 }
-else print '&nbsp;';
-
-
-print '</div></div></div>';
 
 print '<div class="fichecenter"><br>';
 
@@ -155,7 +158,7 @@ foreach ($fulltree as $key => $val)
 	$categstatic->ref = $val['label'];
 	$categstatic->color = $val['color'];
 	$categstatic->type = $type;
-	$li = $categstatic->getNomUrl(1, '', 60);
+	$li = $categstatic->getNomUrl(1, '', 60, $moreparam.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam));
 	$desc = dol_htmlcleanlastbr($val['description']);
 
 	$counter = '';
@@ -171,7 +174,7 @@ foreach ($fulltree as $key => $val)
 	'rowid'=>$val['rowid'],
 	'fk_menu'=>$val['fk_parent'],
 	'entry'=>'<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>'.$li.'</span></td>'.$counter.
-		'<td class="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'">'.img_view().'</a></td></tr></table>'
+		'<td class="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.$moreparam.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam).'">'.img_view().'</a></td></tr></table>'
 	);
 }
 
@@ -193,9 +196,7 @@ if ($nbofentries > 0)
 	print '<tr class="pair"><td colspan="3">';
 	tree_recur($data, $data[0], 0);
 	print '</td></tr>';
-}
-else
-{
+} else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 6b20105f797..866a98fd816 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -44,8 +44,8 @@ $confirm = GETPOST('confirm');
 
 if ($id == '' && $label == '')
 {
-    dol_print_error('', 'Missing parameter id');
-    exit();
+	dol_print_error('', 'Missing parameter id');
+	exit();
 }
 
 // Security check
@@ -70,34 +70,34 @@ if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backwar
 
 if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && $_POST["sendit"] && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    if ($object->id) {
-        $file = $_FILES['userfile'];
-        if (is_array($file['name']) && count($file['name']) > 0)
-        {
-            foreach ($file['name'] as $i => $name)
-            {
-                if (empty($file['tmp_name'][$i]) || intval($conf->global->MAIN_UPLOAD_DOC) * 1000 <= filesize($file['tmp_name'][$i]))
-                {
-                    setEventMessage($file['name'][$i].' : '.$langs->trans(empty($file['tmp_name'][$i]) ? 'ErrorFailedToSaveFile' : 'MaxSizeForUploadedFiles'));
-                    unset($file['name'][$i], $file['type'][$i], $file['tmp_name'][$i], $file['error'][$i], $file['size'][$i]);
-                }
-            }
-        }
+	if ($object->id) {
+		$file = $_FILES['userfile'];
+		if (is_array($file['name']) && count($file['name']) > 0)
+		{
+			foreach ($file['name'] as $i => $name)
+			{
+				if (empty($file['tmp_name'][$i]) || intval($conf->global->MAIN_UPLOAD_DOC) * 1000 <= filesize($file['tmp_name'][$i]))
+				{
+					setEventMessage($file['name'][$i].' : '.$langs->trans(empty($file['tmp_name'][$i]) ? 'ErrorFailedToSaveFile' : 'MaxSizeForUploadedFiles'));
+					unset($file['name'][$i], $file['type'][$i], $file['tmp_name'][$i], $file['error'][$i], $file['size'][$i]);
+				}
+			}
+		}
 
-        if (!empty($file['tmp_name'])) {
-            $object->add_photo($upload_dir, $file);
-        }
-    }
+		if (!empty($file['tmp_name'])) {
+			$object->add_photo($upload_dir, $file);
+		}
+	}
 }
 
 if ($action == 'confirm_delete' && $_GET["file"] && $confirm == 'yes' && $user->rights->categorie->creer)
 {
-    $object->delete_photo($upload_dir."/".$_GET["file"]);
+	$object->delete_photo($upload_dir."/".$_GET["file"]);
 }
 
 if ($action == 'addthumb' && $_GET["file"])
 {
-    $object->addThumbs($upload_dir."/".$_GET["file"]);
+	$object->addThumbs($upload_dir."/".$_GET["file"]);
 }
 
 
@@ -126,7 +126,7 @@ if ($object->id)
 	$ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 	foreach ($ways as $way)
 	{
-	    $morehtmlref .= $way."<br>\n";
+		$morehtmlref .= $way."<br>\n";
 	}
 	$morehtmlref .= '</div>';
 
@@ -137,7 +137,7 @@ if ($object->id)
 	*/
 	if ($action == 'delete')
 	{
-	    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
 	}
 
 	print '<br>';
@@ -159,7 +159,7 @@ if ($object->id)
 	print '</td></tr>';
 
 	print "</table>\n";
-    print '</div>';
+	print '</div>';
 
 	dol_fiche_end();
 
@@ -179,9 +179,7 @@ if ($object->id)
 		{
 			print '<a class="butAction hideonsmartphone" href="'.$_SERVER['PHP_SELF'].'?action=ajout_photo&amp;id='.$object->id.'&amp;type='.$type.'">';
 			print $langs->trans("AddPhoto").'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip hideonsmartphone" href="#">';
 			print $langs->trans("AddPhoto").'</a>';
 		}
@@ -215,64 +213,62 @@ if ($object->id)
 
 		if (is_array($listofphoto) && count($listofphoto))
 		{
-    		print '<br>';
-            print '<table width="100%" valign="top" align="center">';
+			print '<br>';
+			print '<table width="100%" valign="top" align="center">';
 
-    		foreach ($listofphoto as $key => $obj)
-    		{
-    			$nbphoto++;
+			foreach ($listofphoto as $key => $obj)
+			{
+				$nbphoto++;
 
-    			if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
-    			if ($nbbyrow) print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
+				if ($nbbyrow) print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
 
-    			print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Taille origine" target="_blank">';
+				print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Taille origine" target="_blank">';
 
-    			// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
-    			if ($obj['photo_vignette'])
-    			{
-    				$filename = $obj['photo_vignette'];
-    			}
-    			else
-    			{
-    				$filename = $obj['photo'];
-    			}
+				// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
+				if ($obj['photo_vignette'])
+				{
+					$filename = $obj['photo_vignette'];
+				} else {
+					$filename = $obj['photo'];
+				}
 
-    			// Nom affiche
-    			$viewfilename = $obj['photo'];
+				// Nom affiche
+				$viewfilename = $obj['photo'];
 
-    			// Taille de l'image
-    			$object->get_image_size($dir.$filename);
-    			$imgWidth = ($object->imgWidth < $maxWidth) ? $object->imgWidth : $maxWidth;
-    			$imgHeight = ($object->imgHeight < $maxHeight) ? $object->imgHeight : $maxHeight;
+				// Taille de l'image
+				$object->get_image_size($dir.$filename);
+				$imgWidth = ($object->imgWidth < $maxWidth) ? $object->imgWidth : $maxWidth;
+				$imgHeight = ($object->imgHeight < $maxHeight) ? $object->imgHeight : $maxHeight;
 
-    			print '<img border="0" width="'.$imgWidth.'" height="'.$imgHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename).'">';
+				print '<img border="0" width="'.$imgWidth.'" height="'.$imgHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename).'">';
 
-    			print '</a>';
-    			print '<br>'.$viewfilename;
-    			print '<br>';
+				print '</a>';
+				print '<br>'.$viewfilename;
+				print '<br>';
 
-    			// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
-    			if (!$obj['photo_vignette'] && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $obj['photo']) && ($object->imgWidth > $maxWidth || $object->imgHeight > $maxHeight))
-    			{
-    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addthumb&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
-    			}
-    			if ($user->rights->categorie->creer)
-    			{
-    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">';
-    				print img_delete().'</a>';
-    			}
-    			if ($nbbyrow) print '</td>';
-    			if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) print '</tr>';
-    		}
+				// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
+				if (!$obj['photo_vignette'] && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $obj['photo']) && ($object->imgWidth > $maxWidth || $object->imgHeight > $maxHeight))
+				{
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addthumb&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
+				}
+				if ($user->rights->categorie->creer)
+				{
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">';
+					print img_delete().'</a>';
+				}
+				if ($nbbyrow) print '</td>';
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) print '</tr>';
+			}
 
-    		// Ferme tableau
-    		while ($nbphoto % $nbbyrow)
-    		{
-    			print '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
-    			$nbphoto++;
-    		}
+			// Ferme tableau
+			while ($nbphoto % $nbbyrow)
+			{
+				print '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
+				$nbphoto++;
+			}
 
-    		print '</table>';
+			print '</table>';
 		}
 
 		if ($nbphoto < 1)
@@ -280,10 +276,8 @@ if ($object->id)
 			print '<div class="opacitymedium">'.$langs->trans("NoPhotoYet")."</div>";
 		}
 	}
-}
-else
-{
-    print $langs->trans("ErrorUnknown");
+} else {
+	print $langs->trans("ErrorUnknown");
 }
 
 // End of page
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index b06a24c995f..f4e073c4e1c 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('categories', 'languages'));
 
 $id     = GETPOST('id', 'int');
 $label  = GETPOST('label', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $type   = GETPOST('type', 'aZ09');
 
@@ -83,43 +83,43 @@ $cancel != $langs->trans("Cancel") &&
 	$current_lang = $langs->getDefaultLang();
 
 	// check parameters
-    $forcelangprod = GETPOST('forcelangprod', 'alpha');
-    $libelle = GETPOST('libelle', 'alpha');
-    $desc = GETPOST('desc', 'none');
+	$forcelangprod = GETPOST('forcelangprod', 'alpha');
+	$libelle = GETPOST('libelle', 'alpha');
+	$desc = GETPOST('desc', 'restricthtml');
 
-    if (empty($forcelangprod)) {
-        $error++;
-        $object->errors[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Translation'));
-    }
+	if (empty($forcelangprod)) {
+		$error++;
+		$object->errors[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Translation'));
+	}
 
-    if (!$error) {
-        if (empty($libelle)) {
-            $error++;
-            $object->errors[] = $langs->trans('Language_'.$forcelangprod).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
-        }
+	if (!$error) {
+		if (empty($libelle)) {
+			$error++;
+			$object->errors[] = $langs->trans('Language_'.$forcelangprod).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
+		}
 
-        if (!$error) {
-            // update de l'objet
-            if ($forcelangprod == $current_lang) {
-                $object->label = $libelle;
-                $object->description = dol_htmlcleanlastbr($desc);
-            } else {
-                $object->multilangs[$forcelangprod]["label"] = $libelle;
-                $object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr($desc);
-            }
+		if (!$error) {
+			// update de l'objet
+			if ($forcelangprod == $current_lang) {
+				$object->label = $libelle;
+				$object->description = dol_htmlcleanlastbr($desc);
+			} else {
+				$object->multilangs[$forcelangprod]["label"] = $libelle;
+				$object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr($desc);
+			}
 
-            // sauvegarde en base
-            $res = $object->setMultiLangs($user);
-            if ($res < 0) $error++;
-        }
-    }
+			// sauvegarde en base
+			$res = $object->setMultiLangs($user);
+			if ($res < 0) $error++;
+		}
+	}
 
-    if ($error) {
-        $action = 'add';
-        setEventMessages($object->error, $object->errors, 'errors');
-    } else {
-        $action = '';
-    }
+	if ($error) {
+		$action = 'add';
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		$action = '';
+	}
 }
 
 // Validation de l'edition
@@ -132,13 +132,13 @@ $cancel != $langs->trans("Cancel") &&
 
 	foreach ($object->multilangs as $key => $value) // enregistrement des nouvelles valeurs dans l'objet
 	{
-        $libelle = GETPOST('libelle-'.$key, 'alpha');
-        $desc = GETPOST('desc-'.$key);
+		$libelle = GETPOST('libelle-'.$key, 'alpha');
+		$desc = GETPOST('desc-'.$key);
 
-        if (empty($libelle)) {
-            $error++;
-            $object->errors[] = $langs->trans('Language_'.$key).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
-        }
+		if (empty($libelle)) {
+			$error++;
+			$object->errors[] = $langs->trans('Language_'.$key).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
+		}
 
 		if ($key == $current_lang) {
 			$object->label       = $libelle;
@@ -149,17 +149,17 @@ $cancel != $langs->trans("Cancel") &&
 		}
 	}
 
-    if (!$error) {
-        $res = $object->setMultiLangs($user);
-        if ($res < 0)   $error++;
-    }
+	if (!$error) {
+		$res = $object->setMultiLangs($user);
+		if ($res < 0)   $error++;
+	}
 
-    if ($error) {
-        $action = 'edit';
-        setEventMessages($object->error, $object->errors, 'errors');
-    } else {
-        $action = '';
-    }
+	if ($error) {
+		$action = 'edit';
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		$action = '';
+	}
 }
 
 
@@ -181,10 +181,10 @@ $head = categories_prepare_head($object, $type);
 $cnt_trans = 0;
 if (!empty($object->multilangs))
 {
-    foreach ($object->multilangs as $key => $value)
-    {
-        $cnt_trans++;
-    }
+	foreach ($object->multilangs as $key => $value)
+	{
+		$cnt_trans++;
+	}
 }
 
 dol_fiche_head($head, 'translation', $langs->trans($title), -1, 'category');
@@ -195,7 +195,7 @@ $object->ref = $object->label;
 $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 foreach ($ways as $way) {
-    $morehtmlref .= $way."<br>\n";
+	$morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
 
@@ -238,11 +238,11 @@ print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '')
 {
-    if ($user->rights->produit->creer || $user->rights->service->creer)
-    {
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
-        if ($cnt_trans > 0) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
-    }
+	if ($user->rights->produit->creer || $user->rights->service->creer)
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
+		if ($cnt_trans > 0) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
+	}
 }
 
 print "\n</div>\n";
@@ -258,20 +258,20 @@ if ($action == 'edit')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="vedit">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	if (!empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
-		    print "<br><b><u>".$langs->trans('Language_'.$key)." :</u></b><br>";
+			print "<br><b><u>".$langs->trans('Language_'.$key)." :</u></b><br>";
 			print '<table class="border centpercent">';
 
 			// Label
-            $libelle = (GETPOST('libelle-'.$key, 'alpha') ? GETPOST('libelle-'.$key, 'alpha') : $object->multilangs[$key]['label']);
+			$libelle = (GETPOST('libelle-'.$key, 'alpha') ? GETPOST('libelle-'.$key, 'alpha') : $object->multilangs[$key]['label']);
 			print '<tr><td class="titlefield fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.$libelle.'"></td></tr>';
 			// Desc
-            $desc = (GETPOST('desc-'.$key) ? GETPOST('desc-'.$key) : $object->multilangs[$key]['description']);
+			$desc = (GETPOST('desc-'.$key) ? GETPOST('desc-'.$key) : $object->multilangs[$key]['description']);
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
 			$doleditor = new DolEditor("desc-$key", $desc, '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
 			$doleditor->Create();
@@ -291,23 +291,22 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($action != 'add')
+} elseif ($action != 'add')
 {
-    if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
+	if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
 
-    if (!empty($object->multilangs))
+	if (!empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
-		    $s = picto_from_langcode($key);
+			$s = picto_from_langcode($key);
 			print '<table class="border centpercent">';
-			print '<tr class="liste_titre"><td colspan="2">'.($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'&type='.$type.'">'.img_delete('', '').'</a></td></tr>';
+			print '<tr class="liste_titre"><td colspan="2">'.($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'&type='.$type.'">'.img_delete('', '').'</a></td></tr>';
 			print '<tr><td class="titlefield">'.$langs->trans('Label').'</td><td>'.$object->multilangs[$key]["label"].'</td></tr>';
 			print '<tr><td>'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
 			if (!empty($conf->global->CATEGORY_USE_OTHER_FIELD_IN_TRANSLATION))
 			{
-                print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
+				print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
 		}
@@ -330,16 +329,16 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="vadd">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	print '<table class="border centpercent">';
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans('Translation').'</td><td>';
-    print $formadmin->select_language(GETPOST('forcelangprod', 'alpha'), 'forcelangprod', 0, $object->multilangs);
+	print $formadmin->select_language(GETPOST('forcelangprod', 'alpha'), 'forcelangprod', 0, $object->multilangs);
 	print '</td></tr>';
 	print '<tr><td class="fieldrequired">'.$langs->trans('Label').'</td>';
 	print '<td><input name="libelle" class="minwidth200 maxwidth300" value="'.GETPOST('libelle', 'alpha').'"></td></tr>';
 	print '<tr><td>'.$langs->trans('Description').'</td><td>';
-	$doleditor = new DolEditor('desc', GETPOST('desc', 'none'), '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+	$doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 958b77e42e8..30b706a4b3a 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -47,14 +47,15 @@ $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk
 $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
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'categorylist'; // 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')
 
+
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -103,47 +104,40 @@ if ($id > 0 && $removeelem > 0)
 		$tmpobject = new Product($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'product';
-	}
-	elseif ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
+	} elseif ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
 	{
 		$tmpobject = new Societe($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'supplier';
-	}
-	elseif ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer)
+	} elseif ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer)
 	{
 		$tmpobject = new Societe($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'customer';
-	}
-	elseif ($type == Categorie::TYPE_MEMBER && $user->rights->adherent->creer)
+	} elseif ($type == Categorie::TYPE_MEMBER && $user->rights->adherent->creer)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$tmpobject = new Adherent($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'member';
-	}
-	elseif ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) {
+	} elseif ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$tmpobject = new Contact($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'contact';
-    }
-    elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
+    } 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)
+    } 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_USER && $user->rights->user->user->creer)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 		$tmpobject = new User($db);
@@ -161,9 +155,7 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 	{
 		header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -180,15 +172,11 @@ if ($type == Categorie::TYPE_PRODUCT && $elemid && $action == 'addintocategory'
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("WasAddedSuccessfully", $newobject->ref), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			setEventMessages($langs->trans("ObjectAlreadyLinkedToCategory"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -278,7 +266,7 @@ if ($user->rights->categorie->creer)
 
 if ($user->rights->categorie->supprimer)
 {
-	print "<a class='butActionDelete' href='".DOL_URL_ROOT."/categories/viewcat.php?action=delete&amp;id=".$object->id."&amp;type=".$type."'>".$langs->trans("Delete")."</a>";
+	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 "</div>";
@@ -329,16 +317,13 @@ print '</tr>';
 $cats = $object->get_filles();
 if ($cats < 0)
 {
-	dol_print_error($db, $cats->error, $cats->errors);
-}
-elseif (count($cats) < 1)
+	dol_print_error($db, $object->error, $object->errors);
+} elseif (count($cats) < 1)
 {
 	print '<tr class="oddeven">';
 	print '<td colspan="3" class="opacitymedium">'.$langs->trans("NoSubCat").'</td>';
 	print '</tr>';
-}
-else
-{
+} else {
 	$categstatic = new Categorie($db);
 
 	$fulltree = $categstatic->get_full_arbo($type, $object->id, 1);
@@ -407,9 +392,7 @@ else
 
 		print '</td>';
 		print '</tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr class="pair">';
 		print '<td colspan="3">';
 		print '<table class="nobordernopadding">';
@@ -449,10 +432,8 @@ if ($type == Categorie::TYPE_PRODUCT)
 	$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
 	if ($prods < 0)
 	{
-		dol_print_error($db, $prods->error, $prods->errors);
-	}
-	else
-	{
+		dol_print_error($db, $object->error, $object->errors);
+	} else {
 		// Form to add record into a category
 		$showclassifyform = 1;
 		if ($showclassifyform)
@@ -514,9 +495,7 @@ if ($type == Categorie::TYPE_PRODUCT)
 				print '</td>';
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -532,10 +511,8 @@ if ($type == Categorie::TYPE_SUPPLIER)
 	$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
 	if ($socs < 0)
 	{
-		dol_print_error($db, $socs->error, $socs->errors);
-	}
-	else
-	{
+		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.'">';
@@ -575,9 +552,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
 
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -593,10 +568,8 @@ if ($type == Categorie::TYPE_CUSTOMER)
 	$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
 	if ($socs < 0)
 	{
-		dol_print_error($db, $socs->error, $socs->errors);
-	}
-	else
-	{
+		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.'">';
@@ -635,9 +608,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
 				print '</td>';
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -656,10 +627,8 @@ if ($type == Categorie::TYPE_MEMBER)
 	$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
 	if ($prods < 0)
 	{
-		dol_print_error($db, $prods->error, $prods->errors);
-	}
-	else
-	{
+		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.'">';
@@ -700,9 +669,7 @@ if ($type == Categorie::TYPE_MEMBER)
 				}
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -719,10 +686,8 @@ if ($type == Categorie::TYPE_CONTACT)
 	$contacts = $object->getObjectsInCateg($type, 0, $limit, $offset);
 	if ($contacts < 0)
 	{
-		dol_print_error($db, $contacts->error, $contacts->errors);
-	}
-	else
-	{
+		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.'">';
@@ -764,9 +729,7 @@ if ($type == Categorie::TYPE_CONTACT)
 				print '</td>';
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -785,10 +748,8 @@ if ($type == Categorie::TYPE_ACCOUNT)
     $accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
     if ($accounts < 0)
     {
-        dol_print_error($db, $accounts->error, $accounts->errors);
-    }
-    else
-    {
+        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.'">';
@@ -828,9 +789,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
                 }
                 print "</tr>\n";
             }
-        }
-        else
-        {
+        } else {
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
         }
         print "</table>\n";
@@ -850,9 +809,7 @@ if ($type == Categorie::TYPE_PROJECT)
 	if ($objects < 0)
 	{
 		dol_print_error($db, $object->error, $object->errors);
-	}
-	else
-	{
+	} 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.'">';
@@ -893,9 +850,7 @@ if ($type == Categorie::TYPE_PROJECT)
 				}
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -913,9 +868,7 @@ if ($type == Categorie::TYPE_USER)
 	if ($users < 0)
 	{
 		dol_print_error($db, $object->error, $object->errors);
-	}
-	else
-	{
+	} 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.'">';
@@ -924,12 +877,14 @@ if ($type == Categorie::TYPE_USER)
 		print '<input type="hidden" name="action" value="list">';
 
 		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = '';
 
-		print_barre_liste($langs->trans("Users"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'user', 0, $newcardbutton, '', $limit);
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type;
+		$num = count($users);
+
+		print_barre_liste($langs->trans("Users"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, '', 'user', 0, '', '', $limit);
 
 		print "<table class='noborder' width='100%'>\n";
-		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Users").' <span class="badge">'.count($users).'</span></td></tr>'."\n";
+		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Users").' <span class="badge">'.$num.'</span></td></tr>'."\n";
 
 		if (count($users) > 0)
 		{
@@ -953,9 +908,7 @@ if ($type == Categorie::TYPE_USER)
 				}
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
@@ -965,7 +918,7 @@ if ($type == Categorie::TYPE_USER)
 }
 
 
-// List of Project
+// List of warehouses
 if ($type == Categorie::TYPE_WAREHOUSE)
 {
 	$permission = $user->rights->stock->creer;
@@ -976,9 +929,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 	if ($objects < 0)
 	{
 		dol_print_error($db, $object->error, $object->errors);
-	}
-	else
-	{
+	} 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.'">';
@@ -1019,9 +970,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 				}
 				print "</tr>\n";
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoItems").'</td></tr>';
 		}
 		print "</table>\n";
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index c570e12ba31..7353ea881ee 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -39,7 +39,7 @@ $error = 0;
 $website = GETPOST('website', 'alpha');
 $page = GETPOST('page', 'alpha');
 $pageid = GETPOST('pageid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if (GETPOST('delete')) { $action = 'delete'; }
 if (GETPOST('preview')) $action = 'preview';
@@ -94,9 +94,7 @@ if ($action == 'add')
 		$db->commit();
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 
@@ -129,14 +127,10 @@ if ($action == 'delete')
 
 			header("Location: ".$_SERVER["PHP_SELF"].'?website='.$website);
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 129696a60d9..3c8ed94c2bf 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -37,6 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncommreminder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -47,9 +48,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("companies", "other", "commercial", "bills", "orders", "agenda"));
+$langs->loadLangs(array("companies", "other", "commercial", "bills", "orders", "agenda", "mails"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 $socpeopleassigned = GETPOST('socpeopleassigned', 'array');
@@ -57,15 +58,23 @@ $origin = GETPOST('origin', 'alpha');
 $originid = GETPOST('originid', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 
-$fulldayevent = GETPOST('fullday');
+$fulldayevent = GETPOST('fullday', 'alpha');
 
-$aphour = GETPOST('aphour');
-$apmin = GETPOST('apmin');
-$p2hour = GETPOST('p2hour');
-$p2min = GETPOST('p2min');
+$aphour = GETPOST('aphour', 'int');
+$apmin = GETPOST('apmin', 'int');
+$p2hour = GETPOST('p2hour', 'int');
+$p2min = GETPOST('p2min', 'int');
 
-$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth"), GETPOST("apday"), GETPOST("apyear"));
-$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month"), GETPOST("p2day"), GETPOST("p2year"));
+$addreminder = GETPOST('addreminder', 'alpha');
+$offsetvalue = GETPOST('offsetvalue', 'int');
+$offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
+$remindertype = GETPOST('selectremindertype', 'aZ09');
+$modelmail = GETPOST('actioncommsendmodel_mail', 'int');
+
+//var_dump($_POST); exit;
+
+$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
+$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
@@ -111,6 +120,12 @@ $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');
 
+$TRemindTypes = array();
+if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) $TRemindTypes['email'] = $langs->trans('EMail');
+if (!empty($conf->global->AGENDA_REMINDER_BROWSER)) $TRemindTypes['browser'] = $langs->trans('BrowserPush');
+
+$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
+
 
 /*
  * Actions
@@ -173,14 +188,12 @@ if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes')
 	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		if ($id > 0) {
 			//$object->fetch($id);
             if (!empty($object->socpeopleassigned)) {
                 reset($object->socpeopleassigned);
-                $object->contactid = key($object->socpeopleassigned);
+                $object->contact_id = key($object->socpeopleassigned);
             }
 			$result = $object->createFromClone($user, GETPOST('socid', 'int'));
 			if ($result > 0) {
@@ -243,19 +256,17 @@ if (empty($reshook) && $action == 'add')
 		$error++; $donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-	}
-	else
-	{
+	} else {
 		$object->type_code = GETPOST('actioncode', 'aZ09');
 	}
 
 	if (!$error)
 	{
 		// Initialisation objet actioncomm
-		$object->priority = GETPOST("priority") ?GETPOST("priority") : 0;
+		$object->priority = GETPOSTISSET("priority") ? GETPOST("priority", "int") : 0;
 		$object->fulldayevent = (!empty($fulldayevent) ? 1 : 0);
-		$object->location = GETPOST("location");
-		$object->label = trim(GETPOST('label'));
+		$object->location = GETPOST("location", 'alphanohtml');
+		$object->label = GETPOST('label', 'alphanohtml');
 		$object->fk_element = GETPOST("fk_element", 'int');
 		$object->elementtype = GETPOST("elementtype", 'alpha');
 		if (!GETPOST('label'))
@@ -263,14 +274,11 @@ if (empty($reshook) && $action == 'add')
 			if (GETPOST('actioncode', 'aZ09') == 'AC_RDV' && $contact->getFullName($langs))
 			{
 				$object->label = $langs->transnoentitiesnoconv("TaskRDVWith", $contact->getFullName($langs));
-			}
-			else
-			{
+			} else {
 				if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
 				{
 					$object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
-				}
-				else {
+				} else {
 					$cactioncomm->fetch($object->type_code);
 					$object->label = $cactioncomm->label;
 				}
@@ -318,7 +326,7 @@ if (empty($reshook) && $action == 'add')
 		if (GETPOST("doneby") > 0) $object->userdoneid = GETPOST("doneby", "int");
 	}
 
-	$object->note_private = trim(GETPOST("note", "none"));
+	$object->note_private = trim(GETPOST("note", "restricthtml"));
 
 	if (isset($_POST["contactid"])) $object->contact = $contact;
 
@@ -358,7 +366,7 @@ if (empty($reshook) && $action == 'add')
 	if (!empty($object->socpeopleassigned))
 	{
 		reset($object->socpeopleassigned);
-		$object->contactid = key($object->socpeopleassigned);
+		$object->contact_id = key($object->socpeopleassigned);
 	}
 
 	// Fill array 'array_options' with data from add form
@@ -385,24 +393,56 @@ if (empty($reshook) && $action == 'add')
 				$moreparam = '';
 				if ($user->id != $object->userownerid) $moreparam = "filtert=-1"; // We force to remove filter so created record is visible when going back to per user view.
 
-				$db->commit();
+                //Create reminders
+                if ($addreminder == 'on'){
+                    $actionCommReminder = new ActionCommReminder($db);
+
+                    $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;
+
+                    // 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 error
+							$db->rollback();
+							$langs->load("errors");
+							$error = $langs->trans('ErrorReminderActionCommCreation');
+							setEventMessages($error, null, 'errors');
+							$action = 'create'; $donotclearsession = 1;
+							break;
+						}
+					}
+                }
+
+                if ($error) {
+                	$db->rollback();
+                } else {
+					$db->commit();
+                }
+
 				if (!empty($backtopage))
 				{
 					dol_syslog("Back to ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
 					header("Location: ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
-				}
-				elseif ($idaction)
+				} elseif ($idaction)
 				{
 					header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.($moreparam ? '&'.$moreparam : ''));
-				}
-				else
-				{
+				} else {
 					header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam ? '?'.$moreparam : ''));
 				}
 				exit;
-			}
-			else
-			{
+			} else {
 				// If error
 				$db->rollback();
 				$langs->load("errors");
@@ -410,9 +450,7 @@ if (empty($reshook) && $action == 'add')
 				setEventMessages($error, null, 'errors');
 				$action = 'create'; $donotclearsession = 1;
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create'; $donotclearsession = 1;
@@ -453,20 +491,20 @@ if (empty($reshook) && $action == 'update')
 		$object->datep       = $datep;
 		$object->datef       = $datef;
 		$object->percentage  = $percentage;
-		$object->priority    = GETPOST("priority", "alphanohtml");
+		$object->priority    = GETPOST("priority", "int");
         $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->contactid   = GETPOST("contactid", 'int');
-        if (empty($object->contactid) && !empty($object->socpeopleassigned)) {
+		$object->contact_id   = GETPOST("contactid", 'int');
+        if (empty($object->contact_id) && !empty($object->socpeopleassigned)) {
             reset($object->socpeopleassigned);
-            $object->contactid = key($object->socpeopleassigned);
+            $object->contact_id = key($object->socpeopleassigned);
         }
 		$object->fk_project  = GETPOST("projectid", 'int');
-		$object->note_private = trim(GETPOST("note", "none"));
+		$object->note_private = trim(GETPOST("note", "restricthtml"));
 		$object->fk_element	 = GETPOST("fk_element", "int");
 		$object->elementtype = GETPOST("elementtype", "alphanohtml");
 
@@ -489,8 +527,7 @@ if (empty($reshook) && $action == 'update')
 			{
 				if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']] = $val;
 			}
-		}
-		else {
+		} else {
 			$assignedtouser = (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : 0);
 			if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>($user->id == $assignedtouser ? $transparency : '')); // Owner first
 		}
@@ -517,9 +554,7 @@ if (empty($reshook) && $action == 'update')
 			$error++; $donotclearsession = 1;
 			$action = 'edit';
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-		}
-		else
-		{
+		} else {
 			$result = $cactioncomm->fetch(GETPOST('actioncode', 'aZ09'));
 		}
 		if (empty($object->userownerid))
@@ -604,12 +639,52 @@ if (empty($reshook) && $action == 'update')
 				$categories = GETPOST('categories', 'array');
 				$object->setCategories($categories);
 
+				$object->loadReminders();
+				if (!empty($object->reminders) && $object->datep > dol_now())
+				{
+					foreach ($object->reminders as $reminder)
+					{
+						$reminder->delete($user);
+					}
+					$object->reminders = array();
+				}
+
+				//Create reminders
+				if ($addreminder == 'on' && $object->datep > dol_now()){
+					$actionCommReminder = new ActionCommReminder($db);
+
+					$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;
+
+					// 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 error
+							$langs->load("errors");
+							$error = $langs->trans('ErrorReminderActionCommCreation');
+							setEventMessages($error, null, 'errors');
+							$action = 'create'; $donotclearsession = 1;
+							break;
+						}
+					}
+				}
+
 				unset($_SESSION['assignedtouser']);
 
-				$db->commit();
-			}
-			else
-			{
+				if (!$error) $db->commit();
+				else $db->rollback();
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
@@ -646,9 +721,7 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes
 		{
 			header("Location: index.php");
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -756,9 +829,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate')
     {
         header("Location: ".$backtopage);
         exit;
-    }
-    else
-    {
+    } else {
         $action = '';
     }
 }
@@ -771,6 +842,7 @@ if (empty($reshook)) {
 }
 
 
+
 /*
  * View
  */
@@ -778,6 +850,13 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formproject = new FormProjets($db);
 
+$arrayrecurrulefreq = array(
+	'no'=>$langs->trans("OnceOnly"),
+	'MONTHLY'=>$langs->trans("EveryMonth"),
+	'WEEKLY'=>$langs->trans("EveryWeek"),
+	//'DAYLY'=>$langs->trans("EveryDay")
+);
+
 $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('', $langs->trans("Agenda"), $help_url);
 
@@ -814,7 +893,6 @@ if ($action == 'create')
 							$("#p2").removeAttr("disabled");
 	            		}
 	            	}
-                    setdatefields();
                     $("#fullday").change(function() {
 						console.log("setdatefields");
                         setdatefields();
@@ -828,11 +906,25 @@ if ($action == 'create')
                         {
                             $("#doneby").val(-1);
                         }
-                   });
-                   $("#actioncode").change(function() {
+                    });
+                    $("#actioncode").change(function() {
                         if ($("#actioncode").val() == \'AC_RDV\') $("#dateend").addClass("fieldrequired");
                         else $("#dateend").removeClass("fieldrequired");
-                   });
+                    });
+					$("#aphour,#apmin").change(function() {
+						if ($("#actioncode").val() == \'AC_RDV\') {
+							console.log("Start date was changed, we modify end date "+(parseInt($("#aphour").val()))+" "+$("#apmin").val()+" -> "+("00" + (parseInt($("#aphour").val()) + 1)).substr(-2,2));
+							$("#p2hour").val(("00" + (parseInt($("#aphour").val()) + 1)).substr(-2,2));
+							$("#p2min").val($("#apmin").val());
+							$("#p2day").val($("#apday").val());
+							$("#p2month").val($("#apmonth").val());
+							$("#p2year").val($("#apyear").val());
+							$("#p2").val($("#ap").val());
+						}
+					});
+                    if ($("#actioncode").val() == \'AC_RDV\') $("#dateend").addClass("fieldrequired");
+                    else $("#dateend").removeClass("fieldrequired");
+                    setdatefields();
                })';
         print '</script>'."\n";
     }
@@ -855,8 +947,8 @@ if ($action == 'create')
 	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
 		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
-		$default = (empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT) ? '' : $conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT);
-		$formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ?GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1);
+		$default = (empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT) ? 'AC_RDV' : $conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT);
+		$formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1);
 		print '</td></tr>';
 	}
 
@@ -866,45 +958,56 @@ if ($action == 'create')
     // Full day
     print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
 
-	// Date start
-	$datep = ($datep ? $datep : $object->datep);
-	if (GETPOST('datep', 'int', 1)) $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
-	print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td>';
+    $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
+	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 '</td></tr>';
+    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>';
 
 	// Date end
-	$datef = ($datef ? $datef : $object->datef);
-    if (GETPOST('datef', 'int', 1)) $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
-	if (empty($datef) && !empty($datep) && !empty($conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS))
-	{
-		$datef = dol_time_plus_duree($datep, $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS, 'h');
-	}
-	print '<tr><td><span id="dateend"'.(GETPOST("actioncode", 'aZ09') == 'AC_RDV' ? ' class="fieldrequired"' : '').'>'.$langs->trans("DateActionEnd").'</span></td><td>';
+	/*print '<tr><td>';
+	print '<span id="dateend"'.(GETPOST("actioncode", 'aZ09') == 'AC_RDV' ? ' class="fieldrequired"' : '').'>'.$langs->trans("DateActionEnd").'</span>';
+	print '</td>';
+	print '<td>';
 	if (GETPOST("afaire") == 1) {
         print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend');
     } else {
         print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend');
     }
-	print '</td></tr>';
+	print '</td></tr>';*/
 
     // Dev in progress
 	$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
 	if ($userepeatevent)
 	{
 		// Repeat
-		print '<tr><td>'.$langs->trans("RepeatEvent").'</td><td colspan="3">';
+		print '<tr><td></td><td colspan="3">';
 		print '<input type="hidden" name="recurid" value="'.$object->recurid.'">';
-		$arrayrecurrulefreq = array(
-		'no'=>$langs->trans("No"),
-		'MONTHLY'=>$langs->trans("EveryMonth"),
-		'WEEKLY'=>$langs->trans("EveryWeek"),
-		//'DAYLY'=>$langs->trans("EveryDay")
-		);
 		$selectedrecurrulefreq = 'no';
 		$selectedrecurrulebymonthday = '';
 		$selectedrecurrulebyday = '';
@@ -955,8 +1058,7 @@ if ($action == 'create')
 	$percent = -1;
 	if (isset($_GET['status']) || isset($_POST['status'])) $percent = GETPOST('status');
 	elseif (isset($_GET['percentage']) || isset($_POST['percentage'])) $percent = GETPOST('percentage');
-	else
-	{
+	else {
 		if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent = '0';
 		elseif (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent = 100;
 	}
@@ -966,7 +1068,7 @@ if ($action == 'create')
     // Location
     if (empty($conf->global->AGENDA_DISABLE_LOCATION))
     {
-		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="soixantepercent" value="'.(GETPOST('location') ?GETPOST('location') : $object->location).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="minwidth300" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
     }
 
 	// Assigned to
@@ -978,9 +1080,7 @@ if ($action == 'create')
 		if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
 		$listofuserid[$user->id]['transparency'] = GETPOSTISSET('transparency') ?GETPOST('transparency', 'alpha') : 1; // 1 by default at first init
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	}
-	else
-	{
+	} else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -998,7 +1098,7 @@ if ($action == 'create')
 	}*/
 	print '</td></tr>';
 
-	// Realised by
+	// Done by
 	if (!empty($conf->global->AGENDA_ENABLE_DONEBY))
 	{
 		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
@@ -1032,16 +1132,14 @@ if ($action == 'create')
 			$societe->fetch(GETPOST('socid', 'int'));
 			print $societe->getNomUrl(1);
 			print '<input type="hidden" id="socid" name="socid" value="'.GETPOST('socid', 'int').'">';
-		}
-		else
-		{
+		} else {
 			$events = array();
 			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 			//For external user force the company to user company
 			if (!empty($user->socid)) {
-				print $form->select_company($user->socid, 'socid', '', 1, 1, 0, $events, 0, 'minwidth300');
+				print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company($user->socid, 'socid', '', 1, 1, 0, $events, 0, 'minwidth300');
 			} else {
-				print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth300');
+				print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth300');
 			}
 		}
 		print '</td></tr>';
@@ -1050,7 +1148,7 @@ if ($action == 'create')
 		print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
 		$preselectedids = GETPOST('socpeopleassigned', 'array');
 		if (GETPOST('contactid', 'int')) $preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
-		print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
+		print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
 		print '</td></tr>';
 	}
 
@@ -1062,7 +1160,7 @@ if ($action == 'create')
 		$projectid = GETPOST('projectid', 'int');
 
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td id="project-input-container" >';
-
+		print img_picto('', 'project', 'class="paddingrightonly"');
 		$numproject = $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$societe->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
@@ -1085,7 +1183,7 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Task").'</td><td id="project-task-input-container" >';
-
+		print img_picto('', 'projecttask', 'class="paddingrightonly"');
 		$projectsListId = false;
 		if (!empty($projectid)) { $projectsListId = $projectid; }
 		$tid = GETPOST("projecttaskid") ?GETPOST("projecttaskid") : '';
@@ -1112,14 +1210,16 @@ if ($action == 'create')
 	}
 
 	// Priority
-	print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Priority").'</td><td colspan="3">';
-	print '<input type="text" name="priority" value="'.(GETPOST('priority') ?GETPOST('priority') : ($object->priority ? $object->priority : '')).'" size="5">';
-	print '</td></tr>';
+	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', (GETPOST('note', 'none') ? GETPOST('note', 'none') : $object->note_private), '', 180, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
+    $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>';
 
@@ -1134,12 +1234,77 @@ if ($action == 'create')
 
 	print '</table>';
 
-	dol_fiche_end();
+
+    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 '<hr>';
+        //print load_fiche_titre($langs->trans("AddReminder"), '', '');
+
+        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>';
+
+        //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>';
+
+        //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 "\n".'<script type="text/javascript">';
+        print '$(document).ready(function () {
+	            		$("#addreminder").click(function(){
+	            		    if (this.checked) {
+	            		      $(".reminderparameters").show();
+                            } else {
+                            $(".reminderparameters").hide();
+                            }
+	            		 });
+
+	            		$("#selectremindertype").change(function(){
+	            	        var selected_option = $("#selectremindertype option:selected").val();
+	            		    if(selected_option == "email") {
+	            		        $("#select_actioncommsendmodel_mail").closest("tr").show();
+	            		    } else {
+	            			    $("#select_actioncommsendmodel_mail").closest("tr").hide();
+	            		    };
+	            		});
+                   })';
+        print '</script>'."\n";
+    }
+
+    dol_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Add").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	if (empty($backtopage)) {
+		print '<input type="button" class="button" name="cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	} else {
+		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	}
 	print '</div>';
 
 	print "</form>";
@@ -1182,10 +1347,10 @@ if ($id > 0)
 		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
 		foreach ($socpeopleassigned as $tmpid) $object->socpeopleassigned[$id] = array('id' => $tmpid);
-		$object->contactid   = GETPOST("contactid", 'int');
+		$object->contact_id   = GETPOST("contactid", 'int');
 		$object->fk_project  = GETPOST("projectid", 'int');
 
-		$object_private = GETPOST("note", 'none');
+		$object_private = GETPOST("note", 'restricthtml');
 	}
 
 	if ($result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
@@ -1263,9 +1428,7 @@ if ($id > 0)
 		    if ($object->type_code != 'AC_OTH_AUTO')
 		    {
 		    	$formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ?GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto");
-		    }
-		    else
-		    {
+		    } else {
                 print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">'.$langs->trans("Action".$object->type_code);
 		    }
 			print '</td></tr>';
@@ -1278,7 +1441,7 @@ if ($id > 0)
         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").'</span></td><td colspan="3">';
+		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) {
@@ -1286,9 +1449,7 @@ if ($id > 0)
         } else {
             print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart');
         }
-		print '</td></tr>';
-		// Date end
-		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
+        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) {
@@ -1303,14 +1464,8 @@ if ($id > 0)
 		if ($userepeatevent)
 		{
 			// Repeat
-			print '<tr><td>'.$langs->trans("RepeatEvent").'</td><td colspan="3">';
+			print '<tr><td></td><td colspan="3">';
 			print '<input type="hidden" name="recurid" value="'.$object->recurid.'">';
-			$arrayrecurrulefreq = array(
-				'no'=>$langs->trans("No"),
-				'MONTHLY'=>$langs->trans("EveryMonth"),
-				'WEEKLY'=>$langs->trans("EveryWeek"),
-				//'DAYLY'=>$langs->trans("EveryDay"),
-			);
 			$selectedrecurrulefreq = 'no';
 			$selectedrecurrulebymonthday = '';
 			$selectedrecurrulebyday = '';
@@ -1358,7 +1513,7 @@ if ($id > 0)
 		// Status
 		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
 		$percent = GETPOST("percentage") ? GETPOST("percentage") : $object->percentage;
-		$formactions->form_select_status_action('formaction', $percent, 1);
+		$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 		print '</td></tr>';
 
         // Location
@@ -1395,9 +1550,7 @@ if ($id > 0)
 	    		}
 	    	}
 	    	$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	    }
-	    else
-	    {
+	    } else {
 	    	if (!empty($_SESSION['assignedtouser']))
 	    	{
 	    		$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1445,7 +1598,7 @@ if ($id > 0)
 		print '<br><hr><br>';
 
 
-		print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield centpercent">';
 
 		if ($conf->societe->enabled)
 		{
@@ -1457,14 +1610,14 @@ if ($id > 0)
 			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 			// TODO Refresh also list of project if $conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY not defined with list linked to socid ?
 			// FIXME If we change company, we may get a project that does not match
-			print $form->select_company($object->socid, 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth200');
+			print img_picto('', 'company', 'class="paddingrightonly"').$form->select_company($object->socid, 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth200');
 			print '</div>';
 			print '</td></tr>';
 
 			// related contact
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td><td>';
 			print '<div class="maxwidth200onsmartphone">';
-			print $form->selectcontacts($object->socid, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'quatrevingtpercent', false, 0, 0, array(), 'multiple', 'contactid');
+			print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts($object->socid, array_keys($object->socpeopleassigned), 'socpeopleassigned[]', 1, '', '', 1, 'quatrevingtpercent', false, 0, 0, array(), 'multiple', 'contactid');
 			print '</div>';
 			print '</td>';
 			print '</tr>';
@@ -1476,6 +1629,7 @@ if ($id > 0)
 			$langs->load("projects");
 
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td>';
+			print img_picto('', 'project', 'class="paddingrightonly"');
 			$numprojet = $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $object->fk_project, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500');
 			if ($numprojet == 0)
 			{
@@ -1485,9 +1639,11 @@ if ($id > 0)
 		}
 
 		// Priority
-		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>';
+		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>';
+		}
 
 		// Object linked
 		if (!empty($object->fk_element) && !empty($object->elementtype))
@@ -1520,9 +1676,7 @@ if ($id > 0)
 			    print '<input type="hidden" name="elementtype" value="'.$object->elementtype.'">';
 
 			    print '</td>';
-			}
-			else
-			{
+			} else {
 			    print '<td>';
 			    print dolGetElementUrl($object->fk_element, $object->elementtype, 1);
 			    print '<input type="hidden" name="fk_element" value="'.$object->fk_element.'">';
@@ -1552,6 +1706,86 @@ if ($id > 0)
 
 		print '</table>';
 
+		// Reminders
+		if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
+		{
+			$filteruserid = $user->id;
+			if ($user->rights->agenda->allactions->read) $filteruserid = 0;
+			$object->loadReminders('', $filteruserid, false);
+
+			print '<hr>';
+
+			if (count($object->reminders) > 0) {
+				$checked = 'checked';
+				$keys = array_keys($object->reminders);
+				$firstreminderId = array_shift($keys);
+
+				$actionCommReminder = $object->reminders[$firstreminderId];
+			} else {
+				$checked = '';
+				$actionCommReminder = new ActionCommReminder($db);
+				$actionCommReminder->offsetvalue = 10;
+				$actionCommReminder->offsetunit = 'i';
+				$actionCommReminder->typeremind = 'email';
+			}
+
+			print '<tr><td>'.$langs->trans("AddReminder").'</td><td colspan="3"><input type="checkbox" id="addreminder" name="addreminder" '.$checked.'></td></tr>';
+
+			print '<div class="reminderparameters" '.(empty($checked) ? 'style="display: none;"' : '').'>';
+
+			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="'.$actionCommReminder->offsetvalue.'" size="5">';
+			print '</td></tr>';
+
+			//Time Type
+			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("TimeType").'</td><td colspan="3">';
+			print $form->selectTypeDuration('offsetunit', $actionCommReminder->offsetunit);
+			print '</td></tr>';
+
+			//Reminder Type
+			$TRemindTypes = array();
+			if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) $TRemindTypes['email'] = $langs->trans('EMail');
+			if (!empty($conf->global->AGENDA_REMINDER_BROWSER)) $TRemindTypes['browser'] = $langs->trans('BrowserPush');
+			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ReminderType").'</td><td colspan="3">';
+			print $form->selectarray('selectremindertype', $TRemindTypes, $actionCommReminder->typeremind);
+			print '</td></tr>';
+
+			$hide = '';
+			if ($actionCommReminder->typeremind == 'browser') $hide = 'style="display:none;"';
+
+			//Mail Model
+			print '<tr '.$hide.'><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
+			print $form->selectModelMail('actioncommsend', 'actioncomm_send', 1);
+			print '</td></tr>';
+
+			print '</table>';
+
+			print "\n".'<script type="text/javascript">';
+			print '$(document).ready(function () {
+	            		$("#addreminder").click(function(){
+	            		    if (this.checked) {
+	            		      $(".reminderparameters").show();
+                            } else {
+                            $(".reminderparameters").hide();
+                            }
+	            		 });
+
+	            		$("#selectremindertype").change(function(){
+	            	        var selected_option = $("#selectremindertype option:selected").val();
+	            		    if(selected_option == "email") {
+	            		        $("#select_actioncommsendmodel_mail").closest("tr").show();
+	            		    } else {
+	            			    $("#select_actioncommsendmodel_mail").closest("tr").hide();
+	            		    };
+	            		});
+
+                   })';
+			print '</script>'."\n";
+		}
+
 		dol_fiche_end();
 
 		print '<div class="center">';
@@ -1561,9 +1795,7 @@ if ($id > 0)
 		print '</div>';
 
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		dol_fiche_head($head, 'card', $langs->trans("Action"), -1, 'action');
 
 
@@ -1578,7 +1810,7 @@ if ($id > 0)
 		$linkback = '';
 		// Link to other agenda views
 		$linkback .= img_picto($langs->trans("BackToList"), 'object_list-alt', 'class="hideonsmartphone pictoactionview"');
-		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 		$linkback .= '</li>';
 		$linkback .= '<li class="noborder litext">';
 		$linkback .= img_picto($langs->trans("ViewCal"), 'object_calendar', 'class="hideonsmartphone pictoactionview"');
@@ -1643,6 +1875,7 @@ if ($id > 0)
 		dol_banner_tab($object, 'id', $linkback, ($user->socid ? 0 : 1), 'id', 'ref', $morehtmlref);
 
 	    print '<div class="fichecenter">';
+	    print '<div class="fichehalfleft">';
 
 		print '<div class="underbanner clearboth"></div>';
 
@@ -1652,17 +1885,17 @@ if ($id > 0)
 		// Type
 		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
-			print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="3">'.$langs->trans($object->type).'</td></tr>';
+			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 colspan="3">'.yn($object->fulldayevent, 3).'</td></tr>';
+        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++;
 
 		// Date start
-		print '<tr><td>'.$langs->trans("DateActionStart").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("DateActionStart").'</td><td>';
 		if (!$object->fulldayevent) print dol_print_date($object->datep, 'dayhour');
 		else print dol_print_date($object->datep, 'day');
 		if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
@@ -1670,7 +1903,7 @@ if ($id > 0)
 		print '</tr>';
 
 		// Date end
-		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td>';
         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"));
@@ -1679,11 +1912,11 @@ if ($id > 0)
         // Location
 	    if (empty($conf->global->AGENDA_DISABLE_LOCATION))
     	{
-			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$object->location.'</td></tr>';
+			print '<tr><td>'.$langs->trans("Location").'</td><td>'.$object->location.'</td></tr>';
     	}
 
 		// Assigned to
-    	print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td colspan="3">';
+    	print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td>';
 		$listofuserid = array();
 		if (empty($donotclearsession))
 		{
@@ -1706,9 +1939,7 @@ if ($id > 0)
 				}
 			}
 			$_SESSION['assignedtouser'] = json_encode($listofuserid);
-		}
-		else
-		{
+		} else {
 			if (!empty($_SESSION['assignedtouser']))
 			{
 				$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -1735,7 +1966,7 @@ if ($id > 0)
 		// Done by
 		if ($conf->global->AGENDA_ENABLE_DONEBY)
 		{
-			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
+			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
 			if ($object->userdoneid > 0)
 			{
 				$tmpuser = new User($db);
@@ -1744,16 +1975,19 @@ if ($id > 0)
 			}
 			print '</td></tr>';
 		}
+
 		// Categories
 		if ($conf->categorie->enabled) {
-			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td colspan="3">';
+			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($object->id, Categorie::TYPE_ACTIONCOMM, 1);
 			print "</td></tr>";
 		}
 
 		print '</table>';
 
-		print '<br>';
+		print '</div>';
+
+		print '<div class="fichehalfright">';
 
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield centpercent">';
@@ -1761,7 +1995,7 @@ if ($id > 0)
 		if ($conf->societe->enabled)
 		{
 		    // Related company
-		    print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td colspan="3">'.($object->thirdparty->id ? $object->thirdparty->getNomUrl(1) : ('<span class="opacitymedium">'.$langs->trans("None").'</span>'));
+		    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))
@@ -1773,7 +2007,7 @@ if ($id > 0)
 
 			// Related contact
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td>';
-			print '<td colspan="3">';
+			print '<td>';
 
 			if (!empty($object->socpeopleassigned))
 			{
@@ -1794,16 +2028,14 @@ if ($id > 0)
 						print '<div class="paddingright"></div>';
 					}
 				}
-			}
-			else
-			{
+			} else {
 				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 			}
 			print '</td></tr>';
 		}
 
 		// Priority
-		print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td colspan="3">';
+		print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td>';
 		print ($object->priority ? $object->priority : '');
 		print '</td></tr>';
 
@@ -1814,24 +2046,60 @@ if ($id > 0)
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
 			$link = dolGetElementUrl($object->fk_element, $object->elementtype, 1);
-			print '<td colspan="3">';
+			print '<td>';
 			if (empty($link)) print '<span class="opacitymedium">'.$langs->trans("ObjectDeleted").'</span>';
 			else print $link;
 			print '</td></tr>';
 		}
 
 		// Description
-		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td class="wordbreak">';
 		print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
 		print '</td></tr>';
 
         // Other attributes
-        $cols = 3;
         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);
+
+        	print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Reminders").'</td><td>';
+
+        	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>';
+        		}
+        	}
+
+        	print '</td></tr>';
+        }
+
 		print '</table>';
 
 		print '</div>';
+		print '</div>';
+		print '<div class="clearboth"></div>';
 
 		dol_fiche_end();
 	}
@@ -1853,9 +2121,7 @@ if ($id > 0)
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-			}
-			else
-			{
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
 			}
 
@@ -1863,19 +2129,15 @@ if ($id > 0)
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
 			{
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=clone&object='.$object->element.'&id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
-			}
-			else
-			{
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("ToClone").'</a></div>';
 			}
 
 			if ($user->rights->agenda->allactions->delete ||
 			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->delete))
 			{
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
-			}
-			else
-			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Delete").'</a></div>';
 			}
 		}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 3c060ffdc39..97896448a3f 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -28,6 +28,9 @@
  */
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncommreminder.class.php';
 
 
 /**
@@ -35,492 +38,507 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class ActionComm extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'action';
-
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'actioncomm';
-
-    /**
-     * @var string Name of id column
-     */
-    public $table_rowid = 'id';
-
-    /**
-     * @var string Name of icon for actioncomm object. Filename of icon is object_action.png
-     */
-    public $picto = 'action';
-
-    /**
-     * @var int 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     */
-    public $ismultientitymanaged = 1;
-
-    /**
-     * @var integer 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
-     *              2=Same than 1 but accept record if fksoc is empty
-     */
-    public $restrictiononfksoc = 2;
-
-    /**
-     * @var int Id of the event
-     */
-    public $id;
-
-    /**
-     * @var int Id of the event. Use $id as possible
-     */
-    public $ref;
-
-    /**
-     * @var int Id into parent table llx_c_actioncomm (used only if option to use type is set)
-     */
-    public $type_id;
-
-    /**
-     * @var string Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH.
-     */
-    public $type_code;
-
-    /**
-     * @var string Type label
-     */
-    public $type_label;
-
-    /**
-     * @var string Label into parent table llx_c_actioncomm (used only if option to use type is set)
-     */
-    public $type;
-
-    /**
-     * @var string Color into parent table llx_c_actioncomm (used only if option to use type is set)
-     */
-    public $type_color;
-
-    /**
-     * @var string Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
-     */
-    public $code;
-
-    /**
-     * @var string Agenda event label
-     */
-    public $label;
-
-    /**
-     * @var integer Date creation record (datec)
-     */
-    public $datec;
-
-    /**
-     * @var integer Date end record (datef)
-     */
-    public $datef;
-
-    /**
-     * @var integer Duration (duree)
-     */
-    public $duree;
-
-    /**
-     * @var integer Date modification record (tms)
-     */
-    public $datem;
-
-    /**
-     * @var User Object user that create action
-     * @deprecated
-     * @see $authorid
-     */
-    public $author;
-
-    /**
-     * @var User Object user that modified action
-     * @deprecated
-     * @see $usermodid
-     */
-    public $usermod;
-
-    /**
-     * @var int Id user that create action
-     */
-    public $authorid;
-
-    /**
-     * @var int Id user that modified action
-     */
-    public $usermodid;
-
-    /**
-     * @var integer Date action start (datep)
-     */
-    public $datep;
-
-    /**
-     * @var integer Date action end (datep2)
-     */
-    public $datep2;
-
-    /**
-     * @var int -1=Unkown duration
-     * @deprecated
-     */
-    public $durationp = -1;
-
-    /**
-     * @var int 1=Event on full day
-     */
-    public $fulldayevent = 0;
-
-    /**
-     * @var integer Percentage
-     */
-    public $percentage;
-
-    /**
-     * @var string Location
-     */
-    public $location;
-
-    /**
-     * @var int Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events)
-     */
-    public $transparency;
-
-    /**
-     * @var int (0 By default)
-     */
-    public $priority;
-
-    /**
-     * @var int[] Array of user ids
-     */
-    public $userassigned = array();
-
-    /**
-     * @var int Id of user owner = fk_user_action into table
-     */
-    public $userownerid;
-
-    /**
-     * @var int Id of user done (deprecated)
-     * @deprecated
-     */
-    public $userdoneid;
-
-    /**
-     * @var int[] Array of contact ids
-     */
-    public $socpeopleassigned = array();
-
-    /**
-     * @var int[] Array of other contact emails (not user, not contact)
-     */
-    public $otherassigned = array();
-
-
-    /**
-     * @var User Object user of owner
-     * @deprecated
-     * @see $userownerid
-     */
-    public $usertodo;
-
-    /**
-     * @var User Object user that did action
-     * @deprecated
-     * @see $userdoneid
-     */
-    public $userdone;
-
-    /**
-     * @var int thirdparty id linked to action
-     */
-    public $socid;
-
-    /**
-     * @var int socpeople id linked to action
-     */
-    public $contactid;
-
-    /**
-     * @var Societe|null Company linked to action (optional)
-     * @deprecated
-     * @see $socid
-     */
-    public $societe;
-
-    /**
-     * @var Contact|null Contact linked to action (optional)
-     * @deprecated
-     * @see $contactid
-     */
-    public $contact;
-
-    // Properties for links to other objects
-    /**
-     * @var int Id of linked object
-     */
-    public $fk_element; // Id of record
-
-    /**
-     * @var int Id of record alternative for API
-     */
-    public $elementid;
-
-    /**
-     * @var string Type of record. This if property ->element of object linked to.
-     */
-    public $elementtype;
-
-    /**
-     * @var string Ical name
-     */
-    public $icalname;
-
-    /**
-     * @var string Ical color
-     */
-    public $icalcolor;
-
-    /**
-     * @var string Extraparam
-     */
-    public $extraparams;
-
-    /**
-     * @var array Actions
-     */
-    public $actions = array();
-
-    /**
-     * @var string Email msgid
-     */
-    public $email_msgid;
-
-    /**
-     * @var string Email from
-     */
-    public $email_from;
-
-    /**
-     * @var string Email sender
-     */
-    public $email_sender;
-
-    /**
-     * @var string Email to
-     */
-    public $email_to;
-
-    /**
-     * @var string Email tocc
-     */
-    public $email_tocc;
-    /**
-     * @var string Email tobcc
-     */
-    public $email_tobcc;
-
-    /**
-     * @var string Email subject
-     */
-    public $email_subject;
-
-    /**
-     * @var string Email errors to
-     */
-    public $errors_to;
-
-
-    /**
-     *      Constructor
-     *
-     *      @param      DoliDB		$db      Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
-        $this->db = $db;
-    }
-
-    /**
-     *    Add an action/event into database.
-     *    $this->type_id OR $this->type_code must be set.
-     *
-     *    @param	User	$user      		Object user making action
-     *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
-     *    @return   int 		        	Id of created event, < 0 if KO
-     */
-    public function create(User $user, $notrigger = 0)
-    {
-        global $langs, $conf, $hookmanager;
-
-        $error = 0;
-        $now = dol_now();
-
-        // Check parameters
-        if (!isset($this->userownerid) || $this->userownerid === '')	// $this->userownerid may be 0 (anonymous event) of > 0
-        {
-            dol_syslog("You tried to create an event but mandatory property ownerid was not defined", LOG_WARNING);
-        	$this->errors[] = 'ErrorPropertyUserowneridNotDefined';
-        	return -1;
-        }
-
-        // Clean parameters
-        $this->label = dol_trunc(trim($this->label), 128);
-        $this->location = dol_trunc(trim($this->location), 128);
-        $this->note_private = dol_htmlcleanlastbr(trim(empty($this->note_private) ? $this->note : $this->note_private));
-        if (empty($this->percentage))   $this->percentage = 0;
-        if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
-        if (empty($this->fulldayevent)) $this->fulldayevent = 0;
-        if (empty($this->transparency)) $this->transparency = 0;
-        if ($this->percentage > 100) $this->percentage = 100;
-        //if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-        if (!empty($this->datep) && !empty($this->datef))   $this->durationp = ($this->datef - $this->datep); // deprecated
-        //if (! empty($this->date)  && ! empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
-        if (!empty($this->datep) && !empty($this->datef) && $this->datep > $this->datef) $this->datef = $this->datep;
-        //if (! empty($this->date)  && ! empty($this->dateend) && $this->date > $this->dateend) $this->dateend=$this->date;
-        if (!isset($this->fk_project) || $this->fk_project < 0) $this->fk_project = 0;
-        // For backward compatibility
-        if ($this->elementtype == 'facture')  $this->elementtype = 'invoice';
-        if ($this->elementtype == 'commande') $this->elementtype = 'order';
-        if ($this->elementtype == 'contrat')  $this->elementtype = 'contract';
-
-        if (!is_array($this->userassigned) && !empty($this->userassigned))	// For backward compatibility when userassigned was an int instead fo array
-        {
-        	$tmpid = $this->userassigned;
-        	$this->userassigned = array();
-        	$this->userassigned[$tmpid] = array('id'=>$tmpid, 'transparency'=>$this->transparency);
-        }
-
-        $userownerid = $this->userownerid;
-        $userdoneid = $this->userdoneid;
-
-        // Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
-        if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned))
-        	$this->userassigned = array($userownerid=>array('id'=>$userownerid, 'transparency'=>$this->transparency));
-
-        if (!$this->type_id || !$this->type_code)
-        {
-        	$key = empty($this->type_id) ? $this->type_code : $this->type_id;
-
-            // Get id from code
-            $cactioncomm = new CActionComm($this->db);
-            $result = $cactioncomm->fetch($key);
-
-            if ($result > 0)
-            {
-                $this->type_id = $cactioncomm->id;
-                $this->type_code = $cactioncomm->code;
-            }
-            elseif ($result == 0)
-            {
-                $this->error = 'Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"';
-                return -1;
-            }
-            else
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'action';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'actioncomm';
+
+	/**
+	 * @var string Name of id column
+	 */
+	public $table_rowid = 'id';
+
+	/**
+	 * @var string Name of icon for actioncomm object. Filename of icon is object_action.png
+	 */
+	public $picto = 'action';
+
+	/**
+	 * @var int 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 */
+	public $ismultientitymanaged = 1;
+
+	/**
+	 * @var integer 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
+	 *              2=Same than 1 but accept record if fksoc is empty
+	 */
+	public $restrictiononfksoc = 2;
+
+	/**
+	 * @var int Id of the event
+	 */
+	public $id;
+
+	/**
+	 * @var int Id of the event. Use $id as possible
+	 */
+	public $ref;
+
+	/**
+	 * @var int Id into parent table llx_c_actioncomm (used only if option to use type is set)
+	 */
+	public $type_id;
+
+	/**
+	 * @var string Code into parent table llx_c_actioncomm (used only if option to use type is set). With default setup, should be AC_OTH_AUTO or AC_OTH.
+	 */
+	public $type_code;
+
+	/**
+	 * @var string Type label
+	 */
+	public $type_label;
+
+	/**
+	 * @var string Label into parent table llx_c_actioncomm (used only if option to use type is set)
+	 */
+	public $type;
+
+	/**
+	 * @var string Color into parent table llx_c_actioncomm (used only if option to use type is set)
+	 */
+	public $type_color;
+
+	/**
+	 * @var string Free code to identify action. Ie: Agenda trigger add here AC_TRIGGERNAME ('AC_COMPANY_CREATE', 'AC_PROPAL_VALIDATE', ...)
+	 */
+	public $code;
+
+	/**
+	 * @var string Agenda event label
+	 */
+	public $label;
+
+	/**
+	 * @var integer Date creation record (datec)
+	 */
+	public $datec;
+
+	/**
+	 * @var integer Date end record (datef)
+	 */
+	public $datef;
+
+	/**
+	 * @var integer Duration (duree)
+	 */
+	public $duree;
+
+	/**
+	 * @var integer Date modification record (tms)
+	 */
+	public $datem;
+
+	/**
+	 * @var User Object user that create action
+	 * @deprecated
+	 * @see $authorid
+	 */
+	public $author;
+
+	/**
+	 * @var User Object user that modified action
+	 * @deprecated
+	 * @see $usermodid
+	 */
+	public $usermod;
+
+	/**
+	 * @var int Id user that create action
+	 */
+	public $authorid;
+
+	/**
+	 * @var int Id user that modified action
+	 */
+	public $usermodid;
+
+	/**
+	 * @var integer Date action start (datep)
+	 */
+	public $datep;
+
+	/**
+	 * @var integer Date action end (datep2)
+	 */
+	public $datep2;
+
+	/**
+	 * @var int -1=Unkown duration
+	 * @deprecated
+	 */
+	public $durationp = -1;
+
+	/**
+	 * @var int 1=Event on full day
+	 */
+	public $fulldayevent = 0;
+
+	/**
+	 * @var integer Percentage
+	 */
+	public $percentage;
+
+	/**
+	 * @var string Location
+	 */
+	public $location;
+
+	/**
+	 * @var int Transparency (ical standard). Used to say if people assigned to event are busy or not by event. 0=available, 1=busy, 2=busy (refused events)
+	 */
+	public $transparency;
+
+	/**
+	 * @var int (0 By default)
+	 */
+	public $priority;
+
+	/**
+	 * @var int[] Array of user ids
+	 */
+	public $userassigned = array();
+
+	/**
+	 * @var int Id of user owner = fk_user_action into table
+	 */
+	public $userownerid;
+
+	/**
+	 * @var int Id of user done (deprecated)
+	 * @deprecated
+	 */
+	public $userdoneid;
+
+	/**
+	 * @var int[] Array of contact ids
+	 */
+	public $socpeopleassigned = array();
+
+	/**
+	 * @var int[] Array of other contact emails (not user, not contact)
+	 */
+	public $otherassigned = array();
+
+	/**
+	 * @var array	Array of reminders
+	 */
+	public $reminders = array();
+
+	/**
+	 * @var User Object user of owner
+	 * @deprecated
+	 * @see $userownerid
+	 */
+	public $usertodo;
+
+	/**
+	 * @var User Object user that did action
+	 * @deprecated
+	 * @see $userdoneid
+	 */
+	public $userdone;
+
+	/**
+	 * @var int thirdparty id linked to action
+	 */
+	public $socid;
+
+	/**
+	 * @var int socpeople id linked to action
+	 */
+	public $contactid;
+
+	/**
+	 * @var Societe|null Company linked to action (optional)
+	 * @deprecated
+	 * @see $socid
+	 */
+	public $societe;
+
+	/**
+	 * @var Contact|null Contact linked to action (optional)
+	 * @deprecated
+	 * @see $contactid
+	 */
+	public $contact;
+
+	// Properties for links to other objects
+	/**
+	 * @var int Id of linked object
+	 */
+	public $fk_element; // Id of record
+
+	/**
+	 * @var int Id of record alternative for API
+	 */
+	public $elementid;
+
+	/**
+	 * @var string Type of record. This if property ->element of object linked to.
+	 */
+	public $elementtype;
+
+	/**
+	 * @var string Ical name
+	 */
+	public $icalname;
+
+	/**
+	 * @var string Ical color
+	 */
+	public $icalcolor;
+
+	/**
+	 * @var string Extraparam
+	 */
+	public $extraparams;
+
+	/**
+	 * @var array Actions
+	 */
+	public $actions = array();
+
+	/**
+	 * @var string Email msgid
+	 */
+	public $email_msgid;
+
+	/**
+	 * @var string Email from
+	 */
+	public $email_from;
+
+	/**
+	 * @var string Email sender
+	 */
+	public $email_sender;
+
+	/**
+	 * @var string Email to
+	 */
+	public $email_to;
+
+	/**
+	 * @var string Email tocc
+	 */
+	public $email_tocc;
+	/**
+	 * @var string Email tobcc
+	 */
+	public $email_tobcc;
+
+	/**
+	 * @var string Email subject
+	 */
+	public $email_subject;
+
+	/**
+	 * @var string Email errors to
+	 */
+	public $errors_to;
+
+	/**
+	 * Typical value for a event that is in a todo state
+	 */
+	const EVENT_TODO = 0;
+
+	/**
+	 * Typical value for a event that is in a progress state
+	 */
+	const EVENT_IN_PROGRESS = 50;
+
+	/**
+	 * Typical value for a event that is in a finished state
+	 */
+	const EVENT_FINISHED = 100;
+
+	/**
+	 *      Constructor
+	 *
+	 *      @param      DoliDB		$db      Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 *    Add an action/event into database.
+	 *    $this->type_id OR $this->type_code must be set.
+	 *
+	 *    @param	User	$user      		Object user making action
+	 *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
+	 *    @return   int 		        	Id of created event, < 0 if KO
+	 */
+	public function create(User $user, $notrigger = 0)
+	{
+		global $langs, $conf, $hookmanager;
+
+		$error = 0;
+		$now = dol_now();
+
+		// Check parameters
+		if (!isset($this->userownerid) || $this->userownerid === '')	// $this->userownerid may be 0 (anonymous event) of > 0
+		{
+			dol_syslog("You tried to create an event but mandatory property ownerid was not defined", LOG_WARNING);
+			$this->errors[] = 'ErrorPropertyUserowneridNotDefined';
+			return -1;
+		}
+
+		// Clean parameters
+		$this->label = dol_trunc(trim($this->label), 128);
+		$this->location = dol_trunc(trim($this->location), 128);
+		$this->note_private = dol_htmlcleanlastbr(trim(empty($this->note_private) ? $this->note : $this->note_private));
+		if (empty($this->percentage))   $this->percentage = 0;
+		if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
+		if (empty($this->fulldayevent)) $this->fulldayevent = 0;
+		if (empty($this->transparency)) $this->transparency = 0;
+		if ($this->percentage > 100) $this->percentage = 100;
+		//if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
+		if (!empty($this->datep) && !empty($this->datef))   $this->durationp = ($this->datef - $this->datep); // deprecated
+		//if (! empty($this->date)  && ! empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
+		if (!empty($this->datep) && !empty($this->datef) && $this->datep > $this->datef) $this->datef = $this->datep;
+		//if (! empty($this->date)  && ! empty($this->dateend) && $this->date > $this->dateend) $this->dateend=$this->date;
+		if (!isset($this->fk_project) || $this->fk_project < 0) $this->fk_project = 0;
+		// For backward compatibility
+		if ($this->elementtype == 'facture')  $this->elementtype = 'invoice';
+		if ($this->elementtype == 'commande') $this->elementtype = 'order';
+		if ($this->elementtype == 'contrat')  $this->elementtype = 'contract';
+
+		if (!is_array($this->userassigned) && !empty($this->userassigned))	// For backward compatibility when userassigned was an int instead fo array
+		{
+			$tmpid = $this->userassigned;
+			$this->userassigned = array();
+			$this->userassigned[$tmpid] = array('id'=>$tmpid, 'transparency'=>$this->transparency);
+		}
+
+		$userownerid = $this->userownerid;
+		$userdoneid = $this->userdoneid;
+
+		// Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
+		if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned))
+			$this->userassigned = array($userownerid=>array('id'=>$userownerid, 'transparency'=>$this->transparency));
+
+		if (!$this->type_id || !$this->type_code)
+		{
+			$key = empty($this->type_id) ? $this->type_code : $this->type_id;
+
+			// Get id from code
+			$cactioncomm = new CActionComm($this->db);
+			$result = $cactioncomm->fetch($key);
+
+			if ($result > 0)
 			{
-                $this->error = $cactioncomm->error;
-                return -1;
-            }
-        }
-        $code = empty($this->code) ? $this->type_code : $this->code;
+				$this->type_id = $cactioncomm->id;
+				$this->type_code = $cactioncomm->code;
+			} elseif ($result == 0)
+			{
+				$this->error = 'Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"';
+				return -1;
+			} else {
+				$this->error = $cactioncomm->error;
+				return -1;
+			}
+		}
+		$code = empty($this->code) ? $this->type_code : $this->code;
 
-        // Check parameters
-        if (!$this->type_id)
-        {
-            $this->error = "ErrorWrongParameters";
-            return -1;
-        }
+		// Check parameters
+		if (!$this->type_id)
+		{
+			$this->error = "ErrorWrongParameters";
+			return -1;
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm";
-        $sql .= "(datec,";
-        $sql .= "datep,";
-        $sql .= "datep2,";
-        $sql .= "durationp,"; // deprecated
-        $sql .= "fk_action,";
-        $sql .= "code,";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm";
+		$sql .= "(datec,";
+		$sql .= "datep,";
+		$sql .= "datep2,";
+		$sql .= "durationp,"; // deprecated
+		$sql .= "fk_action,";
+		$sql .= "code,";
 	 	$sql .= "ref_ext,";
-        $sql .= "fk_soc,";
-        $sql .= "fk_project,";
-        $sql .= "note,";
-        $sql .= "fk_contact,";
-        $sql .= "fk_user_author,";
-        $sql .= "fk_user_action,";
-        $sql .= "fk_user_done,";
-        $sql .= "label,percent,priority,fulldayevent,location,";
-        $sql .= "transparency,";
-        $sql .= "fk_element,";
-        $sql .= "elementtype,";
-        $sql .= "entity,";
-        $sql .= "extraparams,";
+		$sql .= "fk_soc,";
+		$sql .= "fk_project,";
+		$sql .= "note,";
+		$sql .= "fk_contact,";
+		$sql .= "fk_user_author,";
+		$sql .= "fk_user_action,";
+		$sql .= "fk_user_done,";
+		$sql .= "label,percent,priority,fulldayevent,location,";
+		$sql .= "transparency,";
+		$sql .= "fk_element,";
+		$sql .= "elementtype,";
+		$sql .= "entity,";
+		$sql .= "extraparams,";
 		// Fields emails
-        $sql .= "email_msgid,";
-        $sql .= "email_from,";
-        $sql .= "email_sender,";
-        $sql .= "email_to,";
-        $sql .= "email_tocc,";
-        $sql .= "email_tobcc,";
-        $sql .= "email_subject,";
-        $sql .= "errors_to";
-        $sql .= ") VALUES (";
-        $sql .= "'".$this->db->idate($now)."', ";
-        $sql .= (strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : "null").", ";
-        $sql .= (strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : "null").", ";
-        $sql .= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '') ? "'".$this->db->escape($this->durationp)."'" : "null").", "; // deprecated
-        $sql .= (isset($this->type_id) ? $this->type_id : "null").",";
-        $sql .= ($code ? ("'".$this->db->escape($code)."'") : "null").", ";
-        $sql .= ($this->ref_ext ? ("'".$this->db->idate($this->ref_ext)."'") : "null").", ";
-        $sql .= ((isset($this->socid) && $this->socid > 0) ? $this->socid : "null").", ";
-        $sql .= ((isset($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : "null").", ";
-        $sql .= " '".$this->db->escape($this->note_private)."', ";
-        $sql .= ((isset($this->contactid) && $this->contactid > 0) ? $this->contactid : "null").", ";
-        $sql .= (isset($user->id) && $user->id > 0 ? $user->id : "null").", ";
-        $sql .= ($userownerid > 0 ? $userownerid : "null").", ";
-        $sql .= ($userdoneid > 0 ? $userdoneid : "null").", ";
-        $sql .= "'".$this->db->escape($this->label)."','".$this->db->escape($this->percentage)."','".$this->db->escape($this->priority)."','".$this->db->escape($this->fulldayevent)."','".$this->db->escape($this->location)."', ";
-        $sql .= "'".$this->db->escape($this->transparency)."', ";
-        $sql .= (!empty($this->fk_element) ? $this->fk_element : "null").", ";
-        $sql .= (!empty($this->elementtype) ? "'".$this->db->escape($this->elementtype)."'" : "null").", ";
-        $sql .= $conf->entity.",";
-        $sql .= (!empty($this->extraparams) ? "'".$this->db->escape($this->extraparams)."'" : "null").", ";
-        // Fields emails
-        $sql .= (!empty($this->email_msgid) ? "'".$this->db->escape($this->email_msgid)."'" : "null").", ";
-        $sql .= (!empty($this->email_from) ? "'".$this->db->escape($this->email_from)."'" : "null").", ";
-        $sql .= (!empty($this->email_sender) ? "'".$this->db->escape($this->email_sender)."'" : "null").", ";
-        $sql .= (!empty($this->email_to) ? "'".$this->db->escape($this->email_to)."'" : "null").", ";
-        $sql .= (!empty($this->email_tocc) ? "'".$this->db->escape($this->email_tocc)."'" : "null").", ";
-        $sql .= (!empty($this->email_tobcc) ? "'".$this->db->escape($this->email_tobcc)."'" : "null").", ";
-        $sql .= (!empty($this->email_subject) ? "'".$this->db->escape($this->email_subject)."'" : "null").", ";
-        $sql .= (!empty($this->errors_to) ? "'".$this->db->escape($this->errors_to)."'" : "null");
-        $sql .= ")";
+		$sql .= "email_msgid,";
+		$sql .= "email_from,";
+		$sql .= "email_sender,";
+		$sql .= "email_to,";
+		$sql .= "email_tocc,";
+		$sql .= "email_tobcc,";
+		$sql .= "email_subject,";
+		$sql .= "errors_to";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->idate($now)."', ";
+		$sql .= (strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : "null").", ";
+		$sql .= (strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : "null").", ";
+		$sql .= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '') ? "'".$this->db->escape($this->durationp)."'" : "null").", "; // deprecated
+		$sql .= (isset($this->type_id) ? $this->type_id : "null").",";
+		$sql .= ($code ? ("'".$this->db->escape($code)."'") : "null").", ";
+		$sql .= (!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").", ";
+		$sql .= ((isset($this->socid) && $this->socid > 0) ? $this->socid : "null").", ";
+		$sql .= ((isset($this->fk_project) && $this->fk_project > 0) ? $this->fk_project : "null").", ";
+		$sql .= " '".$this->db->escape($this->note_private)."', ";
+		$sql .= ((isset($this->contact_id) && $this->contact_id > 0) ? $this->contact_id : "null").", "; // deprecated, use ->socpeopleassigned
+		$sql .= (isset($user->id) && $user->id > 0 ? $user->id : "null").", ";
+		$sql .= ($userownerid > 0 ? $userownerid : "null").", ";
+		$sql .= ($userdoneid > 0 ? $userdoneid : "null").", ";
+		$sql .= "'".$this->db->escape($this->label)."','".$this->db->escape($this->percentage)."','".$this->db->escape($this->priority)."','".$this->db->escape($this->fulldayevent)."','".$this->db->escape($this->location)."', ";
+		$sql .= "'".$this->db->escape($this->transparency)."', ";
+		$sql .= (!empty($this->fk_element) ? $this->fk_element : "null").", ";
+		$sql .= (!empty($this->elementtype) ? "'".$this->db->escape($this->elementtype)."'" : "null").", ";
+		$sql .= $conf->entity.",";
+		$sql .= (!empty($this->extraparams) ? "'".$this->db->escape($this->extraparams)."'" : "null").", ";
+		// Fields emails
+		$sql .= (!empty($this->email_msgid) ? "'".$this->db->escape($this->email_msgid)."'" : "null").", ";
+		$sql .= (!empty($this->email_from) ? "'".$this->db->escape($this->email_from)."'" : "null").", ";
+		$sql .= (!empty($this->email_sender) ? "'".$this->db->escape($this->email_sender)."'" : "null").", ";
+		$sql .= (!empty($this->email_to) ? "'".$this->db->escape($this->email_to)."'" : "null").", ";
+		$sql .= (!empty($this->email_tocc) ? "'".$this->db->escape($this->email_tocc)."'" : "null").", ";
+		$sql .= (!empty($this->email_tobcc) ? "'".$this->db->escape($this->email_tobcc)."'" : "null").", ";
+		$sql .= (!empty($this->email_subject) ? "'".$this->db->escape($this->email_subject)."'" : "null").", ";
+		$sql .= (!empty($this->errors_to) ? "'".$this->db->escape($this->errors_to)."'" : "null");
+		$sql .= ")";
 
-        dol_syslog(get_class($this)."::add", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id");
+		dol_syslog(get_class($this)."::add", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id");
 
-            // Now insert assigned users
+			// Now insert assigned users
 			if (!$error)
 			{
 				//dol_syslog(var_export($this->userassigned, true));
 				foreach ($this->userassigned as $key => $val)
 				{
-			        if (!is_array($val))	// For backward compatibility when val=id
-			        {
-			        	$val = array('id'=>$val);
-			        }
+					if (!is_array($val))	// For backward compatibility when val=id
+					{
+						$val = array('id'=>$val);
+					}
 
-			        if ($val['id'] > 0)
-			        {
+					if ($val['id'] > 0)
+					{
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 						$sql .= " VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory']) ? '0' : $val['mandatory']).", ".(empty($val['transparency']) ? '0' : $val['transparency']).", ".(empty($val['answer_status']) ? '0' : $val['answer_status']).")";
 
@@ -529,10 +547,10 @@ class ActionComm extends CommonObject
 						{
 							$error++;
 							dol_syslog('Error to process userassigned: '.$this->db->lasterror(), LOG_ERR);
-			           		$this->errors[] = $this->db->lasterror();
+					   		$this->errors[] = $this->db->lasterror();
 						}
 						//var_dump($sql);exit;
-			        }
+					}
 				}
 			}
 
@@ -556,58 +574,54 @@ class ActionComm extends CommonObject
 				}
 			}
 
-            if (!$error)
-            {
-	            // Actions on extra fields
-           		$result = $this->insertExtraFields();
-           		if ($result < 0)
-           		{
-           			$error++;
-           		}
-            }
+			if (!$error)
+			{
+				// Actions on extra fields
+		   		$result = $this->insertExtraFields();
+		   		if ($result < 0)
+		   		{
+		   			$error++;
+		   		}
+			}
 
-            if (!$error && !$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('ACTION_CREATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('ACTION_CREATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 
-            if (!$error)
-            {
-            	$this->db->commit();
-            	return $this->id;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->db->rollback();
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+			if (!$error)
+			{
+				$this->db->commit();
+				return $this->id;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->db->rollback();
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *  Load an object from its id and create a new one in database
-     *
-     *  @param	    User	        $fuser      	Object user making action
+	/**
+	 *  Load an object from its id and create a new one in database
+	 *
+	 *  @param	    User	        $fuser      	Object user making action
 	 *  @param		int				$socid			Id of thirdparty
-     *  @return		int								New id of clone
-     */
-    public function createFromClone(User $fuser, $socid)
-    {
-        global $db, $conf, $hookmanager;
+	 *  @return		int								New id of clone
+	 */
+	public function createFromClone(User $fuser, $socid)
+	{
+		global $db, $conf, $hookmanager;
 
-        $error = 0;
-        $now = dol_now();
+		$error = 0;
+		$now = dol_now();
 
-        $this->db->begin();
+		$this->db->begin();
 
 		// Load source object
 		$objFrom = clone $this;
@@ -619,174 +633,173 @@ class ActionComm extends CommonObject
 		//$this->fetch_userassigned();
 		$this->fetchResources();
 
-        $this->id = 0;
+		$this->id = 0;
 
-        // Create clone
+		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($fuser);
-        if ($result < 0) $error++;
+		if ($result < 0) $error++;
 
-        if (!$error)
-        {
-            // Hook of thirdparty module
-            if (is_object($hookmanager))
-            {
-                $parameters = array('objFrom'=>$objFrom);
-                $action = '';
-                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
-            }
+		if (!$error)
+		{
+			// Hook of thirdparty module
+			if (is_object($hookmanager))
+			{
+				$parameters = array('objFrom'=>$objFrom);
+				$action = '';
+				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+			}
 
-            // Call trigger
-            $result = $this->call_trigger('ACTION_CLONE', $fuser);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
+			// Call trigger
+			$result = $this->call_trigger('ACTION_CLONE', $fuser);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
 
-        unset($this->context['createfromclone']);
+		unset($this->context['createfromclone']);
 
-        // End
-        if (!$error)
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		// End
+		if (!$error)
+		{
+			$this->db->commit();
+			return $this->id;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *  Load object from database
-     *
-     *  @param  int		$id     	Id of action to get
-     *  @param  string	$ref    	Ref of action to get
-     *  @param  string	$ref_ext	Ref ext to get
-     *  @return	int					<0 if KO, >0 if OK
-     */
-    public function fetch($id, $ref = '', $ref_ext = '')
-    {
-        global $langs;
+	/**
+	 *  Load object from database
+	 *
+	 *  @param  int		$id     		Id of action to get
+	 *  @param  string	$ref    		Ref of action to get
+	 *  @param  string	$ref_ext		Ref ext to get
+	 *  @param	string	$email_msgid	Email msgid
+	 *  @return	int						<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $ref = '', $ref_ext = '', $email_msgid = '')
+	{
+		global $langs;
 
-        $sql = "SELECT a.id,";
-        $sql .= " a.id as ref,";
-        $sql .= " a.entity,";
-        $sql .= " a.ref_ext,";
-        $sql .= " a.datep,";
-        $sql .= " a.datep2,";
-        $sql .= " a.durationp,"; // deprecated
-        $sql .= " a.datec,";
-        $sql .= " a.tms as datem,";
-        $sql .= " a.code, a.label, a.note,";
-        $sql .= " a.fk_soc,";
-        $sql .= " a.fk_project,";
-        $sql .= " a.fk_user_author, a.fk_user_mod,";
-        $sql .= " a.fk_user_action, a.fk_user_done,";
-        $sql .= " a.fk_contact, a.percent as percentage,";
-        $sql .= " a.fk_element as elementid, a.elementtype,";
-        $sql .= " a.priority, a.fulldayevent, a.location, a.transparency,";
-        $sql .= " c.id as type_id, c.code as type_code, c.libelle as type_label, c.color as type_color, c.picto as type_picto,";
-        $sql .= " s.nom as socname,";
-        $sql .= " u.firstname, u.lastname as lastname";
-        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a ";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action=c.id ";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
-        $sql .= " WHERE ";
-        if ($ref) $sql .= " a.id=".$ref; // No field ref, we use id
-        elseif ($ref_ext) $sql .= " a.ref_ext='".$this->db->escape($ref_ext)."'";
-        else $sql .= " a.id=".$id;
+		$sql = "SELECT a.id,";
+		$sql .= " a.id as ref,";
+		$sql .= " a.entity,";
+		$sql .= " a.ref_ext,";
+		$sql .= " a.datep,";
+		$sql .= " a.datep2,";
+		$sql .= " a.durationp,"; // deprecated
+		$sql .= " a.datec,";
+		$sql .= " a.tms as datem,";
+		$sql .= " a.code, a.label, a.note,";
+		$sql .= " a.fk_soc,";
+		$sql .= " a.fk_project,";
+		$sql .= " a.fk_user_author, a.fk_user_mod,";
+		$sql .= " a.fk_user_action, a.fk_user_done,";
+		$sql .= " a.fk_contact, a.percent as percentage,";
+		$sql .= " a.fk_element as elementid, a.elementtype,";
+		$sql .= " a.priority, a.fulldayevent, a.location, a.transparency,";
+		$sql .= " a.email_msgid, a.email_subject, a.email_from, a.email_to, a.email_tocc, a.email_tobcc, a.errors_to,";
+		$sql .= " c.id as type_id, c.code as type_code, c.libelle as type_label, c.color as type_color, c.picto as type_picto,";
+		$sql .= " s.nom as socname,";
+		$sql .= " u.firstname, u.lastname as lastname";
+		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a ";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action=c.id ";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
+		$sql .= " WHERE ";
+		if ($ref) $sql .= " a.id = ".((int) $ref); // No field ref, we use id
+		elseif ($ref_ext) $sql .= " a.ref_ext = '".$this->db->escape($ref_ext)."'";
+		elseif ($email_msgid) $sql .= " a.email_msgid = '".$this->db->escape($email_msgid)."'";
+		else $sql .= " a.id = ".((int) $id);
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	$num = $this->db->num_rows($resql);
-            if ($num)
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id         = $obj->id;
-				$this->entity     = $obj->entity;
-                $this->ref        = $obj->ref;
-                $this->ref_ext    = $obj->ref_ext;
+				$this->id         = $obj->id;
+				$this->entity = $obj->entity;
+				$this->ref        = $obj->ref;
+				$this->ref_ext    = $obj->ref_ext;
 
-                // Properties of parent table llx_c_actioncomm
-                $this->type_id    = $obj->type_id;
-                $this->type_code  = $obj->type_code;
-                $this->type_color = $obj->type_color;
-                $this->type_picto = $obj->type_picto;
-                $transcode = $langs->trans("Action".$obj->type_code);
-                $this->type       = (($transcode != "Action".$obj->type_code) ? $transcode : $obj->type_label);
-                $transcode = $langs->trans("Action".$obj->type_code.'Short');
-                $this->type_short = (($transcode != "Action".$obj->type_code.'Short') ? $transcode : '');
+				// Properties of parent table llx_c_actioncomm
+				$this->type_id    = $obj->type_id;
+				$this->type_code  = $obj->type_code;
+				$this->type_color = $obj->type_color;
+				$this->type_picto = $obj->type_picto;
+				$transcode = $langs->trans("Action".$obj->type_code);
+				$this->type       = (($transcode != "Action".$obj->type_code) ? $transcode : $obj->type_label);
+				$transcode = $langs->trans("Action".$obj->type_code.'Short');
+				$this->type_short = (($transcode != "Action".$obj->type_code.'Short') ? $transcode : '');
 
 				$this->code = $obj->code;
-                $this->label = $obj->label;
-                $this->datep = $this->db->jdate($obj->datep);
-                $this->datef = $this->db->jdate($obj->datep2);
+				$this->label = $obj->label;
+				$this->datep = $this->db->jdate($obj->datep);
+				$this->datef = $this->db->jdate($obj->datep2);
 
-                $this->datec = $this->db->jdate($obj->datec);
-                $this->datem = $this->db->jdate($obj->datem);
+				$this->datec = $this->db->jdate($obj->datec);
+				$this->datem = $this->db->jdate($obj->datem);
 
-                $this->note = $obj->note; // deprecated
-                $this->note_private = $obj->note;
-                $this->percentage = $obj->percentage;
+				$this->note = $obj->note; // deprecated
+				$this->note_private = $obj->note;
+				$this->percentage = $obj->percentage;
 
-                $this->authorid = $obj->fk_user_author;
-                $this->usermodid = $obj->fk_user_mod;
+				$this->authorid = $obj->fk_user_author;
+				$this->usermodid = $obj->fk_user_mod;
 
-                if (!is_object($this->author)) $this->author = new stdClass(); // To avoid warning
-                $this->author->id = $obj->fk_user_author; // deprecated
-                $this->author->firstname = $obj->firstname; // deprecated
-                $this->author->lastname = $obj->lastname; // deprecated
-                if (!is_object($this->usermod)) $this->usermod = new stdClass(); // To avoid warning
-                $this->usermod->id = $obj->fk_user_mod; // deprecated
+				if (!is_object($this->author)) $this->author = new stdClass(); // To avoid warning
+				$this->author->id = $obj->fk_user_author; // deprecated
+				$this->author->firstname = $obj->firstname; // deprecated
+				$this->author->lastname = $obj->lastname; // deprecated
+				if (!is_object($this->usermod)) $this->usermod = new stdClass(); // To avoid warning
+				$this->usermod->id = $obj->fk_user_mod; // deprecated
 
-                $this->userownerid = $obj->fk_user_action;
-                $this->userdoneid = $obj->fk_user_done;
-                $this->priority				= $obj->priority;
-                $this->fulldayevent			= $obj->fulldayevent;
-                $this->location				= $obj->location;
-                $this->transparency			= $obj->transparency;
+				$this->userownerid = $obj->fk_user_action;
+				$this->userdoneid = $obj->fk_user_done;
+				$this->priority				= $obj->priority;
+				$this->fulldayevent			= $obj->fulldayevent;
+				$this->location				= $obj->location;
+				$this->transparency			= $obj->transparency;
 
-                $this->socid = $obj->fk_soc; // To have fetch_thirdparty method working
-                $this->contactid			= $obj->fk_contact; // To have fetch_contact method working
-                $this->fk_project = $obj->fk_project; // To have fetch_projet method working
+				$this->socid = $obj->fk_soc; // To have fetch_thirdparty method working
+				$this->contact_id = $obj->fk_contact; // To have fetch_contact method working
+				$this->fk_project = $obj->fk_project; // To have fetch_projet method working
 
-                //$this->societe->id			= $obj->fk_soc;			// deprecated
-                //$this->contact->id			= $obj->fk_contact;		// deprecated
+				//$this->societe->id			= $obj->fk_soc;			// deprecated
+				//$this->contact->id			= $obj->fk_contact;		// deprecated
 
-                $this->fk_element = $obj->elementid;
-                $this->elementid = $obj->elementid;
-                $this->elementtype = $obj->elementtype;
+				$this->fk_element = $obj->elementid;
+				$this->elementid = $obj->elementid;
+				$this->elementtype = $obj->elementtype;
 
-                $this->fetchResources();
-            }
-            $this->db->free($resql);
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
+				$this->fetchResources();
+			}
+			$this->db->free($resql);
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
 
-        return $num;
-    }
+		return $num;
+	}
 
-    /**
-     *    Initialize $this->userassigned & this->socpeopleassigned array with list of id of user and contact assigned to event
-     *
-     *    @return   int				<0 if KO, >0 if OK
-     */
-    public function fetchResources()
-    {
-    	$this->userassigned = array();
-    	$this->socpeopleassigned = array();
+	/**
+	 *    Initialize $this->userassigned & this->socpeopleassigned array with list of id of user and contact assigned to event
+	 *
+	 *    @return   int				<0 if KO, >0 if OK
+	 */
+	public function fetchResources()
+	{
+		$this->userassigned = array();
+		$this->socpeopleassigned = array();
 
-    	$sql = 'SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency';
+		$sql = 'SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm_resources';
 		$sql .= ' WHERE fk_actioncomm = '.$this->id;
 		$sql .= " AND element_type IN ('user', 'socpeople')";
@@ -796,9 +809,9 @@ class ActionComm extends CommonObject
 			// If owner is known, we must but id first into list
 			if ($this->userownerid > 0) $this->userassigned[$this->userownerid] = array('id'=>$this->userownerid); // Set first so will be first into list.
 
-            while ($obj = $this->db->fetch_object($resql))
-            {
-            	if ($obj->fk_element > 0)
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				if ($obj->fk_element > 0)
 				{
 					switch ($obj->element_type) {
 						case 'user':
@@ -810,90 +823,86 @@ class ActionComm extends CommonObject
 							break;
 					}
 				}
-            }
+			}
 
-        	return 1;
-		}
-		else
-		{
+			return 1;
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Initialize this->userassigned array with list of id of user assigned to event
-     *
-     *    @param    bool    $override   Override $this->userownerid when empty. TODO This should be false by default. True is here to fix corrupted data.
-     *    @return   int                 <0 if KO, >0 if OK
-     */
-    public function fetch_userassigned($override = true)
-    {
-        // phpcs:enable
-        $sql = "SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency";
-        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm_resources";
-        $sql .= " WHERE element_type = 'user' AND fk_actioncomm = ".$this->id;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Initialize this->userassigned array with list of id of user assigned to event
+	 *
+	 *    @param    bool    $override   Override $this->userownerid when empty. TODO This should be false by default. True is here to fix corrupted data.
+	 *    @return   int                 <0 if KO, >0 if OK
+	 */
+	public function fetch_userassigned($override = true)
+	{
+		// phpcs:enable
+		$sql = "SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency";
+		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm_resources";
+		$sql .= " WHERE element_type = 'user' AND fk_actioncomm = ".$this->id;
 
-        $resql2 = $this->db->query($sql);
-        if ($resql2)
-        {
-            $this->userassigned = array();
+		$resql2 = $this->db->query($sql);
+		if ($resql2)
+		{
+			$this->userassigned = array();
 
-            // If owner is known, we must but id first into list
-            if ($this->userownerid > 0)
-            {
-                // Set first so will be first into list.
-                $this->userassigned[$this->userownerid] = array('id'=>$this->userownerid);
-            }
+			// If owner is known, we must but id first into list
+			if ($this->userownerid > 0)
+			{
+				// Set first so will be first into list.
+				$this->userassigned[$this->userownerid] = array('id'=>$this->userownerid);
+			}
 
-            while ($obj = $this->db->fetch_object($resql2))
-            {
-                if ($obj->fk_element > 0)
-                {
-                    $this->userassigned[$obj->fk_element] = array('id'=>$obj->fk_element,
-                                                                  'mandatory'=>$obj->mandatory,
-                                                                  'answer_status'=>$obj->answer_status,
-                                                                  'transparency'=>$obj->transparency);
-                }
+			while ($obj = $this->db->fetch_object($resql2))
+			{
+				if ($obj->fk_element > 0)
+				{
+					$this->userassigned[$obj->fk_element] = array('id'=>$obj->fk_element,
+																  'mandatory'=>$obj->mandatory,
+																  'answer_status'=>$obj->answer_status,
+																  'transparency'=>$obj->transparency);
+				}
 
-                if ($override === true)
-                {
-                    // If not defined (should not happened, we fix this)
-                    if (empty($this->userownerid))
-                    {
-                        $this->userownerid = $obj->fk_element;
-                    }
-                }
-            }
+				if ($override === true)
+				{
+					// If not defined (should not happened, we fix this)
+					if (empty($this->userownerid))
+					{
+						$this->userownerid = $obj->fk_element;
+					}
+				}
+			}
 
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *    Delete event from database
-     *
-     *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
-     *    @return   int 					<0 if KO, >0 if OK
-     */
-    public function delete($notrigger = 0)
-    {
-        global $user;
+	/**
+	 *    Delete event from database
+	 *
+	 *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
+	 *    @return   int 					<0 if KO, >0 if OK
+	 */
+	public function delete($notrigger = 0)
+	{
+		global $user;
 
-        $error = 0;
+		$error = 0;
 
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // remove categorie association
-        if (!$error) {
+		// remove categorie association
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_actioncomm";
 			$sql .= " WHERE fk_actioncomm=".$this->id;
 
@@ -902,152 +911,160 @@ class ActionComm extends CommonObject
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
-        }
+		}
 
-        // remove actioncomm_resources
-        if (!$error) {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources";
-            $sql .= " WHERE fk_actioncomm=".$this->id;
+		// remove actioncomm_resources
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources";
+			$sql .= " WHERE fk_actioncomm=".$this->id;
 
-            $res = $this->db->query($sql);
-            if (!$res) {
-                $this->error = $this->db->lasterror();
-                $error++;
-            }
-        }
+			$res = $this->db->query($sql);
+			if (!$res) {
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+		}
 
-        // Removed extrafields
-        if (!$error) {
-        	  $result = $this->deleteExtraFields();
-          	if ($result < 0)
-           	{
-           		$error++;
-           		dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
-           	}
-        }
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
+			$sql .= " WHERE fk_actioncomm = ".$this->id;
 
-        // remove actioncomm
-        if (!$error) {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm";
-            $sql .= " WHERE id=".$this->id;
+			$res = $this->db->query($sql);
+			if (!$res) {
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+		}
 
-            $res = $this->db->query($sql);
-            if (!$res) {
-                $this->error = $this->db->lasterror();
-                $error++;
-            }
-        }
+		// Removed extrafields
+		if (!$error) {
+			  $result = $this->deleteExtraFields();
+		  	if ($result < 0)
+		   	{
+		   		$error++;
+		   		dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
+		   	}
+		}
 
-        if (!$error)
-        {
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('ACTION_DELETE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
+		// remove actioncomm
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm";
+			$sql .= " WHERE id=".$this->id;
 
-            if (!$error)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->db->rollback();
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+			$res = $this->db->query($sql);
+			if (!$res) {
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+		}
 
-    /**
-     *    Update action into database
-     *	  If percentage = 100, on met a jour date 100%
-     *
-     *    @param    User	$user			Object user making change
-     *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
-     *    @return   int     				<0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0)
-    {
-        global $langs, $conf, $hookmanager;
+		if (!$error)
+		{
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('ACTION_DELETE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 
-        $error = 0;
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->db->rollback();
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-        // Clean parameters
-        $this->label = trim($this->label);
-        $this->note_private = dol_htmlcleanlastbr(trim(empty($this->note_private) ? $this->note : $this->note_private));
-        if (empty($this->percentage))    $this->percentage = 0;
-        if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
-        if (empty($this->transparency))  $this->transparency = 0;
-        if (empty($this->fulldayevent))  $this->fulldayevent = 0;
-        if ($this->percentage > 100) $this->percentage = 100;
-        //if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-        if ($this->datep && $this->datef)   $this->durationp = ($this->datef - $this->datep); // deprecated
-        //if ($this->date  && $this->dateend) $this->durationa=($this->dateend - $this->date);
-        if ($this->datep && $this->datef && $this->datep > $this->datef) $this->datef = $this->datep;
-        //if ($this->date  && $this->dateend && $this->date > $this->dateend) $this->dateend=$this->date;
-        if ($this->fk_project < 0) $this->fk_project = 0;
+	/**
+	 *    Update action into database
+	 *	  If percentage = 100, on met a jour date 100%
+	 *
+	 *    @param    User	$user			Object user making change
+	 *    @param    int		$notrigger		1 = disable triggers, 0 = enable triggers
+	 *    @return   int     				<0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		global $langs, $conf, $hookmanager;
 
-        // Check parameters
-        if ($this->percentage == 0 && $this->userdoneid > 0)
-        {
-            $this->error = "ErrorCantSaveADoneUserWithZeroPercentage";
-            return -1;
-        }
+		$error = 0;
 
-        $socid = (($this->socid > 0) ? $this->socid : 0);
-        $contactid = (($this->contactid > 0) ? $this->contactid : 0);
+		// Clean parameters
+		$this->label = trim($this->label);
+		$this->note_private = dol_htmlcleanlastbr(trim(empty($this->note_private) ? $this->note : $this->note_private));
+		if (empty($this->percentage))    $this->percentage = 0;
+		if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
+		if (empty($this->transparency))  $this->transparency = 0;
+		if (empty($this->fulldayevent))  $this->fulldayevent = 0;
+		if ($this->percentage > 100) $this->percentage = 100;
+		//if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
+		if ($this->datep && $this->datef)   $this->durationp = ($this->datef - $this->datep); // deprecated
+		//if ($this->date  && $this->dateend) $this->durationa=($this->dateend - $this->date);
+		if ($this->datep && $this->datef && $this->datep > $this->datef) $this->datef = $this->datep;
+		//if ($this->date  && $this->dateend && $this->date > $this->dateend) $this->dateend=$this->date;
+		if ($this->fk_project < 0) $this->fk_project = 0;
+
+		// Check parameters
+		if ($this->percentage == 0 && $this->userdoneid > 0)
+		{
+			$this->error = "ErrorCantSaveADoneUserWithZeroPercentage";
+			return -1;
+		}
+
+		$socid = (($this->socid > 0) ? $this->socid : 0);
+		$contactid = (($this->contact_id > 0) ? $this->contact_id : 0);
 		$userownerid = ($this->userownerid ? $this->userownerid : 0);
 		$userdoneid = ($this->userdoneid ? $this->userdoneid : 0);
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
-        $sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
-        if ($this->type_id > 0) $sql .= ", fk_action = '".$this->db->escape($this->type_id)."'";
-        $sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
-        $sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
-        $sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
-        $sql .= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '' ? "'".$this->db->escape($this->durationp)."'" : "null"); // deprecated
-        $sql .= ", note = '".$this->db->escape($this->note_private)."'";
-        $sql .= ", fk_project =".($this->fk_project > 0 ? $this->fk_project : "null");
-        $sql .= ", fk_soc =".($socid > 0 ? $socid : "null");
-        $sql .= ", fk_contact =".($contactid > 0 ? $contactid : "null");
-        $sql .= ", priority = '".$this->db->escape($this->priority)."'";
-        $sql .= ", fulldayevent = '".$this->db->escape($this->fulldayevent)."'";
-        $sql .= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'" : "null");
-        $sql .= ", transparency = '".$this->db->escape($this->transparency)."'";
-        $sql .= ", fk_user_mod = ".$user->id;
-        $sql .= ", fk_user_action=".($userownerid > 0 ? "'".$userownerid."'" : "null");
-        $sql .= ", fk_user_done=".($userdoneid > 0 ? "'".$userdoneid."'" : "null");
-        if (!empty($this->fk_element)) $sql .= ", fk_element=".($this->fk_element ? $this->db->escape($this->fk_element) : "null");
-        if (!empty($this->elementtype)) $sql .= ", elementtype=".($this->elementtype ? "'".$this->db->escape($this->elementtype)."'" : "null");
-        $sql .= " WHERE id=".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
+		$sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
+		if ($this->type_id > 0) $sql .= ", fk_action = '".$this->db->escape($this->type_id)."'";
+		$sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
+		$sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
+		$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
+		$sql .= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '' ? "'".$this->db->escape($this->durationp)."'" : "null"); // deprecated
+		$sql .= ", note = '".$this->db->escape($this->note_private)."'";
+		$sql .= ", fk_project =".($this->fk_project > 0 ? $this->fk_project : "null");
+		$sql .= ", fk_soc =".($socid > 0 ? $socid : "null");
+		$sql .= ", fk_contact =".($contactid > 0 ? $contactid : "null");
+		$sql .= ", priority = '".$this->db->escape($this->priority)."'";
+		$sql .= ", fulldayevent = '".$this->db->escape($this->fulldayevent)."'";
+		$sql .= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'" : "null");
+		$sql .= ", transparency = '".$this->db->escape($this->transparency)."'";
+		$sql .= ", fk_user_mod = ".$user->id;
+		$sql .= ", fk_user_action = ".($userownerid > 0 ? "'".$this->db->escape($userownerid)."'" : "null");
+		$sql .= ", fk_user_done = ".($userdoneid > 0 ? "'".$this->db->escape($userdoneid)."'" : "null");
+		if (!empty($this->fk_element)) $sql .= ", fk_element=".($this->fk_element ? $this->db->escape($this->fk_element) : "null");
+		if (!empty($this->elementtype)) $sql .= ", elementtype=".($this->elementtype ? "'".$this->db->escape($this->elementtype)."'" : "null");
+		$sql .= " WHERE id=".$this->id;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
 			$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++;
+	   			}
+			}
 
-            // Now insert assignedusers
+			// Now insert assignedusers
 			if (!$error)
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources where fk_actioncomm = ".$this->id." AND element_type = 'user'";
@@ -1055,10 +1072,10 @@ class ActionComm extends CommonObject
 
 				foreach ($this->userassigned as $key => $val)
 				{
-			        if (!is_array($val))	// For backward compatibility when val=id
-			        {
-			        	$val = array('id'=>$val);
-			        }
+					if (!is_array($val))	// For backward compatibility when val=id
+					{
+						$val = array('id'=>$val);
+					}
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 					$sql .= " VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory']) ? '0' : $val['mandatory']).", ".(empty($val['transparency']) ? '0' : $val['transparency']).", ".(empty($val['answer_status']) ? '0' : $val['answer_status']).")";
 
@@ -1066,7 +1083,7 @@ class ActionComm extends CommonObject
 					if (!$resql)
 					{
 						$error++;
-		           		$this->errors[] = $this->db->lasterror();
+				   		$this->errors[] = $this->db->lasterror();
 					}
 					//var_dump($sql);exit;
 				}
@@ -1094,273 +1111,272 @@ class ActionComm extends CommonObject
 				}
 			}
 
-            if (!$error && !$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('ACTION_MODIFY', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('ACTION_MODIFY', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 
-            if (!$error)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                dol_syslog(get_class($this)."::update ".join(',', $this->errors), LOG_ERR);
-                return -2;
-            }
-        }
-        else
-        {
-            $this->db->rollback();
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				dol_syslog(get_class($this)."::update ".join(',', $this->errors), LOG_ERR);
+				return -2;
+			}
+		} else {
+			$this->db->rollback();
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    /**
-     *  Load all objects with filters.
-     *  @todo WARNING: This make a fetch on all records instead of making one request with a join.
-     *
-     *  @param		DoliDb	$db				Database handler
-     *  @param		int		$socid			Filter by thirdparty
-     *  @param		int		$fk_element		Id of element action is linked to
-     *  @param		string	$elementtype	Type of element action is linked to
-     *  @param		string	$filter			Other filter
-     *  @param		string	$sortfield		Sort on this field
-     *  @param		string	$sortorder		ASC or DESC
-     *  @param		string	$limit			Limit number of answers
-     *  @return		array|string			Error string if KO, array with actions if OK
-     */
-    public static function getActions($db, $socid = 0, $fk_element = 0, $elementtype = '', $filter = '', $sortfield = 'a.datep', $sortorder = 'DESC', $limit = 0)
-    {
-        global $conf, $langs;
+	/**
+	 *  Load all objects with filters.
+	 *  @todo WARNING: This make a fetch on all records instead of making one request with a join.
+	 *
+	 *  @param		DoliDb	$db				Not used
+	 *  @param		int		$socid			Filter by thirdparty
+	 *  @param		int		$fk_element		Id of element action is linked to
+	 *  @param		string	$elementtype	Type of element action is linked to
+	 *  @param		string	$filter			Other filter
+	 *  @param		string	$sortfield		Sort on this field
+	 *  @param		string	$sortorder		ASC or DESC
+	 *  @param		string	$limit			Limit number of answers
+	 *  @return		array|string			Error string if KO, array with actions if OK
+	 */
+	public static function getActions($db, $socid = 0, $fk_element = 0, $elementtype = '', $filter = '', $sortfield = 'a.datep', $sortorder = 'DESC', $limit = 0)
+	{
+		global $conf, $langs;
 
-        $resarray = array();
+		$resarray = array();
 
-        dol_syslog(get_class()."::getActions", LOG_DEBUG);
+		dol_syslog(get_class()."::getActions", LOG_DEBUG);
 
-        $sql = "SELECT a.id";
-        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-        $sql .= " WHERE a.entity IN (".getEntity('agenda').")";
-        if (!empty($socid)) $sql .= " AND a.fk_soc = ".$socid;
-        if (!empty($elementtype))
-        {
-            if ($elementtype == 'project') $sql .= ' AND a.fk_project = '.$fk_element;
-            else $sql .= " AND a.fk_element = ".(int) $fk_element." AND a.elementtype = '".$elementtype."'";
-        }
-        if (!empty($filter)) $sql .= $filter;
+		$sql = "SELECT a.id";
+		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
+		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
+		if (!empty($socid)) $sql .= " AND a.fk_soc = ".$socid;
+		if (!empty($elementtype))
+		{
+			if ($elementtype == 'project') {
+				$sql .= ' AND a.fk_project = '.$fk_element;
+			}
+			elseif ($elementtype == 'contact') {
+				$sql .= ' AND a.id IN';
+				$sql .= " (SELECT fk_actioncomm FROM ".MAIN_DB_PREFIX."actioncomm_resources WHERE";
+				$sql .= " element_type = 'socpeople' AND fk_element = ".$fk_element.')';
+			}
+			else {
+				$sql .= " AND a.fk_element = ".(int) $fk_element." AND a.elementtype = '".$db->escape($elementtype)."'";
+			}
+		}
+		if (!empty($filter)) $sql .= $filter;
 		if ($sortorder && $sortfield) $sql .= $db->order($sortfield, $sortorder);
 		$sql .= $db->plimit($limit, 0);
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
 
-            if ($num)
-            {
-                for ($i = 0; $i < $num; $i++)
-                {
-                    $obj = $db->fetch_object($resql);
-                    $actioncommstatic = new ActionComm($db);
-                    $actioncommstatic->fetch($obj->id);
-                    $resarray[$i] = $actioncommstatic;
-                }
-            }
-            $db->free($resql);
-            return $resarray;
-        }
-        else
-        {
-            return $db->lasterror();
-        }
-    }
+			if ($num)
+			{
+				for ($i = 0; $i < $num; $i++)
+				{
+					$obj = $db->fetch_object($resql);
+					$actioncommstatic = new ActionComm($db);
+					$actioncommstatic->fetch($obj->id);
+					$resarray[$i] = $actioncommstatic;
+				}
+			}
+			$db->free($resql);
+			return $resarray;
+		} else {
+			return $db->lasterror();
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     * @param	User	$user   			Objet user
-     * @param	int		$load_state_board	Charge indicateurs this->nb de tableau de bord
-     * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
-     */
-    public function load_board($user, $load_state_board = 0)
-    {
-        // 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
+	 * @param	int		$load_state_board	Charge indicateurs this->nb de tableau de bord
+	 * @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 */
+	public function load_board($user, $load_state_board = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-    	if (empty($load_state_board)) $sql = "SELECT a.id, a.datep as dp";
-    	else {
-    		$this->nb = array();
-    		$sql = "SELECT count(a.id) as nb";
-    	}
-    	$sql .= " FROM ".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 1 = 1";
-    	if (empty($load_state_board)) $sql .= " AND a.percent >= 0 AND a.percent < 100";
-    	$sql .= " AND a.entity IN (".getEntity('agenda').")";
-    	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 a.fk_soc = ".$user->socid;
-    	if (!$user->rights->agenda->allactions->read) $sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id.")";
+		if (empty($load_state_board)) $sql = "SELECT a.id, a.datep as dp";
+		else {
+			$this->nb = array();
+			$sql = "SELECT count(a.id) as nb";
+		}
+		$sql .= " FROM ".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 1 = 1";
+		if (empty($load_state_board)) $sql .= " AND a.percent >= 0 AND a.percent < 100";
+		$sql .= " AND a.entity IN (".getEntity('agenda').")";
+		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 a.fk_soc = ".$user->socid;
+		if (!$user->rights->agenda->allactions->read) $sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id.")";
 
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		if (empty($load_state_board)) {
-	    		$agenda_static = new ActionComm($this->db);
-	    		$response = new WorkboardResponse();
-	    		$response->warning_delay = $conf->agenda->warning_delay / 60 / 60 / 24;
-	    		$response->label = $langs->trans("ActionsToDo");
-	    		$response->labelShort = $langs->trans("ActionsToDoShort");
-	    		$response->url = DOL_URL_ROOT.'/comm/action/list.php?actioncode=0&amp;status=todo&amp;mainmenu=agenda';
-	    		if ($user->rights->agenda->allactions->read) $response->url .= '&amp;filtert=-1';
-	    		$response->img = img_object('', "action", 'class="inline-block valigntextmiddle"');
-    		}
-    		// This assignment in condition is not a bug. It allows walking the results.
-    		while ($obj = $this->db->fetch_object($resql))
-    		{
-    			if (empty($load_state_board)) {
-	    			$response->nbtodo++;
-	    			$agenda_static->datep = $this->db->jdate($obj->dp);
-	    			if ($agenda_static->hasDelay()) $response->nbtodolate++;
-    			} else $this->nb["actionscomm"] = $obj->nb;
-    		}
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (empty($load_state_board)) {
+				$agenda_static = new ActionComm($this->db);
+				$response = new WorkboardResponse();
+				$response->warning_delay = $conf->agenda->warning_delay / 60 / 60 / 24;
+				$response->label = $langs->trans("ActionsToDo");
+				$response->labelShort = $langs->trans("ActionsToDoShort");
+				$response->url = DOL_URL_ROOT.'/comm/action/list.php?action=show_list&actioncode=0&status=todo&mainmenu=agenda';
+				if ($user->rights->agenda->allactions->read) $response->url .= '&filtert=-1';
+				$response->img = img_object('', "action", 'class="inline-block valigntextmiddle"');
+			}
+			// This assignment in condition is not a bug. It allows walking the results.
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				if (empty($load_state_board)) {
+					$response->nbtodo++;
+					$agenda_static->datep = $this->db->jdate($obj->dp);
+					if ($agenda_static->hasDelay()) $response->nbtodolate++;
+				} else $this->nb["actionscomm"] = $obj->nb;
+			}
 
-    		$this->db->free($resql);
-    		if (empty($load_state_board)) return $response;
-    		else return 1;
-    	}
-    	else
-    	{
-    		dol_print_error($this->db);
-    		$this->error = $this->db->error();
-    		return -1;
-    	}
-    }
+			$this->db->free($resql);
+			if (empty($load_state_board)) return $response;
+			else return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Charge les informations d'ordre info dans l'objet facture
-     *
-     *  @param	int		$id       	Id de la facture a charger
-     *  @return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT ';
-        $sql .= ' a.id,';
-        $sql .= ' datec,';
-        $sql .= ' tms as datem,';
-        $sql .= ' fk_user_author,';
-        $sql .= ' fk_user_mod';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
-        $sql .= ' WHERE a.id = '.$id;
+	/**
+	 *  Charge les informations d'ordre info dans l'objet facture
+	 *
+	 *  @param	int		$id       	Id de la facture a charger
+	 *  @return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT ';
+		$sql .= ' a.id,';
+		$sql .= ' datec,';
+		$sql .= ' tms as datem,';
+		$sql .= ' fk_user_author,';
+		$sql .= ' fk_user_mod';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm as a';
+		$sql .= ' WHERE a.id = '.$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);
-                $this->id = $obj->id;
-                if ($obj->fk_user_author)
-                {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation = $cuser;
-                }
-                if ($obj->fk_user_mod)
-                {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_mod);
-                    $this->user_modification = $muser;
-                }
+		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->id;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+				if ($obj->fk_user_mod)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_mod);
+					$this->user_modification = $muser;
+				}
 
-                $this->date_creation = $this->db->jdate($obj->datec);
-                if (!empty($obj->fk_user_mod)) $this->date_modification = $this->db->jdate($obj->datem);
-            }
-            $this->db->free($result);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+				$this->date_creation = $this->db->jdate($obj->datec);
+				if (!empty($obj->fk_user_mod)) $this->date_modification = $this->db->jdate($obj->datem);
+			}
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    /**
-     *  Return label of status
-     *
-     *  @param	int		$mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-     *  @param  int		$hidenastatus   1=Show nothing if status is "Not applicable"
-     *  @return string          		String with status
-     */
-    public function getLibStatut($mode, $hidenastatus = 0)
-    {
-        return $this->LibStatut($this->percentage, $mode, $hidenastatus, $this->datep);
-    }
+	/**
+	 *  Return label of status
+	 *
+	 *  @param	int		$mode           0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int		$hidenastatus   1=Show nothing if status is "Not applicable"
+	 *  @return string          		String with status
+	 */
+	public function getLibStatut($mode, $hidenastatus = 0)
+	{
+		return $this->LibStatut($this->percentage, $mode, $hidenastatus, $this->datep);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return label of action status
-     *
-     *  @param  int     $percent        Percent
-     *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
-     *  @param  int		$hidenastatus   1=Show nothing if status is "Not applicable"
-     *  @param  int     $datestart      Date start of event
-     *  @return string		    		Label
-     */
-    public function LibStatut($percent, $mode, $hidenastatus = 0, $datestart = '')
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return label of action status
+	 *
+	 *  @param  int     $percent        Percent
+	 *  @param  int		$mode           0=Long label, 1=Short label, 2=Picto+Short label, 3=Picto, 4=Picto+Short label, 5=Short label+Picto, 6=Picto+Long label, 7=Very short label+Picto
+	 *  @param  int		$hidenastatus   1=Show nothing if status is "Not applicable"
+	 *  @param  int     $datestart      Date start of event
+	 *  @return string		    		Label
+	 */
+	public function LibStatut($percent, $mode, $hidenastatus = 0, $datestart = '')
+	{
+		// phpcs:enable
+		global $langs;
 
-        $labelStatus = $langs->trans('StatusNotApplicable');
-       	if ($percent == -1 && !$hidenastatus) $labelStatus = $langs->trans('StatusNotApplicable');
-       	elseif ($percent == 0) $labelStatus = $langs->trans('StatusActionToDo').' (0%)';
-       	elseif ($percent > 0 && $percent < 100) $labelStatus = $langs->trans('StatusActionInProcess').' ('.$percent.'%)';
-       	elseif ($percent >= 100) $labelStatus = $langs->trans('StatusActionDone').' (100%)';
+		$labelStatus = $langs->trans('StatusNotApplicable');
+	   	if ($percent == -1 && !$hidenastatus) $labelStatus = $langs->trans('StatusNotApplicable');
+	   	elseif ($percent == 0) $labelStatus = $langs->trans('StatusActionToDo').' (0%)';
+	   	elseif ($percent > 0 && $percent < 100) $labelStatus = $langs->trans('StatusActionInProcess').' ('.$percent.'%)';
+	   	elseif ($percent >= 100) $labelStatus = $langs->trans('StatusActionDone').' (100%)';
 
-        $labelStatusShort = $langs->trans('StatusNotApplicable');
-        if ($percent == -1 && !$hidenastatus) $labelStatusShort = $langs->trans('NA');
-        elseif ($percent == 0) $labelStatusShort = '0%';
-        elseif ($percent > 0 && $percent < 100) $labelStatusShort = $percent.'%';
-        elseif ($percent >= 100) $labelStatusShort = '100%';
+		$labelStatusShort = $langs->trans('StatusNotApplicable');
+		if ($percent == -1 && !$hidenastatus) $labelStatusShort = $langs->trans('NA');
+		elseif ($percent == 0) $labelStatusShort = '0%';
+		elseif ($percent > 0 && $percent < 100) $labelStatusShort = $percent.'%';
+		elseif ($percent >= 100) $labelStatusShort = '100%';
 
-        $statusType = 'status9';
-        if ($percent == -1 && !$hidenastatus) $statusType = 'status9';
-        if ($percent == 0) $statusType = 'status1';
-        if ($percent > 0 && $percent < 100) $statusType = 'status3';
-        if ($percent >= 100) $statusType = 'status6';
+		$statusType = 'status9';
+		if ($percent == -1 && !$hidenastatus) $statusType = 'status9';
+		if ($percent == 0) $statusType = 'status1';
+		if ($percent > 0 && $percent < 100) $statusType = 'status3';
+		if ($percent >= 100) $statusType = 'status6';
 
-        return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
-    }
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
+	}
 
-    /**
-     *  Return URL of event
-     *  Use $this->id, $this->type_code, $this->label and $this->type_label
-     *
-     *  @param	int		$withpicto				0 = No picto, 1 = Include picto into link, 2 = Only picto
-     *  @param	int		$maxlength				Max number of charaters into label. If negative, use the ref as label.
-     *  @param	string	$classname				Force style class on a link
-     *  @param	string	$option					'' = Link to action, 'birthday'= Link to contact, 'holiday' = Link to leave
-     *  @param	int		$overwritepicto			1 = Overwrite picto
-     *  @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, $classname = '', $option = '', $overwritepicto = 0, $notooltip = 0, $save_lastsearch_value = -1)
-    {
-        global $conf, $langs, $user, $hookmanager, $action;
+	/**
+	 *  Return URL of event
+	 *  Use $this->id, $this->type_code, $this->label and $this->type_label
+	 *
+	 *  @param	int		$withpicto				0 = No picto, 1 = Include picto into link, 2 = Only picto
+	 *  @param	int		$maxlength				Max number of charaters into label. If negative, use the ref as label.
+	 *  @param	string	$classname				Force style class on a link
+	 *  @param	string	$option					'' = Link to action, 'birthday'= Link to contact, 'holiday' = Link to leave
+	 *  @param	int		$overwritepicto			1 = Overwrite picto
+	 *  @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, $classname = '', $option = '', $overwritepicto = 0, $notooltip = 0, $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $user, $hookmanager, $action;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$canread = 0;
 		if ($user->rights->agenda->myactions->read && $this->authorid == $user->id) $canread = 1; // Can read my event
@@ -1368,10 +1384,10 @@ class ActionComm extends CommonObject
 		if ($user->rights->agenda->allactions->read) $canread = 1; // Can read all event of other
 		if (!$canread)
 		{
-            $option = 'nolink';
+			$option = 'nolink';
 		}
 
-        $label = $this->label;
+		$label = $this->label;
 		if (empty($label)) $label = $this->libelle; // For backward compatibility
 
 		$result = '';
@@ -1384,10 +1400,10 @@ class ActionComm extends CommonObject
 		}
 		if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
-		    if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
+			if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
 		}
 
-		$tooltip = '<u>'.$langs->trans('Action').'</u>';
+		$tooltip = img_picto('', $this->picto).' <u>'.$langs->trans('Action').'</u>';
 		if (!empty($this->ref))
 			$tooltip .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($label))
@@ -1396,38 +1412,38 @@ class ActionComm extends CommonObject
 			$tooltip .= '<br><b>'.$langs->trans('Type').':</b> '.$labeltype;
 		if (!empty($this->location))
 			$tooltip .= '<br><b>'.$langs->trans('Location').':</b> '.$this->location;
+		if (isset($this->transparency))
+			$tooltip .= '<br><b>'.$langs->trans('Busy').':</b> '.yn($this->transparency);
 		if (!empty($this->note_private))
-		    $tooltip .= '<br><b>'.$langs->trans('Note').':</b> '.(dol_textishtml($this->note_private) ? str_replace(array("\r", "\n"), "", $this->note_private) : str_replace(array("\r", "\n"), '<br>', $this->note_private));
+			$tooltip .= '<br><b>'.$langs->trans('Note').':</b> '.(dol_textishtml($this->note_private) ? str_replace(array("\r", "\n"), "", $this->note_private) : str_replace(array("\r", "\n"), '<br>', $this->note_private));
 		$linkclose = '';
 		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color)
 			$linkclose = ' style="background-color:#'.$this->type_color.'"';
 
 		if (empty($notooltip))
 		{
-		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label = $langs->trans("ShowAction");
-		        $linkclose .= ' alt="'.dol_escape_htmltag($tooltip, 1).'"';
-		    }
-		    $linkclose .= ' title="'.dol_escape_htmltag($tooltip, 1).'"';
-		    $linkclose .= ' class="'.$classname.' classfortooltip"';
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowAction");
+				$linkclose .= ' alt="'.dol_escape_htmltag($tooltip, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($tooltip, 1).'"';
+			$linkclose .= ' class="'.$classname.' classfortooltip"';
 
-		    /*
+			/*
 		    $hookmanager->initHooks(array('actiondao'));
 		    $parameters=array('id'=>$this->id);
 		    $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		    $linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
 		    */
-		}
-		else $linkclose .= ' class="'.$classname.'"';
+		} else $linkclose .= ' class="'.$classname.'"';
 
 		$url = '';
 		if ($option == 'birthday')
 			$url = DOL_URL_ROOT.'/contact/perso.php?id='.$this->id;
 		elseif ($option == 'holiday')
-            $url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
-		else
-			$url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
+			$url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
+		else $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
@@ -1445,172 +1461,170 @@ class ActionComm extends CommonObject
 			$linkend = '';
 		}
 
-        if ($withpicto == 2)
-        {
-            $libelle = $label;
-            if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle = $labeltype;
-            $libelleshort = '';
-        }
-        else
-        {
-            $libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
-            if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle = $labeltype;
-            if ($maxlength < 0) $libelleshort = $this->ref;
-            else $libelleshort = dol_trunc($libelle, $maxlength);
-        }
+		if ($withpicto == 2)
+		{
+			$libelle = $label;
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle = $labeltype;
+			$libelleshort = '';
+		} else {
+			$libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle = $labeltype;
+			if ($maxlength < 0) $libelleshort = $this->ref;
+			else $libelleshort = dol_trunc($libelle, $maxlength);
+		}
 
-        if ($withpicto)
-        {
-            if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))	// Add code into ()
-            {
-            	if ($labeltype)
-            	{
-                	$libelle .= (preg_match('/'.preg_quote($labeltype, '/').'/', $libelle) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
-            	}
-            }
-        }
+		if ($withpicto)
+		{
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))	// Add code into ()
+			{
+				if ($labeltype)
+				{
+					$libelle .= (preg_match('/'.preg_quote($labeltype, '/').'/', $libelle) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
+				}
+			}
+		}
 
-        $result .= $linkstart;
-        if ($withpicto)	$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$libelle), ($overwritepicto ? $overwritepicto : 'action'), ($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        $result .= $libelleshort;
-        $result .= $linkend;
+		$result .= $linkstart;
+		if ($withpicto)	$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$libelle), ($overwritepicto ? $overwritepicto : 'action'), ($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		$result .= $libelleshort;
+		$result .= $linkend;
 
-        global $action;
-        $hookmanager->initHooks(array('actiondao'));
-        $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->initHooks(array('actiondao'));
+		$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;
+	}
 
-    /**
-     * Sets object to supplied categories.
-     *
-     * Deletes object from existing categories not supplied.
-     * Adds it to non existing supplied categories.
-     * Existing categories are left untouch.
-     *
-     * @param  int[]|int $categories Category or categories IDs
-     * @return void
-     */
-    public function setCategories($categories)
-    {
-        // Handle single category
-        if (!is_array($categories)) {
-            $categories = array($categories);
-        }
+	/**
+	 * Sets object to supplied categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param  int[]|int $categories Category or categories IDs
+	 * @return void
+	 */
+	public function setCategories($categories)
+	{
+		// Handle single category
+		if (!is_array($categories)) {
+			$categories = array($categories);
+		}
 
-        // Get current categories
-        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-        $c = new Categorie($this->db);
-        $existing = $c->containing($this->id, Categorie::TYPE_ACTIONCOMM, 'id');
+		// Get current categories
+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$c = new Categorie($this->db);
+		$existing = $c->containing($this->id, Categorie::TYPE_ACTIONCOMM, 'id');
 
-        // Diff
-        if (is_array($existing)) {
-            $to_del = array_diff($existing, $categories);
-            $to_add = array_diff($categories, $existing);
-        } else {
-            $to_del = array(); // Nothing to delete
-            $to_add = $categories;
-        }
+		// Diff
+		if (is_array($existing)) {
+			$to_del = array_diff($existing, $categories);
+			$to_add = array_diff($categories, $existing);
+		} else {
+			$to_del = array(); // Nothing to delete
+			$to_add = $categories;
+		}
 
-        // Process
-        foreach ($to_del as $del) {
-            if ($c->fetch($del) > 0) {
-                $c->del_type($this, Categorie::TYPE_ACTIONCOMM);
-            }
-        }
-        foreach ($to_add as $add) {
-            if ($c->fetch($add) > 0) {
-                $c->add_type($this, Categorie::TYPE_ACTIONCOMM);
-            }
-        }
-        return;
-    }
+		// Process
+		foreach ($to_del as $del) {
+			if ($c->fetch($del) > 0) {
+				$c->del_type($this, Categorie::TYPE_ACTIONCOMM);
+			}
+		}
+		foreach ($to_add as $add) {
+			if ($c->fetch($add) > 0) {
+				$c->add_type($this, Categorie::TYPE_ACTIONCOMM);
+			}
+		}
+		return;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Export events from database into a cal file.
-     *
-     * @param string    $format         The format of the export 'vcal', 'ical/ics' or 'rss'
-     * @param string    $type           The type of the export 'event' or 'journal'
-     * @param integer   $cachedelay     Do not rebuild file if date older than cachedelay seconds
-     * @param string    $filename       The name for the exported file.
-     * @param array     $filters        Array of filters. Example array('notolderthan'=>99, 'year'=>..., 'idfrom'=>..., 'notactiontype'=>'systemauto', 'project'=>123, ...)
-     * @param integer   $exportholiday  0 = don't integrate holidays into the export, 1 = integrate holidays into the export
-     * @return integer                  -1 = error on build export file, 0 = export okay
-     */
-    public function build_exportfile($format, $type, $cachedelay, $filename, $filters, $exportholiday = 0)
-    {
-        global $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Export events from database into a cal file.
+	 *
+	 * @param string    $format         The format of the export 'vcal', 'ical/ics' or 'rss'
+	 * @param string    $type           The type of the export 'event' or 'journal'
+	 * @param integer   $cachedelay     Do not rebuild file if date older than cachedelay seconds
+	 * @param string    $filename       The name for the exported file.
+	 * @param array     $filters        Array of filters. Example array('notolderthan'=>99, 'year'=>..., 'idfrom'=>..., 'notactiontype'=>'systemauto', 'project'=>123, ...)
+	 * @param integer   $exportholiday  0 = don't integrate holidays into the export, 1 = integrate holidays into the export
+	 * @return integer                  -1 = error on build export file, 0 = export okay
+	 */
+	public function build_exportfile($format, $type, $cachedelay, $filename, $filters, $exportholiday = 0)
+	{
+		global $hookmanager;
 
-        // phpcs:enable
-        global $conf, $langs, $dolibarr_main_url_root, $mysoc;
+		// phpcs:enable
+		global $conf, $langs, $dolibarr_main_url_root, $mysoc;
 
-        require_once DOL_DOCUMENT_ROOT."/core/lib/xcal.lib.php";
-        require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
-        require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
+		require_once DOL_DOCUMENT_ROOT."/core/lib/xcal.lib.php";
+		require_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
+		require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 
-        dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
+		dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
 
-        // Check parameters
-        if (empty($format)) return -1;
+		// Check parameters
+		if (empty($format)) return -1;
 
-        // Clean parameters
-        if (!$filename)
-        {
-            $extension = 'vcs';
-            if ($format == 'ical') $extension = 'ics';
-            $filename = $format.'.'.$extension;
-        }
+		// Clean parameters
+		if (!$filename)
+		{
+			$extension = 'vcs';
+			if ($format == 'ical') $extension = 'ics';
+			$filename = $format.'.'.$extension;
+		}
 
-        // Create dir and define output file (definitive and temporary)
-        $result = dol_mkdir($conf->agenda->dir_temp);
-        $outputfile = $conf->agenda->dir_temp.'/'.$filename;
+		// Create dir and define output file (definitive and temporary)
+		$result = dol_mkdir($conf->agenda->dir_temp);
+		$outputfile = $conf->agenda->dir_temp.'/'.$filename;
 
-        $result = 0;
+		$result = 0;
 
-        $buildfile = true;
-        $login = ''; $logina = ''; $logind = ''; $logint = '';
+		$buildfile = true;
+		$login = ''; $logina = ''; $logind = ''; $logint = '';
 
-        $now = dol_now();
+		$now = dol_now();
 
-        if ($cachedelay)
-        {
-            $nowgmt = dol_now();
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-            if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
-            {
-                dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
-                $buildfile = false;
-            }
-        }
+		if ($cachedelay)
+		{
+			$nowgmt = dol_now();
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
+			{
+				dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
+				$buildfile = false;
+			}
+		}
 
-        if ($buildfile)
-        {
-            // Build event array
-            $eventarray = array();
+		if ($buildfile)
+		{
+			// Build event array
+			$eventarray = array();
 
-            $sql = "SELECT a.id,";
-            $sql .= " a.datep,"; // Start
-            $sql .= " a.datep2,"; // End
-            $sql .= " a.durationp,"; // deprecated
-            $sql .= " a.datec, a.tms as datem,";
-            $sql .= " a.label, a.code, a.note, a.fk_action as type_id,";
-            $sql .= " a.fk_soc,";
-            $sql .= " a.fk_user_author, a.fk_user_mod,";
-            $sql .= " a.fk_user_action,";
-            $sql .= " a.fk_contact, a.percent as percentage,";
-            $sql .= " a.fk_element, a.elementtype,";
-            $sql .= " a.priority, a.fulldayevent, a.location, a.transparency,";
-            $sql .= " u.firstname, u.lastname, u.email,";
-            $sql .= " s.nom as socname,";
-            $sql .= " c.id as type_id, c.code as type_code, c.libelle as type_label";
-            $sql .= " FROM (".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a)";
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author"; // Link to get author of event for export
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
+			$sql = "SELECT a.id,";
+			$sql .= " a.datep,"; // Start
+			$sql .= " a.datep2,"; // End
+			$sql .= " a.durationp,"; // deprecated
+			$sql .= " a.datec, a.tms as datem,";
+			$sql .= " a.label, a.code, a.note, a.fk_action as type_id,";
+			$sql .= " a.fk_soc,";
+			$sql .= " a.fk_user_author, a.fk_user_mod,";
+			$sql .= " a.fk_user_action,";
+			$sql .= " a.fk_contact, a.percent as percentage,";
+			$sql .= " a.fk_element, a.elementtype,";
+			$sql .= " a.priority, a.fulldayevent, a.location, a.transparency,";
+			$sql .= " u.firstname, u.lastname, u.email,";
+			$sql .= " s.nom as socname,";
+			$sql .= " c.id as type_id, c.code as type_code, c.libelle as type_label";
+			$sql .= " FROM (".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a)";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author"; // Link to get author of event for export
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
 
 			$parameters = array('filters' => $filters);
 			$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters); // Note that $action and $object may have been modified by hook
@@ -1619,131 +1633,129 @@ class ActionComm extends CommonObject
 			// We must filter on assignement table
 			if ($filters['logint']) $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
 			$sql .= " WHERE a.fk_action=c.id";
-            $sql .= " AND a.entity IN (".getEntity('agenda').")";
-            foreach ($filters as $key => $value)
-            {
-                if ($key == 'notolderthan' && $value != '') $sql .= " AND a.datep >= '".$this->db->idate($now - ($value * 24 * 60 * 60))."'";
-                if ($key == 'year')         $sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value, 1))."' AND '".$this->db->idate(dol_get_last_day($value, 12))."'";
-                if ($key == 'id')           $sql .= " AND a.id=".(is_numeric($value) ? $value : 0);
-                if ($key == 'idfrom')       $sql .= " AND a.id >= ".(is_numeric($value) ? $value : 0);
-                if ($key == 'idto')         $sql .= " AND a.id <= ".(is_numeric($value) ? $value : 0);
-                if ($key == 'project')      $sql .= " AND a.fk_project=".(is_numeric($value) ? $value : 0);
-                if ($key == 'actiontype')    $sql .= " AND c.type = '".$this->db->escape($value)."'";
-                if ($key == 'notactiontype') $sql .= " AND c.type <> '".$this->db->escape($value)."'";
-                // We must filter on assignement table
+			$sql .= " AND a.entity IN (".getEntity('agenda').")";
+			foreach ($filters as $key => $value)
+			{
+				if ($key == 'notolderthan' && $value != '') $sql .= " AND a.datep >= '".$this->db->idate($now - ($value * 24 * 60 * 60))."'";
+				if ($key == 'year')         $sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value, 1))."' AND '".$this->db->idate(dol_get_last_day($value, 12))."'";
+				if ($key == 'id')           $sql .= " AND a.id=".(is_numeric($value) ? $value : 0);
+				if ($key == 'idfrom')       $sql .= " AND a.id >= ".(is_numeric($value) ? $value : 0);
+				if ($key == 'idto')         $sql .= " AND a.id <= ".(is_numeric($value) ? $value : 0);
+				if ($key == 'project')      $sql .= " AND a.fk_project=".(is_numeric($value) ? $value : 0);
+				if ($key == 'actiontype')    $sql .= " AND c.type = '".$this->db->escape($value)."'";
+				if ($key == 'notactiontype') $sql .= " AND c.type <> '".$this->db->escape($value)."'";
+				// We must filter on assignement table
 				if ($key == 'logint')       $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
-                if ($key == 'logina')
-                {
-                    $logina = $value;
-                    $condition = '=';
-                    if (preg_match('/^!/', $logina))
-                    {
-                        $logina = preg_replace('/^!/', '', $logina);
-                        $condition = '<>';
-                    }
-                    $userforfilter = new User($this->db);
-                    $result = $userforfilter->fetch('', $logina);
-                    if ($result > 0) $sql .= " AND a.fk_user_author ".$condition." ".$userforfilter->id;
-                    elseif ($result < 0 || $condition == '=') $sql .= " AND a.fk_user_author = 0";
-                }
-                if ($key == 'logint')
-                {
-                    $logint = $value;
-                    $condition = '=';
-                    if (preg_match('/^!/', $logint))
-                    {
-                        $logint = preg_replace('/^!/', '', $logint);
-                        $condition = '<>';
-                    }
-                    $userforfilter = new User($this->db);
-                    $result = $userforfilter->fetch('', $logint);
-                    if ($result > 0) $sql .= " AND ar.fk_element = ".$userforfilter->id;
-                    elseif ($result < 0 || $condition == '=') $sql .= " AND ar.fk_element = 0";
-                }
-            }
+				if ($key == 'logina')
+				{
+					$logina = $value;
+					$condition = '=';
+					if (preg_match('/^!/', $logina))
+					{
+						$logina = preg_replace('/^!/', '', $logina);
+						$condition = '<>';
+					}
+					$userforfilter = new User($this->db);
+					$result = $userforfilter->fetch('', $logina);
+					if ($result > 0) $sql .= " AND a.fk_user_author ".$condition." ".$userforfilter->id;
+					elseif ($result < 0 || $condition == '=') $sql .= " AND a.fk_user_author = 0";
+				}
+				if ($key == 'logint')
+				{
+					$logint = $value;
+					$condition = '=';
+					if (preg_match('/^!/', $logint))
+					{
+						$logint = preg_replace('/^!/', '', $logint);
+						$condition = '<>';
+					}
+					$userforfilter = new User($this->db);
+					$result = $userforfilter->fetch('', $logint);
+					if ($result > 0) $sql .= " AND ar.fk_element = ".$userforfilter->id;
+					elseif ($result < 0 || $condition == '=') $sql .= " AND ar.fk_element = 0";
+				}
+			}
 
-            $sql .= " AND a.datep IS NOT NULL"; // To exclude corrupted events and avoid errors in lightning/sunbird import
+			$sql .= " AND a.datep IS NOT NULL"; // To exclude corrupted events and avoid errors in lightning/sunbird import
 
 			$parameters = array('filters' => $filters);
 			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 			$sql .= $hookmanager->resPrint;
 
-            $sql .= " ORDER by datep";
-            //print $sql;exit;
+			$sql .= " ORDER by datep";
+			//print $sql;exit;
 
-            dol_syslog(get_class($this)."::build_exportfile select events", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                // Note: Output of sql request is encoded in $conf->file->character_set_client
-                // This assignment in condition is not a bug. It allows walking the results.
+			dol_syslog(get_class($this)."::build_exportfile select events", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				// Note: Output of sql request is encoded in $conf->file->character_set_client
+				// This assignment in condition is not a bug. It allows walking the results.
 				$diff = 0;
-                while ($obj = $this->db->fetch_object($resql))
-                {
-                    $qualified = true;
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$qualified = true;
 
-                    // 'eid','startdate','duration','enddate','title','summary','category','email','url','desc','author'
-                    $event = array();
-                    $event['uid'] = 'dolibarragenda-'.$this->db->database_name.'-'.$obj->id."@".$_SERVER["SERVER_NAME"];
-                    $event['type'] = $type;
-                    $datestart = $this->db->jdate($obj->datep) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
+					// 'eid','startdate','duration','enddate','title','summary','category','email','url','desc','author'
+					$event = array();
+					$event['uid'] = 'dolibarragenda-'.$this->db->database_name.'-'.$obj->id."@".$_SERVER["SERVER_NAME"];
+					$event['type'] = $type;
+					$datestart = $this->db->jdate($obj->datep) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
 
-                    // fix for -> Warning: A non-numeric value encountered
-                    if (is_numeric($this->db->jdate($obj->datep2)))
-                    {
-                        $dateend = $this->db->jdate($obj->datep2)
-                                 - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
-                    }
-                    else
-                    {
-                        // use start date as fall-back to avoid import erros on empty end date
-                        $dateend = $datestart;
-                    }
+					// fix for -> Warning: A non-numeric value encountered
+					if (is_numeric($this->db->jdate($obj->datep2)))
+					{
+						$dateend = $this->db->jdate($obj->datep2)
+								 - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
+					} else {
+						// use start date as fall-back to avoid import erros on empty end date
+						$dateend = $datestart;
+					}
 
-                    $duration = ($datestart && $dateend) ? ($dateend - $datestart) : 0;
-                    $event['summary'] = $obj->label.($obj->socname ? " (".$obj->socname.")" : "");
-                    $event['desc'] = $obj->note;
-                    $event['startdate'] = $datestart;
-                    $event['enddate'] = $dateend; // Not required with type 'journal'
-                    $event['duration'] = $duration; // Not required with type 'journal'
-                    $event['author'] = dolGetFirstLastname($obj->firstname, $obj->lastname);
-                    $event['priority'] = $obj->priority;
-                    $event['fulldayevent'] = $obj->fulldayevent;
-                    $event['location'] = $obj->location;
-                    $event['transparency'] = (($obj->transparency > 0) ? 'OPAQUE' : 'TRANSPARENT'); // OPAQUE (busy) or TRANSPARENT (not busy)
-                    $event['category'] = $obj->type_label;
-                    $event['email'] = $obj->email;
+					$duration = ($datestart && $dateend) ? ($dateend - $datestart) : 0;
+					$event['summary'] = $obj->label.($obj->socname ? " (".$obj->socname.")" : "");
+					$event['desc'] = $obj->note;
+					$event['startdate'] = $datestart;
+					$event['enddate'] = $dateend; // Not required with type 'journal'
+					$event['duration'] = $duration; // Not required with type 'journal'
+					$event['author'] = dolGetFirstLastname($obj->firstname, $obj->lastname);
+					$event['priority'] = $obj->priority;
+					$event['fulldayevent'] = $obj->fulldayevent;
+					$event['location'] = $obj->location;
+					$event['transparency'] = (($obj->transparency > 0) ? 'OPAQUE' : 'TRANSPARENT'); // OPAQUE (busy) or TRANSPARENT (not busy)
+					$event['category'] = $obj->type_label;
+					$event['email'] = $obj->email;
 					// 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
-                    $url = $urlwithroot.'/comm/action/card.php?id='.$obj->id;
-                    $event['url'] = $url;
-                    $event['created'] = $this->db->jdate($obj->datec) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
-                    $event['modified'] = $this->db->jdate($obj->datem) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
+					$url = $urlwithroot.'/comm/action/card.php?id='.$obj->id;
+					$event['url'] = $url;
+					$event['created'] = $this->db->jdate($obj->datec) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
+					$event['modified'] = $this->db->jdate($obj->datem) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
 
-                    // TODO: find a way to call "$this->fetch_userassigned();" without override "$this" properties
-                    $this->id = $obj->id;
-                    $this->fetch_userassigned(false);
+					// TODO: find a way to call "$this->fetch_userassigned();" without override "$this" properties
+					$this->id = $obj->id;
+					$this->fetch_userassigned(false);
 
-                    $assignedUserArray = array();
+					$assignedUserArray = array();
 
-                    foreach ($this->userassigned as $key => $value)
-                    {
-                        $assignedUser = new User($this->db);
-                        $assignedUser->fetch($value['id']);
+					foreach ($this->userassigned as $key => $value)
+					{
+						$assignedUser = new User($this->db);
+						$assignedUser->fetch($value['id']);
 
-                        $assignedUserArray[$key] = $assignedUser;
-                    }
+						$assignedUserArray[$key] = $assignedUser;
+					}
 
-                    $event['assignedUsers'] = $assignedUserArray;
+					$event['assignedUsers'] = $assignedUserArray;
 
-                    if ($qualified && $datestart)
-                    {
-                        $eventarray[] = $event;
-                    }
-                    $diff++;
-                }
+					if ($qualified && $datestart)
+					{
+						$eventarray[] = $event;
+					}
+					$diff++;
+				}
 
 				$parameters = array('filters' => $filters, 'eventarray' => &$eventarray);
 				$reshook = $hookmanager->executeHooks('addMoreEventsExport', $parameters); // Note that $action and $object may have been modified by hook
@@ -1751,187 +1763,175 @@ class ActionComm extends CommonObject
 				{
 					$eventarray = $hookmanager->resArray;
 				}
-            }
-            else
-            {
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
+			} else {
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
 
 			if ($exportholiday == 1)
-            {
-                $langs->load("holidays");
-                $title = $langs->trans("Holidays");
+			{
+				$langs->load("holidays");
+				$title = $langs->trans("Holidays");
 
-                $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.email, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
-                $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
-                $sql .= " WHERE u.rowid = x.fk_user";
-                $sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
-                $sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
+				$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.email, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
+				$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
+				$sql .= " WHERE u.rowid = x.fk_user";
+				$sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
+				$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
 
-                $resql = $this->db->query($sql);
-                if ($resql)
-                {
-                    $num = $this->db->num_rows($resql);
-                    $i   = 0;
+				$resql = $this->db->query($sql);
+				if ($resql)
+				{
+					$num = $this->db->num_rows($resql);
+					$i   = 0;
 
-                    while ($i < $num)
-                    {
-                        $obj   = $this->db->fetch_object($resql);
-                        $event = array();
+					while ($i < $num)
+					{
+						$obj   = $this->db->fetch_object($resql);
+						$event = array();
 
-                        if ($obj->halfday == -1)
-                        {
-                            $event['fulldayevent'] = false;
+						if ($obj->halfday == -1)
+						{
+							$event['fulldayevent'] = false;
 
-                            $timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
-                            $timestampEnd   = dol_stringtotime($obj->date_end." 12:00:00", 0);
-                        }
-                        elseif ($obj->halfday == 1)
-                        {
-                            $event['fulldayevent'] = false;
+							$timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
+							$timestampEnd   = dol_stringtotime($obj->date_end." 12:00:00", 0);
+						} elseif ($obj->halfday == 1)
+						{
+							$event['fulldayevent'] = false;
 
-                            $timestampStart = dol_stringtotime($obj->date_start." 12:00:00", 0);
-                            $timestampEnd   = dol_stringtotime($obj->date_end." 23:59:59", 0);
-                        }
-                        else
-                        {
-                            $event['fulldayevent'] = true;
+							$timestampStart = dol_stringtotime($obj->date_start." 12:00:00", 0);
+							$timestampEnd   = dol_stringtotime($obj->date_end." 23:59:59", 0);
+						} else {
+							$event['fulldayevent'] = true;
 
-                            $timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
-                            $timestampEnd   = dol_stringtotime($obj->date_end." 23:59:59", 0);
-                        }
+							$timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
+							$timestampEnd   = dol_stringtotime($obj->date_end." 23:59:59", 0);
+						}
 
-                        if (!empty($conf->global->AGENDA_EXPORT_FIX_TZ))
-                        {
-                            $timestampStart = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
-                            $timestampEnd   = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
-                        }
+						if (!empty($conf->global->AGENDA_EXPORT_FIX_TZ))
+						{
+							$timestampStart = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
+							$timestampEnd   = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
+						}
 
-                        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-                        $urlwithroot       = $urlwithouturlroot.DOL_URL_ROOT;
-                        $url               = $urlwithroot.'/holiday/card.php?id='.$obj->rowid;
+						$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+						$urlwithroot       = $urlwithouturlroot.DOL_URL_ROOT;
+						$url               = $urlwithroot.'/holiday/card.php?id='.$obj->rowid;
 
-                        $event['uid']          = 'dolibarrholiday-'.$this->db->database_name.'-'.$obj->rowid."@".$_SERVER["SERVER_NAME"];
-                        $event['author']       = dolGetFirstLastname($obj->firstname, $obj->lastname);
-                        $event['type']         = 'event';
-                        $event['category']     = "Holiday";
-                        $event['transparency'] = 'OPAQUE';
-                        $event['email']        = $obj->email;
-                        $event['created']      = $timestampStart;
-                        $event['modified']     = $timestampStart;
-                        $event['startdate']    = $timestampStart;
-                        $event['enddate']      = $timestampEnd;
-                        $event['duration']     = $timestampEnd - $timestampStart;
-                        $event['url']          = $url;
+						$event['uid']          = 'dolibarrholiday-'.$this->db->database_name.'-'.$obj->rowid."@".$_SERVER["SERVER_NAME"];
+						$event['author']       = dolGetFirstLastname($obj->firstname, $obj->lastname);
+						$event['type']         = 'event';
+						$event['category']     = "Holiday";
+						$event['transparency'] = 'OPAQUE';
+						$event['email']        = $obj->email;
+						$event['created']      = $timestampStart;
+						$event['modified']     = $timestampStart;
+						$event['startdate']    = $timestampStart;
+						$event['enddate']      = $timestampEnd;
+						$event['duration']     = $timestampEnd - $timestampStart;
+						$event['url']          = $url;
 
-                        if ($obj->status == 2)
-                        {
-                            // 2 = leave wait for approval
-                            $event['summary'] = $title." - ".$obj->lastname." (wait for approval)";
-                        }
-                        else
-                        {
-                            // 3 = leave approved
-                            $event['summary'] = $title." - ".$obj->lastname;
-                        }
+						if ($obj->status == 2)
+						{
+							// 2 = leave wait for approval
+							$event['summary'] = $title." - ".$obj->lastname." (wait for approval)";
+						} else {
+							// 3 = leave approved
+							$event['summary'] = $title." - ".$obj->lastname;
+						}
 
-                        $eventarray[] = $event;
+						$eventarray[] = $event;
 
-                        $i++;
-                    }
-                }
-            }
+						$i++;
+					}
+				}
+			}
 
-            $langs->load("agenda");
+			$langs->load("agenda");
 
-            // Define title and desc
-            $more = '';
-            if ($login)  $more = $langs->transnoentities("User").' '.$login;
-            if ($logina) $more = $langs->transnoentities("ActionsAskedBy").' '.$logina;
-            if ($logint) $more = $langs->transnoentities("ActionsToDoBy").' '.$logint;
-            if ($logind) $more = $langs->transnoentities("ActionsDoneBy").' '.$logind;
-            if ($more)
-            {
-                $title = 'Dolibarr actions '.$mysoc->name.' - '.$more;
-                $desc = $more;
-                $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
-            }
-            else
-            {
-                $title = 'Dolibarr actions '.$mysoc->name;
-                $desc = $langs->transnoentities('ListOfActions');
-                $desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
-            }
+			// Define title and desc
+			$more = '';
+			if ($login)  $more = $langs->transnoentities("User").' '.$login;
+			if ($logina) $more = $langs->transnoentities("ActionsAskedBy").' '.$logina;
+			if ($logint) $more = $langs->transnoentities("ActionsToDoBy").' '.$logint;
+			if ($logind) $more = $langs->transnoentities("ActionsDoneBy").' '.$logind;
+			if ($more)
+			{
+				$title = 'Dolibarr actions '.$mysoc->name.' - '.$more;
+				$desc = $more;
+				$desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
+			} else {
+				$title = 'Dolibarr actions '.$mysoc->name;
+				$desc = $langs->transnoentities('ListOfActions');
+				$desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
+			}
 
-            // Create temp file
-            $outputfiletmp = tempnam($conf->agenda->dir_temp, 'tmp'); // Temporary file (allow call of function by different threads
-            @chmod($outputfiletmp, octdec($conf->global->MAIN_UMASK));
+			// Create temp file
+			$outputfiletmp = tempnam($conf->agenda->dir_temp, 'tmp'); // Temporary file (allow call of function by different threads
+			@chmod($outputfiletmp, octdec($conf->global->MAIN_UMASK));
 
-            // Write file
-            if ($format == 'vcal') $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-            elseif ($format == 'ical') $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-            elseif ($format == 'rss')  $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			// Write file
+			if ($format == 'vcal') $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			elseif ($format == 'ical') $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			elseif ($format == 'rss')  $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
 
-            if ($result >= 0)
-            {
-                if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
-                else
-                {
-                	$this->error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
-                    dol_syslog(get_class($this)."::build_exportfile ".$this->error, LOG_ERR);
-                    dol_delete_file($outputfiletmp, 0, 1);
-                    $result = -1;
-                }
-            }
-            else
-            {
-                dol_syslog(get_class($this)."::build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
-                dol_delete_file($outputfiletmp, 0, 1);
-                $langs->load("errors");
-                $this->error = $langs->trans("ErrorFailToCreateFile", $outputfile);
-            }
-        }
+			if ($result >= 0)
+			{
+				if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
+				else {
+					$this->error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
+					dol_syslog(get_class($this)."::build_exportfile ".$this->error, LOG_ERR);
+					dol_delete_file($outputfiletmp, 0, 1);
+					$result = -1;
+				}
+			} else {
+				dol_syslog(get_class($this)."::build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
+				dol_delete_file($outputfiletmp, 0, 1);
+				$langs->load("errors");
+				$this->error = $langs->trans("ErrorFailToCreateFile", $outputfile);
+			}
+		}
 
-        return $result;
-    }
+		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	int >0 if ok
-     */
-    public function initAsSpecimen()
-    {
-        global $user;
+	/**
+	 *  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()
+	{
+		global $user;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Initialise parametres
-        $this->id = 0;
-        $this->specimen = 1;
+		// Initialise parametres
+		$this->id = 0;
+		$this->specimen = 1;
 
-        $this->type_code = 'AC_OTH';
-        $this->code = 'AC_SPECIMEN_CODE';
-        $this->label = 'Label of event Specimen';
-        $this->datec = $now;
-        $this->datem = $now;
-        $this->datep = $now;
-        $this->datef = $now;
-        $this->fulldayevent = 0;
-        $this->percentage = 0;
-        $this->location = 'Location';
-        $this->transparency = 1; // 1 means opaque
-        $this->priority = 1;
-        //$this->note_public = "This is a 'public' note.";
+		$this->type_code = 'AC_OTH';
+		$this->code = 'AC_SPECIMEN_CODE';
+		$this->label = 'Label of event Specimen';
+		$this->datec = $now;
+		$this->datem = $now;
+		$this->datep = $now;
+		$this->datef = $now;
+		$this->fulldayevent = 0;
+		$this->percentage = 0;
+		$this->location = 'Location';
+		$this->transparency = 1; // 1 means opaque
+		$this->priority = 1;
+		//$this->note_public = "This is a 'public' note.";
 		$this->note_private = "This is a 'private' note.";
 
-        $this->userownerid = $user->id;
-        $this->userassigned[$user->id] = array('id'=>$user->id, 'transparency'=> 1);
-        return 1;
-    }
+		$this->userownerid = $user->id;
+		$this->userassigned[$user->id] = array('id'=>$user->id, 'transparency'=> 1);
+		return 1;
+	}
 
 	/**
 	 *  Function used to replace a thirdparty id with another one.
@@ -1950,62 +1950,249 @@ class ActionComm extends CommonObject
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
-    /**
-     *  Is the action delayed?
-     *
-     *  @return bool
-     */
-    public function hasDelay()
-    {
-        global $conf;
+	/**
+	 *  Is the action delayed?
+	 *
+	 *  @return bool
+	 */
+	public function hasDelay()
+	{
+		global $conf;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        return $this->datep && ($this->datep < ($now - $conf->agenda->warning_delay));
-    }
+		return $this->datep && ($this->datep < ($now - $conf->agenda->warning_delay));
+	}
 
 
-    /**
-     *  Send reminders by emails
-     *  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 sendEmailsReminder()
-    {
-    	global $conf, $langs;
+	/**
+	 *  Load event reminder of events
+	 *
+	 *  @param	string	$type		Type of reminder 'browser' or 'email'
+	 *  @param	int		$fk_user	Id of user
+	 *  @param	bool	$onlypast	true = get only past reminder, false = get all reminders linked to this
+	 *  @return int         		0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function loadReminders($type = '', $fk_user = 0, $onlypast = true)
+	{
+		global $conf, $langs, $user;
 
-    	$error = 0;
-    	$this->output = '';
+		$error = 0;
+
+		$this->reminders = array();
+
+		//Select all action comm reminders for event
+		$sql = "SELECT rowid as id, typeremind, dateremind, status, offsetvalue, offsetunit, fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
+		$sql .= " WHERE fk_actioncomm = ".$this->id;
+		if ($onlypast) {
+			$sql .= " AND dateremind <= '".$this->db->idate(dol_now())."'";
+		}
+		if ($type) {
+			$sql .= " AND typeremind ='".$this->db->escape($type)."'";
+		}
+		if ($fk_user > 0) {
+			$sql .= " AND fk_user = ".((int) $fk_user);
+		}
+		if (empty($conf->global->AGENDA_REMINDER_EMAIL)) $sql .= " AND typeremind != 'email'";
+		if (empty($conf->global->AGENDA_REMINDER_BROWSER)) $sql .= " AND typeremind != 'browser'";
+
+		$sql .= $this->db->order("dateremind", "ASC");
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$tmpactioncommreminder = new ActionCommReminder($this->db);
+				$tmpactioncommreminder->id = $obj->id;
+				$tmpactioncommreminder->typeremind = $obj->typeremind;
+				$tmpactioncommreminder->dateremind = $obj->dateremind;
+				$tmpactioncommreminder->offsetvalue = $obj->offsetvalue;
+				$tmpactioncommreminder->offsetunit = $obj->offsetunit;
+				$tmpactioncommreminder->status = $obj->status;
+				$tmpactioncommreminder->fk_user = $obj->fk_user;
+
+				$this->reminders[$obj->id] = $tmpactioncommreminder;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$error++;
+		}
+
+		return count($this->reminders);
+	}
+
+
+	/**
+	 *  Send reminders by emails
+	 *  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 sendEmailsReminder()
+	{
+		global $conf, $langs, $user;
+
+		$error = 0;
+		$this->output = '';
 		$this->error = '';
+		$nbMailSend = 0;
+		$errorsMsg = array();
 
-    	if (empty($conf->agenda->enabled))	// Should not happen. If module disabled, cron job should not be visible.
+		if (empty($conf->agenda->enabled))	// Should not happen. If module disabled, cron job should not be visible.
 		{
 			$langs->load("agenda");
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
 			return 0;
 		}
 		if (empty($conf->global->AGENDA_REMINDER_EMAIL))
-    	{
-    		$langs->load("agenda");
-    		$this->output = $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
-    		return 0;
-    	}
+		{
+			$langs->load("agenda");
+			$this->output = $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
+			return 0;
+		}
 
-    	$now = dol_now();
+		$now = dol_now();
 
-    	dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-    	$this->db->begin();
+		$this->db->begin();
 
-        // TODO Scan events of type 'email' into table llx_actioncomm_reminder with status todo, send email, then set status to done
+		//Select all action comm reminder
+		$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
+		$sql .= " WHERE typeremind = 'email' AND status = 0";
+		$sql .= " AND dateremind <= '".$this->db->idate(dol_now())."'";
+		$sql .= $this->db->order("dateremind", "ASC");
+		$resql = $this->db->query($sql);
 
-        // Delete also very old past events (we do not keep more than 1 month record in past)
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_reminder WHERE dateremind < '".$this->db->jdate($now - (3600 * 24 * 32))."'";
-        $this->db->query($sql);
+		if ($resql) {
+			$formmail = new FormMail($this->db);
+			$actionCommReminder = new ActionCommReminder($this->db);
 
-        $this->db->commit();
+			while ($obj = $this->db->fetch_object($resql)) {
+				$res = $actionCommReminder->fetch($obj->id);
+				if ($res < 0) {
+					$error++;
+					$errorsMsg[] = "Failed to load invoice ActionComm Reminder";
+				}
 
-        return $error;
-    }
+				if (!$error)
+				{
+					//Select email template
+					$arraymessage = $formmail->getEMailTemplate($this->db, 'actioncomm_send', $user, $langs, (!empty($actionCommReminder->fk_email_template)) ? $actionCommReminder->fk_email_template : -1, 1);
+
+					// Load event
+					$res = $this->fetch($actionCommReminder->fk_actioncomm);
+					if ($res > 0)
+					{
+						// PREPARE EMAIL
+
+						// Make substitution in email content
+						$substitutionarray = getCommonSubstitutionArray($langs, 0, '', $this);
+
+						complete_substitutions_array($substitutionarray, $langs, $this);
+
+						// Content
+						$sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray);
+
+						//Topic
+						$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->trans('EventReminder'));
+
+						// Recipient
+						$recipient = new User($this->db);
+						$res = $recipient->fetch($actionCommReminder->fk_user);
+						if ($res > 0 && !empty($recipient->email)) $to = $recipient->email;
+						else {
+							$errorsMsg[] = "Failed to load recipient";
+							$error++;
+						}
+
+						// Sender
+						$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
+						if (empty($from)) {
+							$errorsMsg[] = "Failed to load recipient";
+							$error++;
+						}
+
+						// Errors Recipient
+						$errors_to = $conf->global->MAIN_MAIL_ERRORS_TO;
+
+						// Mail Creation
+						$cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, array(), array(), array(), '', "", 0, 1, $errors_to, '', '', '', '', '');
+
+						// Sending Mail
+						if ($cMailFile->sendfile())
+						{
+							$actionCommReminder->status = $actionCommReminder::STATUS_DONE;
+							$res = $actionCommReminder->update($user);
+							if ($res < 0)
+							{
+								$errorsMsg[] = "Failed to update status of ActionComm Reminder";
+								$error++;
+								break; // This is to avoid to have this error on all the selected email. If we fails here for one record, it may fails for others. We must solve first.
+							} else {
+								$nbMailSend++;
+							}
+						} else {
+							$errorsMsg[] = $cMailFile->error.' : '.$to;
+							$error++;
+						}
+					} else {
+						$error++;
+					}
+				}
+			}
+		} else {
+			$error++;
+		}
+
+		if (!$error)
+		{
+			// Delete also very old past events (we do not keep more than 1 month record in past)
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
+			$sql .= " WHERE dateremind < '".$this->db->idate($now - (3600 * 24 * 32))."'";
+			$resql = $this->db->query($sql);
+
+			if (!$resql) {
+				$errorsMsg[] = 'Failed to delete old reminders';
+				//$error++;		// If this fails, we must not rollback other SQL requests already done. Never mind.
+			}
+		}
+
+		if (!$error) {
+			$this->output = 'Nb of emails sent : '.$nbMailSend;
+			$this->db->commit();
+			return 0;
+		}
+		else {
+			$this->db->rollback();
+			$this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? join(', ', $errorsMsg) : $error;
+			return $error;
+		}
+	}
+
+	/**
+	 * Udpate the percent value of a event with the given id
+	 *
+	 * @param int		$id			The id of the event
+	 * @param int		$percent	The new percent value for the event
+	 * @return int					1 when update of the event was suscessfull, otherwise -1
+	 */
+	public function updatePercent($id, $percent)
+	{
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
+		$sql .= " SET percent = ".(int) $percent;
+		$sql .= " WHERE id=".$id;
+
+		if ($this->db->query($sql))
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index f987d551766..16384edfcde 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -50,6 +50,9 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $picto = 'generic';
 
+	const STATUS_TODO = 0;
+	const STATUS_DONE = 1;
+
 
 	/**
 	 *  'type' if the field format.
@@ -74,12 +77,15 @@ 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",),
-		'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,),
-		'offsetunit' => array('type'=>'varchar(1)', 'label'=>'OffsetUnit', 'visible'=>1, 'enabled'=>1, 'position'=>57, 'notnull'=>1, 'comment'=>"m, h, d, w",),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'default'=>0, 'index'=>0, 'arrayofkeyval'=>array('0'=>'ToDo', '1'=>'Done')),
+		'offsetunit' => array('type'=>'varchar(1)', 'label'=>'OffsetUnit', 'visible'=>1, 'enabled'=>1, 'position'=>57, 'notnull'=>1, 'comment'=>"y, m, d, w, h, i",),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>58, 'notnull'=>1, 'default'=>0, 'index'=>0, 'arrayofkeyval'=>array('0'=>'ToDo', '1'=>'Done')),
+		'fk_actioncomm' => array('type'=>'integer', 'label'=>'Project', 'visible'=>1, 'enabled'=>1, 'position'=>59, 'notnull'=>1, 'index'=>1,),
+		'fk_email_template' => array('type'=>'integer', 'label'=>'EmailTemplate', 'visible'=>1, 'enabled'=>1, 'position'=>60, 'notnull'=>0),
 	);
 
 	/**
@@ -87,6 +93,11 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $rowid;
 
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
 	public $dateremind;
 	public $typeremind;
 
@@ -103,6 +114,16 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $status;
 
+	/**
+	 * @var int Project
+	 */
+	public $fk_actioncomm;
+
+	/**
+	 * @var int Template Mail
+	 */
+	public $fk_email_template;
+
 	// END MODULEBUILDER PROPERTIES
 
 
@@ -200,28 +221,23 @@ class ActionCommReminder extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Done');
 			elseif ($status == 0) return $langs->trans('ToDo');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
 			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Done'), 'statut4').' '.$langs->trans('Done');
 			elseif ($status == 0) return img_picto($langs->trans('ToDo'), 'statut5').' '.$langs->trans('ToDo');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
 			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Done').' '.img_picto($langs->trans('Done'), 'statut4');
 			elseif ($status == 0) return $langs->trans('ToDo').' '.img_picto($langs->trans('ToDo'), 'statut5');
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index e09bc905b96..473c87e22a0 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -148,7 +148,7 @@ class AgendaEvents extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -156,28 +156,27 @@ class AgendaEvents extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
 
         if ($result)
         {
             $i = 0;
-            $num = $db->num_rows($result);
+            $num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $actioncomm_static = new ActionComm($db);
+            	$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 : '.$db->lasterror());
+        } 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');
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index c8041c4ea16..6e86a556a1a 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -104,15 +104,11 @@ class CActionComm
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else
-			{
+            } else {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -143,7 +139,7 @@ class CActionComm
         $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
         $sql .= " WHERE 1=1";
         if ($active != '') $sql .= " AND active=".$active;
-        if (!empty($excludetype)) $sql .= " AND type <> '".$excludetype."'";
+        if (!empty($excludetype)) $sql .= " AND type <> '".$this->db->escape($excludetype)."'";
         if ($morefilter) $sql .= " AND ".$morefilter;
         $sql .= " ORDER BY module, position, type";
 
@@ -208,9 +204,7 @@ class CActionComm
             if ($idorcode == 'id') $this->liste_array = $repid;
             if ($idorcode == 'code') $this->liste_array = $repcode;
             return $this->liste_array;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index e985b8ea09e..b806dde94f9 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -179,16 +179,13 @@ class ICal
 								$tmpkey = '';
 								$tmpvalue = '';
 							}
-						}
-                    	elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value))
+						} 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
-                    		{
+                    		} else {
                     			$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
                     		}
                     	}                    	//$value=quotedPrintDecode($tmpvalue.$value);
@@ -236,9 +233,7 @@ class ICal
         	if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
         	{
         		list($key, $value) = array($key, $value);
-        	}
-        	else
-        	{
+        	} else {
         		list($key, $value) = $this->ical_dt_date($key, $value);
         	}
         }
@@ -377,9 +372,7 @@ class ICal
         {
             usort($temp, array(&$this, "ical_dtstart_compare"));
             return $temp;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 9e770f70a93..bed4054e018 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -40,7 +40,7 @@ if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/clas
 $langs->loadLangs(array('companies', 'commercial', 'other', 'bills'));
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -123,7 +123,7 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
 
 	$linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
-	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
+	$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list">'.$langs->trans("BackToList").'</a>';
 
 	// Link to other agenda views
 	$out = '';
@@ -215,9 +215,7 @@ if ($object->id > 0)
 			}
 		}
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
-	}
-	else
-	{
+	} else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -263,9 +261,7 @@ if ($object->id > 0)
 	$permission = $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f35c17d375d..a48dc03aea2 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -76,10 +76,10 @@ 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');
+$action = GETPOST('action', 'aZ09');
 $resourceid = GETPOST("search_resourceid", "int");
 $year = GETPOST("year", "int") ?GETPOST("year", "int") : date("Y");
 $month = GETPOST("month", "int") ?GETPOST("month", "int") : date("m");
@@ -90,14 +90,21 @@ $status = GETPOST("search_status", 'aZ09') ?GETPOST("search_status", 'aZ09') : G
 $type = GETPOST("search_type", 'aZ09') ?GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
 $maxprint = (isset($_GET["maxprint"]) ?GETPOST("maxprint") : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
+if ($dateselect > 0)
+{
+	$day = GETPOST('dateselectday', 'int');
+	$month = GETPOST('dateselectmonth', 'int');
+	$year = GETPOST('dateselectyear', 'int');
+}
+
 // 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';
-}
-else
-{
+	$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));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -111,14 +118,14 @@ if ($action == 'default')	// When action is default, we want a calendar view and
 {
 	$action = (($defaultview != 'show_list') ? $defaultview : 'show_month');
 }
-if (GETPOST('viewcal', 'none') && GETPOST('action', 'alpha') != 'show_day' && GETPOST('action', 'alpha') != 'show_week') {
-    $action = 'show_month'; $day = '';
+if (GETPOST('viewcal', 'restricthtml') && GETPOST('action', 'alpha') != 'show_day' && GETPOST('action', 'alpha') != 'show_week') {
+	$action = 'show_month'; $day = '';
 } // View by month
-if (GETPOST('viewweek', 'none') || GETPOST('action', 'alpha') == 'show_week') {
-    $action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
+if (GETPOST('viewweek', 'restricthtml') || GETPOST('action', 'alpha') == 'show_week') {
+	$action = 'show_week'; $week = ($week ? $week : date("W")); $day = ($day ? $day : date("d"));
 } // View by week
-if (GETPOST('viewday', 'none') || GETPOST('action', 'alpha') == 'show_day') {
-    $action = 'show_day'; $day = ($day ? $day : date("d"));
+if (GETPOST('viewday', 'restricthtml') || GETPOST('action', 'alpha') == 'show_day') {
+	$action = 'show_day'; $day = ($day ? $day : date("d"));
 } // View by day
 
 // Load translation files required by the page
@@ -134,45 +141,46 @@ $hookmanager->initHooks(array('agenda'));
 
 if (GETPOST("viewlist", 'alpha') || $action == 'show_list')
 {
-    $param = '';
-    if (is_array($_POST))
-    {
-        foreach ($_POST as $key => $val)
-        {
-            if ($key == 'token') continue;
-            $param .= '&'.$key.'='.urlencode($val);
-        }
-    }
-    //print $param;
-    header("Location: ".DOL_URL_ROOT.'/comm/action/list.php?'.$param);
-    exit;
+	$param = '';
+	if (is_array($_POST))
+	{
+		foreach ($_POST as $key => $val)
+		{
+			if ($key == 'token') continue;
+			$param .= '&'.$key.'='.urlencode($val);
+		}
+	}
+	if (!preg_match('/action=/', $param)) $param .= ($param ? '&' : '').'action=show_list';
+	//print $param;
+	header("Location: ".DOL_URL_ROOT.'/comm/action/list.php?'.$param);
+	exit;
 }
 
 if (GETPOST("viewperuser", 'alpha') || $action == 'show_peruser')
 {
-    $param = '';
-    if (is_array($_POST))
-    {
-        foreach ($_POST as $key => $val)
-        {
-            if ($key == 'token') continue;
-            $param .= '&'.$key.'='.urlencode($val);
-        }
-    }
-    //print $param;
-    header("Location: ".DOL_URL_ROOT.'/comm/action/peruser.php?'.$param);
-    exit;
+	$param = '';
+	if (is_array($_POST))
+	{
+		foreach ($_POST as $key => $val)
+		{
+			if ($key == 'token') continue;
+			$param .= '&'.$key.'='.urlencode($val);
+		}
+	}
+	//print $param;
+	header("Location: ".DOL_URL_ROOT.'/comm/action/peruser.php?'.$param);
+	exit;
 }
 
 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();
 }
 
 
@@ -218,21 +226,21 @@ $listofextcals = array();
 // Define list of external calendars (global admin setup)
 if (empty($conf->global->AGENDA_DISABLE_EXT))
 {
-    $i = 0;
-    while ($i < $MAXAGENDA)
-    {
-        $i++;
-        $source = 'AGENDA_EXT_SRC'.$i;
-        $name = 'AGENDA_EXT_NAME'.$i;
-        $offsettz = 'AGENDA_EXT_OFFSETTZ'.$i;
-        $color = 'AGENDA_EXT_COLOR'.$i;
-        $buggedfile = 'AGENDA_EXT_BUGGEDFILE'.$i;
-        if (!empty($conf->global->$source) && !empty($conf->global->$name))
-        {
-        	// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
-        	$listofextcals[] = array('src'=>$conf->global->$source, 'name'=>$conf->global->$name, 'offsettz'=>$conf->global->$offsettz, 'color'=>$conf->global->$color, 'buggedfile'=>(isset($conf->global->buggedfile) ? $conf->global->buggedfile : 0));
-        }
-    }
+	$i = 0;
+	while ($i < $MAXAGENDA)
+	{
+		$i++;
+		$source = 'AGENDA_EXT_SRC'.$i;
+		$name = 'AGENDA_EXT_NAME'.$i;
+		$offsettz = 'AGENDA_EXT_OFFSETTZ'.$i;
+		$color = 'AGENDA_EXT_COLOR'.$i;
+		$buggedfile = 'AGENDA_EXT_BUGGEDFILE'.$i;
+		if (!empty($conf->global->$source) && !empty($conf->global->$name))
+		{
+			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
+			$listofextcals[] = array('src'=>$conf->global->$source, 'name'=>$conf->global->$name, 'offsettz'=>$conf->global->$offsettz, 'color'=>$conf->global->$color, 'buggedfile'=>(isset($conf->global->buggedfile) ? $conf->global->buggedfile : 0));
+		}
+	}
 }
 // Define list of external calendars (user setup)
 if (empty($user->conf->AGENDA_DISABLE_EXT))
@@ -243,7 +251,7 @@ if (empty($user->conf->AGENDA_DISABLE_EXT))
 		$i++;
 		$source = 'AGENDA_EXT_SRC_'.$user->id.'_'.$i;
 		$name = 'AGENDA_EXT_NAME_'.$user->id.'_'.$i;
-        $offsettz = 'AGENDA_EXT_OFFSETTZ_'.$user->id.'_'.$i;
+		$offsettz = 'AGENDA_EXT_OFFSETTZ_'.$user->id.'_'.$i;
 		$color = 'AGENDA_EXT_COLOR_'.$user->id.'_'.$i;
 		$enabled = 'AGENDA_EXT_ENABLED_'.$user->id.'_'.$i;
 		$buggedfile = 'AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i;
@@ -257,74 +265,75 @@ if (empty($user->conf->AGENDA_DISABLE_EXT))
 
 if (empty($action) || $action == 'show_month')
 {
-    $prev = dol_get_prev_month($month, $year);
-    $prev_year  = $prev['year'];
-    $prev_month = $prev['month'];
-    $next = dol_get_next_month($month, $year);
-    $next_year  = $next['year'];
-    $next_month = $next['month'];
+	$prev = dol_get_prev_month($month, $year);
+	$prev_year  = $prev['year'];
+	$prev_month = $prev['month'];
+	$next = dol_get_next_month($month, $year);
+	$next_year  = $next['year'];
+	$next_month = $next['month'];
 
-    $max_day_in_prev_month = date("t", dol_mktime(0, 0, 0, $prev_month, 1, $prev_year)); // Nb of days in previous month
-    $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year)); // Nb of days in next month
-    // tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
-    $tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, true)) + 2; // date('w') is 0 fo sunday
-    $tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
-    if ($tmpday >= 1) $tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
-    // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-    $firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $max_day_in_prev_month + $tmpday, $prev_year);
-    $next_day = 7 - ($max_day_in_month + 1 - $tmpday) % 7;
-    if ($next_day < 6) $next_day += 7;
-    $lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year);
+	$max_day_in_prev_month = date("t", dol_mktime(0, 0, 0, $prev_month, 1, $prev_year)); // Nb of days in previous month
+	$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year)); // Nb of days in next month
+	// tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
+	$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, true)) + 2; // date('w') is 0 fo sunday
+	$tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
+	if ($tmpday >= 1) $tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
+	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
+	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $max_day_in_prev_month + $tmpday, $prev_year);
+	$next_day = 7 - ($max_day_in_month + 1 - $tmpday) % 7;
+	if ($next_day < 6) $next_day += 7;
+	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year);
 }
 if ($action == 'show_week')
 {
-    $prev = dol_get_first_day_week($day, $month, $year);
-    $prev_year  = $prev['prev_year'];
-    $prev_month = $prev['prev_month'];
-    $prev_day   = $prev['prev_day'];
-    $first_day  = $prev['first_day'];
-    $first_month = $prev['first_month'];
-    $first_year = $prev['first_year'];
+	$prev = dol_get_first_day_week($day, $month, $year);
+	$prev_year  = $prev['prev_year'];
+	$prev_month = $prev['prev_month'];
+	$prev_day   = $prev['prev_day'];
+	$first_day  = $prev['first_day'];
+	$first_month = $prev['first_month'];
+	$first_year = $prev['first_year'];
 
-    $week = $prev['week'];
+	$week = $prev['week'];
 
-    $day = (int) $day;
-    $next = dol_get_next_week($first_day, $week, $first_month, $first_year);
-    $next_year  = $next['year'];
-    $next_month = $next['month'];
-    $next_day   = $next['day'];
+	$day = (int) $day;
+	$next = dol_get_next_week($first_day, $week, $first_month, $first_year);
+	$next_year  = $next['year'];
+	$next_month = $next['month'];
+	$next_day   = $next['day'];
 
-    // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-    $firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year);
+	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
+	$firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year);
 	$lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 
-    $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
+	$max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
 
-    $tmpday = $first_day;
+	$tmpday = $first_day;
 }
 if ($action == 'show_day')
 {
-    $prev = dol_get_prev_day($day, $month, $year);
-    $prev_year  = $prev['year'];
-    $prev_month = $prev['month'];
-    $prev_day   = $prev['day'];
-    $next = dol_get_next_day($day, $month, $year);
-    $next_year  = $next['year'];
-    $next_month = $next['month'];
-    $next_day   = $next['day'];
+	$prev = dol_get_prev_day($day, $month, $year);
+	$prev_year  = $prev['year'];
+	$prev_month = $prev['month'];
+	$prev_day   = $prev['day'];
+	$next = dol_get_next_day($day, $month, $year);
+	$next_year  = $next['year'];
+	$next_month = $next['month'];
+	$next_day   = $next['day'];
 
-    // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
-    $firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $prev_day, $prev_year);
-    $lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year);
+	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
+	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $prev_day, $prev_year);
+	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year);
 }
 //print 'xx'.$prev_year.'-'.$prev_month.'-'.$prev_day;
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
 //print dol_print_date($firstdaytoshow,'day');
 //print dol_print_date($lastdaytoshow,'day');
 
-$title = $langs->trans("DoneAndToDoActions");
+/*$title = $langs->trans("DoneAndToDoActions");
 if ($status == 'done') $title = $langs->trans("DoneActions");
 if ($status == 'todo') $title = $langs->trans("ToDoActions");
+*/
 
 $param = '';
 if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {
@@ -333,7 +342,7 @@ if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_act
 	} else $param .= "&search_actioncode=".urlencode($actioncode);
 }
 if ($resourceid > 0)  $param .= "&search_resourceid=".urlencode($resourceid);
-if ($status || isset($_GET['status']) || isset($_POST['status'])) $param .= "&search_status=".urlencode($status);
+if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status);
 if ($filter)       $param .= "&search_filter=".urlencode($filter);
 if ($filtert)      $param .= "&search_filtert=".urlencode($filtert);
 if ($usergroup)    $param .= "&search_usergroup=".urlencode($usergroup);
@@ -347,32 +356,36 @@ $param .= "&maxprint=".urlencode($maxprint);
 // Show navigation bar
 if (empty($action) || $action == 'show_month')
 {
-    $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
-    $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");
-    $nav .= " </span>\n";
-    $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
-    $nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a>)";
-    $picto = 'calendar';
+	$nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
+	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");
+	$nav .= " </span>\n";
+	$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
+	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a> ";
+	$picto = 'calendar';
 }
 if ($action == 'show_week')
 {
-    $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp;\n";
-    $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
-    $nav .= " </span>\n";
-    $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
-    $nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
-    $picto = 'calendarweek';
+	$nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp;\n";
+	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
+	$nav .= " </span>\n";
+	$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
+	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	$picto = 'calendarweek';
 }
 if ($action == 'show_day')
 {
-    $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
-    $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");
-    $nav .= " </span>\n";
-    $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
-    $nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
-    $picto = 'calendarday';
+	$nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
+	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");
+	$nav .= " </span>\n";
+	$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
+	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	$picto = 'calendarday';
 }
 
+$nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
+//$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+$nav .= '<button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
+
 // Must be after the nav definition
 $param .= '&year='.$year.'&month='.$month.($day ? '&day='.$day : '');
 //print 'x'.$param;
@@ -385,6 +398,8 @@ if ($action == 'show_month') $tabactive = 'cardmonth';
 if ($action == 'show_week') $tabactive = 'cardweek';
 if ($action == 'show_day')  $tabactive = 'cardday';
 if ($action == 'show_list') $tabactive = 'cardlist';
+if ($action == 'show_pertuser') $tabactive = 'cardperuser';
+if ($action == 'show_pertype') $tabactive = 'cardpertype';
 
 $paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
 
@@ -394,10 +409,55 @@ print '<form method="POST" id="searchFormList" class="listactionsfilter" action=
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-dol_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();
+//dol_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();
 
+$viewmode = '';
+$viewmode .= '<a class="btnTitle 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'.($action == 'show_month' ? ' btnTitleSelected' : '').' 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'.($action == 'show_week' ? ' btnTitleSelected' : '').' 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'.($action == 'show_day' ? ' btnTitleSelected' : '').' 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 .= '<span class="marginrightonly"></span>';
+
+
+$newcardbutton = '';
+if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
+{
+	$tmpforcreatebutton = dol_getdate(dol_now(), true);
+
+	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
+
+	//$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 : '')));
+}
 
 // Define the legend/list of calendard to show
 $s = ''; $link = '';
@@ -409,28 +469,28 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
 	$s .= "\n".'<!-- Div to calendars selectors -->'."\n";
 	$s .= '<script type="text/javascript">'."\n";
 	$s .= 'jQuery(document).ready(function () {'."\n";
-	$s .= 'jQuery("#check_birthday").click(function() { console.log("Toggle birthday"); jQuery(".family_birthday").toggle(); });'."\n";
+	$s .= 'jQuery(".check_birthday").click(function() { console.log("Toggle birthday"); jQuery(".family_birthday").toggle(); });'."\n";
 	$s .= 'jQuery(".family_birthday").toggle();'."\n";
 	if ($action == "show_week" || $action == "show_month" || empty($action))
 	{
-        // Code to enable drag and drop
+		// Code to enable drag and drop
 		$s .= 'jQuery( "div.sortable" ).sortable({connectWith: ".sortable", placeholder: "ui-state-highlight", items: "div.movable", receive: function( event, ui ) {'."\n";
-        // Code to submit form
+		// Code to submit form
 		$s .= 'console.log("submit form to record new event");'."\n";
-        //$s.='console.log(event.target);';
+		//$s.='console.log(event.target);';
 		$s .= 'var newval = jQuery(event.target).closest("div.dayevent").attr("id");'."\n";
 		$s .= 'console.log("found parent div.dayevent with id = "+newval);'."\n";
 		$s .= 'var frm=jQuery("#searchFormList");'."\n";
 		$s .= 'var newurl = ui.item.find("a.cal_event").attr("href");'."\n";
 		$s .= 'console.log(newurl);'."\n";
 		$s .= 'frm.attr("action", newurl).children("#newdate").val(newval);frm.submit();}'."\n";
-        $s .= '});'."\n";
-    }
-    $s .= '});'."\n";
-    $s .= '</script>'."\n";
+		$s .= '});'."\n";
+	}
+	$s .= '});'."\n";
+	$s .= '</script>'."\n";
 
 	// Local calendar
-	$s .= '<div class="nowrap inline-block minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
+	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
 
 	// External calendars
 	if (is_array($showextcals) && count($showextcals) > 0)
@@ -452,36 +512,31 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
 	}
 
 	// Birthdays
-	$s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
+	$s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_birthday" name="check_birthday" class="check_birthday"> <span class="check_birthday_text">'.$langs->trans("AgendaShowBirthdayEvents").'</span> &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;
-    }
-}
-else 									// If javascript off
+		$s .= $hookmanager->resPrint;
+	} elseif ($reshook > 1)
+	{
+		$s = $hookmanager->resPrint;
+	}
+} else // If javascript off
 {
 	$newparam = $param; // newparam is for birthday links
-    $newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);
-    if (!preg_match('/showbirthday=/i', $newparam)) $newparam .= '&showbirthday=1';
-    $link = '<a href="'.dol_escape_htmltag($_SERVER['PHP_SELF']);
-    $link .= '?'.dol_escape_htmltag($newparam);
-    $link .= '">';
-    if (empty($showbirthday)) $link .= $langs->trans("AgendaShowBirthdayEvents");
-    else $link .= $langs->trans("AgendaHideBirthdayEvents");
-    $link .= '</a>';
+	$newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);
+	if (!preg_match('/showbirthday=/i', $newparam)) $newparam .= '&showbirthday=1';
+	$link = '<a href="'.dol_escape_htmltag($_SERVER['PHP_SELF']);
+	$link .= '?'.dol_escape_htmltag($newparam);
+	$link .= '">';
+	if (empty($showbirthday)) $link .= $langs->trans("AgendaShowBirthdayEvents");
+	else $link .= $langs->trans("AgendaHideBirthdayEvents");
+	$link .= '</a>';
 }
 
-print load_fiche_titre($s, $link.' &nbsp; &nbsp; '.$nav, '', 0, 0, 'tablelistofcalendars');
-
-
 // Load events from database into $eventarray
 $eventarray = array();
 
@@ -508,32 +563,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);
@@ -543,30 +592,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 .= ')';
-}
-else
-{
-    // To limit array
-    $sql .= " AND (";
-    $sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')"; // End 7 days after + 3 to go from 28 to 31
-    $sql .= " OR ";
-    $sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'";
-    $sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')";
-    $sql .= " OR ";
-    $sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'";
-    $sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')";
-    $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, $month, 1, $year) - (60 * 60 * 24 * 7))."'"; // Start 7 days before
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')"; // End 7 days after + 3 to go from 28 to 31
+	$sql .= " OR ";
+	$sql .= " (a.datep2 BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'";
+	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')";
+	$sql .= " OR ";
+	$sql .= " (a.datep < '".$db->idate(dol_mktime(0, 0, 0, $month, 1, $year) - (60 * 60 * 24 * 7))."'";
+	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')";
+	$sql .= ')';
 }
 if ($type) $sql .= " AND ca.id = ".$type;
 if ($status == '0') { $sql .= " AND a.percent = 0"; }
@@ -577,10 +624,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 datep';
@@ -591,521 +638,518 @@ dol_syslog("comm/action/index.php", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
+	$num = $db->num_rows($resql);
 
-    $MAXONSAMEPAGE = 10000; // Useless to have more. Protection to avoid memory overload when high number of event (for example after a mass import)
-    $i = 0;
-    while ($i < $num && $i < $MAXONSAMEPAGE)
-    {
-        $obj = $db->fetch_object($resql);
+	$MAXONSAMEPAGE = 10000; // Useless to have more. Protection to avoid memory overload when high number of event (for example after a mass import)
+	$i = 0;
+	while ($i < $num && $i < $MAXONSAMEPAGE)
+	{
+		$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;
+		}
 
-        // Create a new object action
-        $event = new ActionComm($db);
+		// Create a new object action
+		$event = new ActionComm($db);
 
-        $event->id = $obj->id;
-        $event->ref = $event->id;
+		$event->id = $obj->id;
+		$event->ref = $event->id;
 
-        $event->datep = $db->jdate($obj->datep); // datep and datef are GMT date. Example: 1970-01-01 01:00:00, jdate will return 0 if TZ of PHP server is Europe/Berlin
-        $event->datef = $db->jdate($obj->datep2);
+		$event->datep = $db->jdate($obj->datep); // datep and datef are GMT date. Example: 1970-01-01 01:00:00, jdate will return 0 if TZ of PHP server is Europe/Berlin
+		$event->datef = $db->jdate($obj->datep2);
 		//var_dump($obj->datep);
-        //var_dump($event->datep);
+		//var_dump($event->datep);
 
-        $event->type_code = $obj->type_code;
-        $event->type_label = $obj->type_label;
-        $event->type_color = $obj->type_color;
+		$event->type_code = $obj->type_code;
+		$event->type_label = $obj->type_label;
+		$event->type_color = $obj->type_color;
 
-        $event->libelle = $obj->label; // deprecated
-        $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->fetch_userassigned(); // This load $event->userassigned
-        $event->priority = $obj->priority;
-        $event->fulldayevent = $obj->fulldayevent;
-        $event->location = $obj->location;
-        $event->transparency = $obj->transparency;
-        $event->fk_element = $obj->fk_element;
-        $event->elementtype = $obj->elementtype;
+		$event->libelle = $obj->label; // deprecated
+		$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->fetch_userassigned(); // This load $event->userassigned
+		$event->priority = $obj->priority;
+		$event->fulldayevent = $obj->fulldayevent;
+		$event->location = $obj->location;
+		$event->transparency = $obj->transparency;
+		$event->fk_element = $obj->fk_element;
+		$event->elementtype = $obj->elementtype;
 
-        $event->fk_project = $obj->fk_project;
+		$event->fk_project = $obj->fk_project;
 
-        $event->thirdparty_id = $obj->fk_soc;
-        $event->contact_id = $obj->fk_contact;
+		$event->thirdparty_id = $obj->fk_soc;
+		$event->contact_id = $obj->fk_contact;
 
-        // 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.
-        $event->date_start_in_calendar = $event->datep;
-        if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar = $event->datef;
-        else $event->date_end_in_calendar = $event->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.
+		$event->date_start_in_calendar = $event->datep;
+		if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar = $event->datef;
+		else $event->date_end_in_calendar = $event->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
-        }
-        else
-        {
-            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);
+		// Check values
+		if ($event->date_end_in_calendar < $firstdaytoshow ||
+		$event->date_start_in_calendar >= $lastdaytoshow)
+		{
+			// This record is out of visible range
+		} else {
+			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);
 
-            // 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++;
-    }
-}
-else
-{
-    dol_print_error($db);
+			//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++;
+	}
+} else {
+	dol_print_error($db);
 }
 
 // Complete $eventarray with birthdates
 if ($showbirthday)
 {
-    // Add events in array
-    $sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
-    $sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.$user->id.'))';
-    $sql .= " AND sp.entity IN (".getEntity('socpeople').")";
-    if ($action == 'show_day')
-    {
-        $sql .= ' AND MONTH(birthday) = '.$month;
-        $sql .= ' AND DAY(birthday) = '.$day;
-    }
-    else
-    {
-        $sql .= ' AND MONTH(birthday) = '.$month;
-    }
-    $sql .= ' ORDER BY birthday';
+	// Add events in array
+	$sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
+	$sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.$user->id.'))';
+	$sql .= " AND sp.entity IN (".getEntity('socpeople').")";
+	if ($action == 'show_day')
+	{
+		$sql .= ' AND MONTH(birthday) = '.$month;
+		$sql .= ' AND DAY(birthday) = '.$day;
+	} else {
+		$sql .= ' AND MONTH(birthday) = '.$month;
+	}
+	$sql .= ' ORDER BY birthday';
 
-    dol_syslog("comm/action/index.php", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
-            $event = new ActionComm($db);
+	dol_syslog("comm/action/index.php", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+			$event = new ActionComm($db);
 
-            $event->id = $obj->rowid; // We put contact id in action id for birthdays events
-            $event->ref = $event->id;
+			$event->id = $obj->rowid; // We put contact id in action id for birthdays events
+			$event->ref = $event->id;
 
-            $datebirth = dol_stringtotime($obj->birthday, 1);
-            //print 'ee'.$obj->birthday.'-'.$datebirth;
-            $datearray = dol_getdate($datebirth, true);
-            $event->datep = dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true); // For full day events, date are also GMT but they wont but converted during output
-            $event->datef = $event->datep;
-            $event->type_code = 'BIRTHDAY';
-            $event->label = $langs->trans("Birthday").' '.dolGetFirstLastname($obj->firstname, $obj->lastname);
-            $event->percentage = 100;
-            $event->fulldayevent = 1;
+			$datebirth = dol_stringtotime($obj->birthday, 1);
+			//print 'ee'.$obj->birthday.'-'.$datebirth;
+			$datearray = dol_getdate($datebirth, true);
+			$event->datep = dol_mktime(0, 0, 0, $datearray['mon'], $datearray['mday'], $year, true); // For full day events, date are also GMT but they wont but converted during output
+			$event->datef = $event->datep;
+			$event->type_code = 'BIRTHDAY';
+			$event->label = $langs->trans("Birthday").' '.dolGetFirstLastname($obj->firstname, $obj->lastname);
+			$event->percentage = 100;
+			$event->fulldayevent = 1;
 
-            $event->date_start_in_calendar = $event->datep;
-            $event->date_end_in_calendar = $event->datef;
-            $event->ponctuel = 0;
+			$event->date_start_in_calendar = $event->datep;
+			$event->date_end_in_calendar = $event->datef;
+			$event->ponctuel = 0;
 
-            // 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 = true;
-            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-            do
-            {
-                $eventarray[$daykey][] = $event;
-                $daykey += 60 * 60 * 24;
-                if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
-            $i++;
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+			$loop = true;
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			do {
+				$eventarray[$daykey][] = $event;
+				$daykey += 60 * 60 * 24;
+				if ($daykey > $event->date_end_in_calendar) $loop = false;
+			} while ($loop);
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 if ($conf->global->AGENDA_SHOW_HOLIDAYS)
 {
-    $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
-    $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE u.rowid = x.fk_user";
-    $sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
-    $sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.statut, x.rowid, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.statut as status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE u.rowid = x.fk_user";
+	$sql .= " AND u.statut = '1'"; // Show only active users  (0 = inactive user, 1 = active user)
+	$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
 
-    if ($action == 'show_day')
-    {
-        // Request only leaves for the current selected day
-        $sql .= " AND '".$year."-".$month."-".$day."' BETWEEN x.date_debut AND x.date_fin";
-    }
-    elseif ($action == 'show_week')
-    {
-        // TODO: Add filter to reduce database request
-    }
-    elseif ($action == 'show_month')
-    {
-        // TODO: Add filter to reduce database request
-    }
+	if ($action == 'show_day')
+	{
+		// Request only leaves for the current selected day
+		$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";
+	} elseif ($action == 'show_week')
+	{
+		// TODO: Add filter to reduce database request
+	} elseif ($action == 'show_month')
+	{
+		// TODO: Add filter to reduce database request
+	}
 
-    $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);
 
-            $dateStartArray = dol_getdate(dol_stringtotime($obj->date_start, 1), true);
-            $dateEndArray   = dol_getdate(dol_stringtotime($obj->date_end, 1), true);
+			$dateStartArray = dol_getdate(dol_stringtotime($obj->date_start, 1), true);
+			$dateEndArray   = dol_getdate(dol_stringtotime($obj->date_end, 1), true);
 
-            $event = new ActionComm($db);
+			$event = new ActionComm($db);
 
-            // Need the id of the leave object for link to it
-            $event->id                      = $obj->rowid;
-            $event->ref                     = $event->id;
+			// Need the id of the leave object for link to it
+			$event->id                      = $obj->rowid;
+			$event->ref                     = $event->id;
 
-            $event->type_code               = 'HOLIDAY';
-            $event->datep                   = dol_mktime(0, 0, 0, $dateStartArray['mon'], $dateStartArray['mday'], $dateStartArray['year'], true);
-            $event->datef                   = dol_mktime(0, 0, 0, $dateEndArray['mon'], $dateEndArray['mday'], $dateEndArray['year'], true);
-            $event->date_start_in_calendar  = $event->datep;
-            $event->date_end_in_calendar    = $event->datef;
+			$event->type_code               = 'HOLIDAY';
+			$event->datep                   = dol_mktime(0, 0, 0, $dateStartArray['mon'], $dateStartArray['mday'], $dateStartArray['year'], true);
+			$event->datef                   = dol_mktime(0, 0, 0, $dateEndArray['mon'], $dateEndArray['mday'], $dateEndArray['year'], true);
+			$event->date_start_in_calendar  = $event->datep;
+			$event->date_end_in_calendar    = $event->datef;
 
-            if ($obj->status == 3)
-            {
-                // Show no symbol for leave with state "leave approved"
-                $event->percentage = -1;
-            }
-            elseif ($obj->status == 2)
-            {
-                // Show TO-DO symbol for leave with state "leave wait for approval"
-                $event->percentage = 0;
-            }
+			if ($obj->status == 3)
+			{
+				// Show no symbol for leave with state "leave approved"
+				$event->percentage = -1;
+			} elseif ($obj->status == 2)
+			{
+				// Show TO-DO symbol for leave with state "leave wait for approval"
+				$event->percentage = 0;
+			}
 
-            if ($obj->halfday == 1)
-            {
-                $event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
-            }
-            elseif ($obj->halfday == -1)
-            {
-                $event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
-            }
-            else
-            {
-                $event->label = $obj->lastname;
-            }
+			if ($obj->halfday == 1)
+			{
+				$event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
+			} elseif ($obj->halfday == -1)
+			{
+				$event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
+			} else {
+				$event->label = $obj->lastname;
+			}
 
-            $annee  = date('Y', $event->date_start_in_calendar);
-            $mois   = date('m', $event->date_start_in_calendar);
-            $jour   = date('d', $event->date_start_in_calendar);
-            $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+			$annee  = date('Y', $event->date_start_in_calendar);
+			$mois   = date('m', $event->date_start_in_calendar);
+			$jour   = date('d', $event->date_start_in_calendar);
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
 
-            do
-            {
-                $eventarray[$daykey][] = $event;
+			do {
+				$eventarray[$daykey][] = $event;
 
-                $daykey += 60 * 60 * 24;
-            }
+				$daykey += 60 * 60 * 24;
+			} while ($daykey <= $event->date_end_in_calendar);
 
-            while ($daykey <= $event->date_end_in_calendar);
-
-            $i++;
-        }
-    }
+			$i++;
+		}
+	}
 }
 
 // Complete $eventarray with external import Ical
 if (count($listofextcals))
 {
-    require_once DOL_DOCUMENT_ROOT.'/comm/action/class/ical.class.php';
-    foreach ($listofextcals as $extcal)
-    {
-        $url = $extcal['src']; // Example: https://www.google.com/calendar/ical/eldy10%40gmail.com/private-cde92aa7d7e0ef6110010a821a2aaeb/basic.ics
-        $namecal = $extcal['name'];
-        $offsettz = $extcal['offsettz'];
-        $colorcal = $extcal['color'];
-        $buggedfile = $extcal['buggedfile'];
-        //print "url=".$url." namecal=".$namecal." colorcal=".$colorcal." buggedfile=".$buggedfile;
-        $ical = new ICal();
-        $ical->parse($url);
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/ical.class.php';
+	foreach ($listofextcals as $extcal)
+	{
+		$url = $extcal['src']; // Example: https://www.google.com/calendar/ical/eldy10%40gmail.com/private-cde92aa7d7e0ef6110010a821a2aaeb/basic.ics
+		$namecal = $extcal['name'];
+		$offsettz = $extcal['offsettz'];
+		$colorcal = $extcal['color'];
+		$buggedfile = $extcal['buggedfile'];
+		//print "url=".$url." namecal=".$namecal." colorcal=".$colorcal." buggedfile=".$buggedfile;
+		$ical = new ICal();
+		$ical->parse($url);
 
-        // After this $ical->cal['VEVENT'] contains array of events, $ical->cal['DAYLIGHT'] contains daylight info, $ical->cal['STANDARD'] contains non daylight info, ...
-        //var_dump($ical->cal); exit;
-        $icalevents = array();
-        if (is_array($ical->get_event_list())) $icalevents = array_merge($icalevents, $ical->get_event_list()); // Add $ical->cal['VEVENT']
-        if (is_array($ical->get_freebusy_list())) $icalevents = array_merge($icalevents, $ical->get_freebusy_list()); // Add $ical->cal['VFREEBUSY']
+		// After this $ical->cal['VEVENT'] contains array of events, $ical->cal['DAYLIGHT'] contains daylight info, $ical->cal['STANDARD'] contains non daylight info, ...
+		//var_dump($ical->cal); exit;
+		$icalevents = array();
+		if (is_array($ical->get_event_list())) $icalevents = array_merge($icalevents, $ical->get_event_list()); // Add $ical->cal['VEVENT']
+		if (is_array($ical->get_freebusy_list())) $icalevents = array_merge($icalevents, $ical->get_freebusy_list()); // Add $ical->cal['VFREEBUSY']
 
-        if (count($icalevents) > 0)
-        {
-            // Duplicate all repeatable events into new entries
-            $moreicalevents = array();
-            foreach ($icalevents as $icalevent)
-            {
-                if (isset($icalevent['RRULE']) && is_array($icalevent['RRULE'])) //repeatable event
-                {
-                    //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 ($icalevent['DTSTART;VALUE=DATE']) //fullday event
-                    {
-                        $datecurstart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
-                        $datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
-                    }
-                    elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime']))
-                    {
-                        $datecurstart = $icalevent['DTSTART']['unixtime'];
-                        $datecurend = $icalevent['DTEND']['unixtime'];
-                        if (!empty($ical->cal['DAYLIGHT']['DTSTART']) && $datecurstart)
-                        {
-                            //var_dump($ical->cal);
-                            $tmpcurstart = $datecurstart;
-                            $tmpcurend = $datecurend;
-                            $tmpdaylightstart = dol_mktime(0, 0, 0, 1, 1, 1970, 1) + (int) $ical->cal['DAYLIGHT']['DTSTART'];
-                            $tmpdaylightend = dol_mktime(0, 0, 0, 1, 1, 1970, 1) + (int) $ical->cal['STANDARD']['DTSTART'];
-                            //var_dump($tmpcurstart);var_dump($tmpcurend); var_dump($ical->cal['DAYLIGHT']['DTSTART']);var_dump($ical->cal['STANDARD']['DTSTART']);
-                            // Edit datecurstart and datecurend
-                            if ($tmpcurstart >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) $datecurstart -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
-                            else $datecurstart -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
-                            if ($tmpcurend >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) $datecurend -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
-                            else $datecurend -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
-                        }
-                        // datecurstart and datecurend are now GMT date
-                        //var_dump($datecurstart); var_dump($datecurend); exit;
-                    }
-                    else
-                    {
-                        // Not a recongized record
-                        dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR);
-                        continue;
-                    }
-                    //print 'xx'.$datecurstart;exit;
+		if (count($icalevents) > 0)
+		{
+			// Duplicate all repeatable events into new entries
+			$moreicalevents = array();
+			foreach ($icalevents as $icalevent)
+			{
+				if (isset($icalevent['RRULE']) && is_array($icalevent['RRULE'])) //repeatable event
+				{
+					//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 ($icalevent['DTSTART;VALUE=DATE']) //fullday event
+					{
+						$datecurstart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
+						$datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
+					} elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime']))
+					{
+						$datecurstart = $icalevent['DTSTART']['unixtime'];
+						$datecurend = $icalevent['DTEND']['unixtime'];
+						if (!empty($ical->cal['DAYLIGHT']['DTSTART']) && $datecurstart)
+						{
+							//var_dump($ical->cal);
+							$tmpcurstart = $datecurstart;
+							$tmpcurend = $datecurend;
+							$tmpdaylightstart = dol_mktime(0, 0, 0, 1, 1, 1970, 1) + (int) $ical->cal['DAYLIGHT']['DTSTART'];
+							$tmpdaylightend = dol_mktime(0, 0, 0, 1, 1, 1970, 1) + (int) $ical->cal['STANDARD']['DTSTART'];
+							//var_dump($tmpcurstart);var_dump($tmpcurend); var_dump($ical->cal['DAYLIGHT']['DTSTART']);var_dump($ical->cal['STANDARD']['DTSTART']);
+							// Edit datecurstart and datecurend
+							if ($tmpcurstart >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) $datecurstart -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
+							else $datecurstart -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
+							if ($tmpcurend >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) $datecurend -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
+							else $datecurend -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
+						}
+						// datecurstart and datecurend are now GMT date
+						//var_dump($datecurstart); var_dump($datecurend); exit;
+					} else {
+						// Not a recongized record
+						dol_syslog("Found a not recognized repeatable record with unknown date start", LOG_ERR);
+						continue;
+					}
+					//print 'xx'.$datecurstart;exit;
 
-                    $interval = (empty($icalevent['RRULE']['INTERVAL']) ? 1 : $icalevent['RRULE']['INTERVAL']);
-                    $until = empty($icalevent['RRULE']['UNTIL']) ? 0 : dol_stringtotime($icalevent['RRULE']['UNTIL'], 1);
-                    $maxrepeat = empty($icalevent['RRULE']['COUNT']) ? 0 : $icalevent['RRULE']['COUNT'];
-                    if ($until && ($until + ($datecurend - $datecurstart)) < $firstdaytoshow) continue; // We discard repeatable event that end before start date to show
-                    if ($datecurstart >= $lastdaytoshow) continue; // We discard repeatable event that start after end date to show
+					$interval = (empty($icalevent['RRULE']['INTERVAL']) ? 1 : $icalevent['RRULE']['INTERVAL']);
+					$until = empty($icalevent['RRULE']['UNTIL']) ? 0 : dol_stringtotime($icalevent['RRULE']['UNTIL'], 1);
+					$maxrepeat = empty($icalevent['RRULE']['COUNT']) ? 0 : $icalevent['RRULE']['COUNT'];
+					if ($until && ($until + ($datecurend - $datecurstart)) < $firstdaytoshow) continue; // We discard repeatable event that end before start date to show
+					if ($datecurstart >= $lastdaytoshow) continue; // We discard repeatable event that start after end date to show
 
-                    $numofevent = 0;
-                    while (($datecurstart < $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat)))
-                    {
-                        if ($datecurend >= $firstdaytoshow)    // We add event
-                        {
-                            $newevent = $icalevent;
-                            unset($newevent['RRULE']);
-                            if ($icalevent['DTSTART;VALUE=DATE'])
-                            {
-                                $newevent['DTSTART;VALUE=DATE'] = dol_print_date($datecurstart, '%Y%m%d');
-                                $newevent['DTEND;VALUE=DATE'] = dol_print_date($datecurend + 1, '%Y%m%d');
-                            }
-                            else
-                            {
-                                $newevent['DTSTART'] = $datecurstart;
-                                $newevent['DTEND'] = $datecurend;
-                            }
-                            $moreicalevents[] = $newevent;
-                        }
-                        // Jump on next occurence
-                        $numofevent++;
-                        $savdatecurstart = $datecurstart;
-                        if ($icalevent['RRULE']['FREQ'] == 'DAILY')
-                        {
-                            $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'd');
-                            $datecurend = dol_time_plus_duree($datecurend, $interval, 'd');
-                        }
-                        if ($icalevent['RRULE']['FREQ'] == 'WEEKLY')
-                        {
-                            $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'w');
-                            $datecurend = dol_time_plus_duree($datecurend, $interval, 'w');
-                        }
-                        elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY')
-                        {
-                            $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'm');
-                            $datecurend = dol_time_plus_duree($datecurend, $interval, 'm');
-                        }
-                        elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY')
-                        {
-                            $datecurstart = dol_time_plus_duree($datecurstart, $interval, 'y');
-                            $datecurend = dol_time_plus_duree($datecurend, $interval, 'y');
-                        }
-                        // Test to avoid infinite loop ($datecurstart must increase)
-                        if ($savdatecurstart >= $datecurstart)
-                        {
-                            dol_syslog("Found a rule freq ".$icalevent['RRULE']['FREQ']." not managed by dolibarr code. Assume 1 week frequency.", LOG_ERR);
-                            $datecurstart += 3600 * 24 * 7;
-                            $datecurend += 3600 * 24 * 7;
-                        }
-                    }
-                }
-            }
-            $icalevents = array_merge($icalevents, $moreicalevents);
+					$numofevent = 0;
+					while (($datecurstart < $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat)))
+					{
+						if ($datecurend >= $firstdaytoshow)    // We add event
+						{
+							$newevent = $icalevent;
+							unset($newevent['RRULE']);
+							if ($icalevent['DTSTART;VALUE=DATE'])
+							{
+								$newevent['DTSTART;VALUE=DATE'] = dol_print_date($datecurstart, '%Y%m%d');
+								$newevent['DTEND;VALUE=DATE'] = dol_print_date($datecurend + 1, '%Y%m%d');
+							} else {
+								$newevent['DTSTART'] = $datecurstart;
+								$newevent['DTEND'] = $datecurend;
+							}
+							$moreicalevents[] = $newevent;
+						}
+						// Jump on next occurence
+						$numofevent++;
+						$savdatecurstart = $datecurstart;
+						if ($icalevent['RRULE']['FREQ'] == 'DAILY')
+						{
+							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'd');
+							$datecurend = dol_time_plus_duree($datecurend, $interval, 'd');
+						}
+						if ($icalevent['RRULE']['FREQ'] == 'WEEKLY')
+						{
+							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'w');
+							$datecurend = dol_time_plus_duree($datecurend, $interval, 'w');
+						} elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY')
+						{
+							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'm');
+							$datecurend = dol_time_plus_duree($datecurend, $interval, 'm');
+						} elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY')
+						{
+							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'y');
+							$datecurend = dol_time_plus_duree($datecurend, $interval, 'y');
+						}
+						// Test to avoid infinite loop ($datecurstart must increase)
+						if ($savdatecurstart >= $datecurstart)
+						{
+							dol_syslog("Found a rule freq ".$icalevent['RRULE']['FREQ']." not managed by dolibarr code. Assume 1 week frequency.", LOG_ERR);
+							$datecurstart += 3600 * 24 * 7;
+							$datecurend += 3600 * 24 * 7;
+						}
+					}
+				}
+			}
+			$icalevents = array_merge($icalevents, $moreicalevents);
 
-            // Loop on each entry into cal file to know if entry is qualified and add an ActionComm into $eventarray
-            foreach ($icalevents as $icalevent)
-            {
-            	//var_dump($icalevent);
+			// Loop on each entry into cal file to know if entry is qualified and add an ActionComm into $eventarray
+			foreach ($icalevents as $icalevent)
+			{
+				//var_dump($icalevent);
 
-                //print $icalevent['SUMMARY'].'->'.var_dump($icalevent).'<br>';exit;
-                if (!empty($icalevent['RRULE'])) continue; // We found a repeatable event. It was already split into unitary events, so we discard general rule.
+				//print $icalevent['SUMMARY'].'->'.var_dump($icalevent).'<br>';exit;
+				if (!empty($icalevent['RRULE'])) continue; // We found a repeatable event. It was already split into unitary events, so we discard general rule.
 
-                // Create a new object action
-                $event = new ActionComm($db);
-                $addevent = false;
-                if (isset($icalevent['DTSTART;VALUE=DATE'])) // fullday event
-                {
-                    // For full day events, date are also GMT but they wont but converted using tz during output
-                    $datestart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
-                    $dateend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
-                    //print 'x'.$datestart.'-'.$dateend;exit;
-                    //print dol_print_date($dateend,'dayhour','gmt');
-                    $event->fulldayevent = 1;
-                    $addevent = true;
-                }
-                elseif (!is_array($icalevent['DTSTART'])) // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
-                {
-                    $datestart = $icalevent['DTSTART'];
-                    $dateend = $icalevent['DTEND'];
+				// Create a new object action
+				$event = new ActionComm($db);
+				$addevent = false;
+				if (isset($icalevent['DTSTART;VALUE=DATE'])) // fullday event
+				{
+					// For full day events, date are also GMT but they wont but converted using tz during output
+					$datestart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
+					$dateend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
+					//print 'x'.$datestart.'-'.$dateend;exit;
+					//print dol_print_date($dateend,'dayhour','gmt');
+					$event->fulldayevent = 1;
+					$addevent = true;
+				} elseif (!is_array($icalevent['DTSTART'])) // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
+				{
+					$datestart = $icalevent['DTSTART'];
+					$dateend = $icalevent['DTEND'];
 
-                    $datestart += +($offsettz * 3600);
-                    $dateend += +($offsettz * 3600);
+					$datestart += +($offsettz * 3600);
+					$dateend += +($offsettz * 3600);
 
-                    $addevent = true;
-                    //var_dump($offsettz);
-                    //var_dump(dol_print_date($datestart, 'dayhour', 'gmt'));
-                }
-                elseif (isset($icalevent['DTSTART']['unixtime']))	// File contains a local timezone + a TZ (for example when using bluemind)
-                {
-                    $datestart = $icalevent['DTSTART']['unixtime'];
-                    $dateend = $icalevent['DTEND']['unixtime'];
+					$addevent = true;
+					//var_dump($offsettz);
+					//var_dump(dol_print_date($datestart, 'dayhour', 'gmt'));
+				} elseif (isset($icalevent['DTSTART']['unixtime']))	// File contains a local timezone + a TZ (for example when using bluemind)
+				{
+					$datestart = $icalevent['DTSTART']['unixtime'];
+					$dateend = $icalevent['DTEND']['unixtime'];
 
-                    $datestart += +($offsettz * 3600);
-                    $dateend += +($offsettz * 3600);
+					$datestart += +($offsettz * 3600);
+					$dateend += +($offsettz * 3600);
 
-                    // $buggedfile is set to uselocalandtznodaylight if conf->global->AGENDA_EXT_BUGGEDFILEx = 'uselocalandtznodaylight'
-                    if ($buggedfile === 'uselocalandtznodaylight')	// unixtime is a local date that does not take daylight into account, TZID is +1 for example for 'Europe/Paris' in summer instead of 2
-                    {
-                    	// TODO
-                    }
-                    // $buggedfile is set to uselocalandtzdaylight if conf->global->AGENDA_EXT_BUGGEDFILEx = 'uselocalandtzdaylight' (for example with bluemind)
-                    if ($buggedfile === 'uselocalandtzdaylight')	// unixtime is a local date that does take daylight into account, TZID is +2 for example for 'Europe/Paris' in summer
-                    {
-                    	$localtzs = new DateTimeZone(preg_replace('/"/', '', $icalevent['DTSTART']['TZID']));
-                    	$localtze = new DateTimeZone(preg_replace('/"/', '', $icalevent['DTEND']['TZID']));
-                    	$localdts = new DateTime(dol_print_date($datestart, 'dayrfc', 'gmt'), $localtzs);
-                    	$localdte = new DateTime(dol_print_date($dateend, 'dayrfc', 'gmt'), $localtze);
+					// $buggedfile is set to uselocalandtznodaylight if conf->global->AGENDA_EXT_BUGGEDFILEx = 'uselocalandtznodaylight'
+					if ($buggedfile === 'uselocalandtznodaylight')	// unixtime is a local date that does not take daylight into account, TZID is +1 for example for 'Europe/Paris' in summer instead of 2
+					{
+						// TODO
+					}
+					// $buggedfile is set to uselocalandtzdaylight if conf->global->AGENDA_EXT_BUGGEDFILEx = 'uselocalandtzdaylight' (for example with bluemind)
+					if ($buggedfile === 'uselocalandtzdaylight')	// unixtime is a local date that does take daylight into account, TZID is +2 for example for 'Europe/Paris' in summer
+					{
+						$localtzs = new DateTimeZone(preg_replace('/"/', '', $icalevent['DTSTART']['TZID']));
+						$localtze = new DateTimeZone(preg_replace('/"/', '', $icalevent['DTEND']['TZID']));
+						$localdts = new DateTime(dol_print_date($datestart, 'dayrfc', 'gmt'), $localtzs);
+						$localdte = new DateTime(dol_print_date($dateend, 'dayrfc', 'gmt'), $localtze);
 						$tmps = -1 * $localtzs->getOffset($localdts);
 						$tmpe = -1 * $localtze->getOffset($localdte);
 						$datestart += $tmps;
 						$dateend += $tmpe;
 						//var_dump($datestart);
-                    }
-                    $addevent = true;
-                }
+					}
+					$addevent = true;
+				}
 
-                if ($addevent)
-                {
-                    $event->id = $icalevent['UID'];
-                    $event->ref = $event->id;
+				if ($addevent)
+				{
+					$event->id = $icalevent['UID'];
+					$event->ref = $event->id;
 
-                    $event->icalname = $namecal;
-                    $event->icalcolor = $colorcal;
-                    $usertime = 0; // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.
-                    $event->datep = $datestart + $usertime;
-                    $event->datef = $dateend + $usertime;
-                    $event->type_code = "ICALEVENT";
+					$userId = $userstatic->findUserIdByEmail($namecal);
+					if (!empty($userId) && $userId > 0)
+					{
+						$event->userassigned[$userId] = $userId;
+						$event->percentage = -1;
+					}
+					else {
+						$event->type_code = "ICALEVENT";
+					}
 
-                    if ($icalevent['SUMMARY']) $event->label = $icalevent['SUMMARY'];
-                    elseif ($icalevent['DESCRIPTION']) $event->label = dol_nl2br($icalevent['DESCRIPTION'], 1);
-                    else $event->label = $langs->trans("ExtSiteNoLabel");
+					$event->icalname = $namecal;
+					$event->icalcolor = $colorcal;
+					$usertime = 0; // We dont modify date because we want to have date into memory datep and datef stored as GMT date. Compensation will be done during output.
+					$event->datep = $datestart + $usertime;
+					$event->datef = $dateend + $usertime;
 
-                    $event->date_start_in_calendar = $event->datep;
+					if ($icalevent['SUMMARY']) $event->label = $icalevent['SUMMARY'];
+					elseif ($icalevent['DESCRIPTION']) $event->label = dol_nl2br($icalevent['DESCRIPTION'], 1);
+					else $event->label = $langs->trans("ExtSiteNoLabel");
 
-                    if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar = $event->datef;
-                    else $event->date_end_in_calendar = $event->datep;
+					// Priority (see https://www.kanzaki.com/docs/ical/priority.html)
+					// LOW      = 0 to 4
+					// MEDIUM   = 5
+					// HIGH     = 6 to 9
+					if ($icalevent['PRIORITY']) $event->priority = $icalevent['PRIORITY'];
 
-                    // Define ponctual property
-                    if ($event->date_start_in_calendar == $event->date_end_in_calendar)
-                    {
-                        $event->ponctuel = 1;
-                        //print 'x'.$datestart.'-'.$dateend;exit;
-                    }
+					// Transparency (see https://www.kanzaki.com/docs/ical/transp.html)
+					if ($icalevent['TRANSP'])
+					{
+						if ($icalevent['TRANSP'] == "TRANSPARENT") $event->transparency = 0; // 0 = available / free
+						if ($icalevent['TRANSP'] == "OPAQUE") $event->transparency = 1; // 1 = busy
 
-                    // Add event into $eventarray if date range are ok.
-                    if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow)
-                    {
-                        //print 'x'.$datestart.'-'.$dateend;exit;
-                        //print 'x'.$datestart.'-'.$dateend;exit;
-                        //print 'x'.$datestart.'-'.$dateend;exit;
-                        // This record is out of visible range
-                    }
-                    else
-                    {
-                        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);
+						// TODO: MS outlook states
+						// X-MICROSOFT-CDO-BUSYSTATUS:FREE      + TRANSP:TRANSPARENT => Available / Free
+						// X-MICROSOFT-CDO-BUSYSTATUS:FREE      + TRANSP:OPAQUE      => Work another place
+						// X-MICROSOFT-CDO-BUSYSTATUS:TENTATIVE + TRANSP:OPAQUE      => With reservations
+						// X-MICROSOFT-CDO-BUSYSTATUS:BUSY      + TRANSP:OPAQUE      => Busy
+						// X-MICROSOFT-CDO-BUSYSTATUS:OOF       + TRANSP:OPAQUE      => Away from the office / off-site
+					}
 
-                        // 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);
+					if ($icalevent['LOCATION']) $event->location = $icalevent['LOCATION'];
 
-                        // Loop on each day covered by action to prepare an index to show on calendar
-                        $loop = true; $j = 0;
-                        // daykey must be date that represent day box in calendar so must be a user time
-                        $daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
-                        $daykeygmt = dol_mktime(0, 0, 0, $mois, $jour, $annee, true, 0);
-                        do
-                        {
-                            //if ($event->fulldayevent) print dol_print_date($daykeygmt,'dayhour','gmt').'-'.dol_print_date($daykey,'dayhour','gmt').'-'.dol_print_date($event->date_end_in_calendar,'dayhour','gmt').' ';
-                            $eventarray[$daykey][] = $event;
-                            $daykey += 60 * 60 * 24; $daykeygmt += 60 * 60 * 24; // Add one day
-                            if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) $loop = false;
-                        }
-                        while ($loop);
-                    }
-                }
-            }
-        }
-    }
+					$event->date_start_in_calendar = $event->datep;
+
+					if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar = $event->datef;
+					else $event->date_end_in_calendar = $event->datep;
+
+					// Define ponctual property
+					if ($event->date_start_in_calendar == $event->date_end_in_calendar)
+					{
+						$event->ponctuel = 1;
+						//print 'x'.$datestart.'-'.$dateend;exit;
+					}
+
+					// Add event into $eventarray if date range are ok.
+					if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow)
+					{
+						//print 'x'.$datestart.'-'.$dateend;exit;
+						//print 'x'.$datestart.'-'.$dateend;exit;
+						//print 'x'.$datestart.'-'.$dateend;exit;
+						// This record is out of visible range
+					} else {
+						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);
+
+						// 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 must be date that represent day box in calendar so must be a user time
+						$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee);
+						$daykeygmt = dol_mktime(0, 0, 0, $mois, $jour, $annee, true, 0);
+						do {
+							//if ($event->fulldayevent) print dol_print_date($daykeygmt,'dayhour','gmt').'-'.dol_print_date($daykey,'dayhour','gmt').'-'.dol_print_date($event->date_end_in_calendar,'dayhour','gmt').' ';
+							$eventarray[$daykey][] = $event;
+							$daykey += 60 * 60 * 24; $daykeygmt += 60 * 60 * 24; // Add one day
+							if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) $loop = false;
+						} while ($loop);
+					}
+				}
+			}
+		}
+	}
 }
 
 
@@ -1114,12 +1158,12 @@ if (count($listofextcals))
 $parameters = array(); $object = null;
 $reshook = $hookmanager->executeHooks('getCalendarEvents', $parameters, $object, $action);
 if (!empty($hookmanager->resArray['eventarray'])) {
-    foreach ($hookmanager->resArray['eventarray'] as $keyDate => $events) {
-        if (!isset($eventarray[$keyDate])) {
-            $eventarray[$keyDate] = array();
-        }
-        $eventarray[$keyDate] = array_merge($eventarray[$keyDate], $events);
-    }
+	foreach ($hookmanager->resArray['eventarray'] as $keyDate => $events) {
+		if (!isset($eventarray[$keyDate])) {
+			$eventarray[$keyDate] = array();
+		}
+		$eventarray[$keyDate] = array_merge($eventarray[$keyDate], $events);
+	}
 }
 
 // Sort events
@@ -1138,179 +1182,202 @@ $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));
 
 
+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);
+
+print $s;
+
+
 if (empty($action) || $action == 'show_month')      // View by month
 {
-    $newparam = $param; // newparam is for birthday links
-    $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
-    $newparam = preg_replace('/action=show_month&?/i', '', $newparam);
-    $newparam = preg_replace('/action=show_week&?/i', '', $newparam);
-    $newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
-    $newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
-    $newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
-    $newparam = preg_replace('/viewcal=[0-9]+&?/i', '', $newparam);
-    $newparam = preg_replace('/showbirthday_=/i', 'showbirthday=', $newparam); // Restore correct parameter
-    $newparam .= '&viewcal=1';
+	$newparam = $param; // newparam is for birthday links
+	$newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
+	$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
+	$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+	$newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
+	$newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
+	$newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
+	$newparam = preg_replace('/viewcal=[0-9]+&?/i', '', $newparam);
+	$newparam = preg_replace('/showbirthday_=/i', 'showbirthday=', $newparam); // Restore correct parameter
+	$newparam .= '&viewcal=1';
 
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+	print '</div>';
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
-    print ' <tr class="liste_titre">';
-    $i = 0;
-    while ($i < 7)
-    {
-        print '  <td align="center">';
-        $numdayinweek = (($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7);
-        if (!empty($conf->dol_optimize_smallscreen))
-        {
-            $labelshort = array(0=>'SundayMin', 1=>'MondayMin', 2=>'TuesdayMin', 3=>'WednesdayMin', 4=>'ThursdayMin', 5=>'FridayMin', 6=>'SaturdayMin');
-            print $langs->trans($labelshort[$numdayinweek]);
-        }
-        else print $langs->trans("Day".$numdayinweek);
-        print '  </td>'."\n";
-        $i++;
-    }
-    echo ' </tr>'."\n";
+	print '<div class="div-table-responsive-no-min sectioncalendarbymonth maxscreenheightless300">';
+	print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
+	print ' <tr class="liste_titre">';
+	// Column title of weeks numbers
+	echo '  <td align="center">#</td>';
+	$i = 0;
+	while ($i < 7)
+	{
+		print '  <td class="center bold uppercase tdfordaytitle">';
+		$numdayinweek = (($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7);
+		if (!empty($conf->dol_optimize_smallscreen))
+		{
+			$labelshort = array(0=>'SundayMin', 1=>'MondayMin', 2=>'TuesdayMin', 3=>'WednesdayMin', 4=>'ThursdayMin', 5=>'FridayMin', 6=>'SaturdayMin');
+			print $langs->trans($labelshort[$numdayinweek]);
+		} else print $langs->trans("Day".$numdayinweek);
+		print '  </td>'."\n";
+		$i++;
+	}
+	echo ' </tr>'."\n";
 
-    $todayarray = dol_getdate($now, 'fast');
-    $todaytms = dol_mktime(0, 0, 0, $todayarray['mon'], $todayarray['mday'], $todayarray['year']);
+	$todayarray = dol_getdate($now, 'fast');
+	$todaytms = dol_mktime(0, 0, 0, $todayarray['mon'], $todayarray['mday'], $todayarray['year']);
 
-    // In loops, tmpday contains day nb in current month (can be zero or negative for days of previous month)
-    //var_dump($eventarray);
-    for ($iter_week = 0; $iter_week < 6; $iter_week++)
-    {
-        echo " <tr>\n";
-        for ($iter_day = 0; $iter_day < 7; $iter_day++)
-        {
-        	/* Show days before the beginning of the current month (previous month)  */
-            if ($tmpday <= 0)
-            {
-                $style = 'cal_other_month cal_past';
-        		if ($iter_day == 6) $style .= ' cal_other_month_right';
-                echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
-                show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
-                echo "  </td>\n";
-            }
-            /* Show days of the current month */
-            elseif ($tmpday <= $max_day_in_month)
-            {
-                $curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);
-                $style = 'cal_current_month';
-                if ($iter_day == 6) $style .= ' cal_current_month_right';
-                $today = 0;
-                if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $month && $todayarray['year'] == $year) $today = 1;
-                if ($today) $style = 'cal_today';
-                if ($curtime < $todaytms) $style .= ' cal_past';
+	// In loops, tmpday contains day nb in current month (can be zero or negative for days of previous month)
+	//var_dump($eventarray);
+	for ($iter_week = 0; $iter_week < 6; $iter_week++) {
+		echo " <tr>\n";
+		// Get date of the current day, format 'yyyy-mm-dd'
+		if ($tmpday <= 0) // If number of the current day is in previous month
+		{
+			$currdate0 = sprintf("%04d", $prev_year).sprintf("%02d", $prev_month).sprintf("%02d", $max_day_in_prev_month + $tmpday);
+		}
+		elseif ($tmpday <= $max_day_in_month) // If number of the current day is in current month
+		{
+			$currdate0 = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $tmpday);
+		}
+		else // If number of the current day is in next month
+		{
+			$currdate0 = sprintf("%04d", $next_year).sprintf("%02d", $next_month).sprintf("%02d", $tmpday - $max_day_in_month);
+		}
+		// Get week number for the targeted date '$currdate0'
+		$numweek0 = date("W", strtotime(date($currdate0)));
+		// Show the week number, and define column width
+		echo ' <td class="center weeknumber opacitymedium" width="2%">'.$numweek0.'</td>';
+
+		for ($iter_day = 0; $iter_day < 7; $iter_day++) {
+			if ($tmpday <= 0) {
+				/* 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">';
+				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) {
+				/* Show days of the current month */
+				$curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);
+				$style = 'cal_current_month';
+				if ($iter_day == 6) $style .= ' cal_current_month_right';
+				$today = 0;
+				if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $month && $todayarray['year'] == $year) $today = 1;
+				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">';
-                show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
-                echo "  </td>\n";
-            }
-            /* Show days after the current month (next month) */
-            else
-			{
-                $style = 'cal_other_month';
-                if ($iter_day == 6) $style .= ' cal_other_month_right';
-                echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
-                show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
-                echo "</td>\n";
-            }
-            $tmpday++;
-        }
-        echo " </tr>\n";
-    }
-    print "</table>\n";
+				echo '  <td class="'.$style.' nowrap" width="14%" valign="top">';
+				show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
+				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">';
+				show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
+				echo "</td>\n";
+			}
+			$tmpday++;
+		}
+		echo " </tr>\n";
+	}
+	print "</table>\n";
 	print '</div>';
 
 	print '<input type="hidden" name="actionmove" value="mupdate">';
 	print '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 	print '<input type="hidden" name="newdate" id="newdate">';
-}
-elseif ($action == 'show_week') // View by week
-{
-    $newparam = $param; // newparam is for birthday links
-    $newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
-    $newparam = preg_replace('/action=show_month&?/i', '', $newparam);
-    $newparam = preg_replace('/action=show_week&?/i', '', $newparam);
-    $newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
-    $newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
-    $newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
-    $newparam = preg_replace('/viewweek=[0-9]+&?/i', '', $newparam);
-    $newparam = preg_replace('/showbirthday_=/i', 'showbirthday=', $newparam); // Restore correct parameter
-    $newparam .= '&viewweek=1';
+} elseif ($action == 'show_week') {
+	// View by week
+	$newparam = $param; // newparam is for birthday links
+	$newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
+	$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
+	$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+	$newparam = preg_replace('/day=[0-9]+&?/i', '', $newparam);
+	$newparam = preg_replace('/month=[0-9]+&?/i', '', $newparam);
+	$newparam = preg_replace('/year=[0-9]+&?/i', '', $newparam);
+	$newparam = preg_replace('/viewweek=[0-9]+&?/i', '', $newparam);
+	$newparam = preg_replace('/showbirthday_=/i', 'showbirthday=', $newparam); // Restore correct parameter
+	$newparam .= '&viewweek=1';
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
-    print ' <tr class="liste_titre">';
-    $i = 0;
-    while ($i < 7)
-    {
-        echo '  <td align="center">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7))."</td>\n";
-        $i++;
-    }
-    echo " </tr>\n";
+	print '<div class="liste_titre liste_titre_bydiv centpercent"><div class="divsearchfield">';
+	print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+	print '</div></div>';
 
-    echo " <tr>\n";
+	print '<div class="div-table-responsive-no-min sectioncalendarbyweek maxscreenheightless300">';
+	print '<table width="100%" class="noborder nocellnopadd cal_pannel cal_month">';
+	print ' <tr class="liste_titre">';
+	$i = 0;
+	while ($i < 7) {
+		echo '  <td class="center bold uppercase tdfordaytitle">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7))."</td>\n";
+		$i++;
+	}
+	echo " </tr>\n";
 
-    for ($iter_day = 0; $iter_day < 7; $iter_day++)
-    {
-        // Show days of the current week
+	echo " <tr>\n";
+
+	for ($iter_day = 0; $iter_day < 7; $iter_day++) {
+		// Show days of the current week
 		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');
 		$tmparray = dol_getdate($curtime, true);
 		$tmpday = $tmparray['mday'];
 		$tmpmonth = $tmparray['mon'];
 		$tmpyear = $tmparray['year'];
 
-        $style = 'cal_current_month';
-        if ($iter_day == 6) $style .= ' cal_other_month_right';
-        $today = 0;
-        $todayarray = dol_getdate($now, 'fast');
-        if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
-        if ($today) $style = 'cal_today';
+		$style = 'cal_current_month';
+		if ($iter_day == 6) $style .= ' cal_other_month_right';
+		$today = 0;
+		$todayarray = dol_getdate($now, 'fast');
+		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
+		if ($today) $style = 'cal_today';
 
-        echo '  <td class="'.$style.'" width="14%" valign="top">';
-        show_day_events($db, $tmpday, $tmpmonth, $tmpyear, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);
-        echo "  </td>\n";
-    }
-    echo " </tr>\n";
+		echo '  <td class="'.$style.'" width="14%" valign="top">';
+		show_day_events($db, $tmpday, $tmpmonth, $tmpyear, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);
+		echo "  </td>\n";
+	}
+	echo " </tr>\n";
 
-    print "</table>\n";
+	print "</table>\n";
 	print '</div>';
 
-    echo '<input type="hidden" name="actionmove" value="mupdate">';
-    echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
-    echo '<input type="hidden" name="newdate" id="newdate">';
-}
-else    // View by day
+	echo '<input type="hidden" name="actionmove" value="mupdate">';
+	echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
+	echo '<input type="hidden" name="newdate" id="newdate">';
+} else // View by day
 {
-    $newparam = $param; // newparam is for birthday links
-    $newparam = preg_replace('/action=show_month&?/i', '', $newparam);
-    $newparam = preg_replace('/action=show_week&?/i', '', $newparam);
-    $newparam = preg_replace('/viewday=[0-9]+&?/i', '', $newparam);
-    $newparam .= '&viewday=1';
-    // Code to show just one day
-    $style = 'cal_current_month cal_current_month_oneday';
-    $today = 0;
-    $todayarray = dol_getdate($now, 'fast');
-    if ($todayarray['mday'] == $day && $todayarray['mon'] == $month && $todayarray['year'] == $year) $today = 1;
-    //if ($today) $style='cal_today';
+	$newparam = $param; // newparam is for birthday links
+	$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
+	$newparam = preg_replace('/action=show_week&?/i', '', $newparam);
+	$newparam = preg_replace('/viewday=[0-9]+&?/i', '', $newparam);
+	$newparam .= '&viewday=1';
+	// Code to show just one day
+	$style = 'cal_current_month cal_current_month_oneday';
+	$today = 0;
+	$todayarray = dol_getdate($now, 'fast');
+	if ($todayarray['mday'] == $day && $todayarray['mon'] == $month && $todayarray['year'] == $year) $today = 1;
+	//if ($today) $style='cal_today';
 
-    $timestamp = dol_mktime(12, 0, 0, $month, $day, $year);
-    $arraytimestamp = dol_getdate($timestamp);
+	$timestamp = dol_mktime(12, 0, 0, $month, $day, $year);
+	$arraytimestamp = dol_getdate($timestamp);
 
-    //echo '<table class="tagtable centpercent noborder nocellnopadd cal_pannel cal_month">';
-    echo '<table class="tagtable centpercent noborder nocellnopadd cal_pannel cal_month noborderbottom" style="margin-bottom: 5px !important;">';
+	print '<div class="liste_titre liste_titre_bydiv centpercent"><div class="divsearchfield">';
+	print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
+	print '</div></div>';
 
-    echo ' <tr class="tagtr liste_titre">';
-    echo '  <td class="tagtd width100"></td>';
-    echo '  <td class="tagtd center">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n";
-    echo " </td>\n";
+	print '<div class="div-table-responsive-no-min sectioncalendarbyday maxscreenheightless300">';
+	echo '<table class="tagtable centpercent noborder nocellnopadd cal_pannel cal_month noborderbottom" style="margin-bottom: 5px !important;">';
 
-    /*
+	echo ' <tr class="tagtr liste_titre">';
+	echo '  <td class="tagtd center bold uppercase">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n";
+	echo " </td>\n";
+
+	/*
     echo ' <div class="tagtr">';
     echo '  <div class="tagtd width100"></div>';
     echo '  <div class="tagtd center">';
@@ -1319,39 +1386,39 @@ else    // View by day
     echo " </div>\n";
 	*/
 
-    echo '</table>';
+	echo '</table>';
+	print '</div>';
 
-    /* WIP View per hour */
-    $useviewhour = 0;
-    if ($useviewhour)
-    {
-    	print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	/* WIP View per hour */
+	$useviewhour = 0;
+	if ($useviewhour)
+	{
+		print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 
-    	$maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file
+		$maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file
 
-	    echo '<div style="max-height: '.$maxheightwin.'px;">';
+		echo '<div style="max-height: '.$maxheightwin.'px;">';
 		echo '<div class="tagtable centpercent calendarviewcontainer">';
 
-	    $maxnbofchar = 80;
+		$maxnbofchar = 80;
 
-	    $tmp = explode('-', $conf->global->MAIN_DEFAULT_WORKING_HOURS);
-	    $minhour = round($tmp[0], 0);
-	    $maxhour = round($tmp[1], 0);
-	    if ($minhour > 23) $minhour = 23;
-	    if ($maxhour < 1)  $maxhour = 1;
-	    if ($maxhour <= $minhour) { $maxhour = $minhour + 1; }
+		$tmp = explode('-', $conf->global->MAIN_DEFAULT_WORKING_HOURS);
+		$minhour = round($tmp[0], 0);
+		$maxhour = round($tmp[1], 0);
+		if ($minhour > 23) $minhour = 23;
+		if ($maxhour < 1)  $maxhour = 1;
+		if ($maxhour <= $minhour) { $maxhour = $minhour + 1; }
 
-	    $i = 0;
-	    $j = 0;
+		$i = 0;
+		$j = 0;
 		while ($i < 24)
 		{
-		    echo ' <div class="tagtr calendarviewcontainertr">'."\n";
-		    echo '  <div class="tagtd width100 tdtop">'.dol_print_date($i * 3600, 'hour', 'gmt').'</div>';
-		    echo '  <div class="tagtd '.$style.' tdtop">';
-		    echo "  </div>\n";
-		    echo " </div>\n";
-		    $i++;
-		    $j++;
+			echo ' <div class="tagtr calendarviewcontainertr">'."\n";
+			echo '  <div class="tagtd width100 tdtop">'.dol_print_date($i * 3600, 'hour', 'gmt').'</div>';
+			echo '  <div class="tagtd '.$style.' tdtop"></div>'."\n";
+			echo ' </div>'."\n";
+			$i++;
+			$j++;
 		}
 
 		echo '</div></div>';
@@ -1359,15 +1426,13 @@ else    // View by day
 		show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 1);
 
 		print '</div>';
-    }
-    else
-    {
-    	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
+	} else {
+		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
 
-    	show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0);
+		show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0);
 
-    	print '</div>';
-    }
+		print '</div>';
+	}
 }
 
 print "\n".'</form>';
@@ -1397,417 +1462,401 @@ $db->close();
  */
 function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint = 0, $maxnbofchar = 16, $newparam = '', $showinfo = 0, $minheight = 60, $nonew = 0)
 {
-    global $user, $conf, $langs;
-    global $action, $filter, $filtert, $status, $actioncode, $usergroup; // Filters used into search form
-    global $theme_datacolor;
-    global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;
+	global $user, $conf, $langs;
+	global $action, $filter, $filtert, $status, $actioncode, $usergroup; // Filters used into search form
+	global $theme_datacolor;
+	global $cachethirdparties, $cachecontacts, $cacheusers, $colorindexused;
 
-    $dateint = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
+	$dateint = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
 
-    print "\n";
+	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";
+	// 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";
 
-    if ($nonew <= 0)
-    {
-	    print '<div class="tagtr"><div class="nowrap float">';
-	    print '<a 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 '">';
-	    if ($showinfo) print dol_print_date($curtime, 'daytextshort');
-	    else print dol_print_date($curtime, '%d');
-	    print '</a>';
-	    print '</div><div class="floatright nowrap">';
-	    if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
-	    {
-	    	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
+	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 '">';
+		if ($showinfo) print dol_print_date($curtime, 'daytextshort');
+		else print dol_print_date($curtime, '%d');
+		print '</a>';
+		print '</div><div class="floatright nowrap">';
+		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 img_picto($langs->trans("NewAction"), 'edit_add.png');
-	        print '</a>';
-	    }
-	    print '</div></div>'."\n";
-    }
+			//$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 img_picto($langs->trans("NewAction"), 'edit_add.png');
+			print '</a>';
+		}
+		print '</div></div>'."\n";
+	}
 
-    if ($nonew < 0)
-    {
-    	print '</div>';
-    	return;
-    }
+	if ($nonew < 0)
+	{
+		print '</div>';
+		return;
+	}
 
-    // Line with td contains all div of each events
-    print '<div class="tagtr">';
-    print '<div class="tagtd centpercent agendacell sortable">';
+	// Line with td contains all div of each events
+	print '<div class="tagtr">';
+	print '<div class="tagtd centpercent agendacell sortable">';
 
-    //$curtime = dol_mktime (0, 0, 0, $month, $day, $year);
-    $i = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
-    $ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
+	//$curtime = dol_mktime (0, 0, 0, $month, $day, $year);
+	$i = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
+	$ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
 
-    $colorindexused[$user->id] = 0; // Color index for current user (user->id) is always 0
-    $nextindextouse = is_array($colorindexused) ?count($colorindexused) : 0; // At first run this is 0, so fist user has 0, next 1, ...
+	$colorindexused[$user->id] = 0; // Color index for current user (user->id) is always 0
+	$nextindextouse = is_array($colorindexused) ?count($colorindexused) : 0; // At first run this is 0, so fist user has 0, next 1, ...
 	//var_dump($colorindexused);
 
-    foreach ($eventarray as $daykey => $notused)
-    {
-        $annee = date('Y', $daykey);
-        $mois = date('m', $daykey);
-        $jour = date('d', $daykey);
-        if ($day == $jour && $month == $mois && $year == $annee)
-        {
-            foreach ($eventarray[$daykey] as $index => $event)
-            {
-                if ($i < $maxprint || $maxprint == 0 || !empty($conf->global->MAIN_JS_SWITCH_AGENDA))
-                {
-                    $keysofuserassigned = array_keys($event->userassigned);
-                    $ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
+	foreach ($eventarray as $daykey => $notused)
+	{
+		$annee = date('Y', $daykey);
+		$mois = date('m', $daykey);
+		$jour = date('d', $daykey);
+		if ($day == $jour && $month == $mois && $year == $annee)
+		{
+			foreach ($eventarray[$daykey] as $index => $event)
+			{
+				if ($i < $maxprint || $maxprint == 0 || !empty($conf->global->MAIN_JS_SWITCH_AGENDA))
+				{
+					$keysofuserassigned = array_keys($event->userassigned);
+					$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
-                    // Define $color (Hex string like '0088FF') and $cssclass of event
-                    $color = -1; $cssclass = ''; $colorindex = -1;
-                    if (in_array($user->id, $keysofuserassigned))
-                    {
-	                    $cssclass = 'family_mytasks';
+					// Define $color (Hex string like '0088FF') and $cssclass of event
+					$color = -1; $cssclass = ''; $colorindex = -1;
+					if (in_array($user->id, $keysofuserassigned))
+					{
+						$cssclass = 'family_mytasks';
 
-	                    if (empty($cacheusers[$event->userownerid]))
-	                    {
-	                    	$newuser = new User($db);
-	                    	$newuser->fetch($event->userownerid);
-	                    	$cacheusers[$event->userownerid] = $newuser;
-	                    }
-	                    //var_dump($cacheusers[$event->userownerid]->color);
-
-	                    // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-	                    if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
-                    }
-                    elseif ($event->type_code == 'ICALEVENT')      // Event come from external ical file
-                    {
-                    	$numical++;
-                    	if (!empty($event->icalname)) {
-                    		if (!isset($numicals[dol_string_nospecial($event->icalname)])) {
-                    			$numicals[dol_string_nospecial($event->icalname)] = 0;
-                    		}
-                    		$numicals[dol_string_nospecial($event->icalname)]++;
-                    	}
-
-                    	$color = ($event->icalcolor ? $event->icalcolor : -1);
-                    	$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
-                    }
-                    elseif ($event->type_code == 'BIRTHDAY')
-                    {
-                    	$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unmovable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-                    }
-                    else
-               	    {
-                    	$numother++;
-                    	$color = ($event->icalcolor ? $event->icalcolor : -1);
-                    	$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
-
-                        if (empty($cacheusers[$event->userownerid]))
-                        {
-                        	$newuser = new User($db);
-                        	$newuser->fetch($event->userownerid);
-                        	$cacheusers[$event->userownerid] = $newuser;
-                        }
-                        //var_dump($cacheusers[$event->userownerid]->color);
-
-                       	// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-                       	if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
-                    }
-
-                    if ($color < 0)	// Color was not set on user card. Set color according to color index.
-                    {
-                    	// Define color index if not yet defined
-                    	$idusertouse = ($event->userownerid ? $event->userownerid : 0);
-                    	if (isset($colorindexused[$idusertouse]))
-                    	{
-                    		$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
-                    	}
-                    	else
-                    	{
-                   			$colorindex = $nextindextouse;
-                   			$colorindexused[$idusertouse] = $colorindex;
-                    		if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
-                    	}
-                    	//print '|'.($color).'='.($idusertouse?$idusertouse:0).'='.$colorindex.'<br>';
-			            // Define color
-                    	$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-                    }
-                    $cssclass = $cssclass.' '.$cssclass.'_day_'.$ymd;
-
-                    // Defined style to disable drag and drop feature
-                    if ($event->type_code == 'AC_OTH_AUTO')
-                    {
-                        $cssclass .= " unmovable";
-                    }
-                    elseif ($event->type_code == 'ICALEVENT')
-                    {
-                        $cssclass .= " unmovable";
-                    } elseif ($event->date_end_in_calendar && date('Ymd', $event->date_start_in_calendar) != date('Ymd', $event->date_end_in_calendar)) {
-                        $tmpyearend    = date('Y', $event->date_end_in_calendar);
-                        $tmpmonthend   = date('m', $event->date_end_in_calendar);
-                        $tmpdayend     = date('d', $event->date_end_in_calendar);
-                        if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
-                        {
-                            $cssclass .= " unmovable";
-                        }
-                    }
-                    else {
-                        if ($user->rights->agenda->allactions->create ||
-                            (($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create))
-                        {
-                            $cssclass .= " movable cursormove";
-                        } else {
-                            $cssclass .= " unmovable";
-                        }
-                    }
-
-                    $h = ''; $nowrapontd = 1;
-                    if ($action == 'show_day') { $h = 'height: 100%; '; $nowrapontd = 0; }
-                    if ($action == 'show_week') { $h = 'height: 100%; '; $nowrapontd = 0; }
-
-                    // Show rect of event
-                    print "\n";
-                    print '<!-- start event '.$i.' -->'."\n";
-                    print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'"';
-                    //print ' style="height: 100px;';
-                    //print ' position: absolute; top: 40px; width: 50%;';
-                    //print '"';
-                    print '>';
-
-                    //var_dump($event->userassigned);
-                    //var_dump($event->transparency);
-                    print '<table class="centpercent cal_event';
-                    print (empty($event->transparency) ? ' cal_event_notbusy' : ' cal_event_busy');
-                    //if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) print ' opacitymedium';	// Not busy
-                    print '" style="'.$h;
-                    $colortouse = $color;
-                    // If colortouse is similar than background, we force to change it.
-                    if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY))
-                    {
-                    	print 'border: 2px solid #'.$colortouse.';';
-                    }
-                    else
-                    {
-                    	print 'background: #'.$colortouse.';';
-                    	print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($colortouse, -3).'), to(#'.dol_color_minus($colortouse, -1).'));';
-                    }
-                   	//print 'background: #'.$colortouse.';';
-                   	//print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';
-                    //if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
-                    //else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
-                    //print ' -moz-border-radius:4px;"';
-                    //print 'border: 1px solid #ccc" width="100%"';
-                    print '">';
-                    print '<tr>';
-                    print '<td class="tdoverflow nobottom centpercent '.($nowrapontd ? 'nowrap ' : '').'cal_event'.($event->type_code == 'BIRTHDAY' ? ' cal_event_birthday' : '').'">';
-
-                    $daterange = '';
-
-                    if ($event->type_code == 'BIRTHDAY') // It's a birthday
-                    {
-                        print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'birthday', 'contact');
-                    }
-					elseif ($event->type_code == 'HOLIDAY')
-                    {
-                        print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'holiday', 'user');
-                    }
-                    elseif ($event->type_code != 'BIRTHDAY' && $event->type_code != 'HOLIDAY')
-                    {
-                        // Picto
-                        if (empty($event->fulldayevent))
-                        {
-                            //print $event->getNomUrl(2).' ';
-                        }
-
-                        // Date
-                        if (empty($event->fulldayevent))
-                        {
-                            // Show hours (start ... end)
-                            $tmpyearstart  = date('Y', $event->date_start_in_calendar);
-                            $tmpmonthstart = date('m', $event->date_start_in_calendar);
-                            $tmpdaystart   = date('d', $event->date_start_in_calendar);
-                            $tmpyearend    = date('Y', $event->date_end_in_calendar);
-                            $tmpmonthend   = date('m', $event->date_end_in_calendar);
-                            $tmpdayend     = date('d', $event->date_end_in_calendar);
-                            // Hour start
-                            if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour)
-                            {
-                                $daterange .= dol_print_date($event->date_start_in_calendar, 'hour'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
-                                if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
-                                {
-                                    if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend)
-                                    $daterange .= '-';
-                                    //else
-                                    //print '...';
-                                }
-                            }
-                            if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
-                            {
-                                if ($tmpyearstart != $tmpyearend || $tmpmonthstart != $tmpmonthend || $tmpdaystart != $tmpdayend)
-                                {
-                                    $daterange .= '...';
-                                }
-                            }
-                            // Hour end
-                            if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
-                            {
-                                if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
-                                $daterange .= dol_print_date($event->date_end_in_calendar, 'hour'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
-                            }
-                        }
-                        else
+						if (empty($cacheusers[$event->userownerid]))
 						{
-                            if ($showinfo)
-                            {
-                                print $langs->trans("EventOnFullDay")."<br>\n";
-                            }
-                        }
+							$newuser = new User($db);
+							$newuser->fetch($event->userownerid);
+							$cacheusers[$event->userownerid] = $newuser;
+						}
+						//var_dump($cacheusers[$event->userownerid]->color);
 
-                        // Show title
-                        $titletoshow = $daterange;
-                        $titletoshow .= ($titletoshow ? ' ' : '').($event->label ? $event->label : $event->libelle);
+						// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+						if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
+					} elseif ($event->type_code == 'ICALEVENT')      // Event come from external ical file
+					{
+						$numical++;
+						if (!empty($event->icalname)) {
+							if (!isset($numicals[dol_string_nospecial($event->icalname)])) {
+								$numicals[dol_string_nospecial($event->icalname)] = 0;
+							}
+							$numicals[dol_string_nospecial($event->icalname)]++;
+						}
 
-                        if ($event->type_code != 'ICALEVENT') {
-                        	$savlabel = $event->label ? $event->label : $event->libelle;
-                        	$event->label = $titletoshow;
-                        	$event->libelle = $titletoshow;
-                        	// Note: List of users are inside $event->userassigned. Link may be clickable depending on permissions of user.
-                        	$titletoshow = $event->getNomUrl(0, $maxnbofchar, 'cal_event', '', 0, 0);
-                        	$event->label = $savlabel;
-                        	$event->libelle = $savlabel;
-                        }
+						$color = ($event->icalcolor ? $event->icalcolor : -1);
+						$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
+					} elseif ($event->type_code == 'BIRTHDAY')
+					{
+						$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unmovable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
+					} else {
+						$numother++;
+						$color = ($event->icalcolor ? $event->icalcolor : -1);
+						$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
 
-                        // Loop on each assigned user
-                        $listofusertoshow = '';
-                        $posuserassigned = 0;
-                        foreach ($event->userassigned as $tmpid => $tmpdata)
-                        {
-                            if (!$posuserassigned && $titletoshow) $listofusertoshow .= '<br>';
-                            $posuserassigned++;
-                            if (empty($cacheusers[$tmpid]))
-                            {
-                                $newuser = new User($db);
-                                $newuser->fetch($tmpid);
-                                $cacheusers[$tmpid] = $newuser;
-                            }
+						if (empty($cacheusers[$event->userownerid]))
+						{
+							$newuser = new User($db);
+							$newuser->fetch($event->userownerid);
+							$cacheusers[$event->userownerid] = $newuser;
+						}
+						//var_dump($cacheusers[$event->userownerid]->color);
 
-                            $listofusertoshow .= $cacheusers[$tmpid]->getNomUrl(-3, '', 0, 0, 0, 0, '', 'paddingright valigntextbottom');
-                        }
+					   	// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+					   	if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
+					}
 
-                        print $titletoshow;
-                        print $listofusertoshow;
+					if ($color < 0)	// Color was not set on user card. Set color according to color index.
+					{
+						// Define color index if not yet defined
+						$idusertouse = ($event->userownerid ? $event->userownerid : 0);
+						if (isset($colorindexused[$idusertouse]))
+						{
+							$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
+						} else {
+				   			$colorindex = $nextindextouse;
+				   			$colorindexused[$idusertouse] = $colorindex;
+							if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
+						}
+						//print '|'.($color).'='.($idusertouse?$idusertouse:0).'='.$colorindex.'<br>';
+						// Define color
+						$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
+					}
+					$cssclass = $cssclass.' '.$cssclass.'_day_'.$ymd;
 
-                        if ($event->type_code == 'ICALEVENT') print '<br>('.dol_trunc($event->icalname, $maxnbofchar).')';
+					// Defined style to disable drag and drop feature
+					if ($event->type_code == 'AC_OTH_AUTO')
+					{
+						$cssclass .= " unmovable";
+					} elseif ($event->type_code == 'ICALEVENT')
+					{
+						$cssclass .= " unmovable";
+					} elseif ($event->date_end_in_calendar && date('Ymd', $event->date_start_in_calendar) != date('Ymd', $event->date_end_in_calendar)) {
+						$tmpyearend    = date('Y', $event->date_end_in_calendar);
+						$tmpmonthend   = date('m', $event->date_end_in_calendar);
+						$tmpdayend     = date('d', $event->date_end_in_calendar);
+						if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
+						{
+							$cssclass .= " unmovable";
+						}
+					} else {
+						if ($user->rights->agenda->allactions->create ||
+							(($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create))
+						{
+							$cssclass .= " movable cursormove";
+						} else {
+							$cssclass .= " unmovable";
+						}
+					}
 
-                        $thirdparty_id = ($event->thirdparty_id > 0 ? $event->thirdparty_id : ((is_object($event->societe) && $event->societe->id > 0) ? $event->societe->id : 0));
-                        $contact_id = ($event->contact_id > 0 ? $event->contact_id : ((is_object($event->contact) && $event->contact->id > 0) ? $event->contact->id : 0));
+					$h = ''; $nowrapontd = 1;
+					if ($action == 'show_day') { $h = 'height: 100%; '; $nowrapontd = 0; }
+					if ($action == 'show_week') { $h = 'height: 100%; '; $nowrapontd = 0; }
 
-                        // If action related to company / contact
-                        $linerelatedto = '';
-                        if ($thirdparty_id > 0)
-                        {
-                        	if (!isset($cachethirdparties[$thirdparty_id]) || !is_object($cachethirdparties[$thirdparty_id]))
-                            {
-                                $thirdparty = new Societe($db);
-                                $thirdparty->fetch($thirdparty_id);
-                                $cachethirdparties[$thirdparty_id] = $thirdparty;
-                            }
-                            else $thirdparty = $cachethirdparties[$thirdparty_id];
-                            if (!empty($thirdparty->id)) $linerelatedto .= $thirdparty->getNomUrl(1, '', 0);
-                        }
-                        if (!empty($contact_id) && $contact_id > 0)
-                        {
-                        	if (!is_object($cachecontacts[$contact_id]))
-                            {
-                                $contact = new Contact($db);
-                                $contact->fetch($contact_id);
-                                $cachecontacts[$contact_id] = $contact;
-                            }
-                            else $contact = $cachecontacts[$contact_id];
-                            if ($linerelatedto) $linerelatedto .= '&nbsp;';
-                            if (!empty($contact->id)) $linerelatedto .= $contact->getNomUrl(1, '', 0);
-                        }
-                        if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && !empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
-                        {
-                            include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-                            if ($linerelatedto) $linerelatedto .= '<br>';
-                            $linerelatedto .= dolGetElementUrl($event->fk_element, $event->elementtype, 1);
-                        }
-                        if ($linerelatedto) print '<br>'.$linerelatedto;
-                    }
+					// Show rect of event
+					print "\n";
+					print '<!-- start event '.$i.' -->'."\n";
+					print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'"';
+					//print ' style="height: 100px;';
+					//print ' position: absolute; top: 40px; width: 50%;';
+					//print '"';
+					print '>';
 
-                    // Show location
-                    if ($showinfo)
-                    {
-                        if ($event->location)
-                        {
-                            print '<br>';
-                            print $langs->trans("Location").': '.$event->location;
-                        }
-                    }
+					//var_dump($event->userassigned);
+					//var_dump($event->transparency);
+					print '<table class="centpercent cal_event';
+					print (empty($event->transparency) ? ' cal_event_notbusy' : ' cal_event_busy');
+					//if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) print ' opacitymedium';	// Not busy
+					print '" style="'.$h;
+					$colortouse = $color;
+					// If colortouse is similar than background, we force to change it.
+					if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY))
+					{
+						print 'background: #f0f0f0;';
+						print 'border-left: 5px solid #'.$colortouse.';';
+					} else {
+						print 'background: #f0f0f0;';
+						print 'border-left: 5px solid #'.dol_color_minus($colortouse, -3).';';
+						//print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($colortouse, -3).'), to(#'.dol_color_minus($colortouse, -1).'));';
+					}
+				   	//print 'background: #'.$colortouse.';';
+				   	//print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';
+					//if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
+					//else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
+					//print ' -moz-border-radius:4px;"';
+					//print 'border: 1px solid #ccc" width="100%"';
+					print '">';
+					print '<tr>';
+					print '<td class="tdoverflow nobottom centpercent '.($nowrapontd ? 'nowrap ' : '').'cal_event'.($event->type_code == 'BIRTHDAY' ? ' cal_event_birthday' : '').'">';
 
-                    print '</td>';
-                    // Status - Percent
-                    $withstatus = 0;
-                    if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT')
-                    {
-                        $withstatus = 1;
-                        if ($event->percentage >= 0) $withstatus = 2;
-                    }
-                    print '<td class="nobottom right nowrap cal_event_right'.($withstatus >= 2 ? ' cal_event_right_status' : '').'">';
-                    if ($withstatus) print $event->getLibStatut(3, 1);
-                    else print '&nbsp;';
-                    print '</td></tr></table>';
-                    print '</div><!-- end event '.$i.' -->'."\n";
-                    $i++;
-                }
-                else
-                {
-                	print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action='.$action.'&maxprint=0&month='.$monthshown.'&year='.$year;
-                    print ($status ? '&status='.$status : '').($filter ? '&filter='.$filter : '');
-                    print ($filtert ? '&search_filtert='.$filtert : '');
-                    print ($usergroup ? '&search_usergroup='.$usergroup : '');
-                    print ($actioncode != '' ? '&search_actioncode='.$actioncode : '');
-                    print '">'.img_picto("all", "1downarrow_selected.png").' ...';
-                    print ' +'.(count($eventarray[$daykey]) - $maxprint);
-                    print '</a>';
-                    break;
-                    //$ok=false;        // To avoid to show twice the link
-                }
-            }
+					$daterange = '';
 
-            break;
-        }
-    }
-    if (!$i) print '&nbsp;';
+					if ($event->type_code == 'BIRTHDAY') // It's a birthday
+					{
+						print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'birthday', 'contact');
+					} elseif ($event->type_code == 'HOLIDAY')
+					{
+						print $event->getNomUrl(1, $maxnbofchar, 'cal_event', 'holiday', 'user');
+					} elseif ($event->type_code != 'BIRTHDAY' && $event->type_code != 'HOLIDAY')
+					{
+						// Picto
+						if (empty($event->fulldayevent))
+						{
+							//print $event->getNomUrl(2).' ';
+						}
 
-    if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $i > $maxprint && $maxprint)
-    {
-        print '<div id="more_'.$ymd.'">'.img_picto("all", "1downarrow_selected.png").' +'.$langs->trans("More").'...</div>';
-        //print ' +'.(count($eventarray[$daykey])-$maxprint);
-        print '<script type="text/javascript">'."\n";
-        print 'jQuery(document).ready(function () {'."\n";
-        print 'jQuery("#more_'.$ymd.'").click(function() { reinit_day_'.$ymd.'(); });'."\n";
+						// Date
+						if (empty($event->fulldayevent))
+						{
+							// Show hours (start ... end)
+							$tmpyearstart  = date('Y', $event->date_start_in_calendar);
+							$tmpmonthstart = date('m', $event->date_start_in_calendar);
+							$tmpdaystart   = date('d', $event->date_start_in_calendar);
+							$tmpyearend    = date('Y', $event->date_end_in_calendar);
+							$tmpmonthend   = date('m', $event->date_end_in_calendar);
+							$tmpdayend     = date('d', $event->date_end_in_calendar);
+							// Hour start
+							if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour)
+							{
+								$daterange .= dol_print_date($event->date_start_in_calendar, 'hour'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
+								if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
+								{
+									if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend)
+									$daterange .= '-';
+									//else
+									//print '...';
+								}
+							}
+							if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
+							{
+								if ($tmpyearstart != $tmpyearend || $tmpmonthstart != $tmpmonthend || $tmpdaystart != $tmpdayend)
+								{
+									$daterange .= '...';
+								}
+							}
+							// Hour end
+							if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
+							{
+								if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
+								$daterange .= dol_print_date($event->date_end_in_calendar, 'hour'); // Il faudrait utiliser ici tzuser, mais si on ne peut pas car qd on rentre un date dans fiche action, en input la conversion local->gmt se base sur le TZ server et non user
+							}
+						} else {
+							if ($showinfo)
+							{
+								print $langs->trans("EventOnFullDay")."<br>\n";
+							}
+						}
 
-        print 'function reinit_day_'.$ymd.'() {'."\n";
-        print 'var nb=0;'."\n";
-        // TODO Loop on each element of day $ymd and start to toggle once $maxprint has been reached
-        print 'jQuery(".family_mytasks_day_'.$ymd.'").toggle();';
-        print '}'."\n";
+						// Show title
+						$titletoshow = $daterange;
+						$titletoshow .= ($titletoshow ? ' ' : '').($event->label ? $event->label : $event->libelle);
 
-        print '});'."\n";
+						if ($event->type_code != 'ICALEVENT') {
+							$savlabel = $event->label ? $event->label : $event->libelle;
+							$event->label = $titletoshow;
+							$event->libelle = $titletoshow;
+							// Note: List of users are inside $event->userassigned. Link may be clickable depending on permissions of user.
+							$titletoshow = $event->getNomUrl(0, $maxnbofchar, 'cal_event cal_event_title', '', 0, 0);
+							$event->label = $savlabel;
+							$event->libelle = $savlabel;
+						}
 
-        print '</script>'."\n";
-    }
+						// Loop on each assigned user
+						$listofusertoshow = '';
+						$posuserassigned = 0;
+						foreach ($event->userassigned as $tmpid => $tmpdata)
+						{
+							if (!$posuserassigned && $titletoshow) $listofusertoshow .= '<br>';
+							$posuserassigned++;
+							if (empty($cacheusers[$tmpid]))
+							{
+								$newuser = new User($db);
+								$newuser->fetch($tmpid);
+								$cacheusers[$tmpid] = $newuser;
+							}
 
-    print '</div></div>'; // td tr
+							$listofusertoshow .= $cacheusers[$tmpid]->getNomUrl(-3, '', 0, 0, 0, 0, '', 'paddingright valigntextbottom');
+						}
 
-    print '</div>'; // table
-    print "\n";
+						print $titletoshow;
+						print $listofusertoshow;
+
+						if ($event->type_code == 'ICALEVENT') print '<br>('.dol_trunc($event->icalname, $maxnbofchar).')';
+
+						$thirdparty_id = ($event->thirdparty_id > 0 ? $event->thirdparty_id : ((is_object($event->societe) && $event->societe->id > 0) ? $event->societe->id : 0));
+						$contact_id = ($event->contact_id > 0 ? $event->contact_id : ((is_object($event->contact) && $event->contact->id > 0) ? $event->contact->id : 0));
+
+						// If action related to company / contact
+						$linerelatedto = '';
+						if ($thirdparty_id > 0)
+						{
+							if (!isset($cachethirdparties[$thirdparty_id]) || !is_object($cachethirdparties[$thirdparty_id]))
+							{
+								$thirdparty = new Societe($db);
+								$thirdparty->fetch($thirdparty_id);
+								$cachethirdparties[$thirdparty_id] = $thirdparty;
+							} else $thirdparty = $cachethirdparties[$thirdparty_id];
+							if (!empty($thirdparty->id)) $linerelatedto .= $thirdparty->getNomUrl(1, '', 0);
+						}
+						if (!empty($contact_id) && $contact_id > 0)
+						{
+							if (!is_object($cachecontacts[$contact_id]))
+							{
+								$contact = new Contact($db);
+								$contact->fetch($contact_id);
+								$cachecontacts[$contact_id] = $contact;
+							} else $contact = $cachecontacts[$contact_id];
+							if ($linerelatedto) $linerelatedto .= '&nbsp;';
+							if (!empty($contact->id)) $linerelatedto .= $contact->getNomUrl(1, '', 0);
+						}
+						if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && !empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
+						{
+							include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+							if ($linerelatedto) $linerelatedto .= '<br>';
+							$linerelatedto .= dolGetElementUrl($event->fk_element, $event->elementtype, 1);
+						}
+						if ($linerelatedto) print '<br>'.$linerelatedto;
+					}
+
+					// Show location
+					if ($showinfo)
+					{
+						if ($event->location)
+						{
+							print '<br>';
+							print $langs->trans("Location").': '.$event->location;
+						}
+					}
+
+					print '</td>';
+					// Status - Percent
+					$withstatus = 0;
+					if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT')
+					{
+						$withstatus = 1;
+						if ($event->percentage >= 0) $withstatus = 2;
+					}
+					print '<td class="nobottom right nowrap cal_event_right'.($withstatus >= 2 ? ' cal_event_right_status' : '').'">';
+					if ($withstatus) print $event->getLibStatut(3, 1);
+					else print '&nbsp;';
+					print '</td></tr></table>';
+					print '</div><!-- end event '.$i.' -->'."\n";
+					$i++;
+				} else {
+					print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?action='.$action.'&maxprint=0&month='.$monthshown.'&year='.$year;
+					print ($status ? '&status='.$status : '').($filter ? '&filter='.$filter : '');
+					print ($filtert ? '&search_filtert='.$filtert : '');
+					print ($usergroup ? '&search_usergroup='.$usergroup : '');
+					print ($actioncode != '' ? '&search_actioncode='.$actioncode : '');
+					print '">'.img_picto("all", "1downarrow_selected.png").' ...';
+					print ' +'.(count($eventarray[$daykey]) - $maxprint);
+					print '</a>';
+					break;
+					//$ok=false;        // To avoid to show twice the link
+				}
+			}
+
+			break;
+		}
+	}
+	if (!$i) print '&nbsp;';
+
+	if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $i > $maxprint && $maxprint)
+	{
+		print '<div id="more_'.$ymd.'">'.img_picto("all", "1downarrow_selected.png").' +'.$langs->trans("More").'...</div>';
+		//print ' +'.(count($eventarray[$daykey])-$maxprint);
+		print '<script type="text/javascript">'."\n";
+		print 'jQuery(document).ready(function () {'."\n";
+		print 'jQuery("#more_'.$ymd.'").click(function() { reinit_day_'.$ymd.'(); });'."\n";
+
+		print 'function reinit_day_'.$ymd.'() {'."\n";
+		print 'var nb=0;'."\n";
+		// TODO Loop on each element of day $ymd and start to toggle once $maxprint has been reached
+		print 'jQuery(".family_mytasks_day_'.$ymd.'").toggle();';
+		print '}'."\n";
+
+		print '});'."\n";
+
+		print '</script>'."\n";
+	}
+
+	print '</div></div>'; // td tr
+
+	print '</div>'; // table
+	print "\n";
 }
 
 
@@ -1824,13 +1873,11 @@ function dol_color_minus($color, $minus, $minusunit = 16)
 	$newcolor = $color;
 	if ($minusunit == 16)
 	{
-    	$newcolor[0] = dechex(max(min(hexdec($newcolor[0]) - $minus, 15), 0));
-    	$newcolor[2] = dechex(max(min(hexdec($newcolor[2]) - $minus, 15), 0));
-    	$newcolor[4] = dechex(max(min(hexdec($newcolor[4]) - $minus, 15), 0));
-	}
-	else
-	{
-	    // Not yet implemented
+		$newcolor[0] = dechex(max(min(hexdec($newcolor[0]) - $minus, 15), 0));
+		$newcolor[2] = dechex(max(min(hexdec($newcolor[2]) - $minus, 15), 0));
+		$newcolor[4] = dechex(max(min(hexdec($newcolor[4]) - $minus, 15), 0));
+	} else {
+		// Not yet implemented
 	}
 	return $newcolor;
 }
@@ -1845,39 +1892,39 @@ function dol_color_minus($color, $minus, $minusunit = 16)
 function sort_events_by_date($a, $b)
 {
 	// Sort holidays at first
-    if ($a->type_code === 'HOLIDAY')
-    {
-        return -1;
-    }
+	if ($a->type_code === 'HOLIDAY')
+	{
+		return -1;
+	}
 
-    if ($b->type_code === 'HOLIDAY')
-    {
-        return 1;
-    }
+	if ($b->type_code === 'HOLIDAY')
+	{
+		return 1;
+	}
 
-    // datep => Event start time
-    // datef => Event end time
+	// datep => Event start time
+	// datef => Event end time
 
-    // Events have different start time
-    if ($a->datep !== $b->datep)
-    {
-        return $a->datep - $b->datep;
-    }
+	// Events have different start time
+	if ($a->datep !== $b->datep)
+	{
+		return $a->datep - $b->datep;
+	}
 
-    // Events have same start time and no end time
-    if ((!is_numeric($b->datef)) || (!is_numeric($a->datef)))
-    {
-        return sort_events_by_percentage($a, $b);
-    }
+	// Events have same start time and no end time
+	if ((!is_numeric($b->datef)) || (!is_numeric($a->datef)))
+	{
+		return sort_events_by_percentage($a, $b);
+	}
 
-    // Events have the same start time and same end time
-    if ($b->datef === $a->datef)
-    {
-        return sort_events_by_percentage($a, $b);
-    }
+	// Events have the same start time and same end time
+	if ($b->datef === $a->datef)
+	{
+		return sort_events_by_percentage($a, $b);
+	}
 
-    // Events have the same start time, but have different end time -> longest event first
-    return $b->datef - $a->datef;
+	// Events have the same start time, but have different end time -> longest event first
+	return $b->datef - $a->datef;
 }
 
 /**
@@ -1889,18 +1936,18 @@ function sort_events_by_date($a, $b)
  */
 function sort_events_by_percentage($a, $b)
 {
-    // Sort events with no percentage before each other
-    // (usefull to sort holidays, sick days or similar on the top)
+	// Sort events with no percentage before each other
+	// (usefull to sort holidays, sick days or similar on the top)
 
-    if ($a->percentage < 0)
-    {
-        return -1;
-    }
+	if ($a->percentage < 0)
+	{
+		return -1;
+	}
 
-    if ($b->percentage < 0)
-    {
-        return 1;
-    }
+	if ($b->percentage < 0)
+	{
+		return 1;
+	}
 
-    return $b->percentage - $a->percentage;
+	return $b->percentage - $a->percentage;
 }
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 2391f9ca491..92975aafec0 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2017      Open-DSI             <support@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +40,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("users", "companies", "agenda", "commercial", "other"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$massaction = GETPOST('massaction', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
 $resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
 $pid = GETPOST("search_projectid", 'int', 3) ?GETPOST("search_projectid", 'int', 3) : GETPOST("projectid", 'int', 3);
@@ -49,14 +51,15 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $year = GETPOST("year", 'int');
 $month = GETPOST("month", 'int');
 $day = GETPOST("day", 'int');
+$toselect = GETPOST('toselect', 'array');
+$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';
-}
-else
-{
+} 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));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -131,8 +134,8 @@ $arrayfields = array(
 	'a.datep'=>array('label'=>"DateStart", 'checked'=>1),
 	'a.datep2'=>array('label'=>"DateEnd", 'checked'=>1),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
-	'a.fk_contact'=>array('label'=>"Contact", 'checked'=>1),
-	'a.fk_element'=>array('label'=>"LinkedObject", 'checked'=>0, 'enabled'=>(!empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))),
+	'a.fk_contact'=>array('label'=>"Contact", 'checked'=>0),
+	'a.fk_element'=>array('label'=>"LinkedObject", 'checked'=>1, 'enabled'=>(!empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))),
 	'a.percent'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 	'a.datec'=>array('label'=>'DateCreation', 'checked'=>0),
 	'a.tms'=>array('label'=>'DateModification', 'checked'=>0)
@@ -149,11 +152,17 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+//var_dump($_POST);exit;
 
 /*
  *	Actions
  */
 
+if (GETPOST('cancel', 'alpha'))
+{
+	$action = 'list'; $massaction = '';
+}
+
 if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday"))
 {
 	$param = '';
@@ -185,9 +194,53 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
     $datestart = '';
     $dateend = '';
     $search_status = '';
+	$toselect = '';
     $search_array_options = array();
 }
 
+if (empty($reshook) && !empty($massaction))
+{
+	unset($percent);
+
+	switch ($massaction)
+	{
+		case 'set_all_events_to_todo':
+			$percent = ActionComm::EVENT_TODO;
+			break;
+
+		case 'set_all_events_to_in_progress':
+			$percent = ActionComm::EVENT_IN_PROGRESS;
+			break;
+
+		case 'set_all_events_to_finished':
+			$percent = ActionComm::EVENT_FINISHED;
+			break;
+	}
+
+	if (isset($percent))
+	{
+		foreach ($toselect as $toselectid)
+		{
+			$result = $object->updatePercent($toselectid, $percent);
+			if ($result < 0)
+			{
+				dol_print_error($db);
+				break;
+			}
+		}
+	}
+}
+
+// As mass deletion happens with a confirm step, $massaction is not use for the final step (deletion).
+if (empty($reshook))
+{
+	$objectclass = 'ActionComm';
+	$objectlabel = 'Events';
+	$uploaddir = true;
+	// Only users that can delete any event can remove records.
+	$permissiontodelete = $user->rights->agenda->allactions->delete;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
 
 /*
  *  View
@@ -239,6 +292,19 @@ if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
+// List of mass actions available
+$arrayofmassactions = array(
+	'set_all_events_to_todo' => $langs->trans("SetAllEventsToTodo"),
+	'set_all_events_to_in_progress' => $langs->trans("SetAllEventsToInProgress"),
+	'set_all_events_to_finished' => $langs->trans("SetAllEventsToFinished"),
+);
+if ($user->rights->agenda->allactions->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();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
 $sql = "SELECT";
 if ($usergroup > 0) $sql .= " DISTINCT";
 $sql .= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,";
@@ -279,24 +345,18 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
         }
-    }
-    else
-    {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-        else
-        {
+        else {
             if (is_array($actioncode))
             {
                 $sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
-            }
-            else
-            {
+            } else {
                 $sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -366,8 +426,12 @@ if ($resql)
 
 	$num = $db->num_rows($resql);
 
+	$arrayofselected = is_array($toselect) ? $toselect : array();
+
 	// Local calendar
-	$newtitle = '<div class="nowrap clear inline-block minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
+	$newtitle = '<div class="nowrap clear inline-block minheight30 margintoponly">';
+	$newtitle .= '<input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; ';
+	$newtitle .= '</div>';
 	//$newtitle=$langs->trans($title);
 
 	$tabactive = 'cardlist';
@@ -378,7 +442,6 @@ if ($resql)
 
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -389,9 +452,9 @@ if ($resql)
 	if ($showbirthday)    $nav .= '<input type="hidden" name="search_showbirthday" value="1">';
 	print $nav;
 
-    dol_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();
+    //dol_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();
 
     // Add link to show birthdays
     $link = '';
@@ -418,25 +481,64 @@ if ($resql)
     if (empty($reshook))
     {
 		$s .= $hookmanager->resPrint;
-    }
-    elseif ($reshook > 1)
+    } elseif ($reshook > 1)
 	{
     	$s = $hookmanager->resPrint;
     }
 
-    $newcardbutton = '';
-    if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
-    {
-        $tmpforcreatebutton = dol_getdate(dol_now(), true);
+    $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>';
 
-        $newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
+    $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>';
 
-        //$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 : '')));
-    }
+    $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>';
 
-    print_barre_liste($s, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1);
+    $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 .= '<span class="marginrightonly"></span>';
+
+	$tmpforcreatebutton = dol_getdate(dol_now(), true);
+
+	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
+
+	//$param='month='.$monthshown.'&year='.$year;
+	$hourminsec = '100000';
+
+	$url = DOL_URL_ROOT.'/comm/action/card.php?action=create';
+	$url .= '&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec;
+	$url .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
+
+	$newcardbutton = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', $url, '', $user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create);
+
+	$param .= '&action='.$action;
+
+	print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, -1 * $nbtotalofrecords, 'object_action', 0, $nav.$newcardbutton, '', $limit, 0, 0, 1, $viewmode);
+
+	print $s;
+
+    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
     $moreforfilter = '';
 
@@ -444,6 +546,11 @@ if ($resql)
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
     $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="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
@@ -569,8 +676,7 @@ if ($resql)
 			{
 				$userstatic->fetch($obj->fk_user_action);
 				print $userstatic->getNomUrl(-1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 		}
 
@@ -585,12 +691,11 @@ if ($resql)
 			{
 				if ($actioncomm->type_picto) {
 					$imgpicto = img_picto('', $actioncomm->type_picto);
-				}
-				else {
+				} else {
 					if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
 					elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
 					elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actioncomm->type_code == 'AC_EMAIL')   $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actioncomm->type_code == 'AC_EMAIL' || $actioncomm->type_code == 'AC_EMAIL_IN')   $imgpicto = img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
 					elseif ($actioncomm->type_code == 'AC_INT')     $imgpicto = img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
 					elseif ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
 					elseif (!preg_match('/_AUTO/', $actioncomm->type_code)) $imgpicto = img_picto('', 'object_other', '', false, 0, 0, '', 'paddingright').' ';
@@ -602,14 +707,17 @@ if ($resql)
 			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) $labeltype = 'AC_OTH';
 			if ($actioncomm->type_code == 'AC_OTH' && $actioncomm->code == 'TICKET_MSG') {
 				$labeltype = $langs->trans("Message");
-			} elseif (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
+			} else {
+				if (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
+				if ($obj->type_code == 'AC_OTH_AUTO' && ($obj->type_code != $obj->code) && $labeltype && !empty($arraylist[$obj->code])) $labeltype .= ' - '.$arraylist[$obj->code]; // Use code in priority on type_code
+			}
 			print dol_trunc($labeltype, 28);
 			print '</td>';
 		}
 
 		// Label
 		if (!empty($arrayfields['a.label']['checked'])) {
-			print '<td class="tdoverflowmax200">';
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($actionstatic->label).'">';
 			print $actionstatic->label;
 			print '</td>';
 		}
@@ -623,6 +731,7 @@ if ($resql)
 		}
 
 		$formatToUse = $obj->fulldayevent ? 'day' : 'dayhour';
+
 		// Start date
 		if (!empty($arrayfields['a.datep']['checked'])) {
 			print '<td class="center nowraponall">';
@@ -654,8 +763,7 @@ if ($resql)
 				$societestatic->email = $obj->socemail;
 
 				print $societestatic->getNomUrl(1, '', 28);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 		}
 
@@ -677,8 +785,7 @@ if ($resql)
                             $contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
                             $contactList[] = $contact->getNomUrl(1, '', 0);
                         }
-                    }
-                    else {
+                    } else {
                         // use cache
                         $contactList[] = $contactListCache[$socpeopleassigned['id']];
                     }
@@ -686,8 +793,7 @@ if ($resql)
                 if (!empty($contactList)) {
                     print implode(', ', $contactList);
                 }
-            }
-            elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
+            } elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
 			{
 				$contactstatic->id = $obj->fk_contact;
 				$contactstatic->email = $obj->email;
@@ -698,9 +804,7 @@ if ($resql)
 				$contactstatic->phone_perso = $obj->phone_perso;
 				$contactstatic->country_id = $obj->country_id;
 				print $contactstatic->getNomUrl(1, '', 0);
-			}
-			else
-			{
+			} else {
 				print "&nbsp;";
 			}
 			print '</td>';
@@ -740,7 +844,15 @@ if ($resql)
 			$datep = $db->jdate($obj->datep);
 			print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent, 5, 0, $datep).'</td>';
 		}
-		print '<td></td>';
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected = 0;
+			if (in_array($obj->id, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
 
 		print "</tr>\n";
 		$i++;
@@ -750,9 +862,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 6dfbc6c7f9c..72b25c9d731 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -41,9 +41,9 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
 
-$filter = GETPOST("filter", 'alpha', 3);
-$filtert = GETPOST("filtert", "int", 3);
-$usergroup = GETPOST("usergroup", "int", 3);
+$filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
+$filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
+$usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 $showbirthday = 0;
@@ -64,7 +64,7 @@ if (!$sortorder) $sortorder = "ASC";
 if (!$sortfield) $sortfield = "a.datec";
 
 // Security check
-$socid = GETPOST("socid", "int");
+$socid = GETPOST("search_socid", "int") ?GETPOST("search_socid", "int") : GETPOST("socid", "int");
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
 if ($socid < 0) $socid = '';
@@ -79,24 +79,23 @@ if (!$user->rights->agenda->allactions->read || $filter == 'mine')  // If no per
 
 //$action=GETPOST('action','alpha');
 $action = 'show_pertype';
-$resourceid = GETPOST("resourceid", "int");
+$resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
 $year = GETPOST("year", "int") ?GETPOST("year", "int") : date("Y");
 $month = GETPOST("month", "int") ?GETPOST("month", "int") : date("m");
 $week = GETPOST("week", "int") ?GETPOST("week", "int") : date("W");
 $day = GETPOST("day", "int") ?GETPOST("day", "int") : date("d");
-$pid = GETPOST("projectid", "int", 3);
-$status = GETPOST("status", 'alpha');
-$type = GETPOST("type", 'alpha');
+$pid = GETPOST("search_projectid", "int", 3) ?GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
+$status = GETPOST("search_status", 'alpha') ?GETPOST("search_status", 'alpha') : GETPOST("status", 'alpha');
+$type = GETPOST("search_type", 'alpha') ?GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
 $maxprint = ((GETPOST("maxprint", 'int') != '') ?GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('actioncode', 'array'))
+if (GETPOST('search_actioncode', 'array'))
 {
-    $actioncode = GETPOST('actioncode', 'array', 3);
+    $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
-    $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
+} 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));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
 
@@ -109,6 +108,7 @@ if ($dateselect > 0)
 }
 
 $tmp = empty($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
+$tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
 $begin_h = GETPOST('begin_h', 'int') != '' ?GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
 $end_h   = GETPOST('end_h', 'int') ?GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
@@ -117,14 +117,15 @@ if ($end_h < 1 || $end_h > 24) $end_h = 18;
 if ($end_h <= $begin_h) $end_h = $begin_h + 1;
 
 $tmp = empty($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
+$tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
 $begin_d = 1;
-$end_d   = 53;
+$end_d = 53;
 
 if ($status == '' && !isset($_GET['status']) && !isset($_POST['status'])) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
 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') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
+if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
     $action = 'show_month'; $day = '';
 }                                                   // View by month
 if (GETPOST('viewweek', 'alpha') || $action == 'show_week') {
@@ -152,6 +153,10 @@ if ($action == 'delete_action')
 {
     $event = new ActionComm($db);
     $event->fetch($actionid);
+    $event->fetch_optionals();
+    $event->fetch_userassigned();
+    $event->oldcopy = clone $event;
+
     $result = $event->delete();
 }
 
@@ -161,6 +166,27 @@ if ($action == 'delete_action')
  * View
  */
 
+$parameters = array(
+	'socid' => $socid,
+	'status' => $status,
+	'year' => $year,
+	'month' => $month,
+	'day' => $day,
+	'type' => $type,
+	'maxprint' => $maxprint,
+	'filter' => $filter,
+	'filtert' => $filtert,
+	'showbirthday' => $showbirthday,
+	'canedit' => $canedit,
+	'optioncss' => $optioncss,
+	'actioncode' => $actioncode,
+	'pid' => $pid,
+	'resourceid' => $resourceid,
+	'usergroup' => $usergroup,
+);
+$reshook = $hookmanager->executeHooks('beforeAgendaPerType', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
 $form = new Form($db);
 $companystatic = new Societe($db);
 
@@ -201,18 +227,26 @@ if ($status == 'done') $title = $langs->trans("DoneActions");
 if ($status == 'todo') $title = $langs->trans("ToDoActions");
 
 $param = '';
-if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $param .= "&actioncode=".$actioncode;
-if ($resourceid > 0) $param .= "&resourceid=".$resourceid;
-if ($status || isset($_GET['status']) || isset($_POST['status'])) $param .= "&status=".$status;
-if ($filter)  $param .= "&filter=".$filter;
-if ($filtert) $param .= "&filtert=".$filtert;
-if ($usergroup) $param .= "&usergroup=".$usergroup;
-if ($socid)   $param .= "&socid=".$socid;
-if ($showbirthday) $param .= "&showbirthday=1";
-if ($pid)     $param .= "&projectid=".$pid;
-if ($type)   $param .= "&type=".$type;
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser' || $action != 'show_pertype') $param .= '&action='.$action;
-$param .= "&maxprint=".$maxprint;
+if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) {
+	if (is_array($actioncode)) {
+		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
+	} else $param .= "&search_actioncode=".urlencode($actioncode);
+}
+if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
+if ($status || isset($_GET['status']) || isset($_POST['status'])) $param .= "&search_status=".urlencode($status);
+if ($filter)        $param .= "&search_filter=".urlencode($filter);
+if ($filtert)       $param .= "&search_filtert=".urlencode($filtert);
+if ($usergroup)     $param .= "&search_usergroup=".urlencode($usergroup);
+if ($socid)         $param .= "&search_socid=".urlencode($socid);
+if ($showbirthday)  $param .= "&search_showbirthday=1";
+if ($pid)           $param .= "&search_projectid=".urlencode($pid);
+if ($type)          $param .= "&search_type=".urlencode($type);
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') $param .= '&action='.urlencode($action);
+if ($begin_h != '') $param .= '&begin_h='.urlencode($begin_h);
+if ($end_h != '')   $param .= '&end_h='.urlencode($end_h);
+if ($begin_d != '') $param .= '&begin_d='.urlencode($begin_d);
+if ($end_d != '')   $param .= '&end_d='.urlencode($end_d);
+$param .= "&maxprint=".urlencode($maxprint);
 
 $prev = dol_get_first_day($year, 1);
 $prev_year  = $year - 1;
@@ -240,6 +274,7 @@ $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
 
 $tmpday = $first_day;
+$picto = 'calendartype';
 
 $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y")."</span> \n";
@@ -247,7 +282,7 @@ $nav .= "<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$nex
 $nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
 $picto = 'calendarweek';
 
-$nav .= ' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
+/*$nav .= ' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
 $nav .= '<input type="hidden" name="token" value="'.newToken().'">';
 $nav .= '<input type="hidden" name="action" value="'.$action.'">';
 $nav .= '<input type="hidden" name="filtert" value="'.$filtert.'">';
@@ -262,27 +297,30 @@ $nav .= '<input type="hidden" name="end_h" value="'.$end_h.'">';
 $nav .= '<input type="hidden" name="begin_d" value="'.$begin_d.'">';
 $nav .= '<input type="hidden" name="end_d" value="'.$end_d.'">';
 $nav .= '<input type="hidden" name="showbirthday" value="'.$showbirthday.'">';
-
+*/
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
-$nav .= '</form>';
+//$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+$nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
+//$nav .= '</form>';
 
 // Must be after the nav definition
-$param .= '&year='.$year.'&month='.$month.($day ? '&day='.$day : '');
+$param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
 //print 'x'.$param;
 
 
-
-
-$tabactive = 'cardpertype';
+$tabactive = '';
+if ($action == 'show_month') $tabactive = 'cardmonth';
+if ($action == 'show_week') $tabactive = 'cardweek';
+if ($action == 'show_day')  $tabactive = 'cardday';
+if ($action == 'show_list') $tabactive = 'cardlist';
+if ($action == 'show_peruser') $tabactive = 'cardperuser';
+if ($action == 'show_pertype') $tabactive = 'cardpertype';
 
 $paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
 
 $head = calendars_prepare_head($paramnoaction);
 
-dol_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 '<form method="POST" id="searchFormList" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 
 $showextcals = $listofextcals;
 // Legend
@@ -329,18 +367,80 @@ if ($conf->use_javascript_ajax)
 	    if (empty($reshook))
 	    {
 			$s .= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
+	    } elseif ($reshook > 1)
 		{
 	    	$s = $hookmanager->resPrint;
 	    }
 	}
 }
 
+$massactionbutton = '';
+
+$viewmode = '';
+$viewmode .= '<a class="btnTitle 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_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 btnTitleSelected 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>';
+
+
+$newcardbutton = '';
+if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
+{
+	$tmpforcreatebutton = dol_getdate(dol_now(), true);
+
+	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
+
+	//$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 : '')));
+}
+
+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);
 
 
 $link = '';
-print load_fiche_titre($s, $link.' &nbsp; &nbsp; '.$nav, '');
+//print load_fiche_titre('', $link.' &nbsp; &nbsp; '.$nav.' '.$newcardbutton, '');
+
+// Local calendar
+$newtitle = '<div class="nowrap clear inline-block minheight30">';
+$newtitle .= '<input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; ';
+$newtitle .= '</div>';
+//$newtitle=$langs->trans($title);
+
+$s = $newtitle;
+
+print $s;
+
+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>';
 
 
 // Get event in an array
@@ -372,19 +472,20 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
-    }
-    else
-    {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
-            $sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+        else {
+        	if (is_array($actioncode))
+        	{
+        		$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
+        	} else {
+        		$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+        	}
         }
     }
 }
@@ -406,9 +507,7 @@ if ($action == 'show_day')
     $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
-{
+} 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
@@ -439,7 +538,7 @@ if ($filtert > 0 || $usergroup > 0)
 $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
 //print $sql;
 
-dol_syslog("comm/action/index.php", LOG_DEBUG);
+dol_syslog("comm/action/pertype.php", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -478,7 +577,7 @@ if ($resql)
         $event->fk_project = $obj->fk_project;
 
         $event->socid = $obj->fk_soc;
-        $event->contactid = $obj->fk_contact;
+        $event->contact_id = $obj->fk_contact;
 
         $event->fk_element = $obj->fk_element;
         $event->elementtype = $obj->elementtype;
@@ -490,9 +589,7 @@ if ($resql)
         	$event->date_start_in_calendar = $datep;
         	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
         	else $event->date_end_in_calendar = $datep;
-        }
-        else
-        {
+        } else {
         	$event->date_start_in_calendar = $datep;
         	if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
         	else $event->date_end_in_calendar = $datep;
@@ -509,9 +606,7 @@ if ($resql)
         {
             // This record is out of visible range
         	unset($event);
-        }
-        else
-		{
+        } 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
 
@@ -527,8 +622,7 @@ if ($resql)
             // 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
-			{
+            do {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][] = $event;
@@ -536,23 +630,22 @@ if ($resql)
 
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } 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++;
     }
-}
-else
-{
+    $db->free($resql);
+} else {
     dol_print_error($db);
 }
 
 $maxnbofchar = 18;
 $cachethirdparties = array();
 $cachecontacts = array();
+$cacheusers = array();
 
 // Define theme_datacolor array
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
@@ -574,11 +667,10 @@ $newparam = preg_replace('/viewweek=[0-9]+&?/i', '', $newparam);
 $newparam = preg_replace('/showbirthday_=/i', 'showbirthday=', $newparam); // Restore correct parameter
 $newparam .= '&viewweek=1';
 
-echo '<form id="move_event" action="" method="POST"><input type="hidden" name="action" value="mupdate">';
+print '<input type="hidden" name="action" value="mupdate">';
 echo '<input type="hidden" name="backtopage" value="'.dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']).'">';
 echo '<input type="hidden" name="token" value="'.newToken().'">';
 echo '<input type="hidden" name="newdate" id="newdate">';
-echo '</form>';
 
 
 // Line header with list of days
@@ -620,6 +712,7 @@ $sql = "SELECT code, color, libelle as label FROM ".MAIN_DB_PREFIX."c_actioncomm
 $resql = $db->query($sql);
 while ($obj = $db->fetch_object($resql))
 {
+	$typeofevents[$obj->code] = $obj->code;
 	$colorsbytype[$obj->code] = $obj->color;
 	$labelbytype[$obj->code] = $obj->label;
 }
@@ -633,7 +726,7 @@ foreach ($typeofevents as $typeofevent)
 {
 	$var = !$var;
 	echo "<tr>";
-	echo '<td class="cal_current_month cal_peruserviewname'.($var ? ' cal_impair' : '').'">'.$username->getNomUrl(1).'</td>';
+	echo '<td class="cal_current_month cal_peruserviewname'.($var ? ' cal_impair' : '').'">'.$typeofevent.'</td>';
 	$tmpday = $sav;
 
 	// Lopp on each day of week
@@ -659,7 +752,7 @@ foreach ($typeofevents as $typeofevent)
 		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
 		if ($today) $style = 'cal_today_peruser';
 
-		show_day_events_pertype($username, $tmpday, $tmpmonth, $tmpyear, $monthshown, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
+		show_day_events_pertype($typeofevent, $tmpday, $tmpmonth, $tmpyear, $mont, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
 		$i++;
 	}
@@ -668,7 +761,7 @@ foreach ($typeofevents as $typeofevent)
 }
 
 echo "</table>\n";
-
+echo "<br>";
 
 if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 {
@@ -695,6 +788,9 @@ if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	*/
 }
 
+print "\n".'</form>';
+print "\n";
+
 // Add js code to manage click on a box
 print '<script type="text/javascript" language="javascript">
 jQuery(document).ready(function() {
@@ -717,7 +813,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/list.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */
@@ -763,13 +859,13 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 	global $user, $conf, $langs, $hookmanager, $action;
 	global $filter, $filtert, $status, $actioncode; // Filters used into search form
 	global $theme_datacolor; // Array with a list of different we can use (come from theme)
-	global $cachethirdparties, $cachecontacts, $cacheprojects, $colorindexused;
+	global $cachethirdparties, $cachecontacts, $cacheusers, $cacheprojects, $colorindexused;
 	global $begin_h, $end_h;
 
 	$cases1 = array(); // Color first half hour
 	$cases2 = array(); // Color second half hour
 
-	$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
+	$curtime = dol_mktime(0, 0, 0, $month, $day, $year, false, 0);
 
 	$i = 0; $nummytasks = 0; $numother = 0; $numbirthday = 0; $numical = 0; $numicals = array();
 	$ymd = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $day);
@@ -808,8 +904,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 				{
 					$nummytasks++; $cssclass = 'family_mytasks';
 					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
-				}
-				elseif ($event->type_code == 'ICALEVENT')
+				} elseif ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
 					if (!empty($event->icalname))
@@ -822,27 +917,22 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 
 					$color = $event->icalcolor;
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
-				}
-				elseif ($event->type_code == 'BIRTHDAY')
+				} elseif ($event->type_code == 'BIRTHDAY')
 				{
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-				}
-				else
-				{
+				} else {
 					$numother++; $cssclass = 'family_other';
 					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
 				}
 
-				if ($color < 0)	// Color was not forced. Set color according to color index.
+				if ($color < 0)	// Color was not set on user card. Set color according to color index.
 				{
 					// Define color index if not yet defined
 					$idusertouse = ($event->userownerid ? $event->userownerid : 0);
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
-					}
-					else
-					{
+					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
 						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -880,8 +970,8 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 				        		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');
 			        		}
-							$cases1[$h][$event->id]['string'] .= ' - '.$event->label;
-							$cases1[$h][$event->id]['typecode'] = $event->type_code;
+			        		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)
 							{
@@ -903,15 +993,15 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 								}
 								$cases1[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
-							if ($event->contactid > 0)
+							if ($event->contact_id > 0)
 							{
-								if (empty($cachecontacts[$event->contactid]))
+								if (empty($cachecontacts[$event->contact_id]))
 								{
 									$tmpcontact = new Contact($db);
-									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid] = $tmpcontact;
+									$tmpcontact->fetch($event->contact_id);
+									$cachecontacts[$event->contact_id] = $tmpcontact;
 								}
-								$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
+								$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
 						if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
@@ -926,7 +1016,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 				        		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');
 			        		}
-							$cases2[$h][$event->id]['string'] .= ' - '.$event->label;
+			        		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)
@@ -949,20 +1039,18 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 								}
 								$cases2[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
-							if ($event->contactid > 0)
+							if ($event->contact_id > 0)
 							{
-								if (empty($cachecontacts[$event->contactid]))
+								if (empty($cachecontacts[$event->contact_id]))
 								{
 									$tmpcontact = new Contact($db);
-									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid] = $tmpcontact;
+									$tmpcontact->fetch($event->contact_id);
+									$cachecontacts[$event->contact_id] = $tmpcontact;
 								}
-								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
+								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
-					}
-					else
-					{
+					} else {
 						$busy = $event->transparency;
 						$cases1[$h][$event->id]['busy'] = $busy;
 						$cases2[$h][$event->id]['busy'] = $busy;
@@ -1025,8 +1113,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color1 = $output[0]['color'];
-		}
-		elseif (count($cases1[$h]) > 1)
+		} elseif (count($cases1[$h]) > 1)
 		{
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
@@ -1038,8 +1125,7 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color2 = $output[0]['color'];
-		}
-		elseif (count($cases2[$h]) > 1)
+		} elseif (count($cases2[$h]) > 1)
 		{
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f2cce5c8023..f99cc3cbd16 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -41,9 +41,9 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
 
-$filter = GETPOST("search_filter", 'alpha', 3) ?GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
-$filtert = GETPOST("search_filtert", "int", 3) ?GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
-$usergroup = GETPOST("search_usergroup", "int", 3) ?GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
+$filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
+$filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
+$usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup", "int", 3) : GETPOST("usergroup", "int", 3);
 //if (! ($usergroup > 0) && ! ($filtert > 0)) $filtert = $user->id;
 //$showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 $showbirthday = 0;
@@ -94,9 +94,7 @@ if (GETPOST('search_actioncode', 'array'))
 {
     $actioncode = GETPOST('search_actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
@@ -112,8 +110,8 @@ if ($dateselect > 0)
 $tmp = empty($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? '9-18' : $conf->global->MAIN_DEFAULT_WORKING_HOURS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
-$begin_h = GETPOST('begin_h', 'int') != '' ?GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
-$end_h   = GETPOST('end_h', 'int') ?GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
+$begin_h = GETPOST('begin_h', 'int') != '' ? GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
+$end_h   = GETPOST('end_h', 'int') ? GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
 if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
 if ($end_h < 1 || $end_h > 24) $end_h = 18;
 if ($end_h <= $begin_h) $end_h = $begin_h + 1;
@@ -167,6 +165,7 @@ if ($action == 'delete_action')
 /*
  * View
  */
+
 $parameters = array(
 	'socid' => $socid,
 	'status' => $status,
@@ -286,7 +285,7 @@ $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
 $nav .= " </span>\n";
 $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
-$nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
 
 /*$nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
 $nav.='<input type="hidden" name="token" value="' . newToken() . '">';
@@ -305,7 +304,8 @@ $nav.='<input type="hidden" name="end_d" value="' . $end_d . '">';
 $nav.='<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
 */
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+//$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
+$nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
 //$nav.='</form>';
 
 // Must be after the nav definition
@@ -320,6 +320,7 @@ if ($action == 'show_week') $tabactive = 'cardweek';
 if ($action == 'show_day')  $tabactive = 'cardday';
 if ($action == 'show_list') $tabactive = 'cardlist';
 if ($action == 'show_peruser') $tabactive = 'cardperuser';
+if ($action == 'show_pertype') $tabactive = 'cardpertype';
 
 $paramnoaction = preg_replace('/action=[a-z_]+/', '', $param);
 
@@ -327,10 +328,6 @@ $head = calendars_prepare_head($paramnoaction);
 
 print '<form method="POST" id="searchFormList" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 
-dol_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();
-
 $showextcals = $listofextcals;
 // Legend
 if ($conf->use_javascript_ajax)
@@ -376,14 +373,48 @@ if ($conf->use_javascript_ajax)
 	    if (empty($reshook))
 	    {
 			$s .= $hookmanager->resPrint;
-	    }
-	    elseif ($reshook > 1)
+	    } elseif ($reshook > 1)
 		{
 	    	$s = $hookmanager->resPrint;
 	    }
 	}
 }
 
+$massactionbutton = '';
+
+$viewmode = '';
+$viewmode .= '<a class="btnTitle 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_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 btnTitleSelected 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>';
+
 
 $newcardbutton = '';
 if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
@@ -397,8 +428,24 @@ if ($user->rights->agenda->myactions->create || $user->rights->agenda->allaction
     $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);
+
 $link = '';
-print load_fiche_titre($s, $link.' &nbsp; &nbsp; '.$nav.' '.$newcardbutton, '');
+//print load_fiche_titre('', $link.' &nbsp; &nbsp; '.$nav.' '.$newcardbutton, '');
+
+// Local calendar
+$newtitle = '<div class="nowrap clear inline-block minheight30">';
+$newtitle .= '<input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; ';
+$newtitle .= '</div>';
+//$newtitle=$langs->trans($title);
+
+$s = $newtitle;
+
+print $s;
+
+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>';
 
 
 
@@ -431,24 +478,18 @@ if (!empty($actioncode))
     {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
             if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
         }
-    }
-    else
-    {
+    } else {
         if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
         elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-        else
-        {
+        else {
             if (is_array($actioncode))
             {
   	        	$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
-            }
-            else
-            {
+            } else {
   	        	$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
             }
         }
@@ -472,9 +513,7 @@ if ($action == 'show_day')
     $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
-{
+} else {
     // To limit array
     $sql .= " AND (";
     $sql .= " (a.datep BETWEEN '".$db->idate($firstdaytoshow - (60 * 60 * 24 * 2))."'"; // Start 2 day before $firstdaytoshow
@@ -545,7 +584,7 @@ if ($resql)
         $event->fk_project = $obj->fk_project;
 
         $event->socid = $obj->fk_soc;
-        $event->contactid = $obj->fk_contact;
+        $event->contact_id = $obj->fk_contact;
 
         $event->fk_element = $obj->fk_element;
         $event->elementtype = $obj->elementtype;
@@ -557,9 +596,7 @@ if ($resql)
             $event->date_start_in_calendar = $datep;
             if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
             else $event->date_end_in_calendar = $datep;
-        }
-        else
-		{
+        } else {
             $event->date_start_in_calendar = $datep;
             if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
             else $event->date_end_in_calendar = $datep;
@@ -576,9 +613,7 @@ if ($resql)
         {
             // This record is out of visible range
             unset($event);
-        }
-        else
-		{
+        } 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
 
@@ -594,8 +629,7 @@ if ($resql)
             // 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
-			{
+            do {
                 //if ($event->id==408) print 'daykey='.$daykey.' '.$event->datep.' '.$event->datef.'<br>';
 
                 $eventarray[$daykey][] = $event;
@@ -603,8 +637,7 @@ if ($resql)
 
                 $daykey += 60 * 60 * 24;
                 if ($daykey > $event->date_end_in_calendar) $loop = false;
-            }
-            while ($loop);
+            } 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>';
@@ -612,9 +645,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -659,7 +690,35 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	echo '<table width="100%" class="noborder nocellnopadd cal_month">';
 
 	echo '<tr class="liste_titre">';
-	echo '<td></td>';
+	echo '<td class="nopaddingtopimp nopaddingbottomimp">';
+
+	if ($canedit && $action == 'show_peruser')
+	{
+		// Filter on hours
+		print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"');
+		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleTimeRange").'">'.$langs->trans("Hours").'</span>';
+		print "\n".'<div class="ui-grid-a inline-block"><div class="ui-block-a">';
+		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
+		if (empty($conf->dol_use_jmobile)) print ' - ';
+		else print '</div><div class="ui-block-b">';
+		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
+		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
+		print '</div></div>';
+
+		print '<br>';
+
+		// Filter on days
+		print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"');
+		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleDaysRange").'">'.$langs->trans("DaysOfWeek").'</span>';
+		print "\n".'<div class="ui-grid-a  inline-block"><div class="ui-block-a">';
+		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
+		if (empty($conf->dol_use_jmobile)) print ' - ';
+		else print '</div><div class="ui-block-b">';
+		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
+		print '</div></div>';
+	}
+
+	print '</td>';
 	$i = 0; // 0 = sunday,
 	while ($i < 7)
 	{
@@ -669,7 +728,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 			continue;
 		}
 		echo '<td align="center" colspan="'.($end_h - $begin_h).'">';
-		echo $langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7));
+		echo '<span class="bold spandayofweek">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7)).'</span>';
 		print "<br>";
 		if ($i) print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day');
 		else print dol_print_date($currentdaytoshow, 'day');
@@ -713,16 +772,13 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		    {
 			    $event->fetch_userassigned();
 				$listofuserid = $event->userassigned;
-				foreach ($listofuserid as $userid => $tmp)
-				{
+				foreach ($listofuserid as $userid => $tmp) {
 				   	if (!in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
 				}
 		    }
 		}
-	}
-	/* Use this list to have for all users */
-	else
-	{
+	} else {
+		/* Use this list to have for all users */
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 		if ($usergroup > 0)	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
@@ -730,8 +786,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		if ($usergroup > 0)	$sql .= " AND ug.fk_usergroup = ".$usergroup;
 		//print $sql;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 		    $num = $db->num_rows($resql);
 		    $i = 0;
 		    if ($num)
@@ -743,8 +798,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 					$i++;
 		        }
 		    }
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 	//var_dump($usernamesid);
 	foreach ($usernamesid as $id)
@@ -888,7 +942,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/list.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */
@@ -992,8 +1046,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
 
 					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color;
-				}
-				elseif ($event->type_code == 'ICALEVENT')
+				} elseif ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
 					if (!empty($event->icalname))
@@ -1006,13 +1059,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 
 					$color = $event->icalcolor;
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
-				}
-				elseif ($event->type_code == 'BIRTHDAY')
+				} elseif ($event->type_code == 'BIRTHDAY')
 				{
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
-				}
-				else
-				{
+				} else {
 					$numother++;
 					$color = ($event->icalcolor ? $event->icalcolor : -1);
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
@@ -1038,9 +1088,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
-					}
-					else
-					{
+					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
 						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
@@ -1101,15 +1149,15 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 								}
 								$cases1[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
-							if ($event->contactid > 0)
+							if ($event->contact_id > 0)
 							{
-								if (empty($cachecontacts[$event->contactid]))
+								if (empty($cachecontacts[$event->contact_id]))
 								{
 									$tmpcontact = new Contact($db);
-									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid] = $tmpcontact;
+									$tmpcontact->fetch($event->contact_id);
+									$cachecontacts[$event->contact_id] = $tmpcontact;
 								}
-								$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
+								$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
 						if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
@@ -1147,20 +1195,18 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 								}
 								$cases2[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
-							if ($event->contactid > 0)
+							if ($event->contact_id > 0)
 							{
-								if (empty($cachecontacts[$event->contactid]))
+								if (empty($cachecontacts[$event->contact_id]))
 								{
 									$tmpcontact = new Contact($db);
-									$tmpcontact->fetch($event->contactid);
-									$cachecontacts[$event->contactid] = $tmpcontact;
+									$tmpcontact->fetch($event->contact_id);
+									$cachecontacts[$event->contact_id] = $tmpcontact;
 								}
-								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contactid]->getFullName($langs);
+								$cases2[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
-					}
-					else
-					{
+					} else {
 						$busy = $event->transparency;
 						$cases1[$h][$event->id]['busy'] = $busy;
 						$cases2[$h][$event->id]['busy'] = $busy;
@@ -1224,8 +1270,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color1 = $output[0]['color'];
-		}
-		elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
+		} elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
 		{
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
@@ -1237,8 +1282,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
 			if ($output[0]['color']) $color2 = $output[0]['color'];
-		}
-		elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
+		} elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
 		{
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
@@ -1252,7 +1296,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print ($style1 ? $style1.' ' : '');
-		print 'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
+		print 'onclickopenref'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
 		print '</td><td ';
 		if ($style2 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color2 ? $color2 : "888").' !important" ';
@@ -1262,7 +1306,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		}
 		print 'class="';
 		print ($style2 ? $style2.' ' : '');
-		print 'onclickopenref'.($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
+		print 'onclickopenref'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_30_'.($ids2 ? $ids2 : 'none').'"'.($title2 ? ' title="'.$title2.'"' : '').'>';
 		print $string2;
 		print '</td></tr>';
 		print '</table>';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index aa1d53fcfca..fbb49772d3e 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.pdf.php';
 // Load translation files required by the page
 $langs->loadLangs(array("agenda", "commercial"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $month = GETPOST('month', 'int');
 $year = GETPOST('year', 'int');
 
@@ -185,8 +185,7 @@ if ($resql)
 				print '</td>';
 				print '<td class="center">'.dol_print_date(dol_filemtime($file), 'dayhour').'</td>';
 				print '<td class="center">'.dol_print_size(dol_filesize($file)).'</td>';
-			}
-			else {
+			} else {
 				print '<td>&nbsp;</td>';
 				print '<td>&nbsp;</td>';
 				print '<td>&nbsp;</td>';
@@ -201,9 +200,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index 699f290ed79..d154dc7aafb 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -39,7 +39,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'propal'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 635ffaf8b37..1acdbfa5ca1 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -46,7 +46,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 
 $elementtype = 'propaldet'; //Must be the $table_element of the class that manage extrafield
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index d48c897d6bb..d3a60d76e14 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville        <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020 Laurent Destailleur         <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne                 <eric.seigne@ryxeo.com>
  * Copyright (C) 2006      Andre Cianfarani            <acianfa@free.fr>
  * Copyright (C) 2005-2017 Regis Houssin               <regis.houssin@inodbox.com>
@@ -9,6 +9,7 @@
  * Copyright (C) 2013      Alexandre Spangaro          <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2019 Frédéric France             <frederic.france@netlogic.fr>
  * Copyright (C) 2015      Marcos García               <marcosgdf@gmail.com>
+ * Copyright (C) 2020      Open-Dsi         		   <support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +64,6 @@ if ($user->socid > 0) $id = $user->socid;
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
 $action = GETPOST('action', 'aZ09');
-$mode = GETPOST("mode");
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -138,12 +138,12 @@ if (empty($reshook))
 	}
 
 	// customer preferred shipping method
-    if ($action == 'setshippingmethod' && $user->rights->societe->creer)
-    {
-        $object->fetch($id);
-        $result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-        if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setshippingmethod' && $user->rights->societe->creer)
+	{
+		$object->fetch($id);
+		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+	}
 
 	// assujetissement a la TVA
 	if ($action == 'setassujtva' && $user->rights->societe->creer)
@@ -190,25 +190,32 @@ if (empty($reshook))
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
+	// Set sales representatives
+	if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer)
+	{
+		$object->fetch($id);
+		$result = $object->setSalesRep(GETPOST('commercial', 'array'));
+	}
+
 	if ($action == 'update_extras') {
-        $object->fetch($id);
+		$object->fetch($id);
 
-        $object->oldcopy = dol_clone($object);
+		$object->oldcopy = dol_clone($object);
 
-        // Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
-        if ($ret < 0) $error++;
-        if (!$error)
-        {
-        	$result = $object->insertExtraFields('COMPANY_MODIFY');
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
+		if (!$error)
+		{
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-        }
-        if ($error) $action = 'edit_extras';
-    }
+		}
+		if ($error) $action = 'edit_extras';
+	}
 }
 
 
@@ -242,11 +249,11 @@ if ($object->id > 0)
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	// Prospect/Customer
@@ -255,16 +262,16 @@ if ($object->id > 0)
 	print '</td></tr>';
 
 	// Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans("Prefix").'</td><td>';
-	    print ($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
-	    print '</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans("Prefix").'</td><td>';
+		print ($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
+		print '</td></tr>';
+	}
 
 	if ($object->client)
 	{
-        $langs->load("compta");
+		$langs->load("compta");
 
 		print '<tr><td>';
 		print $langs->trans('CustomerCode').'</td><td>';
@@ -331,9 +338,7 @@ if ($object->id > 0)
 	if ($action == 'editconditions')
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
-	}
-	else
-	{
+	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none');
 	}
 	print "</td>";
@@ -350,9 +355,7 @@ if ($object->id > 0)
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print "</td>";
@@ -371,9 +374,7 @@ if ($object->id > 0)
 		if ($action == 'editbankaccount')
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'fk_account', 1);
-		}
-		else
-		{
+		} else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'none');
 		}
 		print "</td>";
@@ -385,64 +386,64 @@ if ($object->id > 0)
 	// Relative discounts (Discounts-Drawbacks-Rebates)
 	if ($isCustomer)
 	{
-    	print '<tr><td class="nowrap">';
-    	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-    	print $langs->trans("CustomerRelativeDiscountShort");
-    	print '<td><td class="right">';
-    	if ($user->rights->societe->creer && !$user->socid > 0)
-    	{
-    		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
-    	}
-    	print '</td></tr></table>';
-    	print '</td><td>'.($object->remise_percent ? '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>' : '').'</td>';
-    	print '</tr>';
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans("CustomerRelativeDiscountShort");
+		print '<td><td class="right">';
+		if ($user->rights->societe->creer && !$user->socid > 0)
+		{
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
+		}
+		print '</td></tr></table>';
+		print '</td><td>'.($object->remise_percent ? '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>' : '').'</td>';
+		print '</tr>';
 
-    	// Absolute discounts (Discounts-Drawbacks-Rebates)
-    	print '<tr><td class="nowrap">';
-    	print '<table width="100%" class="nobordernopadding">';
-    	print '<tr><td class="nowrap">';
-    	print $langs->trans("CustomerAbsoluteDiscountShort");
-    	print '<td><td class="right">';
-    	if ($user->rights->societe->creer && !$user->socid > 0)
-    	{
-    		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
-    	}
-    	print '</td></tr></table>';
-    	print '</td>';
-    	print '<td>';
-    	$amount_discount = $object->getAvailableDiscounts();
-    	if ($amount_discount < 0) dol_print_error($db, $object->error);
-    	if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
-    	//else print $langs->trans("DiscountNone");
-    	print '</td>';
-    	print '</tr>';
+		// Absolute discounts (Discounts-Drawbacks-Rebates)
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding">';
+		print '<tr><td class="nowrap">';
+		print $langs->trans("CustomerAbsoluteDiscountShort");
+		print '<td><td class="right">';
+		if ($user->rights->societe->creer && !$user->socid > 0)
+		{
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
+		}
+		print '</td></tr></table>';
+		print '</td>';
+		print '<td>';
+		$amount_discount = $object->getAvailableDiscounts();
+		if ($amount_discount < 0) dol_print_error($db, $object->error);
+		if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
+		//else print $langs->trans("DiscountNone");
+		print '</td>';
+		print '</tr>';
 	}
 
 	// Max outstanding bill
 	if ($object->client)
 	{
-	    print '<tr class="nowrap">';
-	    print '<td>';
-	    print $form->editfieldkey("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer);
-	    print '</td><td>';
-	    $limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
-	    print $form->editfieldval("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer, $limit_field_type, ($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
-	    print '</td>';
-	    print '</tr>';
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer);
+		print '</td><td>';
+		$limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
+		print $form->editfieldval("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer, $limit_field_type, ($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
+		print '</td>';
+		print '</tr>';
 	}
 
 	if ($object->client)
 	{
 		if (!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT))
 		{
-		    print '<!-- Minimim amount for orders -->'."\n";
-		    print '<tr class="nowrap">';
-		    print '<td>';
-		    print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer);
-		    print '</td><td>';
-		    print $form->editfieldval("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer, $limit_field_type, ($object->order_min_amount != '' ? price($object->order_min_amount) : ''));
-		    print '</td>';
-		    print '</tr>';
+			print '<!-- Minimim amount for orders -->'."\n";
+			print '<tr class="nowrap">';
+			print '<td>';
+			print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer);
+			print '</td><td>';
+			print $form->editfieldval("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer, $limit_field_type, ($object->order_min_amount != '' ? price($object->order_min_amount) : ''));
+			print '</td>';
+			print '</tr>';
 		}
 	}
 
@@ -467,26 +468,24 @@ if ($object->id > 0)
 		print '</tr>';
 	}
 
-    // Preferred shipping Method
-    if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
-        print '<tr><td class="nowrap">';
-        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-        print $langs->trans('SendingMethod');
-        print '<td>';
-        if (($action != 'editshipping') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
-        print '</tr></table>';
-        print '</td><td>';
-        if ($action == 'editshipping')
-        {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
-        }
-        else
-        {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
-        }
-        print "</td>";
-        print '</tr>';
-    }
+	// Preferred shipping Method
+	if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('SendingMethod');
+		print '<td>';
+		if (($action != 'editshipping') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editshipping')
+		{
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+		} else {
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
+		}
+		print "</td>";
+		print '</tr>';
+	}
 
 	// Categories
 	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
@@ -501,74 +500,70 @@ if ($object->id > 0)
 	$parameters = array('socid'=>$object->id);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-    // Sales representative
+	// Sales representative
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
-    // Module Adherent
-    if (!empty($conf->adherent->enabled))
-    {
-        $langs->load("members");
-        $langs->load("users");
+	// Module Adherent
+	if (!empty($conf->adherent->enabled))
+	{
+		$langs->load("members");
+		$langs->load("users");
 
-        print '<tr><td class="titlefield">'.$langs->trans("LinkedToDolibarrMember").'</td>';
-        print '<td>';
-        $adh = new Adherent($db);
-        $result = $adh->fetch('', '', $object->id);
-        if ($result > 0)
-        {
-            $adh->ref = $adh->getFullName($langs);
-            print $adh->getNomUrl(1);
-        }
-        else
-        {
-            print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
-        }
-        print '</td>';
-        print "</tr>\n";
-    }
+		print '<tr><td class="titlefield">'.$langs->trans("LinkedToDolibarrMember").'</td>';
+		print '<td>';
+		$adh = new Adherent($db);
+		$result = $adh->fetch('', '', $object->id);
+		if ($result > 0)
+		{
+			$adh->ref = $adh->getFullName($langs);
+			print $adh->getNomUrl(1);
+		} else {
+			print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
+		}
+		print '</td>';
+		print "</tr>\n";
+	}
 
 	print "</table>";
 
 	// Prospection level and status
 	if ($object->client == 2 || $object->client == 3)
 	{
-    	print '<br>';
+		print '<br>';
 
-    	print '<div class="underbanner clearboth"></div>';
-    	print '<table class="border centpercent tableforfield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
 
-	    // Level of prospect
-	    print '<tr><td class="titlefield nowrap">';
-	    print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	    print $langs->trans('ProspectLevel');
-	    print '<td>';
-	    if ($action != 'editlevel' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
-	    print '</tr></table>';
-	    print '</td><td>';
-	    if ($action == 'editlevel')
-	    {
-	        $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
-	    }
-	    else
-	    {
-	        print $object->getLibProspLevel();
-	    }
-        print "</td>";
-        print '</tr>';
+		// Level of prospection
+		print '<tr><td class="titlefield nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('ProspectLevel');
+		print '<td>';
+		if ($action != 'editlevel' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editlevel')
+		{
+			$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
+		} else {
+			print $object->getLibProspLevel();
+		}
+		print "</td>";
+		print '</tr>';
 
-        // Status
-        $object->loadCacheOfProspStatus();
-        print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
-        print ' &nbsp; &nbsp; ';
-        print '<div class="floatright">';
-        foreach ($object->cacheprospectstatus as $key => $val)
-        {
-            $titlealt = 'default';
-            if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
-            if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus reposition" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm">'.img_action($titlealt, $val['code']).'</a>';
-        }
-        print '</div></td></tr>';
-        print "</table>";
+		// Status of prospection
+		$object->loadCacheOfProspStatus();
+		print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
+		print ' &nbsp; &nbsp; ';
+		print '<div class="floatright">';
+		foreach ($object->cacheprospectstatus as $key => $val)
+		{
+			$titlealt = 'default';
+			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
+			if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus reposition" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+		}
+		print '</div></td></tr>';
+		print "</table>";
 	}
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
@@ -596,7 +591,7 @@ if ($object->id > 0)
 		$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).' '.$text.'</span><br>';
+		$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>';
@@ -614,7 +609,7 @@ if ($object->id > 0)
 		$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).' '.$text.'</span><br>';
+		$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>';
@@ -632,7 +627,7 @@ if ($object->id > 0)
 		$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).' '.$text.'</span><br>';
+		$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>';
@@ -648,7 +643,7 @@ if ($object->id > 0)
 		$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).' '.$text.'</span><br>';
+		$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>';
@@ -675,9 +670,9 @@ if ($object->id > 0)
 		$langs->load("propal");
 
 		$sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.fk_statut, p.total_ht";
-        $sql .= ", p.tva as total_tva";
-        $sql .= ", p.total as total_ttc";
-        $sql .= ", p.ref, p.ref_client, p.remise";
+		$sql .= ", p.tva as total_tva";
+		$sql .= ", p.total as total_ttc";
+		$sql .= ", p.ref, p.ref_client, p.remise";
 		$sql .= ", p.datep as dp, p.fin_validite as date_limit";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
 		$sql .= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
@@ -691,17 +686,17 @@ if ($object->id > 0)
 			$propal_static = new Propal($db);
 
 			$num = $db->num_rows($resql);
-            if ($num > 0)
-            {
-            	print '<div class="div-table-responsive-no-min">';
-            	print '<table class="noborder centpercent lastrecordtable">';
+			if ($num > 0)
+			{
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-                print '<tr class="liste_titre">';
-    			print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-    			print '</tr></table></td>';
-    			print '</tr>';
-            }
+				print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table></td>';
+				print '</tr>';
+			}
 
 			$i = 0;
 			while ($i < $num && $i < $MAXLIST)
@@ -709,17 +704,17 @@ if ($object->id > 0)
 				$objp = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $propal_static->id = $objp->propalid;
-                $propal_static->ref = $objp->ref;
-                $propal_static->ref_client = $objp->ref_client;
-                $propal_static->total_ht = $objp->total_ht;
-                $propal_static->total_tva = $objp->total_tva;
-                $propal_static->total_ttc = $objp->total_ttc;
-                print $propal_static->getNomUrl(1);
-                if (($db->jdate($objp->date_limit) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == $propal_static::STATUS_VALIDATED) {
-                    print " ".img_warning();
-                }
+				print '<td class="nowrap">';
+				$propal_static->id = $objp->propalid;
+				$propal_static->ref = $objp->ref;
+				$propal_static->ref_client = $objp->ref_client;
+				$propal_static->total_ht = $objp->total_ht;
+				$propal_static->total_tva = $objp->total_tva;
+				$propal_static->total_ttc = $objp->total_ttc;
+				print $propal_static->getNomUrl(1);
+				if (($db->jdate($objp->date_limit) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == $propal_static::STATUS_VALIDATED) {
+					print " ".img_warning();
+				}
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td class="right" style="min-width: 60px" class="nowrap">'.$propal_static->LibStatut($objp->fk_statut, 5).'</td></tr>';
@@ -732,9 +727,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -744,12 +737,12 @@ if ($object->id > 0)
 	 */
 	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
-        $sql = "SELECT s.nom, s.rowid";
-        $sql .= ", c.rowid as cid, c.total_ht";
-        $sql .= ", c.tva as total_tva";
-        $sql .= ", c.total_ttc";
-        $sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
-        $sql .= ", c.date_commande as dc";
+		$sql = "SELECT s.nom, s.rowid";
+		$sql .= ", c.rowid as cid, c.total_ht";
+		$sql .= ", c.tva as total_tva";
+		$sql .= ", c.total_ttc";
+		$sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
+		$sql .= ", c.date_commande as dc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
 		$sql .= " WHERE c.fk_soc = s.rowid ";
 		$sql .= " AND s.rowid = ".$object->id;
@@ -784,8 +777,6 @@ if ($object->id > 0)
 				print '<tr class="liste_titre">';
 				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomerOrders", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'">'.$langs->trans("AllOrders").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-				//if($num2 > 0) print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').'</a></td>';
-				//else print '<td width="20px" class="right"><a href="#">'.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
 			}
@@ -804,8 +795,8 @@ if ($object->id > 0)
 				$commande_static->billed = $objp->billed;
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                print $commande_static->getNomUrl(1);
+				print '<td class="nowrap">';
+				print $commande_static->getNomUrl(1);
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td class="right" style="min-width: 60px" class="nowrap">'.$commande_static->LibStatut($objp->fk_statut, $objp->facture, 5).'</td></tr>';
@@ -818,85 +809,83 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
 
-    /*
+	/*
      *   Latest shipments
      */
-    if (!empty($conf->expedition->enabled) && $user->rights->expedition->lire)
-    {
-        $sql = 'SELECT e.rowid as id';
-        $sql .= ', e.ref';
-        $sql .= ', e.date_creation';
-        $sql .= ', e.fk_statut as statut';
-        $sql .= ', s.nom';
-        $sql .= ', s.rowid as socid';
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
-        $sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
-        $sql .= " AND e.entity IN (".getEntity('expedition').")";
-        $sql .= ' GROUP BY e.rowid';
-        $sql .= ', e.ref';
-        $sql .= ', e.date_creation';
-        $sql .= ', e.fk_statut';
-        $sql .= ', s.nom';
-        $sql .= ', s.rowid';
-        $sql .= " ORDER BY e.date_creation DESC";
+	if (!empty($conf->expedition->enabled) && $user->rights->expedition->lire)
+	{
+		$sql = 'SELECT e.rowid as id';
+		$sql .= ', e.ref';
+		$sql .= ', e.date_creation';
+		$sql .= ', e.fk_statut as statut';
+		$sql .= ', s.nom';
+		$sql .= ', s.rowid as socid';
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
+		$sql .= " AND e.entity IN (".getEntity('expedition').")";
+		$sql .= ' GROUP BY e.rowid';
+		$sql .= ', e.ref';
+		$sql .= ', e.date_creation';
+		$sql .= ', e.fk_statut';
+		$sql .= ', s.nom';
+		$sql .= ', s.rowid';
+		$sql .= " ORDER BY e.date_creation DESC";
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-        	$sendingstatic = new Expedition($db);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$sendingstatic = new Expedition($db);
 
-        	$num = $db->num_rows($resql);
-            if ($num > 0) {
-            	print '<div class="div-table-responsive-no-min">';
-            	print '<table class="noborder centpercent lastrecordtable">';
+			$num = $db->num_rows($resql);
+			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-                print '<tr class="liste_titre">';
-                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/expedition/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-                print '</tr></table></td>';
-                print '</tr>';
-            }
+				print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/expedition/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table></td>';
+				print '</tr>';
+			}
 
-            $i = 0;
-            while ($i < $num && $i < $MAXLIST)
-            {
-                $objp = $db->fetch_object($resql);
+			$i = 0;
+			while ($i < $num && $i < $MAXLIST)
+			{
+				$objp = $db->fetch_object($resql);
 
-                $sendingstatic->id = $objp->id;
-                $sendingstatic->ref = $objp->ref;
+				$sendingstatic->id = $objp->id;
+				$sendingstatic->ref = $objp->ref;
 
-                print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                print $sendingstatic->getNomUrl(1);
-                print '</td>';
-                if ($objp->date_creation > 0) {
-                    print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_creation), 'day').'</td>';
-                } else {
-                    print '<td class="right"><b>!!!</b></td>';
-                }
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				print $sendingstatic->getNomUrl(1);
+				print '</td>';
+				if ($objp->date_creation > 0) {
+					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_creation), 'day').'</td>';
+				} else {
+					print '<td class="right"><b>!!!</b></td>';
+				}
 
-                print '<td class="nowrap right" width="100" >'.$sendingstatic->LibStatut($objp->statut, 5).'</td>';
-                print "</tr>\n";
-                $i++;
-            }
-            $db->free($resql);
+				print '<td class="nowrap right" width="100" >'.$sendingstatic->LibStatut($objp->statut, 5).'</td>';
+				print "</tr>\n";
+				$i++;
+			}
+			$db->free($resql);
 
-            if ($num > 0)
-            {
-                print "</table>";
-                print '</div>';
-            }
-        } else {
-            dol_print_error($db);
-        }
-    }
+			if ($num > 0)
+			{
+				print "</table>";
+				print '</div>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+	}
 
 	/*
 	 * Latest contracts
@@ -921,7 +910,7 @@ if ($object->id > 0)
 				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
+				print '<tr class="liste_titre">';
 				print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td>';
 				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->id.'">'.$langs->trans("AllContracts").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
 				//print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/contract/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
@@ -970,9 +959,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1000,7 +987,7 @@ if ($object->id > 0)
 				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
+				print '<tr class="liste_titre">';
 				print '<td colspan="3"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fichinter/list.php?socid='.$object->id.'">'.$langs->trans("AllInterventions").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/fichinter/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table></td>';
@@ -1013,11 +1000,11 @@ if ($object->id > 0)
 				$objp = $db->fetch_object($resql);
 
 				$fichinter_static->id = $objp->id;
-                $fichinter_static->statut = $objp->fk_statut;
+				$fichinter_static->statut = $objp->fk_statut;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/card.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"), "propal").' '.$objp->ref.'</a></td>'."\n";
-                //print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
+				//print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
 				print '<td class="right" style="min-width: 60px">'.convertSecondToTime($objp->duration).'</td>'."\n";
 				print '<td class="nowrap right" style="min-width: 60px">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
 				print '</tr>';
@@ -1031,9 +1018,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1102,15 +1087,11 @@ if ($object->id > 0)
 				if ($objp->frequency && $objp->date_last_gen > 0)
 				{
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_last_gen), 'day').'</td>';
-				}
-				else
-				{
+				} else {
 					if ($objp->dc > 0)
 					{
 						print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day').'</td>';
-					}
-					else
-					{
+					} else {
 						print '<td class="right"><b>!!!</b></td>';
 					}
 				}
@@ -1139,9 +1120,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1151,10 +1130,10 @@ if ($object->id > 0)
 	 */
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
-        $sql = 'SELECT f.rowid as facid, f.ref, f.type';
-        $sql .= ', f.total as total_ht';
-        $sql .= ', f.tva as total_tva';
-        $sql .= ', f.total_ttc';
+		$sql = 'SELECT f.rowid as facid, f.ref, f.type';
+		$sql .= ', f.total as total_ht';
+		$sql .= ', f.tva as total_tva';
+		$sql .= ', f.total_ttc';
 		$sql .= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut';
 		$sql .= ', s.nom, s.rowid as socid';
 		$sql .= ', SUM(pf.amount) as am';
@@ -1180,7 +1159,7 @@ if ($object->id > 0)
 
 				print '<tr class="liste_titre">';
 				print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
 			}
@@ -1204,9 +1183,7 @@ if ($object->id > 0)
 				if ($objp->df > 0)
 				{
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
-				}
-				else
-				{
+				} else {
 					print '<td class="right"><b>!!!</b></td>';
 				}
 				print '<td class="right" style="min-width: 60px">';
@@ -1215,9 +1192,9 @@ if ($object->id > 0)
 
 				if (!empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
 				{
-    				print '<td class="right" style="min-width: 60px">';
-    				print price($objp->total_ttc);
-    				print '</td>';
+					print '<td class="right" style="min-width: 60px">';
+					print price($objp->total_ttc);
+					print '</td>';
 				}
 
 				print '<td class="nowrap right" style="min-width: 60px">'.($facturestatic->LibStatut($objp->paye, $objp->statut, 5, $objp->am)).'</td>';
@@ -1231,9 +1208,7 @@ if ($object->id > 0)
 				print "</table>";
 				print '</div>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1253,86 +1228,79 @@ if ($object->id > 0)
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 
-    if (empty($reshook))
-    {
-        if ($object->status != 1)
-        {
-            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
-        }
+	if (empty($reshook))
+	{
+		if ($object->status != 1)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
+		}
 
-    	if (!empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status == 1)
-    	{
-    		$langs->load("propal");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
-    	}
+		if (!empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status == 1)
+		{
+			$langs->load("propal");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
+		}
 
-    	if (!empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status == 1)
-    	{
-    		$langs->load("orders");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
-    	}
+		if (!empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status == 1)
+		{
+			$langs->load("orders");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
+		}
 
-    	if ($user->rights->contrat->creer && $object->status == 1)
-    	{
-    		$langs->load("contracts");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
-    	}
+		if ($user->rights->contrat->creer && $object->status == 1)
+		{
+			$langs->load("contracts");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
+		}
 
-    	if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status == 1)
-    	{
-    		$langs->load("fichinter");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
-    	}
+		if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status == 1)
+		{
+			$langs->load("fichinter");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
+		}
 
-    	// Add invoice
-    	if ($user->socid == 0)
-    	{
-    		if (!empty($conf->deplacement->enabled) && $object->status == 1)
-    		{
-    			$langs->load("trips");
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
-    		}
+		// Add invoice
+		if ($user->socid == 0)
+		{
+			if (!empty($conf->deplacement->enabled) && $object->status == 1)
+			{
+				$langs->load("trips");
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
+			}
 
-    		if (!empty($conf->facture->enabled) && $object->status == 1)
-    		{
-    			if (empty($user->rights->facture->creer))
-    			{
-    			    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    			}
-    			else
-    			{
-    				$langs->load("bills");
-    				$langs->load("orders");
+			if (!empty($conf->facture->enabled) && $object->status == 1)
+			{
+				if (empty($user->rights->facture->creer))
+				{
+					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+				} else {
+					$langs->loadLangs(array("orders", "bills"));
 
-    				if (!empty($conf->commande->enabled))
-    				{
-    				    if ($object->client != 0 && $object->client != 2)
-    				    {
-    					    if (!empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-    					    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-    				    }
-    				    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    				}
+					if (!empty($conf->commande->enabled))
+					{
+						if ($object->client != 0 && $object->client != 2) {
+							if (!empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+							else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+					}
 
-    				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
-    				else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    			}
-    		}
-    	}
+					if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+				}
+			}
+		}
 
-    	// Add action
-    	if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
-    	{
-    		if ($user->rights->agenda->myactions->create)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
-    		}
-    		else
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
-    		}
-    	}
-    }
+		// Add action
+		if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
+		{
+			if ($user->rights->agenda->myactions->create)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
+			} else {
+				print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
+			}
+		}
+	}
 
 	print '</div>';
 
@@ -1342,19 +1310,17 @@ if ($object->id > 0)
 		show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 	}
 
-    if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-    {
-        print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
+	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+	{
+		print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
 
-        // List of todo actions
+		// List of todo actions
 		show_actions_todo($conf, $langs, $db, $object);
 
-        // List of done actions
+		// List of done actions
 		show_actions_done($conf, $langs, $db, $object);
 	}
-}
-else
-{
+} else {
 	$langs->load("errors");
 	print $langs->trans('ErrorRecordNotFound');
 }
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 8c9a63d97e2..1038afa923f 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -29,8 +29,8 @@ require '../main.inc.php';
 // Load translation files required by the page
 $langs->load("companies");
 
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) $sortorder = "ASC";
 if (!$sortfield) $sortfield = "p.name";
@@ -170,9 +170,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index af5b4ac41a5..1e09d3f0beb 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -1,10 +1,11 @@
 <?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
- * Copyright (C) 2020      Pierre Ardoin        <mapiolca@me.com>
+/* Copyright (C) 2001-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2019		Nicolas ZABOURI			<info@inovea-conseil.com>
+ * Copyright (C) 2020		Pierre Ardoin			<mapiolca@me.com>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,44 +22,43 @@
  */
 
 /**
- *	\file       htdocs/comm/index.php
- *	\ingroup    commercial
- *	\brief      Home page of commercial area
+ *	\file		htdocs/comm/index.php
+ *	\ingroup	commercial
+ *	\brief		Home page of commercial area
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
-if (!empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->propal->enabled))  require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->supplier_proposal->enabled))  require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-if (!empty($conf->commande->enabled))  require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
 if (!$user->rights->societe->lire) accessforbidden();
 
-$hookmanager = new HookManager($db);
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/agenda.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('commercialindex'));
 
 // Load translation files required by the page
-$langs->loadLangs(array("commercial", "propal"));
+$langs->loadLangs(array("boxes", "commercial", "contracts", "orders", "propal", "supplier_proposal"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $bid = GETPOST('bid', 'int');
 
 // Securite acces client
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
 
-$max = 3;
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 $now = dol_now();
 
 /*
@@ -84,328 +84,245 @@ print load_fiche_titre($langs->trans("CommercialArea"), '', 'commercial');
 
 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 proposal
-    if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
-    {
-    	$listofsearchfields['search_proposal'] = array('text'=>'Proposal');
-    }
-    // Search customer order
-    if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
-    {
-    	$listofsearchfields['search_customer_order'] = array('text'=>'CustomerOrder');
-    }
-    // Search supplier proposal
-    if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-    {
-        $listofsearchfields['search_supplier_proposal'] = array('text'=>'SupplierProposalShort');
-    }
-    // Search supplier order
-    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire)
-    {
-    	$listofsearchfields['search_supplier_order'] = array('text'=>'SupplierOrder');
-    }
-    // Search intervention
-    if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
-    {
-    	$listofsearchfields['search_intervention'] = array('text'=>'Intervention');
-    }
-    // Search contract
-    if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-    {
-        $listofsearchfields['search_contract'] = array('text'=>'Contract');
-    }
+// This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
+	// Search proposal
+	if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
+		$listofsearchfields['search_proposal'] = array('text'=>'Proposal');
+	}
+	// Search customer order
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+		$listofsearchfields['search_customer_order'] = array('text'=>'CustomerOrder');
+	}
+	// Search supplier proposal
+	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
+		$listofsearchfields['search_supplier_proposal'] = array('text'=>'SupplierProposalShort');
+	}
+	// Search supplier order
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
+		$listofsearchfields['search_supplier_order'] = array('text'=>'SupplierOrder');
+	}
+	// Search intervention
+	if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire) {
+		$listofsearchfields['search_intervention'] = array('text'=>'Intervention');
+	}
+	// Search contract
+	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+		$listofsearchfields['search_contract'] = array('text'=>'Contract');
+	}
 
-    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 class="noborderbottom" 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 class="noborderbottom" rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button "></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
 /*
- * Draft proposals
+ * Draft customer proposals
  */
-if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
-{
-	$langs->load("propal");
-
-	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.tva as total_tva, p.total as total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-    $sql .= ", s.code_client";
-	$sql .= ", s.email";
-    $sql .= ", s.entity";
-    $sql .= ", s.code_compta";
+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";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE p.fk_statut = 0";
+	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
 	$sql .= " AND p.fk_soc = s.rowid";
-	$sql .= " AND p.entity IN (".getEntity('propal').")";
+	$sql .= " AND p.fk_statut = ".Propal::STATUS_DRAFT;
 	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;
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$total = 0;
 		$num = $db->num_rows($resql);
+		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		startSimpleTable("ProposalsDraft", "comm/propal/list.php", "search_status=".Propal::STATUS_DRAFT, 2, $num);
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("ProposalsDraft").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?search_status=0"><span class="badge">'.$num.'</span></a></th></tr>';
-
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			$i = 0;
-			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-			{
+
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
 
-				print '<tr class="oddeven"><td  class="nowrap">';
 				$propalstatic->id = $obj->rowid;
 				$propalstatic->ref = $obj->ref;
-                $propalstatic->ref_client = $obj->ref_client;
-                $propalstatic->total_ht = $obj->total_ht;
-                $propalstatic->total_tva = $obj->total_tva;
-                $propalstatic->total_ttc = $obj->total_ttc;
-				print $propalstatic->getNomUrl(1);
-				print '</td>';
-				print '<td class="nowrap">';
+				$propalstatic->ref_client = $obj->ref_client;
+				$propalstatic->total_ht = $obj->total_ht;
+				$propalstatic->total_tva = $obj->total_tva;
+				$propalstatic->total_ttc = $obj->total_ttc;
+
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
 				$companystatic->client = $obj->client;
-                $companystatic->code_client = $obj->code_client;
-                $companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
 				$companystatic->canvas = $obj->canvas;
 				$companystatic->entity = $obj->entity;
-                $companystatic->email = $obj->email;
-                $companystatic->code_compta = $obj->code_compta;
-				print $companystatic->getNomUrl(1, 'customer', 16);
-				print '</td>';
-				print '<td class="nowrap right">'.price($obj->total_ht).'</td></tr>';
+				$companystatic->email = $obj->email;
+				$companystatic->code_compta = $obj->code_compta;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap tdoverflowmax100">'.$propalstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="nowrap right">'.price((!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc)).'</td>';
+				print '</tr>';
+
 				$i++;
-				$total += $obj->total_ht;
-			}
-			if ($num > $nbofloop)
-			{
-				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
-			{
-				print '<tr class="liste_total"><td colspan="2" class="right">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td></tr>";
+				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
 			}
 		}
-		else
-		{
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
-		}
-		print "</table></div><br>";
+
+		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
+		finishSimpleTable(true);
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
 
 
-
 /*
  * Draft supplier proposals
  */
-if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-{
-    $langs->load("supplier_proposal");
+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";
+	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;
+	$sql .= " AND p.fk_soc = s.rowid";
+	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 = "SELECT p.rowid, p.ref, p.total_ht, p.tva as total_tva, p.total as total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-    $sql .= ", s.code_client";
-    $sql .= ", s.code_fournisseur";
-	$sql .= ", s.entity";
-    $sql .= ", 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.fk_statut = 0";
-    $sql .= " AND p.fk_soc = s.rowid";
-    $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
-    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;
+	$resql = $db->query($sql);
+	if ($resql) {
+		$total = 0;
+		$num = $db->num_rows($resql);
+		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		startSimpleTable("SupplierProposalsDraft", "supplier_proposal/list.php", "search_status=".SupplierProposal::STATUS_DRAFT, 2, $num);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $total = 0;
-        $num = $db->num_rows($resql);
+		if ($num > 0) {
+			$i = 0;
 
-        print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder centpercent">';
-        print '<tr class="liste_titre">';
-        print '<th colspan="3">'.$langs->trans("SupplierProposalsDraft").($num ? '<span class="badge marginleftonlyshort">'.$num.'</span>' : '').'</th></tr>';
+			while ($i < $nbofloop) {
+				$obj = $db->fetch_object($resql);
 
-        if ($num > 0)
-        {
-            $i = 0;
-			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-            {
-                $obj = $db->fetch_object($resql);
+				$supplierproposalstatic->id = $obj->rowid;
+				$supplierproposalstatic->ref = $obj->ref;
+				$supplierproposalstatic->total_ht = $obj->total_ht;
+				$supplierproposalstatic->total_tva = $obj->total_tva;
+				$supplierproposalstatic->total_ttc = $obj->total_ttc;
 
-                print '<tr class="oddeven"><td  class="nowrap">';
-                $supplierproposalstatic->id = $obj->rowid;
-                $supplierproposalstatic->ref = $obj->ref;
-                $supplierproposalstatic->total_ht = $obj->total_ht;
-                $supplierproposalstatic->total_tva = $obj->total_tva;
-                $supplierproposalstatic->total_ttc = $obj->total_ttc;
-                print $supplierproposalstatic->getNomUrl(1);
-                print '</td>';
-                print '<td class="nowrap">';
-                $companystatic->id = $obj->socid;
-                $companystatic->name = $obj->name;
-                $companystatic->client = $obj->client;
-                $companystatic->code_client = $obj->code_client;
-                $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas = $obj->canvas;
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->client = $obj->client;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->canvas = $obj->canvas;
 				$companystatic->entity = $obj->entity;
-                $companystatic->email = $obj->email;
-                print $companystatic->getNomUrl(1, 'supplier', 16);
-                print '</td>';
-                print '<td class="nowrap right">'.price($obj->total_ht).'</td></tr>';
-                $i++;
-                $total += $obj->total_ht;
-            }
-			if ($num > $nbofloop)
-			{
-				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
-            {
-                print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
-            }
-        }
-        else
-        {
-            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
-        }
-        print "</table></div><br>";
+				$companystatic->email = $obj->email;
 
-        $db->free($resql);
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+				print '<tr class="oddeven">';
+				print '<td class="nowrap tdoverflowmax100">'.$supplierproposalstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '</tr>';
+
+				$i++;
+				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+			}
+		}
+
+		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
+		finishSimpleTable(true);
+
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
 /*
- * Draft orders
+ * Draft customer orders
  */
-if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
-{
-	$langs->load("orders");
-
-	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-    $sql .= ", s.code_client";
-	$sql .= ", s.email";
-    $sql .= ", s.entity";
-    $sql .= ", s.code_compta";
+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";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE c.fk_soc = s.rowid";
-	$sql .= " AND c.fk_statut = 0";
-	$sql .= " AND c.entity IN (".getEntity('commande').")";
+	$sql .= " WHERE c.entity IN (".getEntity($orderstatic->element).")";
+	$sql .= " AND c.fk_statut = ".Commande::STATUS_DRAFT;
+	$sql .= " AND c.fk_soc = s.rowid";
 	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;
+	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$total = 0;
 		$num = $db->num_rows($resql);
+		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		startSimpleTable("DraftOrders", "commande/list.php", "search_status=".Commande::STATUS_DRAFT, 2, $num);
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("DraftOrders").($num ? '<span class="badge marginleftonlyshort">'.$num.'</span>' : '').'</th></tr>';
-
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			$i = 0;
-			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-			{
+
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
-				print '<tr class="oddeven"><td class="nowrap">';
-                $orderstatic->id = $obj->rowid;
-                $orderstatic->ref = $obj->ref;
-                $orderstatic->ref_client = $obj->ref_client;
-                $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->ref_client = $obj->ref_client;
+				$orderstatic->total_ht = $obj->total_ht;
+				$orderstatic->total_tva = $obj->total_tva;
+				$orderstatic->total_ttc = $obj->total_ttc;
+
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->name;
 				$companystatic->client = $obj->client;
-                $companystatic->code_client = $obj->code_client;
-                $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas = $obj->canvas;
-                $companystatic->email = $obj->email;
-                $companystatic->entity = $obj->entity;
-				print $companystatic->getNomUrl(1, 'customer', 16);
-				print '</td>';
-				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
-					print '<td class="nowrap right">'.price($obj->total_ht).'</td></tr>';
-				}
-				else {
-					print '<td class="nowrap right">'.price($obj->total_ttc).'</td></tr>';
-				}
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->canvas = $obj->canvas;
+				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap tdoverflowmax100">'.$orderstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '</tr>';
+
 				$i++;
-				$total += $obj->total_ttc;
-			}
-			if ($num > $nbofloop)
-			{
-				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
-            {
-                print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
+				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
 			}
 		}
-		else
-		{
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
-		}
-		print "</table>";
-		print "</div><br>";
+
+		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
+		finishSimpleTable(true);
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -414,228 +331,182 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 /*
  * Draft suppliers orders
  */
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire)
-{
-    $langs->load("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";
+	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;
+	$sql .= " AND cf.fk_soc = s.rowid";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) $sql .= " AND cf.fk_soc = ".$socid;
 
-    $sql = "SELECT cf.rowid, cf.ref, cf.ref_supplier, cf.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-    $sql .= ", s.code_client";
-    $sql .= ", s.code_fournisseur";
-	$sql .= ", s.entity";
-    $sql .= ", 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.fk_soc = s.rowid";
-    $sql .= " AND cf.fk_statut = 0";
-    $sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
-    if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    if ($socid)	$sql .= " AND cf.fk_soc = ".$socid;
+	$resql = $db->query($sql);
+	if ($resql) {
+		$total = 0;
+		$num = $db->num_rows($resql);
+		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		startSimpleTable("DraftSuppliersOrders", "fourn/commande/list.php", "search_status=".CommandeFournisseur::STATUS_DRAFT, 2, $num);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $total = 0;
-        $num = $db->num_rows($resql);
+		if ($num > 0) {
+			$i = 0;
 
-        print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder centpercent">';
-        print '<tr class="liste_titre">';
-        print '<th colspan="3">'.$langs->trans("DraftSuppliersOrders").($num ? '<span class="badge marginleftonlyshort">'.$num.'</span>' : '').'</th></tr>';
+			while ($i < $nbofloop) {
+				$obj = $db->fetch_object($resql);
 
-        if ($num > 0)
-        {
-            $i = 0;
-			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-            {
-                $obj = $db->fetch_object($resql);
-                print '<tr class="oddeven"><td class="nowrap">';
-                $supplierorderstatic->id = $obj->rowid;
-                $supplierorderstatic->ref = $obj->ref;
-                $supplierorderstatic->ref_supplier = $obj->ref_suppliert;
-                $supplierorderstatic->total_ht = $obj->total_ht;
-                $supplierorderstatic->total_tva = $obj->total_tva;
-                $supplierorderstatic->total_ttc = $obj->total_ttc;
-                print $supplierorderstatic->getNomUrl(1);
-                print '</td>';
-                print '<td class="nowrap">';
-                $companystatic->id = $obj->socid;
-                $companystatic->name = $obj->name;
-                $companystatic->client = $obj->client;
-                $companystatic->code_client = $obj->code_client;
-                $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas = $obj->canvas;
+				$supplierorderstatic->id = $obj->rowid;
+				$supplierorderstatic->ref = $obj->ref;
+				$supplierorderstatic->ref_supplier = $obj->ref_suppliert;
+				$supplierorderstatic->total_ht = $obj->total_ht;
+				$supplierorderstatic->total_tva = $obj->total_tva;
+				$supplierorderstatic->total_ttc = $obj->total_ttc;
+
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->client = $obj->client;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->canvas = $obj->canvas;
 				$companystatic->entity = $obj->entity;
-                $companystatic->email = $obj->email;
-                print $companystatic->getNomUrl(1, 'supplier', 16);
-                print '</td>';
-				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
-					print '<td class="nowrap right">'.price($obj->total_ht).'</td></tr>';
-				}
-				else {
-					print '<td class="nowrap right">'.price($obj->total_ttc).'</td></tr>';
-				}
-                $i++;
-                $total += $obj->total_ttc;
-            }
- 			if ($num > $nbofloop)
-			{
-				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
-            {
-                print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
-            }
-        }
-        else
-        {
-            print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
-        }
-        print "</table>";
-        print "</div><br>";
+				$companystatic->email = $obj->email;
 
-        $db->free($resql);
-    } else {
-        dol_print_error($db);
-    }
+				print '<tr class="oddeven">';
+				print '<td class="nowrap tdoverflowmax100">'.$supplierorderstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '</tr>';
+
+				$i++;
+				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
+			}
+		}
+
+		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
+		finishSimpleTable(true);
+
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
 }
 
-
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
-
-
-$max = 3;
-
+print '</div><div class="fichetwothirdright">';
+print '<div class="ficheaddleft">';
 
 /*
  * Last modified customers or prospects
  */
-if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
-{
-	$langs->load("boxes");
-
-	$sql = "SELECT s.rowid, s.nom as name, s.client, s.datec, s.tms, s.canvas";
-    $sql .= ", s.code_client";
-	$sql .= ", s.code_compta";
-    $sql .= ", s.entity";
-    $sql .= ", s.email";
+if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
+	$sql = "SELECT s.rowid, s.nom as name, s.client, s.datec, s.tms, s.canvas, s.code_client, s.code_compta, s.entity, s.email";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE s.client IN (1, 2, 3)";
-	$sql .= " AND s.entity IN (".getEntity($companystatic->element).")";
+	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
+	$sql .= " AND s.client IN (".Societe::CUSTOMER.", ".Societe::PROSPECT.", ".Societe::CUSTOMER_AND_PROSPECT.")";
 	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 s.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
+	if ($resql) {
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$header = "BoxTitleLastCustomersOrProspects";
+		}
+		elseif (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$header = "BoxTitleLastModifiedProspects";
+		}
+		else {
+			$header = "BoxTitleLastModifiedCustomers";
+		}
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="2">';
-		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects", $max);
-        elseif (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects", $max);
-		else print $langs->trans("BoxTitleLastModifiedCustomers", $max);
-		print '</th>';
-		print '<th class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/societe/list.php?type=p,c">'.$langs->trans("FullList").'</a></th>';
-		print '</tr>';
-		if ($num)
-		{
-			while ($i < $num)
-			{
+		$num = $db->num_rows($resql);
+		startSimpleTable($langs->trans($header, min($max, $num)), "societe/list.php", "type=p,c", 1);
+
+		if ($num) {
+			$i = 0;
+
+			while ($i < $num && $i < $max) {
 				$objp = $db->fetch_object($resql);
+
 				$companystatic->id = $objp->rowid;
 				$companystatic->name = $objp->name;
 				$companystatic->client = $objp->client;
-                $companystatic->code_client = $objp->code_client;
-                $companystatic->code_fournisseur = $objp->code_fournisseur;
-                $companystatic->canvas = $objp->canvas;
+				$companystatic->code_client = $objp->code_client;
+				$companystatic->code_fournisseur = $objp->code_fournisseur;
+				$companystatic->canvas = $objp->canvas;
 				$companystatic->code_compta = $objp->code_compta;
-                $companystatic->entity = $objp->entity;
-                $companystatic->email = $objp->email;
+				$companystatic->entity = $objp->entity;
+				$companystatic->email = $objp->email;
+
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 48).'</td>';
-				print '<td class="right" nowrap>';
-				print $companystatic->getLibCustProspStatut();
-				print "</td>";
-				print '<td class="right" nowrap>'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="right" nowrap>'.$companystatic->getLibCustProspStatut().'</td>';
+				print '<td class="right" nowrap>'.dol_print_date($db->jdate($objp->tms), 'day').'</td>';
 				print '</tr>';
+
 				$i++;
 			}
+		}
 
-			$db->free($resql);
-		}
-		else
-		{
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-		}
-		print "</table>";
-		print "</div><br>";
+		addSummaryTableLine(3, $num);
+		finishSimpleTable(true);
+
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
 	}
 }
 
-// Last suppliers
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->societe->lire)
-{
-	$langs->load("boxes");
 
-	$sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm";
-    $sql .= ", s.code_fournisseur";
-	$sql .= ", s.entity";
-    $sql .= ", s.email";
+/*
+ * Last suppliers
+ */
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->societe->lire) {
+	$sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm, s.code_fournisseur, s.entity, s.email";
 	$sql .= " 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($companystatic->element).")";
+	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
+	$sql .= " AND s.fournisseur = ".Societe::SUPPLIER;
 	if (!$user->rights->societe->client->voir && !$user->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 s.datec DESC";
 	$sql .= $db->plimit($max, 0);
 
-	$result = $db->query($sql);
-	if ($result)
-	{
-		$num = $db->num_rows($result);
-		$i = 0;
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
+		startSimpleTable($langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)), "societe/list.php", "type=f");
+
+		if ($num) {
+			$i = 0;
+			while ($i < $num && $i < $max) {
+				$objp = $db->fetch_object($resql);
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th>'.$langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)).'</th>';
-		print '<th class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/societe/list.php?type=f">'.$langs->trans("FullList").'</a></th>';
-		print '</tr>';
-		if ($num)
-		{
-			while ($i < $num && $i < $max)
-			{
-				$objp = $db->fetch_object($result);
 				$companystatic->id = $objp->rowid;
-                $companystatic->name = $objp->name;
-                $companystatic->code_client = $objp->code_client;
-                $companystatic->code_fournisseur = $objp->code_fournisseur;
-                $companystatic->canvas = $objp->canvas;
+				$companystatic->name = $objp->name;
+				$companystatic->code_client = $objp->code_client;
+				$companystatic->code_fournisseur = $objp->code_fournisseur;
+				$companystatic->canvas = $objp->canvas;
 				$companystatic->entity = $objp->entity;
-                $companystatic->email = $objp->email;
-                print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'supplier', 44).'</td>';
+				$companystatic->email = $objp->email;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
 				print '</tr>';
 
 				$i++;
 			}
 		}
-		else
-		{
-			print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-		}
-		print '</table>';
-		print '</div><br>';
+
+		addSummaryTableLine(2, $num);
+		finishSimpleTable(true);
+
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
 	}
 }
 
@@ -643,8 +514,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 /*
  * Last actions
  */
-if ($user->rights->agenda->myactions->read)
-{
+if ($user->rights->agenda->myactions->read) {
 	show_array_last_actions_done($max);
 }
 
@@ -652,297 +522,274 @@ if ($user->rights->agenda->myactions->read)
 /*
  * Actions to do
  */
-if ($user->rights->agenda->myactions->read)
-{
-	show_array_actions_to_do(10);
+if ($user->rights->agenda->myactions->read) {
+	show_array_actions_to_do($max);
 }
 
 
 /*
  * Latest contracts
  */
-if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
-{
-	$langs->load("contracts");
+if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // TODO A REFAIRE DEPUIS NOUVEAU CONTRAT
+	$staticcontrat = new Contrat($db);
 
-	$sql = "SELECT s.nom as name, s.rowid, s.canvas, ";
-    $sql .= ", s.code_client";
-    $sql .= ", s.entity";
-    $sql .= ", s.email";
-    $sql .= ", c.statut, c.rowid as contratid, p.ref, c.fin_validite as datefin, c.date_cloture as dateclo";
+	$sql = "SELECT s.nom as name, s.rowid, s.canvas, s.code_client, s.entity, s.email";
+	$sql .= ", c.statut, c.rowid as contratid, p.ref, c.fin_validite as datefin, c.date_cloture as dateclo";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."contrat as c";
 	$sql .= ", ".MAIN_DB_PREFIX."product as p";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE c.fk_soc = s.rowid";
-	$sql .= " AND c.entity IN (".getEntity('contract').")";
+	$sql .= " WHERE c.entity IN (".getEntity($staticcontrat->element).")";
+	$sql .= " AND c.fk_soc = s.rowid";
 	$sql .= " AND c.fk_product = p.rowid";
-	if (!$user->rights->societe->client->voir && !$socid)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	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 c.tms DESC";
-	$sql .= $db->plimit(5, 0);
+	$sql .= $db->plimit($max + 1, 0);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
+		startSimpleTable($langs->trans("LastContracts", $max), "", "", 2);
 
-		if ($num > 0)
-		{
-			print '<div class="div-table-responsive-no-min">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("LastContracts", 5).'</th></tr>';
+		if ($num > 0) {
 			$i = 0;
 
-			$staticcontrat = new Contrat($db);
-
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
-				print '<tr class="oddeven"><td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), "contract")." ".$obj->ref."</a></td>';
-				print '<td>';
-                $companystatic->id = $objp->rowid;
-                $companystatic->name = $objp->name;
-                $companystatic->code_client = $objp->code_client;
-                $companystatic->code_fournisseur = $objp->code_fournisseur;
-                $companystatic->canvas = $objp->canvas;
+
+				$companystatic->id = $objp->rowid;
+				$companystatic->name = $objp->name;
+				$companystatic->code_client = $objp->code_client;
+				$companystatic->code_fournisseur = $objp->code_fournisseur;
+				$companystatic->canvas = $objp->canvas;
 				$companystatic->entity = $objp->entity;
-                $companystatic->email = $objp->email;
-                print $companystatic->getNomUrl(1, 'customer', 44);
-				print '</td>'."\n";
-				print "<td class=\"right\">".$staticcontrat->LibStatut($obj->statut, 3)."</td></tr>\n";
+				$companystatic->email = $objp->email;
+
+				print '<tr class="oddeven">';
+				print '<td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), "contract")." ".$obj->ref."</a></td>';
+				print '<td>'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
+				print '<td class="right">'.$staticcontrat->LibStatut($obj->statut, 3).'</td>';
+				print '</tr>';
 
 				$i++;
 			}
-			print "</table>";
-			print "</div><br>";
 		}
-	}
-	else
-	{
+
+		addSummaryTableLine(2, $num);
+		finishSimpleTable(true);
+
+		$db->free($resql);
+	} else {
 		dol_print_error($db);
 	}
 }
 
-/*
- * Opened proposals
- */
-if (!empty($conf->propal->enabled) && $user->rights->propal->lire)
-{
-	$langs->load("propal");
 
-	$sql = "SELECT s.nom as name, s.rowid, s.code_client";
-	$sql .= ", s.entity";
-    $sql .= ", s.email";
-	$sql .= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.tva as total_tva, p.ref, p.ref_client, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+/*
+ * Opened (validated) proposals
+ */
+if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
+	$sql = "SELECT p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.tva as total_tva, p.ref, p.ref_client, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
+	$sql .= ", s.nom as name, s.rowid, s.code_client, s.entity, s.email";
+	$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.fk_soc = s.rowid";
-	$sql .= " AND p.entity IN (".getEntity('propal').")";
-	$sql .= " AND p.fk_statut = 1";
+	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
+	$sql .= " AND p.fk_soc = s.rowid";
+	$sql .= " AND p.fk_statut = ".Propal::STATUS_VALIDATED;
 	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 p.rowid DESC";
 
-	$result = $db->query($sql);
-	if ($result)
-	{
-		$total = 0;
-		$num = $db->num_rows($result);
-		$i = 0;
-		if ($num > 0)
-		{
-			print '<div class="div-table-responsive-no-min">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><th colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?search_status=1"><span class="badge">'.$num.'</span></th></tr>';
+	$resql = $db->query($sql);
+	if ($resql) {
+		$total = $total_ttc = 0;
+		$num = $db->num_rows($resql);
+		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		startSimpleTable("ProposalsOpened", "comm/propal/list.php", "search_status=1", 4, $num);
 
-			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-			{
-				$obj = $db->fetch_object($result);
+		if ($num > 0) {
+			$i = 0;
+			$othernb = 0;
 
-				print '<tr class="oddeven">';
+			while ($i < $nbofloop) {
+				$obj = $db->fetch_object($resql);
 
-				// Ref
-				print '<td class="nowrap" width="140">';
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += $obj->total_ht;
+					$total_ttc += $obj->total_ttc;
+					continue;
+				}
 
 				$propalstatic->id = $obj->propalid;
 				$propalstatic->ref = $obj->ref;
-                $propalstatic->ref_client = $obj->ref_client;
-                $propalstatic->total_ht = $obj->total_ht;
-                $propalstatic->total_tva = $obj->total_tva;
-                $propalstatic->total_ttc = $obj->total_ttc;
+				$propalstatic->ref_client = $obj->ref_client;
+				$propalstatic->total_ht = $obj->total_ht;
+				$propalstatic->total_tva = $obj->total_tva;
+				$propalstatic->total_ttc = $obj->total_ttc;
+
+				$companystatic->id = $obj->rowid;
+				$companystatic->name = $obj->name;
+				$companystatic->client = $obj->client;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->canvas = $obj->canvas;
+				$companystatic->entity = $obj->entity;
+				$companystatic->email = $obj->email;
 
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				print '<td class="nobordernopadding nowrap">';
-				print $propalstatic->getNomUrl(1);
-				print '</td>';
-				print '<td width="18" class="nobordernopadding nowrap">';
-				if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
-				print '</td>';
-				print '<td width="16" align="center" class="nobordernopadding">';
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
 				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;
-				print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
-				print '</td></tr></table>';
+				$warning = ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) ? img_warning($langs->trans("Late")) : '';
 
-				print "</td>";
+				print '<tr class="oddeven">';
+
+				print '<td class="nowrap" width="140">';
+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+				print '<td class="nobordernopadding nowrap">'.$propalstatic->getNomUrl(1).'</td>';
+				print '<td width="18" class="nobordernopadding nowrap">'.$warning.'</td>';
+				print '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($propalstatic->element, $filename, $filedir).'</td>';
+				print '</tr>';
+				print '</table>';
+				print '</td>';
+
+				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
+				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
+				print '<td class="right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
+
+				print '</tr>';
 
-                print '<td class="nowrap">';
-                $companystatic->id = $obj->rowid;
-                $companystatic->name = $obj->name;
-                $companystatic->client = $obj->client;
-                $companystatic->code_client = $obj->code_client;
-                $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
-                $companystatic->email = $obj->email;
-                print $companystatic->getNomUrl(1, 'customer', 44);
-                print '</td>';
-				print '<td class="right">';
-				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
-				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
-					print '<td class="right">'.price($obj->total_ht).'</td>';
-				}
-				else {
-					print '<td class="right">'.price($obj->total_ttc).'</td>';
-				}
-				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>'."\n";
-				print '</tr>'."\n";
 				$i++;
-				$total += $obj->total_ttc;
+				$total += $obj->total_ht;
+				$total_ttc += $obj->total_ttc;
 			}
-			if ($num > $nbofloop)
-			{
-				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
+
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
 			}
-			elseif ($total > 0)
-			{
-				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td class=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
-			}
-			print "</table>";
-			print "</div><br>";
 		}
-	}
-	else
-	{
+
+		addSummaryTableLine(5, $num, $nbofloop, empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $total_ttc : $total, "NoProposal", true);
+		finishSimpleTable(true);
+
+		$db->free($resql);
+	} else {
 		dol_print_error($db);
 	}
 }
 
-/*
- * Opened Order
- */
-if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
-{
-	$langs->load("orders");
 
-	$sql = "SELECT s.nom as name, s.rowid, c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
-    $sql .= ", s.code_client";
-	$sql .= ", s.entity";
-    $sql .= ", s.email";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+/*
+ * Opened (validated) order
+ */
+if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+	$sql = "SELECT c.rowid as commandeid, c.total_ttc, c.total_ht, c.tva as total_tva, c.ref, c.ref_client, c.fk_statut, c.date_valid as dv, c.facture as billed";
+	$sql .= ", s.nom as name, s.rowid, s.code_client, s.entity, s.email";
+	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE c.fk_soc = s.rowid";
-	$sql .= " AND c.entity IN (".getEntity('commande').")";
-	$sql .= " AND (c.fk_statut = ".Commande::STATUS_VALIDATED." or c.fk_statut = ".Commande::STATUS_SHIPMENTONPROCESS.")";
+	$sql .= " WHERE c.entity IN (".getEntity($orderstatic->element).")";
+	$sql .= " AND c.fk_soc = s.rowid";
+	$sql .= " AND c.fk_statut IN (".Commande::STATUS_VALIDATED.", ".Commande::STATUS_SHIPMENTONPROCESS.")";
 	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 c.rowid DESC";
 
-	$result = $db->query($sql);
-	if ($result)
-	{
-		$total = 0;
-		$num = $db->num_rows($result);
-		$i = 0;
-		if ($num > 0)
-		{
-			print '<div class="div-table-responsive-no-min">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><th class="liste_titre" colspan="5">'.$langs->trans("OrdersOpened").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status=1"><span class="badge">'.$num.'</span></th></tr>';
+	$resql = $db->query($sql);
+	if ($resql) {
+		$total = $total_ttc = 0;
+		$num = $db->num_rows($resql);
+		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		startSimpleTable("OrdersOpened", "commande/list.php", "search_status=".Commande::STATUS_VALIDATED, 4, $num);
 
-			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-			{
-				$obj = $db->fetch_object($result);
+		if ($num > 0) {
+			$i = 0;
+			$othernb = 0;
 
-				print '<tr class="oddeven">';
+			while ($i < $nbofloop) {
+				$obj = $db->fetch_object($resql);
 
-				// Ref
-				print '<td class="nowrap" width="140">';
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += $obj->total_ht;
+					$total_ttc += $obj->total_ttc;
+					continue;
+				}
 
 				$orderstatic->id = $obj->commandeid;
 				$orderstatic->ref = $obj->ref;
-                $orderstatic->ref_client = $obj->ref_client;
-                $orderstatic->total_ht = $obj->total_ht;
-                $orderstatic->total_tva = $obj->total_tva;
-                $orderstatic->total_ttc = $obj->total_ttc;
+				$orderstatic->ref_client = $obj->ref_client;
+				$orderstatic->total_ht = $obj->total_ht;
+				$orderstatic->total_tva = $obj->total_tva;
+				$orderstatic->total_ttc = $obj->total_ttc;
+
+				$companystatic->id = $obj->rowid;
+				$companystatic->name = $obj->name;
+				$companystatic->client = $obj->client;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->canvas = $obj->canvas;
+				$companystatic->entity = $obj->entity;
+				$companystatic->email = $obj->email;
 
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				print '<td class="nobordernopadding nowrap">';
-				print $orderstatic->getNomUrl(1);
-				print '</td>';
-				print '<td width="18" class="nobordernopadding nowrap">';
-				//if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
-				print '</td>';
-				print '<td width="16" align="center" class="nobordernopadding">';
 				$filename = dol_sanitizeFileName($obj->ref);
 				$filedir = $conf->commande->dir_output.'/'.dol_sanitizeFileName($obj->ref);
 				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;
-				print $formfile->getDocumentsLink($orderstatic->element, $filename, $filedir);
-				print '</td></tr></table>';
+				//$warning = ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) ? img_warning($langs->trans("Late")) : '';
 
-				print "</td>";
+				print '<tr class="oddeven">';
+
+				print '<td class="nowrap" width="140">';
+				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+				print '<td class="nobordernopadding nowrap">'.$orderstatic->getNomUrl(1).'</td>';
+				print '<td width="18" class="nobordernopadding nowrap"></td>';
+				print '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($orderstatic->element, $filename, $filedir).'</td>';
+				print '</tr>';
+				print '</table>';
+				print '</td>';
+
+				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
+				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
+				print '<td class="right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>';
+
+				print '</tr>';
 
-                print '<td class="nowrap">';
-                $companystatic->id = $obj->rowid;
-                $companystatic->name = $obj->name;
-                $companystatic->client = $obj->client;
-                $companystatic->code_client = $obj->code_client;
-                $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas = $obj->canvas;
-				$companystatic->entity = $obj->entity;
-                $companystatic->email = $obj->email;
-                print $companystatic->getNomUrl(1, 'customer', 44);
-                print '</td>';
-				print '<td class="right">';
-				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
-				if (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT)) {
-					print '<td class="right">'.price($obj->total_ht).'</td>';
-				}
-				else {
-					print '<td class="right">'.price($obj->total_ttc).'</td>';
-				}
-				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>'."\n";
-				print '</tr>'."\n";
 				$i++;
-				$total += $obj->total_ttc;
+				$total += $obj->total_ht;
+				$total_ttc += $obj->total_ttc;
 			}
-			if ($num > $nbofloop)
-			{
-				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
+
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
 			}
-			elseif ($total > 0)
-			{
-				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td class=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
-			}
-			print "</table>";
-			print "</div><br>";
 		}
-	}
-	else
-	{
+
+		addSummaryTableLine(5, $num, $nbofloop, empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $total_ttc : $total, "None", true);
+		finishSimpleTable(true);
+
+		$db->free($resql);
+	} else {
 		dol_print_error($db);
 	}
 }
 
-
-
-print '</div></div></div>';
+print '</div>';
+print '</div>';
+print '</div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardCommercials', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index d4db9fc6ea9..64e7df053ea 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -46,8 +46,8 @@ if (!$user->rights->mailing->lire || $user->socid > 0)
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -87,9 +87,7 @@ if (empty($template_id)) {
 if ($result < 0)
 {
 	setEventMessages($advTarget->error, $advTarget->errors, 'errors');
-}
-else
-{
+} else {
 	if (!empty($advTarget->id)) {
 		$array_query = json_decode($advTarget->filtervalue, true);
 	}
@@ -428,7 +426,7 @@ if ($object->fetch($id) >= 0) {
 	print $form->showrefnav($object, 'id', $linkback);
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+	print '<tr><td>'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e3cb5a9ad97..02d779e5525 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -41,7 +41,7 @@ $langs->load("mails");
 if (!$user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) accessforbidden();
 
 $id = (GETPOST('mailid', 'int') ? GETPOST('mailid', 'int') : GETPOST('id', 'int'));
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $urlfrom = GETPOST('urlfrom');
 
@@ -93,17 +93,13 @@ if (empty($reshook))
 		if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			$result = $object->createFromClone($user, $object->id, GETPOST("clone_content", 'alpha'), GETPOST("clone_receivers", 'alpha'));
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -120,14 +116,11 @@ if (empty($reshook))
 			setEventMessages('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
 			setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
 			$action = '';
-		}
-		elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+		} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 		{
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
 			$action = '';
-		}
-		else
-		{
+		} else {
 			$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
 			if ($object->statut == 0)
@@ -218,7 +211,6 @@ if (empty($reshook))
 						$substitutionarray['__OTHER4__'] = $other4;
 						$substitutionarray['__OTHER5__'] = $other5;
 						$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
-						$substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
 						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$obj->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.$obj->tag.'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
 
@@ -235,9 +227,7 @@ if (empty($reshook))
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-							}
-							else
-							{
+							} else {
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
@@ -316,9 +306,7 @@ if (empty($reshook))
 							if (!$resql2)
 							{
 								dol_print_error($db);
-							}
-							else
-							{
+							} else {
 								//if cheack read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false)
 								{
@@ -350,9 +338,7 @@ if (empty($reshook))
                         	}
 
                         	//test if CHECK READ change statut prospect contact
-						}
-						else
-						{
+						} else {
 							// Mail failed
 							$nbko++;
 
@@ -369,9 +355,7 @@ if (empty($reshook))
 
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs');
 				}
 
@@ -381,16 +365,12 @@ if (empty($reshook))
 					$statut = 2; // Status 'sent partially' (because at least one error)
 					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					if ($nbok >= $num)
 					{
 						$statut = 3; // Send to everybody
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
-					}
-					else
-					{
+					} else {
 						$statut = 2; // Status 'sent partially' (because not send to everybody)
 						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
 					}
@@ -403,9 +383,7 @@ if (empty($reshook))
 				{
 					dol_print_error($db);
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog($db->error());
 				dol_print_error($db);
 			}
@@ -472,9 +450,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
 				$action = '';
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
 				$action = 'test';
 			}
@@ -486,16 +462,16 @@ if (empty($reshook))
 	{
 		$mesgs = array();
 
-		$object->email_from     = trim($_POST["from"]);
-		$object->email_replyto  = trim($_POST["replyto"]);
-		$object->email_errorsto = trim($_POST["errorsto"]);
-		$object->titre          = trim($_POST["titre"]);
-		$object->sujet          = trim($_POST["sujet"]);
-		$object->body           = trim($_POST["bodyemail"]);
-		$object->bgcolor        = trim($_POST["bgcolor"]);
-		$object->bgimage        = trim($_POST["bgimage"]);
+		$object->email_from     = GETPOST("from");
+		$object->email_replyto  = GETPOST("replyto");
+		$object->email_errorsto = GETPOST("errorsto");
+		$object->title          = GETPOST("title");
+		$object->sujet          = GETPOST("sujet");
+		$object->body           = GETPOST("bodyemail", 'restricthtml');
+		$object->bgcolor        = GETPOST("bgcolor");
+		$object->bgimage        = GETPOST("bgimage");
 
-		if (!$object->titre) {
+		if (!$object->title) {
 			$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		}
 		if (!$object->sujet) {
@@ -520,16 +496,16 @@ if (empty($reshook))
 	}
 
 	// Action update description of emailing
-	if ($action == 'settitre' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
+	if ($action == 'settitle' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
 	{
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
-		if ($action == 'settitre') $object->titre = trim(GETPOST('titre', 'alpha'));
+		if ($action == 'settitle') $object->title = trim(GETPOST('title', 'alpha'));
 		elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'alpha'));
 		elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'alpha'));
 		elseif ($action == 'setemail_errorsto') {
             $object->email_errorsto = trim(GETPOST('email_errorsto', 'alpha'));
-        } elseif ($action == 'settitre' && empty($object->titre)) {
+        } elseif ($action == 'settitle' && empty($object->title)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		} elseif ($action == 'setfrom' && empty($object->email_from)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailFrom"));
@@ -587,10 +563,10 @@ if (empty($reshook))
 		{
 			$mesgs = array();
 
-			$object->sujet          = trim($_POST["sujet"]);
-			$object->body           = trim($_POST["bodyemail"]);
-			$object->bgcolor        = trim($_POST["bgcolor"]);
-			$object->bgimage        = trim($_POST["bgimage"]);
+			$object->sujet          = GETPOST("sujet");
+			$object->body           = GETPOST("bodyemail", 'restricthtml');
+			$object->bgcolor        = GETPOST("bgcolor");
+			$object->bgimage        = GETPOST("bgimage");
 
 			if (!$object->sujet) {
 				$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTopic"));
@@ -611,9 +587,7 @@ if (empty($reshook))
 
 			setEventMessages($mesg, $mesgs, 'errors');
 			$action = "edit";
-		}
-		else
-		{
+		} else {
 			$action = "edit";
 		}
 	}
@@ -627,9 +601,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -645,14 +617,10 @@ if (empty($reshook))
     			//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
     			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
     			exit;
-            }
-            else
-            {
+            } else {
                 setEventMessages($object->error, $object->errors, 'errors');
             }
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -675,15 +643,11 @@ if (empty($reshook))
 				$db->commit();
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -774,7 +738,7 @@ if ($action == 'create')
 	print '<div style="padding-top: 10px">';
 	// Editeur wysiwyg
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'none'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
+	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'restricthtml'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
 	$doleditor->Create();
 	print '</div>';
 
@@ -783,9 +747,7 @@ if ($action == 'create')
 	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("CreateMailing").'"></div>';
 
 	print '</form>';
-}
-else
-{
+} else {
 	if ($object->id > 0)
 	{
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
@@ -801,13 +763,11 @@ else
 		if ($action == 'valid')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1);
-		}
-		// Confirm reset
+		} // Confirm reset
 		elseif ($action == 'reset')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ResetMailing"), $langs->trans("ConfirmResetMailing", $object->ref), "confirm_reset", '', '', 2);
-		}
-		// Confirm delete
+		} // Confirm delete
 		elseif ($action == 'delete')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
@@ -841,8 +801,7 @@ else
 					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
 					if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
 					$_GET["action"] = '';
-				}
-				elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+				} 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');
@@ -855,9 +814,7 @@ else
 					    setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
 					}
 					$_GET["action"] = '';
-				}
-				else
-				{
+				} 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');
 
@@ -897,9 +854,9 @@ else
 
 			// Description
 			print '<tr><td class="titlefield">';
-			print $form->editfieldkey("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
+			print $form->editfieldkey("MailTitle", 'title', $object->title, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
 			print '</td><td>';
-			print $form->editfieldval("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
+			print $form->editfieldval("MailTitle", 'title', $object->title, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
 			print '</td></tr>';
 
 			// From
@@ -939,9 +896,7 @@ else
     				if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
     				{
     					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-    				}
-    				else
-    				{
+    				} else {
     					$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
     				}
 			    }
@@ -949,9 +904,7 @@ else
 				if ($text)
     			{
     			    print $form->textwithpicto($nbemail, $text, 1, 'warning');
-    			}
-    			else
-    			{
+    			} else {
     				print $nbemail;
     			}
 			}
@@ -998,9 +951,7 @@ else
 					if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithEditor").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("EditWithTextEditor").'</a>';
 					}
 
@@ -1012,9 +963,7 @@ else
 				if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("TestMailing").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=test&amp;id='.$object->id.'">'.$langs->trans("TestMailing").'</a>';
 				}
 
@@ -1023,13 +972,10 @@ else
 					if ($object->nbemail <= 0)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoTargetYet")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					elseif (empty($user->rights->mailing->valider))
+					} elseif (empty($user->rights->mailing->valider))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ValidMailing").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=valid&amp;id='.$object->id.'">'.$langs->trans("ValidMailing").'</a>';
 					}
 				}
@@ -1039,13 +985,10 @@ else
 					if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SendingFromWebInterfaceIsNotAllowed")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
+					} elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("SendMailing").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=sendall&amp;id='.$object->id.'">'.$langs->trans("SendMailing").'</a>';
 					}
 				}
@@ -1060,9 +1003,7 @@ else
 					if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("ResetMailing").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=reset&amp;id='.$object->id.'">'.$langs->trans("ResetMailing").'</a>';
 					}
 				}
@@ -1072,10 +1013,8 @@ else
 					if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("DeleteMailing").'</a>';
-					}
-					else
-					{
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
+					} else {
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.(!empty($urlfrom) ? '&urlfrom='.$urlfrom : '').'">'.$langs->trans("DeleteMailing").'</a>';
 					}
 				}
 
@@ -1153,9 +1092,7 @@ else
 					print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
 					print '<br>';
 				}
-			}
-			else
-			{
+			} else {
 				print '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 			}
 			print '</td></tr>';
@@ -1176,14 +1113,11 @@ else
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
 				$doleditor->Create();
-			}
-			else print dol_htmlentitiesbr($object->body);
+			} else print dol_htmlentitiesbr($object->body);
 			print '</div>';
 
 			dol_fiche_end();
-		}
-		else
-		{
+		} else {
 			/*
 			 * Mailing en mode edition (CKeditor or HTML source)
 			 */
@@ -1210,7 +1144,7 @@ else
 			*/
 
 			// Topic
-			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 			// From
 			print '<tr><td class="titlefield">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
 			// To
@@ -1229,9 +1163,7 @@ else
 					if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 					{
 						$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-					}
-					else
-					{
+					} else {
 						$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 					}
 				}
@@ -1239,9 +1171,7 @@ else
 				if ($text)
 				{
 					print $form->textwithpicto($nbemail, $text, 1, 'warning');
-				}
-				else
-				{
+				} else {
 					print $nbemail;
 				}
 			}
@@ -1315,9 +1245,7 @@ else
 					$out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Search"), 'delete.png', '', '', 1).'" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
 					$out .= '<br></div>';
 				}
-			}
-			else
-			{
+			} else {
 				$out .= $langs->trans("NoAttachedFiles").'<br>';
 			}
 			// Add link to add file
@@ -1366,9 +1294,7 @@ else
 			print '</form>';
 			print '<br>';
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index d8d9873b88b..ff9bb98f639 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -41,8 +41,8 @@ if (!$user->rights->mailing->lire || $user->socid > 0) accessforbidden();
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -160,9 +160,7 @@ if (GETPOST('exportcsv', 'int'))
 		}
 
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	exit;
@@ -181,15 +179,11 @@ if ($action == 'delete')
 			$obj->update_nb($id);
 
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			header("Location: list.php");
 			exit;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -243,7 +237,7 @@ if ($object->fetch($id) >= 0)
 
 	print '<table class="border centpercent tableforfield">';
 
-	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">';
 	$emailarray = CMailFile::getArrayAddress($object->email_from);
@@ -293,9 +287,7 @@ if ($object->fetch($id) >= 0)
 			if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
 			{
 				$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-			}
-			else
-			{
+			} else {
 				$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 			}
 		}
@@ -303,9 +295,7 @@ if ($object->fetch($id) >= 0)
 		if ($text)
 		{
 			print $form->textwithpicto($nbemail, $text, 1, 'warning');
-		}
-		else
-		{
+		} else {
 			print $nbemail;
 		}
 	}
@@ -405,9 +395,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
-					{
+					} else {
 					    print '<div '.$bctag[$var].'>';
 					}
 
@@ -420,8 +408,7 @@ if ($object->fetch($id) >= 0)
 
 					try {
 						$nbofrecipient = $obj->getNbOfRecipients('');
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
@@ -430,9 +417,7 @@ if ($object->fetch($id) >= 0)
 					if ($nbofrecipient >= 0)
 					{
 						print $nbofrecipient;
-					}
-					else
-					{
+					} else {
 						print $langs->trans("Error").' '.img_error($obj->error);
 					}
 					print '</div>';
@@ -442,8 +427,7 @@ if ($object->fetch($id) >= 0)
 					{
     					try {
     						$filter = $obj->formFilter();
-    					}
-    					catch (Exception $e)
+    					} catch (Exception $e)
     					{
     						dol_syslog($e->getMessage(), LOG_ERR);
     					}
@@ -456,9 +440,7 @@ if ($object->fetch($id) >= 0)
 					if ($allowaddtarget)
 					{
 						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
-					}
-					else
-					{
+					} else {
 					    print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 						//print $langs->trans("MailNoChangePossible");
 						print "&nbsp;";
@@ -632,31 +614,24 @@ if ($object->fetch($id) >= 0)
                 if (empty($obj->source_id) || empty($obj->source_type))
                 {
                     print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
-                }
-                else
-                {
+                } else {
                     if ($obj->source_type == 'member')
                     {
 						$objectstaticmember->fetch($obj->source_id);
                         print $objectstaticmember->getNomUrl(1);
-                    }
-                    elseif ($obj->source_type == 'user')
+                    } elseif ($obj->source_type == 'user')
                     {
 						$objectstaticuser->fetch($obj->source_id);
                         print $objectstaticuser->getNomUrl(1);
-                    }
-                    elseif ($obj->source_type == 'thirdparty')
+                    } elseif ($obj->source_type == 'thirdparty')
                     {
 						$objectstaticcompany->fetch($obj->source_id);
                         print $objectstaticcompany->getNomUrl(1);
-                    }
-                    elseif ($obj->source_type == 'contact')
+                    } elseif ($obj->source_type == 'contact')
                     {
                     	$objectstaticcontact->fetch($obj->source_id);
                     	print $objectstaticcontact->getNomUrl(1);
-                    }
-                    else
-                    {
+                    } else {
                         print $obj->source_url;
                     }
                 }
@@ -676,9 +651,7 @@ if ($object->fetch($id) >= 0)
 					print '<td class="nowrap right">';
 					print $object::libStatutDest($obj->statut, 2, '');
 					print '</td>';
-				}
-				else
-				{
+				} else {
 					// Date sent
 					print '<td class="center">'.$obj->date_envoi.'</td>';
 
@@ -692,7 +665,7 @@ if ($object->fetch($id) >= 0)
 				if ($obj->statut == 0)	// Not sent yet
 				{
 					if ($user->rights->mailing->creer && $allowaddtarget) {
-						print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
+						print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
 					}
 				}
 				/*if ($obj->statut == -1)	// Sent with error
@@ -704,9 +677,7 @@ if ($object->fetch($id) >= 0)
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			if ($object->statut < 2)
 			{
 			    print '<tr><td colspan="9" class="opacitymedium">';
@@ -720,9 +691,7 @@ if ($object->fetch($id) >= 0)
 		print '</form>';
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 7700ca6ee43..f82ebec9d6f 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -165,9 +165,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -221,9 +219,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -284,9 +280,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -351,9 +345,7 @@ class AdvanceTargetingMailing extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -411,9 +403,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -453,9 +443,7 @@ class AdvanceTargetingMailing extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -579,7 +567,7 @@ class AdvanceTargetingMailing extends CommonObject
 					if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') ||
 						($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
 						if (!empty($arrayquery['options_'.$key])) {
-							$sqlwhere[] = " (te.".$key." LIKE '".$arrayquery['options_'.$key]."')";
+							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key])."')";
 						}
 					} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'int') ||
 						($extrafields->attributes[$elementtype]['type'][$key] == 'double')) {
@@ -599,7 +587,7 @@ class AdvanceTargetingMailing extends CommonObject
 						if (is_array($arrayquery['options_'.$key])) {
 							$sqlwhere[] = " (te.".$key." IN ('".implode("','", $arrayquery['options_'.$key])."'))";
 						} elseif (!empty($arrayquery['options_'.$key])) {
-							$sqlwhere[] = " (te.".$key." LIKE '".$arrayquery['options_'.$key]."')";
+							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key])."')";
 						}
 					}
 				}
@@ -676,22 +664,20 @@ class AdvanceTargetingMailing extends CommonObject
 				$sqlwhere[] = $this->transformToSQL('t.firstname', $arrayquery['contact_firstname']);
 			}
 			if (!empty($arrayquery['contact_country']) && count($arrayquery['contact_country'])) {
-				$sqlwhere[] = " (t.fk_pays IN (".$this->db->escape(implode(',', $arrayquery['contact_country']))."))";
+				$sqlwhere[] = " (t.fk_pays IN (".$this->db->sanitize($this->db->escape(implode(',', $arrayquery['contact_country'])))."))";
 			}
 			if (!empty($arrayquery['contact_status']) && count($arrayquery['contact_status']) > 0) {
-				$sqlwhere[] = " (t.statut IN (".$this->db->escape(implode(',', $arrayquery['contact_status']))."))";
+				$sqlwhere[] = " (t.statut IN (".$this->db->sanitize($this->db->escape(implode(',', $arrayquery['contact_status'])))."))";
 			}
 			if (!empty($arrayquery['contact_civility']) && count($arrayquery['contact_civility']) > 0) {
-				$sqlwhere[] = " (t.civility IN ('".$this->db->escape(implode("','", $arrayquery['contact_civility']))."'))";
+				$sqlwhere[] = " (t.civility IN ('".$this->db->sanitize($this->db->escape(implode("','", $arrayquery['contact_civility'])))."'))";
 			}
 			if ($arrayquery['contact_no_email'] != '') {
 				$tmpwhere = '';
 				if (!empty($arrayquery['contact_no_email']))
 				{
 					$tmpwhere .= "(t.email IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
-				}
-				else
-				{
+				} else {
 					$tmpwhere .= "(t.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE t.entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($arrayquery['contact_no_email'])."'))";
 				}
 				$sqlwhere[] = $tmpwhere;
@@ -722,7 +708,7 @@ class AdvanceTargetingMailing extends CommonObject
 					if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') ||
 					($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
 						if (!empty($arrayquery['options_'.$key.'_cnct'])) {
-							$sqlwhere[] = " (te.".$key." LIKE '".$arrayquery['options_'.$key.'_cnct']."')";
+							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key.'_cnct'])."')";
 						}
 					} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'int') ||
 						($extrafields->attributes[$elementtype]['type'][$key] == 'double')) {
@@ -746,7 +732,7 @@ class AdvanceTargetingMailing extends CommonObject
 						if (is_array($arrayquery['options_'.$key.'_cnct'])) {
 							$sqlwhere[] = " (te.".$key." IN ('".implode("','", $arrayquery['options_'.$key.'_cnct'])."'))";
 						} elseif (!empty($arrayquery['options_'.$key.'_cnct'])) {
-							$sqlwhere[] = " (te.".$key." LIKE '".$arrayquery['options_'.$key.'_cnct']."')";
+							$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key.'_cnct'])."')";
 						}
 					}
 				}
@@ -824,7 +810,7 @@ class AdvanceTargetingMailing extends CommonObject
 							if (($extrafields->attributes[$elementtype]['type'][$key] == 'varchar') ||
 								($extrafields->attributes[$elementtype]['type'][$key] == 'text')) {
 								if (!empty($arrayquery['options_'.$key])) {
-									$sqlwhere[] = " (tse.".$key." LIKE '".$arrayquery['options_'.$key]."')";
+									$sqlwhere[] = " (tse.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key])."')";
 								}
 							} elseif (($extrafields->attributes[$elementtype]['type'][$key] == 'int') ||
 								($extrafields->attributes[$elementtype]['type'][$key] == 'double')) {
@@ -844,7 +830,7 @@ class AdvanceTargetingMailing extends CommonObject
 								if (is_array($arrayquery['options_'.$key])) {
 									$sqlwhere[] = " (tse.".$key." IN ('".implode("','", $arrayquery['options_'.$key])."'))";
 								} elseif (!empty($arrayquery['options_'.$key])) {
-									$sqlwhere[] = " (tse.".$key." LIKE '".$arrayquery['options_'.$key]."')";
+									$sqlwhere[] = " (tse.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key])."')";
 								}
 							}
 						}
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 06962600edf..53fafb0ce61 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -314,9 +314,7 @@ class FormAdvTargetEmailing extends Form
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 56a115a2fea..704d0892ab5 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -46,7 +46,7 @@ class Mailing extends CommonObject
 	 */
 	public $picto = 'email';
 
-	public $titre;
+	public $title;
 	public $sujet;
 	public $body;
 	public $nbemail;
@@ -115,7 +115,7 @@ class Mailing extends CommonObject
 
 		$this->db->begin();
 
-		$this->titre = trim($this->titre);
+		$this->title = trim($this->title);
 		$this->email_from = trim($this->email_from);
 
 		if (!$this->email_from)
@@ -130,9 +130,9 @@ class Mailing extends CommonObject
 		$sql .= " (date_creat, fk_user_creat, entity)";
 		$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", ".$conf->entity.")";
 
-		if (!$this->titre)
+		if (!$this->title)
 		{
-			$this->titre = $langs->trans("NoTitle");
+			$this->title = $langs->trans("NoTitle");
 		}
 
 		dol_syslog("Mailing::Create", LOG_DEBUG);
@@ -144,18 +144,14 @@ class Mailing extends CommonObject
 			if ($this->update($user) > 0)
 			{
 				$this->db->commit();
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
 
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -171,7 +167,7 @@ class Mailing extends CommonObject
 	public function update($user)
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
-		$sql .= " SET titre = '".$this->db->escape($this->titre)."'";
+		$sql .= " SET titre = '".$this->db->escape($this->title)."'";
 		$sql .= ", sujet = '".$this->db->escape($this->sujet)."'";
 		$sql .= ", body = '".$this->db->escape($this->body)."'";
 		$sql .= ", email_from = '".$this->db->escape($this->email_from)."'";
@@ -186,9 +182,7 @@ class Mailing extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -204,7 +198,7 @@ class Mailing extends CommonObject
 	{
 		global $conf;
 
-		$sql = "SELECT m.rowid, m.titre, m.sujet, m.body, m.bgcolor, m.bgimage";
+		$sql = "SELECT m.rowid, m.titre as title, m.sujet, m.body, m.bgcolor, m.bgimage";
 		$sql .= ", m.email_from, m.email_replyto, m.email_errorsto";
 		$sql .= ", m.statut, m.nbemail";
 		$sql .= ", m.fk_user_creat, m.fk_user_valid";
@@ -227,7 +221,7 @@ class Mailing extends CommonObject
 				$this->ref = $obj->rowid;
 				$this->statut = $obj->statut;
 				$this->nbemail = $obj->nbemail;
-				$this->titre = $obj->titre;
+				$this->title = $obj->title;
 
 				$this->sujet = $obj->sujet;
 				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401))) {
@@ -253,15 +247,11 @@ class Mailing extends CommonObject
 				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::fetch Erreur -1");
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::fetch Erreur -2");
 			return -2;
 		}
@@ -293,7 +283,7 @@ class Mailing extends CommonObject
 		$object->statut = 0;
 
 		// Clear fields
-		$object->titre = $langs->trans("CopyOf").' '.$object->titre.' '.dol_print_date(dol_now());
+		$object->title = $langs->trans("CopyOf").' '.$object->title.' '.dol_print_date(dol_now());
 
 		// If no option copy content
 		if (empty($option1))
@@ -368,9 +358,7 @@ class Mailing extends CommonObject
 							);
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
@@ -386,9 +374,7 @@ class Mailing extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -412,9 +398,7 @@ class Mailing extends CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -437,9 +421,7 @@ class Mailing extends CommonObject
 		if ($resql)
 		{
 			return $this->delete_targets();
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -462,9 +444,7 @@ class Mailing extends CommonObject
 		if ($resql)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return 0;
 		}
@@ -490,9 +470,7 @@ class Mailing extends CommonObject
 		if ($resql)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -512,8 +490,7 @@ class Mailing extends CommonObject
 	    if ($mode == 'alreadysent') $sql .= " AND statut <> 0";
 	    elseif ($mode == 'alreadysentok') $sql .= " AND statut > 0";
 	    elseif ($mode == 'alreadysentko') $sql .= " AND statut = -1";
-	    else
-	    {
+	    else {
 	        $this->error = 'BadValueForParameterMode';
 	        return -2;
 	    }
@@ -523,9 +500,7 @@ class Mailing extends CommonObject
 	    {
 	        $obj = $this->db->fetch_object($resql);
 	        if ($obj) return $obj->nb;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $this->db->lasterror();
 	        return -1;
 	    }
@@ -585,8 +560,7 @@ class Mailing extends CommonObject
 			 $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.'>';
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 6b765d9451f..ddcdaabf14e 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -129,9 +129,7 @@ if (is_resource($handle))
                             }
 
                             $db->free($result);
-                        }
-                        else
-                        {
+                        } else {
                             dol_print_error($db);
                         }
                         print '</tr>';
@@ -184,23 +182,19 @@ if ($result) {
 
 	        print '<tr class="oddeven">';
 	        print '<td class="nowrap">'.$mailstatic->getNomUrl(1).'</td>';
-	        print '<td>'.dol_trunc($obj->titre, 38).'</td>';
+	        print '<td>'.dol_trunc($obj->title, 38).'</td>';
 	        print '<td class="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
 	        print '<td class="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
 	        print '<td class="right">'.$mailstatic->LibStatut($obj->statut, 5).'</td>';
             print '</tr>';
 	        $i++;
 	    }
-    }
-    else
-    {
+    } else {
         print '<tr><td class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print "</table></div><br>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 8119224bbfa..525064942a6 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -130,9 +130,7 @@ if ($filteremail)
 	if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
 	if (!$sortorder) $sortorder = "ASC";
 	if (!$sortfield) $sortfield = "m.rowid";
-}
-else
-{
+} else {
 	$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
 	$sql .= " WHERE m.entity = ".$conf->entity;
@@ -240,7 +238,7 @@ if ($resql)
 		print $email->getNomUrl(1);
 		print '</td>';
 
-		print '<td>'.$obj->titre.'</td>';
+		print '<td>'.$obj->title.'</td>';
 		// Date creation
 
 		print '<td class="center">';
@@ -274,9 +272,7 @@ if ($resql)
 		if ($filteremail)
 		{
 			print $email::libStatutDest($obj->sendstatut, 2);
-		}
-		else
-		{
+		} else {
 			print $email->LibStatut($obj->statut, 5);
 		}
 		print '</td>';
@@ -297,9 +293,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index 6d80626242d..cd5d5c9ace9 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -152,9 +152,7 @@ if ($_socid > 0)
 		}
 		$db->free($resql);
 		print "</table>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index eddf967c7d1..9caf2c8483c 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020	    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
@@ -68,7 +69,7 @@ $error = 0;
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $origin = GETPOST('origin', 'alpha');
 $originid = GETPOST('originid', 'int');
@@ -161,9 +162,7 @@ if (empty($reshook))
 		if (!GETPOST('socid', 3))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			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
@@ -204,9 +203,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Delete proposal
+	} // Delete proposal
 	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
 	{
 		$result = $object->delete($user);
@@ -217,9 +214,7 @@ if (empty($reshook))
 			$langs->load("errors");
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Remove line
+	} // Remove line
 	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$result = $object->deleteline($lineid);
@@ -237,14 +232,12 @@ if (empty($reshook))
 			}
 			$ret = $object->fetch($id); // Reload to get new records
 			if ($ret > 0) $object->fetch_thirdparty();
-			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit();
-	}
-
-	// Validation
+	} // Validation
 	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$result = $object->valid($user);
@@ -260,8 +253,11 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
+				if ($ret > 0) {
+					$object->fetch_thirdparty();
+				}
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
@@ -270,9 +266,7 @@ if (empty($reshook))
 			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
 			else setEventMessages($langs->trans($object->error), null, 'errors');
 		}
-	}
-
-	elseif ($action == 'setdate' && $usercancreate)
+	} elseif ($action == 'setdate' && $usercancreate)
 	{
 		$datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 
@@ -286,21 +280,17 @@ if (empty($reshook))
 			if ($result < 0)
 				dol_print_error($db, $object->error);
 		}
-	}
-	elseif ($action == 'setecheance' && $usercancreate)
+	} elseif ($action == 'setecheance' && $usercancreate)
 	{
 		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
-	}
-	elseif ($action == 'setdate_livraison' && $usercancreate)
+	} elseif ($action == 'setdate_livraison' && $usercancreate)
 	{
 		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
-	}
-
-	// Positionne ref client
+	} // Positionne ref client
 	elseif ($action == 'setref_client' && $usercancreate)
 	{
 		$result = $object->set_ref_client($user, GETPOST('ref_client'));
@@ -308,15 +298,11 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Set incoterm
+	} // Set incoterm
 	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $usercancreate)
 	{
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	}
-
-	// Create proposal
+	} // Create proposal
 	elseif ($action == 'add' && $usercancreate)
 	{
 		$object->socid = $socid;
@@ -366,12 +352,12 @@ if (empty($reshook))
 					$object->remise_percent = GETPOST('remise_percent');
 					$object->remise_absolue = GETPOST('remise_absolue');
 					$object->socid = GETPOST('socid', 'int');
-					$object->contactid = GETPOST('contactid', 'int');
+					$object->contact_id = GETPOST('contactid', 'int');
 					$object->fk_project = GETPOST('projectid', 'int');
-					$object->modelpdf = GETPOST('model');
+					$object->model_pdf = GETPOST('model');
 					$object->author = $user->id; // deprecated
-					$object->note_private = GETPOST('note_private', 'none');
-					$object->note_public = GETPOST('note_public', 'none');
+					$object->note_private = GETPOST('note_private', 'restricthtml');
+					$object->note_public = GETPOST('note_public', 'restricthtml');
 					$object->statut = Propal::STATUS_DRAFT;
 					$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 					$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
@@ -394,12 +380,12 @@ if (empty($reshook))
 				$object->cond_reglement_id = GETPOST('cond_reglement_id');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id');
 				$object->fk_account = GETPOST('fk_account', 'int');
-				$object->contactid = GETPOST('contactid', 'int');
+				$object->contact_id = GETPOST('contactid', 'int');
 				$object->fk_project = GETPOST('projectid', 'int');
-				$object->modelpdf = GETPOST('model');
+				$object->model_pdf = GETPOST('model');
 				$object->author = $user->id; // deprecated
-				$object->note_private = GETPOST('note_private', 'none');
-				$object->note_public = GETPOST('note_public', 'none');
+				$object->note_private = GETPOST('note_private', 'restricthtml');
+				$object->note_public = GETPOST('note_public', 'restricthtml');
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
@@ -550,9 +536,8 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				} 			// Standard creation
-				else
-				{
+				} // Standard creation
+				else {
 					$id = $object->create($user);
 				}
 
@@ -594,7 +579,7 @@ if (empty($reshook))
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
 							}
-							$model = $object->modelpdf;
+							$model = $object->model_pdf;
 
 							$ret = $object->fetch($id); // Reload to get new records
 							$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -603,29 +588,23 @@ if (empty($reshook))
 
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 						exit();
-					}
-					else
-					{
+					} else {
 						$db->rollback();
 						$action = 'create';
 					}
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$db->rollback();
 					$action = 'create';
 				}
 			}
 		}
-	}
-
-	// Classify billed
+	} // Classify billed
 	elseif ($action == 'classifybilled' && $usercanclose)
 	{
 		$db->begin();
 
-		$result = $object->cloture($user, Propal::STATUS_BILLED, '');
+		$result = $object->cloture($user, $object::STATUS_BILLED, '');
 		if ($result < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -635,25 +614,21 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-
-	// Close proposal
-	elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) {
+	} // Close proposal
+	elseif ($action == 'confirm_closeas' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		if (!(GETPOST('statut', 'int') > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
-			$action = 'statut';
+			$action = 'closeas';
 		} else {
 			// prevent browser refresh from closing proposal several times
-			if ($object->statut == Propal::STATUS_VALIDATED)
+			if ($object->statut == $object::STATUS_VALIDATED)
 			{
 				$db->begin();
 
-				$result = $object->cloture($user, GETPOST('statut', 'int'), GETPOST('note_private', 'none'));
+				$result = $object->cloture($user, GETPOST('statut', 'int'), GETPOST('note_private', 'restricthtml'));
 				if ($result < 0)
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
@@ -663,16 +638,12 @@ if (empty($reshook))
 				if (!$error)
 				{
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 				}
 			}
 		}
-	}
-
-	// Reopen proposal
+	} // Reopen proposal
 	elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		// prevent browser refresh from reopening proposal several times
 		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED)
@@ -689,15 +660,11 @@ if (empty($reshook))
 			if (!$error)
 			{
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
-	}
-
-	// add lines from objectlinked
+	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
 	    && $user->rights->propal->creer
 	    && $object->statut == Propal::STATUS_DRAFT
@@ -713,8 +680,7 @@ if (empty($reshook))
 	        {
 	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'OrderLine';
-	        }
-	        elseif ($fromElement == 'propal')
+	        } elseif ($fromElement == 'propal')
 	        {
 	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'PropaleLigne';
@@ -766,8 +732,7 @@ if (empty($reshook))
 	                } else {
 	                    $error++;
 	                }
-	            }
-	            else {
+	            } else {
 	                $error++;
 	            }
 	        }
@@ -805,11 +770,9 @@ if (empty($reshook))
 			}
 			$ret = $object->fetch($id); // Reload to get new records
 			if ($ret > 0) $object->fetch_thirdparty();
-			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-
-	elseif ($action == "setabsolutediscount" && $usercancreate) {
+	} elseif ($action == "setabsolutediscount" && $usercancreate) {
 		if ($_POST["remise_id"]) {
 			if ($object->id > 0) {
 				$result = $object->insert_discount($_POST["remise_id"]);
@@ -818,23 +781,27 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Add line
-	elseif ($action == 'addline' && $usercancreate) {
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+		// Define vat_rate
+		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
+		$vat_rate = str_replace('*', '', $vat_rate);
+		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+		foreach ($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
+		}
+	} elseif ($action == 'addline' && $usercancreate) {		// Add line
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc', 'none') ?GETPOST('dp_desc', 'none') : '');
-		$price_ht = GETPOST('price_ht');
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$product_desc = (GETPOSTISSET('dp_desc') ?GETPOST('dp_desc', 'restricthtml') : '');
+		$price_ht = price2num(GETPOST('price_ht'));
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -859,7 +826,7 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht == '' && $price_ht_devise == '') 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
+		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht === '' && $price_ht_devise === '') 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error++;
@@ -926,8 +893,7 @@ if (empty($reshook))
 					    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
+				} // If price per customer
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
@@ -949,8 +915,7 @@ if (empty($reshook))
 							if (empty($tva_tx)) $tva_npr = 0;
 						}
 					}
-				}
-				// If price per quantity
+				} // If price per quantity
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
 				{
 					if ($prod->prices_by_qty[0])	// yes, this product has some prices per quantity
@@ -966,17 +931,14 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else
-							{
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
 							break;
 						}
 					}
-				}
-				// If price per quantity and customer
+				} // If price per quantity and customer
 				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
 				{
 					if ($prod->prices_by_qty[$object->thirdparty->price_level]) // yes, this product has some prices per quantity
@@ -992,9 +954,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else
-							{
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -1007,11 +967,10 @@ if (empty($reshook))
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 				// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
-				if (!empty($price_ht)) {
+				if (!empty($price_ht) || $price_ht === '0') {
 					$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
+				} // 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') {
@@ -1143,7 +1102,7 @@ if (empty($reshook))
 						if ($ret > 0) {
 							$object->fetch_thirdparty();
 						}
-						$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+						$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 					}
 
 					unset($_POST['prod_entry_mode']);
@@ -1185,9 +1144,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Update a line within proposal
+	} // Update a line within proposal
 	elseif ($action == 'updateline' && $usercancreate && GETPOST('save'))
 	{
 		// Define info_bits
@@ -1196,7 +1153,7 @@ if (empty($reshook))
 			$info_bits |= 0x01;
 
 			// Clean parameters
-		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'none'));
+		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml'));
 
 		// Define vat_rate
 		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
@@ -1287,7 +1244,7 @@ if (empty($reshook))
 					}
 					$ret = $object->fetch($id); // Reload to get new records
 					if ($ret > 0) $object->fetch_thirdparty();
-					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
 				unset($_POST['qty']);
@@ -1325,66 +1282,42 @@ if (empty($reshook))
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
-	}
-
-	elseif ($action == 'classin' && $usercancreate) {
+	} elseif ($action == 'classin' && $usercancreate) {
         // Set project
         $object->setProject(GETPOST('projectid', 'int'));
-	}
-
-	// Delivery time
+	} // Delivery time
 	elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->set_availability($user, GETPOST('availability_id', 'int'));
-	}
-
-	// Origin of the commercial proposal
+	} // Origin of the commercial proposal
 	elseif ($action == 'setdemandreason' && $usercancreate) {
 		$result = $object->set_demand_reason($user, GETPOST('demand_reason_id', 'int'));
-	}
-
-	// Terms of payment
+	} // Terms of payment
 	elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-
-	elseif ($action == 'setremisepercent' && $usercancreate) {
+	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise_percent($user, $_POST['remise_percent']);
-	}
-
-	elseif ($action == 'setremiseabsolue' && $usercancreate) {
+	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
-	}
-
-	// Payment choice
+	} // Payment choice
 	elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	}
-
-	// Multicurrency Code
+	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
+	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
-	}
-
-	// bank account
+	} // bank account
 	elseif ($action == 'setbankaccount' && $usercancreate) {
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-
-	// shipping method
+	} // shipping method
 	elseif ($action == 'setshippingmethod' && $usercancreate) {
 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-	}
-
-	elseif ($action == 'update_extras') {
+	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 		if (!$error)
 		{
@@ -1418,18 +1351,14 @@ if (empty($reshook))
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-		}
-
-		// Toggle the status of a contact
+		} // Toggle the status of a contact
 		elseif ($action == 'swapstatut') {
 			if ($object->fetch($id) > 0) {
 				$result = $object->swapContactStatus(GETPOST('ligne'));
 			} else {
 				dol_print_error($db);
 			}
-		}
-
-		// Delete a contact
+		} // Delete a contact
 		elseif ($action == 'deletecontact') {
 			$object->fetch($id);
 			$result = $object->delete_contact($lineid);
@@ -1539,9 +1468,7 @@ if ($action == 'create')
 				if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
@@ -1582,7 +1509,7 @@ if ($action == 'create')
 		}
 	} else {
 		print '<td>';
-		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		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))
 		{
@@ -1630,12 +1557,12 @@ if ($action == 'create')
 
 	// Terms of payment
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	$form->select_conditions_paiements($soc->cond_reglement_id, 'cond_reglement_id', -1, 1);
+	$form->select_conditions_paiements((GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id), 'cond_reglement_id', -1, 1);
 	print '</td></tr>';
 
 	// Mode of payment
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	$form->select_types_paiements($soc->mode_reglement_id, 'mode_reglement_id');
+	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id), 'mode_reglement_id');
 	print '</td></tr>';
 
 	// Bank Account
@@ -1651,7 +1578,10 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Delivery delay
-	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod').'</td><td>';
+	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod');
+	if (!empty($conf->commande->enabled))
+		print ' ('.$langs->trans('AfterOrder').')';
+	print '</td><td>';
 	$form->selectAvailabilityDelay('', 'availability_id', '', 1);
 	print '</td></tr>';
 
@@ -1895,11 +1825,11 @@ if ($action == 'create')
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmClonePropal', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	if ($action == 'statut')
+	if ($action == 'closeas')
 	{
 		//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(Propal::STATUS_SIGNED), 3=>$object->LibStatut(Propal::STATUS_NOTSIGNED))),
+			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' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
 		);
 
@@ -1912,25 +1842,17 @@ if ($action == 'create')
 			));
 		}
 
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'setstatut', $formquestion, '', 1, 250);
-	}
-
-	// Confirm delete
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
+	} // Confirm delete
 	elseif ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp', $object->ref), 'confirm_delete', '', 0, 1);
-	}
-
-	// Confirm reopen
+	} // Confirm reopen
 	elseif ($action == 'reopen') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp', $object->ref), 'confirm_reopen', '', 0, 1);
-	}
-
-	// Confirmation delete product/service line
+	} // Confirmation delete product/service line
 	elseif ($action == 'ask_deleteline') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
-	}
-
-	// Confirm validate proposal
+	} // Confirm validate proposal
 	elseif ($action == 'validate') {
 		$error = 0;
 
@@ -2314,9 +2236,7 @@ if ($action == 'create')
 		if ($action != 'editincoterm')
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		}
-		else
-		{
+		} 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>';
@@ -2442,13 +2362,15 @@ if ($action == 'create')
 	// Form to add new line
 	if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines')
 	{
-		if ($action != 'editline')
-		{
+		if ($action != 'editline') {
 			// Add products/services form
 			$object->formAddObjectLine(1, $mysoc, $soc);
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		} else {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('formEditObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		}
 	}
 
@@ -2483,9 +2405,7 @@ if ($action == 'create')
 					if ($usercanvalidate)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
-					}
-					else
-						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
+					} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
 				}
 				// Create event
 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -2508,8 +2428,7 @@ if ($action == 'create')
 					if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || !empty($conf->global->PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else
-							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
+						} else print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 
@@ -2561,28 +2480,26 @@ if ($action == 'create')
 						if ($usercanclose)
 						{
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
-						}
-						else
-						{
+						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("ClassifyBilled").'</a>';
 						}
 					}
 				}
 
-				// Set accepted/refused
+				// Close as accepted/refused
 				if ($object->statut == Propal::STATUS_VALIDATED && $usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
 					print '>'.$langs->trans('SetAcceptedRefused').'</a>';
 				}
 
 				// Clone
 				if ($usercancreate) {
-					print '<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>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;token='.newToken().'&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a>';
 				}
 
 				// Delete
 				if ($usercandelete) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'"';
 					print '>'.$langs->trans('Delete').'</a>';
 				}
 			}
@@ -2607,7 +2524,7 @@ if ($action == 'create')
 		$genallowed = $usercanread;
 		$delallowed = $usercancreate;
 
-		print $formfile->showdocuments('propal', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);
+		print $formfile->showdocuments('propal', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('propal'));
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 87c91d0f621..f2275d59021 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
  */
 class Proposals extends DolibarrApi
 {
-    /**
+	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
 	static $FIELDS = array(
@@ -65,60 +65,60 @@ class Proposals extends DolibarrApi
 	 */
 	public function get($id, $contact_list = 1)
 	{
-        return $this->_fetch($id, '', '', $contact_list);
+		return $this->_fetch($id, '', '', $contact_list);
 	}
 
-    /**
-     * Get properties of an proposal object by ref
-     *
-     * Return an array with proposal informations
-     *
-     * @param       string		$ref			Ref of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref/{ref}
-     *
-     * @throws 	RestException
-     */
-    public function getByRef($ref, $contact_list = 1)
-    {
-        return $this->_fetch('', $ref, '', $contact_list);
-    }
+	/**
+	 * Get properties of an proposal object by ref
+	 *
+	 * Return an array with proposal informations
+	 *
+	 * @param       string		$ref			Ref of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref/{ref}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRef($ref, $contact_list = 1)
+	{
+		return $this->_fetch('', $ref, '', $contact_list);
+	}
 
-    /**
-     * Get properties of an proposal object by ref_ext
-     *
-     * Return an array with proposal informations
-     *
-     * @param       string		$ref_ext			External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref_ext/{ref_ext}
-     *
-     * @throws 	RestException
-     */
-    public function getByRefExt($ref_ext, $contact_list = 1)
-    {
-        return $this->_fetch('', '', $ref_ext, $contact_list);
-    }
+	/**
+	 * Get properties of an proposal object by ref_ext
+	 *
+	 * Return an array with proposal informations
+	 *
+	 * @param       string		$ref_ext			External reference of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref_ext/{ref_ext}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRefExt($ref_ext, $contact_list = 1)
+	{
+		return $this->_fetch('', '', $ref_ext, $contact_list);
+	}
 
-    /**
-     * Get properties of an proposal object
-     *
-     * Return an array with proposal informations
-     *
-     * @param       int         $id             ID of order
+	/**
+	 * Get properties of an proposal object
+	 *
+	 * Return an array with proposal informations
+	 *
+	 * @param       int         $id             ID of order
 	 * @param		string		$ref			Ref of object
 	 * @param		string		$ref_ext		External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
-    {
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
+	{
 		if (!DolibarrApiAccess::$user->rights->propal->lire) {
 			throw new RestException(401);
 		}
@@ -151,8 +151,8 @@ class Proposals extends DolibarrApi
 	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
 	 * @return  array                       Array of order objects
 	 */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
 		global $db, $conf;
 
 		$obj_ret = array();
@@ -190,7 +190,7 @@ class Proposals extends DolibarrApi
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-		$sql .= $db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
 			if ($page < 0)
 			{
@@ -198,21 +198,21 @@ class Proposals extends DolibarrApi
 			}
 			$offset = $limit * $page;
 
-			$sql .= $db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
-        dol_syslog("API Rest request");
-		$result = $db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
 		if ($result)
 		{
-			$num = $db->num_rows($result);
+			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
 			while ($i < $min)
 			{
-				$obj = $db->fetch_object($result);
-				$proposal_static = new Propal($db);
+				$obj = $this->db->fetch_object($result);
+				$proposal_static = new Propal($this->db);
 				if ($proposal_static->fetch($obj->rowid)) {
 					// Add external contacts ids
 					$proposal_static->contacts_ids = $proposal_static->liste_contact(-1, 'external', 1);
@@ -220,9 +220,8 @@ class Proposals extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
-			throw new RestException(503, 'Error when retrieve propal list : '.$db->lasterror());
+		} else {
+			throw new RestException(503, 'Error when retrieve propal list : '.$this->db->lasterror());
 		}
 		if (!count($obj_ret)) {
 			throw new RestException(404, 'No proposal found');
@@ -236,13 +235,13 @@ class Proposals extends DolibarrApi
 	 * @param   array   $request_data   Request data
 	 * @return  int     ID of proposal
 	 */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
 			$this->propal->$field = $value;
@@ -259,7 +258,7 @@ class Proposals extends DolibarrApi
 		}
 
 		return $this->propal->id;
-    }
+	}
 
 	/**
 	 * Get lines of a commercial proposal
@@ -270,26 +269,26 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 */
-    public function getLines($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->lire) {
-            throw new RestException(401);
-        }
+	public function getLines($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->lire) {
+			throw new RestException(401);
+		}
 
-	    $result = $this->propal->fetch($id);
-	    if (!$result) {
-		    throw new RestException(404, 'Commercial Proposal not found');
-	    }
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-		    throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-	    }
-	    $this->propal->getLinesArray();
-	    $result = array();
-	    foreach ($this->propal->lines as $line) {
-		    array_push($result, $this->_cleanObjectDatas($line));
-	    }
-	    return $result;
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->propal->getLinesArray();
+		$result = array();
+		foreach ($this->propal->lines as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
 	}
 
 	/**
@@ -310,50 +309,50 @@ class Proposals extends DolibarrApi
 
 		$result = $this->propal->fetch($id);
 		if (!$result) {
-		    throw new RestException(404, 'Commercial Proposal not found');
+			throw new RestException(404, 'Commercial Proposal not found');
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $request_data = (object) $request_data;
+		$request_data = (object) $request_data;
 
-        $updateRes = $this->propal->addline(
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        $request_data->fk_product,
-                        $request_data->remise_percent,
-                        'HT',
-                        0,
-                        $request_data->info_bits,
-                        $request_data->product_type,
-                        $request_data->rang,
-                        $request_data->special_code,
-      					$request_data->fk_parent_line,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $request_data->origin,
-                        $request_data->origin_id,
-                        $request_data->multicurrency_subprice,
-                        $request_data->fk_remise_except
-        );
+		$updateRes = $this->propal->addline(
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						$request_data->fk_product,
+						$request_data->remise_percent,
+						'HT',
+						0,
+						$request_data->info_bits,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+	  					$request_data->fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$request_data->origin,
+						$request_data->origin_id,
+						$request_data->multicurrency_subprice,
+						$request_data->fk_remise_except
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
-        } else {
-            throw new RestException(400, $this->propal->error);
-        }
-    }
+		if ($updateRes > 0) {
+			return $updateRes;
+		} else {
+			throw new RestException(400, $this->propal->error);
+		}
+	}
 
 	/**
 	 * Update a line of given commercial proposal
@@ -389,37 +388,37 @@ class Proposals extends DolibarrApi
 	  		throw new RestException(404, 'Proposal line not found');
 	  	}
 
-        $updateRes = $this->propal->updateline(
-            $lineid,
-            isset($request_data->subprice) ? $request_data->subprice : $propalline->subprice,
-            isset($request_data->qty) ? $request_data->qty : $propalline->qty,
-            isset($request_data->remise_percent) ? $request_data->remise_percent : $propalline->remise_percent,
-            isset($request_data->tva_tx) ? $request_data->tva_tx : $propalline->tva_tx,
-            isset($request_data->localtax1_tx) ? $request_data->localtax1_tx : $propalline->localtax1_tx,
-            isset($request_data->localtax2_tx) ? $request_data->localtax2_tx : $propalline->localtax2_tx,
-            isset($request_data->desc) ? $request_data->desc : $propalline->desc,
-            'HT',
-            isset($request_data->info_bits) ? $request_data->info_bits : $propalline->info_bits,
-            isset($request_data->special_code) ? $request_data->special_code : $propalline->special_code,
-            isset($request_data->fk_parent_line) ? $request_data->fk_parent_line : $propalline->fk_parent_line,
-            0,
-            isset($request_data->fk_fournprice) ? $request_data->fk_fournprice : $propalline->fk_fournprice,
-            isset($request_data->pa_ht) ? $request_data->pa_ht : $propalline->pa_ht,
-            isset($request_data->label) ? $request_data->label : $propalline->label,
-            isset($request_data->product_type) ? $request_data->product_type : $propalline->product_type,
-            isset($request_data->date_start) ? $request_data->date_start : $propalline->date_start,
-            isset($request_data->date_end) ? $request_data->date_end : $propalline->date_end,
-            isset($request_data->array_options) ? $request_data->array_options : $propalline->array_options,
-            isset($request_data->fk_unit) ? $request_data->fk_unit : $propalline->fk_unit,
-            isset($request_data->multicurrency_subprice) ? $request_data->multicurrency_subprice : $propalline->subprice
-        );
+		$updateRes = $this->propal->updateline(
+			$lineid,
+			isset($request_data->subprice) ? $request_data->subprice : $propalline->subprice,
+			isset($request_data->qty) ? $request_data->qty : $propalline->qty,
+			isset($request_data->remise_percent) ? $request_data->remise_percent : $propalline->remise_percent,
+			isset($request_data->tva_tx) ? $request_data->tva_tx : $propalline->tva_tx,
+			isset($request_data->localtax1_tx) ? $request_data->localtax1_tx : $propalline->localtax1_tx,
+			isset($request_data->localtax2_tx) ? $request_data->localtax2_tx : $propalline->localtax2_tx,
+			isset($request_data->desc) ? $request_data->desc : $propalline->desc,
+			'HT',
+			isset($request_data->info_bits) ? $request_data->info_bits : $propalline->info_bits,
+			isset($request_data->special_code) ? $request_data->special_code : $propalline->special_code,
+			isset($request_data->fk_parent_line) ? $request_data->fk_parent_line : $propalline->fk_parent_line,
+			0,
+			isset($request_data->fk_fournprice) ? $request_data->fk_fournprice : $propalline->fk_fournprice,
+			isset($request_data->pa_ht) ? $request_data->pa_ht : $propalline->pa_ht,
+			isset($request_data->label) ? $request_data->label : $propalline->label,
+			isset($request_data->product_type) ? $request_data->product_type : $propalline->product_type,
+			isset($request_data->date_start) ? $request_data->date_start : $propalline->date_start,
+			isset($request_data->date_end) ? $request_data->date_end : $propalline->date_end,
+			isset($request_data->array_options) ? $request_data->array_options : $propalline->array_options,
+			isset($request_data->fk_unit) ? $request_data->fk_unit : $propalline->fk_unit,
+			isset($request_data->multicurrency_subprice) ? $request_data->multicurrency_subprice : $propalline->subprice
+		);
 
-	    if ($updateRes > 0) {
-		    $result = $this->get($id);
-		    unset($result->line);
-		    return $this->_cleanObjectDatas($result);
-	    }
-	    return false;
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
 	}
 
 	/**
@@ -433,13 +432,13 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 *
-     * @throws RestException 401
-     * @throws RestException 404
+	 * @throws RestException 401
+	 * @throws RestException 404
 	 */
-    public function deleteLine($id, $lineid)
-    {
+	public function deleteLine($id, $lineid)
+	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
+			throw new RestException(401);
 		}
 
 		$result = $this->propal->fetch($id);
@@ -456,14 +455,12 @@ class Proposals extends DolibarrApi
 		$updateRes = $this->propal->deleteline($lineid);
 		if ($updateRes > 0) {
 			return $this->get($id);
-		}
-		else
-		{
+		} else {
 			throw new RestException(405, $this->propal->error);
 		}
 	}
 
-    /**
+	/**
 	 * Add a contact type of given commercial proposal
 	 *
 	 * @param int    $id             Id of commercial proposal to update
@@ -474,76 +471,83 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 *
-     * @throws RestException 401
-     * @throws RestException 404
+	 * @throws RestException 401
+	 * @throws RestException 404
 	 */
-    public function postContact($id, $contactid, $type)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
+	public function postContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->propal->fetch($id);
+		$result = $this->propal->fetch($id);
 
 		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-        if (!in_array($type, array('BILLING', 'SHIPPING', 'CUSTOMER'), true)) {
-            throw new RestException(500, 'Availables types: BILLING, SHIPPING OR CUSTOMER');
-        }
+		if (!in_array($type, array('BILLING', 'SHIPPING', 'CUSTOMER'), true)) {
+			throw new RestException(500, 'Availables types: BILLING, SHIPPING OR CUSTOMER');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->propal->add_contact($contactid, $type, 'external');
+		$result = $this->propal->add_contact($contactid, $type, 'external');
 
-        if (!$result) {
-            throw new RestException(500, 'Error when added the contact');
-        }
+		if (!$result) {
+			throw new RestException(500, 'Error when added the contact');
+		}
 
-        return $this->propal;
-    }
+		return $this->propal;
+	}
 
-     /**
-	 * Delete a contact type of given commercial proposal
-	 *
-	 * @param int    $id             Id of commercial proposal to update
-	 * @param int    $rowid          Row key of the contact in the array contact_ids.
-	 *
-	 * @url	DELETE {id}/contact/{rowid}
-	 *
-	 * @return int
-	 *
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-	 */
-    public function deleteContact($id, $rowid)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
+	 /**
+	  * Delete a contact type of given commercial proposal
+	  *
+	  * @param int    $id             Id of commercial proposal to update
+	  * @param int    $contactid      Row key of the contact in the array contact_ids.
+	  * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
+	  *
+	  * @url	DELETE {id}/contact/{contactid}/{type}
+	  *
+	  * @return int
+	  *
+	  * @throws RestException 401
+	  * @throws RestException 404
+	  * @throws RestException 500
+	  */
+	public function deleteContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->propal->fetch($id);
+		$result = $this->propal->fetch($id);
 
 		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->propal->delete_contact($rowid);
+		$contacts = $this->invoice->liste_contact();
 
-        if (!$result) {
-            throw new RestException(500, 'Error when deleted the contact');
-        }
+		foreach ($contacts as $contact) {
+			if ($contact['id'] == $contactid && $contact['code'] == $type) {
+				$result = $this->propal->delete_contact($contact['rowid']);
 
-        return $this->propal;
-    }
+				if (!$result) {
+					throw new RestException(500, 'Error when deleted the contact');
+				}
+			}
+		}
+
+		return $this->_cleanObjectDatas($this->propal);
+	}
 
 	/**
 	 * Update commercial proposal general fields (won't touch lines of commercial proposal)
@@ -552,12 +556,12 @@ class Proposals extends DolibarrApi
 	 * @param array $request_data   Datas
 	 *
 	 * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
 
 		$result = $this->propal->fetch($id);
 		if (!$result) {
@@ -588,9 +592,7 @@ class Proposals extends DolibarrApi
 		if ($this->propal->update(DolibarrApiAccess::$user) > 0)
 		{
 			return $this->get($id);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500, $this->propal->error);
 		}
 	}
@@ -629,14 +631,14 @@ class Proposals extends DolibarrApi
 	}
 
 	/**
-	* Set a proposal to draft
-	*
-	* @param   int     $id             Order ID
-	*
-	* @url POST    {id}/settodraft
-	*
-	* @return  array
-	*/
+	 * Set a proposal to draft
+	 *
+	 * @param   int     $id             Order ID
+	 *
+	 * @url POST    {id}/settodraft
+	 *
+	 * @return  array
+	 */
 	public function settodraft($id)
 	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
@@ -688,14 +690,14 @@ class Proposals extends DolibarrApi
 	 * @url POST    {id}/validate
 	 *
 	 * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     *
-     * @return array
-     */
-    public function validate($id, $notrigger = 0)
-    {
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 * @return array
+	 */
+	public function validate($id, $notrigger = 0)
+	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
 			throw new RestException(401);
 		}
@@ -716,19 +718,19 @@ class Proposals extends DolibarrApi
 			throw new RestException(500, 'Error when validating Commercial Proposal: '.$this->propal->error);
 		}
 
-        $result = $this->propal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Commercial Proposal not found');
-        }
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->propal->fetchObjectLinked();
+		$this->propal->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->propal);
-    }
+		return $this->_cleanObjectDatas($this->propal);
+	}
 
 	/**
 	 * Close (Accept or refuse) a quote / commercial proposal
@@ -778,47 +780,47 @@ class Proposals extends DolibarrApi
 		return $this->_cleanObjectDatas($this->propal);
 	}
 
-    /**
-     * Set a commercial proposal billed. Could be also called setbilled
-     *
-     * @param   int     $id             Commercial proposal ID
-     *
-     * @url POST    {id}/setinvoiced
-     *
-     * @return  array
-     */
-    public function setinvoiced($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->propal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Commercial Proposal not found');
-        }
+	/**
+	 * Set a commercial proposal billed. Could be also called setbilled
+	 *
+	 * @param   int     $id             Commercial proposal ID
+	 *
+	 * @url POST    {id}/setinvoiced
+	 *
+	 * @return  array
+	 */
+	public function setinvoiced($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->propal->classifyBilled(DolibarrApiAccess::$user);
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->propal->error);
-        }
+		$result = $this->propal->classifyBilled(DolibarrApiAccess::$user);
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->propal->error);
+		}
 
-        $result = $this->propal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Proposal not found');
-        }
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->propal->fetchObjectLinked();
+		$this->propal->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->propal);
-    }
+		return $this->_cleanObjectDatas($this->propal);
+	}
 
 
 	/**
@@ -840,25 +842,25 @@ class Proposals extends DolibarrApi
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->address);
+		unset($object->note);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->address);
 
-        return $object;
-    }
+		return $object;
+	}
 }
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c6d6f18e109..7e34ac6fc3c 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -41,12 +41,15 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 
 /**
  *	Class to manage proposals
  */
 class Propal extends CommonObject
 {
+	use CommonIncoterm;
+
 	/**
 	 * @var string ID to identify managed object
 	 */
@@ -390,9 +393,7 @@ class Propal extends CommonObject
 			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
 			{
 				$price = $prod->multiprices[$this->thirdparty->price_level];
-			}
-			else
-			{
+			} else {
 				$price = $prod->price;
 			}
 
@@ -473,22 +474,16 @@ class Propal extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $line->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -561,9 +556,7 @@ class Propal extends CommonObject
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -715,23 +708,17 @@ class Propal extends CommonObject
                 {
                     $this->db->commit();
                     return $this->line->id;
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->error();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $this->line->error;
                 $this->db->rollback();
                 return -2;
             }
-        }
-		else
-		{
+        } else {
 			dol_syslog(get_class($this)."::addline status of proposal must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -741,15 +728,15 @@ class Propal extends CommonObject
 	/**
 	 *  Update a proposal line
 	 *
-	 *  @param      int			$rowid           	Id de la ligne
-	 *  @param      float		$pu		     	  	Prix unitaire (HT ou TTC selon price_base_type)
+	 *  @param      int			$rowid           	Id of line
+	 *  @param      float		$pu		     	  	Unit price (HT or TTC depending on price_base_type)
 	 *  @param      float		$qty            	Quantity
-	 *  @param      float		$remise_percent  	Remise effectuee sur le produit
-	 *  @param      float		$txtva	          	Taux de TVA
+	 *  @param      float		$remise_percent  	Discount on line
+	 *  @param      float		$txtva	          	VAT Rate (Can be '1.23' or '1.23 (ABC)')
 	 * 	@param	  	float		$txlocaltax1		Local tax 1 rate
 	 *  @param	  	float		$txlocaltax2		Local tax 2 rate
 	 *  @param      string		$desc            	Description
-	 *	@param	  	string		$price_base_type	HT ou TTC
+	 *	@param	  	string		$price_base_type	HT or TTC
 	 *	@param      int			$info_bits        	Miscellaneous informations
 	 *	@param		int			$special_code		Special code (also used by externals modules!)
 	 * 	@param		int			$fk_parent_line		Id of parent line (0 in most cases, used by modules adding sublevels into lines).
@@ -841,7 +828,6 @@ class Propal extends CommonObject
 			//Fetch current line from the database and then clone the object and set it in $oldline property
 			$line = new PropaleLigne($this->db);
 			$line->fetch($rowid);
-			$line->fetch_optionals();
 
 			$staticline = clone $line;
 
@@ -917,17 +903,13 @@ class Propal extends CommonObject
 
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::updateline Erreur -2 Propal en mode incompatible pour cette action");
 			return -2;
 		}
@@ -959,15 +941,11 @@ class Propal extends CommonObject
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -1083,10 +1061,10 @@ class Propal extends CommonObject
 		$sql .= ", '".$this->db->idate($this->date)."'";
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", '(PROV)'";
-		$sql .= ", ".($user->id > 0 ? "'".$user->id."'" : "NULL");
+		$sql .= ", ".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "NULL");
 		$sql .= ", '".$this->db->escape($this->note_private)."'";
 		$sql .= ", '".$this->db->escape($this->note_public)."'";
-		$sql .= ", '".$this->db->escape($this->modelpdf)."'";
+		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
 		$sql .= ", ".($this->fin_validite != '' ? "'".$this->db->idate($this->fin_validite)."'" : "NULL");
 		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
 		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
@@ -1141,8 +1119,7 @@ class Propal extends CommonObject
                 					$error++;
                 				}
                 			}
-                		}
-                		else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+                		} 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);
@@ -1169,9 +1146,7 @@ class Propal extends CommonObject
                         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
-                        {
+                        } else {
                             $line = $this->lines[$i];
                         }
 						// Reset fk_parent_line for line that are not child lines or special product
@@ -1267,16 +1242,12 @@ class Propal extends CommonObject
 							if ($result < 0) { $error++; }
 							// End call triggers
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror();
 						$error++;
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -1286,15 +1257,11 @@ class Propal extends CommonObject
 				$this->db->commit();
 				dol_syslog(get_class($this)."::create done id=".$this->id);
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1375,9 +1342,7 @@ class Propal extends CommonObject
 			$object->ref_client = '';
 
 			// TODO Change product price if multi-prices
-		}
-		else
-		{
+		} else {
 		    $objsoc->fetch($object->socid);
 		}
 
@@ -1446,9 +1411,7 @@ class Propal extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1502,8 +1465,7 @@ class Propal extends CommonObject
 		if ($ref) {
 			$sql .= " WHERE p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
 			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
-		}
-		else $sql .= " WHERE p.rowid=".$rowid;
+		} else $sql .= " WHERE p.rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1534,7 +1496,8 @@ class Propal extends CommonObject
 				$this->fk_project = $obj->fk_project;
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
-				$this->modelpdf             = $obj->model_pdf;
+				$this->model_pdf            = $obj->model_pdf;
+				$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;
@@ -1615,9 +1578,7 @@ class Propal extends CommonObject
 
 			$this->error = "Record Not Found";
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1641,7 +1602,7 @@ class Propal extends CommonObject
 		if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
 		if (isset($this->note) || isset($this->note_private)) $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
 		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
+		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
 		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 		if (!empty($this->duree_validite)) $this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
 
@@ -1711,9 +1672,7 @@ class Propal extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1841,9 +1800,7 @@ class Propal extends CommonObject
 			$this->db->free($result);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -3;
 		}
@@ -1891,9 +1848,7 @@ class Propal extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($soc);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -1966,9 +1921,7 @@ class Propal extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2030,9 +1983,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2092,9 +2043,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2154,9 +2103,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2217,9 +2164,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2228,9 +2173,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2290,9 +2233,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2301,9 +2242,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2359,9 +2298,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2370,9 +2307,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -2429,9 +2364,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2497,9 +2430,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2565,9 +2496,7 @@ class Propal extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -2578,12 +2507,12 @@ class Propal extends CommonObject
 	 *	Close the commercial proposal
 	 *
 	 *	@param      User	$user		Object user that close
-	 *	@param      int		$statut		Statut
+	 *	@param      int		$status		Status
 	 *	@param      string	$note		Complete private note with this note
 	 *  @param		int		$notrigger	1=Does not execute triggers, 0=Execute triggers
 	 *	@return     int         		<0 if KO, >0 if OK
 	 */
-    public function cloture($user, $statut, $note = "", $notrigger = 0)
+    public function cloture($user, $status, $note = "", $notrigger = 0)
 	{
 		global $langs, $conf;
 
@@ -2595,19 +2524,19 @@ class Propal extends CommonObject
 		$newprivatenote = dol_concatdesc($this->note_private, $note);
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-		$sql .= " SET fk_statut = ".$statut.", note_private = '".$this->db->escape($newprivatenote)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
+		$sql .= " SET fk_statut = ".$status.", note_private = '".$this->db->escape($newprivatenote)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
+			$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->model_pdf;
 			$triggerName = 'PROPAL_CLOSE_REFUSED';
 
-			if ($statut == self::STATUS_SIGNED)
+			if ($status == self::STATUS_SIGNED)
 			{
 				$triggerName = 'PROPAL_CLOSE_SIGNED';
-				$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
+				$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->model_pdf;
 
 				// The connected company is classified as a client
 				$soc = new Societe($this->db);
@@ -2621,7 +2550,7 @@ class Propal extends CommonObject
 					return -2;
 				}
 			}
-			if ($statut == self::STATUS_BILLED)	// Why this ?
+			if ($status == self::STATUS_BILLED)	// ->cloture() can also be called when we set it to billed, after setting it to signed
 			{
 				$triggerName = 'PROPAL_CLASSIFY_BILLED';
 			}
@@ -2643,7 +2572,7 @@ class Propal extends CommonObject
 			if (!$error)
 			{
 				$this->oldcopy = clone $this;
-				$this->statut = $statut;
+				$this->statut = $status;
 				$this->date_cloture = $now;
 				$this->note_private = $newprivatenote;
 			}
@@ -2660,9 +2589,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->statut = $this->oldcopy->statut;
 				$this->date_cloture = $this->oldcopy->date_cloture;
 				$this->note_private = $this->oldcopy->note_private;
@@ -2670,9 +2597,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2721,9 +2646,7 @@ class Propal extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2788,9 +2711,7 @@ class Propal extends CommonObject
 
 		    $this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2856,13 +2777,10 @@ class Propal extends CommonObject
 					if ($shortlist == 1)
 					{
 						$ga[$obj->propalid] = $obj->ref;
-					}
-					elseif ($shortlist == 2)
+					} elseif ($shortlist == 2)
 					{
 						$ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else
-					{
+					} else {
 						$ga[$i]['id'] = $obj->propalid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -2872,9 +2790,7 @@ class Propal extends CommonObject
 				}
 			}
 			return $ga;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2914,10 +2830,8 @@ class Propal extends CommonObject
 				if ($objecttype == 'facture')
 				{
 					$linkedInvoices[] = $object;
-				}
-				// Cas des factures liees par un autre objet (ex: commande)
-				else
-				{
+				} // Cas des factures liees par un autre objet (ex: commande)
+				else {
 					$this->fetchObjectLinked($object, $objecttype);
 					foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid)
 					{
@@ -2968,13 +2882,10 @@ class Propal extends CommonObject
 					}
 				}
 				return $ga;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else return $ga;
+		} else return $ga;
 	}
 
 	/**
@@ -3074,30 +2985,22 @@ class Propal extends CommonObject
 						dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
 						$this->db->commit();
 						return 1;
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror();
 						$this->db->rollback();
 						return 0;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -3151,9 +3054,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3162,9 +3063,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -3223,9 +3122,7 @@ class Propal extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3234,9 +3131,7 @@ class Propal extends CommonObject
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Propal status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -3293,9 +3188,7 @@ class Propal extends CommonObject
 				}
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3430,9 +3323,7 @@ class Propal extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -3456,6 +3347,8 @@ class Propal extends CommonObject
 		$sql = "SELECT rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= $this->db->plimit(100);
+
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3510,9 +3403,7 @@ class Propal extends CommonObject
 				$line->total_ttc = 60;
 				$line->total_tva = 10;
 				$line->remise_percent = 50;
-			}
-			else
-			{
+			} else {
 				$line->total_ht = 100;
 				$line->total_ttc = 120;
 				$line->total_tva = 20;
@@ -3571,9 +3462,7 @@ class Propal extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -3623,16 +3512,12 @@ class Propal extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($db,"Propale::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Proposal"));
 			return "";
@@ -3662,7 +3547,7 @@ class Propal extends CommonObject
 
 		if ($user->rights->propal->lire)
 		{
-			$label = '<u>'.$langs->trans("Proposal").'</u>';
+			$label = img_picto('', $this->picto).' <u>'.$langs->trans("Proposal").'</u>';
 			if (!empty($this->ref))
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 			if (!empty($this->ref_client))
@@ -3680,14 +3565,11 @@ class Propal extends CommonObject
 
 			if ($option == '') {
 				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
-			}
-			elseif ($option == 'compta') {  // deprecated
+			} elseif ($option == 'compta') {  // deprecated
 				$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$this->id.$get_params;
-			}
-			elseif ($option == 'expedition') {
+			} elseif ($option == 'expedition') {
 				$url = DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id.$get_params;
-			}
-			elseif ($option == 'document') {
+			} elseif ($option == 'document') {
 				$url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id.$get_params;
 			}
 
@@ -3795,8 +3677,8 @@ class Propal extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'azur';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->PROPALE_ADDON_PDF)) {
 				$modele = $conf->global->PROPALE_ADDON_PDF;
 			}
@@ -4036,14 +3918,10 @@ class PropaleLigne extends CommonObjectLine
 				$this->db->free($result);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -4092,9 +3970,7 @@ class PropaleLigne extends CommonObjectLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4181,9 +4057,7 @@ class PropaleLigne extends CommonObjectLine
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -4235,9 +4109,7 @@ class PropaleLigne extends CommonObjectLine
 			$this->db->commit();
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -4258,6 +4130,8 @@ 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;
+
 		// Clean parameters
 		if (empty($this->tva_tx)) $this->tva_tx = 0;
 		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
@@ -4284,9 +4158,7 @@ class PropaleLigne extends CommonObjectLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4333,7 +4205,7 @@ class PropaleLigne extends CommonObjectLine
 		$sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
 		$sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-		$sql .= " WHERE rowid = ".$this->rowid;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -4341,7 +4213,6 @@ class PropaleLigne extends CommonObjectLine
 		{
 			if (!$error)
 			{
-				$this->id = $this->rowid;
 				$result = $this->insertExtraFields();
 				if ($result < 0)
 				{
@@ -4363,9 +4234,7 @@ class PropaleLigne extends CommonObjectLine
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4398,9 +4267,7 @@ class PropaleLigne extends CommonObjectLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index da86625b78f..16be5930e89 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('facture', 'orders', 'sendings', 'companies'));
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -55,8 +55,7 @@ if ($id > 0 || !empty($ref))
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
 		$error++;
-	}
-	elseif ($ret < 0)
+	} elseif ($ret < 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$error++;
@@ -65,9 +64,7 @@ if ($id > 0 || !empty($ref))
 if (!$error)
 {
 	$object->fetch_thirdparty();
-}
-else
-{
+} else {
 	header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');
 	exit;
 }
@@ -89,31 +86,23 @@ if ($action == 'addcontact' && $user->rights->propale->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-
-// Toggle the status of a contact
+} // Toggle the status of a contact
 elseif ($action == 'swapstatut' && $user->rights->propale->creer)
 {
 	if ($object->id > 0)
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-}
-
-// Deletes a contact
+} // Deletes a contact
 elseif ($action == 'deletecontact' && $user->rights->propale->creer)
 {
 	$result = $object->delete_contact($lineid);
@@ -122,9 +111,7 @@ elseif ($action == 'deletecontact' && $user->rights->propale->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index d9d12c5efb4..70c67566091 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -179,9 +179,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->propal->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index a320d2b83b9..692f561867a 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
+/* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2019		Nicolas ZABOURI			<info@inovea-conseil.com>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,22 +20,12 @@
  */
 
 /**
- *	\file       htdocs/comm/propal/index.php
- *	\ingroup    propal
- *	\brief      Home page of proposal area
+ *	\file		htdocs/comm/propal/index.php
+ *	\ingroup	propal
+ *	\brief	Home page of proposal area
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-
-$hookmanager = new HookManager($db);
-
-// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
-$hookmanager->initHooks(array('proposalindex'));
-
-// Load translation files required by the page
-$langs->loadLangs(array('propal', 'companies'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
@@ -43,13 +34,24 @@ if (isset($user->socid) && $user->socid > 0)
 	$action = '';
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'propal');
+restrictedArea($user, 'propal');
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('proposalindex'));
+
+// Load translation files required by the page
+$langs->loadLangs(array('propal', 'companies'));
+
+$now = dol_now();
+$max = 5;
 
 /*
  * View
  */
-$now = dol_now();
 $propalstatic = new Propal($db);
 $companystatic = new Societe($db);
 $form = new Form($db);
@@ -60,195 +62,218 @@ llxHeader("", $langs->trans("ProspectionArea"), $help_url);
 
 print load_fiche_titre($langs->trans("ProspectionArea"), '', 'propal');
 
-//print '<table width="100%" class="notopnoleftnoright">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
-print '<div class="fichecenter"><div class="fichethirdleft">';
+print '<div class="fichecenter">';
+print '<div class="fichethirdleft">';
 
-
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+// This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))
 {
-    print '<form method="post" action="'.DOL_URL_ROOT.'/comm/propal/list.php">';
-    print '<div class="div-table-responsive-no-min">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    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("Proposal").':</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="'.DOL_URL_ROOT.'/comm/propal/list.php">';
+	print '<div class="div-table-responsive-no-min">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<table class="noborder nohover centpercent">';
 
+	print '<tr class="liste_titre">';
+	print '<td colspan="3">'.$langs->trans("Search").'</td>';
+	print '</tr>';
+
+	print '<tr class="oddeven">';
+	print '<td>'.$langs->trans("Proposal").':</td>';
+	print '<td><input type="text" class="flat" name="sall" size=18></td>';
+	print '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+	print '</tr>';
+
+	print '</table>';
+	print '</div>';
+	print '</form>';
+	print '<br>';
+}
 
 /*
  * Statistics
  */
+$listofstatus = array(Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED);
 
 $sql = "SELECT count(p.rowid) as nb, p.fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."propal as p";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE p.fk_soc = s.rowid";
-$sql .= " AND p.entity IN (".getEntity('propal').")";
+$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
+$sql .= " AND p.fk_soc = s.rowid";
 if ($user->socid) $sql .= ' AND p.fk_soc = '.$user->socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-$sql .= " AND p.fk_statut IN (0,1,2,3,4)";
+$sql .= " AND p.fk_statut IN (".implode(" ,", $listofstatus).")";
 $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();
 
-    $total = 0;
-    $totalinprocess = 0;
-    $dataseries = array();
-    $colorseries = array();
-    $vals = array();
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($resql);
+		if ($obj)
+		{
+			$vals[$obj->status] = $obj->nb;
+			$totalinprocess += $obj->nb;
 
-    // -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)
-    {
-        $obj = $db->fetch_object($resql);
-        if ($obj)
-        {
-            $vals[$obj->status] = $obj->nb;
-            $totalinprocess += $obj->nb;
+			$total += $obj->nb;
+		}
+		$i++;
+	}
+	$db->free($resql);
 
-            $total += $obj->nb;
-        }
-        $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 '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder nohover centpercent">';
-    print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Proposals").'</td></tr>'."\n";
-    $listofstatus = array(0, 1, 2, 3, 4);
-    foreach ($listofstatus as $status)
-    {
-    	$dataseries[] = array($propalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-    	if ($status == Propal::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-    	if ($status == Propal::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-    	if ($status == Propal::STATUS_SIGNED) $colorseries[$status] = $badgeStatus4;
-    	if ($status == Propal::STATUS_NOTSIGNED) $colorseries[$status] = $badgeStatus9;
-    	if ($status == Propal::STATUS_BILLED) $colorseries[$status] = $badgeStatus6;
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Proposals").'</td>';
+	print '</tr>';
 
-        if (empty($conf->use_javascript_ajax))
-        {
-            print '<tr class="oddeven">';
-            print '<td>'.$propalstatic->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 align="center" colspan="2">';
+	foreach ($listofstatus as $status) {
+		$dataseries[] = array($propalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+		if ($status == Propal::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+		if ($status == Propal::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+		if ($status == Propal::STATUS_SIGNED) $colorseries[$status] = $badgeStatus4;
+		if ($status == Propal::STATUS_NOTSIGNED) $colorseries[$status] = $badgeStatus9;
+		if ($status == Propal::STATUS_BILLED) $colorseries[$status] = $badgeStatus6;
 
-        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('idgraphthirdparties');
-        print $dolgraph->show($total ? 0 : 1);
+		if (empty($conf->use_javascript_ajax)) {
+			print '<tr class="oddeven">';
+			print '<td>'.$propalstatic->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";
+		}
+	}
 
-        print '</td></tr>';
-    }
-    //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);
+	if ($conf->use_javascript_ajax)	{
+		print '<tr>';
+		print '<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('idgraphthirdparties');
+		print $dolgraph->show($total ? 0 : 1);
+
+		print '</td>';
+		print '</tr>';
+	}
+
+	//if ($totalinprocess != $total)
+	//{
+	//	print '<tr class="liste_total">';
+	//	print '<td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td>';
+	//	print '<td class="right">'.$totalinprocess.'</td>';
+	//	print '</tr>';
+	//}
+
+	print '<tr class="liste_total">';
+	print '<td>'.$langs->trans("Total").'</td>';
+	print '<td class="right">'.$total.'</td>';
+	print '</tr>';
+
+	print '</table>';
+	print '</div>';
+	print '<br>';
+} else {
+	dol_print_error($db);
 }
 
 
 /*
  * Draft proposals
  */
-if (!empty($conf->propal->enabled))
-{
-	$sql = "SELECT c.rowid, c.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client";
-	$sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
+if (!empty($conf->propal->enabled)) {
+	$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";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE c.fk_soc = s.rowid";
-	$sql .= " AND c.entity IN (".getEntity('propal').")";
-	$sql .= " AND c.fk_statut = 0";
-	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+	$sql .= " WHERE p.entity IN (".getEntity($propalstatic->element).")";
+	$sql .= " AND p.fk_soc = s.rowid";
+	$sql .= " AND p.fk_statut =".Propal::STATUS_DRAFT;
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) $sql .= " AND p.fk_soc = ".$socid;
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
-		if ($num)
-		{
-			print '<div class="div-table-responsive-no-min">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre">';
-			$langs->load("propal");
-			print '<td colspan="2">'.$langs->trans("DraftPropals").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?search_status=0"><span class="badge">'.$num.'</span></a></td></tr>';
+		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		startSimpleTable("DraftPropals", "comm/propal/list.php", "search_status=".Propal::STATUS_DRAFT, 2, $num);
 
+		if ($num) {
+			$total = 0;
 			$i = 0;
-			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-			{
+
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
-				print '<tr class="oddeven">';
 
 				$propalstatic->id = $obj->rowid;
 				$propalstatic->ref = $obj->ref;
-				print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';
+				$propalstatic->ref_client = $obj->ref_client;
+				$propalstatic->total_ht = $obj->total_ht;
+				$propalstatic->total_tva = $obj->total_tva;
+				$propalstatic->total_ttc = $obj->total_ttc;
 
 				$companystatic->id = $obj->socid;
-				$companystatic->name = $obj->socname;
+				$companystatic->name = $obj->name;
 				$companystatic->client = $obj->client;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
 				$companystatic->canvas = $obj->canvas;
-				print '<td>'.$companystatic->getNomUrl(1, 'customer', 24).'</td>';
+				$companystatic->entity = $obj->entity;
+				$companystatic->email = $obj->email;
+				$companystatic->code_compta = $obj->code_compta;
 
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 16).'</td>';
+				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
+
 				$i++;
+				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
 			}
-			if ($num > $nbofloop)
-			{
-				print '<tr class="liste_total"><td colspan="2" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
-			{
-				print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td></tr>";
-			}
-			print "</table>";
-			print "</div><br>";
 		}
+
+		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
+		finishSimpleTable(true);
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
 	}
 }
 
+print '</div>';
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
-print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
-
-
-$max = 5;
+print '<div class="fichetwothirdright">';
+print '<div class="ficheaddleft">';
 
 /*
  * Last modified proposals
  */
 
-$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
-$sql .= " date_cloture as datec";
+$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, date_cloture as datec";
+$sql .= ", s.nom as socname, s.rowid as socid, s.canvas, s.client";
 $sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE c.fk_soc = s.rowid";
-$sql .= " AND c.entity IN (".getEntity('propal').")";
+$sql .= " WHERE c.entity IN (".getEntity($propalstatic->element).")";
+$sql .= " AND c.fk_soc = s.rowid";
 //$sql.= " AND c.fk_statut > 2";
 if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -256,155 +281,127 @@ $sql .= " ORDER BY c.tms DESC";
 $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 '<td colspan="4">'.$langs->trans("LastModifiedProposals", $max).'</td></tr>';
-
+if ($resql) {
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
-		$i = 0;
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
+	startSimpleTable($langs->trans("LastModifiedProposals", $max), "", "", 3);
 
-			print '<tr class="oddeven">';
-			print '<td width="20%" class="nowrap">';
+	if ($num) {
+		$i = 0;
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
 
 			$propalstatic->id = $obj->rowid;
 			$propalstatic->ref = $obj->ref;
 
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			print '<td width="96" class="nobordernopadding nowrap">';
-			print $propalstatic->getNomUrl(1);
-			print '</td>';
-
-			print '<td width="16" class="nobordernopadding nowrap">';
-			print '&nbsp;';
-			print '</td>';
-
-			print '<td width="16" class="nobordernopadding right">';
-			$filename = dol_sanitizeFileName($obj->ref);
-			$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-			print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
-			print '</td></tr></table>';
-
-			print '</td>';
-
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->socname;
 			$companystatic->client = $obj->client;
 			$companystatic->canvas = $obj->canvas;
-			print '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
 
-			print '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
+			$filename = dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
 
-			print '<td class="right">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
+			print '<tr class="oddeven">';
+
+			print '<td width="20%" class="nowrap">';
+			print '<table class="nobordernopadding">';
+			print '<tr class="nocellnopadd">';
+			print '<td width="96" class="nobordernopadding nowrap">'.$propalstatic->getNomUrl(1).'</td>';
+			print '<td width="16" class="nobordernopadding nowrap"></td>';
+			print '<td width="16" class="nobordernopadding right">'.$formfile->getDocumentsLink($propalstatic->element, $filename, $filedir).'</td>';
 			print '</tr>';
+			print '</table>';
+			print '</td>';
+
+			print '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
+			print '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
+			print '<td class="right">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
+
+			print '</tr>';
+
 			$i++;
 		}
 	}
-	print "</table>";
-	print "</div><br>";
+
+	finishSimpleTable(true);
+	$db->free($resql);
+} else {
+	dol_print_error($db);
 }
-else dol_print_error($db);
 
 
 /*
- * Open proposals
+ * Open (validated) proposals
  */
-if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
-{
-	$langs->load("propal");
-
-	$now = dol_now();
-
+if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
 	$sql .= ", p.rowid as propalid, p.entity, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."propal as p";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE p.fk_soc = s.rowid";
-	$sql .= " AND p.entity IN (".getEntity('propal').")";
-	$sql .= " AND p.fk_statut = 1";
+	$sql .= " AND p.entity IN (".getEntity($propalstatic->element).")";
+	$sql .= " AND p.fk_statut = ".Propal::STATUS_VALIDATED;
 	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 p.rowid DESC";
 
-	$result = $db->query($sql);
-	if ($result)
-	{
+	$resql = $db->query($sql);
+	if ($resql) {
 		$total = 0;
-		$num = $db->num_rows($result);
-		$i = 0;
-		if ($num > 0)
-		{
-			print '<div class="div-table-responsive-no-min">';
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ProposalsOpened").' <a href="'.DOL_URL_ROOT.'/comm/propal/list.php?search_status=1"><span class="badge">'.$num.'</span></a></td></tr>';
+		$num = $db->num_rows($resql);
+		$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
+		startSimpleTable("ProposalsOpened", "comm/propal/list.php", "search_status=".Propal::STATUS_VALIDATED, 4, $num);
 
-			$nbofloop = min($num, (empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->global->MAIN_MAXLIST_OVERLOAD));
-			while ($i < $nbofloop)
-			{
-				$obj = $db->fetch_object($result);
-
-				print '<tr class="oddeven">';
-
-				// Ref
-				print '<td class="nowrap" width="140">';
+		if ($num > 0) {
+			$i = 0;
+			while ($i < $nbofloop) {
+				$obj = $db->fetch_object($resql);
 
 				$propalstatic->id = $obj->propalid;
 				$propalstatic->ref = $obj->ref;
 
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				print '<td class="nobordernopadding nowrap">';
-				print $propalstatic->getNomUrl(1);
-				print '</td>';
-				print '<td width="18" class="nobordernopadding nowrap">';
-				if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
-				print '</td>';
-				print '<td width="16" align="center" class="nobordernopadding">';
-				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
-				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;
-				print $formfile->getDocumentsLink($propalstatic->element, $filename, $filedir);
-				print '</td></tr></table>';
-
-				print "</td>";
-
 				$companystatic->id = $obj->socid;
 				$companystatic->name = $obj->socname;
 				$companystatic->client = $obj->client;
 				$companystatic->canvas = $obj->canvas;
-				print '<td class="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>'."\n";
 
-				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
+				$filename = dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->propal->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+				$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->propalid;
 
-				print '<td class="right">'.price($obj->total_ttc).'</td>';
+				$warning = ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) ? img_warning($langs->trans("Late")) : '';
+
+				print '<tr class="oddeven">';
+
+				// Ref
+				print '<td class="nowrap" width="140">';
+				print '<table class="nobordernopadding">';
+				print '<tr class="nocellnopadd">';
+				print '<td class="nobordernopadding nowrap">'.$propalstatic->getNomUrl(1).'</td>';
+				print '<td width="18" class="nobordernopadding nowrap">'.$warning.'</td>';
+				print '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($propalstatic->element, $filename, $filedir).'</td>';
+				print '</tr>';
+				print '</table>';
+				print '</td>';
+
+				print '<td class="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
+				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
+				print '<td class="right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
+
+				print '</tr>';
 
-				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>'."\n";
-				print '</tr>'."\n";
 				$i++;
-				$total += $obj->total_ttc;
+				$total += (!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc);
 			}
-			if ($num > $nbofloop)
-			{
-				print '<tr class="liste_total"><td colspan="5" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
-			{
-				print '<tr class="liste_total"><td colspan="3" class="right">'.$langs->trans("Total")."</td><td align=\"right\">".price($total)."</td><td>&nbsp;</td></tr>";
-			}
-			print "</table>";
-			print "</div><br>";
 		}
-	}
-	else
-	{
+
+		addSummaryTableLine(5, $num, $nbofloop, $total, "None", true);
+		finishSimpleTable(true);
+		$db->free($resql);
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -412,6 +409,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 /*
  * Proposals to process
  */
+
 /*
 if (! empty($conf->propal->enabled))
 {
@@ -486,7 +484,9 @@ if (! empty($conf->propal->enabled))
 /*
  * Proposal that are in a shipping process
  */
-/*if (! empty($conf->propal->enabled))
+
+/*
+if (! empty($conf->propal->enabled))
 {
 	$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
 	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
@@ -555,8 +555,9 @@ if (! empty($conf->propal->enabled))
 }
 */
 
-//print '</td></tr></table>';
-print '</div></div></div>';
+print '</div>';
+print '</div>';
+print '</div>';
 
 $parameters = array('user' => $user);
 $reshook = $hookmanager->executeHooks('dashboardPropals', $parameters, $object); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 76914e2c13a..f9ccc0837c8 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -50,7 +50,7 @@ $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'pro
 
 $socid = GETPOST('socid', 'int');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -78,7 +78,7 @@ $search_login = GETPOST('search_login', 'alpha');
 $search_product_category = GETPOST('search_product_category', 'int');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
-$search_state = trim(GETPOST("search_state"));
+$search_state = GETPOST("search_state");
 $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
@@ -88,7 +88,7 @@ $search_dateend_end = dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth',
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_startmonth', 'int'), GETPOST('search_datedelivery_startday', 'int'), GETPOST('search_datedelivery_startyear', 'int'));
 $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));
 $search_availability = GETPOST('search_availability', 'int');
-$search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
+$search_categ_cus = GETPOST("search_categ_cus", 'int');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 
@@ -183,6 +183,8 @@ $arrayfields = array(
 	'p.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'p.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500),
+	'p.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
+	'p.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
 	'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 // Extra fields
@@ -333,13 +335,13 @@ if (!$user->rights->societe->client->voir && !$socid) //restriction
 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 (".$db->escape($search_country).')';
-if ($search_type_thirdparty)		$sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
+if ($search_country)				$sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
+if ($search_type_thirdparty)		$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 if ($search_ref)					$sql .= natural_search('p.ref', $search_ref);
 if ($search_refcustomer)			$sql .= natural_search('p.ref_client', $search_refcustomer);
 if ($search_refproject)				$sql .= natural_search('pr.ref', $search_refproject);
 if ($search_project)				$sql .= natural_search('pr.title', $search_project);
-if ($search_availability)			$sql .= " AND p.fk_availability IN (".$db->escape($search_availability).')';
+if ($search_availability)			$sql .= " AND p.fk_availability IN (".$db->sanitize($db->escape($search_availability)).')';
 
 if ($search_societe)				$sql .= natural_search('s.nom', $search_societe);
 if ($search_login)					$sql .= natural_search("u.login", $search_login);
@@ -361,7 +363,7 @@ if ($search_product_category > 0)	$sql .= " AND cp.fk_categorie = ".$db->escape(
 if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
 if ($search_status != '' && $search_status != '-1')
 {
-	$sql .= ' AND p.fk_statut IN ('.$db->escape($search_status).')';
+	$sql .= ' AND p.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
 }
 if ($search_date_start)             $sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";
 if ($search_date_end)               $sql .= " AND p.datep <= '".$db->idate($search_date_end)."'";
@@ -414,9 +416,7 @@ if ($resql)
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfProposals').' - '.$soc->name;
 		if (empty($search_societe)) $search_societe = $soc->name;
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans('ListOfProposals');
 	}
 
@@ -474,17 +474,17 @@ if ($resql)
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
 		'presend'=>$langs->trans("SendByMail"),
+		'prevalidate'=>$langs->trans("Validate"),
+		'presign'=>$langs->trans("Sign"),
 	);
 	if ($user->rights->propal->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if ($user->rights->propal->cloturer) $arrayofmassactions['closed'] = $langs->trans("Close");
 	if (in_array($massaction, array('presend', 'predelete', 'closed'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-	$newcardbutton = '';
-	if ($user->rights->propal->creer)
-	{
-		$newcardbutton .= dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/propal/card.php?action=create');
-	}
+	$url = DOL_URL_ROOT.'/comm/propal/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->rights->propal->creer);
 
 	// Fields title search
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -504,6 +504,16 @@ if ($resql)
 	$trackid = 'pro'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+	if ($massaction == 'prevalidate')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
+	}
+
+	if ($massaction == 'presign')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassSignature"), $langs->trans("ConfirmMassSignatureQuestion"), "sign", null, '', 0, 200, 500, 1);
+	}
+
 	if ($sall)
 	{
 		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
@@ -532,7 +542,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -541,7 +551,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -628,12 +638,10 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From').' ';
-		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
+		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to').' ';
-		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
+		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
 	}
@@ -642,12 +650,10 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From').' ';
-		print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1);
+		print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to').' ';
-		print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1);
+		print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
 	}
@@ -656,12 +662,10 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From').' ';
-		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1);
+		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to').' ';
-		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1);
+		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '</td>';
 	}
@@ -789,6 +793,18 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['p.note_public']['checked']))
+	{
+		// Note public
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['p.note_private']['checked']))
+	{
+		// Note private
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	// Status
 	if (!empty($arrayfields['p.fk_statut']['checked']))
 	{
@@ -844,6 +860,8 @@ if ($resql)
 	if (!empty($arrayfields['p.datec']['checked']))     		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.tms']['checked']))       		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 	if (!empty($arrayfields['p.date_cloture']['checked']))		print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.note_public']['checked']))       print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	if (!empty($arrayfields['p.note_private']['checked']))      print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	if (!empty($arrayfields['p.fk_statut']['checked']))			print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print '</tr>'."\n";
@@ -1028,9 +1046,7 @@ if ($resql)
 			{
 				print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
 				print '</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>&nbsp;</td>';
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -1042,9 +1058,7 @@ if ($resql)
 			{
 				print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
 				print '</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>&nbsp;</td>';
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -1169,8 +1183,7 @@ if ($resql)
 				if ($nbofsalesrepresentative > 3)   // We print only number
 				{
 					print $nbofsalesrepresentative;
-				}
-				elseif ($nbofsalesrepresentative > 0)
+				} elseif ($nbofsalesrepresentative > 0)
 				{
 					$userstatic = new User($db);
 					$j = 0;
@@ -1192,9 +1205,7 @@ if ($resql)
 					}
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
-			}
-			else
-			{
+			} else {
 				print '&nbsp';
 			}
 			print '</td>';
@@ -1231,6 +1242,22 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+		// Note public
+		if (!empty($arrayfields['p.note_public']['checked']))
+		{
+			print '<td class="center">';
+			print dol_escape_htmltag($obj->note_public);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Note private
+		if (!empty($arrayfields['p.note_private']['checked']))
+		{
+			print '<td class="center">';
+			print dol_escape_htmltag($obj->note_private);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Status
 		if (!empty($arrayfields['p.fk_statut']['checked']))
 		{
@@ -1279,12 +1306,72 @@ if ($resql)
 	$delallowed = $user->rights->propal->creer;
 
 	print $formfile->showdocuments('massfilesarea_proposals', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
-	dol_print_error($db);
+
+	if ($action == 'validate') {
+		if (GETPOST('confirm') == 'yes') {
+			$tmpproposal = new Propal($db);
+			$db->begin();
+			$error = 0;
+			foreach ($toselect as $checked) {
+				if ($tmpproposal->fetch($checked)) {
+					if ($tmpproposal->statut == 0) {
+						if ($tmpproposal->valid($user)) {
+							setEventMessage($tmpproposal->ref." ".$langs->trans('PassedInOpenStatus'), 'mesgs');
+						} else {
+							setEventMessage($langs->trans('CantBeValidated'), 'errors');
+							$error++;
+						}
+					} else {
+						setEventMessage($tmpproposal->ref." ".$langs->trans('IsNotADraft'), 'errors');
+						$error++;
+					}
+				}
+				dol_print_error($db);
+				$error++;
+			}
+			if ($error) {
+				$db->rollback();
+			} else {
+				$db->commit();
+			}
+		}
+	}
+
+	if ($action == "sign") {
+		if (GETPOST('confirm') == 'yes') {
+			$tmpproposal = new Propal($db);
+			$db->begin();
+			$error = 0;
+			foreach ($toselect as $checked) {
+				if ($tmpproposal->fetch($checked)) {
+					if ($tmpproposal->statut == 1) {
+						$tmpproposal->statut = 2;
+						if ($tmpproposal->update($user)) {
+							setEventMessage($tmpproposal->ref." ".$langs->trans('Signed'), 'mesgs');
+						} else {
+							dol_print_error($db);
+							$error++;
+						}
+					} else {
+						setEventMessage($tmpproposal->ref." ".$langs->trans('CantBeSign'), 'errors');
+						$error++;
+					}
+				} else {
+					dol_print_error($db);
+					$error++;
+				}
+			}
+			if ($error) {
+				$db->rollback();
+			} else {
+				$db->commit();
+			}
+		}
+	}
+} else {
+		dol_print_error($db);
 }
 
-// End of page
-llxFooter();
-$db->close();
+	// End of page
+	llxFooter();
+	$db->close();
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 06385bd40e9..ef35903fcd0 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('propal', 'compta', 'bills', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index add31f13f08..49e1141fec1 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -101,7 +101,7 @@ dol_mkdir($dir);
 
 
 $stats = new PropaleStats($db, $socid, ($userid > 0 ? $userid : 0), $mode, ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
-if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND p.fk_statut IN ('.$db->escape($object_status).')';
+if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND p.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
@@ -112,9 +112,7 @@ 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';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/proposalsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$year.'.png';
 }
@@ -152,9 +150,7 @@ 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';
-}
-else
-{
+} else {
     $filenameamount = $dir.'/proposalsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$year.'.png';
 }
@@ -192,9 +188,7 @@ 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';
-}
-else
-{
+} 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';
@@ -347,8 +341,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index ff0beef4037..d99b3509b26 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2020      Open-Dsi        		<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,7 +72,7 @@ if (!empty($conf->propal->enabled))
  *
  */
 
-$sql = "SELECT count(*) as cc, st.libelle, st.id";
+$sql = "SELECT count(*) as cc, st.libelle, st.picto, st.id";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st ";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -98,7 +99,7 @@ if ($resql)
 
 			print '<tr class="oddeven"><td>';
 			print '<a href="prospects.php?page=0&amp;stcomm='.$obj->id.'">';
-			print img_action($langs->trans("Show"), $obj->id).' ';
+			print img_action($langs->trans("Show"), $obj->id, $obj->picto).' ';
 			print $langs->trans("StatusProspect".$obj->id);
 			print '</a></td><td class="right">'.$obj->cc.'</td></tr>';
 			$i++;
@@ -223,9 +224,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 			}
 			print "</table><br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index b3b852c591a..e393f5fce56 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -83,9 +83,7 @@ if ($socid > 0)
 
 
 	print $langs->trans("FeatureNotYetAvailable");
-}
-else
-{
+} else {
   	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 09f5e46f94b..284c248f1f0 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -83,9 +83,7 @@ if ($socid > 0)
 
 
 	print $langs->trans("FeatureNotYetAvailable");
-}
-else
-{
+} else {
   	dol_print_error($db);
 }
 
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index 53b32500a40..cab1a311dbb 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -70,15 +70,11 @@ if (GETPOST('action', 'aZ09') == 'setremise')
 	    {
     		header("Location: ".$backtopage);
     		exit;
-	    }
-	    else
-	    {
+	    } else {
     		header("Location: remise.php?id=".$_GET["id"]);
     		exit;
 	    }
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -252,16 +248,12 @@ if ($socid > 0)
 	    			print '</tr>';
 	    			$i++;
 	    		}
-			}
-			else
-			{
+			} else {
 			    print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -311,16 +303,12 @@ if ($socid > 0)
 					print '</tr>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index c312591aeec..16a7d362ba6 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('orders', 'bills', 'companies'));
 
 $id = GETPOST('id', 'int');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Security check
@@ -105,9 +105,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 		{
 			$newdiscount1->description = $discount->description;
 			$newdiscount2->description = $discount->description;
-		}
-		else
-		{
+		} else {
 			$newdiscount1->description = $discount->description.' (1)';
 			$newdiscount2->description = $discount->description.' (2)';
 		}
@@ -150,9 +148,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id.($backtopage ? '&backtopage='.urlencode($backtopage) : '')); // To avoid pb whith back
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -189,22 +185,16 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 			    {
 			        header("Location: ".$backtopage.'&discountid='.$discountid);
 			        exit;
-			    }
-				else
-				{
+			    } else {
 				    header("Location: remx.php?id=".$id);
 				    exit;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($soc->error, $soc->errors, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFieldFormat", $langs->transnoentitiesnoconv("AmountHT")), null, 'errors');
 	}
 }
@@ -224,9 +214,7 @@ if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes'
 		$db->commit();
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id); // To avoid pb whith back
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($discount->error, $discount->errors, 'errors');
 		$db->rollback();
 	}
@@ -300,9 +288,7 @@ if ($socid > 0)
 			$obj = $db->fetch_object($resql);
 			$remise_all += $obj->amount;
 			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -332,9 +318,7 @@ if ($socid > 0)
 			$obj = $db->fetch_object($resql);
 			$remise_all += $obj->amount;
 			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -489,8 +473,7 @@ if ($socid > 0)
 	    				$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))
+	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -498,8 +481,7 @@ if ($socid > 0)
 	    				$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))
+	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -507,9 +489,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    				print '<td class="minwidth100">';
 	    				print $obj->description;
 	    				print '</td>';
@@ -535,8 +515,7 @@ if ($socid > 0)
 	    				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>';
+	    			} else print '<td>&nbsp;</td>';
 	    			print '</tr>';
 
 	    			if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
@@ -546,9 +525,7 @@ if ($socid > 0)
 	    			}
 	    			$i++;
 	    		}
-			}
-			else
-			{
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -569,9 +546,7 @@ if ($socid > 0)
 				$langs->load("dict");
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, '', 0);
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -646,8 +621,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -655,8 +629,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
+					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -664,9 +637,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td class="minwidth100">';
 						print $obj->description;
 						print '</td>';
@@ -692,8 +663,7 @@ if ($socid > 0)
 						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>';
+					} else print '<td>&nbsp;</td>';
 					print '</tr>';
 
 					if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
@@ -703,9 +673,7 @@ if ($socid > 0)
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -726,9 +694,7 @@ if ($socid > 0)
 				$langs->load("dict");
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.$showconfirminfo['rowid'].($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount', price($showconfirminfo['amount_ttc']), $langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0);
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -857,8 +823,7 @@ if ($socid > 0)
 	    				$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))
+	    			} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -866,8 +831,7 @@ if ($socid > 0)
 	    				$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))
+	    			} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
 	    			{
 	    				print '<td class="minwidth100">';
 	    				$facturestatic->id = $obj->fk_facture_source;
@@ -875,9 +839,7 @@ if ($socid > 0)
 	    				$facturestatic->type = $obj->type;
 	    				print preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("Invoice"), $obj->description).' '.$facturestatic->getNomURl(1);
 	    				print '</td>';
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    				print '<td class="minwidth100">';
 	    				print $obj->description;
 	    				print '</td>';
@@ -906,9 +868,7 @@ if ($socid > 0)
 	    			print '</tr>';
 	    			$i++;
 	    		}
-			}
-			else
-			{
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 			    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -916,9 +876,7 @@ if ($socid > 0)
 
 			print "</table>";
 			print '</div>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -1035,8 +993,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -1044,8 +1001,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
+					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
 					{
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -1053,9 +1009,7 @@ if ($socid > 0)
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(EXCESS PAID\)/', $langs->trans("Invoice"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td class="minwidth100">';
 						print $obj->description;
 						print '</td>';
@@ -1083,9 +1037,7 @@ if ($socid > 0)
 					print '</tr>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$colspan = 8;
 				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
@@ -1093,9 +1045,7 @@ if ($socid > 0)
 
 			print "</table>";
 			print '</div>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index ed1f27e3c82..3ee5b89e01a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -67,7 +67,7 @@ if (!empty($conf->productbatch->enabled)) $langs->load("productbatch");
 $id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('orderid', 'int'));
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $lineid = GETPOST('lineid', 'int');
@@ -154,9 +154,7 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0)
 			{
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
@@ -167,9 +165,7 @@ if (empty($reshook))
 				{
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -187,9 +183,7 @@ if (empty($reshook))
 			if ($result > 0)
 			{
 				setEventMessages($langs->trans('OrderReopened', $object->ref), null);
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -203,9 +197,7 @@ if (empty($reshook))
 		{
 			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -229,14 +221,12 @@ if (empty($reshook))
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -273,12 +263,12 @@ if (empty($reshook))
 			$db->begin();
 
 			$object->date_commande = $datecommande;
-			$object->note_private = GETPOST('note_private', 'none');
-			$object->note_public = GETPOST('note_public', 'none');
+			$object->note_private = GETPOST('note_private', 'restricthtml');
+			$object->note_public = GETPOST('note_public', 'restricthtml');
 			$object->source = GETPOST('source_id');
 			$object->fk_project = GETPOST('projectid', 'int');
 			$object->ref_client = GETPOST('ref_client', 'alpha');
-			$object->modelpdf = GETPOST('model');
+			$object->model_pdf = GETPOST('model');
 			$object->cond_reglement_id = GETPOST('cond_reglement_id');
 			$object->mode_reglement_id = GETPOST('mode_reglement_id');
 			$object->fk_account = GETPOST('fk_account', 'int');
@@ -288,7 +278,7 @@ if (empty($reshook))
 			$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 			$object->warehouse_id = GETPOST('warehouse_id', 'int');
 			$object->fk_delivery_address = GETPOST('fk_address');
-			$object->contactid = GETPOST('contactid');
+			$object->contact_id = GETPOST('contactid');
 			$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 			$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
@@ -427,7 +417,7 @@ if (empty($reshook))
 						        $originidforcontact=$srcobject->origin_id;
 						    }
 						    $sqlcontact = "SELECT code, 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 = '".$originforcontact."'";
+						    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$db->escape($originforcontact)."'";
 
 						    $resqlcontact = $db->query($sqlcontact);
 						    if ($resqlcontact)
@@ -502,17 +492,14 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'classifybilled' && $usercancreate)
+	} elseif ($action == 'classifybilled' && $usercancreate)
 	{
 		$ret = $object->classifyBilled($user);
 
 		if ($ret < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	elseif ($action == 'classifyunbilled' && $usercancreate)
+	} elseif ($action == 'classifyunbilled' && $usercancreate)
 	{
 		$ret = $object->classifyUnBilled();
 		if ($ret < 0) {
@@ -527,17 +514,13 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setremise' && $usercancreate) {
+	} elseif ($action == 'setremise' && $usercancreate) {
 		$result = $object->set_remise($user, GETPOST('remise'));
 		if ($result < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setabsolutediscount' && $usercancreate) {
+	} elseif ($action == 'setabsolutediscount' && $usercancreate) {
 		if (GETPOST('remise_id')) {
 			if ($object->id > 0) {
 				$object->insert_discount(GETPOST('remise_id'));
@@ -545,9 +528,7 @@ if (empty($reshook))
 				dol_print_error($db, $object->error);
 			}
 		}
-	}
-
-	elseif ($action == 'setdate' && $usercancreate) {
+	} elseif ($action == 'setdate' && $usercancreate) {
 		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$date = dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));
 
@@ -555,19 +536,16 @@ if (empty($reshook))
 		if ($result < 0) {
 			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'));
 
-	elseif ($action == 'setdate_livraison' && $usercancreate) {
-		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-		$datelivraison = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
-
-		$result = $object->set_date_livraison($user, $datelivraison);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
-
-	elseif ($action == 'setmode' && $usercancreate) {
+	    $object->fetch($id);
+	    $result = $object->set_date_livraison($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)
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -581,21 +559,15 @@ if (empty($reshook))
 	// Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
-	}
-
-	elseif ($action == 'setavailability' && $usercancreate) {
+	} elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->availability(GETPOST('availability_id'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	elseif ($action == 'setdemandreason' && $usercancreate) {
+	} elseif ($action == 'setdemandreason' && $usercancreate) {
 		$result = $object->demand_reason(GETPOST('demand_reason_id'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	elseif ($action == 'setconditions' && $usercancreate) {
+	} elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
@@ -612,7 +584,7 @@ if (empty($reshook))
 				}
 
 				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 	}
@@ -648,18 +620,20 @@ if (empty($reshook))
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setremisepercent' && $usercancreate) {
+	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise($user, GETPOST('remise_percent'));
-	}
-
-	elseif ($action == 'setremiseabsolue' && $usercancreate) {
+	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
 		$result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));
-	}
-
-	// Add a new line
-	elseif ($action == 'addline' && $usercancreate)
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+		// Define vat_rate
+		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
+		$vat_rate = str_replace('*', '', $vat_rate);
+		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+		foreach ($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->date_start, $line->date_end, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
+		}
+	} elseif ($action == 'addline' && $usercancreate)		// Add a new line
 	{
 		$langs->load('errors');
 		$error = 0;
@@ -674,9 +648,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -724,9 +696,7 @@ if (empty($reshook))
 
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error++;
 				}
@@ -794,9 +764,7 @@ if (empty($reshook))
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
 							if (empty($tva_tx)) $tva_npr = 0;
 						}
-					}
-					else
-					{
+					} else {
 						setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					}
 				}
@@ -816,9 +784,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else
-							{
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -841,9 +807,7 @@ if (empty($reshook))
 							if ($priceforthequantityarray['price_base_type'] == 'HT')
 							{
 								$pu_ht = $priceforthequantityarray['unitprice'];
-							}
-							else
-							{
+							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
 							}
 							// Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST.
@@ -856,7 +820,7 @@ if (empty($reshook))
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 				// if price ht is forced (ie: calculated by margin rate and cost price). TODO Why this ?
-				if (!empty($price_ht)) {
+				if (!empty($price_ht) || $price_ht === '0') {
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 				}
@@ -976,7 +940,7 @@ if (empty($reshook))
 							$outputlangs->setDefaultLang($newlang);
 						}
 
-						$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+						$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 					}
 
 					unset($_POST['prod_entry_mode']);
@@ -1028,7 +992,7 @@ if (empty($reshook))
 		$date_end = '';
 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'none'));
+		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml'));
 		$pu_ht = GETPOST('price_ht');
 		$vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0);
 		$pu_ht_devise = GETPOST('multicurrency_subprice');
@@ -1120,7 +1084,7 @@ if (empty($reshook))
 					}
 
 					$ret = $object->fetch($object->id); // Reload to get new records
-					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
 				unset($_POST['qty']);
@@ -1156,9 +1120,7 @@ if (empty($reshook))
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
-	}
-
-	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
+	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
@@ -1166,9 +1128,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1198,14 +1158,12 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-					$model = $object->modelpdf;
+					$model = $object->model_pdf;
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1219,9 +1177,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1251,23 +1207,19 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-					$model = $object->modelpdf;
+					$model = $object->model_pdf;
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {
+	} elseif ($action == 'confirm_shipped' && $confirm == 'yes' && $usercanclose) {
 		$result = $object->cloture($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)
+	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
@@ -1275,9 +1227,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1306,7 +1256,7 @@ if (empty($reshook))
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
@@ -1348,8 +1298,7 @@ if (empty($reshook))
 	        {
 	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'OrderLine';
-	        }
-	        elseif ($fromElement == 'propal')
+	        } elseif ($fromElement == 'propal')
 	        {
 	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'PropaleLigne';
@@ -1401,8 +1350,7 @@ if (empty($reshook))
 	                } else {
 	                    $error++;
 	                }
-	            }
-	            else {
+	            } else {
 	                $error++;
 	            }
 	        }
@@ -1532,12 +1480,10 @@ if ($action == 'create' && $usercancreate)
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
 				$element = $subelement = 'commande';
-			}
-			elseif ($element == 'propal') {
+			} elseif ($element == 'propal') {
 				$element = 'comm/propal';
 				$subelement = 'propal';
-			}
-			elseif ($element == 'contract') {
+			} elseif ($element == 'contract') {
 				$element = $subelement = 'contrat';
 			}
 
@@ -1583,9 +1529,7 @@ if ($action == 'create' && $usercancreate)
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id  = $soc->cond_reglement_id;
 		$mode_reglement_id  = $soc->mode_reglement_id;
 		$fk_account         = $soc->fk_account;
@@ -1623,8 +1567,7 @@ if ($action == 'create' && $usercancreate)
 	print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';
 	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && !empty($origin) && !empty($originid))
 		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
-	else
-		print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
+	else print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
 	print '</tr>';
 
 	// Thirdparty
@@ -1681,15 +1624,14 @@ if ($action == 'create' && $usercancreate)
 	print $form->selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date
 	print '</td></tr>';
 
-	// Delivery date planed
-	print "<tr><td>".$langs->trans("DateDeliveryPlanned").'</td><td>';
-	if (empty($datedelivery))
-	{
-		if (!empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
-		else $datedelivery = empty($conf->global->MAIN_AUTOFILL_DATE_DELIVERY) ?-1 : '';
-	}
-	print $form->selectDate($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1);
-	print "</td></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>';
 
 	// terms of the settlement
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
@@ -1921,6 +1863,7 @@ if ($action == 'create' && $usercancreate)
 		$author = new User($db);
 		$author->fetch($object->user_author_id);
 
+		$object->fetch_thirdparty();
 		$res = $object->fetch_optionals();
 
 		$head = commande_prepare_head($object);
@@ -1957,9 +1900,7 @@ if ($action == 'create' && $usercancreate)
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else
-			{
+			} else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -1989,9 +1930,7 @@ if ($action == 'create' && $usercancreate)
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else
-			{
+			} else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2031,9 +1970,7 @@ if ($action == 'create' && $usercancreate)
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else
-			{
+			} else {
 			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
@@ -2209,11 +2146,11 @@ if ($action == 'create' && $usercancreate)
 			print '<form name="setdate_livraison" 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_livraison ? $object->date_livraison : - 1, 'liv_', '', '', '', "setdate_livraison");
+			print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
-			print $object->date_livraison ? dol_print_date($object->date_livraison, 'daytext') : '&nbsp;';
+			print $object->date_livraison ? dol_print_date($object->date_livraison, 'dayhour') : '&nbsp;';
 			if ($object->hasDelay() && !empty($object->date_livraison)) {
 				print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 			}
@@ -2387,9 +2324,7 @@ if ($action == 'create' && $usercancreate)
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else
-			{
+			} 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>';
@@ -2561,8 +2496,7 @@ if ($action == 'create' && $usercancreate)
 					if ($object->statut > Commande::STATUS_DRAFT || !empty($conf->global->COMMANDE_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else
-							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 
@@ -2669,7 +2603,7 @@ if ($action == 'create' && $usercancreate)
 				// Delete order
 				if ($usercandelete) {
 					if ($numshipping == 0) {
-						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>';
+						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
 					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ShippingExist").'">'.$langs->trans("Delete").'</a></div>';
 					}
@@ -2694,7 +2628,7 @@ if ($action == 'create' && $usercancreate)
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 			$genallowed = $usercanread;
 			$delallowed = $usercancreate;
-			print $formfile->showdocuments('commande', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);
+			print $formfile->showdocuments('commande', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang, '', $object);
 
 
 			// Show links to link elements
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index ab0abb3d151..b9fbe8a6c1d 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -29,230 +29,229 @@ require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 class Orders extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid',
-    	'date'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid',
+		'date'
+	);
 
-    /**
-     * @var Commande $commande {@type Commande}
-     */
-    public $commande;
+	/**
+	 * @var Commande $commande {@type Commande}
+	 */
+	public $commande;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->commande = new Commande($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->commande = new Commande($this->db);
+	}
 
-    /**
-     * Get properties of an order object by id
-     *
-     * Return an array with order informations
-     *
-     * @param       int         $id            ID of order
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
+	/**
+	 * Get properties of an order object by id
 	 *
-     * @throws 	RestException
-     */
-    public function get($id, $contact_list = 1)
-    {
-        return $this->_fetch($id, '', '', $contact_list);
-    }
+	 * Return an array with order informations
+	 *
+	 * @param       int         $id            ID of order
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id, $contact_list = 1)
+	{
+		return $this->_fetch($id, '', '', $contact_list);
+	}
 
-    /**
-     * Get properties of an order object by ref
-     *
-     * Return an array with order informations
-     *
-     * @param       string		$ref			Ref of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref/{ref}
-     *
-     * @throws 	RestException
-     */
-    public function getByRef($ref, $contact_list = 1)
-    {
-        return $this->_fetch('', $ref, '', $contact_list);
-    }
+	/**
+	 * Get properties of an order object by ref
+	 *
+	 * Return an array with order informations
+	 *
+	 * @param       string		$ref			Ref of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref/{ref}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRef($ref, $contact_list = 1)
+	{
+		return $this->_fetch('', $ref, '', $contact_list);
+	}
 
-    /**
-     * Get properties of an order object by ref_ext
-     *
-     * Return an array with order informations
-     *
-     * @param       string		$ref_ext			External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref_ext/{ref_ext}
-     *
-     * @throws 	RestException
-     */
-    public function getByRefExt($ref_ext, $contact_list = 1)
-    {
-        return $this->_fetch('', '', $ref_ext, $contact_list);
-    }
+	/**
+	 * Get properties of an order object by ref_ext
+	 *
+	 * Return an array with order informations
+	 *
+	 * @param       string		$ref_ext			External reference of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref_ext/{ref_ext}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRefExt($ref_ext, $contact_list = 1)
+	{
+		return $this->_fetch('', '', $ref_ext, $contact_list);
+	}
 
-    /**
-     * Get properties of an order object
-     *
-     * Return an array with order informations
-     *
-     * @param       int         $id            ID of order
+	/**
+	 * Get properties of an order object
+	 *
+	 * Return an array with order informations
+	 *
+	 * @param       int         $id            ID of order
 	 * @param		string		$ref			Ref of object
 	 * @param		string		$ref_ext		External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
-    {
-        if (!DolibarrApiAccess::$user->rights->commande->lire) {
-            throw new RestException(401);
-        }
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->commande->fetch($id, $ref, $ref_ext);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id, $ref, $ref_ext);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        // Add external contacts ids
-        $this->commande->contacts_ids = $this->commande->liste_contact(-1, 'external', $contact_list);
-        $this->commande->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->commande);
-    }
+		// Add external contacts ids
+		$this->commande->contacts_ids = $this->commande->liste_contact(-1, 'external', $contact_list);
+		$this->commande->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->commande);
+	}
 
-    /**
-     * List orders
-     *
-     * Get a list of orders
-     *
-     * @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 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 orders
+	 *
+	 * Get a list of orders
+	 *
+	 * @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 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."commande 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."commande 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('commande').')';
-        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('commande').')';
+		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 .= $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 .= $db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $commande_static = new Commande($db);
-                if ($commande_static->fetch($obj->rowid)) {
-                    // Add external contacts ids
-                    $commande_static->contacts_ids = $commande_static->liste_contact(-1, 'external', 1);
-                    $obj_ret[] = $this->_cleanObjectDatas($commande_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No order 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);
+				$commande_static = new Commande($this->db);
+				if ($commande_static->fetch($obj->rowid)) {
+					// Add external contacts ids
+					$commande_static->contacts_ids = $commande_static->liste_contact(-1, 'external', 1);
+					$obj_ret[] = $this->_cleanObjectDatas($commande_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve commande list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No order found');
+		}
 		return $obj_ret;
-    }
+	}
 
-    /**
-     * Create a sale order
-     *
-     * Exemple: { "socid": 2, "date": 1595196000, "type": 0, "lines": [{ "fk_product": 2, "qty": 1 }] }
-     *
-     * @param   array   $request_data   Request data
-     * @return  int     ID of order
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->commande->creer) {
+	/**
+	 * Create a sale order
+	 *
+	 * Exemple: { "socid": 2, "date": 1595196000, "type": 0, "lines": [{ "fk_product": 2, "qty": 1 }] }
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of order
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->commande->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->commande->$field = $value;
+		}
+		/*if (isset($request_data["lines"])) {
           $lines = array();
           foreach ($request_data["lines"] as $line) {
             array_push($lines, (object) $line);
@@ -260,204 +259,241 @@ class Orders extends DolibarrApi
           $this->commande->lines = $lines;
         }*/
 
-        if ($this->commande->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating order", array_merge(array($this->commande->error), $this->commande->errors));
-        }
+		if ($this->commande->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating order", array_merge(array($this->commande->error), $this->commande->errors));
+		}
 
-        return $this->commande->id;
-    }
+		return $this->commande->id;
+	}
 
-    /**
-     * Get lines of an order
-     *
-     * @param int   $id             Id of order
-     *
-     * @url	GET {id}/lines
-     *
-     * @return int
-     */
-    public function getLines($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->commande->lire) {
+	/**
+	 * Get lines of an order
+	 *
+	 * @param int   $id             Id of order
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return int
+	 */
+	public function getLines($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
 			throw new RestException(401);
 		}
 
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->commande->getLinesArray();
-        $result = array();
-        foreach ($this->commande->lines as $line) {
-            array_push($result, $this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
+		}
+		$this->commande->getLinesArray();
+		$result = array();
+		foreach ($this->commande->lines as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
 
-    /**
-     * Add a line to given order
-     *
-     * @param int   $id             Id of order to update
-     * @param array $request_data   OrderLine data
-     *
-     * @url	POST {id}/lines
-     *
-     * @return int
-     */
-    public function postLine($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->commande->creer) {
+	/**
+	 * Add a line to given order
+	 *
+	 * @param int   $id             Id of order to update
+	 * @param array $request_data   OrderLine data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int
+	 */
+	public function postLine($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		}
 		$request_data = (object) $request_data;
-        $updateRes = $this->commande->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->info_bits,
-                        $request_data->fk_remise_except,
-                        'HT',
-                        0,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->rang,
-                        $request_data->special_code,
-                        $request_data->fk_parent_line,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $request_data->origin,
-                        $request_data->origin_id,
-                        $request_data->multicurrency_subprice
-        );
+		$updateRes = $this->commande->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->info_bits,
+						$request_data->fk_remise_except,
+						'HT',
+						0,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+						$request_data->fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$request_data->origin,
+						$request_data->origin_id,
+						$request_data->multicurrency_subprice,
+						$request_data->ref_ext
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
-        } else {
-            throw new RestException(400, $this->commande->error);
-        }
-    }
+		if ($updateRes > 0) {
+			return $updateRes;
+		} else {
+			throw new RestException(400, $this->commande->error);
+		}
+	}
 
-    /**
-     * Update a line to given order
-     *
-     * @param int   $id             Id of order to update
-     * @param int   $lineid         Id of line to update
-     * @param array $request_data   OrderLine data
-     *
-     * @url	PUT {id}/lines/{lineid}
-     *
-     * @return array|bool
-     */
-    public function putLine($id, $lineid, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->commande->creer) {
+	/**
+	 * Update a line to given order
+	 *
+	 * @param int   $id             Id of order to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   OrderLine data
+	 *
+	 * @url	PUT {id}/lines/{lineid}
+	 *
+	 * @return array|bool
+	 */
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		}
 		$request_data = (object) $request_data;
-        $updateRes = $this->commande->updateline(
-            $lineid,
-            $request_data->desc,
-            $request_data->subprice,
-            $request_data->qty,
-            $request_data->remise_percent,
-            $request_data->tva_tx,
-            $request_data->localtax1_tx,
-            $request_data->localtax2_tx,
-            'HT',
-            $request_data->info_bits,
-            $request_data->date_start,
-            $request_data->date_end,
-            $request_data->product_type,
-            $request_data->fk_parent_line,
-            0,
-            $request_data->fk_fournprice,
-            $request_data->pa_ht,
-            $request_data->label,
-            $request_data->special_code,
-            $request_data->array_options,
-            $request_data->fk_unit,
-      		$request_data->multicurrency_subprice
-        );
+		$updateRes = $this->commande->updateline(
+			$lineid,
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->remise_percent,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			'HT',
+			$request_data->info_bits,
+			$request_data->date_start,
+			$request_data->date_end,
+			$request_data->product_type,
+			$request_data->fk_parent_line,
+			0,
+			$request_data->fk_fournprice,
+			$request_data->pa_ht,
+			$request_data->label,
+			$request_data->special_code,
+			$request_data->array_options,
+			$request_data->fk_unit,
+	  		$request_data->multicurrency_subprice,
+			0,
+	  		$request_data->ref_ext
+		);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
-        return false;
-    }
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
+	}
 
-    /**
-     * Delete a line to given order
-     *
-     *
-     * @param int   $id             Id of order 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->commande->creer) {
+	/**
+	 * Delete a line to given order
+	 *
+	 *
+	 * @param int   $id             Id of order 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->commande->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->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
 
-        $updateRes = $this->commande->deleteline(DolibarrApiAccess::$user, $lineid);
-        if ($updateRes > 0) {
-            return $this->get($id);
-        } else {
-            throw new RestException(405, $this->commande->error);
-        }
-    }
+		$updateRes = $this->commande->deleteline(DolibarrApiAccess::$user, $lineid);
+		if ($updateRes > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(405, $this->commande->error);
+		}
+	}
 
-    /**
+	/**
+	 * Get contacts of given order
+	 *
+	 * Return an array with contact informations
+	 *
+	 * @param int    $id   ID of order
+	 * @param string $type Type of the contact (BILLING, SHIPPING, CUSTOMER)
+	 *
+	 * @url	GET {id}/contacts
+	 *
+	 * @return 	array data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function getContacts($id, $type = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$contacts = $this->commande->liste_contact(-1, 'external', 0, $type);
+
+		return $this->_cleanObjectDatas($contacts);
+	}
+
+	/**
 	 * Add a contact type of given order
 	 *
 	 * @param int    $id             Id of order to update
@@ -468,177 +504,196 @@ class Orders extends DolibarrApi
 	 *
 	 * @return int
 	 *
-     * @throws RestException 401
-     * @throws RestException 404
+	 * @throws RestException 401
+	 * @throws RestException 404
 	 */
-    public function postContact($id, $contactid, $type)
-    {
-        if (!DolibarrApiAccess::$user->rights->commande->creer) {
+	public function postContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->commande->add_contact($contactid, $type, 'external');
+		$result = $this->commande->add_contact($contactid, $type, 'external');
 
-        if (!$result) {
-            throw new RestException(500, 'Error when added the contact');
-        }
+		if ($result < 0) {
+			throw new RestException(500, 'Error when added the contact');
+		}
 
-        return $this->commande;
-    }
+		if ($result == 0) {
+			throw new RestException(304, 'contact already added');
+		}
 
-    /**
-	 * Delete a contact type of given order
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contact linked to the order'
+			)
+		);
+	}
+
+	/**
+	 * Unlink a contact type of given order
 	 *
 	 * @param int    $id             Id of order to update
-	 * @param int    $rowid          Row key of the contact in the array contact_ids.
+	 * @param int    $contactid      Id of contact
+	 * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
 	 *
-	 * @url	DELETE {id}/contact/{rowid}
+	 * @url	DELETE {id}/contact/{contactid}/{type}
 	 *
 	 * @return int
 	 *
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
 	 */
-    public function deleteContact($id, $rowid)
-    {
-        if (!DolibarrApiAccess::$user->rights->commande->creer) {
+	public function deleteContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->commande->delete_contact($rowid);
+		 $contacts = $this->commande->liste_contact();
 
-        if (!$result) {
-            throw new RestException(500, 'Error when deleted the contact');
-        }
+		foreach ($contacts as $contact) {
+			if ($contact['id'] == $contactid && $contact['code'] == $type) {
+				$result = $this->commande->delete_contact($contact['rowid']);
 
-        return $this->commande;
-    }
+				if (!$result) {
+					throw new RestException(500, 'Error when deleted the contact');
+				}
+			}
+		}
 
-    /**
-     * 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->commande->creer) {
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Contact unlinked from order'
+			)
+		);
+	}
+
+	/**
+	 * 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->commande->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-        foreach ($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->commande->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->commande->$field = $value;
+		}
 
 		// Update availability
 		if (!empty($this->commande->availability_id)) {
-		    if ($this->commande->availability($this->commande->availability_id) < 0)
+			if ($this->commande->availability($this->commande->availability_id) < 0)
 			throw new RestException(400, 'Error while updating availability');
 		}
 
-        if ($this->commande->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        }
-        else
-        {
-        	throw new RestException(500, $this->commande->error);
-        }
-    }
+		if ($this->commande->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->commande->error);
+		}
+	}
 
-    /**
-     * Delete order
-     *
-     * @param   int     $id         Order ID
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->commande->supprimer) {
+	/**
+	 * Delete order
+	 *
+	 * @param   int     $id         Order ID
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if (!$this->commande->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when deleting order : '.$this->commande->error);
-        }
+		if (!$this->commande->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting order : '.$this->commande->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Order deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Order deleted'
+			)
+		);
+	}
 
-    /**
-     * Validate an order
-     *
+	/**
+	 * Validate an order
+	 *
 	 * 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->commande->creer) {
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 * @return  array
+	 */
+	public function validate($id, $idwarehouse = 0, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
 			throw new RestException(401);
 		}
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
@@ -646,288 +701,288 @@ class Orders extends DolibarrApi
 
 		$result = $this->commande->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->commande->error);
+			throw new RestException(500, 'Error when validating Order: '.$this->commande->error);
+		}
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
 		}
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
 
-        if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->commande->fetchObjectLinked();
+		$this->commande->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->commande);
-    }
+		return $this->_cleanObjectDatas($this->commande);
+	}
 
-    /**
-     *  Tag the order as validated (opened)
-     *
-     *  Function used when order is reopend after being closed.
-     *
-     * @param int   $id       Id of the order
-     *
-     * @url     POST {id}/reopen
-     *
-     * @return int
-     *
-     * @throws RestException 304
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function reopen($id)
-    {
+	/**
+	 *  Tag the order as validated (opened)
+	 *
+	 *  Function used when order is reopend after being closed.
+	 *
+	 * @param int   $id       Id of the order
+	 *
+	 * @url     POST {id}/reopen
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 */
+	public function reopen($id)
+	{
 
-        if (!DolibarrApiAccess::$user->rights->commande->creer) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Order ID is mandatory');
-        }
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Order ID is mandatory');
+		}
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
-        $result = $this->commande->set_reopen(DolibarrApiAccess::$user);
-        if ($result < 0) {
-            throw new RestException(405, $this->commande->error);
-        }elseif ($result == 0) {
-            throw new RestException(304);
-        }
+		$result = $this->commande->set_reopen(DolibarrApiAccess::$user);
+		if ($result < 0) {
+			throw new RestException(405, $this->commande->error);
+		} elseif ($result == 0) {
+			throw new RestException(304);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Classify the order as invoiced. Could be also called setbilled
-     *
-     * @param int   $id           Id of the order
-     *
-     * @url     POST {id}/setinvoiced
-     *
-     * @return int
-     *
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function setinvoiced($id)
-    {
+	/**
+	 * Classify the order as invoiced. Could be also called setbilled
+	 *
+	 * @param int   $id           Id of the order
+	 *
+	 * @url     POST {id}/setinvoiced
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 */
+	public function setinvoiced($id)
+	{
 
-        if (!DolibarrApiAccess::$user->rights->commande->creer) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Order ID is mandatory');
-        }
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Order ID is mandatory');
+		}
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
-        $result = $this->commande->classifyBilled(DolibarrApiAccess::$user);
-        if ($result < 0) {
-            throw new RestException(400, $this->commande->error);
-        }
-
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-        	throw new RestException(404, 'Order not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
-        	throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $this->commande->fetchObjectLinked();
-
-        return $this->_cleanObjectDatas($this->commande);
-    }
-
-    /**
-     * Close an order (Classify it as "Delivered")
-     *
-     * @param   int     $id             Order ID
-     * @param   int     $notrigger      Disabled triggers
-     *
-     * @url POST    {id}/close
-     *
-     * @return  int
-     */
-    public function close($id, $notrigger = 0)
-    {
-    	if (!DolibarrApiAccess::$user->rights->commande->creer) {
-    		throw new RestException(401);
-    	}
-    	$result = $this->commande->fetch($id);
-    	if (!$result) {
-    		throw new RestException(404, 'Order not found');
-    	}
-
-    	if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
-
-    	$result = $this->commande->cloture(DolibarrApiAccess::$user, $notrigger);
-    	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 Order: '.$this->commande->error);
-    	}
-
-    	$result = $this->commande->fetch($id);
-    	if (!$result) {
-    		throw new RestException(404, 'Order not found');
-    	}
-
-    	if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
-
-    	$this->commande->fetchObjectLinked();
-
-    	return $this->_cleanObjectDatas($this->commande);
-    }
-
-    /**
-     * Set an order to draft
-     *
-     * @param   int     $id             Order ID
-     * @param   int 	$idwarehouse    Warehouse ID to use for stock change (Used only if option STOCK_CALCULATE_ON_VALIDATE_ORDER is on)
-     *
-     * @url POST    {id}/settodraft
-     *
-     * @return  array
-     */
-    public function settodraft($id, $idwarehouse = -1)
-    {
-        if (!DolibarrApiAccess::$user->rights->commande->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $result = $this->commande->setDraft(DolibarrApiAccess::$user, $idwarehouse);
-        if ($result == 0) {
-            throw new RestException(304, 'Nothing done. May be object is already closed');
-        }
-        if ($result < 0) {
-            throw new RestException(500, 'Error when closing Order: '.$this->commande->error);
-        }
+		$result = $this->commande->classifyBilled(DolibarrApiAccess::$user);
+		if ($result < 0) {
+			throw new RestException(400, $this->commande->error);
+		}
 
 		$result = $this->commande->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->commande->fetchObjectLinked();
+		$this->commande->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->commande);
-    }
+		return $this->_cleanObjectDatas($this->commande);
+	}
+
+	/**
+	 * Close an order (Classify it as "Delivered")
+	 *
+	 * @param   int     $id             Order ID
+	 * @param   int     $notrigger      Disabled triggers
+	 *
+	 * @url POST    {id}/close
+	 *
+	 * @return  int
+	 */
+	public function close($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->commande->cloture(DolibarrApiAccess::$user, $notrigger);
+		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 Order: '.$this->commande->error);
+		}
+
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$this->commande->fetchObjectLinked();
+
+		return $this->_cleanObjectDatas($this->commande);
+	}
+
+	/**
+	 * Set an order to draft
+	 *
+	 * @param   int     $id             Order ID
+	 * @param   int 	$idwarehouse    Warehouse ID to use for stock change (Used only if option STOCK_CALCULATE_ON_VALIDATE_ORDER is on)
+	 *
+	 * @url POST    {id}/settodraft
+	 *
+	 * @return  array
+	 */
+	public function settodraft($id, $idwarehouse = -1)
+	{
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->commande->setDraft(DolibarrApiAccess::$user, $idwarehouse);
+		if ($result == 0) {
+			throw new RestException(304, 'Nothing done. May be object is already closed');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when closing Order: '.$this->commande->error);
+		}
+
+		$result = $this->commande->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('commande', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$this->commande->fetchObjectLinked();
+
+		return $this->_cleanObjectDatas($this->commande);
+	}
 
 
-    /**
-     * Create an order using an existing proposal.
-     *
-     *
-     * @param int   $proposalid       Id of the proposal
-     *
-     * @url     POST /createfromproposal/{proposalid}
-     *
-     * @return int
-     * @throws RestException 400
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     */
-    public function createOrderFromProposal($proposalid)
-    {
+	/**
+	 * Create an order using an existing proposal.
+	 *
+	 *
+	 * @param int   $proposalid       Id of the proposal
+	 *
+	 * @url     POST /createfromproposal/{proposalid}
+	 *
+	 * @return int
+	 * @throws RestException 400
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 */
+	public function createOrderFromProposal($proposalid)
+	{
 
-        require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
-        if (!DolibarrApiAccess::$user->rights->propal->lire) {
-            throw new RestException(401);
-        }
-        if (!DolibarrApiAccess::$user->rights->commande->creer) {
-            throw new RestException(401);
-        }
-        if (empty($proposalid)) {
-            throw new RestException(400, 'Proposal ID is mandatory');
-        }
+		if (!DolibarrApiAccess::$user->rights->propal->lire) {
+			throw new RestException(401);
+		}
+		if (!DolibarrApiAccess::$user->rights->commande->creer) {
+			throw new RestException(401);
+		}
+		if (empty($proposalid)) {
+			throw new RestException(400, 'Proposal ID is mandatory');
+		}
 
-        $propal = new Propal($this->db);
-        $result = $propal->fetch($proposalid);
-        if (!$result) {
-            throw new RestException(404, 'Proposal not found');
-        }
+		$propal = new Propal($this->db);
+		$result = $propal->fetch($proposalid);
+		if (!$result) {
+			throw new RestException(404, 'Proposal not found');
+		}
 
-        $result = $this->commande->createFromProposal($propal, DolibarrApiAccess::$user);
-        if ($result < 0) {
-            throw new RestException(405, $this->commande->error);
-        }
-        $this->commande->fetchObjectLinked();
+		$result = $this->commande->createFromProposal($propal, DolibarrApiAccess::$user);
+		if ($result < 0) {
+			throw new RestException(405, $this->commande->error);
+		}
+		$this->commande->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->commande);
-    }
+		return $this->_cleanObjectDatas($this->commande);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note);
-        unset($object->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)
-    {
-        $commande = array();
-        foreach (Orders::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, $field." field missing");
-            $commande[$field] = $data[$field];
-        }
-        return $commande;
-    }
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$commande = array();
+		foreach (Orders::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, $field." field missing");
+			$commande[$field] = $data[$field];
+		}
+		return $commande;
+	}
 }
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 07f483da931..f2aab587169 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -37,6 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
+
 /**
  *  Class to manage customers orders
  */
@@ -99,13 +100,13 @@ class Commande extends CommonOrder
 	 */
 	public $ref_client;
 
-    /**
+	/**
 	 * @var string Internal ref for order
 	 * @deprecated
 	 */
 	public $ref_int;
 
-    /**
+	/**
 	 * @var int Contact ID
 	 */
 	public $contactid;
@@ -121,15 +122,15 @@ class Commande extends CommonOrder
 	 */
 	public $billed;
 
-    /**
-     * @var int Draft Status of the order
-     */
-    public $brouillon;
-    public $cond_reglement_code;
+	/**
+	 * @var int Draft Status of the order
+	 */
+	public $brouillon;
+	public $cond_reglement_code;
 
 	/**
-     * @var int bank account ID
-     */
+	 * @var int bank account ID
+	 */
 	public $fk_account;
 
 	/**
@@ -168,12 +169,12 @@ class Commande extends CommonOrder
 	public $demand_reason_id; // Source reason. Why we receive order (after a phone campaign, ...)
 	public $demand_reason_code;
 	/**
-     * @var int Date of order
+	 * @var int Date of order
 	 */
 	public $date;
 
 	/**
-     * @var int Date of order
+	 * @var int Date of order
 	 * @deprecated
 	 * @see $date
 	 */
@@ -182,8 +183,8 @@ class Commande extends CommonOrder
 	public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_remise_except;
 
 	public $remise_percent;
@@ -197,13 +198,13 @@ class Commande extends CommonOrder
 	public $linked_objects = array();
 
 	/**
-     * @var int User author ID
-     */
+	 * @var int User author ID
+	 */
 	public $user_author_id;
 
-    /**
-     * @var int User validator ID
-     */
+	/**
+	 * @var int User validator ID
+	 */
 	public $user_valid;
 
 	/**
@@ -213,8 +214,8 @@ class Commande extends CommonOrder
 
 	// Multicurrency
 	/**
-     * @var int Currency ID
-     */
+	 * @var int Currency ID
+	 */
 	public $fk_multicurrency;
 
 	public $multicurrency_code;
@@ -223,9 +224,9 @@ class Commande extends CommonOrder
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
 
-    /**
-     * @var Commande clone of order object
-     */
+	/**
+	 * @var Commande clone of order object
+	 */
 	public $oldcopy;
 
 	//! key of module source when order generated from a dedicated module ('cashdesk', 'takepos', ...)
@@ -394,11 +395,11 @@ class Commande extends CommonOrder
 				$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($soc, $this);
@@ -406,16 +407,12 @@ class Commande extends CommonOrder
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_COMMANDE_ADDON_NotDefined");
 			return "";
 		}
@@ -468,9 +465,7 @@ class Commande extends CommonOrder
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($soc);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -574,16 +569,14 @@ class Commande extends CommonOrder
 		{
 			$this->ref = $num;
 			$this->statut = self::STATUS_VALIDATED;
-            $this->brouillon = 0;
+			$this->brouillon = 0;
 		}
 
 		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -597,9 +590,9 @@ class Commande extends CommonOrder
 	 *	@param	int		$idwarehouse	Warehouse ID to use for stock change (Used only if option STOCK_CALCULATE_ON_VALIDATE_ORDER is on)
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function setDraft($user, $idwarehouse = -1)
-    {
-        //phpcs:enable
+	public function setDraft($user, $idwarehouse = -1)
+	{
+		//phpcs:enable
 		global $conf, $langs;
 
 		$error = 0;
@@ -627,12 +620,12 @@ class Commande extends CommonOrder
 
 		if ($this->db->query($sql))
 		{
-		    if (!$error)
-		    {
-		        $this->oldcopy = clone $this;
-		    }
+			if (!$error)
+			{
+				$this->oldcopy = clone $this;
+			}
 
-		    // If stock is decremented on validate order, we must reincrement it
+			// If stock is decremented on validate order, we must reincrement it
 			if (!empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
 			{
 				$result = 0;
@@ -668,14 +661,12 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
 		}
-    }
+	}
 
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -688,7 +679,7 @@ class Commande extends CommonOrder
 	 */
 	public function set_reopen($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 
 		if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED)
@@ -711,9 +702,7 @@ class Commande extends CommonOrder
 			$result = $this->call_trigger('ORDER_REOPEN', $user);
 			if ($result < 0) $error++;
 			// End call triggers
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
@@ -726,9 +715,7 @@ class Commande extends CommonOrder
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
@@ -783,15 +770,11 @@ class Commande extends CommonOrder
 
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 
 				$this->db->rollback();
@@ -861,9 +844,7 @@ class Commande extends CommonOrder
 				$this->statut = self::STATUS_CANCELED;
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::cancel ".$errmsg, LOG_ERR);
@@ -872,9 +853,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -965,7 +944,7 @@ class Commande extends CommonOrder
 		$sql .= ", ".($this->ref_ext ? "'".$this->db->escape($this->ref_ext)."'" : "null");
 		$sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
 		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
-		$sql .= ", '".$this->db->escape($this->modelpdf)."'";
+		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
 		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : "null");
 		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "null");
 		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
@@ -980,7 +959,7 @@ class Commande extends CommonOrder
 		$sql .= ", ".(int) $this->fk_incoterms;
 		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ", ".setEntity($this);
-        $sql .= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null");
+		$sql .= ", ".($this->module_source ? "'".$this->db->escape($this->module_source)."'" : "null");
 		$sql .= ", ".($this->pos_source != '' ? "'".$this->db->escape($this->pos_source)."'" : "null");
 		$sql .= ", ".(int) $this->fk_multicurrency;
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
@@ -1026,7 +1005,12 @@ class Commande extends CommonOrder
 						$origintype = $this->element;
 					}
 
-                    $result = $this->addline(
+					// ref_ext
+					if (empty($line->ref_ext)) {
+						$line->ref_ext = '';
+					}
+
+					$result = $this->addline(
 						$line->desc,
 						$line->subprice,
 						$line->qty,
@@ -1050,8 +1034,10 @@ class Commande extends CommonOrder
 						$line->label,
 						$line->array_options,
 						$line->fk_unit,
-	                    $origintype,
-	                    $originid
+						$origintype,
+						$originid,
+						0,
+						$line->ref_ext
 					);
 					if ($result < 0)
 					{
@@ -1100,8 +1086,7 @@ class Commande extends CommonOrder
 										$error++;
 									}
 								}
-							}
-							else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+							} 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);
@@ -1137,7 +1122,7 @@ class Commande extends CommonOrder
 						}
 
 						$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 = '".$originforcontact."'";
+						$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)
@@ -1147,8 +1132,7 @@ class Commande extends CommonOrder
 								//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);
+						} else dol_print_error($resqlcontact);
 					}
 
 					if (!$error)
@@ -1169,23 +1153,17 @@ class Commande extends CommonOrder
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						$this->db->rollback();
 						return -1 * $error;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->db->rollback();
 			return -1;
@@ -1245,6 +1223,13 @@ class Commande extends CommonOrder
 		$this->date_validation    = '';
 		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $this->ref_client = '';
 
+		// Do not clone ref_ext
+		$num = count($this->lines);
+		for ($i = 0; $i < $num; $i++)
+		{
+			$this->lines[$i]->ref_ext = '';
+		}
+
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($user);
@@ -1288,9 +1273,7 @@ class Commande extends CommonOrder
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1370,13 +1353,13 @@ 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->contactid;
+		$this->contact_id            = $object->contact_id;
 		$this->ref_client           = $object->ref_client;
 
 		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN))
 		{
-            $this->note_private         = $object->note_private;
-            $this->note_public          = $object->note_public;
+			$this->note_private         = $object->note_private;
+			$this->note_public          = $object->note_public;
 		}
 
 		$this->origin = $object->element;
@@ -1421,10 +1404,8 @@ class Commande extends CommonOrder
 					$this->valid($user);
 				}
 				return $ret;
-			}
-			else return -1;
-		}
-		else return -1;
+			} else return -1;
+		} else return -1;
 	}
 
 
@@ -1457,6 +1438,7 @@ class Commande extends CommonOrder
 	 * 	@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		string			$ref_ext		    line external reference
 	 *	@return     int             					>0 if OK, <0 if KO
 	 *
 	 *	@see        add_product()
@@ -1466,13 +1448,13 @@ class Commande extends CommonOrder
 	 *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
 	 *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
 	 */
-	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0)
+	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $info_bits = 0, $fk_remise_except = 0, $price_base_type = 'HT', $pu_ttc = 0, $date_start = '', $date_end = '', $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $array_options = 0, $fk_unit = null, $origin = '', $origin_id = 0, $pu_ht_devise = 0, $ref_ext = '')
 	{
 		global $mysoc, $conf, $langs, $user;
 
 		$logtext = "::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent";
 		$logtext .= ", info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start";
-		$logtext .= ", date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit, origin=$origin, origin_id=$origin_id, pu_ht_devise=$pu_ht_devise";
+		$logtext .= ", date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit, origin=$origin, origin_id=$origin_id, pu_ht_devise=$pu_ht_devise, ref_ext=$ref_ext";
 		dol_syslog(get_class($this).$logtext, LOG_DEBUG);
 
 		if ($this->statut == self::STATUS_DRAFT)
@@ -1480,6 +1462,7 @@ class Commande extends CommonOrder
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
+
 			if (empty($remise_percent)) $remise_percent = 0;
 			if (empty($qty)) $qty = 0;
 			if (empty($info_bits)) $info_bits = 0;
@@ -1489,6 +1472,7 @@ class Commande extends CommonOrder
 			if (empty($txlocaltax2)) $txlocaltax2 = 0;
 			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
 			if (empty($this->fk_multicurrency)) $this->fk_multicurrency = 0;
+			if (empty($ref_ext)) $ref_ext = '';
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
@@ -1504,9 +1488,7 @@ class Commande extends CommonOrder
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 			$label = trim($label);
@@ -1521,7 +1503,7 @@ class Commande extends CommonOrder
 				return -1;
 			}
 
-            $this->db->begin();
+			$this->db->begin();
 
 			$product_type = $type;
 			if (!empty($fk_product))
@@ -1606,6 +1588,7 @@ class Commande extends CommonOrder
 			$this->line->label = $label;
 			$this->line->desc = $desc;
 			$this->line->qty = $qty;
+			$this->line->ref_ext = $ref_ext;
 
 			$this->line->vat_src_code = $vat_src_code;
 			$this->line->tva_tx = $txtva;
@@ -1665,23 +1648,17 @@ class Commande extends CommonOrder
 				{
 					$this->db->commit();
 					return $this->line->id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 				dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::addline status of order must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -1705,7 +1682,7 @@ class Commande extends CommonOrder
 	 */
 	public function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start = '', $date_end = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 
 		if (!$qty) $qty = 1;
@@ -1804,7 +1781,7 @@ class Commande extends CommonOrder
 		$sql .= ', c.fk_incoterms, c.location_incoterms';
 		$sql .= ", c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc";
 		$sql .= ", c.module_source, c.pos_source";
-        $sql .= ", i.libelle as label_incoterms";
+		$sql .= ", i.libelle as label_incoterms";
 		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql .= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
 		$sql .= ', ca.code as availability_code, ca.label as availability_label';
@@ -1866,7 +1843,8 @@ class Commande extends CommonOrder
 				$this->note = $obj->note_private; // deprecated
 				$this->note_private = $obj->note_private;
 				$this->note_public = $obj->note_public;
-				$this->modelpdf = $obj->model_pdf;
+				$this->model_pdf = $obj->model_pdf;
+				$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;
@@ -1920,15 +1898,11 @@ class Commande extends CommonOrder
 					return -3;
 				}
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = 'Order with id '.$id.' not found sql='.$sql;
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1944,7 +1918,7 @@ class Commande extends CommonOrder
 	 */
 	public function insert_discount($idremise)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -1992,22 +1966,16 @@ class Commande extends CommonOrder
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $line->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -2018,17 +1986,17 @@ class Commande extends CommonOrder
 	/**
 	 *	Load array lines
 	 *
-	 *	@param		int		$only_product	Return only physical products
+	 *	@param		int		$only_product	Return only physical products, not services
 	 *	@param		int		$loadalsotranslation	Return translation for products
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
 		global $langs, $conf;
-        // phpcs:enable
+		// phpcs:enable
 		$this->lines = array();
 
-		$sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx,';
+		$sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx, l.ref_ext,';
 		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,';
 		$sql .= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,';
 		$sql .= ' l.fk_unit,';
@@ -2063,6 +2031,7 @@ class Commande extends CommonOrder
 				$line->description      = $objp->description; // Description line
 				$line->product_type     = $objp->product_type;
 				$line->qty              = $objp->qty;
+				$line->ref_ext          = $objp->ref_ext;
 
 				$line->vat_src_code     = $objp->vat_src_code;
 				$line->tva_tx           = $objp->tva_tx;
@@ -2118,13 +2087,13 @@ class Commande extends CommonOrder
 				$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;
+				$this->lines[$i] = $line;
 
 				$i++;
 			}
@@ -2132,9 +2101,7 @@ class Commande extends CommonOrder
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -2197,9 +2164,7 @@ class Commande extends CommonOrder
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2244,9 +2209,7 @@ class Commande extends CommonOrder
 			}
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2262,7 +2225,7 @@ class Commande extends CommonOrder
 	 */
 	public function nb_expedition()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = 'SELECT count(*)';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'expedition as e';
 		$sql .= ', '.MAIN_DB_PREFIX.'element_element as el';
@@ -2275,8 +2238,7 @@ class Commande extends CommonOrder
 		{
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2290,7 +2252,7 @@ class Commande extends CommonOrder
 	 */
 	public function stock_array($filtre_statut = self::STATUS_CANCELED)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->stocks = array();
 
 		// Tableau des id de produit de la commande
@@ -2362,36 +2324,26 @@ class Commande extends CommonOrder
 						{
 							$this->db->commit();
 							return 1;
-						}
-						else
-						{
+						} else {
 							$this->db->rollback();
 							$this->error = $this->db->lasterror();
 							return -1;
 						}
-					}
-					else
-					{
+					} else {
 						$this->db->rollback();
 						$this->error = $line->error;
 						return -1;
 					}
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return 0;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -1;
 		}
@@ -2408,7 +2360,7 @@ class Commande extends CommonOrder
 	 */
 	public function set_remise($user, $remise, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
 		if ($user->rights->commande->creer)
@@ -2450,9 +2402,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2476,7 +2426,7 @@ class Commande extends CommonOrder
 	 */
 	public function set_remise_absolue($user, $remise, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
 		if ($user->rights->commande->creer)
@@ -2518,9 +2468,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2544,7 +2492,7 @@ class Commande extends CommonOrder
 	 */
 	public function set_date($user, $date, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($user->rights->commande->creer)
 		{
 			$error = 0;
@@ -2581,9 +2529,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2592,9 +2538,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -2610,7 +2554,7 @@ class Commande extends CommonOrder
 	 */
 	public function set_date_livraison($user, $date_livraison, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($user->rights->commande->creer)
 		{
 			$error = 0;
@@ -2647,9 +2591,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2658,9 +2600,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -2681,7 +2621,7 @@ class Commande extends CommonOrder
 	 */
 	public function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'c.date_commande', $sortorder = 'DESC')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$ga = array();
@@ -2717,13 +2657,10 @@ class Commande extends CommonOrder
 					if ($shortlist == 1)
 					{
 						$ga[$obj->cid] = $obj->ref;
-					}
-					elseif ($shortlist == 2)
+					} elseif ($shortlist == 2)
 					{
 						$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else
-					{
+					} else {
 						$ga[$i]['id'] = $obj->cid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -2732,9 +2669,7 @@ class Commande extends CommonOrder
 				}
 			}
 			return $ga;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2788,9 +2723,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2799,9 +2732,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'Command status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2820,7 +2751,7 @@ class Commande extends CommonOrder
 	 */
 	public function demand_reason($demand_reason_id, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		dol_syslog('Commande::demand_reason('.$demand_reason_id.')');
@@ -2860,9 +2791,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2871,9 +2800,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$error_str = 'order status do not meet requirement '.$this->statut;
 			dol_syslog(__METHOD__.$error_str, LOG_ERR);
 			$this->error = $error_str;
@@ -2893,7 +2820,7 @@ class Commande extends CommonOrder
 	 */
 	public function set_ref_client($user, $ref_client, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($user->rights->commande->creer)
 		{
 			$error = 0;
@@ -2929,9 +2856,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2940,9 +2865,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -2984,9 +2907,7 @@ class Commande extends CommonOrder
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyBilled ".$errmsg, LOG_ERR);
@@ -2995,9 +2916,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3039,9 +2958,7 @@ class Commande extends CommonOrder
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
@@ -3050,9 +2967,7 @@ class Commande extends CommonOrder
 				$this->db->rollback();
 				return -1 * $error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3086,13 +3001,14 @@ class Commande extends CommonOrder
 	 * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @param		double			$pu_ht_devise		Amount in currency
 	 * 	@param		int				$notrigger			disable line update trigger
+	 * 	@param		string			$ref_ext			external reference
 	 *  @return   	int              					< 0 if KO, > 0 if OK
 	 */
-	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $price_base_type = 'HT', $info_bits = 0, $date_start = '', $date_end = '', $type = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
+	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $price_base_type = 'HT', $info_bits = 0, $date_start = '', $date_end = '', $type = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $ref_ext = '')
 	{
 		global $conf, $mysoc, $langs, $user;
 
-		dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code");
+		dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code, ref_ext=$ref_ext");
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		if ($this->statut == Commande::STATUS_DRAFT)
@@ -3105,6 +3021,7 @@ class Commande extends CommonOrder
 			if (empty($txlocaltax2)) $txlocaltax2 = 0;
 			if (empty($remise_percent)) $remise_percent = 0;
 			if (empty($special_code) || $special_code == 3) $special_code = 0;
+			if (empty($ref_ext)) $ref_ext = '';
 
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
@@ -3160,9 +3077,7 @@ class Commande extends CommonOrder
 			if ($price_base_type == 'TTC')
 			{
 				$subprice = $pu_ttc;
-			}
-			else
-			{
+			} else {
 				$subprice = $pu_ht;
 			}
 			$remise = 0;
@@ -3211,6 +3126,7 @@ class Commande extends CommonOrder
 			$this->line->label = $label;
 			$this->line->desc = $desc;
 			$this->line->qty = $qty;
+			$this->line->ref_ext = $ref_ext;
 
 			$this->line->vat_src_code = $vat_src_code;
 			$this->line->tva_tx         = $txtva;
@@ -3265,17 +3181,13 @@ class Commande extends CommonOrder
 
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = get_class($this)."::updateline Order status makes operation forbidden";
 			$this->errors = array('OrderStatusMakeOperationForbidden');
 			return -2;
@@ -3300,7 +3212,7 @@ class Commande extends CommonOrder
 		if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
 		if (isset($this->note) || isset($this->note_private)) $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
 		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
+		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
 		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 
 		// Check parameters
@@ -3369,9 +3281,7 @@ class Commande extends CommonOrder
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -3412,9 +3322,9 @@ class Commande extends CommonOrder
 		if (!$error)
 		{
 			// Delete extrafields of order details
-                        $main = MAIN_DB_PREFIX.'commandedet';
-                        $ef = $main."_extrafields";
-                        $sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_commande = ".$this->id.")";
+						$main = MAIN_DB_PREFIX.'commandedet';
+						$ef = $main."_extrafields";
+						$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_commande = ".$this->id.")";
 			if (!$this->db->query($sql))
 			{
 				$error++;
@@ -3506,9 +3416,7 @@ class Commande extends CommonOrder
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
@@ -3528,7 +3436,7 @@ class Commande extends CommonOrder
 	 */
 	public function load_board($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$clause = " WHERE";
@@ -3573,9 +3481,7 @@ class Commande extends CommonOrder
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -3619,55 +3525,51 @@ class Commande extends CommonOrder
 	 */
 	public function LibStatut($status, $billed, $mode, $donotshowbilled = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$billedtext = '';
 		if (empty($donotshowbilled)) $billedtext .= ($billed ? ' - '.$langs->trans("Billed") : '');
 
+		$labelTooltip = '';
+
 		if ($status == self::STATUS_CANCELED) {
-		    $labelStatus = $langs->trans('StatusOrderCanceled');
-		    $labelStatusShort = $langs->trans('StatusOrderCanceledShort');
-		    $statusType = 'status9';
-		}
-		elseif ($status == self::STATUS_DRAFT) {
-		    $labelStatus = $langs->trans('StatusOrderDraft');
-		    $labelStatusShort = $langs->trans('StatusOrderDraftShort');
-		    $statusType = 'status0';
-		}
-		elseif ($status == self::STATUS_VALIDATED) {
-		    $labelStatus = $langs->trans('StatusOrderValidated').$billedtext;
-		    $labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
-		    $statusType = 'status1';
-		}
-		elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
-		    $labelStatus = $langs->trans('StatusOrderSentShort').$billedtext;
-		    $labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
-		    $statusType = 'status4';
-		}
-		elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
-		    $labelStatus = $langs->trans('StatusOrderToBill');
-		    $labelStatusShort = $langs->trans('StatusOrderToBillShort');
-		    $statusType = 'status4';
-		}
-		elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
-		    $labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
-		    $labelStatusShort = $langs->trans('StatusOrderProcessed').$billedtext;
-		    $statusType = 'status6';
-		}
-		elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
-		    $labelStatus = $langs->trans('StatusOrderDelivered');
-		    $labelStatusShort = $langs->trans('StatusOrderDelivered');
-		    $statusType = 'status6';
-		}
-		else {
-		    $labelStatus = $langs->trans('Unknown');
-		    $labelStatusShort = '';
-		    $statusType = '';
-		    $mode = 0;
+			$labelStatus = $langs->trans('StatusOrderCanceled');
+			$labelStatusShort = $langs->trans('StatusOrderCanceledShort');
+			$statusType = 'status9';
+		} elseif ($status == self::STATUS_DRAFT) {
+			$labelStatus = $langs->trans('StatusOrderDraft');
+			$labelStatusShort = $langs->trans('StatusOrderDraftShort');
+			$statusType = 'status0';
+		} elseif ($status == self::STATUS_VALIDATED) {
+			$labelStatus = $langs->trans('StatusOrderValidated').$billedtext;
+			$labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
+			$statusType = 'status1';
+		} elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
+			$labelStatus = $langs->trans('StatusOrderSent').$billedtext;
+			$labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
+			$labelTooltip = $langs->trans("StatusOrderSent").' - '.$langs->trans("DateDeliveryPlanned").dol_print_date($this->date_livraison).$billedtext;
+			$statusType = 'status4';
+		} elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+			$labelStatus = $langs->trans('StatusOrderToBill');
+			$labelStatusShort = $langs->trans('StatusOrderToBillShort');
+			$statusType = 'status4';
+		} elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+			$labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
+			$labelStatusShort = $langs->trans('StatusOrderProcessedShort').$billedtext;
+			$statusType = 'status6';
+		} elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+			$labelStatus = $langs->trans('StatusOrderDelivered');
+			$labelStatusShort = $langs->trans('StatusOrderDeliveredShort');
+			$statusType = 'status6';
+		} else {
+			$labelStatus = $langs->trans('Unknown');
+			$labelStatusShort = '';
+			$statusType = '';
+			$mode = 0;
 		}
 
-		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode, '', array('tooltip' => $labelTooltip));
 	}
 
 
@@ -3710,7 +3612,7 @@ class Commande extends CommonOrder
 		$label = '';
 
 		if ($user->rights->commande->lire) {
-			$label = '<u>'.$langs->trans("Order").'</u>';
+			$label = img_picto('', $this->picto).' <u>'.$langs->trans("Order").'</u>';
 			$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)) {
@@ -3822,9 +3724,7 @@ class Commande extends CommonOrder
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3849,6 +3749,8 @@ class Commande extends CommonOrder
 		$sql = "SELECT rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= $this->db->plimit(100);
+
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -3898,9 +3800,7 @@ class Commande extends CommonOrder
 				$line->total_ttc = 60;
 				$line->total_tva = 10;
 				$line->remise_percent = 50;
-			}
-			else
-			{
+			} else {
 				$line->total_ht = 100;
 				$line->total_ttc = 120;
 				$line->total_tva = 20;
@@ -3932,7 +3832,7 @@ class Commande extends CommonOrder
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$this->nb = array();
@@ -3958,9 +3858,7 @@ class Commande extends CommonOrder
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4101,6 +3999,8 @@ class OrderLine extends CommonOrderLine
 	 */
 	public $label;
 
+	public $ref_ext;
+
 	public $fk_remise_except;
 	public $rang = 0;
 	public $fk_fournprice;
@@ -4131,10 +4031,10 @@ class OrderLine extends CommonOrderLine
 	 *
 	 *      @param     DoliDB	$db      handler d'acces base de donnee
 	 */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 	/**
 	 *  Load line order
@@ -4145,7 +4045,7 @@ class OrderLine extends CommonOrderLine
 	public function fetch($rowid)
 	{
 		$sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_parent_line, cd.fk_product, cd.product_type, cd.label as custom_label, cd.description, cd.price, cd.qty, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx,';
-		$sql .= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
+		$sql .= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice, cd.ref_ext,';
 		$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
 		$sql .= ' cd.fk_unit,';
 		$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
@@ -4167,6 +4067,7 @@ class OrderLine extends CommonOrderLine
 			$this->qty              = $objp->qty;
 			$this->price            = $objp->price;
 			$this->subprice         = $objp->subprice;
+			$this->ref_ext          = $objp->ref_ext;
 			$this->vat_src_code     = $objp->vat_src_code;
 			$this->tva_tx           = $objp->tva_tx;
 			$this->localtax1_tx		= $objp->localtax1_tx;
@@ -4212,9 +4113,7 @@ class OrderLine extends CommonOrderLine
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -4233,32 +4132,32 @@ class OrderLine extends CommonOrderLine
 
 		$error = 0;
 
-        // check if order line is not in a shipment line before deleting
-        $sqlCheckShipmentLine  = "SELECT";
-        $sqlCheckShipmentLine .= " ed.rowid";
-        $sqlCheckShipmentLine .= " FROM ".MAIN_DB_PREFIX."expeditiondet ed";
-        $sqlCheckShipmentLine .= " WHERE ed.fk_origin_line = ".$this->rowid;
+		// check if order line is not in a shipment line before deleting
+		$sqlCheckShipmentLine  = "SELECT";
+		$sqlCheckShipmentLine .= " ed.rowid";
+		$sqlCheckShipmentLine .= " FROM ".MAIN_DB_PREFIX."expeditiondet ed";
+		$sqlCheckShipmentLine .= " WHERE ed.fk_origin_line = ".$this->rowid;
 
-        $resqlCheckShipmentLine = $this->db->query($sqlCheckShipmentLine);
-        if (!$resqlCheckShipmentLine) {
-            $error++;
-            $this->error    = $this->db->lasterror();
-            $this->errors[] = $this->error;
-        } else {
-            $langs->load('errors');
-            $num = $this->db->num_rows($resqlCheckShipmentLine);
-            if ($num > 0) {
-                $error++;
-                $objCheckShipmentLine = $this->db->fetch_object($resqlCheckShipmentLine);
-                $this->error = $langs->trans('ErrorRecordAlreadyExists').' : '.$langs->trans('ShipmentLine').' '.$objCheckShipmentLine->rowid;
-                $this->errors[] = $this->error;
-            }
-            $this->db->free($resqlCheckShipmentLine);
-        }
-        if ($error) {
-            dol_syslog(__METHOD__.'Error ; '.$this->error, LOG_ERR);
-            return -1;
-        }
+		$resqlCheckShipmentLine = $this->db->query($sqlCheckShipmentLine);
+		if (!$resqlCheckShipmentLine) {
+			$error++;
+			$this->error    = $this->db->lasterror();
+			$this->errors[] = $this->error;
+		} else {
+			$langs->load('errors');
+			$num = $this->db->num_rows($resqlCheckShipmentLine);
+			if ($num > 0) {
+				$error++;
+				$objCheckShipmentLine = $this->db->fetch_object($resqlCheckShipmentLine);
+				$this->error = $langs->trans('ErrorRecordAlreadyExists').' : '.$langs->trans('ShipmentLine').' '.$objCheckShipmentLine->rowid;
+				$this->errors[] = $this->error;
+			}
+			$this->db->free($resqlCheckShipmentLine);
+		}
+		if ($error) {
+			dol_syslog(__METHOD__.'Error ; '.$this->error, LOG_ERR);
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -4300,9 +4199,7 @@ class OrderLine extends CommonOrderLine
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -4340,6 +4237,7 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->special_code)) $this->special_code = 0;
 		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
 		if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->ref_ext)) $this->ref_ext = '';
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -4347,9 +4245,7 @@ class OrderLine extends CommonOrderLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4361,7 +4257,7 @@ class OrderLine extends CommonOrderLine
 
 		// Insertion dans base de la ligne
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet';
-		$sql .= ' (fk_commande, fk_parent_line, label, description, qty, ';
+		$sql .= ' (fk_commande, fk_parent_line, label, description, qty, ref_ext,';
 		$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
 		$sql .= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
 		$sql .= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,';
@@ -4374,6 +4270,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " '".$this->db->escape($this->desc)."',";
 		$sql .= " '".price2num($this->qty)."',";
+		$sql .= " '".$this->db->escape($this->ref_ext)."',";
 		$sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
 		$sql .= " '".price2num($this->tva_tx)."',";
 		$sql .= " '".price2num($this->localtax1_tx)."',";
@@ -4444,9 +4341,7 @@ class OrderLine extends CommonOrderLine
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4486,6 +4381,7 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->product_type)) $this->product_type = 0;
 		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
 		if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->ref_ext)) $this->ref_ext = '';
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
@@ -4493,9 +4389,7 @@ class OrderLine extends CommonOrderLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -4513,6 +4407,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
 		$sql .= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
 		$sql .= " , qty=".price2num($this->qty);
+		$sql .= " , ref_ext='".$this->db->escape($this->ref_ext)."'";
 		$sql .= " , subprice=".price2num($this->subprice)."";
 		$sql .= " , remise_percent=".price2num($this->remise_percent)."";
 		$sql .= " , price=".price2num($this->price).""; // TODO A virer
@@ -4578,9 +4473,7 @@ class OrderLine extends CommonOrderLine
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -4596,7 +4489,7 @@ class OrderLine extends CommonOrderLine
 	 */
 	public function update_total()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->db->begin();
 
 		// Clean parameters
@@ -4619,9 +4512,7 @@ class OrderLine extends CommonOrderLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index cbb93b940de..5af5fb23060 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -78,8 +78,7 @@ class CommandeStats extends Stats
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
 			$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
-		}
-		elseif ($mode == 'supplier')
+		} elseif ($mode == 'supplier')
 		{
 			$object = new CommandeFournisseur($this->db);
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 6b9e3ae039a..2a1042c4347 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -33,11 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('orders', 'sendings', 'companies'));
+$langs->loadLangs(array('orders', 'sendings', 'companies', 'bills'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -63,16 +63,12 @@ if ($action == 'addcontact' && $user->rights->commande->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -84,9 +80,7 @@ elseif ($action == 'swapstatut' && $user->rights->commande->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -101,8 +95,7 @@ elseif ($action == 'deletecontact' && $user->rights->commande->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -206,9 +199,7 @@ if ($id > 0 || !empty($ref))
 		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 		    if ($res) break;
 		}
-	}
-	else
-	{
+	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 1e445a602f7..f2f806cc7af 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -164,7 +164,7 @@ if ($resql)
 
 		$result = '';
 		$link = $linkend = '';
-		$link = '<a href="'.dol_buildpath('/commande/orderstoinvoice.php', 1).'?socid='.$obj->rowid.'">';
+		$link = '<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$obj->rowid.'">';
 		$linkend = '</a>';
 		$name = $obj->name;
 		$result .= ($link.img_object($langs->trans("ShowCompany").': '.$name, 'company').$linkend);
@@ -184,9 +184,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 9d188cda104..ab4f3990b78 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -37,7 +37,7 @@ if (!empty($conf->projet->enabled)) {
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array('companies', 'other'));
+$langs->loadLangs(array('companies', 'other', 'bills'));
 
 $action		= GETPOST('action', 'aZ09');
 $confirm	= GETPOST('confirm');
@@ -182,14 +182,10 @@ if ($id > 0 || !empty($ref))
 		$permtoedit = $user->rights->commande->creer;
 		$param = '&id='.$object->id.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity);
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 13d67c942ed..96476caeeed 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -173,9 +173,7 @@ if ($resql)
     //if ($totalinprocess != $total)
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -232,9 +230,7 @@ if (!empty($conf->commande->enabled))
                 print '</td></tr>';
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table></div><br>";
@@ -323,8 +319,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 $max = 10;
 
@@ -410,8 +405,7 @@ if (!empty($conf->commande->enabled))
 		}
 
 		print "</table></div><br>";
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 /*
@@ -495,8 +489,7 @@ if (!empty($conf->commande->enabled))
 			}
 		}
 		print "</table></div><br>";
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 9b45bf66312..d08e8148101 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -34,7 +34,7 @@ if (!empty($conf->projet->enabled)) {
 if (!$user->rights->commande->lire)	accessforbidden();
 
 // Load translation files required by the page
-$langs->loadLangs(array('orders', 'sendings'));
+$langs->loadLangs(array('orders', 'sendings', 'bills'));
 
 $socid = 0;
 $comid = GETPOST("id", 'int');
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 1e7e0d1d9d7..eaf944ff968 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills'));
+$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks'));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
@@ -55,6 +55,10 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'orderlist';
 
+$search_datecloture_start = GETPOST('search_datecloture_start', 'int');
+if (empty($search_datecloture_start)) $search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));
+$search_datecloture_end = GETPOST('search_datecloture_end', 'int');
+if (empty($search_datecloture_end)) $search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
 $search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_startmonth', 'int'), GETPOST('search_dateorder_startday', 'int'), GETPOST('search_dateorder_startyear', 'int'));
 $search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_endmonth', 'int'), GETPOST('search_dateorder_endday', 'int'), GETPOST('search_dateorder_endyear', 'int'));
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_startmonth', 'int'), GETPOST('search_datedelivery_startday', 'int'), GETPOST('search_datedelivery_startyear', 'int'));
@@ -68,7 +72,7 @@ $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state", 'alpha');
 $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
-$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'));
 $socid = GETPOST('socid', 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
@@ -158,6 +162,8 @@ $arrayfields = array(
 	'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.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),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>1000, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)))
 );
@@ -210,6 +216,7 @@ if (empty($reshook))
 		$search_total_ht = '';
 		$search_total_vat = '';
 		$search_total_ttc = '';
+		$search_warehouse = '';
 		$search_multicurrency_code = '';
 		$search_multicurrency_tx = '';
 		$search_multicurrency_montant_ht = '';
@@ -227,6 +234,8 @@ if (empty($reshook))
 		$toselect = '';
 		$search_array_options = array();
 		$search_categ_cus = 0;
+		$search_datecloture_start = '';
+		$search_datecloture_end = '';
 	}
 	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'))
@@ -269,7 +278,7 @@ $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client, c.fk_user_author,';
 $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,';
-$sql .= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
+$sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
 $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
 $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 $sql .= " u.login";
@@ -333,6 +342,8 @@ if ($search_status <> '')
 	}
 }
 
+if ($search_datecloture_start)               $sql .= " AND c.date_cloture >= '".$db->idate($search_datecloture_start)."'";
+if ($search_datecloture_end)                 $sql .= " AND c.date_cloture <= '".$db->idate($search_datecloture_end)."'";
 if ($search_dateorder_start)                 $sql .= " AND c.date_commande >= '".$db->idate($search_dateorder_start)."'";
 if ($search_dateorder_end)                   $sql .= " AND c.date_commande <= '".$db->idate($search_dateorder_end)."'";
 if ($search_datedelivery_start)              $sql .= " AND c.date_livraison >= '".$db->idate($search_datedelivery_start)."'";
@@ -395,9 +406,7 @@ if ($resql)
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfOrders').' - '.$soc->name;
 		if (empty($search_company)) $search_company = $soc->name;
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans('ListOfOrders');
 	}
 	if (strval($search_status) == '0')
@@ -438,6 +447,8 @@ if ($resql)
 	if ($sall)						$param .= '&sall='.urlencode($sall);
 	if ($socid > 0)					$param .= '&socid='.urlencode($socid);
 	if ($search_status != '')		$param .= '&search_status='.urlencode($search_status);
+	if ($search_datecloture_start)  $param .= '&search_datecloture_start='.urlencode($search_datecloture_start);
+	if ($search_datecloture_end)    $param .= '&search_datecloture_end='.urlencode($search_datecloture_end);
 	if ($search_dateorder_start)    $param .= '&search_dateorder_start='.urlencode($search_dateorder_start);
 	if ($search_dateorder_end)      $param .= '&search_dateorder_end='.urlencode($search_dateorder_end);
 	if ($search_datedelivery_start) $param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
@@ -484,11 +495,9 @@ if ($resql)
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-	$newcardbutton = '';
-	if ($contextpage == 'orderlist' && $user->rights->commande->creer)
-	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/commande/card.php?action=create');
-    }
+	$url = DOL_URL_ROOT.'/commande/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlist' && $user->rights->commande->creer);
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -541,9 +550,7 @@ if ($resql)
 		{
 			print $form->selectyesno('validate_invoices', 0, 1, 1);
 			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
-		}
-		else
-		{
+		} else {
 			print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
@@ -586,7 +593,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -595,7 +602,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -627,6 +634,16 @@ if ($resql)
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
+	if (GETPOST('autoselectall', 'int')) {
+		$selectedfields .= '<script>';
+		$selectedfields .= '   $(document).ready(function() {';
+		$selectedfields .= '        console.log("Autoclick on checkforselects");';
+		$selectedfields .= '   		$("#checkforselects").click();';
+		$selectedfields .= '        $("#massaction").val("createbills").change();';
+		$selectedfields .= '   });';
+		$selectedfields .= '</script>';
+	}
+
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
@@ -635,37 +652,37 @@ if ($resql)
 	if (!empty($arrayfields['c.ref']['checked']))
 	{
 		print '<td class="liste_titre">';
-		print '<input class="flat" size="6" type="text" name="search_ref" value="'.$search_ref.'">';
+		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	// Ref customer
 	if (!empty($arrayfields['c.ref_client']['checked']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.$search_ref_customer.'">';
+		print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.dol_escape_htmltag($search_ref_customer).'">';
 		print '</td>';
 	}
 	// Project ref
 	if (!empty($arrayfields['p.ref']['checked']))
 	{
-		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'"></td>';
+		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
 	}
 	// Project title
 	if (!empty($arrayfields['p.title']['checked']))
 	{
-	    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project" value="'.$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']))
 	{
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" name="search_company" value="'.$search_company.'">';
+		print '<input class="flat" type="text" 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="4" name="search_town" value="'.$search_town.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 	// State
 	if (!empty($arrayfields['state.nom']['checked']))
 	{
@@ -692,12 +709,10 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From').' ';
-		print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start', 0, 0, 1);
+		print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to').' ';
-		print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end', 0, 0, 1);
+		print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
 	}
@@ -705,12 +720,10 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From').' ';
-		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1);
+		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to').' ';
-		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1);
+		print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
 	}
@@ -718,14 +731,14 @@ if ($resql)
 	{
 		// Amount
 		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_total_ht" value="'.$search_total_ht.'">';
+		print '<input class="flat" type="text" size="4" name="search_total_ht" value="'.dol_escape_htmltag($search_total_ht).'">';
 		print '</td>';
 	}
 	if (!empty($arrayfields['c.total_vat']['checked']))
 	{
 		// Amount
 		print '<td class="liste_titre right">';
-		print '<input class="flat" type="text" size="4" name="search_total_vat" value="'.$search_total_vat.'">';
+		print '<input class="flat" type="text" size="4" name="search_total_vat" value="'.dol_escape_htmltag($search_total_vat).'">';
 		print '</td>';
 	}
 	if (!empty($arrayfields['c.total_ttc']['checked']))
@@ -797,6 +810,24 @@ if ($resql)
 	}
 	// Date cloture
 	if (!empty($arrayfields['c.date_cloture']['checked']))
+	{
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datecloture_start ? $search_datecloture_start : -1, 'search_datecloture_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datecloture_end ? $search_datecloture_end : -1, 'search_datecloture_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
+		print '</td>';
+	}
+	// Note public
+	if (!empty($arrayfields['c.note_public']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Note private
+	if (!empty($arrayfields['c.note_private']['checked']))
 	{
 		print '<td class="liste_titre">';
 		print '</td>';
@@ -864,6 +895,8 @@ if ($resql)
 	if (!empty($arrayfields['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $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 ');
 	if (!empty($arrayfields['c.date_cloture']['checked']))       print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	if (!empty($arrayfields['c.note_public']['checked'])) print_liste_field_titre($arrayfields['c.note_public']['label'], $_SERVER["PHP_SELF"], "c.note_public", "", $param, '', $sortfield, $sortorder, 'right ');
+	if (!empty($arrayfields['c.note_private']['checked'])) print_liste_field_titre($arrayfields['c.note_private']['label'], $_SERVER["PHP_SELF"], "c.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
@@ -872,6 +905,7 @@ if ($resql)
 	$total = 0;
 	$subtotal = 0;
 	$productstat_cache = array();
+	$productstat_cachevirtual = array();
 	$getNomUrl_cache = array();
 
 	$generic_commande = new Commande($db);
@@ -929,7 +963,6 @@ if ($resql)
 			// Show shippable Icon (create subloop, so may be slow)
 			if ($conf->stock->enabled)
 			{
-				$langs->load("stocks");
 				if (($obj->fk_statut > 0) && ($obj->fk_statut < 3))
 				{
 					$numlines = count($generic_commande->lines); // Loop on each line of order
@@ -953,17 +986,16 @@ if ($resql)
 
 							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST))  // Default code. Default is when this option is not set, setting it create strange result
 							{
-								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
-								$text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel;
-								$text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique;
+								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+								$text_info .= ' - '.$langs->trans("Stock").': <span class="'.($generic_product->stock_reel > 0 ? 'ok' : 'error').'">'.$generic_product->stock_reel.'</span>';
+								$text_info .= ' - '.$langs->trans("VirtualStock").': <span class="'.($generic_product->stock_theorique > 0 ? 'ok' : 'error').'">'.$generic_product->stock_theorique.'</span>';
 								$text_info .= '<br>';
 
 								if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel)
 								{
 									$notshippable++;
 								}
-							}
-							else {  // Detailed code, looks bugged
+							} else {  // Detailed virtual stock, looks bugged, uncomplete and need heavy load.
 								// stock order and stock order_supplier
 								$stock_order = 0;
 								$stock_order_supplier = 0;
@@ -1086,7 +1118,7 @@ if ($resql)
 				{
 					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0))
 					{
-						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$companystatic->id.'">';
+						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$companystatic->id.'&search_billed=0&autoselectall=1">';
 						print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').'</a>';
 					}
 				}
@@ -1129,7 +1161,7 @@ if ($resql)
 		if (!empty($arrayfields['typent.code']['checked']))
 		{
 			print '<td class="center">';
-			if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
+			if (empty($typenArray)) $typenArray = $formcompany->typent_array(1);
 			print $typenArray[$obj->typent_code];
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
@@ -1147,7 +1179,7 @@ if ($resql)
 		if (!empty($arrayfields['c.date_delivery']['checked']))
 		{
 			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_delivery), 'day');
+			print dol_print_date($db->jdate($obj->date_delivery), 'dayhour');
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
@@ -1253,6 +1285,22 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+		// Note public
+		if (!empty($arrayfields['c.note_public']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print dol_escape_htmltag($obj->note_public);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Note private
+		if (!empty($arrayfields['c.note_private']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print dol_escape_htmltag($obj->note_private);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Status
 		if (!empty($arrayfields['c.fk_statut']['checked']))
 		{
@@ -1267,7 +1315,7 @@ if ($resql)
 		}
 
 		// Action column
-		print '<td class="nowrap" align="center">';
+		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;
@@ -1310,9 +1358,7 @@ if ($resql)
 	$delallowed = $user->rights->commande->creer;
 
 	print $formfile->showdocuments('massfilesarea_orders', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 9054252e6d9..9922d3b0e3e 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('companies', 'bills', 'orders'));
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = 0;
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
deleted file mode 100644
index f230f7935a5..00000000000
--- a/htdocs/commande/orderstoinvoice.php
+++ /dev/null
@@ -1,741 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2005       Marc Barilley / Ocebo   <marc@ocebo.com>
- * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2012       Andreu Bisquerra Gaya   <jove@bisquerra.com>
- * Copyright (C) 2012       David Rodriguez Martinez <davidrm146@gmail.com>
- * Copyright (C) 2012-2018  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
- * 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/commande/orderstoinvoice.php
- *	\ingroup    commande
- *	\brief      Page to invoice multiple orders
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.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';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-if (!empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("orders", "deliveries", "companies"));
-
-if (!$user->rights->facture->creer)
-	accessforbidden();
-
-$id				= (GETPOST('id') ?GETPOST('id', 'int') : GETPOST("facid", "int")); // For backward compatibility
-$ref			= GETPOST('ref', 'alpha');
-$action			= GETPOST('action', 'alpha');
-$confirm		= GETPOST('confirm', 'alpha');
-$sref			= GETPOST('sref', 'alpha');
-$sref_client = GETPOST('sref_client', 'alpha');
-$sall			= trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$socid = GETPOST('socid', 'int');
-$selected = GETPOST('orders_to_invoice');
-$sortfield		= GETPOST("sortfield", 'alpha');
-$sortorder		= GETPOST("sortorder", 'alpha');
-$search_status = GETPOST('search_status', 'alpha');
-
-$error = 0;
-
-if (!$sortfield) $sortfield = 'c.rowid';
-if (!$sortorder) $sortorder = 'DESC';
-
-$now = dol_now();
-$date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]); // Date for local PHP server
-$date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]);
-$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server
-$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]);
-
-$extrafields = new ExtraFields($db);
-
-$object = new Facture($db);
-
-// fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
-
-if ($action == 'create')
-{
-	if (!is_array($selected))
-	{
-		$error++;
-		setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
-	}
-	else
-	{
-		$origin = GETPOST('origin');
-		$originid = GETPOST('originid');
-	}
-}
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager = new HookManager($db);
-$hookmanager->initHooks(array('orderstoinvoice'));
-
-
-/*
- * Actions
- */
-
-if (($action == 'create' || $action == 'add') && !$error)
-{
-	require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-	if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-	$langs->load('bills');
-	$langs->load('products');
-	$langs->load('main');
-	if (isset($_GET['orders_to_invoice']))
-	{
-		$orders_id = GETPOST('orders_to_invoice', '', 1);
-		$n        = count($orders_id);
-		$i        = 0;
-
-		$originid = $orders_id[0];
-		$_GET['originid'] = $orders_id[0];
-	}
-	if (isset($_POST['orders_to_invoice']))
-	{
-		$orders_id = GETPOST('orders_to_invoice', '', 2);
-		$nn        = count($orders_id);
-		$ii        = 0;
-
-		$originid = $orders_id[0];
-		$_POST['originid'] = $orders_id[0];
-	}
-
-	$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
-	$lineid			= GETPOST('lineid', 'int');
-	$userid			= GETPOST('userid', 'int');
-	$search_ref		= GETPOST('sf_ref') ?GETPOST('sf_ref') : GETPOST('search_ref');
-	$closeOrders	= GETPOST('autocloseorders') ? true : false;
-
-	// Security check
-	$fieldid = GETPOST('ref', 'alpha') ? 'ref' : 'rowid';
-	if ($user->socid) $socid = $user->socid;
-	$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
-
-	$usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
-
-	// Insert new invoice in database
-	if ($action == 'add' && $user->rights->facture->creer)
-	{
-		$object->socid = GETPOST('socid');
-		$db->begin();
-		$error = 0;
-
-		// Standard or deposit or proforma invoice
-		if ($_POST['type'] == 0)
-		{
-			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-			if (empty($datefacture))
-			{
-				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-			}
-			if (!$error)
-			{
-				// Si facture standard
-				$object->socid = $_POST['socid'];
-				$object->type				= $_POST['type'];
-				$object->number = $_POST['ref'];
-				$object->date				= $datefacture;
-				$object->note_public		= trim($_POST['note_public']);
-				$object->note				= trim($_POST['note']);
-				$object->ref_client			= $_POST['ref_client'];
-				$object->modelpdf = $_POST['model'];
-				$object->fk_project			= $_POST['projectid'];
-				$object->cond_reglement_id	= ($_POST['type'] == 3 ? 1 : $_POST['cond_reglement_id']);
-				$object->mode_reglement_id	= $_POST['mode_reglement_id'];
-				$object->amount = $_POST['amount'];
-				$object->remise_absolue		= $_POST['remise_absolue'];
-				$object->remise_percent		= $_POST['remise_percent'];
-
-				$ret = $extrafields->setOptionalsFromPost(null, $object);
-				if ($ret < 0) $error++;
-
-				if ($_POST['origin'] && $_POST['originid'])
-				{
-					$object->origin    = $_POST['origin'];
-					$object->origin_id = $orders_id[$ii];
-					$object->linked_objects = $orders_id;
-					$id = $object->create($user);
-					$object->fetch_thirdparty();
-
-					if ($id > 0)
-					{
-						foreach ($orders_id as $origin => $origin_id)
-						{
-							$origin_id = (!empty($origin_id) ? $origin_id : $object->origin_id);
-							$db->begin();
-							$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-							$sql .= "fk_source";
-							$sql .= ", sourcetype";
-							$sql .= ", fk_target";
-							$sql .= ", targettype";
-							$sql .= ") VALUES (";
-							$sql .= $origin_id;
-							$sql .= ", '".$object->origin."'";
-							$sql .= ", ".$id;
-							$sql .= ", '".$object->element."'";
-							$sql .= ")";
-
-							if ($db->query($sql))
-							{
-								$db->commit();
-							}
-							else
-							{
-								$db->rollback();
-							}
-						}
-
-						while ($ii < $nn)
-						{
-							include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-							$objectsrc = new Commande($db);
-							dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
-							$result = $objectsrc->fetch($orders_id[$ii]);
-							if ($result > 0)
-							{
-								if ($closeOrders)
-								{
-									$objectsrc->classifyBilled($user);
-									$objectsrc->setStatut(3);
-								}
-								$lines = $objectsrc->lines;
-								if (empty($lines) && method_exists($objectsrc, 'fetch_lines'))
-								{
-									$objectsrc->fetch_lines();
-									$lines = $objectsrc->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;
-										}
-
-										// Extrafields
-										if (method_exists($lines[$i], 'fetch_optionals')) {
-											$lines[$i]->fetch_optionals();
-											$array_options = $lines[$i]->array_options;
-										}
-
-                                        $result = $object->addline(
-											$desc,
-											$lines[$i]->subprice,
-											$lines[$i]->qty,
-											$lines[$i]->tva_tx,
-											$lines[$i]->localtax1_tx,
-											$lines[$i]->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,
-											$ii,
-											$lines[$i]->special_code,
-											$object->origin,
-											$lines[$i]->rowid,
-											$fk_parent_line,
-											$lines[$i]->fk_fournprice,
-											$lines[$i]->pa_ht,
-											$lines[$i]->label,
-                                            $array_options
-										);
-										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;
-										}
-									}
-								}
-							}
-							else
-							{
-								setEventMessages($objectsrc->error, $objectsrc->errors, 'errors');
-								$error++;
-							}
-							$ii++;
-						}
-					}
-					else
-					{
-						setEventMessages($object->error, $object->errors, 'errors');
-						$error++;
-					}
-				}
-			}
-		}
-
-		// End of object creation, we show it
-		if ($id > 0 && !$error)
-		{
-			$db->commit();
-			header('Location: '.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$id);
-			exit;
-		}
-		else
-		{
-			$db->rollback();
-			$action = 'create';
-			$_GET["origin"] = $_POST["origin"];
-			$_GET["originid"] = $_POST["originid"];
-			setEventMessages($object->error, $object->errors, 'errors');
-			$error++;
-		}
-	}
-}
-
-
-/*
- * View
- */
-
-$html = new Form($db);
-$htmlother = new FormOther($db);
-$formfile = new FormFile($db);
-$companystatic = new Societe($db);
-
-// Mode creation
-if ($action == 'create' && !$error)
-{
-	$facturestatic = new Facture($db);
-
-	llxHeader();
-	print load_fiche_titre($langs->trans('NewBill'));
-
-	$soc = new Societe($db);
-	if ($socid) $res = $soc->fetch($socid);
-	if ($res)
-	{
-		$cond_reglement_id 	= $soc->cond_reglement_id;
-		$mode_reglement_id 	= $soc->mode_reglement_id;
-		$remise_percent = $soc->remise_percent;
-	}
-	$remise_absolue = 0;
-	$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
-
-	$absolute_discount = $soc->getAvailableDiscounts();
-	print '<form name="add" 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="socid" value="'.$soc->id.'">'."\n";
-	print '<input name="ref" type="hidden" value="provisoire">';
-	print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
-	print '<input type="hidden" name="originid" value="'.GETPOST('originid').'">';
-	print '<input type="hidden" name="autocloseorders" value="'.GETPOST('autocloseorders').'">';
-
-	dol_fiche_head();
-
-	print '<table class="border centpercent">';
-
-	// Ref
-	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
-
-	// Third party
-	print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td><td>';
-	print $soc->getNomUrl(1);
-	print '<input type="hidden" name="socid" value="'.$soc->id.'">';
-	print '</td>';
-	print '</tr>'."\n";
-
-	// Type
-	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td>';
-	print '<table class="nobordernopadding">'."\n";
-
-	// Standard invoice
-	print '<tr height="18"><td width="16px" valign="middle">';
-	print '<input type="radio" name="type" value="0"'.(GETPOST('type') == 0 ? ' checked' : '').'>';
-	print '</td><td valign="middle">';
-	$desc = $html->textwithpicto($langs->trans("InvoiceStandardAsk"), $langs->transnoentities("InvoiceStandardDesc"), 1);
-	print $desc;
-	print '</td></tr>'."\n";
-	print '</table>';
-
-	// Date invoice
-	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
-	print $html->selectDate('', '', '', '', '', "add", 1, 1);
-	print '</td></tr>';
-	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	$html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
-	print '</td></tr>';
-	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	$html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
-	print '</td></tr>';
-	// Project
-	if (!empty($conf->projet->enabled))
-	{
-		$formproject = new FormProjets($db);
-
-		$langs->load('projects');
-		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects($soc->id, $projectid, 'projectid');
-		print '</td></tr>';
-	}
-
-	include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-	$objectsrc = new Commande($db);
-	$listoforders = array();
-	foreach ($selected as $sel)
-	{
-		$result = $objectsrc->fetch($sel);
-		if ($result > 0)
-		{
-			$listoforders[] = $objectsrc->ref;
-		}
-	}
-
-	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc, 'idsrc' => $listoforders);
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
-		$object = new Facture($db);
-		print $object->showOptionals($extrafields, 'edit');
-	}
-
-	// Modele PDF
-	print '<tr><td>'.$langs->trans('Model').'</td>';
-	print '<td>';
-	include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-	$liste = ModelePDFFactures::liste_modeles($db);
-	print $html->selectarray('model', $liste, $conf->global->FACTURE_ADDON_PDF);
-	print "</td></tr>";
-
-	// Public note
-	print '<tr>';
-	print '<td class="border" valign="top">'.$langs->trans('NotePublic').'</td>';
-	print '<td valign="top">';
-	print '<textarea name="note_public" class="quatrevingtpercent" rows="'.ROWS_3.'">';
-
-	print $langs->trans("Orders").": ".implode(', ', $listoforders);
-
-	print '</textarea></td></tr>';
-	// Private note
-	if (empty($user->socid))
-	{
-		print '<tr>';
-		print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
-		print '<td valign="top">';
-		print '<textarea name="note" class="quatrevingtpercent" rows="'.ROWS_3.'">';
-
-		print '</textarea></td></tr>';
-	}
-
-	print '</table>';
-
-	while ($i < $n)
-	{
-		print '<input type="hidden" name="orders_to_invoice[]" value="'.$orders_id[$i].'">';
-
-		$i++;
-	}
-
-	dol_fiche_end();
-
-	// Button "Create Draft"
-	print '<div class="center"><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'" /></div>';
-	print "</form>\n";
-
-	print '</td></tr>';
-	print "</table>\n";
-}
-
-// Mode liste
-if (($action != 'create' && $action != 'add') || ($action == 'create' && $error))
-{
-	llxHeader();
-	?>
-	<script type="text/javascript">
-		jQuery(document).ready(function() {
-		jQuery("#checkall").click(function() {
-			jQuery(".checkformerge").prop('checked', true);
-		});
-		jQuery("#checknone").click(function() {
-			jQuery(".checkformerge").prop('checked', false);
-		});
-	});
-	</script>
-	<?php
-
-	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.entity, c.ref, c.total_ht, c.ref_client,';
-	$sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut, c.facture as billed';
-	$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
-	$sql .= ', '.MAIN_DB_PREFIX.'commande as c';
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= ' WHERE c.entity IN ('.getEntity('commande').')';
-	$sql .= ' AND c.fk_soc = s.rowid';
-
-	// Show orders with status validated, shipping started and delivered (well any order we can bill)
-	$sql .= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";
-
-	if ($socid)	$sql .= ' AND s.rowid = '.$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($sref)
-	{
-		$sql .= " AND c.ref LIKE '%".$db->escape($sref)."%'";
-	}
-	if ($sall)
-	{
-		$sql .= " AND (c.ref LIKE '%".$db->escape($sall)."%' OR c.note LIKE '%".$db->escape($sall)."%')";
-	}
-
-	//Date filter
-	if ($date_start && $date_end) $sql .= " AND c.date_commande >= '".$db->idate($date_start)."' AND c.date_commande <= '".$db->idate($date_end)."'";
-	if ($date_starty && $date_endy) $sql .= " AND c.date_livraison >= '".$db->idate($date_starty)."' AND c.date_livraison <= '".$db->idate($date_endy)."'";
-
-	if (!empty($sref_client))
-	{
-		$sql .= ' AND c.ref_client LIKE \'%'.$db->escape($sref_client).'%\'';
-	}
-	$sql .= $db->order($sortfield, $sortorder);
-
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		if ($socid)
-		{
-			$soc = new Societe($db);
-			$soc->fetch($socid);
-		}
-		$title = $langs->trans('ListOfOrders');
-		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill');
-		$num = $db->num_rows($resql);
-		print load_fiche_titre($title);
-		$i = 0;
-		$period = $html->selectDate($date_start, 'date_start', 0, 0, 1, '', 1, 0).' - '.$html->selectDate($date_end, 'date_end', 0, 0, 1, '', 1, 0);
-		$periodely = $html->selectDate($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0).' - '.$html->selectDate($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0);
-
-		if (!empty($socid))
-		{
-			// Company
-			$companystatic->id = $socid;
-			$companystatic->name = $soc->name;
-			print '<h3>'.$companystatic->getNomUrl(1, 'customer').'</h3>';
-		}
-
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'c.ref', '', '&amp;socid='.$socid, '', $sortfield, $sortorder);
-		print_liste_field_titre('RefCustomerOrder', $_SERVER["PHP_SELF"], 'c.ref_client', '', '&amp;socid='.$socid, '', $sortfield, $sortorder);
-		print_liste_field_titre('OrderDate', $_SERVER["PHP_SELF"], 'c.date_commande', '', '&amp;socid='.$socid, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre('DeliveryDate', $_SERVER["PHP_SELF"], 'c.date_livraison', '', '&amp;socid='.$socid, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre('Status', '', '', '', '', 'class="right"');
-		print_liste_field_titre('GenerateBill', '', '', '', '', 'align="center"');
-		print '</tr>';
-
-		// Fields title search
-		print '<form method="get" action="orderstoinvoice.php">';
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
-		print '<tr class="liste_titre">';
-
-		//REF
-		print '<td class="liste_titre">';
-		print '<input class="flat" size="10" type="text" name="sref" value="'.$sref.'">';
-		print '</td>';
-
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" size="10" name="sref_client" value="'.$sref_client.'">';
-        print '</td>';
-
-		//DATE ORDER
-		print '<td class="liste_titre" align="center">';
-		print $period;
-		print '</td>';
-
-		//DATE DELIVERY
-		print '<td class="liste_titre" align="center">';
-		print $periodely;
-		print '</td>';
-
-		//SEARCH BUTTON
-		print '<td class="liste_titre 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>';
-
-		//ALL/NONE
-		print '<td align="center" class="liste_titre">';
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
-		print '</td>';
-
-		print '</tr>';
-		print '</form>';
-
-		print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
-
-		$generic_commande = new Commande($db);
-
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">';
-
-			$generic_commande->id = $objp->rowid;
-			$generic_commande->ref = $objp->ref;
-			$generic_commande->statut = $objp->fk_statut;
-			$generic_commande->date_commande = $db->jdate($objp->date_commande);
-			$generic_commande->date_livraison = $db->jdate($objp->date_livraison);
-
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			print '<td class="nobordernopadding nowraponall">';
-			print $generic_commande->getNomUrl(1, 0);
-			print '</td>';
-
-			print '<td width="20" class="nobordernopadding nowraponall">';
-			if ($generic_commande->hasDelay()) {
-				print img_picto($langs->trans("Late"), "warning");
-			}
-			print '</td>';
-
-			print '<td width="16" class="nobordernopadding hideonsmartphone right">';
-			$filename = dol_sanitizeFileName($objp->ref);
-			$filedir = $conf->commande->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objp->rowid;
-			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
-			print '</td></tr></table>';
-			print '</td>';
-
-			print '<td>'.$objp->ref_client.'</td>';
-
-			// Order date
-			print '<td align="center" class="nowrap">';
-			print dol_print_date($db->jdate($objp->date_commande), 'day');
-			print '</td>';
-
-			//Delivery date
-			print '<td align="center" class="nowrap">';
-			print dol_print_date($db->jdate($objp->date_livraison), 'day');
-			print '</td>';
-
-			// Statut
-			print '<td class="nowrap right">'.$generic_commande->LibStatut($objp->fk_statut, $objp->billed, 5).'</td>';
-
-			// Checkbox
-			print '<td class="center">';
-			print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="'.$objp->rowid.'">';
-			print '</td>';
-
-			print '</tr>';
-
-			$total = $total + $objp->price;
-			$subtotal = $subtotal + $objp->price;
-			$i++;
-		}
-		print '</table>';
-        print '</div>';
-
-		// Buttons actions
-		print '<br><div class="center"><input type="checkbox" '.(empty($conf->global->INVOICE_CLOSE_ORDERS_OFF_BY_DEFAULT_FORMASSINVOICE) ? ' checked="checked"' : '').' name="autocloseorders"> '.$langs->trans("CloseProcessedOrdersAutomatically");
-		print '<div class="right">';
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
-		print '<input type="hidden" name="action" value="create">';
-		print '<input type="hidden" name="origin" value="commande"><br>';
-		//print '<a class="butAction" href="index.php">'.$langs->trans("GoBack").'</a>';
-		print '<input type="submit" class="butAction" value="'.$langs->trans("GenerateBill").'">';
-		print '</div>';
-		print '</div>';
-
-		print '</form>';
-
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 4e7ed481882..346b5549bfd 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -94,11 +94,11 @@ dol_mkdir($dir);
 $stats = new CommandeStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
 if ($mode == 'customer')
 {
-    if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND c.fk_statut IN ('.$db->escape($object_status).')';
+	if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
 }
 if ($mode == 'supplier')
 {
-    if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND c.fk_statut IN ('.$db->escape($object_status).')';
+	if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
 }
 
 
@@ -114,9 +114,7 @@ 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';
-}
-else
-{
+} 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';
@@ -157,9 +155,7 @@ 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';
-}
-else
-{
+} 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';
@@ -198,9 +194,7 @@ 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';
-}
-else
-{
+} 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';
@@ -381,8 +375,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     print $px2->show();
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 7d8b819b75c..020b85bf06c 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -60,15 +60,15 @@ $date_stopMonth = GETPOST('date_stopmonth', 'int');
 $date_stopYear = GETPOST('date_stopyear', 'int');
 //FIXME doldate
 $date_stop = ($date_stopDay) ?dol_mktime(23, 59, 59, $date_stopMonth, $date_stopDay, $date_stopYear) : strtotime($date_stop);
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('comptafileslist', 'globallist'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -149,7 +149,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		// Customer invoices
 		if (GETPOST('selectinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
+			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
 		    $sql .= " WHERE datef between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -158,7 +158,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Vendor invoices
 		if (GETPOST('selectsupplierinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
 		    $sql .= " WHERE datef between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -167,7 +167,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Expense reports
 		if (GETPOST('selectexpensereports')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
 		    $sql .= " WHERE date_fin between  ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -176,16 +176,16 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Donations
 		if (GETPOST('selectdonations')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
 		    $sql .= " WHERE datedon between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		    $sql .= " AND t.fk_statut <> ".Don::STATUS_DRAFT;
 		}
-	    // Paiements of salaries
+	    // Payments of salaries
 		if (GETPOST('selectpaymentsofsalaries')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -194,7 +194,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Social contributions
 		if (GETPOST('selectsocialcontributions')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
 		    $sql .= " WHERE t.date_ech between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -203,7 +203,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Various payments
 		if (GETPOST('selectvariouspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -211,7 +211,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
         // Loan payments
 		if (GETPOST('selectloanspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND l.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -334,9 +334,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		                    $nofile['sens'] = $objd->sens;
 
 		                    $filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
-		                }
-		                else
-		                {
+		                } else {
 		                    foreach ($files as $key => $file)
 		                    {
 		                    	$file['id'] = $objd->id;
@@ -383,15 +381,12 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 
 		            $i++;
 		        }
-		    }
-		    else
-		    {
+		    } else {
 		        dol_print_error($db);
 		    }
 
 		    $db->free($resd);
-		}
-		else {
+		} else {
 			setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'errors');
 			$error++;
 		}
@@ -491,9 +486,7 @@ if ($result && $action == "dl" && !$error)
         dol_delete_file($zipname);
 
         exit();
-    }
-    else
-    {
+    } else {
     	setEventMessages($langs->trans("FailedToOpenFile", $zipname), null, 'errors');
     }
 }
@@ -532,6 +525,9 @@ dol_fiche_head($head, 'AccountancyFiles');
 print '<form name="searchfiles" action="?action=searchfiles" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
+print '<span class="opacitymedium">'.$langs->trans("ExportAccountingSourceDocHelp", $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Journals")).'</span><br>';
+print '<br>';
+
 print $langs->trans("ReportPeriod").': '.$form->selectDate($date_start, 'date_start', 0, 0, 0, "", 1, 1, 0);
 print ' - '.$form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0)."\n</a>";
 
@@ -585,7 +581,7 @@ if (!empty($date_start) && !empty($date_stop))
     foreach ($listofchoices as $choice => $val) {
     	$param .= '&'.$choice.'='.(GETPOST($choice, 'int') ? 1 : 0);
     }
-    print '<form name="dl" action="?action=dl" method="POST" >'."\n";
+    print '<form name="dl" action="'.$_SERVER["PHP_SELF"].'?action=dl" method="POST">'."\n";
     print '<input type="hidden" name="token" value="'.currentToken().'">';
 
     echo dol_print_date($date_start, 'day')." - ".dol_print_date($date_stop, 'day');
@@ -596,7 +592,7 @@ if (!empty($date_start) && !empty($date_stop))
     	print '<input type="hidden" name="'.$choice.'" value="'.GETPOST($choice).'">';
     }
 
-    print '<input class="butAction" type="submit" value="'.$langs->trans("Download").'" />';
+    print '<input class="butAction butDownload" type="submit" value="'.$langs->trans("Download").'" />';
     print '</form>'."\n";
 
     print '<br>';
@@ -610,13 +606,14 @@ if (!empty($date_start) && !empty($date_stop))
     print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
     print '<td>'.$langs->trans("Document").'</td>';
     print '<td>'.$langs->trans("Paid").'</td>';
-    print '<td align="right">'.$langs->trans("TotalHT").'</td>';
-    print '<td align="right">'.$langs->trans("TotalTTC").'</td>';
-    print '<td align="right">'.$langs->trans("TotalVAT").'</td>';
+    print '<td align="right">'.$langs->trans("TotalHT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+    print '<td align="right">'.$langs->trans("TotalTTC").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+    print '<td align="right">'.$langs->trans("TotalVAT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
 	print '<td class="center">'.$langs->trans("Code").'</td>';
 	print '<td class="center">'.$langs->trans("Country").'</td>';
     print '<td class="center">'.$langs->trans("VATIntra").'</td>';
+    if ($conf->multicurrency->enabled) print '<td class="center">'.$langs->trans("Currency").'</td>';
     print '</tr>';
     if ($result)
     {
@@ -624,10 +621,12 @@ if (!empty($date_start) && !empty($date_stop))
 
         if (empty($TData))
         {
-            print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td></tr>';
-        }
-        else
-        {
+            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;
@@ -653,7 +652,7 @@ if (!empty($date_start) && !empty($date_stop))
                 print dol_print_date($data['date'], 'day');
                 print "</td>\n";
 
-                // Date
+                // Date due
                 print '<td class="center">';
                 print dol_print_date($data['date_due'], 'day');
                 print "</td>\n";
@@ -664,10 +663,18 @@ if (!empty($date_start) && !empty($date_stop))
 				if ($data['item'] == 'Invoice') {
 					$invoice->id = $data['id'];
                 	$invoice->ref = $data['ref'];
+                	$invoice->total_ht = $data['amount_ht'];
+                	$invoice->total_ttc = $data['amount_ttc'];
+                	$invoice->total_tva = $data['amount_vat'];
+                	$invoice->multicurrency_code = $data['currency'];
                 	print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
 				} elseif ($data['item'] == 'SupplierInvoice') {
                 	$supplier_invoice->id = $data['id'];
                 	$supplier_invoice->ref = $data['ref'];
+                	$supplier_invoice->total_ht = $data['amount_ht'];
+                	$supplier_invoice->total_ttc = $data['amount_ttc'];
+                	$supplier_invoice->total_tva = $data['amount_vat'];
+                	$supplier_invoice->multicurrency_code = $data['currency'];
                 	print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
 				} elseif ($data['item'] == 'ExpenseReport') {
                     $expensereport->id = $data['id'];
@@ -712,13 +719,13 @@ if (!empty($date_start) && !empty($date_stop))
                 print '<td aling="left">'.$data['paid'].'</td>';
 
                 // Total ET
-                print '<td align="right">'.price($data['sens']?$data['amount_ht']:-$data['amount_ht'])."</td>\n";
+                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";
+                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 align="right">'.price($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'])."</td>\n";
 
-                print '<td>'.$data['thirdparty_name']."</td>\n";
+                print '<td class="tdoverflowmax150" title="'.$data['thirdparty_name'].'">'.$data['thirdparty_name']."</td>\n";
 
                 print '<td class="center">'.$data['thirdparty_code']."</td>\n";
 
@@ -736,6 +743,10 @@ if (!empty($date_start) && !empty($date_stop))
                     $totalVAT_debit -= $data['amount_vat'];
                 }
 
+                if (! empty($conf->multicurrency->enabled)) {
+                	print '<td class="center">'.$data['currency']."</td>\n";
+                }
+
                 print "</tr>\n";
             }
 
@@ -746,6 +757,9 @@ if (!empty($date_start) && !empty($date_stop))
             print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
             print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
             print '<td colspan="4"></td>';
+            if (! empty($conf->multicurrency->enabled)) {
+            	print '<td></td>';
+            }
             print "</tr>\n";
             // Total debits
             print '<tr class="liste_total">';
@@ -754,14 +768,20 @@ if (!empty($date_start) && !empty($date_stop))
             print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
             print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
             print '<td colspan="4"></td>';
+            if (! empty($conf->multicurrency->enabled)) {
+            	print '<td></td>';
+            }
             print "</tr>\n";
             // Balance
             print '<tr class="liste_total">';
             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 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";
         }
     }
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index f380d8b4ee5..0129d1e5f43 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -81,13 +81,11 @@ if ($currentInvId)																	// Here to breakdown
 			$remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount
 			$result += $remainAmount; // result must be deduced by
 			$currentAmount += $remainAmount; // curAmount put to curRemain
-		} else
-		{
+		} else {
 			$currentAmount = $currentRemain;
 			$result += $currentRemain;
 		}
-	} else
-	{
+	} else {
 		// Reset the substraction for this amount
 		$result += price2num($currentAmount);
 		$currentAmount = 0;
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index 05f89e1bc6f..3b8423b68dc 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -38,15 +38,9 @@ $langs->loadLangs(array('banks', 'companies', 'other'));
 
 $id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$num = (GETPOST('num', 'alpha') ? GETPOST('num', 'alpha') : GETPOST('sectionid', 'alpha'));
-
-$mesg = '';
-if (isset($_SESSION['DolMessage'])) {
-	$mesg = $_SESSION['DolMessage'];
-	unset($_SESSION['DolMessage']);
-}
+$numref = (GETPOST('num', 'alpha') ? GETPOST('num', 'alpha') : GETPOST('sectionid', 'alpha'));
 
 // Security check
 if ($user->socid) {
@@ -71,21 +65,74 @@ if (!$sortfield)
 	$sortfield = "name";
 
 $object = new Account($db);
-if ($id > 0 || !empty($ref)) $object->fetch($id, $ref);
+if ($id > 0 || !empty($ref))
+{
+	$result = $object->fetch($id, $ref);
+	$account = $object->id; // Force the search field on id of account
+}
 
 $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', '');
 
+// Define number of receipt to show (current, previous or next one ?)
+$found = false;
+if ($_GET["rel"] == 'prev')
+{
+	// Recherche valeur pour num = numero releve precedent
+	$sql = "SELECT DISTINCT(b.num_releve) as num";
+	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+	$sql .= " WHERE b.num_releve < '".$db->escape($numref)."'";
+	$sql .= " AND b.fk_account = ".$id;
+	$sql .= " ORDER BY b.num_releve DESC";
+
+	dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$numrows = $db->num_rows($resql);
+		if ($numrows > 0)
+		{
+			$obj = $db->fetch_object($resql);
+			$numref = $obj->num;
+			$found = true;
+		}
+	}
+} elseif ($_GET["rel"] == 'next')
+{
+	// Recherche valeur pour num = numero releve precedent
+	$sql = "SELECT DISTINCT(b.num_releve) as num";
+	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+	$sql .= " WHERE b.num_releve > '".$db->escape($numref)."'";
+	$sql .= " AND b.fk_account = ".$id;
+	$sql .= " ORDER BY b.num_releve ASC";
+
+	dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$numrows = $db->num_rows($resql);
+		if ($numrows > 0)
+		{
+			$obj = $db->fetch_object($resql);
+			$numref = $obj->num;
+			$found = true;
+		}
+	}
+} else {
+	// On veut le releve num
+	$found = true;
+}
+
 
 /*
  * Actions
  */
 
-if (!empty($num))
+if (!empty($numref))
 {
 	$object->fetch_thirdparty();
-	$upload_dir = $conf->bank->dir_output."/".$id."/statement/".dol_sanitizeFileName($num);
+	$upload_dir = $conf->bank->dir_output."/".$id."/statement/".dol_sanitizeFileName($numref);
 }
-$backtopage = $_SERVER['PHP_SELF']."?account=".$id."&num=".$num;
+$backtopage = $_SERVER['PHP_SELF']."?account=".$id."&num=".$numref;
 include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
@@ -101,10 +148,10 @@ llxHeader('', $title, $helpurl);
 
 if ($id > 0 || !empty($ref)) {
 	if ($object->fetch($id, $ref)) {
-		$upload_dir = $conf->bank->dir_output."/".$id."/statement/".dol_sanitizeFileName($num);
+		$upload_dir = $conf->bank->dir_output."/".$id."/statement/".dol_sanitizeFileName($numref);
 
 		// Onglets
-		$head = account_statement_prepare_head($object, $num);
+		$head = account_statement_prepare_head($object, $numref);
 		dol_fiche_head($head, 'document', $langs->trans("AccountStatement"), -1, 'account');
 
 
@@ -115,8 +162,15 @@ if ($id > 0 || !empty($ref)) {
 			$totalsize += $file['size'];
 		}
 
-		$title = $langs->trans("AccountStatement").' '.$num.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts');
-		print load_fiche_titre($title, '', '');
+		$morehtmlright = '';
+		$morehtmlright .= '<div class="pagination"><ul>';
+		$morehtmlright .= '<li class="pagination"><a class="paginationnext" href="'.$_SERVER["PHP_SELF"].'?rel=prev&amp;num='.$numref.'&amp;ve='.$ve.'&amp;account='.$object->id.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
+		$morehtmlright .= '<li class="pagination"><span class="active">'.$langs->trans("AccountStatement")." ".$numref.'</span></li>';
+		$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, '');
 
 		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
@@ -134,16 +188,14 @@ if ($id > 0 || !empty($ref)) {
 		$modulepart = 'bank';
 		$permission = $user->rights->banque->modifier;
 		$permtoedit = $user->rights->banque->modifier;
-		$param = '&id='.$object->id.'&num='.urlencode($num);
-		$moreparam = '&num='.urlencode($num); ;
-		$relativepathwithnofile = $id."/statement/".dol_sanitizeFileName($num)."/";
+		$param = '&id='.$object->id.'&num='.urlencode($numref);
+		$moreparam = '&num='.urlencode($numref); ;
+		$relativepathwithnofile = $id."/statement/".dol_sanitizeFileName($numref)."/";
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	Header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 1f6e5e6620c..cd82da0e1bd 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -50,9 +50,7 @@ if (!$year_start)
 {
 	$year_start = $year_current - 2;
 	$year_end = $year_current;
-}
-else
-{
+} else {
 	$year_end = $year_start + 2;
 }
 
@@ -93,7 +91,7 @@ $sql .= " WHERE b.fk_account = ba.rowid";
 $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql .= " AND b.amount >= 0";
 if (!empty($id))
-	$sql .= " AND b.fk_account IN (".$db->escape($id).")";
+	$sql .= " AND b.fk_account IN (".$db->sanitize($db->escape($id)).")";
 $sql .= " GROUP BY dm";
 
 $resql = $db->query($sql);
@@ -107,9 +105,7 @@ if ($resql)
 		$encaiss[$row[1]] = $row[0];
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -121,7 +117,7 @@ $sql .= " WHERE b.fk_account = ba.rowid";
 $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql .= " AND b.amount <= 0";
 if (!empty($id))
-	$sql .= " AND b.fk_account IN (".$db->escape($id).")";
+	$sql .= " AND b.fk_account IN (".$db->sanitize($db->escape($id)).")";
 $sql .= " GROUP BY dm";
 
 $resql = $db->query($sql);
@@ -135,9 +131,7 @@ if ($resql)
 		$decaiss[$row[1]] = -$row[0];
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -157,9 +151,7 @@ if (!empty($id))
     if (!preg_match('/,/', $id))
     {
         dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-    }
-    else
-    {
+    } else {
         $bankaccount = new Account($db);
         $listid = explode(',', $id);
         foreach ($listid as $key => $aId)
@@ -170,9 +162,7 @@ if (!empty($id))
             if ($key < (count($listid) - 1)) print ', ';
         }
     }
-}
-else
-{
+} else {
 	print $langs->trans("AllAccounts");
 }
 
@@ -250,15 +240,14 @@ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql .= " WHERE b.fk_account = ba.rowid";
 $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 if (!empty($id))
-	$sql .= " AND b.fk_account IN (".$db->escape($id).")";
+	$sql .= " AND b.fk_account IN (".$db->sanitize($db->escape($id)).")";
 
 $resql = $db->query($sql);
 if ($resql)
 {
 	$obj = $db->fetch_object($resql);
 	if ($obj) $balance = $obj->total;
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -280,9 +269,7 @@ if ($result < 0)
 	$langs->load("errors");
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
-}
-else
-{
+} else {
 	// Calcul de $min et $max
 	$sql = "SELECT MIN(b.datev) as min, MAX(b.datev) as max";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -298,9 +285,7 @@ else
 		$obj = $db->fetch_object($resql);
 		$min = $db->jdate($obj->min);
 		$max = $db->jdate($obj->max);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	$log = "graph.php: min=".$min." max=".$max;
@@ -338,9 +323,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -425,9 +408,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 7d059734126..e77f4386de9 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -56,7 +56,7 @@ $langs->loadLangs(array("banks", "bills", "categories", "companies", "margins",
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $contextpage = 'banktransactionlist'.(empty($object->ref) ? '' : '-'.$object->id);
@@ -68,9 +68,7 @@ if ($fielvalue)
 {
 	if ($user->socid) $socid = $user->socid;
 	$result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
-}
-else
-{
+} else {
 	if ($user->socid) $socid = $user->socid;
 	$result = restrictedArea($user, 'banque');
 }
@@ -111,15 +109,15 @@ if (!$sortfield) $sortfield = 'b.datev,b.dateo,b.rowid';
 $object = new Account($db);
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
-    $search_account = $object->id; // Force the search field on id of account
+	$result = $object->fetch($id, $ref);
+	$search_account = $object->id; // Force the search field on id of account
 
-    if (!($object->id > 0))
-    {
-    	$langs->load("errors");
-    	print($langs->trans('ErrorRecordNotFound'));
-    	exit;
-    }
+	if (!($object->id > 0))
+	{
+		$langs->load("errors");
+		print($langs->trans('ErrorRecordNotFound'));
+		exit;
+	}
 }
 
 $mode_balance_ok = false;
@@ -139,20 +137,20 @@ $extrafields->fetch_name_optionals_label('banktransaction');
 $search_array_options = $extrafields->getOptionalsFromPost('banktransaction', '', 'search_');
 
 $arrayfields = array(
-    'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
-    'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
-    'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1),
-    'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-    'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1),
-    'bu.label'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>500),
-    'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>1000),
-    'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
-    'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
+	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
+	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
+	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1),
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1),
+	'bu.label'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>500),
+	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>1000),
+	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
+	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
 	'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>1000),
 	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1001),
 	'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>1010),
-    'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
+	'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
 );
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -183,10 +181,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_dt_start = '';
-    $search_dt_end = '';
-    $search_dv_start = '';
-    $search_dv_end = '';
+	$search_dt_start = '';
+	$search_dt_end = '';
+	$search_dv_start = '';
+	$search_dv_end = '';
 	$search_type = "";
 	$search_debit = "";
 	$search_credit = "";
@@ -205,60 +203,57 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 if (empty($reshook))
 {
-    $objectclass = 'Account';
-    $objectlabel = 'BankTransaction';
-    $permissiontoread = $user->rights->banque->lire;
-    $permissiontodelete = $user->rights->banque->supprimer;
-    $uploaddir = $conf->bank->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	$objectclass = 'Account';
+	$objectlabel = 'BankTransaction';
+	$permissiontoread = $user->rights->banque->lire;
+	$permissiontodelete = $user->rights->banque->supprimer;
+	$uploaddir = $conf->bank->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 // Conciliation
-if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate)
+if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate
+	&& (!GETPOSTISSET('pageplusone') || (GETPOST('pageplusone') == GETPOST('pageplusoneold'))))
 {
-    $error = 0;
+	$error = 0;
 
-    // Definition, nettoyage parametres
-    $num_releve = trim(GETPOST("num_releve", "alpha"));
+	// Definition, nettoyage parametres
+	$num_releve = GETPOST("num_releve", "alpha");
 
-    if ($num_releve)
-    {
-        $bankline = new AccountLine($db);
-        if (isset($_POST['rowid']) && is_array($_POST['rowid']))
-        {
-            foreach ($_POST['rowid'] as $row)
-            {
-                if ($row > 0)
-                {
-                    $result = $bankline->fetch($row);
-                    $bankline->num_releve = $num_releve; //$_POST["num_releve"];
-                    $result = $bankline->update_conciliation($user, GETPOST("cat"), GETPOST('confirm_reconcile', 'alpha') ? 1 : 0); // If we confirm_reconcile, we set flag 'rappro' to 1.
-                    if ($result < 0)
-                    {
-                        setEventMessages($bankline->error, $bankline->errors, 'errors');
-                        $error++;
-                        break;
-                    }
-                }
-            }
-        }
-        else
-        {
-            $error++;
-            $langs->load("errors");
-            setEventMessages($langs->trans("NoRecordSelected"), null, 'errors');
-        }
-    }
-    else
-    {
-        $error++;
-        $langs->load("errors");
-        setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
-    }
+	if ($num_releve)
+	{
+		$bankline = new AccountLine($db);
+		if (isset($_POST['rowid']) && is_array($_POST['rowid']))
+		{
+			foreach ($_POST['rowid'] as $row)
+			{
+				if ($row > 0)
+				{
+					$result = $bankline->fetch($row);
+					$bankline->num_releve = $num_releve; //$_POST["num_releve"];
+					$result = $bankline->update_conciliation($user, GETPOST("cat"), GETPOST('confirm_reconcile', 'alpha') ? 1 : 0); // If we confirm_reconcile, we set flag 'rappro' to 1.
+					if ($result < 0)
+					{
+						setEventMessages($bankline->error, $bankline->errors, 'errors');
+						$error++;
+						break;
+					}
+				}
+			}
+		} else {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("NoRecordSelected"), null, 'errors');
+		}
+	} else {
+		$error++;
+		$langs->load("errors");
+		setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
+	}
 
-    if (!$error)
-    {
-    	$param = 'action=reconcile&contextpage=banktransactionlist&id='.$id.'&search_account='.$id;
+	if (!$error)
+	{
+		$param = 'action=reconcile&contextpage=banktransactionlist&id='.$id.'&search_account='.$id;
 		$param .= '&search_conciliated='.urlencode($search_conciliated);
 		if ($page) $param .= '&page='.urlencode($page);
 		if ($offset) $param .= '&offset='.urlencode($offset);
@@ -274,91 +269,85 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
 		if ($search_credit) $param .= '&search_credit='.urlencode($search_credit);
 		$param .= '&sortfield='.urlencode($sortfield).'&sortorder='.urlencode($sortorder);
 		header('Location: '.$_SERVER["PHP_SELF"].'?'.$param); // To avoid to submit twice and allow the back button
-        exit;
-    }
+		exit;
+	}
 }
 
 
 if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
 {
-    $error = 0;
+	$error = 0;
 
-    if (price2num($_POST["addcredit"]) > 0)
-    {
-        $amount = price2num($_POST["addcredit"]);
-    }
-    else
-    {
-        $amount = - price2num($_POST["adddebit"]);
-    }
+	if (price2num(GETPOST("addcredit")) > 0)
+	{
+		$amount = price2num(GETPOST("addcredit"));
+	} else {
+		$amount = - price2num(GETPOST("adddebit"));
+	}
 
-    $operation = GETPOST("operation", 'alpha');
-    $num_chq   = GETPOST("num_chq", 'alpha');
-    $label     = GETPOST("label", 'alpha');
-    $cat1      = GETPOST("cat1", 'alpha');
+	$operation = GETPOST("operation", 'alpha');
+	$num_chq   = GETPOST("num_chq", 'alpha');
+	$label     = GETPOST("label", 'alpha');
+	$cat1      = GETPOST("cat1", 'alpha');
 
-    $bankaccountid = $id;
-    if (GETPOST('add_account', 'int') > 0) $bankaccountid = GETPOST('add_account', 'int');
+	$bankaccountid = $id;
+	if (GETPOST('add_account', 'int') > 0) $bankaccountid = GETPOST('add_account', 'int');
 
-    if (!$dateop) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-    }
-    if (!$operation) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-    }
-    if (!$label) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-    }
-    if (!$amount) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
-    }
-    if (!$bankaccountid > 0)
-    {
-    	$error++;
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
-    }
-    /*if (! empty($conf->accounting->enabled) && (empty($search_accountancy_code) || $search_accountancy_code == '-1'))
+	if (!$dateop) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+	}
+	if (!$operation) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+	}
+	if (!$label) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+	}
+	if (!$amount) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+	}
+	if (!$bankaccountid > 0)
+	{
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
+	}
+	/*if (! empty($conf->accounting->enabled) && (empty($search_accountancy_code) || $search_accountancy_code == '-1'))
     {
     	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
     	$error++;
     }*/
 
-    if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
-    {
-    	$objecttmp = new Account($db);
-    	$objecttmp->fetch($bankaccountid);
-        $insertid = $objecttmp->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $search_accountancy_code);
-        if ($insertid > 0)
-        {
-            setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
-            exit;
-        }
-        else
-        {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
-    else
-    {
-        $action = 'addline';
-    }
+	if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
+	{
+		$objecttmp = new Account($db);
+		$objecttmp->fetch($bankaccountid);
+		$insertid = $objecttmp->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $search_accountancy_code);
+		if ($insertid > 0)
+		{
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		$action = 'addline';
+	}
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->modifier)
 {
-    $accline = new AccountLine($db);
-    $result = $accline->fetch(GETPOST("rowid", "int"));
-    $result = $accline->delete($user);
-    if ($result <= 0) {
-    	setEventMessages($accline->error, $accline->errors, 'errors');
-    } else {
-    	setEventMessages('RecordDeleted', null, 'mesgs');
-    }
+	$accline = new AccountLine($db);
+	$result = $accline->fetch(GETPOST("rowid", "int"));
+	$result = $accline->delete($user);
+	if ($result <= 0) {
+		setEventMessages($accline->error, $accline->errors, 'errors');
+	} else {
+		setEventMessages('RecordDeleted', null, 'mesgs');
+	}
 }
 
 
@@ -431,46 +420,44 @@ if ($id > 0 || !empty($ref))
 	$helpurl = "";
 	llxHeader('', $title, $helpurl);
 
-    // Load bank groups
-    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
-    $bankcateg = new BankCateg($db);
+	// Load bank groups
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
+	$bankcateg = new BankCateg($db);
 
-    foreach ($bankcateg->fetchAll() as $bankcategory) {
-        $options[$bankcategory->id] = $bankcategory->label;
-    }
+	foreach ($bankcateg->fetchAll() as $bankcategory) {
+		$options[$bankcategory->id] = $bankcategory->label;
+	}
 
-    // Bank card
-    $head = bank_prepare_head($object);
-    dol_fiche_head($head, 'journal', $langs->trans("FinancialAccount"), 0, 'account');
+	// Bank card
+	$head = bank_prepare_head($object);
+	dol_fiche_head($head, 'journal', $langs->trans("FinancialAccount"), 0, 'account');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-    dol_fiche_end();
+	dol_fiche_end();
 
 
-    /*
+	/*
      * Buttons actions
      */
 
-    if ($action != 'reconcile')
-    {
-        if ($object->canBeConciliated() > 0)
-        {
-            // If not cash account and can be reconciliate
-            if ($user->rights->banque->consolidate) {
-            	$newparam = $param;
-            	$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
-            	$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
-            } else {
-            	$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
-            }
-        }
-    }
-}
-else
-{
+	if ($action != 'reconcile')
+	{
+		if ($object->canBeConciliated() > 0)
+		{
+			// If not cash account and can be reconciliate
+			if ($user->rights->banque->consolidate) {
+				$newparam = $param;
+				$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
+				$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
+			} else {
+				$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
+			}
+		}
+	}
+} else {
 	llxHeader('', $langs->trans("BankTransactions"), '', '', 0, 0, array(), array(), $param);
 }
 
@@ -552,25 +539,25 @@ $nbtotalofrecords = '';
 $nbtotalofpages = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    $nbtotalofpages = ceil($nbtotalofrecords / $limit);
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	$nbtotalofpages = ceil($nbtotalofrecords / $limit);
 }
 
 if (($id > 0 || !empty($ref)) && ((string) $page == ''))
 {
-    // We open a list of transaction of a dedicated account and no page was set by defaut
-    // We force on last page.
-    $page = ($nbtotalofpages - 1);
-    $offset = $limit * $page;
-    if ($page < 0) $page = 0;
+	// We open a list of transaction of a dedicated account and no page was set by defaut
+	// We force on last page.
+	$page = ($nbtotalofpages - 1);
+	$offset = $limit * $page;
+	if ($page < 0) $page = 0;
 }
 if ($page >= $nbtotalofpages)
 {
-    // If we made a search and result has low page than the page number we were on
-    $page = ($nbtotalofpages - 1);
-    $offset = $limit * $page;
-    if ($page < 0) $page = 0;
+	// If we made a search and result has low page than the page number we were on
+	$page = ($nbtotalofpages - 1);
+	$offset = $limit * $page;
+	if ($page < 0) $page = 0;
 }
 
 
@@ -596,23 +583,23 @@ if ($resql)
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-    // List of mass actions available
-    $arrayofmassactions = array(
-        //'presend'=>$langs->trans("SendByMail"),
-        //'builddoc'=>$langs->trans("PDFMerge"),
-    );
-    //if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-    if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
-    $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+	// List of mass actions available
+	$arrayofmassactions = array(
+		//'presend'=>$langs->trans("SendByMail"),
+		//'builddoc'=>$langs->trans("PDFMerge"),
+	);
+	//if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-    // Confirmation delete
-    if ($action == 'delete')
-    {
-        $text = $langs->trans('ConfirmDeleteTransaction');
-        print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
-    }
+	// Confirmation delete
+	if ($action == 'delete')
+	{
+		$text = $langs->trans('ConfirmDeleteTransaction');
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
+	}
 
-    // Lines of title fields
+	// Lines of title fields
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -621,7 +608,7 @@ if ($resql)
 	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
 	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
@@ -629,56 +616,54 @@ if ($resql)
 	// Form to reconcile
 	if ($user->rights->banque->consolidate && $action == 'reconcile')
 	{
-	    print '<div class="valignmiddle inline-block" style="padding-right: 20px;">';
-	    print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
-	    print '<input class="flat" id="num_releve" name="num_releve" type="text" value="'.(GETPOST('num_releve') ?GETPOST('num_releve') : '').'" size="10">'; // The only default value is value we just entered
-	    print '</div>';
-	    if (is_array($options) && count($options))
-	    {
-	        print $langs->trans("EventualyAddCategory").': ';
-	        print Form::selectarray('cat', $options, GETPOST('cat'), 1);
-	    }
-	    print '<br><div style="margin-top: 5px;"><span class="opacitymedium">'.$langs->trans("ThenCheckLinesAndConciliate").'</span> ';
-	    print '<input class="button" name="confirm_savestatement" type="submit" value="'.$langs->trans("SaveStatementOnly").'">';
-	    print ' '.$langs->trans("or").' ';
-	    print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
-	    print ' '.$langs->trans("or").' ';
-	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+		print '<div class="valignmiddle inline-block" style="padding-right: 20px;">';
+		print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
+		print '<input class="flat" id="num_releve" name="num_releve" type="text" value="'.(GETPOST('num_releve') ?GETPOST('num_releve') : '').'" size="10">'; // The only default value is value we just entered
+		print '</div>';
+		if (is_array($options) && count($options))
+		{
+			print $langs->trans("EventualyAddCategory").': ';
+			print Form::selectarray('cat', $options, GETPOST('cat'), 1);
+		}
+		print '<br><div style="margin-top: 5px;"><span class="opacitymedium">'.$langs->trans("ThenCheckLinesAndConciliate").'</span> ';
+		print '<input class="button" name="confirm_savestatement" type="submit" value="'.$langs->trans("SaveStatementOnly").'">';
+		print ' '.$langs->trans("or").' ';
+		print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+		print ' '.$langs->trans("or").' ';
+		print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
-	    // Show last bank statements
-	    $nbmax = 15; // We accept to show last 15 receipts (so we can have more than one year)
-	    $liste = "";
-	    $sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank";
-	    $sql .= " WHERE fk_account=".$object->id." AND num_releve IS NOT NULL";
-	    $sql .= $db->order("num_releve", "DESC");
-	    $sql .= $db->plimit($nbmax + 1);
-	    print '<br>';
-	    print $langs->trans("LastAccountStatements").' : ';
-	    $resqlr = $db->query($sql);
-	    if ($resqlr)
-	    {
-	        $numr = $db->num_rows($resqlr);
-	        $i = 0;
-	        $last_ok = 0;
-	        while (($i < $numr) && ($i < $nbmax))
-	        {
-	            $objr = $db->fetch_object($resqlr);
-	            if (!$last_ok) {
-	                $last_releve = $objr->num_releve;
-	                $last_ok = 1;
-	            }
-	            $i++;
-	            $liste = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$id.'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
-	        }
-	        if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
-	        print $liste;
-	        if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
-	    }
-	    else
-	    {
-	        dol_print_error($db);
-	    }
+		// Show last bank statements
+		$nbmax = 12; // We show last 12 receipts (so we can have more than one year)
+		$liste = "";
+		$sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank";
+		$sql .= " WHERE fk_account=".$object->id." AND num_releve IS NOT NULL";
+		$sql .= $db->order("num_releve", "DESC");
+		$sql .= $db->plimit($nbmax + 1);
+		print '<br>';
+		print $langs->trans("LastAccountStatements").' : ';
+		$resqlr = $db->query($sql);
+		if ($resqlr)
+		{
+			$numr = $db->num_rows($resqlr);
+			$i = 0;
+			$last_ok = 0;
+			while (($i < $numr) && ($i < $nbmax))
+			{
+				$objr = $db->fetch_object($resqlr);
+				if (!$last_ok) {
+					$last_releve = $objr->num_releve;
+					$last_ok = 1;
+				}
+				$i++;
+				$liste = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$id.'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
+			}
+			if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
+			print $liste;
+			if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
+		} else {
+			dol_print_error($db);
+		}
 
 		// Using BANK_REPORT_LAST_NUM_RELEVE to automatically report last num (or not)
 		if (!empty($conf->global->BANK_REPORT_LAST_NUM_RELEVE))
@@ -791,24 +776,22 @@ if ($resql)
 		{
 			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))	// If direct entries is done using miscellaneous payments
 			{
-			    $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
-			}
-			else												// If direct entries is not done using miscellaneous payments
+				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
+			} else // If direct entries is not done using miscellaneous payments
 			{
-                $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
+				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
 			}
-		}
-		else
-		{
-            $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
+		} else {
+			$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
 		}
 	}
 
-	$morehtml = '<div class="inline-block '.(($buttonreconcile || $newcardbutton) ? 'marginrightonly' : '').'">';
+	/*$morehtml = '<div class="inline-block '.(($buttonreconcile || $newcardbutton) ? 'marginrightonly' : '').'">';
 	$morehtml .= '<label for="pageplusone">'.$langs->trans("Page")."</label> "; // ' Page ';
 	$morehtml .= '<input type="text" name="pageplusone" id="pageplusone" class="flat right width25 pageplusone" value="'.($page + 1).'">';
 	$morehtml .= '/'.$nbtotalofpages.' ';
 	$morehtml .= '</div>';
+	*/
 
 	if ($action != 'addline' && $action != 'reconcile')
 	{
@@ -820,7 +803,7 @@ if ($resql)
 	$picto = 'bank_account';
 	if ($id > 0 || !empty($ref)) $picto = '';
 
-	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit);
+	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit, 0, 0, 1);
 
 	// We can add page now to param
 	if ($page != '') $param .= '&page='.urlencode($page);
@@ -830,19 +813,19 @@ if ($resql)
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateOperationShort').' :';
 	$moreforfilter .= ($conf->browser->layout == 'phone' ? '<br>' : ' ');
-	$moreforfilter .= '<div class="nowrap inline-block">'.$langs->trans('From').' ';
-	$moreforfilter .= $form->selectDate($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0).'</div>';
+	$moreforfilter .= '<div class="nowrap inline-block">';
+	$moreforfilter .= $form->selectDate($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')).'</div>';
 	//$moreforfilter .= ' - ';
-	$moreforfilter .= '<div class="nowrap inline-block">'.$langs->trans('to').' '.$form->selectDate($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0).'</div>';
+	$moreforfilter .= '<div class="nowrap inline-block">'.$form->selectDate($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')).'</div>';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('DateValueShort').' : ';
 	$moreforfilter .= ($conf->browser->layout == 'phone' ? '<br>' : ' ');
-	$moreforfilter .= '<div class="nowrap inline-block">'.$langs->trans('From').' ';
-	$moreforfilter .= $form->selectDate($search_dv_start, 'search_start_dv', 0, 0, 1, "search_form", 1, 0).'</div>';
+	$moreforfilter .= '<div class="nowrap inline-block">';
+	$moreforfilter .= $form->selectDate($search_dv_start, 'search_start_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')).'</div>';
 	//$moreforfilter .= ' - ';
-	$moreforfilter .= '<div class="nowrap inline-block">'.$langs->trans('to').' '.$form->selectDate($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0).'</div>';
+	$moreforfilter .= '<div class="nowrap inline-block">'.$form->selectDate($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')).'</div>';
 	$moreforfilter .= '</div>';
 
 	if (!empty($conf->categorie->enabled))
@@ -873,66 +856,66 @@ if ($resql)
 		print '</div>'."\n";
 	}
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 	print '<tr class="liste_titre_filter">';
 	if (!empty($arrayfields['b.rowid']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input type="text" class="flat" name="search_ref" size="2" value="'.dol_escape_htmltag($search_ref).'">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat" name="search_ref" size="2" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.label']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input type="text" class="flat maxwidth100" name="search_description" value="'.dol_escape_htmltag($search_description).'">';
-    	print '</td>';
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat maxwidth100" name="search_description" value="'.dol_escape_htmltag($search_description).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.dateo']['checked']))
 	{
-        print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['b.datev']['checked']))
 	{
-        print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['type']['checked']))
 	{
-        print '<td class="liste_titre" align="center">';
-        $form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100');
-        print '</td>';
+		print '<td class="liste_titre" align="center">';
+		$form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100');
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.num_chq']['checked']))
 	{
-        // Numero
-        print '<td class="liste_titre" align="center"><input type="text" class="flat" name="req_nb" value="'.dol_escape_htmltag($search_req_nb).'" size="2"></td>';
+		// Numero
+		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="req_nb" value="'.dol_escape_htmltag($search_req_nb).'" size="2"></td>';
 	}
 	if (!empty($arrayfields['bu.label']['checked']))
 	{
-	    print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+		print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
 	}
 	if (!empty($arrayfields['ba.ref']['checked']))
 	{
-    	print '<td class="liste_titre">';
-    	$form->select_comptes($search_account, 'search_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''), 0, 'maxwidth100');
-    	print '</td>';
+		print '<td class="liste_titre">';
+		$form->select_comptes($search_account, 'search_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''), 0, 'maxwidth100');
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.debit']['checked']))
 	{
-    	print '<td class="liste_titre right">';
-    	print '<input type="text" class="flat width50" name="search_debit" value="'.dol_escape_htmltag($search_debit).'">';
-    	print '</td>';
+		print '<td class="liste_titre right">';
+		print '<input type="text" class="flat width50" name="search_debit" value="'.dol_escape_htmltag($search_debit).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.credit']['checked']))
 	{
-    	print '<td class="liste_titre right">';
-    	print '<input type="text" class="flat width50" name="search_credit" value="'.dol_escape_htmltag($search_credit).'">';
-    	print '</td>';
+		print '<td class="liste_titre right">';
+		print '<input type="text" class="flat width50" name="search_credit" value="'.dol_escape_htmltag($search_credit).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['balancebefore']['checked']))
 	{
@@ -951,21 +934,21 @@ if ($resql)
 	// Numero statement
 	if (!empty($arrayfields['b.num_releve']['checked']))
 	{
-        print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_num_releve" value="'.dol_escape_htmltag($search_num_releve).'" size="3"></td>';
+		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_num_releve" value="'.dol_escape_htmltag($search_num_releve).'" size="3"></td>';
 	}
 	// Conciliated
 	if (!empty($arrayfields['b.conciliated']['checked']))
 	{
-        print '<td class="liste_titre" align="center">';
-        print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1);
-        print '</td>';
+		print '<td class="liste_titre" align="center">';
+		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1);
+		print '</td>';
 	}
 	print '<td class="liste_titre" align="middle">';
 	print '</td>';
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
-    print '</td>';
+	print '</td>';
 	print "</tr>\n";
 
 	// Fields title
@@ -1003,110 +986,107 @@ if ($resql)
 	// Loop on each record
 	$sign = 1;
 
-    $totalarray = array();
-    while ($i < min($num, $limit))
-    {
-        $objp = $db->fetch_object($resql);
+	$totalarray = array();
+	while ($i < min($num, $limit))
+	{
+		$objp = $db->fetch_object($resql);
 
-        // If we are in a situation where we need/can show balance, we calculate the start of balance
-        if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && $mode_balance_ok)
-        {
-            if (!$search_account)
-            {
-                dol_print_error('', 'account is not defined but $mode_balance_ok is true');
-                exit;
-            }
+		// If we are in a situation where we need/can show balance, we calculate the start of balance
+		if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && $mode_balance_ok)
+		{
+			if (!$search_account)
+			{
+				dol_print_error('', 'account is not defined but $mode_balance_ok is true');
+				exit;
+			}
 
-            // Loop on each record before
-            $sign = 1;
-            $i = 0;
-            $sqlforbalance = 'SELECT SUM(b.amount) as previoustotal';
-            $sqlforbalance .= " FROM ";
-            $sqlforbalance .= " ".MAIN_DB_PREFIX."bank_account as ba,";
-            $sqlforbalance .= " ".MAIN_DB_PREFIX."bank as b";
-            $sqlforbalance .= " WHERE b.fk_account = ba.rowid";
-            $sqlforbalance .= " AND ba.entity IN (".getEntity('bank_account').")";
-            $sqlforbalance .= " AND b.fk_account = ".$search_account;
-            $sqlforbalance .= " AND (b.datev < '".$db->idate($db->jdate($objp->dv))."' OR (b.datev = '".$db->idate($db->jdate($objp->dv))."' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
-            $resqlforbalance = $db->query($sqlforbalance);
-            //print $sqlforbalance;
-            if ($resqlforbalance)
-            {
-                $objforbalance = $db->fetch_object($resqlforbalance);
-                if ($objforbalance)
-                {
-                	// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
-                	if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
-                	{
-                		$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
-                	}
-                	// If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
-                	else
-                	{
-                		$balance = $objforbalance->previoustotal;
-                	}
-                }
-            }
-            else dol_print_error($db);
+			// Loop on each record before
+			$sign = 1;
+			$i = 0;
+			$sqlforbalance = 'SELECT SUM(b.amount) as previoustotal';
+			$sqlforbalance .= " FROM ";
+			$sqlforbalance .= " ".MAIN_DB_PREFIX."bank_account as ba,";
+			$sqlforbalance .= " ".MAIN_DB_PREFIX."bank as b";
+			$sqlforbalance .= " WHERE b.fk_account = ba.rowid";
+			$sqlforbalance .= " AND ba.entity IN (".getEntity('bank_account').")";
+			$sqlforbalance .= " AND b.fk_account = ".$search_account;
+			$sqlforbalance .= " AND (b.datev < '".$db->idate($db->jdate($objp->dv))."' OR (b.datev = '".$db->idate($db->jdate($objp->dv))."' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
+			$resqlforbalance = $db->query($sqlforbalance);
+			//print $sqlforbalance;
+			if ($resqlforbalance)
+			{
+				$objforbalance = $db->fetch_object($resqlforbalance);
+				if ($objforbalance)
+				{
+					// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
+					if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
+					{
+						$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
+					} // If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
+					else {
+						$balance = $objforbalance->previoustotal;
+					}
+				}
+			} else dol_print_error($db);
 
-            $balancecalculated = true;
+			$balancecalculated = true;
 
-            // Output a line with start balance
-            if ($user->rights->banque->consolidate && $action == 'reconcile')
-            {
-            	$tmpnbfieldbeforebalance = 0;
-            	$tmpnbfieldafterbalance = 0;
-            	$balancefieldfound = 0;
-            	foreach ($arrayfields as $key => $val)
-            	{
-            		if ($key == 'balancebefore' || $key == 'balance')
-            		{
-            			$balancefieldfound++;
-            			continue;
-            		}
-           			if (!empty($arrayfields[$key]['checked']))
-           			{
-           				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-           				else $tmpnbfieldafterbalance++;
-           			}
-            	}
-            	// Extra fields
-            	$element = 'banktransaction';
-            	if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label']))
-            	{
-            		foreach ($extrafields->attributes[$element]['label'] as $key => $val)
-            		{
-            			if (!empty($arrayfields["ef.".$key]['checked']))
-            			{
-		           			if (!empty($arrayfields[$key]['checked']))
-		           			{
-		           				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-		           				else $tmpnbfieldafterbalance++;
-		           			}
-            			}
-            		}
-            	}
+			// Output a line with start balance
+			if ($user->rights->banque->consolidate && $action == 'reconcile')
+			{
+				$tmpnbfieldbeforebalance = 0;
+				$tmpnbfieldafterbalance = 0;
+				$balancefieldfound = 0;
+				foreach ($arrayfields as $key => $val)
+				{
+					if ($key == 'balancebefore' || $key == 'balance')
+					{
+						$balancefieldfound++;
+						continue;
+					}
+		   			if (!empty($arrayfields[$key]['checked']))
+		   			{
+		   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
+		   				else $tmpnbfieldafterbalance++;
+		   			}
+				}
+				// Extra fields
+				$element = 'banktransaction';
+				if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label']))
+				{
+					foreach ($extrafields->attributes[$element]['label'] as $key => $val)
+					{
+						if (!empty($arrayfields["ef.".$key]['checked']))
+						{
+				   			if (!empty($arrayfields[$key]['checked']))
+				   			{
+				   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
+				   				else $tmpnbfieldafterbalance++;
+				   			}
+						}
+					}
+				}
 
-            	print '<tr class="oddeven trforbreak">';
-            	if ($tmpnbfieldbeforebalance)
-            	{
-            		print '<td colspan="'.$tmpnbfieldbeforebalance.'">';
-            		print '&nbsp;';
-            		print '</td>';
-            	}
+				print '<tr class="oddeven trforbreak">';
+				if ($tmpnbfieldbeforebalance)
+				{
+					print '<td colspan="'.$tmpnbfieldbeforebalance.'">';
+					print '&nbsp;';
+					print '</td>';
+				}
 
-            	if (!empty($arrayfields['balancebefore']['checked']))
-            	{
-	            	print '<td class="right">';
-	            	print price(price2num($balance, 'MT'), 1, $langs);
-	            	print '</td>';
-            	}
-            	if (!empty($arrayfields['balance']['checked']))
-            	{
-            		print '<td class="right">';
+				if (!empty($arrayfields['balancebefore']['checked']))
+				{
+					print '<td class="right">';
 					print price(price2num($balance, 'MT'), 1, $langs);
 					print '</td>';
-            	}
+				}
+				if (!empty($arrayfields['balance']['checked']))
+				{
+					print '<td class="right">';
+					print price(price2num($balance, 'MT'), 1, $langs);
+					print '</td>';
+				}
 
 				print '<td class="center">';
 				print '<input type="checkbox" id="selectAll" />';
@@ -1119,269 +1099,249 @@ if ($resql)
 				print '<td colspan="'.($tmpnbfieldafterbalance + 2).'">';
 				print '&nbsp;';
 				print '</td>';
-            	print '</tr>';
-            }
-        }
+				print '</tr>';
+			}
+		}
 
 
-        if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
-        {
-        	$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
-        	$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
-        }
-		else
+		if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
 		{
+			$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
+			$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
+		} else {
 			$balancebefore = price2num($balance, 'MT'); // balancebefore = balance of previous line (sort is asc)
 			$balance = price2num($balance + ($sign * $objp->amount), 'MT');
 		}
 
-        if (empty($cachebankaccount[$objp->bankid]))
-        {
-            $bankaccounttmp = new Account($db);
-            $bankaccounttmp->fetch($objp->bankid);
-            $cachebankaccount[$objp->bankid] = $bankaccounttmp;
-            $bankaccount = $bankaccounttmp;
-        }
-        else
-        {
-            $bankaccount = $cachebankaccount[$objp->bankid];
-        }
+		if (empty($cachebankaccount[$objp->bankid]))
+		{
+			$bankaccounttmp = new Account($db);
+			$bankaccounttmp->fetch($objp->bankid);
+			$cachebankaccount[$objp->bankid] = $bankaccounttmp;
+			$bankaccount = $bankaccounttmp;
+		} else {
+			$bankaccount = $cachebankaccount[$objp->bankid];
+		}
 
-        if (empty($conf->global->BANK_COLORIZE_MOVEMENT)) {
-            $backgroundcolor = "class='oddeven'";
-        } else {
-            if ($objp->amount < 0)
-            {
-                if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR1)) {
-                    $color = '#fca955';
-                } else {
-                    $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR1;
-                }
-                $backgroundcolor = 'style="background: '.$color.';"';
-            } else {
-                if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR2)) {
-                    $color = '#7fdb86';
-                } else {
-                    $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR2;
-                }
-                $backgroundcolor = 'style="background: '.$color.';"';
-            }
-        }
-        print '<tr class="oddeven" '.$backgroundcolor.'>';
+		if (empty($conf->global->BANK_COLORIZE_MOVEMENT)) {
+			$backgroundcolor = "class='oddeven'";
+		} else {
+			if ($objp->amount < 0)
+			{
+				if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR1)) {
+					$color = '#fca955';
+				} else {
+					$color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR1;
+				}
+				$backgroundcolor = 'style="background: '.$color.';"';
+			} else {
+				if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR2)) {
+					$color = '#7fdb86';
+				} else {
+					$color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR2;
+				}
+				$backgroundcolor = 'style="background: '.$color.';"';
+			}
+		}
 
-        // Ref
-    	if (!empty($arrayfields['b.rowid']['checked']))
-    	{
-                print '<td class="nowrap left">';
-                print "<a href=\"line.php?rowid=".$objp->rowid.'&save_lastsearch_values=1">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'account', 'class="classfortooltip"').' '.$objp->rowid."</a> &nbsp; ";
-                print '</td>';
-                if (!$i) $totalarray['nbfield']++;
-    	}
+		$banklinestatic->id = $objp->rowid;
+		$banklinestatic->ref = $objp->rowid;
 
-    	// Description
-    	if (!empty($arrayfields['b.label']['checked']))
-    	{
-    	    print "<td>";
+		print '<tr class="oddeven" '.$backgroundcolor.'>';
 
-    	    //print "<a href=\"line.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
-    	    $reg = array();
-    	    preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
-    	    if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) print $langs->trans($reg[1]);
-    	    else {
-    	    	if ($objp->label == '(payment_salary)') {
-    	    		print dol_trunc($langs->trans("SalaryPayment", 40));
-    	    	} else {
-    	    		print dol_trunc($objp->label, 40);
-    	    	}
-    	    }
-    	    //print "</a>&nbsp;";
+		// Ref
+		if (!empty($arrayfields['b.rowid']['checked']))
+		{
+				print '<td class="nowrap left">';
+				print $banklinestatic->getNomUrl(1);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+		}
 
-    	    // Add links after description
-    	    $links = $bankaccountstatic->get_url($objp->rowid);
-    	    $cachebankaccount = array();
-    	    foreach ($links as $key=>$val)
-    	    {
-    	    	print '<!-- '.$links[$key]['type'].' -->';
-    	    	if ($links[$key]['type'] == 'withdraw')
-    	    	{
-    	    		$banktransferstatic->id = $links[$key]['url_id'];
-    	    		$banktransferstatic->ref = $links[$key]['label'];
-    	    		print ' '.$banktransferstatic->getNomUrl(0);
-    	    	}
-    	    	elseif ($links[$key]['type'] == 'payment')
-    	        {
-    	            $paymentstatic->id = $links[$key]['url_id'];
-    	            $paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-    	            print ' '.$paymentstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_supplier')
-    	        {
-    	            $paymentsupplierstatic->id = $links[$key]['url_id'];
-    	            $paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-    	            print ' '.$paymentsupplierstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_sc')
-    	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-    	            //print $langs->trans("SocialContributionPayment");
-    	            print '</a>';
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_vat')
-    	        {
-    	            $paymentvatstatic->id = $links[$key]['url_id'];
-    	            $paymentvatstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentvatstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_salary')
-    	        {
-    	            $paymentsalstatic->id = $links[$key]['url_id'];
-    	            $paymentsalstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentsalstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_loan')
-    	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-    	            print '</a>';
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_donation')
-    	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-    	            print '</a>';
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_expensereport')
-    	        {
-    	            $paymentexpensereportstatic->id = $links[$key]['url_id'];
-    	            $paymentexpensereportstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentexpensereportstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_various')
-    	        {
-    	            $paymentvariousstatic->id = $links[$key]['url_id'];
-    	            $paymentvariousstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentvariousstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'banktransfert')
-    	        {
-    	            // Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
-    	            if ($objp->amount > 0)
-    	            {
-    	                $banklinestatic->fetch($links[$key]['url_id']);
-    	                $bankstatic->id = $banklinestatic->fk_account;
-    	                $bankstatic->label = $banklinestatic->bank_account_ref;
-    	                print ' ('.$langs->trans("TransferFrom").' ';
-    	                print $bankstatic->getNomUrl(1, 'transactions');
-    	                print ' '.$langs->trans("toward").' ';
-    	                $bankstatic->id = $objp->bankid;
-    	                $bankstatic->label = $objp->bankref;
-    	                print $bankstatic->getNomUrl(1, '');
-    	                print ')';
-    	            }
-    	            else
-    	            {
-    	                $bankstatic->id = $objp->bankid;
-    	                $bankstatic->label = $objp->bankref;
-    	                print ' ('.$langs->trans("TransferFrom").' ';
-    	                print $bankstatic->getNomUrl(1, '');
-    	                print ' '.$langs->trans("toward").' ';
-    	                $banklinestatic->fetch($links[$key]['url_id']);
-    	                $bankstatic->id = $banklinestatic->fk_account;
-    	                $bankstatic->label = $banklinestatic->bank_account_ref;
-    	                print $bankstatic->getNomUrl(1, 'transactions');
-    	                print ')';
-    	            }
-    	            //var_dump($links);
-    	        }
-    	        elseif ($links[$key]['type'] == 'company')
-    	        {
-    	        }
-    	        elseif ($links[$key]['type'] == 'user')
-    	        {
-    	        }
-    	        elseif ($links[$key]['type'] == 'member')
-    	        {
-    	        }
-    	        elseif ($links[$key]['type'] == 'sc')
-    	        {
-    	        }
-    	        else
-    	        {
-    	            // Show link with label $links[$key]['label']
-    	            if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
-    	            print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
-    	            if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg))
-    	            {
-    	                // Label generique car entre parentheses. On l'affiche en le traduisant
-    	                if ($reg[1] == 'paiement') $reg[1] = 'Payment';
-    	                print ' '.$langs->trans($reg[1]);
-    	            }
-    	            else
-    	            {
-    	                print ' '.$links[$key]['label'];
-    	            }
-    	            print '</a>';
-    	        }
-    	    }
-    	    print '</td>';
-    	    if (!$i) $totalarray['nbfield']++;
-    	}
+		// Description
+		if (!empty($arrayfields['b.label']['checked']))
+		{
+			print "<td>";
 
-        // Date ope
-    	if (!empty($arrayfields['b.dateo']['checked']))
-    	{
-    	    print '<td align="center" class="nowrap">';
-    	    print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
-    	    print '&nbsp;';
-    	    print '<span class="inline-block">';
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_remove()."</a> ";
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_add()."</a>";
-    	    print '</span>';
-    	    print "</td>\n";
-                if (!$i) $totalarray['nbfield']++;
-    	}
+			//print "<a href=\"line.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
+			$reg = array();
+			preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
+			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) print $langs->trans($reg[1]);
+			else {
+				if ($objp->label == '(payment_salary)') {
+					print dol_trunc($langs->trans("SalaryPayment", 40));
+				} else {
+					print dol_trunc($objp->label, 40);
+				}
+			}
+			//print "</a>&nbsp;";
 
-        // Date value
-    	if (!empty($arrayfields['b.datev']['checked']))
-    	{
-    	    print '<td align="center" class="nowrap">';
-    	    print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv), "day")."</span>";
-    	    print '&nbsp;';
-    	    print '<span class="inline-block">';
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_remove()."</a> ";
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_add()."</a>";
-    	    print '</span>';
-    	    print "</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-    	}
+			// Add links after description
+			$links = $bankaccountstatic->get_url($objp->rowid);
+			$cachebankaccount = array();
+			foreach ($links as $key=>$val)
+			{
+				print '<!-- '.$links[$key]['type'].' -->';
+				if ($links[$key]['type'] == 'withdraw')
+				{
+					$banktransferstatic->id = $links[$key]['url_id'];
+					$banktransferstatic->ref = $links[$key]['label'];
+					print ' '.$banktransferstatic->getNomUrl(0);
+				} elseif ($links[$key]['type'] == 'payment')
+				{
+					$paymentstatic->id = $links[$key]['url_id'];
+					$paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
+					print ' '.$paymentstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_supplier')
+				{
+					$paymentsupplierstatic->id = $links[$key]['url_id'];
+					$paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
+					print ' '.$paymentsupplierstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_sc')
+				{
+					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
+					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
+					//print $langs->trans("SocialContributionPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_vat')
+				{
+					$paymentvatstatic->id = $links[$key]['url_id'];
+					$paymentvatstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentvatstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_salary')
+				{
+					$paymentsalstatic->id = $links[$key]['url_id'];
+					$paymentsalstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentsalstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_loan')
+				{
+					print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
+					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_donation')
+				{
+					print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
+					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_expensereport')
+				{
+					$paymentexpensereportstatic->id = $links[$key]['url_id'];
+					$paymentexpensereportstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentexpensereportstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_various')
+				{
+					$paymentvariousstatic->id = $links[$key]['url_id'];
+					$paymentvariousstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentvariousstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'banktransfert')
+				{
+					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
+					if ($objp->amount > 0)
+					{
+						$banklinestatic->fetch($links[$key]['url_id']);
+						$bankstatic->id = $banklinestatic->fk_account;
+						$bankstatic->label = $banklinestatic->bank_account_ref;
+						print ' ('.$langs->trans("TransferFrom").' ';
+						print $bankstatic->getNomUrl(1, 'transactions');
+						print ' '.$langs->trans("toward").' ';
+						$bankstatic->id = $objp->bankid;
+						$bankstatic->label = $objp->bankref;
+						print $bankstatic->getNomUrl(1, '');
+						print ')';
+					} else {
+						$bankstatic->id = $objp->bankid;
+						$bankstatic->label = $objp->bankref;
+						print ' ('.$langs->trans("TransferFrom").' ';
+						print $bankstatic->getNomUrl(1, '');
+						print ' '.$langs->trans("toward").' ';
+						$banklinestatic->fetch($links[$key]['url_id']);
+						$bankstatic->id = $banklinestatic->fk_account;
+						$bankstatic->label = $banklinestatic->bank_account_ref;
+						print $bankstatic->getNomUrl(1, 'transactions');
+						print ')';
+					}
+					//var_dump($links);
+				} elseif ($links[$key]['type'] == 'company')
+				{
+				} elseif ($links[$key]['type'] == 'user')
+				{
+				} elseif ($links[$key]['type'] == 'member')
+				{
+				} elseif ($links[$key]['type'] == 'sc')
+				{
+				} else {
+					// Show link with label $links[$key]['label']
+					if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
+					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg))
+					{
+						// Label generique car entre parentheses. On l'affiche en le traduisant
+						if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+						print ' '.$langs->trans($reg[1]);
+					} else {
+						print ' '.$links[$key]['label'];
+					}
+					print '</a>';
+				}
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Payment type
-    	if (!empty($arrayfields['type']['checked']))
-    	{
-        	print '<td align="center" class="nowrap">';
-	        $labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
-	        if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
-	        else print $labeltype;
-	        print "</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-    	}
+		// Date ope
+		if (!empty($arrayfields['b.dateo']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
+			print '&nbsp;';
+			print '<span class="inline-block">';
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_remove()."</a> ";
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_add()."</a>";
+			print '</span>';
+			print "</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Num cheque
-    	if (!empty($arrayfields['b.num_chq']['checked']))
-    	{
-    	    print '<td class="nowrap" align="center">'.($objp->num_chq ? $objp->num_chq : "")."</td>\n";
-    	    if (!$i) $totalarray['nbfield']++;
-    	}
+		// Date value
+		if (!empty($arrayfields['b.datev']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv), "day")."</span>";
+			print '&nbsp;';
+			print '<span class="inline-block">';
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_remove()."</a> ";
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_add()."</a>";
+			print '</span>';
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Payment type
+		if (!empty($arrayfields['type']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			$labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
+			if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
+			else print $labeltype;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Num cheque
+		if (!empty($arrayfields['b.num_chq']['checked']))
+		{
+			print '<td class="nowrap" align="center">'.($objp->num_chq ? $objp->num_chq : "")."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
 		// Third party
-    	if (!empty($arrayfields['bu.label']['checked']))
-    	{
-        	print '<td class="tdoverflowmax150">';
+		if (!empty($arrayfields['bu.label']['checked']))
+		{
+			print '<td class="tdoverflowmax150">';
 			if ($objp->url_id)
 			{
 				$companystatic->id = $objp->url_id;
@@ -1395,175 +1355,161 @@ if ($resql)
 				$companystatic->code_compta = $objp->code_compta;
 				$companystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
 				print $companystatic->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-    	}
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Bank account
-    	if (!empty($arrayfields['ba.ref']['checked']))
-    	{
-        	print '<td class="nowrap">';
+		// Bank account
+		if (!empty($arrayfields['ba.ref']['checked']))
+		{
+			print '<td class="nowrap">';
 			print $bankaccount->getNomUrl(1);
 			print "</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-    	}
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Debit
-    	if (!empty($arrayfields['b.debit']['checked']))
-    	{
-    	    print '<td class="nowrap right">';
-    	    if ($objp->amount < 0)
-    	    {
-    	    	print price($objp->amount * -1);
-    	        $totalarray['totaldeb'] += $objp->amount;
-    	    }
-    	    print "</td>\n";
-    	    if (!$i) $totalarray['nbfield']++;
-    	    if (!$i) $totalarray['totaldebfield'] = $totalarray['nbfield'];
-    	}
+		// Debit
+		if (!empty($arrayfields['b.debit']['checked']))
+		{
+			print '<td class="nowrap right">';
+			if ($objp->amount < 0)
+			{
+				print price($objp->amount * -1);
+				$totalarray['totaldeb'] += $objp->amount;
+			}
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['totaldebfield'] = $totalarray['nbfield'];
+		}
 
-    	// Credit
-    	if (!empty($arrayfields['b.credit']['checked']))
-    	{
-    	    print '<td class="nowrap right">';
-    	    if ($objp->amount > 0)
-    	    {
+		// Credit
+		if (!empty($arrayfields['b.credit']['checked']))
+		{
+			print '<td class="nowrap right">';
+			if ($objp->amount > 0)
+			{
 				print price($objp->amount);
-    	        $totalarray['totalcred'] += $objp->amount;
-    	    }
-    	    print "</td>\n";
-    	    if (!$i) $totalarray['nbfield']++;
-    	    if (!$i) $totalarray['totalcredfield'] = $totalarray['nbfield'];
-    	}
+				$totalarray['totalcred'] += $objp->amount;
+			}
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['totalcredfield'] = $totalarray['nbfield'];
+		}
 
-    	// Balance before
-    	if (!empty($arrayfields['balancebefore']['checked']))
-    	{
-    		if ($mode_balance_ok)
-    		{
-    			if ($balancebefore >= 0)
-    			{
-    				print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
-    			}
-    			else
-    			{
-    				print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
-    			}
-    		}
-    		else
-    		{
-    			print '<td class="right">-</td>';
-    		}
-    		if (!$i) $totalarray['nbfield']++;
-    	}
-    	// Balance
-    	if (!empty($arrayfields['balance']['checked']))
-    	{
-    		if ($mode_balance_ok)
-    		{
-    			if ($balance >= 0)
-    			{
-    				print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
-    			}
-    			else
-    			{
-    				print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
-    			}
-    		}
-    		else
-    		{
-    			print '<td class="right">-</td>';
-    		}
-    		if (!$i) $totalarray['nbfield']++;
-    	}
+		// Balance before
+		if (!empty($arrayfields['balancebefore']['checked']))
+		{
+			if ($mode_balance_ok)
+			{
+				if ($balancebefore >= 0)
+				{
+					print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
+				} else {
+					print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
+				}
+			} else {
+				print '<td class="right">-</td>';
+			}
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Balance
+		if (!empty($arrayfields['balance']['checked']))
+		{
+			if ($mode_balance_ok)
+			{
+				if ($balance >= 0)
+				{
+					print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
+				} else {
+					print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
+				}
+			} else {
+				print '<td class="right">-</td>';
+			}
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	if (!empty($arrayfields['b.num_releve']['checked']))
-    	{
-            print '<td class="nowraponall" align="center">';
-        	// Transaction reconciliated or edit link
-        	if ($bankaccount->canBeConciliated() > 0)
-        	{
-        		if ($objp->num_releve)
-            	{
-            	    print '<a href="releve.php?num='.$objp->num_releve.'&account='.$objp->bankid.'&save_lastsearch_values=1">'.$objp->num_releve.'</a>';
-            	}
-            	if (!$objp->conciliated && $action == 'reconcile')
-            	{
-            		if ($objp->num_releve) print '&nbsp;';
-            	    print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(!empty($_POST['rowid'][$objp->rowid]) ? ' checked' : '').'>';
-            	}
-        	}
-        	print '</td>';
-            if (!$i)
-            {
-            	$totalarray['nbfield']++;
-            	$posconciliatecol = $totalarray['nbfield'];
-            }
-    	}
+		if (!empty($arrayfields['b.num_releve']['checked']))
+		{
+			print '<td class="nowraponall" align="center">';
+			// Transaction reconciliated or edit link
+			if ($bankaccount->canBeConciliated() > 0)
+			{
+				if ($objp->num_releve)
+				{
+					print '<a href="releve.php?num='.$objp->num_releve.'&account='.$objp->bankid.'&save_lastsearch_values=1">'.$objp->num_releve.'</a>';
+				}
+				if (!$objp->conciliated && $action == 'reconcile')
+				{
+					if ($objp->num_releve) print '&nbsp;';
+					print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(!empty($_POST['rowid'][$objp->rowid]) ? ' checked' : '').'>';
+				}
+			}
+			print '</td>';
+			if (!$i)
+			{
+				$totalarray['nbfield']++;
+				$posconciliatecol = $totalarray['nbfield'];
+			}
+		}
 
-        if (!empty($arrayfields['b.conciliated']['checked']))
-    	{
-            print '<td class="nowraponall" align="center">';
-            print $objp->conciliated ? $langs->trans("Yes") : $langs->trans("No");
-        	print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-    	}
+		if (!empty($arrayfields['b.conciliated']['checked']))
+		{
+			print '<td class="nowraponall" align="center">';
+			print $objp->conciliated ? $langs->trans("Yes") : $langs->trans("No");
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Action edit/delete
-    	print '<td class="nowraponall" align="center">';
-    	// Transaction reconciliated or edit link
-    	if ($objp->conciliated && $bankaccount->canBeConciliated() > 0)  // If line not conciliated and account can be conciliated
-    	{
-    	    print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
-    	    print img_edit();
-    	    print '</a>';
-    	}
-    	else
-    	{
-    	    if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-    	    {
-    	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
-    	        print img_edit();
-    	        print '</a>';
-    	    }
-    	    else
-    	    {
-    	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
-    	        print img_view();
-    	        print '</a>';
-    	    }
-    	    if ($bankaccount->canBeConciliated() > 0 && empty($objp->conciliated))
-    	    {
-    	        if ($db->jdate($objp->dv) < ($now - $conf->bank->rappro->warning_delay))
-    	        {
-    	            print ' '.img_warning($langs->trans("ReconciliationLate"));
-    	        }
-    	    }
-    	    if ($user->rights->banque->modifier)
-    	    {
-    	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;rowid='.$objp->rowid.'&amp;id='.$objp->bankid.'&amp;page='.$page.'">';
-    	        print img_delete('', 'class="marginleftonly"');
-    	        print '</a>';
-    	    }
-    	}
-    	print '</td>';
-    	if (!$i) $totalarray['nbfield']++;
+		// Action edit/delete
+		print '<td class="nowraponall" align="center">';
+		// Transaction reconciliated or edit link
+		if ($objp->conciliated && $bankaccount->canBeConciliated() > 0)  // If line not conciliated and account can be conciliated
+		{
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+			print img_edit();
+			print '</a>';
+		} else {
+			if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+			{
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+				print img_edit();
+				print '</a>';
+			} else {
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+				print img_view();
+				print '</a>';
+			}
+			if ($bankaccount->canBeConciliated() > 0 && empty($objp->conciliated))
+			{
+				if ($db->jdate($objp->dv) < ($now - $conf->bank->rappro->warning_delay))
+				{
+					print ' '.img_warning($langs->trans("ReconciliationLate"));
+				}
+			}
+			if ($user->rights->banque->modifier)
+			{
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;rowid='.$objp->rowid.'&amp;id='.$objp->bankid.'&amp;page='.$page.'">';
+				print img_delete('', 'class="marginleftonly"');
+				print '</a>';
+			}
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-    	// Action column
-    	print '<td class="nowrap" align="center">';
-    	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-    	{
-    	    $selected = 0;
-    	    if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
-    	    print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
-    	}
-    	print '</td>';
-    	if (!$i) $totalarray['nbfield']++;
+		// Action column
+		print '<td class="nowrap" align="center">';
+		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		{
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
 		print "</tr>";
 
@@ -1573,27 +1519,25 @@ if ($resql)
 	// Show total line
 	if (isset($totalarray['totaldebfield']) || isset($totalarray['totalcredfield']))
 	{
-	    print '<tr class="liste_total">';
-	    $i = 0;
-	    while ($i < $totalarray['nbfield'])
-	    {
-	        $i++;
-	        if ($i == 1)
-	        {
-	            if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
-	            else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
-	        }
-	        elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
-	        elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
-	        elseif ($i == $posconciliatecol)
-	        {
-	        	print '<td class="center">';
-	        	if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
-	        	print '</td>';
-	        }
-	        else print '<td></td>';
-	    }
-	    print '</tr>';
+		print '<tr class="liste_total">';
+		$i = 0;
+		while ($i < $totalarray['nbfield'])
+		{
+			$i++;
+			if ($i == 1)
+			{
+				if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
+			} elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
+			elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
+			elseif ($i == $posconciliatecol)
+			{
+				print '<td class="center">';
+				if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+				print '</td>';
+			} else print '<td></td>';
+		}
+		print '</tr>';
 	}
 
 	// If no record found
@@ -1607,11 +1551,9 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 
-    print '</form>';
+	print '</form>';
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 042117808d5..8559096477d 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -89,9 +89,7 @@ if ($result)
 	print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").'</td>';
 	print '<td class="liste_total right">'.price($total).'</td>';
 	print '<td colspan="2" class="liste_total right">'.price($totalnb ?price2num($total / $totalnb, 'MT') : 0).'</td></tr>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 print "</table>";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 593893878e0..bac2f974def 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -99,9 +99,7 @@ if ($action == 'add')
 	if (empty($account_number) || $account_number == '-1')
 	{
 		$object->account_number = '';
-	}
-	else
-	{
+	} else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
@@ -117,7 +115,7 @@ if ($action == 'add')
 
 	$object->min_allowed     = GETPOST("account_min_allowed", 'int');
 	$object->min_desired     = GETPOST("account_min_desired", 'int');
-	$object->comment         = trim(GETPOST("account_comment", 'none'));
+	$object->comment         = trim(GETPOST("account_comment", 'restricthtml'));
 
 	$object->fk_user_author  = $user->id;
 
@@ -155,8 +153,7 @@ if ($action == 'add')
 			$_GET["id"] = $id; // Force chargement page en mode visu
 
 			$action = '';
-		}
-		else {
+		} else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 
@@ -167,9 +164,7 @@ if ($action == 'add')
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -205,9 +200,7 @@ if ($action == 'update')
 	if (empty($account_number) || $account_number == '-1')
 	{
 		$object->account_number = '';
-	}
-	else
-	{
+	} else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
@@ -220,7 +213,7 @@ if ($action == 'update')
 
 	$object->min_allowed     = GETPOST("account_min_allowed", 'int');
 	$object->min_desired     = GETPOST("account_min_desired", 'int');
-	$object->comment         = trim(GETPOST("account_comment", 'none'));
+	$object->comment         = trim(GETPOST("account_comment", 'restricthtml'));
 
 	if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
 	{
@@ -259,9 +252,7 @@ if ($action == 'update')
 			$object->setCategories($categories);
 
 			$_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
-		}
-		else
-		{
+		} else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'edit'; // Force chargement page edition
@@ -271,9 +262,7 @@ if ($action == 'update')
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -290,9 +279,7 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
@@ -383,8 +370,7 @@ if ($action == 'create')
 	if (isset($_POST["account_country_id"]))
 	{
 		$selectedcode = $_POST["account_country_id"] ? $_POST["account_country_id"] : $object->country_code;
-	}
-	elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+	} elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
 	$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
@@ -398,9 +384,7 @@ if ($action == 'create')
 	if ($selectedcode)
 	{
 		$formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id');
-	}
-	else
-	{
+	} else {
 		print $countrynotdefined;
 	}
 	print '</td></tr>';
@@ -544,9 +528,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td><input type="text" name="account_number" value="'.(GETPOST("account_number") ?GETPOST('account_number', 'alpha') : $object->account_number).'"></td></tr>';
 	}
@@ -571,16 +553,14 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-}
-/* ************************************************************************** */
-/*                                                                            */
-/* Visu et edition                                                            */
-/*                                                                            */
-/* ************************************************************************** */
-else
-{
-	if (($_GET["id"] || $_GET["ref"]) && $action != 'edit')
-	{
+} else {
+	/* ************************************************************************** */
+	/*                                                                            */
+	/* Visu et edition                                                            */
+	/*                                                                            */
+	/* ************************************************************************** */
+
+	if (($_GET["id"] || $_GET["ref"]) && $action != 'edit') {
 		$object = new Account($db);
 		if ($_GET["id"])
 		{
@@ -781,13 +761,13 @@ else
 
 		if ($user->rights->banque->configurer)
 		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
 		}
 
 		$canbedeleted = $object->can_be_deleted(); // Renvoi vrai si compte sans mouvements
 		if ($user->rights->banque->configurer && $canbedeleted)
 		{
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
+			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
 		}
 
 		print '</div>';
@@ -886,9 +866,7 @@ else
 		if ($selectedcode)
 		{
 			print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id');
-		}
-		else
-		{
+		} else {
 			print $countrynotdefined;
 		}
 		print '</td></tr>';
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 308dad5dbca..18b75bdea9b 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -132,13 +132,11 @@ if ($result)
 			print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
 			print '<input type="submit" name="update" class="button" value="'.$langs->trans("Edit").'">';
 			print "</td>";
-		}
-		else
-		{
+		} else {
 			print "<td >".$objp->label."</td>";
 			print '<td class="center">';
-			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit">'.img_edit().'</a>';
-			print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=delete">'.img_delete().'</a>';
+			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit&amp;token='.newToken().'">'.img_edit().'</a>';
+			print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=delete&amp;token='.newToken().'">'.img_delete().'</a>';
 			print '</td>';
 		}
 		print "</tr>";
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 31d7749a430..dffd62dc5a3 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -342,9 +342,9 @@ class Account extends CommonObject
 				$string .= $this->code_guichet.' ';
 			} elseif ($val == 'BankAccountNumberKey') {
 				$string .= $this->cle_rib.' ';
-			}elseif ($val == 'BIC') {
+			} elseif ($val == 'BIC') {
 				$string .= $this->bic.' ';
-			}elseif ($val == 'IBAN') {
+			} elseif ($val == 'IBAN') {
 				$string .= $this->iban.' ';
 			}
 		}
@@ -390,11 +390,11 @@ class Account extends CommonObject
 		$sql .= ", label";
 		$sql .= ", type";
 		$sql .= ") VALUES (";
-		$sql .= "'".$line_id."'";
-		$sql .= ", '".$url_id."'";
-		$sql .= ", '".$url."'";
+		$sql .= " ".((int) $line_id);
+		$sql .= ", '".$this->db->escape($url_id)."'";
+		$sql .= ", '".$this->db->escape($url)."'";
 		$sql .= ", '".$this->db->escape($label)."'";
-		$sql .= ", '".$type."'";
+		$sql .= ", '".$this->db->escape($type)."'";
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::add_url_line", LOG_DEBUG);
@@ -402,9 +402,7 @@ class Account extends CommonObject
 		{
 			$rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_url");
 			return $rowid;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -436,8 +434,7 @@ class Account extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_url";
 		if ($fk_bank > 0) {
 			$sql .= " WHERE fk_bank = ".$fk_bank;
-		}
-		else { $sql .= " WHERE url_id = ".$url_id." AND type = '".$type."'";
+		} else { $sql .= " WHERE url_id = ".$url_id." AND type = '".$this->db->escape($type)."'";
 		}
 		$sql .= " ORDER BY type, label";
 
@@ -463,8 +460,7 @@ class Account extends CommonObject
 				$lines[$i]['fk_bank'] = $obj->fk_bank;
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $lines;
 	}
@@ -473,7 +469,7 @@ class Account extends CommonObject
 	 *  Add an entry into table ".MAIN_DB_PREFIX."bank
 	 *
 	 *  @param	int	        $date			Date operation
-	 *  @param	string		$oper			1,2,3,4... (deprecated) or 'TYP','VIR','PRE','LIQ','VAD','CB','CHQ'...
+	 *  @param	string		$oper			'VIR','PRE','LIQ','VAD','CB','CHQ'...
 	 *  @param	string		$label			Descripton
 	 *  @param	float		$amount			Amount
 	 *  @param	string		$num_chq		Numero cheque or transfer
@@ -508,9 +504,7 @@ class Account extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 				$oper = $obj->code;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db, 'Failed to get payment type code');
 				return -1;
 			}
@@ -722,20 +716,15 @@ class Account extends CommonObject
 					if ($result < 0) $error++;
 					// End call triggers
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$this->error = $langs->trans("ErrorBankLabelAlreadyExists");
 				$error++;
-			}
-			else {
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$error++;
 			}
@@ -745,9 +734,7 @@ class Account extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -838,9 +825,7 @@ class Account extends CommonObject
 				if ($result < 0) $error++;
 				// End call triggers
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
@@ -850,9 +835,7 @@ class Account extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -909,9 +892,7 @@ class Account extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
@@ -1008,14 +989,10 @@ class Account extends CommonObject
 				$this->fetch_optionals();
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror;
 			$this->errors[] = $this->error;
 			return -1;
@@ -1115,9 +1092,7 @@ class Account extends CommonObject
 						dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = "Error ".$this->db->lasterror();
 			}
@@ -1127,9 +1102,7 @@ class Account extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1194,8 +1167,7 @@ class Account extends CommonObject
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj->nb <= 1) $can_be_deleted = true; // Juste le solde
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $can_be_deleted;
@@ -1293,9 +1265,7 @@ class Account extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -1332,9 +1302,7 @@ class Account extends CommonObject
 				$this->nb["banklines"] = $obj->nb;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -1347,7 +1315,7 @@ class Account extends CommonObject
 	 *
 	 *      @return int     Nb of account we can reconciliate
 	 */
-	public static function countAccountToReconcile()
+	public function countAccountToReconcile()
 	{
 		global $db, $conf, $user;
 
@@ -1363,13 +1331,12 @@ class Account extends CommonObject
 		$sql .= " WHERE ba.rappro > 0 and ba.clos = 0";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		if (empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) $sql .= " AND ba.courant != 2";
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$obj = $db->fetch_object($resql);
+			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		}
-		else dol_print_error($db);
+		} else dol_print_error($this->db);
 
 		return $nb;
 	}
@@ -1389,7 +1356,7 @@ class Account extends CommonObject
 		global $conf, $langs, $user;
 
 		$result = '';
-		$label = '<u>'.$langs->trans("BankAccount").'</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("BankAccount").'</u>';
 		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 		$label .= '<br><b>'.$langs->trans('AccountNumber').':</b> '.$this->number;
 		$label .= '<br><b>'.$langs->trans('IBAN').':</b> '.$this->iban;
@@ -1418,8 +1385,7 @@ class Account extends CommonObject
 		if ($mode == 'transactions')
 		{
 			$url = DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$this->id;
-		}
-		elseif ($mode == 'receipts')
+		} elseif ($mode == 'receipts')
 		{
 			$url = DOL_URL_ROOT.'/compta/bank/releve.php?account='.$this->id;
 		}
@@ -1479,9 +1445,7 @@ class Account extends CommonObject
 		if ($this->error_number == 0)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -1742,7 +1706,7 @@ class AccountLine extends CommonObject
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
-	public $picto = 'generic';
+	public $picto = 'accountline';
 
 	/**
 	 * @var int ID
@@ -1861,7 +1825,7 @@ class AccountLine extends CommonObject
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		if ($num) $sql .= " AND b.num_chq='".$this->db->escape($num)."'";
 		elseif ($ref) $sql .= " AND b.rowid='".$this->db->escape($ref)."'";
-		else $sql .= " AND b.rowid=".$rowid;
+		else $sql .= " AND b.rowid = ".((int) $rowid);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1902,9 +1866,7 @@ class AccountLine extends CommonObject
 			}
 			$this->db->free($result);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -1991,8 +1953,7 @@ class AccountLine extends CommonObject
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else {
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
@@ -2020,9 +1981,7 @@ class AccountLine extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -$nbko;
 		}
@@ -2059,9 +2018,7 @@ class AccountLine extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -$nbko;
 		}
@@ -2091,9 +2048,7 @@ class AccountLine extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->error();
 			return -1;
@@ -2157,9 +2112,7 @@ class AccountLine extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2195,14 +2148,11 @@ class AccountLine extends CommonObject
 				{
 					return 1;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		return 0;
 	}
 
@@ -2262,14 +2212,11 @@ class AccountLine extends CommonObject
 				{
 					return 1;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		return 0;
 	}
 
@@ -2339,9 +2286,7 @@ class AccountLine extends CommonObject
 				//$this->date_rappro       = $obj->daterappro;    // Not yet managed
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2361,13 +2306,16 @@ class AccountLine extends CommonObject
 		global $langs;
 
 		$result = '';
-		$label = $langs->trans("ShowTransaction").': '.$this->rowid;
-		$linkstart = '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$this->rowid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Transaction").'</u>:<br>';
+		$label .= '<b>'.$langs->trans("Ref").':</b> '.$this->ref;
+
+		$linkstart = '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$this->id.'&save_lastsearch_values=1" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
 		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'account'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($this->ref ? $this->ref : $this->rowid);
+		if ($withpicto != 2) $result .= ($this->ref ? $this->ref : $this->id);
 		$result .= $linkend;
 
 		if ($option == 'showall' || $option == 'showconciliated' || $option == 'showconciliatedandaccounted') $result .= ' <span class="opacitymedium">(';
@@ -2473,7 +2421,7 @@ class AccountLine extends CommonObject
 
 		$type = 'bank';
 
-		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$this->id;
+		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->id;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2482,9 +2430,7 @@ class AccountLine extends CommonObject
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index ad75559b362..3293f746033 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -225,9 +225,7 @@ class BankAccounts extends DolibarrApi
         if ($accountto->currency_code == $accountfrom->currency_code)
         {
             $amount_to = $amount;
-        }
-        else
-        {
+        } 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.');
@@ -303,9 +301,7 @@ class BankAccounts extends DolibarrApi
                     'message' => 'Internal wire transfer created successfully.'
                 )
             );
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             throw new RestException(500, $accountfrom->error.' '.$accountto->error);
         }
@@ -338,9 +334,7 @@ class BankAccounts extends DolibarrApi
         if ($account->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $account->error);
         }
     }
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index aec104028c0..157a7096eb8 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -95,6 +95,37 @@ class PaymentVarious extends CommonObject
 	public $fk_user_modif;
 
 
+	/**
+	 *  '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.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	public $fields = array(
+		// TODO: fill this array
+	);
+	// END MODULEBUILDER PROPERTIES
+
 	/**
 	 *	Constructor
 	 *
@@ -169,9 +200,7 @@ class PaymentVarious extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -244,9 +273,7 @@ class PaymentVarious extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -311,6 +338,24 @@ class PaymentVarious extends CommonObject
 		$this->fk_user_modif = '';
 	}
 
+	/**
+	 * Check if a miscellaneous payment can be created into database
+	 *
+	 * @return	boolean		True or false
+	 */
+	public function check()
+	{
+		$newamount = price2num($this->amount, 'MT');
+
+		// Validation of parameters
+		if (!($newamount) > 0 || empty($this->datep))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 *  Create in database
 	 *
@@ -434,9 +479,7 @@ class PaymentVarious extends CommonObject
 					if ($bank_line_id > 0)
 					{
 						$this->update_fk_bank($bank_line_id);
-					}
-					else
-					{
+					} else {
 						$this->error = $acc->error;
 						$error++;
 					}
@@ -465,22 +508,17 @@ class PaymentVarious extends CommonObject
 				$result = $this->call_trigger('PAYMENT_VARIOUS_CREATE', $user);
 				if ($result < 0) $error++;
 				// End call triggers
-			}
-			else $error++;
+			} else $error++;
 
 			if (!$error)
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -503,9 +541,7 @@ class PaymentVarious extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -539,30 +575,25 @@ class PaymentVarious extends CommonObject
 		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');
@@ -620,8 +651,7 @@ class PaymentVarious extends CommonObject
 			 $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.'>';
@@ -680,9 +710,7 @@ class PaymentVarious extends CommonObject
 				$this->date_modif = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -700,7 +728,7 @@ class PaymentVarious extends CommonObject
 
 		$type = 'bank';
 
-		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$banklineid;
+		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$banklineid;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -709,9 +737,7 @@ class PaymentVarious extends CommonObject
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index d003463e5af..2bd95409827 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -36,15 +36,9 @@ $langs->loadLangs(array('banks', 'companies', 'other'));
 
 $id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
-$mesg = '';
-if (isset($_SESSION['DolMessage'])) {
-    $mesg = $_SESSION['DolMessage'];
-    unset($_SESSION['DolMessage']);
-}
-
 // Security check
 if ($user->socid) {
     $action = '';
@@ -137,12 +131,10 @@ if ($id > 0 || !empty($ref)) {
         $permtoedit = $user->rights->banque->modifier;
         $param = '&id='.$object->id;
         include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
-}
-else {
+} else {
     Header('Location: index.php');
     exit;
 }
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 347353be84f..686122f4d56 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -84,9 +84,7 @@ if ($result < 0)
 	$langs->load("errors");
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
-}
-else
-{
+} else {
 	// Calcul $min and $max
 	$sql = "SELECT MIN(b.datev) as min, MAX(b.datev) as max";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -102,9 +100,7 @@ else
 		$obj = $db->fetch_object($resql);
 		$min = $db->jdate($obj->min);
 		$max = $db->jdate($obj->max);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	if (empty($min)) $min = dol_now() - 3600 * 24;
@@ -134,8 +130,8 @@ else
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		$sql .= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
-		$sql .= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
+		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
+		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
 		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
@@ -151,9 +147,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -165,7 +159,7 @@ else
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		$sql .= " AND b.datev < '".$year."-".sprintf("%02s", $month)."-01'";
+		$sql .= " AND b.datev < '".$db->escape($year)."-".sprintf("%02s", $month)."-01'";
 		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
 
 		$resql = $db->query($sql);
@@ -174,9 +168,7 @@ else
 			$row = $db->fetch_row($resql);
 			$solde = $row[0];
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -199,9 +191,7 @@ else
 			if ($day > time())
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
-			}
-			else
-			{
+			} else {
 				$datas[$i] = $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -277,8 +267,8 @@ else
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		$sql .= " AND b.datev >= '".$year."-01-01 00:00:00'";
-		$sql .= " AND b.datev <= '".$year."-12-31 23:59:59'";
+		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
+		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
 		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
@@ -294,9 +284,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -308,7 +296,7 @@ else
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		$sql .= " AND b.datev < '".$year."-01-01'";
+		$sql .= " AND b.datev < '".$db->escape($year)."-01-01'";
 		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
 
 		$resql = $db->query($sql);
@@ -317,9 +305,7 @@ else
 			$row = $db->fetch_row($resql);
 			$solde = $row[0];
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -343,9 +329,7 @@ else
 			if ($day > $now)
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
-			}
-			else
-			{
+			} else {
 				$datas[$i] = $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -431,9 +415,7 @@ else
 				$amounts[$row[0]] = $row[1];
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -459,9 +441,7 @@ else
 			if ($day > ($max + 86400))
 			{
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
-			}
-			else
-			{
+			} else {
 				$datas[$i] = 0 + $solde + $subtotal;
 			}
 			$datamin[$i] = $object->min_desired;
@@ -539,8 +519,8 @@ else
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		$sql .= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
-		$sql .= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
+		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
+		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
 		$sql .= " AND b.amount > 0";
 		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
 		$sql .= " GROUP BY date_format(b.datev,'%d')";
@@ -557,9 +537,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -577,8 +555,8 @@ else
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		$sql .= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
-		$sql .= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
+		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
+		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
 		$sql .= " AND b.amount < 0";
 		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
 		$sql .= " GROUP BY date_format(b.datev,'%d')";
@@ -591,9 +569,7 @@ else
 				$debits[$row[0]] = abs($row[1]);
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -656,8 +632,8 @@ else
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		$sql .= " AND b.datev >= '".$year."-01-01 00:00:00'";
-		$sql .= " AND b.datev <= '".$year."-12-31 23:59:59'";
+		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
+		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
 		$sql .= " AND b.amount > 0";
 		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
 		$sql .= " GROUP BY date_format(b.datev,'%m');";
@@ -674,9 +650,7 @@ else
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		$sql = "SELECT date_format(b.datev,'%m')";
@@ -685,8 +659,8 @@ else
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		$sql .= " AND b.datev >= '".$year."-01-01 00:00:00'";
-		$sql .= " AND b.datev <= '".$year."-12-31 23:59:59'";
+		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
+		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
 		$sql .= " AND b.amount < 0";
 		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
 		$sql .= " GROUP BY date_format(b.datev,'%m')";
@@ -699,9 +673,7 @@ else
 				$debits[$row[0]] = abs($row[1]);
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -770,16 +742,12 @@ if ($account)
 		{
 			$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);
-		}
-		else
-		{
+		} else {
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.$moreparam.'">'.$langs->trans("BackToAccount").'</a>';
 			print $langs->trans("AllAccounts");
 			//print $morehtml;
 		}
-	}
-	else
-	{
+	} else {
 	    $bankaccount = new Account($db);
 		$listid = explode(',', $account);
 		foreach ($listid as $key => $id)
@@ -790,9 +758,7 @@ if ($account)
 			if ($key < (count($listid) - 1)) print ', ';
 		}
 	}
-}
-else
-{
+} else {
 	print $langs->trans("AllAccounts");
 }
 
@@ -808,9 +774,7 @@ if ($mode == 'showalltime')
 	print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'">';
 	print $langs->trans("GoBack");
 	print '</a>';
-}
-else
-{
+} else {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=showalltime&account='.$account.'">';
 	print $langs->trans("ShowAllTimeBalance");
 	print '</a>';
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 6f6d7236f15..e1adb0b5e41 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'companies'));
 
-$id = GETPOST("rowid");
+$id = GETPOST("rowid", 'int');
 
 
 /*
@@ -55,7 +55,7 @@ $hselected = $h;
 $h++;
 
 
-dol_fiche_head($head, $hselected, $langs->trans("LineRecord"), -1, 'account');
+dol_fiche_head($head, $hselected, $langs->trans("LineRecord"), -1, 'accountline');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index bf8dc6f5649..4e2998792d8 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -32,6 +32,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'compta', 'bills', 'other'));
@@ -43,7 +44,7 @@ if (!empty($conf->salaries->enabled)) $langs->load("salaries");
 
 $id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $rowid = GETPOST("rowid", 'int');
 $orig_account = GETPOST("orig_account");
@@ -76,15 +77,15 @@ if ($user->rights->banque->consolidate && $action == 'donext')
 {
     $al = new AccountLine($db);
     $al->dateo_next($_GET["rowid"]);
-}elseif ($user->rights->banque->consolidate && $action == 'doprev')
+} elseif ($user->rights->banque->consolidate && $action == 'doprev')
 {
     $al = new AccountLine($db);
     $al->dateo_previous($_GET["rowid"]);
-}elseif ($user->rights->banque->consolidate && $action == 'dvnext')
+} elseif ($user->rights->banque->consolidate && $action == 'dvnext')
 {
     $al = new AccountLine($db);
     $al->datev_next($_GET["rowid"]);
-}elseif ($user->rights->banque->consolidate && $action == 'dvprev')
+} elseif ($user->rights->banque->consolidate && $action == 'dvprev')
 {
     $al = new AccountLine($db);
     $al->datev_previous($_GET["rowid"]);
@@ -99,9 +100,7 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban
     	{
         	dol_print_error($db);
     	}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("MissingIds"), null, 'errors');
 	}
 }
@@ -120,9 +119,7 @@ if ($user->rights->banque->modifier && $action == "update")
 	if (GETPOST('accountid', 'int') > 0 && !$acline->rappro && !$acline->getVentilExportCompta())	// We ask to change bank account
 	{
 		$actarget->fetch(GETPOST('accountid', 'int'));
-	}
-	else
-	{
+	} else {
 		$actarget->fetch($id);
 	}
 
@@ -142,15 +139,15 @@ if ($user->rights->banque->modifier && $action == "update")
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 		$sql .= " SET ";
 		// Always opened
-		if (isset($_POST['value']))      $sql .= " fk_type='".$db->escape($_POST['value'])."',";
-		if (isset($_POST['num_chq']))    $sql .= " num_chq='".$db->escape($_POST["num_chq"])."',";
-		if (isset($_POST['banque']))     $sql .= " banque='".$db->escape($_POST["banque"])."',";
-		if (isset($_POST['emetteur']))   $sql .= " emetteur='".$db->escape($_POST["emetteur"])."',";
+		if (isset($_POST['value']))      $sql .= " fk_type='".$db->escape(GETPOST('value'))."',";
+		if (isset($_POST['num_chq']))    $sql .= " num_chq='".$db->escape(GETPOST("num_chq"))."',";
+		if (isset($_POST['banque']))     $sql .= " banque='".$db->escape(GETPOST("banque"))."',";
+		if (isset($_POST['emetteur']))   $sql .= " emetteur='".$db->escape(GETPOST("emetteur"))."',";
 		// Blocked when conciliated
 		if (!$acline->rappro)
 		{
-			if (isset($_POST['label']))      $sql .= " label='".$db->escape($_POST["label"])."',";
-			if (isset($_POST['amount']))     $sql .= " amount='".$amount."',";
+			if (isset($_POST['label']))      $sql .= " label = '".$db->escape(GETPOST("label"))."',";
+			if (isset($_POST['amount']))     $sql .= " amount= '".$db->escape($amount)."',";
 			if (isset($_POST['dateomonth'])) $sql .= " dateo = '".$db->idate($dateop)."',";
 			if (isset($_POST['datevmonth'])) $sql .= " datev = '".$db->idate($dateval)."',";
 		}
@@ -191,9 +188,7 @@ if ($user->rights->banque->modifier && $action == "update")
 		{
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -218,7 +213,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
         $db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."bank";
-        $sql .= " SET num_releve=".($num_rel ? "'".$num_rel."'" : "null");
+        $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;
@@ -229,9 +224,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
         {
 	        setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -254,16 +247,7 @@ foreach ($cats as $cat) {
     $arrayselected[] = $cat->id;
 }
 
-$tabs = array(
-    array(
-        DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$rowid,
-        $langs->trans('BankTransaction')
-    ),
-    array(
-        DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$rowid,
-        $langs->trans('Info')
-    )
-);
+$head = bankline_prepare_head($rowid);
 
 
 $sql = "SELECT b.rowid,b.dateo as do,b.datev as dv, b.amount, b.label, b.rappro,";
@@ -304,7 +288,7 @@ if ($result)
         print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
         print '<input type="hidden" name="id" value="'.$acct->id.'">';
 
-        dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), 0, 'account', 0);
+        dol_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>';
 
@@ -314,7 +298,7 @@ if ($result)
 		print '<div class="fichecenter2">';
 
         print '<div class="underbanner clearboth"></div>';
-        print '<table class="border centpercent">';
+        print '<table class="border centpercent tableforfield">';
 
         $i++;
 
@@ -324,9 +308,7 @@ if ($result)
         if (!$objp->rappro && !$bankline->getVentilExportCompta())
         {
         	$form->select_comptes($acct->id, 'accountid', 0, '', 0);
-        }
-        else
-        {
+        } else {
         	print $acct->getNomUrl(1, 'transactions', 'reflabel');
         }
         print '</td>';
@@ -350,8 +332,7 @@ if ($result)
                     print $langs->trans("Payment");
                     print '</a>';*/
                     print $paymenttmp->getNomUrl(1);
-                }
-                elseif ($links[$key]['type'] == 'payment_supplier') {
+                } 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']);
@@ -361,79 +342,66 @@ if ($result)
                     print $langs->trans("Payment");
                     print '</a>';*/
                     print $paymenttmp->getNomUrl(1);
-                }
-                elseif ($links[$key]['type'] == 'company') {
+                } elseif ($links[$key]['type'] == 'company') {
                     $societe = new Societe($db);
                     $societe->fetch($links[$key]['url_id']);
                     print $societe->getNomUrl(1);
-                }
-                elseif ($links[$key]['type'] == 'sc') {
+                } 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') {
+                } 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') {
+                } 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') {
+                } 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') {
+                } 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') {
+                } 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') {
+                } 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') {
+                } 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') {
+                } 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') {
+                } 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') {
+                } 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 {
+                } else {
                     print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
                     print img_object('', 'generic').' ';
                     print $links[$key]['label'];
@@ -463,9 +431,7 @@ if ($result)
                 print ' &nbsp; &nbsp; '.$langs->trans("CheckReceipt").': '.$receipt->getNomUrl(2);
             }
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>'.$objp->fk_type.' '.$objp->num_chq.'</td>';
         }
         print "</tr>";
@@ -479,9 +445,7 @@ if ($result)
             print '<td>';
             print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>'.$objp->emetteur.'</td>';
         }
         print "</tr>";
@@ -495,9 +459,7 @@ if ($result)
         	print '<td>';
         	print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
         	print '</td>';
-        }
-        else
-        {
+        } else {
         	print '<td>'.$objp->banque.'</td>';
         }
         print "</tr>";
@@ -517,9 +479,7 @@ if ($result)
                 print img_edit_add()."</a>";
             }
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>';
             print dol_print_date($db->jdate($objp->do), "day");
             print '</td>';
@@ -541,9 +501,7 @@ if ($result)
                 print img_edit_add()."</a>";
             }
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>';
             print dol_print_date($db->jdate($objp->dv), "day");
             print '</td>';
@@ -560,24 +518,18 @@ if ($result)
             {
                 // Label generique car entre parentheses. On l'affiche en le traduisant
                 print $langs->trans($reg[1]);
-            }
-            else
-            {
+            } else {
                 print $objp->label;
             }
             print '">';
             print '</td>';
-        }
-        else
-        {
+        } 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
-            {
+            } else {
                 print $objp->label;
             }
             print '</td>';
@@ -591,9 +543,7 @@ if ($result)
             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
-        {
+        } else {
             print '<td>';
             print price($objp->amount);
             print '</td>';
@@ -649,16 +599,12 @@ if ($result)
                 {
                     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
-                {
+                } 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
-            {
+            } else {
                 print '<td>'.$objp->num_releve.'&nbsp;</td>';
             }
             print '</tr>';
@@ -669,9 +615,7 @@ if ($result)
                 print '<td>';
                 print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"]) ? ($_POST["reconciled"] ? ' checked="checked"' : '') : ($objp->rappro ? ' checked="checked"' : '')).'">';
                 print '</td>';
-            }
-            else
-            {
+            } else {
                 print '<td>'.yn($objp->rappro).'</td>';
             }
             print '</tr>';
@@ -694,8 +638,7 @@ if ($result)
     }
 
     $db->free($result);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index b1c76c529ad..9c67897e18d 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -39,7 +39,7 @@ if (!empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categori
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'accountancy', 'compta'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -212,8 +212,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 
@@ -248,12 +247,7 @@ if ($user->rights->banque->supprimer) $arrayofmassactions['predelete'] = '<span
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton = '';
-if ($user->rights->banque->configurer)
-{
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create');
-}
-
+$newcardbutton = dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->rights->banque->configurer);
 
 // Lines of title fields
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -282,7 +276,7 @@ if ($sall)
 
 $moreforfilter = '';
 
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	$moreforfilter .= $form->getFilterBox(Categorie::TYPE_ACCOUNT, $search_category_list);
 }
@@ -487,9 +481,7 @@ foreach ($accounts as $key=>$type)
     		$accountingaccount = new AccountingAccount($db);
     		$accountingaccount->fetch('', $objecttmp->account_number, 1);
     		print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
-    	}
-    	else
-    	{
+    	} else {
     		print $objecttmp->account_number;
     	}
     	print '</td>';
@@ -505,9 +497,7 @@ foreach ($accounts as $key=>$type)
     		$accountingjournal = new AccountingJournal($db);
     		$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
     		print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-    	}
-    	else
-    	{
+    	} else {
     		print '';
     	}
     	print '</td>';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index ee02e6a6e8e..ba5e20c11c1 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -48,7 +48,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("banks", "categories", "companies", "bills", "trips", "donations", "loan"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('account', 'int') ? GETPOST('account', 'int') : GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $dvid = GETPOST('dvid', 'alpha');
@@ -125,8 +125,7 @@ if ($_GET["rel"] == 'prev')
 			$found = true;
 		}
 	}
-}
-elseif ($_GET["rel"] == 'next')
+} elseif ($_GET["rel"] == 'next')
 {
 	// Recherche valeur pour num = numero releve precedent
 	$sql = "SELECT DISTINCT(b.num_releve) as num";
@@ -147,8 +146,7 @@ elseif ($_GET["rel"] == 'next')
 			$found = true;
 		}
 	}
-}
-else {
+} else {
 	// On veut le releve num
 	$found = true;
 }
@@ -249,6 +247,8 @@ if (empty($numref))
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
+		$morehtmlref = '';
+
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
 		dol_fiche_end();
@@ -295,17 +295,13 @@ if (empty($numref))
 			if (!isset($objp->numr))
 			{
 				//
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven">';
 				print '<td>';
 				if ($action != 'editbankreceipt' || $objp->numr != $brref)
 				{
 					print '<a href="releve.php?num='.$objp->numr.'&account='.$object->id.'">'.$objp->numr.'</a>';
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="oldbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="text" name="newbankreceipt" value="'.$objp->numr.'">';
 					print '<input type="submit" class="button" name="actionnewbankreceipt" value="'.$langs->trans("Rename").'">';
@@ -355,14 +351,10 @@ if (empty($numref))
 		print '</form>';
 
 		print "\n</div>\n";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
 	/**
 	 *   Show list of record into a bank statement
 	 */
@@ -372,17 +364,15 @@ else
 	dol_fiche_head($head, 'statement', $langs->trans("AccountStatement"), -1, 'account');
 
 
-	$mesprevnext = '';
-	$mesprevnext .= '<div class="pagination"><ul>';
-	$mesprevnext .= '<li class="pagination"><a class="paginationnext" href="'.$_SERVER["PHP_SELF"].'?rel=prev&amp;num='.$numref.'&amp;ve='.$ve.'&amp;account='.$object->id.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
-	//$mesprevnext.=' &nbsp; ';
-	$mesprevnext .= '<li class="pagination"><span class="active">'.$langs->trans("AccountStatement")." ".$numref.'</span></li>';
-	//$mesprevnext.=' &nbsp; ';
-    $mesprevnext .= '<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>';
-    $mesprevnext .= '</ul></div>';
+	$morehtmlright = '';
+	$morehtmlright .= '<div class="pagination"><ul>';
+	$morehtmlright .= '<li class="pagination"><a class="paginationnext" href="'.$_SERVER["PHP_SELF"].'?rel=prev&amp;num='.$numref.'&amp;ve='.$ve.'&amp;account='.$object->id.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
+	$morehtmlright .= '<li class="pagination"><span class="active">'.$langs->trans("AccountStatement")." ".$numref.'</span></li>';
+	$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, $mesprevnext, '');
+    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\">";
@@ -488,58 +478,50 @@ else
 					$paymentstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_supplier')
+				} elseif ($links[$key]['type'] == 'payment_supplier')
 				{
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentsupplierstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_sc')
+				} 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>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_vat')
+				} elseif ($links[$key]['type'] == 'payment_vat')
 				{
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentvatstatic->getNomUrl(1);
-				}
-				elseif ($links[$key]['type'] == 'payment_salary')
+				} 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('ShowPayment'), 'payment').' ';
 					print $langs->trans("Payment");
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_donation')
+				} elseif ($links[$key]['type'] == 'payment_donation')
 				{
 					$paymentdonationstatic->id = $links[$key]['url_id'];
 					$paymentdonationstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentdonationstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_loan')
+				} elseif ($links[$key]['type'] == 'payment_loan')
 				{
 					$paymentloanstatic->id = $links[$key]['url_id'];
 					$paymentloanstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentloanstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'payment_various')
+				} elseif ($links[$key]['type'] == 'payment_various')
 				{
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentvariousstatic->getNomUrl(1);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'banktransfert') {
+				} elseif ($links[$key]['type'] == 'banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
 					if ($objp->amount > 0)
 					{
@@ -553,9 +535,7 @@ else
 						$bankstatic->label = $objp->bankref;
 						print $bankstatic->getNomUrl(1, '');
 						print ')';
-					}
-					else
-					{
+					} else {
 						$bankstatic->id = $objp->bankid;
 						$bankstatic->label = $objp->bankref;
 						print ' ('.$langs->trans("from").' ';
@@ -567,35 +547,30 @@ else
 						print $bankstatic->getNomUrl(1, 'transactions');
 						print ')';
 					}
-				}
-				elseif ($links[$key]['type'] == 'company') {
+				} elseif ($links[$key]['type'] == 'company') {
                     $societestatic->id = $links[$key]['url_id'];
                     $societestatic->name = $links[$key]['label'];
                     print $societestatic->getNomUrl(1, 'company', 24);
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'member') {
+				} elseif ($links[$key]['type'] == 'member') {
 					print '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowMember'), 'user').' ';
 					print $links[$key]['label'];
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'user') {
+				} elseif ($links[$key]['type'] == 'user') {
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('ShowUser'), 'user').' ';
 					print $links[$key]['label'];
 					print '</a>';
 					$newline = 0;
-				}
-				elseif ($links[$key]['type'] == 'sc') {
+				} 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('ShowBill'), 'bill').' ';
 					print $langs->trans("SocialContribution");
 					print '</a>';
 					$newline = 0;
-				}
-				else {
+				} else {
 					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
 					print $links[$key]['label'];
 					print '</a>';
@@ -625,9 +600,7 @@ else
 						print "<br>-&nbsp;<i>".$objc->label."</i>";
 						$ii++;
 					}
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 				}
 			}
@@ -638,9 +611,7 @@ else
 			{
 				$totald = $totald + abs($objp->amount);
 				print '<td class="nowrap right">'.price($objp->amount * -1)."</td><td>&nbsp;</td>\n";
-			}
-			else
-			{
+			} else {
 				$totalc = $totalc + abs($objp->amount);
 				print '<td>&nbsp;</td><td class="nowrap right">'.price($objp->amount)."</td>\n";
 			}
@@ -649,12 +620,10 @@ else
 
 			if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
 			{
-				print '<td class="center"><a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$objp->rowid.'&account='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?account='.$object->id.'&num='.$numref).'">';
+				print '<td class="center"><a class="editfielda reposition" href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$objp->rowid.'&account='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?account='.$object->id.'&num='.$numref).'">';
 				print img_edit();
 				print "</a></td>";
-			}
-			else
-			{
+			} else {
 				print "<td class=\"center\">&nbsp;</td>";
 			}
 			print "</tr>";
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index aa4c39e55ee..70903f9120f 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("banks", "categories", "multicurrency"));
 if (!$user->rights->banque->transfer)
   accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $error = 0;
 
 
@@ -87,9 +87,7 @@ if ($action == 'add')
 		if ($accountto->currency_code == $accountfrom->currency_code)
 		{
 			$amountto = $amount;
-		}
-		else
-		{
+		} else {
 			if (!$amountto)
 			{
 				$error++;
@@ -130,15 +128,11 @@ if ($action == 'add')
 				$mesgs = $langs->trans("TransferFromToDone", '<a href="bankentries_list.php?id='.$accountfrom->id.'&sortfield=b.datev,b.dateo,b.rowid&sortorder=desc">'.$accountfrom->label."</a>", '<a href="bankentries_list.php?id='.$accountto->id.'">'.$accountto->label."</a>", $amount, $langs->transnoentities("Currency".$conf->currency));
 				setEventMessages($mesgs, null, 'mesgs');
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				setEventMessages($accountfrom->error.' '.$accountto->error, null, 'errors');
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 		    $error++;
 			setEventMessages($langs->trans("ErrorFromToAccountsMustDiffers"), null, 'errors');
 		}
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index b8d259cdc8d..cf494b77a90 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -72,9 +72,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	if ($vline)
 	{
 		$viewline = $vline;
-	}
-	else
-	{
+	} else {
 		$viewline = 20;
 	}
 
@@ -290,8 +288,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 					if ($obj->family == 'invoice') {
 						$mc->getInfo($obj->entity);
 						print "<td>".$mc->label."</td>";
-					}
-					else {
+					} else {
 						print "<td></td>";
 					}
 				}
@@ -304,9 +301,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -326,9 +321,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 
 	print "</table>";
     print "</div>";
-}
-else
-{
+} else {
 	print $langs->trans("ErrorBankAccountNotFound");
 }
 
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index c4fdc3be56a..56843c9032f 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -41,8 +41,9 @@ $langs->loadLangs(array("compta", "banks", "bills", "users", "accountancy", "cat
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$action		= GETPOST('action', 'alpha');
-$cancel		= GETPOST('cancel', 'aZ09');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $accountid = GETPOST("accountid") > 0 ? GETPOST("accountid", "int") : 0;
@@ -107,8 +108,8 @@ if (empty($reshook))
 		$object->datev = $datev;
 		$object->datep = $datep;
 		$object->amount = price2num(GETPOST("amount", 'alpha'));
-		$object->label = GETPOST("label", 'none');
-		$object->note = GETPOST("note", 'none');
+		$object->label = GETPOST("label", 'restricthtml');
+		$object->note = GETPOST("note", 'restricthtml');
 		$object->type_payment = GETPOST("paymenttype", 'int') > 0 ? GETPOST("paymenttype", "int") : 0;
 		$object->num_payment = GETPOST("num_payment", 'alpha');
 		$object->fk_user_author = $user->id;
@@ -163,9 +164,7 @@ if (empty($reshook))
 				$urltogo = ($backtopage ? $backtopage : DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
 				header("Location: ".$urltogo);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = "create";
@@ -198,22 +197,16 @@ if (empty($reshook))
 					$db->commit();
 					header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
 					exit;
-				}
-				else
-				{
+				} else {
 					$object->error = $accountline->error;
 					$db->rollback();
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
 		}
 	}
@@ -233,6 +226,64 @@ if (empty($reshook))
 	}
 }
 
+// Action clone object
+if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
+
+if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->modifier))
+{
+	$db->begin();
+
+	$originalId = $id;
+
+	$object->fetch($id);
+
+	if ($object->id > 0)
+	{
+		$object->id = $object->ref = null;
+
+		if (GETPOST('clone_label', 'alphanohtml')) {
+			$object->label = GETPOST('clone_label', 'alphanohtml');
+		} else {
+			$object->label = $langs->trans("CopyOf").' '.$object->label;
+		}
+
+		$newdatepayment = dol_mktime(0, 0, 0, GETPOST('clone_date_paymentmonth', 'int'), GETPOST('clone_date_paymentday', 'int'), GETPOST('clone_date_paymentyear', 'int'));
+		$newdatevalue = dol_mktime(0, 0, 0, GETPOST('clone_date_valuemonth', 'int'), GETPOST('clone_date_valueday', 'int'), GETPOST('clone_date_valueyear', 'int'));
+		if ($newdatepayment) $object->datep = $newdatepayment;
+		if (!empty($newdatevalue)) {
+			$object->datev = $newdatevalue;
+		} else {
+			$object->datev = $newdatepayment;
+		}
+
+		if ($object->check())
+		{
+			$id = $object->create($user);
+			if ($id > 0)
+			{
+				$db->commit();
+				$db->close();
+
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			} else {
+				$id = $originalId;
+				$db->rollback();
+
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		} else {
+			$id = $originalId;
+			$db->rollback();
+
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		$db->rollback();
+		dol_print_error($db, $object->error);
+	}
+}
+
 
 /*
  *	View
@@ -375,8 +426,7 @@ if ($action == 'create')
         print '<td>';
 		print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1);
         print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("AccountAccounting").'</td>';
 		print '<td><input class="minwidth100 maxwidthonsmartphone" name="accountancy_code" value="'.$accountancy_code.'">';
@@ -391,14 +441,11 @@ if ($action == 'create')
         if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
         {
             print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
-        }
-        else
-        {
+        } else {
             print '<input type="text" class="maxwidth200 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
         }
         print '</td></tr>';
-    }
-    else // For external software
+    } else // For external software
     {
         print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
         print '<td><input class="minwidth100 maxwidthonsmartphone" name="subledger_account" value="'.$subledger_account.'">';
@@ -431,6 +478,19 @@ if ($id)
 
 	$head = various_payment_prepare_head($object);
 
+	// Clone confirmation
+	if ($action === 'clone')
+	{
+		$formquestion = array(
+			array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
+		);
+		$formquestion[] = array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1);
+		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1);
+		$formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1));
+
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 300);
+	}
+
 	dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, $object->picto);
 
 	$morehtmlref = '<div class="refidno">';
@@ -554,6 +614,12 @@ if ($id)
 	// TODO
 	// Add button modify
 
+	// Clone
+	if ($user->rights->banque->modifier)
+	{
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/bank/various_payment/card.php", 1).'?id='.$object->id.'&amp;action=clone">'.$langs->trans("ToClone")."</a></div>";
+	}
+
 	// Delete
 	if (empty($object->rappro))
 	{
@@ -562,16 +628,12 @@ if ($id)
 			if ($alreadyaccounted) {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("Accounted").'">'.$langs->trans("Delete").'</a></div>';
 			} else {
-				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index d81b9bdd41a..744daa939d5 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("compta", "banks", "bills", "users", "accountancy"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -44,8 +44,8 @@ $result = restrictedArea($user, 'banque', '', '', '');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -149,9 +149,7 @@ if ($object->id)
 	$permission = $user->rights->banque->modifier;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 4e836f10af0..2fb2c56fc46 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2017-2019	Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Tobias Sekan            <tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "banks", "bills", "accountancy"));
@@ -44,11 +46,14 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $search_ref = GETPOST('search_ref', 'int');
 $search_user = GETPOST('search_user', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
-$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(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_datep_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
+$search_datep_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_datev_start = dol_mktime(0, 0, 0, GETPOST('search_date_value_startmonth', 'int'), GETPOST('search_date_value_startday', 'int'), GETPOST('search_date_value_startyear', 'int'));
+$search_datev_end = dol_mktime(23, 59, 59, GETPOST('search_date_value_endmonth', 'int'), GETPOST('search_date_value_endday', 'int'), GETPOST('search_date_value_endyear', 'int'));
 $search_amount_deb = GETPOST('search_amount_deb', 'alpha');
 $search_amount_cred = GETPOST('search_amount_cred', 'alpha');
-$search_account = GETPOST('search_account', 'int');
+$search_bank_account = GETPOST('search_account', 'int');
+$search_bank_entry = GETPOST('search_bank_entry', 'int');
 $search_accountancy_account = GETPOST("search_accountancy_account");
 if ($search_accountancy_account == - 1) $search_accountancy_account = '';
 $search_accountancy_subledger = GETPOST("search_accountancy_subledger");
@@ -75,39 +80,103 @@ if (!GETPOST('typeid'))
 		$part = explode(':', $val);
 		if ($part[0] == 'v.fk_typepayment') $typeid = $part[1];
 	}
-}
-else
-{
+} else {
 	$typeid = GETPOST('typeid');
 }
 
 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_date_start = '';
-	$search_date_end = '';
-	$search_amount_deb = "";
-	$search_amount_cred = "";
-	$search_account = '';
+	$search_ref = '';
+	$search_label = '';
+	$search_datep_start = '';
+	$search_datep_end = '';
+	$search_datev_start = '';
+	$search_datev_end = '';
+	$search_amount_deb = '';
+	$search_amount_cred = '';
+	$search_bank_account = '';
+	$search_bank_entry = '';
 	$search_accountancy_account = '';
 	$search_accountancy_subledger = '';
-	$typeid = "";
+	$typeid = '';
 }
 
+$search_all = GETPOSTISSET("search_all") ? trim(GETPOST("search_all", 'alpha')) : trim(GETPOST('sall'));
+
+/*
+* TODO: fill array "$fields" in "/compta/bank/class/paymentvarious.class.php" and use
+*
+*
+* $object = new PaymentVarious($db);
+*
+* $search = array();
+* foreach ($object->fields as $key => $val)
+* {
+*	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+* }
+
+* $fieldstosearchall = array();
+* foreach ($object->fields as $key => $val)
+* {
+*	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+* }
+*
+*/
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'v.rowid'=>"Ref",
+	'v.label'=>"Label",
+	'v.datep'=>"DatePayment",
+	'v.datev'=>"DateValue",
+	'v.amount'=>$langs->trans("Debit").", ".$langs->trans("Credit"),
+);
+
+// Definition of fields for lists
+$arrayfields = array(
+	'ref'			=>array('label'=>"Ref", 'checked'=>1, 'position'=>100),
+	'label'			=>array('label'=>"Label", 'checked'=>1, 'position'=>110),
+	'datep'			=>array('label'=>"DatePayment", 'checked'=>1, 'position'=>120),
+	'datev'			=>array('label'=>"DateValue", 'checked'=>1, 'position'=>130),
+	'type'			=>array('label'=>"PaymentMode", 'checked'=>1, 'position'=>140),
+	'project'		=>array('label'=>"Project", 'checked'=>1, 'position'=>200, "enabled"=>!empty($conf->projet->enabled)),
+	'bank'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>!empty($conf->banque->enabled)),
+	'entry'			=>array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>310, "enabled"=>!empty($conf->banque->enabled)),
+	'account'		=>array('label'=>"AccountAccountingShort", 'checked'=>1, 'position'=>400, "enabled"=>!empty($conf->accounting->enabled)),
+	'subledger'		=>array('label'=>"SubledgerAccount", 'checked'=>1, 'position'=>410, "enabled"=>!empty($conf->accounting->enabled)),
+	'debit'			=>array('label'=>"Debit", 'checked'=>1, 'position'=>500),
+	'credit'		=>array('label'=>"Credit", 'checked'=>1, 'position'=>510),
+);
+
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+/*
+ * Actions
+ */
+
+$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';
+}
 
 /*
  * View
  */
 
-llxHeader();
-
 $form = new Form($db);
-$formaccounting = new FormAccounting($db);
-$variousstatic = new PaymentVarious($db);
-$accountstatic = new Account($db);
+if ($arrayfields['account']['checked'] || $arrayfields['subledger']['checked'])	$formaccounting = new FormAccounting($db);
+if ($arrayfields['bank']['checked'] && !empty($conf->accounting->enabled))		$accountingjournal = new AccountingJournal($db);
+if ($arrayfields['ref']['checked'])		$variousstatic		= new PaymentVarious($db);
+if ($arrayfields['bank']['checked'])	$accountstatic		= new Account($db);
+if ($arrayfields['project']['checked'])	$proj = new Project($db);
+if ($arrayfields['entry']['checked'])	$bankline = new AccountLine($db);
+if ($arrayfields['account']['checked']) $accountingaccount = new AccountingAccount($db);
 
-$sql = "SELECT v.rowid, v.sens, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank, v.accountancy_code, v.subledger_account,";
+$sql = "SELECT v.rowid, v.sens, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank, v.accountancy_code, v.subledger_account, v.fk_projet as fk_project,";
 $sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number as bank_account_number, ba.fk_accountancy_journal as accountancy_journal, ba.label as blabel,";
 $sql .= " pst.code as payment_code";
 $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
@@ -119,11 +188,14 @@ $sql .= " WHERE v.entity IN (".getEntity('payment_various').")";
 // Search criteria
 if ($search_ref)						$sql .= " AND v.rowid=".$db->escape($search_ref);
 if ($search_label)						$sql .= natural_search(array('v.label'), $search_label);
-if ($search_date_start)					$sql .= " AND v.datep >= '".$db->idate($search_date_start)."'";
-if ($search_date_end)           	    $sql .= " AND v.datep <= '".$db->idate($search_date_end)."'";
+if ($search_datep_start)				$sql .= " AND v.datep >= '".$db->idate($search_datep_start)."'";
+if ($search_datep_end)					$sql .= " AND v.datep <= '".$db->idate($search_datep_end)."'";
+if ($search_datev_start)				$sql .= " AND v.datev >= '".$db->idate($search_datev_start)."'";
+if ($search_datev_end)					$sql .= " AND v.datev <= '".$db->idate($search_datev_end)."'";
 if ($search_amount_deb)					$sql .= natural_search("v.amount", $search_amount_deb, 1);
 if ($search_amount_cred)				$sql .= natural_search("v.amount", $search_amount_cred, 1);
-if ($search_account > 0)				$sql .= " AND b.fk_account=".$db->escape($search_account);
+if ($search_bank_account > 0)			$sql .= " AND b.fk_account=".$db->escape($search_bank_account);
+if ($search_bank_entry > 0)				$sql .= " AND b.fk_account=".$db->escape($search_bank_account);
 if ($search_accountancy_account > 0)	$sql .= " AND v.accountancy_code=".$db->escape($search_accountancy_account);
 if ($search_accountancy_subledger > 0)	$sql .= " AND v.subledger_account=".$db->escape($search_accountancy_subledger);
 if ($typeid > 0)						$sql .= " AND v.fk_typepayment=".$typeid;
@@ -131,6 +203,7 @@ if ($filtre) {
 	$filtre = str_replace(":", "=", $filtre);
 	$sql .= " AND ".$filtre;
 }
+if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -146,6 +219,19 @@ $result = $db->query($sql);
 if ($result)
 {
 	$num = $db->num_rows($result);
+
+	// 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($result);
+		$id = $obj->rowid;
+		header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$id);
+		exit;
+	}
+
+	// must be place behind the last "header(...)" call
+	llxHeader();
+
 	$i = 0;
 	$total = 0;
 
@@ -154,22 +240,22 @@ if ($result)
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($search_ref)						$param .= '&search_ref='.urlencode($search_ref);
 	if ($search_label)						$param .= '&search_label='.urlencode($search_label);
-	if ($search_date_start)					$param .= '&search_date_start='.urlencode($search_date_start);
-	if ($search_date_end)					$param .= '&search_date_end='.urlencode($search_date_end);
-	if ($typeid > 0)            			$param .= '&typeid='.urlencode($typeid);
-	if ($search_amount_deb)     			$param .= '&search_amount_deb='.urlencode($search_amount_deb);
-	if ($search_amount_cred)    			$param .= '&search_amount_cred='.urlencode($search_amount_cred);
-	if ($search_account > 0)				$param .= '&search_amount='.urlencode($search_account);
+	if ($search_datep_start)				$param .= '&search_datep_start='.urlencode($search_datep_start);
+	if ($search_datep_end)					$param .= '&search_datep_end='.urlencode($search_datep_end);
+	if ($search_datev_start)				$param .= '&search_datev_start='.urlencode($search_datev_start);
+	if ($search_datev_end)					$param .= '&search_datev_end='.urlencode($search_datev_end);
+	if ($typeid > 0)						$param .= '&typeid='.urlencode($typeid);
+	if ($search_amount_deb)					$param .= '&search_amount_deb='.urlencode($search_amount_deb);
+	if ($search_amount_cred)				$param .= '&search_amount_cred='.urlencode($search_amount_cred);
+	if ($search_bank_account > 0)			$param .= '&search_amount='.urlencode($search_bank_account);
 	if ($search_accountancy_account > 0)	$param .= '&search_accountancy_account='.urlencode($search_accountancy_account);
 	if ($search_accountancy_subledger > 0)	$param .= '&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
 
 	if ($optioncss != '') $param .= '&amp;optioncss='.urlencode($optioncss);
 
-	$newcardbutton = '';
-	if ($user->rights->banque->modifier)
-	{
-		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create');
-	}
+	$url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->modifier);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 
@@ -179,59 +265,106 @@ if ($result)
 	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_barre_liste($langs->trans("MenuVariousPayment"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 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>';
+	}
+
+	$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 '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
 
 	print '<tr class="liste_titre">';
 
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+
 	// Ref
-	print '<td class="liste_titre left">';
-	print '<input class="flat" type="text" size="3" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-	print '</td>';
+	if ($arrayfields['ref']['checked']) {
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="3" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
+	}
 
 	// Label
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
-
-	// Date
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
-	print '</div>';
-	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
-
-	print '</div>';
-	print '</td>';
-
-	// Type
-	print '<td class="liste_titre left">';
-	$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16);
-	print '</td>';
-
-	// Account
-	if (!empty($conf->banque->enabled))
-	{
+	if ($arrayfields['label']['checked']) {
 		print '<td class="liste_titre">';
-		$form->select_comptes($search_account, 'search_account', 0, '', 1);
+		print '<input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
+		print '</td>';
+	}
+
+	// Payment date
+	if ($arrayfields['datep']['checked']) {
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datep_start ? $search_datep_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datep_end ? $search_datep_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
+		print '</td>';
+	}
+
+	// Value date
+	if ($arrayfields['datev']['checked']) {
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datev_start ? $search_datev_start : -1, 'search_date_value_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+		print '</div>';
+		print '<div class="nowrap">';
+		print $form->selectDate($search_datev_end ? $search_datev_end : -1, 'search_date_value_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+		print '</div>';
+		print '</td>';
+	}
+
+	// Payment type
+	if ($arrayfields['type']['checked']) {
+		print '<td class="liste_titre left">';
+		$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16, 1, 'maxwidth100');
+		print '</td>';
+	}
+
+	// Project
+	if ($arrayfields['project']['checked']) {
+		print '<td class="liste_titre">';
+		// TODO
+		print '</td>';
+	}
+
+	// Bank account
+	if ($arrayfields['bank']['checked']) {
+		print '<td class="liste_titre">';
+		$form->select_comptes($search_bank_account, 'search_account', 0, '', 1, '', 0, 'maxwidth100');
+		print '</td>';
+	}
+
+	// Bank entry
+	if ($arrayfields['entry']['checked']) {
+		print '<td class="liste_titre left">';
+		print '<input name="search_bank_entry" class="flat maxwidth50" type="text" value="'.dol_escape_htmltag($search_bank_entry).'">';
 		print '</td>';
 	}
 
 	// Accounting account
-	if (!empty($conf->accounting->enabled))
-	{
-		// Accounting account
+	if ($arrayfields['account']['checked']) {
 		print '<td class="liste_titre">';
 		print '<div class="nowrap">';
 		print $formaccounting->select_account($search_accountancy_account, 'search_accountancy_account', 1, array(), 1, 1, 'maxwidth200');
 		print '</div>';
 		print '</td>';
+	}
 
-		// Subledger account
+	// Subledger account
+	if ($arrayfields['subledger']['checked']) {
 		print '<td class="liste_titre">';
 		print '<div class="nowrap">';
 		print $formaccounting->select_auxaccount($search_accountancy_subledger, 'search_accountancy_subledger', 1, 'maxwidth200');
@@ -240,31 +373,50 @@ if ($result)
 	}
 
 	// Debit
-	print '<td class="liste_titre right"><input name="search_amount_deb" class="flat" type="text" size="8" value="'.$search_amount_deb.'"></td>';
+	if ($arrayfields['debit']['checked']) {
+		print '<td class="liste_titre right">';
+		print '<input name="search_amount_deb" class="flat maxwidth50" type="text" value="'.dol_escape_htmltag($search_amount_deb).'">';
+		print '</td>';
+	}
 
 	// Credit
-	print '<td class="liste_titre right"><input name="search_amount_cred" class="flat" type="text" size="8" value="'.$search_amount_cred.'"></td>';
+	if ($arrayfields['credit']['checked']) {
+		print '<td class="liste_titre right">';
+		print '<input name="search_amount_cred" class="flat maxwidth50" type="text" size="8" value="'.dol_escape_htmltag($search_amount_cred).'">';
+		print '</td>';
+	}
 
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterAndCheckAddButtons(0);
 	print $searchpicto;
 	print '</td>';
 
-	print "</tr>\n";
-
+	print '</tr>';
 
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "v.rowid", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "v.label", "", $param, '', $sortfield, $sortorder, 'left ');
-	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "v.datep,v.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'left ');
-	if (!empty($conf->banque->enabled))     print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-	if (!empty($conf->accounting->enabled)) print_liste_field_titre("AccountAccountingShort", $_SERVER["PHP_SELF"], "v.accountancy_code", "", $param, '', $sortfield, $sortorder, 'left ');
-	if (!empty($conf->accounting->enabled)) print_liste_field_titre("SubledgerAccount", $_SERVER["PHP_SELF"], "v.subledger_account", "", $param, '', $sortfield, $sortorder, 'left ');
-	print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "v.amount", "", $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "v.amount", "", $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-	print "</tr>\n";
+
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+
+	if ($arrayfields['ref']['checked'])			print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], 'v.rowid', '', $param, '', $sortfield, $sortorder);
+	if ($arrayfields['label']['checked'])		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder, 'left ');
+	if ($arrayfields['datep']['checked'])		print_liste_field_titre($arrayfields['datep']['label'], $_SERVER["PHP_SELF"], 'v.datep,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
+	if ($arrayfields['datev']['checked'])		print_liste_field_titre($arrayfields['datev']['label'], $_SERVER["PHP_SELF"], 'v.datev,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
+	if ($arrayfields['type']['checked'])		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'left ');
+	if ($arrayfields['project']['checked'])		print_liste_field_titre($arrayfields['project']['label'], $_SERVER["PHP_SELF"], 'fk_project', '', $param, '', $sortfield, $sortorder);
+	if ($arrayfields['bank']['checked'])		print_liste_field_titre($arrayfields['bank']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+	if ($arrayfields['entry']['checked'])		print_liste_field_titre($arrayfields['entry']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+	if ($arrayfields['account']['checked'])		print_liste_field_titre($arrayfields['account']['label'], $_SERVER["PHP_SELF"], 'v.accountancy_code', '', $param, '', $sortfield, $sortorder, 'left ');
+	if ($arrayfields['subledger']['checked'])	print_liste_field_titre($arrayfields['subledger']['label'], $_SERVER["PHP_SELF"], 'v.subledger_account', '', $param, '', $sortfield, $sortorder, 'left ');
+	if ($arrayfields['debit']['checked'])		print_liste_field_titre($arrayfields['debit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+	if ($arrayfields['credit']['checked'])		print_liste_field_titre($arrayfields['credit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+	print '</tr>';
 
 
 	$totalarray = array();
@@ -274,28 +426,53 @@ if ($result)
 
 		print '<tr class="oddeven">';
 
-		$variousstatic->id = $obj->rowid;
-		$variousstatic->ref = $obj->rowid;
+		// No
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+			print '<td>'.(($offset * $limit) + $i).'</td>';
+		}
 
 		// Ref
-		print "<td>".$variousstatic->getNomUrl(1)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if ($arrayfields['ref']['checked']) {
+			$variousstatic->id = $obj->rowid;
+			$variousstatic->ref = $obj->rowid;
+			print "<td>".$variousstatic->getNomUrl(1)."</td>";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
 		// Label payment
-		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if ($arrayfields['label']['checked']) {
+			print "<td>".dol_trunc($obj->label, 40)."</td>";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
 		// Date payment
-		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if ($arrayfields['datep']['checked']) {
+			print '<td class="center">'.dol_print_date($obj->datep, 'day')."</td>";
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+
+		// Date value
+		if ($arrayfields['datev']['checked']) {
+			print '<td class="center">'.dol_print_date($obj->datev, 'day')."</td>";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
 		// Type
-		print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if ($arrayfields['type']['checked']) {
+			print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-		// Account
-		if (!empty($conf->banque->enabled))
-		{
+		// Project
+		if ($arrayfields['project']['checked']) {
+			$proj->fetch($obj->fk_project);
+			print '<td class="nowraponall">'.$proj->getNomUrl(1).'</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
+		// Bank account
+		if ($arrayfields['bank']['checked']) {
 			print '<td>';
 			if ($obj->bid > 0)
 			{
@@ -305,23 +482,28 @@ if ($result)
 
 				if (!empty($conf->accounting->enabled)) {
 					$accountstatic->account_number = $obj->bank_account_number;
-
-					$accountingjournal = new AccountingJournal($db);
 					$accountingjournal->fetch($obj->accountancy_journal);
 					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
 				}
 
 				$accountstatic->label = $obj->blabel;
 				print $accountstatic->getNomUrl(1);
+			} else {
+				print '&nbsp;';
 			}
-			else print '&nbsp;';
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 
+		// Bank entry
+		if ($arrayfields['entry']['checked']) {
+			$bankline->fetch($obj->fk_bank);
+			print '<td>'.$bankline->getNomUrl(1).'</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+
 		// Accounting account
-		if (!empty($conf->accounting->enabled)) {
-			$accountingaccount = new AccountingAccount($db);
+		if ($arrayfields['account']['checked']) {
 			$accountingaccount->fetch('', $obj->accountancy_code, 1);
 
 			print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';
@@ -329,38 +511,42 @@ if ($result)
 		}
 
 		// Accounting subledger account
-		if (!empty($conf->accounting->enabled))
-		{
+		if ($arrayfields['subledger']['checked']) {
 			print '<td>'.length_accounta($obj->subledger_account).'</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Debit
-		print '<td class="nowrap right">';
-		if ($obj->sens == 0)
-		{
-			print price($obj->amount);
-			$totalarray['val']['total_deb'] += $obj->amount;
+		if ($arrayfields['debit']['checked']) {
+			print '<td class="nowrap right">';
+			if ($obj->sens == 0)
+			{
+				print price($obj->amount);
+				$totalarray['val']['total_deb'] += $obj->amount;
+			}
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_deb';
+			print '</td>';
 		}
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_deb';
-		print '</td>';
 
 		// Credit
-		print '<td class="nowrap right">';
-		if ($obj->sens == 1)
-		{
-			print price($obj->amount);
-			$totalarray['val']['total_cred'] += $obj->amount;
+		if ($arrayfields['credit']['checked']) {
+			print '<td class="nowrap right">';
+			if ($obj->sens == 1)
+			{
+				print price($obj->amount);
+				$totalarray['val']['total_cred'] += $obj->amount;
+			}
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_cred';
+			print '</td>';
 		}
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_cred';
-		print '</td>';
+
 		print '<td></td>';
 
 		if (!$i) $totalarray['nbfield']++;
 
-		print "</tr>\n";
+		print "</tr>";
 
 		$i++;
 	}
@@ -373,9 +559,7 @@ if ($result)
 	print '</form>';
 
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 3780fbc1afe..b14b77d5264 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -107,8 +107,7 @@ if (GETPOST('cancel', 'alpha'))
 {
 	if ($action == 'valid') {
 		$action = 'view';
-	}
-	else {
+	} else {
 		$action = 'create';
 	}
 }
@@ -144,8 +143,7 @@ if ($action == "start")
 		$action = 'create';
 		$error++;
 	}
-}
-elseif ($action == "add")
+} elseif ($action == "add")
 {
 	if (GETPOST('opening', 'alpha') == '')
 	{
@@ -177,9 +175,7 @@ elseif ($action == "add")
 		{
 			$db->commit();
 			$action = "view";
-		}
-		else
-		{
+		} else {
 			$db->rollback;
 			$action = "view";
 		}
@@ -217,9 +213,7 @@ if ($action == "valid")	// validate = close
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("CashFenceDone"), null);
 		$db->commit();
 	}
@@ -253,9 +247,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
         setEventMessages("RecordDeleted", null, 'mesgs');
         header("Location: ".$backurlforlist);
         exit;
-    }
-    else
-    {
+    } else {
         if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
         else setEventMessages($object->error, null, 'errors');
     }
@@ -282,8 +274,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		$syear = $object->year_close;
 		$smonth = $object->month_close;
 		$sday = $object->day_close;
-	}
-	elseif (GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '-1')
+	} elseif (GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '-1')
 	{
 		$posmodule = GETPOST('posmodule', 'alpha');
 		$terminalid = GETPOST('posnumber', 'alpha');
@@ -327,11 +318,8 @@ if ($action == "create" || $action == "start" || $action == 'close')
     			{
     				$obj = $db->fetch_object($resql);
     				if ($obj) $initialbalanceforterminal[$terminalid][$key] = $obj->total;
-    			}
-    			else dol_print_error($db);
-			}
-			else
-			{
+    			} else dol_print_error($db);
+			} else {
 				setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminaltouse), null, 'errors');
 			    $error++;
 			}
@@ -350,8 +338,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			if ($key == 'cash')       $sql .= " AND cp.code = 'LIQ'";
 			elseif ($key == 'cheque') $sql .= " AND cp.code = 'CHQ'";
 			elseif ($key == 'card')   $sql .= " AND cp.code = 'CB'";
-			else
-			{
+			else {
 				dol_print_error('Value for key = '.$key.' not supported');
 				exit;
 			}
@@ -371,8 +358,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 					$theoricalamountforterminal[$terminalid][$key] = price2num($theoricalamountforterminal[$terminalid][$key] + $obj->total);
 					$theoricalnbofinvoiceforterminal[$terminalid][$key] = $obj->nb;
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 	}
 
@@ -388,14 +374,11 @@ if ($action == "create" || $action == "start" || $action == 'close')
 	    if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
 	    {
 		    print '<input type="hidden" name="action" value="add">';
-	    }
-	    elseif ($action == 'close')
+	    } elseif ($action == 'close')
 	    {
 	    	print '<input type="hidden" name="action" value="valid">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
-	    }
-		else
-	    {
+	    } else {
 	    	print '<input type="hidden" name="action" value="start">';
 	    }
 
@@ -469,9 +452,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		if ($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1')
 		{
 			print '';
-		}
-		else
-		{
+		} else {
 			print '<input type="submit" name="add" class="button" value="'.$langs->trans("Start").'">';
 		}
 		print '</td>';
@@ -569,8 +550,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			{
 				$object->fetch($id);
 				print $object->opening;
-			}
-			else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+			} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
 			print '">';
 			print '</td>';
 			// Amount per payment type
@@ -608,8 +588,7 @@ if (empty($action) || $action == "view" || $action == "close")
 
     if ($result <= 0) {
     	print $langs->trans("ErrorRecordNotFound");
-    }
-    else {
+    } else {
     	$head = array();
     	$head[0][0] = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$object->id;
     	$head[0][1] = $langs->trans("CashControl");
@@ -706,14 +685,11 @@ if (empty($action) || $action == "view" || $action == "close")
 	    	if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
 	    	{
 	    		print '<input type="hidden" name="action" value="add">';
-	    	}
-	    	elseif ($action == 'close')
+	    	} elseif ($action == 'close')
 	    	{
 	    		print '<input type="hidden" name="action" value="valid">';
 	    		print '<input type="hidden" name="id" value="'.$id.'">';
-	    	}
-	    	else
-	    	{
+	    	} else {
 	    		print '<input type="hidden" name="action" value="start">';
 	    	}
 
@@ -860,8 +836,7 @@ if (empty($action) || $action == "view" || $action == "close")
 	    		{
 	    			$object->fetch($id);
 	    			print $object->opening;
-	    		}
-	    		else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+	    		} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
 	    		print '">';
 	    		print '</td>';
 	    		// Amount per payment type
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index a98c9ea83f5..2adf3a01a83 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -63,8 +63,8 @@ $id = GETPOST('id', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -98,7 +98,7 @@ if ($user->socid > 0)	// Protection if external user
 //$result = restrictedArea($user, 'monmodule', $id, '');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -259,9 +259,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 81a19389244..0f60be3c3a8 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -404,8 +404,7 @@ class CashControl extends CommonObject
 		     $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.'>';
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 1ea06eba9e9..02299788794 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -172,9 +172,7 @@ if ($resql)
             $bankaccounttmp->fetch($objp->bankid);
             $cachebankaccount[$objp->bankid] = $bankaccounttmp;
             $bankaccount = $bankaccounttmp;
-        }
-        else
-        {
+        } else {
             $bankaccount = $cachebankaccount[$objp->bankid];
         }
 
@@ -208,8 +206,7 @@ if ($resql)
 		print $bankaccount->getNomUrl(1);
 		if ($cashcontrol->posmodule == "takepos") {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH'.$cashcontrol->posnumber;
-		}
-		else {
+		} else {
 			$var1 = 'CASHDESK_ID_BANKACCOUNT_CASH';
 		}
 		if ($objp->code == 'CHQ') {
@@ -300,8 +297,8 @@ if ($resql)
 	/*
 	$sql = "UPDATE ".MAIN_DB_PREFIX."pos_cash_fence ";
 	$sql .= "SET";
-	$sql .= " cash='".$cash."'";
-    $sql .= ", card='".$bank."'";
+	$sql .= " cash='".$db->escape($cash)."'";
+    $sql .= ", card='".$db->escape($bank)."'";
 	$sql .= " where rowid=".$id;
 	$db->query($sql);
 	*/
@@ -311,9 +308,7 @@ if ($resql)
     print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 1f69a6aa1c8..dae7ca358ac 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -106,9 +106,7 @@ 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
-{
+} else {
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 0);
 }
 
@@ -220,8 +218,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		            $accountstatic->accountancy_journal = $obj->accountancy_journal;
 		            $accountstatic->label = $obj->blabel;
 		            print $accountstatic->getNomUrl(1);
-		        }
-		        else print '&nbsp;';
+		        } else print '&nbsp;';
 		        print '</td>';
 		    }
 			// Paid
@@ -243,9 +240,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
         if (!empty($conf->banque->enabled)) print '<td></td>';
 	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	print '</table>';
@@ -337,8 +332,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			            $accountstatic->accountancy_journal = $obj->accountancy_journal;
 			            $accountstatic->label = $obj->blabel;
 			            print $accountstatic->getNomUrl(1);
-			        }
-			        else print '&nbsp;';
+			        } else print '&nbsp;';
 			        print '</td>';
 			    }
 
@@ -359,9 +353,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 		    print "</table>";
 		    $db->free($result);
-		}
-		else
-		{
+		} else {
 		    dol_print_error($db);
 		}
 	}
@@ -372,19 +364,15 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 {
 	$j = 1;
 	$numlt = 3;
-}
-elseif ($mysoc->localtax1_assuj == "1")
+} elseif ($mysoc->localtax1_assuj == "1")
 {
 	$j = 1;
 	$numlt = 2;
-}
-elseif ($mysoc->localtax2_assuj == "1")
+} elseif ($mysoc->localtax2_assuj == "1")
 {
 	$j = 2;
 	$numlt = 3;
-}
-else
-{
+} else {
 	$j = 0;
 	$numlt = 0;
 }
@@ -454,9 +442,7 @@ while ($j < $numlt)
 
 			print "</table>";
 			$db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -550,8 +536,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 			            $accountstatic->accountancy_journal = $obj->accountancy_journal;
 			            $accountstatic->label = $obj->blabel;
 			            print $accountstatic->getNomUrl(1);
-			        }
-			        else print '&nbsp;';
+			        } else print '&nbsp;';
 			        print '</td>';
 			    }
 
@@ -569,9 +554,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
             $db->free($result);
 
             print "<br>";
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 6c1439d5466..1b4e86bbb4c 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -66,7 +66,7 @@ $thirdpartystatic = new Societe($db);
 
 if ($action == 'note')
 {
-	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$note."' WHERE rowid=".$socid;
+	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($note)."' WHERE rowid=".$socid;
 	$result = $db->query($sql);
 }
 
@@ -196,9 +196,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 463d9ea699f..fcd7c542eb2 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -43,7 +43,7 @@ $id = GETPOST('id', 'int');
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'deplacement', $id, '');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 $object = new Deplacement($db);
@@ -62,167 +62,138 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
 
 if ($action == 'validate' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    if ($object->statut == Deplacement::STATUS_DRAFT)
-    {
-        $result = $object->setStatut(1);
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        }
-        else
-        {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
-}
-
-elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
+	$object->fetch($id);
+	if ($object->statut == Deplacement::STATUS_DRAFT)
+	{
+		$result = $object->setStatut(1);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+} elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    if ($object->statut == Deplacement::STATUS_VALIDATED)
-    {
-        $result = $object->setStatut(Deplacement::STATUS_REFUNDED);
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        }
-        else
-        {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
-}
-
-elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
+	$object->fetch($id);
+	if ($object->statut == Deplacement::STATUS_VALIDATED)
+	{
+		$result = $object->setStatut(Deplacement::STATUS_REFUNDED);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+} elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
 {
-    $result = $object->delete($id);
-    if ($result >= 0)
-    {
-        header("Location: index.php");
-        exit;
-    }
-    else
-    {
-	    setEventMessages($object->error, $object->errors, 'errors');
-    }
-}
-
-elseif ($action == 'add' && $user->rights->deplacement->creer)
+	$result = $object->delete($id);
+	if ($result >= 0)
+	{
+		header("Location: index.php");
+		exit;
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+} elseif ($action == 'add' && $user->rights->deplacement->creer)
 {
-    if (!GETPOST('cancel', 'alpha'))
-    {
-        $error = 0;
+	if (!GETPOST('cancel', 'alpha'))
+	{
+		$error = 0;
 
-        $object->date = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-        $object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
-        $object->type = GETPOST('type', 'alpha');
-        $object->socid = (int) GETPOST('socid', 'int');
-        $object->fk_user = (int) GETPOST('fk_user', 'int');
-        $object->note_private = GETPOST('note_private', 'alpha');
-        $object->note_public = GETPOST('note_public', 'alpha');
-        $object->statut = Deplacement::STATUS_DRAFT;
+		$object->date = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
+		$object->type = GETPOST('type', 'alpha');
+		$object->socid = (int) GETPOST('socid', 'int');
+		$object->fk_user = (int) GETPOST('fk_user', 'int');
+		$object->note_private = GETPOST('note_private', 'alpha');
+		$object->note_public = GETPOST('note_public', 'alpha');
+		$object->statut = Deplacement::STATUS_DRAFT;
 
-        if (!$object->date)
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-            $error++;
-        }
-        if ($object->type == '-1')
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-            $error++;
-        }
-        if (!($object->fk_user > 0))
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Person")), null, 'errors');
-            $error++;
-        }
+		if (!$object->date)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+			$error++;
+		}
+		if ($object->type == '-1')
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+			$error++;
+		}
+		if (!($object->fk_user > 0))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Person")), null, 'errors');
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $id = $object->create($user);
+		if (!$error)
+		{
+			$id = $object->create($user);
 
-            if ($id > 0)
-            {
-                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-                exit;
-            }
-            else
-            {
-	            setEventMessages($object->error, $object->errors, 'errors');
-                $action = 'create';
-            }
-        }
-        else
-        {
-            $action = 'create';
-        }
-    }
-    else
-    {
-        header("Location: index.php");
-        exit;
-    }
-}
-
-// Update record
+			if ($id > 0)
+			{
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'create';
+			}
+		} else {
+			$action = 'create';
+		}
+	} else {
+		header("Location: index.php");
+		exit;
+	}
+} // Update record
 elseif ($action == 'update' && $user->rights->deplacement->creer)
 {
-    if (!GETPOST('cancel', 'alpha'))
-    {
-        $result = $object->fetch($id);
+	if (!GETPOST('cancel', 'alpha'))
+	{
+		$result = $object->fetch($id);
 
-        $object->date			= dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-        $object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
-        $object->type			= GETPOST('type', 'alpha');
-        $object->socid = (int) GETPOST('socid', 'int');
-        $object->fk_user = (int) GETPOST('fk_user', 'int');
-        $object->note_private = GETPOST('note_private', 'alpha');
-        $object->note_public = GETPOST('note_public', 'alpha');
+		$object->date			= dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
+		$object->type			= GETPOST('type', 'alpha');
+		$object->socid = (int) GETPOST('socid', 'int');
+		$object->fk_user = (int) GETPOST('fk_user', 'int');
+		$object->note_private = GETPOST('note_private', 'alpha');
+		$object->note_public = GETPOST('note_public', 'alpha');
 
-        $result = $object->update($user);
+		$result = $object->update($user);
 
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        }
-        else
-        {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
-    else
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-        exit;
-    }
-}
-
-// Set into a project
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+		exit;
+	}
+} // Set into a project
 elseif ($action == 'classin' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    $result = $object->setProject(GETPOST('projectid', 'int'));
-    if ($result < 0) dol_print_error($db, $object->error);
-}
-
-// Set fields
+	$object->fetch($id);
+	$result = $object->setProject(GETPOST('projectid', 'int'));
+	if ($result < 0) dol_print_error($db, $object->error);
+} // Set fields
 elseif ($action == 'setdated' && $user->rights->deplacement->creer)
 {
-    $dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
-    $object->fetch($id);
-    $result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
-    if ($result < 0) dol_print_error($db, $object->error);
-}
-elseif ($action == 'setkm' && $user->rights->deplacement->creer)
+	$dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
+	$object->fetch($id);
+	$result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
+	if ($result < 0) dol_print_error($db, $object->error);
+} elseif ($action == 'setkm' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    $result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
-    if ($result < 0) dol_print_error($db, $object->error);
+	$object->fetch($id);
+	$result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
+	if ($result < 0) dol_print_error($db, $object->error);
 }
 
 
@@ -239,342 +210,327 @@ $form = new Form($db);
 */
 if ($action == 'create')
 {
-    //WYSIWYG Editor
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	//WYSIWYG Editor
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-    print load_fiche_titre($langs->trans("NewTrip"));
+	print load_fiche_titre($langs->trans("NewTrip"));
 
-    $datec = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	$datec = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-    $form->select_type_fees(GETPOST('type', 'int'), 'type', 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+	$form->select_type_fees(GETPOST('type', 'int'), 'type', 1);
+	print '</td></tr>';
 
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-    print $form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
+	print $form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	print '</td></tr>';
 
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-    print $form->selectDate($datec ? $datec : -1, '', '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+	print $form->selectDate($datec ? $datec : -1, '', '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
-    // Km
-    print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value="'.GETPOST("km").'"></td></tr>';
+	// Km
+	print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value="'.GETPOST("km").'"></td></tr>';
 
-    // Company
-    print "<tr>";
-    print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-    print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 1);
-    print '</td></tr>';
+	// Company
+	print "<tr>";
+	print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
+	print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 1);
+	print '</td></tr>';
 
-    // Public note
-    print '<tr>';
-    print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-    print '<td>';
+	// Public note
+	print '<tr>';
+	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
+	print '<td>';
 
-    $doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-    print $doleditor->Create(1);
+	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+	print $doleditor->Create(1);
 
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Private note
-    if (empty($user->socid))
-    {
-        print '<tr>';
-        print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-        print '<td>';
+	// Private note
+	if (empty($user->socid))
+	{
+		print '<tr>';
+		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
+		print '<td>';
 
-        $doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-        print $doleditor->Create(1);
+		$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+		print $doleditor->Create(1);
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>';
+	print '</table>';
 
-    print '<br><div class="center">';
+	print '<br><div class="center">';
 	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
-}
-elseif ($id)
+	print '</form>';
+} elseif ($id)
 {
-    $result = $object->fetch($id);
-    if ($result > 0)
-    {
-        $head = trip_prepare_head($object);
+	$result = $object->fetch($id);
+	if ($result > 0)
+	{
+		$head = trip_prepare_head($object);
 
-        dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
+		dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
 
-        if ($action == 'edit' && $user->rights->deplacement->creer)
-        {
-            //WYSIWYG Editor
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		if ($action == 'edit' && $user->rights->deplacement->creer)
+		{
+			//WYSIWYG Editor
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-            $soc = new Societe($db);
-            if ($object->socid)
-            {
-                $soc->fetch($object->socid);
-            }
+			$soc = new Societe($db);
+			if ($object->socid)
+			{
+				$soc->fetch($object->socid);
+			}
 
-            print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="id" value="'.$id.'">';
+			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Ref
-            print "<tr>";
-            print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-            print $object->ref;
-            print '</td></tr>';
+			// Ref
+			print "<tr>";
+			print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+			print $object->ref;
+			print '</td></tr>';
 
-            // Type
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-            $form->select_type_fees(GETPOST('type', 'int') ?GETPOST('type', 'int') : $object->type, 'type', 0);
-            print '</td></tr>';
+			// Type
+			print "<tr>";
+			print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+			$form->select_type_fees(GETPOST('type', 'int') ?GETPOST('type', 'int') : $object->type, 'type', 0);
+			print '</td></tr>';
 
-            // Who
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-            print $form->select_dolusers(GETPOST('fk_user', 'int') ?GETPOST('fk_user', 'int') : $object->fk_user, 'fk_user', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-            print '</td></tr>';
+			// Who
+			print "<tr>";
+			print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
+			print $form->select_dolusers(GETPOST('fk_user', 'int') ?GETPOST('fk_user', 'int') : $object->fk_user, 'fk_user', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+			print '</td></tr>';
 
-            // Date
-            print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-            print $form->selectDate($object->date, '', 0, 0, 0, 'update', 1, 0);
-            print '</td></tr>';
+			// Date
+			print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+			print $form->selectDate($object->date, '', 0, 0, 0, 'update', 1, 0);
+			print '</td></tr>';
 
-            // Km
-            print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
-            print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
-            print '</td></tr>';
+			// Km
+			print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
+			print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
+			print '</td></tr>';
 
-            // Where
-            print "<tr>";
-            print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-            print $form->select_company($soc->id, 'socid', '', 1);
-            print '</td></tr>';
+			// Where
+			print "<tr>";
+			print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
+			print $form->select_company($soc->id, 'socid', '', 1);
+			print '</td></tr>';
 
-            // Public note
-            print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td>';
-            print '<td>';
+			// Public note
+			print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td>';
+			print '<td>';
 
-            $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-            print $doleditor->Create(1);
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+			print $doleditor->Create(1);
 
-            print "</td></tr>";
+			print "</td></tr>";
 
-            // Private note
-            if (empty($user->socid))
-            {
-                print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
-                print '<td>';
+			// Private note
+			if (empty($user->socid))
+			{
+				print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
+				print '<td>';
 
-                $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-                print $doleditor->Create(1);
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+				print $doleditor->Create(1);
 
-                print "</td></tr>";
-            }
+				print "</td></tr>";
+			}
 
-            // Other attributes
-            $parameters = array();
-            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			// Other attributes
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 
-            print '</table>';
+			print '</table>';
 
-            print '<br><div class="center">';
+			print '<br><div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-            print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-            print '</div>';
+			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+			print '</div>';
 
-            print '</form>';
+			print '</form>';
 
-            print '</div>';
-        }
-        else
-        {
-            /*
+			print '</div>';
+		} else {
+			/*
              * Confirm delete trip
              */
-            if ($action == 'delete')
-            {
-                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
-            }
+			if ($action == 'delete')
+			{
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
+			}
 
-            $soc = new Societe($db);
-            if ($object->socid) $soc->fetch($object->socid);
+			$soc = new Societe($db);
+			if ($object->socid) $soc->fetch($object->socid);
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-            // Ref
-            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
-            print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
-            print '</td></tr>';
+			// Ref
+			print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
+			print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+			print '</td></tr>';
 
-	        $form->load_cache_types_fees();
+			$form->load_cache_types_fees();
 
-	        // Type
-            print '<tr><td>';
-            print $form->editfieldkey("Type", 'type', $langs->trans($object->type), $object, $user->rights->deplacement->creer, 'select:types_fees');
-            print '</td><td>';
-            print $form->editfieldval("Type", 'type', $form->cache_types_fees[$object->type], $object, $user->rights->deplacement->creer, 'select:types_fees');
-            print '</td></tr>';
+			// Type
+			print '<tr><td>';
+			print $form->editfieldkey("Type", 'type', $langs->trans($object->type), $object, $user->rights->deplacement->creer, 'select:types_fees');
+			print '</td><td>';
+			print $form->editfieldval("Type", 'type', $form->cache_types_fees[$object->type], $object, $user->rights->deplacement->creer, 'select:types_fees');
+			print '</td></tr>';
 
-            // Who
-            print '<tr><td>'.$langs->trans("Person").'</td><td>';
-            $userfee = new User($db);
-            $userfee->fetch($object->fk_user);
-            print $userfee->getNomUrl(1);
-            print '</td></tr>';
+			// Who
+			print '<tr><td>'.$langs->trans("Person").'</td><td>';
+			$userfee = new User($db);
+			$userfee->fetch($object->fk_user);
+			print $userfee->getNomUrl(1);
+			print '</td></tr>';
 
-            // Date
-            print '<tr><td>';
-            print $form->editfieldkey("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
-            print '</td><td>';
-            print $form->editfieldval("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
-            print '</td></tr>';
+			// Date
+			print '<tr><td>';
+			print $form->editfieldkey("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
+			print '</td><td>';
+			print $form->editfieldval("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
+			print '</td></tr>';
 
-            // Km/Price
-            print '<tr><td class="tdtop">';
-            print $form->editfieldkey("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
-            print '</td><td>';
-            print $form->editfieldval("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
-            print "</td></tr>";
+			// Km/Price
+			print '<tr><td class="tdtop">';
+			print $form->editfieldkey("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
+			print '</td><td>';
+			print $form->editfieldval("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
+			print "</td></tr>";
 
-            // Where
-            print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
-            print '<td>';
-            if ($soc->id) print $soc->getNomUrl(1);
-            print '</td></tr>';
+			// Where
+			print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
+			print '<td>';
+			if ($soc->id) print $soc->getNomUrl(1);
+			print '</td></tr>';
 
-            // Project
-            if (!empty($conf->projet->enabled))
-            {
-                $langs->load('projects');
-                print '<tr>';
-                print '<td>';
+			// Project
+			if (!empty($conf->projet->enabled))
+			{
+				$langs->load('projects');
+				print '<tr>';
+				print '<td>';
 
-                print '<table class="nobordernopadding" width="100%"><tr><td>';
-                print $langs->trans('Project');
-                print '</td>';
-                if ($action != 'classify' && $user->rights->deplacement->creer)
-                {
-                    print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
-                    print img_edit($langs->trans('SetProject'), 1);
-                    print '</a></td>';
-                }
-                print '</tr></table>';
-                print '</td><td colspan="3">';
-                if ($action == 'classify')
-                {
-                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
-                }
-                else
-                {
-                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
-                }
-                print '</td>';
-                print '</tr>';
-            }
+				print '<table class="nobordernopadding" width="100%"><tr><td>';
+				print $langs->trans('Project');
+				print '</td>';
+				if ($action != 'classify' && $user->rights->deplacement->creer)
+				{
+					print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
+					print img_edit($langs->trans('SetProject'), 1);
+					print '</a></td>';
+				}
+				print '</tr></table>';
+				print '</td><td colspan="3">';
+				if ($action == 'classify')
+				{
+					$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
+				} else {
+					$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
+				}
+				print '</td>';
+				print '</tr>';
+			}
 
-            // Statut
-            print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+			// Statut
+			print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
-        	// Other attributes
-        	$parameters = array('socid'=>$object->id);
-        	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$parameters = array('socid'=>$object->id);
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-            print "</table><br>";
+			print "</table><br>";
 
-            // Notes
-            $blocname = 'notes';
-            $title = $langs->trans('Notes');
-            include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+			// Notes
+			$blocname = 'notes';
+			$title = $langs->trans('Notes');
+			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 
-            print '</div>';
+			print '</div>';
 
-            /*
+			/*
              * Barre d'actions
              */
 
-            print '<div class="tabsAction">';
+			print '<div class="tabsAction">';
 
-            if ($object->statut < Deplacement::STATUS_REFUNDED) 	// if not refunded
-            {
-	            if ($user->rights->deplacement->creer)
-	            {
-	                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-	            }
-	            else
-	            {
-	                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
-	            }
-            }
+			if ($object->statut < Deplacement::STATUS_REFUNDED) 	// if not refunded
+			{
+				if ($user->rights->deplacement->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
+				}
+			}
 
-            if ($object->statut == Deplacement::STATUS_DRAFT) 	// if draft
-            {
-                if ($user->rights->deplacement->creer)
-                {
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
-                }
-                else
-                {
-                    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
-                }
-            }
+			if ($object->statut == Deplacement::STATUS_DRAFT) 	// if draft
+			{
+				if ($user->rights->deplacement->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
+				}
+			}
 
-            if ($object->statut == Deplacement::STATUS_VALIDATED) 	// if validated
-            {
-                if ($user->rights->deplacement->creer)
-                {
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
-                }
-                else
-                {
-                    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
-                }
-            }
+			if ($object->statut == Deplacement::STATUS_VALIDATED) 	// if validated
+			{
+				if ($user->rights->deplacement->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
+				}
+			}
 
-            if ($user->rights->deplacement->supprimer)
-            {
-                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
-            }
-            else
-            {
-                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
-            }
+			if ($user->rights->deplacement->supprimer)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
+			}
 
-            print '</div>';
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+			print '</div>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 // End of page
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index ec4610179e2..69baf710b95 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -199,16 +199,12 @@ class Deplacement extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -267,9 +263,7 @@ class Deplacement extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -312,9 +306,7 @@ class Deplacement extends CommonObject
 			$this->extraparams	= (array) json_decode($obj->extraparams, true);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -338,9 +330,7 @@ class Deplacement extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -375,30 +365,25 @@ class Deplacement extends CommonObject
 		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');
@@ -460,9 +445,7 @@ class Deplacement extends CommonObject
                 $ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
                 $i++;
             }
-        }
-        else
-        {
+        } else {
         	dol_print_error($this->db);
         }
 
@@ -507,9 +490,7 @@ class Deplacement extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
index 6fdd54095a2..953ee78a3d6 100644
--- a/htdocs/compta/deplacement/class/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/class/deplacementstats.class.php
@@ -122,7 +122,7 @@ class DeplacementStats extends Stats
 	{
 		$sql = "SELECT date_format(dated,'%m') as dm, sum(".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		$sql .= " WHERE date_format(dated,'%Y') = '".$year."'";
+		$sql .= " WHERE date_format(dated,'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -142,7 +142,7 @@ class DeplacementStats extends Stats
 	{
 		$sql = "SELECT date_format(dated,'%m') as dm, avg(".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		$sql .= " WHERE date_format(dated,'%Y') = '".$year."'";
+		$sql .= " WHERE date_format(dated,'%Y') = '".$this->db->escape($year)."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
         $sql .= $this->db->order('dm', 'DESC');
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index 2cef0b3e6cd..47b1709ff60 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('other', 'trips', 'companies', 'interventions'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -49,8 +49,8 @@ $result = restrictedArea($user, 'deplacement', $id, '');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -123,9 +123,7 @@ if ($object->id)
     $permission = $user->rights->deplacement->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 9d45bafd20f..0cea847f9ce 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -192,14 +192,11 @@ if ($result)
 
             $i++;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table><br>';
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 print '</div></div></div>';
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index a4cc8f24019..78c1f32556d 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -196,9 +196,7 @@ if ($resql)
     print "</table>";
     print "</form>\n";
     $db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index cf745b784fc..7707cb40786 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -167,9 +167,7 @@ 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';
-}
-else
-{
+} 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';
@@ -294,8 +292,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index 55d4141fc07..df5cb39f9e4 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -40,7 +40,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facture'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
index feeca2046d6..a8d073958ad 100644
--- a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facture_rec'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index 87467f0dba6..ebe2a437a92 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facturedet'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
index 32a7a8cb75a..a09b0380f59 100644
--- a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facturedet_rec'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index cad443940f4..3ab212a62bd 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -188,11 +188,11 @@ if (empty($reshook))
 
 		if (!$error)
 		{
-			$object->titre = GETPOST('titre', 'nohtml'); // deprecated
-			$object->title = GETPOST('titre', 'nohtml');
-			$object->note_private = GETPOST('note_private', 'none');
-            $object->note_public = GETPOST('note_public', 'none');
-            $object->modelpdf = GETPOST('modelpdf', 'alpha');
+			$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->usenewprice = GETPOST('usenewprice', 'alpha');
 
 			$object->frequency = $frequency;
@@ -238,9 +238,7 @@ if (empty($reshook))
 					setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
 					$action = "create";
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = "create";
@@ -252,9 +250,7 @@ if (empty($reshook))
 
 				header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$object->id);
 	   			exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				$error++;
@@ -279,18 +275,15 @@ if (empty($reshook))
 	if ($action == 'setconditions' && $user->rights->facture->creer)
 	{
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-	// Set mode
+	} // Set mode
 	elseif ($action == 'setmode' && $user->rights->facture->creer)
 	{
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	}
-	// Set project
+	} // Set project
 	elseif ($action == 'classin' && $user->rights->facture->creer)
 	{
 		$object->setProject(GETPOST('projectid', 'int'));
-	}
-	// Set bank account
+	} // Set bank account
 	elseif ($action == 'setref' && $user->rights->facture->creer)
 	{
 		//var_dump(GETPOST('ref', 'alpha'));exit;
@@ -300,47 +293,37 @@ if (empty($reshook))
 			$object->titre = GETPOST('ref', 'alpha'); // deprecated
 			$object->title = GETPOST('ref', 'alpha');
 			$object->ref = $object->title;
-		}
-		else dol_print_error($db, $object->error, $object->errors);
-	}
-	// Set bank account
+		} else dol_print_error($db, $object->error, $object->errors);
+	} // Set bank account
 	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-	// Set frequency and unit frequency
+	} // Set frequency and unit frequency
 	elseif ($action == 'setfrequency' && $user->rights->facture->creer)
 	{
 		$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
-	}
-	// Set next date of execution
+	} // Set next date of execution
 	elseif ($action == 'setdate_when' && $user->rights->facture->creer)
 	{
 		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
 		if (!empty($date)) $object->setNextDate($date);
-	}
-	// Set max period
+	} // Set max period
 	elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
 	{
 		$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
-	}
-	// Set auto validate
+	} // Set auto validate
 	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'));
-	}
-    // Set model pdf
+	} // Set model pdf
 	elseif ($action == 'setmodelpdf' && $user->rights->facture->creer)
 	{
 		$object->setModelpdf(GETPOST('modelpdf', 'alpha'));
-	}
-
-	// Set status disabled
+	} // Set status disabled
 	elseif ($action == 'disable' && $user->rights->facture->creer)
 	{
 		$db->begin();
@@ -356,15 +339,11 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Set status enabled
+	} // Set status enabled
 	elseif ($action == 'enable' && $user->rights->facture->creer)
 	{
 		$db->begin();
@@ -380,19 +359,14 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	// Multicurrency Code
+	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
+	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
 	}
@@ -418,25 +392,20 @@ if (empty($reshook))
 			{
 				$db->commit();
 				$object->fetch($object->id); // Reload lines
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
-	}
-	elseif ($action == 'update_extras')
+	} elseif ($action == 'update_extras')
 	{
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
@@ -466,9 +435,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -570,17 +537,14 @@ if (empty($reshook))
 				{
 					$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
+				} // 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
-					{
+					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -603,9 +567,7 @@ if (empty($reshook))
 					}
 
 					$desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
-				}
-				else
-				{
+				} else {
 					$desc = $prod->description;
 				}
 
@@ -640,9 +602,7 @@ if (empty($reshook))
 
 				$type = $prod->type;
 				$fk_unit = $prod->fk_unit;
-			}
-			else
-			{
+			} else {
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
@@ -672,9 +632,7 @@ if (empty($reshook))
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 				setEventMessages($mesg, null, 'errors');
-			}
-			else
-			{
+			} else {
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill, $fournprice, $buyingprice);
 
@@ -692,7 +650,7 @@ if (empty($reshook))
 	    				$outputlangs = new Translate("", $conf);
 	    				$outputlangs->setDefaultLang($newlang);
 	    			    }
-	    			    $model=$object->modelpdf;
+	    			    $model=$object->model_pdf;
 	    			    $ret = $object->fetch($id); // Reload to get new records
 
 	    			    $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -738,18 +696,14 @@ if (empty($reshook))
 
 					unset($_POST['situations']);
 					unset($_POST['progress']);
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 
 				$action = '';
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
+	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
 	{
 		if (!$object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
@@ -759,7 +713,7 @@ if (empty($reshook))
 		$date_end = '';
 		//$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		//$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'none') ? GETPOST('product_desc', 'none') : GETPOST('desc', 'none'));
+		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml') ? GETPOST('product_desc', 'restricthtml') : GETPOST('desc', 'restricthtml'));
 		$pu_ht = GETPOST('price_ht');
 		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		$qty = GETPOST('qty');
@@ -907,7 +861,7 @@ if (empty($reshook))
                                 }
 
                                 $ret = $object->fetch($id); // Reload to get new records
-                                $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+                                $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
                     }*/
 
 				$object->fetch($object->id); // Reload lines
@@ -947,9 +901,7 @@ if (empty($reshook))
 
 				unset($_POST['situations']);
 				unset($_POST['progress']);
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1012,8 +964,8 @@ if ($action == 'create')
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Customer").'</td><td>'.$object->thirdparty->getNomUrl(1, 'customer').'</td>';
 		print '</tr>';
 
-		$note_public = GETPOST('note_public', 'none') ?GETPOST('note_public', 'none') : $object->note_public;
-		$note_private = GETPOST('note_private', 'none') ?GETPOST('note_private', 'none') : $object->note_private;
+		$note_public = GETPOSTISSET('note_public') ? GETPOST('note_public', 'restricthtml') : $object->note_public;
+		$note_private = GETPOSTISSET('note_private') ? GETPOST('note_private', 'restricthtml') : $object->note_private;
 
 		// Help of substitution key
 		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
@@ -1144,9 +1096,7 @@ if ($action == 'create')
 			$select = array('0'=>$langs->trans('DoNotGenerateDoc'), '1'=>$langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 			print "</td></tr>";
-		}
-		else
-		{
+		} else {
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
 
@@ -1198,14 +1148,10 @@ if ($action == 'create')
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
-	}
-	else
-	{
+	} else {
 		dol_print_error('', "Error, no invoice ".$object->id);
 	}
-}
-else
-{
+} else {
 	/*
 	 * View mode
 	 */
@@ -1328,9 +1274,7 @@ else
 			if ($action == 'editconditions')
 			{
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-			}
-			else
-			{
+			} else {
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'none');
 			}
 		} else {
@@ -1350,9 +1294,7 @@ else
 		if ($action == 'editmode')
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
-		}
-		else
-		{
+		} else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
@@ -1423,6 +1365,8 @@ else
 		// Only on template invoices
 		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = $langs->trans("DateNextInvoiceBeforeGen").' ('.$langs->trans("Example").': '.dol_print_date(($object->date_when ? $object->date_when : dol_now()), 'dayhour').')';
 		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree(($object->date_when ? $object->date_when : dol_now()), $object->frequency, $object->unit_frequency), 'dayhour').')';
+		$substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $object->nb_gen_done;
+		$substitutionarray['__INVOICE_COUNTER_MAX__'] = $object->nb_gen_max;
 
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
 		foreach ($substitutionarray as $key => $val)
@@ -1459,9 +1403,7 @@ else
 		if ($action == 'editbankaccount')
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-		}
-		else
-		{
+		} else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 		}
 		print "</td>";
@@ -1485,11 +1427,9 @@ else
                 $list[] = str_replace(':', '|', $k).':'.$model;
             }
             $select = 'select;'.implode(',', $list);
-            print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->modelpdf, $object, $user->rights->facture->creer, $select);
-        }
-        else
-        {
-            print $object->modelpdf;
+            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>';
@@ -1536,15 +1476,11 @@ else
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else
-		{
+		} else {
 			if ($object->frequency > 0)
 			{
 				print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-			}
-			else
-			{
+			} else {
 				print $langs->trans("NotARecurringInvoiceTemplate");
 			}
 		}
@@ -1555,9 +1491,7 @@ else
 		if ($action == 'date_when' || $object->frequency > 0)
 		{
 			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
-		}
-		else
-		{
+		} else {
 			print $langs->trans("NextDateToExecution");
 		}
 		print '</td><td>';
@@ -1569,9 +1503,7 @@ else
 		if (!$object->isMaxNbGenReached())
 		{
 			if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
-		}
-		else
-		{
+		} else {
 			print img_info($langs->trans("MaxNumberOfGenerationReached"));
 		}
 		print '</td>';
@@ -1582,18 +1514,14 @@ else
 		if ($action == 'nb_gen_max' || $object->frequency > 0)
 		{
 			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-		}
-		else
-		{
+		} else {
 			print $langs->trans("MaxPeriodNumber");
 		}
 		print '</td><td>';
 		if ($action == 'nb_gen_max' || $object->frequency > 0)
 		{
 			  print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
-		}
-		else
-		{
+		} else {
 			print '';
 		}
 		print '</td>';
@@ -1603,8 +1531,7 @@ else
 		print '<tr><td>';
 		if ($action == 'auto_validate' || $object->frequency > 0)
 			print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
-		else
-			print $langs->trans("StatusOfGeneratedInvoices");
+		else print $langs->trans("StatusOfGeneratedInvoices");
 		print '</td><td>';
 		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
 		if ($action == 'auto_validate' || $object->frequency > 0)
@@ -1619,8 +1546,7 @@ else
 			print '<td>';
 			if ($action == 'generate_pdf' || $object->frequency > 0)
 				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
-			else
-				print $langs->trans("StatusOfGeneratedDocuments");
+			else print $langs->trans("StatusOfGeneratedDocuments");
 			print '</td>';
 			print '<td>';
 			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
@@ -1630,9 +1556,7 @@ else
 			}
 			print '</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
 
@@ -1695,13 +1619,12 @@ else
 		// Show object lines
 		if (!empty($object->lines))
 		{
-			//$disableedit=1;
-			//$disablemove=1;
+			$canchangeproduct = 1;
 			$ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
 		}
 
 		// Form to add new line
-		if ($object->statut == 0 && $user->rights->facture->creer && $action != 'valid' && $action != 'editline')
+		if ($object->statut == $object::STATUS_DRAFT && $user->rights->facture->creer && $action != 'valid' && $action != 'editline')
 		{
 			if ($action != 'editline')
 			{
@@ -1733,21 +1656,15 @@ else
 				if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max))
 				{
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
-				}
-				else
-				{
+				} else {
 					if (empty($object->frequency) || $object->date_when <= $today)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->thirdparty->id.'&fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
 					}
 				}
-			}
-			else
-			{
+			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
 			}
 		}
@@ -1757,9 +1674,7 @@ else
 			if (empty($object->suspended))
 			{
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=disable&id='.$object->id.'">'.$langs->trans("Disable").'</a></div>';
-			}
-			else
-			{
+			} else {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=enable&id='.$object->id.'">'.$langs->trans("Enable").'</a></div>';
 			}
 		}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 2038fea438c..8a2b5b150e4 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -75,7 +75,7 @@ $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0);
 $id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $lineid = GETPOST('lineid', 'int');
@@ -188,9 +188,7 @@ if (empty($reshook))
        		setEventMessages($object->error, $object->errors, 'errors');
        		$action = '';
         }
-	}
-
-	// Change status of invoice
+	} // Change status of invoice
 	elseif ($action == 'reopen' && $usercancreate) {
 		$result = $object->fetch($id);
 
@@ -203,9 +201,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Delete invoice
+	} // Delete invoice
 	elseif ($action == 'confirm_delete' && $confirm == 'yes') {
 		$result = $object->fetch($id);
 		$object->fetch_thirdparty();
@@ -233,9 +229,7 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-	}
-
-	// Delete line
+	} // Delete line
 	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -257,7 +251,7 @@ if (empty($reshook))
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$ret = $object->fetch($id); // Reload to get new records
-				$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 			if ($result >= 0) {
 				header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
@@ -267,17 +261,13 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
-	}
-
-	// Delete link of credit note to invoice
+	} // Delete link of credit note to invoice
 	elseif ($action == 'unlinkdiscount' && $usercancreate)
 	{
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
 		$discount->unlink_invoice();
-	}
-
-	// Validation
+	} // Validation
 	elseif ($action == 'valid' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -343,32 +333,24 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'set_thirdparty' && $usercancreate)
+	} elseif ($action == 'set_thirdparty' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setValueFrom('fk_soc', $socid, '', null, 'int', '', $user, 'BILL_MODIFY');
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
 		exit();
-	}
-
-	elseif ($action == 'classin' && $usercancreate)
+	} elseif ($action == 'classin' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setProject($_POST['projectid']);
-	}
-
-	elseif ($action == 'setmode' && $usercancreate)
+	} elseif ($action == 'setmode' && $usercancreate)
 	{
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
+	} elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
 	{
 	    $object->fetch($id);
 	    $object->retained_warranty_fk_cond_reglement = 0; // To clean property
@@ -381,36 +363,25 @@ if (empty($reshook))
 	    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)
+	} 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);
-	}
-
-	elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer)
+	} 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);
-	}
-
-
-	// Multicurrency Code
+	} // Multicurrency Code
 	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
+	} // Multicurrency rate
 	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
-	}
-
-	elseif ($action == 'setinvoicedate' && $usercancreate)
+	} elseif ($action == 'setinvoicedate' && $usercancreate)
 	{
 		$object->fetch($id);
 		$old_date_lim_reglement = $object->date_lim_reglement;
@@ -429,9 +400,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setdate_pointoftax' && $usercancreate)
+	} elseif ($action == 'setdate_pointoftax' && $usercancreate)
 	{
 		$object->fetch($id);
 		$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
@@ -440,9 +409,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setconditions' && $usercancreate)
+	} elseif ($action == 'setconditions' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->cond_reglement_code = 0; // To clean property
@@ -458,9 +425,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setpaymentterm' && $usercancreate)
+	} elseif ($action == 'setpaymentterm' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->date_lim_reglement = dol_mktime(12, 0, 0, $_POST['paymenttermmonth'], $_POST['paymenttermday'], $_POST['paymenttermyear']);
@@ -472,9 +437,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	}
-
-	elseif ($action == 'setrevenuestamp' && $usercancreate)
+	} elseif ($action == 'setrevenuestamp' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->revenuestamp = GETPOST('revenuestamp');
@@ -495,34 +458,26 @@ if (empty($reshook))
 					$outputlangs->setDefaultLang($newlang);
 					$outputlangs->load('products');
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Set incoterm
+	} // Set incoterm
 	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
 	{
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	}
-
-	// bank account
+	} // bank account
 	elseif ($action == 'setbankaccount' && $usercancreate)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-	}
-
-	elseif ($action == 'setremisepercent' && $usercancreate)
+	} elseif ($action == 'setremisepercent' && $usercancreate)
 	{
 		$object->fetch($id);
 		$result = $object->set_remise($user, $_POST['remise_percent']);
-	}
-
-	elseif ($action == "setabsolutediscount" && $usercancreate)
+	} elseif ($action == "setabsolutediscount" && $usercancreate)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
 
@@ -575,24 +530,18 @@ if (empty($reshook))
 			}
 			$ret = $object->fetch($id); // Reload to get new records
 
-			$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'setref' && $usercancreate)
+	} elseif ($action == 'setref' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->setValueFrom('ref', GETPOST('ref'), '', null, '', '', $user, 'BILL_MODIFY');
-	}
-
-	elseif ($action == 'setref_client' && $usercancreate)
+	} elseif ($action == 'setref_client' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->set_ref_client(GETPOST('ref_client'));
-	}
-
-	// Classify to validated
+	} // Classify to validated
 	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse', 'int');
@@ -626,9 +575,7 @@ if (empty($reshook))
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL')
 				{
@@ -697,22 +644,18 @@ if (empty($reshook))
 						$outputlangs->setDefaultLang($newlang);
 						$outputlangs->load('products');
 					}
-					$model = $object->modelpdf;
+					$model = $object->model_pdf;
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 					if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				if (count($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Go back to draft status (unvalidate)
+	} // Go back to draft status (unvalidate)
 	elseif ($action == 'confirm_modif' && $usercanunvalidate)
 	{
 		$idwarehouse = GETPOST('idwarehouse', 'int');
@@ -785,7 +728,7 @@ if (empty($reshook))
 							$outputlangs->setDefaultLang($newlang);
 							$outputlangs->load('products');
 						}
-						$model = $object->modelpdf;
+						$model = $object->model_pdf;
 						$ret = $object->fetch($id); // Reload to get new records
 
 						$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -793,9 +736,7 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Classify "paid"
+	} // Classify "paid"
 	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercanissuepayment)
 	{
 		$object->fetch($id);
@@ -805,8 +746,8 @@ if (empty($reshook))
 	elseif ($action == 'confirm_paid_partially' && $confirm == 'yes' && $usercanissuepayment)
 	{
 		$object->fetch($id);
-		$close_code = GETPOST("close_code", 'none');
-		$close_note = GETPOST("close_note", 'none');
+		$close_code = GETPOST("close_code", 'restricthtml');
+		$close_note = GETPOST("close_note", 'restricthtml');
 		if ($close_code) {
 			$result = $object->set_paid($user, $close_code, $close_note);
 			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
@@ -816,17 +757,15 @@ if (empty($reshook))
 	} // Classify "abandoned"
 	elseif ($action == 'confirm_canceled' && $confirm == 'yes') {
 		$object->fetch($id);
-		$close_code = GETPOST("close_code", 'none');
-		$close_note = GETPOST("close_note", 'none');
+		$close_code = GETPOST("close_code", 'restricthtml');
+		$close_note = GETPOST("close_note", 'restricthtml');
 		if ($close_code) {
 			$result = $object->set_canceled($user, $close_code, $close_note);
 			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
 		}
-	}
-
-	// Convertir en reduc
+	} // Convertir en reduc
 	elseif ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -979,25 +918,19 @@ if (empty($reshook))
 					if ($result >= 0)
 					{
 						$db->commit();
-					}
-					else
-					{
+					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$db->rollback();
 					}
 				} else {
 					$db->commit();
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($discount->error, $discount->errors, 'errors');
 				$db->rollback();
 			}
 		}
-	}
-
-	// Delete payment
+	} // Delete payment
 	elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
@@ -1013,9 +946,7 @@ if (empty($reshook))
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 			}
 		}
-	}
-
-	/*
+	} /*
 	 * Insert new invoice in database
 	 */
 	elseif ($action == 'add' && $usercancreate)
@@ -1056,11 +987,11 @@ if (empty($reshook))
 
 				$object->date = $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
-				$object->note_public		= trim(GETPOST('note_public', 'none'));
+				$object->note_public		= trim(GETPOST('note_public', 'restricthtml'));
 				// We do not copy the private note
 				$object->ref_client			= $_POST['ref_client'];
 				$object->ref_int = $_POST['ref_int'];
-				$object->modelpdf = $_POST['model'];
+				$object->model_pdf = $_POST['model'];
 				$object->fk_project			= $_POST['projectid'];
 				$object->cond_reglement_id	= $_POST['cond_reglement_id'];
 				$object->mode_reglement_id	= $_POST['mode_reglement_id'];
@@ -1084,7 +1015,7 @@ if (empty($reshook))
 		}
 
 		// Credit note invoice
-		if ($_POST['type'] == Facture::TYPE_CREDIT_NOTE)
+		if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE)
 		{
 			$sourceinvoice = GETPOST('fac_avoir');
 			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE))
@@ -1102,7 +1033,7 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
+			$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
 
 			if (!$error)
 			{
@@ -1110,20 +1041,19 @@ if (empty($reshook))
 					$object->entity = $originentity;
 				}
 				$object->socid = GETPOST('socid', 'int');
-				$object->ref = $_POST['ref'];
+				$object->ref = GETPOST('ref');
 				$object->date = $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
-				$object->note_public		= trim(GETPOST('note_public', 'none'));
+				$object->note_public		= trim(GETPOST('note_public', 'restricthtml'));
 				// We do not copy the private note
-				$object->ref_client			= $_POST['ref_client'];
-				$object->ref_int = $_POST['ref_int'];
-				$object->modelpdf = $_POST['model'];
-				$object->fk_project			= $_POST['projectid'];
+				$object->ref_client			= GETPOST('ref_client');
+				$object->model_pdf = GETPOST('model');
+				$object->fk_project			= GETPOST('projectid', 'int');
 				$object->cond_reglement_id	= 0;
-				$object->mode_reglement_id	= $_POST['mode_reglement_id'];
+				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
 				$object->fk_account = GETPOST('fk_account', 'int');
-				$object->remise_absolue		= $_POST['remise_absolue'];
-				$object->remise_percent		= $_POST['remise_percent'];
+				$object->remise_absolue		= GETPOST('remise_absolue');
+				$object->remise_percent		= GETPOST('remise_percent');
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
@@ -1188,9 +1118,7 @@ if (empty($reshook))
 							            {
 							                $searchPreviousInvoice = false; // find, exit;
 							                break;
-							            }
-							            else
-							            {
+							            } 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;
 							            	}
@@ -1327,22 +1255,21 @@ if (empty($reshook))
 			if (!$error)
 			{
 				$object->socid = GETPOST('socid', 'int');
-				$object->type            = $_POST['type'];
-				$object->ref             = $_POST['ref'];
+				$object->type            = GETPOST('type');
+				$object->ref             = GETPOST('ref');
 				$object->date            = $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
-				$object->note_public = trim(GETPOST('note_public', 'none'));
-				$object->note_private    = trim(GETPOST('note_private', 'none'));
-				$object->ref_client      = $_POST['ref_client'];
-				$object->ref_int = $_POST['ref_int'];
-				$object->modelpdf        = $_POST['model'];
-				$object->fk_project = $_POST['projectid'];
-				$object->cond_reglement_id	= ($_POST['type'] == 3 ? 1 : $_POST['cond_reglement_id']);
-				$object->mode_reglement_id	= $_POST['mode_reglement_id'];
+				$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->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');
 				$object->fk_account = GETPOST('fk_account', 'int');
-				$object->amount = $_POST['amount'];
-				$object->remise_absolue		= $_POST['remise_absolue'];
-				$object->remise_percent		= $_POST['remise_percent'];
+				$object->amount = price2num(GETPOST('amount'));
+				$object->remise_absolue		= GETPOST('remise_absolue');
+				$object->remise_percent		= GETPOST('remise_percent');
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
@@ -1380,21 +1307,20 @@ if (empty($reshook))
 				// Si facture standard
 				$object->socid = GETPOST('socid', 'int');
 				$object->type				= GETPOST('type');
-				$object->ref = $_POST['ref'];
+				$object->ref = GETPOST('ref');
 				$object->date				= $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
-				$object->note_public		= trim(GETPOST('note_public', 'none'));
-				$object->note_private = trim(GETPOST('note_private', 'none'));
-				$object->ref_client			= $_POST['ref_client'];
-				$object->ref_int = $_POST['ref_int'];
-				$object->modelpdf = $_POST['model'];
-				$object->fk_project			= $_POST['projectid'];
-				$object->cond_reglement_id	= ($_POST['type'] == 3 ? 1 : $_POST['cond_reglement_id']);
-				$object->mode_reglement_id	= $_POST['mode_reglement_id'];
+				$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->fk_project			= GETPOST('projectid');
+				$object->cond_reglement_id	= (GETPOST('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
+				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
 				$object->fk_account = GETPOST('fk_account', 'int');
-				$object->amount = $_POST['amount'];
-				$object->remise_absolue		= $_POST['remise_absolue'];
-				$object->remise_percent		= $_POST['remise_percent'];
+				$object->amount = price2num(GETPOST('amount'));
+				$object->remise_absolue		= GETPOST('remise_absolue');
+				$object->remise_percent		= GETPOST('remise_percent');
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
@@ -1410,8 +1336,7 @@ if (empty($reshook))
 				if (in_array($object->type, $retainedWarrantyInvoiceAvailableType)) {
 					$object->retained_warranty = GETPOST('retained_warranty', 'int');
 					$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
-				}
-				else {
+				} else {
 					$object->retained_warranty = 0;
 					$object->retained_warranty_fk_cond_reglement = 0;
 				}
@@ -1514,14 +1439,11 @@ if (empty($reshook))
 									$amount_ttc_diff += $am;
 									$amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline
 								}
-							}
-							else
-							{
+							} else {
 								if ($typeamount == 'amount')
 								{
 									$amountdeposit[0] = $valuedeposit;
-								}
-								elseif ($typeamount == 'variable')
+								} elseif ($typeamount == 'variable')
 								{
 									if ($result > 0)
 									{
@@ -1742,7 +1664,7 @@ if (empty($reshook))
     						    $originidforcontact=$srcobject->origin_id;
     						}
     						$sqlcontact = "SELECT code, 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 = '".$originforcontact."'";
+    						$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$db->escape($originforcontact)."'";
 
     						$resqlcontact = $db->query($sqlcontact);
     						if ($resqlcontact)
@@ -1769,9 +1691,7 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				}
-				else
-				{   // If some invoice's lines coming from page
+				} else {   // If some invoice's lines coming from page
 					$id = $object->create($user);
 
 					for ($i = 1; $i <= $NBLINES; $i++) {
@@ -1878,12 +1798,11 @@ if (empty($reshook))
 				$object->fetch_thirdparty();
 				$object->date = $datefacture;
 				$object->date_pointoftax = $date_pointoftax;
-				$object->note_public = trim(GETPOST('note_public', 'none'));
-				$object->note = trim(GETPOST('note', 'none'));
-				$object->note_private = trim(GETPOST('note', 'none'));
+				$object->note_public = trim(GETPOST('note_public', 'restricthtml'));
+				$object->note = trim(GETPOST('note', 'restricthtml'));
+				$object->note_private = trim(GETPOST('note', 'restricthtml'));
 				$object->ref_client = GETPOST('ref_client', 'alpha');
-				$object->ref_int = GETPOST('ref_int', 'alpha');
-				$object->modelpdf = GETPOST('model', 'alpha');
+				$object->model_pdf = GETPOST('model', 'alpha');
 				$object->fk_project = GETPOST('projectid', 'int');
 				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
@@ -1897,9 +1816,7 @@ if (empty($reshook))
 				if ($id <= 0)
 				{
 					$mesg = $object->error;
-				}
-				else
-				{
+				} else {
 					$nextSituationInvoice = new Facture($db);
 					$nextSituationInvoice->fetch($id);
 
@@ -1930,7 +1847,7 @@ if (empty($reshook))
 					$outputlangs->setDefaultLang($newlang);
 					$outputlangs->load('products');
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -1939,36 +1856,38 @@ if (empty($reshook))
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
 			exit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
 			$_GET["originid"] = $_POST["originid"];
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Add a new line
-	elseif ($action == 'addline' && $usercancreate)
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'aZ09') && GETPOST('vatforalllines', 'alpha')) {
+		// Define vat_rate
+		$vat_rate = (GETPOST('vatforalllines') ? GETPOST('vatforalllines') : 0);
+		$vat_rate = str_replace('*', '', $vat_rate);
+		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
+		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
+		foreach ($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice);
+		}
+	} elseif ($action == 'addline' && $usercancreate)		// Add a new line
 	{
 		$langs->load('errors');
 		$error = 0;
 
 		// Set if we used free entry or predefined product
 		$predef = '';
-		$product_desc = (GETPOST('dp_desc', 'none') ?GETPOST('dp_desc', 'none') : '');
-		$price_ht = GETPOST('price_ht');
-		$price_ht_devise = GETPOST('multicurrency_price_ht');
+		$product_desc = (GETPOST('dp_desc', 'none') ?GETPOST('dp_desc', 'restricthtml') : '');
+		$price_ht = price2num(GETPOST('price_ht'));
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
 		if ($prod_entry_mode == 'free')
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -2015,9 +1934,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans("ErrorFieldCantBeNegativeOnInvoice", $langs->transnoentitiesnoconv("UnitPriceHT"), $langs->transnoentitiesnoconv("CustomerAbsoluteDiscountShort")), null, 'errors');
 				}
 				$error++;
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 				$error++;
 			}
@@ -2043,9 +1960,7 @@ if (empty($reshook))
 
 				if ($res = $prodcomb->fetchByProductCombination2ValuePairs($idprod, $combinations)) {
 					$idprod = $res->fk_product_child;
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans('ErrorProductCombinationNotFound'), null, 'errors');
 					$error++;
 				}
@@ -2097,21 +2012,18 @@ if (empty($reshook))
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 				// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
-				if (!empty($price_ht))
+				if (!empty($price_ht) || $price_ht === '0')
 				{
 					$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
+				} // 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
-					{
+					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -2229,7 +2141,7 @@ if (empty($reshook))
 							$outputlangs->setDefaultLang($newlang);
 							$outputlangs->load('products');
 						}
-						$model = $object->modelpdf;
+						$model = $object->model_pdf;
 						$ret = $object->fetch($id); // Reload to get new records
 
 						$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -2278,9 +2190,7 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
+	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
 	{
 		if (!$object->fetch($id) > 0)	dol_print_error($db);
 		$object->fetch_thirdparty();
@@ -2290,7 +2200,7 @@ if (empty($reshook))
 		$date_end = '';
 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
-		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'none') ? GETPOST('product_desc', 'none') : GETPOST('desc', 'none'));
+		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml') ? GETPOST('product_desc', 'restricthtml') : GETPOST('desc', 'restricthtml'));
 		$pu_ht = GETPOST('price_ht');
 		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		$qty = GETPOST('qty');
@@ -2337,16 +2247,14 @@ if (empty($reshook))
 		        setEventMessages($mesg, null, 'warnings');
 		        $error++;
 		        $result = -1;
-		    }
-		    elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
+		    } 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)
+		} elseif (GETPOST('progress') < $percent)
 		{
 			$mesg = '<div class="warning">'.$langs->trans("CantBeLessThanMinPercent").'</div>';
 			setEventMessages($mesg, null, 'warnings');
@@ -2401,9 +2309,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans("ErrorFieldCantBeNegativeOnInvoice", $langs->transnoentitiesnoconv("UnitPriceHT"), $langs->transnoentitiesnoconv("CustomerAbsoluteDiscountShort")), null, 'errors');
 				}
 				$error++;
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 				$error++;
 			}
@@ -2425,10 +2331,10 @@ if (empty($reshook))
 				}
 			}
 
-			$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'),
+			$result = $object->updateline(GETPOST('lineid', 'int'), $description, $pu_ht, $qty, price2num(GETPOST('remise_percent', 'alpha')),
 				$date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type,
-				GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, GETPOST('progress'),
-				$_POST['units'], $pu_ht_devise);
+				GETPOST('fk_parent_line', 'int'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, price2num(GETPOST('progress', 'alpha')),
+				GETPOST('units', 'alpha'), $pu_ht_devise);
 
 			if ($result >= 0) {
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -2446,7 +2352,7 @@ if (empty($reshook))
 					}
 
 					$ret = $object->fetch($id); // Reload to get new records
-					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
 				unset($_POST['qty']);
@@ -2488,9 +2394,7 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
+	} elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
 	{
 		if (!$object->fetch($id) > 0) dol_print_error($db);
 		if (GETPOST('all_progress') != "")
@@ -2503,18 +2407,13 @@ if (empty($reshook))
                     $mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
                     setEventMessages($mesg, null, 'warnings');
 					$result = -1;
-				} else
-					$object->update_percent($line, $_POST['all_progress']);
+				} else $object->update_percent($line, $_POST['all_progress']);
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
+	} elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
 		exit();
-	}
-
-	// Outing situation invoice from cycle
+	} // Outing situation invoice from cycle
 	elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $usercancreate)
 	{
 	    $object->fetch($id, '', '', '', true);
@@ -2584,9 +2483,7 @@ if (empty($reshook))
                                     {
                                         $searchPreviousInvoice = false; // find, exit;
                                         break;
-                                    }
-                                    else
-                                    {
+                                    } else {
                                         $lineIndex--; // go to previous invoice in cycle
                                     }
                                 }
@@ -2613,25 +2510,17 @@ if (empty($reshook))
                     {
                         setEventMessages($langs->trans('Updated'), '', 'mesgs');
                         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-                    }
-                    else
-                    {
+                    } else {
                         setEventMessages($langs->trans('ErrorOutingSituationInvoiceCreditNote'), array(), 'errors');
                     }
-	            }
-	            else
-	            {
+	            } else {
 	                setEventMessages($langs->trans('ErrorOutingSituationInvoiceOnUpdate'), array(), 'errors');
 	            }
-	        }
-	        else
-	        {
+	        } else {
 	            setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
 	        }
 	    }
-	}
-
-	// add lines from objectlinked
+	} // add lines from objectlinked
 	elseif ($action == 'import_lines_from_object'
 	    && $usercancreate
 	    && $object->statut == Facture::STATUS_DRAFT
@@ -2647,8 +2536,7 @@ if (empty($reshook))
 	        {
 	            dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'OrderLine';
-	        }
-	        elseif ($fromElement == 'propal')
+	        } elseif ($fromElement == 'propal')
 	        {
 	            dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 	            $lineClassName = 'PropaleLigne';
@@ -2690,8 +2578,7 @@ if (empty($reshook))
                     $array_options = $originLine->array_options;
                     if ($object->type == Facture::TYPE_SITUATION) {
                         $situation_percent = 0;
-                    }
-                    else {
+                    } else {
                         $situation_percent = 100;
                     }
                     $fk_prev_id = '';
@@ -2705,8 +2592,7 @@ if (empty($reshook))
                     } else {
                         $error++;
                     }
-                }
-                else {
+                } else {
                     $error++;
                 }
 	        }
@@ -2739,7 +2625,7 @@ if (empty($reshook))
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
@@ -2919,9 +2805,7 @@ if ($action == 'create')
 				//Replicate extrafields
 				$expesrc->fetch_optionals();
 				$object->array_options = $expesrc->array_options;
-			}
-			else
-			{
+			} else {
 				$cond_reglement_id 	= (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : 0));
 				$mode_reglement_id 	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : 0));
 				$fk_account         = (!empty($objectsrc->fk_account) ? $objectsrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
@@ -2939,9 +2823,7 @@ if ($action == 'create')
 				$object->array_options = $objectsrc->array_options;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id 	= $soc->cond_reglement_id;
 		$mode_reglement_id 	= $soc->mode_reglement_id;
 		$fk_account        	= $soc->fk_account;
@@ -2952,12 +2834,21 @@ if ($action == 'create')
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
+	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
+	if (empty($cond_reglement_id)) {
+		$cond_reglement_id = GETPOST("cond_reglement_id");
+	}
+
+	// when payment mode is empty (means not override by payment mode form a other object, like third-party), try to use default value
+	if (empty($mode_reglement_id)) {
+		$mode_reglement_id = GETPOST("mode_reglement_id");
+	}
+
 	if (!empty($soc->id)) $absolute_discount = $soc->getAvailableDiscounts();
 	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_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->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
 
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 		print ajax_combobox('fac_replacement');
 		print ajax_combobox('fac_avoir');
@@ -3023,9 +2914,7 @@ if ($action == 'create')
 		print ')';
 		print '</td>';
 		print '</tr>'."\n";
-	}
-	else
-	{
+	} else {
 		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');
@@ -3179,10 +3068,10 @@ if ($action == 'create')
 			print '</div></div>';
 
 			// Next situation invoice
-			$opt = $form->selectSituationInvoices(GETPOST('originid'), $socid);
+			$opt = $form->selectSituationInvoices(GETPOST('originid', 'int'), $socid);
 
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-			$tmp = '<input type="radio" name="type" value="5"'.(GETPOST('type') == 5 && GETPOST('originid') ? ' checked' : '');
+			$tmp = '<input type="radio" name="type" value="5"'.(GETPOST('type') == 5 && GETPOST('originid', 'int') ? ' checked' : '');
 			if ($opt == ('<option value ="0" selected>'.$langs->trans('NoSituations').'</option>') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande'))
 				$tmp .= ' disabled';
 			$tmp .= '> ';
@@ -3248,9 +3137,7 @@ if ($action == 'create')
 			print $desc;
 			print '</div></div>';
 		}
-	}
-	else
-	{
+	} else {
 	    if (!empty($conf->global->INVOICE_USE_SITUATION))
 	    {
     	    print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
@@ -3355,9 +3242,7 @@ if ($action == 'create')
 
     			print '</div></div>';
     		}
-		}
-		else
-		{
+		} 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> ';
 			else $tmp = '<input type="radio" name="type" id="radio_creditnote" value="2" > ';
@@ -3508,13 +3393,16 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Bank Account
-	if (GETPOSTISSET('fk_account')) {
-		$fk_account = GETPOST('fk_account');
-	}
+	if (!empty($conf->banque->enabled))
+	{
+		if (GETPOSTISSET('fk_account')) {
+			$fk_account = GETPOST('fk_account');
+		}
 
-	print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
-	$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
-	print '</td></tr>';
+		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
+		$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+		print '</td></tr>';
+	}
 
 	// Project
 	if (!empty($conf->projet->enabled))
@@ -3733,8 +3621,7 @@ if ($action == 'create')
 	}
 
 	print '<br>';
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
 {
 	/*
 	 * Show object in view mode
@@ -3843,9 +3730,7 @@ elseif ($id > 0 || !empty($ref))
 					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1, 0, 0, $langs->trans("NoStockAction"), 0, $forcecombo))
 				);
 				$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', $formquestion, "yes", 1);
-			}
-			else
-			{
+			} else {
 				$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('DeleteBill'), $text, 'confirm_delete', '', 'no', 1);
 			}
 		} else {
@@ -4050,7 +3935,7 @@ elseif ($id > 0 || !empty($ref))
 		}
 	}
 
-	if ($action == 'deletepaiement')
+	if ($action == 'deletepayment')
 	{
 		$payment_id = GETPOST('paiement_id');
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&paiement_id='.$payment_id, $langs->trans('DeletePayment'), $langs->trans('ConfirmDeletePayment'), 'confirm_delete_paiement', '', 'no', 1);
@@ -4182,8 +4067,7 @@ elseif ($id > 0 || !empty($ref))
 		foreach ($facidavoir as $id) {
 			if ($i == 0)
 				print ' ';
-			else
-				print ',';
+			else print ',';
 			$facavoir = new Facture($db);
 			$facavoir->fetch($id);
 			print $facavoir->getNomUrl(1);
@@ -4234,17 +4118,13 @@ elseif ($id > 0 || !empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateInvoice');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
+	if ($action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
 
-	if ($object->type != Facture::TYPE_CREDIT_NOTE) {
-		if ($action == 'editinvoicedate') {
-			$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date, 'invoicedate');
-		} else {
-			print dol_print_date($object->date, 'day');
-		}
+	if ($action == 'editinvoicedate') {
+		$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date, 'invoicedate');
 	} else {
 		print dol_print_date($object->date, 'day');
 	}
@@ -4327,9 +4207,7 @@ elseif ($id > 0 || !empty($ref))
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
 	}
 	print '</td></tr>';
@@ -4381,24 +4259,25 @@ elseif ($id > 0 || !empty($ref))
 	}
 
 	// Bank Account
-	print '<tr><td class="nowrap">';
-	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	print $langs->trans('BankAccount');
-	print '<td>';
-	if (($action != 'editbankaccount') && $usercancreate)
-		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>';
-	if ($action == 'editbankaccount')
+	if (!empty($conf->banque->enabled))
 	{
-		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('BankAccount');
+		print '<td>';
+		if (($action != 'editbankaccount') && $usercancreate)
+			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>';
+		if ($action == 'editbankaccount')
+		{
+			$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');
+		}
+		print "</td>";
+		print '</tr>';
 	}
-	else
-	{
-		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
-	}
-	print "</td>";
-	print '</tr>';
 
 	// Incoterms
 	if (!empty($conf->incoterm->enabled))
@@ -4415,9 +4294,7 @@ elseif ($id > 0 || !empty($ref))
 		if ($action != 'editincoterm')
 		{
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		}
-		else
-		{
+		} 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>';
@@ -4431,7 +4308,7 @@ elseif ($id > 0 || !empty($ref))
 			$displayWarranty = false;
 		}
 
-		if($displayWarranty) {
+		if ($displayWarranty) {
 			// Retained Warranty
 			print '<tr class="retained-warranty-lines"  ><td>';
 			print '<table id="retained-warranty-table" class="nobordernopadding" width="100%"><tr><td>';
@@ -4451,9 +4328,7 @@ elseif ($id > 0 || !empty($ref))
 		        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
-		    {
+		    } else {
 		        print price($object->retained_warranty).'%';
 		    }
 		    print '</td></tr>';
@@ -4486,9 +4361,7 @@ elseif ($id > 0 || !empty($ref))
 		        $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
-		    {
+		    } 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" ');
@@ -4521,9 +4394,7 @@ elseif ($id > 0 || !empty($ref))
                 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
-            {
+            } else {
                 print dol_print_date($object->retained_warranty_date_limit, 'day');
             }
             print '</td></tr>';
@@ -4541,44 +4412,50 @@ elseif ($id > 0 || !empty($ref))
 	print '<div class="fichehalfright">';
 	print '<div class="ficheaddleft">';
 
+	print '<!-- amounts -->'."\n";
 	print '<table class="border bordertop tableforfield centpercent">';
 
+	$sign = 1;
+	if (!empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE_SCREEN) && $object->type == $object::TYPE_CREDIT_NOTE) {
+		$sign = -1;	// We invert sign for output
+	}
+
 	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 amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap amountcard">'.price($sign * $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 amountcard">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap amountcard">'.price($sign * $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 amountcard">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap amountcard">'.price($sign * $object->multicurrency_total_ttc, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 	}
 
 	// Amount
 	print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
-	print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+	print '<td class="nowrap amountcard">'.price($sign * $object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
 	// Vat
-	print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="3" class="nowrap amountcard">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="3" class="nowrap amountcard">'.price($sign * $object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	print '</tr>';
 
 	// 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 amountcard">'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+		print '<td class="nowrap amountcard">'.price($sign * $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 amountcard">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+		print '<td class=nowrap amountcard">'.price($sign * $object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
 
 	// Revenue stamp
@@ -4636,13 +4513,11 @@ elseif ($id > 0 || !empty($ref))
 	}
 
 	// Total with tax
-	print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="nowrap amountcard">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="nowrap amountcard">'.price($sign * $object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
 	print '</table>';
 
 
-	$sign = 1;
-	if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = - 1;
 	$nbrows = 8;
 	$nbcols = 3;
 	if (!empty($conf->projet->enabled))
@@ -4785,6 +4660,8 @@ elseif ($id > 0 || !empty($ref))
 	    print '</table>';
 	}
 
+	$sign = 1;
+	if ($object->type == $object::TYPE_CREDIT_NOTE) $sign = -1;
 
 	// List of payments already done
 
@@ -4862,7 +4739,7 @@ elseif ($id > 0 || !empty($ref))
 				print '<td class="center">';
 				if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
 				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepaiement&paiement_id='.$objp->rowid.'">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepayment&token='.newToken().'&paiement_id='.$objp->rowid.'">';
 					print img_delete();
 					print '</a>';
 				}
@@ -4885,8 +4762,7 @@ elseif ($id > 0 || !empty($ref))
 		print '<tr><td colspan="'.$nbcols.'" class="right">';
 		if ($object->type != Facture::TYPE_DEPOSIT)
 			print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
-		else
-			print $langs->trans('AlreadyPaid');
+		else print $langs->trans('AlreadyPaid');
 		print ' :</td><td class="right'.(($totalpaye > 0) ? ' amountalreadypaid' : '').'">'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
 
 		$resteapayeraffiche = $resteapayer;
@@ -4981,9 +4857,7 @@ elseif ($id > 0 || !empty($ref))
 		    if ($object->type == Facture::TYPE_SITUATION)
 		    {
 		        $retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
-		    }
-		    else
-		    {
+		    } else {
 		        // Because one day retained warranty could be used on standard invoices
 		        $retainedWarranty = $object->total_ttc * $object->retained_warranty / 100;
 		    }
@@ -4998,8 +4872,7 @@ elseif ($id > 0 || !empty($ref))
 		    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
+	} else // Credit note
 	{
 		$cssforamountpaymentcomplete = 'amountpaymentneutral';
 
@@ -5172,9 +5045,7 @@ elseif ($id > 0 || !empty($ref))
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Modify').'</span>';
 						}
 					}
-				}
-				else
-				{
+				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span>';
 				}
 			}
@@ -5213,8 +5084,7 @@ elseif ($id > 0 || !empty($ref))
 					} else {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else
-							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 			}
@@ -5232,14 +5102,10 @@ elseif ($id > 0 || !empty($ref))
 						} else {
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('MakeWithdrawRequest').'</span>';
 						}
-					}
-					else
-					{
+					} else {
 						//print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 					}
-				}
-				else
-				{
+				} else {
 					//print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 				}
 			}
@@ -5273,9 +5139,7 @@ elseif ($id > 0 || !empty($ref))
 					if ($resteapayer == 0)
 					{
 						print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a>';
 					}
 				}
@@ -5314,17 +5178,13 @@ elseif ($id > 0 || !empty($ref))
 				{
 					// If one payment or one credit note was linked to this invoice
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaidPartially').'</a>';
-				}
-				else
-				{
+				} else {
 					if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED))
 					{
 						if ($objectidnext)
 						{
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ClassifyCanceled').'</span>';
-						}
-						else
-						{
+						} else {
 							print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=canceled">'.$langs->trans('ClassifyCanceled').'</a>';
 						}
 					}
@@ -5336,7 +5196,7 @@ elseif ($id > 0 || !empty($ref))
 			{
 				if (!$objectidnext)
 				{
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').''.($object->entity > 0 ? '&amp;originentity='.$object->entity : '').'">'.$langs->trans("CreateCreditNote").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').($object->entity > 0 ? '&amp;originentity='.$object->entity : '').'">'.$langs->trans("CreateCreditNote").'</a>';
 				}
 			}
 
@@ -5386,9 +5246,7 @@ elseif ($id > 0 || !empty($ref))
 			    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
-			    {
+			    } else {
 			        print '<a id="butSituationOutRefused" class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotEnouthCreditNote").'" >'.$langs->trans("RemoveSituationFromCycle").'</a>';
 			    }
 			}
@@ -5411,27 +5269,20 @@ elseif ($id > 0 || !empty($ref))
 				//var_dump($isErasable);
 				if ($isErasable == -4) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable == -3) {
+				} elseif ($isErasable == -3) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable == -2) {
+				} elseif ($isErasable == -2) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable == -1) {
+				} elseif ($isErasable == -1) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($isErasable <= 0)	// Any other cases
+				} elseif ($isErasable <= 0)	// Any other cases
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a>';
-				}
-				elseif ($objectidnext)
+				} elseif ($objectidnext)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Delete').'</a>';
-				}
-				else
-				{
-					print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+				} else {
+					print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
 				}
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
@@ -5458,7 +5309,7 @@ elseif ($id > 0 || !empty($ref))
 
 		print $formfile->showdocuments(
 			'facture', $filename, $filedir, $urlsource, $genallowed,
-			$delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '',
+			$delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '',
 			$soc->default_lang, '', $object, 0, 'remove_file_comfirm');
 
 		$somethingshown = $formfile->numoffiles;
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 85da9cd5c37..0ab4974ce7f 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -28,96 +28,96 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
  */
 class Invoices 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 Facture $invoice {@type Facture}
-     */
-    public $invoice;
+	/**
+	 * @var Facture $invoice {@type Facture}
+	 */
+	public $invoice;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->invoice = new Facture($this->db);
-    }
-
-    /**
-     * Get properties of a invoice object
-     *
-     * Return an array with invoice informations
-     *
-     * @param 	int 	$id           ID of invoice
-     * @param   int     $contact_list 0:Return array contains all properties, 1:Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-	public function get($id, $contact_list = 1)
+	/**
+	 * Constructor
+	 */
+	public function __construct()
 	{
-        return $this->_fetch($id, '', '', $contact_list);
+		global $db, $conf;
+		$this->db = $db;
+		$this->invoice = new Facture($this->db);
 	}
 
-    /**
-     * Get properties of an invoice object by ref
-     *
-     * Return an array with invoice informations
-     *
-     * @param       string		$ref			Ref of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref/{ref}
-     *
-     * @throws 	RestException
-     */
-    public function getByRef($ref, $contact_list = 1)
-    {
-        return $this->_fetch('', $ref, '', $contact_list);
-    }
+	/**
+	 * Get properties of a invoice object
+	 *
+	 * Return an array with invoice informations
+	 *
+	 * @param 	int 	$id           ID of invoice
+	 * @param   int     $contact_list 0:Return array contains all properties, 1:Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id, $contact_list = 1)
+	{
+		return $this->_fetch($id, '', '', $contact_list);
+	}
 
-    /**
-     * Get properties of an invoice object by ref_ext
-     *
-     * Return an array with invoice informations
-     *
-     * @param       string		$ref_ext			External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref_ext/{ref_ext}
-     *
-     * @throws 	RestException
-     */
-    public function getByRefExt($ref_ext, $contact_list = 1)
-    {
-        return $this->_fetch('', '', $ref_ext, $contact_list);
-    }
+	/**
+	 * Get properties of an invoice object by ref
+	 *
+	 * Return an array with invoice informations
+	 *
+	 * @param       string		$ref			Ref of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref/{ref}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRef($ref, $contact_list = 1)
+	{
+		return $this->_fetch('', $ref, '', $contact_list);
+	}
 
-    /**
-     * Get properties of an invoice object
-     *
-     * Return an array with invoice informations
-     *
-     * @param       int         $id            ID of order
+	/**
+	 * Get properties of an invoice object by ref_ext
+	 *
+	 * Return an array with invoice informations
+	 *
+	 * @param       string		$ref_ext			External reference of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref_ext/{ref_ext}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRefExt($ref_ext, $contact_list = 1)
+	{
+		return $this->_fetch('', '', $ref_ext, $contact_list);
+	}
+
+	/**
+	 * Get properties of an invoice object
+	 *
+	 * Return an array with invoice informations
+	 *
+	 * @param       int         $id            ID of order
 	 * @param		string		$ref			Ref of object
 	 * @param		string		$ref_ext		External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
-    {
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
+	{
 		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
@@ -142,139 +142,138 @@ class Invoices extends DolibarrApi
 
 		$this->invoice->fetchObjectLinked();
 		return $this->_cleanObjectDatas($this->invoice);
-    }
+	}
 
-    /**
-     * List invoices
-     *
-     * Get a list of invoices
-     *
-     * @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	$status		      Filter by invoice status : draft | unpaid | paid | cancelled
-     * @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 invoice objects
-     *
+	/**
+	 * List invoices
+	 *
+	 * Get a list of invoices
+	 *
+	 * @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	$status		      Filter by invoice status : draft | unpaid | paid | cancelled
+	 * @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 invoice objects
+	 *
 	 * @throws RestException 404 Not found
 	 * @throws RestException 503 Error
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $status = '', $sqlfilters = '')
-    {
-        global $db, $conf;
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $status = '', $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."facture 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."facture 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('invoice').')';
-        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.")";
+		$sql .= ' WHERE t.entity IN ('.getEntity('invoice').')';
+		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
+		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 
 		// Filter by status
-        if ($status == 'draft')     $sql .= " AND t.fk_statut IN (0)";
-        if ($status == 'unpaid')    $sql .= " AND t.fk_statut IN (1)";
-        if ($status == 'paid')      $sql .= " AND t.fk_statut IN (2)";
-        if ($status == 'cancelled') $sql .= " AND t.fk_statut IN (3)";
-        // 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).")";
-        }
+		if ($status == 'draft')     $sql .= " AND t.fk_statut IN (0)";
+		if ($status == 'unpaid')    $sql .= " AND t.fk_statut IN (1)";
+		if ($status == 'paid')      $sql .= " AND t.fk_statut IN (2)";
+		if ($status == 'cancelled') $sql .= " AND t.fk_statut IN (3)";
+		// 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 .= $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 .= $db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $i = 0;
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $invoice_static = new Facture($db);
-                if ($invoice_static->fetch($obj->rowid))
-                {
-                	// Get payment details
-                	$invoice_static->totalpaid = $invoice_static->getSommePaiement();
-                	$invoice_static->totalcreditnotes = $invoice_static->getSumCreditNotesUsed();
-                	$invoice_static->totaldeposits = $invoice_static->getSumDepositsUsed();
-                	$invoice_static->remaintopay = price2num($invoice_static->total_ttc - $invoice_static->totalpaid - $invoice_static->totalcreditnotes - $invoice_static->totaldeposits, 'MT');
+		$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);
+				$invoice_static = new Facture($this->db);
+				if ($invoice_static->fetch($obj->rowid))
+				{
+					// Get payment details
+					$invoice_static->totalpaid = $invoice_static->getSommePaiement();
+					$invoice_static->totalcreditnotes = $invoice_static->getSumCreditNotesUsed();
+					$invoice_static->totaldeposits = $invoice_static->getSumDepositsUsed();
+					$invoice_static->remaintopay = price2num($invoice_static->total_ttc - $invoice_static->totalpaid - $invoice_static->totalcreditnotes - $invoice_static->totaldeposits, 'MT');
 
 					// Add external contacts ids
 					$invoice_static->contacts_ids = $invoice_static->liste_contact(-1, 'external', 1);
 
-                	$obj_ret[] = $this->_cleanObjectDatas($invoice_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve invoice list : '.$db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No invoice found');
-        }
+					$obj_ret[] = $this->_cleanObjectDatas($invoice_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve invoice list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No invoice found');
+		}
 		return $obj_ret;
-    }
+	}
 
-    /**
-     * Create invoice object
-     *
-     * @param array $request_data   Request datas
-     * @return int                  ID of invoice
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
+	/**
+	 * Create invoice object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int                  ID of invoice
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
 			throw new RestException(401, "Insuffisant rights");
 		}
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
-        foreach ($request_data as $field => $value) {
-            $this->invoice->$field = $value;
-        }
-        if (!array_key_exists('date', $request_data)) {
-            $this->invoice->date = dol_now();
-        }
-        /* We keep lines as an array
+		foreach ($request_data as $field => $value) {
+			$this->invoice->$field = $value;
+		}
+		if (!array_key_exists('date', $request_data)) {
+			$this->invoice->date = dol_now();
+		}
+		/* We keep lines as an array
          if (isset($request_data["lines"])) {
             $lines = array();
             foreach ($request_data["lines"] as $line) {
@@ -283,152 +282,154 @@ class Invoices extends DolibarrApi
             $this->invoice->lines = $lines;
         }*/
 
-        if ($this->invoice->create(DolibarrApiAccess::$user, 0, (empty($request_data["date_lim_reglement"]) ? 0 : $request_data["date_lim_reglement"])) < 0) {
-            throw new RestException(500, "Error creating invoice", array_merge(array($this->invoice->error), $this->invoice->errors));
-        }
-        return $this->invoice->id;
-    }
+		if ($this->invoice->create(DolibarrApiAccess::$user, 0, (empty($request_data["date_lim_reglement"]) ? 0 : $request_data["date_lim_reglement"])) < 0) {
+			throw new RestException(500, "Error creating invoice", array_merge(array($this->invoice->error), $this->invoice->errors));
+		}
+		return $this->invoice->id;
+	}
 
-     /**
-     * Create an invoice 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 createInvoiceFromOrder($orderid)
-    {
+	 /**
+	  * Create an invoice 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 createInvoiceFromOrder($orderid)
+	{
 
-        require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
-        if (!DolibarrApiAccess::$user->rights->commande->lire) {
-            throw new RestException(401);
-        }
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
-        if (empty($orderid)) {
-            throw new RestException(400, 'Order ID is mandatory');
-        }
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
+		if (!DolibarrApiAccess::$user->rights->facture->creer) {
+			throw new RestException(401);
+		}
+		if (empty($orderid)) {
+			throw new RestException(400, 'Order ID is mandatory');
+		}
 
-        $order = new Commande($this->db);
-        $result = $order->fetch($orderid);
-        if (!$result) {
-            throw new RestException(404, 'Order not found');
-        }
+		$order = new Commande($this->db);
+		$result = $order->fetch($orderid);
+		if (!$result) {
+			throw new RestException(404, 'Order not found');
+		}
 
-        $result = $this->invoice->createFromOrder($order, DolibarrApiAccess::$user);
-        if ($result < 0) {
-            throw new RestException(405, $this->invoice->error);
-        }
-        $this->invoice->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		$result = $this->invoice->createFromOrder($order, DolibarrApiAccess::$user);
+		if ($result < 0) {
+			throw new RestException(405, $this->invoice->error);
+		}
+		$this->invoice->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
-    /**
-     * Get lines of an invoice
-     *
-     * @param int   $id             Id of invoice
-     *
-     * @url	GET {id}/lines
-     *
-     * @return int
-     */
-    public function getLines($id)
-    {
-    	if (!DolibarrApiAccess::$user->rights->facture->lire) {
-    		throw new RestException(401);
-    	}
+	/**
+	 * Get lines of an invoice
+	 *
+	 * @param int   $id             Id of invoice
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return int
+	 */
+	public function getLines($id)
+	{
+		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);
-    	}
-    	$this->invoice->getLinesArray();
-    	$result = array();
-    	foreach ($this->invoice->lines as $line) {
-    		array_push($result, $this->_cleanObjectDatas($line));
-    	}
-    	return $result;
-    }
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->invoice->getLinesArray();
+		$result = array();
+		foreach ($this->invoice->lines as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
 
-    /**
-     * Update a line to a given invoice
-     *
-     * @param int   $id             Id of invoice to update
-     * @param int   $lineid         Id of line to update
-     * @param array $request_data   InvoiceLine data
-     *
-     * @url	PUT {id}/lines/{lineid}
-     *
-     * @return array
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404 Invoice not found
-     */
-    public function putLine($id, $lineid, $request_data = null)
-    {
-    	if (!DolibarrApiAccess::$user->rights->facture->creer) {
-    		throw new RestException(401);
-    	}
+	/**
+	 * Update a line to a given invoice
+	 *
+	 * @param int   $id             Id of invoice to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   InvoiceLine data
+	 *
+	 * @url	PUT {id}/lines/{lineid}
+	 *
+	 * @return array
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404 Invoice not found
+	 */
+	public function putLine($id, $lineid, $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);
-    	}
-    	$request_data = (object) $request_data;
-        $updateRes = $this->invoice->updateline(
-    		$lineid,
-    		$request_data->desc,
-    		$request_data->subprice,
-    		$request_data->qty,
-    		$request_data->remise_percent,
-    		$request_data->date_start,
-    		$request_data->date_end,
-    		$request_data->tva_tx,
-    		$request_data->localtax1_tx,
-    		$request_data->localtax2_tx,
-    		'HT',
-    		$request_data->info_bits,
-    		$request_data->product_type,
-    		$request_data->fk_parent_line,
-    		0,
-    		$request_data->fk_fournprice,
-    		$request_data->pa_ht,
-    		$request_data->label,
-    		$request_data->special_code,
-    		$request_data->array_options,
-    		$request_data->situation_percent,
-    		$request_data->fk_unit,
-    		$request_data->multicurrency_subprice
-    	);
+		if (!DolibarrApi::_checkAccessToResource('facture', $this->invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->invoice->updateline(
+			$lineid,
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->remise_percent,
+			$request_data->date_start,
+			$request_data->date_end,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			'HT',
+			$request_data->info_bits,
+			$request_data->product_type,
+			$request_data->fk_parent_line,
+			0,
+			$request_data->fk_fournprice,
+			$request_data->pa_ht,
+			$request_data->label,
+			$request_data->special_code,
+			$request_data->array_options,
+			$request_data->situation_percent,
+			$request_data->fk_unit,
+			$request_data->multicurrency_subprice,
+			0,
+			$request_data->ref_ext
+		);
 
-    	if ($updateRes > 0) {
-    		$result = $this->get($id);
-    		unset($result->line);
-    		return $this->_cleanObjectDatas($result);
-	    } else {
-	    	throw new RestException(304, $this->invoice->error);
-    	}
-    }
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		} else {
+			throw new RestException(304, $this->invoice->error);
+		}
+	}
 
-    /**
+	/**
 	 * Add a contact type of given invoice
 	 *
 	 * @param int    $id             Id of invoice to update
@@ -439,45 +440,46 @@ class Invoices extends DolibarrApi
 	 *
 	 * @return int
 	 *
-     * @throws RestException 401
-     * @throws RestException 404
+	 * @throws RestException 401
+	 * @throws RestException 404
 	 */
-    public function postContact($id, $contactid, $type)
-    {
-        if (!DolibarrApiAccess::$user->rights->facture->creer) {
-            throw new RestException(401);
-        }
+	public function postContact($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 (!in_array($type, array('BILLING', 'SHIPPING', 'CUSTOMER'), true)) {
-            throw new RestException(500, 'Availables types: BILLING, SHIPPING OR CUSTOMER');
-        }
+		if (!in_array($type, array('BILLING', 'SHIPPING', 'CUSTOMER'), true)) {
+			throw new RestException(500, 'Availables types: BILLING, SHIPPING OR CUSTOMER');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('invoice', $this->invoice->id)) {
+		if (!DolibarrApi::_checkAccessToResource('invoice', $this->invoice->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->invoice->add_contact($contactid, $type, 'external');
+		$result = $this->invoice->add_contact($contactid, $type, 'external');
 
-        if (!$result) {
-            throw new RestException(500, 'Error when added the contact');
-        }
+		if (!$result) {
+			throw new RestException(500, 'Error when added the contact');
+		}
 
-        return $this->_cleanObjectDatas($this->invoice);
-    }
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
-    /**
+	/**
 	 * Delete a contact type of given invoice
 	 *
 	 * @param int    $id             Id of invoice to update
-	 * @param int    $rowid          Row key of the contact in the array contact_ids.
+	 * @param int    $contactid      Row key of the contact in the array contact_ids.
+	 * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
 	 *
-	 * @url	DELETE {id}/contact/{rowid}
+	 * @url	DELETE {id}/contact/{contactid}/{type}
 	 *
 	 * @return array
   	 *
@@ -485,7 +487,7 @@ class Invoices extends DolibarrApi
      * @throws RestException 404
      * @throws RestException 500
 	 */
-    public function deleteContact($id, $rowid)
+    public function deleteContact($id, $contactid, $type)
     {
         if (!DolibarrApiAccess::$user->rights->facture->creer) {
             throw new RestException(401);
@@ -501,10 +503,17 @@ class Invoices extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->invoice->delete_contact($rowid);
-        if ($result < 0) {
-            throw new RestException(500, 'Error when deleted the contact');
-        }
+        $contacts = $this->invoice->liste_contact();
+
+		foreach ($contacts as $contact) {
+			if ($contact['id'] == $contactid && $contact['code'] == $type) {
+		        $result = $this->invoice->delete_contact($contact['rowid']);
+
+		        if (!$result) {
+                    throw new RestException(500, 'Error when deleted the contact');
+                }
+		    }
+		}
 
         return $this->_cleanObjectDatas($this->invoice);
     }
@@ -548,9 +557,7 @@ class Invoices extends DolibarrApi
     	$updateRes = $this->invoice->deleteline($lineid);
     	if ($updateRes > 0) {
     		return $this->get($id);
-    	}
-    	else
-    	{
+    	} else {
     		throw new RestException(405, $this->invoice->error);
     	}
     }
@@ -707,7 +714,9 @@ class Invoices extends DolibarrApi
             $request_data->array_options,
             $request_data->situation_percent,
             $request_data->fk_prev_id,
-            $request_data->fk_unit
+            $request_data->fk_unit,
+            0,
+            $request_data->ref_ext
         );
 
         if ($updateRes < 0) {
@@ -875,8 +884,8 @@ class Invoices extends DolibarrApi
      * Sets an invoice as paid
      *
      * @param   int 	$id            Order ID
-     * @param   string 	$close_code    Code renseigne si on classe a payee completement alors que paiement incomplet (cas escompte par exemple)
-     * @param   string 	$close_note    Commentaire renseigne si on classe a payee alors que paiement incomplet (cas escompte par exemple)
+     * @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
      *
@@ -987,6 +996,8 @@ class Invoices extends DolibarrApi
      */
     public function markAsCreditAvailable($id)
     {
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
         if (!DolibarrApiAccess::$user->rights->facture->creer) {
             throw new RestException(401);
         }
@@ -1041,14 +1052,11 @@ class Invoices extends DolibarrApi
             $discount = new DiscountAbsolute($this->db);
             if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
                 $discount->description = '(CREDIT_NOTE)';
-            }
-            elseif ($this->invoice->type == Facture::TYPE_DEPOSIT) {
+            } 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) {
+            } elseif ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
                 $discount->description = '(EXCESS RECEIVED)';
-            }
-            else {
+            } else {
                 throw new RestException(500, 'Cant convert to reduc an Invoice of this type');
             }
 
@@ -1062,7 +1070,7 @@ class Invoices extends DolibarrApi
                 // 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_paiements';
+                $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;
@@ -1072,7 +1080,7 @@ class Invoices extends DolibarrApi
                 if (!$resql) dol_print_error($this->db);
 
                 $res = $this->db->fetch_object($resql);
-                $total_paiements = $res->total_paiements;
+                $total_payments = $res->total_payments;
 
                 // Total credit note and deposit
                 $total_creditnote_and_deposit = 0;
@@ -1085,7 +1093,7 @@ class Invoices extends DolibarrApi
                     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_paiements + $total_creditnote_and_deposit - $this->invoice->total_ttc;
+                $discount->amount_ht = $discount->amount_ttc = $total_payments + $total_creditnote_and_deposit - $this->invoice->total_ttc;
                 $discount->amount_tva = 0;
                 $discount->tva_tx = 0;
 
@@ -1124,18 +1132,14 @@ class Invoices extends DolibarrApi
                     if ($result >= 0)
                     {
                         $this->db->commit();
-                    }
-                    else
-                    {
+                    } else {
                         $this->db->rollback();
                         throw new RestException(500, 'Could not set paid');
                     }
                 } else {
                     $this->db->commit();
                 }
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 throw new RestException(500, 'Discount creation error');
             }
@@ -1287,12 +1291,12 @@ class Invoices extends DolibarrApi
      *
      * @param int     $id                               Id of invoice
      * @param string  $datepaye           {@from body}  Payment date        {@type timestamp}
-     * @param int     $paiementid         {@from body}  Payment mode Id {@min 1}
+     * @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_paiement       {@from body}  Payment number (optional)
-     * @param string  $comment            {@from body}  Note (optional)
-     * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paiementcode = 'CHQ')
+     * @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
@@ -1303,7 +1307,7 @@ class Invoices extends DolibarrApi
      * @throws RestException 401
      * @throws RestException 404
      */
-    public function addPayment($id, $datepaye, $paiementid, $closepaidinvoices, $accountid, $num_paiement = '', $comment = '', $chqemetteur = '', $chqbank = '')
+    public function addPayment($id, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
     {
         global $conf;
 
@@ -1326,8 +1330,8 @@ class Invoices extends DolibarrApi
     		}
     	}
 
-    	if (empty($paiementid)) {
-    		throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
+    	if (empty($paymentid)) {
+    		throw new RestException(400, 'Payment ID or Payment Code is mandatory');
     	}
 
 
@@ -1364,67 +1368,68 @@ class Invoices extends DolibarrApi
 
 
     	// Creation of payment line
-    	$paiement = new Paiement($this->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 = $paiementid;
-    	$paiement->paiementcode = dol_getIdFromCode($this->db, $paiementid, 'c_paiement', 'id', 'code', 1);
-    	$paiement->num_paiement = $num_paiement;
-    	$paiement->note = $comment;
+    	$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;
 
-    	$paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-    	if ($paiement_id < 0)
+    	$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 : '.$paiement->error);
+    		throw new RestException(400, 'Payment error : '.$paymentobj->error);
     	}
 
     	if (!empty($conf->banque->enabled)) {
     		$label = '(CustomerInvoicePayment)';
 
-    		if ($paiement->paiementcode == 'CHQ' && empty($chqemetteur)) {
-    			throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paiement->paiementcode);
+    		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 = $paiement->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
+    		$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 : '.$paiement->error);
+    			throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
     		}
     	}
 
     	$this->db->commit();
 
-    	return $paiement_id;
+    	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": "99.99", "2": "10"}
+     * 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     $paiementid         {@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_paiement       {@from body}  Payment number (optional)
-     * @param string  $comment            {@from body}  Note (optional)
-     * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paiementcode = 'CHQ')
-     * @param string  $chqbank            {@from body}  Issuer bank name (optional)
+     * @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, $paiementid, $closepaidinvoices, $accountid, $num_paiement = '', $comment = '', $chqemetteur = '', $chqbank = '')
+    public function addPaymentDistributed($arrayofamounts, $datepaye, $paymentid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '', $ref_ext = '', $accepthigherpayment = false)
     {
         global $conf;
 
@@ -1447,8 +1452,8 @@ class Invoices extends DolibarrApi
         		throw new RestException(400, 'Account ID is mandatory');
         	}
         }
-        if (empty($paiementid)) {
-        	throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
+        if (empty($paymentid)) {
+        	throw new RestException(400, 'Payment ID or Payment Code is mandatory');
         }
 
         $this->db->begin();
@@ -1457,7 +1462,7 @@ class Invoices extends DolibarrApi
         $multicurrency_amounts = array();
 
         // Loop on each invoice to pay
-        foreach ($arrayofamounts as $id => $amount)
+        foreach ($arrayofamounts as $id => $amountarray)
         {
         	$result = $this->invoice->fetch($id);
         	if (!$result) {
@@ -1465,68 +1470,134 @@ class Invoices extends DolibarrApi
         		throw new RestException(404, 'Invoice ID '.$id.' not found');
         	}
 
-        	// 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 ($amount != 'remain')
-        	{
-        		if ($amount > $resteapayer)
-        		{
-        			$this->db->rollback();
-        			throw new RestException(400, 'Payment amount on invoice ID '.$id.' ('.$amount.') is higher than remain to pay ('.$resteapayer.')');
-        		}
-        		$resteapayer = $amount;
+        	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"].')');
         	}
-            // 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;
+
+        	$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.')');
+			}
+
+        	if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+        	    $amount = -$amount;
+        	}
+
+            if ($is_multicurrency) {
+                $amounts[$id] = null;
                 // Multicurrency
-                $newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-                $multicurrency_amounts[$id] = -$newvalue;
+                $multicurrency_amounts[$id] = $amount;
             } else {
-                $resteapayer = price2num($resteapayer, 'MT');
-                $amounts[$id] = $resteapayer;
+                $amounts[$id] = $amount;
                 // Multicurrency
-                $newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-                $multicurrency_amounts[$id] = $newvalue;
+                $multicurrency_amounts[$id] = null;
             }
         }
 
         // Creation of payment line
-        $paiement = new Paiement($this->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   = $paiementid;
-        $paiement->paiementcode = dol_getIdFromCode($this->db, $paiementid, 'c_paiement', 'id', 'code', 1);
-        $paiement->num_paiement = $num_paiement;
-        $paiement->note         = $comment;
-        $paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-        if ($paiement_id < 0)
+        $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 : '.$paiement->error);
+            throw new RestException(400, 'Payment error : '.$paymentobj->error);
         }
         if (!empty($conf->banque->enabled)) {
             $label = '(CustomerInvoicePayment)';
-            if ($paiement->paiementcode == 'CHQ' && empty($chqemetteur)) {
-                  throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paiement->paiementcode);
+            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 = $paiement->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
+            $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 : '.$paiement->error);
+                throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
             }
         }
 
         $this->db->commit();
 
-        return $paiement_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
+	 * @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';
+
+        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);
+
+        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');
+            }
+        }
+
+        return [
+            'success' => [
+                'code' => 200,
+                'message' => 'Payment updated'
+            ]
+        ];
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c5bd8a987ac..d1a6abcdec3 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -74,6 +74,11 @@ class FactureRec extends CommonInvoice
 	 */
 	protected $table_ref_field = 'titre';
 
+	/**
+	 * @var string The label of recurring invoice
+	 */
+	public $title;
+
 	public $number;
 	public $date;
 	public $remise;
@@ -199,9 +204,10 @@ class FactureRec extends CommonInvoice
 	 *
 	 * 	@param		User	$user		User object
 	 * 	@param		int		$facid		Id of source invoice
+	 *  @param		int		$notrigger	No trigger
 	 *	@return		int					<0 if KO, id of invoice created if OK
 	 */
-	public function create($user, $facid)
+	public function create($user, $facid, $notrigger = 0)
 	{
 		global $conf;
 
@@ -221,7 +227,6 @@ class FactureRec extends CommonInvoice
 			$this->date_when = null;
 		}
 
-
 		$this->frequency = abs($this->frequency);
 		$this->nb_gen_done = 0;
 		$this->nb_gen_max = empty($this->nb_gen_max) ? 0 : $this->nb_gen_max;
@@ -277,8 +282,8 @@ class FactureRec extends CommonInvoice
 			$sql .= ", ".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
 			$sql .= ", ".(!empty($this->modelpdf) ? ("'".$this->db->escape($this->modelpdf)."'") : "NULL");
 			$sql .= ", '".$this->db->escape($user->id)."'";
-			$sql .= ", ".(!empty($facsrc->fk_project) ? "'".$facsrc->fk_project."'" : "null");
-			$sql .= ", ".(!empty($facsrc->fk_account) ? "'".$facsrc->fk_account."'" : "null");
+			$sql .= ", ".(!empty($facsrc->fk_project) ? "'".$this->db->escape($facsrc->fk_project)."'" : "null");
+			$sql .= ", ".(!empty($facsrc->fk_account) ? "'".$this->db->escape($facsrc->fk_account)."'" : "null");
 			$sql .= ", ".($facsrc->cond_reglement_id > 0 ? $this->db->escape($facsrc->cond_reglement_id) : "null");
 			$sql .= ", ".($facsrc->mode_reglement_id > 0 ? $this->db->escape($facsrc->mode_reglement_id) : "null");
 			$sql .= ", ".$this->usenewprice;
@@ -336,8 +341,7 @@ class FactureRec extends CommonInvoice
 					if ($result_insert < 0)
 					{
 						$error++;
-					}
-					else {
+					} else {
 					    $objectline = new FactureLigneRec($this->db);
 					    if ($objectline->fetch($result_insert))
 					    {
@@ -377,8 +381,7 @@ class FactureRec extends CommonInvoice
 					                $error++;
 					            }
 					        }
-					    }
-					    else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+					    } 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);
@@ -391,25 +394,39 @@ class FactureRec extends CommonInvoice
 					}
 				}
 
+				if (!$error) {
+					$result = $this->insertExtraFields();
+					if ($result < 0)
+					{
+						$error++;
+					}
+				}
+
+				if (!$error && !$notrigger)
+				{
+					// Call trigger
+					$result = $this->call_trigger('BILLREC_CREATE', $user);
+					if ($result < 0)
+					{
+						$this->db->rollback();
+						return -2;
+					}
+					// End call triggers
+				}
+
 				if ($error)
 				{
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 					return $this->id;
 				}
-			}
-			else
-			{
+			} else {
 			    $this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -460,9 +477,7 @@ class FactureRec extends CommonInvoice
 	        }
 	        $this->db->commit();
 	        return 1;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $this->db->lasterror();
 	        $this->db->rollback();
 	        return -2;
@@ -584,16 +599,12 @@ class FactureRec extends CommonInvoice
 					return -3;
 				}
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found sql='.$sql;
 				dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -722,9 +733,7 @@ class FactureRec extends CommonInvoice
 
 			$this->db->free($result);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -3;
 		}
@@ -766,15 +775,11 @@ class FactureRec extends CommonInvoice
 				// Delete extrafields
                 $res = $this->deleteExtraFields();
                 if ($res < 0) $error = -4;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$error = -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$error = -2;
 		}
@@ -783,9 +788,7 @@ class FactureRec extends CommonInvoice
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else
-		{
+		} else {
 	        $this->db->rollback();
 	        return $error;
 		}
@@ -860,9 +863,7 @@ class FactureRec extends CommonInvoice
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -925,7 +926,7 @@ class FactureRec extends CommonInvoice
 			$sql .= ", fk_unit";
 			$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 			$sql .= ") VALUES (";
-			$sql .= "'".$facid."'";
+			$sql .= " ".((int) $facid);
 			$sql .= ", ".(!empty($label) ? "'".$this->db->escape($label)."'" : "null");
 			$sql .= ", '".$this->db->escape($desc)."'";
 			$sql .= ", ".price2num($pu_ht);
@@ -936,7 +937,7 @@ class FactureRec extends CommonInvoice
 			$sql .= ", '".$this->db->escape($localtaxes_type[0])."'";
 			$sql .= ", ".price2num($txlocaltax2);
 			$sql .= ", '".$this->db->escape($localtaxes_type[2])."'";
-			$sql .= ", ".(!empty($fk_product) ? "'".$fk_product."'" : "null");
+			$sql .= ", ".(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : "null");
 			$sql .= ", ".$product_type;
 			$sql .= ", ".price2num($remise_percent);
 			$sql .= ", ".price2num($pu_ht);
@@ -969,9 +970,7 @@ class FactureRec extends CommonInvoice
 				$this->id = $facid;
 				$this->update_price();
 				return $lineId;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
@@ -1045,9 +1044,7 @@ class FactureRec extends CommonInvoice
 	        if ($price_base_type == 'HT')
 	        {
 	            $pu = $pu_ht;
-	        }
-	        else
-	        {
+	        } else {
 	            $pu = $pu_ttc;
 	        }
 
@@ -1091,7 +1088,7 @@ class FactureRec extends CommonInvoice
 	        }
 
 	        $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET ";
-	        $sql .= "fk_facture = '".$facid."'";
+	        $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);
@@ -1102,7 +1099,7 @@ class FactureRec extends CommonInvoice
 		    $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) ? "'".$fk_product."'" : "null");
+		    $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)."'";
@@ -1131,9 +1128,7 @@ class FactureRec extends CommonInvoice
 	            $this->id = $facid;
 	            $this->update_price();
 	            return 1;
-	        }
-	        else
-	        {
+	        } else {
 	            $this->error = $this->db->lasterror();
 	            return -1;
 	        }
@@ -1204,13 +1199,13 @@ class FactureRec extends CommonInvoice
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_rec';
 		$sql .= ' WHERE frequency > 0'; // A recurring invoice is an invoice with a frequency
-		$sql .= " AND (date_when IS NULL OR date_when <= '".$db->idate($today)."')";
+		$sql .= " AND (date_when IS NULL OR date_when <= '".$this->db->idate($today)."')";
 		$sql .= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
 		$sql .= ' AND suspended = 0';
 		$sql .= ' AND entity = '.$conf->entity; // MUST STAY = $conf->entity here
 		if ($restrictioninvoiceid > 0)
 			$sql .= ' AND rowid = '.$restrictioninvoiceid;
-		$sql .= $db->order('entity', 'ASC');
+		$sql .= $this->db->order('entity', 'ASC');
 		//print $sql;exit;
 		$parameters = array(
 			'restrictioninvoiceid' => $restrictioninvoiceid,
@@ -1218,29 +1213,28 @@ class FactureRec extends CommonInvoice
 		);
 		$reshook = $hookmanager->executeHooks('beforeCreationOfRecurringInvoices', $parameters, $sql); // note that $sql might be modified by hooks
 
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$i = 0;
-			$num = $db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 
 			if ($num)
 				$this->output .= $langs->trans("FoundXQualifiedRecurringInvoiceTemplate", $num)."\n";
-			else
-				$this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
+			else $this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
 
 			$saventity = $conf->entity;
 
 			while ($i < $num)     // Loop on each template invoice. If $num = 0, test is false at first pass.
 			{
-				$line = $db->fetch_object($resql);
+				$line = $this->db->fetch_object($resql);
 
-				$db->begin();
+				$this->db->begin();
 
 				$invoiceidgenerated = 0;
 
 				$facture = null;
-				$facturerec = new FactureRec($db);
+				$facturerec = new FactureRec($this->db);
 				$facturerec->fetch($line->rowid);
 
 				if ($facturerec->id > 0)
@@ -1250,7 +1244,7 @@ class FactureRec extends CommonInvoice
 
 					dol_syslog("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref.", entity=".$facturerec->entity);
 
-					$facture = new Facture($db);
+					$facture = new Facture($this->db);
 					$facture->fac_rec = $facturerec->id; // We will create $facture from this recurring invoice
 					$facture->fk_fac_rec_source = $facturerec->id; // We will create $facture from this recurring invoice
 
@@ -1288,9 +1282,7 @@ class FactureRec extends CommonInvoice
 							$error++;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity."\n";
 					$this->errors[] = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity;
@@ -1299,14 +1291,12 @@ class FactureRec extends CommonInvoice
 
 				if (!$error && $invoiceidgenerated >= 0)
 				{
-					$db->commit("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
+					$this->db->commit("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
 					dol_syslog("createRecurringInvoices Process invoice template ".$facturerec->ref." is finished with a success generation");
 					$nb_create++;
 					$this->output .= $langs->trans("InvoiceGeneratedFromTemplate", $facture->ref, $facturerec->ref)."\n";
-				}
-				else
-				{
-					$db->rollback("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
+				} else {
+					$this->db->rollback("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
 				}
 
 				$parameters = array(
@@ -1323,8 +1313,7 @@ class FactureRec extends CommonInvoice
 			}
 
 			$conf->entity = $saventity; // Restore entity context
-		}
-		else dol_print_error($db);
+		} else dol_print_error($this->db);
 
 		$this->output = trim($this->output);
 
@@ -1430,69 +1419,54 @@ class FactureRec extends CommonInvoice
 			{
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans("Draft");
 				}
 			}
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			$prefix = 'Short';
 			if ($recur)
 			{
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$labelStatus = $langs->trans("Draft");
 				}
 			}
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($recur)
 			{
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($recur)
 			{
@@ -1500,25 +1474,20 @@ class FactureRec extends CommonInvoice
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			$prefix = '';
 			if ($recur)
@@ -1526,25 +1495,20 @@ class FactureRec extends CommonInvoice
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		}
-		elseif ($mode == 5 || $mode == 6)
+		} elseif ($mode == 5 || $mode == 6)
 		{
 			$prefix = '';
 			if ($mode == 5) $prefix = 'Short';
@@ -1553,19 +1517,15 @@ class FactureRec extends CommonInvoice
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status4';
 					$labelStatus = $langs->trans('Active');
 				}
-			}
-			else
-			{
+			} else {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
-				}
-				else {
+				} else {
 					$statusType = 'status0';
 					$labelStatus = $langs->trans('Draft');
 				}
@@ -1600,6 +1560,8 @@ class FactureRec extends CommonInvoice
 		$sql = "SELECT rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= $this->db->plimit(100);
+
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1654,16 +1616,14 @@ class FactureRec extends CommonInvoice
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
-				}
-				elseif ($xnbp == 2)    // UP is negative (free line)
+				} elseif ($xnbp == 2)    // UP is negative (free line)
 				{
 					$line->subprice = -100;
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
 					$line->remise_percent = 0;
-				}
-				elseif ($xnbp == 3)    // Discount is 50% (product line)
+				} elseif ($xnbp == 3)    // Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -1671,8 +1631,7 @@ class FactureRec extends CommonInvoice
 					$line->total_ttc = 59.8;
 					$line->total_tva = 9.8;
 					$line->remise_percent = 50;
-				}
-				else    // (product line)
+				} else // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -1761,9 +1720,7 @@ class FactureRec extends CommonInvoice
             $this->frequency = $frequency;
             if (!empty($unit)) $this->unit_frequency = $unit;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1794,9 +1751,7 @@ class FactureRec extends CommonInvoice
             $this->date_when = $date;
             if ($increment_nb_gen_done > 0) $this->nb_gen_done++;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1827,9 +1782,7 @@ class FactureRec extends CommonInvoice
         {
             $this->nb_gen_max = $nb;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1858,9 +1811,7 @@ class FactureRec extends CommonInvoice
         {
             $this->auto_validate = $validate;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1889,9 +1840,7 @@ class FactureRec extends CommonInvoice
         {
             $this->generate_pdf = $validate;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -1920,9 +1869,7 @@ class FactureRec extends CommonInvoice
         {
             $this->modelpdf = $model;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -2067,9 +2014,7 @@ class FactureLigneRec extends CommonInvoiceLine
 
     		$this->db->free($result);
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -3;
     	}
@@ -2149,9 +2094,7 @@ class FactureLigneRec extends CommonInvoiceLine
     		}
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } 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 2e66cd0d240..8ec349c79f4 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -100,13 +100,13 @@ class Facture extends CommonInvoice
 	public $author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_valid;
 
 	public $date; // Date invoice
@@ -153,8 +153,8 @@ class Facture extends CommonInvoice
 	public $mode_reglement_code; // Code in llx_c_paiement
 
 	/**
-     * @var int ID Field to store bank id to use when payment mode is withdraw
-     */
+	 * @var int ID Field to store bank id to use when payment mode is withdraw
+	 */
 	public $fk_bank;
 
 	/**
@@ -175,8 +175,8 @@ class Facture extends CommonInvoice
 
 	// Multicurrency
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_multicurrency;
 
 	public $multicurrency_code;
@@ -323,30 +323,30 @@ class Facture extends CommonInvoice
 	);
 	// END MODULEBUILDER PROPERTIES
 
-    /**
-     * 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 (should not be used. a proforma is an order)
-     */
-    const TYPE_PROFORMA = 4;
+	/**
+	 * Proforma invoice (should not be used. a proforma is an order)
+	 */
+	const TYPE_PROFORMA = 4;
 
 	/**
 	 * Situation invoice
@@ -407,7 +407,7 @@ class Facture extends CommonInvoice
 	 * 	@param	int		$forceduedate	If set, do not recalculate due date from payment condition but force it with value
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-    public function create(User $user, $notrigger = 0, $forceduedate = 0)
+	public function create(User $user, $notrigger = 0, $forceduedate = 0)
 	{
 		global $langs, $conf, $mysoc, $hookmanager;
 		$error = 0;
@@ -458,10 +458,10 @@ class Facture extends CommonInvoice
 		$nextdatewhen = null;
 		$previousdaynextdatewhen = null;
 
-		// Create invoice from a template invoice
+		// Create invoice from a template recurring invoice
 		if ($this->fac_rec > 0)
 		{
-		    $this->fk_fac_rec_source = $this->fac_rec;
+			$this->fk_fac_rec_source = $this->fac_rec;
 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 			$_facrec = new FactureRec($this->db);
@@ -481,8 +481,8 @@ class Facture extends CommonInvoice
 
 			// Fields coming from GUI (priority on template). TODO Value of template should be used as default value on GUI so we can use here always value from GUI
 			$this->fk_project        = GETPOST('projectid', 'int') > 0 ? ((int) GETPOST('projectid', 'int')) : $_facrec->fk_project;
-			$this->note_public       = GETPOST('note_public', 'none') ? GETPOST('note_public', 'none') : $_facrec->note_public;
-			$this->note_private      = GETPOST('note_private', 'none') ? GETPOST('note_private', 'none') : $_facrec->note_private;
+			$this->note_public       = GETPOST('note_public', 'none') ? GETPOST('note_public', 'restricthtml') : $_facrec->note_public;
+			$this->note_private      = GETPOST('note_private', 'none') ? GETPOST('note_private', 'restricthtml') : $_facrec->note_private;
 			$this->modelpdf          = GETPOST('model', 'alpha') ? GETPOST('model', 'alpha') : $_facrec->modelpdf;
 			$this->cond_reglement_id = GETPOST('cond_reglement_id', 'int') > 0 ? ((int) GETPOST('cond_reglement_id', 'int')) : $_facrec->cond_reglement_id;
 			$this->mode_reglement_id = GETPOST('mode_reglement_id', 'int') > 0 ? ((int) GETPOST('mode_reglement_id', 'int')) : $_facrec->mode_reglement_id;
@@ -503,9 +503,9 @@ class Facture extends CommonInvoice
 			$this->ref_client = trim($this->ref_client);
 			$this->note_public = trim($this->note_public);
 			$this->note_private = trim($this->note_private);
-		    $this->note_private = dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
+			$this->note_private = dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->ref));
 
-		    $this->array_options = $_facrec->array_options;
+			$this->array_options = $_facrec->array_options;
 
 			//if (! $this->remise) $this->remise = 0;
 			if (!$this->mode_reglement_id) $this->mode_reglement_id = 0;
@@ -520,12 +520,12 @@ class Facture extends CommonInvoice
 			// For recurring invoices, update date and number of last generation of recurring template invoice, before inserting new invoice
 			if ($_facrec->frequency > 0)
 			{
-			    dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
-			    if (empty($_facrec->date_when)) $_facrec->date_when = $now;
-                $next_date = $_facrec->getNextDate(); // Calculate next date
-                $result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
-                //$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
-                $result = $_facrec->setNextDate($next_date, 1);
+				dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
+				if (empty($_facrec->date_when)) $_facrec->date_when = $now;
+				$next_date = $_facrec->getNextDate(); // Calculate next date
+				$result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
+				//$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
+				$result = $_facrec->setNextDate($next_date, 1);
 			}
 
 			// Define lang of customer
@@ -536,8 +536,8 @@ class Facture extends CommonInvoice
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) $newlang = $this->default_lang; // for thirdparty
 			if (!empty($newlang))
 			{
-			    $outputlangs = new Translate("", $conf);
-			    $outputlangs->setDefaultLang($newlang);
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang($newlang);
 			}
 
 			// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
@@ -567,16 +567,16 @@ class Facture extends CommonInvoice
 		}
 
 		// Define due date if not already defined
-        if (empty($forceduedate)) {
-            $duedate = $this->calculate_date_lim_reglement();
-            /*if ($duedate < 0) {	Regression, a date can be negative if before 1970.
+		if (empty($forceduedate)) {
+			$duedate = $this->calculate_date_lim_reglement();
+			/*if ($duedate < 0) {	Regression, a date can be negative if before 1970.
                 dol_syslog(__METHOD__ . ' Error in calculate_date_lim_reglement. We got ' . $duedate, LOG_ERR);
                 return -1;
             }*/
-            $this->date_lim_reglement = $duedate;
-        } else {
-            $this->date_lim_reglement = $forceduedate;
-        }
+			$this->date_lim_reglement = $duedate;
+		} else {
+			$this->date_lim_reglement = $forceduedate;
+		}
 
 		// Insert into database
 		$socid = $this->socid;
@@ -595,24 +595,24 @@ class Facture extends CommonInvoice
 		$sql .= ", note_private";
 		$sql .= ", note_public";
 		$sql .= ", ref_client, ref_int";
-        $sql .= ", fk_account";
+		$sql .= ", fk_account";
 		$sql .= ", module_source, pos_source, fk_fac_rec_source, fk_facture_source, fk_user_author, fk_projet";
 		$sql .= ", fk_cond_reglement, fk_mode_reglement, date_lim_reglement, model_pdf";
 		$sql .= ", situation_cycle_ref, situation_counter, situation_final";
 		$sql .= ", fk_incoterms, location_incoterms";
-        $sql .= ", fk_multicurrency";
-        $sql .= ", multicurrency_code";
-        $sql .= ", multicurrency_tx";
-        $sql .= ", retained_warranty";
-        $sql .= ", retained_warranty_date_limit";
-        $sql .= ", retained_warranty_fk_cond_reglement";
+		$sql .= ", fk_multicurrency";
+		$sql .= ", multicurrency_code";
+		$sql .= ", multicurrency_tx";
+		$sql .= ", retained_warranty";
+		$sql .= ", retained_warranty_date_limit";
+		$sql .= ", retained_warranty_fk_cond_reglement";
 		$sql .= ")";
 		$sql .= " VALUES (";
 		$sql .= "'(PROV)'";
 		$sql .= ", ".setEntity($this);
 		$sql .= ", ".($this->ref_ext ? "'".$this->db->escape($this->ref_ext)."'" : "null");
 		$sql .= ", '".$this->db->escape($this->type)."'";
-		$sql .= ", '".$socid."'";
+		$sql .= ", ".((int) $socid);
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", ".($this->remise_absolue > 0 ? $this->remise_absolue : 'NULL');
 		$sql .= ", ".($this->remise_percent > 0 ? $this->remise_percent : 'NULL');
@@ -627,7 +627,7 @@ class Facture extends CommonInvoice
 		$sql .= ", ".($this->pos_source != '' ? "'".$this->db->escape($this->pos_source)."'" : "null");
 		$sql .= ", ".($this->fk_fac_rec_source ? "'".$this->db->escape($this->fk_fac_rec_source)."'" : "null");
 		$sql .= ", ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null");
-		$sql .= ", ".($user->id > 0 ? "'".$user->id."'" : "null");
+		$sql .= ", ".($user->id > 0 ? (int) $user->id : "null");
 		$sql .= ", ".($this->fk_project ? $this->fk_project : "null");
 		$sql .= ", ".$this->cond_reglement_id;
 		$sql .= ", ".$this->mode_reglement_id;
@@ -636,7 +636,7 @@ class Facture extends CommonInvoice
 		$sql .= ", ".($this->situation_counter ? "'".$this->db->escape($this->situation_counter)."'" : "null");
 		$sql .= ", ".($this->situation_final ? $this->situation_final : 0);
 		$sql .= ", ".(int) $this->fk_incoterms;
-        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ", ".(int) $this->fk_multicurrency;
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql .= ", ".(double) $this->multicurrency_tx;
@@ -667,28 +667,27 @@ class Facture 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++;
+						}
+					}
 				}
 			}
 
@@ -699,35 +698,34 @@ class Facture extends CommonInvoice
 				$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(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-				    if (count($exp->linkedObjectsIds['commande']) > 0)
-				    {
-				        foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-				        {
-				            $originforcontact = 'commande';
-				            if (is_object($value)) $originidforcontact = $value->id;
-				            else $originidforcontact = $value;
-				            break; // We take first one
-				        }
-				    }
+					require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+					$exp = new Expedition($this->db);
+					$exp->fetch($this->origin_id);
+					$exp->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
+					if (count($exp->linkedObjectsIds['commande']) > 0)
+					{
+						foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
+						{
+							$originforcontact = 'commande';
+							if (is_object($value)) $originidforcontact = $value->id;
+							else $originidforcontact = $value;
+							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 = '".$originforcontact."'";
+				$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))
-				    {
-				        //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);
+					while ($objcontact = $this->db->fetch_object($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);
 			}
 
 			/*
@@ -766,12 +764,12 @@ class Facture extends CommonInvoice
 						$newinvoiceline->fk_parent_line = $fk_parent_line;
 
 						if ($this->type === Facture::TYPE_REPLACEMENT && $newinvoiceline->fk_remise_except) {
-                            $discount = new DiscountAbsolute($this->db);
-                            $discount->fetch($newinvoiceline->fk_remise_except);
+							$discount = new DiscountAbsolute($this->db);
+							$discount->fetch($newinvoiceline->fk_remise_except);
 
-						    $discountId = $soc->set_remise_except($discount->amount_ht, $user, $discount->description, $discount->tva_tx);
-						    $newinvoiceline->fk_remise_except = $discountId;
-                        }
+							$discountId = $soc->set_remise_except($discount->amount_ht, $user, $discount->description, $discount->tva_tx);
+							$newinvoiceline->fk_remise_except = $discountId;
+						}
 
 						$result = $newinvoiceline->insert();
 
@@ -787,8 +785,7 @@ class Facture extends CommonInvoice
 						break;
 					}
 				}
-			}
-			elseif (!$error && empty($this->fac_rec)) 		// If this->lines is an array of invoice line arrays
+			} elseif (!$error && empty($this->fac_rec)) 		// If this->lines is an array of invoice line arrays
 			{
 				$fk_parent_line = 0;
 
@@ -796,13 +793,13 @@ class Facture extends CommonInvoice
 
 				foreach ($this->lines as $i => $val)
 				{
-                	$line = $this->lines[$i];
+					$line = $this->lines[$i];
 
-                	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-				    //if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-                	if (!is_object($line)) $line = (object) $line;
+					// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+					//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
+					if (!is_object($line)) $line = (object) $line;
 
-				    if ($result >= 0)
+					if ($result >= 0)
 					{
 						// Reset fk_parent_line for no child products and special product
 						if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
@@ -821,7 +818,12 @@ class Facture extends CommonInvoice
 							$origintype = $this->element;
 						}
 
-                        $result = $this->addline(
+						// init ref_ext
+						if (empty($line->ref_ext)) {
+							$line->ref_ext = '';
+						}
+
+						$result = $this->addline(
 							$line->desc,
 							$line->subprice,
 							$line->qty,
@@ -840,8 +842,8 @@ class Facture extends CommonInvoice
 							$line->product_type,
 							$line->rang,
 							$line->special_code,
-	                        $origintype,
-	                        $originid,
+							$origintype,
+							$originid,
 							$fk_parent_line,
 							$line->fk_fournprice,
 							$line->pa_ht,
@@ -850,7 +852,8 @@ class Facture extends CommonInvoice
 							$line->situation_percent,
 							$line->fk_prev_id,
 							$line->fk_unit,
-							$line->pu_ht_devise
+							$line->pu_ht_devise,
+							$line->ref_ext
 						);
 						if ($result < 0)
 						{
@@ -899,26 +902,26 @@ class Facture extends CommonInvoice
 					$buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice;
 					// If buyprice not defined from template invoice, we try to guess the best value
 					if (!$buyprice && $_facrec->lines[$i]->fk_product > 0)
-                    {
-                        require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-                        $producttmp = new ProductFournisseur($this->db);
-                        $producttmp->fetch($_facrec->lines[$i]->fk_product);
+					{
+						require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+						$producttmp = new ProductFournisseur($this->db);
+						$producttmp->fetch($_facrec->lines[$i]->fk_product);
 
-                        // If margin module defined on costprice, we try the costprice
-                        // If not defined or if module margin defined and pmp and stock module enabled, we try pmp price
-                        // else we get the best supplier price
-                        if ($conf->global->MARGIN_TYPE == 'costprice' && !empty($producttmp->cost_price)) $buyprice = $producttmp->cost_price;
-                        elseif (!empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && !empty($producttmp->pmp)) $buyprice = $producttmp->pmp;
-                        else {
-                            if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0)
-                            {
-                                if ($producttmp->product_fourn_price_id > 0)
-                                {
-                                    $buyprice = price2num($producttmp->fourn_unitprice * (1 - $producttmp->fourn_remise_percent / 100) + $producttmp->fourn_remise, 'MU');
-                                }
-                            }
-                        }
-                    }
+						// If margin module defined on costprice, we try the costprice
+						// If not defined or if module margin defined and pmp and stock module enabled, we try pmp price
+						// else we get the best supplier price
+						if ($conf->global->MARGIN_TYPE == 'costprice' && !empty($producttmp->cost_price)) $buyprice = $producttmp->cost_price;
+						elseif (!empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && !empty($producttmp->pmp)) $buyprice = $producttmp->pmp;
+						else {
+							if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0)
+							{
+								if ($producttmp->product_fourn_price_id > 0)
+								{
+									$buyprice = price2num($producttmp->fourn_unitprice * (1 - $producttmp->fourn_remise_percent / 100) + $producttmp->fourn_remise, 'MU');
+								}
+							}
+						}
+					}
 
 					$result_insert = $this->addline(
 						$_facrec->lines[$i]->desc,
@@ -942,7 +945,7 @@ class Facture extends CommonInvoice
 						'',
 						0,
 						0,
-					    $fk_product_fournisseur_price,
+						$fk_product_fournisseur_price,
 						$buyprice,
 						$_facrec->lines[$i]->label,
 						empty($_facrec->lines[$i]->array_options) ?null:$_facrec->lines[$i]->array_options,
@@ -971,45 +974,37 @@ class Facture extends CommonInvoice
 					// Actions on extra fields
 					if (!$error)
 					{
-					    $result = $this->insertExtraFields();
-					    if ($result < 0) $error++;
+						$result = $this->insertExtraFields();
+						if ($result < 0) $error++;
 					}
 
-			        if (!$error && !$notrigger)
-			        {
-			            // Call trigger
-			            $result = $this->call_trigger('BILL_CREATE', $user);
-			            if ($result < 0) $error++;
-			            // End call triggers
-			        }
+					if (!$error && !$notrigger)
+					{
+						// Call trigger
+						$result = $this->call_trigger('BILL_CREATE', $user);
+						if ($result < 0) $error++;
+						// End call triggers
+					}
 
 					if (!$error)
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						$this->db->rollback();
 						return -4;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $langs->trans('FailedToUpdatePrice');
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1024,7 +1019,7 @@ class Facture extends CommonInvoice
 	 *	@param		int		$invertdetail	Reverse sign of amounts for lines
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function createFromCurrent(User $user, $invertdetail = 0)
+	public function createFromCurrent(User $user, $invertdetail = 0)
 	{
 		global $conf;
 
@@ -1035,13 +1030,13 @@ class Facture extends CommonInvoice
 		// fetch optionals attributes and labels
 		$this->fetch_optionals();
 
-        if (!empty($this->array_options)) {
-                    $facture->array_options = $this->array_options;
-        }
+		if (!empty($this->array_options)) {
+					$facture->array_options = $this->array_options;
+		}
 
-        foreach ($this->lines as &$line) {
-                    $line->fetch_optionals(); //fetch extrafields
-        }
+		foreach ($this->lines as &$line) {
+					$line->fetch_optionals(); //fetch extrafields
+		}
 
 		$facture->fk_facture_source = $this->fk_facture_source;
 		$facture->type 			    = $this->type;
@@ -1067,9 +1062,9 @@ class Facture extends CommonInvoice
 		$facture->situation_cycle_ref = $this->situation_cycle_ref;
 		$facture->situation_final = $this->situation_final;
 
-        $facture->retained_warranty = $this->retained_warranty;
-        $facture->retained_warranty_fk_cond_reglement = $this->retained_warranty_fk_cond_reglement;
-        $facture->retained_warranty_date_limit = $this->retained_warranty_date_limit;
+		$facture->retained_warranty = $this->retained_warranty;
+		$facture->retained_warranty_fk_cond_reglement = $this->retained_warranty_fk_cond_reglement;
+		$facture->retained_warranty_date_limit = $this->retained_warranty_date_limit;
 
 
 		// Loop on each line of new invoice
@@ -1084,6 +1079,7 @@ class Facture extends CommonInvoice
 				$facture->lines[$i]->total_localtax1 = -$facture->lines[$i]->total_localtax1;
 				$facture->lines[$i]->total_localtax2 = -$facture->lines[$i]->total_localtax2;
 				$facture->lines[$i]->total_ttc = -$facture->lines[$i]->total_ttc;
+				$facture->lines[$i]->ref_ext = '';
 			}
 		}
 
@@ -1094,8 +1090,7 @@ class Facture extends CommonInvoice
 		{
 			$this->error = $facture->error;
 			$this->errors = $facture->errors;
-		}
-		elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
+		} elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
 		{
 			$this->fetchObjectLinked('', '', $this->id, 'facture');
 
@@ -1117,7 +1112,7 @@ class Facture extends CommonInvoice
 	/**
 	 *	Load an object from its id and create a new one in database
 	 *
-     *	@param      User	$user        	User that clone
+	 *	@param      User	$user        	User that clone
 	 *  @param  	int 	$fromid         Id of object to clone
 	 * 	@return		int					    New id of clone
 	 */
@@ -1140,11 +1135,11 @@ class Facture extends CommonInvoice
 
 			if ($objsoc->fetch($this->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_project = '';
-			    $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_project = '';
+				$object->fk_delivery_address = '';
 			}
 
 			// TODO Change product price if multi-prices
@@ -1173,14 +1168,14 @@ class Facture extends CommonInvoice
 		// Loop on each line of new invoice
 		foreach ($object->lines as $i => $line)
 		{
-		    if (($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
+			if (($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
 			{
-			    unset($object->lines[$i]);
-			    unset($object->products[$i]); // Tant que products encore utilise
+				unset($object->lines[$i]);
+				unset($object->products[$i]); // Tant que products encore utilise
 			}
 						// Bloc to update dates of service (month by month only if previously filled at 1d near start or end of month)
 			// If it's a service with start and end dates
-			if (!empty($line->date_start) && !empty($line->date_end) ) {
+			if (!empty($line->date_start) && !empty($line->date_end)) {
 				// Get the dates
 				$start = dol_getdate($line->date_start);
 				$end = dol_getdate($line->date_end);
@@ -1202,6 +1197,8 @@ class Facture extends CommonInvoice
 					$object->lines[$i]->date_end = $newLast;
 				}
 			}
+
+			$object->lines[$i]->ref_ext = ''; // Do not clone ref_ext
 		}
 
 		// Create clone
@@ -1210,13 +1207,13 @@ class Facture extends CommonInvoice
 		if ($result < 0) $error++;
 		else {
 			// copy internal contacts
-		    if ($object->copy_linked_contact($this, 'internal') < 0)
+			if ($object->copy_linked_contact($this, 'internal') < 0)
 				$error++;
 
 			// copy external contacts if same company
 			elseif ($this->socid == $object->socid)
 			{
-			    if ($object->copy_linked_contact($this, 'external') < 0)
+				if ($object->copy_linked_contact($this, 'external') < 0)
 					$error++;
 			}
 		}
@@ -1240,9 +1237,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1255,7 +1250,7 @@ class Facture extends CommonInvoice
 	 *  @param		User			$user				Object user
 	 *  @return     int             					<0 if KO, 0 if nothing done, 1 if OK
 	 */
-    public function createFromOrder($object, User $user)
+	public function createFromOrder($object, User $user)
 	{
 		global $conf, $hookmanager;
 
@@ -1308,7 +1303,7 @@ class Facture extends CommonInvoice
 			$marginInfos			= getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht);
 			$line->pa_ht			= $marginInfos[0];
 
-            // get extrafields from original line
+			// get extrafields from original line
 			$object->lines[$i]->fetch_optionals();
 			foreach ($object->lines[$i]->array_options as $options_key => $value)
 				$line->array_options[$options_key] = $value;
@@ -1325,22 +1320,22 @@ class Facture extends CommonInvoice
 		$this->demand_reason_id     = $object->demand_reason_id;
 		$this->date_livraison       = $object->date_livraison;
 		$this->fk_delivery_address  = $object->fk_delivery_address; // deprecated
-		$this->contact_id           = $object->contactid;
+		$this->contact_id           = $object->contact_id;
 		$this->ref_client           = $object->ref_client;
 
 		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN))
 		{
-		    $this->note_private = $object->note_private;
-            $this->note_public = $object->note_public;
+			$this->note_private = $object->note_private;
+			$this->note_public = $object->note_public;
 		}
 
-        $this->module_source = $object->module_source;
+		$this->module_source = $object->module_source;
 		$this->pos_source = $object->pos_source;
 
 		$this->origin = $object->element;
 		$this->origin_id = $object->id;
 
-        // get extrafields from original line
+		// get extrafields from original line
 		$object->fetch_optionals();
 		foreach ($object->array_options as $options_key => $value)
 			$this->array_options[$options_key] = $value;
@@ -1367,10 +1362,8 @@ class Facture extends CommonInvoice
 			if (!$error)
 			{
 				return 1;
-			}
-			else return -1;
-		}
-		else return -1;
+			} else return -1;
+		} else return -1;
 	}
 
 	/**
@@ -1381,13 +1374,13 @@ class Facture 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     $addlinktonotes  			1=Add link to notes
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @param  string  $target                     Target of link ('', '_self', '_blank', '_parent', '_backoffice', ...)
+	 *  @param	int  	$notooltip		 			1=Disable tooltip
+	 *  @param  int     $addlinktonotes  			1=Add link to notes
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  string  $target                     Target of link ('', '_self', '_blank', '_parent', '_backoffice', ...)
 	 *  @return string 			         			String with URL
 	 */
-    public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $addlinktonotes = 0, $save_lastsearch_value = -1, $target = '')
+	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $addlinktonotes = 0, $save_lastsearch_value = -1, $target = '')
 	{
 		global $langs, $conf, $user, $mysoc;
 
@@ -1398,8 +1391,8 @@ class Facture extends CommonInvoice
 		if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
 		else $url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
 
-        if (!$user->rights->facture->lire)
-            $option = 'nolink';
+		if (!$user->rights->facture->lire)
+			$option = 'nolink';
 
 		if ($option !== 'nolink')
 		{
@@ -1415,56 +1408,56 @@ class Facture extends CommonInvoice
 		if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
 		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
 		if ($this->type == self::TYPE_DEPOSIT) $picto .= 'd'; // Deposit invoice
-        $label = '';
+		$label = '';
 
-        if ($user->rights->facture->lire) {
-            $label = '<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>';
-            if (!empty($this->ref))
-                $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-            if (!empty($this->ref_client))
-                $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
-            if (!empty($this->date))
-              	$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
-            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('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_localtax1) && $this->total_localtax1 != 0)		// We keep test != 0 because $this->total_localtax1 can be '0.00000000'
-            	$label .= '<br><b>'.$langs->transcountry('AmountLT1', $mysoc->country_code).':</b> '.price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_localtax2) && $this->total_localtax2 != 0)
-            	$label .= '<br><b>'.$langs->transcountry('AmountLT2', $mysoc->country_code).':</b> '.price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency);
-            if (!empty($this->total_ttc))
-                $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-    		if ($moretitle) $label .= ' - '.$moretitle;
-    		if (isset($this->statut) && isset($this->alreadypaid)) {
-    			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
-    		}
-        }
+		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>';
+			if (!empty($this->ref))
+				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+			if (!empty($this->ref_client))
+				$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
+			if (!empty($this->date))
+			  	$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
+			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('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+			if (!empty($this->total_localtax1) && $this->total_localtax1 != 0)		// We keep test != 0 because $this->total_localtax1 can be '0.00000000'
+				$label .= '<br><b>'.$langs->transcountry('AmountLT1', $mysoc->country_code).':</b> '.price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
+			if (!empty($this->total_localtax2) && $this->total_localtax2 != 0)
+				$label .= '<br><b>'.$langs->transcountry('AmountLT2', $mysoc->country_code).':</b> '.price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency);
+			if (!empty($this->total_ttc))
+				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+			if ($moretitle) $label .= ' - '.$moretitle;
+			if (isset($this->statut) && isset($this->alreadypaid)) {
+				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
+			}
+		}
 
 		$linkclose = ($target ? ' target="'.$target.'"' : '');
 		if (empty($notooltip) && $user->rights->facture->lire)
 		{
-		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label = $langs->trans("Invoice");
-		        $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("Invoice");
+				$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 ($option == 'nolink') {
-            $linkstart = '';
-            $linkend = '';
-        }
+		if ($option == 'nolink') {
+			$linkstart = '';
+			$linkend = '';
+		}
 
 		$result .= $linkstart;
 		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
@@ -1473,19 +1466,19 @@ class Facture extends CommonInvoice
 
 		if ($addlinktonotes)
 		{
-		    $txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-		    if ($txttoshow)
-		    {
-                //$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
-		    	$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.$txttoshow;
-    		    $result .= ' <span class="note inline-block">';
-    		    $result .= '<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow, 1, 1).'">';
-    		    $result .= img_picto('', 'note');
-    		    $result .= '</a>';
-    		    //$result.=img_picto($langs->trans("ViewNote"),'object_generic');
-    		    //$result.='</a>';
-    		    $result .= '</span>';
-		    }
+			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
+			if ($txttoshow)
+			{
+				//$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
+				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.$txttoshow;
+				$result .= ' <span class="note inline-block">';
+				$result .= '<a href="'.DOL_URL_ROOT.'/compta/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow, 1, 1).'">';
+				$result .= img_picto('', 'note');
+				$result .= '</a>';
+				//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
+				//$result.='</a>';
+				$result .= '</span>';
+			}
 		}
 
 		return $result;
@@ -1523,10 +1516,10 @@ class Facture extends CommonInvoice
 		$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 .= ', f.fk_incoterms, f.location_incoterms';
-        $sql .= ', f.module_source, f.pos_source';
-        $sql .= ", i.libelle as label_incoterms";
-        $sql .= ", f.retained_warranty as retained_warranty, f.retained_warranty_date_limit as retained_warranty_date_limit, f.retained_warranty_fk_cond_reglement as retained_warranty_fk_cond_reglement";
+		$sql .= ', f.fk_incoterms, f.location_incoterms';
+		$sql .= ', f.module_source, f.pos_source';
+		$sql .= ", i.libelle as label_incoterms";
+		$sql .= ", f.retained_warranty as retained_warranty, f.retained_warranty_date_limit as retained_warranty_date_limit, f.retained_warranty_fk_cond_reglement as retained_warranty_fk_cond_reglement";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
@@ -1597,7 +1590,8 @@ class Facture extends CommonInvoice
 				$this->note_public			= $obj->note_public;
 				$this->user_author			= $obj->fk_user_author;
 				$this->user_valid = $obj->fk_user_valid;
-				$this->modelpdf = $obj->model_pdf;
+				$this->model_pdf = $obj->model_pdf;
+				$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;
@@ -1645,23 +1639,19 @@ class Facture extends CommonInvoice
 					return -3;
 				}
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = 'Invoice with id='.$rowid.' or ref='.$ref.' or ref_ext='.$ref_ext.' not found';
 				dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load all detailed lines into this->lines
 	 *
@@ -1673,11 +1663,11 @@ class Facture extends CommonInvoice
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
 		global $langs, $conf;
-        // phpcs:enable
+		// phpcs:enable
 		$this->lines = array();
 
 		$sql = 'SELECT l.rowid, l.fk_facture, l.fk_product, l.fk_parent_line, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
-		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice,';
+		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice, l.ref_ext,';
 		$sql .= ' l.situation_percent, l.fk_prev_id,';
 		$sql .= ' l.rang, l.special_code,';
 		$sql .= ' l.date_start as date_start, l.date_end as date_end,';
@@ -1716,8 +1706,9 @@ class Facture extends CommonInvoice
 				$line->fk_product_type  = $objp->fk_product_type; // Type of product
 				$line->qty              = $objp->qty;
 				$line->subprice         = $objp->subprice;
+				$line->ref_ext          = $objp->ref_ext; // line external ref
 
-                $line->vat_src_code = $objp->vat_src_code;
+				$line->vat_src_code = $objp->vat_src_code;
 				$line->tva_tx           = $objp->tva_tx;
 				$line->localtax1_tx     = $objp->localtax1_tx;
 				$line->localtax2_tx     = $objp->localtax2_tx;
@@ -1760,14 +1751,14 @@ class Facture extends CommonInvoice
 				$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
 				$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
 
-                $line->fetch_optionals();
+				$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;
 
@@ -1775,9 +1766,7 @@ class Facture extends CommonInvoice
 			}
 			$this->db->free($result);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -1789,7 +1778,7 @@ class Facture extends CommonInvoice
 	 *
 	 * @return	void
 	 */
-    public function fetchPreviousNextSituationInvoice()
+	public function fetchPreviousNextSituationInvoice()
 	{
 		global $conf;
 
@@ -1811,15 +1800,13 @@ class Facture extends CommonInvoice
 				$invoice = new Facture($this->db);
 				if ($invoice->fetch($objp->rowid) > 0)
 				{
-				    if ($objp->situation_counter < $this->situation_counter
-				        || ($objp->situation_counter == $this->situation_counter && $objp->rowid < $this->id) // This case appear when there are credit notes
-				       )
+					if ($objp->situation_counter < $this->situation_counter
+						|| ($objp->situation_counter == $this->situation_counter && $objp->rowid < $this->id) // This case appear when there are credit notes
+					   )
 					{
-					    $this->tab_previous_situation_invoice[] = $invoice;
-					}
-					else
-					{
-					    $this->tab_next_situation_invoice[] = $invoice;
+						$this->tab_previous_situation_invoice[] = $invoice;
+					} else {
+						$this->tab_next_situation_invoice[] = $invoice;
 					}
 				}
 			}
@@ -1833,7 +1820,7 @@ class Facture extends CommonInvoice
 	 *      @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;
 
@@ -1842,6 +1829,7 @@ class Facture extends CommonInvoice
 		// Clean parameters
 		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
 		if (isset($this->ref)) $this->ref = trim($this->ref);
+		if (isset($this->ref_ext)) $this->ref_ext = trim($this->ref_ext);
 		if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
 		if (isset($this->increment)) $this->increment = trim($this->increment);
 		if (isset($this->close_code)) $this->close_code = trim($this->close_code);
@@ -1849,7 +1837,7 @@ class Facture extends CommonInvoice
 		if (isset($this->note) || isset($this->note_private)) $this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
 		if (isset($this->note) || isset($this->note_private)) $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
 		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
+		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
 		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 		if (isset($this->retained_warranty)) $this->retained_warranty = floatval($this->retained_warranty);
 
@@ -1860,6 +1848,7 @@ class Facture extends CommonInvoice
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture SET";
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+		$sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
 		$sql .= " type=".(isset($this->type) ? $this->db->escape($this->type) : "null").",";
 		$sql .= " ref_client=".(isset($this->ref_client) ? "'".$this->db->escape($this->ref_client)."'" : "null").",";
 		$sql .= " increment=".(isset($this->increment) ? "'".$this->db->escape($this->increment)."'" : "null").",";
@@ -1934,25 +1923,23 @@ class Facture extends CommonInvoice
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount)
 	 *
 	 *    @param     int	$idremise	Id of absolute 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';
@@ -1988,12 +1975,12 @@ class Facture extends CommonInvoice
 			// Get buy/cost price of invoice that is source of discount
 			if ($remise->fk_facture_source > 0)
 			{
-    			$srcinvoice = new Facture($this->db);
-    			$srcinvoice->fetch($remise->fk_facture_source);
-    			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php'; // TODO Move this into commonobject
-    			$formmargin = new FormMargin($this->db);
-    			$arraytmp = $formmargin->getMarginInfosArray($srcinvoice, false);
-        		$facligne->pa_ht = $arraytmp['pa_total'];
+				$srcinvoice = new Facture($this->db);
+				$srcinvoice->fetch($remise->fk_facture_source);
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php'; // TODO Move this into commonobject
+				$formmargin = new FormMargin($this->db);
+				$arraytmp = $formmargin->getMarginInfosArray($srcinvoice, false);
+				$facligne->pa_ht = $arraytmp['pa_total'];
 			}
 
 			$facligne->total_ht  = -$remise->amount_ht;
@@ -2022,29 +2009,23 @@ class Facture extends CommonInvoice
 
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->error = $facligne->error;
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $facligne->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -3;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set customer ref
 	 *
@@ -2052,10 +2033,10 @@ class Facture extends CommonInvoice
 	 *  @param     	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-    public function set_ref_client($ref_client, $notrigger = 0)
+	public function set_ref_client($ref_client, $notrigger = 0)
 	{
-        // phpcs:enable
-	    global $user;
+		// phpcs:enable
+		global $user;
 
 		$error = 0;
 
@@ -2064,8 +2045,7 @@ class Facture extends CommonInvoice
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 		if (empty($ref_client))
 			$sql .= ' SET ref_client = NULL';
-		else
-			$sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
+		else $sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
@@ -2095,9 +2075,7 @@ class Facture extends CommonInvoice
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -2116,7 +2094,7 @@ class Facture extends CommonInvoice
 	 *	@param		int		$idwarehouse	Id warehouse to use for stock change.
 	 *	@return		int						<0 if KO, 0=Refused, >0 if OK
 	 */
-    public function delete($user, $notrigger = 0, $idwarehouse = -1)
+	public function delete($user, $notrigger = 0, $idwarehouse = -1)
 	{
 		global $langs, $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -2136,10 +2114,10 @@ class Facture extends CommonInvoice
 
 		if (!$error && !$notrigger)
 		{
-            // Call trigger
-            $result = $this->call_trigger('BILL_DELETE', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('BILL_DELETE', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 		}
 
 		// Removed extrafields
@@ -2211,7 +2189,7 @@ class Facture extends CommonInvoice
 				}
 			}
 
-            // Invoice line extrafileds
+			// Invoice line extrafileds
 			$main = MAIN_DB_PREFIX.'facturedet';
 			$ef = $main."_extrafields";
 			$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture = $rowid)";
@@ -2264,29 +2242,23 @@ class Facture extends CommonInvoice
 
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." sql=".$sql;
 					$this->db->rollback();
 					return -6;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." sql=".$sql;
 				$this->db->rollback();
 				return -4;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag the invoice as paid completely (if close_code is filled) => this->fk_statut=2, this->paye=1
 	 *  or partialy (if close_code filled) + appel trigger BILL_PAYED => this->fk_statut=2, this->paye stay 0
@@ -2296,9 +2268,9 @@ class Facture extends CommonInvoice
 	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet (cas escompte par exemple)
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function set_paid($user, $close_code = '', $close_note = '')
+	public function set_paid($user, $close_code = '', $close_note = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 
 		if ($this->paye != 1)
@@ -2321,13 +2293,11 @@ class Facture extends CommonInvoice
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-	            // Call trigger
-	            $result = $this->call_trigger('BILL_PAYED', $user);
-	            if ($result < 0) $error++;
-	            // End call triggers
-			}
-			else
-			{
+				// Call trigger
+				$result = $this->call_trigger('BILL_PAYED', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
@@ -2336,21 +2306,17 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
 	 *	Fonction utilisee quand un paiement prelevement est refuse,
@@ -2359,9 +2325,9 @@ class Facture extends CommonInvoice
 	 *  @param	User	$user       Object user that change status
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-    public function set_unpaid($user)
+	public function set_unpaid($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$error = 0;
 
 		$this->db->begin();
@@ -2376,13 +2342,11 @@ class Facture extends CommonInvoice
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-            // Call trigger
-            $result = $this->call_trigger('BILL_UNPAYED', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-		}
-		else
-		{
+			// Call trigger
+			$result = $this->call_trigger('BILL_UNPAYED', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		} else {
 			$error++;
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
@@ -2392,16 +2356,14 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Tag invoice as canceled, with no payment on it (example for replacement invoice or payment never received) + call trigger BILL_CANCEL
 	 *	Warning, if option to decrease stock on invoice was set, this function does not change stock (it might be a cancel because
@@ -2412,9 +2374,9 @@ class Facture extends CommonInvoice
 	 *	@param	string	$close_note		Comment
 	 *	@return int         			<0 if KO, >0 if OK
 	 */
-    public function set_canceled($user, $close_code = '', $close_note = '')
+	public function set_canceled($user, $close_code = '', $close_note = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 
 		dol_syslog(get_class($this)."::set_canceled rowid=".$this->id, LOG_DEBUG);
 
@@ -2438,27 +2400,23 @@ class Facture extends CommonInvoice
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-	            // Call trigger
-	            $result = $this->call_trigger('BILL_CANCEL', $user);
-	            if ($result < 0)
-	            {
+				// Call trigger
+				$result = $this->call_trigger('BILL_CANCEL', $user);
+				if ($result < 0)
+				{
 					$this->db->rollback();
 					return -1;
 				}
-	            // End call triggers
+				// End call triggers
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -2;
@@ -2473,11 +2431,11 @@ class Facture extends CommonInvoice
 	 * @param   string	$force_number	Reference to force on invoice
 	 * @param	int		$idwarehouse	Id of warehouse to use for stock decrease if option to decreasenon stock is on (0=no decrease)
 	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 * @param	int		$batch_rule		[=0] 0 not decrement batch, else batch rule to use
+	 * @param	int		$batch_rule		0=do not decrement batch, else batch rule to use
 	 *                                 	1=take in batches ordered by sellby and eatby dates
-     * @return	int						<0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK
+	 * @return	int						<0 if KO, 0=Nothing done because invoice is not a draft, >0 if OK
 	 */
-    public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0, $batch_rule = 0)
+	public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0, $batch_rule = 0)
 	{
 		global $conf, $langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -2508,12 +2466,12 @@ class Facture extends CommonInvoice
 		}
 		if (count($this->lines) <= 0)
 		{
-        	$langs->load("errors");
+			$langs->load("errors");
 			$this->error = $langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
 			return -1;
 		}
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
 		{
 			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.$conf->global->MAIN_USE_ADVANCED_PERMS, LOG_ERR);
@@ -2567,8 +2525,7 @@ class Facture extends CommonInvoice
 		if ($force_number)
 		{
 			$num = $force_number;
-		}
-		elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 		{
 			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
 			{
@@ -2576,9 +2533,7 @@ class Facture extends CommonInvoice
 				$this->date_lim_reglement = $this->calculate_date_lim_reglement();
 			}
 			$num = $this->getNextNumRef($this->thirdparty);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -2728,10 +2683,10 @@ class Facture extends CommonInvoice
 			// Trigger calls
 			if (!$error && !$notrigger)
 			{
-	            // Call trigger
-	            $result = $this->call_trigger('BILL_VALIDATE', $user);
-	            if ($result < 0) $error++;
-	            // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('BILL_VALIDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
 			}
 
 			if (!$error)
@@ -2759,16 +2714,16 @@ class Facture extends CommonInvoice
 						if (@rename($dirsource, $dirdest))
 						{
 							dol_syslog("Rename ok");
-	                        // Rename docs starting with $oldref with $newref
-	                        $listoffiles = dol_dir_list($conf->facture->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->facture->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);
+							}
 						}
 					}
 				}
@@ -2792,24 +2747,22 @@ class Facture extends CommonInvoice
 				$this->date_validation = $now;
 				$i = 0;
 
-                if (!empty($conf->global->INVOICE_USE_SITUATION))
-                {
-                	$final = true;
-    				$nboflines = count($this->lines);
-    				while (($i < $nboflines) && $final) {
-    					$final = ($this->lines[$i]->situation_percent == 100);
-    					$i++;
-    				}
+				if (!empty($conf->global->INVOICE_USE_SITUATION))
+				{
+					$final = true;
+					$nboflines = count($this->lines);
+					while (($i < $nboflines) && $final) {
+						$final = ($this->lines[$i]->situation_percent == 100);
+						$i++;
+					}
 
-    				if (empty($final)) $this->situation_final = 0;
-    				else $this->situation_final = 1;
+					if (empty($final)) $this->situation_final = 0;
+					else $this->situation_final = 1;
 
-				    $this->setFinal($user);
-                }
+					$this->setFinal($user);
+				}
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 		}
 
@@ -2817,9 +2770,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -2831,7 +2782,7 @@ class Facture extends CommonInvoice
 	 * @param	Translate	$langs	Translate object
 	 * @return bool		false if KO, true if OK
 	 */
-    public function updatePriceNextInvoice(&$langs)
+	public function updatePriceNextInvoice(&$langs)
 	{
 		foreach ($this->tab_next_situation_invoice as $next_invoice)
 		{
@@ -2875,7 +2826,7 @@ class Facture extends CommonInvoice
 	 */
 	public function setDraft($user, $idwarehouse = -1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$error = 0;
@@ -2946,15 +2897,11 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -2998,39 +2945,41 @@ class Facture extends CommonInvoice
 	 *  @param      int         $fk_prev_id         Previous situation line id reference
 	 *  @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @param		double		$pu_ht_devise		Unit price in currency
+	 *  @param		string		$ref_ext		    External reference of the line
 	 *  @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,
-        $date_start = '',
-        $date_end = '',
-        $ventil = 0,
-        $info_bits = 0,
-        $fk_remise_except = '',
-        $price_base_type = 'HT',
-        $pu_ttc = 0,
-        $type = self::TYPE_STANDARD,
-        $rang = -1,
-        $special_code = 0,
-        $origin = '',
-        $origin_id = 0,
-        $fk_parent_line = 0,
-        $fk_fournprice = null,
-        $pa_ht = 0,
-        $label = '',
-        $array_options = 0,
-        $situation_percent = 100,
-        $fk_prev_id = 0,
-        $fk_unit = null,
-        $pu_ht_devise = 0
-    ) {
+	public function addline(
+		$desc,
+		$pu_ht,
+		$qty,
+		$txtva,
+		$txlocaltax1 = 0,
+		$txlocaltax2 = 0,
+		$fk_product = 0,
+		$remise_percent = 0,
+		$date_start = '',
+		$date_end = '',
+		$ventil = 0,
+		$info_bits = 0,
+		$fk_remise_except = '',
+		$price_base_type = 'HT',
+		$pu_ttc = 0,
+		$type = self::TYPE_STANDARD,
+		$rang = -1,
+		$special_code = 0,
+		$origin = '',
+		$origin_id = 0,
+		$fk_parent_line = 0,
+		$fk_fournprice = null,
+		$pa_ht = 0,
+		$label = '',
+		$array_options = 0,
+		$situation_percent = 100,
+		$fk_prev_id = 0,
+		$fk_unit = null,
+		$pu_ht_devise = 0,
+		$ref_ext = ''
+	) {
 		// Deprecation warning
 		if ($label) {
 			dol_syslog(__METHOD__.": using line label is deprecated", LOG_WARNING);
@@ -3057,6 +3006,7 @@ class Facture extends CommonInvoice
 			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
 			if (empty($fk_prev_id)) $fk_prev_id = 'null';
 			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+			if (empty($ref_ext)) $ref_ext = '';
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
@@ -3073,9 +3023,7 @@ class Facture extends CommonInvoice
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -3098,8 +3046,8 @@ class Facture extends CommonInvoice
 				$product_type = $product->type;
 
 				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
-                    $langs->load("errors");
-				    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
+					$langs->load("errors");
+					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -3132,8 +3080,8 @@ class Facture extends CommonInvoice
 
 			// MultiCurrency
 			$multicurrency_total_ht = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
 			// Rank to use
@@ -3152,6 +3100,7 @@ class Facture extends CommonInvoice
 			$this->line->fk_facture = $this->id;
 			$this->line->label = $label; // deprecated
 			$this->line->desc = $desc;
+			$this->line->ref_ext = $ref_ext;
 
 			$this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ?abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
 			$this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
@@ -3196,8 +3145,8 @@ class Facture extends CommonInvoice
 			$this->line->multicurrency_code = $this->multicurrency_code;
 			$this->line->multicurrency_subprice		= $pu_ht_devise;
 			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				$this->line->array_options = $array_options;
@@ -3216,23 +3165,17 @@ class Facture extends CommonInvoice
 				{
 					$this->db->commit();
 					return $this->line->id;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::addline status of invoice must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -3260,14 +3203,15 @@ class Facture extends CommonInvoice
 	 * 	@param		int			$pa_ht				Price (without tax) of product when it was bought
 	 * 	@param		string		$label				Label of the line (deprecated, do not use)
 	 * 	@param		int			$special_code		Special code (also used by externals modules!)
-     *  @param		array		$array_options		extrafields array
+	 *  @param		array		$array_options		extrafields array
 	 * 	@param      int         $situation_percent  Situation advance percentage
 	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 * 	@param		int			$notrigger			disable line update trigger
+	 *  @param		string		$ref_ext		    External reference of the line
 	 *  @return    	int             				< 0 if KO, > 0 if OK
 	 */
-    public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = self::TYPE_STANDARD, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0)
+	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = self::TYPE_STANDARD, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $ref_ext = '')
 	{
 		global $conf, $user;
 		// Deprecation warning
@@ -3305,11 +3249,12 @@ class Facture extends CommonInvoice
 			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
 			if (empty($special_code) || $special_code == 3) $special_code = 0;
 			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
+			if (empty($ref_ext)) $ref_ext = '';
 
 			$remise_percent = price2num($remise_percent);
 			$qty			= price2num($qty);
 			$pu 			= price2num($pu);
-        	$pu_ht_devise = price2num($pu_ht_devise);
+			$pu_ht_devise = price2num($pu_ht_devise);
 			$pa_ht			= price2num($pa_ht);
 			$txtva			= price2num($txtva);
 			$txlocaltax1	= price2num($txlocaltax1);
@@ -3325,12 +3270,12 @@ class Facture extends CommonInvoice
 			$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.
-    		}
+			$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, $situation_percent, $this->multicurrency_tx, $pu_ht_devise);
 
@@ -3345,8 +3290,8 @@ class Facture extends CommonInvoice
 
 			// MultiCurrency
 			$multicurrency_total_ht = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
 			// Old properties: $price, $remise (deprecated)
@@ -3371,8 +3316,8 @@ class Facture extends CommonInvoice
 				$product_type = $product->type;
 
 				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE) && $product_type == 0 && $product->stock_reel < $qty) {
-                    $langs->load("errors");
-				    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
+					$langs->load("errors");
+					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnInvoice', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -3382,7 +3327,7 @@ class Facture extends CommonInvoice
 
 			$line->oldline = $staticline;
 			$this->line = $line;
-            $this->line->context = $this->context;
+			$this->line->context = $this->context;
 
 			// Reorder if fk_parent_line change
 			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
@@ -3395,6 +3340,7 @@ class Facture extends CommonInvoice
 			$this->line->rowid				= $rowid;
 			$this->line->label				= $label;
 			$this->line->desc = $desc;
+			$this->line->ref_ext = $ref_ext;
 			$this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ?abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
 
 			$this->line->vat_src_code = $vat_src_code;
@@ -3405,7 +3351,7 @@ class Facture extends CommonInvoice
 			$this->line->localtax2_type		= $localtaxes_type[2];
 
 			$this->line->remise_percent		= $remise_percent;
-			$this->line->subprice			= ($this->type == 2 ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
+			$this->line->subprice			= ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
 			$this->line->date_start = $date_start;
 			$this->line->date_end			= $date_end;
 			$this->line->total_ht			= (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
@@ -3447,16 +3393,12 @@ class Facture extends CommonInvoice
 				$this->update_price(1);
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
-			    $this->error = $this->line->error;
+			} else {
+				$this->error = $this->line->error;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = "Invoice statut makes operation forbidden";
 			return -2;
 		}
@@ -3469,7 +3411,7 @@ class Facture extends CommonInvoice
 	 * @param	float	$situation_percent	progress percentage need to be test
 	 * @return false if KO, true if OK
 	 */
-    public function checkProgressLine($idline, $situation_percent)
+	public function checkProgressLine($idline, $situation_percent)
 	{
 		$sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd
 				INNER JOIN '.MAIN_DB_PREFIX.'facture f ON (fd.fk_facture = f.rowid)
@@ -3489,7 +3431,7 @@ class Facture extends CommonInvoice
 		else return $situation_percent < $obj->situation_percent;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Update invoice line with percentage
 	 *
@@ -3497,16 +3439,16 @@ class Facture extends CommonInvoice
 	 * @param  int          $percent    Percentage
 	 * @return void
 	 */
-    public function update_percent($line, $percent)
+	public function update_percent($line, $percent)
 	{
-        // phpcs:enable
-	    global $mysoc, $user;
+		// phpcs:enable
+		global $mysoc, $user;
 
-	    // Progress should never be changed for discount lines
-	    if (($line->info_bits & 2) == 2)
-	    {
-	    	return;
-	    }
+		// Progress should never be changed for discount lines
+		if (($line->info_bits & 2) == 2)
+		{
+			return;
+		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -3532,9 +3474,9 @@ class Facture extends CommonInvoice
 	 *	@param		int		$rowid		Id of line to delete
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-    public function deleteline($rowid)
+	public function deleteline($rowid)
 	{
-        global $user;
+		global $user;
 
 		dol_syslog(get_class($this)."::deleteline rowid=".$rowid, LOG_DEBUG);
 
@@ -3562,7 +3504,7 @@ class Facture extends CommonInvoice
 
 		$line = new FactureLigne($this->db);
 
-        $line->context = $this->context;
+		$line->context = $this->context;
 
 		// For triggers
 		$result = $line->fetch($rowid);
@@ -3576,23 +3518,19 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $line->error;
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set percent discount
 	 *
@@ -3601,9 +3539,9 @@ class Facture extends CommonInvoice
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 		<0 if ko, >0 if ok
 	 */
-    public function set_remise($user, $remise, $notrigger = 0)
+	public function set_remise($user, $remise, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Clean parameters
 		if (empty($remise)) $remise = 0;
 
@@ -3643,9 +3581,7 @@ class Facture extends CommonInvoice
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3658,7 +3594,7 @@ class Facture extends CommonInvoice
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set absolute discount
 	 *
@@ -3667,9 +3603,9 @@ class Facture extends CommonInvoice
 	 *  @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
 		if (empty($remise)) $remise = 0;
 
 		if ($user->rights->facture->creer)
@@ -3712,9 +3648,7 @@ class Facture extends CommonInvoice
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				foreach ($this->errors as $errmsg)
 				{
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -3734,7 +3668,7 @@ class Facture extends CommonInvoice
 	 *      @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, $langs;
 
@@ -3832,7 +3766,7 @@ class Facture extends CommonInvoice
 	 *	@param  int		$id		Id of object to load
 	 *	@return	void
 	 */
-    public function info($id)
+	public function info($id)
 	{
 		$sql = 'SELECT c.rowid, datec, date_valid as datev, tms as datem,';
 		$sql .= ' date_closing as dateclosing,';
@@ -3872,15 +3806,13 @@ class Facture extends CommonInvoice
 				$this->date_closing      = $this->db->jdate($obj->dateclosing);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of invoices (eventually filtered on a user) into an array
 	 *
@@ -3894,9 +3826,9 @@ class Facture extends CommonInvoice
 	 *  @param    	string	$sortorder		Sort order
 	 *  @return     array|int             	-1 if KO, array with result if OK
 	 */
-    public function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'f.datef,f.rowid', $sortorder = 'DESC')
+	public function liste_array($shortlist = 0, $draft = 0, $excluser = '', $socid = 0, $limit = 0, $offset = 0, $sortfield = 'f.datef,f.rowid', $sortorder = 'DESC')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		$ga = array();
@@ -3932,13 +3864,10 @@ class Facture extends CommonInvoice
 					if ($shortlist == 1)
 					{
 						$ga[$obj->fid] = $obj->ref;
-					}
-					elseif ($shortlist == 2)
+					} elseif ($shortlist == 2)
 					{
 						$ga[$obj->fid] = $obj->ref.' ('.$obj->name.')';
-					}
-					else
-					{
+					} else {
 						$ga[$i]['id'] = $obj->fid;
 						$ga[$i]['ref'] 	= $obj->ref;
 						$ga[$i]['name'] = $obj->name;
@@ -3947,16 +3876,14 @@ class Facture extends CommonInvoice
 				}
 			}
 			return $ga;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of invoices qualified to be replaced by another invoice.
 	 *	Invoices matching the following rules are returned:
@@ -3965,9 +3892,9 @@ class Facture extends CommonInvoice
 	 *	@param		int		$socid		Id thirdparty
 	 *	@return    	array|int			Array of invoices ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
 	 */
-    public function list_replacable_invoices($socid = 0)
+	public function list_replacable_invoices($socid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$return = array();
@@ -3997,16 +3924,14 @@ class Facture extends CommonInvoice
 			}
 			//print_r($return);
 			return $return;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of invoices qualified to be corrected by a credit note.
 	 *	Invoices matching the following rules are returned:
@@ -4015,9 +3940,9 @@ class Facture extends CommonInvoice
 	 *	@param		int		$socid		Id thirdparty
 	 *	@return    	array				Array of invoices ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
 	 */
-    public function list_qualified_avoir_invoices($socid = 0)
+	public function list_qualified_avoir_invoices($socid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$return = array();
@@ -4036,19 +3961,17 @@ class Facture extends CommonInvoice
 		$sql .= " AND f.type != ".self::TYPE_CREDIT_NOTE; // Type non 2 si facture non avoir
 
 		if (!empty($conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE)) {
-		    // Select the last situation invoice
-		    $sqlSit = 'SELECT MAX(fs.rowid)';
-		    $sqlSit .= " FROM ".MAIN_DB_PREFIX."facture as fs";
-		    $sqlSit .= " WHERE fs.entity IN (".getEntity('invoice').")";
-		    $sqlSit .= " AND fs.type = ".self::TYPE_SITUATION;
-		    $sqlSit .= " AND fs.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
-		    $sqlSit .= " GROUP BY fs.situation_cycle_ref";
-		    $sqlSit .= " ORDER BY fs.situation_counter";
-            $sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$sqlSit.") )"; // Type non 5 si facture non avoir
-		}
-		else
-		{
-		    $sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
+			// Select the last situation invoice
+			$sqlSit = 'SELECT MAX(fs.rowid)';
+			$sqlSit .= " FROM ".MAIN_DB_PREFIX."facture as fs";
+			$sqlSit .= " WHERE fs.entity IN (".getEntity('invoice').")";
+			$sqlSit .= " AND fs.type = ".self::TYPE_SITUATION;
+			$sqlSit .= " AND fs.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
+			$sqlSit .= " GROUP BY fs.situation_cycle_ref";
+			$sqlSit .= " ORDER BY fs.situation_counter";
+			$sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$sqlSit.") )"; // Type non 5 si facture non avoir
+		} else {
+			$sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
 		}
 
 		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
@@ -4072,25 +3995,23 @@ class Facture extends CommonInvoice
 			}
 
 			return $return;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *	@param  User		$user    	Object user
 	 *	@return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
 	 */
-    public function load_board($user)
+	public function load_board($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$clause = " WHERE";
@@ -4138,9 +4059,7 @@ class Facture extends CommonInvoice
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4155,7 +4074,7 @@ class Facture extends CommonInvoice
 	 *
 	 *	@return     array       Liste des id contacts facturation
 	 */
-    public function getIdBillingContact()
+	public function getIdBillingContact()
 	{
 		return $this->getIdContact('external', 'BILLING');
 	}
@@ -4165,7 +4084,7 @@ class Facture extends CommonInvoice
 	 *
 	 *	@return     array       Liste des id contacts livraison
 	 */
-    public function getIdShippingContact()
+	public function getIdShippingContact()
 	{
 		return $this->getIdContact('external', 'SHIPPING');
 	}
@@ -4179,7 +4098,7 @@ class Facture extends CommonInvoice
 	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
 	 *  @return	void
 	 */
-    public function initAsSpecimen($option = '')
+	public function initAsSpecimen($option = '')
 	{
 		global $conf, $langs;
 
@@ -4187,12 +4106,14 @@ class Facture 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();
 		$sql = "SELECT rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= $this->db->plimit(100);
+
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -4260,8 +4181,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				}
-				elseif ($xnbp == 2)    // UP is negative (free line)
+				} elseif ($xnbp == 2)    // UP is negative (free line)
 				{
 					$line->subprice = -100;
 					$line->total_ht = -100;
@@ -4271,8 +4191,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				}
-				elseif ($xnbp == 3)    // Discount is 50% (product line)
+				} elseif ($xnbp == 3)    // Discount is 50% (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -4283,8 +4202,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ttc = 119.6;
 					$line->multicurrency_total_tva = 19.6;
 					$line->remise_percent = 50;
-				}
-				else    // (product line)
+				} else // (product line)
 				{
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
@@ -4335,15 +4253,15 @@ class Facture extends CommonInvoice
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *      @return         int     <0 if KO, >0 if OK
 	 */
-    public function load_state_board()
+	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		$this->nb = array();
@@ -4368,11 +4286,9 @@ class Facture extends CommonInvoice
 			{
 				$this->nb["invoices"] = $obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -4384,9 +4300,9 @@ class Facture extends CommonInvoice
 	 *
 	 * 	@return int		>0 if OK, <0 if KO
 	 */
-    public function getLinesArray()
+	public function getLinesArray()
 	{
-	    return $this->fetch_lines();
+		return $this->fetch_lines();
 	}
 
 	/**
@@ -4431,7 +4347,7 @@ class Facture extends CommonInvoice
 	 *
 	 * @return int >= 1 if OK, -1 if error
 	 */
-    public function newCycle()
+	public function newCycle()
 	{
 		$sql = 'SELECT max(situation_cycle_ref) FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql .= " WHERE f.entity IN (".getEntity('invoice', 0).")";
@@ -4454,27 +4370,27 @@ class Facture extends CommonInvoice
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Checks if the invoice is the first of a cycle
 	 *
 	 * @return boolean
 	 */
-    public function is_first()
+	public function is_first()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return ($this->situation_counter == 1);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Returns an array containing the previous situations as Facture objects
 	 *
 	 * @return mixed -1 if error, array of previous situations
 	 */
-    public function get_prev_sits()
+	public function get_prev_sits()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture';
@@ -4506,7 +4422,7 @@ class Facture extends CommonInvoice
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 				<0 if KO, >0 if OK
 	 */
-    public function setFinal(User $user, $notrigger = 0)
+	public function setFinal(User $user, $notrigger = 0)
 	{
 		$error = 0;
 
@@ -4534,9 +4450,7 @@ class Facture extends CommonInvoice
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
@@ -4547,15 +4461,15 @@ class Facture extends CommonInvoice
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Checks if the invoice is the last in its cycle
 	 *
 	 * @return bool Last of the cycle status
 	 */
-    public function is_last_in_cycle()
+	public function is_last_in_cycle()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (!empty($this->situation_cycle_ref)) {
@@ -4613,24 +4527,21 @@ class Facture extends CommonInvoice
 		$hasDelay = $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay);
 		if ($hasDelay && !empty($this->retained_warranty) && !empty($this->retained_warranty_date_limit))
 		{
-		    $totalpaye = $this->getSommePaiement();
-		    $totalpaye = floatval($totalpaye);
-		    $RetainedWarrantyAmount = $this->getRetainedWarrantyAmount();
-		    if ($totalpaye >= 0 && $RetainedWarrantyAmount >= 0)
-		    {
-		        if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay))
-		        {
-		            $hasDelay = 1;
-		        }
-		        elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay))
-		        {
-		            $hasDelay = 1;
-		        }
-		        else
-		        {
-		            $hasDelay = 0;
-		        }
-		    }
+			$totalpaye = $this->getSommePaiement();
+			$totalpaye = floatval($totalpaye);
+			$RetainedWarrantyAmount = $this->getRetainedWarrantyAmount();
+			if ($totalpaye >= 0 && $RetainedWarrantyAmount >= 0)
+			{
+				if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay))
+				{
+					$hasDelay = 1;
+				} elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay))
+				{
+					$hasDelay = 1;
+				} else {
+					$hasDelay = 0;
+				}
+			}
 		}
 
 		return $hasDelay;
@@ -4681,48 +4592,45 @@ class Facture extends CommonInvoice
 	public function getRetainedWarrantyAmount($rounding = -1)
 	{
 		global $conf;
-	    if (empty($this->retained_warranty)) {
-	        return -1;
-	    }
+		if (empty($this->retained_warranty)) {
+			return -1;
+		}
 
-	    $retainedWarrantyAmount = 0;
+		$retainedWarrantyAmount = 0;
 
-	    // Billed - retained warranty
-	    if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION))
-	    {
-	        $displayWarranty = true;
-	        // Check if this situation invoice is 100% for real
-	        if (!empty($this->lines)) {
-	            foreach ($this->lines as $i => $line) {
-	                if ($line->product_type < 2 && $line->situation_percent < 100) {
-	                    $displayWarranty = false;
-	                    break;
-	            	}
-	            }
-	        }
+		// Billed - retained warranty
+		if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION))
+		{
+			$displayWarranty = true;
+			// Check if this situation invoice is 100% for real
+			if (!empty($this->lines)) {
+				foreach ($this->lines as $i => $line) {
+					if ($line->product_type < 2 && $line->situation_percent < 100) {
+						$displayWarranty = false;
+						break;
+					}
+				}
+			}
 
-	        if ($displayWarranty && !empty($this->situation_final))
-	        {
-	            $this->fetchPreviousNextSituationInvoice();
-	            $TPreviousIncoice = $this->tab_previous_situation_invoice;
+			if ($displayWarranty && !empty($this->situation_final))
+			{
+				$this->fetchPreviousNextSituationInvoice();
+				$TPreviousIncoice = $this->tab_previous_situation_invoice;
 
-	            $total2BillWT = 0;
-	            foreach ($TPreviousIncoice as &$fac) {
-	                $total2BillWT += $fac->total_ttc;
-	            }
-	            $total2BillWT += $this->total_ttc;
+				$total2BillWT = 0;
+				foreach ($TPreviousIncoice as &$fac) {
+					$total2BillWT += $fac->total_ttc;
+				}
+				$total2BillWT += $this->total_ttc;
 
-	            $retainedWarrantyAmount = $total2BillWT * $this->retained_warranty / 100;
-	        }
-	        else {
-	            return -1;
-	        }
-	    }
-	    else
-	    {
-	        // Because one day retained warranty could be used on standard invoices
-	        $retainedWarrantyAmount = $this->total_ttc * $this->retained_warranty / 100;
-	    }
+				$retainedWarrantyAmount = $total2BillWT * $this->retained_warranty / 100;
+			} else {
+				return -1;
+			}
+		} else {
+			// Because one day retained warranty could be used on standard invoices
+			$retainedWarrantyAmount = $this->total_ttc * $this->retained_warranty / 100;
+		}
 
 		if ($rounding < 0) {
 			$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
@@ -4732,7 +4640,7 @@ class Facture extends CommonInvoice
 			return round($retainedWarrantyAmount, $rounding);
 		}
 
-	    return $retainedWarrantyAmount;
+		return $retainedWarrantyAmount;
 	}
 
 	/**
@@ -4743,32 +4651,28 @@ class Facture extends CommonInvoice
 	 */
 	public function setRetainedWarranty($value)
 	{
-	    dol_syslog(get_class($this).'::setRetainedWarranty('.$value.')');
-	    if ($this->statut >= 0)
-	    {
-	        $fieldname = 'retained_warranty';
-	        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-	        $sql .= ' SET '.$fieldname.' = '.floatval($value);
-	        $sql .= ' WHERE rowid='.$this->id;
+		dol_syslog(get_class($this).'::setRetainedWarranty('.$value.')');
+		if ($this->statut >= 0)
+		{
+			$fieldname = 'retained_warranty';
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET '.$fieldname.' = '.floatval($value);
+			$sql .= ' WHERE rowid='.$this->id;
 
-	        if ($this->db->query($sql))
-	        {
-	            $this->retained_warranty = floatval($value);
-	            return 1;
-	        }
-	        else
-	        {
-	            dol_syslog(get_class($this).'::setRetainedWarranty Erreur '.$sql.' - '.$this->db->error());
-	            $this->error = $this->db->error();
-	            return -1;
-	        }
-	    }
-	    else
-	    {
-	        dol_syslog(get_class($this).'::setRetainedWarranty, status of the object is incompatible');
-	        $this->error = 'Status of the object is incompatible '.$this->statut;
-	        return -2;
-	    }
+			if ($this->db->query($sql))
+			{
+				$this->retained_warranty = floatval($value);
+				return 1;
+			} else {
+				dol_syslog(get_class($this).'::setRetainedWarranty Erreur '.$sql.' - '.$this->db->error());
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this).'::setRetainedWarranty, status of the object is incompatible');
+			$this->error = 'Status of the object is incompatible '.$this->statut;
+			return -2;
+		}
 	}
 
 
@@ -4781,37 +4685,33 @@ class Facture extends CommonInvoice
 	 */
 	public function setRetainedWarrantyDateLimit($timestamp, $dateYmd = false)
 	{
-	    if (!$timestamp && $dateYmd) {
-	        $timestamp = $this->db->jdate($dateYmd);
-	    }
+		if (!$timestamp && $dateYmd) {
+			$timestamp = $this->db->jdate($dateYmd);
+		}
 
 
-	    dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit('.$timestamp.')');
-	    if ($this->statut >= 0)
-	    {
-	        $fieldname = 'retained_warranty_date_limit';
-	        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-	        $sql .= ' SET '.$fieldname.' = '.(strval($timestamp) != '' ? '\''.$this->db->idate($timestamp).'\'' : 'null');
-	        $sql .= ' WHERE rowid='.$this->id;
+		dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit('.$timestamp.')');
+		if ($this->statut >= 0)
+		{
+			$fieldname = 'retained_warranty_date_limit';
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET '.$fieldname.' = '.(strval($timestamp) != '' ? '\''.$this->db->idate($timestamp).'\'' : 'null');
+			$sql .= ' WHERE rowid='.$this->id;
 
-	        if ($this->db->query($sql))
-	        {
-	            $this->retained_warranty_date_limit = $timestamp;
-	            return 1;
-	        }
-	        else
-	        {
-	            dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit Erreur '.$sql.' - '.$this->db->error());
-	            $this->error = $this->db->error();
-	            return -1;
-	        }
-	    }
-	    else
-	    {
-	        dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit, status of the object is incompatible');
-	        $this->error = 'Status of the object is incompatible '.$this->statut;
-	        return -2;
-	    }
+			if ($this->db->query($sql))
+			{
+				$this->retained_warranty_date_limit = $timestamp;
+				return 1;
+			} else {
+				dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit Erreur '.$sql.' - '.$this->db->error());
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit, status of the object is incompatible');
+			$this->error = 'Status of the object is incompatible '.$this->statut;
+			return -2;
+		}
 	}
 }
 
@@ -4821,12 +4721,12 @@ class Facture extends CommonInvoice
  */
 class FactureLigne extends CommonInvoiceLine
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'facturedet';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'facturedet';
@@ -4844,6 +4744,7 @@ class FactureLigne extends CommonInvoiceLine
 	public $label;
 	//! Description ligne
 	public $desc;
+	public $ref_ext; // External reference of the line
 
 	public $localtax1_type; // Local tax 1 type
 	public $localtax2_type; // Local tax 2 type
@@ -4911,10 +4812,10 @@ class FactureLigne extends CommonInvoiceLine
 	 *	@param	int		$rowid      id of invoice line to get
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
-    public function fetch($rowid)
+	public function fetch($rowid)
 	{
 		$sql = 'SELECT fd.rowid, fd.fk_facture, fd.fk_parent_line, fd.fk_product, fd.product_type, fd.label as custom_label, fd.description, fd.price, fd.qty, fd.vat_src_code, fd.tva_tx,';
-		$sql .= ' fd.localtax1_tx, fd. localtax2_tx, fd.remise, fd.remise_percent, fd.fk_remise_except, fd.subprice,';
+		$sql .= ' fd.localtax1_tx, fd. localtax2_tx, fd.remise, fd.remise_percent, fd.fk_remise_except, fd.subprice, fd.ref_ext,';
 		$sql .= ' fd.date_start as date_start, fd.date_end as date_end, fd.fk_product_fournisseur_price as fk_fournprice, fd.buy_price_ht as pa_ht,';
 		$sql .= ' fd.info_bits, fd.special_code, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,';
 		$sql .= ' fd.fk_code_ventilation,';
@@ -4942,6 +4843,7 @@ class FactureLigne extends CommonInvoiceLine
 			$this->desc					= $objp->description;
 			$this->qty = $objp->qty;
 			$this->subprice = $objp->subprice;
+			$this->ref_ext = $objp->ref_ext;
 			$this->vat_src_code = $objp->vat_src_code;
 			$this->tva_tx = $objp->tva_tx;
 			$this->localtax1_tx			= $objp->localtax1_tx;
@@ -4988,10 +4890,8 @@ class FactureLigne extends CommonInvoiceLine
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
-		{
-		    $this->error = $this->db->lasterror();
+		} else {
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -5003,15 +4903,15 @@ class FactureLigne extends CommonInvoiceLine
 	 *  @param      int     $noerrorifdiscountalreadylinked  1=Do not make error if lines is linked to a discount and discount already linked to another
 	 *	@return		int						                 <0 if KO, >0 if OK
 	 */
-    public function insert($notrigger = 0, $noerrorifdiscountalreadylinked = 0)
+	public function insert($notrigger = 0, $noerrorifdiscountalreadylinked = 0)
 	{
 		global $langs, $user, $conf;
 
 		$error = 0;
 
-        $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'.
+		$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'.
 
-        dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
+		dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
 
 		// Clean parameters
 		$this->desc = trim($this->desc);
@@ -5026,6 +4926,7 @@ class FactureLigne extends CommonInvoiceLine
 		if (empty($this->remise_percent)) $this->remise_percent = 0;
 		if (empty($this->info_bits)) $this->info_bits = 0;
 		if (empty($this->subprice)) $this->subprice = 0;
+		if (empty($this->ref_ext)) $this->ref_ext = '';
 		if (empty($this->special_code)) $this->special_code = 0;
 		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
 		if (empty($this->fk_prev_id)) $this->fk_prev_id = 0;
@@ -5043,9 +4944,7 @@ class FactureLigne extends CommonInvoiceLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -5074,7 +4973,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facturedet';
 		$sql .= ' (fk_facture, fk_parent_line, label, description, qty,';
 		$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-		$sql .= ' fk_product, product_type, remise_percent, subprice, fk_remise_except,';
+		$sql .= ' fk_product, product_type, remise_percent, subprice, ref_ext, fk_remise_except,';
 		$sql .= ' date_start, date_end, fk_code_ventilation, ';
 		$sql .= ' rang, special_code, fk_product_fournisseur_price, buy_price_ht,';
 		$sql .= ' info_bits, total_ht, total_tva, total_ttc, total_localtax1, total_localtax2,';
@@ -5087,7 +4986,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " '".$this->db->escape($this->desc)."',";
 		$sql .= " ".price2num($this->qty).",";
-        $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+		$sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
 		$sql .= " ".price2num($this->tva_tx).",";
 		$sql .= " ".price2num($this->localtax1_tx).",";
 		$sql .= " ".price2num($this->localtax2_tx).",";
@@ -5097,6 +4996,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= " ".((int) $this->product_type).",";
 		$sql .= " ".price2num($this->remise_percent).",";
 		$sql .= " ".price2num($this->subprice).",";
+		$sql .= " '".$this->db->escape($this->ref_ext)."',";
 		$sql .= ' '.(!empty($this->fk_remise_except) ? $this->fk_remise_except : "null").',';
 		$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
 		$sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").",";
@@ -5131,14 +5031,14 @@ class FactureLigne extends CommonInvoiceLine
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
 			$this->rowid = $this->id; // For backward compatibility
 
-            if (!$error)
-            {
-            	$result = $this->insertExtraFields();
-            	if ($result < 0)
-            	{
-            		$error++;
-            	}
-            }
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 			// Si fk_remise_except defini, on lie la remise a la facture
 			// ce qui la flague comme "consommee".
@@ -5151,19 +5051,17 @@ class FactureLigne extends CommonInvoiceLine
 					// Check if discount was found
 					if ($result > 0)
 					{
-					    // Check if discount not already affected to another invoice
+						// Check if discount not already affected to another invoice
 						if ($discount->fk_facture_line > 0)
 						{
-						    if (empty($noerrorifdiscountalreadylinked))
-						    {
-    							$this->error = $langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
-    							dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
-    							$this->db->rollback();
-    							return -3;
-						    }
-						}
-						else
-						{
+							if (empty($noerrorifdiscountalreadylinked))
+							{
+								$this->error = $langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
+								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
+								$this->db->rollback();
+								return -3;
+							}
+						} else {
 							$result = $discount->link_to_invoice($this->rowid, 0);
 							if ($result < 0)
 							{
@@ -5173,17 +5071,13 @@ class FactureLigne extends CommonInvoiceLine
 								return -3;
 							}
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $langs->trans("ErrorADiscountThatHasBeenRemovedIsIncluded");
 						dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $discount->error;
 					dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 					$this->db->rollback();
@@ -5193,21 +5087,19 @@ class FactureLigne extends CommonInvoiceLine
 
 			if (!$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('LINEBILL_INSERT', $user);
-                if ($result < 0)
-                {
+				// Call trigger
+				$result = $this->call_trigger('LINEBILL_INSERT', $user);
+				if ($result < 0)
+				{
 					$this->db->rollback();
 					return -2;
 				}
-                // End call triggers
+				// End call triggers
 			}
 
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -2;
@@ -5221,7 +5113,7 @@ class FactureLigne extends CommonInvoiceLine
 	 *	@param		int		$notrigger	Disable triggers
 	 *	@return		int					<0 if KO, >0 if OK
 	 */
-    public function update($user = '', $notrigger = 0)
+	public function update($user = '', $notrigger = 0)
 	{
 		global $user, $conf;
 
@@ -5231,6 +5123,7 @@ class FactureLigne extends CommonInvoiceLine
 
 		// Clean parameters
 		$this->desc = trim($this->desc);
+		if (empty($this->ref_ext)) $this->ref_ext = '';
 		if (empty($this->tva_tx)) $this->tva_tx = 0;
 		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
 		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
@@ -5260,43 +5153,42 @@ class FactureLigne extends CommonInvoiceLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
 
 		$this->db->begin();
 
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
-        $sql .= " description='".$this->db->escape($this->desc)."'";
-        $sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
-        $sql .= ", subprice=".price2num($this->subprice)."";
-        $sql .= ", remise_percent=".price2num($this->remise_percent)."";
-        if ($this->fk_remise_except) $sql .= ", fk_remise_except=".$this->fk_remise_except;
-        else $sql .= ", fk_remise_except=null";
+		// Update line in database
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
+		$sql .= " description='".$this->db->escape($this->desc)."'";
+		$sql .= ", ref_ext='".$this->db->escape($this->ref_ext)."'";
+		$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+		$sql .= ", subprice=".price2num($this->subprice)."";
+		$sql .= ", remise_percent=".price2num($this->remise_percent)."";
+		if ($this->fk_remise_except) $sql .= ", fk_remise_except=".$this->fk_remise_except;
+		else $sql .= ", fk_remise_except=null";
 		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->db->escape($this->vat_src_code))."'";
-        $sql .= ", tva_tx=".price2num($this->tva_tx)."";
-        $sql .= ", localtax1_tx=".price2num($this->localtax1_tx)."";
-        $sql .= ", localtax2_tx=".price2num($this->localtax2_tx)."";
+		$sql .= ", tva_tx=".price2num($this->tva_tx)."";
+		$sql .= ", localtax1_tx=".price2num($this->localtax1_tx)."";
+		$sql .= ", localtax2_tx=".price2num($this->localtax2_tx)."";
 		$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
 		$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-        $sql .= ", qty=".price2num($this->qty);
-        $sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
-        $sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
-        $sql .= ", product_type=".$this->product_type;
-        $sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
-        $sql .= ", special_code='".$this->db->escape($this->special_code)."'";
-        if (empty($this->skip_update_total))
-        {
-        	$sql .= ", total_ht=".price2num($this->total_ht);
-        	$sql .= ", total_tva=".price2num($this->total_tva);
-        	$sql .= ", total_ttc=".price2num($this->total_ttc);
-        	$sql .= ", total_localtax1=".price2num($this->total_localtax1);
-        	$sql .= ", total_localtax2=".price2num($this->total_localtax2);
-        }
+		$sql .= ", qty=".price2num($this->qty);
+		$sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
+		$sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$sql .= ", product_type=".$this->product_type;
+		$sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
+		$sql .= ", special_code='".$this->db->escape($this->special_code)."'";
+		if (empty($this->skip_update_total))
+		{
+			$sql .= ", total_ht=".price2num($this->total_ht);
+			$sql .= ", total_tva=".price2num($this->total_tva);
+			$sql .= ", total_ttc=".price2num($this->total_ttc);
+			$sql .= ", total_localtax1=".price2num($this->total_localtax1);
+			$sql .= ", total_localtax2=".price2num($this->total_localtax2);
+		}
 		$sql .= ", fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
 		$sql .= ", buy_price_ht='".price2num($this->pa_ht)."'";
 		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
@@ -5307,9 +5199,9 @@ class FactureLigne extends CommonInvoiceLine
 
 		// Multicurrency
 		$sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		$sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+		$sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+		$sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
 		$sql .= " WHERE rowid = ".$this->rowid;
 
@@ -5317,32 +5209,30 @@ class FactureLigne extends CommonInvoiceLine
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-        	if (!$error)
-        	{
-        		$this->id = $this->rowid;
-        		$result = $this->insertExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        		}
-        	}
+			if (!$error)
+			{
+				$this->id = $this->rowid;
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
 			if (!$error && !$notrigger)
 			{
-                // Call trigger
-                $result = $this->call_trigger('LINEBILL_UPDATE', $user);
-                if ($result < 0)
+				// Call trigger
+				$result = $this->call_trigger('LINEBILL_UPDATE', $user);
+				if ($result < 0)
  				{
 					$this->db->rollback();
 					return -2;
 				}
-                // End call triggers
+				// End call triggers
 			}
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -5352,10 +5242,10 @@ class FactureLigne extends CommonInvoiceLine
 	/**
 	 * 	Delete line in database
 	 *  TODO Add param User $user and notrigger (see skeleton)
-     *
+	 *
 	 *	@return	    int		           <0 if KO, >0 if OK
 	 */
-    public function delete()
+	public function delete()
 	{
 		global $user;
 
@@ -5370,13 +5260,13 @@ class FactureLigne extends CommonInvoiceLine
 		}
 		// End call triggers
 
-        // extrafields
-        $result = $this->deleteExtraFields();
-        if ($result < 0)
-        {
-            $this->db->rollback();
-            return -1;
-        }
+		// extrafields
+		$result = $this->deleteExtraFields();
+		if ($result < 0)
+		{
+			$this->db->rollback();
+			return -1;
+		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".$this->rowid;
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -5384,25 +5274,23 @@ class FactureLigne extends CommonInvoiceLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *	Update DB line fields total_xxx
+	 *	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();
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
@@ -5426,16 +5314,14 @@ class FactureLigne extends CommonInvoiceLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Returns situation_percent of the previous line.
 	 * Warning: If invoice is a replacement invoice, this->fk_prev_id is id of the replaced line.
@@ -5444,14 +5330,14 @@ class FactureLigne extends CommonInvoiceLine
 	 * @param  bool    $include_credit_note		Include credit note or not
 	 * @return int                     >= 0
 	 */
-    public function get_prev_progress($invoiceid, $include_credit_note = true)
+	public function get_prev_progress($invoiceid, $include_credit_note = true)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $invoicecache;
 		if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") {
 			return 0;
 		} else {
-		    // If invoice is not a situation invoice, this->fk_prev_id is used for something else
+			// If invoice is not a situation invoice, this->fk_prev_id is used for something else
 			if (!isset($invoicecache[$invoiceid])) {
 				$invoicecache[$invoiceid] = new Facture($this->db);
 				$invoicecache[$invoiceid]->fetch($invoiceid);
@@ -5466,20 +5352,20 @@ class FactureLigne extends CommonInvoiceLine
 				$returnPercent = floatval($res['situation_percent']);
 
 				if ($include_credit_note) {
-				    $sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd';
-				    $sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON (f.rowid = fd.fk_facture) ';
-				    $sql .= ' WHERE fd.fk_prev_id ='.$this->fk_prev_id;
-				    $sql .= ' AND f.situation_cycle_ref = '.$invoicecache[$invoiceid]->situation_cycle_ref; // Prevent cycle outed
-				    $sql .= ' AND f.type = '.Facture::TYPE_CREDIT_NOTE;
+					$sql = 'SELECT fd.situation_percent FROM '.MAIN_DB_PREFIX.'facturedet fd';
+					$sql .= ' JOIN '.MAIN_DB_PREFIX.'facture f ON (f.rowid = fd.fk_facture) ';
+					$sql .= ' WHERE fd.fk_prev_id ='.$this->fk_prev_id;
+					$sql .= ' AND f.situation_cycle_ref = '.$invoicecache[$invoiceid]->situation_cycle_ref; // Prevent cycle outed
+					$sql .= ' AND f.type = '.Facture::TYPE_CREDIT_NOTE;
 
-				    $res = $this->db->query($sql);
-				    if ($res) {
-				        while ($obj = $this->db->fetch_object($res)) {
-				            $returnPercent = $returnPercent + floatval($obj->situation_percent);
-				        }
-				    } else {
-				    	dol_print_error($this->db);
-				    }
+					$res = $this->db->query($sql);
+					if ($res) {
+						while ($obj = $this->db->fetch_object($res)) {
+							$returnPercent = $returnPercent + floatval($obj->situation_percent);
+						}
+					} else {
+						dol_print_error($this->db);
+					}
 				}
 
 				return $returnPercent;
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 427daf445c5..9888bd23d13 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -145,9 +145,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -202,9 +200,7 @@ class PaymentTerm // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -239,9 +235,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->free($resql);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -305,9 +299,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -345,9 +337,7 @@ class PaymentTerm // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -396,9 +386,7 @@ class PaymentTerm // extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 8eb47268186..459543dfc74 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -42,7 +42,7 @@ $id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // Fo
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -69,35 +69,25 @@ if ($action == 'addcontact' && $user->rights->facture->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-
-// Toggle the status of a contact
+} // Toggle the status of a contact
 elseif ($action == 'swapstatut' && $user->rights->facture->creer)
 {
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-
-// Deletes a contact
+} // Deletes a contact
 elseif ($action == 'deletecontact' && $user->rights->facture->creer)
 {
 	$object->fetch($id);
@@ -107,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->facture->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -207,9 +196,7 @@ if ($id > 0 || !empty($ref))
 		    $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 		    if ($res) break;
 		}
-	}
-	else
-	{
+	} else {
 		// Record not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index a901b985342..722286044cc 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -45,7 +45,7 @@ $langs->loadLangs(array('propal', 'compta', 'other', 'bills', 'companies'));
 $id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -181,14 +181,10 @@ if ($id > 0 || !empty($ref))
 		$permtoedit = $user->rights->facture->creer;
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
new file mode 100644
index 00000000000..fb044280a21
--- /dev/null
+++ b/htdocs/compta/facture/index.php
@@ -0,0 +1,534 @@
+<?php
+/* Copyright (C) 2020	Tobias Sekan	<tobias.sekan@startmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file		htdocs/compat/facture/index.php
+*	\ingroup	facture
+ *	\brief		Home page of customer invoices area
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+
+// Security check
+restrictedArea($user, 'facture');
+
+// Load translation files required by the page
+$langs->load('bills');
+
+// Filter to show only result of one customer
+$socid = GETPOST('socid', 'int');
+if (isset($user->socid) && $user->socid > 0)
+{
+	$action = '';
+	$socid = $user->socid;
+}
+
+// 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;
+
+/*
+* View
+*/
+
+llxHeader("", $langs->trans("CustomersInvoicesArea"), "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes");
+
+print load_fiche_titre($langs->trans("CustomersInvoicesArea"), '', 'bill');
+
+print '<div class="fichecenter">';
+
+print '<div class="fichethirdleft">';
+
+// This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))
+{
+	print getAreaSearchFrom();
+	print '<br>';
+}
+
+print getPieChart($socid);
+print '<br>';
+print getDraftTable($maxDraftCount, $socid);
+
+print '</div>';
+
+print '<div class="fichetwothirdright">';
+print '<div class="ficheaddleft">';
+
+print getLatestEditTable($maxLatestEditCount, $socid);
+print '<br>';
+print getOpenTable($maxOpenCount, $socid);
+
+print '</div>';
+print '</div>';
+
+print '</div>';
+
+// End of page
+llxFooter();
+$db->close();
+
+/**
+ * Return a HTML string that contains a additional search form
+ *
+ * @return string A HTML string that contains a additional search form
+ */
+function getAreaSearchFrom()
+{
+	global $langs;
+
+	$result = '<form method="post" action="'.DOL_URL_ROOT.'/compta/facture/list.php">';
+	$result .= '<div class="div-table-responsive-no-min">';
+	$result .= '<input type="hidden" name="token" value="'.newToken().'">';
+	$result .= '<table class="noborder nohover centpercent">';
+
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="3">'.$langs->trans("Search").'</td>';
+	$result .= '</tr>';
+
+	$result .= '<tr class="oddeven">';
+	$result .= '<td>'.$langs->trans("Invoice").':</td><td><input type="text" class="flat" name="sall" size=18></td>';
+	$result .= '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+	$result .= '</tr>';
+
+	$result .= "</table>";
+	$result .= "</div>";
+	$result .= "</form>";
+
+	return $result;
+}
+
+/**
+ * Return a HTML table that contains a pie chart of customer invoices
+ *
+ * @param	int		$socid		(Optional) Show only results from the customer with this id
+ * @return	string				A HTML table that contains a pie chart of customer invoices
+ */
+function getPieChart($socid = 0)
+{
+	global $conf, $db, $langs, $user;
+
+	$sql = "SELECT count(f.rowid), f.fk_statut";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."facture 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.entity IN (".getEntity('facture').")";
+	if ($user->socid) $sql .= ' AND f.fk_soc = '.$user->socid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " GROUP BY f.fk_statut";
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		return '';
+	}
+
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	$total = 0;
+	$vals = [];
+
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
+		if ($row)
+		{
+			$vals[$row[1]] = $row[0];
+			$total += $row[0];
+		}
+
+		$i++;
+	}
+
+	$db->free($resql);
+
+	$result = '<div class="div-table-responsive-no-min">';
+	$result .= '<table class="noborder nohover centpercent">';
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomerInvoice").'</td>';
+	$result .= '</tr>';
+
+	$objectstatic = new Facture($db);
+	$array = [Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_CLOSED, Facture::STATUS_ABANDONED];
+	$dataseries = [];
+
+	foreach ($array as $status)
+	{
+		$objectstatic->statut = $status;
+		$objectstatic->paye = $status == Facture::STATUS_CLOSED ? -1 : 0;
+
+		$dataseries[] = [$objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0)];
+		if (!$conf->use_javascript_ajax)
+		{
+			$result .= '<tr class="oddeven">';
+			$result .= '<td>'.$objectstatic->getLibStatut(0).'</td>';
+			$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
+			$result .= '</tr>';
+		}
+	}
+
+	if ($conf->use_javascript_ajax)
+	{
+		$dolgraph = new DolGraph();
+		$dolgraph->SetData($dataseries);
+		$dolgraph->setShowLegend(1);
+		$dolgraph->setShowPercent(1);
+		$dolgraph->SetType(['pie']);
+		$dolgraph->setWidth('100%');
+		$dolgraph->draw('idgraphthirdparties');
+
+		$result .= '<tr>';
+		$result .= '<td align="center" colspan="2">'.$dolgraph->show($total ? 0 : 1).'</td>';
+		$result .= '</tr>';
+	}
+
+	$result .= '<tr class="liste_total">';
+	$result .= '<td>'.$langs->trans("Total").'</td>';
+	$result .= '<td class="right">'.$total.'</td>';
+	$result .= '</tr>';
+
+	$result .= '</table>';
+	$result .= '</div>';
+	return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with customer invoice drafts
+ *
+ * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
+ * @param	int		$socid		(Optional) Show only results from the customer with this id
+ * @return	string				A HTML table that contains a list with customer invoice drafts
+ */
+function getDraftTable($maxCount = 500, $socid = 0)
+{
+	global $db, $langs, $user;
+
+	$sql = "SELECT f.rowid, f.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client, f.total as total_ttc";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	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('facture').")";
+	$sql .= " AND f.fk_statut = ".Facture::STATUS_DRAFT;
+	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= $db->plimit($maxCount, 0);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		return '';
+	}
+
+	$num = $db->num_rows($resql);
+
+	$result = '<div class="div-table-responsive-no-min">';
+	$result .= '<table class="noborder centpercent">';
+
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="3">';
+	$result .= $langs->trans("CustomersDraftInvoices");
+	$result .= ' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=0">';
+	$result .= '<span class="badge">'.$num.'</span>';
+	$result .= '</a>';
+	$result .= '</td>';
+	$result .= '</tr>';
+
+	if ($num < 1)
+	{
+		$result .= '</table>';
+		$result .= '</div>';
+		return $result;
+	}
+
+	$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;
+
+		$companystatic->id		= $obj->socid;
+		$companystatic->name	= $obj->socname;
+		$companystatic->client	= $obj->client;
+		$companystatic->canvas	= $obj->canvas;
+
+		$result .= '<tr class="oddeven">';
+		$result .= '<td class="nowrap">'.$objectstatic->getNomUrl(1).'</td>';
+		$result .= '<td>'.$companystatic->getNomUrl(1, 'customer', 24).'</td>';
+		$result .= '<td class="right">'.price($obj->total_ttc).'</td>';
+		$result .= '</tr>';
+
+		$i++;
+		$total += $obj->total_ttc;
+	}
+
+	if ($num > $nbofloop)
+	{
+		$result .= '<tr class="liste_total">';
+		$result .= '<td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
+		$result .= '</tr>';
+	}
+	elseif ($total > 0)
+	{
+		$result .= '<tr class="liste_total">';
+		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
+		$result .= '<td class="right">'.price($total).'</td>';
+		$result .= '</tr>';
+	}
+
+	$result .= '</table>';
+	$result .= '</div>';
+	return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with latest edited customer invoices
+ *
+ * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
+ * @param	int		$socid		(Optional) Show only results from the customer with this id
+ * @return	string				A HTML table that contains a list with latest edited customer invoices
+ */
+function getLatestEditTable($maxCount = 5, $socid = 0)
+{
+	global $conf, $db, $langs, $user;
+
+	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
+	$sql .= " f.datec";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	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('facture').")";
+	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " ORDER BY f.tms DESC";
+	$sql .= $db->plimit($maxCount, 0);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+	}
+
+	$num = $db->num_rows($resql);
+
+	$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>';
+
+	if ($num < 1)
+	{
+		$result .= '</table>';
+		$result .= '</div>';
+		return $result;
+	}
+
+	$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;
+
+		$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 .=  '<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 .=  '</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 .=  '</tr>';
+
+		$i++;
+	}
+
+	$result .= '</table>';
+	$result .= '</div>';
+	return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with open (unpaid) customer invoices
+ *
+ * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
+ * @param	int		$socid		(Optional) Show only results from the customer with this id
+ * @return	string				A HTML table that conatins a list with open (unpaid) customer invoices
+ */
+function getOpenTable($maxCount = 500, $socid = 0)
+{
+	global $conf, $db, $langs, $user;
+
+	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
+	$sql .= ", f.rowid as id, f.entity, f.total as total_ttc, f.total as total_ht, f.ref, f.fk_statut";
+	$sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".MAIN_DB_PREFIX."facture 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.entity IN (".getEntity('facture').")";
+	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
+	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 f.rowid DESC";
+	$sql .= $db->plimit($maxCount, 0);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+	}
+
+	$num = $db->num_rows($resql);
+
+	$result = '<div class="div-table-responsive-no-min">';
+	$result .= '<table class="noborder centpercent">';
+
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="4">';
+	$result .= $langs->trans("BillsCustomersUnpaid");
+	$result .= ' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=1">';
+	$result .= '<span class="badge">'.$num.'</span>';
+	$result .= '</a>';
+	$result .= '</td>';
+	$result .= '</tr>';
+
+	if ($num < 1)
+	{
+		$result .= '</table>';
+		$result .= '</div>';
+		return $result;
+	}
+
+	$objectstatic	= new Facture($db);
+	$companystatic	= new Societe($db);
+	$formfile		= new FormFile($db);
+	$nbofloop		= min($num, $maxCount);
+	$now			= dol_now();
+	$total			= 0;
+	$i				= 0;
+
+	while ($i < $nbofloop)
+	{
+		$obj = $db->fetch_object($resql);
+
+		$objectstatic->id= $obj->id;
+		$objectstatic->ref	= $obj->ref;
+
+		$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].'/'.dol_sanitizeFileName($obj->ref);
+
+		$result .= '<tr class="oddeven">';
+
+		$result .= '<td class="nowrap" width="140">';
+		$result .= '<table class="nobordernopadding">';
+		$result .= '<tr class="nocellnopadd">';
+
+		$result .= '<td class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
+
+		$result .= '<td width="18" class="nobordernopadding nowrap">';
+
+		if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay))
+		{
+			$result .= img_warning($langs->trans("Late"));
+		}
+
+		$result .= '</td>';
+
+		$result .= '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
+
+		$result .= '</tr>';
+		$result .= '</table>';
+		$result .= '</td>';
+
+		$result .= '<td class="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
+		$result .= '<td class="right">'.dol_print_date($db->jdate($obj->df), 'day').'</td>';
+		$result .= '<td class="right">'.price($obj->total_ttc).'</td>';
+
+		$result .= '</tr>';
+
+		$i++;
+		$total += $obj->total_ttc;
+	}
+
+	if ($num > $nbofloop)
+	{
+		$result .= '<tr class="liste_total">';
+		$result .= '<td colspan="4" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
+		$result .= '</tr>';
+	}
+	elseif ($total > 0)
+	{
+		$result .= '<tr class="liste_total">';
+		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
+		$result .= '<td align="right">'.price($total).'</td>';
+		$result .= '<td>&nbsp;</td>';
+		$result .= '</tr>';
+	}
+
+	$result .= '</table>';
+	$result .= '</div>';
+	return $result;
+}
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index f6da540f735..16d163c4fe6 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -357,7 +357,7 @@ if ($resql)
 	if (!empty($arrayfields['f.titre']['checked']))
 	{
 		print '<td class="liste_titre left">';
-		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	// Thirpdarty
@@ -529,7 +529,7 @@ if ($resql)
 
 			if (!empty($arrayfields['f.titre']['checked']))
 			{
-			    print '<td>';
+			    print '<td class="nowrap tdoverflowmax200">';
 			    print $invoicerectmp->getNomUrl(1);
 			    print "</a>";
 			    print "</td>\n";
@@ -616,9 +616,7 @@ if ($resql)
 				if (!$invoicerectmp->isMaxNbGenReached())
 				{
 					if (!$objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
-				}
-				else
-				{
+				} else {
 					print img_info($langs->trans("MaxNumberOfGenerationReached"));
 				}
 				print '</div>';
@@ -661,19 +659,14 @@ if ($resql)
 				if ($invoicerectmp->isMaxNbGenReached())
 				{
 					print $langs->trans("MaxNumberOfGenerationReached");
-				}
-				elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
+				} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
 				{
 					print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
 					print $langs->trans("CreateBill").'</a>';
-				}
-				else
-				{
+				} else {
 					print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
 				}
-			}
-			else
-			{
+			} else {
 				print "&nbsp;";
 			}
 			if (!$i) $totalarray['nbfield']++;
@@ -683,9 +676,7 @@ if ($resql)
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
@@ -700,9 +691,7 @@ if ($resql)
 	print "</form>";
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 71184d905b3..e12e21e70b4 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -61,7 +61,7 @@ $id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); //
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -100,7 +100,7 @@ $search_module_source = GETPOST('search_module_source', 'alpha');
 $search_pos_source = GETPOST('search_pos_source', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
-$search_state = trim(GETPOST("search_state"));
+$search_state = GETPOST("search_state");
 $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_user = GETPOST('search_user', 'int');
@@ -111,7 +111,7 @@ $search_date_valid_start = dol_mktime(0, 0, 0, GETPOST('search_date_valid_startm
 $search_date_valid_end = dol_mktime(23, 59, 59, GETPOST('search_date_valid_endmonth', 'int'), GETPOST('search_date_valid_endday', 'int'), GETPOST('search_date_valid_endyear', 'int'));
 $search_datelimit_start = dol_mktime(0, 0, 0, GETPOST('search_datelimit_startmonth', 'int'), GETPOST('search_datelimit_startday', 'int'), GETPOST('search_datelimit_startyear', 'int'));
 $search_datelimit_end = dol_mktime(23, 59, 59, GETPOST('search_datelimit_endmonth', 'int'), GETPOST('search_datelimit_endday', 'int'), GETPOST('search_datelimit_endyear', 'int'));
-$search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
+$search_categ_cus = GETPOST("search_categ_cus", 'int');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 
@@ -205,6 +205,8 @@ $arrayfields = array(
 	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>220), // Not enabled by default because slow
 	'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))),
+	'f.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
 	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 
@@ -304,8 +306,7 @@ if ($massaction == 'makepayment'){
 
 	header('Location: '.$loc);
 	exit;
-}
-elseif ($massaction == 'withdrawrequest')
+} elseif ($massaction == 'withdrawrequest')
 {
 	$langs->load("withdrawals");
 
@@ -313,9 +314,7 @@ elseif ($massaction == 'withdrawrequest')
 	{
 		$error++;
 		setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		//Checking error
 		$error = 0;
 
@@ -363,12 +362,10 @@ elseif ($massaction == 'withdrawrequest')
 				if ($numprlv > 0) {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
-				}
-				elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE') {
+				} elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE') {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
-				}
-				else {
+				} else {
 					$listofbills[] = $objecttmp; // $listofbills will only contains invoices with good payment method and no request already done
 				}
 			}
@@ -386,9 +383,7 @@ elseif ($massaction == 'withdrawrequest')
 				{
 					$db->commit();
 					$nbwithdrawrequestok++;
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 					setEventMessages($aBill->error, $aBill->errors, 'errors');
 				}
@@ -485,15 +480,15 @@ if ($filtre)
 }
 if ($search_ref) $sql .= natural_search('f.ref', $search_ref);
 if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcustomer);
-if ($search_type != '' && $search_type != '-1') $sql .= " AND f.type IN (".$db->escape($search_type).")";
+if ($search_type != '' && $search_type != '-1') $sql .= " AND f.type IN (".$db->sanitize($db->escape($search_type)).")";
 if ($search_project_ref) $sql .= natural_search('p.ref', $search_project_ref);
 if ($search_project) $sql .= natural_search('p.title', $search_project);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
 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 (".$db->escape($search_country).')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
+if ($search_country) $sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
+if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_montant_ht != '') $sql .= natural_search('f.total', $search_montant_ht, 1);
 if ($search_montant_vat != '') $sql .= natural_search('f.tva', $search_montant_vat, 1);
@@ -516,10 +511,8 @@ if ($search_status != '-1' && $search_status != '')
 		if ($search_status == '1') $sql .= " AND f.fk_statut = 1"; // unpayed
 		if ($search_status == '2') $sql .= " AND f.fk_statut = 2"; // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
 		if ($search_status == '3') $sql .= " AND f.fk_statut = 3"; // abandonned
-	}
-	else
-	{
-		$sql .= " AND f.fk_statut IN (".$db->escape($search_status).")"; // When search_status is '1,2' for example
+	} else {
+		$sql .= " AND f.fk_statut IN (".$db->sanitize($db->escape($search_status)).")"; // When search_status is '1,2' for example
 	}
 }
 
@@ -567,9 +560,7 @@ if (!$sall)
 	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 : '');
 	}
-}
-else
-{
+} else {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
 
@@ -678,18 +669,19 @@ if ($resql)
 	if ($user->rights->facture->supprimer) {
 		if (!empty($conf->global->INVOICE_CAN_REMOVE_DRAFT_ONLY)) {
         	$arrayofmassactions['predeletedraft'] = $langs->trans("Deletedraft");
-		}
-        elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
+		} elseif (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED)) {	// mass deletion never possible on invoices on such situation
             $arrayofmassactions['predelete'] = $langs->trans("Delete");
         }
     }
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-	$newcardbutton = '';
-	if ($user->rights->facture->creer && $contextpage != 'poslist')
+	// Show the new button only when this page is not opend from the Extended POS
+	if ($contextpage != 'poslist')
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/facture/card.php?action=create');
+		$url = DOL_URL_ROOT.'/compta/facture/card.php?action=create';
+		if (!empty($socid)) $url .= '&socid='.$socid;
+		$newcardbutton = dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', $user->rights->facture->creer);
 	}
 
 	$i = 0;
@@ -737,7 +729,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -746,7 +738,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -768,6 +760,7 @@ if ($resql)
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	// Show the massaction checkboxes only when this page is not opend from the Extended POS
 	if ($massactionbutton && $contextpage != 'poslist') $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 	print '<div class="div-table-responsive">';
@@ -816,12 +809,10 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From').' ';
-		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
+		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to').' ';
-		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
+		print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
 	}
@@ -830,12 +821,10 @@ if ($resql)
 	{
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
-		print $langs->trans('From').' ';
-		print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1);
+		print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 		print '</div>';
 		print '<div class="nowrap">';
-		print $langs->trans('to').' ';
-		print $form->selectDate($search_date_valid_end ? $search_date_valid_end : -1, 'search_date_valid_end', 0, 0, 1);
+		print $form->selectDate($search_date_valid_end ? $search_date_valid_end : -1, 'search_date_valid_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 		print '</div>';
 		print '</td>';
 	}
@@ -850,8 +839,7 @@ if ($resql)
 		print '</div>';
 		print '<div class="nowrap">';
 		print $langs->trans('to').' ';*/
-		print $langs->trans("Before").' ';
-		print $form->selectDate($search_datelimit_end ? $search_datelimit_end : -1, 'search_datelimit_end', 0, 0, 1);
+		print $form->selectDate($search_datelimit_end ? $search_datelimit_end : -1, 'search_datelimit_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("Before"));
 		print '<br><input type="checkbox" name="search_option" value="late"'.($option == 'late' ? ' checked' : '').'> '.$langs->trans("Alert");
 		print '</div>';
 		print '</td>';
@@ -1051,6 +1039,18 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['f.note_public']['checked']))
+	{
+		// Note public
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['f.note_private']['checked']))
+	{
+		// Note private
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	// Status
 	if (!empty($arrayfields['f.fk_statut']['checked']))
 	{
@@ -1111,6 +1111,8 @@ if ($resql)
 	if (!empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 	if (!empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 	if (!empty($arrayfields['f.date_closing']['checked']))       print_liste_field_titre($arrayfields['f.date_closing']['label'], $_SERVER["PHP_SELF"], "f.date_closing", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.note_public']['checked']))       print_liste_field_titre($arrayfields['f.note_public']['label'], $_SERVER["PHP_SELF"], "f.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	if (!empty($arrayfields['f.note_private']['checked']))       print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	if (!empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
@@ -1218,7 +1220,7 @@ if ($resql)
             // Ref
 			if (!empty($arrayfields['f.ref']['checked']))
 			{
-				print '<td class="nowrap">';
+				print '<td class="nowraponall">';
 
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 
@@ -1226,9 +1228,7 @@ if ($resql)
                 if ($contextpage == 'poslist')
                 {
                     print $obj->ref;
-                }
-                else
-                {
+                } else {
                     print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
                 }
 
@@ -1256,7 +1256,7 @@ if ($resql)
 			// Type
 			if (!empty($arrayfields['f.type']['checked']))
 			{
-				print '<td class="nowrap">';
+				print '<td class="nowraponall tdoverflowmax100" title="'.$facturestatic->getLibType().'">';
 				print $facturestatic->getLibType();
 				print "</td>";
 				if (!$i) $totalarray['nbfield']++;
@@ -1265,7 +1265,7 @@ if ($resql)
 			// Date
 			if (!empty($arrayfields['f.date']['checked']))
 			{
-				print '<td align="center" class="nowrap">';
+				print '<td align="center" class="nowraponall">';
 				print dol_print_date($db->jdate($obj->df), 'day');
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1274,7 +1274,7 @@ if ($resql)
 			// Date
 			if (!empty($arrayfields['f.date_valid']['checked']))
 			{
-				print '<td align="center" class="nowrap">';
+				print '<td align="center" class="nowraponall">';
 				print dol_print_date($db->jdate($obj->date_valid), 'day');
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1283,7 +1283,7 @@ if ($resql)
 			// Date limit
 			if (!empty($arrayfields['f.date_lim_reglement']['checked']))
 			{
-				print '<td align="center" class="nowrap">'.dol_print_date($datelimit, 'day');
+				print '<td align="center" class="nowraponall">'.dol_print_date($datelimit, 'day');
 				if ($facturestatic->hasDelay())
 				{
 				    print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
@@ -1295,7 +1295,7 @@ if ($resql)
 			// Project ref
 			if (!empty($arrayfields['p.ref']['checked']))
 			{
-				print '<td class="nocellnopadd nowrap">';
+				print '<td class="nocellnopadd nowraponall">';
 				if ($obj->project_id > 0)
 				{
 					print $projectstatic->getNomUrl(1);
@@ -1307,7 +1307,7 @@ if ($resql)
 			// Project title
 			if (!empty($arrayfields['p.title']['checked']))
 			{
-			    print '<td class="nowrap">';
+			    print '<td class="nowraponall">';
 			    if ($obj->project_id > 0)
 			    {
 			        print $projectstatic->title;
@@ -1323,9 +1323,7 @@ if ($resql)
 		        if ($contextpage == 'poslist')
 				{
 				    print $thirdpartystatic->name;
-				}
-				else
-				{
+				} else {
 				    print $thirdpartystatic->getNomUrl(1, 'customer');
 				}
 				print '</td>';
@@ -1342,7 +1340,7 @@ if ($resql)
 			// Zip
 			if (!empty($arrayfields['s.zip']['checked']))
 			{
-				print '<td>';
+				print '<td class="nowraponall">';
 				print $obj->zip;
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1384,7 +1382,7 @@ if ($resql)
 			// Payment mode
 			if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 			{
-				print '<td>';
+				print '<td class="tdoverflowmax100">';
 				$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1420,7 +1418,7 @@ if ($resql)
 			// Amount HT
 			if (!empty($arrayfields['f.total_ht']['checked']))
 			{
-				  print '<td class="right nowrap">'.price($obj->total_ht)."</td>\n";
+				  print '<td class="right nowraponall">'.price($obj->total_ht)."</td>\n";
 				  if (!$i) $totalarray['nbfield']++;
 				  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
 				  $totalarray['val']['f.total_ht'] += $obj->total_ht;
@@ -1428,7 +1426,7 @@ if ($resql)
 			// Amount VAT
 			if (!empty($arrayfields['f.total_vat']['checked']))
 			{
-				print '<td class="right nowrap">'.price($obj->total_vat)."</td>\n";
+				print '<td class="right nowraponall">'.price($obj->total_vat)."</td>\n";
 				if (!$i) $totalarray['nbfield']++;
 				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
 				$totalarray['val']['f.total_vat'] += $obj->total_vat;
@@ -1436,7 +1434,7 @@ if ($resql)
 			// Amount LocalTax1
 			if (!empty($arrayfields['f.total_localtax1']['checked']))
 			{
-				print '<td class="right nowrap">'.price($obj->total_localtax1)."</td>\n";
+				print '<td class="right nowraponall">'.price($obj->total_localtax1)."</td>\n";
 				if (!$i) $totalarray['nbfield']++;
 				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
 				$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
@@ -1444,7 +1442,7 @@ if ($resql)
 			// Amount LocalTax2
 			if (!empty($arrayfields['f.total_localtax2']['checked']))
 			{
-				print '<td class="right nowrap">'.price($obj->total_localtax2)."</td>\n";
+				print '<td class="right nowraponall">'.price($obj->total_localtax2)."</td>\n";
 				if (!$i) $totalarray['nbfield']++;
 				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
 				$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
@@ -1452,7 +1450,7 @@ if ($resql)
 			// Amount TTC
 			if (!empty($arrayfields['f.total_ttc']['checked']))
 			{
-				print '<td class="right nowrap">'.price($obj->total_ttc)."</td>\n";
+				print '<td class="right nowraponall">'.price($obj->total_ttc)."</td>\n";
 				if (!$i) $totalarray['nbfield']++;
 				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
 				$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
@@ -1477,7 +1475,7 @@ if ($resql)
 
 			if (!empty($arrayfields['dynamount_payed']['checked']))
 			{
-				print '<td class="right nowrap">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
+				print '<td class="right nowraponall">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
 				if (!$i) $totalarray['nbfield']++;
 				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalam';
 				$totalarray['val']['totalam'] += $totalpay;
@@ -1486,7 +1484,7 @@ if ($resql)
 			// Pending amount
 			if (!empty($arrayfields['rtp']['checked']))
 			{
-				print '<td class="right nowrap">';
+				print '<td class="right nowraponall">';
 				print (!empty($remaintopay) ? price($remaintopay, 0, $langs) : '&nbsp;');
 				print '</td>'; // TODO Use a denormalized field
 				if (!$i) $totalarray['nbfield']++;
@@ -1498,14 +1496,14 @@ if ($resql)
 			// Currency
 			if (!empty($arrayfields['f.multicurrency_code']['checked']))
 			{
-				  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+				  print '<td class="nowraponall">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
 				  if (!$i) $totalarray['nbfield']++;
 			}
 
 			// Currency rate
 			if (!empty($arrayfields['f.multicurrency_tx']['checked']))
 			{
-				  print '<td class="nowrap">';
+				  print '<td class="nowraponall">';
 				  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
 				  print "</td>\n";
 				  if (!$i) $totalarray['nbfield']++;
@@ -1513,31 +1511,31 @@ if ($resql)
 			// Amount HT
 			if (!empty($arrayfields['f.multicurrency_total_ht']['checked']))
 			{
-				  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
+				  print '<td class="right nowraponall">'.price($obj->multicurrency_total_ht)."</td>\n";
 				  if (!$i) $totalarray['nbfield']++;
 			}
 			// Amount VAT
 			if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))
 			{
-				print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";
+				print '<td class="right nowraponall">'.price($obj->multicurrency_total_vat)."</td>\n";
 				if (!$i) $totalarray['nbfield']++;
 			}
 			// Amount TTC
 			if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))
 			{
-				print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
+				print '<td class="right nowraponall">'.price($obj->multicurrency_total_ttc)."</td>\n";
 				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked']))
 			{
-				print '<td class="right nowrap">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
+				print '<td class="right nowraponall">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
 				if (!$i) $totalarray['nbfield']++;
 			}
 
 			// Pending amount
 			if (!empty($arrayfields['multicurrency_rtp']['checked']))
 			{
-				print '<td class="right nowrap">';
+				print '<td class="right nowraponall">';
 				print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
 				print '</td>'; // TODO Use a denormalized field
 				if (!$i) $totalarray['nbfield']++;
@@ -1573,6 +1571,22 @@ if ($resql)
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
+			// Note public
+			if (!empty($arrayfields['f.note_public']['checked']))
+			{
+				print '<td class="center">';
+				print dol_escape_htmltag($obj->note_public);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Note private
+			if (!empty($arrayfields['f.note_private']['checked']))
+			{
+				print '<td class="center">';
+				print dol_escape_htmltag($obj->note_private);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
 			// Status
 			if (!empty($arrayfields['f.fk_statut']['checked']))
 			{
@@ -1582,7 +1596,7 @@ if ($resql)
 				if (!$i) $totalarray['nbfield']++;
 			}
 
-			// Action column
+			// Action column (Show the massaction button only when this page is not opend from the Extended POS)
 			print '<td class="nowrap" align="center">';
 			if (($massactionbutton || $massaction) && $contextpage != 'poslist')   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			{
@@ -1613,22 +1627,23 @@ if ($resql)
 
 	print "</form>\n";
 
-	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	// Show the file area only when this page is not opend from the Extended POS
+	if ($contextpage != 'poslist') {
+		$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_invoices', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+		print $formfile->showdocuments('massfilesarea_invoices', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	}
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 954c48ec0c9..249d2dd9b8c 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('companies', 'bills'));
 $id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = 0;
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index cfe6cd51a22..f69517c1037 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -44,7 +44,7 @@ $langs->loadLangs(array('bills', 'banks', 'withdrawals', 'companies'));
 $id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $type = GETPOST('type', 'aZ09');
 
 $fieldid = (!empty($ref) ? 'ref' : 'rowid');
@@ -107,9 +107,7 @@ if (empty($reshook))
                 $db->commit();
 
                 setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            }
-            else
-            {
+            } else {
                 $db->rollback();
                 setEventMessages($object->error, $object->errors, 'errors');
             }
@@ -383,14 +381,10 @@ if ($object->id > 0)
 		if ($action == 'editinvoicedate')
 		{
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date, 'invoicedate');
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->date, 'day');
 		}
-	}
-	else
-	{
+	} else {
 		print dol_print_date($object->date, 'day');
 	}
 	print '</td>';
@@ -409,14 +403,10 @@ if ($object->id > 0)
 		if ($action == 'editconditions')
 		{
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-		}
-		else
-		{
+		} else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		}
-	}
-	else
-	{
+	} else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -439,17 +429,13 @@ if ($object->id > 0)
 		if ($action == 'editpaymentterm')
 		{
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $duedate, 'paymentterm');
-		}
-		else
-		{
+		} else {
 			print dol_print_date($duedate, 'day');
 			if ($object->hasDelay()) {
 				print img_warning($langs->trans('Late'));
 			}
 		}
-	}
-	else
-	{
+	} else {
 		print '&nbsp;';
 	}
 	print '</td></tr>';
@@ -465,9 +451,7 @@ if ($object->id > 0)
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id');
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print '</td></tr>';
@@ -484,9 +468,7 @@ if ($object->id > 0)
 	if ($action == 'editbankaccount')
 	{
 	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-	}
-	else
-	{
+	} else {
 	    $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 	}
 	print "</td>";
@@ -617,9 +599,7 @@ if ($object->id > 0)
 	{
 		$num = $db->num_rows($result_sql);
 		$numopen = $num;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -640,9 +620,7 @@ if ($object->id > 0)
 	{
 		$obj = $db->fetch_object($result_sql);
 		if ($obj) $pending = $obj->amount;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -676,25 +654,20 @@ if ($object->id > 0)
     			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
-    		{
+    		} else {
     			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$buttonlabel.'</a>';
     		}
-	    }
-	    else
-        {
+	    } else {
         	print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$buttonlabel.'</a>';
         }
-	}
-	else
-	{
+	} else {
 		if ($num == 0)
 		{
 			if ($object->statut > $object::STATUS_DRAFT) print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AlreadyPaid")).'">'.$buttonlabel.'</a>';
 			else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("Draft")).'">'.$buttonlabel.'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("RequestAlreadyDone")).'">'.$buttonlabel.'</a>';
 		}
-		else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("RequestAlreadyDone")).'">'.$buttonlabel.'</a>';
 	}
 
 	print "</div><br>\n";
@@ -779,7 +752,7 @@ if ($object->id > 0)
 			print '<td class="center">'.$langs->trans("OrderWaiting").'</td>';
 
 			print '<td class="right">';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&did='.$obj->rowid.'&type='.$type.'">';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'&did='.$obj->rowid.'&type='.$type.'">';
 			print img_delete();
 			print '</a></td>';
 
@@ -788,9 +761,7 @@ if ($object->id > 0)
 		}
 
 		$db->free($result_sql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -867,9 +838,7 @@ if ($object->id > 0)
 			print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 
 		$db->free($result);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 284186b73ce..81466651856 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-if(!empty($conf->category->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+if (!empty($conf->category->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
@@ -60,7 +60,7 @@ if ($user->socid > 0)
 
 $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;
+if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2;
 else $startyear=$year-1;
 $endyear = $year;
 
@@ -68,7 +68,7 @@ $endyear = $year;
 /*
  * View
  */
-if(!empty($conf->category->enabled)) $langs->load('categories');
+if (!empty($conf->category->enabled)) $langs->load('categories');
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
@@ -94,7 +94,7 @@ dol_mkdir($dir);
 $stats = new FactureStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
 if ($mode == 'customer')
 {
-    if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->escape($object_status).')';
+	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).')';
@@ -102,7 +102,7 @@ if ($mode == 'customer')
 }
 if ($mode == 'supplier')
 {
-    if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->escape($object_status).')';
+	if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
 }
 
 // Build graphic number of object
@@ -180,9 +180,7 @@ 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';
-}
-else
-{
+} 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';
@@ -369,8 +367,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index a02a0fc1682..ef35c03eb54 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -78,9 +78,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 			// If not abandonned
     		$total = $total + $sign * $objectlink->total_ht;
     		echo price($objectlink->total_ht);
-    	}
-    	else
-    	{
+    	} else {
     		echo '<strike>'.price($objectlink->total_ht).'</strike>';
     	}
 	}
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 23ef5b6d0d9..0591d75d5a3 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
+ * Copyright (C) 2020      Tobias Sekan         <tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,12 +33,9 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (!empty($conf->commande->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->commande->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->tax->enabled))
-	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 
 // L'espace compta/treso doit toujours etre actif car c'est un espace partage
 // par de nombreux modules (banque, facture, commande a facturer, etc...) independamment
@@ -51,7 +49,7 @@ $langs->loadLangs(array('compta', 'bills'));
 if (!empty($conf->commande->enabled))
 	$langs->load("orders");
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $bid = GETPOST('bid', 'int');
 
 // Security check
@@ -62,7 +60,7 @@ if ($user->socid > 0)
 	$socid = $user->socid;
 }
 
-$max = 3;
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('invoiceindex'));
@@ -148,7 +146,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	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";
 	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 = 0";
+	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".Facture::STATUS_DRAFT;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 
@@ -161,8 +159,8 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerDraft', $parameters);
 	$sql .= $hookmanager->resPrint;
 
-	$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 .= " 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";
 
 	// Add Group from hooks
 	$parameters = array();
@@ -175,10 +173,18 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->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 colspan="3">'.$langs->trans("CustomersDraftInvoices").($num ? '<span class="badge marginleftonlyshort">'.$num.'</span>' : '').'</th></tr>';
+		print '<th colspan="3">';
+		print $langs->trans("CustomersDraftInvoices").' ';
+		print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status='.Facture::STATUS_DRAFT.'">';
+		print '<span class="badge marginleftonlyshort">'.$num.'</span>';
+		print '</a>';
+		print '</th>';
+		print '</tr>';
+
 		if ($num)
 		{
 			$companystatic = new Societe($db);
@@ -207,11 +213,11 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$companystatic->code_compta = $obj->code_compta;
 				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven"><td class="nowrap">';
+				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
 				print $facturestatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td class="nowrap">';
-				print $companystatic->getNomUrl(1, 'customer', 16);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $companystatic->getNomUrl(1, 'customer');
 				print '</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '</tr>';
@@ -222,16 +228,12 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -248,7 +250,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
     $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 = 0";
+	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
 	$sql .= " AND f.entity IN (".getEntity('invoice').')';
 	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;
@@ -262,10 +264,18 @@ 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">';
-		print '<th colspan="3">'.$langs->trans("SuppliersDraftInvoices").($num ? '<span class="badge marginleftonlyshort">'.$num.'</span>' : '').'</th></tr>';
+		print '<th colspan="3">';
+		print $langs->trans("SuppliersDraftInvoices").' ';
+		print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status='.FactureFournisseur::STATUS_DRAFT.'">';
+		print '<span class="badge marginleftonlyshort">'.$num.'</span>';
+		print '</a>';
+		print '</th>';
+		print '</tr>';
+
 		if ($num)
 		{
 			$companystatic = new Societe($db);
@@ -295,11 +305,11 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$companystatic->code_compta = $obj->code_compta;
 				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven"><td class="nowrap">';
-				print $facturesupplierstatic->getNomUrl(1, '', 16);
+				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
+				print $facturesupplierstatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td>';
-				print $companystatic->getNomUrl(1, 'supplier', 16);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $companystatic->getNomUrl(1, 'supplier');
 				print '</td>';
 				print '<td class="right">'.price($obj->total_ttc).'</td>';
 				print '</tr>';
@@ -310,16 +320,12 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print '<tr class="liste_total"><td class="left">'.$langs->trans("Total").'</td>';
 			print '<td colspan="2" class="right">'.price($tot_ttc).'</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -364,6 +370,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
 		$num = $db->num_rows($resql);
 		$i = 0;
+		$othernb = 0;
 
         print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
@@ -380,6 +387,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			{
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += $obj->total_ht;
+					$total_ttc += $obj->total_ttc;
+					continue;
+				}
+
 				$facturestatic->ref = $obj->ref;
 				$facturestatic->id = $obj->rowid;
 				$facturestatic->total_ht = $obj->total_ht;
@@ -436,18 +451,22 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 				$i++;
 			}
-		}
-		else
-		{
+
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
+		} else {
 			$colspan = 5;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -499,10 +518,20 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 		{
 			$i = 0;
 			$total = $total_ttc = $totalam = 0;
+			$othernb = 0;
+
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += $obj->total_ht;
+					$total_ttc += $obj->total_ttc;
+					continue;
+				}
+
 				$facstatic->ref = $obj->ref;
 				$facstatic->id = $obj->rowid;
 				$facstatic->total_ht = $obj->total_ht;
@@ -521,11 +550,11 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$thirdpartystatic->code_compta = '';
 				$thirdpartystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven nowraponall"><td>';
+				print '<tr class="oddeven nowraponall tdoverflowmax100"><td>';
 				print $facstatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td>';
-				print $thirdpartystatic->getNomUrl(1, 'supplier', 44);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $thirdpartystatic->getNomUrl(1, 'supplier');
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
@@ -537,17 +566,21 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$totalam += $obj->am;
 				$i++;
 			}
-		}
-		else
-		{
+
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
+		} else {
 			$colspan = 5;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -576,10 +609,10 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 	$result = $db->query($sql);
 	if ($result)
 	{
-		$var = false;
 		$num = $db->num_rows($result);
 
 		$i = 0;
+		$othernb = 0;
 
         print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
@@ -598,6 +631,14 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 			{
 				$objp = $db->fetch_object($result);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += $obj->total_ht;
+					$total_ttc += $obj->total_ttc;
+					continue;
+				}
+
 				$donationstatic->id = $objp->rowid;
 				$donationstatic->ref = $objp->rowid;
 				$donationstatic->lastname = $objp->lastname;
@@ -606,7 +647,7 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 				$label = $donationstatic->getFullName($langs);
 				if ($objp->societe) $label .= ($label ? ' - ' : '').$objp->societe;
 
-				print '<tr class="oddeven">';
+				print '<tr class="oddeven tdoverflowmax100">';
 				print '<td>'.$donationstatic->getNomUrl(1).'</td>';
 				print '<td>'.$label.'</td>';
 				print '<td class="nowrap right">'.price($objp->amount).'</td>';
@@ -616,14 +657,19 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 
 				$i++;
 			}
-		}
-		else
-		{
+
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
+		} else {
 			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table></div><br>';
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 /**
@@ -668,17 +714,27 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			{
 				$i = 0;
 				$tot_ttc = 0;
+				$othernb = 0;
+
 				while ($i < $num)
 				{
 					$obj = $db->fetch_object($resql);
 
+					if ($i >= $max) {
+						$othernb += 1;
+						$i++;
+						$total += $obj->total_ht;
+						$total_ttc += $obj->total_ttc;
+						continue;
+					}
+
 					$chargestatic->id = $obj->rowid;
 					$chargestatic->ref = $obj->rowid;
 					$chargestatic->label = $obj->label;
 					$chargestatic->paye = $obj->paye;
 
 					print '<tr class="oddeven">';
-					print '<td>'.$chargestatic->getNomUrl(1).'</td>';
+					print '<td class="nowraponall">'.$chargestatic->getNomUrl(1).'</td>';
 					print '<td class="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
 					print '<td class="nowrap right">'.price($obj->amount).'</td>';
 					print '<td class="nowrap right">'.price($obj->sumpaid).'</td>';
@@ -689,21 +745,25 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 					$i++;
 				}
 
+				if ($othernb) {
+					print '<tr class="oddeven">';
+					print '<td class="nowrap" colspan="5">';
+					print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+					print '</td>';
+					print "</tr>\n";
+				}
+
 				print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Total").'</td>';
 				print '<td class="nowrap right">'.price($tot_ttc).'</td>';
 				print '<td class="right"></td>';
 				print '<td class="right">&nbsp;</td>';
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			print "</table></div><br>";
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -732,7 +792,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 	$sql .= " AND c.entity = ".$conf->entity;
 	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 .= " AND c.fk_statut = 3";
+	$sql .= " AND c.fk_statut = ".Commande::STATUS_CLOSED;
 	$sql .= " AND c.facture = 0";
 	// Add where from hooks
 	$parameters = array();
@@ -749,11 +809,19 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 		if ($num)
 		{
 			$i = 0;
+			$othernb = 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("OrdersDeliveredToBill").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status=3&amp;billed=0"><span class="badge">'.$num.'</span></a></th>';
+			print '<th colspan="2">';
+			print $langs->trans("OrdersDeliveredToBill").' ';
+			print '<a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_CLOSED.'&amp;billed=0">';
+			print '<span class="badge">'.$num.'</span>';
+			print '</a>';
+			print '</th>';
+
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
 			print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
 			print '<th class="right">'.$langs->trans("ToBill").'</th>';
@@ -766,6 +834,14 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 			{
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += $obj->total_ht;
+					$total_ttc += $obj->total_ttc;
+					continue;
+				}
+
 				$societestatic->id = $obj->socid;
 				$societestatic->name = $obj->name;
 				$societestatic->email = $obj->email;
@@ -799,8 +875,8 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 
 				print '</td>';
 
-				print '<td class="left">';
-                print $societestatic->getNomUrl(1, 'customer', 44);
+				print '<td class="nowrap tdoverflowmax100">';
+                print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
@@ -814,6 +890,14 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 				$i++;
 			}
 
+			if ($othernb) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="5">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
+
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($tot_ht).'</td>';
 			print '<td class="nowrap right">'.price($tot_ttc).'</td>';
@@ -823,9 +907,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 			print '</table></div><br>';
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -847,7 +929,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$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";
-	$sql .= " WHERE s.rowid = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
+	$sql .= " WHERE s.rowid = f.fk_soc AND f.paye = 0 AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 	$sql .= " AND f.entity IN (".getEntity('invoice').')';
 	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;
@@ -865,10 +947,19 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
 		$num = $db->num_rows($resql);
 		$i = 0;
+		$othernb = 0;
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BillsCustomersUnpaid", $num).' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th>';
+
+		print '<tr class="liste_titre">';
+		print '<th colspan="2">';
+		print $langs->trans("BillsCustomersUnpaid", $num).' ';
+		print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?search_status='.Facture::STATUS_VALIDATED.'">';
+		print '<span class="badge">'.$num.'</span>';
+		print '</a>';
+		print '</th>';
+
 		print '<th class="right">'.$langs->trans("DateDue").'</th>';
 		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
 		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
@@ -883,6 +974,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			{
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += $obj->total_ht;
+					$total_ttc += $obj->total_ttc;
+					continue;
+				}
+
 				$facturestatic->ref = $obj->ref;
 				$facturestatic->id = $obj->rowid;
 				$facturestatic->total_ht = $obj->total_ht;
@@ -923,14 +1022,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				print '</td></tr></table>';
 
 				print '</td>';
-				print '<td class="left">';
-				print $societestatic->getNomUrl(1, 'customer', 44);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->datelimite), 'day').'</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="nowrap right">'.price($obj->am).'</td>';
-				print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).'</td>';
+				print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am, $obj->type).'</td>';
 				print '</tr>';
 
 				$total_ttc += $obj->total_ttc;
@@ -940,6 +1039,16 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$i++;
 			}
 
+			if ($othernb) {
+				$colspan = 6;
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="'.$colspan.'">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
+
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).')</font> </td>';
 			print '<td>&nbsp;</td>';
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($total).'</td>';
@@ -947,18 +1056,14 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			print '<td class="nowrap right">'.price($totalam).'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			$colspan = 6;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -970,7 +1075,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 {
 	$facstatic = new FactureFournisseur($db);
 
-	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
+	$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";
@@ -983,7 +1088,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= " WHERE s.rowid = ff.fk_soc";
 	$sql .= " AND ff.entity = ".$conf->entity;
 	$sql .= " AND ff.paye = 0";
-	$sql .= " AND ff.fk_statut = 1";
+	$sql .= " AND ff.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	if ($socid) $sql .= " AND ff.fk_soc = ".$socid;
 	// Add where from hooks
@@ -991,7 +1096,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierUnpaid', $parameters);
 	$sql .= $hookmanager->resPrint;
 
-	$sql .= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.tva, ff.total_tva, ff.total_ttc, ff.paye, ff.date_lim_reglement,";
+	$sql .= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.type, ff.libelle, ff.total_ht, ff.tva, ff.total_tva, ff.total_ttc, ff.paye, ff.date_lim_reglement,";
 	$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
 	$sql .= " ORDER BY ff.date_lim_reglement ASC";
 
@@ -999,10 +1104,21 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	if ($resql)
 	{
 		$num = $db->num_rows($resql);
+		$othernb = 0;
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BillsSuppliersUnpaid", $num).' <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php"><span class="badge">'.$num.'</span></a></th>';
+
+		print '<tr class="liste_titre">';
+		print '<th colspan="2">';
+		print $langs->trans("BillsSuppliersUnpaid", $num).' ';
+		print '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status='.FactureFournisseur::STATUS_VALIDATED.'">';
+		// TODO: "impayees.php" looks very outdatetd and should be set to deprecated or directly remove in the next version
+		// <a href="'.DOL_URL_ROOT.'/fourn/facture/impayees.php">
+		print '<span class="badge">'.$num.'</span>';
+		print '</a>';
+		print '</th>';
+
 		print '<th class="right">'.$langs->trans("DateDue").'</th>';
 		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
 		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
@@ -1018,8 +1134,17 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			{
 				$obj = $db->fetch_object($resql);
 
+				if ($i >= $max) {
+					$othernb += 1;
+					$i++;
+					$total += $obj->total_ht;
+					$total_ttc += $obj->total_ttc;
+					continue;
+				}
+
 				$facstatic->ref = $obj->ref;
 				$facstatic->id = $obj->rowid;
+				$facstatic->type = $obj->type;
 				$facstatic->total_ht = $obj->total_ht;
 				$facstatic->total_tva = $obj->total_tva;
 				$facstatic->total_ttc = $obj->total_ttc;
@@ -1034,15 +1159,15 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$societestatic->code_compta = $obj->code_compta;
 				$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven"><td>';
+				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
 				print $facstatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td>'.$societestatic->getNomUrl(1, 'supplier', 44).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$societestatic->getNomUrl(1, 'supplier').'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').'</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="nowrap right">'.price($obj->am).'</td>';
-				print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).'</td>';
+				print '<td>'.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am, $obj->type).'</td>';
 				print '</tr>';
 				$total += $obj->total_ht;
 				$total_ttc += $obj->total_ttc;
@@ -1050,6 +1175,16 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$i++;
 			}
 
+			if ($othernb) {
+				$colspan = 6;
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
+				print '<tr class="oddeven">';
+				print '<td class="nowrap" colspan="'.$colspan.'">';
+				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
+				print '</td>';
+				print "</tr>\n";
+			}
+
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc - $totalam).')</font> </td>';
 			print '<td>&nbsp;</td>';
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($total).'</td>';
@@ -1057,17 +1192,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print '<td class="nowrap right">'.price($totalam).'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			$colspan = 6;
 			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index 1459bbf2402..d754760dd57 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -91,7 +91,7 @@ $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescPurchasesJournal").'<br>';
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-else  $description .= $langs->trans("DepositsAreIncluded");
+else $description .= $langs->trans("DepositsAreIncluded");
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
@@ -106,7 +106,7 @@ $sql .= " s.rowid as socid, s.nom as name, s.code_compta_fournisseur,";
 $sql .= " p.rowid as pid, p.ref as ref, p.accountancy_code_buy,";
 $sql .= " ct.accountancy_code_buy as account_tva, ct.recuperableonly";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva as ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = '".$idpays."'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva as ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = ".((int) $idpays);
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
 $sql .= " JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
 $sql .= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
@@ -168,8 +168,7 @@ if ($result)
 
 		$i++;
 	}
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -238,9 +237,7 @@ foreach ($tabfac as $key => $val)
 				{
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
-				}
-				else
-				{
+				} 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 98bd5e989f7..62e8c77a133 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -93,7 +93,7 @@ $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescSellsJournal").'<br>';
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-else  $description .= $langs->trans("DepositsAreIncluded");
+else $description .= $langs->trans("DepositsAreIncluded");
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
 
@@ -109,13 +109,12 @@ $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
 $sql .= " JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 $sql .= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = '".$idpays."'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_tva ct ON fd.tva_tx = ct.taux AND fd.info_bits = ct.recuperableonly AND ct.fk_pays = ".((int) $idpays);
 $sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 $sql .= " AND f.fk_statut > 0";
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
-}
-else {
+} else {
 	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_STANDARD.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 }
 
@@ -195,8 +194,7 @@ if ($result)
    		$tabcompany[$obj->rowid] = array('id'=>$obj->socid, 'name'=>$obj->name, 'client'=>$obj->client);
    		$i++;
    	}
-}
-else {
+} else {
     dol_print_error($db);
 }
 
@@ -268,9 +266,7 @@ foreach ($tabfac as $key => $val)
 				{
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
-				}
-				else
-				{
+				} else {
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 	    			print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				}
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 51275c7159f..6353d394f20 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -80,9 +80,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
         $db->commit();
         header("Location: list.php?localTaxType=".$lttype);
         exit;
-    }
-    else
-    {
+    } else {
         $db->rollback();
         setEventMessages($object->error, $object->errors, 'errors');
         $_GET["action"] = "create";
@@ -113,22 +111,16 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/compta/localtax/list.php?localTaxType='.$object->ltt);
 				exit;
-			}
-			else
-			{
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-	else
-	{
+	} else {
         $mesg = 'Error try do delete a line linked to a conciliated bank transaction';
         setEventMessages($mesg, null, 'errors');
 	}
@@ -288,10 +280,8 @@ if ($id)
 	print "<div class=\"tabsAction\">\n";
 	if ($object->rappro == 0)
 	{
-		print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
-	}
-	else
-	{
+		print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
 	}
 	print "</div>";
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 6aa7c2b1a87..1dfeb0b8930 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -137,15 +137,11 @@ class Localtax extends CommonObject
             {
             	$this->db->commit();
             	return $this->id;
-            }
-            else
-			{
+            } else {
 				$this->db->rollback();
 				return -1;
             }
-        }
-        else
-		{
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -206,9 +202,7 @@ class Localtax extends CommonObject
     	{
     		$this->db->commit();
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->db->rollback();
     		return -1;
     	}
@@ -270,9 +264,7 @@ class Localtax extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -377,15 +369,11 @@ class Localtax extends CommonObject
             	$ret = $obj->amount;
                 $this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else
-		{
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -418,15 +406,11 @@ class Localtax extends CommonObject
             	$ret = $obj->total_localtax;
                 $this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
             	return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -461,15 +445,11 @@ class Localtax extends CommonObject
                 $ret = $obj->amount;
             	$this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -547,9 +527,7 @@ class Localtax extends CommonObject
                     if ($bank_line_id > 0)
 					{
                         $this->update_fk_bank($bank_line_id);
-                    }
-					else
-					{
+                    } else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
@@ -567,22 +545,16 @@ class Localtax extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -3;
 				}
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -604,9 +576,7 @@ class Localtax extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result) {
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index 61a11a042f2..1b1ad5351d3 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -53,17 +53,13 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
     $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
-		{
+		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);
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 		}
-	}
-	else
-	{
+	} 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); }
@@ -92,7 +88,7 @@ if (empty($local))
 }
 
 
-
+$calc = 0;
 /*
  * View
  */
@@ -124,11 +120,11 @@ $calc = $conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
 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 .= '<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')';
+    $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 .= '<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')';
+    $description .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
 	$builddate = dol_now();
 
 	$elementcust = $langs->trans("CustomersInvoices");
@@ -141,11 +137,11 @@ 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 .= '<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')';
+    $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 .= '<br>('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')';
+    $description .= '<span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
     $builddate = dol_now();
 
 	$elementcust = $langs->trans("CustomersInvoices");
@@ -161,10 +157,12 @@ report_header($name, '', $period, $periodlink, $description, $builddate, $export
 $vatcust = $langs->transcountry($local == 1 ? "LT1" : "LT2", $mysoc->country_code);
 $vatsup = $langs->transcountry($local == 1 ? "LT1" : "LT2", $mysoc->country_code);
 
+print '<div class="div-table-responsive">';
+print '<table class="noborder centpercent">';
+
 // IRPF that the customer has retained me
 if ($calc == 0 || $calc == 2)
 {
-	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td class="left">'.$langs->trans("Num").'</td>';
 	print '<td class="left">'.$langs->trans("Customer").'</td>';
@@ -201,9 +199,7 @@ if ($calc == 0 || $calc == 2)
 					if ($coll->assuj == '1')
 					{
 						$intra = $langs->trans('Unknown');
-					}
-					else
-					{
+					} else {
 						$intra = '';
 					}
 				}
@@ -229,22 +225,18 @@ if ($calc == 0 || $calc == 2)
 	    print '<td class="nowrap right">'.price($totalamount).'</td>';
 		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		if ($coll_list == -1)
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 		elseif ($coll_list == -2)
 			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		else
-			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		else print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
 	}
 }
 
 // IRPF I retained my supplier
 if ($calc == 0 || $calc == 1) {
-	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td class="left">'.$langs->trans("Num")."</td>";
 	print '<td class="left">'.$langs->trans("Supplier")."</td>";
@@ -274,9 +266,7 @@ if ($calc == 0 || $calc == 1) {
 					if ($coll->assuj == '1')
 					{
 						$intra = $langs->trans('Unknown');
-					}
-					else
-					{
+					} else {
 						$intra = '';
 					}
 				}
@@ -302,32 +292,30 @@ if ($calc == 0 || $calc == 1) {
 	    print '<td class="nowrap right">'.price($totalamount).'</td>';
 		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
-
-		print '</table>';
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		if ($coll_list == -1)
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 		elseif ($coll_list == -2)
 			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		else
-			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		else print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
 	}
 }
 
 if ($calc == 0) {
 	// Total to pay
-	print '<br><br>';
-	print '<table class="noborder centpercent">';
+	print '<tr><td colspan="5"></td></tr>';
+
 	$diff = $x_coll_sum - $x_paye_sum;
 	print '<tr class="liste_total">';
 	print '<td class="liste_total" colspan="4">'.$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";
 }
+
 print '</table>';
+print '</div>';
+
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index a08ac99d6bd..e8bcc89821b 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -52,15 +52,11 @@ 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 (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 {
 			$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;
 		}
-	}
-	else
-	{
+	} 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); }
@@ -152,9 +148,7 @@ function pt($db, $sql, $date)
             	$amountpaid = 0;
             	$previousmode = '';
             	$previousmonth = '';
-            }
-            else
-            {
+            } else {
             	$previousmode = $obj->mode;
             	$previousmonth = $obj->dm;
             }
@@ -182,8 +176,7 @@ function pt($db, $sql, $date)
 
         print "</table>";
         $db->free($result);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -234,10 +227,10 @@ $fsearch .= '<input type="hidden" name="modetax" value="'.$modetax.'">';
 $description = $fsearch;
 
 // Show report header
-$name = $langs->trans("ReportByMonth");
+$name = $langs->transcountry($localTaxType == 1 ? "LT1ReportByMonth" : "LT2ReportByMonth", $mysoc->country_code);
 $description .= $langs->trans($LT);
 $calcmode = $langs->trans("LTReportBuildWithOptionDefinedInModule").' ';
-$calcmode .= '('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')<br>';
+$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
 
 //if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='<br>'.$langs->trans("ThisIsAnEstimatedValue");
 
@@ -388,9 +381,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				'localtax2'			=>$x_paye[$my_paye_rate]['localtax2_list'][$id],
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else
-			{
+			} else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 47a0f44be47..2702a962281 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -31,7 +31,7 @@ $langs->load("compta");
 $socid = GETPOST('socid', 'int');
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
-$ltt = GETPOST("localTaxType");
+$ltt = GETPOST("localTaxType", 'int');
 
 
 /*
@@ -42,17 +42,15 @@ llxHeader();
 
 $localtax_static = new Localtax($db);
 
-$newcardbutton = '';
-if ($user->rights->tax->charges->creer)
-{
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt);
-}
+$url = DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt;
+if (!empty($socid)) $url .= '&socid='.$socid;
+$newcardbutton = dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
 
 print load_fiche_titre($langs->transcountry($ltt == 2 ? "LT2Payments" : "LT1Payments", $mysoc->country_code), $newcardbutton, 'title_accountancy');
 
 $sql = "SELECT rowid, amount, label, f.datev, f.datep";
 $sql .= " FROM ".MAIN_DB_PREFIX."localtax as f ";
-$sql .= " WHERE f.entity = ".$conf->entity." AND localtaxtype=".$db->escape($ltt);
+$sql .= " WHERE f.entity = ".$conf->entity." AND localtaxtype = ".$db->escape($ltt);
 $sql .= " ORDER BY datev DESC";
 
 $result = $db->query($sql);
@@ -95,9 +93,7 @@ if ($result)
 
     print "</table>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 8e2e871251f..ebb66778df7 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -63,17 +63,13 @@ 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 (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 {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 		}
-	}
-	else
-	{
+	} 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); }
@@ -138,7 +134,7 @@ $calcmode = '';
 if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
 if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
 if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
-$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')';
+$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 $prevyear = $year_start;
@@ -204,12 +200,13 @@ if ($local == 1) {
 }
 
 // VAT Received and paid
+print '<div class="div-table-responsive">';
 echo '<table class="noborder centpercent">';
 
 $y = $year_current;
 $total = 0;
 $i = 0;
-$columns = 5;
+$columns = 4;
 
 // Load arrays of datas
 $x_coll = tax_by_rate('localtax'.$local, $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
@@ -222,11 +219,8 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		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
-{
+	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
@@ -317,8 +311,9 @@ else
 	$x_paye_sum = 0;
 	$x_paye_ht = 0;
 
-	$span = $columns;
-	if ($modetax != 1) $span += 2;
+	$span = $columns - 1;
+	if ($modetax != 2) $span += 1;
+	if ($modetax != 1) $span += 1;
 
 	// Customers invoices
 	print '<tr class="liste_titre">';
@@ -372,9 +367,7 @@ else
 						$product_static->type = $fields['ptype'];
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
-					}
-					else
-					{
+					} else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
 			            if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
@@ -416,8 +409,7 @@ else
 						if ($type == 0)
 						{
 							print $langs->trans("NotUsedForGoods");
-						}
-						else {
+						} else {
 							print price($fields['payment_amount']);
 							if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
 						}
@@ -477,10 +469,10 @@ else
 
     // Blank line
 	print '<tr><td colspan="'.($span + 1).'">&nbsp;</td></tr>';
-	print '</table>';
+	//print '</table>';
 	$diff = $x_coll_sum;
 
-	echo '<table class="noborder centpercent">';
+	//echo '<table class="noborder centpercent">';
 	//print table headers for this quadri - expenses now
 	print '<tr class="liste_titre">';
 	print '<td class="left">'.$elementsup.'</td>';
@@ -532,9 +524,7 @@ else
 						$product_static->type = $fields['ptype'];
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
-					}
-					else
-					{
+					} else {
 						if ($type) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
 						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
@@ -572,9 +562,7 @@ else
 						if ($type == 0)
 						{
 							print $langs->trans("NA");
-						}
-						else
-						{
+						} else {
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
 								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
@@ -631,11 +619,7 @@ else
 		print '</tr>';
 	}
 
-	print '</table>';
-
 	// Total to pay
-    print '<br><br>';
-    print '<table class="noborder centpercent">';
     $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>';
@@ -644,7 +628,9 @@ else
 
 	$i++;
 }
+
 print '</table>';
+print '</div>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 4a7e387987c..9d86cff65dd 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -47,7 +47,7 @@ $accountid = GETPOST('accountid', 'int');
 $paymentnum	= GETPOST('num_paiement', 'alpha');
 $socid      = GETPOST('socid', 'int');
 
-$sortfield	= GETPOST('sortfield', 'alpha');
+$sortfield	= GETPOST('sortfield', 'aZ09comma');
 $sortorder	= GETPOST('sortorder', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
@@ -107,7 +107,7 @@ if (empty($reshook))
 			if (substr($key, 0, 7) == 'amount_' && GETPOST($key) != '')
 	        {
 	            $cursorfacid = substr($key, 7);
-	            $amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
+	            $amounts[$cursorfacid] = price2num(GETPOST($key));
 	            $totalpayment = $totalpayment + $amounts[$cursorfacid];
 	            if (!empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
 	            $result = $tmpinvoice->fetch($cursorfacid);
@@ -131,11 +131,10 @@ if (empty($reshook))
 	            }
 
 	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        }
-			elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
-	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
+	            $multicurrency_amounts[$cursorfacid] = price2num(GETPOST($key));
 	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
 	            if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
 	            $result = $tmpinvoice->fetch($cursorfacid);
@@ -266,8 +265,6 @@ if (empty($reshook))
 	    $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');
-	    $paiement->num_paiement = $paiement->num_payment; // For bacward compatibility
-	    $paiement->note         = $paiement->note_private; // For bacward compatibility
 
 	    if (!$error)
 	    {
@@ -312,9 +309,7 @@ if (empty($reshook))
 	        else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
 	        header('Location: '.$loc);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	    }
 	}
@@ -503,9 +498,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             print '<td>';
             $form->select_comptes($accountid, 'accountid', 0, '', 2);
             print '</td>';
-        }
-        else
-        {
+        } else {
             print '<td>&nbsp;</td>';
         }
         print "</tr>\n";
@@ -531,7 +524,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		// 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', 'none').'</textarea></td></tr>';
+		print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('comment', 'restricthtml').'</textarea></td></tr>';
 
         print '</table>';
 
@@ -560,9 +553,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         if ($facture->type != Facture::TYPE_CREDIT_NOTE)
         {
             $sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-        }
-        else
-        {
+        } 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
@@ -665,9 +656,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                         }
 
                         print '</td>';
-                    }
-                    else
-                    {
+                    } else {
                         print '<td align="center"></td>';
                     }
 
@@ -710,9 +699,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
     				    			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
-    				    	{
+    				    	} else {
     				    		print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
     				    		print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
     				    	}
@@ -746,9 +733,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							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
-                    {
+                    } 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)).'">';
                     }
@@ -803,9 +788,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 //print "</td></tr>\n";
             }
             $db->free($resql);
-        }
-        else
-		{
+        } else {
             dol_print_error($db);
         }
 
@@ -866,7 +849,7 @@ if (!GETPOST('action', 'aZ09'))
     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';
+    $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';
@@ -902,7 +885,7 @@ if (!GETPOST('action', 'aZ09'))
             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_paiement."</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>';
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index d3dec6fde82..dd7651a6147 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('bills', 'banks', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -60,14 +60,12 @@ if ($action == 'setnote' && $user->rights->facture->paiement)
     $db->begin();
 
     $object->fetch($id);
-    $result = $object->update_note(GETPOST('note', 'none'));
+    $result = $object->update_note(GETPOST('note', 'restricthtml'));
     if ($result > 0)
     {
         $db->commit();
         $action = '';
-    }
-    else
-    {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
     }
@@ -87,15 +85,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
         {
         	header("Location: ".$backtopage);
         	exit;
-        }
-        else
-        {
+        } else {
         	header("Location: list.php");
         	exit;
         }
-	}
-	else
-	{
+	} else {
 	    $langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
@@ -131,9 +125,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
 
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 	    $langs->load("errors");
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
@@ -147,9 +139,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
@@ -162,9 +152,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
@@ -413,9 +401,7 @@ if ($resql)
 	print '</div>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -445,9 +431,7 @@ if ($user->socid == 0 && $action == '')
 		if (!$disable_delete)
 		{
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 2fd885c5201..71cd900f915 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('banks', 'categories', 'bills', 'companies', 'compta'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -46,8 +46,8 @@ $fieldname = (!empty($ref) ? 'ref' : 'rowid');
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque', '', 'fk_user_author', $fieldname);
 
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortorder) $sortorder = "ASC";
 if (!$sortfield) $sortfield = "b.dateo,b.rowid";
@@ -57,7 +57,7 @@ $offset = $limit * $page;
 
 $dir = $conf->bank->dir_output.'/checkdeposits/';
 $filterdate = dol_mktime(0, 0, 0, GETPOST('fdmonth'), GETPOST('fdday'), GETPOST('fdyear'));
-$filteraccountid = GETPOST('accountid');
+$filteraccountid = GETPOST('accountid', 'int');
 
 $object = new RemiseCheque($db);
 
@@ -79,9 +79,7 @@ if ($action == 'setdate' && $user->rights->banque->cheque)
         {
 			setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else
-    {
+    } else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -98,9 +96,7 @@ if ($action == 'setrefext' && $user->rights->banque->cheque)
         {
             setEventMessages($object->error, $object->errors, 'errors');
         }
-    }
-    else
-    {
+    } else {
         setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -117,9 +113,7 @@ if ($action == 'setref' && $user->rights->banque->cheque)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -149,30 +143,24 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che
 
        		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
         	exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorSelectAtLeastOne"), null, 'mesgs');
 	    $action = 'new';
 	}
 }
 
-if ($action == 'remove' && $id > 0 && $_GET["lineid"] > 0 && $user->rights->banque->cheque)
+if ($action == 'remove' && $id > 0 && GETPOST("lineid", 'int') > 0 && $user->rights->banque->cheque)
 {
 	$object->id = $id;
-	$result = $object->removeCheck($_GET["lineid"]);
+	$result = $object->removeCheck(GETPOST("lineid", "int"));
 	if ($result === 0)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -185,9 +173,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c
 	{
 		header("Location: index.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($paiement->error, $paiement->errors, 'errors');
 	}
 }
@@ -212,9 +198,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->c
 
         header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -222,7 +206,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->c
 if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->banque->cheque)
 {
 	$reject_date = dol_mktime(0, 0, 0, GETPOST('rejectdate_month'), GETPOST('rejectdate_day'), GETPOST('rejectdate_year'));
-	$rejected_check = GETPOST('bankid');
+	$rejected_check = GETPOST('bankid', 'int');
 
 	$object->fetch($id);
 	$paiement_id = $object->rejectCheck($rejected_check, $reject_date);
@@ -232,9 +216,7 @@ if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->ban
 		//header("Location: ".DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id);
 		//exit;
 		$action = '';
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
@@ -261,15 +243,11 @@ if ($action == 'builddoc' && $user->rights->banque->cheque)
 	{
 		dol_print_error($db, $object->error);
 		exit;
-	}
-	else
-	{
+	} else {
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc'));
 		exit;
 	}
-}
-
-// Remove file in doc form
+} // Remove file in doc form
 elseif ($action == 'remove_file' && $user->rights->banque->cheque)
 {
 	if ($object->fetch($id) > 0)
@@ -314,9 +292,7 @@ if ($action == 'new')
 	$h++;
 
 	print load_fiche_titre($langs->trans("Cheques"), '', 'bank_account');
-}
-else
-{
+} else {
 	$result = $object->fetch($id, $ref);
 	if ($result < 0)
 	{
@@ -357,7 +333,7 @@ else
 	if ($action == 'reject_check')
 	{
 		$formquestion = array(
-			array('type' => 'hidden', 'name' => 'bankid', 'value' => GETPOST('lineid')),
+			array('type' => 'hidden', 'name' => 'bankid', 'value' => GETPOST('lineid', 'int')),
 			array('type' => 'date', 'name' => 'rejectdate_', 'label' => $langs->trans("RejectCheckDate"), 'value' => dol_now())
 		);
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("RejectCheck"), $langs->trans("ConfirmRejectCheck"), 'confirm_reject_check', $formquestion, '', 1);
@@ -418,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= '".$filteraccountid."'";
+    if ($filteraccountid > 0) $sql .= " AND ba.rowid = ".((int) $filteraccountid);
 	$sql .= $db->order("b.dateo,b.rowid", "ASC");
 
 	$resql = $db->query($sql);
@@ -510,9 +486,7 @@ if ($action == 'new')
 				if ($paymentstatic->id)
 				{
 					print $paymentstatic->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print '&nbsp;';
 				}
 				print '</td>';
@@ -522,9 +496,7 @@ if ($action == 'new')
 				if ($accountlinestatic->rowid)
 				{
 					print $accountlinestatic->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print '&nbsp;';
 				}
 				print '</td>';
@@ -544,17 +516,13 @@ if ($action == 'new')
 		if ($user->rights->banque->cheque)
 		{
 			print '<input type="submit" class="button" value="'.$langs->trans('NewCheckDepositOn', $account_label).'">';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn', $account_label).'</a>';
 		}
 		print '</div><br>';
 		print '</form>';
 	}
-}
-else
-{
+} else {
 	$paymentstatic = new Paiement($db);
 	$accountlinestatic = new AccountLine($db);
 	$accountstatic = new Account($db);
@@ -588,9 +556,7 @@ else
         print $form->selectDate($object->date_bordereau, 'datecreate_', '', '', '', "setdate");
         print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
         print '</form>';
-    }
-    else
-    {
+    } else {
         print $object->date_bordereau ? dol_print_date($object->date_bordereau, 'day') : '&nbsp;';
     }
 
@@ -700,9 +666,7 @@ else
     			if ($paymentstatic->id)
     			{
     				print $paymentstatic->getNomUrl(1);
-    			}
-    			else
-    			{
+    			} else {
     				print '&nbsp;';
     			}
     			print '</td>';
@@ -712,9 +676,7 @@ else
     			if ($accountlinestatic->rowid)
     			{
     				print $accountlinestatic->getNomUrl(1);
-    			}
-    			else
-    			{
+    			} else {
     				print '&nbsp;';
     			}
     			print '</td>';
@@ -737,9 +699,7 @@ else
 
     			$i++;
     		}
-        }
-        else
-        {
+        } else {
             print '<td colspan="8" class="opacitymedium">';
             print $langs->trans("None");
             print '</td>';
@@ -756,9 +716,7 @@ else
 		}
 
 		print "</div>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -776,12 +734,12 @@ print '<div class="tabsAction">';
 
 if ($user->socid == 0 && !empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)
 {
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valide&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Validate').'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valide&amp;token='.newToken().'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Validate').'</a>';
 }
 
 if ($user->socid == 0 && !empty($object->id) && $user->rights->banque->cheque)
 {
-	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Delete').'</a>';
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Delete').'</a>';
 }
 print '</div>';
 
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 746065647d5..00815c90f7d 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -120,18 +120,14 @@ class RemiseCheque extends CommonObject
 				if ($this->statut == 0)
 				{
 					$this->ref = "(PROV".$this->id.")";
-				}
-				else
-				{
+				} else {
 					$this->ref = $obj->ref;
 				}
 			}
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 		    $this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -215,7 +211,7 @@ class RemiseCheque extends CommonObject
 				$sql .= " WHERE b.fk_type = 'CHQ'";
 				$sql .= " AND b.amount > 0";
 				$sql .= " AND b.fk_bordereau = 0";
-				$sql .= " AND b.fk_account='".$account_id."'";
+				$sql .= " AND b.fk_account = ".((int) $account_id);
 				if ($limit) $sql .= $this->db->plimit($limit);
 
 				dol_syslog("RemiseCheque::Create", LOG_DEBUG);
@@ -227,9 +223,7 @@ class RemiseCheque extends CommonObject
 						array_push($lines, $row[0]);
 					}
 					$this->db->free($resql);
-				}
-				else
-				{
+				} else {
 					$this->errno = -1026;
 					dol_syslog("RemiseCheque::Create Error ".$this->errno, LOG_ERR);
 				}
@@ -269,9 +263,7 @@ class RemiseCheque extends CommonObject
 					dol_syslog("RemiseCheque::Create Error update amount ".$this->errno, LOG_ERR);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$this->errno = -1;
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
@@ -288,9 +280,7 @@ class RemiseCheque extends CommonObject
             $this->db->commit();
             dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
             return $this->errno;
@@ -341,9 +331,7 @@ class RemiseCheque extends CommonObject
 		if ($this->errno === 0)
 		{
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Delete ROLLBACK ($this->errno)");
 		}
@@ -370,7 +358,7 @@ class RemiseCheque extends CommonObject
 		if ($this->errno == 0 && $numref)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
-			$sql .= " SET statut = 1, ref = '".$numref."'";
+			$sql .= " SET statut = 1, ref = '".$this->db->escape($numref)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 			$sql .= " AND entity = ".$conf->entity;
 			$sql .= " AND statut = 0";
@@ -385,15 +373,11 @@ class RemiseCheque extends CommonObject
 				{
 				    $this->ref = $numref;
 					$this->statut = 1;
-				}
-				else
-				{
+				} else {
 					$this->errno = -1029;
 					dol_syslog("Remisecheque::Validate Error ".$this->errno, LOG_ERR);
 				}
-			}
-			else
-			{
+			} else {
 				$this->errno = -1033;
 				dol_syslog("Remisecheque::Validate Error ".$this->errno, LOG_ERR);
 			}
@@ -404,9 +388,7 @@ class RemiseCheque extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::Validate ".$this->errno, LOG_ERR);
             return $this->errno;
@@ -488,9 +470,7 @@ class RemiseCheque extends CommonObject
 			}
 
 			return $numref;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Bank"));
 			return "";
@@ -544,9 +524,7 @@ class RemiseCheque extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -584,9 +562,7 @@ class RemiseCheque extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -664,17 +640,13 @@ class RemiseCheque extends CommonObject
 			{
 				//$outputlangs->charset_output=$sav_charset_output;
 				return 1;
-			}
-			else
-			{
+			} else {
 				//$outputlangs->charset_output=$sav_charset_output;
 				dol_syslog("Error");
 				dol_print_error($this->db, $docmodel->error);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorFileDoesNotExists", $dir.$file);
 			return -1;
 		}
@@ -690,6 +662,7 @@ class RemiseCheque extends CommonObject
 		global $conf;
 
 		$this->errno = 0;
+
 		$this->db->begin();
 		$total = 0;
 		$nb = 0;
@@ -709,8 +682,8 @@ class RemiseCheque extends CommonObject
 			$this->db->free($resql);
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
-			$sql .= " SET amount = '".price2num($total)."'";
-			$sql .= ", nbcheque = ".$nb;
+			$sql .= " SET amount = ".price2num($total);
+			$sql .= ", nbcheque = ".((int) $nb);
 			$sql .= " WHERE rowid = ".$this->id;
 			$sql .= " AND entity = ".$conf->entity;
 
@@ -720,9 +693,7 @@ class RemiseCheque extends CommonObject
 				$this->errno = -1030;
 				dol_syslog("RemiseCheque::updateAmount ERREUR UPDATE ($this->errno)");
 			}
-		}
-		else
-		{
+		} else {
 			$this->errno = -1031;
 			dol_syslog("RemiseCheque::updateAmount ERREUR SELECT ($this->errno)");
 		}
@@ -730,9 +701,7 @@ class RemiseCheque extends CommonObject
 		if ($this->errno === 0)
 		{
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog("RemiseCheque::updateAmount ROLLBACK ($this->errno)");
 		}
@@ -754,16 +723,14 @@ class RemiseCheque extends CommonObject
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 			$sql .= " SET fk_bordereau = 0";
-			$sql .= " WHERE rowid = '".$account_id."'";
-			$sql .= " AND fk_bordereau = ".$this->id;
+			$sql .= " WHERE rowid = ".((int) $account_id);
+			$sql .= " AND fk_bordereau = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->updateAmount();
-			}
-			else
-			{
+			} else {
 				$this->errno = -1032;
 				dol_syslog("RemiseCheque::removeCheck ERREUR UPDATE ($this->errno)");
 			}
@@ -808,18 +775,18 @@ class RemiseCheque extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
 		$sql .= ' WHERE pf.fk_paiement = '.$payment->id;
 
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$rejectedPayment = new Paiement($db);
+			$rejectedPayment = new Paiement($this->db);
 			$rejectedPayment->amounts = array();
 			$rejectedPayment->datepaye = $rejection_date;
 			$rejectedPayment->paiementid = dol_getIdFromCode($this->db, 'CHQ', 'c_paiement', 'code', 'id', 1);
 			$rejectedPayment->num_payment = $payment->num_payment;
 
-			while ($obj = $db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$invoice = new Facture($db);
+				$invoice = new Facture($this->db);
 				$invoice->fetch($obj->fk_facture);
 				$invoice->set_unpaid($user);
 
@@ -838,31 +805,23 @@ class RemiseCheque extends CommonObject
 					{
     					$this->db->commit();
     					return $rejectedPayment->id;
-					}
-					else
-					{
+					} else {
                         $this->db->rollback();
 					    return -1;
 					}
-				}
-				else
-				{
+				} else {
 				    $this->error = $rejectedPayment->error;
 				    $this->errors = $rejectedPayment->errors;
 				    $this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $rejectedPayment->error;
 				$this->errors = $rejectedPayment->errors;
 			    $this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -935,15 +894,11 @@ class RemiseCheque extends CommonObject
             {
                 $this->date_bordereau = $date;
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->error();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             return -2;
         }
     }
@@ -970,15 +925,11 @@ class RemiseCheque extends CommonObject
 			if ($resql)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -1046,8 +997,7 @@ class RemiseCheque extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index c85553d59a8..1ee79aeafd9 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -76,9 +76,7 @@ if ($resql) {
     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
-{
+} else {
     dol_print_error($db);
 }
 
@@ -140,9 +138,7 @@ if ($resql)
 	print "</table>";
 
 	$db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index fe1f7c31050..3bb45c4e312 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -124,11 +124,9 @@ if ($resql)
     if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-	$newcardbutton = '';
-	if ($user->rights->banque->cheque)
-	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new');
-	}
+	$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->cheque);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -221,9 +219,7 @@ if ($resql)
             print "</tr>\n";
     		$i++;
     	}
-    }
-    else
-    {
+    } else {
    		print '<tr class="oddeven">';
    		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";
    		print '</tr>';
@@ -231,9 +227,7 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 	print "</form>\n";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 7a759dde543..5cb16bdcbe3 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2018      Ferran Marcet		 <fmarcet@2byte.es>
  * Copyright (C) 2018      Thibault FOUCART		 <support@ptibogxiv.net>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020      Andreu Bisquerra Gaya <jove@bisquerra.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
@@ -73,6 +74,8 @@ class Paiement extends CommonObject
 	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 $author;
 	public $paiementid; // Type of payment. Id saved into fields fk_paiement on llx_paiement
 	public $paiementcode; // Code of payment.
@@ -87,13 +90,6 @@ class Paiement extends CommonObject
      */
     public $type_code;
 
-    /**
-     * @var string Numero du CHQ, VIR, etc...
-     * @deprecated
-     * @see $num_payment
-     */
-    public $numero;
-
     /**
      * @var string Numero du CHQ, VIR, etc...
      * @deprecated
@@ -140,6 +136,10 @@ class Paiement extends CommonObject
      */
     public $fk_paiement; // Type of payment
 
+    /**
+     * @var string payment external reference
+     */
+    public $ref_ext;
 
 	/**
 	 *	Constructor
@@ -161,7 +161,7 @@ class Paiement extends CommonObject
 	 */
 	public function fetch($id, $ref = '', $fk_bank = '')
 	{
-		$sql = 'SELECT p.rowid, p.ref, p.datep as dp, p.amount, p.statut, p.ext_payment_id, p.ext_payment_site, p.fk_bank, p.multicurrency_amount,';
+		$sql = 'SELECT p.rowid, p.ref, p.ref_ext, p.datep as dp, p.amount, p.statut, p.ext_payment_id, p.ext_payment_site, p.fk_bank, p.multicurrency_amount,';
 		$sql .= ' c.code as type_code, c.libelle as type_label,';
 		$sql .= ' p.num_paiement as num_payment, p.note,';
 		$sql .= ' b.fk_account';
@@ -184,9 +184,9 @@ class Paiement extends CommonObject
 
 				$this->id             = $obj->rowid;
 				$this->ref            = $obj->ref ? $obj->ref : $obj->rowid;
+				$this->ref_ext        = $obj->ref_ext;
 				$this->date           = $this->db->jdate($obj->dp);
 				$this->datepaye       = $this->db->jdate($obj->dp);
-				$this->num_paiement   = $obj->num_payment; // deprecated
 				$this->num_payment    = $obj->num_payment;
 				$this->montant        = $obj->amount; // deprecated
 				$this->amount         = $obj->amount;
@@ -204,15 +204,11 @@ class Paiement extends CommonObject
 
 				$this->db->free($resql);
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->free($resql);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -246,9 +242,7 @@ class Paiement extends CommonObject
 		{
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
-		}
-		else
-		{
+		} else {
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
@@ -282,22 +276,25 @@ class Paiement extends CommonObject
 
 		$this->ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
 
+		if (empty($this->ref_ext)) {
+			$this->ref_ext = '';
+		}
+
 		if ($way == 'dolibarr')
 		{
 			$total = $totalamount;
 			$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
-		}
-		else
-		{
+		} else {
 			$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
 			$mtotal = $totalamount;
 		}
 
-		$num_payment = ($this->num_payment ? $this->num_payment : $this->num_paiement);
-		$note = ($this->note_public ? $this->note_public : $this->note);
+		$num_payment = $this->num_payment;
+		$note = ($this->note_private ? $this->note_private : $this->note);
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, ext_payment_id, ext_payment_site, fk_user_creat)";
-		$sql .= " VALUES (".$conf->entity.", '".$this->db->escape($this->ref)."', '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', ".$total.", ".$mtotal.", ".$this->paiementid.", '".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, ref_ext, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, ext_payment_id, ext_payment_site, fk_user_creat, pos_change)";
+		$sql .= " VALUES (".$conf->entity.", '".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', ".$total.", ".$mtotal.", ".$this->paiementid.", ";
+		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((int) $this->pos_change).")";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -344,8 +341,7 @@ class Paiement extends CommonObject
                             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
-                            {
+                            else {
                                 // If invoice is a down payment, we also convert down payment to discount
                                 if ($invoice->type == Facture::TYPE_DEPOSIT)
                                 {
@@ -433,15 +429,11 @@ class Paiement extends CommonObject
                             	$error++;
                             }
                         }
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror();
 						$error++;
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.');
 				}
 			}
@@ -453,9 +445,7 @@ class Paiement extends CommonObject
 				if ($result < 0) { $error++; }
 				// Fin appel triggers
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
@@ -467,9 +457,7 @@ class Paiement extends CommonObject
 		    $this->multicurrency_amount = $mtotal;
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -505,9 +493,7 @@ class Paiement extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -573,9 +559,7 @@ class Paiement extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error;
 			$this->db->rollback();
 			return -5;
@@ -724,7 +708,7 @@ class Paiement extends CommonObject
 						$bank_line_id,
 						$this->id_prelevement,
 						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
-						$this->num_paiement,
+						$this->num_payment,
 						'withdraw'
 					);
 				}
@@ -736,9 +720,7 @@ class Paiement extends CommonObject
 				    if ($result < 0) { $error++; }
 				    // Fin appel triggers
 				}
-            }
-            else
-			{
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -746,9 +728,7 @@ class Paiement extends CommonObject
             if (!$error)
             {
             	$this->db->commit();
-            }
-            else
-			{
+            } else {
             	$this->db->rollback();
             }
         }
@@ -756,9 +736,7 @@ class Paiement extends CommonObject
         if (!$error)
         {
             return $bank_line_id;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -782,9 +760,7 @@ class Paiement extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
             $this->error = $this->db->lasterror();
             dol_syslog(get_class($this).'::update_fk_bank '.$this->error);
 			return -1;
@@ -824,7 +800,7 @@ class Paiement extends CommonObject
 
             $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 = '".$type."' AND url_id = ".$this->id.")";
+            $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);
@@ -845,9 +821,7 @@ class Paiement extends CommonObject
 
                 $this->db->commit();
                 return 0;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
@@ -876,9 +850,7 @@ class Paiement extends CommonObject
             {
             	$this->num_payment = $this->db->escape($num);
                 return 0;
-            }
-            else
-            {
+            } else {
                 $this->error = 'Error -1 '.$this->db->error();
                 return -2;
             }
@@ -901,9 +873,7 @@ class Paiement extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::valide '.$this->error);
 			return -1;
@@ -925,9 +895,7 @@ class Paiement extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::reject '.$this->error);
 			return -1;
@@ -971,9 +939,7 @@ class Paiement extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
     }
@@ -1005,9 +971,7 @@ class Paiement extends CommonObject
 			}
 
 			return $billsarray;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error.' -', LOG_DEBUG);
 			return -1;
@@ -1039,9 +1003,7 @@ class Paiement extends CommonObject
     		}
 
     		return $amounts;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->error();
     		dol_syslog(get_class($this).'::getAmountsArray Error '.$this->error.' -', LOG_DEBUG);
     		return -1;
@@ -1124,9 +1086,7 @@ class Paiement extends CommonObject
 			}
 
 			return $numref;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Invoice"));
 			return "";
@@ -1199,7 +1159,7 @@ class Paiement extends CommonObject
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-        $label = '<u>'.$langs->trans("ShowPayment").'</u><br>';
+        $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')
@@ -1212,7 +1172,7 @@ class Paiement extends CommonObject
             	foreach ($arraybill as $billid)
             	{
             		$facturestatic->fetch($billid);
-            		$label .= '<br> '.$facturestatic->getNomUrl(1).' '.$facturestatic->getLibStatut(2, 1);
+            		$label .= '<br> '.$facturestatic->getNomUrl(1, '', 0, 0, '', 1).' '.$facturestatic->getLibStatut(2, 1);
             	}
             }
         }
@@ -1227,8 +1187,7 @@ class Paiement extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
 
diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php
index 00c3440b868..68d987b06ff 100644
--- a/htdocs/compta/paiement/info.php
+++ b/htdocs/compta/paiement/info.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array('bills', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 /*
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 20401d81a1a..f3ea57ea084 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -1,13 +1,14 @@
 <?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
- * Copyright (C) 2015      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2017      Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2018      Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018      Charlene Benke       <charlie@patas-monkey.com>
+/* Copyright (C) 2001-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +31,11 @@
  */
 
 require '../../main.inc.php';
+
+// Security check
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'facture', $facid, '');
+
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -39,138 +45,169 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'compta', 'companies'));
 
-$action		= GETPOST('action', 'alpha');
-$confirm	= GETPOST('confirm', 'alpha');
-$optioncss = GETPOST('optioncss', 'alpha');
+$action				= GETPOST('action', 'alpha');
+$massaction			= GETPOST('massaction', 'alpha');
+$confirm			= GETPOST('confirm', 'alpha');
+$optioncss			= GETPOST('optioncss', 'alpha');
+$contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'paymentlist';
 
-$facid	= GETPOST('facid', 'int');
-$socid	= GETPOST('socid', 'int');
-$userid = GETPOST('userid', 'int');
-$day = GETPOST('day', 'int');
-$month	= GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
+$facid				= GETPOST('facid', 'int');
+$socid				= GETPOST('socid', 'int');
+$userid				= GETPOST('userid', 'int');
+$day				= GETPOST('day', 'int');
+$month				= GETPOST('month', 'int');
+$year				= GETPOST('year', 'int');
 
-// Security check
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'facture', $facid, '');
+$search_ref			= GETPOST("search_ref", "alpha");
+$search_company		= GETPOST("search_company", 'alpha');
+$search_paymenttype	= GETPOST("search_paymenttype");
+$search_account		= GETPOST("search_account", "int");
+$search_payment_num	= GETPOST('search_payment_num', 'alpha');
+$search_amount		= GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
 
-$paymentstatic = new Paiement($db);
-$accountstatic = new Account($db);
-$companystatic = new Societe($db);
+$limit				= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield			= GETPOST("sortfield", 'alpha');
+$sortorder			= GETPOST("sortorder", 'alpha');
+$page				= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
-$search_ref = GETPOST("search_ref", "alpha");
-$search_account = GETPOST("search_account", "int");
-$search_paymenttype = GETPOST("search_paymenttype");
-$search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
-$search_company = GETPOST("search_company", 'alpha');
-$search_payment_num = GETPOST('search_payment_num', 'alpha');
-
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) $page = 0;      // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+
 if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "p.rowid";
+if (!$sortfield) $sortfield = "p.ref";
+
+$search_all = trim(GETPOSTISSET("search_all") ? GETPOSTISSET("search_all", 'alpha') : GETPOST('sall'));
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'p.ref'=>"RefPayment",
+	's.nom'=>"ThirdParty",
+	'p.num_paiement'=>"Numero",
+	'p.amount'=>"Amount",
+);
+
+$arrayfields = array(
+	'p.ref'				=> array('label'=>"RefPayment",				'checked'=>1, 'position'=>10),
+	'p.datep'			=> array('label'=>"Date",					'checked'=>1, 'position'=>20),
+	's.nom'				=> array('label'=>"ThirdParty",				'checked'=>1, 'position'=>30),
+	'c.libelle'			=> array('label'=>"Type",					'checked'=>1, 'position'=>40),
+	'transaction'		=> array('label'=>"BankTransactionLine",	'checked'=>1, 'position'=>50, 'enabled'=>(!empty($conf->banque->enabled))),
+	'ba.label'			=> array('label'=>"Account",				'checked'=>1, 'position'=>60, 'enabled'=>(!empty($conf->banque->enabled))),
+	'p.num_paiement'	=> array('label'=>"Numero",					'checked'=>1, 'position'=>70, 'tooltip'=>"ChequeOrTransferNumber"),
+	'p.amount'			=> array('label'=>"Amount",					'checked'=>1, 'position'=>80),
+	'p.statut'			=> array('label'=>"Status",					'checked'=>1, 'position'=>90, 'enabled'=>(!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentlist'));
-$extrafields = new ExtraFields($db);
-
-$arrayfields = array();
-
+$object = new Paiement($db);
 
 /*
  * Actions
  */
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
-	$search_ref = "";
-	$search_account = "";
-	$search_amount = "";
-    $search_paymenttype = "";
-    $search_payment_num = "";
-	$search_company = "";
-    $day = '';
-    $year = '';
-    $month = '';
-    $search_array_options = array();
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		$search_ref = '';
+		$search_account = '';
+		$search_amount = '';
+		$search_paymenttype = '';
+		$search_payment_num = '';
+		$search_company = '';
+		$day = '';
+		$year = '';
+		$month = '';
+		$option = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 }
 
-
 /*
- * 	View
+ * View
  */
 
 $form = new Form($db);
 $formother = new FormOther($db);
+$accountstatic = new Account($db);
+$companystatic = new Societe($db);
+$bankline = new AccountLine($db);
 
 llxHeader('', $langs->trans('ListPayment'));
 
-if (GETPOST("orphelins", "alpha"))
-{
-    // Payments not linked to an invoice. Should not happend. For debug only.
-    $sql = "SELECT p.rowid, p.ref, p.datep as dp, p.amount,";
-    $sql .= " p.statut, p.num_paiement as num_payment,";
-    $sql .= " c.code as paiement_code";
+if (GETPOST("orphelins", "alpha")) {
+	// Payments not linked to an invoice. Should not happend. For debug only.
+	$sql = "SELECT p.ref, p.datep, p.amount, p.statut, p.num_paiement";
+	$sql .= ", c.code as paiement_code";
+
 	// Add fields from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
-    $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " WHERE p.entity IN (".getEntity('invoice').")";
-    $sql .= " AND pf.fk_facture IS NULL";
+	$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+	$sql .= " AND pf.fk_facture IS NULL";
+
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
-}
-else
-{
-    $sql = "SELECT DISTINCT p.rowid, p.ref, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
-    $sql .= " p.statut, p.num_paiement as num_payment,";
-    $sql .= " c.code as paiement_code,";
-    $sql .= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal,";
-    $sql .= " s.rowid as socid, s.nom as name, s.email";
+} else {
+	// DISTINCT is to avoid duplicate when there is a link to sales representatives
+	$sql = "SELECT DISTINCT p.ref, p.datep, p.fk_bank, p.amount, p.statut, p.num_paiement";
+	$sql .= ", c.code as paiement_code";
+	$sql .= ", ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal";
+	$sql .= ", s.rowid as socid, s.nom as name, s.email";
+
 	// Add fields from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
-    $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-    if (!$user->rights->societe->client->voir && !$socid)
-    {
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-    }
-    $sql .= " WHERE p.entity IN (".getEntity('invoice').")";
-    if (!$user->rights->societe->client->voir && !$socid)
-    {
-        $sql .= " AND sc.fk_user = ".$user->id;
-    }
-    if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
-    if ($userid)
-    {
-        if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
-        else  $sql .= " AND f.fk_user_author = ".$userid;
-    }
-    // Search criteria
-    $sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
-    if ($search_ref)       		    $sql .= natural_search('p.ref', $search_ref);
-    if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
-    if ($search_paymenttype != "")  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
-    if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
-    if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
-    if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
+	$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+	}
+	$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND sc.fk_user = ".$user->id;
+	}
+	if ($socid > 0) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if ($userid) {
+		if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
+		else $sql .= " AND f.fk_user_author = ".$userid;
+	}
+
+	// Search criteria
+	$sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
+	if ($search_ref)       		    $sql .= natural_search('p.ref', $search_ref);
+	if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
+	if ($search_paymenttype != '')  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
+	if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
+	if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
+	if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
+
+	if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
@@ -179,211 +216,291 @@ else
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
+
+	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
 		$page = 0;
 		$offset = 0;
 	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
-//print "$sql";
 
 $resql = $db->query($sql);
-if ($resql)
+if (!$resql) {
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+$param .= (GETPOST("orphelins") ? "&orphelins=1" : '');
+$param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : '');
+$param .= ($search_company ? "&search_company=".urlencode($search_company) : '');
+$param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : '');
+$param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : '');
+if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
+
+if ($search_all)
 {
-    $num = $db->num_rows($resql);
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
 
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    $param .= (GETPOST("orphelins") ? "&orphelins=1" : "");
-    $param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : "");
-    $param .= ($search_company ? "&search_company=".urlencode($search_company) : "");
-    $param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : "");
-    $param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : "");
-    if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+$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 '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
 
-    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
+print '<tr class="liste_titre_filter">';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-    // Lines for filters fields
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-    print '</td>';
-    print '<td class="liste_titre center">';
-    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-    print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
-    print '</td>';
-    if (!empty($conf->banque->enabled))
-    {
-	    print '<td class="liste_titre">';
-	    $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	    print '</td>';
-    }
-    print '<td class="liste_titre right">';
-    print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+// Filters: Lines (placeholder)
+print '<tr class="liste_titre_filter">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print '<td class="liste_titre">';
 	print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-    {
-        print '<td class="liste_titre right">';
-        print '</td>';
-    }
-    print "</tr>\n";
+}
 
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "p.rowid", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "p.num_paiement", "", $param, "", $sortfield, $sortorder);
-    if (!empty($conf->banque->enabled))
-    {
-        print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-    }
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-    //print_liste_field_titre("Invoices"),"","","",$param,'class="left"',$sortfield,$sortorder);
+// Filter: Ref
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
 
-	$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;
+// Filter: Date
+if (!empty($arrayfields['p.datep']['checked'])) {
+	print '<td class="liste_titre center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print '</td>';
+}
 
-    if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "p.statut", "", $param, 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-    print "</tr>\n";
+// Filter: Thirdparty
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+	print '</td>';
+}
 
-    $i = 0;
-    $totalarray = array();
-    while ($i < min($num, $limit))
-    {
-        $objp = $db->fetch_object($resql);
+// Filter: Payment type
+if (!empty($arrayfields['c.libelle']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
+	print '</td>';
+}
 
-        $paymentstatic->id = $objp->rowid;
-        $paymentstatic->ref = $objp->ref;
+// Filter: Bank transaction number
+if (!empty($arrayfields['transaction']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
+	print '</td>';
+}
 
-        $companystatic->id = $objp->socid;
-        $companystatic->name = $objp->name;
-        $companystatic->email = $objp->email;
+// Filter: Cheque number (fund transfer)
+if (!empty($arrayfields['p.num_paiement']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
 
-        print '<tr class="oddeven">';
+// Filter: Bank account
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_account, 'search_account', 0, '', 1);
+	print '</td>';
+}
 
-        print '<td>';
-        print $paymentstatic->getNomUrl(1);
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+// Filter: Amount
+if (!empty($arrayfields['p.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+	print '</td>';
+}
 
-        // Date
-        $dateformatforpayment = 'day';
-        if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
-        print '<td class="center">'.dol_print_date($db->jdate($objp->dp), $dateformatforpayment).'</td>';
-        if (!$i) $totalarray['nbfield']++;
+// Filter: Status (only placeholder)
+if (!empty($arrayfields['p.statut']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
 
-        // Thirdparty
-        print '<td>';
-        if ($objp->socid > 0)
-        {
-            print $companystatic->getNomUrl(1, '', 24);
-        }
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+// 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;
 
-        // Type
-        print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
-        if (!$i) $totalarray['nbfield']++;
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
 
-        // Payment number
-        print '<td>'.$objp->num_payment.'</td>';
-        if (!$i) $totalarray['nbfield']++;
+print "</tr>";
 
-        // Account
-	    if (!empty($conf->banque->enabled))
-	    {
-	        print '<td>';
-	        if ($objp->bid > 0)
-	        {
-	            $accountstatic->id = $objp->bid;
-	            $accountstatic->ref = $objp->bref;
-	            $accountstatic->label = $objp->blabel;
-	            $accountstatic->number = $objp->number;
-	            $accountstatic->account_number = $objp->account_number;
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.datep']['checked']))				print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], "p.datep", '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['s.nom']['checked']))				print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['c.libelle']['checked']))			print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.num_paiement']['checked']))		print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
+if (!empty($arrayfields['transaction']['checked']))			print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], "ba.label", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.amount']['checked']))			print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], "p.amount", '', $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($arrayfields['p.statut']['checked']))			print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", '', $param, 'class="right"', $sortfield, $sortorder);
 
-				$accountingjournal = new AccountingJournal($db);
-				$accountingjournal->fetch($objp->accountancy_journal);
-				$accountstatic->accountancy_journal = $accountingjournal->code;
+// 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 $accountstatic->getNomUrl(1);
-	        }
-	        print '</td>';
-	        if (!$i) $totalarray['nbfield']++;
-	    }
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print "</tr>";
 
-	    // Amount
-        print '<td class="right">'.price($objp->amount).'</td>';
-        if (!$i) $totalarray['nbfield']++;
-        $totalarray['pos'][7] = 'amount';
-        $totalarray['val']['amount'] += $objp->amount;
+$checkedCount = 0;
+foreach ($arrayfields as $column) {
+	if ($column['checked']) {
+		$checkedCount++;
+	}
+}
 
-        if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-        {
-            print '<td class="right">';
-            if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
-            print $paymentstatic->LibStatut($objp->statut, 5);
-            if ($objp->statut == 0) print '</a>';
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-        }
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit)) {
+	$objp = $db->fetch_object($resql);
 
-		print '<td></td>';
+	$object->id = $objp->rowid;
+	$object->ref = $objp->ref;
+
+	$companystatic->id = $objp->socid;
+	$companystatic->name = $objp->name;
+	$companystatic->email = $objp->email;
+
+	print '<tr class="oddeven">';
+
+	// No
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
 		if (!$i) $totalarray['nbfield']++;
+	}
 
-		print '</tr>';
+	// Ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td>'.$object->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-        $i++;
-    }
+	// Date
+	if (!empty($arrayfields['p.datep']['checked'])) {
+		$dateformatforpayment = 'day';
+		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
+		print '<td class="center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    // Show total line
-    include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+	// Thirdparty
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print '<td>';
+		if ($objp->socid > 0) {
+			print $companystatic->getNomUrl(1, '', 24);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
+	// Payment type
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
 
-    print "</table>\n";
-    print "</div>";
-    print "</form>\n";
-}
-else
-{
-    dol_print_error($db);
+	// Filter: Cheque number (fund transfer)
+	if (!empty($arrayfields['p.num_paiement']['checked'])) {
+		print '<td>'.$objp->num_paiement.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Bank transaction
+	if (!empty($arrayfields['transaction']['checked'])) {
+		$bankline->fetch($objp->fk_bank);
+		print '<td>'.$bankline->getNomUrl(1, 0).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Bank account
+	if (!empty($arrayfields['ba.label']['checked'])) {
+		print '<td>';
+		if ($objp->bid > 0) {
+			$accountstatic->id = $objp->bid;
+			$accountstatic->ref = $objp->bref;
+			$accountstatic->label = $objp->blabel;
+			$accountstatic->number = $objp->number;
+			$accountstatic->account_number = $objp->account_number;
+
+			$accountingjournal = new AccountingJournal($db);
+			$accountingjournal->fetch($objp->accountancy_journal);
+			$accountstatic->accountancy_journal = $accountingjournal->code;
+
+			print $accountstatic->getNomUrl(1);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	if (!empty($arrayfields['p.amount']['checked'])) {
+		print '<td class="right">'.price($objp->amount).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		$totalarray['pos'][$checkedCount] = 'amount';
+		$totalarray['val']['amount'] += $objp->amount;
+	}
+
+	// Status
+	if (!empty($arrayfields['p.statut']['checked'])) {
+		print '<td class="right">';
+		if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
+		print $object->LibStatut($objp->statut, 5);
+		if ($objp->statut == 0) print '</a>';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Buttons
+	print '<td></td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>';
+
+	$i++;
 }
 
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print "</table>";
+print "</div>";
+print "</form>";
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 80013d3d865..9d3bae3140d 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2020      Maxime DEMAREST      <maxime@indelog.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
@@ -26,6 +27,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Security check
@@ -68,9 +70,7 @@ if ($action == 'builddoc')
     if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
     {
         $outputlangs->charset_output = $sav_charset_output;
-    }
-    else
-    {
+    } else {
         $outputlangs->charset_output = $sav_charset_output;
         dol_print_error($db, $obj->error);
     }
@@ -84,6 +84,7 @@ if ($action == 'builddoc')
  */
 
 $formother = new FormOther($db);
+$formfile = new FormFile($db);
 
 llxHeader();
 
@@ -155,7 +156,7 @@ if ($year)
                     $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></td>';
+                    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>';
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 91ef2c215e6..00e9a0c4074 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -40,8 +40,8 @@ if ($user->socid > 0)
 
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -126,9 +126,7 @@ if ($resql)
         if ($objp->statut == 0)
         {
             print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
-        }
-        else
-        {
+        } else {
             print "-";
         }
 
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 509e20f3613..5f442ab0b18 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->load("bills");
 
 $chid = GETPOST("id", 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $amounts = array();
 
 // Security check
@@ -41,6 +41,8 @@ if ($user->socid > 0)
 	$socid = $user->socid;
 }
 
+$charge = new ChargeSociales($db);
+
 
 /*
  * Actions
@@ -110,8 +112,8 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
     		$paiement->amounts      = $amounts; // Tableau de montant
     		$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
     		$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-    		$paiement->note         = GETPOST("note", 'none');
-    		$paiement->note_private = GETPOST("note", 'none');
+    		$paiement->note         = GETPOST("note", 'restricthtml');
+    		$paiement->note_private = GETPOST("note", 'restricthtml');
 
     		if (!$error)
     		{
@@ -141,9 +143,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
                 $loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
                 header('Location: '.$loc);
                 exit;
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
         }
@@ -163,7 +163,6 @@ $form = new Form($db);
 // Formulaire de creation d'un paiement de charge
 if ($action == 'create')
 {
-	$charge = new ChargeSociales($db);
 	$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;
@@ -225,7 +224,7 @@ if ($action == 'create')
 	print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
 	$datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 	$datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (empty($_POST["remonth"]) ?-1 : $datepaye) : 0;
-	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
+	print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution"));
 	print "</td>";
 	print '</tr>';
 
@@ -283,9 +282,7 @@ if ($action == 'create')
 		if ($objp->date_ech > 0)
 		{
 			print '<td class="left">'.dol_print_date($objp->date_ech, 'day').'</td>'."\n";
-		}
-		else
-		{
+		} else {
 			print "<td align=\"center\"><b>!!!</b></td>\n";
 		}
 
@@ -305,9 +302,7 @@ if ($action == 'create')
 			$remaintopay = $objp->amount - $sumpaid;
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
-		}
-		else
-		{
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 5fdfe327056..0e71c83f6cb 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -66,9 +66,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
         $db->commit();
         header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php?mode=sconly");
         exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -184,7 +182,7 @@ print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">'.dol_print_date($o
 print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("PaymentType".$object->type_code).'</td></tr>';
 
 // Numero
-print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_paiement.'</td></tr>';
+print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_payment.'</td></tr>';
 
 // Montant
 print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
@@ -283,9 +281,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -315,10 +311,8 @@ if ($action == '')
 	{
 		if (!$disable_delete)
 		{
-			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
+			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.GETPOST('id', 'int').'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index fb1432a18f1..e2477d86544 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -162,15 +162,11 @@ if ($resql)
             print '</tr>';
             $i++;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoSupplierInvoiceToWithdraw", $langs->transnoentitiesnoconv("BankTransfer")).'</td></tr>';
     }
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -231,9 +227,7 @@ if ($result)
 
     print "</table></div><br>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 00bcd088e27..2691e14504d 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('banks', 'categories', 'bills', 'companies', 'withdrawal
 if ($user->socid > 0) accessforbidden();
 
 // Get supervariables
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
@@ -45,8 +45,8 @@ $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -81,38 +81,38 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($action == 'confirm_delete')
-    {
-        $res = $object->delete($user);
-        if ($res > 0)
-        {
-        	if ($object->type == 'bank-transfer') {
-        		header("Location: ".DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php');
-        	} else {
-        		header("Location: ".DOL_URL_ROOT.'/compta/prelevement/index.php');
-        	}
-            exit;
-        }
-    }
+	if ($action == 'confirm_delete')
+	{
+		$res = $object->delete($user);
+		if ($res > 0)
+		{
+			if ($object->type == 'bank-transfer') {
+				header("Location: ".DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php');
+			} else {
+				header("Location: ".DOL_URL_ROOT.'/compta/prelevement/index.php');
+			}
+			exit;
+		}
+	}
 
-    // Seems to no be used and replaced with $action == 'infocredit'
-    if ($action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes')
-    {
-        $res = $object->set_credite();
-        if ($res >= 0)
-        {
-            header("Location: card.php?id=".$id);
-            exit;
-        }
-    }
+	// Seems to no be used and replaced with $action == 'infocredit'
+	if ($action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes')
+	{
+		$res = $object->set_credite();
+		if ($res >= 0)
+		{
+			header("Location: card.php?id=".$id);
+			exit;
+		}
+	}
 
-    if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-        /*
+		/*
         if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
         {
             $dir = $conf->prelevement->dir_output.'/receipts';
@@ -133,24 +133,24 @@ if (empty($reshook))
 
 		$error = $object->set_infotrans($user, $dt, GETPOST('methode', 'alpha'));
 
-        if ($error)
-        {
-            header("Location: card.php?id=".$id."&error=$error");
-            exit;
-        }
-    }
+		if ($error)
+		{
+			header("Location: card.php?id=".$id."&error=$error");
+			exit;
+		}
+	}
 
 	// Set direct debit order to credited, create payment and close invoices
 	if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
 	{
 		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-        $error = $object->set_infocredit($user, $dt);
-        if ($error)
-        {
-        	setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
+		$error = $object->set_infocredit($user, $dt);
+		if ($error)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 
@@ -179,7 +179,7 @@ if ($id > 0 || $ref)
 
 	}*/
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/bons.php'.($object->type != 'bank-transfer' ? '' : '?type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/orders_list.php?restore_lastsearch_values=1'.($object->type != 'bank-transfer' ? '' : '&type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref');
 
@@ -317,15 +317,15 @@ if ($id > 0 || $ref)
 
 		if (empty($object->date_trans) && $user->rights->prelevement->bons->send)
 		{
-			print "<a class=\"butAction\" href=\"card.php?action=settransmitted&id=".$object->id."\">".$langs->trans("SetToStatusSent")."</a>";
+			print "<a class=\"butAction\" href=\"card.php?action=settransmitted&token='.newToken().'&id=".$object->id."\">".$langs->trans("SetToStatusSent")."</a>";
 		}
 
 		if (!empty($object->date_trans) && $object->date_credit == 0)
 		{
-			print "<a class=\"butAction\" href=\"card.php?action=setcredited&id=".$object->id."\">".$langs->trans("ClassCredited")."</a>";
+			print "<a class=\"butAction\" href=\"card.php?action=setcredited&token='.newToken().'&id=".$object->id."\">".$langs->trans("ClassCredited")."</a>";
 		}
 
-		print "<a class=\"butActionDelete\" href=\"card.php?action=delete&id=".$object->id."\">".$langs->trans("Delete")."</a>";
+		print "<a class=\"butActionDelete\" href=\"card.php?action=delete&token='.newToken().'&id=".$object->id."\">".$langs->trans("Delete")."</a>";
 
 		print "</div>";
 	}
@@ -421,9 +421,7 @@ if ($id > 0 || $ref)
 			if ($obj->statut == 3)
 			{
 		  		print '<b>'.$langs->trans("StatusRefused").'</b>';
-			}
-			else
-			{
+			} else {
 				if ($object->statut == BonPrelevement::STATUS_CREDITED)
 				{
 					if ($obj->statut == 2) {
@@ -431,15 +429,11 @@ if ($id > 0 || $ref)
 						{
 							//print '<a class="butActionDelete" href="line.php?action=rejet&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
 							print '<a href="line.php?action=rejet&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
-						}
-						else
-						{
+						} else {
 							//print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("StandingOrderReject").'</a>';
 						}
 					}
-				}
-				else
-				{
+				} else {
 					//print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotPossibleForThisStatusOfWithdrawReceiptORLine").'">'.$langs->trans("StandingOrderReject").'</a>';
 				}
 			}
@@ -472,9 +466,7 @@ if ($id > 0 || $ref)
 		print '</form>';
 
 		$db->free($result);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index b1e7e29a698..9d3c5bef7a8 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -162,21 +162,15 @@ class BonPrelevement extends CommonObject
 				if ($this->db->query($sql))
 				{
 					$result = 0;
-				}
-				else
-				{
+				} else {
 					$result = -1;
 					dol_syslog(get_class($this)."::AddFacture Error $result");
 				}
-			}
-			else
-			{
+			} else {
 				$result = -2;
 				dol_syslog(get_class($this)."::AddFacture Error $result");
 			}
-		}
-		else
-		{
+		} else {
 			$result = -3;
 			dol_syslog(get_class($this)."::AddFacture Error $result");
 		}
@@ -211,22 +205,18 @@ class BonPrelevement extends CommonObject
 			$sql .= " FROM  ".MAIN_DB_PREFIX."prelevement_lignes";
 			$sql .= " WHERE fk_prelevement_bons = ".$this->id;
 			$sql .= " AND fk_soc =".$client_id;
-			$sql .= " AND code_banque ='".$code_banque."'";
-			$sql .= " AND code_guichet ='".$code_guichet."'";
-			$sql .= " AND number ='".$number."'";
+			$sql .= " AND code_banque = '".$this->db->escape($code_banque)."'";
+			$sql .= " AND code_guichet = '".$this->db->escape($code_guichet)."'";
+			$sql .= " AND number = '".$this->db->escape($number)."'";
 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$num = $this->db->num_rows($resql);
-			}
-			else
-			{
+			} else {
 				$result = -1;
 			}
-		}
-		else
-		{
+		} else {
 			/*
 			 * No aggregate
 			 */
@@ -244,19 +234,17 @@ class BonPrelevement extends CommonObject
 			$sql .= ", ".$client_id;
 			$sql .= ", '".$this->db->escape($client_nom)."'";
 			$sql .= ", '".price2num($amount)."'";
-			$sql .= ", '".$code_banque."'";
-			$sql .= ", '".$code_guichet."'";
-			$sql .= ", '".$number."'";
-			$sql .= ", '".$number_key."'";
+			$sql .= ", '".$this->db->escape($code_banque)."'";
+			$sql .= ", '".$this->db->escape($code_guichet)."'";
+			$sql .= ", '".$this->db->escape($number)."'";
+			$sql .= ", '".$this->db->escape($number_key)."'";
 			$sql .= ")";
 
 			if ($this->db->query($sql))
 			{
 				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
 				$result = 0;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::addline Error -2");
 				$result = -2;
 			}
@@ -330,20 +318,16 @@ class BonPrelevement extends CommonObject
 				$this->type           = $obj->type;
 
 				$this->status         = $obj->status;
-				$this->statut         = $obj->status;	// For backward compatibility
+				$this->statut         = $obj->status; // For backward compatibility
 
 				$this->fetched = 1;
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::Fetch Erreur aucune ligne retournee");
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -411,17 +395,13 @@ class BonPrelevement extends CommonObject
 			{
 				$this->db->commit();
 				return 0;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::set_credite ROLLBACK ");
 
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::set_credite Ouverture transaction SQL impossible ");
 			return -2;
 		}
@@ -527,19 +507,16 @@ class BonPrelevement extends CommonObject
 					}
 
 					$paiement->num_payment = $this->ref; // Set ref of direct debit note
-					$paiement->num_paiement = $this->ref; // For backward compatibility
 					$paiement->id_prelevement = $this->id;
 
-					$paiement_id = $paiement->create($user);		// This use ->paiementid, that is ID of payment mode
+					$paiement_id = $paiement->create($user); // This use ->paiementid, that is ID of payment mode
 					if ($paiement_id < 0)
 					{
 						$error++;
 						$this->error = $paiement->error;
 						$this->errors = $paiement->errors;
 						dol_syslog(get_class($this)."::set_infocredit AddPayment Error ".$this->error);
-					}
-					else
-					{
+					} else {
 						if ($this->type == 'bank-transfer') {
 							$modeforaddpayment = 'payment_supplier';
 						} else {
@@ -562,20 +539,17 @@ class BonPrelevement extends CommonObject
 
 				// Update withdrawal line
 				// TODO: Translate to ligneprelevement.class.php
-				if (! $error) {
+				if (!$error) {
 					$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
 					$sql .= " SET statut = 2";
 					$sql .= " WHERE fk_prelevement_bons = ".$this->id;
 
-					if (!$this->db->query($sql))
-					{
+					if (!$this->db->query($sql)) {
 						dol_syslog(get_class($this)."::set_infocredit Update lines Error");
 						$error++;
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				dol_syslog(get_class($this)."::set_infocredit Update Bons Error");
 				$error++;
@@ -591,15 +565,11 @@ class BonPrelevement extends CommonObject
 
 				$this->db->commit();
 				return 0;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -1026;
 		}
 	}
@@ -641,9 +611,7 @@ class BonPrelevement extends CommonObject
 				$message .= $langs->trans("InfoTransData", price($this->amount), $this->methodes_trans[$this->method_trans], dol_print_date($date, 'day'));
 
 				// TODO Call trigger to create a notification using notification module
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 
@@ -655,17 +623,13 @@ class BonPrelevement extends CommonObject
 				$this->db->commit();
 
 				return 0;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::set_infotrans ROLLBACK", LOG_ERR);
 
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::set_infotrans Ouverture transaction SQL impossible", LOG_CRIT);
 			return -2;
 		}
@@ -720,8 +684,7 @@ class BonPrelevement extends CommonObject
 				{
 					$row = $this->db->fetch_row($resql);
 					if (!$amounts) $arr[$i] = $row[0];
-					else
-					{
+					else {
 						$arr[$i] = array(
 							$row[0],
 							$row[1]
@@ -731,9 +694,7 @@ class BonPrelevement extends CommonObject
 				}
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::getListInvoices Erreur");
 		}
 
@@ -782,9 +743,7 @@ class BonPrelevement extends CommonObject
 			$this->db->free($resql);
 
 			return $obj->nb;
-		}
-		else
-		{
+		} else {
 			$error = 1;
 			dol_syslog(get_class($this)."::SommeAPrelever Erreur -1");
 			dol_syslog($this->db->error());
@@ -847,9 +806,7 @@ class BonPrelevement extends CommonObject
 			$this->db->free($resql);
 
 			return $obj->nb;
-		}
-		else
-		{
+		} else {
 			$this->error = get_class($this)."::NbFactureAPrelever Erreur -1 sql=".$this->db->error();
 			return -1;
 		}
@@ -926,7 +883,7 @@ class BonPrelevement extends CommonObject
 				$sql .= " AND f.rowid = pfd.fk_facture_fourn";
 			}
 			$sql .= " AND s.rowid = f.fk_soc";
-			$sql .= " AND f.fk_statut = 1";			// Invoice validated
+			$sql .= " AND f.fk_statut = 1"; // Invoice validated
 			$sql .= " AND f.paye = 0";
 			$sql .= " AND pfd.traite = 0";
 			$sql .= " AND f.total_ttc > 0";
@@ -954,9 +911,7 @@ class BonPrelevement extends CommonObject
 				}
 				$this->db->free($resql);
 				dol_syslog(__METHOD__."::Read invoices, ".$i." invoices to withdraw", LOG_DEBUG);
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_syslog(__METHOD__."::Read invoices error ".$this->db->error(), LOG_ERR);
 			}
@@ -1006,27 +961,19 @@ class BonPrelevement extends CommonObject
 								$factures_prev_id[$i] = $fac[0];
 								$i++;
 								//dol_syslog(__METHOD__."::RIB is ok", LOG_DEBUG);
-							}
-							else
-							{
+							} else {
 								dol_syslog(__METHOD__."::Check BAN Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$tmpinvoice->socid." ".$soc->name, LOG_WARNING);
 								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$tmpinvoice->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 								$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice ".$tmpinvoice->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 							}
-						}
-						else
-						{
+						} else {
 							dol_syslog(__METHOD__."::Check BAN Failed to read company", LOG_WARNING);
 						}
-					}
-					else
-					{
+					} else {
 						dol_syslog(__METHOD__."::Check BAN Failed to read invoice", LOG_WARNING);
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog(__METHOD__."::Check BAN No invoice to process", LOG_WARNING);
 			}
 		}
@@ -1112,15 +1059,11 @@ class BonPrelevement extends CommonObject
 						$prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
 						$this->id = $prev_id;
 						$this->ref = $ref;
-					}
-					else
-					{
+					} else {
 						$error++;
 						dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 				}
@@ -1235,7 +1178,7 @@ class BonPrelevement extends CommonObject
 			/*
 			 * Update total defined after generation of file
 			 */
-			if (! $error) {
+			if (!$error) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
 				$sql .= " SET amount = ".price2num($this->total);
 				$sql .= " WHERE rowid = ".$this->id;
@@ -1334,9 +1277,7 @@ class BonPrelevement extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1361,7 +1302,7 @@ class BonPrelevement extends CommonObject
 
 		$result = '';
 
-		$labeltoshow = 'Withdraw';
+		$labeltoshow = 'PaymentByDirectDebit';
 		if ($this->type == 'bank-transfer') {
 			$labeltoshow = 'PaymentByBankTransfer';
 		}
@@ -1403,8 +1344,7 @@ class BonPrelevement extends CommonObject
 			 $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.'>';
@@ -1440,14 +1380,12 @@ class BonPrelevement extends CommonObject
 		$result = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-		$sql .= " WHERE rowid = '".$rowid."'";
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		if ($this->db->query($sql))
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -1466,14 +1404,12 @@ class BonPrelevement extends CommonObject
 		$result = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-		$sql .= " WHERE fk_user=".$user." AND fk_action='".$action."'";
+		$sql .= " WHERE fk_user=".$user." AND fk_action='".$this->db->escape($action)."'";
 
 		if ($this->db->query($sql))
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -1497,15 +1433,13 @@ class BonPrelevement extends CommonObject
 			$now = dol_now();
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)";
-			$sql .= " VALUES (".$db->idate($now).",".$user.", 'NULL', 'NULL', '".$action."')";
+			$sql .= " VALUES ('".$this->db->idate($now)."', ".$user.", 'NULL', 'NULL', '".$this->db->escape($action)."')";
 
 			dol_syslog("adnotiff: ".$sql);
 			if ($this->db->query($sql))
 			{
 				$result = 0;
-			}
-			else
-			{
+			} else {
 				$result = -1;
 				dol_syslog(get_class($this)."::AddNotification Error $result");
 			}
@@ -1607,7 +1541,7 @@ class BonPrelevement extends CommonObject
 					{
 						$obj = $this->db->fetch_object($resql);
 
-						if (! empty($cachearraytotestduplicate[$obj->idfac])) {
+						if (!empty($cachearraytotestduplicate[$obj->idfac])) {
 							$this->error = $langs->trans('ErrorCompanyHasDuplicateDefaultBAN', $obj->socid);
 							$this->invoice_in_error[$obj->idfac] = $this->error;
 							$result = -2;
@@ -1722,7 +1656,7 @@ class BonPrelevement extends CommonObject
 					{
 						$obj = $this->db->fetch_object($resql);
 
-						if (! empty($cachearraytotestduplicate[$obj->idfac])) {
+						if (!empty($cachearraytotestduplicate[$obj->idfac])) {
 							$this->error = $langs->trans('ErrorCompanyHasDuplicateDefaultBAN', $obj->socid);
 							$this->invoice_in_error[$obj->idfac] = $this->error;
 							$result = -2;
@@ -1743,8 +1677,7 @@ class BonPrelevement extends CommonObject
 				}
 
 				// Define $fileEmetteurSection. Start of bloc PmtInf. Will contains all $nbtotalDrctDbtTxInf
-				if ($result != -2)
-				{
+				if ($result != -2) {
 					$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf, $format, $type);
 				}
 
@@ -1813,9 +1746,7 @@ class BonPrelevement extends CommonObject
 						// TODO Write record into file
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					$result = -2;
 				}
 			} else {
@@ -1843,9 +1774,7 @@ class BonPrelevement extends CommonObject
 						// TODO Write record into file
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					$result = -2;
 				}
 			}
@@ -2262,7 +2191,7 @@ class BonPrelevement extends CommonObject
 				 $XML_SEPA_INFO .= '					<AdrLine>'.$conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN.'</AdrLine>'.$CrLf;
 				 $XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '			</UltmtCdtr>'.$CrLf;*/
-				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf;		// Field "Responsible of fees". Must be SLEV
+				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf; // Field "Responsible of fees". Must be SLEV
 				$XML_SEPA_INFO .= '			<CdtrSchmeId>'.$CrLf;
 				$XML_SEPA_INFO .= '				<Id>'.$CrLf;
 				$XML_SEPA_INFO .= '					<PrvtId>'.$CrLf;
@@ -2324,7 +2253,7 @@ class BonPrelevement extends CommonObject
 				 $XML_SEPA_INFO .= '					<AdrLine>'.$conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN.'</AdrLine>'.$CrLf;
 				 $XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '			</UltmtCdtr>'.$CrLf;*/
-				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf;		// Field "Responsible of fees". Must be SLEV
+				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf; // Field "Responsible of fees". Must be SLEV
 				/*$XML_SEPA_INFO .= '			<CdtrSchmeId>'.$CrLf;
 				$XML_SEPA_INFO .= '				<Id>'.$CrLf;
 				$XML_SEPA_INFO .= '					<PrvtId>'.$CrLf;
@@ -2338,11 +2267,8 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '				</Id>'.$CrLf;
 				$XML_SEPA_INFO .= '			</CdtrSchmeId>'.$CrLf;*/
 			}
-		}
-		else
-		{
+		} else {
 			fputs($this->file, 'INCORRECT EMETTEUR '.$XML_SEPA_INFO.$CrLf);
-			$result = -2;
 		}
 		return $XML_SEPA_INFO;
 	}
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index 10f3c05c25a..a645d2bb078 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -96,17 +96,13 @@ class LignePrelevement
 				$this->statut          = $obj->statut;
 				$this->bon_ref         = $obj->ref;
 				$this->bon_rowid       = $obj->bon_rowid;
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_syslog("LignePrelevement::Fetch rowid=$rowid numrows=0");
 			}
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			$error++;
 			dol_syslog("LignePrelevement::Fetch rowid=$rowid");
 			dol_syslog($this->db->error());
@@ -142,20 +138,17 @@ class LignePrelevement
 		if ($mode == 0)
 		{
 			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); // Waiting
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); // Credited
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]); // Refused
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1');
 			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6');
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1');
 			elseif ($status == 2) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6');
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 8c033353637..20d600bf9b4 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -153,16 +153,13 @@ class RejetPrelevement
 			$pai->amounts[$facs[$i][0]] = price2num($facs[$i][1] * -1);
 			$pai->datepaye = $date_rejet;
 			$pai->paiementid = 3; // type of payment: withdrawal
-			$pai->num_paiement = $fac->ref;
 			$pai->num_payment = $fac->ref;
 
 			if ($pai->create($this->user) < 0)  // we call with no_commit
 			{
 				$error++;
 				dol_syslog("RejetPrelevement::Create Error creation payment invoice ".$facs[$i][0]);
-			}
-			else
-			{
+			} else {
 				$result = $pai->addPaymentToBank($user, 'payment', '(InvoiceRefused)', $bankaccount, '', '');
 				if ($result < 0)
 				{
@@ -191,9 +188,7 @@ class RejetPrelevement
 		{
 			dol_syslog("RejetPrelevement::Create Commit");
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			dol_syslog("RejetPrelevement::Create Rollback");
 			$this->db->rollback();
 		}
@@ -227,9 +222,7 @@ class RejetPrelevement
 				$row = $this->db->fetch_row($resql);
 				$userid = $row[0];
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog("RejetPrelevement::_send_email Erreur lecture user");
 		}
 
@@ -265,14 +258,10 @@ class RejetPrelevement
 			if ($result)
 			{
 				dol_syslog("RejetPrelevement::_send_email email envoye");
-			}
-			else
-			{
+			} else {
 				dol_syslog("RejetPrelevement::_send_email Erreur envoi email");
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog("RejetPrelevement::_send_email Userid invalide");
 		}
 	}
@@ -310,8 +299,7 @@ class RejetPrelevement
 				{
 					$row = $this->db->fetch_row($resql);
 					if (!$amounts) $arr[$i] = $row[0];
-					else
-					{
+					else {
 						$arr[$i] = array(
 							$row[0],
 							$row[1]
@@ -321,9 +309,7 @@ class RejetPrelevement
 				}
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_syslog("getListInvoices", LOG_ERR);
 		}
 
@@ -358,15 +344,11 @@ class RejetPrelevement
 				$this->db->free($resql);
 
 				return 0;
-			}
-			else
-			{
+			} else {
 				dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid numrows=0");
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog("RejetPrelevement::Fetch Erreur rowid=$rowid");
 			return -2;
 		}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index b8cac653dc4..8c8dc01a22c 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -46,7 +46,7 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 $type = GETPOST('type', 'aZ09');
 
 // Get supervariables
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
 $format = GETPOST('format', 'aZ09');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -84,10 +84,10 @@ if (empty($reshook))
 			$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
 		}
 		$bprev = new BonPrelevement($db);
-	    $executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), (GETPOST('reday', 'int') + $delayindays), GETPOST('reyear', 'int'));
+		$executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), (GETPOST('reday', 'int') + $delayindays), GETPOST('reyear', 'int'));
 
-	    // $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty (we don't use them anymore)
-	    $result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate, 0, $type);
+		// $conf->global->PRELEVEMENT_CODE_BANQUE and $conf->global->PRELEVEMENT_CODE_GUICHET should be empty (we don't use them anymore)
+		$result = $bprev->create($conf->global->PRELEVEMENT_CODE_BANQUE, $conf->global->PRELEVEMENT_CODE_GUICHET, $mode, $format, $executiondate, 0, $type);
 		if ($result < 0) {
 			setEventMessages($bprev->error, $bprev->errors, 'errors');
 		} elseif ($result == 0) {
@@ -185,37 +185,35 @@ if ($mesg) print $mesg;
 print '<div class="tabsAction">'."\n";
 
 print '<form action="'.$_SERVER['PHP_SELF'].'?action=create" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 if ($nb) {
-    if ($pricetowithdraw) {
-        print $langs->trans('ExecutionDate').' ';
-        $datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-        print $form->selectDate($datere, 're');
+	if ($pricetowithdraw) {
+		print $langs->trans('ExecutionDate').' ';
+		$datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		print $form->selectDate($datere, 're');
 
-        if ($mysoc->isInEEC()) {
-        	$title = $langs->trans("CreateForSepa");
-        	if ($type == 'bank-transfer') {
-        		$title = $langs->trans("CreateSepaFileForPaymentByBankTransfer");
-        	}
+		if ($mysoc->isInEEC()) {
+			$title = $langs->trans("CreateForSepa");
+			if ($type == 'bank-transfer') {
+				$title = $langs->trans("CreateSepaFileForPaymentByBankTransfer");
+			}
 
-        	if ($type != 'bank-transfer') {
-            	print '<select name="format">';
-            	print '<option value="FRST"'.(GETPOST('format', 'aZ09') == 'FRST' ? ' selected="selected"' : '').'>'.$langs->trans('SEPAFRST').'</option>';
-            	print '<option value="RCUR"'.(GETPOST('format', 'aZ09') == 'RCUR' ? ' selected="selected"' : '').'>'.$langs->trans('SEPARCUR').'</option>';
-            	print '</select>';
-        	}
-            print '<input class="butAction" type="submit" value="'.$title.'"/>';
-        } else {
-        	$title = $langs->trans("CreateAll");
-        	if ($type == 'bank-transfer') {
-        		$title = $langs->trans("CreateFileForPaymentByBankTransfer");
-        	}
-        	print '<a class="butAction" type="submit" href="create.php?action=create&format=ALL&type='.$type.'">'.$title."</a>\n";
+			if ($type != 'bank-transfer') {
+				print '<select name="format">';
+				print '<option value="FRST"'.(GETPOST('format', 'aZ09') == 'FRST' ? ' selected="selected"' : '').'>'.$langs->trans('SEPAFRST').'</option>';
+				print '<option value="RCUR"'.(GETPOST('format', 'aZ09') == 'RCUR' ? ' selected="selected"' : '').'>'.$langs->trans('SEPARCUR').'</option>';
+				print '</select>';
+			}
+			print '<input class="butAction" type="submit" value="'.$title.'"/>';
+		} else {
+			$title = $langs->trans("CreateAll");
+			if ($type == 'bank-transfer') {
+				$title = $langs->trans("CreateFileForPaymentByBankTransfer");
+			}
+			print '<a class="butAction" type="submit" href="create.php?action=create&format=ALL&type='.$type.'">'.$title."</a>\n";
 		}
-	}
-	else
-	{
+	} else {
 		if ($mysoc->isInEEC())
 		{
 			$title = $langs->trans("CreateForSepaFRST");
@@ -228,9 +226,7 @@ if ($nb) {
 				$title = $langs->trans("CreateForSepaRCUR");
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("AmountMustBePositive").'">'.$title."</a>\n";
 			}
-		}
-		else
-		{
+		} else {
 			$title = $langs->trans("CreateAll");
 			if ($type == 'bank-transfer') {
 				$title = $langs->trans("CreateFileForPaymentByBankTransfer");
@@ -238,9 +234,7 @@ if ($nb) {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$title."</a>\n";
 		}
 	}
-}
-else
-{
+} else {
 	$titlefortab = $langs->transnoentitiesnoconv("StandingOrders");
 	$title = $langs->trans("CreateAll");
 	if ($type == 'bank-transfer') {
@@ -307,12 +301,12 @@ if ($resql)
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-    $param = '';
+	$param = '';
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 	if ($socid) $param .= '&socid='.urlencode($socid);
-    if ($option) $param .= "&option=".urlencode($option);
+	if ($option) $param .= "&option=".urlencode($option);
 
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	if (!empty($limit)) {
@@ -323,12 +317,12 @@ if ($resql)
 	if ($type == 'bank-transfer') {
 		$title = $langs->trans("InvoiceWaitingPaymentByBankTransfer");
 	}
-    print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, '', '', '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit);
+	print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, '', '', '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit);
 
-    $tradinvoice = "Invoice";
-    if ($type == 'bank-transfer') {
-    	$tradinvoice = "SupplierInvoice";
-    }
+	$tradinvoice = "Invoice";
+	if ($type == 'bank-transfer') {
+		$tradinvoice = "SupplierInvoice";
+	}
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -396,17 +390,13 @@ if ($resql)
 			print '</tr>';
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 	print "</table>";
 	print "</form>";
 	print "<br>\n";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index a83a6a2938c..94c8c0639e1 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -40,14 +40,14 @@ $status = GETPOST('status', 'int');
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // 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')
 
 $type = GETPOST('type', 'aZ09');
 
 $search_facture = GETPOST('search_facture', 'alpha');
-$search_societe = trim(GETPOST('search_societe', 'alpha'));
+$search_societe = GETPOST('search_societe', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -89,15 +89,13 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
  */
 
 if ($type != 'bank-transfer') {
-	if (!$status)
-	{
+	if (!$status) {
 		$title = $langs->trans("RequestStandingOrderToTreat");
 	} else {
 		$title = $langs->trans("RequestStandingOrderTreated");
 	}
 } else {
-	if (!$status)
-	{
+	if (!$status) {
 		$title = $langs->trans("RequestPaymentsByBankTransferToTreat");
 	} else {
 		$title = $langs->trans("RequestPaymentsByBankTransferTreated");
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 0e4ff799ba6..4e3d191fdfa 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -45,8 +45,8 @@ $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -82,11 +82,11 @@ llxHeader('', $langs->trans("WithdrawalsReceipts"));
 if ($id > 0 || $ref)
 {
   	if ($object->fetch($id, $ref) >= 0)
-    {
-    	$head = prelevement_prepare_head($object);
+	{
+		$head = prelevement_prepare_head($object);
 		dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/bons.php'.($object->type != 'bank-transfer' ? '' : '?type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/orders_list.php?restore_lastsearch_values=1'.($object->type != 'bank-transfer' ? '' : '&type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref');
 
@@ -151,11 +151,9 @@ if ($id > 0 || $ref)
 		print '</div>';
 
 		dol_fiche_end();
-    }
-  	else
-    {
-      	dol_print_error($db);
-    }
+	} else {
+	  	dol_print_error($db);
+	}
 }
 
 
@@ -193,13 +191,13 @@ $sql .= $db->order($sortfield, $sortorder);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $resql = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($resql);
-    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-    {
-    	$page = 0;
-    	$offset = 0;
-    }
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	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);
@@ -214,13 +212,13 @@ if ($resql)
 
 	// Lines of title fields
 	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">';
 	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="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
 
@@ -247,90 +245,83 @@ if ($resql)
 	$invoicetmpsupplier = new FactureFournisseur($db);
 
   	while ($i < min($num, $limit))
-    {
-     	$obj = $db->fetch_object($resql);
+	{
+	 	$obj = $db->fetch_object($resql);
 
-     	if ($obj->type == 'bank-transfer') {
-     		$invoicetmp = $invoicetmpsupplier;
-     	} else {
-     		$invoicetmp = $invoicetmpcustomer;
-     	}
-     	$invoicetmp->fetch($obj->facid);
+	 	if ($obj->type == 'bank-transfer') {
+	 		$invoicetmp = $invoicetmpsupplier;
+	 	} else {
+	 		$invoicetmp = $invoicetmpcustomer;
+	 	}
+	 	$invoicetmp->fetch($obj->facid);
 
-     	$thirdpartytmp->fetch($obj->socid);
+	 	$thirdpartytmp->fetch($obj->socid);
 
-      	print '<tr class="oddeven">';
+	  	print '<tr class="oddeven">';
 
-      	print "<td>";
-      	print $invoicetmp->getNomUrl(1);
-        print "</td>\n";
+	  	print "<td>";
+	  	print $invoicetmp->getNomUrl(1);
+		print "</td>\n";
 
-      	print '<td>';
-      	print $thirdpartytmp->getNomUrl(1);
-      	print "</td>\n";
+	  	print '<td>';
+	  	print $thirdpartytmp->getNomUrl(1);
+	  	print "</td>\n";
 
-      	// Amount of invoice
-      	print '<td class="right">'.price($obj->total_ttc)."</td>\n";
+	  	// Amount of invoice
+	  	print '<td class="right">'.price($obj->total_ttc)."</td>\n";
 
-      	// Amount requested
-      	print '<td class="right">'.price($obj->amount_requested)."</td>\n";
+	  	// Amount requested
+	  	print '<td class="right">'.price($obj->amount_requested)."</td>\n";
 
-      	// Status of requests
-      	print '<td class="center">';
+	  	// Status of requests
+	  	print '<td class="center">';
 
-      	if ($obj->statut == 0)
-		{
+	  	if ($obj->statut == 0) {
 	  		print '-';
-		}
-      	elseif ($obj->statut == 2)
-		{
+		} elseif ($obj->statut == 2) {
 			if ($obj->type == 'bank-transfer') {
 				print $langs->trans("StatusDebited");
 			} else {
 				print $langs->trans("StatusCredited");
 			}
-		}
-      	elseif ($obj->statut == 3)
-		{
+		} elseif ($obj->statut == 3) {
 	  		print '<b>'.$langs->trans("StatusRefused").'</b>';
 		}
 
-      	print "</td>";
+	  	print "</td>";
 
-      	print "<td></td>";
+	  	print "<td></td>";
 
-      	print "</tr>\n";
+	  	print "</tr>\n";
 
-      	$totalinvoices += $obj->total_ttc;
-      	$totalamount_requested += $obj->amount_requested;
+	  	$totalinvoices += $obj->total_ttc;
+	  	$totalamount_requested += $obj->amount_requested;
 
-      	$i++;
-    }
+	  	$i++;
+	}
 
   	if ($num > 0)
-    {
-      	print '<tr class="liste_total">';
-     	print '<td>'.$langs->trans("Total").'</td>';
-      	print '<td>&nbsp;</td>';
-      	print '<td class="right">';
+	{
+	  	print '<tr class="liste_total">';
+	 	print '<td>'.$langs->trans("Total").'</td>';
+	  	print '<td>&nbsp;</td>';
+	  	print '<td class="right">';
 		//if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");		// It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only.
-      	if ($totalamount_requested != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+	  	if ($totalamount_requested != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
 		print "</td>\n";
-      	print '<td class="right">';
+	  	print '<td class="right">';
 		print price($totalamount_requested);
-      	print "</td>\n";
-      	print '<td>&nbsp;</td>';
-      	print '<td>&nbsp;</td>';
-      	print "</tr>\n";
-    }
+	  	print "</td>\n";
+	  	print '<td>&nbsp;</td>';
+	  	print '<td>&nbsp;</td>';
+	  	print "</tr>\n";
+	}
 
   	print "</table>";
   	print '</div>';
 
-  	$db->free($resql);
-}
-else
-{
+  	$db->free($result);
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index cbc1a666def..7783edd4673 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -45,8 +45,8 @@ $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -76,11 +76,11 @@ llxHeader('', $langs->trans("WithdrawalsReceipts"));
 if ($prev_id > 0 || $ref)
 {
   	if ($object->fetch($prev_id, $ref) >= 0)
-    {
-    	$head = prelevement_prepare_head($object);
+	{
+		$head = prelevement_prepare_head($object);
 		dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/bons.php'.($object->type != 'bank-transfer' ? '' : '?type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/orders_list.php?restore_lastsearch_values=1'.($object->type != 'bank-transfer' ? '' : '&type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref');
 
@@ -145,11 +145,9 @@ if ($prev_id > 0 || $ref)
 		print '</div>';
 
 		dol_fiche_end();
-    }
-  	else
-    {
-      	dol_print_error($db);
-    }
+	} else {
+	  	dol_print_error($db);
+	}
 }
 
 
@@ -207,51 +205,47 @@ if ($resql)
 
 	if ($num > 0)
 	{
-      	$i = 0;
-	    while ($i < $num)
-        {
-    		$obj = $db->fetch_object($resql);
+	  	$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-    		print '<tr class="oddeven"><td>';
+			print '<tr class="oddeven"><td>';
 
-    		print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid.'">';
-    		print img_picto('', 'statut'.$obj->statut).' ';
-    		print substr('000000'.$obj->rowid, -6);
-    		print '</a></td>';
-    		print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
+			print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$obj->rowid.'">';
+			print img_picto('', 'statut'.$obj->statut).' ';
+			print substr('000000'.$obj->rowid, -6);
+			print '</a></td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
 
-    		print '<td class="right">'.price($obj->amount)."</td>\n";
-    		print '<td>'.$rej->motifs[$obj->motif].'</td>';
+			print '<td class="right">'.price($obj->amount)."</td>\n";
+			print '<td>'.$rej->motifs[$obj->motif].'</td>';
 
-    		print '<td class="center">'.yn($obj->afacturer).'</td>';
-    		print '<td class="center">'.$obj->fk_facture.'</td>';
-    		print "</tr>\n";
+			print '<td class="center">'.yn($obj->afacturer).'</td>';
+			print '<td class="center">'.$obj->fk_facture.'</td>';
+			print "</tr>\n";
 
-    		$total += $obj->amount;
+			$total += $obj->amount;
 
-    		$i++;
-    	}
-	}
-	else
-	{
-	    print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			$i++;
+		}
+	} else {
+		print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 	}
 
   	if ($num > 0)
-    {
-    	print '<tr class="liste_total"><td>&nbsp;</td>';
-    	print '<td class="liste_total">'.$langs->trans("Total").'</td>';
-    	print '<td class="right">'.price($total)."</td>\n";
-    	print '<td colspan="3">&nbsp;</td>';
-    	print "</tr>\n";
-    }
-    print "</table>\n";
-    print '</div>';
+	{
+		print '<tr class="liste_total"><td>&nbsp;</td>';
+		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
+		print '<td class="right">'.price($total)."</td>\n";
+		print '<td colspan="3">&nbsp;</td>';
+		print "</tr>\n";
+	}
+	print "</table>\n";
+	print '</div>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index d94edfa5107..df5118df0cf 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -43,8 +43,8 @@ $type = GETPOST('type', 'aZ09');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -79,7 +79,7 @@ if ($prev_id > 0 || $ref)
 		$head = prelevement_prepare_head($object);
 		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
-		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/bons.php'.($object->type != 'bank-transfer' ? '' : '?type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/prelevement/orders_list.php?restore_lastsearch_values=1'.($object->type != 'bank-transfer' ? '' : '&type=bank-transfer').'">'.$langs->trans("BackToList").'</a>';
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref');
 
@@ -144,9 +144,7 @@ if ($prev_id > 0 || $ref)
 		print '</div>';
 
 		dol_fiche_end();
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -196,9 +194,7 @@ if ($prev_id > 0 || $ref)
 
 		print "</table>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		print $db->error().' '.$sql;
 	}
 }
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index e68e753d83b..4104249df5c 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -161,15 +161,11 @@ if ($resql)
             print '</tr>';
             $i++;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders")).'</td></tr>';
     }
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -232,9 +228,7 @@ if ($result)
 
     print "</table></div><br>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index d6124113321..3c8d80d4931 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -39,15 +39,15 @@ $langs->loadlangs(array('banks', 'categories', 'bills', 'withdrawals'));
 if ($user->socid > 0) accessforbidden();
 
 // Get supervariables
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $socid = GETPOST('socid', 'int');
 
 $type = GETPOST('type', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortorder = GETPOST('sortorder', 'alpha');
-$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if ($page == -1 || $page == null) { $page = 0; }
 $offset = $limit * $page;
@@ -75,9 +75,7 @@ if ($action == 'confirm_rejet')
 		{
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-		}
-
-		elseif ($daterej > dol_now())
+		} elseif ($daterej > dol_now())
 		{
 			$error++;
 			$langs->load("error");
@@ -104,14 +102,10 @@ if ($action == 'confirm_rejet')
 				header("Location: line.php?id=".$id);
 				exit;
 			}
-		}
-		else
-		{
+		} else {
 			$action = "rejet";
 		}
-	}
-	else
-	{
+	} else {
 		header("Location: line.php?id=".$id);
 		exit;
 	}
@@ -174,25 +168,19 @@ if ($id)
 				{
 					/* Historique pour certaines install */
 					print $langs->trans("Unknown");
-				}
-				else
-				{
+				} else {
 					print dol_print_date($rej->date_rejet, 'day');
 				}
 				print '</td></tr>';
 				print '<tr><td>'.$langs->trans("RefusedInvoicing").'</td><td>'.$rej->invoicing.'</td></tr>';
-			}
-			else
-			{
+			} else {
 				print '<tr><td>'.$resf.'</td></tr>';
 			}
 		}
 
 		print '</table>';
 		dol_fiche_end();
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -259,15 +247,11 @@ if ($id)
 				if ($user->rights->prelevement->bons->credit)
 				{
 					print '<a class="butActionDelete" href="line.php?action=rejet&id='.$lipre->id.'">'.$langs->trans("StandingOrderReject").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("StandingOrderReject").'</a>';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotPossibleForThisStatusOfWithdrawReceiptORLine").'">'.$langs->trans("StandingOrderReject").'</a>';
 		}
 	}
@@ -344,9 +328,7 @@ if ($id)
 		print "</table>";
 
 		$db->free($result);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 72960c9c15b..36aa4bb8e5c 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -38,7 +38,7 @@ $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk
 $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
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlinelist'; // 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')
 
@@ -50,8 +50,8 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 $type = GETPOST('type', 'aZ09');
 
 $limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -263,9 +263,7 @@ if ($result)
     print '</form>';
 
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/orders_list.php
similarity index 96%
rename from htdocs/compta/prelevement/bons.php
rename to htdocs/compta/prelevement/orders_list.php
index 5a1ce4e7024..d4f16eab7f6 100644
--- a/htdocs/compta/prelevement/bons.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -19,9 +19,9 @@
  */
 
 /**
- * 	\file       htdocs/compta/prelevement/bons.php
+ * 	\file       htdocs/compta/prelevement/orders_list.php
  * 	\ingroup    prelevement
- * 	\brief      Page liste des bons de prelevements
+ * 	\brief      Page to list direct debit orders or credit transfer orders
  */
 
 require '../../main.inc.php';
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'widthdrawals'));
 
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
 
 // Security check
 $socid = GETPOST('socid', 'int');
@@ -41,8 +41,8 @@ $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 $type = GETPOST('type', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -214,9 +214,7 @@ if ($result)
     print '</form>';
 
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 81f17dc784b..da2420aed3f 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -42,8 +42,8 @@ $type = GETPOST('type', 'aZ09');
 
 // Get supervariables
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortorder = GETPOST('sortorder', 'alpha');
-$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -137,9 +137,7 @@ if ($result)
 
 	print "</table>";
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 87fd3917a56..1d6e1c2a183 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -142,9 +142,7 @@ if ($resql)
 	print '</td><td class="right">&nbsp;</td>';
 	print "</tr></table>";
 	$db->free();
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -247,9 +245,7 @@ if ($resql)
 	print '</td><td class="right">&nbsp;</td>';
 	print "</tr></table>";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 3f2112537b1..63368fa94e8 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -46,8 +46,8 @@ $hookmanager->initHooks(array('recapcomptacard', 'globalcard'));
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -211,15 +211,11 @@ if ($id > 0)
 					}
 
 					$db->free($resqlp);
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -288,9 +284,7 @@ if ($id > 0)
 
 		print "</table>";
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 27bc4526a3e..671921506d5 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -99,8 +99,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
             $month_end = $month_start - 1;
             if ($month_end < 1) $month_end = 12;
             else $year_end++;
-        }
-        else $month_end = $month_start;
+        } 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); }
@@ -151,11 +150,10 @@ if ($modecompta == "CREANCES-DETTES")
 	$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");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -166,8 +164,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
     $description = $langs->trans("RulesResultInOut");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -212,9 +209,7 @@ print_liste_field_titre('');
 if ($modecompta == 'BOOKKEEPING')
 {
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'class="right"', $sortfield, $sortorder);
-}
-else
-{
+} else {
 	if ($modecompta == 'CREANCES-DETTES')
 	{
 		print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
@@ -312,16 +307,11 @@ if ($modecompta == 'BOOKKEEPING')
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr><td colspan="4" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 		}
-	}
-	else dol_print_error($db);
-}
-else
-{
+	} else dol_print_error($db);
+} else {
 	/*
 	 * Factures clients
 	 */
@@ -336,12 +326,10 @@ else
 	    $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)";
+		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)."'";
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} elseif ($modecompta == 'RECETTES-DEPENSES')
 	{
 		/*
 	     * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -463,12 +451,10 @@ else
 	    $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)";
+		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)."'";
-	}
-	elseif ($modecompta == 'RECETTES-DEPENSES')
+	} 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";
@@ -517,9 +503,7 @@ else
 	            print "</tr>\n";
 	            $i++;
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -552,8 +536,7 @@ else
 	    $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')
+	} 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";
@@ -597,8 +580,7 @@ else
 	            print '</tr>';
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -629,8 +611,7 @@ else
 	    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')
+	} 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";
@@ -674,8 +655,7 @@ else
 	            print '</tr>';
 	            $i++;
 	        }
-	    }
-	    else {
+	    } else {
 	        print '<tr class="oddeven"><td>&nbsp;</td>';
 	        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 	        print '</tr>';
@@ -767,16 +747,12 @@ else
 		            print '</tr>';
 		            $i++;
 		        }
-		    }
-		    else
-		    {
+		    } else {
 		        print '<tr class="oddeven"><td>&nbsp;</td>';
 		        print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 		        print '</tr>';
 		    }
-		}
-		else
-		{
+		} else {
 		    dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -853,16 +829,12 @@ else
 					print '<td class="right">'.price(-$obj->amount_ttc).'</td>';
 					print '</tr>';
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 				print '</tr>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -887,9 +859,7 @@ else
 		    	$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 		    	$sql .= " WHERE p.entity IN (".getEntity('donation').")";
 		    	$sql .= " AND fk_statut in (1,2)";
-			}
-			else
-			{
+			} 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";
@@ -935,16 +905,12 @@ else
 					print '</tr>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 				print '</tr>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
@@ -1011,8 +977,7 @@ else
                 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);
+        } else dol_print_error($db);
     }
 
     /*
@@ -1060,8 +1025,7 @@ else
                 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);
+        } else dol_print_error($db);
     }
 
 	/*
@@ -1083,8 +1047,7 @@ else
 		    $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)";
+			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').")";
@@ -1131,8 +1094,7 @@ else
 		    $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)";
+			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;
@@ -1172,9 +1134,7 @@ else
 		    print '<td class="right">&nbsp;</td>'."\n";
 		    print '<td class="right">'.price($amount)."</td>\n";
 		    print "</tr>\n";
-		}
-		else
-		{
+		} else {
 		    // VAT really already paid
 		    $amount = 0;
 		    $sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
@@ -1253,9 +1213,7 @@ else
 		            }
 		        }
 		        $db->free($result);
-		    }
-		    else
-		    {
+		    } else {
 		        dol_print_error($db);
 		    }
 		    print '<tr class="oddeven"><td>&nbsp;</td>';
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index b912723adfc..9ae666cb01a 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -78,8 +78,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
 			else $year_end++;
-		}
-		else $month_end = $month_start;
+		} 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); }
@@ -131,11 +130,10 @@ if ($modecompta == 'CREANCES-DETTES')
 	$description = $langs->trans("RulesAmountWithTaxIncluded");
 	$description .= '<br>'.$langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= "<br>".$langs->trans("DepositsAreNotIncluded");
-	else  $description .= "<br>".$langs->trans("DepositsAreIncluded");
+	else $description .= "<br>".$langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES") {
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">', '</a>').')';
@@ -146,8 +144,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") {
 	$description .= '<br>'.$langs->trans("RulesResultInOut");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -191,8 +188,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		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)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		/*
 		 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -228,12 +224,10 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 			$i++;
 		}
 		$db->free($result);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -274,17 +268,14 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		// Nothing from this table
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -307,8 +298,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		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)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
@@ -343,12 +333,10 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 			$i++;
 		}
 		$db->free($result);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -429,8 +417,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		} else {
 			dol_print_error($db);
 		}
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		// TVA really already paid
 		$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
@@ -493,8 +480,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 			dol_print_error($db);
 		}
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -515,8 +501,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$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)."'";
-	}
-	elseif ($modecompta == "RECETTES-DEPENSES")
+	} elseif ($modecompta == "RECETTES-DEPENSES")
 	{
 		$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
@@ -552,8 +537,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -600,8 +584,7 @@ if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
 	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Nothing from this table
 }
@@ -659,13 +642,10 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
 				$decaiss_ttc[$obj->dm] += $obj->amount_ttc;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
-}
-elseif ($modecompta == 'BOOKKEEPING') {
+} elseif ($modecompta == 'BOOKKEEPING') {
 	// Nothing from this table
 }
 
@@ -721,13 +701,10 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
     			$i++;
     		}
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
-}
-elseif ($modecompta == 'BOOKKEEPING') {
+} elseif ($modecompta == 'BOOKKEEPING') {
 	// Nothing from this table
 }
 
@@ -761,9 +738,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     			$i++;
     		}
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 
@@ -791,9 +766,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
     			$i++;
     		}
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 }
@@ -829,9 +802,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
     			$i++;
     		}
     	}
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 }
@@ -896,9 +867,7 @@ if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 				$i++;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -977,9 +946,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if (!isset($totsorties[$annee])) $totsorties[$annee] = 0;
 				$totsorties[$annee] += $decaiss[$case];
 			}
-		}
-		else
-		{
+		} else {
 			if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
 			{
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($decaiss_ttc[$case], 'MT')).'</a>';
@@ -998,9 +965,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if (!isset($totentrees[$annee])) $totentrees[$annee] = 0;
 				$totentrees[$annee] += $encaiss[$case];
 			}
-		}
-		else
-		{
+		} else {
 			if (isset($encaiss_ttc[$case]))
 			{
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($encaiss_ttc[$case], 'MT')).'</a>';
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 66adea3371f..48cb8b1154e 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -90,8 +90,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
 			else $year_end++;
-		}
-		else $month_end = $month_start;
+		} 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); }
@@ -178,11 +177,10 @@ if ($modecompta == "CREANCES-DETTES")
 	//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
 	$description = $langs->trans("RulesResultDue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES") {
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("AnnualByAccountInputOutputMode");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month") > 0 ? '&month='.GETPOST("month") : '').'&modecompta=CREANCES-DETTES">', '</a>').')';
@@ -192,8 +190,7 @@ elseif ($modecompta == "RECETTES-DEPENSES") {
 	$description = $langs->trans("RulesResultInOut");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPersonalizedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -248,13 +245,11 @@ if ($modecompta == 'CREANCES-DETTES')
 {
 	//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")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	//if (! empty($date_start) && ! empty($date_end))
 	//	$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// Get array of all report groups that are active
 	$cats = $AccCat->getCats(); // WARNING: Computed groups must be after group they include
@@ -375,7 +370,7 @@ elseif ($modecompta == "BOOKKEEPING")
 				print "</tr>\n";
 
 				//var_dump($sommes);
-			} else            // normal category
+			} else // normal category
 			{
 				$code = $cat['code']; // Category code we process
 
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index d7f20622a43..c744bcc90e8 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -128,9 +128,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		header("Location: list.php");
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -145,29 +143,23 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (!$dateperiod)
+	} elseif (!$dateperiod)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (!$actioncode > 0)
+	} elseif (!$actioncode > 0)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		$action = 'create';
-	}
-	elseif (empty($amount))
+	} elseif (empty($amount))
 	{
 		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
-	{
+	} else {
 		$object->type = $actioncode;
 		$object->label = GETPOST('label', 'alpha');
 		$object->date_ech = $dateech;
@@ -195,24 +187,19 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (!$dateperiod)
+	} elseif (!$dateperiod)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (empty($amount))
+	} elseif (empty($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (!is_numeric($amount))
+	} elseif (!is_numeric($amount))
 	{
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	}
-	else
-	{
+	} else {
 		$result = $object->fetch($id);
 
 		$object->date_ech = $dateech;
@@ -245,16 +232,14 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
-		}
-		else {
+		} else {
 			$object->label = $langs->trans("CopyOf").' '.$object->label;
 		}
 
 		if (GETPOST('clone_for_next_month', 'int')) {
 			$object->periode = dol_time_plus_duree($object->periode, 1, 'm');
 			$object->date_ech = dol_time_plus_duree($object->date_ech, 1, 'm');
-		}
-		else {
+		} else {
 			$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
 			$newdateech = dol_mktime(0, 0, 0, GETPOST('clone_date_echmonth', 'int'), GETPOST('clone_date_echday', 'int'), GETPOST('clone_date_echyear', 'int'));
 			if ($newdateperiod) $object->periode = $newdateperiod;
@@ -271,18 +256,14 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$id = $originalId;
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		dol_print_error($db, $object->error);
 	}
@@ -431,9 +412,7 @@ if ($id > 0)
 			if (!empty($conf->global->TAX_ADD_CLON_FOR_NEXT_MONTH_CHECKBOX))
 			{
 				$formquestion[] = array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1);
-			}
-			else
-			{
+			} else {
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_period', 'label' => $langs->trans("PeriodEndDate"), 'value' => -1);
 			}
@@ -502,6 +481,8 @@ if ($id > 0)
 		}
 		$morehtmlref .= '</div>';
 
+		$morehtmlright = '';
+
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
@@ -535,9 +516,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print $form->selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1);
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->periode, "day");
 		}
 		print "</td></tr>";
@@ -548,8 +527,7 @@ if ($id > 0)
 			print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
 			print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">';
 			print "</td></tr>";
-		}
-		else {
+		} else {
 			print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -674,9 +652,7 @@ if ($id > 0)
 					$totalpaye += $objp->amount;
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 				print '<td></td><td></td><td></td><td></td>';
 				print '</tr>';
@@ -695,9 +671,7 @@ if ($id > 0)
 			print '</div>';
 
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -732,13 +706,13 @@ if ($id > 0)
 			// Reopen
 			if ($object->paye && $user->rights->tax->charges->creer)
 			{
-				print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/card.php", 1)."?id=$object->id&amp;action=reopen\">".$langs->trans("ReOpen")."</a></div>";
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/sociales/card.php", 1).'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a></div>';
 			}
 
 			// Edit
 			if ($object->paye == 0 && $user->rights->tax->charges->creer)
 			{
-				print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/card.php?id=$object->id&amp;action=edit\">".$langs->trans("Modify")."</a></div>";
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
 			}
 
 			// Emit payment
@@ -750,26 +724,24 @@ if ($id > 0)
 			// Classify 'paid'
 			if ($object->paye == 0 && round($resteapayer) <= 0 && $user->rights->tax->charges->creer)
 			{
-				print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/card.php?id=$object->id&amp;action=paid\">".$langs->trans("ClassifyPaid")."</a></div>";
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=paid&amp;token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>';
 			}
 
 			// Clone
 			if ($user->rights->tax->charges->creer)
 			{
-				print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".dol_buildpath("/compta/sociales/card.php", 1)."?id=$object->id&amp;action=clone\">".$langs->trans("ToClone")."</a></div>";
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/sociales/card.php", 1).'?id='.$object->id.'&amp;action=clone">'.$langs->trans("ToClone")."</a></div>";
 			}
 
 			// Delete
 			if ($user->rights->tax->charges->supprimer)
 			{
-				print "<div class=\"inline-block divButAction\"><a class=\"butActionDelete\" href=\"".DOL_URL_ROOT."/compta/sociales/card.php?id=$object->id&amp;action=delete\">".$langs->trans("Delete")."</a></div>";
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 			}
 
 			print "</div>";
 		}
-	}
-	else
-	{
+	} else {
 		/* Social contribution not found */
 		dol_print_error('', $object->error);
 	}
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index b91d9ca31ee..cc66b56aabd 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -459,28 +459,23 @@ class Cchargesociales
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 6d3f4dffa4a..81ae1e28f20 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -171,14 +171,10 @@ class ChargeSociales extends CommonObject
                 $this->db->free($resql);
 
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -252,14 +248,11 @@ class ChargeSociales extends CommonObject
 			if (empty($error)) {
 				$this->db->commit();
 				return $this->id;
-			}
-			else {
+			} else {
 				$this->db->rollback();
 				return -1 * $error;
 			}
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -328,9 +321,7 @@ class ChargeSociales extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -386,9 +377,7 @@ class ChargeSociales extends CommonObject
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -421,14 +410,10 @@ class ChargeSociales extends CommonObject
                 $obj = $this->db->fetch_object($result);
                 $this->db->free($result);
                 return $obj->amount;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->error();
             return -1;
         }
@@ -612,9 +597,7 @@ class ChargeSociales extends CommonObject
 
             $this->db->free($resql);
             return $amount;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -667,9 +650,7 @@ class ChargeSociales extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index c771a664d5f..62b02860f08 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -134,9 +134,8 @@ class PaymentSocialContribution extends CommonObject
 		if (isset($this->fk_charge)) $this->fk_charge = (int) $this->fk_charge;
 		if (isset($this->amount)) $this->amount = trim($this->amount);
 		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
-		if (isset($this->num_paiement)) $this->num_paiement = trim($this->num_paiement); // deprecated
 		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-		if (isset($this->note)) $this->note = trim($this->note);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
 		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;
@@ -194,14 +193,11 @@ class PaymentSocialContribution extends CommonObject
 							if ($remaintopay == 0)
 							{
 								$result = $contrib->set_paid($user);
-							}
-							else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
+							} else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 		}
@@ -215,9 +211,7 @@ class PaymentSocialContribution extends CommonObject
             $this->total = $totalamount; // deprecated
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -270,9 +264,8 @@ class PaymentSocialContribution extends CommonObject
 				$this->datep = $this->db->jdate($obj->datep);
 				$this->amount = $obj->amount;
 				$this->fk_typepaiement = $obj->fk_typepaiement;
-				$this->num_paiement = $obj->num_payment;
 				$this->num_payment = $obj->num_payment;
-				$this->note = $obj->note;
+				$this->note_private = $obj->note;
 				$this->fk_bank = $obj->fk_bank;
 				$this->fk_user_creat = $obj->fk_user_creat;
 				$this->fk_user_modif = $obj->fk_user_modif;
@@ -286,9 +279,7 @@ class PaymentSocialContribution extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -312,9 +303,8 @@ class PaymentSocialContribution extends CommonObject
 		if (isset($this->fk_charge)) $this->fk_charge = (int) $this->fk_charge;
 		if (isset($this->amount)) $this->amount = trim($this->amount);
 		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
-		if (isset($this->num_paiement)) $this->num_paiement = trim($this->num_paiement); // deprecated
 		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-		if (isset($this->note)) $this->note = trim($this->note);
+		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
 		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;
@@ -333,7 +323,7 @@ class PaymentSocialContribution extends CommonObject
 		$sql .= " datep=".(dol_strlen($this->datep) != 0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
 		$sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
 		$sql .= " fk_typepaiement=".(isset($this->fk_typepaiement) ? $this->fk_typepaiement : "null").",";
-		$sql .= " num_paiement=".(isset($this->num_paiement) ? "'".$this->db->escape($this->num_paiement)."'" : "null").",";
+		$sql .= " num_paiement=".(isset($this->num_payment) ? "'".$this->db->escape($this->num_payment)."'" : "null").",";
 		$sql .= " note=".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : "null").",";
 		$sql .= " fk_bank=".(isset($this->fk_bank) ? $this->fk_bank : "null").",";
 		$sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").",";
@@ -358,9 +348,7 @@ class PaymentSocialContribution extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -414,9 +402,7 @@ class PaymentSocialContribution extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -465,9 +451,7 @@ class PaymentSocialContribution extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -517,7 +501,7 @@ class PaymentSocialContribution extends CommonObject
         global $conf;
 
 		// Clean data
-        $this->num_payment = trim($this->num_payment ? $this->num_payment : $this->num_paiement);
+        $this->num_payment = trim($this->num_payment);
 
         $error = 0;
 
@@ -580,9 +564,7 @@ class PaymentSocialContribution extends CommonObject
                         if ($result <= 0) dol_print_error($this->db);
                     }
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -591,9 +573,7 @@ class PaymentSocialContribution extends CommonObject
         if (!$error)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -616,9 +596,7 @@ class PaymentSocialContribution extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
@@ -702,7 +680,7 @@ class PaymentSocialContribution extends CommonObject
 		$result = '';
 
 		if (empty($this->ref)) $this->ref = $this->lib;
-        $label = $langs->trans("ShowPayment").': '.$this->ref;
+        $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">';
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 3c73c8e6614..e7d76b94a76 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -163,9 +163,7 @@ if ($object->id)
     $permtoedit = $user->rights->fournisseur->facture->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 8ccd8aa35aa..bd7f6147f2d 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -35,7 +35,7 @@ if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/clas
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'banks', 'bills'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -80,9 +80,7 @@ if (!GETPOSTISSET('search_typeid'))
 		$part = explode(':', $val);
 		if ($part[0] == 'cs.fk_type') $search_typeid = $part[1];
 	}
-}
-else
-{
+} else {
 	$search_typeid = GETPOST('search_typeid', 'int');
 }
 
@@ -140,8 +138,8 @@ if ($year > 0)
     $sql .= " AND (";
     // Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
     // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-    $sql .= "   (cs.periode IS NOT NULL AND date_format(cs.periode, '%Y') = '".$year."') ";
-    $sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$year."')";
+    $sql .= "   (cs.periode IS NOT NULL AND date_format(cs.periode, '%Y') = '".$db->escape($year)."') ";
+    $sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$db->escape($year)."')";
     $sql .= ")";
 }
 if ($filtre) {
@@ -209,9 +207,7 @@ if ($resql)
 		$countrynotdefined = $langs->trans("ErrorSetACountryFirst");
 		print $countrynotdefined;
 		print '</div>';
-	}
-	else
-	{
+	} else {
 	    print '<div class="div-table-responsive">';
 	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
@@ -224,7 +220,7 @@ if ($resql)
 		print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 		// Type
 		print '<td class="liste_titre" align="left">';
-	    $formsocialcontrib->select_type_socialcontrib($search_typeid, 'search_typeid', 1, 0, 0, 'maxwidth100onsmartphone');
+	    $formsocialcontrib->select_type_socialcontrib($search_typeid, 'search_typeid', 1, 0, 0, 'maxwidth100onsmartphone', 1);
 	    print '</td>';
 		// Ref Project
 	   	if (!empty($conf->projet->enabled)) print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'"></td>';
@@ -314,9 +310,7 @@ if ($resql)
 			if ($obj->periode)
 			{
 				print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'</a>';
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print "</td>\n";
@@ -346,9 +340,7 @@ if ($resql)
 		print '</div>';
 	}
 	print '</form>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 5cfa5df06ed..fc1f66d5e2c 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -92,9 +92,7 @@ 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
-{
+} else {
     print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
 }
 
@@ -208,9 +206,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	    print '<td align="center" class="liste_total">&nbsp;</td>';
 	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	print '</table>';
@@ -287,9 +283,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 		    print "</table>";
 		    $db->free($result);
-		}
-		else
-		{
+		} else {
 		    dol_print_error($db);
 		}
 	}
@@ -300,19 +294,15 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 {
 	$j = 1;
 	$numlt = 3;
-}
-elseif ($mysoc->localtax1_assuj == "1")
+} elseif ($mysoc->localtax1_assuj == "1")
 {
 	$j = 1;
 	$numlt = 2;
-}
-elseif ($mysoc->localtax2_assuj == "1")
+} elseif ($mysoc->localtax2_assuj == "1")
 {
 	$j = 2;
 	$numlt = 3;
-}
-else
-{
+} else {
 	$j = 0;
 	$numlt = 0;
 }
@@ -388,9 +378,7 @@ while ($j < $numlt)
 
 			print "</table>";
 			$db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -472,9 +460,7 @@ if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
             $db->free($result);
 
             print "<br>";
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
     }
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index 1e2890f57fa..ee859965552 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -77,9 +77,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			else $year_end++;
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-	}
-	else
-	{
+	} 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); }
@@ -209,8 +207,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	}
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByVatRate");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -220,11 +217,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 5831467ce63..fbecc1df335 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -60,6 +60,9 @@ if (GETPOST('subcat', 'alpha') === 'yes') {
 $selected_type = GETPOST('search_type', 'int');
 if ($selected_type == '') $selected_type = -1;
 
+// Hook
+$hookmanager->initHooks(array('cabyprodservlist'));
+
 // Date range
 $year = GETPOST("year");
 $month = GETPOST("month");
@@ -103,9 +106,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			else $year_end++;
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-	}
-	else
-	{
+	} 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); }
@@ -181,8 +182,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	}
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByProductsAndServices");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -192,11 +192,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 
@@ -232,8 +230,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
@@ -255,8 +252,7 @@ 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
+	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$selected_cat;
 		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 		$sql .= ")";
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 4d4f56a1354..8b6caa89a8f 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -96,9 +96,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	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); }
-}
-else
-{
+} else {
 	// TODO We define q
 }
 // $date_start and $date_end are defined. We force $year_start and $nbofyear
@@ -154,11 +152,10 @@ if ($modecompta == "CREANCES-DETTES") {
     //$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");
+	else $description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByUserAuthorOfInvoice");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -167,12 +164,10 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
     $builddate = dol_now();
     //$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	// TODO
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 	// TODO
 }
@@ -396,8 +391,7 @@ if (count($amount)) {
             } else {
                 //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
             }
-        }
-        elseif ($modecompta == 'CREANCES-DETTES') {
+        } elseif ($modecompta == 'CREANCES-DETTES') {
             if ($key > 0) {
                 print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
             } else {
@@ -416,8 +410,7 @@ if (count($amount)) {
             } else {
                 //print '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?userid=-1">';
             }
-        }
-        elseif ($modecompta == 'CREANCES-DETTES') {
+        } elseif ($modecompta == 'CREANCES-DETTES') {
             if ($key > 0) {
                 print '<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?userid='.$key.'">';
             } else {
@@ -431,8 +424,7 @@ if (count($amount)) {
         	} else {
         		//print '</a>';
         	}
-        }
-        elseif ($modecompta == 'CREANCES-DETTES') {
+        } elseif ($modecompta == 'CREANCES-DETTES') {
         	if ($key > 0) {
         		print '</a>';
         	}
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index bec20998cfa..a02d87a8392 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -61,6 +61,9 @@ if ($user->socid > 0) $socid = $user->socid;
 if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
 if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
 
+// Hook
+$hookmanager->initHooks(array('casoclist'));
+
 // Date range
 $year = GETPOST("year", 'int');
 $month = GETPOST("month", 'int');
@@ -113,9 +116,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	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); }
-}
-else
-{
+} else {
 	// TODO We define q
 }
 
@@ -180,11 +181,10 @@ if ($modecompta == "CREANCES-DETTES")
 	//$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");
+	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -193,11 +193,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -223,8 +221,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -241,8 +238,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} 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 .= ")";
@@ -261,8 +257,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -275,8 +270,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$selected_cat;
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 	    $sql .= ")";
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index d1a64e218d2..796ce2cc6a6 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -73,8 +73,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
-		}
-		else $month_end = $month_start;
+		} 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); }
@@ -124,11 +123,10 @@ if ($modecompta == "CREANCES-DETTES")
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesCADue");
 	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else  $description .= $langs->trans("DepositsAreIncluded");
+	else $description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("TurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -140,8 +138,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -173,8 +170,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	else $sql .= " AND f.type IN (0,1,2,3,5)";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	/*
 	 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
@@ -188,8 +184,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$sql .= " AND pf.fk_facture = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
@@ -223,8 +218,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -259,9 +253,7 @@ if ($modecompta == 'RECETTES-DEPENSES')
 			}
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -339,11 +331,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 					print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
-				}
-				else
-				{
-					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-					else { print '&nbsp;'; }
+				} else {
+					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 				}
 				print "</td>";
 			}
@@ -356,11 +345,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if ($modecompta != 'BOOKKEEPING') print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
 				print price($cum[$case], 1);
 				if ($modecompta != 'BOOKKEEPING') print '</a>';
-			}
-			else
-			{
-				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-				else { print '&nbsp;'; }
+			} else {
+				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 			}
 			print "</td>";
 
@@ -390,12 +376,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					print '<td class="borderrightlight right">-</td>';
 				}
-			}
-			else
-			{
+			} else {
 				print '<td class="borderrightlight right">';
-				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
-				else { print '&nbsp;'; }
+				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
 				print '</td>';
 			}
 
@@ -483,9 +466,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 		{
 			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
-		}
-		else
-		{
+		} else {
 			print '<td>&nbsp;</td>';
 		}
 	}
@@ -494,9 +475,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 	{
 		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
-	}
-	else
-	{
+	} else {
 		print '<td>&nbsp;</td>';
 	}
 
@@ -519,12 +498,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		{
 			print '<td class="borderrightlight right">+0%</td>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<td class="borderrightlight right">';
-		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
-		else { print '&nbsp;'; }
+		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print '&nbsp;'; }
 		print '</td>';
 	}
 
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index 3ff41f4d114..c257d5d1f73 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -69,8 +69,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 			$month_end = $month_start - 1;
 			if ($month_end < 1) $month_end = 12;
-		}
-		else $month_end = $month_start;
+		} 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); }
@@ -121,8 +120,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -133,8 +131,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
@@ -165,8 +162,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " AND f.type IN (0,2)";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -176,8 +172,7 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$sql .= " AND pf.fk_facturefourn = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
 	$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
@@ -211,8 +206,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -289,11 +283,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 					print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
-				}
-				else
-				{
-					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-					else { print '&nbsp;'; }
+				} else {
+					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 				}
 				print "</td>";
 			}
@@ -306,11 +297,8 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				if ($modecompta != 'BOOKKEEPING') print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
 				print price($cum[$case], 1);
 				if ($modecompta != 'BOOKKEEPING') print '</a>';
-			}
-			else
-			{
-				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; }
-				else { print '&nbsp;'; }
+			} else {
+				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
 			}
 			print "</td>";
 
@@ -340,12 +328,9 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 				{
 					print '<td class="borderrightlight right">-</td>';
 				}
-			}
-			else
-			{
+			} else {
 				print '<td class="borderrightlight right">';
-				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; }
-				else { print '&nbsp;'; }
+				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
 				print '</td>';
 			}
 
@@ -368,9 +353,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 		{
 			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
-		}
-		else
-		{
+		} else {
 			print '<td>&nbsp;</td>';
 		}
 	}
@@ -379,9 +362,7 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
 	{
 		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
-	}
-	else
-	{
+	} else {
 		print '<td>&nbsp;</td>';
 	}
 
@@ -404,12 +385,9 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 		{
 			print '<td class="borderrightlight right">+0%</td>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<td class="borderrightlight right">';
-		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; }
-		else { print '&nbsp;'; }
+		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print '&nbsp;'; }
 		print '</td>';
 	}
 
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index fafb967ace1..83a3cb70a00 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -57,6 +57,9 @@ if (GETPOST('subcat', 'alpha') === 'yes') {
 $selected_type = GETPOST('search_type', 'int');
 if ($selected_type == '') $selected_type = -1;
 
+// Hook
+$hookmanager->initHooks(array('supplierturnoverbyprodservlist'));
+
 // Date range
 $year = GETPOST("year");
 $month = GETPOST("month");
@@ -100,9 +103,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			else $year_end++;
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
-	}
-	else
-	{
+	} 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); }
@@ -172,8 +173,7 @@ if ($modecompta == "CREANCES-DETTES") {
 
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByProductsAndServices");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -181,11 +181,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 
 	$builddate = dol_now();
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 
@@ -221,8 +219,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($selected_cat === -2)	// Without any category
 	{
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
@@ -240,8 +237,7 @@ 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
+	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$selected_cat;
 		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 		$sql .= ")";
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index fcae12f744b..7a624284cdf 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -50,6 +50,9 @@ if (GETPOST('subcat', 'alpha') === 'yes') {
     $subcat = true;
 }
 
+// Hook
+$hookmanager->initHooks(array('supplierturnoverbythirdpartylist'));
+
 // Security check
 if ($user->socid > 0) $socid = $user->socid;
 if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
@@ -107,9 +110,7 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 	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); }
-}
-else
-{
+} else {
 	// TODO We define q
 }
 
@@ -175,8 +176,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "RECETTES-DEPENSES")
+} elseif ($modecompta == "RECETTES-DEPENSES")
 {
 	$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeEngagement");
@@ -184,11 +184,9 @@ elseif ($modecompta == "RECETTES-DEPENSES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-}
-elseif ($modecompta == "BOOKKEEPING")
+} elseif ($modecompta == "BOOKKEEPING")
 {
-}
-elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
 {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -215,8 +213,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -229,8 +226,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} 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 .= ")";
@@ -245,8 +241,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	}
-	elseif ($selected_cat) 	// Into a specific category
+	} elseif ($selected_cat) 	// Into a specific category
 	{
 	    $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
@@ -259,8 +254,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($selected_cat === -2)	// Without any category
 	{
 	    $sql .= " AND cs.fk_soc is null";
-	}
-	elseif ($selected_cat) {	// Into a specific category
+	} elseif ($selected_cat) {	// Into a specific category
 	    $sql .= " AND (c.rowid = ".$selected_cat;
 	    if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
 	    $sql .= ")";
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 6d7c5935418..a39e14466eb 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -98,7 +98,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	}
     $object->amount = $amount;
 	$object->label = GETPOST("label", 'alpha');
-	$object->note = GETPOST("note", 'none');
+	$object->note_private = GETPOST("note", 'restricthtml');
 
 	if (empty($object->datep))
 	{
@@ -131,9 +131,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 			$db->commit();
 			header("Location: list.php");
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = "create";
@@ -166,22 +164,16 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/compta/tva/list.php');
 				exit;
-			}
-			else
-			{
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	        setEventMessages($object->error, $object->errors, 'errors');
 	    }
-	}
-	else
-	{
+	} else {
 		$mesg = 'Error try do delete a line linked to a conciliated bank transaction';
 		setEventMessages($mesg, null, 'errors');
 	}
@@ -247,7 +239,7 @@ if ($action == 'create')
     print '<label for="radiorefund">';
     print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
     print '&nbsp;';
-    print $langs->trans("Refund");
+    print $langs->trans("PaymentBack");
     print '</label>';
     print '</div>';
     print "<br>\n";
@@ -387,15 +379,11 @@ if ($id)
 	{
 		if (!empty($user->rights->tax->charges->supprimer))
 		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
-		}
-		else
-		{
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 	print "</div>";
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 668a58c4f77..5f661609e52 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -150,15 +150,11 @@ class Tva extends CommonObject
             {
             	$this->db->commit();
             	return $this->id;
-            }
-            else
-			{
+            } else {
 				$this->db->rollback();
 				return -1;
             }
-        }
-        else
-		{
+        } else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -224,9 +220,7 @@ class Tva extends CommonObject
     	{
     		$this->db->commit();
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->db->rollback();
     		return -1;
     	}
@@ -293,9 +287,7 @@ class Tva extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -392,7 +384,7 @@ class Tva extends CommonObject
         $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' ";
+        	$sql .= " AND f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
         }
 
         $result = $this->db->query($sql);
@@ -404,15 +396,11 @@ class Tva extends CommonObject
 				$ret = $obj->amount;
                 $this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
                 $this->db->free($result);
 				return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -433,7 +421,7 @@ class Tva extends CommonObject
         $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 .= " WHERE f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
         }
 
         $result = $this->db->query($sql);
@@ -445,15 +433,11 @@ class Tva extends CommonObject
                 $ret = $obj->total_tva;
             	$this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -476,7 +460,7 @@ class Tva extends CommonObject
 
         if ($year)
         {
-            $sql .= " WHERE f.datev >= '".$year."-01-01' AND f.datev <= '".$year."-12-31' ";
+        	$sql .= " WHERE f.datev >= '".$this->db->escape($year)."-01-01' AND f.datev <= '".$this->db->escape($year)."-12-31' ";
         }
 
         $result = $this->db->query($sql);
@@ -488,15 +472,11 @@ class Tva extends CommonObject
                 $ret = $obj->amount;
             	$this->db->free($result);
                 return $ret;
-            }
-            else
-			{
+            } else {
             	$this->db->free($result);
 				return 0;
             }
-        }
-        else
-        {
+        } else {
             print $this->db->lasterror();
             return -1;
         }
@@ -613,9 +593,7 @@ class Tva extends CommonObject
                     if ($bank_line_id > 0)
 					{
                         $this->update_fk_bank($bank_line_id);
-                    }
-					else
-					{
+                    } else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
@@ -633,21 +611,15 @@ class Tva extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -3;
 				}
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -670,9 +642,7 @@ class Tva extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -711,8 +681,7 @@ class Tva extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
@@ -753,9 +722,7 @@ class Tva extends CommonObject
 
             $this->db->free($resql);
             return $amount;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -800,9 +767,7 @@ class Tva extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index bcedba7a074..a91d637c39d 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -66,14 +66,11 @@ 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 (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
+            } 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--;
@@ -85,15 +82,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
             	}
             	$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
+            } 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
-    {
+    } 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); }
@@ -130,6 +124,7 @@ $product_static = new Product($db);
 $payment_static = new Paiement($db);
 $paymentfourn_static = new PaiementFourn($db);
 $paymentexpensereport_static = new PaymentExpenseReport($db);
+$user_static = new User($db);
 
 $morequerystring = '';
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
@@ -157,7 +152,7 @@ $calcmode = '';
 if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
 if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
 if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
-$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')';
+$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 $prevyear = $year_start;
@@ -222,7 +217,7 @@ $vatsup = $langs->trans("VATPaid");
 
 
 // VAT Received
-
+print '<div class="div-table-responsive">';
 print "<table class=\"noborder\" width=\"100%\">";
 
 $y = $year_current;
@@ -321,9 +316,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
                     'vat'				=>$x_paye[$my_paye_thirdpartyid]['vat_list'][$id],
                     'link'				=>$expensereport->getNomUrl(1)
                 );
-            }
-            else
-            {
+            } 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];
@@ -693,9 +686,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
                             || ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
                         {
                             print $langs->trans("NA");
-                        }
-                        else
-                        {
+                        } else {
                             if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
                                 $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
                             }
@@ -753,14 +744,12 @@ if (!is_array($x_coll) || !is_array($x_paye))
         print '</tr>';
     }
 
-    print '</table>';
-
     // Total to pay
-    print '<br><br>';
-    print '<table class="noborder centpercent">';
+    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.'">'.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').'</td>';
+    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";
 
@@ -768,7 +757,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 }
 
 print '</table>';
-
+print '</div>';
 
 llxFooter();
 
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index 0a464c47b54..830dfb78d3a 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -148,9 +148,7 @@ if ($object->id)
     $permtoedit = $user->rights->fournisseur->facture->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 0a785aa78cd..a4fd1293b4d 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -57,14 +57,11 @@ 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 (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
+			} 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--;
@@ -76,15 +73,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 				}
 				$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
+			} 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
-	{
+	} 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); }
@@ -176,9 +170,7 @@ function pt($db, $sql, $date)
             	$amountpaid = 0;
             	$previousmode = '';
             	$previousmonth = '';
-            }
-            else
-            {
+            } else {
             	$previousmode = $obj->mode;
             	$previousmonth = $obj->dm;
             }
@@ -207,8 +199,7 @@ function pt($db, $sql, $date)
         print "</table>";
 
         $db->free($result);
-    }
-    else {
+    } else {
         dol_print_error($db);
     }
 }
@@ -229,12 +220,12 @@ $fsearch .= '<input type="hidden" name="modetax" value="'.$modetax.'">';
 $description = $fsearch;
 
 // Show report header
-$name = $langs->trans("ReportByMonth");
+$name = $langs->trans("VATReportByMonth");
 $calcmode = '';
 if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
 if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
 if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
-$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')';
+$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
 
 $description .= $langs->trans("VATSummary").'<br>';
 if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description .= $langs->trans("RulesVATDueProducts");
@@ -371,9 +362,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else
-			{
+			} else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 003a7eabcad..82829fca12e 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -72,9 +72,7 @@ if (empty($_REQUEST['typeid']))
 		$part = explode(':', $val);
 		if ($part[0] == 't.fk_typepayment') $typeid = $part[1];
 	}
-}
-else
-{
+} else {
 	$typeid = $_REQUEST['typeid'];
 }
 
@@ -148,11 +146,9 @@ if ($result)
 	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 	if ($typeid) $param .= '&amp;typeid='.$typeid;
 
-	$newcardbutton = '';
-	if ($user->rights->tax->charges->creer)
-	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/tva/card.php?action=create');
-    }
+	$url = DOL_URL_ROOT.'/compta/tva/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -174,22 +170,18 @@ if ($result)
 	// Date end period
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1);
+	print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1);
+	print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	// Date payment
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1);
+	print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1);
+	print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	// Type
 	print '<td class="liste_titre left">';
@@ -228,9 +220,7 @@ if ($result)
 		if ($obj->payment_code <> '')
 		{
 			$type = '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-		}
-		else
-		{
+		} else {
 			$type = '<td>&nbsp;</td>';
 		}
 
@@ -266,8 +256,7 @@ if ($result)
 
 				$bankstatic->label = $obj->blabel;
 				print $bankstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td>';
 		}
 		// Amount
@@ -291,9 +280,7 @@ if ($result)
 	print '</form>';
 
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 79ee69a030c..8fb4c32bf72 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -66,14 +66,11 @@ 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 (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
+			} 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--;
@@ -85,15 +82,12 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 				}
 				$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
+			} 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
-	{
+	} 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); }
@@ -158,7 +152,7 @@ $calcmode = '';
 if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
 if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
 if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
-$calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')';
+$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 $prevyear = $year_start; $prevquarter = $q;
@@ -219,6 +213,7 @@ $vatexpensereport = $langs->trans("VATPaid");
 
 
 // VAT Received and paid
+print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 
 $y = $year_current;
@@ -315,9 +310,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
 				'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else
-			{
+			} else {
 				$invoice_supplier->id = $x_paye[$my_paye_rate]['facid'][$id];
 				$invoice_supplier->ref = $x_paye[$my_paye_rate]['facnum'][$id];
 				$invoice_supplier->type = $x_paye[$my_paye_rate]['type'][$id];
@@ -439,9 +432,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					if (dol_string_nohtmltag($fields['descr'])) {
 						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 					}
-				}
-				else
-				{
+				} else {
 					if ($type) {
 						$text = img_object($langs->trans('Service'), 'service');
 					} else {
@@ -620,9 +611,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					if (dol_string_nohtmltag($fields['descr'])) {
 						print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 					}
-				}
-				else
-				{
+				} else {
 					if ($type) {
 						$text = img_object($langs->trans('Service'), 'service');
 					} else {
@@ -673,9 +662,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 						|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
 					{
 						print $langs->trans("NA");
-					}
-					else
-					{
+					} else {
 						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
 							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
 						}
@@ -733,6 +720,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	}
 
 	print '</table>';
+	print '</div>';
 
 	// Total to pay
 	print '<br><br>';
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 32c37301a0e..02cc5bae399 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -219,10 +219,10 @@ $dolibarr_main_authentication='dolibarr';
 // 1 = Force redirect to https, until SCRIPT_URI start with https into response
 // 2 = Force redirect to https, until SERVER["HTTPS"] is 'on' into response
 // 'https://my.domain.com' = Force redirect to https using this domain name.
-// Warning: If you enable this parameter, your web server must be configured to
-// respond URL with https protocol.
-// According to your web server setup, some values may works and other not. Try
-// different values (1,2 or 'https://my.domain.com') if you experience problems.
+// Warning: If you enable this parameter, your web server must be configured to respond URL with https protocol.
+// According to your web server setup, some values may works and other not. Try different values (1,2 or 'https://my.domain.com') if you experience problems.
+// Even if a redirect to HTTPS is forced by the webserver, it is recommanded to set this value to another value than 0, so your session cookies will be 
+// flagged as secured. 
 // Default value: 0
 // Possible values: 0, 1, 2 or 'https://my.domain.com'
 // Examples:
@@ -233,12 +233,12 @@ $dolibarr_main_force_https='0';
 // dolibarr_main_prod
 // When this parameter is defined, all errors messages are not reported.
 // This feature exists for production usage to avoid to give any information to hackers.
-// Default value: 0
+// Default value: 1
 // Possible values: 0 or 1
 // Examples:
-// $dolibarr_main_prod='0';
+// $dolibarr_main_prod='1';
 //
-$dolibarr_main_prod='0';
+$dolibarr_main_prod='1';
 
 // $dolibarr_main_restrict_os_commands
 // To restrict commands you can execute by the backup feature, enter allowed command here.
@@ -260,8 +260,8 @@ $dolibarr_main_restrict_ip='';
 
 // dolibarr_nocsrfcheck
 // This parameter can be used to disable CSRF protection.
-// This might be required if you access Dolibarr behind a proxy that make
-// URL rewriting, to avoid false alarms.
+// This might be required if you access Dolibarr behind a proxy that make bad URL rewriting, to avoid false alarms.
+// In most cases, you should always keep this to 0.
 // Default value: 0
 // Possible values: 0 or 1
 // Examples:
@@ -269,6 +269,12 @@ $dolibarr_main_restrict_ip='';
 //
 $dolibarr_nocsrfcheck='0';
 
+// dolibarr_cron_allow_cli
+// If set to 1, you will be able to define some command line in the internale Job scheduler module.
+// Default value: '0'
+// Examples: '1'
+$dolibarr_cron_allow_cli='0';
+
 // dolibarr_mailing_limit_sendbyweb
 // Can set a limit for mailing send by web. This overwrite database value. Can be used to restrict on OS level.
 // Default value: '25'
@@ -281,6 +287,18 @@ $dolibarr_nocsrfcheck='0';
 // Examples: '-1' (sending by cli is forbidden)
 // $dolibarr_mailing_limit_sendbycli='0';
 
+// MAIN_ANTIVIRUS_COMMAND (as a constant)
+// Force a value for the antivirus command line tool so setup for admin user interface has no effect.
+// Default value: ''
+// Example: '/usr/bin/clamdscan';
+// define('MAIN_ANTIVIRUS_COMMAND', '/usr/bin/clamdscan');
+
+// MAIN_ANTIVIRUS_PARAM (as a constant)
+// Force a value for the antivirus parameters on command line so setup for admin user interface has no effect.
+// Default value: ''
+// Example: '--fdpass';
+// define('MAIN_ANTIVIRUS_PARAM', '--fdpass');
+
 
 //##################
 // Other
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 625cf524169..23a6042fbf9 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -76,16 +76,14 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -159,9 +157,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
  	}
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
     $objcanvas->display_canvas($action); // Show template
-}
-else
-{
+} else {
     // -----------------------------------------
     // When used in standard mode
     // -----------------------------------------
@@ -244,18 +240,11 @@ else
         $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 (is_object($objthirdparty) && 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>";
+			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'));
     	}
 
-
-    	//print '<div class="tabsAction">';
-        //print '</div>';
-
     	$newcardbutton = '';
     	if (!empty($conf->agenda->enabled))
     	{
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index fbd31812fe8..415d9e47790 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -119,9 +119,7 @@ abstract class ActionsContactCardCommon
         	{
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
         		$this->tpl['company_id'] = $objsoc->id;
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $form->select_company($this->object->socid, 'socid', '', 1);
         	}
 
@@ -208,8 +206,7 @@ abstract class ActionsContactCardCommon
 				$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");
+			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
         }
 
         if ($action == 'view' || $action == 'delete')
@@ -222,9 +219,7 @@ abstract class ActionsContactCardCommon
 
         		$objsoc->fetch($this->object->socid);
         		$this->tpl['company'] = $objsoc->getNomUrl(1);
-        	}
-        	else
-        	{
+        	} else {
         		$this->tpl['company'] = $langs->trans("ContactNotLinkedToCompany");
         	}
 
@@ -309,9 +304,7 @@ abstract class ActionsContactCardCommon
             if ($resql)
             {
                 $obj = $this->db->fetch_object($resql);
-            }
-            else
-            {
+            } else {
                 dol_print_error($this->db);
             }
             $this->object->country_id = $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 54b3f137967..099c973b0a4 100644
--- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php
+++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php
@@ -104,9 +104,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
             $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
-		{
+		} else {
 			// Confirm delete contact
         	if ($action == 'delete' && $user->rights->societe->contact->supprimer)
         	{
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
index bd0808aa8b5..43fd48e3ef0 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
@@ -144,7 +144,7 @@ if (empty($user->socid)) {
 	}
 
 	if ($user->rights->societe->contact->supprimer) {
-		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
+		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$this->control->tpl['id'].'&amp;action=delete&amp;token='.newToken().'&amp;canvas='.$canvas.'">'.$langs->trans('Delete').'</a>';
 	}
 
 	print '</div><br>';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 7bd88436e31..e4e7ecaf5fb 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Josep Lluís Amador      <joseplluis@lliuretic.cat>
+ * Copyright (C) 2020       Open-Dsi     			<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -70,14 +71,14 @@ $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
 if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactcard', 'globalcard'));
@@ -101,51 +102,45 @@ 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;
+	}
 
 	// Creation utilisateur depuis contact
-    if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-    {
-        // Recuperation contact actuel
-        $result = $object->fetch($id);
+	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
+	{
+		// Recuperation contact actuel
+		$result = $object->fetch($id);
 
-        if ($result > 0)
-        {
-            $db->begin();
+		if ($result > 0)
+		{
+			$db->begin();
 
-            // Creation user
-            $nuser = new User($db);
-            $result = $nuser->create_from_contact($object, GETPOST("login")); // Do not use GETPOST(alpha)
+			// Creation user
+			$nuser = new User($db);
+			$result = $nuser->create_from_contact($object, GETPOST("login")); // Do not use GETPOST(alpha)
 
-            if ($result > 0)
-            {
-                $result2 = $nuser->setPassword($user, GETPOST("password"), 0, 0, 1); // Do not use GETPOST(alpha)
-                if ($result2)
-                {
-                    $db->commit();
-                }
-                else
-                {
-                    $error = $nuser->error; $errors = $nuser->errors;
-                    $db->rollback();
-                }
-            }
-            else
-            {
-                $error = $nuser->error; $errors = $nuser->errors;
-                $db->rollback();
-            }
-        }
-        else
-        {
-            $error = $object->error; $errors = $object->errors;
-        }
-    }
+			if ($result > 0)
+			{
+				$result2 = $nuser->setPassword($user, GETPOST("password"), 0, 0, 1); // Do not use GETPOST(alpha)
+				if ($result2)
+				{
+					$db->commit();
+				} else {
+					$error = $nuser->error; $errors = $nuser->errors;
+					$db->rollback();
+				}
+			} else {
+				$error = $nuser->error; $errors = $nuser->errors;
+				$db->rollback();
+			}
+		} else {
+			$error = $object->error; $errors = $object->errors;
+		}
+	}
 
 
 	// Confirmation desactivation
@@ -155,9 +150,7 @@ if (empty($reshook))
 		if ($object->setstatus(0) < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 			exit;
 		}
@@ -170,9 +163,7 @@ if (empty($reshook))
 		if ($object->setstatus(1) < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 			exit;
 		}
@@ -183,50 +174,50 @@ if (empty($reshook))
 	{
 		$db->begin();
 
-        if ($canvas) $object->canvas = $canvas;
+		if ($canvas) $object->canvas = $canvas;
 
-        $object->entity = (GETPOSTISSET('entity') ?GETPOST('entity', 'int') : $conf->entity);
-        $object->socid			= GETPOST("socid", 'int');
-        $object->lastname = GETPOST("lastname", 'alpha');
-        $object->firstname = GETPOST("firstname", 'alpha');
-		$object->civility_code	= GETPOST("civility_code", 'alpha');
-        $object->poste			= GETPOST("poste", 'alpha');
-        $object->address = GETPOST("address", 'alpha');
-        $object->zip = GETPOST("zipcode", 'alpha');
-        $object->town = GETPOST("town", 'alpha');
-        $object->country_id = GETPOST("country_id", 'int');
-        $object->state_id = GETPOST("state_id", 'int');
-        //$object->jabberid		= GETPOST("jabberid", 'alpha');
-        //$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->email = GETPOST("email", 'alpha');
-        $object->no_email = GETPOST("no_email", "int");
-        $object->phone_pro = GETPOST("phone_pro", 'alpha');
-        $object->phone_perso = GETPOST("phone_perso", 'alpha');
-        $object->phone_mobile = GETPOST("phone_mobile", 'alpha');
-        $object->fax = GETPOST("fax", 'alpha');
-        $object->priv = GETPOST("priv", 'int');
-        $object->note_public = GETPOST("note_public", 'none');
-        $object->note_private = GETPOST("note_private", 'none');
-        $object->roles = GETPOST("roles", 'array');
+		$object->entity = (GETPOSTISSET('entity') ?GETPOST('entity', 'int') : $conf->entity);
+		$object->socid = GETPOST("socid", 'int');
+		$object->lastname = GETPOST("lastname", 'alpha');
+		$object->firstname = GETPOST("firstname", 'alpha');
+		$object->civility_code = GETPOST("civility_code", 'alpha');
+		$object->poste			= GETPOST("poste", 'alpha');
+		$object->address = GETPOST("address", 'alpha');
+		$object->zip = GETPOST("zipcode", 'alpha');
+		$object->town = GETPOST("town", 'alpha');
+		$object->country_id = GETPOST("country_id", 'int');
+		$object->state_id = GETPOST("state_id", 'int');
+		//$object->jabberid		= GETPOST("jabberid", 'alpha');
+		//$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->email = GETPOST("email", 'alpha');
+		$object->no_email = GETPOST("no_email", "int");
+		$object->phone_pro = GETPOST("phone_pro", 'alpha');
+		$object->phone_perso = GETPOST("phone_perso", 'alpha');
+		$object->phone_mobile = GETPOST("phone_mobile", 'alpha');
+		$object->fax = GETPOST("fax", 'alpha');
+		$object->priv = GETPOST("priv", 'int');
+		$object->note_public = GETPOST("note_public", 'restricthtml');
+		$object->note_private = GETPOST("note_private", 'restricthtml');
+		$object->roles = GETPOST("roles", 'array');
 
-        $object->statut			= 1; //Defult status to Actif
+		$object->statut			= 1; //Defult status to Actif
 
-        // Note: Correct date should be completed with location to have exact GM time of birth.
-        $object->birthday = dol_mktime(0, 0, 0, GETPOST("birthdaymonth", 'int'), GETPOST("birthdayday", 'int'), GETPOST("birthdayyear", 'int'));
-        $object->birthday_alert = GETPOST("birthday_alert", 'alpha');
+		// Note: Correct date should be completed with location to have exact GM time of birth.
+		$object->birthday = dol_mktime(0, 0, 0, GETPOST("birthdaymonth", 'int'), GETPOST("birthdayday", 'int'), GETPOST("birthdayyear", 'int'));
+		$object->birthday_alert = GETPOST("birthday_alert", 'alpha');
 
-        // Fill array 'array_options' with data from add form
+		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0)
 		{
@@ -234,19 +225,19 @@ if (empty($reshook))
 			$action = 'create';
 		}
 
-        if (!GETPOST("lastname"))
-        {
-            $error++; $errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label"));
-            $action = 'create';
-        }
+		if (!GETPOST("lastname"))
+		{
+			$error++; $errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Lastname").' / '.$langs->transnoentities("Label"));
+			$action = 'create';
+		}
 
-        if (!$error)
-        {
-            $id = $object->create($user);
-            if ($id <= 0)
-            {
-                $error++; $errors = array_merge($errors, ($object->error ? array($object->error) : $object->errors));
-                $action = 'create';
+		if (!$error)
+		{
+			$id = $object->create($user);
+			if ($id <= 0)
+			{
+				$error++; $errors = array_merge($errors, ($object->error ? array($object->error) : $object->errors));
+				$action = 'create';
 			} else {
 				// Categories association
 				$contcats = GETPOST('contcats', 'array');
@@ -268,57 +259,51 @@ if (empty($reshook))
 					}
 				}
 			}
-        }
+		}
 
-        if (!$error && $id > 0)
-        {
-            $db->commit();
-            if (!empty($backtopage)) $url = $backtopage;
-            else $url = 'card.php?id='.$id;
-            header("Location: ".$url);
-            exit;
-        }
-        else
-        {
-            $db->rollback();
-        }
-    }
+		if (!$error && $id > 0)
+		{
+			$db->commit();
+			if (!empty($backtopage)) $url = $backtopage;
+			else $url = 'card.php?id='.$id;
+			header("Location: ".$url);
+			exit;
+		} else {
+			$db->rollback();
+		}
+	}
 
-    if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->contact->supprimer)
-    {
-        $result = $object->fetch($id);
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->contact->supprimer)
+	{
+		$result = $object->fetch($id);
 		$object->oldcopy = clone $object;
 
-        $object->old_lastname = GETPOST("old_lastname");
-        $object->old_firstname = GETPOST("old_firstname");
+		$object->old_lastname = GETPOST("old_lastname");
+		$object->old_firstname = GETPOST("old_firstname");
 
-        $result = $object->delete();
-        if ($result > 0)
-        {
-        	if ($backtopage)
-        	{
-        		header("Location: ".$backtopage);
-        		exit;
-        	}
-        	else
-        	{
-        		header("Location: ".DOL_URL_ROOT.'/contact/list.php');
-        		exit;
-        	}
-        }
-        else
-        {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
+		$result = $object->delete();
+		if ($result > 0)
+		{
+			if ($backtopage)
+			{
+				header("Location: ".$backtopage);
+				exit;
+			} else {
+				header("Location: ".DOL_URL_ROOT.'/contact/list.php');
+				exit;
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 
-    if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact->creer)
-    {
-        if (empty($_POST["lastname"]))
-        {
-            $error++; $errors = array($langs->trans("ErrorFieldRequired", $langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
-            $action = 'edit';
-        }
+	if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact->creer)
+	{
+		if (empty($_POST["lastname"]))
+		{
+			$error++; $errors = array($langs->trans("ErrorFieldRequired", $langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
+			$action = 'edit';
+		}
 
 		if (!$error)
 		{
@@ -327,164 +312,171 @@ if (empty($reshook))
 
 			// Photo save
 			$dir = $conf->societe->multidir_output[$object->entity]."/contact/".$object->id."/photos";
-            $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-            if (GETPOST('deletephoto') && $object->photo)
-            {
-                $fileimg = $dir.'/'.$object->photo;
-                $dirthumbs = $dir.'/thumbs';
-                dol_delete_file($fileimg);
-                dol_delete_dir_recursive($dirthumbs);
-                $object->photo = '';
-            }
-            if ($file_OK)
-            {
-                if (image_format_supported($_FILES['photo']['name']) > 0)
-                {
-                    dol_mkdir($dir);
+			$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+			if (GETPOST('deletephoto') && $object->photo)
+			{
+				$fileimg = $dir.'/'.$object->photo;
+				$dirthumbs = $dir.'/thumbs';
+				dol_delete_file($fileimg);
+				dol_delete_dir_recursive($dirthumbs);
+				$object->photo = '';
+			}
+			if ($file_OK)
+			{
+				if (image_format_supported($_FILES['photo']['name']) > 0)
+				{
+					dol_mkdir($dir);
 
-                    if (@is_dir($dir))
-                    {
-                        $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                        $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+					if (@is_dir($dir))
+					{
+						$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+						$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                        if (!$result > 0)
-                        {
-                            $errors[] = "ErrorFailedToSaveFile";
-                        }
-                        else
-                        {
-                            $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
+						if (!$result > 0)
+						{
+							$errors[] = "ErrorFailedToSaveFile";
+						} else {
+							$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
 
-    					    // Create thumbs
-    					    $object->addThumbs($newfile);
-                        }
-                    }
-                }
-                else
-                {
-                    $errors[] = "ErrorBadImageFormat";
-                }
-            }
-            else
-            {
-                switch ($_FILES['photo']['error'])
-                {
-                    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-                    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-                        $errors[] = "ErrorFileSizeTooLarge";
-                        break;
-                    case 3: //uploaded file was only partially uploaded
-                        $errors[] = "ErrorFilePartiallyUploaded";
-                        break;
-                }
-            }
+							// Create thumbs
+							$object->addThumbs($newfile);
+						}
+					}
+				} else {
+					$errors[] = "ErrorBadImageFormat";
+				}
+			} else {
+				switch ($_FILES['photo']['error'])
+				{
+					case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+					case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+						$errors[] = "ErrorFileSizeTooLarge";
+						break;
+					case 3: //uploaded file was only partially uploaded
+						$errors[] = "ErrorFilePartiallyUploaded";
+						break;
+				}
+			}
 
 			$object->oldcopy = clone $object;
 
 			$object->old_lastname = GETPOST("old_lastname", 'alpha');
 			$object->old_firstname = GETPOST("old_firstname", 'alpha');
 
-            $object->socid = GETPOST("socid", 'int');
-            $object->lastname = GETPOST("lastname", 'alpha');
-            $object->firstname = GETPOST("firstname", 'alpha');
-            $object->civility_code = GETPOST("civility_code", 'alpha');
-            $object->poste = GETPOST("poste", 'alpha');
+			$object->socid = GETPOST("socid", 'int');
+			$object->lastname = GETPOST("lastname", 'alpha');
+			$object->firstname = GETPOST("firstname", 'alpha');
+			$object->civility_code = GETPOST("civility_code", 'alpha');
+			$object->poste = GETPOST("poste", 'alpha');
 
-            $object->address = GETPOST("address", 'alpha');
-            $object->zip = GETPOST("zipcode", 'alpha');
-            $object->town = GETPOST("town", 'alpha');
-            $object->state_id   	= GETPOST("state_id", 'int');
-            $object->country_id		= GETPOST("country_id", 'int');
+			$object->address = GETPOST("address", 'alpha');
+			$object->zip = GETPOST("zipcode", 'alpha');
+			$object->town = GETPOST("town", 'alpha');
+			$object->state_id   	= GETPOST("state_id", 'int');
+			$object->country_id		= GETPOST("country_id", 'int');
 
-            $object->email = GETPOST("email", 'alpha');
-            $object->no_email = GETPOST("no_email", "int");
-            //$object->jabberid		= GETPOST("jabberid", 'alpha');
-            //$object->skype		= GETPOST("skype", 'alpha');
-            //$object->twitter		= GETPOST("twitter", 'alpha');
-            //$object->facebook		= GETPOST("facebook", 'alpha');
-            //$object->linkedin		= GETPOST("linkedin", 'alpha');
+			$object->email = GETPOST("email", 'alpha');
+			$object->no_email = GETPOST("no_email", "int");
+			//$object->jabberid		= GETPOST("jabberid", 'alpha');
+			//$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_pro = GETPOST("phone_pro", 'alpha');
-            $object->phone_perso = GETPOST("phone_perso", 'alpha');
-            $object->phone_mobile = GETPOST("phone_mobile", 'alpha');
-            $object->fax = GETPOST("fax", 'alpha');
-            $object->priv = GETPOST("priv", 'int');
-            $object->note_public = GETPOST("note_public", 'none');
-            $object->note_private = GETPOST("note_private", 'none');
-            $object->roles = GETPOST("roles", '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_pro = GETPOST("phone_pro", 'alpha');
+			$object->phone_perso = GETPOST("phone_perso", 'alpha');
+			$object->phone_mobile = GETPOST("phone_mobile", 'alpha');
+			$object->fax = GETPOST("fax", 'alpha');
+			$object->priv = GETPOST("priv", 'int');
+			$object->note_public = GETPOST("note_public", 'restricthtml');
+			$object->note_private = GETPOST("note_private", 'restricthtml');
+			$object->roles = GETPOST("roles", 'array');
 
-            // Fill array 'array_options' with data from add form
+			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
 			if ($ret < 0) $error++;
 
 			if (!$error)
 			{
-                $result = $object->update($contactid, $user);
+				$result = $object->update($contactid, $user);
 
-    			if ($result > 0) {
-    				// Categories association
-    				$categories = GETPOST('contcats', 'array');
-    				$object->setCategories($categories);
+				if ($result > 0) {
+					// Categories association
+					$categories = GETPOST('contcats', 'array');
+					$object->setCategories($categories);
 
-    				$no_email = GETPOST('no_email', 'int');
+					$no_email = GETPOST('no_email', 'int');
 
-    				// Update mass emailing flag into table mailing_unsubscribe
-    				if (GETPOSTISSET('no_email') && $object->email)
-    				{
-    					if ($no_email)
-	    				{
-	    					$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing', 0).") AND email = '".$db->escape($object->email)."'";
-	    					$resql = $db->query($sql);
-	    					if ($resql)
-	    					{
-	    						$obj = $db->fetch_object($resql);
-	    						$noemail = $obj->nb;
-	    						if (empty($noemail))
-	    						{
-	    							$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe(email, entity, date_creat) VALUES ('".$db->escape($object->email)."', ".$db->escape(getEntity('mailing', 0)).", '".$db->idate(dol_now())."')";
-	    							$resql = $db->query($sql);
-	    						}
-	    					}
-	    				}
-	    				else
-	    				{
-	    					$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = '".$db->escape($object->email)."' AND entity = ".$db->escape(getEntity('mailing', 0));
-	    					$resql = $db->query($sql);
-	    				}
+					// Update mass emailing flag into table mailing_unsubscribe
+					if (GETPOSTISSET('no_email') && $object->email)
+					{
+						if ($no_email)
+						{
+							$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing', 0).") AND email = '".$db->escape($object->email)."'";
+							$resql = $db->query($sql);
+							if ($resql)
+							{
+								$obj = $db->fetch_object($resql);
+								$noemail = $obj->nb;
+								if (empty($noemail))
+								{
+									$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe(email, entity, date_creat) VALUES ('".$db->escape($object->email)."', ".$db->escape(getEntity('mailing', 0)).", '".$db->idate(dol_now())."')";
+									$resql = $db->query($sql);
+								}
+							}
+						} else {
+							$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = '".$db->escape($object->email)."' AND entity = ".$db->escape(getEntity('mailing', 0));
+							$resql = $db->query($sql);
+						}
 
-	    				$object->no_email = $no_email;
-    				}
+						$object->no_email = $no_email;
+					}
 
-    				$object->old_lastname = '';
-    				$object->old_firstname = '';
-    				$action = 'view';
-    			}
-    			else
-    			{
-    				setEventMessages($object->error, $object->errors, 'errors');
-    				$action = 'edit';
-    			}
+					$object->old_lastname = '';
+					$object->old_firstname = '';
+					$action = 'view';
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+					$action = 'edit';
+				}
 			}
-        }
+		}
 
-        if (!$error && empty($errors))
-        {
-       		if (!empty($backtopage))
-       		{
-       			header("Location: ".$backtopage);
-       			exit;
-       		}
-        }
-    }
+		if (!$error && empty($errors))
+		{
+	   		if (!empty($backtopage))
+	   		{
+	   			header("Location: ".$backtopage);
+	   			exit;
+	   		}
+		}
+	}
 
-    // Actions to send emails
+	if ($action == 'setprospectcontactlevel' && $user->rights->societe->contact->creer)
+	{
+		$object->fetch($id);
+		$object->fk_prospectlevel = GETPOST('prospect_contact_level_id', 'alpha');
+		$result = $object->update($object->id, $user);
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+	}
+
+	// set communication status
+	if ($action == 'setstcomm')
+	{
+		$object->fetch($id);
+		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcommcontact');
+		$result = $object->update($object->id, $user);
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+	}
+
+	// Actions to send emails
 	$triggersendname = 'CONTACT_SENTBYMAIL';
 	$paramname = 'id';
 	$mode = 'emailfromcontact';
@@ -509,89 +501,87 @@ $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("
 
 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
-}
-else
-{
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
+	$objcanvas->display_canvas($action); // Show template
+} else {
+	// -----------------------------------------
+	// 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) {
-        	setEventMessages($object->error, $object->errors, 'errors');
-        }
+	$head = array();
+	if ($id > 0)
+	{
+		// Si edition contact deja existant
+		$object = new Contact($db);
+		$res = $object->fetch($id, $user);
+		if ($res < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-        $object->fetchRoles();
+		$object->fetchRoles();
 
-        // 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 ($user->rights->societe->contact->creer)
-    {
-        if ($action == 'create')
-        {
-            /*
+	if ($user->rights->societe->contact->creer)
+	{
+		if ($action == 'create')
+		{
+			/*
              * Fiche en mode creation
              */
-            $object->canvas = $canvas;
+			$object->canvas = $canvas;
 
-            $object->state_id = GETPOST("state_id");
+			$object->state_id = GETPOST("state_id");
 
-            // We set country_id, country_code and label for the selected country
-            $object->country_id = $_POST["country_id"] ?GETPOST("country_id") : (empty($objsoc->country_id) ? $mysoc->country_id : $objsoc->country_id);
-            if ($object->country_id)
-            {
-            	$tmparray = getCountry($object->country_id, 'all');
-                $object->country_code = $tmparray['code'];
-                $object->country      = $tmparray['label'];
-            }
+			// We set country_id, country_code and label for the selected country
+			$object->country_id = $_POST["country_id"] ?GETPOST("country_id") : (empty($objsoc->country_id) ? $mysoc->country_id : $objsoc->country_id);
+			if ($object->country_id)
+			{
+				$tmparray = getCountry($object->country_id, 'all');
+				$object->country_code = $tmparray['code'];
+				$object->country      = $tmparray['label'];
+			}
 
-            $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
-            $linkback = '';
-            print load_fiche_titre($title, $linkback, 'address');
+			$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
+			$linkback = '';
+			print load_fiche_titre($title, $linkback, 'address');
 
-            // Show errors
-            dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
+			// Show errors
+			dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
 
-            if ($conf->use_javascript_ajax)
-            {
+			if ($conf->use_javascript_ajax)
+			{
 				print "\n".'<script type="text/javascript" language="javascript">'."\n";
 				print 'jQuery(document).ready(function () {
 							jQuery("#selectcountry_id").change(function() {
@@ -611,224 +601,219 @@ else
                             });
 						})'."\n";
 				print '</script>'."\n";
-            }
+			}
 
-            print '<form method="post" name="formsoc" action="'.$_SERVER["PHP_SELF"].'">';
-            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 '<form method="post" name="formsoc" action="'.$_SERVER["PHP_SELF"].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="add">';
+			print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 			if (!empty($objsoc)) {
 				print '<input type="hidden" name="entity" value="'.$objsoc->entity.'">';
-            }
+			}
 
-            dol_fiche_head($head, 'card', '', 0, '');
+			dol_fiche_head($head, 'card', '', 0, '');
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Name
-            print '<tr><td class="titlefieldcreate fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
-            print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
-            print '</tr>';
-
-            print '<tr>';
-            print '<td><label for="firstname">';
-            print $form->textwithpicto($langs->trans("Firstname"), $langs->trans("KeepEmptyIfGenericAddress")).'</label></td>';
-            print '<td colspan="3"><input name="firstname" id="firstname"type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname", 'alpha') ?GETPOST("firstname", 'alpha') : $object->firstname).'"></td>';
-            print '</tr>';
-
-            // Company
-            if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-            {
-                if ($socid > 0)
-                {
-                    print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
-                    print '<td colspan="3" class="maxwidthonsmartphone">';
-                    print $objsoc->getNomUrl(1, 'contact');
-                    print '</td>';
-                    print '<input type="hidden" name="socid" id="socid" value="'.$objsoc->id.'">';
-                    print '</td></tr>';
-                }
-                else {
-                    print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-                    print $form->select_company($socid, 'socid', '', 'SelectThirdParty');
-                    print '</td></tr>';
-                }
-            }
-
-            // Civility
-            print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
-            print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'alpha') : $object->civility_code, 'civility_code');
-            print '</td></tr>';
-
-            print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
-	        print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOST("poste", 'alpha') ?GETPOST("poste", 'alpha') : $object->poste).'"></td>';
-
-            $colspan = 3;
-            if ($conf->use_javascript_ajax && $socid > 0) $colspan = 2;
-
-            // Address
-            if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) $object->address = $objsoc->address; // Predefined with third party
-            print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
-            print '<td colspan="'.$colspan.'"><textarea class="flat quatrevingtpercent" name="address" id="address" rows="'.ROWS_2.'">'.(GETPOST("address", 'alpha') ?GETPOST("address", 'alpha') : $object->address).'</textarea></td>';
-
-            if ($conf->use_javascript_ajax && $socid > 0)
-            {
-	            $rowspan = 3;
-	    		if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
-
-	            print '<td class="valignmiddle center" rowspan="'.$rowspan.'">';
-		        print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a>';
-	            print '</td>';
-            }
-            print '</tr>';
-
-            // Zip / Town
-            if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) $object->zip = $objsoc->zip; // Predefined with third party
-            if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->town)) == 0) $object->town = $objsoc->town; // Predefined with third party
-            print '<tr><td><label for="zipcode">'.$langs->trans("Zip").'</label> / <label for="town">'.$langs->trans("Town").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-            print $formcompany->select_ziptown((GETPOST("zipcode", 'alpha') ? GETPOST("zipcode", 'alpha') : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6).'&nbsp;';
-            print $formcompany->select_ziptown((GETPOST("town", 'alpha') ? GETPOST("town", 'alpha') : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-            print '</td></tr>';
-
-            // Country
-            print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-            print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-            print $form->select_country((GETPOST("country_id", 'alpha') ? GETPOST("country_id", 'alpha') : $object->country_id), 'country_id');
-            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><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-                }
-                else
-                {
-                    print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-                }
-
-                if ($object->country_id)
-                {
-                    print $formcompany->select_state(GETPOST("state_id", 'alpha') ? GETPOST("state_id", 'alpha') : $object->state_id, $object->country_code, 'state_id');
-                }
-                else
-                {
-                    print $countrynotdefined;
-                }
-                print '</td></tr>';
-            }
-
-            if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) $object->phone_pro = $objsoc->phone; // Predefined with third party
-            if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) $object->fax = $objsoc->fax; // Predefined with third party
-
-            // Phone / Fax
-            print '<tr><td>'.$form->editfieldkey('PhonePro', 'phone_pro', '', $object, 0).'</td>';
-            print '<td>';
-            print img_picto('', 'object_phoning');
-            print '<input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" value="'.(GETPOSTISSET('phone_pro') ? GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('PhonePerso', 'phone_perso', '', $object, 0).'</td>';
-            print '<td>';
-            print img_picto('', 'object_phoning');
-            print '<input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" value="'.(GETPOSTISSET('phone_perso') ? GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
-
-            print '<tr><td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', '', $object, 0).'</td>';
-            print '<td>';
-            print img_picto('', 'object_phoning_mobile');
-            print '<input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-            print '<td>';
-            print img_picto('', 'object_phoning_fax');
-            print '<input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
-            print '</tr>';
-
-            if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email; // Predefined with third party
-
-            // Email
-            print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '').'</td>';
-            print '<td>';
-            print img_picto('', 'object_email');
-            print '<input type="text" name="email" id="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'"></td>';
+			// Name
+			print '<tr><td class="titlefieldcreate fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
+			print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
 			print '</tr>';
 
-            if (!empty($conf->mailing->enabled))
-            {
-            	$noemail = '';
-            	if (empty($noemail) && !empty($object->email))
-            	{
-            		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$db->escape($object->email)."'";
-            		//print $sql;
-            		$resql = $db->query($sql);
-            		if ($resql)
-            		{
-            			$obj = $db->fetch_object($resql);
-            			$noemail = $obj->nb;
-            		}
-            	}
+			print '<tr>';
+			print '<td><label for="firstname">';
+			print $form->textwithpicto($langs->trans("Firstname"), $langs->trans("KeepEmptyIfGenericAddress")).'</label></td>';
+			print '<td colspan="3"><input name="firstname" id="firstname"type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname", 'alpha') ?GETPOST("firstname", 'alpha') : $object->firstname).'"></td>';
+			print '</tr>';
 
-            	print '<tr>';
-            	print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
-	            print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
-	            print '</tr>';
-            }
-            print '</tr>';
+			// Company
+			if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+			{
+				if ($socid > 0)
+				{
+					print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
+					print '<td colspan="3" class="maxwidthonsmartphone">';
+					print $objsoc->getNomUrl(1, 'contact');
+					print '</td>';
+					print '<input type="hidden" name="socid" id="socid" value="'.$objsoc->id.'">';
+					print '</td></tr>';
+				} else {
+					print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+					print $form->select_company($socid, 'socid', '', 'SelectThirdParty');
+					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="'.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))
-            // {
-            // 	// Jabber
-            // 	if (! empty($conf->global->SOCIALNETWORKS_JABBER))
-            // 	{
-            // 		print '<tr><td><label for="skype">'.$form->editfieldkey('Jabber', 'jabberid', '', $object, 0).'</label></td>';
-            // 		print '<td colspan="3"><input type="text" name="jabberid" id="jabberid" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("jabberid")?GETPOST("jabberid", 'alpha'):$object->jabberid).'"></td></tr>';
-            // 	}
-            // 	// Skype
-            // 	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
-            // 	{
-            // 		print '<tr><td><label for="skype">'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</label></td>';
-            // 		print '<td colspan="3"><input type="text" name="skype" id="skype" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype", 'alpha'):$object->skype).'"></td></tr>';
-            // 	}
-            // 	// Twitter
-            // 	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
-            // 	{
-            // 		print '<tr><td><label for="twitter">'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</label></td>';
-            // 		print '<td colspan="3"><input type="text" name="twitter" id="twitter" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter", 'alpha'):$object->twitter).'"></td></tr>';
-            // 	}
-            // 	// Facebook
-            // 	if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
-            // 	{
-            // 		print '<tr><td><label for="facebook">'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</label></td>';
-            // 		print '<td colspan="3"><input type="text" name="facebook" id="facebook" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("facebook")?GETPOST("facebook", 'alpha'):$object->facebook).'"></td></tr>';
-            // 	}
-            //     // LinkedIn
-            //     if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
-            //     {
-            //         print '<tr><td><label for="linkedin">'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).'</label></td>';
-            //         print '<td colspan="3"><input type="text" name="linkedin" id="linkedin" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("linkedin")?GETPOST("linkedin", 'alpha'):$object->linkedin).'"></td></tr>';
-            //     }
-            // }
+			// Civility
+			print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+			print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'alpha') : $object->civility_code, 'civility_code');
+			print '</td></tr>';
 
-            // Visibility
-            print '<tr><td><label for="priv">'.$langs->trans("ContactVisibility").'</label></td><td colspan="3">';
-            $selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
-            print $form->selectarray('priv', $selectarray, (GETPOST("priv", 'alpha') ?GETPOST("priv", 'alpha') : $object->priv), 0);
-            print '</td></tr>';
+			print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
+			print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOST("poste", 'alpha') ?GETPOST("poste", 'alpha') : $object->poste).'"></td>';
+
+			$colspan = 3;
+			if ($conf->use_javascript_ajax && $socid > 0) $colspan = 2;
+
+			// Address
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) $object->address = $objsoc->address; // Predefined with third party
+			print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
+			print '<td colspan="'.$colspan.'"><textarea class="flat quatrevingtpercent" name="address" id="address" rows="'.ROWS_2.'">'.(GETPOST("address", 'alpha') ?GETPOST("address", 'alpha') : $object->address).'</textarea></td>';
+
+			if ($conf->use_javascript_ajax && $socid > 0)
+			{
+				$rowspan = 3;
+				if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
+
+				print '<td class="valignmiddle center" rowspan="'.$rowspan.'">';
+				print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a>';
+				print '</td>';
+			}
+			print '</tr>';
+
+			// Zip / Town
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) $object->zip = $objsoc->zip; // Predefined with third party
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->town)) == 0) $object->town = $objsoc->town; // Predefined with third party
+			print '<tr><td><label for="zipcode">'.$langs->trans("Zip").'</label> / <label for="town">'.$langs->trans("Town").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+			print $formcompany->select_ziptown((GETPOST("zipcode", 'alpha') ? GETPOST("zipcode", 'alpha') : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6).'&nbsp;';
+			print $formcompany->select_ziptown((GETPOST("town", 'alpha') ? GETPOST("town", 'alpha') : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			print '</td></tr>';
+
+			// Country
+			print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+			print $form->select_country((GETPOST("country_id", 'alpha') ? GETPOST("country_id", 'alpha') : $object->country_id), 'country_id');
+			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><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+				} else {
+					print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
+				}
+
+				if ($object->country_id)
+				{
+					print $formcompany->select_state(GETPOST("state_id", 'alpha') ? GETPOST("state_id", 'alpha') : $object->state_id, $object->country_code, 'state_id');
+				} else {
+					print $countrynotdefined;
+				}
+				print '</td></tr>';
+			}
+
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) $object->phone_pro = $objsoc->phone; // Predefined with third party
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) $object->fax = $objsoc->fax; // Predefined with third party
+
+			// Phone / Fax
+			print '<tr><td>'.$form->editfieldkey('PhonePro', 'phone_pro', '', $object, 0).'</td>';
+			print '<td>';
+			print img_picto('', 'object_phoning');
+			print '<input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" value="'.(GETPOSTISSET('phone_pro') ? GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('PhonePerso', 'phone_perso', '', $object, 0).'</td>';
+			print '<td>';
+			print img_picto('', 'object_phoning');
+			print '<input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" value="'.(GETPOSTISSET('phone_perso') ? GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
+
+			print '<tr><td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', '', $object, 0).'</td>';
+			print '<td>';
+			print img_picto('', 'object_phoning_mobile');
+			print '<input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
+			print '<td>';
+			print img_picto('', 'object_phoning_fax');
+			print '<input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
+			print '</tr>';
+
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email; // Predefined with third party
+
+			// Email
+			print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '').'</td>';
+			print '<td>';
+			print img_picto('', 'object_email');
+			print '<input type="text" name="email" id="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'"></td>';
+			print '</tr>';
+
+			if (!empty($conf->mailing->enabled))
+			{
+				$noemail = '';
+				if (empty($noemail) && !empty($object->email))
+				{
+					$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$db->escape($object->email)."'";
+					//print $sql;
+					$resql = $db->query($sql);
+					if ($resql)
+					{
+						$obj = $db->fetch_object($resql);
+						$noemail = $obj->nb;
+					}
+				}
+
+				print '<tr>';
+				print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
+				print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ? GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
+				print '</tr>';
+			}
+			print '</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))
+			// {
+			// 	// Jabber
+			// 	if (! empty($conf->global->SOCIALNETWORKS_JABBER))
+			// 	{
+			// 		print '<tr><td><label for="skype">'.$form->editfieldkey('Jabber', 'jabberid', '', $object, 0).'</label></td>';
+			// 		print '<td colspan="3"><input type="text" name="jabberid" id="jabberid" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("jabberid")?GETPOST("jabberid", 'alpha'):$object->jabberid).'"></td></tr>';
+			// 	}
+			// 	// Skype
+			// 	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
+			// 	{
+			// 		print '<tr><td><label for="skype">'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</label></td>';
+			// 		print '<td colspan="3"><input type="text" name="skype" id="skype" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype", 'alpha'):$object->skype).'"></td></tr>';
+			// 	}
+			// 	// Twitter
+			// 	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
+			// 	{
+			// 		print '<tr><td><label for="twitter">'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</label></td>';
+			// 		print '<td colspan="3"><input type="text" name="twitter" id="twitter" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter", 'alpha'):$object->twitter).'"></td></tr>';
+			// 	}
+			// 	// Facebook
+			// 	if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
+			// 	{
+			// 		print '<tr><td><label for="facebook">'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</label></td>';
+			// 		print '<td colspan="3"><input type="text" name="facebook" id="facebook" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("facebook")?GETPOST("facebook", 'alpha'):$object->facebook).'"></td></tr>';
+			// 	}
+			//     // LinkedIn
+			//     if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
+			//     {
+			//         print '<tr><td><label for="linkedin">'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).'</label></td>';
+			//         print '<td colspan="3"><input type="text" name="linkedin" id="linkedin" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("linkedin")?GETPOST("linkedin", 'alpha'):$object->linkedin).'"></td></tr>';
+			//     }
+			// }
+
+			// Visibility
+			print '<tr><td><label for="priv">'.$langs->trans("ContactVisibility").'</label></td><td colspan="3">';
+			$selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
+			print $form->selectarray('priv', $selectarray, (GETPOST("priv", 'alpha') ?GETPOST("priv", 'alpha') : $object->priv), 0);
+			print '</td></tr>';
 
 			// Categories
 			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
@@ -838,91 +823,84 @@ else
 				print "</td></tr>";
 			}
 
-	        // Contact by default
-	        if (!empty($socid)) {
-		        print '<tr><td>'.$langs->trans("ContactByDefaultFor").'</td>';
-		        print '<td colspan="3">';
-		        $contactType = $object->listeTypeContacts('external', '', 1);
-		        print $form->multiselectarray('roles', $contactType);
-		        print '</td></tr>';
-	        }
+			// Contact by default
+			if (!empty($socid)) {
+				print '<tr><td>'.$langs->trans("ContactByDefaultFor").'</td>';
+				print '<td colspan="3">';
+				$contactType = $object->listeTypeContacts('external', '', 1);
+				print $form->multiselectarray('roles', $contactType);
+				print '</td></tr>';
+			}
 
-            // Other attributes
-            $parameters = array('socid' => $socid, 'objsoc' => $objsoc, 'colspan' => ' colspan="3"', 'cols' => 3);
-            $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('socid' => $socid, 'objsoc' => $objsoc, 'colspan' => ' colspan="3"', 'cols' => 3);
+			$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><br>";
+			print "</table><br>";
 
 			print '<hr style="margin-bottom: 20px">';
 
-            // Add personnal information
-            print load_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>', '', '');
+			// Add personnal information
+			print load_fiche_titre('<div class="comboperso">'.$langs->trans("PersonalInformations").'</div>', '', '');
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Date To Birth
-            print '<tr><td><label for="birthday">'.$langs->trans("DateToBirth").'</label></td><td>';
-            $form = new Form($db);
-            if ($object->birthday)
-            {
-                print $form->selectDate($object->birthday, 'birthday', 0, 0, 0, "perso", 1, 0);
-            }
-            else
-            {
-                print $form->selectDate('', 'birthday', 0, 0, 1, "perso", 1, 0);
-            }
-            print '</td>';
+			// Date To Birth
+			print '<tr><td><label for="birthday">'.$langs->trans("DateOfBirth").'</label></td><td>';
+			$form = new Form($db);
+			if ($object->birthday)
+			{
+				print $form->selectDate($object->birthday, 'birthday', 0, 0, 0, "perso", 1, 0);
+			} else {
+				print $form->selectDate('', 'birthday', 0, 0, 1, "perso", 1, 0);
+			}
+			print '</td>';
 
-            print '<td><label for="birthday_alert">'.$langs->trans("Alert").'</label>: ';
-            if ($object->birthday_alert)
-            {
-                print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked>';
-            }
-            else
-            {
-                print '<input type="checkbox" name="birthday_alert" id="birthday_alert">';
-            }
-            print '</td>';
-            print '</tr>';
+			print '<td><label for="birthday_alert">'.$langs->trans("Alert").'</label>: ';
+			if ($object->birthday_alert)
+			{
+				print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked>';
+			} else {
+				print '<input type="checkbox" name="birthday_alert" id="birthday_alert">';
+			}
+			print '</td>';
+			print '</tr>';
 
-            print "</table>";
+			print "</table>";
 
-            dol_fiche_end();
+			dol_fiche_end();
 
-            print '<div class="center">';
-            print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
-            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>';
+			print '<div class="center">';
+			print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
+			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>';
 
-            print "</form>";
-        }
-        elseif ($action == 'edit' && !empty($id))
-        {
-            /*
+			print "</form>";
+		} elseif ($action == 'edit' && !empty($id))
+		{
+			/*
              * Fiche en mode edition
              */
 
-            // We set country_id, and country_code label of the chosen country
-            if (isset($_POST["country_id"]) || $object->country_id)
-            {
-	            $tmparray = getCountry($object->country_id, 'all');
-	            $object->country_code = $tmparray['code'];
-	            $object->country      = $tmparray['label'];
-            }
+			// We set country_id, and country_code label of the chosen country
+			if (isset($_POST["country_id"]) || $object->country_id)
+			{
+				$tmparray = getCountry($object->country_id, 'all');
+				$object->country_code = $tmparray['code'];
+				$object->country      = $tmparray['label'];
+			}
 
 			$objsoc = new Societe($db);
 			$objsoc->fetch($object->socid);
@@ -930,8 +908,8 @@ else
 			// Show errors
 			dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
 
-            if ($conf->use_javascript_ajax)
-            {
+			if ($conf->use_javascript_ajax)
+			{
 				print "\n".'<script type="text/javascript" language="javascript">'."\n";
 				print 'jQuery(document).ready(function () {
 							jQuery("#selectcountry_id").change(function() {
@@ -951,229 +929,223 @@ else
             				});
 						})'."\n";
 				print '</script>'."\n";
-            }
+			}
 
-            print '<form enctype="multipart/form-data" method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" name="formsoc">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="id" value="'.$id.'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="contactid" value="'.$object->id.'">';
-            print '<input type="hidden" name="old_lastname" value="'.$object->lastname.'">';
-            print '<input type="hidden" name="old_firstname" value="'.$object->firstname.'">';
-            if (!empty($backtopage)) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			print '<form enctype="multipart/form-data" method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" name="formsoc">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="contactid" value="'.$object->id.'">';
+			print '<input type="hidden" name="old_lastname" value="'.$object->lastname.'">';
+			print '<input type="hidden" name="old_firstname" value="'.$object->firstname.'">';
+			if (!empty($backtopage)) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-            dol_fiche_head($head, 'card', $title, 0, 'contact');
+			dol_fiche_head($head, 'card', $title, 0, 'contact');
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Ref/ID
-            if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-           	{
-	            print '<tr><td>'.$langs->trans("ID").'</td><td colspan="3">';
-	            print $object->ref;
-	            print '</td></tr>';
-           	}
+			// Ref/ID
+			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
+		   	{
+				print '<tr><td>'.$langs->trans("ID").'</td><td colspan="3">';
+				print $object->ref;
+				print '</td></tr>';
+		   	}
 
-            // Lastname
-            print '<tr><td class="titlefieldcreate fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
-            print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="minwidth200" maxlength="80" value="'.(GETPOSTISSET("lastname") ? GETPOST("lastname") : $object->lastname).'" autofocus="autofocus"></td>';
-            print '</tr>';
-            print '<tr>';
-            // Firstname
-            print '<td><label for="firstname">'.$langs->trans("Firstname").'</label></td>';
-	        print '<td colspan="3"><input name="firstname" id="firstname" type="text" class="minwidth200" maxlength="80" value="'.(GETPOSTISSET("firstname") ? GETPOST("firstname") : $object->firstname).'"></td>';
-	        print '</tr>';
+			// Lastname
+			print '<tr><td class="titlefieldcreate fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
+			print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="minwidth200" maxlength="80" value="'.(GETPOSTISSET("lastname") ? GETPOST("lastname") : $object->lastname).'" autofocus="autofocus"></td>';
+			print '</tr>';
+			print '<tr>';
+			// Firstname
+			print '<td><label for="firstname">'.$langs->trans("Firstname").'</label></td>';
+			print '<td colspan="3"><input name="firstname" id="firstname" type="text" class="minwidth200" maxlength="80" value="'.(GETPOSTISSET("firstname") ? GETPOST("firstname") : $object->firstname).'"></td>';
+			print '</tr>';
 
-            // Company
-            if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-            {
-                print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
-                print '<td colspan="3" class="maxwidthonsmartphone">';
-                print $form->select_company(GETPOST('socid', 'int') ?GETPOST('socid', 'int') : ($object->socid ? $object->socid : -1), 'socid', '', $langs->trans("SelectThirdParty"));
-                print '</td>';
-                print '</tr>';
-            }
-
-            // Civility
-            print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
-            print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", "aZ09") : $object->civility_code, 'civility_code');
-            print '</td></tr>';
-
-            print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
-	        print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="80" value="'.(GETPOSTISSET("poste") ? GETPOST("poste") : $object->poste).'"></td></tr>';
-
-            // Address
-            print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
-            print '<td colspan="3">';
-            print '<div class="paddingrightonly valignmiddle inline-block quatrevingtpercent">';
-            print '<textarea class="flat minwidth200 centpercent" name="address" id="address">'.(GETPOSTISSET("address") ? GETPOST("address", 'nohtml') : $object->address).'</textarea>';
-            print '</div><div class="paddingrightonly valignmiddle inline-block">';
-            if ($conf->use_javascript_ajax) print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a><br>';
-            print '</div>';
-            print '</td>';
-
-            // Zip / Town
-            print '<tr><td><label for="zipcode">'.$langs->trans("Zip").'</label> / <label for="town">'.$langs->trans("Town").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-            print $formcompany->select_ziptown((GETPOSTISSET("zipcode") ? GETPOST("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6).'&nbsp;';
-            print $formcompany->select_ziptown((GETPOSTISSET("town") ? GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
-            print '</td></tr>';
-
-            // Country
-            print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></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');
-            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><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-                }
-                else
-                {
-                    print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-                }
-
-                print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOST('state_id', 'alpha') : $object->state_id, $object->country_code, 'state_id');
-                print '</td></tr>';
-            }
-
-            // Phone
-            print '<tr><td>'.$form->editfieldkey('PhonePro', 'phone_pro', GETPOST('phone_pro', 'alpha'), $object, 0).'</td>';
-            print '<td>';
-            print img_picto('', 'object_phoning');
-            print '<input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_pro') ?GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
-            print '<td>'.$form->editfieldkey('PhonePerso', 'fax', GETPOST('phone_perso', 'alpha'), $object, 0).'</td>';
-            print '<td>';
-            print img_picto('', 'object_phoning');
-            print '<input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_perso') ?GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
-
-            print '<tr><td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', GETPOST('phone_mobile', 'alpha'), $object, 0, 'string', '').'</td>';
-            print '<td>';
-            print img_picto('', 'object_phoning_mobile');
-            print '<input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_mobile') ?GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
-            print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
-            print '<td>';
-            print img_picto('', 'object_phoning_fax');
-            print '<input type="text" name="fax" id="fax" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_fax') ?GETPOST('phone_fax', 'alpha') : $object->fax).'"></td></tr>';
-
-            // EMail
-            print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-            print '<td>';
-            print img_picto('', 'object_email');
-            print '<input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td>';
-            if (!empty($conf->mailing->enabled))
-            {
-                $langs->load("mails");
-                print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
-                print '<td>'.$object->getNbOfEMailings().'</td>';
-            }
-            else
+			// Company
+			if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
 			{
-				print '<td colspan="2"></td>';
-            }
-            print '</tr>';
+				print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
+				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print $form->select_company(GETPOST('socid', 'int') ?GETPOST('socid', 'int') : ($object->socid ? $object->socid : -1), 'socid', '', $langs->trans("SelectThirdParty"));
+				print '</td>';
+				print '</tr>';
+			}
 
-            // Unsubscribe
-            print '<tr>';
-            if (!empty($conf->mailing->enabled))
-            {
-            	$noemail = '';
-            	if (empty($noemail) && !empty($object->email))
-            	{
-            		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$db->escape($object->email)."'";
-            		//print $sql;
-            		$resql = $db->query($sql);
-            		if ($resql)
-            		{
-            			$obj = $db->fetch_object($resql);
-            			$noemail = $obj->nb;
-            		}
-            	}
+			// Civility
+			print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+			print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", "aZ09") : $object->civility_code, 'civility_code');
+			print '</td></tr>';
 
-            	print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
-	            print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ?GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
-            }
-            else
+			print '<tr><td><label for="title">'.$langs->trans("PostOrFunction").'</label></td>';
+			print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="80" value="'.(GETPOSTISSET("poste") ? GETPOST("poste") : $object->poste).'"></td></tr>';
+
+			// Address
+			print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
+			print '<td colspan="3">';
+			print '<div class="paddingrightonly valignmiddle inline-block quatrevingtpercent">';
+			print '<textarea class="flat minwidth200 centpercent" name="address" id="address">'.(GETPOSTISSET("address") ? GETPOST("address", 'nohtml') : $object->address).'</textarea>';
+			print '</div><div class="paddingrightonly valignmiddle inline-block">';
+			if ($conf->use_javascript_ajax) print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a><br>';
+			print '</div>';
+			print '</td>';
+
+			// Zip / Town
+			print '<tr><td><label for="zipcode">'.$langs->trans("Zip").'</label> / <label for="town">'.$langs->trans("Town").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+			print $formcompany->select_ziptown((GETPOSTISSET("zipcode") ? GETPOST("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6).'&nbsp;';
+			print $formcompany->select_ziptown((GETPOSTISSET("town") ? GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
+			print '</td></tr>';
+
+			// Country
+			print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></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');
+			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><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+				} else {
+					print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
+				}
+
+				print $formcompany->select_state(GETPOSTISSET('state_id') ? GETPOST('state_id', 'alpha') : $object->state_id, $object->country_code, 'state_id');
+				print '</td></tr>';
+			}
+
+			// Phone
+			print '<tr><td>'.$form->editfieldkey('PhonePro', 'phone_pro', GETPOST('phone_pro', 'alpha'), $object, 0).'</td>';
+			print '<td>';
+			print img_picto('', 'object_phoning');
+			print '<input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_pro') ?GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
+			print '<td>'.$form->editfieldkey('PhonePerso', 'fax', GETPOST('phone_perso', 'alpha'), $object, 0).'</td>';
+			print '<td>';
+			print img_picto('', 'object_phoning');
+			print '<input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_perso') ?GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
+
+			print '<tr><td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', GETPOST('phone_mobile', 'alpha'), $object, 0, 'string', '').'</td>';
+			print '<td>';
+			print img_picto('', 'object_phoning_mobile');
+			print '<input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_mobile') ?GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
+			print '<td>'.$form->editfieldkey('Fax', 'fax', GETPOST('fax', 'alpha'), $object, 0).'</td>';
+			print '<td>';
+			print img_picto('', 'object_phoning_fax');
+			print '<input type="text" name="fax" id="fax" class="maxwidth200" maxlength="80" value="'.(GETPOSTISSET('phone_fax') ?GETPOST('phone_fax', 'alpha') : $object->fax).'"></td></tr>';
+
+			// EMail
+			print '<tr><td>'.$form->editfieldkey('EMail', 'email', GETPOST('email', 'alpha'), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
+			print '<td>';
+			print img_picto('', 'object_email');
+			print '<input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td>';
+			if (!empty($conf->mailing->enabled))
+			{
+				$langs->load("mails");
+				print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
+				print '<td>'.$object->getNbOfEMailings().'</td>';
+			} else {
 				print '<td colspan="2"></td>';
 			}
-            print '</tr>';
+			print '</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))
-            // {
-            // 	// Jabber ID
-            // 	if (! empty($conf->global->SOCIALNETWORKS_JABBER))
-            // 	{
-            // 		print '<tr><td><label for="jabberid">'.$form->editfieldkey('Jabber', 'jabberid', '', $object, 0).'</label></td>';
-            // 		print '<td><input type="text" name="jabberid" id="jabberid" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("jabberid")?GETPOST("jabberid", 'alpha'):$object->jabberid).'"></td></tr>';
-            // 	}
-            // 	// Skype
-            // 	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
-            // 	{
-            // 		print '<tr><td><label for="skype">'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</label></td>';
-            // 		print '<td><input type="text" name="skype" id="skype" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype", 'alpha'):$object->skype).'"></td></tr>';
-            // 	}
-            // 	// Twitter
-            // 	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
-            // 	{
-            // 		print '<tr><td><label for="twitter">'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</label></td>';
-            // 		print '<td><input type="text" name="twitter" id="twitter" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter", 'alpha'):$object->twitter).'"></td></tr>';
-            // 	}
-            // 	// Facebook
-            //     if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
-            //     {
-            //         print '<tr><td><label for="facebook">'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</label></td>';
-            //         print '<td><input type="text" name="facebook" id="facebook" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOST("facebook")?GETPOST("facebook", 'alpha'):$object->facebook).'"></td></tr>';
-            //     }
-            //     // LinkedIn
-            //     if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
-            //     {
-            //         print '<tr><td><label for="linkedin">'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).'</label></td>';
-            //         print '<td><input type="text" name="linkedin" id="linkedin" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOST("linkedin")?GETPOST("linkedin", 'alpha'):$object->linkedin).'"></td></tr>';
-            //     }
-            // }
+			// Unsubscribe
+			print '<tr>';
+			if (!empty($conf->mailing->enabled))
+			{
+				$noemail = '';
+				if (empty($noemail) && !empty($object->email))
+				{
+					$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$db->escape($object->email)."'";
+					//print $sql;
+					$resql = $db->query($sql);
+					if ($resql)
+					{
+						$obj = $db->fetch_object($resql);
+						$noemail = $obj->nb;
+					}
+				}
 
-            // Visibility
-            print '<tr><td><label for="priv">'.$langs->trans("ContactVisibility").'</label></td><td colspan="3">';
-            $selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
-            print $form->selectarray('priv', $selectarray, $object->priv, 0);
-            print '</td></tr>';
+				print '<td><label for="no_email">'.$langs->trans("No_Email").'</label></td>';
+				print '<td>'.$form->selectyesno('no_email', (GETPOSTISSET("no_email") ?GETPOST("no_email", 'alpha') : $noemail), 1).'</td>';
+			} else {
+				print '<td colspan="2"></td>';
+			}
+			print '</tr>';
 
-            // Note Public
-            print '<tr><td class="tdtop"><label for="note_public">'.$langs->trans("NotePublic").'</label></td><td colspan="3">';
-            $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-            print $doleditor->Create(1);
-            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="'.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))
+			// {
+			// 	// Jabber ID
+			// 	if (! empty($conf->global->SOCIALNETWORKS_JABBER))
+			// 	{
+			// 		print '<tr><td><label for="jabberid">'.$form->editfieldkey('Jabber', 'jabberid', '', $object, 0).'</label></td>';
+			// 		print '<td><input type="text" name="jabberid" id="jabberid" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("jabberid")?GETPOST("jabberid", 'alpha'):$object->jabberid).'"></td></tr>';
+			// 	}
+			// 	// Skype
+			// 	if (! empty($conf->global->SOCIALNETWORKS_SKYPE))
+			// 	{
+			// 		print '<tr><td><label for="skype">'.$form->editfieldkey('Skype', 'skype', '', $object, 0).'</label></td>';
+			// 		print '<td><input type="text" name="skype" id="skype" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("skype")?GETPOST("skype", 'alpha'):$object->skype).'"></td></tr>';
+			// 	}
+			// 	// Twitter
+			// 	if (! empty($conf->global->SOCIALNETWORKS_TWITTER))
+			// 	{
+			// 		print '<tr><td><label for="twitter">'.$form->editfieldkey('Twitter', 'twitter', '', $object, 0).'</label></td>';
+			// 		print '<td><input type="text" name="twitter" id="twitter" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET("twitter")?GETPOST("twitter", 'alpha'):$object->twitter).'"></td></tr>';
+			// 	}
+			// 	// Facebook
+			//     if (! empty($conf->global->SOCIALNETWORKS_FACEBOOK))
+			//     {
+			//         print '<tr><td><label for="facebook">'.$form->editfieldkey('Facebook', 'facebook', '', $object, 0).'</label></td>';
+			//         print '<td><input type="text" name="facebook" id="facebook" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOST("facebook")?GETPOST("facebook", 'alpha'):$object->facebook).'"></td></tr>';
+			//     }
+			//     // LinkedIn
+			//     if (! empty($conf->global->SOCIALNETWORKS_LINKEDIN))
+			//     {
+			//         print '<tr><td><label for="linkedin">'.$form->editfieldkey('LinkedIn', 'linkedin', '', $object, 0).'</label></td>';
+			//         print '<td><input type="text" name="linkedin" id="linkedin" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOST("linkedin")?GETPOST("linkedin", 'alpha'):$object->linkedin).'"></td></tr>';
+			//     }
+			// }
 
-            // Note Private
-            print '<tr><td class="tdtop"><label for="note_private">'.$langs->trans("NotePrivate").'</label></td><td colspan="3">';
-            $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-            print $doleditor->Create(1);
-            print '</td></tr>';
+			// Visibility
+			print '<tr><td><label for="priv">'.$langs->trans("ContactVisibility").'</label></td><td colspan="3">';
+			$selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
+			print $form->selectarray('priv', $selectarray, $object->priv, 0);
+			print '</td></tr>';
 
-            // Status
-            print '<tr><td>'.$langs->trans("Status").'</td>';
-            print '<td colspan="3">';
-            print $object->getLibStatut(4);
-            print '</td></tr>';
+			// Note Public
+			print '<tr><td class="tdtop"><label for="note_public">'.$langs->trans("NotePublic").'</label></td><td colspan="3">';
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			print $doleditor->Create(1);
+			print '</td></tr>';
+
+			// Note Private
+			print '<tr><td class="tdtop"><label for="note_private">'.$langs->trans("NotePrivate").'</label></td><td colspan="3">';
+			$doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			print $doleditor->Create(1);
+			print '</td></tr>';
+
+			// Status
+			print '<tr><td>'.$langs->trans("Status").'</td>';
+			print '<td colspan="3">';
+			print $object->getLibStatut(4);
+			print '</td></tr>';
 
 			// Categories
 			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
@@ -1190,93 +1162,92 @@ else
 			}
 
 			// Contact by default
-	        if (!empty($object->socid)) {
-		        print '<tr><td>'.$langs->trans("ContactByDefaultFor").'</td>';
-		        print '<td colspan="3">';
-		        print $formcompany->showRoles("roles", $object, 'edit', $object->roles);
-		        print '</td></tr>';
-	        }
+			if (!empty($object->socid)) {
+				print '<tr><td>'.$langs->trans("ContactByDefaultFor").'</td>';
+				print '<td colspan="3">';
+				print $formcompany->showRoles("roles", $object, 'edit', $object->roles);
+				print '</td></tr>';
+			}
 
-            // Other attributes
-            $parameters = array('colspan' => ' colspan="3"', 'cols'=> '3');
-            $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('colspan' => ' colspan="3"', 'cols'=> '3');
+			$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);
+			}
 
-            $object->load_ref_elements();
+			$object->load_ref_elements();
 
-            if (!empty($conf->commande->enabled))
-            {
-                print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
-                print $object->ref_commande ? $object->ref_commande : $langs->trans("NoContactForAnyOrder");
-                print '</td></tr>';
-            }
+			if (!empty($conf->commande->enabled))
+			{
+				print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
+				print $object->ref_commande ? $object->ref_commande : $langs->trans("NoContactForAnyOrder");
+				print '</td></tr>';
+			}
 
-            if (!empty($conf->propal->enabled))
-            {
-                print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
-                print $object->ref_propal ? $object->ref_propal : $langs->trans("NoContactForAnyProposal");
-                print '</td></tr>';
-            }
+			if (!empty($conf->propal->enabled))
+			{
+				print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
+				print $object->ref_propal ? $object->ref_propal : $langs->trans("NoContactForAnyProposal");
+				print '</td></tr>';
+			}
 
-            if (!empty($conf->contrat->enabled))
-            {
-                print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
-                print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract");
-                print '</td></tr>';
-            }
+			if (!empty($conf->contrat->enabled))
+			{
+				print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
+				print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract");
+				print '</td></tr>';
+			}
 
-            if (!empty($conf->facture->enabled))
-            {
-                print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
-                print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
-                print '</td></tr>';
-            }
+			if (!empty($conf->facture->enabled))
+			{
+				print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
+				print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
+				print '</td></tr>';
+			}
 
-            // Login Dolibarr
-            print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
-            if ($object->user_id)
-            {
-                $dolibarr_user = new User($db);
-                $result = $dolibarr_user->fetch($object->user_id);
-                print $dolibarr_user->getLoginUrl(1);
-            }
-            else print $langs->trans("NoDolibarrAccess");
-            print '</td></tr>';
+			// Login Dolibarr
+			print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
+			if ($object->user_id)
+			{
+				$dolibarr_user = new User($db);
+				$result = $dolibarr_user->fetch($object->user_id);
+				print $dolibarr_user->getLoginUrl(1);
+			} else print $langs->trans("NoDolibarrAccess");
+			print '</td></tr>';
 
-            // Photo
-            print '<tr>';
-            print '<td>'.$langs->trans("PhotoFile").'</td>';
-            print '<td colspan="3">';
-            if ($object->photo) {
-                print $form->showphoto('contact', $object);
-                print "<br>\n";
-            }
-            print '<table class="nobordernopadding">';
-            if ($object->photo) 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>';
+			// Photo
+			print '<tr>';
+			print '<td>'.$langs->trans("PhotoFile").'</td>';
+			print '<td colspan="3">';
+			if ($object->photo) {
+				print $form->showphoto('contact', $object);
+				print "<br>\n";
+			}
+			print '<table class="nobordernopadding">';
+			if ($object->photo) 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>';
+			print '</td>';
+			print '</tr>';
 
-            print '</table>';
+			print '</table>';
 
-            dol_fiche_end();
+			dol_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>";
-        }
-    }
+			print "</form>";
+		}
+	}
 
     // Select mail models is same action as presend
     if (GETPOST('modelselected', 'alpha')) {
@@ -1287,110 +1258,153 @@ else
     {
         $objsoc = new Societe($db);
 
-        // View mode
+		// View mode
 
-        // Show errors
-        dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
+		// Show errors
+		dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
 
-        dol_fiche_head($head, 'card', $title, -1, 'contact');
+		dol_fiche_head($head, 'card', $title, -1, 'contact');
 
-        if ($action == 'create_user')
-        {
-            // Full firstname and lastname separated with a dot : firstname.lastname
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            $login = dol_buildlogin($object->lastname, $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';
+			$login = dol_buildlogin($object->lastname, $object->firstname);
 
-            $generated_password = '';
-            if (!$ldap_sid) // TODO ldap_sid ?
-            {
-                require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-                $generated_password = getRandomPassword(false);
-            }
-            $password = $generated_password;
+			$generated_password = '';
+			if (!$ldap_sid) // TODO ldap_sid ?
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+				$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),
-                //array('label' => $form->textwithpicto($langs->trans("Type"),$langs->trans("InternalExternalDesc")), 'type' => 'select', 'name' => 'intern', 'default' => 1, 'values' => array(0=>$langs->trans('Internal'),1=>$langs->trans('External')))
-            );
-            $text = $langs->trans("ConfirmCreateContact").'<br>';
-            if (!empty($conf->societe->enabled))
-            {
-                if ($object->socid > 0) $text .= $langs->trans("UserWillBeExternalUser");
-                else $text .= $langs->trans("UserWillBeInternalUser");
-            }
-            print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CreateDolibarrLogin"), $text, "confirm_create_user", $formquestion, 'yes');
-        }
+			// 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),
+				//array('label' => $form->textwithpicto($langs->trans("Type"),$langs->trans("InternalExternalDesc")), 'type' => 'select', 'name' => 'intern', 'default' => 1, 'values' => array(0=>$langs->trans('Internal'),1=>$langs->trans('External')))
+			);
+			$text = $langs->trans("ConfirmCreateContact").'<br>';
+			if (!empty($conf->societe->enabled))
+			{
+				if ($object->socid > 0) $text .= $langs->trans("UserWillBeExternalUser");
+				else $text .= $langs->trans("UserWillBeInternalUser");
+			}
+			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CreateDolibarrLogin"), $text, "confirm_create_user", $formquestion, 'yes');
+		}
 
-        $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->fetch($object->socid);
-            // Thirdparty
-            $morehtmlref .= $langs->trans('ThirdParty').' : ';
-            if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1, 'contact');
-            else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
-        }
-        $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+		{
+			$objsoc->fetch($object->socid);
+			// Thirdparty
+			$morehtmlref .= $langs->trans('ThirdParty').' : ';
+			if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1, 'contact');
+			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="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%">';
 
-        // Civility
-        print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
-        print $object->getCivilityLabel();
-        print '</td></tr>';
+		// Civility
+		print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
+		print $object->getCivilityLabel();
+		print '</td></tr>';
 
-        // Job / position
-        print '<tr><td>'.$langs->trans("PostOrFunction").'</td><td>'.$object->poste.'</td></tr>';
+		// Job / position
+		print '<tr><td>'.$langs->trans("PostOrFunction").'</td><td>'.$object->poste.'</td></tr>';
 
-        // Email
-        if (!empty($conf->mailing->enabled))
-        {
-            $langs->load("mails");
-            print '<tr><td>'.$langs->trans("NbOfEMailingsSend").'</td>';
-            print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td></tr>';
-        }
+		// Email
+		if (!empty($conf->mailing->enabled))
+		{
+			$langs->load("mails");
+			print '<tr><td>'.$langs->trans("NbOfEMailingsSend").'</td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td></tr>';
+		}
 
-        // Unsubscribe opt-out
-        if (!empty($conf->mailing->enabled))
-        {
-        	//print 'eee'.$object->email;
-        	$noemail = $object->no_email;
-        	if (empty($noemail) && !empty($object->email))
-        	{
-        		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$db->escape($object->email)."'";
-        		//print $sql;
-        		$resql = $db->query($sql);
-        		if ($resql)
-        		{
-        			$obj = $db->fetch_object($resql);
-        			$noemail = $obj->nb;
-        		}
-        	}
-        	print '<tr><td>'.$langs->trans("No_Email").'</td><td>'.yn($noemail).'</td></tr>';
-        }
+		// Unsubscribe opt-out
+		if (!empty($conf->mailing->enabled))
+		{
+			//print 'eee'.$object->email;
+			$noemail = $object->no_email;
+			if (empty($noemail) && !empty($object->email))
+			{
+				$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$db->escape($object->email)."'";
+				//print $sql;
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$noemail = $obj->nb;
+				}
+			}
+			print '<tr><td>'.$langs->trans("No_Email").'</td><td>'.yn($noemail).'</td></tr>';
+		}
 
-        print '<tr><td>'.$langs->trans("ContactVisibility").'</td><td>';
-        print $object->LibPubPriv($object->priv);
-        print '</td></tr>';
+		print '<tr><td>'.$langs->trans("ContactVisibility").'</td><td>';
+		print $object->LibPubPriv($object->priv);
+		print '</td></tr>';
 
-        print '</table>';
+		print '</table>';
+		print '</div>';
 
-        print '</div>';
-        print '<div class="fichehalfright"><div class="ficheaddleft">';
+		$object->fetch_thirdparty();
 
-        print '<div class="underbanner clearboth"></div>';
-        print '<table class="border tableforfield" width="100%">';
+		if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
+			if ($object->thirdparty->client == 2 || $object->thirdparty->client == 3)
+			{
+				print '<br>';
+
+				print '<div class="underbanner clearboth"></div>';
+				print '<table class="border" width="100%">';
+
+				// Level of prospect
+				print '<tr><td class="titlefield nowrap">';
+				print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+				print $langs->trans('ProspectLevel');
+				print '<td>';
+				if ($action != 'editlevel' && $user->rights->societe->contact->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;id='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+				print '</tr></table>';
+				print '</td><td>';
+				if ($action == 'editlevel') {
+					$formcompany->formProspectContactLevel($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_prospectlevel, 'prospect_contact_level_id', 1);
+				} else {
+					print $object->getLibProspLevel();
+				}
+				print "</td>";
+				print '</tr>';
+
+				// Status of prospection
+				$object->loadCacheOfProspStatus();
+				print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
+				print ' &nbsp; &nbsp; ';
+				print '<div class="floatright">';
+				foreach ($object->cacheprospectstatus as $key => $val) {
+					$titlealt = 'default';
+					if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
+					if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+				}
+				print '</div></td></tr>';
+
+				print "</table>";
+				print '</div>';
+			}
+		}
+
+		print '<div class="fichehalfright"><div class="ficheaddleft">';
+
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
 
 		// Categories
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
@@ -1400,80 +1414,78 @@ else
 			print '</td></tr>';
 		}
 
-	    if (!empty($object->socid)) {
-		    print '<tr><td class="titlefield">'.$langs->trans("ContactByDefaultFor").'</td>';
-		    print '<td colspan="3">';
-		    print $formcompany->showRoles("roles", $object, 'view');
-		    print '</td></tr>';
-	    }
+		if (!empty($object->socid)) {
+			print '<tr><td class="titlefield">'.$langs->trans("ContactByDefaultFor").'</td>';
+			print '<td colspan="3">';
+			print $formcompany->showRoles("roles", $object, 'view');
+			print '</td></tr>';
+		}
 
-    	// Other attributes
-    	$cols = 3;
-    	$parameters = array('socid'=>$socid);
-    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+		// Other attributes
+		$cols = 3;
+		$parameters = array('socid'=>$socid);
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-        $object->load_ref_elements();
+		$object->load_ref_elements();
 
-        if (!empty($conf->propal->enabled))
-        {
-            print '<tr><td class="titlefield">'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
-            print $object->ref_propal ? $object->ref_propal : $langs->trans("NoContactForAnyProposal");
-            print '</td></tr>';
-        }
+		if (!empty($conf->propal->enabled))
+		{
+			print '<tr><td class="titlefield">'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
+			print $object->ref_propal ? $object->ref_propal : $langs->trans("NoContactForAnyProposal");
+			print '</td></tr>';
+		}
 
-        if (!empty($conf->commande->enabled) || !empty($conf->expedition->enabled))
-        {
-            print '<tr><td>';
-            if (!empty($conf->expedition->enabled)) { print $langs->trans("ContactForOrdersOrShipments"); }
-            else print $langs->trans("ContactForOrders");
-            print '</td><td colspan="3">';
-            $none = $langs->trans("NoContactForAnyOrder");
-            if (!empty($conf->expedition->enabled)) { $none = $langs->trans("NoContactForAnyOrderOrShipments"); }
-            print $object->ref_commande ? $object->ref_commande : $none;
-            print '</td></tr>';
-        }
+		if (!empty($conf->commande->enabled) || !empty($conf->expedition->enabled))
+		{
+			print '<tr><td>';
+			if (!empty($conf->expedition->enabled)) { print $langs->trans("ContactForOrdersOrShipments"); } else print $langs->trans("ContactForOrders");
+			print '</td><td colspan="3">';
+			$none = $langs->trans("NoContactForAnyOrder");
+			if (!empty($conf->expedition->enabled)) { $none = $langs->trans("NoContactForAnyOrderOrShipments"); }
+			print $object->ref_commande ? $object->ref_commande : $none;
+			print '</td></tr>';
+		}
 
-        if (!empty($conf->contrat->enabled))
-        {
-            print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
-            print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract");
-            print '</td></tr>';
-        }
+		if (!empty($conf->contrat->enabled))
+		{
+			print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
+			print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract");
+			print '</td></tr>';
+		}
 
-        if (!empty($conf->facture->enabled))
-        {
-            print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
-            print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
-            print '</td></tr>';
-        }
+		if (!empty($conf->facture->enabled))
+		{
+			print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
+			print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
+			print '</td></tr>';
+		}
 
-        print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
-        if ($object->user_id)
-        {
-            $dolibarr_user = new User($db);
-            $result = $dolibarr_user->fetch($object->user_id);
-            print $dolibarr_user->getLoginUrl(1);
-        }
-        else print $langs->trans("NoDolibarrAccess");
-        print '</td></tr>';
+		print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
+		if ($object->user_id)
+		{
+			$dolibarr_user = new User($db);
+			$result = $dolibarr_user->fetch($object->user_id);
+			print $dolibarr_user->getLoginUrl(1);
+		} else print $langs->trans("NoDolibarrAccess");
+		print '</td></tr>';
 
-        print '<tr><td>';
-        print $langs->trans("VCard").'</td><td colspan="3">';
+		print '<tr><td>';
+		print $langs->trans("VCard").'</td><td colspan="3">';
 		print '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$object->id.'">';
 		print img_picto($langs->trans("Download"), 'vcard.png', 'class="paddingrightonly"');
 		print $langs->trans("Download");
 		print '</a>';
-        print '</td></tr>';
+		print '</td></tr>';
 
-        print "</table>";
+		print "</table>";
 
-        print '</div></div></div>';
-        print '<div style="clear:both"></div>';
+		print '</div></div></div>';
+		print '<div style="clear:both"></div>';
 
-        dol_fiche_end();
+		dol_fiche_end();
 
-        // Barre d'actions
-        print '<div class="tabsAction">';
+		// Barre d'actions
+		print '<div class="tabsAction">';
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -1484,52 +1496,73 @@ else
 				{
 					$langs->load("mails");
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-				}
-				else
-				{
+				} else {
 					$langs->load("mails");
 					print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
 				}
 			}
 
 			if ($user->rights->societe->contact->creer)
-            {
-                print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit">'.$langs->trans('Modify').'</a>';
-            }
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit">'.$langs->trans('Modify').'</a>';
+			}
 
-            if (!$object->user_id && $user->rights->user->user->creer)
-            {
-                print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a>';
-            }
+			if (!$object->user_id && $user->rights->user->user->creer)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a>';
+			}
 
-            // Activer
-            if ($object->statut == 0 && $user->rights->societe->contact->creer)
-            {
-                print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable">'.$langs->trans("Reactivate").'</a>';
-            }
-            // Desactiver
-            if ($object->statut == 1 && $user->rights->societe->contact->creer)
-            {
-                print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
-            }
+			// Activer
+			if ($object->statut == 0 && $user->rights->societe->contact->creer)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable">'.$langs->trans("Reactivate").'</a>';
+			}
+			// Desactiver
+			if ($object->statut == 1 && $user->rights->societe->contact->creer)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
+			}
 
-		    // Delete
-		    if ($user->rights->societe->contact->supprimer)
-            {
-                print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete'.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
-            }
-        }
+			// Delete
+			if ($user->rights->societe->contact->supprimer)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().''.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
+			}
+		}
 
-        print "</div>";
+		print "</div>";
 
-	    // Presend form
-	    $modelmail = 'contact';
-	    $defaulttopic = 'Information';
-	    $diroutput = $conf->contact->dir_output;
-	    $trackid = 'con'.$object->id;
+		//Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
 
-	    include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-    }
+		if ($action != 'presend')
+		{
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+
+			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+			$MAXEVENT = 10;
+
+			$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id);
+
+			// List of actions on element
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+			$formactions = new FormActions($db);
+			$somethingshown = $formactions->showactions($object, 'contact', $object->socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty
+
+			print '</div></div></div>';
+		}
+
+		// Presend form
+		$modelmail = 'contact';
+		$defaulttopic = 'Information';
+		$diroutput = $conf->contact->dir_output;
+		$trackid = 'con'.$object->id;
+
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+	}
 }
 
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 4a95c4000de..8ea6ebea0d4 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2013      Juanjo Menent	 	       <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2019      Nicolas ZABOURI 	           <info@inovea-conseil.com>
+ * Copyright (C) 2020      Open-Dsi  	               <support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,6 +60,29 @@ class Contact extends CommonObject
 	 */
 	public $picto = 'contact';
 
+	/**
+	 *  '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.
+	 *  '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")
+	 *  '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.
+	 */
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
@@ -68,36 +92,38 @@ class Contact extends CommonObject
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>15),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'fk_soc' =>array('type'=>'integer', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>30, 'index'=>1),
-		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>35),
-		'civility' =>array('type'=>'varchar(6)', 'label'=>'Civility', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'lastname' =>array('type'=>'varchar(50)', 'label'=>'Lastname', 'enabled'=>1, 'visible'=>-1, 'position'=>45, 'showoncombobox'=>1),
-		'firstname' =>array('type'=>'varchar(50)', 'label'=>'Firstname', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'showoncombobox'=>1),
+		'fk_soc' =>array('type'=>'integer', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>1, 'position'=>25, 'searchall'=>1),
+		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>30, 'index'=>1),
+		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>3, 'position'=>35),
+		'civility' =>array('type'=>'varchar(6)', 'label'=>'Civility', 'enabled'=>1, 'visible'=>3, 'position'=>40),
+		'lastname' =>array('type'=>'varchar(50)', 'label'=>'Lastname', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'showoncombobox'=>1, 'searchall'=>1),
+		'firstname' =>array('type'=>'varchar(50)', 'label'=>'Firstname', 'enabled'=>1, 'visible'=>1, 'position'=>50, 'showoncombobox'=>1, 'searchall'=>1),
 		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'zip' =>array('type'=>'varchar(25)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-		'town' =>array('type'=>'text', 'label'=>'Town', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'fk_departement' =>array('type'=>'integer', 'label'=>'Fk departement', 'enabled'=>1, 'visible'=>-1, 'position'=>70),
-		'fk_pays' =>array('type'=>'integer', 'label'=>'Fk pays', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'birthday' =>array('type'=>'date', 'label'=>'Birthday', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
+		'zip' =>array('type'=>'varchar(25)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>1, 'position'=>60),
+		'town' =>array('type'=>'text', 'label'=>'Town', 'enabled'=>1, 'visible'=>1, 'position'=>65),
+		'fk_departement' =>array('type'=>'integer', 'label'=>'Fk departement', 'enabled'=>1, 'visible'=>3, 'position'=>70),
+		'fk_pays' =>array('type'=>'integer', 'label'=>'Fk pays', 'enabled'=>1, 'visible'=>3, 'position'=>75),
+		'birthday' =>array('type'=>'date', 'label'=>'Birthday', 'enabled'=>1, 'visible'=>3, 'position'=>80),
 		'poste' =>array('type'=>'varchar(80)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'phone' =>array('type'=>'varchar(30)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'phone_perso' =>array('type'=>'varchar(30)', 'label'=>'Phone perso', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'phone_mobile' =>array('type'=>'varchar(30)', 'label'=>'Phone mobile', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-		'fax' =>array('type'=>'varchar(30)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'email' =>array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		'socialnetworks' =>array('type'=>'text', 'label'=>'SocialNetworks', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-		'photo' =>array('type'=>'varchar(255)', 'label'=>'Photo', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'priv' =>array('type'=>'smallint(6)', 'label'=>'Private', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>175),
-		'no_email' =>array('type'=>'smallint(6)', 'label'=>'No email', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>180),
-		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
-		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>195),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>200),
-		'default_lang' =>array('type'=>'varchar(6)', 'label'=>'Default lang', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
-		'canvas' =>array('type'=>'varchar(32)', 'label'=>'Canvas', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
-		'statut' =>array('type'=>'tinyint(4)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000),
+		'phone' =>array('type'=>'varchar(30)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>1, 'position'=>90, 'searchall'=>1),
+		'phone_perso' =>array('type'=>'varchar(30)', 'label'=>'PhonePerso', 'enabled'=>1, 'visible'=>1, 'position'=>95, 'searchall'=>1),
+		'phone_mobile' =>array('type'=>'varchar(30)', 'label'=>'PhoneMobile', 'enabled'=>1, 'visible'=>1, 'position'=>100, 'searchall'=>1),
+		'fax' =>array('type'=>'varchar(30)', 'label'=>'Fax', 'enabled'=>1, 'visible'=>1, 'position'=>105, 'searchall'=>1),
+		'email' =>array('type'=>'varchar(255)', 'label'=>'Email', 'enabled'=>1, 'visible'=>1, 'position'=>110, 'searchall'=>1),
+		'socialnetworks' =>array('type'=>'text', 'label'=>'SocialNetworks', 'enabled'=>1, 'visible'=>3, 'position'=>115),
+		'photo' =>array('type'=>'varchar(255)', 'label'=>'Photo', 'enabled'=>1, 'visible'=>3, 'position'=>170),
+		'priv' =>array('type'=>'smallint(6)', 'label'=>'ContactVisibility', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>175),
+		'fk_stcommcontact' =>array('type'=>'integer', 'label'=>'Fk stcommcontact', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
+		'fk_prospectlevel' =>array('type'=>'varchar(12)', 'label'=>'ProspectLevel', 'enabled'=>1, 'visible'=>-1, 'position'=>255),
+		'no_email' =>array('type'=>'smallint(6)', 'label'=>'No_Email', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>180),
+		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>3, 'position'=>185),
+		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>3, 'position'=>190),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>3, 'position'=>195, 'searchall'=>1),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>3, 'position'=>200, 'searchall'=>1),
+		'default_lang' =>array('type'=>'varchar(6)', 'label'=>'Default lang', 'enabled'=>1, 'visible'=>3, 'position'=>205),
+		'canvas' =>array('type'=>'varchar(32)', 'label'=>'Canvas', 'enabled'=>1, 'visible'=>3, 'position'=>210),
+		'statut' =>array('type'=>'tinyint(4)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
+		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'position'=>1000),
 	);
 
 	public $civility_id; // In fact we store civility_code
@@ -209,6 +235,11 @@ class Contact extends CommonObject
 
 	public $roles = array();
 
+	public $cacheprospectstatus = array();
+	public $fk_prospectlevel;
+	public $stcomm_id;
+	public $statut_commercial;
+	public $stcomm_picto;
 
 	/**
 	 *	Constructor
@@ -220,12 +251,22 @@ class Contact extends CommonObject
 		global $conf, $langs;
 
 		$this->db = $db;
-
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->mailing->enabled)) $this->fields['no_email']['enabled'] = 0;
-		if (!empty($conf->global->SOCIETE_DISABLE_CONTACTS)) $this->fields['thirdparty']['enabled'] = 0;
 		$this->statut = 1; // By default, status is enabled
 
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID))		$this->fields['rowid']['visible'] = 0;
+		if (empty($conf->mailing->enabled))						$this->fields['no_email']['enabled'] = 0;
+
+		// typical ['s.nom'] is used for third-parties
+		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+			$this->fields['fk_soc']['enabled'] = 0;
+			$this->fields['fk_soc']['searchall'] = 0;
+		}
+
+		if (empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {	// Default behaviour
+			$this->field['fk_stcommcontact']['enabled'] = 0;
+			$this->field['fk_prospectcontactlevel']['enabled'] = 0;
+		}
+
 		// Unset fields that are disabled
 		foreach ($this->fields as $key => $val)
 		{
@@ -287,9 +328,7 @@ class Contact extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -330,6 +369,7 @@ class Contact extends CommonObject
         $sql .= ", firstname";
         $sql .= ", fk_user_creat";
 		$sql .= ", priv";
+		$sql.= ", fk_stcommcontact";
 		$sql .= ", statut";
 		$sql .= ", canvas";
 		$sql .= ", entity";
@@ -343,6 +383,7 @@ class Contact extends CommonObject
         $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 .= " ".$this->db->escape($this->statut).",";
         $sql .= " ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null").",";
         $sql .= " ".$this->db->escape($this->entity).",";
@@ -388,16 +429,12 @@ class Contact extends CommonObject
             {
                 $this->db->commit();
                 return $this->id;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
                 return -2;
             }
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 
 			$this->db->rollback();
@@ -471,6 +508,11 @@ class Contact extends CommonObject
 		$sql .= ", phone_perso = ".(isset($this->phone_perso) ? "'".$this->db->escape($this->phone_perso)."'" : "null");
 		$sql .= ", phone_mobile = ".(isset($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "null");
 		$sql .= ", priv = '".$this->db->escape($this->priv)."'";
+		$sql .= ", fk_prospectcontactlevel = '".$this->db->escape($this->fk_prospectlevel)."'";
+		if (isset($this->stcomm_id))
+		{
+			$sql .= ", fk_stcommcontact = ".($this->stcomm_id > 0 || $this->stcomm_id == -1 ? $this->stcomm_id : "0");
+		}
 		$sql .= ", statut = ".$this->db->escape($this->statut);
 		$sql .= ", fk_user_modif=".($user->id > 0 ? "'".$this->db->escape($user->id)."'" : "NULL");
 		$sql .= ", default_lang=".($this->default_lang ? "'".$this->db->escape($this->default_lang)."'" : "NULL");
@@ -596,16 +638,12 @@ class Contact extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -$error;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
             $this->db->rollback();
 			return -1;
@@ -761,14 +799,10 @@ class Contact extends CommonObject
                     $error++;
                     $this->error = $this->db->lasterror();
 				}
-			}
-			else
-			{
+			} else {
 				$result = true;
 			}
-		}
-		else
-		{
+		} else {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
 			$sql .= "WHERE type=1 AND fk_contact=".$this->db->escape($id)." AND fk_user=".$user->id;
 			$result = $this->db->query($sql);
@@ -791,9 +825,7 @@ class Contact extends CommonObject
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else
-		{
+		} else {
 		    dol_syslog(get_class($this)."::update Error ".$this->error, LOG_ERR);
 		    $this->db->rollback();
 		    return -$error;
@@ -834,6 +866,7 @@ class Contact extends CommonObject
 		$sql .= " c.socialnetworks,";
         $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.import_key,";
 		$sql .= " c.datec as date_creation, c.tms as date_modification,";
 		$sql .= " co.label as country, co.code as country_code,";
@@ -845,9 +878,9 @@ 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';
 		if ($id) $sql .= " WHERE c.rowid = ".$id;
-		else
-		{
+		else {
 			$sql .= " WHERE c.entity IN (".getEntity($this->element).")";
 			if ($ref_ext) {
 				$sql .= " AND c.ref_ext = '".$this->db->escape($ref_ext)."'";
@@ -867,8 +900,7 @@ class Contact extends CommonObject
 				dol_syslog($this->error, LOG_ERR);
 
 				return 2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num)   // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
 
@@ -902,6 +934,14 @@ class Contact extends CommonObject
 				$this->poste			= $obj->poste;
 				$this->statut = $obj->statut;
 
+				$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
+
 				$this->phone_pro = trim($obj->phone);
 				$this->fax = trim($obj->fax);
 				$this->phone_perso = trim($obj->phone_perso);
@@ -942,9 +982,7 @@ class Contact extends CommonObject
 						$this->user_id = $uobj->rowid;
 					}
 					$this->db->free($resql);
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->error();
 					return -1;
 				}
@@ -970,9 +1008,7 @@ class Contact extends CommonObject
 							$this->birthday_alert = 1;
 						}
 						$this->db->free($resql);
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->error();
 						return -1;
 					}
@@ -987,15 +1023,11 @@ class Contact extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("RecordNotFound");
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1016,8 +1048,7 @@ class Contact extends CommonObject
 		if (in_array($this->civility_id, array('MR')) || in_array($this->civility_code, array('MR')))
 		{
 			$this->gender = 'man';
-		}
-		elseif (in_array($this->civility_id, array('MME', 'MLE')) || in_array($this->civility_code, array('MME', 'MLE')))
+		} elseif (in_array($this->civility_id, array('MME', 'MLE')) || in_array($this->civility_code, array('MME', 'MLE')))
 		{
 			$this->gender = 'woman';
 		}
@@ -1061,9 +1092,7 @@ class Contact extends CommonObject
 			}
 			$this->db->free($resql);
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1115,9 +1144,7 @@ class Contact extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $this->db->error().' sql='.$sql;
 			}
@@ -1183,9 +1210,7 @@ class Contact extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog("Error ".$this->error, LOG_ERR);
 			return -1;
@@ -1232,9 +1257,7 @@ class Contact extends CommonObject
 			}
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			print $this->db->error();
 		}
 	}
@@ -1259,9 +1282,7 @@ class Contact extends CommonObject
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1292,7 +1313,7 @@ class Contact extends CommonObject
 			$label .= '</div><div style="clear: both;"></div>';
 		}
 
-        $label .= '<u>'.$langs->trans("Contact").'</u>';
+		$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;
@@ -1522,9 +1543,7 @@ class Contact extends CommonObject
 		{
 			$this->db->rollback();
 			return -$error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1659,7 +1678,7 @@ class Contact extends CommonObject
 		$sql .= ", ".MAIN_DB_PREFIX."societe_contacts sc";
 		$sql .= " WHERE sc.fk_soc =".$this->socid;
 		$sql .= " AND sc.fk_c_type_contact=tc.rowid";
-		$sql .= " AND tc.element='".$element."'";
+		$sql .= " AND tc.element='".$this->db->escape($element)."'";
 		$sql .= " AND tc.active=1";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -1677,9 +1696,7 @@ class Contact extends CommonObject
 			}
 
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
@@ -1742,4 +1759,137 @@ class Contact extends CommonObject
 			return $error * -1;
 		}
 	}
+
+	/**
+	 *  Load array of prospect status
+	 *
+	 *  @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;
+
+		$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);
+			$i++;
+		}
+		return 1;
+	}
+
+	/**
+	 *	Return prostect level
+	 *
+	 *  @return     string        Libelle
+	 */
+	public function getLibProspLevel()
+	{
+		return $this->libProspLevel($this->fk_prospectlevel);
+	}
+
+	/**
+	 *  Return label of prospect level
+	 *
+	 *  @param	int		$fk_prospectlevel   	Prospect level
+	 *  @return string        					label of level
+	 */
+	public function libProspLevel($fk_prospectlevel)
+	{
+		global $langs;
+
+		$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))
+		{
+			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
+		}
+		return $lib;
+	}
+
+
+	/**
+	 *  Set prospect level
+	 *
+	 *  @param  User	$user		Utilisateur qui definie la remise
+	 *	@return	int					<0 if KO, >0 if OK
+	 * @deprecated Use update function instead
+	 */
+	public function setProspectLevel(User $user)
+	{
+		return $this->update($this->id, $user);
+	}
+
+	/**
+	 *  Return status of prospect
+	 *
+	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+	 *  @param	string	$label		Label to use for status for added status
+	 *  @return string        		Libelle
+	 */
+	public function getLibProspCommStatut($mode = 0, $label = '')
+	{
+		return $this->libProspCommStatut($this->stcomm_id, $mode, $label, $this->stcomm_picto);
+	}
+
+	/**
+	 *  Return label of a given status
+	 *
+	 *  @param	int|string	$statut        	Id or code for prospection status
+	 *  @param  int			$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 *  @param	string		$label			Label to use for status for added status
+	 *	@param 	string		$picto      	Name of image file to show ('filenew', ...)
+	 *                                      If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory.
+	 *                                      Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
+	 *                                      Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
+	 *                                      Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
+	 *  @return string       	 			Libelle du statut
+	 */
+	public function libProspCommStatut($statut, $mode = 0, $label = '', $picto = '')
+	{
+		global $langs;
+		$langs->load('customers');
+
+		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");
+			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);
+			}
+		}
+		if ($mode == 3)
+		{
+			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto);
+			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto);
+			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto);
+			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);
+			}
+		}
+		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");
+			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 "Error, mode/status not found";
+	}
 }
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index ad4b5ca08f5..7655e00ea3f 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -178,8 +178,7 @@ if ($type_element == 'fichinter')
 	$where = ' WHERE f.entity IN ('.getEntity('ficheinter').')';
 	$dateprint = 'f.datec';
 	$doc_number = 'f.ref';
-}
-elseif ($type_element == 'invoice')
+} elseif ($type_element == 'invoice')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$documentstatic = new Facture($db);
@@ -193,8 +192,7 @@ elseif ($type_element == 'invoice')
 	$dateprint = 'f.datef';
 	$doc_number = 'f.ref';
 	$thirdTypeSelect = 'customer';
-}
-elseif ($type_element == 'propal')
+} elseif ($type_element == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$documentstatic = new Propal($db);
@@ -208,8 +206,7 @@ elseif ($type_element == 'propal')
 	$datePrint = 'c.datep';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
-}
-elseif ($type_element == 'order')
+} elseif ($type_element == 'order')
 {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 	$documentstatic = new Commande($db);
@@ -223,8 +220,7 @@ elseif ($type_element == 'order')
 	$dateprint = 'c.date_commande';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
-}
-elseif ($type_element == 'supplier_invoice')
+} elseif ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$documentstatic = new FactureFournisseur($db);
@@ -266,8 +262,7 @@ elseif ($type_element == 'supplier_order')
 	$dateprint = 'c.date_valid';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'supplier';
-}
-elseif ($type_element == 'contract')
+} elseif ($type_element == 'contract')
 { 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$documentstatic = new Contrat($db);
@@ -423,9 +418,7 @@ if ($sql_select)
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
-		}
-		else
-		{
+		} else {
 			print $documentstatic->getLibStatut(2);
 		}
 		print '</td>';
@@ -467,9 +460,7 @@ if ($sql_select)
 				}
 
 				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else
-			{
+			} else {
 				$label = $objp->product_label;
 			}
 
@@ -501,29 +492,23 @@ if ($sql_select)
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
 					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
-				else
-				{
+				} else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			if ($objp->fk_product > 0) {
 				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index e21ee3e492b..f8498ddae9a 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -52,7 +52,7 @@ if (!empty($canvas))
 
 // Security check
 if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
+$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 842d03cb3a6..f601086ad05 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -67,9 +67,7 @@ if ($action == 'dolibarr2ldap')
 	{
 		setEventMessages($langs->trans("ContactSynchronized"), null, 'mesgs');
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 		$db->rollback();
 	}
@@ -106,9 +104,7 @@ if ($object->socid > 0)
 	$thirdparty->fetch($object->socid);
 
 	print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$thirdparty->getNomUrl(1).'</td></tr>';
-}
-else
-{
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td colspan="3">';
 	print $langs->trans("ContactNotLinkedToCompany");
 	print '</td></tr>';
@@ -183,22 +179,16 @@ if ($result > 0)
 		if (!is_array($records))
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-		}
-		else
-		{
+		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 843a894a0fd..4d30977bf6a 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2018       Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Josep Lluís Amador      <joseplluis@lliuretic.cat>
+ * Copyright (C) 2020       Open-Dsi      			<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +44,7 @@ $langs->loadLangs(array("companies", "suppliers", "categories"));
 
 $socialnetworks = getArrayOfSocialNetworks();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -61,7 +62,7 @@ $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all',
 $search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars
 $search_phone = GETPOST("search_phone", 'alpha');
 
-$search_id = trim(GETPOST("search_id", "int"));
+$search_id = GETPOST("search_id", "int");
 $search_firstlast_only = GETPOST("search_firstlast_only", 'alpha');
 $search_lastname = GETPOST("search_lastname", 'alpha');
 $search_firstname = GETPOST("search_firstname", 'alpha');
@@ -76,7 +77,7 @@ $search_no_email = GETPOST("search_no_email", 'int');
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
-			$search_{$key} = GETPOST("search_".$key, 'alpha');
+			$search_[$key] = GETPOST("search_".$key, 'alpha');
 		}
 	}
 }
@@ -91,6 +92,8 @@ $search_town = GETPOST('search_town', 'alpha');
 $search_import_key = GETPOST("search_import_key", "alpha");
 $search_country = GETPOST("search_country", 'intcomma');
 $search_roles = GETPOST("search_roles", 'array');
+$search_level = GETPOST("search_level", "array");
+$search_stcomm = GETPOST('search_stcomm', 'int');
 
 if ($search_status == '') $search_status = 1; // always display active customer first
 
@@ -101,8 +104,8 @@ $type = GETPOST("type", 'aZ');
 $view = GETPOST("view", 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $userid = GETPOST('userid', 'int');
 $begin = GETPOST('begin');
@@ -123,14 +126,12 @@ if ($type == "c")
 	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactcustomerlist';
 	$titre .= '  ('.$langs->trans("ThirdPartyCustomers").')';
 	$urlfiche = "card.php";
-}
-elseif ($type == "f")
+} elseif ($type == "f")
 {
 	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactsupplierlist';
 	$titre .= ' ('.$langs->trans("ThirdPartySuppliers").')';
 	$urlfiche = "card.php";
-}
-elseif ($type == "o")
+} elseif ($type == "o")
 {
 	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactotherlist';
 	$titre .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
@@ -148,41 +149,47 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-	'p.lastname'=>'Lastname',
-	'p.firstname'=>'Firstname',
-	'p.email'=>'EMail',
-	's.nom'=>"ThirdParty",
-	'p.phone'=>"Phone",
-	'p.phone_perso'=>"PhonePerso",
-	'p.phone_mobile'=>"PhoneMobile",
-	'p.fax'=>"Fax",
-    'p.note_public'=>"NotePublic",
-    'p.note_private'=>"NotePrivate",
-);
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val)
+{
+	// don't allow search in private notes for external users when doing "search in all"
+	if (!empty($user->socid) && $key == "note_private") {
+		continue;
+	}
+
+	if (empty($val['searchall'])) {
+		continue;
+	}
+
+	$fieldstosearchall['p.'.$key] = $val['label'];
+}
+
+// Add none object fields for "search in all"
+if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+	$fieldstosearchall['s.nom'] = "ThirdParty";
+}
 
 // Definition of fields for list
-$arrayfields = array(
-	'p.rowid'=>array('label'=>"TechnicalID", 'position'=>1, 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0)),
-	'p.lastname'=>array('label'=>"Lastname", 'position'=>2, 'checked'=>1),
-	'p.firstname'=>array('label'=>"Firstname", 'position'=>3, 'checked'=>1),
-	'p.poste'=>array('label'=>"PostOrFunction", 'position'=>10, 'checked'=>1),
-	'p.town'=>array('label'=>"Town", 'position'=>20, 'checked'=>0),
-	'p.zip'=>array('label'=>"Zip", 'position'=>21, 'checked'=>0),
-	'country.code_iso'=>array('label'=>"Country", 'position'=>22, 'checked'=>0),
-	'p.phone'=>array('label'=>"Phone", 'position'=>30, 'checked'=>1),
-	'p.phone_perso'=>array('label'=>"PhonePerso", 'position'=>31, 'checked'=>0),
-	'p.phone_mobile'=>array('label'=>"PhoneMobile", 'position'=>32, 'checked'=>1),
-	'p.fax'=>array('label'=>"Fax", 'position'=>33, 'checked'=>0),
-	'p.email'=>array('label'=>"EMail", 'position'=>40, 'checked'=>1),
-	'p.no_email'=>array('label'=>"No_Email", 'position'=>41, 'checked'=>0, 'enabled'=>(!empty($conf->mailing->enabled))),
-	'p.thirdparty'=>array('label'=>"ThirdParty", 'position'=>50, 'checked'=>1, 'enabled'=>empty($conf->global->SOCIETE_DISABLE_CONTACTS)),
-	'p.priv'=>array('label'=>"ContactVisibility", 'checked'=>1, 'position'=>200),
-	'p.datec'=>array('label'=>"DateCreationShort", 'checked'=>0, 'position'=>500),
-	'p.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	'p.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-	'p.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
-);
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (empty($val['visible'])) {
+		continue;
+	}
+
+	$arrayfields['p.'.$key] = array(
+		'label'=>$val['label'],
+		'checked'=>(($val['visible'] < 0) ? 0 : 1),
+		'enabled'=>($val['enabled'] && ($val['visible'] != 3)),
+		'position'=>$val['position']);
+}
+
+// Add none object fields to fields for list
+$arrayfields['country.code_iso'] = array('label'=>"Country", 'position'=>22, 'checked'=>0);
+if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+	$arrayfields['s.nom'] = array('label'=>"ThirdParty", 'position'=>25, 'checked'=>1);
+}
+
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
@@ -194,6 +201,7 @@ if (!empty($conf->socialnetworks->enabled)) {
 		}
 	}
 }
+
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 {
@@ -259,11 +267,13 @@ if (empty($reshook))
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active']) {
-					$search_{$key} = "";
+					$search_[$key] = "";
 				}
 			}
 		}
 		$search_priv = "";
+		$search_stcomm = '';
+		$search_level = '';
 		$search_status = -1;
 		$search_categ = '';
 		$search_categ_thirdparty = '';
@@ -281,6 +291,17 @@ if (empty($reshook))
 	$permissiontodelete = $user->rights->societe->supprimer;
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	if ($action == 'setstcomm')
+	{
+		$object = new Contact($db);
+		$result = $object->fetch(GETPOST('stcommcontactid'));
+		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcommcontact');
+		$result = $object->update($object->id, $user);
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+
+		$action = '';
+	}
 }
 
 if ($search_priv < 0) $search_priv = '';
@@ -295,12 +316,36 @@ $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 $contactstatic = new Contact($db);
 
+if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
+	$contactstatic->loadCacheOfProspStatus();
+}
+
 $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
+// Select every potentiels, and note each potentiels which fit in search parameters
+$tab_level = array();
+$sql = "SELECT code, label, sortorder";
+$sql .= " FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
+$sql .= " WHERE active > 0";
+$sql .= " ORDER BY sortorder";
+$resql = $db->query($sql);
+if ($resql)
+{
+	while ($obj = $db->fetch_object($resql))
+	{
+		// Compute level text
+		$level = $langs->trans($obj->code);
+		if ($level == $obj->code) $level = $langs->trans($obj->label);
+		$tab_level[$obj->code] = $level;
+	}
+}
+else dol_print_error($db);
+
 $sql = "SELECT s.rowid as socid, s.nom as name,";
 $sql .= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.no_email,";
 $sql .= " p.socialnetworks, p.photo,";
 $sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_update,";
+$sql .= " st.libelle as stcomm, st.picto as stcomm_picto, p.fk_stcommcontact as stcomm_id, p.fk_prospectcontactlevel,";
 $sql .= " co.label as country, co.code as country_code";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -314,6 +359,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
 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 (p.rowid = ef.fk_object)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_stcommcontact as st ON st.id = p.fk_stcommcontact";
 if (!empty($search_categ)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cc ON p.rowid = cc.fk_socpeople"; // We need this table joined to the select in order to filter by categ
 if (!empty($search_categ_thirdparty)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
 if (!empty($search_categ_supplier)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs2 ON s.rowid = cs2.fk_soc"; // We need this table joined to the select in order to filter by categ
@@ -327,14 +373,14 @@ if (!empty($userid))    // propre au commercial
 {
 	$sql .= " AND p.fk_user_creat=".$db->escape($userid);
 }
+if ($search_level)  $sql .= natural_search("p.fk_prospectcontactlevel", join(',', $search_level), 3);
+if ($search_stcomm != '' && $search_stcomm != -2) $sql .= natural_search("p.fk_stcommcontact", $search_stcomm, 2);
 
 // Filter to exclude not owned private contacts
 if ($search_priv != '0' && $search_priv != '1')
 {
 	$sql .= " AND (p.priv='0' OR (p.priv='1' AND p.fk_user_creat=".$user->id."))";
-}
-else
-{
+} else {
 	if ($search_priv == '0') $sql .= " AND p.priv='0'";
 	if ($search_priv == '1') $sql .= " AND (p.priv='1' AND p.fk_user_creat=".$user->id.")";
 }
@@ -351,10 +397,10 @@ if (strlen($search_phone))          $sql .= natural_search(array('p.phone', 'p.p
 if (strlen($search_cti))            $sql .= natural_search(array('p.phone', 'p.phone_perso', 'p.phone_mobile'), $search_cti);
 if (strlen($search_firstlast_only)) $sql .= natural_search(array('p.lastname', 'p.firstname'), $search_firstlast_only);
 
-if ($search_id > 0)                 $sql .= natural_search("p.rowid", $search_id, 1);
+if ($search_id > 0)                 $sql .= natural_search('p.rowid', $search_id, 1);
 if ($search_lastname)               $sql .= natural_search('p.lastname', $search_lastname);
 if ($search_firstname)              $sql .= natural_search('p.firstname', $search_firstname);
-if ($search_societe)                $sql .= natural_search('s.nom', $search_societe);
+if ($search_societe)                $sql .= natural_search(empty($conf->global->SOCIETE_DISABLE_CONTACTS) ? 's.nom' : 'p.fk_soc', $search_societe);
 if ($search_country)                $sql .= " AND p.fk_pays IN (".$search_country.')';
 if (strlen($search_poste))          $sql .= natural_search('p.poste', $search_poste);
 if (strlen($search_phone_perso))    $sql .= natural_search('p.phone_perso', $search_phone_perso);
@@ -363,8 +409,8 @@ if (strlen($search_phone_mobile))   $sql .= natural_search('p.phone_mobile', $se
 if (strlen($search_fax))            $sql .= natural_search('p.fax', $search_fax);
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
-		if ($value['active'] && strlen($search_{$key})) {
-			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_{$key}.'%\'';
+		if ($value['active'] && strlen($search_[$key])) {
+			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_[$key].'%\'';
 		}
 	}
 }
@@ -381,16 +427,13 @@ if ($search_import_key)             $sql .= natural_search("p.import_key", $sear
 if ($type == "o")        // filtre sur type
 {
 	$sql .= " AND p.fk_soc IS NULL";
-}
-elseif ($type == "f")        // filtre sur type
+} elseif ($type == "f")        // filtre sur type
 {
 	$sql .= " AND s.fournisseur = 1";
-}
-elseif ($type == "c")        // filtre sur type
+} elseif ($type == "c")        // filtre sur type
 {
 	$sql .= " AND s.client IN (1, 3)";
-}
-elseif ($type == "p")        // filtre sur type
+} elseif ($type == "p")        // filtre sur type
 {
 	$sql .= " AND s.client IN (2, 3)";
 }
@@ -408,9 +451,7 @@ $sql .= $hookmanager->resPrint;
 if ($view == "recent")
 {
 	$sql .= $db->order("p.datec", "DESC");
-}
-else
-{
+} else {
 	$sql .= $db->order($sortfield, $sortorder);
 }
 
@@ -430,7 +471,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if (! $resql)
+if (!$resql)
 {
 	dol_print_error($db);
 	exit;
@@ -476,8 +517,14 @@ if ($search_email != '') $param .= '&amp;search_email='.urlencode($search_email)
 if ($search_no_email != '') $param .= '&amp;search_no_email='.urlencode($search_no_email);
 if ($search_status != '') $param .= '&amp;search_status='.urlencode($search_status);
 if ($search_priv == '0' || $search_priv == '1') $param .= "&amp;search_priv=".urlencode($search_priv);
+if ($search_stcomm != '') $param .= '&search_stcomm='.urlencode($search_stcomm);
+if (is_array($search_level) && count($search_level)) {
+	foreach ($search_level as $slevel) {
+		$param .= '&search_level[]='.urlencode($slevel);
+	}
+}
 if ($search_import_key != '') $param .= '&amp;search_import_key='.urlencode($search_import_key);
-if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
+if ($optioncss != '') $param .= '&amp;optioncss='.urlencode($optioncss);
 if (count($search_roles) > 0) $param .= implode('&search_roles[]=', $search_roles);
 
 // Add $param from extra fields
@@ -493,11 +540,7 @@ if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton = '';
-if ($user->rights->societe->contact->creer)
-{
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create');
-}
+$newcardbutton = dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create', '', $user->rights->societe->contact->creer);
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -528,7 +571,7 @@ if ($search_firstlast_only)
 }
 
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -551,21 +594,20 @@ if (!empty($conf->categorie->enabled))
 		$moreforfilter .= $formother->select_categories(Categorie::TYPE_SUPPLIER, $search_categ_supplier, 'search_categ_supplier', 1);
 		$moreforfilter .= '</div>';
 	}
-	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('Roles').': ';
-	$moreforfilter .= $formcompany->showRoles("search_roles", $objecttmp, 'edit', $search_roles);
-	$moreforfilter .= '</div>';
-}
-if ($moreforfilter)
-{
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	$parameters = array('type'=>$type);
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	print '</div>';
 }
 
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('Roles').': ';
+$moreforfilter .= $formcompany->showRoles("search_roles", $objecttmp, 'edit', $search_roles);
+$moreforfilter .= '</div>';
+
+print '<div class="liste_titre liste_titre_bydiv centpercent">';
+print $moreforfilter;
+$parameters = array('type'=>$type);
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+print '</div>';
+
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
@@ -674,13 +716,13 @@ if (!empty($conf->socialnetworks->enabled)) {
 			if (!empty($arrayfields['p.'.$key]['checked']))
 			{
 				print '<td class="liste_titre">';
-				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_{$key}).'">';
+				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_[$key]).'">';
 				print '</td>';
 			}
 		}
 	}
 }
-if (!empty($arrayfields['p.thirdparty']['checked']))
+if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_societe" size="8" value="'.dol_escape_htmltag($search_societe).'">';
@@ -689,9 +731,28 @@ if (!empty($arrayfields['p.thirdparty']['checked']))
 if (!empty($arrayfields['p.priv']['checked']))
 {
 	print '<td class="liste_titre center">';
-    $selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
-    print $form->selectarray('search_priv', $selectarray, $search_priv, 1);
-    print '</td>';
+	$selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
+	print $form->selectarray('search_priv', $selectarray, $search_priv, 1);
+	print '</td>';
+}
+// Prospect level
+if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print $form->multiselectarray('search_level', $tab_level, $search_level, 0, 0, 'width75', 0, 0, '', '', '', 2);
+	print '</td>';
+}
+// Prospect status
+if (!empty($arrayfields['p.fk_stcommcontact']['checked']))
+{
+	print '<td class="liste_titre maxwidthonsmartphone center">';
+	$arraystcomm = array();
+	foreach ($contactstatic->cacheprospectstatus as $key => $val)
+	{
+		$arraystcomm[$val['id']] = ($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
+	}
+	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2, 0, 0, '', 0, 0, 0, '', 'nowrap ');
+	print '</td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -744,7 +805,7 @@ if (!empty($arrayfields['p.town']['checked']))                print_liste_field_
 //if (! empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
 //if (! empty($arrayfields['region.nom']['checked']))          print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
 if (!empty($arrayfields['country.code_iso']['checked'])) {
-    print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "co.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "co.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 if (!empty($arrayfields['p.phone']['checked']))               print_liste_field_titre($arrayfields['p.phone']['label'], $_SERVER["PHP_SELF"], "p.phone", $begin, $param, '', $sortfield, $sortorder);
 if (!empty($arrayfields['p.phone_perso']['checked']))         print_liste_field_titre($arrayfields['p.phone_perso']['label'], $_SERVER["PHP_SELF"], "p.phone_perso", $begin, $param, '', $sortfield, $sortorder);
@@ -759,30 +820,33 @@ if (!empty($conf->socialnetworks->enabled)) {
 		}
 	}
 }
-if (!empty($arrayfields['p.thirdparty']['checked']))          print_liste_field_titre($arrayfields['p.thirdparty']['label'], $_SERVER["PHP_SELF"], "s.nom", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.priv']['checked']))                print_liste_field_titre($arrayfields['p.priv']['label'], $_SERVER["PHP_SELF"], "p.priv", $begin, $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['p.fk_soc']['checked']))					print_liste_field_titre($arrayfields['p.fk_soc']['label'], $_SERVER["PHP_SELF"], "p.fk_soc", $begin, $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['s.nom']['checked']))						print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $begin, $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.priv']['checked']))						print_liste_field_titre($arrayfields['p.priv']['label'], $_SERVER["PHP_SELF"], "p.priv", $begin, $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked']))	print_liste_field_titre($arrayfields['p.fk_prospectcontactlevel']['label'], $_SERVER["PHP_SELF"], "p.fk_prospectcontactlevel", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['p.fk_stcommcontact']['checked']))			print_liste_field_titre($arrayfields['p.fk_stcommcontact']['label'], $_SERVER["PHP_SELF"], "p.fk_stcommcontact", "", $param, '', $sortfield, $sortorder, 'center ');
 // 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); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['p.datec']['checked'])) {
-    print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $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['p.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 ');
 }
 if (!empty($arrayfields['p.statut']['checked'])) {
-    print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 if (!empty($arrayfields['p.import_key']['checked'])) {
-    print_liste_field_titre($arrayfields['p.import_key']['label'], $_SERVER["PHP_SELF"], "p.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre($arrayfields['p.import_key']['label'], $_SERVER["PHP_SELF"], "p.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
@@ -811,6 +875,8 @@ while ($i < min($num, $limit))
 	$contactstatic->country_code = $obj->country_code;
 	$contactstatic->photo = $obj->photo;
 
+	$contactstatic->fk_prospectlevel = $obj->fk_prospectcontactlevel;
+
 	print '<tr class="oddeven">';
 
 	// ID
@@ -918,18 +984,16 @@ while ($i < min($num, $limit))
 			}
 		}
 	}
-    // Company
-	if (!empty($arrayfields['p.thirdparty']['checked']))
+	// Company
+	if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td>';
 		if ($obj->socid)
 		{
-		    $objsoc = new Societe($db);
-		    $objsoc->fetch($obj->socid);
-		    print $objsoc->getNomUrl(1);
-		}
-		else
-			print '&nbsp;';
+			$objsoc = new Societe($db);
+			$objsoc->fetch($obj->socid);
+			print $objsoc->getNomUrl(1);
+		} else print '&nbsp;';
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
@@ -941,6 +1005,30 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
+	if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked']))
+	{
+		// Prospect level
+		print '<td class="center">';
+		print $contactstatic->getLibProspLevel();
+		print "</td>";
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	if (!empty($arrayfields['p.fk_stcommcontact']['checked']))
+	{
+		// Prospect status
+		print '<td class="center nowrap"><div class="nowrap">';
+		print '<div class="inline-block">'.$contactstatic->libProspCommStatut($obj->stcomm_id, 2, $contactstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
+		print '</div> - <div class="inline-block">';
+		foreach ($contactstatic->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"].'?stcommcontactid='.$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']++;
+	}
+
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 5a6ea3eb032..1710b4dda6a 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php';
 $langs->loadLangs(array('companies', 'other'));
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -85,21 +85,15 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 					if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0)
 					{
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
-					}
-					else
-					{
+					} else {
 					    // Create thumbs
 					    $object->addThumbs($newfile);
 					}
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages("ErrorBadImageFormat", null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			switch ($_FILES['photo']['error'])
 			{
 				case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
@@ -111,9 +105,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 					break;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$error = $object->error;
 	}
 }
@@ -183,9 +175,7 @@ if ($action == 'edit')
             $objsoc->fetch($object->socid);
 
             print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td>';
-        }
-        else
-        {
+        } else {
             print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
             print $langs->trans("ContactNotLinkedToCompany");
             print '</td></tr>';
@@ -198,7 +188,7 @@ if ($action == 'edit')
     print '</td></tr>';
 
     // Date To Birth
-    print '<tr><td>'.$langs->trans("DateToBirth").'</td><td>';
+    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>';
@@ -207,9 +197,7 @@ if ($action == 'edit')
     if (!empty($object->birthday_alert))
     {
         print '<input type="checkbox" name="birthday_alert" checked></td>';
-    }
-    else
-    {
+    } else {
         print '<input type="checkbox" name="birthday_alert"></td>';
     }
     print '</tr>';
@@ -225,9 +213,7 @@ if ($action == 'edit')
     print '</div>';
 
     print "</form>";
-}
-else
-{
+} else {
     // View mode
 
     dol_fiche_head($head, 'perso', $title, -1, 'contact');
@@ -286,7 +272,7 @@ else
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        print '<td>'.$langs->trans("DateToBirth").'</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);
@@ -301,10 +287,8 @@ else
         if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
         else print $langs->trans("BirthdayAlertOff");
         print '</td>';
-    }
-    else
-    {
-        print '<td>'.$langs->trans("DateToBirth").'</td><td colspan="3"></td>';
+    } else {
+        print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3"></td>';
     }
     print "</tr>";
 
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 75362491424..ee325317033 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -102,8 +102,7 @@ if ($company->id)
 		$v->setEmail($company->email, 'INTERNET');
 	}
 	// when e-mail of contact and company complete different use company e-mail at first (and contact e-mail at second)
-	else
-	{
+	else {
 		$v->setEmail($company->email);
 
 		// support by Microsoft Outlook (2019 and possible earlier)
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index 031a1b7498d..5343ab8f349 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -42,7 +42,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'contrat'; //Must be the $element of the class that manage extrafield
 
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index 3e068f5650b..bd0c7b132d0 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -42,7 +42,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'contratdet'; //Must be the $element of the class that manage extrafield
 
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index 0055b0ba428..d016cb23d75 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -39,9 +39,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 96fcc7f899a..b6e77e69dca 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -50,7 +50,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("contracts", "orders", "companies", "bills", "products", 'compta'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $socid = GETPOST('socid', 'int');
 $id = GETPOST('id', 'int');
@@ -112,13 +112,10 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else {
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
+	} elseif ($action == 'confirm_closeline' && $confirm == 'yes' && $user->rights->contrat->activer)
 	{
 		if (!GETPOST('dateend'))
 		{
@@ -132,9 +129,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -302,14 +297,11 @@ if (empty($reshook))
 										}
 
 										$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["libelle"])) ? $prod->multilangs[$outputlangs->defaultlang]["libelle"] : $lines[$i]->product_label;
-									}
-									else
-									{
+									} else {
 										$label = $lines[$i]->product_label;
 									}
 									$desc = ($lines[$i]->desc && $lines[$i]->desc != $lines[$i]->libelle) ?dol_htmlentitiesbr($lines[$i]->desc) : '';
-								}
-								else {
+								} else {
 									$desc = dol_htmlentitiesbr($lines[$i]->desc);
 								}
 
@@ -354,9 +346,7 @@ if (empty($reshook))
 								}
 							}
 						}
-					}
-					else
-					{
+					} else {
 						setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 						$error++;
 					}
@@ -367,30 +357,23 @@ if (empty($reshook))
 					// modified by hook
 					if ($reshook < 0)
 						$error++;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
-			}
-			else
-			{
+			} else {
 				$result = $object->create($user);
 				if ($result > 0)
 				{
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else {
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 				$action = 'create';
 			}
 		}
-	}
-
-	elseif ($action == 'classin' && $user->rights->contrat->creer)
+	} elseif ($action == 'classin' && $user->rights->contrat->creer)
 	{
 		$object->setProject(GETPOST('projectid'));
 	}
@@ -407,9 +390,7 @@ if (empty($reshook))
 		{
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
 		}
@@ -480,8 +461,7 @@ if (empty($reshook))
 					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-				}
-				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
@@ -513,9 +493,7 @@ if (empty($reshook))
 					if ($price_base_type != 'HT')
 					{
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-					}
-					else
-				    {
+					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 					}
 				}
@@ -525,9 +503,7 @@ if (empty($reshook))
 				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 
 				$fk_unit = $prod->fk_unit;
-			}
-			else
-			{
+			} else {
 				$pu_ht = GETPOST('price_ht');
 				$price_base_type = 'HT';
 				$tva_tx = GETPOST('tva_tx') ?str_replace('*', '', GETPOST('tva_tx')) : 0; // tva_tx field may be disabled, so we use vat rate 0
@@ -543,8 +519,7 @@ if (empty($reshook))
 			$fk_fournprice = $_POST['fournprice'];
 			if (!empty($_POST['buying_price']))
 			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
+			else $pa_ht = null;
 
 			$info_bits = 0;
 			if ($tva_npr) $info_bits |= 0x01;
@@ -554,9 +529,7 @@ if (empty($reshook))
 			{
 				$object->error = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
 				$result = -1;
-			}
-			else
-			{
+			} else {
 				// Insert line
 				$result = $object->addline(
 					$desc,
@@ -595,7 +568,7 @@ if (empty($reshook))
 
 					$ret = $object->fetch($id); // Reload to get new records
 
-					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
 				unset($_POST['prod_entry_mode']);
@@ -629,15 +602,11 @@ if (empty($reshook))
 				unset($_POST['date_endday']);
 				unset($_POST['date_endmonth']);
 				unset($_POST['date_endyear']);
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $user->rights->contrat->creer && !GETPOST('cancel', 'alpha')) {
+	} elseif ($action == 'updateline' && $user->rights->contrat->creer && !GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
 		if (!empty($date_start_update) && !empty($date_end_update) && $date_start_update > $date_end_update)
@@ -692,12 +661,12 @@ if (empty($reshook))
 			$fk_fournprice = $_POST['fournprice'];
 			if (!empty($_POST['buying_price']))
 			  $pa_ht = $_POST['buying_price'];
-			else
-			  $pa_ht = null;
+			else $pa_ht = null;
 
 			$fk_unit = GETPOST('unit', 'alpha');
 
-			$objectline->description = GETPOST('product_desc', 'none');
+			$objectline->fk_product = GETPOST('idprod', 'int');
+			$objectline->description = GETPOST('product_desc', 'restricthtml');
 			$objectline->price_ht = GETPOST('elprice');
 			$objectline->subprice = GETPOST('elprice');
 			$objectline->qty = GETPOST('elqty');
@@ -744,14 +713,10 @@ if (empty($reshook))
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		$result = $object->deleteline(GETPOST('lineid'), $user);
 
@@ -759,14 +724,10 @@ if (empty($reshook))
 		{
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		$result = $object->validate($user);
 
@@ -783,19 +744,15 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'reopen' && $user->rights->contrat->creer)
+	} elseif ($action == 'reopen' && $user->rights->contrat->creer)
 	{
 		$result = $object->reopen($user);
 		if ($result < 0)
@@ -822,23 +779,17 @@ if (empty($reshook))
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->contrat->supprimer)
 	{
 		$result = $object->delete($user);
 		if ($result >= 0)
 		{
 			header("Location: list.php?restore_lastsearch_values=1");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
+	} elseif ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		if (GETPOST('newcid') > 0)
 		{
@@ -850,23 +801,18 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 				return;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefNewContract")), null, 'errors');
 		}
-	}
-	elseif ($action == 'update_extras')
+	} elseif ($action == 'update_extras')
 	{
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error) {
@@ -881,8 +827,7 @@ if (empty($reshook))
 		if ($error) {
 			$action = 'edit_extras';
 		}
-	}
-	elseif ($action == 'setref_supplier')
+	} elseif ($action == 'setref_supplier')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 		if (!$cancelbutton) {
@@ -896,13 +841,11 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
-	}
-	elseif ($action == 'setref_customer')
+	} elseif ($action == 'setref_customer')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 
@@ -918,13 +861,11 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
-	}
-	elseif ($action == 'setref')
+	} elseif ($action == 'setref')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 
@@ -958,13 +899,11 @@ if (empty($reshook))
 	            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 	            exit;
 	        }
-	    }
-	    else {
+	    } else {
 	        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 	        exit;
 	    }
-	}
-	elseif ($action == 'setdate_contrat')
+	} elseif ($action == 'setdate_contrat')
 	{
 		$cancelbutton = GETPOST('cancel', 'alpha');
 
@@ -982,8 +921,7 @@ if (empty($reshook))
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			}
-		}
-		else {
+		} else {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
@@ -1014,16 +952,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1044,8 +978,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1057,9 +990,7 @@ if (empty($reshook))
 		if (!GETPOST('socid', 3))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0) {
 				$result = $object->createFromClone($user, $socid);
 				if ($result > 0) {
@@ -1119,9 +1050,7 @@ if ($action == 'create')
 		if ($element == 'project')
 		{
 			$projectid = GETPOST('originid');
-		}
-		else
-		{
+		} else {
 			// For compatibility
 			if ($element == 'order' || $element == 'commande') { $element = $subelement = 'commande'; }
 			if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
@@ -1148,8 +1077,7 @@ if ($action == 'create')
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
-	}
-	else {
+	} else {
 		$projectid = GETPOST('projectid', 'int');
 		$note_private = GETPOST("note_private");
 		$note_public = GETPOST("note_public");
@@ -1195,9 +1123,7 @@ if ($action == 'create')
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
-	}
-	else
-	{
+	} else {
 		print '<td>';
 		print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300');
 		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
@@ -1291,9 +1217,7 @@ if ($action == 'create')
 	}
 
 	print "</form>\n";
-}
-else
-/* *************************************************************************** */
+} else /* *************************************************************************** */
 /*                                                                             */
 /* Mode vue et edition                                                         */
 /*                                                                             */
@@ -1513,8 +1437,6 @@ else
 		$usemargins = 0;
 		if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'propal', 'commande'))) $usemargins = 1;
 
-		$var = false;
-
 		// Title line for service
 		$cursorline = 1;
 		print '<div id="contrat-lines-container" data-contractid="'.$object->id.'"  data-element="'.$object->element.'" >';
@@ -1525,7 +1447,6 @@ else
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="updateline">';
 			print '<input type="hidden" name="elrowid" value="'.$object->lines[$cursorline - 1]->id.'">';
-			print '<input type="hidden" name="idprod" value="'.(!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0).'">';
 			print '<input type="hidden" name="fournprice" value="'.(!empty($object->lines[$cursorline - 1]->fk_fournprice) ? $object->lines[$cursorline - 1]->fk_fournprice : 0).'">';
 
 			// Area with common detail of line
@@ -1567,7 +1488,9 @@ else
 				// Line in view mode
 				if ($action != 'editline' || GETPOST('rowid') != $objp->rowid)
 				{
-					print '<tr class="tdtop oddeven">';
+				    $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)
 					{
@@ -1599,9 +1522,7 @@ else
 						echo $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td>'.img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description)."</td>\n";
 					}
 					// VAT
@@ -1622,9 +1543,7 @@ else
 					if ($objp->remise_percent > 0)
 					{
 						print '<td class="right">'.$objp->remise_percent."%</td>\n";
-					}
-					else
-					{
+					} else {
 						print '<td>&nbsp;</td>';
 					}
 
@@ -1648,7 +1567,7 @@ else
 					}
 					if ($user->rights->contrat->creer && ($object->statut >= 0))
 					{
-						print '<a class="reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;rowid='.$objp->rowid.'">';
+						print '<a class="reposition marginrightonly" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;rowid='.$objp->rowid.'">';
 						print img_delete();
 						print '</a>';
 					}
@@ -1667,7 +1586,7 @@ else
 							$colspan = 7;
 						}
 
-						print '<tr class="oddeven">';
+						print '<tr class="oddeven" '.$moreparam.'>';
 						print '<td colspan="'.$colspan.'">';
 
 						// Date planned
@@ -1681,8 +1600,7 @@ else
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
-						}
-						else print $langs->trans("Unknown");
+						} else print $langs->trans("Unknown");
 						print ' &nbsp;-&nbsp; ';
 						print $langs->trans("DateEndPlanned").': ';
 						if ($objp->date_fin)
@@ -1693,8 +1611,7 @@ else
 								$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 								print " ".img_warning($textlate);
 							}
-						}
-						else print $langs->trans("Unknown");
+						} else print $langs->trans("Unknown");
 
 						print '</td>';
 						print '</tr>';
@@ -1705,28 +1622,37 @@ else
 						$line = new ContratLigne($db);
 						$line->id = $objp->rowid;
 						$line->fetch_optionals();
-						print $line->showOptionals($extrafields, 'view', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', 1);
+						print $line->showOptionals($extrafields, 'view', array('class'=>'oddeven','style'=>$moreparam, 'colspan'=>$colspan), '', '', 1);
 					}
 				}
 				// Line in mode update
-				else
-				{
+				else {
 					// Ligne carac
 					print '<tr class="oddeven">';
 					print '<td>';
-					if ($objp->fk_product)
+					if ($objp->fk_product > 0)
 					{
-						$productstatic->id = $objp->fk_product;
-						$productstatic->type = $objp->ptype;
-						$productstatic->ref = $objp->pref;
-						$productstatic->entity = $objp->pentity;
-						print $productstatic->getNomUrl(1, '', 32);
-						print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
+						$canchangeproduct = 1;
+						if (empty($canchangeproduct)) {
+							$productstatic->id = $objp->fk_product;
+							$productstatic->type = $objp->ptype;
+							$productstatic->ref = $objp->pref;
+							$productstatic->entity = $objp->pentity;
+							print $productstatic->getNomUrl(1, '', 32);
+							print $objp->label ? ' - '.dol_trunc($objp->label, 32) : '';
+							print '<input type="hidden" name="idprod" value="'.(!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0).'">';
+						} else {
+							$senderissupplier = 0;
+							if (empty($senderissupplier)) {
+								print $form->select_produits((!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0), 'idprod');
+							} else {
+								print $form->select_produits_fournisseurs((!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0), 'idprod');
+							}
+						}
 						print '<br>';
-					}
-					else
-					{
+					} else {
 						print $objp->label ? $objp->label.'<br>' : '';
+						print '<input type="hidden" name="idprod" value="'.(!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0).'">';
 					}
 
 					// editeur wysiwyg
@@ -1801,15 +1727,15 @@ else
 				}
 
 				$db->free($result);
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 
 			if ($object->statut > 0)
 			{
-				print '<tr class="oddeven">';
+                $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";
 			}
@@ -1873,9 +1799,7 @@ else
 				if (empty($dateactend))
 				{
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEndReal")), null, 'errors');
-				}
-				else
-				{
+				} else {
 					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&ligne=".GETPOST('ligne', 'int')."&date=".$dateactstart."&dateend=".$dateactend."&comment=".urlencode($comment), $langs->trans("CloseService"), $langs->trans("ConfirmCloseService", dol_print_date($dateactend, "%A %d %B %Y")), "confirm_closeline", '', 0, 1);
 				}
 				print '<table class="notopnoleftnoright" width="100%"><tr class="oddeven" height="6"><td></td></tr></table>';
@@ -1887,7 +1811,7 @@ else
 			{
 				print '<table class="notopnoleftnoright tableforservicepart2'.($cursorline < $nbofservices ? ' boxtablenobottom' : '').'" width="100%">';
 
-				print '<tr class="oddeven">';
+				print '<tr class="oddeven" '.$moreparam.'>';
 				print '<td>'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline - 1]->getLibStatut(4).'</td>';
 				print '<td width="30" class="right">';
 				if ($user->socid == 0)
@@ -1914,7 +1838,7 @@ else
 				print '</td>';
 				print "</tr>\n";
 
-				print '<tr class="oddeven">';
+				print '<tr class="oddeven" '.$moreparam.'>';
 
 				print '<td>';
 				// Si pas encore active
@@ -1983,7 +1907,7 @@ else
 				print '</tr>';
 
 				print '<tr class="oddeven">';
-				print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled ? 4 : 3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td>';
+				print '<td class="nohover">'.$langs->trans("Comment").'</td><td colspan="3" class="nohover" colspan="'.($conf->margin->enabled ? 4 : 3).'"><input type="text" class="minwidth300" name="comment" value="'.GETPOST("comment", 'alphanohtml').'"></td>';
 				print '<td class="nohover right">';
 				print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"> &nbsp; ';
 				print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -2112,8 +2036,7 @@ else
 					if ($object->statut == 1) {
 						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
@@ -2147,9 +2070,7 @@ else
 					if ($user->rights->contrat->activer)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" id="btnactivateall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate">'.$langs->trans("ActivateAllContracts").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btnactivateall" href="#">'.$langs->trans("ActivateAllContracts").'</a></div>';
 					}
 				}
@@ -2158,9 +2079,7 @@ else
 					if ($user->rights->contrat->desactiver)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" id="btncloseall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btncloseall" href="#">'.$langs->trans("CloseAllContracts").'</a></div>';
 					}
 
@@ -2173,18 +2092,24 @@ else
 					//}
 				}
 
-				// 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>';
-				}
+                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>';
+                }
 
-				// Delete
+                // 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)
+				// - Droit de supprimer
 				if (($user->rights->contrat->creer && $object->statut == $object::STATUS_DRAFT) || $user->rights->contrat->supprimer)
 				{
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
-				}
-				else
-				{
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
 				}
 			}
@@ -2211,7 +2136,7 @@ else
 			$delallowed = $user->rights->contrat->creer;
 
 
-			print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+			print $formfile->showdocuments('contract', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
 
 			// Show links to link elements
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index a35d3c871de..671ac1177f6 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -141,7 +141,7 @@ class Contracts extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -149,29 +149,28 @@ class Contracts extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
         dol_syslog("API Rest request");
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
 
         if ($result)
         {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             $i = 0;
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $contrat_static = new Contrat($db);
+            	$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 : '.$db->lasterror());
+        } else {
+        	throw new RestException(503, 'Error when retrieve contrat list : '.$this->db->lasterror());
         }
         if (!count($obj_ret)) {
             throw new RestException(404, 'No contract found');
@@ -464,9 +463,7 @@ class Contracts extends DolibarrApi
         $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user);
         if ($updateRes > 0) {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
               throw new RestException(405, $this->contract->error);
         }
     }
@@ -501,9 +498,7 @@ class Contracts extends DolibarrApi
         if ($this->contract->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->contract->error);
         }
     }
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 58be7fdcb45..e179bd50797 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -298,16 +298,12 @@ class Contrat extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				dol_print_error($db, get_class($this)."::getNextValue ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Contract"));
 			return "";
@@ -410,9 +406,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -467,9 +461,7 @@ class Contrat extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -508,20 +500,17 @@ class Contrat extends CommonObject
 		if ($force_number)
 		{
 			$num = $force_number;
-		}
-		elseif (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		} elseif (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($this->thirdparty);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
         $this->newref = dol_sanitizeFileName($num);
 
 		if ($num)
 		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET ref = '".$num."', statut = 1";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET ref = '".$this->db->escape($num)."', statut = 1";
 			//$sql.= ", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
 			$sql .= " WHERE rowid = ".$this->id." AND statut = 0";
 
@@ -591,9 +580,7 @@ class Contrat extends CommonObject
 				$this->brouillon = 0;
 				$this->date_validation = $now;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 		}
 
@@ -601,9 +588,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -666,9 +651,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -720,8 +703,7 @@ class Contrat extends CommonObject
 				$this->error = 'Fetch found several records.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num)   // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
 				if ($obj)
@@ -744,6 +726,7 @@ class Contrat 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;
 
 					$this->fk_projet = $obj->fk_project; // deprecated
@@ -770,16 +753,12 @@ class Contrat extends CommonObject
 
 					return $this->id;
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::fetch Contract not found");
 				$this->error = "Contract not found";
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::fetch Error searching contract");
 			$this->error = $this->db->error();
 			return -1;
@@ -939,9 +918,7 @@ class Contrat extends CommonObject
 				$pos++;
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::Fetch Error when reading lines of contracts linked to products");
 			return -3;
 		}
@@ -1081,8 +1058,7 @@ class Contrat extends CommonObject
     			                    $error++;
     			                }
     			            }
-    			        }
-    			        else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+    			        } 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);
@@ -1117,7 +1093,7 @@ class Contrat extends CommonObject
     			    }
 
     			    $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 = '".$originforcontact."'";
+    			    $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)
@@ -1129,8 +1105,7 @@ class Contrat extends CommonObject
     			            //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);
+    			    } else dol_print_error($resqlcontact);
     			}
 			}
 
@@ -1145,24 +1120,18 @@ class Contrat extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = "Failed to add contract";
 				dol_syslog(get_class($this)."::create - 20 - ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
 
 			$this->db->rollback();
@@ -1331,9 +1300,7 @@ class Contrat extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1426,9 +1393,7 @@ class Contrat extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1505,9 +1470,7 @@ class Contrat extends CommonObject
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 
@@ -1558,9 +1521,7 @@ class Contrat extends CommonObject
 				if (($result = $this->defineBuyPrice($pu_ht, $remise_percent, $fk_product)) < 0)
 				{
 					return $result;
-				}
-				else
-				{
+				} else {
 					$pa_ht = $result;
 				}
 			}
@@ -1580,15 +1541,15 @@ class Contrat extends CommonObject
 			$sql .= ($fk_product > 0 ? $fk_product : "null").",";
 			$sql .= " ".$qty.",";
 			$sql .= " ".$txtva.",";
-			$sql .= " ".($vat_src_code ? "'".$vat_src_code."'" : "null").",";
+			$sql .= " ".($vat_src_code ? "'".$this->db->escape($vat_src_code)."'" : "null").",";
 			$sql .= " ".$txlocaltax1.",";
 			$sql .= " ".$txlocaltax2.",";
-			$sql .= " '".$localtax1_type."',";
-			$sql .= " '".$localtax2_type."',";
+			$sql .= " '".$this->db->escape($localtax1_type)."',";
+			$sql .= " '".$this->db->escape($localtax2_type)."',";
 			$sql .= " ".price2num($remise_percent).",";
 			$sql .= " ".price2num($pu_ht).",";
 			$sql .= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
-			$sql .= " '".$info_bits."',";
+			$sql .= " '".$this->db->escape($info_bits)."',";
 			$sql .= " ".price2num($price).",".price2num($remise).",";
 			if (isset($fk_fournprice)) $sql .= ' '.$fk_fournprice.',';
 			else $sql .= ' null,';
@@ -1631,22 +1592,16 @@ class Contrat extends CommonObject
 				{
 					$this->db->rollback();
 					return -1;
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 					return $contractlineid;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error()." sql=".$sql;
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::addline ErrorTryToAddLineOnValidatedContract", LOG_ERR);
 			return -2;
 		}
@@ -1698,9 +1653,7 @@ class Contrat extends CommonObject
 		{
 			$remise = round(($pu * $remise_percent / 100), 2);
 			$price = $pu - $remise;
-		}
-		else
-		{
+		} else {
 			$remise_percent = 0;
 		}
 
@@ -1750,9 +1703,7 @@ class Contrat extends CommonObject
 			if (($result = $this->defineBuyPrice($pu, $remise_percent)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$pa_ht = $result;
 			}
 		}
@@ -1766,8 +1717,8 @@ class Contrat extends CommonObject
 		$sql .= ",tva_tx='".price2num($tvatx)."'";
 		$sql .= ",localtax1_tx='".price2num($localtax1tx)."'";
 		$sql .= ",localtax2_tx='".price2num($localtax2tx)."'";
-		$sql .= ",localtax1_type='".$localtax1_type."'";
-		$sql .= ",localtax2_type='".$localtax2_type."'";
+		$sql .= ",localtax1_type='".$this->db->escape($localtax1_type)."'";
+		$sql .= ",localtax2_type='".$this->db->escape($localtax2_type)."'";
 		$sql .= ", total_ht='".price2num($total_ht)."'";
 		$sql .= ", total_tva='".price2num($total_tva)."'";
 		$sql .= ", total_localtax1='".price2num($total_localtax1)."'";
@@ -1775,14 +1726,10 @@ class Contrat extends CommonObject
 		$sql .= ", total_ttc='".price2num($total_ttc)."'";
 		$sql .= ", fk_product_fournisseur_price=".($fk_fournprice > 0 ? $fk_fournprice : "null");
 		$sql .= ", buy_price_ht='".price2num($pa_ht)."'";
-		if ($date_start > 0) { $sql .= ",date_ouverture_prevue='".$this->db->idate($date_start)."'"; }
-		else { $sql .= ",date_ouverture_prevue=null"; }
-		if ($date_end > 0) { $sql .= ",date_fin_validite='".$this->db->idate($date_end)."'"; }
-		else { $sql .= ",date_fin_validite=null"; }
-		if ($date_debut_reel > 0) { $sql .= ",date_ouverture='".$this->db->idate($date_debut_reel)."'"; }
-		else { $sql .= ",date_ouverture=null"; }
-		if ($date_fin_reel > 0) { $sql .= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; }
-		else { $sql .= ",date_cloture=null"; }
+		if ($date_start > 0) { $sql .= ",date_ouverture_prevue='".$this->db->idate($date_start)."'"; } else { $sql .= ",date_ouverture_prevue=null"; }
+		if ($date_end > 0) { $sql .= ",date_fin_validite='".$this->db->idate($date_end)."'"; } else { $sql .= ",date_fin_validite=null"; }
+		if ($date_debut_reel > 0) { $sql .= ",date_ouverture='".$this->db->idate($date_debut_reel)."'"; } else { $sql .= ",date_ouverture=null"; }
+		if ($date_fin_reel > 0) { $sql .= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; } else { $sql .= ",date_cloture=null"; }
 		$sql .= ", fk_unit=".($fk_unit ? "'".$this->db->escape($fk_unit)."'" : "null");
 		$sql .= " WHERE rowid = ".$rowid;
 
@@ -1825,16 +1772,12 @@ class Contrat extends CommonObject
 					$this->db->commit();
 					return 1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::updateline Erreur -2");
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::updateline Erreur -1");
@@ -1895,9 +1838,7 @@ class Contrat extends CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -1970,7 +1911,6 @@ class Contrat extends CommonObject
 		}
 
 		$statusType = 'status'.$status;
-		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
 		if ($status == self::STATUS_VALIDATED) $statusType = 'status6';
 
 		if ($mode == 4 || $mode == 6 || $mode == 7)
@@ -1993,9 +1933,7 @@ class Contrat extends CommonObject
 			$text .= ($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5, 3, -1, 'class="marginleft2"')) : '';
 			$text .= ($mode == 7 ? '</span>' : '');
 			return $text;
-		}
-		else
-		{
+		} else {
 			return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 		}
 	}
@@ -2029,7 +1967,7 @@ class Contrat extends CommonObject
         $label = '';
 
         if ($user->rights->contrat->lire) {
-            $label = '<u>'.$langs->trans("ShowContract").'</u>';
+        	$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;
@@ -2113,9 +2051,7 @@ class Contrat extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2150,9 +2086,7 @@ class Contrat extends CommonObject
 				$i++;
 			}
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2188,9 +2122,7 @@ class Contrat extends CommonObject
 				$i++;
 			}
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2222,8 +2154,7 @@ class Contrat extends CommonObject
 			$sql .= " WHERE c.statut = 1";
 			$sql .= " AND c.rowid = cd.fk_contrat";
 			$sql .= " AND cd.statut = 0";
-		}
-		elseif ($mode == 'expired')
+		} elseif ($mode == 'expired')
 		{
 			$sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
 			$sql .= $this->from;
@@ -2231,8 +2162,7 @@ class Contrat extends CommonObject
 			$sql .= " AND c.rowid = cd.fk_contrat";
 			$sql .= " AND cd.statut = 4";
 			$sql .= " AND cd.date_fin_validite < '".$this->db->idate(dol_now())."'";
-		}
-		elseif ($mode == 'active')
+		} elseif ($mode == 'active')
 		{
 		    $sql = "SELECT cd.rowid, cd.date_fin_validite as datefin";
 		    $sql .= $this->from;
@@ -2258,8 +2188,7 @@ class Contrat extends CommonObject
 				$label = $langs->trans("BoardNotActivatedServices");
 				$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') {
+			} 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");
@@ -2290,9 +2219,7 @@ class Contrat extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2333,9 +2260,7 @@ class Contrat extends CommonObject
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2384,6 +2309,8 @@ class Contrat extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
 		$sql .= " AND tosell = 1";
+		$sql .= $this->db->plimit(100);
+
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -2792,11 +2719,22 @@ class ContratLigne extends CommonObjectLine
 		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';
@@ -2841,18 +2779,16 @@ class ContratLigne extends CommonObjectLine
 	 *  Load object in memory from database
 	 *
 	 *  @param	int		$id         Id object
-	 *  @param	string	$ref		Ref of contract
+	 *  @param	string	$ref		Ref of contract line
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
     public function fetch($id, $ref = '')
 	{
-
 		// Check parameters
 		if (empty($id) && empty($ref)) return -1;
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
-
 		$sql .= " t.tms,";
 		$sql .= " t.fk_contrat,";
 		$sql .= " t.fk_product,";
@@ -2953,16 +2889,18 @@ class ContratLigne extends CommonObjectLine
 				$this->fk_user_cloture = $obj->fk_user_cloture;
 				$this->commentaire = $obj->commentaire;
 				$this->fk_fournprice = $obj->fk_fournprice;
+
 				$marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->fk_fournprice, $obj->pa_ht);
 				$this->pa_ht = $marginInfos[0];
 				$this->fk_unit = $obj->fk_unit;
+
+				$this->fetch_optionals();
 			}
+
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -3047,9 +2985,7 @@ class ContratLigne extends CommonObjectLine
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->pa_ht = $result;
 			}
 		}
@@ -3196,9 +3132,7 @@ class ContratLigne extends CommonObjectLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -3279,9 +3213,7 @@ class ContratLigne extends CommonObjectLine
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->error()." sql=".$sql;
 			return -1;
@@ -3334,9 +3266,7 @@ class ContratLigne extends CommonObjectLine
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 1da2416ce84..38a97d0aaa8 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -36,7 +36,7 @@ if (!empty($conf->projet->enabled)) {
 // Load translation files required by the page
 $langs->loadLangs(array('contracts', 'companies'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $socid = GETPOST('socid', 'int');
 $id = GETPOST('id', 'int');
@@ -70,9 +70,7 @@ if ($action == 'addcontact' && $user->rights->contrat->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$msg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -90,9 +88,7 @@ if ($action == 'swapstatut' && $user->rights->contrat->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $object->error);
 	}
 }
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index fd3b3f66e4a..d60d54258bb 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -193,9 +193,7 @@ if ($object->id)
     $permtoedit = $user->rights->contrat->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 2a7c9c0d91a..7fe88d03c3d 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -37,8 +37,8 @@ $hookmanager->initHooks(array('contractindex'));
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'companies', 'contracts'));
 
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 $statut = GETPOST('statut') ?GETPOST('statut') : 1;
@@ -140,9 +140,7 @@ if ($resql)
 		$i++;
 	}
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 // Search by status (only expired)
@@ -179,9 +177,7 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -298,16 +294,12 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 				//$tot_ttc+=$obj->total_ttc;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoContracts").'</td></tr>';
 		}
 		print "</table></div><br>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -383,9 +375,7 @@ if ($result)
 	$db->free($result);
 
 	print "</table></div>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -439,9 +429,7 @@ if ($resql)
             $productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
-		}
-		else
-		{
+		} 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);
@@ -462,9 +450,7 @@ if ($resql)
 	$db->free();
 
 	print "</table></div>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -519,9 +505,7 @@ if ($resql)
             $productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
-		}
-		else
-		{
+		} 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);
@@ -541,9 +525,7 @@ if ($resql)
 	$db->free();
 
 	print "</table></div>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -599,9 +581,7 @@ if ($resql)
             $productstatic->ref = $obj->pref;
 			$productstatic->entity = $obj->pentity;
             print $productstatic->getNomUrl(1, '', 20);
-		}
-		else
-		{
+		} 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);
@@ -621,9 +601,7 @@ if ($resql)
 	$db->free();
 
 	print "</table></div>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 37fd99a771e..04329a63145 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array('contracts', 'products', 'companies', 'compta'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -50,13 +50,13 @@ $search_name = GETPOST('search_name', 'alpha');
 $search_email = GETPOST('search_email', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
-$search_state = trim(GETPOST("search_state", 'alpha'));
+$search_state = GETPOST("search_state", 'alpha');
 $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_contract = GETPOST('search_contract', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$sall = (GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search_status = GETPOST('search_status', 'alpha');
 $socid = GETPOST('socid', 'int');
 $search_user = GETPOST('search_user', 'int');
@@ -369,11 +369,9 @@ if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete'] = '<span
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton = '';
-if ($user->rights->contrat->creer)
-{
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewContractSubscription'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contrat/card.php?action=create');
-}
+$url = DOL_URL_ROOT.'/contrat/card.php?action=create';
+if (!empty($socid)) $url .= '&socid='.$socid;
+$newcardbutton = dolGetButtonTitle($langs->trans('NewContractSubscription'), '', 'fa fa-plus-circle', $url, '', $user->rights->contrat->creer);
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -418,7 +416,7 @@ if ($user->rights->user->user->lire)
  	$moreforfilter .= '</div>';
 }
 // If the user can view categories of products
-if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -708,8 +706,7 @@ while ($i < min($num, $limit))
 			if ($nbofsalesrepresentative > 3) {
 				// We print only number
 				print $nbofsalesrepresentative;
-			}
-			elseif ($nbofsalesrepresentative > 0)
+			} elseif ($nbofsalesrepresentative > 0)
 			{
 				$userstatic = new User($db);
 				$j = 0;
@@ -731,9 +728,7 @@ while ($i < min($num, $limit))
 				}
 			}
 			//else print $langs->trans("NoSalesRepresentativeAffected");
-		}
-		else
-		{
+		} else {
 			print '&nbsp';
 		}
 		print '</td>';
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index d782ad5b3f5..d9eb8e3ccdc 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -34,7 +34,7 @@ if (!empty($conf->projet->enabled)) {
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'contracts'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $socid = GETPOST('socid', 'int');
 $id = GETPOST('id', 'int');
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 90f6516a499..7279ab98781 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -98,14 +98,11 @@ if ($search_status != '')
 	$tmp = explode('&', $search_status);
 	$mode = $tmp[0];
 	if (empty($tmp[1])) $filter = '';
-	else
-	{
+	else {
 		if ($tmp[1] == 'filter=notexpired') $filter = 'notexpired';
 		if ($tmp[1] == 'filter=expired') $filter = 'expired';
 	}
-}
-else
-{
+} else {
 	$search_status = $mode;
 	if ($filter == 'expired') $search_status .= '&filter=expired';
 	if ($filter == 'notexpired') $search_status .= '&filter=notexpired';
@@ -202,7 +199,7 @@ $now = dol_now();
 
 $form = new Form($db);
 
-$sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,";
+$sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut, c.ref_customer, c.ref_supplier,";
 $sql .= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur,";
 $sql .= " cd.rowid, cd.description, cd.statut,";
 $sql .= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity,";
@@ -567,6 +564,8 @@ while ($i < min($num, $limit))
 
 	$contractstatic->id = $obj->cid;
 	$contractstatic->ref = $obj->ref ? $obj->ref : $obj->cid;
+	$contractstatic->ref_customer = $obj->ref_customer;
+	$contractstatic->ref_supplier = $obj->ref_supplier;
 
 	$companystatic->id = $obj->socid;
 	$companystatic->name = $obj->name;
@@ -579,7 +578,7 @@ while ($i < min($num, $limit))
 	// Ref
 	if (!empty($arrayfields['c.ref']['checked']))
 	{
-		print '<td>';
+		print '<td class="nowraponall">';
 		print $contractstatic->getNomUrl(1, 16);
 		print '</td>';
         if (!$i) $totalarray['nbfield']++;
@@ -597,9 +596,7 @@ while ($i < min($num, $limit))
 			print $productstatic->getNomUrl(1, '', 24);
 			print $obj->label ? ' - '.dol_trunc($obj->label, 16) : '';
 			if (!empty($obj->description) && !empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
-		}
-		else
-		{
+		} else {
 			if ($obj->type == 0) print img_object($obj->description, 'product').' '.dol_trunc($obj->description, 24);
 			if ($obj->type == 1) print img_object($obj->description, 'service').' '.dol_trunc($obj->description, 24);
 		}
@@ -682,8 +679,7 @@ while ($i < min($num, $limit))
 			$warning_delay = $conf->contrat->services->expires->warning_delay / 3600 / 24;
 			$textlate = $langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($warning_delay) >= 0 ? '+' : '').ceil($warning_delay).' '.$langs->trans("days");
 			print img_warning($textlate);
-		}
-		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
+		} else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
         if (!$i) $totalarray['nbfield']++;
 	}
@@ -724,9 +720,7 @@ while ($i < min($num, $limit))
 	    {
 			// If contract is draft, we say line is also draft
 		    print $contractstatic->LibStatut(0, 5);
-	    }
-	    else
-	    {
+	    } else {
 		    print $staticcontratligne->LibStatut($obj->statut, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now) ? 1 : 0);
 	    }
 	    print '</td>';
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 3091b77f0a4..cee75415eee 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -40,8 +40,7 @@ if ($cancel)
 	{
 		header("Location: ".$backtopageforcancel);
 		exit;
-	}
-	elseif (!empty($backtopage))
+	} elseif (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
@@ -57,8 +56,7 @@ if ($action == 'add' && !empty($permissiontoadd))
 	{
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (GETPOST($key.'hour') == '' && GETPOST($key.'min') == '') continue; // The field was not submited to be edited
-		}
-		else {
+		} else {
 			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
 		}
 		// Ignore special fields
@@ -66,7 +64,7 @@ if ($action == 'add' && !empty($permissiontoadd))
 
 		// Set value to insert
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key, 'none');
+			$value = GETPOST($key, 'restricthtml');
 		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
 		} elseif ($object->fields[$key]['type'] == 'datetime') {
@@ -74,7 +72,7 @@ if ($action == 'add' && !empty($permissiontoadd))
 		} elseif ($object->fields[$key]['type'] == 'duration') {
 			$value = 60 * 60 * GETPOST($key.'hour', 'int') + 60 * GETPOST($key.'min', 'int');
 		} elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) {
-			$value = price2num(GETPOST($key, 'none')); // To fix decimal separator according to lang setup
+			$value = price2num(GETPOST($key, 'alphanohtml')); // To fix decimal separator according to lang setup
 		} elseif ($object->fields[$key]['type'] == 'boolean') {
 			$value = (GETPOST($key) == 'on' ? 1 : 0);
 		} else {
@@ -87,7 +85,7 @@ if ($action == 'add' && !empty($permissiontoadd))
 		$object->$key = $value;
 		if ($val['notnull'] > 0 && $object->$key == '' && !is_null($val['default']) && $val['default'] == '(PROV)')
 		{
-		    $object->$key = '(PROV)';
+			$object->$key = '(PROV)';
 		}
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
@@ -107,22 +105,18 @@ if ($action == 'add' && !empty($permissiontoadd))
 		$result = $object->create($user);
 		if ($result > 0)
 		{
-		    // Creation OK
+			// Creation OK
 			$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
 			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
 			header("Location: ".$urltogo);
 			exit;
-		}
-		else
-		{
+		} else {
 			// Creation KO
 			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
+			else setEventMessages($object->error, null, 'errors');
 			$action = 'create';
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'create';
 	}
 }
@@ -135,23 +129,25 @@ if ($action == 'update' && !empty($permissiontoadd))
 		// Check if field was submited to be edited
 		if ($object->fields[$key]['type'] == 'duration') {
 			if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) continue; // The field was not submited to be edited
-		}
-		elseif ($object->fields[$key]['type'] == 'boolean') {
+		} elseif ($object->fields[$key]['type'] == 'boolean') {
 			if (!GETPOSTISSET($key)) {
 				$object->$key = 0; // use 0 instead null if the field is defined as not null
 				continue;
 			}
-		}
-
-		else {
+		} else {
 			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
 		}
 		// Ignore special fields
 		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;
 
 		// Set value to update
-		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key, 'none');
+		if (preg_match('/^(text|html)/', $object->fields[$key]['type'])) {
+			$tmparray = explode(':', $object->fields[$key]['type']);
+			if (!empty($tmparray[1])) {
+				$value = GETPOST($key, $tmparray[1]);
+			} else {
+				$value = GETPOST($key, 'restricthtml');
+			}
 		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
 		} elseif ($object->fields[$key]['type'] == 'datetime') {
@@ -163,7 +159,7 @@ if ($action == 'update' && !empty($permissiontoadd))
 				$value = '';
 			}
 		} elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) {
-            $value = price2num(GETPOST($key, 'none')); // To fix decimal separator according to lang setup
+			$value = price2num(GETPOST($key, 'alphanohtml')); // To fix decimal separator according to lang setup
 		} elseif ($object->fields[$key]['type'] == 'boolean') {
 			$value = ((GETPOST($key, 'aZ09') == 'on' || GETPOST($key, 'aZ09') == '1') ? 1 : 0);
 		} else {
@@ -192,16 +188,12 @@ if ($action == 'update' && !empty($permissiontoadd))
 		if ($result > 0)
 		{
 			$action = 'view';
-		}
-		else
-		{
+		} else {
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'edit';
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 	}
 }
@@ -227,9 +219,7 @@ if ($action == "update_extras" && !empty($permissiontoadd))
 	{
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		$action = 'view';
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit_extras';
 	}
@@ -238,11 +228,11 @@ if ($action == "update_extras" && !empty($permissiontoadd))
 // Action to delete
 if ($action == 'confirm_delete' && !empty($permissiontodelete))
 {
-    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);
 	if ($result > 0)
@@ -251,9 +241,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
 		setEventMessages("RecordDeleted", null, 'mesgs');
 		header("Location: ".$backurlforlist);
 		exit;
-	}
-	else
-	{
+	} else {
 		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 		else setEventMessages($object->error, null, 'errors');
 	}
@@ -263,7 +251,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
 if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissiontoadd))
 {
 	if (method_exists('deleteline', $object)) {
-		$result = $object->deleteline($user, $lineid);		// For backward compatibility
+		$result = $object->deleteline($user, $lineid); // For backward compatibility
 	} else {
 		$result = $object->deleteLine($user, $lineid);
 	}
@@ -287,16 +275,14 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			if (method_exists($object, 'generateDocument')) {
 				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 
 		setEventMessages($langs->trans('RecordDeleted'), null, 'mesgs');
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -308,8 +294,7 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
 	if ($result >= 0)
 	{
 		// Define output language
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		{
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			if (method_exists($object, 'generateDocument')) {
 				$outputlangs = $langs;
 				$newlang = '';
@@ -319,15 +304,13 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -349,15 +332,13 @@ if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd)
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -369,9 +350,7 @@ if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd)
 	if ($result >= 0)
 	{
 		// Nothing else done
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -393,15 +372,13 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
@@ -412,24 +389,20 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else
-	{
-	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use native clone to keep this->db valid.
+	} else {
+		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. 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'));
-        // ...
-	    $result = $objectutil->createFromClone($user, (($object->id > 0) ? $object->id : $id));
-	    if (is_object($result) || $result > 0)
+		// ...
+		$result = $objectutil->createFromClone($user, (($object->id > 0) ? $object->id : $id));
+		if (is_object($result) || $result > 0)
 		{
 			$newid = 0;
 			if (is_object($result)) $newid = $result->id;
 			else $newid = $result;
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 			exit;
-		}
-		else
-		{
-		    setEventMessages($objectutil->error, $objectutil->errors, 'errors');
+		} else {
+			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
 			$action = '';
 		}
 	}
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index ce582040ac9..20bd19625cc 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -37,9 +37,7 @@ if ($action == 'builddoc' && $permissiontoadd)
     if (is_numeric(GETPOST('model', 'alpha')))
     {
         $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
-    }
-    else
-    {
+    } else {
    		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
         $ret = $object->fetch_thirdparty();
@@ -84,14 +82,12 @@ if ($action == 'builddoc' && $permissiontoadd)
         if (empty($hideref)) $hideref = 0;
         if (empty($moreparams)) $moreparams = null;
 
-        $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+        $result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
             $action = '';
-        }
-        else
-        {
+        } else {
         	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
@@ -134,8 +130,7 @@ if ($action == 'remove_file' && $permissiontoadd)
 
 	    header('Location: '.$urltoredirect);
 	    exit;
-	}
-	else {
+	} else {
 		setEventMessages('BugFoundVarUploaddirnotDefined', null, 'errors');
 	}
 }
diff --git a/htdocs/core/actions_changeselectedfields.inc.php b/htdocs/core/actions_changeselectedfields.inc.php
index 9a03ba0d29e..f4e7f01d234 100644
--- a/htdocs/core/actions_changeselectedfields.inc.php
+++ b/htdocs/core/actions_changeselectedfields.inc.php
@@ -28,7 +28,7 @@
 // $object must be defined (object is loaded in this file with fetch)
 
 // Save selection
-if (GETPOST('formfilteraction', 'none') == 'listafterchangingselectedfields')
+if (GETPOST('formfilteraction', 'alphanohtml') == 'listafterchangingselectedfields')
 {
     $tabparam = array();
 
diff --git a/htdocs/core/actions_comments.inc.php b/htdocs/core/actions_comments.inc.php
index 07829999c10..079f207b4a4 100644
--- a/htdocs/core/actions_comments.inc.php
+++ b/htdocs/core/actions_comments.inc.php
@@ -35,7 +35,7 @@ $comment = new Comment($db);
 
 if ($action == 'addcomment')
 {
-	$description = GETPOST('comment_description', 'none');
+	$description = GETPOST('comment_description', 'restricthtml');
 	if (!empty($description))
 	{
 		$comment->description = $description;
@@ -49,9 +49,7 @@ if ($action == 'addcomment')
 			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($comment->error, $comment->errors, 'errors');
 			$action = '';
 		}
@@ -61,15 +59,13 @@ if ($action === 'updatecomment')
 {
     if ($comment->fetch($idcomment) >= 0)
     {
-        $comment->description = GETPOST('comment_description', 'none');
+        $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
-        {
+        } else {
             setEventMessages($comment->error, $comment->errors, 'errors');
             $action = '';
         }
@@ -84,9 +80,7 @@ if ($action == 'deletecomment')
 			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($comment->error, $comment->errors, 'errors');
 			$action = '';
 		}
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index bb5a7516fb2..46a6a31c202 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -122,9 +122,7 @@ if ($action == 'add')
 	    					$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	    					$action = 'create';
 	    				}
-	    			}
-	    			else
-	    			{
+	    			} else {
 	    				$error++;
 	    				$langs->load("errors");
 	    				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
@@ -149,9 +147,7 @@ if ($action == 'add')
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
-    			{
+    			} else {
     				//Esle it's separated key/value and coma list
     				foreach ($parameters_array as $param_ligne)
     				{
@@ -191,25 +187,19 @@ if ($action == 'add')
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
-    			{
+    			} else {
                     $error++;
     			    $mesg = $extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
-    		{
+    		} else {
                 $error++;
     		    $langs->load("errors");
     			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialNorUpperCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
-	    }
-	    else
-	    {
+	    } else {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
@@ -293,9 +283,7 @@ if ($action == 'update')
 	        				$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
 	        				$action = 'edit';
 	        			}
-	        		}
-	        		else
-	        		{
+	        		} else {
 	        			$error++;
 	        			$langs->load("errors");
 	        			$mesg[] = $langs->trans("ErrorBadFormatValueList", $param_ligne);
@@ -319,9 +307,7 @@ if ($action == 'update')
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
-    			{
+    			} else {
     				//Esle it's separated key/value and coma list
     				foreach ($parameters_array as $param_ligne)
     				{
@@ -361,24 +347,18 @@ if ($action == 'update')
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
-    			{
+    			} else {
                     $error++;
     			    $mesg = $extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
-    		{
+    		} else {
     		    $error++;
     			$langs->load("errors");
     			$mesg = $langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
-	    }
-	    else
-	    {
+	    } else {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
 	}
@@ -394,11 +374,8 @@ if ($action == 'delete')
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else $mesg = $extrafields->error;
-	}
-	else
-	{
+        } else $mesg = $extrafields->error;
+	} else {
 	    $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 e85e3ed629a..d4cdbb66a21 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -37,17 +37,14 @@ if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask'
 	    {
 	        $object->fetch_thirdparty();
 	        $id = $object->id;
-	    }
-	    else
-	    {
+	    } 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 {
+	    	} else {
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    	}
         	$action = '';
diff --git a/htdocs/core/actions_lineupdown.inc.php b/htdocs/core/actions_lineupdown.inc.php
index b0556d6399f..e5507eeafc0 100644
--- a/htdocs/core/actions_lineupdown.inc.php
+++ b/htdocs/core/actions_lineupdown.inc.php
@@ -43,7 +43,7 @@ if ($action == 'up' && $permissiontoedit)
 	}
 
 	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
@@ -64,7 +64,7 @@ if ($action == 'down' && $permissiontoedit)
 		$outputlangs->setDefaultLang($newlang);
 	}
 	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index a1b2c12e10b..3caeeed6678 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -41,8 +41,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 				$error++;
 				if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 					setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
-				}
-				else {
+				} else {
 					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 				}
 			}
@@ -58,15 +57,13 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 			if (!empty($upload_dirold) && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 			{
 				$result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
-			}
-			elseif (!empty($upload_dir))
+			} elseif (!empty($upload_dir))
 			{
 				$result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
 			}
 		}
 	}
-}
-elseif (GETPOST('linkit', 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
+} elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
     $link = GETPOST('link', 'alpha');
     if ($link)
@@ -86,8 +83,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
     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.
+    } 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;
@@ -124,8 +120,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         } else {
             setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
         }
-    }
-    elseif ($linkid)	// delete of external link
+    } elseif ($linkid)	// delete of external link
     {
         require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
         $link = new Link($db);
@@ -148,16 +143,13 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
         if ($backtopage) {
         	header('Location: '.$backtopage);
             exit;
-        }
-        else
-        {
+        } 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'))
+} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
 {
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
     $langs->load('link');
@@ -176,13 +168,10 @@ elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('
         {
             setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
         }
-    }
-    else
-    {
+    } else {
         //error fetching
     }
-}
-elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
+} 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.
 	if (!empty($upload_dir))
@@ -243,15 +232,11 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 			            	}
 
 			                setEventMessages($langs->trans("FileRenamed"), null);
-			            }
-			            else
-			            {
+			            } 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
-	            	{
+	            	} 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');
 	            	}
@@ -277,9 +262,7 @@ elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
 		    		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		    		$ecmfile->share = getRandomPassword(true);
 		    	}
-		    }
-		    else
-		    {
+		    } else {
 		    	$ecmfile->share = '';
 		    }
 		    $result = $ecmfile->update($user);
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 77fbea3c36a..c2f0a314445 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2018	   Nicolas ZABOURI	<info@inovea-conseil.com>
  * Copyright (C) 2018 	   Juanjo Menent  <jmenent@2byte.es>
  * Copyright (C) 2019 	   Ferran Marcet  <fmarcet@2byte.es>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019      Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -141,7 +141,7 @@ if (!$error && $massaction == 'confirm_presend')
 	   	$massaction = 'presend';
 	}
 
-	if (!GETPOST('subject', 'none'))
+	if (!GETPOST('subject', 'restricthtml'))
 	{
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTopic")), null, 'warnings');
@@ -180,8 +180,7 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($val == 'thirdparty') // Id of third party or user
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-					}
-					elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
+					} elseif ($val && method_exists($thirdparty, 'contact_get_property'))		// Id of contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 						$sendtoid[] = $val;
@@ -210,8 +209,7 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($val == 'thirdparty') // Id of third party
 					{
 						$tmparray[] = $thirdparty->name.' <'.$thirdparty->email.'>';
-					}
-					elseif ($val)	// Id du contact
+					} elseif ($val)	// Id du contact
 					{
 						$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
 						//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
@@ -256,20 +254,17 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($objectobj->element == 'societe')
 					{
 						$sendto = $objectobj->email;
-					}
-					elseif ($objectobj->element == 'expensereport')
+					} elseif ($objectobj->element == 'expensereport')
 					{
 						$fuser = new User($db);
 						$fuser->fetch($objectobj->fk_user_author);
 						$sendto = $fuser->email;
-					}
-					elseif ($objectobj->element == 'holiday')
+					} elseif ($objectobj->element == 'holiday')
 					{
 					    $fuser = new User($db);
 					    $fuser->fetch($objectobj->fk_user);
 					    $sendto = $fuser->email;
-					}
-					elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
+					} elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
 					{
 						$emails_to_sends = array();
 						$objectobj->fetch_thirdparty();
@@ -283,9 +278,7 @@ if (!$error && $massaction == 'confirm_presend')
 						if (count($emails_to_sends) > 0) {
 							$sendto = implode(',', $emails_to_sends);
 						}
-					}
-					else
-					{
+					} else {
 						$objectobj->fetch_thirdparty();
 						$sendto = $objectobj->thirdparty->email;
 					}
@@ -336,9 +329,7 @@ if (!$error && $massaction == 'confirm_presend')
 							'names'=>array($filename),
 							'mimes'=>array($mime)
 						);
-					}
-					else
-					{
+					} else {
 							$nbignored++;
 							$langs->load("errors");
 							$resaction .= '<div class="error">'.$langs->trans('ErrorCantReadFile', $file).'</div><br>';
@@ -364,19 +355,15 @@ if (!$error && $massaction == 'confirm_presend')
 				$fromtype = GETPOST('fromtype');
 				if ($fromtype === 'user') {
 					$from = $user->getFullName($langs).' <'.$user->email.'>';
-				}
-				elseif ($fromtype === 'company') {
+				} elseif ($fromtype === 'company') {
 					$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-				}
-				elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 					$tmp = explode(',', $user->email_aliases);
 					$from = trim($tmp[($reg[1] - 1)]);
-				}
-				elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
 					$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 					$from = trim($tmp[($reg[1] - 1)]);
-				}
-				elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+				} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 					$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
 					$resql = $db->query($sql);
 					$obj = $db->fetch_object($resql);
@@ -384,14 +371,13 @@ if (!$error && $massaction == 'confirm_presend')
 					{
 						$from = $obj->label.' <'.$obj->email.'>';
 					}
-				}
-				else {
+				} else {
 					$from = $_POST['fromname'].' <'.$_POST['frommail'].'>';
 				}
 
 				$replyto = $from;
-				$subject = GETPOST('subject', 'none');
-				$message = GETPOST('message', 'none');
+				$subject = GETPOST('subject', 'restricthtml');
+				$message = GETPOST('message', 'restricthtml');
 
 				$sendtobcc = GETPOST('sendtoccc');
 				if ($objectclass == 'Propal') 				$sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc ? ", " : "").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
@@ -412,9 +398,7 @@ if (!$error && $massaction == 'confirm_presend')
 					{
 					    $looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object
 					}
-				}
-				else
-				{
+				} else {
 					$objectforloop = new $objectclass($db);
 					$objectforloop->thirdparty = $thirdparty; // Force thirdparty on object (even if object was not loaded)
 					$looparray[0] = $objectforloop;
@@ -464,8 +448,7 @@ if (!$error && $massaction == 'confirm_presend')
 								);
 							}
 						}
-					}
-					elseif (!empty($attachedfilesThirdpartyObj[$thirdparty->id][$objectid])) {
+					} elseif (!empty($attachedfilesThirdpartyObj[$thirdparty->id][$objectid])) {
 						// Create form object
 						// if "one email per recipient" isn't check we must separate $attachedfiles by object
 						$attachedfiles = $attachedfilesThirdpartyObj[$thirdparty->id][$objectid];
@@ -481,9 +464,7 @@ if (!$error && $massaction == 'confirm_presend')
 					    $trackid = 'thi'.$thirdparty->id;
 					    if ($objecttmp->element == 'expensereport') $trackid = 'use'.$thirdparty->id;
 					    if ($objecttmp->element == 'holiday') $trackid = 'use'.$thirdparty->id;
-					}
-					else
-					{
+					} else {
 					    $trackid = strtolower(get_class($objecttmp));
 					    if (get_class($objecttmp) == 'Contrat')  $trackid = 'con';
 					    if (get_class($objecttmp) == 'Propal')   $trackid = 'pro';
@@ -507,9 +488,7 @@ if (!$error && $massaction == 'confirm_presend')
 					if ($mailfile->error)
 					{
 						$resaction .= '<div class="error">'.$mailfile->error.'</div>';
-					}
-					else
-					{
+					} else {
 						$result = $mailfile->sendfile();
 						if ($result)
 						{
@@ -574,17 +553,13 @@ if (!$error && $massaction == 'confirm_presend')
 
 								$nbsent++; // Nb of object sent
 							}
-						}
-						else
-						{
+						} else {
 							$langs->load("other");
 							if ($mailfile->error)
 							{
 								$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 								$resaction .= '<br><div class="error">'.$mailfile->error.'</div>';
-							}
-							else
-							{
+							} else {
 								$resaction .= '<div class="warning">No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS</div>';
 							}
 						}
@@ -605,9 +580,7 @@ if (!$error && $massaction == 'confirm_presend')
 			//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($resaction, null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			//setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
 			setEventMessages($resaction, null, 'warnings');
 		}
@@ -642,7 +615,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 			$cmd->fetch_optionals();
 
 			$objecttmp->socid = $cmd->socid;
-			$objecttmp->type = Facture::TYPE_STANDARD;
+			$objecttmp->type = $objecttmp::TYPE_STANDARD;
 			$objecttmp->cond_reglement_id	= $cmd->cond_reglement_id;
 			$objecttmp->mode_reglement_id	= $cmd->mode_reglement_id;
 			$objecttmp->fk_project = $cmd->fk_project;
@@ -675,9 +648,9 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 			$sql .= ", targettype";
 			$sql .= ") VALUES (";
 			$sql .= $id_order;
-			$sql .= ", '".$objecttmp->origin."'";
+			$sql .= ", '".$db->escape($objecttmp->origin)."'";
 			$sql .= ", ".$objecttmp->id;
-			$sql .= ", '".$objecttmp->element."'";
+			$sql .= ", '".$db->escape($objecttmp->element)."'";
 			$sql .= ")";
 
 			if (!$db->query($sql))
@@ -722,16 +695,12 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 						{
 							$result = $objecttmp->insert_discount($discountid);
 							//$result=$discount->link_to_invoice($lineid,$id);
-						}
-						else
-						{
+						} else {
 							setEventMessages($discount->error, $discount->errors, 'errors');
 							$error++;
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// Positive line
 						$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 						// Date start
@@ -773,7 +742,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 							'HT',
 							0,
 							$product_type,
-							$ii,
+							$lines[$i]->rang,
 							$lines[$i]->special_code,
 							$objecttmp->origin,
 							$lines[$i]->rowid,
@@ -789,9 +758,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 						if ($result > 0)
 						{
 							$lineid = $result;
-						}
-						else
-						{
+						} else {
 							$lineid = 0;
 							$error++;
 							break;
@@ -881,9 +848,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 
 		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
 		exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		$action = 'create';
 		$_GET["origin"] = $_POST["origin"];
@@ -923,20 +888,15 @@ if (!$error && $massaction == 'cancelorders')
 			setEventMessages($cmd->error, $cmd->errors, 'errors');
 			$error++;
 			break;
-		}
-		else
-			$nbok++;
+		} else $nbok++;
 	}
 	if (!$error)
 	{
 		if ($nbok > 1)
 			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-		else
-			setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -1029,25 +989,23 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 				$input_files .= ' '.escapeshellarg($f);
 			}
 
-			$cmd = 'pdftk ' . $input_files . ' cat output '.escapeshellarg($file);
+			$cmd = 'pdftk '.$input_files.' cat output '.escapeshellarg($file);
 			exec($cmd);
 
 			// check if pdftk is installed
 			if (file_exists($file)) {
 				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
 				$langs->load("exports");
 				setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
 			} else {
 				setEventMessages($langs->trans('ErrorPDFTkOutputFileNotFound'), null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
-	}
-	else {
+	} else {
 		// Create empty PDF
 		$formatarray = pdf_getFormat();
 		$page_largeur = $formatarray['width'];
@@ -1104,9 +1062,7 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 
 			$langs->load("exports");
 			setEventMessages($langs->trans('FileSuccessfullyBuilt', $filename.'_'.dol_print_date($now, 'dayhourlog')), null, 'mesgs');
-		}
-		else
-		{
+		} else {
             setEventMessages($langs->trans('NoPDFAvailableForDocGenAmongChecked'), null, 'errors');
 		}
 	}
@@ -1160,17 +1116,13 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 					setEventMessages($langs->trans("ErrorObjectMustHaveStatusDraftToBeValidated", $objecttmp->ref), null, 'errors');
 					$error++;
 					break;
-				}
-				elseif ($result < 0)
+				} elseif ($result < 0)
 				{
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
-				}
-				else $nbok++;
-			}
-			else
-			{
+				} else $nbok++;
+			} else {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
@@ -1182,9 +1134,7 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 		//var_dump($listofobjectthirdparties);exit;
@@ -1205,10 +1155,8 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
-            } else
-                $nbok++;
-        }
-        else {
+            } else $nbok++;
+        } else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
             $error++;
             break;
@@ -1218,15 +1166,14 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
     if (!$error) {
         if ($nbok > 1)
             setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-        else
-            setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+        else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
         $db->commit();
-    }
-    else {
+    } else {
         $db->rollback();
     }
 }
 
+//var_dump($_POST);var_dump($massaction);exit;
 
 // Delete record from mass action (massaction = 'delete' for direct delete, action/confirm='delete'/'yes' with a confirmation step before)
 if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete)
@@ -1269,11 +1216,8 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 			    setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			    $error++;
 			    break;
-			}
-			else $nbok++;
-		}
-		else
-		{
+			} else $nbok++;
+		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
 			break;
@@ -1285,9 +1229,7 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 		if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
 		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 	//var_dump($listofobjectthirdparties);exit;
@@ -1331,11 +1273,8 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
                 $error++;
                 break;
-            }
-            else $nbok++;
-        }
-        else
-        {
+            } else $nbok++;
+        } else {
             setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
             $error++;
             break;
@@ -1347,9 +1286,7 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
         if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
         else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
         $db->commit();
-    }
-    else
-    {
+    } else {
         $db->rollback();
     }
 }
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index e2da8a4170c..e88fc937e38 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -75,8 +75,7 @@ if ($action == 'print_file' && $user->rights->printing->read) {
 						setEventMessages($printer->error, $printer->errors);
 						setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$ret = 1;
 					setEventMessages($e->getMessage(), null, 'errors');
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index e23d2ce01a9..5be25002079 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -114,44 +114,43 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		$result = $object->fetch($id);
 
 		$sendtosocid = 0; // Id of related thirdparty
-		if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('societe', 'member', 'user', 'expensereport', 'contact')))
+		if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('member', 'user', 'expensereport', 'societe', 'contact')))
 		{
-			$result = $object->fetch_thirdparty();
-			if ($object->element == 'user' && $result == 0) $result = 1; // Even if not found, we consider ok
+			$resultthirdparty = $object->fetch_thirdparty();
 			$thirdparty = $object->thirdparty;
-			$sendtosocid = $thirdparty->id;
-		}
-		elseif ($object->element == 'member' || $object->element == 'user')
+			if (is_object($thirdparty)) $sendtosocid = $thirdparty->id;
+		} elseif ($object->element == 'member' || $object->element == 'user')
 		{
 			$thirdparty = $object;
 			if ($object->socid > 0) $sendtosocid = $object->socid;
-		}
-		elseif ($object->element == 'expensereport')
+		} elseif ($object->element == 'expensereport')
 		{
 			$tmpuser = new User($db);
 			$tmpuser->fetch($object->fk_user_author);
 			$thirdparty = $tmpuser;
 			if ($object->socid > 0) $sendtosocid = $object->socid;
-		}
-		elseif ($object->element == 'societe')
+		} elseif ($object->element == 'societe')
 		{
 			$thirdparty = $object;
-			if ($thirdparty->id > 0) $sendtosocid = $thirdparty->id;
-		}
-		elseif ($object->element == 'contact')
+			if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
+		} elseif ($object->element == 'contact')
 		{
 			$contact = $object;
-			if ($contact->id > 0) $sendtosocid = $contact->fetch_thirdparty()->id;
-		}
-		else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+			if ($contact->id > 0) {
+				$contact->fetch_thirdparty();
+				$thirdparty = $contact->thirdparty;
+				if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
+			}
+		} else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
 
 		if (is_object($hookmanager))
 		{
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		}
+	} else {
+		$thirdparty = $mysoc;
 	}
-	else $thirdparty = $mysoc;
 
 	if ($result > 0)
 	{
@@ -176,24 +175,24 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			// Recipients are provided into free text
 			$tmparray[] = trim($_POST['sendto']);
 		}
+
 		if (count($receiver) > 0)
 		{
+			// Recipient was provided from combo list
 			foreach ($receiver as $key=>$val)
 			{
-				// Recipient was provided from combo list
-				if ($val == 'thirdparty') // Key selected means currentthird party (may be usd for current member or current user too)
+				if ($val == 'thirdparty') // Key selected means current third party ('thirdparty' may be used for current member or current user too)
 				{
 					$tmparray[] = dol_string_nospecial($thirdparty->getFullName($langs), ' ', array(",")).' <'.$thirdparty->email.'>';
 				}
-				// Recipient was provided from combo list
 				elseif ($val == 'contact') // Key selected means current contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)	// $val is the Id of a contact
+					$sendtoid[] = $contact->id;
+				} elseif ($val)	// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
-					$sendtoid[] = $val;
+					$sendtoid[] = ((int) $val);
 				}
 			}
 		}
@@ -239,11 +238,11 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				elseif ($val == 'contact')	// Key selected means current contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
-				}
-				elseif ($val)				// $val is the Id of a contact
+					//$sendtoid[] = $contact->id;  TODO Add also id of contact in CC ?
+				} elseif ($val)				// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
-					//$sendtoid[] = $val;  TODO Add also id of contact in CC ?
+					//$sendtoid[] = ((int) $val);  TODO Add also id of contact in CC ?
 				}
 			}
 		}
@@ -264,12 +263,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 
 		if (dol_strlen($sendto))
 		{
-            // 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
 
-		    require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 
 			$langs->load("commercial");
 
@@ -277,22 +276,17 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			$fromtype = GETPOST('fromtype', 'alpha');
 			if ($fromtype === 'robot') {
 				$from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
-			}
-			elseif ($fromtype === 'user') {
+			} elseif ($fromtype === 'user') {
 				$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
-			}
-			elseif ($fromtype === 'company') {
+			} elseif ($fromtype === 'company') {
 				$from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
-			}
-			elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp = explode(',', $user->email_aliases);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
 				$tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
 				$from = trim($tmp[($reg[1] - 1)]);
-			}
-			elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
+			} elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
 				$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile';
 				$sql .= ' WHERE rowid = '.(int) $reg[1];
 				$resql = $db->query($sql);
@@ -301,14 +295,13 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				{
 					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 				}
-			}
-			else {
+			} else {
 				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")).' <'.$_POST['frommail'].'>';
 			}
 
 			$replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")).' <'.$_POST['replytomail'].'>';
-			$message = GETPOST('message', 'none');
-			$subject = GETPOST('subject', 'none');
+			$message = GETPOST('message', 'restricthtml');
+			$subject = GETPOST('subject', 'restricthtml');
 
 			// Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
 			// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
@@ -419,19 +412,17 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			{
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				$action = 'presend';
-			}
-			else
-			{
+			} else {
 				$result = $mailfile->sendfile();
 				if ($result)
 				{
 					// Initialisation of datas of object to call trigger
 					if (is_object($object))
 					{
-					    if (empty($actiontypecode)) $actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+						if (empty($actiontypecode)) $actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
 
 						$object->socid = $sendtosocid; // To link to a company
-						$object->sendtoid = $sendtoid; // To link to contact addresses. This is an array.
+						$object->sendtoid = $sendtoid; // To link to contact-addresses. This is an array.
 						$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 						$object->actionmsg = $actionmsg; // Long text (@todo Replace this with $message, we already have details of email in dedicated properties)
 						$object->actionmsg2		= $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
@@ -465,7 +456,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 
 							if ($error) {
 								setEventMessages($object->error, $object->errors, 'errors');
-    						}
+							}
 						}
 						// End call of triggers
 					}
@@ -479,18 +470,14 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 	  				if (isset($paramname2) || isset($paramval2)) $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
 		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
 			  		exit;
-				}
-				else
-				{
+				} else {
 					$langs->load("other");
 					$mesg = '<div class="error">';
 					if ($mailfile->error)
 					{
 						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
 						$mesg .= '<br>'.$mailfile->error;
-					}
-					else
-					{
+					} else {
 						$mesg .= 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 					}
 					$mesg .= '</div>';
@@ -499,18 +486,14 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 					$action = 'presend';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("MailTo")), null, 'warnings');
 			dol_syslog('Try to send email with no recipient defined', LOG_WARNING);
 			$action = 'presend';
 		}
-	}
-	else
-	{
-		$langs->load("other");
+	} else {
+		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailedToReadObject', $object->element), null, 'errors');
 		dol_syslog('Failed to read data of object id='.$object->id.' element='.$object->element);
 		$action = 'presend';
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index 313375d1aa1..05be4a31d18 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -50,9 +50,7 @@ if ($action == 'update' && is_array($arrayofparameters))
 	{
 		$db->commit();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
 	}
@@ -96,8 +94,7 @@ if ($action == 'setModuleOptions')
                 unset($listofdir[$key]); continue;
             }
             if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-            else
-            {
+            else {
                 $upload_dir = $tmpdir;
             }
         }
@@ -112,9 +109,7 @@ if ($action == 'setModuleOptions')
     {
         $db->commit();
         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } 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 3bbba0204f5..61db9b9fc55 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', 'none'), ENT_QUOTES, 'UTF-8', 1), '_public');
+	$result_update = $object->update_note(dol_html_entity_decode(GETPOST('note_public', 'restricthtml'), ENT_QUOTES, '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')))
@@ -49,7 +49,7 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			$model = $object->modelpdf;
+			$model = $object->model_pdf;
 			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
 			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
 			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
@@ -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', 'none'), ENT_QUOTES), '_private');
+	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES), '_private');
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 5b656786c8f..41e23819266 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -34,28 +34,28 @@ if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
 
 if (!isset($mode) || $mode != 'noajax')    // For ajax call
 {
-    require_once '../../main.inc.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+	require_once '../../main.inc.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-    $action = GETPOST('action', 'aZ09');
-    $file = urldecode(GETPOST('file', 'alpha'));
-    $section = GETPOST("section", 'alpha');
-    $module = GETPOST("module", 'alpha');
-    $urlsource = GETPOST("urlsource", 'alpha');
-    $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
+	$action = GETPOST('action', 'aZ09');
+	$file = urldecode(GETPOST('file', 'alpha'));
+	$section = GETPOST("section", 'alpha');
+	$module = GETPOST("module", 'alpha');
+	$urlsource = GETPOST("urlsource", 'alpha');
+	$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 
-    $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-    $sortfield = GETPOST("sortfield", 'alpha');
-    $sortorder = GETPOST("sortorder", 'alpha');
-    $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-    if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-    $offset = $limit * $page;
-    $pageprev = $page - 1;
-    $pagenext = $page + 1;
-    if (!$sortorder) $sortorder = "ASC";
-    if (!$sortfield) $sortfield = "name";
+	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+	$sortfield = GETPOST("sortfield", 'alpha');
+	$sortorder = GETPOST("sortorder", 'alpha');
+	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+	$offset = $limit * $page;
+	$pageprev = $page - 1;
+	$pagenext = $page + 1;
+	if (!$sortorder) $sortorder = "ASC";
+	if (!$sortfield) $sortfield = "name";
 
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -63,31 +63,30 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 
 	$ecmdir = new EcmDirectory($db);
 	if ($section > 0) {
-	    $result = $ecmdir->fetch($section);
-	    if (!$result > 0)
-	    {
-	        //dol_print_error($db,$ecmdir->error);
-	        //exit;
-	    }
+		$result = $ecmdir->fetch($section);
+		if (!$result > 0)
+		{
+			//dol_print_error($db,$ecmdir->error);
+			//exit;
+		}
 	}
 } else // For no ajax call
 {
 	$rootdirfordoc = $conf->ecm->dir_output;
 
 	$ecmdir = new EcmDirectory($db);
-    $relativepath = '';
-    if ($section > 0)
-    {
-        $result = $ecmdir->fetch($section);
-        if (!$result > 0)
-        {
-            dol_print_error($db, $ecmdir->error);
-            exit;
-        }
+	$relativepath = '';
+	if ($section > 0)
+	{
+		$result = $ecmdir->fetch($section);
+		if (!$result > 0)
+		{
+			dol_print_error($db, $ecmdir->error);
+			exit;
+		}
 
-        $relativepath = $ecmdir->getRelativePath(); // Example   'mydir/'
-    }
-	elseif (GETPOST('section_dir'))
+		$relativepath = $ecmdir->getRelativePath(); // Example   'mydir/'
+	} elseif (GETPOST('section_dir'))
 	{
 		$relativepath = GETPOST('section_dir');
 	}
@@ -114,10 +113,10 @@ if ($user->socid > 0) $socid = $user->socid;
 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.
 if (preg_match('/\.\./', $upload_dir) || preg_match('/[<>|]/', $upload_dir))
 {
-    dol_syslog("Refused to deliver file ".$upload_dir);
-    // Do no show plain path in shown error message
-    dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $upload_dir));
-    exit;
+	dol_syslog("Refused to deliver file ".$upload_dir);
+	// Do no show plain path in shown error message
+	dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $upload_dir));
+	exit;
 }
 
 // Check permissions
@@ -146,10 +145,10 @@ if ($modulepart == 'medias')
 if (!isset($mode) || $mode != 'noajax')
 {
 	// Ajout directives pour resoudre bug IE
-    header('Cache-Control: Public, must-revalidate');
-    header('Pragma: public');
+	header('Cache-Control: Public, must-revalidate');
+	header('Pragma: public');
 
-    top_httphead();
+	top_httphead();
 }
 
 $type = 'directory';
@@ -157,8 +156,8 @@ $type = 'directory';
 // This test if file exists should be useless. We keep it to find bug more easily
 if (!dol_is_dir($upload_dir))
 {
-    //dol_mkdir($upload_dir);
-    /*$langs->load("install");
+	//dol_mkdir($upload_dir);
+	/*$langs->load("install");
     dol_print_error(0,$langs->trans("ErrorDirDoesNotExists",$upload_dir));
     exit;*/
 }
@@ -174,72 +173,76 @@ if (!empty($pageid))     $param .= '&pageid='.urlencode($pageid);
 // Dir scan
 if ($type == 'directory')
 {
-    $formfile = new FormFile($db);
+	$formfile = new FormFile($db);
 
-    $maxlengthname = 40;
-    $excludefiles = array('^SPECIMEN\.pdf$', '^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^payments$', '^CVS$', '^thumbs$');
-    $sorting = (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC);
+	$maxlengthname = 40;
+	$excludefiles = array('^SPECIMEN\.pdf$', '^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^payments$', '^CVS$', '^thumbs$');
+	$sorting = (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC);
 
-    // Right area. If module is defined here, we are in automatic ecm.
-    $automodules = array('company', 'invoice', 'invoice_supplier', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'tax', 'project', 'fichinter', 'user', 'expensereport', 'holiday', 'banque');
+	// Right area. If module is defined here, we are in automatic ecm.
+	$automodules = array(
+		'company',
+		'invoice',
+		'invoice_supplier',
+		'propal',
+		'supplier_proposal',
+		'order',
+		'order_supplier',
+		'contract',
+		'product',
+		'tax',
+		'project',
+		'fichinter',
+		'user',
+		'expensereport',
+		'holiday',
+		'recruitment-recruitmentcandidature',
+		'banque',
+		'mrp-mo'
+	);
 
-    // TODO change for multicompany sharing
-    // Auto area for suppliers invoices
-    if ($module == 'company') $upload_dir = $conf->societe->dir_output;
-    // Auto area for suppliers invoices
-    elseif ($module == 'invoice') $upload_dir = $conf->facture->dir_output;
-    // Auto area for suppliers invoices
-    elseif ($module == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
-    // Auto area for customers proposal
-    elseif ($module == 'propal') $upload_dir = $conf->propal->dir_output;
-    // Auto area for suppliers proposal
-    elseif ($module == 'supplier_proposal') $upload_dir = $conf->supplier_proposal->dir_output;
-    // Auto area for customers orders
-    elseif ($module == 'order') $upload_dir = $conf->commande->dir_output;
-    // Auto area for suppliers orders
-    elseif ($module == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
-    // Auto area for suppliers invoices
-    elseif ($module == 'contract') $upload_dir = $conf->contrat->dir_output;
-    // Auto area for products
-    elseif ($module == 'product') $upload_dir = $conf->product->dir_output;
-    // Auto area for suppliers invoices
-    elseif ($module == 'tax') $upload_dir = $conf->tax->dir_output;
-    // Auto area for projects
-    elseif ($module == 'project') $upload_dir = $conf->projet->dir_output;
-    // Auto area for interventions
-    elseif ($module == 'fichinter') $upload_dir = $conf->ficheinter->dir_output;
-    // Auto area for users
-    elseif ($module == 'user') $upload_dir = $conf->user->dir_output;
-    // Auto area for expense report
-    elseif ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
-	// Auto area for holiday
-    elseif ($module == 'holiday') $upload_dir = $conf->holiday->dir_output;
-    // Auto area for holiday
-    elseif ($module == 'banque') $upload_dir = $conf->bank->dir_output;
+	// TODO change for multicompany sharing
+	if ($module == 'company') $upload_dir = $conf->societe->dir_output;
+	elseif ($module == 'invoice') $upload_dir = $conf->facture->dir_output;
+	elseif ($module == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
+	elseif ($module == 'propal') $upload_dir = $conf->propal->dir_output;
+	elseif ($module == 'supplier_proposal') $upload_dir = $conf->supplier_proposal->dir_output;
+	elseif ($module == 'order') $upload_dir = $conf->commande->dir_output;
+	elseif ($module == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
+	elseif ($module == 'contract') $upload_dir = $conf->contrat->dir_output;
+	elseif ($module == 'product') $upload_dir = $conf->product->dir_output;
+	elseif ($module == 'tax') $upload_dir = $conf->tax->dir_output;
+	elseif ($module == 'project') $upload_dir = $conf->projet->dir_output;
+	elseif ($module == 'fichinter') $upload_dir = $conf->ficheinter->dir_output;
+	elseif ($module == 'user') $upload_dir = $conf->user->dir_output;
+	elseif ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
+	elseif ($module == 'holiday') $upload_dir = $conf->holiday->dir_output;
+	elseif ($module == 'recruitment-recruitmentcandidature') $upload_dir = $conf->recruitment->dir_output.'/recruitmentcandidature';
+	elseif ($module == 'banque') $upload_dir = $conf->bank->dir_output;
+	elseif ($module == 'mrp-mo') $upload_dir = $conf->mrp->dir_output.'/mo';
 
-    // Automatic list
-    if (in_array($module, $automodules))
-    {
-        $param .= '&module='.$module;
-        if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.urlencode($search_doc_ref);
+	// Automatic list
+	if (in_array($module, $automodules))
+	{
+		$param .= '&module='.$module;
+		if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.urlencode($search_doc_ref);
 
-        $textifempty = ($section ? $langs->trans("NoFileFound") : ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("NoFileFound")));
+		$textifempty = ($section ? $langs->trans("NoFileFound") : ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("NoFileFound")));
 
-        if ($module == 'company') $excludefiles[] = '^contact$'; // The subdir 'contact' contains files of contacts with no id of thirdparty.
+		if ($module == 'company') $excludefiles[] = '^contact$'; // The subdir 'contact' contains files of contacts with no id of thirdparty.
 
-        $filter = preg_quote($search_doc_ref, '/');
-        $filearray = dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting, 1);
+		$filter = preg_quote($search_doc_ref, '/');
+		$filearray = dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting, 1);
 
-        $perm = $user->rights->ecm->upload;
+		$perm = $user->rights->ecm->upload;
 
-        $formfile->list_of_autoecmfiles($upload_dir, $filearray, $module, $param, 1, '', $perm, 1, $textifempty, $maxlengthname, $url, 1);
-    }
-    // Manual list
-    else
-    {
-    	if ($module == 'medias')
-    	{
-    		/*
+		$formfile->list_of_autoecmfiles($upload_dir, $filearray, $module, $param, 1, '', $perm, 1, $textifempty, $maxlengthname, $url, 1);
+	}
+	// Manual list
+	else {
+		if ($module == 'medias')
+		{
+			/*
     		   $_POST is array like
     		  'token' => string '062380e11b7dcd009d07318b57b71750' (length=32)
 			  'action' => string 'file_manager' (length=12)
@@ -250,91 +253,82 @@ if ($type == 'directory')
 			  'max_file_size' => string '2097152' (length=7)
 			  'sendit' => string 'Envoyer fichier' (length=15)
     		 */
-    		$relativepath = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
-    		if ($relativepath && $relativepath != '/') $relativepath .= '/';
-    		$upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
-    		if (GETPOSTISSET('website') || GETPOSTISSET('file_manager'))
-	    	{
-	    		$param .= '&file_manager=1';
-	    		if (!preg_match('/website=/', $param)) $param .= '&website='.urlencode(GETPOST('website', 'alpha'));
-	    		if (!preg_match('/pageid=/', $param)) $param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
-	    		//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
-	    	}
-    	}
-    	else
-    	{
-        	$relativepath = $ecmdir->getRelativePath();
-        	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-    	}
+			$relativepath = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
+			if ($relativepath && $relativepath != '/') $relativepath .= '/';
+			$upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
+			if (GETPOSTISSET('website') || GETPOSTISSET('file_manager'))
+			{
+				$param .= '&file_manager=1';
+				if (!preg_match('/website=/', $param)) $param .= '&website='.urlencode(GETPOST('website', 'alpha'));
+				if (!preg_match('/pageid=/', $param)) $param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
+				//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
+			}
+		} else {
+			$relativepath = $ecmdir->getRelativePath();
+			$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
+		}
 
-        // If $section defined with value 0
+		// If $section defined with value 0
 		if (($section === '0' || empty($section)) && ($module != 'medias'))
-        {
-            $filearray = array();
-        }
-        else
-        {
-        	$filearray = dol_dir_list($upload_dir, "files", 0, '', array('^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^CVS$'), $sortfield, $sorting, 1);
-        }
+		{
+			$filearray = array();
+		} else {
+			$filearray = dol_dir_list($upload_dir, "files", 0, '', array('^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^CVS$'), $sortfield, $sorting, 1);
+		}
 
-        if ($section)
-        {
-            $param .= '&section='.$section;
-        	if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.$search_doc_ref;
+		if ($section)
+		{
+			$param .= '&section='.$section;
+			if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.$search_doc_ref;
 
-            $textifempty = $langs->trans('NoFileFound');
-        }
-        elseif ($section === '0')
-        {
-        	if ($module == 'ecm') $textifempty = '<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
-        	else $textifempty = $langs->trans('NoFileFound');
-        }
-        else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
+			$textifempty = $langs->trans('NoFileFound');
+		} elseif ($section === '0')
+		{
+			if ($module == 'ecm') $textifempty = '<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
+			else $textifempty = $langs->trans('NoFileFound');
+		} else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
 
-        if ($module == 'medias')
-        {
-            $useinecm = 6;
-            $modulepart = 'medias';
-            $perm = ($user->rights->website->write || $user->rights->emailing->creer);
-            $title = 'none';
-        }
-        elseif ($module == 'ecm') // DMS/ECM -> manual structure
-        {
-            if ($user->rights->ecm->read)
-            {
-                // Buttons: Preview
-                $useinecm = 2;
-            }
+		if ($module == 'medias')
+		{
+			$useinecm = 6;
+			$modulepart = 'medias';
+			$perm = ($user->rights->website->write || $user->rights->emailing->creer);
+			$title = 'none';
+		} elseif ($module == 'ecm') // DMS/ECM -> manual structure
+		{
+			if ($user->rights->ecm->read)
+			{
+				// Buttons: Preview
+				$useinecm = 2;
+			}
 
-            if ($user->rights->ecm->upload)
-            {
-                // Buttons: Preview + Delete
-                $useinecm = 4;
-            }
+			if ($user->rights->ecm->upload)
+			{
+				// Buttons: Preview + Delete
+				$useinecm = 4;
+			}
 
-            if ($user->rights->ecm->setup)
-            {
-                // Buttons: Preview + Delete + Edit
-                $useinecm = 5;
-            }
+			if ($user->rights->ecm->setup)
+			{
+				// Buttons: Preview + Delete + Edit
+				$useinecm = 5;
+			}
 
-            $perm = $user->rights->ecm->upload;
-            $modulepart = 'ecm';
-            $title = ''; // Use default
-        }
-        else
-        {
-            $useinecm = 5;
-            $modulepart = 'ecm';
-            $perm = $user->rights->ecm->upload;
-            $title = ''; // Use default
-        }
+			$perm = $user->rights->ecm->upload;
+			$modulepart = 'ecm';
+			$title = ''; // Use default
+		} else {
+			$useinecm = 5;
+			$modulepart = 'ecm';
+			$perm = $user->rights->ecm->upload;
+			$title = ''; // Use default
+		}
 
-        // When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param
-        // When we show list of files for a directory, $filearray ciontains file list, and directory is defined with modulepart + $relativepath
-        //var_dump("section=".$section." title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url);
-        $formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm);
-    }
+		// When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param
+		// When we show list of files for a directory, $filearray ciontains file list, and directory is defined with modulepart + $relativepath
+		//var_dump("section=".$section." title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url);
+		$formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm);
+	}
 }
 
 
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 3e54532668a..620643da8f2 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -49,8 +49,7 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 	$preopened = GETPOST('preopened');
 
 	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
-}
-else    // For no ajax call
+} else // For no ajax call
 {
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
 
@@ -73,8 +72,7 @@ if ($modulepart == 'ecm')
 {
 	$fullpathselecteddir = $conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened = $conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
-}
-elseif ($modulepart == 'medias')
+} elseif ($modulepart == 'medias')
 {
 	$fullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened = $dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
@@ -95,8 +93,7 @@ if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpat
 if ($modulepart == 'ecm')
 {
 	if (!$user->rights->ecm->read) accessforbidden();
-}
-elseif ($modulepart == 'medias')
+} elseif ($modulepart == 'medias')
 {
 	// Always allowed
 }
@@ -471,8 +468,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 							if ($modulepart == 'ecm')
 							{
 								$newfullpathselecteddir = $conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
-							}
-							elseif ($modulepart == 'medias')
+							} elseif ($modulepart == 'medias')
 							{
 								$newfullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
 							}
@@ -486,7 +482,6 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 
 				echo "</ul>\n";
 			}
-		}
-		else print "PermissionDenied";
+		} else print "PermissionDenied";
 	}
 }
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index d8f4985f6d8..01cb85008bd 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2016	   Sergio Sanchis		<sergiosanchis@hotmail.com>
  * Copyright (C) 2017	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019      Frédéric France      <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,27 +18,83 @@
  */
 
 if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
+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');
 if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');					// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');					// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');					// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');			// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');			// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');					// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');					// Do not check style html tag into posted data
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');						// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');					// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');					// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       		  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');						// If this page is public (can be called outside logged session)
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');			// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', '1');		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("XFRAMEOPTIONS_ALLOWALL"))   define('XFRAMEOPTIONS_ALLOWALL', '1');			// Do not add the HTTP header 'X-Frame-Options: SAMEORIGIN' but 'X-Frame-Options: ALLOWALL'
+
 
 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();
+$action = GETPOST('action', 'aZ09');
+$listofreminderids = GETPOST('listofreminderids', 'aZ09');
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'stopreminder') {
+	dol_syslog("Clear notification for listofreminderids=".$listofreminderids);
+	$listofreminderid = GETPOST('listofreminderids', 'intcomma');
+
+	// Set the reminder as done
+	//foreach ($listofreminderidsarray as $listofreminderid) {
+	//	if (empty($listofreminderid)) continue;
+	//$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'action_reminder WHERE rowid = '.$listofreminderid.' AND fk_user = '.$user->id;
+	$sql = 'UPDATE '.MAIN_DB_PREFIX.'actioncomm_reminder SET status = 1';
+	$sql .= ' WHERE status = 0 AND rowid IN ('.$db->sanitize($db->escape($listofreminderid)).')';
+	$sql .= ' AND fk_user = '.$user->id.' AND entity = '.$conf->entity;
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+	}
+	//}
+
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+	// Clean database
+	$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'actioncomm_reminder';
+	$sql .= " WHERE dateremind < '".$db->idate(dol_time_plus_duree(dol_now(), -1, 'm'))."'";
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+	}
+
+	exit;
+}
+
 
 /*
  * View
  */
 
-top_httphead('text/html'); // TODO Use a json mime type
+top_httphead('application/json');
 
 global $user, $db, $langs, $conf;
 
-$time = (int) GETPOST('time', 'int'); // Use the time parameter that is always increased by time_update, even if call is late
-//$time=dol_now();
-
-
 $eventfound = array();
 //Uncomment this to force a test
 //$eventfound[]=array('type'=>'agenda', 'id'=>1, 'tipo'=>'eee', 'location'=>'aaa');
@@ -46,9 +102,10 @@ $eventfound = array();
 //dol_syslog('time='.$time.' $_SESSION[auto_ck_events_not_before]='.$_SESSION['auto_check_events_not_before']);
 
 // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened.
-if ($time >= $_SESSION['auto_check_events_not_before'])
+// 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),
@@ -60,15 +117,14 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
             dol_syslog("We ask to check browser notification on a too large period. We fix this with current date.");
             $starttime = $time;
         }
-    }
-    else
-    {
+    } else {
         $starttime = $time;
     }
 
     $_SESSION['auto_check_events_not_before'] = $time + $time_update;
+	*/
 
-    // Force save of session change we did.
+    // Force save of the session change we did.
     // WARNING: Any change in sessions after that will not be saved !
     session_write_close();
 
@@ -77,43 +133,42 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
 
     dol_syslog('NEW $_SESSION[auto_check_events_not_before]='.$_SESSION['auto_check_events_not_before']);
 
-    $sql = 'SELECT id';
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'actioncomm a, '.MAIN_DB_PREFIX.'actioncomm_resources ar';
-    $sql .= ' WHERE a.id = ar.fk_actioncomm';
-    // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened.
-    // This need to extend period to be sure to not miss and save in session what we notified to avoid duplicate (save is not done yet).
-    $sql .= " AND datep BETWEEN '".$db->idate($starttime)."' AND '".$db->idate($time + $time_update - 1)."'";
-    $sql .= ' AND a.code <> "AC_OTH_AUTO"';
-    $sql .= ' AND ar.element_type = "user"';
-    $sql .= ' AND ar.fk_element = '.$user->id;
+    $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) {
-        $actionmod = new ActionComm($db);
-
         while ($obj = $db->fetch_object($resql))
         {
-            // Load translation files required by the page
-            $langs->loadLangs(array('agenda', 'commercial'));
-
-            $actionmod->fetch($obj->id);
-
             // Message must be formated and translated to be used with javascript directly
             $event = array();
             $event['type'] = 'agenda';
-            $event['id'] = $actionmod->id;
-            $event['tipo'] = $langs->transnoentities('Action'.$actionmod->code);
-            $event['titulo'] = $actionmod->label;
-            $event['location'] = $langs->transnoentities('Location').': '.$actionmod->location;
+            $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[] = $event;
+            $eventfound[$obj->id_agenda] = $event;
         }
-    }
-    else
-    {
+    } else {
         dol_syslog("Error sql = ".$db->lasterror(), LOG_ERR);
     }
 }
 
-print json_encode($eventfound);
+print json_encode(array('pastreminders'=>$eventfound, 'nextreminder'=>''));
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index c7e5bbd8991..710759e10bb 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -26,13 +26,15 @@ if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('CSRFCHECK_WITH_TOKEN'))  define('CSRFCHECK_WITH_TOKEN', '1'); // Token is required even in GET mode
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');	// set or del
 $name = GETPOST('name', 'alpha');
 
+
 /*
  * View
  */
@@ -46,7 +48,7 @@ top_httphead();
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-// Registering the location of boxes
+// Registering the new value of constant
 if (!empty($action) && !empty($name))
 {
 	$entity = GETPOST('entity', 'int');
@@ -57,10 +59,11 @@ if (!empty($action) && !empty($name))
 		if ($action == 'set')
 		{
 			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
-		}
-		elseif ($action == 'del')
+		} elseif ($action == 'del')
 		{
 			dolibarr_del_const($db, $name, $entity);
 		}
 	}
+} else {
+	http_response_code(403);
 }
diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php
index 67e769ab17f..6b476a8f59a 100644
--- a/htdocs/core/ajax/contacts.php
+++ b/htdocs/core/ajax/contacts.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2012 Regis Houssin       <regis.houssin@inodbox.com>
- * Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2020 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,11 +27,15 @@ if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 
 require '../../main.inc.php';
 
-$id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$id = GETPOST('id', 'int');	// id of thirdparty
+$action = GETPOST('action', 'aZ09');
 $htmlname = GETPOST('htmlname', 'alpha');
 $showempty = GETPOST('showempty', 'int');
 
+// Security check
+$result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
+
+
 /*
  * View
  */
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index a3db4505f70..16f39af9bde 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -51,20 +51,38 @@ if (!empty($id) && !empty($element) && !empty($htmlelement) && !empty($type))
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande') { $classpath = $subelement = 'commande'; }
-	elseif ($element == 'propal') { $classpath = 'comm/propal'; $subelement = 'propal'; }
-	elseif ($element == 'facture') { $classpath = 'compta/facture'; $subelement = 'facture'; }
-	elseif ($element == 'contract') { $classpath = $subelement = 'contrat'; }
-	elseif ($element == 'shipping') { $classpath = $subelement = 'expedition'; }
-	elseif ($element == 'deplacement') { $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	elseif ($element == 'order_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	elseif ($element == 'invoice_supplier') { $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande') {
+		$classpath = $subelement = 'commande';
+	} elseif ($element == 'propal') {
+		$classpath = 'comm/propal';
+		$subelement = 'propal';
+	} elseif ($element == 'facture') {
+		$classpath = 'compta/facture';
+		$subelement = 'facture';
+	} elseif ($element == 'contract') {
+		$classpath = $subelement = 'contrat';
+	} elseif ($element == 'shipping') {
+		$classpath = $subelement = 'expedition';
+	} elseif ($element == 'deplacement') {
+		$classpath = 'compta/deplacement';
+		$subelement = 'deplacement';
+	} elseif ($element == 'order_supplier') {
+		$classpath = 'fourn';
+		$subelement = 'fournisseur.commande';
+	} elseif ($element == 'invoice_supplier') {
+		$classpath = 'fourn';
+		$subelement = 'fournisseur.facture';
+	}
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier') { $classname = 'CommandeFournisseur'; }
-	elseif ($element == 'invoice_supplier') { $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+	if ($element == 'order_supplier') {
+		$classname = 'CommandeFournisseur';
+	} elseif ($element == 'invoice_supplier') {
+		$classname = 'FactureFournisseur';
+	} else {
+		$classname = ucfirst($subelement);
+	}
 
 	$object = new $classname($db);
 	$object->fetch($id);
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index 14258e1ebb1..b1a72868312 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -62,8 +62,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 	elseif ($element == 'order_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'commande';
-	}
-	elseif ($element == 'invoice_supplier') {
+	} elseif ($element == 'invoice_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'facture';
 	}
@@ -83,8 +82,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 			{
 				$ret = $form->$methodname();
 				if ($ret > 0) echo json_encode($form->$cachename);
-			}
-			elseif (!empty($ext_element))
+			} elseif (!empty($ext_element))
 			{
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
@@ -99,16 +97,12 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$ret = $object->$methodname($fk_element);
 				if ($ret > 0) echo json_encode($object->$cachename);
 			}
-		}
-		else
-		{
+		} else {
 			$object = new GenericObject($db);
 			$value = $object->$loadmethod($table_element, $fk_element, $field);
 			echo $value;
 		}
-	}
-	else
-	{
+	} else {
 		echo $langs->transnoentities('NotEnoughPermissions');
 	}
 }
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index f7bf1d6299c..ceb221b4870 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -30,7 +30,7 @@ if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $value = GETPOST('value', 'int');
 $field = GETPOST('field', 'alpha');
@@ -43,9 +43,9 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-if (empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+/*if (empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 	accessforbidden('Calling this file is allowed only when MAIN_DIRECT_STATUS_UPDATE is set');
-}
+}*/
 
 
 /*
@@ -58,11 +58,9 @@ print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"])
 
 if (in_array($field, array('status'))) {
 	$result = restrictedArea($user, $element, $id);
-}
-elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) {	// Special case for products
+} elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) {	// Special case for products
 	$result = restrictedArea($user, 'produit|service', $id, 'product&product', '', '', 'rowid');
-}
-else {
+} else {
 	accessforbidden("Bad value for combination of parameters element/field.", 0, 0, 1);
 	exit;
 }
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index a914470e50d..e58895a967f 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -30,7 +30,7 @@ if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $hash_unique_id = GETPOST('hash_unique_id', 'alpha');
 $hash_algo = GETPOST('hash_algo', 'alpha');
 
@@ -66,7 +66,6 @@ elseif ($action == 'firstpingko')
 	// Note: pings are by installation, done on entity 1.
 	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt'); // erase last value
 	print 'First ping KO saved for entity '.$conf->entity;
-}
-else {
+} else {
 	print 'Error action='.$action.' not supported';
 }
diff --git a/htdocs/core/ajax/price.php b/htdocs/core/ajax/price.php
index 4e4e302d439..0dec4d21c68 100644
--- a/htdocs/core/ajax/price.php
+++ b/htdocs/core/ajax/price.php
@@ -51,8 +51,7 @@ if (!empty($output) && isset($amount) && isset($tva_tx))
 			$price = price2num($amount * (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = $amount;
 			$return['price_ttc'] = (isset($price) && $price != '' ? price($price) : '');
-		}
-		elseif ($output == 'price_ht') {
+		} elseif ($output == 'price_ht') {
 			$price = price2num($amount / (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = (isset($price) && $price != '' ? price($price) : '');
 			$return['price_ttc'] = ($tva_tx == 0 ? $price : $amount);
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 0eb0545a9ea..8273683b8de 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -59,51 +59,60 @@ top_httphead();
 if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
 {
 	$ext_element = GETPOST('ext_element', 'alpha', 2);
-	$field				= substr($field, 8); // remove prefix val_
+	$field = substr($field, 8); // remove prefix val_
 	$type = GETPOST('type', 'alpha', 2);
-	$value				= ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
-	$loadmethod			= GETPOST('loadmethod', 'alpha', 2);
-	$savemethod			= GETPOST('savemethod', 'alpha', 2);
+	$value = ($type == 'ckeditor' ? GETPOST('value', '', 2) : GETPOST('value', 'alpha', 2));
+	$loadmethod = GETPOST('loadmethod', 'alpha', 2);
+	$savemethod = GETPOST('savemethod', 'alpha', 2);
 	$savemethodname = (!empty($savemethod) ? $savemethod : 'setValueFrom');
-	$newelement			= $element;
+	$newelement = $element;
 
 	$view = '';
 	$format = 'text';
 	$return = array();
 	$error = 0;
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
-	{
+	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs)) {
 		$element = $regs[1];
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $newelement = 'propale';
-	elseif ($element == 'fichinter') $newelement = 'ficheinter';
-	elseif ($element == 'product') $newelement = 'produit';
-	elseif ($element == 'member') $newelement = 'adherent';
-	elseif ($element == 'order_supplier') {
+	if ($element == 'propal') {
+		$newelement = 'propale';
+	} elseif ($element == 'fichinter') {
+		$newelement = 'ficheinter';
+	} elseif ($element == 'product') {
+		$newelement = 'produit';
+	} elseif ($element == 'member') {
+		$newelement = 'adherent';
+	} elseif ($element == 'order_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'commande';
-	}
-	elseif ($element == 'invoice_supplier') {
+	} elseif ($element == 'invoice_supplier') {
 		$newelement = 'fournisseur';
 		$subelement = 'facture';
+	} else {
+		$newelement = $element;
 	}
-	else $newelement = $element;
 
 	$_POST['action'] = 'update'; // Hack so restrictarea will test permissions on write too
 	$feature = $newelement;
 	$feature2 = $subelement;
 	$object_id = $fk_element;
-	if ($feature == 'expedition' || $feature == 'shipping')
-	{
+	if ($feature == 'expedition' || $feature == 'shipping') {
 		$feature = 'commande';
 		$object_id = 0;
 	}
-	if ($feature == 'shipping') $feature = 'commande';
-	if ($feature == 'payment') { $feature = 'facture'; }
-	if ($feature == 'payment_supplier') { $feature = 'fournisseur'; $feature2 = 'facture'; }
+	if ($feature == 'shipping') {
+		$feature = 'commande';
+	}
+	if ($feature == 'payment') {
+		$feature = 'facture';
+	}
+	if ($feature == 'payment_supplier') {
+		$feature = 'fournisseur';
+		$feature2 = 'facture';
+	}
 	//var_dump(GETPOST('action','aZ09'));
 	//var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
 	$check_access = restrictedArea($user, $feature, $object_id, '', $feature2);
@@ -130,15 +139,11 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
-		}
-		elseif ($type == 'datepicker')
-		{
+		} elseif ($type == 'datepicker') {
 			$timestamp = GETPOST('timestamp', 'int', 2);
 			$format = 'date';
 			$newvalue = ($timestamp / 1000);
-		}
-		elseif ($type == 'select')
-		{
+		} elseif ($type == 'select') {
 			$loadmethodname = 'load_cache_'.$loadmethod;
 			$loadcachename = 'cache_'.$loadmethod;
 			$loadviewname = 'view_'.$loadmethod;
@@ -157,15 +162,11 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$return['error'] = $form->error;
 				}
-			}
-			else
-			{
+			} else {
 				$module = $subelement = $ext_element;
 				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
 				{
@@ -187,9 +188,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$return['error'] = $object->error;
 				}
@@ -215,17 +214,13 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 
 				$return['value'] = $value;
 				$return['view'] = (!empty($view) ? $view : $value);
-			}
-			else
-			{
+			} else {
 				$return['error'] = $object->error;
 			}
 		}
 
 		echo json_encode($return);
-	}
-	else
-	{
+	} else {
 		echo $langs->trans('NotEnoughPermissions');
 	}
 }
diff --git a/htdocs/core/ajax/selectobject.php b/htdocs/core/ajax/selectobject.php
index eed6c21c126..9d9b7bbfc42 100644
--- a/htdocs/core/ajax/selectobject.php
+++ b/htdocs/core/ajax/selectobject.php
@@ -33,7 +33,7 @@ $objectdesc = GETPOST('objectdesc', 'alpha');
 $htmlname = GETPOST('htmlname', 'aZ09');
 $sqlfilter = GETPOST('sqlfilter', 'alpha');
 $outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 
 
@@ -75,9 +75,10 @@ if (!is_object($objecttmp))
 }
 
 // When used from jQuery, the search term is added as GET param "term".
-$searchkey = (($id && GETPOST($id, 'alpha')) ?GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ?GETPOST($htmlname, 'alpha') : ''));
+$searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ? GETPOST($htmlname, 'alpha') : ''));
 
-// TODO Add a security test to avoid to get content of all tables
+// Add a security test to avoid to get content of all tables
+restrictedArea($user, $objecttmp->element, $id);
 
 $arrayresult = $form->selectForFormsList($objecttmp, $htmlname, '', 0, $searchkey, '', '', '', 0, 1);
 
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 03acbde80fa..87b3a903343 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -48,7 +48,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 //global $hookmanager;
 $hookmanager->initHooks(array('searchform'));
 
-$search_boxvalue = GETPOST('q', 'none');
+$search_boxvalue = GETPOST('q', 'restricthtml');
 
 $arrayresult = array();
 
@@ -119,6 +119,39 @@ if ((! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFOR
 	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
+// Customer payments
+if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
+{
+	$arrayresult['searchintocustomerpayments'] = array(
+		'position'=>170,
+		'img'=>'object_payment',
+		'label'=>$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
+		'url'=>DOL_URL_ROOT.'/compta/paiement/list.php?leftmenu=customers_bills_payment'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+}
+
+// Vendor payments
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || ! empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
+{
+	$arrayresult['searchintovendorpayments'] = array(
+		'position'=>175,
+		'img'=>'object_payment',
+		'label'=>$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
+		'url'=>DOL_URL_ROOT.'/fourn/paiement/list.php?leftmenu=suppliers_bills_payment'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+}
+
+// Miscellaneous payments
+if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED) && $user->rights->banque->lire)
+{
+	$arrayresult['searchintomiscpayments'] = array(
+		'position'=>180,
+		'img'=>'object_payment',
+		'label'=>$langs->trans("SearchIntoMiscPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoMiscPayments", $search_boxvalue),
+		'url'=>DOL_URL_ROOT.'/compta/bank/various_payment/list.php?leftmenu=tax_various'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+}
+
 if (!empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
 {
 	$arrayresult['searchintocontract'] = array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('', 'object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
@@ -152,13 +185,12 @@ $reshook = $hookmanager->executeHooks('addSearchEntry', $parameters);
 if (empty($reshook))
 {
 	$arrayresult = array_merge($arrayresult, $hookmanager->resArray);
-}
-else $arrayresult = $hookmanager->resArray;
+} else $arrayresult = $hookmanager->resArray;
 
-// This allow to keep a search entry to the top
+// 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'] = -10;
+    if (array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -1000;
 }
 
 // Sort on position
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index 9edcad9f4fa..0bd16eb6449 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -27,7 +27,7 @@ if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 require '../../main.inc.php';
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $htmlname	= GETPOST('htmlname', 'alpha');
 $selected	= (GETPOST('selected') ?GETPOST('selected') : '-1');
 $productid = (GETPOST('productid', 'int') ?GETPOST('productid', 'int') : 0);
@@ -52,9 +52,7 @@ if (!empty($id) && !empty($action) && !empty($htmlname))
 	{
 		$seller = $mysoc;
 		$buyer = $soc;
-	}
-	else
-	{
+	} else {
 		$buyer = $mysoc;
 		$seller = $soc;
 	}
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index 850d25bae47..dfa1f3f8419 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2010     Regis Houssin       <regis.houssin@inodbox.com>
- * Copyright (C) 2011-204 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2010      Regis Houssin       <regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2014 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,8 +75,7 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 		if ($town)    $sql .= " AND z.town LIKE '%".$db->escape($town)."%'";
 		$sql .= " ORDER BY z.zip, z.town";
 		$sql .= $db->plimit(100); // Avoid pb with bad criteria
-	}
-	else                                               // Use table of third parties
+	} else // Use table of third parties
 	{
 		$sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
 		$sql .= ", c.code as country_code, c.label as country";
@@ -128,9 +127,7 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 	}
 
 	echo json_encode($return_arr);
-}
-else
-{
+} else {
 }
 
 $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 6198c90e663..76c3fa5eb47 100644
--- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php
+++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
@@ -84,7 +84,7 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
             $sql = "SELECT DISTINCT b.piece_num";
             $sql .= ", b.doc_date as date_movement";
             $sql .= ", b.label_operation";
-            $sql .= ", b.montant";
+            $sql .= ", b.montant as amount";
             $sql .= ", b.code_journal";
             $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
             $sql .= " WHERE b.fk_doc = 0";
@@ -103,7 +103,7 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
                     $date		= $this->db->jdate($objp->date_movement);
 					$journal	= $objp->code_journal;
                     $label		= $objp->label_operation;
-					$amount		= $objp->montant;
+					$amount		= $objp->amount;
 
 					$bookkeepingstatic->id = $objp->id;
 					$bookkeepingstatic->piece_num = $objp->piece_num;
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 448e7d915c9..a951402fd7b 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -244,9 +244,7 @@ class box_actions extends ModeleBoxes
 					$out .= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE * 1000).');';
 				}
 				$out .= '</script>';
-			}
-			else
-			{
+			} else {
 				$out .= '<script>';
 				$out .= '$("#dialogboxaction").dialog({ autoOpen: false });';
 				$out .= '</script>';
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 8fc7b8766e4..1585241b843 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -30,415 +30,413 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_activity extends ModeleBoxes
 {
-    public $boxcode = "activity";
-    public $boximg = "object_bill";
-    public $boxlabel = 'BoxGlobalActivity';
-    public $depends = array("facture");
+	public $boxcode = "activity";
+	public $boximg = "object_bill";
+	public $boxlabel = 'BoxGlobalActivity';
+	public $depends = array("facture");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $conf, $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $conf, $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        // FIXME: Pb into some status
-        $this->enabled = ($conf->global->MAIN_FEATURES_LEVEL); // Not enabled by default due to bugs (see previous comments)
+		// FIXME: Pb into some status
+		$this->enabled = ($conf->global->MAIN_FEATURES_LEVEL); // Not enabled by default due to bugs (see previous comments)
 
-        $this->hidden = !((!empty($conf->facture->enabled) && $user->rights->facture->lire)
-            || (!empty($conf->commande->enabled) && $user->rights->commande->lire)
-            || (!empty($conf->propal->enabled) && $user->rights->propale->lire)
-            );
-    }
+		$this->hidden = !((!empty($conf->facture->enabled) && $user->rights->facture->lire)
+			|| (!empty($conf->commande->enabled) && $user->rights->commande->lire)
+			|| (!empty($conf->propal->enabled) && $user->rights->propale->lire)
+			);
+	}
 
-    /**
-     *  Charge les donnees en memoire pour affichage ulterieur
-     *
-     *  @param  int     $max        Maximum number of records to load
-     *  @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Charge les donnees en memoire pour affichage ulterieur
+	 *
+	 *  @param  int     $max        Maximum number of records to load
+	 *  @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $totalnb = 0;
-        $line = 0;
-        $cachetime = 3600;
-        $fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'-r'.($user->rights->societe->client->voir ? '1' : '0').'.cache';
-        $now = dol_now();
-        $nbofperiod = 3;
+		$totalnb = 0;
+		$line = 0;
+		$cachetime = 3600;
+		$fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'-r'.($user->rights->societe->client->voir ? '1' : '0').'.cache';
+		$now = dol_now();
+		$nbofperiod = 3;
 
-        if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
-        $textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
-        $this->info_box_head = array(
-            'text' => $textHead,
-            'limit'=> dol_strlen($textHead),
-        );
+		if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
+		$textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
+		$this->info_box_head = array(
+			'text' => $textHead,
+			'limit'=> dol_strlen($textHead),
+		);
 
-        // compute the year limit to show
-        $tmpdate = dol_time_plus_duree(dol_now(), -1 * $nbofperiod, "m");
+		// compute the year limit to show
+		$tmpdate = dol_time_plus_duree(dol_now(), -1 * $nbofperiod, "m");
 
 
-        // list the summary of the propals
-        if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-        	$propalstatic = new Propal($this->db);
+		// list the summary of the propals
+		if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+			$propalstatic = new Propal($this->db);
 
-        	$cachedir = DOL_DATA_ROOT.'/propale/temp';
-        	$filename = '/boxactivity-propal'.$fileid;
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        	$data = array();
-        	if ($refresh)
-        	{
-        		$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
-        		$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql .= ")";
-        		$sql .= " WHERE p.entity IN (".getEntity('propal').")";
-        		$sql .= " AND p.fk_soc = s.rowid";
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-        		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-        		$sql .= " AND p.datep >= '".$this->db->idate($tmpdate)."'";
-        		$sql .= " AND p.date_cloture IS NULL"; // just unclosed
-        		$sql .= " GROUP BY p.fk_statut";
-        		$sql .= " ORDER BY p.fk_statut DESC";
+			$cachedir = DOL_DATA_ROOT.'/propale/temp';
+			$filename = '/boxactivity-propal'.$fileid;
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$data = array();
+			if ($refresh)
+			{
+				$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ")";
+				$sql .= " WHERE p.entity IN (".getEntity('propal').")";
+				$sql .= " AND p.fk_soc = s.rowid";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				$sql .= " AND p.datep >= '".$this->db->idate($tmpdate)."'";
+				$sql .= " AND p.date_cloture IS NULL"; // just unclosed
+				$sql .= " GROUP BY p.fk_statut";
+				$sql .= " ORDER BY p.fk_statut DESC";
 
-        		$result = $this->db->query($sql);
-        		if ($result)
-        		{
-        			$num = $this->db->num_rows($result);
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$num = $this->db->num_rows($result);
 
-        			$j = 0;
-        			while ($j < $num) {
-        				$data[$j] = $this->db->fetch_object($result);
-        				$j++;
-        			}
-        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$this->db->free($result);
-        		} else {
-        			dol_print_error($this->db);
-        		}
-        	}
-        	else
-        	{
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-        	if (!empty($data))
-        	{
-        		$j = 0;
-        		while ($j < count($data))
-        		{
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
-                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-                        'logo' => 'object_propal'
-        			);
+			if (!empty($data))
+			{
+				$j = 0;
+				while ($j < count($data))
+				{
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
+						'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+						'logo' => 'object_propal'
+					);
 
-        			$this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-        			);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+					);
 
-        			$this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
-        			);
-        			$totalnb += $data[$j]->nb;
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'text' => $data[$j]->nb,
+						'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
+					);
+					$totalnb += $data[$j]->nb;
 
-        			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
-        			);
-        			$this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
-        			);
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+					);
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
+					);
 
-        			$line++;
-        			$j++;
-        		}
-        	}
-        }
+					$line++;
+					$j++;
+				}
+			}
+		}
 
-        // list the summary of the orders
-        if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-            include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-            $commandestatic = new Commande($this->db);
+		// list the summary of the orders
+		if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+			$commandestatic = new Commande($this->db);
 
-            $langs->load("orders");
+			$langs->load("orders");
 
-            $cachedir = DOL_DATA_ROOT.'/commande/temp';
-            $filename = '/boxactivity-order'.$fileid;
-            $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-            $data = array();
+			$cachedir = DOL_DATA_ROOT.'/commande/temp';
+			$filename = '/boxactivity-order'.$fileid;
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$data = array();
 
-            if ($refresh) {
-                $sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
-                $sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-                if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-                $sql .= ")";
-                $sql .= " WHERE c.entity = ".$conf->entity;
-                $sql .= " AND c.fk_soc = s.rowid";
-                if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-                if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-                $sql .= " AND c.date_commande >= '".$this->db->idate($tmpdate)."'";
-                $sql .= " GROUP BY c.fk_statut";
-                $sql .= " ORDER BY c.fk_statut DESC";
+			if ($refresh) {
+				$sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ")";
+				$sql .= " WHERE c.entity IN (".getEntity('commande').")";
+				$sql .= " AND c.fk_soc = s.rowid";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				$sql .= " AND c.date_commande >= '".$this->db->idate($tmpdate)."'";
+				$sql .= " GROUP BY c.fk_statut";
+				$sql .= " ORDER BY c.fk_statut DESC";
 
-                $result = $this->db->query($sql);
-                if ($result) {
-                    $num = $this->db->num_rows($result);
-                    $j = 0;
-                    while ($j < $num) {
-                        $data[$j] = $this->db->fetch_object($result);
-                        $j++;
-                    }
-                    if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-                        dol_filecache($cachedir, $filename, $data);
-                    }
-                    $this->db->free($result);
-                } else {
-                    dol_print_error($this->db);
-                }
-            } else {
-                $data = dol_readcachefile($cachedir, $filename);
-            }
+				$result = $this->db->query($sql);
+				if ($result) {
+					$num = $this->db->num_rows($result);
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-            if (!empty($data)) {
-                $j = 0;
-                while ($j < count($data)) {
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
-                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
-                        'logo' => 'object_order',
-                    );
+			if (!empty($data)) {
+				$j = 0;
+				while ($j < count($data)) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
+						'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
+						'logo' => 'object_order',
+					);
 
-                    $this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
-                    );
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
+					);
 
-                    $this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
-                        'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
-                    );
-                    $totalnb += $data[$j]->nb;
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'text' => $data[$j]->nb,
+						'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
+						'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
+					);
+					$totalnb += $data[$j]->nb;
 
-                    $this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
-                    );
-                    $this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
-                    );
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+					);
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
+					);
 
-                    $line++;
-                    $j++;
-                }
-            }
-        }
+					$line++;
+					$j++;
+				}
+			}
+		}
 
 
-        // list the summary of the bills
-        if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        	$facturestatic = new Facture($this->db);
+		// list the summary of the bills
+		if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$facturestatic = new Facture($this->db);
 
-        	// part 1
-        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
-        	$filename = '/boxactivity-invoice'.$fileid;
+			// part 1
+			$cachedir = DOL_DATA_ROOT.'/facture/temp';
+			$filename = '/boxactivity-invoice'.$fileid;
 
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        	$data = array();
-        	if ($refresh)
-        	{
-        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql .= ")";
-        		$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-        		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-        		$sql .= " AND f.fk_soc = s.rowid";
-        		$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=1";
-        		$sql .= " GROUP BY f.fk_statut";
-        		$sql .= " ORDER BY f.fk_statut DESC";
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$data = array();
+			if ($refresh)
+			{
+				$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ")";
+				$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				$sql .= " AND f.fk_soc = s.rowid";
+				$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=1";
+				$sql .= " GROUP BY f.fk_statut";
+				$sql .= " ORDER BY f.fk_statut DESC";
 
-        		$result = $this->db->query($sql);
-        		if ($result) {
-        			$num = $this->db->num_rows($result);
-        			$j = 0;
-        			while ($j < $num) {
-        				$data[$j] = $this->db->fetch_object($result);
-        				$j++;
-        			}
-        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$this->db->free($result);
-        		} else {
-        			dol_print_error($this->db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
+				$result = $this->db->query($sql);
+				if ($result) {
+					$num = $this->db->num_rows($result);
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-        	if (!empty($data)) {
-        		$j = 0;
-        		while ($j < count($data)) {
-        			$billurl = "search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                        'logo' => 'bill',
-        			);
+			if (!empty($data)) {
+				$j = 0;
+				while ($j < count($data)) {
+					$billurl = "search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+						'logo' => 'bill',
+					);
 
-        			$this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
-        			);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
+					);
 
-        			$this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
-                        'text' => $data[$j]->nb,
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			);
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
+						'text' => $data[$j]->nb,
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+					);
 
-        			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
-        			);
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
+					);
 
-        			// We add only for the current year
-       				$totalnb += $data[$j]->nb;
+					// We add only for the current year
+	   				$totalnb += $data[$j]->nb;
 
-        			$this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
-        			);
-        			$line++;
-        			$j++;
-        		}
-        		if (count($data) == 0)
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-        			);
-        	}
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
+					);
+					$line++;
+					$j++;
+				}
+				if (count($data) == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedInvoices"),
+					);
+			}
 
-        	// part 2
-        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
-        	$filename = '/boxactivity-invoice2'.$fileid;
+			// part 2
+			$cachedir = DOL_DATA_ROOT.'/facture/temp';
+			$filename = '/boxactivity-invoice2'.$fileid;
 
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 
-        	$data = array();
-        	if ($refresh) {
-        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-        		$sql .= " AND f.fk_soc = s.rowid";
-        		$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=0";
-        		$sql .= " GROUP BY f.fk_statut";
-        		$sql .= " ORDER BY f.fk_statut DESC";
+			$data = array();
+			if ($refresh) {
+				$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+				$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
+				$sql .= " AND f.fk_soc = s.rowid";
+				$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=0";
+				$sql .= " GROUP BY f.fk_statut";
+				$sql .= " ORDER BY f.fk_statut DESC";
 
-        		$result = $this->db->query($sql);
-        		if ($result) {
-        			$num = $this->db->num_rows($result);
-        			$j = 0;
-        			while ($j < $num) {
-        				$data[$j] = $this->db->fetch_object($result);
-        				$j++;
-        			}
-        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$this->db->free($result);
-        		} else {
-        			dol_print_error($this->db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
+				$result = $this->db->query($sql);
+				if ($result) {
+					$num = $this->db->num_rows($result);
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-        	if (!empty($data)) {
-        		$alreadypaid = -1;
+			if (!empty($data)) {
+				$alreadypaid = -1;
 
-        		$j = 0;
-        		while ($j < count($data)) {
-        			$billurl = "search_status=".$data[$j]->fk_statut."&amp;paye=0";
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                        'logo' => 'bill',
-        			);
+				$j = 0;
+				while ($j < count($data)) {
+					$billurl = "search_status=".$data[$j]->fk_statut."&amp;paye=0";
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+						'logo' => 'bill',
+					);
 
-        			$this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-        			);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+					);
 
-        			$this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			);
-        			$totalnb += $data[$j]->nb;
-        			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
-        			);
-        			$this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
-        			);
-        			$line++;
-        			$j++;
-        		}
-        		if (count($data) == 0) {
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-                    );
-                }
-        	}
-        }
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'text' => $data[$j]->nb,
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+					);
+					$totalnb += $data[$j]->nb;
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+					);
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
+					);
+					$line++;
+					$j++;
+				}
+				if (count($data) == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedInvoices"),
+					);
+				}
+			}
+		}
 
 		// Add the sum in the bottom of the boxes
 		$this->info_box_contents[$line][0] = array('tr' => 'class="liste_total_wrap"');
@@ -446,19 +444,19 @@ class box_activity extends ModeleBoxes
 		$this->info_box_contents[$line][2] = array('td' => 'class="liste_total right" ', 'text' => $totalnb);
 		$this->info_box_contents[$line][3] = array('td' => 'class="liste_total right" ', 'text' => '');
 		$this->info_box_contents[$line][4] = array('td' => 'class="liste_total right" ', 'text' => "");
-    }
+	}
 
 
-    /**
-     *  Method to show box
-     *
-     *  @param	array	$head       Array with properties of box title
-     *  @param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *  @return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param	array	$head       Array with properties of box title
+	 *  @param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *  @return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 17dd29057b3..e6d032d41f8 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -132,16 +132,14 @@ class box_birthdays extends ModeleBoxes
 				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql)
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 010bf8e7f21..e49d21ba387 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -133,16 +133,14 @@ class box_birthdays_members extends ModeleBoxes
 				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql)
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index f5bbf7021e9..c81e226decb 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -79,9 +79,7 @@ class box_bookmarks extends ModeleBoxes
         if ($user->rights->bookmark->creer) {
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("BookmarksManagement");
-		}
-		else
-		{
+		} else {
 			$this->info_box_head['subpicto'] = 'bookmark';
 			$this->info_box_head['subtext'] = $langs->trans("ListOfBookmark");
 		}
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 70718db55b5..00cad787e0b 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -154,16 +154,14 @@ class box_clients extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql)
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 7672c47880d..d5cc859eaa7 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -105,9 +105,7 @@ class box_external_rss extends ModeleBoxes
         	if ($rssparser->error) $errormessage .= " - ".$rssparser->error;
         	$title .= " ".img_error($errormessage);
             $this->info_box_head = array('text' => $title, 'limit' => 0);
-        }
-        else
-        {
+        } else {
             $this->info_box_head = array(
                 'text' => $title,
                 'sublink' => $link,
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index a374094ea89..f5fe3e76dde 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -186,17 +186,14 @@ class box_factures_imp extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else
-			{
+			} else {
                 $this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 4125ce92eaa..2c104bea729 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -151,18 +151,14 @@ class box_ficheinter extends ModeleBoxes
 				);
 
 				$this->db->free($resql);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else
-		{
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 			    'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 46dfdff6d23..66497c2e94f 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -148,16 +148,14 @@ class box_goodcustomers extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else {
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 				'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index e78b6e235b1..9d5aeda7b36 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -111,9 +111,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -153,9 +151,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -200,9 +196,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -270,13 +264,10 @@ class box_graph_invoices_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover left"', 'maxlength'=>500, 'text' => $mesg);
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 52dcdc995cd..b9fde24b759 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -108,9 +108,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -151,9 +149,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -197,9 +193,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -267,9 +261,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 					$stringtoshow .= '</div>';
 				}
 				$this->info_box_contents[0][0] = array('tr'=>'class="oddeven nohover"', 'td' => 'class="nohover center"', 'textnoformat'=>$stringtoshow);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -277,8 +269,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 45459805f00..2ff1a579798 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -111,9 +111,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -152,9 +150,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -196,9 +192,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -270,9 +264,7 @@ class box_graph_orders_permonth extends ModeleBoxes
                     'td' => 'class="nohover center"',
                     'textnoformat'=>$stringtoshow,
                 );
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -280,8 +272,7 @@ class box_graph_orders_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index 99426be8cb1..fb40ee1f68f 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -110,9 +110,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -151,9 +149,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -195,9 +191,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -269,9 +263,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
                     'td' => 'class="nohover center"',
                     'textnoformat'=>$stringtoshow,
                 );
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -279,8 +271,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index e8337d74303..957277005e7 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -94,9 +94,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			$showinvoicenb = GETPOST($param_showinvoicenb, 'alpha');
 			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
 			$showordernb = GETPOST($param_showordernb, 'alpha');
-		}
-		else
-		{
+		} else {
 			$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 			$year = $tmparray['year'];
 			$showinvoicenb = $tmparray['showinvoicenb'];
@@ -135,66 +133,6 @@ class box_graph_product_distribution extends ModeleBoxes
 		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '160' : '320';
 		$HEIGHT = '192';
 
-		if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
-		{
-			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showinvoicenb)
-			{
-                $langs->load("bills");
-				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-
-				$showpointvalue = 1; $nocolor = 0;
-				$mode = 'customer';
-				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
-				$data1 = $stats_invoice->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), 5);
-
-				if (empty($data1))
-				{
-					$showpointvalue = 0;
-					$nocolor = 1;
-					$data1 = array(array(0=>$langs->trans("None"), 1=>1));
-				}
-				$filenamenb = $dir."/prodserforinvoice-".$year.".png";
-				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=productstats&amp;file=prodserforinvoice-'.$year.'.png';
-
-				$px1 = new DolGraph();
-				$mesg = $px1->isGraphKo();
-				if (!$mesg)
-				{
-					$i = 0; $legend = array();
-
-					foreach ($data1 as $key => $val)
-					{
-						$data1[$key][0] = dol_trunc($data1[$key][0], 32);
-						$legend[] = $data1[$key][0];
-						$i++;
-					}
-
-					$px1->SetData($data1);
-					unset($data1);
-
-					if ($nocolor) $px1->SetDataColor(array(array(220, 220, 220)));
-					$px1->SetLegend($legend);
-					$px1->setShowLegend(2);
-					$px1->setShowPointValue($showpointvalue);
-					$px1->setShowPercent(0);
-					$px1->SetMaxValue($px1->GetCeilMaxValue());
-					//$px1->SetWidth($WIDTH);
-					$px1->SetHeight($HEIGHT);
-					//$px1->SetYLabel($langs->trans("NumberOfBills"));
-					$px1->SetShading(3);
-					$px1->SetHorizTickIncrement(1);
-					$px1->SetCssPrefix("cssboxes");
-					//$px1->mode='depth';
-					$px1->SetType(array('pie'));
-					$px1->SetTitle($langs->trans("ForObject", $langs->transnoentitiesnoconv("Invoices")));
-					$px1->combine = 0.05;
-
-					$px1->draw($filenamenb, $fileurlnb);
-				}
-			}
-		}
-
 		if (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
 		{
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
@@ -314,6 +252,67 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 		}
 
+
+		if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
+		{
+			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
+			if ($showinvoicenb)
+			{
+				$langs->load("bills");
+				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
+
+				$showpointvalue = 1; $nocolor = 0;
+				$mode = 'customer';
+				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
+				$data1 = $stats_invoice->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), 5);
+
+				if (empty($data1))
+				{
+					$showpointvalue = 0;
+					$nocolor = 1;
+					$data1 = array(array(0=>$langs->trans("None"), 1=>1));
+				}
+				$filenamenb = $dir."/prodserforinvoice-".$year.".png";
+				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=productstats&amp;file=prodserforinvoice-'.$year.'.png';
+
+				$px1 = new DolGraph();
+				$mesg = $px1->isGraphKo();
+				if (!$mesg)
+				{
+					$i = 0; $legend = array();
+
+					foreach ($data1 as $key => $val)
+					{
+						$data1[$key][0] = dol_trunc($data1[$key][0], 32);
+						$legend[] = $data1[$key][0];
+						$i++;
+					}
+
+					$px1->SetData($data1);
+					unset($data1);
+
+					if ($nocolor) $px1->SetDataColor(array(array(220, 220, 220)));
+					$px1->SetLegend($legend);
+					$px1->setShowLegend(2);
+					$px1->setShowPointValue($showpointvalue);
+					$px1->setShowPercent(0);
+					$px1->SetMaxValue($px1->GetCeilMaxValue());
+					//$px1->SetWidth($WIDTH);
+					$px1->SetHeight($HEIGHT);
+					//$px1->SetYLabel($langs->trans("NumberOfBills"));
+					$px1->SetShading(3);
+					$px1->SetHorizTickIncrement(1);
+					$px1->SetCssPrefix("cssboxes");
+					//$px1->mode='depth';
+					$px1->SetType(array('pie'));
+					$px1->SetTitle($langs->trans("ForObject", $langs->transnoentitiesnoconv("Invoices")));
+					$px1->combine = 0.05;
+
+					$px1->draw($filenamenb, $fileurlnb);
+				}
+			}
+		}
+
 		if (empty($nbofgraph))
 		{
 		    $langs->load("errors");
@@ -341,11 +340,6 @@ class box_graph_product_distribution extends ModeleBoxes
 			$stringtoshow .= '<input type="hidden" name="action" value="'.$refreshaction.'">';
 			$stringtoshow .= '<input type="hidden" name="page_y" value="">';
 			$stringtoshow .= '<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showinvoicenb,showpropalnb,showordernb">';
-			if (!empty($conf->facture->enabled) || !empty($user->rights->facture->lire))
-			{
-				$stringtoshow .= '<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb ? ' checked' : '').'> '.$langs->trans("ForCustomersInvoices");
-				$stringtoshow .= ' &nbsp; ';
-			}
 			if (!empty($conf->propal->enabled) || !empty($user->rights->propale->lire))
 			{
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb ? ' checked' : '').'> '.$langs->trans("ForProposals");
@@ -355,6 +349,11 @@ class box_graph_product_distribution extends ModeleBoxes
 			{
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb ? ' checked' : '').'> '.$langs->trans("ForCustomersOrders");
 			}
+			if (!empty($conf->facture->enabled) || !empty($user->rights->facture->lire))
+			{
+				$stringtoshow .= '<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb ? ' checked' : '').'> '.$langs->trans("ForCustomersInvoices");
+				$stringtoshow .= ' &nbsp; ';
+			}
 			$stringtoshow .= '<br>';
 			$stringtoshow .= $langs->trans("Year").' <input class="flat" size="4" type="text" name="'.$param_year.'" value="'.$year.'">';
 			$stringtoshow .= '<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto('', 'refresh.png', '', '', 1).'">';
@@ -363,29 +362,29 @@ class box_graph_product_distribution extends ModeleBoxes
 
 			if ($nbofgraph == 1)
 			{
-				if ($showinvoicenb) $stringtoshow .= $px1->show();
-				elseif ($showpropalnb) $stringtoshow .= $px2->show();
-				else $stringtoshow .= $px3->show();
+				if ($showpropalnb) $stringtoshow .= $px2->show();
+				elseif ($showordernb) $stringtoshow .= $px3->show();
+				else $stringtoshow .= $px1->show();
 			}
 			if ($nbofgraph == 2)
 			{
 				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				if ($showinvoicenb) $stringtoshow .= $px1->show();
-				elseif ($showpropalnb) $stringtoshow .= $px2->show();
+				if ($showpropalnb) $stringtoshow .= $px2->show();
+				elseif ($showordernb) $stringtoshow .= $px3->show();
 				$stringtoshow .= '</div><div class="fichehalfright">';
-				if ($showordernb) $stringtoshow .= $px3->show();
-				elseif ($showpropalnb) $stringtoshow .= $px2->show();
+				if ($showinvoicenb) $stringtoshow .= $px1->show();
+				elseif ($showordernb) $stringtoshow .= $px3->show();
 				$stringtoshow .= '</div></div></div>';
 			}
 			if ($nbofgraph == 3)
 			{
 				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				$stringtoshow .= $px1->show();
-				$stringtoshow .= '</div><div class="fichehalfright">';
 				$stringtoshow .= $px2->show();
+				$stringtoshow .= '</div><div class="fichehalfright">';
+				$stringtoshow .= $px3->show();
 				$stringtoshow .= '</div></div></div>';
 				$stringtoshow .= '<div class="fichecenter"><div class="containercenter">';
-				$stringtoshow .= $px3->show();
+				$stringtoshow .= $px1->show();
 				$stringtoshow .= '</div></div>';
 			}
 			$this->info_box_contents[0][0] = array(
@@ -393,9 +392,7 @@ class box_graph_product_distribution extends ModeleBoxes
                 'td' => 'class="nohover center"',
                 'textnoformat'=>$stringtoshow,
             );
-		}
-		else
-		{
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
 				'maxlength'=>500,
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 42b95e516b5..4231638948a 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -111,9 +111,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
-			}
-			else
-			{
+			} else {
 				$tmparray = json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true);
 				$endyear = $tmparray['year'];
 				$shownb = $tmparray['shownb'];
@@ -150,9 +148,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -196,9 +192,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 						if ($startmonth != 1)
 						{
                             $legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
-						}
-						else
-						{
+						} else {
 							$legend[] = $i;
 						}
 						$i++;
@@ -270,9 +264,7 @@ class box_graph_propales_permonth extends ModeleBoxes
                     'td' => 'class="nohover center"',
                     'textnoformat'=>$stringtoshow,
                 );
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'tr'=>'class="oddeven nohover"',
                     'td' => 'class="nohover left"',
@@ -280,8 +272,7 @@ class box_graph_propales_permonth extends ModeleBoxes
                     'text' => $mesg,
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 374e9ab1bae..52591fa5292 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -117,7 +117,7 @@ class box_produits extends ModeleBoxes
 						$sqld = "SELECT label";
 						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld .= " WHERE fk_product=".$objp->rowid;
-						$sqld .= " AND lang='".$langs->getDefaultLang()."'";
+						$sqld .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
 						$sqld .= " LIMIT 1";
 
 						$resultd = $this->db->query($sqld);
@@ -149,8 +149,7 @@ class box_produits extends ModeleBoxes
                     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
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -159,9 +158,7 @@ class box_produits extends ModeleBoxes
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type = $langs->trans("HT");
-							}
-							else
-							{
+							} else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type = $langs->trans("TTC");
 							}
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index dcd95445ddd..6845cb2db5f 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -130,7 +130,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 						$sqld = "SELECT label";
 						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld .= " WHERE fk_product=".$objp->rowid;
-						$sqld .= " AND lang='".$langs->getDefaultLang()."'";
+						$sqld .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
 						$sqld .= " LIMIT 1";
 
 						$resultd = $this->db->query($sqld);
@@ -171,8 +171,7 @@ class box_produits_alerte_stock extends ModeleBoxes
                     {
                         $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
+	                } else //Parse the dynamic price
 	               	{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 	                    $priceparser = new PriceParser($this->db);
@@ -181,9 +180,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 							if ($objp->price_base_type == 'HT')
 							{
 								$price_base_type = $langs->trans("HT");
-							}
-							else
-							{
+							} else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
 								$price_base_type = $langs->trans("TTC");
 							}
@@ -228,17 +225,14 @@ class box_produits_alerte_stock extends ModeleBoxes
                     );
 
 				$this->db->free($result);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
             $this->info_box_contents[0][0] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index c99f07ff311..e8b056322da 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -146,8 +146,7 @@ class box_project extends ModeleBoxes
                                 'td' => 'class="right"',
                                 'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
                             );
-                        else
-                            $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+                        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));
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index 7d6d2b0ee10..d528a4d68ca 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -90,7 +90,7 @@ class box_services_contracts extends ModeleBoxes
 
 			$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 			$sql .= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
-			$sql .= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut, cd.product_type as type, cd.date_fin_validite as date_line,";
+			$sql .= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut as contractline_status, cd.product_type as type, cd.date_fin_validite as date_line,";
 			$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity, p.tobuy, p.tosell";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
@@ -125,6 +125,7 @@ class box_services_contracts extends ModeleBoxes
 					$contractlinestatic->type = $objp->type;
 					$contractlinestatic->product_id = $objp->product_id;
 					$contractlinestatic->product_ref = $objp->product_ref;
+					$contractlinestatic->statut = $objp->contractline_status;
 
 					$contractstatic->id = $objp->rowid;
 					$contractstatic->ref = $objp->ref;
@@ -143,24 +144,7 @@ class box_services_contracts extends ModeleBoxes
 					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
 
 					$dateline = $this->db->jdate($objp->date_line);
-					if ($contractstatic->statut == Contrat::STATUS_VALIDATED && $objp->statut == ContratLigne::STATUS_OPEN && !empty($dateline) && ($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
-
-					// Multilangs
-					if (!empty($conf->global->MAIN_MULTILANGS) && $objp->product_id > 0) // if option multilang is on
-					{
-						$sqld = "SELECT label";
-						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
-						$sqld .= " WHERE fk_product=".$objp->product_id;
-						$sqld .= " AND lang='".$langs->getDefaultLang()."'";
-						$sqld .= " LIMIT 1";
-
-						$resultd = $this->db->query($sqld);
-						if ($resultd)
-						{
-							$objtp = $this->db->fetch_object($resultd);
-							if ($objtp->label != '') $contractlinestatic->label = $objtp->label;
-						}
-					}
+					if ($contractstatic->statut == Contrat::STATUS_VALIDATED && $objp->contractline_status == ContratLigne::STATUS_OPEN && !empty($dateline) && ($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
 
 					// Label
 					if ($objp->product_id > 0)
@@ -190,10 +174,8 @@ class box_services_contracts extends ModeleBoxes
 							$description = ''; // Already added into main visible desc
 						}
 
-						$s = $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
-					}
-					else
-					{
+						$s = $form->textwithtooltip($text, $description, 3, '', '', '', 0, (!empty($objp->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
+					} else {
 						$s = img_object($langs->trans("ShowProductOrService"), ($objp->product_type ? 'service' : 'product')).' '.dol_htmlentitiesbr($objp->description);
 					}
 
@@ -224,7 +206,7 @@ class box_services_contracts extends ModeleBoxes
 
 					$this->info_box_contents[$i][] = array(
                         'td' => 'class="right" width="18"',
-                        'text' => $contractlinestatic->LibStatut($objp->statut, 3)
+						'text' => $contractlinestatic->getLibStatut(3)
 					);
 
 					$i++;
@@ -235,17 +217,14 @@ class box_services_contracts extends ModeleBoxes
 				);
 
 				$this->db->free($result);
-			}
-			else
-			{
+			} else {
 				$this->info_box_contents[0][0] = array(
                     'td' => '',
                     'maxlength' => 500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
 			}
-		}
-		else {
+		} else {
 			$this->info_box_contents[0][0] = array(
 			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 94b4764eeae..d7b3433f6d2 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -170,18 +170,14 @@ class box_services_expired extends ModeleBoxes
     			}
 
 				$this->db->free($resql);
-    		}
-    		else
-    		{
+    		} else {
     			$this->info_box_contents[0][] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($this->db->error().' sql='.$sql),
                 );
     		}
-    	}
-    	else
-    	{
+    	} else {
     		$this->info_box_contents[0][0] = array(
     		    'td' => 'class="nohover opacitymedium left"',
     		    'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 27700f193c9..cdc1dd51440 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -167,9 +167,7 @@ class box_supplier_orders extends ModeleBoxes
                     'text' => ($this->db->error().' sql='.$sql),
                 );
             }
-        }
-        else
-        {
+        } else {
             $this->info_box_contents[0][] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 86a2b7b3086..54b8955d519 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -173,9 +173,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
                     'text' => ($this->db->error().' sql='.$sql),
                 );
             }
-        }
-        else
-        {
+        } else {
             $this->info_box_contents[0][] = array(
                 'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index f9a974ae1c5..c1d728eb667 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -93,15 +93,13 @@ class box_task extends ModeleBoxes
         $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 = $_COOKIE[$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') {
+        } elseif ($filterValue == 'im_project_contact') {
             $textHead .= ' : '.$langs->trans("WhichIamLinkedToProject");
         }
 
@@ -156,11 +154,10 @@ class box_task extends ModeleBoxes
 			$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 = '".$user->id."' )";
+                $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 = '".$user->id."' )";
+            } 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' )";
             }
 
@@ -192,7 +189,7 @@ class box_task extends ModeleBoxes
                     $projectstatic->ref = $objp->project_ref;
                     $projectstatic->title = $objp->project_title;
 
-                    $label = $projectstatic->getNomUrl(1).' '.$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);
 
diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
new file mode 100644
index 00000000000..b4eddf5f18d
--- /dev/null
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -0,0 +1,204 @@
+<?php
+/* Copyright (C) 2012-2014 Charles-François BENKE <charles.fr@benke.fr>
+ * Copyright (C) 2014      Marcos García          <marcosgdf@gmail.com>
+ * Copyright (C) 2015      Frederic France        <frederic.france@free.fr>
+ * Copyright (C) 2016      Juan José Menent       <jmenent@2byte.es>
+ * Copyright (C) 2020      Pierre Ardoin          <mapiolca@me.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/core/boxes/box_validated_projects.php
+ *  \ingroup    projet
+ *  \brief      Module to show validated projects whose tasks are assigned to the connected person, without any time entered by the connected person
+ */
+include_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
+
+/**
+ * Class to manage the box to show last projet
+ */
+class box_validated_projects extends ModeleBoxes
+{
+    public $boxcode="validated_project";
+    public $boximg="object_projectpub";
+    public $boxlabel;
+    //var $depends = array("projet");
+
+    /**
+     * @var DoliDB Database handler.
+     */
+    public $db;
+
+    public $param;
+
+    public $info_box_head = array();
+    public $info_box_contents = array();
+
+    public $enabled = 1;
+
+
+    /**
+     *  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'));
+
+        $this->db = $db;
+        $this->boxlabel = "ProjectsWithTask";
+
+        $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;
+
+        $this->max=$max;
+
+        $totalMnt = 0;
+        $totalnb = 0;
+        $totalnbTask=0;
+
+        $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);
+
+            $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);
+
+            // 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;
+				$this->info_box_contents[$i][] = array(
+					'td' => 'class="nowraponall"',
+					'text' => "Reference projet",
+				);
+				$this->info_box_contents[$i][] = array(
+					'td' => 'class="center"',
+					'text' => 'Client',
+				);
+				$this->info_box_contents[$i][] = array(
+					'td' => 'class="center"',
+					'text' => 'Date debut de projet',
+				);
+				$this->info_box_contents[$i][] = array(
+					'td' => 'class="center"',
+					'text' => 'Nombre de mes tâches sans temps saisi',
+				);
+				$i++;
+
+                while ($i < min($num+1, $max+1)) {
+                    $objp = $this->db->fetch_object($result);
+
+                    $projectstatic->id = $objp->rowid;
+                    $projectstatic->ref = $objp->ref;
+
+                    $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' => ''
+                    	);
+                    }
+
+                    $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"),
+						'asis' => 1,
+                    );
+                    $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);
+    }
+}
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 01fbcdef47b..fd179dec7b6 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -143,10 +143,10 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 		global $conf;
 
 		// Recupere liste des boites d'un user si ce dernier a sa propre liste
-		$sql = "SELECT b.rowid, b.box_id, b.position, b.box_order, b.fk_user";
+		$sql = "SELECT b.rowid as id, b.box_id, b.position, b.box_order, b.fk_user";
 		$sql .= " FROM ".MAIN_DB_PREFIX."boxes as b";
 		$sql .= " WHERE b.entity = ".$conf->entity;
-		$sql .= " AND b.rowid = ".$rowid;
+		$sql .= " AND b.rowid = ".((int) $rowid);
 		dol_syslog(get_class($this)."::fetch rowid=".$rowid);
 
 		$resql = $this->db->query($sql);
@@ -155,47 +155,21 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			$obj = $this->db->fetch_object($resql);
 			if ($obj)
 			{
-				$this->rowid = $obj->rowid;
+				$this->id = $obj->id;
+				$this->rowid = $obj->id;	// For backward compatibility
 				$this->box_id = $obj->box_id;
 				$this->position = $obj->position;
 				$this->box_order = $obj->box_order;
 				$this->fk_user = $obj->fk_user;
 				return 1;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
 
-
-	/**
-	 * Standard method to get content of a box
-	 *
-	 * @param   array   $head       Array with properties of box title
-	 * @param   array   $contents   Array with properties of box lines
-	 *
-	 * @return  string
-	 */
-	public function outputBox($head = null, $contents = null)
-	{
-		global $langs, $user, $conf;
-
-		// Trick to get result into a var from a function that makes print instead of return
-		// TODO Replace ob_start with param nooutput=1 into showBox
-		ob_start();
-		$result = $this->showBox($head, $contents);
-		$output = ob_get_contents();
-		ob_end_clean();
-
-		return $output;
-	}
-
 	/**
 	 * Standard method to show a box (usage by boxes not mandatory, a box can still use its own showBox function)
 	 *
@@ -426,6 +400,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			{
 				while (($file = readdir($handle)) !== false)
 				{
+					$reg = array();
 					if (is_readable($newdir.'/'.$file) && preg_match('/^(.+)\.php/', $file, $reg))
 					{
 						if (preg_match('/\.back$/', $file)) continue;
@@ -438,13 +413,10 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 						{
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget", $modName, "").'</div>';
-						}
-						else
-						{
+						} else {
 							try {
 								include_once $newdir.'/'.$file;
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								print $e->getMessage();
 							}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 709b0f25189..bb8086f9b90 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -32,7 +32,7 @@
 
 /**
  *	Class to send emails (with attachments or not)
- *  Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext);
+ *  Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext,$replyto);
  *         $mailfile->sendfile();
  */
 class CMailFile
@@ -41,47 +41,47 @@ class CMailFile
 	public $sendmode;
 	public $sendsetup;
 
-    public $subject; // Topic:       Subject of email
-    public $addr_from; // From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
+	public $subject; // Topic:       Subject of email
+	public $addr_from; // From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
 	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
 	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
 	// Return-Path: Email where to send bounds.
-    public $reply_to; // Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
-    public $errors_to; // Errors-To:	Email where to send errors.
-    public $addr_to;
-    public $addr_cc;
-    public $addr_bcc;
-    public $trackid;
+	public $reply_to; // Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
+	public $errors_to; // Errors-To:	Email where to send errors.
+	public $addr_to;
+	public $addr_cc;
+	public $addr_bcc;
+	public $trackid;
 
-    public $mixed_boundary;
-    public $related_boundary;
-    public $alternative_boundary;
-    public $deliveryreceipt;
+	public $mixed_boundary;
+	public $related_boundary;
+	public $alternative_boundary;
+	public $deliveryreceipt;
 
-    public $eol;
-    public $eol2;
+	public $eol;
+	public $eol2;
 
 	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    public $smtps; // Contains SMTPs object (if this method is used)
-    public $phpmailer; // Contains PHPMailer object (if this method is used)
+	public $smtps; // Contains SMTPs object (if this method is used)
+	public $phpmailer; // Contains PHPMailer object (if this method is used)
 
 	/**
 	 * @var string CSS
 	 */
 	public $css;
 	//! Defined css style for body background
-    public $styleCSS;
+	public $styleCSS;
 	//! Defined background directly in body tag
-    public $bodyCSS;
+	public $bodyCSS;
 
-    public $msgid;
-    public $headers;
-    public $message;
-    /**
+	public $msgid;
+	public $headers;
+	public $message;
+	/**
 	 * @var array fullfilenames list (full path of filename on file system)
 	 */
 	public $filename_list = array();
@@ -95,21 +95,21 @@ class CMailFile
 	public $mimefilename_list = array();
 
 	// Image
-    public $html;
-    public $image_boundary;
-    public $atleastoneimage = 0; // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
-    public $html_images = array();
-    public $images_encoded = array();
-    public $image_types = array(
-        'gif'  => 'image/gif',
+	public $html;
+	public $image_boundary;
+	public $atleastoneimage = 0; // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
+	public $html_images = array();
+	public $images_encoded = array();
+	public $image_types = array(
+		'gif'  => 'image/gif',
 		'jpg'  => 'image/jpeg',
 		'jpeg' => 'image/jpeg',
 		'jpe'  => 'image/jpeg',
 		'bmp'  => 'image/bmp',
 		'png'  => 'image/png',
 		'tif'  => 'image/tiff',
-        'tiff' => 'image/tiff',
-    );
+		'tiff' => 'image/tiff',
+	);
 
 
 	/**
@@ -147,7 +147,7 @@ class CMailFile
 		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
 		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 
-        $this->subject = $subject;
+		$this->subject = $subject;
 		$this->addr_to = $to;
 		$this->addr_from = $from;
 		$this->msg = $msg;
@@ -168,9 +168,13 @@ class CMailFile
 
 		// Define this->sendmode
 		$this->sendmode = '';
-		if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
-		{
-			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
+		if (!empty($this->sendcontext)) {
+			$smtpContextKey = strtoupper($this->sendcontext);
+			$keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey;
+			$smtpContextSendMode = $conf->global->{$keyForSMTPSendMode};
+			if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') {
+				$this->sendmode = $smtpContextSendMode;
+			}
 		}
 		if (empty($this->sendmode)) $this->sendmode = $conf->global->MAIN_MAIL_SENDMODE;
 		if (empty($this->sendmode)) $this->sendmode = 'mail';
@@ -195,7 +199,7 @@ class CMailFile
 		// On defini alternative_boundary
 		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contains special chars)
 
-		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
+		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, replyto=$replyto trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
 		dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
 
 		if (empty($subject))
@@ -206,8 +210,8 @@ class CMailFile
 		}
 		if (empty($msg))
 		{
-		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
-		    $msg = '.'; // Avoid empty message (with empty message content, you will see a multipart structure)
+			dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
+			$msg = '.'; // Avoid empty message (with empty message content, you will see a multipart structure)
 		}
 
 		// Detect if message is HTML (use fast method)
@@ -215,9 +219,7 @@ class CMailFile
 		{
 			$this->msgishtml = 0;
 			if (dol_textishtml($msg)) $this->msgishtml = 1;
-		}
-		else
-		{
+		} else {
 			$this->msgishtml = $msgishtml;
 		}
 
@@ -270,9 +272,6 @@ class CMailFile
 			}
 		}
 
-		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
-
 		$this->addr_to = $to;
 		$this->addr_cc = $addr_cc;
 		$this->addr_bcc = $addr_bcc;
@@ -290,6 +289,21 @@ class CMailFile
 			$this->addr_bcc = '';
 		}
 
+		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) {
+			$addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		}
+
+		$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') {
+				$keyforsslseflsigned  ='MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_' . $smtpContextKey;
+			}
+		}
+
 		// We set all data according to choosed sending method.
 		// We also set a value for ->msgid
 		if ($this->sendmode == 'mail')
@@ -339,8 +353,7 @@ class CMailFile
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message .= $text_body.$files_encoded;
 			$this->message .= "--".$this->mixed_boundary."--".$this->eol;
-		}
-		elseif ($this->sendmode == 'smtps')
+		} elseif ($this->sendmode == 'smtps')
 		{
 			// Use SMTPS library
 			// ------------------------------------------
@@ -359,7 +372,7 @@ class CMailFile
 			$smtps->setTO($this->getValidAddress($this->addr_to, 0, 1));
 			$smtps->setFrom($this->getValidAddress($this->addr_from, 0, 1));
 			$smtps->setTrackId($this->trackid);
-			$smtps->setReplyTo($this->getValidAddress($this->replyto, 0, 1));
+			$smtps->setReplyTo($this->getValidAddress($this->reply_to, 0, 1));
 
 			if (!empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
 
@@ -401,79 +414,91 @@ class CMailFile
 			$smtps->setBCC($this->addr_bcc);
 			$smtps->setErrorsTo($this->errors_to);
 			$smtps->setDeliveryReceipt($this->deliveryreceipt);
+			if (!empty($conf->global->$keyforsslseflsigned)) $smtps->setOptions(array('ssl' => array('verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true)));
 
 			$host = dol_getprefix('email');
 			$this->msgid = time().'.SMTPs-dolibarr-'.$this->trackid.'@'.$host;
 
 			$this->smtps = $smtps;
-		}
-		elseif ($this->sendmode == 'swiftmailer')
-		{
+		} elseif ($this->sendmode == 'swiftmailer') {
 			// Use Swift Mailer library
-            $host = dol_getprefix('email');
+			$host = dol_getprefix('email');
 
-            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php';
+			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php';
 
-            // egulias autoloader lib
-            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/autoload.php';
+			// egulias autoloader lib
+			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/autoload.php';
 
-            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
-            // Create the message
-            //$this->message = Swift_Message::newInstance();
-            $this->message = new Swift_Message();
-            //$this->message = new Swift_SignedMessage();
-            // Adding a trackid header to a message
-            $headers = $this->message->getHeaders();
-            $headers->addTextHeader('X-Dolibarr-TRACKID', $this->trackid.'@'.$host);
-            $this->msgid = time().'.swiftmailer-dolibarr-'.$this->trackid.'@'.$host;
-            $headerID = $this->msgid;
-            $msgid = $headers->get('Message-ID');
-            $msgid->setId($headerID);
-            $headers->addIdHeader('References', $headerID);
-            // TODO if (! empty($moreinheader)) ...
+			// Create the message
+			//$this->message = Swift_Message::newInstance();
+			$this->message = new Swift_Message();
+			//$this->message = new Swift_SignedMessage();
+			// Adding a trackid header to a message
+			$headers = $this->message->getHeaders();
+			$headers->addTextHeader('X-Dolibarr-TRACKID', $this->trackid.'@'.$host);
+			$this->msgid = time().'.swiftmailer-dolibarr-'.$this->trackid.'@'.$host;
+			$headerID = $this->msgid;
+			$msgid = $headers->get('Message-ID');
+			$msgid->setId($headerID);
+			$headers->addIdHeader('References', $headerID);
+			// TODO if (! empty($moreinheader)) ...
 
-            // Give the message a subject
-            try {
-                $result = $this->message->setSubject($this->subject);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-            }
+			// Give the message a subject
+			try {
+				$result = $this->message->setSubject($this->subject);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+			}
 
-            // Set the From address with an associative array
-            //$this->message->setFrom(array('john@doe.com' => 'John Doe'));
-            if (! empty($this->addr_from)) {
-                try {
-                    $result = $this->message->setFrom($this->getArrayAddress($this->addr_from));
-                } catch (Exception $e) {
-                    $this->errors[] = $e->getMessage();
-                }
-            }
+			// Set the From address with an associative array
+			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));
+			if (!empty($this->addr_from)) {
+				try {
+					if (!empty($conf->global->MAIN_FORCE_DISABLE_MAIL_SPOOFING)) {
+						// Prevent email spoofing for smtp server with a strict configuration
+						$regexp = '/([a-z0-9_\.\-\+])+\@(([a-z0-9\-])+\.)+([a-z0-9]{2,4})+/i'; // This regular expression extracts all emails from a string
+						$emailMatchs = preg_match_all($regexp, $from, $adressEmailFrom);
+						$adressEmailFrom = reset($adressEmailFrom);
+						if ($emailMatchs !== false && filter_var($conf->global->MAIN_MAIL_SMTPS_ID, FILTER_VALIDATE_EMAIL) && $conf->global->MAIN_MAIL_SMTPS_ID !== $adressEmailFrom)
+						{
+							$result = $this->message->setFrom($conf->global->MAIN_MAIL_SMTPS_ID);
+						} else {
+							$result = $this->message->setFrom($this->getArrayAddress($this->addr_from));
+						}
+					} else {
+						$result = $this->message->setFrom($this->getArrayAddress($this->addr_from));
+					}
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+				}
+			}
 
-            // Set the To addresses with an associative array
-            if (! empty($this->addr_to)) {
-                try {
-                    $result = $this->message->setTo($this->getArrayAddress($this->addr_to));
-                } catch (Exception $e) {
-                    $this->errors[] = $e->getMessage();
-                }
-            }
+			// Set the To addresses with an associative array
+			if (!empty($this->addr_to)) {
+				try {
+					$result = $this->message->setTo($this->getArrayAddress($this->addr_to));
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+				}
+			}
 
-            if (! empty($this->reply_to)) {
-                try {
-                	$result = $this->message->SetReplyTo($this->getArrayAddress($this->reply_to));
-                } catch (Exception $e) {
-                    $this->errors[] = $e->getMessage();
-                }
-            }
+			if (!empty($this->reply_to)) {
+				try {
+					$result = $this->message->SetReplyTo($this->getArrayAddress($this->reply_to));
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+				}
+			}
 
-            try {
-                $result = $this->message->setCharSet($conf->file->character_set_client);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-            }
+			try {
+				$result = $this->message->setCharSet($conf->file->character_set_client);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+			}
 
-            if (!empty($this->html)) {
+			if (!empty($this->html)) {
 				if (!empty($css)) {
 					$this->css = $css;
 					$this->buildCSS();
@@ -518,13 +543,11 @@ class CMailFile
 				}
 			}
 
-			if (! empty($this->addr_cc)) $this->message->setCc($this->getArrayAddress($this->addr_cc));
-			if (! empty($this->addr_bcc)) $this->message->setBcc($this->getArrayAddress($this->addr_bcc));
-			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
+			if (!empty($this->addr_cc)) $this->message->setCc($this->getArrayAddress($this->addr_cc));
+			if (!empty($this->addr_bcc)) $this->message->setBcc($this->getArrayAddress($this->addr_bcc));
+			//if (! empty($this->errors_to)) $this->message->setErrorsTo($this->getArrayAddress($this->errors_to));
 			if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($this->addr_from));
-		}
-		else
-		{
+		} else {
 			// Send mail method not correctly defined
 			// --------------------------------------
 			$this->error = 'Bad value for sendmode';
@@ -569,26 +592,26 @@ class CMailFile
 			$sendingmode = $this->sendmode;
 			if ($this->context == 'emailing' && !empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
 			{
-			    // List of sending methods
-			    $listofmethods = array();
-			    $listofmethods['mail'] = 'PHP mail function';
-			    //$listofmethods['simplemail']='Simplemail class';
-			    $listofmethods['smtps'] = 'SMTP/SMTPS socket library';
+				// List of sending methods
+				$listofmethods = array();
+				$listofmethods['mail'] = 'PHP mail function';
+				//$listofmethods['simplemail']='Simplemail class';
+				$listofmethods['smtps'] = 'SMTP/SMTPS socket library';
 
-			    // EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
-			    // You ensure that every user is using its own SMTP server when using the mass emailing module.
-			    $linktoadminemailbefore = '<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
-			    $linktoadminemailend = '</a>';
-			    $this->error = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);
-			    $this->errors[] = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);
-			    $this->error .= '<br>'.$langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);
-			    $this->errors[] = $langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);
-			    if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS))
-			    {
-			        $this->error .= '<br>'.$langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);
-			        $this->errors[] = $langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);
-			    }
-                return false;
+				// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
+				// You ensure that every user is using its own SMTP server when using the mass emailing module.
+				$linktoadminemailbefore = '<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
+				$linktoadminemailend = '</a>';
+				$this->error = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);
+				$this->errors[] = $langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]);
+				$this->error .= '<br>'.$langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);
+				$this->errors[] = $langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']);
+				if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS))
+				{
+					$this->error .= '<br>'.$langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);
+					$this->errors[] = $langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS);
+				}
+				return false;
 			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
@@ -630,14 +653,20 @@ class CMailFile
 			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
 			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
 			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
-			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
-			{
-				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+			$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;
+				}
 			}
 
 			// Action according to choosed sending method
@@ -723,9 +752,7 @@ class CMailFile
 						$this->error .= ".<br>";
 						$this->error .= $langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					}
-					else
-					{
+					} else {
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 					}
 				}
@@ -738,8 +765,7 @@ class CMailFile
 				// Restore parameters
 				if (!empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
 				if (!empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
-			}
-			elseif ($this->sendmode == 'smtps')
+			} elseif ($this->sendmode == 'smtps')
 			{
 				if (!is_object($this->smtps))
 				{
@@ -810,20 +836,17 @@ class CMailFile
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 						$res = true;
-					}
-					else
-					{
+					} else {
 						if (empty($this->error)) $this->error = $result;
 						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - ".$this->error, LOG_ERR);
 						$res = false;
 					}
 				}
-			}
-			elseif ($this->sendmode == 'swiftmailer')
+			} elseif ($this->sendmode == 'swiftmailer')
 			{
-                // Use Swift Mailer library
-                // ------------------------------------------
-                require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+				// Use Swift Mailer library
+				// ------------------------------------------
+				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
 				// Clean parameters
 				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');
@@ -839,25 +862,26 @@ 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)));;
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Switch content encoding to base64 - avoid the doubledot issue with quoted-printable
-                $contentEncoderBase64 = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
-                $this->message->setEncoder($contentEncoderBase64);
+				$contentEncoderBase64 = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
+				$this->message->setEncoder($contentEncoderBase64);
 
 				// Create the Mailer using your created Transport
 				$this->mailer = new Swift_Mailer($this->transport);
 
-                // DKIM SIGN
-                if ($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED) {
-                    $privateKey = $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY;
-                    $domainName = $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN;
-                    $selector = $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR;
-                    $signer = new Swift_Signers_DKIMSigner($privateKey, $domainName, $selector);
-                    $this->message->attachSigner($signer->ignoreHeader('Return-Path'));
-                }
+				// DKIM SIGN
+				if ($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED) {
+					$privateKey = $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY;
+					$domainName = $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN;
+					$selector = $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR;
+					$signer = new Swift_Signers_DKIMSigner($privateKey, $domainName, $selector);
+					$this->message->attachSigner($signer->ignoreHeader('Return-Path'));
+				}
 
-                if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+				if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
 					// To use the ArrayLogger
 					$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
 					// Or to use the Echo Logger
@@ -876,14 +900,10 @@ class CMailFile
 				if (!empty($this->error) || !$result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
-				}
-				else
-				{
+				} else {
 					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 				}
-			}
-			else
-			{
+			} else {
 				// Send mail method not correctly defined
 				// --------------------------------------
 
@@ -899,9 +919,7 @@ class CMailFile
 
 				return $reshook;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
 		}
@@ -923,7 +941,7 @@ class CMailFile
 		return '=?'.$conf->file->character_set_client.'?B?'.base64_encode($stringtoencode).'?=';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Read a file on disk and return encoded content for emails (mode = 'mail')
 	 *
@@ -932,7 +950,7 @@ class CMailFile
 	 */
 	private function _encode_file($sourcefile)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$newsourcefile = dol_osencode($sourcefile);
 
 		if (is_readable($newsourcefile))
@@ -940,9 +958,7 @@ class CMailFile
 			$contents = file_get_contents($newsourcefile); // Need PHP 4.3
 			$encoded = chunk_split(base64_encode($contents), 76, $this->eol); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
 			return -1;
@@ -950,7 +966,7 @@ class CMailFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Write content of a SMTP request into a dump file (mode = all)
 	 *  Used for debugging.
@@ -960,7 +976,7 @@ class CMailFile
 	 */
 	public function dump_mail()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $dolibarr_main_data_root;
 
 		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
@@ -973,12 +989,10 @@ class CMailFile
 				fputs($fp, $this->headers);
 				fputs($fp, $this->eol); // This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
-			}
-			elseif ($this->sendmode == 'smtps')
+			} elseif ($this->sendmode == 'smtps')
 			{
 				fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-			elseif ($this->sendmode == 'swiftmailer')
+			} elseif ($this->sendmode == 'swiftmailer')
 			{
 				fputs($fp, $this->logger->dump()); // this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
@@ -1007,9 +1021,7 @@ class CMailFile
 			$out .= ">";
 			$out .= $msg;
 			$out .= "</body></html>";
-		}
-		else
-		{
+		} else {
 			$out = $msg;
 		}
 
@@ -1045,7 +1057,7 @@ class CMailFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Create SMTP headers (mode = 'mail')
 	 *
@@ -1053,7 +1065,7 @@ class CMailFile
 	 */
 	public function write_smtpheaders()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$out = "";
 
@@ -1090,9 +1102,7 @@ class CMailFile
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2; // Uppercase seems replaced by phpmail
 			$out .= 'References: <'.$this->msgid.">".$this->eol2;
 			$out .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host.$this->eol2;
-		}
-		else
-		{
+		} else {
 			$this->msgid = time().'.phpmail@'.$host;
 			$out .= 'Message-ID: <'.$this->msgid.">".$this->eol2;
 		}
@@ -1111,7 +1121,7 @@ class CMailFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Create header MIME (mode = 'mail')
 	 *
@@ -1121,7 +1131,7 @@ class CMailFile
 	 */
 	public function write_mimeheaders($filename_list, $mimefilename_list)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$mimedone = 0;
 		$out = "";
 
@@ -1142,7 +1152,7 @@ class CMailFile
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return email content (mode = 'mail')
 	 *
@@ -1151,7 +1161,7 @@ class CMailFile
 	 */
 	public function write_body($msgtext)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$out = '';
@@ -1221,9 +1231,7 @@ class CMailFile
 			{
 				$out .= "--".$this->alternative_boundary."--".$this->eol;
 			}
-		}
-		else
-		{
+		} else {
 			$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
 			$out .= $this->eol.$strContent.$this->eol;
@@ -1244,7 +1252,7 @@ class CMailFile
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Attach file to email (mode = 'mail')
 	 *
@@ -1255,7 +1263,7 @@ class CMailFile
 	 */
 	public function write_files($filename_list, $mimetype_list, $mimefilename_list)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$out = '';
 
 		$filename_list_size = count($filename_list);
@@ -1281,9 +1289,7 @@ class CMailFile
 					$out .= $encoded;
 					$out .= $this->eol;
 					//$out.= $this->eol;
-				}
-				else
-				{
+				} else {
 					return $encoded;
 				}
 			}
@@ -1293,7 +1299,7 @@ class CMailFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Attach an image to email (mode = 'mail')
 	 *
@@ -1302,7 +1308,7 @@ class CMailFile
 	 */
 	public function write_images($images_list)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$out = '';
 
 		if (is_array($images_list))
@@ -1326,7 +1332,7 @@ class CMailFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Try to create a socket connection
 	 *
@@ -1336,7 +1342,7 @@ class CMailFile
 	 */
 	public function check_server_port($host, $port)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$_retVal = 0;
@@ -1367,7 +1373,7 @@ class CMailFile
 
 			dol_syslog("Try socket connection to host=".$host." port=".$port);
 			//See if we can connect to the SMTP server
-            if ($socket = @fsockopen(
+			if ($socket = @fsockopen(
 					$host, // Host to test, IP or domain. Add ssl:// for SSL/TLS.
 					$port, // which Port number to use
 					$errno, // actual system level error
@@ -1381,16 +1387,14 @@ class CMailFile
 
 				// Check response from Server
 				if ($_retVal = $this->server_parse($socket, "220")) $_retVal = $socket;
-			}
-			else
-			{
+			} else {
 				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);
 			}
 		}
 		return $_retVal;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * This function has been modified as provided by SirSir to allow multiline responses when
 	 * using SMTP Extensions.
@@ -1401,7 +1405,7 @@ class CMailFile
 	 */
 	public function server_parse($socket, $response)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$_retVal = true; // Indicates if Object was created or not
 		$server_response = '';
 
@@ -1503,16 +1507,12 @@ class CMailFile
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -1529,8 +1529,8 @@ class CMailFile
 	 *										     If format 2: 'john@doe.com'
 	 *										     If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
 	 *                                           If format 4: 'John Doe' or 'john@doe.com' if no label exists
-     *                                           If format 5: <a href="mailto:john@doe.com">John Doe</a> or <a href="mailto:john@doe.com">john@doe.com</a> if no label exists
-     * @see getArrayAddress()
+	 *                                           If format 5: <a href="mailto:john@doe.com">John Doe</a> or <a href="mailto:john@doe.com">john@doe.com</a> if no label exists
+	 * @see getArrayAddress()
 	 */
 	public static function getValidAddress($address, $format, $encode = 0, $maxnumberofemail = 0)
 	{
@@ -1549,9 +1549,7 @@ class CMailFile
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
-			{
+			} else {
 				$name  = '';
 				$email = trim($val);
 			}
@@ -1561,10 +1559,10 @@ class CMailFile
 				$i++;
 
 				$newemail = '';
-                if ($format == 5) {
-                    $newemail = $name ? $name : $email;
-                    $newemail = '<a href="mailto:'.$email.'">'.$newemail.'</a>';
-                }
+				if ($format == 5) {
+					$newemail = $name ? $name : $email;
+					$newemail = '<a href="mailto:'.$email.'">'.$newemail.'</a>';
+				}
 				if ($format == 4)
 				{
 					$newemail = $name ? $name : $email;
@@ -1620,9 +1618,7 @@ class CMailFile
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
-			{
+			} else {
 				$name  = null;
 				$email = trim($val);
 			}
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 4cd06a81233..4f1959d2707 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -131,7 +131,7 @@ class CSMSFile
                 $sms->nostop = $this->nostop;
 
                 $sms->socid = $this->socid;
-                $sms->contactid = $this->contactid;
+                $sms->contact_id = $this->contact_id;
                 $sms->project = $this->fk_project;
 
                 $res = $sms->SmsSend();
@@ -140,21 +140,17 @@ class CSMSFile
 				{
 					$this->error = $sms->error;
 					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-				}
-				else
-				{
+				} 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);
 				}
-			}
-		    elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+			} 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
-		        {
+		        try {
 		            $classname = ucfirst($classfile);
 		            $sms = new $classname($this->db);
 		            $sms->expe = $this->addr_from;
@@ -166,7 +162,7 @@ class CSMSFile
 		            $sms->nostop = $this->nostop;
 
 		            $sms->socid = $this->socid;
-		            $sms->contactid = $this->contactid;
+		            $sms->contact_id = $this->contact_id;
 		            $sms->fk_project = $this->fk_project;
 
                     $res = $sms->SmsSend();
@@ -176,29 +172,22 @@ class CSMSFile
     				if ($res <= 0)
     				{
     					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
-    				}
-    				else
-    				{
+    				} 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)
+		        } catch (Exception $e)
 		        {
 		            dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
 		        }
-		    }
-			else
-			{
+		    } else {
 				// Send sms method not correctly defined
 				// --------------------------------------
 
 				return 'Bad value for MAIN_SMS_SENDMODE constant';
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'No sms sent. Feature is disabled by option MAIN_DISABLE_ALL_SMS';
 			dol_syslog("CSMSFile::sendfile: ".$this->error, LOG_WARNING);
 		}
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index a70a2f9cafc..cf671eb57ca 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -138,9 +138,7 @@ class Ccountry // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -184,13 +182,10 @@ class Ccountry // extends CommonObject
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -243,9 +238,7 @@ class Ccountry // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -283,9 +276,7 @@ class Ccountry // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index eff934b635f..a083576aacb 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -156,9 +156,7 @@ class Comment extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -216,9 +214,7 @@ class Comment extends CommonObject
 
 			if ($num_rows) return 1;
 			else return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -280,9 +276,7 @@ class Comment extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -355,25 +349,25 @@ class Comment extends CommonObject
 			$sql .= " c.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
 			$sql .= " WHERE c.fk_element = ".$fk_element;
-			$sql .= " AND c.element_type = '".$db->escape($element_type)."'";
+			$sql .= " AND c.element_type = '".$this->db->escape($element_type)."'";
 			$sql .= " AND c.entity = ".$conf->entity;
 			$sql .= " ORDER BY c.tms DESC";
 
 			dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-			$resql = $db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$num_rows = $db->num_rows($resql);
+				$num_rows = $this->db->num_rows($resql);
 				if ($num_rows > 0)
 				{
-					while ($obj = $db->fetch_object($resql))
+					while ($obj = $this->db->fetch_object($resql))
 					{
 						$comment = new self($db);
 						$comment->fetch($obj->rowid);
 						$this->comments[] = $comment;
 					}
 				}
-				$db->free($resql);
+				$this->db->free($resql);
 			} else {
 				$this->errors[] = "Error ".$this->db->lasterror();
 				return -1;
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 544cc105416..6015bbceece 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -40,199 +40,199 @@ abstract class CommonDocGenerator
 	 */
 	public $error = '';
 
-    /**
-     * @var string[]    Array of error strings
-     */
-    public $errors = array();
+	/**
+	 * @var string[]    Array of error strings
+	 */
+	public $errors = array();
 
 	/**
-     * @var DoliDB Database handler.
-     */
+	 * @var DoliDB Database handler.
+	 */
 	protected $db;
 
-    /**
-     * @var Extrafields object
-     */
+	/**
+	 * @var Extrafields object
+	 */
 	public $extrafieldsCache;
 
 	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-	*/
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   User		$user           User
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_user($user, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   User		$user           User
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_user($user, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
+		$logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
 
-        return array(
-            'myuser_lastname'=>$user->lastname,
-            'myuser_firstname'=>$user->firstname,
-            'myuser_fullname'=>$user->getFullName($outputlangs, 1),
-            'myuser_login'=>$user->login,
-            'myuser_phone'=>$user->office_phone,
-       		'myuser_address'=>$user->address,
-       		'myuser_zip'=>$user->zip,
-       		'myuser_town'=>$user->town,
-       		'myuser_country'=>$user->country,
-        	'myuser_country_code'=>$user->country_code,
-       		'myuser_state'=>$user->state,
-        	'myuser_state_code'=>$user->state_code,
-        	'myuser_fax'=>$user->office_fax,
-            'myuser_mobile'=>$user->user_mobile,
-            'myuser_email'=>$user->email,
-        	'myuser_logo'=>$logotouse,
-        	'myuser_job'=>$user->job,
-            'myuser_web'=>''	// url not exist in $user object
-        );
-    }
+		return array(
+			'myuser_lastname'=>$user->lastname,
+			'myuser_firstname'=>$user->firstname,
+			'myuser_fullname'=>$user->getFullName($outputlangs, 1),
+			'myuser_login'=>$user->login,
+			'myuser_phone'=>$user->office_phone,
+	   		'myuser_address'=>$user->address,
+	   		'myuser_zip'=>$user->zip,
+	   		'myuser_town'=>$user->town,
+	   		'myuser_country'=>$user->country,
+			'myuser_country_code'=>$user->country_code,
+	   		'myuser_state'=>$user->state,
+			'myuser_state_code'=>$user->state_code,
+			'myuser_fax'=>$user->office_fax,
+			'myuser_mobile'=>$user->user_mobile,
+			'myuser_email'=>$user->email,
+			'myuser_logo'=>$logotouse,
+			'myuser_job'=>$user->job,
+			'myuser_web'=>''	// url not exist in $user object
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Societe		$mysoc			Object thirdparty
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_mysoc($mysoc, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Societe		$mysoc			Object thirdparty
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_mysoc($mysoc, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-        if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))
-        {
-            $mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);
-        }
-        if (empty($mysoc->country) && !empty($mysoc->country_code))
-        {
-        	$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
-        }
-        if (empty($mysoc->state) && !empty($mysoc->state_code))
-        {
-        	$mysoc->state = getState($mysoc->state_code, 0);
-        }
+		if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))
+		{
+			$mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);
+		}
+		if (empty($mysoc->country) && !empty($mysoc->country_code))
+		{
+			$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
+		}
+		if (empty($mysoc->state) && !empty($mysoc->state_code))
+		{
+			$mysoc->state = getState($mysoc->state_code, 0);
+		}
 
-        $logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+		$logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
 
-        return array(
-            'mycompany_logo'=>$logotouse,
-            'mycompany_name'=>$mysoc->name,
-            'mycompany_email'=>$mysoc->email,
-            'mycompany_phone'=>$mysoc->phone,
-            'mycompany_fax'=>$mysoc->fax,
-            'mycompany_address'=>$mysoc->address,
-            'mycompany_zip'=>$mysoc->zip,
-            'mycompany_town'=>$mysoc->town,
-            'mycompany_country'=>$mysoc->country,
-            'mycompany_country_code'=>$mysoc->country_code,
-            'mycompany_state'=>$mysoc->state,
-            'mycompany_state_code'=>$mysoc->state_code,
-        	'mycompany_web'=>$mysoc->url,
-            'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
-            'mycompany_managers'=>$mysoc->managers,
-            'mycompany_capital'=>$mysoc->capital,
-            'mycompany_barcode'=>$mysoc->barcode,
-            'mycompany_idprof1'=>$mysoc->idprof1,
-            'mycompany_idprof2'=>$mysoc->idprof2,
-            'mycompany_idprof3'=>$mysoc->idprof3,
-            'mycompany_idprof4'=>$mysoc->idprof4,
-            'mycompany_idprof5'=>$mysoc->idprof5,
-            'mycompany_idprof6'=>$mysoc->idprof6,
-        	'mycompany_vatnumber'=>$mysoc->tva_intra,
+		return array(
+			'mycompany_logo'=>$logotouse,
+			'mycompany_name'=>$mysoc->name,
+			'mycompany_email'=>$mysoc->email,
+			'mycompany_phone'=>$mysoc->phone,
+			'mycompany_fax'=>$mysoc->fax,
+			'mycompany_address'=>$mysoc->address,
+			'mycompany_zip'=>$mysoc->zip,
+			'mycompany_town'=>$mysoc->town,
+			'mycompany_country'=>$mysoc->country,
+			'mycompany_country_code'=>$mysoc->country_code,
+			'mycompany_state'=>$mysoc->state,
+			'mycompany_state_code'=>$mysoc->state_code,
+			'mycompany_web'=>$mysoc->url,
+			'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
+			'mycompany_managers'=>$mysoc->managers,
+			'mycompany_capital'=>$mysoc->capital,
+			'mycompany_barcode'=>$mysoc->barcode,
+			'mycompany_idprof1'=>$mysoc->idprof1,
+			'mycompany_idprof2'=>$mysoc->idprof2,
+			'mycompany_idprof3'=>$mysoc->idprof3,
+			'mycompany_idprof4'=>$mysoc->idprof4,
+			'mycompany_idprof5'=>$mysoc->idprof5,
+			'mycompany_idprof6'=>$mysoc->idprof6,
+			'mycompany_vatnumber'=>$mysoc->tva_intra,
 			'mycompany_object'=>$mysoc->object,
-            'mycompany_note_private'=>$mysoc->note_private,
-            //'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
-        );
-    }
+			'mycompany_note_private'=>$mysoc->note_private,
+			//'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param	Societe		$object			Object
-     * @param   Translate	$outputlangs    Language object for output
-     * @param   string		$array_key	    Name of the key for return array
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_thirdparty($object, $outputlangs, $array_key = 'company')
-    {
-        // phpcs:enable
-        global $conf, $extrafields;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param	Societe		$object			Object
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @param   string		$array_key	    Name of the key for return array
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_thirdparty($object, $outputlangs, $array_key = 'company')
+	{
+		// phpcs:enable
+		global $conf, $extrafields;
 
-        if (empty($object->country) && !empty($object->country_code))
-        {
-        	$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
-        }
-        if (empty($object->state) && !empty($object->state_code))
-        {
-        	$object->state = getState($object->state_code, 0);
-        }
+		if (empty($object->country) && !empty($object->country_code))
+		{
+			$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
+		}
+		if (empty($object->state) && !empty($object->state_code))
+		{
+			$object->state = getState($object->state_code, 0);
+		}
 
-        $array_thirdparty = array(
-            'company_name'=>$object->name,
-	        'company_name_alias' => $object->name_alias,
-            'company_email'=>$object->email,
-            'company_phone'=>$object->phone,
-            'company_fax'=>$object->fax,
-            'company_address'=>$object->address,
-            'company_zip'=>$object->zip,
-            'company_town'=>$object->town,
-            'company_country'=>$object->country,
-        	'company_country_code'=>$object->country_code,
-            'company_state'=>$object->state,
-        	'company_state_code'=>$object->state_code,
-        	'company_web'=>$object->url,
-            'company_barcode'=>$object->barcode,
-            'company_vatnumber'=>$object->tva_intra,
-            'company_customercode'=>$object->code_client,
-            'company_suppliercode'=>$object->code_fournisseur,
-            'company_customeraccountancycode'=>$object->code_compta,
-            'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
-            'company_juridicalstatus'=>$object->forme_juridique,
-            'company_outstanding_limit'=>$object->outstanding_limit,
-            'company_capital'=>$object->capital,
-            'company_idprof1'=>$object->idprof1,
-            'company_idprof2'=>$object->idprof2,
-            'company_idprof3'=>$object->idprof3,
-            'company_idprof4'=>$object->idprof4,
-            'company_idprof5'=>$object->idprof5,
-            'company_idprof6'=>$object->idprof6,
-            'company_note_public'=>$object->note_public,
-            'company_note_private'=>$object->note_private,
-        	'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
-        	'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
-        );
+		$array_thirdparty = array(
+			'company_name'=>$object->name,
+			'company_name_alias' => $object->name_alias,
+			'company_email'=>$object->email,
+			'company_phone'=>$object->phone,
+			'company_fax'=>$object->fax,
+			'company_address'=>$object->address,
+			'company_zip'=>$object->zip,
+			'company_town'=>$object->town,
+			'company_country'=>$object->country,
+			'company_country_code'=>$object->country_code,
+			'company_state'=>$object->state,
+			'company_state_code'=>$object->state_code,
+			'company_web'=>$object->url,
+			'company_barcode'=>$object->barcode,
+			'company_vatnumber'=>$object->tva_intra,
+			'company_customercode'=>$object->code_client,
+			'company_suppliercode'=>$object->code_fournisseur,
+			'company_customeraccountancycode'=>$object->code_compta,
+			'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
+			'company_juridicalstatus'=>$object->forme_juridique,
+			'company_outstanding_limit'=>$object->outstanding_limit,
+			'company_capital'=>$object->capital,
+			'company_idprof1'=>$object->idprof1,
+			'company_idprof2'=>$object->idprof2,
+			'company_idprof3'=>$object->idprof3,
+			'company_idprof4'=>$object->idprof4,
+			'company_idprof5'=>$object->idprof5,
+			'company_idprof6'=>$object->idprof6,
+			'company_note_public'=>$object->note_public,
+			'company_note_private'=>$object->note_private,
+			'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
+			'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
+		);
 
-	    // Retrieve extrafields
-	    if (is_array($object->array_options) && count($object->array_options))
-	    {
-		    $object->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$object->fetch_optionals();
 
-		    $array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);
-	    }
+			$array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);
+		}
 		return $array_thirdparty;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
@@ -241,9 +241,9 @@ abstract class CommonDocGenerator
 	 * @param   string		$array_key	    Name of the key for return array
 	 * @return	array 						Array of substitution key->code
 	 */
-    public function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')
-    {
-        // phpcs:enable
+	public function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
 		global $conf, $extrafields;
 
 		if (empty($object->country) && !empty($object->country_code))
@@ -285,67 +285,67 @@ abstract class CommonDocGenerator
 			$array_key.'_civility' => $object->civility,
 		);
 
-	    // Retrieve extrafields
-	    if (is_array($object->array_options) && count($object->array_options))
-	    {
-		    $object->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$object->fetch_optionals();
 
-		    $array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);
-	    }
+			$array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);
+		}
 		return $array_contact;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_other($outputlangs)
-    {
-        // phpcs:enable
-    	global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_other($outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-    	$now = dol_now('gmt'); // gmt
-    	$array_other = array(
-    	    // Date in default language
-    	    'current_date'=>dol_print_date($now, 'day', 'tzuser'),
-    	    'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
+		$now = dol_now('gmt'); // gmt
+		$array_other = array(
+			// Date in default language
+			'current_date'=>dol_print_date($now, 'day', 'tzuser'),
+			'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
    			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),
    			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),
-    	    // Date in requested output language
-    	    'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
+			// Date in requested output language
+			'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
    			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
    			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),
    			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
-    	);
+		);
 
 
-    	foreach ($conf->global as $key => $val)
-    	{
-    		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
-    		else $newval = $val;
-    		$array_other['__['.$key.']__'] = $newval;
-    	}
+		foreach ($conf->global as $key => $val)
+		{
+			if (isASecretKey($key)) $newval = '*****forbidden*****';
+			else $newval = $val;
+			$array_other['__['.$key.']__'] = $newval;
+		}
 
-    	return $array_other;
-    }
+		return $array_other;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
 	 * @param   Object			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   string		    $array_key	        Name of the key for return array
+	 * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
 	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $extrafields;
 
 		$sumpayed = $sumdeposit = $sumcreditnote = '';
@@ -381,11 +381,11 @@ abstract class CommonDocGenerator
 		$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
 		$array_key.'_source_invoice_ref'=>$invoice_source->ref,
 		// Dates
-        $array_key.'_hour'=>dol_print_date($date, 'hour'),
+		$array_key.'_hour'=>dol_print_date($date, 'hour'),
 		$array_key.'_date'=>dol_print_date($date, 'day'),
 		$array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'),
 		$array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ?dol_print_date($object->date_lim_reglement, 'day') : ''),
-	    $array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''),
+		$array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''),
 		$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
 		$array_key.'_date_modification'=>(!empty($object->date_modification) ?dol_print_date($object->date_modification, 'day') : ''),
 		$array_key.'_date_validation'=>(!empty($object->date_validation) ?dol_print_date($object->date_validation, 'dayhour') : ''),
@@ -397,6 +397,8 @@ abstract class CommonDocGenerator
 		$array_key.'_payment_term_code'=>$object->cond_reglement_code,
 		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
 
+		$array_key.'_incoterms'=>(method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
+
 		$array_key.'_bank_iban'=>$bank_account->iban,
 		$array_key.'_bank_bic'=>$bank_account->bic,
 
@@ -414,8 +416,8 @@ abstract class CommonDocGenerator
 
 		$array_key.'_multicurrency_code' => price2num($object->multicurrency_code),
 		$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
-	    $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
-	    $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
+		$array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
+		$array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
 		$array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),
 		$array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),
 		$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
@@ -470,11 +472,11 @@ abstract class CommonDocGenerator
 			$totalUp = 0;
 			foreach ($object->lines as $line)
 			{
-			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
+				// $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
 				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx] = price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
-			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
+				// $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated = vatrate($line->tva_tx);
 				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated] = 0;
 				$resarray[$array_key.'_total_vat_'.$vatformated] += $line->total_tva;
@@ -512,7 +514,7 @@ abstract class CommonDocGenerator
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -523,7 +525,7 @@ abstract class CommonDocGenerator
 	 */
 	public function get_substitutionarray_lines($line, $outputlangs, $linenumber = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$resarray = array(
@@ -535,9 +537,9 @@ abstract class CommonDocGenerator
 			'line_product_type'=>$line->product_type,
 			'line_desc'=>$line->desc,
 			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
-		    'line_localtax1_rate'=>vatrate($line->localtax1_tx),
-		    'line_localtax2_rate'=>vatrate($line->localtax1_tx),
-		    'line_up'=>price2num($line->subprice),
+			'line_localtax1_rate'=>vatrate($line->localtax1_tx),
+			'line_localtax2_rate'=>vatrate($line->localtax1_tx),
+			'line_up'=>price2num($line->subprice),
 			'line_up_locale'=>price($line->subprice, 0, $outputlangs),
 			'line_total_up'=>price2num($line->subprice * $line->qty),
 			'line_total_up_locale'=>price($line->subprice * $line->qty, 0, $outputlangs),
@@ -549,31 +551,31 @@ abstract class CommonDocGenerator
 			'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
 			'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
 			'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
-		    // Dates
+			// Dates
 			'line_date_start'=>dol_print_date($line->date_start, 'day'),
 			'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzserver', $outputlangs),
-		    'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),
-		    'line_date_end'=>dol_print_date($line->date_end, 'day'),
-		    'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
-		    'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),
+			'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),
+			'line_date_end'=>dol_print_date($line->date_end, 'day'),
+			'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
+			'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),
 
-		    'line_multicurrency_code' => price2num($line->multicurrency_code),
-		    'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
-		    'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
-		    'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
-		    'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
-		    'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
-		    'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
-		    'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
-		    'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
+			'line_multicurrency_code' => price2num($line->multicurrency_code),
+			'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
+			'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
+			'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
+			'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
+			'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
+			'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
+			'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
+			'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
 		);
 
-        // Units
+		// Units
 		if ($conf->global->PRODUCT_USE_UNITS)
 		{
-		      $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
-		      $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
-        }
+			  $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
+			  $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
+		}
 
 		// Retrieve extrafields
 		$extrafieldkey = $line->table_element;
@@ -583,14 +585,14 @@ abstract class CommonDocGenerator
 		$extrafields->fetch_name_optionals_label($extrafieldkey, true);
 		$line->fetch_optionals();
 
-        $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
 
-        // Check if the current line belongs to a supplier order
-        if (get_class($line) == 'CommandeFournisseurLigne')
-        {
-            // Add the product supplier extrafields to the substitutions
-            $extrafields->fetch_name_optionals_label("product_fournisseur_price");
-            $extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
+		// Check if the current line belongs to a supplier order
+		if (get_class($line) == 'CommandeFournisseurLigne')
+		{
+			// Add the product supplier extrafields to the substitutions
+			$extrafields->fetch_name_optionals_label("product_fournisseur_price");
+			$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
 
 			if (!empty($extralabels) && is_array($extralabels))
 			{
@@ -604,7 +606,7 @@ abstract class CommonDocGenerator
 				if ($columns != "")
 				{
 					$columns = substr($columns, 0, strlen($columns) - 2);
-					$resql = $this->db->query("SELECT $columns FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields AS ex INNER JOIN ".MAIN_DB_PREFIX."product_fournisseur_price AS f ON ex.fk_object = f.rowid WHERE f.ref_fourn = '".$line->ref_supplier."'");
+					$resql = $this->db->query("SELECT ".$columns." FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields AS ex INNER JOIN ".MAIN_DB_PREFIX."product_fournisseur_price AS f ON ex.fk_object = f.rowid WHERE f.ref_fourn = '".$this->db->escape($line->ref_supplier)."'");
 
 					if ($this->db->num_rows($resql) > 0)
 					{
@@ -617,7 +619,7 @@ abstract class CommonDocGenerator
 					}
 				}
 			}
-        }
+		}
 
 		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
 		if (isset($line->fk_product) && $line->fk_product > 0)
@@ -631,158 +633,158 @@ abstract class CommonDocGenerator
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Expedition		$object             Main object to use as data source
-     * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   array			$array_key	        Name of the key for return array
-     * @return	array								Array of substitution
-     */
-    public function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')
-    {
-        // phpcs:enable
-    	global $conf, $extrafields;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Expedition		$object             Main object to use as data source
+	 * @param   Translate		$outputlangs        Lang object to use for output
+	 * @param   array			$array_key	        Name of the key for return array
+	 * @return	array								Array of substitution
+	 */
+	public function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
+		global $conf, $extrafields;
 		dol_include_once('/core/lib/product.lib.php');
 		$object->list_delivery_methods($object->shipping_method_id);
 		$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
 
-    	$array_shipment = array(
-	    	$array_key.'_id'=>$object->id,
-	    	$array_key.'_ref'=>$object->ref,
-	    	$array_key.'_ref_ext'=>$object->ref_ext,
-	    	$array_key.'_ref_customer'=>$object->ref_customer,
-	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
-	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
-	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
-	    	$array_key.'_total_ht'=>price($object->total_ht),
-	    	$array_key.'_total_vat'=>price($object->total_tva),
-	    	$array_key.'_total_ttc'=>price($object->total_ttc),
-	    	$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
-	    	$array_key.'_note_private'=>$object->note_private,
-	    	$array_key.'_note'=>$object->note_public,
-	    	$array_key.'_tracking_number'=>$object->tracking_number,
-	    	$array_key.'_tracking_url'=>$object->tracking_url,
-	    	$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
-    		$array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
-    		$array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
-    		$array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
-    		$array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
-	    	$array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),
-    	);
+		$array_shipment = array(
+			$array_key.'_id'=>$object->id,
+			$array_key.'_ref'=>$object->ref,
+			$array_key.'_ref_ext'=>$object->ref_ext,
+			$array_key.'_ref_customer'=>$object->ref_customer,
+			$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
+			$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
+			$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
+			$array_key.'_total_ht'=>price($object->total_ht),
+			$array_key.'_total_vat'=>price($object->total_tva),
+			$array_key.'_total_ttc'=>price($object->total_ttc),
+			$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
+			$array_key.'_note_private'=>$object->note_private,
+			$array_key.'_note'=>$object->note_public,
+			$array_key.'_tracking_number'=>$object->tracking_number,
+			$array_key.'_tracking_url'=>$object->tracking_url,
+			$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
+			$array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
+			$array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
+			$array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
+			$array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
+			$array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),
+		);
 
-    	// Add vat by rates
-    	foreach ($object->lines as $line)
-    	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
-    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
-    	}
+		// Add vat by rates
+		foreach ($object->lines as $line)
+		{
+			if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+			$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
+		}
 
-	    // Retrieve extrafields
-	    if (is_array($object->array_options) && count($object->array_options))
-	    {
-		    $object->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$object->fetch_optionals();
 
-		    $array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
-	    }
+			$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
+		}
 
-    	return $array_shipment;
-    }
+		return $array_shipment;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Define array with couple substitution key => substitution value
-     *
-     *	@param  ExpeditionLigne	$line				Object line
-     *	@param  Translate		$outputlangs        Lang object to use for output
-     *	@return	array								Substitution array
-     */
-    public function get_substitutionarray_shipment_lines($line, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
-        dol_include_once('/core/lib/product.lib.php');
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Define array with couple substitution key => substitution value
+	 *
+	 *	@param  ExpeditionLigne	$line				Object line
+	 *	@param  Translate		$outputlangs        Lang object to use for output
+	 *	@return	array								Substitution array
+	 */
+	public function get_substitutionarray_shipment_lines($line, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
+		dol_include_once('/core/lib/product.lib.php');
 
-        $resarray = array(
-	    	'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
-	    	'line_product_ref'=>$line->product_ref,
-	    	'line_product_label'=>$line->product_label,
-	    	'line_desc'=>$line->desc,
-	    	'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
-	    	'line_up'=>price($line->subprice),
-            'line_total_up'=>price($line->subprice * $line->qty),
-	    	'line_qty'=>$line->qty,
-	    	'line_qty_shipped'=>$line->qty_shipped,
-	    	'line_qty_asked'=>$line->qty_asked,
-	    	'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
-	    	'line_price_ht'=>price($line->total_ht),
-	    	'line_price_ttc'=>price($line->total_ttc),
-	    	'line_price_vat'=>price($line->total_tva),
-        	'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuringUnitString(0, 'weight', $line->weight_units),
-        	'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuringUnitString(0, 'size', $line->length_units),
-        	'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuringUnitString(0, 'surface', $line->surface_units),
-        	'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuringUnitString(0, 'volume', $line->volume_units),
-    	);
+		$resarray = array(
+			'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
+			'line_product_ref'=>$line->product_ref,
+			'line_product_label'=>$line->product_label,
+			'line_desc'=>$line->desc,
+			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
+			'line_up'=>price($line->subprice),
+			'line_total_up'=>price($line->subprice * $line->qty),
+			'line_qty'=>$line->qty,
+			'line_qty_shipped'=>$line->qty_shipped,
+			'line_qty_asked'=>$line->qty_asked,
+			'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
+			'line_price_ht'=>price($line->total_ht),
+			'line_price_ttc'=>price($line->total_ttc),
+			'line_price_vat'=>price($line->total_tva),
+			'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuringUnitString(0, 'weight', $line->weight_units),
+			'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuringUnitString(0, 'size', $line->length_units),
+			'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuringUnitString(0, 'surface', $line->surface_units),
+			'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuringUnitString(0, 'volume', $line->volume_units),
+		);
 
-        // Retrieve extrafields
-        $extrafieldkey = $line->element;
-        $array_key = "line";
-        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        $extrafields = new ExtraFields($this->db);
-        $extrafields->fetch_name_optionals_label($extrafieldkey, true);
-        $line->fetch_optionals();
+		// Retrieve extrafields
+		$extrafieldkey = $line->element;
+		$array_key = "line";
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$extrafields = new ExtraFields($this->db);
+		$extrafields->fetch_name_optionals_label($extrafieldkey, true);
+		$line->fetch_optionals();
 
-        $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
 
-        return $resarray;
-    }
+		return $resarray;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Object		$object    		Dolibarr Object
-     * @param   Translate	$outputlangs    Language object for output
-     * @param   boolean		$recursive    	Want to fetch child array or child object
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)
-    {
-        // phpcs:enable
-        $array_other = array();
-        if (!empty($object)) {
-            foreach ($object as $key => $value) {
-                if (!empty($value)) {
-                    if (!is_array($value) && !is_object($value)) {
-                        $array_other['object_'.$key] = $value;
-                    }
-                    if (is_array($value) && $recursive) {
-                        $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);
-                    }
-                }
-            }
-        }
-        return $array_other;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Object		$object    		Dolibarr Object
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @param   boolean		$recursive    	Want to fetch child array or child object
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)
+	{
+		// phpcs:enable
+		$array_other = array();
+		if (!empty($object)) {
+			foreach ($object as $key => $value) {
+				if (!empty($value)) {
+					if (!is_array($value) && !is_object($value)) {
+						$array_other['object_'.$key] = $value;
+					}
+					if (is_array($value) && $recursive) {
+						$array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);
+					}
+				}
+			}
+		}
+		return $array_other;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Fill array with couple extrafield key => extrafield value
-     *
-     *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)
-     *	@param  array			$array_to_fill      Substitution array
-     *  @param  Extrafields		$extrafields        Extrafields object
-     *  @param  string			$array_key	        Prefix for name of the keys into returned array
-     *  @param  Translate		$outputlangs        Lang object to use for output
-     *	@return	array								Substitution array
-     */
-    public function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Fill array with couple extrafield key => extrafield value
+	 *
+	 *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)
+	 *	@param  array			$array_to_fill      Substitution array
+	 *  @param  Extrafields		$extrafields        Extrafields object
+	 *  @param  string			$array_key	        Prefix for name of the keys into returned array
+	 *  @param  Translate		$outputlangs        Lang object to use for output
+	 *	@return	array								Substitution array
+	 */
+	public function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)
+	{
+		// phpcs:enable
 		global $conf;
 
 		if (is_array($extrafields->attributes[$object->table_element]['label'])) {
@@ -794,12 +796,10 @@ abstract class CommonDocGenerator
 					$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);
 					//Add value to store price with currency
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select')
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select')
 				{
 					$object->array_options['options_'.$key] = $extrafields->attributes[$object->table_element]['param'][$key]['options'][$object->array_options['options_'.$key]];
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {
 					$valArray = explode(',', $object->array_options['options_'.$key]);
 					$output = array();
 					foreach ($extrafields->attributes[$object->table_element]['param'][$key]['options'] as $keyopt=>$valopt) {
@@ -808,8 +808,7 @@ abstract class CommonDocGenerator
 						}
 					}
 					$object->array_options['options_'.$key] = implode(', ', $output);
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date')
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date')
 				{
 					if (strlen($object->array_options['options_'.$key]) > 0)
 					{
@@ -817,17 +816,14 @@ abstract class CommonDocGenerator
 						$object->array_options['options_'.$key] = dol_print_date($date, 'day'); // using company output language
 						$object->array_options['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format
 						$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date, 'dayrfc'); // international format
-					}
-					else
-					{
+					} else {
 						$object->array_options['options_'.$key] = '';
 						$object->array_options['options_'.$key.'_locale'] = '';
 						$object->array_options['options_'.$key.'_rfc'] = '';
 					}
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-				}
-				elseif ($extrafields->attributes[$object->table_element]['label'][$key] == 'datetime')
+				} elseif ($extrafields->attributes[$object->table_element]['label'][$key] == 'datetime')
 				{
 					$datetime = $object->array_options['options_'.$key];
 					$object->array_options['options_'.$key] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour') : ''); // using company output language
@@ -835,8 +831,7 @@ abstract class CommonDocGenerator
 					$object->array_options['options_'.$key.'_rfc'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhourrfc') : ''); // international format
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-				}
-				elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link')
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link')
 				{
 					$id = $object->array_options['options_'.$key];
 					if ($id != "")
@@ -880,677 +875,671 @@ abstract class CommonDocGenerator
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
-    {
-        if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
-        $pdf->line($x + $l, $y, $x + $l, $y + $h);
-        if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
-        $pdf->line($x, $y + $h, $x, $y);
-    }
-
-
-    /**
-     *  uasort callback function to Sort columns fields
-     *
-     *  @param	array			$a    			PDF lines array fields configs
-     *  @param	array			$b    			PDF lines array fields configs
-     *  @return	int								Return compare result
-     */
-    public function columnSort($a, $b)
-    {
-        if (empty($a['rank'])) { $a['rank'] = 0; }
-        if (empty($b['rank'])) { $b['rank'] = 0; }
-        if ($a['rank'] == $b['rank']) {
-            return 0;
-        }
-        return ($a['rank'] > $b['rank']) ? -1 : 1;
-    }
-
-    /**
-     *   	Prepare Array Column Field
-     *
-     *   	@param	object			$object				common object
-     *   	@param	Translate		$outputlangs		langs
-     *      @param	int				$hidedetails		Do not show line details
-     *      @param	int				$hidedesc			Do not show desc
-     *      @param	int				$hideref			Do not show ref
-     *      @return	null
-     */
-    public function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-        global $conf;
-
-        $this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-
-        // Sorting
-        uasort($this->cols, array($this, 'columnSort'));
-
-        // Positionning
-        $curX = $this->page_largeur - $this->marge_droite; // start from right
-
-        // Array width
-        $arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;
-
-        // Count flexible column
-        $totalDefinedColWidth = 0;
-        $countFlexCol = 0;
-        foreach ($this->cols as $colKey =>& $colDef)
-        {
-            if (!$this->getColumnStatus($colKey)) continue; // continue if disabled
-
-            if (!empty($colDef['scale'])) {
-                // In case of column width is defined by percentage
-                $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);
-            }
-
-            if (empty($colDef['width'])) {
-                $countFlexCol++;
-            }
-            else {
-                $totalDefinedColWidth += $colDef['width'];
-            }
-        }
-
-        foreach ($this->cols as $colKey =>& $colDef)
-        {
-            // setting empty conf with default
-            if (!empty($colDef['title'])) {
-                $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
-            }
-            else {
-                $colDef['title'] = $this->defaultTitlesFieldsStyle;
-            }
-
-            // setting empty conf with default
-            if (!empty($colDef['content'])) {
-                $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
-            }
-            else {
-                $colDef['content'] = $this->defaultContentsFieldsStyle;
-            }
-
-            if ($this->getColumnStatus($colKey))
-            {
-                // In case of flexible column
-                if (empty($colDef['width'])) {
-                    $colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;
-                }
-
-                // Set positions
-                $lastX = $curX;
-                $curX = $lastX - $colDef['width'];
-                $colDef['xStartPos'] = $curX;
-                $colDef['xEndPos']   = $lastX;
-            }
-        }
-    }
-
-    /**
-     *  get column content width from column key
-     *
-     *  @param	string      $colKey     the column key
-     *  @return	float                   width in mm
-     */
-    public function getColumnContentWidth($colKey)
-    {
-        $colDef = $this->cols[$colKey];
-        return  $colDef['width'] - $colDef['content']['padding'][3] - $colDef['content']['padding'][1];
-    }
-
-
-    /**
-     *  get column content X (abscissa) left position from column key
-     *
-     *  @param	string    $colKey    		the column key
-     *  @return	float      X position in mm
-     */
-    public function getColumnContentXStart($colKey)
-    {
-        $colDef = $this->cols[$colKey];
-        return  $colDef['xStartPos'] + $colDef['content']['padding'][3];
-    }
-
-    /**
-     *   	get column position rank from column key
-     *
-     *   	@param	string		$colKey    		the column key
-     *      @return	int         rank on success and -1 on error
-     */
-    public function getColumnRank($colKey)
-    {
-        if (!isset($this->cols[$colKey]['rank'])) return -1;
-        return  $this->cols[$colKey]['rank'];
-    }
-
-    /**
-     *  get column position rank from column key
-     *
-     *  @param	string		$newColKey    	the new column key
-     *  @param	array		$defArray    	a single column definition array
-     *  @param	string		$targetCol    	target column used to place the new column beside
-     *  @param	bool		$insertAfterTarget    	insert before or after target column ?
-     *  @return	int         new rank on success and -1 on error
-     */
-    public function insertNewColumnDef($newColKey, $defArray, $targetCol = false, $insertAfterTarget = false)
-    {
-        // prepare wanted rank
-        $rank = -1;
-
-        // try to get rank from target column
-        if (!empty($targetCol)) {
-            $rank = $this->getColumnRank($targetCol);
-            if ($rank >= 0 && $insertAfterTarget) { $rank++; }
-        }
-
-        // get rank from new column definition
-        if ($rank < 0 && !empty($defArray['rank'])) {
-            $rank = $defArray['rank'];
-        }
-
-        // error: no rank
-        if ($rank < 0) { return -1; }
-
-        foreach ($this->cols as $colKey =>& $colDef)
-        {
-            if ($rank <= $colDef['rank'])
-            {
-                $colDef['rank'] = $colDef['rank'] + 1;
-            }
-        }
-
-        $defArray['rank'] = $rank;
-        $this->cols[$newColKey] = $defArray; // array_replace is used to preserve keys
-
-        return $rank;
-    }
-
-
-    /**
-     *  print standard column content
-     *
-     *  @param	TCPDF		    $pdf    	pdf object
-     *  @param	float		$curY    	curent Y position
-     *  @param	string		$colKey    	the column key
-     *  @param	string		$columnText   column text
-     *  @return	null
-     */
-    public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
-    {
-        global $hookmanager;
-
-        $parameters = array(
-            'curY' => &$curY,
-            'columnText' => $columnText,
-            'colKey' => $colKey,
-            'pdf' => &$pdf,
-        );
-        $reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        if (!$reshook)
-        {
-            if (empty($columnText)) return;
-            $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
-            $colDef = $this->cols[$colKey];
-            // save curent cell padding
-			$curentCellPaddinds = $pdf->getCellPaddings();
-            // set cell padding with column content definition
-			$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
-            $pdf->writeHTMLCell($colDef['width'], 2, $colDef['xStartPos'], $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
-
-            // restore cell padding
-			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
-        }
-    }
-
-
-    /**
-     *  print description column content
-     *
-     *  @param	TCPDF		$pdf    	pdf object
-     *  @param	float		$curY    	curent Y position
-     *  @param	string		$colKey    	the column key
-     *  @param  object      $object CommonObject
-     *  @param  int         $i  the $object->lines array key
-     *  @param  Translate $outputlangs    Output language
-     *  @param  int $hideref hide ref
-     *  @param  int $hidedesc hide desc
-     *  @param  int $issupplierline if object need supplier product
-     *  @return null
-     */
-    public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
+	public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
 	{
-        // load desc col params
-        $colDef = $this->cols[$colKey];
-        // save curent cell padding
-        $curentCellPaddinds = $pdf->getCellPaddings();
-        // set cell padding with column content definition
-        $pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
-
-        // line description
-        pdf_writelinedesc($pdf, $object, $i, $outputlangs, $colDef['width'], 3, $colDef['xStartPos'], $curY, $hideref, $hidedesc, $issupplierline);
-        $posYAfterDescription = $pdf->GetY() - $colDef['content']['padding'][0];
-
-        // restore cell padding
-        $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
-
-        // Display extrafield if needed
-        $params = array(
-            'display'         => 'list',
-            'printableEnable' => array(3),
-            'printableEnableNotEmpty' => array(4)
-        );
-        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-        if (!empty($extrafieldDesc)) {
-            $this->printStdColumnContent($pdf, $posYAfterDescription, $colKey, $extrafieldDesc);
-        }
-    }
-
-    /**
-     *  get extrafield content for pdf writeHtmlCell compatibility
-     *  usage for PDF line columns and object note block
-     *
-     *  @param	object		$object     common object
-     *  @param	string		$extrafieldKey    	the extrafield key
-     *  @return	string
-     */
-    public function getExtrafieldContent($object, $extrafieldKey)
-    {
-        global $hookmanager;
-
-        if (empty($object->table_element)) { return; }
-
-        $extrafieldsKeyPrefix = "options_";
-
-        // Cleanup extrafield key to remove prefix if present
-        $pos = strpos($extrafieldKey, $extrafieldsKeyPrefix);
-        if ($pos === 0) {
-            $extrafieldKey = substr($extrafieldKey, strlen($extrafieldsKeyPrefix));
-        }
-
-        $extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;
+		if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
+		$pdf->line($x + $l, $y, $x + $l, $y + $h);
+		if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
+		$pdf->line($x, $y + $h, $x, $y);
+	}
 
 
-        // Load extrafiels if not allready does
-        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
-        $extrafields = $this->extrafieldsCache;
+	/**
+	 *  uasort callback function to Sort columns fields
+	 *
+	 *  @param	array			$a    			PDF lines array fields configs
+	 *  @param	array			$b    			PDF lines array fields configs
+	 *  @return	int								Return compare result
+	 */
+	public function columnSort($a, $b)
+	{
+		if (empty($a['rank'])) { $a['rank'] = 0; }
+		if (empty($b['rank'])) { $b['rank'] = 0; }
+		if ($a['rank'] == $b['rank']) {
+			return 0;
+		}
+		return ($a['rank'] > $b['rank']) ? -1 : 1;
+	}
 
-        $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+	/**
+	 *   	Prepare Array Column Field
+	 *
+	 *   	@param	object			$object				common object
+	 *   	@param	Translate		$outputlangs		langs
+	 *      @param	int				$hidedetails		Do not show line details
+	 *      @param	int				$hidedesc			Do not show desc
+	 *      @param	int				$hideref			Do not show ref
+	 *      @return	null
+	 */
+	public function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf;
 
-        // TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...
-        if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {
-            // for lack of anything better we cleanup all html tags
-            $extrafieldOutputContent = dol_string_nohtmltag($extrafieldOutputContent);
-        }
-
-        $parameters = array(
-            'object' => $object,
-            'extrafields' => $extrafields,
-            'extrafieldKey' => $extrafieldKey,
-            'extrafieldOutputContent' =>& $extrafieldOutputContent
-        );
-        $reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        if ($reshook)
-        {
-            $extrafieldOutputContent = $hookmanager->resPrint;
-        }
-
-        return $extrafieldOutputContent;
-    }
+		$this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 
-    /**
-     *  display extrafields columns content
-     *
-     *  @param	object		$object    	line of common object
-     *  @param Translate $outputlangs    Output language
-     *  @param array $params    array of additionals parameters
-     *  @return	double  max y value
-     */
-    public function getExtrafieldsInHtml($object, $outputlangs, $params = array())
-    {
-        global $hookmanager;
+		// Sorting
+		uasort($this->cols, array($this, 'columnSort'));
 
-        if (empty($object->table_element)) {
-            return;
-        }
+		// Positionning
+		$curX = $this->page_largeur - $this->marge_droite; // start from right
 
-        // Load extrafiels if not allready does
-        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
-        $extrafields = $this->extrafieldsCache;
+		// Array width
+		$arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;
 
-        $defaultParams = array(
-            'style'         => '',
-            'display'         => 'auto', // auto, table, list
-            'printableEnable' => array(1),
-            'printableEnableNotEmpty' => array(2),
+		// Count flexible column
+		$totalDefinedColWidth = 0;
+		$countFlexCol = 0;
+		foreach ($this->cols as $colKey =>& $colDef)
+		{
+			if (!$this->getColumnStatus($colKey)) continue; // continue if disabled
 
-            'table'         => array(
-                'maxItemsInRow' => 2,
-                'cellspacing'   => 0,
-                'cellpadding'   => 0,
-                'border'        => 0,
-                'labelcolwidth' => '25%',
-                'arrayOfLineBreakType' => array('text', 'html')
-            ),
+			if (!empty($colDef['scale'])) {
+				// In case of column width is defined by percentage
+				$colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);
+			}
 
-            'list'         => array(
-                'separator' => '<br/>'
-            ),
+			if (empty($colDef['width'])) {
+				$countFlexCol++;
+			} else {
+				$totalDefinedColWidth += $colDef['width'];
+			}
+		}
 
-            'auto'         => array(
-                'list' => 0, // 0 for default
-                'table' => 4 // if there more than x extrafield to display
-            ),
-        );
+		foreach ($this->cols as $colKey =>& $colDef)
+		{
+			// setting empty conf with default
+			if (!empty($colDef['title'])) {
+				$colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
+			} else {
+				$colDef['title'] = $this->defaultTitlesFieldsStyle;
+			}
 
-        $params = $params + $defaultParams;
+			// setting empty conf with default
+			if (!empty($colDef['content'])) {
+				$colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
+			} else {
+				$colDef['content'] = $this->defaultContentsFieldsStyle;
+			}
+
+			if ($this->getColumnStatus($colKey))
+			{
+				// In case of flexible column
+				if (empty($colDef['width'])) {
+					$colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;
+				}
+
+				// Set positions
+				$lastX = $curX;
+				$curX = $lastX - $colDef['width'];
+				$colDef['xStartPos'] = $curX;
+				$colDef['xEndPos']   = $lastX;
+			}
+		}
+	}
+
+	/**
+	 *  get column content width from column key
+	 *
+	 *  @param	string      $colKey     the column key
+	 *  @return	float                   width in mm
+	 */
+	public function getColumnContentWidth($colKey)
+	{
+		$colDef = $this->cols[$colKey];
+		return  $colDef['width'] - $colDef['content']['padding'][3] - $colDef['content']['padding'][1];
+	}
 
 
-        /**
-         * @var $extrafields ExtraFields
-         */
+	/**
+	 *  get column content X (abscissa) left position from column key
+	 *
+	 *  @param	string    $colKey    		the column key
+	 *  @return	float      X position in mm
+	 */
+	public function getColumnContentXStart($colKey)
+	{
+		$colDef = $this->cols[$colKey];
+		return  $colDef['xStartPos'] + $colDef['content']['padding'][3];
+	}
 
-        $html = '';
-        $fields = array();
+	/**
+	 *   	get column position rank from column key
+	 *
+	 *   	@param	string		$colKey    		the column key
+	 *      @return	int         rank on success and -1 on error
+	 */
+	public function getColumnRank($colKey)
+	{
+		if (!isset($this->cols[$colKey]['rank'])) return -1;
+		return  $this->cols[$colKey]['rank'];
+	}
 
-        if (is_array($extrafields->attributes[$object->table_element]['label'])) {
-            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
-            {
-                // Enable extrafield ?
-                $enabled = 0;
-                $disableOnEmpty = 0;
-                if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
-                    $printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
-                    if (in_array($printable, $params['printableEnable']) || in_array($printable, $params['printableEnableNotEmpty'])) {
-                        $enabled = 1;
-                    }
+	/**
+	 *  get column position rank from column key
+	 *
+	 *  @param	string		$newColKey    	the new column key
+	 *  @param	array		$defArray    	a single column definition array
+	 *  @param	string		$targetCol    	target column used to place the new column beside
+	 *  @param	bool		$insertAfterTarget    	insert before or after target column ?
+	 *  @return	int         new rank on success and -1 on error
+	 */
+	public function insertNewColumnDef($newColKey, $defArray, $targetCol = false, $insertAfterTarget = false)
+	{
+		// prepare wanted rank
+		$rank = -1;
 
-                    if (in_array($printable, $params['printableEnableNotEmpty'])) {
-                        $disableOnEmpty = 1;
-                    }
-                }
+		// try to get rank from target column
+		if (!empty($targetCol)) {
+			$rank = $this->getColumnRank($targetCol);
+			if ($rank >= 0 && $insertAfterTarget) { $rank++; }
+		}
 
-                if (empty($enabled)) {
-                    continue;
-                }
+		// get rank from new column definition
+		if ($rank < 0 && !empty($defArray['rank'])) {
+			$rank = $defArray['rank'];
+		}
 
-                $field = new stdClass();
-                $field->rank = intval($extrafields->attributes[$object->table_element]['pos'][$key]);
-                $field->content = $this->getExtrafieldContent($object, $key);
-                $field->label = $outputlangs->transnoentities($label);
-                $field->type = $extrafields->attributes[$object->table_element]['type'][$key];
+		// error: no rank
+		if ($rank < 0) { return -1; }
 
-                // dont display if empty
-                if ($disableOnEmpty && empty($field->content)) {
-                    continue;
-                }
+		foreach ($this->cols as $colKey =>& $colDef)
+		{
+			if ($rank <= $colDef['rank'])
+			{
+				$colDef['rank'] = $colDef['rank'] + 1;
+			}
+		}
 
-                $fields[] = $field;
-            }
-        }
+		$defArray['rank'] = $rank;
+		$this->cols[$newColKey] = $defArray; // array_replace is used to preserve keys
 
-        if (!empty($fields))
-        {
-            // Sort extrafields by rank
-            uasort($fields, function ($a, $b) {
-                return  ($a->rank > $b->rank) ? 1 : -1;
+		return $rank;
+	}
+
+
+	/**
+	 *  print standard column content
+	 *
+	 *  @param	TCPDF		    $pdf    	pdf object
+	 *  @param	float		$curY    	curent Y position
+	 *  @param	string		$colKey    	the column key
+	 *  @param	string		$columnText   column text
+	 *  @return	null
+	 */
+	public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
+	{
+		global $hookmanager;
+
+		$parameters = array(
+			'curY' => &$curY,
+			'columnText' => $columnText,
+			'colKey' => $colKey,
+			'pdf' => &$pdf,
+		);
+		$reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if (!$reshook)
+		{
+			if (empty($columnText)) return;
+			$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
+			$colDef = $this->cols[$colKey];
+			// save curent cell padding
+			$curentCellPaddinds = $pdf->getCellPaddings();
+			// set cell padding with column content definition
+			$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+			$pdf->writeHTMLCell($colDef['width'], 2, $colDef['xStartPos'], $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
+
+			// restore cell padding
+			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+		}
+	}
+
+
+	/**
+	 *  print description column content
+	 *
+	 *  @param	TCPDF		$pdf    	pdf object
+	 *  @param	float		$curY    	curent Y position
+	 *  @param	string		$colKey    	the column key
+	 *  @param  object      $object CommonObject
+	 *  @param  int         $i  the $object->lines array key
+	 *  @param  Translate $outputlangs    Output language
+	 *  @param  int $hideref hide ref
+	 *  @param  int $hidedesc hide desc
+	 *  @param  int $issupplierline if object need supplier product
+	 *  @return null
+	 */
+	public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
+	{
+		// load desc col params
+		$colDef = $this->cols[$colKey];
+		// save curent cell padding
+		$curentCellPaddinds = $pdf->getCellPaddings();
+		// set cell padding with column content definition
+		$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+
+		// line description
+		pdf_writelinedesc($pdf, $object, $i, $outputlangs, $colDef['width'], 3, $colDef['xStartPos'], $curY, $hideref, $hidedesc, $issupplierline);
+		$posYAfterDescription = $pdf->GetY() - $colDef['content']['padding'][0];
+
+		// restore cell padding
+		$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+
+		// Display extrafield if needed
+		$params = array(
+			'display'         => 'list',
+			'printableEnable' => array(3),
+			'printableEnableNotEmpty' => array(4)
+		);
+		$extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+		if (!empty($extrafieldDesc)) {
+			$this->printStdColumnContent($pdf, $posYAfterDescription, $colKey, $extrafieldDesc);
+		}
+	}
+
+	/**
+	 *  get extrafield content for pdf writeHtmlCell compatibility
+	 *  usage for PDF line columns and object note block
+	 *
+	 *  @param	object		$object     common object
+	 *  @param	string		$extrafieldKey    	the extrafield key
+	 *  @return	string
+	 */
+	public function getExtrafieldContent($object, $extrafieldKey)
+	{
+		global $hookmanager;
+
+		if (empty($object->table_element)) { return; }
+
+		$extrafieldsKeyPrefix = "options_";
+
+		// Cleanup extrafield key to remove prefix if present
+		$pos = strpos($extrafieldKey, $extrafieldsKeyPrefix);
+		if ($pos === 0) {
+			$extrafieldKey = substr($extrafieldKey, strlen($extrafieldsKeyPrefix));
+		}
+
+		$extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;
+
+
+		// Load extrafiels if not allready does
+		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		$extrafields = $this->extrafieldsCache;
+
+		$extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+
+		// TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...
+		if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {
+			// for lack of anything better we cleanup all html tags
+			$extrafieldOutputContent = dol_string_nohtmltag($extrafieldOutputContent);
+		}
+
+		$parameters = array(
+			'object' => $object,
+			'extrafields' => $extrafields,
+			'extrafieldKey' => $extrafieldKey,
+			'extrafieldOutputContent' =>& $extrafieldOutputContent
+		);
+		$reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook)
+		{
+			$extrafieldOutputContent = $hookmanager->resPrint;
+		}
+
+		return $extrafieldOutputContent;
+	}
+
+
+	/**
+	 *  display extrafields columns content
+	 *
+	 *  @param	object		$object    	line of common object
+	 *  @param Translate $outputlangs    Output language
+	 *  @param array $params    array of additionals parameters
+	 *  @return	double  max y value
+	 */
+	public function getExtrafieldsInHtml($object, $outputlangs, $params = array())
+	{
+		global $hookmanager;
+
+		if (empty($object->table_element)) {
+			return;
+		}
+
+		// Load extrafiels if not allready does
+		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		$extrafields = $this->extrafieldsCache;
+
+		$defaultParams = array(
+			'style'         => '',
+			'display'         => 'auto', // auto, table, list
+			'printableEnable' => array(1),
+			'printableEnableNotEmpty' => array(2),
+
+			'table'         => array(
+				'maxItemsInRow' => 2,
+				'cellspacing'   => 0,
+				'cellpadding'   => 0,
+				'border'        => 0,
+				'labelcolwidth' => '25%',
+				'arrayOfLineBreakType' => array('text', 'html')
+			),
+
+			'list'         => array(
+				'separator' => '<br/>'
+			),
+
+			'auto'         => array(
+				'list' => 0, // 0 for default
+				'table' => 4 // if there more than x extrafield to display
+			),
+		);
+
+		$params = $params + $defaultParams;
+
+
+		/**
+		 * @var $extrafields ExtraFields
+		 */
+
+		$html = '';
+		$fields = array();
+
+		if (is_array($extrafields->attributes[$object->table_element]['label'])) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
+			{
+				// Enable extrafield ?
+				$enabled = 0;
+				$disableOnEmpty = 0;
+				if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
+					$printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
+					if (in_array($printable, $params['printableEnable']) || in_array($printable, $params['printableEnableNotEmpty'])) {
+						$enabled = 1;
+					}
+
+					if (in_array($printable, $params['printableEnableNotEmpty'])) {
+						$disableOnEmpty = 1;
+					}
+				}
+
+				if (empty($enabled)) {
+					continue;
+				}
+
+				$field = new stdClass();
+				$field->rank = intval($extrafields->attributes[$object->table_element]['pos'][$key]);
+				$field->content = $this->getExtrafieldContent($object, $key);
+				$field->label = $outputlangs->transnoentities($label);
+				$field->type = $extrafields->attributes[$object->table_element]['type'][$key];
+
+				// dont display if empty
+				if ($disableOnEmpty && empty($field->content)) {
+					continue;
+				}
+
+				$fields[] = $field;
+			}
+		}
+
+		if (!empty($fields))
+		{
+			// Sort extrafields by rank
+			uasort($fields, function ($a, $b) {
+				return  ($a->rank > $b->rank) ? 1 : -1;
 			});
 
-            // define some HTML content with style
-            $html .= !empty($params['style']) ? '<style>'.$params['style'].'</style>' : '';
+			// define some HTML content with style
+			$html .= !empty($params['style']) ? '<style>'.$params['style'].'</style>' : '';
 
-            // auto select display format
-            if ($params['display'] == 'auto') {
-                $lastNnumbItems = 0;
-                foreach ($params['auto'] as $display => $numbItems) {
-                    if ($lastNnumbItems <= $numbItems && count($fields) > $numbItems) {
-                        $lastNnumbItems = $numbItems;
-                        $params['display'] = $display;
-                    }
-                }
-            }
+			// auto select display format
+			if ($params['display'] == 'auto') {
+				$lastNnumbItems = 0;
+				foreach ($params['auto'] as $display => $numbItems) {
+					if ($lastNnumbItems <= $numbItems && count($fields) > $numbItems) {
+						$lastNnumbItems = $numbItems;
+						$params['display'] = $display;
+					}
+				}
+			}
 
-            if ($params['display'] == 'list') {
-                // Display in list format
-                $i = 0;
-                foreach ($fields as $field) {
-                    $html .= !empty($i) ? $params['list']['separator'] : '';
-                    $html .= '<strong>'.$field->label.' : </strong>';
-                    $html .= $field->content;
-                    $i++;
-                }
-            }
-            elseif ($params['display'] == 'table') {
-                // Display in table format
-                $html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';
+			if ($params['display'] == 'list') {
+				// Display in list format
+				$i = 0;
+				foreach ($fields as $field) {
+					$html .= !empty($i) ? $params['list']['separator'] : '';
+					$html .= '<strong>'.$field->label.' : </strong>';
+					$html .= $field->content;
+					$i++;
+				}
+			} elseif ($params['display'] == 'table') {
+				// Display in table format
+				$html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';
 
-                $html .= "<tr>";
-                $itemsInRow = 0;
-                $maxItemsInRow = $params['table']['maxItemsInRow'];
-                foreach ($fields as $field) {
-                    //$html.= !empty($html)?'<br/>':'';
-                    if ($itemsInRow >= $maxItemsInRow) {
-                        // start a new line
-                        $html .= "</tr><tr>";
-                        $itemsInRow = 0;
-                    }
+				$html .= "<tr>";
+				$itemsInRow = 0;
+				$maxItemsInRow = $params['table']['maxItemsInRow'];
+				foreach ($fields as $field) {
+					//$html.= !empty($html)?'<br/>':'';
+					if ($itemsInRow >= $maxItemsInRow) {
+						// start a new line
+						$html .= "</tr><tr>";
+						$itemsInRow = 0;
+					}
 
-                    // for some type we need line break
-                    if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {
-                        if ($itemsInRow > 0) {
-                            // close table row and empty cols
-                            for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {
-                                $html .= "<td ></td><td></td>";
-                            }
-                            $html .= "</tr>";
+					// for some type we need line break
+					if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {
+						if ($itemsInRow > 0) {
+							// close table row and empty cols
+							for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {
+								$html .= "<td ></td><td></td>";
+							}
+							$html .= "</tr>";
 
-                            // start a new line
-                            $html .= "<tr>";
-                        }
+							// start a new line
+							$html .= "<tr>";
+						}
 
-                        $itemsInRow = $maxItemsInRow;
-                        $html .= '<td colspan="'.($maxItemsInRow * 2 - 1).'">';
-                        $html .= '<strong>'.$field->label.' :</strong> ';
-                        $html .= $field->content;
-                        $html .= "</td>";
-                    } else {
-                        $itemsInRow++;
-                        $html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';
-                        $html .= '<strong>'.$field->label.' :</strong>';
-                        $html .= "</td>";
+						$itemsInRow = $maxItemsInRow;
+						$html .= '<td colspan="'.($maxItemsInRow * 2 - 1).'">';
+						$html .= '<strong>'.$field->label.' :</strong> ';
+						$html .= $field->content;
+						$html .= "</td>";
+					} else {
+						$itemsInRow++;
+						$html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';
+						$html .= '<strong>'.$field->label.' :</strong>';
+						$html .= "</td>";
 
 
-                        $html .= '<td  class="extrafield-content">';
-                        $html .= $field->content;
-                        $html .= "</td>";
-                    }
-                }
-                $html .= "</tr>";
+						$html .= '<td  class="extrafield-content">';
+						$html .= $field->content;
+						$html .= "</td>";
+					}
+				}
+				$html .= "</tr>";
 
-                $html .= '</table>';
-            }
-        }
+				$html .= '</table>';
+			}
+		}
 
-        return $html;
-    }
+		return $html;
+	}
 
 
-    /**
-     *  get column status from column key
-     *
-     *  @param	string			$colKey    		the column key
-     *  @return	float      width in mm
-     */
-    public function getColumnStatus($colKey)
-    {
-        if (!empty($this->cols[$colKey]['status'])) {
-            return true;
-        }
-        else  return  false;
-    }
+	/**
+	 *  get column status from column key
+	 *
+	 *  @param	string			$colKey    		the column key
+	 *  @return	float      width in mm
+	 */
+	public function getColumnStatus($colKey)
+	{
+		if (!empty($this->cols[$colKey]['status'])) {
+			return true;
+		} else return  false;
+	}
 
-    /**
-     * Print standard column content
-     *
-     * @param TCPDI	    $pdf            Pdf object
-     * @param float     $tab_top        Tab top position
-     * @param float     $tab_height     Default tab height
-     * @param Translate $outputlangs    Output language
-     * @param int       $hidetop        Hide top
-     * @return float                    Height of col tab titles
-     */
-    public function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0)
-    {
-        global $hookmanager, $conf;
+	/**
+	 * Print standard column content
+	 *
+	 * @param TCPDI	    $pdf            Pdf object
+	 * @param float     $tab_top        Tab top position
+	 * @param float     $tab_height     Default tab height
+	 * @param Translate $outputlangs    Output language
+	 * @param int       $hidetop        Hide top
+	 * @return float                    Height of col tab titles
+	 */
+	public function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0)
+	{
+		global $hookmanager, $conf;
 
-        foreach ($this->cols as $colKey => $colDef) {
-            $parameters = array(
-                'colKey' => $colKey,
-                'pdf' => $pdf,
-                'outputlangs' => $outputlangs,
-                'tab_top' => $tab_top,
-                'tab_height' => $tab_height,
-                'hidetop' => $hidetop
-            );
+		foreach ($this->cols as $colKey => $colDef) {
+			$parameters = array(
+				'colKey' => $colKey,
+				'pdf' => $pdf,
+				'outputlangs' => $outputlangs,
+				'tab_top' => $tab_top,
+				'tab_height' => $tab_height,
+				'hidetop' => $hidetop
+			);
 
-            $reshook = $hookmanager->executeHooks('pdfTabTitles', $parameters, $this); // Note that $object may have been modified by hook
-            if ($reshook < 0) {
-                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-            } elseif (empty($reshook)) {
-                if (!$this->getColumnStatus($colKey)) continue;
+			$reshook = $hookmanager->executeHooks('pdfTabTitles', $parameters, $this); // Note that $object may have been modified by hook
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			} elseif (empty($reshook)) {
+				if (!$this->getColumnStatus($colKey)) continue;
 
-                // get title label
-                $colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
+				// get title label
+				$colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
 
-                // Add column separator
-                if (!empty($colDef['border-left'])) {
-                    $pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
-                }
+				// Add column separator
+				if (!empty($colDef['border-left'])) {
+					$pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
+				}
 
-                if (empty($hidetop)) {
-                    // save curent cell padding
-                    $curentCellPaddinds = $pdf->getCellPaddings();
+				if (empty($hidetop)) {
+					// save curent cell padding
+					$curentCellPaddinds = $pdf->getCellPaddings();
 
-                    // Add space for lines (more if we need to show a second alternative language)
-                    global $outputlangsbis;
-                    if (is_object($outputlangsbis)) {
-                        // set cell padding with column title definition
-                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);
-                    }
-                    else {
-                        // set cell padding with column title definition
-                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
-                    }
+					// Add space for lines (more if we need to show a second alternative language)
+					global $outputlangsbis;
+					if (is_object($outputlangsbis)) {
+						// set cell padding with column title definition
+						$pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);
+					} else {
+						// set cell padding with column title definition
+						$pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
+					}
 
-                    $pdf->SetXY($colDef['xStartPos'], $tab_top);
-                    $textWidth = $colDef['width'];
-                    $pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
+					$pdf->SetXY($colDef['xStartPos'], $tab_top);
+					$textWidth = $colDef['width'];
+					$pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
 
-                    // Add variant of translation if $outputlangsbis is an object
-                    if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {
-                        $pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
-                    	$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());
-                    	$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
-                    	$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);
-                    }
+					// Add variant of translation if $outputlangsbis is an object
+					if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {
+						$pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
+						$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());
+						$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
+						$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);
+					}
 
-                    $this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);
+					$this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);
 
-                    // restore cell padding
-                    $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
-                }
-            }
-        }
+					// restore cell padding
+					$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+				}
+			}
+		}
 
-        return $this->tabTitleHeight;
-    }
+		return $this->tabTitleHeight;
+	}
 
 
 
-    /**
-     *  Define Array Column Field for extrafields
-     *
-     *  @param	object			$object    		common object det
-     *  @param	Translate		$outputlangs    langs
-     *  @param	int			   $hidedetails		Do not show line details
-     *  @return	null
-     */
-    public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)
-    {
-        global $conf;
+	/**
+	 *  Define Array Column Field for extrafields
+	 *
+	 *  @param	object			$object    		common object det
+	 *  @param	Translate		$outputlangs    langs
+	 *  @param	int			   $hidedetails		Do not show line details
+	 *  @return	null
+	 */
+	public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)
+	{
+		global $conf;
 
-        if (!empty($hidedetails)) {
-            return;
-        }
+		if (!empty($hidedetails)) {
+			return;
+		}
 
-        if (empty($object->table_element)) {
-            return;
-        }
+		if (empty($object->table_element)) {
+			return;
+		}
 
-        // Load extrafiels if not allready does
-        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
-        $extrafields = $this->extrafieldsCache;
+		// Load extrafiels if not allready does
+		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		$extrafields = $this->extrafieldsCache;
 
 
-        if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
-            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
-            {
-                // Dont display separator yet even is set to be displayed (not compatible yet)
-                if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
-                {
-                    continue;
-                }
+		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
+			{
+				// Dont display separator yet even is set to be displayed (not compatible yet)
+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
+				{
+					continue;
+				}
 
-                // Enable extrafield ?
-                $enabled = 0;
-                if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
-                    $printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
-                    if ($printable === 1 || $printable === 2) {
-                        $enabled = 1;
-                    }
-                    // Note : if $printable === 3 or 4 so, it's displayed after line description not in cols
-                }
+				// Enable extrafield ?
+				$enabled = 0;
+				if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
+					$printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
+					if ($printable === 1 || $printable === 2) {
+						$enabled = 1;
+					}
+					// Note : if $printable === 3 or 4 so, it's displayed after line description not in cols
+				}
 
-                if (!$enabled) { continue; } // don't wast resourses if we don't need them...
+				if (!$enabled) { continue; } // don't wast resourses if we don't need them...
 
-                // Load language if required
-                if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+				// Load language if required
+				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
 
-                // TODO : add more extrafield customisation capacities for PDF like width, rank...
+				// TODO : add more extrafield customisation capacities for PDF like width, rank...
 
-                // set column definition
-                $def = array(
-                    'rank' => intval($extrafields->attributes[$object->table_element]['pos'][$key]),
-                    'width' => 25, // in mm
-                    'status' => boolval($enabled),
-                    'title' => array(
-                        'label' => $outputlangs->transnoentities($label)
-                    ),
-                    'content' => array(
-                        'align' => 'C'
-                    ),
-                    'border-left' => true, // add left line separator
-                );
+				// set column definition
+				$def = array(
+					'rank' => intval($extrafields->attributes[$object->table_element]['pos'][$key]),
+					'width' => 25, // in mm
+					'status' => boolval($enabled),
+					'title' => array(
+						'label' => $outputlangs->transnoentities($label)
+					),
+					'content' => array(
+						'align' => 'C'
+					),
+					'border-left' => true, // add left line separator
+				);
 
-                $alignTypeRight = array('double', 'int', 'price');
-                if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeRight)) {
-                    $def['content']['align'] = 'R';
-                }
+				$alignTypeRight = array('double', 'int', 'price');
+				if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeRight)) {
+					$def['content']['align'] = 'R';
+				}
 
-                $alignTypeLeft = array('text', 'html');
-                if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeLeft)) {
-                    $def['content']['align'] = 'L';
-                }
+				$alignTypeLeft = array('text', 'html');
+				if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeLeft)) {
+					$def['content']['align'] = 'L';
+				}
 
 
-                // for extrafields we use rank of extrafield to place it on PDF
-                $this->insertNewColumnDef("options_".$key, $def);
-            }
-        }
-    }
+				// for extrafields we use rank of extrafield to place it on PDF
+				$this->insertNewColumnDef("options_".$key, $def);
+			}
+		}
+	}
 }
diff --git a/htdocs/core/class/commonincoterm.class.php b/htdocs/core/class/commonincoterm.class.php
new file mode 100644
index 00000000000..b2d5491684e
--- /dev/null
+++ b/htdocs/core/class/commonincoterm.class.php
@@ -0,0 +1,141 @@
+<?php
+/* Copyright (C) 2012 Regis Houssin  <regis.houssin@inodbox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/core/class/commonincoterm.class.php
+ *       \ingroup    core
+ *       \brief      File of the superclass of object classes that support incoterm (customer and supplier)
+ */
+
+
+/**
+ *      Superclass for incoterm classes
+ */
+trait CommonIncoterm
+{
+	/**
+	 * @var int		ID incoterm.
+	 * @see setIncoterms()
+	 */
+	public $fk_incoterms;
+
+	/**
+	 * @var string	Label of incoterm. Used for tooltip.
+	 * @see SetIncoterms()
+	 */
+	public $label_incoterms;
+
+	/**
+	 * @var string	Location of incoterm.
+	 * @see display_incoterms()
+	 */
+	public $location_incoterms;
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return incoterms informations
+	 *    TODO Use a cache for label get
+	 *
+	 *    @return	string	incoterms info
+	 */
+	public function display_incoterms()
+	{
+		// phpcs:enable
+		$out = '';
+
+		$this->label_incoterms = '';
+		if (!empty($this->fk_incoterms))
+		{
+			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$res = $this->db->fetch_object($result);
+				$out .= $res->code;
+			}
+		}
+
+		$out .= (($out && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;
+
+		return $out;
+	}
+
+	/**
+	 *    Return incoterms informations for pdf display
+	 *
+	 *    @return	string		incoterms info
+	 */
+	public function getIncotermsForPDF()
+	{
+		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			if ($num > 0)
+			{
+				$res = $this->db->fetch_object($resql);
+				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
+			} else {
+				return '';
+			}
+		} else {
+			$this->errors[] = $this->db->lasterror();
+			return false;
+		}
+	}
+
+	/**
+	 *    Define incoterms values of current object
+	 *
+	 *    @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
+	 */
+	public function setIncoterms($id_incoterm, $location)
+	{
+		if ($this->id && $this->table_element)
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
+			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
+			$sql .= " WHERE rowid = ".$this->id;
+			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$this->fk_incoterms = $id_incoterm;
+				$this->location_incoterms = $location;
+
+				$sql = 'SELECT libelle as label_incotermsFROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
+				$res = $this->db->query($sql);
+				if ($res)
+				{
+					$obj = $this->db->fetch_object($res);
+					$this->label_incoterms = $obj->label_incoterms;
+				}
+				return 1;
+			} else {
+				$this->errors[] = $this->db->lasterror();
+				return -1;
+			}
+		} else {
+			return -1;
+		}
+	}
+}
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index cb7ce67d923..98890744701 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -24,12 +24,15 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 
 /**
  * 	Superclass for invoices classes
  */
 abstract class CommonInvoice extends CommonObject
 {
+	use CommonIncoterm;
+
     /**
      * Standard invoice
      */
@@ -140,9 +143,7 @@ abstract class CommonInvoice extends CommonObject
 			$this->db->free($resql);
 			if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -170,9 +171,7 @@ abstract class CommonInvoice extends CommonObject
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -193,9 +192,7 @@ abstract class CommonInvoice extends CommonObject
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -216,9 +213,7 @@ abstract class CommonInvoice extends CommonObject
 	    if ($result >= 0)
 	    {
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->error = $discountstatic->error;
 	        return -1;
 	    }
@@ -248,9 +243,7 @@ abstract class CommonInvoice extends CommonObject
 				$idarray[] = $row[0];
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $idarray;
@@ -284,15 +277,11 @@ abstract class CommonInvoice extends CommonObject
 			{
 				// If there is any
 				return $obj->rowid;
-			}
-			else
-			{
+			} else {
 				// If no invoice replaces it
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -311,6 +300,7 @@ abstract class CommonInvoice extends CommonObject
 		$table2 = 'paiement';
 		$field = 'fk_facture';
 		$field2 = 'fk_paiement';
+		$field3=', p.ref_ext';
 		$sharedentity = 'facture';
 		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 		{
@@ -318,10 +308,11 @@ abstract class CommonInvoice extends CommonObject
 			$table2 = 'paiementfourn';
 			$field = 'fk_facturefourn';
 			$field2 = 'fk_paiementfourn';
+			$field3='';
 			$sharedentity = 'facture_fourn';
 		}
 
-		$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
+		$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code'.$field3;
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
 		$sql .= ' WHERE pf.'.$field.' = '.$this->id;
 		//$sql.= ' WHERE pf.'.$field.' = 1';
@@ -339,7 +330,11 @@ abstract class CommonInvoice extends CommonObject
 			while ($i < $num)
 			{
 				$obj = $this->db->fetch_object($resql);
-				$retarray[] = 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;
+				}
+				$retarray[]=$tmp;
 				$i++;
 			}
 			$this->db->free($resql);
@@ -352,8 +347,7 @@ abstract class CommonInvoice extends CommonObject
 				$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 = '.$this->id;
 				$sql .= ' AND (f.type = 2 OR f.type = 0 OR f.type = 3)'; // Find discount coming from credit note or excess received or deposits (payments from deposits are always null except if FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is set)
-			}
-			elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+			} elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
 			{
 				$sql = 'SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
@@ -372,15 +366,12 @@ abstract class CommonInvoice extends CommonObject
 						$obj = $this->db->fetch_object($resql);
 						if ($multicurrency) {
 							$retarray[] = array('amount'=>$obj->multicurrency_amount, 'type'=>$obj->type, 'date'=>$obj->date, 'num'=>'0', 'ref'=>$obj->ref);
-						}
-						else {
+						} else {
 							$retarray[] = array('amount'=>$obj->amount, 'type'=>$obj->type, 'date'=>$obj->date, 'num'=>'', 'ref'=>$obj->ref);
 						}
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					dol_print_error($this->db);
 					return array();
@@ -389,9 +380,7 @@ abstract class CommonInvoice extends CommonObject
 			}
 
 			return $retarray;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return array();
@@ -473,7 +462,7 @@ abstract class CommonInvoice extends CommonObject
 		$type = 'customer_invoice';
 		if ($this->element == 'invoice_supplier') $type = 'supplier_invoice';
 
-		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$this->id;
+		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->id;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -482,9 +471,7 @@ abstract class CommonInvoice extends CommonObject
 			{
 				$alreadydispatched = $obj->nb;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -549,41 +536,33 @@ abstract class CommonInvoice extends CommonObject
 		    if ($status == 0) {
 		        $labelStatus = $langs->trans('BillStatusDraft');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusDraft');
-		    }
-		    elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
+		    } elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
 		        $labelStatus = $langs->trans('BillStatusClosedUnpaid');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
 		        $statusType = 'status5';
-		    }
-		    elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
+		    } elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
 		        $labelStatus = $langs->trans('BillStatusClosedPaidPartially');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
 		        $statusType = 'status9';
-		    }
-		    elseif ($alreadypaid <= 0) {
+		    } elseif ($alreadypaid == 0) {
 		        $labelStatus = $langs->trans('BillStatusNotPaid');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusNotPaid');
 		        $statusType = 'status1';
-		    }
-		    else {
+		    } else {
 		        $labelStatus = $langs->trans('BillStatusStarted');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusStarted');
 		        $statusType = 'status3';
 		    }
-		}
-		else
-		{
+		} else {
 		    $statusType = 'status6';
 
 		    if ($type == self::TYPE_CREDIT_NOTE) {
 		        $labelStatus = $langs->trans('BillStatusPaidBackOrConverted'); // credit note
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
-		    }
-		    elseif ($type == self::TYPE_DEPOSIT) {
+		    } elseif ($type == self::TYPE_DEPOSIT) {
 		        $labelStatus = $langs->trans('BillStatusConverted'); // deposit invoice
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
-		    }
-		    else {
+		    } else {
 		        $labelStatus = $langs->trans('BillStatusPaid');
 		        $labelStatusShort = $langs->trans('Bill'.$prefix.'StatusPaid');
 		    }
@@ -629,9 +608,7 @@ abstract class CommonInvoice extends CommonObject
 				$cdr_type = $obj->type_cdr;
 				$cdr_decalage = $obj->decalage;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -657,9 +634,7 @@ abstract class CommonInvoice extends CommonObject
 			{
 				$mois = 1;
 				$annee += 1;
-			}
-			else
-			{
+			} else {
 				$mois += 1;
 			}
 			// We move at the beginning of the next month, and we take a day off
@@ -682,8 +657,9 @@ abstract class CommonInvoice extends CommonObject
 
 			if ($diff < 0) $datelim = $date_lim_current;
 			else $datelim = $date_lim_next;
+		} else {
+			return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
 		}
-		else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
 
 		return $datelim;
 	}
@@ -767,49 +743,38 @@ abstract class CommonInvoice extends CommonObject
 
 						dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 						$resql = $this->db->query($sql);
-						if (!$resql)
-						{
+						if (!$resql) {
 							$this->error = $this->db->lasterror();
 							dol_syslog(get_class($this).'::demandeprelevement Erreur');
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = 'WithdrawRequestErrorNilAmount';
 						dol_syslog(get_class($this).'::demandeprelevement WithdrawRequestErrorNilAmount');
 						$error++;
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						// Force payment mode of invoice to withdraw
 						$payment_mode_id = dol_getIdFromCode($this->db, 'PRE', 'c_paiement', 'code', 'id', 1);
-						if ($payment_mode_id > 0)
-						{
+						if ($payment_mode_id > 0) {
 							$result = $this->setPaymentMethods($payment_mode_id);
 						}
 					}
 
 					if ($error) return -1;
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->error = "A request already exists";
 					dol_syslog(get_class($this).'::demandeprelevement Impossible de creer une demande, demande deja en cours');
 					return 0;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				dol_syslog(get_class($this).'::demandeprelevement Erreur -2');
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = "Status of invoice does not allow this";
 			dol_syslog(get_class($this)."::demandeprelevement ".$this->error." $this->statut, $this->paye, $this->mode_reglement_id");
 			return -3;
@@ -833,9 +798,7 @@ abstract class CommonInvoice extends CommonObject
 		if ($this->db->query($sql))
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this).'::demande_prelevement_delete Error '.$this->error);
 			return -1;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5fa301123d3..3ea4bba4a7f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -222,9 +222,9 @@ abstract class CommonObject
 	 * @var string
 	 * @see getFullAddress(), isInEEC(), country
 	 */
-    public $country_code;
+	public $country_code;
 
-    /**
+	/**
 	 * @var string
 	 * @see getFullAddress()
 	 */
@@ -238,21 +238,27 @@ abstract class CommonObject
 
 	/**
 	 * @var string
-	 * @see getFullAddress(), state
+	 * @see getFullAddress(), $state
 	 */
-    public $state_code;
+	public $state_code;
 
-    /**
-	 * @var string
-	 * @see getFullAddress(), region
+	/**
+	 * @var int
+	 * @see getFullAddress(), $region_code, $region
 	 */
-	public $region;
+	public $region_id;
 
 	/**
 	 * @var string
-	 * @see getFullAddress(), region
+	 * @see getFullAddress(), $region_id, $region
 	 */
-    public $region_code;
+	public $region_code;
+
+	/**
+	 * @var string
+	 * @see getFullAddress(), $region_id, $region_code
+	 */
+	public $region;
 
 	/**
 	 * @var int
@@ -314,7 +320,7 @@ abstract class CommonObject
 	 * @var string
 	 * @see SetDocModel()
 	 */
-	public $modelpdf;
+	public $model_pdf;
 
 	/**
 	 * @var string
@@ -387,48 +393,30 @@ abstract class CommonObject
 	 */
 	public $comments = array();
 
-	/**
-	 * @var int
-	 * @see setIncoterms()
-	 */
-	public $fk_incoterms;
-
-	/**
-	 * @var string
-	 * @see SetIncoterms()
-	 */
-	public $label_incoterms;
-
-	/**
-	 * @var string
-	 * @see display_incoterms()
-	 */
-	public $location_incoterms;
-
 	/**
 	 * @var string The name
 	 */
 	public $name;
 
-    /**
-     * @var string The lastname
-     */
+	/**
+	 * @var string The lastname
+	 */
 	public $lastname;
 
-    /**
-     * @var string The firstname
-     */
+	/**
+	 * @var string The firstname
+	 */
 	public $firstname;
 
-    /**
-     * @var string The civility code, not an integer
-     */
+	/**
+	 * @var string The civility code, not an integer
+	 */
 	public $civility_id;
 
 	// Dates
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
@@ -515,16 +503,16 @@ abstract class CommonObject
 	 */
 	public function getFormatedCustomerRef($objref)
 	{
-	    global $hookmanager;
+		global $hookmanager;
 
-	    $parameters = array('objref'=>$objref);
-	    $action = '';
-	    $reshook = $hookmanager->executeHooks('getFormatedCustomerRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-	    if ($reshook > 0)
-	    {
-	        return $hookmanager->resArray['objref'];
-	    }
-	    return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
+		$parameters = array('objref'=>$objref);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('getFormatedCustomerRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0)
+		{
+			return $hookmanager->resArray['objref'];
+		}
+		return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
 	}
 
 	/**
@@ -535,16 +523,16 @@ abstract class CommonObject
 	 */
 	public function getFormatedSupplierRef($objref)
 	{
-	    global $hookmanager;
+		global $hookmanager;
 
-	    $parameters = array('objref'=>$objref);
-	    $action = '';
-	    $reshook = $hookmanager->executeHooks('getFormatedSupplierRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-	    if ($reshook > 0)
-	    {
-	        return $hookmanager->resArray['objref'];
-	    }
-	    return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
+		$parameters = array('objref'=>$objref);
+		$action = '';
+		$reshook = $hookmanager->executeHooks('getFormatedSupplierRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0)
+		{
+			return $hookmanager->resArray['objref'];
+		}
+		return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
 	}
 
 	/**
@@ -616,15 +604,15 @@ abstract class CommonObject
 			$this->country = $tmparray['label'];
 		}
 
-        if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_code)))
-    	{
-    		require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-    		$tmparray = getState($this->state_id, 'all', 0, 1);
+		if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_code)))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+			$tmparray = getState($this->state_id, 'all', 0, 1);
 			$this->state_code   = $tmparray['code'];
 			$this->state        = $tmparray['label'];
 			$this->region_code  = $tmparray['region_code'];
 			$this->region       = $tmparray['region'];
-        }
+		}
 
 		return dol_format_address($this, $withcountry, $sep, '', 0, $extralangcode);
 	}
@@ -697,7 +685,7 @@ abstract class CommonObject
 
 				if (!empty($extralanguages->attributes[$elementforaltlanguage]['address']) || !empty($extralanguages->attributes[$elementforaltlanguage]['town']))
 				{
-					$out .= "<!-- alternatelanguage for '".$elementforaltlanguage."' set to fields '".join(',', $extralanguages->attributes[$elementforaltlanguage]). "' -->\n";
+					$out .= "<!-- alternatelanguage for '".$elementforaltlanguage."' set to fields '".join(',', $extralanguages->attributes[$elementforaltlanguage])."' -->\n";
 					$this->fetchValuesForExtraLanguages();
 					if (!is_object($form)) $form = new Form($this->db);
 					$htmltext = '';
@@ -715,12 +703,11 @@ abstract class CommonObject
 		if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
 				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
 		{
-            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
-                $out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
-            }
-            else {
-                $out .= ($outdone ? ' - ' : '').$this->state;
-            }
+			if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
+				$out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
+			} else {
+				$out .= ($outdone ? ' - ' : '').$this->state;
+			}
 			$outdone++;
 		}
 
@@ -759,8 +746,8 @@ abstract class CommonObject
 		}
 		if (!empty($this->url))
 		{
-            //$out.=dol_print_url($this->url,'_goout',0,1);//steve changed to blank
-		    $out .= dol_print_url($this->url, '_blank', 0, 1);
+			//$out.=dol_print_url($this->url,'_goout',0,1);//steve changed to blank
+			$out .= dol_print_url($this->url, '_blank', 0, 1);
 			$outdone++;
 		}
 
@@ -845,10 +832,8 @@ abstract class CommonObject
 					$this->errors = $ecmfile->errors;
 				}
 				*/
-			}
-			else return '';
-		}
-		elseif (empty($ecmfile->share))
+			} else return '';
+		} elseif (empty($ecmfile->share))
 		{
 			// Add entry into index
 			if ($initsharekey)
@@ -856,8 +841,7 @@ abstract class CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$ecmfile->share = getRandomPassword(true);
 				$ecmfile->update($user);
-			}
-			else return '';
+			} else return '';
 		}
 		// Define $urlwithroot
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -879,9 +863,7 @@ abstract class CommonObject
 		if ($relativelink)
 		{
 			$linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');
-		}
-		else
-		{
+		} else {
 			$linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 		}
 
@@ -890,7 +872,7 @@ abstract class CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Add a link between element $this->element and a contact
 	 *
@@ -902,7 +884,7 @@ abstract class CommonObject
 	 */
 	public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs;
 
 
@@ -928,9 +910,7 @@ abstract class CommonObject
 		if (is_numeric($type_contact))
 		{
 			$id_type_contact = $type_contact;
-		}
-		else
-		{
+		} else {
 			// We look for id type_contact
 			$sql = "SELECT tc.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
@@ -993,18 +973,14 @@ abstract class CommonObject
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error = $this->db->errno();
 					$this->db->rollback();
 					echo 'err rollback';
 					return -2;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
@@ -1013,7 +989,7 @@ abstract class CommonObject
 		} else return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Copy contact from one element to current
 	 *
@@ -1023,7 +999,7 @@ abstract class CommonObject
 	 */
 	public function copy_linked_contact($objFrom, $source = 'internal')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$contacts = $objFrom->liste_contact(-1, $source);
 		foreach ($contacts as $contact)
 		{
@@ -1036,7 +1012,7 @@ abstract class CommonObject
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Update a link to contact line
 	 *
@@ -1048,26 +1024,24 @@ abstract class CommonObject
 	 */
 	public function update_contact($rowid, $statut, $type_contact_id = 0, $fk_socpeople = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
 		$sql .= " statut = ".$statut;
-		if ($type_contact_id) $sql .= ", fk_c_type_contact = '".$type_contact_id."'";
-		if ($fk_socpeople) $sql .= ", fk_socpeople = '".$fk_socpeople."'";
+		if ($type_contact_id) $sql .= ", fk_c_type_contact = ".((int) $type_contact_id);
+		if ($fk_socpeople) $sql .= ", fk_socpeople = ".((int) $fk_socpeople);
 		$sql .= " where rowid = ".$rowid;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Delete a link to contact line
 	 *
@@ -1077,7 +1051,7 @@ abstract class CommonObject
 	 */
 	public function delete_contact($rowid, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 
@@ -1097,16 +1071,14 @@ abstract class CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Delete all links between an object $this and all its contacts
 	 *
@@ -1116,7 +1088,7 @@ abstract class CommonObject
 	 */
 	public function delete_linked_contact($source = '', $code = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$temp = array();
 		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);
 
@@ -1135,15 +1107,13 @@ abstract class CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Get array of all contacts for an object
 	 *
@@ -1155,7 +1125,7 @@ abstract class CommonObject
 	 */
 	public function liste_contact($status = -1, $source = 'external', $list = 0, $code = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$tab = array();
@@ -1197,9 +1167,7 @@ abstract class CommonObject
 								   'nom'=>$obj->lastname, // For backward compatibility
 								   'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact,
 								   'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact);
-				}
-				else
-				{
+				} else {
 					$tab[$i] = $obj->id;
 				}
 
@@ -1207,9 +1175,7 @@ abstract class CommonObject
 			}
 
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_print_error($this->db);
 			return -1;
@@ -1243,16 +1209,14 @@ abstract class CommonObject
 			$result = $this->update_contact($rowid, $newstatut);
 			$this->db->free($resql);
 			return $result;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_print_error($this->db);
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Return array with list of possible values for type of contacts
 	 *
@@ -1265,7 +1229,7 @@ abstract class CommonObject
 	 */
 	public function liste_type_contact($source = 'internal', $order = 'position', $option = 0, $activeonly = 0, $code = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($order)) $order = 'position';
@@ -1297,9 +1261,7 @@ abstract class CommonObject
 				$i++;
 			}
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			//dol_print_error($this->db);
 			return null;
@@ -1323,6 +1285,8 @@ abstract class CommonObject
 		// phpcs:enable
 		global $langs, $conf;
 
+		$langs->loadLangs(array('bills', 'contracts', 'interventions', 'orders', 'projects', 'propal', 'ticket', 'agenda'));
+
 		$tab = array();
 
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position, tc.element";
@@ -1380,9 +1344,7 @@ abstract class CommonObject
 				}
 			}
 			return $tab;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return null;
 		}
@@ -1427,9 +1389,9 @@ abstract class CommonObject
 		if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";
 		if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";
 		$sql .= " AND ec.fk_c_type_contact = tc.rowid";
-		$sql .= " AND tc.element = '".$element."'";
-		$sql .= " AND tc.source = '".$source."'";
-		if ($code) $sql .= " AND tc.code = '".$code."'";
+		$sql .= " AND tc.element = '".$this->db->escape($element)."'";
+		$sql .= " AND tc.source = '".$this->db->escape($source)."'";
+		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
 		$sql .= " AND tc.active = 1";
 		if ($status) $sql .= " AND ec.statut = ".$status;
 
@@ -1442,9 +1404,7 @@ abstract class CommonObject
 				$result[$i] = $obj->fk_socpeople;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return null;
 		}
@@ -1452,17 +1412,17 @@ abstract class CommonObject
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *		Load object contact with id=$this->contactid into $this->contact
+	 *		Load object contact with id=$this->contact_id into $this->contact
 	 *
-	 *		@param	int		$contactid      Id du contact. Use this->contactid if empty.
+	 *		@param	int		$contactid      Id du contact. Use this->contact_id if empty.
 	 *		@return	int						<0 if KO, >0 if OK
 	 */
 	public function fetch_contact($contactid = null)
 	{
-        // phpcs:enable
-		if (empty($contactid)) $contactid = $this->contactid;
+		// phpcs:enable
+		if (empty($contactid)) $contactid = $this->contact_id;
 
 		if (empty($contactid)) return 0;
 
@@ -1473,7 +1433,7 @@ abstract class CommonObject
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    	Load the third party of object, from id $this->socid or $this->fk_soc, into this->thirdparty
 	 *
@@ -1482,7 +1442,7 @@ abstract class CommonObject
 	 */
 	public function fetch_thirdparty($force_thirdparty_id = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
@@ -1505,8 +1465,7 @@ abstract class CommonObject
 			}
 
 			return $result;
-		} else
-			return -1;
+		} else return -1;
 	}
 
 
@@ -1536,7 +1495,7 @@ abstract class CommonObject
 		return $this->fetch($result->rowid);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Load data for barcode into properties ->barcode_type*
 	 *	Properties ->barcode_type that is id of barcode. Type is used to find other properties, but
@@ -1546,7 +1505,7 @@ abstract class CommonObject
 	 */
 	public function fetch_barcode()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
@@ -1576,9 +1535,7 @@ abstract class CommonObject
 					$this->barcode_type_label = $obj->label;
 					$this->barcode_type_coder = $obj->coder;
 					return 1;
-				}
-				else
-				{
+				} else {
 					dol_print_error($this->db);
 					return -1;
 				}
@@ -1587,7 +1544,7 @@ abstract class CommonObject
 		return 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *		Load the project with id $this->fk_project into this->project
 	 *
@@ -1595,7 +1552,7 @@ abstract class CommonObject
 	 */
 	public function fetch_projet()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 		if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility
@@ -1609,7 +1566,7 @@ abstract class CommonObject
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *		Load the product with id $this->fk_product into this->product
 	 *
@@ -1617,7 +1574,7 @@ abstract class CommonObject
 	 */
 	public function fetch_product()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 		if (empty($this->fk_product)) return 0;
@@ -1629,7 +1586,7 @@ abstract class CommonObject
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *		Load the user with id $userid into this->user
 	 *
@@ -1638,14 +1595,14 @@ abstract class CommonObject
 	 */
 	public function fetch_user($userid)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$user = new User($this->db);
 		$result = $user->fetch($userid);
 		$this->user = $user;
 		return $result;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Read linked origin object
 	 *
@@ -1653,10 +1610,10 @@ abstract class CommonObject
 	 */
 	public function fetch_origin()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if ($this->origin == 'shipping') $this->origin = 'expedition';
 		if ($this->origin == 'delivery') $this->origin = 'livraison';
-        if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
+		if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
 
 		$origin = $this->origin;
 
@@ -1666,14 +1623,14 @@ abstract class CommonObject
 	}
 
 	/**
-     *  Load object from specific field
-     *
-     *  @param	string	$table		Table element or element line
-     *  @param	string	$field		Field selected
-     *  @param	string	$key		Import key
-     *  @param	string	$element	Element name
-     *	@return	int					<0 if KO, >0 if OK
-     */
+	 *  Load object from specific field
+	 *
+	 *  @param	string	$table		Table element or element line
+	 *  @param	string	$field		Field selected
+	 *  @param	string	$key		Import key
+	 *  @param	string	$element	Element name
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
 	public function fetchObjectFrom($table, $field, $key, $element = null)
 	{
 		global $conf;
@@ -1785,9 +1742,7 @@ abstract class CommonObject
 				if (empty($this->fields) && method_exists($this, 'fetch'))
 				{
 					$result = $this->fetch($id);
-				}
-				else
-				{
+				} else {
 					$result = $this->fetchCommon($id);
 				}
 				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
@@ -1799,22 +1754,18 @@ abstract class CommonObject
 				if (property_exists($this, $field)) $this->$field = $value;
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load properties id_previous and id_next by comparing $fieldid with $this->ref
 	 *
@@ -1825,7 +1776,7 @@ abstract class CommonObject
 	 */
 	public function load_previous_next_ref($filter, $fieldid, $nodbprefix = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		if (!$this->table_element)
@@ -1852,11 +1803,10 @@ abstract class CommonObject
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		}
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
-		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
 		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
 		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
 		if (!empty($filter))
@@ -1867,8 +1817,7 @@ abstract class CommonObject
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		}
-		elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1910,7 +1859,7 @@ abstract class CommonObject
 		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
 		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
 		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
-		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
+		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
 		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
 		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
 		if (!empty($filter))
@@ -1973,7 +1922,7 @@ abstract class CommonObject
 		while ($i < $num)
 		{
 			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			else $contactAlreadySelected[$i] = $tab[$i]['id'];
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -2000,14 +1949,12 @@ abstract class CommonObject
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
 			else $sql .= ' SET fk_project = NULL';
 			$sql .= ' WHERE rowid = '.$this->id;
-		}
-		elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
+		} elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
 		{
 			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
 			else $sql .= ' SET fk_project = NULL';
 			$sql .= ' WHERE id = '.$this->id;
-		}
-		else											// Special case for old architecture objects
+		} else // Special case for old architecture objects
 		{
 			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
 			else $sql .= ' SET fk_projet = NULL';
@@ -2019,9 +1966,7 @@ abstract class CommonObject
 		{
 			$this->fk_project = $projectid;
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2053,16 +1998,12 @@ abstract class CommonObject
 				// for supplier
 				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2094,16 +2035,12 @@ abstract class CommonObject
 				if ($rate) $this->setMulticurrencyRate($rate, 2);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2202,16 +2139,12 @@ abstract class CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2245,16 +2178,12 @@ abstract class CommonObject
 				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
 				$this->cond_reglement = $id; // for compatibility
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible');
 			$this->error = 'Status of the object is incompatible '.$this->statut;
 			return -2;
@@ -2270,33 +2199,29 @@ abstract class CommonObject
 	 */
 	public function setRetainedWarrantyPaymentTerms($id)
 	{
-	    dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms('.$id.')');
-	    if ($this->statut >= 0 || $this->element == 'societe')
-	    {
-	        $fieldname = 'retained_warranty_fk_cond_reglement';
+		dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms('.$id.')');
+		if ($this->statut >= 0 || $this->element == 'societe')
+		{
+			$fieldname = 'retained_warranty_fk_cond_reglement';
 
-	        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-	        $sql .= ' SET '.$fieldname.' = '.$id;
-	        $sql .= ' WHERE rowid='.$this->id;
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET '.$fieldname.' = '.$id;
+			$sql .= ' WHERE rowid='.$this->id;
 
-	        if ($this->db->query($sql))
-	        {
-	            $this->retained_warranty_fk_cond_reglement = $id;
-	            return 1;
-	        }
-	        else
-	        {
-	            dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
-	            $this->error = $this->db->error();
-	            return -1;
-	        }
-	    }
-	    else
-	    {
-	        dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');
-	        $this->error = 'Status of the object is incompatible '.$this->statut;
-	        return -2;
-	    }
+			if ($this->db->query($sql))
+			{
+				$this->retained_warranty_fk_cond_reglement = $id;
+				return 1;
+			} else {
+				dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms, status of the object is incompatible');
+			$this->error = 'Status of the object is incompatible '.$this->statut;
+			return -2;
+		}
 	}
 
 	/**
@@ -2318,9 +2243,7 @@ abstract class CommonObject
 		{
 			$this->fk_delivery_address = $id;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
 			return -1;
@@ -2442,11 +2365,10 @@ abstract class CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->modelpdf = $modelpdf;
+			$this->model_pdf = $modelpdf;
+			$this->modelpdf = $modelpdf; // For bakward compatibility
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return 0;
 		}
@@ -2488,9 +2410,7 @@ abstract class CommonObject
 			dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
 			$this->error = $this->db->lasterror();
 			$error++;
-		}
-		else
-		{
+		} else {
 			if (!$notrigger)
 			{
 				// Call trigger
@@ -2504,9 +2424,7 @@ abstract class CommonObject
 		{
 			$this->db->rollback();
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->fk_account = ($fk_account == 'NULL') ?null:$fk_account;
 			$this->db->commit();
 			return 1;
@@ -2516,7 +2434,7 @@ abstract class CommonObject
 
 	// TODO: Move line related operations to CommonObjectLine?
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Save a new position (field rang) for details lines.
 	 *  You can choose to set position for lines with already a position or lines without any position defined.
@@ -2528,7 +2446,7 @@ abstract class CommonObject
 	 */
 	public function line_order($renum = false, $rowidorder = 'ASC', $fk_parent_line = true)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!$this->table_element_line)
 		{
 			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined", LOG_ERR);
@@ -2553,8 +2471,7 @@ abstract class CommonObject
 		{
 			$row = $this->db->fetch_row($resql);
 			$nl = $row[0];
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		if ($nl > 0)
 		{
 			// The goal of this part is to reorder all lines, with all children lines sharing the same
@@ -2596,9 +2513,7 @@ abstract class CommonObject
 						$this->updateRangOfLine($row, ($key + 1));
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2608,10 +2523,11 @@ abstract class CommonObject
 	/**
 	 * 	Get children of line
 	 *
-	 * 	@param	int		$id		Id of parent line
-	 * 	@return	array			Array with list of children lines id
+	 * 	@param	int		$id		            Id of parent line
+	 * 	@param	int		$includealltree		0 = 1st level child, 1 = All level child
+	 * 	@return	array			            Array with list of children lines id
 	 */
-	public function getChildrenOfLine($id)
+	public function getChildrenOfLine($id, $includealltree = 0)
 	{
 		$rows = array();
 
@@ -2624,20 +2540,17 @@ abstract class CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$i = 0;
-			$num = $this->db->num_rows($resql);
-			while ($i < $num)
-			{
-				$row = $this->db->fetch_row($resql);
-				$rows[$i] = $row[0];
-				$i++;
+			if ($this->db->num_rows($resql) > 0) {
+				while ($row = $this->db->fetch_row($resql)) {
+					$rows[] = $row[0];
+					if (!empty($includealltree)) $rows = array_merge($rows, $this->getChildrenOfLine($row[0]), $includealltree);
+				}
 			}
 		}
-
 		return $rows;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Update a line to have a lower rank
 	 *
@@ -2647,7 +2560,7 @@ abstract class CommonObject
 	 */
 	public function line_up($rowid, $fk_parent_line = true)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->line_order(false, 'ASC', $fk_parent_line);
 
 		// Get rang of line
@@ -2657,7 +2570,7 @@ abstract class CommonObject
 		$this->updateLineUp($rowid, $rang);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Update a line to have a higher rank
 	 *
@@ -2667,7 +2580,7 @@ abstract class CommonObject
 	 */
 	public function line_down($rowid, $fk_parent_line = true)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->line_order(false, 'ASC', $fk_parent_line);
 
 		// Get rang of line
@@ -2702,7 +2615,7 @@ abstract class CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Update position of line with ajax (rang)
 	 *
@@ -2711,7 +2624,7 @@ abstract class CommonObject
 	 */
 	public function line_ajaxorder($rows)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$num = count($rows);
 		for ($i = 0; $i < $num; $i++)
 		{
@@ -2744,9 +2657,7 @@ abstract class CommonObject
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2778,9 +2689,7 @@ abstract class CommonObject
 				{
 					dol_print_error($this->db);
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2825,7 +2734,7 @@ abstract class CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Get max value used for position of line (rang)
 	 *
@@ -2834,8 +2743,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') $positionfield = 'position';
 
 		// Search the last rang with fk_parent_line
@@ -2853,16 +2762,13 @@ abstract class CommonObject
 				if (!empty($row[0]))
 				{
 					return $row[0];
-				}
-				else
-				{
+				} else {
 					return $this->getRangOfLine($fk_parent_line);
 				}
 			}
 		}
 		// If not, search the last rang of element
-		else
-		{
+		else {
 			$sql = 'SELECT max('.$positionfield.') FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 
@@ -2876,7 +2782,7 @@ abstract class CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update external ref of element
 	 *
@@ -2885,7 +2791,7 @@ abstract class CommonObject
 	 */
 	public function update_ref_ext($ref_ext)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		if (!$this->table_element)
 		{
 			dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);
@@ -2901,15 +2807,13 @@ abstract class CommonObject
 		{
 			$this->ref_ext = $ref_ext;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update note of element
 	 *
@@ -2919,7 +2823,7 @@ abstract class CommonObject
 	 */
 	public function update_note($note, $suffix = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		if (!$this->table_element)
@@ -2934,12 +2838,14 @@ abstract class CommonObject
 			dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
 			return -2;
 		}
+
+		$newsuffix = $suffix;
+
 		// Special cas
-		//var_dump($this->table_element);exit;
-		if ($this->table_element == 'product') $suffix = '';
+		if ($this->table_element == 'product' && $newsuffix == '_private') $newsuffix = '';
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET note".$suffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
+		$sql .= " SET note".$newsuffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
 		$sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;
 		$sql .= " WHERE rowid =".$this->id;
 
@@ -2948,21 +2854,18 @@ abstract class CommonObject
 		{
 			if ($suffix == '_public') $this->note_public = $note;
 			elseif ($suffix == '_private') $this->note_private = $note;
-			else
-			{
+			else {
 				$this->note = $note; // deprecated
 				$this->note_private = $note;
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Update public note (kept for backward compatibility)
 	 *
@@ -2973,11 +2876,11 @@ abstract class CommonObject
 	 */
 	public function update_note_public($note)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		return $this->update_note($note, '_public');
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Update total_ht, total_ttc, total_vat, total_localtax1, total_localtax2 for an object (sum of lines).
 	 *  Must be called at end of methods addline or updateline.
@@ -2990,16 +2893,16 @@ abstract class CommonObject
 	 */
 	public function update_price($exclspec = 0, $roundingadjust = 'none', $nodatabaseupdate = 0, $seller = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $hookmanager, $action;
 
-        $parameters = array('exclspec' => $exclspec, 'roundingadjust' => $roundingadjust, 'nodatabaseupdate' => $nodatabaseupdate, 'seller' => $seller);
-        $reshook = $hookmanager->executeHooks('updateTotalPrice', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-        if ($reshook > 0) {
-            return 1; // replacement code
-        } elseif ($reshook < 0) {
-            return -1; // failure
-        } // reshook = 0 => execute normal code
+		$parameters = array('exclspec' => $exclspec, 'roundingadjust' => $roundingadjust, 'nodatabaseupdate' => $nodatabaseupdate, 'seller' => $seller);
+		$reshook = $hookmanager->executeHooks('updateTotalPrice', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			return 1; // replacement code
+		} elseif ($reshook < 0) {
+			return -1; // failure
+		} // reshook = 0 => execute normal code
 
 		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
 		$MODULE = "";
@@ -3221,14 +3124,10 @@ abstract class CommonObject
 			if (!$error)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db, 'Bad request in update_price');
 			return -1;
 		}
@@ -3273,9 +3172,7 @@ abstract class CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return 0;
@@ -3346,19 +3243,16 @@ abstract class CommonObject
 		{
 			if ($justsource)
 			{
-				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'";
-				if ($withtargettype) $sql .= " AND targettype = '".$targettype."'";
-			}
-			elseif ($justtarget)
+				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				if ($withtargettype) $sql .= " AND targettype = '".$this->db->escape($targettype)."'";
+			} elseif ($justtarget)
 			{
-				$sql .= "fk_target = ".$targetid." AND targettype = '".$targettype."'";
-				if ($withsourcetype) $sql .= " AND sourcetype = '".$sourcetype."'";
+				$sql .= "fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
+				if ($withsourcetype) $sql .= " AND sourcetype = '".$this->db->escape($sourcetype)."'";
 			}
-		}
-		else
-		{
-			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')";
-			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')";
+		} else {
+			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."')";
+			$sql .= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."')";
 		}
 		$sql .= ' ORDER BY '.$orderby;
 
@@ -3376,14 +3270,11 @@ abstract class CommonObject
 					if ($justsource)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
-					}
-					elseif ($justtarget)
+					} elseif ($justtarget)
 					{
 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
-				}
-				else
-				{
+				} else {
 					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
 					{
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
@@ -3414,32 +3305,23 @@ abstract class CommonObject
 					// To work with non standard classpath or module name
 					if ($objecttype == 'facture') {
 						$classpath = 'compta/facture/class';
-					}
-					elseif ($objecttype == 'facturerec') {
+					} elseif ($objecttype == 'facturerec') {
 						$classpath = 'compta/facture/class'; $module = 'facture';
-					}
-					elseif ($objecttype == 'propal') {
+					} elseif ($objecttype == 'propal') {
 						$classpath = 'comm/propal/class';
-					}
-					elseif ($objecttype == 'supplier_proposal') {
+					} elseif ($objecttype == 'supplier_proposal') {
 						$classpath = 'supplier_proposal/class';
-					}
-					elseif ($objecttype == 'shipping') {
+					} elseif ($objecttype == 'shipping') {
 						$classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon';
-					}
-					elseif ($objecttype == 'delivery') {
+					} elseif ($objecttype == 'delivery') {
 						$classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon';
-					}
-					elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
+					} elseif ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') {
 						$classpath = 'fourn/class'; $module = 'fournisseur';
-					}
-					elseif ($objecttype == 'fichinter') {
+					} elseif ($objecttype == 'fichinter') {
 						$classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter';
-					}
-					elseif ($objecttype == 'subscription') {
+					} elseif ($objecttype == 'subscription') {
 						$classpath = 'adherents/class'; $module = 'adherent';
-					}
-					elseif ($objecttype == 'contact') {
+					} elseif ($objecttype == 'contact') {
 						 $module = 'societe';
 					}
 
@@ -3448,23 +3330,17 @@ abstract class CommonObject
 
 					if ($objecttype == 'order') {
 						$classfile = 'commande'; $classname = 'Commande';
-					}
-					elseif ($objecttype == 'invoice_supplier') {
+					} elseif ($objecttype == 'invoice_supplier') {
 						$classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur';
-					}
-					elseif ($objecttype == 'order_supplier') {
+					} elseif ($objecttype == 'order_supplier') {
 						$classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur';
-					}
-					elseif ($objecttype == 'supplier_proposal') {
+					} elseif ($objecttype == 'supplier_proposal') {
 						$classfile = 'supplier_proposal'; $classname = 'SupplierProposal';
-					}
-					elseif ($objecttype == 'facturerec') {
+					} elseif ($objecttype == 'facturerec') {
 						$classfile = 'facture-rec'; $classname = 'FactureRec';
-					}
-					elseif ($objecttype == 'subscription') {
+					} elseif ($objecttype == 'subscription') {
 						$classfile = 'subscription'; $classname = 'Subscription';
-					}
-					elseif ($objecttype == 'project' || $objecttype == 'projet') {
+					} elseif ($objecttype == 'project' || $objecttype == 'projet') {
 						$classpath = 'projet/class'; $classfile = 'project'; $classname = 'Project';
 					}
 
@@ -3488,17 +3364,13 @@ abstract class CommonObject
 								}
 							}
 						}
-					}
-					else
-					{
+					} else {
 						unset($this->linkedObjectsIds[$objecttype]);
 					}
 				}
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3529,8 +3401,7 @@ abstract class CommonObject
 			$sql .= ", sourcetype = '".$this->db->escape($sourcetype)."'";
 			$sql .= " WHERE fk_target = ".$this->id;
 			$sql .= " AND targettype = '".$this->db->escape($this->element)."'";
-		}
-		elseif ($updatetarget)
+		} elseif ($updatetarget)
 		{
 			$sql .= "fk_target = ".$targetid;
 			$sql .= ", targettype = '".$this->db->escape($targettype)."'";
@@ -3542,9 +3413,7 @@ abstract class CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -3579,21 +3448,16 @@ abstract class CommonObject
 		if ($rowid > 0)
 		{
 			$sql .= " rowid = ".$rowid;
-		}
-		else
-		{
+		} else {
 			if ($deletesource)
 			{
 				$sql .= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
 				$sql .= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'";
-			}
-			elseif ($deletetarget)
+			} elseif ($deletetarget)
 			{
 				$sql .= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
 				$sql .= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'";
-			}
-			else
-			{
+			} else {
 				$sql .= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')";
 				$sql .= " OR";
 				$sql .= " (fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."')";
@@ -3604,9 +3468,7 @@ abstract class CommonObject
 		if ($this->db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -3683,16 +3545,12 @@ abstract class CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setStatut ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -3731,11 +3589,8 @@ abstract class CommonObject
 			{
 				$this->canvas = $obj->canvas;
 				return 1;
-			}
-			else return 0;
-		}
-		else
-		{
+			} else return 0;
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3808,16 +3663,13 @@ abstract class CommonObject
 					if (is_numeric($elementname))	// old usage
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
-					}
-					else	// new usage: $elementname=Translation key
+					} else // new usage: $elementname=Translation key
 					{
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname));
 					}
 					break; // We found at least one, we stop here
 				}
-			}
-			else
-			{
+			} else {
 				$this->errors[] = $this->db->lasterror();
 				return -1;
 			}
@@ -3826,8 +3678,7 @@ abstract class CommonObject
 		{
 			$this->errors[] = "ErrorRecordHasChildren";
 			return $haschild;
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -3919,8 +3770,7 @@ abstract class CommonObject
 			{
 				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
 				$totalToShip += $line->qty_shipped; // defined for shipment only
-			}
-			elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
+			} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
 			{
 				if (empty($totalToShip)) $totalToShip = 0;
 				$totalToShip += $line->qty; // defined for reception only
@@ -3930,13 +3780,12 @@ abstract class CommonObject
 			if ($this->element == 'shipping') {
 				// for shipments
 				$qty = $line->qty_shipped ? $line->qty_shipped : 0;
-			}
-			else {
+			} else {
 				$qty = $line->qty ? $line->qty : 0;
 			}
 
 			$weight = $line->weight ? $line->weight : 0;
-            ($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;
+			($weight == 0 && !empty($line->product->weight)) ? $weight = $line->product->weight : 0;
 			$volume = $line->volume ? $line->volume : 0;
 			($volume == 0 && !empty($line->product->volume)) ? $volume = $line->product->volume : 0;
 
@@ -3958,8 +3807,7 @@ abstract class CommonObject
 			{
 				$trueWeightUnit = pow(10, $weightUnit);
 				$totalWeight += $weight * $qty * $trueWeightUnit;
-			}
-			else {
+			} else {
 				if ($weight_units == 99) {
 					// conversion 1 Pound = 0.45359237 KG
 					$trueWeightUnit = 0.45359237;
@@ -3968,8 +3816,7 @@ abstract class CommonObject
 					// conversion 1 Ounce = 0.0283495 KG
 					$trueWeightUnit = 0.0283495;
 					$totalWeight += $weight * $qty * $trueWeightUnit;
-				}
-				else {
+				} else {
 					$totalWeight += $weight * $qty; // This may be wrong if we mix different units
 				}
 			}
@@ -3979,9 +3826,7 @@ abstract class CommonObject
 				$trueVolumeUnit = pow(10, $volumeUnit);
 				//print $line->volume;
 				$totalVolume += $volume * $qty * $trueVolumeUnit;
-			}
-			else
-			{
+			} else {
 				$totalVolume += $volume * $qty; // This may be wrong if we mix different units
 			}
 		}
@@ -4012,113 +3857,13 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *    Return incoterms informations
-	 *    TODO Use a cache for label get
-	 *
-	 *    @return	string	incoterms info
-	 */
-	public function display_incoterms()
-	{
-        // phpcs:enable
-		$out = '';
-		$this->label_incoterms = '';
-		if (!empty($this->fk_incoterms))
-		{
-			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
-			$result = $this->db->query($sql);
-			if ($result)
-			{
-				$res = $this->db->fetch_object($result);
-				$out .= $res->code;
-			}
-		}
-
-		$out .= (($res->code && $this->location_incoterms) ? ' - ' : '').$this->location_incoterms;
-
-		return $out;
-	}
-
-	/**
-	 *    Return incoterms informations for pdf display
-	 *
-	 *    @return	string		incoterms info
-	 */
-	public function getIncotermsForPDF()
-	{
-		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			if ($num > 0)
-			{
-				$res = $this->db->fetch_object($resql);
-				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
-			}
-			else
-			{
-				return '';
-			}
-		}
-		else
-		{
-			$this->errors[] = $this->db->lasterror();
-			return false;
-		}
-	}
-
-	/**
-	 *    Define incoterms values of current object
-	 *
-	 *    @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
-	 */
-	public function setIncoterms($id_incoterm, $location)
-	{
-		if ($this->id && $this->table_element)
-		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
-			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
-			$sql .= " WHERE rowid = ".$this->id;
-			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$this->fk_incoterms = $id_incoterm;
-				$this->location_incoterms = $location;
-
-				$sql = 'SELECT libelle FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
-				$res = $this->db->query($sql);
-				if ($res)
-				{
-					$obj = $this->db->fetch_object($res);
-					$this->label_incoterms = $obj->libelle;
-				}
-				return 1;
-			}
-			else
-			{
-				$this->errors[] = $this->db->lasterror();
-				return -1;
-			}
-		}
-		else return -1;
-	}
-
-
 	// --------------------
 	// TODO: All functions here must be redesigned and moved as they are not business functions but output functions
 	// --------------------
@@ -4156,9 +3901,7 @@ abstract class CommonObject
 			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
-			}
-			else
-			{
+			} else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_create.tpl.php';
 			}
 
@@ -4223,9 +3966,7 @@ abstract class CommonObject
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_title.tpl.php');
-				}
-				else
-				{
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
@@ -4252,9 +3993,7 @@ abstract class CommonObject
 				{
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				}
-				else
-				{
+				} else {
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
@@ -4335,9 +4074,7 @@ abstract class CommonObject
 					}
 
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label;
-				}
-				else
-				{
+				} else {
 					$label = $line->product_label;
 				}
 
@@ -4356,9 +4093,7 @@ abstract class CommonObject
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
-				}
-				else
-				{
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';
 				}
 
@@ -4387,9 +4122,7 @@ abstract class CommonObject
 				if (!empty($module))
 				{
 					$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
-				}
-				else
-				{
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_edit.tpl.php';
 				}
 
@@ -4433,8 +4166,8 @@ abstract class CommonObject
 			print '<td class="left">'.$langs->trans('Unit').'</td>';
 		}
 		print '<td class="right">'.$langs->trans('ReductionShort').'</td>';
-        print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
-        print '</tr>';
+		print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
+		print '</tr>';
 		$i = 0;
 
 		if (!empty($this->lines))
@@ -4449,9 +4182,7 @@ abstract class CommonObject
 						$action = '';
 						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 					}
-				}
-				else
-				{
+				} else {
 					$this->printOriginLine($line, '', $restrictlist, '/core/tpl', $selectedLines);
 				}
 
@@ -4481,23 +4212,19 @@ abstract class CommonObject
 		if (!empty($line->date_start))
 		{
 			$date_start = $line->date_start;
-		}
-		else
-		{
+		} else {
 			$date_start = $line->date_debut_prevue;
 			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
 		}
 		if (!empty($line->date_end))
 		{
 			$date_end = $line->date_end;
-		}
-		else
-		{
+		} else {
 			$date_end = $line->date_fin_prevue;
 			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
 		}
 
-        $this->tpl['id'] = $line->id;
+		$this->tpl['id'] = $line->id;
 
 		$this->tpl['label'] = '';
 		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');
@@ -4507,8 +4234,7 @@ abstract class CommonObject
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fk_soc = $this->socid;
 			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
-		}
-		elseif (!empty($line->fk_product))
+		} elseif (!empty($line->fk_product))
 		{
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
@@ -4526,9 +4252,7 @@ abstract class CommonObject
 			{
 				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
-		}
-		else
-		{
+		} else {
 			$this->tpl['label'] .= ($line->product_type == -1 ? '&nbsp;' : ($line->product_type == 1 ? img_object($langs->trans(''), 'service') : img_object($langs->trans(''), 'product')));
 			if (!empty($line->desc)) {
 				$this->tpl['label'] .= $line->desc;
@@ -4550,39 +4274,32 @@ abstract class CommonObject
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
+			} elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
 			{
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS RECEIVED)')
+			} elseif ($line->desc == '(EXCESS RECEIVED)')
 			{
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-			}
-			elseif ($line->desc == '(EXCESS PAID)')
+			} elseif ($line->desc == '(EXCESS PAID)')
 			{
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-			}
-			else
-			{
+			} else {
 				$this->tpl['description'] = dol_trunc($line->desc, 60);
 			}
-		}
-		else
-		{
+		} else {
 			$this->tpl['description'] = '&nbsp;';
 		}
 
-        // VAT Rate
-        $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
-        $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-        if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
+		// VAT Rate
+		$this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
+		$this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
+		if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
@@ -4602,9 +4319,7 @@ abstract class CommonObject
 			if (!empty($module))
 			{
 				$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
-			}
-			else
-			{
+			} else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/originproductline.tpl.php';
 			}
 
@@ -4618,7 +4333,7 @@ abstract class CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Add resources to the current object : add entry into llx_element_resources
 	 *	Need $this->element & $this->id
@@ -4631,7 +4346,7 @@ abstract class CommonObject
 	 */
 	public function add_element_resource($resource_id, $resource_type, $busy = 0, $mandatory = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_resources (";
@@ -4655,16 +4370,14 @@ abstract class CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return  0;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Delete a link to resource line
 	 *
@@ -4675,7 +4388,7 @@ abstract class CommonObject
 	 */
 	public function delete_resource($rowid, $element, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$this->db->begin();
@@ -4691,9 +4404,7 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
-		{
+		} else {
 			if (!$notrigger)
 			{
 				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
@@ -4727,7 +4438,7 @@ abstract class CommonObject
 	 * Common function for all objects extending CommonObject for generating documents
 	 *
 	 * @param 	string 		$modelspath 	Relative folder where generators are placed
-	 * @param 	string 		$modele 		Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf','alpha') for example.
+	 * @param 	string 		$modele 		Generator to use. Caller must set it to obj->model_pdf or GETPOST('model_pdf','alpha') for example.
 	 * @param 	Translate 	$outputlangs 	Output language to use
 	 * @param 	int 		$hidedetails 	1 to hide details. 0 by default
 	 * @param 	int 		$hidedesc 		1 to hide product description. 0 by default
@@ -4747,255 +4458,246 @@ abstract class CommonObject
 
 		if (empty($reshook))
 		{
-		    dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
+			dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
-		    // Increase limit for PDF build
-		    $err = error_reporting();
-		    error_reporting(0);
-		    @set_time_limit(120);
-		    error_reporting($err);
+			// Increase limit for PDF build
+			$err = error_reporting();
+			error_reporting(0);
+			@set_time_limit(120);
+			error_reporting($err);
 
-		    // If selected model is a filename template (then $modele="modelname" or "modelname:filename")
-		    $tmp = explode(':', $modele, 2);
-		    if (!empty($tmp[1]))
-		    {
-			    $modele = $tmp[0];
-			    $srctemplatepath = $tmp[1];
-		    }
+			// If selected model is a filename template (then $modele="modelname" or "modelname:filename")
+			$tmp = explode(':', $modele, 2);
+			if (!empty($tmp[1]))
+			{
+				$modele = $tmp[0];
+				$srctemplatepath = $tmp[1];
+			}
 
-		    // Search template files
+			// Search template files
 			$file = '';
 			$classname = '';
 			$filefound = '';
-		    $dirmodels = array('/');
-		    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)
-			    {
-				    if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
-				    else $file = $prefix."_".$modele.".modules.php";
+			$dirmodels = array('/');
+			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)
+				{
+					if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php
+					else $file = $prefix."_".$modele.".modules.php";
 
-				    // On verifie l'emplacement du modele
-				    $file = dol_buildpath($reldir.$modelspath.$file, 0);
-				    if (file_exists($file))
-				    {
-					    $filefound = $file;
-					    $classname = $prefix.'_'.$modele;
-					    break;
-				    }
-			    }
-			    if ($filefound) break;
-		    }
+					// On verifie l'emplacement du modele
+					$file = dol_buildpath($reldir.$modelspath.$file, 0);
+					if (file_exists($file))
+					{
+						$filefound = $file;
+						$classname = $prefix.'_'.$modele;
+						break;
+					}
+				}
+				if ($filefound) break;
+			}
 
-		    // If generator was found
-		    if ($filefound)
-		    {
-			    global $db; // Required to solve a conception default making an include of code using $db instead of $this->db just after.
+			// If generator was found
+			if ($filefound)
+			{
+				global $db; // Required to solve a conception default making an include of code using $db instead of $this->db just after.
 
-			    require_once $file;
+				require_once $file;
 
-			    $obj = new $classname($this->db);
+				$obj = new $classname($this->db);
 
-			    // If generator is ODT, we must have srctemplatepath defined, if not we set it.
-			    if ($obj->type == 'odt' && empty($srctemplatepath))
-			    {
-				    $varfortemplatedir = $obj->scandir;
-				    if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir))
-				    {
-					    $dirtoscan = $conf->global->$varfortemplatedir;
+				// If generator is ODT, we must have srctemplatepath defined, if not we set it.
+				if ($obj->type == 'odt' && empty($srctemplatepath))
+				{
+					$varfortemplatedir = $obj->scandir;
+					if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir))
+					{
+						$dirtoscan = $conf->global->$varfortemplatedir;
 
-					    $listoffiles = array();
+						$listoffiles = array();
 
-					    // Now we add first model found in directories scanned
-					    $listofdir = explode(',', $dirtoscan);
-					    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))
-						    {
-							    $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
-							    if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
-						    }
-					    }
+						// Now we add first model found in directories scanned
+						$listofdir = explode(',', $dirtoscan);
+						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))
+							{
+								$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
+								if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+							}
+						}
 
-					    if (count($listoffiles))
-					    {
-						    foreach ($listoffiles as $record)
-						    {
-							    $srctemplatepath = $record['fullname'];
-							    break;
-						    }
-					    }
-				    }
+						if (count($listoffiles))
+						{
+							foreach ($listoffiles as $record)
+							{
+								$srctemplatepath = $record['fullname'];
+								break;
+							}
+						}
+					}
 
-				    if (empty($srctemplatepath))
-				    {
-					    $this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
-					    return -1;
-				    }
-			    }
+					if (empty($srctemplatepath))
+					{
+						$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
+						return -1;
+					}
+				}
 
-			    if ($obj->type == 'odt' && !empty($srctemplatepath))
-			    {
-				    if (!dol_is_file($srctemplatepath))
-				    {
-				    	dol_syslog("Failed to locate template file ".$srctemplatepath, LOG_WARNING);
-					    $this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
-					    return -1;
-				    }
-			    }
+				if ($obj->type == 'odt' && !empty($srctemplatepath))
+				{
+					if (!dol_is_file($srctemplatepath))
+					{
+						dol_syslog("Failed to locate template file ".$srctemplatepath, LOG_WARNING);
+						$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
+						return -1;
+					}
+				}
 
-			    // 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;
+				// 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 (in_array(get_class($this), array('Adherent')))
-			    {
-				    $arrayofrecords = array(); // The write_file of templates of adherent class need this var
-				    $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
-			    }
-			    else
-			    {
-				     $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
-			    }
-			    // After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
+				if (in_array(get_class($this), array('Adherent')))
+				{
+					$arrayofrecords = array(); // The write_file of templates of adherent class need this var
+					$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
+				} else {
+					 $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
+				}
+				// After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
 
-			    if ($resultwritefile > 0)
-			    {
-				    $outputlangs->charset_output = $sav_charset_output;
+				if ($resultwritefile > 0)
+				{
+					$outputlangs->charset_output = $sav_charset_output;
 
-				    // We delete old preview
-				    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-				    dol_delete_preview($this);
+					// We delete old preview
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+					dol_delete_preview($this);
 
-				    // Index file in database
-				    if (!empty($obj->result['fullpath']))
-				    {
-					    $destfull = $obj->result['fullpath'];
-					    $upload_dir = dirname($destfull);
-					    $destfile = basename($destfull);
-					    $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
+					// Index file in database
+					if (!empty($obj->result['fullpath']))
+					{
+						$destfull = $obj->result['fullpath'];
+						$upload_dir = dirname($destfull);
+						$destfile = basename($destfull);
+						$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-					    if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
-					    {
-						    $filename = basename($destfile);
-						    $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
-						    $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
+						if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
+						{
+							$filename = basename($destfile);
+							$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
+							$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-						    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-						    $ecmfile = new EcmFiles($this->db);
-						    $result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
+							include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+							$ecmfile = new EcmFiles($this->db);
+							$result = $ecmfile->fetch(0, '', ($rel_dir ? $rel_dir.'/' : '').$filename);
 
-						     // Set the public "share" key
-						    $setsharekey = false;
-						    if ($this->element == 'propal')
-						    {
-							    $useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
-							    if ($useonlinesignature) $setsharekey = true;
-							    if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
-						    }
-						    if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
-							    $setsharekey = true;
-						    }
-						    if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
-							    $setsharekey = true;
-						    }
-						    if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
-							    $setsharekey = true;
-						    }
+							 // Set the public "share" key
+							$setsharekey = false;
+							if ($this->element == 'propal')
+							{
+								$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
+								if ($useonlinesignature) $setsharekey = true;
+								if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
+							}
+							if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
+								$setsharekey = true;
+							}
+							if ($this->element == 'facture' && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
+								$setsharekey = true;
+							}
+							if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
+								$setsharekey = true;
+							}
 
-						    if ($setsharekey) {
-							    if (empty($ecmfile->share))	// Because object not found or share not set yet
-							    {
-								    require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-								    $ecmfile->share = getRandomPassword(true);
-							    }
-						    }
+							if ($setsharekey) {
+								if (empty($ecmfile->share))	// Because object not found or share not set yet
+								{
+									require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+									$ecmfile->share = getRandomPassword(true);
+								}
+							}
 
-						    if ($result > 0)
-						     {
-							    $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
-							    $ecmfile->fullpath_orig = '';
-							    $ecmfile->gen_or_uploaded = 'generated';
-							    $ecmfile->description = ''; // indexed content
-							    $ecmfile->keyword = ''; // keyword content
-							    $result = $ecmfile->update($user);
-							    if ($result < 0) {
-								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-							    }
-						    }
-						    else
-						    {
-							    $ecmfile->entity = $conf->entity;
-							    $ecmfile->filepath = $rel_dir;
-							    $ecmfile->filename = $filename;
-							    $ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
-							    $ecmfile->fullpath_orig = '';
-							    $ecmfile->gen_or_uploaded = 'generated';
-							    $ecmfile->description = ''; // indexed content
-							    $ecmfile->keyword = ''; // keyword content
-							    $ecmfile->src_object_type = $this->table_element;
-							    $ecmfile->src_object_id   = $this->id;
+							if ($result > 0)
+							 {
+								$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
+								$ecmfile->fullpath_orig = '';
+								$ecmfile->gen_or_uploaded = 'generated';
+								$ecmfile->description = ''; // indexed content
+								$ecmfile->keyword = ''; // keyword content
+								$result = $ecmfile->update($user);
+								if ($result < 0) {
+									setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+								}
+							} else {
+								$ecmfile->entity = $conf->entity;
+								$ecmfile->filepath = $rel_dir;
+								$ecmfile->filename = $filename;
+								$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
+								$ecmfile->fullpath_orig = '';
+								$ecmfile->gen_or_uploaded = 'generated';
+								$ecmfile->description = ''; // indexed content
+								$ecmfile->keyword = ''; // keyword content
+								$ecmfile->src_object_type = $this->table_element;
+								$ecmfile->src_object_id   = $this->id;
 
-							    $result = $ecmfile->create($user);
-							    if ($result < 0) {
-								    setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-							    }
-						    }
+								$result = $ecmfile->create($user);
+								if ($result < 0) {
+									setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
+								}
+							}
 
-						    /*$this->result['fullname']=$destfull;
+							/*$this->result['fullname']=$destfull;
 						    $this->result['filepath']=$ecmfile->filepath;
 						    $this->result['filename']=$ecmfile->filename;*/
-						    //var_dump($obj->update_main_doc_field);exit;
+							//var_dump($obj->update_main_doc_field);exit;
 
-						    // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
-						    $update_main_doc_field = 0;
-						    if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
-						    if ($update_main_doc_field && !empty($this->table_element))
-						    {
-							    $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
-							    $sql .= ' WHERE rowid = '.$this->id;
+							// Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set)
+							$update_main_doc_field = 0;
+							if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
+							if ($update_main_doc_field && !empty($this->table_element))
+							{
+								$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
+								$sql .= ' WHERE rowid = '.$this->id;
 
-							    $resql = $this->db->query($sql);
-							    if (!$resql) {
+								$resql = $this->db->query($sql);
+								if (!$resql) {
 									dol_print_error($this->db);
 								} else {
-							        $this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
-							    }
-						    }
-					    }
-				    }
-				    else
-				    {
-					    dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
-				    }
+									$this->last_main_doc = $ecmfile->filepath.'/'.$ecmfile->filename;
+								}
+							}
+						}
+					} else {
+						dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING);
+					}
 
-				    // Success in building document. We build meta file.
-				    dol_meta_create($this);
+					// Success in building document. We build meta file.
+					dol_meta_create($this);
 
-				    return 1;
-			    }
-			    else
-			    {
-				    $outputlangs->charset_output = $sav_charset_output;
-				    dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
-				    return -1;
-			    }
-		    } else {
-		    	if (! $filefound) {
-			    	$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;
-			    	dol_print_error('', $this->error);
-		    	} else {
-		    		$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $filefound);
-		    		dol_print_error('', $this->error);
-		    	}
-			    return -1;
-		    }
-		}
-		else return $reshook;
+					return 1;
+				} else {
+					$outputlangs->charset_output = $sav_charset_output;
+					dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
+					return -1;
+				}
+			} else {
+				if (!$filefound) {
+					$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;
+					dol_print_error('', $this->error);
+				} else {
+					$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $filefound);
+					dol_print_error('', $this->error);
+				}
+				return -1;
+			}
+		} else return $reshook;
 	}
 
 	/**
@@ -5100,9 +4802,7 @@ abstract class CommonObject
 			if (!empty($this->errors))
 			{
 				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
-			}
-			else
-			{
+			} else {
 				$this->errors = $interface->errors;
 			}
 		}
@@ -5141,7 +4841,7 @@ abstract class CommonObject
 		// Request to get translation values for object
 		$sql = "SELECT rowid, property, lang , value";
 		$sql .= " FROM ".MAIN_DB_PREFIX."object_lang";
-		$sql .= " WHERE type_object = '".$element."'";
+		$sql .= " WHERE type_object = '".$this->db->escape($element)."'";
 		$sql .= " AND fk_object = ".$this->id;
 
 		//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
@@ -5163,9 +4863,7 @@ abstract class CommonObject
 					if (preg_match('/date/', $type))
 					{
 						$this->array_languages[$key][$codelang] = $this->db->jdate($value);
-					}
-					else
-					{
+					} else {
 						$this->array_languages[$key][$codelang] = $value;
 					}
 
@@ -5177,9 +4875,7 @@ abstract class CommonObject
 
 			if ($numrows) return $numrows;
 			else return 0;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -5228,14 +4924,12 @@ abstract class CommonObject
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 				$value_key = dol_mktime(0, 0, 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
-			}
-			elseif (in_array($key_type, array('datetime')))
+			} elseif (in_array($key_type, array('datetime')))
 			{
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 				$value_key = dol_mktime($_POST[$postfieldkey."hour"], $_POST[$postfieldkey."min"], 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
-			}
-			elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
+			} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 			{
 				$value_arr = GETPOST($postfieldkey, 'array'); // check if an array
 				if (!empty($value_arr)) {
@@ -5243,14 +4937,11 @@ abstract class CommonObject
 				} else {
 					$value_key = '';
 				}
-			}
-			elseif (in_array($key_type, array('price', 'double')))
+			} elseif (in_array($key_type, array('price', 'double')))
 			{
 				$value_arr = GETPOST($postfieldkey, 'alpha');
 				$value_key = price2num($value_arr);
-			}
-			else
-			{
+			} else {
 				$value_key = GETPOST($postfieldkey);
 				if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
 			}
@@ -5330,9 +5021,7 @@ abstract class CommonObject
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
 			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);
-		}
-		else
-		{
+		} else {
 			global $extrafields;
 			dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING);
 		}
@@ -5352,7 +5041,7 @@ abstract class CommonObject
 				}
 			}
 			$sql .= " FROM ".MAIN_DB_PREFIX.$table_element."_extrafields";
-			$sql .= " WHERE fk_object = ".$rowid;
+			$sql .= " WHERE fk_object = ".((int) $rowid);
 
 			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
 			$resql = $this->db->query($sql);
@@ -5373,9 +5062,7 @@ abstract class CommonObject
 							{
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key] = $this->db->jdate($value);
-							}
-							else
-							{
+							} else {
 								$this->array_options["options_".$key] = $value;
 							}
 
@@ -5399,9 +5086,7 @@ abstract class CommonObject
 
 				if ($numrows) return $numrows;
 				else return 0;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return -1;
 			}
@@ -5434,9 +5119,7 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -5495,7 +5178,7 @@ abstract class CommonObject
 			   		if ($this->array_options[$key] === '') $mandatorypb = true;
 			   		if ($mandatorypb)
 			   		{
-			   		    dol_syslog("Mandatory extra field ".$key." is empty");
+			   			dol_syslog("Mandatory extra field ".$key." is empty");
 			   			$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
 			   			return -1;
 			   		}
@@ -5509,11 +5192,9 @@ abstract class CommonObject
 					if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS))
 					{
 						$value = dol_eval($attrfieldcomputed, 1, 0);
-					    dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
-					    $new_array_options[$key] = $value;
-					}
-					else
-					{
+						dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
+						$new_array_options[$key] = $value;
+					} else {
 						$new_array_options[$key] = null;
 					}
 				}
@@ -5525,8 +5206,7 @@ abstract class CommonObject
 			   			{
 			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 			   				return -1;
-			  			}
-			   			elseif ($value == '')
+			  			} elseif ($value == '')
 			   			{
 			   				$new_array_options[$key] = null;
 			   			}
@@ -5539,8 +5219,7 @@ abstract class CommonObject
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." for ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value == '')
+						} elseif ($value == '')
 						{
 							$new_array_options[$key] = null;
 						}
@@ -5571,21 +5250,16 @@ abstract class CommonObject
 				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 				   					{
 				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
-				   					}
-									else
-									{
+				   					} else {
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
 										$new_array_options[$key] = $newvalue;
 									}
-			   					}
-			   					else
-			   					{
+			   					} else {
 			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 			   					}
 			   				}
-			   			}
-			   			else	// Common usage
+			   			} else // Common usage
 			   			{
 			   				$new_array_options[$key] = $this->array_options[$key];
 			   			}
@@ -5609,24 +5283,20 @@ abstract class CommonObject
 							if ($value == '-1')	// -1 is key for no defined in combo list of objects
 							{
 								$new_array_options[$key] = '';
-							}
-							elseif ($value)
+							} elseif ($value)
 							{
 								$object = new $InfoFieldList[0]($this->db);
 								if (is_numeric($value)) $res = $object->fetch($value);
 								else $res = $object->fetch('', $value);
 
 								if ($res > 0) $new_array_options[$key] = $object->id;
-								else
-								{
+								else {
 									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
 								}
 							}
-						}
-						else
-						{
+						} else {
 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 						}
 						break;
@@ -5654,13 +5324,13 @@ abstract class CommonObject
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
-    			foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
-    			{
-    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
-    			    {
-    			        $sql .= ",".$tmpkey;
-    			    }
-    			}
+				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+				{
+					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+					{
+						$sql .= ",".$tmpkey;
+					}
+				}
 			}
 			$sql .= ") VALUES (".$this->id;
 
@@ -5673,9 +5343,7 @@ abstract class CommonObject
 					if ($new_array_options[$key] != '' || $new_array_options[$key] == '0')
 					{
 						$sql .= ",'".$this->db->escape($new_array_options[$key])."'";
-					}
-					else
-					{
+					} else {
 						$sql .= ",null";
 					}
 				}
@@ -5683,14 +5351,14 @@ abstract class CommonObject
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']))
 			{
-			    foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
-    			{
-    			    if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
-    			    {
-                        if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0";
-                        else $sql .= ", ''";
-    			    }
-    			}
+				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval)
+				{
+					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey]))    // If field not already added previously
+					{
+						if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0";
+						else $sql .= ", ''";
+					}
+				}
 			}
 
 			$sql .= ")";
@@ -5716,14 +5384,11 @@ abstract class CommonObject
 			{
 				$this->db->rollback();
 				return -1;
-			}
-			else
-			{
+			} else {
 				$this->db->commit();
 				return 1;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -5766,8 +5431,7 @@ abstract class CommonObject
 						{
 							$this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value == '')
+						} elseif ($value == '')
 						{
 							$new_array_languages[$key] = null;
 						}
@@ -5779,8 +5443,7 @@ abstract class CommonObject
 							dol_syslog($langs->trans("ExtraLanguageHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel);
 							return -1;
-						}
-						elseif ($value == '')
+						} elseif ($value == '')
 						{
 							$new_array_languages[$key] = null;
 						}
@@ -5839,14 +5502,11 @@ abstract class CommonObject
 			{
 				$this->db->rollback();
 				return -1;
-			}
-			else
-			{
+			} else {
 				$this->db->commit();
 				return 1;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -5894,8 +5554,7 @@ abstract class CommonObject
 					{
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value === '')
+					} elseif ($value === '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5907,8 +5566,7 @@ abstract class CommonObject
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					}
-					elseif ($value === '')
+					} elseif ($value === '')
 					{
 						$this->array_options["options_".$key] = null;
 					}
@@ -5969,14 +5627,11 @@ abstract class CommonObject
 				dol_syslog(__METHOD__.$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
-			}
-			else
-			{
+			} else {
 				$this->db->commit();
 				return 1;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -6032,38 +5687,38 @@ abstract class CommonObject
 		}
 
 		$out = '';
-        $type = '';
-        $param = array();
-        $param['options'] = array();
-        $reg = array();
-        $size = $this->fields[$key]['size'];
-        // Because we work on extrafields
-        if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-        	$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
-        	$type = 'link';
-        } elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-        	$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');
-        	$type = 'link';
-        } elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options'] = array($reg[2].':'.$reg[3] => 'N');
-            $type = 'link';
-        } elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
-            $type = 'sellist';
-        } elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
-            $param['options'] = array();
-            $type = 'varchar';
-            $size = $reg[1];
-        } elseif (preg_match('/varchar/', $val['type'])) {
-            $param['options'] = array();
-            $type = 'varchar';
-        } elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
-            $param['options'] = $this->fields[$key]['arrayofkeyval'];
-            $type = 'select';
-        } else {
-            $param['options'] = array();
-            $type = $this->fields[$key]['type'];
-        }
+		$type = '';
+		$param = array();
+		$param['options'] = array();
+		$reg = array();
+		$size = $this->fields[$key]['size'];
+		// Because we work on extrafields
+		if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
+			$type = 'link';
+		} elseif (preg_match('/^(integer|link):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+			$type = 'link';
+		} elseif (preg_match('/^(integer|link):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[2].':'.$reg[3] => 'N');
+			$type = 'link';
+		} elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+			$type = 'sellist';
+		} elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
+			$param['options'] = array();
+			$type = 'varchar';
+			$size = $reg[1];
+		} elseif (preg_match('/varchar/', $val['type'])) {
+			$param['options'] = array();
+			$type = 'varchar';
+		} elseif (is_array($this->fields[$key]['arrayofkeyval'])) {
+			$param['options'] = $this->fields[$key]['arrayofkeyval'];
+			$type = 'select';
+		} else {
+			$param['options'] = array();
+			$type = $this->fields[$key]['type'];
+		}
 
 		$label = $this->fields[$key]['label'];
 		//$elementtype=$this->fields[$key]['elementtype'];	// Seems not used
@@ -6086,42 +5741,31 @@ abstract class CommonObject
 		}
 
 		// Set value of $morecss. For this, we use in priority showsize from parameters, then $val['css'] then autodefine
-		if (empty($morecss) && !empty($val['css']))
-		{
-		    $morecss = $val['css'];
-		}
-		elseif (empty($morecss))
-		{
+		if (empty($morecss) && !empty($val['css'])) {
+			$morecss = $val['css'];
+		} elseif (empty($morecss)) {
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'link')	// link means an foreign key to another primary id
+			} elseif ($type == 'datetime' || $type == 'link')	// link means an foreign key to another primary id
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+			} elseif (in_array($type, array('int', 'integer', 'price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 			{
 				$morecss = 'maxwidth75';
 			} elseif ($type == 'url') {
 				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss = '';
-			}
-			else
-			{
+			} else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
-				{
+				} else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -6139,56 +5783,44 @@ abstract class CommonObject
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type, array('duration')))
+		} elseif (in_array($type, array('duration')))
 		{
 			$out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1);
-		}
-		elseif (in_array($type, array('int', 'integer')))
+		} elseif (in_array($type, array('int', 'integer')))
 		{
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		}
-		elseif (in_array($type, array('real')))
+			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
+		} elseif (in_array($type, array('real')))
 		{
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
+		} elseif (preg_match('/varchar/', $type))
 		{
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		}
-		elseif ($type == 'text')
+			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
+		} elseif (preg_match('/^text/', $type))
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif (preg_match('/^html/', $type))
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked = '';
 			if (!empty($value)) {
@@ -6197,22 +5829,19 @@ abstract class CommonObject
 				$checked = ' value="1" ';
 			}
 			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
+		} elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/', $type))
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -6222,7 +5851,7 @@ abstract class CommonObject
 			}
 
 			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-                if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';
+				if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
@@ -6233,8 +5862,7 @@ abstract class CommonObject
 				$out .= '>'.$val.'</option>';
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -6301,14 +5929,10 @@ abstract class CommonObject
 					{
 						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
-					}
-					else
-					{
+					} else {
 						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
-				}
-				else
-				{
+				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
@@ -6343,9 +5967,7 @@ abstract class CommonObject
 							{
 								$labeltoshow .= $obj->$field_toshow.' ';
 							}
-						}
-						else
-						{
+						} else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
 						$labeltoshow = dol_trunc($labeltoshow, 45);
@@ -6362,16 +5984,13 @@ abstract class CommonObject
 								}
 							}
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							if (!$notrans)
 							{
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
-								}
-								else {
+								} else {
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
@@ -6395,19 +6014,16 @@ abstract class CommonObject
 						$i++;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
@@ -6418,13 +6034,11 @@ abstract class CommonObject
 				$out .= ($value == $keyopt ? 'checked' : '');
 				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -6562,8 +6176,7 @@ abstract class CommonObject
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter]]'
 			$param_list_array = explode(':', $param_list[0]);
@@ -6588,13 +6201,11 @@ abstract class CommonObject
 		   			$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				}
 			}
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out = '<input type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$newval = $val;
 			$newval['type'] = 'varchar(256)';
@@ -6673,8 +6284,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
+		} elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
 		if (is_array($val['arrayofkeyval'])) $type = 'select';
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
 
@@ -6690,11 +6300,10 @@ abstract class CommonObject
 		{
 			$type = 'link';
 			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
+		} elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
+			$type = 'sellist';
 		}
-        elseif (preg_match('/^sellist:(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
-            $param['options'] = array($reg[1].':'.$reg[2].':'.$reg[3].':'.$reg[4] => 'N');
-            $type = 'sellist';
-        }
 
 		$langfile = $val['langfile'];
 		$list = $val['list'];
@@ -6716,35 +6325,26 @@ abstract class CommonObject
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'timestamp')
+			} elseif ($type == 'datetime' || $type == 'timestamp')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'double', 'price')))
+			} elseif (in_array($type, array('int', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss = '';
-			}
-			else
-			{
+			} else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
-				{
+				} else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -6760,59 +6360,49 @@ abstract class CommonObject
 			} else {
 				$value = '';
 			}
-		}
-		elseif ($type == 'datetime' || $type == 'timestamp')
+		} elseif ($type == 'datetime' || $type == 'timestamp')
 		{
 			if (!empty($value)) {
 				$value = dol_print_date($value, 'dayhour');
 			} else {
 				$value = '';
 			}
-		}
-		elseif ($type == 'duration')
+		} elseif ($type == 'duration')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			if (!is_null($value) && $value !== '') {
 				$value = convertSecondToTime($value, 'allhourmin');
 			}
-		}
-		elseif ($type == 'double' || $type == 'real')
+		} elseif ($type == 'double' || $type == 'real')
 		{
 			if (!is_null($value) && $value !== '') {
 				$value = price($value);
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked = '';
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value = dol_print_url($value, '_blank', 32, 1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!is_null($value) && $value !== '') {
 				$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			}
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$value = $param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -6873,9 +6463,7 @@ abstract class CommonObject
 							$value .= $obj->$field_toshow.' ';
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
 						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
@@ -6886,14 +6474,11 @@ abstract class CommonObject
 						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+		} elseif ($type == 'radio')
 		{
 			$value = $param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$value = '';
@@ -6905,8 +6490,7 @@ abstract class CommonObject
 				}
 				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -6973,8 +6557,7 @@ abstract class CommonObject
 			} else {
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out = '';
 
@@ -6996,29 +6579,23 @@ abstract class CommonObject
 						$object->fetch($value);
 						$value = $object->getNomUrl($getnomurlparam);
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
-			}
-			else $value = '';
-		}
-		elseif ($type == 'text' || $type == 'html')
+			} else $value = '';
+		} elseif (preg_match('/^(text|html)/', $type))
 		{
 			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value = preg_replace('/./i', '*', $value);
-		}
-		elseif ($type == 'array')
+		} elseif ($type == 'array')
 		{
 			$value = implode('<br>', $value);
 		}
 
-		//print $type.'-'.$size;
+		//print $type.'-'.$size.'-'.$value;
 		$out = $value;
 
 		return $out;
@@ -7039,240 +6616,253 @@ abstract class CommonObject
 	 */
 	public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0)
 	{
-		global $db, $conf, $langs, $action, $form;
+		global $db, $conf, $langs, $action, $form, $hookmanager;
 
 		if (!is_object($form)) $form = new Form($db);
 
 		$out = '';
 
-		if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('showOptionals', $parameters, $this, $action); // Note that $action and $object may have been modified by hook
+		if (empty($reshook))
 		{
-			$out .= "\n";
-			$out .= '<!-- showOptionals --> ';
-			$out .= "\n";
-
-            $extrafields_collapse_num = '';
-			$e = 0;
-			foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
+			if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)
 			{
-				// Show only the key field in params
-				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
+				$out .= "\n";
+				$out .= '<!-- showOptionals --> ';
+				$out .= "\n";
 
-				// @todo Add test also on 'enabled' (different than 'list' that is 'visibility')
-				$enabled = 1;
-				if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key]))
+				$extrafields_collapse_num = '';
+				$e = 0;
+				foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
 				{
-                    $enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1);
-                }
-				if (empty($enabled)) continue;
+					// Show only the key field in params
+					if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
 
-				$visibility = 1;
-				if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key]))
-				{
-				    $visibility = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);
-				}
-
-				$perms = 1;
-				if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))
-				{
-					$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
-				}
-
-				if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-				elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
-				elseif ($mode == 'view' && empty($visibility)) continue;
-				if (empty($perms)) continue;
-				// Load language if required
-				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
-					$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
-				}
-
-				$colspan = '';
-				if (is_array($params) && count($params) > 0) {
-					if (array_key_exists('cols', $params)) {
-						$colspan = $params['cols'];
+					// Test on 'enabled' ('enabled' is different than 'list' = 'visibility')
+					$enabled = 1;
+					if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key]))
+					{
+						$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1);
 					}
-					elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.
-						$reg = array();
-						if (preg_match('/colspan="(\d+)"/', $params['colspan'], $reg)) {
-							$colspan = $reg[1];
-						}
-						else {
-							$colspan = $params['colspan'];
-						}
+					if (empty($enabled)) continue;
+
+					$visibility = 1;
+					if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key]))
+					{
+						$visibility = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);
 					}
-				}
 
-				switch ($mode) {
-					case "view":
-						$value = $this->array_options["options_".$key.$keysuffix];
-						break;
-					case "create":
-                    case "edit":
-                        $getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none'); // GETPOST can get value from GET, POST or setup of default values.
-                        // GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
-						if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))
-						{
-							if (is_array($getposttemp)) {
-								// $getposttemp is an array but following code expects a comma separated string
-								$value = implode(",", $getposttemp);
-							} else {
-								$value = $getposttemp;
-							}
-						} else {
-							$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.
-						}
-						//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
-						break;
-				}
+					$perms = 1;
+					if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))
+					{
+						$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
+					}
 
-				if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
-				{
-                    $extrafields_collapse_num = '';
-                    $extrafield_param = $extrafields->attributes[$this->table_element]['param'][$key];
-                    if (!empty($extrafield_param) && is_array($extrafield_param)) {
-                        $extrafield_param_list = array_keys($extrafield_param['options']);
+					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+					elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
+					elseif ($mode == 'view' && empty($visibility)) continue;
+					if (empty($perms)) continue;
+					// Load language if required
+					if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
+						$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+					}
 
-                        if (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[$this->table_element]['pos'][$key];
-                            }
-                        }
-                    }
-
-					$out .= $extrafields->showSeparator($key, $this, ($colspan + 1));
-				}
-				else
-				{
-					$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
-					$csstyle = '';
+					$colspan = '';
 					if (is_array($params) && count($params) > 0) {
-						if (array_key_exists('class', $params)) {
-							$class .= $params['class'].' ';
-						}
-						if (array_key_exists('style', $params)) {
-							$csstyle = $params['style'];
+						if (array_key_exists('cols', $params)) {
+							$colspan = $params['cols'];
+						} elseif (array_key_exists('colspan', $params)) {	// For backward compatibility. Use cols instead now.
+							$reg = array();
+							if (preg_match('/colspan="(\d+)"/', $params['colspan'], $reg)) {
+								$colspan = $reg[1];
+							} else {
+								$colspan = $params['colspan'];
+							}
 						}
 					}
 
-					// add html5 elements
-					$domData  = ' data-element="extrafield"';
-					$domData .= ' data-targetelement="'.$this->element.'"';
-					$domData .= ' data-targetid="'.$this->id.'"';
-
-					$html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id);
-
-					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan = '0'; }
-
-					if ($action == 'selectlines') { $colspan++; }
-
-					// Convert date into timestamp format (value in memory must be a timestamp)
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
-					{
-						$datenotinstring = $this->array_options['options_'.$key];
-						if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility
-						{
-							$datenotinstring = $this->db->jdate($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')))
-					{
-						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];
-					}
-					// HTML, select, integer and text add default value
-					if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'select', 'int')))
-					{
-						if ($action == 'create') $value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ? GETPOST($keyprefix.'options_'.$key.$keysuffix, 'none', 3) : $extrafields->attributes[$this->table_element]['default'][$key];
-						else $value = $this->array_options['options_'.$key];
-					}
-
-					$labeltoshow = $langs->trans($label);
-					$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
-
-					$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';
-					$out .= '<td class="';
-					//$out .= "titlefield";
-					//if (GETPOST('action', 'none') == 'create') $out.='create';
-					// BUG #11554 : For public page, use red dot for required fields, instead of bold label
-					$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
-					if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters
-						$out .= '">';
-						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
-						else $out .= $labeltoshow;
-						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
-					} else {
-						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
-						$out .= '">';
-						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
-						else $out .= $labeltoshow;
-					}
-					$out .= '</td>';
-
-					$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
-
-					$out .= '<td '.($html_id ? 'id="'.$html_id.'" ' : '').'class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
-
 					switch ($mode) {
 						case "view":
-							$out .= $extrafields->showOutputField($key, $value);
+							$value = $this->array_options["options_".$key.$keysuffix];	// Value may be clean or formated later
 							break;
-                        case "create":
-                        case "edit":
-							$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element);
+						case "create":
+						case "edit":
+							// We get the value of property found with GETPOST so it takes into account:
+							// default values overwrite, restore back to list link, ... (but not 'default value in database' of field)
+							$check = 'alphanohtml';
+							if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text'))) {
+								$check = 'restricthtml';
+							}
+							$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, $check, 3); // GETPOST can get value from GET, POST or setup of default values overwrite.
+							// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
+							if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))
+							{
+								if (is_array($getposttemp)) {
+									// $getposttemp is an array but following code expects a comma separated string
+									$value = implode(",", $getposttemp);
+								} else {
+									$value = $getposttemp;
+								}
+							} else {
+								$value = $this->array_options["options_".$key]; // No GET, no POST, no default value, so we take value of object.
+							}
+							//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
 							break;
 					}
 
-					$out .= '</td>';
-
-					/*for($ii = 0; $ii < ($colspan - 1); $ii++)
+					if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
 					{
-						$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';
-					}*/
+						$extrafields_collapse_num = '';
+						$extrafield_param = $extrafields->attributes[$this->table_element]['param'][$key];
+						if (!empty($extrafield_param) && is_array($extrafield_param)) {
+							$extrafield_param_list = array_keys($extrafield_param['options']);
 
-					if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
-					else $out .= '</tr>';
-					$e++;
-				}
-			}
-			$out .= "\n";
-			// Add code to manage list depending on others
-			if (!empty($conf->use_javascript_ajax)) {
-				$out .= '
-				<script>
-				    jQuery(document).ready(function() {
-				    	function showOptions(child_list, parent_list)
-				    	{
-				    		var val = $("select[name=\""+parent_list+"\"]").val();
-				    		var parentVal = parent_list + ":" + val;
-							if(val > 0) {
-					    		$("select[name=\""+child_list+"\"] option[parent]").hide();
-					    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
-							} else {
-								$("select[name=\""+child_list+"\"] option").show();
+							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[$this->table_element]['pos'][$key];
+								}
 							}
-				    	}
-						function setListDependencies() {
-					    	jQuery("select option[parent]").parent().each(function() {
-					    		var child_list = $(this).attr("name");
-								var parent = $(this).find("option[parent]:first").attr("parent");
-								var infos = parent.split(":");
-								var parent_list = infos[0];
-								$("select[name=\""+parent_list+"\"]").change(function() {
-									showOptions(child_list, parent_list);
-								});
-					    	});
 						}
 
-						setListDependencies();
-				    });
-				</script>'."\n";
+						$out .= $extrafields->showSeparator($key, $this, ($colspan + 1));
+					} else {
+						$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
+						$csstyle = '';
+						if (is_array($params) && count($params) > 0) {
+							if (array_key_exists('class', $params)) {
+								$class .= $params['class'].' ';
+							}
+							if (array_key_exists('style', $params)) {
+								$csstyle = $params['style'];
+							}
+						}
+
+						// add html5 elements
+						$domData  = ' data-element="extrafield"';
+						$domData .= ' data-targetelement="'.$this->element.'"';
+						$domData .= ' data-targetid="'.$this->id.'"';
+
+						$html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id);
+
+						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan = '0'; }
+
+						if ($action == 'selectlines') { $colspan++; }
+
+						// Convert date into timestamp format (value in memory must be a timestamp)
+						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
+						{
+							$datenotinstring = $this->array_options['options_'.$key];
+							if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility
+							{
+								$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;
+						}
+						// 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')))
+						{
+							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? price2num($value) : $this->array_options['options_'.$key];
+						}
+
+						// HTML, text, select, integer and varchar: take into account default value in database if in create mode
+						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'varchar', 'select', 'int')))
+						{
+							if ($action == 'create') $value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? $value : $extrafields->attributes[$this->table_element]['default'][$key];
+						}
+
+						$labeltoshow = $langs->trans($label);
+						$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
+
+						$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="'.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.'" '.$domData.' >';
+						$out .= '<td class="';
+						//$out .= "titlefield";
+						//if (GETPOST('action', 'restricthtml') == 'create') $out.='create';
+						// BUG #11554 : For public page, use red dot for required fields, instead of bold label
+						$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
+						if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters
+							$out .= '">';
+							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
+							else $out .= $labeltoshow;
+							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
+						} else {
+							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+							$out .= '">';
+							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
+							else $out .= $labeltoshow;
+						}
+						$out .= '</td>';
+
+						$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
+
+						$out .= '<td '.($html_id ? 'id="'.$html_id.'" ' : '').'class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
+
+						switch ($mode) {
+							case "view":
+								$out .= $extrafields->showOutputField($key, $value);
+								break;
+							case "create":
+								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element);
+								break;
+							case "edit":
+								$out .= $extrafields->showInputField($key, $value, '', $keysuffix, '', 0, $this->id, $this->table_element);
+								break;
+						}
+
+						$out .= '</td>';
+
+						/*for($ii = 0; $ii < ($colspan - 1); $ii++)
+						{
+							$out .='<td class="'.$this->element.'_extras_'.$key.'"></td>';
+						}*/
+
+						if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) $out .= '</tr>';
+						else $out .= '</tr>';
+						$e++;
+					}
+				}
+				$out .= "\n";
+				// Add code to manage list depending on others
+				if (!empty($conf->use_javascript_ajax)) {
+					$out .= '
+					<script>
+					    jQuery(document).ready(function() {
+					    	function showOptions(child_list, parent_list)
+					    	{
+					    		var val = $("select[name=\""+parent_list+"\"]").val();
+					    		var parentVal = parent_list + ":" + val;
+								if(val > 0) {
+						    		$("select[name=\""+child_list+"\"] option[parent]").hide();
+						    		$("select[name=\""+child_list+"\"] option[parent=\""+parentVal+"\"]").show();
+								} else {
+									$("select[name=\""+child_list+"\"] option").show();
+								}
+					    	}
+							function setListDependencies() {
+						    	jQuery("select option[parent]").parent().each(function() {
+						    		var child_list = $(this).attr("name");
+									var parent = $(this).find("option[parent]:first").attr("parent");
+									var infos = parent.split(":");
+									var parent_list = infos[0];
+									$("select[name=\""+parent_list+"\"]").change(function() {
+										showOptions(child_list, parent_list);
+									});
+						    	});
+							}
+
+							setListDependencies();
+					    });
+					</script>'."\n";
+				}
+
 				$out .= '<!-- /showOptionals --> '."\n";
 			}
 		}
+
+		$out .= $hookmanager->resPrint;
+
 		return $out;
 	}
 
@@ -7341,9 +6931,7 @@ abstract class CommonObject
 		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
 		{
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
-		}
-		else
-		{
+		} else {
 			// Get cost price for margin calculation
 			if (!empty($fk_product))
 			{
@@ -7360,13 +6948,11 @@ abstract class CommonObject
 					if ($product->cost_price > 0)
 					{
 						$buyPrice = $product->cost_price;
-					}
-					elseif ($product->pmp > 0)
+					} elseif ($product->pmp > 0)
 					{
 						$buyPrice = $product->pmp;
 					}
-				}
-				elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
+				} elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
 				{
 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
@@ -7389,8 +6975,7 @@ abstract class CommonObject
 					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
 					{
 						$buyPrice = $productFournisseur->fourn_unitprice;
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->errors[] = $productFournisseur->error;
 						return -2;
@@ -7401,7 +6986,7 @@ abstract class CommonObject
 		return $buyPrice;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show photos of an object (nbmax maximum), into several columns
 	 *
@@ -7421,7 +7006,7 @@ abstract class CommonObject
 	 */
 	public function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -7503,8 +7088,7 @@ abstract class CommonObject
 
 							if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';
 							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';
-						}
-						elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
+						} elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
 						$return .= "\n";
 
@@ -7530,26 +7114,20 @@ abstract class CommonObject
 								{
 									$return .= '<!-- Show original file (thumb not yet available with shared links) -->';
 									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
-								}
-								else {
+								} else {
 									$return .= '<!-- Show original file -->';
 									$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">';
 								}
-							}
-							else
-							{
+							} else {
 								$return .= '<!-- Show nophoto file (because file is not shared) -->';
 								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">';
 							}
-						}
-						else
-						{
+						} else {
 							if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
 							{
 								$return .= '<!-- Show thumb -->';
 								$return .= '<img class="photo photowithmargin"  height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">';
-							}
-							else {
+							} else {
 								$return .= '<!-- Show original file -->';
 								$return .= '<img class="photo photowithmargin" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
 							}
@@ -7574,7 +7152,7 @@ abstract class CommonObject
 								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;token='.newToken().'&amp;file='.urlencode($pdir.$viewfilename).'">';
 								$return .= img_delete().'</a>';
 							}
 						}
@@ -7584,8 +7162,7 @@ abstract class CommonObject
 						{
 							$return .= '</td>';
 							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
-						}
-						elseif ($nbbyrow < 0) $return .= '</div>';
+						} elseif ($nbbyrow < 0) $return .= '</div>';
 					}
 
 					if (empty($size)) {     // Format origine
@@ -7601,7 +7178,7 @@ abstract class CommonObject
 								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
 								// Link to delete
-								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;file='.urlencode($pdir.$viewfilename).'">';
+								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=delete&amp;token='.newToken().'&amp;file='.urlencode($pdir.$viewfilename).'">';
 								$return .= img_delete().'</a>';
 							}
 						}
@@ -7674,8 +7251,7 @@ abstract class CommonObject
 		{
 			if (isset($info['type']) && ($info['type'] == 'duration')) return true;
 			else return false;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -7690,8 +7266,7 @@ abstract class CommonObject
 		{
 			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
 			else return false;
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -7795,13 +7370,10 @@ abstract class CommonObject
 				if (empty($this->{$field}))
 				{
 					$queryarray[$field] = null;
-				}
-				else
-				{
+				} else {
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
-			}
-			elseif ($this->isArray($info))
+			} elseif ($this->isArray($info))
 			{
 				if (!empty($this->{$field})) {
 					if (!is_array($this->{$field})) {
@@ -7811,28 +7383,22 @@ abstract class CommonObject
 				} else {
 					$queryarray[$field] = null;
 				}
-			}
-			elseif ($this->isDuration($info))
+			} elseif ($this->isDuration($info))
 			{
 				// $this->{$field} may be null, '', 0, '0', 123, '123'
 				if ($this->{$field} != '' || !empty($info['notnull'])) $queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1
 				else $queryarray[$field] = null;
-			}
-			elseif ($this->isInt($info) || $this->isFloat($info))
+			} elseif ($this->isInt($info) || $this->isFloat($info))
 			{
 				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
-				else
-				{
+				else {
 					// $this->{$field} may be null, '', 0, '0', 123, '123'
 					if ($this->{$field} != '' || !empty($info['notnull'])) {
 						if ($this->isInt($info)) $queryarray[$field] = (int) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
 						if ($this->isFloat($info)) $queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
-					}
-					else $queryarray[$field] = null;
+					} else $queryarray[$field] = null;
 				}
-			}
-			else
-			{
+			} else {
 				$queryarray[$field] = $this->{$field};
 			}
 
@@ -7847,7 +7413,7 @@ abstract class CommonObject
 	 * Function to load data from a SQL pointer into properties of current object $this
 	 *
 	 * @param   stdClass    $obj    Contain data of object from database
-     * @return void
+	 * @return void
 	 */
 	public function setVarsFromFetchObj(&$obj)
 	{
@@ -7857,8 +7423,7 @@ abstract class CommonObject
 			{
 				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
 				else $this->{$field} = strtotime($obj->{$field});
-			}
-			elseif ($this->isArray($info))
+			} elseif ($this->isArray($info))
 			{
 				if (!empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
@@ -7867,19 +7432,15 @@ abstract class CommonObject
 				} else {
 					$this->{$field} = array();
 				}
-			}
-			elseif ($this->isInt($info))
+			} elseif ($this->isInt($info))
 			{
 				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else
-				{
+				else {
 					if ($this->isForcedToNullIfZero($info))
 					{
 						if (empty($obj->{$field})) $this->{$field} = null;
 						else $this->{$field} = (double) $obj->{$field};
-					}
-					else
-					{
+					} else {
 						if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 							$this->{$field} = (int) $obj->{$field};
 						} else {
@@ -7887,25 +7448,20 @@ abstract class CommonObject
 						}
 					}
 				}
-			}
-			elseif ($this->isFloat($info))
+			} elseif ($this->isFloat($info))
 			{
 				if ($this->isForcedToNullIfZero($info))
 				{
 					if (empty($obj->{$field})) $this->{$field} = null;
 					else $this->{$field} = (double) $obj->{$field};
-				}
-				else
-				{
+				} else {
 					if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 						$this->{$field} = (double) $obj->{$field};
 					} else {
 						$this->{$field} = null;
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->{$field} = $obj->{$field};
 			}
 		}
@@ -7937,9 +7493,9 @@ abstract class CommonObject
 		if (is_null($value)) return 'NULL';
 		elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) return $this->db->escape("$value");
 		elseif ($fieldsentry['type'] == 'boolean') {
-		    if ($value) return 'true';
-		    else return 'false';
-        }
+			if ($value) return 'true';
+			else return 'false';
+		}
 		else return "'".$this->db->escape($value)."'";
 	}
 
@@ -7968,11 +7524,11 @@ abstract class CommonObject
 		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
 
 		$keys = array();
-		$values = array();	// Array to store string forged for SQL syntax
+		$values = array(); // Array to store string forged for SQL syntax
 		foreach ($fieldvalues as $k => $v) {
 			$keys[$k] = $k;
 			$value = $this->fields[$k];
-			$values[$k] = $this->quote($v, $value);			// May return string 'NULL' if $value is null
+			$values[$k] = $this->quote($v, $value); // May return string 'NULL' if $value is null
 		}
 
 		// Clean and check mandatory
@@ -7988,6 +7544,12 @@ abstract class CommonObject
 				$this->errors[] = $langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
 			}
 
+			// If value is null and there is a default value for field
+			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && !is_null($this->fields[$key]['default']))
+			{
+				$values[$key] = $this->fields[$key]['default'];
+			}
+
 			// If field is an implicit foreign key field
 			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
 				if (isset($this->fields[$key]['default'])) $values[$key] = $this->fields[$key]['default'];
@@ -8021,19 +7583,19 @@ abstract class CommonObject
 		// If we have a field ref with a default value of (PROV)
 		if (!$error)
 		{
-		    if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && !is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)')
-		    {
-		        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE (ref = '(PROV)' OR ref = '') AND rowid = ".$this->id;
-		        $resqlupdate = $this->db->query($sql);
+			if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && !is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)')
+			{
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE (ref = '(PROV)' OR ref = '') AND rowid = ".$this->id;
+				$resqlupdate = $this->db->query($sql);
 
-		        if ($resqlupdate === false)
-		        {
-		            $error++;
-		            $this->errors[] = $this->db->lasterror();
-		        } else {
-		        	$this->ref = '(PROV'.$this->id.')';
-		        }
-		    }
+				if ($resqlupdate === false)
+				{
+					$error++;
+					$this->errors[] = $this->db->lasterror();
+				} else {
+					$this->ref = '(PROV'.$this->id.')';
+				}
+			}
 		}
 
 		// Create extrafields
@@ -8100,14 +7662,17 @@ abstract class CommonObject
 	{
 		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
 
-		$sql = 'SELECT '.$this->getFieldList();
+		$fieldlist = $this->getFieldList();
+		if (empty($fieldlist)) return 0;
+
+		$sql = 'SELECT '.$fieldlist;
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id))  $sql .= ' WHERE rowid = '.$id;
+		if (!empty($id)) $sql .= ' WHERE rowid = '.$id;
 		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
 		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
 		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' AND entity IN ('.getEntity($this->table_element).')';
-		if ($morewhere)   $sql .= $morewhere;
+		if ($morewhere) $sql .= $morewhere;
 		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
@@ -8123,14 +7688,10 @@ abstract class CommonObject
 				$this->fetch_optionals();
 
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -8181,9 +7742,7 @@ abstract class CommonObject
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 			return -1;
@@ -8310,8 +7869,7 @@ abstract class CommonObject
 					return -1;
 				}
 			}
-		}
-		elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
+		} elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
 		{
 			$objectisused = $this->isObjectUsed($this->id);
 			if (!empty($objectisused))
@@ -8326,46 +7884,46 @@ abstract class CommonObject
 
 		// Delete cascade first
 		if (is_array($this->childtablesoncascade) && !empty($this->childtablesoncascade)) {
-            foreach ($this->childtablesoncascade as $table)
-            {
-	            $deleteFromObject = explode(':', $table);
-	            if (count($deleteFromObject)>=2) {
-		            $className = str_replace('@', '', $deleteFromObject[0]);
-		            $filePath = $deleteFromObject[1];
-		            $columnName = $deleteFromObject[2];
-		            if (dol_include_once($filePath)) {
-			            $childObject = new $className($this->db);
-			            if (method_exists($childObject, 'deleteByParentField')) {
-				            $result = $childObject->deleteByParentField($this->id, $columnName);
-				            if ($result < 0) {
+			foreach ($this->childtablesoncascade as $table)
+			{
+				$deleteFromObject = explode(':', $table);
+				if (count($deleteFromObject) >= 2) {
+					$className = str_replace('@', '', $deleteFromObject[0]);
+					$filePath = $deleteFromObject[1];
+					$columnName = $deleteFromObject[2];
+					if (dol_include_once($filePath)) {
+						$childObject = new $className($this->db);
+						if (method_exists($childObject, 'deleteByParentField')) {
+							$result = $childObject->deleteByParentField($this->id, $columnName);
+							if ($result < 0) {
 								$error++;
-					            $this->errors[] = $childObject->error;
-					            break;
-				            }
-			            } else {
+								$this->errors[] = $childObject->error;
+								break;
+							}
+						} else {
 							$error++;
 							$this->errors[] = "You defined a cascade delete on an object $childObject but there is no method deleteByParentField for it";
 							break;
 						}
-		            } else {
-			            $error++;
-						$this->errors[] = 'Cannot include child class file ' .$filePath;
-			            break;
-		            }
-	            } else {
-	            	// Delete record in child table
-	            	$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $table . ' WHERE ' . $this->fk_element . ' = ' . $this->id;
-
-		            $resql = $this->db->query($sql);
-		            if (!$resql) {
+					} else {
 						$error++;
-			            $this->error = $this->db->lasterror();
-			            $this->errors[] = $this->error;
+						$this->errors[] = 'Cannot include child class file '.$filePath;
 						break;
-		            }
-	            }
-            }
-        }
+					}
+				} else {
+					// Delete record in child table
+					$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
+
+					$resql = $this->db->query($sql);
+					if (!$resql) {
+						$error++;
+						$this->error = $this->db->lasterror();
+						$this->errors[] = $this->error;
+						break;
+					}
+				}
+			}
+		}
 
 		if (!$error) {
 			if (!$notrigger) {
@@ -8421,8 +7979,8 @@ abstract class CommonObject
 		if (!empty($parentId) && !empty($parentField)) {
 			$this->db->begin();
 
-			$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE '.$parentField.' = ' . (int) $parentId;
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' WHERE '.$parentField.' = '.(int) $parentId;
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -8563,9 +8121,7 @@ abstract class CommonObject
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -8581,7 +8137,7 @@ abstract class CommonObject
 	 */
 	public function initAsSpecimenCommon()
 	{
-	    global $user;
+		global $user;
 
 		$this->id = 0;
 		if (array_key_exists('label', $this->fields)) $this->label = 'This is label';
@@ -8617,40 +8173,121 @@ abstract class CommonObject
 		return count($this->comments);
 	}
 
-    /**
-     * Return nb comments already posted
-     *
-     * @return int
-     */
-    public function getNbComments()
-    {
-        return count($this->comments);
-    }
+	/**
+	 * Return nb comments already posted
+	 *
+	 * @return int
+	 */
+	public function getNbComments()
+	{
+		return count($this->comments);
+	}
 
-    /**
-     * Trim object parameters
-     * @param string[] $parameters array of parameters to trim
-     *
-     * @return void
-     */
-    public 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
+	 */
+	public function trimParameters($parameters)
+	{
+		if (!is_array($parameters)) return;
+		foreach ($parameters as $parameter) {
+			if (isset($this->$parameter)) {
+				$this->$parameter = trim($this->$parameter);
+			}
+		}
+	}
 
-    /**
-     *  copy related categories to another object
-     *
-     * @param  int		$fromId	Id object source
-     * @param  int		$toId	Id object cible
-     * @param  string	$type	Type of category ('product', ...)
-     * @return int      < 0 si erreur, > 0 si ok
-     */
+	/* Part for categories/tags */
+
+	/**
+	 * Sets object to given categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param 	string 		$type_categ 	Category type ('customer', 'supplier', 'website_page', ...)
+	 * @return	int							Array of category objects or < 0 if KO
+	 */
+	public function getCategoriesCommon($type_categ)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+		// Get current categories
+		$c = new Categorie($this->db);
+		$existing = $c->containing($this->id, $type_categ, 'id');
+
+		return $existing;
+	}
+
+	/**
+	 * Sets object to given categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
+	 * @param 	string 		$type_categ 	Category type ('customer', 'supplier', 'website_page', ...)
+	 * @return	int							<0 if KO, >0 if OK
+	 */
+	public function setCategoriesCommon($categories, $type_categ)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+		// Handle single category
+		if (!is_array($categories)) {
+			$categories = array($categories);
+		}
+
+		// Get current categories
+		$c = new Categorie($this->db);
+		$existing = $c->containing($this->id, $type_categ, 'id');
+
+		// Diff
+		if (is_array($existing)) {
+			$to_del = array_diff($existing, $categories);
+			$to_add = array_diff($categories, $existing);
+		} else {
+			$to_del = array(); // Nothing to delete
+			$to_add = $categories;
+		}
+
+		$error = 0;
+
+		// Process
+		foreach ($to_del as $del) {
+			if ($c->fetch($del) > 0) {
+				$c->del_type($this, $type_categ);
+			}
+		}
+		foreach ($to_add as $add) {
+			if ($c->fetch($add) > 0)
+			{
+				$result = $c->add_type($this, $type_categ);
+				if ($result < 0)
+				{
+					$error++;
+					$this->error = $c->error;
+					$this->errors = $c->errors;
+					break;
+				}
+			}
+		}
+
+		return $error ? -1 : 1;
+	}
+
+	/**
+	 * Copy related categories to another object
+	 *
+	 * @param  int		$fromId	Id object source
+	 * @param  int		$toId	Id object cible
+	 * @param  string	$type	Type of category ('product', ...)
+	 * @return int      < 0 si erreur, > 0 si ok
+	 */
 	public function cloneCategories($fromId, $toId, $type = '')
 	{
 		$this->db->begin();
@@ -8662,7 +8299,7 @@ abstract class CommonObject
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type])." (fk_categorie, fk_product)";
 		$sql .= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type]);
-		$sql .= " WHERE fk_product = '".$fromId."'";
+		$sql .= " WHERE fk_product = ".((int) $fromId);
 
 		if (!$this->db->query($sql))
 		{
@@ -8708,7 +8345,7 @@ abstract class CommonObject
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files";
 		$sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'";
-		$sql.= " AND filepath = '".$element."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity;
+		$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/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index a68d5c22002..c7e95aa1fbc 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -50,12 +50,22 @@ abstract class CommonObjectLine extends CommonObject
 	public $fk_unit;
 
 
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
+
 	/**
 	 *	Returns the label, shot_label or code found in units dictionary from ->fk_unit.
 	 *  A langs->trans() must be called on result to get translated value.
 	 *
-	 * 	@param	string $type 	Label type (long, short or code). This can be a translation key.
-	 *	@return	string|int 		<0 if ko, label if ok
+	 * 	@param	string $type 	Label type ('long', 'short' or 'code'). This can be a translation key.
+	 *	@return	string|int 		<0 if KO, label if OK (Example: 'long', 'short' or 'unitCODE')
 	 */
 	public function getLabelOfUnit($type = 'long')
 	{
@@ -81,9 +91,7 @@ abstract class CommonObjectLine extends CommonObject
 			else $label = $res[$label_type];
 			$this->db->free($resql);
 			return $label;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
 			return -1;
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index e45d08a9396..83d20e99b95 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -23,13 +23,14 @@
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 
 /**
  *      Superclass for orders classes
  */
 abstract class CommonOrder extends CommonObject
 {
-
+	use CommonIncoterm;
 }
 
 /**
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index 50330f26b17..c3d6e7de299 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -127,7 +127,7 @@ abstract class CommonStickerGenerator
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
 	 *
-	 * @param   PDF         $pdf            PDF reference
+	 * @param   TCPDF         $pdf            PDF reference
 	 * @param   Translate  	$outputlangs    Output langs
 	 * @param   array     	$param          Associative array containing label content and optional parameters
 	 * @return  void
@@ -139,7 +139,7 @@ abstract class CommonStickerGenerator
 	 * Methode qui permet de modifier la taille des caracteres
 	 * Cela modiera aussi l'espace entre chaque ligne
 	 *
-	 * @param    PDF        $pdf   PDF reference
+	 * @param    TCPDF        $pdf   PDF reference
 	 * @param    int        $pt    point
 	 * @return   void
 	 */
@@ -158,7 +158,7 @@ abstract class CommonStickerGenerator
 	/**
 	 * protected Print dot line
 	 *
-	 * @param	PDF     $pdf                PDF reference
+	 * @param	TCPDF   $pdf                PDF reference
 	 * @param 	int		$x1					X1
 	 * @param 	int		$y1					Y1
 	 * @param 	int		$x2					X2
@@ -175,8 +175,7 @@ abstract class CommonStickerGenerator
 		$hauteur = abs($y1 - $y2);
 		if ($length > $hauteur) {
 			$Pointilles = ($length / $nbPointilles) / 2; // taille des pointilles
-		}
-		else {
+		} else {
 			$Pointilles = ($hauteur / $nbPointilles) / 2;
 		}
 		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
@@ -202,7 +201,7 @@ abstract class CommonStickerGenerator
 	/**
 	 * protected Function realisant une croix aux 4 coins des cartes
 	 *
-	 * @param PDF   $pdf                PDF reference
+	 * @param TCPDF $pdf                PDF reference
 	 * @param int   $x1					X1
 	 * @param int	$y1					Y1
 	 * @param int	$x2					X2
@@ -281,7 +280,7 @@ abstract class CommonStickerGenerator
 	/**
 	 * protected Set format
 	 *
-	 * @param    PDF       $pdf     PDF reference
+	 * @param    TCPDF     $pdf     PDF reference
 	 * @param    string    $format  Format
 	 * @return   void
 	 */
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index ad87949d4e9..32d7b145a41 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -183,7 +183,7 @@ class Conf
 					//if (! defined("$key")) define("$key", $value);	// In some cases, the constant might be already forced (Example: SYSLOG_HANDLERS during install)
 					$this->global->$key = $value;
 
-					if ($value && preg_match('/^MAIN_MODULE_/', $key))
+					if ($value && strpos($key, 'MAIN_MODULE_') === 0)
 					{
 						$reg = array();
 						// If this is constant for a new tab page activated by a module. It initializes modules_parts['tabs'].
@@ -191,7 +191,7 @@ class Conf
 						{
 							$partname = 'tabs';
 							$params = explode(':', $value, 2);
-							if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
+							if (!is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
 							$this->modules_parts[$partname][$params[0]][] = $value; // $value may be a string or an array
 						}
 						// If this is constant for all generic part activated by a module. It initializes
@@ -203,7 +203,7 @@ class Conf
 						{
 							$modulename = strtolower($reg[1]);
 							$partname = strtolower($reg[2]);
-							if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
+							if (!is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
 							$arrValue = json_decode($value, true);
 							if (is_array($arrValue) && !empty($arrValue)) $value = $arrValue;
 							elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) $value = '/'.$modulename.'/core/'.$partname.'/';
@@ -249,8 +249,7 @@ class Conf
 		{
 			try {
 				date_default_timezone_set($this->global->MAIN_SERVER_TZ);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".$this->global->MAIN_SERVER_TZ, LOG_ERR);
 			}
@@ -271,14 +270,7 @@ class Conf
 		if (empty($this->global->MAIN_MENUFRONT_STANDARD)) $this->global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";
 		if (empty($this->global->MAIN_MENU_SMARTPHONE)) $this->global->MAIN_MENU_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
 		if (empty($this->global->MAIN_MENUFRONT_SMARTPHONE)) $this->global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
-		// Clean var use vat for company
 		if (!isset($this->global->FACTURE_TVAOPTION)) $this->global->FACTURE_TVAOPTION = 1;
-		elseif (!empty($this->global->FACTURE_TVAOPTION) && !is_numeric($this->global->FACTURE_TVAOPTION))
-		{
-			// Old value of option, we clean to use new value (0 or 1)
-			if ($this->global->FACTURE_TVAOPTION != "franchise") $this->global->FACTURE_TVAOPTION = 1;
-			else $this->global->FACTURE_TVAOPTION = 0;
-		}
 
 		// Variable globales LDAP
 		if (empty($this->global->LDAP_FIELD_FULLNAME)) $this->global->LDAP_FIELD_FULLNAME = '';
@@ -332,9 +324,7 @@ class Conf
 
 							// For backward compatibility
 							$this->$module->$dirname = $rootfordata."/".$name;
-						}
-						else
-						{
+						} else {
 							// For multicompany sharings
 							$this->$module->$multidirname = array($this->entity => $rootfortemp."/".$name."/temp");
 
@@ -410,28 +400,22 @@ class Conf
 			$this->fournisseur->payment->dir_output = $rootfordata."/fournisseur/payment"; // For backward compatibility
 			$this->fournisseur->payment->dir_temp = $rootfortemp."/fournisseur/payment/temp"; // For backward compatibility
 
-			// To prepare split of module fournisseur into fournisseur + supplier_order + supplier_invoice
-			if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))  // By default, if module supplier is on, we set new properties
+			// To prepare split of module fournisseur into module 'fournisseur' + supplier_order + supplier_invoice
+			if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))  // By default, if module supplier is on, and we don't use yet the new modules, we set artificialy the module properties
 			{
-				if (empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))	// This can be set to 1 once modules purchase order and supplier invoice exists
-				{
-					$this->supplier_order = new stdClass();
-					$this->supplier_order->enabled = 1;
-					$this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
-					$this->supplier_order->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");
-					$this->supplier_order->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility
-					$this->supplier_order->dir_temp = $rootfortemp."/fournisseur/commande/temp"; // For backward compatibility
-				}
+				$this->supplier_order = new stdClass();
+				$this->supplier_order->enabled = 1;
+				$this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
+				$this->supplier_order->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");
+				$this->supplier_order->dir_output = $rootfordata."/fournisseur/commande"; // For backward compatibility
+				$this->supplier_order->dir_temp = $rootfortemp."/fournisseur/commande/temp"; // For backward compatibility
 
-				if (empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))	// This can be set to 1 once modules purchase order and supplier invoice exists
-				{
-					$this->supplier_invoice = new stdClass();
-					$this->supplier_invoice->enabled = 1;
-					$this->supplier_invoice->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");
-					$this->supplier_invoice->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/facture/temp");
-					$this->supplier_invoice->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility
-					$this->supplier_invoice->dir_temp = $rootfortemp."/fournisseur/facture/temp"; // For backward compatibility
-				}
+				$this->supplier_invoice = new stdClass();
+				$this->supplier_invoice->enabled = 1;
+				$this->supplier_invoice->multidir_output = array($this->entity => $rootfordata."/fournisseur/facture");
+				$this->supplier_invoice->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/facture/temp");
+				$this->supplier_invoice->dir_output = $rootfordata."/fournisseur/facture"; // For backward compatibility
+				$this->supplier_invoice->dir_temp = $rootfortemp."/fournisseur/facture/temp"; // For backward compatibility
 			}
 		}
 
@@ -499,7 +483,9 @@ class Conf
 			$this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 0;
 			$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;
 			$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;
-			if (empty($this->reception->enabled))$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
+			if (empty($this->reception->enabled)) {
+				$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
+			}
 			else {
 				$this->global->STOCK_CALCULATE_ON_RECEPTION = 1;
 				$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 0;
@@ -617,58 +603,58 @@ class Conf
 		// 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) * 24 * 60 * 60;
+            $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) * 24 * 60 * 60;
+			$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) * 24 * 60 * 60;
+			$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) * 24 * 60 * 60;
+		    $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) * 24 * 60 * 60;
-    		$this->commande->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS) ? $this->global->MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS : 7) * 24 * 60 * 60;
+    		$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) * 24 * 60 * 60;
-            $this->propal->facturation->warning_delay = (isset($this->global->MAIN_DELAY_PROPALS_TO_BILL) ? $this->global->MAIN_DELAY_PROPALS_TO_BILL : 0) * 24 * 60 * 60;
+    		$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) * 24 * 60 * 60;
-		    $this->facture->fournisseur->warning_delay = (isset($this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY) ? $this->global->MAIN_DELAY_SUPPLIER_BILLS_TO_PAY : 0) * 24 * 60 * 60;
+    		$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) * 24 * 60 * 60;
-            $this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 24 * 60 * 60;
+	   	    $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) * 24 * 60 * 60;
-		    $this->bank->cheque->warning_delay = (isset($this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT) ? $this->global->MAIN_DELAY_CHEQUES_TO_DEPOSIT : 0) * 24 * 60 * 60;
+    		$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) * 24 * 60 * 60;
+		    $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) * 24 * 60 * 60;
+		    $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) * 24 * 60 * 60;
+            $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))
@@ -698,6 +684,9 @@ class Conf
 		// If we are in develop mode, we activate the option MAIN_SECURITY_CSRF_WITH_TOKEN to 1 if not already defined.
 		if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $this->global->MAIN_FEATURES_LEVEL >= 2) $this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;
 
+		if (defined('MAIN_ANTIVIRUS_COMMAND')) $this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
+		if (defined('MAIN_ANTIVIRUS_PARAM')) $this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');
+
 		// For backward compatibility
 		if (isset($this->product))   $this->produit = $this->product;
 		if (isset($this->facture))   $this->invoice = $this->facture;
@@ -712,39 +701,42 @@ class Conf
         	if (is_object($mc)) $mc->setValues($this);
         }
 
-		// We init log handlers
-		if (!empty($this->global->SYSLOG_HANDLERS)) {
-			$handlers = json_decode($this->global->SYSLOG_HANDLERS);
-		} else {
-			$handlers = array();
-		}
-		foreach ($handlers as $handler) {
-			$handler_files = array();
-			$dirsyslogs = array_merge(array('/core/modules/syslog/'), $this->modules_parts['syslog']);
-			foreach ($dirsyslogs as $reldir) {
-				$dir = dol_buildpath($reldir, 0);
-				$newdir = dol_osencode($dir);
-				if (is_dir($newdir)) {
-					$file = $newdir.$handler.'.php';
-					if (file_exists($file)) {
-						$handler_files[] = $file;
+        if (!empty($this->syslog->enabled)) {
+			// We init log handlers
+			if (!empty($this->global->SYSLOG_HANDLERS)) {
+				$handlers = json_decode($this->global->SYSLOG_HANDLERS);
+			} else {
+				$handlers = array();
+			}
+			foreach ($handlers as $handler) {
+				$handler_file_found = '';
+				$dirsyslogs = array_merge(array('/core/modules/syslog/'), $this->modules_parts['syslog']);
+				foreach ($dirsyslogs as $reldir) {
+					$dir = dol_buildpath($reldir, 0);
+					$newdir = dol_osencode($dir);
+					if (is_dir($newdir)) {
+						$file = $newdir.$handler.'.php';
+						if (file_exists($file)) {
+							$handler_file_found = $file;
+							break;
+						}
 					}
 				}
-			}
 
-			if (empty($handler_files)) {
-				throw new Exception('Missing log handler file '.$handler.'.php');
-			}
+				if (empty($handler_file_found)) {
+					throw new Exception('Missing log handler file '.$handler.'.php');
+				}
 
-			require_once $handler_files[0];
-			$loghandlerinstance = new $handler();
-			if (!$loghandlerinstance instanceof LogHandlerInterface) {
-				throw new Exception('Log handler does not extend LogHandlerInterface');
-			}
+				require_once $handler_file_found;
+				$loghandlerinstance = new $handler();
+				if (!$loghandlerinstance instanceof LogHandlerInterface) {
+					throw new Exception('Log handler does not extend LogHandlerInterface');
+				}
 
-			if (empty($this->loghandlers[$handler])) {
-				$this->loghandlers[$handler] = $loghandlerinstance;
+				if (empty($this->loghandlers[$handler])) {
+					$this->loghandlers[$handler] = $loghandlerinstance;
+				}
 			}
-		}
+        }
 	}
 }
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index 999b01341f0..ad7d93506f4 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -31,408 +31,385 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class CoreObject extends CommonObject
 {
-    public $withChild = true;
+	public $withChild = true;
 
-    /**
-     *  @var Array $_fields Fields to synchronize with Database
-     */
-    protected $fields = array();
+	/**
+	 *  @var Array $_fields Fields to synchronize with Database
+	 */
+	protected $fields = array();
 
-    /**
-     *  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;
+	}
 
-    /**
-     * Function to init fields
-     *
-     * @return bool
-     */
-    protected function init()
-    {
-        $this->id = 0;
-        $this->datec = 0;
-        $this->tms = 0;
+	/**
+	 * Function to init fields
+	 *
+	 * @return bool
+	 */
+	protected function init()
+	{
+		$this->id = 0;
+		$this->datec = 0;
+		$this->tms = 0;
 
-        if (!empty($this->fields))
-        {
-            foreach ($this->fields as $field=>$info)
-            {
-                if ($this->isDate($info)) $this->{$field} = time();
-                elseif ($this->isArray($info)) $this->{$field} = array();
-                elseif ($this->isInt($info)) $this->{$field} = (int) 0;
-                elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
-                else $this->{$field} = '';
-            }
+		if (!empty($this->fields))
+		{
+			foreach ($this->fields as $field=>$info)
+			{
+				if ($this->isDate($info)) $this->{$field} = time();
+				elseif ($this->isArray($info)) $this->{$field} = array();
+				elseif ($this->isInt($info)) $this->{$field} = (int) 0;
+				elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
+				else $this->{$field} = '';
+			}
 
-            $this->to_delete = false;
-            $this->is_clone = false;
+			$this->to_delete = false;
+			$this->is_clone = false;
 
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * Test type of field
-     *
-     * @param   string  $field  name of field
-     * @param   string  $type   type of field to test
-     * @return  boolean         value of field or false
-     */
-    private function checkFieldType($field, $type)
-    {
-        if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
-        {
-            return $this->{'is_'.$type}($this->fields[$field]);
-        }
-        else
-        {
-            return false;
-        }
-    }
+	/**
+	 * Test type of field
+	 *
+	 * @param   string  $field  name of field
+	 * @param   string  $type   type of field to test
+	 * @return  boolean         value of field or false
+	 */
+	private function checkFieldType($field, $type)
+	{
+		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
+		{
+			return $this->{'is_'.$type}($this->fields[$field]);
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     *	Get object and children from database
-     *
-     *	@param      int			$id       		Id of object to load
-     * 	@param		bool		$loadChild		used to load children from database
-     *	@return     int         				>0 if OK, <0 if KO, 0 if not found
-     */
-    public function fetch($id, $loadChild = true)
-    {
-        $res = $this->fetchCommon($id);
-        if ($res > 0) {
-            if ($loadChild) $this->fetchChild();
-        }
+	/**
+	 *	Get object and children from database
+	 *
+	 *	@param      int			$id       		Id of object to load
+	 * 	@param		bool		$loadChild		used to load children from database
+	 *	@return     int         				>0 if OK, <0 if KO, 0 if not found
+	 */
+	public function fetch($id, $loadChild = true)
+	{
+		$res = $this->fetchCommon($id);
+		if ($res > 0) {
+			if ($loadChild) $this->fetchChild();
+		}
 
-        return $res;
-    }
+		return $res;
+	}
 
 
-    /**
-     * Function to instantiate a new child
-     *
-     * @param   string  $tabName        Table name of child
-     * @param   int     $id             If id is given, we try to return his key if exist or load if we try_to_load
-     * @param   string  $key            Attribute name of the object id
-     * @param   bool    $try_to_load    Force the fetch if an id is given
-     * @return                          int
-     */
-    public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false)
-    {
-        if (!empty($id))
-        {
-            foreach ($this->{$tabName} as $k=>&$object)
-            {
-                if ($object->{$key} === $id) return $k;
-            }
-        }
+	/**
+	 * Function to instantiate a new child
+	 *
+	 * @param   string  $tabName        Table name of child
+	 * @param   int     $id             If id is given, we try to return his key if exist or load if we try_to_load
+	 * @param   string  $key            Attribute name of the object id
+	 * @param   bool    $try_to_load    Force the fetch if an id is given
+	 * @return                          int
+	 */
+	public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false)
+	{
+		if (!empty($id))
+		{
+			foreach ($this->{$tabName} as $k=>&$object)
+			{
+				if ($object->{$key} === $id) return $k;
+			}
+		}
 
-        $k = count($this->{$tabName});
+		$k = count($this->{$tabName});
 
-        $className = ucfirst($tabName);
-        $this->{$tabName}[$k] = new $className($this->db);
-        if ($id > 0 && $key === 'id' && $try_to_load)
-        {
-            $this->{$tabName}[$k]->fetch($id);
-        }
+		$className = ucfirst($tabName);
+		$this->{$tabName}[$k] = new $className($this->db);
+		if ($id > 0 && $key === 'id' && $try_to_load)
+		{
+			$this->{$tabName}[$k]->fetch($id);
+		}
 
-        return $k;
-    }
+		return $k;
+	}
 
 
-    /**
-     * Function to set a child as to delete
-     *
-     * @param   string  $tabName        Table name of child
-     * @param   int     $id             Id of child to set as to delete
-     * @param   string  $key            Attribute name of the object id
-     * @return                          bool
-     */
-    public function removeChild($tabName, $id, $key = 'id')
-    {
-        foreach ($this->{$tabName} as &$object)
-        {
-            if ($object->{$key} == $id)
-            {
-                $object->to_delete = true;
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Function to set a child as to delete
+	 *
+	 * @param   string  $tabName        Table name of child
+	 * @param   int     $id             Id of child to set as to delete
+	 * @param   string  $key            Attribute name of the object id
+	 * @return                          bool
+	 */
+	public function removeChild($tabName, $id, $key = 'id')
+	{
+		foreach ($this->{$tabName} as &$object)
+		{
+			if ($object->{$key} == $id)
+			{
+				$object->to_delete = true;
+				return true;
+			}
+		}
+		return false;
+	}
 
 
-    /**
-     * Function to fetch children objects
-     *
-     * @return void
-     */
-    public function fetchChild()
-    {
-        if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
-        {
-            foreach ($this->childtables as &$childTable)
-            {
-                $className = ucfirst($childTable);
+	/**
+	 * Function to fetch children objects
+	 *
+	 * @return void
+	 */
+	public function fetchChild()
+	{
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		{
+			foreach ($this->childtables as &$childTable)
+			{
+				$className = ucfirst($childTable);
 
-                $this->{$className} = array();
+				$this->{$className} = array();
 
-                $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
-                $res = $this->db->query($sql);
+				$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
+				$res = $this->db->query($sql);
 
-                if ($res)
-                {
-                    while ($obj = $this->db->fetch_object($res))
-                    {
-                        $o = new $className($this->db);
-                        $o->fetch($obj->rowid);
+				if ($res)
+				{
+					while ($obj = $this->db->fetch_object($res))
+					{
+						$o = new $className($this->db);
+						$o->fetch($obj->rowid);
 
-                        $this->{$className}[] = $o;
-                    }
-                }
-                else
-                {
-                    $this->errors[] = $this->db->lasterror();
-                }
-            }
-        }
-    }
+						$this->{$className}[] = $o;
+					}
+				} else {
+					$this->errors[] = $this->db->lasterror();
+				}
+			}
+		}
+	}
 
-    /**
-     * Function to update children data
-     *
-     * @param   User    $user   user object
-     * @return void
-     */
-    public function saveChild(User &$user)
-    {
-        if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
-        {
-            foreach ($this->childtables as &$childTable)
-            {
-                $className = ucfirst($childTable);
-                if (!empty($this->{$className}))
-                {
-                    foreach ($this->{$className} as $i => &$object)
-                    {
-                        $object->{$this->fk_element} = $this->id;
+	/**
+	 * Function to update children data
+	 *
+	 * @param   User    $user   user object
+	 * @return void
+	 */
+	public function saveChild(User &$user)
+	{
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		{
+			foreach ($this->childtables as &$childTable)
+			{
+				$className = ucfirst($childTable);
+				if (!empty($this->{$className}))
+				{
+					foreach ($this->{$className} as $i => &$object)
+					{
+						$object->{$this->fk_element} = $this->id;
 
-                        $object->update($user);
-                        if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) unset($this->{$className}[$i]);
-                    }
-                }
-            }
-        }
-    }
+						$object->update($user);
+						if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) unset($this->{$className}[$i]);
+					}
+				}
+			}
+		}
+	}
 
 
-    /**
-     * Function to update object or create or delete if needed
-     *
-     * @param   User    $user   User object
-     * @return  int             < 0 if KO, > 0 if OK
-     */
-    public function update(User &$user)
-    {
-        if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-        elseif (isset($this->to_delete) && $this->to_delete == true) return $this->delete($user);
+	/**
+	 * Function to update object or create or delete if needed
+	 *
+	 * @param   User    $user   User object
+	 * @return  int             < 0 if KO, > 0 if OK
+	 */
+	public function update(User &$user)
+	{
+		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
+		elseif (isset($this->to_delete) && $this->to_delete == true) return $this->delete($user);
 
-        $error = 0;
-        $this->db->begin();
+		$error = 0;
+		$this->db->begin();
 
-        $res = $this->updateCommon($user);
-        if ($res)
-        {
-            $result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
-        }
-        else
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->error;
-        }
+		$res = $this->updateCommon($user);
+		if ($res)
+		{
+			$result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
+			if ($result < 0) $error++;
+			else $this->saveChild($user);
+		} else {
+			$error++;
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+		}
 
-        if (empty($error))
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (empty($error))
+		{
+			$this->db->commit();
+			return $this->id;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     * Function to create object in database
-     *
-     * @param   User    $user   user object
-     * @return  int             < 0 if KO, > 0 if OK
-     */
-    public function create(User &$user)
-    {
-        if ($this->id > 0) return $this->update($user);
+	/**
+	 * Function to create object in database
+	 *
+	 * @param   User    $user   User object
+	 * @return  int             < 0 if KO, > 0 if OK
+	 */
+	public function create(User $user)
+	{
+		if ($this->id > 0) return $this->update($user);
 
-        $error = 0;
-        $this->db->begin();
+		$error = 0;
+		$this->db->begin();
 
-        $res = $this->createCommon($user);
-        if ($res)
-        {
-            $this->id = $this->db->last_insert_id($this->table_element);
+		$res = $this->createCommon($user);
+		if ($res)
+		{
+			$this->id = $this->db->last_insert_id($this->table_element);
 
-            $result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
-        }
-        else
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->error;
-        }
+			$result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
+			if ($result < 0) $error++;
+			else $this->saveChild($user);
+		} else {
+			$error++;
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+		}
 
-        if (empty($error))
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (empty($error))
+		{
+			$this->db->commit();
+			return $this->id;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     * Function to delete object in database
-     *
-     * @param   User    $user   user object
-     * @return  int             < 0 if KO, > 0 if OK
-     */
-    public function delete(User &$user)
-    {
-        if ($this->id <= 0) return 0;
+	/**
+	 * Function to delete object in database
+	 *
+	 * @param   User    $user   user object
+	 * @return  int             < 0 if KO, > 0 if OK
+	 */
+	public function delete(User &$user)
+	{
+		if ($this->id <= 0) return 0;
 
-        $error = 0;
-        $this->db->begin();
+		$error = 0;
+		$this->db->begin();
 
-        $result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user);
-        if ($result < 0) $error++;
+		$result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user);
+		if ($result < 0) $error++;
 
-        if (!$error)
-        {
-            $this->deleteCommon($user);
-            if ($this->withChild && !empty($this->childtables))
-            {
-                foreach ($this->childtables as &$childTable)
-                {
-                    $className = ucfirst($childTable);
-                    if (!empty($this->{$className}))
-                    {
-                        foreach ($this->{$className} as &$object)
-                        {
-                            $object->delete($user);
-                        }
-                    }
-                }
-            }
-        }
+		if (!$error)
+		{
+			$this->deleteCommon($user);
+			if ($this->withChild && !empty($this->childtables))
+			{
+				foreach ($this->childtables as &$childTable)
+				{
+					$className = ucfirst($childTable);
+					if (!empty($this->{$className}))
+					{
+						foreach ($this->{$className} as &$object)
+						{
+							$object->delete($user);
+						}
+					}
+				}
+			}
+		}
 
-        if (empty($error))
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->error;
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (empty($error))
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     * Function to get a formatted date
-     *
-     * @param   string  $field  Attribute to return
-     * @param   string  $format Output date format
-     * @return          string
-     */
-    public function getDate($field, $format = '')
-    {
-        if (empty($this->{$field})) return '';
-        else
-        {
-            return dol_print_date($this->{$field}, $format);
-        }
-    }
+	/**
+	 * Function to get a formatted date
+	 *
+	 * @param   string  $field  Attribute to return
+	 * @param   string  $format Output date format
+	 * @return          string
+	 */
+	public function getDate($field, $format = '')
+	{
+		if (empty($this->{$field})) return '';
+		else {
+			return dol_print_date($this->{$field}, $format);
+		}
+	}
 
-    /**
-     * Function to set date in field
-     *
-     * @param   string  $field  field to set
-     * @param   string  $date   formatted date to convert
-     * @return                  mixed
-     */
-    public function setDate($field, $date)
-    {
-        if (empty($date))
-        {
-            $this->{$field} = 0;
-        }
-        else
-        {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-            $this->{$field} = dol_stringtotime($date);
-        }
+	/**
+	 * Function to set date in field
+	 *
+	 * @param   string  $field  field to set
+	 * @param   string  $date   formatted date to convert
+	 * @return                  mixed
+	 */
+	public function setDate($field, $date)
+	{
+		if (empty($date))
+		{
+			$this->{$field} = 0;
+		} else {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+			$this->{$field} = dol_stringtotime($date);
+		}
 
-        return $this->{$field};
-    }
+		return $this->{$field};
+	}
 
 
-    /**
-     * Function to update current object
-     *
-     * @param   array   $Tab    Array of values
-     * @return                  int
-     */
-    public function setValues(&$Tab)
-    {
-        foreach ($Tab as $key => $value)
-        {
-            if ($this->checkFieldType($key, 'date'))
-            {
-                $this->setDate($key, $value);
-            }
-            elseif ($this->checkFieldType($key, 'float'))
-            {
-                $this->{$key} = (double) price2num($value);
-            }
-            elseif ($this->checkFieldType($key, 'int')) {
-                $this->{$key} = (int) price2num($value);
-            }
-            else
-            {
-            	$this->{$key} = dol_string_nohtmltag($value);
-            }
-        }
+	/**
+	 * Function to update current object
+	 *
+	 * @param   array   $Tab    Array of values
+	 * @return                  int
+	 */
+	public function setValues(&$Tab)
+	{
+		foreach ($Tab as $key => $value)
+		{
+			if ($this->checkFieldType($key, 'date'))
+			{
+				$this->setDate($key, $value);
+			} elseif ($this->checkFieldType($key, 'float'))
+			{
+				$this->{$key} = (double) price2num($value);
+			} elseif ($this->checkFieldType($key, 'int')) {
+				$this->{$key} = (int) price2num($value);
+			} else {
+				$this->{$key} = dol_string_nohtmltag($value);
+			}
+		}
 
-        return 1;
-    }
+		return 1;
+	}
 }
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 406615aada6..80c47591fbb 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -50,7 +50,7 @@ class Cstate // extends CommonObject
 	public $id;
 
 	public $code_departement;
-
+	public $code;
 	/**
 	 * @var string
 	 * @deprecated
@@ -132,9 +132,7 @@ class Cstate // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -169,16 +167,16 @@ class Cstate // extends CommonObject
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id = $obj->rowid;
-				$this->code_departement = $obj->code_departement;
-				$this->nom = $obj->nom;
+				$this->code_departement = $obj->code_departement;    //deprecated
+				$this->code = $obj->code_departement;
+				$this->nom = $obj->nom;   //deprecated
+				$this->name = $obj->nom;
 				$this->active = $obj->active;
             }
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -264,9 +262,7 @@ class Cstate // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 2524445b294..07d3563088e 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -136,9 +136,7 @@ class Ctypent // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -185,9 +183,7 @@ class Ctypent // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -240,9 +236,7 @@ class Ctypent // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -280,9 +274,7 @@ class Ctypent // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index 096ae47a7b8..ac7b07ea5a9 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -135,9 +135,7 @@ class CUnits // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -195,9 +193,7 @@ class CUnits // extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -236,14 +232,11 @@ class CUnits // extends CommonObject
     		foreach ($filter as $key => $value) {
     			if ($key == 't.rowid' || $key == 't.active' || $key == 't.scale') {
     				$sqlwhere[] = $key.'='.(int) $value;
-    			}
-    			elseif (strpos($key, 'date') !== false) {
+    			} elseif (strpos($key, 'date') !== false) {
     				$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-    			}
-    			elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
+    			} elseif ($key == 't.unit_type' || $key == 't.code' || $key == 't.short_label') {
     				$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
-    			}
-    			else {
+    			} else {
     				$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
     			}
     		}
@@ -339,9 +332,7 @@ class CUnits // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -379,9 +370,7 @@ class CUnits // extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -397,10 +386,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');
 		}
 
@@ -424,10 +412,10 @@ class CUnits // extends CommonObject
 
 		// convert to standard unit
 		$value  = $value * $scaleUnitPow;
-		if($fk_new_unit !=0 ){
+		if ($fk_new_unit !=0 ){
 			// Calcul en unité de base
 			$scaleUnitPow = $this->scaleOfUnitPow($fk_new_unit);
-			if(!empty($scaleUnitPow))
+			if (!empty($scaleUnitPow))
 			{
 				// convert to new unit
 				$value  = $value / $scaleUnitPow;
@@ -436,11 +424,9 @@ class CUnits // extends CommonObject
 		return round($value, 2);
 	}
 
-
-
 	/**
 	 * get scale of unit factor
-	 * @param $id int id of unit in dictionary
+	 * @param int $id id of unit in dictionary
 	 * @return float|int
 	 */
 	public function scaleOfUnitPow($id)
@@ -448,9 +434,9 @@ class CUnits // extends CommonObject
 		$base = 10;
 		// TODO : add base col into unit dictionary table
 		$unit = $this->db->getRow('SELECT scale, unit_type from '.MAIN_DB_PREFIX.'c_units WHERE rowid = '.intval($id));
-		if($unit){
+		if ($unit) {
 			// TODO : if base exist in unit dictionary table remove this convertion exception and update convertion infos in database exemple time hour currently scale 3600 will become scale 2 base 60
-			if($unit->unit_type == 'time'){
+			if ($unit->unit_type == 'time') {
 				return doubleval($unit->scale);
 			}
 
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 724b2a778d8..4cddc65d636 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -187,15 +187,11 @@ class DiscountAbsolute
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else
-            {
+            } else {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -264,9 +260,7 @@ class DiscountAbsolute
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror().' - sql='.$sql;
             return -1;
         }
@@ -303,9 +297,7 @@ class DiscountAbsolute
                     $this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
-            }
-            else
-            {
+            } else {
                 dol_print_error($this->db);
                 return -1;
             }
@@ -331,9 +323,7 @@ class DiscountAbsolute
         			$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
         			return -2;
         		}
-        	}
-        	else
-        	{
+        	} else {
         		dol_print_error($this->db);
         		return -1;
         	}
@@ -368,15 +358,12 @@ class DiscountAbsolute
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
-                {
+                } else {
                     $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            elseif ($this->fk_invoice_supplier_source) {
+            } 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;
@@ -387,22 +374,16 @@ class DiscountAbsolute
             	{
             		$this->db->commit();
             		return 1;
-            	}
-            	else
-            	{
+            	} else {
             		$this->error = $this->db->lasterror();
             		$this->db->rollback();
             		return -1;
             	}
-            }
-            else
-            {
+            } else {
                 $this->db->commit();
                 return 1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
@@ -458,9 +439,7 @@ class DiscountAbsolute
         		$this->fk_facture = $rowidinvoice;
         	}
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -490,9 +469,7 @@ class DiscountAbsolute
         if ($resql)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -3;
         }
@@ -568,16 +545,13 @@ class DiscountAbsolute
             $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')
+        } 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
-        {
+        } else {
             $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -589,9 +563,7 @@ class DiscountAbsolute
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency == 1) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -614,16 +586,13 @@ class DiscountAbsolute
             $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')
+        } 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
-        {
+        } else {
             $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -635,9 +604,7 @@ class DiscountAbsolute
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency == 1) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
@@ -658,15 +625,12 @@ class DiscountAbsolute
             $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')
+        } 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
-        {
+        } else {
             $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
@@ -678,9 +642,7 @@ class DiscountAbsolute
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency) return $obj->multicurrency_amount;
 			else return $obj->amount;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->lasterror();
             return -1;
         }
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 24e0a6de275..2b148a96e8a 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -55,16 +55,14 @@ class DolGeoIP
 		    {
 		    	require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
 		    }
-		}
-		elseif ($type == 'city')
+		} elseif ($type == 'city')
 		{
 		    // 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';
 		    }
-		}
-		else { print 'ErrorBadParameterInConstructor'; return 0; }
+		} else { print 'ErrorBadParameterInConstructor'; return 0; }
 
 		// Here, function exists (embedded into PHP or exists because we made include)
 		if (empty($type) || empty($datfile))
@@ -85,20 +83,16 @@ class DolGeoIP
 		{
 			try {
 				$this->gi = new GeoIp2\Database\Reader($datfile); // '/usr/local/share/GeoIP/GeoIP2-City.mmdb'
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$this->error = $e->getMessage();
 				dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 				return 0;
 			}
-		}
-		elseif (function_exists('geoip_open'))
+		} elseif (function_exists('geoip_open'))
 		{
 			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
-		}
-		else
-		{
+		} 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();
@@ -126,9 +120,7 @@ class DolGeoIP
 		{
 		    // geoip_country_code_by_addr does not exists
     		return strtolower(geoip_country_code_by_name($ip));
-		}
-		else
-		{
+		} else {
 			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))
 			{
 				if ($geoipversion == '2')
@@ -136,33 +128,25 @@ class DolGeoIP
 					try {
 						$record = $this->gi->country($ip);
 						return strtolower($record->country->isoCode);
-					}
-					catch (Exception $e) {
+					} catch (Exception $e) {
 						//return $e->getMessage();
 						return '';
 					}
-				}
-				else
-				{
+				} 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));
 				}
-			}
-			else
-			{
+			} else {
 				if ($geoipversion == '2')
 				{
 					try {
 						$record = $this->gi->country($ip);
 						return strtolower($record->country->isoCode);
-					}
-					catch (Exception $e) {
+					} catch (Exception $e) {
 						//return $e->getMessage();
 						return '';
 					}
-				}
-				else
-				{
+				} else {
 					if (!function_exists('geoip_country_code_by_addr_v6')) return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
 					return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
 				}
@@ -193,14 +177,11 @@ class DolGeoIP
 			try {
 				$record = $this->gi->country($name);
 				return $record->country->isoCode;
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				//return $e->getMessage();
 				return '';
 			}
-		}
-		else
-		{
+		} else {
 			return geoip_country_code_by_name($this->gi, $name);
 		}
 	}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 4df5c6add45..dee727cb596 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -472,14 +472,10 @@ class DolGraph
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolor = $theme_bgcoloronglet;
-			}
-			else
-			{
+			} else {
 				$this->bgcolor = $theme_bgcolor;
 			}
-		}
-		else
-		{
+		} else {
 			$this->bgcolor = $bg_color;
 		}
 	}
@@ -502,14 +498,10 @@ class DolGraph
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolorgrid = $theme_bgcoloronglet;
-			}
-			else
-			{
+			} else {
 				$this->bgcolorgrid = $theme_bgcolor;
 			}
-		}
-		else
-		{
+		} else {
 			$this->bgcolorgrid = $bg_colorgrid;
 		}
 	}
@@ -541,7 +533,7 @@ class DolGraph
 		$vals = array();
 
 		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
+		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
 		for ($j = 0; $j < $nblines; $j++)
 		{
@@ -570,7 +562,7 @@ class DolGraph
 		$vals = array();
 
 		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
+		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
 		for ($j = 0; $j < $nblines; $j++)
 		{
@@ -725,9 +717,7 @@ class DolGraph
 				foreach ($values as $x => $y) {
 					if (isset($y)) $serie[$i] .= 'd'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
 				}
-			}
-			else
-			{
+			} else {
 				foreach ($values as $x => $y) {
 					if (isset($y)) $serie[$i] .= 'd'.$i.'.push(['.$x.', '.$y.']);'."\n";
 				}
@@ -758,9 +748,7 @@ class DolGraph
 		if ($nblot < 0)
 		{
 			$this->stringtoshow .= '<!-- No series of data -->'."\n";
-		}
-		else
-		{
+		} else {
 			while ($i < $nblot)
 			{
 				$this->stringtoshow .= '<!-- Serie '.$i.' -->'."\n";
@@ -835,8 +823,7 @@ class DolGraph
 		}'."\n";
 		}
 		// Other cases, graph of type 'bars', 'lines'
-		else
-		{
+		else {
 			// Add code to support tooltips
 		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
 			$this->stringtoshow .= '
@@ -895,13 +882,12 @@ class DolGraph
 				$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';
+                    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 }, ';
+                    } 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.' }';
@@ -1058,9 +1044,7 @@ class DolGraph
 		if ($nblot < 0)
 		{
 			$this->stringtoshow .= '<!-- No series of data -->';
-		}
-		else
-		{
+		} else {
 			while ($i < $nblot)
 			{
 				//$this->stringtoshow .= '<!-- Series '.$i.' -->'."\n";
@@ -1103,8 +1087,7 @@ class DolGraph
 					if (strpos($tmp, '-') !== false) {
 						$foundnegativecolor++;
 						$color = '#FFFFFF'; // If $val is '-123'
-					}
-					else $color = "#".$tmp; // If $val is '123' or '#123'
+					} else $color = "#".$tmp; // If $val is '123' or '#123'
 				}
 				$this->stringtoshow .= "'".$color."'";
 				$i++;
@@ -1170,8 +1153,7 @@ class DolGraph
 			$this->stringtoshow .= '});'."\n";
 		}
 		// Other cases, graph of type 'bars', 'lines', 'linesnopoint'
-		else
-		{
+		else {
 			$type = 'bar';
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 09dcc3681b7..f8c33f9403a 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -186,7 +186,7 @@ class dolReceiptPrinter extends Printer
         	'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_PAYMENT',
         	'dol_print_logo' => 'DOL_PRINT_LOGO',
         	'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
         	'dol_value_object_id' => 'InvoiceID',
@@ -197,17 +197,16 @@ class dolReceiptPrinter extends Printer
         	'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_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_mobile' => 'DOL_VALUE_CUSTOMER_MOBILE',
         	'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_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',
@@ -572,7 +571,7 @@ class dolReceiptPrinter extends Printer
         // 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_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);
@@ -583,12 +582,12 @@ class dolReceiptPrinter extends Printer
 
         $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->mail, $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->vatintra, $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_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);
@@ -776,6 +775,35 @@ class dolReceiptPrinter extends Printer
 							}
                         }
 						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,";
+						$sql .= " cp.code";
+						$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
+						$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
+						$sql .= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
+						$sql .= " ORDER BY p.datep";
+						$resql = $this->db->query($sql);
+						if ($resql)
+						{
+							$num = $this->db->num_rows($resql);
+							$i = 0;
+							while ($i < $num) {
+								$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;
+								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
+								{
+									$spacestoadd = $nbcharactbyline - strlen($langs->trans("Change")) - 12;
+									$spaces = str_repeat(' ', $spacestoadd);
+									$this->printer->text($spaces.$langs->trans("Change").' '.str_pad(price($row->pos_change), 10, ' ', STR_PAD_LEFT)."\n");
+								}
+								$i++;
+							}
+						}
+						break;
                     default:
                         $this->printer->text($vals[$tplline]['tag']);
                         $this->printer->text($vals[$tplline]['value']);
@@ -788,6 +816,7 @@ class dolReceiptPrinter extends Printer
 			if ($this->printer->connector instanceof DummyPrintConnector)
 			{
 				$data = $this->printer->connector->getData();
+				if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") echo base64_encode($data);
 				dol_syslog($data);
 			}
 			// Close and print
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 3bac7c8c2cc..7cf18ae4801 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -95,13 +95,12 @@ class EmailSenderProfile extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>1),
 		'email' => array('type'=>'varchar(255)', 'label'=>'Email', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1),
-		//'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
 		'private' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'User', 'visible'=>-1, 'enabled'=>1, 'position'=>50, 'default'=>'0', 'notnull'=>1),
 		'signature' => array('type'=>'text', 'label'=>'Signature', 'visible'=>3, 'enabled'=>1, 'position'=>400, 'notnull'=>-1, 'index'=>1,),
 		'position' => array('type'=>'integer', 'label'=>'Position', 'visible'=>1, 'enabled'=>1, 'position'=>405, 'notnull'=>-1, 'index'=>1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'default'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1, 'arrayofkeyval'=>array(0=>'Disabled', 1=>'Enabled')),
+		'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'default'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0=>'Disabled', 1=>'Enabled')),
 	);
 
 	/**
@@ -331,7 +330,7 @@ class EmailSenderProfile extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status, $mode);
+		return $this->LibStatut($this->active, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -346,36 +345,16 @@ class EmailSenderProfile extends CommonObject
 	{
 		global $langs;
 
-		if ($mode == 0 || $mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
+		if ($status == 1) {
+			$label = $labelshort = $langs->trans('Enabled');
+		} else {
+			$label = $labelshort = $langs->trans('Disabled');
 		}
+
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+
+		return dolGetStatus($label, $labelshort, '', $statusType, $mode);
 	}
 
     /**
@@ -424,9 +403,7 @@ class EmailSenderProfile extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 9c2e5b145dd..bffd23f05d2 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -173,9 +173,7 @@ class Events // extends CommonObject
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -260,9 +258,7 @@ class Events // extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 5ac47f1a478..e17bfbc55d4 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -38,103 +38,116 @@
 class ExtraFields
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
-     * @var array Array with type of element (for what object is the extrafield)
+	 * @var array Array with type of element (for what object is the extrafield)
 	 * @deprecated
-     */
-    public $attribute_elementtype;
+	 */
+	public $attribute_elementtype;
 
-    /**
-     * @var array Array with type of the extra field
+	/**
+	 * @var array Array with type of the extra field
 	 * @deprecated
-     */
-    public $attribute_type;
+	 */
+	public $attribute_type;
 
-    /**
-     * @var array Array with label of extra field
+	/**
+	 * @var array Array with label of extra field
 	 * @deprecated
-     */
-    public $attribute_label;
+	 */
+	public $attribute_label;
 
-    /**
-     * @var array Array with size of extra field
+	/**
+	 * @var array Array with size of extra field
 	 * @deprecated
-     */
+	 */
 	public $attribute_size;
 
-    /**
-     * @var array Array with list of possible values for some types of extra fields
+	/**
+	 * @var array Array with list of possible values for some types of extra fields
 	 * @deprecated
-     */
+	 */
 	public $attribute_choice;
 
-    /**
-     * @var array Array to store compute formula for computed fields
+	/**
+	 * @var array Array to store compute formula for computed fields
 	 * @deprecated
-     */
+	 */
 	public $attribute_computed;
 
-    /**
-     * @var array Array to store default value
+	/**
+	 * @var array Array to store default value
 	 * @deprecated
-     */
+	 */
 	public $attribute_default;
 
-    /**
-     * @var array Array to store if attribute is unique or not
+	/**
+	 * @var array Array to store if attribute is unique or not
 	 * @deprecated
-     */
+	 */
 	public $attribute_unique;
 
-    /**
-     * @var array Array to store if attribute is required or not
+	/**
+	 * @var array Array to store if attribute is required or not
 	 * @deprecated
-     */
+	 */
 	public $attribute_required;
 
-    /**
-     * @var array Array to store parameters of attribute (used in select type)
+	/**
+	 * @var array Array to store parameters of attribute (used in select type)
 	 * @deprecated
-     */
+	 */
 	public $attribute_param;
 
-    /**
-     * @var array Array to store position of attribute
+	/**
+	 * @var array Array to store position of attribute
 	 * @deprecated
-     */
+	 */
 	public $attribute_pos;
 
-    /**
-     * @var array Array to store if attribute is editable regardless of the document status
+	/**
+	 * @var array Array to store if attribute is editable regardless of the document status
 	 * @deprecated
-     */
+	 */
 	public $attribute_alwayseditable;
 
-    /**
-     * @var array Array to store permission to check
+	/**
+	 * @var array Array to store permission to check
 	 * @deprecated
-     */
+	 */
 	public $attribute_perms;
 
-    /**
-     * @var array Array to store language file to translate label of values
+	/**
+	 * @var array Array to store language file to translate label of values
 	 * @deprecated
-     */
+	 */
 	public $attribute_langfile;
 
-    /**
-     * @var array Array to store if field is visible by default on list
+	/**
+	 * @var array Array to store if field is visible by default on list
 	 * @deprecated
-     */
+	 */
 	public $attribute_list;
 
 	/**
-     * @var array New array to store extrafields definition
-     */
+	 * @var array Array to store if field is summable
+	 * @deprecated
+	 */
+	public $attribute_totalizable;
+
+	/**
+	 * @var array Array to store entity id of extrafield
+	 * @deprecated
+	 */
+	public $attribute_entityid;
+
+
+	/**
+	 * @var array New array to store extrafields definition
+	 */
 	public $attributes;
 
 	/**
@@ -147,33 +160,33 @@ class ExtraFields
 	 */
 	public $errors = array();
 
-    /**
+	/**
 	 * @var string DB Error number
 	 */
 	public $errno;
 
 
 	public static $type2label = array(
-	    'varchar'=>'String1Line',
-	    'text'=>'TextLongNLines',
-	    'html'=>'HtmlText',
-	    'int'=>'Int',
-	    'double'=>'Float',
-	    'date'=>'Date',
-	    'datetime'=>'DateAndTime',
-	    'boolean'=>'Boolean',
-	    'price'=>'ExtrafieldPrice',
-	    'phone'=>'ExtrafieldPhone',
-	    'mail'=>'ExtrafieldMail',
-	    'url'=>'ExtrafieldUrl',
-	    'password' => 'ExtrafieldPassword',
-	    'select' => 'ExtrafieldSelect',
-	    'sellist' => 'ExtrafieldSelectList',
-	    'radio' => 'ExtrafieldRadio',
-	    'checkbox' => 'ExtrafieldCheckBox',
-	    'chkbxlst' => 'ExtrafieldCheckBoxFromList',
-	    'link' => 'ExtrafieldLink',
-	    'separate' => 'ExtrafieldSeparator',
+		'varchar'=>'String1Line',
+		'text'=>'TextLongNLines',
+		'html'=>'HtmlText',
+		'int'=>'Int',
+		'double'=>'Float',
+		'date'=>'Date',
+		'datetime'=>'DateAndTime',
+		'boolean'=>'Boolean',
+		'price'=>'ExtrafieldPrice',
+		'phone'=>'ExtrafieldPhone',
+		'mail'=>'ExtrafieldMail',
+		'url'=>'ExtrafieldUrl',
+		'password' => 'ExtrafieldPassword',
+		'select' => 'ExtrafieldSelect',
+		'sellist' => 'ExtrafieldSelectList',
+		'radio' => 'ExtrafieldRadio',
+		'checkbox' => 'ExtrafieldCheckBox',
+		'chkbxlst' => 'ExtrafieldCheckBoxFromList',
+		'link' => 'ExtrafieldLink',
+		'separate' => 'ExtrafieldSeparator',
 	);
 
 
@@ -181,7 +194,7 @@ class ExtraFields
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-	*/
+	 */
 	public function __construct($db)
 	{
 		$this->db = $db;
@@ -225,7 +238,7 @@ class ExtraFields
 	 *  @param  string  		$langfile  		 	Language file
 	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
 	 *  @param	int				$totalizable		Is a measure. Must show a total on lists
-     *  @param  int             $printable        Is extrafield displayed on PDF
+	 *  @param  int             $printable        Is extrafield displayed on PDF
 	 *  @return int      							<=0 if KO, >0 if OK
 	 */
 	public function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
@@ -253,11 +266,8 @@ class ExtraFields
 				$this->error = '';
 				$this->errno = 0;
 				return 1;
-			}
-			else return -2;
-		}
-		else
-		{
+			} else return -2;
+		} else {
 			return -1;
 		}
 	}
@@ -338,21 +348,17 @@ class ExtraFields
 					$resql = $this->db->query($sql, 1, 'dml');
 				}
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Add description of a new optional attribute
 	 *
@@ -375,13 +381,13 @@ class ExtraFields
 	 *  @param	string			$langfile		Language file
 	 *  @param  string  		$enabled  		Condition to have the field enabled or not
 	 *  @param	int				$totalizable	Is a measure. Must show a total on lists
-     *  @param  int             $printable        Is extrafield displayed on PDF
+	 *  @param  int             $printable        Is extrafield displayed on PDF
 	 *  @return	int								<=0 if KO, >0 if OK
-     *  @throws Exception
+	 *  @throws Exception
 	 */
 	private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = 0, $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		if ($elementtype == 'thirdparty') $elementtype = 'societe';
@@ -401,13 +407,10 @@ class ExtraFields
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
-			{
+			} else {
 				$params = '';
 			}
 
@@ -436,7 +439,7 @@ class ExtraFields
 			$sql .= " help,";
 			$sql .= " totalizable";
 			$sql .= " )";
-			$sql .= " VALUES('".$attrname."',";
+			$sql .= " VALUES('".$this->db->escape($attrname)."',";
 			$sql .= " '".$this->db->escape($label)."',";
 			$sql .= " '".$this->db->escape($type)."',";
 			$sql .= " ".$pos.",";
@@ -465,9 +468,7 @@ class ExtraFields
 			if ($this->db->query($sql))
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errno = $this->db->lasterrno();
 				return -1;
@@ -497,44 +498,42 @@ class ExtraFields
 			$result = $this->delete_label($attrname, $elementtype);
 			if ($result < 0)
 			{
-			    $this->error = $this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				$this->errors[] = $this->db->lasterror();
-			    $error++;
+				$error++;
 			}
 
 			if (!$error)
 			{
-        		$sql = "SELECT COUNT(rowid) as nb";
-        		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
-        		$sql .= " WHERE elementtype = '".$elementtype."'";
-        		$sql .= " AND name = '".$attrname."'";
-        		//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
-                $resql = $this->db->query($sql);
-                if ($resql)
-                {
-                    $obj = $this->db->fetch_object($resql);
-                    if ($obj->nb <= 0)
-                    {
-            			$result = $this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
-            			if ($result < 0)
-            			{
-            				$this->error = $this->db->lasterror();
-				            $this->errors[] = $this->db->lasterror();
-            				$error++;
-            			}
-                    }
-                }
+				$sql = "SELECT COUNT(rowid) as nb";
+				$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+				$sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'";
+				$sql .= " AND name = '".$this->db->escape($attrname)."'";
+				//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
+				$resql = $this->db->query($sql);
+				if ($resql)
+				{
+					$obj = $this->db->fetch_object($resql);
+					if ($obj->nb <= 0)
+					{
+						$result = $this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
+						if ($result < 0)
+						{
+							$this->error = $this->db->lasterror();
+							$this->errors[] = $this->db->lasterror();
+							$error++;
+						}
+					}
+				}
 			}
 
 			return $result;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Delete description of an optional attribute
 	 *
@@ -544,7 +543,7 @@ class ExtraFields
 	 */
 	private function delete_label($attrname, $elementtype = 'member')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if ($elementtype == 'thirdparty') $elementtype = 'societe';
@@ -553,24 +552,20 @@ class ExtraFields
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-			$sql .= " WHERE name = '".$attrname."'";
+			$sql .= " WHERE name = '".$this->db->escape($attrname)."'";
 			$sql .= " AND entity IN  (0,".$conf->entity.')';
-			$sql .= " AND elementtype = '".$elementtype."'";
+			$sql .= " AND elementtype = '".$this->db->escape($elementtype)."'";
 
 			dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -596,17 +591,17 @@ class ExtraFields
 	 *  @param  string  $entity	            Entity of extrafields
 	 *  @param	string	$langfile			Language file
 	 *  @param  string  $enabled  			Condition to have the field enabled or not
-     *  @param  int     $totalizable        Is extrafield totalizable on list
-     *  @param  int     $printable        Is extrafield displayed on PDF
+	 *  @param  int     $totalizable        Is extrafield totalizable on list
+	 *  @param  int     $printable        Is extrafield displayed on PDF
 	 * 	@return	int							>0 if OK, <=0 if KO
-     *  @throws Exception
+	 *  @throws Exception
 	 */
 	public function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
 	{
 		if ($elementtype == 'thirdparty') $elementtype = 'societe';
 		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-        $table = $elementtype.'_extrafields';
+		$table = $elementtype.'_extrafields';
 		if ($elementtype == 'categorie') $table = 'categories_extrafields';
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
@@ -659,34 +654,26 @@ class ExtraFields
 					if ($unique)
 					{
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					}
-					else
-					{
+					} else {
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql = $this->db->query($sql, 1, 'dml');
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Modify description of personalized attribute
 	 *
@@ -708,14 +695,14 @@ class ExtraFields
 	 *  @param  string  $entity     		Entity of extrafields
 	 *  @param	string	$langfile			Language file
 	 *  @param  string  $enabled  			Condition to have the field enabled or not
-     *  @param  int     $totalizable        Is extrafield totalizable on list
-     *  @param  int     $printable        Is extrafield displayed on PDF
-     *  @return	int							<=0 if KO, >0 if OK
-     *  @throws Exception
+	 *  @param  int     $totalizable        Is extrafield totalizable on list
+	 *  @param  int     $printable        Is extrafield displayed on PDF
+	 *  @return	int							<=0 if KO, >0 if OK
+	 *  @throws Exception
 	 */
 	private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable.", ".$printable);
 
@@ -725,9 +712,9 @@ class ExtraFields
 
 		if (empty($pos)) $pos = 0;
 		if (empty($list)) $list = '0';
-        if (empty($totalizable)) {
-            $totalizable = 0;
-        }
+		if (empty($totalizable)) {
+			$totalizable = 0;
+		}
 		if (empty($required)) $required = 0;
 		if (empty($unique)) $unique = 0;
 		if (empty($alwayseditable)) $alwayseditable = 0;
@@ -739,13 +726,10 @@ class ExtraFields
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
-			{
+			} else {
 				$params = '';
 			}
 
@@ -753,17 +737,15 @@ class ExtraFields
 			{
 				// We dont want on all entities, we delete all and current
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del .= " WHERE name = '".$attrname."'";
+				$sql_del .= " WHERE name = '".$this->db->escape($attrname)."'";
 				$sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
-				$sql_del .= " AND elementtype = '".$elementtype."'";
-			}
-			else
-			{
+				$sql_del .= " AND elementtype = '".$this->db->escape($elementtype)."'";
+			} else {
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del .= " WHERE name = '".$attrname."'";
+				$sql_del .= " WHERE name = '".$this->db->escape($attrname)."'";
 				$sql_del .= " AND entity = 0";
-				$sql_del .= " AND elementtype = '".$elementtype."'";
+				$sql_del .= " AND elementtype = '".$this->db->escape($elementtype)."'";
 			}
 			$resql1 = $this->db->query($sql_del);
 
@@ -783,7 +765,7 @@ class ExtraFields
 			$sql .= " param,";
 			$sql .= " list,";
 			$sql .= " printable,";
-            $sql .= " totalizable,";
+			$sql .= " totalizable,";
 			$sql .= " fielddefault,";
 			$sql .= " fieldcomputed,";
 			$sql .= " fk_user_author,";
@@ -792,7 +774,7 @@ class ExtraFields
 			$sql .= " enabled,";
 			$sql .= " help";
 			$sql .= ") VALUES (";
-			$sql .= "'".$attrname."',";
+			$sql .= "'".$this->db->escape($attrname)."',";
 			$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
 			$sql .= " '".$this->db->escape($label)."',";
 			$sql .= " '".$this->db->escape($type)."',";
@@ -807,7 +789,7 @@ class ExtraFields
 			$sql .= " '".$this->db->escape($params)."',";
 			$sql .= " '".$this->db->escape($list)."', ";
 			$sql .= " '".$this->db->escape($printable)."', ";
-            $sql .= " ".($totalizable ? 'TRUE' : 'FALSE').",";
+			$sql .= " ".($totalizable ? 'TRUE' : 'FALSE').",";
 			$sql .= " ".(($default != '') ? "'".$this->db->escape($default)."'" : "null").",";
 			$sql .= " ".($computed ? "'".$this->db->escape($computed)."'" : "null").",";
 			$sql .= " ".$user->id.",";
@@ -823,22 +805,18 @@ class ExtraFields
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Load array this->attributes, or old this->attribute_xxx like attribute_label, attribute_type, ...
 	 *
@@ -848,7 +826,7 @@ class ExtraFields
 	 */
 	public function fetch_name_optionals_label($elementtype, $forceload = false)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		if (empty($elementtype)) return array();
@@ -864,7 +842,7 @@ class ExtraFields
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,printable,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
 		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
 		//$sql.= " WHERE entity IN (0,".$conf->entity.")";    // Filter is done later
-		if ($elementtype) $sql .= " WHERE elementtype = '".$elementtype."'"; // Filed with object->table_element
+		if ($elementtype) $sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'"; // Filed with object->table_element
 		$sql .= " ORDER BY pos";
 
 		$resql = $this->db->query($sql);
@@ -874,15 +852,15 @@ class ExtraFields
 			{
 				while ($tab = $this->db->fetch_object($resql))
 				{
-				    if ($tab->entity != 0 && $tab->entity != $conf->entity)
-				    {
-				        // This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field without default value
-				        if ($tab->fieldrequired && is_null($tab->fielddefault))
-				        {
-				            $this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name] = $tab->type;
-				        }
-				        continue;
-				    }
+					if ($tab->entity != 0 && $tab->entity != $conf->entity)
+					{
+						// This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field without default value
+						if ($tab->fieldrequired && is_null($tab->fielddefault))
+						{
+							$this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name] = $tab->type;
+						}
+						continue;
+					}
 
 					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
 					if ($tab->type != 'separate')
@@ -924,7 +902,7 @@ class ExtraFields
 					$this->attributes[$tab->elementtype]['langfile'][$tab->name] = $tab->langs;
 					$this->attributes[$tab->elementtype]['list'][$tab->name] = $tab->list;
 					$this->attributes[$tab->elementtype]['printable'][$tab->name] = $tab->printable;
-                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name] = ($tab->totalizable ? 1 : 0);
+					$this->attributes[$tab->elementtype]['totalizable'][$tab->name] = ($tab->totalizable ? 1 : 0);
 					$this->attributes[$tab->elementtype]['entityid'][$tab->name] = $tab->entity;
 					$this->attributes[$tab->elementtype]['enabled'][$tab->name] = $tab->enabled;
 					$this->attributes[$tab->elementtype]['help'][$tab->name] = $tab->help;
@@ -933,9 +911,7 @@ class ExtraFields
 				}
 			}
 			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
 		}
@@ -992,8 +968,7 @@ class ExtraFields
 			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else // Old usage
 		{
 			$label = $this->attribute_label[$key];
 			$type = $this->attribute_type[$key];
@@ -1021,39 +996,29 @@ class ExtraFields
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime' || $type == 'link')
+			} elseif ($type == 'datetime' || $type == 'link')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type, array('int', 'integer', 'double', 'price')))
+			} elseif (in_array($type, array('int', 'integer', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
+			} elseif ($type == 'password')
 			{
 				$morecss = 'maxwidth100';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss = 'minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss = '';
-			}
-			else
-			{
+			} else {
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				elseif (round($size) <= 48)
+				} elseif (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
-				{
+				} else {
 					$morecss = 'minwidth400';
 				}
 			}
@@ -1071,48 +1036,38 @@ class ExtraFields
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type, array('int', 'integer')))
+		} elseif (in_array($type, array('int', 'integer')))
 		{
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			if (empty($mode))
 			{
@@ -1123,27 +1078,22 @@ class ExtraFields
 					$checked = ' value="1" ';
 				}
 				$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
-			}
-			else
-			{
+			} else {
 				$out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
 			}
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1167,8 +1117,7 @@ class ExtraFields
 				$out .= '</option>';
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1189,8 +1138,8 @@ class ExtraFields
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                // 5 : id category type
-                // 6 : ids categories list separated by comma for category root
+				// 5 : id category type
+				// 6 : ids categories list separated by comma for category root
 				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
@@ -1209,131 +1158,129 @@ class ExtraFields
 					$keyList .= ', '.$parentField;
 				}
 
-                $filter_categorie = false;
-                if (count($InfoFieldList) > 5) {
-                    if ($InfoFieldList[0] == 'categorie') {
-                        $filter_categorie = true;
-                    }
-                }
+				$filter_categorie = false;
+				if (count($InfoFieldList) > 5) {
+					if ($InfoFieldList[0] == 'categorie') {
+						$filter_categorie = true;
+					}
+				}
 
-                if ($filter_categorie === false) {
-                    $fields_label = explode('|', $InfoFieldList[1]);
-                    if (is_array($fields_label)) {
-                        $keyList .= ', ';
-                        $keyList .= implode(', ', $fields_label);
-                    }
+				if ($filter_categorie === false) {
+					$fields_label = explode('|', $InfoFieldList[1]);
+					if (is_array($fields_label)) {
+						$keyList .= ', ';
+						$keyList .= implode(', ', $fields_label);
+					}
 
-                    $sqlwhere = '';
-                    $sql = 'SELECT '.$keyList;
-                    $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-                    if (!empty($InfoFieldList[4])) {
-                        // can use curent entity filter
-                        if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
-                            $InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);
-                        }
-                        // can use SELECT request
-                        if (strpos($InfoFieldList[4], '$SEL$') !== false) {
-                            $InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
-                        }
+					$sqlwhere = '';
+					$sql = 'SELECT '.$keyList;
+					$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+					if (!empty($InfoFieldList[4])) {
+						// can use curent entity filter
+						if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
+							$InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);
+						}
+						// can use SELECT request
+						if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+						}
 
-                        // current object id can be use into filter
-                        if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
-                            $InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
-                        } else {
-                            $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-                        }
-                        //We have to join on extrafield table
-                        if (strpos($InfoFieldList[4], 'extra') !== false) {
-                            $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-                            $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
-                        } else {
-                            $sqlwhere .= ' WHERE '.$InfoFieldList[4];
-                        }
-                    } else {
-                        $sqlwhere .= ' WHERE 1=1';
-                    }
-                    // Some tables may have field, some other not. For the moment we disable it.
-                    if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                        $sqlwhere .= ' AND entity = '.$conf->entity;
-                    }
-                    $sql .= $sqlwhere;
-                    //print $sql;
+						// current object id can be use into filter
+						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+							$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
+						} else {
+							$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
+						}
+						//We have to join on extrafield table
+						if (strpos($InfoFieldList[4], 'extra') !== false) {
+							$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+							$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
+						} else {
+							$sqlwhere .= ' WHERE '.$InfoFieldList[4];
+						}
+					} else {
+						$sqlwhere .= ' WHERE 1=1';
+					}
+					// Some tables may have field, some other not. For the moment we disable it.
+					if (in_array($InfoFieldList[0], array('tablewithentity'))) {
+						$sqlwhere .= ' AND entity = '.$conf->entity;
+					}
+					$sql .= $sqlwhere;
+					//print $sql;
 
-                    $sql .= ' ORDER BY '.implode(', ', $fields_label);
+					$sql .= ' ORDER BY '.implode(', ', $fields_label);
 
-                    dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
-                    $resql = $this->db->query($sql);
-                    if ($resql) {
-                        $out .= '<option value="0">&nbsp;</option>';
-                        $num = $this->db->num_rows($resql);
-                        $i = 0;
-                        while ($i < $num) {
-                            $labeltoshow = '';
-                            $obj = $this->db->fetch_object($resql);
+					dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
+					$resql = $this->db->query($sql);
+					if ($resql) {
+						$out .= '<option value="0">&nbsp;</option>';
+						$num = $this->db->num_rows($resql);
+						$i = 0;
+						while ($i < $num) {
+							$labeltoshow = '';
+							$obj = $this->db->fetch_object($resql);
 
-                            // Several field into label (eq table:code|libelle:rowid)
-                            $notrans = false;
-                            $fields_label = explode('|', $InfoFieldList[1]);
-                            if (is_array($fields_label) && count($fields_label) > 1) {
-                                $notrans = true;
-                                foreach ($fields_label as $field_toshow) {
-                                    $labeltoshow .= $obj->$field_toshow.' ';
-                                }
-                            } else {
-                                $labeltoshow = $obj->{$InfoFieldList[1]};
-                            }
-                            $labeltoshow = dol_trunc($labeltoshow, 45);
+							// Several field into label (eq table:code|libelle:rowid)
+							$notrans = false;
+							$fields_label = explode('|', $InfoFieldList[1]);
+							if (is_array($fields_label) && count($fields_label) > 1) {
+								$notrans = true;
+								foreach ($fields_label as $field_toshow) {
+									$labeltoshow .= $obj->$field_toshow.' ';
+								}
+							} else {
+								$labeltoshow = $obj->{$InfoFieldList[1]};
+							}
+							$labeltoshow = $labeltoshow;
 
-                            if ($value == $obj->rowid) {
-                            	if (!$notrans) {
-	                                foreach ($fields_label as $field_toshow) {
-	                                    $translabel = $langs->trans($obj->$field_toshow);
-	                                    $labeltoshow = dol_trunc($translabel, 18).' ';
-	                                }
-                            	}
-                                $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-                            } else {
-                                if (!$notrans) {
-                                    $translabel = $langs->trans($obj->{$InfoFieldList[1]});
-                                    $labeltoshow = dol_trunc($translabel, 18);
-                                }
-                                if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+							if ($value == $obj->rowid) {
+								if (!$notrans) {
+									foreach ($fields_label as $field_toshow) {
+										$translabel = $langs->trans($obj->$field_toshow);
+										$labeltoshow = $translabel.' ';
+									}
+								}
+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							} else {
+								if (!$notrans) {
+									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+									$labeltoshow = $translabel;
+								}
+								if (empty($labeltoshow)) $labeltoshow = '(not defined)';
 
-                                if (!empty($InfoFieldList[3]) && $parentField) {
-                                    $parent = $parentName.':'.$obj->{$parentField};
-                                }
+								if (!empty($InfoFieldList[3]) && $parentField) {
+									$parent = $parentName.':'.$obj->{$parentField};
+								}
 
-                                $out .= '<option value="'.$obj->rowid.'"';
-                                $out .= ($value == $obj->rowid ? ' selected' : '');
-                                $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-                                $out .= '>'.$labeltoshow.'</option>';
-                            }
+								$out .= '<option value="'.$obj->rowid.'"';
+								$out .= ($value == $obj->rowid ? ' selected' : '');
+								$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+								$out .= '>'.$labeltoshow.'</option>';
+							}
 
-                            $i++;
-                        }
-                        $this->db->free($resql);
-                    } else {
-                        print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-                    }
-                } else {
+							$i++;
+						}
+						$this->db->free($resql);
+					} else {
+						print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
+					}
+				} else {
 					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-                    $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-                    $out .= '<option value="0">&nbsp;</option>';
-                    foreach ($data as $data_key => $data_value) {
-                        $out .= '<option value="'.$data_key.'"';
-                        $out .= ($value == $data_key ? ' selected' : '');
-                        $out .= '>'.$data_value.'</option>';
-                    }
-                }
+					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+					$out .= '<option value="0">&nbsp;</option>';
+					foreach ($data as $data_key => $data_value) {
+						$out .= '<option value="'.$data_key.'"';
+						$out .= ($value == $data_key ? ' selected' : '');
+						$out .= '>'.$data_value.'</option>';
+					}
+				}
 			}
 			$out .= '</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
@@ -1344,13 +1291,11 @@ class ExtraFields
 				$out .= ($value == $keyopt ? 'checked' : '');
 				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -1364,8 +1309,8 @@ class ExtraFields
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                // 5 : id category type
-                // 6 : ids categories list separated by comma for category root
+				// 5 : id category type
+				// 6 : ids categories list separated by comma for category root
 				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
@@ -1380,182 +1325,180 @@ class ExtraFields
 					}
 				}
 
-                $filter_categorie = false;
-                if (count($InfoFieldList) > 5) {
-                    if ($InfoFieldList[0] == 'categorie') {
-                        $filter_categorie = true;
-                    }
-                }
+				$filter_categorie = false;
+				if (count($InfoFieldList) > 5) {
+					if ($InfoFieldList[0] == 'categorie') {
+						$filter_categorie = true;
+					}
+				}
 
-                if ($filter_categorie === false) {
-                    $fields_label = explode('|', $InfoFieldList[1]);
-                    if (is_array($fields_label)) {
-                        $keyList .= ', ';
-                        $keyList .= implode(', ', $fields_label);
-                    }
+				if ($filter_categorie === false) {
+					$fields_label = explode('|', $InfoFieldList[1]);
+					if (is_array($fields_label)) {
+						$keyList .= ', ';
+						$keyList .= implode(', ', $fields_label);
+					}
 
-                    $sqlwhere = '';
-                    $sql = 'SELECT '.$keyList;
-                    $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-                    if (!empty($InfoFieldList[4])) {
-                        // can use SELECT request
-                        if (strpos($InfoFieldList[4], '$SEL$') !== false) {
-                            $InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
-                        }
+					$sqlwhere = '';
+					$sql = 'SELECT '.$keyList;
+					$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+					if (!empty($InfoFieldList[4])) {
+						// can use SELECT request
+						if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+						}
 
-                        // current object id can be use into filter
-                        if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
-                            $InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
-                        } elseif (preg_match("#^.*list.php$#", $_SERVER["PHP_SELF"])) {
-                            // Pattern for word=$ID$
-                            $word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
+						// current object id can be use into filter
+						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+							$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
+						} elseif (preg_match("#^.*list.php$#", $_SERVER["PHP_SELF"])) {
+							// Pattern for word=$ID$
+							$word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
 
-                            // Removing space arount =, ( and )
-                            $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
+							// Removing space arount =, ( and )
+							$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 
-                            $nbPreg = 1;
-                            // While we have parenthesis
-                            while ($nbPreg != 0) {
-                                // Init des compteurs
-                                $nbPregRepl = $nbPregSel = 0;
-                                // On retire toutes les parenthèses sans = avant
-                                $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
-                                // On retire les espaces autour des = et parenthèses
-                                $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
-                                // On retire toutes les parenthèses avec = avant
-                                $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
-                                // On retire les espaces autour des = et parenthèses
-                                $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
+							$nbPreg = 1;
+							// While we have parenthesis
+							while ($nbPreg != 0) {
+								// Init des compteurs
+								$nbPregRepl = $nbPregSel = 0;
+								// On retire toutes les parenthèses sans = avant
+								$InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
+								// On retire les espaces autour des = et parenthèses
+								$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
+								// On retire toutes les parenthèses avec = avant
+								$InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
+								// On retire les espaces autour des = et parenthèses
+								$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 
-                                // Calcul du compteur général pour la boucle
-                                $nbPreg = $nbPregRepl + $nbPregSel;
-                            }
+								// Calcul du compteur général pour la boucle
+								$nbPreg = $nbPregRepl + $nbPregSel;
+							}
 
-                            // Si l'on a un AND ou un OR, avant ou après
-                            preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
-                            while (!empty($matchCondition[0])) {
-                                // If the two sides differ but are not empty
-                                if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {
-                                    // Nobody sain would do that without parentheses
-                                    $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-                                } else {
-                                    if (!empty($matchCondition[1])) {
-                                        $boolCond = (($matchCondition[1] == "AND") ? ' AND TRUE ' : ' OR FALSE ');
-                                        $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);
-                                    } elseif (!empty($matchCondition[3])) {
-                                        $boolCond = (($matchCondition[3] == "AND") ? ' TRUE AND ' : ' FALSE OR');
-                                        $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);
-                                    } else {
-                                        $InfoFieldList[4] = " TRUE ";
-                                    }
-                                }
+							// Si l'on a un AND ou un OR, avant ou après
+							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
+							while (!empty($matchCondition[0])) {
+								// If the two sides differ but are not empty
+								if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {
+									// Nobody sain would do that without parentheses
+									$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
+								} else {
+									if (!empty($matchCondition[1])) {
+										$boolCond = (($matchCondition[1] == "AND") ? ' AND TRUE ' : ' OR FALSE ');
+										$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);
+									} elseif (!empty($matchCondition[3])) {
+										$boolCond = (($matchCondition[3] == "AND") ? ' TRUE AND ' : ' FALSE OR');
+										$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);
+									} else {
+										$InfoFieldList[4] = " TRUE ";
+									}
+								}
 
-                                // Si l'on a un AND ou un OR, avant ou après
-                                preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
-                            }
-                        } else {
-                            $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-                        }
+								// Si l'on a un AND ou un OR, avant ou après
+								preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
+							}
+						} else {
+							$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
+						}
 
-                        // We have to join on extrafield table
-                        if (strpos($InfoFieldList[4], 'extra.') !== false) {
-                            $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
-                            $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
-                        } else {
-                            $sqlwhere .= ' WHERE '.$InfoFieldList[4];
-                        }
-                    } else {
-                        $sqlwhere .= ' WHERE 1=1';
-                    }
-                    // Some tables may have field, some other not. For the moment we disable it.
-                    if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                        $sqlwhere .= ' AND entity = '.$conf->entity;
-                    }
-                    // $sql.=preg_replace('/^ AND /','',$sqlwhere);
-                    // print $sql;
+						// We have to join on extrafield table
+						if (strpos($InfoFieldList[4], 'extra.') !== false) {
+							$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+							$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
+						} else {
+							$sqlwhere .= ' WHERE '.$InfoFieldList[4];
+						}
+					} else {
+						$sqlwhere .= ' WHERE 1=1';
+					}
+					// Some tables may have field, some other not. For the moment we disable it.
+					if (in_array($InfoFieldList[0], array('tablewithentity'))) {
+						$sqlwhere .= ' AND entity = '.$conf->entity;
+					}
+					// $sql.=preg_replace('/^ AND /','',$sqlwhere);
+					// print $sql;
 
-                    $sql .= $sqlwhere;
-                    dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
-                    $resql = $this->db->query($sql);
-                    if ($resql) {
-                        $num = $this->db->num_rows($resql);
-                        $i = 0;
+					$sql .= $sqlwhere;
+					dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
+					$resql = $this->db->query($sql);
+					if ($resql) {
+						$num = $this->db->num_rows($resql);
+						$i = 0;
 
-                        $data = array();
+						$data = array();
 
-                        while ($i < $num) {
-                            $labeltoshow = '';
-                            $obj = $this->db->fetch_object($resql);
+						while ($i < $num) {
+							$labeltoshow = '';
+							$obj = $this->db->fetch_object($resql);
 
-                            $notrans = false;
-                            // Several field into label (eq table:code|libelle:rowid)
-                            $fields_label = explode('|', $InfoFieldList[1]);
-                            if (is_array($fields_label)) {
-                                $notrans = true;
-                                foreach ($fields_label as $field_toshow) {
-                                    $labeltoshow .= $obj->$field_toshow.' ';
-                                }
-                            } else {
-                                $labeltoshow = $obj->{$InfoFieldList[1]};
-                            }
-                            $labeltoshow = dol_trunc($labeltoshow, 45);
+							$notrans = false;
+							// Several field into label (eq table:code|libelle:rowid)
+							$fields_label = explode('|', $InfoFieldList[1]);
+							if (is_array($fields_label)) {
+								$notrans = true;
+								foreach ($fields_label as $field_toshow) {
+									$labeltoshow .= $obj->$field_toshow.' ';
+								}
+							} else {
+								$labeltoshow = $obj->{$InfoFieldList[1]};
+							}
+							$labeltoshow = dol_trunc($labeltoshow, 45);
 
-                            if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-                                foreach ($fields_label as $field_toshow) {
-                                    $translabel = $langs->trans($obj->$field_toshow);
-                                    if ($translabel != $obj->$field_toshow) {
-                                        $labeltoshow = dol_trunc($translabel, 18).' ';
-                                    } else {
-                                        $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
-                                    }
-                                }
+							if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+								foreach ($fields_label as $field_toshow) {
+									$translabel = $langs->trans($obj->$field_toshow);
+									if ($translabel != $obj->$field_toshow) {
+										$labeltoshow = dol_trunc($translabel, 18).' ';
+									} else {
+										$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
+									}
+								}
 
-                                $data[$obj->rowid] = $labeltoshow;
-                            } else {
-                                if (!$notrans) {
-                                    $translabel = $langs->trans($obj->{$InfoFieldList[1]});
-                                    if ($translabel != $obj->{$InfoFieldList[1]}) {
-                                        $labeltoshow = dol_trunc($translabel, 18);
-                                    } else {
-                                        $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
-                                    }
-                                }
-                                if (empty($labeltoshow))
-                                    $labeltoshow = '(not defined)';
+								$data[$obj->rowid] = $labeltoshow;
+							} else {
+								if (!$notrans) {
+									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+									if ($translabel != $obj->{$InfoFieldList[1]}) {
+										$labeltoshow = dol_trunc($translabel, 18);
+									} else {
+										$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
+									}
+								}
+								if (empty($labeltoshow))
+									$labeltoshow = '(not defined)';
 
-                                if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-                                    $data[$obj->rowid] = $labeltoshow;
-                                }
+								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+									$data[$obj->rowid] = $labeltoshow;
+								}
 
-                                if (!empty($InfoFieldList[3]) && $parentField) {
-                                    $parent = $parentName.':'.$obj->{$parentField};
-                                }
+								if (!empty($InfoFieldList[3]) && $parentField) {
+									$parent = $parentName.':'.$obj->{$parentField};
+								}
 
-                                $data[$obj->rowid] = $labeltoshow;
-                            }
+								$data[$obj->rowid] = $labeltoshow;
+							}
 
-                            $i++;
-                        }
-                        $this->db->free($resql);
+							$i++;
+						}
+						$this->db->free($resql);
 
-                        $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
-                    } else {
-                        print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-                    }
-                } else {
+						$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+					} else {
+						print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
+					}
+				} else {
 					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-                    $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-                    $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
-                }
+					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 			$showempty = (($required && $default != '') ? 0 : 1);
 			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
@@ -1603,8 +1546,7 @@ class ExtraFields
 			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else // Old usage
 		{
 			//dol_syslog("Warning: parameter 'extrafieldsobjectkey' is missing", LOG_WARNING);
 			$label = $this->attribute_label[$key];
@@ -1631,17 +1573,14 @@ class ExtraFields
 		{
 			$showsize = 10;
 			$value = dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$showsize = 19;
 			$value = dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$showsize = 10;
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {
 				//$value=price($value);
@@ -1649,34 +1588,27 @@ class ExtraFields
 				$number_decimals = $sizeparts[1];
 				$value = price($value, 0, $langs, 0, 0, $number_decimals, '');
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked = '';
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value = dol_print_url($value, '_blank', 32, 1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			if ($value || $value == '0') $value = price($value, 0, $langs, 0, 0, -1);
-		}
-		elseif ($type == 'select')
-		{
+		} elseif ($type == 'select') {
 			$valstr = $param['options'][$value];
 			if (($pos = strpos($valstr, "|")) !== false)
 			{
@@ -1684,9 +1616,7 @@ class ExtraFields
 			}
 			if ($langfile && $valstr) $value = $langs->trans($valstr);
 			else $value = $valstr;
-		}
-		elseif ($type == 'sellist')
-		{
+		} elseif ($type == 'sellist') {
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
 
@@ -1705,6 +1635,13 @@ class ExtraFields
 				$keyList .= implode(', ', $fields_label);
 			}
 
+			$filter_categorie = false;
+			if (count($InfoFieldList) > 5) {
+				if ($InfoFieldList[0] == 'categorie') {
+					$filter_categorie = true;
+				}
+			}
+
 			$sql = 'SELECT '.$keyList;
 			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false)
@@ -1725,48 +1662,55 @@ class ExtraFields
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$value = ''; // value was used, so now we reste it to use it to build final output
+				if ($filter_categorie === false) {
+					$value = ''; // value was used, so now we reste it to use it to build final output
 
-				$obj = $this->db->fetch_object($resql);
+					$obj = $this->db->fetch_object($resql);
 
-				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|', $InfoFieldList[1]);
+					// Several field into label (eq table:code|libelle:rowid)
+					$fields_label = explode('|', $InfoFieldList[1]);
 
-				if (is_array($fields_label) && count($fields_label) > 1)
-				{
-					foreach ($fields_label as $field_toshow)
-					{
-						$translabel = '';
-						if (!empty($obj->$field_toshow)) {
-							$translabel = $langs->trans($obj->$field_toshow);
+					if (is_array($fields_label) && count($fields_label) > 1) {
+						foreach ($fields_label as $field_toshow) {
+							$translabel = '';
+							if (!empty($obj->$field_toshow)) {
+								$translabel = $langs->trans($obj->$field_toshow);
+							}
+							if ($translabel != $field_toshow) {
+								$value .= dol_trunc($translabel, 18).' ';
+							} else {
+								$value .= $obj->$field_toshow.' ';
+							}
 						}
-						if ($translabel != $field_toshow) {
-							$value .= dol_trunc($translabel, 18).' ';
-						} else {
-							$value .= $obj->$field_toshow.' ';
-						}
-					}
-				}
-				else
-				{
-					$translabel = '';
-					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-					}
-					if ($translabel != $obj->{$InfoFieldList[1]}) {
-						$value = dol_trunc($translabel, 18);
 					} else {
-						$value = $obj->{$InfoFieldList[1]};
+						$translabel = '';
+						if (!empty($obj->{$InfoFieldList[1]})) {
+							$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+						}
+						if ($translabel != $obj->{$InfoFieldList[1]}) {
+							$value = dol_trunc($translabel, 18);
+						} else {
+							$value = $obj->{$InfoFieldList[1]};
+						}
 					}
+				} else {
+					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+					$toprint = array();
+					$obj = $this->db->fetch_object($resql);
+					$c = new Categorie($this->db);
+					$c->fetch($obj->rowid);
+					$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
+					foreach ($ways as $way) {
+						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.img_object('', 'category').' '.$way.'</li>';
+					}
+					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+		} elseif ($type == 'radio')
 		{
 			$value = $param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr = explode(',', $value);
 			$value = '';
@@ -1778,8 +1722,7 @@ class ExtraFields
 				}
 			}
 			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -1800,6 +1743,13 @@ class ExtraFields
 				$keyList .= implode(', ', $fields_label);
 			}
 
+			$filter_categorie = false;
+			if (count($InfoFieldList) > 5) {
+				if ($InfoFieldList[0] == 'categorie') {
+					$filter_categorie = true;
+				}
+			}
+
 			$sql = 'SELECT '.$keyList;
 			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
@@ -1811,33 +1761,49 @@ class ExtraFields
 			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
-				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint = array();
-				while ($obj = $this->db->fetch_object($resql)) {
-					// Several field into label (eq table:code|libelle:rowid)
-					$fields_label = explode('|', $InfoFieldList[1]);
-					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ($fields_label as $field_toshow) {
-								$translabel = '';
-								if (!empty($obj->$field_toshow)) {
-									$translabel = $langs->trans($obj->$field_toshow);
+				if ($filter_categorie === false) {
+					$value = ''; // value was used, so now we reste it to use it to build final output
+					$toprint = array();
+					while ($obj = $this->db->fetch_object($resql)) {
+						// Several field into label (eq table:code|libelle:rowid)
+						$fields_label = explode('|', $InfoFieldList[1]);
+						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+							if (is_array($fields_label) && count($fields_label) > 1) {
+								foreach ($fields_label as $field_toshow) {
+									$translabel = '';
+									if (!empty($obj->$field_toshow)) {
+										$translabel = $langs->trans($obj->$field_toshow);
+									}
+									if ($translabel != $field_toshow) {
+										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+									} else {
+										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+									}
 								}
-								if ($translabel != $field_toshow) {
+							} else {
+								$translabel = '';
+								if (!empty($obj->{$InfoFieldList[1]})) {
+									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+								}
+								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
 								}
 							}
-						} else {
-							$translabel = '';
-							if (!empty($obj->{$InfoFieldList[1]})) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-							}
-							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-							} else {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+						}
+					}
+				} else {
+					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+					$toprint = array();
+					while ($obj = $this->db->fetch_object($resql)) {
+						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+							$c = new Categorie($this->db);
+							$c->fetch($obj->rowid);
+							$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
+							foreach ($ways as $way) {
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.img_object('', 'category').' '.$way.'</li>';
 							}
 						}
 					}
@@ -1846,8 +1812,7 @@ class ExtraFields
 			} else {
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out = '';
 
@@ -1868,28 +1833,21 @@ class ExtraFields
 						$object->fetch($value);
 						$value = $object->getNomUrl(3);
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
 			}
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			$value = dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
-		}
-		else
-		{
+		} else {
 			$showsize = round($size);
 			if ($showsize > 48) $showsize = 48;
 		}
@@ -1916,39 +1874,31 @@ class ExtraFields
 
 		$align = '';
 
-        if ($type == 'date')
+		if ($type == 'date')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$align = "right";
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$align = "right";
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			$align = "right";
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$align = "center";
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$align = "right";
 		}
@@ -1972,43 +1922,43 @@ class ExtraFields
 		$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
 		$out .= '</strong></td></tr>';
 
-        $extrafield_param = $this->attributes[$object->table_element]['param'][$key];
-        if (!empty($extrafield_param) && is_array($extrafield_param)) {
-            $extrafield_param_list = array_keys($extrafield_param['options']);
+		$extrafield_param = $this->attributes[$object->table_element]['param'][$key];
+		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 ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
-                	// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.
-                	$collapse_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));
-                    $extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key];
+			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) {
+					// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.
+					$collapse_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));
+					$extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key];
 
-                    $out .= '<!-- Add js script to manage the collpase/uncollapse of extrafields separators '.$key.' -->';
-                    $out .= '<script type="text/javascript">';
-                    $out .= 'jQuery(document).ready(function(){';
-                    if ($collapse_display === false) {
-                        $out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-plus-square\"></span>&nbsp;");'."\n";
-                        $out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
-                    } else {
-                    	$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-minus-square\"></span>&nbsp;");'."\n";
-                    	$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
-                    }
-                    $out .= '   jQuery("#trextrafieldseparator'.$key.'").click(function(){'."\n";
-                    $out .= '       jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").toggle(300, function(){'."\n";
-                    $out .= '           if (jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").is(":hidden")) {'."\n";
-                    $out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
-                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";
-                    $out .= '           } else {'."\n";
-                    $out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
-                    $out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
-                    $out .= '           }'."\n";
-                    $out .= '       });';
-                    $out .= '   });';
-                    $out .= '});';
-                    $out .= '</script>';
-                }
-            }
-        }
+					$out .= '<!-- Add js script to manage the collpase/uncollapse of extrafields separators '.$key.' -->';
+					$out .= '<script type="text/javascript">';
+					$out .= 'jQuery(document).ready(function(){';
+					if ($collapse_display === false) {
+						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-plus-square\"></span>&nbsp;");'."\n";
+						$out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
+					} else {
+						$out .= '   jQuery("#trextrafieldseparator'.$key.' td").prepend("<span class=\"cursorpointer fa fa-minus-square\"></span>&nbsp;");'."\n";
+						$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
+					}
+					$out .= '   jQuery("#trextrafieldseparator'.$key.'").click(function(){'."\n";
+					$out .= '       jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").toggle(300, function(){'."\n";
+					$out .= '           if (jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").is(":hidden")) {'."\n";
+					$out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-plus-square").removeClass("fa-minus-square");'."\n";
+					$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=0; path='.$_SERVER["PHP_SELF"].'"'."\n";
+					$out .= '           } else {'."\n";
+					$out .= '               jQuery("#trextrafieldseparator'.$key.' td span").addClass("fa-minus-square").removeClass("fa-plus-square");'."\n";
+					$out .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
+					$out .= '           }'."\n";
+					$out .= '       });';
+					$out .= '   });';
+					$out .= '});';
+					$out .= '</script>';
+				}
+			}
+		}
 
 		return $out;
 	}
@@ -2038,7 +1988,7 @@ class ExtraFields
 			foreach ($extralabels as $key => $value)
 			{
 				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) continue;
-				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && ! GETPOSTISSET('options_'.$key)) continue;
+				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key)) continue;
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
 				if ($key_type == 'separate') continue;
@@ -2059,8 +2009,8 @@ class ExtraFields
 				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-				    if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
-				        || (!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
+					if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
+						|| (!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
 						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
@@ -2069,42 +2019,29 @@ class ExtraFields
 					}
 				}
 
-				if (in_array($key_type, array('date')))
-				{
+				if (in_array($key_type, array('date'))) {
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('datetime')))
-				{
+				} elseif (in_array($key_type, array('datetime'))) {
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
-				{
+				} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {
 					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
 						$value_key = implode($value_arr, ',');
 					} else {
 						$value_key = '';
 					}
-				}
-				elseif (in_array($key_type, array('price', 'double')))
-				{
+				} elseif (in_array($key_type, array('price', 'double'))) {
 					$value_arr = GETPOST("options_".$key, 'alpha');
 					$value_key = price2num($value_arr);
-				}
-				elseif (in_array($key_type, array('html')))
-				{
+				} elseif (in_array($key_type, array('html'))) {
 					$value_key = GETPOST("options_".$key, 'alpha');
-				}
-				elseif (in_array($key_type, array('text')))
-				{
+				} elseif (in_array($key_type, array('text'))) {
 					$value_key = GETPOST("options_".$key, 'alphanohtml');
-				}
-				else
-				{
+				} else {
 					$value_key = GETPOST("options_".$key);
 					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
 				}
@@ -2116,12 +2053,10 @@ class ExtraFields
 				$langs->load('errors');
 				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
 				return -1;
-			}
-			else {
+			} else {
 				return 1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -2141,9 +2076,7 @@ class ExtraFields
 		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else
-		{
+		} else {
 			$extralabels = $extrafieldsobjectkey;
 		}
 
@@ -2165,23 +2098,19 @@ class ExtraFields
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) continue; // Value was not provided, we should not set it.
 					// Clean parameters
 					$value_key = dol_mktime(GETPOST($keysuffix."options_".$key.$keyprefix."hour", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."min", 'int'), 0, GETPOST($keysuffix."options_".$key.$keyprefix."month", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."day", 'int'), GETPOST($keysuffix."options_".$key.$keyprefix."year", 'int'));
-				}
-				elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
+				} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
 					$value_arr = (array) $value_arr;
 					$value_key = implode(',', $value_arr);
-				}
-				elseif (in_array($key_type, array('price', 'double', 'int')))
+				} elseif (in_array($key_type, array('price', 'double', 'int')))
 				{
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key = price2num($value_arr);
-				}
-				else
-				{
+				} else {
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
 					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index 08413c788b2..a57fa20f510 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -146,7 +146,6 @@ class ExtraLanguages
 			$keyprefix = $keyprefix.'options_';
 		}
 
-
 		return $out;
 	}
 
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index c9bb7372bd2..c941a3a0745 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -64,46 +64,36 @@ class FileUpload
 		if ($element == 'propal') {
 			$pathname = 'comm/propal';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'facture') {
+		} elseif ($element == 'facture') {
 			$pathname = 'compta/facture';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'project') {
+		} elseif ($element == 'project') {
 			$element = $pathname = 'projet';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'project_task') {
+		} elseif ($element == 'project_task') {
 			$pathname = 'projet'; $filename = 'task';
 			$dir_output = $conf->projet->dir_output;
 			$parentForeignKey = 'fk_project';
 			$parentClass = 'Project';
 			$parentElement = 'projet';
 			$parentObject = 'project';
-		}
-		elseif ($element == 'fichinter') {
+		} elseif ($element == 'fichinter') {
 			$element = 'ficheinter';
 			$dir_output = $conf->$element->dir_output;
-		}
-		elseif ($element == 'order_supplier') {
+		} elseif ($element == 'order_supplier') {
 			$pathname = 'fourn'; $filename = 'fournisseur.commande';
 			$dir_output = $conf->fournisseur->commande->dir_output;
-		}
-		elseif ($element == 'invoice_supplier') {
+		} elseif ($element == 'invoice_supplier') {
 			$pathname = 'fourn'; $filename = 'fournisseur.facture';
 			$dir_output = $conf->fournisseur->facture->dir_output;
-		}
-		elseif ($element == 'product') {
+		} elseif ($element == 'product') {
 			$dir_output = $conf->product->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'productbatch') {
+		} elseif ($element == 'productbatch') {
 			$dir_output = $conf->productbatch->multidir_output[$conf->entity];
-		}
-		elseif ($element == 'action') {
+		} elseif ($element == 'action') {
 			$pathname = 'comm/action'; $filename = 'actioncomm';
 			$dir_output = $conf->agenda->dir_output;
-		}
-		elseif ($element == 'chargesociales') {
+		} elseif ($element == 'chargesociales') {
 			$pathname = 'compta/sociales'; $filename = 'chargesociales';
 			$dir_output = $conf->tax->dir_output;
 		} else {
@@ -298,9 +288,7 @@ class FileUpload
 
 			if (preg_match('/error/i', $res)) return false;
 			return true;
-		}
-		else
-		{
+		} else {
 			return false;
 		}
 	}
@@ -451,9 +439,7 @@ class FileUpload
 				} else {
 					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
 				}
-			}
-			else
-			{
+			} else {
 				// Non-multipart uploads (PUT method support)
 				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
 			}
@@ -469,8 +455,7 @@ class FileUpload
 						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 					}
 				}
-			}
-			elseif ($this->options['discard_aborted_uploads'])
+			} elseif ($this->options['discard_aborted_uploads'])
 			{
 				unlink($file_path);
 				$file->error = 'abort';
@@ -493,9 +478,7 @@ class FileUpload
 		if ($file_name)
 		{
 			$info = $this->getFileObject($file_name);
-		}
-		else
-		{
+		} else {
 			$info = $this->getFileObjects();
 		}
 		header('Content-type: application/json');
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 514782593d9..c0216f16a19 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -35,6 +35,8 @@ class Fiscalyear extends CommonObject
 	 */
 	public $element = 'fiscalyear';
 
+	public $picto = 'technic';
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
@@ -97,6 +99,7 @@ class Fiscalyear extends CommonObject
 	public $statuts = array();
 	public $statuts_short = array();
 
+
 	/**
 	 * Constructor
 	 *
@@ -157,16 +160,12 @@ class Fiscalyear extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -206,9 +205,7 @@ class Fiscalyear extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog($this->error, LOG_ERR);
 			$this->db->rollback();
@@ -242,9 +239,7 @@ class Fiscalyear extends CommonObject
 			$this->statut	    = $obj->statut;
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -268,15 +263,85 @@ class Fiscalyear extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
 	}
 
+	/**
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      int			$withpicto                Add picto into link
+	 *  @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, $notooltip = 0, $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $user;
+
+		if (empty($this->ref)) $this->ref = $this->id;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+
+		$result = '';
+
+		$url = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_card.php?id='.$this->id;
+
+		if (!$user->rights->accounting->fiscalyear->write)
+			$option = 'nolink';
+
+		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 ($short) return $url;
+
+		$label = '';
+
+		if ($user->rights->accounting->fiscalyear->write) {
+			$label = '<u>'.$langs->trans("FiscalPeriod").'</u>';
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
+			if (isset($this->statut)) {
+				$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+			}
+		}
+
+		$linkclose = '';
+		if (empty($notooltip) && $user->rights->accounting->fiscalyear->write)
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("FiscalYear");
+				$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>';
+
+		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);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
+
+		return $result;
+	}
+
 	/**
 	 * Give a label from a status
 	 *
@@ -304,27 +369,22 @@ class Fiscalyear extends CommonObject
 		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]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$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]), 'statut4');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$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]), 'statut4');
 			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
@@ -369,9 +429,7 @@ class Fiscalyear extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -402,8 +460,7 @@ class Fiscalyear extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $nb;
 	}
@@ -434,8 +491,7 @@ class Fiscalyear extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $nb;
 	}
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index e24bce5e247..3c094ff5a6b 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -30,9 +30,9 @@
 class HookManager
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -44,18 +44,18 @@ class HookManager
 	 */
 	public $errors = array();
 
-    // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
-    public $contextarray = array();
+	// Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
+	public $contextarray = array();
 
 	// Array with instantiated classes
-    public $hooks = array();
+	public $hooks = array();
 
 	// Array result
-    public $resArray = array();
+	public $resArray = array();
 	// Printable result
-    public $resPrint = '';
+	public $resPrint = '';
 	// Nb of qualified hook ran
-    public $resNbOfHooks = 0;
+	public $resNbOfHooks = 0;
 
 	/**
 	 * Constructor
@@ -84,9 +84,9 @@ class HookManager
 		global $conf;
 
 		// Test if there is hooks to manage
-        if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
+		if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
 
-        // For backward compatibility
+		// For backward compatibility
 		if (!is_array($arraycontext)) $arraycontext = array($arraycontext);
 
 		$this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
@@ -130,28 +130,29 @@ class HookManager
 		return 1;
 	}
 
-    /**
-     *  Execute hooks (if they were initialized) for the given method
-     *
-     *  @param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
-     *  @param		array	$parameters		Array of parameters
-     *  @param		Object	$object			Object to use hooks on
-     *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
-     *  @return		mixed					For 'addreplace' hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-     *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-     *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
-     *                                      $this->error or this->errors are also defined by class called by this function if error.
-     */
+	/**
+	 *  Execute hooks (if they were initialized) for the given method
+	 *
+	 *  @param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
+	 *  @param		array	$parameters		Array of parameters
+	 *  @param		Object	$object			Object to use hooks on
+	 *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
+	 *  @return		mixed					For 'addreplace' hooks (doActions, formConfirm, formObjectOptions, pdf_xxx,...): 	Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+	 *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+	 *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
+	 *                                      $this->error or this->errors are also defined by class called by this function if error.
+	 */
 	public function executeHooks($method, $parameters = array(), &$object = '', &$action = '')
 	{
-        if (!is_array($this->hooks) || empty($this->hooks)) return '';
+		if (!is_array($this->hooks) || empty($this->hooks)) return 0;	// No hook available, do nothing.
 
-        $parameters['context'] = join(':', $this->contextarray);
-        //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
+		$parameters['context'] = join(':', $this->contextarray);
+		//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
-        // Define type of hook ('output' or 'addreplace'). Type 'returnvalue' is deprecated because a 'addreplace' hook can also return resPrint and resArray).
-        $hooktype = 'output';
-        if (in_array(
+		// Define type of hook ('output' or 'addreplace').
+		// TODO Remove hooks with type 'output'. All hooks must be converted into 'addreplace' hooks.
+		$hooktype = 'output';
+		if (in_array(
 			$method,
 			array(
 				'addCalendarChoice',
@@ -171,32 +172,33 @@ class HookManager
 				'formattachOptions',
 				'formBuilddocLineOptions',
 				'formatNotificationMessage',
+				'formConfirm',
 				'getAccessForbiddenMessage',
 				'getDirList',
 				'getFormMail',
 				'getFormatedCustomerRef',
-			    'getFormatedSupplierRef',
+				'getFormatedSupplierRef',
 				'getIdProfUrl',
 				'getInputIdProf',
 				'moveUploadedFile',
 				'moreHtmlStatus',
 				'pdf_build_address',
 				'pdf_writelinedesc',
-			    'pdf_getlinenum',
-			    'pdf_getlineref',
-			    'pdf_getlineref_supplier',
-			    'pdf_getlinevatrate',
-			    'pdf_getlineupexcltax',
-			    'pdf_getlineupwithtax',
-			    'pdf_getlineqty',
-			    'pdf_getlineqty_asked',
-			    'pdf_getlineqty_shipped',
-			    'pdf_getlineqty_keeptoship',
-			    'pdf_getlineunit',
-			    'pdf_getlineremisepercent',
-			    'pdf_getlineprogress',
-			    'pdf_getlinetotalexcltax',
-			    'pdf_getlinetotalwithtax',
+				'pdf_getlinenum',
+				'pdf_getlineref',
+				'pdf_getlineref_supplier',
+				'pdf_getlinevatrate',
+				'pdf_getlineupexcltax',
+				'pdf_getlineupwithtax',
+				'pdf_getlineqty',
+				'pdf_getlineqty_asked',
+				'pdf_getlineqty_shipped',
+				'pdf_getlineqty_keeptoship',
+				'pdf_getlineunit',
+				'pdf_getlineremisepercent',
+				'pdf_getlineprogress',
+				'pdf_getlinetotalexcltax',
+				'pdf_getlinetotalwithtax',
 				'paymentsupplierinvoices',
 				'printAddress',
 				'printEmail',
@@ -207,97 +209,92 @@ class HookManager
 				'restrictedArea',
 				'sendMail',
 				'sendMailAfter',
+				'showOptionals',
 				'showLinkToObjectBlock',
 				'setContentSecurityPolicy',
 				'setHtmlTitle',
-                'completeTabsHead'
+				'completeTabsHead'
 				)
 			)) $hooktype = 'addreplace';
 
-        if ($method == 'insertExtraFields') {
-            $hooktype = 'returnvalue'; // @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
-            dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
-        }
+		// Init return properties
+		$this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;
 
-        // Init return properties
-        $this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;
+		// Loop on each hook to qualify modules that have declared context
+		$modulealreadyexecuted = array();
+		$resaction = 0; $error = 0;
+		foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
+		{
+			if (!empty($modules))
+			{
+				foreach ($modules as $module => $actionclassinstance)
+				{
+					//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
 
-        // Loop on each hook to qualify modules that have declared context
-        $modulealreadyexecuted = array();
-        $resaction = 0; $error = 0; $result = '';
-        foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
-        {
-            if (!empty($modules))
-            {
-                foreach ($modules as $module => $actionclassinstance)
-                {
-                	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
+					// test to avoid running twice a hook, when a module implements several active contexts
+					if (in_array($module, $modulealreadyexecuted)) continue;
 
-                    // test to avoid running twice a hook, when a module implements several active contexts
-                    if (in_array($module, $modulealreadyexecuted)) continue;
+					// jump to next module/class if method does not exist
+					if (!method_exists($actionclassinstance, $method)) continue;
 
-                	// jump to next module/class if method does not exist
-                    if (!method_exists($actionclassinstance, $method)) continue;
+					$this->resNbOfHooks++;
 
-                    $this->resNbOfHooks++;
+					$modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice
 
-                    $modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice
+					// Clean class (an error may have been set from a previous call of another method for same module/hook)
+					$actionclassinstance->error = 0;
+					$actionclassinstance->errors = array();
 
-                    // Clean class (an error may have been set from a previous call of another method for same module/hook)
-                    $actionclassinstance->error = 0;
-                    $actionclassinstance->errors = array();
+					dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
 
-                    dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
-
-                    // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
-                    $parameters['currentcontext'] = $context;
-                    // Hooks that must return int (hooks with type 'addreplace')
-                    if ($hooktype == 'addreplace')
-                    {
-                    	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-                    	if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
-                    	{
-                    		$error++;
-                    		$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
-                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
-                    	}
-
-                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
-                    }
-                    // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
-                    else
+					// Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
+					$parameters['currentcontext'] = $context;
+					// Hooks that must return int (hooks with type 'addreplace')
+					if ($hooktype == 'addreplace')
 					{
-                    	// TODO. this test should be done into the method of hook by returning nothing
-                    	if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+						$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
+						{
+							$error++;
+							$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
+							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
+						}
 
-                    	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
-                    	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+						if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
+					}
+					// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
+					else {
+						// TODO. this test should be done into the method of hook by returning nothing
+						if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
-                    	if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
-                    	if (is_numeric($resaction) && $resaction < 0)
-                    	{
-                    	    $error++;
-                    	    $this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
-                    	    dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
-                    	}
-                    	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
-                    	if (!is_array($resaction) && !is_numeric($resaction))
-                    	{
-                    		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-                    		if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }
-                    	}
-                    }
+						//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
+						$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
-                    //print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
+						if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+						if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
+						if (is_numeric($resaction) && $resaction < 0)
+						{
+							$error++;
+							$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
+							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
+						}
+						// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
+						if (!is_array($resaction) && !is_numeric($resaction))
+						{
+							dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
+							if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }
+						}
+					}
 
-                    unset($actionclassinstance->results);
-                    unset($actionclassinstance->resprints);
-                }
-            }
-        }
+					//print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
 
-        return ($error ?-1 : $resaction);
+					unset($actionclassinstance->results);
+					unset($actionclassinstance->resprints);
+				}
+			}
+		}
+
+		return ($error ? -1 : $resaction);
 	}
 }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2a95dd4cd20..d5d6e59dcb3 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -124,9 +124,7 @@ class Form
 				}
 				if ($fieldrequired) $ret .= '</span>';
 				$ret .= '</div>'."\n";
-			}
-			else
-			{
+			} else {
 				if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 				if ($help) {
 					$ret .= $this->textwithpicto($langs->trans($text), $help);
@@ -135,9 +133,7 @@ class Form
 				}
 				if ($fieldrequired) $ret .= '</span>';
 			}
-		}
-		else
-		{
+		} else {
 			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			if ($fieldrequired) $ret .= '<span class="fieldrequired">';
 			if ($help) {
@@ -190,9 +186,7 @@ class Form
 		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) // TODO add jquery timepicker and support select
 		{
 			$ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);
-		}
-		else
-		{
+		} else {
 			if (GETPOST('action', 'aZ09') == 'edit'.$htmlname)
 			{
 				$ret .= "\n";
@@ -205,15 +199,13 @@ class Form
 				if (preg_match('/^(string|safehtmlstring|email)/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata);
-					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';
-				}
-				elseif (preg_match('/^(numeric|amount)/', $typeofdata))
+					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').' autofocus>';
+				} elseif (preg_match('/^(numeric|amount)/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata);
 					$valuetoshow = price2num($editvalue ? $editvalue : $value);
-					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ?price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';
-				}
-				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
+					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ?price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').' autofocus>';
+				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))	// if wysiwyg is enabled $typeofdata = 'ckeditor'
 				{
 					$tmp = explode(':', $typeofdata);
 					$cols = $tmp[2];
@@ -225,22 +217,19 @@ class Form
 					}
 
 					$valuetoshow = ($editvalue ? $editvalue : $value);
-					$ret .= '<textarea id="'.$htmlname.'" name="'.$htmlname.'" wrap="soft" rows="'.($tmp[1] ? $tmp[1] : '20').'"'.($cols ? ' cols="'.$cols.'"' : 'class="quatrevingtpercent"').$morealt.'">';
+					$ret .= '<textarea id="'.$htmlname.'" name="'.$htmlname.'" wrap="soft" rows="'.($tmp[1] ? $tmp[1] : '20').'"'.($cols ? ' cols="'.$cols.'"' : 'class="quatrevingtpercent"').$morealt.'" autofocus>';
 					// textarea convert automatically entities chars into simple chars.
 					// So we convert & into &amp; so a string like 'a &lt; <b>b</b><br>é<br>&lt;script&gt;alert('X');&lt;script&gt;' stay a correct html and is not converted by textarea component when wysiwig is off.
 					$valuetoshow = str_replace('&', '&amp;', $valuetoshow);
 					$ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));
 					$ret .= '</textarea>';
-				}
-				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')
+				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')
 				{
 					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0);
-				}
-				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
+				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
 				{
 					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0);
-				}
-				elseif (preg_match('/^select;/', $typeofdata))
+				} elseif (preg_match('/^select;/', $typeofdata))
 				{
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -251,8 +240,7 @@ class Form
 						$arraylist[$tmpkey] = $tmp[1];
 					}
 					$ret .= $this->selectarray($htmlname, $arraylist, $value);
-				}
-				elseif (preg_match('/^ckeditor/', $typeofdata))
+				} elseif (preg_match('/^ckeditor/', $typeofdata))
 				{
 					$tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols:uselocalbrowser
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -270,9 +258,7 @@ class Form
 
 				if (empty($notabletag)) $ret .= '</tr></table>'."\n";
 				$ret .= '</form>'."\n";
-			}
-			else
-			{
+			} else {
 				if (preg_match('/^(email)/', $typeofdata))              $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
 				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
 				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);
@@ -289,8 +275,7 @@ class Form
 						$arraylist[$tmp[0]] = $tmp[1];
 					}
 					$ret .= $arraylist[$value];
-				}
-				elseif (preg_match('/^ckeditor/', $typeofdata))
+				} elseif (preg_match('/^ckeditor/', $typeofdata))
 				{
 					$tmpcontent = dol_htmlentitiesbr($value);
 					if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
@@ -302,8 +287,7 @@ class Form
 					// We dont use dol_escape_htmltag to get the html formating active, but this need we must also
 					// clean data from some dangerous html
 					$ret .= dol_string_onlythesehtmltags(dol_htmlentitiesbr($tmpcontent));
-				}
-				else {
+				} else {
 					$ret .= dol_escape_htmltag($value);
 				}
 
@@ -441,8 +425,7 @@ class Form
 				if (!empty($tmp[1])) $inputOption = $tmp[1];
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 				$out .= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";
-			}
-			elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
+			} elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
@@ -450,22 +433,19 @@ class Form
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 
 				$out .= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format
-			}
-			elseif (preg_match('/^(select|autocomplete)/', $inputType))
+			} elseif (preg_match('/^(select|autocomplete)/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $loadmethod = $tmp[1];
 				if (!empty($tmp[2])) $savemethod = $tmp[2];
 				if (!empty($tmp[3])) $button_only = true;
-			}
-			elseif (preg_match('/^textarea/', $inputType))
+			} elseif (preg_match('/^textarea/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
 				$rows = (empty($tmp[1]) ? '8' : $tmp[1]);
 				$cols = (empty($tmp[2]) ? '80' : $tmp[2]);
-			}
-			elseif (preg_match('/^ckeditor/', $inputType))
+			} elseif (preg_match('/^ckeditor/', $inputType))
 			{
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0]; $toolbar = $tmp[1];
@@ -476,9 +456,7 @@ class Form
 				if (!empty($conf->fckeditor->enabled))
 				{
 					$out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";
-				}
-				else
-				{
+				} else {
 					$inputType = 'textarea';
 				}
 			}
@@ -497,9 +475,7 @@ class Form
 						$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";
 						if (!empty($custommsg['error']))
 							$out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";
-				}
-				else
-					$out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
+				} else $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";
 			}
 			if ($inputType == 'textarea') {
 				$out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";
@@ -507,9 +483,7 @@ class Form
 			}
 			$out .= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";
 			$out .= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(!empty($editvalue) ? $editvalue : $value).'</span>'."\n";
-		}
-		else
-		{
+		} else {
 			$out = $value;
 		}
 
@@ -557,9 +531,7 @@ class Form
 		if ($tooltiptrigger == '')
 		{
 			$htmltext = str_replace('"', '&quot;', $htmltext);
-		}
-		else
-		{
+		} else {
 			$classfortooltip = 'classfortooltiponclick';
 			$textfordialog .= '<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
 		}
@@ -568,15 +540,13 @@ class Form
 			$paramfortooltipimg = ' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';
 			if ($tooltiptrigger == '') $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
 			else $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+		} else $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
 		if ($tooltipon == 1 || $tooltipon == 3)
 		{
 			$paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';
 			if ($tooltiptrigger == '') $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip
 			else $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';
-		}
-		else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
+		} else $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag
 		if (empty($notabs)) $s .= '<table class="nobordernopadding"><tr style="height: auto;">';
 		elseif ($notabs == 2) $s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';
 		// Define value if value is before
@@ -631,8 +601,7 @@ class Form
 		if (empty($conf->use_javascript_ajax))
 		{
 			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable')	return $text;
-			else
-			{
+			else {
 				$alt = $htmltext;
 				$htmltext = '';
 			}
@@ -667,16 +636,18 @@ class Form
 	 * @param	string	$selected		Value auto selected when at least one record is selected. Not a preselected value. Use '0' by default.
 	 * @param	array		$arrayofaction	array('code'=>'label', ...). The code is the key stored into the GETPOST('massaction') when submitting action.
 	 * @param   int     $alwaysvisible  1=select button always visible
+	 * @param       string  $name     Name for massaction
+	 * @param       string  $cssclass CSS class used to check for select
 	 * @return	string|void					Select list
 	 */
-	public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0)
+	public function selectMassAction($selected, $arrayofaction, $alwaysvisible = 0, $name = 'massaction', $cssclass = 'checkforselect')
 	{
 		global $conf, $langs, $hookmanager;
 
 
 		$disabled = 0;
 		$ret = '<div class="centpercent center">';
-		$ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionselect valignmiddle" name="massaction"'.($disabled ? ' disabled="disabled"' : '').'>';
+		$ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'select valignmiddle alignstart" id="'.$name.'" name="'.$name.'"'.($disabled ? ' disabled="disabled"' : '').'>';
 
 		// Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.
 		$parameters = array();
@@ -695,46 +666,46 @@ class Form
 
 		$ret .= '</select>';
 
-		if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.massactionselect');
+				if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.'.$name.'select');
 
 		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
 		$ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.
-		$ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
+				$ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
 		$ret .= '</div>';
 
 		if (!empty($conf->use_javascript_ajax))
 		{
 			$ret .= '<!-- JS CODE TO ENABLE mass action select -->
     		<script>
-        		function initCheckForSelect(mode)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkbox */
+                        function initCheckForSelect(mode, name, cssclass)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkboxi, "name" refers to the class of the massaction button, "cssclass" to the class of the checkfor select boxes */
         		{
         			atleastoneselected=0;
-    	    		jQuery(".checkforselect").each(function( index ) {
+                                jQuery("."+cssclass).each(function( index ) {
     	  				/* console.log( index + ": " + $( this ).text() ); */
     	  				if ($(this).is(\':checked\')) atleastoneselected++;
     	  			});
 
-					console.log("initCheckForSelect mode="+mode+" atleastoneselected="+atleastoneselected);
+					console.log("initCheckForSelect mode="+mode+" name="+name+" cssclass="+cssclass+" atleastoneselected="+atleastoneselected);
 
     	  			if (atleastoneselected || '.$alwaysvisible.')
     	  			{
-    	  				jQuery(".massaction").show();
-        			    '.($selected ? 'if (atleastoneselected) { jQuery(".massactionselect").val("'.$selected.'").trigger(\'change\'); jQuery(".massactionconfirmed").prop(\'disabled\', false); }' : '').'
-        			    '.($selected ? 'if (! atleastoneselected) { jQuery(".massactionselect").val("0").trigger(\'change\'); jQuery(".massactionconfirmed").prop(\'disabled\', true); } ' : '').'
+                                    jQuery("."+name).show();
+        			    '.($selected ? 'if (atleastoneselected) { jQuery("."+name+"select").val("'.$selected.'").trigger(\'change\'); jQuery("."+name+"confirmed").prop(\'disabled\', false); }' : '').'
+        			    '.($selected ? 'if (! atleastoneselected) { jQuery("."+name+"select").val("0").trigger(\'change\'); jQuery("."+name+"confirmed").prop(\'disabled\', true); } ' : '').'
     	  			}
     	  			else
     	  			{
-    	  				jQuery(".massaction").hide();
-						jQuery(".massactionother").hide();
+                                    jQuery("."+name).hide();
+                                    jQuery("."+name+"other").hide();
     	            }
         		}
 
         	jQuery(document).ready(function () {
-        		initCheckForSelect(0);
-        		jQuery(".checkforselect").click(function() {
-        			initCheckForSelect(1);
-    	  		});
-    	  		jQuery(".massactionselect").change(function() {
+                    initCheckForSelect(0, "' . $name.'", "'.$cssclass.'");
+                    jQuery(".' . $cssclass.'").click(function() {
+                        initCheckForSelect(1, "'.$name.'", "'.$cssclass.'");
+                    });
+                        jQuery(".' . $name.'select").change(function() {
         			var massaction = $( this ).val();
         			var urlform = $( this ).closest("form").attr("action").replace("#show_files","");
         			if (massaction == "builddoc")
@@ -742,17 +713,18 @@ class Form
                         urlform = urlform + "#show_files";
     	            }
         			$( this ).closest("form").attr("action", urlform);
-                    console.log("we select a mass action "+massaction+" - "+urlform);
+                    console.log("we select a mass action name='.$name.' massaction="+massaction+" - "+urlform);
         	        /* Warning: if you set submit button to disabled, post using Enter will no more work if there is no other button */
         			if ($(this).val() != \'0\')
     	  			{
-    	  				jQuery(".massactionconfirmed").prop(\'disabled\', false);
-						jQuery(".massactionother").show();
+                                        jQuery(".' . $name.'confirmed").prop(\'disabled\', false);
+										jQuery(".' . $name.'other").hide();	/* To disable if another div was open */
+                                        jQuery(".' . $name.'"+massaction).show();
     	  			}
     	  			else
     	  			{
-    	  				jQuery(".massactionconfirmed").prop(\'disabled\', true);
-						jQuery(".massactionother").hide();
+                                        jQuery(".' . $name.'confirmed").prop(\'disabled\', true);
+										jQuery(".' . $name.'other").hide();	/* To disable any div open */
     	  			}
     	        });
         	});
@@ -856,9 +828,7 @@ class Form
 					{
 						$foundselected = true;
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';
 					}
 					if ($row['label']) $out .= dol_trunc($row['label'], $maxlength, 'middle');
@@ -868,9 +838,7 @@ class Form
 				}
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -947,9 +915,7 @@ class Form
 					if ($selected && ($selected == $row['rowid'] || $selected == $row['code']))
 					{
 						$out .= '<option value="'.$row['rowid'].'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.$row['rowid'].'">';
 					}
 
@@ -966,9 +932,7 @@ class Form
 			{
 				$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1073,9 +1037,7 @@ class Form
 			asort($this->cache_types_fees);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1121,25 +1083,6 @@ class Form
 	}
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return HTML code to select a company.
-	 *
-	 *  @param		int			$selected				Preselected products
-	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page)
-	 *  @param		int			$filter					Filter on thirdparty
-	 *  @param		int			$limit					Limit on number of returned lines
-	 *  @param		array		$ajaxoptions			Options for ajax_autocompleter
-	 * 	@param		int			$forcecombo				Force to load all values and output a standard combobox (with no beautification)
-	 *  @return		string								Return select box for thirdparty.
-	 *  @deprecated	3.8 Use select_company instead. For exemple $form->select_thirdparty(GETPOST('socid'),'socid','',0) => $form->select_company(GETPOST('socid'),'socid','',1,0,0,array(),0)
-	 */
-	public function select_thirdparty($selected = '', $htmlname = 'socid', $filter = '', $limit = 20, $ajaxoptions = array(), $forcecombo = 0)
-	{
-		// phpcs:enable
-		return $this->select_thirdparty_list($selected, $htmlname, $filter, 1, 0, $forcecombo, array(), '', 0, $limit);
-	}
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output html form to select a third party
@@ -1194,9 +1137,7 @@ class Form
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
-		}
-		else
-		{
+		} else {
 			// Immediate load of all database
 			$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple);
 		}
@@ -1326,9 +1267,7 @@ class Form
 							$label .= $obj->code_fournisseur.' - ';
 						}
 						$label .= ' '.$obj->name;
-					}
-					else
-					{
+					} else {
 						$label = $obj->name;
 					}
 
@@ -1357,14 +1296,10 @@ class Form
 						if (in_array($obj->rowid, $selected))
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else
-						{
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
-					}
-					else
-					{
+					} else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -1373,9 +1308,7 @@ class Form
 				}
 			}
 			$out .= '</select>'."\n";
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1455,9 +1388,7 @@ class Form
 			}
 			print '</select>';
 			return $qualifiedlines;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1587,9 +1518,7 @@ class Form
 								if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')';
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
-							}
-							else
-							{
+							} else {
 								$out .= '<option value="'.$obj->rowid.'"';
 								if ($disabled) $out .= ' disabled';
 								$out .= '>';
@@ -1598,9 +1527,7 @@ class Form
 								if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')';
 								$out .= '</option>';
 							}
-						}
-						else
-						{
+						} else {
 							if (in_array($obj->rowid, $selected))
 							{
 								$out .= $contactstatic->getFullName($langs);
@@ -1611,9 +1538,7 @@ class Form
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled>';
 				$out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');
 				$out .= '</option>';
@@ -1637,9 +1562,7 @@ class Form
 
 			$this->num = $num;
 			return $out;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -1713,8 +1636,7 @@ class Form
 		{
 			// Build list includeUsers to have only hierarchy
 			$includeUsers = implode(",", $user->getAllChildIds(0));
-		}
-		elseif ($include == 'hierarchyme')
+		} elseif ($include == 'hierarchyme')
 		{
 			// Build list includeUsers to have only hierarchy and current user
 			$includeUsers = implode(",", $user->getAllChildIds(1));
@@ -1735,17 +1657,13 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";
 			if ($force_entity) $sql .= " WHERE u.entity IN (0,".$force_entity.")";
 			else $sql .= " WHERE u.entity IS NOT NULL";
-		}
-		else
-		{
+		} else {
 			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 			{
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
 				$sql .= " ON ug.fk_user = u.rowid";
 				$sql .= " WHERE ug.entity = ".$conf->entity;
-			}
-			else
-			{
+			} else {
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
 			}
 		}
@@ -1762,9 +1680,7 @@ class Form
 		if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))	// MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname
 		{
 			$sql .= " ORDER BY u.firstname ASC";
-		}
-		else
-		{
+		} else {
 			$sql .= " ORDER BY u.lastname ASC";
 		}
 
@@ -1798,18 +1714,7 @@ class Form
 					$disableline = '';
 					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) $disableline = ($enableonlytext ? $enableonlytext : '1');
 
-					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected)))
-					{
-						$out .= '<option value="'.$obj->rowid.'"';
-						if ($disableline) $out .= ' disabled';
-						$out .= ' selected>';
-					}
-					else
-					{
-						$out .= '<option value="'.$obj->rowid.'"';
-						if ($disableline) $out .= ' disabled';
-						$out .= '>';
-					}
+					$labeltoshow = '';
 
 					// $fullNameMode is 0=Lastname+Firstname (MAIN_FIRSTNAME_NAME_POSITION=1), 1=Firstname+Lastname (MAIN_FIRSTNAME_NAME_POSITION=0)
 					$fullNameMode = 0;
@@ -1817,61 +1722,63 @@ class Form
 					{
 						$fullNameMode = 1; //Firstname+lastname
 					}
-					$out .= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
+					$labeltoshow .= $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
 
 					// Complete name with more info
-					$moreinfo = 0;
+					$moreinfo = '';
 					if (!empty($conf->global->MAIN_SHOW_LOGIN))
 					{
-						$out .= ($moreinfo ? ' - ' : ' (').$obj->login;
-						$moreinfo++;
+						$moreinfo .= ($moreinfo ? ' - ' : ' (').$obj->login;
 					}
 					if ($showstatus >= 0)
 					{
 						if ($obj->statut == 1 && $showstatus == 1)
 						{
-							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
-							$moreinfo++;
+							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
 						}
-						if ($obj->statut == 0)
+						if ($obj->statut == 0 && $showstatus == 1)
 						{
-							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
-							$moreinfo++;
+							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
 						}
 					}
 					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity)
 					{
 						if (!$obj->entity)
 						{
-							$out .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");
-							$moreinfo++;
-						}
-						else
-						{
-							$out .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));
-							$moreinfo++;
+							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");
+						} else {
+							$moreinfo .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));
 						}
 					}
-					$out .= ($moreinfo ? ')' : '');
+					$moreinfo .= ($moreinfo ? ')' : '');
 					if ($disableline && $disableline != '1')
 					{
-						$out .= ' - '.$disableline; // This is text from $enableonlytext parameter
+						$moreinfo .= ' - '.$disableline; // This is text from $enableonlytext parameter
 					}
+					$labeltoshow .= $moreinfo;
+
+					$out .= '<option value="'.$obj->rowid.'"';
+					if ($disableline) $out .= ' disabled';
+					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected))) {
+						$out .= ' selected';
+					}
+					if ($showstatus >= 0 && $obj->statut == 0) {
+						$out .= ' data-html="'.dol_escape_htmltag('<strike class="opacitymediumxxx">'.$labeltoshow.'</strike>').'"';
+					}
+					$out .= '>';
+					$out .= $labeltoshow;
 					$out .= '</option>';
-					$outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);
+
+					$outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength).$moreinfo;
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';
 				$out .= '<option value="">'.$langs->trans("None").'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1911,20 +1818,7 @@ class Form
 		$userstatic = new User($this->db);
 		$out = '';
 
-		// Method with no ajax
-		//$out.='<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		if ($action == 'view')
-		{
-			$out .= '';
-		}
-		else
-		{
-			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
-			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
-			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
-			$out .= ' <input type="submit" class="button valignmiddle" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
-			$out .= '<br>';
-		}
+
 		$assignedtouser = array();
 		if (!empty($_SESSION['assignedtouser']))
 		{
@@ -1932,7 +1826,7 @@ class Form
 		}
 		$nbassignetouser = count($assignedtouser);
 
-		if ($nbassignetouser && $action != 'view') $out .= '<br>';
+		//if ($nbassignetouser && $action != 'view') $out .= '<br>';
 		if ($nbassignetouser) $out .= '<ul class="attendees">';
 		$i = 0; $ownerid = 0;
 		foreach ($assignedtouser as $key => $value)
@@ -1965,7 +1859,16 @@ class Form
 		}
 		if ($nbassignetouser) $out .= '</ul>';
 
-		//$out.='</form>';
+		// Method with no ajax
+		if ($action != 'view')
+		{
+			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
+			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
+			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
+			$out .= ' <input type="submit" class="button valignmiddle" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+			$out .= '<br>';
+		}
+
 		return $out;
 	}
 
@@ -1994,13 +1897,16 @@ class Form
 	 *										            'warehouseclosed' = count products from closed warehouses,
 	 *										            'warehouseinternal' = count products from warehouses for internal correct/transfer only
 	 *  @param 		array 		$selected_combinations 	Selected combinations. Format: array([attrid] => attrval, [...])
-	 *  @return		void
+	 *  @param		string		$nooutput				No print, return the output into a string
+	 *  @return		void|string
 	 */
-	public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array())
+	public function select_produits($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $status = 1, $finished = 2, $selected_input_value = '', $hidelabel = 0, $ajaxoptions = array(), $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $selected_combinations = array(), $nooutput = 0)
 	{
 		// phpcs:enable
 		global $langs, $conf;
 
+		$out = '';
+
 		// check parameters
 		$price_level = (!empty($price_level) ? $price_level : 0);
 		if (is_null($ajaxoptions)) $ajaxoptions = array();
@@ -2008,8 +1914,7 @@ class Form
 		if (strval($filtertype) === '' && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 			if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {
 				$filtertype = '0';
-			}
-			elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+			} elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 				$filtertype = '1';
 			}
 		}
@@ -2031,8 +1936,7 @@ class Form
 			{
 				if (empty($conf->product->enabled)) { // when product module is disabled, show services only
 					$filtertype = 1;
-				}
-				elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
+				} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 					$filtertype = 0;
 				}
 			}
@@ -2042,102 +1946,103 @@ class Form
 			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
 				$urloption .= '&socid='.$socid;
 			}
-			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 
 			if (!empty($conf->variants->enabled)) {
-				?>
+				$out .= '
 				<script>
 
-					selected = <?php echo json_encode($selected_combinations) ?>;
+					selected = '.json_encode($selected_combinations).';
 					combvalues = {};
 
 					jQuery(document).ready(function () {
 
-						jQuery("input[name='prod_entry_mode']").change(function () {
-							if (jQuery(this).val() == 'free') {
-								jQuery('div#attributes_box').empty();
+						jQuery("input[name=\'prod_entry_mode\']").change(function () {
+							if (jQuery(this).val() == \'free\') {
+								jQuery(\'div#attributes_box\').empty();
 							}
 						});
 
-						jQuery("input#<?php echo $htmlname ?>").change(function () {
+						jQuery("input#'.$htmlname.'").change(function () {
 
 							if (!jQuery(this).val()) {
-								jQuery('div#attributes_box').empty();
+								jQuery(\'div#attributes_box\').empty();
 								return;
 							}
 
-							jQuery.getJSON("<?php echo dol_buildpath('/variants/ajax/getCombinations.php', 2) ?>", {
+							jQuery.getJSON("'.DOL_URL_ROOT.'/variants/ajax/getCombinations.php", {
 								id: jQuery(this).val()
 							}, function (data) {
-								jQuery('div#attributes_box').empty();
+								jQuery(\'div#attributes_box\').empty();
 
 								jQuery.each(data, function (key, val) {
 
 									combvalues[val.id] = val.values;
 
-									var span = jQuery(document.createElement('div')).css({
-										'display': 'table-row'
+									var span = jQuery(document.createElement(\'div\')).css({
+										\'display\': \'table-row\'
 									});
 
 									span.append(
-										jQuery(document.createElement('div')).text(val.label).css({
-											'font-weight': 'bold',
-											'display': 'table-cell',
-											'text-align': 'right'
+										jQuery(document.createElement(\'div\')).text(val.label).css({
+											\'font-weight\': \'bold\',
+											\'display\': \'table-cell\',
+											\'text-align\': \'right\'
 										})
 									);
 
-									var html = jQuery(document.createElement('select')).attr('name', 'combinations[' + val.id + ']').css({
-										'margin-left': '15px',
-										'white-space': 'pre'
+									var html = jQuery(document.createElement(\'select\')).attr(\'name\', \'combinations[\' + val.id + \']\').css({
+										\'margin-left\': \'15px\',
+										\'white-space\': \'pre\'
 									}).append(
-										jQuery(document.createElement('option')).val('')
+										jQuery(document.createElement(\'option\')).val(\'\')
 									);
 
 									jQuery.each(combvalues[val.id], function (key, val) {
-										var tag = jQuery(document.createElement('option')).val(val.id).html(val.value);
+										var tag = jQuery(document.createElement(\'option\')).val(val.id).html(val.value);
 
 										if (selected[val.fk_product_attribute] == val.id) {
-											tag.attr('selected', 'selected');
+											tag.attr(\'selected\', \'selected\');
 										}
 
 										html.append(tag);
 									});
 
 									span.append(html);
-									jQuery('div#attributes_box').append(span);
+									jQuery(\'div#attributes_box\').append(span);
 								});
 							})
 						});
 
-						<?php if ($selected): ?>
-						jQuery("input#<?php echo $htmlname ?>").change();
-						<?php endif ?>
+						'.($selected ? 'jQuery("input#'.$htmlname.'").change();' : '').'
 					});
 				</script>
-                <?php
+                ';
 			}
-			if (empty($hidelabel)) print $langs->trans("RefOrLabel").' : ';
+
+			if (empty($hidelabel)) $out .= $langs->trans("RefOrLabel").' : ';
 			elseif ($hidelabel > 1) {
 				$placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';
 				if ($hidelabel == 2) {
-					print img_picto($langs->trans("Search"), 'search');
+					$out .= img_picto($langs->trans("Search"), 'search');
 				}
 			}
-			print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
+			$out .= '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';
 			if ($hidelabel == 3) {
-				print img_picto($langs->trans("Search"), 'search');
+				$out .= img_picto($langs->trans("Search"), 'search');
 			}
+		} else {
+			$out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
 		}
-		else
-		{
-			print $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
-		}
+
+		if (empty($nooutput)) print $out;
+		else return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Return list of products for a customer
+	 *	Return list of products for a customer.
+	 *  Called by select_produits.
 	 *
 	 *	@param      int		$selected           Preselected product
 	 *	@param      string	$htmlname           Name of select html
@@ -2159,18 +2064,18 @@ class Form
 	 *										    'warehouseinternal' = count products from warehouses for internal correct/transfer only
 	 *  @return     array    				    Array of keys for json
 	 */
-    public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')
+	public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $user, $db;
 
 		$out = '';
 		$outarray = array();
 
-        // Units
-        if ($conf->global->PRODUCT_USE_UNITS) {
-            $langs->load('other');
-        }
+		// Units
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$langs->load('other');
+		}
 
 		$warehouseStatusArray = array();
 		if (!empty($warehouseStatus))
@@ -2193,11 +2098,9 @@ class Form
 		$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_country, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
 		if (count($warehouseStatusArray))
 		{
-		    $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
-		}
-		else
-		{
-		    $selectFieldsGrouped = ", ".$db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
+			$selectFieldsGrouped = ", sum(".$this->db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
+		} else {
+			$selectFieldsGrouped = ", ".$this->db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
 		}
 
 		$sql = "SELECT ";
@@ -2220,11 +2123,11 @@ class Form
 			$sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx';
 			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx";
 		}
-        // Units
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
-            $selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';
-        }
+		// Units
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
+			$selectFields .= ', unit_long, unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';
+		}
 
 		// Multilang : we add translation
 		if (!empty($conf->global->MAIN_MULTILANGS))
@@ -2250,27 +2153,27 @@ class Form
 		{
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (".getEntity('stock').")";
-			$sql .= ' AND e.statut IN ('.$this->db->escape(implode(',', $warehouseStatusArray)).')'; // Return line if product is inside the selected stock. If not, an empty line will be returned so we will count 0.
+			$sql .= ' AND e.statut IN ('.$this->db->sanitize($this->db->escape(implode(',', $warehouseStatusArray))).')'; // Return line if product is inside the selected stock. If not, an empty line will be returned so we will count 0.
 		}
 
 		// include search in supplier ref
 		if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))
 		{
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 		}
 
 		//Price by customer
 		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
 			$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";
 		}
-        // Units
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
-        }
+		// Units
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
+		}
 		// Multilang : we add translation
 		if (!empty($conf->global->MAIN_MULTILANGS))
 		{
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='".$langs->getDefaultLang()."'";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
 		}
 
 		if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
@@ -2286,13 +2189,11 @@ class Form
 		if ($finished == 0)
 		{
 			$sql .= " AND p.finished = ".$finished;
-		}
-		elseif ($finished == 1)
+		} elseif ($finished == 1)
 		{
 			$sql .= " AND p.finished = ".$finished;
 			if ($status >= 0)  $sql .= " AND p.tosell = ".$status;
-		}
-		elseif ($status >= 0)
+		} elseif ($status >= 0)
 		{
 			$sql .= " AND p.tosell = ".$status;
 		}
@@ -2300,8 +2201,7 @@ class Form
 		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type = ".$filtertype;
 		elseif (empty($conf->product->enabled)) { // when product module is disabled, show services only
 			$sql .= " AND p.fk_product_type = 1";
-		}
-		elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
+		} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 			$sql .= " AND p.fk_product_type = 0";
 		}
 		// Add criteria on ref/label
@@ -2316,19 +2216,19 @@ class Form
 			foreach ($scrit as $crit)
 			{
 				if ($i > 0) $sql .= " AND ";
-				$sql .= "(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";
-				if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";
+				$sql .= "(p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%'";
+				if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.label LIKE '".$this->db->escape($prefix.$crit)."%'";
 				if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION))
 				{
-					$sql .= " OR p.description LIKE '".$db->escape($prefix.$crit)."%'";
-					if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";
+					$sql .= " OR p.description LIKE '".$this->db->escape($prefix.$crit)."%'";
+					if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " OR pl.description LIKE '".$this->db->escape($prefix.$crit)."%'";
 				}
-				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql .= " OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";
+				if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) $sql .= " OR pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%'";
 				$sql .= ")";
 				$i++;
 			}
 			if (count($scrit) > 1) $sql .= ")";
-		  	if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";
+			if (!empty($conf->barcode->enabled)) $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			$sql .= ')';
 		}
 		if (count($warehouseStatusArray))
@@ -2342,16 +2242,14 @@ class Form
 			$sql .= " ORDER BY categorie_product_id ";
 			//ASC OR DESC order
 			($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .= "ASC" : $sql .= "DESC";
-		}
-		else
-		{
-			$sql .= $db->order("p.ref");
+		} else {
+			$sql .= $this->db->order("p.ref");
 		}
 
-		$sql .= $db->plimit($limit, 0);
+		$sql .= $this->db->plimit($limit, 0);
 
 		// Build output string
-		dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
+		dol_syslog(get_class($this)."::select_produits_list search products", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
@@ -2378,10 +2276,8 @@ class Form
 			{
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
-			}
-			else
-			{
-			    if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
+			} else {
+				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 			}
 			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
 
@@ -2399,7 +2295,7 @@ class Form
 					$sql .= " WHERE fk_product_price=".$objp->price_rowid;
 					$sql .= " ORDER BY quantity ASC";
 
-					dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);
+					dol_syslog(get_class($this)."::select_produits_list search prices by qty", LOG_DEBUG);
 					$result2 = $this->db->query($sql);
 					if ($result2)
 					{
@@ -2431,9 +2327,7 @@ class Form
 							array_push($outarray, $optJson);
 						}
 					}
-				}
-				else
-				{
+				} else {
 					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_price_expression)) {
 						$price_product = new Product($this->db);
 						$price_product->fetch($objp->rowid, '', '', 1);
@@ -2465,9 +2359,7 @@ class Form
 
 			if (empty($outputmode)) return $out;
 			return $outarray;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -2525,43 +2417,43 @@ class Form
 
 		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO))  require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        // Units
-        $outvalUnits = '';
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            if (!empty($objp->unit_short)) {
-                $outvalUnits .= ' - '.$objp->unit_short;
-            }
-        }
-        if (!empty($conf->global->PRODUCT_SHOW_DIMENSIONS_IN_COMBO)) {
-            if (!empty($objp->weight) && $objp->weight_units !== null) {
-                $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
-                $outvalUnits .= ' - '.$unitToShow;
-            }
-            if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
-            	$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
-                $outvalUnits .= ' - '.$unitToShow;
-            }
-            if (!empty($objp->surface) && $objp->surface_units !== null) {
-                $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
-                $outvalUnits .= ' - '.$unitToShow;
-            }
-            if (!empty($objp->volume) && $objp->volume_units !== null) {
-                $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
-                $outvalUnits .= ' - '.$unitToShow;
-            }
-        }
-        if ($outdurationvalue && $outdurationunit) {
-            $da = array(
-                'h' => $langs->trans('Hour'),
-                'd' => $langs->trans('Day'),
-                'w' => $langs->trans('Week'),
-                'm' => $langs->trans('Month'),
-                'y' => $langs->trans('Year')
-            );
-            if (isset($da[$outdurationunit])) {
-                $outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
-            }
-        }
+		// Units
+		$outvalUnits = '';
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			if (!empty($objp->unit_short)) {
+				$outvalUnits .= ' - '.$objp->unit_short;
+			}
+		}
+		if (!empty($conf->global->PRODUCT_SHOW_DIMENSIONS_IN_COMBO)) {
+			if (!empty($objp->weight) && $objp->weight_units !== null) {
+				$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
+				$outvalUnits .= ' - '.$unitToShow;
+			}
+			if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
+				$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
+				$outvalUnits .= ' - '.$unitToShow;
+			}
+			if (!empty($objp->surface) && $objp->surface_units !== null) {
+				$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
+				$outvalUnits .= ' - '.$unitToShow;
+			}
+			if (!empty($objp->volume) && $objp->volume_units !== null) {
+				$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
+				$outvalUnits .= ' - '.$unitToShow;
+			}
+		}
+		if ($outdurationvalue && $outdurationunit) {
+			$da = array(
+				'h' => $langs->trans('Hour'),
+				'd' => $langs->trans('Day'),
+				'w' => $langs->trans('Week'),
+				'm' => $langs->trans('Month'),
+				'y' => $langs->trans('Year')
+			);
+			if (isset($da[$outdurationunit])) {
+				$outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
+			}
+		}
 
 		$opt = '<option value="'.$objp->rowid.'"';
 		$opt .= ($objp->rowid == $selected) ? ' selected' : '';
@@ -2571,10 +2463,10 @@ class Form
 		}
 		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
 		{
-		    if (!empty($user->rights->stock->lire)) {
-    			if ($objp->stock > 0) $opt .= ' class="product_line_stock_ok"';
-	       		elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';
-		    }
+			if (!empty($user->rights->stock->lire)) {
+				if ($objp->stock > 0) $opt .= ' class="product_line_stock_ok"';
+		   		elseif ($objp->stock <= 0) $opt .= ' class="product_line_stock_too_low"';
+			}
 		}
 		$opt .= '>';
 		$opt .= $objp->ref;
@@ -2589,9 +2481,9 @@ class Form
 		$outval .= ' - '.dol_trunc($label, $maxlengtharticle);
 		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $outval .= ' ('.getCountry($outorigin, 1).')';
 
-        // Units
-        $opt .= $outvalUnits;
-        $outval .= $outvalUnits;
+		// Units
+		$opt .= $outvalUnits;
+		$outval .= $outvalUnits;
 
 		$found = 0;
 
@@ -2601,9 +2493,9 @@ class Form
 		{
 			$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
-			$sql .= " WHERE fk_product='".$objp->rowid."'";
+			$sql .= " WHERE fk_product = ".((int) $objp->rowid);
 			$sql .= " AND entity IN (".getEntity('productprice').")";
-			$sql .= " AND price_level=".$price_level;
+			$sql .= " AND price_level = ".((int) $price_level);
 			$sql .= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.
 			$sql .= " LIMIT 1";
 
@@ -2619,9 +2511,7 @@ class Form
 					{
 						$opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 						$outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-					}
-					else
-					{
+					} else {
 						$opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 						$outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 					}
@@ -2630,9 +2520,7 @@ class Form
 					$outpricebasetype = $objp2->price_base_type;
 					$outtva_tx = $objp2->tva_tx;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 			}
 		}
@@ -2649,9 +2537,7 @@ class Form
 				$outval .= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/";
 				$opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 				$outval .= $langs->transnoentities("Unit");
-			}
-			else
-			{
+			} else {
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 				$opt .= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -2685,9 +2571,7 @@ class Form
 				{
 					$opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 					$outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-				}
-				else
-				{
+				} else {
 					$opt .= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 					$outval .= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 				}
@@ -2706,9 +2590,7 @@ class Form
 			{
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
-			}
-			else
-			{
+			} else {
 				$opt .= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");
 				$outval .= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");
 			}
@@ -2720,46 +2602,46 @@ class Form
 
 		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
 		{
-	        if (!empty($user->rights->stock->lire)) {
-                $opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;
+			if (!empty($user->rights->stock->lire)) {
+				$opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;
 
-    			if ($objp->stock > 0) {
-    				$outval .= ' - <span class="product_line_stock_ok">';
-    			}elseif ($objp->stock <= 0) {
-    				$outval .= ' - <span class="product_line_stock_too_low">';
-    			}
-    			$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
-    			$outval .= '</span>';
-    			if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
-    			{
-    			    $langs->load("stocks");
+				if ($objp->stock > 0) {
+					$outval .= ' - <span class="product_line_stock_ok">';
+				} elseif ($objp->stock <= 0) {
+					$outval .= ' - <span class="product_line_stock_too_low">';
+				}
+				$outval .= $langs->transnoentities("Stock").':'.$objp->stock;
+				$outval .= '</span>';
+				if (empty($novirtualstock) && !empty($conf->global->STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO))  // Warning, this option may slow down combo list generation
+				{
+					$langs->load("stocks");
 
-    			    $tmpproduct = new Product($this->db);
-    			    $tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)
-    			    $tmpproduct->load_virtual_stock();
-    			    $virtualstock = $tmpproduct->stock_theorique;
+					$tmpproduct = new Product($this->db);
+					$tmpproduct->fetch($objp->rowid, '', '', '', 1, 1, 1); // Load product without lang and prices arrays (we just need to make ->virtual_stock() after)
+					$tmpproduct->load_virtual_stock();
+					$virtualstock = $tmpproduct->stock_theorique;
 
-    			    $opt .= ' - '.$langs->trans("VirtualStock").':'.$virtualstock;
+					$opt .= ' - '.$langs->trans("VirtualStock").':'.$virtualstock;
 
-    			    $outval .= ' - '.$langs->transnoentities("VirtualStock").':';
-    			    if ($virtualstock > 0) {
-    			        $outval .= '<span class="product_line_stock_ok">';
-    			    }elseif ($virtualstock <= 0) {
-    			        $outval .= '<span class="product_line_stock_too_low">';
-    			    }
-    			    $outval .= $virtualstock;
-    			    $outval .= '</span>';
+					$outval .= ' - '.$langs->transnoentities("VirtualStock").':';
+					if ($virtualstock > 0) {
+						$outval .= '<span class="product_line_stock_ok">';
+					} elseif ($virtualstock <= 0) {
+						$outval .= '<span class="product_line_stock_too_low">';
+					}
+					$outval .= $virtualstock;
+					$outval .= '</span>';
 
-    			    unset($tmpproduct);
-    			}
-	        }
+					unset($tmpproduct);
+				}
+			}
 		}
 
 		$opt .= "</option>\n";
 		$optJson = array('key'=>$outkey, 'value'=>$outref, 'label'=>$outval, 'label2'=>$outlabel, 'desc'=>$outdesc, 'type'=>$outtype, 'price_ht'=>price2num($outprice_ht), 'price_ttc'=>price2num($outprice_ttc), 'pricebasetype'=>$outpricebasetype, 'tva_tx'=>$outtva_tx, 'qty'=>$outqty, 'discount'=>$outdiscount, 'duration_value'=>$outdurationvalue, 'duration_unit'=>$outdurationunit, 'pbq'=>$outpbq);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of products for customer (in Ajax if Ajax activated or go to select_produits_fournisseurs_list)
 	 *
@@ -2774,9 +2656,9 @@ class Form
 	 *  @param	string	$morecss		More CSS
 	 *	@return	void
 	 */
-    public function select_produits_fournisseurs($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $ajaxoptions = array(), $hidelabel = 0, $alsoproductwithnosupplierprice = 0, $morecss = '')
+	public function select_produits_fournisseurs($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $ajaxoptions = array(), $hidelabel = 0, $alsoproductwithnosupplierprice = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 		global $price_level, $status, $finished;
 
@@ -2796,14 +2678,12 @@ class Form
 			$urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
 			print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 			print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';
-		}
-		else
-		{
+		} else {
 			print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', -1, 0, 0, $alsoproductwithnosupplierprice, $morecss);
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of suppliers products
 	 *
@@ -2820,9 +2700,9 @@ class Form
 	 *  @param	string	$morecss		Add more CSS
 	 *  @return array           		Array of keys for json
 	 */
-    public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '')
+	public function select_produits_fournisseurs_list($socid, $selected = '', $htmlname = 'productid', $filtertype = '', $filtre = '', $filterkey = '', $statut = -1, $outputmode = 0, $limit = 100, $alsoproductwithnosupplierprice = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $db;
 
 		$out = '';
@@ -2831,28 +2711,28 @@ class Form
 		$maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);
 
 		$langs->load('stocks');
-        // Units
-        if ($conf->global->PRODUCT_USE_UNITS) {
-            $langs->load('other');
-        }
+		// Units
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$langs->load('other');
+		}
 
 		$sql = "SELECT p.rowid, p.ref, p.label, p.price, p.duration, p.fk_product_type,";
 		$sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
 		$sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";
 		$sql .= " pfp.supplier_reputation";
-        // Units
-        if ($conf->global->PRODUCT_USE_UNITS) {
-            $sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
-        }
-        if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";
+		// Units
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
+		}
+		if (!empty($conf->barcode->enabled)) $sql .= ", pfp.barcode";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON ( p.rowid = pfp.fk_product AND pfp.entity IN (".getEntity('product').") )";
 		if ($socid) $sql .= " AND pfp.fk_soc = ".$socid;
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
-        // Units
-        if ($conf->global->PRODUCT_USE_UNITS) {
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
-        }
+		// Units
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
+		}
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
 		$sql .= " AND p.tobuy = 1";
 		if (strval($filtertype) != '') $sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);
@@ -2874,13 +2754,13 @@ class Form
 			}
 			if (count($scrit) > 1) $sql .= ")";
 			if (!empty($conf->barcode->enabled)) {
-                $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
-                $sql .= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
-            }
+				$sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+				$sql .= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
+			}
 			$sql .= ')';
 		}
 		$sql .= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
-		$sql .= $db->plimit($limit, 0);
+		$sql .= $this->db->plimit($limit, 0);
 
 		// Build output string
 
@@ -2915,41 +2795,41 @@ class Form
 				$outdurationvalue = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';
 				$outdurationunit = $outtype == Product::TYPE_SERVICE ?substr($objp->duration, -1) : '';
 
-                // Units
-                $outvalUnits = '';
-                if ($conf->global->PRODUCT_USE_UNITS) {
-                    if (!empty($objp->unit_short)) {
-                        $outvalUnits .= ' - '.$objp->unit_short;
-                    }
-                    if (!empty($objp->weight) && $objp->weight_units !== null) {
-                        $unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
-                        $outvalUnits .= ' - '.$unitToShow;
-                    }
-                    if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
-                    	$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
-                        $outvalUnits .= ' - '.$unitToShow;
-                    }
-                    if (!empty($objp->surface) && $objp->surface_units !== null) {
-                        $unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
-                        $outvalUnits .= ' - '.$unitToShow;
-                    }
-                    if (!empty($objp->volume) && $objp->volume_units !== null) {
-                        $unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
-                        $outvalUnits .= ' - '.$unitToShow;
-                    }
-                    if ($outdurationvalue && $outdurationunit) {
-                        $da = array(
-                            'h' => $langs->trans('Hour'),
-                            'd' => $langs->trans('Day'),
-                            'w' => $langs->trans('Week'),
-                            'm' => $langs->trans('Month'),
-                            'y' => $langs->trans('Year')
-                        );
-                        if (isset($da[$outdurationunit])) {
-                            $outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
-                        }
-                    }
-                }
+				// Units
+				$outvalUnits = '';
+				if ($conf->global->PRODUCT_USE_UNITS) {
+					if (!empty($objp->unit_short)) {
+						$outvalUnits .= ' - '.$objp->unit_short;
+					}
+					if (!empty($objp->weight) && $objp->weight_units !== null) {
+						$unitToShow = showDimensionInBestUnit($objp->weight, $objp->weight_units, 'weight', $langs);
+						$outvalUnits .= ' - '.$unitToShow;
+					}
+					if ((!empty($objp->length) || !empty($objp->width) || !empty($objp->height)) && $objp->length_units !== null) {
+						$unitToShow = $objp->length.' x '.$objp->width.' x '.$objp->height.' '.measuringUnitString(0, 'size', $objp->length_units);
+						$outvalUnits .= ' - '.$unitToShow;
+					}
+					if (!empty($objp->surface) && $objp->surface_units !== null) {
+						$unitToShow = showDimensionInBestUnit($objp->surface, $objp->surface_units, 'surface', $langs);
+						$outvalUnits .= ' - '.$unitToShow;
+					}
+					if (!empty($objp->volume) && $objp->volume_units !== null) {
+						$unitToShow = showDimensionInBestUnit($objp->volume, $objp->volume_units, 'volume', $langs);
+						$outvalUnits .= ' - '.$unitToShow;
+					}
+					if ($outdurationvalue && $outdurationunit) {
+						$da = array(
+							'h' => $langs->trans('Hour'),
+							'd' => $langs->trans('Day'),
+							'w' => $langs->trans('Week'),
+							'm' => $langs->trans('Month'),
+							'y' => $langs->trans('Year')
+						);
+						if (isset($da[$outdurationunit])) {
+							$outvalUnits .= ' - '.$outdurationvalue.' '.$langs->transnoentities($da[$outdurationunit].($outdurationvalue > 1 ? 's' : ''));
+						}
+					}
+				}
 
 				$objRef = $objp->ref;
 				if ($filterkey && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
@@ -2976,7 +2856,7 @@ class Form
 				}
 				$outvallabel .= ' - '.dol_trunc($label, $maxlengtharticle);
 
-                // Units
+				// Units
 				$optlabel .= $outvalUnits;
 				$outvallabel .= $outvalUnits;
 
@@ -3007,9 +2887,7 @@ class Form
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/";
 						$optlabel .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
 						$outvallabel .= $langs->transnoentities("Unit");
-					}
-					else
-					{
+					} else {
 						$optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;
 						$optlabel .= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding
@@ -3044,15 +2922,12 @@ class Form
 						$optlabel .= " - ".$reputations[$objp->supplier_reputation];
 						$outvallabel .= " - ".$reputations[$objp->supplier_reputation];
 					}
-				}
-				else
-				{
+				} else {
 					if (empty($alsoproductwithnosupplierprice))     // No supplier price defined for couple product/supplier
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
-					}
-					else                                            // No supplier price defined for product, even on other suppliers
+					} else // No supplier price defined for product, even on other suppliers
 					{
 						$optlabel .= " - <span class='opacitymedium'>".$langs->trans("NoPriceDefinedForThisSupplier").'</span>';
 						$outvallabel .= ' - '.$langs->transnoentities("NoPriceDefinedForThisSupplier");
@@ -3100,14 +2975,12 @@ class Form
 
 			if (empty($outputmode)) return $out;
 			return $outarray;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return list of suppliers prices for a product
 	 *
@@ -3116,9 +2989,9 @@ class Form
 	 *  @param      int		$selected_supplier  Pre-selected supplier if more than 1 result
 	 *  @return	    string
 	 */
-    public function select_product_fourn_price($productid, $htmlname = 'productfournpriceid', $selected_supplier = '')
+	public function select_product_fourn_price($productid, $htmlname = 'productfournpriceid', $selected_supplier = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$langs->load('stocks');
@@ -3147,9 +3020,7 @@ class Form
 			if (!$num)
 			{
 				$form .= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
-			}
-			else
-			{
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 				$form .= '<option value="0">&nbsp;</option>';
 
@@ -3192,9 +3063,7 @@ class Form
 					if ($objp->quantity == 1)
 					{
 						$opt .= $langs->trans("Unit");
-					}
-					else
-					{
+					} else {
 						$opt .= $langs->trans("Units");
 					}
 					if ($objp->quantity > 1)
@@ -3213,14 +3082,12 @@ class Form
 			$form .= '</select>';
 			$this->db->free($result);
 			return $form;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of delivery address
 	 *
@@ -3230,9 +3097,9 @@ class Form
 	 *    @param    int		$showempty         	Add an empty field
 	 *    @return	integer|null
 	 */
-    public function select_address($selected, $socid, $htmlname = 'address_id', $showempty = 0)
+	public function select_address($selected, $socid, $htmlname = 'address_id', $showempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// looking for users
 		$sql = "SELECT a.rowid, a.label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_address as a";
@@ -3256,9 +3123,7 @@ class Form
 					if ($selected && $selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';
-					}
-					else
-					{
+					} else {
 						print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';
 					}
 					$i++;
@@ -3266,23 +3131,21 @@ class Form
 			}
 			print '</select>';
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load into cache list of payment terms
 	 *
 	 *      @return     int             Nb of lines loaded, <0 if KO
 	 */
-    public function load_cache_conditions_paiements()
+	public function load_cache_conditions_paiements()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$num = count($this->cache_conditions_paiements);
@@ -3315,23 +3178,21 @@ class Form
 			//$this->cache_conditions_paiements=dol_sort_array($this->cache_conditions_paiements, 'label', 'asc', 0, 0, 1);		// We use the field sortorder of table
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge dans cache la liste des délais de livraison possibles
 	 *
 	 *      @return     int             Nb of lines loaded, <0 if KO
 	 */
-    public function load_cache_availability()
+	public function load_cache_availability()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$num = count($this->cache_availability);
@@ -3364,9 +3225,7 @@ class Form
 			$this->cache_availability = dol_sort_array($this->cache_availability, 'label', 'asc', 0, 0, 1);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3381,7 +3240,7 @@ class Form
 	 *		@param	int		$addempty		Add empty entry
 	 *		@return	void
 	 */
-    public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0)
+	public function selectAvailabilityDelay($selected = '', $htmlname = 'availid', $filtertype = '', $addempty = 0)
 	{
 		global $langs, $user;
 
@@ -3396,9 +3255,7 @@ class Form
 			if ($selected == $id)
 			{
 				print '<option value="'.$id.'" selected>';
-			}
-			else
-			{
+			} else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayavailability['label'];
@@ -3413,7 +3270,7 @@ class Form
 	 *
 	 *      @return     int             Nb of lines loaded, <0 if KO
 	 */
-    public function loadCacheInputReason()
+	public function loadCacheInputReason()
 	{
 		global $langs;
 
@@ -3449,9 +3306,7 @@ class Form
 
 			unset($tmparray);
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3467,7 +3322,7 @@ class Form
 	 *	@param	int		$addempty		 Add an empty entry
 	 *	@return	void
 	 */
-    public function selectInputReason($selected = '', $htmlname = 'demandreasonid', $exclude = '', $addempty = 0)
+	public function selectInputReason($selected = '', $htmlname = 'demandreasonid', $exclude = '', $addempty = 0)
 	{
 		global $langs, $user;
 
@@ -3482,9 +3337,7 @@ class Form
 			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
 			{
 				print '<option value="'.$arraydemandreason['id'].'" selected>';
-			}
-			else
-			{
+			} else {
 				print '<option value="'.$arraydemandreason['id'].'">';
 			}
 			$label = $arraydemandreason['label']; // Translation of label was already done into the ->loadCacheInputReason
@@ -3495,15 +3348,15 @@ class Form
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Charge dans cache la liste des types de paiements possibles
 	 *
 	 *      @return     int                 Nb of lines loaded, <0 if KO
 	 */
-    public function load_cache_types_paiements()
+	public function load_cache_types_paiements()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$num = count($this->cache_types_paiements);
@@ -3540,16 +3393,14 @@ class Form
 			$this->cache_types_paiements = dol_sort_array($this->cache_types_paiements, 'label', 'asc', 0, 0, 1);
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Return list of payment modes.
 	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
@@ -3563,9 +3414,9 @@ class Form
 	 * 		@param	string	$morecss			Add more CSS on select tag
 	 *		@return	void
 	 */
-    public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
+	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $user, $conf;
 
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
@@ -3582,9 +3433,7 @@ class Form
 			if ($selected == $id)
 			{
 				print '<option value="'.$id.'" selected>';
-			}
-			else
-			{
+			} else {
 				print '<option value="'.$id.'">';
 			}
 			print $arrayconditions['label'];
@@ -3592,10 +3441,11 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox($htmlname);
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Return list of payment methods
 	 *      Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value but scope is all application, probably not what you want.
@@ -3611,9 +3461,9 @@ class Form
 	 *      @param  string  $morecss        Add more CSS on select tag
 	 * 		@return	void
 	 */
-    public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
+	public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $user, $conf;
 
 		dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
@@ -3661,6 +3511,7 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox('select'.$htmlname);
 	}
 
 
@@ -3671,7 +3522,7 @@ class Form
 	 *  @param  string	$htmlname       Nom de la zone select
 	 * 	@return	string					Code of HTML select to chose tax or not
 	 */
-    public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type')
+	public function selectPriceBaseType($selected = '', $htmlname = 'price_base_type')
 	{
 		global $langs;
 
@@ -3687,9 +3538,7 @@ class Form
 			if ($selected == $id)
 			{
 				$return .= '<option value="'.$id.'" selected>'.$value;
-			}
-			else
-			{
+			} else {
 				$return .= '<option value="'.$id.'">'.$value;
 			}
 			$return .= '</option>';
@@ -3709,7 +3558,7 @@ class Form
 	 *  @param  string	$moreattrib        To add more attribute on select
 	 * 	@return	void
 	 */
-    public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '')
+	public function selectShippingMethod($selected = '', $htmlname = 'shipping_method_id', $filtre = '', $useempty = 0, $moreattrib = '')
 	{
 		global $langs, $conf, $user;
 
@@ -3762,7 +3611,7 @@ class Form
 	 *    @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 formSelectShippingMethod($page, $selected = '', $htmlname = 'shipping_method_id', $addempty = 0)
+	public function formSelectShippingMethod($page, $selected = '', $htmlname = 'shipping_method_id', $addempty = 0)
 	{
 		global $langs, $db;
 
@@ -3793,7 +3642,7 @@ class Form
 	 *
 	 * @return    string                     HTML select
 	 */
-    public function selectSituationInvoices($selected = '', $socid = 0)
+	public function selectSituationInvoices($selected = '', $socid = 0)
 	{
 		global $langs;
 
@@ -3804,36 +3653,33 @@ class Form
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture';
 		$sql .= ' WHERE entity IN ('.getEntity('invoice').')';
 		$sql .= ' AND situation_counter >= 1';
+		$sql .= ' AND fk_soc = '.(int) $socid;
 		$sql .= ' AND type <> 2';
 		$sql .= ' ORDER by situation_cycle_ref, situation_counter desc';
 		$resql = $this->db->query($sql);
+
 		if ($resql && $this->db->num_rows($resql) > 0) {
 			// Last seen cycle
 			$ref = 0;
 			while ($obj = $this->db->fetch_object($resql)) {
-				//Same company ?
-			    if ($socid == $obj->fk_soc) {
-					//Same cycle ?
-			        if ($obj->situation_cycle_ref != $ref) {
-						// Just seen this cycle
-			            $ref = $obj->situation_cycle_ref;
-						//not final ?
-			            if ($obj->situation_final != 1) {
-							//Not prov?
-			                if (substr($obj->ref, 1, 4) != 'PROV') {
-			                    if ($selected == $obj->rowid) {
-			                        $opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';
-								} else {
-								    $opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
-								}
+				//Same cycle ?
+				if ($obj->situation_cycle_ref != $ref) {
+					// Just seen this cycle
+					$ref = $obj->situation_cycle_ref;
+					//not final ?
+					if ($obj->situation_final != 1) {
+						//Not prov?
+						if (substr($obj->ref, 1, 4) != 'PROV') {
+							if ($selected == $obj->rowid) {
+								$opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';
+							} else {
+								$opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';
 							}
 						}
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 				dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);
 		}
 		if ($opt == '<option value ="" selected></option>')
@@ -3851,7 +3697,7 @@ class Form
 	 *      @param	int		$showempty		Add a nempty line
 	 * 		@return	string                  HTML select
 	 */
-    public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0)
+	public function selectUnits($selected = '', $htmlname = 'units', $showempty = 0)
 	{
 		global $langs;
 
@@ -3869,19 +3715,17 @@ class Form
 
 			while ($res = $this->db->fetch_object($resql))
 			{
-			    $unitLabel = $res->label;
-			    if (!empty($langs->tab_translate['unit'.$res->code]))	// check if Translation is available before
-			    {
-			        $unitLabel = $langs->trans('unit'.$res->code) != $res->label ? $langs->trans('unit'.$res->code) : $res->label;
-			    }
+				$unitLabel = $res->label;
+				if (!empty($langs->tab_translate['unit'.$res->code]))	// check if Translation is available before
+				{
+					$unitLabel = $langs->trans('unit'.$res->code) != $res->label ? $langs->trans('unit'.$res->code) : $res->label;
+				}
 
 				if ($selected == $res->rowid)
 				{
-				    $return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
-				}
-				else
-				{
-				    $return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
+					$return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
+				} else {
+					$return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
 				}
 			}
 			$return .= '</select>';
@@ -3889,7 +3733,7 @@ class Form
 		return $return;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return a HTML select list of bank accounts
 	 *
@@ -3903,9 +3747,9 @@ class Form
 	 *  @param	string	$morecss			More CSS
 	 * 	@return	int							<0 if error, Num of bank account found if OK (0, 1, 2, ...)
 	 */
-    public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
+	public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$langs->load("admin");
@@ -3938,9 +3782,7 @@ class Form
 					if ($selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
-					}
-					else
-					{
+					} else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->label);
@@ -3950,14 +3792,11 @@ class Form
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -3977,7 +3816,7 @@ class Form
 	 */
 	public function selectEstablishments($selected = '', $htmlname = 'entity', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf;
 
 		$langs->load("admin");
@@ -4010,9 +3849,7 @@ class Form
 					if ($selected == $obj->rowid)
 					{
 						print '<option value="'.$obj->rowid.'" selected>';
-					}
-					else
-					{
+					} else {
 						print '<option value="'.$obj->rowid.'">';
 					}
 					print trim($obj->name);
@@ -4021,14 +3858,11 @@ class Form
 					$i++;
 				}
 				print "</select>";
-			}
-			else
-			{
+			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveEstablishmentDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoEstablishmentFound").'</span>';
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -4042,7 +3876,7 @@ class Form
 	 *    @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 formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0)
+	public function formSelectAccount($page, $selected = '', $htmlname = 'fk_account', $addempty = 0)
 	{
 		global $langs;
 		if ($htmlname != "none") {
@@ -4066,28 +3900,28 @@ class Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return list of categories having choosed type
 	 *
 	 *    @param	string|int	            $type				Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
-	 *    @param    string		            $selected    		Id of category preselected or 'auto' (autoselect category if there is only one element)
+	 *    @param    string		            $selected    		Id of category preselected or 'auto' (autoselect category if there is only one element). Not used if $outputmode = 1.
 	 *    @param    string		            $htmlname			HTML field name
 	 *    @param    int			            $maxlength      	Maximum length for labels
-     *    @param    int|string|array    	$markafterid        Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
-     *                                                          $markafterid can be an :
-     *                                                          - int (id of category)
-     *                                                          - string (categories ids seprated by comma)
-     *                                                          - array (list of categories ids)
+	 *    @param    int|string|array    	$markafterid        Keep only or removed all categories including the leaf $markafterid in category tree (exclude) or Keep only of category is inside the leaf starting with this id.
+	 *                                                          $markafterid can be an :
+	 *                                                          - int (id of category)
+	 *                                                          - string (categories ids seprated by comma)
+	 *                                                          - array (list of categories ids)
 	 *    @param	int			            $outputmode			0=HTML select string, 1=Array
-     *    @param	int			            $include			[=0] Removed or 1=Keep only
-     *    @param	string					$morecss			More CSS
+	 *    @param	int			            $include			[=0] Removed or 1=Keep only
+	 *    @param	string					$morecss			More CSS
 	 *    @return	string
 	 *    @see select_categories()
 	 */
-    public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '')
+	public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		$langs->load("categories");
 
@@ -4119,13 +3953,10 @@ class Form
 					$i++;
 				}
 				$this->db->free($result);
-			}
-			else dol_print_error($this->db);
-		}
-		else
-		{
+			} else dol_print_error($this->db);
+		} else {
 			$cat = new Categorie($this->db);
-            $cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
+			$cate_arbo = $cat->get_full_arbo($type, $markafterid, $include);
 		}
 
 		$output = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
@@ -4133,17 +3964,14 @@ class Form
 		if (is_array($cate_arbo))
 		{
 			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
-			else
-			{
+			else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
 					if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1))
 					{
 						$add = 'selected ';
-					}
-					else
-					{
+					} else {
 						$add = '';
 					}
 					$output .= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').'</option>';
@@ -4159,7 +3987,7 @@ class Form
 		return $output;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *     Show a confirmation HTML form or AJAX popup
 	 *
@@ -4176,10 +4004,10 @@ class Form
 	 *     @deprecated
 	 *     @see formconfirm()
 	 */
-    public function form_confirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)
+	public function form_confirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)
 	{
-        // phpcs:enable
-        dol_syslog(__METHOD__.': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);
+		// phpcs:enable
+		dol_syslog(__METHOD__.': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);
 		print $this->formconfirm($page, $title, $question, $action, $formquestion, $selectedchoice, $useajax, $height, $width);
 	}
 
@@ -4202,16 +4030,16 @@ class Form
 	 *													type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', ...
 	 * 	   @param  	string			$selectedchoice  	'' or 'no', or 'yes' or '1' or '0'
 	 * 	   @param  	int|string		$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
-	 *     @param  	int				$height          	Force height of box (0 = auto)
+	 *     @param  	int|string		$height          	Force height of box (0 = auto)
 	 *     @param	int				$width				Force width of box ('999' or '90%'). Ignored and forced to 90% on smartphones.
 	 *     @param	int				$disableformtag		1=Disable form tag. Can be used if we are already inside a <form> section.
 	 *     @return 	string      		    			HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form
 	 */
-    public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0)
+	public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0)
 	{
 		global $langs, $conf;
 
-		$more = '<!-- formconfirm -->';
+		$more = '<!-- formconfirm for page='.dol_escape_htmltag($page).' -->';
 		$formconfirm = '';
 		$inputok = array();
 		$inputko = array();
@@ -4222,7 +4050,7 @@ class Form
 
 		// Set height automatically if not defined
 		if (empty($height)) {
-			$height = 210;
+			$height = 220;
 			if (is_array($formquestion) && count($formquestion) > 2) {
 				$height += ((count($formquestion) - 2) * 24);
 			}
@@ -4256,19 +4084,16 @@ class Form
 					if ($input['type'] == 'text')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
-					}
-					elseif ($input['type'] == 'password')
+					} elseif ($input['type'] == 'password')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div><div class="tagtd"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></div></div>'."\n";
-					}
-					elseif ($input['type'] == 'select')
+					} elseif ($input['type'] == 'select')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
 						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd left">';
 						$more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);
 						$more .= '</div></div>'."\n";
-					}
-					elseif ($input['type'] == 'checkbox')
+					} elseif ($input['type'] == 'checkbox')
 					{
 						$more .= '<div class="tagtr">';
 						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
@@ -4278,8 +4103,7 @@ class Form
 						if (isset($input['disabled'])) $more .= ' disabled';
 						$more .= ' /></div>';
 						$more .= '</div>'."\n";
-					}
-					elseif ($input['type'] == 'radio')
+					} elseif ($input['type'] == 'radio')
 					{
 						$i = 0;
 						foreach ($input['values'] as $selkey => $selval)
@@ -4294,8 +4118,7 @@ class Form
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
-					}
-					elseif ($input['type'] == 'date')
+					} elseif ($input['type'] == 'date')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].'</div>';
 						$more .= '<div class="tagtd">';
@@ -4306,16 +4129,13 @@ class Form
 						$formquestion[] = array('name'=>$input['name'].'year');
 						$formquestion[] = array('name'=>$input['name'].'hour');
 						$formquestion[] = array('name'=>$input['name'].'min');
-					}
-					elseif ($input['type'] == 'other')
+					} elseif ($input['type'] == 'other')
 					{
 						$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
 						if (!empty($input['label'])) $more .= $input['label'].'</div><div class="tagtd">';
 						$more .= $input['value'];
 						$more .= '</div></div>'."\n";
-					}
-
-					elseif ($input['type'] == 'onecolumn')
+					} elseif ($input['type'] == 'onecolumn')
 					{
 						$moreonecolumn .= '<div class="margintoponly">';
 						$moreonecolumn .= $input['value'];
@@ -4404,7 +4224,6 @@ class Form
                          		});
                          	}
                          	var urljump = pageyes + (pageyes.indexOf("?") < 0 ? "?" : "") + options;
-                         	//alert(urljump);
             				if (pageyes.length > 0) { location.href = urljump; }
                             $(this).dialog("close");
                         },
@@ -4440,9 +4259,7 @@ class Form
             });
             </script>';
 			$formconfirm .= "<!-- end ajax formconfirm -->\n";
-		}
-		else
-		{
+		} else {
 			$formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";
 
 			if (empty($disableformtag)) $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
@@ -4489,7 +4306,7 @@ class Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show a form to select a project
 	 *
@@ -4503,9 +4320,9 @@ class Form
 	 *    @param    int     $nooutput           No print is done. String is returned.
 	 *    @return	string                      Return html content
 	 */
-    public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0)
+	public function form_project($page, $socid, $selected = '', $htmlname = 'projectid', $discard_closed = 0, $maxlength = 20, $forcefocus = 0, $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
@@ -4525,18 +4342,14 @@ class Form
 			$out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);
 			$out .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$projet = new Project($this->db);
 				$projet->fetch($selected);
 				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
 				$out .= $projet->getNomUrl(0, '', 1);
-			}
-			else
-			{
+			} else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -4549,7 +4362,7 @@ class Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show a form to select payment conditions
 	 *
@@ -4559,9 +4372,9 @@ class Form
 	 *	@param	int		$addempty		Add empty entry
 	 *  @return	void
 	 */
-    public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0)
+	public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4571,9 +4384,7 @@ class Form
 			$this->select_conditions_paiements($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_conditions_paiements();
@@ -4584,7 +4395,7 @@ class Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show a form to select a delivery delay
 	 *
@@ -4594,9 +4405,9 @@ class Form
 	 *	@param	int		$addempty		Ajoute entree vide
 	 *  @return	void
 	 */
-    public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0)
+	public function form_availability($page, $selected = '', $htmlname = 'availability', $addempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4606,9 +4417,7 @@ class Form
 			$this->selectAvailabilityDelay($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_availability();
@@ -4628,9 +4437,9 @@ class Form
 	 *  @param  string	$htmlname    	Name of select html field
 	 *  @param	int		$addempty		Add empty entry
 	 *  @return	void
-     */
-    public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0)
-    {
+	 */
+	public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0)
+	{
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4640,9 +4449,7 @@ class Form
 			$this->selectInputReason($selected, $htmlname, -1, $addempty);
 			print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->loadCacheInputReason();
@@ -4660,7 +4467,7 @@ class Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show a form + html select a date
 	 *
@@ -4673,9 +4480,9 @@ class Form
 	 *    @return	string
 	 *    @see		selectDate()
 	 */
-    public function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0)
+	public function form_date($page, $selected, $htmlname, $displayhour = 0, $displaymin = 0, $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$ret = '';
@@ -4691,9 +4498,7 @@ class Form
 			$ret .= '</td>';
 			$ret .= '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			$ret .= '</tr></table></form>';
-		}
-		else
-		{
+		} else {
 			if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
 			else $ret .= dol_print_date($selected, 'day');
 		}
@@ -4703,7 +4508,7 @@ class Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show a select form to choose a user
 	 *
@@ -4714,9 +4519,9 @@ class Form
 	 *  @param  array	$include        List of users id to include
 	 *  @return	void
 	 */
-    public function form_users($page, $selected = '', $htmlname = 'userid', $exclude = '', $include = '')
+	public function form_users($page, $selected = '', $htmlname = 'userid', $exclude = '', $include = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if ($htmlname != "none")
@@ -4727,9 +4532,7 @@ class Form
 			print $this->select_dolusers($selected, $htmlname, 1, $exclude, 0, $include);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -4743,7 +4546,7 @@ class Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with payment mode
 	 *
@@ -4755,9 +4558,9 @@ class Form
 	 *    @param   int     $addempty       1=Add empty entry
 	 *    @return	void
 	 */
-    public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0)
+	public function form_modes_reglement($page, $selected = '', $htmlname = 'mode_reglement_id', $filtertype = '', $active = 1, $addempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4767,9 +4570,7 @@ class Form
 			$this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				$this->load_cache_types_paiements();
@@ -4780,7 +4581,7 @@ class Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with multicurrency code
 	 *
@@ -4789,9 +4590,9 @@ class Form
 	 *    @param    string	$htmlname    	Name of select html field
 	 *    @return	void
 	 */
-    public function form_multicurrency_code($page, $selected = '', $htmlname = 'multicurrency_code')
+	public function form_multicurrency_code($page, $selected = '', $htmlname = 'multicurrency_code')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		if ($htmlname != "none")
 		{
@@ -4801,15 +4602,13 @@ class Form
 			print $this->selectMultiCurrency($selected, $htmlname, 0);
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			dol_include_once('/core/lib/company.lib.php');
 			print !empty($selected) ? currency_name($selected, 1) : '&nbsp;';
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with multicurrency rate
 	 *
@@ -4819,9 +4618,9 @@ class Form
 	 *    @param    string  $currency       Currency code to explain the rate
 	 *    @return	void
 	 */
-    public function form_multicurrency_rate($page, $rate = '', $htmlname = 'multicurrency_tx', $currency = '')
+	public function form_multicurrency_rate($page, $rate = '', $htmlname = 'multicurrency_tx', $currency = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $mysoc, $conf;
 
 		if ($htmlname != "none")
@@ -4836,23 +4635,19 @@ class Form
 			print '</select> ';
 			print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if (!empty($rate))
 			{
 				print price($rate, 1, $langs, 1, 0);
 				if ($currency && $rate != 1) print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';
-			}
-			else
-			{
+			} else {
 				print 1;
 			}
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show a select box with available absolute discounts
 	 *
@@ -4868,9 +4663,9 @@ class Form
 	 *  @param	int		$discount_type	0 => customer discount, 1 => supplier discount
 	 *  @return	void
 	 */
-    public function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter = '', $maxvalue = 0, $more = '', $hidelist = 0, $discount_type = 0)
+	public function form_remise_dispo($page, $selected, $htmlname, $socid, $amount, $filter = '', $maxvalue = 0, $more = '', $hidelist = 0, $discount_type = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		if ($htmlname != "none")
 		{
@@ -4883,9 +4678,7 @@ class Form
 				{
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'HasCreditNoteFromSupplier';
-				}
-				else
-				{
+				} else {
 					if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") $translationKey = 'HasAbsoluteDiscountFromSupplier';
 					else $translationKey = 'HasCreditNoteFromSupplier';
 				}
@@ -4894,9 +4687,7 @@ class Form
 				{
 					if (!$filter || $filter == "fk_facture_source IS NULL") $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice
 					else $translationKey = 'CompanyHasCreditNote';
-				}
-				else
-				{
+				} else {
 					if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") $translationKey = 'CompanyHasAbsoluteDiscount';
 					else $translationKey = 'CompanyHasCreditNote';
 				}
@@ -4934,34 +4725,30 @@ class Form
 				print '</div>';
 			}
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				print $selected;
-			}
-			else
-			{
+			} else {
 				print "0";
 			}
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Show forms to select a contact
-     *
-     *  @param	string		$page        	Page
-     *  @param	Societe		$societe		Filter on third party
-     *  @param    int			$selected    	Id contact pre-selectionne
-     *  @param    string		$htmlname    	Name of HTML select. If 'none', we just show contact link.
-     *  @return	void
-     */
-    public function form_contacts($page, $societe, $selected = '', $htmlname = 'contactid')
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Show forms to select a contact
+	 *
+	 *  @param	string		$page        	Page
+	 *  @param	Societe		$societe		Filter on third party
+	 *  @param    int			$selected    	Id contact pre-selectionne
+	 *  @param    string		$htmlname    	Name of HTML select. If 'none', we just show contact link.
+	 *  @return	void
+	 */
+	public function form_contacts($page, $societe, $selected = '', $htmlname = 'contactid')
+	{
+		// phpcs:enable
 		global $langs, $conf;
 
 		if ($htmlname != "none")
@@ -4980,9 +4767,7 @@ class Form
 			print '</td>';
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -4995,7 +4780,7 @@ class Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output html select to select thirdparty
 	 *
@@ -5010,9 +4795,9 @@ class Form
 	 *  @param  int     $nooutput       No print output. Return it only.
 	 *  @return	void|string
 	 */
-    public function form_thirdparty($page, $selected = '', $htmlname = 'socid', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $events = array(), $nooutput = 0)
+	public function form_thirdparty($page, $selected = '', $htmlname = 'socid', $filter = '', $showempty = 0, $showtype = 0, $forcecombo = 0, $events = array(), $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$out = '';
@@ -5024,18 +4809,14 @@ class Form
 			$out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);
 			$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
-		}
-		else
-		{
+		} else {
 			if ($selected)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$soc = new Societe($this->db);
 				$soc->fetch($selected);
 				$out .= $soc->getNomUrl($langs);
-			}
-			else
-			{
+			} else {
 				$out .= "&nbsp;";
 			}
 		}
@@ -5044,18 +4825,18 @@ class Form
 		else print $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Retourne la liste des devises, dans la langue de l'utilisateur
 	 *
 	 *    @param	string	$selected    preselected currency code
 	 *    @param    string	$htmlname    name of HTML select list
-     *    @deprecated
+	 *    @deprecated
 	 *    @return	void
 	 */
-    public function select_currency($selected = '', $htmlname = 'currency_id')
+	public function select_currency($selected = '', $htmlname = 'currency_id')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		print $this->selectCurrency($selected, $htmlname);
 	}
 
@@ -5067,7 +4848,7 @@ class Form
 	 *  @param  string  $mode        0 = Add currency symbol into label, 1 = Add 3 letter iso code
 	 * 	@return	string
 	 */
-    public function selectCurrency($selected = '', $htmlname = 'currency_id', $mode = 0)
+	public function selectCurrency($selected = '', $htmlname = 'currency_id', $mode = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -5083,19 +4864,15 @@ class Form
 			if ($selected && $selected == $code_iso)
 			{
 				$out .= '<option value="'.$code_iso.'" selected>';
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="'.$code_iso.'">';
 			}
 			$out .= $currency['label'];
 			if ($mode == 1)
 			{
-			    $out .= ' ('.$code_iso.')';
-			}
-			else
-			{
-                $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
+				$out .= ' ('.$code_iso.')';
+			} else {
+				$out .= ' ('.$langs->getCurrencySymbol($code_iso).')';
 			}
 			$out .= '</option>';
 		}
@@ -5117,7 +4894,7 @@ class Form
 	 *  @param  integer	$useempty    1=Add empty line
 	 * 	@return	string
 	 */
-    public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0)
+	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0)
 	{
 		global $db, $conf, $langs, $user;
 
@@ -5127,10 +4904,10 @@ class Form
 
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
 		$sql .= " WHERE entity IN ('".getEntity('mutlicurrency')."')";
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			while ($obj = $db->fetch_object($resql)) $TCurrency[$obj->code] = $obj->code;
+			while ($obj = $this->db->fetch_object($resql)) $TCurrency[$obj->code] = $obj->code;
 		}
 
 		$out = '';
@@ -5165,16 +4942,16 @@ class Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Load into the cache vat rates of a country
 	 *
 	 *  @param	string	$country_code		Country code with quotes ("'CA'", or "'CA,IN,...'")
 	 *  @return	int							Nb of loaded lines, 0 if already loaded, <0 if KO
 	 */
-    public function load_cache_vatrates($country_code)
+	public function load_cache_vatrates($country_code)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$num = count($this->cache_vatrates);
@@ -5218,21 +4995,17 @@ class Form
 				}
 
 				return $num;
-			}
-			else
-			{
+			} else {
 				$this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</font>';
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = '<font class="error">'.$this->db->error().'</font>';
 			return -2;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output an HTML select vat rate.
 	 *  The name of this function should be selectVat. We keep bad name for compatibility purpose.
@@ -5254,9 +5027,9 @@ class Form
 	 *  @param  int          $mode                0=Use vat rate as key in combo list, 1=Add VAT code after vat rate into key, -1=Use id of vat line as key
 	 *  @return	string
 	 */
-    public function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = '', $societe_acheteuse = '', $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0)
+	public function load_tva($htmlname = 'tauxtva', $selectedrate = '', $societe_vendeuse = '', $societe_acheteuse = '', $idprod = 0, $info_bits = 0, $type = '', $options_only = false, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $conf, $mysoc;
 
 		$langs->load('errors');
@@ -5281,9 +5054,7 @@ class Form
 			if ($societe_vendeuse->id == $mysoc->id)
 			{
 				$return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</font>';
-			}
-			else
-			{
+			} else {
 				$return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</font>';
 			}
 			return $return;
@@ -5298,9 +5069,7 @@ class Form
 		if (is_object($societe_vendeuse))
 		{
 			$code_country = "'".$societe_vendeuse->country_code."'";
-		}
-		else
-		{
+		} else {
 			$code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente
 		}
 		if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))    // If option to have vat for end customer for services is on
@@ -5315,13 +5084,10 @@ class Form
 					{
 						$code_country .= ",'".$societe_acheteuse->country_code."'";
 					}
-				}
-				elseif (!$idprod)  // We don't know type of product
+				} elseif (!$idprod)  // We don't know type of product
 				{
 					$code_country .= ",'".$societe_acheteuse->country_code."'";
-				}
-				else
-				{
+				} else {
 					$prodstatic = new Product($this->db);
 					$prodstatic->fetch($idprod);
 					if ($prodstatic->type == Product::TYPE_SERVICE)   // We know product is a service
@@ -5343,10 +5109,10 @@ class Form
 				$tmpthirdparty = new Societe($this->db);
 				$defaulttx = get_default_tva($societe_vendeuse, (is_object($societe_acheteuse) ? $societe_acheteuse : $tmpthirdparty), $idprod);
 				$defaultnpr = get_default_npr($societe_vendeuse, (is_object($societe_acheteuse) ? $societe_acheteuse : $tmpthirdparty), $idprod);
-		        if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
-			        $defaultcode = $reg[1];
-			        $defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);
-		        }
+				if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
+					$defaultcode = $reg[1];
+					$defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);
+				}
 				if (empty($defaulttx)) $defaultnpr = 0;
 			}
 
@@ -5395,8 +5161,7 @@ class Form
 							$return .= ' selected';
 							$selectedfound = true;
 						}
-					}
-					elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
+					} elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
 			   		{
 			   			$return .= ' selected';
 			   			$selectedfound = true;
@@ -5407,9 +5172,7 @@ class Form
 				if ($mysoc->country_code == 'IN' || !empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES))
 				{
 					$return .= $rate['labelpositiverates'];
-				}
-				else
-				{
+				} else {
 					$return .= vatrate($rate['label']);
 				}
 				//$return.=($rate['code']?' '.$rate['code']:'');
@@ -5419,9 +5182,7 @@ class Form
 			}
 
 			if (!$options_only) $return .= '</select>';
-		}
-		else
-		{
+		} else {
 			$return .= $this->error;
 		}
 
@@ -5430,9 +5191,9 @@ class Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
 	 *  Fields are preselected with :
 	 *            	- set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')
 	 *            	- local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
@@ -5452,22 +5213,44 @@ class Form
 	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another select_date field.
 	 *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.
 	 *  @return	string|void					Nothing or string if nooutput is 1
-     *  @deprecated
+	 *  @deprecated
 	 *  @see    selectDate(), form_date(), select_month(), select_year(), select_dayofweek()
 	 */
-    public function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '')
-    {
-        // phpcs:enable
-        $retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);
-        if (!empty($nooutput)) {
-            return $retstring;
-        }
-        print $retstring;
-        return;
-    }
+	public function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '')
+	{
+		// phpcs:enable
+		$retstring = $this->selectDate($set_time, $prefix, $h, $m, $empty, $form_name, $d, $addnowlink, $disabled, $fullday, $addplusone, $adddateof);
+		if (!empty($nooutput)) {
+			return $retstring;
+		}
+		print $retstring;
+		return;
+	}
 
-    /**
-     *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
+	/**
+	 *  Show 2 HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
+	 *  Fields are preselected with :
+	 *              - set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')
+	 *              - local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
+	 *              - Empty (fields empty), if set_time is -1 (in this case, parameter empty must also have value 1)
+	 *
+	 *  @param  integer     $set_time       Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).
+	 *  @param  integer     $set_time_end       Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).
+	 *  @param	string		$prefix			Prefix for fields name
+	 *  @param	string		$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
+	 * 	@return string                      Html for selectDate
+	 *  @see    form_date(), select_month(), select_year(), select_dayofweek()
+	 */
+	public function selectDateToDate($set_time = '', $set_time_end = '', $prefix = 're', $empty = 0)
+	{
+		$ret = $this->selectDate($set_time, $prefix.'_start', 0, 0, $empty);
+		$ret .= '<br/>';
+		$ret .= $this->selectDate($set_time_end, $prefix.'_end', 0, 0, $empty);
+		return $ret;
+	}
+
+	/**
+	 *  Show a HTML widget to input a date or combo list for day, month, years and optionaly hours and minutes.
 	 *  Fields are preselected with :
 	 *              - set_time date (must be a local PHP server timestamp or string date with format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM')
 	 *              - local date in user area, if set_time is '' (so if set_time is '', output may differs when done from two different location)
@@ -5482,16 +5265,17 @@ class Form
 	 *	@param	int			$d				1=Show days, month, years
 	 * 	@param	int			$addnowlink		Add a link "Now", 1 with server time, 2 with local computer time
 	 * 	@param 	int			$disabled		Disable input fields
-	 *  @param  int			$fullday        When a checkbox with id #fullday is cheked, hours are set with 00:00 (if value if 'fulldaystart') or 23:59 (if value is 'fulldayend')
+	 *  @param  int			$fullday        When a checkbox with id #fullday is checked, hours are set with 00:00 (if value if 'fulldaystart') or 23:59 (if value is 'fulldayend')
 	 *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another selectDate field.
 	 *  @param  datetime    $adddateof      Add a link "Date of ..." using the following date. See also $labeladddateof for the label used.
-     *  @param  string      $openinghours   Specify hour start and hour end for the select ex 8,20
-     *  @param  int         $stepminutes    Specify step for minutes between 1 and 30
-     *  @param	string		$labeladddateof Label to use for the $adddateof parameter.
+	 *  @param  string      $openinghours   Specify hour start and hour end for the select ex 8,20
+	 *  @param  int         $stepminutes    Specify step for minutes between 1 and 30
+	 *  @param	string		$labeladddateof Label to use for the $adddateof parameter.
+	 *  @param	string 		$placeholder    Placeholder
 	 * 	@return string                      Html for selectDate
 	 *  @see    form_date(), select_month(), select_year(), select_dayofweek()
 	 */
-    public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '')
+	public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '', $placeholder = '')
 	{
 		global $conf, $langs;
 
@@ -5502,7 +5286,7 @@ class Form
 		if ($m == '') $m = 0;
 		$emptydate = 0;
 		$emptyhours = 0;
-        if ($stepminutes <= 0 || $stepminutes > 30) $stepminutes = 1;
+		if ($stepminutes <= 0 || $stepminutes > 30) $stepminutes = 1;
 		if ($empty == 1) { $emptydate = 1; $emptyhours = 1; }
 		if ($empty == 2) { $emptydate = 0; $emptyhours = 1; }
 		$orig_set_time = $set_time;
@@ -5514,6 +5298,7 @@ class Form
 		}
 
 		// Analysis of the pre-selection date
+		$reg = array();
 		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg))	// deprecated usage
 		{
 			// Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
@@ -5522,8 +5307,7 @@ class Form
 			$sday	= (!empty($reg[3]) ? $reg[3] : '');
 			$shour	= (!empty($reg[4]) ? $reg[4] : '');
 			$smin	= (!empty($reg[5]) ? $reg[5] : '');
-		}
-		elseif (strval($set_time) != '' && $set_time != -1)
+		} elseif (strval($set_time) != '' && $set_time != -1)
 		{
 			// set_time est un timestamps (0 possible)
 			$syear = dol_print_date($set_time, "%Y");
@@ -5534,16 +5318,12 @@ class Form
 				$shour = dol_print_date($set_time, "%H");
 				$smin = dol_print_date($set_time, "%M");
 				$ssec = dol_print_date($set_time, "%S");
-			}
-			else
-			{
+			} else {
 				$shour = '';
 				$smin = '';
 				$ssec = '';
 			}
-		}
-		else
-		{
+		} else {
 			// Date est '' ou vaut -1
 			$syear = '';
 			$smonth = '';
@@ -5578,7 +5358,7 @@ class Form
 				if ($usecalendar == "eldy")
 				{
 					// Zone de saisie manuelle de la date
-					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';
+					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate" maxlength="11" value="'.$formated_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
 					$retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 					$retstring .= '>';
@@ -5590,14 +5370,12 @@ class Form
 						$base = DOL_URL_ROOT.'/core/';
 						$retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';
 						$retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';
-					}
-					else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
+					} else $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				elseif ($usecalendar == 'jquery')
+				} elseif ($usecalendar == 'jquery')
 				{
 					if (!$disabled)
 					{
@@ -5633,8 +5411,9 @@ class Form
 
 					// Zone de saisie manuelle de la date
 					$retstring .= '<div class="nowrap inline-block">';
-					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';
+					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate" maxlength="11" value="'.$formated_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
+					$retstring .= ($placeholder ? ' placeholder="'.$placeholder.'"' : '');
 					$retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 					$retstring .= '>';
 
@@ -5650,9 +5429,7 @@ class Form
                 		$retstring.='    });';
                 		$retstring.='});';
                 		$retstring.="</script>";*/
-					}
-					else
-					{
+					} else {
 						$retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 					}
 
@@ -5660,15 +5437,12 @@ class Form
 					$retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				}
-				else
-				{
+				} else {
 					$retstring .= "Bad value of MAIN_POPUP_CALENDAR";
 				}
 			}
 			// Show date with combo selects
-			else
-			{
+			else {
 				//$retstring.='<div class="inline-block">';
 				// Day
 				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
@@ -5704,9 +5478,7 @@ class Form
 				if ($emptydate || $set_time == -1)
 				{
 					$retstring .= '<input'.($disabled ? ' disabled' : '').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
-				}
-				else
-				{
+				} else {
 					$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
 
 					for ($year = $syear - 10; $year < $syear + 10; $year++)
@@ -5763,39 +5535,38 @@ class Form
 		{
 			// Script which will be inserted in the onClick of the "Now" link
 			$reset_scripts = "";
-            if ($addnowlink == 2) // local computer time
-            {
-                // pad add leading 0 on numbers
-                $reset_scripts .= "Number.prototype.pad = function(size) {
+			if ($addnowlink == 2) // local computer time
+			{
+				// pad add leading 0 on numbers
+				$reset_scripts .= "Number.prototype.pad = function(size) {
                         var s = String(this);
                         while (s.length < (size || 2)) {s = '0' + s;}
                         return s;
                     };
                     var d = new Date();";
-            }
+			}
 
 			// Generate the date part, depending on the use or not of the javascript calendar
-            if ($addnowlink == 1) // server time expressed in user time setup
-            {
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
-            }
-            elseif ($addnowlink == 2)
-            {
-            	/* Disabled because the output does not use the string format defined by FormatDateShort key to forge the value into #prefix.
+			if ($addnowlink == 1) // server time expressed in user time setup
+			{
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
+			} elseif ($addnowlink == 2)
+			{
+				/* Disabled because the output does not use the string format defined by FormatDateShort key to forge the value into #prefix.
             	 * This break application for foreign languages.
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(parseInt(d.getMonth().pad()) + 1);';
                 $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(d.getFullYear());';
                 */
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
-            }
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day', 'tzuser').'\');';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d', 'tzuser').'\');';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m', 'tzuser').'\');';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y', 'tzuser').'\');';
+			}
 			/*if ($usecalendar == "eldy")
             {
                 $base=DOL_URL_ROOT.'/core/';
@@ -5812,14 +5583,15 @@ class Form
 			{
 				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
 				//$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';
-                if ($addnowlink == 1)
-                {
-                    $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H', 'tzuser').'\');';
-                }
-                elseif ($addnowlink == 2)
-                {
-                    $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';
-                }
+				if ($addnowlink == 1)
+				{
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H', 'tzuser').'\');';
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').change();';
+				} elseif ($addnowlink == 2)
+				{
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').change();';
+				}
 
 				if ($fullday) $reset_scripts .= ' } ';
 			}
@@ -5828,14 +5600,15 @@ class Form
 			{
 				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
 				//$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';
-                if ($addnowlink == 1)
-                {
-                    $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M', 'tzuser').'\');';
-                }
-                elseif ($addnowlink == 2)
-                {
-                    $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
-                }
+				if ($addnowlink == 1)
+				{
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M', 'tzuser').'\');';
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').change();';
+				} elseif ($addnowlink == 2)
+				{
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(d.getMinutes().pad());';
+					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').change();';
+				}
 				if ($fullday) $reset_scripts .= ' } ';
 			}
 			// If reset_scripts is not empty, print the link with the reset_scripts in the onClick
@@ -5892,9 +5665,35 @@ class Form
 		return $retstring;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to show a form to select a duration on a page
+	/**
+	 * selectTypeDuration
+	 *
+	 * @param   string   $prefix     Prefix
+	 * @param   string   $selected   Selected type
+	 * @return  string               HTML select string
+	 */
+	public function selectTypeDuration($prefix, $selected = 'i')
+	{
+		global $langs;
+
+		$TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
+
+		$retstring = '<select class="flat" id="select_'.$prefix.'type_duration" name="'.$prefix.'type_duration">';
+		foreach ($TDurationTypes as $key=>$typeduration) {
+			$retstring .= '<option value="'.$key.'"';
+			if ($key == $selected) {
+				$retstring .= " selected";
+			}
+			$retstring .= ">".$typeduration."</option>";
+		}
+		$retstring .= "</select>";
+
+		return $retstring;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to show a form to select a duration on a page
 	 *
 	 *	@param	string		$prefix   		Prefix for input fields
 	 *	@param  int			$iSecond  		Default preselected duration (number of seconds or '')
@@ -5906,9 +5705,9 @@ class Form
 	 * 	@param	int			$nooutput		Do not output html string but return it
 	 *  @return	string|void
 	 */
-    public function select_duration($prefix, $iSecond = '', $disabled = 0, $typehour = 'select', $minunderhours = 0, $nooutput = 0)
+	public function select_duration($prefix, $iSecond = '', $disabled = 0, $typehour = 'select', $minunderhours = 0, $nooutput = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$retstring = '';
@@ -5924,8 +5723,7 @@ class Form
 			$minSelected = convertSecondToTime($iSecond, 'min');
 		}
 
-		if ($typehour == 'select')
-		{
+		if ($typehour == 'select') {
 			$retstring .= '<select class="flat" id="select_'.$prefix.'hour" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').'>';
 			for ($hour = 0; $hour < 25; $hour++)	// For a duration, we allow 24 hours
 			{
@@ -5937,12 +5735,11 @@ class Form
 				$retstring .= ">".$hour."</option>";
 			}
 			$retstring .= "</select>";
-		}
-		elseif ($typehour == 'text' || $typehour == 'textselect')
-		{
+		} elseif ($typehour == 'text' || $typehour == 'textselect') {
 			$retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';
+		} else {
+			return 'BadValueForParameterTypeHour';
 		}
-		else return 'BadValueForParameterTypeHour';
 
 		if ($typehour != 'text') $retstring .= ' '.$langs->trans('HourShort');
 		else $retstring .= '<span class="hideonsmartphone">:</span>';
@@ -5961,8 +5758,7 @@ class Form
 				$retstring .= '>'.$min.'</option>';
 			}
 			$retstring .= "</select>";
-		}
-		elseif ($typehour == 'text')
+		} elseif ($typehour == 'text')
 		{
 			$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';
 		}
@@ -5980,6 +5776,7 @@ class Form
 
 	/**
 	 * Generic method to select a component from a combo list.
+	 * Can use autocomplete with ajax after x key pressed or a full combo, depending on setup.
 	 * This is the generic method that will replace all specific existing methods.
 	 *
 	 * @param 	string			$objectdesc			ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]
@@ -5994,7 +5791,7 @@ class Form
 	 * @param	int				$disabled			1=Html component is disabled
 	 * @param	string	        $selected_input_value	Value of preselected input text (for use with ajax)
 	 * @return	string								Return HTML string
-	 * @see selectForFormsList() select_thirdparty
+	 * @see selectForFormsList() select_thirdparty_list()
 	 */
 	public function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '')
 	{
@@ -6011,6 +5808,7 @@ class Form
 		if (!empty($classpath))
 		{
 			dol_include_once($classpath);
+
 			if ($classname && class_exists($classname))
 			{
 				$objecttmp = new $classname($this->db);
@@ -6038,16 +5836,16 @@ class Form
 		$out = '';
 		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->$confkeyforautocompletemode) && !$forcecombo)
 		{
-		    // No immediate load of all database
-		    $placeholder = '';
-		    if ($preselectedvalue && empty($selected_input_value))
-		    {
-		        $objecttmp->fetch($preselectedvalue);
-		        $selected_input_value = ($prefixforautocompletemode == 'company' ? $objecttmp->name : $objecttmp->ref);
-		        //unset($objecttmp);
-		    }
+			// No immediate load of all database
+			$placeholder = '';
+			if ($preselectedvalue && empty($selected_input_value))
+			{
+				$objecttmp->fetch($preselectedvalue);
+				$selected_input_value = ($prefixforautocompletemode == 'company' ? $objecttmp->name : $objecttmp->ref);
+				//unset($objecttmp);
+			}
 
-		    $objectdesc = $classname.':'.$classpath.':'.$addcreatebuttonornot.':'.$filter;
+			$objectdesc = $classname.':'.$classpath.':'.$addcreatebuttonornot.':'.$filter;
 			$urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';
 
 			// No immediate load of all database
@@ -6057,9 +5855,7 @@ class Form
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';
 			if ($placeholder) $placeholder = ' placeholder="'.$placeholder.'"';
 			$out .= '<input type="text" class="'.$morecss.'"'.($disabled ? ' disabled="disabled"' : '').' name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else
-		{
+		} else {
 			// Immediate load of table record. Note: filter is inside $objecttmp->filter
 			$out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo, 0, $disabled);
 		}
@@ -6087,9 +5883,7 @@ class Form
 		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 		{
 			$tmpescaped = "'".$db->escape($regbis[1])."'";
-		}
-		else
-		{
+		} else {
 			$tmpescaped = $db->escape($tmpescaped);
 		}
 		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
@@ -6113,7 +5907,7 @@ class Form
 	 * @return	string|array						Return HTML string
 	 * @see selectForForms()
 	 */
-    public function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled = 0)
+	public function selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $outputmode = 0, $disabled = 0)
 	{
 		global $conf, $langs, $user;
 
@@ -6131,20 +5925,16 @@ class Form
 				if ($val['showoncombobox']) $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;
 			}
 			if ($tmpfieldstoshow) $fieldstoshow = $tmpfieldstoshow;
-		}
-        else
-        {
+		} else {
 			// For backward compatibility
 			$objecttmp->fields['ref'] = array('type'=>'varchar(30)', 'label'=>'Ref', 'showoncombobox'=>1);
-        }
+		}
 
 		if (empty($fieldstoshow))
 		{
 			if (isset($objecttmp->fields['ref'])) {
 				$fieldstoshow = 't.ref';
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorNoFieldWithAttributeShowoncombobox");
 				return $langs->trans('ErrorNoFieldWithAttributeShowoncombobox');
@@ -6232,14 +6022,10 @@ class Form
 						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
-						}
-						else
-						{
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
 						}
-					}
-					else
-					{
+					} else {
 						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
 					}
 
@@ -6249,9 +6035,7 @@ class Form
 			}
 
 			$out .= '</select>'."\n";
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -6328,8 +6112,8 @@ class Form
 			{
 				foreach ($array as $key => $value)
 				{
-				    if (!is_array($value)) $array[$key] = $langs->trans($value);
-				    else $array[$key]['label'] = $langs->trans($value['label']);
+					if (!is_array($value)) $array[$key] = $langs->trans($value);
+					else $array[$key]['label'] = $langs->trans($value['label']);
 				}
 			}
 
@@ -6339,14 +6123,14 @@ class Form
 
 			foreach ($array as $key => $tmpvalue)
 			{
-			    if (is_array($tmpvalue)) $value = $tmpvalue['label'];
-			    else $value = $tmpvalue;
+				if (is_array($tmpvalue)) $value = $tmpvalue['label'];
+				else $value = $tmpvalue;
 
 				$disabled = ''; $style = '';
 				if (!empty($disablebademail))
 				{
-				    if (($disablebademail == 1 && !preg_match('/&lt;.+@.+&gt;/', $value))
-				        || ($disablebademail == 2 && preg_match('/---/', $value)))
+					if (($disablebademail == 1 && !preg_match('/&lt;.+@.+&gt;/', $value))
+						|| ($disablebademail == 2 && preg_match('/---/', $value)))
 					{
 						$disabled = ' disabled';
 						$style = ' class="warning"';
@@ -6357,9 +6141,7 @@ class Form
 				{
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value));
 					else $selectOptionValue = $key.' - '.($maxlen ?dol_trunc($value, $maxlen) : $value);
-				}
-				else
-				{
+				} else {
 					if (empty($nohtmlescape)) $selectOptionValue = dol_escape_htmltag($maxlen ?dol_trunc($value, $maxlen) : $value);
 					else $selectOptionValue = $maxlen ?dol_trunc($value, $maxlen) : $value;
 					if ($value == '' || $value == '-') $selectOptionValue = '&nbsp;';
@@ -6376,10 +6158,10 @@ class Form
 				if ($nohtmlescape) $out .= ' data-html="'.dol_escape_htmltag($selectOptionValue).'"';
 				if (is_array($tmpvalue))
 				{
-				    foreach ($tmpvalue as $keyforvalue => $valueforvalue)
-				    {
-				        if (preg_match('/^data-/', $keyforvalue)) $out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';
-				    }
+					foreach ($tmpvalue as $keyforvalue => $valueforvalue)
+					{
+						if (preg_match('/^data-/', $keyforvalue)) $out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';
+					}
 				}
 				$out .= '>';
 				//var_dump($selectOptionValue);
@@ -6487,19 +6269,17 @@ class Form
 		if ($acceptdelayedhtml)
 		{
 			$delayedhtmlcontent .= $outdelayed;
-		}
-		else
-		{
+		} else {
 			$out .= $outdelayed;
 		}
 		return $out;
 	}
 
-    /**
-     *  Return a HTML select string, built from an array of key+value, but content returned into select is defined into $array parameter.
-     *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
-     *
-     *  @param  string	$htmlname               Name of html select area
+	/**
+	 *  Return a HTML select string, built from an array of key+value, but content returned into select is defined into $array parameter.
+	 *  Note: Do not apply langs->trans function on returned content of Ajax service, content may be entity encoded twice.
+	 *
+	 *  @param  string	$htmlname               Name of html select area
 	 *	@param	string	$array					Array (key=>array('text'=>'A text', 'url'=>'An url'), ...)
 	 *	@param	string	$id             		Preselected key
 	 *	@param  string	$moreparam      		Add more parameters onto the select tag
@@ -6605,9 +6385,7 @@ class Form
 		if ($acceptdelayedhtml)
 		{
 			$delayedhtmlcontent .= $outdelayed;
-		}
-		else
-		{
+		} else {
 			$out .= $outdelayed;
 		}
 		return $out;
@@ -6619,7 +6397,7 @@ class Form
 	 *	@param	string	$htmlname		Name of select
 	 *	@param	array	$array			Array with key+value
 	 *	@param	array	$selected		Array with key+value preselected
-	 *	@param	int		$key_in_label   1 pour afficher la key dans la valeur "[key] value"
+	 *	@param	int		$key_in_label   1 to show key like in "[key] value"
 	 *	@param	int		$value_as_key   1 to use value as key
 	 *	@param  string	$morecss        Add more css style
 	 *	@param  int		$translate		Translate and encode value
@@ -6638,25 +6416,23 @@ class Form
 		$out = '';
 
 		if ($addjscombo < 0) {
-		    if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $addjscombo = 1;
-		    else $addjscombo = 0;
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $addjscombo = 1;
+			else $addjscombo = 0;
 		}
 
 		// Add code for jquery to use multiselect
 		if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))
 		{
+			$out .= "\n".'<!-- JS CODE TO ENABLE select for id '.$htmlname.' -->
+						<script>'."\n";
 			if ($addjscombo == 1)
 			{
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				$out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->'."\n";
-				$out .= '<script>'."\n";
 				$out .= 'function formatResult(record) {'."\n";
 				if ($elemtype == 'category')
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
-				}
-				else
-				{
+				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -6664,9 +6440,7 @@ class Form
 				if ($elemtype == 'category')
 				{
 					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
-				}
-				else
-				{
+				} else {
 					$out .= 'return record.text;';
 				}
 				$out .= '};'."\n";
@@ -6686,8 +6460,7 @@ class Form
 				// Add other js lib
 				// TODO external lib multiselect/jquery.multi-select.js must have been loaded to use this multiselect plugin
 				// ...
-				$out .= "\n".'<!-- JS CODE TO ENABLE external lib for id '.$htmlname.' -->'."\n";
-				$out .= '<script>'."\n";
+				$out .= 'console.log(\'addjscombo=2 for htmlname='.$htmlname.'\');';
 				$out .= '$(document).ready(function () {
 							$(\'#'.$htmlname.'\').multiSelect({
 								containerHTML: \'<div class="multi-select-container">\',
@@ -6712,15 +6485,16 @@ class Form
 			{
 				foreach ($array as $key => $value)
 				{
+					$newval = ($translate ? $langs->trans($value) : $value);
+					$newval = ($key_in_label ? $key.' - '.$newval : $newval);
+
 					$out .= '<option value="'.$key.'"';
-                    if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != ''))
+					if (is_array($selected) && !empty($selected) && in_array((string) $key, $selected) && ((string) $key != ''))
 					{
 						$out .= ' selected';
 					}
+					$out .= ' data-html="'.$newval.'"';
 					$out .= '>';
-
-					$newval = ($translate ? $langs->trans($value) : $value);
-					$newval = ($key_in_label ? $key.' - '.$newval : $newval);
 					$out .= dol_htmlentitiesbr($newval);
 					$out .= '</option>'."\n";
 				}
@@ -6747,7 +6521,7 @@ class Form
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
 
-		$tmpvar = "MAIN_SELECTEDFIELDS_".$varpage;
+		$tmpvar = "MAIN_SELECTEDFIELDS_".$varpage; // To get list of saved seleteced properties
 		if (!empty($user->conf->$tmpvar))
 		{
 			$tmparray = explode(',', $user->conf->$tmpvar);
@@ -6765,23 +6539,23 @@ class Form
 
 		foreach ($array as $key => $val)
 		{
-		    /* var_dump($val);
+			/* var_dump($val);
             var_dump(array_key_exists('enabled', $val));
             var_dump(!$val['enabled']);*/
-		    if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled'])
-		    {
-			    unset($array[$key]); // We don't want this field
-			    continue;
-		    }
-		    if ($val['label'])
-		    {
-		    	if (! empty($val['langfile']) && is_object($langs)) {
-		    		$langs->load($val['langfile']);
-		    	}
+			if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled'])
+			{
+				unset($array[$key]); // We don't want this field
+				continue;
+			}
+			if ($val['label'])
+			{
+				if (!empty($val['langfile']) && is_object($langs)) {
+					$langs->load($val['langfile']);
+				}
 
-		        $lis .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked']) ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
-			    $listcheckedstring .= (empty($val['checked']) ? '' : $key.',');
-		    }
+				$lis .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked']) ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';
+				$listcheckedstring .= (empty($val['checked']) ? '' : $key.',');
+			}
 		}
 
 		$out = '<!-- Component multiSelectArrayWithCheckbox '.$htmlname.' -->
@@ -6834,9 +6608,10 @@ class Form
 	 * 	@param		int		$id				Id of object
 	 * 	@param		string	$type			Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.
 	 *  @param		int		$rendermode		0=Default, use multiselect. 1=Emulate multiselect (recommended)
+	 *  @param		int		$nolink			1=Do not add html links
 	 * 	@return		string					String with categories
 	 */
-    public function showCategories($id, $type, $rendermode = 0)
+	public function showCategories($id, $type, $rendermode = 0, $nolink = 0)
 	{
 		global $db;
 
@@ -6850,7 +6625,7 @@ class Form
 			$toprint = array();
 			foreach ($categories as $c)
 			{
-				$ways = $c->print_all_ways(' &gt;&gt; ', '', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
+				$ways = $c->print_all_ways(' &gt;&gt; ', ($nolink ? 'none' : ''), 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
 				foreach ($ways as $way)
 				{
 					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.$way.'</li>';
@@ -6881,7 +6656,7 @@ class Form
 	 *  @param  array           $compatibleImportElementsList  Array of compatibles elements object for "import from" action
 	 *  @return	int							      <0 if KO, >=0 if OK
 	 */
-    public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)
+	public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)
 	{
 		global $conf, $langs, $hookmanager;
 		global $bc, $action;
@@ -6892,7 +6667,7 @@ class Form
 		$hookmanager->initHooks(array('commonobject'));
 		$parameters = array(
 			'morehtmlright' => $morehtmlright,
-		    'compatibleImportElementsList' => &$compatibleImportElementsList,
+			'compatibleImportElementsList' => &$compatibleImportElementsList,
 		);
 		$reshook = $hookmanager->executeHooks('showLinkedObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
@@ -6926,7 +6701,7 @@ class Form
 				// to display inport button on tpl
 				$showImportButton = false;
 				if (!empty($compatibleImportElementsList) && in_array($element, $compatibleImportElementsList)) {
-				    $showImportButton = true;
+					$showImportButton = true;
 				}
 
 				$regs = array();
@@ -6942,41 +6717,31 @@ class Form
 				if ($objecttype == 'facture') {
 					$tplpath = 'compta/'.$element;
 					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'facturerec') {
+				} elseif ($objecttype == 'facturerec') {
 					$tplpath = 'compta/facture';
 					$tplname = 'linkedobjectblockForRec';
 					if (empty($conf->facture->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'propal') {
+				} elseif ($objecttype == 'propal') {
 					$tplpath = 'comm/'.$element;
 					if (empty($conf->propal->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'supplier_proposal') {
+				} elseif ($objecttype == 'supplier_proposal') {
 					if (empty($conf->supplier_proposal->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
+				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
 					$tplpath = 'expedition';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
-				}
-        		elseif ($objecttype == 'reception') {
-        			$tplpath = 'reception';
-        			if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
-        		}
-				elseif ($objecttype == 'delivery') {
+				} elseif ($objecttype == 'reception') {
+					$tplpath = 'reception';
+					if (empty($conf->reception->enabled)) continue; // Do not show if module disabled
+				} elseif ($objecttype == 'delivery') {
 					$tplpath = 'livraison';
 					if (empty($conf->expedition->enabled)) continue; // Do not show if module disabled
-				}
-				elseif ($objecttype == 'invoice_supplier') {
+				} elseif ($objecttype == 'invoice_supplier') {
 					$tplpath = 'fourn/facture';
-				}
-				elseif ($objecttype == 'order_supplier') {
+				} elseif ($objecttype == 'order_supplier') {
 					$tplpath = 'fourn/commande';
-				}
-				elseif ($objecttype == 'expensereport') {
+				} elseif ($objecttype == 'expensereport') {
 					$tplpath = 'expensereport';
-				}
-				elseif ($objecttype == 'subscription') {
+				} elseif ($objecttype == 'subscription') {
 					$tplpath = 'adherents';
 				}
 
@@ -7012,7 +6777,7 @@ class Form
 
 			if (!empty($compatibleImportElementsList))
 			{
-			    $res = @include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
+				$res = @include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
 			}
 
 
@@ -7030,7 +6795,7 @@ class Form
 	 *  @param	array			$excludelinksto		Do not show links of this type, for exemple array('order') or array('supplier_order'). null or array() if no exclusion.
 	 *  @return	string								<0 if KO, >0 if OK
 	 */
-    public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())
+	public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())
 	{
 		global $conf, $langs, $hookmanager;
 		global $bc, $action;
@@ -7076,7 +6841,7 @@ class Form
 
 		if (!empty($listofidcompanytoscan))  // If empty, we don't have criteria to scan the object we can link to
 		{
-            $reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		}
 
 		if (empty($reshook))
@@ -7085,8 +6850,7 @@ class Form
 			{
 				$possiblelinks = array_merge($possiblelinks, $hookmanager->resArray);
 			}
-		}
-		elseif ($reshook > 0)
+		} elseif ($reshook > 0)
 		{
 			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
 			{
@@ -7173,15 +6937,13 @@ class Form
     		</div>
     		</dd>
     		</dl>';
-		}
-		else
-		{
+		} else {
 			$linktoelem = '';
 		}
 
 		if (!empty($conf->use_javascript_ajax))
 		{
-		    print '<!-- Add js to show linkto box -->
+			print '<!-- Add js to show linkto box -->
 				<script>
 				jQuery(document).ready(function() {
 					jQuery(".linkto").click(function() {
@@ -7206,7 +6968,7 @@ class Form
 	 *  @param	int      	$useempty		1=Add empty line
 	 *	@return	string						See option
 	 */
-    public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
+	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
 	{
 		global $langs;
 
@@ -7225,9 +6987,7 @@ class Form
 		{
 			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
-		}
-		else
-	    {
+		} else {
 	   		$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');
 			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
@@ -7236,7 +6996,7 @@ class Form
 		return $resultyesno;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of export templates
 	 *
@@ -7246,12 +7006,12 @@ class Form
 	 *  @param  int		$useempty          Affiche valeur vide dans liste
 	 *  @return	void
 	 */
-    public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0)
+	public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
-		$sql .= " WHERE type = '".$type."'";
+		$sql .= " WHERE type = '".$this->db->escape($type)."'";
 		$sql .= " ORDER BY rowid";
 		$result = $this->db->query($sql);
 		if ($result)
@@ -7270,9 +7030,7 @@ class Form
 				if ($selected == $obj->rowid)
 				{
 					print '<option value="'.$obj->rowid.'" selected>';
-				}
-				else
-				{
+				} else {
 					print '<option value="'.$obj->rowid.'">';
 				}
 				print $obj->label;
@@ -7280,8 +7038,7 @@ class Form
 				$i++;
 			}
 			print "</select>";
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -7304,7 +7061,7 @@ class Form
 	 *	  @param	string	$morehtmlright	More html code to show after ref.
 	 * 	  @return	string    				Portion HTML with ref + navigation buttons
 	 */
-    public function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '')
+	public function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '')
 	{
 		global $langs, $conf, $hookmanager, $extralanguages;
 
@@ -7329,11 +7086,11 @@ class Form
 			// Special case for project/task page
 			if ($paramid == 'project_ref')
 			{
-			    if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl))     // TODO Remove this when nav with project_ref on task pages are ok
-			    {
-				    $navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);
-    				$paramid = 'ref';
-			    }
+				if (preg_match('/\/tasks\/(task|contact|note|document)\.php/', $navurl))     // TODO Remove this when nav with project_ref on task pages are ok
+				{
+					$navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);
+					$paramid = 'ref';
+				}
 			}
 
 			// accesskey is for Windows or Linux:  ALT + key for chrome, ALT + SHIFT + KEY for firefox
@@ -7342,13 +7099,10 @@ class Form
 			if ($conf->browser->name == 'chrome')
 			{
 				$stringforfirstkey .= ' ALT +';
-			}
-			elseif ($conf->browser->name == 'firefox')
+			} elseif ($conf->browser->name == 'firefox')
 			{
 				$stringforfirstkey .= ' ALT + SHIFT +';
-			}
-			else
-			{
+			} else {
 				$stringforfirstkey .= ' CTL +';
 			}
 
@@ -7435,8 +7189,7 @@ class Form
 					$ret .= $this->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');
 				}
 			}
-		}
-		elseif ($object->element == 'member')
+		} elseif ($object->element == 'member')
 		{
 			$ret .= $object->ref.'<br>';
 			$fullname = $object->getFullName($langs);
@@ -7445,24 +7198,19 @@ class Form
 			} else {
 				$ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');
 			}
-		}
-		elseif (in_array($object->element, array('contact', 'user', 'usergroup')))
+		} elseif (in_array($object->element, array('contact', 'user', 'usergroup')))
 		{
 			$ret .= dol_htmlentities($object->getFullName($langs));
-		}
-		elseif (in_array($object->element, array('action', 'agenda')))
+		} elseif (in_array($object->element, array('action', 'agenda')))
 		{
 			$ret .= $object->ref.'<br>'.$object->label;
-		}
-		elseif (in_array($object->element, array('adherent_type')))
+		} elseif (in_array($object->element, array('adherent_type')))
 		{
 			$ret .= $object->label;
-		}
-		elseif ($object->element == 'ecm_directories')
+		} elseif ($object->element == 'ecm_directories')
 		{
 			$ret .= '';
-		}
-		elseif ($fieldref != 'none')
+		} elseif ($fieldref != 'none')
 		{
 			$ret .= dol_htmlentities($object->$fieldref);
 		}
@@ -7493,7 +7241,7 @@ class Form
 	 * 		@param	int		$width			Width of photo
 	 * 	  	@return string    				HTML code to output barcode
 	 */
-    public function showbarcode(&$object, $width = 100)
+	public function showbarcode(&$object, $width = 100)
 	{
 		global $conf;
 
@@ -7549,8 +7297,7 @@ class Form
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;
 			}
 			$email = $object->email;
-		}
-		elseif ($modulepart == 'contact')
+		} elseif ($modulepart == 'contact')
 		{
 			$dir = $conf->societe->multidir_output[$entity].'/contact';
 			if (!empty($object->photo))
@@ -7562,8 +7309,7 @@ class Form
 			}
 			$email = $object->email;
 			$capture = 'user';
-		}
-		elseif ($modulepart == 'userphoto')
+		} elseif ($modulepart == 'userphoto')
 		{
 			$dir = $conf->user->dir_output;
 			if (!empty($object->photo))
@@ -7576,8 +7322,7 @@ class Form
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		}
-		elseif ($modulepart == 'memberphoto')
+		} elseif ($modulepart == 'memberphoto')
 		{
 			$dir = $conf->adherent->dir_output;
 			if (!empty($object->photo))
@@ -7590,9 +7335,7 @@ class Form
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile = $object->id.".jpg"; // For backward compatibility
 			$email = $object->email;
 			$capture = 'user';
-		}
-		else
-		{
+		} else {
 			// Generic case to show photos
 			$dir = $conf->$modulepart->dir_output;
 			if (!empty($object->photo))
@@ -7620,8 +7363,7 @@ class Form
 				}
 				$ret .= '<img alt="Photo" class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').' photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
-			}
-			elseif ($altfile && file_exists($dir."/".$altfile))
+			} elseif ($altfile && file_exists($dir."/".$altfile))
 			{
 				if ($addlinktofullsize)
 				{
@@ -7631,16 +7373,13 @@ class Form
 				}
 				$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';
 				if ($addlinktofullsize) $ret .= '</a>';
-			}
-			else
-			{
+			} else {
 				$nophoto = '/public/theme/common/nophoto.png';
 				if (in_array($modulepart, array('userphoto', 'contact', 'memberphoto')))	// For module that are "physical" users
 				{
 					if ($modulepart == 'memberphoto' && strpos($object->morphy, 'mor') !== false) {
 						$nophoto = '/public/theme/common/company.png';
-					}
-					else {
+					} else {
 						$nophoto = '/public/theme/common/user_anonymous.png';
 						if ($object->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
 						if ($object->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
@@ -7657,9 +7396,7 @@ class Form
 					//$defaultimg=urlencode(dol_buildpath($nophoto,3));
 					$defaultimg = 'mm';
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="https://www.gravatar.com/avatar/'.md5(strtolower(trim($email))).'?s='.$width.'&d='.$defaultimg.'">'; // gravatar need md5 hash
-				}
-				else
-				{
+				} else {
 					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.$nophoto.'">';
 				}
 			}
@@ -7672,13 +7409,12 @@ class Form
 				$ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';
 				$ret .= '</table>';
 			}
-		}
-		else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
+		} else dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);
 
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return select list of groups
 	 *
@@ -7695,9 +7431,9 @@ class Form
 	 *  @return	string
 	 *  @see select_dolusers()
 	 */
-    public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false, $morecss = '')
+	public function select_dolgroups($selected = '', $htmlname = 'groupid', $show_empty = 0, $exclude = '', $disabled = 0, $include = '', $enableonly = '', $force_entity = '0', $multiple = false, $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs;
 
 		// Permettre l'exclusion de groupes
@@ -7719,12 +7455,10 @@ class Form
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";
-			if ($force_entity) $sql .= " WHERE ug.entity IN (0,".$force_entity.")";
+			if ($force_entity) $sql .= " WHERE ug.entity IN (0, ".$force_entity.")";
 			else $sql .= " WHERE ug.entity IS NOT NULL";
-		}
-		else
-		{
-			$sql .= " WHERE ug.entity IN (0,".$conf->entity.")";
+		} else {
+			$sql .= " WHERE ug.entity IN (0, ".$conf->entity.")";
 		}
 		if (is_array($exclude) && $excludeGroups) $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";
 		if (is_array($include) && $includeGroups) $sql .= " AND ug.rowid IN ('".$includeGroups."')";
@@ -7769,16 +7503,12 @@ class Form
 					$out .= '</option>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				if ($show_empty) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";
 				$out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -7791,7 +7521,7 @@ class Form
 	 *
 	 *  @return	string
 	 */
-    public function showFilterButtons()
+	public function showFilterButtons()
 	{
 		$out = '<div class="nowrap">';
 		$out .= '<button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
@@ -7802,22 +7532,23 @@ class Form
 	}
 
 	/**
-	 *	Return HTML to show the search and clear seach button
+	 *	Return HTML to show the search and clear search button
 	 *
 	 *  @param  string  $cssclass                  CSS class
 	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
+	 *  @param  string  $massactionname            Mass action button name that will launch an action on the selected items
 	 *  @return	string
 	 */
-    public function showCheckAddButtons($cssclass = 'checkforaction', $calljsfunction = 0)
+	public function showCheckAddButtons($cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")
 	{
 		global $conf, $langs;
 
 		$out = '';
-		$id = uniqid();
-		if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions'.$id.'" name="checkallactions" class="checkallactions"></div>';
+
+		if (!empty($conf->use_javascript_ajax)) $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="'.$cssclass.'s" name="'.$cssclass.'s" class="checkallactions"></div>';
 		$out .= '<script>
             $(document).ready(function() {
-            	$("#checkallactions'.$id.'").click(function() {
+                $("#' . $cssclass.'s").click(function() {
                     if($(this).is(\':checked\')){
                         console.log("We check all '.$cssclass.'");
                 		$(".'.$cssclass.'").prop(\'checked\', true).trigger(\'change\');
@@ -7827,15 +7558,13 @@ class Form
                         console.log("We uncheck all");
                 		$(".'.$cssclass.'").prop(\'checked\', false).trigger(\'change\');
                     }'."\n";
-		if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+				if ($calljsfunction) $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0, "'.$massactionname.'", "'.$cssclass.'"); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
 		$out .= '         });
-
-        	$(".checkforselect").change(function() {
-				$(this).closest("tr").toggleClass("highlight", this.checked);
-			});
-
- 	});
-    </script>';
+        	        $(".' . $cssclass.'").change(function() {
+					$(this).closest("tr").toggleClass("highlight", this.checked);
+				});
+		 	});
+    	</script>';
 
 		return $out;
 	}
@@ -7846,14 +7575,15 @@ class Form
 	 *  @param	int  	$addcheckuncheckall        Add the check all/uncheck all checkbox (use javascript) and code to manage this
 	 *  @param  string  $cssclass                  CSS class
 	 *  @param  int     $calljsfunction            0=default. 1=call function initCheckForSelect() after changing status of checkboxes
+	 *  @param  string  $massactionname            Mass action name
 	 *  @return	string
 	 */
-    public function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0)
+	public function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")
 	{
 		$out = $this->showFilterButtons();
 		if ($addcheckuncheckall)
 		{
-			$out .= $this->showCheckAddButtons($cssclass, $calljsfunction);
+			$out .= $this->showCheckAddButtons($cssclass, $calljsfunction, $massactionname);
 		}
 		return $out;
 	}
@@ -7868,14 +7598,15 @@ class Form
 	 * @param	string	$target                htmlname of target select to bind event
 	 * @param	int		$default_selected      default category to select if fk_c_type_fees change = EX_KME
 	 * @param	array	$params                param to give
+	 * @param	int		$info_admin			   Show the tooltip help picto to setup list
 	 * @return	string
 	 */
-    public function selectExpenseCategories($selected = '', $htmlname = 'fk_c_exp_tax_cat', $useempty = 0, $excludeid = array(), $target = '', $default_selected = 0, $params = array())
+	public function selectExpenseCategories($selected = '', $htmlname = 'fk_c_exp_tax_cat', $useempty = 0, $excludeid = array(), $target = '', $default_selected = 0, $params = array(), $info_admin = 1)
 	{
-		global $db, $conf, $langs, $user;
+		global $db, $langs, $user;
 
-        $out = '';
-        $sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
+		$out = '';
+		$sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';
 		$sql .= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';
 		if (!empty($excludeid)) $sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';
 		$sql .= ' ORDER BY label';
@@ -7883,7 +7614,7 @@ class Form
 		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';
+			$out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp maxwidth200">';
 			if ($useempty) $out .= '<option value="0">&nbsp;</option>';
 
 			while ($obj = $db->fetch_object($resql))
@@ -7891,7 +7622,9 @@ class Form
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).'</option>';
 			}
 			$out .= '</select>';
-			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			$out .= ajax_combobox('select_'.$htmlname);
+
+			if (!empty($htmlname) && $user->admin && $info_admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
 			if (!empty($target))
 			{
@@ -7943,9 +7676,7 @@ class Form
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -7960,11 +7691,11 @@ class Form
 	 * @param	integer	$useempty    1=Add empty line
 	 * @return	string
 	 */
-    public function selectExpenseRanges($selected = '', $htmlname = 'fk_range', $useempty = 0)
+	public function selectExpenseRanges($selected = '', $htmlname = 'fk_range', $useempty = 0)
 	{
 		global $db, $conf, $langs;
 
-        $out = '';
+		$out = '';
 		$sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';
 		$sql .= ' WHERE entity = '.$conf->entity.' AND active = 1';
 
@@ -7979,9 +7710,7 @@ class Form
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -7998,11 +7727,11 @@ class Form
 	 * @param	integer	$useid       0=use 'code' as key, 1=use 'id' as key
 	 * @return	string
 	 */
-    public function selectExpense($selected = '', $htmlname = 'fk_c_type_fees', $useempty = 0, $allchoice = 1, $useid = 0)
+	public function selectExpense($selected = '', $htmlname = 'fk_c_type_fees', $useempty = 0, $allchoice = 1, $useid = 0)
 	{
 		global $db, $langs;
 
-        $out = '';
+		$out = '';
 		$sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';
 		$sql .= ' WHERE active = 1';
 
@@ -8022,14 +7751,12 @@ class Form
 				$out .= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';
 			}
 			$out .= '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
-        return $out;
-    }
+		return $out;
+	}
 
 	/**
 	 *  Output a combo list with invoices qualified for a third party
@@ -8041,15 +7768,15 @@ class Form
 	 *	@param	int		$option_only	Return only html options lines without the select tag
 	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
 	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
-     *  @param	int		$forcefocus		Force focus on field (works with javascript only)
-     *  @param	int		$disabled		Disabled
+	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)
+	 *  @param	int		$disabled		Disabled
 	 *  @param	string	$morecss        More css added to the select component
 	 *  @param	string	$projectsListId ''=Automatic filter on project allowed. List of id=Filter on project ids.
 	 *  @param	string	$showproject	'all' = Show project info, ''=Hide project info
 	 *  @param	User	$usertofilter	User object to use for filtering
 	 *	@return int         			Nbr of project if OK, <0 if KO
 	 */
-    public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
+	public function selectInvoice($socid = -1, $selected = '', $htmlname = 'invoiceid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500', $projectsListId = '', $showproject = 'all', $usertofilter = null)
 	{
 		global $user, $conf, $langs;
 
@@ -8075,7 +7802,7 @@ class Form
 		}
 
 		// Search all projects
-        $sql = 'SELECT f.rowid, f.ref as fref, "nolabel" as flabel, p.rowid as pid, f.ref,
+		$sql = 'SELECT f.rowid, f.ref as fref, "nolabel" as flabel, p.rowid as pid, f.ref,
             p.title, p.fk_soc, p.fk_statut, p.public,';
 		$sql .= ' s.nom as name';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
@@ -8095,9 +7822,9 @@ class Form
 			if (!empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
-            	$out .= $comboenhancement;
-            	$morecss = 'minwidth200imp maxwidth500';
+			   	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+				$out .= $comboenhancement;
+				$morecss = 'minwidth200imp maxwidth500';
 			}
 
 			if (empty($option_only)) {
@@ -8120,9 +7847,7 @@ class Form
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
 							$i++;
@@ -8141,13 +7866,11 @@ class Form
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							}
-							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
 								if ($discard_closed == 2) $disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							}
-							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -8159,15 +7882,11 @@ class Form
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -8190,9 +7909,7 @@ class Form
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -8208,7 +7925,7 @@ class Form
 	 */
 	public function searchComponent($arrayofcriterias, $search_component_params, $arrayofinputfieldsalreadyoutput = array())
 	{
-	    global $conf, $langs;
+		global $langs;
 
 		$ret = '';
 
@@ -8227,27 +7944,65 @@ class Form
 		$ret .= '<input type="hidden" name="search_component_params_hidden" class="search_component_params_hidden" value="'.GETPOST("search_component_params_hidden").'">';
 		// For compatibility with forms that show themself the search criteria in addition of this component, we output the fields
 		foreach ($arrayofcriterias as $criterias) {
-		    foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {
-		    	if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) continue;
-		        if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) continue;
-		        if (in_array($criteriafamilyval['type'], array('date', 'datetime', 'timestamp'))) {
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_start">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startyear">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startmonth">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startday">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_end">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endyear">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endmonth">';
-		            $ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endday">';
-		        }
-		        else {
+			foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {
+				if (in_array('search_'.$criteriafamilykey, $arrayofinputfieldsalreadyoutput)) continue;
+				if (in_array($criteriafamilykey, array('rowid', 'ref_ext', 'entity', 'extraparams'))) continue;
+				if (in_array($criteriafamilyval['type'], array('date', 'datetime', 'timestamp'))) {
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_start">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startyear">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startmonth">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_startday">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_end">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endyear">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endmonth">';
+					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'_endday">';
+				} else {
 					$ret .= '<input type="hidden" name="search_'.$criteriafamilykey.'">';
-		        }
-		    }
+				}
+			}
 		}
-        $ret .= '</div>';
+		$ret .= '</div>';
 
 
 		return $ret;
 	}
+
+	/**
+	 * selectModelMail
+	 *
+	 * @param   string   $prefix     Prefix
+	 * @param   string   $modelType  Model type
+	 * @param	int		 $default	 1=Show also Default mail template
+	 * @return  string               HTML select string
+	 */
+	public function selectModelMail($prefix, $modelType = '', $default = 0)
+	{
+		global $langs, $db, $user;
+
+		$retstring = '';
+
+		$TModels = array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$result = $formmail->fetchAllEMailTemplate($modelType, $user, $langs);
+
+		if ($default) $TModels[0] = $langs->trans('DefaultMailModel');
+		if ($result > 0) {
+			foreach ($formmail->lines_model as $model) {
+				$TModels[$model->id] = $model->label;
+			}
+		}
+
+		$retstring .= '<select class="flat" id="select_'.$prefix.'model_mail" name="'.$prefix.'model_mail">';
+
+		foreach ($TModels as $id_model=>$label_model) {
+			$retstring .= '<option value="'.$id_model.'"';
+			$retstring .= ">".$label_model."</option>";
+		}
+
+		$retstring .= "</select>";
+
+		return $retstring;
+	}
 }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 7aa7d5585d8..f48e9b8eb74 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -82,9 +82,7 @@ class FormAccounting extends Form
 		{
 		    $options = $this->options_cache[$usecache];
 		    $selected = $selectid;
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT rowid, code, label, nature, entity, active";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE active = 1";
@@ -170,23 +168,21 @@ class FormAccounting extends Form
 			$sql .= " AND c.category_type = 0";
             if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
             $sql .= " ORDER BY c.label ASC";
-        }
-        else
-        {
+        } 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 = '".$mysoc->country_code."'";
+            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 = $db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $num = $db->num_rows($resql);
+        	$num = $this->db->num_rows($resql);
             if ($num)
             {
                 $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
@@ -195,7 +191,7 @@ class FormAccounting extends Form
                 if ($useempty) $out .= '<option value="0">&nbsp;</option>';
                 while ($i < $num)
                 {
-                    $obj = $db->fetch_object($resql);
+                	$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);
@@ -204,15 +200,11 @@ class FormAccounting extends Form
                 }
                 $out .= '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            }
-            else
-            {
+            } else {
                 $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
             }
-        }
-        else
-        {
-            dol_print_error($db, $db->lasterror());
+        } else {
+        	dol_print_error($this->db);
         }
 
         $out .= ajax_combobox($htmlname, array());
@@ -287,9 +279,7 @@ class FormAccounting extends Form
 		{
 		    $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
-		{
+		} else {
     		$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";
@@ -315,9 +305,7 @@ class FormAccounting extends Form
 				if (empty($obj->labelshort))
 				{
 					$labeltoshow = $obj->label;
-				}
-				else
-				{
+				} else {
 					$labeltoshow = $obj->labelshort;
 				}
 
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 398e2b8a235..54406b1075b 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -29,58 +29,58 @@
  */
 class FormActions
 {
-    /**
-     * @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;
-    }
+	 *  @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Show list of action status
-     *
-     * 	@param	string	$formname		Name of form where select is included
-     * 	@param	string	$selected		Preselected value (-1..100)
-     * 	@param	int		$canedit		1=can edit, 0=read only
-     *  @param  string	$htmlname   	Name of html prefix for html fields (selectX and valX)
-     *  @param	integer	$showempty		Show an empty line if select is used
-     *  @param	integer	$onlyselect		0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running)
-     *  @param  string  $morecss        More css on select field
-     * 	@return	void
-     */
-    public function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100')
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Show list of action status
+	 *
+	 * 	@param	string	$formname		Name of form where select is included
+	 * 	@param	string	$selected		Preselected value (-1..100)
+	 * 	@param	int		$canedit		1=can edit, 0=read only
+	 *  @param  string	$htmlname   	Name of html prefix for html fields (selectX and valX)
+	 *  @param	integer	$showempty		Show an empty line if select is used
+	 *  @param	integer	$onlyselect		0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running)
+	 *  @param  string  $morecss        More css on select field
+	 * 	@return	void
+	 */
+	public function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100')
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        $listofstatus = array(
-            '-1' => $langs->trans("ActionNotApplicable"),
-            '0' => $langs->trans("ActionsToDoShort"),
-            '50' => $langs->trans("ActionRunningShort"),
-            '100' => $langs->trans("ActionDoneShort")
-        );
+		$listofstatus = array(
+			'-1' => $langs->trans("ActionNotApplicable"),
+			'0' => $langs->trans("ActionsToDoShort"),
+			'50' => $langs->trans("ActionRunningShort"),
+			'100' => $langs->trans("ActionDoneShort")
+		);
 		// +ActionUncomplete
 
-        if (!empty($conf->use_javascript_ajax))
-        {
-            print "\n";
-            print "<script type=\"text/javascript\">
+		if (!empty($conf->use_javascript_ajax))
+		{
+			print "\n";
+			print "<script type=\"text/javascript\">
                 var htmlname = '".$htmlname."';
 
                 $(document).ready(function () {
@@ -124,153 +124,148 @@ class FormActions
                     }
                 }
                 </script>\n";
-        }
-        if (!empty($conf->use_javascript_ajax) || $onlyselect)
-        {
-        	//var_dump($selected);
-        	if ($selected == 'done') $selected = '100';
-            print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
-            if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'></option>';
-            foreach ($listofstatus as $key => $val)
-            {
-                print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
-                if ($key == '50' && $onlyselect == 2)
-                {
-                	print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';
-                }
-            }
-            print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit = 0;
-
-            if (empty($onlyselect))
-            {
-	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
-    	        print '<span class="hideonsmartphone hideifna">%</span>';
-            }
-        }
-        else
+		}
+		if (!empty($conf->use_javascript_ajax) || $onlyselect)
 		{
-            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';
-        }
-    }
-
-
-    /**
-     *  Show list of actions for element
-     *
-     *  @param	Object	$object					Object
-     *  @param  string	$typeelement			'invoice','propal','order','invoice_supplier','order_supplier','fichinter'
-     *	@param	int		$socid					Socid of user
-     *  @param	int		$forceshowtitle			Show title even if there is no actions to show
-     *  @param  string  $morecss        		More css on table
-     *  @param	int		$max					Max number of record
-     *  @param	string	$moreparambacktopage	More param for the backtopage
-     *  @param	string	$morehtmlcenter			More html text on center of title line
-     *	@return	int								<0 if KO, >=0 if OK
-     */
-    public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlcenter = '')
-    {
-        global $langs, $conf, $user;
-
-        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-
-        $sortfield = 'a.datep,a.id';
-        $sortorder = 'DESC,DESC';
-
-        $listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
-        if (!is_array($listofactions)) dol_print_error($this->db, 'FailedToGetActions');
-
-        $num = count($listofactions);
-        if ($num || $forceshowtitle)
-        {
-        	if ($typeelement == 'invoice')               $title = $langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title = $langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title = $langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_proposal') $title = $langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title = $langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title = $langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title = $langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title = $langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
-            elseif ($typeelement == 'task')              $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
-            elseif ($typeelement == 'member')            $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
-            else $title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
-
-            $urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');
-
-            $projectid = $object->fk_project;
-            if ($typeelement == 'project') $projectid = $object->id;
-
-            $newcardbutton = '';
-            if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create))
+			//var_dump($selected);
+			if ($selected == 'done') $selected = '100';
+			print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
+			if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'></option>';
+			foreach ($listofstatus as $key => $val)
 			{
-                $newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(), 'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid > 0 ? '&socid='.$object->socid : ($socid > 0 ? '&socid='.$socid : '')).($projectid > 0 ? '&projectid='.$projectid : '').'&backtopage='.urlencode($urlbacktopage));
+				print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
+				if ($key == '50' && $onlyselect == 2)
+				{
+					print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';
+				}
+			}
+			print '</select>';
+			if ($selected == 0 || $selected == 100) $canedit = 0;
+
+			if (empty($onlyselect))
+			{
+				print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
+				print '<span class="hideonsmartphone hideifna">%</span>';
+			}
+		} else {
+			print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';
+		}
+	}
+
+
+	/**
+	 *  Show list of actions for element
+	 *
+	 *  @param	Object	$object					Object
+	 *  @param  string	$typeelement			'invoice', 'propal', 'order', 'invoice_supplier', 'order_supplier', 'fichinter'
+	 *	@param	int		$socid					Socid of user
+	 *  @param	int		$forceshowtitle			Show title even if there is no actions to show
+	 *  @param  string  $morecss        		More css on table
+	 *  @param	int		$max					Max number of record
+	 *  @param	string	$moreparambacktopage	More param for the backtopage
+	 *  @param	string	$morehtmlcenter			More html text on center of title line
+	 *	@return	int								<0 if KO, >=0 if OK
+	 */
+	public function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlcenter = '')
+	{
+		global $langs, $conf, $user;
+
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+		$sortfield = 'a.datep,a.id';
+		$sortorder = 'DESC,DESC';
+
+		$listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
+		if (!is_array($listofactions)) dol_print_error($this->db, 'FailedToGetActions');
+
+		$num = count($listofactions);
+		if ($num || $forceshowtitle)
+		{
+			if ($typeelement == 'invoice')               $title = $langs->trans('ActionsOnBill');
+			elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title = $langs->trans('ActionsOnBill');
+			elseif ($typeelement == 'propal')            $title = $langs->trans('ActionsOnPropal');
+			elseif ($typeelement == 'supplier_proposal') $title = $langs->trans('ActionsOnSupplierProposal');
+			elseif ($typeelement == 'order')             $title = $langs->trans('ActionsOnOrder');
+			elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title = $langs->trans('ActionsOnOrder');
+			elseif ($typeelement == 'shipping')          $title = $langs->trans('ActionsOnShipping');
+			elseif ($typeelement == 'fichinter')         $title = $langs->trans('ActionsOnFicheInter');
+			elseif ($typeelement == 'project')           $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+			elseif ($typeelement == 'task')              $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+			elseif ($typeelement == 'member')            $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+			else $title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
+
+			$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');
+
+			$projectid = $object->fk_project;
+			if ($typeelement == 'project') $projectid = $object->id;
+
+			$newcardbutton = '';
+			if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create))
+			{
+				$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog')).'&amp;origin='.urlencode($typeelement).'&amp;originid='.$object->id.($object->socid > 0 ? '&amp;socid='.$object->socid : ($socid > 0 ? '&amp;socid='.$socid : '')).($projectid > 0 ? '&amp;projectid='.$projectid : '').'&amp;backtopage='.urlencode($urlbacktopage));
 			}
 
 
-        	print '<!-- formactions->showactions -->'."\n";
-        	print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlcenter);
+			print '<!-- formactions->showactions -->'."\n";
+			print load_fiche_titre($title, $newcardbutton, '', 0, 0, '', $morehtmlcenter);
 
-        	$page = 0; $param = '';
+			$page = 0; $param = '';
 
-        	print '<div class="div-table-responsive-no-min">';
-        	print '<table class="centpercent noborder'.($morecss ? ' '.$morecss : '').'">';
-        	print '<tr class="liste_titre">';
-        	print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, '', $sortfield, $sortorder, 'center ', 1);
-        	print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, 'right ', 1);
-        	print '</tr>';
-        	print "\n";
+			print '<div class="div-table-responsive-no-min">';
+			print '<table class="centpercent noborder'.($morecss ? ' '.$morecss : '').'">';
+			print '<tr class="liste_titre">';
+			print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+			print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+			print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+			print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+			print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, '', $sortfield, $sortorder, 'center ', 1);
+			print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, 'right ', 1);
+			print '</tr>';
+			print "\n";
 
-        	if (is_array($listofactions) && count($listofactions))
-        	{
-        		$cacheusers = array();
+			if (is_array($listofactions) && count($listofactions))
+			{
+				$cacheusers = array();
 
-	        	$cursorevent = 0;
-	        	foreach ($listofactions as $actioncomm)
-	        	{
-	        		if ($max && $cursorevent >= $max) break;
+				$cursorevent = 0;
+				foreach ($listofactions as $actioncomm)
+				{
+					if ($max && $cursorevent >= $max) break;
 
-	        		$ref = $actioncomm->getNomUrl(1, -1);
-	        		$label = $actioncomm->getNomUrl(0, 38);
+					$ref = $actioncomm->getNomUrl(1, -1);
+					$label = $actioncomm->getNomUrl(0, 38);
 
-	        		print '<tr class="oddeven">';
-	        		// Ref
+					print '<tr class="oddeven">';
+					// Ref
 					print '<td class="nowraponall">'.$ref.'</td>';
 					// Onwer
-	        		print '<td class="tdoverflowmax150">';
-	        		if (!empty($actioncomm->userownerid))
-	        		{
-	        			if (is_object($cacheusers[$actioncomm->userownerid]))
-	        			{
-	        				$tmpuser = $cacheusers[$actioncomm->userownerid];
-	        			}
-	        			else
-	        			{
-	        				$tmpuser = new User($this->db);
-	        				$tmpuser->fetch($actioncomm->userownerid);
-	        				$cacheusers[$actioncomm->userownerid] = $tmpuser;
-	        			}
-	        			if ($tmpuser->id > 0)
-	        			{
-	        				print $tmpuser->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
-	        			}
-	        		}
-	        		print '</td>';
+					print '<td class="tdoverflowmax150">';
+					if (!empty($actioncomm->userownerid))
+					{
+						if (is_object($cacheusers[$actioncomm->userownerid]))
+						{
+							$tmpuser = $cacheusers[$actioncomm->userownerid];
+						} else {
+							$tmpuser = new User($this->db);
+							$tmpuser->fetch($actioncomm->userownerid);
+							$cacheusers[$actioncomm->userownerid] = $tmpuser;
+						}
+						if ($tmpuser->id > 0)
+						{
+							print $tmpuser->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
+						}
+					}
+					print '</td>';
 
 					// Type
-	        		print '<td>';
-	        		// TODO Code common with code into comm/action/list.php
+					print '<td>';
+					// TODO Code common with code into comm/action/list.php
 					$imgpicto = '';
 					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 					{
 						if ($actioncomm->type_picto) {
 							$imgpicto = img_picto('', $actioncomm->type_picto);
-						}
-						else {
+						} else {
 							if ($actioncomm->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
 							elseif ($actioncomm->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
 							elseif ($actioncomm->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
@@ -286,105 +281,100 @@ class FormActions
 					} else {
 						print $actioncomm->type_short ? $actioncomm->type_short : $actioncomm->type;
 					}
-	        		print '</td>';
-	        		// Label
-	        		print '<td>'.$label.'</td>';
-	        		// Date
-	        		print '<td class="center">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
-	        		if ($actioncomm->datef)
-	        		{
-		        		$tmpa = dol_getdate($actioncomm->datep);
-		        		$tmpb = dol_getdate($actioncomm->datef);
-		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
-		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
-		        		}
-		        		else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
-	        		}
-	        		print '</td>';
-	        		print '<td class="right">';
-        			print $actioncomm->getLibStatut(3);
-	        		print '</td>';
-	        		print '</tr>';
+					print '</td>';
+					// Label
+					print '<td>'.$label.'</td>';
+					// Date
+					print '<td class="center">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
+					if ($actioncomm->datef)
+					{
+						$tmpa = dol_getdate($actioncomm->datep);
+						$tmpb = dol_getdate($actioncomm->datef);
+						if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
+						{
+							if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
+						} else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
+					}
+					print '</td>';
+					print '<td class="right">';
+					print $actioncomm->getLibStatut(3);
+					print '</td>';
+					print '</tr>';
 
-	        		$cursorevent++;
-	        	}
-        	}
-        	else
-        	{
-        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        	}
+					$cursorevent++;
+				}
+			} else {
+				print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			}
 
-        	if ($max && $num > $max)
-        	{
-        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
-        	}
+			if ($max && $num > $max)
+			{
+				print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
+			}
 
-        	print '</table>';
-        	print '</div>';
-        }
+			print '</table>';
+			print '</div>';
+		}
 
-        return $num;
-    }
+		return $num;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Output html select list of type of event
-     *
-     *  @param	array|string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.
-     *  @param  string		    $htmlname       Name of select field
-     *  @param	string		    $excludetype	A type to exclude ('systemauto', 'system', '')
-     *  @param	integer		    $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	int		        $hideinfohelp	1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
-     *  @param  int		        $multiselect    1=Allow multiselect of action type
-     *  @param  int             $nooutput       1=No output
-     *  @param	string			$morecss		More css to add to SELECT component.
-     * 	@return	string
-     */
-    public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0, $morecss = '')
-    {
-        // phpcs:enable
-        global $langs, $user, $form, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Output html select list of type of event
+	 *
+	 *  @param	array|string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.
+	 *  @param  string		    $htmlname       Name of select field
+	 *  @param	string		    $excludetype	A type to exclude ('systemauto', 'system', '')
+	 *  @param	integer		    $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	int		        $hideinfohelp	1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
+	 *  @param  int		        $multiselect    1=Allow multiselect of action type
+	 *  @param  int             $nooutput       1=No output
+	 *  @param	string			$morecss		More css to add to SELECT component.
+	 * 	@return	string
+	 */
+	public function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0, $morecss = '')
+	{
+		// phpcs:enable
+		global $langs, $user, $form, $conf;
 
-        if (!is_object($form)) $form = new Form($this->db);
+		if (!is_object($form)) $form = new Form($this->db);
 
-        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
-        require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-        $caction = new CActionComm($this->db);
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+		$caction = new CActionComm($this->db);
 
-        // Suggest a list with manual events or all auto events
-        $arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
-        if (empty($multiselect)) {
-            // Add empty line at start only if no multiselect
-            array_unshift($arraylist, '&nbsp;');
-        }
-        //asort($arraylist);
+		// Suggest a list with manual events or all auto events
+		$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+		if (empty($multiselect)) {
+			// Add empty line at start only if no multiselect
+			array_unshift($arraylist, '&nbsp;');
+		}
+		//asort($arraylist);
 
-       	if ($selected == 'manual') $selected = 'AC_OTH';
-       	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';
+	   	if ($selected == 'manual') $selected = 'AC_OTH';
+	   	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';
 
-       	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+	   	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
 
-       	$out = '';
+	   	$out = '';
 
 		if (!empty($multiselect))
 		{
-	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+			if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
 			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
-		}
-		else
-		{
+		} else {
 			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth200'.($morecss ? ' '.$morecss : ''), 1);
 		}
 
-        if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
-        {
-            $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);
-        }
+		if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
+		{
+			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);
+		}
 
-        if ($nooutput) return $out;
-        else print $out;
-        return '';
-    }
+		if ($nooutput) return $out;
+		else print $out;
+		return '';
+	}
 }
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 16e9a70ab56..b53d73bc757 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -114,9 +114,7 @@ class FormAdmin
 			if ($selected == $keytouse)
 			{
 				$out .= '<option value="'.$keytouse.'" selected>'.$valuetoshow.'</option>';
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="'.$keytouse.'">'.$valuetoshow.'</option>';
 			}
 		}
@@ -184,9 +182,7 @@ class FormAdmin
     	                        if ($file == $selected)
     	                        {
     	        					$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        }
-    	                        else
-    	                        {
+    	                        } else {
     	                            $menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
     	                        }
     	                    }
@@ -385,9 +381,7 @@ class FormAdmin
 
                 $i++;
             }
-        }
-        else
-		{
+        } else {
 			dol_print_error($this->db);
 			return '';
 		}
@@ -405,9 +399,7 @@ class FormAdmin
             if ($selected == $key)
 			{
 				$out .= '<option value="'.$key.'" selected>'.$value.'</option>';
-			}
-			else
-			{
+			} else {
 				$out .= '<option value="'.$key.'">'.$value.'</option>';
 			}
 		}
diff --git a/htdocs/core/class/html.formbank.class.php b/htdocs/core/class/html.formbank.class.php
index a9708a9d76d..a359bd194f7 100644
--- a/htdocs/core/class/html.formbank.class.php
+++ b/htdocs/core/class/html.formbank.class.php
@@ -23,6 +23,8 @@
  *	\brief      File of class with all html predefined components
  */
 
+include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
 
 /**
  *	Class to manage generation of HTML components for bank module
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 8c27666dfc4..104daf6de0e 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -176,8 +176,7 @@ class FormBarCode
             }
             $out .= "</select>";
             $out .= ajax_combobox("select_".$htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
         return $out;
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 41e39cc93a2..f2f856144ff 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -32,13 +32,12 @@ class FormCategory extends Form
 	/**
 	 * Return a HTML filter box for a list filter view
 	 *
-	 * @param string $type			The categorie type (e.g Categorie::TYPE_WAREHOUSE)
-	 * @param Array $preSelected	A list with the elements that should pre-selected
-	 * @return string				A HTML filter box (Note: selected results can get with GETPOST("search_category_".$type."_list"))
+	 * @param string	$type			The categorie type (e.g Categorie::TYPE_WAREHOUSE)
+	 * @param Array		$preSelected	A list with the elements that should pre-selected
+	 * @return string					A HTML filter box (Note: selected results can get with GETPOST("search_category_".$type."_list"))
 	 */
-	public function getFilterBox($type, $preSelected)
+	public function getFilterBox($type, array $preSelected)
 	{
-		// phpcs:enable
 		global $langs;
 
 		if (empty($preSelected) || !is_array($preSelected))
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 6fb02454311..b43df3753dc 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2008-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2017		Rui Strecht			<rui.strecht@aliartalentos.com>
+ * Copyright (C) 2020       Open-Dsi         	<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 class FormCompany extends Form
 {
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    	Return list of labels (translated) of third parties type
 	 *
@@ -49,7 +50,7 @@ class FormCompany extends Form
 	 */
 	public function typent_array($mode = 0, $filter = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs, $mysoc;
 
 		$effs = array();
@@ -82,7 +83,7 @@ class FormCompany extends Form
 		return $effs;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoie la liste des types d'effectifs possibles (pas de traduction car nombre)
 	 *
@@ -92,7 +93,7 @@ class FormCompany extends Form
 	 */
 	public function effectif_array($mode = 0, $filter = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$effs = array();
 
 		$sql = "SELECT id, code, libelle";
@@ -122,7 +123,7 @@ class FormCompany extends Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Affiche formulaire de selection des modes de reglement
 	 *
@@ -134,7 +135,7 @@ class FormCompany extends Form
 	 */
 	public function form_prospect_level($page, $selected = '', $htmlname = 'prospect_level_id', $empty = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs;
 
 		print '<form method="post" action="'.$page.'">';
@@ -166,19 +167,70 @@ class FormCompany extends Form
 			}
 
 			print Form::selectarray($htmlname, $options, $selected);
-		}
-		else dol_print_error($this->db);
+		} 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").'">';
 		print '</form>';
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Affiche formulaire de selection des niveau de prospection pour les contacts
+	 *
+	 *  @param	int		$page        	Page
+	 *  @param  int		$selected    	Id or code preselected
+	 *  @param  string	$htmlname   	Nom du formulaire select
+	 *	@param	int		$empty			Add empty value in list
+	 *	@return	void
+	 */
+	public function formProspectContactLevel($page, $selected = '', $htmlname = 'prospect_contact_level_id', $empty = 0)
+	{
+		global $user, $langs;
+
+		print '<form method="post" action="' . $page . '">';
+		print '<input type="hidden" name="action" value="setprospectcontactlevel">';
+		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 .= " WHERE active > 0";
+		$sql .= " ORDER BY sortorder";
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$options = array();
+
+			if ($empty)
+			{
+				$options[''] = '';
+			}
+
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$level = $langs->trans($obj->code);
+
+				if ($level == $obj->code)
+				{
+					$level = $langs->trans($obj->label);
+				}
+
+				$options[$obj->code] = $level;
+			}
+
+			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") . '">';
+		print '</form>';
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Returns the drop-down list of departments/provinces/cantons for all countries or for a given country.
-     *   In the case of an all-country list, the display breaks on the country.
-     *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).
-     *   Thus the links with the departments are done on a department independently of its name.
+	 *   In the case of an all-country list, the display breaks on the country.
+	 *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).
+	 *   Thus the links with the departments are done on a department independently of its name.
 	 *
 	 *   @param     string	$selected        	Code state preselected
 	 *   @param     int		$country_codeid     0=list for all countries, otherwise country code or country rowid to show
@@ -187,16 +239,16 @@ class FormCompany extends Form
 	 */
 	public function select_departement($selected = '', $country_codeid = 0, $htmlname = 'state_id')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		print $this->select_state($selected, $country_codeid, $htmlname);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Returns the drop-down list of departments/provinces/cantons for all countries or for a given country.
-     *   In the case of an all-country list, the display breaks on the country.
-     *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).
-     *   Thus the links with the departments are done on a department independently of its name.
+	 *   In the case of an all-country list, the display breaks on the country.
+	 *   The key of the list is the code (there can be several entries for a given code but in this case, the country field differs).
+	 *   Thus the links with the departments are done on a department independently of its name.
 	 *
 	 *    @param	int		$selected        	Code state preselected (mus be state id)
 	 *    @param    integer	$country_codeid    	Country code or id: 0=list for all countries, otherwise country code or country rowid to show
@@ -206,7 +258,7 @@ class FormCompany extends Form
 	 */
 	public function select_state($selected = 0, $country_codeid = 0, $htmlname = 'state_id')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $user;
 
 		dol_syslog(get_class($this)."::select_departement selected=".$selected.", country_codeid=".$country_codeid, LOG_DEBUG);
@@ -241,8 +293,7 @@ class FormCompany extends Form
 					if ($obj->code == '0')		// Le code peut etre une chaine
 					{
 						$out .= '<option value="0">&nbsp;</option>';
-					}
-					else {
+					} else {
 						if (!$country || $country != $obj->country)
 						{
 							// Affiche la rupture si on est en mode liste multipays
@@ -256,9 +307,7 @@ class FormCompany extends Form
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>';
-						}
-						else
-						{
+						} else {
 							$out .= '<option value="'.$obj->rowid.'">';
 						}
 
@@ -267,16 +316,13 @@ class FormCompany extends Form
 						($conf->global->MAIN_SHOW_STATE_CODE == 1 || $conf->global->MAIN_SHOW_STATE_CODE == 2 || $conf->global->MAIN_SHOW_STATE_CODE === 'all')) {
 							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out .= $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-							}
-							else {
+							} else {
 								$out .= $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
-						}
-						else {
+						} else {
 							if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1) {
 								$out .= $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-							}
-							else {
+							} else {
 								$out .= ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
 							}
 						}
@@ -288,9 +334,7 @@ class FormCompany extends Form
 			}
 			if (!empty($htmlname)) $out .= '</select>';
 			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -305,7 +349,7 @@ class FormCompany extends Form
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *   Retourne la liste deroulante des regions actives dont le pays est actif
 	 *   La cle de la liste est le code (il peut y avoir plusieurs entree pour
@@ -318,7 +362,7 @@ class FormCompany extends Form
 	 */
 	public function select_region($selected = '', $htmlname = 'region_id')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		$langs->load("dict");
 
@@ -342,8 +386,7 @@ class FormCompany extends Form
 					$obj = $this->db->fetch_object($resql);
 					if ($obj->code == 0) {
 						print '<option value="0">&nbsp;</option>';
-					}
-					else {
+					} else {
 						if ($country == '' || $country != $obj->country)
 						{
 							// Show break
@@ -356,9 +399,7 @@ class FormCompany extends Form
 						if ($selected > 0 && $selected == $obj->code)
 						{
 							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
-						}
-						else
-						{
+						} else {
 							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
 						}
 					}
@@ -366,25 +407,24 @@ class FormCompany extends Form
 				}
 			}
 			print '</select>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return combo list with people title
 	 *
 	 *  @param  string	$selected   	Civility/Title code preselected
 	 * 	@param	string	$htmlname		Name of HTML select combo field
 	 *  @param  string  $morecss        Add more css on SELECT element
+	 *  @param	int		$addjscombo		Add js combo
 	 *  @return	string					String with HTML select
 	 */
-	public function select_civility($selected = '', $htmlname = 'civility_id', $morecss = 'maxwidth100')
+	public function select_civility($selected = '', $htmlname = 'civility_id', $morecss = 'maxwidth150', $addjscombo = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $user;
 		$langs->load("dict");
 
@@ -409,12 +449,10 @@ class FormCompany extends Form
 					if ($selected == $obj->code)
 					{
 						$out .= '<option value="'.$obj->code.'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.$obj->code.'">';
 					}
-					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
+					// If translation exists, we use it, otherwise, we use tha had coded label
 					$out .= ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->label != '-' ? $obj->label : ''));
 					$out .= '</option>';
 					$i++;
@@ -422,16 +460,20 @@ class FormCompany extends Form
 			}
 			$out .= '</select>';
 			if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-		}
-		else
-		{
+
+			if ($addjscombo) {
+				// Enhance with select2
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($htmlname);
+			}
+		} else {
 			dol_print_error($this->db);
 		}
 
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
 	 *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays.
@@ -445,25 +487,25 @@ class FormCompany extends Form
 	 */
 	public function select_forme_juridique($selected = '', $country_codeid = 0, $filter = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		print $this->select_juridicalstatus($selected, $country_codeid, $filter);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Retourne la liste deroulante des formes juridiques tous pays confondus ou pour un pays donne.
 	 *    Dans le cas d'une liste tous pays confondu, on affiche une rupture sur le pays
 	 *
 	 *    @param	string		$selected        	Preselected code of juridical type
 	 *    @param    int			$country_codeid     0=list for all countries, otherwise list only country requested
-     *    @param    string		$filter          	Add a SQL filter on list
-     *    @param	string		$htmlname			HTML name of select
-     *    @param	string		$morecss			More CSS
-     *    @return	string							String with HTML select
+	 *    @param    string		$filter          	Add a SQL filter on list
+	 *    @param	string		$htmlname			HTML name of select
+	 *    @param	string		$morecss			More CSS
+	 *    @return	string							String with HTML select
 	 */
 	public function select_juridicalstatus($selected = '', $country_codeid = 0, $filter = '', $htmlname = 'forme_juridique_code', $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $user;
 		$langs->load("dict");
 
@@ -474,7 +516,7 @@ class FormCompany extends Form
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE f.fk_pays=c.rowid";
 		$sql .= " AND f.active = 1 AND c.active = 1";
-		if ($country_codeid) $sql .= " AND c.code = '".$country_codeid."'";
+		if ($country_codeid) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
 		if ($filter) $sql .= " ".$filter;
 		$sql .= " ORDER BY c.code";
 
@@ -525,9 +567,7 @@ class FormCompany extends Form
 					if ($selected > 0 && $selected == $val['code'])
 					{
 						$out .= '<option value="'.$val['code'].'" selected>';
-					}
-					else
-					{
+					} else {
 						$out .= '<option value="'.$val['code'].'">';
 					}
 					// If translation exists, we use it, otherwise we use default label in database
@@ -538,14 +578,12 @@ class FormCompany extends Form
 			$out .= '</select>';
 			if ($user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 
-		    // Make select dynamic
-        	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-	        $out .= ajax_combobox($htmlname);
+			// Make select dynamic
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname);
 
 			$out .= '</div>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -562,8 +600,8 @@ class FormCompany extends Form
 	 *  @param  string		$htmlname       Name of HTML form
 	 * 	@param	array		$limitto		Disable answers that are not id in this array list
 	 *  @param	int			$forceid		This is to force another object id than object->id
-     *  @param	string		$moreparam		String with more param to add into url when noajax search is used.
-     *  @param	string		$morecss		More CSS on select component
+	 *  @param	string		$moreparam		String with more param to add into url when noajax search is used.
+	 *  @param	string		$morecss		More CSS on select component
 	 * 	@return int 						The selected third party ID
 	 */
 	public function selectCompaniesForNewContact($object, $var_id, $selected = '', $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '', $morecss = '')
@@ -652,9 +690,7 @@ class FormCompany extends Form
 			print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$name.'" />';
 			print ajax_autocompleter(($socid ? $socid : -1), $htmlname, DOL_URL_ROOT.'/societe/ajaxcompanies.php', '', $minLength, 0);
 			return $socid;
-		}
-		else
-		{
+		} else {
 			// Search to list thirdparties
 			$sql = "SELECT s.rowid, s.nom as name FROM";
 			$sql .= " ".MAIN_DB_PREFIX."societe as s";
@@ -692,9 +728,7 @@ class FormCompany extends Form
 							if ($disabled) print ' disabled';
 							print ' selected>'.dol_trunc($obj->name, 24).'</option>';
 							$firstCompany = $obj->rowid;
-						}
-						else
-						{
+						} else {
 							print '<option value="'.$obj->rowid.'"';
 							if ($disabled) print ' disabled';
 							print '>'.dol_trunc($obj->name, 24).'</option>';
@@ -705,30 +739,28 @@ class FormCompany extends Form
 				print "</select>\n";
 				print ajax_combobox($htmlname);
 				return $firstCompany;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
 		}
 	}
 
-    /**
-     *  Return a select list with types of contacts
-     *
-     *  @param	object		$object         Object to use to find type of contact
-     *  @param  string		$selected       Default selected value
-     *  @param  string		$htmlname		HTML select name
-     *  @param  string		$source			Source ('internal' or 'external')
-     *  @param  string		$sortorder		Sort criteria ('position', 'code', ...)
-     *  @param  int			$showempty      1=Add en empty line
-     *  @param  string      $morecss        Add more css to select component
-     *  @return	void
-     */
-    public function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '')
+	/**
+	 *  Return a select list with types of contacts
+	 *
+	 *  @param	object		$object         Object to use to find type of contact
+	 *  @param  string		$selected       Default selected value
+	 *  @param  string		$htmlname		HTML select name
+	 *  @param  string		$source			Source ('internal' or 'external')
+	 *  @param  string		$sortorder		Sort criteria ('position', 'code', ...)
+	 *  @param  int			$showempty      1=Add en empty line
+	 *  @param  string      $morecss        Add more css to select component
+	 *  @return	void
+	 */
+	public function selectTypeContact($object, $selected, $htmlname = 'type', $source = 'internal', $sortorder = 'position', $showempty = 0, $morecss = '')
 	{
-	    global $user, $langs;
+		global $user, $langs;
 
 		if (is_object($object) && method_exists($object, 'liste_type_contact'))
 		{
@@ -790,7 +822,7 @@ class FormCompany extends Form
 		return 'ErrorBadValueForParameterRenderMode'; // Should not happened
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Return a select list with zip codes and their town
 	 *
@@ -805,7 +837,7 @@ class FormCompany extends Form
 	 */
 	public function select_ziptown($selected = '', $htmlname = 'zipcode', $fields = '', $fieldsize = 0, $disableautocomplete = 0, $moreattrib = '', $morecss = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$out = '';
@@ -823,158 +855,155 @@ class FormCompany extends Form
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return HTML string to use as input of professional id into a HTML page (siren, siret, etc...)
-     *
-     *  @param	int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
-     *  @param  string	$htmlname       Name of HTML select
-     *  @param  string	$preselected    Default value to show
-     *  @param  string	$country_code   FR, IT, ...
-     *  @param  string  $morecss        More css
-     *  @return	string					HTML string with prof id
-     */
-    public function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent')
-    {
-        // phpcs:enable
-        global $conf, $langs, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return HTML string to use as input of professional id into a HTML page (siren, siret, etc...)
+	 *
+	 *  @param	int		$idprof         1,2,3,4 (Example: 1=siren,2=siret,3=naf,4=rcs/rm)
+	 *  @param  string	$htmlname       Name of HTML select
+	 *  @param  string	$preselected    Default value to show
+	 *  @param  string	$country_code   FR, IT, ...
+	 *  @param  string  $morecss        More css
+	 *  @return	string					HTML string with prof id
+	 */
+	public function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent')
+	{
+		// phpcs:enable
+		global $conf, $langs, $hookmanager;
 
-        $formlength = 0;
-        if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
-        	if ($country_code == 'FR')
-        	{
-        		if (isset($idprof)) {
-        			if ($idprof == 1) $formlength = 9;
-        			elseif ($idprof == 2) $formlength = 14;
-        			elseif ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier
-        			elseif ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id
-        		}
-        	}
-        	elseif ($country_code == 'ES')
-        	{
-        		if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits
-        		if ($idprof == 2) $formlength = 12; //NASS 12 digits without /
-        		if ($idprof == 3) $formlength = 5; //CNAE 5 digits
-        		if ($idprof == 4) $formlength = 32; //depend of college
-        	}
-        }
+		$formlength = 0;
+		if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
+			if ($country_code == 'FR')
+			{
+				if (isset($idprof)) {
+					if ($idprof == 1) $formlength = 9;
+					elseif ($idprof == 2) $formlength = 14;
+					elseif ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier
+					elseif ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id
+				}
+			} elseif ($country_code == 'ES')
+			{
+				if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits
+				if ($idprof == 2) $formlength = 12; //NASS 12 digits without /
+				if ($idprof == 3) $formlength = 5; //CNAE 5 digits
+				if ($idprof == 4) $formlength = 32; //depend of college
+			}
+		}
 
-        $selected = $preselected;
-        if (!$selected && isset($idprof)) {
-        	if ($idprof == 1 && !empty($this->idprof1)) $selected = $this->idprof1;
-        	elseif ($idprof == 2 && !empty($this->idprof2)) $selected = $this->idprof2;
-        	elseif ($idprof == 3 && !empty($this->idprof3)) $selected = $this->idprof3;
-        	elseif ($idprof == 4 && !empty($this->idprof4)) $selected = $this->idprof4;
-        }
+		$selected = $preselected;
+		if (!$selected && isset($idprof)) {
+			if ($idprof == 1 && !empty($this->idprof1)) $selected = $this->idprof1;
+			elseif ($idprof == 2 && !empty($this->idprof2)) $selected = $this->idprof2;
+			elseif ($idprof == 3 && !empty($this->idprof3)) $selected = $this->idprof3;
+			elseif ($idprof == 4 && !empty($this->idprof4)) $selected = $this->idprof4;
+		}
 
-        $maxlength = $formlength;
-        if (empty($formlength)) { $formlength = 24; $maxlength = 128; }
+		$maxlength = $formlength;
+		if (empty($formlength)) { $formlength = 24; $maxlength = 128; }
 
-        $out = '';
+		$out = '';
 
-        // Execute hook getInputIdProf to complete or replace $out
-        $parameters = array('formlength'=>$formlength, 'selected'=>$preselected, 'idprof'=>$idprof, 'htmlname'=>$htmlname, 'country_code'=>$country_code);
-        $reshook = $hookmanager->executeHooks('getInputIdProf', $parameters);
-        if (empty($reshook))
-        {
-        	$out .= '<input type="text" '.($morecss ? 'class="'.$morecss.'" ' : '').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
-        }
-        $out .= $hookmanager->resPrint;
+		// Execute hook getInputIdProf to complete or replace $out
+		$parameters = array('formlength'=>$formlength, 'selected'=>$preselected, 'idprof'=>$idprof, 'htmlname'=>$htmlname, 'country_code'=>$country_code);
+		$reshook = $hookmanager->executeHooks('getInputIdProf', $parameters);
+		if (empty($reshook))
+		{
+			$out .= '<input type="text" '.($morecss ? 'class="'.$morecss.'" ' : '').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
+		}
+		$out .= $hookmanager->resPrint;
 
-        return $out;
-    }
+		return $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return a HTML select with localtax values for thirdparties
-     *
-     * @param 	int 		$local			LocalTax
-     * @param 	int 		$selected		Preselected value
-     * @param 	string      $htmlname		HTML select name
-     * @return	void
-     */
-    public function select_localtax($local, $selected, $htmlname)
-    {
-        // phpcs:enable
-        $tax = get_localtax_by_third($local);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return a HTML select with localtax values for thirdparties
+	 *
+	 * @param 	int 		$local			LocalTax
+	 * @param 	int 		$selected		Preselected value
+	 * @param 	string      $htmlname		HTML select name
+	 * @return	void
+	 */
+	public function select_localtax($local, $selected, $htmlname)
+	{
+		// phpcs:enable
+		$tax = get_localtax_by_third($local);
 
-        $num = $this->db->num_rows($tax);
-        $i = 0;
-    	if ($num)
-    	{
-    		$valors = explode(":", $tax);
+		$num = $this->db->num_rows($tax);
+		$i = 0;
+		if ($num)
+		{
+			$valors = explode(":", $tax);
 
-    		if (count($valors) > 1)
-    		{
-    			//montar select
-    			print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-    			while ($i <= (count($valors)) - 1)
-    			{
-    				if ($selected == $valors[$i])
-    				{
-    					print '<option value="'.$valors[$i].'" selected>';
-    				}
-    				else
-    				{
-    					print '<option value="'.$valors[$i].'">';
-    				}
-    				print $valors[$i];
-    				print '</option>';
-    				$i++;
-    			}
-    			print'</select>';
-    		}
-    	}
-    }
+			if (count($valors) > 1)
+			{
+				//montar select
+				print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+				while ($i <= (count($valors)) - 1)
+				{
+					if ($selected == $valors[$i])
+					{
+						print '<option value="'.$valors[$i].'" selected>';
+					} else {
+						print '<option value="'.$valors[$i].'">';
+					}
+					print $valors[$i];
+					print '</option>';
+					$i++;
+				}
+				print'</select>';
+			}
+		}
+	}
 
-    /**
-     * Return a HTML select for thirdparty type
-     *
-     * @param int $selected selected value
-     * @param string $htmlname HTML select name
-     * @param string $htmlidname HTML select id
-     * @param string $typeinput HTML output
-     * @param string $morecss More css
-     * @return string HTML string
-     */
-    public function selectProspectCustomerType($selected, $htmlname = 'client', $htmlidname = 'customerprospect', $typeinput = 'form', $morecss = '')
-    {
+	/**
+	 * Return a HTML select for thirdparty type
+	 *
+	 * @param int $selected selected value
+	 * @param string $htmlname HTML select name
+	 * @param string $htmlidname HTML select id
+	 * @param string $typeinput HTML output
+	 * @param string $morecss More css
+	 * @return string HTML string
+	 */
+	public function selectProspectCustomerType($selected, $htmlname = 'client', $htmlidname = 'customerprospect', $typeinput = 'form', $morecss = '')
+	{
 
-    	global $conf, $langs;
+		global $conf, $langs;
 
-    	$out = '<select class="flat '.$morecss.'" name="'.$htmlname.'" id="'.$htmlidname.'">';
-    	if ($typeinput == 'form') {
-    		if ($selected == '' || $selected == '-1') $out .= '<option value="-1">&nbsp;</option>';
-	    	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-	    		$out .= '<option value="2"'.($selected == 2 ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
-	    	}
-	    	if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
-	    		$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
-	    	}
-	    	if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-	    		$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
-	    	}
-	    	$out .= '<option value="0"'.((string) $selected == '0' ? ' selected' : '').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
-    	} elseif ($typeinput == 'list') {
-    		$out .= '<option value="-1"'.(($selected == '' || $selected == '-1') ? ' selected' : '').'>&nbsp;</option>';
-    		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-    			$out .= '<option value="1,3"'.($selected == '1,3' ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
-    		}
-    		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-    			$out .= '<option value="2,3"'.($selected == '2,3' ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
-    		}
-    		$out .= '<option value="4"'.($selected == '4' ? ' selected' : '').'>'.$langs->trans('Supplier').'</option>';
-    		$out .= '<option value="0"'.($selected == '0' ? ' selected' : '').'>'.$langs->trans('Other').'</option>';
-    	} elseif ($typeinput == 'admin') {
-    		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
-    			$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
-    		}
-    		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-    			$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
-    		}
-    	}
-    	$out .= '</select>';
+		$out = '<select class="flat '.$morecss.'" name="'.$htmlname.'" id="'.$htmlidname.'">';
+		if ($typeinput == 'form') {
+			if ($selected == '' || $selected == '-1') $out .= '<option value="-1">&nbsp;</option>';
+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+				$out .= '<option value="2"'.($selected == 2 ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
+			}
+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
+				$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
+			}
+			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+				$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
+			}
+			$out .= '<option value="0"'.((string) $selected == '0' ? ' selected' : '').'>'.$langs->trans('NorProspectNorCustomer').'</option>';
+		} elseif ($typeinput == 'list') {
+			$out .= '<option value="-1"'.(($selected == '' || $selected == '-1') ? ' selected' : '').'>&nbsp;</option>';
+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+				$out .= '<option value="2,3"'.($selected == '2,3' ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
+			}
+			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+				$out .= '<option value="1,3"'.($selected == '1,3' ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
+			}
+			$out .= '<option value="4"'.($selected == '4' ? ' selected' : '').'>'.$langs->trans('Supplier').'</option>';
+			$out .= '<option value="0"'.($selected == '0' ? ' selected' : '').'>'.$langs->trans('Other').'</option>';
+		} elseif ($typeinput == 'admin') {
+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
+				$out .= '<option value="3"'.($selected == 3 ? ' selected' : '').'>'.$langs->trans('ProspectCustomer').'</option>';
+			}
+			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+				$out .= '<option value="1"'.($selected == 1 ? ' selected' : '').'>'.$langs->trans('Customer').'</option>';
+			}
+		}
+		$out .= '</select>';
 
-    	return $out;
-    }
+		return $out;
+	}
 }
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 2235ac6b335..b2e32b8c063 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -58,9 +58,10 @@ class FormContract
 	 *	@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 select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1)
+    public function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
     {
         // phpcs:enable
 		global $db, $user, $conf, $langs;
@@ -69,7 +70,8 @@ class FormContract
 		if (!empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		// Search all contacts
-		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
+		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut,';
+		$sql .= ' c.ref_customer, c.ref_supplier';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'contrat as c';
 		$sql .= " WHERE c.entity = ".$conf->entity;
 		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
@@ -87,34 +89,37 @@ class FormContract
 		$sql .= " ORDER BY c.ref ";
 
 		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
 			if ($showempty) print '<option value="0">&nbsp;</option>';
-			$num = $db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
 			{
 				while ($i < $num)
 				{
-					$obj = $db->fetch_object($resql);
+					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
+
+						if ($showRef)
+						{
+							if ($obj->ref_customer) $labeltoshow = $labeltoshow." - ".$obj->ref_customer;
+							if ($obj->ref_supplier) $labeltoshow = $labeltoshow." - ".$obj->ref_supplier;
+						}
+
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							$disabled = 0;
 							if ($obj->statut == 0)
 							{
@@ -130,9 +135,7 @@ class FormContract
 							if ($hideunselectables && $disabled)
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -147,7 +150,7 @@ class FormContract
 				}
 			}
 			print '</select>';
-			$db->free($resql);
+			$this->db->free($resql);
 
 			if (!empty($conf->use_javascript_ajax))
 			{
@@ -157,10 +160,8 @@ class FormContract
 			}
 
 			return $num;
-		}
-		else
-		{
-			dol_print_error($db);
+		} else {
+			dol_print_error($this->db);
 			return -1;
 		}
     }
@@ -174,9 +175,10 @@ class FormContract
      *  @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)
+    public function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1, $showRef = 0)
     {
         global $langs;
 
@@ -184,7 +186,7 @@ class FormContract
         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);
+        $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.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php
new file mode 100644
index 00000000000..e8079b77ed6
--- /dev/null
+++ b/htdocs/core/class/html.formexpensereport.class.php
@@ -0,0 +1,136 @@
+<?php
+/* Copyright (C) 2012-2013  Charles-Fr BENKE		<charles.fr@benke.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/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ * \file       htdocs/core/class/html.formexpensereport.class.php
+ * \ingroup    core
+ * \brief      File of class with all html predefined components
+ */
+
+/**
+ *	Class to manage generation of HTML components for contract module
+ */
+class FormExpenseReport
+{
+    /**
+     * @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;
+    }
+
+
+    /**
+     *    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);
+
+    	print '<select class="flat" 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>';
+    }
+
+    /**
+     *  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 .= '<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;
+
+    		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;
+    }
+}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 46e85707497..464dbafa375 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -58,7 +58,7 @@ class FormFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show form to upload a new file.
 	 *
@@ -70,8 +70,8 @@ class FormFile
 	 *  @param  int			$size          	Length of input file area. Deprecated.
 	 *  @param	Object		$object			Object to use (when attachment is done on an element)
 	 *  @param	string		$options		Add an option column
-     *  @param  integer     $useajax        Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option).
-     *                                      Deprecated 2 should never be used and if 1 is used, option should no be enabled.
+	 *  @param  integer     $useajax        Use fileupload ajax (0=never, 1=if enabled, 2=always whatever is option).
+	 *                                      Deprecated 2 should never be used and if 1 is used, option should no be enabled.
 	 *  @param	string		$savingdocmask	Mask to use to define output filename. For example 'XXXXX-__YYYYMMDD__-__file__'
 	 *  @param	integer		$linkfiles		1=Also add form to link files, 0=Do not show form to link files
 	 *  @param	string		$htmlname		Name and id of HTML form ('formuserfile' by default, 'formuserfileecm' when used to upload a file in ECM)
@@ -83,14 +83,14 @@ class FormFile
 	 */
 	public function form_attach_new_file($url, $title = '', $addcancel = 0, $sectionid = 0, $perm = 1, $size = 50, $object = '', $options = '', $useajax = 1, $savingdocmask = '', $linkfiles = 1, $htmlname = 'formuserfile', $accept = '', $sectiondir = '', $usewithoutform = 0, $capture = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $hookmanager;
 		$hookmanager->initHooks(array('formfile'));
 
-        // Deprecation warning
-        if ($useajax == 2) {
-            dol_syslog(__METHOD__.": using 2 for useajax is deprecated and should be not used", LOG_WARNING);
-        }
+		// Deprecation warning
+		if ($useajax == 2) {
+			dol_syslog(__METHOD__.": using 2 for useajax is deprecated and should be not used", LOG_WARNING);
+		}
 
 		if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax = 0;
 
@@ -101,9 +101,7 @@ class FormFile
 			// TODO: This does not support option savingdocmask
 			// TODO: This break feature to upload links too
 			return $this->_formAjaxFileUpload($object);
-		}
-		else
-	   	{
+		} else {
 			//If there is no permission and the option to hide unauthorized actions is enabled, then nothing is printed
 			if (!$perm && !empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 				return 1;
@@ -116,15 +114,18 @@ class FormFile
 
 			if (empty($usewithoutform))		// Try to avoid this and set instead the form by the caller.
 			{
-    			$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
-    			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
-    			$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';
-    			$out .= '<input type="hidden" name="sortfield" value="'.GETPOST('sortfield', 'alpha').'">';
-    			$out .= '<input type="hidden" name="sortorder" value="'.GETPOST('sortorder', 'aZ09').'">';
+				// Add a param as GET parameter to detect when POST were cleaned by PHP because a file larger than post_max_size
+				$url .= (strpos($url, '?') === false ? '?' : '&').'uploadform=1';
+
+				$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
+				$out .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$out .= '<input type="hidden" id="'.$htmlname.'_section_dir" name="section_dir" value="'.$sectiondir.'">';
+				$out .= '<input type="hidden" id="'.$htmlname.'_section_id"  name="section_id" value="'.$sectionid.'">';
+				$out .= '<input type="hidden" name="sortfield" value="'.GETPOST('sortfield', 'aZ09comma').'">';
+				$out .= '<input type="hidden" name="sortorder" value="'.GETPOST('sortorder', 'aZ09').'">';
 			}
 
-			$out .= '<table class="nobordernopadding cenpercent">';
+			$out .= '<table class="nobordernopadding centpercent">';
 			$out .= '<tr>';
 
 			if (!empty($options)) $out .= '<td>'.$options.'</td>';
@@ -197,32 +198,33 @@ class FormFile
 					$out .= ' ';
 					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
 				}
-			}
-			else
-			{
+			} else {
 				$out .= ' ('.$langs->trans("UploadDisabled").')';
 			}
 			$out .= "</td></tr>";
 
 			if ($savingdocmask)
-            {
-            	//add a global variable for disable the auto renaming on upload
-                $rename = (empty($conf->global->MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT) ? 'checked' : '');
+			{
+				//add a global variable for disable the auto renaming on upload
+				$rename = (empty($conf->global->MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT) ? 'checked' : '');
 
-                $out .= '<tr>';
-   	            if (!empty($options)) $out .= '<td>'.$options.'</td>';
-	            $out .= '<td valign="middle" class="nowrap">';
-				$out .= '<input type="checkbox" '.$rename.' class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> '.$langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
-            	$out .= '</td>';
-            	$out .= '</tr>';
-            }
+				$out .= '<tr>';
+   				if (!empty($options)) $out .= '<td>'.$options.'</td>';
+				$out .= '<td valign="middle" class="nowrap">';
+				$out .= '<input type="checkbox" '.$rename.' class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> ';
+				$out .= '<span class="opacitymedium">';
+				$out .= $langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
+				$out .= '</span>';
+				$out .= '</td>';
+				$out .= '</tr>';
+			}
 
 			$out .= "</table>";
 
 			if (empty($usewithoutform))
 			{
-    			$out .= '</form>';
-	       		if (empty($sectionid)) $out .= '<br>';
+				$out .= '</form>';
+		   		if (empty($sectionid)) $out .= '<br>';
 			}
 
 			$out .= "\n</div><!-- End form attach new file -->\n";
@@ -236,10 +238,10 @@ class FormFile
 
 				if (empty($usewithoutform))
 				{
-    				$out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">'."\n";
-    				$out .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
-    				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">'."\n";
-    				$out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">'."\n";
+					$out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">'."\n";
+					$out .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+					$out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">'."\n";
+					$out .= '<input type="hidden" id="'.$htmlname.'_link_section_id"  name="link_section_id" value="'.$sectionid.'">'."\n";
 				}
 
 				$out .= '<div class="valignmiddle">';
@@ -261,8 +263,8 @@ class FormFile
 				$out .= '</div>';
 				if (empty($usewithoutform))
 				{
-    				$out .= '<div class="clearboth"></div>';
-                    $out .= '</form><br>';
+					$out .= '<div class="clearboth"></div>';
+					$out .= '</form><br>';
 				}
 
 				$out .= "\n</div><!-- End form link new url -->\n";
@@ -272,7 +274,7 @@ class FormFile
 			$res = $hookmanager->executeHooks('formattachOptions', $parameters, $object);
 			if (empty($res))
 			{
-			    print '<div class="'.($usewithoutform ? 'inline-block valignmiddle' : 'attacharea attacharea'.$htmlname).'">';
+				print '<div class="'.($usewithoutform ? 'inline-block valignmiddle' : 'attacharea attacharea'.$htmlname).'">';
 				print $out;
 				print '</div>';
 			}
@@ -282,7 +284,7 @@ class FormFile
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Show the box with list of available documents for object
 	 *
@@ -307,7 +309,7 @@ class FormFile
 	 */
 	public function show_documents($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed = 0, $modelselected = '', $allowgenifempty = 1, $forcenomultilang = 0, $iconPDF = 0, $notused = 0, $noform = 0, $param = '', $title = '', $buttonlabel = '', $codelang = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$this->numoffiles = 0;
 		print $this->showdocuments($modulepart, $modulesubdir, $filedir, $urlsource, $genallowed, $delallowed, $modelselected, $allowgenifempty, $forcenomultilang, $iconPDF, $notused, $noform, $param, $title, $buttonlabel, $codelang);
 		return $this->numoffiles;
@@ -425,262 +427,206 @@ class FormFile
 			{
 				$showempty = 1;
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
 					$modellist = ModeleThirdPartyDoc::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'propal')
+			} elseif ($modulepart == 'propal')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 					$modellist = ModelePDFPropales::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'supplier_proposal')
+			} elseif ($modulepart == 'supplier_proposal')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
 					$modellist = ModelePDFSupplierProposal::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'commande')
+			} elseif ($modulepart == 'commande')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 					$modellist = ModelePDFCommandes::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'expedition')
+			} elseif ($modulepart == 'expedition')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 					$modellist = ModelePDFExpedition::liste_modeles($this->db);
 				}
-			}
-            elseif ($modulepart == 'reception')
-            {
-                if (is_array($genallowed)) $modellist = $genallowed;
-                else
-                {
+			} elseif ($modulepart == 'reception')
+			{
+				if (is_array($genallowed)) $modellist = $genallowed;
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 					$modellist = ModelePdfReception::liste_modeles($this->db);
 				}
-            }
-			elseif ($modulepart == 'livraison')
+			} elseif ($modulepart == 'livraison')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
 					$modellist = ModelePDFDeliveryOrder::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'ficheinter')
+			} elseif ($modulepart == 'ficheinter')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 					$modellist = ModelePDFFicheinter::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'facture')
+			} elseif ($modulepart == 'facture')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 					$modellist = ModelePDFFactures::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'contract')
+			} elseif ($modulepart == 'contract')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 					$modellist = ModelePDFContract::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'project')
+			} elseif ($modulepart == 'project')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 					$modellist = ModelePDFProjects::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'project_task')
+			} elseif ($modulepart == 'project_task')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 					$modellist = ModelePDFTask::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'product')
+			} elseif ($modulepart == 'product')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
 					$modellist = ModelePDFProduct::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'product_batch')
+			} elseif ($modulepart == 'product_batch')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
 					$modellist = ModelePDFProductBatch::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'stock')
+			} elseif ($modulepart == 'stock')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
 					$modellist = ModelePDFStock::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'movement')
+			} elseif ($modulepart == 'movement')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
 					$modellist = ModelePDFMovement::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'export')
+			} elseif ($modulepart == 'export')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 					$modellist = ModeleExports::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
+			} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 					$modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
+			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 					$modellist = ModelePDFSuppliersInvoices::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'supplier_payment')
+			} elseif ($modulepart == 'supplier_payment')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 					$modellist = ModelePDFSuppliersPayments::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'remisecheque')
+			} elseif ($modulepart == 'remisecheque')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 					$modellist = ModeleChequeReceipts::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'donation')
+			} elseif ($modulepart == 'donation')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
 					$modellist = ModeleDon::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'member')
+			} elseif ($modulepart == 'member')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
 					$modellist = ModelePDFCards::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'agenda' || $modulepart == 'actions')
+			} elseif ($modulepart == 'agenda' || $modulepart == 'actions')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
 					$modellist = ModeleAction::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'expensereport')
+			} elseif ($modulepart == 'expensereport')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
 					$modellist = ModeleExpenseReport::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'unpaid')
+			} elseif ($modulepart == 'unpaid')
 			{
 				$modellist = '';
-			}
-			elseif ($modulepart == 'user')
+			} elseif ($modulepart == 'user')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
 					$modellist = ModelePDFUser::liste_modeles($this->db);
 				}
-			}
-			elseif ($modulepart == 'usergroup')
+			} elseif ($modulepart == 'usergroup')
 			{
 				if (is_array($genallowed)) $modellist = $genallowed;
-				else
-				{
+				else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
 					$modellist = ModelePDFUserGroup::liste_modeles($this->db);
 				}
-			}
-			else
-			{
-			    $submodulepart = $modulepart;
+			} else {
+				$submodulepart = $modulepart;
 
-			    // modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
-			    $tmp = explode(':', $modulepart);
-			    if (!empty($tmp[1])) {
-			    	$modulepart = $tmp[0];
-			    	$submodulepart = $tmp[1];
-			    }
+				// modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
+				$tmp = explode(':', $modulepart);
+				if (!empty($tmp[1])) {
+					$modulepart = $tmp[0];
+					$submodulepart = $tmp[1];
+				}
 
-			    // For normalized standard modules
+				// For normalized standard modules
 				$file = dol_buildpath('/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
 				if (file_exists($file))
 				{
@@ -688,7 +634,7 @@ class FormFile
 				}
 				// For normalized external modules.
 				else {
-				    $file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
+					$file = dol_buildpath('/'.$modulepart.'/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
 					$res = include_once $file;
 				}
 
@@ -697,9 +643,7 @@ class FormFile
 				if (class_exists($class))
 				{
 					$modellist = call_user_func($class.'::liste_modeles', $this->db);
-				}
-				else
-				{
+				} else {
 					dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments");
 					return -1;
 				}
@@ -743,9 +687,7 @@ class FormFile
 				{
 					$out .= ajax_combobox('model');
 				}
-			}
-			else
-			{
+			} else {
 				$out .= '<div class="float">'.$langs->trans("Files").'</div>';
 			}
 
@@ -758,9 +700,7 @@ class FormFile
 				$morecss = 'maxwidth150';
 				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';
 				$out .= $formadmin->select_language($defaultlang, 'lang_id', 0, null, 0, 0, 0, $morecss);
-			}
-			else
-			{
+			} else {
 				$out .= '&nbsp;';
 			}
 
@@ -896,9 +836,7 @@ class FormFile
 						{
 							$out .= $hookmanager->resPrint; // Complete line
 							$out .= '</tr>';
-						}
-						else
-						{
+						} else {
 							$out = $hookmanager->resPrint; // Replace all $out
 						}
 			  		}
@@ -984,9 +922,7 @@ class FormFile
 		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
 		{
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
-		}
-		else
-		{
+		} else {
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
 		}
 		$file_list = dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$'); // We also discard .meta and .png preview
@@ -1053,9 +989,7 @@ class FormFile
     			</dl>';
 
 			if (!$found) $out = '';
-		}
-		else
-		{
+		} else {
 			// TODO Add link to regenerate doc ?
 			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
 		}
@@ -1064,7 +998,7 @@ class FormFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show list of documents in $filearray (may be they are all in same directory but may not)
 	 *  This also sync database if $upload_dir is defined.
@@ -1099,7 +1033,7 @@ class FormFile
 	 */
 	public function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0, $disablecrop = -1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $hookmanager;
 		global $sortfield, $sortorder, $maxheightmini;
 		global $dolibarr_main_url_root;
@@ -1121,7 +1055,7 @@ class FormFile
 		// For backward compatiblity, we detect file stored into an old path
 		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
 		{
-		    $relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
+			$relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
 		}
 		// Defined relative dir to DOL_DATA_ROOT
 		$relativedir = '';
@@ -1153,9 +1087,7 @@ class FormFile
 		if (isset($reshook) && $reshook != '') // null or '' for bypass
 		{
 			return $reshook;
-		}
-		else
-		{
+		} else {
 			if (!is_object($form))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // The compoent may be included into ajax page that does not include the Form class
@@ -1276,11 +1208,9 @@ class FormFile
 						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']).'">';
 						$editline = 1;
-					}
-					else
-					{
+					} else {
 						$filenametoshow = preg_replace('/\.noexe$/', '', $file['name']);
-						print dol_trunc($filenametoshow, 200);
+						print dol_escape_htmltag(dol_trunc($filenametoshow, 200));
 						print '</a>';
 					}
 					// Preview link
@@ -1309,15 +1239,13 @@ class FormFile
 						print '<td class="center">';
 						if (image_format_supported($file['name']) >= 0)
 						{
-						    if ($useinecm == 5 || $useinecm == 6)
-						    {
-						        $smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image. TODO Change this it is slow on image dir.
-						    }
-						    else
-						    {
-						        $smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original
-						    }
-						    if (!dol_is_file($file['path'].'/'.$smallfile)) $smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+							if ($useinecm == 5 || $useinecm == 6)
+							{
+								$smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image. TODO Change this it is slow on image dir.
+							} else {
+								$smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original
+							}
+							if (!dol_is_file($file['path'].'/'.$smallfile)) $smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
 							//print $file['path'].'/'.$smallfile.'<br>';
 
 							$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
@@ -1327,10 +1255,9 @@ class FormFile
 							} else {
 								print '<a href="'.$urlforhref['url'].'" class="'.$urlforhref['css'].'" target="'.$urlforhref['target'].'" mime="'.$urlforhref['mime'].'">';
 							}
-							print '<img class="photo maxwidth200" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
+							print '<img class="photo maxwidth200 shadow" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
 							print '</a>';
-						}
-						else print '&nbsp;';
+						} else print '&nbsp;';
 						print '</td>';
 					}
 
@@ -1342,9 +1269,7 @@ class FormFile
 						{
 							print $langs->trans("FileSharedViaALink").' ';
 							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share'] ? ' checked="checked"' : '').' /> ';
-						}
-						else
-						{
+						} else {
 							if ($file['share'])
 							{
 								// Define $urlwithroot
@@ -1362,9 +1287,7 @@ class FormFile
 
 								print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
 								print '<input type="text" class="quatrevingtpercent minwidth200imp" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
-							}
-							else
-							{
+							} else {
 								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 							}
 						}
@@ -1417,7 +1340,7 @@ class FormFile
 							if (!empty($conf->dol_use_jmobile)) $useajax = 0;
 							if (empty($conf->use_javascript_ajax)) $useajax = 0;
 							if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax = 0;
-							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=delete&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
+							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=delete&token='.newToken().'&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
 						}
 						print "</td>";
 
@@ -1432,15 +1355,12 @@ class FormFile
 									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
 								}
 								print '</td>';
-							}
-							else {
+							} else {
 							   	print '<td'.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
 							   	print '</td>';
 							}
-					    }
-					}
-					else
-					{
+						}
+					} else {
 						print '<td class="right">';
 						print '<input type="hidden" name="ecmfileid" value="'.$filearray[$key]['rowid'].'">';
 						print '<input type="submit" class="button" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -1484,7 +1404,7 @@ class FormFile
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show list of documents in a directory
 	 *
@@ -1505,7 +1425,7 @@ class FormFile
 	 */
 	public function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload = 0, $relativepath = '', $permissiontodelete = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $url = '', $addfilterfields = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $form;
 		global $sortfield, $sortorder;
 		global $search_doc_ref;
@@ -1556,81 +1476,74 @@ class FormFile
 		{
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 			$object_instance = new Societe($this->db);
-		}
-		elseif ($modulepart == 'invoice')
+		} elseif ($modulepart == 'invoice')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$object_instance = new Facture($this->db);
-		}
-		elseif ($modulepart == 'invoice_supplier')
+		} elseif ($modulepart == 'invoice_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 			$object_instance = new FactureFournisseur($this->db);
-		}
-		elseif ($modulepart == 'propal')
+		} elseif ($modulepart == 'propal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$object_instance = new Propal($this->db);
-		}
-		elseif ($modulepart == 'supplier_proposal')
+		} elseif ($modulepart == 'supplier_proposal')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 			$object_instance = new SupplierProposal($this->db);
-		}
-		elseif ($modulepart == 'order')
+		} elseif ($modulepart == 'order')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$object_instance = new Commande($this->db);
-		}
-		elseif ($modulepart == 'order_supplier')
+		} elseif ($modulepart == 'order_supplier')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 			$object_instance = new CommandeFournisseur($this->db);
-		}
-		elseif ($modulepart == 'contract')
+		} elseif ($modulepart == 'contract')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 			$object_instance = new Contrat($this->db);
-		}
-		elseif ($modulepart == 'product')
+		} elseif ($modulepart == 'product')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$object_instance = new Product($this->db);
-		}
-		elseif ($modulepart == 'tax')
+		} elseif ($modulepart == 'tax')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 			$object_instance = new ChargeSociales($this->db);
-		}
-		elseif ($modulepart == 'project')
+		} elseif ($modulepart == 'project')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 			$object_instance = new Project($this->db);
-		}
-		elseif ($modulepart == 'fichinter')
+		} elseif ($modulepart == 'fichinter')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 			$object_instance = new Fichinter($this->db);
-		}
-		elseif ($modulepart == 'user')
+		} elseif ($modulepart == 'user')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 			$object_instance = new User($this->db);
-		}
-		elseif ($modulepart == 'expensereport')
+		} elseif ($modulepart == 'expensereport')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 			$object_instance = new ExpenseReport($this->db);
-		}
-		elseif ($modulepart == 'holiday')
+		} elseif ($modulepart == 'holiday')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 			$object_instance = new Holiday($this->db);
-		}
-		elseif ($modulepart == 'banque')
+		} elseif ($modulepart == 'recruitment-recruitmentcandidature')
 		{
-		    include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-		    $object_instance = new Account($this->db);
+			include_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
+			$object_instance = new RecruitmentCandidature($this->db);
+		} elseif ($modulepart == 'banque')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			$object_instance = new Account($this->db);
+		} elseif ($modulepart == 'mrp-mo')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
+			$object_instance = new Mo($this->db);
 		}
 
 		foreach ($filearray as $key => $file)
@@ -1647,16 +1560,27 @@ class FormFile
 				$id = 0; $ref = ''; $label = '';
 
 				// To show ref or specific information according to view to show (defined by $module)
+				$reg = array();
 				if ($modulepart == 'company' || $modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
 				elseif ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) { $id = $ref; $ref = ''; } }	// $ref may be also id with old supplier invoices
 				elseif ($modulepart == 'user' || $modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
-                elseif (in_array($modulepart, array('invoice', 'propal', 'supplier_proposal', 'order', 'order_supplier', 'contract', 'product', 'project', 'fichinter', 'expensereport', 'banque')))
-				{
+				elseif (in_array($modulepart, array(
+					'invoice',
+					'propal',
+					'supplier_proposal',
+					'order',
+					'order_supplier',
+					'contract',
+					'product',
+					'project',
+					'fichinter',
+					'expensereport',
+					'recruitment-recruitmentcandidature',
+					'mrp-mo',
+					'banque'))) {
 					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : '');
-				}
-				else
-				{
-				    //print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";
+				} else {
+					//print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";
 				}
 
 				if (!$id && !$ref) continue;
@@ -1664,9 +1588,7 @@ class FormFile
 				if (!empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
 				{
 					$found = 1;
-				}
-				else
-				{
+				} else {
 					//print 'Fetch '.$id." - ".$ref.'<br>';
 
 					if ($id) {
@@ -1726,7 +1648,7 @@ class FormFile
 				//if ($forcedownload) print '&attachment=1';
 				//print '&file='.urlencode($relativefile).'">';
 				//print img_view().'</a> &nbsp; ';
-				//if ($permissiontodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
+				//if ($permissiontodelete) print '<a href="'.$url.'?id='.$object->id.'&section='.$_REQUEST["section"].'&action=delete&token='.newToken().'&urlfile='.urlencode($file['name']).'">'.img_delete().'</a>';
 				//else print '&nbsp;';
 				print "</td></tr>\n";
 			}
@@ -1817,7 +1739,7 @@ class FormFile
 
 		print '<table width="100%" class="liste noborder nobottom">';
 		print '<tr class="liste_titre">';
-        print_liste_field_titre(
+		print_liste_field_titre(
 			$langs->trans("Links"),
 			$_SERVER['PHP_SELF'],
 			"name",
@@ -1826,20 +1748,20 @@ class FormFile
 			'',
 			$sortfield,
 			$sortorder,
-            ''
+			''
 		);
-        print_liste_field_titre(
+		print_liste_field_titre(
 			"",
 			"",
 			"",
 			"",
 			"",
 			'',
-            '',
-            '',
-            'right '
+			'',
+			'',
+			'right '
 		);
-        print_liste_field_titre(
+		print_liste_field_titre(
 			$langs->trans("Date"),
 			$_SERVER['PHP_SELF'],
 			"date",
@@ -1848,18 +1770,18 @@ class FormFile
 			'',
 			$sortfield,
 			$sortorder,
-            'center '
+			'center '
 		);
-        print_liste_field_titre(
+		print_liste_field_titre(
 			'',
 			$_SERVER['PHP_SELF'],
 			"",
 			"",
 			$param,
 			'',
-            '',
-            '',
-            'center '
+			'',
+			'',
+			'center '
 		);
 		print_liste_field_titre('', '', '');
 		print '</tr>';
@@ -1887,9 +1809,7 @@ class FormFile
 				print '<input type="submit" name="save" class="button" value="'.dol_escape_htmltag($langs->trans('Save')).'">';
 				print '<input type="submit" name="cancel" class="button" value="'.dol_escape_htmltag($langs->trans('Cancel')).'">';
 				print '</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>';
 				print img_picto('', 'globe').' ';
 				print '<a data-ajax="false" href="'.$link->url.'" target="_blank">';
@@ -1902,7 +1822,7 @@ class FormFile
 				print '<td class="right">';
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'" class="editfilelink editfielda reposition" >'.img_edit().'</a>'; // id= is included into $param
 				if ($permissiontodelete) {
-					print ' &nbsp; <a class="deletefilelink" href="'.$_SERVER['PHP_SELF'].'?action=delete&linkid='.$link->id.$param.'">'.img_delete().'</a>'; // id= is included into $param
+					print ' &nbsp; <a class="deletefilelink" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&linkid='.$link->id.$param.'">'.img_delete().'</a>'; // id= is included into $param
 				} else {
 					print '&nbsp;';
 				}
@@ -1950,8 +1870,7 @@ class FormFile
 				{
 					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
 					$out .= '<span class="fa fa-search-plus" style="color: gray"></span>';
-				}
-				else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+				} else $out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
 				$out .= '</a>';
 			}
 		}
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index 32a3488b939..dccbe50333a 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -80,32 +80,28 @@ class FormIntervention
 		}
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$out .= '<select id="interventionid" class="flat" name="'.$htmlname.'">';
 			if ($showempty) $out .= '<option value="0">&nbsp;</option>';
-			$num = $db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
 			{
 				while ($i < $num)
 				{
-					$obj = $db->fetch_object($resql);
+					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							$disabled = 0;
 							if (!$obj->fk_statut > 0)
 							{
@@ -121,9 +117,7 @@ class FormIntervention
 							if ($hideunselectables && $disabled)
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								$resultat .= '>'.$labeltoshow;
@@ -136,12 +130,10 @@ class FormIntervention
 				}
 			}
 			$out .= '</select>';
-			$db->free($resql);
+			$this->db->free($resql);
 			return $out;
-		}
-		else
-		{
-			dol_print_error($db);
+		} else {
+			dol_print_error($this->db);
 			return '';
 		}
 	}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f5408bceff1..e2749c5e183 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -37,75 +37,75 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 class FormMail extends Form
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
-     * @var int 1 = Include HTML form tag and show submit button
-     *          0 = Do not include form tag and submit button
-     *          -1 = Do not include form tag but include submit button
-     */
+	/**
+	 * @var int 1 = Include HTML form tag and show submit button
+	 *          0 = Do not include form tag and submit button
+	 *          -1 = Do not include form tag but include submit button
+	 */
 	public $withform;
 
-    /**
-     * @var string name from
-     */
+	/**
+	 * @var string name from
+	 */
 	public $fromname;
 
-    /**
-     * @var string email from
-     */
+	/**
+	 * @var string email from
+	 */
 	public $frommail;
 
-    /**
-     * @var string user, company, robot
-     */
-    public $fromtype;
+	/**
+	 * @var string user, company, robot
+	 */
+	public $fromtype;
 
-    /**
-     * @var int from ID
-     */
-    public $fromid;
+	/**
+	 * @var int from ID
+	 */
+	public $fromid;
 
-    /**
-     * @var int also from robot
-     */
-    public $fromalsorobot;
+	/**
+	 * @var int also from robot
+	 */
+	public $fromalsorobot;
 
-    /**
-     * @var string thirdparty etc
-     */
-    public $totype;
+	/**
+	 * @var string thirdparty etc
+	 */
+	public $totype;
 
-    /**
-     * @var int ID
-     */
-    public $toid;
+	/**
+	 * @var int ID
+	 */
+	public $toid;
 
-    /**
-     * @var string replyto name
-     */
-    public $replytoname;
+	/**
+	 * @var string replyto name
+	 */
+	public $replytoname;
 
-    /**
-     * @var string replyto email
-     */
+	/**
+	 * @var string replyto email
+	 */
 	public $replytomail;
 
-    /**
-     * @var string to name
-     */
+	/**
+	 * @var string to name
+	 */
 	public $toname;
 
-    /**
-     * @var string to email
-     */
+	/**
+	 * @var string to email
+	 */
 	public $tomail;
 
-    /**
-     * @var string trackid
-     */
+	/**
+	 * @var string trackid
+	 */
 	public $trackid;
 
 	public $withsubstit; // Show substitution array
@@ -180,7 +180,7 @@ class FormMail extends Form
 		$this->withfckeditor = -1; // -1 = Auto
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Clear list of attached files in send mail form (also stored in session)
 	 *
@@ -188,7 +188,7 @@ class FormMail extends Form
 	 */
 	public function clear_attached_files()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -203,7 +203,7 @@ class FormMail extends Form
 		unset($_SESSION["listofmimes".$keytoavoidconflict]);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Add a file into the list of attached files (stored in SECTION array)
 	 *
@@ -214,7 +214,7 @@ class FormMail extends Form
 	 */
 	public function add_attached_files($path, $file = '', $type = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$listofpaths = array();
 		$listofnames = array();
 		$listofmimes = array();
@@ -237,7 +237,7 @@ class FormMail extends Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Remove a file from the list of attached files (stored in SECTION array)
 	 *
@@ -246,7 +246,7 @@ class FormMail extends Form
 	 */
 	public function remove_attached_files($keytodelete)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$listofpaths = array();
 		$listofnames = array();
 		$listofmimes = array();
@@ -267,7 +267,7 @@ class FormMail extends Form
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return list of attached files (stored in SECTION array)
 	 *
@@ -275,7 +275,7 @@ class FormMail extends Form
 	 */
 	public function get_attached_files()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$listofpaths = array();
 		$listofnames = array();
 		$listofmimes = array();
@@ -287,7 +287,7 @@ class FormMail extends Form
 		return array('paths'=>$listofpaths, 'names'=>$listofnames, 'mimes'=>$listofmimes);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show the form to input an email
 	 *  this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
@@ -299,11 +299,11 @@ class FormMail extends Form
 	 */
 	public function show_form($addfileaction = 'addfile', $removefileaction = 'removefile')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		print $this->get_form($addfileaction, $removefileaction);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Get the form to input an email
 	 *  this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
@@ -316,13 +316,17 @@ class FormMail extends Form
 	 */
 	public function get_form($addfileaction = 'addfile', $removefileaction = 'removefile')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $user, $hookmanager, $form;
 
+		// Required to show preview of mail attachments
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+		$formfile = new Formfile($this->db);
+
 		if (!is_object($form)) $form = new Form($this->db);
 
 		// Load translation files required by the page
-        $langs->loadLangs(array('other', 'mails'));
+		$langs->loadLangs(array('other', 'mails'));
 
 		// Clear temp files. Must be done at beginning, before call of triggers
 		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
@@ -343,9 +347,7 @@ class FormMail extends Form
 		if (!empty($reshook))
 		{
 			return $hookmanager->resPrint;
-		}
-		else
-		{
+		} else {
 			$out = '';
 
 			$disablebademails = 1;
@@ -416,7 +418,11 @@ class FormMail extends Form
 			}
 			foreach ($this->param as $key=>$value)
 			{
-				$out .= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+				if (is_array($value)) {
+					$out .= "<!-- param key=".$key." is array, we do not output input filed for it -->\n";
+				} else {
+					$out .= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+				}
 			}
 
 			$modelmail_array = array();
@@ -434,9 +440,7 @@ class FormMail extends Form
 					if (preg_match('/\((.*)\)/', $line->label, $reg))
 					{
 						$modelmail_array[$line->id] = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
-					}
-					else
-					{
+					} else {
 						$modelmail_array[$line->id] = $line->label;
 					}
 					if ($line->lang) $modelmail_array[$line->id] .= ' ('.$line->lang.')';
@@ -459,8 +463,8 @@ class FormMail extends Form
 			} elseif (!empty($this->param['models']) && in_array($this->param['models'], array(
 					'propal_send', 'order_send', 'facture_send',
 					'shipping_send', 'fichinter_send', 'supplier_proposal_send', 'order_supplier_send',
-					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'all'
-                )))
+					'invoice_supplier_send', 'thirdparty', 'contract', 'user', 'recruitmentcandidature_send', 'all'
+				)))
 			{
 				// If list of template is empty
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
@@ -470,10 +474,11 @@ class FormMail extends Form
 				$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" disabled="disabled" id="modelselected">';
 				$out .= ' &nbsp; ';
 				$out .= '</div>';
+			} else {
+				$out .= '<!-- No template available for $this->param["models"] = '.$this->param['models'].' -->';
 			}
 
 
-
 			$out .= '<table class="tableforemailform boxtablenotop" width="100%">'."\n";
 
 			// Substitution array/string
@@ -481,7 +486,7 @@ class FormMail extends Form
 			if (is_array($this->substit) && count($this->substit)) $helpforsubstitution .= $langs->trans('AvailableVariables').' :<br>'."\n";
 			foreach ($this->substit as $key => $val)
 			{
-				$helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';
+				$helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag(dolGetFirstLineOfText($val))).'<br>';
 			}
 			if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
 			{
@@ -519,9 +524,7 @@ class FormMail extends Form
 						if ($this->frommail)
 						{
 							$out .= ' &lt;'.$this->frommail.'&gt;';
-						}
-						else
-						{
+						} else {
 							if ($this->fromtype)
 							{
 								$langs->load('errors');
@@ -536,9 +539,7 @@ class FormMail extends Form
 						{
 							$langs->load('errors');
 							$liste['user'] = $user->getFullName($langs).' &lt;'.$langs->trans('ErrorNoMailDefinedForThisUser').'&gt;';
-						}
-						else
-						{
+						} else {
 							$liste['user'] = $user->getFullName($langs).' &lt;'.$user->email.'&gt;';
 						}
 
@@ -579,8 +580,7 @@ class FormMail extends Form
 								}
 								$i++;
 							}
-						}
-						else dol_print_error($this->db);
+						} else dol_print_error($this->db);
 
 						foreach ($listaliases as $typealias => $listalias)
 						{
@@ -615,9 +615,7 @@ class FormMail extends Form
 					}
 
 					$out .= "</td></tr>\n";
-				}
-				else
-				{
+				} else {
 					$out .= '<tr><td class="fieldrequired width200">'.$langs->trans("MailFrom")."</td><td>";
 					$out .= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" class="maxwidth200onsmartphone" value="'.$this->fromname.'" />';
 					$out .= '&nbsp; &nbsp; ';
@@ -644,35 +642,28 @@ class FormMail extends Form
 							$soc = new Societe($this->db);
 							$soc->fetch($this->toid);
 							$out .= $soc->getNomUrl(1);
-						}
-						elseif ($this->totype == 'contact')
+						} elseif ($this->totype == 'contact')
 						{
 							$contact = new Contact($this->db);
 							$contact->fetch($this->toid);
 							$out .= $contact->getNomUrl(1);
-						}
-						else
-						{
+						} else {
 							$out .= $this->toname;
 						}
 						$out .= ' &lt;'.$this->tomail.'&gt;';
 						if ($this->withtofree)
 						{
-							$out .= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "").'" />';
+							$out .= '<br>'.$langs->trans("and").' <input class="minwidth200" id="sendto" name="sendto" value="'.(!is_array($this->withto) && !is_numeric($this->withto) ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "").'" />';
 						}
-					}
-					else
-					{
+					} else {
 						// Note withto may be a text like 'AllRecipientSelected'
 						$out .= (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
 					}
-				}
-				else
-				{
+				} else {
 					// The free input of email
 					if (!empty($this->withtofree))
 					{
-						$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (isset($_REQUEST["sendto"]) ? $_REQUEST["sendto"] : $this->withto) : "")).'" />';
+						$out .= '<input class="minwidth200" id="sendto" name="sendto" value="'.(($this->withtofree && !is_numeric($this->withtofree)) ? $this->withtofree : (!is_array($this->withto) && !is_numeric($this->withto) ? (GETPOSTISSET("sendto") ? GETPOST("sendto") : $this->withto) : "")).'" />';
 					}
 					// The select combo
 					if (!empty($this->withto) && is_array($this->withto))
@@ -684,7 +675,9 @@ class FormMail extends Form
 						{
 							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
-						$withtoselected = GETPOST("receiver", 'none'); // Array of selected value
+
+						$withtoselected = GETPOST("receiver", 'array'); // Array of selected value
+
 						if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')
 						{
 							$withtoselected = array_keys($tmparray);
@@ -708,7 +701,7 @@ class FormMail extends Form
 				{
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
-				$withtoselected = GETPOST("receiveruser", 'none'); // Array of selected value
+				$withtoselected = GETPOST("receiveruser", 'array'); // Array of selected value
 				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')
 				{
 					$withtoselected = array_keys($tmparray);
@@ -741,10 +734,8 @@ class FormMail extends Form
 				if ($this->withtoccreadonly)
 				{
 					$out .= (!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : "";
-				}
-				else
-				{
-				    $out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
+				} else {
+					$out .= '<input class="minwidth200" id="sendtocc" name="sendtocc" value="'.(GETPOST("sendtocc", "alpha") ? GETPOST("sendtocc", "alpha") : ((!is_array($this->withtocc) && !is_numeric($this->withtocc)) ? $this->withtocc : '')).'" />';
 					if (!empty($this->withtocc) && is_array($this->withtocc))
 					{
 						$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
@@ -754,7 +745,7 @@ class FormMail extends Form
 						{
 							$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 						}
-						$withtoccselected = GETPOST("receivercc"); // Array of selected value
+						$withtoccselected = GETPOST("receivercc", 'array'); // Array of selected value
 						$out .= $form->multiselectarray("receivercc", $tmparray, $withtoccselected, null, null, 'inline-block minwidth500', null, "");
 					}
 				}
@@ -774,7 +765,7 @@ class FormMail extends Form
 				{
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
-				$withtoselected = GETPOST("receiverccuser", 'none'); // Array of selected value
+				$withtoselected = GETPOST("receiverccuser", 'array'); // Array of selected value
 				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action', 'aZ09') == 'presend')
 				{
 					$withtoselected = array_keys($tmparray);
@@ -865,7 +856,10 @@ class FormMail extends Form
 						foreach ($listofpaths as $key => $val)
 						{
 							$out .= '<div id="attachfile_'.$key.'">';
+							// Preview of attachment
+							preg_match('#^(/)(\w+)(/)(.+)$#', substr($val, (strlen(DOL_DATA_ROOT) - strlen($val))), $formfile_params);
 							$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
+							$out .= $formfile->showPreview(array(), $formfile_params[2], $formfile_params[4]);
 							if (!$this->withfilereadonly)
 							{
 								$out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
@@ -873,8 +867,7 @@ class FormMail extends Form
 							}
 							$out .= '<br></div>';
 						}
-					}
-					elseif (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
+					} elseif (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
 					{
 						$out .= $langs->trans("NoAttachedFiles").'<br>';
 					}
@@ -885,9 +878,7 @@ class FormMail extends Form
 						$out .= ' ';
 						$out .= '<input class="button" type="submit" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
 					}
-				}
-				else
-				{
+				} else {
 					$out .= $this->withfile;
 				}
 
@@ -897,7 +888,7 @@ class FormMail extends Form
 			// Message
 			if (!empty($this->withbody))
 			{
-				$defaultmessage = GETPOST('message', 'none');
+				$defaultmessage = GETPOST('message', 'restricthtml');
 				if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1')
 				{
 					if ($arraydefaultmessage && $arraydefaultmessage->content) {
@@ -912,9 +903,7 @@ class FormMail extends Form
 				if (empty($this->substit['__REF__']))
 				{
 					$paymenturl = '';
-				}
-				else
-				{
+				} else {
 					// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 					$langs->loadLangs(array('paypal', 'other'));
@@ -933,13 +922,13 @@ class FormMail extends Form
 					$langs->load('other');
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = str_replace('\n', "\n", $langs->transnoentities("PredefinedMailContentLink", $paymenturl));
 					$this->substit['__ONLINE_PAYMENT_URL__'] = $paymenturl;
-				}
-				else
-				{
+				} else {
 					$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = '';
 					$this->substit['__ONLINE_PAYMENT_URL__'] = '';
 				}
 
+				$this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'] = '';
+
 				// Add lines substitution key from each line
 				$lines = '';
 				$defaultlines = $arraydefaultmessage->content_lines;
@@ -962,24 +951,26 @@ class FormMail extends Form
 				if (strpos($defaultmessage, '__ONLINE_PAYMENT_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
 					$atleastonecomponentishtml++;
 				}
+				if (strpos($defaultmessage, '__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__') !== false && dol_textishtml($this->substit['__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__'])) {
+					$atleastonecomponentishtml++;
+				}
 				if (dol_textishtml($defaultmessage)) {
 					$atleastonecomponentishtml++;
 				}
 				if ($atleastonecomponentishtml) {
-					if (! dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
+					if (!dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
 						$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
 					}
-					if (! dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
+					if (!dol_textishtml($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'])) {
 						$this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__'] = dol_nl2br($this->substit['__ONLINE_PAYMENT_TEXT_AND_URL__']);
 					}
-					if (! dol_textishtml($defaultmessage)) {
+					if (!dol_textishtml($defaultmessage)) {
 						$defaultmessage = dol_nl2br($defaultmessage);
 					}
 				}
 
 				if (GETPOSTISSET("message") && !$_POST['modelselected']) $defaultmessage = $_POST["message"];
-				else
-				{
+				else {
 					$defaultmessage = make_substitutions($defaultmessage, $this->substit);
 					// Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
 					$defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
@@ -995,9 +986,7 @@ class FormMail extends Form
 				{
 					$out .= nl2br($defaultmessage);
 					$out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
-				}
-				else
-				{
+				} else {
 					if (!isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
 
 					// Editor wysiwyg
@@ -1073,7 +1062,7 @@ class FormMail extends Form
 		if (!empty($this->withtocccreadonly)) {
 			$out .= (!is_array($this->withtoccc) && !is_numeric($this->withtoccc)) ? $this->withtoccc : "";
 		} else {
-		    $out .= '<input class="minwidth200" id="sendtoccc" name="sendtoccc" value="'.(GETPOST("sendtoccc", "alpha") ? GETPOST("sendtoccc", "alpha") : ((!is_array($this->withtoccc) && !is_numeric($this->withtoccc)) ? $this->withtoccc : '')).'" />';
+			$out .= '<input class="minwidth200" id="sendtoccc" name="sendtoccc" value="'.(GETPOSTISSET("sendtoccc") ? GETPOST("sendtoccc", "alpha") : ((!is_array($this->withtoccc) && !is_numeric($this->withtoccc)) ? $this->withtoccc : '')).'" />';
 			if (!empty($this->withtoccc) && is_array($this->withtoccc)) {
 				$out .= " ".$langs->trans("and")."/".$langs->trans("or")." ";
 				// multiselect array convert html entities into options tags, even if we dont want this, so we encode them a second time
@@ -1081,7 +1070,7 @@ class FormMail extends Form
 				foreach ($tmparray as $key => $val) {
 					$tmparray[$key] = dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
 				}
-				$withtocccselected = GETPOST("receiverccc"); // Array of selected value
+				$withtocccselected = GETPOST("receiverccc", 'array'); // Array of selected value
 				$out .= $form->multiselectarray("receiverccc", $tmparray, $withtocccselected, null, null, null, null, "90%");
 			}
 		}
@@ -1157,7 +1146,7 @@ class FormMail extends Form
 	{
 		global $conf, $langs, $form;
 
-		$defaulttopic = GETPOST('subject', 'none');
+		$defaulttopic = GETPOST('subject', 'restricthtml');
 		if (!GETPOST('modelselected', 'alpha') || GETPOST('modelmailselected') != '-1') {
 			if ($arraydefaultmessage && $arraydefaultmessage->topic) {
 				$defaulttopic = $arraydefaultmessage->topic;
@@ -1198,7 +1187,7 @@ class FormMail extends Form
 	 */
 	public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '')
 	{
-        $ret = new ModelMail();
+		$ret = new ModelMail();
 
 		if ($id == -2 && empty($label)) {
 			$this->error = 'LabelIsMandatoryWhenIdIs-2';
@@ -1240,26 +1229,42 @@ class FormMail extends Form
 				$ret->content = $obj->content;
 				$ret->content_lines = $obj->content_lines;
 				$ret->joinfiles = $obj->joinfiles;
-			}
-			elseif ($id == -2) {
+			} elseif ($id == -2) {
 				// Not found with the provided label
 				return -1;
-			}
-			else {	// If there is no template at all
+			} else {	// If there is no template at all
 				$defaultmessage = '';
-				if ($type_template == 'body') { $defaultmessage = $this->withbody; }		// Special case to use this->withbody as content
-				elseif ($type_template == 'facture_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
-				elseif ($type_template == 'facture_relance') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-				elseif ($type_template == 'propal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal"); }
-				elseif ($type_template == 'supplier_proposal_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal"); }
-				elseif ($type_template == 'order_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder"); }
-				elseif ($type_template == 'order_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-				elseif ($type_template == 'invoice_supplier_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-				elseif ($type_template == 'shipping_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping"); }
-				elseif ($type_template == 'fichinter_send') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
-				elseif ($type_template == 'thirdparty') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
-				elseif ($type_template == 'user') { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser"); }
-				elseif (!empty($type_template)) { $defaultmessage = $outputlangs->transnoentities("PredefinedMailContentGeneric"); }
+
+				if ($type_template == 'body') {
+					// Special case to use this->withbody as content
+					$defaultmessage = $this->withbody;
+				} elseif ($type_template == 'facture_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoice");
+				} elseif ($type_template == 'facture_relance') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendInvoiceReminder");
+				} elseif ($type_template == 'propal_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendProposal");
+				} elseif ($type_template == 'supplier_proposal_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierProposal");
+				} elseif ($type_template == 'order_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendOrder");
+				} elseif ($type_template == 'order_supplier_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierOrder");
+				} elseif ($type_template == 'invoice_supplier_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendSupplierInvoice");
+				} elseif ($type_template == 'shipping_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendShipping");
+				} elseif ($type_template == 'fichinter_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendFichInter");
+				} elseif ($type_template == 'actioncomm_send') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentSendActionComm");
+				} elseif ($type_template == 'thirdparty') {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentThirdparty");
+			    } elseif ($type_template == 'user') {
+			    	$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentUser");
+				} elseif (!empty($type_template)) {
+					$defaultmessage = $outputlangs->transnoentities("PredefinedMailContentGeneric");
+				}
 
 				$ret->label = 'default';
 				$ret->lang = $outputlangs->defaultlang;
@@ -1271,9 +1276,7 @@ class FormMail extends Form
 
 			$db->free($resql);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
@@ -1290,14 +1293,12 @@ class FormMail extends Form
 	 */
 	public function isEMailTemplate($type_template, $user, $outputlangs)
 	{
-		$ret = array();
-
 		$sql = "SELECT label, topic, content, lang";
 		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql .= " WHERE type_template='".$this->db->escape($type_template)."'";
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql .= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
-		if (is_object($outputlangs)) $sql .= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
+		if (is_object($outputlangs)) $sql .= " AND (lang = '".$this->db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";
 		$sql .= $this->db->order("lang,label", "ASC");
 		//print $sql;
 
@@ -1307,9 +1308,7 @@ class FormMail extends Form
 			$num = $this->db->num_rows($resql);
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
@@ -1327,15 +1326,13 @@ class FormMail extends Form
 	 */
 	public function fetchAllEMailTemplate($type_template, $user, $outputlangs, $active = 1)
 	{
-		$ret = array();
-
 		$sql = "SELECT rowid, label, topic, content, content_lines, lang, fk_user, private, position";
 		$sql .= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
 		$sql .= " WHERE type_template IN ('".$this->db->escape($type_template)."', 'all')";
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql .= " AND (private = 0 OR fk_user = ".$user->id.")"; // See all public templates or templates I own.
 		if ($active >= 0) $sql .= " AND active = ".$active;
-		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";	// Return all languages
+		//if (is_object($outputlangs)) $sql.= " AND (lang = '".$this->db->escape($outputlangs->defaultlang)."' OR lang IS NULL OR lang = '')";	// Return all languages
 		$sql .= $this->db->order("position,lang,label", "ASC");
 		//print $sql;
 
@@ -1361,9 +1358,7 @@ class FormMail extends Form
 			}
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			$this->error = get_class($this).' '.__METHOD__.' ERROR:'.$this->db->lasterror();
 			return -1;
 		}
@@ -1381,7 +1376,7 @@ class FormMail extends Form
 	 */
 	public function setSubstitFromObject($object, $outputlangs)
 	{
-		global $conf, $user;
+		global $conf, $user, $extrafields;
 
 		$parameters = array();
 		$tmparray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
@@ -1493,9 +1488,7 @@ class FormMail extends Form
 					if ($conf->commande->enabled) $tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					if ($conf->contrat->enabled)  $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 				}
-			}
-			else
-			{
+			} else {
 				/* No need to show into tooltip help, option is not enabled
 				$vars['__SECUREKEYPAYMENT__']='';
 				$vars['__SECUREKEYPAYMENT_MEMBER__']='';
@@ -1527,9 +1520,9 @@ class ModelMail
 	public $id;
 
 	/**
-     * @var string Model mail label
-     */
-    public $label;
+	 * @var string Model mail label
+	 */
+	public $label;
 
 	public $topic;
 	public $content;
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 83923ffa6c7..cf159819764 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -87,7 +87,7 @@ class FormMargin
 			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-				$product = new ProductFournisseur($db);
+				$product = new ProductFournisseur($this->db);
 				if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
 					$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
 			}
@@ -118,8 +118,7 @@ class FormMargin
 					//}
 					//else
 						$marginInfos['margin_on_products'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] += $pa;
@@ -129,13 +128,11 @@ class FormMargin
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
 					//else
 						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
 					$marginInfos['pa_total'] += $pa;
 					$marginInfos['pv_total'] += $pv;
 				}
-			}
-			else {
+			} else {
 				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
 				if ($type == 0) {  // product
 					$marginInfos['pa_products'] += $pa;
@@ -151,8 +148,7 @@ class FormMargin
 					//{
 					    $marginInfos['margin_on_products'] += $pv - $pa;
 					//}
-				}
-				elseif ($type == 1) {  // service
+				} elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] += $pa;
@@ -208,7 +204,7 @@ class FormMargin
 		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 = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
+	        $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>';
 
@@ -228,8 +224,7 @@ class FormMargin
 		print '<td class="liste_titre right">'.$langs->trans('SellingPrice').'</td>';
 		if ($conf->global->MARGIN_TYPE == "1")
 			print '<td class="liste_titre right">'.$langs->trans('BuyingPrice').'</td>';
-		else
-			print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
+		else print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
 		print '<td class="liste_titre right">'.$langs->trans('Margin').'</td>';
 		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 			print '<td class="liste_titre right">'.$langs->trans('MarginRate').'</td>';
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 726ea5feb78..ba2406f4b70 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -38,723 +38,693 @@
  */
 class FormOther
 {
-    private $db;
+	private $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error;
 
 
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return HTML select list of export models
-     *
-     *    @param    string	$selected          Id modele pre-selectionne
-     *    @param    string	$htmlname          Nom de la zone select
-     *    @param    string	$type              Type des modeles recherches
-     *    @param    int		$useempty          Show an empty value in list
-     *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
-     *    @return	void
-     */
-    public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)
-    {
-        // phpcs:enable
-        global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return HTML select list of export models
+	 *
+	 *    @param    string	$selected          Id modele pre-selectionne
+	 *    @param    string	$htmlname          Nom de la zone select
+	 *    @param    string	$type              Type des modeles recherches
+	 *    @param    int		$useempty          Show an empty value in list
+	 *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
+	 *    @return	void
+	 */
+	public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-    	$sql = "SELECT rowid, label, fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."export_model";
-        $sql .= " WHERE type = '".$this->db->escape($type)."'";
+		$sql = "SELECT rowid, label, fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
+		$sql .= " WHERE type = '".$this->db->escape($type)."'";
 		if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
-        $sql .= " ORDER BY label";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty)
-            {
-                print '<option value="-1">&nbsp;</option>';
-            }
+		$sql .= " ORDER BY label";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty)
+			{
+				print '<option value="-1">&nbsp;</option>';
+			}
 
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $label = $obj->label;
-                if ($obj->fk_user == 0) {
-                	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                }
-                elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
-                	$tmpuser = new User($this->db);
-                	$tmpuser->fetch($obj->fk_user);
-                	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
-                }
+				$label = $obj->label;
+				if ($obj->fk_user == 0) {
+					$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
+				} elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+					$tmpuser = new User($this->db);
+					$tmpuser->fetch($obj->fk_user);
+					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
+				}
 
-                if ($selected == $obj->rowid)
-                {
-                    print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                }
-                else
-                {
-                    print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
-                }
-                print $label;
-                print '</option>';
-                $i++;
-            }
-            print "</select>";
-            print ajax_combobox($htmlname);
-        }
-        else {
-            dol_print_error($this->db);
-        }
-    }
+				if ($selected == $obj->rowid)
+				{
+					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
+				} else {
+					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
+				}
+				print $label;
+				print '</option>';
+				$i++;
+			}
+			print "</select>";
+			print ajax_combobox($htmlname);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of export models
-     *
-     *    @param    string	$selected          Id modele pre-selectionne
-     *    @param    string	$htmlname          Nom de la zone select
-     *    @param    string	$type              Type des modeles recherches
-     *    @param    int		$useempty          Affiche valeur vide dans liste
-     *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
-     *    @return	void
-     */
-    public function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0, $fk_user = null)
-    {
-        // phpcs:enable
-    	global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of export models
+	 *
+	 *    @param    string	$selected          Id modele pre-selectionne
+	 *    @param    string	$htmlname          Nom de la zone select
+	 *    @param    string	$type              Type des modeles recherches
+	 *    @param    int		$useempty          Affiche valeur vide dans liste
+	 *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
+	 *    @return	void
+	 */
+	public function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0, $fk_user = null)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-        $sql = "SELECT rowid, label, fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."import_model";
-        $sql .= " WHERE type = '".$this->db->escape($type)."'";
-        if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
-        $sql .= " ORDER BY rowid";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty)
-            {
-                print '<option value="-1">&nbsp;</option>';
-            }
+		$sql = "SELECT rowid, label, fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."import_model";
+		$sql .= " WHERE type = '".$this->db->escape($type)."'";
+		if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
+		$sql .= " ORDER BY rowid";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty)
+			{
+				print '<option value="-1">&nbsp;</option>';
+			}
 
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $label = $obj->label;
-                if ($obj->fk_user == 0) {
-                	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                }
-                elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
-                	$tmpuser = new User($this->db);
-                	$tmpuser->fetch($obj->fk_user);
-                	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
-                }
+				$label = $obj->label;
+				if ($obj->fk_user == 0) {
+					$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
+				} elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+					$tmpuser = new User($this->db);
+					$tmpuser->fetch($obj->fk_user);
+					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
+				}
 
-                if ($selected == $obj->rowid)
-                {
-                    print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                }
-                else
-                {
-                    print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
-                }
-                print $label;
-                print '</option>';
-                $i++;
-            }
-            print "</select>";
-            print ajax_combobox($htmlname);
-        }
-        else {
-            dol_print_error($this->db);
-        }
-    }
+				if ($selected == $obj->rowid)
+				{
+					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
+				} else {
+					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
+				}
+				print $label;
+				print '</option>';
+				$i++;
+			}
+			print "</select>";
+			print ajax_combobox($htmlname);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of ecotaxes with label
-     *
-     *    @param	string	$selected   Preselected ecotaxes
-     *    @param    string	$htmlname	Name of combo list
-     *    @return	integer
-     */
-    public function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of ecotaxes with label
+	 *
+	 *    @param	string	$selected   Preselected ecotaxes
+	 *    @param    string	$htmlname	Name of combo list
+	 *    @return	integer
+	 */
+	public function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')
+	{
+		// phpcs:enable
+		global $langs;
 
-        $sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";
-        $sql .= " c.label as country";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
-        $sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
-        $sql .= " ORDER BY country, e.organization ASC, e.code ASC";
+		$sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";
+		$sql .= " c.label as country";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
+		$sql .= " ORDER BY country, e.organization ASC, e.code ASC";
 
-    	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            print '<select class="flat" name="'.$htmlname.'">';
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            print '<option value="-1">&nbsp;</option>'."\n";
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $this->db->fetch_object($resql);
-                    if ($selected && $selected == $obj->rowid)
-                    {
-                        print '<option value="'.$obj->rowid.'" selected>';
-                    }
-                    else
-                    {
-                        print '<option value="'.$obj->rowid.'">';
-                        //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
-                    }
-                    $selectOptionValue = $obj->code.' - '.$obj->label.' : '.price($obj->price).' '.$langs->trans("HT").' ('.$obj->organization.')';
-                    print $selectOptionValue;
-                    print '</option>';
-                    $i++;
-                }
-            }
-            print '</select>';
-            return 0;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return 1;
-        }
-    }
+		dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			print '<select class="flat" name="'.$htmlname.'">';
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			print '<option value="-1">&nbsp;</option>'."\n";
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					if ($selected && $selected == $obj->rowid)
+					{
+						print '<option value="'.$obj->rowid.'" selected>';
+					} else {
+						print '<option value="'.$obj->rowid.'">';
+						//print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
+					}
+					$selectOptionValue = $obj->code.' - '.$obj->label.' : '.price($obj->price).' '.$langs->trans("HT").' ('.$obj->organization.')';
+					print $selectOptionValue;
+					print '</option>';
+					$i++;
+				}
+			}
+			print '</select>';
+			return 0;
+		} else {
+			dol_print_error($this->db);
+			return 1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of revenue stamp for country
-     *
-     *    @param	string	$selected   	Value of preselected revenue stamp
-     *    @param    string	$htmlname   	Name of combo list
-     *    @param    string	$country_code   Country Code
-     *    @return	string					HTML select list
-     */
-    public function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')
-    {
-        // phpcs:enable
-    	global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of revenue stamp for country
+	 *
+	 *    @param	string	$selected   	Value of preselected revenue stamp
+	 *    @param    string	$htmlname   	Name of combo list
+	 *    @param    string	$country_code   Country Code
+	 *    @return	string					HTML select list
+	 */
+	public function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')
+	{
+		// phpcs:enable
+		global $langs;
 
-    	$out = '';
+		$out = '';
 
-    	$sql = "SELECT r.taux, r.revenuestamp_type";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
-    	$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
-    	$sql .= " AND c.code = '".$country_code."'";
+		$sql = "SELECT r.taux, r.revenuestamp_type";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
+		$sql .= " AND c.code = '".$this->db->escape($country_code)."'";
 
-    	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$out .= '<select class="flat" name="'.$htmlname.'">';
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
-    		$out .= '<option value="0">&nbsp;</option>'."\n";
-    		if ($num)
-    		{
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($resql);
-    				if (($selected && $selected == $obj->taux) || $num == 1)
-    				{
-    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
-    				}
-    				else
-    				{
-    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
-    					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
-    				}
-    				$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
-    				$out .= '</option>';
-    				$i++;
-    			}
-    		}
-    		$out .= '</select>';
-    		return $out;
-    	}
-    	else
-    	{
-    		dol_print_error($this->db);
-    		return '';
-    	}
-    }
+		dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$out .= '<select class="flat" name="'.$htmlname.'">';
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			$out .= '<option value="0">&nbsp;</option>'."\n";
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					if (($selected && $selected == $obj->taux) || $num == 1)
+					{
+						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
+					} else {
+						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
+						//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
+					}
+					$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
+					$out .= '</option>';
+					$i++;
+				}
+			}
+			$out .= '</select>';
+			return $out;
+		} else {
+			dol_print_error($this->db);
+			return '';
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return a HTML select list to select a percent
-     *
-     *    @param	integer	$selected      	pourcentage pre-selectionne
-     *    @param    string	$htmlname      	nom de la liste deroulante
-     *    @param	int		$disabled		Disabled or not
-     *    @param    int		$increment     	increment value
-     *    @param    int		$start         	start value
-     *    @param    int		$end           	end value
-     *    @param    int     $showempty      Add also an empty line
-     *    @return   string					HTML select string
-     */
-    public function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)
-    {
-        // phpcs:enable
-        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
-        if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return a HTML select list to select a percent
+	 *
+	 *    @param	integer	$selected      	pourcentage pre-selectionne
+	 *    @param    string	$htmlname      	nom de la liste deroulante
+	 *    @param	int		$disabled		Disabled or not
+	 *    @param    int		$increment     	increment value
+	 *    @param    int		$start         	start value
+	 *    @param    int		$end           	end value
+	 *    @param    int     $showempty      Add also an empty line
+	 *    @return   string					HTML select string
+	 */
+	public function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)
+	{
+		// phpcs:enable
+		$return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
+		if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
 
-        for ($i = $start; $i <= $end; $i += $increment)
-        {
-            if ($selected != '' && (int) $selected == $i)
-            {
-                $return .= '<option value="'.$i.'" selected>';
-            }
-            else
-            {
-                $return .= '<option value="'.$i.'">';
-            }
-            $return .= $i.' % ';
-            $return .= '</option>';
-        }
+		for ($i = $start; $i <= $end; $i += $increment)
+		{
+			if ($selected != '' && (int) $selected == $i)
+			{
+				$return .= '<option value="'.$i.'" selected>';
+			} else {
+				$return .= '<option value="'.$i.'">';
+			}
+			$return .= $i.' % ';
+			$return .= '</option>';
+		}
 
-        $return .= '</select>';
+		$return .= '</select>';
 
-        return $return;
-    }
+		return $return;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return select list for categories (to use in form search selectors)
-     *
-     * @param	int		$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
-     * @param   integer	$selected     	Preselected value
-     * @param   string	$htmlname      	Name of combo list
-     * @param	int		$nocateg		Show also an entry "Not categorized"
-     * @param   int     $showempty      Add also an empty line
-     * @param   string  $morecss        More CSS
-     * @return  string		        	Html combo list code
-     * @see	select_all_categories()
-     */
-    public function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')
-    {
-        // phpcs:enable
-        global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return select list for categories (to use in form search selectors)
+	 *
+	 * @param	int		$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
+	 * @param   integer	$selected     	Preselected value
+	 * @param   string	$htmlname      	Name of combo list
+	 * @param	int		$nocateg		Show also an entry "Not categorized"
+	 * @param   int     $showempty      Add also an empty line
+	 * @param   string  $morecss        More CSS
+	 * @return  string		        	Html combo list code
+	 * @see	select_all_categories()
+	 */
+	public function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')
+	{
+		// phpcs:enable
+		global $conf, $langs;
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-        // For backward compatibility
-        if (is_numeric($type))
-        {
-            dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
-        }
+		// For backward compatibility
+		if (is_numeric($type))
+		{
+			dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
+		}
 
-        // Load list of "categories"
-        $static_categs = new Categorie($this->db);
-        $tab_categs = $static_categs->get_full_arbo($type);
+		// Load list of "categories"
+		$static_categs = new Categorie($this->db);
+		$tab_categs = $static_categs->get_full_arbo($type);
 
-        $moreforfilter = '';
-        // Enhance with select2
-        if ($conf->use_javascript_ajax)
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-            $comboenhancement = ajax_combobox('select_categ_'.$htmlname);
-            $moreforfilter .= $comboenhancement;
-        }
+		$moreforfilter = '';
+		// Enhance with select2
+		if ($conf->use_javascript_ajax)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$comboenhancement = ajax_combobox('select_categ_'.$htmlname);
+			$moreforfilter .= $comboenhancement;
+		}
 
-        // Print a select with each of them
-        $moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing
+		// Print a select with each of them
+		$moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
+		if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing
 
-        if (is_array($tab_categs))
-        {
-            foreach ($tab_categs as $categ)
-            {
-                $moreforfilter .= '<option value="'.$categ['id'].'"';
-                if ($categ['id'] == $selected) $moreforfilter .= ' selected';
-                $moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';
-            }
-        }
-        if ($nocateg)
-        {
-        	$langs->load("categories");
-        	$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';
-        }
-        $moreforfilter .= '</select>';
+		if (is_array($tab_categs))
+		{
+			foreach ($tab_categs as $categ)
+			{
+				$moreforfilter .= '<option value="'.$categ['id'].'"';
+				if ($categ['id'] == $selected) $moreforfilter .= ' selected';
+				$moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';
+			}
+		}
+		if ($nocateg)
+		{
+			$langs->load("categories");
+			$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';
+		}
+		$moreforfilter .= '</select>';
 
-        return $moreforfilter;
-    }
+		return $moreforfilter;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return select list for categories (to use in form search selectors)
-     *
-     *  @param	string	$selected     		Preselected value
-     *  @param  string	$htmlname      		Name of combo list (example: 'search_sale')
-     *  @param  User	$user           	Object user
-     *  @param	int		$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-     *  @param	int		$showempty			1=show also an empty value
-     *  @param	string	$morecss			More CSS
-     *  @param	int		$norepresentative	Show also an entry "Not categorized"
-     *  @return string						Html combo list code
-     */
-    public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)
-    {
-        // phpcs:enable
-        global $conf, $langs, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return select list for categories (to use in form search selectors)
+	 *
+	 *  @param	string	$selected     		Preselected value
+	 *  @param  string	$htmlname      		Name of combo list (example: 'search_sale')
+	 *  @param  User	$user           	Object user
+	 *  @param	int		$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+	 *  @param	int		$showempty			1=show also an empty value
+	 *  @param	string	$morecss			More CSS
+	 *  @param	int		$norepresentative	Show also an entry "Not categorized"
+	 *  @return string						Html combo list code
+	 */
+	public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs, $hookmanager;
 
-        $langs->load('users');
+		$langs->load('users');
 
-        $out = '';
-        // Enhance with select2
-        if ($conf->use_javascript_ajax)
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+		$out = '';
+		// Enhance with select2
+		if ($conf->use_javascript_ajax)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 
-            $comboenhancement = ajax_combobox($htmlname);
-            if ($comboenhancement)
-            {
-            	$out .= $comboenhancement;
-            }
-        }
+			$comboenhancement = ajax_combobox($htmlname);
+			if ($comboenhancement)
+			{
+				$out .= $comboenhancement;
+			}
+		}
 
-	    $reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);
+		$reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);
 
-        // Select each sales and print them in a select input
-        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $out .= '<option value="0">&nbsp;</option>';
+		// Select each sales and print them in a select input
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+		if ($showempty) $out .= '<option value="0">&nbsp;</option>';
 
-        // Get list of users allowed to be viewed
-        $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
-        $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
+		// Get list of users allowed to be viewed
+		$sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
+		$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-        if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-        {
-        	if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-        		$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users
-        	} else {
-        		$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
-        		$sql_usr .= " OR u.entity = 0"; // Show always superadmin
-        	}
-        }
-        else
-        {
-        	$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
-        }
+		if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		{
+			if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+				$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users
+			} else {
+				$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
+				$sql_usr .= " OR u.entity = 0"; // Show always superadmin
+			}
+		} else {
+			$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
+		}
 
-        if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;
-        if (!empty($user->socid)) $sql_usr .= " AND u.fk_soc = ".$user->socid;
+		if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;
+		if (!empty($user->socid)) $sql_usr .= " AND u.fk_soc = ".$user->socid;
 
-	    //Add hook to filter on user (for exemple on usergroup define in custom modules)
-	    if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[0];
+		//Add hook to filter on user (for exemple on usergroup define in custom modules)
+		if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[0];
 
-        // Add existing sales representatives of thirdparty of external user
-        if (empty($user->rights->user->user->lire) && $user->socid)
-        {
-            $sql_usr .= " UNION ";
-            $sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
-            $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		// Add existing sales representatives of thirdparty of external user
+		if (empty($user->rights->user->user->lire) && $user->socid)
+		{
+			$sql_usr .= " UNION ";
+			$sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
+			$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 
-            if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-            {
-            	if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-            		$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users
-            	} else {
-            		$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
-            	}
-            }
-            else
-            {
-            	$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
-            }
+			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+			{
+				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+					$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users
+				} else {
+					$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
+				}
+			} else {
+				$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
+			}
 
-            $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
+			$sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
 
-	        //Add hook to filter on user (for exemple on usergroup define in custom modules)
-	        if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[1];
-        }
-	    $sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
-        //print $sql_usr;exit;
+			//Add hook to filter on user (for exemple on usergroup define in custom modules)
+			if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[1];
+		}
+		$sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
+		//print $sql_usr;exit;
 
-        $resql_usr = $this->db->query($sql_usr);
-        if ($resql_usr)
-        {
-            while ($obj_usr = $this->db->fetch_object($resql_usr))
-            {
-                $out .= '<option value="'.$obj_usr->rowid.'"';
+		$resql_usr = $this->db->query($sql_usr);
+		if ($resql_usr)
+		{
+			while ($obj_usr = $this->db->fetch_object($resql_usr))
+			{
+				$out .= '<option value="'.$obj_usr->rowid.'"';
 
-                if ($obj_usr->rowid == $selected) $out .= ' selected';
+				if ($obj_usr->rowid == $selected) $out .= ' selected';
 
-                $out .= '>';
-                $out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
-                // Complete name with more info
-                $moreinfo = 0;
-                if (!empty($conf->global->MAIN_SHOW_LOGIN))
-                {
-                    $out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
-                    $moreinfo++;
-                }
-                if ($showstatus >= 0)
-                {
+				$out .= '>';
+				$out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
+				// Complete name with more info
+				$moreinfo = 0;
+				if (!empty($conf->global->MAIN_SHOW_LOGIN))
+				{
+					$out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
+					$moreinfo++;
+				}
+				if ($showstatus >= 0)
+				{
 					if ($obj_usr->statut == 1 && $showstatus == 1)
 					{
 						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
-	                	$moreinfo++;
+						$moreinfo++;
 					}
 					if ($obj_usr->statut == 0)
 					{
 						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
-                		$moreinfo++;
+						$moreinfo++;
 					}
 				}
 				$out .= ($moreinfo ? ')' : '');
-                $out .= '</option>';
-            }
-            $this->db->free($resql_usr);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
+				$out .= '</option>';
+			}
+			$this->db->free($resql_usr);
+		} else {
+			dol_print_error($this->db);
+		}
 
-        if ($norepresentative)
-        {
-        	$langs->load("companies");
-        	$out .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NoSalesRepresentativeAffected").' -</option>';
-        }
+		if ($norepresentative)
+		{
+			$langs->load("companies");
+			$out .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NoSalesRepresentativeAffected").' -</option>';
+		}
 
-        $out .= '</select>';
+		$out .= '</select>';
 
-        return $out;
-    }
+		return $out;
+	}
 
-    /**
-     *	Return list of project and tasks
-     *
-     *	@param  int		$selectedtask   		Pre-selected task
-     *  @param  int		$projectid				Project id
-     * 	@param  string	$htmlname    			Name of html select
-     * 	@param	int		$modeproject			1 to restrict on projects owned by user
-     * 	@param	int		$modetask				1 to restrict on tasks associated to user
-     * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists
-     *  @param  int		$useempty       		0=Allow empty values
-     *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
+	/**
+	 *	Return list of project and tasks
+	 *
+	 *	@param  int		$selectedtask   		Pre-selected task
+	 *  @param  int		$projectid				Project id
+	 * 	@param  string	$htmlname    			Name of html select
+	 * 	@param	int		$modeproject			1 to restrict on projects owned by user
+	 * 	@param	int		$modetask				1 to restrict on tasks associated to user
+	 * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists
+	 *  @param  int		$useempty       		0=Allow empty values
+	 *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
 	 *  @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated status)
-     *  @param	string	$morecss				More css
-     *  @return	void
-     */
-    public function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')
-    {
-        global $user, $langs;
+	 *  @param	string	$morecss				More css
+	 *  @return	void
+	 */
+	public function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')
+	{
+		global $user, $langs;
 
-        require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
-        //print $modeproject.'-'.$modetask;
-        $task = new Task($this->db);
-        $tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);
-        if ($tasksarray)
-        {
-        	print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty) print '<option value="0">&nbsp;</option>';
-            $j = 0;
-            $level = 0;
-            $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
-            print '</select>';
+		//print $modeproject.'-'.$modetask;
+		$task = new Task($this->db);
+		$tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);
+		if ($tasksarray)
+		{
+			print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty) print '<option value="0">&nbsp;</option>';
+			$j = 0;
+			$level = 0;
+			$this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
+			print '</select>';
 
-            print ajax_combobox($htmlname);
-        }
-        else
-        {
-            print '<div class="warning">'.$langs->trans("NoProject").'</div>';
-        }
-    }
+			print ajax_combobox($htmlname);
+		} else {
+			print '<div class="warning">'.$langs->trans("NoProject").'</div>';
+		}
+	}
 
-    /**
-     * Write lines of a project (all lines of a project if parent = 0)
-     *
-     * @param 	int		$inc					Cursor counter
-     * @param 	int		$parent					Id of parent task we want to see
-     * @param 	array	$lines					Array of task lines
-     * @param 	int		$level					Level
-     * @param 	int		$selectedtask			Id selected task
-     * @param 	int		$selectedproject		Id selected project
-     * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
-     * @return	void
-     */
-    private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)
-    {
-        global $langs, $user, $conf;
+	/**
+	 * Write lines of a project (all lines of a project if parent = 0)
+	 *
+	 * @param 	int		$inc					Cursor counter
+	 * @param 	int		$parent					Id of parent task we want to see
+	 * @param 	array	$lines					Array of task lines
+	 * @param 	int		$level					Level
+	 * @param 	int		$selectedtask			Id selected task
+	 * @param 	int		$selectedproject		Id selected project
+	 * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
+	 * @return	void
+	 */
+	private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)
+	{
+		global $langs, $user, $conf;
 
-        $lastprojectid = 0;
+		$lastprojectid = 0;
 
-        $numlines = count($lines);
-        for ($i = 0; $i < $numlines; $i++) {
-            if ($lines[$i]->fk_parent == $parent) {
-                //var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
+		$numlines = count($lines);
+		for ($i = 0; $i < $numlines; $i++) {
+			if ($lines[$i]->fk_parent == $parent) {
+				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
 
-                // Break on a new project
-                if ($parent == 0)	// We are on a task at first level
-                {
-                    if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
-                    {
-                        if ($i > 0) print '<option value="0" disabled>----------</option>';
-                        print '<option value="'.$lines[$i]->fk_project.'_0"';
-                        if ($selectedproject == $lines[$i]->fk_project) print ' selected';
-                        print '>'; // Project -> Task
-                        print $langs->trans("Project").' '.$lines[$i]->projectref;
-                        if (empty($lines[$i]->public))
-                        {
-                            print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                        }
-                        else
-                        {
-                            print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
-                        }
-                        //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
-                        print "</option>\n";
+				// Break on a new project
+				if ($parent == 0)	// We are on a task at first level
+				{
+					if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
+					{
+						if ($i > 0) print '<option value="0" disabled>----------</option>';
+						print '<option value="'.$lines[$i]->fk_project.'_0"';
+						if ($selectedproject == $lines[$i]->fk_project) print ' selected';
+						print '>'; // Project -> Task
+						print $langs->trans("Project").' '.$lines[$i]->projectref;
+						if (empty($lines[$i]->public))
+						{
+							print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
+						} else {
+							print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
+						}
+						//print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
+						print "</option>\n";
 
-                        $lastprojectid = $lines[$i]->fk_project;
-                        $inc++;
-                    }
-                }
+						$lastprojectid = $lines[$i]->fk_project;
+						$inc++;
+					}
+				}
 
-                $newdisablechildoftaskid = $disablechildoftaskid;
+				$newdisablechildoftaskid = $disablechildoftaskid;
 
-                // Print task
-                if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
-                {
-                	// Check if we must disable entry
-                	$disabled = 0;
-                	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
-                	{
-               			$disabled++;
-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too
-                	}
+				// Print task
+				if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
+				{
+					// Check if we must disable entry
+					$disabled = 0;
+					if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
+					{
+			   			$disabled++;
+			   			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too
+					}
 
-                    print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
-                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
-                    if ($disabled) print ' disabled';
-                    print '>';
-                    print $langs->trans("Project").' '.$lines[$i]->projectref;
-                    print ' '.$lines[$i]->projectlabel;
-                    if (empty($lines[$i]->public))
-                    {
-                        print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                    }
-                    else
-                    {
-                        print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
-                    }
-                    if ($lines[$i]->id) print ' > ';
-                    for ($k = 0; $k < $level; $k++)
-                    {
-                        print "&nbsp;&nbsp;&nbsp;";
-                    }
-                    print $lines[$i]->ref.' '.$lines[$i]->label."</option>\n";
-                    $inc++;
-                }
+					print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
+					if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
+					if ($disabled) print ' disabled';
+					print '>';
+					print $langs->trans("Project").' '.$lines[$i]->projectref;
+					print ' '.$lines[$i]->projectlabel;
+					if (empty($lines[$i]->public))
+					{
+						print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
+					} else {
+						print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
+					}
+					if ($lines[$i]->id) print ' > ';
+					for ($k = 0; $k < $level; $k++)
+					{
+						print "&nbsp;&nbsp;&nbsp;";
+					}
+					print $lines[$i]->ref.' '.$lines[$i]->label."</option>\n";
+					$inc++;
+				}
 
-                $level++;
-                if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
-                $level--;
-            }
-        }
-    }
+				$level++;
+				if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+				$level--;
+			}
+		}
+	}
 
 
-    /**
-     *  Output a HTML thumb of color or a text if not defined.
-     *
-     *  @param	string		$color				String with hex (FFFFFF) or comma RGB ('255,255,255')
-     *  @param	string		$textifnotdefined	Text to show if color not defined
-     *  @return	string							HTML code for color thumb
-     *  @see selectColor()
-     */
-    public static function showColor($color, $textifnotdefined = '')
-    {
-    	$textcolor = 'FFF';
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-    	if (colorIsLight($color)) $textcolor = '000';
+	/**
+	 *  Output a HTML thumb of color or a text if not defined.
+	 *
+	 *  @param	string		$color				String with hex (FFFFFF) or comma RGB ('255,255,255')
+	 *  @param	string		$textifnotdefined	Text to show if color not defined
+	 *  @return	string							HTML code for color thumb
+	 *  @see selectColor()
+	 */
+	public static function showColor($color, $textifnotdefined = '')
+	{
+		$textcolor = 'FFF';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		if (colorIsLight($color)) $textcolor = '000';
 
-    	$color = colorArrayToHex(colorStringToArray($color, array()), '');
+		$color = colorArrayToHex(colorStringToArray($color, array()), '');
 
 		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
 		else print $textifnotdefined;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Output a HTML code to select a color
-     *
-     *  @param	string		$set_color		Pre-selected color
-     *  @param	string		$prefix			Name of HTML field
-     *  @param	string		$form_name		Deprecated. Not used.
-     *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
-     *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
-     *  @return	void
-     *  @deprecated Use instead selectColor
-     *  @see selectColor()
-     */
-    public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')
-    {
-        // phpcs:enable
-    	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Output a HTML code to select a color
+	 *
+	 *  @param	string		$set_color		Pre-selected color
+	 *  @param	string		$prefix			Name of HTML field
+	 *  @param	string		$form_name		Deprecated. Not used.
+	 *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
+	 *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
+	 *  @return	void
+	 *  @deprecated Use instead selectColor
+	 *  @see selectColor()
+	 */
+	public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')
+	{
+		// phpcs:enable
+		print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
+	}
 
-    /**
-     *  Output a HTML code to select a color. Field will return an hexa color like '334455'.
-     *
-     *  @param	string		$set_color		Pre-selected color
-     *  @param	string		$prefix			Name of HTML field
-     *  @param	string		$form_name		Deprecated. Not used.
-     *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
-     *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
-     *  @param	string		$morecss		Add css style into input field
-     *  @return	string
-     *  @see showColor()
-     */
-    public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '')
-    {
-        // Deprecation warning
-        if ($form_name) {
-            dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);
-        }
+	/**
+	 *  Output a HTML code to select a color. Field will return an hexa color like '334455'.
+	 *
+	 *  @param	string		$set_color		Pre-selected color
+	 *  @param	string		$prefix			Name of HTML field
+	 *  @param	string		$form_name		Deprecated. Not used.
+	 *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
+	 *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
+	 *  @param	string		$morecss		Add css style into input field
+	 *  @return	string
+	 *  @see showColor()
+	 */
+	public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '')
+	{
+		// Deprecation warning
+		if ($form_name) {
+			dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);
+		}
 
-        global $langs, $conf;
+		global $langs, $conf;
 
-        $out = '';
+		$out = '';
 
-        if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)
-        {
-            $langs->load("other");
-            if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
-            {
-	            $out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
-	            $out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
-	            $out .= '<script type="text/javascript">
+		if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)
+		{
+			$langs->load("other");
+			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
+			{
+				$out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
+				$out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
+				$out .= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                $(\'#colorpicker'.$prefix.'\').jPicker( {
 	                window: {
@@ -791,16 +761,15 @@ class FormOther
 	                  }
 			        } ); });
 	             </script>';
-            }
-            $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
-        }
-        else  // In most cases, this is not used. We used instead function with no specific list of colors
-        {
-        	if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
-            {
-	        	$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
-	            $out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
-	            $out .= '<script type="text/javascript">
+			}
+			$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
+		} else // In most cases, this is not used. We used instead function with no specific list of colors
+		{
+			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
+			{
+				$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
+				$out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
+				$out .= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
 	                     size: 14,
@@ -809,300 +778,304 @@ class FormOther
 	                 });
 	             });
 	             </script>';
-            }
-            $out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
-            //print '<option value="-1">&nbsp;</option>';
-            foreach ($arrayofcolors as $val)
-            {
-                $out .= '<option value="'.$val.'"';
-                if ($set_color == $val) $out .= ' selected';
-                $out .= '>'.$val.'</option>';
-            }
-            $out .= '</select>';
-        }
+			}
+			$out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
+			//print '<option value="-1">&nbsp;</option>';
+			foreach ($arrayofcolors as $val)
+			{
+				$out .= '<option value="'.$val.'"';
+				if ($set_color == $val) $out .= ' selected';
+				$out .= '>'.$val.'</option>';
+			}
+			$out .= '</select>';
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Creation d'un icone de couleur
-     *
-     *	@param	string	$color		Couleur de l'image
-     *	@param	string	$module 	Nom du module
-     *	@param	string	$name		Nom de l'image
-     *	@param	int		$x 			Largeur de l'image en pixels
-     *	@param	int		$y      	Hauteur de l'image en pixels
-     *	@return	void
-     */
-    public function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Creation d'un icone de couleur
+	 *
+	 *	@param	string	$color		Couleur de l'image
+	 *	@param	string	$module 	Nom du module
+	 *	@param	string	$name		Nom de l'image
+	 *	@param	int		$x 			Largeur de l'image en pixels
+	 *	@param	int		$y      	Hauteur de l'image en pixels
+	 *	@return	void
+	 */
+	public function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')
+	{
+		// phpcs:enable
+		global $conf;
 
-        $file = $conf->$module->dir_temp.'/'.$name.'.png';
+		$file = $conf->$module->dir_temp.'/'.$name.'.png';
 
-        // On cree le repertoire contenant les icones
-        if (!file_exists($conf->$module->dir_temp))
-        {
-            dol_mkdir($conf->$module->dir_temp);
-        }
+		// On cree le repertoire contenant les icones
+		if (!file_exists($conf->$module->dir_temp))
+		{
+			dol_mkdir($conf->$module->dir_temp);
+		}
 
-        // On cree l'image en vraies couleurs
-        $image = imagecreatetruecolor($x, $y);
+		// On cree l'image en vraies couleurs
+		$image = imagecreatetruecolor($x, $y);
 
-        $color = substr($color, 1, 6);
+		$color = substr($color, 1, 6);
 
-        $rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge
-        $vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert
-        $bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu
+		$rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge
+		$vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert
+		$bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu
 
-        $couleur = imagecolorallocate($image, $rouge, $vert, $bleu);
-        //print $rouge.$vert.$bleu;
-        imagefill($image, 0, 0, $couleur); //on remplit l'image
-        // On cree la couleur et on l'attribue a une variable pour ne pas la perdre
-        ImagePng($image, $file); //renvoie une image sous format png
-        ImageDestroy($image);
-    }
+		$couleur = imagecolorallocate($image, $rouge, $vert, $bleu);
+		//print $rouge.$vert.$bleu;
+		imagefill($image, 0, 0, $couleur); //on remplit l'image
+		// On cree la couleur et on l'attribue a une variable pour ne pas la perdre
+		ImagePng($image, $file); //renvoie une image sous format png
+		ImageDestroy($image);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    	Return HTML combo list of week
-     *
-     *    	@param	string		$selected          Preselected value
-     *    	@param  string		$htmlname          Nom de la zone select
-     *    	@param  int			$useempty          Affiche valeur vide dans liste
-     *    	@return	string
-     */
-    public function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    	Return HTML combo list of week
+	 *
+	 *    	@param	string		$selected          Preselected value
+	 *    	@param  string		$htmlname          Nom de la zone select
+	 *    	@param  int			$useempty          Affiche valeur vide dans liste
+	 *    	@return	string
+	 */
+	public function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        $week = array(
-            0=>$langs->trans("Day0"),
-            1=>$langs->trans("Day1"),
-            2=>$langs->trans("Day2"),
-            3=>$langs->trans("Day3"),
-            4=>$langs->trans("Day4"),
-            5=>$langs->trans("Day5"),
-            6=>$langs->trans("Day6")
-        );
+		$week = array(
+			0=>$langs->trans("Day0"),
+			1=>$langs->trans("Day1"),
+			2=>$langs->trans("Day2"),
+			3=>$langs->trans("Day3"),
+			4=>$langs->trans("Day4"),
+			5=>$langs->trans("Day5"),
+			6=>$langs->trans("Day6")
+		);
 
-        $select_week = '<select class="flat" name="'.$htmlname.'">';
-        if ($useempty)
-        {
-            $select_week .= '<option value="-1">&nbsp;</option>';
-        }
-        foreach ($week as $key => $val)
-        {
-            if ($selected == $key)
-            {
-                $select_week .= '<option value="'.$key.'" selected>';
-            }
-            else
-            {
-                $select_week .= '<option value="'.$key.'">';
-            }
-            $select_week .= $val;
-            $select_week .= '</option>';
-        }
-        $select_week .= '</select>';
-        return $select_week;
-    }
+		$select_week = '<select class="flat" name="'.$htmlname.'">';
+		if ($useempty)
+		{
+			$select_week .= '<option value="-1">&nbsp;</option>';
+		}
+		foreach ($week as $key => $val)
+		{
+			if ($selected == $key)
+			{
+				$select_week .= '<option value="'.$key.'" selected>';
+			} else {
+				$select_week .= '<option value="'.$key.'">';
+			}
+			$select_week .= $val;
+			$select_week .= '</option>';
+		}
+		$select_week .= '</select>';
+		return $select_week;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Return HTML combo list of month
-     *
-     *      @param  string      $selected          	Preselected value
-     *      @param  string      $htmlname          	Name of HTML select object
-     *      @param  int         $useempty          	Show empty in list
-     *      @param  int         $longlabel         	Show long label
-     *      @param	string		$morecss			More Css
-     *      @return string
-     */
-    public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'maxwidth50imp valignmiddle')
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Return HTML combo list of month
+	 *
+	 *      @param  string      $selected          	Preselected value
+	 *      @param  string      $htmlname          	Name of HTML select object
+	 *      @param  int         $useempty          	Show empty in list
+	 *      @param  int         $longlabel         	Show long label
+	 *      @param	string		$morecss			More Css
+	 *      @return string
+	 */
+	public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'maxwidth50imp valignmiddle')
+	{
+		// phpcs:enable
+		global $langs;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        if ($longlabel) $montharray = monthArray($langs, 0); // Get array
-        else $montharray = monthArray($langs, 1);
+		if ($longlabel) $montharray = monthArray($langs, 0); // Get array
+		else $montharray = monthArray($langs, 1);
 
-        $select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-        if ($useempty)
-        {
-            $select_month .= '<option value="0">&nbsp;</option>';
-        }
-        foreach ($montharray as $key => $val)
-        {
-            if ($selected == $key)
-            {
-                $select_month .= '<option value="'.$key.'" selected>';
-            }
-            else
-            {
-                $select_month .= '<option value="'.$key.'">';
-            }
-            $select_month .= $val;
-            $select_month .= '</option>';
-        }
-        $select_month .= '</select>';
-        return $select_month;
-    }
+		$select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+		if ($useempty)
+		{
+			$select_month .= '<option value="0">&nbsp;</option>';
+		}
+		foreach ($montharray as $key => $val)
+		{
+			if ($selected == $key)
+			{
+				$select_month .= '<option value="'.$key.'" selected>';
+			} else {
+				$select_month .= '<option value="'.$key.'">';
+			}
+			$select_month .= $val;
+			$select_month .= '</option>';
+		}
+		$select_month .= '</select>';
+		return $select_month;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return HTML combo list of years
-     *
-     *  @param  string		$selected       Preselected value (''=current year, -1=none, year otherwise)
-     *  @param  string		$htmlname       Name of HTML select object
-     *  @param  int			$useempty       Affiche valeur vide dans liste
-     *  @param  int			$min_year       Offset of minimum year into list (by default current year -10)
-     *  @param  int		    $max_year		Offset of maximum year into list (by default current year + 5)
-     *  @param	int			$offset			Offset
-     *  @param	int			$invert			Invert
-     *  @param	string		$option			Option
-     *  @param	string		$morecss		More CSS
-     *  @return	string
-     */
-    public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
-    {
-        // phpcs:enable
-        print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return HTML combo list of years
+	 *
+	 *  @param  string		$selected       Preselected value (''=current year, -1=none, year otherwise)
+	 *  @param  string		$htmlname       Name of HTML select object
+	 *  @param  int			$useempty       Affiche valeur vide dans liste
+	 *  @param  int			$min_year       Offset of minimum year into list (by default current year -10)
+	 *  @param  int		    $max_year		Offset of maximum year into list (by default current year + 5)
+	 *  @param	int			$offset			Offset
+	 *  @param	int			$invert			Invert
+	 *  @param	string		$option			Option
+	 *  @param	string		$morecss		More CSS
+	 *  @return	string
+	 */
+	public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
+	{
+		// phpcs:enable
+		print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);
+	}
 
-    /**
-     *	Return HTML combo list of years
-     *
-     *  @param  string	$selected       Preselected value (''=current year, -1=none, year otherwise)
-     *  @param  string	$htmlname       Name of HTML select object
-     *  @param  int	    $useempty       Affiche valeur vide dans liste
-     *  @param  int	    $min_year		Offset of minimum year into list (by default current year -10)
-     *  @param  int	    $max_year       Offset of maximum year into list (by default current year + 5)
-     *  @param	int		$offset			Offset
-     *  @param	int		$invert			Invert
-     *  @param	string	$option			Option
-     *  @param	string	$morecss		More css
-     *  @return	string
-     */
-    public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
-    {
-        $out = '';
+	/**
+	 *	Return HTML combo list of years
+	 *
+	 *  @param  string	$selected       Preselected value (''=current year, -1=none, year otherwise)
+	 *  @param  string	$htmlname       Name of HTML select object
+	 *  @param  int	    $useempty       Affiche valeur vide dans liste
+	 *  @param  int	    $min_year		Offset of minimum year into list (by default current year -10)
+	 *  @param  int	    $max_year       Offset of maximum year into list (by default current year + 5)
+	 *  @param	int		$offset			Offset
+	 *  @param	int		$invert			Invert
+	 *  @param	string	$option			Option
+	 *  @param	string	$morecss		More css
+	 *  @param  bool	$addjscombo		Add js combo
+	 *  @return	string
+	 */
+	public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp', $addjscombo = false)
+	{
+		$out = '';
 
-        $currentyear = date("Y") + $offset;
-        $max_year = $currentyear + $max_year;
-        $min_year = $currentyear - $min_year;
-        if (empty($selected) && empty($useempty)) $selected = $currentyear;
+		// Add code for jquery to use multiselect
+		if ($addjscombo)
+		{
+			// Enhance with select2
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname);
+		}
 
-        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';
-        if ($useempty)
-        {
-        	$selected_html = '';
-            if ($selected == '') $selected_html = ' selected';
-            $out .= '<option value=""'.$selected_html.'>&nbsp;</option>';
-        }
-        if (!$invert)
-        {
-            for ($y = $max_year; $y >= $min_year; $y--)
-            {
-                $selected_html = '';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
-                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
-            }
-        }
-        else
-        {
-            for ($y = $min_year; $y <= $max_year; $y++)
-            {
-                $selected_html = '';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
-                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
-            }
-        }
-        $out .= "</select>\n";
+		$currentyear = date("Y") + $offset;
+		$max_year = $currentyear + $max_year;
+		$min_year = $currentyear - $min_year;
+		if (empty($selected) && empty($useempty)) $selected = $currentyear;
 
-        return $out;
-    }
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';
+		if ($useempty)
+		{
+			$selected_html = '';
+			if ($selected == '') $selected_html = ' selected';
+			$out .= '<option value=""'.$selected_html.'>&nbsp;</option>';
+		}
+		if (!$invert)
+		{
+			for ($y = $max_year; $y >= $min_year; $y--)
+			{
+				$selected_html = '';
+				if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
+			}
+		} else {
+			for ($y = $min_year; $y <= $max_year; $y++)
+			{
+				$selected_html = '';
+				if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
+			}
+		}
+		$out .= "</select>\n";
+
+		return $out;
+	}
 
 
-    /**
-     * 	Get array with HTML tabs with boxes of a particular area including personalized choices of user.
-     *  Class 'Form' must be known.
-     *
-     * 	@param	   User         $user		 Object User
-     * 	@param	   String       $areacode    Code of area for pages - 0 = Home page ... See getListOfPagesForBoxes()
+	/**
+	 * 	Get array with HTML tabs with boxes of a particular area including personalized choices of user.
+	 *  Class 'Form' must be known.
+	 *
+	 * 	@param	   User         $user		 Object User
+	 * 	@param	   String       $areacode    Code of area for pages - 0 = Home page ... See getListOfPagesForBoxes()
 	 *	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlista'=>, 'boxlistb'=>)
-     */
-    public static function getBoxesArea($user, $areacode)
-    {
-        global $conf, $langs, $db;
+	 */
+	public static function getBoxesArea($user, $areacode)
+	{
+		global $conf, $langs, $db;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
-        $confuserzone = 'MAIN_BOXES_'.$areacode;
+		$confuserzone = 'MAIN_BOXES_'.$areacode;
 
-        // $boxactivated will be array of boxes enabled into global setup
-        // $boxidactivatedforuser will be array of boxes choosed by user
+		// $boxactivated will be array of boxes enabled into global setup
+		// $boxidactivatedforuser will be array of boxes choosed by user
 
-        $selectboxlist = '';
-        $boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)
+		$selectboxlist = '';
+		$boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)
 
-        $boxidactivatedforuser = array();
-        foreach ($boxactivated as $box)
-        {
-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user
-        }
+		$boxidactivatedforuser = array();
+		foreach ($boxactivated as $box)
+		{
+			if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user
+		}
 
-        // Define selectboxlist
-        $arrayboxtoactivatelabel = array();
-        if (!empty($user->conf->$confuserzone))
-        {
-        	$boxorder = '';
-        	$langs->load("boxes"); // Load label of boxes
-        	foreach ($boxactivated as $box)
-        	{
-        		if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user
-        		$label = $langs->transnoentitiesnoconv($box->boxlabel);
-        		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
-        		if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')
-        		{
-        			$label = $label.' <span class="fa fa-bar-chart"></span>';
-        		}
-        		$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list
-        	}
-            foreach ($boxidactivatedforuser as $boxid)
-        	{
-       			if (empty($boxorder)) $boxorder .= 'A:';
+		// Define selectboxlist
+		$arrayboxtoactivatelabel = array();
+		if (!empty($user->conf->$confuserzone))
+		{
+			$boxorder = '';
+			$langs->load("boxes"); // Load label of boxes
+			foreach ($boxactivated as $box)
+			{
+				if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user
+				$label = $langs->transnoentitiesnoconv($box->boxlabel);
+				//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
+				if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')
+				{
+					$label = $label.' <span class="fa fa-bar-chart"></span>';
+				}
+				$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list
+			}
+			foreach ($boxidactivatedforuser as $boxid)
+			{
+	   			if (empty($boxorder)) $boxorder .= 'A:';
   				$boxorder .= $boxid.',';
-        	}
+			}
 
-        	//var_dump($boxidactivatedforuser);
+			//var_dump($boxidactivatedforuser);
 
-        	// Class Form must have been already loaded
-        	$selectboxlist .= '<!-- Form with select box list -->'."\n";
+			// Class Form must have been already loaded
+			$selectboxlist .= '<!-- Form with select box list -->'."\n";
 			$selectboxlist .= '<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+			$selectboxlist .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$selectboxlist .= '<input type="hidden" name="addbox" value="addbox">';
 			$selectboxlist .= '<input type="hidden" name="userid" value="'.$user->id.'">';
 			$selectboxlist .= '<input type="hidden" name="areacode" value="'.$areacode.'">';
 			$selectboxlist .= '<input type="hidden" name="boxorder" value="'.$boxorder.'">';
 			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
-            if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
-            $selectboxlist .= '</form>';
-            if (!empty($conf->use_javascript_ajax))
-            {
-            	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-            	$selectboxlist .= ajax_combobox("boxcombo");
-            }
-        }
+			if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+			$selectboxlist .= '</form>';
+			if (!empty($conf->use_javascript_ajax))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$selectboxlist .= ajax_combobox("boxcombo");
+			}
+		}
 
-        // Javascript code for dynamic actions
-        if (!empty($conf->use_javascript_ajax))
-        {
-	        $selectboxlist .= '<script type="text/javascript" language="javascript">
+		// Javascript code for dynamic actions
+		if (!empty($conf->use_javascript_ajax))
+		{
+			$selectboxlist .= '<script type="text/javascript" language="javascript">
 
 	        // To update list of activated boxes
 	        function updateBoxOrder(closing) {
@@ -1141,8 +1114,8 @@ class FormOther
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=addbox&boxid=\'+boxid;
 	                }
 	        	});';
-	        	if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';
-	        	$selectboxlist .= '
+				if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';
+				$selectboxlist .= '
 
 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({
 	    	    	handle: \'.boxhandle\',
@@ -1167,147 +1140,144 @@ class FormOther
 
         	});'."\n";
 
-	        $selectboxlist .= '</script>'."\n";
-        }
+			$selectboxlist .= '</script>'."\n";
+		}
 
-        // Define boxlista and boxlistb
-        $nbboxactivated = count($boxidactivatedforuser);
+		// Define boxlista and boxlistb
+		$nbboxactivated = count($boxidactivatedforuser);
 
-        if ($nbboxactivated)
-        {
-        	// Load translation files required by the page
-            $langs->loadLangs(array("boxes", "projects"));
+		if ($nbboxactivated)
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("boxes", "projects"));
 
-        	$emptybox = new ModeleBoxes($db);
+			$emptybox = new ModeleBoxes($db);
 
-            $boxlista .= "\n<!-- Box left container -->\n";
+			$boxlista .= "\n<!-- Box left container -->\n";
 
-            // Define $box_max_lines
-            $box_max_lines = 5;
-            if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
+			// Define $box_max_lines
+			$box_max_lines = 5;
+			if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
 
-            $ii = 0;
-            foreach ($boxactivated as $key => $box)
-            {
-            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+			$ii = 0;
+			foreach ($boxactivated as $key => $box)
+			{
+				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
 				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^A/i', $box->box_order)) // column A
-                {
-                    $ii++;
-                    //print 'box_id '.$boxactivated[$ii]->box_id.' ';
-                    //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
-                    // Show box
-                    $box->loadBox($box_max_lines);
-                    $boxlista .= $box->outputBox();
-                }
-            }
+				if (preg_match('/^A/i', $box->box_order)) // column A
+				{
+					$ii++;
+					//print 'box_id '.$boxactivated[$ii]->box_id.' ';
+					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
+					// Show box
+					$box->loadBox($box_max_lines);
+					$boxlista .= $box->showBox(null, null, 1);
+				}
+			}
 
-            if ($conf->browser->layout != 'phone')
-            {
-            	$emptybox->box_id = 'A';
-            	$emptybox->info_box_head = array();
-            	$emptybox->info_box_contents = array();
-            	$boxlista .= $emptybox->outputBox(array(), array());
-            }
-            $boxlista .= "<!-- End box left container -->\n";
+			if ($conf->browser->layout != 'phone')
+			{
+				$emptybox->box_id = 'A';
+				$emptybox->info_box_head = array();
+				$emptybox->info_box_contents = array();
+				$boxlista .= $emptybox->showBox(array(), array(), 1);
+			}
+			$boxlista .= "<!-- End box left container -->\n";
 
-            $boxlistb .= "\n<!-- Box right container -->\n";
+			$boxlistb .= "\n<!-- Box right container -->\n";
 
-            $ii = 0;
-            foreach ($boxactivated as $key => $box)
-            {
-            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^B/i', $box->box_order)) // colonne B
-                {
-                    $ii++;
-                    //print 'box_id '.$boxactivated[$ii]->box_id.' ';
-                    //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
-                    // Show box
-                    $box->loadBox($box_max_lines);
-                    $boxlistb .= $box->outputBox();
-                }
-            }
+			$ii = 0;
+			foreach ($boxactivated as $key => $box)
+			{
+				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
+				if (preg_match('/^B/i', $box->box_order)) // colonne B
+				{
+					$ii++;
+					//print 'box_id '.$boxactivated[$ii]->box_id.' ';
+					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
+					// Show box
+					$box->loadBox($box_max_lines);
+					$boxlistb .= $box->showBox(null, null, 1);
+				}
+			}
 
-            if ($conf->browser->layout != 'phone')
-            {
-            	$emptybox->box_id = 'B';
-            	$emptybox->info_box_head = array();
-            	$emptybox->info_box_contents = array();
-            	$boxlistb .= $emptybox->outputBox(array(), array());
-            }
+			if ($conf->browser->layout != 'phone')
+			{
+				$emptybox->box_id = 'B';
+				$emptybox->info_box_head = array();
+				$emptybox->info_box_contents = array();
+				$boxlistb .= $emptybox->showBox(array(), array(), 1);
+			}
 
-            $boxlistb .= "<!-- End box right container -->\n";
-        }
+			$boxlistb .= "<!-- End box right container -->\n";
+		}
 
-        return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
-    }
+		return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return a HTML select list of a dictionary
-     *
-     *  @param  string	$htmlname          	Name of select zone
-     *  @param	string	$dictionarytable	Dictionary table
-     *  @param	string	$keyfield			Field for key
-     *  @param	string	$labelfield			Label field
-     *  @param	string	$selected			Selected value
-     *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-     *  @param  string  $moreattrib         More attributes on HTML select tag
-     * 	@return	void
-     */
-    public function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return a HTML select list of a dictionary
+	 *
+	 *  @param  string	$htmlname          	Name of select zone
+	 *  @param	string	$dictionarytable	Dictionary table
+	 *  @param	string	$keyfield			Field for key
+	 *  @param	string	$labelfield			Label field
+	 *  @param	string	$selected			Selected value
+	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 * 	@return	void
+	 */
+	public function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        $langs->load("admin");
+		$langs->load("admin");
 
-        $sql = "SELECT rowid, ".$keyfield.", ".$labelfield;
-        $sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
-        $sql .= " ORDER BY ".$labelfield;
+		$sql = "SELECT rowid, ".$keyfield.", ".$labelfield;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
+		$sql .= " ORDER BY ".$labelfield;
 
-        dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            if ($num)
-            {
-                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-                if ($useempty == 1 || ($useempty == 2 && $num > 1))
-                {
-                    print '<option value="-1">&nbsp;</option>';
-                }
+		dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				if ($useempty == 1 || ($useempty == 2 && $num > 1))
+				{
+					print '<option value="-1">&nbsp;</option>';
+				}
 
-                while ($i < $num)
-                {
-                    $obj = $this->db->fetch_object($result);
-                    if ($selected == $obj->rowid || $selected == $obj->$keyfield)
-                    {
-                        print '<option value="'.$obj->$keyfield.'" selected>';
-                    }
-                    else
-                    {
-                        print '<option value="'.$obj->$keyfield.'">';
-                    }
-                    print $obj->$labelfield;
-                    print '</option>';
-                    $i++;
-                }
-                print "</select>";
-            } else {
-                print $langs->trans("DictionaryEmpty");
-            }
-        }
-        else {
-            dol_print_error($this->db);
-        }
-    }
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($result);
+					if ($selected == $obj->rowid || $selected == $obj->$keyfield)
+					{
+						print '<option value="'.$obj->$keyfield.'" selected>';
+					} else {
+						print '<option value="'.$obj->$keyfield.'">';
+					}
+					print $obj->$labelfield;
+					print '</option>';
+					$i++;
+				}
+				print "</select>";
+			} else {
+				print $langs->trans("DictionaryEmpty");
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    /**
+	/**
 	 *	Return an html string with a select combo box to choose yes or no
 	 *
 	 *	@param	string		$htmlname		Name of html select field
@@ -1317,7 +1287,7 @@ class FormOther
 	 *  @param	int      	$useempty		1=Add empty line
 	 *	@return	string						See option
 	 */
-    public function selectAutoManual($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
+	public function selectAutoManual($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
 	{
 		global $langs;
 
@@ -1336,9 +1306,7 @@ class FormOther
 		{
 			$resultautomanual .= '<option value="'.$automatic.'" selected>'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'">'.$langs->trans("Manual").'</option>'."\n";
-		}
-		else
-	    {
+		} else {
 	   		$selected = (($useempty && $value != '0' && $value != 'manual') ? '' : ' selected');
 			$resultautomanual .= '<option value="'.$automatic.'">'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'"'.$selected.'>'.$langs->trans("Manual").'</option>'."\n";
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index bf3db0cc65c..9586adeaed4 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -97,9 +97,7 @@ class FormProjets
 			));
 
 			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else
-		{
+		} else {
 			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
 		}
 		if ($discard_closed > 0)
@@ -115,8 +113,7 @@ class FormProjets
 		{
 			print $out;
 			return '';
-		}
-		else return $out;
+		} else return $out;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -173,7 +170,7 @@ class FormProjets
 			if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 			elseif ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 			{
-				$sql .= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
+				$sql .= " AND (p.fk_soc IN (".$socid.", ".((int) $conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY).") OR p.fk_soc IS NULL)";
 			}
 		}
 		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
@@ -208,9 +205,7 @@ class FormProjets
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
 						{
 							$i++;
@@ -232,13 +227,11 @@ class FormProjets
 						{
 							$disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("Draft");
-						}
-						elseif ($obj->fk_statut == 2)
+						} elseif ($obj->fk_statut == 2)
 						{
 							if ($discard_closed == 2) $disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("Closed");
-						}
-						elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						} elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
 							$disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -249,15 +242,11 @@ class FormProjets
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -289,14 +278,11 @@ class FormProjets
 				{
 					print $out;
 					return '';
-				}
-				else return $out;
+				} else return $out;
 			} else {
 				return $outarray;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -379,10 +365,10 @@ class FormProjets
 					//if (! empty($conf->use_javascript_ajax)) $out .= '<span class="opacitymedium">aaa';
 					$out .= $show_empty;
 					//if (! empty($conf->use_javascript_ajax)) $out .= '</span>';
-				}
-				else $out .= '&nbsp;';
+				} else $out .= '&nbsp;';
 				$out .= '</option>';
 			}
+
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -394,9 +380,7 @@ class FormProjets
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else
-					{
+					} else {
 						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
 						{
 							$i++;
@@ -405,6 +389,18 @@ class FormProjets
 
 						$labeltoshow = '';
 
+						$disabled = 0;
+						if ($obj->fk_statut == Project::STATUS_DRAFT)
+						{
+							$disabled = 1;
+						} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+						{
+							if ($discard_closed == 2) $disabled = 1;
+						} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						{
+							$disabled = 1;
+						}
+
 						if ($showproject == 'all')
 						{
 							$labeltoshow .= dol_trunc($obj->ref, 18); // Project ref
@@ -419,13 +415,11 @@ class FormProjets
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							}
-							elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
 							{
 								if ($discard_closed == 2) $disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							}
-							elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
@@ -441,15 +435,11 @@ class FormProjets
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
-						}
-						else
-						{
+						} else {
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat = '';
-							}
-							else
-							{
+							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
 								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
@@ -472,9 +462,7 @@ class FormProjets
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -598,9 +586,7 @@ class FormProjets
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
@@ -660,9 +646,7 @@ class FormProjets
 					if ($useshortlabel)
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-					}
-					else
-					{
+					} else {
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
 						if ($showpercent) $finallabel .= ' ('.$obj->percent.'%)';
 					}
@@ -682,9 +666,7 @@ class FormProjets
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
 			dol_syslog(get_class($this)."::selectOpportunityStatus ".$this->error, LOG_ERR);
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 979d8a71ca8..e1653444960 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -97,9 +97,7 @@ class FormPropal
                         $i++;
                     }
                 }
-            }
-            else
-            {
+            } else {
                 dol_print_error($this->db);
             }
         }
@@ -120,18 +118,14 @@ class FormPropal
             if ($selected != '' && $selected == $obj['id'])
             {
                 print '<option value="'.$obj['id'].'" selected>';
-            }
-            else
-            {
+            } 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
-            {
+            } 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']];
 
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 669928cb3e9..55d214fbbd6 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -179,9 +179,7 @@ function limitChars(textarea, limit, infodiv)
                 if ($this->fromsms)
                 {
                     print $this->fromsms;
-                }
-                else
-                {
+                } else {
                     if ($this->fromtype)
                     {
                         $langs->load("errors");
@@ -190,58 +188,45 @@ function limitChars(textarea, limit, infodiv)
                 }
                 print "</td></tr>\n";
                 print "</td></tr>\n";
-            }
-            else
-            {
+            } 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
-                    {
+                    try {
                         $sms = new OvhSms($this->db);
                         if (empty($conf->global->OVHSMS_ACCOUNT))
                         {
                             $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
-                        }
-                        else
-                        {
+                        } else {
                             $resultsender = $sms->SmsSenderList();
                         }
-                    }
-                    catch (Exception $e)
+                    } 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'
+                } 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
-                    {
+                    try {
                         $classname = ucfirst($classfile);
                         if (class_exists($classname))
                         {
                         	$sms = new $classname($this->db);
                         	$resultsender = $sms->SmsSenderList();
-                        }
-                        else
-                        {
+                        } else {
                         	$sms = new stdClass();
                         	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
-                    }
-                    catch (Exception $e)
+                    } catch (Exception $e)
                     {
                         dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
-                }
-                else
-                {
+                } 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;
@@ -255,9 +240,7 @@ function limitChars(textarea, limit, infodiv)
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
                     print '</select>';
-                }
-                else
-                {
+                } else {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
                     if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
                     print '</span>';
@@ -278,9 +261,7 @@ function limitChars(textarea, limit, infodiv)
             if ($this->withtoreadonly)
             {
                 print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
-            }
-            else
-            {
+            } 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)
                 {
@@ -317,9 +298,7 @@ function limitChars(textarea, limit, infodiv)
             {
                 print nl2br($defaultmessage);
                 print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
-            }
-            else
-            {
+            } 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>';
             }
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index 5ecef635d73..e3a063b0d69 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -59,17 +59,18 @@ class FormSocialContrib
      * 	@param	int		$maxlen			Max length of text in combo box
      * 	@param	int		$help			Add or not the admin help picto
      *  @param	string	$morecss		Add more CSS on select
+     *  @param	int		$noerrorifempty	No print error if list is empty for the country
      * 	@return	void
      */
-    public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300')
+    public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300', $noerrorifempty = 0)
     {
         // phpcs:enable
         global $conf, $db, $langs, $user, $mysoc;
 
         if (empty($mysoc->country_id) && empty($mysoc->country_code))
         {
-            dol_print_error('', 'Call to select_type_socialcontrib with mysoc country not yet defined');
-            exit;
+        	print $langs->trans("ErrorSetupOfCountryMustBeDone");
+			return;
         }
 
         if (!empty($mysoc->country_id))
@@ -79,21 +80,19 @@ class FormSocialContrib
             $sql .= " WHERE c.active = 1";
             $sql .= " AND c.fk_pays = ".$mysoc->country_id;
             $sql .= " ORDER BY c.libelle ASC";
-        }
-        else
-        {
+        } 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 = '".$mysoc->country_code."'";
+            $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 = $db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $num = $db->num_rows($resql);
+        	$num = $this->db->num_rows($resql);
             if ($num)
             {
             	print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
@@ -102,7 +101,7 @@ class FormSocialContrib
                 if ($useempty) print '<option value="0">&nbsp;</option>';
                 while ($i < $num)
                 {
-                    $obj = $db->fetch_object($resql);
+                	$obj = $this->db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
                     if ($obj->id == $selected) print ' selected';
                     print '>'.dol_trunc($obj->type, $maxlen);
@@ -111,15 +110,11 @@ class FormSocialContrib
                 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
-            {
-                print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
-            }
-        }
-        else
-        {
-            dol_print_error($db, $db->lasterror());
+        } 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 8dcd4965c65..35ad4b83a7f 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -200,17 +200,17 @@ class FormTicket
 
 		// Type
 		print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">'.$langs->trans("TicketTypeRequest").'</span></label></td><td>';
-		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', '2', 0, 0, 0, 'minwidth150');
+		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 0, 0, 0, 'minwidth200');
+		print '</td></tr>';
+
+		// Group
+		print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketCategory").'</span></label></td><td>';
+		$this->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', '', 2, 0, 0, 0, 'minwidth200');
 		print '</td></tr>';
 
 		// Severity
 		print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
-		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', '2');
-		print '</td></tr>';
-
-		// Group
-		print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketGroup").'</span></label></td><td>';
-		$this->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', '', '2');
+		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 0);
 		print '</td></tr>';
 
 		// Subject
@@ -231,7 +231,7 @@ class FormTicket
 		}
 
 		// MESSAGE
-		$msg = GETPOSTISSET('message') ? GETPOST('message', 'none') : '';
+		$msg = GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : '';
 		print '<tr><td><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span></label></td><td>';
 
 		// If public form, display more information
@@ -247,6 +247,59 @@ class FormTicket
 		$doleditor->Create();
 		print '</td></tr>';
 
+
+		// Attached files
+		if (!empty($this->withfile)) {
+			// Define list of attached files
+			$listofpaths = array();
+			$listofnames = array();
+			$listofmimes = array();
+			if (!empty($_SESSION["listofpaths"])) {
+				$listofpaths = explode(';', $_SESSION["listofpaths"]);
+			}
+
+			if (!empty($_SESSION["listofnames"])) {
+				$listofnames = explode(';', $_SESSION["listofnames"]);
+			}
+
+			if (!empty($_SESSION["listofmimes"])) {
+				$listofmimes = explode(';', $_SESSION["listofmimes"]);
+			}
+
+			$out = '<tr>';
+			$out .= '<td>'.$langs->trans("MailFile").'</td>';
+			$out .= '<td>';
+			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+			$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
+			$out .= '<script type="text/javascript" language="javascript">';
+			$out .= 'jQuery(document).ready(function () {';
+			$out .= '    jQuery(".removedfile").click(function() {';
+			$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
+			$out .= '    });';
+			$out .= '})';
+			$out .= '</script>'."\n";
+			if (count($listofpaths)) {
+				foreach ($listofpaths as $key => $val) {
+					$out .= '<div id="attachfile_'.$key.'">';
+					$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
+					if (!$this->withfilereadonly) {
+						$out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+					}
+					$out .= '<br></div>';
+				}
+			} else {
+				$out .= $langs->trans("NoAttachedFiles").'<br>';
+			}
+			if ($this->withfile == 2) { // Can add other files
+				$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+				$out .= ' ';
+				$out .= '<input type="submit" class="button" id="addfile" name="addfile" value="'.$langs->trans("MailingAddFile").'" />';
+			}
+			$out .= "</td></tr>\n";
+
+			print $out;
+		}
+
 		// User of creation
 		if ($this->withusercreate > 0 && $this->fk_user_create) {
 			print '<tr><td class="titlefield">'.$langs->trans("CreatedBy").'</td><td>';
@@ -338,7 +391,7 @@ class FormTicket
 				print '</td></tr>';
 			} else {
 				print '<tr><td class="titlefield"><input type="hidden" name="socid" value="'.$user->socid.'"/></td>';
-				print '<td><input type="hidden" name="contactid" value="'.$user->contactid.'"/></td>';
+				print '<td><input type="hidden" name="contactid" value="'.$user->contact_id.'"/></td>';
 				print '<td><input type="hidden" name="type" value="Z"/></td></tr>';
 			}
 
@@ -359,58 +412,6 @@ class FormTicket
 			print '</td></tr>';
 		}
 
-		// Attached files
-		if (!empty($this->withfile)) {
-			// Define list of attached files
-			$listofpaths = array();
-			$listofnames = array();
-			$listofmimes = array();
-			if (!empty($_SESSION["listofpaths"])) {
-				$listofpaths = explode(';', $_SESSION["listofpaths"]);
-			}
-
-			if (!empty($_SESSION["listofnames"])) {
-				$listofnames = explode(';', $_SESSION["listofnames"]);
-			}
-
-			if (!empty($_SESSION["listofmimes"])) {
-				$listofmimes = explode(';', $_SESSION["listofmimes"]);
-			}
-
-			$out = '<tr>';
-			$out .= '<td>'.$langs->trans("MailFile").'</td>';
-			$out .= '<td>';
-			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
-			$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-			$out .= '<script type="text/javascript" language="javascript">';
-			$out .= 'jQuery(document).ready(function () {';
-			$out .= '    jQuery(".removedfile").click(function() {';
-			$out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
-			$out .= '    });';
-			$out .= '})';
-			$out .= '</script>'."\n";
-			if (count($listofpaths)) {
-				foreach ($listofpaths as $key => $val) {
-					$out .= '<div id="attachfile_'.$key.'">';
-					$out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
-					if (!$this->withfilereadonly) {
-						$out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
-					}
-					$out .= '<br></div>';
-				}
-			} else {
-				$out .= $langs->trans("NoAttachedFiles").'<br>';
-			}
-			if ($this->withfile == 2) { // Can add other files
-				$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-				$out .= ' ';
-				$out .= '<input type="submit" class="button" id="addfile" name="addfile" value="'.$langs->trans("MailingAddFile").'" />';
-			}
-			$out .= "</td></tr>\n";
-
-			print $out;
-		}
-
 		// Other attributes
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $this->action); // Note that $action and $object may have been modified by hook
@@ -884,12 +885,12 @@ class FormTicket
 			$modelmail_array[$line->id] = $line->label;
 		}
 
-		print '<table class="border"  width="'.$width.'">';
+		print '<table class="border" width="'.$width.'">';
 
 		// External users can't send message email
 		if ($user->rights->ticket->write && !$user->socid)
 		{
-			print '<tr><td width="30%"></td><td colspan="2">';
+			print '<tr><td></td><td>';
 			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : '');
 			print '<input type="checkbox" name="send_email" value="1" id="send_msg_email" '.$checkbox_selected.'/> ';
 			print '<label for="send_msg_email">'.$langs->trans('SendMessageByEmail').'</label>';
@@ -903,29 +904,27 @@ class FormTicket
 					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 				}
 				print ' &nbsp; ';
-				print '<input class="button" type="submit" value="'.$langs->trans('Use').'" name="modelselected" id="modelselected">';
-				print ' &nbsp; ';
+				print '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
 				print '</div></td>';
 			}
 
 			// Private message (not visible by customer/external user)
 			if (!$user->socid) {
-				print '<tr><td width="30%"></td><td>';
+				print '<tr><td></td><td>';
 				$checkbox_selected = (GETPOST('private_message', 'alpha') == "1" ? ' checked' : '');
 				print '<input type="checkbox" name="private_message" value="1" id="private_message" '.$checkbox_selected.'/> ';
 				print '<label for="private_message">'.$langs->trans('MarkMessageAsPrivate').'</label>';
-				print '</td><td class="center">';
-				print $form->textwithpicto('', $langs->trans("TicketMessagePrivateHelp"), 1, 'help');
+				print ' '.$form->textwithpicto('', $langs->trans("TicketMessagePrivateHelp"), 1, 'help');
 				print '</td></tr>';
 			}
 
+			// Subject
 			print '<tr class="email_line"><td class="titlefieldcreate">'.$langs->trans('Subject').'</td>';
-			$label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
-			print '<td colspan="2"><input type="text" class="text" size="80" name="subject" value="['.$label_title.' - '.$langs->trans("Ticket").' #'.$this->ref.'] '.$langs->trans('TicketNewMessage').'" />';
+			print '<td><input type="text" class="text minwidth500" name="subject" value="['.$conf->global->MAIN_INFO_SOCIETE_NOM.' - '.$langs->trans("Ticket").' '.$this->ref.'] '.$langs->trans('TicketNewMessage').'" />';
 			print '</td></tr>';
 
 			// Destinataires
-			print '<tr class="email_line"><td>'.$langs->trans('MailRecipients').'</td><td colspan="2">';
+			print '<tr class="email_line"><td>'.$langs->trans('MailRecipients').'</td><td>';
 			$ticketstat = new Ticket($this->db);
 			$res = $ticketstat->fetch('', '', $this->track_id);
 			if ($res) {
@@ -973,7 +972,9 @@ class FormTicket
 		// External users can't send message email
 		if ($user->rights->ticket->write && !$user->socid) {
 			$mail_intro = GETPOST('mail_intro') ? GETPOST('mail_intro') : $conf->global->TICKET_MESSAGE_MAIL_INTRO;
-			print '<tr class="email_line"><td><label for="mail_intro">'.$langs->trans("TicketMessageMailIntro").'</label>';
+			print '<tr class="email_line"><td><label for="mail_intro">';
+			print $form->textwithpicto($langs->trans("TicketMessageMailIntro"), $langs->trans("TicketMessageMailIntroHelp"), 1, 'help');
+			print '</label>';
 
 			print '</td><td>';
 			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -982,22 +983,20 @@ class FormTicket
 			$doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
 
 			$doleditor->Create();
-			print '</td><td class="center">';
-			print $form->textwithpicto('', $langs->trans("TicketMessageMailIntroHelp"), 1, 'help');
 			print '</td></tr>';
 		}
 
-        // MESSAGE
-        $defaultmessage="";
+		// MESSAGE
+		$defaultmessage = "";
 		if (is_object($arraydefaultmessage) && $arraydefaultmessage->content) {
 			$defaultmessage = $arraydefaultmessage->content;
 		}
-        $defaultmessage = str_replace('\n', "\n", $defaultmessage);
+		$defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
 		// Deal with format differences between message and signature (text / HTML)
-		if (dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__SIGNATURE__'])) {
-			$this->substit['__SIGNATURE__'] = dol_nl2br($this->substit['__SIGNATURE__']);
-		} elseif (!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__SIGNATURE__'])) {
+		if (dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
+			$this->substit['__USER_SIGNATURE__'] = dol_nl2br($this->substit['__USER_SIGNATURE__']);
+		} elseif (!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
 			$defaultmessage = dol_nl2br($defaultmessage);
 		}
 		if (isset($_POST["message"]) && !$_POST['modelselected']) {
@@ -1009,17 +1008,16 @@ class FormTicket
 			$defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);
 		}
 
-		print '<tr><td class="tdtop"><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span></label></td><td>';
+		print '<tr><td class="tdtop"><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span>';
+		if ($user->rights->ticket->write && !$user->socid) {
+			print $form->textwithpicto('', $langs->trans("TicketMessageHelp"), 1, 'help');
+		}
+		print '</label></td><td>';
 		//$toolbarname = 'dolibarr_details';
 		$toolbarname = 'dolibarr_notes';
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, 70);
 		$doleditor->Create();
-		print '</td><td class="center">';
-		if ($user->rights->ticket->write && !$user->socid) {
-			print $form->textwithpicto('', $langs->trans("TicketMessageHelp"), 1, 'help');
-		}
-
 		print '</td></tr>';
 
 		// Signature
@@ -1027,13 +1025,11 @@ class FormTicket
 		if ($user->rights->ticket->write && !$user->socid) {
 			$mail_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
 			print '<tr class="email_line"><td><label for="mail_intro">'.$langs->trans("TicketMessageMailSignature").'</label>';
-
+			print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelp"), 1, 'help');
 			print '</td><td>';
 			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 			$doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
 			$doleditor->Create();
-			print '</td><td class="center">';
-			print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelp"), 1, 'help');
 			print '</td></tr>';
 		}
 
@@ -1041,7 +1037,7 @@ class FormTicket
 		if (!empty($this->withfile)) {
 			$out = '<tr>';
 			$out .= '<td width="180">'.$langs->trans("MailFile").'</td>';
-			$out .= '<td colspan="2">';
+			$out .= '<td>';
 			// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
 			$out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
 			$out .= '<script type="text/javascript" language="javascript">';
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 7b067fa11d6..c656f5e39ee 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -79,9 +79,7 @@ class FormWebsite
                 if ($selected == $obj->rowid)
                 {
                     $out .= '<option value="'.$obj->rowid.'" selected>';
-                }
-                else
-                {
+                } else {
                     $out .= '<option value="'.$obj->rowid.'">';
                 }
                 $out .= $obj->ref;
@@ -89,8 +87,7 @@ class FormWebsite
                 $i++;
             }
             $out .= "</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -138,9 +135,7 @@ class FormWebsite
     				if ($selected == $obj->rowid || $selected == $obj->code)
     				{
     					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
-    				{
+    				} else {
     					print '<option value="'.$obj->code.'">';
     				}
     				print $obj->label;
@@ -149,13 +144,10 @@ class FormWebsite
     			}
     			print "</select>";
     			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-    		}
-    		else
-    		{
+    		} else {
     			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
     }
@@ -205,9 +197,7 @@ class FormWebsite
     		if ($selected == $key)
     		{
     			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
-    		{
+    		} else {
     			$out .= '<option value="'.$key.'">';
     		}
     		$out .= $langs->trans($val);
@@ -242,9 +232,7 @@ class FormWebsite
 	    if ($atleastonepage && $action != 'editsource')
 	    {
 	    	$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
-	    }
-	    else
-	    {
+	    } else {
 	    	$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
 	    }
 
@@ -292,9 +280,7 @@ class FormWebsite
 	    if ($atleastonepage && $action != 'editsource')
 	    {
 	    	$out .= ajax_combobox($htmlname);
-	    }
-	    else
-	    {
+	    } else {
 	    	$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
 	    	$out .= ajax_combobox($htmlname);
 	    }
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index ffba924b1ea..26edc402880 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -43,9 +43,7 @@ class InfoBox
         		0 => 'Home',
         		27 => 'AccountancyHome'
         	);
-		}
-		else
-		{
+		} else {
 			return array(
 				0 => 'Home',
 				1 => 'userhome',
@@ -108,8 +106,7 @@ class InfoBox
             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
+        } else // available
         {
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql .= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
@@ -128,14 +125,13 @@ class InfoBox
 
                 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
-                    {
+                    } else {
                         $boxname = preg_replace('/\.php$/i', '', $obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
                     }
@@ -199,17 +195,13 @@ class InfoBox
                         //print 'xx module='.$module.' enabled='.$enabled;
                         if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
                         else unset($box);
-                    }
-                    else
-                    {
+                    } else {
                         dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
                     }
                 }
                 $j++;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog($db->lasterror(), LOG_ERR);
             return array('error'=>$db->lasterror());
         }
@@ -282,12 +274,13 @@ class InfoBox
                         //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 .= " '".$colonne.$ii."',";
+                        $sql .= " '".$db->escape($colonne.$ii)."',";
                         $sql .= " ".$userid.",";
                         $sql .= " ".$conf->entity;
                         $sql .= ")";
@@ -302,24 +295,17 @@ class InfoBox
                     }
                 }
             }
-            if ($error)
-            {
-                $error = $db->error();
-                $db->rollback();
-                return -2;
-            }
-            else
-            {
-                $db->commit();
-                return 1;
-            }
+        } else {
+        	$error++;
         }
-        else
+
+        if ($error)
         {
-            $error = $db->lasterror();
-            $db->rollback();
-            dol_syslog(get_class()."::saveboxorder ".$error);
-            return -1;
+        	$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 4199e51cb68..c7004eea8b4 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -83,8 +83,7 @@ class Interfaces
         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);
-            global $db;
-            $user = new User($db);
+            $user = new User($this->db);
         }
         //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch run_triggers", LOG_DEBUG);
 
@@ -151,8 +150,7 @@ class Interfaces
                             //print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
                             include_once $newdir.'/'.$file;
                             //print 'Done for '.$modName."\n";
-                        }
-                        catch (Exception $e)
+                        } catch (Exception $e)
                         {
                             dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
                         }
@@ -187,14 +185,11 @@ class Interfaces
                 {
                     //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
+                } 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
-                {
+                } 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);
                 }
 
@@ -219,9 +214,7 @@ class Interfaces
                     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
-            {
+            } else {
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
         }
@@ -230,9 +223,7 @@ class Interfaces
         {
             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
-        {
+        } else {
             //dol_syslog(get_class($this)."::run_triggers Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko, LOG_DEBUG);
             return $nbok;
         }
@@ -291,9 +282,7 @@ class Interfaces
                         {
                             $langs->load("errors");
                             print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
-                        }
-                        else
-                        {
+                        } else {
                             include_once $newdir.'/'.$file;
                         }
 
@@ -369,19 +358,15 @@ class Interfaces
 		            {
 		                $text .= $langs->trans("TriggerDisabledByName").'<br>';
 		                if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
-		            }
-		            else
-		            {
+		            } 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 {
+	            } else {
 	            	print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
 	            }
-            }
-            catch(Exception $e) {
+            } catch (Exception $e) {
             	print $e->getMessage();
             }
 
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index b09db176852..a1de5813b46 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -164,7 +164,7 @@ class Ldap
     public function connect_bind()
 	{
         // phpcs:enable
-		global $langs, $conf;
+		global $conf;
 
 		$connected = 0;
 		$this->bind = 0;
@@ -187,15 +187,14 @@ class Ldap
 		if (empty($this->error))
 		{
 			// Loop on each ldap server
-			foreach ($this->server as $key => $host)
+			foreach ($this->server as $host)
 			{
 				if ($connected) break;
 				if (empty($host)) continue;
 
 				if ($this->serverPing($host, $this->serverPort) === true) {
 					$this->connection = ldap_connect($host, $this->serverPort);
-				}
-				else continue;
+				} else continue;
 
 				if (is_resource($this->connection))
 				{
@@ -225,14 +224,10 @@ class Ldap
 							$this->bind = $this->result;
 							$connected = 2;
 							break;
-						}
-						else
-						{
+						} else {
 							$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 						}
-					}
-					else
-					{
+					} else {
 						// Try in auth mode
 						if ($this->searchUser && $this->searchPassword)
 						{
@@ -243,9 +238,7 @@ class Ldap
 								$this->bind = $this->result;
 								$connected = 2;
 								break;
-							}
-							else
-							{
+							} else {
 								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
@@ -259,9 +252,7 @@ class Ldap
 								$this->bind = $this->result;
 								$connected = 1;
 								break;
-							}
-							else
-							{
+							} else {
 								$this->error = ldap_errno($this->connection).' '.ldap_error($this->connection);
 							}
 						}
@@ -276,9 +267,7 @@ class Ldap
 		{
 			$return = $connected;
 			dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
-		}
-		else
-		{
+		} else {
 			$this->error = 'Failed to connect to LDAP'.($this->error ? ': '.$this->error : '');
 			$return = -1;
 			dol_syslog(get_class($this)."::connect_bind return=".$return.' - '.$this->error, LOG_WARNING);
@@ -299,9 +288,7 @@ class Ldap
 		if ($this->connection && !@ldap_close($this->connection))
 		{
 			return false;
-		}
-		else
-		{
+		} else {
 			return true;
 		}
 	}
@@ -320,9 +307,7 @@ class Ldap
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else
-		{
+		} else {
 			return true;
 		}
 	}
@@ -345,9 +330,7 @@ class Ldap
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
 			return false;
-		}
-		else
-		{
+		} else {
 			return true;
 		}
 	}
@@ -416,8 +399,6 @@ class Ldap
 	 */
     public function add($dn, $info, $user)
 	{
-		global $conf;
-
 		dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
@@ -448,9 +429,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->ldapErrorCode = @ldap_errno($this->connection);
 			$this->ldapErrorText = @ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
@@ -465,7 +444,7 @@ class Ldap
 	 *
 	 *	@param	string		$dn			DN entry key
 	 *	@param	array		$info		Attributes array
-	 *	@param	User			$user		Objet user that modify
+	 *	@param	User		$user		Objet user that modify
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
     public function modify($dn, $info, $user)
@@ -494,19 +473,18 @@ class Ldap
 		$this->dump($dn, $info);
 
 		//print_r($info);
-		// For better compatibility with Samba4 AD
+
+    	// For better compatibility with Samba4 AD
 		if ($this->serverType == "activedirectory") {
-			unset($info['cn']); // For avoid error : Operation not allowed on RDN (Code 67)
+			unset($info['cn']); // To avoid error : Operation not allowed on RDN (Code 67)
 		}
-		$result=@ldap_modify($this->connection, $dn, $info);
+		$result = @ldap_modify($this->connection, $dn, $info);
 
 		if ($result)
 		{
 			dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::modify failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -526,7 +504,7 @@ class Ldap
 	 */
     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));
+		dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn ? 1 : 0));
 
 		// Check parameters
 		if (!$this->connection)
@@ -552,9 +530,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::rename failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -595,16 +571,13 @@ class Ldap
 			{
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
-			}
-			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
 			}
-		}
-		else
-		{
+		} else {
 			//$result = $this->delete($olddn);
 			$result = $this->add($dn, $info, $user); // If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
 			$result = $this->modify($dn, $info, $user); // We use add/modify instead of delete/add when olddn is received
@@ -615,9 +588,7 @@ class Ldap
 			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			//print_r($info);
 			return -1;
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::update done successfully");
 			return 1;
 		}
@@ -673,9 +644,7 @@ class Ldap
 		if (preg_match('/^ldap/', $this->server[0]))
 		{
 			$target = "-H ".join(',', $this->server);
-		}
-		else
-		{
+		} else {
 			$target = "-h ".join(',', $this->server)." -p ".$this->serverPort;
 		}
 		$content .= "# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
@@ -688,10 +657,8 @@ class Ldap
 			if (!is_array($value))
 			{
 				$content .= "$key: $value\n";
-			}
-			else
-			{
-				foreach ($value as $valuekey => $valuevalue)
+			} else {
+				foreach ($value as $valuevalue)
 				{
 					$content .= "$key: $valuevalue\n";
 				}
@@ -726,9 +693,7 @@ class Ldap
 			if (!empty($conf->global->MAIN_UMASK))
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 			return 1;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -773,8 +738,6 @@ class Ldap
 	 */
     public function addAttribute($dn, $info, $user)
 	{
-		global $conf;
-
 		dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
@@ -805,9 +768,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::add_attribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -825,8 +786,6 @@ class Ldap
 	 */
     public function updateAttribute($dn, $info, $user)
 	{
-		global $conf;
-
 		dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
@@ -857,9 +816,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::updateAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -877,8 +834,6 @@ class Ldap
 	 */
     public function deleteAttribute($dn, $info, $user)
 	{
-		global $conf;
-
 		dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
@@ -909,9 +864,7 @@ class Ldap
 		{
 			dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = @ldap_error($this->connection);
 			dol_syslog(get_class($this)."::deleteAttribute failed: ".$this->error, LOG_ERR);
 			return -1;
@@ -1034,18 +987,14 @@ class Ldap
 			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
 			{
 				$filter = '('.$this->filter.')';
-			}
-			elseif (((string) $activefilter == 'member') && $this->filter)
+			} elseif (((string) $activefilter == 'member') && $this->filter)
 			{
 				$filter = '('.$this->filtermember.')';
-			}
-			else	// If this->filter is empty, make fiter on * (all)
+			} else // If this->filter is empty, make fiter on * (all)
 			{
 				$filter = '('.$useridentifier.'=*)';
 			}
-		}
-		else
-		{
+		} else {
 			$filter = '('.$useridentifier.'='.$search.')';
 		}
 
@@ -1056,9 +1005,7 @@ class Ldap
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter." attributeArray=(".join(',', $attributeArray).")");
 			//var_dump($attributeArray);
 			$this->result = @ldap_search($this->connection, $userDn, $filter, $attributeArray);
-		}
-		else
-		{
+		} else {
 			// Return list with fields selected by default
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
 			$this->result = @ldap_search($this->connection, $userDn, $filter);
@@ -1095,9 +1042,7 @@ class Ldap
 					{
 						$objectsid = $this->getObjectSid($recordid);
 						$fulllist[$recordid][$attributeArray[$j]] = $objectsid;
-					}
-					else
-					{
+					} else {
 						if (in_array($attributeArray[$j], $attributeAsArray) && is_array($info[$i][$keyattributelower])) {
 							$valueTab = array();
 							foreach ($info[$i][$keyattributelower] as $key => $value) {
@@ -1170,9 +1115,7 @@ class Ldap
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else
-			{
+			} else {
 				$i++;
 				$i++;
 			}
@@ -1183,9 +1126,7 @@ class Ldap
 			$ldapBinary = ldap_get_values_len($this->connection, $entry, "objectsid");
 			$SIDText = $this->binSIDtoText($ldapBinary[0]);
 			return $SIDText;
-		}
-		else
-		{
+		} else {
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return '?';
 		}
@@ -1243,9 +1184,7 @@ class Ldap
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else
-		{
+		} else {
 			ldap_free_result($this->result);
 			return $result;
 		}
@@ -1283,9 +1222,7 @@ class Ldap
 				if ($result['count'] > 0) dol_syslog('Ldap::fetch search found '.$result['count'].' records');
 				else dol_syslog('Ldap::fetch search returns but found no records');
 				//var_dump($result);exit;
-			}
-			else
-			{
+			} else {
 				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 				dol_syslog(get_class($this)."::fetch search fails");
 				return -1;
@@ -1296,9 +1233,7 @@ class Ldap
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
-			}
-			else
-			{
+			} else {
 				break;
 			}
 		}
@@ -1307,9 +1242,7 @@ class Ldap
 		{
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->name       = $this->convToOutputCharset($result[0][$this->attr_name][0], $this->ldapcharset);
 			$this->firstname  = $this->convToOutputCharset($result[0][$this->attr_firstname][0], $this->ldapcharset);
 			$this->login      = $this->convToOutputCharset($result[0][$this->attr_login][0], $this->ldapcharset);
@@ -1323,9 +1256,7 @@ class Ldap
 			if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists
 			{
 				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0) ? $this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0], $this->ldapcharset)) : 0;
-			}
-			else
-			{
+			} else {
 				$this->pwdlastset = -1;
 			}
 			if (!$this->name && !$this->login) $this->pwdlastset = -1;
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index 8ab9e58aa58..b85cfc3f399 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -750,7 +750,7 @@ class Lessc {
 						if ($suffix !== null &&
 							$subProp[0] == "assign" &&
 							is_string($subProp[1]) &&
-							$subProp[1]{0} != $this->vPrefix
+							$subProp[1][0] != $this->vPrefix
 							) {
 								$subProp[2] = array(
 									'list', ' ',
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 1a844f86f2b..9d70458a198 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -98,7 +98,7 @@ class Link extends CommonObject
         $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 .= " 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)."'";
@@ -123,23 +123,17 @@ class Link extends CommonObject
                 dol_syslog(get_class($this)."::Create success id=".$this->id);
                 $this->db->commit();
                 return $this->id;
-            }
-            else
-            {
+            } else {
                 dol_syslog(get_class($this)."::Create echec update ".$this->error, LOG_ERR);
                 $this->db->rollback();
                 return -3;
             }
-        }
-        else
-        {
+        } else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 $this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
                 $result = -1;
-            }
-            else
-            {
+            } else {
                 $this->error = $this->db->lasterror();
                 $result = -2;
             }
@@ -181,7 +175,7 @@ class Link extends CommonObject
         $this->db->begin();
 
         $sql  = "UPDATE ".MAIN_DB_PREFIX."links SET ";
-        $sql .= "entity = '".$conf->entity."'";
+        $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)."'";
@@ -211,17 +205,13 @@ class Link extends CommonObject
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
             {
                 // Doublon
                 $this->error = $langs->trans("ErrorDuplicateField");
                 $result = -1;
-            }
-            else
-            {
+            } else {
                 $this->error = $langs->trans("Error sql = ".$sql);
                 $result = -2;
             }
@@ -245,7 +235,7 @@ class Link extends CommonObject
         global $conf;
 
         $sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE objecttype = '".$objecttype."' AND objectid = ".$objectid;
+        $sql .= " WHERE objecttype = '".$this->db->escape($objecttype)."' AND objectid = ".$objectid;
         if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
         if ($sortfield) {
             if (empty($sortorder)) {
@@ -296,7 +286,7 @@ class Link extends CommonObject
         global $conf;
 
         $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";
-        $sql .= " WHERE objecttype = '".$objecttype."' AND objectid = ".$objectid;
+        $sql .= " WHERE objecttype = '".$db->escape($objecttype)."' AND objectid = ".$objectid;
         if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
 
         $resql = $db->query($sql);
@@ -342,9 +332,7 @@ class Link extends CommonObject
                 $this->objecttype = $obj->objecttype;
                 $this->objectid = $obj->objectid;
                 return 1;
-            }
-            else
-			{
+            } else {
                 return 0;
             }
         } else {
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 60bf6474031..06bc79804bf 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -120,7 +120,8 @@ class Menu
         $nb = 0;
         foreach ($this->liste as $val)
         {
-            if (!empty($val['enabled'])) $nb++;
+        	//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/menubase.class.php b/htdocs/core/class/menubase.class.php
index 953064e6b4c..8695ef88ef4 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -29,749 +29,732 @@
  */
 class Menubase
 {
-    /**
-     * @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;
 
-    /**
-     * @var string Menu handler
-     */
-    public $menu_handler;
+	/**
+	 * @var string Menu handler
+	 */
+	public $menu_handler;
 
-    /**
-     * @var string Module name if record is added by a module
-     */
-    public $module;
+	/**
+	 * @var string Module name if record is added by a module
+	 */
+	public $module;
 
-    /**
-     * @var string Menu top or left
-     */
-    public $type;
+	/**
+	 * @var string Menu top or left
+	 */
+	public $type;
 
-    /**
-     * @var string Name family/module for top menu (home, companies, ...)
-     */
-    public $mainmenu;
+	/**
+	 * @var string Name family/module for top menu (home, companies, ...)
+	 */
+	public $mainmenu;
 
-    /**
-     * @var int 0 or Id of mother menu line, or -1 if we use fk_mainmenu and fk_leftmenu
-     */
-    public $fk_menu;
+	/**
+	 * @var int 0 or Id of mother menu line, or -1 if we use fk_mainmenu and fk_leftmenu
+	 */
+	public $fk_menu;
 
-    /**
-     * @var string fk_mainmenu
-     */
-    public $fk_mainmenu;
+	/**
+	 * @var string fk_mainmenu
+	 */
+	public $fk_mainmenu;
 
-    /**
-     * @var string fk_leftmenu
-     */
-    public $fk_leftmenu;
+	/**
+	 * @var string fk_leftmenu
+	 */
+	public $fk_leftmenu;
 
-    /**
-     * @var int Sort order of entry
-     */
-    public $position;
+	/**
+	 * @var int Sort order of entry
+	 */
+	public $position;
 
-    /**
-     * @var string Relative (or absolute) url to go
-     */
-    public $url;
+	/**
+	 * @var string Relative (or absolute) url to go
+	 */
+	public $url;
 
-    /**
-     * @var string Target of Url link
-     */
-    public $target;
+	/**
+	 * @var string Target of Url link
+	 */
+	public $target;
 
-    /**
-     * @var string Key for menu translation
-     * @deprecated
-     * @see $title
-     */
-    public $titre;
+	/**
+	 * @var string Key for menu translation
+	 * @deprecated
+	 * @see $title
+	 */
+	public $titre;
 
-    /**
-     * @var string Key for menu translation
-     */
-    public $title;
+	/**
+	 * @var string Key for menu translation
+	 */
+	public $title;
 
-    /**
-     * @var string Lang file to load for translation
-     */
-    public $langs;
+	/**
+	 * @var string Lang file to load for translation
+	 */
+	public $langs;
 
-    /**
-     * @var string Not used
-     * @deprecated
-     */
-    public $level;
+	/**
+	 * @var string Not used
+	 * @deprecated
+	 */
+	public $level;
 
-    /**
-     * @var string Name family/module for left menu (setup, info, ...)
-     */
-    public $leftmenu;
+	/**
+	 * @var string Name family/module for left menu (setup, info, ...)
+	 */
+	public $leftmenu;
 
-    /**
-     * @var string Condition to show enabled or disabled
-     */
-    public $perms;
+	/**
+	 * @var string Condition to show enabled or disabled
+	 */
+	public $perms;
 
-    /**
-     * @var string Condition to show or hide
-     */
-    public $enabled;
+	/**
+	 * @var string Condition to show or hide
+	 */
+	public $enabled;
 
-    /**
-     * @var int 0 if menu for all users, 1 for external only, 2 for internal only
-     */
-    public $user;
+	/**
+	 * @var int 0 if menu for all users, 1 for external only, 2 for internal only
+	 */
+	public $user;
 
-    /**
-     * @var int timestamp
-     */
-    public $tms;
+	/**
+	 * @var int timestamp
+	 */
+	public $tms;
 
 
-    /**
+	/**
 	 *  Constructor
 	 *
 	 *  @param		DoliDB		$db 		    Database handler
-     *  @param     	string		$menu_handler	Menu handler
-     */
-    public function __construct($db, $menu_handler = '')
-    {
-        $this->db = $db;
-        $this->menu_handler = $menu_handler;
-        return 1;
-    }
+	 *  @param     	string		$menu_handler	Menu handler
+	 */
+	public function __construct($db, $menu_handler = '')
+	{
+		$this->db = $db;
+		$this->menu_handler = $menu_handler;
+		return 1;
+	}
 
 
-    /**
-     *  Create menu entry into database
-     *
-     *  @param      User	$user       User that create
-     *  @return     int      			<0 if KO, Id of record if OK
-     */
-    public function create($user = null)
-    {
-        global $conf, $langs;
+	/**
+	 *  Create menu entry into database
+	 *
+	 *  @param      User	$user       User that create
+	 *  @return     int      			<0 if KO, Id of record if OK
+	 */
+	public function create($user = null)
+	{
+		global $conf, $langs;
 
-        // Clean parameters
-        $this->menu_handler = trim($this->menu_handler);
-        $this->module = trim($this->module);
-        $this->type = trim($this->type);
-        $this->mainmenu = trim($this->mainmenu);
-        $this->leftmenu = trim($this->leftmenu);
-        $this->fk_menu = (int) $this->fk_menu; // If -1, fk_mainmenu and fk_leftmenu must be defined
-        $this->fk_mainmenu = trim($this->fk_mainmenu);
-        $this->fk_leftmenu = trim($this->fk_leftmenu);
-        $this->position = (int) $this->position;
-        $this->url = trim($this->url);
-        $this->target = trim($this->target);
-        $this->titre = trim($this->titre);
-        $this->langs = trim($this->langs);
-        $this->perms = trim($this->perms);
-        $this->enabled = trim($this->enabled);
-        $this->user = (int) $this->user;
-        if (empty($this->position)) $this->position = 0;
-        if (!$this->level) $this->level = 0;
+		// Clean parameters
+		if (!isset($this->enabled)) $this->enabled = '1';
+		$this->menu_handler = trim($this->menu_handler);
+		$this->module = trim($this->module);
+		$this->type = trim($this->type);
+		$this->mainmenu = trim($this->mainmenu);
+		$this->leftmenu = trim($this->leftmenu);
+		$this->fk_menu = (int) $this->fk_menu; // If -1, fk_mainmenu and fk_leftmenu must be defined
+		$this->fk_mainmenu = trim($this->fk_mainmenu);
+		$this->fk_leftmenu = trim($this->fk_leftmenu);
+		$this->position = (int) $this->position;
+		$this->url = trim($this->url);
+		$this->target = trim($this->target);
+		$this->title = trim($this->title);
+		$this->langs = trim($this->langs);
+		$this->perms = trim($this->perms);
+		$this->enabled = trim($this->enabled);
+		$this->user = (int) $this->user;
+		if (empty($this->position)) $this->position = 0;
+		if (!$this->level) $this->level = 0;
 
-        // Check parameters
-        if (empty($this->menu_handler)) return -1;
+		// Check parameters
+		if (empty($this->menu_handler)) return -1;
 
-        // For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
-        // may use an already used value because its internal cursor does not increase when we do
-        // an insert with a forced id.
-        if (in_array($this->db->type, array('pgsql')))
-        {
-            $sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
-            $resqlrowid = $this->db->query($sql);
-            if ($resqlrowid) {
-                $obj = $this->db->fetch_object($resqlrowid);
-                $maxrowid = $obj->maxrowid;
+		// For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
+		// may use an already used value because its internal cursor does not increase when we do
+		// an insert with a forced id.
+		if (in_array($this->db->type, array('pgsql')))
+		{
+			$sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
+			$resqlrowid = $this->db->query($sql);
+			if ($resqlrowid) {
+				$obj = $this->db->fetch_object($resqlrowid);
+				$maxrowid = $obj->maxrowid;
 
-                // Max rowid can be empty if there is no record yet
-                if (empty($maxrowid)) $maxrowid = 1;
+				// Max rowid can be empty if there is no record yet
+				if (empty($maxrowid)) $maxrowid = 1;
 
-                $sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
-                //print $sql; exit;
-                $resqlrowidset = $this->db->query($sql);
-                if (!$resqlrowidset) dol_print_error($this->db);
-            }
-            else dol_print_error($this->db);
-        }
+				$sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
+				//print $sql; exit;
+				$resqlrowidset = $this->db->query($sql);
+				if (!$resqlrowidset) dol_print_error($this->db);
+			} else dol_print_error($this->db);
+		}
 
-        // Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
-        $sql = "SELECT count(*)";
-        $sql .= " FROM ".MAIN_DB_PREFIX."menu";
-        $sql .= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";
-        $sql .= " AND fk_menu = ".((int) $this->fk_menu);
-        $sql .= " AND position = ".((int) $this->position);
-        $sql .= " AND url = '".$this->db->escape($this->url)."'";
-        $sql .= " AND entity = ".$conf->entity;
+		// Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
+		$sql = "SELECT count(*)";
+		$sql .= " FROM ".MAIN_DB_PREFIX."menu";
+		$sql .= " WHERE menu_handler = '".$this->db->escape($this->menu_handler)."'";
+		$sql .= " AND fk_menu = ".((int) $this->fk_menu);
+		$sql .= " AND position = ".((int) $this->position);
+		$sql .= " AND url = '".$this->db->escape($this->url)."'";
+		$sql .= " AND entity = ".$conf->entity;
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-        	$row = $this->db->fetch_row($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$row = $this->db->fetch_row($result);
 
-        	if ($row[0] == 0)   // If not found
-        	{
-		        // Insert request
-		        $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
-		        $sql .= "menu_handler,";
-		        $sql .= "entity,";
-		        $sql .= "module,";
-		        $sql .= "type,";
-		        $sql .= "mainmenu,";
-		        $sql .= "leftmenu,";
-		        $sql .= "fk_menu,";
-		        $sql .= "fk_mainmenu,";
-		        $sql .= "fk_leftmenu,";
-		        $sql .= "position,";
-		        $sql .= "url,";
-		        $sql .= "target,";
-		        $sql .= "titre,";
-		        $sql .= "langs,";
-		        $sql .= "perms,";
-		        $sql .= "enabled,";
-		        $sql .= "usertype";
-		        $sql .= ") VALUES (";
-		        $sql .= " '".$this->db->escape($this->menu_handler)."',";
-		        $sql .= " '".$this->db->escape($conf->entity)."',";
-		        $sql .= " '".$this->db->escape($this->module)."',";
-		        $sql .= " '".$this->db->escape($this->type)."',";
-		        $sql .= " ".($this->mainmenu ? "'".$this->db->escape($this->mainmenu)."'" : "''").","; // Can't be null
-		        $sql .= " ".($this->leftmenu ? "'".$this->db->escape($this->leftmenu)."'" : "null").",";
-		        $sql .= " ".((int) $this->fk_menu).",";
-		        $sql .= " ".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
-		        $sql .= " ".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
-		        $sql .= " ".((int) $this->position).",";
-		        $sql .= " '".$this->db->escape($this->url)."',";
-		        $sql .= " '".$this->db->escape($this->target)."',";
-		        $sql .= " '".$this->db->escape($this->titre)."',";
-		        $sql .= " '".$this->db->escape($this->langs)."',";
-		        $sql .= " '".$this->db->escape($this->perms)."',";
-		        $sql .= " '".$this->db->escape($this->enabled)."',";
-		        $sql .= " '".$this->db->escape($this->user)."'";
-		        $sql .= ")";
+			if ($row[0] == 0)   // If not found
+			{
+				// Insert request
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
+				$sql .= "menu_handler,";
+				$sql .= "entity,";
+				$sql .= "module,";
+				$sql .= "type,";
+				$sql .= "mainmenu,";
+				$sql .= "leftmenu,";
+				$sql .= "fk_menu,";
+				$sql .= "fk_mainmenu,";
+				$sql .= "fk_leftmenu,";
+				$sql .= "position,";
+				$sql .= "url,";
+				$sql .= "target,";
+				$sql .= "titre,";
+				$sql .= "langs,";
+				$sql .= "perms,";
+				$sql .= "enabled,";
+				$sql .= "usertype";
+				$sql .= ") VALUES (";
+				$sql .= " '".$this->db->escape($this->menu_handler)."',";
+				$sql .= " '".$this->db->escape($conf->entity)."',";
+				$sql .= " '".$this->db->escape($this->module)."',";
+				$sql .= " '".$this->db->escape($this->type)."',";
+				$sql .= " ".($this->mainmenu ? "'".$this->db->escape($this->mainmenu)."'" : "''").","; // Can't be null
+				$sql .= " ".($this->leftmenu ? "'".$this->db->escape($this->leftmenu)."'" : "null").",";
+				$sql .= " ".((int) $this->fk_menu).",";
+				$sql .= " ".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
+				$sql .= " ".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
+				$sql .= " ".((int) $this->position).",";
+				$sql .= " '".$this->db->escape($this->url)."',";
+				$sql .= " '".$this->db->escape($this->target)."',";
+				$sql .= " '".$this->db->escape($this->title)."',";
+				$sql .= " '".$this->db->escape($this->langs)."',";
+				$sql .= " '".$this->db->escape($this->perms)."',";
+				$sql .= " '".$this->db->escape($this->enabled)."',";
+				$sql .= " '".$this->db->escape($this->user)."'";
+				$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."menu");
-		            dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
+				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."menu");
+					dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
 
-		            return $this->id;
-		        }
-		        else
-		        {
-		            $this->error = "Error ".$this->db->lasterror();
-		            return -1;
-		        }
-        	}
-        	else
-        	{
-        		dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);
-        		$this->error = 'Error Menu entry already exists';
-        		return 0;
-        	}
-        }
-        else
-        {
-        	return -1;
-        }
-    }
+					return $this->id;
+				} else {
+					$this->error = "Error ".$this->db->lasterror();
+					return -1;
+				}
+			} else {
+				dol_syslog(get_class($this)."::create menu entry already exists", LOG_WARNING);
+				$this->error = 'Error Menu entry already exists';
+				return 0;
+			}
+		} else {
+			return -1;
+		}
+	}
 
-    /**
-     *  Update menu entry into 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;
+	/**
+	 *  Update menu entry into 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;
 
-        // Clean parameters
-        $this->rowid = trim($this->rowid);
-        $this->menu_handler = trim($this->menu_handler);
-        $this->module = trim($this->module);
-        $this->type = trim($this->type);
-        $this->mainmenu = trim($this->mainmenu);
-        $this->leftmenu = trim($this->leftmenu);
-        $this->fk_menu = (int) $this->fk_menu;
-        $this->fk_mainmenu = trim($this->fk_mainmenu);
-        $this->fk_leftmenu = trim($this->fk_leftmenu);
-        $this->position = (int) $this->position;
-        $this->url = trim($this->url);
-        $this->target = trim($this->target);
-        $this->titre = trim($this->titre);
-        $this->langs = trim($this->langs);
-        $this->perms = trim($this->perms);
-        $this->enabled = trim($this->enabled);
-        $this->user = (int) $this->user;
+		// Clean parameters
+		$this->rowid = trim($this->rowid);
+		$this->menu_handler = trim($this->menu_handler);
+		$this->module = trim($this->module);
+		$this->type = trim($this->type);
+		$this->mainmenu = trim($this->mainmenu);
+		$this->leftmenu = trim($this->leftmenu);
+		$this->fk_menu = (int) $this->fk_menu;
+		$this->fk_mainmenu = trim($this->fk_mainmenu);
+		$this->fk_leftmenu = trim($this->fk_leftmenu);
+		$this->position = (int) $this->position;
+		$this->url = trim($this->url);
+		$this->target = trim($this->target);
+		$this->title = trim($this->title);
+		$this->langs = trim($this->langs);
+		$this->perms = trim($this->perms);
+		$this->enabled = trim($this->enabled);
+		$this->user = (int) $this->user;
 
-        // Check parameters
-        // Put here code to add control on parameters values
+		// Check parameters
+		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
-        $sql .= " menu_handler='".$this->db->escape($this->menu_handler)."',";
-        $sql .= " module='".$this->db->escape($this->module)."',";
-        $sql .= " type='".$this->db->escape($this->type)."',";
-        $sql .= " mainmenu='".$this->db->escape($this->mainmenu)."',";
-        $sql .= " leftmenu='".$this->db->escape($this->leftmenu)."',";
-        $sql .= " fk_menu=".$this->fk_menu.",";
-        $sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
-        $sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
-        $sql .= " position=".($this->position > 0 ? $this->position : 0).",";
-        $sql .= " url='".$this->db->escape($this->url)."',";
-        $sql .= " target='".$this->db->escape($this->target)."',";
-        $sql .= " titre='".$this->db->escape($this->titre)."',";
-        $sql .= " langs='".$this->db->escape($this->langs)."',";
-        $sql .= " perms='".$this->db->escape($this->perms)."',";
-        $sql .= " enabled='".$this->db->escape($this->enabled)."',";
-        $sql .= " usertype='".$this->db->escape($this->user)."'";
-        $sql .= " WHERE rowid=".$this->id;
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
+		$sql .= " menu_handler='".$this->db->escape($this->menu_handler)."',";
+		$sql .= " module='".$this->db->escape($this->module)."',";
+		$sql .= " type='".$this->db->escape($this->type)."',";
+		$sql .= " mainmenu='".$this->db->escape($this->mainmenu)."',";
+		$sql .= " leftmenu='".$this->db->escape($this->leftmenu)."',";
+		$sql .= " fk_menu=".$this->fk_menu.",";
+		$sql .= " fk_mainmenu=".($this->fk_mainmenu ? "'".$this->db->escape($this->fk_mainmenu)."'" : "null").",";
+		$sql .= " fk_leftmenu=".($this->fk_leftmenu ? "'".$this->db->escape($this->fk_leftmenu)."'" : "null").",";
+		$sql .= " position=".($this->position > 0 ? $this->position : 0).",";
+		$sql .= " url='".$this->db->escape($this->url)."',";
+		$sql .= " target='".$this->db->escape($this->target)."',";
+		$sql .= " titre='".$this->db->escape($this->title)."',";
+		$sql .= " langs='".$this->db->escape($this->langs)."',";
+		$sql .= " perms='".$this->db->escape($this->perms)."',";
+		$sql .= " enabled='".$this->db->escape($this->enabled)."',";
+		$sql .= " usertype='".$this->db->escape($this->user)."'";
+		$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;
-        }
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
 
-        return 1;
-    }
+		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;
+	/**
+	 *   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.menu_handler,";
-        $sql .= " t.entity,";
-        $sql .= " t.module,";
-        $sql .= " t.type,";
-        $sql .= " t.mainmenu,";
-        $sql .= " t.leftmenu,";
-        $sql .= " t.fk_menu,";
-        $sql .= " t.fk_mainmenu,";
-        $sql .= " t.fk_leftmenu,";
-        $sql .= " t.position,";
-        $sql .= " t.url,";
-        $sql .= " t.target,";
-        $sql .= " t.titre,";
-        $sql .= " t.langs,";
-        $sql .= " t.perms,";
-        $sql .= " t.enabled,";
-        $sql .= " t.usertype as user,";
-        $sql .= " t.tms";
-        $sql .= " FROM ".MAIN_DB_PREFIX."menu as t";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.menu_handler,";
+		$sql .= " t.entity,";
+		$sql .= " t.module,";
+		$sql .= " t.type,";
+		$sql .= " t.mainmenu,";
+		$sql .= " t.leftmenu,";
+		$sql .= " t.fk_menu,";
+		$sql .= " t.fk_mainmenu,";
+		$sql .= " t.fk_leftmenu,";
+		$sql .= " t.position,";
+		$sql .= " t.url,";
+		$sql .= " t.target,";
+		$sql .= " t.titre as title,";
+		$sql .= " t.langs,";
+		$sql .= " t.perms,";
+		$sql .= " t.enabled,";
+		$sql .= " t.usertype as user,";
+		$sql .= " t.tms";
+		$sql .= " FROM ".MAIN_DB_PREFIX."menu 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->menu_handler = $obj->menu_handler;
-                $this->entity = $obj->entity;
-                $this->module = $obj->module;
-                $this->type = $obj->type;
-                $this->mainmenu = $obj->mainmenu;
-                $this->leftmenu = $obj->leftmenu;
-                $this->fk_menu = $obj->fk_menu;
-                $this->fk_mainmenu = $obj->fk_mainmenu;
-                $this->fk_leftmenu = $obj->fk_leftmenu;
-                $this->position = $obj->position;
-                $this->url = $obj->url;
-                $this->target = $obj->target;
-                $this->titre = $obj->titre;
-                $this->langs = $obj->langs;
-                $this->perms = $obj->perms;
-                $this->enabled = str_replace("\"", "'", $obj->enabled);
-                $this->user = $obj->user;
-                $this->tms = $this->db->jdate($obj->tms);
-            }
-            $this->db->free($resql);
+				$this->menu_handler = $obj->menu_handler;
+				$this->entity = $obj->entity;
+				$this->module = $obj->module;
+				$this->type = $obj->type;
+				$this->mainmenu = $obj->mainmenu;
+				$this->leftmenu = $obj->leftmenu;
+				$this->fk_menu = $obj->fk_menu;
+				$this->fk_mainmenu = $obj->fk_mainmenu;
+				$this->fk_leftmenu = $obj->fk_leftmenu;
+				$this->position = $obj->position;
+				$this->url = $obj->url;
+				$this->target = $obj->target;
+				$this->title = $obj->title;
+				$this->langs = $obj->langs;
+				$this->perms = $obj->perms;
+				$this->enabled = str_replace("\"", "'", $obj->enabled);
+				$this->user = $obj->user;
+				$this->tms = $this->db->jdate($obj->tms);
+			}
+			$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
-     */
-    public function delete($user)
-    {
-        //global $conf, $langs;
+	/**
+	 *  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;
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
+		$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;
-        }
+		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;
-    }
+		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;
+	/**
+	 *  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->menu_handler = 'all';
-        $this->module = 'specimen';
-        $this->type = 'top';
-        $this->mainmenu = '';
-        $this->fk_menu = '0';
-        $this->position = '';
-        $this->url = 'http://dummy';
-        $this->target = '';
-        $this->titre = 'Specimen menu'; // deprecated
-        $this->title = 'Specimen menu';
-        $this->langs = '';
-        $this->level = '';
-        $this->leftmenu = '';
-        $this->perms = '';
-        $this->enabled = '';
-        $this->user = '';
-        $this->tms = '';
-    }
+		$this->menu_handler = 'all';
+		$this->module = 'specimen';
+		$this->type = 'top';
+		$this->mainmenu = '';
+		$this->fk_menu = '0';
+		$this->position = '';
+		$this->url = 'http://dummy';
+		$this->target = '';
+		$this->title = 'Specimen menu';
+		$this->langs = '';
+		$this->leftmenu = '';
+		$this->perms = '';
+		$this->enabled = '';
+		$this->user = '';
+		$this->tms = '';
+	}
 
 
-    /**
-     *	Load tabMenu array with top menu entries found into database.
-     *
-     * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (always '')
-     * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
-     * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
-     * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
-     * 	@param  array	$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
-     * 	@return	array					Return array with menu entries for top menu
-     */
-    public function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
-    {
-        global $langs, $user, $conf; // To export to dol_eval function
-        global $mainmenu, $leftmenu; // To export to dol_eval function
+	/**
+	 *	Load tabMenu array with top menu entries found into database.
+	 *
+	 * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (always '')
+	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
+	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
+	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
+	 * 	@param  array	$tabMenu       If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+	 * 	@return	array					Return array with menu entries for top menu
+	 */
+	public function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
+	{
+		global $langs, $user, $conf; // To export to dol_eval function
+		global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu = $mymainmenu; // To export to dol_eval function
-        $leftmenu = $myleftmenu; // To export to dol_eval function
+		$mainmenu = $mymainmenu; // To export to dol_eval function
+		$leftmenu = $myleftmenu; // To export to dol_eval function
 
-        $newTabMenu = array();
-        foreach ($tabMenu as $val)
-        {
-            if ($val['type'] == 'top') $newTabMenu[] = $val;
-        }
+		$newTabMenu = array();
+		foreach ($tabMenu as $val)
+		{
+			if ($val['type'] == 'top') $newTabMenu[] = $val;
+		}
 
-        return $newTabMenu;
-    }
+		return $newTabMenu;
+	}
 
-    /**
-     * 	Load entries found from database (and stored into $tabMenu) in $this->newmenu array.
-     *  Warning: Entries in $tabMenu must have child after parent
-     *
-     * 	@param	Menu	$newmenu        Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy)
-     * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (often $_SESSION["mainmenu"])
-     * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
-     * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
-     * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
-     * 	@param  array	$tabMenu       Array with menu entries already loaded
-     * 	@return Menu    		       	Menu array for particular mainmenu value or full tabArray
-     */
-    public function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
-    {
-        global $langs, $user, $conf; // To export to dol_eval function
-        global $mainmenu, $leftmenu; // To export to dol_eval function
+	/**
+	 * 	Load entries found from database (and stored into $tabMenu) in $this->newmenu array.
+	 *  Warning: Entries in $tabMenu must have child after parent
+	 *
+	 * 	@param	Menu	$newmenu        Menu array to complete (in most cases, it's empty, may be already initialized with some menu manager like eldy)
+	 * 	@param	string	$mymainmenu		Value for mainmenu to filter menu to load (often $_SESSION["mainmenu"])
+	 * 	@param	string	$myleftmenu		Value for leftmenu to filter menu to load (always '')
+	 * 	@param	int		$type_user		0=Menu for backoffice, 1=Menu for front office
+	 * 	@param	string	$menu_handler	Filter on name of menu_handler used (auguria, eldy...)
+	 * 	@param  array	$tabMenu       Array with menu entries already loaded
+	 * 	@return Menu    		       	Menu array for particular mainmenu value or full tabArray
+	 */
+	public function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
+	{
+		global $langs, $user, $conf; // To export to dol_eval function
+		global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu = $mymainmenu; // To export to dol_eval function
-        $leftmenu = $myleftmenu; // To export to dol_eval function
+		$mainmenu = $mymainmenu; // To export to dol_eval function
+		$leftmenu = $myleftmenu; // To export to dol_eval function
 
-        // Detect what is top mainmenu id
-        $menutopid = '';
-        foreach ($tabMenu as $key => $val)
-        {
-            // Define menutopid of mainmenu
-            if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
-            {
-                $menutopid = $val['rowid'];
-                break;
-            }
-        }
+		// Detect what is top mainmenu id
+		$menutopid = '';
+		foreach ($tabMenu as $key => $val)
+		{
+			// Define menutopid of mainmenu
+			if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
+			{
+				$menutopid = $val['rowid'];
+				break;
+			}
+		}
 
-        // We initialize newmenu with first already found menu entries
-        $this->newmenu = $newmenu;
+		// We initialize newmenu with first already found menu entries
+		$this->newmenu = $newmenu;
 
-        // Now complete $this->newmenu->list to add entries found into $tabMenu that are childs of mainmenu=$menutopid, using the fk_menu link that is int (old method)
-        $this->recur($tabMenu, $menutopid, 1);
+		// Now complete $this->newmenu->list to add entries found into $tabMenu that are childs of mainmenu=$menutopid, using the fk_menu link that is int (old method)
+		$this->recur($tabMenu, $menutopid, 1);
 
-        // Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
-        foreach ($tabMenu as $key => $val)
-        {
-        	//var_dump($tabMenu);
-        	if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
-        	{
-        		//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
-        		//var_dump($this->newmenu->liste);exit;
+		// Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
+		foreach ($tabMenu as $key => $val)
+		{
+			//var_dump($tabMenu);
+			if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
+			{
+				//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
+				//var_dump($this->newmenu->liste);exit;
 
-        		if (empty($val['fk_leftmenu']))
-        		{
-        			$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-        			//var_dump($this->newmenu->liste);
-        		}
-        		else
-        		{
-        			// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
-        			$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;
-        			foreach ($this->newmenu->liste as $keyparent => $valparent)
-        			{
-        				//var_dump($valparent);
-        				if ($searchlastsub)    // If we started to search for last submenu
-        				{
-        					if ($valparent['level'] >= $searchlastsub) $lastid = $keyparent;
-        					if ($valparent['level'] < $searchlastsub)
-        					{
-        						$nextid = $keyparent;
-        						break;
-        					}
-        				}
-        				if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu'])
-        				{
-        					//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
-        					// Now we look to find last subelement of this parent (we add at end)
-        					$searchlastsub = ($valparent['level'] + 1);
-        					$lastid = $keyparent;
-        					$found = 1;
-        				}
-        			}
-        			//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
-        			if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
-        			else {
-        			    dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
-        			    //print "Parent menu not found !!<br>";
-        			}
-        		}
-        	}
-        }
+				if (empty($val['fk_leftmenu']))
+				{
+					$this->newmenu->add($val['url'], $val['titre'], 0, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+					//var_dump($this->newmenu->liste);
+				} else {
+					// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
+					$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;
+					foreach ($this->newmenu->liste as $keyparent => $valparent)
+					{
+						//var_dump($valparent);
+						if ($searchlastsub)    // If we started to search for last submenu
+						{
+							if ($valparent['level'] >= $searchlastsub) $lastid = $keyparent;
+							if ($valparent['level'] < $searchlastsub)
+							{
+								$nextid = $keyparent;
+								break;
+							}
+						}
+						if ($valparent['mainmenu'] == $val['fk_mainmenu'] && $valparent['leftmenu'] == $val['fk_leftmenu'])
+						{
+							//print "We found parent: keyparent='.$keyparent.' - level=".$valparent['level'].' - '.join(',',$valparent).'<br>';
+							// Now we look to find last subelement of this parent (we add at end)
+							$searchlastsub = ($valparent['level'] + 1);
+							$lastid = $keyparent;
+							$found = 1;
+						}
+					}
+					//print 'We must insert menu entry between entry '.$lastid.' and '.$nextid.'<br>';
+					if ($found) $this->newmenu->insert($lastid, $val['url'], $val['titre'], $searchlastsub, $val['perms'], $val['target'], $val['mainmenu'], $val['leftmenu'], $val['position']);
+					else {
+						dol_syslog("Error. Modules ".$val['module']." has defined a menu entry with a parent='fk_mainmenu=".$val['fk_leftmenu'].",fk_leftmenu=".$val['fk_leftmenu']."' and position=".$val['position'].'. The parent was not found. May be you forget it into your definition of menu, or may be the parent has a "position" that is after the child (fix field "position" of parent or child in this case).', LOG_WARNING);
+						//print "Parent menu not found !!<br>";
+					}
+				}
+			}
+		}
 
-        return $this->newmenu;
-    }
+		return $this->newmenu;
+	}
 
 
-    /**
-     *  Load entries found in database into variable $tabMenu. Note that only "database menu entries" are loaded here, hardcoded will not be present into output.
-     *
-     *  @param	string	$mymainmenu     Value for mainmenu that defined mainmenu
-     *  @param	string	$myleftmenu     Value for left that defined leftmenu
-     *  @param  int		$type_user      Looks for menu entry for 0=Internal users, 1=External users
-     *  @param  string	$menu_handler   Name of menu_handler used ('auguria', 'eldy'...)
-     *  @param  array	$tabMenu        Array to store new entries found (in most cases, it's empty, but may be alreay filled)
-     *  @return int     		        >0 if OK, <0 if KO
-     */
-    public function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
-    {
-        global $langs, $user, $conf; // To export to dol_eval function
-        global $mainmenu, $leftmenu; // To export to dol_eval function
+	/**
+	 *  Load entries found in database into variable $tabMenu. Note that only "database menu entries" are loaded here, hardcoded will not be present into output.
+	 *
+	 *  @param	string	$mymainmenu     Value for mainmenu that defined mainmenu
+	 *  @param	string	$myleftmenu     Value for left that defined leftmenu
+	 *  @param  int		$type_user      Looks for menu entry for 0=Internal users, 1=External users
+	 *  @param  string	$menu_handler   Name of menu_handler used ('auguria', 'eldy'...)
+	 *  @param  array	$tabMenu        Array to store new entries found (in most cases, it's empty, but may be alreay filled)
+	 *  @return int     		        >0 if OK, <0 if KO
+	 */
+	public function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
+	{
+		global $langs, $user, $conf; // To export to dol_eval function
+		global $mainmenu, $leftmenu; // To export to dol_eval function
 
-        $mainmenu = $mymainmenu; // To export to dol_eval function
-        $leftmenu = $myleftmenu; // To export to dol_eval function
+		$mainmenu = $mymainmenu; // To export to dol_eval function
+		$leftmenu = $myleftmenu; // To export to dol_eval function
 
-        $sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
-        $sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
-        $sql .= " WHERE m.entity IN (0,".$conf->entity.")";
-        $sql .= " AND m.menu_handler IN ('".$menu_handler."','all')";
-        if ($type_user == 0) $sql .= " AND m.usertype IN (0,2)";
-        if ($type_user == 1) $sql .= " AND m.usertype IN (1,2)";
-        $sql .= " ORDER BY m.position, m.rowid";
-        //print $sql;
+		$sql = "SELECT m.rowid, m.type, m.module, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu, m.url, m.titre, m.langs, m.perms, m.enabled, m.target, m.mainmenu, m.leftmenu, m.position";
+		$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
+		$sql .= " WHERE m.entity IN (0,".$conf->entity.")";
+		$sql .= " AND m.menu_handler IN ('".$this->db->escape($menu_handler)."','all')";
+		if ($type_user == 0) $sql .= " AND m.usertype IN (0,2)";
+		if ($type_user == 1) $sql .= " AND m.usertype IN (1,2)";
+		$sql .= " ORDER BY m.position, m.rowid";
+		//print $sql;
 
-        //dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $numa = $this->db->num_rows($resql);
+		//dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$numa = $this->db->num_rows($resql);
 
-            $a = 0;
-            $b = 0;
-            while ($a < $numa)
-            {
-                //$objm = $this->db->fetch_object($resql);
-                $menu = $this->db->fetch_array($resql);
+			$a = 0;
+			$b = 0;
+			while ($a < $numa)
+			{
+				//$objm = $this->db->fetch_object($resql);
+				$menu = $this->db->fetch_array($resql);
 
-                // Define $right
-                $perms = true;
-                if (isset($menu['perms']))
-                {
-                	$tmpcond = $menu['perms'];
-                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
-                	$perms = verifCond($tmpcond);
-                    //print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
-                }
+				// Define $right
+				$perms = true;
+				if (isset($menu['perms']))
+				{
+					$tmpcond = $menu['perms'];
+					if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+					$perms = verifCond($tmpcond);
+					//print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
+				}
 
-                // Define $enabled
-                $enabled = true;
-                if (isset($menu['enabled']))
-                {
-                	$tmpcond = $menu['enabled'];
-                	if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
-                    $enabled = verifCond($tmpcond);
-                }
+				// Define $enabled
+				$enabled = true;
+				if (isset($menu['enabled']))
+				{
+					$tmpcond = $menu['enabled'];
+					if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+					$enabled = verifCond($tmpcond);
+				}
 
-                // Define $title
-                if ($enabled)
-                {
-                	$title = $langs->trans($menu['titre']); // If $menu['titre'] start with $, a dol_eval is done.
-                	//var_dump($title.'-'.$menu['titre']);
-                    if ($title == $menu['titre'])   // Translation not found
-                    {
-                        if (!empty($menu['langs']))    // If there is a dedicated translation file
-                        {
-                        	//print 'Load file '.$menu['langs'].'<br>';
-                            $langs->load($menu['langs']);
-                        }
+				// Define $title
+				if ($enabled)
+				{
+					$title = $langs->trans($menu['titre']); // If $menu['titre'] start with $, a dol_eval is done.
+					//var_dump($title.'-'.$menu['titre']);
+					if ($title == $menu['titre'])   // Translation not found
+					{
+						if (!empty($menu['langs']))    // If there is a dedicated translation file
+						{
+							//print 'Load file '.$menu['langs'].'<br>';
+							$langs->load($menu['langs']);
+						}
 
-                        $substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-                        $menu['titre'] = make_substitutions($menu['titre'], $substitarray);
+						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+						$menu['titre'] = make_substitutions($menu['titre'], $substitarray);
 
-                        if (preg_match("/\//", $menu['titre'])) // To manage translation when title is string1/string2
-                        {
-                            $tab_titre = explode("/", $menu['titre']);
-                            $title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
-                        }
-                        elseif (preg_match('/\|\|/', $menu['titre']))
-                        {
-                            // To manage different translation (Title||AltTitle@ConditionForAltTitle)
-                        	$tab_title = explode("||", $menu['titre']);
-                        	$alt_title = explode("@", $tab_title[1]);
-                        	$title_enabled = verifCond($alt_title[1]);
-                        	$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
-                        }
-                        else
-                        {
-                            $title = $langs->trans($menu['titre']);
-                        }
-                    }
-                    //$tmp4=microtime(true);
-                    //print '>>> 3 '.($tmp4 - $tmp3).'<br>';
+						if (preg_match("/\//", $menu['titre'])) // To manage translation when title is string1/string2
+						{
+							$tab_titre = explode("/", $menu['titre']);
+							$title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
+						} elseif (preg_match('/\|\|/', $menu['titre']))
+						{
+							// To manage different translation (Title||AltTitle@ConditionForAltTitle)
+							$tab_title = explode("||", $menu['titre']);
+							$alt_title = explode("@", $tab_title[1]);
+							$title_enabled = verifCond($alt_title[1]);
+							$title = ($title_enabled ? $langs->trans($alt_title[0]) : $langs->trans($tab_title[0]));
+						} else {
+							$title = $langs->trans($menu['titre']);
+						}
+					}
+					//$tmp4=microtime(true);
+					//print '>>> 3 '.($tmp4 - $tmp3).'<br>';
 
-                    // We complete tabMenu
-                    $tabMenu[$b]['rowid']       = $menu['rowid'];
-                    $tabMenu[$b]['module']      = $menu['module'];
-                    $tabMenu[$b]['fk_menu']     = $menu['fk_menu'];
-                    $tabMenu[$b]['url']         = $menu['url'];
-                    if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url']))
-                    {
-                        if (preg_match('/\?/', $tabMenu[$b]['url'])) $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];
-                        else $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];
-                    }
-                    $tabMenu[$b]['titre']       = $title;
-                    $tabMenu[$b]['target']      = $menu['target'];
-                    $tabMenu[$b]['mainmenu']    = $menu['mainmenu'];
-                    $tabMenu[$b]['leftmenu']    = $menu['leftmenu'];
-                    $tabMenu[$b]['perms']       = $perms;
-                    $tabMenu[$b]['langs']       = $menu['langs'];	// Note that this should not be used, lang file should be already loaded.
-                    $tabMenu[$b]['enabled']     = $enabled;
-                    $tabMenu[$b]['type']        = $menu['type'];
-                    $tabMenu[$b]['fk_mainmenu'] = $menu['fk_mainmenu'];
-                    $tabMenu[$b]['fk_leftmenu'] = $menu['fk_leftmenu'];
-                    $tabMenu[$b]['position']    = (int) $menu['position'];
+					// We complete tabMenu
+					$tabMenu[$b]['rowid']       = $menu['rowid'];
+					$tabMenu[$b]['module']      = $menu['module'];
+					$tabMenu[$b]['fk_menu']     = $menu['fk_menu'];
+					$tabMenu[$b]['url']         = $menu['url'];
+					if (!preg_match("/^(http:\/\/|https:\/\/)/i", $tabMenu[$b]['url']))
+					{
+						if (preg_match('/\?/', $tabMenu[$b]['url'])) $tabMenu[$b]['url'] .= '&amp;idmenu='.$menu['rowid'];
+						else $tabMenu[$b]['url'] .= '?idmenu='.$menu['rowid'];
+					}
+					$tabMenu[$b]['titre']       = $title;
+					$tabMenu[$b]['target']      = $menu['target'];
+					$tabMenu[$b]['mainmenu']    = $menu['mainmenu'];
+					$tabMenu[$b]['leftmenu']    = $menu['leftmenu'];
+					$tabMenu[$b]['perms']       = $perms;
+					$tabMenu[$b]['langs']       = $menu['langs']; // Note that this should not be used, lang file should be already loaded.
+					$tabMenu[$b]['enabled']     = $enabled;
+					$tabMenu[$b]['type']        = $menu['type'];
+					$tabMenu[$b]['fk_mainmenu'] = $menu['fk_mainmenu'];
+					$tabMenu[$b]['fk_leftmenu'] = $menu['fk_leftmenu'];
+					$tabMenu[$b]['position']    = (int) $menu['position'];
 
-                    $b++;
-                }
+					$b++;
+				}
 
-                $a++;
-            }
-            $this->db->free($resql);
+				$a++;
+			}
+			$this->db->free($resql);
 
-            // Currently $tabMenu is sorted on position.
-            // If a child have a position lower that its parent, we can make a loop to fix this here, but we prefer to show a warning
-            // into the leftMenuCharger later to avoid useless operations.
+			// Currently $tabMenu is sorted on position.
+			// If a child have a position lower that its parent, we can make a loop to fix this here, but we prefer to show a warning
+			// into the leftMenuCharger later to avoid useless operations.
 
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *  Complete this->newmenu with menu entry found in $tab
-     *
-     *  @param  array	$tab			Tab array with all menu entries
-     *  @param  int		$pere			Id of parent
-     *  @param  int		$level			Level
-     *  @return	void
-     */
-    private function recur($tab, $pere, $level)
-    {
-        // Loop on tab array
-        $num = count($tab);
-        for ($x = 0; $x < $num; $x++)
-        {
-            //si un element a pour pere : $pere
-            if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
-            {
-                $this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
-                $this->recur($tab, $tab[$x]['rowid'], ($level + 1));
-            }
-        }
-    }
+	/**
+	 *  Complete this->newmenu with menu entry found in $tab
+	 *
+	 *  @param  array	$tab			Tab array with all menu entries
+	 *  @param  int		$pere			Id of parent
+	 *  @param  int		$level			Level
+	 *  @return	void
+	 */
+	private function recur($tab, $pere, $level)
+	{
+		// Loop on tab array
+		$num = count($tab);
+		for ($x = 0; $x < $num; $x++)
+		{
+			//si un element a pour pere : $pere
+			if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled'])
+			{
+				$this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu']);
+				$this->recur($tab, $tab[$x]['rowid'], ($level + 1));
+			}
+		}
+	}
 }
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index a930cc97d2d..82b6c8859bc 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -171,7 +171,7 @@ class Notify
 				if ($notifcode)
 				{
 					if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
-					else $sql .= " AND a.code = '".$notifcode."'"; // New usage
+					else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
 				}
 				$sql .= " AND s.entity IN (".getEntity('societe').")";
 				if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
@@ -194,9 +194,7 @@ class Notify
 						}
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -216,7 +214,7 @@ class Notify
 				if ($notifcode)
 				{
 					if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
-					else $sql .= " AND a.code = '".$notifcode."'"; // New usage
+					else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
 				}
 				$sql .= " AND c.entity IN (".getEntity('user').")";
 				if ($userid > 0) $sql .= " AND c.rowid = ".$userid;
@@ -239,9 +237,7 @@ class Notify
 						}
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
@@ -258,9 +254,7 @@ class Notify
 					if ($notifcode)
 					{
 						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
-					}
-					else
-					{
+					} else {
 						if ($val == '' || !preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue;
 					}
 
@@ -279,8 +273,7 @@ class Notify
 								$tmpuser->fetch($user->fk_user);
 								if ($tmpuser->email) $newval2 = trim($tmpuser->email);
 								else $newval2 = '';
-							}
-							else $newval2 = '';
+							} else $newval2 = '';
 						}
 						if ($newval2)
 						{
@@ -362,7 +355,7 @@ class Notify
 			$sql .= " AND n.fk_soc = s.rowid";
 			$sql .= " AND c.statut = 1";
 			if (is_numeric($notifcode)) $sql .= " AND n.fk_action = ".$notifcode; // Old usage
-			else $sql .= " AND a.code = '".$notifcode."'"; // New usage
+			else $sql .= " AND a.code = '".$this->db->escape($notifcode)."'"; // New usage
 			$sql .= " AND s.rowid = ".$object->socid;
 
 			$sql .= "\nUNION\n";
@@ -522,9 +515,7 @@ class Notify
 						{
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
-						}
-						else
-						{
+						} else {
 							$filepdf = $pdf_path;
 						}
 
@@ -567,8 +558,7 @@ class Notify
 							if ($obj->type_target == 'touserid') {
 	 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_user, type, objet_type, type_target, objet_id, email)";
 								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
-							}
-							else {
+							} else {
 								$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, type_target, objet_id, email)";
 								$sql .= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".($object->socid ? $object->socid : 'null').", ".$obj->cid.", '".$obj->type."', '".$object_type."', '".$obj->type_target."', ".$object->id.", '".$this->db->escape($obj->email)."')";
 							}
@@ -576,27 +566,19 @@ class Notify
 							{
 								dol_print_error($this->db);
 							}
-						}
-						else
-						{
+						} else {
 							$error++;
 							$this->errors[] = $mailfile->error;
 						}
-					}
-					else
-				    {
+					} else {
 						dol_syslog("No notification sent for ".$sendto." because email is empty");
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog("No notification to thirdparty sent, nothing into notification setup for the thirdparty socid = ".$object->socid);
 			}
-		}
-		else
-		{
+		} else {
 	   		$error++;
 			$this->errors[] = $this->db->lasterror();
 			dol_syslog("Failed to get list of notification to send ".$this->db->lasterror(), LOG_ERR);
@@ -743,9 +725,7 @@ class Notify
 				{
 					// We can't add PDF as it is not generated yet.
 					$filepdf = '';
-				}
-				else
-				{
+				} else {
 					$filepdf = $pdf_path;
 				}
 
@@ -808,9 +788,7 @@ class Notify
 						{
 							dol_print_error($this->db);
 						}
-					}
-					else
-					{
+					} else {
 						$error++;
 						$this->errors[] = $mailfile->error;
 					}
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index ed684529f33..19a94bca9f6 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -218,9 +218,7 @@ class SimpleOpenID
         if (count($this->error) > 0)
         {
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
@@ -458,9 +456,7 @@ class SimpleOpenID
             echo '<script language="JavaScript" type="text/javascript">window.location=\'';
             echo $redirect_to;
             echo '\';</script>';
-        }
-        else
-        {	// Default Header Redirect
+        } else {	// Default Header Redirect
             header('Location: '.$redirect_to);
         }
     }
@@ -502,9 +498,7 @@ class SimpleOpenID
         if ($data['is_valid'] == "true")
         {
             return true;
-        }
-        else
-        {
+        } else {
             return false;
         }
     }
@@ -554,9 +548,7 @@ class SimpleOpenID
         {
             $this->ErrorStore('OPENID_NOSERVERSFOUND');
             return false;
-        }
-        else
-        {
+        } 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 4ad70ac1f78..c18bfd1d263 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -218,9 +218,7 @@ class RssParser
 				$foundintocache = 1;
 
 				$this->_lastfetchdate = $filedate;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
 			}
 		}
@@ -229,9 +227,7 @@ class RssParser
 		if ($foundintocache)    // Cache file found and is not too old
 		{
 			$str = file_get_contents($newpathofdestfile);
-		}
-		else
-		{
+		} else {
 			try {
 				ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
 				ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
@@ -244,8 +240,7 @@ class RssParser
 				$context = stream_context_create($opts);
 
 				$str = file_get_contents($this->_urlRSS, false, $context);
-			}
-			catch (Exception $e) {
+			} catch (Exception $e) {
 				print 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();
 			}
 		}
@@ -258,9 +253,7 @@ class RssParser
 				//print 'xx'.LIBXML_NOCDATA;
 				libxml_use_internal_errors(false);
 				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-			}
-			else
-			{
+			} else {
 				if (! function_exists('xml_parser_create')) {
 					$this->error = 'Function xml_parser_create are not supported by your PHP';
 					return -1;
@@ -299,9 +292,7 @@ class RssParser
 					@chmod($newpathofdestfile, octdec($newmask));
 
 					$this->_lastfetchdate = $nowgmt;
-				}
-				else
-				{
+				} else {
 					print 'Error, failed to open file '.$newpathofdestfile.' for write';
 				}
 			}
@@ -330,9 +321,7 @@ class RssParser
 					if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
 					if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
 					if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-				}
-				else
-				{
+				} else {
 					//var_dump($rss->channel);
 					if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
 					if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
@@ -347,8 +336,7 @@ class RssParser
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
 				else $items = $rss->items; // With xmlparse
 				//var_dump($items);exit;
-			}
-			elseif ($rss->_format == 'atom')
+			} elseif ($rss->_format == 'atom')
 			{
 				//var_dump($rss);
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
@@ -358,9 +346,7 @@ class RssParser
 					if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
 					if (!empty($rss->title))         $this->_title = (string) $rss->title;
 					if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-				}
-				else
-				{
+				} else {
 					//if (!empty($rss->channel['rss_language']))	$this->_language = (string) $rss->channel['rss_language'];
 					if (!empty($rss->channel['generator']))			$this->_generator = (string) $rss->channel['generator'];
 					//if (!empty($rss->channel['rss_copyright']))	$this->_copyright = (string) $rss->channel['rss_copyright'];
@@ -370,7 +356,9 @@ class RssParser
 					if (!empty($rss->channel['title']))				$this->_title = (string) $rss->channel['title'];
 					//if (!empty($rss->channel['rss_description']))	$this->_description = (string) $rss->channel['rss_description'];
 
-					$this->_imageurl = $this->getAtomImageUrl($rss->channel);
+					if (!empty($rss->channel)) {
+						$this->_imageurl = $this->getAtomImageUrl($rss->channel);
+					}
 				}
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
 					$tmprss = xml2php($rss); $items = $tmprss['entry'];
@@ -397,9 +385,7 @@ class RssParser
 							$itemPubDate = (string) $item->pubDate;
 							$itemId = '';
 							$itemAuthor = '';
-						}
-						else
-						{
+						} else {
 							$itemLink = (string) $item['link'];
 							$itemTitle = (string) $item['title'];
 							$itemDescription = (string) $item['description'];
@@ -417,8 +403,7 @@ class RssParser
 								$itemCategory[] = (string) $cat;
 							}
 						}
-					}
-					elseif ($rss->_format == 'atom')
+					} elseif ($rss->_format == 'atom')
 					{
 						if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 						{
@@ -428,9 +413,7 @@ class RssParser
 							$itemPubDate = (string) $item['created'];
 							$itemId = (string) $item['id'];
 							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
-						}
-						else
-						{
+						} else {
 							$itemLink = (isset($item['link']) ? (string) $item['link'] : '');
 							$itemTitle = (string) $item['title'];
 							$itemDescription = $this->getAtomItemDescription($item);
@@ -438,8 +421,7 @@ class RssParser
 							$itemId = (string) $item['id'];
 							$itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
 						}
-					}
-					else print 'ErrorBadFeedFormat';
+					} else print 'ErrorBadFeedFormat';
 
 					// Add record to result array
 					$this->_rssarray[$i] = array(
@@ -459,9 +441,7 @@ class RssParser
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorFailedToLoadRSSFile';
 			return -1;
 		}
@@ -501,12 +481,10 @@ class RssParser
 			if ($el == 'rdf') {
 				$this->_format = 'rss';
 				$this->feed_version = '1.0';
-			}
-			elseif ($el == 'rss') {
+			} elseif ($el == 'rss') {
 				$this->_format = 'rss';
 				$this->feed_version = $attrs['version'];
-			}
-			elseif ($el == 'feed') {
+			} elseif ($el == 'feed') {
 				$this->_format = 'atom';
 				$this->feed_version = $attrs['version'];
 				$this->inchannel = true;
@@ -517,8 +495,7 @@ class RssParser
 		if ($el == 'channel')
 		{
 			$this->inchannel = true;
-		}
-		elseif ($el == 'item' or $el == 'entry')
+		} elseif ($el == 'item' or $el == 'entry')
 		{
 			$this->initem = true;
 			if (isset($attrs['rdf:about'])) {
@@ -534,9 +511,7 @@ class RssParser
 		$el == 'textinput' )
 		{
 			$this->intextinput = true;
-		}
-
-		elseif (
+		} elseif (
 		$this->_format == 'rss' and
 		$this->current_namespace == '' and
 		$el == 'image' )
@@ -575,13 +550,10 @@ class RssParser
 			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
 			{
 				$link_el = 'link';
-			}
-			elseif (!isset($attrs['rel']))
+			} elseif (!isset($attrs['rel']))
 			{
 				$link_el = 'link';
-			}
-			else
-			{
+			} else {
 				$link_el = 'link_'.$attrs['rel'];
 			}
 
@@ -608,9 +580,7 @@ class RssParser
 		if ($this->_format == 'atom' and $this->incontent)
 		{
 			$this->append_content($text);
-		}
-		else
-		{
+		} else {
 			$current_el = join('_', array_reverse($this->stack));
 			$this->append($current_el, $text);
 		}
@@ -634,37 +604,30 @@ class RssParser
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
-		}
-		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
 		{
 			$this->intextinput = false;
-		}
-		elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
 		{
 			$this->inimage = false;
-		}
-		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
+		} elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
 		{
 			$this->incontent = false;
-		}
-		elseif ($el == 'channel' or $el == 'feed')
+		} elseif ($el == 'channel' or $el == 'feed')
 		{
 			$this->inchannel = false;
-		}
-		elseif ($this->_format == 'atom' and $this->incontent) {
+		} elseif ($this->_format == 'atom' and $this->incontent) {
 			// balance tags properly
 			// note:  i don't think this is actually neccessary
 			if ($this->stack[0] == $el)
 			{
 				$this->append_content("</$el>");
-			}
-			else {
+			} else {
 				$this->append_content("<$el />");
 			}
 
 			array_shift($this->stack);
-		}
-		else {
+		} else {
 			array_shift($this->stack);
 		}
 
@@ -699,8 +662,7 @@ class RssParser
 		// phpcs:enable
 		if ($this->initem) {
 			$this->concat($this->current_item[$this->incontent], $text);
-		}
-		elseif ($this->inchannel) {
+		} elseif ($this->inchannel) {
 			$this->concat($this->channel[$this->incontent], $text);
 		}
 	}
@@ -721,28 +683,21 @@ class RssParser
 		{
 			if ($this->initem) {
 				$this->concat($this->current_item[$this->current_namespace][$el], $text);
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat($this->channel[$this->current_namespace][$el], $text);
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat($this->textinput[$this->current_namespace][$el], $text);
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat($this->image[$this->current_namespace][$el], $text);
 			}
-		}
-		else {
+		} else {
 			if ($this->initem) {
 				$this->concat($this->current_item[$el], $text);
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat($this->textinput[$el], $text);
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat($this->image[$el], $text);
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat($this->channel[$el], $text);
 			}
 		}
@@ -762,8 +717,7 @@ class RssParser
 		if (isset($item['summary']))
 		{
 			$result = $item['summary'];
-		}
-		elseif (isset($item['atom_content']))
+		} elseif (isset($item['atom_content']))
 		{
 			$result = $item['atom_content'];
 		}
@@ -851,14 +805,11 @@ function xml2php($xml)
 			$array[$key][] = $tmp;
 			$array[$key][] = $child;
 			$tab = true;
-		}
-		elseif ($tab === true)
+		} elseif ($tab === true)
 		{
 			//Add an element in an existing array
 			$array[$key][] = $child;
-		}
-		else
-		{
+		} else {
 			//Add a simple element
 			$array[$key] = $child;
 		}
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 09a1f7f2949..3adbf4af4d5 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -228,6 +228,21 @@ class SMTPs
     private $_trackId = '';
     private $_moreInHeader = '';
 
+    /**
+     * 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
+     */
+	public function setOptions($_options = [])
+    {
+        $this->_options = $_options;
+    }
 
     /**
      * Set delivery receipt
@@ -316,8 +331,7 @@ class SMTPs
 
         if ($_part === true)
         $_retValue = $this->_errorsTo;
-        else
-        $_retValue = $this->_errorsTo[$_part];
+        else $_retValue = $this->_errorsTo[$_part];
 
         return $_retValue;
     }
@@ -373,17 +387,32 @@ class SMTPs
         {
             $this->_setErr(99, $host.' is either offline or is an invalid host name.');
             $_retVal = false;
-        }
-        else
-        {
-            //See if we can connect to the SMTP server
-            if ($this->socket = @fsockopen(
-                preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
+        } 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
@@ -395,8 +424,7 @@ class SMTPs
                 $_retVal = $this->socket;
             }
             // This connection attempt failed.
-            else
-            {
+            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);
@@ -521,9 +549,7 @@ class SMTPs
             if (!$_retVal) {
                 $this->_setErr(130, 'Invalid Authentication Credentials.');
 			}
-        }
-        else
-        {
+        } else {
             $this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
         }
 
@@ -555,8 +581,7 @@ class SMTPs
             }
 
             // This is a "normal" SMTP Server "handshack"
-            else
-            {
+            else {
                 // Send the RFC821 specified HELO.
                 $host = $this->getHost();
                 $usetls = preg_match('@tls://@i', $host);
@@ -684,8 +709,7 @@ class SMTPs
         }
 
         // Read the Systems php.ini file
-        else
-        {
+        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'))
@@ -952,8 +976,7 @@ class SMTPs
 
         if ($_part === true)
         $_retValue = $this->_msgFrom;
-        else
-        $_retValue = $this->_msgFrom[$_part];
+        else $_retValue = $this->_msgFrom[$_part];
 
         return $_retValue;
     }
@@ -982,8 +1005,7 @@ class SMTPs
 
         if ($_part === true)
             $_retValue = $this->_msgReplyTo;
-        else
-            $_retValue = $this->_msgReplyTo[$_part];
+        else $_retValue = $this->_msgReplyTo[$_part];
 
         return $_retValue;
     }
@@ -1017,8 +1039,7 @@ class SMTPs
                 $_addrList = explode(',', $_addrList);
 
                 // Stick it in an array
-                else
-                $_addrList = array($_addrList);
+                else $_addrList = array($_addrList);
             }
 
             // take the array of addresses and split them further
@@ -1039,8 +1060,7 @@ class SMTPs
                     $aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
                 }
                 // We only have an eMail address
-                else
-                {
+                else {
                     // Strip off the beggining '<'
                     $_strAddr = str_replace('<', '', $_strAddr);
 
@@ -1096,9 +1116,7 @@ class SMTPs
             $_aryEmail['real'] = trim($_tmpAry[0], ' ">');
 
             $_aryEmail['addr'] = $_tmpAry[1];
-        }
-        else
-        $_aryEmail['addr'] = $_tmpAry[0];
+        } else $_aryEmail['addr'] = $_tmpAry[0];
 
         // Pull User Name and Host.tld apart
         list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
@@ -1169,9 +1187,7 @@ class SMTPs
                             {
                                 $_realName = '"'.$_realName.'"';
                                 $_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
-                            }
-                            else
-                            {
+                            } else {
                                 $_RCPT_list[] = $_addr.'@'.$_host;
                             }
                         }
@@ -1179,15 +1195,11 @@ class SMTPs
                 }
 
                 return implode(', ', $_RCPT_list);
-            }
-            else
-            {
+            } else {
                 $this->_setErr(101, 'No eMail Address for message to be sent to.');
                 return false;
             }
-        }
-        else
-        {
+        } else {
             $this->_setErr(102, 'eMail type not defined.');
             return false;
         }
@@ -1320,9 +1332,7 @@ class SMTPs
             $_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
-        {
+        } else {
             $_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
         }
         if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
@@ -1369,8 +1379,7 @@ class SMTPs
         //{
         if ($strType == 'html')
         $strMimeType = 'text/html';
-        else
-        $strMimeType = 'text/plain';
+        else $strMimeType = 'text/plain';
 
         // Make RFC821 Compliant, replace bare linefeeds
         $strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
@@ -1512,9 +1521,7 @@ class SMTPs
                     $content .= "--".$this->_getBoundary('related')."--\r\n";
                     $content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";
                     $content .= "\r\n";
-                }
-                else
-                {
+                } else {
                     if (key_exists('image', $this->_msgContent))
                     {
                         $content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 9620612cb2e..a18bad625e6 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -73,9 +73,7 @@ abstract class Stats
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-			}
-			else
-			{
+			} 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.");
 			}
 		}
@@ -84,9 +82,7 @@ abstract class Stats
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
-		}
-		else
-		{
+		} else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -170,9 +166,7 @@ abstract class Stats
         		$foundintocache = 1;
 
         		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	}
-        	else
-        	{
+        	} 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.");
         	}
         }
@@ -182,9 +176,7 @@ abstract class Stats
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
         	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else
-		{
+        } else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
 			if ($sm != 0) $year = $year - 1;
@@ -220,8 +212,7 @@ abstract class Stats
 				fclose($fp);
 				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
@@ -299,9 +290,7 @@ abstract class Stats
         		$foundintocache = 1;
 
         		$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-        	}
-        	else
-        	{
+        	} 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.");
         	}
         }
@@ -311,9 +300,7 @@ abstract class Stats
         {
         	dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
         	$data = json_decode(file_get_contents($newpathofdestfile), true);
-        }
-        else
-		{
+        } else {
 			$data = $this->getAllByProduct($year, $limit);
 			//					$data[$i][]=$datay[$year][$i][1];	// set yval for x=i
 		}
@@ -366,8 +353,7 @@ abstract class Stats
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -410,8 +396,7 @@ abstract class Stats
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -449,9 +434,7 @@ abstract class Stats
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -509,8 +492,7 @@ abstract class Stats
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		for ($i = 1; $i < 13; $i++)
 		{
@@ -565,8 +547,7 @@ abstract class Stats
 		  		$i++;
 		  	}
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		for ($i = 1; $i < 13; $i++)
 		{
@@ -620,8 +601,7 @@ abstract class Stats
             }
 		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
 		  	$this->db->free($resql);
-		}
-        else dol_print_error($this->db);
+		} 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 5cd26e3c75a..184724c0319 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -95,8 +95,7 @@ class Translate
 			$langpref = str_replace("-", "_", $langpref);
 			$langlist = preg_split("/[;,]/", $langpref);
 			$codetouse = preg_replace('/[^_a-zA-Z]/', '', $langlist[0]);
-		}
-		else $codetouse = $srclang;
+		} else $codetouse = $srclang;
 
 		// We redefine $srclang
 		$langpart = explode("_", $codetouse);
@@ -111,10 +110,8 @@ class Translate
 				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[1]);
 				$longforlong = array('no_nb'=>'nb_NO');
 				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
+			} 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', 'nb'=>'nb_NO', 'no'=>'nb_NO');
 			if (isset($longforshort[strtolower($langpart[0])])) $srclang = $longforshort[strtolower($langpart[0])];
@@ -304,12 +301,10 @@ class Translate
 												$tabtranslatedomain[$key] = $value;
 											}
 										}
-									}
-									elseif ($key[0] == '#')
+									} elseif ($key[0] == '#')
 									{
 									    continue;
-									}
-									else {
+									} 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);
 										if ($usecachekey) {
@@ -517,21 +512,28 @@ class Translate
     					}
     				}
     			}
-		    }
-		    else
-		    {
+		    } else {
 		        dol_print_error($db);
 		    }
 		}
 
 		if ($fileread) $this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded
 
-		if (empty($this->_tab_loaded[$newdomain])) $this->_tab_loaded[$newdomain] = 2; // Marque ce cas comme non trouve (no lines found for language)
+		if (empty($this->_tab_loaded[$newdomain])) $this->_tab_loaded[$newdomain] = 2; // Mark this case as not found (no lines found for language)
 
 		return 1;
 	}
 
-
+	/**
+	 * Get information with result of loading data for domain
+	 *
+	 * @param	string		$domain		Domain to check
+	 * @return 	int						0, 1, 2...
+	 */
+	public function isLoaded($domain)
+	{
+		return $this->_tab_loaded[$domain];
+	}
 
 	/**
 	 * Return translated value of key for special keys ("Currency...", "Civility...", ...).
@@ -557,24 +559,19 @@ class Translate
 	    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))
+        } 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))
+		} 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))
+		} 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))
+        } 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))
+        } 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');
@@ -641,8 +638,7 @@ class Translate
             $str = str_replace(array('__lt__', '__gt__', '__quot__'), array('<', '>', '"',), $str);
 
 			return $str;
-		}
-		else								// Translation is not available
+		} else // Translation is not available
 		{
 		    //if ($key[0] == '$') { return dol_eval($key,1); }
 			return $this->getTradFromKey($key);
@@ -712,9 +708,7 @@ class Translate
             }
 
             return $str;
-		}
-		else
-		{
+		} else {
 		    if ($key[0] == '$') { return dol_eval($key, 1); }
 			return $this->getTradFromKey($key);
 		}
@@ -830,9 +824,7 @@ class Translate
 				if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
 				{
 				    $langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
-				}
-				else
-				{
+				} else {
 					$langs_available[$dir] = $this->trans('Language_'.$dir);
 				}
 				if ($mainlangonly) {
@@ -961,9 +953,7 @@ class Translate
 
 			$db->free($resql);
 			return $this->cache_labels[$tablename][$key];
-		}
-		else
-		{
+		} else {
 			$this->error = $db->lasterror();
 			return -1;
 		}
@@ -1061,9 +1051,7 @@ class Translate
 			array_multisort($label, SORT_ASC, $this->cache_currencies);
 			//var_dump($this->cache_currencies);	$this->cache_currencies is now sorted onto label
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 6dc243d3723..454ace0ebfa 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -133,8 +133,7 @@ class Utils
 					$result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
 					$count += $result;
 					$countdeleted += $tmpcountdeleted;
-				}
-				elseif ($filesarray[$key]['type'] == 'file')
+				} elseif ($filesarray[$key]['type'] == 'file')
 				{
 					// If (file that is not logfile) or (if mode is logfile)
 					if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile')
@@ -144,9 +143,7 @@ class Utils
 						{
 							$count++;
 							$countdeleted++;
-						}
-						else
-						{
+						} else {
 							$counterror++;
 						}
 					}
@@ -166,8 +163,7 @@ class Utils
 		{
 			$this->output = $langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
 			if ($count > $countdeleted) $this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
-		}
-		else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
+		} else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
 
 		// Recreate temp dir that are not automatically recreated by core code for performance purpose, we need them
 		if (!empty($conf->api->enabled))
@@ -212,7 +208,7 @@ class Utils
 		}
 
 		// Check type parameter
-		if ($type == 'auto') $type = $db->type;
+		if ($type == 'auto') $type = $this->db->type;
 		if (!in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
 		{
 			$langs->load("errors");
@@ -266,10 +262,8 @@ class Utils
 			if (GETPOST("sql_structure", "alpha") || $usedefault)
 			{
 				if (GETPOST("drop", "alpha") || $usedefault)	$param .= " --add-drop-table=TRUE";
-				else 				       	         		    $param .= " --add-drop-table=FALSE";
-			}
-			else
-			{
+				else $param .= " --add-drop-table=FALSE";
+			} else {
 				$param .= " -t";
 			}
 			if (GETPOST("disable-add-locks", "alpha")) $param .= " --add-locks=FALSE";
@@ -282,9 +276,7 @@ class Utils
 				if (GETPOST("delayed", "alpha"))	 	 $param .= " --delayed-insert";
 				if (GETPOST("sql_ignore", "alpha"))	 $param .= " --insert-ignore";
 				if (GETPOST("hexforbinary", "alpha") || $usedefault) $param .= " --hex-blob";
-			}
-			else
-			{
+			} else {
 				$param .= " -d"; // No row information (no data)
 			}
 			$param .= " --default-character-set=utf8"; // We always save output into utf8 charset
@@ -325,9 +317,7 @@ class Utils
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
 						$errormsg = 'Error '.$retval;
 						$ok = 0;
-					}
-					else
-					{
+					} else {
 						$i = 0;
 						if (!empty($output_arr))
 						{
@@ -366,9 +356,7 @@ class Utils
 
 				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
 				$errormsg = $langs->trans("ErrorFailedToWriteInDir");
@@ -390,9 +378,7 @@ class Utils
 				if ($compression == 'bz')   bzclose($handle);
 				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg)) {	// No error
 					$errormsg = '';
-				}
-				else
-				{
+				} else {
 					// Renommer fichier sortie en fichier erreur
 					//print "$outputfile -> $outputerror";
 					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
@@ -430,9 +416,7 @@ class Utils
 				$this->backupTables($outputfiletemp);
 				dol_compress_file($outputfiletemp, $outputfile, $compression);
 				unlink($outputfiletemp);
-			}
-			else
-			{
+			} else {
 				$this->backupTables($outputfile);
 			}
 
@@ -612,15 +596,12 @@ class Utils
 		{
 			try {
 				$moduleobj = new $class($this->db);
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				dol_print_error($e->getMessage());
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$langs->load("errors");
 			dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
@@ -689,9 +670,7 @@ class Utils
 						if ($filecursor)
 						{
 							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
-						}
-						else
-						{
+						} else {
 							$this->error = 'Failed to concat content of file '.$spec['fullname'];
 							return -1;
 						}
@@ -759,25 +738,19 @@ class Utils
 				$result = ($resarray['result'] == 0) ? 1 : 0;
 
 				chdir($currentdir);
-			}
-			else
-			{
+			} else {
 				$result = 0;
 			}
 
 			if ($result > 0)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				$error++;
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorCheckVersionIsDefined");
@@ -934,9 +907,7 @@ class Utils
 			{
 				$tables[] = $row[0];
 			}
-		}
-		else
-		{
+		} else {
 			$tables = is_array($tables) ? $tables : explode(',', $tables);
 		}
 
@@ -996,9 +967,7 @@ class Utils
 			if (empty($row2[1]))
 			{
 				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
-			}
-			else
-			{
+			} else {
 				fwrite($handle, $row2[1].";\n");
 				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
 
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index 204a30b4829..a16d6297dd4 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -58,9 +58,7 @@ if (class_exists($keyforclass))
 			$this->export_help_array[$r][$fieldname] = $helpfield;
 		}
 	}
-}
-else
-{
+} else {
 	dol_print_error($this->db, 'Failed to find class '.$keyforclass.', even after the include of '.$keyforclassfile);
 }
 // End add common fields
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 921b3d14bb6..7deb98dbfd5 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -54,8 +54,8 @@ if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE'))
 
 	// Load variable for pagination
 	$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-	$sortfield = GETPOST('sortfield', 'alpha');
-	$sortorder = GETPOST('sortorder', 'alpha');
+	$sortfield = GETPOST('sortfield', 'aZ09comma');
+	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 	if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 	$offset = $limit * $page;
@@ -129,8 +129,7 @@ if ($objecttype) {
     	}
         $ObjectClassName = $arrayoftype[$objecttype]['ObjectClassName'];
         $object = new $ObjectClassName($db);
-    }
-    catch (Exception $e) {
+    } catch (Exception $e) {
         print 'Failed to load class for type '.$objecttype;
     }
 }
@@ -252,12 +251,10 @@ if (is_array($search_groupby) && count($search_groupby)) {
 			if (is_null($obj->val)) {
 				$keytouse = '__NULL__';
 				$valuetranslated = $langs->transnoentitiesnoconv("NotDefined");
-			}
-			elseif ($obj->val === '') {
+			} elseif ($obj->val === '') {
 				$keytouse = '';
 				$valuetranslated = $langs->transnoentitiesnoconv("Empty");
-			}
-			else {
+			} else {
 				$keytouse = (string) $obj->val;
 				$valuetranslated = $obj->val;
 			}
@@ -267,8 +264,7 @@ if (is_array($search_groupby) && count($search_groupby)) {
 				$valuetranslated = $object->fields[$gvalwithoutprefix]['arrayofkeyval'][$obj->val];
 				if (is_null($valuetranslated)) $valuetranslated = $langs->transnoentitiesnoconv("UndefinedKey");
 				$valuetranslated = $langs->trans($valuetranslated);
-			}
-			elseif (preg_match('/integer:([^:]+):([^:]+)$/', $object->fields[$gvalwithoutprefix]['type'], $regs)) {
+			} elseif (preg_match('/integer:([^:]+):([^:]+)$/', $object->fields[$gvalwithoutprefix]['type'], $regs)) {
 				$classname = $regs[1];
 				$classpath = $regs[2];
 				dol_include_once($classpath);
@@ -292,9 +288,17 @@ 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'];
+            }
 			//var_dump($gkey.' '.$gval.' '.$gvalwithoutprefix);
 			$gvalwithoutprefix = preg_replace('/\-(year|month|day)/', '', $gvalwithoutprefix);
-			$labeloffield = $langs->transnoentitiesnoconv($object->fields[$gvalwithoutprefix]['label']);
+			$labeloffield = $langs->transnoentitiesnoconv($keyforlabeloffield);
 			setEventMessages($langs->trans("ErrorTooManyDifferentValueForSelectedGroupBy", $MAXUNIQUEVALFORGROUP, $labeloffield), null, 'warnings');
 			$search_groupby = array();
 		}
@@ -314,7 +318,7 @@ $startyear = $endyear - 2;
 $param = '';
 
 print '<form method="post" action="'.$_SERVER['PHP_SELF'].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="viewgraph">';
 print '<input type="hidden" name="tabfamily" value="'.$tabfamily.'">';
 
@@ -456,8 +460,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
         } 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.', ';
+        } else $sql .= $val.' as x_'.$key.', ';
     }
     foreach ($search_groupby as $key => $val) {
     	if (preg_match('/\-year$/', $val)) {
@@ -469,24 +472,20 @@ if (!empty($search_measures) && !empty($search_xaxis))
     	} 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.', ';
+    	} 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)) {
+        } 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)) {
+        } 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)) {
+        } elseif (preg_match('/\-max$/', $val)) {
         	$tmpval = preg_replace('/\-max$/', '', $val);
         	$sql .= 'MAX('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
         }
@@ -524,8 +523,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
         } elseif (preg_match('/\-day$/', $val)) {
             $tmpval = preg_replace('/\-day$/', '', $val);
             $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        }
-        else $sql .= $val.', ';
+        } else $sql .= $val.', ';
     }
     foreach ($search_groupby as $key => $val) {
     	if (preg_match('/\-year$/', $val)) {
@@ -537,8 +535,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
     	} elseif (preg_match('/\-day$/', $val)) {
     		$tmpval = preg_replace('/\-day$/', '', $val);
     		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	}
-    	else $sql .= $val.', ';
+    	} else $sql .= $val.', ';
     }
     $sql = preg_replace('/,\s*$/', '', $sql);
     $sql .= ' ORDER BY ';
@@ -552,8 +549,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
         } elseif (preg_match('/\-day$/', $val)) {
             $tmpval = preg_replace('/\-day$/', '', $val);
             $sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-        }
-        else $sql .= $val.', ';
+        } else $sql .= $val.', ';
     }
     foreach ($search_groupby as $key => $val) {
     	if (preg_match('/\-year$/', $val)) {
@@ -565,8 +561,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
     	} elseif (preg_match('/\-day$/', $val)) {
     		$tmpval = preg_replace('/\-day$/', '', $val);
     		$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-    	}
-    	else $sql .= $val.', ';
+    	} else $sql .= $val.', ';
     }
     $sql = preg_replace('/,\s*$/', '', $sql);
 }
diff --git a/htdocs/core/data/cloud_metadata_for_ssrf_test.txt b/htdocs/core/data/cloud_metadata_for_ssrf_test.txt
new file mode 100644
index 00000000000..4d98b656b3c
--- /dev/null
+++ b/htdocs/core/data/cloud_metadata_for_ssrf_test.txt
@@ -0,0 +1,23 @@
+## This file is a list of predefined URLs to block when trying to access them from the application, 
+## for example when using the grab website feature of module website
+## Allowing grabbing local url allow to get metadata.
+
+10.0.0.0/8
+0.0.0.0/8
+100.64.0.0/10
+127.0.0.0/8
+169.254.0.0/16
+172.16.0.0/12
+192.0.0.0/29
+192.0.2.0/24
+192.88.99.0/24
+192.168.0.0/16
+198.18.0.0/15
+198.51.100.0/24
+203.0.113.0/24
+224.0.0.0/4
+240.0.0.0/4
+metadata.google.internal
+100.100.100.200 (Alibaba Metadata)
+[::]
+[::1]
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 3a75b4bdc90..d3a6d3a01c9 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -59,9 +59,7 @@ print '<head>'."\n";
 if (GETPOST('mode') && GETPOST('mode') == 'test')
 {
 	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php"></script>'."\n";
-}
-else
-{
+} else {
 	print '<title>'.$langs->trans("Calendar").'</title>';
 }
 
@@ -109,9 +107,7 @@ if ($qualified)
 {
 	//print $_GET["cm"].",".$_GET["sd"].",".$_GET["m"].",".$_GET["y"];exit;
 	displayBox(GETPOST("sd", 'alpha'), GETPOST("m", 'int'), GETPOST("y", 'int'));
-}
-else
-{
+} else {
 	dol_print_error('', 'ErrorBadParameters');
 }
 
@@ -154,9 +150,7 @@ function displayBox($selectedDate, $month, $year)
 	{
 		$selDate = xyzToUnixTimestamp($selectedDate);
 		$xyz = dol_print_date($selDate, "%Y%m%d");
-	}
-	else
-	{
+	} else {
 		$selDate = 0;
 		$xyz = 0;
 	}
@@ -220,9 +214,7 @@ function displayBox($selectedDate, $month, $year)
 				echo "<td>&nbsp;</td>";
 				$cols++;
 			}
-		}
-		else
-		{
+		} else {
 			if ($mydate["wday"] == $startday)
 			{
 				echo "<tr class=\"dpWeek\">";
@@ -255,9 +247,7 @@ function displayBox($selectedDate, $month, $year)
 		if ($thedate == '')
 		{
 			$stoploop = 1;
-		}
-		else
-		{
+		} else {
 			$mydate = dol_getdate($thedate);
 			if ($firstdate["month"] != $mydate["month"]) $stoploop = 1;
 		}
@@ -277,9 +267,7 @@ function displayBox($selectedDate, $month, $year)
 			print $langs->trans("Month".$selectMonth)." ";
 			print sprintf("%02s", $tempDate["mday"]);
 			print ", ".$selectYear;
-		}
-		else
-		{
+		} else {
 			print "Click a Date";
 		}
 		?></td>
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index 3ba3b322e68..898421978db 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -177,6 +177,14 @@ interface Database
 	 */
 	public function escape($stringtoencode);
 
+	/**
+	 * Sanitize a string for SQL forging
+	 *
+	 * @param   string $stringtosanitize 		String to escape
+	 * @return  string                      String escaped
+	 */
+	public function sanitize($stringtosanitize);
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Get last ID after an insert INSERT
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 2818eff65e2..8af9f7bbc25 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -90,7 +90,7 @@ abstract class DoliDB implements Database
     public function idate($param)
 	{
 		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
-		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
+		return dol_print_date($param, "%Y-%m-%d %H:%M:%S", 'tzserver');
 	}
 
 	/**
@@ -103,6 +103,22 @@ abstract class DoliDB implements Database
 		return $this->lasterrno;
 	}
 
+	/**
+	 * Sanitize a string for SQL forging
+	 *
+	 * @param   string 	$stringtosanitize 	String to escape
+	 * @param   int		$allowsimplequote 	Allow simple quote
+	 * @return  string                      String escaped
+	 */
+	public function sanitize($stringtosanitize, $allowsimplequote = 0)
+	{
+		if ($allowsimplequote) {
+			return preg_replace('/[^a-z0-9_\-\.,\']/i', '', $stringtosanitize);
+		} else {
+			return preg_replace('/[^a-z0-9_\-\.,]/i', '', $stringtosanitize);
+		}
+	}
+
 	/**
 	 * Start transaction
 	 *
@@ -120,9 +136,7 @@ abstract class DoliDB implements Database
 				dol_syslog('', 0, 1);
 			}
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->transaction_opened++;
 			dol_syslog('', 0, 1);
 			return 1;
@@ -146,14 +160,10 @@ abstract class DoliDB implements Database
 				$this->transaction_opened = 0;
 				dol_syslog("COMMIT Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->transaction_opened--;
 			return 1;
 		}
@@ -174,9 +184,7 @@ abstract class DoliDB implements Database
 			$this->transaction_opened = 0;
 			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->transaction_opened--;
 			return 1;
 		}
@@ -252,9 +260,7 @@ abstract class DoliDB implements Database
 				$i++;
 			}
 			return $return;
-		}
-		else
-		{
+		} else {
 			return '';
 		}
 	}
@@ -331,7 +337,7 @@ abstract class DoliDB implements Database
 		if ($res)
 		{
 			$results = array();
-			if($this->num_rows($res) > 0){
+			if ($this->num_rows($res) > 0){
 				while ($obj = $this->fetch_object($res)){
 					$results[] = $obj;
 				}
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
deleted file mode 100644
index 667f1986815..00000000000
--- a/htdocs/core/db/mssql.class.php
+++ /dev/null
@@ -1,1228 +0,0 @@
-<?php
-/* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2007 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2007      Simon Desee          <simon@dedisoft.com>
- * Copyright (C) 2015       Cedric GROSS            <c.gross@kreiz-it.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       	htdocs/core/db/mssql.class.php
- *	\brief			Fichier de la classe permettant de gerer une base MSSQL
- */
-
-require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
-
-/**
- *	Classe de gestion de la database de dolibarr
- */
-class DoliDBMssql extends DoliDB
-{
-	//! Database type
-	public $type = 'mssql';
-	//! Database label
-	const LABEL = 'MSSQL';
-	//! Charset used to force charset when creating database
-    public $forcecharset = 'latin1'; // Can't be static as it may be forced with a dynamic value
-	//! Collate used to force collate when creating database
-    public $forcecollate = 'latin1_swedish_ci'; // Can't be static as it may be forced with a dynamic value
-	//! Version min database
-	const VERSIONMIN = '2000';
-	/** @var boolean|resource Resultset of last query */
-	private $_results;
-
-    /**
-	 *	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 $langs;
-
-		$this->database_user = $user;
-        $this->database_host = $host;
-        $this->database_port = $port;
-		$this->transaction_opened = 0;
-
-		if (!function_exists("mssql_connect"))
-		{
-			$this->connected = false;
-			$this->ok = false;
-			$this->error = "Mssql PHP functions for using MSSql driver are not available in this version of PHP";
-			dol_syslog(get_class($this)."::DoliDBMssql : MSsql PHP functions for using MSsql driver are not available in this version of PHP", LOG_ERR);
-			return $this->ok;
-		}
-
-		if (!$host)
-		{
-			$this->connected = false;
-			$this->ok = false;
-			$this->error = $langs->trans("ErrorWrongHostParameter");
-			dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect, wrong host parameters", LOG_ERR);
-			return $this->ok;
-		}
-
-		// Essai connexion serveur
-		$this->db = $this->connect($host, $user, $pass, $name, $port);
-		if ($this->db)
-		{
-			// Si client connecte avec charset different de celui de la base Dolibarr
-			// (La base Dolibarr a ete forcee en this->forcecharset a l'install)
-			$this->connected = true;
-			$this->ok = true;
-		}
-		else
-		{
-			// host, login ou password incorrect
-			$this->connected = false;
-			$this->ok = false;
-			$this->error = mssql_get_last_message();
-			dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect mssql_get_last_message=".$this->error, LOG_ERR);
-		}
-
-		// Si connexion serveur ok et si connexion base demandee, on essaie connexion base
-		if ($this->connected && $name)
-		{
-			if ($this->select_db($name))
-			{
-				$this->database_selected = true;
-				$this->database_name = $name;
-				$this->ok = true;
-			}
-			else
-			{
-				$this->database_selected = false;
-				$this->database_name = '';
-				$this->ok = false;
-				$this->error = $this->error();
-				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error, LOG_ERR);
-			}
-		}
-		else
-		{
-			// Pas de selection de base demandee, ok ou ko
-			$this->database_selected = false;
-		}
-
-		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')
-	{
-		return $line;
-	}
-
-    // 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
-		return @mssql_select_db($database, $this->db);
-	}
-
-	/**
-	 *	Connexion to server
-	 *
-	 *	@param	    string	$host		database server host
-	 *	@param	    string	$login		login
-	 *	@param	    string	$passwd		password
-	 *	@param		string	$name		name of database (not used for mysql, used for pgsql)
-	 *	@param		int		$port		Port of database server
-	 *	@return		false|resource|true	Database access handler
-	 *	@see		close()
-	 */
-    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");
-		$newhost = $host;
-		if ($port) $newhost .= ':'.$port;
-		$this->db = @mssql_connect($newhost, $login, $passwd);
-		//force les enregistrement en latin1 si la base est en utf8 par defaut
-		// Supprime car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec
-		// les nouvelles version de Dolibarr car force par l'install Dolibarr.
-		//$this->query('SET NAMES '.$this->forcecharset);
-		//print "Resultat fonction connect: ".$this->db;
-		$set_options = array('SET ANSI_PADDING ON;',
-		    "SET ANSI_NULLS ON;",
-		    "SET ANSI_WARNINGS ON;",
-		    "SET ARITHABORT ON;",
-		    "SET CONCAT_NULL_YIELDS_NULL ON;",
-		    "SET QUOTED_IDENTIFIER ON;"
-		);
-		mssql_query(implode(' ', $set_options), $this->db);
-
-		return $this->db;
-	}
-
-	/**
-	 *	Return version of database server
-	 *
-	 *	@return	        string      Version string
-	 */
-    public function getVersion()
-	{
-		$resql = $this->query("SELECT @@VERSION");
-		if ($resql)
-		{
-            $version = $this->fetch_array($resql);
-            return $version['computed'];
-		}
-		else return '';
-	}
-
-	/**
-	 *	Return version of database client driver
-	 *
-	 *	@return	        string      Version string
-	 */
-    public function getDriverInfo()
-	{
-		return 'php mssql 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;
-            return mssql_close($this->db);
-        }
-        return false;
-    }
-
-
-	/**
-	 * Start transaction
-	 *
-	 * @return	    bool         true if transaction successfuly opened or already opened, false if error
-	 */
-    public function begin()
-	{
-
-	    $res = mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened = mssql_result($res, 0, 0);
-
-	    if ($this->transaction_opened == 0)
-		{
-		    //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTIONS ON' generate also a mess
-			$ret = mssql_query("SET IMPLICIT_TRANSACTIONS OFF;BEGIN TRANSACTION;", $this->db);
-			if ($ret)
-			{
-				dol_syslog("BEGIN Transaction", LOG_DEBUG);
-			}
-			return $ret;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	/**
-     * Validate a database transaction
-     *
-     * @param	string	$log        Add more log to default log line
-     * @return  bool         		true if validation is OK or transaction level no started, false if ERROR
-	 */
-    public function commit($log = '')
-	{
-	    $res = mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened = mssql_result($res, 0, 0);
-
-		if ($this->transaction_opened == 1)
-		{
-		    //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTION ON' generate also a mess
-			$ret = mssql_query("COMMIT TRANSACTION", $this->db);
-			if ($ret)
-			{
-				dol_syslog("COMMIT Transaction", LOG_DEBUG);
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-		elseif ($this->transaction_opened > 1)
-		{
-			return true;
-		}
-		trigger_error("Commit requested but no transaction remain");
-		return false;
-	}
-
-	/**
-	 * Annulation d'une transaction et retour aux anciennes valeurs
-	 *
-	 * @param	string	$log	Add more log to default log line
-	 * @return	bool             true si annulation ok ou transaction non ouverte, false en cas d'erreur
-	 */
-    public function rollback($log = '')
-	{
-	    $res = mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened = mssql_result($res, 0, 0);
-
-		if ($this->transaction_opened == 1)
-		{
-			$ret = mssql_query("ROLLBACK TRANSACTION", $this->db);
-			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
-			return $ret;
-		}
-		elseif ($this->transaction_opened > 1)
-		{
-			return true;
-		}
-		trigger_error("Rollback requested but no transaction remain");
-		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 false|resource|true		Resultset of answer
-	 */
-    public function query($query, $usesavepoint = 0, $type = 'auto')
-	{
-		$query = trim($query);
-
-		if (preg_match('/^--/', $query)) return true;
-
-		// Conversion syntaxe MySql vers MSDE.
-		$query = str_ireplace("now()", "getdate()", $query);
-		// Erreur SQL: cannot update timestamp field
-		$query = str_ireplace(", tms = tms", "", $query);
-
-		$query = preg_replace("/([. ,\t(])(percent|file|public)([. ,=\t)])/", "$1[$2]$3", $query);
-
-		$original_query = '';
-
-		if ($type == "auto" || $type = 'dml')
-		{
-    		$query = preg_replace('/AUTO_INCREMENT/i', 'IDENTITY', $query);
-    		$query = preg_replace('/double/i', 'float', $query);
-    		$query = preg_replace('/float\((.*)\)/', 'numeric($1)', $query);
-    		$query = preg_replace('/([ \t])unsigned|IF NOT EXISTS[ \t]/i', '$1', $query);
-    		$query = preg_replace('/([ \t])(MEDIUM|TINY|LONG){0,1}TEXT([ \t,])/i', "$1VARCHAR(MAX)$3", $query);
-
-    		$matches = array();
-    		if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+(?:(UNIQUE)|INDEX)\h+(?:INDEX)?\h*(\w+?)\h*\((.+)\)/is', $query, $matches))
-    		{
-                $original_query = $query;
-                $query = "CREATE ".trim($matches[2])." INDEX [".trim($matches[3])."] ON [".trim($matches[1])."] (".trim($matches[4]).")";
-                if ($matches[2]) {
-                    //check if columun is nullable cause Sql server only allow 1 null value if unique index.
-                    $fields = explode(",", trim($matches[4]));
-                    $fields_clear = array_map('trim', $fields);
-                    $infos = $this->GetFieldInformation(trim($matches[1]), $fields_clear);
-                    $query_comp = array();
-                    if (is_array($infos)) {
-	                    foreach ($infos as $fld) {
-	                        if ($fld->IS_NULLABLE == 'YES') {
-	                            $query_comp[] = $fld->COLUMN_NAME." IS NOT NULL";
-	                        }
-	                    }
-                    }
-                    if (!empty($query_comp))
-                        $query .= " WHERE ".implode(" AND ", $query_comp);
-                }
-    		}
-    		else
-    		{
-                if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
-                {
-                    $original_query = $query;
-                    $query = "ALTER TABLE [".$matches[1]."] ADD CONSTRAINT [".$matches[2]."] PRIMARY KEY CLUSTERED (".$matches[3].")";
-                }
-    		}
-		}
-
-		if ($type == "auto" || $type = 'ddl')
-		{
-    		$itemfound = stripos($query, " limit ");
-    		if ($itemfound !== false) {
-    			// Extraire le nombre limite
-    			$number = stristr($query, " limit ");
-    			$number = substr($number, 7);
-    			// Inserer l'instruction TOP et le nombre limite
-    			$query = str_ireplace("select ", "select top ".$number." ", $query);
-    			// Supprimer l'instruction MySql
-    			$query = str_ireplace(" limit ".$number, "", $query);
-    		}
-
-    		$itemfound = stripos($query, " week(");
-    		if ($itemfound !== false) {
-    			// Recreer une requete sans instruction Mysql
-    			$positionMySql = stripos($query, " week(");
-    			$newquery = substr($query, 0, $positionMySql);
-
-    			// Recuperer la date passee en parametre
-    			$extractvalue = stristr($query, " week(");
-    			$extractvalue = substr($extractvalue, 6);
-    			$positionMySql = stripos($extractvalue, ")");
-    			// Conserver la fin de la requete
-    			$endofquery = substr($extractvalue, $positionMySql);
-    			$extractvalue = substr($extractvalue, 0, $positionMySql);
-
-    			// Remplacer l'instruction MySql en Sql Server
-    			// Inserer la date en parametre et le reste de la requete
-    			$query = $newquery." DATEPART(week, ".$extractvalue.$endofquery;
-    		}
-    	    if (preg_match('/^insert\h+(?:INTO)?\h*(\w+?)\h*\(.*\b(?:row)?id\b.*\)\h+VALUES/i', $query, $matches))
-    	    {
-    	        //var_dump($query);
-    	        //var_dump($matches);
-    	        //if (stripos($query,'llx_c_departements') !== false) var_dump($query);
-    	        $sql = 'SET IDENTITY_INSERT ['.trim($matches[1]).'] ON;';
-    	        @mssql_query($sql, $this->db);
-    	        $post_query = 'SET IDENTITY_INSERT ['.trim($matches[1]).'] OFF;';
-    	    }
-		}
-		//print "<!--".$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 (!$this->database_name)
-		{
-			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
-			$ret = mssql_query($query, $this->db);
-		}
-		else
-		{
-			$ret = mssql_query($query, $this->db);
-		}
-
-		if (!empty($post_query))
-		{
-		    @mssql_query($post_query, $this->db);
-		}
-
-		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
-		{
-			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
-			if (!$ret)
-			{
-				$result = mssql_query("SELECT @@ERROR as code", $this->db);
-				$row = mssql_fetch_array($result);
-
-                $this->lastqueryerror = $query;
-				$this->lasterror = $this->error();
-				$this->lasterrno = $row["code"];
-
-				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
-				if ($original_query) dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
-				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", 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	resource	$resultset  Curseur de la requete voulue
-	 *	@return	object|false			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_resource($resultset)) { $resultset = $this->_results; }
-		return mssql_fetch_object($resultset);
-	}
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	array|false				Array or false if KO or end of cursor
-	 */
-    public function fetch_array($resultset)
-	{
-        // 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 mssql_fetch_array($resultset);
-	}
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	array|false				Array or false if KO or end of cursor
-	 */
-    public function fetch_row($resultset)
-	{
-        // 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 @mssql_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
-     *	@see    affected_rows()
-	 */
-    public function num_rows($resultset)
-	{
-        // 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 mssql_num_rows($resultset);
-	}
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Return the number of lines in the result of a request INSERT, DELETE or UPDATE
-	 *
-	 *	@param	resource	$resultset   Curseur de la requete voulue
-	 *	@return int		    Number of lines
-	 *	@see    num_rows()
-	 */
-    public function affected_rows($resultset)
-	{
-        // phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (!is_resource($resultset)) { $resultset = $this->_results; }
-		// mssql necessite un link de base pour cette fonction contrairement
-		// a pqsql qui prend un resultset
-		$rsRows = mssql_query("select @@rowcount as rows", $this->db);
-		return mssql_result($rsRows, 0, "rows");
-		//return mssql_affected_rows($this->db);
-	}
-
-
-	/**
-	 *	Free last resultset used.
-	 *
-	 *	@param  resource	$resultset   Curseur de la requete voulue
-	 *	@return	bool
-	 */
-    public function free($resultset = null)
-	{
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (!is_resource($resultset)) { $resultset = $this->_results; }
-		// Si resultset en est un, on libere la memoire
-		if (is_resource($resultset)) mssql_free_result($resultset);
-	}
-
-	/**
-	 *	Escape a string to insert data
-	 *
-	 *  @param	string	$stringtoencode		String to escape
-	 *  @return	string						String escaped
-	 */
-    public function escape($stringtoencode)
-	{
-		return addslashes($stringtoencode);
-	}
-
-
-	/**
-	 *   Convert (by PHP) a GM Timestamp date into a PHP server TZ 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)
-	{
-		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
-	}
-
-	/**
-     *	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 MSSql 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',
-			1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
-			1046 => 'DB_ERROR_NODBSELECTED',
-			1048 => 'DB_ERROR_CONSTRAINT',
-			2714 => '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',
-			2627 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-			102  => 'DB_ERROR_SYNTAX',
-			8120 => 'DB_ERROR_GROUP_BY_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',
-			1216 => 'DB_ERROR_NO_PARENT',
-			1217 => 'DB_ERROR_CHILD_EXISTS',
-			1451 => 'DB_ERROR_CHILD_EXISTS',
-			1913 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
-			);
-
-			if (isset($errorcode_map[$this->lasterrno]))
-			{
-				return $errorcode_map[$this->lasterrno];
-			}
-			$errno = $this->lasterrno;
-			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 mssql_get_last_message.
-			return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';
-		}
-		else {
-			return mssql_get_last_message();
-		}
-	}
-
-    // 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 or -1 on error
-	 */
-    public function last_insert_id($tab, $fieldid = 'rowid')
-	{
-        // phpcs:enable
-		$res = $this->query("SELECT @@IDENTITY as id");
-		if ($res && $data = $this->fetch_array($res))
-		{
-			return $data["id"];
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-	/**
-     *  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);
-
-		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
-
-		$return = $fieldorvalue;
-		return ($withQuotes ? "'" : "").$this->escape($return).($withQuotes ? "'" : "");
-	}
-
-	/**
-     *	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);
-
-		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
-
-		$return = $value;
-		return $return;
-	}
-
-
-    // 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 '?';
-	}
-
-    // 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	false|resource|true		resource defined if OK, false if KO
-	 */
-    public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
-	{
-        // phpcs:enable
-        /*if (empty($charset))   $charset=$this->forcecharset;
-        if (empty($collation)) $collation=$this->forcecollate;
-        */
-
-		$sql = 'CREATE DATABASE '.$this->EscapeFieldName($database);
-        //TODO: Check if we need to force a charset
-		//$sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
-		$ret = $this->query($sql);
-
-		$this->select_db($database);
-		$sql = "CREATE USER [$owner] FOR LOGIN [$owner]";
-		mssql_query($sql, $this->db);
-		$sql = "ALTER ROLE [db_owner] ADD MEMBER [$owner]";
-		mssql_query($sql, $this->db);
-
-		$sql = "ALTER DATABASE [$database] SET ANSI_NULL_DEFAULT ON;";
-	    @mssql_query($sql, $this->db);
-	    $sql = "ALTER DATABASE [$database] SET ANSI_NULL ON;";
-	    @mssql_query($sql, $this->db);
-
-	    return $ret;
-	}
-
-    // 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
-		$v = mssql_query("Select name from sysobjects where type like 'u'", $this->db);
-		$this->_results = mssql_fetch_array($v);
-		return $this->_results;
-	}
-
-    // 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
-
-		// FIXME: Dummy method
-		// TODO: Implement
-		// May help: https://stackoverflow.com/questions/600446/sql-server-how-do-you-return-the-column-names-from-a-table
-
-		$infotables = array();
-		return $infotables;
-	}
-
-    // 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
-	 *	@param	    string	$type 			Type de la table
-	 *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
-	 *	@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
-
-		$sqlfields = array();
-		$sqluq = array();
-		$sqlk = array();
-
-		// 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 '".$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.")";
-
-		if (is_array($unique_keys))
-		{
-			$i = 0;
-			foreach ($unique_keys as $key => $value)
-			{
-				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$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);
-		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;
-
-		if (!$this->query($sql))
-			return -1;
-		else
-			return 1;
-	}
-
-    // 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	false|resource|true	Resource
-	 */
-    public function DDLDescTable($table, $field = "")
-	{
-        // phpcs:enable
-		$sql = "DESC ".$table." ".$field;
-
-		dol_syslog($sql);
-		$this->_results = $this->query($sql);
-		return $this->_results;
-	}
-
-    // 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']))
-		$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 '".$field_desc['default']."'";
-		if (preg_match("/^[^\s]/i", $field_desc['extra']))
-		$sql  .= " ".$field_desc['extra'];
-		$sql .= " ".$field_position;
-
-		if (!$this -> query($sql))
-		return -1;
-		else
-		return 1;
-	}
-
-    // 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'].")";
-		}
-
-		dol_syslog($sql, LOG_DEBUG);
-		if (!$this->query($sql))
-		return -1;
-		else
-		return 1;
-	}
-
-    // 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($sql, LOG_DEBUG);
-		if (!$this->query($sql))
-		{
-			$this->error = $this->lasterror();
-			return -1;
-		}
-		else return 1;
-	}
-
-    // 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 = "CREATE LOGIN ".$this->EscapeFieldName($dolibarr_main_db_user)." WITH PASSWORD='$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)
-        {
-            if ($this->lasterrno != '15025')
-            {
-	            return -1;
-            }
-            else
-			{
-            	// If user already exists, we continue to set permissions
-            	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
-            }
-        }
-        $sql = "SELECT name from sys.databases where name='".$dolibarr_main_db_name."'";
-        $ressql = $this->query($sql);
-        if (!$ressql)
-        {
-            dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
-            return -1;
-        }
-        else
-        {
-            if ($num)
-            {
-                $this->select_db($dolibarr_main_db_name);
-                $sql = "CREATE USER [$dolibarr_main_db_user] FOR LOGIN [$dolibarr_main_db_user]";
-                $this->query($sql);
-                $sql = "ALTER ROLE [db_owner] ADD MEMBER [$dolibarr_main_db_user]";
-                $this->query($sql);
-            }
-        }
-	    return 1;
-	}
-
-    /**
-     *	Return charset used to store data in database
-     *
-     *	@return		string		Charset
-     */
-    public function getDefaultCharacterSetDatabase()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-		return '';
-	}
-
-	/**
-	 *	Return list of available charset that can be used to store data in database
-	 *
-	 *	@return		array		List of Charset
-	 */
-    public function getListOfCharacterSet()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-		return '';
-	}
-
-	/**
-	 *	Return collation used in database
-	 *
-	 *	@return		string		Collation value
-	 */
-    public function getDefaultCollationDatabase()
-	{
-		$resql = $this->query("SELECT SERVERPROPERTY('collation')");
-		if (!$resql)
-		{
-			return $this->forcecollate;
-		}
-		$liste = $this->fetch_array($resql);
-		return $liste['computed'];
-	}
-
-	/**
-	 *	Return list of available collation that can be used for database
-	 *
-	 *	@return		array		Liste of Collation
-	 */
-    public function getListOfCollation()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-		return array();
-	}
-
-	/**
-	 *	Return full path of dump program
-	 *
-	 *	@return		string		Full path of dump program
-	 */
-    public function getPathOfDump()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-	    return '';
-	}
-
-	/**
-	 *	Return full path of restore program
-	 *
-	 *	@return		string		Full path of restore program
-	 */
-    public function getPathOfRestore()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-	    return '';
-	}
-
-	/**
-	 * 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 = '')
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-		// May help: SELECT SERVERPROPERTY
-
-		$result = array();
-		return $result;
-	}
-
-	/**
-	 * 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 = '')
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-		// May help: http://www.experts-exchange.com/Database/MS-SQL-Server/Q_20971756.html
-
-		return array();
-	}
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *    Escape a field name according to escape's syntax
-	 *
-	 * @param      string $fieldname   Field's name to escape
-	 * @return     string              field's name escaped
-	 */
-    public function EscapeFieldName($fieldname)
-    {
-        // phpcs:enable
-	    return "[".$fieldname."]";
-	}
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * Get information on field
-	 *
-	 * @param      string  $table      Table name which contains fields
-	 * @param      mixed   $fields     String for one field or array of string for multiple field
-	 * @return false|object
-	 */
-    public function GetFieldInformation($table, $fields)
-    {
-        // phpcs:enable
-	    $sql = "SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
-	    if (is_array($fields))
-	    {
-	        $where = " IN ('".implode("','", $fields)."')";
-	    }
-	    else
-	    {
-	        $where = "='".$this->escape($fields)."'";
-	    }
-	    $result = array();
-	    $ret = mssql_query($sql.$where, $this->db);
-	    if ($ret)
-	    {
-	        while ($obj = mssql_fetch_object($ret))
-	        {
-	            $result[] = $obj;
-	        }
-	    }
-	    else
-	        return false;
-
-	    return $result;
-	}
-}
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 719e34c5df9..e3687f7f405 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -121,18 +121,14 @@ class DoliDBMysqli extends DoliDB
 
 					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
-            }
-            else
-            {
+            } 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
-        {
+        } else {
             // Pas de selection de base demandee, ok ou ko
             $this->database_selected = false;
 
@@ -269,9 +265,7 @@ class DoliDBMysqli extends DoliDB
         {
             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
             $ret = $this->db->query($query);
-        }
-        else
-        {
+        } else {
             $ret = $this->db->query($query);
         }
 
@@ -341,9 +335,7 @@ class DoliDBMysqli extends DoliDB
         {
             if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetch_row();
-        }
-        else
-        {
+        } else {
             // si le curseur est un booleen on retourne la valeur 0
             return 0;
         }
@@ -471,8 +463,7 @@ class DoliDBMysqli extends DoliDB
         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 {
+        } else {
             return $this->db->error;
         }
     }
@@ -517,8 +508,7 @@ class DoliDBMysqli extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -550,8 +540,7 @@ class DoliDBMysqli extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -575,8 +564,7 @@ class DoliDBMysqli extends DoliDB
         {
             $row = $this->fetch_row($resql);
             return $row[0];
-        }
-        else return '?';
+        } else return '?';
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -704,9 +692,8 @@ class DoliDBMysqli extends DoliDB
 			{
 				if ((preg_match("/null/i", $field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i", $field_desc['default']))) {
 					$sqlfields[$i]  .= " default ".$field_desc['default'];
-				}
-				else {
-					$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				} else {
+					$sqlfields[$i]  .= " default '".$this->escape($field_desc['default'])."'";
 				}
 			}
 			if (preg_match("/^[^\s]/i", $field_desc['null'])) {
@@ -724,7 +711,7 @@ class DoliDBMysqli extends DoliDB
             $i = 0;
             foreach ($unique_keys as $key => $value)
             {
-                $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
+                $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
                 $i++;
             }
         }
@@ -748,8 +735,7 @@ class DoliDBMysqli extends DoliDB
 
         if (!$this->query($sql))
         return -1;
-        else
-        return 1;
+        else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -766,8 +752,7 @@ class DoliDBMysqli extends DoliDB
 
 		if (!$this->query($sql))
  			return -1;
-    	else
-    		return 1;
+    	else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -824,8 +809,7 @@ class DoliDBMysqli extends DoliDB
         {
             if (preg_match("/null/i", $field_desc['default']))
             $sql .= " default ".$field_desc['default'];
-            else
-            $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']))
         {
@@ -864,8 +848,7 @@ class DoliDBMysqli extends DoliDB
         	{
         		$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')
+        	} 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);
@@ -883,8 +866,7 @@ class DoliDBMysqli extends DoliDB
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
         if (!$this->query($sql))
         return -1;
-        else
-        return 1;
+        else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -929,9 +911,7 @@ class DoliDBMysqli extends DoliDB
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
             	return -1;
-            }
-            else
-			{
+            } else {
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 08b23156f64..d24b4e98189 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -104,9 +104,7 @@ class DoliDBPgsql extends DoliDB
 		{
 			$this->connected = true;
 			$this->ok = true;
-		}
-		else
-		{
+		} else {
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
@@ -122,18 +120,14 @@ class DoliDBPgsql extends DoliDB
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
-			}
-			else
-			{
+			} else {
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
 				$this->error = $this->error();
 				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
-		}
-		else
-		{
+		} else {
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
 		}
@@ -240,8 +234,11 @@ class DoliDBPgsql extends DoliDB
     			// on update defaulted by now
     			$line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
 
+    			// nuke DEFAULT CURRENT_TIMESTAMP
+    			$line = preg_replace('/(\s*)DEFAULT(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
+
     			// nuke ON UPDATE CURRENT_TIMESTAMP
-    			$line = preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
+    			$line = preg_replace('/(\s*)ON(\s*)UPDATE(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
 
     			// unique index(field1,field2)
     			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
@@ -520,8 +517,7 @@ class DoliDBPgsql extends DoliDB
 				{
 					$query = preg_replace('/([^\'])([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])/', '\\1\'\\2\'', $query);
 					dol_syslog("Warning: Bad formed request converted into ".$query, LOG_WARNING);
-				}
-				else $loop = false;
+				} else $loop = false;
 			}
 		}
 
@@ -724,8 +720,7 @@ class DoliDBPgsql extends DoliDB
 		if (!$this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
-		}
-		else {
+		} else {
 			// Constants to convert error code to a generic Dolibarr error code
 			$errorcode_map = array(
 			1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -912,7 +907,7 @@ class DoliDBPgsql extends DoliDB
 		$listtables = array();
 
 		$like = '';
-		if ($table) $like = " AND table_name LIKE '".$table."'";
+		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)
         {
@@ -950,7 +945,7 @@ class DoliDBPgsql extends DoliDB
 		$sql .= "	'' as \"Privileges\"";
 		$sql .= "	FROM information_schema.columns infcol";
 		$sql .= "	WHERE table_schema='public' ";
-		$sql .= "	AND table_name='".$table."'";
+		$sql .= "	AND table_name='".$this->escape($table)."'";
 		$sql .= "	ORDER BY ordinal_position;";
 
 		dol_syslog($sql, LOG_DEBUG);
@@ -1000,10 +995,8 @@ class DoliDBPgsql extends DoliDB
 			{
 				if (preg_match("/null/i", $field_desc['default']))
 				    $sqlfields[$i] .= " default ".$field_desc['default'];
-				else
-				    $sqlfields[$i] .= " default '".$field_desc['default']."'";
-			}
-			elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+			    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']))
@@ -1018,7 +1011,7 @@ class DoliDBPgsql extends DoliDB
 			$i = 0;
 			foreach ($unique_keys as $key => $value)
 			{
-				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
+				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
 				$i++;
 			}
 		}
@@ -1043,8 +1036,7 @@ class DoliDBPgsql extends DoliDB
 		dol_syslog($sql, LOG_DEBUG);
 		if (!$this->query($sql))
 		return -1;
-		else
-		return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1061,8 +1053,7 @@ class DoliDBPgsql extends DoliDB
 
 		if (!$this->query($sql))
 			return -1;
-		else
-			return 1;
+		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1102,9 +1093,9 @@ class DoliDBPgsql extends DoliDB
     public function DDLDescTable($table, $field = "")
 	{
         // phpcs:enable
-		$sql = "SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$table."' AND attrelid = typrelid";
+		$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 = '".$field."'";
+		if ($field) $sql .= " AND attname = '".$this->escape($field)."'";
 
 		dol_syslog($sql, LOG_DEBUG);
 		$this->_results = $this->query($sql);
@@ -1142,7 +1133,7 @@ class DoliDBPgsql extends DoliDB
             if (preg_match("/null/i", $field_desc['default'])) {
                 $sql .= " default ".$field_desc['default'];
 			} else {
-				$sql .= " default '".$field_desc['default']."'";
+				$sql .= " default '".$this->escape($field_desc['default'])."'";
 			}
 		}
 		if (preg_match("/^[^\s]/i", $field_desc['extra'])) {
@@ -1181,8 +1172,7 @@ class DoliDBPgsql extends DoliDB
         	{
         		$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')
+        	} 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);
@@ -1234,8 +1224,7 @@ class DoliDBPgsql extends DoliDB
 		{
             $liste = $this->fetch_array($resql);
 		    return $liste['server_encoding'];
-		}
-		else return '';
+		} else return '';
 	}
 
 	/**
@@ -1275,8 +1264,7 @@ class DoliDBPgsql extends DoliDB
 		{
 		    $liste = $this->fetch_array($resql);
 			return $liste['lc_collate'];
-		}
-		else return '';
+		} else return '';
 	}
 
 	/**
@@ -1315,9 +1303,7 @@ class DoliDBPgsql extends DoliDB
 		if (file_exists('/usr/bin/pg_dump'))
 		{
 		    $fullpathofdump = '/usr/bin/pg_dump';
-		}
-		else
-		{
+		} else {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
 		    $resql = $this->query('SHOW data_directory');
     		if ($resql)
@@ -1346,9 +1332,7 @@ class DoliDBPgsql extends DoliDB
         if (file_exists('/usr/bin/'.$tool))
         {
             $fullpathofdump = '/usr/bin/'.$tool;
-        }
-        else
-        {
+        } else {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
             $resql = $this->query('SHOW data_directory');
             if ($resql)
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 2d24c232797..c34b9dddac0 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -111,9 +111,7 @@ class DoliDBSqlite3 extends DoliDB
             $this->addCustomFunction('WEEKDAY');
             $this->addCustomFunction('date_format');
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        else
-        {
+        } else {
             // host, login ou password incorrect
             $this->connected = false;
             $this->ok = false;
@@ -339,8 +337,7 @@ class DoliDBSqlite3 extends DoliDB
             //$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)
+        } catch (Exception $e)
         {
             $this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
             return '';
@@ -423,7 +420,7 @@ class DoliDBSqlite3 extends DoliDB
             $constraintname = trim($reg[2]);
             $tablename = trim($reg[1]);
 
-            $descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='".$tablename."'");
+            $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);
@@ -467,8 +464,7 @@ class DoliDBSqlite3 extends DoliDB
             if ($ret) {
                 $ret->queryString = $query;
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $this->error = $this->db->lastErrorMsg();
         }
@@ -553,9 +549,7 @@ class DoliDBSqlite3 extends DoliDB
         {
             if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetchArray(SQLITE3_NUM);
-        }
-        else
-        {
+        } else {
             // si le curseur est un booleen on retourne la valeur 0
             return false;
         }
@@ -641,8 +635,7 @@ class DoliDBSqlite3 extends DoliDB
         if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide.
             return 'DB_ERROR_FAILED_TO_CONNECT';
-        }
-        else {
+        } else {
             // Constants to convert error code to a generic Dolibarr error code
             /*$errorcode_map = array(
             1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -706,8 +699,7 @@ class DoliDBSqlite3 extends DoliDB
         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 {
+        } else {
             return $this->error;
         }
     }
@@ -751,8 +743,7 @@ class DoliDBSqlite3 extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -784,8 +775,7 @@ class DoliDBSqlite3 extends DoliDB
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            elseif ($cryptType == 1)
+            } elseif ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -931,10 +921,8 @@ class DoliDBSqlite3 extends DoliDB
             {
                 if (preg_match("/null/i", $field_desc['default']))
                     $sqlfields[$i] .= " default ".$field_desc['default'];
-                else
-                    $sqlfields[$i] .= " default '".$field_desc['default']."'";
-            }
-            elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+                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']))
@@ -949,7 +937,7 @@ class DoliDBSqlite3 extends DoliDB
             $i = 0;
             foreach ($unique_keys as $key => $value)
             {
-                $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
+            	$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
                 $i++;
             }
         }
@@ -991,8 +979,7 @@ class DoliDBSqlite3 extends DoliDB
 
     	if (!$this->query($sql))
     		return -1;
-    	else
-    		return 1;
+    	else return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1043,8 +1030,7 @@ class DoliDBSqlite3 extends DoliDB
         {
             if (preg_match("/null/i", $field_desc['default']))
             $sql .= " default ".$field_desc['default'];
-            else
-            $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'];
@@ -1280,8 +1266,7 @@ class DoliDBSqlite3 extends DoliDB
                 $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 {
+            } else {
                 // TODO Récupérer le message
                 $result[$var] = 'FAIL';
             }
@@ -1354,12 +1339,11 @@ class DoliDBSqlite3 extends DoliDB
         if ($y == 0 && $month == 0) return 0;
         $num = (365 * $y + 31 * ($month - 1) + $day);
         if ($month <= 2) {
-            $y--; }
-        else {
+            $y--; } else {
             $num -= floor(($month * 4 + 23) / 10);
-        }
-        $temp = floor(($y / 100 + 1) * 3 / 4);
-        return $num + floor($y / 4) - $temp;
+			}
+			$temp = floor(($y / 100 + 1) * 3 / 4);
+			return $num + floor($y / 4) - $temp;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index 4f85610e657..ae6fdf8bf70 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -8,7 +8,8 @@ if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra))
 }
 
 // Add extra fields
-$sql = "SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.') ORDER BY pos ASC';
+$sql = "SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields";
+$sql .= " WHERE elementtype = '".$this->db->escape($keyforselect)."' AND type != 'separate' AND entity IN (0, ".$conf->entity.') ORDER BY pos ASC';
 //print $sql;
 $resql = $this->db->query($sql);
 if ($resql)    // This can fail when class is used on old database (during migration for example)
@@ -63,8 +64,7 @@ if ($resql)    // This can fail when class is used on old database (during migra
     			$this->export_entities_array[$r][$fieldname] = $keyforelement;
 		    }
 			// If this is a computed field
-			else
-			{
+			else {
 			    $this->export_fields_array[$r][$fieldname] = $fieldlabel;
 			    $this->export_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
 			    $this->export_special_array[$r][$fieldname] = $obj->fieldcomputed;
diff --git a/htdocs/core/filemanagerdol/browser/default/browser.php b/htdocs/core/filemanagerdol/browser/default/browser.php
index d1d5d434b5b..8f7ff82ecff 100644
--- a/htdocs/core/filemanagerdol/browser/default/browser.php
+++ b/htdocs/core/filemanagerdol/browser/default/browser.php
@@ -95,6 +95,10 @@ var sServerPath = GetUrlParam( 'ServerPath' );
 if ( sServerPath.length > 0 )
 	oConnector.ConnectorUrl += 'ServerPath=' + encodeURIComponent( sServerPath ) + '&' ;
 
+/* @CHANGE LDR Overwrite value coming from parameters for security purpose */
+oConnector.ConnectorUrl = '<?php echo DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php?'; ?>';
+console.log('ConnectorUrl='+oConnector.ConnectorUrl);
+
 oConnector.ResourceType		= GetUrlParam( 'Type' );
 oConnector.ShowAllTypes		= ( oConnector.ResourceType.length == 0 );
 
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
index 0f50f33e988..648ab675cfa 100644
--- a/htdocs/core/filemanagerdol/connectors/php/basexml.php
+++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php
@@ -84,8 +84,8 @@ function CreateXmlFooter()
 /**
  * SendError
  *
- * @param 	integer $number	Number
- * @param 	unknown_type $text		Text
+ * @param 	integer $number		Number
+ * @param 	string 	$text		Text
  * @return	void
  */
 function SendError($number, $text)
@@ -97,9 +97,7 @@ function SendError($number, $text)
 	{
 		SendErrorNode($number, $text);
 		CreateXmlFooter();
-	}
-	else
-	{
+	} else {
 		SetXmlHeaders();
 
 		dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
@@ -127,6 +125,5 @@ function SendErrorNode($number, $text)
 {
 	if ($text)
 		echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
-	else
-		echo '<Error number="'.$number.'" />';
+	else echo '<Error number="'.$number.'" />';
 }
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index dcc1650d4cd..5590879f8e6 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -86,8 +86,7 @@ function GetFoldersAndFiles($resourceType, $currentFolder)
 			{
 				if (is_dir($sServerDir.$sFile))
 					$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
-				else
-				{
+				else {
 					$iFileSize = @filesize($sServerDir.$sFile);
 					if (!$iFileSize) {
 						$iFileSize = 0;
@@ -147,8 +146,7 @@ function CreateFolder($resourceType, $currentFolder)
 
 		if (strpos($sNewFolderName, '..') !== false)
 			$sErrorNumber = '102'; // Invalid folder name.
-		else
-		{
+		else {
 			// Map the virtual path to the local server path of the current folder.
 			$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
 
@@ -171,13 +169,9 @@ function CreateFolder($resourceType, $currentFolder)
 						$sErrorNumber = '110';
 						break;
 				}
-			}
-			else
-				$sErrorNumber = '103';
+			} else $sErrorNumber = '103';
 		}
-	}
-	else
-		$sErrorNumber = '102';
+	} else $sErrorNumber = '102';
 
 	// Create the "Error" node.
 	echo '<Error number="'.$sErrorNumber.'" />';
@@ -254,9 +248,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 					$iCounter++;
 					$sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
 					$sErrorNumber = '201';
-				}
-				else
-				{
+				} else {
 					move_uploaded_file($oFile['tmp_name'], $sFilePath);
 
 					if (is_file($sFilePath))
@@ -289,19 +281,14 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 				{
 					@unlink($sFilePath);
 					$sErrorNumber = '202';
-				}
-				elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true)
+				} elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true)
 				{
 					@unlink($sFilePath);
 					$sErrorNumber = '202';
 				}
 			}
-		}
-		else
-			$sErrorNumber = '202';
-	}
-	else
-		$sErrorNumber = '202';
+		} else $sErrorNumber = '202';
+	} else $sErrorNumber = '202';
 
 
 	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
@@ -314,9 +301,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
     {
         // this line already exists so wrap the if block around it
         SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
-    }
-    else
-	{
+    } else {
 	    //issue the CKEditor Callback
         SendCKEditorResults(
 			$CKEcallback,
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 2a9ac9f146b..2438882604e 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -46,8 +46,7 @@ function GetResourceTypePath($resourceType, $sCommand)
 
 	if ($sCommand == "QuickUpload")
 		return $Config['QuickUploadPath'][$resourceType];
-	else
-		return $Config['FileTypesPath'][$resourceType];
+	else return $Config['FileTypesPath'][$resourceType];
 }
 
 /**
@@ -67,9 +66,7 @@ function GetResourceTypeDirectory($resourceType, $sCommand)
 
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
-	}
-	else
-	{
+	} else {
 		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
 			return $Config['FileTypesAbsolutePath'][$resourceType];
 
@@ -178,9 +175,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		if (isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate'])
 		{
 			mkdir($folderPath);
-		}
-		else
-		{
+		} else {
 			$permissions = '0777';
 			if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate'])
 			{
@@ -202,9 +197,7 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		ini_restore('error_reporting');
 
 		return $sErrorMsg;
-	}
-	else
-		return '';
+	} else return '';
 }
 
 /**
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index 1349ed00dad..b8caad99ee3 100644
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -81,18 +81,14 @@ function ConvertToXmlAttribute($value)
 	if (defined('PHP_OS'))
 	{
 		$os = PHP_OS;
-	}
-	else
-	{
+	} else {
 		$os = php_uname();
 	}
 
 	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
 	{
 		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else
-	{
+	} else {
 		return (htmlspecialchars($value));
 	}
 }
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index 1564fc3f9bc..48b957b9e8a 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -70,10 +70,8 @@ if (!empty($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;
+	} else $appli .= " ".DOL_VERSION;
+} else $appli .= " ".DOL_VERSION;
 
 if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
@@ -89,9 +87,7 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 		$logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
 		$logouttext .= '</a>';
-	}
-	else
-	{
+	} else {
 		$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 		$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 	}
@@ -118,9 +114,8 @@ $result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note
 if (is_numeric($result))
 {
 	if (empty($result)) $toprightmenu .= $hookmanager->resPrint; // add
-	else  $toprightmenu = $hookmanager->resPrint; // replace
-}
-else $toprightmenu .= $result; // For backward compatibility
+	else $toprightmenu = $hookmanager->resPrint; // replace
+} else $toprightmenu .= $result; // For backward compatibility
 
 // Link to module builder
 if (!empty($conf->modulebuilder->enabled))
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 92b8dc34a0e..78a96484751 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -177,8 +177,7 @@ $(document).ready(function(){
 if (empty($user->socid))	// If internal user or not defined
 {
 	$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
-}
-else                        	// If external user
+} else // If external user
 {
 	$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 }
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 9de5ceba476..b71dfc3eeb2 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -516,7 +516,8 @@ function hideMessage(fieldId,message) {
 
 
 /*
- * Used by button to set on/off
+ * Used by button to set on/off.
+ * Call url then make complementary action (like show/hide, enable/disable or set another option).
  *
  * @param	string	url			Url
  * @param	string	code		Code
@@ -525,12 +526,14 @@ function hideMessage(fieldId,message) {
  * @param	int		strict		Strict
  * @param   int     forcereload Force reload
  * @param   int     userid      User id
+ * @param   string  token       Token
  */
-function setConstant(url, code, input, entity, strict, forcereload, userid) {
-	$.get( url, {
+function setConstant(url, code, input, entity, strict, forcereload, userid, token) {
+	$.post( url, {
 		action: "set",
 		name: code,
-		entity: entity
+		entity: entity,
+		token: token
 	},
 	function() {
 		console.log("url request success forcereload="+forcereload);
@@ -582,11 +585,12 @@ function setConstant(url, code, input, entity, strict, forcereload, userid) {
 		if (forcereload) {
 			location.reload();
 		}
-	});
+	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMEssage in session visible */
 }
 
 /*
  * Used by button to set on/off
+ * Call url then make complementary action (like show/hide, enable/disable or set another option).
  *
  * @param	string	url			Url
  * @param	string	code		Code
@@ -595,12 +599,14 @@ function setConstant(url, code, input, entity, strict, forcereload, userid) {
  * @param	int		strict		Strict
  * @param   int     forcereload Force reload
  * @param   int     userid      User id
+ * @param   string  token       Token
  */
-function delConstant(url, code, input, entity, strict, forcereload, userid) {
-	$.get( url, {
+function delConstant(url, code, input, entity, strict, forcereload, userid, token) {
+	$.post( url, {
 		action: "del",
 		name: code,
-		entity: entity
+		entity: entity,
+		token: token
 	},
 	function() {
 		console.log("url request success forcereload="+forcereload);
@@ -648,7 +654,7 @@ function delConstant(url, code, input, entity, strict, forcereload, userid) {
 		if (forcereload) {
 			location.reload();
 		}
-	});
+	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMEssage in session visible */
 }
 
 /*
@@ -664,8 +670,9 @@ function delConstant(url, code, input, entity, strict, forcereload, userid) {
  * @param	int		noButton	noButton
  * @param	int		strict		Strict
  * @param   int     userid      User id
+ * @param   string  token       Token
  */
-function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton, strict, userid) {
+function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton, strict, userid, token) {
 	var boxConfirm = box;
 	$("#confirm_" + code)
 			.attr("title", boxConfirm.title)
@@ -681,9 +688,9 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 						text : yesButton,
 						click : function() {
 							if (action == "set") {
-								setConstant(url, code, input, entity, strict, 0, userid);
+								setConstant(url, code, input, entity, strict, 0, userid, token);
 							} else if (action == "del") {
-								delConstant(url, code, input, entity, strict, 0, userid);
+								delConstant(url, code, input, entity, strict, 0, userid, token);
 							}
 							// Close dialog
 							$(this).dialog("close");
@@ -1123,4 +1130,15 @@ $(document).ready(function() {
 });
 <?php } ?>
 
+// Force to hide menus when page is inside an iFrame
+$(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(".id-container").css('width', '100%');
+
+	}
+});
+
 // End of lib_head.js.php
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index 250eb0231a6..a95e3556405 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -39,91 +39,121 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
     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 = (nowtime + time_auto_update);'."\n";
+    print 'var time_js_next_test;'."\n";
     ?>
 
 	/* Check if permission ok */
 	if (Notification.permission !== "granted") {
+		console.log("Ask Notification.permission");
         Notification.requestPermission()
     }
 
 	/* 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 - (nowtime - time_js_next_test)) * 1000;	//need milliseconds
+    //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); ?>;
     if (login != '') {
-    	console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_test = "+time_js_next_test+" time_auto_update="+time_auto_update);
-    	setTimeout(first_execution, time_first_execution);
+    	setTimeout(first_execution, time_first_execution * 1000);
+        time_js_next_test = nowtime + time_first_execution;
+    	console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
     } //first run auto check
 
 
     function first_execution() {
-    	console.log("Call first_execution time_auto_update (MAIN_BROWSER_NOTIFICATION_FREQUENCY) = "+time_auto_update);
-        check_events();	//one check before launching timer to launch other checks
-        setInterval(check_events, time_auto_update * 1000); //program time to run next check events
+    	console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update);
+        check_events();	//one check before setting the new time for other checks
+        setInterval(check_events, time_auto_update * 1000); // Set new time to run next check events
     }
 
     function check_events() {
     	if (Notification.permission === "granted")
     	{
-    		console.log("Call check_events time_js_next_test = date we are looking for event after ="+time_js_next_test);
+    	    time_js_next_test += time_auto_update;
+    		console.log("Call ajax to check_events with time_js_next_test = "+time_js_next_test);
+
             $.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php'; ?>", {
                 type: "post",   // Usually post or get
                 async: true,
-                data: {time: time_js_next_test},
+                data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
+                dataType: "json",
                 success: function (result) {
-                    var arr = JSON.parse(result);
-                    if (arr.length > 0) {
+                	console.log(result);
+                    var arrayofpastreminders = Object.values(result.pastreminders);
+                    console.log("arrayofpastreminders.length"+arrayofpastreminders.length);
+                    if (arrayofpastreminders && arrayofpastreminders.length > 0) {
                     	var audio = null;
                         <?php
 						if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
 							print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav\');';
 						}
 						?>
+						var listofreminderids = '';
+						var noti = []
 
-                        $.each(arr, function (index, value) {
-                            var url="notdefined";
-                            var title="Not defined";
-                            var body = value['tipo'] + ': ' + value['titulo'];
-                            if (value['type'] == 'agenda' && value['location'] != null && value['location'] != '') {
-                                body += '\n' + value['location'];
+                        $.each(arrayofpastreminders, function (index, value) {
+                        	console.log(value);
+                            var url = "notdefined";
+                            var title = "Not defined";
+                            var body = value.label;
+                            if (value.type == 'agenda' && value.location != null && value.location != '') {
+                                body += '\n' + value.location;
                             }
 
-                            if (value['type'] == 'agenda')
+                            if (value.type == 'agenda' && (value.event_date_start_formated != null || value.event_date_start_formated['event_date_start'] != '')) {
+                                body += '\n' + value.event_date_start_formated;
+                            }
+
+                            if (value.type == 'agenda')
                             {
-                             	url = '<?php echo DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value['id'];
-                                title = '<?php print $langs->trans('Agenda') ?>';
+                             	url = '<?php echo DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
+                                title = '<?php print $langs->trans('EventReminder') ?>';
                             }
                             var extra = {
                                 icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
+                                //image: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
                                 body: body,
-                                tag: value['id']
+                                tag: value.id_agenda,
+                                requireInteraction: true
                             };
 
                             // We release the notify
-                            var noti = new Notification(title, extra);
+                            console.log("Send notification on browser");
+                            noti[index] = new Notification(title, extra);
                             if (index==0 && audio)
                             {
                             	audio.play();
                             }
-                            noti.onclick = function (event) {
-                                console.log("An event to notify on browser was received");
-                                event.preventDefault(); // prevent the browser from focusing the Notification's tab
-                                window.focus();
-                                window.open(url, '_blank');
-                                noti.close();
-                            };
+
+                            if (noti[index]) {
+	                            noti[index].onclick = function (event) {
+	                                console.log("A click on notification on browser has been done");
+	                                event.preventDefault(); // prevent the browser from focusing the Notification's tab
+	                                window.focus();
+	                                window.open(url, '_blank');
+	                                noti[index].close();
+	                            };
+
+	                            listofreminderids = (listofreminderids == '' ? '' : listofreminderids + ',') + value.id_reminder
+	                        }
                         });
+
+                        // Update status of all notifications we sent on browser (listofreminderids)
+                        console.log("Flag notification as done for listofreminderids="+listofreminderids);
+						$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php?action=stopreminder&listofreminderids='; ?>"+listofreminderids, {
+			                type: "post",   // Usually post or get
+			                async: true,
+			                data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
+			            });
+                    } else {
+                    	console.log("No past reminder found, next try at "+time_js_next_test);
                     }
                 }
             });
         }
         else
         {
-        	console.log("Cancel check_events. Useless because Notification.permission is "+Notification.permission);
+        	console.log("Cancel check_events. Useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
         }
-
-        time_js_next_test += time_auto_update;
-		console.log('Updated time_js_next_test. New value is '+time_js_next_test);
     }
     <?php
 }
diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js
index aea8f9a1318..0c8c9ff3245 100644
--- a/htdocs/core/js/timesheet.js
+++ b/htdocs/core/js/timesheet.js
@@ -91,6 +91,7 @@ function pad(n) {
 
 /* function from http://www.timlabonne.com/2013/07/parsing-a-time-string-with-javascript/ */
 /* timeStr must be a duration with format XX:YY (AM/PM not supported) */
+/* return: nbofextradays (0, 1, ...) */
 function parseTime(timeStr, dt)
 {
     if (!dt) {
@@ -103,14 +104,14 @@ function parseTime(timeStr, dt)
         return -1;
     }
     var hours = parseInt(time[1], 10);
- 
     dt.setHours(hours);
     dt.setMinutes(parseInt(time[2], 10) || 0);
     dt.setSeconds(0, 0);
-    return 0;
+ 	//console.log("hours="+hours+" => return nbofextradays="+Math.floor(hours / 24)+" hours="+dt.getHours());
+    return Math.floor(hours / 24);
 }
 
-/* Update total. days = column nb staring from 0 */
+/* Update total. days = column nb starting from 0 */
 function updateTotal(days,mode)
 {
 	console.log('updateTotal days='+days+' mode='+mode);
@@ -124,12 +125,15 @@ function updateTotal(days,mode)
         if (document.getElementById('numberOfFirstLine')) {
         	startline = parseInt(document.getElementById('numberOfFirstLine').value);
         }
+        var nbextradays = 0;
         for (var i=-1; i < nbline; i++)
         {
+        	/* get value into timespent cell */
+        	
             var id='timespent['+i+']['+days+']';
-            var taskTime= new Date(0);
-            var element=document.getElementById(id);
-            if(element)
+            var taskTime = new Date(0);
+            var element = document.getElementById(id);
+            if (element)
             {
             	/* alert(element.value);*/
                 if (element.value)
@@ -142,11 +146,16 @@ function updateTotal(days,mode)
                 }
                 if (result >= 0)
                 {
-                	total.setHours(total.getHours()+taskTime.getHours());
+                	nbextradays = nbextradays + Math.floor((total.getHours()+taskTime.getHours() + result*24) / 24);
+                	//console.log("i="+i+" result="+result);
+			    	total.setHours(total.getHours()+taskTime.getHours());
                 	total.setMinutes(total.getMinutes()+taskTime.getMinutes());
+            		//console.log("i="+i+" nbextradays cumul="+nbextradays+" h="+total.getHours()+" "+taskTime.getHours());
                 }
             }
-
+			
+			/* get value into timeadded cell */
+			
             var id='timeadded['+i+']['+days+']';
             var taskTime= new Date(0);
             var element=document.getElementById(id);
@@ -163,8 +172,11 @@ function updateTotal(days,mode)
                 }
                 if (result >= 0)
                 {
+                	nbextradays = nbextradays + Math.floor((total.getHours()+taskTime.getHours() + result*24) / 24);
+                	//console.log("i="+i+" result="+result);
                 	total.setHours(total.getHours()+taskTime.getHours());
                 	total.setMinutes(total.getMinutes()+taskTime.getMinutes());
+                	//console.log("i="+i+" nbextradays cumul="+nbextradays+" h="+total.getHours()+" "+taskTime.getHours());
                 }
             }
         }
@@ -223,10 +235,15 @@ function updateTotal(days,mode)
         	stringdays = '0'+stringdays;
         }
         
+        /* Output total in top of column */
+        
         if (total.getHours() || total.getMinutes()) jQuery('.totalDay'+stringdays).addClass("bold");
         else jQuery('.totalDay'+stringdays).removeClass("bold");
-    	jQuery('.totalDay'+stringdays).text(pad(total.getHours())+':'+pad(total.getMinutes()));
+        var texttoshow = pad(nbextradays * 24 + total.getHours())+':'+pad(total.getMinutes());
+    	jQuery('.totalDay'+stringdays).text(texttoshow);
 
+		/* Output total of all total */
+		
     	var totalhour = 0;
     	var totalmin = 0;
         for (var i=0; i<7; i++)
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 16b124443da..683d3a87401 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -56,7 +56,7 @@ function accounting_prepare_head(AccountingAccount $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Asset");
+	$head[$h][1] = $langs->trans("AccountAccounting");
 	$head[$h][2] = 'card';
 	$h++;
 
@@ -173,73 +173,133 @@ function length_accounta($accounta)
  */
 function journalHead($nom, $variante, $period, $periodlink, $description, $builddate, $exportlink = '', $moreparam = array(), $calcmode = '', $varlink = '')
 {
-    global $langs;
+	global $langs;
 
-    print "\n\n<!-- start banner journal -->\n";
+	print "\n\n<!-- start banner journal -->\n";
 
-    if (!is_empty($varlink)) $varlink = '?'.$varlink;
+	if (!is_empty($varlink)) $varlink = '?'.$varlink;
 
-    $head = array();
-    $h = 0;
-    $head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
-    $head[$h][1] = $langs->trans("Journalization");
-    $head[$h][2] = 'journal';
+	$head = array();
+	$h = 0;
+	$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
+	$head[$h][1] = $langs->trans("Journalization");
+	$head[$h][2] = 'journal';
 
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].$varlink.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-    dol_fiche_head($head, 'journal');
+	dol_fiche_head($head, 'journal');
 
-    foreach ($moreparam as $key => $value)
-    {
-        print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
-    }
-    print '<table width="100%" class="border">';
+	foreach ($moreparam as $key => $value)
+	{
+		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
+	}
+	print '<table width="100%" class="border">';
 
-    // Ligne de titre
-    print '<tr>';
-    print '<td width="110">'.$langs->trans("Name").'</td>';
-    print '<td colspan="3">';
-    print $nom;
-    print '</td>';
-    print '</tr>';
+	// Ligne de titre
+	print '<tr>';
+	print '<td width="110">'.$langs->trans("Name").'</td>';
+	print '<td colspan="3">';
+	print $nom;
+	print '</td>';
+	print '</tr>';
 
-    // Calculation mode
-    if ($calcmode)
-    {
-        print '<tr>';
-        print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
-        if (!$variante) print '<td colspan="3">';
-        else print '<td>';
-        print $calcmode;
-        if ($variante) print '</td><td colspan="2">'.$variante;
-        print '</td>';
-        print '</tr>';
-    }
+	// Calculation mode
+	if ($calcmode)
+	{
+		print '<tr>';
+		print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
+		if (!$variante) print '<td colspan="3">';
+		else print '<td>';
+		print $calcmode;
+		if ($variante) print '</td><td colspan="2">'.$variante;
+		print '</td>';
+		print '</tr>';
+	}
 
-    // Ligne de la periode d'analyse du rapport
-    print '<tr>';
-    print '<td>'.$langs->trans("ReportPeriod").'</td>';
-    if (!$periodlink) print '<td colspan="3">';
-    else print '<td>';
-    if ($period) print $period;
-    if ($periodlink) print '</td><td colspan="2">'.$periodlink;
-    print '</td>';
-    print '</tr>';
+	// Ligne de la periode d'analyse du rapport
+	print '<tr>';
+	print '<td>'.$langs->trans("ReportPeriod").'</td>';
+	if (!$periodlink) print '<td colspan="3">';
+	else print '<td>';
+	if ($period) print $period;
+	if ($periodlink) print '</td><td colspan="2">'.$periodlink;
+	print '</td>';
+	print '</tr>';
 
-    // Ligne de description
-    print '<tr>';
-    print '<td>'.$langs->trans("ReportDescription").'</td>';
-    print '<td colspan="3">'.$description.'</td>';
-    print '</tr>';
+	// Ligne de description
+	print '<tr>';
+	print '<td>'.$langs->trans("ReportDescription").'</td>';
+	print '<td colspan="3">'.$description.'</td>';
+	print '</tr>';
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
+	print '<div class="center"><input type="submit" class="button" name="submit" value="'.$langs->trans("Refresh").'"></div>';
 
-    print '</form>';
+	print '</form>';
 
-    print "\n<!-- end banner journal -->\n\n";
+	print "\n<!-- end banner journal -->\n\n";
+}
+
+/**
+ * Return Default dates for transfer based on periodicity option in accountancy setup
+ *
+ * @return	array		Dates of periodicity by default
+ */
+function getDefaultDatesForTransfer()
+{
+	global $db, $conf;
+
+	// Period by default on transfer (0: previous month | 1: current month | 2: fiscal year)
+	$periodbydefaultontransfer = $conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER;
+	isset($periodbydefaultontransfer) ? $periodbydefaultontransfer : 0;
+	if ($periodbydefaultontransfer == 2) {
+		$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);
+			$date_start = strtotime($fiscalYear->date_start);
+			$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');
+			$year_end = $year_start + 1;
+			$month_end = $month_start - 1;
+			if ($month_end < 1)
+			{
+				$month_end = 12;
+				$year_end--;
+			}
+			$date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
+			$date_end = dol_get_last_day($year_end, $month_end);
+		}
+	} elseif ($periodbydefaultontransfer == 1) {
+		$year_current = strftime("%Y", dol_now());
+		$pastmonth = strftime("%m", dol_now());
+		$pastmonthyear = $year_current;
+		if ($pastmonth == 0) {
+			$pastmonth = 12;
+			$pastmonthyear--;
+		}
+	} else {
+		$year_current = strftime("%Y", dol_now());
+		$pastmonth = strftime("%m", dol_now()) - 1;
+		$pastmonthyear = $year_current;
+		if ($pastmonth == 0) {
+			$pastmonth = 12;
+			$pastmonthyear--;
+		}
+	}
+
+	return array(
+		'date_start' => $date_start,
+		'date_end' => $date_end,
+		'pastmonthyear' => $pastmonthyear,
+		'pastmonth' => $pastmonth
+	);
 }
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 7b3d66f9003..038b4be27a6 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -185,8 +185,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 			                {
 			                	$qualified = 0;
 			                }
-            			}
-            			else						// This is a test on a constant. For example when we have -- VMYSQLUTF8UNICODE, we test constant $conf->global->UTF8UNICODE
+            			} 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]);
@@ -225,9 +224,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
         if ($buffer) $arraysql[$i] = $buffer;
         fclose($fp);
-    }
-    else
-    {
+    } else {
         dol_syslog("Admin.lib::run_sql failed to open file ".$sqlfile, LOG_ERR);
     }
 
@@ -251,9 +248,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
                     $obj = $db->fetch_object($resql);
                     $listofmaxrowid[$table] = $obj->max;
                     if (empty($listofmaxrowid[$table])) $listofmaxrowid[$table] = 0;
-                }
-                else
-                {
+                } 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>';
@@ -297,7 +292,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
         		$sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);
         	}
 
-            if (!empty($handler)) $sql = preg_replace('/__HANDLER__/i', "'".$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);
 
@@ -370,9 +365,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
                     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
-            {
+            } else {
                 $errno = $db->errno();
                 if (!$silent) print '<!-- Result = '.$errno.' -->'."\n";
 
@@ -414,9 +407,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
         if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
         if (!$silent) print '<td class="right">'.$langs->trans("OK").'</td></tr>'."\n";
         $ok = 1;
-    }
-    else
-    {
+    } 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;
@@ -458,9 +449,7 @@ function dolibarr_del_const($db, $name, $entity = 1)
     {
         $conf->global->$name = '';
         return 1;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         return -1;
     }
@@ -555,9 +544,7 @@ function dolibarr_set_const($db, $name, $value, $type = 'chaine', $visible = 0,
         $db->commit();
         $conf->global->$name = $value;
         return 1;
-    }
-    else
-    {
+    } else {
         $error = $db->lasterror();
         $db->rollback();
         return -1;
@@ -659,8 +646,7 @@ function security_prepare_head()
     {
     	$obj = $db->fetch_object($resql);
     	if ($obj) $nbPerms = $obj->nb;
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
 
     $head[$h][0] = DOL_URL_ROOT."/admin/perms.php";
     $head[$h][1] = $langs->trans("DefaultRights");
@@ -971,9 +957,7 @@ function activateModule($value, $withdeps = 1)
     if ($result <= 0)
     {
         $ret['errors'][] = $objMod->error;
-    }
-    else
-    {
+    } else {
         if ($withdeps)
         {
             if (isset($objMod->depends) && is_array($objMod->depends) && !empty($objMod->depends))
@@ -1009,9 +993,7 @@ function activateModule($value, $withdeps = 1)
     				{
     				    $ret['nbmodules'] += $resarray['nbmodules'];
     				    $ret['nbperms'] += $resarray['nbperms'];
-    				}
-    				else
-    				{
+    				} else {
     				    $ret['errors'][] = $langs->trans('activateModuleDependNotSatisfied', $objMod->name, $modulestring);
     				}
                 }
@@ -1082,8 +1064,7 @@ function unActivateModule($value, $requiredby = 1)
         $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
+    } 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
@@ -1163,9 +1144,7 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
                         if ($objMod->numero > 0)
                         {
                             $j = $objMod->numero;
-                        }
-                        else
-                        {
+                        } else {
                             $j = 1000 + $i;
                         }
 
@@ -1210,24 +1189,19 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
                                 {
                                     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
-                                {
+                                } else {
                                 	$taborder[] = 0; // Add an empty line
                                 }
                             }
 
                             $j++;
                             $i++;
-                        }
-                        else dol_syslog("Module ".get_class($objMod)." not qualified");
+                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
                     }
                 }
             }
             closedir($handle);
-        }
-        else
-        {
+        } else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1285,15 +1259,12 @@ function activateModulesRequiredByCountry($country_code)
 
 								setEventMessages($objMod->automatic_activation[$country_code], null, 'warnings');
 							}
-						}
-						else dol_syslog("Module ".get_class($objMod)." not qualified");
+						} else dol_syslog("Module ".get_class($objMod)." not qualified");
 					}
 				}
 			}
 			closedir($handle);
-		}
-		else
-		{
+		} else {
 			dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
 		}
 	}
@@ -1348,9 +1319,7 @@ function complete_elementList_with_modules(&$elementList)
                         if ($objMod->numero > 0)
                         {
                             $j = $objMod->numero;
-                        }
-                        else
-                        {
+                        } else {
                             $j = 1000 + $i;
                         }
 
@@ -1387,15 +1356,12 @@ function complete_elementList_with_modules(&$elementList)
 
                             $j++;
                             $i++;
-                        }
-                        else dol_syslog("Module ".get_class($objMod)." not qualified");
+                        } else dol_syslog("Module ".get_class($objMod)." not qualified");
                     }
                 }
             }
             closedir($handle);
-        }
-        else
-        {
+        } else {
             dol_syslog("htdocs/admin/modules.php: Failed to open directory ".$dir.". See permission and open_basedir option.", LOG_WARNING);
         }
     }
@@ -1448,17 +1414,13 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
     	// $const is a const key like 'MYMODULE_ABC'
     	if (is_numeric($key)) {		// Very old behaviour
     		$type = 'string';
-    	}
-    	else
-    	{
+    	} else {
     		if (is_array($const))
     		{
     			$type = $const['type'];
 				$label = $const['label'];
     			$const = $key;
-    		}
-    		else
-    		{
+    		} else {
     			$type = $const;
     			$const = $key;
     		}
@@ -1549,9 +1511,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                 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
-            {
+            } 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)).'">';
@@ -1560,18 +1520,15 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                     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')
+                } 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')
+                } elseif ($obj->type == 'yesno')
                 {
                 	print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : '[]'), $obj->value, 1);
-                }
-                elseif (preg_match('/emailtemplate/', $obj->type))
+                } elseif (preg_match('/emailtemplate/', $obj->type))
                 {
                 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
                 	$formmail = new FormMail($db);
@@ -1595,8 +1552,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
                 	//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'
+                } else // type = 'string' ou 'chaine'
                 {
                     print '<input type="text" class="flat" size="48" name="constvalue'.(empty($strictw3c) ? '' : '[]').'" value="'.dol_escape_htmltag($obj->value).'">';
                 }
@@ -1674,7 +1630,7 @@ 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)."','".$type."',".$conf->entity.", ";
+    $sql .= " VALUES ('".$db->escape($name)."','".$db->escape($type)."',".$conf->entity.", ";
     $sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
     $sql .= (!empty($description) ? "'".$db->escape($description)."'" : "null");
     $sql .= ")";
@@ -1685,9 +1641,7 @@ function addDocumentModel($name, $type, $label = '', $description = '')
 	{
 		$db->commit();
 		return 1;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 		return -1;
@@ -1709,7 +1663,7 @@ function delDocumentModel($name, $type)
 
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
 	$sql .= " WHERE nom = '".$db->escape($name)."'";
-	$sql .= " AND type = '".$type."'";
+	$sql .= " AND type = '".$db->escape($type)."'";
 	$sql .= " AND entity = ".$conf->entity;
 
 	dol_syslog("admin.lib::delDocumentModel", LOG_DEBUG);
@@ -1718,9 +1672,7 @@ function delDocumentModel($name, $type)
 	{
 		$db->commit();
 		return 1;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 		return -1;
@@ -1737,8 +1689,11 @@ function phpinfo_array()
 {
 	ob_start();
 	phpinfo();
+	$phpinfostring = ob_get_contents();
+	ob_end_clean();
+
 	$info_arr = array();
-	$info_lines = explode("\n", strip_tags(ob_get_clean(), "<tr><td><h2>")); // end of ob_start()
+	$info_lines = explode("\n", strip_tags($phpinfostring, "<tr><td><h2>"));
 	$cat = "General";
 	foreach ($info_lines as $line)
 	{
@@ -1749,8 +1704,7 @@ function phpinfo_array()
 		if (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
 		{
 			$info_arr[trim($cat)][trim($val[1])] = $val[2];
-		}
-		elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
+		} elseif (preg_match("~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~", $line, $val))
 		{
 			$info_arr[trim($cat)][trim($val[1])] = array("local" => $val[2], "master" => $val[3]);
 		}
@@ -1818,6 +1772,14 @@ function email_admin_prepare_head()
 			$head[$h][2] = 'common_emailing';
 			$h++;
 		}
+
+		if ($conf->ticket->enabled)
+		{
+			$head[$h][0] = DOL_URL_ROOT."/admin/mails_ticket.php";
+			$head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("Ticket"));
+			$head[$h][2] = 'common_ticket';
+			$h++;
+		}
 	}
 
 	$head[$h][0] = DOL_URL_ROOT."/admin/mails_templates.php";
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index b29457c1d0c..19ce8e33fdc 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -51,6 +51,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 {
 	global $conf, $user, $langs, $db, $hookmanager;
 	global $begin_h, $end_h, $begin_d, $end_d;
+	global $massaction;
 
 	$langs->load("companies");
 
@@ -63,44 +64,36 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	print '<input type="hidden" name="year" value="'.$year.'">';
 	print '<input type="hidden" name="month" value="'.$month.'">';
 	print '<input type="hidden" name="day" value="'.$day.'">';
-	print '<input type="hidden" name="action" value="'.$action.'">';
+	if ($massaction != 'predelete') {		// When $massaction == 'predelete', action may be already output to 'delete' by the mass action system.
+		print '<input type="hidden" name="action" value="'.$action.'">';
+	}
 	print '<input type="hidden" name="search_showbirthday" value="'.$showbirthday.'">';
 
-	print '<div class="fichecenter">';
-
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfleft">';
-	else print '<table class="nobordernopadding centpercent"><tr><td class="borderright">';
-
-	print '<table class="nobordernopadding centpercent tableforfield">';
-
 	if ($canedit)
 	{
+		print '<div class="divsearchfield">';
 		// Type
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("Type");
-		print '</td><td class="nowraponall">';
+		print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;"></span>';
+		print '<span class="hideonsmartphone">'.$langs->trans("Type").'</span>';
 		$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));
 		}
-		print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;"></span>';
 		print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500');
-		print '</td></tr>';
+		print '</div>';
 
 		// Assigned to
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("ActionsToDoBy").' &nbsp; ';
-		print '</td><td>';
+		print '<div class="divsearchfield">';
 		print img_picto('', 'user', 'class="fawidth30 inline-block"');
+		print '<span class="hideonsmartphone">'.$langs->trans("ActionsToDoBy").'</span>';
 		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500');
-		if (empty($conf->dol_optimize_smallscreen)) print ' &nbsp; '.$langs->trans("or").' '.$langs->trans("ToUserOfGroup").' &nbsp; ';
-		else print '<br>';
+		print '</div>';
+		print '<div class="divsearchfield">';
 		print img_picto('', 'object_group', 'class="fawidth30 inline-block"');
+		print '<span class="hideonsmartphone">'.$langs->trans("ToUserOfGroup").'</span>';
 		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'maxwidth500');
-		print '</td></tr>';
+		print '</div>';
 
 		if ($conf->resource->enabled)
 		{
@@ -108,25 +101,21 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		    $formresource = new FormResource($db);
 
     		// Resource
-    		print '<tr>';
-    		print '<td class="nowrap">';
-    		print $langs->trans("Resource");
-    		print '</td><td class="nowraponall">';
-    		print img_picto('', 'object_resource', 'class="fawidth30 inline-block"');
+		    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 '</td></tr>';
+    		print '</div>';
 		}
 	}
 
 	if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
 	{
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("ThirdParty").' &nbsp; ';
-		print '</td><td class="nowraponall">';
+		print '<div class="divsearchfield">';
 		print img_picto('', 'company', 'class="fawidth30 inline-block"');
+		print '<span class="hideonsmartphone">'.$langs->trans("ThirdParty").'</span>';
 		print $form->select_company($socid, 'search_socid', '', '&nbsp;', 0, 0, null, 0, 'minwidth100 maxwidth500');
-		print '</td></tr>';
+		print '</div>';
 	}
 
 	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
@@ -134,80 +123,29 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 		$formproject = new FormProjets($db);
 
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("Project").' &nbsp; ';
-		print '</td><td class="nowraponall">';
+		print '<div class="divsearchfield">';
 		print img_picto('', 'project', 'class="fawidth30 inline-block"');
+		print '<span class="hideonsmartphone">'.$langs->trans("Project").'</span>';
 		print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
-		print '</td></tr>';
+		print '</div>';
 	}
 
 	if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"]))
 	{
 		// Status
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("Status");
-		print ' &nbsp;</td><td class="nowraponall">';
+		print '<div class="divsearchfield">';
+		print img_picto('', 'setup', 'class="fawidth30 inline-block"');
+		print '<span class="hideonsmartphone">'.$langs->trans("Status").'</span>';
 		$formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
-		print '</td></tr>';
-	}
-
-	if ($canedit && $action == 'show_peruser')
-	{
-		// Filter on hours
-		print '<tr>';
-		print '<td class="nowrap">'.$langs->trans("VisibleTimeRange").'</td>';
-		print "<td class='nowrap'>";
-		print '<div class="ui-grid-a"><div class="ui-block-a">';
-		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
-		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
-		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
-		print '</div></div>';
-		print '</td></tr>';
-
-		// Filter on days
-		print '<tr>';
-		print '<td class="nowrap">'.$langs->trans("VisibleDaysRange").'</td>';
-		print "<td class='nowrap'>";
-		print '<div class="ui-grid-a"><div class="ui-block-a">';
-		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
-		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
-		print '</div></div>';
-		print '</td></tr>';
+		print '</div>';
 	}
 
 	// Hooks
 	$parameters = array('canedit'=>$canedit, 'pid'=>$pid, 'socid'=>$socid);
+	$object = null;
 	$reshook = $hookmanager->executeHooks('searchAgendaFrom', $parameters, $object, $action); // Note that $action and $object may have been
 
-	print '</table>';
-
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td>';
-
-	if ($conf->browser->layout == 'phone') print '<div class="fichehalfright">';
-	else print '<td class="center nowrap" valign="middle">';
-
-	print '<table class="centpercent"><tr><td align="center">';
-	print '<div class="formleftzone">';
-	print '<input type="submit" class="button" style="min-width:120px" name="refresh" value="'.$langs->trans("Refresh").'">';
-	print '</div>';
-	print '</td></tr>';
-	print '</table>';
-
-	if ($conf->browser->layout == 'phone') print '</div>';
-	else print '</td></tr></table>';
-
-	print '</div>'; // Close fichecenter
 	print '<div style="clear:both"></div>';
-
-	//print '</form>';
 }
 
 
@@ -248,7 +186,7 @@ function show_array_actions_to_do($max = 5)
 		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 '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=todo">'.$langs->trans("FullList").'</a></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;
@@ -304,9 +242,7 @@ function show_array_actions_to_do($max = 5)
 	    print "</table></div><br>";
 
 	    $db->free($resql);
-	}
-	else
-	{
+	} else {
 	    dol_print_error($db);
 	}
 }
@@ -346,7 +282,7 @@ function show_array_last_actions_done($max = 5)
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks", $max).'</th>';
-		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=done">'.$langs->trans("FullList").'</a></th>';
+		print '<th colspan="2" class="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&status=done">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 		$var = true;
 		$i = 0;
@@ -393,9 +329,7 @@ function show_array_last_actions_done($max = 5)
 		print "</table></div><br>";
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -524,7 +458,7 @@ function calendars_prepare_head($param)
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php'.($param ? '?'.$param : '');
+    $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++;
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 869fcf602d7..10fa477600a 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -46,16 +46,16 @@
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array(), $moreparams = '')
 {
-    if (empty($minLength)) $minLength = 1;
+	if (empty($minLength)) $minLength = 1;
 
-    $dataforrenderITem = 'ui-autocomplete';
-    $dataforitem = 'ui-autocomplete-item';
-    // Allow two constant to use other values for backward compatibility
-    if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) $dataforrenderITem = constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');
-    if (defined('JS_QUERY_AUTOCOMPLETE_ITEM'))       $dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM');
+	$dataforrenderITem = 'ui-autocomplete';
+	$dataforitem = 'ui-autocomplete-item';
+	// Allow two constant to use other values for backward compatibility
+	if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) $dataforrenderITem = constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');
+	if (defined('JS_QUERY_AUTOCOMPLETE_ITEM'))       $dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM');
 
-    // Input search_htmlname is original field
-    // Input htmlname is a second input field used when using ajax autocomplete.
+	// Input search_htmlname is original field
+	// Input htmlname is a second input field used when using ajax autocomplete.
 	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" '.($moreparams ? $moreparams : '').' />';
 
 	$script .= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
@@ -348,7 +348,7 @@ function ajax_dialog($title, $message, $w = 350, $h = 150)
 	$msg = '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">';
 	$msg .= $message;
 	$msg .= '</div>'."\n";
-    $msg .= '<script>
+	$msg .= '<script>
     jQuery(function() {
         jQuery("#dialog-info").dialog({
 	        resizable: false,
@@ -364,9 +364,9 @@ function ajax_dialog($title, $message, $w = 350, $h = 150)
 	});
 	</script>';
 
-    $msg .= "\n";
+	$msg .= "\n";
 
-    return $msg;
+	return $msg;
 }
 
 
@@ -397,8 +397,8 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 
 	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete = 0;
 
-    $tmpplugin = 'select2';
-    $msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
+	$tmpplugin = 'select2';
+	$msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
           <script>
         	$(document).ready(function () {
         		$(\''.(preg_match('/^\./', $htmlname) ? $htmlname : '#'.$htmlname).'\').'.$tmpplugin.'({
@@ -477,9 +477,9 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 	}
 
 	$msg .= '});'."\n";
-    $msg .= "</script>\n";
+	$msg .= "</script>\n";
 
-    return $msg;
+	return $msg;
 }
 
 /**
@@ -491,8 +491,8 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
  *  @param	int		$revertonoff			Revert on/off
  *  @param	int		$strict					Use only "disabled" with delConstant and "enabled" with setConstant
  *  @param	int		$forcereload			Force to reload page if we click/change value (this is supported only when there is no 'alert' option in input)
- *  @param	string	$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No margin left. Works for fontawesome picto only.
- *  @param	int		$forcenoajax	1=Force to use a ahref link instead of ajax code.
+ *  @param	string	$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No left margin. Works for fontawesome picto only.
+ *  @param	int		$forcenoajax			1=Force to use a ahref link instead of ajax code.
  * 	@return	string
  */
 function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2, $forcenoajax = 0)
@@ -500,15 +500,13 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 	global $conf, $langs, $user;
 
 	$entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity);
-	if (! isset($input)) $input = array();
+	if (!isset($input)) $input = array();
 
 	if (empty($conf->use_javascript_ajax) || $forcenoajax)
 	{
-		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-	}
-	else
-	{
+		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	} else {
 		$out = "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script>
 			$(document).ready(function() {
@@ -518,17 +516,18 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 				var entity = \''.$entity.'\';
 				var strict = \''.$strict.'\';
 				var userid = \''.$user->id.'\';
-				var yesButton = "'.dol_escape_js($langs->transnoentities("Yes")).'";
-				var noButton = "'.dol_escape_js($langs->transnoentities("No")).'";
+				var yesButton = \''.dol_escape_js($langs->transnoentities("Yes")).'\';
+				var noButton = \''.dol_escape_js($langs->transnoentities("No")).'\';
+				var token = \''.currentToken().'\';
 
 				// Set constant
 				$("#set_" + code).click(function() {
 					if (input.alert && input.alert.set) {
 						if (input.alert.set.yesButton) yesButton = input.alert.set.yesButton;
 						if (input.alert.set.noButton)  noButton = input.alert.set.noButton;
-						confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict, userid);
+						confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict, userid, token);
 					} else {
-						setConstant(url, code, input, entity, 0, '.$forcereload.', userid);
+						setConstant(url, code, input, entity, 0, '.$forcereload.', userid, token);
 					}
 				});
 
@@ -537,9 +536,9 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 					if (input.alert && input.alert.del) {
 						if (input.alert.del.yesButton) yesButton = input.alert.del.yesButton;
 						if (input.alert.del.noButton)  noButton = input.alert.del.noButton;
-						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid);
+						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid, token);
 					} else {
-						delConstant(url, code, input, entity, 0, '.$forcereload.', userid);
+						delConstant(url, code, input, entity, 0, '.$forcereload.', userid, token);
 					}
 				});
 			});
@@ -568,9 +567,9 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
  */
 function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input = array())
 {
-    global $langs;
+	global $langs;
 
-    $out = '<script>
+	$out = '<script>
         $(function() {
             var input = '.json_encode($input).';
 
@@ -581,7 +580,8 @@ function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input =
                     field: \''.$field.'\',
                     value: \'1\',
                     element: \''.$object->element.'\',
-                    id: \''.$object->id.'\'
+                    id: \''.$object->id.'\',
+					token: \''.newToken().'\'
                 },
                 function() {
                     $("#set_'.$code.'_'.$object->id.'").hide();
@@ -611,7 +611,8 @@ function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input =
                     field: \''.$field.'\',
                     value: \'0\',
                     element: \''.$object->element.'\',
-                    id: \''.$object->id.'\'
+                    id: \''.$object->id.'\',
+					token: \''.newToken().'\'
                 },
                 function() {
                     $("#del_'.$code.'_'.$object->id.'").hide();
@@ -635,8 +636,8 @@ function ajax_object_onoff($object, $code, $field, $text_on, $text_off, $input =
             });
         });
     </script>';
-    $out .= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').'">'.img_picto($langs->trans($text_off), 'switch_off').'</span>';
-    $out .= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').'">'.img_picto($langs->trans($text_on), 'switch_on').'</span>';
+	$out .= '<span id="set_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? 'hideobject' : '').'">'.img_picto($langs->trans($text_off), 'switch_off').'</span>';
+	$out .= '<span id="del_'.$code.'_'.$object->id.'" class="linkobject '.($object->$code == 1 ? '' : 'hideobject').'">'.img_picto($langs->trans($text_on), 'switch_on').'</span>';
 
-    return $out;
+	return $out;
 }
diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php
index 1b58784f6e8..5fddf4f1c46 100644
--- a/htdocs/core/lib/asset.lib.php
+++ b/htdocs/core/lib/asset.lib.php
@@ -88,10 +88,10 @@ function asset_prepare_head(Asset $object)
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	//$this->tabs = array(
-	//	'entity:+tabname:Title:@assets:/assets/mypage.php?id=__ID__'
+	//	'entity:+tabname:Title:@assets:/asset/mypage.php?id=__ID__'
 	//); // to add new tab
 	//$this->tabs = array(
-	//	'entity:-tabname:Title:@assets:/assets/mypage.php?id=__ID__'
+	//	'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'
 	//); // to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets');
 
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index d0f102a4e78..387d705780a 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -334,8 +334,7 @@ function checkBanForAccount($account)
             return false; // Sould be 6 but can be 123-456
         elseif (strlen($account->code_banque) < 6)
             return false; // Sould be 6
-        else
-            return true;
+        else return true;
     }
 
     // No particular rule
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index a4d7a077aab..da712d960cd 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -127,15 +127,12 @@ function barcode_encode($code, $encoding)
         /* 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
+    } 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
-    {
+    } 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";
@@ -263,9 +260,7 @@ function barcode_encode_genbarcode($code, $encoding)
         $text = fgets($fp, 1024);
         $encoding = fgets($fp, 1024);
         pclose($fp);
-    }
-    else
-    {
+    } else {
         dol_syslog("barcode.lib.php::barcode_encode_genbarcode failed to run popen ".$fullcommandclear, LOG_ERR);
         return false;
     }
@@ -396,18 +391,14 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
     {
         header("Content-Type: image/jpeg; name=\"barcode.jpg\"");
         imagejpeg($im);
-    }
-    elseif ($mode == 'gif')
+    } elseif ($mode == 'gif')
     {
         header("Content-Type: image/gif; name=\"barcode.gif\"");
         imagegif($im);
-    }
-    elseif (!empty($filebarcode))    // To wxrite into  afile onto disk
+    } elseif (!empty($filebarcode))    // To wxrite into  afile onto disk
     {
         imagepng($im, $filebarcode);
-    }
-    else
-    {
+    } 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 67611649142..d7b5773e1c2 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -41,20 +41,20 @@
  */
 function societe_prepare_head(Societe $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.'/societe/card.php?socid='.$object->id;
-    $head[$h][1] = $langs->trans("ThirdParty");
-    $head[$h][2] = 'card';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
+	$head[$h][1] = $langs->trans("ThirdParty");
+	$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 = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 			$nbContact = 0; // TODO
 
 			$sql = "SELECT COUNT(p.rowid) as nb";
@@ -67,15 +67,13 @@ function societe_prepare_head(Societe $object)
 				if ($obj) $nbContact = $obj->nb;
 			}
 
-		    $head[$h][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$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][0] = DOL_URL_ROOT.'/societe/contact.php?socid='.$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++;
 		}
-    }
-    else
-	{
+	} else {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/societecontact.php?socid='.$object->id;
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][1] = $langs->trans("ContactsAddresses");
@@ -84,66 +82,65 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-    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");
-        if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && $object->client == 3) $head[$h][1] .= ' | ';
-        if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && ($object->client == 1 || $object->client == 3)) $head[$h][1] .= $langs->trans("Customer");
-        $head[$h][2] = 'customer';
-        $h++;
+	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");
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && $object->client == 3) $head[$h][1] .= ' | ';
+		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && ($object->client == 1 || $object->client == 3)) $head[$h][1] .= $langs->trans("Customer");
+		$head[$h][2] = 'customer';
+		$h++;
 
-        if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-        {
-            $langs->load("products");
-            // price
-            $head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;
-            $head[$h][1] = $langs->trans("CustomerPrices");
-            $head[$h][2] = 'price';
-            $h++;
-        }
-    }
-    $supplier_module_enabled = 0;
-    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $supplier_module_enabled = 1;
-    if ($supplier_module_enabled == 1 && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-    {
-        $head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id;
-        $head[$h][1] = $langs->trans("Supplier");
-        $head[$h][2] = 'supplier';
-        $h++;
-    }
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+		{
+			$langs->load("products");
+			// price
+			$head[$h][0] = DOL_URL_ROOT.'/societe/price.php?socid='.$object->id;
+			$head[$h][1] = $langs->trans("CustomerPrices");
+			$head[$h][2] = 'price';
+			$h++;
+		}
+	}
+	$supplier_module_enabled = 0;
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $supplier_module_enabled = 1;
+	if ($supplier_module_enabled == 1 && $object->fournisseur && !empty($user->rights->fournisseur->lire))
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id;
+		$head[$h][1] = $langs->trans("Supplier");
+		$head[$h][2] = 'supplier';
+		$h++;
+	}
 
-    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;
-    	$sql = "SELECT COUNT(n.rowid) as nb";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."projet as n";
-    	$sql .= " WHERE fk_soc = ".$object->id;
-    	$sql .= " AND entity IN (".getEntity('project').")";
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$num = $db->num_rows($resql);
-    		$i = 0;
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($resql);
-    			$nbNote = $obj->nb;
-    			$i++;
-    		}
-    	}
-    	else {
-    		dol_print_error($db);
-    	}
+	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;
+		$sql = "SELECT COUNT(n.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as n";
+		$sql .= " WHERE fk_soc = ".$object->id;
+		$sql .= " AND entity IN (".getEntity('project').")";
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				$nbNote = $obj->nb;
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'project';
-    	$h++;
-    }
+		$head[$h][2] = 'project';
+		$h++;
+	}
 
-    // Tab to link resources
+	// Tab to link resources
 	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;
@@ -174,24 +171,24 @@ 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))
-    {
-        $head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
-        $head[$h][1] = $langs->trans("Referers");
-        $head[$h][2] = 'consumption';
-        $h++;
-    }
+	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))
+	{
+		$head[$h][0] = DOL_URL_ROOT.'/societe/consumption.php?socid='.$object->id;
+		$head[$h][1] = $langs->trans("Referers");
+		$head[$h][2] = 'consumption';
+		$h++;
+	}
 
-    // Bank accounts
-    if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))
-    {
-    	$nbBankAccount = 0;
+	// Bank accounts
+	if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT))
+	{
+		$nbBankAccount = 0;
 		$foundonexternalonlinesystem = 0;
-    	$langs->load("banks");
+		$langs->load("banks");
 
-        //$title = $langs->trans("BankAccounts");
-    	$title = $langs->trans("PaymentInformation");
+		//$title = $langs->trans("BankAccounts");
+		$title = $langs->trans("PaymentInformation");
 
 		if (!empty($conf->stripe->enabled))
 		{
@@ -207,150 +204,147 @@ function societe_prepare_head(Societe $object)
 			if ($stripecu) $foundonexternalonlinesystem++;
 		}
 
-        $sql = "SELECT COUNT(n.rowid) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as n";
-        $sql .= " WHERE n.fk_soc = ".$object->id;
-        if (empty($conf->stripe->enabled)) {
+		$sql = "SELECT COUNT(n.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as n";
+		$sql .= " WHERE n.fk_soc = ".$object->id;
+		if (empty($conf->stripe->enabled)) {
 			$sql .= " AND n.stripe_card_ref IS NULL";
 		} else {
 			$sql .= " AND (n.stripe_card_ref IS NULL OR (n.stripe_card_ref IS NOT NULL AND n.status = ".$servicestatus."))";
 		}
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $num = $db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                $nbBankAccount = $obj->nb;
-                $i++;
-            }
-        }
-        else {
-            dol_print_error($db);
-        }
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				$nbBankAccount = $obj->nb;
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        //if (! empty($conf->stripe->enabled) && $nbBankAccount > 0) $nbBankAccount = '...';	// No way to know exact number
+		//if (! empty($conf->stripe->enabled) && $nbBankAccount > 0) $nbBankAccount = '...';	// No way to know exact number
 
-        $head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
-        $head[$h][1] = $title;
-        if ($foundonexternalonlinesystem) $head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
-       	elseif ($nbBankAccount > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbBankAccount.'</span>';
-        $head[$h][2] = 'rib';
-        $h++;
-    }
+		$head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
+		$head[$h][1] = $title;
+		if ($foundonexternalonlinesystem) $head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
+	   	elseif ($nbBankAccount > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbBankAccount.'</span>';
+		$head[$h][2] = 'rib';
+		$h++;
+	}
 
-    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;
-    	$sql = "SELECT COUNT(n.rowid) as nb";
-    	$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)
-    	{
-    		$num = $db->num_rows($resql);
-    		$i = 0;
-    		while ($i < $num)
-    		{
-    			$obj = $db->fetch_object($resql);
-    			$nbNote = $obj->nb;
-    			$i++;
-    		}
-    	}
-    	else {
-    		dol_print_error($db);
-    	}
-    	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-    	$head[$h][2] = 'website';
-    	$h++;
-    }
+	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;
+		$sql = "SELECT COUNT(n.rowid) as nb";
+		$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)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				$nbNote = $obj->nb;
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		$head[$h][2] = 'website';
+		$h++;
+	}
 
 	// Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty');
+	// 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, 'thirdparty');
 
-    if ($user->socid == 0)
-    {
-        // Notifications
-        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)
-        	{
-        		$num = $db->num_rows($resql);
-        		$i = 0;
-        		while ($i < $num)
-        		{
-        			$obj = $db->fetch_object($resql);
-        			$nbNote = $obj->nb;
-        			$i++;
-        		}
-        	}
-        	else {
-        		dol_print_error($db);
-        	}
+	if ($user->socid == 0)
+	{
+		// Notifications
+		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)
+			{
+				$num = $db->num_rows($resql);
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					$nbNote = $obj->nb;
+					$i++;
+				}
+			} else {
+				dol_print_error($db);
+			}
 
-        	$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id;
-        	$head[$h][1] = $langs->trans("Notifications");
+			$head[$h][0] = DOL_URL_ROOT.'/societe/notify/card.php?socid='.$object->id;
+			$head[$h][1] = $langs->trans("Notifications");
 			if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-        	$head[$h][2] = 'notify';
-        	$h++;
-        }
+			$head[$h][2] = 'notify';
+			$h++;
+		}
 
 		// Notes
-        $nbNote = 0;
-        if (!empty($object->note_private)) $nbNote++;
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
 		if (!empty($object->note_public)) $nbNote++;
-        $head[$h][0] = DOL_URL_ROOT.'/societe/note.php?id='.$object->id;
-        $head[$h][1] = $langs->trans("Notes");
+		$head[$h][0] = DOL_URL_ROOT.'/societe/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++;
 
-        // 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->societe->multidir_output[$object->entity]."/".$object->id;
-        $nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-        $nbLinks = Link::count($db, $object->element, $object->id);
+		// 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->societe->multidir_output[$object->entity]."/".$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.'/societe/document.php?socid='.$object->id;
-        $head[$h][1] = $langs->trans("Documents");
+		$head[$h][0] = DOL_URL_ROOT.'/societe/document.php?socid='.$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++;
-    }
+		$head[$h][2] = 'document';
+		$h++;
+	}
 
-    $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)))
-    {
-        $head[$h][1] .= '/';
-        $head[$h][1] .= $langs->trans("Agenda");
-    }
-    $head[$h][2] = 'agenda';
-    $h++;
+	$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)))
+	{
+		$head[$h][1] .= '/';
+		$head[$h][1] .= $langs->trans("Agenda");
+	}
+	$head[$h][2] = 'agenda';
+	$h++;
 
-    // Log
-    /*$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id;
+	// Log
+	/*$head[$h][0] = DOL_URL_ROOT.'/societe/info.php?socid='.$object->id;
     $head[$h][1] = $langs->trans("Info");
     $head[$h][2] = 'info';
     $h++;*/
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'thirdparty', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -362,21 +356,21 @@ function societe_prepare_head(Societe $object)
  */
 function societe_prepare_head2($object)
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
-    $head[$h][1] = $langs->trans("ThirdParty");
-    $head[$h][2] = 'company';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/societe/card.php?socid='.$object->id;
+	$head[$h][1] = $langs->trans("ThirdParty");
+	$head[$h][2] = 'company';
+	$h++;
 
-    $head[$h][0] = 'commerciaux.php?socid='.$object->id;
-    $head[$h][1] = $langs->trans("SalesRepresentative");
-    $head[$h][2] = 'salesrepresentative';
-    $h++;
+	$head[$h][0] = 'commerciaux.php?socid='.$object->id;
+	$head[$h][1] = $langs->trans("SalesRepresentative");
+	$head[$h][2] = 'salesrepresentative';
+	$h++;
 
-    return $head;
+	return $head;
 }
 
 
@@ -388,35 +382,35 @@ function societe_prepare_head2($object)
  */
 function societe_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.'/societe/admin/societe.php';
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'general';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe.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, 'company_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, 'company_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsThirdParties");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/societe/admin/societe_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsThirdParties");
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/societe/admin/contact_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsContacts");
-    $head[$h][2] = 'attributes_contacts';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/societe/admin/contact_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsContacts");
+	$head[$h][2] = 'attributes_contacts';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'company_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'company_admin', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -438,52 +432,49 @@ function societe_admin_prepare_head()
  */
 function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '', $entconv = 1, $searchlabel = '')
 {
-    global $db, $langs;
+	global $db, $langs;
 
-    $result = '';
+	$result = '';
 
-    // Check parameters
-    if (empty($searchkey) && empty($searchlabel))
-    {
-    	if ($withcode === 'all') return array('id'=>'', 'code'=>'', 'label'=>'');
-    	else return '';
-    }
-    if (!is_object($dbtouse)) $dbtouse = $db;
-    if (!is_object($outputlangs)) $outputlangs = $langs;
+	// Check parameters
+	if (empty($searchkey) && empty($searchlabel))
+	{
+		if ($withcode === 'all') return array('id'=>'', 'code'=>'', 'label'=>'');
+		else return '';
+	}
+	if (!is_object($dbtouse)) $dbtouse = $db;
+	if (!is_object($outputlangs)) $outputlangs = $langs;
 
-    $sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country";
-    if (is_numeric($searchkey)) $sql .= " WHERE rowid=".$searchkey;
-    elseif (!empty($searchkey)) $sql .= " WHERE code='".$db->escape($searchkey)."'";
-    else $sql .= " WHERE label='".$db->escape($searchlabel)."'";
+	$sql = "SELECT rowid, code, label FROM ".MAIN_DB_PREFIX."c_country";
+	if (is_numeric($searchkey)) $sql .= " WHERE rowid=".$searchkey;
+	elseif (!empty($searchkey)) $sql .= " WHERE code='".$db->escape($searchkey)."'";
+	else $sql .= " WHERE label='".$db->escape($searchlabel)."'";
 
-    $resql = $dbtouse->query($sql);
-    if ($resql)
-    {
-        $obj = $dbtouse->fetch_object($resql);
-        if ($obj)
-        {
-            $label = ((!empty($obj->label) && $obj->label != '-') ? $obj->label : '');
-            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;
-            }
-            if ($withcode == 1) $result = $label ? "$obj->code - $label" : "$obj->code";
-            elseif ($withcode == 2) $result = $obj->code;
-            elseif ($withcode == 3) $result = $obj->rowid;
-            elseif ($withcode === 'all') $result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label);
-            else $result = $label;
-        }
-        else
-        {
-            $result = 'NotDefined';
-        }
-        $dbtouse->free($resql);
-        return $result;
-    }
-    else dol_print_error($dbtouse, '');
-    return 'Error';
+	$resql = $dbtouse->query($sql);
+	if ($resql)
+	{
+		$obj = $dbtouse->fetch_object($resql);
+		if ($obj)
+		{
+			$label = ((!empty($obj->label) && $obj->label != '-') ? $obj->label : '');
+			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;
+			}
+			if ($withcode == 1) $result = $label ? "$obj->code - $label" : "$obj->code";
+			elseif ($withcode == 2) $result = $obj->code;
+			elseif ($withcode == 3) $result = $obj->rowid;
+			elseif ($withcode === 'all') $result = array('id'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$label);
+			else $result = $label;
+		} else {
+			$result = 'NotDefined';
+		}
+		$dbtouse->free($resql);
+		return $result;
+	} else dol_print_error($dbtouse, '');
+	return 'Error';
 }
 
 /**
@@ -503,70 +494,60 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
  */
 function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlangs = '', $entconv = 1)
 {
-    global $db, $langs;
+	global $db, $langs;
 
-    if (!is_object($dbtouse)) $dbtouse = $db;
+	if (!is_object($dbtouse)) $dbtouse = $db;
 
-    $sql = "SELECT d.rowid as id, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.code_region as region_code, r.nom as region_name FROM";
-    $sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
-    $sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and d.rowid=".$id;
-    $sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
-    $sql .= " ORDER BY c.code, d.code_departement";
+	$sql = "SELECT d.rowid as id, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code, r.code_region as region_code, r.nom as region_name FROM";
+	$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
+	$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and d.rowid=".$id;
+	$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
+	$sql .= " ORDER BY c.code, d.code_departement";
 
-    dol_syslog("Company.lib::getState", LOG_DEBUG);
-    $resql = $dbtouse->query($sql);
-    if ($resql)
-    {
-        $obj = $dbtouse->fetch_object($resql);
-        if ($obj)
-        {
-            $label = ((!empty($obj->name) && $obj->name != '-') ? $obj->name : '');
-            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;
-            }
+	dol_syslog("Company.lib::getState", LOG_DEBUG);
+	$resql = $dbtouse->query($sql);
+	if ($resql)
+	{
+		$obj = $dbtouse->fetch_object($resql);
+		if ($obj)
+		{
+			$label = ((!empty($obj->name) && $obj->name != '-') ? $obj->name : '');
+			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;
+			}
 
-            if ($withcode == 1) {
-                if ($withregion == 1) {
-                    return $label = $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-                }
-                else {
-                    return $label = $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-                }
-            }
-            elseif ($withcode == 2) {
-                if ($withregion == 1) {
-                    return $label = $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-                }
-                else {
-                    return $label = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
-                }
-            }
-            elseif ($withcode === 'all') {
-                if ($withregion == 1) {
-                    return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label, 'region_code'=>$obj->region_code, 'region'=>$obj->region_name);
-                }
-                else {
-                    return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label);
-                }
-            }
-            else {
-                if ($withregion == 1) {
-                    return $label = $obj->region_name.' - '.$label;
-                }
-                else {
-                    return $label;
-                }
-            }
-        }
-        else
-        {
-            return $langs->transnoentitiesnoconv("NotDefined");
-        }
-    }
-    else dol_print_error($dbtouse, '');
+			if ($withcode == 1) {
+				if ($withregion == 1) {
+					return $label = $obj->region_name.' - '.$obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+				} else {
+					return $label = $obj->code.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+				}
+			} elseif ($withcode == 2) {
+				if ($withregion == 1) {
+					return $label = $obj->region_name.' - '.($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+				} else {
+					return $label = ($langs->trans($obj->code) != $obj->code ? $langs->trans($obj->code) : ($obj->name != '-' ? $obj->name : ''));
+				}
+			} elseif ($withcode === 'all') {
+				if ($withregion == 1) {
+					return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label, 'region_code'=>$obj->region_code, 'region'=>$obj->region_name);
+				} else {
+					return array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$label);
+				}
+			} else {
+				if ($withregion == 1) {
+					return $label = $obj->region_name.' - '.$label;
+				} else {
+					return $label;
+				}
+			}
+		} else {
+			return $langs->transnoentitiesnoconv("NotDefined");
+		}
+	} else dol_print_error($dbtouse, '');
 }
 
 /**
@@ -579,40 +560,38 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
  */
 function currency_name($code_iso, $withcode = '', $outputlangs = null)
 {
-    global $langs, $db;
+	global $langs, $db;
 
-    if (empty($outputlangs)) $outputlangs = $langs;
+	if (empty($outputlangs)) $outputlangs = $langs;
 
-    $outputlangs->load("dict");
+	$outputlangs->load("dict");
 
-    // If there is a translation, we can send immediatly the label
-    if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso)
-    {
-        return ($withcode ? $code_iso.' - ' : '').$outputlangs->trans("Currency".$code_iso);
-    }
+	// If there is a translation, we can send immediatly the label
+	if ($outputlangs->trans("Currency".$code_iso) != "Currency".$code_iso)
+	{
+		return ($withcode ? $code_iso.' - ' : '').$outputlangs->trans("Currency".$code_iso);
+	}
 
-    // If no translation, we read table to get label by default
-    $sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies";
-    $sql .= " WHERE code_iso='".$code_iso."'";
+	// If no translation, we read table to get label by default
+	$sql = "SELECT label FROM ".MAIN_DB_PREFIX."c_currencies";
+	$sql .= " WHERE code_iso='".$db->escape($code_iso)."'";
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $obj = $db->fetch_object($resql);
-            $label = ($obj->label != '-' ? $obj->label : '');
-            if ($withcode) return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";
-            else return $label;
-        }
-        else
-        {
-            return $code_iso;
-        }
-    }
-    return 'ErrorWhenReadingCurrencyLabel';
+		if ($num)
+		{
+			$obj = $db->fetch_object($resql);
+			$label = ($obj->label != '-' ? $obj->label : '');
+			if ($withcode) return ($label == $code_iso) ? "$code_iso" : "$code_iso - $label";
+			else return $label;
+		} else {
+			return $code_iso;
+		}
+	}
+	return 'ErrorWhenReadingCurrencyLabel';
 }
 
 /**
@@ -623,30 +602,28 @@ function currency_name($code_iso, $withcode = '', $outputlangs = null)
  */
 function getFormeJuridiqueLabel($code)
 {
-    global $db, $langs;
+	global $db, $langs;
 
-    if (!$code) return '';
+	if (!$code) return '';
 
-    $sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."c_forme_juridique";
-    $sql .= " WHERE code='$code'";
+	$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."c_forme_juridique";
+	$sql .= " WHERE code='".$db->escape($code)."'";
 
-    dol_syslog("Company.lib::getFormeJuridiqueLabel", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
+	dol_syslog("Company.lib::getFormeJuridiqueLabel", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $obj = $db->fetch_object($resql);
-            $label = ($obj->libelle != '-' ? $obj->libelle : '');
-            return $label;
-        }
-        else
-        {
-            return $langs->trans("NotDefined");
-        }
-    }
+		if ($num)
+		{
+			$obj = $db->fetch_object($resql);
+			$label = ($obj->libelle != '-' ? $obj->libelle : '');
+			return $label;
+		} else {
+			return $langs->trans("NotDefined");
+		}
+	}
 }
 
 
@@ -719,8 +696,8 @@ function isInEEC($object)
 
 	$country_code_in_EEC = getCountriesInEEC();
 
-    //print "dd".$this->country_code;
-    return in_array($object->country_code, $country_code_in_EEC);
+	//print "dd".$this->country_code;
+	return in_array($object->country_code, $country_code_in_EEC);
 }
 
 
@@ -738,120 +715,116 @@ function isInEEC($object)
  */
 function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatelink = 0, $morehtmlright = '')
 {
-    global $user;
+	global $user;
 
-    $i = -1;
+	$i = -1;
 
-    if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-    {
-        $langs->load("projects");
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
+	{
+		$langs->load("projects");
 
-        $newcardbutton = '';
-        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));
-        }
+		$newcardbutton = '';
+		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));
+		}
 
-        print "\n";
-        print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $newcardbutton.$morehtmlright, '');
-        print '<div class="div-table-responsive">';
-        print "\n".'<table class="noborder" width=100%>';
+		print "\n";
+		print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $newcardbutton.$morehtmlright, '');
+		print '<div class="div-table-responsive">';
+		print "\n".'<table class="noborder" width=100%>';
 
-        $sql  = "SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
-        $sql .= ", cls.code as opp_status_code";
-        $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
-        $sql .= " WHERE p.fk_soc = ".$object->id;
-        $sql .= " AND p.entity IN (".getEntity('project').")";
-        $sql .= " ORDER BY p.dateo DESC";
+		$sql  = "SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
+		$sql .= ", cls.code as opp_status_code";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
+		$sql .= " WHERE p.fk_soc = ".$object->id;
+		$sql .= " AND p.entity IN (".getEntity('project').")";
+		$sql .= " ORDER BY p.dateo DESC";
 
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			$num = $db->num_rows($result);
 
-            print '<tr class="liste_titre">';
-            print '<td>'.$langs->trans("Ref").'</td>';
-            print '<td>'.$langs->trans("Name").'</td>';
-            print '<td class="center">'.$langs->trans("DateStart").'</td>';
-            print '<td class="center">'.$langs->trans("DateEnd").'</td>';
-            print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
-            print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';
-            print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';
-            print '<td class="right">'.$langs->trans("Status").'</td>';
-            print '</tr>';
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("Ref").'</td>';
+			print '<td>'.$langs->trans("Name").'</td>';
+			print '<td class="center">'.$langs->trans("DateStart").'</td>';
+			print '<td class="center">'.$langs->trans("DateEnd").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityAmountShort").'</td>';
+			print '<td class="center">'.$langs->trans("OpportunityStatusShort").'</td>';
+			print '<td class="right">'.$langs->trans("OpportunityProbabilityShort").'</td>';
+			print '<td class="right">'.$langs->trans("Status").'</td>';
+			print '</tr>';
 
-            if ($num > 0)
-            {
-                require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-                $projecttmp = new Project($db);
-
-                $i = 0;
-
-                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)
-                    {
-                        print '<tr class="oddeven">';
-
-                        // Ref
-                        print '<td>';
-                        print $projecttmp->getNomUrl(1);
-                        print '</td>';
-
-                        // Label
-                        print '<td>'.$obj->title.'</td>';
-                        // Date start
-                        print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
-                        // Date end
-                        print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';
-                        // Opp amount
-                        print '<td class="right">';
-                        if ($obj->opp_status_code)
-                        {
-                            print price($obj->opp_amount, 1, '', 1, -1, -1, '');
-                        }
-                        print '</td>';
-                        // Opp status
-                        print '<td class="center">';
-            			if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code);
-            			print '</td>';
-			            // Opp percent
-            			print '<td class="right">';
-            			if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
-            			print '</td>';
-                        // Status
-                        print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';
-
-                        print '</tr>';
-                    }
-                    $i++;
-                }
-            }
-            else
+			if ($num > 0)
 			{
-            	print '<tr class="oddeven"><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-            }
-            $db->free($result);
-        }
-        else
-        {
-            dol_print_error($db);
-        }
-        print "</table>";
-        print '</div>';
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-        print "<br>\n";
-    }
+				$projecttmp = new Project($db);
 
-    return $i;
+				$i = 0;
+
+				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)
+					{
+						print '<tr class="oddeven">';
+
+						// Ref
+						print '<td>';
+						print $projecttmp->getNomUrl(1);
+						print '</td>';
+
+						// Label
+						print '<td>'.$obj->title.'</td>';
+						// Date start
+						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
+						// Date end
+						print '<td class="center">'.dol_print_date($db->jdate($obj->de), "day").'</td>';
+						// Opp amount
+						print '<td class="right">';
+						if ($obj->opp_status_code)
+						{
+							print price($obj->opp_amount, 1, '', 1, -1, -1, '');
+						}
+						print '</td>';
+						// Opp status
+						print '<td class="center">';
+						if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code);
+						print '</td>';
+						// Opp percent
+						print '<td class="right">';
+						if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
+						print '</td>';
+						// Status
+						print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';
+
+						print '</tr>';
+					}
+					$i++;
+				}
+			} else {
+				print '<tr class="oddeven"><td colspan="8" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			}
+			$db->free($result);
+		} else {
+			dol_print_error($db);
+		}
+		print "</table>";
+		print '</div>';
+
+		print "<br>\n";
+	}
+
+	return $i;
 }
 
 
@@ -872,388 +845,386 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 	$formcompany = new FormCompany($db);
-    $form = new Form($db);
+	$form = new Form($db);
 
-    $optioncss = GETPOST('optioncss', 'alpha');
-    $sortfield = GETPOST("sortfield", 'alpha');
-    $sortorder = GETPOST("sortorder", 'alpha');
-    $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+	$optioncss = GETPOST('optioncss', 'alpha');
+	$sortfield = GETPOST("sortfield", 'alpha');
+	$sortorder = GETPOST("sortorder", 'alpha');
+	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
-    $search_status = GETPOST("search_status", 'int');
-    if ($search_status == '') $search_status = 1; // always display active customer first
+	$search_status = GETPOST("search_status", 'int');
+	if ($search_status == '') $search_status = 1; // always display active customer first
 
-    $search_name    = GETPOST("search_name", 'alpha');
-    $search_address = GETPOST("search_address", 'alpha');
-    $search_poste   = GETPOST("search_poste", 'alpha');
+	$search_name    = GETPOST("search_name", 'alpha');
+	$search_address = GETPOST("search_address", 'alpha');
+	$search_poste   = GETPOST("search_poste", 'alpha');
 	$search_roles = GETPOST("search_roles", 'array');
 
-    $socialnetworks = getArrayOfSocialNetworks();
+	$socialnetworks = getArrayOfSocialNetworks();
 
-    $searchAddressPhoneDBFields = array(
-        //Address
-        't.address',
-        't.zip',
-        't.town',
+	$searchAddressPhoneDBFields = array(
+		//Address
+		't.address',
+		't.zip',
+		't.town',
 
-        //Phone
-        't.phone',
-        't.phone_perso',
-        't.phone_mobile',
+		//Phone
+		't.phone',
+		't.phone_perso',
+		't.phone_mobile',
 
-        //Fax
-        't.fax',
+		//Fax
+		't.fax',
 
-        //E-mail
-        't.email',
-    );
-    //Social media
-    foreach ($socialnetworks as $key => $value) {
-        if ($value['active']) {
-            $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";
-        }
-    }
+		//E-mail
+		't.email',
+	);
+	//Social media
+	foreach ($socialnetworks as $key => $value) {
+		if ($value['active']) {
+			$searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";
+		}
+	}
 
-    if (!$sortorder) $sortorder = "ASC";
-    if (!$sortfield) $sortfield = "t.lastname";
+	if (!$sortorder) $sortorder = "ASC";
+	if (!$sortfield) $sortfield = "t.lastname";
 
-    if (!empty($conf->clicktodial->enabled))
-    {
-    	$user->fetch_clicktodial(); // lecture des infos de clicktodial du user
-    }
+	if (!empty($conf->clicktodial->enabled))
+	{
+		$user->fetch_clicktodial(); // lecture des infos de clicktodial du user
+	}
 
 
-    $contactstatic = new Contact($db);
+	$contactstatic = new Contact($db);
 
-    $extrafields->fetch_name_optionals_label($contactstatic->table_element);
+	$extrafields->fetch_name_optionals_label($contactstatic->table_element);
 
-    $contactstatic->fields = array(
-        'name'      =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
-        'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20),
-        'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30),
-        'role'      =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40),
-        'statut'    =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))),
-    );
+	$contactstatic->fields = array(
+		'name'      =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
+		'poste'     =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20),
+		'address'   =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30),
+		'role'      =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40),
+		'statut'    =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))),
+	);
 
-    // Definition of fields for list
-    $arrayfields = array(
-	    't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'position'=>1),
-	    't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),
-	    't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),
-	    't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
-	    'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40),
-	    '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 (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {
+	// Definition of fields for list
+	$arrayfields = array(
+		't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID ? 1 : 0), 'position'=>1),
+		't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),
+		't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),
+		't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
+		'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40),
+		'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 (!empty($extrafields->attributes[$contactstatic->table_element]['list'][$key])) {
 				$arrayfields["ef.".$key] = array(
 					'label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key],
 					'checked'=>(($extrafields->attributes[$contactstatic->table_element]['list'][$key] < 0) ? 0 : 1),
 					'position'=>1000 + $extrafields->attributes[$contactstatic->table_element]['pos'][$key],
 					'enabled'=>(abs($extrafields->attributes[$contactstatic->table_element]['list'][$key]) != 3 && $extrafields->attributes[$contactstatic->table_element]['perms'][$key]));
 			}
-    	}
-    }
+		}
+	}
 
-    // Initialize array of search criterias
-    $search = array();
-    foreach ($arrayfields as $key => $val)
-    {
-        $queryName = 'search_'.substr($key, 2);
-    	if (GETPOST($queryName, 'alpha')) {
-            $search[substr($key, 2)] = GETPOST($queryName, 'alpha');
-        }
-    }
-    $search_array_options = $extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_');
+	// Initialize array of search criterias
+	$search = array();
+	foreach ($arrayfields as $key => $val)
+	{
+		$queryName = 'search_'.substr($key, 2);
+		if (GETPOST($queryName, 'alpha')) {
+			$search[substr($key, 2)] = GETPOST($queryName, 'alpha');
+		}
+	}
+	$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
-    {
-    	$search_status = '';
-    	$search_name         = '';
-    	$search_roles        = array();
-        $search_address = '';
-        $search_poste = '';
-        $search = array();
-    	$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_status = '';
+		$search_name         = '';
+		$search_roles        = array();
+		$search_address = '';
+		$search_poste = '';
+		$search = array();
+		$search_array_options = array();
 
-    	foreach ($contactstatic->fields as $key => $val)
+		foreach ($contactstatic->fields as $key => $val)
    		{
    			$search[$key] = '';
    		}
-    }
+	}
 
-    $contactstatic->fields = dol_sort_array($contactstatic->fields, 'position');
-    $arrayfields = dol_sort_array($arrayfields, 'position');
+	$contactstatic->fields = dol_sort_array($contactstatic->fields, 'position');
+	$arrayfields = dol_sort_array($arrayfields, 'position');
 
-    $newcardbutton = '';
-    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));
-    }
+	$newcardbutton = '';
+	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));
+	}
 
-    print "\n";
+	print "\n";
 
-    $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));
-    print load_fiche_titre($title, $newcardbutton, '');
+	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ContactsForCompany") : $langs->trans("ContactsAddressesForCompany"));
+	print load_fiche_titre($title, $newcardbutton, '');
 
-    print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="socid" value="'.$object->id.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="socid" value="'.$object->id.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 
-    $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">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-    print "\n".'<table class="tagtable liste">'."\n";
+	print "\n".'<table class="tagtable liste">'."\n";
 
-    $param = "socid=".urlencode($object->id);
-    if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
-    if (count($search_roles) > 0) $param .= implode('&search_roles[]=', $search_roles);
-    if ($search_name != '')   $param .= '&search_name='.urlencode($search_name);
-    if ($search_poste != '')     $param .= '&search_poste='.urlencode($search_poste);
-    if ($search_address != '')     $param .= '&search_address='.urlencode($search_address);
-    if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+	$param = "socid=".urlencode($object->id);
+	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
+	if (count($search_roles) > 0) $param .= implode('&search_roles[]=', $search_roles);
+	if ($search_name != '')   $param .= '&search_name='.urlencode($search_name);
+	if ($search_poste != '')     $param .= '&search_poste='.urlencode($search_poste);
+	if ($search_address != '')     $param .= '&search_address='.urlencode($search_address);
+	if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 
-    // Add $param from extra fields
-    $extrafieldsobjectkey = $contactstatic->table_element;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+	// Add $param from extra fields
+	$extrafieldsobjectkey = $contactstatic->table_element;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-    $sql = "SELECT t.rowid, t.lastname, t.firstname, t.fk_pays as country_id, t.civility, t.poste, t.phone as phone_pro, t.phone_mobile, t.phone_perso, t.fax, t.email, t.socialnetworks, t.statut, t.photo,";
-    $sql .= " t.civility as civility_id, t.address, t.zip, t.town";
-    $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";
-    $sql .= " WHERE t.fk_soc = ".$object->id;
-    if ($search_status != '' && $search_status != '-1') $sql .= " AND t.statut = ".$db->escape($search_status);
-    if ($search_name)    $sql .= natural_search(array('t.lastname', 't.firstname'), $search_name);
-    if ($search_poste)   $sql .= natural_search('t.poste', $search_poste);
-    if ($search_address) {
+	$sql = "SELECT t.rowid, t.lastname, t.firstname, t.fk_pays as country_id, t.civility, t.poste, t.phone as phone_pro, t.phone_mobile, t.phone_perso, t.fax, t.email, t.socialnetworks, t.statut, t.photo,";
+	$sql .= " t.civility as civility_id, t.address, t.zip, t.town";
+	$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";
+	$sql .= " WHERE t.fk_soc = ".$object->id;
+	if ($search_status != '' && $search_status != '-1') $sql .= " AND t.statut = ".$db->escape($search_status);
+	if ($search_name)    $sql .= natural_search(array('t.lastname', 't.firstname'), $search_name);
+	if ($search_poste)   $sql .= natural_search('t.poste', $search_poste);
+	if ($search_address) {
 		$sql .= natural_search($searchAddressPhoneDBFields, $search_address);
 	}
 	if (count($search_roles) > 0) {
 		$sql .= " AND t.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".implode(',', $search_roles)."))";
 	}
-    // Add where from extra fields
-    $extrafieldsobjectkey = $contactstatic->table_element;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-    if ($sortfield == "t.name") $sql .= " ORDER BY t.lastname $sortorder, t.firstname $sortorder";
-    else $sql .= " ORDER BY $sortfield $sortorder";
+	// Add where from extra fields
+	$extrafieldsobjectkey = $contactstatic->table_element;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+	if ($sortfield == "t.name") $sql .= " ORDER BY t.lastname $sortorder, t.firstname $sortorder";
+	else $sql .= " ORDER BY $sortfield $sortorder";
 
-    dol_syslog('core/lib/company.lib.php :: show_contacts', LOG_DEBUG);
-    $result = $db->query($sql);
-    if (!$result) dol_print_error($db);
+	dol_syslog('core/lib/company.lib.php :: show_contacts', LOG_DEBUG);
+	$result = $db->query($sql);
+	if (!$result) dol_print_error($db);
 
-    $num = $db->num_rows($result);
+	$num = $db->num_rows($result);
 
-    // Fields title search
-    // --------------------------------------------------------------------
-    print '<tr class="liste_titre">';
-    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']))
-    	{
-    		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);
-            } elseif (in_array($key, array('role'))) {
-			    print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles);
-		    } else {
-                print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
-            }
-    		print '</td>';
-    	}
-    }
-    // Extra fields
-    $extrafieldsobjectkey = $contactstatic->table_element;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+	// Fields title search
+	// --------------------------------------------------------------------
+	print '<tr class="liste_titre">';
+	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']))
+		{
+			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);
+			} elseif (in_array($key, array('role'))) {
+				print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles);
+			} else {
+				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			}
+			print '</td>';
+		}
+	}
+	// Extra fields
+	$extrafieldsobjectkey = $contactstatic->table_element;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
-    // Fields from hook
-    $parameters = array('arrayfields'=>$arrayfields);
-    $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $contactstatic); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    // Action column
-    print '<td class="liste_titre" align="right">';
-    print $form->showFilterButtons();
-    print '</td>';
-    print '</tr>'."\n";
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $contactstatic); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="liste_titre" align="right">';
+	print $form->showFilterButtons();
+	print '</td>';
+	print '</tr>'."\n";
 
 
-    // Fields title label
-    // --------------------------------------------------------------------
-    print '<tr class="liste_titre">';
-    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'])) print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
-    	if ($key == 'role') $align .= ($align ? ' ' : '').'left';
-    	if (!empty($arrayfields['sc.'.$key]['checked'])) {
-    		print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
-	    }
-    }
-    // Extra fields
-    $extrafieldsobjectkey = $contactstatic->table_element;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-    // Hook fields
+	// Fields title label
+	// --------------------------------------------------------------------
+	print '<tr class="liste_titre">';
+	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'])) print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
+		if ($key == 'role') $align .= ($align ? ' ' : '').'left';
+		if (!empty($arrayfields['sc.'.$key]['checked'])) {
+			print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
+		}
+	}
+	// Extra fields
+	$extrafieldsobjectkey = $contactstatic->table_element;
+	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, $object); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
-    print '</tr>'."\n";
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+	print '</tr>'."\n";
 
-    $i = -1;
+	$i = -1;
 
 	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x')))
-    {
-    	$i = 0;
+	{
+		$i = 0;
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($result);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($result);
 
-            $contactstatic->id = $obj->rowid;
-            $contactstatic->ref = $obj->ref;
-            $contactstatic->statut = $obj->statut;
-            $contactstatic->lastname = $obj->lastname;
-            $contactstatic->firstname = $obj->firstname;
-            $contactstatic->civility_id = $obj->civility_id;
-            $contactstatic->civility_code = $obj->civility_id;
-            $contactstatic->poste = $obj->poste;
-            $contactstatic->address = $obj->address;
-            $contactstatic->zip = $obj->zip;
-            $contactstatic->town = $obj->town;
-            $contactstatic->phone_pro = $obj->phone_pro;
-            $contactstatic->phone_mobile = $obj->phone_mobile;
-            $contactstatic->phone_perso = $obj->phone_perso;
-            $contactstatic->email = $obj->email;
-            $contactstatic->web = $obj->web;
-            $contactstatic->socialnetworks = $obj->socialnetworks;
-            $contactstatic->photo = $obj->photo;
+			$contactstatic->id = $obj->rowid;
+			$contactstatic->ref = $obj->ref;
+			$contactstatic->statut = $obj->statut;
+			$contactstatic->lastname = $obj->lastname;
+			$contactstatic->firstname = $obj->firstname;
+			$contactstatic->civility_id = $obj->civility_id;
+			$contactstatic->civility_code = $obj->civility_id;
+			$contactstatic->poste = $obj->poste;
+			$contactstatic->address = $obj->address;
+			$contactstatic->zip = $obj->zip;
+			$contactstatic->town = $obj->town;
+			$contactstatic->phone_pro = $obj->phone_pro;
+			$contactstatic->phone_mobile = $obj->phone_mobile;
+			$contactstatic->phone_perso = $obj->phone_perso;
+			$contactstatic->email = $obj->email;
+			$contactstatic->web = $obj->web;
+			$contactstatic->socialnetworks = $obj->socialnetworks;
+			$contactstatic->photo = $obj->photo;
 
-            $country_code = getCountry($obj->country_id, 2);
-            $contactstatic->country_code = $country_code;
+			$country_code = getCountry($obj->country_id, 2);
+			$contactstatic->country_code = $country_code;
 
-            $contactstatic->setGenderFromCivility();
-            $contactstatic->fetch_optionals();
+			$contactstatic->setGenderFromCivility();
+			$contactstatic->fetch_optionals();
 
-	        $resultRole = $contactstatic->fetchRoles();
-	        if ($resultRole < 0) {
-	        	setEventMessages(null, $contactstatic->errors, 'errors');
-	        }
+			$resultRole = $contactstatic->fetchRoles();
+			if ($resultRole < 0) {
+				setEventMessages(null, $contactstatic->errors, 'errors');
+			}
 
-            if (is_array($contactstatic->array_options))
-            {
-	            foreach ($contactstatic->array_options as $key => $val)
-	            {
-	            	$obj->$key = $val;
-	            }
-            }
+			if (is_array($contactstatic->array_options))
+			{
+				foreach ($contactstatic->array_options as $key => $val)
+				{
+					$obj->$key = $val;
+				}
+			}
 
-            print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-            // ID
-            if (!empty($arrayfields['t.rowid']['checked']))
-            {
-            	print '<td>';
-            	print $contactstatic->id;
-            	print '</td>';
-            }
+			// ID
+			if (!empty($arrayfields['t.rowid']['checked']))
+			{
+				print '<td>';
+				print $contactstatic->id;
+				print '</td>';
+			}
 
 			// Photo - Name
-            if (!empty($arrayfields['t.name']['checked']))
-            {
-            	print '<td>';
-            	print $form->showphoto('contact', $contactstatic, 0, 0, 0, 'photorefnoborder valignmiddle marginrightonly', 'small', 1, 0, 1);
+			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));
 				print '</td>';
-            }
+			}
 
 			// Job position
-            if (!empty($arrayfields['t.poste']['checked']))
-            {
-            	print '<td>';
-            	if ($obj->poste) print $obj->poste;
-            	print '</td>';
-            }
+			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']))
-            {
-            	print '<td>';
-	            print $contactstatic->getBannerAddress('contact', $object);
-    	        print '</td>';
-            }
+			// Address - Phone - Email
+			if (!empty($arrayfields['t.address']['checked']))
+			{
+				print '<td>';
+				print $contactstatic->getBannerAddress('contact', $object);
+				print '</td>';
+			}
 
-            // Role
-            if (!empty($arrayfields['sc.role']['checked']))
-            {
-            	print '<td>';
-	            print $formcompany->showRoles("roles", $contactstatic, 'view');
-    	        print '</td>';
-            }
+			// Role
+			if (!empty($arrayfields['sc.role']['checked']))
+			{
+				print '<td>';
+				print $formcompany->showRoles("roles", $contactstatic, 'view');
+				print '</td>';
+			}
 
-            // Status
-            if (!empty($arrayfields['t.statut']['checked']))
-            {
-            	print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
-            }
+			// Status
+			if (!empty($arrayfields['t.statut']['checked']))
+			{
+				print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
+			}
 
-            // Extra fields
-            $extrafieldsobjectkey = $contactstatic->table_element;
-            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Extra fields
+			$extrafieldsobjectkey = $contactstatic->table_element;
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-            // Actions
+			// Actions
 			print '<td align="right">';
 
 			// Add to agenda
-            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; ';
-            }
+			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)
-            {
-                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>';
-            }
+			// Edit
+			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>';
+			}
 
-            print '</td>';
+			print '</td>';
 
-            print "</tr>\n";
-            $i++;
-        }
-    }
-    else
-	{
+			print "</tr>\n";
+			$i++;
+		}
+	} else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    }
-    print "\n</table>\n";
+	}
+	print "\n</table>\n";
 	print '</div>';
 
-    print '</form>'."\n";
+	print '</form>'."\n";
 
-    return $i;
+	return $i;
 }
 
 
@@ -1271,12 +1242,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
  */
 function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '')
 {
-    global $user, $conf;
+	global $user, $conf;
 
-    $out = show_actions_done($conf, $langs, $db, $filterobj, $objcon, 1, $actioncode, 'todo');
+	$out = show_actions_done($conf, $langs, $db, $filterobj, $objcon, 1, $actioncode, 'todo');
 
-    if ($noprint) return $out;
-    else print $out;
+	if ($noprint) return $out;
+	else print $out;
 }
 
 /**
@@ -1299,340 +1270,333 @@ function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = '', $noprin
  */
 function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC', $module = '')
 {
-    global $user, $conf;
-    global $form;
+	global $user, $conf;
+	global $form;
 
-    global $param, $massactionbutton;
+	global $param, $massactionbutton;
+	$start_year = GETPOST('dateevent_startyear');
+	$start_month = GETPOST('dateevent_startmonth');
+	$start_day = GETPOST('dateevent_startday');
+	$end_year = GETPOST('dateevent_endyear');
+	$end_month = GETPOST('dateevent_endmonth');
+	$end_day = GETPOST('dateevent_endday');
+	if (!empty($start_year) && !empty($start_month) && !empty($start_day)) {
+		$search_start = $start_year.'-'.$start_month.'-'.$start_day;
+		$tms_start = strtotime($search_start);
+	}
+	if (!empty($end_year) && !empty($end_month) && !empty($end_day)) {
+		$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
+	{
+		$search_start = '';
+		$tms_start = '';
+		$search_end = '';
+		$tms_end = '';
+	}
+	dol_include_once('/comm/action/class/actioncomm.class.php');
 
-    dol_include_once('/comm/action/class/actioncomm.class.php');
+	// Check parameters
+	if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter');
 
-    // Check parameters
-    if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter');
+	$out = '';
+	$histo = array();
+	$numaction = 0;
+	$now = dol_now('tzuser');
 
-    $out = '';
-    $histo = array();
-    $numaction = 0;
-    $now = dol_now('tzuser');
+	// Open DSI -- Fix order by -- Begin
+	$sortfield_list = explode(',', $sortfield);
+	$sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent');
+	$sortfield_new_list = array();
+	foreach ($sortfield_list as $sortfield_value) {
+		$sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)];
+	}
+	$sortfield_new = implode(',', $sortfield_new_list);
 
-    // Open DSI -- Fix order by -- Begin
-    $sortfield_list = explode(',', $sortfield);
-    $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent');
-    $sortfield_new_list = array();
-    foreach ($sortfield_list as $sortfield_value) {
-        $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)];
-    }
-    $sortfield_new = implode(',', $sortfield_new_list);
+	$sql = '';
 
-    $sql = '';
+	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,";
+		} else {
+			$sql = "SELECT a.id, a.label as label,";
+		}
+		$sql .= " a.datep as dp,";
+		$sql .= " a.datep2 as dp2,";
+		$sql .= " a.percent as percent, 'action' as type,";
+		$sql .= " a.fk_element, a.elementtype,";
+		$sql .= " a.fk_contact,";
+		$sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";
+		$sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
+		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))      $sql .= ", sp.lastname, sp.firstname";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')      $sql .= ", o.ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')  $sql .= ", o.ref";
+		elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", o.ref";
 
-    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,";
-        }
-        else
-        {
-            $sql = "SELECT a.id, a.label as label,";
-        }
-        $sql .= " a.datep as dp,";
-        $sql .= " a.datep2 as dp2,";
-        $sql .= " a.percent as percent, 'action' as type,";
-        $sql .= " a.fk_element, a.elementtype,";
-        $sql .= " a.fk_contact,";
-        $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";
-        $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
-        if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))      $sql .= ", sp.lastname, sp.firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')      $sql .= ", o.ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')  $sql .= ", o.ref";
-        elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", o.ref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
+		$force_filter_contact = false;
+		if (is_object($objcon) && $objcon->id > 0) {
+			$force_filter_contact = true;
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";
+			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
+		}
 
-        $force_filter_contact = false;
-        if (is_object($objcon) && $objcon->id > 0) {
-            $force_filter_contact = true;
-            $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";
-            $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
-        }
+		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
+			$sql .= " ON er.resource_type = 'dolresource'";
+			$sql .= " AND er.element_id = a.id";
+			$sql .= " AND er.resource_id = ".$filterobj->id;
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ } elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o";
+		elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";
 
-        if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
-            $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
-            $sql .= " ON er.resource_type = 'dolresource'";
-            $sql .= " AND er.element_id = a.id";
-            $sql .= " AND er.resource_id = ".$filterobj->id;
-        }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Project') { /* Nothing */ }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o";
-        elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";
+		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
+		if ($force_filter_contact === false) {
+			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')
+			{
+				$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')
+			{
+				$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')
+			{
+				$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')
+			{
+				$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')
+			{
+				$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')
+			{
+				$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)
+			{
+				// 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;
+			}
+		}
 
-        $sql .= " WHERE a.entity IN (".getEntity('agenda').")";
-        if ($force_filter_contact === false) {
-            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')
-            {
-                $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')
-            {
-                $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')
-            {
-                $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')
-            {
-                $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')
-            {
-            	$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')
-            {
-            	$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)
-            {
-            	// 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;
-            }
-        }
+		if (!empty($search_start) && !empty($search_end)) {
+			$sql .= " AND ((a.datep BETWEEN '$search_start' AND '$search_end') OR (a.datep2 BETWEEN '$search_start' AND '$search_end'))";
+		}
+		elseif (empty($search_start) && !empty($search_end)) {
+			$sql .= " AND ((a.datep <= '$search_end') OR (a.datep2 <= '$search_end'))";
+		}
+		elseif (!empty($search_start) && empty($search_end)) {
+			$sql .= " AND ((a.datep >= '$search_start') OR (a.datep2 >= '$search_start'))";
+		}
 
-        // 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'";
-                    elseif ($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 $sql .= " AND c.code = '".$db->escape($actioncode)."'";
-            }
-        }
-        if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
-        elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
-        if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']);
-    }
+		if (is_array($actioncode) && !empty($actioncode)) {
+			$sql .= ' AND (';
+			foreach ($actioncode as $key => $code) {
+				if ($key != 0) $sql .= "OR (";
+				if (!empty($code)) addEventTypeSQL($sql, $code, $donetodo, $now, $filters, "");
+				if ($key != 0) $sql .= ")";
+			}
+			$sql .= ')';
+		}
+		elseif (!empty($actioncode)) addEventTypeSQL($sql, $actioncode, $donetodo, $now, $filters);
 
-    // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.
-    if (!empty($conf->mailing->enabled) && !empty($objcon->email)
-        && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING'))
-    {
-        $langs->load("mails");
+		if (is_array($actioncode)) {
+			foreach ($actioncode as $code) {
+				$sql2 = addMailingEventTypeSQL($code, $objcon, $filterobj);
+				if (!empty($sql2)) {
+					if (!empty($sql)) $sql = $sql." UNION ".$sql2;
+					elseif (empty($sql)) $sql = $sql2;
+					break;
+				}
+			}
+		}
+		else {
+			$sql2 = addMailingEventTypeSQL($actioncode, $objcon, $filterobj);
+			if (!empty($sql) && !empty($sql2)) {
+				$sql = $sql." UNION ".$sql2;
+			}
+			elseif (empty($sql) && !empty($sql2)) {
+				$sql = $sql2;
+			}
+		}
+	}
 
-        $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type";
-        $sql2 .= ", null as fk_element, '' as elementtype, null as contact_id";
-        $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";
-        $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action
-        if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql2 .= ", '' as lastname, '' as firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql2 .= ", '' as ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql2 .= ", '' as ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql2 .= ", '' as ref";
-        $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";
-        $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.
-        $sql2 .= " AND mc.statut = 1";
-        $sql2 .= " AND u.rowid = m.fk_user_valid";
-        $sql2 .= " AND mc.fk_mailing = m.rowid";
-    }
+	//TODO Add limit in nb of results
+	if ($sql)
+	{
+		$sql .= $db->order($sortfield_new, $sortorder);
+		dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $db->num_rows($resql);
 
-    if (!empty($sql) && !empty($sql2)) {
-        $sql = $sql." UNION ".$sql2;
-    } elseif (empty($sql) && !empty($sql2)) {
-        $sql = $sql2;
-    }
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
-    //TODO Add limit in nb of results
-    if ($sql)
-    {
-    	$sql .= $db->order($sortfield_new, $sortorder);
-	    dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
-	    $resql = $db->query($sql);
-	    if ($resql)
-	    {
-	        $i = 0;
-	        $num = $db->num_rows($resql);
+				if ($obj->type == 'action') {
+					$contactaction = new ActionComm($db);
+					$contactaction->id = $obj->id;
+					$result = $contactaction->fetchResources();
+					if ($result < 0) {
+						dol_print_error($db);
+						setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');
+					}
 
-	        while ($i < $num)
-	        {
-	            $obj = $db->fetch_object($resql);
+					//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
+					//elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
+					$tododone = '';
+					if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';
 
-	            if ($obj->type == 'action') {
-	                $contactaction = new ActionComm($db);
-	                $contactaction->id = $obj->id;
-	                $result = $contactaction->fetchResources();
-	                if ($result < 0) {
-	                    dol_print_error($db);
-	                    setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');
-	                }
+					$histo[$numaction] = array(
+						'type'=>$obj->type,
+						'tododone'=>$tododone,
+						'id'=>$obj->id,
+						'datestart'=>$db->jdate($obj->dp),
+						'dateend'=>$db->jdate($obj->dp2),
+						'note'=>$obj->label,
+						'percent'=>$obj->percent,
 
-	                //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
-	                //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
-	                $tododone = '';
-	                if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';
+						'userid'=>$obj->user_id,
+						'login'=>$obj->user_login,
+						'userfirstname'=>$obj->user_firstname,
+						'userlastname'=>$obj->user_lastname,
+						'userphoto'=>$obj->user_photo,
 
-	                $histo[$numaction] = array(
-	                    'type'=>$obj->type,
-	                    'tododone'=>$tododone,
-	                    'id'=>$obj->id,
-	                    'datestart'=>$db->jdate($obj->dp),
-	                    'dateend'=>$db->jdate($obj->dp2),
-	                    'note'=>$obj->label,
-	                    'percent'=>$obj->percent,
+						'contact_id'=>$obj->fk_contact,
+						'socpeopleassigned' => $contactaction->socpeopleassigned,
+						'lastname'=>$obj->lastname,
+						'firstname'=>$obj->firstname,
+						'fk_element'=>$obj->fk_element,
+						'elementtype'=>$obj->elementtype,
+						// Type of event
+						'acode'=>$obj->acode,
+						'alabel'=>$obj->alabel,
+						'libelle'=>$obj->alabel, // deprecated
+						'apicto'=>$obj->apicto
+					);
+				} else {
+					$histo[$numaction] = array(
+						'type'=>$obj->type,
+						'tododone'=>'done',
+						'id'=>$obj->id,
+						'datestart'=>$db->jdate($obj->dp),
+						'dateend'=>$db->jdate($obj->dp2),
+						'note'=>$obj->label,
+						'percent'=>$obj->percent,
+						'acode'=>$obj->acode,
 
-	                    'userid'=>$obj->user_id,
-	                    'login'=>$obj->user_login,
-	                    'userfirstname'=>$obj->user_firstname,
-	                    'userlastname'=>$obj->user_lastname,
-	                    'userphoto'=>$obj->user_photo,
+						'userid'=>$obj->user_id,
+						'login'=>$obj->user_login,
+						'userfirstname'=>$obj->user_firstname,
+						'userlastname'=>$obj->user_lastname,
+						'userphoto'=>$obj->user_photo
+					);
+				}
 
-	                    'contact_id'=>$obj->fk_contact,
-	                    'socpeopleassigned' => $contactaction->socpeopleassigned,
-	                    'lastname'=>$obj->lastname,
-	                    'firstname'=>$obj->firstname,
-	                    'fk_element'=>$obj->fk_element,
-	                    'elementtype'=>$obj->elementtype,
-	                    // Type of event
-	                    'acode'=>$obj->acode,
-	                    'alabel'=>$obj->alabel,
-	                    'libelle'=>$obj->alabel, // deprecated
-	                    'apicto'=>$obj->apicto
-	                );
-	            } else {
-	                $histo[$numaction] = array(
-	                    'type'=>$obj->type,
-	                    'tododone'=>'done',
-	                    'id'=>$obj->id,
-	                    'datestart'=>$db->jdate($obj->dp),
-	                    'dateend'=>$db->jdate($obj->dp2),
-	                    'note'=>$obj->label,
-	                    'percent'=>$obj->percent,
-	                    'acode'=>$obj->acode,
+				$numaction++;
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+	}
 
-	                    'userid'=>$obj->user_id,
-	                    'login'=>$obj->user_login,
-	                    'userfirstname'=>$obj->user_firstname,
-	                    'userlastname'=>$obj->user_lastname,
-	                    'userphoto'=>$obj->user_photo
-	                );
-	            }
+	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))
+	{
+		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
-	            $numaction++;
-	            $i++;
-	        }
-	    }
-	    else
-	    {
-	        dol_print_error($db);
-	    }
-    }
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-    if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))
-    {
-        $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
+		$formactions = new FormActions($db);
 
-        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	    require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+		$actionstatic = new ActionComm($db);
+		$userstatic = new User($db);
+		$contactstatic = new Contact($db);
 
-        $formactions = new FormActions($db);
+		$out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		if ($objcon && get_class($objcon) == 'Contact' &&
+			(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.'" />';
+		}
+		if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
 
-        $actionstatic = new ActionComm($db);
-        $userstatic = new User($db);
-        $contactstatic = new Contact($db);
+		$out .= "\n";
 
-        $out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        if ($objcon && get_class($objcon) == 'Contact' &&
-            (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.'" />';
-        }
-        if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
+		$out .= '<div class="div-table-responsive-no-min">';
+		$out .= '<table class="noborder centpercent">';
 
-        $out .= "\n";
-
-        $out .= '<div class="div-table-responsive-no-min">';
-        $out .= '<table class="noborder centpercent">';
-
-        $out .= '<tr class="liste_titre">';
-        if ($donetodo)
-        {
-            $out .= '<td class="liste_titre"></td>';
-        }
-        $out .= '<td class="liste_titre"></td>';
-        $out .= '<td class="liste_titre"></td>';
-        $out .= '<td class="liste_titre">';
-        $out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, 0, 1);
-        $out .= '</td>';
-        $out .= '<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'"></td>';
-        $out .= '<td class="liste_titre"></td>';
-        $out .= '<td class="liste_titre"></td>';
-        $out .= '<td class="liste_titre"></td>';
-        $out .= '<td class="liste_titre"></td>';
-        // Action column
-        $out .= '<td class="liste_titre" align="middle">';
-        $searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
-        $out .= $searchpicto;
-        $out .= '</td>';
-        $out .= '</tr>';
-
-        $out .= '<tr class="liste_titre">';
+		$out .= '<tr class="liste_titre">';
 		if ($donetodo)
 		{
-            $tmp = '';
-            if (get_class($filterobj) == 'Societe') $tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?socid='.$filterobj->id.'&amp;status=done">';
-            $tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
-            $tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
-            $tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
-            //$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
-            if (get_class($filterobj) == 'Societe') $tmp .= '</a>';
-            $out .= getTitleFieldOfList($tmp);
+			$out .= '<td class="liste_titre"></td>';
+		}
+		$out .= '<td class="liste_titre"></td>';
+		$out .= '<td class="liste_titre"></td>';
+		$out .= '<td class="liste_titre">';
+		$out .= $formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1, 0, (empty($conf->global->AGENDA_USE_MULTISELECT_TYPE) ? 0 : 1), 1);
+		$out .= '</td>';
+		$out .= '<td class="liste_titre maxwidth100onsmartphone"><input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'"></td>';
+		$out .= '<td class="liste_titre center">'.$form->selectDateToDate($tms_start, $tms_end, 'dateevent', 1).'</td>';
+		$out .= '<td class="liste_titre"></td>';
+		$out .= '<td class="liste_titre"></td>';
+		$out .= '<td class="liste_titre"></td>';
+		// Action column
+		$out .= '<td class="liste_titre" align="middle">';
+		$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+		$out .= $searchpicto;
+		$out .= '</td>';
+		$out .= '</tr>';
+
+		$out .= '<tr class="liste_titre">';
+		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") : '');
+			$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
+			$tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
+			//$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
+			if (get_class($filterobj) == 'Societe') $tmp .= '</a>';
+			$out .= getTitleFieldOfList($tmp);
 		}
 		$out .= getTitleFieldOfList($langs->trans("Ref"), 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);
 		$out .= getTitleFieldOfList($langs->trans("Owner"));
-        $out .= getTitleFieldOfList($langs->trans("Type"));
+		$out .= getTitleFieldOfList($langs->trans("Type"));
 		$out .= getTitleFieldOfList($langs->trans("Label"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-        $out .= getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, 'align="center"', $sortfield, $sortorder);
-        $out .= getTitleFieldOfList($langs->trans("RelatedObjects"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+		$out .= getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, 'align="center"', $sortfield, $sortorder);
+		$out .= getTitleFieldOfList($langs->trans("RelatedObjects"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 		$out .= getTitleFieldOfList($langs->trans("ActionOnContact"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 		$out .= getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, 'align="center"', $sortfield, $sortorder);
 		$out .= getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');
@@ -1642,123 +1606,133 @@ 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'];
 			$actionstatic->type_code = $histo[$key]['acode'];
 
-            $out .= '<tr class="oddeven">';
+			$out .= '<tr class="oddeven">';
 
-            // Done or todo
-            if ($donetodo)
-            {
-                $out .= '<td class="nowrap">';
-                $out .= '</td>';
-            }
+			// Done or todo
+			if ($donetodo)
+			{
+				$out .= '<td class="nowrap">';
+				$out .= '</td>';
+			}
 
-            // Ref
-            $out .= '<td class="nowraponall">';
-            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").' ';
-                $out .= $histo[$key]['id'];
-                $out .= '</a>';
-            } else {
-                $out .= $actionstatic->getNomUrl(1, -1);
-            }
-            $out .= '</td>';
+			// Ref
+			$out .= '<td class="nowraponall">';
+			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").' ';
+				$out .= $histo[$key]['id'];
+				$out .= '</a>';
+			} else {
+				$out .= $actionstatic->getNomUrl(1, -1);
+			}
+			$out .= '</td>';
 
-            // Author of event
-            $out .= '<td class="tdoverflowmax200">';
-            //$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', '');
-            }
-            $out .= '</td>';
+			// Author of event
+			$out .= '<td class="tdoverflowmax200">';
+			//$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', '');
+			}
+			$out .= '</td>';
 
-            // Type
-            $out .= '<td>';
-            if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-            {
-            	if ($actionstatic->type_picto) print img_picto('', $actionstatic->type_picto);
-            	else {
-            		if ($actionstatic->type_code == 'AC_RDV')       $out .= img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-            		elseif ($actionstatic->type_code == 'AC_TEL')   $out .= img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-            		elseif ($actionstatic->type_code == 'AC_FAX')   $out .= img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-            		elseif ($actionstatic->type_code == 'AC_EMAIL') $out .= img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-            		elseif ($actionstatic->type_code == 'AC_INT')   $out .= img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-            		elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $out .= img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
-            	}
-            }
-            $labeltype = $actionstatic->type_code;
-            if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) $labeltype = 'AC_OTH';
-            if (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
-            $out .= dol_trunc($labeltype, 28);
-            $out .= '</td>';
+			// Type
+			$out .= '<td>';
+			// TODO Code common with code into showactions
+			$imgpicto = '';
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
+			{
+				if ($actionstatic->type_picto) {
+					$imgpicto .= img_picto('', $actionstatic->type_picto);
+				}
+				else {
+					if ($actionstatic->type_code == 'AC_RDV')       $imgpicto .= img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actionstatic->type_code == 'AC_TEL')   $imgpicto .= img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actionstatic->type_code == 'AC_FAX')   $imgpicto .= img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actionstatic->type_code == 'AC_EMAIL' || $actionstatic->type_code == 'AC_EMAIL_IN') $imgpicto .= img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actionstatic->type_code == 'AC_INT')   $imgpicto .= img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+					elseif ($actionstatic->type_code == 'AC_OTH' && $actionstatic->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
+					elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $imgpicto .= img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+				}
+			}
+			$out .= $imgpicto;
+			$labeltype = $actionstatic->type_code;
+			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) $labeltype = 'AC_OTH';
+			if ($actionstatic->type_code == 'AC_OTH' && $actionstatic->code == 'TICKET_MSG') {
+				$labeltype = $langs->trans("Message");
+			} else {
+				if (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
+				if ($actionstatic->type_code == 'AC_OTH_AUTO' && ($actionstatic->type_code != $actionstatic->code) && $labeltype && !empty($arraylist[$actionstatic->code])) $labeltype .= ' - '.$arraylist[$actionstatic->code]; // Use code in priority on type_code
+			}
+			$out .= dol_trunc($labeltype, 28);
+			$out .= '</td>';
 
-            // Title
-            $out .= '<td>';
-            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;
-                $libelle = $histo[$key]['note'];
-                $actionstatic->id = $histo[$key]['id'];
-                $out .= dol_trunc($libelle, 120);
-            }
-            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');
-                $out .= dol_trunc($libelle, 120);
-            }
-            $out .= '</td>';
+			// Title
+			$out .= '<td>';
+			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;
+				$libelle = $histo[$key]['note'];
+				$actionstatic->id = $histo[$key]['id'];
+				$out .= dol_trunc($libelle, 120);
+			}
+			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');
+				$out .= dol_trunc($libelle, 120);
+			}
+			$out .= '</td>';
 
-            // 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'])
-            {
-                $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');
-                else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');
-            }
-            $late = 0;
-            if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-            if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-            if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1;
-            if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-            if ($late) $out .= img_warning($langs->trans("Late")).' ';
-            $out .= "</td>\n";
+			// 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'])
+			{
+				$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');
+				else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');
+			}
+			$late = 0;
+			if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
+			if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
+			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1;
+			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
+			if ($late) $out .= img_warning($langs->trans("Late")).' ';
+			$out .= "</td>\n";
 
-            // Title of event
-            //$out.='<td>'.dol_trunc($histo[$key]['note'], 40).'</td>';
+			// Title of event
+			//$out.='<td>'.dol_trunc($histo[$key]['note'], 40).'</td>';
 
-            // 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;';
-            $out .= '</td>';
+			// 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;';
+			$out .= '</td>';
 
-            // Contact(s) for action
-            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'];
-                $out .= '<td width="120">'.$contactstatic->getNomUrl(1, '', 10).'</td>';
-            } elseif (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
+			// Contact(s) for action
+			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'];
+				$out .= '<td width="120">'.$contactstatic->getNomUrl(1, '', 10).'</td>';
+			} elseif (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
 				$out .= '<td>';
 				$contact = new Contact($db);
 				foreach ($histo[$key]['socpeopleassigned'] as $cid => $value) {
@@ -1777,28 +1751,27 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					}
 				}
 				$out .= '</td>';
+			} else {
+				$out .= '<td>&nbsp;</td>';
 			}
-            else {
-            	$out .= '<td>&nbsp;</td>';
-            }
 
-            // Status
-            $out .= '<td class="nowrap center">'.$actionstatic->LibStatut($histo[$key]['percent'], 3, 0, $histo[$key]['datestart']).'</td>';
+			// Status
+			$out .= '<td class="nowrap center">'.$actionstatic->LibStatut($histo[$key]['percent'], 3, 0, $histo[$key]['datestart']).'</td>';
 
-            // Actions
-            $out .= '<td></td>';
+			// Actions
+			$out .= '<td></td>';
 
-            $out .= "</tr>\n";
-            $i++;
-        }
-        $out .= "</table>\n";
-        $out .= "</div>\n";
+			$out .= "</tr>\n";
+			$i++;
+		}
+		$out .= "</table>\n";
+		$out .= "</div>\n";
 
-        $out .= '</form>';
-    }
+		$out .= '</form>';
+	}
 
-    if ($noprint) return $out;
-    else print $out;
+	if ($noprint) return $out;
+	else print $out;
 }
 
 /**
@@ -1883,3 +1856,74 @@ function show_subsidiaries($conf, $langs, $db, $object)
 
 	return $i;
 }
+/**
+ * 		Add Event Type SQL
+ *
+ *		@param	string		$sql		    $sql modified
+ * 		@param	string	    $actioncode		Action code
+ * 		@param	string		$donetodo		donetodo
+ * 		@param	string		$now		    now
+ * 		@param	string		$filters		array
+ * 		@param	string		$sqlANDOR		"AND", "OR" or "" sql condition
+ * 		@return	string      sql request
+ */
+function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDOR = "AND")
+{
+	global $conf, $db;
+	// Condition on actioncode
+
+	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 {
+			if ($actioncode == 'AC_OTH') $sql .= " $sqlANDOR c.type != 'systemauto'";
+			elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " $sqlANDOR c.type = 'systemauto'";
+		}
+	}
+	else {
+		if ($actioncode == 'AC_NON_AUTO') $sql .= " $sqlANDOR c.type != 'systemauto'";
+		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " $sqlANDOR c.type = 'systemauto'";
+		else $sql .= " $sqlANDOR c.code = '".$db->escape($actioncode)."'";
+	}
+
+	if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
+	elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
+	if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']);
+
+	return $sql;
+}
+
+/**
+ * 		Add Mailing Event Type SQL
+ *
+ * 		@param	string	    $actioncode		Action code
+ * 		@param	string		$objcon		    objcon
+ * 		@param	Object		$filterobj      filterobj
+ * 		@return	string
+ */
+function addMailingEventTypeSQL($actioncode, $objcon, $filterobj)
+{
+	global $conf, $langs, $db;
+	// Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.
+	if (!empty($conf->mailing->enabled) && !empty($objcon->email)
+		&& (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) {
+		$langs->load("mails");
+
+		$sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type";
+		$sql2 .= ", '' as fk_element, '' as elementtype, '' as contact_id";
+		$sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";
+		$sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action
+		if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql2 .= ", '' as lastname, '' as firstname";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql2 .= ", '' as ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql2 .= ", '' as ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql2 .= ", '' as ref";
+		$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";
+		$sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.
+		$sql2 .= " AND mc.statut = 1";
+		$sql2 .= " AND u.rowid = m.fk_user_valid";
+		$sql2 .= " AND mc.fk_mailing=m.rowid";
+		return $sql2;
+	}
+}
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 33ad0a85229..1779e77213e 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -123,9 +123,7 @@ function dol_print_cron_urls()
     		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
-    	{
+    	} else {
     		print $langs->trans("CronExplainHowToRunWin");
     	}
 	}
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index a751f584564..48e347afbd1 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -94,9 +94,7 @@ function getServerTimeZoneInt($refgmtdate = 'now')
         $localdt = new DateTime($newrefgmtdate, $localtz);
         $tmp = -1 * $localtz->getOffset($localdt);
         //print $refgmtdate.'='.$tmp;
-    }
-    else
-    {
+    } else {
     	$tmp = 0;
     	dol_print_error('', 'PHP version must be 5.3+');
     }
@@ -110,7 +108,7 @@ function getServerTimeZoneInt($refgmtdate = 'now')
  *
  *  @param      int			$time               Date timestamp (or string with format YYYY-MM-DD)
  *  @param      int			$duration_value     Value of delay to add
- *  @param      int			$duration_unit      Unit of added delay (d, m, y, w, h)
+ *  @param      int			$duration_unit      Unit of added delay (d, m, y, w, h, i)
  *  @return     int      			        	New timestamp
  */
 function dol_time_plus_duree($time, $duration_value, $duration_unit)
@@ -118,6 +116,7 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
 	global $conf;
 
 	if ($duration_value == 0)  return $time;
+	if ($duration_unit == 'i') return $time + (60 * $duration_value);
 	if ($duration_unit == 'h') return $time + (3600 * $duration_value);
 	if ($duration_unit == 'w') return $time + (3600 * 24 * 7 * $duration_value);
 
@@ -231,47 +230,37 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 			{
 				$sTime .= dol_print_date($iSecond, 'hourduration', true);
 			}
-		}
-		elseif ($format == 'allhourminsec')
+		} 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)));
-		}
-		elseif ($format == 'allhourmin')
+		} elseif ($format == 'allhourmin')
 		{
 		    return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
-		}
-		elseif ($format == 'allhour')
+		} elseif ($format == 'allhour')
 		{
 			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
 		}
-	}
-	elseif ($format == 'hour')	// only hour part
+	} elseif ($format == 'hour')	// only hour part
 	{
 		$sTime = dol_print_date($iSecond, '%H', true);
-	}
-	elseif ($format == 'fullhour')
+	} elseif ($format == 'fullhour')
 	{
 		if (!empty($iSecond)) {
 			$iSecond = $iSecond / 3600;
-		}
-		else {
+		} else {
 			$iSecond = 0;
 		}
 		$sTime = $iSecond;
-	}
-	elseif ($format == 'min')	// only min part
+	} elseif ($format == 'min')	// only min part
 	{
 		$sTime = dol_print_date($iSecond, '%M', true);
-	}
-    elseif ($format == 'sec')	// only sec part
+	} elseif ($format == 'sec')	// only sec part
     {
         $sTime = dol_print_date($iSecond, '%S', true);
-    }
-    elseif ($format == 'month')	// only month part
+    } elseif ($format == 'month')	// only month part
     {
         $sTime = dol_print_date($iSecond, '%m', true);
-    }
-    elseif ($format == 'year')	// only year part
+    } elseif ($format == 'year')	// only year part
     {
         $sTime = dol_print_date($iSecond, '%Y', true);
     }
@@ -300,8 +289,7 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
 		} elseif ($year_date > 0 && !empty($day_date)) {
 			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
 			$sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
-		} else
-			$sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
+		} else $sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
 	} elseif ($year_date > 0) {
 		$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
 		$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
@@ -346,8 +334,7 @@ function dol_stringtotime($string, $gm = 1)
         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 (
+    } 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
@@ -411,9 +398,7 @@ function dol_get_prev_month($month, $year)
 	{
 		$prev_month = 12;
 		$prev_year  = $year - 1;
-	}
-	else
-	{
+	} else {
 		$prev_month = $month - 1;
 		$prev_year  = $year;
 	}
@@ -432,9 +417,7 @@ function dol_get_next_month($month, $year)
 	{
 		$next_month = 1;
 		$next_year  = $year + 1;
-	}
-	else
-	{
+	} else {
 		$next_month = $month + 1;
 		$next_year  = $year;
 	}
@@ -483,8 +466,8 @@ function dol_get_next_week($day, $week, $month, $year)
  *	@param		int			$year		Year
  * 	@param		int			$month		Month
  * 	@param		mixed		$gm			False or 0 or 'server' = Return date to compare with server TZ, True or 1 to compare with GM date.
- *                          			Exemple: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, after a dol_print_date will return 1970-01-01 00:00:00
- *                          			Exemple: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, after a dol_print_date will return 1970-01-01 00:00:00
+ *                          			Exemple: dol_get_first_day(1970,1,false) will return -3600 with TZ+1, a dol_print_date on it will return 1970-01-01 00:00:00
+ *                          			Exemple: dol_get_first_day(1970,1,true) will return 0 whatever is TZ, a dol_print_date on it will return 1970-01-01 00:00:00
  *  @return		int						Date for first day, '' if error
  */
 function dol_get_first_day($year, $month = 1, $gm = false)
@@ -508,9 +491,7 @@ function dol_get_last_day($year, $month = 12, $gm = false)
 	{
 		$month = 1;
 		$year += 1;
-	}
-	else
-	{
+	} else {
 		$month += 1;
 	}
 
@@ -521,6 +502,28 @@ function dol_get_last_day($year, $month = 12, $gm = false)
 	return $datelim;
 }
 
+/**	Return GMT time for last hour of a given GMT date (it removes hours, min and second part)
+ *
+ *	@param		int			$date		Date
+ *  @return		int						Date for last hour of a given date
+ */
+function dol_get_last_hour($date)
+{
+	$tmparray = dol_getdate($date);
+	return dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year'], false);
+}
+
+/**	Return GMT time for first hour of a given GMT date (it removes hours, min and second part)
+ *
+ *	@param		int			$date		Date
+ *  @return		int						Date for last hour of a given date
+ */
+function dol_get_first_hour($date)
+{
+	$tmparray = dol_getdate($date);
+	return dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year'], false);
+}
+
 /**	Return first day of week for a date. First day of week may be monday if option MAIN_START_WEEK is 1.
  *
  *	@param		int		$day		Day
@@ -563,9 +566,7 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
     		$prev_month = 12;
     		$prev_year  = $year - 1;
     	}
-    }
-    else
-    {
+    } else {
     	$prev_month = $month;
 		$prev_year = $year;
     }
@@ -636,25 +637,6 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 		$mois  = date("m", $timestampStart);
 		$annee = date("Y", $timestampStart);
 
-		// Check into var $conf->global->HOLIDAY_MORE_DAYS   MM-DD,YYYY-MM-DD, ...
-		// Do not use this anymore, use instead the dictionary of public holidays.
-		if (!empty($conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS))
-		{
-			$arrayofdaystring = explode(',', $conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS);
-			foreach ($arrayofdaystring as $daystring)
-			{
-				$tmp = explode('-', $daystring);
-				if ($tmp[2])
-				{
-					if ($tmp[0] == $annee && $tmp[1] == $mois && $tmp[2] == $jour) $ferie = true;
-				}
-				else
-				{
-					if ($tmp[0] == $mois && $tmp[1] == $jour) $ferie = true;
-				}
-			}
-		}
-
 		$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');
 
 		// Loop on public holiday defined into hrm_public_holiday
@@ -674,9 +656,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				if (!empty($obj->dayrule) && $obj->dayrule != 'date')		// For example 'easter', '...'
 				{
 					$specialdayrule[$obj->dayrule] = $obj->dayrule;
-				}
-				else
-				{
+				} else {
 					$match = 1;
 					if (!empty($obj->year) && $obj->year != $annee) $match = 0;
 					if ($obj->month != $mois) $match = 0;
@@ -687,9 +667,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($db->lasterror(), LOG_ERR);
 			return 'Error sql '.$db->lasterror();
 		}
@@ -857,9 +835,7 @@ function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
 		if ($lastday == 1)
 		{
 			$bit = 0;
-		}
-		else
-		{
+		} else {
 			$bit = 1;
 		}
 		$nbjours = (int) floor(($timestampEnd - $timestampStart) / (60 * 60 * 24)) + 1 - $bit;
@@ -901,8 +877,7 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 		$nbOpenDay = ($numdays - $numholidays);
 		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = ($nbOpenDay * 24);
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	elseif ($timestampStart == $timestampEnd)
+	} elseif ($timestampStart == $timestampEnd)
 	{
 		$numholidays = 0;
 		if ($lastday) {
@@ -910,13 +885,11 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 			if ($numholidays == 1) return 0;
 		}
 
-		$nbOpenDay=$lastday;
+		$nbOpenDay = $lastday;
 
 		if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	}
-	else
-	{
+	} else {
 		return $langs->trans("Error");
 	}
 }
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 38e847bb3c1..4e9768b2a44 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -75,8 +75,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 			$discount->fetch($line->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
+		} elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
@@ -84,27 +83,21 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
-		}
-		elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
+		} elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
+		} elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
-		}
-		else
-		{
+		} else {
 			if ($idprod)
 			{
 				if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
-			}
-			else
-			{
+			} else {
 				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
 		}
@@ -123,9 +116,7 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 				if ($prodser->isService())
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-				}
-				else
-				{
+				} else {
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 				}
 			}
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index df9e3d94619..ddccb11247e 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -111,9 +111,7 @@ function show_skin($fuser, $edit = 0)
     					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
-    					{
+    					} else {
     						print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
     					}
 						print '</div>';
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 3d14f14a7df..1f22e464358 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -84,9 +84,7 @@ function ecm_prepare_head($object, $module = 'ecm', $section = '')
 		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
 		$h++;
-	}
-	else
-	{
+	} else {
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$section.'&module='.$module;
 		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
@@ -140,3 +138,38 @@ function ecm_prepare_head_fm($object)
 
 	return $head;
 }
+
+/**
+ *  Return array head with list of tabs to view object informations.
+ *
+ *  @return	array               head array with tabs
+ */
+function ecm_admin_prepare_head()
+{
+	global $langs, $conf;
+	$langs->load("ecm");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT."/admin/ecm.php";
+	$head[$h][1] = $langs->trans("Setup");
+	$head[$h][2] = 'ecm';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/ecm_files_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsEcmFiles");
+	$head[$h][2] = 'attributes_ecm_files';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT.'/admin/ecm_directories_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsEcmDirectories");
+	$head[$h][2] = 'attributes_ecm_directories';
+	$h++;
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin');
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
index fc1ca494d36..b575247e84b 100644
--- a/htdocs/core/lib/expedition.lib.php
+++ b/htdocs/core/lib/expedition.lib.php
@@ -58,10 +58,11 @@ function expedition_prepare_head(Expedition $object)
 		$h++;
 	}
 
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order');
 
-    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;
 }
 
 /**
@@ -94,18 +95,18 @@ function expedition_admin_prepare_head()
 
 	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 	{
-	    $head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
-	    $head[$h][1] = $langs->trans("ExtraFields");
-	    $head[$h][2] = 'attributes_shipment';
-	    $h++;
+		$head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
+		$head[$h][1] = $langs->trans("ExtraFields");
+		$head[$h][2] = 'attributes_shipment';
+		$h++;
 	}
 
 	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 	{
-	    $head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
-	    $head[$h][1] = $langs->trans("ExtraFieldsLines");
-	    $head[$h][2] = 'attributeslines_shipment';
-	    $h++;
+		$head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
+		$head[$h][1] = $langs->trans("ExtraFieldsLines");
+		$head[$h][2] = 'attributeslines_shipment';
+		$h++;
 	}
 
 	if (!empty($conf->global->MAIN_SUBMODULE_LIVRAISON))
@@ -132,7 +133,7 @@ function expedition_admin_prepare_head()
 		$h++;
 	}
 
-
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'expedition_admin');
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'expedition_admin', 'remove');
 
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index 4c54ca09e31..e7a6b897fdb 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -94,7 +94,7 @@ function payment_expensereport_prepare_head(PaymentExpenseReport $object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("ExpenseReport");
+	$head[$h][1] = $langs->trans("ExpenseReportPayment");
 	$head[$h][2] = 'payment';
 	$h++;
 
@@ -133,14 +133,6 @@ function expensereport_admin_prepare_head()
 	$head[$h][2] = 'expensereport';
 	$h++;
 
-	if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
-	{
-		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
-		$head[$h][1] = $langs->trans("ExpenseReportsIk");
-		$head[$h][2] = 'expenseik';
-		$h++;
-	}
-
 	if (!empty($conf->global->MAIN_USE_EXPENSE_RULE))
 	{
 		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";
@@ -149,6 +141,14 @@ function expensereport_admin_prepare_head()
 		$h++;
 	}
 
+	if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
+	{
+		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
+		$head[$h][1] = $langs->trans("ExpenseReportsIk");
+		$head[$h][2] = 'expenseik';
+		$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
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index eeac3566961..63047ed0e7b 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -118,8 +118,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 				if (is_array($excludefilter))
 				{
 					$excludefilterarray = array_merge($excludefilterarray, $excludefilter);
-				}
-				elseif ($excludefilter) $excludefilterarray[] = $excludefilter;
+				} elseif ($excludefilter) $excludefilterarray[] = $excludefilter;
 				// Check if file is qualified
 				foreach ($excludefilterarray as $filt)
 				{
@@ -143,6 +142,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 
 							if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into all $path, only into $file part
 							{
+								$reg = array();
 								preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
 								$level1name = (isset($reg[1]) ? $reg[1] : '');
 								$file_list[] = array(
@@ -167,8 +167,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks));
 							}
 						}
-					}
-					elseif (!$isdir && (($types == "files") || ($types == "all")))
+					} elseif (!$isdir && (($types == "files") || ($types == "all")))
 					{
 						// Add file into file_list array
 						if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
@@ -225,8 +224,8 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 {
 	global $conf, $db;
 
-	$sql = " SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams, date_c, date_m, fk_user_c, fk_user_m,";
-	$sql .= " acl, position, share";
+	$sql = " SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams,";
+	$sql .= " date_c, tms as date_m, fk_user_c, fk_user_m, acl, position, share";
 	if ($mode) $sql .= ", description";
 	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql .= " WHERE filepath = '".$db->escape($path)."'";
@@ -279,9 +278,7 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 		}
 
 		return $file_list;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		return array();
 	}
@@ -374,14 +371,10 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 				if ($result < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
-				}
-				else
-				{
+				} else {
 					$filearray[$key]['rowid'] = $result;
 				}
-			}
-			else
-			{
+			} else {
 				$filearray[$key]['rowid'] = 0; // Should not happened
 			}
 		}
@@ -405,8 +398,7 @@ function dol_compare_file($a, $b)
 
 	$sortorder = strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; }
-	else { $retup = 1; $retdown = -1; }
+	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; } else { $retup = 1; $retdown = -1; }
 
 	if ($sortfield == 'name')
 	{
@@ -514,9 +506,7 @@ function dol_dir_is_emtpy($folder)
 
 		if ($folder_content == "...") return true;
 		else return false;
-	}
-	else
-		return true; // Dir does not exists
+	} else return true; // Dir does not exists
 }
 
 /**
@@ -542,9 +532,7 @@ function dol_count_nb_of_line($file)
 			if (!$line === false) $nb++;
 		}
 		fclose($fp);
-	}
-	else
-	{
+	} else {
 		$nb = -1;
 	}
 
@@ -627,9 +615,7 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
 	if (empty($arrayreplacementisregex))
 	{
 		$content = make_substitutions($content, $arrayreplacement, null);
-	}
-	else
-	{
+	} else {
 		foreach ($arrayreplacement as $key => $value)
 		{
 			$content = preg_replace($key, $value, $content);
@@ -775,9 +761,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 						//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
 						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
 					}
-				}
-				else
-				{
+				} else {
 					$newfile = $file;
 					// Replace destination filename with a new one
 					if (is_array($arrayreplacement))
@@ -793,18 +777,14 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 				if ($result > 0 && $tmpresult >= 0)
 				{
 					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
-				}
-				else
-				{
+				} else {
 					$result = $tmpresult;
 				}
 				if ($result < 0) break;
 			}
 		}
 		closedir($dir_handle);
-	}
-	else
-	{
+	} else {
 		// Source directory does not exists
 		$result = -2;
 	}
@@ -870,8 +850,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
 				$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-			}
-			else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
+			} else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
 		}
 
 		// Move ok
@@ -909,8 +888,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 					$ecmfile->filename = $filename;
 
 					$resultecm = $ecmfile->update($user);
-				}
-				elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
+				} elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
 				{
 					$filename = basename($rel_filetorenameafter);
 					$rel_dir = dirname($rel_filetorenameafter);
@@ -929,8 +907,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 					{
 						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 					}
-				}
-				elseif ($resultecm < 0)
+				} elseif ($resultecm < 0)
 				{
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
@@ -982,11 +959,11 @@ function dolCheckVirus($src_file)
 		if (!class_exists('AntiVir')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
 		}
-		$antivir=new AntiVir($db);
+		$antivir = new AntiVir($db);
 		$result = $antivir->dol_avscan_file($src_file);
 		if ($result < 0)	// If virus or error, we stop here
 		{
-			$reterrors=$antivir->errors;
+			$reterrors = $antivir->errors;
 			return $reterrors;
 		}
 	}
@@ -1073,7 +1050,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		{
 			// $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 (!preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash .= '/';
 
 			if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory
 				$file_name .= '.noexe';
@@ -1098,14 +1075,11 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		}
 	}
 
-	if ($reshook < 0)	// At least one blocking error returned by one hook
-	{
+	if ($reshook < 0) {	// At least one blocking error returned by one hook
 		$errmsg = join(',', $hookmanager->errors);
 		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
 		return $errmsg;
-	}
-	elseif (empty($reshook))
-	{
+	} elseif (empty($reshook)) {
 		// The file functions must be in OS filesystem encoding.
 		$src_file_osencoded = dol_osencode($src_file);
 		$file_name_osencoded = dol_osencode($file_name);
@@ -1125,6 +1099,11 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 				dol_syslog("Files.lib::dol_move_uploaded_file File ".$file_name." already exists. Return 'ErrorFileAlreadyExists'", LOG_WARNING);
 				return 'ErrorFileAlreadyExists';
 			}
+		} else {	// We are allowed to erase
+			if (is_dir($file_name_osencoded)) {	// If there is a directory with name of file to create
+				dol_syslog("Files.lib::dol_move_uploaded_file A directory with name ".$file_name." already exists. Return 'ErrorDirWithFileNameAlreadyExists'", LOG_WARNING);
+				return 'ErrorDirWithFileNameAlreadyExists';
+			}
 		}
 
 		// Move file
@@ -1134,9 +1113,7 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 			if (!empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return $successcode; // Success
-		}
-		else
-		{
+		} else {
 			dol_syslog("Files.lib::dol_move_uploaded_file Failed to move ".$src_file." to ".$file_name, LOG_ERR);
 			return -3; // Unknown error
 		}
@@ -1177,6 +1154,7 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 		return false;
 	}
 
+	$reshook = 0;
 	if (empty($nohook))
 	{
 		$hookmanager->initHooks(array('fileslib'));
@@ -1190,14 +1168,12 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 		$reshook = $hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
-	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok, -1 = ko
+	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok and replace, -1 = ko
 	{
+		dol_syslog("reshook=".$reshook);
 		if ($reshook < 0) return false;
 		return true;
-	}
-	else
-	{
-		//print "x".$file." ".$disableglob;exit;
+	} else {
 		$file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset
 		if (empty($disableglob) && !empty($file_osencoded))
 		{
@@ -1238,19 +1214,16 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 								}
 							}
 						}
-					}
-					else
-					{
+					} else {
 						dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
 						// TODO Failure to remove can be because file was already removed or because of permission
 						// If error because it does not exists, we should return true, and we should return false if this is a permission problem
 					}
 				}
+			} else {
+				dol_syslog("No files to delete found", LOG_DEBUG);
 			}
-			else dol_syslog("No files to delete found", LOG_DEBUG);
-		}
-		else
-		{
+		} else {
 			$ok = false;
 			if ($nophperrors) $ok = @unlink($file_osencoded);
 			else $ok = unlink($file_osencoded);
@@ -1312,9 +1285,7 @@ function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub =
 					if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item")))
 					{
 						$count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
-					}
-					else
-					{
+					} else {
 						$result = dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
 						if ($result) $countdeleted++;
@@ -1394,9 +1365,7 @@ function dol_delete_preview($object)
 			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewold);
 			return 0;
 		}
-	}
-	else
-	{
+	} else {
 		$multiple = $filepreviewold.".";
 		for ($i = 0; $i < 20; $i++)
 		{
@@ -1484,9 +1453,7 @@ function dol_meta_create($object)
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 			return 1;
-	}
-	else
-	{
+	} else {
 		dol_syslog('FailedToDetectDirInDolMetaCreateFor'.$object->element, LOG_WARNING);
 	}
 
@@ -1566,6 +1533,8 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 			$nbok = 0;
 			for ($i = 0; $i < $nbfile; $i++)
 			{
+				if (empty($TFile['name'][$i])) continue; // For example, when submitting a form with no file name
+
 				// Define $destfull (path to file including filename) and $destfile (only filename)
 				$destfull = $upload_dir."/".$TFile['name'][$i];
 				$destfile = $TFile['name'][$i];
@@ -1638,27 +1607,22 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 						{
 							if ($allowoverwrite) {
 								// Do not show error message. We can have an error due to DB_ERROR_RECORD_ALREADY_EXISTS
-							}
-							else {
+							} else {
 								setEventMessages('WarningFailedToAddFileIntoDatabaseIndex', '', 'warnings');
 							}
 						}
 					}
 
 					$nbok++;
-				}
-				else
-				{
+				} else {
 					$langs->load("errors");
 					if ($resupload < 0)	// Unknown error
 					{
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
-					}
-					elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
+					} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 					{
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-					}
-					else	// Known error
+					} else // Known error
 					{
 						setEventMessages($langs->trans($resupload), null, 'errors');
 					}
@@ -1685,9 +1649,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 		} else {
 			setEventMessages($langs->trans("ErrorFileNotLinked"), null, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("File")), null, 'errors');
 	}
@@ -1890,31 +1852,22 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
 				{
 					try {
 						$ret = $image->writeImages($fileoutput, true);
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
 				}
 				if ($ret) return $count;
 				else return -3;
-			}
-			else
-			{
+			} else {
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
-	}
-	else
-	{
+	} else {
 		return 0;
 	}
 }
@@ -1936,14 +1889,11 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 
 	$foundhandler = 0;
 
-	try
-	{
+	try {
 		dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
 
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); }
-		elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); }
-		elseif ($mode == 'zip')
+		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); } elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); } elseif ($mode == 'zip')
 		{
 			if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
 			{
@@ -2015,9 +1965,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 					$errorstring = "dol_compress_file error archive->errorCode = ".$archive->errorCode()." errormsg=".$errormsg;
 					dol_syslog("dol_compress_file failure - ".$errormsg, LOG_ERR);
 					return -3;
-				}
-				else
-				{
+				} else {
 					dol_syslog("dol_compress_file success - ".count($result)." files");
 					return 1;
 				}
@@ -2030,9 +1978,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			fwrite($fp, $compressdata);
 			fclose($fp);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$errorstring = "Try to zip with format ".$mode." with no handler for this format";
 			dol_syslog($errorstring, LOG_ERR);
 
@@ -2040,8 +1986,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			$errormsg = $errorstring;
 			return -2;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2069,11 +2014,12 @@ function dol_uncompress($inputfile, $outputdir)
 		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
 		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
 		$archive = new PclZip($inputfile);
-		$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir);
-		//var_dump($result);
+
+		// Extract into outputdir, but only files that match the regex '/^((?!\.\.).)*$/' that means "does not include .."
+		$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir, PCLZIP_OPT_BY_PREG, '/^((?!\.\.).)*$/');
+
 		if (!is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else
-		{
+		else {
 			$ok = 1; $errmsg = '';
 			// Loop on each file to check result for unzipping file
 			foreach ($result as $key => $val)
@@ -2092,19 +2038,29 @@ function dol_uncompress($inputfile, $outputdir)
 		}
 	}
 
-	if (class_exists('ZipArchive'))
+	if (class_exists('ZipArchive'))	// Must install php-zip to have it
 	{
 		dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
 		$zip = new ZipArchive;
 		$res = $zip->open($inputfile);
 		if ($res === true)
 		{
-			$zip->extractTo($outputdir.'/');
+			//$zip->extractTo($outputdir.'/');
+			// We must extract one file at time so we can check that file name does not contains '..' to avoid transversal path of zip built for example using
+			// python3 path_traversal_archiver.py <Created_file_name> test.zip -l 10 -p tmp/
+			// with -l is the range of dot to go back in path.
+			// and path_traversal_archiver.py found at https://github.com/Alamot/code-snippets/blob/master/path_traversal/path_traversal_archiver.py
+			for ($i = 0; $i < $zip->numFiles; $i++) {
+				if (preg_match('/\.\./', $zip->getNameIndex($i))) {
+					dol_syslog("Warning: Try to unzip a file with a transversal path ".$zip->getNameIndex($i), LOG_WARNING);
+					continue; // Discard the file
+				}
+				$zip->extractTo($outputdir.'/', array($zip->getNameIndex($i)));
+			}
+
 			$zip->close();
 			return array();
-		}
-		else
-		{
+		} else {
 			return array('error'=>'ErrUnzipFails');
 		}
 	}
@@ -2137,11 +2093,8 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 		return -3;
 	}
 
-	try
-	{
-		if ($mode == 'gz') { $foundhandler = 0; }
-		elseif ($mode == 'bz') { $foundhandler = 0; }
-		elseif ($mode == 'zip')
+	try {
+		if ($mode == 'gz') { $foundhandler = 0; } elseif ($mode == 'bz') { $foundhandler = 0; } elseif ($mode == 'zip')
 		{
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
 			 {
@@ -2205,13 +2158,10 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 		{
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
 			return -2;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		global $langs, $errormsg;
 		$langs->load("errors");
@@ -2291,20 +2241,17 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		$accessallowed = 1;
 		$original_file = $conf->medias->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	} // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
 	{
 		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/'.$original_file;
-	}
-	// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+	} // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
 	elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root))
 	{
 		$accessallowed = ($fuser->rights->website->write && preg_match('/\.jpg$/i', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/doctemplates/websites/'.$original_file;
-	}
-	// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
+	} // Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
 	{
 		// Dir for custom dirs
@@ -2313,203 +2260,169 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 
 		$accessallowed = ($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
 		$original_file = $dirins.'/'.$original_file;
-	}
-	// Wrapping for some images
+	} // Wrapping for some images
 	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->mycompany->dir_output.'/'.$original_file;
-	}
-	// Wrapping for users photos
+	} // Wrapping for users photos
 	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->user->dir_output.'/'.$original_file;
-	}
-	// Wrapping for members photos
+	} // Wrapping for members photos
 	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu factures
+	} // Wrapping pour les apercu factures
 	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity]))
 	{
 		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu propal
+	} // Wrapping pour les apercu propal
 	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu commande
+	} // Wrapping pour les apercu commande
 	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->multidir_output[$entity]))
 	{
 		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les apercu intervention
+	} // Wrapping pour les apercu intervention
 	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
 	{
 		if ($fuser->rights->ficheinter->{$lire}) $accessallowed = 1;
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu conat
+	} // Wrapping pour les apercu conat
 	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire}) $accessallowed = 1;
 		$original_file = $conf->contrat->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier proposal
+	} // Wrapping pour les apercu supplier proposal
 	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed = 1;
 		$original_file = $conf->supplier_proposal->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier order
+	} // Wrapping pour les apercu supplier order
 	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
+	} // Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les apercu supplier invoice
+	} // Wrapping pour les apercu supplier invoice
 	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
 	{
 		if ($fuser->rights->expensereport->{$lire}) $accessallowed = 1;
 		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats propales
+	} // Wrapping pour les images des stats propales
 	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
 		$original_file = $conf->propal->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les images des stats commandes
+	} // Wrapping pour les images des stats commandes
 	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
 	{
 		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->commande->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->commande->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats factures
+	} // Wrapping pour les images des stats factures
 	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
 	{
 		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->facture->dir_temp.'/'.$original_file;
-	}
-	elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
+	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
 		$original_file = $conf->fournisseur->facture->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
+	} // Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
 	{
 		if ($fuser->rights->expedition->{$lire}) $accessallowed = 1;
 		$original_file = $conf->expedition->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
+	} // Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
 	{
 		if ($fuser->rights->deplacement->{$lire}) $accessallowed = 1;
 		$original_file = $conf->deplacement->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats expeditions
+	} // Wrapping pour les images des stats expeditions
 	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
 	{
 		if ($fuser->rights->adherent->{$lire}) $accessallowed = 1;
 		$original_file = $conf->adherent->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les images des stats produits
+	} // Wrapping pour les images des stats produits
 	elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp))
 	{
 		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed = 1;
 		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
-	}
-	// Wrapping for taxes
+	} // Wrapping for taxes
 	elseif (in_array($modulepart, array('tax', 'tax-vat')) && !empty($conf->tax->dir_output))
 	{
 		if ($fuser->rights->tax->charges->{$lire}) $accessallowed = 1;
 		$modulepartsuffix = str_replace('tax-', '', $modulepart);
 		$original_file = $conf->tax->dir_output.'/'.($modulepartsuffix != 'tax' ? $modulepartsuffix.'/' : '').$original_file;
-	}
-	// Wrapping for events
+	} // Wrapping for events
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
 		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed = 1;
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
-	}
-	// Wrapping for categories
+	} // Wrapping for categories
 	elseif ($modulepart == 'category' && !empty($conf->categorie->multidir_output[$entity]))
 	{
 		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		if ($fuser->rights->categorie->{$lire}) $accessallowed = 1;
 		$original_file = $conf->categorie->multidir_output[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les prelevements
+	} // Wrapping pour les prelevements
 	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
 	{
 		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i', $original_file)) $accessallowed = 1;
 		$original_file = $conf->prelevement->dir_output.'/'.$original_file;
-	}
-	// Wrapping pour les graph energie
+	} // Wrapping pour les graph energie
 	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->stock->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph fournisseurs
+	} // Wrapping pour les graph fournisseurs
 	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->fournisseur->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour les graph des produits
+	} // Wrapping pour les graph des produits
 	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->product->multidir_temp[$entity].'/'.$original_file;
-	}
-	// Wrapping pour les code barre
+	} // Wrapping pour les code barre
 	elseif ($modulepart == 'barcode')
 	{
 		$accessallowed = 1;
 		// If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
 		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
 		$original_file = '';
-	}
-	// Wrapping pour les icones de background des mailings
+	} // Wrapping pour les icones de background des mailings
 	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->mailing->dir_temp.'/'.$original_file;
-	}
-	// Wrapping pour le scanner
+	} // Wrapping pour le scanner
 	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-	// Wrapping pour les images fckeditor
+	} // Wrapping pour les images fckeditor
 	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for users
+	} // Wrapping for users
 	elseif ($modulepart == 'user' && !empty($conf->user->dir_output))
 	{
 		$canreaduser = (!empty($fuser->admin) || $fuser->rights->user->user->{$lire});
@@ -2519,9 +2432,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->user->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for third parties
+	} // Wrapping for third parties
 	elseif (($modulepart == 'company' || $modulepart == 'societe' || $modulepart == 'thirdparty') && !empty($conf->societe->multidir_output[$entity]))
 	{
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2531,9 +2442,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->societe->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
-	}
-
-	// Wrapping for contact
+	} // Wrapping for contact
 	elseif ($modulepart == 'contact' && !empty($conf->societe->multidir_output[$entity]))
 	{
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2542,9 +2451,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->societe->multidir_output[$entity].'/contact/'.$original_file;
-	}
-
-	// Wrapping for invoices
+	} // Wrapping for invoices
 	elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->multidir_output[$entity]))
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2553,8 +2460,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('invoice').")";
-	}
-	// Wrapping for mass actions
+	} // Wrapping for mass actions
 	elseif ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2562,81 +2468,70 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_orders')
+	} elseif ($modulepart == 'massfilesarea_orders')
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_sendings')
+	} elseif ($modulepart == 'massfilesarea_sendings')
 	{
 		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_invoices')
+	} elseif ($modulepart == 'massfilesarea_invoices')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_expensereport')
+	} elseif ($modulepart == 'massfilesarea_expensereport')
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_interventions')
+	} elseif ($modulepart == 'massfilesarea_interventions')
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
+	} elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
 	{
 		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_supplier_order')
+	} elseif ($modulepart == 'massfilesarea_supplier_order')
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_supplier_invoice')
+	} elseif ($modulepart == 'massfilesarea_supplier_invoice')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-	elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+	} elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
 			$accessallowed = 1;
 		}
 		$original_file = $conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	}
-
-	// Wrapping for interventions
+	} // Wrapping for interventions
 	elseif (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
 	{
 		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2645,9 +2540,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les deplacements et notes de frais
+	} // Wrapping pour les deplacements et notes de frais
 	elseif ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
 	{
 		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2656,8 +2549,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->deplacement->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les propales
+	} // Wrapping pour les propales
 	elseif (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))
 	{
 		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2666,9 +2558,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('propal').")";
-	}
-
-	// Wrapping pour les commandes
+	} // Wrapping pour les commandes
 	elseif (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->multidir_output[$entity]))
 	{
 		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2677,9 +2567,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('order').")";
-	}
-
-	// Wrapping pour les projets
+	} // Wrapping pour les projets
 	elseif ($modulepart == 'project' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2688,8 +2576,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-	elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
+	} elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
 	{
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
 		{
@@ -2697,9 +2584,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	}
-
-	// Wrapping pour les commandes fournisseurs
+	} // Wrapping pour les commandes fournisseurs
 	elseif (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
 	{
 		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2708,9 +2593,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les factures fournisseurs
+	} // Wrapping pour les factures fournisseurs
 	elseif (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2719,8 +2602,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-	// Wrapping pour les rapport de paiements
+	} // Wrapping pour les rapport de paiements
 	elseif ($modulepart == 'supplier_payment')
 	{
 		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2729,9 +2611,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->payment->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	}
-
-	// Wrapping pour les rapport de paiements
+	} // Wrapping pour les rapport de paiements
 	elseif ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
 	{
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2740,9 +2620,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		if ($fuser->societe_id > 0) $original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
 		else $original_file = $conf->facture->dir_output.'/payments/'.$original_file;
-	}
-
-	// Wrapping for accounting exports
+	} // Wrapping for accounting exports
 	elseif ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
 	{
 		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i', $original_file))
@@ -2750,9 +2628,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->accounting->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les expedition
+	} // Wrapping pour les expedition
 	elseif ($modulepart == 'expedition' && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2760,8 +2636,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
-	}
-	// Wrapping pour les bons de livraison
+	} // Wrapping pour les bons de livraison
 	elseif ($modulepart == 'livraison' && !empty($conf->expedition->dir_output))
 	{
 		if ($fuser->rights->expedition->livraison->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2769,9 +2644,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/receipt/".$original_file;
-	}
-
-	// Wrapping pour les actions
+	} // Wrapping pour les actions
 	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
 	{
 		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file))
@@ -2779,9 +2652,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les actions
+	} // Wrapping pour les actions
 	elseif ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
 	{
 		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file))
@@ -2789,9 +2660,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_temp."/".$original_file;
-	}
-
-	// Wrapping pour les produits et services
+	} // Wrapping pour les produits et services
 	elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
 	{
 		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2801,9 +2670,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		if (!empty($conf->product->enabled)) $original_file = $conf->product->multidir_output[$entity].'/'.$original_file;
 		elseif (!empty($conf->service->enabled)) $original_file = $conf->service->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping pour les lots produits
+	} // Wrapping pour les lots produits
 	elseif ($modulepart == 'product_batch' || $modulepart == 'produitlot')
 	{
 		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2812,9 +2679,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		if (!empty($conf->productbatch->enabled)) $original_file = $conf->productbatch->multidir_output[$entity].'/'.$original_file;
-	}
-
-	// Wrapping for stock movements
+	} // Wrapping for stock movements
 	elseif ($modulepart == 'movement' || $modulepart == 'mouvement')
 	{
 		if (empty($entity) || empty($conf->stock->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
@@ -2823,9 +2688,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		if (!empty($conf->stock->enabled)) $original_file = $conf->stock->multidir_output[$entity].'/movement/'.$original_file;
-	}
-
-	// Wrapping pour les contrats
+	} // Wrapping pour les contrats
 	elseif ($modulepart == 'contract' && !empty($conf->contrat->dir_output))
 	{
 		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2834,9 +2697,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->contrat->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
-	}
-
-	// Wrapping pour les dons
+	} // Wrapping pour les dons
 	elseif ($modulepart == 'donation' && !empty($conf->don->dir_output))
 	{
 		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2844,9 +2705,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->don->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les dons
+	} // Wrapping pour les dons
 	elseif ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
 	{
 		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file))
@@ -2854,9 +2713,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->resource->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping pour les remises de cheques
+	} // Wrapping pour les remises de cheques
 	elseif ($modulepart == 'remisecheque' && !empty($conf->bank->dir_output))
 	{
 		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2865,9 +2722,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 
 		$original_file = $conf->bank->dir_output.'/checkdeposits/'.$original_file; // original_file should contains relative path so include the get_exdir result
-	}
-
-	// Wrapping for bank
+	} // Wrapping for bank
 	elseif (($modulepart == 'banque' || $modulepart == 'bank') && !empty($conf->bank->dir_output))
 	{
 		if ($fuser->rights->banque->{$lire})
@@ -2875,55 +2730,41 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->bank->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for export module
+	} // Wrapping for export module
 	elseif ($modulepart == 'export' && !empty($conf->export->dir_temp))
 	{
 		// Aucun test necessaire car on force le rep de download sur
 		// le rep export qui est propre a l'utilisateur
 		$accessallowed = 1;
 		$original_file = $conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// Wrapping for import module
+	} // Wrapping for import module
 	elseif ($modulepart == 'import' && !empty($conf->import->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->import->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour l'editeur wysiwyg
+	} // Wrapping pour l'editeur wysiwyg
 	elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for backups
+	} // Wrapping for backups
 	elseif ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
 	{
 		if ($fuser->admin) $accessallowed = 1;
 		$original_file = $conf->admin->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for upload file test
+	} // Wrapping for upload file test
 	elseif ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
 	{
 		if ($fuser->admin) $accessallowed = 1;
 		$original_file = $conf->admin->dir_temp.'/'.$original_file;
-	}
-
-	// Wrapping pour BitTorrent
+	} // Wrapping pour BitTorrent
 	elseif ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
 	{
 		$accessallowed = 1;
 		$dir = 'files';
 		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir = 'torrents';
 		$original_file = $conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
-	}
-
-	// Wrapping pour Foundation module
+	} // Wrapping pour Foundation module
 	elseif ($modulepart == 'member' && !empty($conf->adherent->dir_output))
 	{
 		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file))
@@ -2931,24 +2772,27 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$accessallowed = 1;
 		}
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
-	}
-
-	// Wrapping for Scanner
+	} // Wrapping for Scanner
 	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
 	{
 		$accessallowed = 1;
 		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
-	}
-
-	// GENERIC Wrapping
+	} // GENERIC Wrapping
 	// If modulepart=module_user_temp	Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
 	// If modulepart=module_temp		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp
 	// If modulepart=module_user		Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/iduser
 	// If modulepart=module				Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
-	else
-	{
+	// If modulepart=module-abc			Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart
+	else {
+		//var_dump($modulepart);
+		//var_dump($original_file);
 		if (preg_match('/^specimen/i', $original_file))	$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.
 		if ($fuser->admin) $accessallowed = 1; // If user is admin
+		$tmpmodulepart = explode('-', $modulepart);
+		if (!empty($tmpmodulepart[1])) {
+				$modulepart = $tmpmodulepart[0];
+				$original_file = $tmpmodulepart[1].'/'.$original_file;
+		}
 
 		// Define $accessallowed
 		$reg = array();
@@ -2961,8 +2805,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
 			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		}
-		elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
+		} elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
 			{
@@ -2971,8 +2814,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
 			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		}
-		elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
+		} elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
@@ -2981,8 +2823,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			}
 			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
 			$original_file = $conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		}
-		elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
+		} elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
 		{
 			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
 			{
@@ -2994,9 +2835,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 				$accessallowed = 1;
 			}
 			$original_file = $conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-		}
-		else
-		{
+		} else {
 			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
 			{
 				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.'). The module for this modulepart value may not be activated.');
@@ -3121,17 +2960,13 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre
 		if (!file_exists($pathref.'/'.$filename))
 		{
 			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize);
-		}
-		else
-		{
+		} else {
 			$md5_local = md5_file($pathref.'/'.$filename);
 
 			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
 			{
 				$checksumconcat[] = $expectedmd5;
-			}
-			else
-			{
+			} else {
 				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize, 'md5'=>(string) $md5_local);
 				$checksumconcat[] = $md5_local;
 			}
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index c46cd150a51..1693329329e 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -55,9 +55,7 @@ if ($resql)
         $_Avery_Labels[$row['code']]['custom_x'] = $row['custom_x'];
         $_Avery_Labels[$row['code']]['custom_y'] = $row['custom_y'];
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 1a47d634299..47a5d3d9330 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -15,6 +15,7 @@
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
  * Copyright (C) 2018-2020  Frédéric France             <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Thibault Foucart            <support@ptibogxiv.net>
+ * Copyright (C) 2020       Open-Dsi         			<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,16 +82,20 @@ function getEntity($element, $shared = 1, $currentobject = null)
 {
 	global $conf, $mc;
 
+	// fix different element names (France to English)
+	switch ($element) {
+		case 'contrat':			$element = 'contract'; break; // "/contrat/class/contrat.class.php"
+		case 'order_supplier':	$element = 'supplier_order'; break; // "/fourn/class/fournisseur.commande.class.php"
+	}
+
 	if (is_object($mc))
 	{
 		return $mc->getEntity($element, $shared, $currentobject);
-	}
-	else
-	{
+	} else {
 		$out = '';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
 		if (in_array($element, $addzero)) $out .= '0,';
-		$out .= $conf->entity;
+		$out .= ((int) $conf->entity);
 		return $out;
 	}
 }
@@ -108,13 +113,22 @@ function setEntity($currentobject)
 	if (is_object($mc) && method_exists($mc, 'setEntity'))
 	{
 		return $mc->setEntity($currentobject);
-	}
-	else
-	{
+	} else {
 		return ((is_object($currentobject) && $currentobject->id > 0 && $currentobject->entity > 0) ? $currentobject->entity : $conf->entity);
 	}
 }
 
+/**
+ * 	Return if string has a name dedicated to store a secret
+ *
+ * 	@param	string	$keyname	Name of key to test
+ * 	@return	boolean				True if key is used to store a secret
+ */
+function isASecretKey($keyname)
+{
+	return preg_match('/(_pass|password|_pw|_key|securekey|serverkey|secret\d?|p12key|exportkey|_PW_[a-z]+|token)$/i', $keyname);
+}
+
 /**
  * Return information about user browser
  *
@@ -168,21 +182,13 @@ function getBrowserInfo($user_agent)
 	}
 
 	// OS
-	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'; }
+	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
-	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
-	elseif (preg_match('/(Windows NT\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
+	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
+	elseif (preg_match('/(Windows NT\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
 	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name = 'lynxlinks'; $version = $reg[4]; }
 
 	if ($tablet) {
@@ -257,17 +263,14 @@ function GETPOSTISSET($paramname)
 		if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))
 		{
 			$isset = 1;
-		}
-		elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
+		} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
+		{
+			$isset = 1;
+		} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
 		{
 			$isset = 1;
 		}
-		elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
-		{
-			$isset = 1;
-		}
-	}
-	else {
+	} else {
 		$isset = (isset($_POST[$paramname]) || isset($_GET[$paramname]));
 	}
 
@@ -285,12 +288,13 @@ function GETPOSTISSET($paramname)
  *                               'none'=no check (only for param that should have very rich content)
  *                               'int'=check it's numeric (integer or float)
  *                               'intcomma'=check it's integer+comma ('1,2,3,4...')
- *                               'alpha'=check it's text and sign
+ *                               'alpha'=Same than alphanohtml since v13
+ *                               'alphanohtml'=check there is no html content and no " and no ../
  *                               'aZ'=check it's a-z only
  *                               'aZ09'=check it's simple alpha string (recommended for keys)
  *                               'array'=check it's array
  *                               'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string)
- *                               'nohtml', 'alphanohtml'=check there is no html content
+ *                               'nohtml'=check there is no html content and no " and no ../
  *                               'restricthtml'=check html content is restricted to some tags only
  *                               'custom'= custom filter specify $filter and $options)
  *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get)
@@ -350,17 +354,14 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))
 			{
 				$out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];
-			}
-			elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
+			} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
 			{
 				$out = $_SESSION['lastsearch_page_'.$relativepathstring];
-			}
-			elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
+			} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
 			{
 				$out = $_SESSION['lastsearch_limit_'.$relativepathstring];
 			}
-		}
-		// Else, retreive default values if we are not doing a sort
+		} // Else, retreive default values if we are not doing a sort
 		elseif (!isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
 		{
 			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
@@ -374,7 +375,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			}
 			if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 			{
-			    if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
+				if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
 					// Now search in setup to overwrite default values
 					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
@@ -395,12 +396,10 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								}
-								else $qualified = 1;
+								} else $qualified = 1;
 
 								if ($qualified)
 								{
-									//var_dump($user->default_values[$relativepathstring][$defkey]['createform']);
 									if (isset($user->default_values[$relativepathstring]['createform'][$defkey][$paramname]))
 									{
 										$out = $user->default_values[$relativepathstring]['createform'][$defkey][$paramname];
@@ -410,8 +409,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 							}
 						}
 					}
-				}
-				// Management of default search_filters and sort order
+				} // Management of default search_filters and sort order
 				//elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname]))
 				elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
 				{
@@ -436,8 +434,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 										}
 										if (!$foundintru) $qualified = 1;
 										//var_dump($defkey.'-'.$qualified);
-									}
-									else $qualified = 1;
+									} else $qualified = 1;
 
 									if ($qualified)
 									{
@@ -458,8 +455,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 								}
 							}
-						}
-						elseif (isset($user->default_values[$relativepathstring]['filters']))
+						} elseif (isset($user->default_values[$relativepathstring]['filters']))
 						{
 							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)	// $defkey is a querystring like 'a=b&c=d', $defval is key of user
 							{
@@ -475,8 +471,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								}
-								else $qualified = 1;
+								} else $qualified = 1;
 
 								if ($qualified)
 								{
@@ -488,9 +483,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 											$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
-									}
-									else
-									{
+									} else {
 										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 										$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 									}
@@ -515,102 +508,77 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 		{
 			$loopnb++; $newout = '';
 
-			if ($reg[1] == 'DAY') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
-			elseif ($reg[1] == 'MONTH') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['mon']; }
-			elseif ($reg[1] == 'YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = $tmp['year']; }
-			elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-			elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-			elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
-			elseif ($reg[1] == 'NEXT_DAY') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
-			elseif ($reg[1] == 'NEXT_MONTH') { $tmp = dol_getdate(dol_now(), true); $tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
-			elseif ($reg[1] == 'NEXT_YEAR') { $tmp = dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
-			elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
-			{
+			if ($reg[1] == 'DAY') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = $tmp['mday'];
+			} elseif ($reg[1] == 'MONTH') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = $tmp['mon'];
+			} elseif ($reg[1] == 'YEAR') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = $tmp['year'];
+			} elseif ($reg[1] == 'PREVIOUS_DAY') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+				$newout = $tmp2['day'];
+			} elseif ($reg[1] == 'PREVIOUS_MONTH') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_prev_month($tmp['mon'], $tmp['year']);
+				$newout = $tmp2['month'];
+			} elseif ($reg[1] == 'PREVIOUS_YEAR') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = ($tmp['year'] - 1);
+			} elseif ($reg[1] == 'NEXT_DAY') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']);
+				$newout = $tmp2['day'];
+			} elseif ($reg[1] == 'NEXT_MONTH') {
+				$tmp = dol_getdate(dol_now(), true);
+				$tmp2 = dol_get_next_month($tmp['mon'], $tmp['year']);
+				$newout = $tmp2['month'];
+			} elseif ($reg[1] == 'NEXT_YEAR') {
+				$tmp = dol_getdate(dol_now(), true);
+				$newout = ($tmp['year'] + 1);
+			} elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID') {
 				$newout = $mysoc->country_id;
-			}
-			elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
-			{
+			} elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID') {
 				$newout = $user->id;
-			}
-			elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
-			{
+			} elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID') {
 				$newout = $user->fk_user;
-			}
-			elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
-			{
+			} elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {
 				$newout = $conf->entity;
+			} else {
+				$newout = ''; // Key not found, we replace with empty string
 			}
-			else $newout = ''; // Key not found, we replace with empty string
 			//var_dump('__'.$reg[1].'__ -> '.$newout);
 			$out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);
 		}
 	}
 
-	// Check is done after replacement
-	switch ($check)
-	{
-		case 'none':
-			break;
-		case 'int':    // Check param is a numeric value (integer but also float or hexadecimal)
-			if (!is_numeric($out)) { $out = ''; }
-			break;
-		case 'intcomma':
-			if (preg_match('/[^0-9,-]+/i', $out)) $out = '';
-			break;
-		case 'alpha':
-			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('"', '../'), '', trim($out));
+	// Check rule
+	if (preg_match('/^array/', $check)) {	// If 'array' or 'array:restricthtml' or 'array:aZ09'
+		if (!is_array($out) || empty($out)) {
+			$out = array();
+		} else {
+			$tmparray = explode(':', $check);
+			if (!empty($tmparray[1])) {
+				$tmpcheck = $tmparray[1];
+			} else {
+				$tmpcheck = 'alphanohtml';
 			}
-			break;
-		case 'san_alpha':
-			$out = filter_var($out, FILTER_SANITIZE_STRING);
-			break;
-		case 'aZ':
-			if (!is_array($out))
-			{
-				$out = trim($out);
-				if (preg_match('/[^a-z]+/i', $out)) $out = '';
+			foreach ($out as $outkey => $outval) {
+				$out[$outkey] = checkVal($outval, $tmpcheck, $filter, $options);
 			}
-			break;
-		case 'aZ09':
-			if (!is_array($out))
-			{
-				$out = trim($out);
-				if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) $out = '';
-			}
-			break;
-		case 'aZ09comma':		// great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh
-			if (!is_array($out))
-			{
-				$out = trim($out);
-				if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) $out = '';
-			}
-			break;
-		case 'array':
-			if (!is_array($out) || empty($out)) $out = array();
-			break;
-		case 'nohtml':
-			$out = dol_string_nohtmltag($out, 0);
-			break;
-		case 'alphanohtml':	// Recommended for most scalar parameters and search parameters
-			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('"', '../'), '', trim($out));
-				$out = dol_string_nohtmltag($out, 0);
-			}
-			break;
-		case 'restricthtml':		// Recommended for most html textarea
-			$out = dol_string_onlythesehtmltags($out, 0);
-			break;
-		case 'custom':
-			if (empty($filter)) return 'BadFourthParameterForGETPOST';
-			$out = filter_var($out, $filter, $options);
-			break;
+		}
+	}
+	else {
+		$out = checkVal($out, $check, $filter, $options);
+	}
+
+	// Sanitizing for special parameters. There is no reason to allow the backtopage parameter to contains an external URL.
+	if ($paramname == 'backtopage') {
+		$out = str_replace('\\', '/', $out);
+		$out = preg_replace(array('/^\/\/+/', '/^[a-z]*:/i'), '', $out);
 	}
 
 	// Code for search criteria persistence.
@@ -636,24 +604,98 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 }
 
 
+/**
+ *  Return a value after checking on a rule.
+ *
+ *  @param  string  $out	     Value to get/check
+ *  @param  string  $check	     Type of check
+ *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
+ *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'
+ *  @return string|array         Value found (string or array), or '' if check fails
+ */
+function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)
+{
+	// Check is done after replacement
+	switch ($check)
+	{
+		case 'none':
+			break;
+		case 'int':    // Check param is a numeric value (integer but also float or hexadecimal)
+			if (!is_numeric($out)) { $out = ''; }
+			break;
+		case 'intcomma':
+			if (preg_match('/[^0-9,-]+/i', $out)) $out = '';
+			break;
+		case 'san_alpha':
+			$out = filter_var($out, FILTER_SANITIZE_STRING);
+			break;
+		case 'aZ':
+			if (!is_array($out))
+			{
+				$out = trim($out);
+				if (preg_match('/[^a-z]+/i', $out)) $out = '';
+			}
+			break;
+		case 'aZ09':
+			if (!is_array($out))
+			{
+				$out = trim($out);
+				if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) $out = '';
+			}
+			break;
+		case 'aZ09comma':		// great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh
+			if (!is_array($out))
+			{
+				$out = trim($out);
+				if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) $out = '';
+			}
+			break;
+		case 'nohtml':
+			$out = dol_string_nohtmltag($out, 0);
+			break;
+		case 'alpha':		// No html and no " and no ../
+		case 'alphanohtml':	// Recommended for most scalar parameters and search parameters
+			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));
+				$out = dol_string_nohtmltag($out, 0);
+			}
+			break;
+		case 'restricthtml':		// Recommended for most html textarea
+			$out = dol_string_onlythesehtmltags($out, 0);
+			// TODO We can also remove all javascripts reference
+			break;
+		case 'custom':
+			if (empty($filter)) return 'BadFourthParameterForGETPOST';
+			$out = filter_var($out, $filter, $options);
+			break;
+	}
+
+	return $out;
+}
+
+
+
 if (!function_exists('dol_getprefix'))
 {
-    /**
-     *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
-     *  The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir
-     *  or two instances in same virtual servers.
-     *
-     *  @param  string  $mode                   '' (prefix for session name) or 'email' (prefix for email id)
-     *  @return	string                          A calculated prefix
-     */
-    function dol_getprefix($mode = '')
-    {
-        global $conf;
+	/**
+	 *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
+	 *  The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir
+	 *  or two instances in same virtual servers.
+	 *
+	 *  @param  string  $mode                   '' (prefix for session name) or 'email' (prefix for email id)
+	 *  @return	string                          A calculated prefix
+	 */
+	function dol_getprefix($mode = '')
+	{
+		global $conf;
 
 		// If prefix is for email
 		if ($mode == 'email')
 		{
-		    if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
+			if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
 			{
 				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
 				elseif (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
@@ -746,8 +788,7 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 		{
 			if ($returnemptyifnotfound == 1 || !file_exists($res)) return '';
 		}
-	}
-	else				// For an url path
+	} else // For an url path
 	{
 		// We try to get local path of file on filesystem from url
 		// Note that trying to know if a file on disk exist by forging path on disk from url
@@ -824,9 +865,7 @@ function dol_clone($object, $native = 0)
 	if (empty($native))
 	{
 		$myclone = unserialize(serialize($object));
-	}
-	else
-	{
+	} else {
 		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)
 	}
 
@@ -917,11 +956,9 @@ function dol_string_unaccent($str)
 		);
 		$string = strtr($string, $replacements);
 		return rawurldecode($string);
-	}
-	else
-	{
+	} else {
 		// See http://www.ascii-code.com/
-        $string = strtr(
+		$string = strtr(
 			$str,
 			"\xC0\xC1\xC2\xC3\xC4\xC5\xC7
 			\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1
@@ -950,7 +987,7 @@ function dol_string_unaccent($str)
  *  @param  array	$badcharstoreplace  List of forbidden characters
  * 	@return string          			Cleaned string
  *
- * 	@see    		dol_sanitizeFilename(), dol_string_unaccent()
+ * 	@see    		dol_sanitizeFilename(), dol_string_unaccent(), dol_string_nounprintableascii()
  */
 function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')
 {
@@ -963,6 +1000,21 @@ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')
 }
 
 
+/**
+ *	Clean a string from all non printable ascii chars (0x00-0x1F and 0x7F). It removes also CR-LF
+ *  This can be used to sanitize a string and view its real content. Some hacks try to obfuscate attacks by inserting non printable chars.
+ *
+ *	@param	string	$str            	String to clean
+ * 	@return string          			Cleaned string
+ *
+ * 	@see    		dol_sanitizeFilename(), dol_string_unaccent(), dol_string_nospecial()
+ */
+function dol_string_nounprintableascii($str)
+{
+	return preg_replace('/[\x00-\x1F\x7F]/u', '', $str);
+}
+
+
 /**
  *  Returns text escaped for inclusion into javascript code
  *
@@ -977,10 +1029,8 @@ function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
 	$substitjs = array("&#039;"=>"\\'", "\r"=>'\\r');
 	//$substitjs['</']='<\/';	// We removed this. Should be useless.
 	if (empty($noescapebackslashn)) { $substitjs["\n"] = '\\n'; $substitjs['\\'] = '\\\\'; }
-	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; }
-	elseif ($mode == 1) $substitjs["'"] = "\\'";
-	elseif ($mode == 2) { $substitjs['"'] = '\\"'; }
-	elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
+	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; } elseif ($mode == 1) $substitjs["'"] = "\\'";
+	elseif ($mode == 2) { $substitjs['"'] = '\\"'; } elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
 	return strtr($stringtoescape, $substitjs);
 }
 
@@ -1073,16 +1123,16 @@ function dol_strtoupper($utf8_string)
  */
 function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = '', $restricttologhandler = '', $logcontext = null)
 {
-    global $conf, $user, $debugbar;
+	global $conf, $user, $debugbar;
 
 	// If syslog module enabled
 	if (empty($conf->syslog->enabled)) return;
 
 	// Check if we are into execution of code of a website
-	if (defined('USEEXTERNALSERVER') && ! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+	if (defined('USEEXTERNALSERVER') && !defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 		global $website, $websitekey;
-		if (is_object($website) && ! empty($website->ref)) $suffixinfilename.='_website_'.$website->ref;
-		elseif (! empty($websitekey)) $suffixinfilename.='_website_'.$websitekey;
+		if (is_object($website) && !empty($website->ref)) $suffixinfilename .= '_website_'.$website->ref;
+		elseif (!empty($websitekey)) $suffixinfilename .= '_website_'.$websitekey;
 	}
 
 	if ($ident < 0)
@@ -1107,9 +1157,9 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 
 		// If adding log inside HTML page is required
 		if ((!empty($_REQUEST['logtohtml']) && !empty($conf->global->MAIN_ENABLE_LOG_TO_HTML))
-		    || (!empty($user->rights->debugbar->read) && is_object($debugbar)))
+			|| (!empty($user->rights->debugbar->read) && is_object($debugbar)))
 		{
-		    $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$message;
+			$conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$message;
 		}
 
 		//TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output
@@ -1135,8 +1185,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 			// This is when server run behind a reverse proxy
 			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != $remoteip) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].' -> '.$data['ip'];
 			elseif (!empty($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != $remoteip) $data['ip'] = $_SERVER['HTTP_CLIENT_IP'].' -> '.$data['ip'];
-		}
-		// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
+		} // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
 		elseif (!empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
 		// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
 		elseif (!empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);
@@ -1160,6 +1209,38 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 	}
 }
 
+/**
+ *	Return HTML code to output a button to open a dialog popup box.
+ *  Such buttons must be included inside a HTML form.
+ *
+ *	@param	string	$name				A name for the html component
+ *	@param	string	$label 	    		Label of button
+ *	@param  string	$buttonstring  		button string
+ *	@param  string	$url				Url to open
+ *  @param	string	$disabled			Disabled text
+ * 	@return	string						HTML component with button
+ */
+function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '')
+{
+	//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
+	$out = '<a class="button bordertransp button_'.$name.'"'.$disabled.' title="'.dol_escape_htmltag($label).'">'.$buttonstring.'</a>';
+	$out .= '<script language="javascript">
+				 jQuery(document).ready(function () {
+					 jQuery(".button_'.$name.'").click(function () {
+						 var $dialog = $(\'<div></div>\').html(\'<iframe class="iframedialog" style="border: 0px;" src="'.DOL_URL_ROOT.$url.'" width="100%" height="98%"></iframe>\')
+						 .dialog({
+						 	autoOpen: false,
+						 	modal: true,
+						 	height: (window.innerHeight - 150),
+						 	width: \'80%\',
+						 	title: "'.dol_escape_js($label).'"
+						 });
+						 $dialog.dialog(\'open\');
+					 });
+				 });
+				 </script>';
+	return $out;
+}
 
 /**
  *	Show tab header of a card
@@ -1173,11 +1254,13 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
  *  @param	string	$morecss			More Css
  *  @param	int		$limittoshow		Limit number of tabs to show. Use 0 to use automatic default value.
+ *  @param	string	$moretabssuffix		A suffix to use when you have several dol_get_fiche_head() in same page
  * 	@return	void
+ *  @deprecated Use print dol_get_fiche_head() instead
  */
-function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0)
+function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0, $moretabssuffix = '')
 {
-	print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath, $morehtmlright, $morecss, $limittoshow);
+	print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath, $morehtmlright, $morecss, $limittoshow, $moretabssuffix);
 }
 
 /**
@@ -1192,9 +1275,10 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0
  *  @param	string	$morehtmlright		Add more html content on right of tabs title
  *  @param	string	$morecss			More Css
  *  @param	int		$limittoshow		Limit number of tabs to show. Use 0 to use automatic default value.
+ *  @param	string	$moretabssuffix		A suffix to use when you have several dol_get_fiche_head() in same page
  * 	@return	string
  */
-function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0)
+function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0, $moretabssuffix = '')
 {
 	global $conf, $langs, $hookmanager;
 
@@ -1202,7 +1286,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	$showtitle = 1;
 	if (!empty($conf->dol_optimize_smallscreen)) $showtitle = 0;
 
-	$out = "\n".'<!-- dol_get_fiche_head -->';
+	$out = "\n".'<!-- dol_fiche_head - dol_get_fiche_head -->';
 
 	if ((!empty($title) && $showtitle) || $morehtmlright || !empty($links)) {
 		$out .= '<div class="tabs'.($picto ? '' : ' nopaddingleft').'" data-role="controlgroup" data-type="horizontal">'."\n";
@@ -1254,8 +1338,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	{
 		if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {
 			$isactive = true;
-		}
-		else {
+		} else {
 			$isactive = false;
 		}
 
@@ -1267,13 +1350,10 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 				if (!empty($links[$i][0]))
 				{
 					$out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				}
-				else
-				{
+				} else {
 					$out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 				}
-			}
-			elseif (!empty($links[$i][1]))
+			} elseif (!empty($links[$i][1]))
 			{
 				//print "x $i $active ".$links[$i][2]." z";
 				if ($isactive)
@@ -1281,18 +1361,14 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 					$out .= $links[$i][1];
 					$out .= '</a>'."\n";
-				}
-				else
-				{
+				} else {
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 					$out .= $links[$i][1];
 					$out .= '</a>'."\n";
 				}
 			}
 			$out .= '</div>';
-		}
-		else
-		{
+		} else {
 			// The popup with the other tabs
 			if (!$popuptab)
 			{
@@ -1304,10 +1380,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 			{
 				if (!empty($links[$i][0]))
 					$outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				else
-					$outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
-			}
-			elseif (!empty($links[$i][1]))
+				else $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+			} elseif (!empty($links[$i][1]))
 			{
 				$outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 				$outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.
@@ -1325,18 +1399,28 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	{
 		$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 		$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+		$widthofpopup = 200;
 
-		$tabsname = str_replace("@", "", $picto);
+		$tabsname = $moretabssuffix;
+		if (empty($tabsname)) { $tabsname = str_replace("@", "", $picto); }
 		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
-		$out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">'.$langs->trans("More").'... ('.$nbintab.')</a>';
-		$out .= '<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
+		$out .= '<a href="#" class="tab moretab inline-block tabunactive">'.$langs->trans("More").'... ('.$nbintab.')</a>'; // Do not use "reposition" class in the "More".
+		$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
 		$out .= $outmore;
 		$out .= '</div>';
 		$out .= '<div></div>';
 		$out .= "</div>\n";
 
 		$out .= "<script>";
-		$out .= "$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";
+		$out .= "$('#moretabs".$tabsname."').mouseenter( function() {
+			var x = this.offsetLeft, y = this.offsetTop;
+			console.log('mouseenter ".$left." x='+x+' y='+y+' window.innerWidth='+window.innerWidth);
+			if ((window.innerWidth - x) < ".($widthofpopup + 10).") {
+				$('#moretabsList".$tabsname."').css('".$right."','8px');
+			}
+			$('#moretabsList".$tabsname."').css('".$left."','auto');
+			});
+		";
 		$out .= "$('#moretabs".$tabsname."').mouseleave( function() { console.log('mouseleave ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','-999em');});";
 		$out .= "</script>";
 	}
@@ -1439,20 +1523,16 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
 		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
 		if ($showimage) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
-		else
-		{
+		else {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
-			}
-			else {    // Show no photo link
+			} else {    // Show no photo link
 				$nophoto = '/public/theme/common/nophoto.png';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
 		}
-	}
-	elseif ($object->element == 'ticket')
-	{
+	} elseif ($object->element == 'ticket') {
 		$width = 80; $cssclass = 'photoref';
 		$showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
 		$maxvisiblephotos = (isset($conf->global->TICKET_MAX_VISIBLE_PHOTO) ? $conf->global->TICKET_MAX_VISIBLE_PHOTO : 2);
@@ -1463,9 +1543,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			if ($object->nbphoto > 0)
 			{
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$showphoto.'</div>';
-			}
-			else
-			{
+			} else {
 				$showimage = 0;
 			}
 		}
@@ -1474,15 +1552,12 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
-			}
-			else {    // Show no photo link
+			} else {    // Show no photo link
 				$nophoto = '/public/theme/common/nophoto.png';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'"></div>';
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if ($showimage)
 		{
 			if ($modulepart != 'unknown')
@@ -1497,9 +1572,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					{
 						$subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);
 						$subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end
-					}
-					else
-					{
+					} else {
 						$subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);
 					}
 					if (empty($subdir)) $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
@@ -1532,7 +1605,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 					if ($pdfexists && !$error)
 					{
-						$heightforphotref = 70;
+						$heightforphotref = 80;
 						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
 						// If the preview file is found
 						if (file_exists($fileimage))
@@ -1542,8 +1615,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 							$phototoshow .= '</div></div>';
 						}
 					}
-				}
-				elseif (!$phototoshow)
+				} elseif (!$phototoshow)
 				{
 					$phototoshow .= $form->showphoto($modulepart, $object, 0, 0, 0, 'photoref', 'small', 1, 0, $maxvisiblephotos);
 				}
@@ -1558,15 +1630,13 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 			if (!$phototoshow)      // Show No photo link (picto of object)
 			{
-			    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
+				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
 				if ($object->element == 'action')
 				{
 					$width = 80;
 					$cssclass = 'photorefcenter';
 					$nophoto = img_picto('No photo', 'title_agenda');
-				}
-				else
-				{
+				} else {
 					$width = 14; $cssclass = 'photorefcenter';
 					$picto = $object->picto;
 					if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub
@@ -1589,12 +1659,10 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
 		{
 		   	$morehtmlstatus .= ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
-		}
-		else {
+		} else {
 			$morehtmlstatus .= $object->getLibStatut(6);
 		}
-	}
-	elseif ($object->element == 'product')
+	} elseif ($object->element == 'product')
 	{
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
 		if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
@@ -1609,32 +1677,27 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		} else {
 			$morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(6, 1).'</span>';
 		}
-	}
-	elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
+	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan')))
 	{
 		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5, $object->totalpaye);
 		$morehtmlstatus .= $tmptxt;
-	}
-	elseif ($object->element == 'contrat' || $object->element == 'contract')
+	} elseif ($object->element == 'contrat' || $object->element == 'contract')
 	{
 		if ($object->statut == 0) $morehtmlstatus .= $object->getLibStatut(5);
 		else $morehtmlstatus .= $object->getLibStatut(4);
-	}
-	elseif ($object->element == 'facturerec')
+	} elseif ($object->element == 'facturerec')
 	{
 		if ($object->frequency == 0) $morehtmlstatus .= $object->getLibStatut(2);
 		else $morehtmlstatus .= $object->getLibStatut(5);
-	}
-	elseif ($object->element == 'project_task')
+	} elseif ($object->element == 'project_task')
 	{
 		$object->fk_statut = 1;
 		if ($object->progress > 0) $object->fk_statut = 2;
 		if ($object->progress >= 100) $object->fk_statut = 3;
 		$tmptxt = $object->getLibStatut(5);
 		$morehtmlstatus .= $tmptxt; // No status on task
-	}
-	else { // Generic case
+	} else { // Generic case
 		$tmptxt = $object->getLibStatut(6);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5);
 		$morehtmlstatus .= $tmptxt;
@@ -1671,7 +1734,8 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	}
 	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && ($conf->global->MAIN_SHOW_TECHNICAL_ID == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id))
 	{
-		$morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';
+		$morehtmlref .= '<div style="clear: both;"></div>';
+		$morehtmlref .= '<div class="refidno">';
 		$morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;
 		$morehtmlref .= '</div>';
 	}
@@ -1753,8 +1817,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;
-	}
-	elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
+	} elseif (in_array($object->country_code, array('GB', 'UK'))) // UK: title firstname name \n address lines \n town state \n zip \n country
 	{
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
@@ -1763,8 +1826,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;
-	}
-	elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
+	} elseif (in_array($object->country_code, array('ES', 'TR'))) // ES: title firstname name \n address lines \n zip town \n state \n country
 	{
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
@@ -1773,15 +1835,13 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		{
 			$ret .= "\n".$object->state;
 		}
-	}
-	elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
+	} elseif (in_array($object->country_code, array('IT'))) // IT: tile firstname name\n address lines \n zip (Code Departement) \n country
 	{
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($town ? (($object->zip ? ' ' : '').$town) : '');
 		$ret .= ($object->state_code ? (' '.($object->state_code)) : '');
-	}
-	else                                        		// Other: title firstname name \n address lines \n zip town \n country
+	} else // Other: title firstname name \n address lines \n zip town \n country
 	{
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';
@@ -1815,8 +1875,7 @@ function dol_strftime($fmt, $ts = false, $is_gmt = false)
 {
 	if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
 		return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);
-	}
-	else return 'Error date into a not supported range';
+	} else return 'Error date into a not supported range';
 }
 
 /**
@@ -1858,8 +1917,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 				$offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
 				$offsettz = 0;
 				$offsetdst = 0;
-			}
-			elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
+			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
 			{
 				$to_gmt = true;
 				$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
@@ -1922,35 +1980,31 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 	$reg = array();
 	if (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', $time, $reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
 	{
-	    dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
-	    return '';
-	}
-	elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
+		dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
+		return '';
+	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
 	{
-	    // This part of code should not be used.
-	    dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
-	    //if (function_exists('debug_print_backtrace')) debug_print_backtrace();
-	    // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
-	    $syear	= (!empty($reg[1]) ? $reg[1] : '');
-	    $smonth = (!empty($reg[2]) ? $reg[2] : '');
-	    $sday	= (!empty($reg[3]) ? $reg[3] : '');
-	    $shour	= (!empty($reg[4]) ? $reg[4] : '');
-	    $smin	= (!empty($reg[5]) ? $reg[5] : '');
-	    $ssec	= (!empty($reg[6]) ? $reg[6] : '');
+		// This part of code should not be used.
+		dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
+		//if (function_exists('debug_print_backtrace')) debug_print_backtrace();
+		// Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
+		$syear	= (!empty($reg[1]) ? $reg[1] : '');
+		$smonth = (!empty($reg[2]) ? $reg[2] : '');
+		$sday	= (!empty($reg[3]) ? $reg[3] : '');
+		$shour	= (!empty($reg[4]) ? $reg[4] : '');
+		$smin	= (!empty($reg[5]) ? $reg[5] : '');
+		$ssec	= (!empty($reg[6]) ? $reg[6] : '');
 
-	    $time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
-	    $ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
-	}
-	else
-	{
+		$time = dol_mktime($shour, $smin, $ssec, $smonth, $sday, $syear, true);
+		$ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
+	} else {
 		// Date is a timestamps
 		if ($time < 100000000000)	// Protection against bad date values
 		{
 			$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 			$ret = adodb_strftime($format, $timetouse, $to_gmt);
-		}
-		else $ret = 'Bad value '.$time.' for date';
+		} else $ret = 'Bad value '.$time.' for date';
 	}
 
 	if (preg_match('/__b__/i', $format))
@@ -1964,9 +2018,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 		{
 			$monthtext = $outputlangs->transnoentities('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);
-		}
-		else
-		{
+		} else {
 			$monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);
 		}
@@ -2034,9 +2086,7 @@ function dol_getdate($timestamp, $fast = false)
 	if ($usealternatemethod)
 	{
 		$arrayinfo = adodb_getdate($timestamp, $fast);
-	}
-	else
-	{
+	} else {
 		$arrayinfo = getdate($timestamp);
 	}
 
@@ -2087,28 +2137,23 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = false, $
 	{
 		$default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'
 		$localtz = new DateTimeZone($default_timezone);
-	}
-	elseif ($gm === 'user')
+	} elseif ($gm === 'user')
 	{
 		// We use dol_tz_string first because it is more reliable.
 		$default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'
 		try {
 			$localtz = new DateTimeZone($default_timezone);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
 			$default_timezone = @date_default_timezone_get();
 		}
-	}
-	elseif (strrpos($gm, "tz,") !== false)
+	} elseif (strrpos($gm, "tz,") !== false)
 	{
 		$timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'
-		try
-		{
+		try {
 			$localtz = new DateTimeZone($timezone);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
 		}
@@ -2147,8 +2192,7 @@ function dol_now($mode = 'gmt')
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time
 		$ret = (int) (dol_now('gmt') + ($tzsecond * 3600));
-	}
-	/*elseif ($mode == 'tzref')				// Time for now with parent company timezone is added
+	} /*elseif ($mode == 'tzref')				// Time for now with parent company timezone is added
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time
@@ -2187,16 +2231,13 @@ function dol_print_size($size, $shortvalue = 0, $shortunit = 0)
 		$ret = $size;
 		$textunitshort = $langs->trans("b");
 		$textunitlong = $langs->trans("Bytes");
-	}
-	else
-	{
+	} else {
 		$ret = round($size / $level, 0);
 		$textunitshort = $langs->trans("Kb");
 		$textunitlong = $langs->trans("KiloBytes");
 	}
 	// Use long or short text unit
-	if (empty($shortunit)) { $ret .= ' '.$textunitlong; }
-	else { $ret .= ' '.$textunitshort; }
+	if (empty($shortunit)) { $ret .= ' '.$textunitlong; } else { $ret .= ' '.$textunitshort; }
 
 	return $ret;
 }
@@ -2270,9 +2311,7 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
 			if ($link) $newemail = '<div>'.$newemail.' '.$link.'</div>';
 		}
-	}
-	else
-	{
+	} else {
 		if ($showinvalid && !isValidEmail($email))
 		{
 			$langs->load("errors");
@@ -2302,23 +2341,23 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
  */
 function getArrayOfSocialNetworks()
 {
-    global $conf, $db;
-    $sql = "SELECT rowid, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
-    $sql .= " WHERE entity=".$conf->entity;
-    $socialnetworks = array();
-    $resql = $db->query($sql);
-    if ($resql) {
-        while ($obj = $db->fetch_object($resql)) {
-            $socialnetworks[$obj->code] = array(
-                'rowid' => $obj->rowid,
-                'label' => $obj->label,
-                'url' => $obj->url,
-                'icon' => $obj->icon,
-                'active' => $obj->active,
-            );
-        }
-    }
-    return $socialnetworks;
+	global $conf, $db;
+	$sql = "SELECT rowid, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
+	$sql .= " WHERE entity=".$conf->entity;
+	$socialnetworks = array();
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$socialnetworks[$obj->code] = array(
+				'rowid' => $obj->rowid,
+				'label' => $obj->label,
+				'url' => $obj->url,
+				'icon' => $obj->icon,
+				'active' => $obj->active,
+			);
+		}
+	}
+	return $socialnetworks;
 }
 
 /**
@@ -2364,9 +2403,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type)
 			$htmllink .= ($link ? ' '.$link : '');
 		}
 		$htmllink .= '</div>';
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		$htmllink .= img_warning($langs->trans("ErrorBadSocialNetworkValue", $value));
 	}
@@ -2406,289 +2443,241 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		// France
 		if (dol_strlen($phone) == 10) {
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);
-		}
-		elseif (dol_strlen($phone) == 7)
+		} elseif (dol_strlen($phone) == 7)
 		{
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);
-		}
-		elseif (dol_strlen($phone) == 9)
+		} elseif (dol_strlen($phone) == 9)
 		{
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-
-	elseif (strtoupper($countrycode) == "CA")
+	} elseif (strtoupper($countrycode) == "CA")
 	{
 		if (dol_strlen($phone) == 10) {
 			$newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PT")
+	} elseif (strtoupper($countrycode) == "PT")
 	{//Portugal
 		if (dol_strlen($phone) == 13)
 		{//ex: +351_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SR")
+	} elseif (strtoupper($countrycode) == "SR")
 	{//Suriname
 		if (dol_strlen($phone) == 10)
 		{//ex: +597_ABC_DEF
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +597_ABC_DEFG
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DE")
+	} elseif (strtoupper($countrycode) == "DE")
 	{//Allemagne
 		if (dol_strlen($phone) == 14)
 		{//ex:  +49_ABCD_EFGH_IJK
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +49_ABC_DEFG_HIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ES")
+	} elseif (strtoupper($countrycode) == "ES")
 	{//Espagne
 		if (dol_strlen($phone) == 12)
 		{//ex:  +34_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BF")
+	} elseif (strtoupper($countrycode) == "BF")
 	{// Burkina Faso
 		if (dol_strlen($phone) == 12)
 		{//ex :  +22 A BC_DE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "RO")
+	} elseif (strtoupper($countrycode) == "RO")
 	{// Roumanie
 		if (dol_strlen($phone) == 12)
 		{//ex :  +40 AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TR")
+	} elseif (strtoupper($countrycode) == "TR")
 	{//Turquie
 		if (dol_strlen($phone) == 13)
 		{//ex :  +90 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "US")
+	} elseif (strtoupper($countrycode) == "US")
 	{//Etat-Unis
 		if (dol_strlen($phone) == 12)
 		{//ex: +1 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MX")
+	} elseif (strtoupper($countrycode) == "MX")
 	{//Mexique
 		if (dol_strlen($phone) == 12)
 		{//ex: +52 ABCD_EFG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 11)
+		} elseif (dol_strlen($phone) == 11)
 		{//ex: +52 AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +52 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ML")
+	} elseif (strtoupper($countrycode) == "ML")
 	{//Mali
 		if (dol_strlen($phone) == 12)
 		{//ex: +223 AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TH")
+	} elseif (strtoupper($countrycode) == "TH")
 	{//Thaïlande
 		if (dol_strlen($phone) == 11)
 		{//ex: +66_ABC_DE_FGH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{//ex: +66_A_BCD_EF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MU")
+	} elseif (strtoupper($countrycode) == "MU")
 	{
-        //Maurice
+		//Maurice
 		if (dol_strlen($phone) == 11)
 		{//ex: +230_ABC_DE_FG
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{//ex: +230_ABCD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "ZA")
+	} elseif (strtoupper($countrycode) == "ZA")
 	{//Afrique du sud
 		if (dol_strlen($phone) == 12)
 		{//ex: +27_AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "SY")
+	} elseif (strtoupper($countrycode) == "SY")
 	{//Syrie
 		if (dol_strlen($phone) == 12)
 		{//ex: +963_AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +963_AB_CD_EF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "AE")
+	} elseif (strtoupper($countrycode) == "AE")
 	{//Emirats Arabes Unis
 		if (dol_strlen($phone) == 12)
 		{//ex: +971_ABC_DEF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +971_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
-		}
-		elseif (dol_strlen($phone) == 14)
+		} elseif (dol_strlen($phone) == 14)
 		{//ex: +971_ABC_DEF_GHIK
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "DZ")
+	} elseif (strtoupper($countrycode) == "DZ")
 	{//Algérie
 		if (dol_strlen($phone) == 13)
 		{//ex: +213_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "BE")
+	} elseif (strtoupper($countrycode) == "BE")
 	{//Belgique
 		if (dol_strlen($phone) == 11)
 		{//ex: +32_ABC_DE_FGH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
-		}
-		elseif (dol_strlen($phone) == 12)
+		} elseif (dol_strlen($phone) == 12)
 		{//ex: +32_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "PF")
+	} elseif (strtoupper($countrycode) == "PF")
 	{//Polynésie française
 		if (dol_strlen($phone) == 12)
 		{//ex: +689_AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CO")
+	} elseif (strtoupper($countrycode) == "CO")
 	{//Colombie
 		if (dol_strlen($phone) == 13)
 		{//ex: +57_ABC_DEF_GH_IJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "JO")
+	} elseif (strtoupper($countrycode) == "JO")
 	{//Jordanie
 		if (dol_strlen($phone) == 12)
 		{//ex: +962_A_BCD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "JM")
+	} elseif (strtoupper($countrycode) == "JM")
 	{//Jamaïque
 		if (dol_strlen($newphone) == 12)
 		{//ex: +1867_ABC_DEFG
 			$newphone = substr($newphone, 0, 5).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MG")
+	} elseif (strtoupper($countrycode) == "MG")
 	{//Madagascar
 		if (dol_strlen($phone) == 13)
 		{//ex: +261_AB_CD_EF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GB")
+	} elseif (strtoupper($countrycode) == "GB")
 	{//Royaume uni
 		if (dol_strlen($phone) == 13)
 		{//ex: +44_ABCD_EFG_HIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "CH")
+	} elseif (strtoupper($countrycode) == "CH")
 	{//Suisse
 		if (dol_strlen($phone) == 12)
 		{//ex: +41_AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
-		}
-		elseif (dol_strlen($phone) == 15)
+		} elseif (dol_strlen($phone) == 15)
 		{// +41_AB_CDE_FGH_IJKL
 			$newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);
 		}
-	}
-	elseif (strtoupper($countrycode) == "TN")
+	} elseif (strtoupper($countrycode) == "TN")
 	{//Tunisie
 		if (dol_strlen($phone) == 12)
 		{//ex: +216_AB_CDE_FGH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GF")
+	} elseif (strtoupper($countrycode) == "GF")
 	{//Guyane francaise
 		if (dol_strlen($phone) == 13)
 		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "GP")
+	} elseif (strtoupper($countrycode) == "GP")
 	{//Guadeloupe
 		if (dol_strlen($phone) == 13)
 		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "MQ")
+	} elseif (strtoupper($countrycode) == "MQ")
 	{//Martinique
 		if (dol_strlen($phone) == 13)
 		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "IT")
+	} elseif (strtoupper($countrycode) == "IT")
 	{//Italie
 		if (dol_strlen($phone) == 12)
 		{//ex: +39_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
-		}
-		elseif (dol_strlen($phone) == 13)
+		} elseif (dol_strlen($phone) == 13)
 		{//ex: +39_ABC_DEF_GH_IJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	}
-	elseif (strtoupper($countrycode) == "AU")
+	} elseif (strtoupper($countrycode) == "AU")
 	{
-        //Australie
+		//Australie
 		if (dol_strlen($phone) == 12)
 		{
-            //ex: +61_A_BCDE_FGHI
+			//ex: +61_A_BCDE_FGHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);
 		}
 	}
@@ -2699,8 +2688,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			$newphoneform = $newphone;
 			$newphone = '<a href="tel:'.$phone.'"';
 			$newphone .= '>'.$newphoneform.'</a>';
-		}
-		elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
+		} elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
 		{
 			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
 
@@ -2753,9 +2741,9 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		if ($withpicto) {
 			if ($withpicto == 'fax') {
 				$picto = 'phoning_fax';
-			}elseif ($withpicto == 'phone') {
+			} elseif ($withpicto == 'phone') {
 				$picto = 'phoning';
-			}elseif ($withpicto == 'mobile') {
+			} elseif ($withpicto == 'mobile') {
 				$picto = 'phoning_mobile';
 			} else {
 				$picto = '';
@@ -2794,11 +2782,8 @@ function dol_print_ip($ip, $mode = 0)
 			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png'))
 			{
 				$ret .= ' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"), DOL_URL_ROOT.'/theme/common/flags/'.$countrycode.'.png', '', 1);
-			}
-			else $ret .= ' ('.$countrycode.')';
-		}
-		else
-		{
+			} else $ret .= ' ('.$countrycode.')';
+		} else {
 			// Nothing
 		}
 	}
@@ -2816,7 +2801,15 @@ function dol_print_ip($ip, $mode = 0)
  */
 function getUserRemoteIP()
 {
-	$ip = empty($_SERVER['HTTP_X_FORWARDED_FOR']) ? (empty($_SERVER['HTTP_CLIENT_IP']) ? (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']) : $_SERVER['HTTP_CLIENT_IP']) : $_SERVER['HTTP_X_FORWARDED_FOR'];
+	if (empty($_SERVER['HTTP_X_FORWARDED_FOR']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_X_FORWARDED_FOR'])) {
+		if (empty($_SERVER['HTTP_CLIENT_IP']) || preg_match('/[^0-9\.\:,\[\]]/', $_SERVER['HTTP_CLIENT_IP'])) {
+			$ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']);
+		} else {
+			$ip = $_SERVER['HTTP_CLIENT_IP']; // value is clean here
+		}
+	} else {
+		$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; // value is clean here
+	}
 	return $ip;
 }
 
@@ -3020,20 +3013,14 @@ function dol_substr($string, $start, $length, $stringencoding = '', $trunconbyte
 		if (function_exists('mb_substr'))
 		{
 			$ret = mb_substr($string, $start, $length, $stringencoding);
-		}
-		else
-		{
+		} else {
 			$ret = substr($string, $start, $length);
 		}
-	}
-	else
-	{
+	} else {
 		if (function_exists('mb_strcut'))
 		{
 			$ret = mb_strcut($string, $start, $length, $stringencoding);
-		}
-		else
-		{
+		} else {
 			$ret = substr($string, $start, $length);
 		}
 	}
@@ -3070,11 +3057,9 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');
-		else
-		//return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
+		else //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;
 		return $string;
-	}
-	elseif ($trunc == 'middle')
+	} elseif ($trunc == 'middle')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1))
@@ -3082,27 +3067,20 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 			$size1 = round($size / 2);
 			$size2 = round($size / 2);
 			return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);
-		}
-		else
-		return $string;
-	}
-	elseif ($trunc == 'left')
+		} else return $string;
+	} elseif ($trunc == 'left')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...
 		return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
-		else
-		return $string;
-	}
-	elseif ($trunc == 'wrap')
+		else return $string;
+	} elseif ($trunc == 'wrap')
 	{
 		$newstring = dol_textishtml($string) ?dol_string_nohtmltag($string, 1) : $string;
 		if (dol_strlen($newstring, $stringencoding) > ($size + 1))
 		return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
-		else
-		return $string;
-	}
-	else return 'BadParam3CallingDolTrunc';
+		else return $string;
+	} else return 'BadParam3CallingDolTrunc';
 }
 
 /**
@@ -3142,113 +3120,112 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		$fullpathpicto = $picto;
 		$reg = array();
 		if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {
-		    $morecss .= ($morecss ? ' ' : '').$reg[1];
-		    $moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
+			$morecss .= ($morecss ? ' ' : '').$reg[1];
+			$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
 		}
 	} else {
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
-
-        if (empty($srconly) && in_array($pictowithouttext, array(
-        		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
-        		'accountancy', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
-        		'cash-register', 'category', 'check', 'close_title', 'company', 'contact', 'contract', 'cubes',
-        		'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', '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', 'help',
-        		'intervention', 'label', 'language', 'list', 'listlight', 'lot',
-        		'map-marker-alt', 'money-bill-alt', 'mrp', 'note',
-        		'object_accounting', 'object_action', 'object_account', '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',
-        		'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
-        		'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
-        		'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
-        		'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
-        		'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
-        		'object_shipment', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
-        		'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
-        		'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
-        		'off', 'on', 'order',
-        		'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
-				'setup', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
+		if (empty($srconly) && in_array($pictowithouttext, array(
+				'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',
+				'help', 'holiday',
+				'intervention', 'label', 'language', 'list', 'listlight', 'lot',
+				'map-marker-alt', 'money-bill-alt', 'mrp', 'note', 'next',
+				'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
+				'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
+				'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
+				'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice',
+				'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label',
+				'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment',
+				'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal',
+				'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask',
+				'object_recruitmentjobposition', 'object_recruitmentcandidature',
+				'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock',
+				'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
+				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
+				'off', 'on', 'order',
+				'paiment', 'play', 'playdisabled', 'previous', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
+				'setup', 'share-alt', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
-				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
-        		'home', 'hrm', 'companies', 'products', 'commercial', 'invoicing', 'pencil-ruler', 'preview', 'project', 'projectpub', 'supplier_invoice', 'members', 'ticket', 'generic',
-        		'error', 'warning', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
-        		'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
+				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
+				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
+				'payment', 'pencil-ruler', 'preview', 'project', 'projectpub', 'refresh', 'supplier_invoice', 'ticket',
+				'error', 'warning',
+				'recruitmentcandidature', 'recruitmentjobposition', 'resource',
+				'supplier_proposal', 'supplier_order', 'supplier_invoice',
+				'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
 			)
 		)) {
 			$fakey = $pictowithouttext;
 			$facolor = ''; $fasize = '';
 			$fa = 'fas';
-			if (in_array($pictowithouttext, array('object_generic', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
+			if (in_array($pictowithouttext, array('clock', 'object_generic', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) {
 				$fa = 'far';
 			}
-			if (in_array($pictowithouttext, array('skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
+			if (in_array($pictowithouttext, array('black-tie', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) {
 				$fa = 'fab';
 			}
 
 			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 
-		    $arrayconvpictotofa = array(
-		    	'account'=>'university', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'address'=> 'address-book',
-		    	'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
-		    	'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
-		    	'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
-		    	'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
-		    	'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
-		    	'email'=>'at',
-		    	'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'info-circle',
-		    	'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',
-		    	'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',
-		    	'sign-out'=>'sign-out-alt',
-		    	'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
-		    	'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
-		    	'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
-		    	'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
-		    	'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
-		    	'other'=>'square',
-		    	'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+			$arrayconvpictotofa = array(
+				'account'=>'university', 'accountline'=>'receipt', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book',
+				'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes',
+				'company'=>'building', 'contact'=>'address-book', 'contract'=>'suitcase', 'conversation'=>'comments', 'donation'=>'file-alt', 'dynamicprice'=>'hand-holding-usd',
+				'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins',
+				'accounting'=>'chart-line', 'category'=>'tag', 'dollyrevert'=>'dolly',
+				'hrm'=>'user-tie', 'margin'=>'calculator', 'members'=>'users', 'ticket'=>'ticket-alt', 'globe'=>'external-link-alt', 'lot'=>'barcode',
+				'email'=>'at',
+				'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
+				'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',
+				'member'=>'users', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
+				'trip'=>'wallet', 'group'=>'users',
+				'sign-out'=>'sign-out-alt',
+				'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
+				'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
+				'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
+				'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
+				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
+				'other'=>'square',
+				'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
+				'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
-		    	'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
-		    	'resource'=>'laptop-house',
-		    	'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
-		    	'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
-		    	'title_agenda'=>'calendar-alt',
-		    	'uparrow'=>'mail-forward', 'vcard'=>'address-card',
-		    	'jabber'=>'comment-o',
-		    	'website'=>'globe-americas'
-		    );
+				'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+				'refresh'=>'redo', 'resource'=>'laptop-house',
+				'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
+				'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
+				'title_agenda'=>'calendar-alt',
+				'uparrow'=>'mail-forward', 'vcard'=>'address-card',
+				'jabber'=>'comment-o',
+				'website'=>'globe-americas'
+			);
 			if ($pictowithouttext == 'off') {
-			    $fakey = 'fa-square';
+				$fakey = 'fa-square';
 				$fasize = '1.3em';
-			}
-			elseif ($pictowithouttext == 'on') {
-			    $fakey = 'fa-check-square';
+			} elseif ($pictowithouttext == 'on') {
+				$fakey = 'fa-check-square';
 				$fasize = '1.3em';
-			}
-			elseif ($pictowithouttext == 'listlight') {
+			} elseif ($pictowithouttext == 'listlight') {
 				$fakey = 'fa-download';
 				$marginleftonlyshort = 1;
-			}
-			elseif ($pictowithouttext == 'printer') {
+			} elseif ($pictowithouttext == 'printer') {
 				$fakey = 'fa-print';
 				$fasize = '1.2em';
-			}
-			elseif ($pictowithouttext == 'note') {
-			    $fakey = 'fa-sticky-note';
+			} elseif ($pictowithouttext == 'note') {
+				$fakey = 'fa-sticky-note';
 				$marginleftonlyshort = 1;
-			}
-			elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
-			    $convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
-			    $fakey = 'fa-'.$convertarray[$pictowithouttext];
-			    if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
+			} elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
+				$convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
+				$fakey = 'fa-'.$convertarray[$pictowithouttext];
+				if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
 				$marginleftonlyshort = 1;
-			}
-			elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
+			} elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
 			{
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
-			}
-			else {
+			} else {
 				$fakey = 'fa-'.$pictowithouttext;
 			}
 
@@ -3264,7 +3241,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			// Add CSS
 			$arrayconvpictotomorcess = array(
-				'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account',
+				'action'=>'infobox-action', 'account'=>'infobox-bank_account', 'accountline'=>'infobox-bank_account', 'accountancy'=>'infobox-bank_account',
 				'bank_account'=>'bg-infobox-bank_account',
 				'bill'=>'infobox-commande', 'billa'=>'infobox-commande', 'billd'=>'infobox-commande',
 				'cash-register'=>'infobox-bank_account', 'contract'=>'infobox-contrat', 'check'=>'font-status4', 'conversation'=>'infobox-contrat',
@@ -3277,6 +3254,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4',
 				'holiday'=>'infobox-holiday', 'invoice'=>'infobox-commande',
 				'payment'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'project'=>'infobox-project', 'projecttask'=>'infobox-project', 'propal'=>'infobox-propal',
+				'recruitmentjobposition'=>'infobox-adherent', 'recruitmentcandidature'=>'infobox-adherent',
 				'resource'=>'infobox-action',
 				'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',
 				'supplier_order'=>'infobox-order_supplier', 'supplier_proposal'=>'infobox-supplier_proposal',
@@ -3290,9 +3268,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 			// Define $color
 			$arrayconvpictotocolor = array(
-				'address'=>'#37a', 'building'=>'#37a', 'bom'=>'#a69944',
-				'companies'=>'#37a', 'company'=>'#37a', 'contact'=>'#37a', 'dynamicprice'=>'#a69944',
-				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'listlight'=>'#999',
+				'address'=>'#6c6aa8', 'building'=>'#6c6aa8', 'bom'=>'#a69944',
+				'companies'=>'#6c6aa8', 'company'=>'#6c6aa8', 'contact'=>'#37a', 'dynamicprice'=>'#a69944',
+				'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'help'=>'#bbb', 'listlight'=>'#999',
 				'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944',
 				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944',
 				'other'=>'#ddd',
@@ -3305,20 +3283,20 @@ 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.
-            $reg = array();
+			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
+			$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];
-                $moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
-            }
-            $moreatt = trim($moreatt);
+				$morecss .= ($morecss ? ' ' : '').$reg[1];
+				$moreatt = str_replace('class="'.$reg[1].'"', '', $moreatt);
+			}
+			if (preg_match('/style="([^"]+)"/', $moreatt, $reg)) {
+				$morestyle = ' '.$reg[1];
+				$moreatt = str_replace('style="'.$reg[1].'"', '', $moreatt);
+			}
+			$moreatt = trim($moreatt);
 
-            $enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
-            $enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
+			$enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
+			$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$enabledisablehtml .= $titlealt;
 			}
@@ -3329,11 +3307,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 		if (!empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) {
 			$path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module
-		}
-		elseif (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
+		} elseif (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
 			$path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme
-		}
-		elseif (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {
+		} elseif (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {
 			$path = $theme.'/theme/'.$theme; // If the theme have the same name as the module
 		}
 
@@ -3369,7 +3345,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		return $fullpathpicto;
 	}
 		// tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for blind people
-    return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup
+	return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt.($morecss ? ' class="'.$morecss.'"' : '') : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup
 }
 
 /**
@@ -3406,13 +3382,13 @@ function img_weather($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $mo
 {
 	global $conf;
 
-	if (is_numeric($picto))
-	{
-		$leveltopicto = array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');
-		//return '<i class="fa fa-weather-level'.$picto.'"></i>';
-		$picto = $leveltopicto[$picto];
+	if (is_numeric($picto)) {
+		//$leveltopicto = array(0=>'weather-clear.png', 1=>'weather-few-clouds.png', 2=>'weather-clouds.png', 3=>'weather-many-clouds.png', 4=>'weather-storm.png');
+		//$picto = $leveltopicto[$picto];
+		return '<i class="fa fa-weather-level'.$picto.'"></i>';
+	} elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+		$picto .= '.png';
 	}
-	elseif (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
 
 	$path = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/weather/'.$picto;
 
@@ -3436,8 +3412,7 @@ function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0
 	if (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
 
 	if ($pictoisfullpath) $path = $picto;
-	else
-	{
+	else {
 		$path = DOL_URL_ROOT.'/theme/common/'.$picto;
 
 		if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS))
@@ -3456,24 +3431,42 @@ function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0
  *
  *	@param	string		$titlealt       Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title.
  *	@param  string		$numaction   	Action id or code to show
+ *	@param 	string		$picto      	Name of image file to show ('filenew', ...)
+ *                                      If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory.
+ *                                      Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
+ *                                      Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
+ *                                      Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
  *	@return string      				Return an img tag
  */
-function img_action($titlealt, $numaction)
+function img_action($titlealt, $numaction, $picto = '')
 {
 	global $langs;
 
 	if (empty($titlealt) || $titlealt == 'default')
 	{
-		if ($numaction == '-1' || $numaction == 'ST_NO') { $numaction = -1; $titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact'); }
-		elseif ($numaction == '0' || $numaction == 'ST_NEVER') { $numaction = 0; $titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted'); }
-		elseif ($numaction == '1' || $numaction == 'ST_TODO') { $numaction = 1; $titlealt = $langs->transnoentitiesnoconv('ChangeToContact'); }
-		elseif ($numaction == '2' || $numaction == 'ST_PEND') { $numaction = 2; $titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess'); }
-		elseif ($numaction == '3' || $numaction == 'ST_DONE') { $numaction = 3; $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone'); }
-		else { $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction); $numaction = 0; }
+		if ($numaction == '-1' || $numaction == 'ST_NO') {
+			$numaction = -1;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact');
+		} elseif ($numaction == '0' || $numaction == 'ST_NEVER') {
+			$numaction = 0;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeNeverContacted');
+		} elseif ($numaction == '1' || $numaction == 'ST_TODO') {
+			$numaction = 1;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeToContact');
+		} elseif ($numaction == '2' || $numaction == 'ST_PEND') {
+			$numaction = 2;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeContactInProcess');
+		} elseif ($numaction == '3' || $numaction == 'ST_DONE') {
+			$numaction = 3;
+			$titlealt = $langs->transnoentitiesnoconv('ChangeContactDone');
+		} else {
+			$titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction);
+			$numaction = 0;
+		}
 	}
 	if (!is_numeric($numaction)) $numaction = 0;
 
-	return img_picto($titlealt, 'stcomm'.$numaction.'.png');
+	return img_picto($titlealt, !empty($picto) ? $picto : 'stcomm'.$numaction.'.png');
 }
 
 /**
@@ -3754,7 +3747,9 @@ function img_left($titlealt = 'default', $selected = 0, $moreatt = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Left');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Left');
+	}
 
 	return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);
 }
@@ -3797,21 +3792,29 @@ function img_allow($allow, $titlealt = 'default')
 /**
  *	Return image of a credit card according to its brand name
  *
- *	@param	string	$brand		Brand name of credit card
- *  @param	string	$morecss	More CSS
+ *	@param  string	$brand		Brand name of credit card
+ *  @param  string	$morecss	More CSS
  *	@return string     			Return img tag
  */
 function img_credit_card($brand, $morecss = null)
 {
 	if (is_null($morecss)) $morecss = 'fa-2x';
 
-	if ($brand == 'visa' || $brand == 'Visa') {$brand = 'cc-visa'; }
-	elseif ($brand == 'mastercard' || $brand == 'MasterCard') {$brand = 'cc-mastercard'; }
-	elseif ($brand == 'amex' || $brand == 'American Express') {$brand = 'cc-amex'; }
-	elseif ($brand == 'discover' || $brand == 'Discover') {$brand = 'cc-discover'; }
-	elseif ($brand == 'jcb' || $brand == 'JCB') {$brand = 'cc-jcb'; }
-	elseif ($brand == 'diners' || $brand == 'Diners club') {$brand = 'cc-diners-club'; }
-	elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {$brand = 'credit-card'; }
+	if ($brand == 'visa' || $brand == 'Visa') {
+		$brand = 'cc-visa';
+	} elseif ($brand == 'mastercard' || $brand == 'MasterCard') {
+		$brand = 'cc-mastercard';
+	} elseif ($brand == 'amex' || $brand == 'American Express') {
+		$brand = 'cc-amex';
+	} elseif ($brand == 'discover' || $brand == 'Discover') {
+		$brand = 'cc-discover';
+	} elseif ($brand == 'jcb' || $brand == 'JCB') {
+		$brand = 'cc-jcb';
+	} elseif ($brand == 'diners' || $brand == 'Diners club') {
+		$brand = 'cc-diners-club';
+	} elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {
+		$brand = 'credit-card';
+	}
 
 	return '<span class="fa fa-'.$brand.' fa-fw'.($morecss ? ' '.$morecss : '').'"></span>';
 }
@@ -3899,15 +3902,14 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
 	if ($infoonimgalt)
 	{
 		$result = img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');
-	}
-	else {
+	} else {
 		if (empty($conf->use_javascript_ajax)) $textfordropdown = '';
 
 		$class = (empty($admin) ? 'undefined' : ($admin == '1' ? 'info' : $admin));
 		$result = ($nodiv ? '' : '<div class="'.$class.' hideonsmartphone'.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');
 
 		if ($textfordropdown) {
-			$tmpresult .= '<span class="'.$class.'text opacitymedium">'.$langs->trans($textfordropdown).' '.img_picto($langs->trans($textfordropdown), '1downarrow').'</span>';
+			$tmpresult .= '<span class="'.$class.'text opacitymedium cursorpointer">'.$langs->trans($textfordropdown).' '.img_picto($langs->trans($textfordropdown), '1downarrow').'</span>';
 			$tmpresult .= '<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
 					jQuery(".'.$class.'text").click(function() {
@@ -3944,20 +3946,21 @@ function dol_print_error($db = '', $error = '', $errors = null)
 	$out = '';
 	$syslog = '';
 
-	// Si erreur intervenue avant chargement langue
+	// If error occurs before the $lang object was loaded
 	if (!$langs)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 		$langs = new Translate('', $conf);
 		$langs->load("main");
 	}
-	// Load translation files required by the page
-    $langs->loadLangs(array('main', 'errors'));
+
+	// Load translation files required by the error messages
+	$langs->loadLangs(array('main', 'errors'));
 
 	if ($_SERVER['DOCUMENT_ROOT'])    // Mode web
 	{
 		$out .= $langs->trans("DolibarrHasDetectedError").".<br>\n";
-		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $out .= "You use an experimental or develop level of features, so please do NOT report any bugs or vulnerability, except if problem is confirmed after moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
 		$out .= $langs->trans("InformationToHelpDiagnose").":<br>\n";
 
 		$out .= "<b>".$langs->trans("Date").":</b> ".dol_print_date(time(), 'dayhourlog')."<br>\n";
@@ -3967,21 +3970,20 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		{
 			$out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
 		}
-		$out .= "<b>".$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
+		$out .= "<b>".$langs->trans("Server").":</b> ".dol_htmlentities($_SERVER["SERVER_SOFTWARE"])."<br>\n";
 		if (function_exists("php_uname"))
 		{
 			$out .= "<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";
 		}
-		$out .= "<b>".$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";
+		$out .= "<b>".$langs->trans("UserAgent").":</b> ".dol_htmlentities($_SERVER["HTTP_USER_AGENT"], ENT_COMPAT, 'UTF-8')."<br>\n";
 		$out .= "<br>\n";
 		$out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";
-		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ?dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";
-		$out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu) ? $conf->standard_menu : '')."<br>\n";
+		$out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";
+		$out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu) ? dol_htmlentities($conf->standard_menu) : '')."<br>\n";
 		$out .= "<br>\n";
 		$syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);
 		$syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);
-	}
-	else                              // Mode CLI
+	} else // Mode CLI
 	{
 		$out .= '> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";
 		$syslog .= "pid=".dol_getmypid();
@@ -3989,7 +3991,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 
 	if (!empty($conf->modules))
 	{
-	    $out .= "<b>".$langs->trans("Modules").":</b> ".join(', ', $conf->modules)."<br>\n";
+		$out .= "<b>".$langs->trans("Modules").":</b> ".join(', ', $conf->modules)."<br>\n";
 	}
 
 	if (is_object($db))
@@ -3997,12 +3999,11 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
 		{
 			$out .= "<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
-			$out .= "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror() ?dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ?dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
-			$out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ?dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out .= "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror() ? dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ? dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
+			$out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ? dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out .= "<br>\n";
-		}
-		else                            // Mode CLI
+		} else // Mode CLI
 		{
 			// No dol_escape_htmltag for output, we are in CLI mode
 			$out .= '> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";
@@ -4030,8 +4031,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 			if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
 			{
 				$out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";
-			}
-			else                        // Mode CLI
+			} else // Mode CLI
 			{
 				$out .= '> '.$langs->transnoentities("Message").":\n".$msg."\n";
 			}
@@ -4048,16 +4048,22 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		$out .= "<br>\n";
 	}
 
-	if (empty($dolibarr_main_prod)) print $out;
-	else	// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
-	{
+	// Return a http error code if possible
+	if (!headers_sent()) {
+		http_response_code(500);
+	}
+
+	if (empty($dolibarr_main_prod)) {
+		print $out;
+	} else {
+		// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
 		print 'This website or feature is currently temporarly not available or failed after a technical error.<br><br>This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";
 		$langs->load("errors");
 		print $langs->trans("DolibarrHasDetectedError").'. ';
 		print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");
 		define("MAIN_CORE_ERROR", 1);
 	}
-	//else print 'Sorry, an error occured but the parameter $dolibarr_main_prod is defined in conf file so no message is reported to your browser. Please read the log file for error message.';
+
 	dol_syslog("Error ".$syslog, LOG_ERR);
 }
 
@@ -4155,20 +4161,18 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	//var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);
 	// If field is used as sort criteria we use a specific css class liste_titre_sel
 	// Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")
+	$liste_titre = 'liste_titre';
 	if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) {
-		$out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib;
-		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
-		$out .= '>';
-	}
-	else {
-		$out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib;
-		$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
-		$out .= '>';
+		$liste_titre = 'liste_titre_sel';
 	}
+	$out .= '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
+	//$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
+	$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
+	$out .= '>';
 
 	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
 	{
-		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);
+		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
 		$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
 		$options = preg_replace('/&+/i', '&', $options);
 		if (!preg_match('/^&/', $options)) $options = '&'.$options;
@@ -4179,20 +4183,16 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 			if (preg_match('/^DESC/i', $sortorder))
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
-			}
-			else		// We reverse the var $sortordertouseinlink
+			} else // We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
-		}
-		else                        // We are on field that is the first current sorting criteria
+		} else // We are on field that is the first current sorting criteria
 		{
 			if (preg_match('/^ASC/i', $sortorder))	// We reverse the var $sortordertouseinlink
 			{
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
-			}
-			else
-			{
+			} else {
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
 		}
@@ -4212,7 +4212,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 
 	if (empty($thead) && $field)    // If this is a sort field
 	{
-		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', $moreparam);
+		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
 		$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
 		$options = preg_replace('/&+/i', '&', $options);
 		if (!preg_match('/^&/', $options)) $options = '&'.$options;
@@ -4221,9 +4221,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		{
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
-		}
-		else
-		{
+		} else {
 			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';
@@ -4330,15 +4328,16 @@ function load_fiche_titre($titre, $morehtmlright = '', $picto = 'generic', $pict
  *	@param	int|string  $totalnboflines		Total number of records/lines for all pages (if known). Use a negative value of number to not show number. Use '' if unknown.
  *	@param	string	    $picto				Icon to use before title (should be a 32x32 transparent png file)
  *	@param	int		    $pictoisfullpath	1=Icon name is a full absolute url of image
- *  @param	string	    $morehtmlright		More html to show
+ *  @param	string	    $morehtmlright		More html to show (after arrows)
  *  @param  string      $morecss            More css to the table
  *  @param  int         $limit              Max number of lines (-1 = use default, 0 = no limit, > 0 = limit).
  *  @param  int         $hideselectlimit    Force to hide select limit
  *  @param  int         $hidenavigation     Force to hide all navigation tools
  *  @param  int			$pagenavastextinput 1=Do not suggest list of pages to navigate but suggest the page number into an input field.
+ *  @param	string		$morehtmlrightbeforearrow	More html to show (before arrows)
  *	@return	void
  */
-function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'generic', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0, $pagenavastextinput = 0)
+function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', $sortorder = '', $morehtmlcenter = '', $num = -1, $totalnboflines = '', $picto = 'generic', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limit = -1, $hideselectlimit = 0, $hidenavigation = 0, $pagenavastextinput = 0, $morehtmlrightbeforearrow = '')
 {
 	global $conf, $langs;
 
@@ -4352,9 +4351,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
 	{
 		$nextpage = 1;
-	}
-	else
-	{
+	} else {
 		$nextpage = 0;
 	}
 	//print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;
@@ -4379,6 +4376,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 
 	// Right
 	print '<td class="nobordernopadding valignmiddle right">';
+	print '<input type="hidden" name="pageplusoneold" value="'.($page+1).'">';
 	if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);
 	if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);
 	// Show navigation bar
@@ -4404,8 +4402,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 				}
 			}
 
-			do
-			{
+			do {
 				if ($pagenavastextinput) {
 					if ($cpt == $page)
 					{
@@ -4417,15 +4414,12 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 					if ($cpt == $page)
 					{
 						$pagelist .= '<li class="pagination"><span class="active">'.($page + 1).'</span></li>';
-					}
-					else
-					{
+					} else {
 						$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';
 					}
 				}
 				$cpt++;
-			}
-			while ($cpt < $nbpages && $cpt <= ($page + $maxnbofpage));
+			} while ($cpt < $nbpages && $cpt <= ($page + $maxnbofpage));
 
 			if (empty($pagenavastextinput)) {
 				if ($cpt < $nbpages)
@@ -4440,15 +4434,13 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 					$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
 				//}
 			}
-		}
-		else
-		{
+		} else {
 			$pagelist .= '<li class="pagination"><span class="active">'.($page + 1)."</li>";
 		}
 	}
 
-	if ($savlimit || $morehtmlright) {
-		print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist
+	if ($savlimit || $morehtmlright || $morehtmlrightbeforearrow) {
+		print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit, $morehtmlrightbeforearrow); // output the div and ul for previous/last completed with page numbers into $pagelist
 	}
 
 	// js to autoselect page field on focus
@@ -4474,13 +4466,20 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
  *  @param  int             $limit              Max nb of record to show  (-1 = no combo with limit, 0 = no limit, > 0 = limit)
  *	@param	int		        $totalnboflines		Total number of records/lines for all pages (if known)
  *  @param  int             $hideselectlimit    Force to hide select limit
+ *  @param	string			$beforearrows		HTML content to show before arrows. Must NOT contains '<li> </li>' tags.
  *	@return	void
  */
-function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $betweenarrows = '', $afterarrows = '', $limit = -1, $totalnboflines = 0, $hideselectlimit = 0)
+function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $betweenarrows = '', $afterarrows = '', $limit = -1, $totalnboflines = 0, $hideselectlimit = 0, $beforearrows = '')
 {
 	global $conf, $langs;
 
 	print '<div class="pagination"><ul>';
+	if ($beforearrows)
+	{
+		print '<li class="paginationbeforearrows">';
+		print $beforearrows;
+		print '</li>';
+	}
 	if ((int) $limit > 0 && empty($hideselectlimit))
 	{
 		$pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';
@@ -4529,7 +4528,7 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
 	}
 	if ($page > 0)
 	{
-		print '<li class="pagination paginationpage"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
+		print '<li class="pagination paginationpage paginationpageleft"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
 	}
 	if ($betweenarrows)
 	{
@@ -4539,7 +4538,7 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
 	}
 	if ($nextpage > 0)
 	{
-		print '<li class="pagination paginationpage"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
+		print '<li class="pagination paginationpage paginationpageright"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
 	}
 	if ($afterarrows)
 	{
@@ -4583,8 +4582,7 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)
 
 	// If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
 	if (!preg_match('/\//', $rate)) $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');
-	else
-	{
+	else {
 		// TODO Split on / and output with a price2num to have clean numbers without ton of 000.
 		$ret = $rate.($addpercent ? '%' : '');
 	}
@@ -4673,10 +4671,8 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 		$listoflanguagesbefore = array('nl_NL');
 		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))
 		{
-		    $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
-		}
-		else
-		{
+			$cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+		} else {
 			$tmpcur = $outlangs->getCurrencySymbol($currency_code);
 			$cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);
 		}
@@ -4799,18 +4795,15 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
 	{
 		$dimension = $dimension * 1000000;
 		$unit = $unit - 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
+	} elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
 	{
 		$dimension = $dimension * 1000;
 		$unit = $unit - 3;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
 	{
 		$dimension = $dimension / 1000000;
 		$unit = $unit + 6;
-	}
-	elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
 	{
 		$dimension = $dimension / 1000;
 		$unit = $unit + 3;
@@ -4876,9 +4869,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
 				if (!$thirdparty_buyer->localtax1_assuj) return 0;
-			}
-			else
-			{
+			} else {
 				if (!$thirdparty_seller->localtax1_assuj) return 0;
 			}
 		}
@@ -4890,15 +4881,11 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 			if ($thirdparty_seller->id == $mysoc->id)
 			{
 				if (!$thirdparty_buyer->localtax2_assuj) return 0;
-			}
-			else
-			{
+			} else {
 				if (!$thirdparty_seller->localtax2_assuj) return 0;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) return 0;
 		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) return 0;
 	}
@@ -4920,8 +4907,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 				{
 					return $thirdparty_seller->localtax1_value;
 				}
-			}
-			else  // i am the seller
+			} else // i am the seller
 			{
 				if (!isOnlyOneLocalTax($local))  // TODO If seller is me, why not always returning this, even if there is only one locatax vat.
 				{
@@ -4938,15 +4924,12 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 				{
 					return $thirdparty_seller->localtax2_value;
 				}
-			}
-			else  // i am the seller
+			} else // i am the seller
 			{
 				if (in_array($mysoc->country_code, array('ES')))
 				{
 					return $thirdparty_buyer->localtax2_value;
-				}
-				else
-				{
+				} else {
 					return $conf->global->MAIN_INFO_VALUE_LOCALTAX2;
 				}
 			}
@@ -4956,10 +4939,10 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 	// By default, search value of local tax on line of common tax
 	$sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
    	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-   	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";
+   	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($thirdparty_seller->country_code)."'";
    	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if ($vatratecode) $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority
-   	else $sql .= " AND t.recuperableonly ='".$vatnpr."'";
+   	if ($vatratecode) $sql .= " AND t.code ='".$db->escape($vatratecode)."'"; // If we have the code, we use it in priority
+   	else $sql .= " AND t.recuperableonly ='".$db->escape($vatnpr)."'";
    	dol_syslog("get_localtax", LOG_DEBUG);
    	$resql = $db->query($sql);
 
@@ -4991,9 +4974,7 @@ function isOnlyOneLocalTax($local)
 	if (count($valors) > 1)
 	{
 		return false;
-	}
-	else
-	{
+	} else {
 		return true;
 	}
 }
@@ -5009,9 +4990,9 @@ function get_localtax_by_third($local)
 	global $db, $mysoc;
 	$sql = "SELECT t.localtax1, t.localtax2 ";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";
-	$sql .= " WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";
+	$sql .= " WHERE c.code = '".$db->escape($mysoc->country_code)."' AND t.active = 1 AND t.taux=(";
 	$sql .= "  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";
-	$sql .= "  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";
+	$sql .= "  WHERE c.code = '".$db->escape($mysoc->country_code)."' AND tt.active = 1";
 	$sql .= "  )";
 
 	$resql = $db->query($sql);
@@ -5047,8 +5028,7 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 	$sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
 	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else
-	{
+	else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
@@ -5058,11 +5038,11 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 		}
 
 		$sql .= ", ".MAIN_DB_PREFIX."c_country as c";
-		/*if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // vat in spain use the buyer country ??
-		else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";*/
-		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		/*if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($buyer->country_code)."'";    // vat in spain use the buyer country ??
+		else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($seller->country_code)."'";*/
+		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($seller->country_code)."'";
 		$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql .= " AND t.code = '".$vatratecode."'";
+		if ($vatratecode) $sql .= " AND t.code = '".$db->escape($vatratecode)."'";
 	}
 
 	$resql = $db->query($sql);
@@ -5071,8 +5051,7 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 		$obj = $db->fetch_object($resql);
 		if ($obj) return array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'rate'=>$obj->rate, 'npr'=>$obj->npr, 'accountancy_code_sell'=>$obj->accountancy_code_sell, 'accountancy_code_buy'=>$obj->accountancy_code_buy);
 		else return array();
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	return array();
 }
@@ -5103,8 +5082,7 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 	$sql  = "SELECT t.taux as rate, t.code, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";
 	if ($firstparamisid) $sql .= " WHERE t.rowid = ".(int) $vatrate;
-	else
-	{
+	else {
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		$reg = array();
@@ -5115,10 +5093,10 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 		}
 
 		$sql .= ", ".MAIN_DB_PREFIX."c_country as c";
-		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??
-		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";
+		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($buyer->country_code)."'"; // local tax in spain use the buyer country ??
+		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($seller->country_code)."'";
 		$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql .= " AND t.code = '".$vatratecode."'";
+		if ($vatratecode) $sql .= " AND t.code = '".$db->escape($vatratecode)."'";
 	}
 
 	$resql = $db->query($sql);
@@ -5131,13 +5109,10 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 		if ($local == 1)
 		{
 			return array($obj->localtax1_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		}
-		elseif ($local == 2)
+		} elseif ($local == 2)
 		{
 			return array($obj->localtax2_type, get_localtax($vateratestring, $local, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
-		}
-		else
-		{
+		} else {
 			return array($obj->localtax1_type, get_localtax($vateratestring, 1, $buyer, $seller), $obj->localtax2_type, get_localtax($vateratestring, 2, $buyer, $seller), $obj->accountancy_code_sell, $obj->accountancy_code_buy);
 		}
 	}
@@ -5177,16 +5152,12 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 				$product->get_buyprice($idprodfournprice, 0, 0, 0);
 				$ret = $product->vatrate_supplier;
 				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
-			}
-			else
-			{
+			} else {
 				$ret = $product->tva_tx; // Default vat of product we defined
 				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
 			}
 			$found = 1;
-		}
-		else
-		{
+		} else {
 			// TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.
 			// May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on
 		}
@@ -5199,7 +5170,7 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 			// If vat of product for the country not found or not defined, we return the first higher vat of country.
 			$sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-			$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
+			$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$db->escape($thirdparty_seller->country_code)."'";
 			$sql .= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";
 			$sql .= $db->plimit(1);
 
@@ -5213,10 +5184,8 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 					if ($obj->default_vat_code) $ret .= ' ('.$obj->default_vat_code.')';
 				}
 				$db->free($sql);
-			}
-			else dol_print_error($db);
-		}
-		else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
+			} else dol_print_error($db);
+		} else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
 	}
 
 	dol_syslog("get_product_vat_for_country: ret=".$ret);
@@ -5256,9 +5225,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 			elseif ($local==2) $ret=$product->localtax2_tx;
 			$found=1;
 			*/
-		}
-		else
-		{
+		} else {
 			// TODO Read default product vat according to countrycode and product
 		}
 	}
@@ -5268,7 +5235,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 		// If vat of product for the country not found or not defined, we return higher vat of country.
 		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";
+		$sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$db->escape($thirdparty_seller->country_code)."'";
 		$sql .= " ORDER BY t.taux DESC, t.recuperableonly ASC";
 		$sql .= $db->plimit(1);
 
@@ -5281,8 +5248,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 				if ($local == 1) $ret = $obj->localtax1;
 				elseif ($local == 2) $ret = $obj->localtax2;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 
 	dol_syslog("get_product_localtax_for_country: ret=".$ret);
@@ -5362,9 +5328,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		{
 			//print 'VATRULE 3';
 			return 0;
-		}
-		else
-		{
+		} else {
 			//print 'VATRULE 4';
 			return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 		}
@@ -5404,8 +5368,7 @@ function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 		$prodprice = new ProductFournisseur($db);
 		$prodprice->fetch_product_fournisseur_price($idprodfournprice);
 		return $prodprice->fourn_tva_npr;
-	}
-	elseif ($idprod > 0)
+	} elseif ($idprod > 0)
 	{
 		if (!class_exists('Product')) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -5443,15 +5406,12 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id
 		if ($mysoc->country_code == 'ES')
 		{
 			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) return 0;
-		}
-		else
-		{
+		} else {
 			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
 			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) return 0;
 			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') return 0;
 		}
-	}
-	elseif ($local == 2) //I Localtax 2
+	} elseif ($local == 2) //I Localtax 2
 	{
 		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
 		if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) return 0;
@@ -5486,8 +5446,7 @@ function yn($yesno, $case = 1, $color = 0)
 		if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
 
 		$classname = 'ok';
-	}
-	elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
+	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
 	{
 		$result = $langs->trans("no");
 		if ($case == 1 || $case == 3) $result = $langs->trans("No");
@@ -5533,14 +5492,12 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart)
 		if ($level == 1) $path = substr($num, 0, 1);
 		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);
 		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
-	}
-	else
-	{
+	} else {
 		// TODO
 		// We will enhance here a common way of forging path for document storage
 		// Here, object->id, object->ref and modulepart are required.
 		//var_dump($modulepart);
-        if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice',
+		if (in_array($modulepart, array('thirdparty', 'contact', 'member', 'propal', 'proposal', 'commande', 'order', 'facture', 'invoice',
 			'supplier_order', 'supplier_proposal', 'shipment', 'contract', 'expensereport', 'ficheinter')))
 		{
 			$path = ($object->ref ? $object->ref : $object->id);
@@ -5607,16 +5564,12 @@ function dol_mkdir($dir, $dataroot = '', $newmask = null)
 					// Si le is_dir a renvoye une fausse info, alors on passe ici.
 					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);
 					$nberr++;
-				}
-				else
-				{
+				} else {
 					dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);
 					$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore
 					$nbcreated++;
 				}
-			}
-			else
-			{
+			} else {
 				$nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignores
 			}
 		}
@@ -5649,30 +5602,31 @@ function picto_required()
  *  @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)
  *	@return string	    				String cleaned
  *
- * 	@see	dol_escape_htmltag() strip_tags() dol_string_onlythesehtmltags() dol_string_neverthesehtmltags()
+ * 	@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)
 {
 	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, $pagecodeto);
+
 	if ($strip_tags) {
 		$temp = strip_tags($temp);
 	} else {
 		$pattern = "/<[^<>]+>/";
-		// Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>
+		// Example of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>
 		$temp = preg_replace($pattern, "", $temp); // pass 1
 		// $temp after pass 1: <a href="/myurl" title="A title">0000-021
 		$temp = preg_replace($pattern, "", $temp); // pass 2
 		// $temp after pass 2: 0000-021
 	}
 
-	$temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
-
-	// Supprime aussi les retours
+	// Remove also CR LF
 	if ($removelinefeed == 1) $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
 
-	// et les espaces doubles
+	// and double spaces
 	while (strpos($temp, "  "))
 	{
 		$temp = str_replace("  ", " ", $temp);
@@ -5685,25 +5639,29 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
  *	Clean a string to keep only desirable HTML tags.
  *
  *	@param	string	$stringtoclean			String to clean
- *  @param	string	$cleanalsosomestyles	Clean also some tags
+ *  @param	boolean	$cleanalsosomestyles	Remove absolute/fixed positioning from inline styles
+ *  @param	boolean	$removeclassattribute	Remove the class attribute from tags
  *	@return string	    					String cleaned
  *
  * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_neverthesehtmltags()
  */
-function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1)
+function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1, $removeclassattribute = 1)
 {
 	$allowed_tags = array(
 		"html", "head", "meta", "body", "article", "a", "abbr", "b", "blockquote", "br", "cite", "div", "dl", "dd", "dt", "em", "font", "img", "ins", "hr", "i", "li", "link",
 		"ol", "p", "q", "s", "section", "span", "strike", "strong", "title", "table", "tr", "th", "td", "u", "ul", "sup", "sub", "blockquote", "pre", "h1", "h2", "h3", "h4", "h5", "h6"
 	);
+
 	$allowed_tags_string = join("><", $allowed_tags);
-	$allowed_tags_string = preg_replace('/^>/', '', $allowed_tags_string);
-	$allowed_tags_string = preg_replace('/<$/', '', $allowed_tags_string);
 	$allowed_tags_string = '<'.$allowed_tags_string.'>';
 
 	if ($cleanalsosomestyles) {
-		$stringtoclean = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/', '', $stringtoclean); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
+		$stringtoclean = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $stringtoclean); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
 	}
+	if ($removeclassattribute) {
+		$stringtoclean = preg_replace('/(<[^>]+)\s+class=((["\']).*?\\3|\\w*)/i', '\\1', $stringtoclean);
+	}
+	// TODO Remove '/href=("|\'|)javascript/' string ?
 
 	$temp = strip_tags($stringtoclean, $allowed_tags_string);
 
@@ -5755,29 +5713,23 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 		{
 			$firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters
 			$firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters
-		}
-		else
-		{
+		} else {
 			$firstline = preg_replace('/[\n\r].*/', '', $text);
 		}
 		return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');
-	}
-	else
-	{
+	} else {
 		$ishtml = 0;
 		if (dol_textishtml($text))
 		{
 			$text = preg_replace('/\n/', '', $text);
 			$ishtml = 1;
 			$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
-		}
-		else
-		{
+		} else {
 			$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
 		}
 
 		$text = strtr($text, $repTable);
-		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
+		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
 		else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
 		$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
@@ -5844,9 +5796,7 @@ function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UT
 		$newstring = strtr($newstring, array('&'=>'__and__', '<'=>'__lt__', '>'=>'__gt__', '"'=>'__dquot__'));
 		$newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding
 		$newstring = strtr($newstring, array('__and__'=>'&', '__lt__'=>'<', '__gt__'=>'>', '__dquot__'=>'"'));
-	}
-	else
-	{
+	} else {
 		if ($removelasteolbr) $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
 		$newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);
 	}
@@ -5890,7 +5840,7 @@ function dol_htmlcleanlastbr($stringtodecode)
  * @param   string	$a					Operand a
  * @param   string	$b					Operand b (ENT_QUOTES=convert simple and double quotes)
  * @param   string	$c					Operand c
- * @param	string	$keepsomeentities	Entities but &amp;, <, >, " are not converted.
+ * @param	string	$keepsomeentities	Entities but &, <, >, " are not converted.
  * @return  string						String decoded
  */
 function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0)
@@ -5935,9 +5885,7 @@ function dol_string_is_good_iso($s, $clean = 0)
 	{
 		$ordchar = ord($s[$scursor]);
 		//print $scursor.'-'.$ordchar.'<br>';
-		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok = 0; break; }
-		elseif ($ordchar > 126 && $ordchar < 160) { $ok = 0; break; }
-		elseif ($clean) {
+		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok = 0; break; } elseif ($ordchar > 126 && $ordchar < 160) { $ok = 0; break; } elseif ($clean) {
 			$out .= $s[$scursor];
 		}
 	}
@@ -5978,7 +5926,7 @@ function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')
 	if (dol_textishtml($text)) $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
 
 	$text = strtr($text, $repTable);
-	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; }	// /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
+	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
 	else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
 	$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
@@ -6022,9 +5970,7 @@ function dol_textishtml($msg, $option = 0)
 		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
 		elseif (preg_match('/<br/i', $msg))				return true;
 		return false;
-	}
-	else
-	{
+	} else {
 		if (preg_match('/<html/i', $msg))				return true;
 		elseif (preg_match('/<body/i', $msg))			return true;
 		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
@@ -6059,18 +6005,18 @@ function dol_textishtml($msg, $option = 0)
  */
 function dol_concatdesc($text1, $text2, $forxml = false, $invert = false)
 {
-    if (!empty($invert))
-    {
-            $tmp = $text1;
-            $text1 = $text2;
-            $text2 = $tmp;
-    }
+	if (!empty($invert))
+	{
+			$tmp = $text1;
+			$text1 = $text2;
+			$text2 = $tmp;
+	}
 
-    $ret = '';
-    $ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1;
-    $ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "<br \>\n" : "<br>\n") : "\n") : "";
-    $ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2;
-    return $ret;
+	$ret = '';
+	$ret .= (!dol_textishtml($text1) && dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text1, 0, 1, '', 1), 0, $forxml) : $text1;
+	$ret .= (!empty($text1) && !empty($text2)) ? ((dol_textishtml($text1) || dol_textishtml($text2)) ? ($forxml ? "<br \>\n" : "<br>\n") : "\n") : "";
+	$ret .= (dol_textishtml($text1) && !dol_textishtml($text2)) ? dol_nl2br(dol_escape_htmltag($text2, 0, 1, '', 1), 0, $forxml) : $text2;
+	return $ret;
 }
 
 
@@ -6096,21 +6042,16 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		// Add SIGNATURE into substitutionarray first, so, when we will make the substitution,
 		// this will include signature content first and then replace var found into content of signature
 		$signature = $user->signature;
-        $substitutionarray = array_merge($substitutionarray, array(
-		'__USER_SIGNATURE__' => (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '')
+		$substitutionarray = array_merge($substitutionarray, array(
+			'__USER_SIGNATURE__' => (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '')
 		)
 			);
-		// For backward compatibility
-		if ($onlykey != 2)
-		{
-			$substitutionarray['__SIGNATURE__'] = (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '');
-		}
 
-        $substitutionarray = array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 		'__USER_ID__' => (string) $user->id,
 		'__USER_LOGIN__' => (string) $user->login,
-        '__USER_EMAIL__' => (string) $user->email,
-        '__USER_LASTNAME__' => (string) $user->lastname,
+		'__USER_EMAIL__' => (string) $user->email,
+		'__USER_LASTNAME__' => (string) $user->lastname,
 		'__USER_FIRSTNAME__' => (string) $user->firstname,
 		'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
 		'__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'),
@@ -6120,7 +6061,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 	}
 	if ((empty($exclude) || !in_array('mycompany', $exclude)) && is_object($mysoc))
 	{
-        $substitutionarray = array_merge($substitutionarray, array(
+		$substitutionarray = array_merge($substitutionarray, array(
 			'__MYCOMPANY_NAME__'    => $mysoc->name,
 			'__MYCOMPANY_EMAIL__'   => $mysoc->email,
 			'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
@@ -6136,8 +6077,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			'__MYCOMPANY_TOWN__'    => $mysoc->town,
 			'__MYCOMPANY_COUNTRY__'    => $mysoc->country,
 			'__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id,
-        	'__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code,
-        	'__MYCOMPANY_CURRENCY_CODE__' => $conf->currency
+			'__MYCOMPANY_COUNTRY_CODE__' => $mysoc->country_code,
+			'__MYCOMPANY_CURRENCY_CODE__' => $conf->currency
 		));
 	}
 
@@ -6153,7 +6094,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__NOTE_PRIVATE__'] = '__NOTE_PRIVATE__';
 			$substitutionarray['__EXTRAFIELD_XXX__'] = '__EXTRAFIELD_XXX__';
 
-			if (!empty($conf->societe->enabled))
+			if (!empty($conf->societe->enabled))	// Most objects are concerned
 			{
 				$substitutionarray['__THIRDPARTY_ID__'] = '__THIRDPARTY_ID__';
 				$substitutionarray['__THIRDPARTY_NAME__'] = '__THIRDPARTY_NAME__';
@@ -6176,7 +6117,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = '__THIRDPARTY_NOTE_PUBLIC__';
 				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = '__THIRDPARTY_NOTE_PRIVATE__';
 			}
-			if (!empty($conf->adherent->enabled))
+			if (!empty($conf->adherent->enabled) && (!is_object($object) || $object->element == 'adherent'))
 			{
 				$substitutionarray['__MEMBER_ID__'] = '__MEMBER_ID__';
 				$substitutionarray['__MEMBER_CIVILITY__'] = '__MEMBER_CIVILITY__';
@@ -6185,7 +6126,13 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				/*$substitutionarray['__MEMBER_NOTE_PUBLIC__'] = '__MEMBER_NOTE_PUBLIC__';
 				$substitutionarray['__MEMBER_NOTE_PRIVATE__'] = '__MEMBER_NOTE_PRIVATE__';*/
 			}
-			if (!empty($conf->projet->enabled))
+			if (!empty($conf->recruitment->enabled) && (!is_object($object) || $object->element == 'candidature'))
+			{
+				$substitutionarray['__CANDIDATE_FULLNAME__'] = '__CANDIDATE_FULLNAME__';
+				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = '__CANDIDATE_FIRSTNAME__';
+				$substitutionarray['__CANDIDATE_LASTNAME__'] = '__CANDIDATE_LASTNAME__';
+			}
+			if (!empty($conf->projet->enabled))		// Most objects
 			{
 				$substitutionarray['__PROJECT_ID__'] = '__PROJECT_ID__';
 				$substitutionarray['__PROJECT_REF__'] = '__PROJECT_REF__';
@@ -6193,7 +6140,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				/*$substitutionarray['__PROJECT_NOTE_PUBLIC__'] = '__PROJECT_NOTE_PUBLIC__';
 				$substitutionarray['__PROJECT_NOTE_PRIVATE__'] = '__PROJECT_NOTE_PRIVATE__';*/
 			}
-			if (!empty($conf->contrat->enabled))
+			if (!empty($conf->contrat->enabled) && (!is_object($object) || $object->element == 'contract'))
 			{
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = 'Highest date planned for a service start';
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = 'Highest date and hour planned for service start';
@@ -6212,14 +6159,12 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = 'Direct download url of an order';
 			$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = 'Direct download url of an invoice';
 
-			if (!empty($conf->expedition->enabled))
+			if (!empty($conf->expedition->enabled) && (!is_object($object) || $object->element == 'shipping'))
 			{
-			    $substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number';
+				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tacking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 			}
-		}
-		else
-		{
+		} else {
 			$substitutionarray['__ID__'] = $object->id;
 			$substitutionarray['__REF__'] = $object->ref;
 			$substitutionarray['__REF_CLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
@@ -6239,26 +6184,27 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 
 			$birthday = dol_print_date($object->birth, 'day');
 
-			if ($object->id > 0)
+			if (is_object($object) && ($object->element == 'adherent' || $object->element == 'member') && $object->id > 0)
 			{
-				$substitutionarray['__MEMBER_ID__'] = $object->id;
+				$substitutionarray['__MEMBER_ID__'] = (isset($object->id) ? $object->id : '');
 				if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
-				$substitutionarray['__MEMBER_FIRSTNAME__'] = $object->firstname;
-				$substitutionarray['__MEMBER_LASTNAME__'] = $object->lastname;
+				$substitutionarray['__MEMBER_FIRSTNAME__'] = (isset($object->firstname) ? $object->firstname : '');
+				$substitutionarray['__MEMBER_LASTNAME__'] = (isset($object->lastname) ? $object->lastname : '');
 				if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs);
-				$substitutionarray['__MEMBER_COMPANY__'] = $object->societe;
-				$substitutionarray['__MEMBER_ADDRESS__'] = $object->address;
-				$substitutionarray['__MEMBER_ZIP__'] = $object->zip;
-				$substitutionarray['__MEMBER_TOWN__'] = $object->town;
-				$substitutionarray['__MEMBER_COUNTRY__'] = $object->country;
-				$substitutionarray['__MEMBER_EMAIL__'] = $object->email;
-				$substitutionarray['__MEMBER_BIRTH__'] = $birthday;
-				$substitutionarray['__MEMBER_PHOTO__'] = $object->photo;
-				$substitutionarray['__MEMBER_LOGIN__'] = $object->login;
-				$substitutionarray['__MEMBER_PASSWORD__'] = $object->pass;
-				$substitutionarray['__MEMBER_PHONE__'] = $object->phone;
-				$substitutionarray['__MEMBER_PHONEPRO__'] = $object->phone_perso;
-				$substitutionarray['__MEMBER_PHONEMOBILE__'] = $object->phone_mobile;
+				$substitutionarray['__MEMBER_COMPANY__'] = (isset($object->societe) ? $object->societe : '');
+				$substitutionarray['__MEMBER_ADDRESS__'] = (isset($object->address) ? $object->address : '');
+				$substitutionarray['__MEMBER_ZIP__'] = (isset($object->zip) ? $object->zip : '');
+				$substitutionarray['__MEMBER_TOWN__'] = (isset($object->town) ? $object->town : '');
+				$substitutionarray['__MEMBER_COUNTRY__'] = (isset($object->country) ? $object->country : '');
+				$substitutionarray['__MEMBER_EMAIL__'] = (isset($object->email) ? $object->email : '');
+				$substitutionarray['__MEMBER_BIRTH__'] = (isset($birthday) ? $birthday : '');
+				$substitutionarray['__MEMBER_PHOTO__'] = (isset($object->photo) ? $object->photo : '');
+				$substitutionarray['__MEMBER_LOGIN__'] = (isset($object->login) ? $object->login : '');
+				$substitutionarray['__MEMBER_PASSWORD__'] = (isset($object->pass) ? $object->pass : '');
+				$substitutionarray['__MEMBER_PHONE__'] = (isset($object->phone) ? $object->phone : '');
+				$substitutionarray['__MEMBER_PHONEPRO__'] = (isset($object->phone_perso) ? $object->phone_perso : '');
+				$substitutionarray['__MEMBER_PHONEMOBILE__'] = (isset($object->phone_mobile) ? $object->phone_mobile : '');
+				$substitutionarray['__MEMBER_TYPE__'] = (isset($object->type) ? $object->type : '');
 				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE__']       = dol_print_date($object->first_subscription_date, 'dayrfc');
 				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_START__'] = dol_print_date($object->first_subscription_date_start, 'dayrfc');
 				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_END__']   = dol_print_date($object->first_subscription_date_end, 'dayrfc');
@@ -6267,8 +6213,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE_END__']    = dol_print_date($object->last_subscription_date_end, 'dayrfc');
 			}
 
-			if (is_object($object) && $object->element == 'societe')
-			{
+			if (is_object($object) && $object->element == 'societe') {
 				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object) ? $object->id : '');
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object) ? $object->name : '');
 				$substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object) ? $object->name_alias : '');
@@ -6289,11 +6234,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_IDPROF5__'] = (is_object($object) ? $object->idprof5 : '');
 				$substitutionarray['__THIRDPARTY_IDPROF6__'] = (is_object($object) ? $object->idprof6 : '');
 				$substitutionarray['__THIRDPARTY_TVAINTRA__'] = (is_object($object) ? $object->tva_intra : '');
-				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_public) : '');
-				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_private) : '');
-			}
-			elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
-			{
+				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object) ? dol_htmlentitiesbr($object->note_public) : '');
+				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object) ? dol_htmlentitiesbr($object->note_private) : '');
+			} elseif (is_object($object->thirdparty)) {
 				$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty) ? $object->thirdparty->id : '');
 				$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty) ? $object->thirdparty->name : '');
 				$substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object->thirdparty) ? $object->thirdparty->name_alias : '');
@@ -6314,17 +6257,23 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_IDPROF5__'] = (is_object($object->thirdparty) ? $object->thirdparty->idprof5 : '');
 				$substitutionarray['__THIRDPARTY_IDPROF6__'] = (is_object($object->thirdparty) ? $object->thirdparty->idprof6 : '');
 				$substitutionarray['__THIRDPARTY_TVAINTRA__'] = (is_object($object->thirdparty) ? $object->thirdparty->tva_intra : '');
-				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object->thirdparty) ?dol_htmlentitiesbr($object->thirdparty->note_public) : '');
-				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object->thirdparty) ?dol_htmlentitiesbr($object->thirdparty->note_private) : '');
+				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object->thirdparty) ? dol_htmlentitiesbr($object->thirdparty->note_public) : '');
+				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object->thirdparty) ? dol_htmlentitiesbr($object->thirdparty->note_private) : '');
 			}
 
-			if (is_object($object->project) && $object->project->id > 0)
+			if (is_object($object) && $object->element == 'recruitmentcandidature') {
+				$substitutionarray['__CANDIDATE_FULLNAME__'] = $object->getFullName($outputlangs);
+				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = $object->firstname;
+				$substitutionarray['__CANDIDATE_LASTNAME__'] = $object->lastname;
+			}
+
+			if (is_object($object->project))
 			{
 				$substitutionarray['__PROJECT_ID__'] = (is_object($object->project) ? $object->project->id : '');
 				$substitutionarray['__PROJECT_REF__'] = (is_object($object->project) ? $object->project->ref : '');
 				$substitutionarray['__PROJECT_NAME__'] = (is_object($object->project) ? $object->project->title : '');
 			}
-			if (is_object($object->projet) && $object->projet->id > 0)	// Deprecated, for backward compatibility
+			if (is_object($object->projet))	// Deprecated, for backward compatibility
 			{
 				$substitutionarray['__PROJECT_ID__'] = (is_object($object->projet) ? $object->projet->id : '');
 				$substitutionarray['__PROJECT_REF__'] = (is_object($object->projet) ? $object->projet->ref : '');
@@ -6337,22 +6286,19 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = $object->tracking_url;
 			}
 
-			if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
+			if (is_object($object) && $object->element == 'contrat' && $object->id > 0 && is_array($object->lines))
 			{
-				if ($object->id > 0)
+				$dateplannedstart = '';
+				$datenextexpiration = '';
+				foreach ($object->lines as $line)
 				{
-					$dateplannedstart = '';
-					$datenextexpiration = '';
-					foreach ($object->lines as $line)
-					{
-						if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-						if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
-					}
-					$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
-					$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
-					$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-					$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+					if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
+					if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
 				}
+				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
+				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
+				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
 			}
 
 			// Create dynamic tags for __EXTRAFIELD_FIELD__
@@ -6367,17 +6313,17 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 					{
 						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
 							$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];
-                            if ($extrafields->attribute_type[$key] == 'date') {
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = dol_print_date($object->array_options['options_' . $key], 'day');
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = dol_print_date($object->array_options['options_' . $key], 'day', 'tzserver', $outputlangs);
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = dol_print_date($object->array_options['options_' . $key], 'dayrfc');
-                            } elseif ($extrafields->attribute_type[$key] == 'datetime') {
-                                $datetime = $object->array_options['options_'.$key];
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour') : '');
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');
-                            }
+							if ($extrafields->attributes[$object->table_element]['type'][$key] == 'date') {
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = dol_print_date($object->array_options['options_'.$key], 'day');
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_LOCALE__'] = dol_print_date($object->array_options['options_'.$key], 'day', 'tzserver', $outputlangs);
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_RFC__'] = dol_print_date($object->array_options['options_'.$key], 'dayrfc');
+							} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'datetime') {
+								$datetime = $object->array_options['options_'.$key];
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour') : '');
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhour', 'tzserver', $outputlangs) : '');
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_DAY_LOCALE__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'day', 'tzserver', $outputlangs) : '');
+								$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'_RFC__'] = ($datetime != "0000-00-00 00:00:00" ? dol_print_date($datetime, 'dayhourrfc') : '');
+							}
 						}
 					}
 				}
@@ -6388,9 +6334,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			if (empty($substitutionarray['__REF__']))
 			{
 				$paymenturl = '';
-			}
-			else
-			{
+			} else {
 				// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 				$outputlangs->loadLangs(array('paypal', 'other'));
@@ -6410,23 +6354,27 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
-				}
-				else $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+				} else $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
 				if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);
-				}
-				else $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+				} else $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
 				if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture')
 				{
 					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);
-				}
-				else $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+				} else $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
 
 				if (is_object($object) && $object->element == 'propal') $substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;
 				if (is_object($object) && $object->element == 'commande') $substitutionarray['__URL_ORDER__'] = DOL_MAIN_URL_ROOT."/commande/card.php?id=".$object->id;
 				if (is_object($object) && $object->element == 'facture') $substitutionarray['__URL_INVOICE__'] = DOL_MAIN_URL_ROOT."/compta/facture/card.php?id=".$object->id;
 			}
+
+			if (is_object($object) && $object->element == 'action')
+			{
+				$substitutionarray['__EVENT_LABEL__'] = $object->label;
+				$substitutionarray['__EVENT_DATE__'] = dol_print_date($object->datep, '%A %d %b %Y');
+				$substitutionarray['__EVENT_TIME__'] = dol_print_date($object->datep, '%H:%M:%S');
+			}
 		}
 	}
 	if (empty($exclude) || !in_array('objectamount', $exclude))
@@ -6468,7 +6416,7 @@ 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']);
 
-        $substitutionarray = array_merge($substitutionarray, array(
+		$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
@@ -6550,7 +6498,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null)
 		if (dol_textishtml($text, 1)) $msgishtml = 1;
 
 		$keyfound = $reg[1];
-		if (preg_match('/(_pass|_pw|password|secret|_key|key$)/i', $keyfound)) $newval = '*****forbidden*****';
+		if (isASecretKey($keyfound)) $newval = '*****forbidden*****';
 		else $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
 		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ?dol_htmlentitiesbr($newval) : $newval, $text);
 	}
@@ -6560,7 +6508,6 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null)
 	{
 		if (!isset($value)) continue; // If value is null, it same than not having substitution key at all into array, we do not replace.
 
-		if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value = ''; // Protection
 		if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value = ''; // Protection
 
 		$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
@@ -6696,17 +6643,14 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
 		$ret .= $firstname;
 		if ($firstname && $lastname) $ret .= ' ';
 		$ret .= $lastname;
-	}
-	elseif ($nameorder == 2 || $nameorder == 3)
-	{
-	    $ret .= $firstname;
-	    if (empty($ret) && $nameorder == 3)
-	    {
-	    	$ret .= $lastname;
-	    }
-	}
-	else
+	} elseif ($nameorder == 2 || $nameorder == 3)
 	{
+		$ret .= $firstname;
+		if (empty($ret) && $nameorder == 3)
+		{
+			$ret .= $lastname;
+		}
+	} else {
 		$ret .= $lastname;
 		if ($firstname && $lastname) $ret .= ' ';
 		$ret .= $firstname;
@@ -6731,8 +6675,7 @@ function setEventMessage($mesgs, $style = 'mesgs')
 	if (!is_array($mesgs))		// If mesgs is a string
 	{
 		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
-	}
-	else						// If mesgs is an array
+	} else // If mesgs is an array
 	{
 		foreach ($mesgs as $mesg)
 		{
@@ -6757,9 +6700,7 @@ function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')
 	if (empty($mesg) && empty($mesgs))
 	{
 		dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);
-	}
-	else
-	{
+	} else {
 		if ($messagekey)
 		{
 			// Complete message with a js link to set a cookie "DOLHIDEMESSAGE".$messagekey;
@@ -6770,8 +6711,7 @@ function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')
 		{
 			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
 			if (empty($mesgs)) setEventMessage($mesg, $style);
-			else
-			{
+			else {
 				if (!empty($mesg) && !in_array($mesg, $mesgs)) setEventMessage($mesg, $style); // Add message string if not already into array
 				setEventMessage($mesgs, $style);
 			}
@@ -6878,9 +6818,7 @@ function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $
 						}
 					});
 				</script>';
-		}
-		else
-		{
+		} else {
 			$return = $out;
 		}
 	}
@@ -6930,8 +6868,7 @@ function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'o
 			if ($val && preg_match('/class="error"/i', $val)) { $iserror++; break; }
 			if ($val && preg_match('/class="warning"/i', $val)) { $iswarning++; break; }
 		}
-	}
-	elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;
+	} elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;
 	elseif ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) $iswarning++;
 	if ($style == 'error') $iserror++;
 	if ($style == 'warning') $iswarning++;
@@ -6954,17 +6891,14 @@ function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'o
 					$tmpmesgstring = preg_replace('/<div class="(error|warning)">/', '', $tmpmesgstring);
 					$tmpmesgstring = preg_replace('/<\/div>/', '', $tmpmesgstring);
 					$newmesgarray[] = $tmpmesgstring;
-				}
-				else
-				{
+				} else {
 					dol_syslog("Error call of dol_htmloutput_mesg with an array with a value that is not a string", LOG_WARNING);
 				}
 			}
 			$mesgarray = $newmesgarray;
 		}
 		print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);
-	}
-	else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+	} else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
 }
 
 /**
@@ -7012,19 +6946,17 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 				if (is_object($array[$key]))
 				{
 					$temp[$key] = $array[$key]->$index;
-				}
-				else
-				{
+				} else {
 					$temp[$key] = $array[$key][$index];
 				}
 			}
 
-            if (!$natsort) {
-                ($order == 'asc') ? asort($temp) : arsort($temp);
-            } else {
-                ($case_sensitive) ? natsort($temp) : natcasesort($temp);
-                if ($order != 'asc') $temp = array_reverse($temp, true);
-            }
+			if (!$natsort) {
+				($order == 'asc') ? asort($temp) : arsort($temp);
+			} else {
+				($case_sensitive) ? natsort($temp) : natcasesort($temp);
+				if ($order != 'asc') $temp = array_reverse($temp, true);
+			}
 
 			$sorted = array();
 
@@ -7149,9 +7081,7 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 		else $cache_codes[$tablename][$key][$fieldid] = '';
 		$db->free($resql);
 		return $cache_codes[$tablename][$key][$fieldid];
-	}
-	else
-	{
+	} else {
 		return -1;
 	}
 }
@@ -7185,7 +7115,7 @@ function verifCond($strRights)
  * @param 	string	$s				String to evaluate
  * @param	int		$returnvalue	0=No return (used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).
  * @param   int     $hideerrors     1=Hide errors
- * @return	mixed					Nothing or return of eval
+ * @return	mixed					Nothing or return result of eval
  */
 function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 {
@@ -7204,9 +7134,7 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	{
 		if ($hideerrors) return @eval('return '.$s.';');
 		else return eval('return '.$s.';');
-	}
-	else
-	{
+	} else {
 		if ($hideerrors) @eval($s);
 		else eval($s);
 	}
@@ -7250,8 +7178,7 @@ function picto_from_langcode($codelang, $moreatt = '')
 	);
 
 	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
-	else
-	{
+	else {
 		$tmparray = explode('_', $codelang);
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
 	}
@@ -7459,20 +7386,18 @@ function getLanguageCodeFromCountryCode($countrycode)
 
 	if (function_exists('locale_get_primary_language') && function_exists('locale_get_region'))    // Need extension php-intl
 	{
-	    foreach ($locales as $locale)
-    	{
-    		$locale_language = locale_get_primary_language($locale);
-    		$locale_region = locale_get_region($locale);
-    		if (strtoupper($countrycode) == $locale_region)
-    		{
-    			//var_dump($locale.'-'.$locale_language.'-'.$locale_region);
-    			return strtolower($locale_language).'_'.strtoupper($locale_region);
-    		}
-    	}
-	}
-	else
-	{
-        dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);
+		foreach ($locales as $locale)
+		{
+			$locale_language = locale_get_primary_language($locale);
+			$locale_region = locale_get_region($locale);
+			if (strtoupper($countrycode) == $locale_region)
+			{
+				//var_dump($locale.'-'.$locale_language.'-'.$locale_region);
+				return strtolower($locale_language).'_'.strtoupper($locale_region);
+			}
+		}
+	} else {
+		dol_syslog("Warning Exention php-intl is not available", LOG_WARNING);
 	}
 
 	return null;
@@ -7531,16 +7456,14 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 							$substitutionarray = array();
 							complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 							$label = make_substitutions($reg[1], $substitutionarray);
-						}
-						else $label = $langs->trans($values[2]);
+						} else $label = $langs->trans($values[2]);
 
 						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);
 						$head[$h][1] = $label;
 						$head[$h][2] = str_replace('+', '', $values[1]);
 						$h++;
 					}
-				}
-				elseif (count($values) == 5)       // deprecated
+				} elseif (count($values) == 5)       // deprecated
 				{
 					dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
 
@@ -7551,16 +7474,14 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 						$substitutionarray = array();
 						complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 						$label = make_substitutions($reg[1], $substitutionarray);
-					}
-					else $label = $langs->trans($values[2]);
+					} else $label = $langs->trans($values[2]);
 
 					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);
 					$head[$h][1] = $label;
 					$head[$h][2] = str_replace('+', '', $values[1]);
 					$h++;
 				}
-			}
-			elseif ($mode == 'remove' && preg_match('/^\-/', $values[1]))
+			} elseif ($mode == 'remove' && preg_match('/^\-/', $values[1]))
 			{
 				if ($values[0] != $type) continue;
 				$tabname = str_replace('-', '', $values[1]);
@@ -7586,7 +7507,7 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 		if ($reshook > 0)
 		{
 			$head = $hookmanager->resArray;
-            $h = count($head);
+			$h = count($head);
 		}
 	}
 }
@@ -7665,8 +7586,7 @@ function printCommonFooter($zone = 'private')
 							}
 							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						}
-						else $qualified = 1;
+						} else $qualified = 1;
 
 						if ($qualified)
 						{
@@ -7697,8 +7617,7 @@ function printCommonFooter($zone = 'private')
 							}
 							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						}
-						else $qualified = 1;
+						} else $qualified = 1;
 
 						if ($qualified)
 						{
@@ -7750,7 +7669,7 @@ function printCommonFooter($zone = 'private')
 			if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 			{
 				$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
-				foreach($tmptagarray as $tmptag) {
+				foreach ($tmptagarray as $tmptag) {
 					print "\n";
 					print "<!-- JS CODE TO ENABLE for google analtics tag -->\n";
 					print "
@@ -7771,17 +7690,17 @@ function printCommonFooter($zone = 'private')
 		// Add Xdebug coverage of code
 		if (defined('XDEBUGCOVERAGE'))
 		{
-		    print_r(xdebug_get_code_coverage());
+			print_r(xdebug_get_code_coverage());
 		}
 
 		// Add DebugBar data
-	    if (!empty($user->rights->debugbar->read) && is_object($debugbar))
-	    {
-	        $debugbar['time']->stopMeasure('pageaftermaster');
-	        print '<!-- Output debugbar data -->'."\n";
-		    print $debugbar->getRenderer()->render();
-		}
-		elseif (count($conf->logbuffer))    // If there is some logs in buffer to show
+		if (!empty($user->rights->debugbar->read) && is_object($debugbar))
+		{
+			$debugbar['time']->stopMeasure('pageaftermaster');
+			print '<!-- Output debugbar data -->'."\n";
+			$renderer = $debugbar->getRenderer();
+			print $debugbar->getRenderer()->render();
+		} elseif (count($conf->logbuffer))    // If there is some logs in buffer to show
 		{
 			print "\n";
 			print "<!-- Start of log output\n";
@@ -7867,7 +7786,7 @@ function dol_getmypid()
  *                             			If param $mode is 2, can contains a list of int id separated by comma like "1,3,4"
  *                             			If param $mode is 3, can contains a list of string separated by comma like "a,b,c"
  * @param	integer			$mode		0=value is list of keyword strings, 1=value is a numeric test (Example ">5.5 <10"), 2=value is a list of ID separated with comma (Example '1,3,4')
- * 										3=value is list of string separated with comma (Example 'text 1,text 2'), 4=value is a list of ID separated with comma (Example '1,3,4') for search into a multiselect string ('1,2')
+ * 										3=value is list of string separated with comma (Example 'text 1,text 2'), 4=value is a list of ID separated with comma (Example '2,7') to be used to search into a multiselect string '1,2,3,4'
  * @param	integer			$nofirstand	1=Do not output the first 'AND'
  * @return 	string 			$res 		The statement to append to the SQL query
  */
@@ -7892,11 +7811,10 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 	$res = '';
 	if (!is_array($fields)) $fields = array($fields);
 
-	$nboffields = count($fields);
-	$end2 = count($crits);
 	$j = 0;
 	foreach ($crits as $crit)
 	{
+		$crit = trim($crit);
 		$i = 0; $i2 = 0;
 		$newres = '';
 		foreach ($fields as $field)
@@ -7904,10 +7822,10 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 			if ($mode == 1)
 			{
 				$operator = '=';
-				$newcrit = preg_replace('/([<>=]+)/', '', trim($crit));
+				$newcrit = preg_replace('/([<>=]+)/', '', $crit);
 
 				$reg = array();
-				preg_match('/([<>=]+)/', trim($crit), $reg);
+				preg_match('/([<>=]+)/', $crit, $reg);
 				if ($reg[1])
 				{
 					$operator = $reg[1];
@@ -7917,76 +7835,72 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					$numnewcrit = price2num($newcrit);
 					if (is_numeric($numnewcrit))
 					{
-						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;
-					}
-					else
-					{
+						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$db->sanitize($numnewcrit); // should be a numeric
+					} else {
 						$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
 					}
 					$i2++; // a criteria was added to string
 				}
-			}
-			elseif ($mode == 2 || $mode == -2)
+			} elseif ($mode == 2 || $mode == -2)
 			{
-				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '')."IN (".$db->escape(trim($crit)).")";
+				$crit = preg_replace('/[^0-9,]/', '', $crit); // ID are always integer
+				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '');
+				$newres .= $crit ? "IN (".$db->sanitize($db->escape($crit)).")" : "IN (0)";
 				if ($mode == -2) $newres .= ' OR '.$field.' IS NULL';
 				$i2++; // a criteria was added to string
-			}
-			elseif ($mode == 3 || $mode == -3)
+			} elseif ($mode == 3 || $mode == -3)
 			{
-				$tmparray = explode(',', trim($crit));
+				$tmparray = explode(',', $crit);
 				if (count($tmparray))
 				{
 					$listofcodes = '';
 					foreach ($tmparray as $val)
 					{
+						$val = trim($val);
 						if ($val)
 						{
 							$listofcodes .= ($listofcodes ? ',' : '');
-							$listofcodes .= "'".$db->escape(trim($val))."'";
+							$listofcodes .= "'".$db->escape($val)."'";
 						}
 					}
-					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$listofcodes.")";
+					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes, 1).")";
 					$i2++; // a criteria was added to string
 				}
 				if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';
-			}
-			elseif ($mode == 4)
+			} elseif ($mode == 4)
 			{
-			    $tmparray = explode(',', trim($crit));
-			    if (count($tmparray))
-			    {
-			        $listofcodes = '';
-			        foreach ($tmparray as $val)
-			        {
-			            if ($val)
-			            {
-			                $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';
-			                $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';
-			                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';
-			                $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';
-			                $newres .= ')';
-			                $i2++;
-			            }
-			        }
-			    }
-			}
-			else    // $mode=0
+				$tmparray = explode(',', $crit);
+				if (count($tmparray))
+				{
+					$listofcodes = '';
+					foreach ($tmparray as $val)
+					{
+						$val = trim($val);
+						if ($val)
+						{
+							$newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape($val).',%\'';
+							$newres .= ' OR '.$field.' = \''.$db->escape($val).'\'';
+							$newres .= ' OR '.$field.' LIKE \'%,'.$db->escape($val).'\'';
+							$newres .= ' OR '.$field.' LIKE \'%,'.$db->escape($val).',%\'';
+							$newres .= ')';
+							$i2++;
+						}
+					}
+				}
+			} else // $mode=0
 			{
 				$tmpcrits = explode('|', $crit);
 				$i3 = 0;
 				foreach ($tmpcrits as $tmpcrit)
 				{
-                    if ($tmpcrit !== '0' && empty($tmpcrit)) continue;
+					if ($tmpcrit !== '0' && empty($tmpcrit)) continue;
 
 					$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
 
 					if (preg_match('/\.(id|rowid)$/', $field))	// Special case for rowid that is sometimes a ref so used as a search field
 					{
 						$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ?trim($tmpcrit) : '0');
-					}
-					else
-					{
+					} else {
 						$newres .= $field." LIKE '";
 
 						$tmpcrit = trim($tmpcrit);
@@ -8154,6 +8068,7 @@ function dolIsAllowedForPreview($file)
 	return 0;
 }
 
+
 /**
  *	Return mime type of a file
  *
@@ -8179,19 +8094,20 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
 	if (preg_match('/\.tsv$/i', $tmpfile)) { $mime = 'text/tab-separated-values'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
 	if (preg_match('/\.(cf|conf|log)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
 	if (preg_match('/\.ini$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'ini'; $famime = 'file-text-o'; }
-    if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; }
+	if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; }
 	if (preg_match('/\.css$/i', $tmpfile)) { $mime = 'text/css'; $imgmime = 'css.png'; $srclang = 'css'; $famime = 'file-text-o'; }
+	if (preg_match('/\.lang$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'lang'; $famime = 'file-text-o'; }
 	// Certificate files
 	if (preg_match('/\.(crt|cer|key|pub)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
 	// XML based (HTML/XML/XAML)
 	if (preg_match('/\.(html|htm|shtml)$/i', $tmpfile)) { $mime = 'text/html'; $imgmime = 'html.png'; $srclang = 'html'; $famime = 'file-text-o'; }
 	if (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xml'; $famime = 'file-text-o'; }
-    if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; }
+	if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; }
 	// Languages
 	if (preg_match('/\.bas$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'bas'; $famime = 'file-code-o'; }
 	if (preg_match('/\.(c)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'c'; $famime = 'file-code-o'; }
 	if (preg_match('/\.(cpp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cpp'; $famime = 'file-code-o'; }
-    if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; }
+	if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; }
 	if (preg_match('/\.(h)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'h'; $famime = 'file-code-o'; }
 	if (preg_match('/\.(java|jsp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'java'; $famime = 'file-code-o'; }
 	if (preg_match('/\.php([0-9]{1})?$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; }
@@ -8300,9 +8216,7 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
 			{
 				$dictvalues[$tablename][$obj->{$rowidfield}] = $obj;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -8323,7 +8237,7 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
  */
 function colorIsLight($stringcolor)
 {
-    $stringcolor = str_replace('#', '', $stringcolor);
+	$stringcolor = str_replace('#', '', $stringcolor);
 	$res = -1;
 	if (!empty($stringcolor))
 	{
@@ -8334,9 +8248,7 @@ function colorIsLight($stringcolor)
 			$r = $tmp[0];
 			$g = $tmp[1];
 			$b = $tmp[2];
-		}
-		else
-		{
+		} else {
 			$hexr = $stringcolor[0].$stringcolor[1];
 			$hexg = $stringcolor[2].$stringcolor[3];
 			$hexb = $stringcolor[4].$stringcolor[5];
@@ -8408,60 +8320,58 @@ function roundUpToNextMultiple($n, $x = 5)
  */
 function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array())
 {
-    $attr = array(
-    	'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css'])
-    );
+	$attr = array(
+		'class'=>'badge '.(!empty($mode) ? ' badge-'.$mode : '').(!empty($type) ? ' badge-'.$type : '').(empty($params['css']) ? '' : ' '.$params['css'])
+	);
 
-    if (empty($html)) {
-        $html = $label;
-    }
+	if (empty($html)) {
+		$html = $label;
+	}
 
-    if (!empty($url)) {
-        $attr['href'] = $url;
-    }
+	if (!empty($url)) {
+		$attr['href'] = $url;
+	}
 
-    if ($mode === 'dot') {
-        $attr['class'] .= ' classfortooltip';
-        $attr['title'] = $html;
-        $attr['aria-label'] = $label;
-        $html = '';
-    }
+	if ($mode === 'dot') {
+		$attr['class'] .= ' classfortooltip';
+		$attr['title'] = $html;
+		$attr['aria-label'] = $label;
+		$html = '';
+	}
 
-    // Override attr
-    if (!empty($params['attr']) && is_array($params['attr'])) {
-        foreach ($params['attr']as $key => $value) {
+	// Override attr
+	if (!empty($params['attr']) && is_array($params['attr'])) {
+		foreach ($params['attr']as $key => $value) {
 			if ($key == 'class') {
 				$attr['class'] .= ' '.$value;
-			}
-			elseif ($key == 'classOverride') {
+			} elseif ($key == 'classOverride') {
 				$attr['class'] = $value;
-			}
-			else {
+			} else {
 				$attr[$key] = $value;
 			}
-        }
-    }
+		}
+	}
 
-    // TODO: add hook
+	// TODO: add hook
 
-    // escape all attribute
-    $attr = array_map('dol_escape_htmltag', $attr);
+	// escape all attribute
+	$attr = array_map('dol_escape_htmltag', $attr);
 
-    $TCompiledAttr = array();
-    foreach ($attr as $key => $value) {
-        $TCompiledAttr[] = $key.'="'.$value.'"';
-    }
+	$TCompiledAttr = array();
+	foreach ($attr as $key => $value) {
+		$TCompiledAttr[] = $key.'="'.$value.'"';
+	}
 
-    $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
+	$compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
 
-    $tag = !empty($url) ? 'a' : 'span';
+	$tag = !empty($url) ? 'a' : 'span';
 
-    return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';
+	return '<'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'>';
 }
 
 
 /**
- * Function dolGetStatus
+ * Output the badge of a status.
  *
  * @param   string  $statusLabel       Label of badge no html : use in alt attribute for accessibility
  * @param   string  $statusLabelShort  Short label of badge no html
@@ -8469,97 +8379,87 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
  * @param   string  $statusType        status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name
  * @param   int	    $displayMode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
  * @param   string  $url               The url for link
- * @param   array   $params            Various params for future : recommended rather than adding more function arguments
+ * @param   array   $params            Various params. Example: array('tooltip'=>'...', 'badgeParams'=>...)
  * @return  string                     Html status string
  */
 function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array())
 {
-    global $conf;
+	global $conf;
 
-    $return = '';
-    $dolGetBadgeParams = array();
+	$return = '';
+	$dolGetBadgeParams = array();
 
-    if (!empty($params['badgeParams'])) {
-        $dolGetBadgeParams = $params['badgeParams'];
-    }
+	if (!empty($params['badgeParams'])) {
+		$dolGetBadgeParams = $params['badgeParams'];
+	}
 
-    // TODO : add a hook
+	// TODO : add a hook
+	if ($displayMode == 0) {
+		$return = !empty($html) ? $html : (empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort));
+	} elseif ($displayMode == 1) {
+		$return = !empty($html) ? $html : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);
+	} // Use status with images (for backward compatibility)
+	elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
+		$return = '';
+		$htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
+		$htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
 
-    if ($displayMode == 0) {
-        $return = !empty($html) ? $html : $statusLabel;
-    }
-    elseif ($displayMode == 1) {
-        $return = !empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel);
-    }
-    // Use status with images (for backward compatibility)
-    elseif (!empty($conf->global->MAIN_STATUS_USES_IMAGES)) {
-        $return = '';
-        $htmlLabel      = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : $statusLabel).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
-        $htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
+		// For small screen, we always use the short label instead of long label.
+		if (!empty($conf->dol_optimize_smallscreen))
+		{
+			if ($displayMode == 0) $displayMode = 1;
+			elseif ($displayMode == 4) $displayMode = 2;
+			elseif ($displayMode == 6) $displayMode = 5;
+		}
 
-        // For small screen, we always use the short label instead of long label.
-        if (!empty($conf->dol_optimize_smallscreen))
-        {
-        	if ($displayMode == 0) $displayMode = 1;
-        	elseif ($displayMode == 4) $displayMode = 2;
-        	elseif ($displayMode == 6) $displayMode = 5;
-        }
+		// For backward compatibility. Image's filename are still in French, so we use this array to convert
+		$statusImg = array(
+			'status0' => 'statut0',
+			'status1' => 'statut1',
+			'status2' => 'statut2',
+			'status3' => 'statut3',
+			'status4' => 'statut4',
+			'status5' => 'statut5',
+			'status6' => 'statut6',
+			'status7' => 'statut7',
+			'status8' => 'statut8',
+			'status9' => 'statut9'
+		);
 
-        // For backward compatibility. Image's filename are still in French, so we use this array to convert
-        $statusImg = array(
-        	'status0' => 'statut0',
-        	'status1' => 'statut1',
-        	'status2' => 'statut2',
-        	'status3' => 'statut3',
-        	'status4' => 'statut4',
-        	'status5' => 'statut5',
-        	'status6' => 'statut6',
-        	'status7' => 'statut7',
-        	'status8' => 'statut8',
-        	'status9' => 'statut9'
-        );
+		if (!empty($statusImg[$statusType])) {
+			$htmlImg = img_picto($statusLabel, $statusImg[$statusType]);
+		} else {
+			$htmlImg = img_picto($statusLabel, $statusType);
+		}
 
-        if (!empty($statusImg[$statusType])) {
-            $htmlImg = img_picto($statusLabel, $statusImg[$statusType]);
-        } else {
-            $htmlImg = img_picto($statusLabel, $statusType);
-        }
-
-        if ($displayMode === 2) {
-            $return = $htmlImg.' '.$htmlLabelShort;
-        }
-        elseif ($displayMode === 3) {
-            $return = $htmlImg;
-        }
-        elseif ($displayMode === 4) {
-            $return = $htmlImg.' '.$htmlLabel;
-        }
-        elseif ($displayMode === 5) {
-            $return = $htmlLabelShort.' '.$htmlImg;
-        }
-        else { // $displayMode >= 6
-            $return = $htmlLabel.' '.$htmlImg;
-        }
-    }
-    // Use new badge
-    elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
-        $statusLabelShort = !empty($statusLabelShort) ? $statusLabelShort : $statusLabel;
+		if ($displayMode === 2) {
+			$return = $htmlImg.' '.$htmlLabelShort;
+		} elseif ($displayMode === 3) {
+			$return = $htmlImg;
+		} elseif ($displayMode === 4) {
+			$return = $htmlImg.' '.$htmlLabel;
+		} elseif ($displayMode === 5) {
+			$return = $htmlLabelShort.' '.$htmlImg;
+		} else { // $displayMode >= 6
+			$return = $htmlLabel.' '.$htmlImg;
+		}
+	} // Use new badge
+	elseif (empty($conf->global->MAIN_STATUS_USES_IMAGES) && !empty($displayMode)) {
+		$statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);
 
 		$dolGetBadgeParams['attr']['class'] = 'badge-status';
-		$dolGetBadgeParams['attr']['title'] = $statusLabel;
+		$dolGetBadgeParams['attr']['title'] = empty($params['tooltip']) ? $statusLabel : $params['tooltip'];
 
-        if ($displayMode == 3) {
-            $return = dolGetBadge($statusLabel, '', $statusType, 'dot', $url, $dolGetBadgeParams);
-        }
-        elseif ($displayMode === 5) {
-            $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);
-        }
-        else {
-            $return = dolGetBadge($statusLabel, $html, $statusType, '', $url, $dolGetBadgeParams);
-        }
-    }
+		if ($displayMode == 3) {
+			$return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams);
+		} elseif ($displayMode === 5) {
+			$return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);
+		} else {
+			$return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), $html, $statusType, '', $url, $dolGetBadgeParams);
+		}
+	}
 
-    return $return;
+	return $return;
 }
 
 
@@ -8577,65 +8477,63 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  */
 function dolGetButtonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())
 {
-    $class = 'butAction';
-    if ($actionType == 'danger' || $actionType == 'delete') {
-        $class = 'butActionDelete';
-    }
+	$class = 'butAction';
+	if ($actionType == 'danger' || $actionType == 'delete') {
+		$class = 'butActionDelete';
+	}
 
-    $attr = array(
-        'class' => $class
-        ,'href' => empty($url) ? '' : $url
-    );
+	$attr = array(
+		'class' => $class
+		,'href' => empty($url) ? '' : $url
+	);
 
-    if (empty($html)) {
-        $html = $label;
-    } else {
-        $attr['aria-label'] = $label;
-    }
+	if (empty($html)) {
+		$html = $label;
+	} else {
+		$attr['aria-label'] = $label;
+	}
 
-    if (empty($userRight)) {
-        $attr['class'] = 'butActionRefused';
-        $attr['href'] = '';
-    }
+	if (empty($userRight)) {
+		$attr['class'] = 'butActionRefused';
+		$attr['href'] = '';
+	}
 
-    if (!empty($id)) {
-        $attr['id'] = $id;
-    }
+	if (!empty($id)) {
+		$attr['id'] = $id;
+	}
 
-    // Override attr
-    if (!empty($params['attr']) && is_array($params['attr'])) {
-        foreach ($params['attr'] as $key => $value) {
-            if ($key == 'class') {
-                $attr['class'] .= ' '.$value;
-            }
-            elseif ($key == 'classOverride') {
-                $attr['class'] = $value;
-            }
-            else {
-                $attr[$key] = $value;
-            }
-        }
-    }
+	// Override attr
+	if (!empty($params['attr']) && is_array($params['attr'])) {
+		foreach ($params['attr'] as $key => $value) {
+			if ($key == 'class') {
+				$attr['class'] .= ' '.$value;
+			} elseif ($key == 'classOverride') {
+				$attr['class'] = $value;
+			} else {
+				$attr[$key] = $value;
+			}
+		}
+	}
 
-    if (isset($attr['href']) && empty($attr['href'])) {
-        unset($attr['href']);
-    }
+	if (isset($attr['href']) && empty($attr['href'])) {
+		unset($attr['href']);
+	}
 
-    // TODO : add a hook
+	// TODO : add a hook
 
-    // escape all attribute
-    $attr = array_map('dol_escape_htmltag', $attr);
+	// escape all attribute
+	$attr = array_map('dol_escape_htmltag', $attr);
 
-    $TCompiledAttr = array();
-    foreach ($attr as $key => $value) {
-        $TCompiledAttr[] = $key.'="'.$value.'"';
-    }
+	$TCompiledAttr = array();
+	foreach ($attr as $key => $value) {
+		$TCompiledAttr[] = $key.'="'.$value.'"';
+	}
 
-    $compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
+	$compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
 
-    $tag = !empty($attr['href']) ? 'a' : 'span';
+	$tag = !empty($attr['href']) ? 'a' : 'span';
 
-    return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>';
+	return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>';
 }
 
 /**
@@ -8652,88 +8550,90 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
  */
 function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $url = '', $id = '', $status = 1, $params = array())
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    // Actually this conf is used in css too for external module compatibility and smooth transition to this function
-    if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin) && $status <= 0) {
-        return '';
-    }
+	// Actually this conf is used in css too for external module compatibility and smooth transition to this function
+	if (!empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) && (!$user->admin) && $status <= 0) {
+		return '';
+	}
 
-    $class = 'btnTitle';
-    if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
+	$class = 'btnTitle';
+	if ($iconClass == 'fa fa-plus-circle') $class .= ' btnTitlePlus';
+	$useclassfortooltip = 1;
 
-    if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
+	if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
 
-    $attr = array(
-        'class' => $class
-        ,'href' => empty($url) ? '' : $url
-    );
+	$attr = array(
+		'class' => $class,
+		'href' => empty($url) ? '' : $url
+	);
 
-    if (!empty($helpText)) {
-        $attr['title'] = dol_escape_htmltag($helpText);
-    }
+	if (!empty($helpText)) {
+		$attr['title'] = dol_escape_htmltag($helpText);
+	} elseif (empty($attr['title']) && $label) {
+		$attr['title'] = $label;
+		$useclassfortooltip = 0;
+	}
 
-    if ($status <= 0) {
-        $attr['class'] .= ' refused';
+	if ($status <= 0) {
+		$attr['class'] .= ' refused';
 
-        $attr['href'] = '';
+		$attr['href'] = '';
 
-        if ($status == -1) { // disable
-            $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
-        }
-        elseif ($status == 0) { // Not enough permissions
-            $attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
-        }
-    }
+		if ($status == -1) { // disable
+			$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("FeatureDisabled"));
+		} elseif ($status == 0) { // Not enough permissions
+			$attr['title'] = dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions"));
+		}
+	}
 
-    if (!empty($attr['title'])) {
-        $attr['class'] .= ' classfortooltip';
-    }
+	if (!empty($attr['title']) && $useclassfortooltip) {
+		$attr['class'] .= ' classfortooltip';
+	}
 
-    if (!empty($id)) {
-        $attr['id'] = $id;
-    }
+	if (!empty($id)) {
+		$attr['id'] = $id;
+	}
 
-    // Override attr
-    if (!empty($params['attr']) && is_array($params['attr'])) {
-        foreach ($params['attr'] as $key => $value) {
-            if ($key == 'class') {
-                $attr['class'] .= ' '.$value;
-            }
-            elseif ($key == 'classOverride') {
-                $attr['class'] = $value;
-            }
-            else {
-                $attr[$key] = $value;
-            }
-        }
-    }
+	// Override attr
+	if (!empty($params['attr']) && is_array($params['attr'])) {
+		foreach ($params['attr'] as $key => $value) {
+			if ($key == 'class') {
+				$attr['class'] .= ' '.$value;
+			} elseif ($key == 'classOverride') {
+				$attr['class'] = $value;
+			} else {
+				$attr[$key] = $value;
+			}
+		}
+	}
 
-    if (isset($attr['href']) && empty($attr['href'])) {
-        unset($attr['href']);
-    }
+	if (isset($attr['href']) && empty($attr['href'])) {
+		unset($attr['href']);
+	}
 
-    // TODO : add a hook
+	// TODO : add a hook
 
-    // escape all attribute
-    $attr = array_map('dol_escape_htmltag', $attr);
+	// escape all attribute
+	$attr = array_map('dol_escape_htmltag', $attr);
 
-    $TCompiledAttr = array();
-    foreach ($attr as $key => $value) {
-        $TCompiledAttr[] = $key.'="'.$value.'"';
-    }
+	$TCompiledAttr = array();
+	foreach ($attr as $key => $value) {
+		$TCompiledAttr[] = $key.'="'.$value.'"';
+	}
 
-    $compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr));
+	$compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr));
 
-    $tag = (empty($attr['href']) ? 'span' : 'a');
+	$tag = (empty($attr['href']) ? 'span' : 'a');
 
-    $button = '';
-    $button .= '<'.$tag.' '.$compiledAttributes.' >';
-    $button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>';
-    $button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';
-    $button .= '</'.$tag.'>';
+	$button = '<'.$tag.' '.$compiledAttributes.'>';
+	$button .= '<span class="'.$iconClass.' valignmiddle btnTitle-icon"></span>';
+	if (!empty($params['forcenohideoftext'])) {
+		$button .= '<span class="valignmiddle text-plus-circle btnTitle-label'.(empty($params['forcenohideoftext']) ? ' hideonsmartphone' : '').'">'.$label.'</span>';
+	}
+	$button .= '</'.$tag.'>';
 
-    return $button;
+	return $button;
 }
 
 /**
@@ -8898,12 +8798,12 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
  */
 function isAFileWithExecutableContent($filename)
 {
-    if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))
-    {
-        return true;
-    }
+	if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))
+	{
+		return true;
+	}
 
-    return false;
+	return false;
 }
 
 /**
@@ -8926,3 +8826,186 @@ function currentToken()
 {
 	return $_SESSION['token'];
 }
+
+/**
+ * Start a table with headers and a optinal clickable number (don't forget to use "finishSimpleTable()" after the last table row)
+ *
+ * @param string	$header		The first left header of the table (automatic translated)
+ * @param string	$link		(optional) The link to a internal dolibarr page, when click on the number (without the first "/")
+ * @param string	$arguments	(optional) Additional arguments for the link (e.g. "search_status=0")
+ * @param integer	$emptyRows	(optional) The count of empty rows after the first header
+ * @param integer	$number		(optional) The number that is shown right after the first header, when not set the link is shown on the right side of the header as "FullList"
+ * @return void
+ *
+ * @see finishSimpleTable()
+ */
+function startSimpleTable($header, $link = "", $arguments = "", $emptyRows = 0, $number = -1)
+{
+	global $langs;
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+
+	print $emptyRows < 1 ? '<th>' : '<th colspan="'.($emptyRows + 1).'">';
+
+	print $langs->trans($header);
+
+	// extra space between the first header and the number
+	if ($number > -1) {
+		print ' ';
+	}
+
+	if (!empty($link)) {
+		if (!empty($arguments)) {
+			print '<a href="'.DOL_URL_ROOT.'/'.$link.'?'.$arguments.'">';
+		} else {
+			print '<a href="'.DOL_URL_ROOT.'/'.$link.'">';
+		}
+	}
+
+	if ($number > -1) {
+		print '<span class="badge">'.$number.'</span>';
+	}
+
+	if (!empty($link)) {
+		print '</a>';
+	}
+
+	print '</th>';
+
+	if ($number < 0 && !empty($link)) {
+		print '<th class="right">';
+
+		if (!empty($arguments)) {
+			print '<a class="commonlink" href="'.DOL_URL_ROOT.'/'.$link.'?'.$arguments.'">';
+		} else {
+			print '<a class="commonlink" href="'.DOL_URL_ROOT.'/'.$link.'">';
+		}
+
+		print $langs->trans("FullList");
+		print '</a>';
+		print '</th>';
+	}
+
+	print '</tr>';
+}
+
+/**
+ * Add the correct HTML close tags for "startSimpleTable(...)" (use after the last table line)
+ *
+ * @param 	bool 	$addLineBreak	(optional) Add a extra line break after the complete table (\<br\>)
+ * @return 	void
+ *
+ * @see startSimpleTable()
+ */
+function finishSimpleTable($addLineBreak = false)
+{
+	print '</table>';
+	print '</div>';
+
+	if ($addLineBreak) {
+		print '<br>';
+	}
+}
+
+/**
+ * Add a summary line to the current open table ("None", "XMoreLines" or "Total xxx")
+ *
+ * @param integer	$tableColumnCount		The complete count columns of the table
+ * @param integer	$num					The count of the rows of the table, when it is zero (0) the "$noneWord" is shown instead
+ * @param integer	$nbofloop				(optional)	The maximum count of rows thaht the table show (when it is zero (0) no summary line will show, expect "$noneWord" when $num === 0)
+ * @param integer	$total					(optional)	The total value thaht is shown after when the table has minimum of one entire
+ * @param string	$noneWord				(optional)	The word that is shown when the table has no entires ($num === 0)
+ * @param boolean	$extraRightColumn		(optional)	Add a addtional column after the summary word and total number
+ * @return void
+ */
+function addSummaryTableLine($tableColumnCount, $num, $nbofloop = 0, $total = 0, $noneWord = "None", $extraRightColumn = false)
+{
+	global $langs;
+
+	if ($num === 0) {
+		print '<tr class="oddeven">';
+		print '<td colspan="'.$tableColumnCount.'" class="opacitymedium">'.$langs->trans($noneWord).'</td>';
+		print '</tr>';
+		return;
+	}
+
+	if ($nbofloop === 0)
+	{
+		// don't show a summary line
+		return;
+	}
+
+	if ($num === 0) {
+		$colspan = $tableColumnCount;
+	}
+	elseif ($num > $nbofloop) {
+		$colspan = $tableColumnCount;
+	} else {
+		$colspan = $tableColumnCount - 1;
+	}
+
+	if ($extraRightColumn) {
+		$colspan--;
+	}
+
+	print '<tr class="liste_total">';
+
+	if ($nbofloop > 0 && $num > $nbofloop) {
+		print '<td colspan="'.$colspan.'" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
+	} else {
+		print '<td colspan="'.$colspan.'" class="right"> '.$langs->trans("Total").'</td>';
+		print '<td class="right" width="100">'.price($total).'</td>';
+	}
+
+	if ($extraRightColumn) {
+		print '<td></td>';
+	}
+
+	print '</tr>';
+}
+
+/**
+ *	Return a file on output using a lo memory.
+ *  It can return very large files with no need of memory.
+ *  WARNING: This close output buffers.
+ *
+ *  @param	string	$fullpath_original_file_osencoded		Full path of file to return.
+ *  @param	int		$method									-1 automatic, 0=readfile, 1=fread, 2=stream_copy_to_stream
+ *  @return void
+ */
+function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
+{
+	global $conf;
+
+	if ($method == -1) {
+		$method = 0;
+		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_FREAD)) $method = 1;
+		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_STREAM_COPY)) $method = 2;
+	}
+
+	// Be sure we don't have output buffering enabled to have readfile working correctly
+	while (ob_get_level()) ob_end_flush();
+
+	// Solution 0
+	if ($method == 0) {
+		readfile($fullpath_original_file_osencoded);
+	}
+	// Solution 1
+	elseif ($method == 1) {
+		$handle = fopen($fullpath_original_file_osencoded, "rb");
+		while (!feof($handle)) {
+			print fread($handle, 8192);
+		}
+		fclose($handle);
+	}
+	// Solution 2
+	elseif ($method == 2) {
+		$handle1 = fopen($fullpath_original_file_osencoded, "rb");
+		$handle2 = fopen("php://output", "wb");
+		stream_copy_to_stream($handle1, $handle2);
+		fclose($handle1);
+		fclose($handle2);
+	}
+}
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 84670de46d2..94bf0dd06c4 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -39,35 +39,34 @@
  */
 function jsUnEscape($source)
 {
-    $decodedStr = "";
-    $pos = 0;
-    $len = strlen($source);
-    while ($pos < $len) {
-        $charAt = substr($source, $pos, 1);
-        if ($charAt == '%') {
-            $pos++;
-            $charAt = substr($source, $pos, 1);
-            if ($charAt == 'u') {
-                // we got a unicode character
-                $pos++;
-                $unicodeHexVal = substr($source, $pos, 4);
-                $unicode = hexdec($unicodeHexVal);
-                $entity = "&#".$unicode.';';
-                $decodedStr .= utf8_encode($entity);
-                $pos += 4;
-            }
-            else {
-                // we have an escaped ascii character
-                $hexVal = substr($source, $pos, 2);
-                $decodedStr .= chr(hexdec($hexVal));
-                $pos += 2;
-            }
-        } else {
-            $decodedStr .= $charAt;
-            $pos++;
-        }
-    }
-    return dol_html_entity_decode($decodedStr, ENT_COMPAT);
+	$decodedStr = "";
+	$pos = 0;
+	$len = strlen($source);
+	while ($pos < $len) {
+		$charAt = substr($source, $pos, 1);
+		if ($charAt == '%') {
+			$pos++;
+			$charAt = substr($source, $pos, 1);
+			if ($charAt == 'u') {
+				// we got a unicode character
+				$pos++;
+				$unicodeHexVal = substr($source, $pos, 4);
+				$unicode = hexdec($unicodeHexVal);
+				$entity = "&#".$unicode.';';
+				$decodedStr .= utf8_encode($entity);
+				$pos += 4;
+			} else {
+				// we have an escaped ascii character
+				$hexVal = substr($source, $pos, 2);
+				$decodedStr .= chr(hexdec($hexVal));
+				$pos += 2;
+			}
+		} else {
+			$decodedStr .= $charAt;
+			$pos++;
+		}
+	}
+	return dol_html_entity_decode($decodedStr, ENT_COMPAT);
 }
 
 
@@ -80,37 +79,37 @@ function jsUnEscape($source)
  */
 function dolGetModulesDirs($subdir = '')
 {
-    global $conf;
+	global $conf;
 
-    $modulesdir = array();
+	$modulesdir = array();
 
-    foreach ($conf->file->dol_document_root as $type => $dirroot)
-    {
-        // Default core/modules dir
-        if ($type === 'main') {
-            $modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';
-        }
+	foreach ($conf->file->dol_document_root as $type => $dirroot)
+	{
+		// Default core/modules dir
+		if ($type === 'main') {
+			$modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';
+		}
 
-        // Scan dir from external modules
-        $handle = @opendir($dirroot);
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.
+		// Scan dir from external modules
+		$handle = @opendir($dirroot);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.
 
-                if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
-                {
-                    if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))
-                    {
-                        $modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';
-                    }
-                }
-            }
-            closedir($handle);
-        }
-    }
-    return $modulesdir;
+				if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+				{
+					if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))
+					{
+						$modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';
+					}
+				}
+			}
+			closedir($handle);
+		}
+	}
+	return $modulesdir;
 }
 
 
@@ -122,16 +121,16 @@ function dolGetModulesDirs($subdir = '')
  */
 function dol_getDefaultFormat(Translate $outputlangs = null)
 {
-    global $langs;
+	global $langs;
 
-    $selected = 'EUA4';
-    if (!$outputlangs) {
-    	$outputlangs = $langs;
-    }
+	$selected = 'EUA4';
+	if (!$outputlangs) {
+		$outputlangs = $langs;
+	}
 
-    if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada
-    if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US
-    return $selected;
+	if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada
+	if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US
+	return $selected;
 }
 
 /**
@@ -144,44 +143,42 @@ function dol_getDefaultFormat(Translate $outputlangs = null)
  */
 function dol_print_file($langs, $filename, $searchalt = 0)
 {
-    global $conf;
+	global $conf;
 
-    // Test if file is in lang directory
-    foreach ($langs->dir as $searchdir)
-    {
-        $formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);
-        dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);
-        if (is_readable($formfile))
-        {
-            $content = file_get_contents($formfile);
-            $isutf8 = utf8_check($content);
-            if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-            elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-            else print $content;
-            return true;
-        }
-        else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+	// Test if file is in lang directory
+	foreach ($langs->dir as $searchdir)
+	{
+		$formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);
+		dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);
+		if (is_readable($formfile))
+		{
+			$content = file_get_contents($formfile);
+			$isutf8 = utf8_check($content);
+			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
+			elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
+			else print $content;
+			return true;
+		} else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
 
-        if ($searchalt) {
-            // Test si fichier dans repertoire de la langue alternative
-            if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
-            else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
-            dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
-            //print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
-            if (is_readable($formfilealt))
-            {
-                $content = file_get_contents($formfilealt);
-                $isutf8 = utf8_check($content);
-                if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-                elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-                else print $content;
-                return true;
-            }
-            else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
-        }
-    }
+		if ($searchalt) {
+			// Test si fichier dans repertoire de la langue alternative
+			if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
+			else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+			dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
+			//print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
+			if (is_readable($formfilealt))
+			{
+				$content = file_get_contents($formfilealt);
+				$isutf8 = utf8_check($content);
+				if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
+				elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
+				else print $content;
+				return true;
+			} else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+		}
+	}
 
-    return false;
+	return false;
 }
 
 /**
@@ -194,291 +191,281 @@ function dol_print_file($langs, $filename, $searchalt = 0)
  */
 function dol_print_object_info($object, $usetable = 0)
 {
-    global $langs, $db;
+	global $langs, $db;
 
-    // Load translation files required by the page
-    $langs->loadLangs(array('other', 'admin'));
+	// Load translation files required by the page
+	$langs->loadLangs(array('other', 'admin'));
 
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-    $deltadateforserver = getServerTimeZoneInt('now');
-    $deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
-    //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
-    $deltadateforuser = round($deltadateforclient - $deltadateforserver);
-    //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
+	$deltadateforserver = getServerTimeZoneInt('now');
+	$deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
+	//$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
+	$deltadateforuser = round($deltadateforclient - $deltadateforserver);
+	//print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
-    if ($usetable) print '<table class="border tableforfield centpercent">';
+	if ($usetable) print '<table class="border tableforfield centpercent">';
 
-    // Import key
-    if (!empty($object->import_key))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("ImportedWithSet");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        print $object->import_key;
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+	// Import key
+	if (!empty($object->import_key))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("ImportedWithSet");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		print $object->import_key;
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    // User creation (old method using already loaded object and not id is kept for backward compatibility)
-    if (!empty($object->user_creation) || !empty($object->user_creation_id))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("CreatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        if (is_object($object->user_creation))
-        {
-        	if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
-        {
-            $userstatic = new User($db);
-            $userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
-
-    // Date creation
-    if (!empty($object->date_creation))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("DateCreation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        print dol_print_date($object->date_creation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
-
-    // User change (old method using already loaded object and not id is kept for backward compatibility)
-    if (!empty($object->user_modification) || !empty($object->user_modification_id))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("ModifiedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        if (is_object($object->user_modification))
-        {
-        	if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
-        {
-            $userstatic = new User($db);
-            $userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
-            if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
-
-    // Date change
-    if (!empty($object->date_modification))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("DateLastModification");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        print dol_print_date($object->date_modification, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
-
-    // User validation (old method using already loaded object and not id is kept for backward compatibility)
-    if (!empty($object->user_validation) || !empty($object->user_validation_id))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("ValidatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        if (is_object($object->user_validation))
-        {
-            if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
-        {
-            $userstatic = new User($db);
-            $userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
+	// User creation (old method using already loaded object and not id is kept for backward compatibility)
+	if (!empty($object->user_creation) || !empty($object->user_creation_id))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("CreatedBy");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		if (is_object($object->user_creation))
+		{
+			if ($object->user_creation->id) print $object->user_creation->getNomUrl(1, '', 0, 0, 0);
+			else print $langs->trans("Unknown");
+		} else {
+			$userstatic = new User($db);
+			$userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+			else print $langs->trans("Unknown");
+		}
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    // Date validation
-    if (!empty($object->date_validation))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("DateValidation");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        print dol_print_date($object->date_validation, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+	// Date creation
+	if (!empty($object->date_creation))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("DateCreation");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		print dol_print_date($object->date_creation, 'dayhour');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    // User approve (old method using already loaded object and not id is kept for backward compatibility)
-    if (!empty($object->user_approve) || !empty($object->user_approve_id))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        if (is_object($object->user_approve))
-        {
-            if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
-        {
-            $userstatic = new User($db);
-            $userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
+	// User change (old method using already loaded object and not id is kept for backward compatibility)
+	if (!empty($object->user_modification) || !empty($object->user_modification_id))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("ModifiedBy");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		if (is_object($object->user_modification))
+		{
+			if ($object->user_modification->id) print $object->user_modification->getNomUrl(1, '', 0, 0, 0);
+			else print $langs->trans("Unknown");
+		} else {
+			$userstatic = new User($db);
+			$userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+			else print $langs->trans("Unknown");
+		}
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    // Date approve
-    if (!empty($object->date_approve))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("DateApprove");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        print dol_print_date($object->date_approve, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+	// Date change
+	if (!empty($object->date_modification))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("DateLastModification");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		print dol_print_date($object->date_modification, 'dayhour');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    // User approve
-    if (!empty($object->user_approve_id2))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("ApprovedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        $userstatic = new User($db);
-        $userstatic->fetch($object->user_approve_id2);
-        if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        else print $langs->trans("Unknown");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
-
-    // Date approve
-    if (!empty($object->date_approve2))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("DateApprove2");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        print dol_print_date($object->date_approve2, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
-
-    // User close
-    if (!empty($object->user_cloture))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("ClosedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        if (is_object($object->user_cloture))
-        {
-			if ($object->user_cloture->id) print $object->user_cloture->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
-        {
-            $userstatic = new User($db);
-            $userstatic->fetch($object->user_cloture);
+	// User validation (old method using already loaded object and not id is kept for backward compatibility)
+	if (!empty($object->user_validation) || !empty($object->user_validation_id))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("ValidatedBy");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		if (is_object($object->user_validation))
+		{
+			if ($object->user_validation->id) print $object->user_validation->getNomUrl(1, '', 0, 0, 0);
+			else print $langs->trans("Unknown");
+		} else {
+			$userstatic = new User($db);
+			$userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+			else print $langs->trans("Unknown");
+		}
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    // Date close
-    if (!empty($object->date_cloture))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("DateClosing");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        print dol_print_date($object->date_cloture, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_cloture + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+	// Date validation
+	if (!empty($object->date_validation))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("DateValidation");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		print dol_print_date($object->date_validation, 'dayhour');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    // User conciliate
-    if (!empty($object->user_rappro))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("ConciliatedBy");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        if (is_object($object->user_rappro))
-        {
+	// User approve (old method using already loaded object and not id is kept for backward compatibility)
+	if (!empty($object->user_approve) || !empty($object->user_approve_id))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("ApprovedBy");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		if (is_object($object->user_approve))
+		{
+			if ($object->user_approve->id) print $object->user_approve->getNomUrl(1, '', 0, 0, 0);
+			else print $langs->trans("Unknown");
+		} else {
+			$userstatic = new User($db);
+			$userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
+			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			else print $langs->trans("Unknown");
+		}
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
+
+	// Date approve
+	if (!empty($object->date_approve))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("DateApprove");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		print dol_print_date($object->date_approve, 'dayhour');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
+
+	// User approve
+	if (!empty($object->user_approve_id2))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("ApprovedBy");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		$userstatic = new User($db);
+		$userstatic->fetch($object->user_approve_id2);
+		if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+		else print $langs->trans("Unknown");
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
+
+	// Date approve
+	if (!empty($object->date_approve2))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("DateApprove2");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		print dol_print_date($object->date_approve2, 'dayhour');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2 + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
+
+	// User close
+	if (!empty($object->user_cloture) || !empty($object->user_closing))
+	{
+		if (isset($object->user_cloture) && !empty($object->user_cloture)) $object->user_closing = $object->user_cloture;
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("ClosedBy");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		if (is_object($object->user_closing))
+		{
+			if ($object->user_closing->id) print $object->user_closing->getNomUrl(1, '', 0, 0, 0);
+			else print $langs->trans("Unknown");
+		} else {
+			$userstatic = new User($db);
+			$userstatic->fetch($object->user_closing);
+			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			else print $langs->trans("Unknown");
+		}
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
+
+	// Date close
+	if (!empty($object->date_cloture) || !empty($object->date_closing))
+	{
+		if (isset($object->date_cloture) && !empty($object->date_cloture)) $object->date_closing = $object->date_cloture;
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("DateClosing");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		print dol_print_date($object->date_closing, 'dayhour');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_closing + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
+
+	// User conciliate
+	if (!empty($object->user_rappro))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("ConciliatedBy");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		if (is_object($object->user_rappro))
+		{
 			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        else
-        {
-            $userstatic = new User($db);
-            $userstatic->fetch($object->user_rappro);
+			else print $langs->trans("Unknown");
+		} else {
+			$userstatic = new User($db);
+			$userstatic->fetch($object->user_rappro);
 			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-        	else print $langs->trans("Unknown");
-        }
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+			else print $langs->trans("Unknown");
+		}
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    // Date conciliate
-    if (!empty($object->date_rappro))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("DateConciliating");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        print dol_print_date($object->date_rappro, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+	// Date conciliate
+	if (!empty($object->date_rappro))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("DateConciliating");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		print dol_print_date($object->date_rappro, 'dayhour');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    // Date send
-    if (!empty($object->date_envoi))
-    {
-        if ($usetable) print '<tr><td class="titlefield">';
-        print $langs->trans("DateLastSend");
-        if ($usetable) print '</td><td>';
-        else print ': ';
-        print dol_print_date($object->date_envoi, 'dayhour');
-        if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
-        if ($usetable) print '</td></tr>';
-        else print '<br>';
-    }
+	// Date send
+	if (!empty($object->date_envoi))
+	{
+		if ($usetable) print '<tr><td class="titlefield">';
+		print $langs->trans("DateLastSend");
+		if ($usetable) print '</td><td>';
+		else print ': ';
+		print dol_print_date($object->date_envoi, 'dayhour');
+		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi + ($deltadateforuser * 3600), "dayhour").' &nbsp;'.$langs->trans("ClientHour");
+		if ($usetable) print '</td></tr>';
+		else print '<br>';
+	}
 
-    if ($usetable) print '</table>';
+	if ($usetable) print '</table>';
 }
 
 
@@ -504,8 +491,8 @@ function dolAddEmailTrackId($email, $trackingid)
  */
 function isValidMailDomain($mail)
 {
-    list($user, $domain) = explode("@", $mail, 2);
-    return checkdnsrr($domain, "MX");
+	list($user, $domain) = explode("@", $mail, 2);
+	return checkdnsrr($domain, "MX");
 }
 
 /**
@@ -523,38 +510,38 @@ function isValidMailDomain($mail)
  */
 function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0, $anchor = 0)
 {
-    $ValidUrl = 0;
-    $urlregex = '';
+	$ValidUrl = 0;
+	$urlregex = '';
 
-    // SCHEME
-    if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
+	// SCHEME
+	if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
 
-    // USER AND PASS
-    if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+	// USER AND PASS
+	if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
 
-    // HOSTNAME OR IP
-    //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
-    //$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // x.x
-    $urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)
-    //use only one of the above
+	// HOSTNAME OR IP
+	//$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
+	//$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)+";  // x.x
+	$urlregex .= "([a-z0-9+\$_\\\:-])+(\.[a-z0-9+\$_-][a-z0-9+\$_-]+)*"; // x ou x.xx (2 x ou plus)
+	//use only one of the above
 
-    // PORT
-    if ($port) $urlregex .= "(\:[0-9]{2,5})";
-    // PATH
-    if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
-    // GET Query
-    if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
-    // ANCHOR
-    if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+	// PORT
+	if ($port) $urlregex .= "(\:[0-9]{2,5})";
+	// PATH
+	if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+	// GET Query
+	if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+	// ANCHOR
+	if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
 
-    // check
-    if (preg_match('/'.$urlregex.'/i', $url))
-    {
-        $ValidUrl = 1;
-    }
-    //print $urlregex.' - '.$url.' - '.$ValidUrl;
+	// check
+	if (preg_match('/'.$urlregex.'/i', $url))
+	{
+		$ValidUrl = 1;
+	}
+	//print $urlregex.' - '.$url.' - '.$ValidUrl;
 
-    return $ValidUrl;
+	return $ValidUrl;
 }
 
 /**
@@ -565,21 +552,21 @@ function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0
  */
 function isValidVATID($company)
 {
-    if ($company->isInEEC())    // Syntax check rules for EEC countries
-    {
-        /* Disabled because some companies can have an address in Irland and a vat number in France.
+	if ($company->isInEEC())    // Syntax check rules for EEC countries
+	{
+		/* Disabled because some companies can have an address in Irland and a vat number in France.
         $vatprefix = $company->country_code;
         if ($vatprefix == 'GR') $vatprefix = '(EL|GR)';
         elseif ($vatprefix == 'MC') $vatprefix = 'FR';	// Monaco is using french VAT numbers
         else $vatprefix = preg_quote($vatprefix, '/');*/
-        $vatprefix = '[a-zA-Z][a-zA-Z]';
-        if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))
-        {
-            return 0;
-        }
-    }
+		$vatprefix = '[a-zA-Z][a-zA-Z]';
+		if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))
+		{
+			return 0;
+		}
+	}
 
-    return 1;
+	return 1;
 }
 
 /**
@@ -591,35 +578,35 @@ function isValidVATID($company)
  */
 function clean_url($url, $http = 1)
 {
-    // Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
-    // To include the minus sign in a char class, we must not escape it but put it at the end of the class
-    // Also, there's no need of escape a dot sign in a class
-    if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))
-    {
-        $proto = $regs[1];
-        $domain = $regs[2];
-        $port = isset($regs[3]) ? $regs[3] : '';
-        //print $url." -> ".$proto." - ".$domain." - ".$port;
-        //$url = dol_string_nospecial(trim($url));
-        $url = trim($url);
+	// Fixed by Matelli (see http://matelli.fr/showcases/patchs-dolibarr/fix-cleaning-url.html)
+	// To include the minus sign in a char class, we must not escape it but put it at the end of the class
+	// Also, there's no need of escape a dot sign in a class
+	$regs = array();
+	if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))
+	{
+		$proto = $regs[1];
+		$domain = $regs[2];
+		$port = isset($regs[3]) ? $regs[3] : '';
+		//print $url." -> ".$proto." - ".$domain." - ".$port;
+		//$url = dol_string_nospecial(trim($url));
+		$url = trim($url);
 
-        // Si http: defini on supprime le http (Si https on ne supprime pas)
-        $newproto = $proto;
-        if ($http == 0)
-        {
-            if (preg_match('/^http:[\\/]+/i', $url))
-            {
-                $url = preg_replace('/^http:[\\/]+/i', '', $url);
-                $newproto = '';
-            }
-        }
+		// Si http: defini on supprime le http (Si https on ne supprime pas)
+		$newproto = $proto;
+		if ($http == 0)
+		{
+			if (preg_match('/^http:[\\/]+/i', $url))
+			{
+				$url = preg_replace('/^http:[\\/]+/i', '', $url);
+				$newproto = '';
+			}
+		}
 
-        // On passe le nom de domaine en minuscule
-        $CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
+		// On passe le nom de domaine en minuscule
+		$CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
 
-        return $CleanUrl;
-    }
-    else return $url;
+		return $CleanUrl;
+	} else return $url;
 }
 
 
@@ -678,12 +665,12 @@ function dolObfuscateEmail($mail, $replace = "*", $nbreplace = 8, $nbdisplaymail
  */
 function array2tr($data, $troptions = '', $tdoptions = '')
 {
-    $text = '<tr '.$troptions.'>';
-    foreach ($data as $key => $item) {
-        $text .= '<td '.$tdoptions.'>'.$item.'</td>';
-    }
-    $text .= '</tr>';
-    return $text;
+	$text = '<tr '.$troptions.'>';
+	foreach ($data as $key => $item) {
+		$text .= '<td '.$tdoptions.'>'.$item.'</td>';
+	}
+	$text .= '</tr>';
+	return $text;
 }
 
 /**
@@ -698,20 +685,20 @@ function array2tr($data, $troptions = '', $tdoptions = '')
  */
 function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '', $tdoptions = '')
 {
-    $text = '';
-    if ($tableMarkup) $text = '<table '.$tableoptions.'>';
-    foreach ($data as $key => $item) {
-        if (is_array($item)) {
-            $text .= array2tr($item, $troptions, $tdoptions);
-        } else {
-            $text .= '<tr '.$troptions.'>';
-            $text .= '<td '.$tdoptions.'>'.$key.'</td>';
-            $text .= '<td '.$tdoptions.'>'.$item.'</td>';
-            $text .= '</tr>';
-        }
-    }
-    if ($tableMarkup) $text .= '</table>';
-    return $text;
+	$text = '';
+	if ($tableMarkup) $text = '<table '.$tableoptions.'>';
+	foreach ($data as $key => $item) {
+		if (is_array($item)) {
+			$text .= array2tr($item, $troptions, $tdoptions);
+		} else {
+			$text .= '<tr '.$troptions.'>';
+			$text .= '<td '.$tdoptions.'>'.$key.'</td>';
+			$text .= '<td '.$tdoptions.'>'.$item.'</td>';
+			$text .= '</tr>';
+		}
+	}
+	if ($tableMarkup) $text .= '</table>';
+	return $text;
 }
 
 /**
@@ -732,459 +719,438 @@ function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '
  */
 function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $date = '', $mode = 'next', $bentityon = true, $objuser = null, $forceentity = null)
 {
-    global $conf, $user;
+	global $conf, $user;
 
-    if (!is_object($objsoc)) $valueforccc = $objsoc;
-    elseif ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = dol_string_unaccent($objsoc->code_fournisseur);
-    else $valueforccc = dol_string_unaccent($objsoc->code_client);
+	if (!is_object($objsoc)) $valueforccc = $objsoc;
+	elseif ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = dol_string_unaccent($objsoc->code_fournisseur);
+	else $valueforccc = dol_string_unaccent($objsoc->code_client);
 
-    $sharetable = $table;
-    if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
+	$sharetable = $table;
+	if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
 
-    // Clean parameters
-    if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers
-    // but we should use local year and month of user
+	// Clean parameters
+	if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers
+	// but we should use local year and month of user
 
-    // For debugging
-    //dol_syslog("mask=".$mask, LOG_DEBUG);
-    //include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
-    //$mask='FA{yy}{mm}-{0000@99}';
-    //$date=dol_mktime(12, 0, 0, 1, 1, 1900);
-    //$date=dol_stringtotime('20130101');
+	// For debugging
+	//dol_syslog("mask=".$mask, LOG_DEBUG);
+	//include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
+	//$mask='FA{yy}{mm}-{0000@99}';
+	//$date=dol_mktime(12, 0, 0, 1, 1, 1900);
+	//$date=dol_stringtotime('20130101');
 
-    $hasglobalcounter = false;
-    // Extract value for mask counter, mask raz and mask offset
-    if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))
-    {
-        $masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');
-        $maskcounter = $reg[1];
-        $hasglobalcounter = true;
-    }
-    else
-    {
-        // setting some defaults so the rest of the code won't fail if there is a third party counter
-        $masktri = '00000';
-        $maskcounter = '00000';
-    }
+	$hasglobalcounter = false;
+	$reg = array();
+	// Extract value for mask counter, mask raz and mask offset
+	if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))
+	{
+		$masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');
+		$maskcounter = $reg[1];
+		$hasglobalcounter = true;
+	} else {
+		// setting some defaults so the rest of the code won't fail if there is a third party counter
+		$masktri = '00000';
+		$maskcounter = '00000';
+	}
 
-    $maskraz = -1;
-    $maskoffset = 0;
-    $resetEveryMonth = false;
-    if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
+	$maskraz = -1;
+	$maskoffset = 0;
+	$resetEveryMonth = false;
+	if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
 
-    // Extract value for third party mask counter
-    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
-    {
-        $maskrefclient = $regClientRef[1].$regClientRef[2];
-        $maskrefclient_maskclientcode = $regClientRef[1];
-        $maskrefclient_maskcounter = $regClientRef[2];
-        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
-        $maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask
-        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
-        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-    }
-    else $maskrefclient = '';
+	// Extract value for third party mask counter
+	$regClient = array();
+	if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
+	{
+		$maskrefclient = $regClientRef[1].$regClientRef[2];
+		$maskrefclient_maskclientcode = $regClientRef[1];
+		$maskrefclient_maskcounter = $regClientRef[2];
+		$maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
+		$maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask
+		$maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
+		$maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
+		if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+	} else $maskrefclient = '';
 
-    // fail if there is neither a global nor a third party counter
-    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
-    {
-        return 'ErrorBadMask';
-    }
+	// fail if there is neither a global nor a third party counter
+	if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
+	{
+		return 'ErrorBadMask';
+	}
 
-    // Extract value for third party type
-    if (preg_match('/\{(t+)\}/i', $mask, $regType))
-    {
-        $masktype = $regType[1];
-        $masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
-        $masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
-    }
-    else
-    {
-    	$masktype = '';
-    	$masktype_value = '';
-    }
+	// Extract value for third party type
+	$regType = array();
+	if (preg_match('/\{(t+)\}/i', $mask, $regType))
+	{
+		$masktype = $regType[1];
+		$masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
+		$masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
+	} else {
+		$masktype = '';
+		$masktype_value = '';
+	}
 
-    // Extract value for user
-    if (preg_match('/\{(u+)\}/i', $mask, $regType))
-    {
-    	$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-    	if (is_object($objuser)) $lastname = $objuser->lastname;
+	// Extract value for user
+	if (preg_match('/\{(u+)\}/i', $mask, $regType))
+	{
+		$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
+		if (is_object($objuser)) $lastname = $objuser->lastname;
 
-    	$maskuser = $regType[1];
-    	$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
-    	$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
-    }
-    else
-    {
-    	$maskuser = '';
-    	$maskuser_value = '';
-    }
+		$maskuser = $regType[1];
+		$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
+		$maskuser_value = str_pad($maskuser_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
+	} else {
+		$maskuser = '';
+		$maskuser_value = '';
+	}
 
-    // Personalized field {XXX-1} à {XXX-9}
-    $maskperso = array();
-    $maskpersonew = array();
-    $tmpmask = $mask;
-    while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))
-    {
-        $maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
-        $maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
-        $tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
-    }
+	// Personalized field {XXX-1} à {XXX-9}
+	$maskperso = array();
+	$maskpersonew = array();
+	$tmpmask = $mask;
+	$regKey = array();
+	while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))
+	{
+		$maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
+		$maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
+		$tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
+	}
 
-    if (strstr($mask, 'user_extra_'))
-    {
+	if (strstr($mask, 'user_extra_'))
+	{
 		$start = "{user_extra_";
 		$end = "\}";
 		$extra = get_string_between($mask, "user_extra_", "}");
 		if (!empty($user->array_options['options_'.$extra])) {
 			$mask = preg_replace('#('.$start.')(.*?)('.$end.')#si', $user->array_options['options_'.$extra], $mask);
 		}
-    }
-    $maskwithonlyymcode = $mask;
-    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);
-    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
-    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
-    $maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);
-    $maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);
-    foreach ($maskperso as $key => $val)
-    {
-        $maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
-    }
-    $maskwithnocode = $maskwithonlyymcode;
-    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
-    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
-    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
-    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
-    // Now maskwithnocode = 0000ddmmyyyyccc for example
-    // and maskcounter    = 0000 for example
-    //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
-    //var_dump($reg);
-
-    // If an offset is asked
-    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
-    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
-
-    // Define $sqlwhere
-    $sqlwhere = '';
-    $yearoffset = 0; // Use year of current $date by default
-    $yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
-
-    // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);
-    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);
-
-    //print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
-    if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
-        $maskraz = $yearoffsettype; // For backward compatibility
-    elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
-        $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
-    //print "maskraz=".$maskraz;	// -1=no reset
-
-    if ($maskraz > 0) {   // A reset is required
-        if ($maskraz == 99) {
-            $maskraz = date('m', $date);
-            $resetEveryMonth = true;
-        }
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
-
-        // Define posy, posm and reg
-        if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
-        {
-            if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
-            elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
-            else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-
-            if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
-        }
-        else // if reset is for a specific month in year, we need year
-        {
-            if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; }
-        	elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; }
-            elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; }
-            else return 'ErrorCantUseRazIfNoYearInMask';
-        }
-        // Define length
-        $yearlen = $posy ?dol_strlen($reg[$posy]) : 0;
-        $monthlen = $posm ?dol_strlen($reg[$posm]) : 0;
-        // Define pos
-       	$yearpos = (dol_strlen($reg[1]) + 1);
-        $monthpos = ($yearpos + $yearlen);
-        if ($posy == 3 && $posm == 2) {		// if month is before year
-          	$monthpos = (dol_strlen($reg[1]) + 1);
-           	$yearpos = ($monthpos + $monthlen);
-        }
-        //print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";
-
-        // Define $yearcomp and $monthcomp (that will be use in the select where to search max number)
-        $monthcomp = $maskraz;
-        $yearcomp = 0;
-
-        if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
-        {
-        	$currentyear = date("Y", $date);
-        	$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);
-        	$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);
-        	$nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);
-        	//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
-
-        	// If after or equal of current fiscal date
-        	if ($date >= $fiscaldate)
-        	{
-        		// If before of next new year date
-        		if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;
-        	}
-        	// If after or equal of current new year date
-        	elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;
-        }
-        // For backward compatibility
-        elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year
-
-        if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);
-        elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);
-        elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset;
-        if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
-        {
-            if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);
-            elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);
-
-            $sqlwhere .= "(";
-            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
-            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-            $sqlwhere .= " OR";
-            $sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp1."'";
-            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
-            $sqlwhere .= ')';
-        }
-		elseif ($resetEveryMonth)
-		{
-			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$yearcomp."'";
-            $sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
-		}
-        else   // reset is done on january
-        {
-            $sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$yearcomp."')";
-        }
-    }
-    //print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset
-    //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
-
-    // Define $sqlstring
-    if (function_exists('mb_strrpos'))
-    	{
-    	$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
 	}
-	else
+	$maskwithonlyymcode = $mask;
+	$maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $maskcounter, $maskwithonlyymcode);
+	$maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
+	$maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
+	$maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);
+	$maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);
+	foreach ($maskperso as $key => $val)
 	{
-    	$posnumstart = strrpos($maskwithnocode, $maskcounter);
+		$maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
+	}
+	$maskwithnocode = $maskwithonlyymcode;
+	$maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
+	$maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
+	$maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
+	$maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
+	// Now maskwithnocode = 0000ddmmyyyyccc for example
+	// and maskcounter    = 0000 for example
+	//print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
+	//var_dump($reg);
+
+	// If an offset is asked
+	if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
+	if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
+
+	// Define $sqlwhere
+	$sqlwhere = '';
+	$yearoffset = 0; // Use year of current $date by default
+	$yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
+
+	// If a restore to zero after a month is asked we check if there is already a value for this year.
+	if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);
+	if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);
+
+	//print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
+	if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
+		$maskraz = $yearoffsettype; // For backward compatibility
+	elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
+		$maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+	//print "maskraz=".$maskraz;	// -1=no reset
+
+	if ($maskraz > 0) {   // A reset is required
+		if ($maskraz == 99) {
+			$maskraz = date('m', $date);
+			$resetEveryMonth = true;
+		}
+		if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+
+		// Define posy, posm and reg
+		if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
+		{
+			if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+
+			if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
+		} else // if reset is for a specific month in year, we need year
+		{
+			if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; } else return 'ErrorCantUseRazIfNoYearInMask';
+		}
+		// Define length
+		$yearlen = $posy ?dol_strlen($reg[$posy]) : 0;
+		$monthlen = $posm ?dol_strlen($reg[$posm]) : 0;
+		// Define pos
+	   	$yearpos = (dol_strlen($reg[1]) + 1);
+		$monthpos = ($yearpos + $yearlen);
+		if ($posy == 3 && $posm == 2) {		// if month is before year
+		  	$monthpos = (dol_strlen($reg[1]) + 1);
+		   	$yearpos = ($monthpos + $monthlen);
+		}
+		//print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";
+
+		// Define $yearcomp and $monthcomp (that will be use in the select where to search max number)
+		$monthcomp = $maskraz;
+		$yearcomp = 0;
+
+		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
+		{
+			$currentyear = date("Y", $date);
+			$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);
+			$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);
+			$nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);
+			//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
+
+			// If after or equal of current fiscal date
+			if ($date >= $fiscaldate)
+			{
+				// If before of next new year date
+				if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;
+			} // If after or equal of current new year date
+			elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;
+		} // For backward compatibility
+		elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year
+
+		if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);
+		elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);
+		elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset;
+		if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
+		{
+			if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);
+			elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);
+
+			$sqlwhere .= "(";
+			$sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp)."'";
+			$sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") >= '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
+			$sqlwhere .= " OR";
+			$sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp1)."'";
+			$sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") < '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."') ";
+			$sqlwhere .= ')';
+		} elseif ($resetEveryMonth)
+		{
+			$sqlwhere .= "(SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp)."'";
+			$sqlwhere .= " AND SUBSTRING(".$field.", ".$monthpos.", ".$monthlen.") = '".str_pad($monthcomp, $monthlen, '0', STR_PAD_LEFT)."')";
+		} else // reset is done on january
+		{
+			$sqlwhere .= '(SUBSTRING('.$field.', '.$yearpos.', '.$yearlen.") = '".$db->escape($yearcomp)."')";
+		}
+	}
+	//print "sqlwhere=".$sqlwhere." yearcomp=".$yearcomp."<br>\n";	// sqlwhere and yearcomp defined only if we ask a reset
+	//print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
+
+	// Define $sqlstring
+	if (function_exists('mb_strrpos'))
+		{
+		$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 'UTF-8');
+	} else {
+		$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
-    if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
-    $sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')';
+	if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
+	$sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')';
 
-    // Define $maskLike
-    $maskLike = dol_string_nospecial($mask);
-    $maskLike = str_replace("%", "_", $maskLike);
+	// Define $maskLike
+	$maskLike = dol_string_nospecial($mask);
+	$maskLike = str_replace("%", "_", $maskLike);
 
-    // Replace protected special codes with matching number of _ as wild card caracter
-    $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
-    $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
-    $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
-    $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
-    $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
-    $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);
-    if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
-    if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
-    if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
-    foreach ($maskperso as $key => $val)
-    {
-    	$maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike);
-    }
+	// Replace protected special codes with matching number of _ as wild card caracter
+	$maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
+	$maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
+	$maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
+	$maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
+	$maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
+	$maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);
+	if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
+	if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
+	if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
+	foreach ($maskperso as $key => $val)
+	{
+		$maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike);
+	}
 
-    // Get counter in database
-    $counter = 0;
-    $sql = "SELECT MAX(".$sqlstring.") as val";
-    $sql .= " FROM ".MAIN_DB_PREFIX.$table;
-    $sql .= " WHERE ".$field." LIKE '".$maskLike."'";
+	// Get counter in database
+	$counter = 0;
+	$sql = "SELECT MAX(".$sqlstring.") as val";
+	$sql .= " FROM ".MAIN_DB_PREFIX.$table;
+	$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike)."'";
 	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";
-    if ($bentityon) // only if entity enable
-    	$sql .= " AND entity IN (".getEntity($sharetable).")";
-    elseif (!empty($forceentity))
-    	$sql .= " AND entity IN (".$forceentity.")";
-    if ($where) $sql .= $where;
-    if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
+	if ($bentityon) // only if entity enable
+		$sql .= " AND entity IN (".getEntity($sharetable).")";
+	elseif (!empty($forceentity))
+		$sql .= " AND entity IN (".$forceentity.")";
+	if ($where) $sql .= $where;
+	if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
 
-    //print $sql.'<br>';
-    dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $obj = $db->fetch_object($resql);
-        $counter = $obj->val;
-    }
-    else dol_print_error($db);
+	//print $sql.'<br>';
+	dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$obj = $db->fetch_object($resql);
+		$counter = $obj->val;
+	} else dol_print_error($db);
 
-    // Check if we must force counter to maskoffset
-    if (empty($counter)) $counter = $maskoffset;
-    elseif (preg_match('/[^0-9]/i', $counter))
-    {
-    	$counter = 0;
-    	dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
-    }
-    elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;
+	// Check if we must force counter to maskoffset
+	if (empty($counter)) $counter = $maskoffset;
+	elseif (preg_match('/[^0-9]/i', $counter))
+	{
+		$counter = 0;
+		dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
+	} elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;
 
-    if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
-    {
-        $counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
+	if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
+	{
+		$counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
 
-        // Define $maskLike
-        $maskLike = dol_string_nospecial($mask);
-        $maskLike = str_replace("%", "_", $maskLike);
-        // Replace protected special codes with matching number of _ as wild card caracter
-        $maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
-        $maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
-        $maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
-        $maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
-        $maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
-        $maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);
-        if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
-        if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
-        if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
+		// Define $maskLike
+		$maskLike = dol_string_nospecial($mask);
+		$maskLike = str_replace("%", "_", $maskLike);
+		// Replace protected special codes with matching number of _ as wild card caracter
+		$maskLike = preg_replace('/\{yyyy\}/i', '____', $maskLike);
+		$maskLike = preg_replace('/\{yy\}/i', '__', $maskLike);
+		$maskLike = preg_replace('/\{y\}/i', '_', $maskLike);
+		$maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
+		$maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
+		$maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);
+		if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
+		if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
+		if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
 
-        $ref = '';
-        $sql = "SELECT ".$field." as ref";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$table;
-        $sql .= " WHERE ".$field." LIKE '".$maskLike."'";
-    	$sql .= " AND ".$field." NOT LIKE '%PROV%'";
-    	if ($bentityon) // only if entity enable
-        	$sql .= " AND entity IN (".getEntity($sharetable).")";
-        elseif (!empty($forceentity))
-        	$sql .= " AND entity IN (".$forceentity.")";
-        if ($where) $sql .= $where;
-        if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
+		$ref = '';
+		$sql = "SELECT ".$field." as ref";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$table;
+		$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike)."'";
+		$sql .= " AND ".$field." NOT LIKE '%PROV%'";
+		if ($bentityon) // only if entity enable
+			$sql .= " AND entity IN (".getEntity($sharetable).")";
+		elseif (!empty($forceentity))
+			$sql .= " AND entity IN (".$forceentity.")";
+		if ($where) $sql .= $where;
+		if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
 
-        dol_syslog("functions2::get_next_value mode=".$mode."", 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("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $ref = $obj->ref;
+		} else dol_print_error($db);
 
-        $numFinal = $ref;
-    }
-    elseif ($mode == 'next')
-    {
-        $counter++;
+		$numFinal = $ref;
+	} elseif ($mode == 'next')
+	{
+		$counter++;
 
-        // If value for $counter has a length higher than $maskcounter chars
-        if ($counter >= pow(10, dol_strlen($maskcounter)))
-        {
-        	$counter = 'ErrorMaxNumberReachForThisMask';
-        }
+		// If value for $counter has a length higher than $maskcounter chars
+		if ($counter >= pow(10, dol_strlen($maskcounter)))
+		{
+			$counter = 'ErrorMaxNumberReachForThisMask';
+		}
 
-        if (!empty($maskrefclient_maskcounter))
-        {
-            //print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";
+		if (!empty($maskrefclient_maskcounter))
+		{
+			//print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";
 
-            // Define $sqlstring
-            $maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...)
-            if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';
-            $maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')';
-            //print "x".$sqlstring;
+			// Define $sqlstring
+			$maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...)
+			if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';
+			$maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')';
+			//print "x".$sqlstring;
 
-            // Define $maskrefclient_maskLike
-            $maskrefclient_maskLike = dol_string_nospecial($mask);
-            $maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike);
-            // Replace protected special codes with matching number of _ as wild card caracter
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike);
-            $maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);
+			// Define $maskrefclient_maskLike
+			$maskrefclient_maskLike = dol_string_nospecial($mask);
+			$maskrefclient_maskLike = str_replace("%", "_", $maskrefclient_maskLike);
+			// Replace protected special codes with matching number of _ as wild card caracter
+			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{yyyy}'), '____', $maskrefclient_maskLike);
+			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{yy}'), '__', $maskrefclient_maskLike);
+			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{y}'), '_', $maskrefclient_maskLike);
+			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{mm}'), '__', $maskrefclient_maskLike);
+			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{dd}'), '__', $maskrefclient_maskLike);
+			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskrefclient_maskLike);
+			$maskrefclient_maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), $maskrefclient_clientcode.str_pad("", dol_strlen($maskrefclient_maskcounter), "_"), $maskrefclient_maskLike);
 
-            // Get counter in database
-            $maskrefclient_counter = 0;
-            $maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";
-            $maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;
-            //$sql.= " WHERE ".$field." not like '(%'";
-            $maskrefclient_sql .= " WHERE ".$field." LIKE '".$maskrefclient_maskLike."'";
-            if ($bentityon) // only if entity enable
-            	$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";
-            elseif (!empty($forceentity))
-            	$sql .= " AND entity IN (".$forceentity.")";
-            if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask
-            if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask
-            $maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$maskrefclient_clientcode."')";
+			// Get counter in database
+			$maskrefclient_counter = 0;
+			$maskrefclient_sql = "SELECT MAX(".$maskrefclient_sqlstring.") as val";
+			$maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;
+			//$sql.= " WHERE ".$field." not like '(%'";
+			$maskrefclient_sql .= " WHERE ".$field." LIKE '".$db->escape($maskrefclient_maskLike)."'";
+			if ($bentityon) // only if entity enable
+				$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";
+			elseif (!empty($forceentity))
+				$sql .= " AND entity IN (".$forceentity.")";
+			if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask
+			if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask
+			$maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$db->escape($maskrefclient_clientcode)."')";
 
-            dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
-            $maskrefclient_resql = $db->query($maskrefclient_sql);
-            if ($maskrefclient_resql)
-            {
-                $maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
-                $maskrefclient_counter = $maskrefclient_obj->val;
-            }
-            else dol_print_error($db);
+			dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
+			$maskrefclient_resql = $db->query($maskrefclient_sql);
+			if ($maskrefclient_resql)
+			{
+				$maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
+				$maskrefclient_counter = $maskrefclient_obj->val;
+			} else dol_print_error($db);
 
-            if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;
+			if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;
 			$maskrefclient_counter++;
-        }
+		}
 
-        // Build numFinal
-        $numFinal = $mask;
+		// Build numFinal
+		$numFinal = $mask;
 
-        // We replace special codes except refclient
+		// We replace special codes except refclient
 		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
 		{
-	        $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);
-		}
-		else	// we want yyyy to be current year
+			$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);
+			$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);
+			$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);
+		} else // we want yyyy to be current year
 		{
-        	$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);
-        	$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);
-        	$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal);
+			$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);
+			$numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);
+			$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1), $numFinal);
 		}
-        $numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal);
-        $numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal);
+		$numFinal = preg_replace('/\{mm\}/i', date("m", $date), $numFinal);
+		$numFinal = preg_replace('/\{dd\}/i', date("d", $date), $numFinal);
 
-        // Now we replace the counter
-        $maskbefore = '{'.$masktri.'}';
-        $maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
-        //print 'x'.$maskbefore.'-'.$maskafter.'y';
-        $numFinal = str_replace($maskbefore, $maskafter, $numFinal);
+		// Now we replace the counter
+		$maskbefore = '{'.$masktri.'}';
+		$maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
+		//print 'x'.$maskbefore.'-'.$maskafter.'y';
+		$numFinal = str_replace($maskbefore, $maskafter, $numFinal);
 
-        // Now we replace the refclient
-        if ($maskrefclient)
-        {
-            //print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n<br>";exit;
-            $maskrefclient_maskbefore = '{'.$maskrefclient.'}';
-            $maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);
-            $numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);
-        }
+		// Now we replace the refclient
+		if ($maskrefclient)
+		{
+			//print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n<br>";exit;
+			$maskrefclient_maskbefore = '{'.$maskrefclient.'}';
+			$maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);
+			$numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);
+		}
 
-        // Now we replace the type
-        if ($masktype)
-        {
-            $masktype_maskbefore = '{'.$masktype.'}';
-            $masktype_maskafter = $masktype_value;
-            $numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);
-        }
+		// Now we replace the type
+		if ($masktype)
+		{
+			$masktype_maskbefore = '{'.$masktype.'}';
+			$masktype_maskafter = $masktype_value;
+			$numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);
+		}
 
-        // Now we replace the user
-        if ($maskuser)
-        {
-        	$maskuser_maskbefore = '{'.$maskuser.'}';
-        	$maskuser_maskafter = $maskuser_value;
-        	$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);
-        }
-    }
+		// Now we replace the user
+		if ($maskuser)
+		{
+			$maskuser_maskbefore = '{'.$maskuser.'}';
+			$maskuser_maskafter = $maskuser_value;
+			$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);
+		}
+	}
 
-    dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG);
-    return $numFinal;
+	dol_syslog("functions2::get_next_value return ".$numFinal, LOG_DEBUG);
+	return $numFinal;
 }
 
 /**
@@ -1197,12 +1163,12 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
  */
 function get_string_between($string, $start, $end)
 {
-    $string = " ".$string;
-     $ini = strpos($string, $start);
-     if ($ini == 0) return "";
-     $ini += strlen($start);
-     $len = strpos($string, $end, $ini) - $ini;
-     return substr($string, $ini, $len);
+	$string = " ".$string;
+	 $ini = strpos($string, $start);
+	 if ($ini == 0) return "";
+	 $ini += strlen($start);
+	 $len = strpos($string, $end, $ini) - $ini;
+	 return substr($string, $ini, $len);
 }
 
 /**
@@ -1214,93 +1180,91 @@ function get_string_between($string, $start, $end)
  */
 function check_value($mask, $value)
 {
-    $result = 0;
+	$result = 0;
 
-    $hasglobalcounter = false;
-    // Extract value for mask counter, mask raz and mask offset
-    if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
-    {
-        $masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');
-        $maskcounter = $reg[1];
-        $hasglobalcounter = true;
-    }
-    else
-    {
-        // setting some defaults so the rest of the code won't fail if there is a third party counter
-        $masktri = '00000';
-        $maskcounter = '00000';
-    }
+	$hasglobalcounter = false;
+	// Extract value for mask counter, mask raz and mask offset
+	$reg = array();
+	if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
+	{
+		$masktri = $reg[1].(isset($reg[2]) ? $reg[2] : '').(isset($reg[3]) ? $reg[3] : '');
+		$maskcounter = $reg[1];
+		$hasglobalcounter = true;
+	} else {
+		// setting some defaults so the rest of the code won't fail if there is a third party counter
+		$masktri = '00000';
+		$maskcounter = '00000';
+	}
+	$maskraz = -1;
+	$maskoffset = 0;
+	if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
 
-    $maskraz = -1;
-    $maskoffset = 0;
-    if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+	// Extract value for third party mask counter
+	$regClientRef = array();
+	if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
+	{
+		$maskrefclient = $regClientRef[1].$regClientRef[2];
+		$maskrefclient_maskclientcode = $regClientRef[1];
+		$maskrefclient_maskcounter = $regClientRef[2];
+		$maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
+		$maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode
+		$maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
+		$maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
+		if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+	} else $maskrefclient = '';
 
-    // Extract value for third party mask counter
-    if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
-    {
-        $maskrefclient = $regClientRef[1].$regClientRef[2];
-        $maskrefclient_maskclientcode = $regClientRef[1];
-        $maskrefclient_maskcounter = $regClientRef[2];
-        $maskrefclient_maskoffset = 0; //default value of maskrefclient_counter offset
-        $maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode
-        $maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
-        $maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
-        if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-    }
-    else $maskrefclient = '';
+	// fail if there is neither a global nor a third party counter
+	if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
+	{
+		return 'ErrorBadMask';
+	}
 
-    // fail if there is neither a global nor a third party counter
-    if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
-    {
-        return 'ErrorBadMask';
-    }
+	$maskwithonlyymcode = $mask;
+	$maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);
+	$maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
+	$maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
+	$maskwithnocode = $maskwithonlyymcode;
+	$maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
+	$maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
+	$maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
+	$maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
+	// Now maskwithnocode = 0000ddmmyyyyccc for example
+	// and maskcounter    = 0000 for example
+	//print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
 
-    $maskwithonlyymcode = $mask;
-    $maskwithonlyymcode = preg_replace('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $maskcounter, $maskwithonlyymcode);
-    $maskwithonlyymcode = preg_replace('/\{dd\}/i', 'dd', $maskwithonlyymcode);
-    $maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
-    $maskwithnocode = $maskwithonlyymcode;
-    $maskwithnocode = preg_replace('/\{yyyy\}/i', 'yyyy', $maskwithnocode);
-    $maskwithnocode = preg_replace('/\{yy\}/i', 'yy', $maskwithnocode);
-    $maskwithnocode = preg_replace('/\{y\}/i', 'y', $maskwithnocode);
-    $maskwithnocode = preg_replace('/\{mm\}/i', 'mm', $maskwithnocode);
-    // Now maskwithnocode = 0000ddmmyyyyccc for example
-    // and maskcounter    = 0000 for example
-    //print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
+	// If an offset is asked
+	if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
+	if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
 
-    // If an offset is asked
-    if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
-    if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
+	// Define $sqlwhere
 
-    // Define $sqlwhere
+	// If a restore to zero after a month is asked we check if there is already a value for this year.
+	if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz = preg_replace('/^@/', '', $reg[2]);
+	if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz = preg_replace('/^@/', '', $reg[3]);
+	if ($maskraz >= 0)
+	{
+		if ($maskraz == 99) {
+			$maskraz = date('m');
+			$resetEveryMonth = true;
+		}
+		if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
 
-    // If a restore to zero after a month is asked we check if there is already a value for this year.
-    if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz = preg_replace('/^@/', '', $reg[2]);
-    if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz = preg_replace('/^@/', '', $reg[3]);
-    if ($maskraz >= 0)
-    {
-        if ($maskraz == 99) {
-            $maskraz = date('m');
-            $resetEveryMonth = true;
-        }
-        if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+		// Define reg
+		if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+		if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';
+		//print "x".$maskwithonlyymcode." ".$maskraz;
+	}
+	//print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
-        // Define reg
-        if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-        if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';
-        //print "x".$maskwithonlyymcode." ".$maskraz;
-    }
-    //print "masktri=".$masktri." maskcounter=".$maskcounter." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
+	// Check we have a number in ($posnumstart+1).', '.dol_strlen($maskcounter)
+	//
 
-    // Check we have a number in ($posnumstart+1).', '.dol_strlen($maskcounter)
-    //
+	// Check length
+	$len = dol_strlen($maskwithnocode);
+	if (dol_strlen($value) != $len) $result = -1;
 
-    // Check length
-    $len = dol_strlen($maskwithnocode);
-    if (dol_strlen($value) != $len) $result = -1;
-
-    // Define $maskLike
-    /* seems not used
+	// Define $maskLike
+	/* seems not used
     $maskLike = dol_string_nospecial($mask);
     $maskLike = str_replace("%","_",$maskLike);
     // Replace protected special codes with matching number of _ as wild card caracter
@@ -1313,8 +1277,8 @@ function check_value($mask, $value)
     if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'),str_pad("",strlen($maskrefclient),"_"),$maskLike);
 	*/
 
-    dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);
-    return $result;
+	dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);
+	return $result;
 }
 
 /**
@@ -1327,12 +1291,12 @@ function check_value($mask, $value)
  */
 function binhex($bin, $pad = false, $upper = false)
 {
-    $last = dol_strlen($bin) - 1;
-    for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); }
-    $x = dechex($x);
-    if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } }
-    if ($upper) { $x = strtoupper($x); }
-    return $x;
+	$last = dol_strlen($bin) - 1;
+	for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); }
+	$x = dechex($x);
+	if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } }
+	if ($upper) { $x = strtoupper($x); }
+	return $x;
 }
 
 /**
@@ -1343,13 +1307,13 @@ function binhex($bin, $pad = false, $upper = false)
  */
 function hexbin($hexa)
 {
-    $bin = '';
-    $strLength = dol_strlen($hexa);
-    for ($i = 0; $i < $strLength; $i++)
-    {
-        $bin .= str_pad(decbin(hexdec($hexa[$i])), 4, '0', STR_PAD_LEFT);
-    }
-    return $bin;
+	$bin = '';
+	$strLength = dol_strlen($hexa);
+	for ($i = 0; $i < $strLength; $i++)
+	{
+		$bin .= str_pad(decbin(hexdec($hexa[$i])), 4, '0', STR_PAD_LEFT);
+	}
+	return $bin;
 }
 
 /**
@@ -1360,77 +1324,72 @@ function hexbin($hexa)
  */
 function numero_semaine($time)
 {
-    $stime = strftime('%Y-%m-%d', $time);
+	$stime = strftime('%Y-%m-%d', $time);
 
-    if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg))
-    {
-        // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
-        $annee = $reg[1];
-        $mois = $reg[2];
-        $jour = $reg[3];
-    }
+	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg))
+	{
+		// Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
+		$annee = $reg[1];
+		$mois = $reg[2];
+		$jour = $reg[3];
+	}
 
-    /*
+	/*
      * Norme ISO-8601:
      * - La semaine 1 de toute annee est celle qui contient le 4 janvier ou que la semaine 1 de toute annee est celle qui contient le 1er jeudi de janvier.
      * - La majorite des annees ont 52 semaines mais les annees qui commence un jeudi et les annees bissextiles commencant un mercredi en possede 53.
      * - Le 1er jour de la semaine est le Lundi
      */
 
-    // Definition du Jeudi de la semaine
-    if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche
-    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;
-    elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi
-    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
-    elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi
-    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
-    else // Jeudi
-    $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);
+	// Definition du Jeudi de la semaine
+	if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche
+	$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;
+	elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi
+	$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
+	elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi
+	$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
+	else // Jeudi
+	$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);
 
-    // Definition du premier Jeudi de l'annee
-    if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche
-    {
-        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
-    }
-    elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi
-    {
-        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
-    }
-    elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi
-    {
-        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
-    }
-    else // Jeudi
-    {
-        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));
-    }
+	// Definition du premier Jeudi de l'annee
+	if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche
+	{
+		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
+	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi
+	{
+		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
+	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi
+	{
+		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
+	} else // Jeudi
+	{
+		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine));
+	}
 
-    // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
-    $numeroSemaine = (
-    (
-    date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))
-    -
-    date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))
-    ) / 7
-    ) + 1;
+	// Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
+	$numeroSemaine = (
+	(
+	date("z", mktime(12, 0, 0, date("m", $jeudiSemaine), date("d", $jeudiSemaine), date("Y", $jeudiSemaine)))
+	-
+	date("z", mktime(12, 0, 0, date("m", $premierJeudiAnnee), date("d", $premierJeudiAnnee), date("Y", $premierJeudiAnnee)))
+	) / 7
+	) + 1;
 
-    // Cas particulier de la semaine 53
-    if ($numeroSemaine == 53)
-    {
-        // Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53
-        if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))
-        {
-            $numeroSemaine = 53;
-        }
-        else
-        {
-            $numeroSemaine = 1;
-        }
-    }
+	// Cas particulier de la semaine 53
+	if ($numeroSemaine == 53)
+	{
+		// Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53
+		if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))
+		{
+			$numeroSemaine = 53;
+		} else {
+			$numeroSemaine = 1;
+		}
+	}
 
-    //echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."<BR>";
+	//echo $jour."-".$mois."-".$annee." (".date("d-m-Y",$premierJeudiAnnee)." - ".date("d-m-Y",$jeudiSemaine).") -> ".$numeroSemaine."<BR>";
 
-    return sprintf("%02d", $numeroSemaine);
+	return sprintf("%02d", $numeroSemaine);
 }
 
 /**
@@ -1443,28 +1402,28 @@ function numero_semaine($time)
  */
 function weight_convert($weight, &$from_unit, $to_unit)
 {
-    /* Pour convertire 320 gr en Kg appeler
+	/* Pour convertire 320 gr en Kg appeler
      *  $f = -3
      *  weigh_convert(320, $f, 0) retournera 0.32
      *
      */
-    while ($from_unit <> $to_unit)
-    {
-        if ($from_unit > $to_unit)
-        {
-            $weight = $weight * 10;
-            $from_unit = $from_unit - 1;
-            $weight = weight_convert($weight, $from_unit, $to_unit);
-        }
-        if ($from_unit < $to_unit)
-        {
-            $weight = $weight / 10;
-            $from_unit = $from_unit + 1;
-            $weight = weight_convert($weight, $from_unit, $to_unit);
-        }
-    }
+	while ($from_unit <> $to_unit)
+	{
+		if ($from_unit > $to_unit)
+		{
+			$weight = $weight * 10;
+			$from_unit = $from_unit - 1;
+			$weight = weight_convert($weight, $from_unit, $to_unit);
+		}
+		if ($from_unit < $to_unit)
+		{
+			$weight = $weight / 10;
+			$from_unit = $from_unit + 1;
+			$weight = weight_convert($weight, $from_unit, $to_unit);
+		}
+	}
 
-    return $weight;
+	return $weight;
 }
 
 /**
@@ -1480,62 +1439,60 @@ function weight_convert($weight, &$from_unit, $to_unit)
  */
 function dol_set_user_param($db, $conf, &$user, $tab)
 {
-    // Verification parametres
-    if (count($tab) < 1) return -1;
+	// Verification parametres
+	if (count($tab) < 1) return -1;
 
-    $db->begin();
+	$db->begin();
 
-    // We remove old parameters for all keys in $tab
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
-    $sql .= " WHERE fk_user = ".$user->id;
-    $sql .= " AND entity = ".$conf->entity;
-    $sql .= " AND param in (";
-    $i = 0;
-    foreach ($tab as $key => $value)
-    {
-        if ($i > 0) $sql .= ',';
-        $sql .= "'".$db->escape($key)."'";
-        $i++;
-    }
-    $sql .= ")";
-    dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
+	// We remove old parameters for all keys in $tab
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param";
+	$sql .= " WHERE fk_user = ".$user->id;
+	$sql .= " AND entity = ".$conf->entity;
+	$sql .= " AND param in (";
+	$i = 0;
+	foreach ($tab as $key => $value)
+	{
+		if ($i > 0) $sql .= ',';
+		$sql .= "'".$db->escape($key)."'";
+		$i++;
+	}
+	$sql .= ")";
+	dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
 
-    $resql = $db->query($sql);
-    if (!$resql)
-    {
-        dol_print_error($db);
-        $db->rollback();
-        return -1;
-    }
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		$db->rollback();
+		return -1;
+	}
 
-    foreach ($tab as $key => $value)
-    {
-        // Set new parameters
-        if ($value)
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
-            $sql .= " VALUES (".$user->id.",".$conf->entity.",";
-            $sql .= " '".$db->escape($key)."','".$db->escape($value)."')";
+	foreach ($tab as $key => $value)
+	{
+		// Set new parameters
+		if ($value)
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
+			$sql .= " VALUES (".$user->id.",".$conf->entity.",";
+			$sql .= " '".$db->escape($key)."','".$db->escape($value)."')";
 
-            dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
-            $result = $db->query($sql);
-            if (!$result)
-            {
-                dol_print_error($db);
-                $db->rollback();
-                return -1;
-            }
-            $user->conf->$key = $value;
-            //print "key=".$key." user->conf->key=".$user->conf->$key;
-        }
-        else
-        {
-            unset($user->conf->$key);
-        }
-    }
+			dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
+			$result = $db->query($sql);
+			if (!$result)
+			{
+				dol_print_error($db);
+				$db->rollback();
+				return -1;
+			}
+			$user->conf->$key = $value;
+			//print "key=".$key." user->conf->key=".$user->conf->$key;
+		} else {
+			unset($user->conf->$key);
+		}
+	}
 
-    $db->commit();
-    return 1;
+	$db->commit();
+	return 1;
 }
 
 /**
@@ -1547,17 +1504,15 @@ function dol_set_user_param($db, $conf, &$user, $tab)
  */
 function dol_print_reduction($reduction, $langs)
 {
-    $string = '';
-    if ($reduction == 100)
-    {
-        $string = $langs->transnoentities("Offered");
-    }
-    else
-    {
-    	$string = vatrate($reduction, true);
-    }
+	$string = '';
+	if ($reduction == 100)
+	{
+		$string = $langs->transnoentities("Offered");
+	} else {
+		$string = vatrate($reduction, true);
+	}
 
-    return $string;
+	return $string;
 }
 
 /**
@@ -1571,7 +1526,7 @@ function version_os($option = '')
 {
 	if ($option == 'smr') $osversion = php_uname('s').' '.php_uname('m').' '.php_uname('r');
 	else $osversion = php_uname();
-    return $osversion;
+	return $osversion;
 }
 
 /**
@@ -1582,7 +1537,7 @@ function version_os($option = '')
  */
 function version_php()
 {
-    return phpversion();
+	return phpversion();
 }
 
 /**
@@ -1593,7 +1548,7 @@ function version_php()
  */
 function version_dolibarr()
 {
-    return DOL_VERSION;
+	return DOL_VERSION;
 }
 
 /**
@@ -1603,7 +1558,7 @@ function version_dolibarr()
  */
 function version_webserver()
 {
-    return $_SERVER["SERVER_SOFTWARE"];
+	return $_SERVER["SERVER_SOFTWARE"];
 }
 
 /**
@@ -1616,96 +1571,89 @@ function version_webserver()
  */
 function getListOfModels($db, $type, $maxfilenamelength = 0)
 {
-    global $conf, $langs;
-    $liste = array();
-    $found = 0;
-    $dirtoscan = '';
+	global $conf, $langs;
+	$liste = array();
+	$found = 0;
+	$dirtoscan = '';
 
-    $sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description";
-    $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-    $sql .= " WHERE type = '".$type."'";
-    $sql .= " AND entity IN (0,".$conf->entity.")";
-    $sql .= " ORDER BY description DESC";
+	$sql = "SELECT nom as id, nom as doc_template_name, libelle as label, description as description";
+	$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+	$sql .= " WHERE type = '".$db->escape($type)."'";
+	$sql .= " AND entity IN (0,".$conf->entity.")";
+	$sql .= " ORDER BY description DESC";
 
-    dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        while ($i < $num)
-        {
-            $found = 1;
+	dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num)
+		{
+			$found = 1;
 
-            $obj = $db->fetch_object($resql);
+			$obj = $db->fetch_object($resql);
 
-            // If this generation module needs to scan a directory, then description field is filled
-            // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
-            if (!empty($obj->description))	// A list of directories to scan is defined
-            {
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			// If this generation module needs to scan a directory, then description field is filled
+			// with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
+			if (!empty($obj->description))	// A list of directories to scan is defined
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-                $const = $obj->description;
-                //irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
-                $dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const));
+				$const = $obj->description;
+				//irtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
+				$dirtoscan = preg_replace('/[\r\n]+/', ',', trim($conf->global->$const));
 
-                $listoffiles = array();
+				$listoffiles = array();
 
-                // Now we add models found in directories scanned
-                $listofdir = explode(',', $dirtoscan);
-                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))
-                    {
-                        // all type of template is allowed
-                        $tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
-                        if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
-                    }
-                }
+				// Now we add models found in directories scanned
+				$listofdir = explode(',', $dirtoscan);
+				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))
+					{
+						// all type of template is allowed
+						$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
+						if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+					}
+				}
 
-                if (count($listoffiles))
-                {
-                    foreach ($listoffiles as $record)
-                    {
-                        $max = ($maxfilenamelength ? $maxfilenamelength : 28);
-                        $liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');
-                    }
-                }
-                else
-                {
-                    $liste[0] = $obj->label.': '.$langs->trans("None");
-                }
-            }
-            else
-            {
-            	if ($type == 'member' && $obj->doc_template_name == 'standard')   // Special case, if member template, we add variant per format
-                {
-                    global $_Avery_Labels;
-                    include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
-                    foreach ($_Avery_Labels as $key => $val)
-                    {
-                    	$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
-                    }
-                }
-                else    // Common usage
-                {
-                	$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;
-                }
-            }
-            $i++;
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-        return -1;
-    }
+				if (count($listoffiles))
+				{
+					foreach ($listoffiles as $record)
+					{
+						$max = ($maxfilenamelength ? $maxfilenamelength : 28);
+						$liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');
+					}
+				} else {
+					$liste[0] = $obj->label.': '.$langs->trans("None");
+				}
+			} else {
+				if ($type == 'member' && $obj->doc_template_name == 'standard')   // Special case, if member template, we add variant per format
+				{
+					global $_Avery_Labels;
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
+					foreach ($_Avery_Labels as $key => $val)
+					{
+						$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
+					}
+				} else // Common usage
+				{
+					$liste[$obj->id] = $obj->label ? $obj->label : $obj->doc_template_name;
+				}
+			}
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
+		return -1;
+	}
 
-    if ($found) return $liste;
-    else return 0;
+	if ($found) return $liste;
+	else return 0;
 }
 
 /**
@@ -1740,11 +1688,11 @@ 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
-    return $login;
+	$login = strtolower(dol_string_unaccent($firstname));
+	$login .= ($login ? '.' : '');
+	$login .= strtolower(dol_string_unaccent($lastname));
+	$login = dol_string_nospecial($login, ''); // For special names
+	return $login;
 }
 
 /**
@@ -1754,42 +1702,40 @@ function dol_buildlogin($lastname, $firstname)
  */
 function getSoapParams()
 {
-    global $conf;
+	global $conf;
 
-    $params = array();
-    $proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true);
-    $proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST);
-    $proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT);
-    $proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER);
-    $proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS);
-    $timeout = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout
-    $response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout
-    //print extension_loaded('soap');
-    if ($proxyuse)
-    {
-        $params = array('connection_timeout'=>$timeout,
-                      'response_timeout'=>$response_timeout,
-                      'proxy_use'      => 1,
-                      'proxy_host'     => $proxyhost,
-                      'proxy_port'     => $proxyport,
-                      'proxy_login'    => $proxyuser,
-                      'proxy_password' => $proxypass,
-                      'trace'		   => 1
-        );
-    }
-    else
-    {
-        $params = array('connection_timeout'=>$timeout,
-                      'response_timeout'=>$response_timeout,
-                      'proxy_use'      => 0,
-                      'proxy_host'     => false,
-                      'proxy_port'     => false,
-                      'proxy_login'    => false,
-                      'proxy_password' => false,
-                      'trace'		   => 1
-        );
-    }
-    return $params;
+	$params = array();
+	$proxyuse = (empty($conf->global->MAIN_PROXY_USE) ?false:true);
+	$proxyhost = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_HOST);
+	$proxyport = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PORT);
+	$proxyuser = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_USER);
+	$proxypass = (empty($conf->global->MAIN_PROXY_USE) ?false:$conf->global->MAIN_PROXY_PASS);
+	$timeout = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout
+	$response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout
+	//print extension_loaded('soap');
+	if ($proxyuse)
+	{
+		$params = array('connection_timeout'=>$timeout,
+					  'response_timeout'=>$response_timeout,
+					  'proxy_use'      => 1,
+					  'proxy_host'     => $proxyhost,
+					  'proxy_port'     => $proxyport,
+					  'proxy_login'    => $proxyuser,
+					  'proxy_password' => $proxypass,
+					  'trace'		   => 1
+		);
+	} else {
+		$params = array('connection_timeout'=>$timeout,
+					  'response_timeout'=>$response_timeout,
+					  'proxy_use'      => 0,
+					  'proxy_host'     => false,
+					  'proxy_port'     => false,
+					  'proxy_login'    => false,
+					  'proxy_password' => false,
+					  'trace'		   => 1
+		);
+	}
+	return $params;
 }
 
 
@@ -1832,64 +1778,51 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classpath = 'compta/facture/class';
 		$module = 'facture';
 		$myobject = 'facture';
-	}
-	elseif ($objecttype == 'commande' || $objecttype == 'order') {
+	} elseif ($objecttype == 'commande' || $objecttype == 'order') {
 		$classpath = 'commande/class';
 		$module = 'commande';
 		$myobject = 'commande';
-	}
-	elseif ($objecttype == 'propal') {
+	} elseif ($objecttype == 'propal') {
 		$classpath = 'comm/propal/class';
-	}
-	elseif ($objecttype == 'supplier_proposal') {
+	} elseif ($objecttype == 'supplier_proposal') {
 		$classpath = 'supplier_proposal/class';
-	}
-	elseif ($objecttype == 'shipping') {
+	} elseif ($objecttype == 'shipping') {
 		$classpath = 'expedition/class';
 		$myobject = 'expedition';
 		$module = 'expedition_bon';
-	}
-	elseif ($objecttype == 'delivery') {
+	} elseif ($objecttype == 'delivery') {
 		$classpath = 'livraison/class';
 		$myobject = 'livraison';
 		$module = 'livraison_bon';
-	}
-	elseif ($objecttype == 'contract') {
+	} elseif ($objecttype == 'contract') {
 		$classpath = 'contrat/class';
 		$module = 'contrat';
 		$myobject = 'contrat';
-	}
-	elseif ($objecttype == 'member') {
+	} elseif ($objecttype == 'member') {
 		$classpath = 'adherents/class';
 		$module = 'adherent';
 		$myobject = 'adherent';
-	}
-	elseif ($objecttype == 'cabinetmed_cons') {
+	} elseif ($objecttype == 'cabinetmed_cons') {
 		$classpath = 'cabinetmed/class';
 		$module = 'cabinetmed';
 		$myobject = 'cabinetmedcons';
-	}
-	elseif ($objecttype == 'fichinter') {
+	} elseif ($objecttype == 'fichinter') {
 		$classpath = 'fichinter/class';
 		$module = 'ficheinter';
 		$myobject = 'fichinter';
-	}
-	elseif ($objecttype == 'task') {
+	} elseif ($objecttype == 'task') {
 		$classpath = 'projet/class';
 		$module = 'projet';
 		$myobject = 'task';
-	}
-	elseif ($objecttype == 'stock') {
+	} elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
 		$module = 'stock';
 		$myobject = 'stock';
-	}
-	elseif ($objecttype == 'inventory') {
+	} elseif ($objecttype == 'inventory') {
 		$classpath = 'product/inventory/class';
 		$module = 'stock';
 		$myobject = 'inventory';
-	}
-	elseif ($objecttype == 'mo') {
+	} elseif ($objecttype == 'mo') {
 		$classpath = 'mrp/class';
 		$module = 'mrp';
 		$myobject = 'mo';
@@ -1904,14 +1837,12 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classname = 'FactureFournisseur';
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
-	}
-	elseif ($objecttype == 'order_supplier') {
+	} elseif ($objecttype == 'order_supplier') {
 		$classfile = 'fournisseur.commande';
 		$classname = 'CommandeFournisseur';
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
-	}
-	elseif ($objecttype == 'stock') {
+	} elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
 		$classfile = 'entrepot';
 		$classname = 'Entrepot';
@@ -1932,8 +1863,7 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 					$ret = $langs->trans('Deleted');
 				}
 				unset($object);
-			}
-			else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+			} else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
 		}
 	}
 	return $ret;
@@ -1968,9 +1898,7 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 			if ($obj->parent_id > 0) $listofparentid[$obj->rowid] = $obj->parent_id;
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -2107,13 +2035,13 @@ function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))
  */
 function colorValidateHex($color, $allow_white = true)
 {
-    if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) return false;
+	if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) return false;
 
-    if (preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid
-    {
-        return true;
-    }
-    return false;
+	if (preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid
+	{
+		return true;
+	}
+	return false;
 }
 
 /**
@@ -2148,8 +2076,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 		{
 			if ($color > 127) $color += ((255 - $color) * ($ratio / 100));
 			if ($color < 128) $color -= ($color * ($ratio / 100));
-		}
-		else			// We decrease agressiveness
+		} else // We decrease agressiveness
 		{
 			if ($color > 128) $color -= (($color - 128) * (abs($ratio) / 100));
 			if ($color < 127) $color += ((128 - $color) * (abs($ratio) / 100));
@@ -2157,9 +2084,7 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 		if ($brightness > 0)
 		{
 			$color = ($color * (100 + abs($brightness)) / 100);
-		}
-		else
-		{
+		} else {
 			$color = ($color * (100 - abs($brightness)) / 100);
 		}
 
@@ -2179,26 +2104,26 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
  */
 function colorAdjustBrightness($hex, $steps)
 {
-    // Steps should be between -255 and 255. Negative = darker, positive = lighter
-    $steps = max(-255, min(255, $steps));
+	// Steps should be between -255 and 255. Negative = darker, positive = lighter
+	$steps = max(-255, min(255, $steps));
 
-    // Normalize into a six character long hex string
-    $hex = str_replace('#', '', $hex);
-    if (strlen($hex) == 3) {
-        $hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2);
-    }
+	// Normalize into a six character long hex string
+	$hex = str_replace('#', '', $hex);
+	if (strlen($hex) == 3) {
+		$hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2);
+	}
 
-    // Split into three parts: R, G and B
-    $color_parts = str_split($hex, 2);
-    $return = '#';
+	// Split into three parts: R, G and B
+	$color_parts = str_split($hex, 2);
+	$return = '#';
 
-    foreach ($color_parts as $color) {
-        $color   = hexdec($color); // Convert to decimal
-        $color   = max(0, min(255, $color + $steps)); // Adjust color
-        $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
-    }
+	foreach ($color_parts as $color) {
+		$color   = hexdec($color); // Convert to decimal
+		$color   = max(0, min(255, $color + $steps)); // Adjust color
+		$return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code
+	}
 
-    return $return;
+	return $return;
 }
 
 /**
@@ -2208,8 +2133,8 @@ function colorAdjustBrightness($hex, $steps)
  */
 function colorDarker($hex, $percent)
 {
-    $steps = intval(255 * $percent / 100) * -1;
-    return colorAdjustBrightness($hex, $steps);
+	$steps = intval(255 * $percent / 100) * -1;
+	return colorAdjustBrightness($hex, $steps);
 }
 
 /**
@@ -2219,8 +2144,8 @@ function colorDarker($hex, $percent)
  */
 function colorLighten($hex, $percent)
 {
-    $steps = intval(255 * $percent / 100);
-    return colorAdjustBrightness($hex, $steps);
+	$steps = intval(255 * $percent / 100);
+	return colorAdjustBrightness($hex, $steps);
 }
 
 
@@ -2232,27 +2157,25 @@ function colorLighten($hex, $percent)
  */
 function colorHexToRgb($hex, $alpha = false, $returnArray = false)
 {
-    $string = '';
-    $hex      = str_replace('#', '', $hex);
-    $length   = strlen($hex);
-    $rgb = array();
-    $rgb['r'] = hexdec($length == 6 ? substr($hex, 0, 2) : ($length == 3 ? str_repeat(substr($hex, 0, 1), 2) : 0));
-    $rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0));
-    $rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0));
-    if ($alpha !== false) {
-        $rgb['a'] = floatval($alpha);
-        $string = 'rgba('.implode(',', $rgb).')';
-    }
-    else {
-        $string = 'rgb('.implode(',', $rgb).')';
-    }
+	$string = '';
+	$hex      = str_replace('#', '', $hex);
+	$length   = strlen($hex);
+	$rgb = array();
+	$rgb['r'] = hexdec($length == 6 ? substr($hex, 0, 2) : ($length == 3 ? str_repeat(substr($hex, 0, 1), 2) : 0));
+	$rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0));
+	$rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0));
+	if ($alpha !== false) {
+		$rgb['a'] = floatval($alpha);
+		$string = 'rgba('.implode(',', $rgb).')';
+	} else {
+		$string = 'rgb('.implode(',', $rgb).')';
+	}
 
-    if ($returnArray) {
-        return $rgb;
-    }
-    else {
-        return $string;
-    }
+	if ($returnArray) {
+		return $rgb;
+	} else {
+		return $string;
+	}
 }
 
 
@@ -2265,25 +2188,25 @@ function colorHexToRgb($hex, $alpha = false, $returnArray = false)
  */
 function cartesianArray(array $input)
 {
-    // filter out empty values
-    $input = array_filter($input);
+	// filter out empty values
+	$input = array_filter($input);
 
-    $result = array(array());
+	$result = array(array());
 
-    foreach ($input as $key => $values) {
-        $append = array();
+	foreach ($input as $key => $values) {
+		$append = array();
 
-        foreach ($result as $product) {
-            foreach ($values as $item) {
-                $product[$key] = $item;
-                $append[] = $product;
-            }
-        }
+		foreach ($result as $product) {
+			foreach ($values as $item) {
+				$product[$key] = $item;
+				$append[] = $product;
+			}
+		}
 
-        $result = $append;
-    }
+		$result = $append;
+	}
 
-    return $result;
+	return $result;
 }
 
 
@@ -2295,68 +2218,50 @@ function cartesianArray(array $input)
  */
 function getModuleDirForApiClass($moduleobject)
 {
-    $moduledirforclass = $moduleobject;
-    if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);
+	$moduledirforclass = $moduleobject;
+	if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);
 
-    if ($moduleobject == 'contracts') {
-    	$moduledirforclass = 'contrat';
-    }
-    elseif (in_array($moduleobject, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
-        $moduledirforclass = 'api';
-    }
-    elseif ($moduleobject == 'contact' || $moduleobject == 'contacts' || $moduleobject == 'customer' || $moduleobject == 'thirdparty' || $moduleobject == 'thirdparties') {
-        $moduledirforclass = 'societe';
-    }
-    elseif ($moduleobject == 'propale' || $moduleobject == 'proposals') {
-        $moduledirforclass = 'comm/propal';
-    }
-    elseif ($moduleobject == 'agenda' || $moduleobject == 'agendaevents') {
-        $moduledirforclass = 'comm/action';
-    }
-    elseif ($moduleobject == 'adherent' || $moduleobject == 'members' || $moduleobject == 'memberstypes' || $moduleobject == 'subscriptions') {
-        $moduledirforclass = 'adherents';
-    }
-    elseif ($moduleobject == 'don' || $moduleobject == 'donations') {
-        $moduledirforclass = 'don';
-    }
-    elseif ($moduleobject == 'banque' || $moduleobject == 'bankaccounts') {
-        $moduledirforclass = 'compta/bank';
-    }
-    elseif ($moduleobject == 'category' || $moduleobject == 'categorie') {
-        $moduledirforclass = 'categories';
-    }
-    elseif ($moduleobject == 'order' || $moduleobject == 'orders') {
-        $moduledirforclass = 'commande';
-    }
-    elseif ($moduleobject == 'shipments') {
-        $moduledirforclass = 'expedition';
-    }
-    elseif ($moduleobject == 'facture' || $moduleobject == 'invoice' || $moduleobject == 'invoices') {
-        $moduledirforclass = 'compta/facture';
-    }
-    elseif ($moduleobject == 'project' || $moduleobject == 'projects' || $moduleobject == 'task' || $moduleobject == 'tasks') {
-        $moduledirforclass = 'projet';
-    }
-    elseif ($moduleobject == 'stock' || $moduleobject == 'stockmovements' || $moduleobject == 'warehouses') {
-        $moduledirforclass = 'product/stock';
-    }
-    elseif ($moduleobject == 'supplierproposals' || $moduleobject == 'supplierproposal' || $moduleobject == 'supplier_proposal') {
-    	$moduledirforclass = 'supplier_proposal';
-    }
-    elseif ($moduleobject == 'fournisseur' || $moduleobject == 'supplierinvoices' || $moduleobject == 'supplierorders') {
-        $moduledirforclass = 'fourn';
-    }
-    elseif ($moduleobject == 'ficheinter' || $moduleobject == 'interventions') {
-    	$moduledirforclass = 'fichinter';
-    }
-    elseif ($moduleobject == 'mos') {
-    	$moduledirforclass = 'mrp';
-    }
-    elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms'))) {
-    	$moduledirforclass = preg_replace('/s$/', '', $moduleobject);
-    }
+	if ($moduleobject == 'contracts') {
+		$moduledirforclass = 'contrat';
+	} elseif (in_array($moduleobject, array('admin', 'login', 'setup', 'access', 'status', 'tools', 'documents'))) {
+		$moduledirforclass = 'api';
+	} elseif ($moduleobject == 'contact' || $moduleobject == 'contacts' || $moduleobject == 'customer' || $moduleobject == 'thirdparty' || $moduleobject == 'thirdparties') {
+		$moduledirforclass = 'societe';
+	} elseif ($moduleobject == 'propale' || $moduleobject == 'proposals') {
+		$moduledirforclass = 'comm/propal';
+	} elseif ($moduleobject == 'agenda' || $moduleobject == 'agendaevents') {
+		$moduledirforclass = 'comm/action';
+	} elseif ($moduleobject == 'adherent' || $moduleobject == 'members' || $moduleobject == 'memberstypes' || $moduleobject == 'subscriptions') {
+		$moduledirforclass = 'adherents';
+	} elseif ($moduleobject == 'don' || $moduleobject == 'donations') {
+		$moduledirforclass = 'don';
+	} elseif ($moduleobject == 'banque' || $moduleobject == 'bankaccounts') {
+		$moduledirforclass = 'compta/bank';
+	} elseif ($moduleobject == 'category' || $moduleobject == 'categorie') {
+		$moduledirforclass = 'categories';
+	} elseif ($moduleobject == 'order' || $moduleobject == 'orders') {
+		$moduledirforclass = 'commande';
+	} elseif ($moduleobject == 'shipments') {
+		$moduledirforclass = 'expedition';
+	} elseif ($moduleobject == 'facture' || $moduleobject == 'invoice' || $moduleobject == 'invoices') {
+		$moduledirforclass = 'compta/facture';
+	} elseif ($moduleobject == 'project' || $moduleobject == 'projects' || $moduleobject == 'task' || $moduleobject == 'tasks') {
+		$moduledirforclass = 'projet';
+	} elseif ($moduleobject == 'stock' || $moduleobject == 'stockmovements' || $moduleobject == 'warehouses') {
+		$moduledirforclass = 'product/stock';
+	} elseif ($moduleobject == 'supplierproposals' || $moduleobject == 'supplierproposal' || $moduleobject == 'supplier_proposal') {
+		$moduledirforclass = 'supplier_proposal';
+	} elseif ($moduleobject == 'fournisseur' || $moduleobject == 'supplierinvoices' || $moduleobject == 'supplierorders') {
+		$moduledirforclass = 'fourn';
+	} elseif ($moduleobject == 'ficheinter' || $moduleobject == 'interventions') {
+		$moduledirforclass = 'fichinter';
+	} elseif ($moduleobject == 'mos') {
+		$moduledirforclass = 'mrp';
+	} elseif (in_array($moduleobject, array('products', 'expensereports', 'users', 'tickets', 'boms'))) {
+		$moduledirforclass = preg_replace('/s$/', '', $moduleobject);
+	}
 
-    return $moduledirforclass;
+	return $moduledirforclass;
 }
 
 /**
@@ -2368,7 +2273,7 @@ function getModuleDirForApiClass($moduleobject)
  */
 function randomColorPart($min = 0, $max = 255)
 {
-    return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT);
+	return str_pad(dechex(mt_rand($min, $max)), 2, '0', STR_PAD_LEFT);
 }
 
 /**
@@ -2380,22 +2285,22 @@ function randomColorPart($min = 0, $max = 255)
  */
 function randomColor($min = 0, $max = 255)
 {
-    return randomColorPart($min, $max).randomColorPart($min, $max).randomColorPart($min, $max);
+	return randomColorPart($min, $max).randomColorPart($min, $max).randomColorPart($min, $max);
 }
 
 
 if (!function_exists('dolEscapeXML'))
 {
-    /**
-     * Encode string for xml usage
-     *
-     * @param 	string	$string		String to encode
-     * @return	string				String encoded
-     */
-    function dolEscapeXML($string)
-    {
-        return strtr($string, array('\''=>'&apos;', '"'=>'&quot;', '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;'));
-    }
+	/**
+	 * Encode string for xml usage
+	 *
+	 * @param 	string	$string		String to encode
+	 * @return	string				String encoded
+	 */
+	function dolEscapeXML($string)
+	{
+		return strtr($string, array('\''=>'&apos;', '"'=>'&quot;', '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;'));
+	}
 }
 
 
@@ -2409,29 +2314,28 @@ if (!function_exists('dolEscapeXML'))
  */
 function autoOrManual($automaticmanual, $case = 1, $color = 0)
 {
-    global $langs;
-    $result = 'unknown'; $classname = '';
-    if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') 	// A mettre avant test sur no a cause du == 0
-    {
-        $result = $langs->trans('automatic');
-        if ($case == 1 || $case == 3) $result = $langs->trans("Automatic");
-        if ($case == 2) $result = '<input type="checkbox" value="1" checked disabled>';
-        if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
+	global $langs;
+	$result = 'unknown'; $classname = '';
+	if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') 	// A mettre avant test sur no a cause du == 0
+	{
+		$result = $langs->trans('automatic');
+		if ($case == 1 || $case == 3) $result = $langs->trans("Automatic");
+		if ($case == 2) $result = '<input type="checkbox" value="1" checked disabled>';
+		if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
 
-        $classname = 'ok';
-    }
-    elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false')
-    {
-        $result = $langs->trans("manual");
-        if ($case == 1 || $case == 3) $result = $langs->trans("Manual");
-        if ($case == 2) $result = '<input type="checkbox" value="0" disabled>';
-        if ($case == 3) $result = '<input type="checkbox" value="0" disabled> '.$result;
+		$classname = 'ok';
+	} elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false')
+	{
+		$result = $langs->trans("manual");
+		if ($case == 1 || $case == 3) $result = $langs->trans("Manual");
+		if ($case == 2) $result = '<input type="checkbox" value="0" disabled>';
+		if ($case == 3) $result = '<input type="checkbox" value="0" disabled> '.$result;
 
-        if ($color == 2) $classname = 'ok';
-        else $classname = 'error';
-    }
-    if ($color) return '<font class="'.$classname.'">'.$result.'</font>';
-    return $result;
+		if ($color == 2) $classname = 'ok';
+		else $classname = 'error';
+	}
+	if ($color) return '<font class="'.$classname.'">'.$result.'</font>';
+	return $result;
 }
 
 
@@ -2443,13 +2347,13 @@ function autoOrManual($automaticmanual, $case = 1, $color = 0)
  */
 function convertBackOfficeMediasLinksToPublicLinks($notetoshow)
 {
-    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
-    $notetoshow = preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow);
-    return $notetoshow;
+	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
+	$notetoshow = preg_replace('/src="[a-zA-Z0-9_\/\-\.]*(viewimage\.php\?modulepart=medias[^"]*)"/', 'src="'.$urlwithroot.'/\1"', $notetoshow);
+	return $notetoshow;
 }
 
 /**
@@ -2480,3 +2384,77 @@ function price2fec($amount)
 
 	return $output;
 }
+
+/**
+ * Check the syntax of some PHP code.
+ *
+ * @param 	string 			$code 	PHP code to check.
+ * @return 	boolean|array 			If false, then check was successful, otherwise an array(message,line) of errors is returned.
+ */
+function phpSyntaxError($code)
+{
+	if (!defined("CR")) define("CR", "\r");
+	if (!defined("LF")) define("LF", "\n");
+	if (!defined("CRLF")) define("CRLF", "\r\n");
+
+	$braces=0;
+	$inString=0;
+	foreach (token_get_all('<?php ' . $code) as $token) {
+		if (is_array($token)) {
+			switch ($token[0]) {
+				case T_CURLY_OPEN:
+				case T_DOLLAR_OPEN_CURLY_BRACES:
+				case T_START_HEREDOC: ++$inString; break;
+				case T_END_HEREDOC:   --$inString; break;
+			}
+		} elseif ($inString & 1) {
+			switch ($token) {
+				case '`':
+				case '\'':
+				case '"': --$inString; break;
+			}
+		} else {
+			switch ($token) {
+				case '`':
+				case '\'':
+				case '"': ++$inString; break;
+				case '{': ++$braces; break;
+				case '}':
+					if ($inString) {
+						--$inString;
+					} else {
+						--$braces;
+						if ($braces < 0) break 2;
+					}
+					break;
+			}
+		}
+	}
+	$inString = @ini_set('log_errors', false);
+	$token = @ini_set('display_errors', true);
+	ob_start();
+	$code = substr($code, strlen('<?php '));
+	$braces || $code = "if(0){{$code}\n}";
+	if (eval($code) === false) {
+		if ($braces) {
+			$braces = PHP_INT_MAX;
+		} else {
+			false !== strpos($code, CR) && $code = strtr(str_replace(CRLF, LF, $code), CR, LF);
+			$braces = substr_count($code, LF);
+		}
+		$code = ob_get_clean();
+		$code = strip_tags($code);
+		if (preg_match("'syntax error, (.+) in .+ on line (\d+)$'s", $code, $code)) {
+			$code[2] = (int) $code[2];
+			$code = $code[2] <= $braces
+			? array($code[1], $code[2])
+			: array('unexpected $end' . substr($code[1], 14), $braces);
+		} else $code = array('syntax error', 0);
+	} else {
+		ob_end_clean();
+		$code = false;
+	}
+	@ini_set('display_errors', $token);
+	@ini_set('log_errors', $inString);
+	return $code;
+}
diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 5e33c976f9c..ae9401b7954 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -187,17 +187,13 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 	{
 		if ($numero >= 1 && $numero < 2) {
 			return ("UN PESO ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero >= 0 && $numero < 1) {
+		} elseif ($numero >= 0 && $numero < 1) {
 			return ("CERO PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero >= 1000000 && $numero < 1000001) {
+		} elseif ($numero >= 1000000 && $numero < 1000001) {
 			return ("UN MILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		elseif ($numero >= 1000000000000 && $numero < 1000000000001) {
+		} elseif ($numero >= 1000000000000 && $numero < 1000000000001) {
 			return ("UN BILL&OacuteN DE PESOS ".$parte_decimal." / 100 M.N.");
-		}
-		else {
+		} else {
 			$entexto = "";
 			$number = $numero;
 			if ($number >= 1000000000) {
@@ -220,8 +216,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 				$entexto .= hundreds2text($CdMILLON, $DdMILLON, $udMILLON);
 				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON == 1)
 					$entexto .= " MILL&OacuteN ";
-				else
-					$entexto .= " MILLONES ";
+				else $entexto .= " MILLONES ";
 			}
 			if ($number >= 1000) {
 				$cdm = (int) ($numero / 100000);
@@ -264,7 +259,7 @@ function hundreds2text($hundreds, $tens, $units)
 	$decenas = array("", "", "TREINTA ", "CUARENTA ", "CINCUENTA ", "SESENTA ", "SETENTA ", "OCHENTA ", "NOVENTA ");
 	$veintis = array("VEINTE", "VEINTIUN", "VEINTID&OacuteS", "VEINTITR&EacuteS", "VEINTICUATRO", "VEINTICINCO", "VEINTIS&EacuteIS", "VEINTISIETE", "VEINTIOCHO", "VEINTINUEVE");
 	$diecis = array("DIEZ", "ONCE", "DOCE", "TRECE", "CATORCE", "QUINCE", "DIECIS&EacuteIS", "DIECISIETE", "DIECIOCHO", "DIECINUEVE");
-    $unidades = array("UN", "DOS", "TRES", "CUATRO", "CINCO", "SEIS", "SIETE", "OCHO", "NUEVE");
+	$unidades = array("UN", "DOS", "TRES", "CUATRO", "CINCO", "SEIS", "SIETE", "OCHO", "NUEVE");
 	$entexto = "";
 	if ($hundreds != 0) {
 		$entexto .= $centenas[$hundreds - 1];
@@ -277,13 +272,11 @@ function hundreds2text($hundreds, $tens, $units)
 			$entexto .= $unidades[$units - 1];
 		}
 		return $entexto;
-	}
-	elseif ($tens == 2) {
+	} elseif ($tens == 2) {
 		if ($hundreds != 0) $entexto .= " ";
 		$entexto .= " ".$veintis[$units];
 		return $entexto;
-	}
-	elseif ($tens == 1) {
+	} elseif ($tens == 1) {
 		if ($hundreds != 0) $entexto .= " ";
 		$entexto .= $diecis[$units];
 		return $entexto;
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index ae0eb86882e..e6e20692317 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -77,40 +77,32 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
     {
     	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')
+    } 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')
+    } 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
-    	{
+    	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')
+    } 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')
+    } elseif ($postorget == 'HEAD')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD'); // HTTP request is 'HEAD'
     	curl_setopt($ch, CURLOPT_NOBODY, true);
-    }
-    elseif ($postorget == 'DELETE')
+    } elseif ($postorget == 'DELETE')
     {
     	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE'); // POST
-    }
-    else
-    {
+    } else {
     	curl_setopt($ch, CURLOPT_POST, 0); // GET
     }
 
@@ -143,9 +135,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
         $rep['curl_error_msg'] = curl_error($ch);
 
 		dol_syslog("getURLContent response array is ".join(',', $rep));
-    }
-    else
-    {
+    } else {
     	$info = curl_getinfo($ch);
 
     	// Ad keys to $rep
@@ -182,9 +172,7 @@ function getDomainFromURL($url, $mode = 0)
 	if ($mode == 2)
 	{
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)\.([^\.]+)$/', '\1.\2.\3', $tmpdomain); // Remove part 'www.' before 'abc.mydomain.com'
-	}
-	else
-	{
+	} else {
 		$tmpdomain = preg_replace('/^.*\.([^\.]+)\.([^\.]+)$/', '\1.\2', $tmpdomain); // Remove part 'www.abc.' before 'mydomain.com'
 	}
 	if (empty($mode))
diff --git a/htdocs/core/lib/hrm.lib.php b/htdocs/core/lib/hrm.lib.php
index 3b336fee8d3..e24c503f449 100644
--- a/htdocs/core/lib/hrm.lib.php
+++ b/htdocs/core/lib/hrm.lib.php
@@ -43,8 +43,8 @@ function establishment_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, 'establishment');
 
 	$head[$h][0] = DOL_URL_ROOT.'/hrm/establishment/info.php?id='.$object->id;
@@ -64,30 +64,30 @@ function establishment_prepare_head($object)
  */
 function hrm_admin_prepare_head()
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    $langs->load('hrm');
+	$langs->load('hrm');
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_hrm.php';
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'parameters';
-    $h++;
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'parameters';
+	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/admin_establishment.php';
-    $head[$h][1] = $langs->trans("Establishments");
-    $head[$h][2] = 'establishments';
-    $h++;
+	$head[$h][1] = $langs->trans("Establishments");
+	$head[$h][2] = 'establishments';
+	$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, '', $head, $h, 'hrm_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, 'hrm_admin');
 
-    complete_head_from_modules($conf, $langs, '', $head, $h, 'hrm_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'hrm_admin', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 0822d3edd4b..bd392760cc5 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -23,7 +23,7 @@
  */
 
 // Define size of logo small and mini
-$maxwidthsmall = 350; $maxheightsmall = 200; // Near 16/9eme
+$maxwidthsmall = 480; $maxheightsmall = 270; // Near 16/9eme
 $maxwidthmini = 128; $maxheightmini = 72; // 16/9eme
 $quality = 80;
 
@@ -40,39 +40,39 @@ function image_format_supported($file, $acceptsvg = 0)
 {
 	global $conf;
 
-    $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into product.class.php
-    if ($acceptsvg || ! empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) {
-    	$regeximgext .= '|\.svg';		// Not allowed by default. SVG can contains javascript
-    }
+	$regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into product.class.php
+	if ($acceptsvg || !empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) {
+		$regeximgext .= '|\.svg'; // Not allowed by default. SVG can contains javascript
+	}
 
-    // Case filename is not a format image
-    $reg = array();
-    if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1;
+	// Case filename is not a format image
+	$reg = array();
+	if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1;
 
-    // Case filename is a format image but not supported by this PHP
-    $imgfonction = '';
-    if (strtolower($reg[1]) == '.gif')  $imgfonction = 'imagecreatefromgif';
-    if (strtolower($reg[1]) == '.jpg')  $imgfonction = 'imagecreatefromjpeg';
-    if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg';
-    if (strtolower($reg[1]) == '.png')  $imgfonction = 'imagecreatefrompng';
-    if (strtolower($reg[1]) == '.bmp')  $imgfonction = 'imagecreatefromwbmp';
-    if (strtolower($reg[1]) == '.webp')  $imgfonction = 'imagecreatefromwebp';
-    if (strtolower($reg[1]) == '.xpm')  $imgfonction = 'imagecreatefromxpm';
-    if (strtolower($reg[1]) == '.xbm')  $imgfonction = 'imagecreatefromxbm';
-    if (strtolower($reg[1]) == '.svg')  $imgfonction = 'imagecreatefromsvg'; // Never available
-    if ($imgfonction)
-    {
-        if (!function_exists($imgfonction))
-        {
-            // Fonctions of conversion not available in this PHP
-            return 0;
-        }
+	// Case filename is a format image but not supported by this PHP
+	$imgfonction = '';
+	if (strtolower($reg[1]) == '.gif')  $imgfonction = 'imagecreatefromgif';
+	if (strtolower($reg[1]) == '.jpg')  $imgfonction = 'imagecreatefromjpeg';
+	if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg';
+	if (strtolower($reg[1]) == '.png')  $imgfonction = 'imagecreatefrompng';
+	if (strtolower($reg[1]) == '.bmp')  $imgfonction = 'imagecreatefromwbmp';
+	if (strtolower($reg[1]) == '.webp')  $imgfonction = 'imagecreatefromwebp';
+	if (strtolower($reg[1]) == '.xpm')  $imgfonction = 'imagecreatefromxpm';
+	if (strtolower($reg[1]) == '.xbm')  $imgfonction = 'imagecreatefromxbm';
+	if (strtolower($reg[1]) == '.svg')  $imgfonction = 'imagecreatefromsvg'; // Never available
+	if ($imgfonction)
+	{
+		if (!function_exists($imgfonction))
+		{
+			// Fonctions of conversion not available in this PHP
+			return 0;
+		}
 
-        // Filename is a format image and supported for conversion by this PHP
-        return 1;
-    }
+		// Filename is a format image and supported for conversion by this PHP
+		return 1;
+	}
 
-    return 0;
+	return 0;
 }
 
 
@@ -97,9 +97,9 @@ function dol_getImageSize($file, $url = false)
 
 	if ($filetoread)
 	{
-    	$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
-    	$ret['width'] = $infoImg[0]; // Largeur de l'image
-    	$ret['height'] = $infoImg[1]; // Hauteur de l'image
+		$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
+		$ret['width'] = $infoImg[0]; // Largeur de l'image
+		$ret['height'] = $infoImg[1]; // Hauteur de l'image
 	}
 
 	return $ret;
@@ -133,25 +133,20 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	{
 		// Si le fichier n'a pas ete indique
 		return 'Bad parameter file';
-	}
-	elseif (!file_exists($file))
+	} elseif (!file_exists($file))
 	{
 		// Si le fichier passe en parametre n'existe pas
 		return $langs->trans("ErrorFileNotFound", $file);
-	}
-	elseif (image_format_supported($file) < 0)
+	} elseif (image_format_supported($file) < 0)
 	{
 		return 'This filename '.$file.' does not seem to be an image filename.';
-	}
-	elseif (!is_numeric($newWidth) && !is_numeric($newHeight))
+	} elseif (!is_numeric($newWidth) && !is_numeric($newHeight))
 	{
 		return 'Wrong value for parameter newWidth or newHeight';
-	}
-	elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
+	} elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
 	{
 		return 'At least newHeight or newWidth must be defined for resizing';
-	}
-	elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
+	} elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
 	{
 		return 'Both newHeight or newWidth must be defined for croping';
 	}
@@ -237,9 +232,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	{
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($newWidth, $newHeight);
-	}
-	else
-	{
+	} else {
 		$imgThumb = imagecreatetruecolor($newWidth, $newHeight);
 	}
 
@@ -312,7 +305,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
 
 	// Free memory. This does not delete image.
-    imagedestroy($img);
+	imagedestroy($img);
 	imagedestroy($imgThumb);
 
 	clearstatcache(); // File was replaced by a modified one, so we clear file caches.
@@ -373,17 +366,14 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
 						$img = imagerotate($img, $deg, imageColorAllocateAlpha($img, 0, 0, 0, 127));
 						imagealphablending($img, false);
 						imagesavealpha($img, true);
-					}
-					else {
+					} else {
 						$img = imagerotate($img, $deg, 0);
 					}
 				}
 				// then rewrite the rotated image back to the disk as $fileDest
 				if ($fileDest === false) {
 					return $img;
-				}
-				else
-				{
+				} else {
 					// In fact there exif is only for JPG but just in case
 					// Create image on disk
 					$image = false;
@@ -448,27 +438,23 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	{
 		// Si le fichier n'a pas ete indique
 		return 'ErrorBadParameters';
-	}
-	elseif (!file_exists($file))
+	} elseif (!file_exists($file))
 	{
 		// Si le fichier passe en parametre n'existe pas
-        dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);
-	    return $langs->trans("ErrorFileNotFound", $file);
-	}
-	elseif (image_format_supported($file) < 0)
+		dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);
+		return $langs->trans("ErrorFileNotFound", $file);
+	} elseif (image_format_supported($file) < 0)
 	{
-        dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);
-	    return 'ErrorBadImageFormat';
-	}
-	elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
+		dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);
+		return 'ErrorBadImageFormat';
+	} elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
 		// Si la largeur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
-        dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);
-	    return 'Error: Wrong value for parameter maxWidth';
-	}
-	elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
+		dol_syslog('Wrong value for parameter maxWidth', LOG_ERR);
+		return 'Error: Wrong value for parameter maxWidth';
+	} elseif (!is_numeric($maxHeight) || empty($maxHeight) || $maxHeight < -1) {
 		// Si la hauteur max est incorrecte (n'est pas numerique, est vide, ou est inferieure a 0)
-        dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);
-	    return 'Error: Wrong value for parameter maxHeight';
+		dol_syslog('Wrong value for parameter maxHeight', LOG_ERR);
+		return 'Error: Wrong value for parameter maxHeight';
 	}
 
 	$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
@@ -509,7 +495,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			$imgfonction = 'imagecreatefrompng';
 			break;
 		case IMAGETYPE_BMP:	    // 6
-            // Not supported by PHP GD
+			// Not supported by PHP GD
 			break;
 		case IMAGETYPE_WBMP:	// 15
 			$imgfonction = 'imagecreatefromwbmp';
@@ -545,7 +531,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			$extImg = '.png';
 			break;
 		case IMAGETYPE_BMP:	    // 6
-            // Not supported by PHP GD
+			// Not supported by PHP GD
 			$extImg = '.bmp';
 			break;
 		case IMAGETYPE_WBMP:	// 15
@@ -554,14 +540,14 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			break;
 	}
 
-    if (!is_resource($img))
-    {
-        dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
-        return 0;
-    }
+	if (!is_resource($img))
+	{
+		dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
+		return 0;
+	}
 
 	$exifAngle = false;
-    if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) {
+	if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) {
 		switch ($ort)
 		{
 			case 3: // 180 rotate left
@@ -582,25 +568,24 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		}
 	}
 
-    if ($exifAngle)
-    {
+	if ($exifAngle)
+	{
 		$rotated = false;
 
-    	if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case
-    	{
+		if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case
+		{
 			imagealphablending($img, false);
 			imagesavealpha($img, true);
 			$rotated = imagerotate($img, $exifAngle, imageColorAllocateAlpha($img, 0, 0, 0, 127));
 			imagealphablending($rotated, false);
 			imagesavealpha($rotated, true);
-		}
-    	else {
+		} else {
 			$rotated = imagerotate($img, $exifAngle, 0);
 		}
 
-    	// replace image with good orientation
-    	if (!empty($rotated)) {
-    		$img = $rotated;
+		// replace image with good orientation
+		if (!empty($rotated)) {
+			$img = $rotated;
 			$imgWidth = $trueImgWidth;
 			$imgHeight = $trueImgHeight;
 		}
@@ -619,9 +604,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		// Si largeur determinante
 		$thumbWidth  = $maxWidth;
 		$thumbHeight = $thumbWidth / $imgWhFact;
-	}
-	else
-	{
+	} else {
 		// Si hauteur determinante
 		$thumbHeight = $maxHeight;
 		$thumbWidth  = $thumbHeight * $imgWhFact;
@@ -629,17 +612,15 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	$thumbHeight = round($thumbHeight);
 	$thumbWidth = round($thumbWidth);
 
-    // Define target format
-    if (empty($targetformat)) $targetformat = $infoImg[2];
+	// Define target format
+	if (empty($targetformat)) $targetformat = $infoImg[2];
 
 	// Create empty image
 	if ($targetformat == IMAGETYPE_GIF)
 	{
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($thumbWidth, $thumbHeight);
-	}
-	else
-	{
+	} else {
 		$imgThumb = imagecreatetruecolor($thumbWidth, $thumbHeight);
 	}
 
@@ -662,31 +643,31 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		case IMAGETYPE_GIF:	    // 1
 			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
 			imagecolortransparent($imgThumb, $trans_colour);
-            $extImgTarget = '.gif';
-            $newquality = 'NU';
-            break;
+			$extImgTarget = '.gif';
+			$newquality = 'NU';
+			break;
 		case IMAGETYPE_JPEG:    // 2
-            $trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
-            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '.jpg');
-            $newquality = $quality;
-            break;
+			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
+			$extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '.jpg');
+			$newquality = $quality;
+			break;
 		case IMAGETYPE_PNG:	    // 3
 			imagealphablending($imgThumb, false); // Pour compatibilite sur certain systeme
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127); // Keep transparent channel
-            $extImgTarget = '.png';
-            $newquality = $quality - 100;
-            $newquality = round(abs($quality - 100) * 9 / 100);
-            break;
+			$extImgTarget = '.png';
+			$newquality = $quality - 100;
+			$newquality = round(abs($quality - 100) * 9 / 100);
+			break;
 		case IMAGETYPE_BMP:	    // 6
-            // Not supported by PHP GD
-            $extImgTarget = '.bmp';
-            $newquality = 'NU';
-            break;
+			// Not supported by PHP GD
+			$extImgTarget = '.bmp';
+			$newquality = 'NU';
+			break;
 		case IMAGETYPE_WBMP:	// 15
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 0);
-            $extImgTarget = '.bmp';
-            $newquality = 'NU';
-            break;
+			$extImgTarget = '.bmp';
+			$newquality = 'NU';
+			break;
 	}
 	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
 
@@ -717,7 +698,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			imagepng($imgThumb, $imgThumbName, $newquality);
 			break;
 		case IMAGETYPE_BMP:	    // 6
-            // Not supported by PHP GD
+			// Not supported by PHP GD
 			break;
 		case IMAGETYPE_WBMP:    // 15
 			imagewbmp($imgThumb, $imgThumbName);
@@ -727,9 +708,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	// Set permissions on file
 	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
 
-    // Free memory. This does not delete image.
-    imagedestroy($img);
-    imagedestroy($imgThumb);
+	// Free memory. This does not delete image.
+	imagedestroy($img);
+	imagedestroy($imgThumb);
 
 	return $imgThumbName;
 }
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index cbaf97611fd..f840c037821 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -67,8 +67,7 @@ function facture_prepare_head($object)
         {
             $obj = $db->fetch_object($resql);
             if ($obj) $nbStandingOrders = $obj->nb;
-        }
-        else dol_print_error($db);
+        } 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>';
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index d5ca3431845..1357bfb2417 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -176,8 +176,7 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 					{
 						if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
 						$result = $fac->generateDocument($regenerate ? $regenerate : $fac->modelpdf, $outputlangs);
-					}
-					else {
+					} else {
 						if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
 					}
 
@@ -261,16 +260,12 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 			}
 
 			$result = 1;
-		}
-		else
-		{
+		} else {
 			if ($usestdout) print "No invoices found for criteria.\n";
 			else dol_syslog("No invoices found for criteria");
 			$result = 0;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		dol_syslog("scripts/invoices/rebuild_merge.php: Error");
 		$error++;
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 44ad9cc6ff1..e4dfa3a0830 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -53,9 +53,7 @@ function dol_json_encode($elements)
 	if (is_object($elements))	// Count number of properties for an object
 	{
 		foreach ($elements as $key => $value) $num++;
-	}
-	else
-	{
+	} else {
 	    $num = count($elements);
 	}
 	//var_dump($num);
@@ -74,9 +72,7 @@ function dol_json_encode($elements)
 			if ($i !== $last) $output .= ',';
 		}
 		$output .= ']';
-	}
-	else
-	{
+	} else {
 		// associative (object)
 		$output = '{';
 		$last = $num - 1;
@@ -197,11 +193,10 @@ function _val($val)
 	    }
 
 	    return '"'.$ascii.'"';
-	}
-	elseif (is_int($val)) return sprintf('%d', $val);
+	} elseif (is_int($val)) return sprintf('%d', $val);
 	elseif (is_float($val)) return sprintf('%F', $val);
 	elseif (is_bool($val)) return ($val ? 'true' : 'false');
-	else  return 'null';
+	else return 'null';
 }
 
 if (!function_exists('json_decode'))
@@ -244,16 +239,22 @@ function dol_json_decode($json, $assoc = false)
 			elseif (($json[$i] == '}') || ($json[$i] == ']')) $out .= ')';
 			elseif ($json[$i] == ':') $out .= ' => ';
 			else $out .= $json[$i];
-		}
-		else $out .= $json[$i];
+		} else $out .= $json[$i];
 		if ($json[$i] == '"' && $json[($i - 1)] != "\\") $comment = !$comment;
 	}
 
 	$out = _unval($out);
 
+	$array = array();
+
 	// Return an array
-	if ($out != '') eval('$array = '.$out.';');
-	else $array = array();
+	if ($out != '') {
+		try {
+			eval('$array = '.$out.';');
+		} catch (Exception $e) {
+			$array = array();
+		}
+	}
 
 	// Return an object
 	if (!$assoc)
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 038791ce1cc..640152d5999 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -87,7 +87,9 @@ function ldap_prepare_head()
 	// 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, '', $head, $h, 'ldap');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ldap');
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ldap', 'remove');
 
 	return $head;
 }
@@ -112,18 +114,14 @@ function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 	if (!function_exists("ldap_connect"))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	}
-	elseif (empty($conf->global->LDAP_SERVER_HOST))
+	} elseif (empty($conf->global->LDAP_SERVER_HOST))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	elseif (empty($key) || empty($dn) || empty($objectclass))
+	} elseif (empty($key) || empty($dn) || empty($objectclass))
 	{
 		$langs->load("errors");
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action='.$testlabel.'">'.$butlabel.'</a>';
 	}
 	print '<br><br>';
@@ -170,8 +168,7 @@ function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount =
 				if (strtolower($key) == 'userpassword') $hide = 1;
 			}
 			show_ldap_content($val, $level + 1, $count, $var, $hide, $val["count"]);
-		}
-		elseif ($subcount)
+		} elseif ($subcount)
 		{
 			$subcount--;
 			$newstring = dol_htmlentitiesbr($val);
diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index a3c352a0405..f6b61db794c 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014-2016	Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Frederic France		<frederic.france@free.fr>
+ * Copyright (C) 2020       Maxime DEMAREST     <maxime@indelog.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
@@ -82,3 +83,50 @@ function loan_prepare_head($object)
 
     return $head;
 }
+
+/**
+ * Calculate remaining loan mensuality and interests
+ *
+ * @param   int     $mens		Value of this mensuality (interests include, set 0 if we don't paid interests for this mensuality)
+ * @param   float   $capital    Remaining capital for this mensuality
+ * @param   float   $rate		Loan rate
+ * @param   int     $echance	Actual loan term
+ * @param   int   	$nbterm  	Total number of term for this loan
+ * @return  array				Array with remaining capital, interest, and mensuality for each remaining terms
+ */
+function loanCalcMonthlyPayment($mens, $capital, $rate, $echance, $nbterm)
+{
+    global $conf;
+    require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+    $object = new LoanSchedule($db);
+
+    // 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);
+
+        $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);
+
+        $capital = $cap_rest;
+        $echance++;
+    }
+
+    return $output;
+}
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 815060c8022..50330686805 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -63,46 +63,46 @@ function member_prepare_head(Adherent $object)
 		$h++;
 	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member');
+	// 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, 'member');
 
-    $nbNote = 0;
-    if (!empty($object->note)) $nbNote++;
-    if (!empty($object->note_private)) $nbNote++;
-    if (!empty($object->note_public)) $nbNote++;
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
+	$nbNote = 0;
+	if (!empty($object->note)) $nbNote++;
+	if (!empty($object->note_private)) $nbNote++;
+	if (!empty($object->note_public)) $nbNote++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Note");
 	$head[$h][2] = 'note';
-    if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 	$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->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member');
-    $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.'/adherents/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] = 'document';
-    $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->adherent->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member');
+	$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.'/adherents/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] = 'document';
+	$h++;
 
 	// Show agenda tab
 	if (!empty($conf->agenda->enabled))
 	{
-	    $head[$h][0] = DOL_URL_ROOT."/adherents/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++;
+		$head[$h][0] = DOL_URL_ROOT."/adherents/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++;
 	}
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member', 'remove');
@@ -148,11 +148,11 @@ function member_type_prepare_head(AdherentType $object)
 		$h++;
 	}
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype');
+	// 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, 'membertype');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'membertype', 'remove');
 
@@ -166,45 +166,45 @@ function member_type_prepare_head(AdherentType $object)
  */
 function member_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.'/adherents/admin/adherent.php';
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'general';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php';
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'general';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php';
-    $head[$h][1] = $langs->trans("EMails");
-    $head[$h][2] = 'emails';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php';
+	$head[$h][1] = $langs->trans("EMails");
+	$head[$h][2] = 'emails';
+	$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, '', $head, $h, 'member_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, 'member_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsMember");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsMember");
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsMemberType");
-    $head[$h][2] = 'attributes_type';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsMemberType");
+	$head[$h][2] = 'attributes_type';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/website.php';
-    $head[$h][1] = $langs->trans("BlankSubscriptionForm");
-    $head[$h][2] = 'website';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/website.php';
+	$head[$h][1] = $langs->trans("BlankSubscriptionForm");
+	$head[$h][2] = 'website';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, '', $head, $h, 'member_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin', 'remove');
 
-    return $head;
+	return $head;
 }
 
 
@@ -216,50 +216,50 @@ function member_admin_prepare_head()
  */
 function member_stats_prepare_head($object)
 {
-    global $langs, $conf, $user;
+	global $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/index.php';
-    $head[$h][1] = $langs->trans("Subscriptions");
-    $head[$h][2] = 'statssubscription';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/index.php';
+	$head[$h][1] = $langs->trans("Subscriptions");
+	$head[$h][2] = 'statssubscription';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbycountry';
-    $head[$h][1] = $langs->trans("Country");
-    $head[$h][2] = 'statscountry';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbycountry';
+	$head[$h][1] = $langs->trans("Country");
+	$head[$h][2] = 'statscountry';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion';
-    $head[$h][1] = $langs->trans("Region");
-    $head[$h][2] = 'statsregion';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbyregion';
+	$head[$h][1] = $langs->trans("Region");
+	$head[$h][2] = 'statsregion';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbystate';
-    $head[$h][1] = $langs->trans("State");
-    $head[$h][2] = 'statsstate';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbystate';
+	$head[$h][1] = $langs->trans("State");
+	$head[$h][2] = 'statsstate';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbytown';
-    $head[$h][1] = $langs->trans('Town');
-    $head[$h][2] = 'statstown';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/geo.php?mode=memberbytown';
+	$head[$h][1] = $langs->trans('Town');
+	$head[$h][2] = 'statstown';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/adherents/stats/byproperties.php';
-    $head[$h][1] = $langs->trans('ByProperties');
-    $head[$h][2] = 'statsbyproperties';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/adherents/stats/byproperties.php';
+	$head[$h][1] = $langs->trans('ByProperties');
+	$head[$h][2] = 'statsbyproperties';
+	$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, 'member_stats');
+	// 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, 'member_stats');
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member_stats', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index a301ac40a2b..9d64185c781 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -63,13 +63,10 @@ function dol_setcache($memoryid, $data)
 		if ($rescode == 0)
 		{
 			return count($data);
-		}
-		else
-		{
+		} else {
 			return -$rescode;
 		}
-	}
-	elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $dolmemcache;
 		if (empty($dolmemcache) || !is_object($dolmemcache))
@@ -86,13 +83,10 @@ function dol_setcache($memoryid, $data)
 		if ($result)
 		{
 			return count($data);
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
-	}
-	// Using shmop
+	} // Using shmop
 	elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
 		$result = dol_setshmop($memoryid, $data);
@@ -133,13 +127,10 @@ function dol_getcache($memoryid)
 		if ($rescode == 0)
 		{
 			return $data;
-		}
-		else
-		{
+		} else {
 			return -$rescode;
 		}
-	}
-	elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
+	} elseif (!empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
 		global $m;
 		if (empty($m) || !is_object($m))
@@ -158,13 +149,10 @@ function dol_getcache($memoryid)
 		if ($data)
 		{
 			return $data;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
-	}
-	// Using shmop
+	} // Using shmop
 	elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
 	{
 		$data = dol_getshmop($memoryid);
@@ -235,9 +223,7 @@ function dol_setshmop($memoryid, $data)
 		}
 		shmop_close($handle);
 		return ($shm_bytes_written1 + $shm_bytes_written2);
-	}
-	else
-	{
+	} else {
 		print 'Error in shmop_open for memoryid='.$memoryid.' shmkey='.$shmkey.' 6+size=6+'.$size;
 		return -1;
 	}
@@ -263,9 +249,7 @@ function dol_getshmop($memoryid)
 		if ($size) $data = unserialize(shmop_read($handle, 6, $size));
 		else return -1;
 		shmop_close($handle);
-	}
-	else
-	{
+	} else {
 		return -2;
 	}
 	return $data;
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 384fd608597..ff14ec56e18 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -83,8 +83,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 	//$pathoffiletoedittmp=$destdir.'/class/'.strtolower($objectname).'.class.php.tmp';
 	//dol_delete_file($pathoffiletoedittmp, 0, 1, 1);
 
-	try
-	{
+	try {
 		include_once $pathoffiletoeditsrc;
 		if (class_exists($objectname)) $object = new $objectname($db);
 		else return -4;
@@ -193,8 +192,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 
 		return $object;
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		print $e->getMessage();
 		return -5;
@@ -209,11 +207,12 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
  *  @param	string      $objectname		Name of object
  * 	@param	string		$newmask		New mask
  *  @param	string      $readdir		Directory source (use $destdir when not defined)
- *  @param	Object		$object			If object was already loaded/known, it is pass to avaoid another include and new.
+ *  @param	Object		$object			If object was already loaded/known, it is pass to avoid another include and new.
+ *  @param	string		$moduletype		'external' or 'internal'
  * 	@return	int							<=0 if KO, >0 if OK
  *  @see rebuildObjectClass()
  */
-function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '', $object = null)
+function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '', $object = null, $moduletype = 'external')
 {
 	global $db, $langs;
 
@@ -225,8 +224,14 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	$pathoffiletoclasssrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
 
 	// Edit .sql file
-	$pathoffiletoeditsrc = $readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-	$pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+	if ($moduletype == 'internal') {
+		$pathoffiletoeditsrc = $readdir.'/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
+		$pathoffiletoedittarget = $destdir.'/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+	} else {
+		$pathoffiletoeditsrc = $readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
+		$pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+	}
+
 	if (!dol_is_file($pathoffiletoeditsrc))
 	{
 		$langs->load("errors");
@@ -235,16 +240,14 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	}
 
 	// Load object from myobject.class.php
-	try
-	{
+	try {
 		if (!is_object($object))
 		{
 			include_once $pathoffiletoclasssrc;
 			if (class_exists($objectname)) $object = new $objectname($db);
 			else return -1;
 		}
-	}
-	catch (Exception $e)
+	} catch (Exception $e)
 	{
 		print $e->getMessage();
 	}
@@ -271,8 +274,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 			$texttoinsert .= "\t".$key." ".$type;
 			if ($key == 'rowid')  $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
 			if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
-			else
-			{
+			else {
 				if ($val['default'] != '')
 				{
 					if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
@@ -293,15 +295,18 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	if ($result)
 	{
 		@chmod($pathoffiletoedittarget, octdec($newmask));
-	}
-	else
-	{
+	} else {
 		$error++;
 	}
 
 	// Edit .key.sql file
-	$pathoffiletoeditsrc = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
-	$pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
+	if ($moduletype == 'internal') {
+		$pathoffiletoeditsrc = $readdir.'/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
+		$pathoffiletoedittarget = $destdir.'/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
+	} else {
+		$pathoffiletoeditsrc = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
+		$pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
+	}
 
 	$contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
@@ -338,9 +343,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	if ($result)
 	{
 		@chmod($pathoffiletoedittarget, octdec($newmask));
-	}
-	else
-	{
+	} else {
 		$error++;
 	}
 
diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php
index 85142e0e631..065b4dfc886 100644
--- a/htdocs/core/lib/multicurrency.lib.php
+++ b/htdocs/core/lib/multicurrency.lib.php
@@ -30,19 +30,21 @@
  */
 function multicurrencyAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath("/admin/multicurrency.php", 1);
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'settings';
-    $h++;
+	$head[$h][0] = dol_buildpath("/admin/multicurrency.php", 1);
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'settings';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency');
 
-    return $head;
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency', 'remove');
+
+	return $head;
 }
 
 /**
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index 7dfd025609c..1120b3f8d15 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -45,9 +45,7 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
         include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
         $Parsedown = new Parsedown();
         $content = $Parsedown->text($content);
-    }
-    else
-    {
+    } else {
         $content = nl2br($content);
     }
 
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index d031984552e..601dad3275d 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -2,6 +2,7 @@
 /**
  * Copyright (C) 2013	    Marcos García	        <marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Abbes Bahfir            <bafbes@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,11 +39,11 @@ function payment_prepare_head(Paiement $object)
 	$head[$h][2] = 'payment';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
@@ -54,6 +55,41 @@ function payment_prepare_head(Paiement $object)
 	return $head;
 }
 
+/**
+ * Returns an array with the tabs for the "Bannkline" section
+ * It loads tabs from modules looking for the entity payment
+ *
+ * @param 	int		$id		ID of bank line
+ * @return 	array 			Tabs for the Bankline section
+ */
+function bankline_prepare_head($id)
+{
+	global $langs, $conf;
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
+	$head[$h][1] = $langs->trans('BankTransaction');
+	$head[$h][2] = 'bankline';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline');
+
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline', 'remove');
+
+	return $head;
+}
+
 /**
  * Returns an array with the tabs for the "Supplier payment" section
  * It loads tabs from modules looking for the entity payment_supplier
@@ -73,11 +109,11 @@ function payment_supplier_prepare_head(Paiement $object)
 	$head[$h][2] = 'payment';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
@@ -134,7 +170,7 @@ function showOnlinePaymentUrl($type, $ref)
 	global $langs;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array('payment', 'stripe'));
+	$langs->loadLangs(array('payment', 'stripe'));
 
 	$servicename = $langs->transnoentitiesnoconv('Online');
 
@@ -158,7 +194,7 @@ function showOnlinePaymentUrl($type, $ref)
  */
 function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0)
 {
-    global $conf, $dolibarr_main_url_root;
+	global $conf, $dolibarr_main_url_root;
 
 	$ref = str_replace(' ', '', $ref);
 	$out = '';
@@ -173,79 +209,71 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 
 	if ($type == 'free')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 			else $out .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 		}
 		//if ($mode) $out.='&noidempotency=1';
-	}
-	elseif ($type == 'order')
+	} elseif ($type == 'order')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'order_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	}
-	elseif ($type == 'invoice')
+	} elseif ($type == 'invoice')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'invoice_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	}
-	elseif ($type == 'contractline')
+	} elseif ($type == 'contractline')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'contractline_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	}
-	elseif ($type == 'member' || $type == 'membersubscription')
+	} elseif ($type == 'member' || $type == 'membersubscription')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'member_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
@@ -255,15 +283,14 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 	}
 	if ($type == 'donation')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'donation_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else
-			{
+			else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
 				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
 				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
@@ -292,82 +319,82 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
  */
 function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)
 {
-    global $conf;
+	global $conf;
 
-    // Juridical status
-    $line1 = "";
-    if ($fromcompany->forme_juridique_code)
-    {
-        $line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
-    }
-    // Capital
-    if ($fromcompany->capital)
-    {
-        $line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
-    }
-    // Prof Id 1
-    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
-    {
-        $field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
-    }
-    // Prof Id 2
-    if ($fromcompany->idprof2)
-    {
-        $field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
-    }
+	// Juridical status
+	$line1 = "";
+	if ($fromcompany->forme_juridique_code)
+	{
+		$line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+	}
+	// Capital
+	if ($fromcompany->capital)
+	{
+		$line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+	}
+	// Prof Id 1
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
+	{
+		$field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
+	}
+	// Prof Id 2
+	if ($fromcompany->idprof2)
+	{
+		$field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
+	}
 
-    // Second line of company infos
-    $line2 = "";
-    // Prof Id 3
-    if ($fromcompany->idprof3)
-    {
-        $field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
-    }
-    // Prof Id 4
-    if ($fromcompany->idprof4)
-    {
-        $field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
-    }
-    // IntraCommunautary VAT
-    if ($fromcompany->tva_intra != '')
-    {
-        $line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
-    }
+	// Second line of company infos
+	$line2 = "";
+	// Prof Id 3
+	if ($fromcompany->idprof3)
+	{
+		$field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
+	}
+	// Prof Id 4
+	if ($fromcompany->idprof4)
+	{
+		$field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
+	}
+	// IntraCommunautary VAT
+	if ($fromcompany->tva_intra != '')
+	{
+		$line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '<div class="center">'."\n";
-    if ($addformmessage)
-    {
-    	print '<!-- object = '.$object->element.' -->';
-    	print '<br>';
+	print '<div class="center">'."\n";
+	if ($addformmessage)
+	{
+		print '<!-- object = '.$object->element.' -->';
+		print '<br>';
 
-    	$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
+		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+		elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
 
-    	// Add other message if VAT exists
-    	if ($object->total_vat != 0 || $object->total_tva != 0)
-    	{
-    		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
-    	}
-    }
+		// Add other message if VAT exists
+		if ($object->total_vat != 0 || $object->total_tva != 0)
+		{
+			$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
+			if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+			elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+		}
+	}
 
-    print '<font style="font-size: 10px;"><br><hr>'."\n";
-    print $fromcompany->name.'<br>';
-    print $line1;
-    if (strlen($line1.$line2) > 50) print '<br>';
-    else print ' - ';
-    print $line2;
-    print '</font></div>'."\n";
+	print '<font style="font-size: 10px;"><br><hr>'."\n";
+	print $fromcompany->name.'<br>';
+	print $line1;
+	if (strlen($line1.$line2) > 50) print '<br>';
+	else print ' - ';
+	print $line2;
+	print '</font></div>'."\n";
 }
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index c1cd75f79cb..db79efefc45 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
  * Copyright (C) 2015-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2019       Lenin Rivas           	<lenin.rivas@servcom-it.com>
+ * Copyright (C) 2020       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
@@ -54,9 +55,7 @@ function pdf_getFormat(Translate $outputlangs = null, $mode = 'setup')
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$pdfformat = dol_getDefaultFormat($outputlangs);
-	}
-	else
-	{
+	} else {
 		$pdfformat = $conf->global->MAIN_PDF_FORMAT;
 	}
 
@@ -123,7 +122,11 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 		define('K_SMALL_RATIO', 2 / 3);
 		define('K_THAI_TOPCHARS', true);
 		define('K_TCPDF_CALLS_IN_HTML', true);
-		define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
+		if (!empty($conf->global->TCPDF_THROW_ERRORS_INSTEAD_OF_DIE)) {
+			define('K_TCPDF_THROW_EXCEPTION_ERROR', true);
+		} else {
+			define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
+		}
 	}
 
 	// Load TCPDF
@@ -267,7 +270,7 @@ function pdf_getPDFFontSize($outputlangs)
 function pdf_getHeightForLogo($logo, $url = false)
 {
 	global $conf;
-	$height = (empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? 22 : $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
+	$height = (empty($conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT) ? 20 : $conf->global->MAIN_DOCUMENTS_LOGO_HEIGHT);
 	$maxwidth = 130;
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 	$tmp = dol_getImageSize($logo, $url);
@@ -305,9 +308,7 @@ function pdfGetHeightForHtmlContent(&$pdf, $htmlcontent)
     $height = 0;
     if ($end_page == $start_page) {
         $height = $end_y - $start_y;
-    }
-    else
-    {
+    } else {
         for ($page = $start_page; $page <= $end_page; ++$page) {
         	$pdf->setPage($page);
         	$tmpm = $pdf->getMargins();
@@ -482,8 +483,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
     			// 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)) {
+    			} 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));
     			}
 
@@ -513,9 +513,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
                         if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
     			    }
     			}
-    		}
-    		else
-    		{
+    		} 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));
@@ -781,7 +779,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 					// Key
 					$tmplength = 15;
 					$content = $account->cle_rib;
-				}elseif ($val == 'IBAN' || $val == 'BIC') {
+				} elseif ($val == 'IBAN' || $val == 'BIC') {
 					// Key
 					$tmplength = 0;
 					$content = '';
@@ -803,9 +801,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
     		$curx = $savcurx;
     		$cury += 8;
 		}
-	}
-	else
-	{
+	} else {
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizecontent);
 		$pdf->SetXY($curx, $cury);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
@@ -840,9 +836,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 		$tmpy = $pdf->getStringHeight(100, $val);
 		$cury += $tmpy;
 		$cur += 1;
-	}
-
-	elseif (!$usedetailedbban) $cury += 1;
+	} elseif (!$usedetailedbban) $cury += 1;
 
 	// Use correct name of bank id according to country
 	$ibankey = FormBank::getIBANLabel($account);
@@ -1058,9 +1052,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
     			$width = 200; $align = 'C';
     		}
 		    $freetextheight = $pdf->getStringHeight($width, $line);
-		}
-		else
-		{
+		} else {
             $freetextheight = pdfGetHeightForHtmlContent($pdf, dol_htmlentitiesbr($line, 1, 'UTF-8', 0)); // New method (works for HTML content)
             //print '<br>'.$freetextheight;exit;
 		}
@@ -1075,9 +1067,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
 		{
             $pdf->MultiCell(0, 3, $line, 0, $align, 0);
-		}
-		else
-		{
+		} 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));
 		}
 		$posy -= $freetextheight;
@@ -1244,9 +1234,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	{
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$prodser = new ProductFournisseur($db);
-	}
-	else
-	{
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$prodser = new Product($db);
 	}
@@ -1282,8 +1270,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$textwasmodified = ($note == $prodser->note);
 			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
 		}
-	}
-	elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
+	} elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
 		if ($object->type == $object::TYPE_DEPOSIT) {
 			$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
 		}
@@ -1306,8 +1293,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
-		}
-		elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
@@ -1315,21 +1301,17 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
-		}
-		elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
-		}
-		elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
+		} elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
 		{
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
-		}
-		else
-		{
+		} else {
 			if ($idprod)
 			{
 				if (empty($hidedesc))
@@ -1337,15 +1319,15 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 					if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
 					{
 						$libelleproduitservice = $desc."\n".$libelleproduitservice;
-					}
-					else
-					{
-						$libelleproduitservice .= $desc;
+					} else {
+						if (!empty($conf->global->HIDE_LABEL_VARIANT_PDF) && $prodser->isVariant()) {
+							$libelleproduitservice = $desc;
+						} else {
+							$libelleproduitservice .= $desc;
+						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$libelleproduitservice .= $desc;
 			}
 		}
@@ -1359,9 +1341,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		if ($prodser->isService())
 		{
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
-		}
-		else
-		{
+		} else {
 			$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 		}
 	}
@@ -1374,14 +1354,12 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 				$ref_prodserv = $ref_supplier;
 			elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2)
 				$ref_prodserv = $ref_supplier.' ('.$outputlangs->transnoentitiesnoconv("InternalRef").' '.$prodser->ref.')';
-			else	// Common case
+			else // Common case
 			{
 				$ref_prodserv = $prodser->ref; // Show local ref
 				if ($ref_supplier) $ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');
 			}
-		}
-		else
-		{
+		} else {
 			$ref_prodserv = $prodser->ref; // Show local ref only
 		}
 
@@ -1942,9 +1920,7 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 				}
 			 	$result = ($object->lines[$i]->situation_percent - $prev_progress).'%';
-			}
-			else
-				$result = $object->lines[$i]->situation_percent.'%';
+			} else $result = $object->lines[$i]->situation_percent.'%';
 	  	}
 	}
 	return $result;
@@ -1999,9 +1975,7 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
         		}
 				$result .= price($sign * ($total_ht / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
-        	}
-        	else
-        	{
+        	} else {
                 $result .= price($sign * $total_ht, 0, $outputlangs);
         	}
         }
@@ -2043,8 +2017,7 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 		if ($object->lines[$i]->special_code == 3)
     	{
     		$result .= $outputlangs->transnoentities("Option");
-    	}
-		elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
+    	} elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
 	}
 	return $result;
 }
@@ -2073,8 +2046,7 @@ function pdf_getTotalQty($object, $type, $outputlangs)
 			if ($type == 'all')
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
+			} elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
 			{
 				$special_code = $object->lines[$i]->special_code;
 				if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -2082,12 +2054,10 @@ function pdf_getTotalQty($object, $type, $outputlangs)
 				$action = '';
 				$reshook = $hookmanager->executeHooks('pdf_getTotalQty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				return $hookmanager->resPrint;
-			}
-			elseif ($type == 0 && $object->lines[$i]->product_type == 0)
+			} elseif ($type == 0 && $object->lines[$i]->product_type == 0)
 			{
 				$total += $object->lines[$i]->qty;
-			}
-			elseif ($type == 1 && $object->lines[$i]->product_type == 1)
+			} elseif ($type == 1 && $object->lines[$i]->product_type == 1)
 			{
 				$total += $object->lines[$i]->qty;
 			}
@@ -2118,8 +2088,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 	    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')
+	    } elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
 		{
 			$outputlangs->load('propal');
 
@@ -2130,8 +2099,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'commande' || $objecttype == 'supplier_order')
+		} elseif ($objecttype == 'commande' || $objecttype == 'supplier_order')
 		{
 			$outputlangs->load('orders');
 			foreach ($objects as $elementobject)
@@ -2141,8 +2109,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'contrat')
+		} elseif ($objecttype == 'contrat')
 		{
 			$outputlangs->load('contracts');
 			foreach ($objects as $elementobject)
@@ -2152,8 +2119,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'fichinter')
+		} elseif ($objecttype == 'fichinter')
 		{
 			$outputlangs->load('interventions');
 			foreach ($objects as $elementobject)
@@ -2163,8 +2129,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("InterDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->datec, 'day', '', $outputlangs);
 			}
-		}
-		elseif ($objecttype == 'shipping')
+		} elseif ($objecttype == 'shipping')
 		{
 			$outputlangs->loadLangs(array("orders", "sendings"));
 
@@ -2175,11 +2140,11 @@ function pdf_getLinkedObjects($object, $outputlangs)
 			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
 			    {
 			        $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-			        if (! empty($elementobject->linkedObjectsIds['commande'])){
+			        if (!empty($elementobject->linkedObjectsIds['commande'])) {
 						include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 						$order = new Commande($db);
 						$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
-						if ($ret < 1) { $order=null; }
+						if ($ret < 1) { $order = null; }
 					}
 			    }
 			    if (!is_object($order))
@@ -2190,9 +2155,7 @@ function pdf_getLinkedObjects($object, $outputlangs)
 			        //$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
-			    {
+			    } 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);
@@ -2238,8 +2201,7 @@ function pdf_getSizeForImage($realpath)
 		{
 			$width = $maxwidth;
 			$height = (int) round($maxwidth * $tmp['height'] / $tmp['width']);
-		}
-		else	// No pb with maxheight
+		} else // No pb with maxheight
 		{
 			$height = $maxheight;
 		}
@@ -2264,9 +2226,7 @@ function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails =
 	if ($object->lines[$i]->special_code == 3)
 	{
 		return $outputlangs->transnoentities("Option");
-	}
-	else
-	{
+	} else {
 		if (is_object($hookmanager))
 		{
 			$special_code = $object->lines[$i]->special_code;
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 2cb8d8e30f6..ea80732ae41 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -131,8 +131,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$localtax1_rate = $localtaxes_array[1];
 		$localtax2_type = $localtaxes_array[2];
 		$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)
+	} 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);
 
@@ -152,15 +151,13 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 				$localtax2_type = $obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);exit;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 	}
 
 	// pu calculation from pu_devise if pu empty
 	if (empty($pu) && !empty($pu_devise)) {
 		if (!empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else
-		{
+		else {
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
 			return array();
 		}
@@ -169,8 +166,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// pu_devise calculation from pu
 	if (empty($pu_devise) && !empty($multicurrency_tx)) {
 		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else
-		{
+		else {
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
 			return array();
 		}
@@ -192,9 +188,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
     	$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
-    {
+    } else {
     	$tot_sans_remise_wt = $tot_sans_remise;
     	$tot_avec_remise_wt = $tot_avec_remise;
     	$pu_wt = $pu;
@@ -268,9 +262,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[5] = price2num($pu * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[2], 'MU'); // Selon TVA NPR ou non
 		$result5bis = price2num($pu * (1 + ($txtva / 100)) + $localtaxes[2], 'MU'); // Si TVA consideree normale (non NPR)
 		$result[4] = price2num($result5bis - ($result[3] + $localtaxes[2]), 'MU');
-	}
-	else
-	{
+	} else {
 		// We work to define prices using the price with tax
 		$result[8] = price2num($tot_sans_remise + $localtaxes[0], 'MT');
 		$result[6] = price2num($tot_sans_remise / (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)), 'MT'); // Selon TVA NPR ou non
@@ -354,9 +346,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[10] = round($result[10] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[2] = price2num($result[0] + $result[1] + $result[9] + $result[10], 'MT');
-		}
-		else
-		{
+		} else {
 			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[2] = round($result[2] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
@@ -405,9 +395,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$result[24] = $newresult[8];
 		$result[25] = $newresult[9];
 		$result[26] = $newresult[10];
-	}
-	else
-	{
+	} else {
 		$result[16] = $result[0];
 		$result[17] = $result[1];
 		$result[18] = $result[2];
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index a8567cd420c..dfc57313add 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -547,17 +547,14 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 				't.rowid' => $unit,
 				't.active' => 1
 			);
-		}
-		elseif ($scale !== '')
+		} elseif ($scale !== '')
 		{
 			$arrayforfilter = array(
 				't.scale' => $scale,
 				't.unit_type' => $measuring_style,
 				't.active' => 1
 			);
-		}
-		else
-		{
+		} else {
 			$arrayforfilter = array(
 				't.rowid' => $unit,
 				't.unit_type' => $measuring_style,
@@ -578,8 +575,7 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 			$measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label] = $labeltoreturn;
 			return $labeltoreturn;
 		}
-	}
-	else {
+	} else {
 		return $measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label];
 	}
 }
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ac8530b4aa5..29a522e7335 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -30,23 +30,23 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 /**
  * Prepare array with list of tabs
  *
- * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to show
+ * @param	Project	$project	Object related to tabs
+ * @return	array				Array of tabs to show
  */
-function project_prepare_head($object)
+function project_prepare_head(Project $project)
 {
 	global $db, $langs, $conf, $user;
 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$project->id;
 	$head[$h][1] = $langs->trans("Project");
 	$head[$h][2] = 'project';
 	$h++;
 
-	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
+	$nbContact = count($project->liste_contact(-1, 'internal')) + count($project->liste_contact(-1, 'external'));
+	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$project->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
 	if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 	$head[$h][2] = 'contact';
@@ -55,12 +55,12 @@ function project_prepare_head($object)
 	if (empty($conf->global->PROJECT_HIDE_TASKS))
 	{
 		// Then tab for sub level of projet, i mean tasks
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id;
 		$head[$h][1] = $langs->trans("Tasks");
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic = new Task($db);
-		$nbTasks = count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+		$nbTasks = count($taskstatic->getTasksArray(0, 0, $project->id, 0, 0));
 		if ($nbTasks > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbTasks).'</span>';
 		$head[$h][2] = 'tasks';
 		$h++;
@@ -71,16 +71,15 @@ function project_prepare_head($object)
 		//$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";
 		$sql .= " WHERE t.fk_task = pt.rowid";
-		$sql .= " AND pt.fk_projet =".$object->id;
+		$sql .= " AND pt.fk_projet =".$project->id;
 		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $nbTimeSpent = 1;
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$project->id;
 		$head[$h][1] = $langs->trans("TimeSpent");
 		if ($nbTimeSpent > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
 		$head[$h][2] = 'timespent';
@@ -92,8 +91,32 @@ function project_prepare_head($object)
 		|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)
 		|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
+		$count = 0;
+
+		if (!empty($conf->propal->enabled))				$count += $project->getElementCount('propal', 'propal');
+		if (!empty($conf->commande->enabled))			$count += $project->getElementCount('order', 'commande');
+		if (!empty($conf->facture->enabled))			$count += $project->getElementCount('invoice', 'facture');
+		if (!empty($conf->facture->enabled))			$count += $project->getElementCount('invoice_predefined', 'facture_rec');
+		if (!empty($conf->supplier_proposal->enabled))	$count += $project->getElementCount('proposal_supplier', 'supplier_proposal');
+		if (!empty($conf->supplier_order->enabled))		$count += $project->getElementCount('order_supplier', 'commande_fournisseur');
+		if (!empty($conf->supplier_invoice->enabled))	$count += $project->getElementCount('invoice_supplier', 'facture_fourn');
+		if (!empty($conf->contrat->enabled))			$count += $project->getElementCount('contract', 'contrat');
+		if (!empty($conf->ficheinter->enabled))			$count += $project->getElementCount('intervention', 'fichinter');
+		if (!empty($conf->expedition->enabled))			$count += $project->getElementCount('shipping', 'expedition');
+		if (!empty($conf->mrp->enabled))				$count += $project->getElementCount('mrp', 'mrp_mo', 'fk_project');
+		if (!empty($conf->deplacement->enabled))		$count += $project->getElementCount('trip', 'deplacement');
+		if (!empty($conf->expensereport->enabled))		$count += $project->getElementCount('expensereport', 'expensereport');
+		if (!empty($conf->don->enabled))				$count += $project->getElementCount('donation', 'don');
+		if (!empty($conf->loan->enabled))				$count += $project->getElementCount('loan', 'loan');
+		if (!empty($conf->tax->enabled))				$count += $project->getElementCount('chargesociales', 'chargesociales');
+		if (!empty($conf->projet->enabled))				$count += $project->getElementCount('project_task', 'projet_task');
+		if (!empty($conf->stock->enabled))				$count += $project->getElementCount('stock_mouvement', 'stock');
+		if (!empty($conf->salaries->enabled))			$count += $project->getElementCount('salaries', 'payment_salary');
+		if (!empty($conf->banque->enabled))				$count += $project->getElementCount('variouspayment', 'payment_various');
+
+		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$project->id;
 		$head[$h][1] = $langs->trans("ProjectOverview");
+		if ($count > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$count.'</span>';
 		$head[$h][2] = 'element';
 		$h++;
 	}
@@ -102,15 +125,15 @@ function project_prepare_head($object)
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project');
+	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project');
 
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
+		if (!empty($project->note_private)) $nbNote++;
+		if (!empty($project->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$project->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		$head[$h][2] = 'notes';
@@ -119,10 +142,10 @@ function project_prepare_head($object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($project->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
+	$nbLinks = Link::count($db, $project->element, $project->id);
+	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$project->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'document';
@@ -131,15 +154,15 @@ function project_prepare_head($object)
 	// Manage discussion
 	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))
 	{
-		$nbComments = $object->getNbComments();
-		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
+		$nbComments = $project->getNbComments();
+		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$project->id;
 		$head[$h][1] = $langs->trans("CommentLink");
 		if ($nbComments > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbComments.'</span>';
 		$head[$h][2] = 'project_comment';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$project->id;
 	$head[$h][1] .= $langs->trans("Events");
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
@@ -149,7 +172,7 @@ function project_prepare_head($object)
 	$head[$h][2] = 'agenda';
 	$h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project', 'remove');
+	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project', 'remove');
 
 	return $head;
 }
@@ -191,8 +214,7 @@ function task_prepare_head($object)
 	{
 		$obj = $db->fetch_object($resql);
 		if ($obj) $nbTimeSpent = 1;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TimeSpent");
@@ -418,15 +440,11 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					if ($foundtaskforuserdeeper > 0)
 					{
 						$showlineingray = 1; // We will show line but in gray
-					}
-					else
-					{
+					} else {
 						$showline = 0; // No reason to show line
 					}
 				}
-			}
-			else
-			{
+			} else {
 				// Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
 				// or into all other projects if user has permission to).
 				if (empty($user->rights->projet->all->lire))
@@ -681,9 +699,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				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;
 			}
-		}
-		else
-		{
+		} else {
 			//$level--;
 		}
 	}
@@ -1264,8 +1280,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				}
-				else print '--:--';
+				} else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
@@ -1379,9 +1394,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
-		{
+		} else {
 			//$level--;
 		}
 	}
@@ -1640,8 +1653,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				}
-				else print '--:--';
+				} else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
@@ -1744,9 +1756,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
-		{
+		} else {
 			//$level--;
 		}
 	}
@@ -1909,8 +1919,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				}
-				else print '--:--';
+				} else print '--:--';
 				print "</td>\n";
 
 				// Time spent by user
@@ -2005,9 +2014,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				//var_dump($totalforeachday);
 			}
 			$level--;
-		}
-		else
-		{
+		} else {
 			//$level--;
 		}
 	}
@@ -2109,9 +2116,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 		$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
-	}
-	else
-	{
+	} else {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t ON p.rowid = t.fk_projet";
 	}
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
@@ -2159,12 +2164,12 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 			$arrayidofprojects[$objp->projectid] = $objp->projectid;
 			$i++;
 		}
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
 
 	// Get list of project with calculation on tasks
-	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount,";
+	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc, s.nom as socname, s.email, s.client, s.fournisseur,";
+	$sql2 .= " p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_percent, p.opp_amount,";
 	$sql2 .= " p.dateo, p.datee,";
 	$sql2 .= " COUNT(t.rowid) as nb, SUM(t.planned_workload) as planned_workload, SUM(t.planned_workload * t.progress / 100) as declared_progess_workload";
 	$sql2 .= " FROM ".MAIN_DB_PREFIX."projet as p";
@@ -2217,7 +2222,6 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 			if ($userAccess >= 0)
 			{
 				$projectstatic->ref = $objp->ref;
-				$projectstatic->statut = $objp->status; // deprecated
 				$projectstatic->status = $objp->status;
 				$projectstatic->title = $objp->title;
 				$projectstatic->datee = $db->jdate($objp->datee);
@@ -2236,6 +2240,9 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 					$thirdpartystatic->id = $objp->fk_soc;
 					$thirdpartystatic->ref = $objp->socname;
 					$thirdpartystatic->name = $objp->socname;
+					$thirdpartystatic->client = $objp->client;
+					$thirdpartystatic->fournisseur = $objp->fournisseur;
+					$thirdpartystatic->email = $objp->email;
 					print $thirdpartystatic->getNomUrl(1);
 				}
 				print '</td>';
@@ -2339,9 +2346,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		print '</tr>';
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -2405,13 +2410,11 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
             $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%
+        } 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 {
+        } 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>';
@@ -2426,8 +2429,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
         if ($label !== true) {
             $out .= $label; // replace label by param
-        }
-        else {
+        } else {
             $out .= $task->getNomUrl(1).' '.dol_htmlentities($task->label);
         }
         $out .= '    </span>';
@@ -2439,8 +2441,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
         $out .= '    <span class="progress-number">';
         if ($progressNumber !== true) {
             $out .= $progressNumber; // replace label by param
-        }
-        else {
+        } else {
             if ($task->hasDelay()) $out .= img_warning($langs->trans("Late")).' ';
 
 			$url = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$task->id;
@@ -2453,7 +2454,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
             $out .= '</b>';
 			$out .= '</a>';
 
-            $out .= '/';
+            $out .= ' / ';
 
 			$out .= '<a href="'.$url.'" >';
             $out .= '<span title="'.$langs->trans('PlannedWorkload').'" >';
@@ -2475,9 +2476,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 			$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';
 		}
     	$out .= '        </div>';
-    }
-    else
-    {
+    } 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>';
@@ -2518,12 +2517,10 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
             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%
+            } 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 {
+            } else {
                 $badgeClass .= 'badge-success';
                 if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("Expected").' '.$progressCalculated.'%';
             }
diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index 3cf9a535eaa..f36295e31f3 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -47,41 +47,40 @@ function reception_prepare_head(Reception $object)
 	$head[$h][2] = 'reception';
 	$h++;
 
-
-
 	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."/reception/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."/reception/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++;
 	}
 
-    $nbNote = 0;
-    if (!empty($object->note_private)) $nbNote++;
-    if (!empty($object->note_public)) $nbNote++;
+	// 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, 'reception');
+
+	$nbNote = 0;
+	if (!empty($object->note_private)) $nbNote++;
+	if (!empty($object->note_public)) $nbNote++;
 	$head[$h][0] = DOL_URL_ROOT."/reception/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++;
 
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception', 'remove');
 
-
-
-
-
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'order', 'remove');
-
-    return $head;
+	return $head;
 }
 
 /**
@@ -102,25 +101,24 @@ function reception_admin_prepare_head()
 	$head[$h][2] = 'reception';
 	$h++;
 
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'reception_admin');
 
 	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
 	{
-	    $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
-	    $head[$h][1] = $langs->trans("ExtraFields");
-	    $head[$h][2] = 'attributes_reception';
-	    $h++;
+		$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
+		$head[$h][1] = $langs->trans("ExtraFields");
+		$head[$h][2] = 'attributes_reception';
+		$h++;
 	}
 
 	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
 	{
-	    $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
-	    $head[$h][1] = $langs->trans("ExtraFieldsLines");
-	    $head[$h][2] = 'attributeslines_reception';
-	    $h++;
+		$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
+		$head[$h][1] = $langs->trans("ExtraFieldsLines");
+		$head[$h][2] = 'attributeslines_reception';
+		$h++;
 	}
 
-
-
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'reception_admin', 'remove');
 
 	return $head;
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index 5a8d5d2530e..67e01e376c9 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -69,7 +69,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 
 	// Ligne de titre
 	print '<tr>';
-	print '<td width="110">'.$langs->trans("ReportName").'</td>';
+	print '<td width="150">'.$langs->trans("ReportName").'</td>';
 	print '<td>';
 	print $reportname;
 	print '</td>';
@@ -80,7 +80,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 	if ($calcmode)
 	{
 		print '<tr>';
-		print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
+		print '<td width="150">'.$langs->trans("CalculationMode").'</td>';
 		print '<td>';
 		print $calcmode;
 		if ($variante) print '<td></td>';
diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
index e6a0998ba6f..a4ba796078f 100644
--- a/htdocs/core/lib/resource.lib.php
+++ b/htdocs/core/lib/resource.lib.php
@@ -37,13 +37,13 @@ function resource_prepare_head($object)
 
 	$head[$h][0] = dol_buildpath('/resource/card.php', 1).'?id='.$object->id;
 	$head[$h][1] = $langs->trans("ResourceCard");
-    	$head[$h][2] = 'resource';
+	$head[$h][2] = 'resource';
 	$h++;
 
 	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)))
 	{
-	    $nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/resource/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';
diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index 5a94e025097..c11e37b7aaa 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -27,42 +27,41 @@
  */
 function salaries_prepare_head($object)
 {
+	global $db, $langs, $conf;
 
-    global $db, $langs, $conf;
+	$h = 0;
+	$head = array();
 
-    $h = 0;
-    $head = array();
+	$head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("SalaryPayment");
+	$head[$h][2] = 'card';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/salaries/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("SalaryPayment");
-    $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, 'salaries');
 
-    // 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, 'salaries');
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->salaries->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.'/salaries/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge ">'.($nbFiles + $nbLinks).'</span>';
+	$head[$h][2] = 'documents';
+	$h++;
 
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    $upload_dir = $conf->salaries->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.'/salaries/document.php?id='.$object->id;
-    $head[$h][1] = $langs->trans('Documents');
-    if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge ">'.($nbFiles + $nbLinks).'</span>';
-    $head[$h][2] = 'documents';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/salaries/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/salaries/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, 'salaries', 'remove');
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'salaries', 'remove');
-
-    return $head;
+	return $head;
 }
 
 /**
@@ -72,28 +71,28 @@ function salaries_prepare_head($object)
  */
 function salaries_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.'/salaries/admin/salaries.php';
-    $head[$h][1] = $langs->trans("Miscellaneous");
-    $head[$h][2] = 'general';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries.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, '', $head, $h, 'salaries_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, 'salaries_admin');
 
-    $head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsSalaries");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/salaries/admin/salaries_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsSalaries");
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, '', $head, $h, 'salaries_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'salaries_admin', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 92728286cd5..cd4bc333b41 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -46,8 +46,7 @@ function dol_encode($chain, $key = '1')
 			$output_tab[$i] = chr(ord(substr($chain, $i, 1)) + 17);
 		}
 		$chain = implode("", $output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result = '';
 		$strlength = dol_strlen($chain);
@@ -85,8 +84,7 @@ function dol_decode($chain, $key = '1')
 		}
 
 		$chain = implode("", $output_tab);
-	}
-	elseif ($key)
+	} elseif ($key)
 	{
 		$result = '';
 		$strlength = dol_strlen($chain);
@@ -171,7 +169,7 @@ function dol_verifyHash($chain, $hash, $type = '0')
  *	@param	User	$user      	  	User to check
  *	@param  string	$features	    Features to check (it must be module $object->element. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
  *	@param  int		$objectid      	Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
- *	@param  string	$tableandshare  'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
+ *	@param  string	$tableandshare  'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany module. Param not used if objectid is null (optional).
  *	@param  string	$feature2		Feature to check, second level of permission (optional). Can be a 'or' check with 'sublevela|sublevelb'.
  *  @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)
@@ -189,10 +187,15 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	//print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
 	//print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
 
+	$parentfortableentity = '';
+
 	if ($features == 'facturerec') $features = 'facture';
 	if ($features == 'mo') $features = 'mrp';
 	if ($features == 'member') $features = 'adherent';
 	if ($features == 'subscription') { $features = 'adherent'; $feature2 = 'cotisation'; };
+	if ($features == 'websitepage') { $features = 'website'; $tableandshare = 'website_page'; $parentfortableentity = 'fk_website@website'; }
+	if ($features == 'project') $features = 'projet';
+	if ($features == 'product') $features = 'produit';
 
 	// Get more permissions checks from hooks
 	$parameters = array('features'=>$features, 'objectid'=>$objectid, 'idtype'=>$dbt_select);
@@ -248,9 +251,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 			$tmpreadok = 1;
 			foreach ($feature2 as $subfeature) {
 				if ($subfeature == 'user' && $user->id == $objectid) continue; // A user can always read its own card
-				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; }
-				elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; }
-				else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
+				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; } elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; } else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
 			}
 			if (!$tmpreadok) {	// We found a test on feature that is ko
 				$readok = 0; // All tests are ko (we manage here the and, the or will be managed later using $nbko).
@@ -294,8 +295,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 				if (!$user->rights->import->run) { $createok = 0; $nbko++; }
 			} elseif ($feature == 'ecm') {
 				if (!$user->rights->ecm->upload) { $createok = 0; $nbko++; }
-			}
-			elseif (!empty($feature2)) {														// This is for permissions on one level
+			} elseif (!empty($feature2)) {														// This is for permissions on one level
 				foreach ($feature2 as $subfeature) {
 					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->creer) continue; // User can edit its own card
 					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->password) continue; // User can edit its own password
@@ -311,7 +311,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 						break;
 					}
 				}
-			} elseif (!empty($feature))	{												// This is for permissions on 2 levels ('creer' or 'write')
+			} elseif (!empty($feature)) {												// This is for permissions on 2 levels ('creer' or 'write')
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->creer.' write='.$user->rights->$feature->write; exit;
 				if (empty($user->rights->$feature->creer)
 				&& empty($user->rights->$feature->write)
@@ -348,47 +348,38 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 			if ($feature == 'contact')
 			{
 				if (!$user->rights->societe->contact->supprimer) $deleteok = 0;
-			}
-			elseif ($feature == 'produit|service')
+			} elseif ($feature == 'produit|service')
 			{
 				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) $deleteok = 0;
-			}
-			elseif ($feature == 'commande_fournisseur')
+			} elseif ($feature == 'commande_fournisseur')
 			{
 				if (!$user->rights->fournisseur->commande->supprimer) $deleteok = 0;
-			}
-			elseif ($feature == 'banque')
+			} elseif ($feature == 'banque')
 			{
 				if (!$user->rights->banque->modifier) $deleteok = 0;
-			}
-			elseif ($feature == 'cheque')
+			} elseif ($feature == 'cheque')
 			{
 				if (!$user->rights->banque->cheque) $deleteok = 0;
-			}
-			elseif ($feature == 'ecm')
+			} elseif ($feature == 'ecm')
 			{
 				if (!$user->rights->ecm->upload) $deleteok = 0;
-			}
-			elseif ($feature == 'ftp')
+			} elseif ($feature == 'ftp')
 			{
 				if (!$user->rights->ftp->write) $deleteok = 0;
-			}elseif ($feature == 'salaries')
+			} elseif ($feature == 'salaries')
 			{
 				if (!$user->rights->salaries->delete) $deleteok = 0;
-			}
-			elseif ($feature == 'salaries')
+			} elseif ($feature == 'salaries')
 			{
 				if (!$user->rights->salaries->delete) $deleteok = 0;
-			}
-			elseif (!empty($feature2))							// This is for permissions on 2 levels
+			} elseif (!empty($feature2))							// This is for permissions on 2 levels
 			{
 				foreach ($feature2 as $subfeature)
 				{
 					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok = 0;
 					else { $deleteok = 1; break; } // For bypass the second test if the first is ok
 				}
-			}
-			elseif (!empty($feature))							// This is used for permissions on 1 level
+			} elseif (!empty($feature))							// This is used for permissions on 1 level
 			{
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
 				if (empty($user->rights->$feature->supprimer)
@@ -408,7 +399,7 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	// is linked to a company allowed to $user.
 	if (!empty($objectid) && $objectid > 0)
 	{
-		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select);
+		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select, $parentfortableentity);
 		$params = array('objectid' => $objectid, 'features' => join(',', $featuresarray), 'features2' => $feature2);
 		return $ok ? 1 : accessforbidden('', 1, 1, 0, $params);
 	}
@@ -420,17 +411,18 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
  * Check access by user to object.
  * This function is also called by restrictedArea
  *
- * @param User			$user			User to check
- * @param array			$featuresarray	Features/modules to check. Example: ('user','service','member','project','task',...)
- * @param int|string	$objectid		Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
- * @param string		$tableandshare	'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
- * @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						True if user has access, False otherwise
+ * @param User			$user					User to check
+ * @param array			$featuresarray			Features/modules to check. Example: ('user','service','member','project','task',...)
+ * @param int|string	$objectid				Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
+ * @param string		$tableandshare			'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany modume. Param not used if objectid is null (optional).
+ * @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)
+ * @param string		$parenttableforentity  	Parent table for entity. Example 'fk_website@website'
+ * @return	bool								True if user has access, False otherwise
  * @see restrictedArea()
  */
-function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid')
+function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = '', $dbt_select = 'rowid', $parenttableforentity = '')
 {
 	global $db, $conf;
 
@@ -448,7 +440,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 		if ($feature == 'project') $feature = 'projet';
 		if ($feature == 'task')    $feature = 'projet_task';
 
-		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday'); // Test on entity only (Objects with no link to company)
+		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'website'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe'); // Test for societe object
 		$checkother = array('contact', 'agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet', 'project'); // Test for project object
@@ -476,35 +468,35 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 					{
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql .= " AND dbt.entity IS NOT NULL";
-					}
-					else
-					{
+					} else {
 						$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 						$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 						$sql .= " AND ((ug.fk_user = dbt.rowid";
 						$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 						$sql .= " OR dbt.entity = 0)"; // Show always superadmin
 					}
+				} else {
+					$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
+					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
-				else {
+			} else {
+				$reg = array();
+				if ($parenttableforentity && preg_match('/(.*)@(.*)/', $parenttableforentity, $reg)) {
+					$sql .= ", ".MAIN_DB_PREFIX.$reg[2]." as dbtp";
+					$sql .= " WHERE dbt.".$reg[1]." = dbtp.rowid AND dbt.".$dbt_select." IN (".$objectid.")";
+					$sql .= " AND dbtp.entity IN (".getEntity($sharedelement, 1).")";
+				} else {
 					$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 					$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				}
 			}
-			else
-			{
-				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
-				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-		}
-		elseif (in_array($feature, $checksoc))	// We check feature = checksoc
+		} elseif (in_array($feature, $checksoc))	// We check feature = checksoc
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
 			{
 				if ($user->socid <> $objectid) return false;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
+			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
@@ -514,8 +506,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " AND sc.fk_user = ".$user->id;
 				$sql .= " AND sc.fk_soc = s.rowid";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
+			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(s.rowid) as nb";
@@ -523,8 +514,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE s.rowid IN (".$objectid.")";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
+		} elseif (in_array($feature, $checkother))	// Test on entity and link to societe. Allowed if link is empty (Ex: contacts...).
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -533,18 +523,16 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.fk_soc = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
+			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = '".$user->id."'";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
+			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
@@ -552,11 +540,10 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-
-			if ($feature == 'agenda')// Also check myactions rights
+			if ($feature == 'agenda')// Also check owner or attendee for users without allactions->read
 			{
 				if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) {
-					require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 					$action = new ActionComm($db);
 					$action->fetch($objectid);
 					if ($action->authorid != $user->id && $action->userownerid != $user->id && !(array_key_exists($user->id, $action->userassigned))) {
@@ -564,9 +551,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 					}
 				}
 			}
-		}
-		elseif (in_array($feature, $checkproject))
-		{
+		} elseif (in_array($feature, $checkproject)) {
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -574,17 +559,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
 				if (!in_array($objectid, $tmparray)) return false;
-			}
-			else
-			{
+			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (in_array($feature, $checktask))
-		{
+		} elseif (in_array($feature, $checktask)) {
 			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
 			{
 				$task = new Task($db);
@@ -595,16 +576,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
 				if (!in_array($task->fk_project, $tmparray)) return false;
-			}
-			else
-			{
+			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		}
-		elseif (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
+		} elseif (!in_array($feature, $nocheck))		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 		{
 			// If external user: Check permission for external users
 			if ($user->socid > 0)
@@ -614,8 +592,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.rowid IN (".$objectid.")";
 				$sql .= " AND dbt.".$dbt_keyfield." = ".$user->socid;
-			}
-			// If internal user: Check permission for internal users that are restricted on their objects
+			} // If internal user: Check permission for internal users that are restricted on their objects
 			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
 			{
 				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
@@ -628,8 +605,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " AND dbt.".$dbt_keyfield." = s.rowid";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 				$sql .= " AND sc.fk_user = ".$user->id;
-			}
-			// If multicompany and internal users with all permissions, check user is in correct entity
+			} // If multicompany and internal users with all permissions, check user is in correct entity
 			elseif (!empty($conf->multicompany->enabled))
 			{
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
@@ -646,13 +622,12 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 			{
 				$obj = $db->fetch_object($resql);
 				if (!$obj || $obj->nb < count(explode(',', $objectid))) return false;
-			}
-			else
-			{
+			} else {
 				return false;
 			}
 		}
 	}
+
 	return true;
 }
 
@@ -707,9 +682,7 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 			{
 				print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
 				print $langs->trans("ErrorForbidden2", $langs->transnoentitiesnoconv("Home"), $langs->transnoentitiesnoconv("Users"));
-			}
-			else
-			{
+			} else {
 				print $langs->trans("ErrorForbidden3");
 			}
 		}
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index ce346c0d26e..6f206832e2d 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -92,7 +92,7 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
     				// Call function to check user/password
     				$function = 'check_user_password_'.$mode;
     				$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
-    				if ($login)	// Login is successfull
+    				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
@@ -101,9 +101,7 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
     					$dol_screenwidth = GETPOST('screenwidth');
     					$dol_screenheight = GETPOST('screenheight');
     				}
-    			}
-    			else
-    			{
+    			} else {
     				dol_syslog("Authentication KO - failed to load file '".$authfile."'", LOG_ERR);
     				sleep(1);
     				// Load translation files required by the page
@@ -132,8 +130,8 @@ if (!function_exists('dol_loginfunction'))
      */
     function dol_loginfunction($langs, $conf, $mysoc)
 	{
-		global $dolibarr_main_demo, $db;
-		global $hookmanager;
+		global $dolibarr_main_demo, $dolibarr_main_force_https;
+		global $db, $hookmanager;
 
 		$langs->loadLangs(array("main", "other", "help", "admin"));
 
@@ -179,16 +177,14 @@ if (!function_exists('dol_loginfunction'))
 				$tmp = dol_buildpath($reldir.'login.tpl.php');
 				if (file_exists($tmp)) { $template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp); break; }
 			}
-		}
-		else
-		{
+		} else {
 			$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 		}
 
 		// Set cookie for timeout management
 		$prefix = dol_getprefix('');
 		$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
-		if (!empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
+		if (!empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, (empty($dolibarr_main_force_https) ? false : true), true);
 
 		if (GETPOST('urlfrom', 'alpha')) $_SESSION["urlfrom"] = GETPOST('urlfrom', 'alpha');
 		else unset($_SESSION["urlfrom"]);
@@ -226,13 +222,11 @@ if (!function_exists('dol_loginfunction'))
 		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))
+		} 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);
 			$width = 128;
-		}
-		elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+		} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
 		{
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
 		}
@@ -363,8 +357,7 @@ function encodedecode_dbpassconf($level = 0)
 					$passwd = $val;
 					$lineofpass = 1;
 				}
-			}
-			elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))
+			} elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))
 			{
 				$val = trim($reg[1]); // This also remove CR/LF
 				$val = preg_replace('/^["\']/', '', $val);
@@ -375,9 +368,7 @@ function encodedecode_dbpassconf($level = 0)
 					$passwd_crypted = $val;
 					$val = dol_decode($val);
 					$passwd = $val;
-				}
-				else
-				{
+				} else {
 					$passwd = $val;
 					$val = dol_encode($val);
 					$passwd_crypted = $val;
@@ -400,9 +391,7 @@ function encodedecode_dbpassconf($level = 0)
 
 				//print 'passwd = '.$passwd.' - passwd_crypted = '.$passwd_crypted;
 				//exit;
-			}
-			else
-			{
+			} else {
 				$config .= $buffer;
 			}
 		}
@@ -422,15 +411,11 @@ function encodedecode_dbpassconf($level = 0)
 			//@chmod($file, octdec('0600'));
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_syslog("encodedecode_dbpassconf Failed to open conf.php file for writing", LOG_WARNING);
 			return -1;
 		}
-	}
-	else
-	{
+	} else {
 		dol_syslog("encodedecode_dbpassconf Failed to read conf.php", LOG_ERR);
 		return -2;
 	}
@@ -475,8 +460,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 			}
 
 			$generated_password = str_shuffle($randomCode);
-		}
-		else	// Old platform, non cryptographic random
+		} else // Old platform, non cryptographic random
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
@@ -493,8 +477,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 
 			$generated_password = str_shuffle($randomCode);
 		}
-	}
-	elseif (!empty($conf->global->USER_PASSWORD_GENERATED))
+	} elseif (!empty($conf->global->USER_PASSWORD_GENERATED))
 	{
 		$nomclass = "modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
 		$nomfichier = $nomclass.".class.php";
@@ -513,9 +496,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		if (function_exists('random_int'))	// Cryptographic random
 		{
 			$generated_password = str_replace($replaceambiguouschars, $numbers[random_int(0, $max)], $generated_password);
-		}
-		else
-		{
+		} else {
 			$generated_password = str_replace($replaceambiguouschars, $numbers[mt_rand(0, $max)], $generated_password);
 		}
 	}
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index ad1e6304d03..b81757f261f 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -304,9 +304,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 						}
 
 						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-					}
-					else
-					{
+					} else {
 						$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 					}
 
@@ -332,9 +330,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 					}
 
 					print '</td>';
-				}
-				else
-				{
+				} else {
 					print "<td>";
 					if ($objp->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
 					else $text = img_object($langs->trans('Product'), 'product');
@@ -439,9 +435,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 						print '<td class="right">';
 						print dol_print_date($receiving->date_delivery, 'day');
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						//print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
 						print '<td>&nbsp;</td>';
@@ -454,9 +448,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 			print '</table>';
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 837f505c132..37cb9b31e8d 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -63,8 +63,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
 		if ($mode == 1) $out .= '&hashp=<font color="#666666">hash_of_file</font>';
-		else
-		{
+		else {
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$propaltmp = new Propal($db);
 			$res = $propaltmp->fetch(0, $ref);
@@ -80,9 +79,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 			{
 				$out = $langs->trans("FeatureOnlineSignDisabled");
 				return $out;
-			}
-			else
-			{
+			} else {
 				$out .= '&hashp='.$hashp;
 			}
 		}
diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index d04fa5f77ef..dfddc95d733 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -26,7 +26,7 @@
  *
  * @return 	array				Array of tabs
  */
-function takepos_prepare_head()
+function takepos_admin_prepare_head()
 {
 	global $langs, $conf;
 
@@ -38,18 +38,20 @@ function takepos_prepare_head()
 	$head[$h][2] = 'setup';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/appearance.php';
+	$head[$h][1] = $langs->trans("Appearance");
+	$head[$h][2] = 'appearance';
+	$h++;
+
 	$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/receipt.php';
 	$head[$h][1] = $langs->trans("Receipt");
 	$head[$h][2] = 'receipt';
 	$h++;
 
-	if ($conf->global->TAKEPOS_BAR_RESTAURANT)
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/bar.php';
-		$head[$h][1] = $langs->trans("BarRestaurant");
-		$head[$h][2] = 'bar';
-		$h++;
-	}
+	$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/bar.php';
+	$head[$h][1] = $langs->trans("BarRestaurant");
+	$head[$h][2] = 'bar';
+	$h++;
 
 	$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
 	for ($i = 1; $i <= $numterminals; $i++)
@@ -65,7 +67,9 @@ function takepos_prepare_head()
 	$head[$h][2] = 'other';
 	$h++;
 
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos_admin');
 
-    return $head;
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos_admin', 'remove');
+
+	return $head;
 }
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index cdf9fe29b1c..3b261bd0814 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -42,7 +42,7 @@ function tax_prepare_head(ChargeSociales $object)
     $head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Card');
+	$head[$h][1] = $langs->trans('SocialContribution');
 	$head[$h][2] = 'card';
 	$h++;
 
@@ -110,8 +110,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	$paymenttable = 'paiement';
     	$paymentfacturetable = 'paiement_facture';
     	$invoicefieldref = 'ref';
-    }
-    elseif ($direction == 'buy')
+    } elseif ($direction == 'buy')
     {
     	$invoicetable = 'facture_fourn';
     	$invoicedettable = 'facture_fourn_det';
@@ -162,8 +161,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$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)
+    	} 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))."'";
@@ -172,11 +170,9 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 0"; // Limit to products
     	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else
-    {
+    } 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, ";
@@ -203,8 +199,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$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)
+    	} 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))."'";
@@ -213,7 +208,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 0"; // Limit to products
     	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
@@ -273,9 +268,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
     			$company_id = $assoc['company_id'];
     		}
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($db);
     		return -3;
     	}
@@ -310,8 +303,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$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)
+    	} 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))."'";
@@ -320,11 +312,9 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 1"; // Limit to services
     	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else
-    {
+    } 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, ";
@@ -351,8 +341,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$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)
+    	} 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))."'";
@@ -361,7 +350,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 1"; // Limit to services
     	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
@@ -424,9 +413,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
     			$company_id = $assoc['company_id'];
     		}
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($db);
     		return -3;
     	}
@@ -455,8 +442,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	{
     		$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)
+    	} 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))."'";
@@ -465,7 +451,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = -1";
     	$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
     	$sql .= " ORDER BY e.rowid";
 
     	if (!$sql)
@@ -528,9 +514,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
     				$company_id = $assoc['company_id'];
     			}
-    		}
-    		else
-    		{
+    		} else {
     			dol_print_error($db);
     			return -3;
     		}
@@ -579,9 +563,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         $paymenttable = 'paiement';
         $paymentfacturetable = 'paiement_facture';
         $invoicefieldref = 'ref';
-    }
-    else
-    {
+    } else {
         $invoicetable = 'facture_fourn';
         $invoicedettable = 'facture_fourn_det';
         $fk_facture = 'fk_facture_fourn';
@@ -631,8 +613,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         {
             $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)
+        } 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))."'";
@@ -641,11 +622,9 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
         $sql .= " AND (d.product_type = 0"; // Limit to products
         $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else
-    {
+    } 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, ";
@@ -672,8 +651,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
     	{
     		$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)
+    	} 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))."'";
@@ -682,7 +660,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
     	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 0"; // Limit to products
     	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
@@ -742,9 +720,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
                 $rate = $assoc['rate'];
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             return -3;
         }
@@ -779,8 +755,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         {
             $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)
+        } 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))."'";
@@ -789,11 +764,9 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
         $sql .= " AND (d.product_type = 1"; // Limit to services
         $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
-    }
-    else
-    {
+    } 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, ";
@@ -820,8 +793,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         {
             $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)
+        } 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))."'";
@@ -830,7 +802,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
         $sql .= " AND (d.product_type = 1"; // Limit to services
         $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
@@ -893,9 +865,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
                 $rate = $assoc['rate'];
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             return -3;
         }
@@ -924,8 +894,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		{
 			$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)
+		} 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))."'";
@@ -934,7 +903,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 		$sql .= " AND (d.product_type = -1";
 		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-		if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
 		$sql .= " ORDER BY e.rowid";
 
 		if (!$sql)
@@ -997,9 +966,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
 					$rate = $assoc['rate'];
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 				return -3;
 			}
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index b8413c323ef..826e2d6bc98 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -30,39 +30,41 @@
  */
 function ticketAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("ticket");
+	$langs->load("ticket");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/ticket.php';
-    $head[$h][1] = $langs->trans("TicketSettings");
-    $head[$h][2] = 'settings';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/ticket.php';
+	$head[$h][1] = $langs->trans("TicketSettings");
+	$head[$h][2] = 'settings';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsTicket");
-    $head[$h][2] = 'attributes';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/ticket_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsTicket");
+	$head[$h][2] = 'attributes';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/ticket_public.php';
-    $head[$h][1] = $langs->trans("PublicInterface");
-    $head[$h][2] = 'public';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/ticket_public.php';
+	$head[$h][1] = $langs->trans("PublicInterface");
+	$head[$h][2] = 'public';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    //$this->tabs = array(
-    //    'entity:+tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'
-    //); // to add new tab
-    //$this->tabs = array(
-    //    'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'
-    //); // to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//    'entity:+tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//    'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin');
 
-    return $head;
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin', 'remove');
+
+	return $head;
 }
 
 /**
@@ -73,71 +75,69 @@ function ticketAdminPrepareHead()
  */
 function ticket_prepare_head($object)
 {
-    global $db, $langs, $conf, $user;
+	global $db, $langs, $conf, $user;
 
-    $h = 0;
-    $head = array();
-    $head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id;
-    $head[$h][1] = $langs->trans("Ticket");
-    $head[$h][2] = 'tabTicket';
-    $h++;
+	$h = 0;
+	$head = array();
+	$head[$h][0] = DOL_URL_ROOT.'/ticket/card.php?action=view&track_id='.$object->track_id;
+	$head[$h][1] = $langs->trans("Ticket");
+	$head[$h][2] = 'tabTicket';
+	$h++;
 
-    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid))
-    {
-    	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-    	$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
-    	$head[$h][1] = $langs->trans('ContactsAddresses');
-    	if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
-    	$head[$h][2] = 'contact';
-    	$h++;
-    }
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid))
+	{
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
+		$head[$h][1] = $langs->trans('ContactsAddresses');
+		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		$head[$h][2] = 'contact';
+		$h++;
+	}
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket');
 
-    // Attached files
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    $upload_dir = $conf->ticket->dir_output."/".$object->ref;
-    $nbFiles = count(dol_dir_list($upload_dir, 'files'));
-    $head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?id='.$object->id;
-    $head[$h][1] = $langs->trans("Documents");
-    if ($nbFiles > 0) {
-        $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';
-    }
+	// Attached files
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	$upload_dir = $conf->ticket->dir_output."/".$object->ref;
+	$nbFiles = count(dol_dir_list($upload_dir, 'files'));
+	$head[$h][0] = dol_buildpath('/ticket/document.php', 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Documents");
+	if ($nbFiles > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';
+	}
 
-    $head[$h][2] = 'tabTicketDocument';
-    $h++;
+	$head[$h][2] = 'tabTicketDocument';
+	$h++;
 
 
-    // History
+	// History
 	$ticketViewType = "messaging";
 	if (empty($_SESSION['ticket-view-type'])) {
 		$_SESSION['ticket-view-type'] = $ticketViewType;
-	}
-	else {
+	} else {
 		$ticketViewType = $_SESSION['ticket-view-type'];
 	}
 
 	if ($ticketViewType == "messaging") {
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
-	}
-	else {
+	} else {
 		// $ticketViewType == "list"
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_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] = 'tabTicketLogs';
-    $h++;
+	$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] = 'tabTicketLogs';
+	$h++;
 
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticket', 'remove');
 
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -162,17 +162,13 @@ function showDirectPublicLink($object)
 	if (empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE))
 	{
 		$out .= '<span class="opacitymedium">'.$langs->trans("PublicInterfaceNotEnabled").'</span>';
-	}
-	else
-	{
+	} else {
 		$out .= img_picto('', 'object_globe.png').' '.$langs->trans("TicketPublicAccess").':<br>';
 		if ($url)
 		{
 			$out .= '<input type="text" id="directpubliclink" class="quatrevingtpercent" value="'.$url.'">';
 			$out .= ajax_autoselect("directpubliclink", 0);
-		}
-		else
-		{
+		} else {
 			$out .= '<span class="opacitymedium">'.$langs->trans("TicketNotCreatedFromPublicInterface").'</span>';
 		}
 	}
@@ -188,13 +184,13 @@ function showDirectPublicLink($object)
  */
 function generate_random_id($car = 16)
 {
-    $string = "";
-    $chaine = "abcdefghijklmnopqrstuvwxyz123456789";
-    srand((double) microtime() * 1000000);
-    for ($i = 0; $i < $car; $i++) {
-        $string .= $chaine[rand() % strlen($chaine)];
-    }
-    return $string;
+	$string = "";
+	$chaine = "abcdefghijklmnopqrstuvwxyz123456789";
+	srand((double) microtime() * 1000000);
+	for ($i = 0; $i < $car; $i++) {
+		$string .= $chaine[rand() % strlen($chaine)];
+	}
+	return $string;
 }
 
 /**
@@ -210,58 +206,54 @@ function generate_random_id($car = 16)
  */
 function llxHeaderTicket($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="publicnewticketform">';
+	print '<body id="mainbody" class="publicnewticketform">';
+	print '<div class="center">';
 
-    // Define urllogo
-    $width = 0;
-    if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO) || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
-        // Print logo
-        if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO))
-        {
-        	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
+	// Define urllogo
+	if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO) || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
+		// Print logo
+		if (!empty($conf->global->TICKET_SHOW_COMPANY_LOGO))
+		{
+			$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?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
-        		$width = 150;
-        	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
-        		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$mysoc->logo);
-        		$width = 150;
-        	} 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?modulepart=mycompany&amp;entity='.$conf->entity.'&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?modulepart=mycompany&amp;entity='.$conf->entity.'&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 || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC))
-    {
-    	print '<div class="backgreypublicpayment">';
-    	print '<div class="logopublicpayment">';
-    	if ($urllogo) {
-	    	print '<a href="'.($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)).'">';
-	    	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-	    	if ($width) print ' width="'.$width.'"';
-	    	print '>';
-	    	print '</a>';
-    	}
-    	if (!empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
-    		print '<div class="clearboth"></div><strong>'.($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")).'</strong>';
-    	}
-    	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>';
-    }
+	// Output html code for logo
+	if ($urllogo || !empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC))
+	{
+		print '<div class="backgreypublicpayment">';
+		print '<div class="logopublicpayment">';
+		if ($urllogo) {
+			print '<a href="'.($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)).'">';
+			print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+			print '>';
+			print '</a>';
+		}
+		if (!empty($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC)) {
+			print '<div class="clearboth"></div><strong>'.($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")).'</strong>';
+		}
+		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>';
 
-    print '<div class="ticketlargemargin">';
+	print '<div class="ticketlargemargin">';
 }
 
 
@@ -285,278 +277,266 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
  */
 function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $noprint = 0, $actioncode = '', $donetodo = 'done', $filters = array(), $sortfield = 'a.datep,a.id', $sortorder = 'DESC')
 {
-    global $user, $conf;
-    global $form;
+	global $user, $conf;
+	global $form;
 
-    global $param, $massactionbutton;
+	global $param, $massactionbutton;
 
-    dol_include_once('/comm/action/class/actioncomm.class.php');
+	dol_include_once('/comm/action/class/actioncomm.class.php');
 
-    // Check parameters
-    if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter');
+	// Check parameters
+	if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter');
 
-    $out = '';
-    $histo = array();
-    $numaction = 0;
-    $now = dol_now('tzuser');
+	$out = '';
+	$histo = array();
+	$numaction = 0;
+	$now = dol_now('tzuser');
 
-    // Open DSI -- Fix order by -- Begin
-    $sortfield_list = explode(',', $sortfield);
-    $sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent');
-    $sortfield_new_list = array();
-    foreach ($sortfield_list as $sortfield_value) {
-        $sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)];
-    }
-    $sortfield_new = implode(',', $sortfield_new_list);
+	// Open DSI -- Fix order by -- Begin
+	$sortfield_list = explode(',', $sortfield);
+	$sortfield_label_list = array('a.id' => 'id', 'a.datep' => 'dp', 'a.percent' => 'percent');
+	$sortfield_new_list = array();
+	foreach ($sortfield_list as $sortfield_value) {
+		$sortfield_new_list[] = $sortfield_label_list[trim($sortfield_value)];
+	}
+	$sortfield_new = implode(',', $sortfield_new_list);
 
-    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,";
-        }
-        else
-        {
-            $sql = "SELECT a.id, a.label as label,";
-        }
-        $sql .= " a.datep as dp,";
-        $sql .= " a.note as message,";
-        $sql .= " a.datep2 as dp2,";
-        $sql .= " a.percent as percent, 'action' as type,";
-        $sql .= " a.fk_element, a.elementtype,";
-        $sql .= " a.fk_contact,";
-        $sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";
-        $sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
-        if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql .= ", sp.lastname, sp.firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')      $sql .= ", o.ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')  $sql .= ", o.ref";
-        $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
+	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,";
+		} else {
+			$sql = "SELECT a.id, a.label as label,";
+		}
+		$sql .= " a.datep as dp,";
+		$sql .= " a.note as message,";
+		$sql .= " a.datep2 as dp2,";
+		$sql .= " a.percent as percent, 'action' as type,";
+		$sql .= " a.fk_element, a.elementtype,";
+		$sql .= " a.fk_contact,";
+		$sql .= " c.code as acode, c.libelle as alabel, c.picto as apicto,";
+		$sql .= " u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname";
+		if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql .= ", sp.lastname, sp.firstname";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", m.lastname, m.firstname";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql .= ", o.ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql .= ", o.ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql .= ", o.ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'BOM')      $sql .= ", o.ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat')  $sql .= ", o.ref";
+		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_action";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_actioncomm as c ON a.fk_action = c.id";
 
-        $force_filter_contact = false;
-        if (is_object($objcon) && $objcon->id > 0) {
-            $force_filter_contact = true;
-            $sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";
-            $sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
-        }
+		$force_filter_contact = false;
+		if (is_object($objcon) && $objcon->id > 0) {
+			$force_filter_contact = true;
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as r ON a.id = r.fk_actioncomm";
+			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
+		}
 
-        if (is_object($filterobj) && get_class($filterobj) == 'Societe')  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
-            $sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
-            $sql .= " ON er.resource_type = 'dolresource'";
-            $sql .= " AND er.element_id = a.id";
-            $sql .= " AND er.resource_id = ".$filterobj->id;
-        }
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o";
+		if (is_object($filterobj) && get_class($filterobj) == 'Societe')  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
+			$sql .= " ON er.resource_type = 'dolresource'";
+			$sql .= " AND er.element_id = a.id";
+			$sql .= " AND er.resource_id = ".$filterobj->id;
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o";
 
-        $sql .= " WHERE a.entity IN (".getEntity('agenda').")";
-        if ($force_filter_contact === false) {
-            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) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
-            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')
-            {
-                $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')
-            {
-                $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')
-            {
-                $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')
-            {
-                $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')
-            {
-                $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
-                if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
-            }
-        }
+		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
+		if ($force_filter_contact === false) {
+			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) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
+			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')
+			{
+				$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')
+			{
+				$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')
+			{
+				$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')
+			{
+				$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')
+			{
+				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
+				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+			}
+		}
 
-        // 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'";
-                    elseif ($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 $sql .= " AND c.code = '".$db->escape($actioncode)."'";
-            }
-        }
-        if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
-        elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
-        if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']);
-    }
+		// 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'";
+					elseif ($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 $sql .= " AND c.code = '".$db->escape($actioncode)."'";
+			}
+		}
+		if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
+		elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
+		if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']);
+	}
 
-    // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.
-    if (!empty($conf->mailing->enabled) && !empty($objcon->email)
-        && (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING'))
-    {
-        $langs->load("mails");
+	// Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.
+	if (!empty($conf->mailing->enabled) && !empty($objcon->email)
+		&& (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING'))
+	{
+		$langs->load("mails");
 
-        $sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type";
-        $sql2 .= ", null as fk_element, '' as elementtype, null as contact_id";
-        $sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";
-        $sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action
-        if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql2 .= ", '' as lastname, '' as firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql2 .= ", '' as ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql2 .= ", '' as ref";
-        elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql2 .= ", '' as ref";
-        $sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";
-        $sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.
-        $sql2 .= " AND mc.statut = 1";
-        $sql2 .= " AND u.rowid = m.fk_user_valid";
-        $sql2 .= " AND mc.fk_mailing=m.rowid";
-    }
+		$sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type";
+		$sql2 .= ", null as fk_element, '' as elementtype, null as contact_id";
+		$sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";
+		$sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action
+		if (is_object($filterobj) && get_class($filterobj) == 'Societe')      $sql2 .= ", '' as lastname, '' as firstname";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur')  $sql2 .= ", '' as ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Product')  $sql2 .= ", '' as ref";
+		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket')   $sql2 .= ", '' as ref";
+		$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";
+		$sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.
+		$sql2 .= " AND mc.statut = 1";
+		$sql2 .= " AND u.rowid = m.fk_user_valid";
+		$sql2 .= " AND mc.fk_mailing=m.rowid";
+	}
 
-    if (!empty($sql) && !empty($sql2)) {
-        $sql = $sql." UNION ".$sql2;
-    } elseif (empty($sql) && !empty($sql2)) {
-        $sql = $sql2;
-    }
+	if (!empty($sql) && !empty($sql2)) {
+		$sql = $sql." UNION ".$sql2;
+	} elseif (empty($sql) && !empty($sql2)) {
+		$sql = $sql2;
+	}
 
-    //TODO Add limit in nb of results
-    $sql .= $db->order($sortfield_new, $sortorder);
-    dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $i = 0;
-        $num = $db->num_rows($resql);
+	//TODO Add limit in nb of results
+	$sql .= $db->order($sortfield_new, $sortorder);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+	dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$i = 0;
+		$num = $db->num_rows($resql);
 
-            if ($obj->type == 'action') {
-                $contactaction = new ActionComm($db);
-                $contactaction->id = $obj->id;
-                $result = $contactaction->fetchResources();
-                if ($result < 0) {
-                    dol_print_error($db);
-                    setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');
-                }
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-                //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
-                //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
-                $tododone = '';
-                if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';
+			if ($obj->type == 'action') {
+				$contactaction = new ActionComm($db);
+				$contactaction->id = $obj->id;
+				$result = $contactaction->fetchResources();
+				if ($result < 0) {
+					dol_print_error($db);
+					setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');
+				}
 
-                $histo[$numaction] = array(
-                    'type'=>$obj->type,
-                    'tododone'=>$tododone,
-                    'id'=>$obj->id,
-                    'datestart'=>$db->jdate($obj->dp),
-                    'dateend'=>$db->jdate($obj->dp2),
-                    'note'=>$obj->label,
-                    'message'=>$obj->message,
-                    'percent'=>$obj->percent,
+				//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
+				//elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
+				$tododone = '';
+				if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';
 
-                    'userid'=>$obj->user_id,
-                    'login'=>$obj->user_login,
-                    'userfirstname'=>$obj->user_firstname,
-                    'userlastname'=>$obj->user_lastname,
-                    'userphoto'=>$obj->user_photo,
+				$histo[$numaction] = array(
+					'type'=>$obj->type,
+					'tododone'=>$tododone,
+					'id'=>$obj->id,
+					'datestart'=>$db->jdate($obj->dp),
+					'dateend'=>$db->jdate($obj->dp2),
+					'note'=>$obj->label,
+					'message'=>$obj->message,
+					'percent'=>$obj->percent,
 
-                    'contact_id'=>$obj->fk_contact,
-                    'socpeopleassigned' => $contactaction->socpeopleassigned,
-                    'lastname'=>$obj->lastname,
-                    'firstname'=>$obj->firstname,
-                    'fk_element'=>$obj->fk_element,
-                    'elementtype'=>$obj->elementtype,
-                    // Type of event
-                    'acode'=>$obj->acode,
-                    'alabel'=>$obj->alabel,
-                    'libelle'=>$obj->alabel, // deprecated
-                    'apicto'=>$obj->apicto
-                );
-            } else {
-                $histo[$numaction] = array(
-                    'type'=>$obj->type,
-                    'tododone'=>'done',
-                    'id'=>$obj->id,
-                    'datestart'=>$db->jdate($obj->dp),
-                    'dateend'=>$db->jdate($obj->dp2),
-                    'note'=>$obj->label,
-                    'message'=>$obj->message,
-                    'percent'=>$obj->percent,
-                    'acode'=>$obj->acode,
+					'userid'=>$obj->user_id,
+					'login'=>$obj->user_login,
+					'userfirstname'=>$obj->user_firstname,
+					'userlastname'=>$obj->user_lastname,
+					'userphoto'=>$obj->user_photo,
 
-                    'userid'=>$obj->user_id,
-                    'login'=>$obj->user_login,
-                    'userfirstname'=>$obj->user_firstname,
-                    'userlastname'=>$obj->user_lastname,
-                    'userphoto'=>$obj->user_photo
-                );
-            }
+					'contact_id'=>$obj->fk_contact,
+					'socpeopleassigned' => $contactaction->socpeopleassigned,
+					'lastname'=>$obj->lastname,
+					'firstname'=>$obj->firstname,
+					'fk_element'=>$obj->fk_element,
+					'elementtype'=>$obj->elementtype,
+					// Type of event
+					'acode'=>$obj->acode,
+					'alabel'=>$obj->alabel,
+					'libelle'=>$obj->alabel, // deprecated
+					'apicto'=>$obj->apicto
+				);
+			} else {
+				$histo[$numaction] = array(
+					'type'=>$obj->type,
+					'tododone'=>'done',
+					'id'=>$obj->id,
+					'datestart'=>$db->jdate($obj->dp),
+					'dateend'=>$db->jdate($obj->dp2),
+					'note'=>$obj->label,
+					'message'=>$obj->message,
+					'percent'=>$obj->percent,
+					'acode'=>$obj->acode,
 
-            $numaction++;
-            $i++;
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+					'userid'=>$obj->user_id,
+					'login'=>$obj->user_login,
+					'userfirstname'=>$obj->user_firstname,
+					'userlastname'=>$obj->user_lastname,
+					'userphoto'=>$obj->user_photo
+				);
+			}
 
-    if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))
-    {
-        $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
+			$numaction++;
+			$i++;
+		}
+	} else {
+		dol_print_error($db);
+	}
 
-        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))
+	{
+		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
-        $formactions = new FormActions($db);
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-        $actionstatic = new ActionComm($db);
-        $userstatic = new User($db);
-        $contactstatic = new Contact($db);
-        $userGetNomUrlCache = array();
+		$formactions = new FormActions($db);
+
+		$actionstatic = new ActionComm($db);
+		$userstatic = new User($db);
+		$contactstatic = new Contact($db);
+		$userGetNomUrlCache = array();
 
 		$out .= '<div class="filters-container" >';
 		$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'))
 		{
 			$out .= '<input type="hidden" name="id" value="'.$objcon->id.'" />';
-		}
-		else
-		{
+		} else {
 			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
 		}
 		if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
@@ -594,115 +574,108 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 		$out .= '</table>';
 
-        $out .= '</form>';
+		$out .= '</form>';
 		$out .= '</div>';
 
-        $out .= "\n";
+		$out .= "\n";
 
-        $out .= '<ul class="timeline">';
+		$out .= '<ul class="timeline">';
 
-        if ($donetodo)
-        {
-            $tmp = '';
-            if (get_class($filterobj) == 'Societe') $tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?socid='.$filterobj->id.'&amp;status=done">';
-            $tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
-            $tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
-            $tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
-            //$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
-            if (get_class($filterobj) == 'Societe') $tmp .= '</a>';
-            $out .= getTitleFieldOfList($tmp);
-        }
+		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") : '');
+			$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
+			$tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
+			//$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
+			if (get_class($filterobj) == 'Societe') $tmp .= '</a>';
+			$out .= getTitleFieldOfList($tmp);
+		}
 
 
-        //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);
+		//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);
 
-        $actualCycleDate = false;
+		$actualCycleDate = false;
 
-        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
+		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'];
-            $actionstatic->type_code = $histo[$key]['acode'];
+			$actionstatic->type_picto = $histo[$key]['apicto'];
+			$actionstatic->type_code = $histo[$key]['acode'];
 
-            $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$histo[$key]['id'];
+			$url = DOL_URL_ROOT.'/comm/action/card.php?id='.$histo[$key]['id'];
 
-            $tmpa = dol_getdate($histo[$key]['datestart'], false);
-            if ($actualCycleDate !== $tmpa['year'].'-'.$tmpa['yday']) {
-                $actualCycleDate = $tmpa['year'].'-'.$tmpa['yday'];
-                $out .= '<!-- timeline time label -->';
-                $out .= '<li class="time-label">';
-                $out .= '<span class="timeline-badge-date">';
-                $out .= dol_print_date($histo[$key]['datestart'], 'daytext', 'tzserver', $langs);
-                $out .= '</span>';
-                $out .= '</li>';
-                $out .= '<!-- /.timeline-label -->';
-            }
+			$tmpa = dol_getdate($histo[$key]['datestart'], false);
+			if ($actualCycleDate !== $tmpa['year'].'-'.$tmpa['yday']) {
+				$actualCycleDate = $tmpa['year'].'-'.$tmpa['yday'];
+				$out .= '<!-- timeline time label -->';
+				$out .= '<li class="time-label">';
+				$out .= '<span class="timeline-badge-date">';
+				$out .= dol_print_date($histo[$key]['datestart'], 'daytext', 'tzserver', $langs);
+				$out .= '</span>';
+				$out .= '</li>';
+				$out .= '<!-- /.timeline-label -->';
+			}
 
 
-            $out .= '<!-- timeline item -->'."\n";
-            $out .= '<li class="timeline-code-'.strtolower($actionstatic->code).'">';
+			$out .= '<!-- timeline item -->'."\n";
+			$out .= '<li class="timeline-code-'.strtolower($actionstatic->code).'">';
 
 
-            $out .= '<!-- timeline icon -->'."\n";
-            $iconClass = 'fa fa-comments';
-            $img_picto = '';
-            $colorClass = '';
-            $pictoTitle = '';
+			$out .= '<!-- timeline icon -->'."\n";
+			$iconClass = 'fa fa-comments';
+			$img_picto = '';
+			$colorClass = '';
+			$pictoTitle = '';
 
-            if ($histo[$key]['percent'] == -1) {
-                $colorClass = 'timeline-icon-not-applicble';
-                $pictoTitle = $langs->trans('StatusNotApplicable');
-            }
-            elseif ($histo[$key]['percent'] == 0) {
-                $colorClass = 'timeline-icon-todo';
-                $pictoTitle = $langs->trans('StatusActionToDo').' (0%)';
-            }
-            elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
-                $colorClass = 'timeline-icon-in-progress';
-                $pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';
-            }
-            elseif ($histo[$key]['percent'] >= 100) {
-                $colorClass = 'timeline-icon-done';
-                $pictoTitle = $langs->trans('StatusActionDone').' (100%)';
-            }
+			if ($histo[$key]['percent'] == -1) {
+				$colorClass = 'timeline-icon-not-applicble';
+				$pictoTitle = $langs->trans('StatusNotApplicable');
+			} elseif ($histo[$key]['percent'] == 0) {
+				$colorClass = 'timeline-icon-todo';
+				$pictoTitle = $langs->trans('StatusActionToDo').' (0%)';
+			} elseif ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100) {
+				$colorClass = 'timeline-icon-in-progress';
+				$pictoTitle = $langs->trans('StatusActionInProcess').' ('.$histo[$key]['percent'].'%)';
+			} elseif ($histo[$key]['percent'] >= 100) {
+				$colorClass = 'timeline-icon-done';
+				$pictoTitle = $langs->trans('StatusActionDone').' (100%)';
+			}
 
 
-            if ($actionstatic->code == 'AC_TICKET_CREATE') {
-                $iconClass = 'fa fa-ticket';
-            }
-            elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
-                $iconClass = 'fa fa-pencil';
-            }
-            elseif ($actionstatic->code == 'TICKET_MSG') {
-                $iconClass = 'fa fa-comments';
-            }
-            elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
-                $iconClass = 'fa fa-mask';
-            }
-            elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-            {
-                if ($actionstatic->type_picto) $img_picto = img_picto('', $actionstatic->type_picto);
-                else {
-                    if ($actionstatic->type_code == 'AC_RDV')       $iconClass = 'fa fa-handshake';
-                    elseif ($actionstatic->type_code == 'AC_TEL')   $iconClass = 'fa fa-phone';
-                    elseif ($actionstatic->type_code == 'AC_FAX')   $iconClass = 'fa fa-fax';
-                    elseif ($actionstatic->type_code == 'AC_EMAIL') $iconClass = 'fa fa-envelope';
-                    elseif ($actionstatic->type_code == 'AC_INT')   $iconClass = 'fa fa-shipping-fast';
-                    elseif ($actionstatic->type_code == 'AC_OTH_AUTO')   $iconClass = 'fa fa-robot';
-                    elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $iconClass = 'fa fa-robot';
-                }
-            }
+			if ($actionstatic->code == 'AC_TICKET_CREATE') {
+				$iconClass = 'fa fa-ticket';
+			} elseif ($actionstatic->code == 'AC_TICKET_MODIFY') {
+				$iconClass = 'fa fa-pencil';
+			} elseif ($actionstatic->code == 'TICKET_MSG') {
+				$iconClass = 'fa fa-comments';
+			} elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
+				$iconClass = 'fa fa-mask';
+			} elseif (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
+			{
+				if ($actionstatic->type_picto) $img_picto = img_picto('', $actionstatic->type_picto);
+				else {
+					if ($actionstatic->type_code == 'AC_RDV')       $iconClass = 'fa fa-handshake';
+					elseif ($actionstatic->type_code == 'AC_TEL')   $iconClass = 'fa fa-phone';
+					elseif ($actionstatic->type_code == 'AC_FAX')   $iconClass = 'fa fa-fax';
+					elseif ($actionstatic->type_code == 'AC_EMAIL') $iconClass = 'fa fa-envelope';
+					elseif ($actionstatic->type_code == 'AC_INT')   $iconClass = 'fa fa-shipping-fast';
+					elseif ($actionstatic->type_code == 'AC_OTH_AUTO')   $iconClass = 'fa fa-robot';
+					elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $iconClass = 'fa fa-robot';
+				}
+			}
 
 
 
-            $out .= '<i class="'.$iconClass.' '.$colorClass.'" title="'.$pictoTitle.'">'.$img_picto.'</i>'."\n";
+			$out .= '<i class="'.$iconClass.' '.$colorClass.'" title="'.$pictoTitle.'">'.$img_picto.'</i>'."\n";
 
-            $out .= '<div class="timeline-item">'."\n";
+			$out .= '<div class="timeline-item">'."\n";
 
-            $out .= '<span class="timeline-header-action">';
+			$out .= '<span class="timeline-header-action">';
 
 			if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'mailing') {
 				$out .= '<a class="timeline-btn" href="'.DOL_URL_ROOT.'/comm/mailing/card.php?id='.$histo[$key]['id'].'">'.img_object($langs->trans("ShowEMailing"), "email").' ';
@@ -712,137 +685,135 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				$out .= $actionstatic->getNomUrl(1, -1, 'valignmiddle').' ';
 			}
 
-            //if ($user->rights->agenda->allactions->read || $actionstatic->authorid == $user->id)
-            //{
-            //	$out.='<a href="'.$url.'" class="timeline-btn" title="'.$langs->trans('Show').'" ><i class="fa fa-calendar" ></i>'.$langs->trans('Show').'</a>';
-            //}
+			//if ($user->rights->agenda->allactions->read || $actionstatic->authorid == $user->id)
+			//{
+			//	$out.='<a href="'.$url.'" class="timeline-btn" title="'.$langs->trans('Show').'" ><i class="fa fa-calendar" ></i>'.$langs->trans('Show').'</a>';
+			//}
 
 
-            if ($user->rights->agenda->allactions->create ||
-                (($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create))
-            {
-                $out .= '<a class="timeline-btn" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?action=edit&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
-            }
+			if ($user->rights->agenda->allactions->create ||
+				(($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create))
+			{
+				$out .= '<a class="timeline-btn" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?action=edit&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
+			}
 
 
-            $out .= '</span>';
-            // Date
-            $out .= '<span class="time"><i class="fa fa-clock-o"></i> ';
-            $out .= dol_print_date($histo[$key]['datestart'], 'dayhour');
-            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');
-                else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour');
-            }
-            $late = 0;
-            if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-            if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-            if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1;
-            if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-            if ($late) $out .= img_warning($langs->trans("Late")).' ';
-            $out .= "</span>\n";
+			$out .= '</span>';
+			// Date
+			$out .= '<span class="time"><i class="fa fa-clock-o"></i> ';
+			$out .= dol_print_date($histo[$key]['datestart'], 'dayhour');
+			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');
+				else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour');
+			}
+			$late = 0;
+			if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
+			if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
+			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1;
+			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
+			if ($late) $out .= img_warning($langs->trans("Late")).' ';
+			$out .= "</span>\n";
 
-            // Ref
-            $out .= '<h3 class="timeline-header">';
+			// Ref
+			$out .= '<h3 class="timeline-header">';
 
-            // Author of event
-            $out .= '<span class="messaging-author">';
-            if ($histo[$key]['userid'] > 0)
-            {
-                if (!isset($userGetNomUrlCache[$histo[$key]['userid']])) { // is in cache ?
-                    $userstatic->fetch($histo[$key]['userid']);
-                    $userGetNomUrlCache[$histo[$key]['userid']] = $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
-                }
-                $out .= $userGetNomUrlCache[$histo[$key]['userid']];
-            }
-            $out .= '</span>';
+			// Author of event
+			$out .= '<span class="messaging-author">';
+			if ($histo[$key]['userid'] > 0)
+			{
+				if (!isset($userGetNomUrlCache[$histo[$key]['userid']])) { // is in cache ?
+					$userstatic->fetch($histo[$key]['userid']);
+					$userGetNomUrlCache[$histo[$key]['userid']] = $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
+				}
+				$out .= $userGetNomUrlCache[$histo[$key]['userid']];
+			}
+			$out .= '</span>';
 
-            // Title
-            $out .= ' <span class="messaging-title">';
+			// Title
+			$out .= ' <span class="messaging-title">';
 
 			if ($actionstatic->code == 'TICKET_MSG') {
 				$out .= $langs->trans('TicketNewMessage');
-			}
-			elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
+			} elseif ($actionstatic->code == 'TICKET_MSG_PRIVATE') {
 				$out .= $langs->trans('TicketNewMessage').' <em>('.$langs->trans('Private').')</em>';
 			} else {
-                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']);
-                    $libelle = $histo[$key]['note'];
-                    $actionstatic->id = $histo[$key]['id'];
-                    $out .= dol_trunc($libelle, 120);
-                }
-                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');
-                    $out .= dol_trunc($libelle, 120);
-                }
-            }
+				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']);
+					$libelle = $histo[$key]['note'];
+					$actionstatic->id = $histo[$key]['id'];
+					$out .= dol_trunc($libelle, 120);
+				}
+				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');
+					$out .= dol_trunc($libelle, 120);
+				}
+			}
 
 
-            $out .= '</span>';
+			$out .= '</span>';
 
-            $out .= '</h3>';
+			$out .= '</h3>';
 
-            if (!empty($histo[$key]['message'])
-                && $actionstatic->code != 'AC_TICKET_CREATE'
-                && $actionstatic->code != 'AC_TICKET_MODIFY'
-            )
-            {
-                $out .= '<div class="timeline-body">';
-                $out .= $histo[$key]['message'];
-                $out .= '</div>';
-            }
+			if (!empty($histo[$key]['message'])
+				&& $actionstatic->code != 'AC_TICKET_CREATE'
+				&& $actionstatic->code != 'AC_TICKET_MODIFY'
+			)
+			{
+				$out .= '<div class="timeline-body">';
+				$out .= $histo[$key]['message'];
+				$out .= '</div>';
+			}
 
 
-            // Timeline footer
-            $footer = '';
+			// Timeline footer
+			$footer = '';
 
-            // Contact for this action
-            if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
-                $contactList = '';
-                foreach ($histo[$key]['socpeopleassigned'] as $cid => $Tab) {
-                    $contact = new Contact($db);
-                    $result = $contact->fetch($cid);
+			// Contact for this action
+			if (isset($histo[$key]['socpeopleassigned']) && is_array($histo[$key]['socpeopleassigned']) && count($histo[$key]['socpeopleassigned']) > 0) {
+				$contactList = '';
+				foreach ($histo[$key]['socpeopleassigned'] as $cid => $Tab) {
+					$contact = new Contact($db);
+					$result = $contact->fetch($cid);
 
-                    if ($result < 0)
-                        dol_print_error($db, $contact->error);
+					if ($result < 0)
+						dol_print_error($db, $contact->error);
 
-                    if ($result > 0) {
-                        $contactList .= !empty($contactList) ? ', ' : '';
-                        $contactList .= $contact->getNomUrl(1);
-                        if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
-                            if (!empty($contact->phone_pro))
-                                $contactList .= '('.dol_print_phone($contact->phone_pro).')';
-                        }
-                    }
-                }
+					if ($result > 0) {
+						$contactList .= !empty($contactList) ? ', ' : '';
+						$contactList .= $contact->getNomUrl(1);
+						if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
+							if (!empty($contact->phone_pro))
+								$contactList .= '('.dol_print_phone($contact->phone_pro).')';
+						}
+					}
+				}
 
-                $footer .= $langs->trans('ActionOnContact').' : '.$contactList;
-            }
-            elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
-            {
-                $contact = new Contact($db);
-                $result = $contact->fetch($histo[$key]['contact_id']);
+				$footer .= $langs->trans('ActionOnContact').' : '.$contactList;
+			} elseif (empty($objcon->id) && isset($histo[$key]['contact_id']) && $histo[$key]['contact_id'] > 0)
+			{
+				$contact = new Contact($db);
+				$result = $contact->fetch($histo[$key]['contact_id']);
 
-                if ($result < 0)
-                    dol_print_error($db, $contact->error);
+				if ($result < 0)
+					dol_print_error($db, $contact->error);
 
-                if ($result > 0) {
-                    $footer .= $contact->getNomUrl(1);
-                    if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
-                        if (!empty($contact->phone_pro))
-                            $footer .= '('.dol_print_phone($contact->phone_pro).')';
-                    }
-                }
-            }
+				if ($result > 0) {
+					$footer .= $contact->getNomUrl(1);
+					if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
+						if (!empty($contact->phone_pro))
+							$footer .= '('.dol_print_phone($contact->phone_pro).')';
+					}
+				}
+			}
 
 			$documents = getTicketActionCommEcmList($actionstatic);
-            if (!empty($documents))
+			if (!empty($documents))
 			{
 				$footer .= '<div class="timeline-documents-container">';
 				foreach ($documents as $doc)
@@ -881,24 +852,24 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 
 
-            if (!empty($footer)) {
-                $out .= '<div class="timeline-footer">'.$footer.'</div>';
-            }
+			if (!empty($footer)) {
+				$out .= '<div class="timeline-footer">'.$footer.'</div>';
+			}
 
 
-            $out .= '</div>'."\n"; // end timeline-item
+			$out .= '</div>'."\n"; // end timeline-item
 
-            $out .= '</li>';
-            $out .= '<!-- END timeline item -->';
+			$out .= '</li>';
+			$out .= '<!-- END timeline item -->';
 
-            $i++;
-        }
-        $out .= "</ul>\n";
-    }
+			$i++;
+		}
+		$out .= "</ul>\n";
+	}
 
 
-    if ($noprint) return $out;
-    else print $out;
+	if ($noprint) return $out;
+	else print $out;
 }
 
 
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 0dcb6e8242d..c0cfa20f529 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -79,9 +79,7 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
     		{
     			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
     			else print img_picto_common('', 'treemenu/line.gif');
-    		}
-    		else
-    		{
+    		} else {
     			if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
     			else print img_picto_common('', 'treemenu/linebottom.gif');
     		}
@@ -105,15 +103,16 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
  *	$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
  *  TODO Replace with jstree plugin instead of treeview plugin.
  *
- *  @param	array	$tab    		Array of all elements
- *  @param  array   $pere   		Array with parent ids ('rowid'=>,'mainmenu'=>,'leftmenu'=>,'fk_mainmenu=>,'fk_leftmenu=>)
- *  @param  int	    $rang   		Level of element
- *  @param	string	$iddivjstree	Id to use for parent ul element
+ *  @param	array	$tab    					Array of all elements
+ *  @param  array   $pere   					Array with parent ids ('rowid'=>,'mainmenu'=>,'leftmenu'=>,'fk_mainmenu=>,'fk_leftmenu=>)
+ *  @param  int	    $rang   					Level of element
+ *  @param	string	$iddivjstree				Id to use for parent ul element
  *  @param  int     $donoresetalreadyloaded     Do not reset global array $donoresetalreadyloaded used to avoid to go down on an aleady processed record
- *  @param  int     $showfk         1=show fk_links to parent into label  (used by menu editor only)
+ *  @param  int     $showfk         			1=show fk_links to parent into label  (used by menu editor only)
+ *  @param	string	$moreparam					Add more param on url of elements
  *  @return	void
  */
-function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoresetalreadyloaded = 0, $showfk = 0)
+function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoresetalreadyloaded = 0, $showfk = 0, $moreparam = '')
 {
     global $tree_recur_alreadyadded, $menu_handler_to_search;
 
@@ -174,9 +173,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			    print '</td><td class="right">';
 			    print $tab[$x]['buttons'];
 			    print '</td></tr></table>';
-			}
-			else
-			{
+			} else {
 			    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";
@@ -184,9 +181,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			// 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'])
-		{
+		} 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']))
 		    {
@@ -203,16 +198,14 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			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'].'">';
+			    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
-			{
+			} else {
 			    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";
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index acf847d6480..7d67635a1e2 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -125,13 +125,13 @@ function user_prepare_head($object)
 				$nbNote = $obj->nb;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
+		$langs->load("mails");
 		$head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Notifications");
+		$head[$h][1] = $langs->trans("NotificationsAuto");
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		$head[$h][2] = 'notify';
 		$h++;
@@ -346,9 +346,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td class="nowrap left" width="20%"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
 		print '<td>&nbsp;</td>';
 		print '</tr>';
-	}
-	else
-	{
+	} else {
 		$dirthemestring = '';
 		foreach ($dirthemes as $dirtheme)
 		{
@@ -403,9 +401,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 						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
-						{
+						} else {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" name="main_theme" value="'.$subdir.'"> '.$subdir;
 						}
 						print '</div>';
@@ -441,18 +437,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	if ($foruserprofile)
 	{
 		// Nothing
-	}
-	else
-	{
+	} else {
 		// Show logo
 		print '<tr class="oddeven"><td class="titlefield">'.$langs->trans("EnableShowLogo").'</td><td>';
 		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
-		{
+		} else {
 			print  yn($conf->global->MAIN_SHOW_LOGO);
 		}
 		print '</td>';
@@ -486,9 +478,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
          }
          if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
          print '</td>';*/
-	}
-	else
-	{
+	} else {
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
@@ -497,9 +487,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			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
-		{
+		} else {
 			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
@@ -531,9 +519,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
@@ -541,9 +527,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';
-		}
-	   	else
-	   	{
+		} 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.'">';
 			else print $langs->trans("Default");
@@ -577,9 +561,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	   	}
     	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    print '</td>';*/
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbackhmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackhmenu1)));
 
 		print '<tr class="oddeven">';
@@ -588,9 +570,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
-		}
-	   	else
-	   	{
+		} 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.'">';
 			else print $langs->trans("Default");
@@ -624,9 +604,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 }
 		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		 print '</td>';*/
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbackvmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackvmenu1)));
 
 		print '<tr class="oddeven">';
@@ -635,9 +613,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} 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.'">';
 			else print $langs->trans("Default");
@@ -651,9 +627,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TextTitleColor for title of Pages
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colortexttitlenotab) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlenotab)));
 
 		print '<tr class="oddeven">';
@@ -662,9 +636,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -677,9 +649,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// BackgroundTableTitleColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbacktitle1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacktitle1)));
 
 		print '<tr class="oddeven">';
@@ -688,9 +658,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';
-		}
-	   	else
-	   	{
+		} else {
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> '; // $colorbacktitle1 in CSS
@@ -703,9 +671,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TextTitleColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colortexttitle) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitle)));
 
 		print '<tr class="oddeven">';
@@ -714,9 +680,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -729,9 +693,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TextTitleLinkColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default=(empty($colortexttitlelink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortexttitlelink)));
 
 		print '<tr class="oddeven">';
@@ -740,9 +702,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
@@ -756,9 +716,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// BackgroundTableLineOddColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbacklineimpair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklineimpair1)));
 
 		print '<tr class="oddeven">';
@@ -767,9 +725,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} 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.'">';
 			else print $langs->trans("Default");
@@ -783,9 +739,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// BackgroundTableLineEvenColor
 	if ($foruserprofile)
 	{
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbacklinepair1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepair1)));
 
 		print '<tr class="oddeven">';
@@ -794,9 +748,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} 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.'">';
 			else print $langs->trans("Default");
@@ -830,9 +782,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     }
 	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 	    	print '</td>';*/
-	}
-	else
-	{
+	} else {
 		$default = (empty($colortextlink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortextlink)));
 
 		print '<tr class="oddeven">';
@@ -841,13 +791,10 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} 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.'">';
-			else
-			{
+			else {
 				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
 				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
 				print $langs->trans("Default");
@@ -872,8 +819,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else {
+	} else {
 		$default = (empty($colorbacklinepairhover) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairhover)));
 
 		print '<tr class="oddeven">';
@@ -886,17 +832,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} 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 != 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");
+			} else print $langs->trans("Default");
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -916,9 +859,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	     print '</td>';
 	     print '</tr>';
 	     */
-	}
-	else
-	{
+	} else {
 		$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
 
 		print '<tr class="oddeven">';
@@ -931,17 +872,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
 			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1).' ';
-		}
-		else
-		{
+		} 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 != '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");
+			} else print $langs->trans("Default");
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -961,15 +899,11 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
    	    if ($edit)
    	    {
    	        print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
-   	    }
-   	    else
-   	    {
+   	    } else {
    	        if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
    	        {
    	            print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
-   	        }
-   	        else
-   	        {
+   	        } else {
    	            print yn(1);
    	            if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
    	        }
@@ -978,9 +912,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	    print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
 	    print '</td>';
 	    print '</tr>';
-	}
-	else
-	{
+	} else {
 	    /*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
 	    $default=$langs->trans('No');
 	    print '<tr class="oddeven">';
@@ -1023,13 +955,10 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		if ($edit)
 		{
 			print $form->selectArray('MAIN_OPTIMIZEFORCOLORBLIND', $colorBlindOptions, $fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND, 0);
-		}
-		else
-		{
+		} else {
 			if (!empty($fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND) && isset($colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND])) {
 				print $colorBlindOptions[$fuser->conf->MAIN_OPTIMIZEFORCOLORBLIND];
-			}
-			else {
+			} else {
 				print yn(0);
 			}
 		}
@@ -1037,9 +966,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORCOLORBLINDDesc"));
 		print '</td>';
 		print '</tr>';
-	}
-	else
-	{
+	} else {
 	}
 	print '</table>';
 }
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index be3d1dea56d..e0f7f4d50b6 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -93,9 +93,7 @@ function dolKeepOnlyPhpCode($str)
 			if (!empty($partlings))
 			{
 				$newstr .= $partlings[0].'?>';
-			}
-			else
-			{
+			} else {
 				$newstr .= $part.'?>';
 			}
 		}
@@ -242,8 +240,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 			$content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
 			$content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
 		}
-	}
-	elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
+	} elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
 	{
 		$content = str_replace('<link rel="stylesheet" href="/styles.css', '<link rel="stylesheet" href="styles.css', $content);
 
@@ -299,8 +296,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 		if (empty($includehtmlcontentopened)) {
 			$content = str_replace('!~!~!~', '', $content);
 		}
-	}
-	else									// REPLACEMENT OF LINKS When page called from virtual host
+	} else // REPLACEMENT OF LINKS When page called from virtual host
 	{
 		$symlinktomediaexists = 1;
 		if ($website->virtualhost) {
@@ -335,9 +331,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 			// If some links to documents or viewimage remains, we replace with wrapper
 			$content = preg_replace('/(<img[^>]*src=")\/?viewimage\.php/', '\1/wrapper.php', $content, -1, $nbrep);
 			$content = preg_replace('/(<a[^>]*href=")\/?documents\.php/', '\1/wrapper.php', $content, -1, $nbrep);
-		}
-		else
-		{
+		} else {
 			// <img src="image.png... => <img src="medias/image.png...
 			$content = preg_replace('/(<img[^>]*src=")\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
 			$content = preg_replace('/(url\(["\']?)\/?image\//', '\1/medias/image/', $content, -1, $nbrep);
@@ -425,9 +419,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		if ($result > 0)
 		{
 			$containerref = $tmpwebsitepage->pageurl;
-		}
-		else
-		{
+		} else {
 			print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 			exit;
 		}
@@ -463,19 +455,14 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 				{
 					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
 					exit;
-				}
-				else
-				{
+				} else {
 					$newurl = preg_replace('/&pageref=([^&]+)/', '&pageref='.$containerref, $currenturi);
 				}
-			}
-			else
-			{
+			} else {
 				$newurl = $currenturi.'&pageref='.urlencode($containerref);
 			}
 		}
-	}
-	else								// When page called from virtual host server
+	} else // When page called from virtual host server
 	{
 		$newurl = '/'.$containerref.'.php';
 	}
@@ -487,9 +474,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		}
 		header("Location: ".$newurl);
 		exit;
-	}
-	else
-	{
+	} else {
 		print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
 		exit;
 	}
@@ -549,7 +534,7 @@ function includeContainer($containerref)
  * Return HTML content to add structured data for an article, news or Blog Post.
  * Use the json-ld format.
  *
- * @param 	string		$type				'blogpost', 'product', 'software', 'organization', ...
+ * @param 	string		$type				'blogpost', 'product', 'software', 'organization', 'qa',  ...
  * @param	array		$data				Array of data parameters for structured data
  * @return  string							HTML content
  */
@@ -557,21 +542,27 @@ function getStructuredData($type, $data = array())
 {
 	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs; // Very important. Required to have var available when running inluded containers.
 
+	$type = strtolower($type);
+
 	if ($type == 'software')
 	{
-		$ret = '<!-- Add structured data for software post -->'."\n";
+		$ret = '<!-- Add structured data for entry in a software annuary -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
 		$ret .= '{
 			"@context": "https://schema.org",
 			"@type": "SoftwareApplication",
 			"name": "'.dol_escape_json($data['name']).'",
 			"operatingSystem": "'.dol_escape_json($data['os']).'",
-			"applicationCategory": "https://schema.org/'.$data['applicationCategory'].'",
-			"aggregateRating": {
-				"@type": "AggregateRating",
-				"ratingValue": "'.$data['ratingvalue'].'",
-				"ratingCount": "'.$data['ratingcount'].'"
-			},
+			"applicationCategory": "https://schema.org/'.$data['applicationCategory'].'",';
+		if (! empty($data['ratingcount'])) {
+			$ret .= '
+				"aggregateRating": {
+					"@type": "AggregateRating",
+					"ratingValue": "'.$data['ratingvalue'].'",
+					"ratingCount": "'.$data['ratingcount'].'"
+				},';
+		}
+		$ret .= '
 			"offers": {
 				"@type": "Offer",
 				"price": "'.$data['price'].'",
@@ -579,8 +570,7 @@ function getStructuredData($type, $data = array())
 			}
 		}'."\n";
 		$ret .= '</script>'."\n";
-	}
-	elseif ($type == 'organization')
+	} elseif ($type == 'organization')
 	{
 		$companyname = $mysoc->name;
 		$url = $mysoc->url;
@@ -602,13 +592,12 @@ function getStructuredData($type, $data = array())
 			$ret .= ",\n";
 			$ret .= '"sameAs": [';
 			$i = 0;
-			foreach($mysoc->socialnetworks as $key => $value) {
+			foreach ($mysoc->socialnetworks as $key => $value) {
 				if ($key == 'linkedin') {
 					$ret.= '"https://www.'.$key.'.com/company/'.dol_escape_json($value).'"';
 				} elseif ($key == 'youtube') {
 					$ret.= '"https://www.'.$key.'.com/user/'.dol_escape_json($value).'"';
-				}
-				else {
+				} else {
 					$ret.= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
 				}
 				$i++;
@@ -618,8 +607,7 @@ function getStructuredData($type, $data = array())
 		}
 		$ret .= '}'."\n";
 		$ret .= '</script>'."\n";
-	}
-	elseif ($type == 'blogpost')
+	} elseif ($type == 'blogpost')
 	{
 		if (!empty($websitepage->author_alias))
 		{
@@ -635,7 +623,7 @@ function getStructuredData($type, $data = array())
 
 			$pageurl = str_replace('__WEBSITE_KEY__', $website->ref, $pageurl);
 			$title = str_replace('__WEBSITE_KEY__', $website->ref, $title);
-			$image = 'medias/'.str_replace('__WEBSITE_KEY__', $website->ref, $image);
+			$image = '/medias/'.str_replace('__WEBSITE_KEY__', $website->ref, $image);
 			$companyname = str_replace('__WEBSITE_KEY__', $website->ref, $companyname);
 			$description = str_replace('__WEBSITE_KEY__', $website->ref, $description);
 
@@ -671,7 +659,7 @@ function getStructuredData($type, $data = array())
 				$ret .= '"keywords": [';
 				$i = 0;
 				$arrayofkeywords = explode(',', $websitepage->keywords);
-				foreach($arrayofkeywords as $keyword) {
+				foreach ($arrayofkeywords as $keyword) {
 					$ret.= '"'.dol_escape_json($keyword).'"';
 					$i++;
 					if ($i < count($arrayofkeywords)) $ret .= ', ';
@@ -682,8 +670,7 @@ function getStructuredData($type, $data = array())
 			$ret .= "\n".'}'."\n";
 			$ret .= '</script>'."\n";
 		}
-	}
-	elseif ($type == 'product')
+	} elseif ($type == 'product')
 	{
 		$ret = '<!-- Add structured data for product -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
@@ -719,6 +706,33 @@ function getStructuredData($type, $data = array())
 				}
 			}'."\n";
 		$ret .= '</script>'."\n";
+	} elseif ($type == 'qa')
+	{
+		$ret = '<!-- Add structured data for QA -->'."\n";
+		$ret .= '<script type="application/ld+json">'."\n";
+		$ret .= '{
+				"@context": "https://schema.org/",
+				"@type": "QAPage",
+				"mainEntity": {
+					"@type": "Question",
+					"name": "'.dol_escape_json($data['name']).'",
+					"text": "'.dol_escape_json($data['name']).'",
+					"answerCount": 1,
+					"author": {
+						"@type": "Person",
+						"name": "'.dol_escape_json($data['author']).'"
+					}
+					"acceptedAnswer": {
+						"@type": "Answer",
+						"text": "'.dol_escape_json(dol_string_nohtmltag(dolStripPhpCode($data['description']))).'",
+						"author": {
+							"@type": "Person",
+							"name": "'.dol_escape_json($data['author']).'"
+						}
+					}
+				}
+			}'."\n";
+		$ret .= '</script>'."\n";
 	}
 	return $ret;
 }
@@ -749,7 +763,8 @@ function getSocialNetworkSharingLinks()
 		// Reddit
 		$out .= '<div class="dol-social-share-reddit">'."\n";
 		$out .= '<a href="https://www.reddit.com/submit" target="_blank" onclick="window.location = \'https://www.reddit.com/submit?url='.$fullurl.'\'; return false">';
-		$out .= '<img src="https://www.reddit.com/static/spreddit7.gif" alt="Submit to reddit" border="0" /> </a>';
+		$out .= '<span class="dol-social-share-reddit-span">Reddit</span>';
+		$out .= '</a>';
 		$out .= '</div>'."\n";
 
 		// Facebook
@@ -793,9 +808,11 @@ function getSocialNetworkSharingLinks()
  * @param	string		$sortfield			Sort Fields
  * @param	string		$sortorder			Sort order ('DESC' or 'ASC')
  * @param	string		$langcode			Language code ('' or 'en', 'fr', 'es', ...)
+ * @param	array		$otherfilters		Other filters
+ * @param	int			$status				0 or 1, or -1 for both
  * @return  string							HTML content
  */
-function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '')
+function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '', $otherfilters = 'null', $status = 1)
 {
 	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
 
@@ -804,30 +821,26 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 
 	if (!is_object($weblangs)) $weblangs = $langs;
 
-	if (empty($searchstring))
+	if (empty($searchstring) && empty($type) && empty($langcode) && empty($otherfilters))
 	{
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("EmptySearchString");
-	}
-	elseif (dol_strlen($searchstring) < 2)
-	{
+	} elseif ($searchstring && dol_strlen($searchstring) < 2) {
 		$weblangs->load("errors");
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("ErrorSearchCriteriaTooSmall");
-	}
-	else
-	{
+	} else {
 		$tmparrayoftype = explode(',', $type);
-		foreach ($tmparrayoftype as $tmptype) {
+		/*foreach ($tmparrayoftype as $tmptype) {
 			if (!in_array($tmptype, array('', 'page', 'blogpost'))) {
 				$error++;
 				$arrayresult['code'] = 'KO';
 				$arrayresult['message'] = 'Bad value for parameter type';
 				break;
 			}
-		}
+		}*/
 	}
 
 	$searchdone = 0;
@@ -835,31 +848,40 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 
 	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo)))
 	{
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'website_page';
-		$sql .= " WHERE fk_website = ".$website->id;
+		$sql = 'SELECT wp.rowid FROM '.MAIN_DB_PREFIX.'website_page as wp';
+		if (is_array($otherfilters) && ! empty($otherfilters['category'])) {
+			$sql .= ', '.MAIN_DB_PREFIX.'categorie_website_page as cwp';
+		}
+		$sql .= " WHERE wp.fk_website = ".$website->id;
+		if ($status >= 0) {
+			$sql .= " AND wp.status = ".$status;
+		}
 		if ($langcode) {
-			$sql .= " AND lang ='".$db->escape($langcode)."'";
+			$sql .= " AND wp.lang ='".$db->escape($langcode)."'";
 		}
 		if ($type) {
 			$tmparrayoftype = explode(',', $type);
 			$typestring = '';
 			foreach ($tmparrayoftype as $tmptype) {
-				$typestring .= ($typestring ? ", " : "")."'".trim($tmptype)."'";
+				$typestring .= ($typestring ? ", " : "")."'".$db->escape(trim($tmptype))."'";
 			}
-			$sql .= " AND type_container IN (".$typestring.")";
+			$sql .= " AND wp.type_container IN (".$typestring.")";
 		}
 		$sql .= " AND (";
 		$searchalgo = '';
 		if (preg_match('/meta/', $algo))
 		{
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."title LIKE '%".$db->escape($searchstring)."%' OR description LIKE '%".$db->escape($searchstring)."%'";
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."keywords LIKE '".$db->escape($searchstring).",%' OR keywords LIKE '% ".$db->escape($searchstring)."%'"; // TODO Use a better way to scan keywords
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escape($searchstring)."%' OR wp.description LIKE '%".$db->escape($searchstring)."%'";
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escape($searchstring).",%' OR wp.keywords LIKE '% ".$db->escape($searchstring)."%'"; // TODO Use a better way to scan keywords
 		}
 		if (preg_match('/content/', $algo))
 		{
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."content LIKE '%".$db->escape($searchstring)."%'";
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escape($searchstring)."%'";
 		}
 		$sql .= $searchalgo;
+		if (is_array($otherfilters) && ! empty($otherfilters['category'])) {
+			$sql .= ' AND cwp.fk_website_page = wp.rowid AND cwp.fk_categorie = '.((int) $otherfilters['category']);
+		}
 		$sql .= ")";
 		$sql .= $db->order($sortfield, $sortorder);
 		$sql .= $db->plimit($max);
@@ -879,9 +901,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 				}
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$arrayresult['code'] = $db->lasterrno();
 			$arrayresult['message'] = $db->lasterror();
@@ -940,9 +960,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 				$arrayresult['code'] = 'KO';
 				$arrayresult['message'] = $weblangs->trans("NoRecordFound");
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$arrayresult['code'] = 'KO';
 			$arrayresult['message'] = 'No supported algorithm found';
@@ -991,9 +1009,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
-		}
-		else
-		{
+		} else {
 			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
@@ -1029,15 +1045,12 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action = 'create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
-				}
-				else
-				{
+				} else {
 					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 					dol_mkdir(dirname($filetosave));
@@ -1068,9 +1081,7 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		{
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
-		}
-		else
-		{
+		} else {
 			$urltograbbis = $urltograb.'/'.$regs[2][$key]; // We use dir of grabbed file
 		}
 
@@ -1108,15 +1119,12 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action = 'create';
-				}
-				elseif ($tmpgeturl['http_code'] != '200')
+				} elseif ($tmpgeturl['http_code'] != '200')
 				{
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
-				}
-				else
-				{
+				} else {
 					$alreadygrabbed[$urltograbbis] = 1; // Track that file was alreay grabbed.
 
 					dol_mkdir(dirname($filetosave));
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 84a30c13d0a..673b904b743 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -197,18 +197,21 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 					}
 				}
 			}
+		} else {
+			dol_print_error($db);
 		}
-		else dol_print_error($db);
 		$tplcontent .= '<?php } ?>'."\n";
 	}
-	// Add manifest.json on homepage
+	// Add manifest.json. Do we have to add it only on home page ?
 	$tplcontent .= '<?php if ($website->use_manifest) { print \'<link rel="manifest" href="/manifest.json.php" />\'."\n"; } ?>'."\n";
 	$tplcontent .= '<!-- Include link to CSS file -->'."\n";
+	// Add js
 	$tplcontent .= '<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />'."\n";
 	$tplcontent .= '<!-- Include link to JS file -->'."\n";
 	$tplcontent .= '<script src="/javascript.js.php"></script>'."\n";
+	// Add headers
 	$tplcontent .= '<!-- Include HTML header from common file -->'."\n";
-	$tplcontent .= '<?php print preg_replace(\'/<\/?html>/ims\', \'\', file_get_contents(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")); ?>'."\n";
+	$tplcontent .= '<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>'."\n";
 	$tplcontent .= '<!-- Include HTML header from page header block -->'."\n";
 	$tplcontent .= preg_replace('/<\/?html>/ims', '', $objectpage->htmlheader)."\n";
 	$tplcontent .= '</head>'."\n";
@@ -268,8 +271,7 @@ function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
 		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
 		}
-	}
-	else {
+	} else {
 		$result1 = true;
 	}
 
@@ -532,8 +534,7 @@ function showWebsiteTemplates(Website $website)
 				}
 			}
 		}
-	}
-	else {
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
 	}
 
diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index 912f0f16cea..ad16755f617 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -58,8 +58,7 @@ function check_authentication($authentication, &$error, &$errorcode, &$errorlabe
         {
             $error++;
             $errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
-        }
-        elseif ($result == 0)
+        } elseif ($result == 0)
         {
             $error++;
             $errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index 3d8120a6d29..e7252ac2171 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -229,9 +229,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 					{
 						$enddate = dol_time_plus_duree($startdate, 1, "d");
 					}
-				}
-				else
-				{
+				} else {
 					if (empty($enddate))
 					{
 						$enddate = $startdate + $duration;
@@ -315,9 +313,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 		{
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
-	}
-	else
-	{
+	} else {
 		dol_syslog("xcal.lib.php::build_calfile Failed to open file ".$outputfile." for writing");
 		return -2;
 	}
@@ -528,9 +524,7 @@ function calEncode($line)
 		}
 
 		$out .= $newpara;
-	}
-	else
-	{
+	} else {
 		$strlength = dol_strlen($line);
 
 		for ($j = 0; $j < $strlength; $j++)
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index ea3fa2f3a19..52e50a504af 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -45,6 +45,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 
 	if (!empty($usertotest))
 	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
 
 		// If test username/password asked, we define $test=false if ko and $login var to login if ok, set also $_SESSION["dol_loginmesg"] if ko
@@ -53,14 +54,15 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 		$usernamecol2 = 'email';
 		$entitycol = 'entity';
 
-		$sql = 'SELECT rowid, login, entity, pass, pass_crypted';
+		$sql = 'SELECT rowid, login, entity, pass, pass_crypted, datestartvalidity, dateendvalidity';
 		$sql .= ' FROM '.$table;
 		$sql .= ' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
 		if (preg_match('/@/', $usertotest)) $sql .= ' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
 		$sql .= ') AND '.$entitycol." IN (0,".($entity ? $entity : 1).")";
 		$sql .= ' AND statut = 1';
-		// Required to first found the user into entity, then the superadmin.
-		// For the case (TODO and that we must avoid) a user has renamed its login with same value than a user in entity 0.
+		// Note: Test on validity is done later
+		// Required to firstly found the user into entity, then the superadmin.
+		// For the case (TODO we must avoid that) a user has renamed its login with same value than a user in entity 0.
 		$sql .= ' ORDER BY entity DESC';
 
 		$resql = $db->query($sql);
@@ -69,6 +71,20 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 			$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--';
+				}
+
 				$passclear = $obj->pass;
 				$passcrypted = $obj->pass_crypted;
 				$passtyped = $passwordtotest;
@@ -79,19 +95,19 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				$cryptType = '';
 				if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType = $conf->global->DATABASE_PWD_ENCRYPTED;
 
-				// By default, we used MD5
-				if (!in_array($cryptType, array('md5'))) $cryptType = 'md5';
+				// By default, we use default setup for encryption rule
+				if (!in_array($cryptType, array('auto'))) $cryptType = 'auto';
 				// Check crypted password according to crypt algorithm
-				if ($cryptType == 'md5')
+				if ($cryptType == 'auto')
 				{
-					if (dol_verifyHash($passtyped, $passcrypted))
+					if (dol_verifyHash($passtyped, $passcrypted, '0'))
 					{
 						$passok = true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
 					}
 				}
 
-				// For compatibility with old versions
+				// For compatibility with very old versions
 				if (!$passok)
 				{
 					if ((!$passcrypted || $passtyped)
@@ -106,9 +122,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				if ($passok)
 				{
 					$login = $obj->login;
-				}
-				else
-				{
+				} 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);
 
@@ -124,8 +138,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 					global $mc;
 
 					if (!isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
-					else
-					{
+					else {
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
 						if ($ret < 0)
 						{
@@ -134,9 +147,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '".$usertotest."'", LOG_NOTICE);
 				sleep(1);
 
@@ -145,9 +156,7 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO db error for '".$usertotest."' error=".$db->lasterror(), LOG_ERR);
 			sleep(1);
 			$_SESSION["dol_loginmesg"] = $db->lasterror();
diff --git a/htdocs/core/login/functions_http.php b/htdocs/core/login/functions_http.php
index 45167fc21c9..7b2eebb0426 100644
--- a/htdocs/core/login/functions_http.php
+++ b/htdocs/core/login/functions_http.php
@@ -33,12 +33,33 @@
 */
 function check_user_password_http($usertotest, $passwordtotest, $entitytotest)
 {
+	global $db, $langs;
+
 	dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));
 
 	$login = '';
 	if (!empty($_SERVER["REMOTE_USER"]))
 	{
 		$login = $_SERVER["REMOTE_USER"];
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+		$tmpuser = new User($db);
+		$tmpuser->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
+
+		$now = dol_now();
+		if ($tmpuser->datestartvalidity && $db->jdate($tmpuser->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 ($tmpuser->dateendvalidity && $db->jdate($tmpuser->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--';
+		}
 	}
 
 	return $login;
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 3a8b274c109..287563b01c3 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -126,9 +126,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					$_SESSION["dol_loginmesg"] = $langs->trans("YouMustChangePassNextLogon", $usertotest, $ldap->domainFQDN);
 					return '';
 				}
-			}
-			else
-			{
+			} else {
 				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
 			}
 			$ldap->close();
@@ -153,6 +151,27 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 				dol_syslog("functions_ldap::check_user_password_ldap Authentification ok");
 				$login = $usertotest;
 
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+				$tmpuser = new User($db);
+				$tmpuser->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
+
+				$now = dol_now();
+				if ($tmpuser->datestartvalidity && $db->jdate($tmpuser->datestartvalidity) >= $now) {
+					$ldap->close();
+					// Load translation files required by the page
+					$langs->loadLangs(array('main', 'errors'));
+					$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
+					return '--bad-login-validity--';
+				}
+				if ($tmpuser->dateendvalidity && $db->jdate($tmpuser->dateendvalidity) <= dol_get_first_hour($now)) {
+					$ldap->close();
+					// Load translation files required by the page
+					$langs->loadLangs(array('main', 'errors'));
+					$_SESSION["dol_loginmesg"] = $langs->trans("ErrorLoginDateValidity");
+					return '--bad-login-validity--';
+				}
+
 				// ldap2dolibarr synchronisation
 				if ($login && !empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
 				{
@@ -190,6 +209,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 						//$resultUpdate = $usertmp->update_ldap2dolibarr($ldap);
 					}
+
 					unset($usertmp);
 				}
 
@@ -218,9 +238,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else
-		{
+		} else {
 			/* Login failed. Return false, together with the error code and text from
              ** the LDAP server. The common error codes and reasons are listed below :
              ** (for iPlanet, other servers may differ)
diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index a401dfd7764..e5e66a7fc80 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -36,7 +36,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/openid.class.php';
  */
 function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 {
-    global $_POST, $db, $conf, $langs;
+    global $db, $conf, $langs;
 
     dol_syslog("functions_openid::check_user_password_openid usertotest=".$usertotest);
 
@@ -56,10 +56,8 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
         {
             $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
-        {
-            $error = $openid->GetError();
+        } else {
+        	$_SESSION["dol_loginmesg"] = $openid->GetError();
             return false;
         }
         return false;
@@ -74,7 +72,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
         {
             // OK HERE KEY IS VALID
 
-            $sql = "SELECT login";
+            $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).")";
@@ -86,24 +84,34 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
                 $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)
+        } elseif ($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
-            $error = $openid->GetError();
+        	$_SESSION["dol_loginmesg"] = $openid->GetError();
             return false;
-        }
-        else
-        {
+        } else {
             // Signature Verification Failed
             //echo "INVALID AUTHORIZATION";
             return false;
         }
-    }
-    elseif ($_GET['openid_mode'] == 'cancel')
+    } elseif ($_GET['openid_mode'] == 'cancel')
     {
         // User Canceled your Request
         //echo "USER CANCELED REQUEST";
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index ec75b35073c..818198fc035 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -258,7 +258,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $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_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, 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', 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', 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__);
@@ -273,25 +274,27 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	-- 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', __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 && $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 && $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))', __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)) && $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)) && $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', __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 && $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 && $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__);
+	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__);
-	-- General Ledger
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
 	-- Balance
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2435__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 10, __ENTITY__);
+	-- General Ledger
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2432__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 12, __ENTITY__);
+    -- Journals
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2434__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Journals', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
 	-- Export accounting documents
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 17, __ENTITY__);
 	-- Reports
@@ -316,19 +319,26 @@ 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->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3001__+MAX_llx_menu__, 'asset', '', 3000__+MAX_llx_menu__, '/asset/card.php?mainmenu=accountancy&amp;leftmenu=asset&amp;action=create', 'MenuNewAsset', 2, 'assets', '$user->rights->asset->write', '', 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->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3003__+MAX_llx_menu__, 'asset', '', 3000__+MAX_llx_menu__, '/asset/list.php?mainmenu=accountancy&amp;leftmenu=asset', 'MenuListAssets', 2, 'assets', '$user->rights->asset->read', '', 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->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3004__+MAX_llx_menu__, 'asset', 'asset_type', 3000__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&amp;leftmenu=asset', 'MenuTypeAssets', 2, 'assets', '$user->rights->asset->read', '', 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->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3005__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&amp;action=create', 'MenuNewTypeAssets', 3, 'assets', '$user->rights->asset->configurer', '', 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->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3005__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&amp;action=create', 'MenuNewTypeAssets', 3, 'assets', '$user->rights->asset->setup_advance', '', 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->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3006__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy', 'MenuListTypeAssets', 3, 'assets', '$user->rights->asset->read', '', 0, 25, __ENTITY__);
 -- Check deposit
 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->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?mainmenu=bank&amp;leftmenu=checks', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 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 ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?mainmenu=bank&amp;leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/list.php?mainmenu=bank&amp;leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__);
--- Withdrawal
-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->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?mainmenu=bank&amp;leftmenu=withdraw', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__);
+-- PaymentByDirectDebit
+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->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?mainmenu=bank&amp;leftmenu=withdraw', 'PaymentByDirectDebit', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?mainmenu=bank&amp;leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2503__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/bons.php?mainmenu=bank&amp;leftmenu=withdraw', 'WithdrawalsReceipts', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2503__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/orders_list.php?mainmenu=bank&amp;leftmenu=withdraw', 'WithdrawalsReceipts', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2504__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/list.php?mainmenu=bank&amp;leftmenu=withdraw', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2506__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/rejets.php?mainmenu=bank&amp;leftmenu=withdraw', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2507__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/stats.php?mainmenu=bank&amp;leftmenu=withdraw', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__);
+-- PaymentByCreditTransfer
+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->prelevement->enabled', __HANDLER__, 'left', 2510__+MAX_llx_menu__, 'accountancy', 'banktransfer', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'PaymentByBankTransfer', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 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->prelevement->enabled && $leftmenu=="banktransfer"', __HANDLER__, 'left', 2512__+MAX_llx_menu__, 'accountancy', '', 2510__+MAX_llx_menu__, '/compta/prelevement/create.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="banktransfer"', __HANDLER__, 'left', 2513__+MAX_llx_menu__, 'accountancy', '', 2510__+MAX_llx_menu__, '/compta/prelevement/orders_list.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'WithdrawalsReceipts', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="banktransfer"', __HANDLER__, 'left', 2514__+MAX_llx_menu__, 'accountancy', '', 2510__+MAX_llx_menu__, '/compta/prelevement/list.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="banktransfer"', __HANDLER__, 'left', 2516__+MAX_llx_menu__, 'accountancy', '', 2510__+MAX_llx_menu__, '/compta/prelevement/rejets.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->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->prelevement->enabled && $leftmenu=="banktransfer"', __HANDLER__, 'left', 2517__+MAX_llx_menu__, 'accountancy', '', 2510__+MAX_llx_menu__, '/compta/prelevement/stats.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__);
 -- Bank
 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', __HANDLER__, 'left', 2600__+MAX_llx_menu__, 'accountancy', 'bank', 14__+MAX_llx_menu__, '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', 0, 'banks', '$user->rights->banque->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->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2601__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/card.php?mainmenu=bank&amp;action=create&amp;leftmenu=bank', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 0, 0, __ENTITY__);
@@ -382,8 +392,9 @@ 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', 4202__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/list.php', 'List', 1, 'members', '$user->rights->adherent->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->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', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=outofdate', 'MenuMembersNotUpToDate', 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', '', 4202__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;leftmenu=members&amp;statut=1&amp;filter=uptodate', 'MenuMembersUpToDate', 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', 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 ('', '! 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__);
@@ -405,7 +416,7 @@ 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->hrm->enabled', __HANDLER__, 'left', 4602__+MAX_llx_menu__, 'hrm', '', 4600__+MAX_llx_menu__, '/user/list.php?mainmenu=hrm&amp;leftmenu=hrm&mode=employee&contextpage=employeelist', 'List', 1, 'hrm', '$user->rights->hrm->employee->read', '', 0, 2, __ENTITY__);
 -- HRM - Holiday
 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->holiday->enabled', __HANDLER__, 'left', 5000__+MAX_llx_menu__, 'hrm', 'hrm', 15__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;leftmenu=hrm', 'CPTitreMenu', 0, 'holiday', '$user->rights->holiday->read', '', 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->holiday->enabled', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card.php?mainmenu=hrm&amp;action=request', 'MenuAddCP', 1, 'holiday', '$user->rights->holiday->write', '', 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->holiday->enabled', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card.php?mainmenu=hrm&amp;action=create', 'MenuAddCP', 1, 'holiday', '$user->rights->holiday->write', '', 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->holiday->enabled', __HANDLER__, 'left', 5002__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;leftmenu=hrm', 'List', 1, 'holiday', '$user->rights->holiday->read', '', 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->holiday->enabled', __HANDLER__, 'left', 5003__+MAX_llx_menu__, 'hrm', '', 5002__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;search_statut=2&leftmenu=hrm', 'ListToApprove', 2, 'trips', '$user->rights->holiday->read', '', 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->holiday->enabled', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/define_holiday.php?mainmenu=hrm&amp;action=request', 'MenuConfCP', 1, 'holiday', '$user->rights->holiday->define_holiday', '', 0, 2, __ENTITY__);
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index e55da6f93ac..a124759faa8 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -116,8 +116,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 			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"';
 
 		$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);
 	}
@@ -145,8 +144,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 		 {
 		 $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 		 }*/
-		else
-		{
+		else {
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_512x512_white.png';
 			$logoContainerAdditionalClass = '';
 		}
@@ -357,8 +355,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				}
 				$i++;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 		$db->free($resql);
 	}
 
@@ -388,13 +385,16 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					$nature = '';
 
 					// Must match array $sourceList defined into journals_list.php
-					if ($objp->nature == 2 && ! empty($conf->facture->enabled)) $nature="sells";
-					if ($objp->nature == 3 && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))) $nature="purchases";
-					if ($objp->nature == 4 && ! empty($conf->banque->enabled)) $nature="bank";
-					if ($objp->nature == 5 && ! empty($conf->expensereport->enabled)) $nature="expensereports";
-					if ($objp->nature == 1) $nature="various";
-					if ($objp->nature == 8) $nature="inventory";
-					if ($objp->nature == 9) $nature="hasnew";
+					if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) $nature = "sells";
+					if ($objp->nature == 3
+						&& (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))
+						&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES))
+						$nature = "purchases";
+					if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
+					if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) $nature = "expensereports";
+					if ($objp->nature == 1) $nature = "various";
+					if ($objp->nature == 8) $nature = "inventory";
+					if ($objp->nature == 9) $nature = "hasnew";
 
 					// To enable when page exists
 					if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))
@@ -410,14 +410,11 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					}
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				// Should not happend. Entries are added
 				$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 		$db->free($resql);
 	}
 
@@ -473,9 +470,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				if ($altok % 2 == 0)
 				{
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
-				}
-				else
-				{
+				} else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 			}
@@ -533,14 +528,11 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					else print '</span>';
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
-				}
-				elseif ($showmenu)                 // Not enabled but visible (so greyed)
+				} elseif ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
-				}
-				else
-				{
+				} else {
 				    $lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
@@ -559,15 +551,14 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
 					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vsmenu">';
+					else print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
 					print $menu_array[$i]['titre'];
 					if ($shorturlwithoutparam) print '</a>';
 					else print '</span>';
 					// If title is not pure text and contains a table, no carriage return added
 					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
 					print '</div>'."\n";
-				}
-				elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
+				} elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 2a67d43c1e3..5b7aa913350 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -68,37 +68,33 @@ class MenuManager
     	global $conf, $user, $langs;
 
    		// On sauve en session le menu principal choisi
-    	if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"] = $_GET["mainmenu"];
-    	if (isset($_GET["idmenu"]))   $_SESSION["idmenu"] = $_GET["idmenu"];
+    	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 (isset($_GET["mainmenu"]))
+    	if (GETPOSTISSET("mainmenu"))
     	{
     		// On sauve en session le menu principal choisi
-    		$mainmenu = $_GET["mainmenu"];
+    		$mainmenu = GETPOST("mainmenu", 'aZ09');
     		$_SESSION["mainmenu"] = $mainmenu;
     		$_SESSION["leftmenuopened"] = "";
-    	}
-    	else
-    	{
+    	} 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 (isset($_GET["leftmenu"]))
+    	if (GETPOSTISSET("leftmenu"))
     	{
     		// On sauve en session le menu principal choisi
-    		$leftmenu = $_GET["leftmenu"];
+    		$leftmenu = GETPOST("leftmenu", 'aZ09');
     		$_SESSION["leftmenu"] = $leftmenu;
 
     		if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
     		{
     			//$leftmenu="";
     			$_SESSION["leftmenuopened"] = "";
-    		}
-    		else
-    		{
+    		} else {
     			$_SESSION["leftmenuopened"] = $leftmenu;
     		}
     	} else {
@@ -145,9 +141,7 @@ class MenuManager
         {
         	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
-        {
+        } 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);
@@ -210,8 +204,7 @@ class MenuManager
         				{
         				    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");
+        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 						print '</a>';
 						print '</li>'."\n";
         			}
@@ -221,13 +214,10 @@ class MenuManager
 					    if ($val['enabled'])
 					    {
 					        $lastlevel[0] = 'enabled';
-					    }
-					    elseif ($showmenu)                 // Not enabled but visible (so greyed)
+					    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
 					    {
 					        $lastlevel[0] = 'greyed';
-					    }
-					    else
-					    {
+					    } else {
 					        $lastlevel[0] = 'hidden';
 					    }
 					}
@@ -258,9 +248,7 @@ class MenuManager
        						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
        						{
        							$relurl2 = dol_buildpath($val2['url'], 1);
-       						}
-       						else
-       						{
+       						} else {
        							$relurl2 = $val2['url'];
        						}
 	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -285,21 +273,16 @@ class MenuManager
 		        					//print ' data-ajax="false"';
 		        					print '>';
 		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
+	        					} else // Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
-	        				}
-	        				else
-	        				{
+	        				} else {
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    }
-	        				    else
-	        				    {
+	        				    } else {
 	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
@@ -308,8 +291,7 @@ class MenuManager
 	        				{
 	        					if ($val2['enabled'])	// Allowed
 	        						print '</a>';
-	        					else
-	        						print '</a>';
+	        					else print '</a>';
 	        				}
 	        				print '</li>'."\n";
        					}
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e07bbcac70e..5e4b98f7461 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -56,19 +56,19 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	if (empty($noout)) print_start_menu_array();
 
-    $usemenuhider = 1;
+	$usemenuhider = 1;
 
 	// 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);
 	}
 
-    $menu_arr = array();
+	$menu_arr = array();
 
 	// Home
 	$menu_arr[] = array(
@@ -92,9 +92,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Members
 	$tmpentry = array(
-	    'enabled' => (!empty($conf->adherent->enabled)),
-	    'perms' => (!empty($user->rights->adherent->lire)),
-	    'module' => 'adherent'
+		'enabled' => (!empty($conf->adherent->enabled)),
+		'perms' => (!empty($user->rights->adherent->lire)),
+		'module' => 'adherent'
 	);
 	$menu_arr[] = array(
 		'name' => 'Members',
@@ -117,13 +117,13 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Third parties
 	$tmpentry = array(
-	    'enabled'=> ((!empty($conf->societe->enabled) &&
-	        (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-	        )
-	        || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-	        ),
-	    'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)),
-	    'module'=>'societe|fournisseur'
+		'enabled'=> ((!empty($conf->societe->enabled) &&
+			(empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+			)
+			|| (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
+			),
+		'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire)),
+		'module'=>'societe|fournisseur'
 	);
 	$menu_arr[] = array(
 		'name' => 'Companies',
@@ -148,7 +148,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 	$tmpentry = array(
 		'enabled'=> (!empty($conf->product->enabled) || !empty($conf->service->enabled) || !empty($conf->expedition->enabled)),
 		'perms'=> (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire) || !empty($user->rights->expedition->lire)),
-	    'module'=>'product|service'
+		'module'=>'product|service'
 	);
 	$menu_arr[] = array(
 		'name' => 'Products',
@@ -157,7 +157,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 					? (array("TMenuProducts", " | ", "TMenuServices"))
 					: (!empty($conf->product->enabled) ? "TMenuProducts" : "TMenuServices"),
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "products",
 		'leftmenu' => '',
@@ -171,36 +171,36 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'submenus' => array(),
 	);
 
-	// MRP
+	// MRP - GPAO
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)),
-	    'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),
-	    'module'=>'bom|mrp'
+		'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)),
+		'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),
+		'module'=>'bom|mrp'
 	);
 	$menu_arr[] = array(
-	    'name' => 'TMenuMRP',
-	    'link' => '/mrp/index.php?mainmenu=mrp&amp;leftmenu=',
-	    'title' => "TMenuMRP",
-	    'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
-	    'target' => $atarget,
-	    'mainmenu' => "mrp",
-	    'leftmenu' => '',
-	    'position' => 30,
-	    'id' => $id,
-	    'idsel' => 'mrp',
-	    'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
-	    'prefix' => '',
-	    'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),
-	    'loadLangs' => array("mrp"),
-	    'submenus' => array(),
+		'name' => 'TMenuMRP',
+		'link' => '/mrp/index.php?mainmenu=mrp&amp;leftmenu=',
+		'title' => "TMenuMRP",
+		'level' => 0,
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'target' => $atarget,
+		'mainmenu' => "mrp",
+		'leftmenu' => '',
+		'position' => 31,
+		'id' => $id,
+		'idsel' => 'mrp',
+		'classname' =>  $classname = ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
+		'prefix' => '',
+		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),
+		'loadLangs' => array("mrp"),
+		'submenus' => array(),
 	);
 
 	// Projects
 	$tmpentry = array(
-	    'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0),
-	    'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0),
-	    'module'=>'projet'
+		'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0),
+		'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0),
+		'module'=>'projet'
 	);
 	$menu_arr[] = array(
 		'name' => 'Projet',
@@ -209,7 +209,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 					? (($conf->global->PROJECT_USE_OPPORTUNITIES == 2) ? "Leads" : "Projects")
 					: "Projects",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "project",
 		'leftmenu' => '',
@@ -223,27 +223,23 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'submenus' => array(),
 	);
 
-	// Commercial
+	// Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->propal->enabled) ||
-	        !empty($conf->commande->enabled) ||
-	    	!empty($conf->fournisseur->enabled) ||
-	    	!empty($conf->supplier_proposal->enabled) ||
-	    	!empty($conf->supplier_order->enabled) ||
-	    	!empty($conf->contrat->enabled) ||
-	        !empty($conf->ficheinter->enabled)
-	        ) ? 1 : 0,
-		'perms'=>(!empty($user->rights->propal->lire) ||
-			!empty($user->rights->commande->lire) ||
-			!empty($user->rights->fournisseur->lire) ||
-			!empty($user->rights->supplier_proposal->lire) ||
-			!empty($user->rights->supplier_order->lire) ||
-			!empty($user->rights->contrat->lire) ||
-			!empty($user->rights->ficheinter->lire) ||
-			!empty($user->rights->supplier_order->lire) ||
-			!empty($user->rights->fournisseur->commande->lire)
-			),
-	    'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
+		'enabled'=>(!empty($conf->propal->enabled)
+			|| !empty($conf->commande->enabled)
+			|| !empty($conf->supplier_proposal->enabled)
+			|| !empty($conf->supplier_order->enabled)
+			|| !empty($conf->contrat->enabled)
+			|| !empty($conf->ficheinter->enabled)
+		) ? 1 : 0,
+		'perms'=>(!empty($user->rights->propal->lire)
+			|| !empty($user->rights->commande->lire)
+			|| !empty($user->rights->supplier_proposal->lire)
+			|| !empty($user->rights->supplier_order->lire)
+			|| !empty($user->rights->contrat->lire)
+			|| !empty($user->rights->ficheinter->lire)
+		),
+		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);
 
 	$onlysupplierorder = !empty($user->rights->fournisseur->commande->lire) &&
@@ -259,7 +255,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'link' => ($onlysupplierorder ? '/fourn/commande/index.php?mainmenu=commercial&amp;leftmenu=' : '/comm/index.php?mainmenu=commercial&amp;leftmenu='),
 		'title' => "Commercial",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "commercial",
 		'leftmenu' => '',
@@ -275,25 +271,25 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Billing - Financial
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->facture->enabled) ||
-	        !empty($conf->don->enabled) ||
-	        !empty($conf->tax->enabled) ||
-	        !empty($conf->salaries->enabled) ||
-	        !empty($conf->supplier_invoice->enabled) ||
-	        !empty($conf->loan->enabled) ||
-            !empty($conf->margins->enabled)
-	        ) ? 1 : 0,
-	    'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
-	        || !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
-	        || !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
-	    'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
+		'enabled'=>(!empty($conf->facture->enabled) ||
+			!empty($conf->don->enabled) ||
+			!empty($conf->tax->enabled) ||
+			!empty($conf->salaries->enabled) ||
+			!empty($conf->supplier_invoice->enabled) ||
+			!empty($conf->loan->enabled) ||
+			!empty($conf->margins->enabled)
+			) ? 1 : 0,
+		'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
+			|| !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
+			|| !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read) || !empty($user->rights->margins->liretous)),
+		'module'=>'facture|supplier_invoice|don|tax|salaries|loan'
 	);
 	$menu_arr[] = array(
 		'name' => 'Compta',
 		'link' => '/compta/index.php?mainmenu=billing&amp;leftmenu=',
 		'title' =>  "MenuFinancial",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "billing",
 		'leftmenu' => '',
@@ -309,16 +305,16 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Bank
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),
+		'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),
 		'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire) || !empty($user->rights->paymentbybanktransfer->read)),
-	    'module'=>'banque|prelevement|paymentbybanktransfer'
+		'module'=>'banque|prelevement|paymentbybanktransfer'
 	);
 	$menu_arr[] = array(
 		'name' => 'Bank',
 		'link' => '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=',
 		'title' =>  "MenuBankCash",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "bank",
 		'leftmenu' => '',
@@ -336,16 +332,16 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Accounting
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)),
-	    'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),
-        'module'=>'comptabilite|accounting|asset'
+		'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)),
+		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),
+		'module'=>'comptabilite|accounting|asset'
 	);
 	$menu_arr[] = array(
 		'name' => 'Accounting',
 		'link' => '/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=',
 		'title' =>  "MenuAccountancy",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "accountancy",
 		'leftmenu' => '',
@@ -363,16 +359,16 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// HRM
 	$tmpentry = array(
-	    'enabled'=>(!empty($conf->hrm->enabled) || !empty($conf->holiday->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled)),
-	    'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire)),
-	    'module'=>'hrm|holiday|deplacement|expensereport'
+		'enabled'=>(!empty($conf->hrm->enabled) || !empty($conf->holiday->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)),
+		'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire) || !empty($user->rights->recruitment->recruitmentjobposition->read)),
+		'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
 	);
 	$menu_arr[] = array(
 		'name' => 'HRM',
 		'link' => '/hrm/index.php?mainmenu=hrm&amp;leftmenu=',
 		'title' =>  "HRM",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "hrm",
 		'leftmenu' => '',
@@ -390,16 +386,16 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Tools
 	$tmpentry = array(
-	    'enabled'=>1,
-	    'perms'=>1,
-	    'module'=>''
+		'enabled'=>1,
+		'perms'=>1,
+		'module'=>''
 	);
 	$menu_arr[] = array(
 		'name' => 'Tools',
 		'link' => '/core/tools.php?mainmenu=tools&amp;leftmenu=',
 		'title' =>  "Tools",
 		'level' => 0,
-	    'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
+		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
 		'mainmenu' => "tools",
 		'leftmenu' => '',
@@ -441,9 +437,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 				{
 					$mtitle .= $langs->trans($item);
 				}
-			}
-			else
-			{
+			} else {
 				$mtitle = $langs->trans($smenu->title);
 			}
 			// Add item
@@ -453,6 +447,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Show personalized menus
 	$menuArbo = new Menubase($db, 'eldy');
+
 	$newTabMenu = $menuArbo->menuTopCharger('', '', $type_user, 'eldy', $tabMenu); // Return tabMenu with only top entries
 
 	$num = count($newTabMenu);
@@ -461,41 +456,45 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		//var_dump($type_user.' '.$newTabMenu[$i]['url'].' '.$showmode.' '.$newTabMenu[$i]['perms']);
 		$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
 
+		$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
+
+		// url = url from host, shorturl = relative path into dolibarr sources
+		$url = $shorturl = $newTabMenu[$i]['url'];
+		if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))	// Do not change url content for external links
+		{
+			$tmp = explode('?', $newTabMenu[$i]['url'], 2);
+			$url = $shorturl = $tmp[0];
+			$param = (isset($tmp[1]) ? $tmp[1] : '');
+
+			if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&amp;leftmenu=';
+			//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
+			$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
+			//$shorturl = $shorturl.($param?'?'.$param:'');
+			$shorturl = $url;
+			if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
+		}
+
 		$showmode = isVisibleToUserType($type_user, $newTabMenu[$i], $listofmodulesforexternal);
 		if ($showmode == 1)
 		{
-			$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
-
-		    // url = url from host, shorturl = relative path into dolibarr sources
-			$url = $shorturl = $newTabMenu[$i]['url'];
-			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))	// Do not change url content for external links
-			{
-				$tmp = explode('?', $newTabMenu[$i]['url'], 2);
-				$url = $shorturl = $tmp[0];
-				$param = (isset($tmp[1]) ? $tmp[1] : '');
-
-				if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&amp;leftmenu=';
-				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
-				$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
-				//$shorturl = $shorturl.($param?'?'.$param:'');
-                $shorturl = $url;
-				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $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"';
 
-		$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);
+		$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);
 	}
 
 	// Sort on position
 	$menu->liste = dol_sort_array($menu->liste, 'position');
 
-    // Output menu entries
+	// Output menu entries
 	// Show logo company
 	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
@@ -515,8 +514,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		{
 			$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);
 		}*/
-		else
-		{
+		else {
 			$urllogo = DOL_URL_ROOT.'/theme/dolibarr_512x512_white.png';
 			$logoContainerAdditionalClass = '';
 		}
@@ -525,26 +523,25 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		print "\n".'<!-- Show logo on menu -->'."\n";
 		print_start_menu_entry('companylogo', 'class="tmenu tmenucompanylogo nohover"', 1);
 
-
 		print '<div class="center '.$logoContainerAdditionalClass.' menulogocontainer"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 100px"></div>'."\n";
 
 		print_end_menu_entry(4);
 	}
 
-    if (empty($noout)) {
-        foreach ($menu->liste as $menuval) {
-            print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
-            print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
-            print_end_menu_entry($menuval['enabled']);
-        }
-    }
+	if (empty($noout)) {
+		foreach ($menu->liste as $menuval) {
+			print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);
+			print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));
+			print_end_menu_entry($menuval['enabled']);
+		}
+	}
 
 	$showmode = 1;
-    if (empty($noout)) {
-        print_start_menu_entry('', 'class="tmenuend"', $showmode);
-        print_end_menu_entry($showmode);
-        print_end_menu_array();
-    }
+	if (empty($noout)) {
+		print_start_menu_entry('', 'class="tmenuend"', $showmode);
+		print_end_menu_entry($showmode);
+		print_end_menu_array();
+	}
 
 	return 0;
 }
@@ -557,7 +554,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
  */
 function print_start_menu_array()
 {
-    global $conf;
+	global $conf;
 
 	print '<div class="tmenudiv">';
 	print '<ul role="navigation" class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';
@@ -671,26 +668,26 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]);
 	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]));
 
-    $usemenuhider = 0;
+	$usemenuhider = 0;
 
 	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);
@@ -716,8 +713,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 			if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup")
 			{
-			    // Load translation files required by the page
-                $langs->loadLangs(array("admin", "help"));
+				// Load translation files required by the page
+				$langs->loadLangs(array("admin", "help"));
 
 				$warnpicto = '';
 				if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY))
@@ -753,15 +750,15 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');
 			if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu))
 			{
-			    // Load translation files required by the page
-                $langs->loadLangs(array('admin', 'help'));
+				// Load translation files required by the page
+				$langs->loadLangs(array('admin', 'help'));
 
 				$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == 'admintools_info') {
-                    $newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);
-				    $newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);
-                    $newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
-                }
+					$newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);
+					$newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);
+					$newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
+				}
 				$newmenu->add('/admin/system/browser.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoBrowser'), 1);
 				$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);
@@ -780,7 +777,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
 				{
 					$langs->load("products");
-				    $newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
+					$newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
 				}
 			}
 
@@ -830,7 +827,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 			{
 				$langs->load("commercial");
-				$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'prospects');
+				$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'prospects');
 				/* no more required, there is a filter that can do more
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire);
@@ -838,26 +835,24 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);
 				*/
-				$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer);
-				//$newmenu->add("/contact/list.php?leftmenu=customers&amp;type=p", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);
+				$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 3, $user->rights->societe->creer);
 			}
 
 			// Customers/Prospects
 			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
 			{
 				$langs->load("commercial");
-				$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers');
+				$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'customers');
 
-				$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer);
-				//$newmenu->add("/contact/list.php?leftmenu=customers&amp;type=c", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);
+				$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 3, $user->rights->societe->creer);
 			}
 
 			// Suppliers
 			if (!empty($conf->societe->enabled) && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->supplier_proposal->enabled)))
 			{
 				$langs->load("suppliers");
-				$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');
-				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 2, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire));
+				$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');
+				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire));
 			}
 
 			// Categories
@@ -899,7 +894,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		}
 
 		/*
-		 * Menu COMMERCIAL
+		 * Menu COMMERCIAL (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 		 */
 		if ($mainmenu == 'commercial')
 		{
@@ -913,33 +908,33 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/comm/propal/card.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);
 				$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {
-                    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);
-				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);
-				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);
-				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);
-				    $newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);
-                    //$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->rights->propale->lire);
-                }
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);
+					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);
+					//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->rights->propale->lire);
+				}
 				$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);
 			}
 
-            // Customers orders
-            if (!empty($conf->commande->enabled))
-            {
-                $langs->load("orders");
-                $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);
-                $newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
-                $newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
-                if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
-                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
-                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
-                    if (!empty($conf->expedition->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
-                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);
-                    //$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
-                    $newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
-                }
-                $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
-            }
+			// Customers orders
+			if (!empty($conf->commande->enabled))
+			{
+				$langs->load("orders");
+				$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);
+				$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
+				$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
+					if (!empty($conf->expedition->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);
+					//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
+				}
+				$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
+			}
 
 			// Supplier proposal
 			if (!empty($conf->supplier_proposal->enabled))
@@ -952,7 +947,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			}
 
 			// Suppliers orders
-            if (!empty($conf->supplier_order->enabled))
+			if (!empty($conf->supplier_order->enabled))
 			{
 				$langs->load("orders");
 				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);
@@ -960,16 +955,16 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
-                    if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
-                    $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
-                }
-                // Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
+					if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
+				}
+				// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->rights->fournisseur->commande->lire);
 
 
 				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);
@@ -984,11 +979,11 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
 				$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {
-                    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
-				    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
-				    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);
-                    $newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);
-                }
+					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
+					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
+					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);
+					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);
+				}
 			}
 
 			// Interventions
@@ -1015,7 +1010,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->facture->enabled))
 			{
 				$langs->load("bills");
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->facture->lire, '', $mainmenu, 'customers_bills');
+				$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->facture->lire, '', $mainmenu, 'customers_bills');
 				$newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->rights->facture->creer);
 				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');
 
@@ -1043,7 +1038,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->societe->enabled) && !empty($conf->supplier_invoice->enabled))
 			{
 				$langs->load("bills");
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
+				$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');
 				$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&amp;action=create", $langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');
 				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');
 
@@ -1053,7 +1048,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');
 				}
 
-				$newmenu->add("/fourn/facture/paiement.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
+				$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
 
 				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');
 
@@ -1086,101 +1081,95 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$langs->load("donations");
 				$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {
-                    $newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);
-                    $newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);
-                }
+					$newmenu->add("/don/card.php?leftmenu=donations&amp;action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);
+					$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);
+				}
 				// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire);
 			}
 
 			// Taxes and social contributions
-			if (!empty($conf->tax->enabled) || !empty($conf->salaries->enabled) || !empty($conf->loan->enabled) || !empty($conf->banque->enabled))
+			if (!empty($conf->tax->enabled))
 			{
-				global $mysoc;
+				$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->rights->tax->charges->lire, '', $mainmenu, 'tax');
 
-				$permtoshowmenu = ((!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read)) || (!empty($conf->loan->enabled) && $user->rights->loan->read) || (!empty($conf->banque->enabled) && $user->rights->banque->lire));
-				$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');
-
-				// Social contributions
-				if (!empty($conf->tax->enabled))
+				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);
+				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);
+				}
+				// VAT
+				if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
 				{
-					$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);
-					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);
-                    }
-					// VAT
-					if (empty($conf->global->TAX_DISABLE_VAT_MENUS))
-					{
-						$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
-						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {
-                            $newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-						    $newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-						    $newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-						    $newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
-                            $newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
-                        }
-						global $mysoc;
+					global $mysoc;
 
-						//Local Taxes 1
-						if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1"))
-						{
-							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
-							if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {
-                                $newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-							    $newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-							    $newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-							    $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
-                                $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
-                            }
+					$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&amp;mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
+					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {
+						$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
+						$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+					}
+
+					//Local Taxes 1
+					if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1"))
+					{
+						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
+						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {
+							$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
+							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
 						}
-						//Local Taxes 2
-						if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1"))
-						{
-							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
-							if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {
-                                $newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-							    $newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-							    $newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-							    $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
-                                $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
-                            }
+					}
+					//Local Taxes 2
+					if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1"))
+					{
+						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
+						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {
+							$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
+							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);
+							$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
 						}
 					}
 				}
+			}
 
-				// Salaries
-				if (!empty($conf->salaries->enabled))
-				{
-					$langs->load("salaries");
-					$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');
-					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
-                        $newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 1, $user->rights->salaries->write);
-					    $newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->rights->salaries->read);
-                        $newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->rights->salaries->read);
-                    }
+			// Salaries
+			if (!empty($conf->salaries->enabled))
+			{
+				$langs->load("salaries");
+				$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');
+				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {
+					$newmenu->add("/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 1, $user->rights->salaries->write);
+					$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->rights->salaries->read);
+					$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->rights->salaries->read);
 				}
+			}
 
-				// Loan
-				if (!empty($conf->loan->enabled))
-				{
-					$langs->load("loan");
-					$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan');
-					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {
-                        $newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->rights->loan->write);
-                        //$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);
-                    }
+			// Loan
+			if (!empty($conf->loan->enabled))
+			{
+				$langs->load("loan");
+				$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan');
+				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {
+					$newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 1, $user->rights->loan->write);
+					//$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);
 				}
+			}
 
-				// Various payment
-				if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
-				{
-					$langs->load("banks");
-					$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various');
-					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {
-                        $newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->rights->banque->modifier);
-                        $newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->rights->banque->lire);
-                    }
+			// Various payment
+			if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
+			{
+				$langs->load("banks");
+				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various');
+				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {
+					$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 1, $user->rights->banque->modifier);
+					$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->rights->banque->lire);
 				}
 			}
 		}
@@ -1211,6 +1200,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/accountancy/admin/journals_list.php?id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 30);
 					$newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 40);
 					$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
+					$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
 					$newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 50);
 					$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 60);
 					if (!empty($conf->banque->enabled)) {
@@ -1232,35 +1222,35 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 130);
 				}
 
-                // Transfer in accounting
-                $newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'transfer', 1);
+				// Transfer in accounting
+				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'transfer', 1);
 
-                // Binding
-                // $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch');
-                if (!empty($conf->facture->enabled))
-                {
-                	$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
-                	if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {
-                		$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-                		$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
-                	}
-                }
-                if (!empty($conf->supplier_invoice->enabled))
-                {
-                	$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');
-                	if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {
-                		$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-                		$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
-                	}
-                }
-                if (!empty($conf->expensereport->enabled))
-                {
-                	$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');
-                	if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {
-                		$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-                		$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
-                	}
-                }
+				// Binding
+				// $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch');
+				if (!empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES))
+				{
+					$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {
+						$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
+						$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+					}
+				}
+				if (!empty($conf->supplier_invoice->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES))
+				{
+					$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {
+						$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
+						$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+					}
+				}
+				if (!empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS))
+				{
+					$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {
+						$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
+						$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+					}
+				}
 
 				// Journals
 				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')
@@ -1289,10 +1279,13 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 								$nature = '';
 
 								// Must match array $sourceList defined into journals_list.php
-								if ($objp->nature == 2 && !empty($conf->facture->enabled)) $nature = "sells";
-								if ($objp->nature == 3 && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))) $nature = "purchases";
+								if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) $nature = "sells";
+								if ($objp->nature == 3
+									&& (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))
+									&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES))
+									$nature = "purchases";
 								if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
-								if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) $nature = "expensereports";
+								if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) $nature = "expensereports";
 								if ($objp->nature == 1) $nature = "various";
 								if ($objp->nature == 8) $nature = "inventory";
 								if ($objp->nature == 9) $nature = "hasnew";
@@ -1311,35 +1304,25 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 								}
 								$i++;
 							}
-						}
-						else
-						{
+						} else {
 							// Should not happend. Entries are added
 							$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 						}
-					}
-					else dol_print_error($db);
+					} else dol_print_error($db);
 					$db->free($resql);
 				}
 
-                // Accounting
-                $newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire, '', $mainmenu, 'accountancy', 1);
-
-
-                // General Ledger
-				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);
+				// Accounting
+				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire, '', $mainmenu, 'accountancy', 1);
 
 				// Balance
 				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
 
-                // Closure
-                if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
-                    $newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
+				// General Ledger
+				$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);
 
-                    if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_closure/', $leftmenu)) {
-                        $newmenu->add("/accountancy/closure/validate.php?leftmenu=accountancy_closure", $langs->trans("MenuAccountancyValidationMovements"), 2, $user->rights->accounting->fiscalyear->write);
-                    }
-                }
+				// Journals
+				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->rights->accounting->mouvements->lire);
 
 				// Files
 				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
@@ -1347,26 +1330,35 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
 				}
 
-				// Reports
-				$newmenu->add("/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
+				// Closure
+				if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+					$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
 
-                if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-                    $newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);
-                    $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
-                    $newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
-                }
+					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_closure/', $leftmenu)) {
+						$newmenu->add("/accountancy/closure/validate.php?leftmenu=accountancy_closure", $langs->trans("MenuAccountancyValidationMovements"), 2, $user->rights->accounting->fiscalyear->write);
+					}
+				}
+
+				// Reports
+				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
+
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
+					$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
+				}
 
 				$modecompta = 'CREANCES-DETTES';
 				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
 				if ($modecompta)
 				{
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-                        $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
-                        $newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);
-                    }
+						$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);
+					}
 				}
 
 				$modecompta = 'RECETTES-DEPENSES';
@@ -1374,12 +1366,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($modecompta)
 				{
 					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-					    $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-					    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
-					    //$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
-                        //$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);
-                    }
+						$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
+						$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
+						//$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
+						//$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);
+					}
 				}
 
 				$modecompta = 'CREANCES-DETTES';
@@ -1402,50 +1394,50 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
 					}
 				}
-            }
+			}
 
 			// Accountancy (simple)
-            if (!empty($conf->comptabilite->enabled))
-            {
-            	// Files
-            	if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
-            	{
-            		$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
-            	}
+			if (!empty($conf->comptabilite->enabled))
+			{
+				// Files
+				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
+				{
+					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
+				}
 
-                // Bilan, resultats
-                $newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');
+				// Bilan, resultats
+				$newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');
 
-                if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
-                    $newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-                    /* On verra ca avec module compabilite expert
+				if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
+					$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+					/* On verra ca avec module compabilite expert
                     $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
                     $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
                     */
-                    $newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
 
-                    /*
+					/*
                     $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
                     if (! empty($conf->propal->enabled)) {
                         $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
                         $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
                     }
                     */
-                    $newmenu->add("/compta/stats/casoc.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-                    $newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
 					//Achats
 					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report", $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-                    // Journaux
-                    $newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
-                    $newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
-                }
-                //if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
-            }
+					// Journals
+					$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
+					$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
+				}
+				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+			}
 
 			// Assets
 			if (!empty($conf->asset->enabled))
@@ -1455,9 +1447,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
 				$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');
 				if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {
-					$newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create", $langs->trans("MenuNewTypeAssets"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->setup_advance));
-                    $newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);
-                }
+					$newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create", $langs->trans("MenuNewTypeAssets"), 2, (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->setup_advance));
+					$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);
+				}
 			}
 		}
 
@@ -1487,7 +1479,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			{
 				$langs->load("categories");
 				$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');
-				$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');
+				$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->banque->configurer, '', $mainmenu, 'tags');
 			}
 
 			// Direct debit order
@@ -1496,13 +1488,13 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');
 
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {
-				    $newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);
+					$newmenu->add("/compta/prelevement/create.php?mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);
 
-				    $newmenu->add("/compta/prelevement/bons.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);
-				    $newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);
-				    $newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);
-				    $newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);
-                }
+					$newmenu->add("/compta/prelevement/orders_list.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);
+					$newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);
+					$newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);
+					$newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);
+				}
 			}
 
 			// Bank transfer order
@@ -1513,7 +1505,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "banktransfer") {
 					$newmenu->add("/compta/prelevement/create.php?type=bank-transfer&mainmenu=bank", $langs->trans("NewPaymentByBankTransfer"), 1, $user->rights->paymentbybanktransfer->create);
 
-					$newmenu->add("/compta/prelevement/bons.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->rights->paymentbybanktransfer->read);
+					$newmenu->add("/compta/prelevement/orders_list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->rights->paymentbybanktransfer->read);
 					$newmenu->add("/compta/prelevement/list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->rights->paymentbybanktransfer->read);
 					$newmenu->add("/compta/prelevement/rejets.php?type=bank-transfer&mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->paymentbybanktransfer->read);
 					$newmenu->add("/compta/prelevement/stats.php?type=bank-transfer&mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->paymentbybanktransfer->read);
@@ -1525,9 +1517,9 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			{
 				$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');
 				if (preg_match('/checks/', $leftmenu)) {
-                    $newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);
-                    $newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);
-                }
+					$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&amp;action=new&amp;mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);
+					$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);
+				}
 			}
 
 			// Cash Control
@@ -1607,35 +1599,38 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
 				$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
 
-                $newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
-                if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+				$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
+				if ($conf->supplier_order->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+				$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire && $conf->global->MAIN_FEATURES_LEVEL >= 2);
 
-                // Categories for warehouses
-                if (!empty($conf->categorie->enabled))
-                {
-                	$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-                }
+				// Categories for warehouses
+				if (!empty($conf->categorie->enabled))
+				{
+					$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				}
 			}
 
 			// Inventory
 			if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 			{
-    			if (!empty($conf->stock->enabled))
-    			{
-    				$langs->load("stocks");
+				if (!empty($conf->stock->enabled))
+				{
+					$langs->load("stocks");
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 					{
-						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
-						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
-						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
+						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');
+						if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
+							$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
+							$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->lire);
+						}
+					} else {
+						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');
+						if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
+							$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
+							$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
+						}
 					}
-					else
-					{
-						$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');
-						$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
-						$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
-					}
-    			}
+				}
 			}
 
 			// Shipments
@@ -1646,14 +1641,14 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
 				$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {
-                    $newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);
-				    $newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);
-                    $newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);
-                }
+					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);
+					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);
+					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);
+				}
 				$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);
 			}
 
-            // Receptions
+			// Receptions
 			if (!empty($conf->reception->enabled))
 			{
 				$langs->load("receptions");
@@ -1668,28 +1663,28 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		}
 
 		/*
-		 * Menu PRODUCTS-SERVICES MRP
+		 * Menu PRODUCTS-SERVICES MRP - GPAO
 		 */
 		if ($mainmenu == 'mrp')
 		{
-		    // BOM
-		    if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled))
-		    {
-		        $langs->load("mrp");
+			// BOM
+			if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled))
+			{
+				$langs->load("mrp");
 
-		        $newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom');
-		        $newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->rights->bom->write, '', $mainmenu, 'bom');
-		        $newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
-		    }
+				$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom');
+				$newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->rights->bom->write, '', $mainmenu, 'bom');
+				$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
+			}
 
-		    if (!empty($conf->mrp->enabled))
-		    {
-		    	$langs->load("mrp");
+			if (!empty($conf->mrp->enabled))
+			{
+				$langs->load("mrp");
 
-		    	$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo');
-		    	$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->rights->mrp->write, '', $mainmenu, 'mo');
-		    	$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->rights->mrp->read, '', $mainmenu, 'mo');
-		    }
+				$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo');
+				$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->rights->mrp->write, '', $mainmenu, 'mo');
+				$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->rights->mrp->read, '', $mainmenu, 'mo');
+			}
 		}
 
 		/*
@@ -1704,10 +1699,10 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$search_project_user = GETPOST('search_project_user', 'int');
 
 				$tmpentry = array(
-                    'enabled'=>(!empty($conf->projet->enabled)),
-				    'perms'=>(!empty($user->rights->projet->lire)),
-                    'module'=>'projet'
-                );
+					'enabled'=>(!empty($conf->projet->enabled)),
+					'perms'=>(!empty($user->rights->projet->lire)),
+					'module'=>'projet'
+				);
 				$showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);
 
 				$titleboth = $langs->trans("LeadsOrProjects");
@@ -1729,14 +1724,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0)
 				{
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-				}
-				elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)
+				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1)
 				{
 					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
-				}
-				elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
+				} elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
 					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
 				}
 
@@ -1752,12 +1745,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				if (empty($conf->global->PROJECT_HIDE_TASKS))
 				{
 					// Project affected to user
-					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire, '',  'project', 'tasks');
+					$newmenu->add("/projet/activity/index.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire, '', 'project', 'tasks');
 					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
 					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);
-				    $newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
+					$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
 
-				    $newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);
+					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);
 				}
 			}
 		}
@@ -1780,19 +1773,19 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			// Leave/Holiday/Vacation module
 			if (!empty($conf->holiday->enabled))
 			{
-			    // Load translation files required by the page
-                $langs->loadLangs(array("holiday", "trips"));
+				// Load translation files required by the page
+				$langs->loadLangs(array("holiday", "trips"));
 
 				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm');
-				$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("New"), 1, $user->rights->holiday->write);
+				$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->rights->holiday->write);
 				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->holiday->read);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm") {
-                    $newmenu->add("/holiday/list.php?search_statut=1&mainmenu=hrm&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);
-				    $newmenu->add("/holiday/list.php?search_statut=2&mainmenu=hrm&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);
-				    $newmenu->add("/holiday/list.php?search_statut=3&mainmenu=hrm&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);
-				    $newmenu->add("/holiday/list.php?search_statut=4&mainmenu=hrm&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);
-                    $newmenu->add("/holiday/list.php?search_statut=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);
-                }
+					$newmenu->add("/holiday/list.php?search_statut=1&mainmenu=hrm&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_statut=2&mainmenu=hrm&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_statut=3&mainmenu=hrm&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_statut=4&mainmenu=hrm&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);
+					$newmenu->add("/holiday/list.php?search_statut=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);
+				}
 				$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);
 				$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->read_all);
 				$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);
@@ -1816,13 +1809,13 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->expensereport->creer);
 				$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->expensereport->lire);
 				if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {
-                    $newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);
-				    $newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);
-				    $newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);
-				    $newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);
-				    $newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);
-                    $newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);
-                }
+					$newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);
+					$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);
+				}
 				$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);
 			}
 
@@ -1882,15 +1875,16 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			if (!empty($conf->adherent->enabled))
 			{
 				// Load translation files required by the page
-                $langs->loadLangs(array("members", "compta"));
+				$langs->loadLangs(array("members", "compta"));
 
 				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members');
 				$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create", $langs->trans("NewMember"), 1, $user->rights->adherent->creer);
 				$newmenu->add("/adherents/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->lire);
 				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->rights->adherent->lire);
 				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1", $langs->trans("MenuMembersValidated"), 2, $user->rights->adherent->lire);
-				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate", $langs->trans("MenuMembersUpToDate"), 2, $user->rights->adherent->lire);
-				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate", $langs->trans("MenuMembersNotUpToDate"), 2, $user->rights->adherent->lire);
+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=withoutsubscription", $langs->trans("WithoutSubscription"), 3, $user->rights->adherent->lire);
+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate", $langs->trans("UpToDate"), 3, $user->rights->adherent->lire);
+				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate", $langs->trans("OutOfDate"), 3, $user->rights->adherent->lire);
 				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=0", $langs->trans("MenuMembersResiliated"), 2, $user->rights->adherent->lire);
 				$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);
 
@@ -1985,14 +1979,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				$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)
 				{
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
-				}
-				else
-				{
+				} else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				}
 			}
@@ -2015,23 +2007,23 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 			$url = $shorturl = $shorturlwithoutparam = $menu_array[$i]['url'];
 			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url']))
 			{
-			    $tmp = explode('?', $menu_array[$i]['url'], 2);
-			    $url = $shorturl = $tmp[0];
-			    $param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link
+				$tmp = explode('?', $menu_array[$i]['url'], 2);
+				$url = $shorturl = $tmp[0];
+				$param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link
 
-			    // 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($menu_array[$i]['mainmenu']))
-			    {
-			        $param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';
-			    }
-			    if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu']))
-			    {
-			        $param .= ($param ? '&' : '').'leftmenu=';
-			    }
-			    //$url.="idmenu=".$menu_array[$i]['rowid'];    // Already done by menuLoad
-			    $url = dol_buildpath($url, 1).($param ? '?'.$param : '');
-			    $shorturlwithoutparam = $shorturl;
-			    $shorturl = $shorturl.($param ? '?'.$param : '');
+				// 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($menu_array[$i]['mainmenu']))
+				{
+					$param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';
+				}
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu']))
+				{
+					$param .= ($param ? '&' : '').'leftmenu=';
+				}
+				//$url.="idmenu=".$menu_array[$i]['rowid'];    // Already done by menuLoad
+				$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
+				$shorturlwithoutparam = $shorturl;
+				$shorturl = $shorturl.($param ? '?'.$param : '');
 			}
 
 
@@ -2050,15 +2042,12 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					else print '</span>';
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
-				}
-				elseif ($showmenu)                 // Not enabled but visible (so greyed)
+				} elseif ($showmenu)                 // Not enabled but visible (so greyed)
 				{
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
-				}
-				else
-				{
-				    $lastlevel0 = 'hidden';
+				} else {
+					$lastlevel0 = 'hidden';
 				}
 				if ($showmenu)
 				{
@@ -2076,15 +2065,14 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
 					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vsmenu">';
+					else print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
 					print $menu_array[$i]['titre'];
 					if ($shorturlwithoutparam) print '</a>';
 					else print '</span>';
 					// If title is not pure text and contains a table, no carriage return added
 					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
 					print '</div>'."\n";
-				}
-				elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
+				} elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 5276a509ae5..c3e6a0bce05 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -66,38 +66,34 @@ class MenuManager
     {
     	global $conf, $user, $langs;
 
-		// On sauve en session le menu principal choisi
-		if (isset($_GET["mainmenu"])) $_SESSION["mainmenu"] = $_GET["mainmenu"];
-		if (isset($_GET["idmenu"]))   $_SESSION["idmenu"] = $_GET["idmenu"];
+		// We save into session the main menu selected
+    	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 (isset($_GET["mainmenu"]))
+		// Read now mainmenu and leftmenu that define which menu to show
+    	if (GETPOSTISSET("mainmenu"))
         {
         	// On sauve en session le menu principal choisi
-        	$mainmenu = $_GET["mainmenu"];
+        	$mainmenu = GETPOST("mainmenu", 'aZ09');
         	$_SESSION["mainmenu"] = $mainmenu;
         	$_SESSION["leftmenuopened"] = "";
-        }
-        else
-        {
+        } 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 (isset($_GET["leftmenu"]))
+        if (GETPOSTISSET("leftmenu"))
         {
         	// On sauve en session le menu principal choisi
-        	$leftmenu = $_GET["leftmenu"];
+        	$leftmenu = GETPOST("leftmenu", 'aZ09');
         	$_SESSION["leftmenu"] = $leftmenu;
 
         	if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
         	{
         		//$leftmenu="";
         		$_SESSION["leftmenuopened"] = "";
-        	}
-        	else
-        	{
+        	} else {
         		$_SESSION["leftmenuopened"] = $leftmenu;
         	}
         } else {
@@ -146,14 +142,11 @@ class MenuManager
         {
         	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
-		{
+        } 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
@@ -215,8 +208,7 @@ class MenuManager
         				{
         					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");
+        				} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
         				print '</a>';
         				print '</li>'."\n";
         			}
@@ -226,13 +218,10 @@ class MenuManager
         			    if ($val['enabled'])
         			    {
         			        $lastlevel[0] = 'enabled';
-        			    }
-        			    elseif ($showmenu)                 // Not enabled but visible (so greyed)
+        			    } elseif ($showmenu)                 // Not enabled but visible (so greyed)
         			    {
         			        $lastlevel[0] = 'greyed';
-        			    }
-        			    else
-        			    {
+        			    } else {
         			        $lastlevel[0] = 'hidden';
         			    }
         			}
@@ -263,9 +252,7 @@ class MenuManager
        						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
        						{
        							$relurl2 = dol_buildpath($val2['url'], 1);
-       						}
-       						else
-       						{
+       						} else {
        							$relurl2 = $val2['url'];
        						}
 	        				$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
@@ -290,21 +277,16 @@ class MenuManager
 		        					//print ' data-ajax="false"';
 		        					print '>';
 		        					$lastlevel2[$val2['level']] = 'enabled';
-	        					}
-	        					else					// Not allowed but visible (greyed)
+	        					} else // Not allowed but visible (greyed)
 	        					{
 				        			print '<a href="#" class="vsmenudisabled">';
 				        			$lastlevel2[$val2['level']] = 'greyed';
 	        					}
-	        				}
-	        				else
-	        				{
+	        				} else {
 	        				    if ($val2['enabled'])	// Allowed
 	        				    {
 	        				        $lastlevel2[$val2['level']] = 'enabled';
-	        				    }
-	        				    else
-	        				    {
+	        				    } else {
 	        				        $lastlevel2[$val2['level']] = 'greyed';
 	        				    }
 	        				}
@@ -313,8 +295,7 @@ class MenuManager
 	        				{
 	        					if ($val2['enabled'])	// Allowed
 	        						print '</a>';
-	        					else
-	        						print '</a>';
+	        					else print '</a>';
 	        				}
 	        				print '</li>'."\n";
        					}
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 923f4e84965..d0f2ae5b7be 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -215,8 +215,7 @@ class MenuManager
 		                {
 		                    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");
+		                } else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
 		                print '</a>';
 		                print '</li>'."\n";
 		            }
@@ -226,13 +225,10 @@ class MenuManager
 		                if ($val['enabled'])
 		                {
 		                    $lastlevel[0] = 'enabled';
-		                }
-		                elseif ($showmenu)                 // Not enabled but visible (so greyed)
+		                } elseif ($showmenu)                 // Not enabled but visible (so greyed)
 		                {
 		                    $lastlevel[0] = 'greyed';
-		                }
-		                else
-		                {
+		                } else {
 		                    $lastlevel[0] = 'hidden';
 		                }
 		            }
@@ -281,21 +277,16 @@ class MenuManager
 		                            //print ' data-ajax="false"';
 		                            print '>';
 		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        }
-		                        else					// Not allowed but visible (greyed)
+		                        } else // Not allowed but visible (greyed)
 		                        {
 		                            print '<a href="#" class="vsmenudisabled">';
 		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
-		                    }
-		                    else
-		                    {
+		                    } else {
 		                        if ($val2['enabled'])	// Allowed
 		                        {
 		                            $lastlevel2[$val2['level']] = 'enabled';
-		                        }
-		                        else
-		                        {
+		                        } else {
 		                            $lastlevel2[$val2['level']] = 'greyed';
 		                        }
 		                    }
@@ -375,9 +366,7 @@ class MenuManager
 						if (($alt % 2 == 0))
 						{
 							print '<div class="blockvmenub lockvmenuimpair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
-						}
-						else
-						{
+						} else {
 							print '<div class="blockvmenu blockvmenupair blockvmenuunique'.($lastopened ? ' blockvmenulast' : '').($alt == 1 ? ' blockvmenufirst' : '').'">'."\n";
 						}
 					}
@@ -397,9 +386,7 @@ class MenuManager
 						if ($this->menu->liste[$i]['enabled'])
 						{
 							print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'</a></div>'."\n";
-						}
-						else
-						{
+						} else {
 							print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu->liste[$i]['titre'].'</font></div>'."\n";
 						}
 						print '<div class="menu_top"></div>'."\n";
@@ -415,13 +402,11 @@ class MenuManager
 						if ($this->menu->liste[$i]['enabled'])
 						{
 							print $tabstring;
-							if ($this->menu->liste[$i]['url']) print '<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';
-							else print '<span class="vsmenu">';
+							if ($this->menu->liste[$i]['url']) print '<a class="vsmenu"  itle="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';
+							else print '<span class="vsmenu" title="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'">';
 							if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].'</a>';
 							else print '</span>';
-						}
-						else
-						{
+						} else {
 							print $tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$this->menu->liste[$i]['titre'].'</font>';
 						}
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index d9f2c97724e..69fce65f781 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -36,2252 +36,2196 @@
  */
 class DolibarrModules // Can not be abstract, because we need to instantiate it into unActivateModule to be able to disable a module whose files were removed.
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
-    /**
-     * @var int Module unique ID
-     * @see https://wiki.dolibarr.org/index.php/List_of_modules_id
-     */
-    public $numero;
+	/**
+	 * @var int Module unique ID
+	 * @see https://wiki.dolibarr.org/index.php/List_of_modules_id
+	 */
+	public $numero;
 
-    /**
-     * @var   string Publisher name
-     * @since 4.0.0
-     */
-    public $editor_name;
+	/**
+	 * @var   string Publisher name
+	 * @since 4.0.0
+	 */
+	public $editor_name;
 
-    /**
-     * @var   string URL of module at publisher site
-     * @since 4.0.0
-     */
-    public $editor_url;
+	/**
+	 * @var   string URL of module at publisher site
+	 * @since 4.0.0
+	 */
+	public $editor_url;
 
-    /**
-     * @var string Family
-     * @see $familyinfo
-     *
-     * Native values: 'crm', 'financial', 'hr', 'projects', 'products', 'ecm', 'technic', 'other'.
-     * Use familyinfo to declare a custom value.
-     */
-    public $family;
+	/**
+	 * @var string Family
+	 * @see $familyinfo
+	 *
+	 * Native values: 'crm', 'financial', 'hr', 'projects', 'products', 'ecm', 'technic', 'other'.
+	 * Use familyinfo to declare a custom value.
+	 */
+	public $family;
 
-    /**
-     * @var array Custom family informations
-     * @see $family
-     *
-     * e.g.:
-     * array(
-     *     'myownfamily' => array(
-     *         'position' => '001',
-     *         'label' => $langs->trans("MyOwnFamily")
-     *     )
-     * );
-     */
-    public $familyinfo;
+	/**
+	 * @var array Custom family informations
+	 * @see $family
+	 *
+	 * e.g.:
+	 * array(
+	 *     'myownfamily' => array(
+	 *         'position' => '001',
+	 *         'label' => $langs->trans("MyOwnFamily")
+	 *     )
+	 * );
+	 */
+	public $familyinfo;
 
-    /**
-     * @var string    Module position on 2 digits
-     */
-    public $module_position = '50';
+	/**
+	 * @var string    Module position on 2 digits
+	 */
+	public $module_position = '50';
 
-    /**
-     * @var string Module name
-     *
-     * Only used if Module[ID]Name translation string is not found.
-     *
-     * You can use the following code to automatically derive it from your module's class name:
-     * preg_replace('/^mod/i', '', get_class($this))
-     */
-    public $name;
+	/**
+	 * @var string Module name
+	 *
+	 * Only used if Module[ID]Name translation string is not found.
+	 *
+	 * You can use the following code to automatically derive it from your module's class name:
+	 * preg_replace('/^mod/i', '', get_class($this))
+	 */
+	public $name;
 
-    /**
-     * @var string[] Paths to create when module is activated
-     *
-     * e.g.: array('/mymodule/temp')
-     */
-    public $dirs = array();
+	/**
+	 * @var string[] Paths to create when module is activated
+	 *
+	 * e.g.: array('/mymodule/temp')
+	 */
+	public $dirs = array();
 
-    /**
-     * @var array Module boxes
-     */
-    public $boxes = array();
+	/**
+	 * @var array Module boxes
+	 */
+	public $boxes = array();
 
-    /**
-     * @var array Module constants
-     */
-    public $const = array();
+	/**
+	 * @var array Module constants
+	 */
+	public $const = array();
 
-    /**
-     * @var array Module cron jobs entries
-     */
-    public $cronjobs = array();
+	/**
+	 * @var array Module cron jobs entries
+	 */
+	public $cronjobs = array();
 
-    /**
-     * @var array Module access rights
-     */
-    public $rights;
+	/**
+	 * @var array Module access rights
+	 */
+	public $rights;
 
-    /**
-     * @var string Module access rights family
-     */
-    public $rights_class;
+	/**
+	 * @var string Module access rights family
+	 */
+	public $rights_class;
 
-    /**
-     * @var array Module menu entries
-     */
-    public $menu = array();
+	/**
+	 * @var array|int 	Module menu entries (1 means the menu entries are not declared into module descriptor but are hardcoded into menu manager)
+	 */
+	public $menu = array();
 
-    /**
-     * @var array Module parts
-     *  array(
-     *      // Set this to 1 if module has its own trigger directory (/mymodule/core/triggers)
-     *      'triggers' => 0,
-     *      // Set this to 1 if module has its own login method directory (/mymodule/core/login)
-     *      'login' => 0,
-     *      // Set this to 1 if module has its own substitution function file (/mymodule/core/substitutions)
-     *      'substitutions' => 0,
-     *      // Set this to 1 if module has its own menus handler directory (/mymodule/core/menus)
-     *      'menus' => 0,
-     *      // Set this to 1 if module has its own theme directory (/mymodule/theme)
-     *      'theme' => 0,
-     *      // Set this to 1 if module overwrite template dir (/mymodule/core/tpl)
-     *      'tpl' => 0,
-     *      // Set this to 1 if module has its own barcode directory (/mymodule/core/modules/barcode)
-     *      'barcode' => 0,
-     *      // Set this to 1 if module has its own models directory (/mymodule/core/modules/xxx)
-     *      'models' => 0,
-     *      // Set this to relative path of css file if module has its own css file
-     *      'css' => '/mymodule/css/mymodule.css.php',
-     *      // Set this to relative path of js file if module must load a js on all pages
-     *      'js' => '/mymodule/js/mymodule.js',
-     *      // Set here all hooks context managed by module
-     *      'hooks' => array('hookcontext1','hookcontext2')
-     *  )
-     */
-    public $module_parts = array();
+	/**
+	 * @var array Module parts
+	 *  array(
+	 *      // Set this to 1 if module has its own trigger directory (/mymodule/core/triggers)
+	 *      'triggers' => 0,
+	 *      // Set this to 1 if module has its own login method directory (/mymodule/core/login)
+	 *      'login' => 0,
+	 *      // Set this to 1 if module has its own substitution function file (/mymodule/core/substitutions)
+	 *      'substitutions' => 0,
+	 *      // Set this to 1 if module has its own menus handler directory (/mymodule/core/menus)
+	 *      'menus' => 0,
+	 *      // Set this to 1 if module has its own theme directory (/mymodule/theme)
+	 *      'theme' => 0,
+	 *      // Set this to 1 if module overwrite template dir (/mymodule/core/tpl)
+	 *      'tpl' => 0,
+	 *      // Set this to 1 if module has its own barcode directory (/mymodule/core/modules/barcode)
+	 *      'barcode' => 0,
+	 *      // Set this to 1 if module has its own models directory (/mymodule/core/modules/xxx)
+	 *      'models' => 0,
+	 *      // Set this to relative path of css file if module has its own css file
+	 *      'css' => '/mymodule/css/mymodule.css.php',
+	 *      // Set this to relative path of js file if module must load a js on all pages
+	 *      'js' => '/mymodule/js/mymodule.js',
+	 *      // Set here all hooks context managed by module
+	 *      'hooks' => array('hookcontext1','hookcontext2')
+	 *  )
+	 */
+	public $module_parts = array();
 
-    /**
-     * @var        string Module documents ?
-     * @deprecated Seems unused anywhere
-     */
-    public $docs;
+	/**
+	 * @var        string Module documents ?
+	 * @deprecated Seems unused anywhere
+	 */
+	public $docs;
 
-    /**
-     * @var        string ?
-     * @deprecated Seems unused anywhere
-     */
-    public $dbversion = "-";
+	/**
+	 * @var        string ?
+	 * @deprecated Seems unused anywhere
+	 */
+	public $dbversion = "-";
 
-    /**
-     * @var string Error message
-     */
-    public $error;
+	/**
+	 * @var string Error message
+	 */
+	public $error;
 
-    /**
-     * @var string Module version
-     * @see http://semver.org
-     *
-     * The following keywords can also be used:
-     * 'development'
-     * 'experimental'
-     * 'dolibarr': only for core modules that share its version
-     * 'dolibarr_deprecated': only for deprecated core modules
-     */
-    public $version;
+	/**
+	 * @var string Module version
+	 * @see http://semver.org
+	 *
+	 * The following keywords can also be used:
+	 * 'development'
+	 * 'experimental'
+	 * 'dolibarr': only for core modules that share its version
+	 * 'dolibarr_deprecated': only for deprecated core modules
+	 */
+	public $version;
 
-    /**
-     * @var string Module description (short text)
-     *
-     * Only used if Module[ID]Desc translation string is not found.
-     */
-    public $description;
+	/**
+	 * @var string Module description (short text)
+	 *
+	 * Only used if Module[ID]Desc translation string is not found.
+	 */
+	public $description;
 
-    /**
-     * @var   string Module description (long text)
-     * @since 4.0.0
-     *
-     * HTML content supported.
-     */
-    public $descriptionlong;
+	/**
+	 * @var   string Module description (long text)
+	 * @since 4.0.0
+	 *
+	 * HTML content supported.
+	 */
+	public $descriptionlong;
 
 
-    // For exports
+	// For exports
 
-    /**
-     * @var string Module export code
-     */
-    public $export_code;
+	/**
+	 * @var string Module export code
+	 */
+	public $export_code;
 
-    /**
-     * @var string Module export label
-     */
-    public $export_label;
+	/**
+	 * @var string Module export label
+	 */
+	public $export_label;
 
-    public $export_permission;
-    public $export_fields_array;
-    public $export_TypeFields_array; // Array of key=>type where type can be 'Numeric', 'Date', 'Text', 'Boolean', 'Status', 'List:xxx:login:rowid'
-    public $export_entities_array;
-    public $export_special_array; // special or computed field
-    public $export_dependencies_array;
-    public $export_sql_start;
-    public $export_sql_end;
-    public $export_sql_order;
+	public $export_permission;
+	public $export_fields_array;
+	public $export_TypeFields_array; // Array of key=>type where type can be 'Numeric', 'Date', 'Text', 'Boolean', 'Status', 'List:xxx:login:rowid'
+	public $export_entities_array;
+	public $export_special_array; // special or computed field
+	public $export_dependencies_array;
+	public $export_sql_start;
+	public $export_sql_end;
+	public $export_sql_order;
 
 
-    // For import
+	// For import
 
-    /**
-     * @var string Module import code
-     */
-    public $import_code;
+	/**
+	 * @var string Module import code
+	 */
+	public $import_code;
 
-    /**
-     * @var string Module import label
-     */
-    public $import_label;
+	/**
+	 * @var string Module import label
+	 */
+	public $import_label;
 
 
-    /**
-     * @var string Module constant name
-     */
-    public $const_name;
+	/**
+	 * @var string Module constant name
+	 */
+	public $const_name;
 
-    /**
-     * @var bool Module can't be disabled
-     */
-    public $always_enabled;
+	/**
+	 * @var bool Module can't be disabled
+	 */
+	public $always_enabled;
 
-    /**
-     * @var int Module is enabled globally (Multicompany support)
-     */
-    public $core_enabled;
+	/**
+	 * @var int Module is enabled globally (Multicompany support)
+	 */
+	public $core_enabled;
 
-    /**
-     * @var string Name of image file used for this module
-     *
-     * If file is in theme/yourtheme/img directory under name object_pictoname.png use 'pictoname'
-     * If file is in module/img directory under name object_pictoname.png use 'pictoname@module'
-     */
-    public $picto;
+	/**
+	 * @var string Name of image file used for this module
+	 *
+	 * If file is in theme/yourtheme/img directory under name object_pictoname.png use 'pictoname'
+	 * If file is in module/img directory under name object_pictoname.png use 'pictoname@module'
+	 */
+	public $picto;
 
-    /**
-     * @var string[] List of config pages
-     *
-     * Name of php pages stored into module/admin directory, used to setup module.
-     * e.g.: "admin.php@module"
-     */
-    public $config_page_url;
+	/**
+	 * @var string[] List of config pages
+	 *
+	 * Name of php pages stored into module/admin directory, used to setup module.
+	 * e.g.: "admin.php@module"
+	 */
+	public $config_page_url;
 
 
-    /**
-     * @var string[] List of module class names that must be enabled if this module is enabled. e.g.: array('modAnotherModule', 'FR'=>'modYetAnotherModule')
+	/**
+	 * @var string[] List of module class names that must be enabled if this module is enabled. e.g.: array('modAnotherModule', 'FR'=>'modYetAnotherModule')
 	 * @see $requiredby
-     */
-    public $depends;
-
-    /**
-     * @var string[] List of module class names to disable if the module is disabled.
-     * @see $depends
-     */
-    public $requiredby;
-
-    /**
-     * @var string[] List of module class names as string this module is in conflict with.
-     * @see $depends
-     */
-    public $conflictwith;
-
-    /**
-     * @var string[] Module language files
-     */
-    public $langfiles;
-
-    /**
-     * @var array<string,string> Array of warnings to show when we activate the module
-     *
-     * array('always'='text') or array('FR'='text')
-     */
-    public $warnings_activation;
-
-    /**
-     * @var array<string,string> Array of warnings to show when we activate an external module
-     *
-     * array('always'='text') or array('FR'='text')
-     */
-    public $warnings_activation_ext;
-
-
-    /**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.4 = array(5, 4)
-     */
-    public $phpmin;
-
-    /**
-     * @var array Minimum version of Dolibarr required by module.
-     * e.g.: Dolibarr ≥ 3.6 = array(3, 6)
-     */
-    public $need_dolibarr_version;
-
-    /**
-     * @var bool Whether to hide the module.
-     */
-    public $hidden = false;
-
-
-
-
-
-    /**
-     * Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
-    // We should but can't set this as abstract because this will make dolibarr hang
-    // after migration due to old module not implementing. We must wait PHP is able to make
-    // a try catch on Fatal error to manage this correctly.
-    // We need constructor into function unActivateModule into admin.lib.php
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Enables a module.
-     * Inserts all informations into database
-     *
-     * @param array  $array_sql SQL requests to be executed when enabling module
-     * @param string $options   String with options when disabling module:
-     *                          - 'noboxes' = Do not insert boxes -
-     *                          'newboxdefonly' = For boxes, insert def of
-     *                          boxes only and not boxes activation
-     *
-     * @return int                         1 if OK, 0 if KO
-     */
-    protected function _init($array_sql, $options = '')
-    {
-        // phpcs:enable
-        global $conf;
-        $err = 0;
-
-        $this->db->begin();
-
-        // Insert activation module constant
-        if (!$err) {
-            $err += $this->_active();
-        }
-
-        // Insert new pages for tabs (into llx_const)
-        if (!$err) {
-            $err += $this->insert_tabs();
-        }
-
-        // Insert activation of module's parts
-        if (!$err) {
-            $err += $this->insert_module_parts();
-        }
-
-        // Insert constant defined by modules (into llx_const)
-        if (!$err && !preg_match('/newboxdefonly/', $options)) {
-            $err += $this->insert_const(); // Test on newboxdefonly to avoid to erase value during upgrade
-        }
-
-        // Insert boxes def into llx_boxes_def and boxes setup (into llx_boxes)
-        if (!$err && !preg_match('/noboxes/', $options)) {
-            $err += $this->insert_boxes($options);
-        }
-
-        // Insert cron job entries (entry in llx_cronjobs)
-        if (!$err) {
-            $err += $this->insert_cronjobs();
-        }
-
-        // Insert permission definitions of module into llx_rights_def. If user is admin, grant this permission to user.
-        if (!$err) {
-            $err += $this->insert_permissions(1, null, 1);
-        }
-
-        // Insert specific menus entries into database
-        if (!$err) {
-            $err += $this->insert_menus();
-        }
-
-        // Create module's directories
-        if (!$err) {
-            $err += $this->create_dirs();
-        }
-
-        // Execute addons requests
-        $num = count($array_sql);
-        for ($i = 0; $i < $num; $i++)
-        {
-            if (!$err) {
-                $val = $array_sql[$i];
-                $sql = $val;
-                $ignoreerror = 0;
-                if (is_array($val)) {
-                    $sql = $val['sql'];
-                    $ignoreerror = $val['ignoreerror'];
-                }
-                // Add current entity id
-                $sql = str_replace('__ENTITY__', $conf->entity, $sql);
-
-                dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror."", LOG_DEBUG);
-                $result = $this->db->query($sql, $ignoreerror);
-                if (!$result) {
-                    if (!$ignoreerror) {
-                         $this->error = $this->db->lasterror();
-                         $err++;
-                    }
-                    else
-                    {
-                         dol_syslog(get_class($this)."::_init Warning ".$this->db->lasterror(), LOG_WARNING);
-                    }
-                }
-            }
-        }
-
-        // Return code
-        if (!$err) {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->db->rollback();
-            return 0;
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Disable function. Deletes the module constants and boxes from the database.
-     *
-     * @param string[] $array_sql SQL requests to be executed when module is disabled
-     * @param string   $options   Options when disabling module:
-     *
-     * @return int                     1 if OK, 0 if KO
-     */
-    protected function _remove($array_sql, $options = '')
-    {
-        // phpcs:enable
-        $err = 0;
-
-        $this->db->begin();
-
-        // Remove activation module line (constant MAIN_MODULE_MYMODULE in llx_const)
-        if (!$err) {
-            $err += $this->_unactive();
-        }
-
-        // Remove activation of module's new tabs (MAIN_MODULE_MYMODULE_TABS_XXX in llx_const)
-        if (!$err) {
-            $err += $this->delete_tabs();
-        }
-
-        // Remove activation of module's parts (MAIN_MODULE_MYMODULE_XXX in llx_const)
-        if (!$err) {
-            $err += $this->delete_module_parts();
-        }
-
-        // Remove constants defined by modules
-        if (!$err) {
-            $err += $this->delete_const();
-        }
-
-        // Remove list of module's available boxes (entry in llx_boxes)
-        if (!$err && !preg_match('/(newboxdefonly|noboxes)/', $options)) {
-            $err += $this->delete_boxes(); // We don't have to delete if option ask to keep boxes safe or ask to add new box def only
-        }
-
-        // Remove list of module's cron job entries (entry in llx_cronjobs)
-        if (!$err) {
-            $err += $this->delete_cronjobs();
-        }
-
-        // Remove module's permissions from list of available permissions (entries in llx_rights_def)
-        if (!$err) {
-            $err += $this->delete_permissions();
-        }
-
-        // Remove module's menus (entries in llx_menu)
-        if (!$err) {
-            $err += $this->delete_menus();
-        }
-
-        // Remove module's directories
-        if (!$err) {
-            $err += $this->delete_dirs();
-        }
-
-        // Run complementary sql requests
-        $num = count($array_sql);
-        for ($i = 0; $i < $num; $i++)
-        {
-            if (!$err) {
-                dol_syslog(get_class($this)."::_remove", LOG_DEBUG);
-                $result = $this->db->query($array_sql[$i]);
-                if (!$result) {
-                    $this->error = $this->db->error();
-                    $err++;
-                }
-            }
-        }
-
-        // Return code
-        if (!$err) {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->db->rollback();
-            return 0;
-        }
-    }
-
-
-    /**
-     * Gives the translated module name if translation exists in admin.lang or into language files of module.
-     * Otherwise return the module key name.
-     *
-     * @return string  Translated module name
-     */
-    public function getName()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($langs->transnoentitiesnoconv("Module".$this->numero."Name") != ("Module".$this->numero."Name")) {
-            // If module name translation exists
-            return $langs->transnoentitiesnoconv("Module".$this->numero."Name");
-        }
-        else
-        {
-            // If module name translation using it's unique id does not exist, we try to use its name to find translation
-            if (is_array($this->langfiles)) {
-                foreach ($this->langfiles as $val)
-                {
-                    if ($val) { $langs->load($val);
-                    }
-                }
-            }
-
-            if ($langs->trans("Module".$this->name."Name") != ("Module".$this->name."Name")) {
-                // If module name translation exists
-                return $langs->transnoentitiesnoconv("Module".$this->name."Name");
-            }
-
-            // Last chance with simple label
-            return $langs->transnoentitiesnoconv($this->name);
-        }
-    }
-
-
-    /**
-     * Gives the translated module description if translation exists in admin.lang or the default module description
-     *
-     * @return string  Translated module description
-     */
-    public function getDesc()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($langs->transnoentitiesnoconv("Module".$this->numero."Desc") != ("Module".$this->numero."Desc")) {
-            // If module description translation exists
-            return $langs->transnoentitiesnoconv("Module".$this->numero."Desc");
-        }
-        else
-        {
-            // If module description translation does not exist using its unique id, we can use its name to find translation
-            if (is_array($this->langfiles)) {
-                foreach ($this->langfiles as $val)
-                {
-                    if ($val) { $langs->load($val);
-                    }
-                }
-            }
-
-            if ($langs->transnoentitiesnoconv("Module".$this->name."Desc") != ("Module".$this->name."Desc")) {
-                // If module name translation exists
-                return $langs->trans("Module".$this->name."Desc");
-            }
-
-            // Last chance with simple label
-            return $langs->trans($this->description);
-        }
-    }
-
-    /**
-     * Gives the long description of a module. First check README-la_LA.md then README.md
-     * If no markdown files found, it returns translated value of the key ->descriptionlong.
-     *
-     * @return string     Long description of a module from README.md of from property.
-     */
-    public function getDescLong()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-
-        $pathoffile = $this->getDescLongReadmeFound();
-
-        if ($pathoffile)     // Mostly for external modules
-        {
-            $content = file_get_contents($pathoffile);
-
-            if ((float) DOL_VERSION >= 6.0) {
-                @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
-
-                $content = dolMd2Html(
-                    $content,
-                    'parsedown',
-                    array(
-                        'doc/' => dol_buildpath(strtolower($this->name).'/doc/', 1),
-                        'img/' => dol_buildpath(strtolower($this->name).'/img/', 1),
-                        'images/' => dol_buildpath(strtolower($this->name).'/images/', 1),
-                    )
-                );
-            }
-            else
-            {
-                $content = nl2br($content);
-            }
-        }
-        else
-        {
-            // Mostly for internal modules
-            if (!empty($this->descriptionlong)) {
-                if (is_array($this->langfiles)) {
-                    foreach ($this->langfiles as $val)
-                    {
-                        if ($val) { $langs->load($val);
-                        }
-                    }
-                }
-
-                $content = $langs->transnoentitiesnoconv($this->descriptionlong);
-            }
-        }
-
-        return $content;
-    }
-
-    /**
-     * Return path of file if a README file was found.
-     *
-     * @return string      Path of file if a README file was found.
-     */
-    public function getDescLongReadmeFound()
-    {
-        global $langs;
-
-        $filefound = false;
-
-        // Define path to file README.md.
-        // First check README-la_LA.md then README-la.md then README.md
-        $pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$langs->defaultlang.'.md', 0);
-        if (dol_is_file($pathoffile)) {
-            $filefound = true;
-        }
-        if (!$filefound) {
-            $tmp = explode('_', $langs->defaultlang);
-            $pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$tmp[0].'.md', 0);
-            if (dol_is_file($pathoffile)) {
-                $filefound = true;
-            }
-        }
-        if (!$filefound) {
-            $pathoffile = dol_buildpath(strtolower($this->name).'/README.md', 0);
-            if (dol_is_file($pathoffile)) {
-                $filefound = true;
-            }
-        }
-
-        return ($filefound ? $pathoffile : '');
-    }
-
-
-    /**
-     * Gives the changelog. First check ChangeLog-la_LA.md then ChangeLog.md
-     *
-     * @return string  Content of ChangeLog
-     */
-    public function getChangeLog()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-
-        $filefound = false;
-
-        // Define path to file README.md.
-        // First check ChangeLog-la_LA.md then ChangeLog.md
-        $pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog-'.$langs->defaultlang.'.md', 0);
-        if (dol_is_file($pathoffile)) {
-            $filefound = true;
-        }
-        if (!$filefound) {
-            $pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog.md', 0);
-            if (dol_is_file($pathoffile)) {
-                $filefound = true;
-            }
-        }
-
-        if ($filefound)     // Mostly for external modules
-        {
-            $content = file_get_contents($pathoffile);
-
-            if ((float) DOL_VERSION >= 6.0) {
-                @include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
-                $content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1)));
-            }
-            else
-            {
-                $content = nl2br($content);
-            }
-        }
-
-        return $content;
-    }
-
-    /**
-     * Gives the publisher name
-     *
-     * @return string  Publisher name
-     */
-    public function getPublisher()
-    {
-        return $this->editor_name;
-    }
-
-    /**
-     * Gives the publisher url
-     *
-     * @return string  Publisher url
-     */
-    public function getPublisherUrl()
-    {
-        return $this->editor_url;
-    }
-
-    /**
-     * Gives module version (translated if param $translated is on)
-     * For 'experimental' modules, gives 'experimental' translation
-     * For 'dolibarr' modules, gives Dolibarr version
-     *
-     * @param  int $translated 1=Special version keys are translated, 0=Special version keys are not translated
-     * @return string                  Module version
-     */
-    public function getVersion($translated = 1)
-    {
-        global $langs;
-        $langs->load("admin");
-
-        $ret = '';
-
-        $newversion = preg_replace('/_deprecated/', '', $this->version);
-        if ($newversion == 'experimental') {
-            $ret = ($translated ? $langs->transnoentitiesnoconv("VersionExperimental") : $newversion);
-        } elseif ($newversion == 'development') {
-            $ret = ($translated ? $langs->transnoentitiesnoconv("VersionDevelopment") : $newversion);
-        } elseif ($newversion == 'dolibarr') {
-            $ret = DOL_VERSION;
-        } elseif ($newversion) {
-            $ret = $newversion;
-        } else {
-            $ret = ($translated ? $langs->transnoentitiesnoconv("VersionUnknown") : 'unknown');
-        }
-
-        if (preg_match('/_deprecated/', $this->version)) {
-            $ret .= ($translated ? ' ('.$langs->transnoentitiesnoconv("Deprecated").')' : $this->version);
-        }
-        return $ret;
-    }
-
-
-    /**
-     * Tells if module is core or external
-     *
-     * @return string  'core', 'external' or 'unknown'
-     */
-    public function isCoreOrExternalModule()
-    {
-        if ($this->version == 'dolibarr' || $this->version == 'dolibarr_deprecated') {
-            return 'core';
-        }
-        if (!empty($this->version) && !in_array($this->version, array('experimental', 'development'))) {
-            return 'external';
-        }
-        if (!empty($this->editor_name) || !empty($this->editor_url)) {
-            return 'external';
-        }
-        if ($this->numero >= 100000) {
-            return 'external';
-        }
-        return 'unknown';
-    }
-
-
-    /**
-     * Gives module related language files list
-     *
-     * @return string[]    Language files list
-     */
-    public function getLangFilesArray()
-    {
-        return $this->langfiles;
-    }
-
-    /**
-     * Gives translated label of an export dataset
-     *
-     * @param int $r Dataset index
-     *
-     * @return string       Translated databaset label
-     */
-    public function getExportDatasetLabel($r)
-    {
-        global $langs;
-
-        $langstring = "ExportDataset_".$this->export_code[$r];
-        if ($langs->trans($langstring) == $langstring) {
-            // Translation not found
-            return $langs->trans($this->export_label[$r]);
-        }
-        else
-        {
-            // Translation found
-            return $langs->trans($langstring);
-        }
-    }
-
-
-    /**
-     * Gives translated label of an import dataset
-     *
-     * @param int $r Dataset index
-     *
-     * @return string      Translated dataset label
-     */
-    public function getImportDatasetLabel($r)
-    {
-        global $langs;
-
-        $langstring = "ImportDataset_".$this->import_code[$r];
-        //print "x".$langstring;
-        if ($langs->trans($langstring) == $langstring) {
-            // Translation not found
-            return $langs->transnoentitiesnoconv($this->import_label[$r]);
-        }
-        else
-        {
-            // Translation found
-            return $langs->transnoentitiesnoconv($langstring);
-        }
-    }
-
-
-    /**
-     * Gives the last date of activation
-     *
-     * @return 	int|string       	Date of last activation or '' if module was never activated
-     */
-    public function getLastActivationDate()
-    {
-        global $conf;
-
-        $err = 0;
-
-        $sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
-        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql .= " AND entity IN (0, ".$conf->entity.")";
-
-        dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $err++;
-        }
-        else
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj) {
-                return $this->db->jdate($obj->tms);
-            }
-        }
-
-        return '';
-    }
-
-
-    /**
-     * Gives the last author of activation
-     *
-     * @return array       Array array('authorid'=>Id of last activation user, 'lastactivationdate'=>Date of last activation)
-     */
-    public function getLastActivationInfo()
-    {
-        global $conf;
-
-        $err = 0;
+	 */
+	public $depends;
+
+	/**
+	 * @var string[] List of module class names to disable if the module is disabled.
+	 * @see $depends
+	 */
+	public $requiredby;
+
+	/**
+	 * @var string[] List of module class names as string this module is in conflict with.
+	 * @see $depends
+	 */
+	public $conflictwith;
+
+	/**
+	 * @var string[] Module language files
+	 */
+	public $langfiles;
+
+	/**
+	 * @var array<string,string> Array of warnings to show when we activate the module
+	 *
+	 * array('always'='text') or array('FR'='text')
+	 */
+	public $warnings_activation;
+
+	/**
+	 * @var array<string,string> Array of warnings to show when we activate an external module
+	 *
+	 * array('always'='text') or array('FR'='text')
+	 */
+	public $warnings_activation_ext;
+
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.4 = array(5, 4)
+	 */
+	public $phpmin;
+
+	/**
+	 * @var array Minimum version of Dolibarr required by module.
+	 * e.g.: Dolibarr ≥ 3.6 = array(3, 6)
+	 */
+	public $need_dolibarr_version;
+
+	/**
+	 * @var bool Whether to hide the module.
+	 */
+	public $hidden = false;
+
+
+
+
+
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
+	// We should but can't set this as abstract because this will make dolibarr hang
+	// after migration due to old module not implementing. We must wait PHP is able to make
+	// a try catch on Fatal error to manage this correctly.
+	// We need constructor into function unActivateModule into admin.lib.php
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Enables a module.
+	 * Inserts all informations into database
+	 *
+	 * @param array  $array_sql SQL requests to be executed when enabling module
+	 * @param string $options   String with options when disabling module:
+	 *                          - 'noboxes' = Do not insert boxes -
+	 *                          'newboxdefonly' = For boxes, insert def of
+	 *                          boxes only and not boxes activation
+	 *
+	 * @return int                         1 if OK, 0 if KO
+	 */
+	protected function _init($array_sql, $options = '')
+	{
+		// phpcs:enable
+		global $conf;
+		$err = 0;
+
+		$this->db->begin();
+
+		// Insert activation module constant
+		if (!$err) {
+			$err += $this->_active();
+		}
+
+		// Insert new pages for tabs (into llx_const)
+		if (!$err) {
+			$err += $this->insert_tabs();
+		}
+
+		// Insert activation of module's parts
+		if (!$err) {
+			$err += $this->insert_module_parts();
+		}
+
+		// Insert constant defined by modules (into llx_const)
+		if (!$err && !preg_match('/newboxdefonly/', $options)) {
+			$err += $this->insert_const(); // Test on newboxdefonly to avoid to erase value during upgrade
+		}
+
+		// Insert boxes def into llx_boxes_def and boxes setup (into llx_boxes)
+		if (!$err && !preg_match('/noboxes/', $options)) {
+			$err += $this->insert_boxes($options);
+		}
+
+		// Insert cron job entries (entry in llx_cronjobs)
+		if (!$err) {
+			$err += $this->insert_cronjobs();
+		}
+
+		// Insert permission definitions of module into llx_rights_def. If user is admin, grant this permission to user.
+		if (!$err) {
+			$err += $this->insert_permissions(1, null, 1);
+		}
+
+		// Insert specific menus entries into database
+		if (!$err) {
+			$err += $this->insert_menus();
+		}
+
+		// Create module's directories
+		if (!$err) {
+			$err += $this->create_dirs();
+		}
+
+		// Execute addons requests
+		$num = count($array_sql);
+		for ($i = 0; $i < $num; $i++)
+		{
+			if (!$err) {
+				$val = $array_sql[$i];
+				$sql = $val;
+				$ignoreerror = 0;
+				if (is_array($val)) {
+					$sql = $val['sql'];
+					$ignoreerror = $val['ignoreerror'];
+				}
+				// Add current entity id
+				$sql = str_replace('__ENTITY__', $conf->entity, $sql);
+
+				dol_syslog(get_class($this)."::_init ignoreerror=".$ignoreerror."", LOG_DEBUG);
+				$result = $this->db->query($sql, $ignoreerror);
+				if (!$result) {
+					if (!$ignoreerror) {
+						 $this->error = $this->db->lasterror();
+						 $err++;
+					} else {
+						 dol_syslog(get_class($this)."::_init Warning ".$this->db->lasterror(), LOG_WARNING);
+					}
+				}
+			}
+		}
+
+		// Return code
+		if (!$err) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return 0;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Disable function. Deletes the module constants and boxes from the database.
+	 *
+	 * @param string[] $array_sql SQL requests to be executed when module is disabled
+	 * @param string   $options   Options when disabling module:
+	 *
+	 * @return int                     1 if OK, 0 if KO
+	 */
+	protected function _remove($array_sql, $options = '')
+	{
+		// phpcs:enable
+		$err = 0;
+
+		$this->db->begin();
+
+		// Remove activation module line (constant MAIN_MODULE_MYMODULE in llx_const)
+		if (!$err) {
+			$err += $this->_unactive();
+		}
+
+		// Remove activation of module's new tabs (MAIN_MODULE_MYMODULE_TABS_XXX in llx_const)
+		if (!$err) {
+			$err += $this->delete_tabs();
+		}
+
+		// Remove activation of module's parts (MAIN_MODULE_MYMODULE_XXX in llx_const)
+		if (!$err) {
+			$err += $this->delete_module_parts();
+		}
+
+		// Remove constants defined by modules
+		if (!$err) {
+			$err += $this->delete_const();
+		}
+
+		// Remove list of module's available boxes (entry in llx_boxes)
+		if (!$err && !preg_match('/(newboxdefonly|noboxes)/', $options)) {
+			$err += $this->delete_boxes(); // We don't have to delete if option ask to keep boxes safe or ask to add new box def only
+		}
+
+		// Remove list of module's cron job entries (entry in llx_cronjobs)
+		if (!$err) {
+			$err += $this->delete_cronjobs();
+		}
+
+		// Remove module's permissions from list of available permissions (entries in llx_rights_def)
+		if (!$err) {
+			$err += $this->delete_permissions();
+		}
+
+		// Remove module's menus (entries in llx_menu)
+		if (!$err) {
+			$err += $this->delete_menus();
+		}
+
+		// Remove module's directories
+		if (!$err) {
+			$err += $this->delete_dirs();
+		}
+
+		// Run complementary sql requests
+		$num = count($array_sql);
+		for ($i = 0; $i < $num; $i++)
+		{
+			if (!$err) {
+				dol_syslog(get_class($this)."::_remove", LOG_DEBUG);
+				$result = $this->db->query($array_sql[$i]);
+				if (!$result) {
+					$this->error = $this->db->error();
+					$err++;
+				}
+			}
+		}
+
+		// Return code
+		if (!$err) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return 0;
+		}
+	}
+
+
+	/**
+	 * Gives the translated module name if translation exists in admin.lang or into language files of module.
+	 * Otherwise return the module key name.
+	 *
+	 * @return string  Translated module name
+	 */
+	public function getName()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($langs->transnoentitiesnoconv("Module".$this->numero."Name") != ("Module".$this->numero."Name")) {
+			// If module name translation exists
+			return $langs->transnoentitiesnoconv("Module".$this->numero."Name");
+		} else {
+			// If module name translation using it's unique id does not exist, we try to use its name to find translation
+			if (is_array($this->langfiles)) {
+				foreach ($this->langfiles as $val)
+				{
+					if ($val) { $langs->load($val);
+					}
+				}
+			}
+
+			if ($langs->trans("Module".$this->name."Name") != ("Module".$this->name."Name")) {
+				// If module name translation exists
+				return $langs->transnoentitiesnoconv("Module".$this->name."Name");
+			}
+
+			// Last chance with simple label
+			return $langs->transnoentitiesnoconv($this->name);
+		}
+	}
+
+
+	/**
+	 * Gives the translated module description if translation exists in admin.lang or the default module description
+	 *
+	 * @return string  Translated module description
+	 */
+	public function getDesc()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($langs->transnoentitiesnoconv("Module".$this->numero."Desc") != ("Module".$this->numero."Desc")) {
+			// If module description translation exists
+			return $langs->transnoentitiesnoconv("Module".$this->numero."Desc");
+		} else {
+			// If module description translation does not exist using its unique id, we can use its name to find translation
+			if (is_array($this->langfiles)) {
+				foreach ($this->langfiles as $val)
+				{
+					if ($val) { $langs->load($val);
+					}
+				}
+			}
+
+			if ($langs->transnoentitiesnoconv("Module".$this->name."Desc") != ("Module".$this->name."Desc")) {
+				// If module name translation exists
+				return $langs->trans("Module".$this->name."Desc");
+			}
+
+			// Last chance with simple label
+			return $langs->trans($this->description);
+		}
+	}
+
+	/**
+	 * Gives the long description of a module. First check README-la_LA.md then README.md
+	 * If no markdown files found, it returns translated value of the key ->descriptionlong.
+	 *
+	 * @return string     Long description of a module from README.md of from property.
+	 */
+	public function getDescLong()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+		$pathoffile = $this->getDescLongReadmeFound();
+
+		if ($pathoffile)     // Mostly for external modules
+		{
+			$content = file_get_contents($pathoffile);
+
+			if ((float) DOL_VERSION >= 6.0) {
+				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
+
+				$content = dolMd2Html(
+					$content,
+					'parsedown',
+					array(
+						'doc/' => dol_buildpath(strtolower($this->name).'/doc/', 1),
+						'img/' => dol_buildpath(strtolower($this->name).'/img/', 1),
+						'images/' => dol_buildpath(strtolower($this->name).'/images/', 1),
+					)
+				);
+			} else {
+				$content = nl2br($content);
+			}
+		} else {
+			// Mostly for internal modules
+			if (!empty($this->descriptionlong)) {
+				if (is_array($this->langfiles)) {
+					foreach ($this->langfiles as $val)
+					{
+						if ($val) { $langs->load($val);
+						}
+					}
+				}
+
+				$content = $langs->transnoentitiesnoconv($this->descriptionlong);
+			}
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Return path of file if a README file was found.
+	 *
+	 * @return string      Path of file if a README file was found.
+	 */
+	public function getDescLongReadmeFound()
+	{
+		global $langs;
+
+		$filefound = false;
+
+		// Define path to file README.md.
+		// First check README-la_LA.md then README-la.md then README.md
+		$pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$langs->defaultlang.'.md', 0);
+		if (dol_is_file($pathoffile)) {
+			$filefound = true;
+		}
+		if (!$filefound) {
+			$tmp = explode('_', $langs->defaultlang);
+			$pathoffile = dol_buildpath(strtolower($this->name).'/README-'.$tmp[0].'.md', 0);
+			if (dol_is_file($pathoffile)) {
+				$filefound = true;
+			}
+		}
+		if (!$filefound) {
+			$pathoffile = dol_buildpath(strtolower($this->name).'/README.md', 0);
+			if (dol_is_file($pathoffile)) {
+				$filefound = true;
+			}
+		}
+
+		return ($filefound ? $pathoffile : '');
+	}
+
+
+	/**
+	 * Gives the changelog. First check ChangeLog-la_LA.md then ChangeLog.md
+	 *
+	 * @return string  Content of ChangeLog
+	 */
+	public function getChangeLog()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+		$filefound = false;
+
+		// Define path to file README.md.
+		// First check ChangeLog-la_LA.md then ChangeLog.md
+		$pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog-'.$langs->defaultlang.'.md', 0);
+		if (dol_is_file($pathoffile)) {
+			$filefound = true;
+		}
+		if (!$filefound) {
+			$pathoffile = dol_buildpath(strtolower($this->name).'/ChangeLog.md', 0);
+			if (dol_is_file($pathoffile)) {
+				$filefound = true;
+			}
+		}
+
+		if ($filefound)     // Mostly for external modules
+		{
+			$content = file_get_contents($pathoffile);
+
+			if ((float) DOL_VERSION >= 6.0) {
+				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
+				$content = dolMd2Html($content, 'parsedown', array('doc/'=>dol_buildpath(strtolower($this->name).'/doc/', 1)));
+			} else {
+				$content = nl2br($content);
+			}
+		}
+
+		return $content;
+	}
+
+	/**
+	 * Gives the publisher name
+	 *
+	 * @return string  Publisher name
+	 */
+	public function getPublisher()
+	{
+		return $this->editor_name;
+	}
+
+	/**
+	 * Gives the publisher url
+	 *
+	 * @return string  Publisher url
+	 */
+	public function getPublisherUrl()
+	{
+		return $this->editor_url;
+	}
+
+	/**
+	 * Gives module version (translated if param $translated is on)
+	 * For 'experimental' modules, gives 'experimental' translation
+	 * For 'dolibarr' modules, gives Dolibarr version
+	 *
+	 * @param  int $translated 1=Special version keys are translated, 0=Special version keys are not translated
+	 * @return string                  Module version
+	 */
+	public function getVersion($translated = 1)
+	{
+		global $langs;
+		$langs->load("admin");
+
+		$ret = '';
+
+		$newversion = preg_replace('/_deprecated/', '', $this->version);
+		if ($newversion == 'experimental') {
+			$ret = ($translated ? $langs->transnoentitiesnoconv("VersionExperimental") : $newversion);
+		} elseif ($newversion == 'development') {
+			$ret = ($translated ? $langs->transnoentitiesnoconv("VersionDevelopment") : $newversion);
+		} elseif ($newversion == 'dolibarr') {
+			$ret = DOL_VERSION;
+		} elseif ($newversion) {
+			$ret = $newversion;
+		} else {
+			$ret = ($translated ? $langs->transnoentitiesnoconv("VersionUnknown") : 'unknown');
+		}
+
+		if (preg_match('/_deprecated/', $this->version)) {
+			$ret .= ($translated ? ' ('.$langs->transnoentitiesnoconv("Deprecated").')' : $this->version);
+		}
+		return $ret;
+	}
+
+
+	/**
+	 * Tells if module is core or external
+	 *
+	 * @return string  'core', 'external' or 'unknown'
+	 */
+	public function isCoreOrExternalModule()
+	{
+		if ($this->version == 'dolibarr' || $this->version == 'dolibarr_deprecated') {
+			return 'core';
+		}
+		if (!empty($this->version) && !in_array($this->version, array('experimental', 'development'))) {
+			return 'external';
+		}
+		if (!empty($this->editor_name) || !empty($this->editor_url)) {
+			return 'external';
+		}
+		if ($this->numero >= 100000) {
+			return 'external';
+		}
+		return 'unknown';
+	}
+
+
+	/**
+	 * Gives module related language files list
+	 *
+	 * @return string[]    Language files list
+	 */
+	public function getLangFilesArray()
+	{
+		return $this->langfiles;
+	}
+
+	/**
+	 * Gives translated label of an export dataset
+	 *
+	 * @param int $r Dataset index
+	 *
+	 * @return string       Translated databaset label
+	 */
+	public function getExportDatasetLabel($r)
+	{
+		global $langs;
+
+		$langstring = "ExportDataset_".$this->export_code[$r];
+		if ($langs->trans($langstring) == $langstring) {
+			// Translation not found
+			return $langs->trans($this->export_label[$r]);
+		} else {
+			// Translation found
+			return $langs->trans($langstring);
+		}
+	}
+
+
+	/**
+	 * Gives translated label of an import dataset
+	 *
+	 * @param int $r Dataset index
+	 *
+	 * @return string      Translated dataset label
+	 */
+	public function getImportDatasetLabel($r)
+	{
+		global $langs;
+
+		$langstring = "ImportDataset_".$this->import_code[$r];
+		//print "x".$langstring;
+		if ($langs->trans($langstring) == $langstring) {
+			// Translation not found
+			return $langs->transnoentitiesnoconv($this->import_label[$r]);
+		} else {
+			// Translation found
+			return $langs->transnoentitiesnoconv($langstring);
+		}
+	}
+
+
+	/**
+	 * Gives the last date of activation
+	 *
+	 * @return 	int|string       	Date of last activation or '' if module was never activated
+	 */
+	public function getLastActivationDate()
+	{
+		global $conf;
+
+		$err = 0;
+
+		$sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
+		$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+		$sql .= " AND entity IN (0, ".$conf->entity.")";
+
+		dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$err++;
+		} else {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) {
+				return $this->db->jdate($obj->tms);
+			}
+		}
+
+		return '';
+	}
+
+
+	/**
+	 * Gives the last author of activation
+	 *
+	 * @return array       Array array('authorid'=>Id of last activation user, 'lastactivationdate'=>Date of last activation)
+	 */
+	public function getLastActivationInfo()
+	{
+		global $conf;
+
+		$err = 0;
 
 		$sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
 		$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
 		$sql .= " AND entity IN (0, ".$conf->entity.")";
 
-        dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $err++;
-        }
-        else
-        {
-            $obj = $this->db->fetch_object($resql);
-            $tmp = array();
-            if ($obj->note) {
-                $tmp = json_decode($obj->note, true);
-            }
-            if ($obj) {
-                return array('authorid'=>$tmp['authorid'], 'ip'=>$tmp['ip'], 'lastactivationdate'=>$this->db->jdate($obj->tms));
-            }
-        }
-
-        return array();
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Insert constants for module activation
-     *
-     * @return int Error count (0 if OK)
-     */
-    protected function _active()
-    {
-        // phpcs:enable
-        global $conf, $user;
-
-        $err = 0;
-
-        // Common module
-        $entity = ((!empty($this->always_enabled) || !empty($this->core_enabled)) ? 0 : $conf->entity);
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql .= " AND entity IN (0, ".$entity.")";
-
-        dol_syslog(get_class($this)."::_active delete activation constant", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $err++;
-        }
-
-        $note = json_encode(array('authorid'=>(is_object($user) ? $user->id : 0), 'ip'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])));
-
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
-        $sql .= " (".$this->db->encrypt($this->const_name, 1);
-        $sql .= ", ".$this->db->encrypt('1', 1);
-        $sql .= ", 0, ".$entity;
-        $sql .= ", '".$this->db->escape($note)."')";
-
-        dol_syslog(get_class($this)."::_active insert activation constant", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $err++;
-        }
-
-        return $err;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Module deactivation
-     *
-     * @return int Error count (0 if OK)
-     */
-    protected function _unactive()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        // Common module
-        $entity = ((!empty($this->always_enabled) || !empty($this->core_enabled)) ? 0 : $conf->entity);
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql .= " AND entity IN (0, ".$entity.")";
-
-        dol_syslog(get_class($this)."::_unactive", LOG_DEBUG);
-        $this->db->query($sql);
-
-        return $err;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps,PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Create tables and keys required by module.
-     * Files module.sql and module.key.sql with create table and create keys
-     * commands must be stored in directory reldir='/module/sql/'
-     * This function is called by this->init
-     *
-     * @param  string $reldir Relative directory where to scan files
-     * @return int             <=0 if KO, >0 if OK
-     */
-    protected function _load_tables($reldir)
-    {
-        // phpcs:enable
-        global $conf;
-
-        $error = 0;
-        $dirfound = 0;
-
-        if (empty($reldir)) {
-            return 1;
-        }
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-
-        $ok = 1;
-        foreach ($conf->file->dol_document_root as $dirroot)
-        {
-            if ($ok) {
-                $dir = $dirroot.$reldir;
-                $ok = 0;
-
-                $handle = @opendir($dir); // Dir may not exists
-                if (is_resource($handle)) {
-                    $dirfound++;
-
-                    // Run llx_mytable.sql files, then llx_mytable_*.sql
-                    $files = array();
-                    while (($file = readdir($handle)) !== false)
-                    {
-                        $files[] = $file;
-                    }
-                    sort($files);
-                    foreach ($files as $file)
-                    {
-                        if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
-                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-                            if ($result <= 0) { $error++;
-                            }
-                        }
-                    }
-
-                    rewinddir($handle);
-
-                    // Run llx_mytable.key.sql files (Must be done after llx_mytable.sql) then then llx_mytable_*.key.sql
-                    $files = array();
-                    while (($file = readdir($handle)) !== false)
-                    {
-                        $files[] = $file;
-                    }
-                    sort($files);
-                    foreach ($files as $file)
-                    {
-                        if (preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
-                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-                            if ($result <= 0) { $error++;
-                            }
-                        }
-                    }
-
-                    rewinddir($handle);
-
-                    // Run data_xxx.sql files (Must be done after llx_mytable.key.sql)
-                    $files = array();
-                    while (($file = readdir($handle)) !== false)
-                    {
-                               $files[] = $file;
-                    }
-                    sort($files);
-                    foreach ($files as $file)
-                    {
-                        if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'data') {
-                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-                            if ($result <= 0) { $error++;
-                            }
-                        }
-                    }
-
-                    rewinddir($handle);
-
-                    // Run update_xxx.sql files
-                    $files = array();
-                    while (($file = readdir($handle)) !== false)
-                    {
-                               $files[] = $file;
-                    }
-                    sort($files);
-                    foreach ($files as $file)
-                    {
-                        if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 6) == 'update') {
-                            $result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-                            if ($result <= 0) { $error++;
-                            }
-                        }
-                    }
-
-                    closedir($handle);
-                }
-
-                if ($error == 0) {
-                    $ok = 1;
-                }
-            }
-        }
-
-        if (!$dirfound) {
-            dol_syslog("A module ask to load sql files into ".$reldir." but this directory was not found.", LOG_WARNING);
-        }
-        return $ok;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Adds boxes
-     *
-     * @param string $option Options when disabling module ('newboxdefonly'=insert only boxes definition)
-     *
-     * @return int             Error count (0 if OK)
-     */
-    public function insert_boxes($option = '')
-    {
-        // phpcs:enable
-        include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-
-        global $conf;
-
-        $err = 0;
-
-        if (is_array($this->boxes)) {
-            dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
-
-            $pos_name = InfoBox::getListOfPagesForBoxes();
-
-            foreach ($this->boxes as $key => $value)
-            {
-                $file  = isset($this->boxes[$key]['file']) ? $this->boxes[$key]['file'] : '';
-                $note  = isset($this->boxes[$key]['note']) ? $this->boxes[$key]['note'] : '';
-                $enabledbydefaulton = isset($this->boxes[$key]['enabledbydefaulton']) ? $this->boxes[$key]['enabledbydefaulton'] : 'Home';
-
-                if (empty($file)) { $file  = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
-                }
-                if (empty($note)) { $note  = isset($this->boxes[$key][2]) ? $this->boxes[$key][2] : ''; // For backward compatibility
-                }
-
-                // Search if boxes def already present
-                $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."boxes_def";
-                $sql .= " WHERE file = '".$this->db->escape($file)."'";
-                $sql .= " AND entity = ".$conf->entity;
-                if ($note) { $sql .= " AND note ='".$this->db->escape($note)."'";
-                }
-
-                $result = $this->db->query($sql);
-                if ($result) {
-                    $obj = $this->db->fetch_object($result);
-                    if ($obj->nb == 0) {
-                        $this->db->begin();
-
-                        if (!$err) {
-                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, entity, note)";
-                            $sql .= " VALUES ('".$this->db->escape($file)."', ";
-                            $sql .= $conf->entity.", ";
-                            $sql .= $note ? "'".$this->db->escape($note)."'" : "null";
-                            $sql .= ")";
-
-                            dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
-                            $resql = $this->db->query($sql);
-                            if (!$resql) { $err++;
-                            }
-                        }
-                        if (!$err && !preg_match('/newboxdefonly/', $option)) {
-                            $lastid = $this->db->last_insert_id(MAIN_DB_PREFIX."boxes_def", "rowid");
-
-                            foreach ($pos_name as $key2 => $val2)
-                            {
-                                    //print 'key2='.$key2.'-val2='.$val2."<br>\n";
-                                if ($enabledbydefaulton && $val2 != $enabledbydefaulton) { continue; // Not enabled by default onto this page.
-                                }
-
-                                $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";
-                                $sql .= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";
-
-                                dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);
-                                $resql = $this->db->query($sql);
-                                if (!$resql) { $err++;
-                                }
-                            }
-                        }
-
-                        if (!$err) {
-                            $this->db->commit();
-                        }
-                        else
-                        {
-                                  $this->error = $this->db->lasterror();
-                                  $this->db->rollback();
-                        }
-                    }
-                    // else box already registered into database
-                }
-                else
-                {
-                    $this->error = $this->db->lasterror();
-                    $err++;
-                }
-            }
-        }
-
-        return $err;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Removes boxes
-     *
-     * @return int Error count (0 if OK)
-     */
-    public function delete_boxes()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        if (is_array($this->boxes)) {
-            foreach ($this->boxes as $key => $value)
-            {
-                //$titre = $this->boxes[$key][0];
-                $file = $this->boxes[$key]['file'];
-                //$note  = $this->boxes[$key][2];
-
-                // TODO If the box is also included by another module and the other module is still on, we should not remove it.
-                // For the moment, we manage this with hard coded exception
-                //print "Remove box ".$file.'<br>';
-                if ($file == 'box_graph_product_distribution.php') {
-                    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-                        dol_syslog("We discard disabling of module ".$file." because another module still active require it.");
-                        continue;
-                    }
-                }
-
-                if (empty($file)) { $file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
-                }
-
-                if ($this->db->type == 'sqlite3') {
-                    // sqlite doesn't support "USING" syntax.
-                    // TODO: remove this dependency.
-                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes ";
-                    $sql .= "WHERE ".MAIN_DB_PREFIX."boxes.box_id IN (";
-                    $sql .= "SELECT ".MAIN_DB_PREFIX."boxes_def.rowid ";
-                    $sql .= "FROM ".MAIN_DB_PREFIX."boxes_def ";
-                    $sql .= "WHERE ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."') ";
-                    $sql .= "AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
-                } else {
-                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-                    $sql .= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
-                    $sql .= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
-                    $sql .= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";
-                    $sql .= " AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
-                }
-
-                dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
-                $resql = $this->db->query($sql);
-                if (!$resql) {
-                    $this->error = $this->db->lasterror();
-                    $err++;
-                }
-
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
-                $sql .= " WHERE file = '".$this->db->escape($file)."'";
-                $sql .= " AND entity = ".$conf->entity;
-
-                dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
-                $resql = $this->db->query($sql);
-                if (!$resql) {
-                    $this->error = $this->db->lasterror();
-                    $err++;
-                }
-            }
-        }
-
-        return $err;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Adds cronjobs
-     *
-     * @return int             Error count (0 if OK)
-     */
-    public function insert_cronjobs()
-    {
-        // phpcs:enable
-        include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
-
-        global $conf;
-
-        $err = 0;
-
-        if (is_array($this->cronjobs)) {
-            dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
-
-            foreach ($this->cronjobs as $key => $value)
-            {
-                $entity = isset($this->cronjobs[$key]['entity']) ? $this->cronjobs[$key]['entity'] : $conf->entity;
-                $label  = isset($this->cronjobs[$key]['label']) ? $this->cronjobs[$key]['label'] : '';
-                $jobtype = isset($this->cronjobs[$key]['jobtype']) ? $this->cronjobs[$key]['jobtype'] : '';
-                $class  = isset($this->cronjobs[$key]['class']) ? $this->cronjobs[$key]['class'] : '';
-                $objectname  = isset($this->cronjobs[$key]['objectname']) ? $this->cronjobs[$key]['objectname'] : '';
-                $method = isset($this->cronjobs[$key]['method']) ? $this->cronjobs[$key]['method'] : '';
-                $command = isset($this->cronjobs[$key]['command']) ? $this->cronjobs[$key]['command'] : '';
-                $parameters  = isset($this->cronjobs[$key]['parameters']) ? $this->cronjobs[$key]['parameters'] : '';
-                $comment = isset($this->cronjobs[$key]['comment']) ? $this->cronjobs[$key]['comment'] : '';
-                $frequency = isset($this->cronjobs[$key]['frequency']) ? $this->cronjobs[$key]['frequency'] : '';
-                $unitfrequency = isset($this->cronjobs[$key]['unitfrequency']) ? $this->cronjobs[$key]['unitfrequency'] : '';
-                $priority = isset($this->cronjobs[$key]['priority']) ? $this->cronjobs[$key]['priority'] : '';
-                $datestart = isset($this->cronjobs[$key]['datestart']) ? $this->cronjobs[$key]['datestart'] : '';
-                $dateend = isset($this->cronjobs[$key]['dateend']) ? $this->cronjobs[$key]['dateend'] : '';
-                $status = isset($this->cronjobs[$key]['status']) ? $this->cronjobs[$key]['status'] : '';
-                $test = isset($this->cronjobs[$key]['test']) ? $this->cronjobs[$key]['test'] : ''; // Line must be enabled or not (so visible or not)
-
-                // Search if cron entry already present
-                $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
-                $sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
-                if ($class) {
-                    $sql .= " AND classesname = '".$this->db->escape($class)."'";
-                }
-                if ($objectname) {
-                    $sql .= " AND objectname = '".$this->db->escape($objectname)."'";
-                }
-                if ($method) {
-                    $sql .= " AND methodename = '".$this->db->escape($method)."'";
-                }
-                if ($command) {
-                    $sql .= " AND command = '".$this->db->escape($command)."'";
-                }
-                $sql .= " AND entity = ".$entity; // Must be exact entity
-
-                $now = dol_now();
-
-                $result = $this->db->query($sql);
-                if ($result) {
-                    $obj = $this->db->fetch_object($result);
-                    if ($obj->nb == 0) {
-                        $this->db->begin();
-
-                        if (!$err) {
-                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob (module_name, datec, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,";
-                            if (is_int($frequency)) { $sql .= ' frequency,'; }
-                            if (is_int($unitfrequency)) { $sql .= ' unitfrequency,'; }
-                            if (is_int($priority)) { $sql .= ' priority,'; }
-                            if (is_int($status)) { $sql .= ' status,'; }
-                            $sql .= " entity, test)";
-                            $sql .= " VALUES (";
-                            $sql .= "'".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."', ";
-                            $sql .= "'".$this->db->idate($now)."', ";
-                            $sql .= ($datestart ? "'".$this->db->idate($datestart)."'" : "'".$this->db->idate($now)."'").", ";
-                            $sql .= ($dateend ? "'".$this->db->idate($dateend)."'" : "NULL").", ";
-                            $sql .= "'".$this->db->escape($label)."', ";
-                            $sql .= "'".$this->db->escape($jobtype)."', ";
-                            $sql .= ($class ? "'".$this->db->escape($class)."'" : "null").",";
-                            $sql .= ($objectname ? "'".$this->db->escape($objectname)."'" : "null").",";
-                            $sql .= ($method ? "'".$this->db->escape($method)."'" : "null").",";
-                            $sql .= ($command ? "'".$this->db->escape($command)."'" : "null").",";
-                            $sql .= ($parameters ? "'".$this->db->escape($parameters)."'" : "null").",";
-                            $sql .= ($comment ? "'".$this->db->escape($comment)."'" : "null").",";
-                            if (is_int($frequency)) { $sql .= "'".$this->db->escape($frequency)."', ";
-                            }
-                            if (is_int($unitfrequency)) { $sql .= "'".$this->db->escape($unitfrequency)."', ";
-                            }
-                            if (is_int($priority)) {$sql .= "'".$this->db->escape($priority)."', ";
-                            }
-                            if (is_int($status)) { $sql .= "'".$this->db->escape($status)."', ";
-                            }
-                            $sql .= $entity.",";
-                            $sql .= "'".$this->db->escape($test)."'";
-                            $sql .= ")";
-
-                            $resql = $this->db->query($sql);
-                            if (!$resql) { $err++;
-                            }
-                        }
-
-                        if (!$err) {
-                            $this->db->commit();
-                        }
-                        else
-                        {
-                            $this->error = $this->db->lasterror();
-                            $this->db->rollback();
-                        }
-                    }
-                    // else box already registered into database
-                }
-                else
-                {
-                    $this->error = $this->db->lasterror();
-                    $err++;
-                }
-            }
-        }
-
-        return $err;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Removes boxes
-     *
-     * @return int Error count (0 if OK)
-     */
-    public function delete_cronjobs()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        if (is_array($this->cronjobs)) {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
-            $sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
-            $sql .= " AND entity = ".$conf->entity;
-            $sql .= " AND test = '1'"; // We delete on lines that are not set with a complete test that is '$conf->module->enabled' so when module is disabled, the cron is also removed.
-              // For crons declared with a '$conf->module->enabled', there is no need to delete the line, so we don't loose setup if we reenable module.
-
-            dol_syslog(get_class($this)."::delete_cronjobs", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql) {
-                $this->error = $this->db->lasterror();
-                $err++;
-            }
-        }
-
-        return $err;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Removes tabs
-     *
-     * @return int Error count (0 if OK)
-     */
-    public function delete_tabs()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql .= " WHERE ".$this->db->decrypt('name')." like '".$this->db->escape($this->const_name)."_TABS_%'";
-        $sql .= " AND entity = ".$conf->entity;
-
-        dol_syslog(get_class($this)."::delete_tabs", LOG_DEBUG);
-        if (!$this->db->query($sql)) {
-            $this->error = $this->db->lasterror();
-            $err++;
-        }
-
-        return $err;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Adds tabs
-     *
-     * @return int  Error count (0 if ok)
-     */
-    public function insert_tabs()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        if (!empty($this->tabs)) {
-            dol_syslog(get_class($this)."::insert_tabs", LOG_DEBUG);
-
-            $i = 0;
-            foreach ($this->tabs as $key => $value)
-            {
-                if (is_array($value) && count($value) == 0) { continue; // Discard empty arrays
-                }
-
-                $entity = $conf->entity;
-                $newvalue = $value;
-
-                if (is_array($value)) {
-                    $newvalue = $value['data'];
-                    if (isset($value['entity'])) { $entity = $value['entity'];
-                    }
-                }
-
-                if ($newvalue) {
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";
-                    $sql .= "name";
-                    $sql .= ", type";
-                    $sql .= ", value";
-                    $sql .= ", note";
-                    $sql .= ", visible";
-                    $sql .= ", entity";
-                    $sql .= ")";
-                    $sql .= " VALUES (";
-                    $sql .= $this->db->encrypt($this->const_name."_TABS_".$i, 1);
-                    $sql .= ", 'chaine'";
-                    $sql .= ", ".$this->db->encrypt($newvalue, 1);
-                    $sql .= ", null";
-                    $sql .= ", '0'";
-                    $sql .= ", ".$entity;
-                    $sql .= ")";
-
-                    $resql = $this->db->query($sql);
-                    if (!$resql) {
-                         dol_syslog($this->db->lasterror(), LOG_ERR);
-                        if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                            $this->error = $this->db->lasterror();
-                            $this->errors[] = $this->db->lasterror();
-                            $err++;
-                            break;
-                        }
-                    }
-                }
-                $i++;
-            }
-        }
-        return $err;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Adds constants
-     *
-     * @return int Error count (0 if OK)
-     */
-    public function insert_const()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        if (empty($this->const)) { return 0;
-        }
-
-        dol_syslog(get_class($this)."::insert_const", LOG_DEBUG);
-
-        foreach ($this->const as $key => $value)
-        {
-            $name      = $this->const[$key][0];
-            $type      = $this->const[$key][1];
-            $val       = $this->const[$key][2];
-            $note      = isset($this->const[$key][3]) ? $this->const[$key][3] : '';
-            $visible   = isset($this->const[$key][4]) ? $this->const[$key][4] : 0;
-            $entity    = (!empty($this->const[$key][5]) && $this->const[$key][5] != 'current') ? 0 : $conf->entity;
-
-            // Clean
-            if (empty($visible)) { $visible = '0';
-            }
-            if (empty($val) && $val != '0') { $val = '';
-            }
-
-            $sql = "SELECT count(*)";
-            $sql .= " FROM ".MAIN_DB_PREFIX."const";
-            $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
-            $sql .= " AND entity = ".$entity;
-
-            $result = $this->db->query($sql);
-            if ($result) {
-                $row = $this->db->fetch_row($result);
-
-                if ($row[0] == 0)   // If not found
-                {
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
-                    $sql .= " VALUES (";
-                    $sql .= $this->db->encrypt($name, 1);
-                    $sql .= ",'".$type."'";
-                    $sql .= ",".(($val != '') ? $this->db->encrypt($val, 1) : "''");
-                    $sql .= ",".($note ? "'".$this->db->escape($note)."'" : "null");
-                    $sql .= ",'".$visible."'";
-                    $sql .= ",".$entity;
-                    $sql .= ")";
-
-                    if (!$this->db->query($sql)) {
-                        $err++;
-                    }
-                }
-                else
-                {
-                    dol_syslog(get_class($this)."::insert_const constant '".$name."' already exists", LOG_WARNING);
-                }
-            }
-            else
-            {
-                $err++;
-            }
-        }
-
-        return $err;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Removes constants tagged 'deleteonunactive'
-     *
-     * @return int <0 if KO, 0 if OK
-     */
-    public function delete_const()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        if (empty($this->const)) { return 0;
-        }
-
-        foreach ($this->const as $key => $value)
-        {
-            $name = $this->const[$key][0];
-            $deleteonunactive = (!empty($this->const[$key][6])) ? 1 : 0;
-
-            if ($deleteonunactive) {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-                $sql .= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
-                $sql .= " AND entity in (0, ".$conf->entity.")";
-                dol_syslog(get_class($this)."::delete_const", LOG_DEBUG);
-                if (!$this->db->query($sql)) {
-                    $this->error = $this->db->lasterror();
-                    $err++;
-                }
-            }
-        }
-
-        return $err;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Adds access rights
-     *
-     * @param  int $reinitadminperms If 1, we also grant them to all admin users
-     * @param  int $force_entity     Force current entity
-     * @param  int $notrigger        1=Does not execute triggers, 0= execute triggers
-     * @return int                     Error count (0 if OK)
-     */
-    public function insert_permissions($reinitadminperms = 0, $force_entity = null, $notrigger = 0)
-    {
-        // phpcs:enable
-        global $conf, $user;
-
-        $err = 0;
-        $entity = (!empty($force_entity) ? $force_entity : $conf->entity);
-
-        dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
-
-        // Test if module is activated
-        $sql_del = "SELECT ".$this->db->decrypt('value')." as value";
-        $sql_del .= " FROM ".MAIN_DB_PREFIX."const";
-        $sql_del .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql_del .= " AND entity IN (0,".$entity.")";
-
-        $resql = $this->db->query($sql_del);
-
-        if ($resql) {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj !== null && !empty($obj->value) && !empty($this->rights)) {
-                // If the module is active
-                foreach ($this->rights as $key => $value)
-                {
-                    $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_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";
-                    $sql .= " WHERE id = ".$r_id." AND entity = ".$entity;
-
-                    $resqlselect = $this->db->query($sql);
-                    if ($resqlselect) {
-                        $objcount = $this->db->fetch_object($resqlselect);
-                        if ($objcount && $objcount->nb == 0) {
-                            if (dol_strlen($r_perms)) {
-                                if (dol_strlen($r_subperms)) {
-                                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
-                                    $sql .= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
-                                    $sql .= " VALUES ";
-                                    $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
-                                }
-                                else
-                                   {
-                                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
-                                    $sql .= " (id, entity, libelle, module, type, bydefault, perms)";
-                                    $sql .= " VALUES ";
-                                    $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
-                                }
-                            }
-                            else
-                            {
-                                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
-                                 $sql .= " (id, entity, libelle, module, type, bydefault)";
-                                 $sql .= " VALUES ";
-                                 $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
-                            }
-
-                            $resqlinsert = $this->db->query($sql, 1);
-
-                            if (!$resqlinsert) {
-                                if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS") {
-                                    $this->error = $this->db->lasterror();
-                                    $err++;
-                                    break;
-                                }
-                                else { dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
-                                }
-                            }
-
-                            $this->db->free($resqlinsert);
-                        }
-
-                        $this->db->free($resqlselect);
-                    }
-
-                    // If we want to init permissions on admin users
-                    if ($reinitadminperms) {
-                        if (!class_exists('User')) {
-                            include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-                        }
-                        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1";
-                        dol_syslog(get_class($this)."::insert_permissions Search all admin users", LOG_DEBUG);
-                        $resqlseladmin = $this->db->query($sql, 1);
-                        if ($resqlseladmin) {
-                            $num = $this->db->num_rows($resqlseladmin);
-                            $i = 0;
-                            while ($i < $num)
-                            {
-                                  $obj2 = $this->db->fetch_object($resqlseladmin);
-                                  dol_syslog(get_class($this)."::insert_permissions Add permission to user id=".$obj2->rowid);
-
-                                  $tmpuser = new User($this->db);
-                                  $result = $tmpuser->fetch($obj2->rowid);
-                                if ($result > 0) {
-                                    $tmpuser->addrights($r_id, '', '', 0, 1);
-                                }
-                                else
-                                 {
-                                    dol_syslog(get_class($this)."::insert_permissions Failed to add the permission to user because fetch return an error", LOG_ERR);
-                                }
-                                 $i++;
-                            }
-                        }
-                        else
-                        {
-                            dol_print_error($this->db);
-                        }
-                    }
-                }
-
-                if ($reinitadminperms && !empty($user->admin))  // Reload permission for current user if defined
-                {
-                    // We reload permissions
-                    $user->clearrights();
-                    $user->getrights();
-                }
-            }
-            $this->db->free($resql);
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $err++;
-        }
-
-        return $err;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Removes access rights
-     *
-     * @return int                     Error count (0 if OK)
-     */
-    public function delete_permissions()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def";
-        $sql .= " WHERE module = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
-        $sql .= " AND entity = ".$conf->entity;
-        dol_syslog(get_class($this)."::delete_permissions", LOG_DEBUG);
-        if (!$this->db->query($sql)) {
-            $this->error = $this->db->lasterror();
-            $err++;
-        }
-
-        return $err;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Adds menu entries
-     *
-     * @return int     Error count (0 if OK)
-     */
-    public function insert_menus()
-    {
-        // phpcs:enable
-        global $user;
-
-        if (!is_array($this->menu) || empty($this->menu)) { return 0;
-        }
-
-        include_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
-
-        dol_syslog(get_class($this)."::insert_menus", LOG_DEBUG);
-
-        $err = 0;
-
-        $this->db->begin();
-
-        foreach ($this->menu as $key => $value)
-        {
-            $menu = new Menubase($this->db);
-            $menu->menu_handler = 'all';
-
-            //$menu->module=strtolower($this->name);    TODO When right_class will be same than module name
-            $menu->module = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
-
-            if (!$this->menu[$key]['fk_menu']) {
-                $menu->fk_menu = 0;
-            }
-            else
-            {
-                $foundparent = 0;
-                $fk_parent = $this->menu[$key]['fk_menu'];
-                if (preg_match('/^r=/', $fk_parent))    // old deprecated method
-                {
-                    $fk_parent = str_replace('r=', '', $fk_parent);
-                    if (isset($this->menu[$fk_parent]['rowid'])) {
-                        $menu->fk_menu = $this->menu[$fk_parent]['rowid'];
-                        $foundparent = 1;
-                    }
-                }
-                elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+),fk_leftmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
-                    $menu->fk_menu = -1;
-                    $menu->fk_mainmenu = $reg[1];
-                    $menu->fk_leftmenu = $reg[2];
-                    $foundparent = 1;
-                }
-                elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
-                    $menu->fk_menu = -1;
-                    $menu->fk_mainmenu = $reg[1];
-                    $menu->fk_leftmenu = '';
-                    $foundparent = 1;
-                }
-                if (!$foundparent) {
-                    $this->error = "ErrorBadDefinitionOfMenuArrayInModuleDescriptor";
-                    dol_syslog(get_class($this)."::insert_menus ".$this->error." ".$this->menu[$key]['fk_menu'], LOG_ERR);
-                    $err++;
-                }
-            }
-            $menu->type = $this->menu[$key]['type'];
-            $menu->mainmenu = isset($this->menu[$key]['mainmenu']) ? $this->menu[$key]['mainmenu'] : (isset($menu->fk_mainmenu) ? $menu->fk_mainmenu : '');
-            $menu->leftmenu = isset($this->menu[$key]['leftmenu']) ? $this->menu[$key]['leftmenu'] : '';
-            $menu->titre = $this->menu[$key]['titre']; // deprecated
-            $menu->title = $this->menu[$key]['titre'];
-            $menu->url = $this->menu[$key]['url'];
-            $menu->langs = $this->menu[$key]['langs'];
-            $menu->position = $this->menu[$key]['position'];
-            $menu->perms = $this->menu[$key]['perms'];
-            $menu->target = isset($this->menu[$key]['target']) ? $this->menu[$key]['target'] : '';
-            $menu->user = $this->menu[$key]['user'];
-            $menu->enabled = isset($this->menu[$key]['enabled']) ? $this->menu[$key]['enabled'] : 0;
-            $menu->position = $this->menu[$key]['position'];
-
-            if (!$err) {
-                $result = $menu->create($user); // Save menu entry into table llx_menu
-                if ($result > 0) {
-                    $this->menu[$key]['rowid'] = $result;
-                }
-                else
-                {
-                    $this->error = $menu->error;
-                    dol_syslog(get_class($this).'::insert_menus result='.$result." ".$this->error, LOG_ERR);
-                    $err++;
-                    break;
-                }
-            }
-        }
-
-        if (!$err) {
-            $this->db->commit();
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::insert_menus ".$this->error, LOG_ERR);
-            $this->db->rollback();
-        }
-
-        return $err;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Removes menu entries
-     *
-     * @return int Error count (0 if OK)
-     */
-    public function delete_menus()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        //$module=strtolower($this->name);        TODO When right_class will be same than module name
-        $module = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
-        $sql .= " WHERE module = '".$this->db->escape($module)."'";
-        $sql .= " AND entity = ".$conf->entity;
-
-        dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $this->error = $this->db->lasterror();
-            $err++;
-        }
-
-        return $err;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Creates directories
-     *
-     * @return int Error count (0 if OK)
-     */
-    public function create_dirs()
-    {
-        // phpcs:enable
-        global $langs, $conf;
-
-        $err = 0;
-
-        if (isset($this->dirs) && is_array($this->dirs)) {
-            foreach ($this->dirs as $key => $value)
-            {
-                $addtodatabase = 0;
-
-                if (!is_array($value)) { $dir = $value; // Default simple mode
-                } else {
-                    $constname = $this->const_name."_DIR_";
-                    $dir       = $this->dirs[$key][1];
-                    $addtodatabase = empty($this->dirs[$key][2]) ? '' : $this->dirs[$key][2]; // Create constante in llx_const
-                    $subname   = empty($this->dirs[$key][3]) ? '' : strtoupper($this->dirs[$key][3]); // Add submodule name (ex: $conf->module->submodule->dir_output)
-                    $forcename = empty($this->dirs[$key][4]) ? '' : strtoupper($this->dirs[$key][4]); // Change the module name if different
-
-                    if (!empty($forcename)) { $constname = 'MAIN_MODULE_'.$forcename."_DIR_";
-                    }
-                    if (!empty($subname)) {   $constname = $constname.$subname."_";
-                    }
-
-                    $name = $constname.strtoupper($this->dirs[$key][0]);
-                }
-
-                // Define directory full path ($dir must start with "/")
-                if (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || $conf->entity == 1) { $fulldir = DOL_DATA_ROOT.$dir;
-                } else { $fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir;
-                }
-                // Create dir if it does not exists
-                if (!empty($fulldir) && !file_exists($fulldir)) {
-                    if (dol_mkdir($fulldir, DOL_DATA_ROOT) < 0) {
-                         $this->error = $langs->trans("ErrorCanNotCreateDir", $fulldir);
-                         dol_syslog(get_class($this)."::_init ".$this->error, LOG_ERR);
-                         $err++;
-                    }
-                }
-
-                // Define the constant in database if requested (not the default mode)
-                if (!empty($addtodatabase)) {
-                    $result = $this->insert_dirs($name, $dir);
-                    if ($result) { $err++;
-                    }
-                }
-            }
-        }
-
-        return $err;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Adds directories definitions
-     *
-     * @param string $name Name
-     * @param string $dir  Directory
-     *
-     * @return int             Error count (0 if OK)
-     */
-    public function insert_dirs($name, $dir)
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        $sql = "SELECT count(*)";
-        $sql .= " FROM ".MAIN_DB_PREFIX."const";
-        $sql .= " WHERE ".$this->db->decrypt('name')." = '".$name."'";
-        $sql .= " AND entity = ".$conf->entity;
-
-        dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result) {
-            $row = $this->db->fetch_row($result);
-
-            if ($row[0] == 0) {
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
-                $sql .= " VALUES (".$this->db->encrypt($name, 1).",'chaine',".$this->db->encrypt($dir, 1).",'Directory for module ".$this->name."','0',".$conf->entity.")";
-
-                dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
-                $this->db->query($sql);
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $err++;
-        }
-
-        return $err;
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Removes directories
-     *
-     * @return int Error count (0 if OK)
-     */
-    public function delete_dirs()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-        $sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_DIR_%'";
-        $sql .= " AND entity = ".$conf->entity;
-
-        dol_syslog(get_class($this)."::delete_dirs", LOG_DEBUG);
-        if (!$this->db->query($sql)) {
-            $this->error = $this->db->lasterror();
-            $err++;
-        }
-
-        return $err;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Adds generic parts
-     *
-     * @return int Error count (0 if OK)
-     */
-    public function insert_module_parts()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $error = 0;
-
-        if (is_array($this->module_parts) && !empty($this->module_parts)) {
-            foreach ($this->module_parts as $key => $value)
-            {
-                if (is_array($value) && count($value) == 0) { continue; // Discard empty arrays
-                }
-
-                $entity = $conf->entity; // Reset the current entity
-                $newvalue = $value;
-
-                // Serialize array parameters
-                if (is_array($value)) {
-                    // Can defined other parameters
-                    // Example when $key='hooks', then $value is an array('data'=>array('hookcontext1','hookcontext2'), 'entity'=>X)
-                    if (isset($value['data']) && is_array($value['data'])) {
-                        $newvalue = json_encode($value['data']);
-                        if (isset($value['entity'])) { $entity = $value['entity'];
-                        }
-                    }
-                    elseif (isset($value['data']) && !is_array($value['data'])) {
-                        $newvalue = $value['data'];
-                        if (isset($value['entity'])) { $entity = $value['entity'];
-                        }
-                    }
-                    else    // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
-                    {
-                        $newvalue = json_encode($value);
-                    }
-                }
-
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";
-                $sql .= "name";
-                $sql .= ", type";
-                $sql .= ", value";
-                $sql .= ", note";
-                $sql .= ", visible";
-                $sql .= ", entity";
-                $sql .= ")";
-                $sql .= " VALUES (";
-                $sql .= $this->db->encrypt($this->const_name."_".strtoupper($key), 1);
-                $sql .= ", 'chaine'";
-                $sql .= ", ".$this->db->encrypt($newvalue, 1);
-                $sql .= ", null";
-                $sql .= ", '0'";
-                $sql .= ", ".$entity;
-                $sql .= ")";
-
-                dol_syslog(get_class($this)."::insert_module_parts for key=".$this->const_name."_".strtoupper($key), LOG_DEBUG);
-
-                $resql = $this->db->query($sql, 1);
-                if (!$resql) {
-                    if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                         $error++;
-                         $this->error = $this->db->lasterror();
-                    }
-                    else
-                    {
-                         dol_syslog(get_class($this)."::insert_module_parts for ".$this->const_name."_".strtoupper($key)." Record already exists.", LOG_WARNING);
-                    }
-                }
-            }
-        }
-        return $error;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Removes generic parts
-     *
-     * @return int Error count (0 if OK)
-     */
-    public function delete_module_parts()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $err = 0;
-        $entity = $conf->entity;
-
-        if (is_array($this->module_parts) && !empty($this->module_parts)) {
-            foreach ($this->module_parts as $key => $value)
-            {
-                // If entity is defined
-                if (is_array($value) && isset($value['entity'])) { $entity = $value['entity'];
-                }
-
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-                $sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_".strtoupper($key)."'";
-                $sql .= " AND entity = ".$entity;
-
-                dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
-                if (!$this->db->query($sql)) {
-                    $this->error = $this->db->lasterror();
-                    $err++;
-                }
-            }
-        }
-        return $err;
-    }
-
-    /**
-     * Function called when module is enabled.
-     * The init function adds tabs, 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')
-     *                         'noboxes' = Do not insert boxes 'newboxdefonly' = For boxes,
-     *                         insert def of boxes only and not boxes activation
-     * @return int                1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        return $this->_init(array(), $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 = '')
-    {
-        return $this->_remove(array(), $options);
-    }
-
-
-    /**
-     * Return Kanban view of a module
-     *
-     * @param	string	$codeenabledisable		HTML code for button to enable/disable module
-     * @param	string	$codetoconfig			HTML code to go to config page
-     * @return 	string							HTML code of Kanban view
-     */
-    public function getKanbanView($codeenabledisable = '', $codetoconfig = '')
-    {
-    	global $conf, $langs;
-
-    	// Define imginfo
-    	$imginfo = "info";
-    	if ($this->isCoreOrExternalModule() == 'external')
-    	{
-    		$imginfo = "info_black";
-    	}
-
-    	$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($this)));
+		dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			$err++;
+		} else {
+			$obj = $this->db->fetch_object($resql);
+			$tmp = array();
+			if ($obj->note) {
+				$tmp = json_decode($obj->note, true);
+			}
+			if ($obj) {
+				return array('authorid'=>$tmp['authorid'], 'ip'=>$tmp['ip'], 'lastactivationdate'=>$this->db->jdate($obj->tms));
+			}
+		}
+
+		return array();
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Insert constants for module activation
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	protected function _active()
+	{
+		// phpcs:enable
+		global $conf, $user;
+
+		$err = 0;
+
+		// Common module
+		$entity = ((!empty($this->always_enabled) || !empty($this->core_enabled)) ? 0 : $conf->entity);
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+		$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+		$sql .= " AND entity IN (0, ".$entity.")";
+
+		dol_syslog(get_class($this)."::_active delete activation constant", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$err++;
+		}
+
+		$note = json_encode(array('authorid'=>(is_object($user) ? $user->id : 0), 'ip'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR'])));
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, value, visible, entity, note) VALUES";
+		$sql .= " (".$this->db->encrypt($this->const_name, 1);
+		$sql .= ", ".$this->db->encrypt('1', 1);
+		$sql .= ", 0, ".$entity;
+		$sql .= ", '".$this->db->escape($note)."')";
+
+		dol_syslog(get_class($this)."::_active insert activation constant", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $err++;
+		}
+
+		return $err;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Module deactivation
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	protected function _unactive()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		// Common module
+		$entity = ((!empty($this->always_enabled) || !empty($this->core_enabled)) ? 0 : $conf->entity);
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+		$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+		$sql .= " AND entity IN (0, ".$entity.")";
+
+		dol_syslog(get_class($this)."::_unactive", LOG_DEBUG);
+		$this->db->query($sql);
+
+		return $err;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps,PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Create tables and keys required by module.
+	 * Files module.sql and module.key.sql with create table and create keys
+	 * commands must be stored in directory reldir='/module/sql/'
+	 * This function is called by this->init
+	 *
+	 * @param  string $reldir Relative directory where to scan files
+	 * @return int             <=0 if KO, >0 if OK
+	 */
+	protected function _load_tables($reldir)
+	{
+		// phpcs:enable
+		global $conf;
+
+		$error = 0;
+		$dirfound = 0;
+
+		if (empty($reldir)) {
+			return 1;
+		}
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+		$ok = 1;
+		foreach ($conf->file->dol_document_root as $dirroot)
+		{
+			if ($ok) {
+				$dir = $dirroot.$reldir;
+				$ok = 0;
+
+				$handle = @opendir($dir); // Dir may not exists
+				if (is_resource($handle)) {
+					$dirfound++;
+
+					// Run llx_mytable.sql files, then llx_mytable_*.sql
+					$files = array();
+					while (($file = readdir($handle)) !== false)
+					{
+						$files[] = $file;
+					}
+					sort($files);
+					foreach ($files as $file)
+					{
+						if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
+							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
+							if ($result <= 0) { $error++;
+							}
+						}
+					}
+
+					rewinddir($handle);
+
+					// Run llx_mytable.key.sql files (Must be done after llx_mytable.sql) then then llx_mytable_*.key.sql
+					$files = array();
+					while (($file = readdir($handle)) !== false)
+					{
+						$files[] = $file;
+					}
+					sort($files);
+					foreach ($files as $file)
+					{
+						if (preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
+							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
+							if ($result <= 0) { $error++;
+							}
+						}
+					}
+
+					rewinddir($handle);
+
+					// Run data_xxx.sql files (Must be done after llx_mytable.key.sql)
+					$files = array();
+					while (($file = readdir($handle)) !== false)
+					{
+							   $files[] = $file;
+					}
+					sort($files);
+					foreach ($files as $file)
+					{
+						if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'data') {
+							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
+							if ($result <= 0) { $error++;
+							}
+						}
+					}
+
+					rewinddir($handle);
+
+					// Run update_xxx.sql files
+					$files = array();
+					while (($file = readdir($handle)) !== false)
+					{
+							   $files[] = $file;
+					}
+					sort($files);
+					foreach ($files as $file)
+					{
+						if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 6) == 'update') {
+							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
+							if ($result <= 0) { $error++;
+							}
+						}
+					}
+
+					closedir($handle);
+				}
+
+				if ($error == 0) {
+					$ok = 1;
+				}
+			}
+		}
+
+		if (!$dirfound) {
+			dol_syslog("A module ask to load sql files into ".$reldir." but this directory was not found.", LOG_WARNING);
+		}
+		return $ok;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Adds boxes
+	 *
+	 * @param string $option Options when disabling module ('newboxdefonly'=insert only boxes definition)
+	 *
+	 * @return int             Error count (0 if OK)
+	 */
+	public function insert_boxes($option = '')
+	{
+		// phpcs:enable
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+
+		global $conf;
+
+		$err = 0;
+
+		if (is_array($this->boxes)) {
+			dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
+
+			$pos_name = InfoBox::getListOfPagesForBoxes();
+
+			foreach ($this->boxes as $key => $value)
+			{
+				$file  = isset($this->boxes[$key]['file']) ? $this->boxes[$key]['file'] : '';
+				$note  = isset($this->boxes[$key]['note']) ? $this->boxes[$key]['note'] : '';
+				$enabledbydefaulton = isset($this->boxes[$key]['enabledbydefaulton']) ? $this->boxes[$key]['enabledbydefaulton'] : 'Home';
+
+				if (empty($file)) { $file  = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
+				}
+				if (empty($note)) { $note  = isset($this->boxes[$key][2]) ? $this->boxes[$key][2] : ''; // For backward compatibility
+				}
+
+				// Search if boxes def already present
+				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."boxes_def";
+				$sql .= " WHERE file = '".$this->db->escape($file)."'";
+				$sql .= " AND entity = ".$conf->entity;
+				if ($note) { $sql .= " AND note ='".$this->db->escape($note)."'";
+				}
+
+				$result = $this->db->query($sql);
+				if ($result) {
+					$obj = $this->db->fetch_object($result);
+					if ($obj->nb == 0) {
+						$this->db->begin();
+
+						if (!$err) {
+							$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes_def (file, entity, note)";
+							$sql .= " VALUES ('".$this->db->escape($file)."', ";
+							$sql .= $conf->entity.", ";
+							$sql .= $note ? "'".$this->db->escape($note)."'" : "null";
+							$sql .= ")";
+
+							dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
+							$resql = $this->db->query($sql);
+							if (!$resql) { $err++;
+							}
+						}
+						if (!$err && !preg_match('/newboxdefonly/', $option)) {
+							$lastid = $this->db->last_insert_id(MAIN_DB_PREFIX."boxes_def", "rowid");
+
+							foreach ($pos_name as $key2 => $val2)
+							{
+									//print 'key2='.$key2.'-val2='.$val2."<br>\n";
+								if ($enabledbydefaulton && $val2 != $enabledbydefaulton) { continue; // Not enabled by default onto this page.
+								}
+
+								$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";
+								$sql .= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";
+
+								dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);
+								$resql = $this->db->query($sql);
+								if (!$resql) { $err++;
+								}
+							}
+						}
+
+						if (!$err) {
+							$this->db->commit();
+						} else {
+								  $this->error = $this->db->lasterror();
+								  $this->db->rollback();
+						}
+					}
+					// else box already registered into database
+				} else {
+					$this->error = $this->db->lasterror();
+					$err++;
+				}
+			}
+		}
+
+		return $err;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Removes boxes
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	public function delete_boxes()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		if (is_array($this->boxes)) {
+			foreach ($this->boxes as $key => $value)
+			{
+				//$titre = $this->boxes[$key][0];
+				$file = $this->boxes[$key]['file'];
+				//$note  = $this->boxes[$key][2];
+
+				// TODO If the box is also included by another module and the other module is still on, we should not remove it.
+				// For the moment, we manage this with hard coded exception
+				//print "Remove box ".$file.'<br>';
+				if ($file == 'box_graph_product_distribution.php') {
+					if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+						dol_syslog("We discard disabling of module ".$file." because another module still active require it.");
+						continue;
+					}
+				}
+
+				if (empty($file)) { $file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
+				}
+
+				if ($this->db->type == 'sqlite3') {
+					// sqlite doesn't support "USING" syntax.
+					// TODO: remove this dependency.
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes ";
+					$sql .= "WHERE ".MAIN_DB_PREFIX."boxes.box_id IN (";
+					$sql .= "SELECT ".MAIN_DB_PREFIX."boxes_def.rowid ";
+					$sql .= "FROM ".MAIN_DB_PREFIX."boxes_def ";
+					$sql .= "WHERE ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."') ";
+					$sql .= "AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
+				} else {
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
+					$sql .= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
+					$sql .= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
+					$sql .= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";
+					$sql .= " AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
+				}
+
+				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$this->error = $this->db->lasterror();
+					$err++;
+				}
+
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
+				$sql .= " WHERE file = '".$this->db->escape($file)."'";
+				$sql .= " AND entity = ".$conf->entity;
+
+				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$this->error = $this->db->lasterror();
+					$err++;
+				}
+			}
+		}
+
+		return $err;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Adds cronjobs
+	 *
+	 * @return int             Error count (0 if OK)
+	 */
+	public function insert_cronjobs()
+	{
+		// phpcs:enable
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+
+		global $conf;
+
+		$err = 0;
+
+		if (is_array($this->cronjobs)) {
+			dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
+
+			foreach ($this->cronjobs as $key => $value)
+			{
+				$entity = isset($this->cronjobs[$key]['entity']) ? $this->cronjobs[$key]['entity'] : $conf->entity;
+				$label  = isset($this->cronjobs[$key]['label']) ? $this->cronjobs[$key]['label'] : '';
+				$jobtype = isset($this->cronjobs[$key]['jobtype']) ? $this->cronjobs[$key]['jobtype'] : '';
+				$class  = isset($this->cronjobs[$key]['class']) ? $this->cronjobs[$key]['class'] : '';
+				$objectname  = isset($this->cronjobs[$key]['objectname']) ? $this->cronjobs[$key]['objectname'] : '';
+				$method = isset($this->cronjobs[$key]['method']) ? $this->cronjobs[$key]['method'] : '';
+				$command = isset($this->cronjobs[$key]['command']) ? $this->cronjobs[$key]['command'] : '';
+				$parameters  = isset($this->cronjobs[$key]['parameters']) ? $this->cronjobs[$key]['parameters'] : '';
+				$comment = isset($this->cronjobs[$key]['comment']) ? $this->cronjobs[$key]['comment'] : '';
+				$frequency = isset($this->cronjobs[$key]['frequency']) ? $this->cronjobs[$key]['frequency'] : '';
+				$unitfrequency = isset($this->cronjobs[$key]['unitfrequency']) ? $this->cronjobs[$key]['unitfrequency'] : '';
+				$priority = isset($this->cronjobs[$key]['priority']) ? $this->cronjobs[$key]['priority'] : '';
+				$datestart = isset($this->cronjobs[$key]['datestart']) ? $this->cronjobs[$key]['datestart'] : '';
+				$dateend = isset($this->cronjobs[$key]['dateend']) ? $this->cronjobs[$key]['dateend'] : '';
+				$status = isset($this->cronjobs[$key]['status']) ? $this->cronjobs[$key]['status'] : '';
+				$test = isset($this->cronjobs[$key]['test']) ? $this->cronjobs[$key]['test'] : ''; // Line must be enabled or not (so visible or not)
+
+				// Search if cron entry already present
+				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
+				$sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
+				if ($class) {
+					$sql .= " AND classesname = '".$this->db->escape($class)."'";
+				}
+				if ($objectname) {
+					$sql .= " AND objectname = '".$this->db->escape($objectname)."'";
+				}
+				if ($method) {
+					$sql .= " AND methodename = '".$this->db->escape($method)."'";
+				}
+				if ($command) {
+					$sql .= " AND command = '".$this->db->escape($command)."'";
+				}
+				$sql .= " AND entity = ".$entity; // Must be exact entity
+
+				$now = dol_now();
+
+				$result = $this->db->query($sql);
+				if ($result) {
+					$obj = $this->db->fetch_object($result);
+					if ($obj->nb == 0) {
+						$this->db->begin();
+
+						if (!$err) {
+							$sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob (module_name, datec, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,";
+							if (is_int($frequency)) { $sql .= ' frequency,'; }
+							if (is_int($unitfrequency)) { $sql .= ' unitfrequency,'; }
+							if (is_int($priority)) { $sql .= ' priority,'; }
+							if (is_int($status)) { $sql .= ' status,'; }
+							$sql .= " entity, test)";
+							$sql .= " VALUES (";
+							$sql .= "'".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."', ";
+							$sql .= "'".$this->db->idate($now)."', ";
+							$sql .= ($datestart ? "'".$this->db->idate($datestart)."'" : "'".$this->db->idate($now)."'").", ";
+							$sql .= ($dateend ? "'".$this->db->idate($dateend)."'" : "NULL").", ";
+							$sql .= "'".$this->db->escape($label)."', ";
+							$sql .= "'".$this->db->escape($jobtype)."', ";
+							$sql .= ($class ? "'".$this->db->escape($class)."'" : "null").",";
+							$sql .= ($objectname ? "'".$this->db->escape($objectname)."'" : "null").",";
+							$sql .= ($method ? "'".$this->db->escape($method)."'" : "null").",";
+							$sql .= ($command ? "'".$this->db->escape($command)."'" : "null").",";
+							$sql .= ($parameters ? "'".$this->db->escape($parameters)."'" : "null").",";
+							$sql .= ($comment ? "'".$this->db->escape($comment)."'" : "null").",";
+							if (is_int($frequency)) { $sql .= "'".$this->db->escape($frequency)."', ";
+							}
+							if (is_int($unitfrequency)) { $sql .= "'".$this->db->escape($unitfrequency)."', ";
+							}
+							if (is_int($priority)) {$sql .= "'".$this->db->escape($priority)."', ";
+							}
+							if (is_int($status)) { $sql .= "'".$this->db->escape($status)."', ";
+							}
+							$sql .= $entity.",";
+							$sql .= "'".$this->db->escape($test)."'";
+							$sql .= ")";
+
+							$resql = $this->db->query($sql);
+							if (!$resql) { $err++;
+							}
+						}
+
+						if (!$err) {
+							$this->db->commit();
+						} else {
+							$this->error = $this->db->lasterror();
+							$this->db->rollback();
+						}
+					}
+					// else box already registered into database
+				} else {
+					$this->error = $this->db->lasterror();
+					$err++;
+				}
+			}
+		}
+
+		return $err;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Removes boxes
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	public function delete_cronjobs()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		if (is_array($this->cronjobs)) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."cronjob";
+			$sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
+			$sql .= " AND entity = ".$conf->entity;
+			$sql .= " AND test = '1'"; // We delete on lines that are not set with a complete test that is '$conf->module->enabled' so when module is disabled, the cron is also removed.
+			  // For crons declared with a '$conf->module->enabled', there is no need to delete the line, so we don't loose setup if we reenable module.
+
+			dol_syslog(get_class($this)."::delete_cronjobs", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->error = $this->db->lasterror();
+				$err++;
+			}
+		}
+
+		return $err;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Removes tabs
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	public function delete_tabs()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+		$sql .= " WHERE ".$this->db->decrypt('name')." like '".$this->db->escape($this->const_name)."_TABS_%'";
+		$sql .= " AND entity = ".$conf->entity;
+
+		dol_syslog(get_class($this)."::delete_tabs", LOG_DEBUG);
+		if (!$this->db->query($sql)) {
+			$this->error = $this->db->lasterror();
+			$err++;
+		}
+
+		return $err;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Adds tabs
+	 *
+	 * @return int  Error count (0 if ok)
+	 */
+	public function insert_tabs()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		if (!empty($this->tabs)) {
+			dol_syslog(get_class($this)."::insert_tabs", LOG_DEBUG);
+
+			$i = 0;
+			foreach ($this->tabs as $key => $value)
+			{
+				if (is_array($value) && count($value) == 0) { continue; // Discard empty arrays
+				}
+
+				$entity = $conf->entity;
+				$newvalue = $value;
+
+				if (is_array($value)) {
+					$newvalue = $value['data'];
+					if (isset($value['entity'])) { $entity = $value['entity'];
+					}
+				}
+
+				if ($newvalue) {
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";
+					$sql .= "name";
+					$sql .= ", type";
+					$sql .= ", value";
+					$sql .= ", note";
+					$sql .= ", visible";
+					$sql .= ", entity";
+					$sql .= ")";
+					$sql .= " VALUES (";
+					$sql .= $this->db->encrypt($this->const_name."_TABS_".$i, 1);
+					$sql .= ", 'chaine'";
+					$sql .= ", ".$this->db->encrypt($newvalue, 1);
+					$sql .= ", null";
+					$sql .= ", '0'";
+					$sql .= ", ".$entity;
+					$sql .= ")";
+
+					$resql = $this->db->query($sql);
+					if (!$resql) {
+						 dol_syslog($this->db->lasterror(), LOG_ERR);
+						if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+							$this->error = $this->db->lasterror();
+							$this->errors[] = $this->db->lasterror();
+							$err++;
+							break;
+						}
+					}
+				}
+				$i++;
+			}
+		}
+		return $err;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Adds constants
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	public function insert_const()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		if (empty($this->const)) { return 0;
+		}
+
+		dol_syslog(get_class($this)."::insert_const", LOG_DEBUG);
+
+		foreach ($this->const as $key => $value)
+		{
+			$name      = $this->const[$key][0];
+			$type      = $this->const[$key][1];
+			$val       = $this->const[$key][2];
+			$note      = isset($this->const[$key][3]) ? $this->const[$key][3] : '';
+			$visible   = isset($this->const[$key][4]) ? $this->const[$key][4] : 0;
+			$entity    = (!empty($this->const[$key][5]) && $this->const[$key][5] != 'current') ? 0 : $conf->entity;
+
+			// Clean
+			if (empty($visible)) { $visible = '0';
+			}
+			if (empty($val) && $val != '0') { $val = '';
+			}
+
+			$sql = "SELECT count(*)";
+			$sql .= " FROM ".MAIN_DB_PREFIX."const";
+			$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
+			$sql .= " AND entity = ".$entity;
+
+			$result = $this->db->query($sql);
+			if ($result) {
+				$row = $this->db->fetch_row($result);
+
+				if ($row[0] == 0)   // If not found
+				{
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
+					$sql .= " VALUES (";
+					$sql .= $this->db->encrypt($name, 1);
+					$sql .= ",'".$this->db->escape($type)."'";
+					$sql .= ",".(($val != '') ? $this->db->encrypt($val, 1) : "''");
+					$sql .= ",".($note ? "'".$this->db->escape($note)."'" : "null");
+					$sql .= ",'".$this->db->escape($visible)."'";
+					$sql .= ",".$entity;
+					$sql .= ")";
+
+					if (!$this->db->query($sql)) {
+						$err++;
+					}
+				} else {
+					dol_syslog(get_class($this)."::insert_const constant '".$name."' already exists", LOG_WARNING);
+				}
+			} else {
+				$err++;
+			}
+		}
+
+		return $err;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Removes constants tagged 'deleteonunactive'
+	 *
+	 * @return int <0 if KO, 0 if OK
+	 */
+	public function delete_const()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		if (empty($this->const)) { return 0;
+		}
+
+		foreach ($this->const as $key => $value)
+		{
+			$name = $this->const[$key][0];
+			$deleteonunactive = (!empty($this->const[$key][6])) ? 1 : 0;
+
+			if ($deleteonunactive) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+				$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
+				$sql .= " AND entity in (0, ".$conf->entity.")";
+				dol_syslog(get_class($this)."::delete_const", LOG_DEBUG);
+				if (!$this->db->query($sql)) {
+					$this->error = $this->db->lasterror();
+					$err++;
+				}
+			}
+		}
+
+		return $err;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Adds access rights
+	 *
+	 * @param  int $reinitadminperms If 1, we also grant them to all admin users
+	 * @param  int $force_entity     Force current entity
+	 * @param  int $notrigger        1=Does not execute triggers, 0= execute triggers
+	 * @return int                     Error count (0 if OK)
+	 */
+	public function insert_permissions($reinitadminperms = 0, $force_entity = null, $notrigger = 0)
+	{
+		// phpcs:enable
+		global $conf, $user;
+
+		$err = 0;
+		$entity = (!empty($force_entity) ? $force_entity : $conf->entity);
+
+		dol_syslog(get_class($this)."::insert_permissions", LOG_DEBUG);
+
+		// Test if module is activated
+		$sql_del = "SELECT ".$this->db->decrypt('value')." as value";
+		$sql_del .= " FROM ".MAIN_DB_PREFIX."const";
+		$sql_del .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+		$sql_del .= " AND entity IN (0,".$entity.")";
+
+		$resql = $this->db->query($sql_del);
+
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj !== null && !empty($obj->value) && !empty($this->rights)) {
+				// If the module is active
+				foreach ($this->rights as $key => $value)
+				{
+					$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_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";
+					$sql .= " WHERE id = ".$r_id." AND entity = ".$entity;
+
+					$resqlselect = $this->db->query($sql);
+					if ($resqlselect) {
+						$objcount = $this->db->fetch_object($resqlselect);
+						if ($objcount && $objcount->nb == 0) {
+							if (dol_strlen($r_perms)) {
+								if (dol_strlen($r_subperms)) {
+									$sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
+									$sql .= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
+									$sql .= " VALUES ";
+									$sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$this->db->escape($r_modul)."','".$this->db->escape($r_type)."',".$r_def.",'".$this->db->escape($r_perms)."','".$this->db->escape($r_subperms)."')";
+								} else {
+									$sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
+									$sql .= " (id, entity, libelle, module, type, bydefault, perms)";
+									$sql .= " VALUES ";
+									$sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$this->db->escape($r_modul)."','".$this->db->escape($r_type)."',".$r_def.",'".$this->db->escape($r_perms)."')";
+								}
+							} else {
+								 $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
+								 $sql .= " (id, entity, libelle, module, type, bydefault)";
+								 $sql .= " VALUES ";
+								 $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$this->db->escape($r_modul)."','".$this->db->escape($r_type)."',".$r_def.")";
+							}
+
+							$resqlinsert = $this->db->query($sql, 1);
+
+							if (!$resqlinsert) {
+								if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS") {
+									$this->error = $this->db->lasterror();
+									$err++;
+									break;
+								} else { dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
+								}
+							}
+
+							$this->db->free($resqlinsert);
+						}
+
+						$this->db->free($resqlselect);
+					}
+
+					// If we want to init permissions on admin users
+					if ($reinitadminperms) {
+						if (!class_exists('User')) {
+							include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+						}
+						$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1";
+						dol_syslog(get_class($this)."::insert_permissions Search all admin users", LOG_DEBUG);
+						$resqlseladmin = $this->db->query($sql, 1);
+						if ($resqlseladmin) {
+							$num = $this->db->num_rows($resqlseladmin);
+							$i = 0;
+							while ($i < $num)
+							{
+								  $obj2 = $this->db->fetch_object($resqlseladmin);
+								  dol_syslog(get_class($this)."::insert_permissions Add permission to user id=".$obj2->rowid);
+
+								  $tmpuser = new User($this->db);
+								  $result = $tmpuser->fetch($obj2->rowid);
+								if ($result > 0) {
+									$tmpuser->addrights($r_id, '', '', 0, 1);
+								} else {
+									dol_syslog(get_class($this)."::insert_permissions Failed to add the permission to user because fetch return an error", LOG_ERR);
+								}
+								 $i++;
+							}
+						} else {
+							dol_print_error($this->db);
+						}
+					}
+				}
+
+				if ($reinitadminperms && !empty($user->admin))  // Reload permission for current user if defined
+				{
+					// We reload permissions
+					$user->clearrights();
+					$user->getrights();
+				}
+			}
+			$this->db->free($resql);
+		} else {
+			$this->error = $this->db->lasterror();
+			$err++;
+		}
+
+		return $err;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Removes access rights
+	 *
+	 * @return int                     Error count (0 if OK)
+	 */
+	public function delete_permissions()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def";
+		$sql .= " WHERE module = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
+		$sql .= " AND entity = ".$conf->entity;
+		dol_syslog(get_class($this)."::delete_permissions", LOG_DEBUG);
+		if (!$this->db->query($sql)) {
+			$this->error = $this->db->lasterror();
+			$err++;
+		}
+
+		return $err;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Adds menu entries
+	 *
+	 * @return int     Error count (0 if OK)
+	 */
+	public function insert_menus()
+	{
+		// phpcs:enable
+		global $user;
+
+		if (!is_array($this->menu) || empty($this->menu)) { return 0;
+		}
+
+		include_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
+
+		dol_syslog(get_class($this)."::insert_menus", LOG_DEBUG);
+
+		$err = 0;
+
+		$this->db->begin();
+
+		foreach ($this->menu as $key => $value)
+		{
+			$menu = new Menubase($this->db);
+			$menu->menu_handler = 'all';
+
+			//$menu->module=strtolower($this->name);    TODO When right_class will be same than module name
+			$menu->module = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
+
+			if (!$this->menu[$key]['fk_menu']) {
+				$menu->fk_menu = 0;
+			} else {
+				$foundparent = 0;
+				$fk_parent = $this->menu[$key]['fk_menu'];
+				if (preg_match('/^r=/', $fk_parent))    // old deprecated method
+				{
+					$fk_parent = str_replace('r=', '', $fk_parent);
+					if (isset($this->menu[$fk_parent]['rowid'])) {
+						$menu->fk_menu = $this->menu[$fk_parent]['rowid'];
+						$foundparent = 1;
+					}
+				} elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+),fk_leftmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
+					$menu->fk_menu = -1;
+					$menu->fk_mainmenu = $reg[1];
+					$menu->fk_leftmenu = $reg[2];
+					$foundparent = 1;
+				} elseif (preg_match('/^fk_mainmenu=([a-zA-Z0-9_]+)$/', $fk_parent, $reg)) {
+					$menu->fk_menu = -1;
+					$menu->fk_mainmenu = $reg[1];
+					$menu->fk_leftmenu = '';
+					$foundparent = 1;
+				}
+				if (!$foundparent) {
+					$this->error = "ErrorBadDefinitionOfMenuArrayInModuleDescriptor";
+					dol_syslog(get_class($this)."::insert_menus ".$this->error." ".$this->menu[$key]['fk_menu'], LOG_ERR);
+					$err++;
+				}
+			}
+			$menu->type = $this->menu[$key]['type'];
+			$menu->mainmenu = isset($this->menu[$key]['mainmenu']) ? $this->menu[$key]['mainmenu'] : (isset($menu->fk_mainmenu) ? $menu->fk_mainmenu : '');
+			$menu->leftmenu = isset($this->menu[$key]['leftmenu']) ? $this->menu[$key]['leftmenu'] : '';
+			$menu->title = $this->menu[$key]['titre'];
+			$menu->url = $this->menu[$key]['url'];
+			$menu->langs = $this->menu[$key]['langs'];
+			$menu->position = $this->menu[$key]['position'];
+			$menu->perms = $this->menu[$key]['perms'];
+			$menu->target = isset($this->menu[$key]['target']) ? $this->menu[$key]['target'] : '';
+			$menu->user = $this->menu[$key]['user'];
+			$menu->enabled = isset($this->menu[$key]['enabled']) ? $this->menu[$key]['enabled'] : 0;
+			$menu->position = $this->menu[$key]['position'];
+
+			if (!$err) {
+				$result = $menu->create($user); // Save menu entry into table llx_menu
+				if ($result > 0) {
+					$this->menu[$key]['rowid'] = $result;
+				} else {
+					$this->error = $menu->error;
+					dol_syslog(get_class($this).'::insert_menus result='.$result." ".$this->error, LOG_ERR);
+					$err++;
+					break;
+				}
+			}
+		}
+
+		if (!$err) {
+			$this->db->commit();
+		} else {
+			dol_syslog(get_class($this)."::insert_menus ".$this->error, LOG_ERR);
+			$this->db->rollback();
+		}
+
+		return $err;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Removes menu entries
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	public function delete_menus()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		//$module=strtolower($this->name);        TODO When right_class will be same than module name
+		$module = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
+		$sql .= " WHERE module = '".$this->db->escape($module)."'";
+		$sql .= " AND entity = ".$conf->entity;
+
+		dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error = $this->db->lasterror();
+			$err++;
+		}
+
+		return $err;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Creates directories
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	public function create_dirs()
+	{
+		// phpcs:enable
+		global $langs, $conf;
+
+		$err = 0;
+
+		if (isset($this->dirs) && is_array($this->dirs)) {
+			foreach ($this->dirs as $key => $value)
+			{
+				$addtodatabase = 0;
+
+				if (!is_array($value)) { $dir = $value; // Default simple mode
+				} else {
+					$constname = $this->const_name."_DIR_";
+					$dir       = $this->dirs[$key][1];
+					$addtodatabase = empty($this->dirs[$key][2]) ? '' : $this->dirs[$key][2]; // Create constante in llx_const
+					$subname   = empty($this->dirs[$key][3]) ? '' : strtoupper($this->dirs[$key][3]); // Add submodule name (ex: $conf->module->submodule->dir_output)
+					$forcename = empty($this->dirs[$key][4]) ? '' : strtoupper($this->dirs[$key][4]); // Change the module name if different
+
+					if (!empty($forcename)) { $constname = 'MAIN_MODULE_'.$forcename."_DIR_";
+					}
+					if (!empty($subname)) {   $constname = $constname.$subname."_";
+					}
+
+					$name = $constname.strtoupper($this->dirs[$key][0]);
+				}
+
+				// Define directory full path ($dir must start with "/")
+				if (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || $conf->entity == 1) { $fulldir = DOL_DATA_ROOT.$dir;
+				} else { $fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir;
+				}
+				// Create dir if it does not exists
+				if (!empty($fulldir) && !file_exists($fulldir)) {
+					if (dol_mkdir($fulldir, DOL_DATA_ROOT) < 0) {
+						 $this->error = $langs->trans("ErrorCanNotCreateDir", $fulldir);
+						 dol_syslog(get_class($this)."::_init ".$this->error, LOG_ERR);
+						 $err++;
+					}
+				}
+
+				// Define the constant in database if requested (not the default mode)
+				if (!empty($addtodatabase)) {
+					$result = $this->insert_dirs($name, $dir);
+					if ($result) { $err++;
+					}
+				}
+			}
+		}
+
+		return $err;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Adds directories definitions
+	 *
+	 * @param string $name Name
+	 * @param string $dir  Directory
+	 *
+	 * @return int             Error count (0 if OK)
+	 */
+	public function insert_dirs($name, $dir)
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		$sql = "SELECT count(*)";
+		$sql .= " FROM ".MAIN_DB_PREFIX."const";
+		$sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'";
+		$sql .= " AND entity = ".$conf->entity;
+
+		dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$row = $this->db->fetch_row($result);
+
+			if ($row[0] == 0) {
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
+				$sql .= " VALUES (".$this->db->encrypt($name, 1).",'chaine',".$this->db->encrypt($dir, 1).",'Directory for module ".$this->name."','0',".$conf->entity.")";
+
+				dol_syslog(get_class($this)."::insert_dirs", LOG_DEBUG);
+				$this->db->query($sql);
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$err++;
+		}
+
+		return $err;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Removes directories
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	public function delete_dirs()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+		$sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_DIR_%'";
+		$sql .= " AND entity = ".$conf->entity;
+
+		dol_syslog(get_class($this)."::delete_dirs", LOG_DEBUG);
+		if (!$this->db->query($sql)) {
+			$this->error = $this->db->lasterror();
+			$err++;
+		}
+
+		return $err;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Adds generic parts
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	public function insert_module_parts()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$error = 0;
+
+		if (is_array($this->module_parts) && !empty($this->module_parts)) {
+			foreach ($this->module_parts as $key => $value)
+			{
+				if (is_array($value) && count($value) == 0) { continue; // Discard empty arrays
+				}
+
+				$entity = $conf->entity; // Reset the current entity
+				$newvalue = $value;
+
+				// Serialize array parameters
+				if (is_array($value)) {
+					// Can defined other parameters
+					// Example when $key='hooks', then $value is an array('data'=>array('hookcontext1','hookcontext2'), 'entity'=>X)
+					if (isset($value['data']) && is_array($value['data'])) {
+						$newvalue = json_encode($value['data']);
+						if (isset($value['entity'])) { $entity = $value['entity'];
+						}
+					} elseif (isset($value['data']) && !is_array($value['data'])) {
+						$newvalue = $value['data'];
+						if (isset($value['entity'])) { $entity = $value['entity'];
+						}
+					} else // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
+					{
+						$newvalue = json_encode($value);
+					}
+				}
+
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";
+				$sql .= "name";
+				$sql .= ", type";
+				$sql .= ", value";
+				$sql .= ", note";
+				$sql .= ", visible";
+				$sql .= ", entity";
+				$sql .= ")";
+				$sql .= " VALUES (";
+				$sql .= $this->db->encrypt($this->const_name."_".strtoupper($key), 1);
+				$sql .= ", 'chaine'";
+				$sql .= ", ".$this->db->encrypt($newvalue, 1);
+				$sql .= ", null";
+				$sql .= ", '0'";
+				$sql .= ", ".$entity;
+				$sql .= ")";
+
+				dol_syslog(get_class($this)."::insert_module_parts for key=".$this->const_name."_".strtoupper($key), LOG_DEBUG);
+
+				$resql = $this->db->query($sql, 1);
+				if (!$resql) {
+					if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+						 $error++;
+						 $this->error = $this->db->lasterror();
+					} else {
+						 dol_syslog(get_class($this)."::insert_module_parts for ".$this->const_name."_".strtoupper($key)." Record already exists.", LOG_WARNING);
+					}
+				}
+			}
+		}
+		return $error;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Removes generic parts
+	 *
+	 * @return int Error count (0 if OK)
+	 */
+	public function delete_module_parts()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$err = 0;
+		$entity = $conf->entity;
+
+		if (is_array($this->module_parts) && !empty($this->module_parts)) {
+			foreach ($this->module_parts as $key => $value)
+			{
+				// If entity is defined
+				if (is_array($value) && isset($value['entity'])) { $entity = $value['entity'];
+				}
+
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+				$sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_".strtoupper($key)."'";
+				$sql .= " AND entity = ".$entity;
+
+				dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
+				if (!$this->db->query($sql)) {
+					$this->error = $this->db->lasterror();
+					$err++;
+				}
+			}
+		}
+		return $err;
+	}
+
+	/**
+	 * Function called when module is enabled.
+	 * The init function adds tabs, 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')
+	 *                         'noboxes' = Do not insert boxes 'newboxdefonly' = For boxes,
+	 *                         insert def of boxes only and not boxes activation
+	 * @return int                1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		return $this->_init(array(), $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 = '')
+	{
+		return $this->_remove(array(), $options);
+	}
+
+
+	/**
+	 * Return Kanban view of a module
+	 *
+	 * @param	string	$codeenabledisable		HTML code for button to enable/disable module
+	 * @param	string	$codetoconfig			HTML code to go to config page
+	 * @return 	string							HTML code of Kanban view
+	 */
+	public function getKanbanView($codeenabledisable = '', $codetoconfig = '')
+	{
+		global $conf, $langs;
+
+		// Define imginfo
+		$imginfo = "info";
+		if ($this->isCoreOrExternalModule() == 'external')
+		{
+			$imginfo = "info_black";
+		}
+
+		$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($this)));
+
+		$version = $this->getVersion(0);
+		$versiontrans = '';
+		if (preg_match('/development/i', $version))  $versiontrans .= 'warning';
+		if (preg_match('/experimental/i', $version)) $versiontrans .= 'warning';
+		if (preg_match('/deprecated/i', $version))   $versiontrans .= 'warning';
 
 		print '
     	<div class="box-flex-item info-box-module'.(empty($conf->global->$const_name) ? ' info-box-module-disabled' : '').($this->isCoreOrExternalModule() == 'external' ? ' info-box-module-external' : '').'">
 	    <div class="info-box info-box-sm info-box-module">
-	    <div class="info-box-icon">';
+	    <div class="info-box-icon'.(empty($conf->global->$const_name) ? '' : ' info-box-icon-module-enabled'.($versiontrans ? ' info-box-icon-module-warning' : '')).'">';
 
 		$alttext = '';
 		//if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
@@ -2290,45 +2234,23 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		{
 			if (preg_match('/^\//i', $this->picto)) print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle"', 1);
 			else print img_object($alttext, $this->picto, 'class="inline-block valignmiddle"');
-		}
-		else
-		{
+		} else {
 			print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
 		}
 
-		$version = $this->getVersion(0);
-		$versiontrans = '';
-		if (preg_match('/development/i', $version))  $versiontrans .= 'warning';
-		if (preg_match('/experimental/i', $version)) $versiontrans .= 'warning';
-		if (preg_match('/deprecated/i', $version))   $versiontrans .= 'warning';
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			print '<span class="info-box-icon-version'.($versiontrans? ' '.$versiontrans : '').'" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
+			print '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').'" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
 			print $this->getVersion(1);
 			print '</span>';
 		}
 
-		/*print '<span class="info-box-icon-action">';
-		print '<div class="valignmiddle inline-block">';
-		print '<div class="valignmiddle inline-block">';
-		print $codeenabledisable;
-		print '</div>';
-		print '<div class="valignmiddle inline-block marginleftonly">';
-		print $codetoconfig;
-		print '</div>';
-		print '</div>';
-		print '</span>';
-		*/
-
 		print '</div>
-	    <div class="info-box-content info-box-text-module">
+	    <div class="info-box-content info-box-text-module'.(empty($conf->global->$const_name) ? '' : ' info-box-module-enabled'.($versiontrans ? ' info-box-content-warning' : '')).'">
 	    <span class="info-box-title">'.$this->getName().'</span>
 	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
 
-		/*print '<span class="info-box-icon-version" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
-		print $this->getVersion(1);
-		print '</span>'; */
-
 		print '<div class="valignmiddle inline-block info-box-more">';
+		//if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
 		print '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$this->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
 		print '</div><br>';
 
@@ -2345,5 +2267,5 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	    </div><!-- /.info-box-content -->
 	    </div><!-- /.info-box -->
 	    </div>';
-    }
+	}
 }
diff --git a/htdocs/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
index bf957175f84..27260748662 100644
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -85,9 +85,7 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 		if (!empty($conf->global->ACTION_EVENT_ADDON_PDF))
 		{
 			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
-		}
-		else
-		{
+		} else {
 			$modele = 'soleil';
 		}
 	}
@@ -141,16 +139,12 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 			dol_delete_preview($object);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "action_pdf_create Error: ".$obj->error);
 			return 0;
 		}
-	}
-	else
-	{
+	} else {
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index b978bed1eab..0b489e7202c 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -295,8 +295,7 @@ class CommActionRapport
 				if ($obj->dp2) {
 					if (dol_print_date($this->db->jdate($obj->dp), "day") != dol_print_date($this->db->jdate($obj->dp2), "day"))
 						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
-					else
-						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					else $textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
 				}
 				$textdate = $outputlangs->trans("ID").' '.$obj->id.' - '.$textdate;
 				$pdf->MultiCell(45 - $this->marge_gauche, $height, $textdate, 0, 'L', 0);
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 1bf2b836269..27b40d48257 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -41,8 +41,8 @@ class pdf_ban extends ModeleBankAccountDoc
 	public $emetteur;
 
 	/**
-     * @var string Dolibarr version of the loaded document
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'development';
 
 	/**
@@ -50,12 +50,12 @@ class pdf_ban extends ModeleBankAccountDoc
 	 *
 	 *  @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", "bank", "withdrawals", "companies"));
+		$langs->loadLangs(array("main", "bank", "withdrawals", "companies"));
 
 		$this->db = $db;
 		$this->name = "ban";
@@ -89,7 +89,7 @@ class pdf_ban extends ModeleBankAccountDoc
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fonction generant le projet sur le disque
 	 *
@@ -97,9 +97,9 @@ class pdf_ban extends ModeleBankAccountDoc
 	 *	@param	Translate	$outputlangs	Lang output object
 	 *	@return	int         				1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs)
+	public function write_file($object, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -113,18 +113,16 @@ class pdf_ban extends ModeleBankAccountDoc
 		{
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
-		    // Definition of $dir and $file
-		    if ($object->specimen)
-		    {
-		        $dir = $conf->bank->dir_output;
-		        $file = $dir."/SPECIMEN.pdf";
-		    }
-		    else
-		    {
-		        $objectref = dol_sanitizeFileName($object->ref);
-		        $dir = $conf->bank->dir_output."/".$objectref;
-		        $file = $dir."/".$objectref.".pdf";
-		    }
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->bank->dir_output;
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->bank->dir_output."/".$objectref;
+				$file = $dir."/".$objectref.".pdf";
+			}
 
 			if (!file_exists($dir))
 			{
@@ -148,20 +146,20 @@ class pdf_ban extends ModeleBankAccountDoc
 				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
-                $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)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
-                $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$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)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$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;
@@ -187,7 +185,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				$tab_top = 50;
 				$tab_height = 200;
 				$tab_top_newpage = 40;
-                $tab_height_newpage = 210;
+				$tab_height_newpage = 210;
 
 				// Affiche notes
 				if (!empty($object->note_public))
@@ -203,9 +201,7 @@ class pdf_ban extends ModeleBankAccountDoc
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -223,9 +219,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -252,8 +246,8 @@ class pdf_ban extends ModeleBankAccountDoc
 				$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))
@@ -262,9 +256,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -288,19 +280,19 @@ class pdf_ban extends ModeleBankAccountDoc
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-    protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		// phpcs:enable
 		global $conf, $mysoc;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Project		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -318,7 +310,7 @@ class pdf_ban extends ModeleBankAccountDoc
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 		$posy = $this->marge_haute;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
@@ -329,18 +321,15 @@ class pdf_ban extends ModeleBankAccountDoc
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -387,8 +376,8 @@ class pdf_ban extends ModeleBankAccountDoc
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Project		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index 23868eef643..b6e4cbc191a 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -43,9 +43,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	public $emetteur;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
 	/**
@@ -53,7 +53,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-    public function __construct($db)
+	public function __construct($db)
 	{
 		global $conf, $langs, $mysoc;
 
@@ -88,22 +88,22 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *  Fonction generant le projet sur le disque
 	 *
 	 *	@param	    Project		$object   		    Object project a generer
 	 *	@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 (not used for this template)
-     *  @param		int			$hidedesc			Do not show desc (not used for this template)
-     *  @param		int			$hideref			Do not show ref (not used for this template)
-     *  @param      null|array  $moreparams         More parameters
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details (not used for this template)
+	 *  @param		int			$hidedesc			Do not show desc (not used for this template)
+	 *  @param		int			$hideref			Do not show ref (not used for this template)
+	 *  @param      null|array  $moreparams         More parameters
 	 *	@return	    int         				    1 if OK, <=0 if KO
 	 */
-    public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $hookmanager, $langs, $user, $mysoc;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -117,20 +117,18 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		{
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
-		    // Definition of $dir and $file
-		    if ($object->specimen)
-		    {
-		        if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
-		        else $dir = $conf->bank->dir_output;
-		        $file = $dir."/SPECIMEN.pdf";
-		    }
-		    else
-		    {
-		        $objectref = dol_sanitizeFileName($object->ref);
-		        if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
-		        else $dir = $conf->bank->dir_output."/".$objectref;
-		        $file = $dir."/".$langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref."-".dol_sanitizeFileName($object->rum).".pdf";
-		    }
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
+				else $dir = $conf->bank->dir_output;
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
+				else $dir = $conf->bank->dir_output."/".$objectref;
+				$file = $dir."/".$langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref."-".dol_sanitizeFileName($object->rum).".pdf";
+			}
 
 			if (!file_exists($dir))
 			{
@@ -154,20 +152,20 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				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
-                $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)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
-                $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$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)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$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,7 +191,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$tab_top = 50;
 				$tab_height = 200;
 				$tab_top_newpage = 40;
-                $tab_height_newpage = 210;
+				$tab_height_newpage = 210;
 
 				// Show notes
 				if (!empty($object->note_public))
@@ -209,9 +207,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -275,7 +271,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$sepaname = '______________________________________________';
 				if ($thirdparty->id > 0)
 				{
-				    $sepaname = $thirdparty->name.($object->account_owner ? ' ('.$object->account_owner.')' : '');
+					$sepaname = $thirdparty->name.($object->account_owner ? ' ('.$object->account_owner.')' : '');
 				}
 				$posY = $pdf->GetY();
 				$posY += 3;
@@ -296,7 +292,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$address = '______________________________________________';
 				if ($thirdparty->id > 0)
 				{
-				    $address = $thirdparty->getFullAddress();
+					$address = $thirdparty->getFullAddress();
 				}
 				$posY = $pdf->GetY();
 				$posY += 1;
@@ -306,9 +302,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
 				if (preg_match('/_____/', $address))
 				{
-    				$posY += 6;
-    				$pdf->SetXY(80, $posY);
-    				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
+					$posY += 6;
+					$pdf->SetXY(80, $posY);
+					$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
 				}
 
 				$ban = '__________________________________________________';
@@ -350,10 +346,10 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				if (empty($object->frstrecur))
 				{
-    				$posY += 6;
-    				$pdf->SetXY(80, $posY);
-				    $txt = '('.$langs->transnoentitiesnoconv("PleaseCheckOne").')';
-    				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
+					$posY += 6;
+					$pdf->SetXY(80, $posY);
+					$txt = '('.$langs->transnoentitiesnoconv("PleaseCheckOne").')';
+					$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				}
 
 				$posY = $pdf->GetY();
@@ -367,9 +363,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -405,8 +399,8 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$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))
@@ -415,9 +409,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -432,7 +424,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -441,12 +433,12 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-    protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
 		// phpcs:enable
 		global $conf, $mysoc;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 	}
 
 
@@ -455,7 +447,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Object		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
@@ -463,27 +455,27 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
-        global $conf, $mysoc;
+		// phpcs:enable
+		global $conf, $mysoc;
 
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    $diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 1 : $conf->global->PDF_DIFFSIZE_TITLE);
+		$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 1 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-	    $posy += $this->_signature_area($pdf, $object, $posy, $outputlangs);
+		$posy += $this->_signature_area($pdf, $object, $posy, $outputlangs);
 
-	    $pdf->SetXY($this->marge_gauche, $posy);
-	    $pdf->SetFont('', '', $default_font_size);
-	    $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("PleaseReturnMandate", $mysoc->email).':', 0, 'L', 0);
-	    $posy = $pdf->GetY() + 2;
+		$pdf->SetXY($this->marge_gauche, $posy);
+		$pdf->SetFont('', '', $default_font_size);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("PleaseReturnMandate", $mysoc->email).':', 0, 'L', 0);
+		$posy = $pdf->GetY() + 2;
 
-	    $pdf->SetXY($this->marge_gauche, $posy);
-	    $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-	    $pdf->MultiCell(100, 6, $mysoc->name, 0, 'L', 0);
+		$pdf->SetXY($this->marge_gauche, $posy);
+		$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
+		$pdf->MultiCell(100, 6, $mysoc->name, 0, 'L', 0);
 		$pdf->MultiCell(100, 6, $outputlangs->convToOutputCharset($mysoc->getFullAddress()), 0, 'L', 0);
 		$posy = $pdf->GetY() + 2;
 
-	    return $posy;
+		return $posy;
 	}
 
 
@@ -493,7 +485,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	/**
 	 *	Show area for the customer to sign
 	 *
-	 *	@param	PDF			$pdf            Object PDF
+	 *	@param	TCPDF		$pdf           Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
@@ -501,33 +493,33 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	 */
 	protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
-	    $tab_top = $posy + 4;
-	    $tab_hl = 4;
+		// phpcs:enable
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+		$tab_top = $posy + 4;
+		$tab_hl = 4;
 
-	    $posx = $this->marge_gauche;
-	    $pdf->SetXY($posx, $tab_top + 0);
+		$posx = $this->marge_gauche;
+		$pdf->SetXY($posx, $tab_top + 0);
 
-	    $pdf->SetFont('', '', $default_font_size - 2);
+		$pdf->SetFont('', '', $default_font_size - 2);
 
-	    $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateOfSignature"), 0, 'L', 0);
-	    $pdf->MultiCell(100, 3, ' ');
-	    $pdf->MultiCell(100, 3, '______________________', 0, 'L', 0);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateOfSignature"), 0, 'L', 0);
+		$pdf->MultiCell(100, 3, ' ');
+		$pdf->MultiCell(100, 3, '______________________', 0, 'L', 0);
 
-	    $posx = 120;
-	    $largcol = ($this->page_largeur - $this->marge_droite - $posx);
-	    $useborder = 0;
-	    $index = 0;
-	    // Total HT
-	    $pdf->SetFillColor(255, 255, 255);
-	    $pdf->SetXY($posx, $tab_top + 0);
-	    $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', 1);
+		$posx = 120;
+		$largcol = ($this->page_largeur - $this->marge_droite - $posx);
+		$useborder = 0;
+		$index = 0;
+		// Total HT
+		$pdf->SetFillColor(255, 255, 255);
+		$pdf->SetXY($posx, $tab_top + 0);
+		$pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', 1);
 
-	    $pdf->SetXY($posx, $tab_top + $tab_hl);
-	    $pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
+		$pdf->SetXY($posx, $tab_top + $tab_hl);
+		$pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
 
-	    return ($tab_hl * 7);
+		return ($tab_hl * 7);
 	}
 
 
@@ -535,7 +527,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Project		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -553,7 +545,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 		$posy = $this->marge_haute;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
@@ -564,18 +556,15 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -589,9 +578,8 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		$daterum = '__________________';
 		if (!empty($object->date_rum))
 		{
-            $daterum = dol_print_date($object->date_rum, 'day', false, $outputlangs, true);
-		}
-		else $daterum = dol_print_date($object->datec, 'day', false, $outputlangs, true); // For old record, the date_rum was not saved.
+			$daterum = dol_print_date($object->date_rum, 'day', false, $outputlangs, true);
+		} else $daterum = dol_print_date($object->datec, 'day', false, $outputlangs, true); // For old record, the date_rum was not saved.
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".$daterum, '', 'R');
 		/*$posy+=6;
 		$pdf->SetXY($posx,$posy);
@@ -628,8 +616,8 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Project		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 5b561f90c1c..5d43609e7de 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -204,33 +204,24 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)))
 		{
 			$result = -2;
-		}
-		else
-		{
+		} else {
 			if ($this->verif_syntax($code, $type) >= 0)
 			{
 				$is_dispo = $this->verif_dispo($db, $code, $product);
 				if ($is_dispo <> 0)
 				{
 					$result = -3;
-				}
-				else
-				{
+				} else {
 					$result = 0;
 				}
-			}
-			else
-			{
+			} else {
 				if (dol_strlen($code) == 0)
 				{
 					$result = -2;
-				}
-				else
-				{
+				} else {
 					$result = -1;
 				}
 			}
@@ -254,7 +245,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	{
         // phpcs:enable
 		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
-		$sql .= " WHERE barcode = '".$code."'";
+		$sql .= " WHERE barcode = '".$db->escape($code)."'";
 		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
 
 		$resql = $db->query($sql);
@@ -263,14 +254,10 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
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 9755369793e..9b22b04800d 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
@@ -48,9 +48,9 @@ class doc_generic_bom_odt extends ModelePDFBom
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * @var string Dolibarr version of the loaded document
@@ -130,8 +130,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -267,9 +266,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -301,9 +298,7 @@ class doc_generic_bom_odt extends ModelePDFBom
                			// 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -336,8 +331,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -353,8 +347,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -385,25 +378,21 @@ class doc_generic_bom_odt extends ModelePDFBom
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -422,15 +411,12 @@ class doc_generic_bom_odt extends ModelePDFBom
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -439,8 +425,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -453,8 +438,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -474,8 +458,7 @@ class doc_generic_bom_odt extends ModelePDFBom
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -496,9 +479,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index 2440a36feff..7d5486d5c41 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -129,9 +129,7 @@ class mod_bom_standard extends ModeleNumRefboms
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_bom_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index ec6f52dfec7..17ae82145df 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -68,17 +68,17 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$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;
 
-        // Retrieves transmitter
-        $this->emetteur = $mysoc;
-        if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		// Retrieves transmitter
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
-        // Define column position
-        $this->line_height = 5;
+		// Define column position
+		$this->line_height = 5;
 		$this->line_per_page = 40;
 		$this->tab_height = 200; //$this->line_height * $this->line_per_page;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fonction to generate document on disk
 	 *
@@ -86,19 +86,19 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	 *	@param	string			$_dir			Directory
 	 *	@param	string			$number			Number
 	 *	@param	Translate		$outputlangs	Lang output object
-     *	@return	int     						1=ok, 0=ko
+	 *	@return	int     						1=ok, 0=ko
 	 */
 	public function write_file($object, $_dir, $number, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $conf, $langs, $hookmanager;
 
-        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
-        $sav_charset_output = $outputlangs->charset_output;
-        if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		$sav_charset_output = $outputlangs->charset_output;
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
-        // Load traductions files required by page
+		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
 
 		$dir = $_dir."/".get_exdir($number, 0, 1, 0, $object, 'cheque').$number;
@@ -128,19 +128,19 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 		// Create PDF instance
-        $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)
-        if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
-        $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)
+		if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+		$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;
@@ -170,7 +170,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		}
 
 		$pdf->AddPage();
-        $pagenb++;
+		$pagenb++;
 		$this->Header($pdf, $pagenb, $pages, $outputlangs);
 
 		$this->Body($pdf, $pagenb, $pages, $outputlangs);
@@ -195,8 +195,8 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$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))
@@ -204,16 +204,16 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 
 		$this->result = array('fullpath'=>$file);
 
-        $outputlangs->charset_output = $sav_charset_output;
-	    return 1; // No error
+		$outputlangs->charset_output = $sav_charset_output;
+		return 1; // No error
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Generate Header
 	 *
-	 *	@param  PDF			$pdf        	Pdf object
+	 *	@param  TCPDF		$pdf        	Pdf object
 	 *	@param  int			$page        	Current page number
 	 *	@param  int			$pages       	Total number of pages
 	 *	@param	Translate	$outputlangs	Object language for output
@@ -221,7 +221,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	 */
 	public function Header(&$pdf, $page, $pages, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -230,47 +230,47 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 
 		$title = $outputlangs->transnoentities("CheckReceipt");
 		$pdf->SetFont('', 'B', $default_font_size);
-        $pdf->SetXY(10, 8);
-        $pdf->MultiCell(0, 2, $title, 0, 'L');
+		$pdf->SetXY(10, 8);
+		$pdf->MultiCell(0, 2, $title, 0, 'L');
 
 		$pdf->SetFont('', '', $default_font_size);
-        $pdf->SetXY(10, 15);
+		$pdf->SetXY(10, 15);
 		$pdf->MultiCell(22, 2, $outputlangs->transnoentities("Ref"), 0, 'L');
-        $pdf->SetXY(32, 15);
+		$pdf->SetXY(32, 15);
 		$pdf->SetFont('', '', $default_font_size);
-        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext ? " - ".$this->ref_ext : '')), 0, 'L');
+		$pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext ? " - ".$this->ref_ext : '')), 0, 'L');
 
 		$pdf->SetFont('', '', $default_font_size);
-        $pdf->SetXY(10, 20);
-        $pdf->MultiCell(22, 2, $outputlangs->transnoentities("Date"), 0, 'L');
-        $pdf->SetXY(32, 20);
-        $pdf->SetFont('', '', $default_font_size);
-        $pdf->MultiCell(60, 2, dol_print_date($this->date, "day", false, $outputlangs));
+		$pdf->SetXY(10, 20);
+		$pdf->MultiCell(22, 2, $outputlangs->transnoentities("Date"), 0, 'L');
+		$pdf->SetXY(32, 20);
+		$pdf->SetFont('', '', $default_font_size);
+		$pdf->MultiCell(60, 2, dol_print_date($this->date, "day", false, $outputlangs));
 
 		$pdf->SetFont('', '', $default_font_size);
-        $pdf->SetXY(10, 26);
-        $pdf->MultiCell(22, 2, $outputlangs->transnoentities("Owner"), 0, 'L');
+		$pdf->SetXY(10, 26);
+		$pdf->MultiCell(22, 2, $outputlangs->transnoentities("Owner"), 0, 'L');
 		$pdf->SetFont('', '', $default_font_size);
-        $pdf->SetXY(32, 26);
-        $pdf->MultiCell(80, 2, $outputlangs->convToOutputCharset($this->account->proprio), 0, 'L');
+		$pdf->SetXY(32, 26);
+		$pdf->MultiCell(80, 2, $outputlangs->convToOutputCharset($this->account->proprio), 0, 'L');
 
 		$pdf->SetFont('', '', $default_font_size);
-        $pdf->SetXY(10, 32);
-        $pdf->MultiCell(0, 2, $outputlangs->transnoentities("Account"), 0, 'L');
-        pdf_bank($pdf, $outputlangs, 32, 32, $this->account, 1);
+		$pdf->SetXY(10, 32);
+		$pdf->MultiCell(0, 2, $outputlangs->transnoentities("Account"), 0, 'L');
+		pdf_bank($pdf, $outputlangs, 32, 32, $this->account, 1);
 
 		$pdf->SetFont('', '', $default_font_size);
-        $pdf->SetXY(114, 15);
+		$pdf->SetXY(114, 15);
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L');
 
-        $pdf->Rect(9, 14, 192, 35);
-        $pdf->line(9, 19, 112, 19);
-        $pdf->line(9, 25, 112, 25);
-        //$pdf->line(9, 31, 201, 31);
-        $pdf->line(9, 31, 112, 31);
+		$pdf->Rect(9, 14, 192, 35);
+		$pdf->line(9, 19, 112, 19);
+		$pdf->line(9, 25, 112, 25);
+		//$pdf->line(9, 31, 201, 31);
+		$pdf->line(9, 31, 112, 31);
 
-        $pdf->line(30, 14, 30, 49);
-        $pdf->line(112, 14, 112, 49);
+		$pdf->line(30, 14, 30, 49);
+		$pdf->line(112, 14, 112, 49);
 
 		// Number of cheques
 		$posy = 51;
@@ -284,11 +284,11 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size);
-        $pdf->SetXY(57, $posy + 1);
-        $pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
+		$pdf->SetXY(57, $posy + 1);
+		$pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
 
 		$pdf->SetFont('', '', $default_font_size);
-        $pdf->SetXY(148, $posy + 1);
+		$pdf->SetXY(148, $posy + 1);
 		$pdf->MultiCell(40, 2, $langs->trans("Total"));
 
 		$pdf->SetFont('', 'B', $default_font_size);
@@ -302,11 +302,11 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
 
 		$pdf->SetXY(41, $this->tab_top + 2);
-        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("Bank"), 0, 'L');
+		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Bank"), 0, 'L');
 		$pdf->line(100, $this->tab_top, 100, $this->tab_top + $this->tab_height + 10);
 
-        $pdf->SetXY(101, $this->tab_top + 2);
-        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
+		$pdf->SetXY(101, $this->tab_top + 2);
+		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
 		$pdf->line(180, $this->tab_top, 180, $this->tab_top + $this->tab_height + 10);
 
 		$pdf->SetXY(180, $this->tab_top + 2);
@@ -317,11 +317,11 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Output array
 	 *
-	 *	@param	PDF			$pdf			PDF object
+	 *	@param	TCPDF		$pdf			PDF object
 	 *	@param	int			$pagenb			Page nb
 	 *	@param	int			$pages			Pages
 	 *	@param	Translate	$outputlangs	Object lang
@@ -329,7 +329,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 	 */
 	public function Body(&$pdf, $pagenb, $pages, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// x=10 - Num
 		// x=30 - Banque
 		// x=100 - Emetteur
@@ -342,30 +342,30 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$num = count($this->lines);
 		for ($j = 0; $j < $num; $j++)
 		{
-            // Dynamic max line heigh calculation
-            $dynamic_line_height = array();
-            $dynamic_line_height[] = $pdf->getStringHeight(60, $outputlangs->convToOutputCharset($this->lines[$j]->bank_chq));
-            $dynamic_line_height[] = $pdf->getStringHeight(80, $outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq));
-            $max_line_height = max($dynamic_line_height);
-            // Calculate number of line used function of estimated line size
-            if ($max_line_height > $this->line_height) $nb_lines = floor($max_line_height / $this->line_height) + 1;
-            else $nb_lines = 1;
+			// Dynamic max line heigh calculation
+			$dynamic_line_height = array();
+			$dynamic_line_height[] = $pdf->getStringHeight(60, $outputlangs->convToOutputCharset($this->lines[$j]->bank_chq));
+			$dynamic_line_height[] = $pdf->getStringHeight(80, $outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq));
+			$max_line_height = max($dynamic_line_height);
+			// Calculate number of line used function of estimated line size
+			if ($max_line_height > $this->line_height) $nb_lines = floor($max_line_height / $this->line_height) + 1;
+			else $nb_lines = 1;
 
-            // Add page break if we do not have space to add current line
+			// Add page break if we do not have space to add current line
 			if ($lineinpage >= ($this->line_per_page - 1))
 			{
-			    $lineinpage = 0; $yp = 0;
+				$lineinpage = 0; $yp = 0;
 
-                // New page
-                $pdf->AddPage();
-                $pagenb++;
-                $this->Header($pdf, $pagenb, $pages, $outputlangs);
-                $pdf->SetFont('', '', $default_font_size - 1);
-                $pdf->MultiCell(0, 3, ''); // Set interline to 3
-                $pdf->SetTextColor(0, 0, 0);
+				// New page
+				$pdf->AddPage();
+				$pagenb++;
+				$this->Header($pdf, $pagenb, $pages, $outputlangs);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 			}
 
-            $lineinpage += $nb_lines;
+			$lineinpage += $nb_lines;
 
 			$pdf->SetXY(1, $this->tab_top + 10 + $yp);
 			$pdf->MultiCell(8, $this->line_height, $j + 1, 0, 'R', 0);
@@ -382,15 +382,15 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 			$pdf->SetXY(180, $this->tab_top + 10 + $yp);
 			$pdf->MultiCell(20, $this->line_height, price($this->lines[$j]->amount_chq), 0, 'R', 0);
 
-            $yp = $yp + ($this->line_height * $nb_lines);
+			$yp = $yp + ($this->line_height * $nb_lines);
 		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
-     *
-	 *  @param	PDF			$pdf     			PDF
+	 *
+	 *  @param	TCPDF		$pdf     			PDF
 	 *  @param	Object		$object				Object to show
 	 *  @param	Translate	$outputlangs		Object lang for output
 	 *  @param	int			$hidefreetext		1=Hide free text
@@ -404,11 +404,13 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 
 		// Line of free text
+		$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+		complete_substitutions_array($substitutionarray, $outputlangs, $object);
 		$newfreetext = '';
 		$paramfreetext = 'BANK_CHEQUERECEIPT_FREE_TEXT';
 		if (!empty($conf->global->$paramfreetext))
 		{
-		    $newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+			$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 		}
 
 		return pdf_pagefoot($pdf, $outputlangs, $newfreetext, $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index bf3f6e9b842..d03b597b4e0 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -126,9 +126,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index 7cc72a865d8..66b2f9f7d82 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -178,9 +178,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 		if (!empty($conf->global->CHEQUERECEIPT_ADDON_PDF))
 		{
 			$modele = $conf->global->CHEQUERECEIPT_ADDON_PDF;
-		}
-		else
-		{
+		} else {
 			//print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_PDF_NotDefined");
 			//return 0;
 			$modele = 'blochet';
@@ -203,16 +201,12 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 		{
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "chequereceipt_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $dir.$file));
 		return -1;
 	}
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 75c5103c4ab..9c8bd72a6a0 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
@@ -48,9 +48,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * @var string Dolibarr version of the loaded document
@@ -137,8 +137,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -279,9 +278,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -313,9 +310,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
                			// 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -352,8 +347,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -369,8 +363,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -401,25 +394,21 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -438,15 +427,12 @@ class doc_generic_order_odt extends ModelePDFCommandes
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -455,8 +441,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -469,8 +454,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -490,8 +474,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -512,9 +495,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				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 3838b9146e6..603fd4efa22 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -69,9 +69,9 @@ class pdf_einstein extends ModelePDFCommandes
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -172,9 +172,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
-		}
-		else
-		{
+		} else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -239,9 +237,7 @@ class pdf_einstein extends ModelePDFCommandes
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -440,18 +436,14 @@ class pdf_einstein extends ModelePDFCommandes
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -566,9 +558,7 @@ class pdf_einstein extends ModelePDFCommandes
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -582,9 +572,7 @@ class pdf_einstein extends ModelePDFCommandes
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -599,8 +587,7 @@ class pdf_einstein extends ModelePDFCommandes
 				// Show square
 				if ($pagenb == 1)
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Affiche zone infos
@@ -642,15 +629,11 @@ class pdf_einstein extends ModelePDFCommandes
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "COMMANDE_OUTPUTDIR");
 			return 0;
 		}
@@ -761,8 +744,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -914,9 +896,7 @@ class pdf_einstein extends ModelePDFCommandes
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1273,25 +1253,20 @@ class pdf_einstein extends ModelePDFCommandes
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} 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
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 1910dd0c048..e6e54e521d8 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -69,9 +69,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -232,9 +232,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		        {
 		            $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
-		        {
+		        } 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
 		        }
@@ -253,14 +251,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 		                        if ($obj['photo_vignette'])
 		                        {
 		                            $filename = $obj['photo_vignette'];
-		                        }
-		                        else
-		                        {
+		                        } else {
 		                            $filename = $obj['photo'];
 		                        }
-		                    }
-		                    else
-		                    {
+		                    } else {
 		                        $filename = $obj['photo'];
 		                    }
 
@@ -288,9 +282,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			{
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->commande->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -487,8 +479,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				            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 {
+				            } else {
 				                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
 				                $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 				            }
@@ -506,8 +497,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				        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
+				    } else // No pagebreak
 				    {
 				        $pdf->commitTransaction();
 				        $posyafter = $pdf->GetY();
@@ -531,9 +521,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				    $tab_height = $tab_height - $height_note;
 				    $tab_top = $posyafter + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -583,8 +571,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 							// 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 $showpricebeforepagebreak = 0;
 					    }
 
 					    if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -621,18 +608,14 @@ class pdf_eratosthene extends ModelePDFCommandes
     								//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
     								$pdf->setPage($pageposafter + 1);
     							}
-    						}
-    						else
-    						{
+    						} 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 $showpricebeforepagebreak = 0;
     						}
-    					}
-    					else	// No pagebreak
+    					} else // No pagebreak
     					{
     						$pdf->commitTransaction();
     					}
@@ -784,9 +767,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						if ($pagenb == $pageposbeforeprintlines)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -800,9 +781,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					    if ($pagenb == $pageposafter)
 						{
 						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    }
-						else
-						{
+					    } 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,8 +796,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);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Affiche zone infos
@@ -860,15 +838,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "COMMANDE_OUTPUTDIR");
 			return 0;
 		}
@@ -973,8 +947,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
             $posy = $pdf->GetY() + 1;
-        }
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+        } elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -1129,9 +1102,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1441,25 +1412,20 @@ class pdf_eratosthene extends ModelePDFCommandes
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
 				    $height = pdf_getHeightForLogo($logo);
 				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} 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
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1848,13 +1814,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 	    if ($reshook < 0)
 	    {
 	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
+	    } elseif (empty($reshook))
 	    {
 	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
+	    } else {
 	        $this->cols = $hookmanager->resArray;
 	    }
     }
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 335ceb27b52..2576533d5b7 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -129,9 +129,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_commande_marbre::getNextValue", LOG_DEBUG);
 			return -1;
 		}
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 c938f40cfb2..8f707493474 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
@@ -46,9 +46,9 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -136,8 +136,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -266,9 +265,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -300,9 +297,7 @@ class doc_generic_contract_odt extends ModelePDFContract
                         // 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -351,8 +346,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -368,8 +362,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -381,26 +374,22 @@ class doc_generic_contract_odt extends ModelePDFContract
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -419,15 +408,12 @@ class doc_generic_contract_odt extends ModelePDFContract
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -436,8 +422,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -450,8 +435,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -469,8 +453,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						$this->error = $e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -489,9 +472,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index f8b7908654b..264d48449e2 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin				<regis.houssin@inodbox.com>
  * Copyright (C) 2008		Raphael Bertrand (Resultic)	<raphael.bertrand@resultic.fr>
  * Copyright (C) 2011		Fabrice CHERRIER
- * Copyright (C) 2013-2019  Philippe Grand	            <philippe.grand@atoo-net.com>
+ * Copyright (C) 2013-2020  Philippe Grand	            <philippe.grand@atoo-net.com>
  * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France             <frederic.france@netlogic.fr>
  *
@@ -41,70 +41,70 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 class pdf_strato extends ModelePDFContract
 {
 	/**
-     * @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.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @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;
 
 	/**
@@ -160,21 +160,21 @@ class pdf_strato extends ModelePDFContract
 		$this->posxdesc = $this->marge_gauche + 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		CommonObject	$object				Id of object to generate
-     *  @param		object			$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:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		CommonObject	$object				Id of object to generate
+	 *  @param		object			$outputlangs		Lang output object
+	 *  @param		string			$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int				$hidedetails		Do not show line details
+	 *  @param		int				$hidedesc			Do not show desc
+	 *  @param		int				$hideref			Do not show ref
+	 *  @return		int									1=OK, 0=KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
 		global $user, $langs, $conf, $hookmanager, $mysoc;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -186,16 +186,14 @@ class pdf_strato extends ModelePDFContract
 
 		if ($conf->contrat->dir_output)
 		{
-            $object->fetch_thirdparty();
+			$object->fetch_thirdparty();
 
 			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->contrat->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->contrat->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -223,26 +221,26 @@ class pdf_strato extends ModelePDFContract
 				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
-                $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)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
-                $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$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)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -343,12 +341,12 @@ class pdf_strato extends ModelePDFContract
 						}
 
 						$txtpredefinedservice = '';
-                        $txtpredefinedservice = $objectligne->product_label;
-                        if ($objectligne->product_label)
-                        {
-                        	$txtpredefinedservice .= ' - ';
-                        	$txtpredefinedservice .= $objectligne->product_label;
-                        }
+						$txtpredefinedservice = $objectligne->product_label;
+						if ($objectligne->product_label)
+						{
+							$txtpredefinedservice .= ' - ';
+							$txtpredefinedservice .= $objectligne->product_label;
+						}
 
 						$desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines)
 						$txt = '';
@@ -361,7 +359,7 @@ class pdf_strato extends ModelePDFContract
 						if (empty($conf->global->CONTRACT_HIDE_REAL_DATE_ON_PDF))
 						{
 							$txt .= '<br>';
-	                        $txt .= $outputlangs->transnoentities("DateStartRealShort")." : <strong>".$daters.'</strong>';
+							$txt .= $outputlangs->transnoentities("DateStartRealShort")." : <strong>".$daters.'</strong>';
 							if ($objectligne->date_cloture) $txt .= " - ".$outputlangs->transnoentities("DateEndRealShort")." : '<strong>'".$datere.'</strong>';
 						}
 
@@ -387,19 +385,15 @@ class pdf_strato extends ModelePDFContract
 									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
-							}
-							else
-							{
+							} 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 $showpricebeforepagebreak = 0;
 							}
-						}
-						else	// No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -425,9 +419,7 @@ class pdf_strato extends ModelePDFContract
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -441,9 +433,7 @@ class pdf_strato extends ModelePDFContract
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -461,9 +451,7 @@ class pdf_strato extends ModelePDFContract
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$this->tabSignature($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab = $this->page_hauteur - $heightforfooter - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$this->tabSignature($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab = $this->page_hauteur - $heightforfooter - $heightforfooter + 1;
@@ -488,8 +476,8 @@ class pdf_strato extends ModelePDFContract
 				$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))
@@ -498,15 +486,11 @@ class pdf_strato extends ModelePDFContract
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "CONTRACT_OUTPUTDIR");
 			return 0;
 		}
@@ -516,7 +500,7 @@ class pdf_strato extends ModelePDFContract
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -534,7 +518,7 @@ class pdf_strato extends ModelePDFContract
 		if ($hidetop) $hidetop = -1;
 
 		$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);
@@ -564,16 +548,16 @@ class pdf_strato extends ModelePDFContract
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height + 3); // Rect takes a length in 3rd parameter and 4th parameter
 	}
 
-    /**
-     * Show footer signature of page
-     * @param   PDF         $pdf            Object PDF
-     * @param   int         $tab_top        tab height position
-     * @param   int         $tab_height     tab height
-     * @param   Translate   $outputlangs    Object language for output
-     * @return void
-     */
+	/**
+	 * Show footer signature of page
+	 * @param   TCPDF       $pdf            Object PDF
+	 * @param   int         $tab_top        tab height position
+	 * @param   int         $tab_height     tab height
+	 * @param   Translate   $outputlangs    Object language for output
+	 * @return void
+	 */
 	protected function tabSignature(&$pdf, $tab_top, $tab_height, $outputlangs)
-    {
+	{
 		$pdf->SetDrawColor(128, 128, 128);
 		$posmiddle = $this->marge_gauche + round(($this->page_largeur - $this->marge_gauche - $this->marge_droite) / 2);
 		$posy = $tab_top + $tab_height + 3 + 3;
@@ -589,20 +573,20 @@ class pdf_strato extends ModelePDFContract
 
 		$pdf->SetXY($posmiddle + 5, $posy + 5);
 		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posmiddle - 5, 20, '', 1);
-    }
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Show top header of page.
-     *
-     *  @param	PDF			$pdf     		Object PDF
-     *  @param  CommonObject		$object     	Object to show
-     *  @param  int	    	$showaddress    0=no, 1=yes
-     *  @param  Translate	$outputlangs	Object lang for output
-     *  @return	void
-     */
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	TCPDF		$pdf     		Object PDF
+	 *  @param  CommonObject	$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @return	void
+	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
-    {
+	{
 		global $conf, $langs;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -633,19 +617,15 @@ class pdf_strato extends ModelePDFContract
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -774,7 +754,7 @@ class pdf_strato extends ModelePDFContract
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	PDF			$pdf     			PDF
 	 * 		@param	CommonObject		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index d5f0c0926f5..ebb8cbf610e 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -114,8 +114,7 @@ class mod_contract_olive extends ModelNumRefContracts
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
 		}
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index b625fd2c450..b503712c58f 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -138,9 +138,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_contract_serpis::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 4c025750f04..a4ff4e43a2d 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -103,9 +103,7 @@ class html_cerfafr extends ModeleDon
 			{
 				$dir = $conf->don->dir_output;
 				$file = $dir."/SPECIMEN.html";
-			}
-			else
-			{
+			} else {
 				$donref = dol_sanitizeFileName($don->ref);
 				$dir = $conf->don->dir_output."/".$donref;
 				$file = $dir."/".$donref.".html";
@@ -130,20 +128,15 @@ class html_cerfafr extends ModeleDon
 				{
 					$formclass->load_cache_types_paiements();
 					$paymentmode = $formclass->cache_types_paiements[$don->modepaiementid]['label'];
-				}
-				else $paymentmode = '';
+				} else $paymentmode = '';
 
 				if ($don->modepaymentcode == 'CHQ') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox" disabled="true" checked="checked"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				elseif ($don->modepaymentcode == 'LIQ') {
+				} elseif ($don->modepaymentcode == 'LIQ') {
 					$ModePaiement = '<td width="25%"><input type="checkbox" checked="checked"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				elseif ($don->modepaymentcode == 'VIR' || $don->modepaymentcode == 'PRE' || $don->modepaymentcode == 'CB') {
+				} elseif ($don->modepaymentcode == 'VIR' || $don->modepaymentcode == 'PRE' || $don->modepaymentcode == 'CB') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox" checked="checked"> Virement, prélèvement, carte bancaire</td>';
-				}
-				else
-				{
+				} else {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
 				}
 
@@ -212,39 +205,33 @@ class html_cerfafr extends ModeleDon
 				$form = str_replace('__FrenchEligibility__', $frencheligibility, $form);
 
 				$art200 = '';
-				if (preg_match('/fr/i', $outputlangs->defaultlang)) {
+				if ($mysoc->country_code == 'FR') {
 					if ($conf->global->DONATION_ART200 >= 1)
 					{
 						$art200 = '<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
-					}
-					else
-					{
+					} else {
 						$art200 = '<input type="checkbox" disabled="true">200 du CGI';
 					}
 				}
 				$form = str_replace('__ARTICLE200__', $art200, $form);
 
 				$art238 = '';
-				if (preg_match('/fr/i', $outputlangs->defaultlang)) {
+				if ($mysoc->country_code == 'FR') {
 					if ($conf->global->DONATION_ART238 >= 1)
 					{
 						$art238 = '<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
-					}
-					else
-					{
+					} else {
 						$art238 = '<input type="checkbox" disabled="true">238 bis du CGI';
 					}
 				}
 				$form = str_replace('__ARTICLE238__', $art238, $form);
 
 				$art978 = '';
-				if (preg_match('/fr/i', $outputlangs->defaultlang)) {
+				if ($mysoc->country_code == 'FR') {
 					if ($conf->global->DONATION_ART978 >= 1)
 					{
 						$art978 = '<input type="checkbox" disabled="true" checked="checked" >978 du CGI';
-					}
-					else
-					{
+					} else {
 						$art978 = '<input type="checkbox" disabled="true">978 du CGI';
 					}
 				}
@@ -261,15 +248,11 @@ class html_cerfafr extends ModeleDon
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "DON_OUTPUTDIR");
 			return 0;
 		}
@@ -315,12 +298,10 @@ class html_cerfafr extends ModeleDon
 			if ($dix[$i] == 0) {
 				$secon[$i] = '';
 				$prim[$i] = $chif[$unite[$i]];
-			}
-			elseif ($dix[$i] == 1) {
+			} elseif ($dix[$i] == 1) {
 				$secon[$i] = '';
 				$prim[$i] = $chif[($unite[$i] + 10)];
-			}
-			elseif ($dix[$i] == 2) {
+			} elseif ($dix[$i] == 2) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'vingt et';
                     $prim[$i] = $chif[$unite[$i]];
@@ -328,8 +309,7 @@ class html_cerfafr extends ModeleDon
                     $secon[$i] = 'vingt';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 3) {
+			} elseif ($dix[$i] == 3) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'trente et';
                     $prim[$i] = $chif[$unite[$i]];
@@ -337,63 +317,51 @@ class html_cerfafr extends ModeleDon
                     $secon[$i] = 'trente';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 4) {
+			} elseif ($dix[$i] == 4) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'quarante et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'quarante';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 5) {
+			} elseif ($dix[$i] == 5) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'cinquante et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'cinquante';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 6) {
+			} elseif ($dix[$i] == 6) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'soixante et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'soixante';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 7) {
+			} elseif ($dix[$i] == 7) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'soixante et';
                     $prim[$i] = $chif[$unite[$i] + 10];
-				}
-				else {
+				} else {
                     $secon[$i] = 'soixante';
                     $prim[$i] = $chif[$unite[$i] + 10];
 				}
-			}
-			elseif ($dix[$i] == 8) {
+			} elseif ($dix[$i] == 8) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'quatre-vingts et';
                     $prim[$i] = $chif[$unite[$i]];
-				}
-				else {
+				} else {
                     $secon[$i] = 'quatre-vingt';
                     $prim[$i] = $chif[$unite[$i]];
 				}
-			}
-			elseif ($dix[$i] == 9) {
+			} elseif ($dix[$i] == 9) {
 				if ($unite[$i] == 1) {
                     $secon[$i] = 'quatre-vingts et';
                     $prim[$i] = $chif[$unite[$i] + 10];
-				}
-				else {
+				} else {
                     $secon[$i] = 'quatre-vingts';
                     $prim[$i] = $chif[$unite[$i] + 10];
 				}
@@ -412,15 +380,13 @@ class html_cerfafr extends ModeleDon
 			$somme = $trio[3].'  '.$secon[3].' '.$prim[3].' million ';
 		elseif (($cent[3] != 0 && $cent[3] != '') || ($dix[3] != 0 && $dix[3] != '') || ($unite[3] != 0 && $unite[3] != ''))
 			$somme = $trio[3].' '.$secon[3].' '.$prim[3].' millions ';
-		else
-			$somme = $trio[3].' '.$secon[3].' '.$prim[3];
+		else $somme = $trio[3].' '.$secon[3].' '.$prim[3];
 
 		if (($cent[2] == 0 || $cent[2] == '') && ($dix[2] == 0 || $dix[2] == '') && ($unite[2] == 1))
 			$somme = $somme.' mille ';
 		elseif (($cent[2] != 0 && $cent[2] != '') || ($dix[2] != 0 && $dix[2] != '') || ($unite[2] != 0 && $unite[2] != ''))
 			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2].' milles ';
-		else
-			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2];
+		else $somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2];
 
 		$somme = $somme.$trio[1].' '.$secon[1].' '.$prim[1];
 
@@ -428,7 +394,6 @@ class html_cerfafr extends ModeleDon
 
 		if (($cent_c == '0' || $cent_c == '') && ($dix_c == '0' || $dix_c == ''))
 			return $somme.' et z&eacute;ro '.$dev2;
-		else
-			return $somme.$trio_c.' '.$secon_c.' '.$dev2;
+		else return $somme.$trio_c.' '.$secon_c.' '.$dev2;
 	}
 }
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 1ea817709e1..122a5abdc10 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
@@ -48,9 +48,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -138,8 +138,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -279,9 +278,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -350,8 +347,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -367,8 +363,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -384,13 +379,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -406,13 +399,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -430,13 +421,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -451,13 +440,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							{
 								if (file_exists($value)) $odfHandler->setImage($key, $value);
 								else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-							}
-							else	// Text
+							} else // Text
 							{
 								$odfHandler->setVars($key, $value, true, 'UTF-8');
 							}
-						}
-						catch (OdfException $e)
+						} catch (OdfException $e)
 						{
                             dol_syslog($e->getMessage(), LOG_INFO);
 						}
@@ -477,25 +464,21 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -512,15 +495,12 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -529,8 +509,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -543,8 +522,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -563,8 +541,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -584,9 +561,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				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 c232edbe81c..b07ba46bf85 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -36,71 +36,71 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_espadon extends ModelePdfExpedition
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
-
-    /**
-     * @var string model name
-     */
-    public $name;
-
-    /**
-     * @var string model description (short text)
-     */
-    public $description;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -148,11 +148,11 @@ class pdf_espadon extends ModelePdfExpedition
 	 *
 	 *	@param		Object		$object			    Object expedition to generate (or id if old method)
 	 *	@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
+	 *  @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)
 	{
@@ -177,16 +177,16 @@ class pdf_espadon extends ModelePdfExpedition
 
 		$nblines = count($object->lines);
 
-        // Loop on each lines to detect if there is at least one image to show
-        $realpatharray = array();
-        $this->atleastonephoto = false;
-        if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
-        {
-            $objphoto = new Product($this->db);
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		$this->atleastonephoto = false;
+		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
+		{
+			$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 = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -195,54 +195,46 @@ class pdf_espadon extends ModelePdfExpedition
 				{
 					$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
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product') . dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 
 				$realpath = '';
 
-                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;
 					$this->atleastonephoto = true;
-                    break;
-                }
+					break;
+				}
 
-                if ($realpath) $realpatharray[$i] = $realpath;
-            }
-        }
+				if ($realpath) $realpatharray[$i] = $realpath;
+			}
+		}
 
-        if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
+		if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
 
 		if ($conf->expedition->dir_output)
 		{
-		    // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -276,23 +268,23 @@ class pdf_espadon extends ModelePdfExpedition
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
 				$heightforinfotot = 8; // 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;
-                $pdf->SetAutoPageBreak(1, 0);
+				$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;
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -323,7 +315,7 @@ class pdf_espadon extends ModelePdfExpedition
 				$tab_height = 130;
 				$tab_height_newpage = 150;
 
-                $this->posxdesc = $this->marge_gauche + 1;
+				$this->posxdesc = $this->marge_gauche + 1;
 
 				// Incoterm
 				$height_incoterms = 0;
@@ -348,15 +340,15 @@ class pdf_espadon extends ModelePdfExpedition
 					}
 				}
 
-                // display note
-                $notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				// display note
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 
-                // 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 (!empty($notetoshow) || !empty($object->tracking_number))
 				{
@@ -399,7 +391,7 @@ class pdf_espadon extends ModelePdfExpedition
 					// Notes
 					if (!empty($notetoshow))
 					{
-					    $pdf->SetFont('', '', $default_font_size - 1); // In loop to manage multi-page
+						$pdf->SetFont('', '', $default_font_size - 1); // In loop to manage multi-page
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top_alt, dol_htmlentitiesbr($notetoshow), 0, 1);
 					}
 
@@ -412,9 +404,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -451,74 +441,69 @@ class pdf_espadon extends ModelePdfExpedition
 
 					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 + $heightforsignature + $heightforinfotot)))	// If photo too high, we moved completely on 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($pageposbefore + 1);
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// If photo too high, we moved completely on 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($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;
-					    }
+							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 = $pdf->getPage();
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
 
-                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
-					        $pageposafter = $pdf->getPage();
-					        $posyafter = $pdf->GetY();
-					        //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-					        if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $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
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $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();
-					    }
-					    $posYAfterDescription = $pdf->GetY();
+								else $showpricebeforepagebreak = 0;
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+						$posYAfterDescription = $pdf->GetY();
 					}
 
 					$nexY = $pdf->GetY();
@@ -556,39 +541,39 @@ class pdf_espadon extends ModelePdfExpedition
 
 					if ($this->getColumnStatus('weight'))
 					{
-					    $this->printStdColumnContent($pdf, $curY, 'weight', $weighttxt.(($weighttxt && $voltxt) ? '<br>' : '').$voltxt, array('html'=>1));
-					    $nexY = max($pdf->GetY(), $nexY);
+						$this->printStdColumnContent($pdf, $curY, 'weight', $weighttxt.(($weighttxt && $voltxt) ? '<br>' : '').$voltxt, array('html'=>1));
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					if ($this->getColumnStatus('qty_asked'))
 					{
-					    $this->printStdColumnContent($pdf, $curY, 'qty_asked', $object->lines[$i]->qty_asked);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$this->printStdColumnContent($pdf, $curY, 'qty_asked', $object->lines[$i]->qty_asked);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					if ($this->getColumnStatus('qty_shipped'))
 					{
-					    $this->printStdColumnContent($pdf, $curY, 'qty_shipped', $object->lines[$i]->qty_shipped);
-					    $nexY = max($pdf->GetY(), $nexY);
+						$this->printStdColumnContent($pdf, $curY, 'qty_shipped', $object->lines[$i]->qty_shipped);
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					if ($this->getColumnStatus('subprice'))
 					{
-					    $this->printStdColumnContent($pdf, $curY, 'subprice', price($object->lines[$i]->subprice, 0, $outputlangs));
-					    $nexY = max($pdf->GetY(), $nexY);
+						$this->printStdColumnContent($pdf, $curY, 'subprice', price($object->lines[$i]->subprice, 0, $outputlangs));
+						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-                    // Extrafields
-                    if (!empty($object->lines[$i]->array_options)) {
-                        foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-                            if ($this->getColumnStatus($extrafieldColKey))
-                            {
-                                $extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
-                                $this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
-                                $nexY = max($pdf->GetY(), $nexY);
-                            }
-                        }
-                    }
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey))
+							{
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
 
 					// Add line
 					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
@@ -607,9 +592,7 @@ class pdf_espadon extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -623,9 +606,7 @@ class pdf_espadon extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -642,9 +623,7 @@ class pdf_espadon extends ModelePdfExpedition
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -667,8 +646,8 @@ class pdf_espadon extends ModelePdfExpedition
 				$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))
@@ -677,15 +656,11 @@ class pdf_espadon extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -696,7 +671,7 @@ class pdf_espadon extends ModelePdfExpedition
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF			$pdf            Object PDF
+	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Amount already paid
 	 *	@param	int         $posy           Start Position
@@ -708,9 +683,9 @@ class pdf_espadon extends ModelePdfExpedition
 		// phpcs:enable
 		global $conf, $mysoc;
 
-        $sign = 1;
+		$sign = 1;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
@@ -740,8 +715,8 @@ class pdf_espadon extends ModelePdfExpedition
 		// Set trueVolume and volume_units not currently stored into database
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
-		    $object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
-		    $object->volume_units = $object->size_units * 3;
+			$object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
+			$object->volume_units = $object->size_units * 3;
 		}
 
 		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
@@ -752,40 +727,40 @@ class pdf_espadon extends ModelePdfExpedition
 
 
 
-    	if ($this->getColumnStatus('desc'))
-    	{
-    	    $this->printStdColumnContent($pdf, $tab2_top, 'desc', $outputlangs->transnoentities("Total"));
-    	}
+		if ($this->getColumnStatus('desc'))
+		{
+			$this->printStdColumnContent($pdf, $tab2_top, 'desc', $outputlangs->transnoentities("Total"));
+		}
 
 
 		if ($this->getColumnStatus('weight'))
 		{
-		    if ($totalWeighttoshow)
-		    {
-		        $this->printStdColumnContent($pdf, $tab2_top, 'weight', $totalWeighttoshow);
-		        $index++;
-		    }
+			if ($totalWeighttoshow)
+			{
+				$this->printStdColumnContent($pdf, $tab2_top, 'weight', $totalWeighttoshow);
+				$index++;
+			}
 
-		    if ($totalVolumetoshow)
-		    {
-		        $y = $tab2_top + ($tab2_hl * $index);
-		        $this->printStdColumnContent($pdf, $y, 'weight', $totalVolumetoshow);
-		    }
+			if ($totalVolumetoshow)
+			{
+				$y = $tab2_top + ($tab2_hl * $index);
+				$this->printStdColumnContent($pdf, $y, 'weight', $totalVolumetoshow);
+			}
 		}
 
 		if ($this->getColumnStatus('qty_asked') && $totalOrdered)
 		{
-		    $this->printStdColumnContent($pdf, $tab2_top, 'qty_asked', $totalOrdered);
+			$this->printStdColumnContent($pdf, $tab2_top, 'qty_asked', $totalOrdered);
 		}
 
 		if ($this->getColumnStatus('qty_shipped') && $totalToShip)
 		{
-		    $this->printStdColumnContent($pdf, $tab2_top, 'qty_shipped', $totalToShip);
+			$this->printStdColumnContent($pdf, $tab2_top, 'qty_shipped', $totalToShip);
 		}
 
 		if ($this->getColumnStatus('subprice'))
 		{
-		    $this->printStdColumnContent($pdf, $tab2_top, 'subprice', price($object->total_ht, 0, $outputlangs));
+			$this->printStdColumnContent($pdf, $tab2_top, 'subprice', price($object->total_ht, 0, $outputlangs));
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
@@ -797,7 +772,7 @@ class pdf_espadon extends ModelePdfExpedition
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -839,7 +814,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$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
 		}
 	}
 
@@ -847,7 +822,7 @@ class pdf_espadon extends ModelePdfExpedition
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -866,7 +841,7 @@ class pdf_espadon extends ModelePdfExpedition
 		// Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK)))
 		{
-            		pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
+					pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
 		}
 
 		//Prepare next
@@ -886,19 +861,15 @@ class pdf_espadon extends ModelePdfExpedition
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -907,9 +878,7 @@ class pdf_espadon extends ModelePdfExpedition
 		if (!empty($conf->barcode->enabled))
 		{
 			$posx = 105;
-		}
-		else
-		{
+		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
@@ -949,10 +918,10 @@ class pdf_espadon extends ModelePdfExpedition
 		// Date planned delivery
 		if (!empty($object->date_delivery))
 		{
-    			$posy += 4;
-    			$pdf->SetXY($posx, $posy);
-    			$pdf->SetTextColor(0, 0, 60);
-    			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
 		}
 
 		if (!empty($object->thirdparty->code_client))
@@ -971,7 +940,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$origin = $object->origin;
 		$origin_id = $object->origin_id;
 
-	    // TODO move to external function
+		// TODO move to external function
 		if (!empty($conf->$origin->enabled))     // commonly $origin='commande'
 		{
 			$outputlangs->load('orders');
@@ -981,7 +950,7 @@ class pdf_espadon extends ModelePdfExpedition
 			$result = $linkedobject->fetch($origin_id);
 			if ($result >= 0)
 			{
-			    //$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
+				//$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
 
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$text = $linkedobject->ref;
@@ -1095,8 +1064,8 @@ class pdf_espadon extends ModelePdfExpedition
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
@@ -1121,21 +1090,21 @@ class pdf_espadon extends ModelePdfExpedition
 	 */
 	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-	    global $conf, $hookmanager;
+		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
@@ -1153,131 +1122,128 @@ class pdf_espadon extends ModelePdfExpedition
 	     );
 	     */
 
-	    $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, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'content' => array(
-                '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, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
 
-	    $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
-	    );
+		$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_SHIPMENT_WITH_PICTURE) && !empty($this->atleastonephoto))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
+		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE) && !empty($this->atleastonephoto))
+		{
+			$this->cols['photo']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['weight'] = array(
-	        'rank' => $rank,
-	        'width' => 30, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'WeightVolShort'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['weight'] = array(
+			'rank' => $rank,
+			'width' => 30, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'WeightVolShort'
+			),
+			'border-left' => true, // add left line separator
+		);
 
 
-	    $rank = $rank + 10;
-	    $this->cols['subprice'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => !empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT) ? 1 : 0,
-	        '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' => !empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT) ? 1 : 0,
+			'title' => array(
+				'textkey' => 'PriceUHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['totalexcltax'] = array(
-	        'rank' => $rank,
-	        'width' => 26, // in mm
-	        'status' => !empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT) ? 1 : 0,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => !empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT) ? 1 : 0,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['qty_asked'] = array(
-	        'rank' => $rank,
-	        'width' => 30, // in mm
-	        'status' => empty($conf->global->SHIPPING_PDF_HIDE_ORDERED) ? 1 : 0,
-	        'title' => array(
-	            'textkey' => 'QtyOrdered'
-	        ),
-	        'border-left' => true, // add left line separator
-	        'content' => array(
-	            'align' => 'C',
-	        ),
-	    );
+		$rank = $rank + 10;
+		$this->cols['qty_asked'] = array(
+			'rank' => $rank,
+			'width' => 30, // in mm
+			'status' => empty($conf->global->SHIPPING_PDF_HIDE_ORDERED) ? 1 : 0,
+			'title' => array(
+				'textkey' => 'QtyOrdered'
+			),
+			'border-left' => true, // add left line separator
+			'content' => array(
+				'align' => 'C',
+			),
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['qty_shipped'] = array(
-	        'rank' => $rank,
-	        'width' => 30, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'QtyToShip'
-	        ),
-	        'border-left' => true, // add left line separator
-	        'content' => array(
-	            'align' => 'C',
-	        ),
-	    );
+		$rank = $rank + 10;
+		$this->cols['qty_shipped'] = array(
+			'rank' => $rank,
+			'width' => 30, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'QtyToShip'
+			),
+			'border-left' => true, // add left line separator
+			'content' => array(
+				'align' => 'C',
+			),
+		);
 
-        // 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/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 7899df494fc..fa243b57626 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -37,71 +37,71 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_merou extends ModelePdfExpedition
 {
-    /**
-     * @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.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @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;
 
 	/**
@@ -142,21 +142,21 @@ class pdf_merou extends ModelePdfExpedition
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build pdf onto disk
 	 *
 	 *	@param		Object		$object			Object expedition to generate (or id if old method)
 	 *	@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
+	 *  @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, $conf, $langs, $mysoc, $hookmanager;
 
 		$object->fetch_thirdparty();
@@ -179,7 +179,7 @@ class pdf_merou extends ModelePdfExpedition
 
 			//Create recipient
 			$idcontact = $object->$origin->getIdContact('external', 'SHIPPING');
-            $this->destinataire = new Contact($this->db);
+			$this->destinataire = new Contact($this->db);
 			if (!empty($idcontact[0])) $this->destinataire->fetch($idcontact[0]);
 
 			//Create deliverer
@@ -192,9 +192,7 @@ class pdf_merou extends ModelePdfExpedition
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -227,23 +225,23 @@ class pdf_merou extends ModelePdfExpedition
 				$pdf = pdf_getInstance($this->format, 'mm', 'l');
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
 				$heightforinfotot = 0; // 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;
-                $pdf->SetAutoPageBreak(1, 0);
+				$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;
+				$pdf->SetAutoPageBreak(1, 0);
 
-			    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;
@@ -287,9 +285,7 @@ class pdf_merou extends ModelePdfExpedition
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -365,9 +361,7 @@ class pdf_merou extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -380,9 +374,7 @@ class pdf_merou extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -397,9 +389,7 @@ class pdf_merou extends ModelePdfExpedition
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -424,25 +414,21 @@ class pdf_merou extends ModelePdfExpedition
 				$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))
-                    @chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $outputlangs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $outputlangs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -452,7 +438,7 @@ class pdf_merou extends ModelePdfExpedition
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -493,8 +479,8 @@ class pdf_merou extends ModelePdfExpedition
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
@@ -512,18 +498,18 @@ class pdf_merou extends ModelePdfExpedition
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("NameAndSignature"), 0, 'C');
 
 		// Show page nb only on iso languages (so default Helvetica font)
-        //if (pdf_getPDFFont($outputlangs) == 'Helvetica')
-        //{
-    	//    $pdf->SetXY(-10,-10);
-        //    $pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
-        //}
+		//if (pdf_getPDFFont($outputlangs) == 'Helvetica')
+		//{
+		//    $pdf->SetXY(-10,-10);
+		//    $pdf->MultiCell(11, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
+		//}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -540,11 +526,11 @@ class pdf_merou extends ModelePdfExpedition
 			//Affiche le filigrane brouillon - Print Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->SENDING_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SENDING_DRAFT_WATERMARK);
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SENDING_DRAFT_WATERMARK);
 		}
 
-        $posy = $this->marge_haute;
-        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 
 		$Xoff = 90;
 		$Yoff = 0;
@@ -561,19 +547,15 @@ class pdf_merou extends ModelePdfExpedition
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, 10, 5, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$height = pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, 10, 5, 0, $height); // width=0 (auto)
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(70, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -672,9 +654,7 @@ class pdf_merou extends ModelePdfExpedition
 					$pdf->writeHTMLCell(50, 8, '', '', $label, '', 'L');
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$pdf->MultiCell(50, 8, $outputlangs->transnoentities("Deliverer")." ".$outputlangs->convToOutputCharset($this->livreur->getFullName($outputlangs)), '', 'L');
 		}
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 2e0733f1ba2..e570a506eca 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -37,71 +37,71 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
  */
 class pdf_rouget extends ModelePdfExpedition
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
-
-    /**
-     * @var string model name
-     */
-    public $name;
-
-    /**
-     * @var string model description (short text)
-     */
-    public $description;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -159,18 +159,18 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$this->posxpicture = $this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 
-        // To work with US executive format
-        if ($this->page_largeur < 210) {
-            $this->posxweightvol -= 20;
-            $this->posxpicture -= 20;
-            $this->posxqtyordered -= 20;
-            $this->posxqtytoship -= 20;
-        }
+		// To work with US executive format
+		if ($this->page_largeur < 210) {
+			$this->posxweightvol -= 20;
+			$this->posxpicture -= 20;
+			$this->posxqtyordered -= 20;
+			$this->posxqtytoship -= 20;
+		}
 
 		if (!empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
-		    $this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
-		    $this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
-		    $this->posxqtyordered = $this->posxqtytoship;
+			$this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
+			$this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
+			$this->posxqtyordered = $this->posxqtytoship;
 		}
 	}
 
@@ -180,11 +180,11 @@ class pdf_rouget extends ModelePdfExpedition
 	 *
 	 *	@param		Object		$object			Object expedition to generate (or id if old method)
 	 *	@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
+	 *  @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)
 	{
@@ -202,15 +202,15 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$nblines = count($object->lines);
 
-        // Loop on each lines to detect if there is at least one image to show
-        $realpatharray = array();
-        if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
-        {
-            $objphoto = new Product($this->db);
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
+		{
+			$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 = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -218,41 +218,35 @@ class pdf_rouget extends ModelePdfExpedition
 				{
 					$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
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 
 				$realpath = '';
 
-                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;
-                    break;
-                }
+					$realpath = $dir.$filename;
+					break;
+				}
 
-                if ($realpath) $realpatharray[$i] = $realpath;
-            }
-        }
+				if ($realpath) $realpatharray[$i] = $realpath;
+			}
+		}
 
-        if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
+		if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
 
 		if ($conf->expedition->dir_output)
 		{
@@ -261,9 +255,7 @@ class pdf_rouget extends ModelePdfExpedition
 			{
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$expref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/sending/".$expref;
 				$file = $dir."/".$expref.".pdf";
@@ -297,23 +289,23 @@ class pdf_rouget extends ModelePdfExpedition
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
 				$heightforinfotot = 8; // 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;
-                $pdf->SetAutoPageBreak(1, 0);
+				$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;
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -421,9 +413,7 @@ class pdf_rouget extends ModelePdfExpedition
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -463,8 +453,7 @@ class pdf_rouget extends ModelePdfExpedition
 						// 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 $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -502,19 +491,15 @@ class pdf_rouget extends ModelePdfExpedition
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -559,8 +544,8 @@ class pdf_rouget extends ModelePdfExpedition
 
 					if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
 					{
-					    $pdf->SetXY($this->posxqtyordered, $curY);
-					    $pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked, '', 'C');
+						$pdf->SetXY($this->posxqtyordered, $curY);
+						$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked, '', 'C');
 					}
 
 					if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP))
@@ -598,9 +583,7 @@ class pdf_rouget extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -614,9 +597,7 @@ class pdf_rouget extends ModelePdfExpedition
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -633,9 +614,7 @@ class pdf_rouget extends ModelePdfExpedition
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -658,8 +637,8 @@ class pdf_rouget extends ModelePdfExpedition
 				$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))
@@ -668,15 +647,11 @@ class pdf_rouget extends ModelePdfExpedition
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -687,7 +662,7 @@ class pdf_rouget extends ModelePdfExpedition
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF			$pdf           Object PDF
+	 *	@param	TCPDF		$pdf           Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
@@ -699,9 +674,9 @@ class pdf_rouget extends ModelePdfExpedition
 		// phpcs:enable
 		global $conf, $mysoc;
 
-        $sign = 1;
+		$sign = 1;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
@@ -731,8 +706,8 @@ class pdf_rouget extends ModelePdfExpedition
 		// Set trueVolume and volume_units not currently stored into database
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
-		    $object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
-		    $object->volume_units = $object->size_units * 3;
+			$object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
+			$object->volume_units = $object->size_units * 3;
 		}
 
 		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
@@ -740,29 +715,29 @@ class pdf_rouget extends ModelePdfExpedition
 		if ($object->trueWeight) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
 		if ($object->trueVolume) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
 
-    	$pdf->SetFillColor(255, 255, 255);
-    	$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-    	$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
+		$pdf->SetFillColor(255, 255, 255);
+		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
 
-        if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
-        {
-            $pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
-        	$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
-        }
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
+		{
+			$pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
+		}
 
-        if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP))
-        {
-        	$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
-        	$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
-        }
+		if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP))
+		{
+			$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
+		}
 
 		if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT))
 		{
-	    	$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
-	    	$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
+			$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
 
-	    	$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
-	    	$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
+			$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
 		}
 
 		if (empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME))
@@ -770,17 +745,17 @@ class pdf_rouget extends ModelePdfExpedition
 			// Total Weight
 			if ($totalWeighttoshow)
 			{
-	    		$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-	    		$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
+				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
 
-	    		$index++;
+				$index++;
 			}
 			if ($totalVolumetoshow)
 			{
-	    		$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-	    		$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
+				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
 
-			    $index++;
+				$index++;
 			}
 			if (!$totalWeighttoshow && !$totalVolumetoshow) $index++;
 		}
@@ -794,7 +769,7 @@ class pdf_rouget extends ModelePdfExpedition
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -841,25 +816,25 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 		}
 
-        if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
-        {
-            $pdf->line($this->posxqtyordered - 1, $tab_top, $this->posxqtyordered - 1, $tab_top + $tab_height);
-    		if (empty($hidetop))
-    		{
-    			$pdf->SetXY($this->posxqtyordered - 1, $tab_top + 1);
-    			$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"), '', 'C');
-    		}
-        }
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
+		{
+			$pdf->line($this->posxqtyordered - 1, $tab_top, $this->posxqtyordered - 1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxqtyordered - 1, $tab_top + 1);
+				$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"), '', 'C');
+			}
+		}
 
-        if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP))
-        {
+		if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP))
+		{
 			$pdf->line($this->posxqtytoship - 1, $tab_top, $this->posxqtytoship - 1, $tab_top + $tab_height);
 			if (empty($hidetop))
 			{
 				$pdf->SetXY($this->posxqtytoship, $tab_top + 1);
 				$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 2, $outputlangs->transnoentities("QtyToShip"), '', 'C');
 			}
-        }
+		}
 
 		if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT)) {
 			$pdf->line($this->posxpuht - 1, $tab_top, $this->posxpuht - 1, $tab_top + $tab_height);
@@ -882,7 +857,7 @@ class pdf_rouget extends ModelePdfExpedition
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -901,7 +876,7 @@ class pdf_rouget extends ModelePdfExpedition
 		// Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK)))
 		{
-            		pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
+					pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
 		}
 
 		//Prepare la suite
@@ -921,19 +896,15 @@ class pdf_rouget extends ModelePdfExpedition
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -942,9 +913,7 @@ class pdf_rouget extends ModelePdfExpedition
 		if (!empty($conf->barcode->enabled))
 		{
 			$posx = 105;
-		}
-		else
-		{
+		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
@@ -984,10 +953,10 @@ class pdf_rouget extends ModelePdfExpedition
 		// Date planned delivery
 		if (!empty($object->date_delivery))
 		{
-    			$posy += 4;
-    			$pdf->SetXY($posx, $posy);
-    			$pdf->SetTextColor(0, 0, 60);
-    			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
 		}
 
 		if (!empty($object->thirdparty->code_client))
@@ -1006,7 +975,7 @@ class pdf_rouget extends ModelePdfExpedition
 		$origin = $object->origin;
 		$origin_id = $object->origin_id;
 
-	    // TODO move to external function
+		// TODO move to external function
 		if (!empty($conf->$origin->enabled))     // commonly $origin='commande'
 		{
 			$outputlangs->load('orders');
@@ -1016,7 +985,7 @@ class pdf_rouget extends ModelePdfExpedition
 			$result = $linkedobject->fetch($origin_id);
 			if ($result >= 0)
 			{
-			    //$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
+				//$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
 
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$text = $linkedobject->ref;
@@ -1130,8 +1099,8 @@ class pdf_rouget extends ModelePdfExpedition
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
-     *
-	 *  @param	PDF			$pdf     			PDF
+	 *
+	 *  @param	TCPDF		$pdf     			PDF
 	 *  @param	Object		$object				Object to show
 	 *  @param	Translate	$outputlangs		Object lang for output
 	 *  @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index 43ee9551109..e30ab1a9d8c 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -133,9 +133,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 955aed73704..ae1310a924a 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -44,71 +44,71 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
  */
 class pdf_standard extends ModeleExpenseReport
 {
-     /**
-     * @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 array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -209,7 +209,7 @@ class pdf_standard extends ModeleExpenseReport
 	 */
 	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;
@@ -226,9 +226,7 @@ class pdf_standard extends ModeleExpenseReport
 			if ($object->specimen) {
 				$dir = $conf->expensereport->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expensereport->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -260,24 +258,24 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
 				$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 + 12; // 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 + 12; // Height reserved to output the footer (value include bottom margin)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
 
-	            $pdf->SetAutoPageBreak(1, 0);
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -339,9 +337,7 @@ class pdf_standard extends ModeleExpenseReport
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -353,87 +349,83 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->setTopMargin($tab_top_newpage);
 				// Loop on each lines
 				$i = 0;
-                while ($i < $nblines) {
+				while ($i < $nblines) {
 					$pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					$pdf->setTopMargin($tab_top_newpage);
-                    if (empty($showpricebeforepagebreak) && ($i !== ($nblines - 1))) {
-                        $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
-                    } else {
-                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
-                    }
+					if (empty($showpricebeforepagebreak) && ($i !== ($nblines - 1))) {
+						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					} else {
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					}
 
 					$pageposbefore = $pdf->getPage();
-                    $curY = $nexY;
-                    $pdf->startTransaction();
-                    $this->printLine($pdf, $object, $i, $curY, $default_font_size, $outputlangs, $hidedetails);
-                    $pageposafter = $pdf->getPage();
+					$curY = $nexY;
+					$pdf->startTransaction();
+					$this->printLine($pdf, $object, $i, $curY, $default_font_size, $outputlangs, $hidedetails);
+					$pageposafter = $pdf->getPage();
 					if ($pageposafter > $pageposbefore) {
-                        // There is a pagebreak
+						// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						if (empty($showpricebeforepagebreak)) {
-                            $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);
-                            $showpricebeforepagebreak = 1;
-                            $nexY = $tab_top_newpage;
-                            $nexY += ($pdf->getFontSize() * 1.3); // Passe espace entre les lignes
-                            $pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
-                            $pdf->SetTextColor(0, 0, 0);
+							$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);
+							$showpricebeforepagebreak = 1;
+							$nexY = $tab_top_newpage;
+							$nexY += ($pdf->getFontSize() * 1.3); // Add space between lines
+							$pdf->SetFont('', '', $default_font_size - 2); // Into loop to work with multipage
+							$pdf->SetTextColor(0, 0, 0);
 
-                            $pdf->setTopMargin($tab_top_newpage);
-                            continue;
-                        } else {
-                            $pdf->setPageOrientation('', 1, $heightforfooter);
-                            $showpricebeforepagebreak = 0;
-                        }
+							$pdf->setTopMargin($tab_top_newpage);
+							continue;
+						} else {
+							$pdf->setPageOrientation('', 1, $heightforfooter);
+							$showpricebeforepagebreak = 0;
+						}
 
 						$this->printLine($pdf, $object, $i, $curY, $default_font_size, $outputlangs, $hidedetails);
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
 						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {
-                            // There is no space left for total+free text
+							// 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
+								// 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
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
 					$i++;
-                    //nexY
-                    $nexY = $pdf->GetY();
-                    $pageposafter = $pdf->getPage();
-                    $pdf->setPage($pageposbefore);
-                    $pdf->setTopMargin($this->marge_haute);
-                    $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					//nexY
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
-                    //$nblineFollowComment = 1;
-                    // Search number of lines coming to know if there is enough room
+					//$nblineFollowComment = 1;
+					// Search number of lines coming to know if there is enough room
 					// if ($i < ($nblines - 1))	// If it's not last line
 					// {
 					//     //Fetch current description to know on which line the next one should be placed
@@ -444,11 +436,11 @@ class pdf_standard extends ModeleExpenseReport
 					// 	$nbLineCommentNeed = dol_nboflines_bis($follow_comment,52,$outputlangs->charset_output);
 					// 	$nbLineTypeNeed = dol_nboflines_bis($follow_type,4,$outputlangs->charset_output);
 
-                    //     $nblineFollowComment = max($nbLineCommentNeed, $nbLineTypeNeed);
+					//     $nblineFollowComment = max($nbLineCommentNeed, $nbLineTypeNeed);
 					// }
 
-                    //$nexY+=$nblineFollowComment*($pdf->getFontSize()*1.3);    // Add space between lines
-                    $nexY += ($pdf->getFontSize() * 1.3); // Add space between lines
+					//$nexY+=$nblineFollowComment*($pdf->getFontSize()*1.3);    // Add space between lines
+					$nexY += ($pdf->getFontSize() * 1.3); // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -458,9 +450,7 @@ class pdf_standard extends ModeleExpenseReport
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -474,9 +464,7 @@ class pdf_standard extends ModeleExpenseReport
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -492,16 +480,14 @@ class pdf_standard extends ModeleExpenseReport
 				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
 				$pdf->SetFont('', '', 10);
 
-            	// Show total area box
+				// Show total area box
 				$posy = $bottomlasttab + 5;
 				$posy_start_of_totals = $posy;
 				$pdf->SetXY(130, $posy);
@@ -512,7 +498,7 @@ class pdf_standard extends ModeleExpenseReport
 
 				if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 				{
-				    // TODO Show vat amout per tax level
+					// TODO Show vat amout per tax level
 					$posy += 5;
 					$pdf->SetXY(130, $posy);
 					$pdf->SetTextColor(0, 0, 60);
@@ -550,8 +536,8 @@ class pdf_standard extends ModeleExpenseReport
 				$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))
@@ -560,15 +546,11 @@ class pdf_standard extends ModeleExpenseReport
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "EXPENSEREPORT_OUTPUTDIR");
 			return 0;
 		}
@@ -586,81 +568,81 @@ class pdf_standard extends ModeleExpenseReport
 	 */
 	protected function printLine(&$pdf, $object, $linenumber, $curY, $default_font_size, $outputlangs, $hidedetails = 0)
 	{
-        global $conf;
-        $pdf->SetFont('', '', $default_font_size - 1);
+		global $conf;
+		$pdf->SetFont('', '', $default_font_size - 1);
 
-        // Accountancy piece
-        $pdf->SetXY($this->posxpiece, $curY);
-        $pdf->writeHTMLCell($this->posxcomment - $this->posxpiece - 0.8, 4, $this->posxpiece - 1, $curY, $linenumber + 1, 0, 1);
+		// Accountancy piece
+		$pdf->SetXY($this->posxpiece, $curY);
+		$pdf->writeHTMLCell($this->posxcomment - $this->posxpiece - 0.8, 4, $this->posxpiece - 1, $curY, $linenumber + 1, 0, 1);
 
-        // Date
-        //$pdf->SetXY($this->posxdate -1, $curY);
-        //$pdf->MultiCell($this->posxtype-$this->posxdate-0.8, 4, dol_print_date($object->lines[$linenumber]->date,"day",false,$outputlangs), 0, 'C');
+		// Date
+		//$pdf->SetXY($this->posxdate -1, $curY);
+		//$pdf->MultiCell($this->posxtype-$this->posxdate-0.8, 4, dol_print_date($object->lines[$linenumber]->date,"day",false,$outputlangs), 0, 'C');
 
-        // Type
-        $pdf->SetXY($this->posxtype - 1, $curY);
-        $nextColumnPosX = $this->posxup;
-        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
-            $nextColumnPosX = $this->posxtva;
-        }
-        if (!empty($conf->projet->enabled)) {
-            $nextColumnPosX = $this->posxprojet;
-        }
+		// Type
+		$pdf->SetXY($this->posxtype - 1, $curY);
+		$nextColumnPosX = $this->posxup;
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+			$nextColumnPosX = $this->posxtva;
+		}
+		if (!empty($conf->projet->enabled)) {
+			$nextColumnPosX = $this->posxprojet;
+		}
 
-        $expensereporttypecode = $object->lines[$linenumber]->type_fees_code;
+		$expensereporttypecode = $object->lines[$linenumber]->type_fees_code;
 		$expensereporttypecodetoshow = ($outputlangs->trans(($expensereporttypecode)) == $expensereporttypecode ? $object->lines[$linenumber]->type_fees_libelle : $outputlangs->trans($expensereporttypecode));
 
 
 		if ($expensereporttypecodetoshow == $expensereporttypecode) {
-            $expensereporttypecodetoshow = preg_replace('/^(EX_|TF_)/', '', $expensereporttypecodetoshow);
-        }
-        //$expensereporttypecodetoshow = dol_trunc($expensereporttypecodetoshow, 9);
+			$expensereporttypecodetoshow = preg_replace('/^(EX_|TF_)/', '', $expensereporttypecodetoshow);
+		}
+		//$expensereporttypecodetoshow = dol_trunc($expensereporttypecodetoshow, 9);
 
-        //$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, $expensereporttypecodetoshow, 0, 'C');
+		//$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, $expensereporttypecodetoshow, 0, 'C');
 
-        // Project
-        //if (! empty($conf->projet->enabled))
-        //{
-        //    $pdf->SetFont('','', $default_font_size - 1);
-        //    $pdf->SetXY($this->posxprojet, $curY);
-        //    $pdf->MultiCell($this->posxtva-$this->posxprojet-0.8, 4, $object->lines[$linenumber]->projet_ref, 0, 'C');
-        //}
+		// Project
+		//if (! empty($conf->projet->enabled))
+		//{
+		//    $pdf->SetFont('','', $default_font_size - 1);
+		//    $pdf->SetXY($this->posxprojet, $curY);
+		//    $pdf->MultiCell($this->posxtva-$this->posxprojet-0.8, 4, $object->lines[$linenumber]->projet_ref, 0, 'C');
+		//}
 
-        // VAT Rate
-        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
-            $vat_rate = pdf_getlinevatrate($object, $linenumber, $outputlangs, $hidedetails);
-            $pdf->SetXY($this->posxtva, $curY);
-            $pdf->MultiCell($this->posxup - $this->posxtva - 0.8, 4, $vat_rate, 0, 'R');
-        }
+		// VAT Rate
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+			$vat_rate = pdf_getlinevatrate($object, $linenumber, $outputlangs, $hidedetails);
+			$pdf->SetXY($this->posxtva, $curY);
+			$pdf->MultiCell($this->posxup - $this->posxtva - 0.8, 4, $vat_rate, 0, 'R');
+		}
 
-        // Unit price
-        $pdf->SetXY($this->posxup, $curY);
-        $pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 4, price($object->lines[$linenumber]->value_unit), 0, 'R');
+		// Unit price
+		$pdf->SetXY($this->posxup, $curY);
+		$pdf->MultiCell($this->posxqty - $this->posxup - 0.8, 4, price($object->lines[$linenumber]->value_unit), 0, 'R');
 
-        // Quantity
-        $pdf->SetXY($this->posxqty, $curY);
-        $pdf->MultiCell($this->postotalttc - $this->posxqty - 0.8, 4, $object->lines[$linenumber]->qty, 0, 'R');
+		// Quantity
+		$pdf->SetXY($this->posxqty, $curY);
+		$pdf->MultiCell($this->postotalttc - $this->posxqty - 0.8, 4, $object->lines[$linenumber]->qty, 0, 'R');
 
-        // Total with all taxes
-        $pdf->SetXY($this->postotalttc - 1, $curY);
-        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalttc, 4, price($object->lines[$linenumber]->total_ttc), 0, 'R');
+		// Total with all taxes
+		$pdf->SetXY($this->postotalttc - 1, $curY);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalttc, 4, price($object->lines[$linenumber]->total_ttc), 0, 'R');
 
-        // Comments
-        $pdf->SetXY($this->posxcomment, $curY);
-        $comment = $outputlangs->trans("Date").':'.dol_print_date($object->lines[$linenumber]->date, "day", false, $outputlangs).' ';
-        $comment .= $outputlangs->trans("Type").':'.$expensereporttypecodetoshow.'<br>';
-        if (!empty($object->lines[$linenumber]->projet_ref)) {
-            $comment .= $outputlangs->trans("Project").':'.$object->lines[$linenumber]->projet_ref.'<br>';
-        }
-        $comment .= $object->lines[$linenumber]->comments;
-        $pdf->writeHTMLCell($this->posxtva - $this->posxcomment - 0.8, 4, $this->posxcomment - 1, $curY, $comment, 0, 1);
+		// Comments
+		$pdf->SetXY($this->posxcomment, $curY);
+		$comment = $outputlangs->trans("Date").':'.dol_print_date($object->lines[$linenumber]->date, "day", false, $outputlangs).' ';
+		$comment .= $outputlangs->trans("Type").':'.$expensereporttypecodetoshow.'<br>';
+		if (!empty($object->lines[$linenumber]->projet_ref)) {
+			$comment .= $outputlangs->trans("Project").':'.$object->lines[$linenumber]->projet_ref.'<br>';
+		}
+		$comment .= $object->lines[$linenumber]->comments;
+		$pdf->writeHTMLCell($this->posxtva - $this->posxcomment - 0.8, 4, $this->posxcomment - 1, $curY, $comment, 0, 1);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
+	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -684,7 +666,7 @@ class pdf_standard extends ModeleExpenseReport
 		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 		*/
 
-	    // Draft watermark
+		// Draft watermark
 		if ($object->fk_statut == 0 && !empty($conf->global->EXPENSEREPORT_DRAFT_WATERMARK)) {
  			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->EXPENSEREPORT_DRAFT_WATERMARK);
 		}
@@ -701,17 +683,15 @@ class pdf_standard extends ModeleExpenseReport
 		$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)
+				$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
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -816,7 +796,7 @@ class pdf_standard extends ModeleExpenseReport
 			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("TripNDF")." :", 0, 'L');
 			$pdf->rect($posx, $posy, $this->page_largeur - $this->marge_gauche - $posx, $hautcadre);
 
-			// Informations for trip (dates and users workflow)
+			// Informations for expense report (dates and users workflow)
 			if ($object->fk_user_author > 0) {
 				$userfee = new User($this->db);
 				$userfee->fetch($object->fk_user_author);
@@ -824,7 +804,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->SetXY($posx + 2, $posy);
 				$pdf->SetFont('', '', 10);
 				$pdf->MultiCell(96, 4, $outputlangs->transnoentities("AUTHOR")." : ".dolGetFirstLastname($userfee->firstname, $userfee->lastname), 0, 'L');
-				$posy += 5;
+				$posy = $pdf->GetY() + 1;
 				$pdf->SetXY($posx + 2, $posy);
 				$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DateCreation")." : ".dol_print_date($object->date_create, "day", false, $outputlangs), 0, 'L');
 			}
@@ -842,9 +822,7 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->SetXY($posx + 2, $posy);
 					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse, "day", false, $outputlangs), 0, 'L');
 				}
-			}
-			elseif ($object->fk_statut == 4)
-			{
+			} elseif ($object->fk_statut == 4) {
 				if ($object->fk_user_cancel > 0) {
 					$userfee = new User($this->db);
 					$userfee->fetch($object->fk_user_cancel); $posy += 6;
@@ -857,9 +835,7 @@ class pdf_standard extends ModeleExpenseReport
 					$pdf->SetXY($posx + 2, $posy);
 					$pdf->MultiCell(96, 4, $outputlangs->transnoentities("DATE_CANCEL")." : ".dol_print_date($object->date_cancel, "day", false, $outputlangs), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				if ($object->fk_user_approve > 0) {
 					$userfee = new User($this->db);
 					$userfee->fetch($object->fk_user_approve); $posy += 6;
@@ -889,7 +865,7 @@ class pdf_standard extends ModeleExpenseReport
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param     PDF			$pdf     		Object PDF
+	 *   @param     TCPDF		$pdf     		Object PDF
 	 *   @param		int			$tab_top		Tab top
 	 *   @param		int			$tab_height		Tab height
 	 *   @param		int			$nexY			next y
@@ -957,15 +933,15 @@ class pdf_standard extends ModeleExpenseReport
 		//	$pdf->MultiCell($this->posxprojet-$this->posxtype - 1, 2, $outputlangs->transnoentities("Type"), '', 'C');
 		//}
 
-        //if (!empty($conf->projet->enabled))
-        //{
-        //    // Project
-        //    $pdf->line($this->posxprojet - 1, $tab_top, $this->posxprojet - 1, $tab_top + $tab_height);
-    	//	if (empty($hidetop)) {
-        //        $pdf->SetXY($this->posxprojet - 1, $tab_top + 1);
-        //        $pdf->MultiCell($this->posxtva - $this->posxprojet - 1, 2, $outputlangs->transnoentities("Project"), '', 'C');
-    	//	}
-        //}
+		//if (!empty($conf->projet->enabled))
+		//{
+		//    // Project
+		//    $pdf->line($this->posxprojet - 1, $tab_top, $this->posxprojet - 1, $tab_top + $tab_height);
+		//	if (empty($hidetop)) {
+		//        $pdf->SetXY($this->posxprojet - 1, $tab_top + 1);
+		//        $pdf->MultiCell($this->posxtva - $this->posxprojet - 1, 2, $outputlangs->transnoentities("Project"), '', 'C');
+		//	}
+		//}
 
 		// VAT
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
@@ -976,7 +952,7 @@ class pdf_standard extends ModeleExpenseReport
 			}
 		}
 
-        // Unit price
+		// Unit price
 		$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);
@@ -1003,7 +979,7 @@ class pdf_standard extends ModeleExpenseReport
 	/**
 	 *  Show payments table
 	 *
-	 *  @param	PDF			$pdf           Object PDF
+	 *  @param	TCPDF		$pdf            Object PDF
 	 *  @param  Object		$object         Object invoice
 	 *  @param  int			$posy           Position y in PDF
 	 *  @param  Translate	$outputlangs    Object langs for output
@@ -1053,7 +1029,7 @@ class pdf_standard extends ModeleExpenseReport
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-		$sql .= " WHERE e.rowid = '".$object->id."'";
+		$sql .= " WHERE e.rowid = ".((int) $object->id);
 		$sql .= " AND p.fk_expensereport = e.rowid";
 		$sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
 		$sql .= " ORDER BY dp";
@@ -1105,9 +1081,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->SetXY($tab3_posx + 35, $tab3_top + $y);
 				$pdf->MultiCell(30, 4, $outputlangs->transnoentitiesnoconv("RemainderToPay"), 0, 'L', 0);
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1116,8 +1090,8 @@ class pdf_standard extends ModeleExpenseReport
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
-     *
-	 *  @param  PDF			$pdf     			PDF
+	 *
+	 *  @param  TCPDF		$pdf     			PDF
 	 *  @param  Object		$object				Object to show
 	 *  @param  Translate	$outputlangs		Object lang for output
 	 *  @param  int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index 2915dac3d0e..299b31ad85c 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -186,9 +186,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_expensereport_jade::getNextValue", LOG_DEBUG);
 			return 0;
 		}
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index 5124cb3f160..f4691ceb611 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -217,9 +217,7 @@ class ExportCsv extends ModeleExports
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -253,9 +251,7 @@ class ExportCsv extends ModeleExports
 		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
@@ -333,7 +329,6 @@ class ExportCsv extends ModeleExports
 		global $conf;
 		$addquote = 0;
 
-
 		// Rule Dolibarr: No HTML
    		//print $charset.' '.$newvalue."\n";
    		//$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php
index 779f2240155..4f7235f6843 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007new.modules.php
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 
 /**
  *	Class to build export files with Excel format
@@ -59,6 +60,8 @@ class ExportExcel2007new extends ModeleExports
 
 	public $worksheet; // Handle sheet
 
+	public $styleArray;
+
 	public $row;
 
 	public $col;
@@ -273,9 +276,7 @@ class ExportExcel2007new extends ModeleExports
     		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		}
-    		else
-    		{
+    		} 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
                 {
@@ -332,9 +333,7 @@ class ExportExcel2007new extends ModeleExports
 			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg))
 			{
 				$newvalue = $outputlangs->transnoentities($reg[1]);
-			}
-			else
-			{
+			} else {
 				$newvalue = $outputlangs->convToOutputCharset($newvalue);
 			}
 
@@ -344,16 +343,13 @@ class ExportExcel2007new extends ModeleExports
         	    $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))
+			} 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');
-			}
-			else
-			{
+			} else {
     	    	if ($typefield == 'Text' || $typefield == 'TextAuto')
     	    	{
     	    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
@@ -361,9 +357,7 @@ class ExportExcel2007new extends ModeleExports
     	    		$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
-    	    	{
+    	    	} else {
     	    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
     	    	}
 			}
@@ -445,4 +439,204 @@ class ExportExcel2007new extends ModeleExports
 
     	return $letter;
     }
+
+	/**
+	 * Set cell value and automatically merge if we give an endcell
+	 *
+	 * @param string $val cell value
+	 * @param string $startCell starting cell
+	 * @param string $endCell  ending cell
+	 * @return int 1 if success -1 if failed
+	 */
+	public function setCellValue($val, $startCell, $endCell = '')
+	{
+		try {
+			$this->workbook->getActiveSheet()->setCellValue($startCell, $val);
+
+			if (! empty($endCell)) {
+				$cellRange = $startCell.':'.$endCell;
+				$this->workbook->getActiveSheet()->mergeCells($startCell.':'.$endCell);
+			}
+			else $cellRange = $startCell;
+			if (! empty($this->styleArray)) $this->workbook->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styleArray);
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return 1;
+	}
+
+	/**
+	 * Set border style
+	 *
+	 * @param string $thickness style \PhpOffice\PhpSpreadsheet\Style\Border
+	 * @param string $color     color \PhpOffice\PhpSpreadsheet\Style\Color
+	 * @return int 1 if ok
+	 */
+	public function setBorderStyle($thickness, $color)
+	{
+		$this->styleArray['borders'] = array(
+			'outline' => array(
+				'borderStyle' => $thickness,
+				'color' => array('argb' => $color)
+			)
+		);
+		return 1;
+	}
+
+	/**
+	 * Set font style
+	 *
+	 * @param bool   $bold  true if bold
+	 * @param string $color color \PhpOffice\PhpSpreadsheet\Style\Color
+	 * @return int 1
+	 */
+	public function setFontStyle($bold, $color)
+	{
+		$this->styleArray['font'] = array(
+			'color' => array('argb' => $color),
+			'bold' => $bold
+		);
+		return 1;
+	}
+
+	/**
+	 * Set alignment style (horizontal, left, right, ...)
+	 *
+	 * @param string $horizontal PhpOffice\PhpSpreadsheet\Style\Alignment
+	 * @return int 1
+	 */
+	public function setAlignmentStyle($horizontal)
+	{
+		$this->styleArray['alignment'] = array('horizontal' => $horizontal);
+		return 1;
+	}
+
+	/**
+	 * Reset Style
+	 * @return int 1
+	 */
+	public function resetStyle()
+	{
+		$this->styleArray = array();
+		return 1;
+	}
+
+	/**
+	 * Make a NxN Block in sheet
+	 *
+	 * @param string $startCell starting cell
+	 * @param array  $TDatas array(ColumnName=>array(Row value 1, row value 2, etc ...))
+	 * @param bool   $boldTitle true if bold headers
+	 * @return int 1 if OK, -1 if KO
+	 */
+	public function setBlock($startCell, $TDatas = array(), $boldTitle = false)
+	{
+		try {
+			if (! empty($TDatas)) {
+				$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
+				$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
+				$startRow = $startCell->getRow();
+				foreach ($TDatas as $column => $TRows) {
+					if ($boldTitle) $this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
+					$this->setCellValue($column, $cell->getCoordinate());
+					$rowPos = $startRow;
+					if ($boldTitle) $this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					foreach ($TRows as $row) {
+						$rowPos++;
+						$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $rowPos);
+						$this->setCellValue($row, $cell->getCoordinate());
+					}
+					$startColumn++;
+				}
+			}
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return 1;
+	}
+
+	/**
+	 * Make a 2xN Tab in Sheet
+	 *
+	 * @param string $startCell A1
+	 * @param array  $TDatas    array(Title=>val)
+	 * @param bool   $boldTitle true if bold titles
+	 * @return int 1 if OK, -1 if KO
+	 */
+	public function setBlock2Columns($startCell, $TDatas = array(), $boldTitle = false)
+	{
+		try {
+			if (! empty($TDatas)) {
+				$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
+				$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
+				$startRow = $startCell->getRow();
+				foreach ($TDatas as $title => $val) {
+					$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
+					if ($boldTitle) $this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					$this->setCellValue($title, $cell->getCoordinate());
+					if ($boldTitle) $this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					$cell2 = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn + 1, $startRow);
+					$this->setCellValue($val, $cell2->getCoordinate());
+					$startRow++;
+				}
+			}
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return 1;
+	}
+
+	/**
+	 * Enable auto sizing for column range
+	 *
+	 * @param string $firstColumn first column to autosize
+	 * @param string $lastColumn  to last column to autosize
+	 * @return int 1
+	 */
+	public function enableAutosize($firstColumn, $lastColumn)
+	{
+		foreach (range($firstColumn, $lastColumn) as $columnID) {
+			$this->workbook->getActiveSheet()->getColumnDimension($columnID)->setAutoSize(true);
+		}
+		return 1;
+	}
+
+	/**
+	 * Set a value cell and merging it by giving a starting cell and a length
+	 *
+	 * @param string $val       Cell value
+	 * @param string $startCell Starting cell
+	 * @param int    $length    Length
+	 * @param int    $offset    Starting offset
+	 * @return string Coordinate or -1 if KO
+	 */
+	public function setMergeCellValueByLength($val, $startCell, $length, $offset = 0)
+	{
+		try {
+			$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
+			$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
+			if (! empty($offset)) $startColumn += $offset;
+
+			$startRow = $startCell->getRow();
+			$startCell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
+			$startCoordinate = $startCell->getCoordinate();
+			$this->setCellValue($val, $startCell->getCoordinate());
+
+			$endCell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn + ($length - 1), $startRow);
+			$endCoordinate = $endCell->getCoordinate();
+			$this->workbook->getActiveSheet()->mergeCells($startCoordinate.':'.$endCoordinate);
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return $endCoordinate;
+	}
 }
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index acbebd54da8..c581909588a 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
@@ -47,9 +47,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -137,8 +137,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -279,9 +278,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -357,8 +354,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -374,8 +370,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -409,25 +404,21 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -446,15 +437,12 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -463,8 +451,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -477,8 +464,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -497,8 +483,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -518,9 +503,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index a98dd42e5d7..2af8fcc9bfb 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -43,76 +43,76 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_crabe extends ModelePDFFactures
 {
-     /**
-     * @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.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -183,9 +183,7 @@ class pdf_crabe extends ModelePDFFactures
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
-		}
-		else
-		{
+		} else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -199,14 +197,14 @@ class pdf_crabe extends ModelePDFFactures
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-		    $this->posxpicture -= 20;
-		    $this->posxtva -= 20;
-		    $this->posxup -= 20;
-		    $this->posxqty -= 20;
-		    $this->posxunit -= 20;
-		    $this->posxdiscount -= 20;
-		    $this->posxprogress -= 20;
-		    $this->postotalht -= 20;
+			$this->posxpicture -= 20;
+			$this->posxtva -= 20;
+			$this->posxup -= 20;
+			$this->posxqty -= 20;
+			$this->posxunit -= 20;
+			$this->posxdiscount -= 20;
+			$this->posxprogress -= 20;
+			$this->postotalht -= 20;
 		}
 
 		$this->tva = array();
@@ -218,21 +216,21 @@ class pdf_crabe extends ModelePDFFactures
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// 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
+	 *  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)
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager, $nblines;
 
 		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
@@ -287,9 +285,7 @@ class pdf_crabe extends ModelePDFFactures
 			{
 				$dir = $conf->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->facture->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -322,27 +318,27 @@ class pdf_crabe extends ModelePDFFactures
 
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-                $pdf->SetAutoPageBreak(1, 0);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-                $heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
-		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 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));
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-                // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-				    $tplidx = $pdf->importPage(1);
-                }
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb = 0;
@@ -357,7 +353,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				// Set certificate
 				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
-				// If use has no certificate, we try to take the company one
+				// If user has no certificate, we try to take the company one
 				if (!$cert) {
 					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
 				}
@@ -384,14 +380,14 @@ class pdf_crabe extends ModelePDFFactures
 				}
 				if (empty($this->atleastonediscount))    // retreive space not used by discount
 				{
-				    $delta = ($this->posxprogress - $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->posxprogress - $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
 				}
 
 				$progress_width = 0;
@@ -456,11 +452,11 @@ class pdf_crabe extends ModelePDFFactures
 						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)
 				{
 					$tab_top -= 2;
@@ -518,8 +514,7 @@ class pdf_crabe extends ModelePDFFactures
 						// 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 $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -555,19 +550,15 @@ class pdf_crabe extends ModelePDFFactures
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -615,17 +606,17 @@ class pdf_crabe extends ModelePDFFactures
 					// Discount on line
 					if ($object->lines[$i]->remise_percent)
 					{
-                        $pdf->SetXY($this->posxdiscount - 2, $curY);
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
-					    $pdf->MultiCell($this->posxprogress - $this->posxdiscount + 2, 3, $remise_percent, 0, 'R');
+						$pdf->SetXY($this->posxdiscount - 2, $curY);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$pdf->MultiCell($this->posxprogress - $this->posxdiscount + 2, 3, $remise_percent, 0, 'R');
 					}
 
 					// Situation progress
 					if ($this->situationinvoice)
 					{
-					    $progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
-					    $pdf->SetXY($this->posxprogress, $curY);
-				        $pdf->MultiCell($this->postotalht - $this->posxprogress + 1, 3, $progress, 0, 'R');
+						$progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
+						$pdf->SetXY($this->posxprogress, $curY);
+						$pdf->MultiCell($this->postotalht - $this->posxprogress + 1, 3, $progress, 0, 'R');
 					}
 
 					// Total HT line
@@ -669,7 +660,7 @@ class pdf_crabe extends ModelePDFFactures
 						$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)
@@ -700,9 +691,7 @@ class pdf_crabe extends ModelePDFFactures
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -716,9 +705,7 @@ class pdf_crabe extends ModelePDFFactures
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -735,9 +722,7 @@ class pdf_crabe extends ModelePDFFactures
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -769,8 +754,8 @@ class pdf_crabe extends ModelePDFFactures
 				$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))
@@ -779,15 +764,11 @@ class pdf_crabe extends ModelePDFFactures
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
 			return 0;
 		}
@@ -799,23 +780,23 @@ class pdf_crabe extends ModelePDFFactures
 	/**
 	 *  Show payments table
 	 *
-     *  @param	PDF			$pdf            Object PDF
-     *  @param  Object		$object         Object invoice
-     *  @param  int			$posy           Position y in PDF
-     *  @param  Translate	$outputlangs    Object langs for output
-     *  @param  int			$heightforfooter height for footer
-     *  @return int             			<0 if KO, >0 if OK
+	 *  @param	TCPDF		$pdf            Object PDF
+	 *  @param  Object		$object         Object invoice
+	 *  @param  int			$posy           Position y in PDF
+	 *  @param  Translate	$outputlangs    Object langs for output
+	 *  @param  int			$heightforfooter height for footer
+	 *  @return int             			<0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
-        $sign = 1;
-        if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		$sign = 1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
 		$current_page = $pdf->getPage();
-        $tab3_posx = 120;
+		$tab3_posx = 120;
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
@@ -881,9 +862,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -935,9 +914,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			return $tab3_top + $y + 3;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -960,8 +937,8 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	protected function _tableau_versements_header($pdf, $object, $outputlangs, $default_font_size, $tab3_posx, $tab3_top, $tab3_width, $tab3_height)
 	{
-	    // phpcs:enable
-	    $title = $outputlangs->transnoentities("PaymentsAlreadyDone");
+		// phpcs:enable
+		$title = $outputlangs->transnoentities("PaymentsAlreadyDone");
 		if ($object->type == 2) $title = $outputlangs->transnoentities("PaymentsBackAlreadyDone");
 
 		$pdf->SetFont('', '', $default_font_size - 3);
@@ -988,7 +965,7 @@ class pdf_crabe extends ModelePDFFactures
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Object		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
@@ -996,7 +973,7 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1108,13 +1085,13 @@ class pdf_crabe extends ModelePDFFactures
 						$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))
-			            {
+						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)
 					{
@@ -1123,13 +1100,13 @@ class pdf_crabe extends ModelePDFFactures
 						$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))
-			            {
+						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;
-			            }
+						}
 					}
 				}
 			}
@@ -1162,7 +1139,7 @@ class pdf_crabe extends ModelePDFFactures
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF			$pdf            Object PDF
+	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
@@ -1171,13 +1148,13 @@ class pdf_crabe extends ModelePDFFactures
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 
-        $sign = 1;
-        if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		$sign = 1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
@@ -1215,10 +1192,8 @@ class pdf_crabe extends ModelePDFFactures
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
-			    // FIXME amount of vat not supported with multicurrency
+			} else {
+				// FIXME amount of vat not supported with multicurrency
 
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
@@ -1252,7 +1227,7 @@ class pdf_crabe extends ModelePDFFactures
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1287,7 +1262,7 @@ class pdf_crabe extends ModelePDFFactures
 					}
 				}
 
-                //}
+				//}
 
 				// VAT
 				foreach ($this->tva as $tvakey => $tvaval)
@@ -1344,7 +1319,7 @@ class pdf_crabe extends ModelePDFFactures
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1489,7 +1464,7 @@ class pdf_crabe extends ModelePDFFactures
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -1583,23 +1558,23 @@ class pdf_crabe extends ModelePDFFactures
 
 		if ($this->atleastonediscount)
 		{
-		    $pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-    		if (empty($hidetop))
-    		{
-   			    $pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
+			$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+   				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
    				$pdf->MultiCell($this->posxprogress - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
-    		}
-        }
+			}
+		}
 
-        if ($this->situationinvoice) {
-            $pdf->line($this->posxprogress - 1, $tab_top, $this->posxprogress - 1, $tab_top + $tab_height);
-            if (empty($hidetop)) {
-                $pdf->SetXY($this->posxprogress, $tab_top + 1);
-                $pdf->MultiCell($this->postotalht - $this->posxprogress, 2, $outputlangs->transnoentities("ProgressShort"), '', 'C');
-            }
-        }
+		if ($this->situationinvoice) {
+			$pdf->line($this->posxprogress - 1, $tab_top, $this->posxprogress - 1, $tab_top + $tab_height);
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxprogress, $tab_top + 1);
+				$pdf->MultiCell($this->postotalht - $this->posxprogress, 2, $outputlangs->transnoentities("ProgressShort"), '', 'C');
+			}
+		}
 
-        $pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
@@ -1611,7 +1586,7 @@ class pdf_crabe extends ModelePDFFactures
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -1630,9 +1605,9 @@ class pdf_crabe extends ModelePDFFactures
 
 		// Show Draft Watermark
 		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
-        {
-		      pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
-        }
+		{
+			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
+		}
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -1640,7 +1615,7 @@ class pdf_crabe extends ModelePDFFactures
 		$w = 110;
 
 		$posy = $this->marge_haute;
-        $posx = $this->page_largeur - $this->marge_droite - $w;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -1654,25 +1629,20 @@ class pdf_crabe extends ModelePDFFactures
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
+					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1801,16 +1771,16 @@ class pdf_crabe extends ModelePDFFactures
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $usertmp = new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy += 4;
-                $pdf->SetXY($posx, $posy);
-		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 1;
@@ -1918,8 +1888,8 @@ class pdf_crabe extends ModelePDFFactures
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 8f48f31fddb..bab3bbd9e71 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -43,82 +43,82 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_sponge extends ModelePDFFactures
 {
-    /**
-     * @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.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -193,771 +193,744 @@ class pdf_sponge extends ModelePDFFactures
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int         	    			1=OK, 0=KO
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-	    // phpcs:enable
-	    global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-	    dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
+		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
-	    if (!is_object($outputlangs)) $outputlangs = $langs;
-	    // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-	    if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
-	    // Load translation files required by the page
-	    $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
 
-	    if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-	    	global $outputlangsbis;
-	    	$outputlangsbis = new Translate('', $conf);
-	    	$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-	    	$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
-	    }
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			global $outputlangsbis;
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		}
 
-	    $nblines = count($object->lines);
+		$nblines = count($object->lines);
 
-	    $hidetop = 0;
-	    if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
-	        $hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
-	    }
+		$hidetop = 0;
+		if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
+			$hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
+		}
 
-	    // Loop on each lines to detect if there is at least one image to show
-	    $realpatharray = array();
-	    $this->atleastonephoto = false;
-	    if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
-	    {
-	        $objphoto = new Product($this->db);
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		$this->atleastonephoto = false;
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
+		{
+			$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)
-	                {
-	                    $dir = $conf->product->dir_output.'/'.$midir;
+				$arephoto = false;
+				foreach ($pdir as $midir)
+				{
+					if (!$arephoto)
+					{
+						$dir = $conf->product->dir_output.'/'.$midir;
 
-	                    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 (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
 
-	    if ($conf->facture->dir_output)
-	    {
-	        $object->fetch_thirdparty();
+		if ($conf->facture->dir_output)
+		{
+			$object->fetch_thirdparty();
 
-	        $deja_regle = $object->getSommePaiement(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-	        $amount_credit_notes_included = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
-	        $amount_deposits_included = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+			$deja_regle = $object->getSommePaiement(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_credit_notes_included = $object->getSumCreditNotesUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
+			$amount_deposits_included = $object->getSumDepositsUsed(($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? 1 : 0);
 
-	        // Definition of $dir and $file
-	        if ($object->specimen)
-	        {
-	            $dir = $conf->facture->dir_output;
-	            $file = $dir."/SPECIMEN.pdf";
-	        }
-	        else
-	        {
-	            $objectref = dol_sanitizeFileName($object->ref);
-	            $dir = $conf->facture->dir_output."/".$objectref;
-	            $file = $dir."/".$objectref.".pdf";
-	        }
-	        if (!file_exists($dir))
-	        {
-	            if (dol_mkdir($dir) < 0)
-	            {
-	                $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
-	                return 0;
-	            }
-	        }
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->facture->dir_output;
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->facture->dir_output."/".$objectref;
+				$file = $dir."/".$objectref.".pdf";
+			}
+			if (!file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return 0;
+				}
+			}
 
-	        if (file_exists($dir))
-	        {
-	            // Add pdfgeneration hook
-	            if (!is_object($hookmanager))
-	            {
-	                include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-	                $hookmanager = new HookManager($this->db);
-	            }
-	            $hookmanager->initHooks(array('pdfgeneration'));
-	            $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
-	            global $action;
-	            $reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+			if (file_exists($dir))
+			{
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-	            // Set nblines with the new facture lines content after hook
-	            $nblines = count($object->lines);
-	            $nbpayments = count($object->getListOfPayments());
+				// Set nblines with the new facture lines content after hook
+				$nblines = count($object->lines);
+				$nbpayments = count($object->getListOfPayments());
 
-	            // Create pdf instance
-	            $pdf = pdf_getInstance($this->format);
-	            $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1, 0);
+				// Create pdf instance
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-	            $heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
-	            $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
-	            if (class_exists('TCPDF'))
-	            {
-	                $pdf->setPrintHeader(false);
-	                $pdf->setPrintFooter(false);
-	            }
-	            $pdf->SetFont(pdf_getPDFFont($outputlangs));
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-	            // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-	            {
-	            	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-	                $tplidx = $pdf->importPage(1);
-	            }
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
-	            $pdf->Open();
-	            $pagenb = 0;
-	            $pdf->SetDrawColor(128, 128, 128);
+				$pdf->Open();
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
-	            $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-	            $pdf->SetSubject($outputlangs->transnoentities("PdfInvoiceTitle"));
-	            $pdf->SetCreator("Dolibarr ".DOL_VERSION);
-	            $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-	            $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-	            if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("PdfInvoiceTitle"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-	            // Set certificate
-	            $cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
-	            // If use has no certificate, we try to take the company one
-	            if (!$cert) {
-	            	$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
-	            }
-	            // If a certificate is found
-	            if ($cert) {
-	            	$info = array(
-	            		'Name' => $this->emetteur->name,
-	            		'Location' => getCountry($this->emetteur->country_code, 0),
-	            		'Reason' => 'INVOICE',
-	            		'ContactInfo' => $this->emetteur->email
-	            	);
-	            	$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
-	            }
+				// Set certificate
+				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
+				// If user has no certificate, we try to take the company one
+				if (!$cert) {
+					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
+				}
+				// If a certificate is found
+				if ($cert) {
+					$info = array(
+						'Name' => $this->emetteur->name,
+						'Location' => getCountry($this->emetteur->country_code, 0),
+						'Reason' => 'INVOICE',
+						'ContactInfo' => $this->emetteur->email
+					);
+					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
+				}
 
-	            $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-	            // Does we have at least one line with discount $this->atleastonediscount
-	            foreach ($object->lines as $line) {
-                    if ($line->remise_percent) {
-	                    $this->atleastonediscount = true;
-	                    break;
-	                }
-	            }
+				// Does we have at least one line with discount $this->atleastonediscount
+				foreach ($object->lines as $line) {
+					if ($line->remise_percent) {
+						$this->atleastonediscount = true;
+						break;
+					}
+				}
 
 
-	            // Situation invoice handling
-	            if ($object->situation_cycle_ref)
-	            {
-	                $this->situationinvoice = true;
-	            }
+				// Situation invoice handling
+				if ($object->situation_cycle_ref)
+				{
+					$this->situationinvoice = true;
+				}
 
-	            // New page
-	            $pdf->AddPage();
-	            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	            $pagenb++;
+				// New page
+				$pdf->AddPage();
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
 
-	            $top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
-	            $pdf->SetFont('', '', $default_font_size - 1);
-	            $pdf->MultiCell(0, 3, ''); // Set interline to 3
-	            $pdf->SetTextColor(0, 0, 0);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
-	            $tab_top = 90 + $top_shift;
-	            $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
-	            $tab_height = 130 - $top_shift;
-	            $tab_height_newpage = 150;
-	            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
+				$tab_top = 90 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+				$tab_height = 130 - $top_shift;
+				$tab_height_newpage = 150;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
 
-                $nexY = $tab_top - 1;
+				$nexY = $tab_top - 1;
 
-	            // Incoterm
-	            $height_incoterms = 0;
-	            if ($conf->incoterm->enabled)
-	            {
-	                $desc_incoterms = $object->getIncotermsForPDF();
-	                if ($desc_incoterms)
-	                {
+				// Incoterm
+				$height_incoterms = 0;
+				if ($conf->incoterm->enabled)
+				{
+					$desc_incoterms = $object->getIncotermsForPDF();
+					if ($desc_incoterms)
+					{
 						$tab_top -= 2;
 
-	                    $pdf->SetFont('', '', $default_font_size - 1);
-	                    $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
-	                    $nexY = max($pdf->GetY(), $nexY);
-	                    $height_incoterms = $nexY - $tab_top;
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+						$nexY = max($pdf->GetY(), $nexY);
+						$height_incoterms = $nexY - $tab_top;
 
-	                    // Rect takes a length in 3rd parameter
-	                    $pdf->SetDrawColor(192, 192, 192);
-	                    $pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
+						// Rect takes a length in 3rd parameter
+						$pdf->SetDrawColor(192, 192, 192);
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
 
-	                    $tab_top = $nexY + 6;
-	                    $height_incoterms += 4;
-	                }
-	            }
+						$tab_top = $nexY + 6;
+						$height_incoterms += 4;
+					}
+				}
 
-	            // Display notes
-	            $notetoshow = empty($object->note_public) ? '' : $object->note_public;
-	            if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-	            {
-	                // Get first sale rep
-	                if (is_object($object->thirdparty))
-	                {
-	                    $salereparray = $object->thirdparty->getSalesRepresentatives($user);
-	                    $salerepobj = new User($this->db);
-	                    $salerepobj->fetch($salereparray[0]['id']);
-	                    if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
-	                }
-	            }
+				// Display notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
+				{
+					// Get first sale rep
+					if (is_object($object->thirdparty))
+					{
+						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
+						$salerepobj = new User($this->db);
+						$salerepobj->fetch($salereparray[0]['id']);
+						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);
+				}
 
-	            $pagenb = $pdf->getPage();
-	            if ($notetoshow)
-	            {
+				$pagenb = $pdf->getPage();
+				if ($notetoshow)
+				{
 					$tab_top -= 2;
 
-	                $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
-	                $pageposbeforenote = $pagenb;
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
 
-	                $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
-	                complete_substitutions_array($substitutionarray, $outputlangs, $object);
-	                $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-	                $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-	                $pdf->startTransaction();
+					$pdf->startTransaction();
 
-	                $pdf->SetFont('', '', $default_font_size - 1);
-	                $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-	                // Description
-	                $pageposafternote = $pdf->getPage();
-	                $posyafter = $pdf->GetY();
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					// Description
+					$pageposafternote = $pdf->getPage();
+					$posyafter = $pdf->GetY();
 
-	                if ($pageposafternote > $pageposbeforenote)
-	                {
-	                    $pdf->rollbackTransaction(true);
+					if ($pageposafternote > $pageposbeforenote)
+					{
+						$pdf->rollbackTransaction(true);
 
-	                    // prepare pages to receive notes
-	                    while ($pagenb < $pageposafternote) {
-	                        $pdf->AddPage();
-	                        $pagenb++;
-	                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-	                        // $this->_pagefoot($pdf,$object,$outputlangs,1);
-	                        $pdf->setTopMargin($tab_top_newpage);
-	                        // The only function to edit the bottom margin of current page to set it.
-	                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                    }
+						// prepare pages to receive notes
+						while ($pagenb < $pageposafternote) {
+							$pdf->AddPage();
+							$pagenb++;
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							// $this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						}
 
-	                    // back to start
-	                    $pdf->setPage($pageposbeforenote);
-	                    $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                    $pdf->SetFont('', '', $default_font_size - 1);
-	                    $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-	                    $pageposafternote = $pdf->getPage();
+						// back to start
+						$pdf->setPage($pageposbeforenote);
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pageposafternote = $pdf->getPage();
 
-	                    $posyafter = $pdf->GetY();
+						$posyafter = $pdf->GetY();
 
-	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-	                    {
-	                        $pdf->AddPage('', '', true);
-	                        $pagenb++;
-	                        $pageposafternote++;
-	                        $pdf->setPage($pageposafternote);
-	                        $pdf->setTopMargin($tab_top_newpage);
-	                        // The only function to edit the bottom margin of current page to set it.
-	                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                        //$posyafter = $tab_top_newpage;
-	                    }
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
+						{
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							//$posyafter = $tab_top_newpage;
+						}
 
 
-	                    // apply note frame to previous pages
-	                    $i = $pageposbeforenote;
-	                    while ($i < $pageposafternote) {
-	                        $pdf->setPage($i);
+						// apply note frame to previous pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
 
 
-	                        $pdf->SetDrawColor(128, 128, 128);
-	                        // Draw note frame
-	                        if ($i > $pageposbeforenote) {
-	                            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-	                            $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                        }
-	                        else {
-	                            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-	                            $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
-	                        }
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
 
-	                        // Add footer
-	                        $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-	                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
+							// Add footer
+							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
-	                        $i++;
-	                    }
+							$i++;
+						}
 
-	                    // apply note frame to last page
-	                    $pdf->setPage($pageposafternote);
-	                    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-	                    $height_note = $posyafter - $tab_top_newpage;
-	                    $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                }
-	                else // No pagebreak
-	                {
-	                    $pdf->commitTransaction();
-	                    $posyafter = $pdf->GetY();
-	                    $height_note = $posyafter - $tab_top;
-	                    $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+						// apply note frame to last page
+						$pdf->setPage($pageposafternote);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$height_note = $posyafter - $tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-	                    {
-	                        // not enough space, need to add page
-	                        $pdf->AddPage('', '', true);
-	                        $pagenb++;
-	                        $pageposafternote++;
-	                        $pdf->setPage($pageposafternote);
-	                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
+						{
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 
-	                        $posyafter = $tab_top_newpage;
-	                    }
-	                }
+							$posyafter = $tab_top_newpage;
+						}
+					}
 
-	                $tab_height = $tab_height - $height_note;
-	                $tab_top = $posyafter + 6;
-	            }
-	            else
-	            {
-	                $height_note = 0;
-	            }
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
+				} else {
+					$height_note = 0;
+				}
 
-	            // Use new auto column system
-	            $this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				// Use new auto column system
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
-	            // Table simulation to know the height of the title line
-			    $pdf->startTransaction();
-			    $this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
-			    $pdf->rollbackTransaction(true);
+				// Table simulation to know the height of the title line
+				$pdf->startTransaction();
+				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+				$pdf->rollbackTransaction(true);
 
-			    $nexY = $tab_top + $this->tabTitleHeight;
+				$nexY = $tab_top + $this->tabTitleHeight;
 
-	            // Loop on each lines
-	            $pageposbeforeprintlines = $pdf->getPage();
-	            $pagenb = $pageposbeforeprintlines;
-	            for ($i = 0; $i < $nblines; $i++)
-	            {
-	                $curY = $nexY;
-	                $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
-	                $pdf->SetTextColor(0, 0, 0);
+				// Loop on each lines
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
 
-	                // Define size of image if we need it
-	                $imglinesize = array();
-	                if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					// Define size of image if we need it
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
 
-	                $pdf->setTopMargin($tab_top_newpage);
-	                $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
-	                $pageposbefore = $pdf->getPage();
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
-	                $showpricebeforepagebreak = 1;
-	                $posYAfterImage = 0;
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
 
-	                if ($this->getColumnStatus('photo'))
-	                {
-    	                // We start with Photo of product line
-    	                if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-    	                {
-    	                    $pdf->AddPage('', '', true);
-    	                    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                    $pdf->setPage($pageposbefore + 1);
+					if ($this->getColumnStatus('photo'))
+					{
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
+						{
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->setPage($pageposbefore + 1);
 
-    	                    $curY = $tab_top_newpage;
+							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
-							else
-								$showpricebeforepagebreak = 0;
-    	                }
+							else $showpricebeforepagebreak = 0;
+						}
 
-    	                if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-    	                {
-    	                    $pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
-    	                    // $pdf->Image does not increase value return by getY, so we save it manually
-    	                    $posYAfterImage = $curY + $imglinesize['height'];
-    	                }
-	                }
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
+						{
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							// $pdf->Image does not increase value return by getY, so we save it manually
+							$posYAfterImage = $curY + $imglinesize['height'];
+						}
+					}
 
-	                // Description of product line
-	                if ($this->getColumnStatus('desc'))
-	                {
-    	                $pdf->startTransaction();
+					// Description of product line
+					if ($this->getColumnStatus('desc'))
+					{
+						$pdf->startTransaction();
 
-                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
-    	                $pageposafter = $pdf->getPage();
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$pageposafter = $pdf->getPage();
 
-    	                if ($pageposafter > $pageposbefore)	// There is a pagebreak
-    	                {
-    	                    $pdf->rollbackTransaction(true);
-    	                    $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
-                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
-    	                    $pageposafter = $pdf->getPage();
-    	                    $posyafter = $pdf->GetY();
-    	                    //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-    	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-    	                    {
-    	                        if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-    	                        {
-    	                            $pdf->AddPage('', '', true);
-    	                            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                            $pdf->setPage($pageposafter + 1);
-    	                        }
-    	                    }
-    	                    else
-    	                    {
-    	                        // We found a page break
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('', '', true);
+									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									$pdf->setPage($pageposafter + 1);
+								}
+							} else {
+								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
-								else
-									$showpricebeforepagebreak = 0;
-    	                    }
-    	                }
-    	                else	// No pagebreak
-    	                {
-    	                    $pdf->commitTransaction();
-    	                }
-	                }
+								else $showpricebeforepagebreak = 0;
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+					}
 
-                    $nexY = $pdf->GetY();
-	                $pageposafter = $pdf->getPage();
-	                $pdf->setPage($pageposbefore);
-	                $pdf->setTopMargin($this->marge_haute);
-	                $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
-	                // We suppose that a too long description or photo were moved completely on next page
-	                if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-	                    $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-	                }
+					// We suppose that a too long description or photo were moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
 
-	                $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
-	                // 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
+					if ($this->getColumnStatus('vat'))
+					{
+						$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);
-	                }
+					// 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);
+					}
 
-	                // Quantity
-	                // Enough for 6 chars
-	                if ($this->getColumnStatus('qty'))
-	                {
-	                    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-	                    $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
-	                    $nexY = max($pdf->GetY(), $nexY);
-	                }
+					// Quantity
+					// Enough for 6 chars
+					if ($this->getColumnStatus('qty'))
+					{
+						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
 
-	                // Situation progress
-	                if ($this->getColumnStatus('progress'))
-	                {
-	                    $progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
-	                    $this->printStdColumnContent($pdf, $curY, 'progress', $progress);
-	                    $nexY = max($pdf->GetY(), $nexY);
-	                }
+					// Situation progress
+					if ($this->getColumnStatus('progress'))
+					{
+						$progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'progress', $progress);
+						$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
+					if ($this->getColumnStatus('unit'))
+					{
+						$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);
-	                }
+					// 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);
+					}
 
-	                // Total HT line
-	                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 HT line
+					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);
+					}
 
-                    // Extrafields
-	                if (!empty($object->lines[$i]->array_options)) {
-	                    foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-                            if ($this->getColumnStatus($extrafieldColKey))
-                            {
-                                $extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
-                                $this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
-                                $nexY = max($pdf->GetY(), $nexY);
-                            }
-                        }
-                    }
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey))
+							{
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
 
 
-	                $parameters = array(
-	                    'object' => $object,
-	                    'i' => $i,
-	                    'pdf' =>& $pdf,
-	                    'curY' =>& $curY,
-	                    'nexY' =>& $nexY,
-	                    'outputlangs' => $outputlangs,
-	                    'hidedetails' => $hidedetails
-	                );
-	                $reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
+					$parameters = array(
+						'object' => $object,
+						'i' => $i,
+						'pdf' =>& $pdf,
+						'curY' =>& $curY,
+						'nexY' =>& $nexY,
+						'outputlangs' => $outputlangs,
+						'hidedetails' => $hidedetails
+					);
+					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
 
 
-	                $sign = 1;
-	                if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
-	                // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-	                $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-	                if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
-	                {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                } else {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva;
-	                }
+					$sign = 1;
+					if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
+					{
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+					} else {
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						else $tvaligne = $sign * $object->lines[$i]->total_tva;
+					}
 
-	                $localtax1ligne = $object->lines[$i]->total_localtax1;
-	                $localtax2ligne = $object->lines[$i]->total_localtax2;
-	                $localtax1_rate = $object->lines[$i]->localtax1_tx;
-	                $localtax2_rate = $object->lines[$i]->localtax2_tx;
-	                $localtax1_type = $object->lines[$i]->localtax1_type;
-	                $localtax2_type = $object->lines[$i]->localtax2_type;
+					$localtax1ligne = $object->lines[$i]->total_localtax1;
+					$localtax2ligne = $object->lines[$i]->total_localtax2;
+					$localtax1_rate = $object->lines[$i]->localtax1_tx;
+					$localtax2_rate = $object->lines[$i]->localtax2_tx;
+					$localtax1_type = $object->lines[$i]->localtax1_type;
+					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-	                if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-	                if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-	                if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
 
-	                $vatrate = (string) $object->lines[$i]->tva_tx;
+					$vatrate = (string) $object->lines[$i]->tva_tx;
 
-	                // Retrieve type from database for backward compatibility with old records
-	                if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-	                    && (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-	                {
-	                    $localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-	                    $localtax1_type = $localtaxtmp_array[0];
-	                    $localtax2_type = $localtaxtmp_array[2];
-	                }
+					// Retrieve type from database for backward compatibility with old records
+					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
+						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
+					{
+						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+						$localtax1_type = $localtaxtmp_array[0];
+						$localtax2_type = $localtaxtmp_array[2];
+					}
 
-	                // retrieve global local tax
-                    if ($localtax1_type && $localtax1ligne != 0) {
-                        $this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-                    }
-                    if ($localtax2_type && $localtax2ligne != 0) {
-                        $this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
-                    }
+					// retrieve global local tax
+					if ($localtax1_type && $localtax1ligne != 0) {
+						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
+						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-                    if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-                    if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
-                    $this->tva[$vatrate] += $tvaligne;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
+					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					$this->tva[$vatrate] += $tvaligne;
 
-                    $nexY = max($nexY, $posYAfterImage);
+					$nexY = max($nexY, $posYAfterImage);
 
-                    // Add line
-                    if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
-                        $pdf->setPage($pageposafter);
-                        $pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
-                        //$pdf->SetDrawColor(190,190,200);
-                        $pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-                        $pdf->SetLineStyle(array('dash'=>0));
-                    }
+					// Add line
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
 
-                    // Detect if some page were added automatically and output _tableau for past pages
-                    while ($pagenb < $pageposafter) {
-                        $pdf->setPage($pagenb);
-                        if ($pagenb == $pageposbeforeprintlines) {
-                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        else
-                        {
-                        	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
-                        $pagenb++;
-                        $pdf->setPage($pagenb);
-                        $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-                    }
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter) {
+						$pdf->setPage($pagenb);
+						if ($pagenb == $pageposbeforeprintlines) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
 
-                    if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
-                        if ($pagenb == $pageposafter) {
-                        	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        else
-                        {
-                        	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
-                        // New page
-                        $pdf->AddPage();
-                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-                        $pagenb++;
-                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-                    }
-	            }
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						// New page
+						$pdf->AddPage();
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
 
-	            // Show square
-	            if ($pagenb == $pageposbeforeprintlines)
-	            {
-	            	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
-	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
-	            else
-	            {
-	            	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
-	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
+				// Show square
+				if ($pagenb == $pageposbeforeprintlines)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
 
-	            // Display infos area
-	            $posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+				// Display infos area
+				$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
-	            // Display total zone
-	            $posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+				// Display total zone
+				$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
-	            // Display payment area
-	            if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-	            {
-	                $posy = $this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
-	            }
+				// Display payment area
+				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
+				{
+					$posy = $this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
+				}
 
-	            // Pagefoot
-	            $this->_pagefoot($pdf, $object, $outputlangs);
-	            if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				// Pagefoot
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
-	            $pdf->Close();
+				$pdf->Close();
 
-	            $pdf->Output($file, 'F');
+				$pdf->Output($file, 'F');
 
-	            // Add pdfgeneration hook
-	            $hookmanager->initHooks(array('pdfgeneration'));
-	            $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
-	            global $action;
-	            $reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-	            if ($reshook < 0)
-	            {
-	                $this->error = $hookmanager->error;
-	                $this->errors = $hookmanager->errors;
-	            }
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0)
+				{
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
+				}
 
-	            if (!empty($conf->global->MAIN_UMASK))
-	                @chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-	                $this->result = array('fullpath'=>$file);
+					$this->result = array('fullpath'=>$file);
 
-	                return 1; // No error
-	        }
-	        else
-	        {
-	            $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
-	            return 0;
-	        }
-	    }
-	    else
-	    {
-	        $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
-	        return 0;
-	    }
+					return 1; // No error
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
+			return 0;
+		}
 	}
 
 
 	/**
 	 *  Show payments table
 	 *
-     *  @param	PDF			$pdf           Object PDF
-     *  @param  Object		$object         Object invoice
-     *  @param  int			$posy           Position y in PDF
-     *  @param  Translate	$outputlangs    Object langs for output
-     *  @return int             			<0 if KO, >0 if OK
+	 *  @param	TCPDF		$pdf            Object PDF
+	 *  @param  Object		$object         Object invoice
+	 *  @param  int			$posy           Position y in PDF
+	 *  @param  Translate	$outputlangs    Object langs for output
+	 *  @return int             			<0 if KO, >0 if OK
 	 */
 	public function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
 	{
 		global $conf;
 
-        $sign = 1;
-        if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		$sign = 1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
-        $tab3_posx = 120;
+		$tab3_posx = 120;
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
@@ -1031,9 +1004,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1074,9 +1045,7 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			return $tab3_top + $y + 3;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1086,7 +1055,7 @@ class pdf_sponge extends ModelePDFFactures
 	/**
 	 *   Show miscellaneous information (payment mode, payment term, ...)
 	 *
-	 *   @param		tcpdf			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Object		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
@@ -1204,13 +1173,13 @@ class pdf_sponge extends ModelePDFFactures
 						$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))
-			            {
+						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)
 					{
@@ -1219,13 +1188,13 @@ class pdf_sponge extends ModelePDFFactures
 						$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))
-			            {
+						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;
-			            }
+						}
 					}
 				}
 			}
@@ -1256,7 +1225,7 @@ class pdf_sponge extends ModelePDFFactures
 	/**
 	 *  Show total to pay
 	 *
-	 *  @param	TCPDI			$pdf            Object PDF
+	 *  @param	TCPDI		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
@@ -1267,20 +1236,20 @@ class pdf_sponge extends ModelePDFFactures
 	{
 		global $conf, $mysoc, $hookmanager;
 
-        $sign = 1;
-        if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		$sign = 1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        $outputlangsbis = null;
-        if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-        	$outputlangsbis = new Translate('', $conf);
-        	$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-        	$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
-        	$default_font_size--;
-        }
+		$outputlangsbis = null;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
+			$default_font_size--;
+		}
 
-        $tab2_top = $posy;
+		$tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
@@ -1312,10 +1281,9 @@ class pdf_sponge extends ModelePDFFactures
 		}
 
 		if (!empty($i)) {
-		    $avancementGlobal = $percent / $i;
-		}
-		else {
-		    $avancementGlobal = 0;
+			$avancementGlobal = $percent / $i;
+		} else {
+			$avancementGlobal = 0;
 		}
 
 		$object->fetchPreviousNextSituationInvoice();
@@ -1324,98 +1292,97 @@ class pdf_sponge extends ModelePDFFactures
 		$total_a_payer = 0;
 		$total_a_payer_ttc = 0;
 		foreach ($TPreviousIncoice as &$fac) {
-		    $total_a_payer += $fac->total_ht;
-		    $total_a_payer_ttc += $fac->total_ttc;
+			$total_a_payer += $fac->total_ht;
+			$total_a_payer_ttc += $fac->total_ttc;
 		}
 		$total_a_payer += $object->total_ht;
 		$total_a_payer_ttc += $object->total_ttc;
 
 		if (!empty($avancementGlobal)) {
-		    $total_a_payer = $total_a_payer * 100 / $avancementGlobal;
-		    $total_a_payer_ttc = $total_a_payer_ttc * 100 / $avancementGlobal;
-		}
-		else {
-		    $total_a_payer = 0;
-		    $total_a_payer_ttc = 0;
+			$total_a_payer = $total_a_payer * 100 / $avancementGlobal;
+			$total_a_payer_ttc = $total_a_payer_ttc * 100 / $avancementGlobal;
+		} else {
+			$total_a_payer = 0;
+			$total_a_payer_ttc = 0;
 		}
 
 		$i = 1;
 		if (!empty($TPreviousIncoice)) {
-		    $pdf->setY($tab2_top);
-		    $posy = $pdf->GetY();
+			$pdf->setY($tab2_top);
+			$posy = $pdf->GetY();
 
-		    foreach ($TPreviousIncoice as &$fac) {
-		        if ($posy > $this->page_hauteur - 4) {
-		            $this->_pagefoot($pdf, $object, $outputlangs, 1);
-		            $pdf->addPage();
-		            $pdf->setY($this->marge_haute);
-		            $posy = $pdf->GetY();
-		        }
+			foreach ($TPreviousIncoice as &$fac) {
+				if ($posy > $this->page_hauteur - 4) {
+					$this->_pagefoot($pdf, $object, $outputlangs, 1);
+					$pdf->addPage();
+					$pdf->setY($this->marge_haute);
+					$posy = $pdf->GetY();
+				}
 
-		        // cumul TVA précédent
-		        $index++;
-		        $pdf->SetFillColor(255, 255, 255);
-		        $pdf->SetXY($col1x, $posy);
-		        $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $fac->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+				// cumul TVA précédent
+				$index++;
+				$pdf->SetFillColor(255, 255, 255);
+				$pdf->SetXY($col1x, $posy);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $fac->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		        $pdf->SetXY($col2x, $posy);
+				$pdf->SetXY($col2x, $posy);
 
-		        $facSign = '';
-		        if ($i > 1) {
-		            $facSign = $fac->total_ht >= 0 ? '+' : '';
-		        }
+				$facSign = '';
+				if ($i > 1) {
+					$facSign = $fac->total_ht >= 0 ? '+' : '';
+				}
 
-		        $displayAmount = ' '.$facSign.' '.price($fac->total_ht, 0, $outputlangs);
+				$displayAmount = ' '.$facSign.' '.price($fac->total_ht, 0, $outputlangs);
 
-		        $pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', 1);
+				$pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', 1);
 
-		        $i++;
-		        $posy += $tab2_hl;
+				$i++;
+				$posy += $tab2_hl;
 
-		        $pdf->setY($posy);
-		    }
+				$pdf->setY($posy);
+			}
 
-		    // Display current total
-		    $pdf->SetFillColor(255, 255, 255);
-		    $pdf->SetXY($col1x, $posy);
-		    $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $object->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+			// Display current total
+			$pdf->SetFillColor(255, 255, 255);
+			$pdf->SetXY($col1x, $posy);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("PDFSituationTitle", $object->situation_counter).' '.$outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
-		    $pdf->SetXY($col2x, $posy);
-		    $facSign = '';
-		    if ($i > 1) {
-		        $facSign = $object->total_ht >= 0 ? '+' : ''; // management of a particular customer case
-		    }
+			$pdf->SetXY($col2x, $posy);
+			$facSign = '';
+			if ($i > 1) {
+				$facSign = $object->total_ht >= 0 ? '+' : ''; // management of a particular customer case
+			}
 
-		    if ($fac->type === facture::TYPE_CREDIT_NOTE) {
-		        $facSign = '-'; // les avoirs
-		    }
+			if ($fac->type === facture::TYPE_CREDIT_NOTE) {
+				$facSign = '-'; // les avoirs
+			}
 
 
-		    $displayAmount = ' '.$facSign.' '.price($object->total_ht, 0, $outputlangs);
-		    $pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', 1);
+			$displayAmount = ' '.$facSign.' '.price($object->total_ht, 0, $outputlangs);
+			$pdf->MultiCell($largcol2, $tab2_hl, $displayAmount, 0, 'R', 1);
 
-		    $posy += $tab2_hl;
+			$posy += $tab2_hl;
 
-		    // Display all total
-		    $pdf->SetFont('', '', $default_font_size - 1);
-		    $pdf->SetFillColor(255, 255, 255);
-		    $pdf->SetXY($col1x, $posy);
-		    $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("SituationTotalProgress", $avancementGlobal), 0, 'L', 1);
+			// Display all total
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetFillColor(255, 255, 255);
+			$pdf->SetXY($col1x, $posy);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("SituationTotalProgress", $avancementGlobal), 0, 'L', 1);
 
-		    $pdf->SetXY($col2x, $posy);
-		    $pdf->MultiCell($largcol2, $tab2_hl, price($total_a_payer * $avancementGlobal / 100, 0, $outputlangs), 0, 'R', 1);
-		    $pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($col2x, $posy);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($total_a_payer * $avancementGlobal / 100, 0, $outputlangs), 0, 'R', 1);
+			$pdf->SetFont('', '', $default_font_size - 2);
 
-		    $posy += $tab2_hl;
+			$posy += $tab2_hl;
 
-		    if ($posy > $this->page_hauteur - 4) {
-		        $pdf->addPage();
-		        $pdf->setY($this->marge_haute);
-		        $posy = $pdf->GetY();
-		    }
+			if ($posy > $this->page_hauteur - 4) {
+				$pdf->addPage();
+				$pdf->setY($this->marge_haute);
+				$posy = $pdf->GetY();
+			}
 
-		    $tab2_top = $posy;
-		    $index = 0;
+			$tab2_top = $posy;
+			$index = 0;
 		}
 
 		$tab2_top += 3;
@@ -1426,30 +1393,30 @@ class pdf_sponge extends ModelePDFFactures
 		// Total remise
 		$total_line_remise = 0;
 		foreach ($object->lines as $i => $line) {
-		    $total_line_remise += pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, 2); // TODO: add this methode to core/lib/pdf.lib
-		    // Gestion remise sous forme de ligne négative
-		    if ($line->total_ht < 0) $total_line_remise += -$line->total_ht;
+			$total_line_remise += pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, 2); // TODO: add this methode to core/lib/pdf.lib
+			// Gestion remise sous forme de ligne négative
+			if ($line->total_ht < 0) $total_line_remise += -$line->total_ht;
 		}
 		if ($total_line_remise > 0) {
-		    if (!empty($conf->global->MAIN_SHOW_AMOUNT_DISCOUNT)) {
-		        $pdf->SetFillColor(255, 255, 255);
-		        $pdf->SetXY($col1x, $tab2_top + $tab2_hl);
-		        $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', 1);
-		        $pdf->SetXY($col2x, $tab2_top + $tab2_hl);
-		        $pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', 1);
+			if (!empty($conf->global->MAIN_SHOW_AMOUNT_DISCOUNT)) {
+				$pdf->SetFillColor(255, 255, 255);
+				$pdf->SetXY($col1x, $tab2_top + $tab2_hl);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalDiscount") : ''), 0, 'L', 1);
+				$pdf->SetXY($col2x, $tab2_top + $tab2_hl);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise, 0, $outputlangs), 0, 'R', 1);
 
-		        $index++;
-		    }
-		    // Show total NET before discount
-		    if (!empty($conf->global->MAIN_SHOW_AMOUNT_BEFORE_DISCOUNT)) {
-		        $pdf->SetFillColor(255, 255, 255);
-		        $pdf->SetXY($col1x, $tab2_top + 0);
-		        $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
-                $pdf->SetXY($col2x, $tab2_top + 0);
-		        $pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
+				$index++;
+			}
+			// Show total NET before discount
+			if (!empty($conf->global->MAIN_SHOW_AMOUNT_BEFORE_DISCOUNT)) {
+				$pdf->SetFillColor(255, 255, 255);
+				$pdf->SetXY($col1x, $tab2_top + 0);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHTBeforeDiscount").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHTBeforeDiscount") : ''), 0, 'L', 1);
+				$pdf->SetXY($col2x, $tab2_top + 0);
+				$pdf->MultiCell($largcol2, $tab2_hl, price($total_line_remise + $total_ht, 0, $outputlangs), 0, 'R', 1);
 
-		        $index++;
-		    }
+				$index++;
+			}
 		}
 
 		// Total HT
@@ -1473,10 +1440,8 @@ class pdf_sponge extends ModelePDFFactures
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
-			    // FIXME amount of vat not supported with multicurrency
+			} else {
+				// FIXME amount of vat not supported with multicurrency
 
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
@@ -1511,7 +1476,7 @@ class pdf_sponge extends ModelePDFFactures
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1544,7 +1509,7 @@ class pdf_sponge extends ModelePDFFactures
 						}
 					}
 				}
-                //}
+				//}
 
 				// VAT
 				// Situations totals migth be wrong on huge amounts
@@ -1555,13 +1520,12 @@ class pdf_sponge extends ModelePDFFactures
 					}
 
 					if ($sum_pdf_tva != $object->total_tva) { // apply coef to recover the VAT object amount (the good one)
-					    if (!empty($sum_pdf_tva))
-					    {
+						if (!empty($sum_pdf_tva))
+						{
 							$coef_fix_tva = $object->total_tva / $sum_pdf_tva;
-					    }
-					    else {
-					        $coef_fix_tva = 1;
-					    }
+						} else {
+							$coef_fix_tva = 1;
+						}
 
 
 						foreach ($this->tva as $tvakey => $tvaval) {
@@ -1627,7 +1591,7 @@ class pdf_sponge extends ModelePDFFactures
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1637,7 +1601,7 @@ class pdf_sponge extends ModelePDFFactures
 
 					foreach ($localtax_rate as $tvakey => $tvaval)
 					{
-					    // retrieve global local tax
+						// retrieve global local tax
 						if ($tvakey != 0)    // On affiche pas taux 0
 						{
 							//$this->atleastoneratenotnull++;
@@ -1796,7 +1760,7 @@ class pdf_sponge extends ModelePDFFactures
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		tcpdf			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -1848,7 +1812,7 @@ class pdf_sponge extends ModelePDFFactures
 		$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
 		}
 	}
 
@@ -1856,7 +1820,7 @@ class pdf_sponge extends ModelePDFFactures
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	Tcpdf			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -1876,9 +1840,9 @@ class pdf_sponge extends ModelePDFFactures
 
 		// Show Draft Watermark
 		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
-        {
-		      pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
-        }
+		{
+			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
+		}
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -1886,7 +1850,7 @@ class pdf_sponge extends ModelePDFFactures
 		$w = 110;
 
 		$posy = $this->marge_haute;
-        $posx = $this->page_largeur - $this->marge_droite - $w;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -1900,25 +1864,20 @@ class pdf_sponge extends ModelePDFFactures
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
+					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
-			}
-			else
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1938,8 +1897,7 @@ class pdf_sponge extends ModelePDFFactures
 			if ($object->type == 0) {
 				if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("InvoiceSituation");
 				$title .= $outputlangsbis->transnoentities("PdfInvoiceTitle");
-			}
-			elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement");
+			} elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement");
 			elseif ($object->type == 2) $title .= $outputlangsbis->transnoentities("InvoiceAvoir");
 			elseif ($object->type == 3) $title .= $outputlangsbis->transnoentities("InvoiceDeposit");
 			elseif ($object->type == 4) $title .= $outputlangsbis->transnoentities("InvoiceProForma");
@@ -2067,16 +2025,16 @@ class pdf_sponge extends ModelePDFFactures
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $usertmp = new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy += 4;
-                $pdf->SetXY($posx, $posy);
-		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 1;
@@ -2182,8 +2140,8 @@ class pdf_sponge extends ModelePDFFactures
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
@@ -2199,30 +2157,30 @@ class pdf_sponge extends ModelePDFFactures
 	/**
 	 *  Define Array Column Field
 	 *
-	 *  @param	object			$object    		common object
-	 *  @param	Translate		$outputlangs    langs
-     *  @param	int			   $hidedetails		Do not show line details
-     *  @param	int			   $hidedesc		Do not show desc
-     *  @param	int			   $hideref			Do not show ref
-     *  @return	null
-     */
-    public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-	    global $conf, $hookmanager;
+	 *  @param	object		   $object    		common object
+	 *  @param	Translate	   $outputlangs     langs
+	 *  @param	int			   $hidedetails		Do not show line details
+	 *  @param	int			   $hidedesc		Do not show desc
+	 *  @param	int			   $hideref			Do not show ref
+	 *  @return	null
+	 */
+	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf, $hookmanager;
 
-	    // 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
@@ -2240,165 +2198,162 @@ class pdf_sponge extends ModelePDFFactures
 	    );
 	    */
 
-	    $rank = 0; // do not use negative rank
-	    $this->cols['desc'] = array(
-	        'rank' => $rank,
-	        'width' => false, // only for desc
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Designation', // use lang key is usefull in somme case with module
-	            'align' => 'L',
-	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'content' => array(
-	            'align' => 'L',
-                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	    );
+		$rank = 0; // do not use negative rank
+		$this->cols['desc'] = array(
+			'rank' => $rank,
+			'width' => false, // only for desc
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'align' => 'L',
+				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				// 'label' => ' ', // the final label
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L',
+				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
 
-	    // PHOTO
-        $rank = $rank + 10;
-        $this->cols['photo'] = array(
-            'rank' => $rank,
-            'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
-            'status' => false,
-            'title' => array(
-                'textkey' => 'Photo',
-                'label' => ' '
-            ),
-            'content' => array(
-                'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-            ),
-            'border-left' => false, // remove left line separator
-        );
+		// PHOTO
+		$rank = $rank + 10;
+		$this->cols['photo'] = array(
+			'rank' => $rank,
+			'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Photo',
+				'label' => ' '
+			),
+			'content' => array(
+				'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'border-left' => false, // remove left line separator
+		);
 
-	    if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
+		{
+			$this->cols['photo']['status'] = true;
+		}
 
 
-	    $rank = $rank + 10;
-	    $this->cols['vat'] = array(
-	        'rank' => $rank,
-	        'status' => false,
-	        'width' => 16, // in mm
-	        'title' => array(
-	            'textkey' => 'VAT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['vat'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 16, // in mm
+			'title' => array(
+				'textkey' => 'VAT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $this->cols['vat']['status'] = true;
-	    }
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$this->cols['vat']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['subprice'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'PriceUHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['subprice'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PriceUHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['qty'] = array(
-	        'rank' => $rank,
-	        'width' => 16, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Qty'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['qty'] = array(
+			'rank' => $rank,
+			'width' => 16, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Qty'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['progress'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Progress'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['progress'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Progress'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if ($this->situationinvoice)
-	    {
-	        $this->cols['progress']['status'] = true;
-	    }
+		if ($this->situationinvoice)
+		{
+			$this->cols['progress']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['unit'] = array(
-	        'rank' => $rank,
-	        'width' => 11, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Unit'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($conf->global->PRODUCT_USE_UNITS) {
-	        $this->cols['unit']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['unit'] = array(
+			'rank' => $rank,
+			'width' => 11, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$this->cols['unit']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['discount'] = array(
-	        'rank' => $rank,
-	        'width' => 13, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'ReductionShort'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($this->atleastonediscount) {
-	        $this->cols['discount']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['discount'] = array(
+			'rank' => $rank,
+			'width' => 13, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'ReductionShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($this->atleastonediscount) {
+			$this->cols['discount']['status'] = true;
+		}
 
-	    $rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
-	    $this->cols['totalexcltax'] = array(
-	        'rank' => $rank,
-	        'width' => 26, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    // Add extrafields cols
-        if (!empty($object->lines)) {
-            $line = reset($object->lines);
-            $this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
-        }
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
 
-	    $parameters = array(
-	        'object' => $object,
-	        'outputlangs' => $outputlangs,
-	        'hidedetails' => $hidedetails,
-	        'hidedesc' => $hidedesc,
-	        'hideref' => $hideref
-	    );
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
 
-	    $reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-	    if ($reshook < 0)
-	    {
-	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
-	    {
-	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
-	        $this->cols = $hookmanager->resArray;
-	    }
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0)
+		{
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook))
+		{
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
 	}
 }
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index 0d70631294a..8dc23e045b3 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -162,7 +162,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 		$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";
-		$sql .= " WHERE ref LIKE '".$prefix."____-%'";
+		$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-%'";
 		$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 
 		$resql = $db->query($sql);
@@ -172,9 +172,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 
@@ -186,7 +184,7 @@ class mod_facture_mars extends ModeleNumRefFactures
             $ref = '';
             $sql = "SELECT ref as ref";
             $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql .= " WHERE ref LIKE '".$prefix."____-".$num."'";
+            $sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
             $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
             $sql .= " ORDER BY ref DESC";
 
@@ -196,12 +194,10 @@ class mod_facture_mars extends ModeleNumRefFactures
             {
                 $obj = $db->fetch_object($resql);
                 if ($obj) $ref = $obj->ref;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             return $ref;
-		}
-		elseif ($mode == 'next')
+		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
     		$yymm = strftime("%y%m", $date);
@@ -211,8 +207,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 
     		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
-		}
-		else dol_print_error('', 'Bad parameter for getNextValue');
+		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
     /**
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 80cd03f3e43..50b708baefc 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -150,8 +150,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
         	{
         		$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 == 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)
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 7bc81121cb1..588b2f34aab 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -194,7 +194,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$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";
-		$sql .= " WHERE ref LIKE '".$prefix."____-%'";
+		$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-%'";
 		$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 
 		$resql = $db->query($sql);
@@ -203,9 +203,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 
@@ -217,7 +215,7 @@ class mod_facture_terre extends ModeleNumRefFactures
             $ref = '';
             $sql = "SELECT ref as ref";
             $sql .= " FROM ".MAIN_DB_PREFIX."facture";
-            $sql .= " WHERE ref LIKE '".$prefix."____-".$num."'";
+            $sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
             $sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
             $sql .= " ORDER BY ref DESC";
 
@@ -226,12 +224,10 @@ class mod_facture_terre extends ModeleNumRefFactures
             {
                 $obj = $db->fetch_object($resql);
                 if ($obj) $ref = $obj->ref;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             return $ref;
-		}
-		elseif ($mode == 'next')
+		} elseif ($mode == 'next')
 		{
 			$date = $invoice->date; // This is invoice date (not creation date)
     		$yymm = strftime("%y%m", $date);
@@ -241,8 +237,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 
     		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
     		return $prefix.$yymm."-".$num;
-		}
-		else dol_print_error('', 'Bad parameter for getNextValue');
+		} else dol_print_error('', 'Bad parameter for getNextValue');
 	}
 
     /**
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index d7509feff7c..47abbc3640a 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -61,9 +61,9 @@ class pdf_soleil extends ModelePDFFicheinter
 
     /**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -185,9 +185,7 @@ class pdf_soleil extends ModelePDFFicheinter
 			{
 				$dir = $conf->ficheinter->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->ficheinter->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -288,9 +286,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -377,8 +373,7 @@ class pdf_soleil extends ModelePDFFicheinter
 									$pdf->setPage($pageposafter + 1);
 								}
 							}
-						}
-						else	// No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -403,9 +398,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -419,9 +412,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-							}
-							else
-							{
+							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 							}
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -439,9 +430,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -469,15 +458,11 @@ class pdf_soleil extends ModelePDFFicheinter
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "FICHEINTER_OUTPUTDIR");
 			return 0;
 		}
@@ -487,7 +472,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -551,7 +536,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -590,17 +575,13 @@ class pdf_soleil extends ModelePDFFicheinter
 			{
 			    $height = pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+			} 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
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -728,7 +709,7 @@ class pdf_soleil extends ModelePDFFicheinter
 	/**
 	 *   	Show footer of page. Need this->emetteur object
 	 *
-	 *   	@param	PDF			$pdf     			PDF
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index cb935c572b3..a653dc640cb 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -106,9 +106,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 		if (!$fayymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 140ce27cf03..b9991a7d14e 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -178,9 +178,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 		if (!empty($conf->global->FICHEINTER_ADDON_PDF))
 		{
 			$modele = $conf->global->FICHEINTER_ADDON_PDF;
-		}
-		else
-		{
+		} else {
 			$modele = 'soleil';
 		}
 	}
@@ -234,16 +232,12 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 			dol_delete_preview($object);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "fichinter_pdf_create Error: ".$obj->error);
 			return 0;
 		}
-	}
-	else
-	{
+	} else {
 		print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 		return 0;
 	}
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 50f87a9b335..348b25e8338 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -139,9 +139,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index de32e84d43a..330454e2105 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -198,9 +198,7 @@ class ImportCsv extends ModeleImports
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFailToOpenFile", $file);
 			$ret = -1;
-		}
-		else
-		{
+		} else {
 			$this->file = $file;
 		}
 
@@ -264,22 +262,17 @@ class ImportCsv extends ModeleImports
 					{
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
-					}
-					else
-					{
+					} else {
 						$newarrayres[$key]['val'] = utf8_encode($val);
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
-				}
-				else	// Autodetect format (UTF8 or ISO)
+				} else // Autodetect format (UTF8 or ISO)
 				{
 					if (utf8_check($val))
 					{
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
-					}
-					else
-					{
+					} else {
 						$newarrayres[$key]['val'] = utf8_encode($val);
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					}
@@ -346,9 +339,7 @@ class ImportCsv extends ModeleImports
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
-		}
-		else
-		{
+		} else {
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
 			$insertdone = false;
@@ -372,11 +363,8 @@ class ImportCsv extends ModeleImports
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
 						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else
-				{
+					} else dol_print_error($this->db);
+				} else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
@@ -411,8 +399,7 @@ class ImportCsv extends ModeleImports
 							$error++;
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
+						else {
 						    // We convert field if required
 						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
@@ -437,9 +424,7 @@ class ImportCsv extends ModeleImports
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
-										{
+                                        } else {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -477,9 +462,7 @@ class ImportCsv extends ModeleImports
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
                                                 $newval = $classinstance->id;
-                                            }
-                                            else
-                                            {
+                                            } 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';
@@ -489,8 +472,7 @@ class ImportCsv extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
                                 {
                                     $isidorref = 'id';
                                     if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
@@ -527,12 +509,10 @@ class ImportCsv extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
+                                } 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')
+                                } 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'];
@@ -541,9 +521,7 @@ class ImportCsv extends ModeleImports
                                 	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
                                 	{
                                 		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	}
-                                	else
-                                	{
+                                	} else {
                                 		$resultload = dol_include_once($file);
                                 		if (empty($resultload))
                                 		{
@@ -559,9 +537,7 @@ class ImportCsv extends ModeleImports
                                 		if ($classinstance->id > 0)	// we found record
                                 		{
                                 			$newval = $scaleorid ? $scaleorid : 0;
-                                		}
-                                		else
-                                		{
+                                		} 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';
@@ -569,8 +545,7 @@ class ImportCsv extends ModeleImports
                                 			$error++;
                                 		}
                                 	}
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -579,8 +554,7 @@ class ImportCsv extends ModeleImports
                                         //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')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -589,8 +563,7 @@ class ImportCsv extends ModeleImports
                                         //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')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -599,8 +572,7 @@ class ImportCsv extends ModeleImports
                                         //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')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -610,8 +582,7 @@ class ImportCsv extends ModeleImports
                                         //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')
+                                } 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
@@ -624,8 +595,7 @@ class ImportCsv extends ModeleImports
                                     }
                                     if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
                                     $newval = $defaultref;
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
+                                } 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'];
@@ -645,8 +615,7 @@ class ImportCsv extends ModeleImports
                                         $errorforthistable++;
                                         $error++;
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -687,9 +656,7 @@ class ImportCsv extends ModeleImports
 												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
 												$i++;
 											}
-										}
-										else
-										{
+										} else {
 											dol_print_error($this->db);
 										}
 									}
@@ -745,8 +712,7 @@ class ImportCsv extends ModeleImports
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/', $val))
+    				    } elseif (preg_match('/^lastrowid-/', $val))
     				    {
     				        $tmp = explode('-', $val);
     				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
@@ -754,15 +720,12 @@ class ImportCsv extends ModeleImports
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				    elseif (preg_match('/^const-/', $val))
+    				    } elseif (preg_match('/^const-/', $val))
     				    {
     				    	$tmp = explode('-', $val, 2);
     				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				    	$listvalues[] = "'".$tmp[1]."'";
-    				    }
-    				    else
-    				    {
+    				    } else {
     				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
     				    	$this->errors[$error]['type'] = 'Import profile setup';
     				    	$error++;
@@ -811,9 +774,7 @@ class ImportCsv extends ModeleImports
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -840,9 +801,7 @@ class ImportCsv extends ModeleImports
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -871,9 +830,7 @@ class ImportCsv extends ModeleImports
 								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -886,7 +843,7 @@ class ImportCsv extends ModeleImports
 						if (!$error && !$updatedone) {
 							// Build SQL INSERT request
 							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
-							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
+							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
 							if (!empty($tablewithentity_cache[$tablename])) {
 								$sqlstart .= ', entity';
 								$sqlend .= ', '.$conf->entity;
@@ -906,9 +863,7 @@ class ImportCsv extends ModeleImports
 								{
 								    $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
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 35aee35869e..8e910a4fc68 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -374,9 +374,7 @@ class ImportXlsx extends ModeleImports
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
 			$warning++;
-		}
-		else
-		{
+		} else {
 			$last_insert_id_array = array(); // store the last inserted auto_increment id for each table, so that dependent tables can be inserted with the appropriate id (eg: extrafields fk_object will be set with the last inserted object's id)
 			$updatedone = false;
 			$insertdone = false;
@@ -400,11 +398,8 @@ class ImportXlsx extends ModeleImports
 						$obj = $this->db->fetch_object($resql);
 						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
 						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
-					}
-					else dol_print_error($this->db);
-				}
-				else
-				{
+					} else dol_print_error($this->db);
+				} else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
@@ -439,8 +434,7 @@ class ImportXlsx extends ModeleImports
 							$error++;
 						}
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
-						else
-						{
+						else {
 						    // We convert field if required
 						    if (!empty($objimport->array_import_convertvalue[0][$val]))
 						    {
@@ -464,9 +458,7 @@ class ImportXlsx extends ModeleImports
                                         if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
                                         {
                                         	$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
-                                        }
-                                        else
-										{
+                                        } else {
                                             $resultload = dol_include_once($file);
                                             if (empty($resultload))
                                             {
@@ -504,9 +496,7 @@ class ImportXlsx extends ModeleImports
                                             if ($classinstance->id != '')	// id may be 0, it is a found value
                                             {
                                                 $newval = $classinstance->id;
-                                            }
-                                            else
-                                            {
+                                            } 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';
@@ -516,8 +506,7 @@ class ImportXlsx extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel')
                                 {
                                     $isidorref = 'id';
                                     if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
@@ -554,12 +543,10 @@ class ImportXlsx extends ModeleImports
                                             }
                                         }
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull')
+                                } 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')
+                                } 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'];
@@ -568,9 +555,7 @@ class ImportXlsx extends ModeleImports
                                 	if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
                                 	{
                                 		$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
-                                	}
-                                	else
-                                	{
+                                	} else {
                                 		$resultload = dol_include_once($file);
                                 		if (empty($resultload))
                                 		{
@@ -586,9 +571,7 @@ class ImportXlsx extends ModeleImports
                                         if ($classinstance->id > 0)	// we found record
                                         {
                                         	$newval = $scaleorid ? $scaleorid : 0;
-                                        }
-                                        else
-                                        {
+                                        } 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';
@@ -596,8 +579,7 @@ class ImportXlsx extends ModeleImports
                                 			$error++;
                                 		}
                                 	}
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -606,8 +588,7 @@ class ImportXlsx extends ModeleImports
                                         //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')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -616,8 +597,7 @@ class ImportXlsx extends ModeleImports
                                         //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')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -626,8 +606,7 @@ class ImportXlsx extends ModeleImports
                                         //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')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto')
                                 {
                                     if (strtolower($newval) == 'auto')
                                     {
@@ -637,8 +616,7 @@ class ImportXlsx extends ModeleImports
                                         //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')
+                                } 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
@@ -651,8 +629,7 @@ class ImportXlsx extends ModeleImports
                                     }
                                     if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
                                     $newval = $defaultref;
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute')
+                                } 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'];
@@ -672,8 +649,7 @@ class ImportXlsx extends ModeleImports
                                         $errorforthistable++;
                                         $error++;
                                     }
-                                }
-                                elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
+                                } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric')
                                 {
                                     $newval = price2num($newval);
                                 }
@@ -714,9 +690,7 @@ class ImportXlsx extends ModeleImports
 												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
 												$i++;
 											}
-										}
-										else
-										{
+										} else {
 											dol_print_error($this->db);
 										}
 									}
@@ -752,7 +726,7 @@ class ImportXlsx 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)."'";
+						else $listvalues[] = "'".$this->db->escape($newval)."'";
 					}
 					$i++;
 				}
@@ -768,8 +742,7 @@ class ImportXlsx extends ModeleImports
     				    {
     				        $listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				        $listvalues[] = $user->id;
-    				    }
-    				    elseif (preg_match('/^lastrowid-/', $val))
+    				    } elseif (preg_match('/^lastrowid-/', $val))
     				    {
     				        $tmp = explode('-', $val);
     				        $lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
@@ -777,15 +750,12 @@ class ImportXlsx extends ModeleImports
     				        $listfields[] = $keyfield;
                             $listvalues[] = $lastinsertid;
     				        //print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-    				    }
-    				    elseif (preg_match('/^const-/', $val))
+    				    } elseif (preg_match('/^const-/', $val))
     				    {
     				    	$tmp = explode('-', $val, 2);
     				    	$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
     				    	$listvalues[] = "'".$tmp[1]."'";
-    				    }
-    				    else
-    				    {
+    				    } else {
     				    	$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
     				    	$this->errors[$error]['type'] = 'Import profile setup';
     				    	$error++;
@@ -833,9 +803,7 @@ class ImportXlsx extends ModeleImports
 									} else {
 										// No record found with filters, insert will be tried below
 									}
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -862,9 +830,7 @@ class ImportXlsx extends ModeleImports
 										// force $lastinsertid to 0 so we INSERT below.
 										$lastinsertid = 0;
 									}
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -893,9 +859,7 @@ class ImportXlsx extends ModeleImports
 								if ($resql) {
 									// No error, update has been done. $this->db->db->affected_rows can be 0 if data hasn't changed
 									$updatedone = true;
-								}
-								else
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
@@ -908,7 +872,7 @@ class ImportXlsx extends ModeleImports
 						if (!$error && !$updatedone) {
 							// Build SQL INSERT request
 							$sqlstart = 'INSERT INTO '.$tablename.'('.implode(', ', $listfields).', import_key';
-							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$importid."'";
+							$sqlend = ') VALUES('.implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
 							if (!empty($tablewithentity_cache[$tablename])) {
 								$sqlstart .= ', entity';
 								$sqlend .= ', '.$conf->entity;
@@ -928,9 +892,7 @@ class ImportXlsx extends ModeleImports
 								{
 								    $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
-								{
+								} else {
 									//print 'E';
 									$this->errors[$error]['lib'] = $this->db->lasterror();
 									$this->errors[$error]['type'] = 'SQL';
diff --git a/htdocs/core/modules/livraison/doc/pdf_storm.modules.php b/htdocs/core/modules/livraison/doc/pdf_storm.modules.php
new file mode 100644
index 00000000000..2019de478eb
--- /dev/null
+++ b/htdocs/core/modules/livraison/doc/pdf_storm.modules.php
@@ -0,0 +1,1078 @@
+<?php
+/* Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@inodbox.com>
+ * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
+ * Copyright (C) 2008      Chiptronik
+ * Copyright (C) 2011-2019 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2020      John BOTELLA
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/livraison/doc/pdf_storm.modules.php
+ *	\ingroup    livraison
+ *	\brief      File of class to manage receving receipts with template Storm
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/modules_livraison.php';
+require_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+
+/**
+ *	Class to build Delivery Order documents with storm model
+ */
+class pdf_storm extends ModelePDFDeliveryOrder
+{
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var string model name
+	 */
+	public $name;
+
+	/**
+	 * @var string model description (short text)
+	 */
+	public $description;
+
+	/**
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 */
+	public $phpmin = array(5, 5);
+
+	/**
+	 * 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 marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
+	/**
+	 * Issuer
+	 * @var Societe Object that emits
+	 */
+	public $emetteur;
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc;
+
+		// Translations
+		$langs->loadLangs(array("main", "bills", "sendings", "companies"));
+
+		$this->db = $db;
+		$this->name = "Storm";
+		$this->description = $langs->trans("DocumentModelStorm");
+
+		// Page size for A4 format
+		$this->type = 'pdf';
+		$formatarray = pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+
+		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_codeproduitservice = 1; // Display product-service code
+
+		// Get source company
+		$this->emetteur = $mysoc;
+		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+
+		$this->tva = array();
+		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param      Livraison	$object				Object to generate
+	 *  @param      Translate	$outputlangs		Lang output object
+	 *  @param      string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param      int			$hidedetails		Do not show line details
+	 *  @param      int			$hidedesc			Do not show desc
+	 *  @param      int			$hideref			Do not show ref
+	 *  @return     int             			1=OK, 0=KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $hookmanager;
+
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "sendings", "deliveries"));
+
+		if ($conf->expedition->dir_output)
+		{
+			$object->fetch_thirdparty();
+
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->expedition->dir_output."/receipt";
+				$file = $dir."/SPECIMEN.pdf";
+			}
+			else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->expedition->dir_output."/receipt/".$objectref;
+				$file = $dir."/".$objectref.".pdf";
+			}
+
+			if (!file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return 0;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+
+				$nblines = count($object->lines);
+
+
+				// Loop on each lines to detect if there is at least one image to show
+				$realpatharray=array();
+				$this->atleastonephoto = false;
+				if (! empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE))
+				{
+					$objphoto = new Product($this->db);
+
+					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))
+						{
+							$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)
+							{
+								$dir = $conf->product->dir_output.'/'.$midir;
+
+								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;
+								}
+							}
+						}
+
+						if ($realpath && $arephoto) $realpatharray[$i]=$realpath;
+					}
+				}
+
+				if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
+
+
+
+				// Create pdf instance
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$heightforinfotot = 30; // 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;
+				$pdf->SetAutoPageBreak(1, 0);
+
+				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);
+				}
+
+				// We get the shipment that is the origin of delivery receipt
+				$expedition = new Expedition($this->db);
+				$result = $expedition->fetch($object->origin_id);
+				// Now we get the order that is origin of shipment
+				$commande = new Commande($this->db);
+				if ($expedition->origin == 'commande')
+				{
+					$commande->fetch($expedition->origin_id);
+				}
+				$object->commande = $commande; // We set order of shipment onto delivery.
+				$object->commande->loadExpeditions();
+
+
+				$pdf->Open();
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("DeliveryOrder"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("DeliveryOrder"));
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+
+
+				// New page
+				$pdf->AddPage();
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
+
+				$tab_top = 90;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
+				$tab_height = 130;
+				$tab_height_newpage = 150;
+
+				$this->posxdesc = $this->marge_gauche + 1;
+
+				// Incoterm
+				$height_incoterms = 0;
+				if ($conf->incoterm->enabled)
+				{
+					$desc_incoterms = $object->getIncotermsForPDF();
+					if ($desc_incoterms)
+					{
+						$tab_top = 88;
+
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+						$nexY = $pdf->GetY();
+						$height_incoterms = $nexY - $tab_top;
+
+						// Rect takes a length in 3rd parameter
+						$pdf->SetDrawColor(192, 192, 192);
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
+
+						$tab_top = $nexY + 6;
+						$height_incoterms += 4;
+					}
+				}
+
+				// display note
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote))
+				{
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
+
+				if (!empty($notetoshow))
+				{
+					$tab_top = 88 + $height_incoterms;
+
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$nexY = $pdf->GetY();
+					$height_note = $nexY - $tab_top;
+
+					// Rect takes a length in 3rd parameter
+					$pdf->SetDrawColor(192, 192, 192);
+					$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY + 6;
+				}
+				else {
+					$height_note = 0;
+				}
+
+				// Use new auto column system
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+				// Table simulation to know the height of the title line
+				$pdf->startTransaction();
+				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, 0);
+				$pdf->rollbackTransaction(true);
+
+				$iniY = $tab_top + $this->tabTitleHeight + 2;
+				$curY = $tab_top + $this->tabTitleHeight + 2;
+				$nexY = $tab_top + $this->tabTitleHeight + 2;
+
+				// Loop on each lines
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					// Fetch optionals
+					if (empty($object->lines[$i]->array_options)){
+						$object->lines[$i]->fetch_optionals();
+					}
+
+					$curY = $nexY;
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
+
+					// Define size of image if we need it
+	                $imglinesize=array();
+	                if (! empty($realpatharray[$i])) $imglinesize=pdf_getSizeForImage($realpatharray[$i]);
+
+
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
+
+					// Description of product line
+					$curX = $this->posxdesc - 1;
+
+					$showpricebeforepagebreak = 1;
+
+					$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
+						{
+							$pdf->AddPage('', '', true);
+							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+							//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							$pdf->setPage($pageposbefore+1);
+
+							$curY = $tab_top_newpage;
+
+							// 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'];
+						}
+					}
+
+
+					// Description of product line
+					if ($this->getColumnStatus('desc')) {
+						$pdf->startTransaction();
+						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $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.
+							pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 4, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
+							$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();
+						}
+
+						$posYAfterDescription=$pdf->GetY();
+					}
+
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description is moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+
+
+					// Quantity
+					if ($this->getColumnStatus('qty_shipped')) {
+						$this->printStdColumnContent($pdf, $curY, 'qty_shipped', $object->lines[$i]->qty_shipped);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Remaining to ship
+					if ($this->getColumnStatus('qty_remaining')) {
+						$qtyRemaining = $object->lines[$i]->qty_asked - $object->commande->expeditions[$object->lines[$i]->fk_origin_line];
+						$this->printStdColumnContent($pdf, $curY, 'qty_remaining', $qtyRemaining);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					$nexY = max($nexY, $posYAfterImage);
+
+					// 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);
+							}
+						}
+					}
+
+					// Add line
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
+					{
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY + 1, $this->page_largeur - $this->marge_droite, $nexY + 1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
+					$nexY += 2; // Add space between lines
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter)
+					{
+						$pdf->setPage($pagenb);
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						}
+						else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
+					{
+						if ($pagenb == 1)
+						{
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						}
+						else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						// New page
+						$pdf->AddPage();
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
+
+				// Show square
+				if ($pagenb == 1)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+				else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+
+				// Affiche zone infos
+				$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+
+				// Pied de page
+				$this->_pagefoot($pdf, $object, $outputlangs);
+
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+
+				$pdf->Close();
+
+				$pdf->Output($file, 'F');
+
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0)
+				{
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
+				}
+
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1; // No error
+			}
+			else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		}
+
+		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "LIVRAISON_OUTPUTDIR");
+		return 0;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *   Show miscellaneous information (payment mode, payment term, ...)
+	 *
+	 *   @param		TCPDF		$pdf     		Object PDF
+	 *   @param		Object		$object			Object to show
+	 *   @param		int			$posy			Y
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @return	void
+	 */
+	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf, $mysoc;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$pdf->SetFont('', '', $default_font_size);
+		$pdf->SetXY($this->marge_gauche, $posy);
+
+		$larg_sign = ($this->page_largeur - $this->marge_gauche - $this->marge_droite) / 3;
+		$pdf->Rect($this->marge_gauche, $posy + 1, $larg_sign, 25);
+		$pdf->SetXY($this->marge_gauche + 2, $posy + 2);
+		$pdf->MultiCell($larg_sign, 2, $outputlangs->trans("For").' '.$outputlangs->convToOutputCharset($mysoc->name).":", '', 'L');
+
+		$pdf->Rect(2 * $larg_sign + $this->marge_gauche, $posy + 1, $larg_sign, 25);
+		$pdf->SetXY(2 * $larg_sign + $this->marge_gauche + 2, $posy + 2);
+		$pdf->MultiCell($larg_sign, 2, $outputlangs->trans("ForCustomer").':', '', 'L');
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		TCPDF		$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y (not used)
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @return	void
+	 */
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	{
+		global $conf;
+
+		// Force to disable hidetop and hidebottom
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
+
+		$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);
+
+		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));
+		}
+
+		$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->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
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	TCPDF		$pdf     		Object PDF
+	 *  @param  Object		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @return	void
+	 */
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	{
+		global $conf, $langs, $hookmanager;
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		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);
+		}
+
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
+
+		$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 $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
+
+		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DeliveryOrder")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+
+		$pdf->SetFont('', '', $default_font_size + 2);
+
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		if ($object->date_valid)
+		{
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_delivery, "%d %b %Y", false, $outputlangs, true), '', 'R');
+		}
+		else {
+			$pdf->SetTextColor(255, 0, 0);
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryNotValidated"), '', 'R');
+			$pdf->SetTextColor(0, 0, 60);
+		}
+
+		if ($object->thirdparty->code_client)
+		{
+			$posy += 5;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+		}
+
+		$pdf->SetTextColor(0, 0, 60);
+
+		$posy += 2;
+
+		// Show list of linked objects
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+
+		if ($showaddress)
+		{
+			// Sender properties
+			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+
+			// Show sender
+			$posy = 42;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			$hautcadre = 40;
+
+			// Show sender frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
+			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0, 0, 60);
+
+			// Show sender name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$posy = $pdf->getY();
+
+			// Show sender information
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+
+			// Client destinataire
+			$posy = 42;
+			$posx = 102;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(80, 5, $outputlangs->transnoentities("DeliveryAddress").":", 0, 'L');
+
+			// If SHIPPING contact defined on order, we use it
+			$usecontact = false;
+			$arrayidcontact = $object->commande->getIdContact('external', 'SHIPPING');
+			if (count($arrayidcontact) > 0)
+			{
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
+			}
+
+			//Recipient name
+			// On peut utiliser le nom de la societe du contact
+			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+				$thirdparty = $object->contact;
+			} else {
+				$thirdparty = $object->thirdparty;
+			}
+
+			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+
+			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
+
+			// Show recipient
+			$widthrecbox = 100;
+			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			$posy = 42;
+			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+
+			// Show recipient frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx + 2, $posy - 5);
+			//$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":",0,'L');
+			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+			// Show recipient name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+
+			$posy = $pdf->getY();
+
+			// Show recipient information
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+		}
+
+		$pdf->SetTextColor(0, 0, 60);
+	}
+
+	// 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
+	 */
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	{
+		global $conf;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'DELIVERY_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
+
+
+
+	/**
+	 *   	Define Array Column Field
+	 *
+	 *   	@param	object		   $object    	    common object
+	 *   	@param	Translate	   $outputlangs     langs
+	 *      @param	int			   $hidedetails		Do not show line details
+	 *      @param	int			   $hidedesc		Do not show desc
+	 *      @param	int			   $hideref			Do not show ref
+	 *      @return	null
+	 */
+	public function 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(0.5, 0.5, 0.5, 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
+		);
+
+		/*
+		 * For exemple
+		 $this->cols['theColKey'] = array(
+		 'rank' => $rank, // int : use for ordering columns
+		 'width' => 20, // the column width in mm
+		 'title' => array(
+		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+		 'label' => ' ', // the final label : used fore final generated text
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 'content' => array(
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.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',
+			),
+		);
+
+		$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_DELIVERY_WITH_PICTURE) && !empty($this->atleastonephoto))
+		{
+			$this->cols['photo']['status'] = true;
+		}
+
+
+		$rank = $rank + 10;
+		$this->cols['Comments'] = array(
+			'rank' => $rank,
+			'width' => 50, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Comments'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		//      $rank = $rank + 10;
+		//      $this->cols['weight'] = array(
+		//          'rank' => $rank,
+		//          'width' => 30, // in mm
+		//          'status' => false,
+		//          'title' => array(
+		//              'textkey' => 'WeightVolShort'
+		//          ),
+		//          'border-left' => true, // add left line separator
+		//      );
+
+		$rank = $rank + 10;
+		$this->cols['qty_shipped'] = array(
+			'rank' => $rank,
+			'width' => 20, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'QtyShippedShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		$rank = $rank + 10;
+		$this->cols['qty_remaining'] = array(
+			'rank' => $rank,
+			'width' => 20, // in mm
+			'status' => 1,
+			'title' => array(
+				'textkey' => 'KeepToShipShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+
+		// 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
+		);
+
+		$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/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index cda16561f8d..34b66066f54 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2014 Regis Houssin         <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  * Copyright (C) 2008      Chiptronik
- * Copyright (C) 2011-2019 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2020 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
 
  * This program is free software; you can redistribute it and/or modify
@@ -39,70 +39,70 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_typhon extends ModelePDFDeliveryOrder
 {
 	/**
-     * @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 array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -171,21 +171,21 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	}
 
 
-    // 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:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param      Object		$object				Object to generate
+	 *  @param      Translate	$outputlangs		Lang output object
+	 *  @param      string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param      int			$hidedetails		Do not show line details
+	 *  @param      int			$hidedesc			Do not show desc
+	 *  @param      int			$hideref			Do not show ref
+	 *  @return     int             			1=OK, 0=KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -204,9 +204,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			{
 				$dir = $conf->expedition->dir_output."/receipt";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/receipt/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -238,25 +236,25 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-                $heightforinfotot = 30; // 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;
-                $pdf->SetAutoPageBreak(1, 0);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$heightforinfotot = 30; // 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;
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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);
+				}
 
 				// We get the shipment that is the origin of delivery receipt
 				$expedition = new Expedition($this->db);
@@ -357,9 +355,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -381,46 +377,42 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					// Description of product line
 					$curX = $this->posxdesc - 1;
 
-                    $showpricebeforepagebreak = 1;
+					$showpricebeforepagebreak = 1;
 
-                    $pdf->startTransaction();
-                    pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxcomm - $curX, 3, $curX, $curY, $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.
-                    	pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxcomm - $curX, 4, $curX, $curY, $hideref, $hidedesc);
-                    	$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
+					$pdf->startTransaction();
+					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxcomm - $curX, 3, $curX, $curY, $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.
+						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxcomm - $curX, 4, $curX, $curY, $hideref, $hidedesc);
+						$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 $showpricebeforepagebreak = 0;
+						}
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+					}
 
 					$nexY = $pdf->GetY();
-                    $pageposafter = $pdf->getPage();
+					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
@@ -489,9 +481,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -505,9 +495,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -524,9 +512,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -616,8 +602,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$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))
@@ -626,9 +612,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -639,11 +623,11 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	}
 
 	// 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, ...)
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Object		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
@@ -651,7 +635,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -672,7 +656,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -738,7 +722,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -772,18 +756,15 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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 $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
+		} else $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 2);
 		$pdf->SetXY($posx, $posy);
@@ -798,9 +779,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		if ($object->date_valid)
 		{
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_delivery, "%d %b %Y", false, $outputlangs, true), '', 'R');
-		}
-		else
-		{
+		} else {
 			$pdf->SetTextColor(255, 0, 0);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryNotValidated"), '', 'R');
 			$pdf->SetTextColor(0, 0, 60);
@@ -916,17 +895,17 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
-     *
-	 *  @param	PDF			$pdf     			PDF
+	 *
+	 *  @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, 'DELIVERY_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, 'DELIVERY_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
 }
diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php
index d3043ea75ec..01788cd863b 100644
--- a/htdocs/core/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/core/modules/livraison/mod_livraison_jade.php
@@ -142,9 +142,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 464c657fa7b..2d6ad7307b2 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -113,9 +113,7 @@ class mailing_advthirdparties extends MailingTargets
 
     					$i++;
     				}
-    			}
-    			else
-    			{
+    			} else {
     				dol_syslog($this->db->error());
     				$this->error = $this->db->error();
     				return -1;
@@ -168,9 +166,7 @@ class mailing_advthirdparties extends MailingTargets
 
     					$i++;
     				}
-    			}
-    			else
-    			{
+    			} else {
     				dol_syslog($this->db->error());
     				$this->error = $this->db->error();
     				return -1;
@@ -272,9 +268,7 @@ class mailing_advthirdparties extends MailingTargets
 				$s .= '</option>';
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 9d7a23ce9fd..be5e8435ad2 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -75,7 +75,7 @@ class mailing_contacts1 extends MailingTargets
 		$langs->load("commercial");
 
 		$statssql = array();
-		$statssql[0] = "SELECT '".$langs->trans("NbOfCompaniesContacts")."' as label,";
+		$statssql[0] = "SELECT '".$this->db->escape($langs->trans("NbOfCompaniesContacts"))."' as label,";
 		$statssql[0] .= " count(distinct(c.email)) as nb";
 		$statssql[0] .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
 		$statssql[0] .= " WHERE c.entity IN (".getEntity('socpeople').")";
@@ -153,8 +153,7 @@ class mailing_contacts1 extends MailingTargets
 				$s .= '<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		$s .= ' ';
@@ -190,13 +189,10 @@ class mailing_contacts1 extends MailingTargets
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		$s .= '<br>';
@@ -225,8 +221,7 @@ class mailing_contacts1 extends MailingTargets
 				$s .= '<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
 		//$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
 		$s .= '<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
@@ -265,13 +260,10 @@ class mailing_contacts1 extends MailingTargets
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		$s .= ' ';
@@ -307,13 +299,10 @@ class mailing_contacts1 extends MailingTargets
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 		$s .= '</select>';
 
 		return $s;
@@ -369,8 +358,7 @@ class mailing_contacts1 extends MailingTargets
 				$prospectlevel[$obj->code] = $obj->label;
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		// Request must return: id, email, fk_contact, lastname, firstname, other
 		$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,";
@@ -402,7 +390,7 @@ class mailing_contacts1 extends MailingTargets
 		{
 			//print "xx".$key;
 			if ($key == 'prospects') $sql .= " AND s.client=2";
-			foreach ($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql .= " AND s.fk_prospectlevel='".$codelevel."'";
+			foreach ($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql .= " AND s.fk_prospectlevel='".$this->db->escape($codelevel)."'";
 			if ($key == 'customers') $sql .= " AND s.client=1";
 			if ($key == 'suppliers') $sql .= " AND s.fournisseur=1";
 		}
@@ -447,9 +435,7 @@ class mailing_contacts1 extends MailingTargets
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 8a504ff28b5..95f180b80ff 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -154,9 +154,7 @@ class mailing_fraise extends MailingTargets
                 $s .= '</option>';
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -193,9 +191,7 @@ class mailing_fraise extends MailingTargets
         		$s .= '</option>';
         		$i++;
         	}
-        }
-        else
-        {
+        } else {
         	dol_print_error($this->db);
         }
 
@@ -242,37 +238,35 @@ class mailing_fraise extends MailingTargets
         $cibles = array();
         $now = dol_now();
 
-        $dateendsubscriptionafter = dol_mktime($_POST['subscriptionafterhour'], $_POST['subscriptionaftermin'], $_POST['subscriptionaftersec'], $_POST['subscriptionaftermonth'], $_POST['subscriptionafterday'], $_POST['subscriptionafteryear']);
-        $dateendsubscriptionbefore = dol_mktime($_POST['subscriptionbeforehour'], $_POST['subscriptionbeforemin'], $_POST['subscriptionbeforesec'], $_POST['subscriptionbeforemonth'], $_POST['subscriptionbeforeday'], $_POST['subscriptionbeforeyear']);
+        $dateendsubscriptionafter = dol_mktime(GETPOST('subscriptionafterhour', 'int'), GETPOST('subscriptionaftermin', 'int'), GETPOST('subscriptionaftersec', 'int'), GETPOST('subscriptionaftermonth', 'int'), GETPOST('subscriptionafterday', 'int'), GETPOST('subscriptionafteryear', 'int'));
+        $dateendsubscriptionbefore = dol_mktime(GETPOST('subscriptionbeforehour', 'int'), GETPOST('subscriptionbeforemin', 'int'), GETPOST('subscriptionbeforesec', 'int'), GETPOST('subscriptionbeforemonth', 'int'), GETPOST('subscriptionbeforeday', 'int'), GETPOST('subscriptionbeforeyear', 'int'));
 
         // La requete doit retourner: id, email, fk_contact, name, firstname
         $sql = "SELECT a.rowid as id, a.email as email, null as fk_contact, ";
         $sql .= " a.lastname, a.firstname,";
         $sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
         $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-        if ($_POST['filter_category'])
+        if (GETPOST('filter_category'))
         {
-        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
-        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie";
+        	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
+        	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
         }
         $sql .= " , ".MAIN_DB_PREFIX."adherent_type as ta";
         $sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false
         $sql .= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$this->db->escape($mailing_id).")";
         // Filter on status
-        if (isset($_POST["filter"]) && $_POST["filter"] == '-1') {
+        if (GETPOST("filter") == '-1') {
             $sql .= " AND a.statut=-1";
         }
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1a') $sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1b') $sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '0')  $sql .= " AND a.statut=0";
+        if (GETPOST("filter", 'aZ09') == '1a') $sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
+        if (GETPOST("filter", 'aZ09') == '1b') $sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
+        if (GETPOST("filter", 'aZ09') === '0')  $sql .= " AND a.statut=0";
         // Filter on date
         if ($dateendsubscriptionafter > 0)  $sql .= " AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
         if ($dateendsubscriptionbefore > 0) $sql .= " AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
         $sql .= " AND a.fk_adherent_type = ta.rowid";
         // Filter on type
-        if ($_POST['filter_type']) $sql .= " AND ta.rowid='".$_POST['filter_type']."'";
-        // Filter on category
-        if ($_POST['filter_category']) $sql .= " AND c.rowid='".$_POST['filter_category']."'";
+        if (GETPOST('filter_type', 'int') > 0) $sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type', 'int'))."'";
         $sql .= " ORDER BY a.email";
         //print $sql;
 
@@ -306,16 +300,14 @@ class mailing_fraise extends MailingTargets
                                 'source_url' => $this->url($obj->id),
                                 'source_id' => $obj->id,
                                 'source_type' => 'member'
-                                );
+                    );
                     $old = $obj->email;
                     $j++;
                 }
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog($this->db->error());
             $this->error = $this->db->error();
             return -1;
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index ffba2571d23..4c078a39130 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -98,9 +98,7 @@ class MailingTargets // This can't be abstract as it is used for some method
         {
             $obj = $this->db->fetch_object($result);
             return $obj->nb;
-        }
-        else
-        {
+        } else {
         	$this->error = $this->db->lasterror();
             return -1;
         }
@@ -144,8 +142,7 @@ class MailingTargets // This can't be abstract as it is used for some method
                 $this->error = $this->db->error();
                 return -1;
             }
-        }
-        else {
+        } else {
             return -1;
         }
         return $nb;
@@ -178,7 +175,7 @@ class MailingTargets // This can't be abstract as it is used for some method
        			$sql .= " tag,";
         		$sql .= " source_type)";
         		$sql .= " VALUES (".$mailing_id.",";
-        		$sql .= (empty($targetarray['fk_contact']) ? '0' : "'".$targetarray['fk_contact']."'").",";
+        		$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'])."',";
@@ -192,9 +189,7 @@ class MailingTargets // This can't be abstract as it is used for some method
         		if ($result)
         		{
         			$j++;
-        		}
-        		else
-        		{
+        		} else {
         			if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
         			{
         				// Si erreur autre que doublon
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index aa3e9bbc703..52da4f87a32 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -73,7 +73,7 @@ class mailing_pomme extends MailingTargets
 		$langs->load("users");
 
 		$statssql = array();
-		$sql = "SELECT '".$langs->trans("DolibarrUsers")."' as label,";
+		$sql = "SELECT '".$this->db->escape($langs->trans("DolibarrUsers"))."' as label,";
 		$sql .= " count(distinct(u.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 		$sql .= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test
@@ -213,9 +213,7 @@ class mailing_pomme extends MailingTargets
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 05e9f4f12c4..b286de97196 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -79,9 +79,7 @@ class mailing_thirdparties extends MailingTargets
 		    $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
-		{
+		} else {
             $addFilter = "";
             if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
             {
@@ -90,21 +88,16 @@ class mailing_thirdparties extends MailingTargets
                 if ($_POST["filter_client"] == 0)
                 {
                     $addDescription .= $langs->trans('NorProspectNorCustomer');
-                }
-                elseif ($_POST["filter_client"] == 1)
+                } elseif ($_POST["filter_client"] == 1)
                 {
                     $addDescription .= $langs->trans('Customer');
-                }
-                elseif ($_POST["filter_client"] == 2)
+                } elseif ($_POST["filter_client"] == 2)
                 {
                     $addDescription .= $langs->trans('Prospect');
-                }
-                elseif ($_POST["filter_client"] == 3)
+                } elseif ($_POST["filter_client"] == 3)
                 {
                     $addDescription .= $langs->trans('ProspectCustomer');
-                }
-                else
-                {
+                } else {
                     $addDescription .= "Unknown status ".$_POST["filter_client"];
                 }
             }
@@ -119,9 +112,7 @@ class mailing_thirdparties extends MailingTargets
                 {
                     $addFilter .= " AND s.status=1";
                     $addDescription .= $langs->trans("Enabled");
-                }
-                else
-                {
+                } else {
                     $addFilter .= " AND s.status=0";
                     $addDescription .= $langs->trans("Disabled");
                 }
@@ -186,9 +177,7 @@ class mailing_thirdparties extends MailingTargets
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
@@ -285,9 +274,7 @@ class mailing_thirdparties extends MailingTargets
 				$s .= '</option>';
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 866712d4bb0..51bdb7b6b87 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -73,9 +73,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
                 $i++;
                 $this->arrayofproducts[$i] = $obj->ref;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
@@ -115,7 +113,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
         $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 = '".$product."'";
+        $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";
 
@@ -153,9 +151,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_syslog($this->db->lasterror());
             $this->error = $this->db->lasterror();
             return -1;
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 9d08cb3565d..3ab0735429e 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -179,9 +179,7 @@ class mailing_xinputfile extends MailingTargets
 									$old = $email;
 									$j++;
 								}
-					        }
-					        else
-					        {
+					        } else {
 					        	$i++;
 					        	$langs->load("errors");
                                 $msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
@@ -196,27 +194,21 @@ class mailing_xinputfile extends MailingTargets
 				    {
 				    	return -$i;
 				    }
-				}
-				else
-				{
+				} else {
 					$this->error = $langs->trans("ErrorFaildToOpenFile");
 					return -1;
 				}
 
 				dol_syslog(get_class($this)."::add_to_target mailing ".$cpt." targets found");
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				if ($resupload < 0)	// Unknown error
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
-				}
-				elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
+				} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 				{
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
-				}
-				else	// Known error
+				} else // Known error
 				{
 					$this->error = '<div class="error">'.$langs->trans($resupload).'</div>';
 				}
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index 0875b02ed56..72614d39e9d 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -148,16 +148,12 @@ class mailing_xinputuser extends MailingTargets
 				);
 
 				return parent::addTargetsToDatabase($mailing_id, $cibles);
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorBadEMail", $email);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
             $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 1582b1c1c34..e6fd6d04091 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -37,23 +37,23 @@ class pdf_standard extends CommonStickerGenerator
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
 	 *
-	 * @param	PDF			$pdf			PDF reference
+	 * @param	TCPDF		$pdf			PDF reference
 	 * @param	Translate	$outputlangs	Output langs
 	 * @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
 	 * - __PHOTO__ is replace with photo provided as parameter
 	 *
-	 * @param	 PDF		$pdf			PDF
+	 * @param	 TCPDF		$pdf			PDF
 	 * @param	 string		$textleft		Text left
 	 * @param	 string		$header			Header
 	 * @param	 string		$footer			Footer
@@ -65,7 +65,7 @@ class pdf_standard extends CommonStickerGenerator
 	 */
 	public function Add_PDF_card(&$pdf, $textleft, $header, $footer, $outputlangs, $textright = '', $idmember = 0, $photo = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $db, $mysoc, $conf, $langs;
 		global $forceimgscalewidth, $forceimgscaleheight;
 
@@ -88,8 +88,7 @@ class pdf_standard extends CommonStickerGenerator
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -155,8 +154,7 @@ class pdf_standard extends CommonStickerGenerator
 		if ($tmp['height'])
 		{
 			$imgratio = $tmp['width'] / $tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
@@ -166,13 +164,11 @@ class pdf_standard extends CommonStickerGenerator
 			// Output left area
 			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		}
-		elseif ($textleft != '' && $textright != '')	//
+		} elseif ($textleft != '' && $textright != '')	//
 		{
 			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
 			{
@@ -180,29 +176,25 @@ class pdf_standard extends CommonStickerGenerator
 				elseif ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			elseif ($textright == '__LOGO__' || $textright == '__PHOTO__')
+			} elseif ($textright == '__LOGO__' || $textright == '__PHOTO__')
 			{
 				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				elseif ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			}
-			else	// text on halft left and text on half right
+			} else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
-		}
-		else	// Only a right part
+		} else // Only a right part
 		{
 			// Output right area
 			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
@@ -237,7 +229,7 @@ class pdf_standard extends CommonStickerGenerator
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build PDF on disk, then output on HTTP stream.
 	 *
@@ -259,6 +251,11 @@ class pdf_standard extends CommonStickerGenerator
 		{
 		    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,
@@ -305,9 +302,7 @@ class pdf_standard extends CommonStickerGenerator
 	        }
 
     		$arrayofrecords = $arrayofmembers;
-		}
-		else
-		{
+		} else {
 		    $arrayofrecords = $object;
 		}
 
@@ -316,14 +311,14 @@ class pdf_standard extends CommonStickerGenerator
 		$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
@@ -336,9 +331,7 @@ class pdf_standard extends CommonStickerGenerator
 		{
 			$title = $outputlangs->transnoentities('MembersCards');
 			$keywords = $outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
-		}
-		else
-		{
+		} else {
 			dol_print_error('', 'Bad value for $mode');
 			return -1;
 		}
@@ -346,15 +339,13 @@ class pdf_standard extends CommonStickerGenerator
 		$filename = 'tmp_cards.pdf';
 		if (is_object($object))
 		{
-		    $outputdir = $conf->adherent->dir_output;
-		    $dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
-		    $file = $dir.'/'.$filename;
-		}
-		else
-		{
-		    $outputdir = $conf->adherent->dir_temp;
-		    $dir = $outputdir;
-		    $file = $dir.'/'.$filename;
+			$outputdir = $conf->adherent->dir_output;
+			$dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
+			$file = $dir.'/'.$filename;
+		} else {
+			$outputdir = $conf->adherent->dir_temp;
+			$dir = $outputdir;
+			$file = $dir.'/'.$filename;
 		}
 
 		//var_dump($file);exit;
@@ -425,22 +416,22 @@ class pdf_standard extends CommonStickerGenerator
 		// Output to http stream
 		if (empty($nooutput))
 		{
-    		clearstatcache();
+			clearstatcache();
 
-    		$attachment = true;
-    		if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
-    		$type = dol_mimetype($filename);
+			$attachment = true;
+			if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
+			$type = dol_mimetype($filename);
 
-    		//if ($encoding)   header('Content-Encoding: '.$encoding);
-    		if ($type)		 header('Content-Type: '.$type);
-    		if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-    		else header('Content-Disposition: inline; filename="'.$filename.'"');
+			//if ($encoding)   header('Content-Encoding: '.$encoding);
+			if ($type)		 header('Content-Type: '.$type);
+			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
+			else header('Content-Disposition: inline; filename="'.$filename.'"');
 
-    		// Ajout directives pour resoudre bug IE
-    		header('Cache-Control: Public, must-revalidate');
-    		header('Pragma: public');
+			// Ajout directives pour resoudre bug IE
+			header('Cache-Control: Public, must-revalidate');
+			header('Pragma: public');
 
-    		readfile($file);
+			readfile($file);
 		}
 
 		return 1;
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index f9bdd58af24..65e9caef561 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -99,13 +99,10 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		if (!empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
 		{
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
-		}
-		else
-		{
+		} else {
 			$code = $modele;
 		}
-	}
-	else $code = $modele;
+	} else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $template, 2);
@@ -113,8 +110,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 	{
 		$template = $tmp[0];
 		$srctemplatepath = $tmp[1];
-	}
-	else $srctemplatepath = $code;
+	} else $srctemplatepath = $code;
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
@@ -153,17 +149,12 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		{
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "members_card_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-
-	else
-	{
+	} else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 747cae06573..e769441288f 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -258,8 +258,8 @@ class modAccounting extends DolibarrModules
 		$this->export_label[$r] = 'Chartofaccounts';
 		$this->export_icon[$r] = 'accounting';
 		$this->export_permission[$r] = array(array("accounting", "chartofaccount"));
-		$this->export_fields_array[$r] = array('ac.rowid'=>'ChartofaccountsId', 'ac.pcg_version'=>'Chartofaccounts', 'aa.rowid'=>'Id', 'aa.account_number'=>"AccountAccounting", 'aa.label'=>"Label", 'aa.account_parent'=>"Accountparent", 'aa.pcg_type'=>"Pcgtype", 'aa.active'=>'Status');
-		$this->export_TypeFields_array[$r] = array('ac.rowid'=>'List:accounting_system:pcg_version', 'aa.account_number'=>"Text", 'aa.label'=>"Text", 'aa.account_parent'=>"Text", 'aa.pcg_type'=>'Text', 'aa.active'=>'Status');
+		$this->export_fields_array[$r] = array('ac.rowid'=>'ChartofaccountsId', 'ac.pcg_version'=>'Chartofaccounts', 'aa.rowid'=>'ID', 'aa.account_number'=>"AccountAccounting", 'aa.label'=>"Label", 'aa.account_parent'=>"Accountparent", 'aa.pcg_type'=>"Pcgtype", 'aa.active'=>'Status');
+		$this->export_TypeFields_array[$r] = array('ac.rowid'=>'List:accounting_system:pcg_version', 'ac.pcg_version'=>'Text', 'aa.rowid'=>'Numeric', 'aa.account_number'=>"Text", 'aa.label'=>"Text", 'aa.account_parent'=>"Text", 'aa.pcg_type'=>'Text', 'aa.active'=>'Status');
 		$this->export_entities_array[$r] = array('ac.rowid'=>"Accounting", 'ac.pcg_version'=>"Accounting", 'aa.rowid'=>'Accounting', 'aa.account_number'=>"Accounting", 'aa.label'=>"Accounting", 'aa.accountparent'=>"Accounting", 'aa.pcg_type'=>"Accounting", 'aa_active'=>"Accounting");
 
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 2184500db8c..d8165948837 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -97,9 +97,7 @@ class modAgenda extends DolibarrModules
 		        //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
-		{
+		} else {
 		    dol_print_error($this->db->lasterror());
 		}
 
@@ -325,7 +323,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'List',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda',
+			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda',
 			'langs'=>'agenda',
 			'position'=>110,
 			'perms'=>'$user->rights->agenda->myactions->read',
@@ -339,7 +337,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'MenuToDoMyActions',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
+			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine',
 			'langs'=>'agenda',
 			'position'=>111,
 			'perms'=>'$user->rights->agenda->myactions->read',
@@ -353,7 +351,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'MenuDoneMyActions',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
+			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine',
 			'langs'=>'agenda',
 			'position'=>112,
 			'perms'=>'$user->rights->agenda->myactions->read',
@@ -367,7 +365,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'MenuToDoActions',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
+			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filtert=-1',
 			'langs'=>'agenda',
 			'position'=>113,
 			'perms'=>'$user->rights->agenda->allactions->read',
@@ -381,7 +379,7 @@ class modAgenda extends DolibarrModules
 			'type'=>'left',
 			'titre'=>'MenuDoneActions',
 			'mainmenu'=>'agenda',
-			'url'=>'/comm/action/list.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
+			'url'=>'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filtert=-1',
 			'langs'=>'agenda',
 			'position'=>114,
 			'perms'=>'$user->rights->agenda->allactions->read',
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index ebceca2960e..b736bdb4367 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -81,7 +81,7 @@ class modAsset extends DolibarrModules
 		// Example: this->dirs = array("/asset/temp","/asset/subdir");
 		$this->dirs = array();
 
-		// Config pages. Put here list of php page, stored into assets/admin directory, to use to setup module.
+		// Config pages. Put here list of php page, stored into asset/admin directory, to use to setup module.
 		$this->config_page_url = array("setup.php@asset");
 
 		// Dependencies
@@ -115,8 +115,8 @@ class modAsset extends DolibarrModules
 		// Array to add new pages in new tabs
 		$this->tabs = array();
 		// Example:
-		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@assets:$user->rights->assets->read:/assets/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@assets:$user->rights->othermodule->read:/assets/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:+tabname1:Title1:mylangfile@assets:$user->rights->assets->read:/asset/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@assets:$user->rights->othermodule->read:/asset/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
@@ -146,7 +146,7 @@ class modAsset extends DolibarrModules
 
 
 		// Boxes/Widgets
-		// Add here list of php file(s) stored in assets/core/boxes that contains class to show a widget.
+		// Add here list of php file(s) stored in asset/core/boxes that contains class to show a widget.
 		$this->boxes = array(
 			//0=>array('file'=>'assetswidget1.php@asset','note'=>'Widget provided by Assets','enabledbydefaulton'=>'Home'),
 			//1=>array('file'=>'assetswidget2.php@asset','note'=>'Widget provided by Assets'),
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 822ebd81e03..11912cf778a 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -71,7 +71,7 @@ class modBanque extends DolibarrModules
 		$this->depends = array();
 		$this->requiredby = array("modComptabilite", "modAccounting", "modPrelevement");
 		$this->conflictwith = array();
-		$this->langfiles = array("banks", "compta", "bills", "companies");
+		$this->langfiles = array("banks", "compta", "bills", "companies", "accounting");
 
 		// Constants
 		$this->const = array();
@@ -202,6 +202,42 @@ class modBanque extends DolibarrModules
 		$this->export_sql_end[$r] .= ' AND p.fk_paiement = 7';
 		$this->export_sql_end[$r] .= ' AND ba.entity IN ('.getEntity('bank_account').')';
 		$this->export_sql_order[$r] = ' ORDER BY b.datev, b.num_releve';
+
+		// Various Payment
+		$r++;
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'VariousPayment';
+		$this->export_permission[$r] = array(array("banque", "export"));
+		$this->export_fields_array[$r] = array(
+			'v.rowid'=>'VariousPaymentId', 'v.label'=>'VariousPaymentLabel', 'v.datev'=>'DateValue', 'v.datep'=>'DateOperation',
+			'v.num_payment'=>'ChequeOrTransferNumber', 'v.amount'=>'Amount', 'v.sens'=>'Sens',
+			'cp.id'=>"PaymentMode",
+			'v.accountancy_code'=>'AccountAccounting', 'v.subledger_account'=>'SubledgerAccount',
+			'v.note'=>'Note', 'v.datec'=>'DateCreation',
+			'p.ref'=>'ProjectRef', 'p.title'=>'ProjectLabel'
+		);
+		$this->export_TypeFields_array[$r] = array(
+			'v.rowid'=>'Text', 'v.label'=>'Text', 'v.datep'=>'Date', 'v.datev'=>'Date',
+			'v.num_payment'=>'Text', 'v.amount'=>'Numeric', 'v.sens'=>'Numeric',
+			'cp.id'=>'List:c_paiement:code:id:code',
+			"v.accountancy_code"=>"Text", "v.subledger_account"=>"Text",
+			"v.note"=>"Text", 'v.datec'=>"Date",
+			"p.ref"=>"Text", "p.title"=>"Text"
+		);
+		$this->export_entities_array[$r] = array(
+			'v.rowid'=>'payment', 'v.label'=>'payment', 'v.datev'=>'payment', 'v.datep'=>'payment',
+			'v.num_payment'=>'payment', 'v.amount'=>'payment', 'v.sens'=>'payment',
+			'cp.id'=>'payment',
+			'v.accountancy_code'=>'payment', 'v.subledger_account'=>"payment",
+			'v.note'=>"payment", 'v.datec'=>"payment",
+			"p.ref"=>"project", "p.title"=>"project"
+		);
+		$this->export_sql_start[$r] = 'SELECT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'payment_various as v';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."projet as p ON v.fk_projet = p.rowid";
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX."c_paiement as cp ON v.fk_typepayment = cp.id";
+		$this->export_sql_end[$r] .= ' WHERE v.entity IN ('.getEntity('payment_various').')';
+		$this->export_sql_order[$r] = ' ORDER BY v.datep';
 	}
 
 
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 5b645747380..447e3e625ac 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -233,9 +233,7 @@ class modBlockedLog extends DolibarrModules
         if ($b->alreadyUsed(1))
         {
             $res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
-        }
-        else
-        {
+        } else {
             $res = $b->create($user);
         }
         if ($res <= 0) {
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index 7258541a7da..78b4efa1567 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -54,7 +54,7 @@ class modBom extends DolibarrModules
 		// It is used to group modules by family in module setup page
 		$this->family = "products";
 		// Module position in the family on 2 digits ('01', '10', '20', ...)
-		$this->module_position = '60';
+		$this->module_position = '65';
 		// 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")));
 
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index b27a1ae30e4..2863760b138 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -46,12 +46,11 @@ class modCashDesk extends DolibarrModules
 		$this->rights_class = 'cashdesk';
 
 		$this->family = "portal";
-		$this->module_position = '55';
+		$this->module_position = '59';
 		// 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 = "CashDesk module";
 
-		$this->revision = '1.27';
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 4f0c1e04307..29a96c0f03c 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -275,7 +275,7 @@ class modCategorie extends DolibarrModules
 			'p.town' => 'Town',
 			'country.code' => 'CountryCode',
 			'country.label' => 'Country',
-			'p.birthday' => 'DateToBirth',
+			'p.birthday' => 'DateOfBirth',
 			'p.poste' => 'PostOrFunction',
 			'p.phone' => 'Phone',
 			'p.phone_perso' => 'PhonePerso',
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 5c9ca314bef..0da6ac160b8 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2020		Ahmad Jamaly Rabub		<rabib@metroworks.co.jp>
  *
  * 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
@@ -262,6 +263,161 @@ class modCommande extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('commande').')';
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		// Imports
+		//--------
+		$r = 0;
+		//Import Order Header
+
+		$r++;
+		$this->import_code[$r] = 'commande_'.$r;
+		$this->import_label[$r] = 'Sales Orders';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'commande', 'extra' => MAIN_DB_PREFIX.'commande_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author']; // Fields to store import user id
+		$this->import_fields_array[$r] = [
+			'c.ref'               => 'Document Ref*',
+			'c.ref_client'        => 'RefCustomer',
+			'c.fk_soc'            => 'ThirdPartyName*',
+			'c.fk_projet'         => 'ProjectId',
+			'c.date_creation'     => 'DateCreation',
+			'c.date_valid'        => 'DateValid',
+			'c.date_commande'     => 'DateOrder',
+			'c.fk_user_modif'     => 'ModifiedById',
+			'c.fk_user_valid'     => 'ValidatedById',
+			'c.fk_statut'         => 'Status*',
+			'c.remise_percent'    => 'GlobalDiscount',
+			'c.tva'               => 'TotalTVA',
+			'c.total_ht'          => 'TotalHT',
+			'c.total_ttc'         => 'TotalTTC',
+			'c.note_private'      => 'NotePrivate',
+			'c.note_public'       => 'Note',
+			'c.facture'           => 'Invoice(1/0)',
+			'c.date_livraison'    => 'DeliveryDate',
+			'c.fk_cond_reglement' => 'Payment Condition',
+			'c.fk_mode_reglement' => 'Payment Mode',
+			'c.model_pdf'         => 'Model'
+		];
+
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
+			$this->import_fields_array[$r]['c.multicurrency_tx']        = 'CurrencyRate';
+			$this->import_fields_array[$r]['c.multicurrency_total_ht']  = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande'];
+		$this->import_regex_array[$r] = [
+			'c.ref' => '(CPV\d{4}-\d{4}|CO\d{4}-\d{4}|PROV.{1,32}$)',
+			'c.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
+		];
+
+		$this->import_updatekeys_array[$r] = ['c.ref' => 'Ref'];
+		$this->import_convertvalue_array[$r] = [
+			'c.fk_soc' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/societe/class/societe.class.php',
+				'class'   => 'Societe',
+				'method'  => 'fetch',
+				'element' => 'ThirdParty'
+			],
+			'c.fk_user_valid' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/user/class/user.class.php',
+				'class'   => 'User',
+				'method'  => 'fetch',
+				'element' => 'user'
+			],
+			'c.fk_mode_reglement' => [
+				'rule' => 'fetchidfromcodeorlabel',
+				'file' => '/compta/paiement/class/cpaiement.class.php',
+				'class' => 'Cpaiement',
+				'method' => 'fetch',
+				'element' => 'cpayment'
+			],
+		];
+
+		//Import CPV Lines
+		$r++;
+		$this->import_code[$r] = 'commande_lines_'.$r;
+		$this->import_label[$r] = 'Order Details';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commandedet', 'extra' => MAIN_DB_PREFIX.'commandedet_extrafields'];
+		$this->import_fields_array[$r] = [
+			'cd.fk_commande'    => 'Document Ref*',
+			'cd.fk_parent_line' => 'PrParentLine',
+			'cd.fk_product'     => 'IdProduct',
+			'cd.label'          => 'Label',
+			'cd.description'    => 'LineDescription',
+			'cd.tva_tx'         => 'LineVATRate',
+			'cd.qty'            => 'LineQty',
+			'cd.remise_percent' => 'Reduc. Percent',
+			'cd.remise'         => 'Reduc.',
+			'cd.price'          => 'Price',
+			'cd.subprice'       => 'Sub Price',
+			'cd.total_ht'       => 'LineTotalHT',
+			'cd.total_tva'      => 'LineTotalVAT',
+			'cd.total_ttc'      => 'LineTotalTTC',
+			'cd.product_type'   => 'TypeOfLineServiceOrProduct',
+			'cd.date_start'     => 'Start Date',
+			'cd.date_end'       => 'End Date',
+			'cd.buy_price_ht'   => 'LineBuyPriceHT',
+			'cd.rang'           => 'LinePosition'
+		];
+
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commandedet' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commandedet'];
+		$this->import_regex_array[$r] = [
+			'cd.product_type'       => '[0|1]$',
+			'cd.fk_product'         => 'rowid@'.MAIN_DB_PREFIX.'product',
+			'cd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
+		];
+		$this->import_updatekeys_array[$r] = ['cd.fk_commande' => 'Sales Order Id', 'cd.fk_product' => 'Product Id'];
+		$this->import_convertvalue_array[$r] = [
+			'cd.fk_commande' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/commande/class/commande.class.php',
+				'class'   => 'Commande',
+				'method'  => 'fetch',
+				'element' => 'commande'
+			],
+		];
 	}
 
 
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 11c28b17fe8..aebafb5b2d6 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -96,7 +96,7 @@ class modCron extends DolibarrModules
 		// Cronjobs
 		$this->cronjobs = array(
 			0=>array('entity'=>0, 'label'=>'PurgeDeleteTemporaryFilesShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'purgeFiles', 'parameters'=>'', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>2, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>50, 'status'=>1, 'test'=>true),
-			1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>in_array($db->type, array('mysql', 'mysqli'))),
+			1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>in_array($this->db->type, array('mysql', 'mysqli'))),
 			// 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
 		);
 
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index d89aac28e98..349fde7eba7 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -45,7 +45,7 @@ class modDeplacement extends DolibarrModules
 		$this->numero = 75;
 
 		$this->family = "hr";
-		$this->module_position = '41';
+		$this->module_position = '43';
 		// 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 notes de frais et deplacements"; // Si traduction Module75Desc non trouvee
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index ce8ea9436e8..1e00f28d40f 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -52,7 +52,7 @@ class modEmailCollector extends DolibarrModules
 		// 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 = '12';
+		$this->module_position = '23';
 		// 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")));
 
@@ -278,38 +278,70 @@ class modEmailCollector extends DolibarrModules
 
 		$sql = array();
 
-		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity;
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = ".$conf->entity;
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
 				$descriptionA1 = 'This collector will scan your mailbox to find emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated.';
 				$descriptionA1 .= ' If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.';
+
 				$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
 				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Ticket_Requets', 'Example to collect ticket requests', '".$this->db->escape($descriptionA1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
-				$sqlforexampleA2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleA2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
-				$sqlforexampleA3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
-				$sqlforexampleA3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'to', 'support@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
+				$sqlforexampleFilterA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleFilterA2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterA2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleFilterA3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterA3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'to', 'support@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
 				$sqlforexampleA4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleA4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'ticket', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
 				$sql[] = $sqlforexampleA1;
-				$sql[] = $sqlforexampleA2;
-				$sql[] = $sqlforexampleA3;
+				$sql[] = $sqlforexampleFilterA1;
+				$sql[] = $sqlforexampleFilterA2;
+				$sql[] = $sqlforexampleFilterA3;
 				$sql[] = $sqlforexampleA4;
 			}
 		} else dol_print_error($this->db);
 
-		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses' and entity = ".$conf->entity;
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".$conf->entity;
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
-				$descriptionB1 = 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event with the email response will be recorded at the good place (Module Agenda must be enabled). For example, if your send a commercial proposal, order or invoice by email and your customer answers your email, the system will automatically find the answer and add it into your ERP.';
+				$descriptionA1 = 'This collector will scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr.';
+
+				$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
+				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Responses_Out', 'Example to collect answers to emails done from email software', '".$this->db->escape($descriptionA1)."', 'Sent', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+
+				$sqlforexampleFilterA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".$conf->entity."), 'isanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleFilterA2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterA2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".$conf->entity."), 'withouttrackingidinmsgid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleActionA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleActionA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".$conf->entity."), 'recordevent', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
+				$sql[] = $sqlforexampleA1;
+				$sql[] = $sqlforexampleFilterA1;
+				$sql[] = $sqlforexampleFilterA2;
+				$sql[] = $sqlforexampleActionA1;
+			}
+		}
+
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".$conf->entity;
+		$tmpresql = $this->db->query($tmpsql);
+		if ($tmpresql) {
+			if ($this->db->num_rows($tmpresql) == 0) {
+				$descriptionB1 = 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically find the answer and add it into your ERP.';
+
 				$sqlforexampleB1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses', 'Example to collect any email responses', '".$this->db->escape($descriptionB1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses_In', 'Example to collect any input email responses', '".$this->db->escape($descriptionB1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
 				$sqlforexampleB2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleB2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses' and entity = ".$conf->entity."), 'withtrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleB2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".$conf->entity."), 'isanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
 				$sqlforexampleB3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleB3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses' and entity = ".$conf->entity."), 'recordevent', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleB3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".$conf->entity."), 'recordevent', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
 				$sql[] = $sqlforexampleB1;
 				$sql[] = $sqlforexampleB2;
 				$sql[] = $sqlforexampleB3;
@@ -323,17 +355,52 @@ class modEmailCollector extends DolibarrModules
 				$descriptionC1 = "This collector will scan your mailbox to find emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated.";
 				$descriptionC1 .= " If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>";
 				$descriptionC1 .= "Note: With this initial example, the title of the lead is generated including the email. If the thirdparty can't be found in database (new customer), the lead will be attached to the thirdparty with ID 1.";
+
 				$sqlforexampleC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
 				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Leads', 'Example to collect leads', '".$this->db->escape($descriptionC1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
-				$sqlforexampleC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
-				$sqlforexampleC3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
-				$sqlforexampleC3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity."), 'to', 'sales@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
+				$sqlforexampleFilterC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterC1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleFilterC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleFilterC3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterC3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity."), 'to', 'sales@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
 				$sqlforexampleC4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, actionparam, date_creation, fk_user_creat, status)";
 				$sqlforexampleC4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity."), 'project', 'tmp_from=EXTRACT:HEADER:^From:(.*);socid=SETIFEMPTY:1;usage_opportunity=SET:1;description=EXTRACT:BODY:(.*);title=SET:Lead or message from __tmp_from__ received by email', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
 				$sql[] = $sqlforexampleC1;
-				$sql[] = $sqlforexampleC2;
-				$sql[] = $sqlforexampleC3;
+				$sql[] = $sqlforexampleFilterC1;
+				$sql[] = $sqlforexampleFilterC2;
+				$sql[] = $sqlforexampleFilterC3;
+				$sql[] = $sqlforexampleC4;
+			}
+		} else dol_print_error($this->db);
+
+		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".$conf->entity;
+		$tmpresql = $this->db->query($tmpsql);
+		if ($tmpresql) {
+			if ($this->db->num_rows($tmpresql) == 0) {
+				$descriptionC1 = "This collector will scan your mailbox to find emails send for a recruitment (Module Recruitment must be enabled). You can complete this collector if you want to automaticallycreate a candidature for a job request.";
+				$descriptionC1 .= "Note: With this initial example, the title of the candidature is generated including the email.";
+
+				$sqlforexampleC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
+				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Candidatures', 'Example to collect email for job candidatures', '".$this->db->escape($descriptionC1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".$user->id.", 0)";
+
+				$sqlforexampleFilterC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterC1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".$conf->entity."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleFilterC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+				$sqlforexampleFilterC3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterC3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".$conf->entity."), 'to', 'jobs@example.com', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
+				$sqlforexampleC4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, actionparam, date_creation, fk_user_creat, status)";
+				$sqlforexampleC4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".$conf->entity."), 'candidature', 'tmp_from=EXTRACT:HEADER:^From:(.*)(<.*>)?;fk_recruitmentjobposition=EXTRACT:HEADER:^To:[^\n]*\+([^\n]*);description=EXTRACT:BODY:(.*);lastname=SET:__tmp_from__', '".$this->db->idate(dol_now())."', ".$user->id.", 1)";
+
+				$sql[] = $sqlforexampleC1;
+				$sql[] = $sqlforexampleFilterC1;
+				$sql[] = $sqlforexampleFilterC2;
+				$sql[] = $sqlforexampleFilterC3;
 				$sql[] = $sqlforexampleC4;
 			}
 		} else dol_print_error($this->db);
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index b65c4fd956b..71b66925922 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2013-2015 Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2020      Ahmad Jamaly Rabib   <rabib@metroworks.co.jp>
  *
  * 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
@@ -62,12 +63,12 @@ class modFournisseur extends DolibarrModules
 
 		// Data directories to create when module is enabled
 		$this->dirs = array(
-            "/fournisseur/temp",
-            "/fournisseur/commande",
-            "/fournisseur/commande/temp",
-            "/fournisseur/facture",
-            "/fournisseur/facture/temp"
-        );
+			"/fournisseur/temp",
+			"/fournisseur/commande",
+			"/fournisseur/commande/temp",
+			"/fournisseur/facture",
+			"/fournisseur/facture/temp"
+		);
 
 		// Dependencies
 		$this->depends = array("modSociete");
@@ -120,13 +121,13 @@ class modFournisseur extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-		0=>array('file'=>'box_graph_invoices_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
-		1=>array('file'=>'box_graph_orders_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
-		2=>array('file'=>'box_fournisseurs.php', 'enabledbydefaulton'=>'Home'),
-		3=>array('file'=>'box_factures_fourn_imp.php', 'enabledbydefaulton'=>'Home'),
-		4=>array('file'=>'box_factures_fourn.php', 'enabledbydefaulton'=>'Home'),
-		5=>array('file'=>'box_supplier_orders.php', 'enabledbydefaulton'=>'Home'),
-		6=>array('file'=>'box_supplier_orders_awaiting_reception.php', 'enabledbydefaulton'=>'Home'),
+			0=>array('file'=>'box_graph_invoices_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_graph_orders_supplier_permonth.php', 'enabledbydefaulton'=>'Home'),
+			2=>array('file'=>'box_fournisseurs.php', 'enabledbydefaulton'=>'Home'),
+			3=>array('file'=>'box_factures_fourn_imp.php', 'enabledbydefaulton'=>'Home'),
+			4=>array('file'=>'box_factures_fourn.php', 'enabledbydefaulton'=>'Home'),
+			5=>array('file'=>'box_supplier_orders.php', 'enabledbydefaulton'=>'Home'),
+			6=>array('file'=>'box_supplier_orders_awaiting_reception.php', 'enabledbydefaulton'=>'Home'),
 		);
 
 		// Permissions
@@ -190,12 +191,12 @@ class modFournisseur extends DolibarrModules
 		$this->rights[$r][5] = 'receptionner';
 
 		$r++;
-        $this->rights[$r][0] = 1189;
-        $this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
-        $this->rights[$r][2] = 'w';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'commande_advance';
-        $this->rights[$r][5] = 'check';
+		$this->rights[$r][0] = 1189;
+		$this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande_advance';
+		$this->rights[$r][5] = 'check';
 
 		$r++;
 		$this->rights[$r][0] = 1188;
@@ -273,9 +274,9 @@ class modFournisseur 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
@@ -298,7 +299,7 @@ class modFournisseur extends DolibarrModules
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'p.accountancy_code_buy'=>'ProductAccountancyBuyCode', 'project.rowid'=>'ProjectId',
 			'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -433,7 +434,7 @@ class modFournisseur extends DolibarrModules
 			'f.fk_statut'=>'InvoiceStatus', 'f.note_public'=>"InvoiceNote", 'p.rowid'=>'PaymentId', 'pf.amount'=>'AmountPayment',
 			'p.datep'=>'DatePayment', 'p.num_paiement'=>'PaymentNumber', 'p.fk_bank'=>'IdTransaction', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -459,7 +460,7 @@ class modFournisseur extends DolibarrModules
 			's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company', 's.tva_intra'=>'company',
 			'f.rowid'=>"invoice", 'f.ref'=>"invoice", 'f.ref_supplier'=>"invoice", 'f.datec'=>"invoice", 'f.datef'=>"invoice", 'f.total_ht'=>"invoice",
 			'f.total_ttc'=>"invoice", 'f.total_tva'=>"invoice", 'f.paye'=>"invoice", 'f.fk_statut'=>'invoice', 'f.note_public'=>"invoice", 'p.rowid'=>'payment', 'pf.amount'=>'payment',
-		    'p.datep'=>'payment', 'p.num_paiement'=>'payment', 'p.fk_bank'=>'account', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project');
+			'p.datep'=>'payment', 'p.num_paiement'=>'payment', 'p.fk_bank'=>'account', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project');
 		$this->export_dependencies_array[$r] = array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
@@ -508,7 +509,7 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
-        $this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
+		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 
 		// Order
@@ -527,7 +528,7 @@ class modFournisseur extends DolibarrModules
 			'fd.total_tva'=>"LineTotalVAT", 'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'RefSupplier', 'fd.fk_product'=>'ProductId',
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -650,6 +651,334 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_order').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+
+		//Import Supplier Invoice
+		//--------
+		$r = 0;
+
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Supplier Invoice"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = ['f' => MAIN_DB_PREFIX.'facture_fourn', 'extra' => MAIN_DB_PREFIX.'facture_fourn_extrafields'];
+		$this->import_tables_creator_array[$r] = ['f' => 'fk_user_author']; // Fields to store import user id
+		$this->import_fields_array[$r] = [
+			'f.ref' => 'InvoiceRef*',
+			'f.ref_supplier' => 'RefSupplier',
+			'f.type' => 'Type*',
+			'f.fk_soc' => 'Supplier/Vendor*',
+			'f.datec' => 'InvoiceDateCreation',
+			'f.datef' => 'DateInvoice',
+			'f.date_lim_reglement' => 'DateMaxPayment',
+			'f.total_ht' => 'TotalHT',
+			'f.total_ttc' => 'TotalTTC',
+			'f.total_tva' => 'TotalVAT',
+			'f.paye' => 'InvoicePaid',
+			'f.fk_statut' => 'InvoiceStatus',
+			'f.fk_user_modif' => 'Modifier Id',
+			'f.fk_user_valid' => 'Validator Id',
+			'f.fk_facture_source' => 'Invoice Source Id',
+			'f.fk_projet' => 'Project Id',
+			'f.fk_account' => 'Bank Account*',
+			'f.note_public' => 'InvoiceNote',
+			'f.note_private' => 'NotePrivate',
+			'f.fk_cond_reglement' => 'Payment Condition',
+			'f.fk_mode_reglement' => 'Payment Mode',
+			'f.model_pdf' => 'Model',
+			'f.date_valid' => 'Validation Date'
+		];
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['f.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn'];
+		$this->import_regex_array[$r] = ['f.ref' => '(SI\d{4}-\d{4}|PROV.{1,32}$)', 'f.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'];
+		$import_sample = [
+			'f.ref' => '(PROV001)',
+			'f.ref_supplier' => 'Supplier1',
+			'f.type' => '0',
+			'f.fk_soc' => 'Vendor1',
+			'f.datec' => '2021-01-01',
+			'f.datef' => '',
+			'f.date_lim_reglement' => '2021-01-30',
+			'f.total_ht' => '1000',
+			'f.total_ttc' => '1000',
+			'f.total_tva' => '0',
+			'f.paye' => '0',
+			'f.fk_statut' => '0',
+			'f.fk_user_modif' => '',
+			'f.fk_user_valid' => '',
+			'f.fk_facture_source' => '',
+			'f.fk_projet' => '',
+			'f.fk_account' => 'BANK1',
+			'f.note_public' => 'Note: ',
+			'f.note_private' => '',
+			'f.fk_cond_reglement' => '1',
+			'f.fk_mode_reglement' => '2',
+			'f.model_pdf' => 'crab',
+			'f.date_valid' => '',
+			'f.multicurrency_code' => 'USD',
+			'f.multicurrency_tx' => '1',
+			'f.multicurrency_total_ht' => '1000',
+			'f.multicurrency_total_tva' => '0',
+			'f.multicurrency_total_ttc' => '1000'
+		];
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = ['f.ref' => 'Ref'];
+		$this->import_convertvalue_array[$r] = [
+			//'c.ref'=>array('rule'=>'getrefifauto'),
+			'f.fk_soc' => ['rule' => 'fetchidfromref', 'file' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'],
+			'f.fk_account' => ['rule' => 'fetchidfromref', 'file' => '/compta/bank/class/account.class.php', 'class' => 'Account', 'method' => 'fetch', 'element' => 'bank_account'],
+		];
+
+		//Import Supplier Invoice Lines
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Supplier Invoice Lines"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = ['fd' => MAIN_DB_PREFIX.'facture_fourn_det', 'extra' => MAIN_DB_PREFIX.'facture_fourn_det_extrafields'];
+		$this->import_fields_array[$r] = [
+			'fd.fk_facture_fourn' => 'InvoiceRef*',
+			'fd.fk_parent_line' => 'FacParentLine',
+			'fd.fk_product' => 'IdProduct',
+			'fd.label' => 'Label',
+			'fd.description' => 'LineDescription',
+			'fd.pu_ht' => 'PriceUHT',
+			'fd.pu_ttc' => 'PriceUTTC',
+			'fd.qty' => 'LineQty',
+			'fd.remise_percent' => 'Reduc.',
+			'fd.vat_src_code' => 'Vat Source Code',
+			'fd.product_type' => 'TypeOfLineServiceOrProduct',
+			'fd.tva_tx' => 'LineVATRate',
+			'fd.total_ht' => 'LineTotalHT',
+			'fd.tva' => 'LineTotalVAT',
+			'fd.total_ttc' => 'LineTotalTTC',
+			'fd.date_start' => 'Start Date',
+			'fd.date_end' => 'End Date',
+			'fd.fk_unit' => 'Unit'
+		];
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['fd.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['fd.multicurrency_subprice'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['fd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['fd.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['fd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn_det'];
+		$this->import_regex_array[$r] = ['fd.product_type' => '[0|1]$', 'fd.fk_product' => 'rowid@'.MAIN_DB_PREFIX.'product', 'fd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'];
+		$import_sample = [
+			'fd.fk_facture_fourn' => '(PROV001)',
+			'fd.fk_parent_line' => '',
+			'fd.fk_product' => '',
+			'fd.label' => '',
+			'fd.description' => 'Test Product',
+			'fd.pu_ht' => '50000',
+			'fd.pu_ttc' => '50000',
+			'fd.qty' => '1',
+			'fd.remise_percent' => '0',
+			'fd.vat_src_code' => '',
+			'fd.product_type' => '0',
+			'fd.tva_tx' => '0',
+			'fd.total_ht' => '50000',
+			'fd.tva' => '0',
+			'fd.total_ttc' => '50000',
+			'fd.date_start' => '',
+			'fd.date_end' => '',
+			'fd.fk_unit' => '',
+			'fd.multicurrency_code' => 'USD',
+			'fd.multicurrency_tx' => '0',
+			'fd.multicurrency_total_ht' => '50000',
+			'fd.multicurrency_total_tva' => '0',
+			'fd.multicurrency_total_ttc' => '50000'
+		];
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = ['fd.rowid' => 'Row Id', 'fd.fk_facture_fourn' => 'Invoice Id', 'fd.fk_product' => 'Product Id'];
+		$this->import_convertvalue_array[$r] = [
+			'fd.fk_facture_fourn' => ['rule' => 'fetchidfromref', 'file' => '/fourn/class/fournisseur.facture.class.php', 'class' => 'FactureFournisseur', 'method' => 'fetch'],
+		];
+
+		//Import Purchase Orders
+		$r++;
+		$this->import_code[$r] = 'commande_fournisseur_' . $r;
+		$this->import_label[$r] = 'Purchase Orders';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX . 'commande_fournisseur', 'extra' => MAIN_DB_PREFIX . 'commande_fournisseur_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author'];	// Fields to store import user id
+		$this->import_fields_array[$r] = [
+			'c.ref'               => 'Document Ref*',
+			'c.ref_supplier'      => 'RefSupplier',
+			'c.fk_soc'            => 'ThirdPartyName*',
+			'c.fk_projet'         => 'ProjectId',
+			'c.date_creation'     => 'DateCreation',
+			'c.date_valid'        => 'DateValid',
+			'c.date_approve'      => 'DateApprove',
+			'c.date_commande'     => 'DateOrder',
+			'c.fk_user_modif'     => 'ModifiedById',
+			'c.fk_user_valid'     => 'ValidatedById',
+			'c.fk_user_approve'   => 'ApprovedById',
+			'c.source'            => 'Source',
+			'c.fk_statut'         => 'Status*',
+			'c.billed'            => 'Billed(0/1)',
+			'c.remise_percent'    => 'GlobalDiscount',
+			'c.tva'               => 'TotalTVA',
+			'c.total_ht'          => 'TotalHT',
+			'c.total_ttc'         => 'TotalTTC',
+			'c.note_private'      => 'NotePrivate',
+			'c.note_public'       => 'Note',
+			'c.date_livraison'    => 'DeliveryDate',
+			'c.fk_cond_reglement' => 'Payment Condition',
+			'c.fk_mode_reglement' => 'Payment Mode',
+			'c.model_pdf'         => 'Model'
+		];
+
+		if (! empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
+			$this->import_fields_array[$r]['c.multicurrency_tx']        = 'CurrencyRate';
+			$this->import_fields_array[$r]['c.multicurrency_total_ht']  = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'commande_fournisseur' AND entity IN (0, " . $conf->entity . ")";
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.' . $obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'commande_fournisseur'];
+		$this->import_regex_array[$r] = [
+			'c.ref' => '(PO\d{4}-\d{4}|PORDER.{1,32}$|PROV.{1,32}$)',
+			'c.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'
+		];
+
+		$this->import_updatekeys_array[$r] = ['c.ref' => 'Ref'];
+		$this->import_convertvalue_array[$r] = [
+			'c.fk_soc' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/societe/class/societe.class.php',
+				'class'   => 'Societe',
+				'method'  => 'fetch',
+				'element' => 'ThirdParty'
+			],
+			'c.fk_mode_reglement' => [
+				'rule' => 'fetchidfromcodeorlabel',
+				'file' => '/compta/paiement/class/cpaiement.class.php',
+				'class' => 'Cpaiement',
+				'method' => 'fetch',
+				'element' => 'cpayment'
+			],
+			'c.source' => ['rule' => 'zeroifnull'],
+		];
+
+		//Import PO Lines
+		$r++;
+		$this->import_code[$r] = 'commande_fournisseurdet_'.$r;
+		$this->import_label[$r] = 'PO Lines';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX . 'commande_fournisseurdet', 'extra' => MAIN_DB_PREFIX . 'commande_fournisseurdet_extrafields'];
+		$this->import_fields_array[$r] = [
+			'cd.fk_commande'    => 'Document Ref*',
+			'cd.fk_parent_line' => 'PrParentLine',
+			'cd.fk_product'     => 'IdProduct',
+			'cd.label'          => 'Label',
+			'cd.description'    => 'LineDescription',
+			'cd.tva_tx'         => 'LineVATRate',
+			'cd.qty'            => 'LineQty',
+			'cd.remise_percent' => 'Reduc. Percent',
+			'cd.remise'         => 'Reduc.',
+			'cd.subprice'       => 'Sub Price',
+			'cd.total_ht'       => 'LineTotalHT',
+			'cd.total_tva'      => 'LineTotalVAT',
+			'cd.total_ttc'      => 'LineTotalTTC',
+			'cd.product_type'   => 'TypeOfLineServiceOrProduct',
+			'cd.date_start'     => 'Start Date',
+			'cd.date_end'       => 'End Date',
+			'cd.info_bits'      => 'InfoBits',
+			'cd.special_code'   => 'Special Code',
+			'cd.rang'           => 'LinePosition',
+			'cd.fk_unit'        => 'Unit'
+		];
+
+		if (! empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$sql="SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'commande_fournisseurdet' AND entity IN (0, " . $conf->entity . ")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.' . $obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'commande_fournisseurdet'];
+		$this->import_regex_array[$r] = [
+			'cd.product_type'       => '[0|1]$',
+			'cd.fk_product'         => 'rowid@' . MAIN_DB_PREFIX . 'product',
+			'cd.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'
+		];
+		$this->import_updatekeys_array[$r] = ['cd.fk_commande' => 'Purchase Order Id'];
+		$this->import_convertvalue_array[$r] = [
+			'cd.fk_commande' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/fourn/class/fournisseur.commande.class.php',
+				'class'   => 'CommandeFournisseur',
+				'method'  => 'fetch',
+				'element' => 'order_supplier'
+			],
+			'cd.info_bits' => ['rule' => 'zeroifnull'],
+			'cd.special_code' => ['rule' => 'zeroifnull'],
+		];
 	}
 
 
@@ -658,7 +987,7 @@ class modFournisseur extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 30618c7ae5a..484564b7066 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -43,6 +43,7 @@ class modHRM extends DolibarrModules
 		$this->rights_class = 'hrm';
 
 		$this->family = "hr";
+		$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 = "Management of employees carrier and feelings (department, employment contract)";
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 6673f55711c..a146a855ccb 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -177,7 +177,7 @@ class modHoliday extends DolibarrModules
 		$this->rights[$r][0] = 20005; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/modify leave requests for everybody'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'writeall_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index ae475836bb5..3f410a1e3f2 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -48,7 +48,7 @@ class modMailing extends DolibarrModules
 		// 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 = '11';
+		$this->module_position = '22';
 
 		// 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));
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index 73df7523843..012bb2d576a 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -33,155 +33,155 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modMrp extends DolibarrModules
 {
-    /**
-     * Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
-        $this->db = $db;
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 660;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'mrp';
-        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-        // It is used to group modules by family in module setup page
-        $this->family = "products";
-        // Module position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '62';
-        // Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-        // Module label (no space allowed), used if translation string 'ModuleMrpName' not found (Mrp is name of module).
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleMrpDesc' not found (Mrp is name of module).
-        $this->description = "Module to Manage Manufacturing Orders (MO)";
-        // Used only if file README.md and README-LL.md not found.
-        $this->descriptionlong = "Module to Manage Manufacturing Orders (MO)";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-        $this->version = 'dolibarr';
-        // Url to the file with your last numberversion of this module
-        //$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 660;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'mrp';
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "products";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '66';
+		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuleMrpName' not found (Mrp is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleMrpDesc' not found (Mrp is name of module).
+		$this->description = "Module to Manage Manufacturing Orders (MO)";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "Module to Manage Manufacturing Orders (MO)";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'dolibarr';
+		// Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 
-        // Key used in llx_const table to save module status enabled/disabled (where MRP is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'mrp';
-        // Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory (core/triggers)
-            'triggers' => 0,
-            // Set this to 1 if module has its own login method file (core/login)
-            'login' => 0,
-            // Set this to 1 if module has its own substitution function file (core/substitutions)
-            'substitutions' => 0,
-            // Set this to 1 if module has its own menus handler directory (core/menus)
-            'menus' => 0,
-            // Set this to 1 if module overwrite template dir (core/tpl)
-            'tpl' => 0,
-            // Set this to 1 if module has its own barcode directory (core/modules/barcode)
-            'barcode' => 0,
-            // Set this to 1 if module has its own models directory (core/modules/xxx)
-            'models' => 0,
-            // Set this to 1 if module has its own theme directory (theme)
-            'theme' => 0,
-            // Set this to relative path of css file if module has its own css file
-            'css' => array(
-                //    '/mrp/css/mrp.css.php',
-            ),
-            // Set this to relative path of js file if module must load a js on all pages
-            'js' => array(
-                //   '/mrp/js/mrp.js.php',
-            ),
-            // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
-            'hooks' => array(
-                //   'data' => array(
-                //       'hookcontext1',
-                //       'hookcontext2',
-                //   ),
-                //   'entity' => '0',
-            ),
-            // Set this to 1 if features of module are opened to external users
-            'moduleforexternal' => 0,
-        );
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/mrp/temp","/mrp/subdir");
-        $this->dirs = array("/mrp/temp");
-        // Config pages. Put here list of php page, stored into mrp/admin directory, to use to setup module.
-        $this->config_page_url = array("mrp.php");
-        // Dependencies
-        // A condition to hide module
-        $this->hidden = false;
-        // List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
-        $this->depends = array('modBom');
-        $this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
-        $this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
-        $this->langfiles = array("mrp");
-        $this->phpmin = array(5, 5); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(8, 0); // Minimum version of Dolibarr required by module
-        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        //$this->automatic_activation = array('FR'=>'MrpWasAutomaticallyActivatedBecauseOfYourCountryChoice');
-        //$this->always_enabled = true;								// If true, can't be disabled
+		// Key used in llx_const table to save module status enabled/disabled (where MRP is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'mrp';
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 0,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 0,
+			// Set this to 1 if module has its own theme directory (theme)
+			'theme' => 0,
+			// Set this to relative path of css file if module has its own css file
+			'css' => array(
+				//    '/mrp/css/mrp.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/mrp/js/mrp.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if features of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/mrp/temp","/mrp/subdir");
+		$this->dirs = array("/mrp/temp");
+		// Config pages. Put here list of php page, stored into mrp/admin directory, to use to setup module.
+		$this->config_page_url = array("mrp.php");
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array('modBom');
+		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+		$this->langfiles = array("mrp");
+		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(8, 0); // Minimum version of Dolibarr required by module
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		//$this->automatic_activation = array('FR'=>'MrpWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
 
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(1 => array('MRP_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
-        //                             2 => array('MRP_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
-        // );
-        $this->const = array(
-        	1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of MO', 0),
-        	2=>array('MRP_MO_ADDON', 'chaine', 'mod_mo_standard', 'Name of numbering rules of MO', 0),
-        	3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/mrps', '', 0)
-        );
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('MRP_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('MRP_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array(
+			1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of MO', 0),
+			2=>array('MRP_MO_ADDON', 'chaine', 'mod_mo_standard', 'Name of numbering rules of MO', 0),
+			3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/mrps', '', 0)
+		);
 
-        // Some keys to add into the overwriting translation tables
-        /*$this->overwrite_translation = array(
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
             'en_US:ParentCompany'=>'Parent company or reseller',
             'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
         )*/
 
-        if (!isset($conf->mrp) || !isset($conf->mrp->enabled)) {
-            $conf->mrp = new stdClass();
-            $conf->mrp->enabled = 0;
-        }
+		if (!isset($conf->mrp) || !isset($conf->mrp->enabled)) {
+			$conf->mrp = new stdClass();
+			$conf->mrp->enabled = 0;
+		}
 
-        // Array to add new pages in new tabs
-        $this->tabs = array();
-        // Example:
-        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@mrp:$user->rights->mrp->read:/mrp/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mrp:$user->rights->othermodule->read:/mrp/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-        //
-        // Where objecttype can be
-        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-        // 'contact'          to add a tab in contact view
-        // 'contract'         to add a tab in contract view
-        // 'group'            to add a tab in group view
-        // 'intervention'     to add a tab in intervention view
-        // 'invoice'          to add a tab in customer invoice view
-        // 'invoice_supplier' to add a tab in supplier invoice view
-        // 'member'           to add a tab in fundation member view
-        // 'opensurveypoll'	  to add a tab in opensurvey poll view
-        // 'order'            to add a tab in customer order view
-        // 'order_supplier'   to add a tab in supplier order view
-        // 'payment'		  to add a tab in payment view
-        // 'payment_supplier' to add a tab in supplier payment view
-        // 'product'          to add a tab in product view
-        // 'propal'           to add a tab in propal view
-        // 'project'          to add a tab in project view
-        // 'stock'            to add a tab in stock view
-        // 'thirdparty'       to add a tab in third party view
-        // 'user'             to add a tab in user view
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@mrp:$user->rights->mrp->read:/mrp/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mrp:$user->rights->othermodule->read:/mrp/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
 
-        // Dictionaries
-        $this->dictionaries = array();
-        /* Example:
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@mrp',
             // List of tables we want to see into dictonnary editor
@@ -205,68 +205,68 @@ class modMrp extends DolibarrModules
         );
         */
 
-        // Boxes/Widgets
-        // Add here list of php file(s) stored in mrp/core/boxes that contains a class to show a widget.
-        $this->boxes = array(
-            0 => array('file' => 'box_mos.php', 'note' => '', 'enabledbydefaulton' => 'Home')
-        );
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in mrp/core/boxes that contains a class to show a widget.
+		$this->boxes = array(
+			0 => array('file' => 'box_mos.php', 'note' => '', 'enabledbydefaulton' => 'Home')
+		);
 
-        // Cronjobs (List of cron jobs entries to add when module is enabled)
-        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-        $this->cronjobs = array(
-            //  0 => array(
-            //      'label' => 'MyJob label',
-            //      'jobtype' => 'method',
-            //      'class' => '/mrp/class/mo.class.php',
-            //      'objectname' => 'Mo',
-            //      'method' => 'doScheduledJob',
-            //      'parameters' => '',
-            //      'comment' => 'Comment',
-            //      'frequency' => 2,
-            //      'unitfrequency' => 3600,
-            //      'status' => 0,
-            //      'test' => '$conf->mrp->enabled',
-            //      'priority' => 50,
-            //  ),
-        );
-        // Example: $this->cronjobs=array(
-        //    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50),
-        //    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50)
-        // );
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			//  0 => array(
+			//      'label' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/mrp/class/mo.class.php',
+			//      'objectname' => 'Mo',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->mrp->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50)
+		// );
 
-        // Permissions provided by this module
-        $this->rights = array();
-        $r = 0;
-        // Add here entries to declare new permissions
-        /* BEGIN MODULEBUILDER PERMISSIONS */
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Read Manufacturing Order'; // Permission label
-        $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Create/Update Manufacturing Order'; // Permission label
-        $this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Delete Manufacturing Order'; // Permission label
-        $this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $r++;
-        /* END MODULEBUILDER PERMISSIONS */
+		// Permissions provided by this module
+		$this->rights = array();
+		$r = 0;
+		// Add here entries to declare new permissions
+		/* BEGIN MODULEBUILDER PERMISSIONS */
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read Manufacturing Order'; // Permission label
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update Manufacturing Order'; // Permission label
+		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete Manufacturing Order'; // Permission label
+		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$r++;
+		/* END MODULEBUILDER PERMISSIONS */
 
-        // Main menu entries to add
-        $this->menu = array();
-        $r = 0;
-        // Add here entries to declare new menus
-        /* BEGIN MODULEBUILDER TOPMENU */
+		// Main menu entries to add
+		$this->menu = array();
+		$r = 0;
+		// Add here entries to declare new menus
+		/* BEGIN MODULEBUILDER TOPMENU */
 		/* END MODULEBUILDER LEFTMENU MO */
 
-        // Exports profiles provided by this module
-        $r = 1;
-        /* BEGIN MODULEBUILDER EXPORT MO */
-        /*
+		// Exports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER EXPORT MO */
+		/*
         $langs->load("mrp");
         $this->export_code[$r]=$this->rights_class.'_'.$r;
         $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
@@ -281,12 +281,12 @@ class modMrp extends DolibarrModules
         $this->export_sql_end[$r] .=' WHERE 1 = 1';
         $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
         $r++; */
-        /* END MODULEBUILDER EXPORT MO */
+		/* END MODULEBUILDER EXPORT MO */
 
-        // Imports profiles provided by this module
-        $r = 1;
-        /* BEGIN MODULEBUILDER IMPORT MO */
-        /*
+		// Imports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER IMPORT MO */
+		/*
          $langs->load("mrp");
          $this->export_code[$r]=$this->rights_class.'_'.$r;
          $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
@@ -301,75 +301,75 @@ class modMrp extends DolibarrModules
          $this->export_sql_end[$r] .=' WHERE 1 = 1';
          $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
          $r++; */
-        /* END MODULEBUILDER IMPORT MO */
-    }
+		/* END MODULEBUILDER IMPORT MO */
+	}
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string  $options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-    	global $conf, $langs;
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
 
-        $result = $this->_load_tables('/mrp/sql/');
-        if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		$result = $this->_load_tables('/mrp/sql/');
+		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
 
-        // Create extrafields during init
-        //include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        //$extrafields = new ExtraFields($this->db);
-        //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		// Create extrafields during init
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        // ODT template
-        $src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mrps/template_mo.odt';
-        $dirodt = DOL_DATA_ROOT.'/doctemplates/mrps';
-        $dest = $dirodt.'/template_mo.odt';
+		// ODT template
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mrps/template_mo.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/mrps';
+		$dest = $dirodt.'/template_mo.odt';
 
-        if (file_exists($src) && !file_exists($dest))
-        {
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	dol_mkdir($dirodt);
-        	$result = dol_copy($src, $dest, 0, 0);
-        	if ($result < 0)
-        	{
-        		$langs->load("errors");
-        		$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
-        		return 0;
-        	}
-        }
+		if (file_exists($src) && !file_exists($dest))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result = dol_copy($src, $dest, 0, 0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+				return 0;
+			}
+		}
 
-        $sql = array(
-        	//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".$conf->entity,
-        	//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".$conf->entity.")"
-        );
+		$sql = array(
+			//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".$conf->entity,
+			//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".$conf->entity.")"
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     *  Function called when module is disabled.
-     *  Remove from database constants, boxes and permissions from Dolibarr database.
-     *  Data directories are not deleted
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        $sql = array();
-        return $this->_remove($sql, $options);
-    }
+	/**
+	 *  Function called when module is disabled.
+	 *  Remove from database constants, boxes and permissions from Dolibarr database.
+	 *  Data directories are not deleted
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+		return $this->_remove($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 165cb9d5858..1c1774c83fd 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -64,7 +64,7 @@ class modOpenSurvey extends DolibarrModules
 		// 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 = '^date@opensurvey';
+		$this->picto = 'poll';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();
diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php
index 2a1686bd1c3..9ea1bf00f29 100644
--- a/htdocs/core/modules/modPaymentByBankTransfer.class.php
+++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php
@@ -54,7 +54,7 @@ class modPaymentByBankTransfer extends DolibarrModules
 		$this->description = "Management of payment by bank transfer";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'experimental';
+		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of png file (without png) used for this module
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 87f11decb5e..e1a1a51160a 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -51,7 +51,7 @@ class modProduct extends DolibarrModules
 		$this->numero = 50;
 
 		$this->family = "products";
-		$this->module_position = '25';
+		$this->module_position = '26';
 		// 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 = "Product management";
@@ -132,26 +132,26 @@ class modProduct 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] = 'supprimer';
-        $r++;
+		$r++;
 
 		$this->rights[$r][0] = 38; // Must be same permission than in service module
 		$this->rights[$r][1] = 'Export products';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'export';
-        $r++;
+		$r++;
 
 		$this->rights[$r][0] = 39;
 		$this->rights[$r][1] = 'Ignore minimum price';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'ignore_price_min_advance';
-        $r++;
+		$r++;
 
-        // Menus
-        //-------
+		// Menus
+		//-------
 
-        $this->menu = 1; // This module adds menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module adds menu entries. They are coded into menu manager.
 		/* We can't enable this here because it must be enabled in both product and service module and this creates duplicate inserts
 		$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
@@ -167,6 +167,9 @@ class modProduct extends DolibarrModules
 		$r++;
 		*/
 
+		$usenpr = 0;
+		if (is_object($mysoc)) $usenpr = $mysoc->useNPR();
+
 		// Exports
 		//--------
 		$r = 0;
@@ -192,9 +195,9 @@ class modProduct extends DolibarrModules
 			'p.tva_tx'=>'VATRate',
 			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
 		);
-		if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
+		if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
 		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice'));
-		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->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('e.ref'=>'DefaultWarehouse', 'p.tobatch'=>'ManageLotSerial', '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'));
 		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -216,7 +219,7 @@ class modProduct extends DolibarrModules
 			'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric',
 			'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->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('e.ref'=>'Text', 'p.tobatch'=>'Numeric', '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'));
 		if (!empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom'=>'Text', 'pf.ref_fourn'=>'Text', 'pf.unitprice'=>'Numeric', 'pf.quantity'=>'Numeric', 'pf.remise_percent'=>'Numeric', 'pf.delivery_time_days'=>'Numeric'));
 		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang'=>'Text', 'l.label'=>'Text', 'l.description'=>'Text', 'l.note'=>'Text'));
@@ -239,6 +242,7 @@ class modProduct 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';
+		if (!empty($conf->stock->enabled)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON e.rowid = p.fk_default_warehouse';
 		$this->export_sql_end[$r] .= ' WHERE p.fk_product_type = 0 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"
 
@@ -255,7 +259,7 @@ class modProduct extends DolibarrModules
 				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 				'pr.tva_tx'=>'PriceLevelVATRate',
 				'pr.date_price'=>'DateCreation');
-			if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+			if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
 			//$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_buy'=>"Text",
 			//	'p.note'=>"Text",'p.length'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text',
@@ -277,90 +281,90 @@ class modProduct 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) && $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(
+			$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.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(
+			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.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(
+			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.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';
+			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';
 		}
 
 		// Imports
@@ -377,34 +381,34 @@ class modProduct extends DolibarrModules
 		$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.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.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.weight_units' => "WeightUnits",
+			'p.length' => "Length",
 			'p.length_units' => "LengthUnits",
-            'p.width' => "Width",
+			'p.width' => "Width",
 			'p.width_units' => "WidthUnits",
-            'p.height' => "Height",
-            'p.height_units' => "HeightUnits",
-            'p.surface' => "Surface",
-            'p.surface_units' => "SurfaceUnits",
-            'p.volume' => "Volume",
+			'p.height' => "Height",
+			'p.height_units' => "HeightUnits",
+			'p.surface' => "Surface",
+			'p.surface_units' => "SurfaceUnits",
+			'p.volume' => "Volume",
 			'p.volume_units' => "VolumeUnits",
 			'p.duration' => "Duration", //duration of service
 			'p.finished' => 'Nature',
@@ -417,17 +421,10 @@ class modProduct extends DolibarrModules
 			'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
-            ));
-        }
 
-        $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
+		$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',
@@ -474,109 +471,135 @@ class modProduct extends DolibarrModules
 						'units' => 'volume',
 						'dict' => 'DictionaryMeasuringUnits'
 				),
-                'p.fk_country' => array(
-                    'rule' => 'fetchidfromcodeid',
-                    'classfile' => '/core/class/ccountry.class.php',
-                    'class' => 'Ccountry',
-                    'method' => 'fetch',
-                    'dict' => 'DictionaryCountry'
-                )
+				'p.fk_country' => array(
+					'rule' => 'fetchidfromcodeid',
+					'classfile' => '/core/class/ccountry.class.php',
+					'class' => 'Ccountry',
+					'method' => 'fetch',
+					'dict' => 'DictionaryCountry'
+				)
 		);
 
+		$this->import_regex_array[$r] = array(
+			'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.recuperableonly' => '^[0|1]$',
+			'p.finished' => '^[0|1]$'
+		);
+
+		if (!empty($conf->stock->enabled)) {//if Stock module enabled
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
+				'p.fk_default_warehouse'=>'DefaultWarehouse',
+				'p.tobatch'=>'ManageLotSerial',
+				'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_regex_array[$r] = array_merge($this->import_regex_array[$r], array(
+				'p.tobatch' => '^[0|1]$'
+			));
+
+			$this->import_convertvalue_array[$r] = array_merge($this->import_convertvalue_array[$r], array(
+					'p.fk_default_warehouse' => array(
+					'rule' => 'fetchidfromref',
+					'classfile' => '/product/stock/class/entrepot.class.php',
+					'class' => 'Entrepot',
+					'method' => 'fetch',
+					'element'=> 'Warehouse'
+				)
+			));
+		}
+
 		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) && $mysoc->useNPR()) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
+		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
 		$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.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.recuperableonly' => '^[0|1]$',
-            'p.finished' => '^[0|1]$'
-        );
 
 		// field order as per structure of table llx_product
 		$import_sample = array(
-            'p.ref' => "PREF123456",
-            'p.datec' => dol_print_date(dol_now(), '%Y-%m-%d'),
-            'p.label' => "Product name in default language",
-            'p.description' => "Product description in default language",
-            'p.note_public' => "a public note (free text)",
-            'p.note' => "a private note (free text)",
-            'p.customcode' => 'customs code',
-            'p.fk_country' => 'FR',
-            'p.price' => "100",
+			'p.ref' => "PREF123456",
+			'p.datec' => dol_print_date(dol_now(), '%Y-%m-%d'),
+			'p.label' => "Product name in default language",
+			'p.description' => "Product description in default language",
+			'p.note_public' => "a public note (free text)",
+			'p.note' => "a private note (free text)",
+			'p.customcode' => 'customs code',
+			'p.fk_country' => 'FR',
+			'p.price' => "100",
 			'p.price_min' => "100",
-            'p.price_ttc' => "110",
+			'p.price_ttc' => "110",
 			'p.price_min_ttc' => "110",
-            'p.price_base_type' => "HT (show/use price excl. tax) / TTC (show/use price incl. tax)",
-            'p.tva_tx' => '10', // tax rate eg: 10. Must match numerically one of the tax rates defined for your country'
-            'p.tosell' => "0 (not for sale to customer, eg. raw material) / 1 (for sale)",
-            'p.tobuy' => "0 (not for purchase from supplier, eg. virtual product) / 1 (for purchase)",
-            'p.fk_product_type' => "0 (product) / 1 (service)",
-            'p.duration' => "eg. 365d/12m/1y",
-            'p.url' => 'link to product (no https)',
-            'p.accountancy_code_sell' => "",
-            'p.accountancy_code_sell_intra' => "",
-            'p.accountancy_code_sell_export' => "",
-            'p.accountancy_code_buy' => "",
-            'p.accountancy_code_buy_intra' => "",
-            'p.accountancy_code_buy_export' => "",
-            'p.weight' => "",
+			'p.price_base_type' => "HT (show/use price excl. tax) / TTC (show/use price incl. tax)",
+			'p.tva_tx' => '10', // tax rate eg: 10. Must match numerically one of the tax rates defined for your country'
+			'p.tosell' => "0 (not for sale to customer, eg. raw material) / 1 (for sale)",
+			'p.tobuy' => "0 (not for purchase from supplier, eg. virtual product) / 1 (for purchase)",
+			'p.fk_product_type' => "0 (product) / 1 (service)",
+			'p.duration' => "eg. 365d/12m/1y",
+			'p.url' => 'link to product (no https)',
+			'p.accountancy_code_sell' => "",
+			'p.accountancy_code_sell_intra' => "",
+			'p.accountancy_code_sell_export' => "",
+			'p.accountancy_code_buy' => "",
+			'p.accountancy_code_buy_intra' => "",
+			'p.accountancy_code_buy_export' => "",
+			'p.weight' => "",
 			'p.weight_units' => 'kg', // Use a unit of measure from the dictionary. g/Kg/T etc....matches field "Short label" for unit type "weight" in table "' . MAIN_DB_PREFIX . 'c_units',
-            'p.length' => "",
+			'p.length' => "",
 			'p.length_units' => 'm', // Use a unit of measure from the dictionary. m/cm/mm etc....matches field "Short label" for unit type "size" in table "' . MAIN_DB_PREFIX . 'c_units',
-            'p.width' => "",
+			'p.width' => "",
 			'p.width_units' => 'm', // Use a unit of measure from the dictionary. m/cm/mm etc....matches field "Short label" for unit type "size" in table "' . MAIN_DB_PREFIX . 'c_units',
-            'p.height' => "",
+			'p.height' => "",
 			'p.height_units' => 'm', // Use a unit of measure from the dictionary. m/cm/mm etc....matches field "Short label" for unit type "size" in table "' . MAIN_DB_PREFIX . 'c_units',
-            'p.surface' => "",
+			'p.surface' => "",
 			'p.surface_units' => 'm2', // Use a unit of measure from the dictionary. m2/cm2/mm2 etc....matches field "Short label" for unit type "surface" in table "' . MAIN_DB_PREFIX . 'c_units',
-            'p.volume' => "",
+			'p.volume' => "",
 			'p.volume_units' => 'm3', //Use a unit of measure from the dictionary. m3/cm3/mm3 etc....matches field "Short label" for unit type "volume" in table "' . MAIN_DB_PREFIX . 'c_units',
-            'p.finished' => '0 (raw material) / 1 (finished goods)'
-        );
-        //clauses copied from import_fields_array
-        if (!empty($conf->stock->enabled)) $import_sample = array_merge($import_sample, array(
-                'p.seuil_stock_alerte' => '',
-                'p.pmp' => '0',
-                'p.desiredstock' => ''
-            ));
-        if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $import_sample = array_merge($import_sample, array('p.cost_price'=>'90'));
-        if (is_object($mysoc) && $mysoc->useNPR()) $import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
-        if (is_object($mysoc) && $mysoc->useLocalTax(1)) $import_sample = array_merge($import_sample, array('p.localtax1_tx'=>'', 'p.localtax1_type'=>''));
-        if (is_object($mysoc) && $mysoc->useLocalTax(2)) $import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
-        if (!empty($conf->barcode->enabled)) $import_sample = array_merge($import_sample, array('p.barcode'=>''));
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            $import_sample = array_merge(
-                $import_sample,
-                array(
-                    'p.fk_unit' => 'use a unit of measure from the dictionary. G/KG/M2/M3 etc....matches field "code" in table "'.MAIN_DB_PREFIX.'c_units"'
-                )
-            );
+			'p.finished' => '0 (raw material) / 1 (finished goods)'
+		);
+		//clauses copied from import_fields_array
+		if (!empty($conf->stock->enabled)) $import_sample = array_merge($import_sample, array(
+				'p.tobatch'=>"0 (don't use) / 1 (use batch/serial number)",
+				'p.seuil_stock_alerte' => '',
+				'p.pmp' => '0',
+				'p.desiredstock' => ''
+			));
+		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $import_sample = array_merge($import_sample, array('p.cost_price'=>'90'));
+		if (is_object($mysoc) && $usenpr) $import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
+		if (is_object($mysoc) && $mysoc->useLocalTax(1)) $import_sample = array_merge($import_sample, array('p.localtax1_tx'=>'', 'p.localtax1_type'=>''));
+		if (is_object($mysoc) && $mysoc->useLocalTax(2)) $import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
+		if (!empty($conf->barcode->enabled)) $import_sample = array_merge($import_sample, array('p.barcode'=>''));
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$import_sample = array_merge(
+				$import_sample,
+				array(
+					'p.fk_unit' => 'use a unit of measure from the dictionary. G/KG/M2/M3 etc....matches field "code" in table "'.MAIN_DB_PREFIX.'c_units"'
+				)
+			);
 
-            if (!is_array($this->import_convertvalue_array[$r])) $this->import_convertvalue_array[$r] = array();
 			$this->import_convertvalue_array[$r] = array_merge($this->import_convertvalue_array[$r], array(
 				'p.fk_unit' => array(
 					'rule' => 'fetchidfromcodeorlabel',
@@ -588,8 +611,8 @@ class modProduct extends DolibarrModules
 			));
 		}
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
-        $this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
-        if (!empty($conf->barcode->enabled)) $this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled
+		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
+		if (!empty($conf->barcode->enabled)) $this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled
 
 		if (!empty($conf->fournisseur->enabled))
 		{
@@ -602,34 +625,34 @@ class modProduct 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) && $mysoc->useNPR())       $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
+			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'));
 			if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
-            $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
 					'sp.price'=>"PriceQtyMinHT*",
 					'sp.unitprice'=>'UnitPriceHT*', // TODO Make this field not required and calculate it from price and qty
 					'sp.remise_percent'=>'DiscountQtyMin'
 			));
 
-            if ($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',
-                ));
-            }
+			if ($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_convertvalue_array[$r] = array(
 					'sp.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty'),
@@ -637,38 +660,38 @@ class modProduct extends DolibarrModules
 			);
 
 			$this->import_examplevalues_array[$r] = array(
-                'sp.fk_product' => "PRODUCT_REF or id:123456",
-                'sp.fk_soc' => "My Supplier",
-                'sp.ref_fourn' => "XYZ-F123456",
-                'sp.quantity' => "5",
-                'sp.tva_tx' => '10',
-			    'sp.price'=>"50",
-			    'sp.unitprice'=>'50',
-			    'sp.remise_percent'=>'0',
-			    'sp.default_vat_code' => '',
-                'sp.delivery_time_days' => '5',
-                'sp.supplier_reputation' => 'FAVORITE / NOTTHGOOD / DONOTORDER'
+				'sp.fk_product' => "PRODUCT_REF or id:123456",
+				'sp.fk_soc' => "My Supplier",
+				'sp.ref_fourn' => "XYZ-F123456",
+				'sp.quantity' => "5",
+				'sp.tva_tx' => '10',
+				'sp.price'=>"50",
+				'sp.unitprice'=>'50',
+				'sp.remise_percent'=>'0',
+				'sp.default_vat_code' => '',
+				'sp.delivery_time_days' => '5',
+				'sp.supplier_reputation' => 'FAVORITE / NOTTHGOOD / DONOTORDER'
 			);
-            if (is_object($mysoc) && $mysoc->useNPR()) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
-            if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
-            if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
-            $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
-                'sp.price' => "50.00",
-                'sp.unitprice' => '10',
-                // TODO Make this field not required and calculate it from price and qty
-                'sp.remise_percent' => '20'
-            ));
-            if ($conf->multicurrency->enabled)
-            {
-                $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
-                    'sp.fk_multicurrency'=>'eg: 2, rowid for code of multicurrency currency',
-                    'sp.multicurrency_code'=>'GBP',
-                    'sp.multicurrency_tx'=>'1.12345',
-                    'sp.multicurrency_unitprice'=>'',
-                    // TODO Make this field not required and calculate it from price and qty
-                    'sp.multicurrency_price'=>''
-                ));
-            }
+			if (is_object($mysoc) && $usenpr) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
+			if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+			if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+			$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
+				'sp.price' => "50.00",
+				'sp.unitprice' => '10',
+				// TODO Make this field not required and calculate it from price and qty
+				'sp.remise_percent' => '20'
+			));
+			if ($conf->multicurrency->enabled)
+			{
+				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
+					'sp.fk_multicurrency'=>'eg: 2, rowid for code of multicurrency currency',
+					'sp.multicurrency_code'=>'GBP',
+					'sp.multicurrency_tx'=>'1.12345',
+					'sp.multicurrency_unitprice'=>'',
+					// TODO Make this field not required and calculate it from price and qty
+					'sp.multicurrency_price'=>''
+				));
+			}
 
 			$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier');
 		}
@@ -689,29 +712,29 @@ class modProduct extends DolibarrModules
 				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 				'pr.date_price'=>'DateCreation*');
 			if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) $this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
-			if (is_object($mysoc) && $mysoc->useNPR()) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
+			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'=>"PRODUCT_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
-		    $r++;
-		    $this->import_code[$r] = $this->rights_class.'_languages';
-		    $this->import_label[$r] = "ProductsOrServicesTranslations";
+			// Import translations of product names and descriptions
+			$r++;
+			$this->import_code[$r] = $this->rights_class.'_languages';
+			$this->import_label[$r] = "ProductsOrServicesTranslations";
 			$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('l'=>MAIN_DB_PREFIX.'product_lang');
+			$this->import_tables_array[$r] = array('l'=>MAIN_DB_PREFIX.'product_lang');
 			// multiline translation, one line per translation
 			$this->import_fields_array[$r] = array('l.fk_product'=>'ProductOrService*', 'l.lang'=>'Language*', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription');
 			//$this->import_fields_array[$r]['l.note']='TranslatedNote';
@@ -724,20 +747,20 @@ class modProduct 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 ('', 'newboxdefonly', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-        $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 ('', 'newboxdefonly', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 77d339da035..ad77f85dfb5 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -144,6 +144,8 @@ class modProjet extends DolibarrModules
 		$r++;
 		$this->boxes[$r][1] = "box_task.php";
 		$r++;
+		$this->boxes[$r][1] = "box_validated_projects.php";
+		$r++;
 
 		// Permissions
 		$this->rights = array();
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 007e92e4277..5791998ff6a 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2020		Ahmad Jamaly Rabib		<rabib@metroworks.co.jp>
  *
  * 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
@@ -254,6 +255,174 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('propal').')';
 		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+
+		// Imports
+		//--------
+		$r = 0;
+
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = 'Proposals'; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'propal', 'extra' => MAIN_DB_PREFIX.'propal_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c'=>'fk_user_author']; // Fields to store import user id
+		$this->import_fields_array[$r] = [
+			'c.ref' => 'Document Ref*',
+			'c.ref_client' => 'RefCustomer',
+			'c.fk_soc' => 'ThirdPartyName*',
+			'c.datec' => 'DateCreation',
+			'c.datep' => 'DatePropal',
+			'c.fin_validite' => 'DateEndPropal',
+			'c.remise_percent' => 'GlobalDiscount',
+			'c.total_ht' => 'TotalHT',
+			'c.total' => 'TotalTTC',
+			'c.fk_statut' => 'Status*',
+			'c.note_public' => 'Note',
+			'c.date_livraison' => 'DeliveryDate',
+			'c.fk_user_valid' => 'ValidatedById'
+		];
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['c.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'propal' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'propal'];
+		$this->import_regex_array[$r] = ['c.ref' => '[^ ]'];
+		$import_sample = [
+			'c.ref' => 'PROV0077',
+			'c.ref_client' => 'Client1',
+			'c.fk_soc' => 'MyBigCompany',
+			'c.datec' => '2020-01-01',
+			'c.datep' => '2020-01-01',
+			'c.fin_validite' => '2020-01-01',
+			'c.remise_percent' => '',
+			'c.total_ht' => '0',
+			'c.total' => '0',
+			'c.fk_statut' => '1',
+			'c.note_public' => '',
+			'c.date_livraison' => '2020-01-01',
+			'c.fk_user_valid' => '1',
+			'c.multicurrency_code' => '',
+			'c.multicurrency_tx' => '1',
+			'c.multicurrency_total_ht' => '0',
+			'c.multicurrency_total_tva' => '0',
+			'c.multicurrency_total_ttc' => '0'
+		];
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = ['c.ref'=>'Ref'];
+		$this->import_convertvalue_array[$r] = [
+			'c.fk_soc' => [
+				'rule' => 'fetchidfromref',
+				'file' => '/societe/class/societe.class.php',
+				'class' => 'Societe',
+				'method' => 'fetch',
+				'element' => 'ThirdParty'
+			]
+		];
+
+		//Import Proposal Lines
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'line_'.$r;
+		$this->import_label[$r] = "ProposalLine"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = [
+			'cd' => MAIN_DB_PREFIX.'propaldet',
+			'extra' => MAIN_DB_PREFIX.'propaldet_extrafields'
+		];
+		$this->import_fields_array[$r] = [
+			'cd.fk_propal' => 'Document Ref*',
+			'cd.fk_parent_line' => 'PrParentLine',
+			'cd.fk_product' => 'IdProduct',
+			'cd.label' => 'Label',
+			'cd.description' => 'LineDescription',
+			'cd.product_type' => 'TypeOfLineServiceOrProduct',
+			'cd.tva_tx' => 'LineVATRate',
+			'cd.qty' => 'LineQty',
+			'cd.remise_percent' => 'Reduc. Percent',
+			'cd.remise' => 'Reduc.',
+			'cd.price' => 'Price',
+			'cd.subprice' => 'Sub Price',
+			'cd.total_ht' => 'LineTotalHT',
+			'cd.total_tva' => 'LineTotalVAT',
+			'cd.total_ttc' => 'LineTotalTTC',
+			'cd.date_start' => 'Start Date',
+			'cd.date_end' => 'End Date',
+			'cd.buy_price_ht' => 'LineBuyPriceHT'
+		];
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'propaldet' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'propaldet'];
+		$this->import_regex_array[$r] = ['cd.product_type' => '[0|1]$'];
+		$import_sample = [
+			'cd.fk_propal' => 'PROV(0001)',
+			'cd.fk_parent_line' => '',
+			'cd.fk_product' => '',
+			'cd.label' => '',
+			'cd.description' => 'Line description',
+			'cd.product_type' => '1',
+			'cd.tva_tx' => '0',
+			'cd.qty' => '2',
+			'cd.remise_percent' => '0',
+			'cd.remise' => '0',
+			'cd.price' => '',
+			'cd.subprice' => '5000',
+			'cd.total_ht' => '10000',
+			'cd.total_tva' => '0',
+			'cd.total_ttc' => '10100',
+			'cd.date_start' => '',
+			'cd.date_end' => '',
+			'cd.buy_price_ht' => '7000',
+			'cd.multicurrency_code' => 'JPY',
+			'cd.multicurrency_tx' => '1',
+			'cd.multicurrency_total_ht' => '10000',
+			'cd.multicurrency_total_tva' => '0',
+			'cd.multicurrency_total_ttc' => '10100'
+		];
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = ['cd.fk_propal' => 'Quotation Id', 'cd.fk_product' => 'Product Id'];
+		$this->import_convertvalue_array[$r] = [
+			'cd.fk_propal' => [
+				'rule'=>'fetchidfromref',
+				'file'=>'/comm/propal/class/propal.class.php',
+				'class'=>'Propal',
+				'method'=>'fetch'
+			]
+		];
 	}
 
 
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index c09915febb8..19cd20271b8 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -50,7 +50,7 @@ class modReception extends DolibarrModules
 		$this->description = "Gestion des réceptions fournisseurs";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'experimental';
+		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->picto = "dollyrevert";
diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php
new file mode 100644
index 00000000000..8e282a9513d
--- /dev/null
+++ b/htdocs/core/modules/modRecruitment.class.php
@@ -0,0 +1,472 @@
+<?php
+/* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2019-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
+ * 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/>.
+ */
+
+/**
+ * 	\defgroup   recruitment     Module Recruitment
+ *  \brief      Recruitment module descriptor.
+ *
+ *  \file       htdocs/recruitment/core/modules/modRecruitment.class.php
+ *  \ingroup    recruitment
+ *  \brief      Description and activation file for module Recruitment
+ */
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Description and activation class for module Recruitment
+ */
+class modRecruitment extends DolibarrModules
+{
+	/**
+	 * 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 = 750;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'recruitment';
+		// 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 = "hr";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '44';
+		// 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 'ModuleRecruitmentName' not found (Recruitment is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleRecruitmentDesc' not found (Recruitment is name of module).
+		$this->description = "Manage and follow recruitment campaign for new job positions";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "Manage and follow recruitment campaign for new job positions";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'experimental';
+		// 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 RECRUITMENT 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 = 'recruitmentjobposition';
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 0,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 1,
+			// 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(
+				//    '/recruitment/css/recruitment.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/recruitment/js/recruitment.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if features of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/recruitment/temp","/recruitment/subdir");
+		$this->dirs = array("/recruitment/temp");
+		// Config pages. Put here list of php page, stored into recruitment/admin directory, to use to setup module.
+		$this->config_page_url = array("setup.php@recruitment");
+		// 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();
+		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+		$this->langfiles = array("recruitment");
+		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(11, -3); // 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'=>'RecruitmentWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('RECRUITMENT_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('RECRUITMENT_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array(
+			// 1 => array('RECRUITMENT_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->recruitment) || !isset($conf->recruitment->enabled)) {
+			$conf->recruitment = new stdClass();
+			$conf->recruitment->enabled = 0;
+		}
+
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@recruitment:$user->rights->recruitment->read:/recruitment/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@recruitment:$user->rights->othermodule->read:/recruitment/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'=>'recruitment',
+			// List of tables we want to see into dictonnary editor
+			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
+			// Label of tables
+			'tablib'=>array("Table1", "Table2", "Table3"),
+			// Request to select fields
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
+			// Sort order
+			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
+			// List of fields (result of select to show dictionary)
+			'tabfield'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields to edit a record)
+			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields for insert)
+			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
+			// Name of columns with primary key (try to always name it 'rowid')
+			'tabrowid'=>array("rowid", "rowid", "rowid"),
+			// Condition to show each dictionary
+			'tabcond'=>array($conf->recruitment->enabled, $conf->recruitment->enabled, $conf->recruitment->enabled)
+		);
+		*/
+
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in recruitment/core/boxes that contains a class to show a widget.
+		$this->boxes = array(
+			//  0 => array(
+			//      'file' => 'recruitmentwidget1.php@recruitment',
+			//      'note' => 'Widget provided by Recruitment',
+			//      'enabledbydefaulton' => 'Home',
+			//  ),
+			//  ...
+		);
+
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			//  0 => array(
+			//      'label' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/recruitment/class/recruitmentjobposition.class.php',
+			//      'objectname' => 'RecruitmentJobPosition',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->recruitment->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->recruitment->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->recruitment->enabled', 'priority'=>50)
+		// );
+
+		// Permissions provided by this module
+		$this->rights = array();
+		$r = 0;
+		// Add here entries to declare new permissions
+		/* BEGIN MODULEBUILDER PERMISSIONS */
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read job positions to fill and candidatures'; // Permission label
+		$this->rights[$r][4] = 'recruitmentjobposition'; // In php code, permission will be checked by test if ($user->rights->recruitment->level1->level2)
+		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->recruitment->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update job positions to fill and candidatures'; // Permission label
+		$this->rights[$r][4] = 'recruitmentjobposition'; // In php code, permission will be checked by test if ($user->rights->recruitment->level1->level2)
+		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->recruitment->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete Job positions to fill and candidatures'; // Permission label
+		$this->rights[$r][4] = 'recruitmentjobposition'; // In php code, permission will be checked by test if ($user->rights->recruitment->level1->level2)
+		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->recruitment->level1->level2)
+		$r++;
+		/* END MODULEBUILDER PERMISSIONS */
+
+		// Main menu entries to add
+		$this->menu = array();
+		$r = 0;
+		// Add here entries to declare new menus
+		/* BEGIN MODULEBUILDER TOPMENU */
+		/* END MODULEBUILDER TOPMENU */
+		/* BEGIN MODULEBUILDER LEFTMENU RECRUITMENTJOBPOSITION */
+		$this->menu[$r++] = array(
+			'fk_menu'=>'fk_mainmenu=hrm', // '' 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 Top menu entry
+			'titre'=>'Recruitment',
+			'mainmenu'=>'hrm',
+			'leftmenu'=>'recruitmentjobposition',
+			'url'=>'/recruitment/recruitmentindex.php',
+			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000 + $r,
+			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->recruitment->recruitmentjobposition->read', // Use 'perms'=>'$user->rights->recruitment->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=hrm,fk_leftmenu=recruitmentjobposition', // '' 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
+			'titre'=>'NewPositionToBeFilled',
+			'mainmenu'=>'hrm',
+			'leftmenu'=>'recruitment_recruitmentjobposition_new',
+			'url'=>'/recruitment/recruitmentjobposition_card.php?action=create',
+			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000 + $r,
+			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->recruitment->recruitmentjobposition->write', // Use 'perms'=>'$user->rights->recruitment->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=hrm,fk_leftmenu=recruitmentjobposition', // '' 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
+			'titre'=>'ListOfPositionsToBeFilled',
+			'mainmenu'=>'hrm',
+			'leftmenu'=>'recruitment_recruitmentjobposition_list',
+			'url'=>'/recruitment/recruitmentjobposition_list.php',
+			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000 + $r,
+			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->recruitment->recruitmentjobposition->read', // Use 'perms'=>'$user->rights->recruitment->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=hrm,fk_leftmenu=recruitmentjobposition', // '' 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
+			'titre'=>'NewCandidature',
+			'mainmenu'=>'hrm',
+			'leftmenu'=>'recruitment_recruitmentcandidature_new',
+			'url'=>'/recruitment/recruitmentcandidature_card.php?action=create',
+			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000 + $r,
+			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->recruitment->recruitmentjobposition->write', // Use 'perms'=>'$user->rights->recruitment->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=hrm,fk_leftmenu=recruitmentjobposition', // '' 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
+			'titre'=>'ListOfCandidatures',
+			'mainmenu'=>'hrm',
+			'leftmenu'=>'recruitment_recruitmentcandidature_list',
+			'url'=>'/recruitment/recruitmentcandidature_list.php',
+			'langs'=>'recruitment', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000 + $r,
+			'enabled'=>'$conf->recruitment->enabled', // Define condition to show or hide menu entry. Use '$conf->recruitment->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->recruitment->recruitmentjobposition->read', // Use 'perms'=>'$user->rights->recruitment->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);
+		/* END MODULEBUILDER LEFTMENU RECRUITMENTJOBPOSITION */
+
+		// Exports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER EXPORT RECRUITMENTJOBPOSITION */
+		/*
+		$langs->load("recruitment");
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='RecruitmentJobPositionLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r]='recruitmentjobposition';
+		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
+		$keyforclass = 'RecruitmentJobPosition'; $keyforclassfile='/mymobule/class/recruitmentjobposition.class.php'; $keyforelement='recruitmentjobposition';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
+		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
+		//$keyforclass = 'RecruitmentJobPositionLine'; $keyforclassfile='/recruitment/class/recruitmentjobposition.class.php'; $keyforelement='recruitmentjobpositionline'; $keyforalias='tl';
+		//include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		$keyforselect='recruitmentjobposition'; $keyforaliasextra='extra'; $keyforelement='recruitmentjobposition';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$keyforselect='recruitmentjobpositionline'; $keyforaliasextra='extraline'; $keyforelement='recruitmentjobpositionline';
+		//include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$this->export_dependencies_array[$r] = array('recruitmentjobpositionline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		//$this->export_special_array[$r] = array('t.field'=>'...');
+		//$this->export_examplevalues_array[$r] = array('t.field'=>'Example');
+		//$this->export_help_array[$r] = array('t.field'=>'FieldDescHelp');
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'recruitmentjobposition as t';
+		//$this->export_sql_end[$r]  =' LEFT JOIN '.MAIN_DB_PREFIX.'recruitmentjobposition_line as tl ON tl.fk_recruitmentjobposition = t.rowid';
+		$this->export_sql_end[$r] .=' WHERE 1 = 1';
+		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('recruitmentjobposition').')';
+		$r++; */
+		/* END MODULEBUILDER EXPORT RECRUITMENTJOBPOSITION */
+
+		// Imports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER IMPORT RECRUITMENTJOBPOSITION */
+		/*
+		 $langs->load("recruitment");
+		 $this->export_code[$r]=$this->rights_class.'_'.$r;
+		 $this->export_label[$r]='RecruitmentJobPositionLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		 $this->export_icon[$r]='recruitmentjobposition';
+		 $keyforclass = 'RecruitmentJobPosition'; $keyforclassfile='/mymobule/class/recruitmentjobposition.class.php'; $keyforelement='recruitmentjobposition';
+		 include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		 $keyforselect='recruitmentjobposition'; $keyforaliasextra='extra'; $keyforelement='recruitmentjobposition';
+		 include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		 //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		 $this->export_sql_start[$r]='SELECT DISTINCT ';
+		 $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'recruitmentjobposition as t';
+		 $this->export_sql_end[$r] .=' WHERE 1 = 1';
+		 $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('recruitmentjobposition').')';
+		 $r++; */
+		/* END MODULEBUILDER IMPORT RECRUITMENTJOBPOSITION */
+	}
+
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
+
+		$result = $this->_load_tables('/recruitment/sql/');
+		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+
+		// Create extrafields during init
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('recruitment_myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'recruitment', '$conf->recruitment->enabled');
+		//$result2=$extrafields->addExtraField('recruitment_myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'recruitment', '$conf->recruitment->enabled');
+		//$result3=$extrafields->addExtraField('recruitment_myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'recruitment', '$conf->recruitment->enabled');
+		//$result4=$extrafields->addExtraField('recruitment_myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'recruitment', '$conf->recruitment->enabled');
+		//$result5=$extrafields->addExtraField('recruitment_myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'recruitment', '$conf->recruitment->enabled');
+
+		// Permissions
+		$this->remove($options);
+
+		$sql = array();
+
+		// Document template
+		$moduledir = 'mymodule';
+		$myTmpObjects = array();
+		$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration'=>1, 'includedocgeneration'=>1);
+
+		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';
+
+				if (file_exists($src) && !file_exists($dest))
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+					dol_mkdir($dirodt);
+					$result = dol_copy($src, $dest, 0, 0);
+					if ($result < 0)
+					{
+						$langs->load("errors");
+						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+						return 0;
+					}
+				}
+
+				$sql = array_merge($sql, array(
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".strtolower($myTmpObjectKey)."',".$conf->entity.")",
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".strtolower($myTmpObjectKey)."' AND entity = ".$conf->entity,
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".strtolower($myTmpObjectKey)."', ".$conf->entity.")"
+				));
+			}
+		}
+
+		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);
+	}
+}
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index b7933bcf3f4..258af06389a 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -134,6 +134,9 @@ class modService extends DolibarrModules
 		 $r++;
 		 */
 
+		$usenpr = 0;
+		if (is_object($mysoc)) $usenpr = $mysoc->useNPR();
+
         // Exports
 		//--------
 		$r = 0;
@@ -158,7 +161,7 @@ class modService extends DolibarrModules
 			'p.tva_tx'=>'VATRate',
 			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
 		);
-		if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
+		if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
 		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice'));
 		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'));
@@ -223,7 +226,7 @@ class modService extends DolibarrModules
 					'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 					'pr.tva_tx'=>'PriceLevelVATRate',
 					'pr.date_price'=>'DateCreation');
-				if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+				if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
 				//$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_buy'=>"Text",
 				//	'p.note'=>"Text",'p.length'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text',
@@ -258,7 +261,7 @@ class modService extends DolibarrModules
 			        'pr.tva_tx'=>'PriceVATRate',
 			        'pr.default_vat_code'=>'PriceVATCode',
 			        'pr.datec'=>'DateCreation');
-			    if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+			    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",
@@ -452,7 +455,7 @@ class modService extends DolibarrModules
         	)
         );
         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) && $mysoc->useNPR()) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
+        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'));
@@ -531,7 +534,7 @@ class modService extends DolibarrModules
 			'p.desiredstock' => ''
 		));
 		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $import_sample = array_merge($import_sample, array('p.cost_price'=>'90'));
-		if (is_object($mysoc) && $mysoc->useNPR()) $import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
+		if (is_object($mysoc) && $usenpr) $import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
 		if (is_object($mysoc) && $mysoc->useLocalTax(1)) $import_sample = array_merge($import_sample, array('p.localtax1_tx'=>'', 'p.localtax1_type'=>''));
 		if (is_object($mysoc) && $mysoc->useLocalTax(2)) $import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
 		if (!empty($conf->barcode->enabled)) $import_sample = array_merge($import_sample, array('p.barcode'=>''));
@@ -580,7 +583,7 @@ class modService extends DolibarrModules
 				    'sp.delivery_time_days' => 'DeliveryDelay',
 				    'sp.supplier_reputation' => 'SupplierReputation'
 				);
-				if (is_object($mysoc) && $mysoc->useNPR())       $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
+				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'));
 				if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
 				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
@@ -617,7 +620,7 @@ class modService extends DolibarrModules
 					'sp.delivery_time_days' => '5',
 					'sp.supplier_reputation' => 'FAVORITE / NOTTHGOOD / DONOTORDER'
 				);
-				if (is_object($mysoc) && $mysoc->useNPR()) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
+				if (is_object($mysoc) && $usenpr) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
 				if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
 				if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
 				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
@@ -657,7 +660,7 @@ class modService extends DolibarrModules
 					'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 					'pr.date_price'=>'DateCreation*');
 				if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) $this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
-				if (is_object($mysoc) && $mysoc->useNPR()) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
+				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')
diff --git a/htdocs/core/modules/modSocialNetworks.class.php b/htdocs/core/modules/modSocialNetworks.class.php
index fd426323e0e..bf7573a912b 100644
--- a/htdocs/core/modules/modSocialNetworks.class.php
+++ b/htdocs/core/modules/modSocialNetworks.class.php
@@ -31,57 +31,57 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modSocialNetworks 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 = 3400;
+		$this->db = $db;
+		$this->numero = 3400;
 
 		// 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 position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '20';
-        // 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 Social Networks fields into third parties and addresses (skype, twitter, facebook, ...)";
+		$this->family = "interface";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '20';
+		// 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 Social Networks fields into third parties and addresses (skype, twitter, facebook, ...)";
 		// 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 = 'email';
+		$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 = 'share-alt';
 
-        // 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(DOL_URL_ROOT.'/admin/dict.php?id=38');
 
-        // Dependencies
-        $this->hidden = !empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED); // A condition to hide module
+		// Dependencies
+		$this->hidden = !empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED); // 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();
+		$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();
 
-        // Main menu entries
-        $this->menu = array();
-    }
+		// Main menu entries
+		$this->menu = array();
+	}
 }
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index a88ddc355a4..60e0fb3b198 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -261,13 +261,15 @@ class modSociete extends DolibarrModules
 		$this->export_icon[$r] = 'company';
 		$this->export_permission[$r] = array(array("societe", "export"));
 		$this->export_fields_array[$r] = array(
-			's.rowid'=>"Id", 's.nom'=>"Name", 's.name_alias'=>"AliasNameShort", 's.status'=>"Status", 's.client'=>"Customer", 's.fournisseur'=>"Supplier", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification",
+			's.rowid'=>"Id", 's.nom'=>"Name", 's.name_alias'=>"AliasNameShort", 'ps.nom'=>"ParentCompany",
+			's.status'=>"Status", 's.client'=>"Customer", 's.fournisseur'=>"Supplier", 's.datec'=>"DateCreation", 's.tms'=>"DateLastModification",
 			's.code_client'=>"CustomerCode", 's.code_fournisseur'=>"SupplierCode", 's.code_compta'=>"AccountancyCode", 's.code_compta_fournisseur'=>"SupplierAccountancyCode",
-			's.address'=>"Address", 's.zip'=>"Zip", 's.town'=>"Town", 'd.nom'=>'State', 'c.label'=>"Country", 'c.code'=>"CountryCode", 's.phone'=>"Phone", 's.fax'=>"Fax",
+			's.address'=>"Address", 's.zip'=>"Zip", 's.town'=>"Town", 'd.nom'=>'State', 'r.nom'=>'Region', 'c.label'=>"Country", 'c.code'=>"CountryCode", 's.phone'=>"Phone", 's.fax'=>"Fax",
 			's.url'=>"Url", 's.email'=>"Email", 's.default_lang'=>"DefaultLang", 's.canvas' => "Canvas", 's.siren'=>"ProfId1", 's.siret'=>"ProfId2", 's.ape'=>"ProfId3", 's.idprof4'=>"ProfId4",
 			's.idprof5'=>"ProfId5", 's.idprof6'=>"ProfId6", 's.tva_intra'=>"VATIntraShort", 's.capital'=>"Capital", 's.note_private'=>"NotePrivate", 's.note_public'=>"NotePublic",
 			't.libelle'=>"ThirdPartyType", 'ce.code'=>"Staff", "cfj.libelle"=>"JuridicalStatus", 's.fk_prospectlevel'=>'ProspectLevel',
-			'st.code'=>'ProspectStatus', 'payterm.libelle'=>'PaymentConditions', 'paymode.libelle'=>'PaymentMode'
+			'st.code'=>'ProspectStatus', 'payterm.libelle'=>'PaymentConditions', 'paymode.libelle'=>'PaymentMode',
+			's.outstanding_limit'=>'OutstandingBill', 'pbacc.ref'=>'PaymentBankAccount', 'incoterm.code'=>'IncotermLabel'
 		);
 		if (!empty($conf->global->SOCIETE_USEPREFIX)) $this->export_fields_array[$r]['s.prefix'] = 'Prefix';
 		if (!empty($conf->global->PRODUIT_MULTIPRICES)) $this->export_fields_array[$r]['s.price_level'] = 'PriceLevel';
@@ -280,6 +282,7 @@ class modSociete extends DolibarrModules
 		$keyforselect = 'societe'; $keyforelement = 'company'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_fields_array[$r] += array('u.login'=>'SaleRepresentativeLogin', 'u.firstname'=>'SaleRepresentativeFirstname', 'u.lastname'=>'SaleRepresentativeLastname');
+
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",
 		//	's.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",
@@ -289,15 +292,21 @@ class modSociete extends DolibarrModules
 		//	's.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'List:c_departements:nom:rowid'
 		//);
 		$this->export_TypeFields_array[$r] = array(
-			's.rowid'=>"Numeric", 's.nom'=>"Text", 's.name_alias'=>"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", '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", 's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text", 's.idprof4'=>"Text", 's.idprof5'=>"Text", 's.idprof6'=>"Text",
-			's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_private'=>"Text", 's.note_public'=>"Text", 't.libelle'=>"Text",
-			'ce.code'=>"List:c_effectif:libelle:code", "cfj.libelle"=>"Text", 's.fk_prospectlevel'=>'List:c_prospectlevel:label:code',
-			'st.code'=>'List:c_stcomm:libelle:code', 'd.nom'=>'Text', 'u.login'=>'Text', 'u.firstname'=>'Text', 'u.lastname'=>'Text', 'payterm.libelle'=>'Text',
-			'paymode.libelle'=>'Text', 's.entity'=>'Numeric',
-			's.price_level'=>'Numeric'
+			'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",
+			'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",
+			's.siret'=>"Text", 's.siren'=>"Text", 's.ape'=>"Text", 's.idprof4'=>"Text", 's.idprof5'=>"Text", 's.idprof6'=>"Text",
+			's.tva_intra'=>"Text", 's.capital'=>"Numeric", 's.note_private'=>"Text", 's.note_public'=>"Text",
+			't.libelle'=>"Text", 'ce.code'=>"List:c_effectif:libelle:code", "cfj.libelle"=>"Text", 's.fk_prospectlevel'=>'List:c_prospectlevel:label:code',
+			'st.code'=>'List:c_stcomm:libelle:code',
+			'payterm.libelle'=>'Text', 'paymode.libelle'=>'Text',
+			's.outstanding_limit'=>'Numeric', 'pbacc.ref'=>'Text', 'incoterm.code'=>'Text',
+			'u.login'=>'Text', 'u.firstname'=>'Text', 'u.lastname'=>'Text',
+			's.entity'=>'Numeric', 's.price_level'=>'Numeric'
 		);
 
 		$this->export_entities_array[$r] = array('u.login'=>'user', 'u.firstname'=>'user', 'u.lastname'=>'user'); // We define here only fields that use another picto
@@ -305,15 +314,19 @@ class modSociete extends DolibarrModules
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra ON s.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as ps ON s.parent = ps.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as ce ON s.fk_effectif = ce.id';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as cfj ON s.fk_forme_juridique = cfj.code';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_regions as r ON r.code_region = d.fk_region AND r.fk_pays = s.fk_pays';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON sc.fk_user = u.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as payterm ON s.cond_reglement = payterm.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as paymode ON s.mode_reglement = paymode.id';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as pbacc ON s.fk_account = pbacc.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as incoterm ON s.fk_incoterms = incoterm.rowid';
 		$this->export_sql_end[$r] .= ' WHERE s.entity IN ('.getEntity('societe').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.$user->id.' ';
@@ -333,7 +346,7 @@ class modSociete extends DolibarrModules
 		$this->export_fields_array[$r] = array(
 			'c.rowid'=>"IdContact", 'c.civility'=>"CivilityCode", 'c.lastname'=>'Lastname', 'c.firstname'=>'Firstname', 'c.poste'=>'PostOrFunction',
 			'c.datec'=>"DateCreation", 'c.tms'=>"DateLastModification", 'c.priv'=>"ContactPrivate", 'c.address'=>"Address", 'c.zip'=>"Zip", 'c.town'=>"Town",
-			'd.nom'=>'State', 'co.label'=>"Country", 'co.code'=>"CountryCode", 'c.phone'=>"Phone", 'c.fax'=>"Fax", 'c.phone_mobile'=>"Mobile", 'c.email'=>"EMail",
+			'd.nom'=>'State', 'r.nom'=>'Region', 'co.label'=>"Country", 'co.code'=>"CountryCode", 'c.phone'=>"Phone", 'c.fax'=>"Fax", 'c.phone_mobile'=>"Mobile", 'c.email'=>"EMail",
 			'c.statut'=>"Status",
 			's.rowid'=>"IdCompany", 's.nom'=>"CompanyName", 's.status'=>"Status", 's.code_client'=>"CustomerCode", 's.code_fournisseur'=>"SupplierCode",
 			's.code_compta'=>"AccountancyCode", 's.code_compta_fournisseur'=>"SupplierAccountancyCode",
@@ -344,7 +357,7 @@ class modSociete extends DolibarrModules
 		$this->export_examplevalues_array[$r] = array('s.client'=>'0 (no customer no prospect)/1 (customer)/2 (prospect)/3 (customer and prospect)', 's.fournisseur'=>'0 (not a supplier) or 1 (supplier)');
 		$this->export_TypeFields_array[$r] = array(
 			'c.civility'=>"List:c_civility:label:code", 'c.lastname'=>'Text', 'c.firstname'=>'Text', 'c.poste'=>'Text', 'c.datec'=>"Date", 'c.priv'=>"Boolean",
-			'c.address'=>"Text", 'c.zip'=>"Text", 'c.town'=>"Text", 'd.nom'=>'Text', 'co.label'=>"List:c_country:label:rowid", 'co.code'=>"Text", 'c.phone'=>"Text",
+			'c.address'=>"Text", 'c.zip'=>"Text", 'c.town'=>"Text", 'd.nom'=>'Text', 'r.nom'=>'Text', 'co.label'=>"List:c_country:label:rowid", 'co.code'=>"Text", 'c.phone'=>"Text",
 			'c.fax'=>"Text", 'c.email'=>"Text",
 			'c.statut'=>"Status",
 			's.rowid'=>"List:societe:nom::thirdparty", 's.nom'=>"Text", 's.status'=>"Status", 's.code_client'=>"Text", 's.code_fournisseur'=>"Text",
@@ -375,6 +388,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extrasoc ON s.rowid = extrasoc.fk_object';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON c.fk_departement = d.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_regions as r ON r.code_region = d.fk_region AND r.fk_pays = c.fk_pays';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id';
@@ -407,6 +421,7 @@ class modSociete extends DolibarrModules
 		$this->import_fields_array[$r] = array(//field order as per structure of table llx_societe
 			's.nom' => "Name*",
 			's.name_alias' => "AliasNameShort",
+			's.parent' => "ParentCompany",
 			's.status' => "Status",
 			's.code_client' => "CustomerCode",
 			's.code_fournisseur' => "SupplierCode",
@@ -443,6 +458,9 @@ class modSociete extends DolibarrModules
 			's.cond_reglement' => "PaymentTermsCustomer",
 			's.mode_reglement_supplier' => 'PaymentTypeSupplier',
 			's.cond_reglement_supplier' => "PaymentTermsSupplier",
+			's.outstanding_limit'=>'OutstandingBill',
+			's.fk_account'=>'PaymentBankAccount',
+			's.fk_incoterms'=>'IncotermLabel',
 			's.tva_assuj' => 'VATIsUsed',
 			's.barcode' => 'BarCode',
 			's.default_lang' => 'DefaultLanguage',
@@ -496,6 +514,29 @@ class modSociete extends DolibarrModules
 			),
 			's.capital' => array('rule' => 'numeric'),
 			's.fk_stcomm' => array('rule' => 'zeroifnull'),
+			's.parent' => array(
+				'rule' => 'fetchidfromref',
+				'file' => '/societe/class/societe.class.php',
+				'class' => 'Societe',
+				'method' => 'fetch',
+				'element' => 'ThirdParty'
+			),
+			's.outstanding_limit' => array('rule' => 'numeric'),
+			's.fk_account' => array(
+				'rule' => 'fetchidfromcodeid',
+				'classfile' => '/compta/bank/class/account.class.php',
+				'class' => 'Account',
+				'method' => 'fetch',
+				'element' => 'BankAccount'
+		//          ),
+		//          TODO
+		//          's.fk_incoterms' => array(
+		//              'rule' => 'fetchidfromcodeid',
+		//              'classfile' => '/core/class/cincoterm.class.php',
+		//              'class' => 'Cincoterm',
+		//              'method' => 'fetch',
+		//              'dict' => 'IncotermLabel'
+			)
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 		$this->import_regex_array[$r] = array(//field order as per structure of table llx_societe
@@ -507,6 +548,7 @@ class modSociete extends DolibarrModules
 			's.cond_reglement' => 'rowid@'.MAIN_DB_PREFIX.'c_payment_term',
 			's.mode_reglement_supplier' => 'id@'.MAIN_DB_PREFIX.'c_paiement',
 			's.cond_reglement_supplier' => 'rowid@'.MAIN_DB_PREFIX.'c_payment_term',
+			's.fk_incoterms' => 'rowid@'.MAIN_DB_PREFIX.'c_incoterms',
 			's.tva_assuj' => '^[0|1]',
 			's.fk_multicurrency' => '^[0|1]',
 			's.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])?$',
@@ -516,6 +558,7 @@ class modSociete extends DolibarrModules
 		$this->import_examplevalues_array[$r] = array(//field order as per structure of table llx_societe
 			's.nom' => "TPBigCompany",
 			's.name_alias' => "Alias for TPBigCompany",
+			's.parent' => "TPMotherCompany",
 			's.status' => "0 (closed) / 1 (active)",
 			's.code_client' => 'eg. CU01-0001 / empty / "auto"',
 			's.code_fournisseur' => 'eg. SU01-0001 / empty / "auto"',
@@ -552,6 +595,9 @@ class modSociete extends DolibarrModules
 			's.cond_reglement' => '1/2/3...matches field "rowid" in table "'.MAIN_DB_PREFIX.'c_payment_term"',
 			's.mode_reglement_supplier' => '1/2/3...matches field "id" in table "'.MAIN_DB_PREFIX.'c_paiement"',
 			's.cond_reglement_supplier' => '1/2/3...matches field "rowid" in table "'.MAIN_DB_PREFIX.'c_payment_term"',
+			's.outstanding_limit' => "5000",
+			's.fk_account' => "rowid or ref",
+			's.fk_incoterms' => '1/2/3...matches field "rowid" in table "'.MAIN_DB_PREFIX.'c_incoterms"',
 			's.tva_assuj' => '0 (VAT not used) / 1 (VAT used)',
 			's.barcode' => '123456789',
 			's.default_lang' => 'en_US / es_ES etc...matches a language directory in htdocs/langs/',
@@ -590,7 +636,7 @@ class modSociete extends DolibarrModules
 			's.town' => "Town",
 			's.fk_departement' => "StateCode",
 			's.fk_pays' => "CountryCode",
-			's.birthday' => "BirthdayDate",
+			's.birthday' => "DateOfBirth",
 			's.poste' => "Role",
 			's.phone' => "Phone",
 			's.phone_perso' => "PhonePerso",
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 4dd1a740278..831358dcf6b 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -81,14 +81,14 @@ class modStock extends DolibarrModules
 		$r++;
 		$this->const[$r][0] = "STOCK_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "Standard";
+		$this->const[$r][2] = "standard";
 		$this->const[$r][3] = 'Name of PDF model of stock';
 		$this->const[$r][4] = 0;
 
 		$r++;
 		$this->const[$r][0] = "MOUVEMENT_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "StdMouvement";
+		$this->const[$r][2] = "stdmovement";
 		$this->const[$r][3] = 'Name of PDF model of stock mouvement';
 		$this->const[$r][4] = 0;
 
@@ -371,9 +371,9 @@ class modStock extends DolibarrModules
 		$this->remove($options);
 
 		//ODT template
-		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/stock/template_stock.odt';
-		$dirodt = DOL_DATA_ROOT.'/doctemplates/stock';
-		$dest = $dirodt.'/template_stock.odt';
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/stocks/template_warehouse.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/stocks';
+		$dest = $dirodt.'/template_warehouse.odt';
 
 		if (file_exists($src) && !file_exists($dest))
 		{
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index c2ce0fec86f..56e08ee7644 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -227,7 +227,7 @@ class modUser extends DolibarrModules
 		    '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'=>'BirthdayDate',
+		    '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"
@@ -283,7 +283,7 @@ class modUser extends DolibarrModules
 		    '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'=>'BirthdayDate',
+		    'u.birth'=>'DateOfBirth',
 		    'u.datec'=>"DateCreation",
 		    'u.statut'=>'Status'
 		);
diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index d61052c0e1b..52a8889fbbb 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -30,54 +30,54 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modWebServicesClient extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 2660;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 2660;
 
-        $this->family = "interface";
-        $this->module_position = '26';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the web service client to call external supplier web services";
+		$this->family = "interface";
+		$this->module_position = '25';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the web service client to call external supplier web services";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'experimental';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		$this->version = 'experimental';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //$this->config_page_url = array();
+		// Config pages
+		//$this->config_page_url = array();
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->langfiles = array("other");
+		$this->langfiles = array("other");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'syncsupplierwebservices';
-        $r = 0;
-    }
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'syncsupplierwebservices';
+		$r = 0;
+	}
 }
diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
similarity index 76%
rename from htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
rename to htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 69af56d1e17..c37e0cc60a7 100644
--- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
+ *	\file       htdocs/core/modules/movement/doc/pdf_standard.modules.php
  *	\ingroup    societe
  *	\brief      File of class to build PDF documents for stocks movements
  */
@@ -35,76 +35,76 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 /**
  *	Class to build documents using ODF templates generator
  */
-class pdf_stdmovement extends ModelePDFMovement
+class pdf_stdandard extends ModelePDFMovement
 {
-    /**
-     * @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.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @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;
 
-    /**
+	/**
 	 * @var Societe Issuer
 	 */
 	public $emetteur;
@@ -179,7 +179,7 @@ class pdf_stdmovement extends ModelePDFMovement
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -193,7 +193,7 @@ class pdf_stdmovement extends ModelePDFMovement
 	 */
 	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;
@@ -203,9 +203,9 @@ class pdf_stdmovement extends ModelePDFMovement
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
 
-        /**
-         * TODO: get from object
-         */
+		/**
+		 * TODO: get from object
+		 */
 
 		$id = GETPOST('id', 'int');
 		$ref = GETPOST('ref', 'alpha');
@@ -242,17 +242,17 @@ class pdf_stdmovement extends ModelePDFMovement
 
 		// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 		$hookmanager->initHooks(array('movementlist'));
-		$extrafields = new ExtraFields($db);
+		$extrafields = new ExtraFields($this->db);
 
 		// fetch optionals attributes and labels
 		$extrafields->fetch_name_optionals_label('movement');
 		$search_array_options = $extrafields->getOptionalsFromPost('movement', '', 'search_');
 
-		$productlot = new ProductLot($db);
-		$productstatic = new Product($db);
-		$warehousestatic = new Entrepot($db);
-		$movement = new MouvementStock($db);
-		$userstatic = new User($db);
+		$productlot = new ProductLot($this->db);
+		$productstatic = new Product($this->db);
+		$warehousestatic = new Entrepot($this->db);
+		$movement = new MouvementStock($this->db);
+		$userstatic = new User($this->db);
 		$element = 'movement';
 
 		$sql = "SELECT p.rowid, p.ref as product_ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.entity,";
@@ -285,38 +285,36 @@ class pdf_stdmovement extends ModelePDFMovement
 		if ($month > 0)
 		{
 			if ($year > 0)
-			$sql .= " AND m.datem BETWEEN '".$db->idate(dol_get_first_day($year, $month, false))."' AND '".$db->idate(dol_get_last_day($year, $month, false))."'";
-			else
-			$sql .= " AND date_format(m.datem, '%m') = '$month'";
-		}
-		elseif ($year > 0)
+				$sql .= " AND m.datem BETWEEN '".$this->db->idate(dol_get_first_day($year, $month, false))."' AND '".$this->db->idate(dol_get_last_day($year, $month, false))."'";
+			else $sql .= " AND date_format(m.datem, '%m') = '$month'";
+		} elseif ($year > 0)
 		{
-			$sql .= " AND m.datem BETWEEN '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
+			$sql .= " AND m.datem BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		}
-		if ($idproduct > 0) $sql .= " AND p.rowid = '".$idproduct."'";
+		if ($idproduct > 0) $sql .= " AND p.rowid = ".((int) $idproduct);
 		if (!empty($search_ref))			$sql .= natural_search('m.rowid', $search_ref, 1);
 		if (!empty($search_movement))      $sql .= natural_search('m.label', $search_movement);
 		if (!empty($search_inventorycode)) $sql .= natural_search('m.inventorycode', $search_inventorycode);
 		if (!empty($search_product_ref))   $sql .= natural_search('p.ref', $search_product_ref);
 		if (!empty($search_product))       $sql .= natural_search('p.label', $search_product);
-		if ($search_warehouse > 0)          $sql .= " AND e.rowid = '".$db->escape($search_warehouse)."'";
+		if ($search_warehouse > 0)          $sql .= " AND e.rowid = ".((int) $this->db->escape($search_warehouse));
 		if (!empty($search_user))          $sql .= natural_search('u.login', $search_user);
 		if (!empty($search_batch))         $sql .= natural_search('m.batch', $search_batch);
 		if ($search_qty != '')				$sql .= natural_search('m.value', $search_qty, 1);
-		if ($search_type_mouvement > 0)		$sql .= " AND m.type_mouvement = '".$db->escape($search_type_mouvement)."'";
+		if ($search_type_mouvement > 0)		$sql .= " AND m.type_mouvement = '".$this->db->escape($search_type_mouvement)."'";
 		// Add where from extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 		// Add where from hooks
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
-		$sql .= $db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
 		$nbtotalofrecords = '';
 		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 		{
-			$result = $db->query($sql);
-			$nbtotalofrecords = $db->num_rows($result);
+			$result = $this->db->query($sql);
+			$nbtotalofrecords = $this->db->num_rows($result);
 			if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
 			{
 				$page = 0;
@@ -324,13 +322,13 @@ class pdf_stdmovement extends ModelePDFMovement
 			}
 		}
 
-		if (empty($search_inventorycode)) $sql .= $db->plimit($limit + 1, $offset);
+		if (empty($search_inventorycode)) $sql .= $this->db->plimit($limit + 1, $offset);
 
 
-		$resql = $db->query($sql);
-		$nbtotalofrecords = $db->num_rows($result);
+		$resql = $this->db->query($sql);
+		$nbtotalofrecords = $this->db->num_rows($result);
 
-        /*
+		/*
          * END TODO
          **/
 
@@ -340,8 +338,8 @@ class pdf_stdmovement extends ModelePDFMovement
 		{
 			if ($resql)
 			{
-				$product = new Product($db);
-				$object = new Entrepot($db);
+				$product = new Product($this->db);
+				$object = new Entrepot($this->db);
 
 				if ($idproduct > 0)
 				{
@@ -352,19 +350,18 @@ class pdf_stdmovement extends ModelePDFMovement
 					$result = $object->fetch($id, $ref);
 					if ($result < 0)
 					{
-						dol_print_error($db);
+						dol_print_error($this->db);
 					}
 				}
 
-				$num = $db->num_rows($resql);
+				$num = $this->db->num_rows($resql);
 
 				$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);
-				else
-				{
+				else {
 					$texte = $langs->trans("ListOfStockMovements");
 					if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 				}
@@ -375,9 +372,7 @@ class pdf_stdmovement extends ModelePDFMovement
 			{
 				$dir = $conf->stock->dir_output."/movement";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				if (!empty($search_inventorycode)) $objectref .= "_".$id."_".$search_inventorycode;
 				if ($search_type_mouvement) $objectref .= "_".$search_type_mouvement;
@@ -389,7 +384,7 @@ class pdf_stdmovement extends ModelePDFMovement
 			$supplierprices = $stockFournisseur->list_product_fournisseur_price($object->id);
 			$object->supplierprices = $supplierprices;
 
-			$productstatic = new Product($db);
+			$productstatic = new Product($this->db);
 
 			if (!file_exists($dir))
 			{
@@ -419,21 +414,21 @@ class pdf_stdmovement extends ModelePDFMovement
 				$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)
+				$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 (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_DISABLE_FPDI) && !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_DISABLE_FPDI) && !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;
@@ -478,15 +473,15 @@ class pdf_stdmovement extends ModelePDFMovement
 				$arrayofuniqueproduct = array();
 
 				//dol_syslog('List products', LOG_DEBUG);
-				$resql = $db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$num = $db->num_rows($resql);
+					$num = $this->db->num_rows($resql);
 					$i = 0;
 					$nblines = $num;
 					for ($i = 0; $i < $nblines; $i++)
 					{
-						$objp = $db->fetch_object($resql);
+						$objp = $this->db->fetch_object($resql);
 
 						// Multilangs
 						if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
@@ -494,13 +489,13 @@ class pdf_stdmovement extends ModelePDFMovement
 							$sql = "SELECT label";
 							$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 							$sql .= " WHERE fk_product=".$objp->rowid;
-							$sql .= " AND lang='".$langs->getDefaultLang()."'";
+							$sql .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
 							$sql .= " LIMIT 1";
 
-							$result = $db->query($sql);
+							$result = $this->db->query($sql);
 							if ($result)
 							{
-								$objtp = $db->fetch_object($result);
+								$objtp = $this->db->fetch_object($result);
 								if ($objtp->label != '') $objp->produit = $objtp->label;
 							}
 						}
@@ -539,19 +534,15 @@ class pdf_stdmovement extends ModelePDFMovement
 									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
-							}
-							else
-							{
+							} 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 $showpricebeforepagebreak = 0;
 							}
-						}
-						else	// No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -571,7 +562,7 @@ class pdf_stdmovement extends ModelePDFMovement
 
 						$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
-						// $objp = $db->fetch_object($resql);
+						// $objp = $this->db->fetch_object($resql);
 
 						$userstatic->id = $objp->fk_user_author;
 						$userstatic->login = $objp->login;
@@ -608,7 +599,7 @@ class pdf_stdmovement extends ModelePDFMovement
 
 						// Date.
 						$pdf->SetXY($this->posxdatemouv, $curY);
-						$pdf->MultiCell($this->posxdesc - $this->posxdatemouv - 0.8, 6, dol_print_date($db->jdate($objp->datem), 'dayhour'), 0, 'L');
+						$pdf->MultiCell($this->posxdesc - $this->posxdatemouv - 0.8, 6, dol_print_date($this->db->jdate($objp->datem), 'dayhour'), 0, 'L');
 
 						// Ref.
 						$pdf->SetXY($this->posxdesc, $curY);
@@ -666,9 +657,7 @@ class pdf_stdmovement extends ModelePDFMovement
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else
-							{
+							} 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);
@@ -682,9 +671,7 @@ class pdf_stdmovement extends ModelePDFMovement
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else
-							{
+							} 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);
@@ -696,7 +683,7 @@ class pdf_stdmovement extends ModelePDFMovement
 						}
 					}
 
-					$db->free($resql);
+					$this->db->free($resql);
 
 					/**
 					 * footer table
@@ -719,10 +706,8 @@ class pdf_stdmovement extends ModelePDFMovement
 					// Total Qty
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $totalunit, 0, 'R', 0);
-				}
-				else
-				{
-					dol_print_error($db);
+				} else {
+					dol_print_error($this->db);
 				}
 
 				if ($notetoshow)
@@ -745,9 +730,7 @@ class pdf_stdmovement extends ModelePDFMovement
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -762,9 +745,7 @@ class pdf_stdmovement extends ModelePDFMovement
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -792,8 +773,8 @@ class pdf_stdmovement extends ModelePDFMovement
 				$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))
@@ -802,15 +783,11 @@ class pdf_stdmovement extends ModelePDFMovement
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -832,34 +809,34 @@ class pdf_stdmovement extends ModelePDFMovement
 	 */
 	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('', 'B', $default_font_size - 3);
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', 'B', $default_font_size - 3);
 
-	    // 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
 
 		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(220, 26, 26)));
 		$pdf->SetDrawColor(220, 26, 26);
@@ -869,12 +846,12 @@ class pdf_stdmovement extends ModelePDFMovement
 		$pdf->SetTextColor(0, 0, 120);
 
 		//Ref mouv
-	    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->posxidref, $tab_top + 1);
-	        $pdf->MultiCell($this->posxdatemouv - $this->posxdatemouv - 0.8, 3, $outputlangs->transnoentities("Ref"), '', 'L');
-	    }
+		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->posxidref, $tab_top + 1);
+			$pdf->MultiCell($this->posxdatemouv - $this->posxdatemouv - 0.8, 3, $outputlangs->transnoentities("Ref"), '', 'L');
+		}
 
 		//Date mouv
 		//$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
@@ -885,20 +862,20 @@ class pdf_stdmovement extends ModelePDFMovement
 		}
 
 		//Ref Product
-	    //$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
-	        $pdf->MultiCell($this->posxlabel - $this->posxdesc, 2, $outputlangs->transnoentities("Ref. Product"), '', 'C');
-	    }
+		//$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxlabel - $this->posxdesc, 2, $outputlangs->transnoentities("Ref. Product"), '', 'C');
+		}
 
 		//Label Product
-	    //$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxlabel - 1, $tab_top + 1);
+		//$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxlabel - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxlabel, 2, $outputlangs->transnoentities("Label"), '', 'C');
-	    }
+		}
 
 		//Lot/serie Product
 		//$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
@@ -909,36 +886,36 @@ class pdf_stdmovement extends ModelePDFMovement
 		}
 
 		//Code Inv
-	    //$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
+		//$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->posxunit - $this->posxup, 2, $outputlangs->transnoentities("Inventory Code"), '', 'C');
-	    }
+		}
 
 		//Label mouvement
-	    //$pdf->line($this->posxunit, $tab_top, $this->posxunit, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxunit, $tab_top + 1);
-	        $pdf->MultiCell($this->posxdiscount - $this->posxunit, 2, $outputlangs->transnoentities("Label Mouvement"), '', 'C');
-	    }
+		//$pdf->line($this->posxunit, $tab_top, $this->posxunit, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxunit, $tab_top + 1);
+			$pdf->MultiCell($this->posxdiscount - $this->posxunit, 2, $outputlangs->transnoentities("Label Mouvement"), '', 'C');
+		}
 
 		//Origin
-	    //$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->posxdiscount + 2, $tab_top + 1);
-	        $pdf->MultiCell($this->postotalht - $this->posxdiscount - 0.8, 2, $outputlangs->transnoentities("Origin"), '', 'C');
-	    }
+		//$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->posxdiscount + 2, $tab_top + 1);
+			$pdf->MultiCell($this->postotalht - $this->posxdiscount - 0.8, 2, $outputlangs->transnoentities("Origin"), '', 'C');
+		}
 
 		//Qty
-	    //$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
-	        $pdf->SetXY($this->postotalht + 2, $tab_top + 1);
-	        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("Qty"), '', 'C');
-	    }
+		//$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
+			$pdf->SetXY($this->postotalht + 2, $tab_top + 1);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("Qty"), '', 'C');
+		}
 
 		$pdf->SetDrawColor(220, 26, 26);
 		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(220, 26, 26)));
@@ -959,74 +936,70 @@ class pdf_stdmovement extends ModelePDFMovement
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
-	    global $conf, $langs, $db, $hookmanager;
+		global $conf, $langs, $db, $hookmanager;
 
-	    // Load traductions files required by page
+		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders", "stocks"));
 
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    if ($object->type == 1) $titlekey = 'ServiceSheet';
-	    else $titlekey = 'StockSheet';
+		if ($object->type == 1) $titlekey = 'ServiceSheet';
+		else $titlekey = 'StockSheet';
 
-	    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("Warehouse");
-	    $pdf->MultiCell(100, 3, $title, '', 'R');
-
-	    $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->label), '', 'R');
-
-	    $posy += 5;
-	    $pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
-	    $pdf->SetTextColor(0, 0, 60);
-	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("LocationSummary").' :', '', 'R');
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("Warehouse");
+		$pdf->MultiCell(100, 3, $title, '', 'R');
+
+		$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->label), '', 'R');
+
+		$posy += 5;
+		$pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("LocationSummary").' :', '', 'R');
 
 		$posy += 4;
 		$pdf->SetXY($posx - 50, $posy);
@@ -1041,13 +1014,11 @@ class pdf_stdmovement extends ModelePDFMovement
 
 		$posy += 4;
 		$pdf->SetXY($posx - 50, $posy);
-		$e = new MouvementStock($db);
+		$e = new MouvementStock($this->db);
 		if (!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0)
 		{
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
-		}
-		else
-		{
+		} else {
 			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
 		}
 
@@ -1078,24 +1049,20 @@ class pdf_stdmovement extends ModelePDFMovement
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
 		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-		$sql .= " WHERE m.fk_entrepot = '".$object->id."'";
-		$resqlbis = $db->query($sql);
+		$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
+		$resqlbis = $this->db->query($sql);
 		if ($resqlbis)
 		{
-			$obj = $db->fetch_object($resqlbis);
-			$lastmovementdate = $db->jdate($obj->datem);
-		}
-		else
-		{
-			dol_print_error($db);
+			$obj = $this->db->fetch_object($resqlbis);
+			$lastmovementdate = $this->db->jdate($obj->datem);
+		} else {
+			dol_print_error($this->db);
 		}
 
 		if ($lastmovementdate)
 		{
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
-		}
-		else
-		{
+		} else {
 			$toWrite = $outputlangs->transnoentities("None");
 		}
 
@@ -1103,7 +1070,7 @@ class pdf_stdmovement extends ModelePDFMovement
 		$nexY = $pdf->GetY();
 
 
-	    /*if ($object->ref_client)
+		/*if ($object->ref_client)
 	    {
 	        $posy+=5;
 	        $pdf->SetXY($posx,$posy);
@@ -1111,14 +1078,14 @@ class pdf_stdmovement extends ModelePDFMovement
 	        $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');
@@ -1133,14 +1100,14 @@ class pdf_stdmovement extends ModelePDFMovement
 	        }
 	    }*/
 
-	    $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);
 
@@ -1171,9 +1138,9 @@ class pdf_stdmovement extends ModelePDFMovement
 	        $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
@@ -1188,8 +1155,8 @@ class pdf_stdmovement extends ModelePDFMovement
 	 */
 	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/stock/modules_movement.php b/htdocs/core/modules/movement/modules_movement.php
similarity index 74%
rename from htdocs/core/modules/stock/modules_movement.php
rename to htdocs/core/modules/movement/modules_movement.php
index ee4e672a499..80a61c75074 100644
--- a/htdocs/core/modules/stock/modules_movement.php
+++ b/htdocs/core/modules/movement/modules_movement.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2018 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2018-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 /**
  *  \file       htdocs/core/modules/stock/modules_movement.php
  *  \ingroup    stock
- *  \brief      File with parent class for generating warehouse to PDF and File of class to manage warehouse movement
+ *  \brief      File with parent class for generating PDF of a stock movements
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
@@ -36,23 +36,25 @@ abstract class ModelePDFMovement 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 = 'mouvement';
+		$type = 'movement';
 		$liste = array();
+
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$liste = getListOfModels($db, $type, $maxfilenamelength);
+
 		return $liste;
 	}
 }
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 e276fe1f5f7..e41b4b35adc 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
@@ -48,9 +48,9 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * @var string Dolibarr version of the loaded document
@@ -137,8 +137,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -274,9 +273,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -308,9 +305,7 @@ class doc_generic_mo_odt extends ModelePDFMo
                			// 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -343,8 +338,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -360,8 +354,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -392,25 +385,21 @@ class doc_generic_mo_odt extends ModelePDFMo
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -429,15 +418,12 @@ class doc_generic_mo_odt extends ModelePDFMo
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -446,8 +432,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -460,8 +445,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -481,8 +465,7 @@ class doc_generic_mo_odt extends ModelePDFMo
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -503,9 +486,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
index 4687bc48fb4..d4b54cb318b 100644
--- a/htdocs/core/modules/mrp/mod_mo_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -129,9 +129,7 @@ class mod_mo_standard extends ModeleNumRefMos
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_mo_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index 4320481abb1..6f3b53bee44 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -35,7 +35,7 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 
 
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
 
 
@@ -80,7 +80,6 @@ if ($action != 'delete' && empty($requestedpermissionsarray))
 //var_dump($requestedpermissionsarray);exit;
 
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
-/** @var $apiService Service */
 $apiService = $serviceFactory->createService('GitHub', $credentials, $storage, $requestedpermissionsarray);
 
 // access type needed to have oauth provider refreshing token
@@ -142,8 +141,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -152,9 +150,7 @@ else // If entry on page with no parameter, we arrive here
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
-    {
+    } else {
         $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 68aba389f31..ea68a5b6141 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -35,7 +35,7 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 
 
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
 
 
@@ -82,7 +82,6 @@ if ($action != 'delete' && empty($requestedpermissionsarray))
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
 // $requestedpermissionsarray contains list of scopes.
 // Conversion into URL is done by Reflection on constant with name SCOPE_scope_in_uppercase
-/** @var $apiService Service */
 $apiService = $serviceFactory->createService('Google', $credentials, $storage, $requestedpermissionsarray);
 
 // access type needed to have oauth provider refreshing token
@@ -140,8 +139,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -150,9 +148,7 @@ else // If entry on page with no parameter, we arrive here
     if (GETPOST('state'))
     {
     	$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
-    {
+    } else {
         $url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
     }
 
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index b2ff4165563..6f5da103cf3 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -35,7 +35,7 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 
 
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
 
 
@@ -80,7 +80,6 @@ if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')
 //var_dump($requestedpermissionsarray);exit;
 
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
-/** @var $apiService Service */
 //$apiService = $serviceFactory->createService('StripeTest', $credentials, $storage, $requestedpermissionsarray);
 
 $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token set service='StripeLive', entity=".$conf->entity;
@@ -146,8 +145,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
     } catch (Exception $e) {
         print $e->getMessage();
     }
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
     $_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -156,9 +154,7 @@ else // If entry on page with no parameter, we arrive here
     if (GETPOST('state'))
     {
         $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
-    {
+    } 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';
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index 925a55c7ca1..d0ca0ba03a4 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -35,7 +35,7 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 
 
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
 
 
@@ -80,7 +80,6 @@ if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')
 //var_dump($requestedpermissionsarray);exit;
 
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
-/** @var $apiService Service */
 //$apiService = $serviceFactory->createService('StripeTest', $credentials, $storage, $requestedpermissionsarray);
 
 $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token set service='StripeTest', entity=".$conf->entity;
@@ -146,8 +145,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 	} catch (Exception $e) {
 		print $e->getMessage();
 	}
-}
-else // If entry on page with no parameter, we arrive here
+} else // If entry on page with no parameter, we arrive here
 {
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
 
@@ -156,9 +154,7 @@ else // If entry on page with no parameter, we arrive here
 	if (GETPOST('state'))
 	{
 		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-	}
-	else
-	{
+	} else {
 		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
 		//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
 		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_TEST_ID.'&scope=read_write';
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index 1f42febd15b..9cda63103e0 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -136,9 +136,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 1a225518518..e1f765110a8 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -35,489 +35,478 @@ use OAuth\OAuth2\Service\Google;
  */
 class printing_printgcp extends PrintingDriver
 {
-    public $name = 'printgcp';
-    public $desc = 'PrintGCPDesc';
+	public $name = 'printgcp';
+	public $desc = 'PrintGCPDesc';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'printer';
-    public $active = 'PRINTING_PRINTGCP';
-    public $conf = array();
-    public $google_id = '';
-    public $google_secret = '';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'printer';
+	public $active = 'PRINTING_PRINTGCP';
+	public $conf = array();
+	public $google_id = '';
+	public $google_secret = '';
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    private $OAUTH_SERVICENAME_GOOGLE = 'Google';
+	private $OAUTH_SERVICENAME_GOOGLE = 'Google';
 
-    const LOGIN_URL = 'https://accounts.google.com/o/oauth2/token';
-    const PRINTERS_SEARCH_URL = 'https://www.google.com/cloudprint/search';
-    const PRINTERS_GET_JOBS = 'https://www.google.com/cloudprint/jobs';
-    const PRINT_URL = 'https://www.google.com/cloudprint/submit';
+	const LOGIN_URL = 'https://accounts.google.com/o/oauth2/token';
+	const PRINTERS_SEARCH_URL = 'https://www.google.com/cloudprint/search';
+	const PRINTERS_GET_JOBS = 'https://www.google.com/cloudprint/jobs';
+	const PRINT_URL = 'https://www.google.com/cloudprint/submit';
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf, $langs, $dolibarr_main_url_root;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $dolibarr_main_url_root;
 
-        // Define $urlwithroot
-        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+		// Define $urlwithroot
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-        $this->db = $db;
+		$this->db = $db;
 
-        if (!$conf->oauth->enabled) {
-            $this->conf[] = array(
-                'varname'=>'PRINTGCP_INFO',
-                'info'=>$langs->transnoentitiesnoconv("WarningModuleNotActive", "OAuth"),
-                'type'=>'info',
-            );
-        } else {
-            $this->google_id = $conf->global->OAUTH_GOOGLE_ID;
-            $this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
-            // Token storage
-            $storage = new DoliStorage($this->db, $this->conf);
-            //$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
-            // Setup the credentials for the requests
-            $credentials = new Credentials(
-                $this->google_id,
-                $this->google_secret,
-                $urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
-            );
-            $access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? 'HasAccessToken' : 'NoAccessToken');
-            $serviceFactory = new \OAuth\ServiceFactory();
-            $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-            $token_ok = true;
-            try {
-                $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $token_ok = false;
-            }
-            //var_dump($this->errors);exit;
+		if (!$conf->oauth->enabled) {
+			$this->conf[] = array(
+				'varname'=>'PRINTGCP_INFO',
+				'info'=>$langs->transnoentitiesnoconv("WarningModuleNotActive", "OAuth"),
+				'type'=>'info',
+			);
+		} else {
+			$this->google_id = $conf->global->OAUTH_GOOGLE_ID;
+			$this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
+			// Token storage
+			$storage = new DoliStorage($this->db, $this->conf);
+			//$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
+			// Setup the credentials for the requests
+			$credentials = new Credentials(
+				$this->google_id,
+				$this->google_secret,
+				$urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
+			);
+			$access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? 'HasAccessToken' : 'NoAccessToken');
+			$serviceFactory = new \OAuth\ServiceFactory();
+			$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+			$token_ok = true;
+			try {
+				$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$token_ok = false;
+			}
+			//var_dump($this->errors);exit;
 
-            $expire = false;
-            // Is token expired or will token expire in the next 30 seconds
-            if ($token_ok) {
-                $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-            }
+			$expire = false;
+			// Is token expired or will token expire in the next 30 seconds
+			if ($token_ok) {
+				$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+			}
 
-            // Token expired so we refresh it
-            if ($token_ok && $expire) {
-                try {
-                    // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                    $refreshtoken = $token->getRefreshToken();
-                    $token = $apiService->refreshAccessToken($token);
-                    $token->setRefreshToken($refreshtoken);
-                    $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-                } catch (Exception $e) {
-                    $this->errors[] = $e->getMessage();
-                }
-            }
-            if ($this->google_id != '' && $this->google_secret != '') {
-                $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
-                $this->conf[] = array(
-                    'varname'=>'PRINTGCP_TOKEN_ACCESS',
-                    'info'=>$access,
-                    'type'=>'info',
-                    'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'),
-                    'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp') : '')
-                );
-                if ($token_ok) {
-                    $expiredat = '';
+			// Token expired so we refresh it
+			if ($token_ok && $expire) {
+				try {
+					// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+					$refreshtoken = $token->getRefreshToken();
+					$token = $apiService->refreshAccessToken($token);
+					$token->setRefreshToken($refreshtoken);
+					$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+				}
+			}
+			if ($this->google_id != '' && $this->google_secret != '') {
+				$this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
+				$this->conf[] = array(
+					'varname'=>'PRINTGCP_TOKEN_ACCESS',
+					'info'=>$access,
+					'type'=>'info',
+					'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'),
+					'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp') : '')
+				);
+				if ($token_ok) {
+					$expiredat = '';
 
-                    $refreshtoken = $token->getRefreshToken();
+					$refreshtoken = $token->getRefreshToken();
 
-                    $endoflife = $token->getEndOfLife();
+					$endoflife = $token->getEndOfLife();
 
-                    if ($endoflife == $token::EOL_NEVER_EXPIRES)
-                    {
-                        $expiredat = $langs->trans("Never");
-                    }
-                    elseif ($endoflife == $token::EOL_UNKNOWN)
-                    {
-                        $expiredat = $langs->trans("Unknown");
-                    }
-                    else
-                    {
-                        $expiredat = dol_print_date($endoflife, "dayhour");
-                    }
+					if ($endoflife == $token::EOL_NEVER_EXPIRES)
+					{
+						$expiredat = $langs->trans("Never");
+					} elseif ($endoflife == $token::EOL_UNKNOWN)
+					{
+						$expiredat = $langs->trans("Unknown");
+					} else {
+						$expiredat = dol_print_date($endoflife, "dayhour");
+					}
 
-                    $this->conf[] = array('varname'=>'TOKEN_REFRESH', 'info'=>((!empty($refreshtoken)) ? 'Yes' : 'No'), 'type'=>'info');
-                    $this->conf[] = array('varname'=>'TOKEN_EXPIRED', 'info'=>($expire ? 'Yes' : 'No'), 'type'=>'info');
-                    $this->conf[] = array('varname'=>'TOKEN_EXPIRE_AT', 'info'=>($expiredat), 'type'=>'info');
-                }
-                /*
+					$this->conf[] = array('varname'=>'TOKEN_REFRESH', 'info'=>((!empty($refreshtoken)) ? 'Yes' : 'No'), 'type'=>'info');
+					$this->conf[] = array('varname'=>'TOKEN_EXPIRED', 'info'=>($expire ? 'Yes' : 'No'), 'type'=>'info');
+					$this->conf[] = array('varname'=>'TOKEN_EXPIRE_AT', 'info'=>($expiredat), 'type'=>'info');
+				}
+				/*
                 if ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)) {
                     $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
-                    $this->conf[] = array('varname'=>'DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
+                    $this->conf[] = array('varname'=>'DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
                 } else {
                     $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
                 }*/
-            } else {
-                $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
-            }
-        }
-        // do not display submit button
-        $this->conf[] = array('enabled'=>0, 'type'=>'submit');
-    }
+			} else {
+				$this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
+			}
+		}
+		// do not display submit button
+		$this->conf[] = array('enabled'=>0, 'type'=>'submit');
+	}
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listAvailablePrinters()
-    {
-        global $conf, $langs;
-        $error = 0;
-        $langs->load('printing');
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listAvailablePrinters()
+	{
+		global $conf, $langs;
+		$error = 0;
+		$langs->load('printing');
 
-        $html = '<tr class="liste_titre">';
-        $html .= '<td>'.$langs->trans('GCP_Name').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_displayName').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_Id').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_OwnerName').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_State').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_connectionStatus').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_Type').'</td>';
-        $html .= '<td class="center">'.$langs->trans("Select").'</td>';
-        $html .= '</tr>'."\n";
-        $list = $this->getlistAvailablePrinters();
-        //$html.= '<td><pre>'.print_r($list,true).'</pre></td>';
-        foreach ($list['available'] as $printer_det)
-        {
-            $html .= '<tr class="oddeven">';
-            $html .= '<td>'.$printer_det['name'].'</td>';
-            $html .= '<td>'.$printer_det['displayName'].'</td>';
-            $html .= '<td>'.$printer_det['id'].'</td>'; // id to identify printer to use
-            $html .= '<td>'.$printer_det['ownerName'].'</td>';
-            $html .= '<td>'.$printer_det['status'].'</td>';
-            $html .= '<td>'.$langs->trans('STATE_'.$printer_det['connectionStatus']).'</td>';
-            $html .= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
-            // Defaut
-            $html .= '<td class="center">';
-            if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
-            {
-                $html .= img_picto($langs->trans("Default"), 'on');
-            }
-            else
-                $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            $html .= '</td>';
-            $html .= '</tr>'."\n";
-        }
-        $this->resprint = $html;
-        return $error;
-    }
+		$html = '<tr class="liste_titre">';
+		$html .= '<td>'.$langs->trans('GCP_Name').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_displayName').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_Id').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_OwnerName').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_State').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_connectionStatus').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_Type').'</td>';
+		$html .= '<td class="center">'.$langs->trans("Select").'</td>';
+		$html .= '</tr>'."\n";
+		$list = $this->getlistAvailablePrinters();
+		//$html.= '<td><pre>'.print_r($list,true).'</pre></td>';
+		foreach ($list['available'] as $printer_det)
+		{
+			$html .= '<tr class="oddeven">';
+			$html .= '<td>'.$printer_det['name'].'</td>';
+			$html .= '<td>'.$printer_det['displayName'].'</td>';
+			$html .= '<td>'.$printer_det['id'].'</td>'; // id to identify printer to use
+			$html .= '<td>'.$printer_det['ownerName'].'</td>';
+			$html .= '<td>'.$printer_det['status'].'</td>';
+			$html .= '<td>'.$langs->trans('STATE_'.$printer_det['connectionStatus']).'</td>';
+			$html .= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
+			// Defaut
+			$html .= '<td class="center">';
+			if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
+			{
+				$html .= img_picto($langs->trans("Default"), 'on');
+			} else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			$html .= '</td>';
+			$html .= '</tr>'."\n";
+		}
+		$this->resprint = $html;
+		return $error;
+	}
 
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return array      list of printers
-     */
-    public function getlistAvailablePrinters()
-    {
-        $ret = array();
-        // Token storage
-        $storage = new DoliStorage($this->db, $this->conf);
-        // Setup the credentials for the requests
-        $credentials = new Credentials(
-            $this->google_id,
-            $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
-        );
-        $serviceFactory = new \OAuth\ServiceFactory();
-        $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-        // Check if we have auth token
-        $token_ok = true;
-        try {
-            $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $token_ok = false;
-        }
-        $expire = false;
-        // Is token expired or will token expire in the next 30 seconds
-        if ($token_ok) {
-            $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-        }
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return array      list of printers
+	 */
+	public function getlistAvailablePrinters()
+	{
+		$ret = array();
+		// Token storage
+		$storage = new DoliStorage($this->db, $this->conf);
+		// Setup the credentials for the requests
+		$credentials = new Credentials(
+			$this->google_id,
+			$this->google_secret,
+			DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
+		);
+		$serviceFactory = new \OAuth\ServiceFactory();
+		$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+		// Check if we have auth token
+		$token_ok = true;
+		try {
+			$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$token_ok = false;
+		}
+		$expire = false;
+		// Is token expired or will token expire in the next 30 seconds
+		if ($token_ok) {
+			$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+		}
 
-        // Token expired so we refresh it
-        if ($token_ok && $expire) {
-            try {
-                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                $refreshtoken = $token->getRefreshToken();
-                $token = $apiService->refreshAccessToken($token);
-                $token->setRefreshToken($refreshtoken);
-                $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-            }
-        }
-        // Send a request with api
-        try {
-            $response = $apiService->request(self::PRINTERS_SEARCH_URL);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            print '<pre>'.print_r($e->getMessage(), true).'</pre>';
-        }
-        //print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
-        $responsedata = json_decode($response, true);
-        $printers = $responsedata['printers'];
-        // Check if we have printers?
-        if (count($printers) == 0) {
-            // We dont have printers so return blank array
-            $ret['available'] = array();
-        } else {
-            // We have printers so returns printers as array
-            $ret['available'] = $printers;
-        }
-        return $ret;
-    }
+		// Token expired so we refresh it
+		if ($token_ok && $expire) {
+			try {
+				// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+				$refreshtoken = $token->getRefreshToken();
+				$token = $apiService->refreshAccessToken($token);
+				$token->setRefreshToken($refreshtoken);
+				$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+			}
+		}
+		// Send a request with api
+		try {
+			$response = $apiService->request(self::PRINTERS_SEARCH_URL);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			print '<pre>'.print_r($e->getMessage(), true).'</pre>';
+		}
+		//print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
+		$responsedata = json_decode($response, true);
+		$printers = $responsedata['printers'];
+		// Check if we have printers?
+		if (count($printers) == 0) {
+			// We dont have printers so return blank array
+			$ret['available'] = array();
+		} else {
+			// We have printers so returns printers as array
+			$ret['available'] = $printers;
+		}
+		return $ret;
+	}
 
-    /**
-     *  Print selected file
-     *
-     * @param   string      $file       file
-     * @param   string      $module     module
-     * @param   string      $subdir     subdir for file
-     * @return  int                     0 if OK, >0 if KO
-     */
-    public function printFile($file, $module, $subdir = '')
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	/**
+	 *  Print selected file
+	 *
+	 * @param   string      $file       file
+	 * @param   string      $module     module
+	 * @param   string      $subdir     subdir for file
+	 * @return  int                     0 if OK, >0 if KO
+	 */
+	public function printFile($file, $module, $subdir = '')
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        global $conf, $user;
-        $error = 0;
+		global $conf, $user;
+		$error = 0;
 
-        $fileprint = $conf->{$module}->dir_output;
-        if ($subdir != '') {
-            $fileprint .= '/'.$subdir;
-        }
-        $fileprint .= '/'.$file;
-        $mimetype = dol_mimetype($fileprint);
-        // select printer uri for module order, propal,...
-        $sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$module."' AND driver='printgcp' AND userid=".$user->id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-                $printer_id = $obj->printer_id;
-            }
-            else
-            {
-                if (!empty($conf->global->PRINTING_GCP_DEFAULT))
-                {
-                    $printer_id = $conf->global->PRINTING_GCP_DEFAULT;
-                }
-                else
-                {
-                    $this->errors[] = 'NoDefaultPrinterDefined';
-                    $error++;
-                    return $error;
-                }
-            }
-        } else {
-            dol_print_error($this->db);
-        }
+		$fileprint = $conf->{$module}->dir_output;
+		if ($subdir != '') {
+			$fileprint .= '/'.$subdir;
+		}
+		$fileprint .= '/'.$file;
+		$mimetype = dol_mimetype($fileprint);
+		// select printer uri for module order, propal,...
+		$sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$this->db->escape($module)."' AND driver='printgcp' AND userid=".$user->id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			if ($obj)
+			{
+				$printer_id = $obj->printer_id;
+			} else {
+				if (!empty($conf->global->PRINTING_GCP_DEFAULT))
+				{
+					$printer_id = $conf->global->PRINTING_GCP_DEFAULT;
+				} else {
+					$this->errors[] = 'NoDefaultPrinterDefined';
+					$error++;
+					return $error;
+				}
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
-        $this->error = 'PRINTGCP: '.$ret['errormessage'];
-        if ($ret['status'] != 1) {
-            $error++;
-        }
-        return $error;
-    }
+		$ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
+		$this->error = 'PRINTGCP: '.$ret['errormessage'];
+		if ($ret['status'] != 1) {
+			$error++;
+		}
+		return $error;
+	}
 
-    /**
-     *  Sends document to the printer
-     *
-     *  @param  string      $printerid      Printer id returned by Google Cloud Print
-     *  @param  string      $printjobtitle  Job Title
-     *  @param  string      $filepath       File Path to be send to Google Cloud Print
-     *  @param  string      $contenttype    File content type by example application/pdf, image/png
-     *  @return array                       status array
-     */
-    public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
-    {
-        // Check if printer id
-        if (empty($printerid)) {
-            return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'No provided printer ID');
-        }
-        // Open the file which needs to be print
-        $handle = fopen($filepath, "rb");
-        if (!$handle) {
-            return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'Could not read the file.');
-        }
-        // Read file content
-        $contents = fread($handle, filesize($filepath));
-        fclose($handle);
-        // Prepare post fields for sending print
-        $post_fields = array(
-            'printerid' => $printerid,
-            'title' => $printjobtitle,
-            'contentTransferEncoding' => 'base64',
-            'content' => base64_encode($contents), // encode file content as base64
-            'contentType' => $contenttype,
-        );
-        // Dolibarr Token storage
-        $storage = new DoliStorage($this->db, $this->conf);
-        // Setup the credentials for the requests
-        $credentials = new Credentials(
-            $this->google_id,
-            $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php?service=google'
-        );
-        $serviceFactory = new \OAuth\ServiceFactory();
-        $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+	/**
+	 *  Sends document to the printer
+	 *
+	 *  @param  string      $printerid      Printer id returned by Google Cloud Print
+	 *  @param  string      $printjobtitle  Job Title
+	 *  @param  string      $filepath       File Path to be send to Google Cloud Print
+	 *  @param  string      $contenttype    File content type by example application/pdf, image/png
+	 *  @return array                       status array
+	 */
+	public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
+	{
+		// Check if printer id
+		if (empty($printerid)) {
+			return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'No provided printer ID');
+		}
+		// Open the file which needs to be print
+		$handle = fopen($filepath, "rb");
+		if (!$handle) {
+			return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'Could not read the file.');
+		}
+		// Read file content
+		$contents = fread($handle, filesize($filepath));
+		fclose($handle);
+		// Prepare post fields for sending print
+		$post_fields = array(
+			'printerid' => $printerid,
+			'title' => $printjobtitle,
+			'contentTransferEncoding' => 'base64',
+			'content' => base64_encode($contents), // encode file content as base64
+			'contentType' => $contenttype,
+		);
+		// Dolibarr Token storage
+		$storage = new DoliStorage($this->db, $this->conf);
+		// Setup the credentials for the requests
+		$credentials = new Credentials(
+			$this->google_id,
+			$this->google_secret,
+			DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php?service=google'
+		);
+		$serviceFactory = new \OAuth\ServiceFactory();
+		$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
 
-        // Check if we have auth token and refresh it
-        $token_ok = true;
-        try {
-            $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $token_ok = false;
-        }
-        if ($token_ok) {
-            try {
-                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                $refreshtoken = $token->getRefreshToken();
-                $token = $apiService->refreshAccessToken($token);
-                $token->setRefreshToken($refreshtoken);
-                $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-            }
-        }
+		// Check if we have auth token and refresh it
+		$token_ok = true;
+		try {
+			$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$token_ok = false;
+		}
+		if ($token_ok) {
+			try {
+				// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+				$refreshtoken = $token->getRefreshToken();
+				$token = $apiService->refreshAccessToken($token);
+				$token->setRefreshToken($refreshtoken);
+				$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+			}
+		}
 
-        // Send a request with api
-        $response = json_decode($apiService->request(self::PRINT_URL, 'POST', $post_fields), true);
-        //print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
-        return array('status' => $response['success'], 'errorcode' => $response['errorCode'], 'errormessage' => $response['message']);
-    }
+		// Send a request with api
+		$response = json_decode($apiService->request(self::PRINT_URL, 'POST', $post_fields), true);
+		//print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
+		return array('status' => $response['success'], 'errorcode' => $response['errorCode'], 'errormessage' => $response['message']);
+	}
 
 
-    /**
-     *  List jobs print
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listJobs()
-    {
-        global $conf, $langs;
+	/**
+	 *  List jobs print
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listJobs()
+	{
+		global $conf, $langs;
 
-        $error = 0;
-        $html = '';
-        // Token storage
-        $storage = new DoliStorage($this->db, $this->conf);
-        // Setup the credentials for the requests
-        $credentials = new Credentials(
-            $this->google_id,
-            $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
-        );
-        $serviceFactory = new \OAuth\ServiceFactory();
-        $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-        // Check if we have auth token
-        $token_ok = true;
-        try {
-            $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $token_ok = false;
-            $error++;
-        }
-        $expire = false;
-        // Is token expired or will token expire in the next 30 seconds
-        if ($token_ok) {
-            $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-        }
+		$error = 0;
+		$html = '';
+		// Token storage
+		$storage = new DoliStorage($this->db, $this->conf);
+		// Setup the credentials for the requests
+		$credentials = new Credentials(
+			$this->google_id,
+			$this->google_secret,
+			DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
+		);
+		$serviceFactory = new \OAuth\ServiceFactory();
+		$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+		// Check if we have auth token
+		$token_ok = true;
+		try {
+			$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$token_ok = false;
+			$error++;
+		}
+		$expire = false;
+		// Is token expired or will token expire in the next 30 seconds
+		if ($token_ok) {
+			$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+		}
 
-        // Token expired so we refresh it
-        if ($token_ok && $expire) {
-            try {
-                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                $refreshtoken = $token->getRefreshToken();
-                $token = $apiService->refreshAccessToken($token);
-                $token->setRefreshToken($refreshtoken);
-                $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $error++;
-            }
-        }
-        // Getting Jobs
-        // Send a request with api
-        try {
-            $response = $apiService->request(self::PRINTERS_GET_JOBS);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $error++;
-        }
-        $responsedata = json_decode($response, true);
-        //$html .= '<pre>'.print_r($responsedata,true).'</pre>';
-        $html .= '<div class="div-table-responsive">';
-        $html .= '<table width="100%" class="noborder">';
-        $html .= '<tr class="liste_titre">';
-        $html .= '<td>'.$langs->trans("Id").'</td>';
-        $html .= '<td>'.$langs->trans("Date").'</td>';
-        $html .= '<td>'.$langs->trans("Owner").'</td>';
-        $html .= '<td>'.$langs->trans("Printer").'</td>';
-        $html .= '<td>'.$langs->trans("Filename").'</td>';
-        $html .= '<td>'.$langs->trans("Status").'</td>';
-        $html .= '<td>'.$langs->trans("Cancel").'</td>';
-        $html .= '</tr>'."\n";
+		// Token expired so we refresh it
+		if ($token_ok && $expire) {
+			try {
+				// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+				$refreshtoken = $token->getRefreshToken();
+				$token = $apiService->refreshAccessToken($token);
+				$token->setRefreshToken($refreshtoken);
+				$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$error++;
+			}
+		}
+		// Getting Jobs
+		// Send a request with api
+		try {
+			$response = $apiService->request(self::PRINTERS_GET_JOBS);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$error++;
+		}
+		$responsedata = json_decode($response, true);
+		//$html .= '<pre>'.print_r($responsedata,true).'</pre>';
+		$html .= '<div class="div-table-responsive">';
+		$html .= '<table width="100%" class="noborder">';
+		$html .= '<tr class="liste_titre">';
+		$html .= '<td>'.$langs->trans("Id").'</td>';
+		$html .= '<td>'.$langs->trans("Date").'</td>';
+		$html .= '<td>'.$langs->trans("Owner").'</td>';
+		$html .= '<td>'.$langs->trans("Printer").'</td>';
+		$html .= '<td>'.$langs->trans("Filename").'</td>';
+		$html .= '<td>'.$langs->trans("Status").'</td>';
+		$html .= '<td>'.$langs->trans("Cancel").'</td>';
+		$html .= '</tr>'."\n";
 
-        $jobs = $responsedata['jobs'];
-        //$html .= '<pre>'.print_r($jobs['0'],true).'</pre>';
-        if (is_array($jobs)) {
-            foreach ($jobs as $value) {
-                $html .= '<tr class="oddeven">';
-                $html .= '<td>'.$value['id'].'</td>';
-                $dates = dol_print_date((int) substr($value['createTime'], 0, 10), 'dayhour');
-                $html .= '<td>'.$dates.'</td>';
-                $html .= '<td>'.$value['ownerId'].'</td>';
-                $html .= '<td>'.$value['printerName'].'</td>';
-                $html .= '<td>'.$value['title'].'</td>';
-                $html .= '<td>'.$value['status'].'</td>';
-                $html .= '<td>&nbsp;</td>';
-                $html .= '</tr>';
-            }
-        }
-        else
-        {
-                $html .= '<tr class="oddeven">';
-                $html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
-                $html .= '</tr>';
-        }
-        $html .= '</table>';
-        $html .= '</div>';
+		$jobs = $responsedata['jobs'];
+		//$html .= '<pre>'.print_r($jobs['0'],true).'</pre>';
+		if (is_array($jobs)) {
+			foreach ($jobs as $value) {
+				$html .= '<tr class="oddeven">';
+				$html .= '<td>'.$value['id'].'</td>';
+				$dates = dol_print_date((int) substr($value['createTime'], 0, 10), 'dayhour');
+				$html .= '<td>'.$dates.'</td>';
+				$html .= '<td>'.$value['ownerId'].'</td>';
+				$html .= '<td>'.$value['printerName'].'</td>';
+				$html .= '<td>'.$value['title'].'</td>';
+				$html .= '<td>'.$value['status'].'</td>';
+				$html .= '<td>&nbsp;</td>';
+				$html .= '</tr>';
+			}
+		} else {
+				$html .= '<tr class="oddeven">';
+				$html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
+				$html .= '</tr>';
+		}
+		$html .= '</table>';
+		$html .= '</div>';
 
-        $this->resprint = $html;
+		$this->resprint = $html;
 
-        return $error;
-    }
+		return $error;
+	}
 }
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 5a3d2481c6d..6b0e528aa1e 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -107,7 +107,7 @@ class printing_printipp extends PrintingDriver
         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 = '".$module."' AND driver = 'printipp' AND userid = ".$user->id;
+        $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);
@@ -115,16 +115,12 @@ class printing_printipp extends PrintingDriver
             {
             	dol_syslog("Found a default printer for user ".$user->id." = ".$obj->printer_id);
                 $ipp->setPrinterURI($obj->printer_id);
-            }
-            else
-            {
+            } 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
-                {
+                } else {
                     $this->errors[] = 'NoDefaultPrinterDefined';
                     $error++;
                     return $error;
@@ -194,7 +190,7 @@ class printing_printipp extends PrintingDriver
             if ($conf->global->PRINTIPP_URI_DEFAULT == $value) {
                 $html .= img_picto($langs->trans("Default"), 'on');
             } else {
-                $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&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 .= '<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";
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index f85984ab9bd..f8460b7483f 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -36,7 +36,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
 	 *
-	 * @param	PDF			$pdf			PDF reference
+	 * @param	TCPDF		$pdf			PDF reference
 	 * @param	Translate	$outputlangs	Output langs
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
@@ -52,7 +52,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 	 * - %LOGO% is replace with company logo
 	 * - %PHOTO% is replace with photo provided as parameter
 	 *
-	 * @param	PDF			$pdf			PDF reference
+	 * @param	TCPDF		$pdf			PDF reference
 	 * @param	string		$textleft		Text left
 	 * @param	string		$header			Header
 	 * @param	string		$footer			Footer
@@ -86,8 +86,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -142,8 +141,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 		if ($tmp['height'])
 		{
 			$imgratio = $tmp['width'] / $tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); }
-			else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
@@ -153,13 +151,11 @@ class pdf_standardlabel extends CommonStickerGenerator
 			// Output left area
 			if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		}
-		elseif ($textleft != '' && $textright != '')	//
+		} elseif ($textleft != '' && $textright != '')	//
 		{
 			if ($textleft == '%LOGO%' || $textleft == '%PHOTO%')
 			{
@@ -167,29 +163,25 @@ class pdf_standardlabel extends CommonStickerGenerator
 				elseif ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			elseif ($textright == '%LOGO%' || $textright == '%PHOTO%')
+			} elseif ($textright == '%LOGO%' || $textright == '%PHOTO%')
 			{
 				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				elseif ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			}
-			else	// text on halft left and text on half right
+			} else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
-		}
-		else	// Only a right part
+		} else // Only a right part
 		{
 			// Output right area
 			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			elseif ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else
-			{
+			else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index 568d850765f..a451df3f17c 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -69,7 +69,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 	/**
 	 * write barcode to pdf
 	 *
-	 * @param PDF	  $pdf		  PDF reference
+	 * @param TCPDF	  $pdf		   PDF reference
 	 * @param string  $code		   code to print
 	 * @param string  $encoding	   type of barcode
 	 * @param boolean $is2d		   true if 2d barcode
@@ -91,7 +91,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
 	 *
-	 * @param	PDF			$pdf			PDF reference
+	 * @param	TCPDF		$pdf			PDF reference
 	 * @param	Translate	$outputlangs	Output langs
 	 * @param	array		$param			Associative array containing label content and optional parameters
 	 * @return	void
@@ -126,8 +126,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			}
-			elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
 			{
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
@@ -166,14 +165,11 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			elseif ($code && !empty($encoding))
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			}
-			else
-			{
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		}
-		elseif ($textleft != '' && $textright != '')	// left and right part
+		} elseif ($textleft != '' && $textright != '')	// left and right part
 		{
 			$logoHeight = $heighttouse / 2;
 			$logoWidth = $widthtouse / 2;
@@ -186,8 +182,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 				}
 				$pdf->SetXY($_PosX + ($widthtouse / 2), $_PosY + $ytop);
 				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			}
-			elseif (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
+			} elseif (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
 			{
 				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + ($widthtouse / 2), $_PosY + $ytop, $logoWidth, 0);
 				elseif ($code && !empty($encoding))
@@ -196,8 +191,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 				}
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			}
-			elseif ($textleft == '%LOGO%')	 // left part logo right part text/barcode
+			} elseif ($textleft == '%LOGO%')	 // left part logo right part text/barcode
 			{
 				if ($logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, 0, $logoHeight);
 				if ($code && !empty($encoding))
@@ -207,8 +201,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 					$pdf->SetXY($_PosX + $xleft + $logoWidth + 1, $_PosY + $ytop);
 					$pdf->MultiCell($widthtouse - $logoWidth - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 				}
-			}
-			elseif ($textright == '%LOGO%')  // right part logo left part text/barcode
+			} elseif ($textright == '%LOGO%')  // right part logo left part text/barcode
 			{
 				if ($logo) $pdf->Image($logo, $_PosX + $xleft + $widthtouse - $logoWidth + 1, $_PosY + $ytop, 0, $logoHeight);
 				if ($code && !empty($encoding))
@@ -218,25 +211,21 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 					$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 					$pdf->MultiCell($widthtouse - $logoWidth - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				}
-			}
-			else	// text on halft left and text on half right
+			} else // text on halft left and text on half right
 			{
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2), $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 				$pdf->SetXY($_PosX + round($this->_Width / 2), $_PosY + $ytop);
 				$pdf->MultiCell(round($this->_Width / 2) - 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
-		}
-		else	// Only a right part
+		} else // Only a right part
 		{
 			// Output right area
 			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, 0, $logoHeight);
 			elseif ($code && !empty($encoding))
 			{
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			}
-			else
-			{
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index f99ddafc4b8..215c3a854ad 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -100,13 +100,10 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		if (!empty($conf->global->ADHERENT_ETIQUETTE_TYPE))
 		{
 			$code = $conf->global->ADHERENT_ETIQUETTE_TYPE;
-		}
-		else
-		{
+		} else {
 			$code = $modele;
 		}
-	}
-	else $code = $modele;
+	} else $code = $modele;
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $template, 2);
@@ -114,8 +111,7 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 	{
 		$template = $tmp[0];
 		$srctemplatepath = $tmp[1];
-	}
-	else $srctemplatepath = $code;
+	} else $srctemplatepath = $code;
 
 	dol_syslog("modele=".$modele." outputdir=".$outputdir." template=".$template." code=".$code." srctemplatepath=".$srctemplatepath." filename=".$filename, LOG_DEBUG);
 
@@ -155,16 +151,12 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		{
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$outputlangs->charset_output = $sav_charset_output;
 			dol_print_error($db, "doc_label_pdf_create Error: ".$obj->error);
 			return -1;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file));
 		return -1;
 	}
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 c0fa4d0f6eb..e1c760ccb32 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
@@ -45,9 +45,9 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -141,8 +141,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -293,9 +292,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -328,9 +325,7 @@ class doc_generic_product_odt extends ModelePDFProduct
                         // 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -366,8 +361,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -384,8 +378,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -416,20 +409,17 @@ class doc_generic_product_odt extends ModelePDFProduct
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('supplierprices');
 					if (!empty($object->supplierprices)) {
 						foreach ($object->supplierprices as $supplierprice)
@@ -441,15 +431,12 @@ class doc_generic_product_odt extends ModelePDFProduct
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($array_lines as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -458,8 +445,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -472,8 +458,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -492,8 +477,7 @@ class doc_generic_product_odt extends ModelePDFProduct
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -513,9 +497,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				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 cbe618b488f..d5e45fa3c73 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -58,9 +58,9 @@ class pdf_standard extends ModelePDFProduct
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -181,9 +181,7 @@ class pdf_standard extends ModelePDFProduct
 			{
 				$dir = $conf->product->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->product->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -334,9 +332,7 @@ class pdf_standard extends ModelePDFProduct
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -573,15 +569,11 @@ class pdf_standard extends ModelePDFProduct
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -740,17 +732,13 @@ class pdf_standard extends ModelePDFProduct
 	        {
 	            $height = pdf_getHeightForLogo($logo);
 	            $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-	        }
-	        else
-	        {
+	        } 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
-	    {
+	    } else {
 	        $text = $this->emetteur->name;
 	        $pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 	    }
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index ba6329004e3..20943a70703 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -207,13 +207,11 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		{
 			$field = 'ref';
 			//$where = ' AND client in (1,2)';
-		}
-		elseif ($type == 1)
+		} elseif ($type == 1)
 		{
 			$field = 'ref';
 			//$where = ' AND fournisseur = 1';
-		}
-		else return -1;
+		} else return -1;
 
 		$now = dol_now();
 
@@ -275,13 +273,10 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
-		}
-		else
-		{
+		} else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
@@ -318,7 +313,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	{
         // phpcs:enable
 		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
-		$sql .= " WHERE ref = '".$code."'";
+		$sql .= " WHERE ref = '".$db->escape($code)."'";
 		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
 
 		$resql = $db->query($sql);
@@ -327,14 +322,10 @@ class mod_codeproduct_elephant extends ModeleProductCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index 706ea0c683a..cfdcbcdb404 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -134,8 +134,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
 		}
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 80bc9f7ce0a..308f98d7828 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -169,9 +169,7 @@ abstract class ModeleProductCode
 				$liste[$row[0]] = $row[1];
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 		return $liste;
@@ -208,16 +206,14 @@ abstract class ModeleProductCode
 			$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>';
-		}
-		elseif ($type == 1)
+		} elseif ($type == 1)
 		{
 			$s .= $langs->trans("RequiredIfService").': ';
 			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>';
-		}
-		elseif ($type == -1)
+		} elseif ($type == -1)
 		{
 			$s .= $langs->trans("Required").': ';
 			if (!empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
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 542ea728f84..fe2b217124e 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
@@ -62,9 +62,9 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -408,8 +408,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -543,9 +542,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -635,21 +632,18 @@ class doc_generic_project_odt extends ModelePDFProjects
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
 				// Replace tags of lines for tasks
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('tasks');
 
 					$taskstatic = new Task($this->db);
@@ -667,15 +661,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 						//complete_substitutions_array($tmparray, $outputlangs, $object, $task, "completesubstitutionarray_lines");
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -718,15 +709,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 								foreach ($tmparray as $key => $val)
 								{
-									try
-									{
+									try {
 										$listlinestaskres->setVars($key, $val, true, 'UTF-8');
-									}
-									catch (OdfException $e)
+									} catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch (SegmentException $e)
+									} catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -768,15 +756,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 								$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
 								foreach ($tmparray as $key => $val)
 								{
-									try
-									{
+									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch (OdfException $e)
+									} catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch (SegmentException $e)
+									} catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -808,15 +793,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 								foreach ($tmparray as $key => $val)
 								{
-									try
-									{
+									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									}
-									catch (OdfException $e)
+									} catch (OdfException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
-									}
-									catch (SegmentException $e)
+									} catch (SegmentException $e)
 									{
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
@@ -841,15 +823,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 							//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -859,8 +838,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$ExceptionTrace = $e->getTrace();
 					// no segment defined on ODT is not an error
@@ -873,8 +851,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 
 				// Replace tags of project files
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -887,15 +864,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -903,8 +877,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -923,8 +896,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				}
 				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
 				{
-					try
-					{
+					try {
 						$listlines = $odfHandler->setSegment('projectcontacts');
 
 						foreach ($contact_arrray as $contact)
@@ -946,15 +918,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 							$tmparray = $this->get_substitutionarray_project_contacts($contact, $outputlangs);
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -962,8 +931,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -1084,8 +1052,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				);
 
 				//Insert reference
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('projectrefs');
 
 					foreach ($listofreferent as $keyref => $valueref)
@@ -1147,15 +1114,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 									foreach ($tmparray as $key => $val)
 									{
-										try
-										{
+										try {
 											$listlines->setVars($key, $val, true, 'UTF-8');
-										}
-										catch (OdfException $e)
+										} catch (OdfException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
-										}
-										catch (SegmentException $e)
+										} catch (SegmentException $e)
 										{
 											dol_syslog($e->getMessage(), LOG_INFO);
 										}
@@ -1216,9 +1180,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 59e3f855ebf..84cc5829571 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -39,75 +39,75 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 class pdf_baleine extends ModelePDFProjects
 {
 	/**
-     * @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 array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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 Company object that emits
+	 * @var Societe object that emits
 	 */
 	public $emetteur;
 
@@ -165,7 +165,7 @@ class pdf_baleine extends ModelePDFProjects
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Function to build pdf project onto disk
 	 *
@@ -175,7 +175,7 @@ class pdf_baleine extends ModelePDFProjects
 	 */
 	public function write_file($object, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -222,22 +222,22 @@ class pdf_baleine extends ModelePDFProjects
 				$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);
+				}
 
 				// Complete object by loading several other informations
 				$task = new Task($this->db);
@@ -300,9 +300,7 @@ class pdf_baleine extends ModelePDFProjects
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -358,16 +356,13 @@ class pdf_baleine extends ModelePDFProjects
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 
 							$forcedesconsamepage = 1;
 							if ($forcedesconsamepage)
@@ -396,8 +391,7 @@ class pdf_baleine extends ModelePDFProjects
 							}
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -451,9 +445,7 @@ class pdf_baleine extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -467,9 +459,7 @@ class pdf_baleine extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -484,8 +474,7 @@ class pdf_baleine extends ModelePDFProjects
 				// Show square
 				if ($pagenb == 1)
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Footer of the page
@@ -503,8 +492,8 @@ class pdf_baleine extends ModelePDFProjects
 				$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))
@@ -513,15 +502,11 @@ class pdf_baleine extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -531,7 +516,7 @@ class pdf_baleine extends ModelePDFProjects
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -582,7 +567,7 @@ class pdf_baleine extends ModelePDFProjects
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Project		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -599,7 +584,7 @@ class pdf_baleine extends ModelePDFProjects
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 		$posy = $this->marge_haute;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
@@ -610,18 +595,15 @@ class pdf_baleine extends ModelePDFProjects
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -675,8 +657,8 @@ class pdf_baleine extends ModelePDFProjects
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
-     *
-	 *  @param	PDF			$pdf     			PDF
+	 *
+	 *  @param	TCPDF		$pdf     			PDF
 	 *  @param	Project		$object				Object to show
 	 *  @param	Translate	$outputlangs		Object lang for output
 	 *  @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 4044676461e..1309f329e30 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -54,11 +54,11 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 class pdf_beluga extends ModelePDFProjects
 {
-    /**
-     * Page orientation
-     * @var string 'P' or 'Portait' (default), 'L' or 'Landscape'
-     */
-    private $orientation = '';
+	/**
+	 * Page orientation
+	 * @var string 'P' or 'Portait' (default), 'L' or 'Landscape'
+	 */
+	private $orientation = '';
 
 	/**
 	 * Issuer
@@ -85,14 +85,14 @@ class pdf_beluga extends ModelePDFProjects
 		// Page size for A4 format
 		$this->type = 'pdf';
 		$formatarray = pdf_getFormat();
-        $this->orientation = 'L';
-        if ($this->orientation == 'L' || $this->orientation == 'Landscape') {
-            $this->page_largeur = $formatarray['height'];
-            $this->page_hauteur = $formatarray['width'];
-        } else {
-            $this->page_largeur = $formatarray['width'];
-            $this->page_hauteur = $formatarray['height'];
-        }
+		$this->orientation = 'L';
+		if ($this->orientation == 'L' || $this->orientation == 'Landscape') {
+			$this->page_largeur = $formatarray['height'];
+			$this->page_hauteur = $formatarray['width'];
+		} else {
+			$this->page_largeur = $formatarray['width'];
+			$this->page_hauteur = $formatarray['height'];
+		}
 		$this->format = array($this->page_largeur, $this->page_hauteur);
 		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
 		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
@@ -107,22 +107,22 @@ class pdf_beluga extends ModelePDFProjects
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
-        // Define position of columns
-        if ($this->orientation == 'L' || $this->orientation == 'Landscape') {
-            $this->posxref = $this->marge_gauche + 1;
-            $this->posxdate = $this->marge_gauche + 105;
-            $this->posxsociety = $this->marge_gauche + 125;
-            $this->posxamountht = $this->marge_gauche + 190;
-            $this->posxamountttc = $this->marge_gauche + 215;
-            $this->posxstatut = $this->marge_gauche + 245;
-        } else {
-            $this->posxref = $this->marge_gauche + 1;
-            $this->posxdate = $this->marge_gauche + 25;
-            $this->posxsociety = $this->marge_gauche + 45;
-            $this->posxamountht = $this->marge_gauche + 110;
-            $this->posxamountttc = $this->marge_gauche + 135;
-            $this->posxstatut = $this->marge_gauche + 165;
-        }
+		// Define position of columns
+		if ($this->orientation == 'L' || $this->orientation == 'Landscape') {
+			$this->posxref = $this->marge_gauche + 1;
+			$this->posxdate = $this->marge_gauche + 105;
+			$this->posxsociety = $this->marge_gauche + 125;
+			$this->posxamountht = $this->marge_gauche + 190;
+			$this->posxamountttc = $this->marge_gauche + 215;
+			$this->posxstatut = $this->marge_gauche + 245;
+		} else {
+			$this->posxref = $this->marge_gauche + 1;
+			$this->posxdate = $this->marge_gauche + 25;
+			$this->posxsociety = $this->marge_gauche + 45;
+			$this->posxamountht = $this->marge_gauche + 110;
+			$this->posxamountttc = $this->marge_gauche + 135;
+			$this->posxstatut = $this->marge_gauche + 165;
+		}
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$this->posxref -= 20;
@@ -135,7 +135,7 @@ class pdf_beluga extends ModelePDFProjects
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fonction generant le projet sur le disque
 	 *
@@ -145,10 +145,10 @@ class pdf_beluga extends ModelePDFProjects
 	 */
 	public function write_file($object, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
-        $formproject = new FormProjets($this->db);
+		$formproject = new FormProjets($this->db);
 
 		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
@@ -194,22 +194,22 @@ class pdf_beluga extends ModelePDFProjects
 				$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);
+				}
 
 				// Complete object by loading several other informations
 				$task = new Task($this->db);
@@ -273,9 +273,7 @@ class pdf_beluga extends ModelePDFProjects
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -284,371 +282,363 @@ class pdf_beluga extends ModelePDFProjects
 				$curY = $tab_top + $heightoftitleline + 1;
 				$nexY = $tab_top + $heightoftitleline + 1;
 
-                $listofreferent = array(
-                    'propal'=>array(
-                    	'name'=>"Proposals",
-                    	'title'=>"ListProposalsAssociatedProject",
-                    	'class'=>'Propal',
-                    	'table'=>'propal',
-                        'datefieldname'=>'datep',
-                    	'test'=>$conf->propal->enabled && $user->rights->propale->lire,
-                        'lang'=>'propal'),
-                    'order'=>array(
-                    	'name'=>"CustomersOrders",
-                    	'title'=>"ListOrdersAssociatedProject",
-                    	'class'=>'Commande',
-                    	'table'=>'commande',
-                    	'datefieldname'=>'date_commande',
-                    	'test'=>$conf->commande->enabled && $user->rights->commande->lire,
-                        'lang'=>'orders'),
-                    'invoice'=>array(
-                    	'name'=>"CustomersInvoices",
-                    	'title'=>"ListInvoicesAssociatedProject",
-                    	'class'=>'Facture',
-                    	'margin'=>'add',
-                    	'table'=>'facture',
-                    	'datefieldname'=>'datef',
-                    	'test'=>$conf->facture->enabled && $user->rights->facture->lire,
-                        'lang'=>'bills'),
-                    'invoice_predefined'=>array(
-                    	'name'=>"PredefinedInvoices",
-                    	'title'=>"ListPredefinedInvoicesAssociatedProject",
-                    	'class'=>'FactureRec',
-                    	'table'=>'facture_rec',
-                    	'datefieldname'=>'datec',
-                    	'test'=>$conf->facture->enabled && $user->rights->facture->lire,
-                        'lang'=>'bills'),
-                    'order_supplier'=>array(
-                    	'name'=>"SuppliersOrders",
-                    	'title'=>"ListSupplierOrdersAssociatedProject",
-                    	'class'=>'CommandeFournisseur',
-                    	'table'=>'commande_fournisseur',
-                    	'datefieldname'=>'date_commande',
-                    	'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire,
-                        'lang'=>'orders'),
-                    'invoice_supplier'=>array(
-                    	'name'=>"BillsSuppliers",
-                    	'title'=>"ListSupplierInvoicesAssociatedProject",
-                    	'class'=>'FactureFournisseur',
-                    	'margin'=>'minus',
-                    	'table'=>'facture_fourn',
-                    	'datefieldname'=>'datef',
-                    	'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire,
-                        'lang'=>'bills'),
-                    'contract'=>array(
-                    	'name'=>"Contracts",
-                    	'title'=>"ListContractAssociatedProject",
-                    	'class'=>'Contrat',
-                    	'table'=>'contrat',
-                    	'datefieldname'=>'date_contrat',
-                    	'test'=>$conf->contrat->enabled && $user->rights->contrat->lire,
-                        'lang'=>'contract'),
-                    'intervention'=>array(
-                    	'name'=>"Interventions",
-                    	'title'=>"ListFichinterAssociatedProject",
-                    	'class'=>'Fichinter',
-                    	'table'=>'fichinter',
-                    	'datefieldname'=>'date_valid',
-                    	'disableamount'=>1,
-                    	'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire,
-                        'lang'=>'interventions'),
-                    'trip'=>array(
-                    	'name'=>"TripsAndExpenses",
-                    	'title'=>"ListExpenseReportsAssociatedProject",
-                    	'class'=>'Deplacement',
-                    	'table'=>'deplacement',
-                    	'datefieldname'=>'dated',
-                    	'margin'=>'minus',
-                    	'disableamount'=>1,
-                    	'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire,
-                        'lang'=>'trip'),
-                    'expensereport'=>array(
-                    	'name'=>"ExpensesReports",
-                    	'title'=>"ListExpenseReportsAssociatedProject",
-                    	'class'=>'ExpenseReport',
-                    	'table'=>'expensereport',
-                    	'datefieldname'=>'dated',
-                    	'margin'=>'minus',
-                    	'disableamount'=>1,
-                    	'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire,
-                        'lang'=>'trip'),
-                    'agenda'=>array(
-                    	'name'=>"Agenda",
-                    	'title'=>"ListActionsAssociatedProject",
-                    	'class'=>'ActionComm',
-                    	'table'=>'actioncomm',
-                    	'datefieldname'=>'datep',
-                    	'disableamount'=>1,
-                    	'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->read,
-                        'lang'=>'agenda')
-                );
+				$listofreferent = array(
+					'propal'=>array(
+						'name'=>"Proposals",
+						'title'=>"ListProposalsAssociatedProject",
+						'class'=>'Propal',
+						'table'=>'propal',
+						'datefieldname'=>'datep',
+						'test'=>$conf->propal->enabled && $user->rights->propale->lire,
+						'lang'=>'propal'),
+					'order'=>array(
+						'name'=>"CustomersOrders",
+						'title'=>"ListOrdersAssociatedProject",
+						'class'=>'Commande',
+						'table'=>'commande',
+						'datefieldname'=>'date_commande',
+						'test'=>$conf->commande->enabled && $user->rights->commande->lire,
+						'lang'=>'orders'),
+					'invoice'=>array(
+						'name'=>"CustomersInvoices",
+						'title'=>"ListInvoicesAssociatedProject",
+						'class'=>'Facture',
+						'margin'=>'add',
+						'table'=>'facture',
+						'datefieldname'=>'datef',
+						'test'=>$conf->facture->enabled && $user->rights->facture->lire,
+						'lang'=>'bills'),
+					'invoice_predefined'=>array(
+						'name'=>"PredefinedInvoices",
+						'title'=>"ListPredefinedInvoicesAssociatedProject",
+						'class'=>'FactureRec',
+						'table'=>'facture_rec',
+						'datefieldname'=>'datec',
+						'test'=>$conf->facture->enabled && $user->rights->facture->lire,
+						'lang'=>'bills'),
+					'order_supplier'=>array(
+						'name'=>"SuppliersOrders",
+						'title'=>"ListSupplierOrdersAssociatedProject",
+						'class'=>'CommandeFournisseur',
+						'table'=>'commande_fournisseur',
+						'datefieldname'=>'date_commande',
+						'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire,
+						'lang'=>'orders'),
+					'invoice_supplier'=>array(
+						'name'=>"BillsSuppliers",
+						'title'=>"ListSupplierInvoicesAssociatedProject",
+						'class'=>'FactureFournisseur',
+						'margin'=>'minus',
+						'table'=>'facture_fourn',
+						'datefieldname'=>'datef',
+						'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire,
+						'lang'=>'bills'),
+					'contract'=>array(
+						'name'=>"Contracts",
+						'title'=>"ListContractAssociatedProject",
+						'class'=>'Contrat',
+						'table'=>'contrat',
+						'datefieldname'=>'date_contrat',
+						'test'=>$conf->contrat->enabled && $user->rights->contrat->lire,
+						'lang'=>'contract'),
+					'intervention'=>array(
+						'name'=>"Interventions",
+						'title'=>"ListFichinterAssociatedProject",
+						'class'=>'Fichinter',
+						'table'=>'fichinter',
+						'datefieldname'=>'date_valid',
+						'disableamount'=>1,
+						'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire,
+						'lang'=>'interventions'),
+					'trip'=>array(
+						'name'=>"TripsAndExpenses",
+						'title'=>"ListExpenseReportsAssociatedProject",
+						'class'=>'Deplacement',
+						'table'=>'deplacement',
+						'datefieldname'=>'dated',
+						'margin'=>'minus',
+						'disableamount'=>1,
+						'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire,
+						'lang'=>'trip'),
+					'expensereport'=>array(
+						'name'=>"ExpensesReports",
+						'title'=>"ListExpenseReportsAssociatedProject",
+						'class'=>'ExpenseReport',
+						'table'=>'expensereport',
+						'datefieldname'=>'dated',
+						'margin'=>'minus',
+						'disableamount'=>1,
+						'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire,
+						'lang'=>'trip'),
+					'agenda'=>array(
+						'name'=>"Agenda",
+						'title'=>"ListActionsAssociatedProject",
+						'class'=>'ActionComm',
+						'table'=>'actioncomm',
+						'datefieldname'=>'datep',
+						'disableamount'=>1,
+						'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->read,
+						'lang'=>'agenda')
+				);
 
-                $hookmanager->initHooks(array('completeListOfReferent'));
-                $hookmanager->executeHooks('completeListOfReferent', ['listofreferent'=>$listofreferent], $object, $action);
-                if (!empty($hookmanager->resArray)) {
-                    $listofreferent = array_merge($listofreferent, $hookmanager->resArray);
-                }
+				$hookmanager->initHooks(array('completeListOfReferent'));
+				$hookmanager->executeHooks('completeListOfReferent', ['listofreferent'=>$listofreferent], $object, $action);
+				if (!empty($hookmanager->resArray)) {
+					$listofreferent = array_merge($listofreferent, $hookmanager->resArray);
+				}
 
-                foreach ($listofreferent as $key => $value)
-                {
-                	$title = $value['title'];
-                	$classname = $value['class'];
-                	$tablename = $value['table'];
-                	$datefieldname = $value['datefieldname'];
-                	$qualified = $value['test'];
-                	$langstoload = $value['lang'];
-                    $projectField = isset($value['project_field']) ? $value['project_field'] : 'fk_projet';
-                	$langs->load($langstoload);
+				foreach ($listofreferent as $key => $value)
+				{
+					$title = $value['title'];
+					$classname = $value['class'];
+					$tablename = $value['table'];
+					$datefieldname = $value['datefieldname'];
+					$qualified = $value['test'];
+					$langstoload = $value['lang'];
+					$projectField = isset($value['project_field']) ? $value['project_field'] : 'fk_projet';
+					$langs->load($langstoload);
 
-                    if (!$qualified) continue;
+					if (!$qualified) continue;
 
-                    //var_dump("$key, $tablename, $datefieldname, $dates, $datee");
-                    $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, $projectField);
+					//var_dump("$key, $tablename, $datefieldname, $dates, $datee");
+					$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, $projectField);
 
-                    $num = count($elementarray);
-                    if ($num >= 0)
-                    {
-                        $nexY = $pdf->GetY() + 5;
+					$num = count($elementarray);
+					if ($num >= 0)
+					{
+						$nexY = $pdf->GetY() + 5;
 
-                        $curY = $nexY;
-                        $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
-                        $pdf->SetTextColor(0, 0, 0);
+						$curY = $nexY;
+						$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+						$pdf->SetTextColor(0, 0, 0);
 
-                        $pdf->SetXY($this->posxref, $curY);
-                        $pdf->MultiCell($this->posxstatut - $this->posxref, 3, $outputlangs->transnoentities($title), 0, 'L');
+						$pdf->SetXY($this->posxref, $curY);
+						$pdf->MultiCell($this->posxstatut - $this->posxref, 3, $outputlangs->transnoentities($title), 0, 'L');
 
-                        $selectList = $formproject->select_element($tablename, $project->thirdparty->id, '', -2, $projectField);
-                        $nexY = $pdf->GetY() + 1;
-                        $curY = $nexY;
-                        $pdf->SetXY($this->posxref, $curY);
-                        $pdf->MultiCell($this->posxdate - $this->posxref, 3, $outputlangs->transnoentities("Ref"), 1, 'L');
-                        $pdf->SetXY($this->posxdate, $curY);
-                        $pdf->MultiCell($this->posxsociety - $this->posxdate, 3, $outputlangs->transnoentities("Date"), 1, 'C');
-                        $pdf->SetXY($this->posxsociety, $curY);
-                        $titlethirdparty = $outputlangs->transnoentities("ThirdParty");
-                        if ($classname == 'ExpenseReport') $titlethirdparty = $langs->trans("User");
-                        $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $titlethirdparty, 1, 'L');
-                        if (empty($value['disableamount'])) {
-                            $pdf->SetXY($this->posxamountht, $curY);
-                            $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHTShort"), 1, 'R');
-                            $pdf->SetXY($this->posxamountttc, $curY);
-                            $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTCShort"), 1, 'R');
-                        } else {
-                            $pdf->SetXY($this->posxamountht, $curY);
-                            $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
-                        }
-                        $pdf->SetXY($this->posxstatut, $curY);
-                        $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Status"), 1, 'R');
+						$selectList = $formproject->select_element($tablename, $project->thirdparty->id, '', -2, $projectField);
+						$nexY = $pdf->GetY() + 1;
+						$curY = $nexY;
+						$pdf->SetXY($this->posxref, $curY);
+						$pdf->MultiCell($this->posxdate - $this->posxref, 3, $outputlangs->transnoentities("Ref"), 1, 'L');
+						$pdf->SetXY($this->posxdate, $curY);
+						$pdf->MultiCell($this->posxsociety - $this->posxdate, 3, $outputlangs->transnoentities("Date"), 1, 'C');
+						$pdf->SetXY($this->posxsociety, $curY);
+						$titlethirdparty = $outputlangs->transnoentities("ThirdParty");
+						if ($classname == 'ExpenseReport') $titlethirdparty = $langs->trans("User");
+						$pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $titlethirdparty, 1, 'L');
+						if (empty($value['disableamount'])) {
+							$pdf->SetXY($this->posxamountht, $curY);
+							$pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHTShort"), 1, 'R');
+							$pdf->SetXY($this->posxamountttc, $curY);
+							$pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTCShort"), 1, 'R');
+						} else {
+							$pdf->SetXY($this->posxamountht, $curY);
+							$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
+						}
+						$pdf->SetXY($this->posxstatut, $curY);
+						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Status"), 1, 'R');
 
-                        if (is_array($elementarray) && count($elementarray) > 0)
-                        {
-                            $nexY = $pdf->GetY();
+						if (is_array($elementarray) && count($elementarray) > 0)
+						{
+							$nexY = $pdf->GetY();
 
-                            $total_ht = 0;
-                            $total_ttc = 0;
-                            $num = count($elementarray);
+							$total_ht = 0;
+							$total_ttc = 0;
+							$num = count($elementarray);
 
-				            // Loop on each lines
-				            for ($i = 0; $i < $num; $i++)
-				            {
-					            $curY = $nexY;
-					            $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
-					            $pdf->SetTextColor(0, 0, 0);
+							// Loop on each lines
+							for ($i = 0; $i < $num; $i++)
+							{
+								$curY = $nexY;
+								$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+								$pdf->SetTextColor(0, 0, 0);
 
-					            $pdf->setTopMargin($tab_top_newpage);
-					            $pdf->setPageOrientation($this->orientation, 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
-					            $pageposbefore = $pdf->getPage();
+								$pdf->setTopMargin($tab_top_newpage);
+								$pdf->setPageOrientation($this->orientation, 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+								$pageposbefore = $pdf->getPage();
 
-					            // Description of line
-					            $idofelement = $elementarray[$i];
-                             	if ($classname == 'ExpenseReport')
-                               	{
-                               		// We get id of expense report
-                               		$expensereportline = new ExpenseReportLine($this->db);
-                               		$expensereportline->fetch($idofelement);
-                               		$idofelement = $expensereportline->fk_expensereport;
-                               	}
+								// Description of line
+								$idofelement = $elementarray[$i];
+							 	if ($classname == 'ExpenseReport')
+							   	{
+							   		// We get id of expense report
+							   		$expensereportline = new ExpenseReportLine($this->db);
+							   		$expensereportline->fetch($idofelement);
+							   		$idofelement = $expensereportline->fk_expensereport;
+							   	}
 
-                                $element = new $classname($this->db);
-                                $element->fetch($idofelement);
-                                $element->fetch_thirdparty();
-                                // print $classname;
+								$element = new $classname($this->db);
+								$element->fetch($idofelement);
+								$element->fetch_thirdparty();
+								// print $classname;
 
-                                $qualifiedfortotal = true;
-                                if ($key == 'invoice') {
-                                    if ($element->close_code == 'replaced')
-                                        $qualifiedfortotal = false; // Replacement invoice
-                                }
+								$qualifiedfortotal = true;
+								if ($key == 'invoice') {
+									if ($element->close_code == 'replaced')
+										$qualifiedfortotal = false; // Replacement invoice
+								}
 
-					            $showpricebeforepagebreak = 1;
+								$showpricebeforepagebreak = 1;
 
-					            $pdf->startTransaction();
-					            // Label
-					            $pdf->SetXY($this->posxref, $curY);
-					            $pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
-					            $pageposafter = $pdf->getPage();
-					            if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					            {
-						            $pdf->rollbackTransaction(true);
-						            $pageposafter = $pageposbefore;
-						            //print $pageposafter.'-'.$pageposbefore;exit;
-						            $pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
-						            // Label
-						            $pdf->SetXY($this->posxref, $curY);
-						            $posybefore = $pdf->GetY();
-						            $pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
-						            $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 == ($num - 1))	// No more lines, and no space left to show total, so we create a new page
-							            {
-								            $pdf->AddPage($this->orientation, '', 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
+								$pdf->startTransaction();
+								// Label
+								$pdf->SetXY($this->posxref, $curY);
+								$pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
+								$pageposafter = $pdf->getPage();
+								if ($pageposafter > $pageposbefore)	// There is a pagebreak
+								{
+									$pdf->rollbackTransaction(true);
+									$pageposafter = $pageposbefore;
+									//print $pageposafter.'-'.$pageposbefore;exit;
+									$pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+									// Label
+									$pdf->SetXY($this->posxref, $curY);
+									$posybefore = $pdf->GetY();
+									$pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
+									$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 == ($num - 1))	// No more lines, and no space left to show total, so we create a new page
+										{
+											$pdf->AddPage($this->orientation, '', 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 $showpricebeforepagebreak = 0;
 
-							            $forcedesconsamepage = 1;
-							            if ($forcedesconsamepage)
-							            {
-								            $pdf->rollbackTransaction(true);
-								            $pageposafter = $pageposbefore;
-								            $pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+										$forcedesconsamepage = 1;
+										if ($forcedesconsamepage)
+										{
+											$pdf->rollbackTransaction(true);
+											$pageposafter = $pageposbefore;
+											$pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
-								            $pdf->AddPage($this->orientation, '', 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);
-								            $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
-								            $pdf->MultiCell(0, 3, ''); // Set interline to 3
-								            $pdf->SetTextColor(0, 0, 0);
+											$pdf->AddPage($this->orientation, '', 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);
+											$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+											$pdf->MultiCell(0, 3, ''); // Set interline to 3
+											$pdf->SetTextColor(0, 0, 0);
 
-								            $pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
-								            $curY = $tab_top_newpage + $heightoftitleline + 1;
+											$pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+											$curY = $tab_top_newpage + $heightoftitleline + 1;
 
-								            // Label
-								            $pdf->SetXY($this->posxref, $curY);
-								            $posybefore = $pdf->GetY();
-								            $pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
-								            $pageposafter = $pdf->getPage();
-								            $posyafter = $pdf->GetY();
-							            }
-						            }
-						            //var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					            }
-					            else	// No pagebreak
-					            {
-						            $pdf->commitTransaction();
-					            }
-					            $posYAfterDescription = $pdf->GetY();
+											// Label
+											$pdf->SetXY($this->posxref, $curY);
+											$posybefore = $pdf->GetY();
+											$pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
+											$pageposafter = $pdf->getPage();
+											$posyafter = $pdf->GetY();
+										}
+									}
+									//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
+								} else // No pagebreak
+								{
+									$pdf->commitTransaction();
+								}
+								$posYAfterDescription = $pdf->GetY();
 
-					            $nexY = $pdf->GetY();
-					            $pageposafter = $pdf->getPage();
-					            $pdf->setPage($pageposbefore);
-					            $pdf->setTopMargin($this->marge_haute);
-					            $pdf->setPageOrientation($this->orientation, 1, 0); // The only function to edit the bottom margin of current page to set it.
+								$nexY = $pdf->GetY();
+								$pageposafter = $pdf->getPage();
+								$pdf->setPage($pageposbefore);
+								$pdf->setTopMargin($this->marge_haute);
+								$pdf->setPageOrientation($this->orientation, 1, 0); // The only function to edit the bottom margin of current page to set it.
 
-					            // We suppose that a too long description is moved completely on next page
-					            if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-						            //var_dump($pageposbefore.'-'.$pageposafter.'-'.$showpricebeforepagebreak);
-						            $pdf->setPage($pageposafter); $curY = $tab_top_newpage + $heightoftitleline + 1;
-					            }
+								// We suppose that a too long description is moved completely on next page
+								if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+									//var_dump($pageposbefore.'-'.$pageposafter.'-'.$showpricebeforepagebreak);
+									$pdf->setPage($pageposafter); $curY = $tab_top_newpage + $heightoftitleline + 1;
+								}
 
-					            $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
-					            // Date
-					            if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
-						            $date = $element->date_commande;
-					            else {
-						            $date = $element->date;
-						            if (empty($date))
-							            $date = $element->datep;
-						            if (empty($date))
-							            $date = $element->date_contrat;
-						            if (empty($date))
-							            $date = $element->datev; // Fiche inter
-					            }
+								// Date
+								if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
+									$date = $element->date_commande;
+								else {
+									$date = $element->date;
+									if (empty($date))
+										$date = $element->datep;
+									if (empty($date))
+										$date = $element->date_contrat;
+									if (empty($date))
+										$date = $element->datev; // Fiche inter
+								}
 
-					            $pdf->SetXY($this->posxdate, $curY);
-					            $pdf->MultiCell($this->posxsociety - $this->posxdate, 3, dol_print_date($date, 'day'), 1, 'C');
+								$pdf->SetXY($this->posxdate, $curY);
+								$pdf->MultiCell($this->posxsociety - $this->posxdate, 3, dol_print_date($date, 'day'), 1, 'C');
 
-					            $pdf->SetXY($this->posxsociety, $curY);
-					            if ($classname == 'ExpenseReport')
-					            {
-						            $fuser = new User($this->db);
-						            $fuser->fetch($element->fk_user_author);
-						            $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $fuser->getFullName($outputlangs), 1, 'L');
-					            }
-					            else
-					            {
-						            $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, (is_object($element->thirdparty) ? $element->thirdparty->name : ''), 1, 'L');
-					            }
+								$pdf->SetXY($this->posxsociety, $curY);
+								if ($classname == 'ExpenseReport')
+								{
+									$fuser = new User($this->db);
+									$fuser->fetch($element->fk_user_author);
+									$pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $fuser->getFullName($outputlangs), 1, 'L');
+								} else {
+									$pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, (is_object($element->thirdparty) ? $element->thirdparty->name : ''), 1, 'L');
+								}
 
-                                // Amount without tax
-                                if (empty($value['disableamount'])) {
-                                    $pdf->SetXY($this->posxamountht, $curY);
-                                    $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($element->total_ht) : ''), 1, 'R');
-                                    $pdf->SetXY($this->posxamountttc, $curY);
-                                    $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($element->total_ttc) : ''), 1, 'R');
-                                } else {
-                                	$pdf->SetXY($this->posxamountht, $curY);
-                                	if ($key == 'agenda')
-                                	{
-                                		$textforamount = dol_trunc($element->label, 26);
-                                		$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, $textforamount, 1, 'L');
-                                	}
-                                	else
-                                	{
-	                                    $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
-                                	}
-                                }
+								// Amount without tax
+								if (empty($value['disableamount'])) {
+									$pdf->SetXY($this->posxamountht, $curY);
+									$pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($element->total_ht) : ''), 1, 'R');
+									$pdf->SetXY($this->posxamountttc, $curY);
+									$pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($element->total_ttc) : ''), 1, 'R');
+								} else {
+									$pdf->SetXY($this->posxamountht, $curY);
+									if ($key == 'agenda')
+									{
+										$textforamount = dol_trunc($element->label, 26);
+										$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, $textforamount, 1, 'L');
+									} else {
+										$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
+									}
+								}
 
-                                // Status
-                                if ($element instanceof CommonInvoice) {
-                                    // This applies for Facture and FactureFournisseur
-                                    $outputstatut = $element->getLibStatut(1, $element->getSommePaiement());
-                                } else {
-                                    $outputstatut = $element->getLibStatut(1);
-                                }
-                                $pdf->SetXY($this->posxstatut, $curY);
-                                $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputstatut, 1, 'R', false, 1, '', '', true, 0, true);
+								// Status
+								if ($element instanceof CommonInvoice) {
+									// This applies for Facture and FactureFournisseur
+									$outputstatut = $element->getLibStatut(1, $element->getSommePaiement());
+								} else {
+									$outputstatut = $element->getLibStatut(1);
+								}
+								$pdf->SetXY($this->posxstatut, $curY);
+								$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputstatut, 1, 'R', false, 1, '', '', true, 0, true);
 
-                                if ($qualifiedfortotal) {
-                                    $total_ht = $total_ht + $element->total_ht;
-                                    $total_ttc = $total_ttc + $element->total_ttc;
-                                }
-                                $nexY = $pdf->GetY();
-                                $curY = $nexY;
-                            }
+								if ($qualifiedfortotal) {
+									$total_ht = $total_ht + $element->total_ht;
+									$total_ttc = $total_ttc + $element->total_ttc;
+								}
+								$nexY = $pdf->GetY();
+								$curY = $nexY;
+							}
 
-                            if (empty($value['disableamount'])) {
-                                $curY = $nexY;
-                                $pdf->SetXY($this->posxref, $curY);
-                                $pdf->MultiCell($this->posxamountttc - $this->posxref, 3, "TOTAL", 1, 'L');
-                                $pdf->SetXY($this->posxamountht, $curY);
-                                $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($total_ht) : ''), 1, 'R');
-                                $pdf->SetXY($this->posxamountttc, $curY);
-                                $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($total_ttc) : ''), 1, 'R');
-                                $pdf->SetXY($this->posxstatut, $curY);
-                                $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Nb")." ".$num, 1, 'L');
-                            }
-                            $nexY = $pdf->GetY() + 5;
-                            $curY = $nexY;
-                        }
-                    }
+							if (empty($value['disableamount'])) {
+								$curY = $nexY;
+								$pdf->SetXY($this->posxref, $curY);
+								$pdf->MultiCell($this->posxamountttc - $this->posxref, 3, "TOTAL", 1, 'L');
+								$pdf->SetXY($this->posxamountht, $curY);
+								$pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, (isset($element->total_ht) ? price($total_ht) : ''), 1, 'R');
+								$pdf->SetXY($this->posxamountttc, $curY);
+								$pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($total_ttc) : ''), 1, 'R');
+								$pdf->SetXY($this->posxstatut, $curY);
+								$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Nb")." ".$num, 1, 'L');
+							}
+							$nexY = $pdf->GetY() + 5;
+							$curY = $nexY;
+						}
+					}
 
-                    $nexY += 2; // Add space between lines
+					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
@@ -677,8 +667,8 @@ class pdf_beluga extends ModelePDFProjects
 				$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))
@@ -687,15 +677,11 @@ class pdf_beluga extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -705,7 +691,7 @@ class pdf_beluga extends ModelePDFProjects
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -756,7 +742,7 @@ class pdf_beluga extends ModelePDFProjects
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Project		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -773,7 +759,7 @@ class pdf_beluga extends ModelePDFProjects
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 		$posy = $this->marge_haute;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
@@ -784,18 +770,15 @@ class pdf_beluga extends ModelePDFProjects
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -825,8 +808,8 @@ class pdf_beluga extends ModelePDFProjects
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
-     *
-	 *  @param	PDF			$pdf     			PDF
+	 *
+	 *  @param	TCPDF		$pdf     			PDF
 	 *  @param	Project		$object				Object to show
 	 *  @param	Translate	$outputlangs		Object lang for output
 	 *  @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 2a13aa8ab57..3f30391117b 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -97,7 +97,7 @@ class pdf_timespent extends ModelePDFProjects
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Fonction generant le projet sur le disque
 	 *
@@ -107,7 +107,7 @@ class pdf_timespent extends ModelePDFProjects
 	 */
 	public function write_file($object, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -154,30 +154,30 @@ class pdf_timespent extends ModelePDFProjects
 				$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)
+				$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 (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);
+				}
 
 				// Complete object by loading several other informations
 				$task = new Task($this->db);
 				$tasksarray = $task->getTasksArray(0, 0, $object->id);
 
-                if (!$object->id > 0)  // Special case when used with object = specimen, we may return all lines
-                {
-                    $tasksarray = array_slice($tasksarray, 0, min(5, count($tasksarray)));
-                }
+				if (!$object->id > 0)  // Special case when used with object = specimen, we may return all lines
+				{
+					$tasksarray = array_slice($tasksarray, 0, min(5, count($tasksarray)));
+				}
 
 				$object->lines = $tasksarray;
 				$nblines = count($object->lines);
@@ -231,9 +231,7 @@ class pdf_timespent extends ModelePDFProjects
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -289,16 +287,13 @@ class pdf_timespent extends ModelePDFProjects
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 
 							$forcedesconsamepage = 1;
 							if ($forcedesconsamepage)
@@ -327,8 +322,7 @@ class pdf_timespent extends ModelePDFProjects
 							}
 						}
 						//var_dump($i.' '.$posybefore.' '.$posyafter.' '.($this->page_hauteur -  ($heightforfooter + $heightforfreetext + $heightforinfotot)).' '.$showpricebeforepagebreak);
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -382,9 +376,7 @@ class pdf_timespent extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -398,9 +390,7 @@ class pdf_timespent extends ModelePDFProjects
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -415,8 +405,7 @@ class pdf_timespent extends ModelePDFProjects
 				// Show square
 				if ($pagenb == 1)
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-				else
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Pied de page
@@ -434,8 +423,8 @@ class pdf_timespent extends ModelePDFProjects
 				$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))
@@ -444,15 +433,11 @@ class pdf_timespent extends ModelePDFProjects
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "PROJECT_OUTPUTDIR");
 			return 0;
 		}
@@ -462,7 +447,7 @@ class pdf_timespent extends ModelePDFProjects
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -477,7 +462,7 @@ class pdf_timespent extends ModelePDFProjects
 
 		$heightoftitleline = 10;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$pdf->SetDrawColor(128, 128, 128);
 
@@ -513,7 +498,7 @@ class pdf_timespent extends ModelePDFProjects
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Project		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -530,7 +515,7 @@ class pdf_timespent extends ModelePDFProjects
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
 		$posy = $this->marge_haute;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
@@ -541,18 +526,15 @@ class pdf_timespent extends ModelePDFProjects
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -604,19 +586,19 @@ class pdf_timespent extends ModelePDFProjects
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Show footer of page. Need this->emetteur object
-     *
-     *  @param  PDF         $pdf                PDF
-     *  @param  Project     $object             Object to show
-     *  @param  Translate   $outputlangs        Object lang for output
-     *  @param  int         $hidefreetext       1=Hide free text
-     *  @return integer
-     */
+	/**
+	 *  Show footer of page. Need this->emetteur object
+	 *
+	 *  @param  TCPDF       $pdf                PDF
+	 *  @param  Project     $object             Object to show
+	 *  @param  Translate   $outputlangs        Object lang for output
+	 *  @param  int         $hidefreetext       1=Hide free text
+	 *  @return integer
+	 */
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
-    {
-        global $conf;
-        $showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-        return pdf_pagefoot($pdf, $outputlangs, 'PROJECT_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, 'PROJECT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
 }
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 00d079c0061..0c77ccc198d 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -106,9 +106,7 @@ class mod_project_simple extends ModeleNumRefProjects
 		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -140,9 +138,7 @@ class mod_project_simple extends ModeleNumRefProjects
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_project_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
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 9b7b15a884d..70cffdf9032 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
@@ -63,9 +63,9 @@ class doc_generic_task_odt extends ModelePDFTask
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -377,8 +377,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -532,8 +531,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					return -1;
@@ -564,8 +562,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -575,8 +572,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				}
 
 				// Replace tags of lines for tasks
-				try
-				{
+				try {
 					// Security check
 					$socid = 0;
 					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
@@ -632,8 +628,7 @@ class doc_generic_task_odt extends ModelePDFTask
 									$listlinestaskres->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);
 								}
 							}
@@ -674,15 +669,12 @@ class doc_generic_task_odt extends ModelePDFTask
 
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -709,15 +701,12 @@ class doc_generic_task_odt extends ModelePDFTask
 						//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -727,8 +716,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					//$listlines->merge();
 
 					$odfHandler->mergeSegment($listtasksfiles);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -738,8 +726,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 
 				// Replace tags of project files
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('projectfiles');
 
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
@@ -753,15 +740,12 @@ class doc_generic_task_odt extends ModelePDFTask
 
 						foreach ($tmparray as $key => $val)
 						{
-							try
-							{
+							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							}
-							catch (OdfException $e)
+							} catch (OdfException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
-							}
-							catch (SegmentException $e)
+							} catch (SegmentException $e)
 							{
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
@@ -769,8 +753,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -789,8 +772,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				}
 				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
 				{
-					try
-					{
+					try {
 						$listlines = $odfHandler->setSegment('projectcontacts');
 
 						foreach ($contact_arrray as $contact)
@@ -813,15 +795,12 @@ class doc_generic_task_odt extends ModelePDFTask
 
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -829,8 +808,7 @@ class doc_generic_task_odt extends ModelePDFTask
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
@@ -853,8 +831,7 @@ class doc_generic_task_odt extends ModelePDFTask
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -874,9 +851,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index 5caeeaf54dd..1451ce26412 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -107,9 +107,7 @@ class mod_task_simple extends ModeleNumRefTask
 		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -140,9 +138,7 @@ class mod_task_simple extends ModeleNumRefTask
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
 		}
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 33850c5d882..59e0e27b677 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
@@ -39,15 +39,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 class doc_generic_proposal_odt extends ModelePDFPropales
 {
     /**
-     * @var Company Issuer object that emits
+     * @var Societe Issuer object that emits
      */
     public $emetteur;
 
-    /**
+	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
     /**
      * @var string Dolibarr version of the loaded document
@@ -140,8 +140,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -227,7 +226,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
-	 *	@param		Propale		$object				Object source to build document
+	 *	@param		Propal		$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
@@ -308,9 +307,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -342,9 +339,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
                         // 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -380,8 +375,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -398,8 +392,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -430,25 +423,21 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -467,15 +456,12 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -484,8 +470,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -498,8 +483,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -518,8 +502,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -539,9 +522,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c285f560678..c67789b1814 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -43,75 +43,75 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_azur extends ModelePDFPropales
 {
 	/**
-     * @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	Save the name of generated file as the main doc when generating a doc with this template
-     */
+	/**
+	 * @var string	Save the name of generated file as the main doc when generating a doc with this template
+	 */
 	public $update_main_doc_field;
 
 	/**
-     * @var string document type
-     */
-    public $type;
-
-    /**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -172,9 +172,7 @@ class pdf_azur extends ModelePDFPropales
 			$this->posxup = 118;
 			$this->posxqty = 135;
 			$this->posxunit = 151;
-		}
-		else
-		{
+		} else {
 			$this->posxtva = 110;
 			$this->posxup = 126;
 			$this->posxqty = 145;
@@ -202,21 +200,21 @@ class pdf_azur extends ModelePDFPropales
 		$this->atleastonediscount = 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// 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
+	 *  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;
@@ -239,14 +237,12 @@ class pdf_azur extends ModelePDFPropales
 				if (empty($object->lines[$i]->fk_product)) continue;
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
-                //var_dump($objphoto->ref);exit;
+				//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
-				{
+				} 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
 				}
@@ -269,14 +265,10 @@ class pdf_azur extends ModelePDFPropales
 								if ($obj['photo_vignette'])
 								{
 									$filename = $obj['photo_vignette'];
-								}
-								else
-								{
+								} else {
 									$filename = $obj['photo'];
 								}
-							}
-							else
-							{
+							} else {
 								$filename = $obj['photo'];
 							}
 
@@ -303,9 +295,7 @@ class pdf_azur extends ModelePDFPropales
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -334,22 +324,22 @@ class pdf_azur extends ModelePDFPropales
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Create pdf instance
-                $pdf = pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -374,14 +364,14 @@ class pdf_azur extends ModelePDFPropales
 				}
 				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
@@ -389,12 +379,12 @@ class pdf_azur extends ModelePDFPropales
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 
-                $heightforinfotot = 40; // Height reserved to output the info and total part
-                $heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE) ? (pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature")) + 10) : 0;
-                $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)
+				$heightforinfotot = 40; // Height reserved to output the info and total part
+				$heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE) ? (pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature")) + 10) : 0;
+				$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;
-                //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
+				//print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -402,7 +392,7 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->SetTextColor(0, 0, 0);
 
 
-	            $tab_top = 90 + $top_shift;
+				$tab_top = 90 + $top_shift;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
@@ -439,18 +429,18 @@ class pdf_azur extends ModelePDFPropales
 						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 (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
 				{
-				    $tmpuser = new User($this->db);
-				    $tmpuser->fetch($object->user_author_id);
-				    $notetoshow .= $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-				    if ($tmpuser->email) $notetoshow .= ',  Mail: '.$tmpuser->email;
-				    if ($tmpuser->office_phone) $notetoshow .= ', Tel: '.$tmpuser->office_phone;
+					$tmpuser = new User($this->db);
+					$tmpuser->fetch($object->user_author_id);
+					$notetoshow .= $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
+					if ($tmpuser->email) $notetoshow .= ',  Mail: '.$tmpuser->email;
+					if ($tmpuser->office_phone) $notetoshow .= ', Tel: '.$tmpuser->office_phone;
 				}
 				if ($notetoshow)
 				{
@@ -509,8 +499,7 @@ class pdf_azur extends ModelePDFPropales
 						// 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 $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -547,19 +536,15 @@ class pdf_azur extends ModelePDFPropales
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -645,7 +630,7 @@ class pdf_azur extends ModelePDFPropales
 						$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)
@@ -676,9 +661,7 @@ class pdf_azur extends ModelePDFPropales
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -692,9 +675,7 @@ class pdf_azur extends ModelePDFPropales
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -711,9 +692,7 @@ class pdf_azur extends ModelePDFPropales
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
@@ -735,7 +714,7 @@ class pdf_azur extends ModelePDFPropales
 				// Customer signature area
 				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
 				{
-				    $posy = $this->_signature_area($pdf, $object, $posy, $outputlangs);
+					$posy = $this->_signature_area($pdf, $object, $posy, $outputlangs);
 				}
 
 				// Pied de page
@@ -781,9 +760,7 @@ class pdf_azur extends ModelePDFPropales
 											} elseif (!empty($conf->service->enabled)) {
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
-										}
-										else
-										{
+										} else {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											} elseif (!empty($conf->service->enabled)) {
@@ -825,8 +802,8 @@ class pdf_azur extends ModelePDFPropales
 				$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))
@@ -835,38 +812,34 @@ class pdf_azur extends ModelePDFPropales
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
 	}
 
 	// 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 proposal
-     *  @param  int			$posy           Position y in PDF
-     *  @param  Translate	$outputlangs    Object langs for output
-     *  @return int             			<0 if KO, >0 if OK
+	 *  @param	TCPDF		$pdf           Object PDF
+	 *  @param  Object		$object         Object proposal
+	 *  @param  int			$posy           Position y in PDF
+	 *  @param  Translate	$outputlangs    Object langs for output
+	 *  @return int             			<0 if KO, >0 if OK
 	 */
 	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, ...)
 	 *
@@ -878,7 +851,7 @@ class pdf_azur extends ModelePDFPropales
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -896,10 +869,10 @@ class pdf_azur extends ModelePDFPropales
 
 		$posxval = 52;
 
-        // Show shipping date
-        if (!empty($object->date_livraison))
+		// Show shipping date
+		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").':';
@@ -909,9 +882,8 @@ class pdf_azur extends ModelePDFPropales
 			$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);
@@ -997,13 +969,13 @@ class pdf_azur extends ModelePDFPropales
 						$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))
-			            {
+						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)
 					{
@@ -1012,13 +984,13 @@ class pdf_azur extends ModelePDFPropales
 						$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))
-			            {
+						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;
-			            }
+						}
 					}
 				}
 			}
@@ -1047,20 +1019,20 @@ class pdf_azur extends ModelePDFPropales
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF			$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param  int			$deja_regle     Montant deja regle
-	 *	@param	int			$posy			Position depart
+	 *	@param	TCPDF		$pdf            Object PDF
+	 *	@param  Propal		$object         Object propal
+	 *	@param  int			$deja_regle     Amount already paid
+	 *	@param	int			$posy			Start position
 	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
+	 *	@return int							Position for continuation
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1068,7 +1040,7 @@ class pdf_azur extends ModelePDFPropales
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		// Tableau total
+		// Total table
 		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
@@ -1100,9 +1072,7 @@ class pdf_azur extends ModelePDFPropales
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1134,7 +1104,7 @@ class pdf_azur extends ModelePDFPropales
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1225,7 +1195,7 @@ class pdf_azur extends ModelePDFPropales
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1235,7 +1205,7 @@ class pdf_azur extends ModelePDFPropales
 
 					foreach ($localtax_rate as $tvakey => $tvaval)
 					{
-					    // retrieve global local tax
+						// retrieve global local tax
 						if ($tvakey != 0)    // On affiche pas taux 0
 						{
 							//$this->atleastoneratenotnull++;
@@ -1327,7 +1297,7 @@ class pdf_azur extends ModelePDFPropales
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -1444,7 +1414,7 @@ class pdf_azur extends ModelePDFPropales
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -1464,7 +1434,7 @@ class pdf_azur extends ModelePDFPropales
 		//  Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->PROPALE_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -1485,25 +1455,20 @@ class pdf_azur extends ModelePDFPropales
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+					$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
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1578,16 +1543,16 @@ class pdf_azur extends ModelePDFPropales
 		// 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(100, 3, $langs->trans("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(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 2;
@@ -1699,8 +1664,8 @@ class pdf_azur extends ModelePDFPropales
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
@@ -1714,11 +1679,11 @@ class pdf_azur extends ModelePDFPropales
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show area for the customer to sign
 	 *
-	 *	@param	PDF			$pdf            Object PDF
+	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
@@ -1726,7 +1691,7 @@ class pdf_azur extends ModelePDFPropales
 	 */
 	protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 		$tab_top = $posy + 4;
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 1af66ca645e..8563c845d2b 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -41,82 +41,82 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_cyan extends ModelePDFPropales
 {
-    /**
-     * @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     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 string     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.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 
@@ -176,17 +176,17 @@ class pdf_cyan extends ModelePDFPropales
 		$this->atleastonediscount = 0;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// 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
+	 *  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)
 	{
@@ -211,7 +211,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		$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
@@ -226,14 +226,12 @@ class pdf_cyan extends ModelePDFPropales
 				if (empty($object->lines[$i]->fk_product)) continue;
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
-                //var_dump($objphoto->ref);exit;
+				//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
-				{
+				} 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
 				}
@@ -256,14 +254,10 @@ class pdf_cyan extends ModelePDFPropales
 								if ($obj['photo_vignette'])
 								{
 									$filename = $obj['photo_vignette'];
-								}
-								else
-								{
+								} else {
 									$filename = $obj['photo'];
 								}
-							}
-							else
-							{
+							} else {
 								$filename = $obj['photo'];
 							}
 
@@ -291,9 +285,7 @@ class pdf_cyan extends ModelePDFPropales
 			{
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->propal->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -322,22 +314,22 @@ class pdf_cyan extends ModelePDFPropales
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Create pdf instance
-                $pdf = pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -354,10 +346,10 @@ class pdf_cyan extends ModelePDFPropales
 
 				// Does we have at least one line with discount $this->atleastonediscount
 				foreach ($object->lines as $line) {
-				    if ($line->remise_percent) {
-				        $this->atleastonediscount = true;
-				        break;
-				    }
+					if ($line->remise_percent) {
+						$this->atleastonediscount = true;
+						break;
+					}
 				}
 
 
@@ -367,11 +359,11 @@ class pdf_cyan extends ModelePDFPropales
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 
-                $heightforinfotot = 40; // Height reserved to output the info and total part
-                $heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE) ? (pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature")) + 10) : 0;
-                $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)
-                //print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
+				$heightforinfotot = 40; // Height reserved to output the info and total part
+				$heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE) ? (pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature")) + 10) : 0;
+				$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)
+				//print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -379,7 +371,7 @@ class pdf_cyan extends ModelePDFPropales
 				$pdf->SetTextColor(0, 0, 0);
 
 
-	            $tab_top = 90 + $top_shift;
+				$tab_top = 90 + $top_shift;
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 
@@ -419,20 +411,20 @@ class pdf_cyan extends ModelePDFPropales
 					}
 				}
 
-                // 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 (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
 				{
-				    $tmpuser = new User($this->db);
-				    $tmpuser->fetch($object->user_author_id);
-				    $notetoshow .= $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-				    if ($tmpuser->email) $notetoshow .= ',  Mail: '.$tmpuser->email;
-				    if ($tmpuser->office_phone) $notetoshow .= ', Tel: '.$tmpuser->office_phone;
+					$tmpuser = new User($this->db);
+					$tmpuser->fetch($object->user_author_id);
+					$notetoshow .= $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
+					if ($tmpuser->email) $notetoshow .= ',  Mail: '.$tmpuser->email;
+					if ($tmpuser->office_phone) $notetoshow .= ', Tel: '.$tmpuser->office_phone;
 				}
 
 				$tab_height = $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter;
@@ -442,8 +434,8 @@ class pdf_cyan extends ModelePDFPropales
 				{
 					$tab_top -= 2;
 
-				    $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
-				    $pageposbeforenote = $pagenb;
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
 
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
@@ -460,99 +452,95 @@ class pdf_cyan extends ModelePDFPropales
 
 					if ($pageposafternote > $pageposbeforenote)
 					{
-					    $pdf->rollbackTransaction(true);
+						$pdf->rollbackTransaction(true);
 
-					    // prepar 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);
-					    }
+						// prepar 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 previus pages
-					    $i = $pageposbeforenote;
-					    while ($i < $pageposafternote) {
-					        $pdf->setPage($i);
+						// apply note frame to previus 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
+						// 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);
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-					    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-					    {
-					        // not enough space, need to add page
-					        $pdf->AddPage('', '', true);
-					        $pagenb++;
-					        $pageposafternote++;
-					        $pdf->setPage($pageposafternote);
-					        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-					        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
+						{
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 
-					        $posyafter = $tab_top_newpage;
-					    }
+							$posyafter = $tab_top_newpage;
+						}
 					}
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $posyafter + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -589,76 +577,71 @@ class pdf_cyan extends ModelePDFPropales
 
 					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 + $heightforsignature + $heightforinfotot)))	// If photo too high, we moved completely on 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($pageposbefore + 1);
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// If photo too high, we moved completely on 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($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;
-    					}
+							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);
-    					$pageposafter = $pdf->getPage();
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$pageposafter = $pdf->getPage();
 
-    					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-    					{
-    						$pdf->rollbackTransaction(true);
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
 
-    						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
-                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
-    						$pageposafter = $pdf->getPage();
-    						$posyafter = $pdf->GetY();
-    						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-    						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $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
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $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();
-    					}
-    					$posYAfterDescription = $pdf->GetY();
+								else $showpricebeforepagebreak = 0;
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+						$posYAfterDescription = $pdf->GetY();
 					}
 
 					$nexY = $pdf->GetY();
@@ -678,73 +661,73 @@ class pdf_cyan extends ModelePDFPropales
 					// 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 HT line
 					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);
 					}
 
-                    // Extrafields
-                    if (!empty($object->lines[$i]->array_options)) {
-                        foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-                            if ($this->getColumnStatus($extrafieldColKey))
-                            {
-                                $extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
-                                $this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
-                                $nexY = max($pdf->GetY(), $nexY);
-                            }
-                        }
-                    }
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey))
+							{
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
 
 					$parameters = array(
-					    'object' => $object,
-					    'i' => $i,
-					    'pdf' =>& $pdf,
-					    'curY' =>& $curY,
-					    'nexY' =>& $nexY,
-					    'outputlangs' => $outputlangs,
-					    'hidedetails' => $hidedetails
+						'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
 
@@ -776,7 +759,7 @@ class pdf_cyan extends ModelePDFPropales
 						$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)
@@ -806,10 +789,8 @@ class pdf_cyan extends ModelePDFPropales
 						$pdf->setPage($pagenb);
 						if ($pagenb == $pageposbeforeprintlines)
 						{
-						    $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);
@@ -820,12 +801,10 @@ class pdf_cyan extends ModelePDFPropales
 					}
 					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
-					    if ($pagenb == $pageposafter)
-						{
-						    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-						}
-						else
+						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_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -840,11 +819,9 @@ class pdf_cyan extends ModelePDFPropales
 				// Show square
 				if ($pagenb == $pageposbeforeprintlines)
 				{
-				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
@@ -866,7 +843,7 @@ class pdf_cyan extends ModelePDFPropales
 				// Customer signature area
 				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
 				{
-				    $posy = $this->drawSignatureArea($pdf, $object, $posy, $outputlangs);
+					$posy = $this->drawSignatureArea($pdf, $object, $posy, $outputlangs);
 				}
 
 				// Pied de page
@@ -912,9 +889,7 @@ class pdf_cyan extends ModelePDFPropales
 											} elseif (!empty($conf->service->enabled)) {
 												$filetomerge_dir = $conf->service->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											}
-										}
-										else
-										{
+										} else {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir(0, 0, 0, 0, $product, 'product').dol_sanitizeFileName($product->ref);
 											} elseif (!empty($conf->service->enabled)) {
@@ -956,8 +931,8 @@ class pdf_cyan extends ModelePDFPropales
 				$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))
@@ -966,15 +941,11 @@ class pdf_cyan extends ModelePDFPropales
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PROP_OUTPUTDIR");
 			return 0;
 		}
@@ -983,11 +954,11 @@ class pdf_cyan extends ModelePDFPropales
 	/**
 	 *  Show payments table
 	 *
-     *  @param	TCPDF		$pdf           Object PDF
-     *  @param  Object		$object         Object proposal
-     *  @param  int			$posy           Position y in PDF
-     *  @param  Translate	$outputlangs    Object langs for output
-     *  @return int             			<0 if KO, >0 if OK
+	 *  @param	TCPDF		$pdf           Object PDF
+	 *  @param  Object		$object         Object proposal
+	 *  @param  int			$posy           Position y in PDF
+	 *  @param  Translate	$outputlangs    Object langs for output
+	 *  @return int             			<0 if KO, >0 if OK
 	 */
 	protected function drawPaymentsTable(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -1021,10 +992,10 @@ class pdf_cyan extends ModelePDFPropales
 
 		$posxval = 52;
 
-        // Show shipping date
-        if (!empty($object->date_livraison))
+		// Show shipping date
+		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").':';
@@ -1034,9 +1005,8 @@ class pdf_cyan extends ModelePDFPropales
 			$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);
@@ -1122,13 +1092,13 @@ class pdf_cyan extends ModelePDFPropales
 						$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))
-			            {
+						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)
 					{
@@ -1137,13 +1107,13 @@ class pdf_cyan extends ModelePDFPropales
 						$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))
-			            {
+						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;
-			            }
+						}
 					}
 				}
 			}
@@ -1175,7 +1145,7 @@ class pdf_cyan extends ModelePDFPropales
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF			$pdf            Object PDF
+	 *	@param	TCPDF		$pdf           Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
@@ -1231,9 +1201,7 @@ class pdf_cyan extends ModelePDFPropales
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -1266,7 +1234,7 @@ class pdf_cyan extends ModelePDFPropales
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1360,7 +1328,7 @@ class pdf_cyan extends ModelePDFPropales
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1370,7 +1338,7 @@ class pdf_cyan extends ModelePDFPropales
 
 					foreach ($localtax_rate as $tvakey => $tvaval)
 					{
-					    // retrieve global local tax
+						// retrieve global local tax
 						if ($tvakey != 0)    // On affiche pas taux 0
 						{
 							//$this->atleastoneratenotnull++;
@@ -1464,7 +1432,7 @@ class pdf_cyan extends ModelePDFPropales
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -1510,7 +1478,7 @@ class pdf_cyan extends ModelePDFPropales
 		$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
 		}
 	}
 
@@ -1518,7 +1486,7 @@ class pdf_cyan extends ModelePDFPropales
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -1538,7 +1506,7 @@ class pdf_cyan extends ModelePDFPropales
 		//  Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->PROPALE_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -1559,25 +1527,20 @@ class pdf_cyan extends ModelePDFPropales
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
-				}
-				else {
+				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
-				    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-				}
-				else
-				{
+					$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
-			{
+			} else {
 				$text = $this->emetteur->name;
 				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
@@ -1652,16 +1615,16 @@ class pdf_cyan extends ModelePDFPropales
 		// 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(100, 3, $langs->trans("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(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 2;
@@ -1773,8 +1736,8 @@ class pdf_cyan extends ModelePDFPropales
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
@@ -1790,7 +1753,7 @@ class pdf_cyan extends ModelePDFPropales
 	/**
 	 *	Show area for the customer to sign
 	 *
-	 *	@param	PDF			$pdf            Object PDF
+	 *	@param	TCPDF		$pdf           Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param	int			$posy			Position depart
 	 *	@param	Translate	$outputlangs	Objet langs
@@ -1833,23 +1796,23 @@ class pdf_cyan extends ModelePDFPropales
 	 *      @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
@@ -1867,148 +1830,145 @@ class pdf_cyan extends ModelePDFPropales
 	     );
 	     */
 
-	    $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, 1, 0.5, 1.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, 1, 0.5, 1.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 = $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
-	    );
+		$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_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
+		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto))
+		{
+			$this->cols['photo']['status'] = true;
+		}
 
 
-	    $rank = $rank + 10;
-	    $this->cols['vat'] = array(
-	        'rank' => $rank,
-	        'status' => false,
-	        'width' => 16, // in mm
-	        'title' => array(
-	            'textkey' => 'VAT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['vat'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 16, // in mm
+			'title' => array(
+				'textkey' => 'VAT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $this->cols['vat']['status'] = true;
-	    }
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$this->cols['vat']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['subprice'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'PriceUHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['subprice'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PriceUHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['qty'] = array(
-	        'rank' => $rank,
-	        'width' => 16, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Qty'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['qty'] = array(
+			'rank' => $rank,
+			'width' => 16, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Qty'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['unit'] = array(
-	        'rank' => $rank,
-	        'width' => 11, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Unit'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($conf->global->PRODUCT_USE_UNITS) {
-	        $this->cols['unit']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['unit'] = array(
+			'rank' => $rank,
+			'width' => 11, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$this->cols['unit']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['discount'] = array(
-	        'rank' => $rank,
-	        'width' => 13, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'ReductionShort'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($this->atleastonediscount) {
-	        $this->cols['discount']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['discount'] = array(
+			'rank' => $rank,
+			'width' => 13, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'ReductionShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($this->atleastonediscount) {
+			$this->cols['discount']['status'] = true;
+		}
 
-	    $rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
-	    $this->cols['totalexcltax'] = array(
-	        'rank' => $rank,
-	        'width' => 26, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-        // Add extrafields cols
-        if (!empty($object->lines)) {
-            $line = reset($object->lines);
-            $this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
-        }
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
 
-	    $parameters = array(
-	        'object' => $object,
-	        'outputlangs' => $outputlangs,
-	        'hidedetails' => $hidedetails,
-	        'hidedesc' => $hidedesc,
-	        'hideref' => $hideref
-	    );
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
 
-	    $reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-	    if ($reshook < 0)
-	    {
-	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
-	    {
-	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
-	        $this->cols = $hookmanager->resArray;
-	    }
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0)
+		{
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook))
+		{
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
 	}
 }
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index a7753cf0f3d..fc3569323dc 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -47,7 +47,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 	/**
 	 * @var string Nom du modele
 	 * @deprecated
-	 * @see name
+	 * @see $name
 	 */
 	public $nom = 'Marbre';
 
@@ -108,9 +108,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -141,9 +139,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index a8c490ff2e3..9c8ca9ffa24 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -47,7 +47,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 	/**
 	 * @var string Nom du modele
 	 * @deprecated
-	 * @see name
+	 * @see $name
 	 */
 	public $nom = 'Saphir';
 
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index 2377e537606..8905f6cf2b4 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015-2018 Charlene BENKE  	<charlie@patas-monkey.com>
+ * Copyright (C) 2020      Maxime DEMAREST <maxime@indelog.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
@@ -207,7 +208,10 @@ class pdf_paiement
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 				}
 				if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
-				$sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
+				// If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payement are ordered by paiement_code
+				if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD))
+					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiement ASC";
+				else $sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
 				break;
 			case "fourn":
 				$sql = "SELECT p.datep as dp, f.ref as ref";
@@ -237,7 +241,10 @@ class pdf_paiement
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 				}
 				if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
-				$sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
+                // 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";
 				break;
 		}
 
@@ -264,9 +271,7 @@ class pdf_paiement
 				$lines[$i][9] = $objp->paiement_amount;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -342,7 +347,7 @@ class pdf_paiement
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF			$pdf     		Object PDF
 	 *  @param  int			$page	     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -416,7 +421,7 @@ class pdf_paiement
 	/**
 	 *	Output body
 	 *
-	 *	@param	PDF			$pdf			PDF object
+	 *	@param	TCPDF		$pdf			PDF object
 	 *	@param	string		$page			Page
 	 *	@param	array		$lines			Array of lines
 	 *	@param	Translate	$outputlangs	Object langs
@@ -425,7 +430,7 @@ class pdf_paiement
 	public function Body(&$pdf, $page, $lines, $outputlangs)
 	{
         // phpcs:enable
-		global $langs;
+		global $langs, $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$pdf->SetFont('', '', $default_font_size - 1);
@@ -435,6 +440,11 @@ class pdf_paiement
 		$pdf->SetFillColor(220, 220, 220);
 		$yp = 0;
 		$numlines = count($lines);
+		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[0][2];
+			$total_mod = 0;
+		}
 		for ($j = 0; $j < $numlines; $j++)
 		{
 			$i = $j;
@@ -450,8 +460,17 @@ class pdf_paiement
 			{
 				if ($yp > $this->tab_height - 15)
 				{
-					$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
-					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $langs->transnoentities('SubTotal')." : ".price($total_page), 0, 'R', 0);
+                    $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);
@@ -474,6 +493,7 @@ class pdf_paiement
 				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][4], 0, 'R', 1);
 				$yp = $yp + 5;
 				$total_page += $lines[$j][9];
+				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))) $total_mod += $lines[$j][9];
 			}
 
 			// Invoice number
@@ -497,9 +517,44 @@ 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);
+				$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->SetFont('', '', $default_font_size - 1);
+                $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);
+            }
 		}
 		$total += $total_page;
-		$pdf->SetXY($this->posxpaymentamount, $this->tab_top + 10 + $yp);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $langs->transnoentities('Total')." : ".price($total), 0, 'R', 0);
+        $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/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 89a532c2556..9676bb2ff70 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
@@ -41,11 +41,11 @@ class doc_generic_reception_odt extends ModelePdfReception
      */
     public $emetteur; // Objet societe qui emet
 
-    /**
+	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
     /**
      * @var string Dolibarr version of the loaded document
@@ -132,8 +132,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -271,9 +270,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -300,9 +297,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					// 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;
-				}
-				else
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -339,8 +334,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					return -1;
@@ -370,8 +364,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -390,8 +383,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 							//var_dump($value);exit;
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -408,8 +400,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -430,8 +421,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
@@ -440,8 +430,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('lines');
 					foreach ($object->lines as $line)
 					{
@@ -463,8 +452,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -494,8 +482,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						$this->error = $e->getMessage();
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -512,9 +499,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$odfHandler = null; // Destroy object
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 25b7b62388f..a95d7594458 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_squille extends ModelePdfReception
 {
-    public $emetteur; // Objet societe qui emet
+	public $emetteur; // Objet societe qui emet
 
 
 	/**
@@ -83,17 +83,17 @@ class pdf_squille extends ModelePdfReception
 
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
-		    $this->posxweightvol -= 20;
-		    $this->posxpicture -= 20;
-		    $this->posxqtyordered -= 20;
-		    $this->posxqtytoship -= 20;
+			$this->posxweightvol -= 20;
+			$this->posxpicture -= 20;
+			$this->posxqtyordered -= 20;
+			$this->posxqtytoship -= 20;
 		}
 
 		if (!empty($conf->global->RECEPTION_PDF_HIDE_ORDERED))
 		{
-		    $this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
-		    $this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
-		    $this->posxqtyordered = $this->posxqtytoship;
+			$this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
+			$this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
+			$this->posxqtyordered = $this->posxqtytoship;
 		}
 	}
 
@@ -103,11 +103,11 @@ class pdf_squille extends ModelePdfReception
 	 *
 	 *	@param		Object		$object			Object reception to generate (or id if old method)
 	 *	@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
+	 *  @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)
 	{
@@ -124,15 +124,15 @@ class pdf_squille extends ModelePdfReception
 
 		$nblines = count($object->lines);
 
-        // Loop on each lines to detect if there is at least one image to show
-        $realpatharray = array();
-        if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
-        {
-            $objphoto = new Product($this->db);
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
+		{
+			$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 = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -142,32 +142,28 @@ class pdf_squille extends ModelePdfReception
 
 				$realpath = '';
 
-                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;
-                    break;
-                }
+					$realpath = $dir.$filename;
+					break;
+				}
 
-                if ($realpath) $realpatharray[$i] = $realpath;
-            }
-        }
+				if ($realpath) $realpatharray[$i] = $realpath;
+			}
+		}
 
-        if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
+		if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
 
 		if ($conf->reception->dir_output)
 		{
@@ -176,9 +172,7 @@ class pdf_squille extends ModelePdfReception
 			{
 				$dir = $conf->reception->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$rcpref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->reception->dir_output."/".$rcpref;
 				$file = $dir."/".$rcpref.".pdf";
@@ -212,22 +206,22 @@ class pdf_squille extends ModelePdfReception
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);
 				$heightforinfotot = 8; // 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);
+				$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));
-                // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && !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_DISABLE_FPDI) && !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;
@@ -335,9 +329,7 @@ class pdf_squille extends ModelePdfReception
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -378,8 +370,7 @@ class pdf_squille extends ModelePdfReception
 						// 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 $showpricebeforepagebreak = 0;
 					}
 
 					if (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -418,19 +409,15 @@ class pdf_squille extends ModelePdfReception
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -471,12 +458,12 @@ class pdf_squille extends ModelePdfReception
 					//$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
 
 					if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
-					    $pdf->SetXY($this->posxqtyordered, $curY);
-					    if ($object->lines[$i]->fk_commandefourndet != $fk_commandefourndet) {
-						    $pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked, '', 'C');
-						    $totalOrdered += $object->lines[$i]->qty_asked;
-					    }
-					    $fk_commandefourndet = $object->lines[$i]->fk_commandefourndet;
+						$pdf->SetXY($this->posxqtyordered, $curY);
+						if ($object->lines[$i]->fk_commandefourndet != $fk_commandefourndet) {
+							$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked, '', 'C');
+							$totalOrdered += $object->lines[$i]->qty_asked;
+						}
+						$fk_commandefourndet = $object->lines[$i]->fk_commandefourndet;
 					}
 
 					$pdf->SetXY($this->posxqtytoship, $curY);
@@ -511,9 +498,7 @@ class pdf_squille extends ModelePdfReception
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -526,9 +511,7 @@ class pdf_squille extends ModelePdfReception
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -544,9 +527,7 @@ class pdf_squille extends ModelePdfReception
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -569,23 +550,19 @@ class pdf_squille extends ModelePdfReception
 				$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))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
 			return 0;
 		}
@@ -596,7 +573,7 @@ class pdf_squille extends ModelePdfReception
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF			$pdf            Object PDF
+	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
@@ -609,9 +586,9 @@ class pdf_squille extends ModelePdfReception
 		// phpcs:enable
 		global $conf, $mysoc;
 
-        $sign = 1;
+		$sign = 1;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
@@ -642,8 +619,8 @@ class pdf_squille extends ModelePdfReception
 		// Set trueVolume and volume_units not currently stored into database
 		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
 		{
-		    $object->trueVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
-		    $object->volume_units = $object->size_units * 3;
+			$object->trueVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
+			$object->volume_units = $object->size_units * 3;
 		}
 
 		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
@@ -651,41 +628,41 @@ class pdf_squille extends ModelePdfReception
 		if ($object->trueWeight) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
 		if ($object->trueVolume) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
 
-    	$pdf->SetFillColor(255, 255, 255);
-    	$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-    	$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
+		$pdf->SetFillColor(255, 255, 255);
+		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
 
-        if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED))
-        {
-            $pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
-        	$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
-        }
+		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED))
+		{
+			$pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
+		}
 
-    	$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
-    	$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
+		$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
+		$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
 
 		if (!empty($conf->global->MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT)) {
-	    	$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
-	    	$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
+			$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
 
-	    	$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
-	    	$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
+			$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
 		}
 
 		// Total Weight
 		if ($totalWeighttoshow)
 		{
-    		$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-    		$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
+			$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
 
-    		$index++;
+			$index++;
 		}
 		if ($totalVolumetoshow)
 		{
-    		$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
-    		$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
+			$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
 
-		    $index++;
+			$index++;
 		}
 		if (!$totalWeighttoshow && !$totalVolumetoshow) $index++;
 
@@ -698,7 +675,7 @@ class pdf_squille extends ModelePdfReception
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y
@@ -742,15 +719,15 @@ class pdf_squille extends ModelePdfReception
 			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 2, $outputlangs->transnoentities("WeightVolShort"), '', 'C');
 		}
 
-        if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED))
-        {
-            $pdf->line($this->posxqtyordered - 1, $tab_top, $this->posxqtyordered - 1, $tab_top + $tab_height);
-    		if (empty($hidetop))
-    		{
-    			$pdf->SetXY($this->posxqtyordered - 1, $tab_top + 1);
-    			$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"), '', 'C');
-    		}
-        }
+		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED))
+		{
+			$pdf->line($this->posxqtyordered - 1, $tab_top, $this->posxqtyordered - 1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxqtyordered - 1, $tab_top + 1);
+				$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"), '', 'C');
+			}
+		}
 
 		$pdf->line($this->posxqtytoship - 1, $tab_top, $this->posxqtytoship - 1, $tab_top + $tab_height);
 		if (empty($hidetop))
@@ -780,7 +757,7 @@ class pdf_squille extends ModelePdfReception
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -799,7 +776,7 @@ class pdf_squille extends ModelePdfReception
 		// Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->RECEPTION_DRAFT_WATERMARK)))
 		{
-            		pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->RECEPTION_DRAFT_WATERMARK);
+					pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->RECEPTION_DRAFT_WATERMARK);
 		}
 
 		//Prepare la suite
@@ -819,19 +796,15 @@ class pdf_squille extends ModelePdfReception
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -840,9 +813,7 @@ class pdf_squille extends ModelePdfReception
 		if (!empty($conf->barcode->enabled))
 		{
 			$posx = 105;
-		}
-		else
-		{
+		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
@@ -882,10 +853,10 @@ class pdf_squille extends ModelePdfReception
 		// Date planned delivery
 		if (!empty($object->date_delivery))
 		{
-    			$posy += 4;
-    			$pdf->SetXY($posx, $posy);
-    			$pdf->SetTextColor(0, 0, 60);
-    			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
 		}
 
 		if (!empty($object->thirdparty->code_fournisseur))
@@ -904,7 +875,7 @@ class pdf_squille extends ModelePdfReception
 		$origin = $object->origin;
 		$origin_id = $object->origin_id;
 
-	    // TODO move to external function
+		// TODO move to external function
 		if (!empty($conf->fournisseur->enabled))     // commonly $origin='commande'
 		{
 			$outputlangs->load('orders');
@@ -914,7 +885,7 @@ class pdf_squille extends ModelePdfReception
 			$result = $linkedobject->fetch($origin_id);
 			if ($result >= 0)
 			{
-			    //$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
+				//$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
 
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$text = $linkedobject->ref;
@@ -1031,8 +1002,8 @@ class pdf_squille extends ModelePdfReception
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF		$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 94bad5adf31..2b596cc070f 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -113,9 +113,7 @@ class mod_reception_beryl extends ModelNumRefReception
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_reception_beryl::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index 6251f02a0de..79d6865037a 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -81,8 +81,8 @@ class modGeneratePassPerso extends ModeleGenPassword
 		$this->user = $user;
 
 		if (empty($conf->global->USER_PASSWORD_PATTERN)) {
-			// default value (8carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
-			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '8;1;1;1;3;1', 'chaine', 0, '', $conf->entity);
+			// default value (10carac, 1maj, 1digit, 1spe,  3 repeat, no ambi at auto generation.
+			dolibarr_set_const($db, "USER_PASSWORD_PATTERN", '10;1;1;1;3;1', 'chaine', 0, '', $conf->entity);
 		}
 
 		$this->Maj = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index 3a1cf3667aa..0c5f2c1807c 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -59,7 +59,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	public function __construct($db, $conf, $langs, $user)
 	{
 		$this->id = "standard";
-		$this->length = 8;
+		$this->length = 10;
 
 		$this->db = $db;
 		$this->conf = $conf;
@@ -75,7 +75,7 @@ class modGeneratePassStandard extends ModeleGenPassword
 	public function getDescription()
 	{
 		global $langs;
-		return $langs->trans("PasswordGenerationStandard");
+		return $langs->trans("PasswordGenerationStandard", $this->length);
 	}
 
 	/**
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 2a7e0cf287f..9cc3adf708e 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -44,9 +44,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 
 	/**
@@ -117,8 +117,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			$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
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, true); // Disable hook for the moment
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -249,9 +248,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -277,8 +274,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 	    					'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -313,8 +309,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 }
                 if ((is_array($contact_arrray) && count($contact_arrray) > 0))
                 {
-                	try
-                	{
+                	try {
                 		$listlines = $odfHandler->setSegment('companycontacts');
 
                 		foreach ($contact_arrray as $array_key => $contact_id)
@@ -323,15 +318,12 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 			$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
                 			foreach ($tmparray as $key => $val)
                 			{
-                				try
-                				{
+                				try {
                 					$listlines->setVars($key, $val, true, 'UTF-8');
-                				}
-                				catch (OdfException $e)
+                				} catch (OdfException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
-                				}
-                				catch (SegmentException $e)
+                				} catch (SegmentException $e)
                 				{
 									dol_syslog($e->getMessage(), LOG_INFO);
                 				}
@@ -339,8 +331,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                 			$listlines->merge();
                 		}
                 		$odfHandler->mergeSegment($listlines);
-                	}
-                	catch (OdfException $e)
+                	} catch (OdfException $e)
                 	{
                 		$this->error = $e->getMessage();
                 		dol_syslog($this->error, LOG_WARNING);
@@ -369,13 +360,11 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else	// Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// setVars failed, probably because key not found
                         dol_syslog($e->getMessage(), LOG_INFO);
@@ -388,8 +377,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -408,8 +396,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 				    try {
                         $odfHandler->creator = $user->getFullName($outputlangs);
                         $odfHandler->title = $object->builddoc_filename;
@@ -438,9 +425,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 22ec06c8aa6..948be99b61a 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -218,13 +218,11 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		{
 			$field = 'code_client';
 			//$where = ' AND client in (1,2)';
-		}
-		elseif ($type == 1)
+		} elseif ($type == 1)
 		{
 			$field = 'code_fournisseur';
 			//$where = ' AND fournisseur = 1';
-		}
-		else return -1;
+		} else return -1;
 
 		$now = dol_now();
 
@@ -281,13 +279,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
-		}
-		else
-		{
+		} else {
 			// Get Mask value
 			$mask = '';
 			if ($type == 0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
@@ -325,8 +320,8 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	{
         // phpcs:enable
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$code."'";
-		else $sql .= " WHERE code_client = '".$code."'";
+		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
+		else $sql .= " WHERE code_client = '".$db->escape($code)."'";
 		if ($soc->id > 0) $sql .= " AND rowid <> ".$soc->id;
 
 		$resql = $db->query($sql);
@@ -335,14 +330,10 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 1bfeab38865..c3ce858ec0d 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -126,8 +126,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
 		}
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index ba7bb120e45..a73e7db2911 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -133,7 +133,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
         $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 '".$prefix."____-%'";
+		$sql .= " WHERE ".$field." LIKE '".$db->escape($prefix)."____-%'";
 		$sql .= " AND entity IN (".getEntity('societe').")";
 
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
@@ -144,9 +144,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 
@@ -184,33 +182,24 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
 		{
 			$result = 0;
-		}
-		elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
 		{
 			$result = -2;
-		}
-		else
-		{
+		} else {
 			if ($this->verif_syntax($code) >= 0)
 			{
 				$is_dispo = $this->verif_dispo($db, $code, $soc, $type);
 				if ($is_dispo <> 0)
 				{
 					$result = -3;
-				}
-				else
-				{
+				} else {
 					$result = 0;
 				}
-			}
-			else
-			{
+			} else {
 				if (dol_strlen($code) == 0)
 				{
 					$result = -2;
-				}
-				else
-				{
+				} else {
 					$result = -1;
 				}
 			}
@@ -237,8 +226,8 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		global $conf, $mc;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$code."'";
-		else $sql .= " WHERE code_client = '".$code."'";
+		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
+		else $sql .= " WHERE code_client = '".$db->escape($code)."'";
 		$sql .= " AND entity IN (".getEntity('societe').")";
 		if ($soc->id > 0) $sql .= " AND rowid <> ".$soc->id;
 
@@ -249,14 +238,10 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 			if ($db->num_rows($resql) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -277,9 +262,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		if (dol_strlen($code) < 11)
 		{
 			$res = -1;
-		}
-		else
-		{
+		} else {
 			$res = 0;
 		}
 		return $res;
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 78b0e2fae8e..fc993a0d671 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -141,14 +141,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		{
 			$codetouse = (!empty($societe->code_client) ? $societe->code_client : 'CUSTCODE');
 			$prefix = $this->prefixcustomeraccountancycode;
-		}
-		elseif ($type == 'supplier')
+		} elseif ($type == 'supplier')
 		{
 			$codetouse = (!empty($societe->code_fournisseur) ? $societe->code_fournisseur : 'SUPPCODE');
 			$prefix = $this->prefixsupplieraccountancycode;
-		}
-		else
-		{
+		} else {
 			$this->error = 'Bad value for parameter type';
 			return -1;
 		}
@@ -171,9 +168,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		if (!$is_dispo)
 		{
 			$this->code = $codetouse;
-		}
-		else
-		{
+		} else {
 			// Pour retour
 			$this->code = $codetouse;
 		}
@@ -210,15 +205,11 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 			{
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
 				return 1; // Dispo
-			}
-			else
-			{
+			} else {
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' not available");
 				return 0; // Non dispo
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $db->error()." sql=".$sql;
 			return -1; // Erreur
 		}
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index d97ac5df0ff..9835851cc7c 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -163,15 +163,12 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
                 $codetouse = $societe->name;
                 $prefix = $this->prefixsupplieraccountancycode;
                 $width = $this->supplieraccountancycodecharacternumber;
-			}
-			elseif ($type == 'customer')
+			} elseif ($type == 'customer')
             {
                 $codetouse = $societe->name;
                 $prefix = $this->prefixcustomeraccountancycode;
                 $width = $this->customeraccountancycodecharacternumber;
-            }
-            else
-            {
+            } else {
                 $this->error = 'Bad value for parameter type';
                 return -1;
             }
@@ -220,9 +217,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
         if ($disponibility == 0)
         {
             return 0; // return ok
-        }
-        else
-        {
+        } else {
             return -1; // return ko
         }
 	}
@@ -240,19 +235,16 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
         if ($type == 'supplier')
         {
             $typethirdparty = 'code_compta_fournisseur';
-        }
-        elseif ($type == 'customer')
+        } elseif ($type == 'customer')
         {
             $typethirdparty = 'code_compta';
-        }
-        else
-        {
+        } else {
             $this->error = 'Bad value for parameter type';
             return -1;
         }
 
         $sql = "SELECT ".$typethirdparty." FROM ".MAIN_DB_PREFIX."societe";
-        $sql .= " WHERE ".$typethirdparty." = '".$code."'";
+        $sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
 
         $resql = $db->query($sql);
         if ($resql)
@@ -261,15 +253,11 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
             {
                 dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' available");
                 return 0; // Available
-            }
-            else
-            {
+            } else {
                 dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' not available");
                 return -1; // Not available
             }
-        }
-        else
-        {
+        } else {
             $this->error = $db->error()." sql=".$sql;
             return -2; // Error
         }
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index a6df7aaea20..df280e11679 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -172,9 +172,7 @@ abstract class ModeleThirdPartyCode
 				$liste[$row[0]] = $row[1];
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 		return $liste;
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 d5ccf5dbd89..89be1983115 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
@@ -24,8 +24,8 @@
  *	\brief      File of class to build ODT documents for stocks/services
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.class.php';
-require_once DOL_DOCUMENT_ROOT.'/stock/class/stock.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -43,16 +43,15 @@ class doc_generic_stock_odt extends ModelePDFStock
 	 */
 	public $emetteur;
 
-    /**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	/**
+	 * @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
-     */
+	 * @var string Dolibarr version of the loaded document
+	 */
 	public $version = 'dolibarr';
 
 
@@ -66,7 +65,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 		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,21 +110,15 @@ class doc_generic_stock_odt extends ModelePDFStock
 		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);
 
 		$texte = $this->description.".<br>\n";
-		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="STOCK_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
-			$texte .= '<input type="hidden" name="param2" value="STOCK_ADDON_PDF_ODT_DEFAULT">';
-			$texte .= '<input type="hidden" name="param3" value="STOCK_ADDON_PDF_ODT_TOBILL">';
-			$texte .= '<input type="hidden" name="param4" value="STOCK_ADDON_PDF_ODT_CLOSED">';
-		}
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		// List of directories area
@@ -141,8 +134,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -162,36 +154,31 @@ class doc_generic_stock_odt extends ModelePDFStock
 		$texte .= '<br></div></div>';
 
 		// Scan directories
-		if (count($listofdir))
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->STOCK_ADDON_PDF_ODT_PATH))
 		{
-			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
-
-			/*if ($conf->global->MAIN_STOCK_CHOOSE_ODT_DOCUMENT > 0)
-			{
-				// Model for creation
-				$liste=ModelePDFStock::liste_modeles($this->db);
-				$texte.= '<table width="50%;">';
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value2',$liste,$conf->global->STOCK_ADDON_PDF_ODT_DEFAULT);
-				$texte.= "</td></tr>";
-
-				$texte.= '<tr>';
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value3',$liste,$conf->global->STOCK_ADDON_PDF_ODT_TOBILL);
-				$texte.= "</td></tr>";
-				$texte.= '<tr>';
-
-				$texte.= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
-				$texte.= '<td colspan="">';
-				$texte.= $form->selectarray('value4',$liste,$conf->global->STOCK_ADDON_PDF_ODT_CLOSED);
-				$texte.= "</td></tr>";
-				$texte.= '</table>';
-			}*/
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
+			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+			$texte .= count($listoffiles);
+			//$texte.=$nbofiles?'</a>':'';
+			$texte .= '</b>';
 		}
 
+		if ($nbofiles)
+		{
+			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+			foreach ($listoffiles as $file)
+			{
+				$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="STOCK_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">';
@@ -205,7 +192,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 		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.
 	 *
@@ -219,7 +206,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $stock, $langs, $conf, $mysoc, $hookmanager, $user;
 
 		if (empty($srctemplatepath))
@@ -291,12 +278,10 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -323,15 +308,13 @@ class doc_generic_stock_odt extends ModelePDFStock
 				{
 					// 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->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;
 				}
 				// Make substitution
@@ -358,17 +341,16 @@ class doc_generic_stock_odt extends ModelePDFStock
 				// Open and load template
 				require_once ODTPHP_PATH.'odf.php';
 				try {
-                    $odfHandler = new odf(
-                        $srctemplatepath,
-					    array(
-						    'PATH_TO_TMP'	  => $conf->product->dir_temp,
-						    '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->product->dir_temp,
+							'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+							'DELIMITER_LEFT'  => '{',
+							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -385,8 +367,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -417,20 +398,17 @@ class doc_generic_stock_odt extends ModelePDFStock
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$listlines = $odfHandler->setSegment('supplierprices');
 					if (!empty($object->supplierprices)) {
 						foreach ($object->supplierprices as $supplierprice)
@@ -442,15 +420,12 @@ class doc_generic_stock_odt extends ModelePDFStock
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($array_lines as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -459,8 +434,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -473,10 +447,9 @@ class doc_generic_stock_odt extends ModelePDFStock
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
-                        dol_syslog($e->getMessage(), LOG_INFO);
+						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
@@ -490,16 +463,15 @@ class doc_generic_stock_odt extends ModelePDFStock
 						$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 {
+				} 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;
 					}
 				}
@@ -514,9 +486,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index c50f3d2a2f8..4b4be2de5b3 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -36,74 +36,74 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_standard extends ModelePDFStock
 {
-    /**
-     * @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 document type
-     */
-    public $type;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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
 	 */
@@ -147,7 +147,7 @@ class pdf_standard extends ModelePDFStock
 		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
 		// Define position of columns
-		$this->wref = 15;
+		$this->wref = 35;
 		$this->posxdesc = $this->marge_gauche + 1;
 		$this->posxlabel = $this->posxdesc + $this->wref;
 		$this->posxtva = 80;
@@ -177,7 +177,7 @@ class pdf_standard extends ModelePDFStock
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Function to build a document on disk using the generic odt module.
 	 *
@@ -189,9 +189,9 @@ class pdf_standard extends ModelePDFStock
 	 *  @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, $db, $hookmanager;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -205,14 +205,12 @@ class pdf_standard extends ModelePDFStock
 
 		if ($conf->stock->dir_output)
 		{
-		    // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->stock->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->stock->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -222,7 +220,7 @@ class pdf_standard extends ModelePDFStock
 			$supplierprices = $stockFournisseur->list_product_fournisseur_price($object->id);
 			$object->supplierprices = $supplierprices;
 
-			$productstatic = new Product($db);
+			$productstatic = new Product($this->db);
 
 			if (!file_exists($dir))
 			{
@@ -252,21 +250,21 @@ class pdf_standard extends ModelePDFStock
 				$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)
+				$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 (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_DISABLE_FPDI) && !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_DISABLE_FPDI) && !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;
@@ -286,47 +284,53 @@ class pdf_standard extends ModelePDFStock
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
 
-				$tab_top = 42;
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
+				$tab_top = 80 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+
 				$tab_height = 130;
-				$tab_height_newpage = 150;
+
 
 				/* ************************************************************************** */
 				/*                                                                            */
-				/* Affichage de la liste des produits de l'entrepot                           */
+				/* Show list of product in warehouse                                          */
 				/*                                                                            */
 				/* ************************************************************************** */
 
-				$nexY += 5;
-				$nexY = $pdf->GetY();
-				$nexY += 10;
-
 				$totalunit = 0;
 				$totalvalue = $totalvaluesell = 0;
 
+				$sortfield = 'p.ref';
+				$sortorder = 'ASC';
+
 				$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc, p.entity,";
 				$sql .= " ps.reel as value";
 				$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
 				$sql .= " WHERE ps.fk_product = p.rowid";
 				$sql .= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
 				$sql .= " AND ps.fk_entrepot = ".$object->id;
-				$sql .= $db->order($sortfield, $sortorder);
+				$sql .= $this->db->order($sortfield, $sortorder);
 
 				//dol_syslog('List products', LOG_DEBUG);
-				$resql = $db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$num = $db->num_rows($resql);
+					$num = $this->db->num_rows($resql);
 					$i = 0;
 					$nblines = $num;
+
+					$this->tabTitleHeight = 0;
+					$nexY = $tab_top + $this->tabTitleHeight;
+
 					for ($i = 0; $i < $nblines; $i++)
 					{
-						$objp = $db->fetch_object($resql);
+						$curY = $nexY;
+
+						$objp = $this->db->fetch_object($resql);
 
 						// Multilangs
 						if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
@@ -334,18 +338,17 @@ class pdf_standard extends ModelePDFStock
 							$sql = "SELECT label";
 							$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 							$sql .= " WHERE fk_product=".$objp->rowid;
-							$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
+							$sql .= " AND lang='".$this->db->escape($langs->getDefaultLang())."'";
 							$sql .= " LIMIT 1";
 
-							$result = $db->query($sql);
+							$result = $this->db->query($sql);
 							if ($result)
 							{
-								$objtp = $db->fetch_object($result);
+								$objtp = $this->db->fetch_object($result);
 								if ($objtp->label != '') $objp->produit = $objtp->label;
 							}
 						}
 
-						$curY = $nexY;
 						$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 						$pdf->SetTextColor(0, 0, 0);
 
@@ -379,19 +382,15 @@ class pdf_standard extends ModelePDFStock
 									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
-							}
-							else
-							{
+							} 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 $showpricebeforepagebreak = 0;
 							}
-						}
-						else	// No pagebreak
+						} else // No pagebreak
 						{
 							$pdf->commitTransaction();
 						}
@@ -424,7 +423,7 @@ class pdf_standard extends ModelePDFStock
 
 						// Label
 						$pdf->SetXY($this->posxlabel + 0.8, $curY);
-						$pdf->MultiCell($this->posxqty - $this->posxlabel - 0.8, 3, $objp->produit, 0, 'L');
+						$pdf->MultiCell($this->posxqty - $this->posxlabel - 0.8, 3, dol_trunc($objp->produit, 24), 0, 'L');
 
 						// Quantity
 						$valtoshow = price2num($objp->value, 'MS');
@@ -433,6 +432,7 @@ class pdf_standard extends ModelePDFStock
 						$pdf->SetXY($this->posxqty, $curY);
 						$pdf->MultiCell($this->posxup - $this->posxqty - 0.8, 3, $towrite, 0, 'R');
 
+						// AWP
 						$totalunit += $objp->value;
 
 						$pdf->SetXY($this->posxup, $curY);
@@ -475,9 +475,7 @@ class pdf_standard extends ModelePDFStock
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else
-							{
+							} 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);
@@ -491,9 +489,7 @@ class pdf_standard extends ModelePDFStock
 							if ($pagenb == 1)
 							{
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-							}
-							else
-							{
+							} 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);
@@ -505,49 +501,52 @@ class pdf_standard extends ModelePDFStock
 						}
 					}
 
-					$db->free($resql);
+					$this->db->free($resql);
 
 					/**
-					 * footer table
+					 * Footer table
 					 */
 					$nexY = $pdf->GetY();
 					$nexY += 2;
 					$curY = $nexY;
 
-					$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(220, 26, 26)));
-					$pdf->line($this->marge_gauche, $curY - 1, $this->page_largeur - $this->marge_droite, $curY - 1);
-					$pdf->SetLineStyle(array('dash'=>0));
+					if ($nblines > 0) {
+						$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200)));
+						$pdf->line($this->marge_gauche, $curY - 1, $this->page_largeur - $this->marge_droite, $curY - 1);
+						$pdf->SetLineStyle(array('dash'=>0));
 
-					$pdf->SetFont('', 'B', $default_font_size - 1);
-					$pdf->SetTextColor(0, 0, 120);
+						$pdf->SetFont('', 'B', $default_font_size - 1);
+						$pdf->SetTextColor(0, 0, 120);
 
-					// Ref.
-					$pdf->SetXY($this->posxdesc, $curY);
-					$pdf->MultiCell($this->wref, 3, $langs->trans("Total"), 0, 'L');
+						// Ref.
+						$pdf->SetXY($this->posxdesc, $curY);
+						$pdf->MultiCell($this->wref, 3, $langs->trans("Total"), 0, 'L');
 
-					// Quantity
-					$valtoshow = price2num($totalunit, 'MS');
-					$towrite = empty($valtoshow) ? '0' : $valtoshow;
+						// Quantity
+						$valtoshow = price2num($totalunit, 'MS');
+						$towrite = empty($valtoshow) ? '0' : $valtoshow;
 
-					$pdf->SetXY($this->posxqty, $curY);
-					$pdf->MultiCell($this->posxup - $this->posxqty - 0.8, 3, $towrite, 0, 'R');
+						$pdf->SetXY($this->posxqty, $curY);
+						$pdf->MultiCell($this->posxup - $this->posxqty - 0.8, 3, $towrite, 0, 'R');
 
-					// Total PMP
-					$pdf->SetXY($this->posxunit, $curY);
-					$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 3, price(price2num($totalvalue, 'MT'), 0, $outputlangs), 0, 'R');
+						// Total PMP
+						$pdf->SetXY($this->posxunit, $curY);
+						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 3, price(price2num($totalvalue, 'MT'), 0, $outputlangs), 0, 'R');
 
-					// Price sell min
-					if (empty($conf->global->PRODUIT_MULTIPRICES))
-					{
-						// Total sell min
-						$pdf->SetXY($this->postotalht, $curY);
-						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($totalvaluesell, 'MT'), 0, $outputlangs), 0, 'R', 0);
+						// Price sell min
+						if (empty($conf->global->PRODUIT_MULTIPRICES))
+						{
+							// Total sell min
+							$pdf->SetXY($this->postotalht, $curY);
+							$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($totalvaluesell, 'MT'), 0, $outputlangs), 0, 'R', 0);
+						}
 					}
+				} else {
+					dol_print_error($this->db);
 				}
-				else
-				{
-					dol_print_error($db);
-				}
+
+				// Displays notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 
 				if ($notetoshow)
 				{
@@ -569,9 +568,7 @@ class pdf_standard extends ModelePDFStock
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else
-				{
+				} else {
 					$height_note = 0;
 				}
 
@@ -579,134 +576,14 @@ class pdf_standard extends ModelePDFStock
 				$curY = $tab_top + 7;
 				$nexY = $tab_top + 7;
 
-				// Loop on each lines
-				/*
-				for ($i = 0 ; $i < $nblines ; $i++)
-				{
-					$curY = $nexY;
-					$pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
-					$pdf->SetTextColor(0,0,0);
-
-					$pdf->setTopMargin($tab_top_newpage);
-					$pdf->setPageOrientation('', 1, $heightforfooter+$heightforfreetext+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-					$pageposbefore=$pdf->getPage();
-
-					// Description of stock line
-					$curX = $this->posxdesc-1;
-
-					$showpricebeforepagebreak=1;
-
-					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$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.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$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
-							$showpricebeforepagebreak=0;
-						}
-					}
-					else	// No pagebreak
-					{
-						$pdf->commitTransaction();
-					}
-
-					$nexY = $pdf->GetY();
-					$pageposafter=$pdf->getPage();
-					$pdf->setPage($pageposbefore);
-					$pdf->setTopMargin($this->marge_haute);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-
-					// We suppose that a too long description is moved completely on next page
-					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-					}
-
-					$pdf->SetFont('','',  $default_font_size - 1);   // On repositionne la police par defaut
-
-					// Quantity
-					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-					$pdf->SetXY($this->posxqty, $curY);
-					// Enough for 6 chars
-					$pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R');
-
-					// Add line
-					if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
-						$pdf->setPage($pageposafter);
-						$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
-						//$pdf->SetDrawColor(190,190,200);
-						$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
-						$pdf->SetLineStyle(array('dash'=>0));
-					}
-
-					$nexY+=2;    // Add space between lines
-
-					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
-						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 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);
-						$pagenb++;
-						$pdf->setPage($pagenb);
-						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 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);
-						// New page
-						$pdf->AddPage();
-						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-				}
-				*/
-				$tab_top = $tab_top_newpage + 21;
+				$tab_top = $tab_top_newpage + 25 + $top_shift;
 
 				// Show square
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -734,8 +611,8 @@ class pdf_standard extends ModelePDFStock
 				$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))
@@ -744,15 +621,11 @@ class pdf_standard extends ModelePDFStock
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "PRODUCT_OUTPUTDIR");
 			return 0;
 		}
@@ -774,93 +647,93 @@ class pdf_standard extends ModelePDFStock
 	 */
 	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('', 'B', $default_font_size - 3);
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', 'B', $default_font_size - 3);
 
-	    // 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
 
-		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(220, 26, 26)));
-		$pdf->SetDrawColor(220, 26, 26);
+		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200)));
+		$pdf->SetDrawColor(200, 200, 200);
 		$pdf->line($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite, $tab_top);
 		$pdf->SetLineStyle(array('dash'=>0));
 		$pdf->SetDrawColor(128, 128, 128);
 		$pdf->SetTextColor(0, 0, 120);
 
-	    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($this->wref, 3, $outputlangs->transnoentities("Ref"), '', 'L');
-	    }
+		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($this->wref, 3, $outputlangs->transnoentities("Ref"), '', 'L');
+		}
 
 		//$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
 		if (empty($hidetop))
 		{
-			$pdf->SetXY($this->posxlabel - 3, $tab_top + 1);
-			$pdf->MultiCell($this->posxqty - $this->posxlabel + 3, 2, $outputlangs->transnoentities("Label"), '', 'C');
+			$pdf->SetXY($this->posxlabel - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxqty - $this->posxlabel - 1, 2, $outputlangs->transnoentities("Label"), '', 'L');
 		}
 
-	    //$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->posxup - $this->posxqty - 1, 2, $outputlangs->transnoentities("Units"), '', '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->posxup - $this->posxqty - 1, 2, $outputlangs->transnoentities("Units"), '', 'R');
+		}
 
-	    //$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->posxunit - $this->posxup - 1, 2, $outputlangs->transnoentities("AverageUnitPricePMPShort"), '', '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->posxunit - $this->posxup - 1, 2, $outputlangs->transnoentities("AverageUnitPricePMPShort"), '', 'R');
+		}
 
 		//$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("EstimatedStockValueShort"), '', 'C');
+			$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("EstimatedStockValueShort"), '', 'R');
 		}
 
-	    //$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
-	    if (empty($hidetop))
-	    {
+		//$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+		if (empty($hidetop))
+		{
 			$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
-			$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("SellPriceMin"), '', 'C');
-	    }
+			$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("SellPriceMin"), '', 'R');
+		}
 
-	    //$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($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("EstimatedStockValueSellShort"), '', 'C');
-	    }
+		//$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($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("EstimatedStockValueSellShort"), '', 'R');
+		}
 
-		$pdf->SetDrawColor(220, 26, 26);
-		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(220, 26, 26)));
+		$pdf->SetDrawColor(200, 200, 200);
+		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200)));
 		$pdf->line($this->marge_gauche, $tab_top + 11, $this->page_largeur - $this->marge_droite, $tab_top + 11);
 		$pdf->SetLineStyle(array('dash'=>0));
 	}
@@ -874,101 +747,94 @@ class pdf_standard extends ModelePDFStock
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
 	 *  @param	string		$titlekey		Translation key to show as title of document
-	 *  @return	void
+	 *  @return	int                         Return topshift value
 	 */
 	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "")
 	{
-	    global $conf, $langs, $db, $hookmanager;
+		global $conf, $langs, $db, $hookmanager;
 
-	    // Load traductions files required by page
+		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders", "stocks"));
 
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    if ($object->type == 1) $titlekey = 'ServiceSheet';
-	    else $titlekey = 'StockSheet';
+		if ($object->type == 1) $titlekey = 'ServiceSheet';
+		else $titlekey = 'StockSheet';
 
-	    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("Warehouse");
-	    $pdf->MultiCell(100, 3, $title, '', 'R');
-
-	    $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->label), '', 'R');
-
-	    $posy += 5;
-	    $pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
-	    $pdf->SetTextColor(0, 0, 60);
-	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("LocationSummary").' :', '', 'R');
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("Warehouse");
+		$pdf->MultiCell(100, 3, $title, '', 'R');
+
+		$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->label), '', 'R');
+
+		$posy += 5;
+		$pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("LocationSummary").' :', '', 'R');
 
 		$posy += 4;
 		$pdf->SetXY($posx - 50, $posy);
 		$pdf->MultiCell(150, 3, $object->lieu, '', 'R');
 
-
-		// Parent entrepot
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ParentWarehouse").' :', '', 'R');
 
-		$posy += 4;
-		$pdf->SetXY($posx - 50, $posy);
-		$e = new Entrepot($db);
-		if (!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0)
-		{
+		// Parent entrepot
+		$e = new Entrepot($this->db);
+		$hasparent = (!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0);
+
+		if ($hasparent) {
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ParentWarehouse").' :', '', 'R');
+
+			$posy += 4;
+			$pdf->SetXY($posx - 50, $posy);
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
 		}
-		else
-		{
-			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
-		}
 
 		// Description
 		$nexY = $pdf->GetY();
@@ -997,102 +863,40 @@ class pdf_standard extends ModelePDFStock
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
 		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-		$sql .= " WHERE m.fk_entrepot = '".$object->id."'";
-		$resqlbis = $db->query($sql);
+		$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
+		$resqlbis = $this->db->query($sql);
 		if ($resqlbis)
 		{
-			$obj = $db->fetch_object($resqlbis);
-			$lastmovementdate = $db->jdate($obj->datem);
-		}
-		else
-		{
-			dol_print_error($db);
+			$obj = $this->db->fetch_object($resqlbis);
+			$lastmovementdate = $this->db->jdate($obj->datem);
+		} else {
+			dol_print_error($this->db);
 		}
 
 		if ($lastmovementdate)
 		{
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
-		}
-		else
-		{
+		} else {
 			$toWrite = $outputlangs->transnoentities("None");
 		}
 
 		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("LastMovement").' : </b>'.$toWrite, 0, 1);
 		$nexY = $pdf->GetY();
 
+		$posy += 2;
 
-	    /*if ($object->ref_client)
-	    {
-	        $posy+=5;
-	        $pdf->SetXY($posx,$posy);
-	        $pdf->SetTextColor(0,0,60);
-	        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
-	    }*/
+		$top_shift = 0;
+		// Show list of linked objects
+		$current_y = $pdf->getY();
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		if ($current_y < $pdf->getY())
+		{
+			$top_shift = $pdf->getY() - $current_y;
+		}
 
-	    /*$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');
-	    */
+		$pdf->SetTextColor(0, 0, 0);
 
-	    // 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(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-	        }
-	    }*/
-
-	    $posy += 2;
-
-	    // Show list of linked objects
-	    $posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-
-	    if ($showaddress)
-	    {
-	        /*
-	        // Sender properties
-	        $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
-
-	        // Show sender
-	        $posy=42;
-	        $posx=$this->marge_gauche;
-	        if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-	        $hautcadre=40;
-
-	        // Show sender frame
-	        $pdf->SetTextColor(0,0,0);
-	        $pdf->SetFont('','', $default_font_size - 2);
-	        $pdf->SetXY($posx,$posy-5);
-	        $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
-	        $pdf->SetXY($posx,$posy);
-	        $pdf->SetFillColor(230,230,230);
-	        $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-	        $pdf->SetTextColor(0,0,60);
-
-	        // Show sender name
-	        $pdf->SetXY($posx+2,$posy+3);
-	        $pdf->SetFont('','B', $default_font_size);
-	        $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-	        $posy=$pdf->getY();
-
-	        // Show sender information
-	        $pdf->SetXY($posx+2,$posy);
-	        $pdf->SetFont('','', $default_font_size - 1);
-	        $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-	        */
-	    }
-
-	    $pdf->SetTextColor(0, 0, 0);
+		return $top_shift;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
@@ -1107,8 +911,8 @@ class pdf_standard extends ModelePDFStock
 	 */
 	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/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 2e3b4e177d7..83733dc1d33 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -38,76 +38,76 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_canelle extends ModelePDFSuppliersInvoices
 {
-    /**
-     * @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 array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -123,8 +123,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *
 	 *  @param	DoliDB		$db     	Database handler
 	 */
-    public function __construct($db)
-    {
+	public function __construct($db)
+	{
 		global $conf, $langs, $mysoc;
 
 		// Translations
@@ -134,7 +134,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->name = "canelle";
 		$this->description = $langs->trans('SuppliersInvoiceModel');
 
-		// Dimension page
+		// Page dimensions
 		$this->type = 'pdf';
 		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
@@ -145,14 +145,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Affiche mode reglement
-		$this->option_condreg = 1; // Affiche conditions reglement
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
 
-        // Define column position
+		// Define column position
 		$this->posxdesc = $this->marge_gauche + 1;
 		$this->posxtva = 112;
 		$this->posxup = 126;
@@ -181,28 +181,28 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		}
 
 		$this->tva = array();
-        $this->localtax1 = array();
-        $this->localtax2 = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
 		$this->atleastonediscount = 0;
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *  Function to build pdf onto disk
-     *
-     *  @param		FactureFournisseur	$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
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		FactureFournisseur	$object				Object to generate
+	 *  @param		Translate			$outputlangs		Lang output object
+	 *  @param		string				$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int					$hidedetails		Do not show line details
+	 *  @param		int					$hidedesc			Do not show desc
+	 *  @param		int					$hideref			Do not show ref
+	 *  @return		int										1=OK, 0=KO
+	 */
+	public function write_file($object, $outputlangs = '', $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager, $nblines;
 
 		// Get source company
@@ -233,12 +233,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			{
 				$dir = $conf->fournisseur->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
-                $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$objectref;
+				$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$objectref;
 				$file = $dir."/".$objectref.".pdf";
 				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
 			}
@@ -270,27 +268,27 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$nbpayments = count($object->getListOfPayments());
 
 				// Create pdf instance
-                $pdf = pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-                $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-                $heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
-		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 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;
@@ -306,26 +304,26 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
-                for ($i = 0; $i < $nblines; $i++)
-                {
-                    if ($object->lines[$i]->remise_percent)
-                    {
-                        $this->atleastonediscount++;
-                    }
-                }
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					if ($object->lines[$i]->remise_percent)
+					{
+						$this->atleastonediscount++;
+					}
+				}
 				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
+				// New page
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
@@ -358,8 +356,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					}
 				}
 
-				// Display notes
-				if (!empty($object->note_public))
+				// Displays notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+
+				if ($notetoshow)
 				{
 					$tab_top -= 2;
 
@@ -424,25 +424,21 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
 					$posYAfterDescription = $pdf->GetY();
 
 					$nexY = $pdf->GetY();
-                    $pageposafter = $pdf->getPage();
+					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
@@ -455,12 +451,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
-                    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-                    {
-    					$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
-                        $pdf->SetXY($this->posxtva, $curY);
-	       				$pdf->MultiCell($this->posxup - $this->posxtva - 1, 3, $vat_rate, 0, 'R');
-                    }
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+					{
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+						$pdf->SetXY($this->posxtva, $curY);
+		   				$pdf->MultiCell($this->posxup - $this->posxtva - 1, 3, $vat_rate, 0, 'R');
+					}
 
 					// Unit price before discount
 					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
@@ -484,16 +480,16 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					if ($object->lines[$i]->remise_percent)
 					{
 						$pdf->SetXY($this->posxdiscount - 2, $curY);
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht - $this->posxdiscount - 1, 3, $remise_percent, 0, 'R');
 					}
 
 					// Total HT line
 					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
-                    $pdf->SetXY($this->postotalht, $curY);
-                    $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
+					$pdf->SetXY($this->postotalht, $curY);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					// Collection of totals by VAT value in $this->tva["taux"]=total_tva
 					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
@@ -535,9 +531,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -551,9 +545,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -570,9 +562,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -604,8 +594,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$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))
@@ -614,26 +604,22 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
-    }
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF			$pdf            Object PDF
+	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Object		$object         Object invoice
 	 *	@param  int			$deja_regle     Amount already paid (in the currency of invoice)
 	 *	@param	int			$posy			Position depart
@@ -642,7 +628,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 
 		$sign = 1;
@@ -650,7 +636,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        $tab2_top = $posy;
+		$tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
@@ -682,7 +668,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->atleastoneratenotnull = 0;
 		foreach ($this->tva as $tvakey => $tvaval)
 		{
-			if ($tvakey > 0)    // On affiche pas taux 0
+			if ($tvakey > 0)    // We do not display rate 0
 			{
 				$this->atleastoneratenotnull++;
 
@@ -732,9 +718,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2, 0, $outputlangs), 0, 'R', 1);
 			}
-		}
-		else
-		{
+		} else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 			//Local tax 1
@@ -861,7 +845,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -882,7 +866,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        // Amount in (at tab_top - 1)
+		// Amount in (at tab_top - 1)
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
@@ -911,14 +895,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		}
 
 		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);
+		{
+			$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->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))
@@ -963,11 +947,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
 	 *
-	 *  @param  PDF                 $pdf            Object PDF
+	 *  @param  TCPDF               $pdf            Object PDF
 	 *  @param  Object			    $object         Object to show
 	 *  @param  int                 $posy           Position y in PDF
 	 *  @param  Translate           $outputlangs    Object langs for output
@@ -975,7 +959,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$sign = 1;
@@ -1027,10 +1011,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-		    $num = $this->db->num_rows($resql);
+			$num = $this->db->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
-			    $y += 3;
+				$y += 3;
 				$row = $this->db->fetch_object($resql);
 
 				$pdf->SetXY($tab3_posx, $tab3_top + $y);
@@ -1048,9 +1032,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1060,7 +1042,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param  PDF                 $pdf            Object PDF
+	 *  @param  TCPDF               $pdf            Object PDF
 	 *  @param  FactureFournisseur  $object         Object to show
 	 *  @param  int                 $showaddress    0=no, 1=yes
 	 *  @param  Translate           $outputlangs    Object lang for output
@@ -1118,11 +1100,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		if ($object->ref_supplier)
 		{
-    		$posy += 4;
+			$posy += 4;
 			$pdf->SetFont('', 'B', $default_font_size);
-    		$pdf->SetXY($posx, $posy);
+			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-    		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefSupplier")." : ".$object->ref_supplier, '', 'R');
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefSupplier")." : ".$object->ref_supplier, '', 'R');
 			$posy += 1;
 		}
 
@@ -1133,9 +1115,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$object->fetch_projet();
 			if (!empty($object->project->ref))
 			{
-        		$posy += 4;
+				$posy += 4;
 				$pdf->SetXY($posx, $posy);
-        		$langs->load("projects");
+				$langs->load("projects");
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Project")." : ".(empty($object->project->ref) ? '' : $object->projet->ref), '', 'R');
 			}
@@ -1147,9 +1129,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
-		}
-		else
-		{
+		} else {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
@@ -1179,16 +1159,16 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		if ($showaddress)
 		{
 			// Sender properties
-		    $carac_emetteur = '';
-		    // Add internal contact of proposal if defined
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $object->fetch_user($arrayidcontact[0]);
-		        $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		    }
+			$carac_emetteur = '';
+			// Add internal contact of proposal if defined
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$object->fetch_user($arrayidcontact[0]);
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		    $carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy = 42 + $top_shift;
@@ -1229,7 +1209,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			}
 
 			//Recipient name
-			// On peut utiliser le nom de la societe du contact
+			// We can use the name of the contact's company
 			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
 				$thirdparty = $object->contact;
 			} else {
@@ -1271,19 +1251,19 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Show footer of page. Need this->emetteur object
-     *
-     *  @param  PDF                 $pdf                PDF
-     *  @param  FactureFournisseur  $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, 'SUPPLIER_INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
-    }
+	/**
+	 *  Show footer of page. Need this->emetteur object
+	 *
+	 *  @param  TCPDF               $pdf                PDF
+	 *  @param  FactureFournisseur  $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, 'SUPPLIER_INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
 }
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 0aa766c2c88..2b528e1154f 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -182,7 +182,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         $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 '".$prefix."____-%'";
+        $sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-%'";
         $sql .= " AND entity = ".$conf->entity;
 
         $resql = $db->query($sql);
@@ -192,9 +192,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         	$obj = $db->fetch_object($resql);
         	if ($obj) $max = intval($obj->max);
         	else $max = 0;
-        }
-        else
-        {
+        } else {
         	return -1;
         }
 
@@ -206,7 +204,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         	$ref = '';
         	$sql = "SELECT ref as ref";
         	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        	$sql .= " WHERE ref LIKE '".$prefix."____-".$num."'";
+        	$sql .= " WHERE ref LIKE '".$db->escape($prefix)."____-".$num."'";
         	$sql .= " AND entity = ".$conf->entity;
 
         	dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
@@ -215,12 +213,10 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
         	{
         		$obj = $db->fetch_object($resql);
         		if ($obj) $ref = $obj->ref;
-        	}
-        	else dol_print_error($db);
+        	} else dol_print_error($db);
 
         	return $ref;
-        }
-        elseif ($mode == 'next')
+        } elseif ($mode == 'next')
         {
         	$date = $object->date; // This is invoice date (not creation date)
         	$yymm = strftime("%y%m", $date);
@@ -230,8 +226,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 
         	dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
         	return $prefix.$yymm."-".$num;
-        }
-        else dol_print_error('', 'Bad parameter for getNextValue');
+        } else dol_print_error('', 'Bad parameter for getNextValue');
     }
 
 
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 8d35c5d1758..3805a941476 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -168,8 +168,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 			{
 				$mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 			}
-		}
-		elseif (is_object($object) && $object->type == 2) $mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
+		} elseif (is_object($object) && $object->type == 2) $mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
 		elseif (is_object($object) && $object->type == 3) $mask = $conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
 		else $mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 		if (!$mask)
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 d7f48915308..9c9e43a9475 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
@@ -49,9 +49,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * @var string Dolibarr version of the loaded document
@@ -138,8 +138,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -238,9 +237,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -273,9 +270,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -307,9 +302,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
                			// 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -346,8 +339,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -363,8 +355,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
                     dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -395,25 +386,21 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -432,15 +419,12 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
                                     dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -449,8 +433,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -463,8 +446,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -484,8 +466,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 					    $odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -506,9 +487,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 657160a9a1b..c0b849fad67 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -41,71 +41,71 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_cornas extends ModelePDFSuppliersOrders
 {
-    /**
-     * @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 document type
-     */
-    public $type;
-
-    /**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -153,7 +153,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
 
-        // Get source company
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 
@@ -161,28 +161,28 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support durring PDF transition: TODO remove this at the end
 
 		$this->tva = array();
-        $this->localtax1 = array();
-        $this->localtax2 = array();
-        $this->atleastoneratenotnull = 0;
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
 		$this->atleastonediscount = 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		CommandeFournisseur	$object				Id of 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:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		CommandeFournisseur	$object				Id of 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, $hookmanager, $mysoc, $nblines;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -203,7 +203,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		$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
@@ -221,9 +221,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				{
 					$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
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -250,16 +248,14 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$amount_credit_notes_included = 0;
 			$amount_deposits_included = 0;
 			//$amount_credit_notes_included = $object->getSumCreditNotesUsed();
-            //$amount_deposits_included = $object->getSumDepositsUsed();
+			//$amount_deposits_included = $object->getSumDepositsUsed();
 
 			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -291,26 +287,26 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				$nblines = count($object->lines);
 
-                $pdf = pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-                $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)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
-                $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$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)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -327,10 +323,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				// Does we have at least one line with discount $this->atleastonediscount
 				foreach ($object->lines as $line) {
-				    if ($line->remise_percent) {
-				        $this->atleastonediscount = true;
-				        break;
-				    }
+					if ($line->remise_percent) {
+						$this->atleastonediscount = true;
+						break;
+					}
 				}
 
 				// New page
@@ -369,131 +365,127 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				// Affiche notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 
-                // Extrafields in note
-                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-                if (!empty($extranote))
-                {
-                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
-                }
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote))
+				{
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
 
 				$pagenb = $pdf->getPage();
 				if ($notetoshow)
 				{
-				    $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
-				    $pageposbeforenote = $pagenb;
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
 
-				    $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
-				    complete_substitutions_array($substitutionarray, $outputlangs, $object);
-				    $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-				    $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-				    $tab_top -= 2;
+					$tab_top -= 2;
 
-				    $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);
 
-				        // prepar 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);
-				        }
+						// prepar 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 previus pages
-				        $i = $pageposbeforenote;
-				        while ($i < $pageposafternote) {
-				            $pdf->setPage($i);
+						// apply note frame to previus pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
 
 
-				            $pdf->SetDrawColor(128, 128, 128);
-				            // Draw note frame
-				            if ($i > $pageposbeforenote) {
-				                $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-				                $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				            }
-				            else {
-				                $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-				                $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
-				            }
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
 
-				            // Add footer
-				            $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-				            $this->_pagefoot($pdf, $object, $outputlangs, 1);
+							// Add footer
+							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
-				            $i++;
-				        }
+							$i++;
+						}
 
-				        // apply note frame to last page
-				        $pdf->setPage($pageposafternote);
-				        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-				        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-				        $height_note = $posyafter - $tab_top_newpage;
-				        $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-				    }
-				    else // No pagebreak
-				    {
-				        $pdf->commitTransaction();
-				        $posyafter = $pdf->GetY();
-				        $height_note = $posyafter - $tab_top;
-				        $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+						// apply note frame to last page
+						$pdf->setPage($pageposafternote);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$height_note = $posyafter - $tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-				        if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-				        {
-				            // not enough space, need to add page
-				            $pdf->AddPage('', '', true);
-				            $pagenb++;
-				            $pageposafternote++;
-				            $pdf->setPage($pageposafternote);
-				            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-				            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
+						{
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 
-				            $posyafter = $tab_top_newpage;
-				        }
-				    }
+							$posyafter = $tab_top_newpage;
+						}
+					}
 
-				    $tab_height = $tab_height - $height_note;
-				    $tab_top = $posyafter + 6;
-				}
-				else
-				{
-				    $height_note = 0;
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
+				} else {
+					$height_note = 0;
 				}
 
 				$nexY = $tab_top + 5;
@@ -535,8 +527,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						// 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 $showpricebeforepagebreak = 0;
 					}
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@@ -552,47 +543,43 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 					if ($this->getColumnStatus('desc'))
 					{
-					    $pdf->startTransaction();
-                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc, 1);
+						$pdf->startTransaction();
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc, 1);
 
-					    $pageposafter = $pdf->getPage();
-					    if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					    {
-					        $pdf->rollbackTransaction(true);
+						$pageposafter = $pdf->getPage();
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
 
-                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc, 1);
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc, 1);
 
-					        $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();
-					    }
-					    $posYAfterDescription = $pdf->GetY();
+							$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();
+						}
+						$posYAfterDescription = $pdf->GetY();
 					}
 
 					$nexY = $pdf->GetY();
-                    $pageposafter = $pdf->getPage();
+					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
@@ -607,73 +594,73 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					// 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 HT line
 					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);
 					}
 
-                    // Extrafields
-                    if (!empty($object->lines[$i]->array_options)) {
-                        foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-                            if ($this->getColumnStatus($extrafieldColKey))
-                            {
-                                $extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
-                                $this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
-                                $nexY = max($pdf->GetY(), $nexY);
-                            }
-                        }
-                    }
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey))
+							{
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
 
 					$parameters = array(
-					    'object' => $object,
-					    'i' => $i,
-					    'pdf' =>& $pdf,
-					    'curY' =>& $curY,
-					    'nexY' =>& $nexY,
-					    'outputlangs' => $outputlangs,
-					    'hidedetails' => $hidedetails
+						'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
 
@@ -704,7 +691,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						$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)
@@ -729,13 +716,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					// Detect if some page were added automatically and output _tableau for past pages
 					while ($pagenb < $pageposafter)
 					{
-					    $pdf->setPage($pagenb);
-					    if ($pagenb == $pageposbeforeprintlines)
-					    {
-					        $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    }
-						else
+						$pdf->setPage($pagenb);
+						if ($pagenb == $pageposbeforeprintlines)
 						{
+							$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);
@@ -746,12 +731,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					}
 					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
 					{
-					    if ($pagenb == $pageposafter)
-					    {
-					        $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
-					    }
-						else
+						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_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -766,11 +749,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				// 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);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-			    }
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -787,7 +768,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$posy = $this->_tableau_versements($pdf, $object, $posy, $outputlangs);
 				}
 
-                // Pied de page
+				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
@@ -802,8 +783,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$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))
@@ -812,26 +793,22 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  CommandeFournisseur		$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
@@ -839,15 +816,15 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 */
 	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, ...)
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		CommandeFournisseur		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
@@ -855,12 +832,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
-	    global $conf, $mysoc;
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		// phpcs:enable
+		global $conf, $mysoc;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        // If France, show VAT mention if not applicable
-	    if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
+		// 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);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -871,13 +848,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		$posxval = 52;
 
-	    // Show payments conditions
-	    if (!empty($object->cond_reglement_code) || $object->cond_reglement)
-	    {
-	        $pdf->SetFont('', 'B', $default_font_size - 2);
-	        $pdf->SetXY($this->marge_gauche, $posy);
-	        $titre = $outputlangs->transnoentities("PaymentConditions").':';
-	        $pdf->MultiCell(80, 4, $titre, 0, 'L');
+		// Show payments conditions
+		if (!empty($object->cond_reglement_code) || $object->cond_reglement)
+		{
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentConditions").':';
+			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
@@ -885,35 +862,35 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
 
-	        $posy = $pdf->GetY() + 3;
-	    }
+			$posy = $pdf->GetY() + 3;
+		}
 
-      	// Show payment mode
-        if (!empty($object->mode_reglement_code))
-        {
-        	$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 (!empty($object->mode_reglement_code))
+		{
+			$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->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');
 
-        	$posy = $pdf->GetY() + 2;
-        }
+			$posy = $pdf->GetY() + 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
 	 *
-	 *	@param	PDF			$pdf           Object PDF
+	 *	@param	TCPDF		$pdf           Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
@@ -922,12 +899,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        $tab2_top = $posy;
+		$tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
@@ -1008,12 +985,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
-		}
-		else
-		{
+		} else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
-    			//Local tax 1
+				//Local tax 1
 			foreach ($this->localtax1 as $localtax_type => $localtax_rate)
 			{
 				if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
@@ -1045,7 +1020,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 			//{
-    			//Local tax 2
+				//Local tax 2
 			foreach ($this->localtax2 as $localtax_type => $localtax_rate)
 			{
 				if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
@@ -1089,8 +1064,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetTextColor(0, 0, 0);
 
-        $creditnoteamount = 0;
-        $depositsamount = 0;
+		$creditnoteamount = 0;
+		$depositsamount = 0;
 		//$creditnoteamount=$object->getSumCreditNotesUsed();
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
@@ -1100,7 +1075,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		if ($deja_regle > 0)
 		{
 			// Already paid + Deposits
-		    $index++;
+			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
@@ -1125,10 +1100,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
+	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -1149,7 +1124,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        // Amount in (at tab_top - 1)
+		// Amount in (at tab_top - 1)
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
@@ -1173,27 +1148,27 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		foreach ($this->cols as $colKey => $colDef)
 		{
-		    if (!$this->getColumnStatus($colKey)) continue;
+			if (!$this->getColumnStatus($colKey)) continue;
 
-		    // get title label
-		    $colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
+			// get title label
+			$colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
 
-		    // Add column separator
-		    if (!empty($colDef['border-left'])) {
-		        $pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
-		    }
+			// Add column separator
+			if (!empty($colDef['border-left'])) {
+				$pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
+			}
 
-		    if (empty($hidetop))
-		    {
-		        $pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0]);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0]);
 
-		        $textWidth = $colDef['width'] - $colDef['title']['padding'][3] - $colDef['title']['padding'][1];
-		        $pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
-		    }
+				$textWidth = $colDef['width'] - $colDef['title']['padding'][3] - $colDef['title']['padding'][1];
+				$pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
+			}
 		}
 
 		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->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
 		}
 	}
 
@@ -1201,7 +1176,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  CommandeFournisseur		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -1240,19 +1215,15 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1295,9 +1266,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
-		}
-		else
-		{
+		} else {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
@@ -1325,16 +1294,16 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		// 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(100, 3, $langs->trans("BuyerName")." : ".$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(100, 3, $langs->trans("BuyerName")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 1;
@@ -1351,15 +1320,15 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		if ($showaddress)
 		{
-		    // Sender properties
-		    $carac_emetteur = '';
-		    // Add internal contact of proposal if defined
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $object->fetch_user($arrayidcontact[0]);
-		        $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		    }
+			// Sender properties
+			$carac_emetteur = '';
+			// Add internal contact of proposal if defined
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$object->fetch_user($arrayidcontact[0]);
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
 			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
@@ -1446,8 +1415,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	CommandeFournisseur		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
@@ -1474,21 +1443,21 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	 */
 	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-	    global $conf, $hookmanager;
+		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
@@ -1506,148 +1475,145 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	     );
 	     */
 
-	    $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, 1, 0.5, 1.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, 1, 0.5, 1.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 = $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
-	    );
+		$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' => true,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-        // Add extrafields cols
-        if (!empty($object->lines)) {
-            $line = reset($object->lines);
-            $this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
-        }
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
 
-	    $parameters = array(
-	        'object' => $object,
-	        'outputlangs' => $outputlangs,
-	        'hidedetails' => $hidedetails,
-	        'hidedesc' => $hidedesc,
-	        'hideref' => $hideref
-	    );
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
 
-	    $reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-	    if ($reshook < 0)
-	    {
-	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    }
-	    elseif (empty($reshook))
-	    {
-	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    }
-	    else
-	    {
-	        $this->cols = $hookmanager->resArray;
-	    }
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0)
+		{
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook))
+		{
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
 	}
 }
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index 4a27b58f8ae..f6e27499dc2 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -41,71 +41,71 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_muscadet extends ModelePDFSuppliersOrders
 {
-    /**
-     * @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 document type
-     */
-    public $type;
-
-    /**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -142,18 +142,18 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Affiche mode reglement
-		$this->option_condreg = 1; // Affiche conditions reglement
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
 
-        // Get source company
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 
@@ -189,28 +189,28 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		}
 
 		$this->tva = array();
-        $this->localtax1 = array();
-        $this->localtax2 = array();
-        $this->atleastoneratenotnull = 0;
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
 		$this->atleastonediscount = 0;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		CommandeFournisseur	$object				Id of 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:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		CommandeFournisseur	$object				Id of 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, $hookmanager, $mysoc, $nblines;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -237,9 +237,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$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
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -266,16 +264,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$amount_credit_notes_included = 0;
 			$amount_deposits_included = 0;
 			//$amount_credit_notes_included = $object->getSumCreditNotesUsed();
-            //$amount_deposits_included = $object->getSumDepositsUsed();
+			//$amount_deposits_included = $object->getSumDepositsUsed();
 
 			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
@@ -307,26 +303,26 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 				$nblines = count($object->lines);
 
-                $pdf = pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-                $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)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
-                $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$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)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -351,14 +347,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				}
 				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
@@ -447,8 +443,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						// 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 $showpricebeforepagebreak = 0;
 					}
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@@ -466,9 +461,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					if ($posYAfterImage > 0)
 					{
 						$descWidth = $this->posxpicture - $curX;
-					}
-					else
-					{
+					} else {
 						$descWidth = $this->posxtva - $curX;
 					}
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
@@ -491,24 +484,20 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
 
 					$nexY = $pdf->GetY();
-                    $pageposafter = $pdf->getPage();
+					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
@@ -550,12 +539,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->SetXY($this->posxdiscount, $curY);
 					if ($object->lines[$i]->remise_percent)
 					{
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht - $this->posxdiscount - 1, 3, $remise_percent, 0, 'R');
 					}
 
 					// Total HT line
-                    $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs);
+					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs);
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
@@ -585,7 +574,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$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)
@@ -616,9 +605,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -632,9 +619,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-						}
-						else
-						{
+						} 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);
@@ -651,9 +636,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -670,7 +653,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$posy = $this->_tableau_versements($pdf, $object, $posy, $outputlangs);
 				}
 
-                // Pied de page
+				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
@@ -685,8 +668,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$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))
@@ -695,26 +678,22 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  CommandeFournisseur		$object			Object order
 	 *	@param	int			$posy			Position y in PDF
 	 *	@param	Translate	$outputlangs	Object langs for output
@@ -722,15 +701,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 */
 	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, ...)
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		CommandeFournisseur		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
@@ -738,13 +717,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
-	    global $conf, $mysoc;
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+		// phpcs:enable
+		global $conf, $mysoc;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        // If France, show VAT mention if not applicable
-	    if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
-		{
+		// 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);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@@ -754,49 +732,46 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		$posxval = 52;
 
-	    // Show payments conditions
-	    if (!empty($object->cond_reglement_code) || $object->cond_reglement)
-	    {
-	        $pdf->SetFont('', 'B', $default_font_size - 2);
-	        $pdf->SetXY($this->marge_gauche, $posy);
-	        $titre = $outputlangs->transnoentities("PaymentConditions").':';
-	        $pdf->MultiCell(80, 4, $titre, 0, 'L');
+		// Show payments conditions
+		if (!empty($object->cond_reglement_code) || $object->cond_reglement_id) {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentConditions").':';
+			$pdf->MultiCell(80, 4, $titre, 0, 'L');
 
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$lib_condition_paiement = $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) != ('PaymentCondition'.$object->cond_reglement_code) ? $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) : $outputlangs->convToOutputCharset($object->cond_reglement);
+			$lib_condition_paiement = $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) != ('PaymentCondition'.$object->cond_reglement_code) ? $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) : $outputlangs->convToOutputCharset($object->cond_reglement_id);
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(80, 4, $lib_condition_paiement, 0, 'L');
 
-	        $posy = $pdf->GetY() + 3;
-	    }
+			$posy = $pdf->GetY() + 3;
+		}
 
-      	// Show payment mode
-        if (!empty($object->mode_reglement_code))
-        {
-        	$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 (!empty($object->mode_reglement_code)) {
+			$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');
-
-        	$posy = $pdf->GetY() + 2;
-        }
+			$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');
 
+			$posy = $pdf->GetY() + 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
 	 *
-	 *  @param	PDF			$pdf           Object PDF
+	 *  @param	TCPDF		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
@@ -805,12 +780,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        $tab2_top = $posy;
+		$tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
@@ -891,12 +866,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
 			}
-		}
-		else
-		{
+		} else {
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
-    			//Local tax 1
+				//Local tax 1
 			foreach ($this->localtax1 as $localtax_type => $localtax_rate)
 			{
 				if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
@@ -928,7 +901,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 			//{
-    			//Local tax 2
+				//Local tax 2
 			foreach ($this->localtax2 as $localtax_type => $localtax_rate)
 			{
 				if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
@@ -972,8 +945,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetTextColor(0, 0, 0);
 
-        $creditnoteamount = 0;
-        $depositsamount = 0;
+		$creditnoteamount = 0;
+		$depositsamount = 0;
 		//$creditnoteamount=$object->getSumCreditNotesUsed();
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
@@ -983,7 +956,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		if ($deja_regle > 0)
 		{
 			// Already paid + Deposits
-		    $index++;
+			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
@@ -1008,10 +981,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
+	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -1032,7 +1005,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        // Amount in (at tab_top - 1)
+		// Amount in (at tab_top - 1)
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
@@ -1060,15 +1033,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-        if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-        {
-    		$pdf->line($this->posxtva, $tab_top, $this->posxtva, $tab_top + $tab_height);
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
+		{
+			$pdf->line($this->posxtva, $tab_top, $this->posxtva, $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->SetXY($this->posxtva - 3, $tab_top + 1);
+				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
-        }
+		}
 
 		$pdf->line($this->posxup, $tab_top, $this->posxup, $tab_top + $tab_height);
 		if (empty($hidetop))
@@ -1117,7 +1090,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  CommandeFournisseur		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -1156,19 +1129,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1201,7 +1170,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->SetXY($posx, $posy);
 				$langs->load("projects");
 				$pdf->SetTextColor(0, 0, 60);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Project")." : ".(empty($object->project->ref) ? '' : $object->projet->ref), '', 'R');
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Project")." : ".(empty($object->project->ref) ? '' : $object->project->ref), '', 'R');
 			}
 		}
 
@@ -1211,9 +1180,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date_commande, "day", false, $outputlangs, true), '', 'R');
-		}
-		else
-		{
+		} else {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(255, 0, 0);
@@ -1241,16 +1208,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		// 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(100, 3, $langs->trans("BuyerName")." : ".$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(100, 3, $langs->trans("BuyerName")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 1;
@@ -1267,15 +1234,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		if ($showaddress)
 		{
-		    // Sender properties
-		    $carac_emetteur = '';
-		    // Add internal contact of proposal if defined
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $object->fetch_user($arrayidcontact[0]);
-		        $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		    }
+			// Sender properties
+			$carac_emetteur = '';
+			// Add internal contact of proposal if defined
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$object->fetch_user($arrayidcontact[0]);
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
 			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
@@ -1361,8 +1328,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *  Show footer of page. Need this->emetteur object
-     *
-	 *  @param	PDF			$pdf     			PDF
+	 *
+	 *  @param	TCPDF		$pdf     			PDF
 	 *  @param	CommandeFournisseur		$object				Object to show
 	 *  @param	Translate	$outputlangs		Object lang for output
 	 *  @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index 79241628482..056b9c2c15e 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -116,9 +116,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 58ef22172bf..388ee06f7a9 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -38,71 +38,71 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
  */
 class pdf_standard extends ModelePDFSuppliersPayments
 {
-    /**
-     * @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 array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -139,10 +139,10 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_multilang = 1; // Available in several languages
 
-        // Define column position
+		// Define column position
 		$this->posxdate = $this->marge_gauche + 1;
 		$this->posxreffacturefourn = 30;
 		$this->posxreffacture = 65;
@@ -163,32 +163,32 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		}
 
 		$this->tva = array();
-        $this->localtax1 = array();
-        $this->localtax2 = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
 		$this->atleastoneratenotnull = 0;
 		$this->atleastonediscount = 0;
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		PaiementFourn		$object				Id of 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		PaiementFourn		$object				Id of 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, $hookmanager;
 
 		if (!is_object($outputlangs)) $outputlangs = $langs;
@@ -230,12 +230,10 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			{
 				$dir = $conf->fournisseur->payment->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
-                $dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
+				$dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
 				$file = $dir."/".$objectref.".pdf";
 				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
 			}
@@ -264,26 +262,26 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 				$nblines = count($object->lines);
 
-                $pdf = pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-                $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)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
-                $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$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)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -299,7 +297,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
-                // New page
+				// New page
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
@@ -359,24 +357,20 @@ class pdf_standard extends ModelePDFSuppliersPayments
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
 
 					$nexY = $pdf->GetY();
-                    $pageposafter = $pdf->getPage();
+					$pageposafter = $pdf->getPage();
 					$pdf->setPage($pageposbefore);
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
@@ -409,8 +403,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 					$pdf->MultiCell($this->posxtva - $this->posxup - 0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0);
 
 					// Total TTC line
-                    $pdf->SetXY($this->posxtotalttc, $curY);
-                    $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R', 0);
+					$pdf->SetXY($this->posxtotalttc, $curY);
+					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R', 0);
 
 
 					// Add line
@@ -432,9 +426,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -448,9 +440,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -467,20 +457,18 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
-				// Affiche zone cheèque
+				// Display check zone
 				$posy = $this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs);
 
 				// Affiche zone totaux
 				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
-				// Pied de page
+				// Footer page
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
@@ -495,8 +483,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$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))
@@ -505,15 +493,11 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_OUTPUTDIR");
 			return 0;
 		}
@@ -524,7 +508,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF				$pdf			Object PDF
+	 *	@param	TCPDF			$pdf			Object PDF
 	 *	@param  PaiementFourn	$object         Object PaiementFourn
 	 *	@param	int				$posy			Position depart
 	 *	@param	Translate		$outputlangs	Objet langs
@@ -532,10 +516,10 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 */
 	protected function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetFillColor(255, 255, 255);
@@ -582,7 +566,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		integer		$tab_top		Top position of table
 	 *   @param		integer		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -603,7 +587,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-        // Amount in (at tab_top - 1)
+		// Amount in (at tab_top - 1)
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
@@ -627,7 +611,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  FactureFournisseur		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -659,23 +643,19 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		}
-		else
-		{
+		} 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);
@@ -808,8 +788,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	FactureFournisseur		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index 197d607b08b..8a315399183 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -136,9 +136,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
 		}
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 c97d2f94d63..ea6c1574149 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
@@ -46,9 +46,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
    * Dolibarr version of the loaded document
@@ -142,8 +142,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -306,9 +305,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -337,16 +334,12 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 					if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))
 					{
 						$socobject = $object->contact;
-					}
-					else
-					{
+					} 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -383,8 +376,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -400,8 +392,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -431,25 +422,21 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -468,15 +455,12 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -485,8 +469,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -499,8 +482,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
                         dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -519,8 +501,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
                         dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -540,9 +521,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index afaf4987e04..06bdb462b18 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -39,76 +39,76 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 class pdf_aurore extends ModelePDFSupplierProposal
 {
 	/**
-     * @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.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @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
-	*/
+	 * Issuer
+	 * @var Societe
+	 */
 	public $emetteur;
 
 
@@ -161,15 +161,15 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		if ($conf->global->PRODUCT_USE_UNITS)
 		{
-		    $this->posxtva = 101;
-		    $this->posxup = 118;
-		    $this->posxqty = 135;
-		    $this->posxunit = 151;
+			$this->posxtva = 101;
+			$this->posxup = 118;
+			$this->posxqty = 135;
+			$this->posxunit = 151;
 		} else {
-		    $this->posxtva = 102;
-		    $this->posxup = 126;
-		    $this->posxqty = 145;
-		    $this->posxunit = 162;
+			$this->posxtva = 102;
+			$this->posxup = 126;
+			$this->posxqty = 145;
+			$this->posxunit = 162;
 		}
 
 		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxup = $this->posxtva;
@@ -192,21 +192,21 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$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;
@@ -233,9 +233,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				{
 					$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
-				{
+				} else {
 					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
@@ -265,9 +263,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			{
 				$dir = $conf->supplier_proposal->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else
-			{
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->supplier_proposal->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
@@ -296,26 +292,26 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Create pdf instance
-                $pdf = pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-                $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)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
-                $pdf->SetAutoPageBreak(1, 0);
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$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)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$pdf->SetAutoPageBreak(1, 0);
 
-                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;
@@ -340,14 +336,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				}
 				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
@@ -379,7 +375,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				{
 					$tab_top -= 2;
 
-                    $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
@@ -432,8 +428,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						// 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 $showpricebeforepagebreak = 0;
 					}
 
 					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
@@ -451,9 +446,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					if ($posYAfterImage > 0)
 					{
 						$descWidth = $this->posxpicture - $curX;
-					}
-					else
-					{
+					} else {
 						$descWidth = $this->posxtva - $curX;
 					}
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
@@ -479,18 +472,14 @@ class pdf_aurore extends ModelePDFSupplierProposal
 								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pageposafter + 1);
 							}
-						}
-						else
-						{
+						} 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 $showpricebeforepagebreak = 0;
 						}
-					}
-					else	// No pagebreak
+					} else // No pagebreak
 					{
 						$pdf->commitTransaction();
 					}
@@ -534,9 +523,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					// Unit
 					if ($conf->global->PRODUCT_USE_UNITS)
 					{
-					    $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
-					    $pdf->SetXY($this->posxunit, $curY);
-					    $pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$pdf->SetXY($this->posxunit, $curY);
+						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
 
 					// Discount on line
@@ -581,7 +570,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$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)
@@ -612,9 +601,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -628,9 +615,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						if ($pagenb == 1)
 						{
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else
-						{
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
@@ -647,9 +632,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -683,8 +666,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$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))
@@ -693,42 +676,38 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $langs->trans("ErrorConstantNotDefined", "SUPPLIER_PROPOSAL_OUTPUTDIR");
 			return 0;
 		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Show payments table
 	 *
-     *  @param	PDF			$pdf           Object PDF
-     *  @param  Object		$object         Object proposal
-     *  @param  int			$posy           Position y in PDF
-     *  @param  Translate	$outputlangs    Object langs for output
-     *  @return int             			<0 if KO, >0 if OK
+	 *  @param	TCPDF		$pdf            Object PDF
+	 *  @param  Object		$object         Object proposal
+	 *  @param  int			$posy           Position y in PDF
+	 *  @param  Translate	$outputlangs    Object langs for output
+	 *  @return int             			<0 if KO, >0 if OK
 	 */
 	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, ...)
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		Object		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
@@ -736,7 +715,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -744,10 +723,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		$posxval = 52;
 
-        // Show shipping date
-        if (!empty($object->date_livraison))
+		// Show shipping date
+		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").':';
@@ -757,9 +736,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
-            $posy = $pdf->GetY() + 1;
-		}
-		else {
+			$posy = $pdf->GetY() + 1;
+		} else {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -768,11 +746,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
 			//$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
-			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
+			$pdf->MultiCell(80, 4, '', 0, 'L');
 
-            $posy = $pdf->GetY() + 1;
+			$posy = $pdf->GetY() + 1;
 		}
-        /* PHFAVRE
+		/* PHFAVRE
 		elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
@@ -843,13 +821,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$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))
-			            {
+						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)
 					{
@@ -858,13 +836,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						$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))
-			            {
+						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;
-			            }
+						}
 					}
 				}
 			}
@@ -892,11 +870,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Show total to pay
 	 *
-	 *	@param	PDF			$pdf            Object PDF
+	 *	@param	TCPDF		$pdf            Object PDF
 	 *	@param  Facture		$object         Object invoice
 	 *	@param  int			$deja_regle     Montant deja regle
 	 *	@param	int			$posy			Position depart
@@ -905,7 +883,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	 */
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $mysoc;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -942,9 +920,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
 			{
 				// Nothing to do
-			}
-			else
-			{
+			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
@@ -976,7 +952,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1067,7 +1043,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						}
 					}
 				}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1077,7 +1053,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 					foreach ($localtax_rate as $tvakey => $tvaval)
 					{
-					    // retrieve global local tax
+						// retrieve global local tax
 						if ($tvakey != 0)    // On affiche pas taux 0
 						{
 							//$this->atleastoneratenotnull++;
@@ -1117,13 +1093,10 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		$pdf->SetTextColor(0, 0, 0);
 
-		/*
 		$resteapayer = $object->total_ttc - $deja_regle;
-		if (! empty($object->paye)) $resteapayer=0;
-		*/
+		if (!empty($object->paye)) $resteapayer = 0;
 
-		if ($deja_regle > 0)
-		{
+		if ($deja_regle > 0) {
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1169,7 +1142,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	/**
 	 *   Show table for lines
 	 *
-	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		TCPDF		$pdf     		Object PDF
 	 *   @param		string		$tab_top		Top position of table
 	 *   @param		string		$tab_height		Height of table (rectangle)
 	 *   @param		int			$nexY			Y (not used)
@@ -1239,16 +1212,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$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->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');
-		    }
+			$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);
@@ -1275,7 +1248,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	/**
 	 *  Show top header of page.
 	 *
-	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param	TCPDF		$pdf     		Object PDF
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
@@ -1295,7 +1268,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		//  Show Draft Watermark
 		if ($object->statut == 0 && (!empty($conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK)))
 		{
-            pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK);
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -1312,19 +1285,15 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		{
 			if (is_readable($logo))
 			{
-			    $height = pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else
-			{
+				$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
-		{
+		} else {
 			$text = $this->emetteur->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
@@ -1352,7 +1321,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
-        /* PHFAVRE
+		/* PHFAVRE
 		$posy+=4;
 		$pdf->SetXY($posx,$posy);
 		$pdf->SetTextColor(0,0,60);
@@ -1370,16 +1339,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		// 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(100, 3, $langs->trans("BuyerName")." : ".$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(100, 3, $langs->trans("BuyerName")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 2;
@@ -1452,9 +1421,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 				if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
 				else $socname = $object->thirdparty->name;
 				$carac_client_name = $outputlangs->convToOutputCharset($socname);
-			}
-			else
-			{
+			} else {
 				$carac_client_name = $outputlangs->convToOutputCharset($object->thirdparty->name);
 			}
 
@@ -1490,16 +1457,16 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     *  Show footer of page. Need this->emetteur object
-     *
-     *  @param  PDF			$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)
+	/**
+	 *  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;
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index 15fa4930bd9..9daf788d92e 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -108,9 +108,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm))
 		{
 			return true;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -141,9 +139,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index dedf0844245..4f70dc6544c 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -90,8 +90,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 		if (file_exists($filename) && is_writable($filename))
 		{
 			dol_syslog('admin/syslog: file '.$filename);
-		}
-		else $errors[] = $langs->trans("ErrorFailedToOpenFile", $filename);
+		} else $errors[] = $langs->trans("ErrorFailedToOpenFile", $filename);
 
 		return $errors;
 	}
@@ -151,9 +150,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				//throw new Exception('Failed to open log file '.basename($logfile));
 				print 'Failed to open log file '.($dolibarr_main_prod ?basename($logfile) : $logfile);
 			}
-		}
-		else
-		{
+		} else {
 			$logLevels = array(
 				LOG_EMERG => 'EMERG',
 				LOG_ALERT => 'ALERT',
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 56ca1825ab4..58fb5f632bf 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -16,7 +16,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 	 */
 	public function getName()
 	{
-		return 'Syslog';
+		return 'Syslogd';
 	}
 
 	/**
@@ -92,9 +92,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 			if (!empty($_SERVER["WINDIR"])) $facility = constant('LOG_USER');
 
 			dol_syslog("admin/syslog: facility ".$facility);
-		}
-		else
-		{
+		} else {
 		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
 		}
 
@@ -116,8 +114,7 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 		if (!empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
-		}
-		else $facility = constant('LOG_USER');
+		} else $facility = constant('LOG_USER');
 
 		// (int) is required to avoid error parameter 3 expected to be long
 		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index 911ed761177..f4de0f6646e 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -164,12 +164,10 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
             if ($resql) {
                 $obj = $db->fetch_object($resql);
                 if ($obj) $ref = $obj->ref;
-            }
-            else dol_print_error($db);
+            } else dol_print_error($db);
 
             return $ref;
-        }
-        elseif ($mode == 'next')
+        } elseif ($mode == 'next')
         {
             $date = $invoice->date; // This is invoice date (not creation date)
             $yymm = strftime("%y%m", $date);
@@ -179,8 +177,7 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 
             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');
+        } else dol_print_error('', 'Bad parameter for getNextValue');
     }
 
     /**
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index 391281d698b..405bcfc6dcb 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -65,7 +65,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 
         $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
         $texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $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%">';
diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php
index 67eebfc789a..679224c5357 100644
--- a/htdocs/core/modules/ticket/mod_ticket_simple.php
+++ b/htdocs/core/modules/ticket/mod_ticket_simple.php
@@ -93,7 +93,7 @@ class mod_ticket_simple extends ModeleNumRefTicket
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket";
 		$search = $this->prefix."____-%";
-		$sql .= " WHERE ref LIKE '".$search."'";
+		$sql .= " WHERE ref LIKE '".$db->escape($search)."'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -128,7 +128,7 @@ class mod_ticket_simple extends ModeleNumRefTicket
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket";
 		$search = $this->prefix."____-%";
-		$sql .= " WHERE ref LIKE '".$search."'";
+		$sql .= " WHERE ref LIKE '".$db->escape($search)."'";
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 17661f74ea2..010eb973f9b 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -68,7 +68,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
 
         $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
         $texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-        $texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $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%">';
diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php
index ad8394fa91e..6aa027f16fc 100644
--- a/htdocs/core/modules/ticket/modules_ticket.php
+++ b/htdocs/core/modules/ticket/modules_ticket.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2010-2014    Regis Houssin    <regis.houssin@inodbox.com>
- * Copyright (C) 2014       Marcos García   <marcosgdf@gmail.com>
+/* Copyright (C) 2010-2014  Regis Houssin    <regis.houssin@inodbox.com>
+ * Copyright (C) 2014       Marcos García    <marcosgdf@gmail.com>
+ * Copyright (C) 2020       Charlene Benke   <charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +25,38 @@
  *                  and parent class for projects numbering models
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+
+/**
+ *	Parent class for documents models
+ */
+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
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+        // phpcs:enable
+		global $conf;
+
+		$type = 'ticket';
+		$list = array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+
+		return $list;
+	}
+}
+
+
 /**
  *  Classe mere des modeles de numerotation des references de projets
  */
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 881ba4cb469..e71b09f8a0a 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
@@ -43,9 +43,9 @@ class doc_generic_user_odt extends ModelePDFUser
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
      * Dolibarr version of the loaded document
@@ -139,8 +139,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -288,9 +287,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -321,9 +318,7 @@ class doc_generic_user_odt extends ModelePDFUser
                         // 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
@@ -339,8 +334,7 @@ class doc_generic_user_odt extends ModelePDFUser
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_WARNING);
@@ -369,13 +363,11 @@ class doc_generic_user_odt extends ModelePDFUser
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -387,8 +379,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -407,8 +398,7 @@ class doc_generic_user_odt extends ModelePDFUser
 						dol_syslog($e->getMessage(), LOG_WARNING);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -428,9 +418,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
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 1b1d6ba1dab..391eab28838 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
@@ -46,9 +46,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 	/**
      * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
+     * e.g.: PHP ≥ 5.6 = array(5, 6)
      */
-	public $phpmin = array(5, 5);
+	public $phpmin = array(5, 6);
 
 	/**
    * Dolibarr version of the loaded document
@@ -142,8 +142,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				unset($listofdir[$key]); continue;
 			}
 			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -291,9 +290,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				    $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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -324,9 +321,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
                         // 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 				// Make substitution
@@ -377,8 +372,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_WARNING);
 				}
@@ -402,31 +396,26 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				foreach ($tmparray as $key=>$value)
 				{
-					try
-					{
+					try {
 						if (preg_match('/logo$/', $key)) // Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
+						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -445,17 +434,14 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									if (!is_array($val)) {
 										$listlines->setVars($key, $val, true, 'UTF-8');
 									}
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_WARNING);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_WARNING);
 								}
@@ -464,8 +450,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -478,8 +463,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
@@ -498,8 +482,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						dol_syslog($e->getMessage(), LOG_WARNING);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -519,9 +502,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index fc4d7b9f24c..c7a52865dc7 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 $langs->loadLangs(array("products", "other"));
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $modulepart = GETPOST('modulepart', 'alpha') ?GETPOST('modulepart', 'alpha') : 'produit|service';
 $original_file = GETPOST("file");
 $backtourl = GETPOST('backtourl');
@@ -50,38 +50,32 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$result = restrictedArea($user, 'produit|service', $id, 'product&product');
 	if ($modulepart == 'produit|service' && (!$user->rights->produit->lire && !$user->rights->service->lire)) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'project')
+} elseif ($modulepart == 'project')
 {
     $result = restrictedArea($user, 'projet', $id);
 	if (!$user->rights->projet->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'bom')
+} elseif ($modulepart == 'bom')
 {
 	$result = restrictedArea($user, $modulepart, $id, 'bom_bom');
 	if (!$user->rights->bom->read) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'member')
+} elseif ($modulepart == 'member')
 {
 	$result = restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
 	if (!$user->rights->adherent->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'user')
+} elseif ($modulepart == 'user')
 {
 	$result = restrictedArea($user, $modulepart, $id, $modulepart);
 	if (!$user->rights->user->user->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'tax')
+} elseif ($modulepart == 'tax')
 {
 	$result = restrictedArea($user, $modulepart, $id, 'chargesociales', 'charges');
 	if (!$user->rights->tax->charges->lire) accessforbidden();
 	$accessallowed = 1;
-}
-elseif ($modulepart == 'bank')
+} elseif ($modulepart == 'bank')
 {
 	$result = restrictedArea($user, 'banque', $id, 'bank_account');
 	if (!$user->rights->banque->lire) accessforbidden();
@@ -118,8 +112,7 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 		if ($object->type == Product::TYPE_PRODUCT) $dir = $conf->product->multidir_output[$object->entity];
 		if ($object->type == Product::TYPE_SERVICE) $dir = $conf->service->multidir_output[$object->entity];
 	}
-}
-elseif ($modulepart == 'project')
+} elseif ($modulepart == 'project')
 {
     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
     $object = new Project($db);
@@ -129,8 +122,7 @@ elseif ($modulepart == 'project')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->project->multidir_output[$object->entity]; // By default
     }
-}
-elseif ($modulepart == 'propal')
+} elseif ($modulepart == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$object = new Propal($db);
@@ -140,8 +132,7 @@ elseif ($modulepart == 'propal')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->propal->multidir_output[$object->entity]; // By default
 	}
-}
-elseif ($modulepart == 'holiday')
+} elseif ($modulepart == 'holiday')
 {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 	$object = new Holiday($db);
@@ -151,8 +142,7 @@ elseif ($modulepart == 'holiday')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'member')
+} elseif ($modulepart == 'member')
 {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	$object = new Adherent($db);
@@ -162,8 +152,7 @@ elseif ($modulepart == 'member')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->adherent->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'societe')
+} elseif ($modulepart == 'societe')
 {
     require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
     $object = new Societe($db);
@@ -173,8 +162,7 @@ elseif ($modulepart == 'societe')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->$modulepart->dir_output;
     }
-}
-elseif ($modulepart == 'user')
+} elseif ($modulepart == 'user')
 {
     require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
     $object = new User($db);
@@ -184,8 +172,7 @@ elseif ($modulepart == 'user')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->$modulepart->dir_output; // By default
     }
-}
-elseif ($modulepart == 'expensereport')
+} elseif ($modulepart == 'expensereport')
 {
     require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
     $object = new ExpenseReport($db);
@@ -195,8 +182,7 @@ elseif ($modulepart == 'expensereport')
         if ($result <= 0) dol_print_error($db, 'Failed to load object');
         $dir = $conf->expensereport->dir_output; // By default
     }
-}
-elseif ($modulepart == 'tax')
+} elseif ($modulepart == 'tax')
 {
 	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 	$object = new ChargeSociales($db);
@@ -206,8 +192,7 @@ elseif ($modulepart == 'tax')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'ticket')
+} elseif ($modulepart == 'ticket')
 {
 	require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 	$object = new Ticket($db);
@@ -217,8 +202,7 @@ elseif ($modulepart == 'ticket')
 		if ($result <= 0) dol_print_error($db, 'Failed to load object');
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-}
-elseif ($modulepart == 'bom')
+} elseif ($modulepart == 'bom')
 {
 	require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 	$object = new BOM($db);
@@ -269,8 +253,7 @@ if (empty($backtourl))
     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('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);
@@ -292,9 +275,7 @@ if ($cancel)
 	{
 		header("Location: ".$backtourl);
 		exit;
-	}
-	else
-	{
+	} else {
 	    dol_print_error('', 'Cancel on photo_resize with a not supported value of modulepart='.$modulepart);
 	    exit;
 	}
@@ -329,8 +310,7 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 
 		    $ecmfile->label = md5_file(dol_osencode($fullpath));
 		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
+		} elseif ($result == 0)   // If not found
 		{
 		    $filename = basename($rel_filename);
 		    $rel_dir = dirname($rel_filename);
@@ -356,15 +336,11 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 		{
 			header("Location: ".$backtourl);
 			exit;
-		}
-		else
-		{
+		} else {
     	    dol_print_error('', 'confirm_resize on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($result, null, 'errors');
 		$_GET['file'] = $_POST["file"];
 		$action = '';
@@ -401,8 +377,7 @@ if ($action == 'confirm_crop')
 
 		    $ecmfile->label = md5_file(dol_osencode($fullpath));
 		    $result = $ecmfile->update($user);
-		}
-		elseif ($result == 0)   // If not found
+		} elseif ($result == 0)   // If not found
 		{
 		    $filename = basename($rel_filename);
 		    $rel_dir = dirname($rel_filename);
@@ -428,15 +403,11 @@ if ($action == 'confirm_crop')
 		{
 			header("Location: ".$backtourl);
 			exit;
-		}
-		else
-		{
+		} else {
     	    dol_print_error('', 'confirm_crop on photo_resize without backtourl defined for modulepart='.$modulepart);
     	    exit;
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($result, null, 'errors');
 		$_GET['file'] = $_POST["file"];
 		$action = '';
diff --git a/htdocs/core/search.php b/htdocs/core/search.php
index b82536edbd2..b0a61f5bd71 100644
--- a/htdocs/core/search.php
+++ b/htdocs/core/search.php
@@ -147,8 +147,6 @@ if (!empty($_SERVER['HTTP_REFERER']))
 {
 	header("Location: ".$_SERVER['HTTP_REFERER']);
 	exit;
-}
-else
-{
+} else {
 	print 'The wrapper search.php was called without any search criteria';
 }
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 0268eef2259..39f41b1dfe7 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -74,9 +74,7 @@ if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 	if (!is_object($form)) $form = new Form($db);
 	$selected = -1;
 	$searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
-}
-else
-{
+} else {
 	$usedbyinclude = 1; // Used into next include
 	$showtitlebefore = GETPOST('showtitlebefore', 'int');
 	$arrayresult = array();
@@ -109,8 +107,7 @@ $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note t
 if (empty($reshook))
 {
 	$searchform .= $hookmanager->resPrint;
-}
-else $searchform = $hookmanager->resPrint;
+} else $searchform = $hookmanager->resPrint;
 
 
 print "\n";
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 6c25b5c07b5..8f55e0bfc69 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -37,10 +37,12 @@ if (empty($conf) || !is_object($conf))
 
 $langs->load("modulebuilder");
 
+$listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php<br>Product:product/class/product.class.php<br>Project:projet/class/project.class.php';
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_add.tpl.php -->
-<script type="text/javascript">
+<script>
     jQuery(document).ready(function() {
     	function init_typeoffields(type)
     	{
@@ -168,7 +170,7 @@ $langs->load("modulebuilder");
     <span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
     <span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
     <span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
-    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?></span>
+    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
     <span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
     <span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
     </td></tr>
@@ -176,12 +178,12 @@ $langs->load("modulebuilder");
 </td>
 </tr>
 <!-- Position -->
-<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOSTISSET('pos') ?GETPOST('pos', 'int') : 100; ?>"></td></tr>
+<tr><td class="titlefield"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOSTISSET('pos') ? GETPOST('pos', 'int') : 100; ?>"></td></tr>
 <!-- Language file -->
 <tr><td class="titlefield"><?php echo $langs->trans("LanguageFile"); ?></td><td class="valeur"><input type="text" id="langfile" name="langfile" class="minwidth200" value="<?php echo dol_escape_htmltag(GETPOST('langfile', 'alpha')); ?>"></td></tr>
 <!-- Computed Value -->
 <?php if (empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?>
-	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOST('computed_value', 'none') ?GETPOST('computed_value', 'none') : ''); ?>"></td></tr>
+	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?></td><td class="valeur"><input id="computed_value" type="text" name="computed_value" class="quatrevingtpercent" value="<?php echo (GETPOSTISSET('computed_value') ? GETPOST('computed_value', 'none') : ''); ?>"></td></tr>
 <?php } else { ?>
 	<tr class="extra_computed_value"><td><?php echo $form->textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?></td><td class="valeur"><input id="computed_value" class="quatrevingtpercent" type="text" name="computed_value" value="<?php echo dol_escape_htmltag($computed); ?>"></td></tr>
 <?php } ?>
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 191b4cf40c8..451bb93d6c7 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -36,10 +36,12 @@ if (empty($conf) || !is_object($conf))
 
 $langs->load("modulebuilder");
 
+$listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php<br>Product:product/class/product.class.php<br>Project:projet/class/project.class.php<br>...';
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_edit.tpl.php -->
-<script type="text/javascript">
+<script>
     jQuery(document).ready(function() {
     	function init_typeoffields(type)
     	{
@@ -177,8 +179,7 @@ if ((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_a
 			$param_chain .= $key.','.$value."\n";
 		}
 	}
-}
-elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
+} elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
 {
 	$paramlist = array_keys($param['options']);
 	$param_chain = $paramlist[0];
@@ -223,9 +224,7 @@ if (in_array($type, array_keys($typewecanchangeinto)))
         else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
     }
     print '</select>';
-}
-else
-{
+} else {
 	print $type2label[$type];
     print '<input type="hidden" name="type" id="type" value="'.$type.'">';
 }
@@ -248,7 +247,7 @@ else
     <span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
     <span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
     <span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
-    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink"), 1, 0, '', 0, 2, 'helpvalue4')?></span>
+    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
     <span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
     <span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
     </td></tr>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index 96620da28d9..fb542f9037e 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -100,8 +100,7 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 			if (empty($extrafields->attributes[$elementtype]['entityid'][$key]))
 			{
 				print $langs->trans("All");
-			}
-			else {
+			} else {
 				global $multicompanylabel_cache;
 				if (!is_array($multicompanylabel_cache)) $multicompanylabel_cache = array();
 				if (empty($multicompanylabel_cache[$extrafields->attributes[$elementtype]['entityid'][$key]])) {
@@ -113,13 +112,11 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 			}
 			print '</td>';
 		}
-		print '<td class="right nowraponall"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';
-		print '&nbsp; <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=delete&attrname='.$key.'">'.img_delete().'</a></td>'."\n";
+		print '<td class="right nowraponall"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&attrname='.$key.'#formeditextrafield">'.img_edit().'</a>';
+		print '&nbsp; <a class="paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&attrname='.$key.'">'.img_delete().'</a></td>'."\n";
 		print "</tr>";
 	}
-}
-else
-{
+} else {
 	$colspan = 13;
 	if (!empty($conf->multicompany->enabled))  $colspan++;
 
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 245cd4f7f00..8f9c8ec83e2 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -19,7 +19,7 @@ if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
-print '<script type="text/javascript" language="javascript">
+print '<script>
 	$(document).ready(function() {
 
 		// Click Function
diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
index 4bb9eb8aa2e..8aab549bf33 100644
--- a/htdocs/core/tpl/ajax/fileupload_main.tpl.php
+++ b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
@@ -25,7 +25,7 @@ if (empty($conf) || !is_object($conf))
 ?>
 
 <!-- START TEMPLATE FILE UPLOAD MAIN -->
-<script type="text/javascript">
+<script>
 window.locale = {
     "fileupload": {
         "errors": {
diff --git a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
index 4f435bb2106..61bec967ecf 100644
--- a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
+++ b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
@@ -31,7 +31,7 @@ if ($object->element == 'propal')
 ?>
 
 <!-- START TEMPLATE IMPORT OBJECT LINKED LINES -->
-<script type="text/javascript">
+<script>
 
 $(document).ready(function(){
 	$('.objectlinked_importbtn').click(function (e) {
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index 0e9e63bff12..e78a5a7734e 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -38,21 +38,21 @@ print "</tr>\n";
 
 if ($action !== 'editcomment')
 {
-    print '<tr class="oddeven">';
+	print '<tr class="oddeven">';
 
-    // Description
-    print '<td colspan="3">';
+	// Description
+	print '<td colspan="3">';
 
-    $desc = GETPOST('comment_description');
+	$desc = GETPOST('comment_description');
 
-    $doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
-    print $doleditor->Create(1);
+	$doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
+	print $doleditor->Create(1);
 
-    print '</td>';
+	print '</td>';
 
-    print '<td class="center">';
-    print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-    print '</td></tr>';
+	print '<td class="center">';
+	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+	print '</td></tr>';
 }
 
 print '</table></form>';
@@ -96,51 +96,47 @@ if (!empty($object->comments))
 		print '<div class="comment-cell comment-right">';
 		print '<div class="comment-table width100p">';
 
-        if ($action === 'editcomment' && $comment->id == $idcomment)
-        {
-            print '<form method="POST" action="'.$varpage.'?id='.$object->id.'">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="updatecomment">';
-            print '<input type="hidden" name="id" value="'.$object->id.'">';
-            print '<input type="hidden" name="idcomment" value="'.$idcomment.'">';
-            print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-        }
+		if ($action === 'editcomment' && $comment->id == $idcomment)
+		{
+			print '<form method="POST" action="'.$varpage.'?id='.$object->id.'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="updatecomment">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="idcomment" value="'.$idcomment.'">';
+			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		}
 
-        print '<div class="comment-description comment-cell">';
-        if ($action === 'editcomment' && $comment->id == $idcomment)
-        {
-            $doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
-            print $doleditor->Create(1);
-        }
-        else
-        {
-            print $comment->description;
-        }
+		print '<div class="comment-description comment-cell">';
+		if ($action === 'editcomment' && $comment->id == $idcomment)
+		{
+			$doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
+			print $doleditor->Create(1);
+		} else {
+			print $comment->description;
+		}
 		print '</div>'; // End comment-description
 
-        if ($action === 'editcomment' && $comment->id == $idcomment)
-        {
-            print '<input name="update" type="submit" class="button" value="'.$langs->trans("Update").'">';
-            print '<input name="cancel" type="submit" class="button" value="'.$langs->trans("Cancel").'">';
+		if ($action === 'editcomment' && $comment->id == $idcomment)
+		{
+			print '<input name="update" type="submit" class="button" value="'.$langs->trans("Update").'">';
+			print '<input name="cancel" type="submit" class="button" value="'.$langs->trans("Cancel").'">';
 
-            print '</form>';
-        }
-        else
-        {
-            if ($fk_user == $user->id || $user->admin == 1)
-            {
-                print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
-                print img_picto('', 'edit.png');
-                print '</a>';
-            }
-            if (($first && $fk_user == $user->id) || $user->admin == 1) {
-                print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
-                print img_picto('', 'delete.png');
-                print '</a>';
-            }
-        }
+			print '</form>';
+		} else {
+			if ($fk_user == $user->id || $user->admin == 1)
+			{
+				print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
+				print img_picto('', 'edit.png');
+				print '</a>';
+			}
+			if (($first && $fk_user == $user->id) || $user->admin == 1) {
+				print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
+				print img_picto('', 'delete.png');
+				print '</a>';
+			}
+		}
 
-        print '</div>'; // End comment-table
+		print '</div>'; // End comment-table
 		print '</div>'; // End comment-right
 		print '</div>'; // End comment
 
diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php
index 9ee724d3dda..d654f2b97b3 100644
--- a/htdocs/core/tpl/bloc_showhide.tpl.php
+++ b/htdocs/core/tpl/bloc_showhide.tpl.php
@@ -32,7 +32,7 @@ if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->
 <!-- BEGIN PHP TEMPLATE bloc_showhide.tpl.php -->
 
 <?php
-print '<script type="text/javascript">'."\n";
+print '<script>'."\n";
 print '$(document).ready(function() {'."\n";
 print '$("#hide-'.$blocname.'").click(function(){'."\n";
 print '		setShowHide(0);'."\n";
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 24fcaa62afa..9ce7d8bfaff 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -51,9 +51,7 @@ if ($action == 'presend')
 		if ($object->element == 'invoice_supplier')
 		{
 			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
-		}
-		else
-		{
+		} else {
 			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 		}
 
@@ -95,7 +93,7 @@ if ($action == 'presend')
 	{
 		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument'))
 		{
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result < 0) {
 				dol_print_error($db, $object->error, $object->errors);
 				exit();
@@ -103,9 +101,7 @@ if ($action == 'presend')
 			if ($object->element == 'invoice_supplier')
 			{
 				$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
-			}
-			else
-			{
+			} else {
 				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
 			}
 
@@ -158,28 +154,19 @@ if ($action == 'presend')
 
 	// Fill list of recipient with email inside <>.
 	$liste = array();
-	if ($object->element == 'expensereport')
-	{
+	if ($object->element == 'expensereport') {
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 		$liste['thirdparty'] = $fuser->getFullName($outputlangs)." <".$fuser->email.">";
-	}
-	elseif ($object->element == 'societe')
-	{
+	} elseif ($object->element == 'societe') {
 		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
 			$liste[$key] = $value;
 		}
-	}
-	elseif ($object->element == 'contact')
-	{
+	} elseif ($object->element == 'contact') {
 		$liste['contact'] = $object->getFullName($outputlangs)." <".$object->email.">";
-	}
-	elseif ($object->element == 'user' || $object->element == 'member')
-	{
+	} elseif ($object->element == 'user' || $object->element == 'member') {
 		$liste['thirdparty'] = $object->getFullName($outputlangs)." <".$object->email.">";
-	}
-	else
-	{
+	} else {
 		if (is_object($object->thirdparty))
 		{
 			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
@@ -288,10 +275,10 @@ if ($action == 'presend')
 		}
 	}
 
-	// Tableau des substitutions
+	// Array of substitutions
 	$formmail->substit = $substitutionarray;
 
-	// Tableau des parametres complementaires
+	// Array of other parameters
 	$formmail->param['action'] = 'send';
 	$formmail->param['models'] = $modelmail;
 	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index 0bf2a60d0fe..d36f0c2a87a 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -54,7 +54,7 @@ foreach ($object->fields as $key => $val)
 	print '</td>';
 	print '<td>';
 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
-	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'none');
+	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'restricthtml');
 	else $value = GETPOST($key, 'alpha');
 	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	else print $object->showInputField($val, $key, $value, '', '', '', 0);
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 8484d06ddb6..ad1a3bd2330 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -45,15 +45,23 @@ foreach ($object->fields as $key => $val)
 	print '<tr><td';
 	print ' class="titlefieldcreate';
 	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if (preg_match('/^(text|html)/', $val['type'])) print ' tdtop';
 	print '">';
 	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
 	else print $langs->trans($val['label']);
 	print '</td>';
 	print '<td>';
 	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOSTISSET($key) ?GETPOST($key, 'int') : $object->$key;
-	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOSTISSET($key) ?GETPOST($key, 'none') : $object->$key;
-	else $value = GETPOSTISSET($key) ?GETPOST($key, 'alpha') : $object->$key;
+	elseif (preg_match('/^(text|html)/', $val['type'])) {
+		$tmparray = explode(':', $val['type']);
+		if (!empty($tmparray[1])) {
+			$check = $tmparray[1];
+		} else {
+			$check = 'restricthtml';
+		}
+		$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $object->$key;
+	}
+	else $value = GETPOSTISSET($key) ? GETPOST($key, 'alpha') : $object->$key;
 	//var_dump($val.' '.$key.' '.$value);
 	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	else print $object->showInputField($val, $key, $value, '', '', '', 0);
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 13d0267817f..5f58ba9e7e9 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -59,10 +59,12 @@ foreach ($object->fields as $key => $val)
 	print '</td>';
 	print '<td class="valuefield fieldname_'.$key;
 	if ($val['type'] == 'text') print ' wordbreak';
+	if ($val['cssview']) print ' '.$val['cssview'];
 	print '">';
-
+	if (in_array($val['type'], array('text', 'html'))) print '<div class="longmessagecut">';
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	//print dol_escape_htmltag($object->$key, 1, 1);
+	if (in_array($val['type'], array('text', 'html'))) print '</div>';
 	print '</td>';
 	print '</tr>';
 }
@@ -83,8 +85,7 @@ foreach ($object->fields as $key => $val)
 	{
 		if (!empty($keyforbreak) && $key == $keyforbreak) {
 			$alreadyoutput = 0; // key used for break on second column
-		}
-		else {
+		} else {
 			continue;
 		}
 	}
@@ -105,9 +106,14 @@ foreach ($object->fields as $key => $val)
 	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
 	else print $langs->trans($val['label']);
 	print '</td>';
-	print '<td>';
+	print '<td class="valuefield fieldname_'.$key;
+	if ($val['type'] == 'text') print ' wordbreak';
+	if ($val['cssview']) print ' '.$val['cssview'];
+	print '">';
+	if (in_array($val['type'], array('text', 'html'))) print '<div class="longmessagecut">';
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	//print dol_escape_htmltag($object->$key, 1, 1);
+	if (in_array($val['type'], array('text', 'html'))) print '</div>';
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index e9f881accd2..1cb8b813001 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -40,21 +40,27 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 $module = $object->element;
 
 // Special cases
-if ($module == 'propal') { $permission = $user->rights->propale->creer; }
-elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }
-elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }
-elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }
-elseif ($module == 'project') { $permission = $user->rights->projet->creer; }
-elseif ($module == 'action') { $permission = $user->rights->agenda->myactions->create; }
-elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }
-elseif ($module == 'reception') { $permission = $user->rights->reception->creer; }
-elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }
-elseif (!isset($permission) && isset($user->rights->$module->creer))
-{
+if ($module == 'propal') {
+	$permission = $user->rights->propale->creer;
+} elseif ($module == 'fichinter') {
+	$permission = $user->rights->ficheinter->creer;
+} elseif ($module == 'order_supplier') {
+	$permission = $user->rights->fournisseur->commande->creer;
+} elseif ($module == 'invoice_supplier') {
+	$permission = $user->rights->fournisseur->facture->creer;
+} elseif ($module == 'project') {
+	$permission = $user->rights->projet->creer;
+} elseif ($module == 'action') {
+	$permission = $user->rights->agenda->myactions->create;
+} elseif ($module == 'shipping') {
+	$permission = $user->rights->expedition->creer;
+} elseif ($module == 'reception') {
+	$permission = $user->rights->reception->creer;
+} elseif ($module == 'project_task') {
+	$permission = $user->rights->projet->creer;
+} elseif (!isset($permission) && isset($user->rights->$module->creer)) {
 	$permission = $user->rights->$module->creer;
-}
-elseif (!isset($permission) && isset($user->rights->$module->write))
-{
+} elseif (!isset($permission) && isset($user->rights->$module->write)) {
 	$permission = $user->rights->$module->write;
 }
 
@@ -177,9 +183,7 @@ foreach (array('internal', 'external') as $source)
 	if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc))
 	{
 		$contactlist = $objectsrc->liste_contact(-1, $source);
-	}
-	else
-	{
+	} else {
 		$contactlist = $object->liste_contact(-1, $source);
 	}
 
@@ -198,9 +202,7 @@ foreach (array('internal', 'external') as $source)
 		if ($contact['source'] == 'internal')
 		{
 			$entry->nature = $langs->trans("User");
-		}
-		elseif ($contact['source'] == 'external')
-		{
+		} elseif ($contact['source'] == 'external') {
 			$entry->nature = $langs->trans("ThirdPartyContact");
 		}
 
@@ -209,9 +211,7 @@ foreach (array('internal', 'external') as $source)
 			$companystatic->fetch($contact['socid']);
 			$entry->thirdparty_html = $companystatic->getNomUrl(1);
 			$entry->thirdparty_name = strtolower($companystatic->getFullName($langs));
-		}
-		elseif ($contact['socid'] < 0)
-		{
+		} elseif ($contact['socid'] < 0) {
 			$entry->thirdparty_html = $conf->global->MAIN_INFO_SOCIETE_NOM;
 			$entry->thirdparty_name = strtolower($conf->global->MAIN_INFO_SOCIETE_NOM);
 		}
@@ -221,9 +221,7 @@ foreach (array('internal', 'external') as $source)
 			$userstatic->fetch($contact['id']);
 			$entry->contact_html = $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			$entry->contact_name = strtolower($userstatic->getFullName($langs));
-		}
-		elseif ($contact['source'] == 'external')
-		{
+		} elseif ($contact['source'] == 'external') {
 			$contactstatic->fetch($contact['id']);
 			$entry->contact_html = $contactstatic->getNomUrl(1, '', 0, '', 0, 0);
 			$entry->contact_name = strtolower($contactstatic->getFullName($langs));
@@ -232,9 +230,7 @@ foreach (array('internal', 'external') as $source)
 		if ($contact['source'] == 'internal')
 		{
 			$entry->status = $userstatic->LibStatut($contact['statuscontact'], 3);
-		}
-		elseif ($contact['source'] == 'external')
-		{
+		} elseif ($contact['source'] == 'external') {
 			$entry->status = $contactstatic->LibStatut($contact['statuscontact'], 3);
 		}
 
@@ -302,9 +298,9 @@ foreach ($list as $entry)
 	if ($permission)
 	{
 		$href = $_SERVER["PHP_SELF"];
-		$href .= "?id=".$object->id;
-		$href .= "&action=deletecontact";
-		$href .= "&lineid=".$entry->id;
+		$href .= '?id='.$object->id;
+		$href .= '&action=deletecontact&token='.newToken();
+		$href .= '&lineid='.$entry->id;
 
 		print "<td class='center'>";
 		print "<a href='$href'>";
@@ -321,9 +317,6 @@ print '</div>';
 
 print "</form>";
 
-
-
-
 print "<!-- TEMPLATE CONTACTS HOOK BEGIN HERE -->\n";
 if (is_object($hookmanager)) {
 	$hookmanager->initHooks(array('contacttpl'));
@@ -331,4 +324,3 @@ if (is_object($hookmanager)) {
 	$reshook = $hookmanager->executeHooks('formContactTpl', $parameters, $object, $action);
 }
 print "<!-- END PHP TEMPLATE CONTACTS -->\n";
-
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 817d1aadfc9..95ac0d6d5ce 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -35,9 +35,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 						$datenotinstring = $db->jdate($datenotinstring);
 					}
 					$value = $datenotinstring;
-				}
-				else
-				{
+				} else {
 					$value = $obj->$tmpkey;
 				}
 				// If field is a computed field, we make computation to get value
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index 6e1dae186b1..22a6135cd13 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -33,14 +33,11 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
                     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')))
+                } 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
-                {
+                } 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';
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 03d487ee0c0..42dc67d2b87 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -24,16 +24,14 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
 		{
 			$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
-		}
-		elseif (in_array($typ, array('boolean')))
+		} elseif (in_array($typ, array('boolean')))
 		{
 			if ($crit !== '-1' && $crit !== '') {
 				$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." = '".$db->escape($crit)."'";
 				if ($crit == '0') $sql .= " OR ".$extrafieldsobjectprefix.$tmpkey." IS NULL";
 				$sql .= ")";
 			}
-		}
-		elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
+		} elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
 		{
 			$mode_search = 0;
 			if (in_array($typ, array('int', 'double', 'real', 'price'))) $mode_search = 1; // Search on a numeric
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 6c0e6b0a559..5db8d04e8ec 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -26,10 +26,8 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield = '';
 				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
 					print '<th class="liste_titre thseparator"></th>';
-				}
-				else
-				{
-					if (! empty($extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key]) && is_object($langs)) {
+				} else {
+					if (!empty($extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key]) && is_object($langs)) {
 						$langs->load($extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key]);
 					}
 
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index f3a181f0b2e..8f02f40fe3c 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -176,7 +176,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			}
 
 			//TODO Improve element and rights detection
-			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'none') == $tmpkeyextra)
+			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'restricthtml') == $tmpkeyextra)
 			{
 			    $fieldid = 'id';
 			    if ($object->table_element == 'societe') $fieldid = 'socid';
@@ -207,7 +207,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 	{
 		print "\n";
 		print '
-				<script type="text/javascript">
+				<script>
 				    jQuery(document).ready(function() {
 				    	function showOptions(child_list, parent_list)
 				    	{
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index fa8add900b1..43ddd86fb99 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -74,20 +74,18 @@ print '<div class="inline-block toolbarbutton centpercent">';
 // Toolbar
 if ($permtoadd)
 {
-	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
+	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
-}
-else
-{
-    print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';
+} 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>';
 }
 if ($module == 'ecm')
 {
 	$tmpurl = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
-	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
+	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
 	print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
 	print '</a>';
 }
@@ -103,7 +101,7 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	if ((empty($section) || $section == -1) && ($module != 'medias'))
 	{
 		?>
-		<script type="text/javascript">
+		<script>
     	jQuery(document).ready(function() {
 			jQuery('#<?php echo $nameforformuserfile ?>').hide();
     	});
@@ -116,8 +114,7 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	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);
-}
-else print '&nbsp;';
+} else print '&nbsp;';
 
 print '</div>';
 // End "Add new file" area
@@ -177,9 +174,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
 
 	    print '</td></tr>';
-    }
-    else	// Show file tree when ajax is disabled (rare)
-    {
+    } else { // Show filtree when ajax is disabled (rare)
         print '<tr><td style="padding-left: 20px">';
 
         $_POST['modulepart'] = $module;
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 33be5fb99d1..2cd485a9510 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -15,14 +15,12 @@ if (isset($totalarray['pos']))
 	{
 		$i++;
 		if (!empty($totalarray['pos'][$i]))  print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else
-		{
+		else {
 			if ($i == 1)
 			{
 				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
 				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-			}
-			else print '<td></td>';
+			} else print '<td></td>';
 		}
 	}
 	print '</tr>';
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index db62e79738b..a4b2ba13ed9 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -79,7 +79,7 @@ if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
 ?>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
-<script type="text/javascript">
+<script>
 $(document).ready(function () {
 	/* Set focus on correct field */
 	<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element
@@ -166,8 +166,7 @@ if (!empty($morelogincontent)) {
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -255,8 +254,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
 
 	$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 	if (!empty($url)) print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';
-	else
-	{
+	else {
 		$langs->load("errors");
 		print '<font class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</font>';
 	}
@@ -331,8 +329,7 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
 			echo $option."\n";
 		}
 	}
-}
-elseif (!empty($moreloginextracontent)) {
+} elseif (!empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }
@@ -342,7 +339,7 @@ elseif (!empty($moreloginextracontent)) {
 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 {
 	$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
-	foreach($tmptagarray as $tmptag) {
+	foreach ($tmptagarray as $tmptag) {
 		print "\n";
 		print "<!-- JS CODE TO ENABLE for google analtics tag -->\n";
 		print "
@@ -359,23 +356,22 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 	}
 }
 
-// Google Adsense
+// TODO Replace this with a hook
+// Google Adsense (need Google module)
 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT))
 {
 	if (empty($conf->dol_use_jmobile))
 	{
 		?>
 	<div class="center"><br>
-		<script type="text/javascript"><!--
+		<script><!--
 			google_ad_client = "<?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>";
 			google_ad_slot = "<?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>";
 			google_ad_width = <?php echo $conf->global->MAIN_GOOGLE_AD_WIDTH ?>;
 			google_ad_height = <?php echo $conf->global->MAIN_GOOGLE_AD_HEIGHT ?>;
 			//-->
 		</script>
-		<script type="text/javascript"
-			src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-		</script>
+		<script src="//pagead2.googlesyndication.com/pagead/show_ads.js"></script>
 	</div>
 		<?php
 	}
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 492590c65e4..900d0366d87 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -98,9 +98,7 @@ if ($massaction == 'presend')
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
 			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
-		}
-		else
-		{
+		} else {
 			$soc = new Societe($db);
 			$soc->fetch($thirdpartyid);
 			foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
@@ -158,9 +156,7 @@ if ($massaction == 'presend')
 		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
 		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
 		$arrayofmassactions = array();
-	}
-	else
-	{
+	} else {
 		print $formmail->get_form();
 	}
 
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 28eb78fa61b..8cda27679c4 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -57,17 +57,29 @@ if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
 }
 
 // Special cases
-if ($module == 'propal') { $permission = $user->rights->propale->creer; }
-elseif ($module == 'supplier_proposal') { $permission = $user->rights->supplier_proposal->creer; }
-elseif ($module == 'fichinter') { $permission = $user->rights->ficheinter->creer; }
-elseif ($module == 'project') { $permission = $user->rights->projet->creer; }
-elseif ($module == 'project_task') { $permission = $user->rights->projet->creer; }
-elseif ($module == 'invoice_supplier') { $permission = $user->rights->fournisseur->facture->creer; }
-elseif ($module == 'order_supplier') { $permission = $user->rights->fournisseur->commande->creer; }
-elseif ($module == 'societe') { $permission = $user->rights->societe->creer; }
-elseif ($module == 'contact') { $permission = $user->rights->societe->creer; }
-elseif ($module == 'shipping') { $permission = $user->rights->expedition->creer; }
-elseif ($module == 'product') { $permission = $user->rights->produit->creer; }
+if ($module == 'propal') {
+	$permission = $user->rights->propale->creer;
+} elseif ($module == 'supplier_proposal') {
+	$permission = $user->rights->supplier_proposal->creer;
+} elseif ($module == 'fichinter') {
+	$permission = $user->rights->ficheinter->creer;
+} elseif ($module == 'project') {
+	$permission = $user->rights->projet->creer;
+} elseif ($module == 'project_task') {
+	$permission = $user->rights->projet->creer;
+} elseif ($module == 'invoice_supplier') {
+	$permission = $user->rights->fournisseur->facture->creer;
+} elseif ($module == 'order_supplier') {
+	$permission = $user->rights->fournisseur->commande->creer;
+} elseif ($module == 'societe') {
+	$permission = $user->rights->societe->creer;
+} elseif ($module == 'contact') {
+	$permission = $user->rights->societe->creer;
+} elseif ($module == 'shipping') {
+	$permission = $user->rights->expedition->creer;
+} elseif ($module == 'product') {
+	$permission = $user->rights->produit->creer;
+}
 //else dol_print_error('','Bad value '.$module.' for param module');
 
 if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
@@ -75,24 +87,21 @@ else $typeofdata = 'textarea:12:95%';
 
 print '<!-- BEGIN PHP TEMPLATE NOTES -->'."\n";
 print '<div class="tagtable border table-border tableforfield centpercent">'."\n";
-if ($module != 'product') {
-	// No public note yet on products
-	print '<div class="tagtr table-border-row">'."\n";
-	print '<div class="tagtd tagtdnote tdtop sensiblehtmlcontent table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
-	print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);
-	print '</div>'."\n";
-	print '<div class="tagtd table-val-border-col sensiblehtmlcontent">'."\n";
-	print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1)."\n";
-	print '</div>'."\n";
-	print '</div>'."\n";
-}
+print '<div class="tagtr table-border-row">'."\n";
+print '<div class="tagtd tagtdnote tdtop sensiblehtmlcontent table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
+print $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam, '', 0);
+print '</div>'."\n";
+print '<div class="tagtd wordbreak table-val-border-col sensiblehtmlcontent">'."\n";
+print $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam, 1)."\n";
+print '</div>'."\n";
+print '</div>'."\n";
 if (empty($user->socid)) {
 	// Private notes (always hidden to external users)
 	print '<div class="tagtr table-border-row">'."\n";
 	print '<div class="tagtd tagtdnote tdtop sensiblehtmlcontent table-key-border-col'.(empty($cssclass) ? '' : ' '.$cssclass).'"'.($colwidth ? ' style="width: '.$colwidth.'%"' : '').'>'."\n";
 	print $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam, '', 0);
 	print '</div>'."\n";
-	print '<div class="tagtd table-val-border-col sensiblehtmlcontent">'."\n";
+	print '<div class="tagtd wordbreak table-val-border-col sensiblehtmlcontent">'."\n";
 	print $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam, 1);
 	print '</div>'."\n";
 	print '</div>'."\n";
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index 8af029ce071..e3e921c20c5 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -42,9 +42,7 @@ if ($fixedDiscount > 0)
 {
 	$translationKey = (!empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
 	print $langs->trans($translationKey, $fixedDiscount).'.';
-}
-else
-{
+} else {
 	$translationKey = (!empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
 	print $langs->trans($translationKey).'.';
 }
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 0f6e056dce5..eed6c9d201e 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -60,26 +60,19 @@ if (!empty($extrafields))
 {
 	if ($this->table_element_line == 'commandedet') {
 		$objectline = new OrderLine($this->db);
-	}
-	elseif ($this->table_element_line == 'propaldet') {
+	} elseif ($this->table_element_line == 'propaldet') {
 		$objectline = new PropaleLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'supplier_proposaldet') {
+	} elseif ($this->table_element_line == 'supplier_proposaldet') {
 		$objectline = new SupplierProposalLine($this->db);
-	}
-	elseif ($this->table_element_line == 'facturedet') {
+	} elseif ($this->table_element_line == 'facturedet') {
 		$objectline = new FactureLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'contratdet') {
+	} elseif ($this->table_element_line == 'contratdet') {
 		$objectline = new ContratLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'commande_fournisseurdet') {
+	} elseif ($this->table_element_line == 'commande_fournisseurdet') {
 		$objectline = new CommandeFournisseurLigne($this->db);
-	}
-	elseif ($this->table_element_line == 'facture_fourn_det') {
+	} elseif ($this->table_element_line == 'facture_fourn_det') {
 		$objectline = new SupplierInvoiceLine($this->db);
-	}
-	elseif ($this->table_element_line == 'facturedet_rec') {
+	} elseif ($this->table_element_line == 'facturedet_rec') {
 		$objectline = new FactureLigneRec($this->db);
 	}
 }
@@ -92,7 +85,7 @@ if ($nolinesbefore) {
 			<td class="linecolnum center"></td>
 		<?php } ?>
 		<td class="linecoldescription minwidth500imp">
-			<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
+			<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span>
 		</td>
 		<?php
 		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
@@ -131,13 +124,11 @@ if ($nolinesbefore) {
 		{
 			if (empty($user->rights->margins->creer)) {
 				$colspan++;
-			}
-			else {
+			} else {
 				print '<td class="margininfos linecolmargin1 right">';
 				if ($conf->global->MARGIN_TYPE == "1")
 					echo $langs->trans('BuyingPrice');
-				else
-					echo $langs->trans('CostPrice');
+				else echo $langs->trans('CostPrice');
 				echo '</td>';
 				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
 				if (!empty($conf->global->DISPLAY_MARK_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
@@ -180,15 +171,13 @@ if ($nolinesbefore) {
 				echo '<label for="prod_entry_mode_free">';
 				echo '<input type="radio" class="prod_entry_mode_free" name="prod_entry_mode" id="prod_entry_mode_free" value="free"';
 				//echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : ((empty($forceall) && (empty($conf->product->enabled) || empty($conf->service->enabled)))?' checked':'') );
-				echo ((GETPOST('prod_entry_mode', 'alpha') == 'free' || ! empty($conf->global->MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT)) ? ' checked' : '');
+				echo ((GETPOST('prod_entry_mode', 'alpha') == 'free' || !empty($conf->global->MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT)) ? ' checked' : '');
 				echo '> ';
 				// Show type selector
 				echo $langs->trans("FreeLineOfType");
 				echo '</label>';
 				echo ' ';
-			}
-			else
-			{
+			} else {
 				echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
 				// Show type selector
 				if ($forceall >= 0)
@@ -213,9 +202,7 @@ if ($nolinesbefore) {
 				if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToSell');
 				elseif ((empty($conf->product->enabled) && !empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) echo $langs->trans('PredefinedServicesToSell');
 				else echo $langs->trans('PredefinedProductsAndServicesToSell');
-			}
-			else
-			{
+			} else {
 				if (!empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans('PredefinedProductsToPurchase');
 				elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) echo $langs->trans('PredefinedServicesToPurchase');
 				else echo $langs->trans('PredefinedProductsAndServicesToPurchase');
@@ -231,15 +218,13 @@ if ($nolinesbefore) {
 				{
 					// hide products in closed warehouse, but show products for internal transfer
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
-				}
-				else
-				{
+				} else {
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 				}
 				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS))
 				{
 					?>
-				<script type="text/javascript">
+				<script>
 					$(document).ready(function(){
 						// On first focus on a select2 combo, auto open the menu (this allow to use the keyboard only)
 						$(document).on('focus', '.select2-selection.select2-selection--single', function (e) {
@@ -254,9 +239,7 @@ if ($nolinesbefore) {
 				</script>
 					<?php
 				}
-			}
-			else
-			{
+			} else {
 				// $senderissupplier=2 is the same as 1 but disables test on minimum qty and disable autofill qty with minimum
 				if ($senderissupplier != 2)
 				{
@@ -266,9 +249,7 @@ if ($nolinesbefore) {
 					'warning' => $langs->trans("NoPriceDefinedForThisSupplier") // translation of an error saved into var 'warning' (for example shown we select a disabled option into combo)
 					);
 					$alsoproductwithnosupplierprice = 0;
-				}
-				else
-				{
+				} else {
 					$ajaxoptions = array(
 					'update' => array('remise_percent' => 'discount')			// html id tags that will be edited with each ajax json response key
 					);
@@ -278,7 +259,7 @@ if ($nolinesbefore) {
 				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_SUPPLIER_PRODUCTS))
 				{
 					?>
-				<script type="text/javascript">
+				<script>
 					$(document).ready(function(){
 						// On first focus on a select2 combo, auto open the menu (this allow to use the keyboard only)
 						$(document).on('focus', '.select2-selection.select2-selection--single', function (e) {
@@ -325,7 +306,7 @@ if ($nolinesbefore) {
 		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
 		$toolbarname = 'dolibarr_details';
 		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
-		$doleditor = new DolEditor('dp_desc', GETPOST('dp_desc', 'none'), '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 100 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enabled, $nbrows, '98%');
+		$doleditor = new DolEditor('dp_desc', GETPOST('dp_desc', 'restricthtml'), '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 100 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enabled, $nbrows, '98%');
 		$doleditor->Create();
 		// Show autofill date for recurring invoices
 		if (!empty($conf->service->enabled) && $object->element == 'facturerec')
@@ -381,7 +362,7 @@ if ($nolinesbefore) {
 	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 		$coldisplay++;
 		print '<td class="nobottom linecoluseunit left">';
-		print $form->selectUnits($line->fk_unit, "units");
+		print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
 		print '</td>';
 	}
 	$remise_percent = $buyer->remise_percent;
@@ -442,21 +423,66 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 	print '<td colspan="'.($coldisplay - (empty($conf->global->MAIN_VIEW_LINE_NUMBER) ? 0 : 1)).'">';
 	$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 	$date_end = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
+
+	$prefillDates = false;
+
+	if (!empty($conf->global->MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE) && !empty($object->lines))
+	{
+		for ($i = count($object->lines) - 1; $i >= 0; $i--)
+		{
+			$lastline = $object->lines[$i];
+
+			if ($lastline->product_type == Product::TYPE_SERVICE && (!empty($lastline->date_start) || !empty($lastline->date_end)))
+			{
+				$date_start_prefill = $lastline->date_start;
+				$date_end_prefill = $lastline->date_end;
+
+				$prefillDates = true;
+				break;
+			}
+		}
+	}
+
+
 	if (!empty($object->element) && $object->element == 'contrat')
 	{
 		print $langs->trans("DateStartPlanned").' ';
 		print $form->selectDate($date_start, "date_start", $usehm, $usehm, 1, "addproduct");
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
 		print $form->selectDate($date_end, "date_end", $usehm, $usehm, 1, "addproduct");
-	}
-	else
-	{
+	} else {
 		print $langs->trans('ServiceLimitedDuration').' '.$langs->trans('From').' ';
 		print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 		print ' '.$langs->trans('to').' ';
 		print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 	};
+
+	if ($prefillDates)
+	{
+		echo ' <span class="small"><a href="#" id="prefill_service_dates">'.$langs->trans('FillWithLastServiceDates').'</a></span>';
+	}
+
 	print '<script>';
+
+	if ($prefillDates)
+	{
+		?>
+        function prefill_service_dates()
+        {
+            $('#date_start').val("<?php echo dol_escape_js(dol_print_date($date_start_prefill, '%d/%m/%Y')); ?>").trigger('change');
+            $('#date_end').val("<?php echo dol_escape_js(dol_print_date($date_end_prefill, '%d/%m/%Y')); ?>").trigger('change');
+
+            return false; // Prevent default link behaviour (which is go to href URL)
+        }
+
+        $(document).ready(function()
+        {
+            $('#prefill_service_dates').click(prefill_service_dates);
+        });
+
+		<?php
+	}
+
 	if (!$date_start) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
 			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index fb9e8bbd208..61be629b2ae 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2010-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2010-2020	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Christophe Battarel	<christophe.battarel@altairis.fr>
  * Copyright (C) 2012       Cédric Salvador     <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
@@ -29,6 +29,7 @@
  * $forceall (0 by default, 1 for supplier invoices/orders)
  * $senderissupplier (0 by default, 1 for supplier invoices/orders)
  * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax)
+ * $canchangeproduct (0 by default, 1 to allow to change the product if it is a predefined product)
  */
 
 // Protection to avoid direct call of template
@@ -42,12 +43,12 @@ if (empty($object) || !is_object($object))
 $usemargins = 0;
 if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;
 
-global $forceall, $senderissupplier, $inputalsopricewithtax;
+global $forceall, $senderissupplier, $inputalsopricewithtax, $canchangeproduct;
 if (empty($dateSelector)) $dateSelector = 0;
 if (empty($forceall)) $forceall = 0;
 if (empty($senderissupplier)) $senderissupplier = 0;
 if (empty($inputalsopricewithtax)) $inputalsopricewithtax = 0;
-
+if (empty($canchangeproduct)) $canchangeproduct = 0;
 
 // Define colspan for the button 'Add'
 $colspan = 3; // Col total ht + col edit + col delete
@@ -71,27 +72,33 @@ $coldisplay++;
 
 	<input type="hidden" name="lineid" value="<?php echo $line->id; ?>">
 	<input type="hidden" id="product_type" name="type" value="<?php echo $line->product_type; ?>">
-	<input type="hidden" id="product_id" name="productid" value="<?php echo (!empty($line->fk_product) ? $line->fk_product : 0); ?>" />
 	<input type="hidden" id="special_code" name="special_code" value="<?php echo $line->special_code; ?>">
 	<input type="hidden" id="fk_parent_line" name="fk_parent_line" value="<?php echo $line->fk_parent_line; ?>">
 
 	<?php if ($line->fk_product > 0) { ?>
 		<?php
-		if ($line->fk_parent_line > 0) echo img_picto('', 'rightarrow');
+		if (empty($canchangeproduct)) {
+			if ($line->fk_parent_line > 0) echo img_picto('', 'rightarrow');
+			?>
+			<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
+			<?php
+			if ($line->product_type == 1) echo img_object($langs->trans('ShowService'), 'service');
+			else print img_object($langs->trans('ShowProduct'), 'product');
+			echo ' '.$line->ref;
+			?>
+			</a>
+			<?php
+			echo ' - '.nl2br($line->product_label);
+			print '<input type="hidden" id="product_id" name="productid" value="'.(!empty($line->fk_product) ? $line->fk_product : 0).'">';
+		} else {
+			if ($senderissupplier) {
+				print $form->select_produits_fournisseurs(!empty($line->fk_product) ? $line->fk_product : 0, 'productid');
+			} else {
+				print $form->select_produits(!empty($line->fk_product) ? $line->fk_product : 0, 'productid');
+			}
+		}
 		?>
-		<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
-		<?php
-		if ($line->product_type == 1) echo img_object($langs->trans('ShowService'), 'service');
-		else print img_object($langs->trans('ShowProduct'), 'product');
-		echo ' '.$line->ref;
-		?>
-		</a>
-		<?php
-		echo ' - '.nl2br($line->product_label);
-		?>
-
 		<br><br>
-
 	<?php }	?>
 
 	<?php
@@ -231,18 +238,15 @@ $coldisplay++;
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0)
 					echo '<td class="right nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
-				else
-					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
 				$coldisplay++;
-			}
-			elseif (!empty($conf->global->DISPLAY_MARK_RATES))
+			} elseif (!empty($conf->global->DISPLAY_MARK_RATES))
 			{
 				$mark_rate = (isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
 				// if credit note, dont allow to modify margin
 				if ($line->subprice < 0)
 					echo '<td class="right nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
-				else
-					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
 		}
@@ -275,7 +279,7 @@ if (!empty($extrafields))
 	print $form->selectDate($line->date_start, 'date_start', $hourmin, $hourmin, $line->date_start ? 0 : 1, "updateline", 1, 0);
 	print ' '.$langs->trans('to').' ';
 	print $form->selectDate($line->date_end, 'date_end', $hourmin, $hourmin, $line->date_end ? 0 : 1, "updateline", 1, 0);
-	print '<script type="text/javascript">';
+	print '<script>';
 	if (!$line->date_start) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
 			print 'jQuery("#date_starthour").val("'.$conf->global->MAIN_DEFAULT_DATE_START_HOUR.'");';
@@ -300,7 +304,7 @@ if (!empty($extrafields))
 ?>
 
 
-<script type="text/javascript">
+<script>
 
 <?php
 if (! empty($usemargins) && $user->rights->margins->creer)
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 88a8d69cdf7..1154dd61834 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -60,11 +60,22 @@ if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier'
 
 // VAT
 print '<td class="linecolvat right" style="width: 80px">';
-if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FACTURE_LOCAL_TAX1_OPTION)) {
+if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FACTURE_LOCAL_TAX2_OPTION)) {
 	print $langs->trans('Taxes');
 } else {
 	print $langs->trans('VAT');
 }
+if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT)
+{
+	global $mysoc;
+	print img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft"');
+	print '<script>$(document).ready(function() { $(".clickvatforalllines").click(function() { jQuery(".classvatforalllines").toggle(); }); });</script>';
+	print '<div class="classvatforalllines hidden inline-block nowraponall">';
+	//print '<input class="inline-block maxwidth50" type="text" name="vatforalllines" id="vatforalllines" value="">';
+	print $form->load_tva('vatforalllines', '', $mysoc, $object->thirdparty, 0, 0, '', false, 1);
+	print '<input class="inline-block" type="submit" name="submitforalllines" value="'.$langs->trans("Update").'">';
+	print '</div>';
+}
 print '</td>';
 
 // Price HT
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 0e705f4f844..99e727c48d5 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -63,8 +63,13 @@ $domData .= ' data-id="'.$line->id.'"';
 $domData .= ' data-qty="'.$line->qty.'"';
 $domData .= ' data-product_type="'.$line->product_type.'"';
 
+$sign = 1;
+if (!empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE_SCREEN) && in_array($object->element, array('facture', 'invoice_supplier')) && $object->type == $object::TYPE_CREDIT_NOTE) {
+	$sign = -1;
+}
 
-$coldisplay = 0; ?>
+$coldisplay = 0;
+?>
 <!-- BEGIN PHP TEMPLATE objectline_view.tpl.php -->
 <tr  id="row-<?php print $line->id?>" class="drag drop oddeven" <?php print $domData; ?> >
 <?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
@@ -89,8 +94,7 @@ if (($line->info_bits & 2) == 2) {
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-		}
-		elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
+		} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
@@ -98,35 +102,27 @@ if (($line->info_bits & 2) == 2) {
 			// Add date of deposit
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
 			    print ' ('.dol_print_date($discount->datec).')';
-		}
-		elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-		}
-		elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+		} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 		{
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-		}
-		else
-		{
+		} else {
 			print ($txt ? ' - ' : '').dol_htmlentitiesbr($line->description);
 		}
 	}
-}
-else
-{
+} else {
 	$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day';
 
     if ($line->fk_product > 0)
 	{
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
-	}
-	else
-	{
+	} else {
 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
 		if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 		else $text = img_object($langs->trans('Product'), 'product');
@@ -139,8 +135,7 @@ else
 			if (preg_match('/^\(DEPOSIT\)/', $line->description)) {
 				$newdesc = preg_replace('/^\(DEPOSIT\)/', $langs->trans("Deposit"), $line->description);
 				print $text.' '.dol_htmlentitiesbr($newdesc);
-			}
-			else {
+			} else {
 				print $text.' '.dol_htmlentitiesbr($line->description);
 			}
 		}
@@ -153,8 +148,7 @@ else
 		if ($line->date_start_fill && $line->date_end_fill) print ' - ';
 		if ($line->date_end_fill) print $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
 		if ($line->date_start_fill || $line->date_end_fill) print '</div>';
-	}
-	else {
+	} else {
 		if ($line->date_start || $line->date_end) print '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
 		//print get_date_range($line->date_start, $line->date_end, $format);
 	}
@@ -177,9 +171,7 @@ if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)
 	if ($user->rights->produit->creer || $user->rights->service->creer) // change required right here
 	{
 		print $productfourn->getNomUrl();
-	}
-	else
-	{
+	} else {
 		print $productfourn->ref_supplier;
 	}
 }
@@ -210,14 +202,14 @@ print vatrate($positiverates.($line->vat_src_code ? ' ('.$line->vat_src_code.')'
 //print vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
 ?></td>
 
-	<td class="linecoluht nowrap right"><?php $coldisplay++; ?><?php print price($line->subprice); ?></td>
+	<td class="linecoluht nowrap right"><?php $coldisplay++; ?><?php print price($sign * $line->subprice); ?></td>
 
 <?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
-	<td class="linecoluht_currency nowrap right"><?php $coldisplay++; ?><?php print price($line->multicurrency_subprice); ?></td>
+	<td class="linecoluht_currency nowrap right"><?php $coldisplay++; ?><?php print price($sign * $line->multicurrency_subprice); ?></td>
 <?php }
 
 if ($inputalsopricewithtax) { ?>
-	<td class="linecoluttc nowrap right"><?php $coldisplay++; ?><?php print (isset($line->pu_ttc) ?price($line->pu_ttc) : price($line->subprice)); ?></td>
+	<td class="linecoluttc nowrap right"><?php $coldisplay++; ?><?php print (isset($line->pu_ttc) ? price($sign * $line->pu_ttc) : price($sign * $line->subprice)); ?></td>
 <?php } ?>
 
 	<td class="linecolqty nowrap right"><?php $coldisplay++; ?>
@@ -260,7 +252,7 @@ if ($this->situation_cycle_ref)
 	$coldisplay++;
 	$locataxes_array = getLocalTaxesFromRate($line->tva.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : ''), 0, ($senderissupplier ? $mysoc : $object->thirdparty), ($senderissupplier ? $object->thirdparty : $mysoc));
 	$tmp = calcul_price_total($line->qty, $line->pu, $line->remise_percent, $line->txtva, -1, -1, 0, 'HT', $line->info_bits, $line->type, ($senderissupplier ? $object->thirdparty : $mysoc), $locataxes_array, 100, $object->multicurrency_tx, $line->multicurrency_subprice);
-	print '<td align="right" class="linecolcycleref2 nowrap">'.price($tmp[0]).'</td>';
+	print '<td align="right" class="linecolcycleref2 nowrap">'.price($sign * $tmp[0]).'</td>';
 }
 
 if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid))
@@ -275,6 +267,7 @@ if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid))
   	  <td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>
     <?php }
 }
+// Price total without tax
 if ($line->special_code == 3) { ?>
 	<td class="linecoloption nowrap right"><?php $coldisplay++; ?><?php print $langs->trans('Option'); ?></td>
 <?php } else {
@@ -304,19 +297,19 @@ if ($line->special_code == 3) { ?>
 
 		print '<span class="classfortooltip" title="'.dol_escape_htmltag($tooltiponprice).'">';
 	}
-	print price($line->total_ht);
+	print price($sign * $line->total_ht);
 	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 	{
 	    print '</span>';
 	}
 	print '</td>';
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
-		print '<td class="linecolutotalht_currency nowrap right">'.price($line->multicurrency_total_ht).'</td>';
+		print '<td class="linecolutotalht_currency nowrap right">'.price($sign * $line->multicurrency_total_ht).'</td>';
 		$coldisplay++;
 	}
 }
 if ($outputalsopricetotalwithtax) {
-    print '<td class="linecolht nowrap right">'.price($line->total_ttc).'</td>';
+	print '<td class="linecolht nowrap right">'.price($sign * $line->total_ttc).'</td>';
 	$coldisplay++;
 }
 
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index 32720a39ede..dcf8e712709 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -39,6 +39,8 @@ if (!empty($conf->commande->enabled))
 	{
 	    $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").'">';
@@ -62,6 +64,8 @@ if (!empty($conf->facture->enabled))
 	{
 	    $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").'">';
@@ -85,6 +89,8 @@ if (!empty($conf->contrat->enabled))
 	{
 	    $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").'">';
@@ -108,6 +114,8 @@ if (!empty($conf->adherent->enabled))
 	{
 	    $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").'">';
@@ -131,6 +139,8 @@ if (!empty($conf->don->enabled))
 	{
 	    $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").'">';
@@ -148,7 +158,7 @@ if (!empty($conf->don->enabled))
 
 if (!empty($conf->use_javascript_ajax))
 {
-	print "\n".'<script type="text/javascript">';
+	print "\n".'<script>';
 	print '$(document).ready(function () {
 		$("#generate_token").click(function() {
             	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 0845e33a80a..84abd97bc14 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -58,7 +58,7 @@ $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize
 <body class="body bodylogin"<?php print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; background-image: url(\''.DOL_URL_ROOT.'/viewimage.php?cache=1&noalt=1&modulepart=mycompany&file='.urlencode('logos/'.$conf->global->MAIN_LOGIN_BACKGROUND).'\')"'; ?>>
 
 <?php if (empty($conf->dol_use_jmobile)) { ?>
-<script type="text/javascript">
+<script>
 $(document).ready(function () {
 	// Set focus on correct field
 	<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element
@@ -120,8 +120,7 @@ if (!empty($morelogincontent)) {
 				echo $option;
 			}
 		}
-	}
-	else {
+	} else {
 		echo '<!-- Option by hook -->';
 		echo $morelogincontent;
 	}
@@ -220,8 +219,7 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
 			echo $option."\n";
 		}
 	}
-}
-elseif (!empty($moreloginextracontent)) {
+} elseif (!empty($moreloginextracontent)) {
 	echo '<!-- Javascript by hook -->';
 	echo $moreloginextracontent;
 }
@@ -231,7 +229,7 @@ elseif (!empty($moreloginextracontent)) {
 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 {
 	$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
-	foreach($tmptagarray as $tmptag) {
+	foreach ($tmptagarray as $tmptag) {
 		print "\n";
 		print "<!-- JS CODE TO ENABLE for google analtics tag -->\n";
 		print "
@@ -248,23 +246,22 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 	}
 }
 
-// Google Adsense
+// TODO Replace this with a hook
+// Google Adsense (need Google module)
 if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT))
 {
 	if (empty($conf->dol_use_jmobile))
 	{
 		?>
 	<div class="center"><br>
-		<script type="text/javascript"><!--
+		<script><!--
 			google_ad_client = "<?php echo $conf->global->MAIN_GOOGLE_AD_CLIENT ?>";
 			google_ad_slot = "<?php echo $conf->global->MAIN_GOOGLE_AD_SLOT ?>";
 			google_ad_width = <?php echo $conf->global->MAIN_GOOGLE_AD_WIDTH ?>;
 			google_ad_height = <?php echo $conf->global->MAIN_GOOGLE_AD_HEIGHT ?>;
 			//-->
 		</script>
-		<script type="text/javascript"
-			src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-		</script>
+		<script	src="//pagead2.googlesyndication.com/pagead/show_ads.js"></script>
 	</div>
 		<?php
 	}
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 2680a763a59..9bc8447a796 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -49,9 +49,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 			print '<div class="tagtd center">'.$form->selectyesno('mandatory', $linked_resource['mandatory'] ? 1 : 0, 1).'</div>';
 			print '<div class="tagtd right"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div>';
 			print '</div>';
-		}
-		else
-		{
+		} else {
 			$class = '';
 			if ($linked_resource['rowid'] == GETPOST('lineid'))
 				$class = 'highlight';
@@ -75,11 +73,11 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 			print '</div>';
 
 			print '<div class="tagtd right">';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?mode=edit&resource_type='.$linked_resource['resource_type'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
+			print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=edit&token='.newToken().'&resource_type='.$linked_resource['resource_type'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
 			print img_edit();
 			print '</a>';
 			print '&nbsp;';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&id='.$linked_resource['resource_id'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
+			print '<a class="marginleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delete_resource&token='.newToken().'&id='.$linked_resource['resource_id'].'&element='.$element.'&element_id='.$element_id.'&lineid='.$linked_resource['rowid'].'">';
 			print img_picto($langs->trans("Unlink"), 'unlink');
 			print '</a>';
 			print '</div>';
@@ -87,8 +85,7 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 			print '</div>';
 		}
 	}
-}
-else {
+} else {
 	print '<div class="tagtr oddeven">';
 	print '<div class="tagtd opacitymedium">'.$langs->trans('NoResourceLinked').'</div>';
 	print '<div class="tagtd opacitymedium"></div>';
diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
index 8f863c1c3b2..3d60ea890ed 100644
--- a/htdocs/core/triggers/dolibarrtriggers.class.php
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -20,7 +20,6 @@
  */
 abstract class DolibarrTriggers
 {
-
 	/**
 	 * Database handler
 	 * @var DoliDB
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index fceb1552f0b..4f368f95473 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -106,8 +106,7 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("NewUserCreated", $object->login);
             $desc = $langs->transnoentities("NewUserCreated", $object->login);
-		}
-        elseif ($action == 'USER_MODIFY')
+		} elseif ($action == 'USER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -115,8 +114,7 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("EventUserModified", $object->login);
             $desc = $langs->transnoentities("EventUserModified", $object->login);
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
+        } elseif ($action == 'USER_NEW_PASSWORD')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -124,8 +122,7 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("NewUserPassword", $object->login);
             $desc = $langs->transnoentities("NewUserPassword", $object->login);
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
+        } elseif ($action == 'USER_ENABLEDISABLE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -140,8 +137,7 @@ class InterfaceLogevents extends DolibarrTriggers
 				$text = $langs->transnoentities("UserDisabled", $object->login);
 				$desc = $langs->transnoentities("UserDisabled", $object->login);
 			}
-        }
-        elseif ($action == 'USER_DELETE')
+        } elseif ($action == 'USER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -158,16 +154,14 @@ class InterfaceLogevents extends DolibarrTriggers
             // Initialisation donnees (date,duree,texte,desc)
             $text = $langs->transnoentities("NewGroupCreated", $object->name);
             $desc = $langs->transnoentities("NewGroupCreated", $object->name);
-		}
-        elseif ($action == 'USERGROUP_MODIFY')
+		} 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);
-		}
-        elseif ($action == 'USERGROUP_DELETE')
+		} elseif ($action == 'USERGROUP_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -202,9 +196,7 @@ class InterfaceLogevents extends DolibarrTriggers
         if ($result > 0)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             $error = "Failed to insert security event: ".$event->error;
             $this->errors[] = $error;
             $this->error = $error;
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 49939277f49..386bedad910 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -56,13 +56,14 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 *      $object->actiontypecode (translation action code: AC_OTH, ...)
 	 *      $object->actionmsg (note, long text)
 	 *      $object->actionmsg2 (label, short text)
-	 *      $object->sendtoid (id of contact or array of ids)
+	 *      $object->sendtoid (id of contact or array of ids of contacts)
 	 *      $object->socid (id of thirdparty)
 	 *      $object->fk_project
-	 *      $object->fk_element
-	 *      $object->elementtype
+	 *      $object->fk_element	(ID of object to link action event to)
+	 *      $object->elementtype (->element of object to link action to)
+	 *      $object->module (if defined, elementtype in llx_actioncomm will be elementtype@module)
 	 *
-	 * @param string		$action		Event action code
+	 * @param string		$action		Event action code ('CONTRACT_MODIFY', 'RECRUITMENTCANDIDATURE_MODIFIY', ...)
 	 * @param Object		$object     Object
 	 * @param User		    $user       Object user
 	 * @param Translate 	$langs      Object langs
@@ -71,9 +72,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->agenda->enabled)) return 0; // Module not active, we do nothing
+		if (empty($conf->agenda->enabled)) return 0; // Module not active, we do nothing
 
 		$key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
+		//var_dump($action.' - '.$conf->global->$key);exit;
 
 		// Do not log events not enabled for this action
 		if (empty($conf->global->$key)) {
@@ -86,41 +88,47 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		// Actions
 		if ($action == 'COMPANY_CREATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "companies"));
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "companies"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
-            $object->actionmsg = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
-            if (!empty($object->prefix)) $object->actionmsg .= " (".$object->prefix.")";
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
+			$object->actionmsg = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
 
 			$object->sendtoid = 0;
 			$object->socid = $object->id;
-        }
-        elseif ($action == 'COMPANY_SENTBYMAIL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
-
-            if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
-
-            // Parameters $object->sendtoid defined by caller
-            //$object->sendtoid=0;
-		}
-        elseif ($action == 'CONTRACT_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "contracts"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-            $object->sendtoid = 0;
-		}
-		elseif ($action == 'CONTRACT_SENTBYMAIL')
+		} elseif ($action == 'COMPANY_SENTBYMAIL')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "contracts"));
+			$langs->loadLangs(array("agenda", "other", "orders"));
+
+			if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'CONTACT_CREATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "companies"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("CONTACT_CREATEInDolibarr", $object->getFullName($langs));
+			$object->actionmsg = $langs->transnoentities("CONTACT_CREATEInDolibarr", $object->getFullName($langs));
+
+			$object->sendtoid = array($object->id => $object->id);
+			$object->socid = $object->socid;
+		} elseif ($action == 'CONTRACT_VALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "contracts"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'CONTRACT_SENTBYMAIL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "contracts"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractSentByEMail", $object->ref);
 			if (empty($object->actionmsg))
@@ -130,323 +138,19 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "propal"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-			$object->sendtoid = 0;
-		}
-        elseif ($action == 'PROPAL_SENTBYMAIL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "propal"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
-            if (empty($object->actionmsg))
-            {
-                $object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
-            }
-
-            // Parameters $object->sendtoid defined by caller
-            //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_SIGNED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "propal"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
-
-			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "propal"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
-
-			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPAL_CLOSE_REFUSED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "propal"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
-
-			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_CLOSE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
-
-			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_CLASSIFY_BILLED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
-
-			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_CANCEL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
-
-			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SENTBYMAIL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderSentByEMail", $object->ref);
-            if (empty($object->actionmsg))
-            {
-                $object->actionmsg = $langs->transnoentities("OrderSentByEMail", $object->ref);
-            }
-
-            // Parameters $object->sendtoid defined by caller
-            //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-			$object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_UNVALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
-
-			$object->sendtoid = 0;
-		}
-        elseif ($action == 'BILL_SENTBYMAIL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
-            if (empty($object->actionmsg))
-            {
-                $object->actionmsg = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
-            }
-
-            // Parameters $object->sendtoid defined by caller
-            //$object->sendtoid=0;
-		}
-		elseif ($action == 'BILL_PAYED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills"));
-
-            // Values for this action can't be defined by caller.
-            $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
-
-            $object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_CANCEL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
-
-            $object->sendtoid = 0;
-		}
-		elseif ($action == 'FICHINTER_CREATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "interventions"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
-
-            $object->sendtoid = 0;
-			$object->fk_element = 0;
-			$object->elementtype = '';
-		}
-		elseif ($action == 'FICHINTER_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "interventions"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-            $object->sendtoid = 0;
-			$object->fk_element = 0;
-			$object->elementtype = '';
-		}
-		elseif ($action == 'FICHINTER_MODIFY')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "interventions"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
-
-            $object->sendtoid = 0;
-			$object->fk_element = 0;
-			$object->elementtype = '';
-		}
-		elseif ($action == 'FICHINTER_SENTBYMAIL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "interventions"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", $object->ref);
-            if (empty($object->actionmsg))
-            {
-            	$object->actionmsg = $langs->transnoentities("InterventionSentByEMail", $object->ref);
-            }
-
-            // Parameters $object->sendtoid defined by caller
-            //$object->sendtoid=0;
-        }
-        elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "interventions"));
-
-           	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
-           	$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
-
-            $object->sendtoid = 0;
-        }
-	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "interventions"));
-
-           	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
-           	$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
-
-            $object->sendtoid = 0;
-        }
-        elseif ($action == 'FICHINTER_DELETE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "interventions"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
-
-            $object->sendtoid = 0;
-			$object->fk_element = 0;
-			$object->elementtype = '';
-		}
-        elseif ($action == 'SHIPPING_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "sendings"));
-
-        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
-        	if (empty($object->actionmsg))
-        	{
-        		$object->actionmsg = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
-        	}
-
-        	// Parameters $object->sendtoid defined by caller
-        	//$object->sendtoid=0;
-        }
-		elseif ($action == 'SHIPPING_SENTBYMAIL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "sendings"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", $object->ref);
-            if (empty($object->actionmsg))
-            {
-                $object->actionmsg = $langs->transnoentities("ShippingSentByEMail", $object->ref);
-            }
-
-            // Parameters $object->sendtoid defined by caller
-            //$object->sendtoid=0;
-		} elseif ($action == 'RECEPTION_VALIDATE')
-        {
-            $langs->load("agenda");
-            $langs->load("other");
-        	$langs->load("receptions");
-
-        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
-        	if (empty($object->actionmsg))
-        	{
-        		$object->actionmsg = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
-        	}
-
-        	// Parameters $object->sendtoid defined by caller
-        	//$object->sendtoid=0;
-        }
-		elseif ($action == 'RECEPTION_SENTBYMAIL')
-        {
-            $langs->load("agenda");
-            $langs->load("other");
-            $langs->load("receptions");
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
-            if (empty($object->actionmsg))
-            {
-                $object->actionmsg = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
-            }
-
-            // Parameters $object->sendtoid defined by caller
-            //$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
+		} elseif ($action == 'PROPAL_VALIDATE')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "propal"));
+			$langs->loadLangs(array("agenda", "other", "propal"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
+		} elseif ($action == 'PROPAL_SENTBYMAIL')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "propal"));
+			$langs->loadLangs(array("agenda", "other", "propal"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
 			if (empty($object->actionmsg))
@@ -456,397 +160,660 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
+		} elseif ($action == 'PROPAL_CLOSE_SIGNED')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "propal"));
+			$langs->loadLangs(array("agenda", "other", "propal"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
+		} elseif ($action == 'PROPAL_CLASSIFY_BILLED')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "propal"));
+			$langs->loadLangs(array("agenda", "other", "propal"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'PROPAL_CLOSE_REFUSED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "propal"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_CREATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-            $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-            $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
+		} elseif ($action == 'ORDER_VALIDATE')
 		{
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_CLOSE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_CLASSIFY_BILLED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_CANCEL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_SENTBYMAIL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderSentByEMail", $object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("OrderSentByEMail", $object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'BILL_VALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'BILL_UNVALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'BILL_SENTBYMAIL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'BILL_PAYED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills"));
+
+			// Values for this action can't be defined by caller.
+			$object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'BILL_CANCEL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'FICHINTER_CREATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "interventions"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
+		} elseif ($action == 'FICHINTER_VALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "interventions"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
+			$object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
+		} elseif ($action == 'FICHINTER_MODIFY')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "interventions"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
+		} elseif ($action == 'FICHINTER_SENTBYMAIL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "interventions"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", $object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("InterventionSentByEMail", $object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "interventions"));
+
+		   	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+		   	$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "interventions"));
+
+		   	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+		   	$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'FICHINTER_DELETE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "interventions"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
+		} elseif ($action == 'SHIPPING_VALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "sendings"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'SHIPPING_SENTBYMAIL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "sendings"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", $object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("ShippingSentByEMail", $object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'RECEPTION_VALIDATE')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("receptions");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'RECEPTION_SENTBYMAIL')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("receptions");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "propal"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "propal"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "propal"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "propal"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_SUPPLIER_CREATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_SUPPLIER_APPROVE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
 			$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
+		} elseif ($action == 'ORDER_SUPPLIER_REFUSE')
 		{
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 			$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
+		} elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-            $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-            $object->sendtoid = 0;
-		}
-		elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
-            if (empty($object->actionmsg))
-            {
-                $object->actionmsg = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
-            }
-
-            // Parameters $object->sendtoid defined by caller
-            //$object->sendtoid=0;
-        }
-		elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
-            if (empty($object->actionmsg))
-            {
-                $object->actionmsg = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
-            }
-
-            $object->sendtoid = 0;
-        }
-		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-            $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
-
-            $object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
-
-            $object->sendtoid = 0;
-		}
-        elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills", "orders"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
-            if (empty($object->actionmsg))
-            {
-                $object->actionmsg = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
-            }
-
-            // Parameters $object->sendtoid defined by caller
-            //$object->sendtoid=0;
-        }
-		elseif ($action == 'BILL_SUPPLIER_PAYED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'BILL_SUPPLIER_CANCELED')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "bills"));
+		} elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
+			}
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'BILL_SUPPLIER_VALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills", "orders"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		} elseif ($action == 'BILL_SUPPLIER_PAYED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'BILL_SUPPLIER_CANCELED')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "bills"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
 		}
 
-        // Members
-        elseif ($action == 'MEMBER_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "members"));
+		// Members
+		elseif ($action == 'MEMBER_VALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
-            $object->actionmsg = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
-            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+			$object->actionmsg = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
 			$object->sendtoid = 0;
-        }
-		elseif ($action == 'MEMBER_MODIFY')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "members"));
+		} elseif ($action == 'MEMBER_MODIFY')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
-            $object->actionmsg = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
-            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+			$object->actionmsg = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-            $object->sendtoid = 0;
-		}
-        elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "members"));
+			$object->sendtoid = 0;
+		} elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "members"));
 
-            $member = $this->context['member'];
-            if (!is_object($member))	// This should not happen
-            {
-	            include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-	            $member = new Adherent($this->db);
-	            $member->fetch($this->fk_adherent);
-            }
+			$member = $this->context['member'];
+			if (!is_object($member))	// This should not happen
+			{
+				include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+				$member = new Adherent($this->db);
+				$member->fetch($this->fk_adherent);
+			}
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
-            $object->actionmsg = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
-            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
-            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->fk_type;
-            $object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->amount;
-            $object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
+			$object->actionmsg = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
+			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
+			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->fk_type;
+			$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->amount;
+			$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
 
 			$object->sendtoid = 0;
 			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
-        {
-        	// Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "members"));
+		} elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "members"));
 
-            $member = $this->context['member'];
-            if (!is_object($member))	// This should not happen
-            {
-            	include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-            	$member = new Adherent($this->db);
-            	$member->fetch($this->fk_adherent);
-            }
+			$member = $this->context['member'];
+			if (!is_object($member))	// This should not happen
+			{
+				include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+				$member = new Adherent($this->db);
+				$member->fetch($this->fk_adherent);
+			}
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
-        	$object->actionmsg = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
-        	$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
-        	$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->fk_type;
-        	$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->amount;
-        	$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
-
-        	$object->sendtoid = 0;
-        	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
-        {
-        	// Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "members"));
-
-        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
-        	$object->actionmsg = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
-        	$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-        	$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
-        	$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-        	$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
-
-        	$object->sendtoid = 0;
-        	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
-        }
-        elseif ($action == 'MEMBER_RESILIATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "members"));
-
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
-            $object->actionmsg = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
-            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
+			$object->actionmsg = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
+			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
+			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->fk_type;
+			$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->amount;
+			$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
 
 			$object->sendtoid = 0;
-        }
-        elseif ($action == 'MEMBER_DELETE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "members"));
+			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
+		} elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
-            $object->actionmsg = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
-            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+			$object->actionmsg = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+			$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+			$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
 
 			$object->sendtoid = 0;
-        }
+			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
+		} elseif ($action == 'MEMBER_RESILIATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "members"));
 
-        // Projects
-        elseif ($action == 'PROJECT_CREATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "projects"));
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+			$object->actionmsg = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
-        	$object->actionmsg = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
-        	$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
+			$object->sendtoid = 0;
+		} elseif ($action == 'MEMBER_DELETE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "members"));
 
-        	$object->sendtoid = 0;
-        }
-        elseif ($action == 'PROJECT_VALIDATE')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "projects"));
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+			$object->actionmsg = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
-            $object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
+			$object->sendtoid = 0;
+		}
 
-            $object->sendtoid = 0;
-        }
-        elseif ($action == 'PROJECT_MODIFY')
-        {
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "projects"));
+		// Projects
+		elseif ($action == 'PROJECT_CREATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "projects"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
-            $object->actionmsg = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
-            $object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+			$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
-            $object->sendtoid = 0;
-        }
+			$object->sendtoid = 0;
+		} elseif ($action == 'PROJECT_VALIDATE')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "projects"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+			$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
+
+			$object->sendtoid = 0;
+		} elseif ($action == 'PROJECT_MODIFY')
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "projects"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
+
+			$object->sendtoid = 0;
+		}
 
 		// Project tasks
 		elseif ($action == 'TASK_CREATE')
 		{
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "projects"));
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "projects"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
 			$object->actionmsg = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'TASK_MODIFY')
+		} elseif ($action == 'TASK_MODIFY')
 		{
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "projects"));
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "projects"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskModifiedInDolibarr", $object->ref);
 			$object->actionmsg = $langs->transnoentities("TaskModifieddInDolibarr", $object->ref);
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'TASK_DELETE')
+		} elseif ($action == 'TASK_DELETE')
 		{
-            // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other", "projects"));
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "projects"));
 
 			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
 			$object->actionmsg = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
 			$object->sendtoid = 0;
-		}
-		elseif ($action == 'TICKET_ASSIGNED')
+		} elseif ($action == 'TICKET_ASSIGNED')
 		{
-		    // Load translation files required by the page
-		    $langs->loadLangs(array("agenda", "other", "projects"));
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "projects"));
 
-		    if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
-		    $object->actionmsg = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
-		    if ($object->oldcopy->fk_user_assign > 0)
-		    {
-		        $tmpuser = new User($this->db);
-		        $tmpuser->fetch($object->oldcopy->fk_user_assign);
-		        $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
-		    }
-		    else
-		    {
-		        $object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
-		    }
-		    if ($object->fk_user_assign > 0)
-		    {
-		        $tmpuser = new User($this->db);
-		        $tmpuser->fetch($object->fk_user_assign);
-		        $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
-		    }
-		    else
-		    {
-		        $object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$langs->trans("None");
-		    }
-		    $object->sendtoid = 0;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
+			if ($object->oldcopy->fk_user_assign > 0)
+			{
+				$tmpuser = new User($this->db);
+				$tmpuser->fetch($object->oldcopy->fk_user_assign);
+				$object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
+			} else {
+				$object->actionmsg .= "\n".$langs->transnoentities("OldUser").': '.$langs->trans("None");
+			}
+			if ($object->fk_user_assign > 0)
+			{
+				$tmpuser = new User($this->db);
+				$tmpuser->fetch($object->fk_user_assign);
+				$object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$tmpuser->getFullName($langs);
+			} else {
+				$object->actionmsg .= "\n".$langs->transnoentities("NewUser").': '.$langs->trans("None");
+			}
+			$object->sendtoid = 0;
 		}
 		// TODO Merge all previous cases into this generic one
-		else	// $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
+		else // $action = BILL_DELETE, TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, CONTACT_SENTBYMAIL, RECRUITMENTCANDIDATURE_MODIFY, ...
 		{
-		    // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
-		    // Note that these key can be set in agenda setup, only if defined into c_action_trigger
-		    // Load translation files required by the page
-            $langs->loadLangs(array("agenda", "other"));
+			// Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function).
+			// Note that these key can be set in agenda setup, only if defined into c_action_trigger
+			// Load translation files required by the page
+			if (empty($object->actionmsg2)) {
+				$langs->loadLangs(array("agenda", "other"));
+				if ($langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref)) != $action."InDolibarr") {	// specific translation key
+					$object->actionmsg2 = $langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+				} else {	// generic translation key
+					$tmp = explode('_', $action);
+					$object->actionmsg2 = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+				}
+			}
+			if (empty($object->actionmsg)) {
+				$langs->loadLangs(array("agenda", "other"));
+				if ($langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref)) != $action."InDolibarr") {	// specific translation key
+					$object->actionmsg = $langs->transnoentities($action."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+				} else {	// generic translation key
+					$tmp = explode('_', $action);
+					$object->actionmsg = $langs->transnoentities($tmp[count($tmp) - 1]."InDolibarr", ($object->newref ? $object->newref : $object->ref));
+				}
+			}
 
-		    if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities($action."InDolibarr", $object->ref);
-		    if (empty($object->actionmsg))  $object->actionmsg = $langs->transnoentities($action."InDolibarr", $object->ref);
-
-		    $object->sendtoid = 0;
+			if (!isset($object->sendtoid) || !is_array($object->sendtoid)) {
+				$object->sendtoid = 0;
+			}
 		}
 
 		$object->actionmsg = $langs->transnoentities("Author").': '.$user->login."\n".$object->actionmsg;
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-        // Add entry in event table
+		// Add entry in event table
 		$now = dol_now();
 
 		if (isset($_SESSION['listofnames-'.$object->trackid]))
@@ -854,38 +821,37 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$attachs = $_SESSION['listofnames-'.$object->trackid];
 			if ($attachs && strpos($action, 'SENTBYMAIL'))
 			{
-                $object->actionmsg = dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
+				$object->actionmsg = dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
 			}
 		}
-
-        require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-        require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$contactforaction = new Contact($this->db);
-        $societeforaction = new Societe($this->db);
-        // Set contactforaction if there is only 1 contact.
-        if (is_array($object->sendtoid))
-        {
-            if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
-        }
-        else
-        {
-            if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
-        }
-        // Set societeforaction.
-        if ($object->socid > 0)			$societeforaction->fetch($object->socid);
-        elseif ($object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
+		$societeforaction = new Societe($this->db);
+		// Set contactforaction if there is only 1 contact.
 
-        $projectid = isset($object->fk_project) ? $object->fk_project : 0;
-        if ($object->element == 'project') $projectid = $object->id;
+		if (is_array($object->sendtoid))
+		{
+			if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
+		} else {
+			if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
+		}
+		// Set societeforaction.
+		if ($object->socid > 0)			$societeforaction->fetch($object->socid);
+		elseif ($object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
 
-        $elementid = $object->id;
-        $elementtype = $object->element;
-        if ($object->element == 'subscription')
-        {
-        	$elementid = $object->fk_adherent;
-        	$elementtype = 'member';
-        }
-        //var_dump($societeforaction);var_dump($contactforaction);exit;
+		$projectid = isset($object->fk_project) ? $object->fk_project : 0;
+		if ($object->element == 'project') $projectid = $object->id;
+
+		$elementid = $object->id; // id of object
+		$elementtype = $object->element;
+		$elementmodule = $object->module;
+		if ($object->element == 'subscription')
+		{
+			$elementid = $object->fk_adherent;
+			$elementtype = 'member';
+		}
+		//var_dump($societeforaction);var_dump($contactforaction);var_dump($elementid);var_dump($elementtype);exit;
 
 		// Insertion action
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -900,10 +866,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$actioncomm->durationp   = 0;
 		$actioncomm->percentage  = -1; // Not applicable
 		$actioncomm->socid       = $societeforaction->id;
-		$actioncomm->contactid   = $contactforaction->id;
+		$actioncomm->contact_id = $contactforaction->id; // deprecated, use ->socpeopleassigned instead
 		$actioncomm->authorid    = $user->id; // User saving action
 		$actioncomm->userownerid = $user->id; // Owner of action
-        // Fields defined when action is an email (content should be into object->actionmsg to be added into note, subject into object->actionms2 to be added into label)
+		// Fields defined when action is an email (content should be into object->actionmsg to be added into note, subject into object->actionms2 to be added into label)
 		$actioncomm->email_msgid   = $object->email_msgid;
 		$actioncomm->email_from    = $object->email_from;
 		$actioncomm->email_sender  = $object->email_sender;
@@ -914,11 +880,11 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$actioncomm->errors_to     = $object->errors_to;
 
 		// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
-		// for such objects because there is already a dedicated field into table llx_actioncomm.
+		// for such objects because there is already a dedicated field into table llx_actioncomm or llx_actioncomm_resources.
 		if (!in_array($elementtype, array('societe', 'contact', 'project')))
 		{
 			$actioncomm->fk_element  = $elementid;
-			$actioncomm->elementtype = $elementtype;
+			$actioncomm->elementtype = $elementtype.($elementmodule ? '@'.$elementmodule : '');
 		}
 
 		if (property_exists($object, 'attachedfiles') && is_array($object->attachedfiles) && count($object->attachedfiles) > 0) {
@@ -927,6 +893,11 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		if (property_exists($object, 'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid) > 0) {
 			$actioncomm->userassigned = $object->sendtouserid;
 		}
+		if (property_exists($object, 'sendtoid') && is_array($object->sendtoid) && count($object->sendtoid) > 0) {
+			foreach ($object->sendtoid as $val) {
+				$actioncomm->socpeopleassigned[$val] = $val;
+			}
+		}
 
 		$ret = $actioncomm->create($user); // User creating action
 
@@ -951,14 +922,12 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		{
 			$_SESSION['LAST_ACTION_CREATED'] = $ret;
 			return 1;
-		}
-		else
-		{
-            $this->error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
-            $this->errors = $actioncomm->errors;
+		} else {
+			$this->error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
+			$this->errors = $actioncomm->errors;
 
-            dol_syslog("interface_modAgenda_ActionsAuto.class.php: ".$this->error, LOG_ERR);
-            return -1;
+			dol_syslog("interface_modAgenda_ActionsAuto.class.php: ".$this->error, LOG_ERR);
+			return -1;
 		}
-    }
+	}
 }
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 2135f463ca7..0800d66eea3 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -83,6 +83,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 		    || $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++;
@@ -93,8 +94,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
-			}
-			else $amounts = (double) $object->total_ttc;
+			} else $amounts = (double) $object->total_ttc;
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
@@ -112,8 +112,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 					$amounts += price2num($amount);
 				}
 			}
-		}
-		elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		} elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -142,9 +141,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 			$this->error = $b->error;
 			$this->errors = $b->errors;
 			return -1;
-		}
-		else
-		{
+		} 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 8b8c392615a..9c3987cbeb1 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -91,8 +91,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_MODIFY')
+		} elseif ($action == 'USER_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -130,8 +129,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_NEW_PASSWORD')
+		} elseif ($action == 'USER_NEW_PASSWORD')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -167,12 +165,10 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_ENABLEDISABLE')
+		} elseif ($action == 'USER_ENABLEDISABLE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-		}
-		elseif ($action == 'USER_DELETE')
+		} elseif ($action == 'USER_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -190,8 +186,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_SETINGROUP')
+		} elseif ($action == 'USER_SETINGROUP')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -228,8 +223,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USER_REMOVEFROMGROUP')
+		} elseif ($action == 'USER_REMOVEFROMGROUP')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -292,8 +286,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USERGROUP_MODIFY')
+		} elseif ($action == 'USERGROUP_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -329,8 +322,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'USERGROUP_DELETE')
+		} elseif ($action == 'USERGROUP_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE) && $conf->global->LDAP_SYNCHRO_ACTIVE === 'dolibarr2ldap')
@@ -369,8 +361,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'CONTACT_MODIFY')
+		} elseif ($action == 'CONTACT_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
@@ -406,8 +397,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'CONTACT_DELETE')
+		} elseif ($action == 'CONTACT_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_CONTACT_ACTIVE))
@@ -475,8 +465,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 
 				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 			}
-		}
-		elseif ($action == 'MEMBER_VALIDATE')
+		} elseif ($action == 'MEMBER_VALIDATE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -499,8 +488,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_SUBSCRIPTION')
+		} elseif ($action == 'MEMBER_SUBSCRIPTION')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -527,8 +515,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_MODIFY')
+		} elseif ($action == 'MEMBER_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -626,8 +613,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_NEW_PASSWORD')
+		} elseif ($action == 'MEMBER_NEW_PASSWORD')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -653,8 +639,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_RESILIATE')
+		} elseif ($action == 'MEMBER_RESILIATE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -680,8 +665,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_DELETE')
+		} elseif ($action == 'MEMBER_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
@@ -764,8 +748,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_TYPE_MODIFY')
+		} elseif ($action == 'MEMBER_TYPE_MODIFY')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
@@ -807,8 +790,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$this->errors[] = "ErrorLDAP ".$ldap->error;
 				}
 			}
-		}
-		elseif ($action == 'MEMBER_TYPE_DELETE')
+		} elseif ($action == 'MEMBER_TYPE_DELETE')
 		{
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE) && (string) $conf->global->LDAP_MEMBER_TYPE_ACTIVE == '1')
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index be5465c06f2..59005b2f34d 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -71,15 +71,12 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
     			$this->error = $object->context['linkto']->error;
     			$this->errors = $object->context['linkto']->errors;
     			$return = -1;
-    		}
-			else
-			{
+    		} else {
 				$return = 1;
 			}
 
         	return $return;
-        }
-        elseif ($action == 'CATEGORY_UNLINK')
+        } elseif ($action == 'CATEGORY_UNLINK')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -89,9 +86,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
         		$this->error = $object->context['unlinkoff']->error;
         		$this->errors = $object->context['unlinkoff']->errors;
         		$return = -1;
-        	}
-        	else
-        	{
+        	} else {
         		$return = 1;
         	}
 
@@ -109,15 +104,12 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                 $this->errors = $object->errors;
                 if (!empty($object->error)) $this->errors[] = $object->error;
                 $return = -1;
-            }
-            else
-            {
+            } else {
                 $return = 1;
             }
 
             return $return;
-        }
-        elseif ($action == 'MEMBER_MODIFY')
+        } elseif ($action == 'MEMBER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -132,9 +124,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                         $this->errors = $object->oldcopy->errors;
                         if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
                         $return = -1;
-                    }
-                    else
-                    {
+                    } else {
                         $return = 1;
                     }
                 }
@@ -144,16 +134,13 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
                     $this->errors = $object->errors;
                     if (!empty($object->error)) $this->errors[] = $object->error;
                     $return = -1;
-                }
-                else
-                {
+                } else {
                     $return = 1;
                 }
             }
 
 			return $return;
-        }
-        elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
+        } elseif ($action == 'MEMBER_RESILIATE' || $action == 'MEMBER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -164,9 +151,7 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 				$this->errors = $object->errors;
 				if (!empty($object->error)) $this->errors[] = $object->error;
 				$return = -1;
-			}
-			else
-			{
+			} else {
 				$return = 1;
 			}
 
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index 760a2101087..a7157ea866a 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -140,8 +140,7 @@ class InterfaceNotification extends DolibarrTriggers
 
 				$i++;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return $ret;
 	}
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 6bd33c5b2f9..d541f2e82d0 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -170,9 +170,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						}
 
 						$ok = 1;
-					}
-					else
-					{
+					} else {
 						$this->error = $userstat->error;
 						$this->errors = $userstat->errors;
 					}
@@ -184,9 +182,6 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 				$langs->load('ticket');
 
-				$object->fetch('', $object->track_id); // Should be useless
-
-
 				// Send email to notification email
 				$sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
 				if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail']))
@@ -200,16 +195,19 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 						/* Send email to admin */
 						$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
-						$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
+						$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'<br><br>';
 						$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-						$message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-						$message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-						$message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+						$message_admin .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
+						$message_admin .= '<li>'.$langs->trans('Category').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
+						$message_admin .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
 						$message_admin .= '<li>'.$langs->trans('From').' : '.($object->email_from ? $object->email_from : ($object->fk_user_create > 0 ? $langs->trans('Internal') : '')).'</li>';
 						// Extrafields
+						$extraFields = new ExtraFields($this->db);
+						$extraFields->fetch_name_optionals_label($object->table_element);
 						if (is_array($object->array_options) && count($object->array_options) > 0) {
 							foreach ($object->array_options as $key => $value) {
-								  $message_admin .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
+								$key = substr($key, 8); // remove "options_"
+								$message_admin .= '<li>'.$langs->trans($extraFields->attributes[$object->element]['label'][$key]).' : '.$extraFields->showOutputField($key, $value).'</li>';
 							}
 						}
 						$message_admin .= '</ul>';
@@ -219,14 +217,16 @@ class InterfaceTicketEmail extends DolibarrTriggers
 								  $message_admin .= '<p>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</p>';
 						}
 
-						$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+						$message = $object->message;
+						if (!dol_textishtml($message)) {
+							$message = dol_nl2br($message);
+						}
+						$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$message.'</p>';
 						$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
 						$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 						$replyto = $from;
 
-						$message_admin = dol_nl2br($message_admin);
-
 						$trackid = 'tic'.$object->id;
 
 						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
@@ -234,7 +234,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 							$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 						}
 						include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-						$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+						$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, '', '', 0, -1, '', '', $trackid, '', 'ticket');
 						if ($mailfile->error) {
 							dol_syslog($mailfile->error, LOG_DEBUG);
 						} else {
@@ -265,11 +265,11 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						$mimetype = array();
 
 						$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
-						$message_customer = $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
+						$message_customer = $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id).'<br><br>';
 						$message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-						$message_customer .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-						$message_customer .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-						$message_customer .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+						$message_customer .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
+						$message_customer .= '<li>'.$langs->trans('Category').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
+						$message_customer .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
 
 						// Extrafields
 						foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
@@ -293,7 +293,12 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						}
 
 						$message_customer .= '</ul>';
-						$message_customer .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+
+						$message = $object->message;
+						if (!dol_textishtml($message)) {
+							$message = dol_nl2br($message);
+						}
+						$message_customer .= '<p>'.$langs->trans('Message').' : <br>'.$message.'</p>';
 						$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
 						$message_customer .= '<p>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
 						$message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
@@ -301,8 +306,6 @@ class InterfaceTicketEmail extends DolibarrTriggers
 						$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 						$replyto = $from;
 
-						$message_customer = dol_nl2br($message_customer);
-
 						$trackid = 'tic'.$object->id;
 
 						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
@@ -310,7 +313,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 							$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 						}
 						include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-						$mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', $trackid);
+						$mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, '', '', 0, -1, '', '', $trackid, '', 'ticket');
 						if ($mailfile->error) {
 							dol_syslog($mailfile->error, LOG_DEBUG);
 						} else {
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index e6c2df36ee1..49bfae82247 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -177,9 +177,7 @@ class InterfaceStripe extends DolibarrTriggers
 										//$taxids = $customer->allTaxIds($customer->id);
 										$customer->createTaxId($customer->id, array('type'=>'eu_vat', 'value'=>$vatcleaned));
 									}
-								}
-								else
-								{
+								} else {
 									$taxids = $customer->allTaxIds($customer->id);
 									if (is_array($taxids->data))
 									{
@@ -193,8 +191,7 @@ class InterfaceStripe extends DolibarrTriggers
 
 							// Update Customer on Stripe
 							$customer->save();
-						}
-						catch (Exception $e)
+						} catch (Exception $e)
 						{
 						    //var_dump(\Stripe\Stripe::getApiVersion());
 							$this->errors[] = $e->getMessage();
@@ -207,17 +204,19 @@ class InterfaceStripe extends DolibarrTriggers
 		if ($action == 'COMPANY_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
+			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.
 
-			$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-			if ($customer)
-			{
-				try {
-					$customer->delete();
-				}
-				catch (Exception $e)
+				$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
+				if ($customer)
 				{
-					dol_syslog("Failed to delete Stripe customer ".$e->getMessage(), LOG_WARNING);
+					try {
+						$customer->delete();
+					} catch (Exception $e)
+					{
+						dol_syslog("Failed to delete Stripe customer ".$e->getMessage(), LOG_WARNING);
+					}
 				}
 			}
 
@@ -254,8 +253,7 @@ class InterfaceStripe extends DolibarrTriggers
 							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
 							try {
 								$card->save();
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								$ok = -1;
 								$this->error = $e->getMessages();
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index 1091b5ee198..62d84295915 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -106,7 +106,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
         if ($action != '') {
             $actions = explode('_', $action);
             $sql = 'SELECT rowid, url FROM '.MAIN_DB_PREFIX.'zapier_hook';
-            $sql .= ' WHERE module="'.$db->escape(strtolower($actions[0])).'" AND action="'.$db->escape(strtolower($actions[1])).'"';
+            $sql .= ' WHERE module="'.$this->db->escape(strtolower($actions[0])).'" AND action="'.$this->db->escape(strtolower($actions[1])).'"';
             //setEventMessages($sql, null);
         }
 
@@ -130,9 +130,9 @@ class InterfaceZapierTriggers extends DolibarrTriggers
                 //$logtriggeraction = true;
                 break;
             case 'ACTION_CREATE':
-                $resql = $db->query($sql);
+            	$resql = $this->db->query($sql);
                 // TODO voir comment regrouper les webhooks en un post
-                while ($resql && $obj = $db->fetch_array($resql)) {
+            	while ($resql && $obj = $this->db->fetch_array($resql)) {
                     $cleaned = cleanObjectDatas(dol_clone($object));
                     $cleaned = cleanAgendaEventsDatas($cleaned);
                     $json = json_encode($cleaned);
@@ -153,8 +153,8 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 
             // Companies
             case 'COMPANY_CREATE':
-                $resql = $db->query($sql);
-                while ($resql && $obj = $db->fetch_array($resql)) {
+            	$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
@@ -163,8 +163,8 @@ class InterfaceZapierTriggers extends DolibarrTriggers
                 $logtriggeraction = true;
                 break;
             case 'COMPANY_MODIFY':
-                $resql = $db->query($sql);
-                while ($resql && $obj = $db->fetch_array($resql)) {
+            	$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
@@ -200,8 +200,8 @@ class InterfaceZapierTriggers extends DolibarrTriggers
 
             // Customer orders
             case 'ORDER_CREATE':
-                $resql = $db->query($sql);
-                while ($resql && $obj = $db->fetch_array($resql)) {
+            	$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
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index d611f687414..9d4cc3f7797 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -68,14 +68,14 @@ if ($pageid > 0)
 {
 	$websitepage->fetch($pageid);
 
-	$weblangs->setDefaultLang(GETPOSTISSET('lang') ? GETPOST('lang', 'aZ09') : (empty($_COOKIE['weblangs-shortcode']) ? 'auto' : $_COOKIE['weblangs-shortcode']));
+	$weblangs->setDefaultLang(GETPOSTISSET('lang') ? GETPOST('lang', 'aZ09') : (empty($_COOKIE['weblangs-shortcode']) ? 'auto' : preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['weblangs-shortcode'])));
 	$pagelangs->setDefaultLang($websitepage->lang ? $websitepage->lang : $weblangs->shortlang);
 
-	if (!defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other')))
+	if (!defined('USEDOLIBARREDITOR') && (in_array($websitepage->type_container, array('menu', 'other')) || empty($websitepage->status)))
 	{
 		$weblangs->load("website");
 		http_response_code(404);
-		print '<center><br><br>'.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage").'</center>';
+		print '<center><br><br>'.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage", $websitepage->pageurl, $websitepage->type_container, $websitepage->status).'</center>';
 		exit;
 	}
 }
@@ -117,9 +117,7 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php')	// If we browsing
 					if (defined('USEDOLIBARRSERVER')) {
 						header("Location: ".DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$newpageid.'&l='.GETPOST('l', 'aZ09'));
 						exit;
-					}
-					else
-					{
+					} else {
 						$newpageref = $obj->pageurl;
 						header("Location: ".(($obj->lang && $obj->lang != $website->lang) ? '/'.$obj->lang.'/' : '/').$newpageref.'.php?l='.GETPOST('l', 'aZ09'));
 						exit;
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index b9c00885d69..7c094a4cd20 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -44,15 +44,13 @@ if (!empty($actionsave))
 
 	$db->begin();
 
-	$i += dolibarr_set_const($db, 'CRON_KEY', trim(GETPOST("CRON_KEY")), 'chaine', 0, '', 0);
+	$i += dolibarr_set_const($db, 'CRON_KEY', GETPOST("CRON_KEY"), 'chaine', 0, '', 0);
 
 	if ($i >= 1)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -63,7 +61,8 @@ if (!empty($actionsave))
  *	View
  */
 
-llxHeader();
+$help_url = '';
+llxHeader('', '', $help_url);
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CronSetup"), $linkback, 'title_setup');
@@ -83,22 +82,20 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print "<td>".$langs->trans("Parameter")."</td>";
 print "<td>".$langs->trans("Value")."</td>";
-print "<td>&nbsp;</td>";
+print "<td></td>";
 print "</tr>";
 
-print '<tr class="impair">';
+print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("KeyForCronAccess").'</td>';
 $disabled = '';
 if (!empty($conf->global->CRON_DISABLE_KEY_CHANGE)) $disabled = ' disabled="disabled"';
 print '<td>';
 if (empty($conf->global->CRON_DISABLE_KEY_CHANGE))
 {
-    print '<input type="text" class="flat minwidth200"'.$disabled.' id="CRON_KEY" name="CRON_KEY" value="'.(GETPOST('CRON_KEY') ?GETPOST('CRON_KEY') : (!empty($conf->global->CRON_KEY) ? $conf->global->CRON_KEY : '')).'">';
+    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
-{
+} 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 : '')).'">';
 }
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 9ebbcda6c44..df529b598ec 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('admin', 'cron', 'members'));
 if (!$user->rights->cron->create) accessforbidden();
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $backtourl = GETPOST('backtourl', 'alpha');
@@ -65,16 +65,12 @@ if (!empty($cancel))
     if (!empty($id) && empty($backtourl))
 	{
 		$action = '';
-	}
-	else
-	{
+	} else {
 	    if ($backtourl)
 	    {
 	        header("Location: ".$backtourl);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        header("Location: ".DOL_URL_ROOT.'/cron/list.php');
 		    exit;
 	    }
@@ -90,9 +86,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->del
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else
-	{
+	} else {
 		Header("Location: ".DOL_URL_ROOT.'/cron/list.php');
 		exit;
 	}
@@ -105,9 +99,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     {
         setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
         $action = '';
-    }
-    else
-    {
+    } else {
         $now = dol_now(); // Date we start
 
     	$result = $object->run_jobs($user->login);
@@ -116,18 +108,14 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
     	{
     		setEventMessages($object->error, $object->errors, 'errors');
     		$action = '';
-    	}
-    	else
-    	{
+    	} 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
-    		{
+    		} else {
     			setEventMessages($object->error, $object->errors, 'errors');
     			$action = '';
     		}
@@ -138,19 +126,19 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
 
 if ($action == 'add')
 {
-	$object->jobtype = GETPOST('jobtype', 'alpha');
-	$object->label = GETPOST('label', 'alpha');
-	$object->command = GETPOST('command', 'alpha');
-	$object->priority = GETPOST('priority', 'int');
-	$object->classesname = GETPOST('classesname', 'alpha');
-	$object->objectname = GETPOST('objectname', 'alpha');
-	$object->methodename = GETPOST('methodename', 'alpha');
+	$object->jobtype = GETPOST('jobtype');
+	$object->label = GETPOST('label');
+	$object->command = GETPOST('command');
+	$object->classesname = GETPOST('classesname', 'alphanohtml');
+	$object->objectname = GETPOST('objectname', 'aZ09');
+	$object->methodename = GETPOST('methodename', 'aZ09');
 	$object->params = GETPOST('params');
 	$object->md5params = GETPOST('md5params');
-	$object->module_name = GETPOST('module_name', 'alpha');
-	$object->note = GETPOST('note', 'none');
+	$object->module_name = GETPOST('module_name');
+	$object->note_private = GETPOST('note', 'restricthtml');
 	$object->datestart = dol_mktime(GETPOST('datestarthour', 'int'), GETPOST('datestartmin', 'int'), 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
 	$object->dateend = dol_mktime(GETPOST('dateendhour', 'int'), GETPOST('dateendmin', 'int'), 0, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
+	$object->priority = GETPOST('priority', 'int');
 	$object->datenextrun = dol_mktime(GETPOST('datenextrunhour', 'int'), GETPOST('datenextrunmin', 'int'), 0, GETPOST('datenextrunmonth', 'int'), GETPOST('datenextrunday', 'int'), GETPOST('datenextrunyear', 'int'));
 	$object->unitfrequency = GETPOST('unitfrequency', 'int');
 	$object->frequency = GETPOST('nbfrequency', 'int');
@@ -163,8 +151,7 @@ if ($action == 'add')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'create';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -177,16 +164,16 @@ if ($action == 'update')
 	$object->jobtype = GETPOST('jobtype');
 	$object->label = GETPOST('label');
 	$object->command = GETPOST('command');
-	$object->classesname = GETPOST('classesname', 'alpha');
-	$object->priority = GETPOST('priority', 'int');
-	$object->objectname = GETPOST('objectname', 'alpha');
-	$object->methodename = GETPOST('methodename', 'alpha');
+	$object->classesname = GETPOST('classesname', 'alphanohtml');
+	$object->objectname = GETPOST('objectname', 'aZ09');
+	$object->methodename = GETPOST('methodename', 'aZ09');
 	$object->params = GETPOST('params');
 	$object->md5params = GETPOST('md5params');
-	$object->module_name = GETPOST('module_name', 'alpha');
-	$object->note = GETPOST('note', 'none');
+	$object->module_name = GETPOST('module_name');
+	$object->note_private = GETPOST('note', 'restricthtml');
 	$object->datestart = dol_mktime(GETPOST('datestarthour', 'int'), GETPOST('datestartmin', 'int'), 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'));
 	$object->dateend = dol_mktime(GETPOST('dateendhour', 'int'), GETPOST('dateendmin', 'int'), 0, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'));
+	$object->priority = GETPOST('priority', 'int');
 	$object->datenextrun = dol_mktime(GETPOST('datenextrunhour', 'int'), GETPOST('datenextrunmin', 'int'), 0, GETPOST('datenextrunmonth', 'int'), GETPOST('datenextrunday', 'int'), GETPOST('datenextrunyear', 'int'));
 	$object->unitfrequency = GETPOST('unitfrequency', 'int');
 	$object->frequency = GETPOST('nbfrequency', 'int');
@@ -199,8 +186,7 @@ if ($action == 'update')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -217,8 +203,7 @@ if ($action == 'activate')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -236,8 +221,7 @@ if ($action == 'inactive')
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit';
-	}
-	else {
+	} else {
 		setEventMessages($langs->trans('CronSaveSucess'), null, 'mesgs');
 		$action = '';
 	}
@@ -257,8 +241,7 @@ llxHeader('', $langs->trans("CronTask"));
 if ($action == 'edit' || empty($action) || $action == 'delete' || $action == 'execute')
 {
 	$head = cron_prepare_head($object);
-}
-elseif ($action == 'create')
+} elseif ($action == 'create')
 {
 	print load_fiche_titre($langs->trans("CronTask"), '', 'title_setup');
 }
@@ -399,7 +382,7 @@ if (($action == "create") || ($action == "edit"))
 
 	print '<tr><td>';
 	print $langs->trans('CronNote')."</td><td>";
-	$doleditor = new DolEditor('note', $object->note, '', 160, 'dolibarr_notes', 'In', true, false, 0, ROWS_4, '90%');
+	$doleditor = new DolEditor('note', $object->note_private, '', 160, 'dolibarr_notes', 'In', true, false, 0, ROWS_4, '90%');
 	$doleditor->Create();
 	print "</td>";
 	print "<td>";
@@ -415,9 +398,7 @@ if (($action == "create") || ($action == "edit"))
 	    if ($object->frequency == $i)
 	    {
 	        print "<option value='".$i."' selected>".$i."</option>";
-	    }
-	    else
-	    {
+	    } else {
 	        print "<option value='".$i."'>".$i."</option>";
 	    }
 	}
@@ -426,8 +407,7 @@ if (($action == "create") || ($action == "edit"))
 	if ($object->unitfrequency == "60")
 	{
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_minute\">".$langs->trans('Minutes')."</label>";
@@ -436,8 +416,7 @@ if (($action == "create") || ($action == "edit"))
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"3600\" id=\"frequency_heures\" ";
 	if ($object->unitfrequency == "3600") {
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_heures\">".$langs->trans('Hours')."</label>";
@@ -446,8 +425,7 @@ if (($action == "create") || ($action == "edit"))
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"86400\" id=\"frequency_jours\" ";
 	if ($object->unitfrequency == "86400") {
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_jours\">".$langs->trans('Days')."</label>";
@@ -456,8 +434,7 @@ if (($action == "create") || ($action == "edit"))
 	$input = " <input type=\"radio\" name=\"unitfrequency\" value=\"604800\" id=\"frequency_semaine\" ";
 	if ($object->unitfrequency == "604800") {
 	    $input .= ' checked />';
-	}
-	else {
+	} else {
 	    $input .= ' />';
 	}
 	$input .= "<label for=\"frequency_semaine\">".$langs->trans('Weeks')."</label>";
@@ -472,9 +449,7 @@ if (($action == "create") || ($action == "edit"))
 	if (!empty($object->datestart))
 	{
         print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
-	}
-	else
-	{
+	} else {
         print $form->selectDate('', 'datestart', 1, 1, '', "cronform");
 	}
 	print "</td>";
@@ -486,8 +461,7 @@ if (($action == "create") || ($action == "edit"))
 	print $langs->trans('CronDtEnd')."</td><td>";
 	if (!empty($object->dateend)) {
         print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
-	}
-	else {
+	} else {
         print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
 	}
 	print "</td>";
@@ -526,9 +500,7 @@ if (($action == "create") || ($action == "edit"))
 	if (!empty($object->datenextrun))
 	{
         print $form->selectDate($object->datenextrun, 'datenextrun', 1, 1, '', "cronform");
-	}
-	else
-	{
+	} else {
         print $form->selectDate(-1, 'datenextrun', 1, 1, '', "cronform");
 	}
 	print "</td>";
@@ -547,9 +519,7 @@ if (($action == "create") || ($action == "edit"))
 	print "</div>";
 
 	print "</form>\n";
-}
-else
-{
+} else {
 	/*
 	 * view card
 	 */
@@ -611,7 +581,9 @@ else
 
 	print '<tr><td>';
 	print $langs->trans('CronNote')."</td><td>";
-	print $langs->trans($object->note);
+	if (!is_null($object->note_private) && $object->note_private != '') {
+		print $langs->trans($object->note_private);
+	}
 	print "</td></tr>";
 
 	if (!empty($conf->multicompany->enabled))
@@ -621,9 +593,7 @@ else
 		if (!$object->entity)
 		{
 			print $langs->trans("AllEntities");
-		}
-		else
-		{
+		} else {
 			$mc->getInfo($object->entity);
 			print $mc->label;
 		}
@@ -681,8 +651,7 @@ else
 	print ' ('.$langs->trans('CronFrom').')';
 	print "</td><td>";
 	if (!$object->status) print $langs->trans("Disabled");
-	elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.dol_print_date($object->datenextrun, 'dayhoursec'); }
-	else { print $langs->trans('CronNone'); }
+	elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.dol_print_date($object->datenextrun, 'dayhoursec'); } else { print $langs->trans('CronNone'); }
 	if ($object->status == Cronjob::STATUS_ENABLED)
 	{
 		if ($object->maxrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("MaxRunReached"));
@@ -737,12 +706,10 @@ else
 	if ((empty($user->rights->cron->execute)))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronExecute").'</a>';
-	}
-	elseif (empty($object->status))
+	} elseif (empty($object->status))
 	{
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("JobDisabled")).'">'.$langs->trans("CronExecute").'</a>';
-	}
-	else {
+	} else {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.(empty($conf->global->CRON_KEY) ? '' : '&securitykey='.$conf->global->CRON_KEY).'">'.$langs->trans("CronExecute").'</a>';
 	}
 
@@ -759,7 +726,7 @@ else
 	if (!$user->rights->cron->delete) {
 		print '<a class="butActionDeleteRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("Delete").'</a>';
 	} else {
-		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
+		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
 	}
 	print '</div>';
 
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 39220f0cebe..10a2659f6a5 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -151,7 +151,7 @@ class Cronjob extends CommonObject
 		if (isset($this->unitfrequency)) $this->unitfrequency = trim($this->unitfrequency);
 		if (isset($this->frequency)) $this->frequency = trim($this->frequency);
 		if (isset($this->status)) $this->status = trim($this->status);
-		if (isset($this->note)) $this->note = trim($this->note);
+		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);
@@ -251,7 +251,7 @@ class Cronjob extends CommonObject
 		$sql .= " ".(!isset($this->status) ? '0' : $this->status).",";
 		$sql .= " ".$user->id.",";
 		$sql .= " ".$user->id.",";
-		$sql .= " ".(!isset($this->note) ? 'NULL' : "'".$this->db->escape($this->note)."'").",";
+		$sql .= " ".(!isset($this->note_private) ? 'NULL' : "'".$this->db->escape($this->note_private)."'").",";
 		$sql .= " ".(!isset($this->nbrun) ? '0' : $this->db->escape($this->nbrun)).",";
 		$sql .= " ".(empty($this->maxrun) ? '0' : $this->db->escape($this->maxrun)).",";
 		$sql .= " ".(!isset($this->libname) ? 'NULL' : "'".$this->db->escape($this->libname)."'").",";
@@ -279,9 +279,7 @@ class Cronjob extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -324,7 +322,7 @@ class Cronjob extends CommonObject
 		$sql .= " t.processing,";
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.fk_user_mod,";
-		$sql .= " t.note,";
+		$sql .= " t.note as note_private,";
 		$sql .= " t.nbrun,";
 		$sql .= " t.maxrun,";
 		$sql .= " t.libname,";
@@ -368,7 +366,7 @@ class Cronjob extends CommonObject
 				$this->processing = $obj->processing;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_user_mod = $obj->fk_user_mod;
-				$this->note = $obj->note;
+				$this->note_private = $obj->note_private;
 				$this->nbrun = $obj->nbrun;
 				$this->maxrun = $obj->maxrun;
 				$this->libname = $obj->libname;
@@ -377,9 +375,7 @@ class Cronjob extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -433,7 +429,7 @@ class Cronjob extends CommonObject
     	$sql .= " t.processing,";
     	$sql .= " t.fk_user_author,";
     	$sql .= " t.fk_user_mod,";
-    	$sql .= " t.note,";
+    	$sql .= " t.note as note_private,";
     	$sql .= " t.nbrun,";
     	$sql .= " t.libname,";
     	$sql .= " t.test";
@@ -505,7 +501,7 @@ class Cronjob extends CommonObject
 	    			$line->processing = $obj->processing;
 	    			$line->fk_user_author = $obj->fk_user_author;
 	    			$line->fk_user_mod = $obj->fk_user_mod;
-	    			$line->note = $obj->note;
+	    			$line->note_private = $obj->note_private;
 	    			$line->nbrun = $obj->nbrun;
 	    			$line->libname = $obj->libname;
 	    			$line->test = $obj->test;
@@ -517,9 +513,7 @@ class Cronjob extends CommonObject
     		$this->db->free($resql);
 
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		return -1;
     	}
@@ -557,7 +551,7 @@ class Cronjob extends CommonObject
 		if (isset($this->unitfrequency)) $this->unitfrequency = trim($this->unitfrequency);
 		if (isset($this->frequency)) $this->frequency = trim($this->frequency);
 		if (isset($this->status)) $this->status = trim($this->status);
-		if (isset($this->note)) $this->note = trim($this->note);
+		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);
@@ -631,7 +625,7 @@ class Cronjob extends CommonObject
 		$sql .= " status=".(isset($this->status) ? $this->status : "null").",";
 		$sql .= " processing=".((isset($this->processing) && $this->processing > 0) ? $this->processing : "0").",";
 		$sql .= " fk_user_mod=".$user->id.",";
-		$sql .= " note=".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : "null").",";
+		$sql .= " note=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " nbrun=".((isset($this->nbrun) && $this->nbrun > 0) ? $this->nbrun : "null").",";
 		$sql .= " maxrun=".((isset($this->maxrun) && $this->maxrun > 0) ? $this->maxrun : "0").",";
 		$sql .= " libname=".(isset($this->libname) ? "'".$this->db->escape($this->libname)."'" : "null").",";
@@ -654,9 +648,7 @@ class Cronjob extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -696,9 +688,7 @@ class Cronjob extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -752,9 +742,7 @@ class Cronjob extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -797,7 +785,7 @@ class Cronjob extends CommonObject
 		$this->processing = 0;
 		$this->fk_user_author = 0;
 		$this->fk_user_mod = 0;
-		$this->note = '';
+		$this->note_private = '';
 		$this->nbrun = '';
 		$this->maxrun = 100;
         $this->libname = '';
@@ -848,8 +836,7 @@ class Cronjob extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -894,9 +881,7 @@ class Cronjob extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -951,9 +936,7 @@ class Cronjob extends CommonObject
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
 			$conf->entity = $savcurrententity;
 			return -1;
-		}
-		else
-		{
+		} else {
 			if (empty($user->id))
 			{
 				$this->error = " User user login:".$userlogin." do not exists";
@@ -1025,6 +1008,15 @@ class Cronjob extends CommonObject
     				$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
@@ -1057,9 +1049,7 @@ class Cronjob extends CommonObject
 				if (!is_array($params_arr))
 				{
 					$result = call_user_func(array($object, $this->methodename), $this->params);
-				}
-				else
-				{
+				} else {
 					$result = call_user_func_array(array($object, $this->methodename), $params_arr);
 				}
 
@@ -1079,9 +1069,7 @@ class Cronjob extends CommonObject
 					$this->lastresult = is_numeric($result) ? $result : -1;
 		            $retval = $this->lastresult;
 		            $error++;
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this)."::run_jobs END");
 				    $this->lastoutput = $object->output;
 					$this->lastresult = var_export($result, true);
@@ -1117,9 +1105,7 @@ class Cronjob extends CommonObject
 			if (!is_array($params_arr))
 			{
 				$result = call_user_func($this->methodename, $this->params);
-			}
-			else
-			{
+			} else {
 				$result = call_user_func_array($this->methodename, $params_arr);
 			}
 
@@ -1132,9 +1118,7 @@ class Cronjob extends CommonObject
 			    $this->lastresult = is_numeric($result) ? $result : -1;
 			    $retval = $this->lastresult;
 			    $error++;
-			}
-			else
-			{
+			} else {
                 $this->lastoutput = var_export($result, true);
                 $this->lastresult = var_export($result, true); // Return code
                 $retval = $this->lastresult;
@@ -1144,23 +1128,32 @@ class Cronjob extends CommonObject
 		// Run a command line
 		if ($this->jobtype == 'command')
 		{
-			$outputdir = $conf->cron->dir_temp;
-			if (empty($outputdir)) $outputdir = $conf->cronjob->dir_temp;
+			global $dolibarr_cron_allow_cli;
 
-			if (!empty($outputdir))
-			{
-				dol_mkdir($outputdir);
-				$outputfile = $outputdir.'/cronjob.'.$userlogin.'.out'; // File used with popen method
+			if (empty($dolibarr_cron_allow_cli)) {
+				$langs->load("errors");
+				$this->error      = $langs->trans("FailedToExecutCommandJob");
+				$this->lastoutput = '';
+				$this->lastresult = $langs->trans("ErrorParameterMustBeEnabledToAllwoThisFeature", 'dolibarr_cron_allow_cli');
+			} else {
+				$outputdir = $conf->cron->dir_temp;
+				if (empty($outputdir)) $outputdir = $conf->cronjob->dir_temp;
 
-				// Execute a CLI
-				include_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
-				$utils = new Utils($this->db);
-				$arrayresult = $utils->executeCLI($this->command, $outputfile);
+				if (!empty($outputdir))
+				{
+					dol_mkdir($outputdir);
+					$outputfile = $outputdir.'/cronjob.'.$userlogin.'.out'; // File used with popen method
 
-				$retval = $arrayresult['result'];
-				$this->error      = $arrayresult['error'];
-				$this->lastoutput = $arrayresult['output'];
-				$this->lastresult = $arrayresult['result'];
+					// Execute a CLI
+					include_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
+					$utils = new Utils($this->db);
+					$arrayresult = $utils->executeCLI($this->command, $outputfile);
+
+					$retval = $arrayresult['result'];
+					$this->error      = $arrayresult['error'];
+					$this->lastoutput = $arrayresult['output'];
+					$this->lastresult = $arrayresult['result'];
+				}
 			}
 		}
 
@@ -1202,9 +1195,7 @@ class Cronjob extends CommonObject
 			$this->error = "User Error : ".$user->error;
 			dol_syslog(get_class($this)."::reprogram_jobs ".$this->error, LOG_ERR);
 			return -1;
-		}
-		else
-		{
+		} else {
 			if (empty($user->id))
 			{
 				$this->error = " User user login:".$userlogin." do not exists";
@@ -1230,9 +1221,7 @@ class Cronjob extends CommonObject
 
 		        // TODO For exact frequency (every month, every year, ...), use instead a dol_time_plus_duree($time, $duration_value, $duration_unit)
 		    }
-		}
-		else
-		{
+		} 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");
 		}
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index e9afad3b48b..927c1d1014f 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("admin", "cron", "bills", "members"));
 
 if (!$user->rights->cron->read) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $confirm = GETPOST('confirm', 'alpha');
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
@@ -132,9 +132,7 @@ if (empty($reshook))
 	    {
 	        setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
 	        $action = '';
-	    }
-	    else
-	    {
+	    } else {
 	        $object = new Cronjob($db);
 	    	$job = $object->fetch($id);
 
@@ -155,9 +153,7 @@ if (empty($reshook))
 	    		    else setEventMessages($langs->trans("JobFinished"), null, 'errors');
 	    		}
 	    		$action = '';
-	    	}
-	    	else
-	    	{
+	    	} else {
 	    		setEventMessages($object->error, $object->errors, 'errors');
 	    		$action = '';
 	    	}
@@ -196,9 +192,7 @@ if (empty($reshook))
 				elseif ($massaction == 'enable') $result = $tmpcron->setStatut(Cronjob::STATUS_ENABLED);
 				//else dol_print_error($db, 'Bad value for massaction');
 				if ($result < 0) setEventMessages($tmpcron->error, $tmpcron->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 		}
@@ -353,7 +347,7 @@ if (!empty($conf->global->CRON_WARNING_DELAY_HOURS)) $text .= $langs->trans("War
 print info_admin($text);
 print '<br>';
 
-$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+//$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) : '');
@@ -364,7 +358,7 @@ print '<table class="noborder">';
 print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">';
-print '<input type="text" class="flat" name="search_label" value="'.$search_label.'" size="10">';
+print '<input type="text" class="flat" name="search_label" value="'.$search_label.'">';
 print '</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
@@ -377,7 +371,6 @@ 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">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="center">';
 print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled")), $search_status, 1);
 print '</td><td class="liste_titre right">';
@@ -394,7 +387,6 @@ print_liste_field_titre("CronTask", '', '', "", $param, '', $sortfield, $sortord
 print_liste_field_titre("CronFrequency", '', "", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("CronDtStart", $_SERVER["PHP_SELF"], "t.datestart", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre("CronDtEnd", $_SERVER["PHP_SELF"], "t.dateend", "", $param, 'align="center"', $sortfield, $sortorder);
-print_liste_field_titre("CronMaxRun", $_SERVER["PHP_SELF"], "t.maxrun", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre("CronNbRun", $_SERVER["PHP_SELF"], "t.nbrun", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre("CronDtLastLaunch", $_SERVER["PHP_SELF"], "t.datelastrun", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
@@ -438,15 +430,13 @@ if ($num > 0)
 		print '</td>';
 
 		// Label
-		print '<td>';
+		print '<td class="tdoverflowmax300">';
 		if (!empty($obj->label))
 		{
 			$object->ref = $langs->trans($obj->label);
-			print $object->getNomUrl(0, '', 1);
+			print '<span title="'.dol_escape_htmltag($langs->trans($obj->label)).'">'.$object->getNomUrl(0, '', 1).'</span>';
 			$object->ref = $obj->rowid;
-		}
-		else
-		{
+		} else {
 			//print $langs->trans('CronNone');
 		}
 		print '</td>';
@@ -466,8 +456,7 @@ if ($num > 0)
 			$texttoshow .= $langs->trans('CronMethod').': '.$obj->methodename;
 			$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$obj->params;
 			$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($obj->note);
-		}
-		elseif ($obj->jobtype == 'command')
+		} elseif ($obj->jobtype == 'command')
 		{
 			$text = $langs->trans('CronCommand');
 			$texttoshow = $langs->trans('CronCommand').': '.dol_trunc($obj->command);
@@ -485,24 +474,21 @@ if ($num > 0)
 		print '</td>';
 
 		print '<td class="center">';
-		if (!empty($obj->datestart)) {print dol_print_date($db->jdate($obj->datestart), 'dayhour'); }
+		if (!empty($obj->datestart)) { print dol_print_date($db->jdate($obj->datestart), 'dayhour'); }
 		print '</td>';
 
 		print '<td class="center">';
-		if (!empty($obj->dateend)) {print dol_print_date($db->jdate($obj->dateend), 'dayhour'); }
+		if (!empty($obj->dateend)) { print dol_print_date($db->jdate($obj->dateend), 'dayhour'); }
 		print '</td>';
 
 		print '<td class="right">';
-		if (!empty($obj->maxrun)) {print $obj->maxrun; }
-		print '</td>';
-
-		print '<td class="right">';
-		if (!empty($obj->nbrun)) {print $obj->nbrun; } else {print '0'; }
+		if (!empty($obj->nbrun)) { print $obj->nbrun; } else {print '0'; }
+		if (!empty($obj->maxrun)) { print ' <span class="'.$langs->trans("Max").'">/ '.$obj->maxrun.'</span>'; }
 		print '</td>';
 
 		// Date start last run
 		print '<td class="center">';
-		if (!empty($datelastrun)) {print dol_print_date($datelastrun, 'dayhoursec'); }
+		if (!empty($datelastrun)) { print dol_print_date($datelastrun, 'dayhoursec'); }
 		print '</td>';
 
 		// Duration
@@ -550,12 +536,12 @@ if ($num > 0)
 		$backtourl = urlencode($_SERVER["PHP_SELF"].'?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : ''));
 		if ($user->rights->cron->create)
 		{
-			print '<a class="editfielda" href="'.DOL_URL_ROOT."/cron/card.php?id=".$obj->rowid."&action=edit".($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
+			print '<a class="editfielda" href="'.DOL_URL_ROOT."/cron/card.php?id=".$obj->rowid.'&action=edit&token='.newToken().($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
 			print "&backtourl=".$backtourl."\" title=\"".dol_escape_htmltag($langs->trans('Edit'))."\">".img_picto($langs->trans('Edit'), 'edit')."</a> &nbsp;";
 		}
 		if ($user->rights->cron->delete)
 		{
-			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=delete".($page ? '&page='.$page : '').($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
+			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"]."?id=".$obj->rowid.'&action=delete&token='.newToken().($page ? '&page='.$page : '').($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
 			print "\" title=\"".dol_escape_htmltag($langs->trans('CronDelete'))."\">".img_picto($langs->trans('CronDelete'), 'delete', '', false, 0, 0, '', 'marginleftonly')."</a> &nbsp; ";
 		} else {
 			print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'), 'delete', '', false, 0, 0, '', 'marginleftonly')."</a> &nbsp; ";
@@ -586,9 +572,7 @@ if ($num > 0)
 
 		$i++;
 	}
-}
-else
-{
+} else {
 	print '<tr><td colspan="9" class="opacitymedium">'.$langs->trans('CronNoJobs').'</td></tr>';
 }
 
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index fe9e5bbc5c3..8cbec549941 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -36,7 +36,7 @@ $langs->load('datapolicy@datapolicy');
 if (!$user->admin) accessforbidden();
 
 // Parameters
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array();
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index f8bcdde1876..b2b739a8f12 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -29,7 +29,7 @@ $langs->loadLangs(array('admin', 'companies', 'members', 'datapolicy'));
 
 
 // Parameters
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 $formadmin = new FormAdmin($db);
 
@@ -101,7 +101,7 @@ print "<script type='text/javascript'>
 </script>";
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?l='.$l.'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setvalue">';
 print '<table>';
 if ($conf->global->MAIN_MULTILANGS) {
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index 8e3cfe10874..280f900f307 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -505,9 +505,7 @@ class DataPolicyCron
 	                                	$error++;
 	                                }
 	                            }
-                            }
-                            else
-                            {
+                            } else {
                             	$errormsg = $object->error;
                             	$error++;
                             }
@@ -538,9 +536,7 @@ class DataPolicyCron
         if (!$error)
         {
         	$this->output = $nbupdated.' record updated, '.$nbdeleted.' record deleted';
-        }
-        else
-        {
+        } else {
         	$this->error = $errormsg;
         }
 
diff --git a/htdocs/datapolicy/public/index.php b/htdocs/datapolicy/public/index.php
index c6e23db9083..079bcd340da 100644
--- a/htdocs/datapolicy/public/index.php
+++ b/htdocs/datapolicy/public/index.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
 $idc = GETPOST('c', 'int');
 $ids = GETPOST('s', 'int');
 $ida = GETPOST('a', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $lang = GETPOST('l', 'alpha');
 $code = GETPOST('key', 'alpha');
 
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 60912b86a8a..195f8e800a7 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -88,9 +88,7 @@ class CdavLib
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
-		}
-		else
-		{
+		} else {
 			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
@@ -105,9 +103,7 @@ class CdavLib
 			if ($ouri === false)
 			{
 				$sql .= ' AND a.id = '.intval($oid);
-			}
-			else
-			{
+			} else {
 				$sql .= ' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
 			}
 		}
@@ -161,8 +157,7 @@ class CdavLib
 
 		if ($obj->percent == -1 && trim($obj->datep) != '')
 			$type = 'VEVENT';
-		else
-			$type = 'VTODO';
+		else $type = 'VTODO';
 
 		$timezone = date_default_timezone_get();
 
@@ -176,8 +171,7 @@ class CdavLib
 		$caldata .= "DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
 		if ($obj->sourceuid == '')
 			$caldata .= "UID:".$obj->id.'-ev-'.$calid.'-cal-'.constant('CDAV_URI_KEY')."\n";
-		else
-			$caldata .= "UID:".$obj->sourceuid."\n";
+		else $caldata .= "UID:".$obj->sourceuid."\n";
 		$caldata .= "SUMMARY:".$obj->label."\n";
 		$caldata .= "LOCATION:".$location."\n";
 		$caldata .= "PRIORITY:".$obj->priority."\n";
@@ -188,30 +182,23 @@ class CdavLib
 			{
 				if (trim($obj->datep2) != '')
 					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
-				else
-					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
-			}
-			elseif (trim($obj->datep2) != '')
+				else $caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
+			} elseif (trim($obj->datep2) != '')
 				$caldata .= "DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
-		}
-		else
-		{
+		} else {
 			$caldata .= "DTSTART;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			if ($type == 'VEVENT')
 			{
 				if (trim($obj->datep2) != '')
 					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
-				else
-					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
-			}
-			elseif (trim($obj->datep2) != '')
+				else $caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
+			} elseif (trim($obj->datep2) != '')
 				$caldata .= "DUE;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 		}
 		$caldata .= "CLASS:PUBLIC\n";
 		if ($obj->transparency == 1)
 			$caldata .= "TRANSP:TRANSPARENT\n";
-		else
-			$caldata .= "TRANSP:OPAQUE\n";
+		else $caldata .= "TRANSP:OPAQUE\n";
 
 		if ($type == 'VEVENT')
 			$caldata .= "STATUS:CONFIRMED\n";
@@ -219,8 +206,7 @@ class CdavLib
 			$caldata .= "STATUS:NEEDS-ACTION\n";
 		elseif ($obj->percent == 100)
 			$caldata .= "STATUS:COMPLETED\n";
-		else
-		{
+		else {
 			$caldata .= "STATUS:IN-PROCESS\n";
 			$caldata .= "PERCENT-COMPLETE:".$obj->percent."\n";
 		}
@@ -284,9 +270,7 @@ class CdavLib
 						'size' => strlen($calendardata),
 						'component' => strpos($calendardata, 'BEGIN:VEVENT') > 0 ? 'vevent' : 'vtodo',
 					);
-				}
-				else
-				{
+				} else {
 					$calevents[] = array(
 						// 'calendardata' => $calendardata,  not necessary because etag+size are present
 						'uri' => $obj->id.'-ev-'.constant('CDAV_URI_KEY'),
diff --git a/htdocs/dav/dav.lib.php b/htdocs/dav/dav.lib.php
index b306ec7161a..bb4835c4d52 100644
--- a/htdocs/dav/dav.lib.php
+++ b/htdocs/dav/dav.lib.php
@@ -26,8 +26,7 @@ if (!defined('CDAV_CONTACT_TAG'))
 {
 	if (isset($conf->global->CDAV_CONTACT_TAG))
 		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-	else
-		define('CDAV_CONTACT_TAG', '');
+	else define('CDAV_CONTACT_TAG', '');
 }
 
 // define CDAV_URI_KEY if not
@@ -35,8 +34,7 @@ if (!defined('CDAV_URI_KEY'))
 {
 	if (isset($conf->global->CDAV_URI_KEY))
 		define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
-	else
-		define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
+	else define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
 }
 
 
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index fd9f993e1e8..1ff336a16b8 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -77,9 +77,7 @@ class DolLogsCollector extends MessagesCollector
 		if ($uselogfile)
 		{
     		$this->getStorageLogs($this->path);
-		}
-		else
-		{
+		} else {
     	    $log_levels = $this->getLevels();
 
     	    foreach ($conf->logbuffer as $line) {
diff --git a/htdocs/debugbar/class/DebugBar.php b/htdocs/debugbar/class/DebugBar.php
index 8882b5f4f1e..e3f2ac159f7 100644
--- a/htdocs/debugbar/class/DebugBar.php
+++ b/htdocs/debugbar/class/DebugBar.php
@@ -51,10 +51,10 @@ class DolibarrDebugBar extends DebugBar
 	 */
 	public function getRenderer()
 	{
-	    $renderer = parent::getJavascriptRenderer(DOL_URL_ROOT.'/includes/DebugBar/Resources');
-	    //$renderer->disableVendor('jquery');
-	    $renderer->disableVendor('fontawesome');
-	    $renderer->disableVendor('highlightjs');
-	    return $renderer;
+		$renderer = parent::getJavascriptRenderer(DOL_URL_ROOT.'/includes/maximebf/debugbar/src/DebugBar/Resources');
+		//$renderer->disableVendor('jquery');
+		$renderer->disableVendor('fontawesome');
+		$renderer->disableVendor('highlightjs');
+		return $renderer;
 	}
 }
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 8b94959a43c..77c20325a9d 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -46,7 +46,7 @@ class TraceableDB extends DoliDB
 	public function __construct($db)
 	{
 		$this->db      = $db;
-		$this->type    = $db->type;
+		$this->type    = $this->db->type;
 		$this->queries = array();
 	}
 
diff --git a/htdocs/debugbar/class/autoloader.php b/htdocs/debugbar/class/autoloader.php
index 1d5c85c975d..91606babb84 100644
--- a/htdocs/debugbar/class/autoloader.php
+++ b/htdocs/debugbar/class/autoloader.php
@@ -5,14 +5,32 @@
  */
 
 spl_autoload_register(function ($class) {
-    if (preg_match('/^DebugBar/', $class) || preg_match('/^'.preg_quote('Psr\Log', '/').'/', $class)) {
-        $file = DOL_DOCUMENT_ROOT.'/includes/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
-        //var_dump($class.' - '.file_exists($file).' - '.$file);
-        if (file_exists($file)) {
-    		require_once $file;
-    		return true;
-    	}
-    	return false;
-    }
-    return true;
+	if (preg_match('/^DebugBar/', $class)) {
+		$file = DOL_DOCUMENT_ROOT.'/includes/maximebf/debugbar/src/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
+		//var_dump($class.' - '.file_exists($file).' - '.$file);
+		if (file_exists($file)) {
+			require_once $file;
+			return true;
+		}
+		return false;
+	}
+	if (preg_match('/^'.preg_quote('Psr\Log', '/').'/', $class)) {
+		$file = DOL_DOCUMENT_ROOT.'/includes/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
+		//var_dump($class.' - '.file_exists($file).' - '.$file);
+		if (file_exists($file)) {
+			require_once $file;
+			return true;
+		}
+		return false;
+	}
+	if (preg_match('/^'.preg_quote('Symfony\Component\VarDumper', '/').'/', $class)) {
+		$class = preg_replace('/'.preg_quote('Symfony\Component\VarDumper', '/').'/', '', $class);
+		$file = DOL_DOCUMENT_ROOT.'/includes/symfony/var-dumper/'.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
+		if (file_exists($file)) {
+			require_once $file;
+			return true;
+		}
+		return false;
+	}
+	return true;
 });
diff --git a/htdocs/document.php b/htdocs/document.php
index 2e088d6378c..bc0cc1eb933 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -76,7 +76,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 $encoding = '';
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $original_file = GETPOST('file', 'alphanohtml'); // Do not use urldecode here ($_GET are already decoded by PHP).
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'alpha');
@@ -133,20 +133,14 @@ if (!empty($hashp))
 				// We remove first level of directory
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
-			}
-			else
-			{
+			} else {
 				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);
 			}
-		}
-		else
-		{
+		} else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
 	}
@@ -161,8 +155,10 @@ if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
 // Define mime type
 $type = 'application/octet-stream';	// By default
 if (GETPOST('type', 'alpha')) $type = GETPOST('type', 'alpha');
-else $type=dol_mimetype($original_file);
+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
+// We do not force if file is a javascript to be able to get js from website module with <script src="
+// Note: Force whatever is $modulepart seems ok.
 if (!in_array($type, array('text/x-javascript')) && !dolIsAllowedForPreview($original_file)) {
 	$type = 'application/octet-stream';
 }
@@ -181,14 +177,13 @@ $check_access = dol_check_secure_access_document($modulepart, $original_file, $e
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
+//var_dump($fullpath_original_file);exit;
 
 if (!empty($hashp))
 {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
-}
-else
-{
+} else {
 	// Basic protection (against external users only)
 	if ($user->socid > 0)
 	{
@@ -226,7 +221,7 @@ if (!$accessallowed)
 if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file))
 {
 	dol_syslog("Refused to deliver file ".$fullpath_original_file);
-	print "ErrorFileNameInvalid: ".$original_file;
+	print "ErrorFileNameInvalid: ".dol_escape_htmltag($original_file);
 	exit;
 }
 
@@ -266,9 +261,11 @@ if (!$attachment && !empty($conf->global->MAIN_USE_EXIF_ROTATION) && image_forma
 	$readfile = !$imgres;
 }
 
+if (is_object($db)) $db->close();
+
+// Send file now
 if ($readfile) {
 	header('Content-Length: '.dol_filesize($fullpath_original_file));
-	readfile($fullpath_original_file_osencoded);
-}
 
-if (is_object($db)) $db->close();
+	readfileLowMemory($fullpath_original_file_osencoded);
+}
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index e8e7fa4f5b9..6a28424d81b 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('admin', 'donations', 'accountancy', 'other'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -70,15 +70,11 @@ if ($action == 'specimen')
         {
             header("Location: ".DOL_URL_ROOT."/document.php?modulepart=donation&file=SPECIMEN.html");
             return;
-        }
-        else
-        {
+        } else {
             setEventMessages($obj->error, $obj->errors, 'errors');
             dol_syslog($obj->error, LOG_ERR);
         }
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
         dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
     }
@@ -106,9 +102,7 @@ elseif ($action == 'setdoc')
 elseif ($action == 'set')
 {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -129,16 +123,14 @@ if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
 if ($action == 'set_DONATION_MESSAGE')
 {
-	$freemessage = GETPOST('DONATION_MESSAGE', 'none'); // No alpha here, we want exact string
+	$freemessage = GETPOST('DONATION_MESSAGE', 'restricthtml'); // No alpha here, we want exact string
 
     $res = dolibarr_set_const($db, "DONATION_MESSAGE", $freemessage, 'chaine', 0, '', $conf->entity);
 
@@ -147,9 +139,7 @@ if ($action == 'set_DONATION_MESSAGE')
  	if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -164,9 +154,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -178,9 +166,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
         exit;
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 }
@@ -210,7 +196,7 @@ $type = 'donation';
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $resql = $db->query($sql);
 if ($resql)
 {
@@ -222,9 +208,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -275,18 +259,14 @@ if (is_resource($handle))
 						print "<td class=\"center\">\n";
 						print img_picto($langs->trans("Enabled"), 'switch_on');
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print "<td class=\"center\">\n";
-						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</a>';
 						print '</td>';
 					}
-				}
-				else
-				{
+				} else {
 					print "<td class=\"center\">\n";
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+					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>";
 				}
 
@@ -296,11 +276,9 @@ if (is_resource($handle))
 					print "<td class=\"center\">";
 					print img_picto($langs->trans("Default"), 'on');
 					print '</td>';
-				}
-				else
-				{
+				} else {
 					print "<td class=\"center\">";
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&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 '<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>';
 				}
 
@@ -370,9 +348,7 @@ print '<td class="center">';
 if (!empty($conf->accounting->enabled))
 {
 	print $formaccounting->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
-}
-else
-{
+} else {
 	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="'.$conf->global->DONATION_ACCOUNTINGACCOUNT.'">';
 }
 print '</td><td class="center">';
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index ba1a0443b47..ddf0e56933c 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -37,7 +37,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'don'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 3d2e873b5b3..95bebb3ef8d 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -47,7 +47,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 $langs->loadLangs(array("bills", "companies", "donations"));
 
 $id = GETPOST('rowid') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $amount = GETPOST('amount');
 $donation_date = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
@@ -113,8 +113,8 @@ if ($action == 'update')
 		$object->date = $donation_date;
 		$object->public = GETPOST("public", 'alpha');
 		$object->fk_project = GETPOST("fk_project", 'alpha');
-		$object->note_private = GETPOST("note_private", 'none');
-		$object->note_public = GETPOST("note_public", 'none');
+		$object->note_private = GETPOST("note_private", 'restricthtml');
+		$object->note_public = GETPOST("note_public", 'restricthtml');
 		$object->modepaymentid = GETPOST('modepayment', 'int');
 
 		// Fill array 'array_options' with data from add form
@@ -166,8 +166,8 @@ if ($action == 'add')
 		$object->country_id = GETPOST('country_id', 'int');
 		$object->email = GETPOST('email', 'alpha');
         $object->date = $donation_date;
-		$object->note_private = GETPOST("note_private", 'none');
-		$object->note_public = GETPOST("note_public", 'none');
+		$object->note_private = GETPOST("note_private", 'restricthtml');
+		$object->note_public = GETPOST("note_public", 'restricthtml');
 		$object->public = GETPOST("public", 'alpha');
 		$object->fk_project = GETPOST("fk_project", 'alpha');
 		$object->modepaymentid = GETPOST('modepayment', 'int');
@@ -181,9 +181,7 @@ if ($action == 'add')
 		{
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -196,9 +194,7 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights-
     {
         header("Location: index.php");
         exit;
-    }
-    else
-    {
+    } else {
         dol_syslog($object->error, LOG_DEBUG);
         setEventMessages($object->error, $object->errors, 'errors');
     }
@@ -212,8 +208,7 @@ if ($action == 'valid_promesse')
 
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -224,8 +219,7 @@ if ($action == 'set_cancel')
     {
         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
         exit;
-    }
-    else {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -236,12 +230,10 @@ if ($action == 'set_paid')
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-elseif ($action == 'classin' && $user->rights->don->creer)
+} elseif ($action == 'classin' && $user->rights->don->creer)
 {
 	$object->fetch($id);
 	$object->setProject($projectid);
@@ -296,7 +288,7 @@ if ($action == 'builddoc')
 		$outputlangs = new Translate("",$conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
-	$result=don_create($db, $object->id, '', $object->modelpdf, $outputlangs);
+	$result=don_create($db, $object->id, '', $object->model_pdf, $outputlangs);
 	if ($result <= 0)
 	{
 		dol_print_error($db,$result);
@@ -355,9 +347,7 @@ if ($action == 'create')
 			}
 			print ')';
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			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
@@ -399,7 +389,7 @@ if ($action == 'create')
 		print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
 		print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';
 		print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.dol_escape_htmltag(GETPOST("address", "none"), 0, 1).'</textarea></td></tr>';
+		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.dol_escape_htmltag(GETPOST("address", "alphanohtml"), 0, 1).'</textarea></td></tr>';
 
 		// Zip / Town
 		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
@@ -520,9 +510,7 @@ if (!empty($id) && $action == 'edit')
 	if ($object->statut == 0)
 	{
 		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.price($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print price($object->amount, 0, $langs, 0, 0, -1, $conf->currency);
 		print '</td></tr>';
@@ -777,9 +765,7 @@ if (!empty($id) && $action != 'edit')
 		}
 		print "</table>";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -801,12 +787,12 @@ if (!empty($id) && $action != 'edit')
 
 	if ($object->statut == 0)
 	{
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=valid_promesse">'.$langs->trans("ValidPromess").'</a></div>';
+		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">'.$langs->trans("ClassifyCanceled")."</a></div>";
+        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
@@ -815,9 +801,7 @@ if (!empty($id) && $action != 'edit')
 		if ($remaintopay == 0)
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
 		}
 	}
@@ -833,15 +817,11 @@ if (!empty($id) && $action != 'edit')
 	{
 		if ($object->statut == -1 || $object->statut == 0)
 		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";
-		}
-		else
-		{
+			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 {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 		}
-	}
-	else
-	{
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 	}
 
@@ -859,7 +839,7 @@ if (!empty($id) && $action != 'edit')
 	$genallowed	= (($object->paid == 0 || $user->admin) && $user->rights->don->lire);
 	$delallowed	= $user->rights->don->creer;
 
-	print $formfile->showdocuments('donation', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf);
+	print $formfile->showdocuments('donation', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
 
 	// Show links to link elements
 	$linktoelem = $form->showLinkToObjectBlock($object, null, array('don'));
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 872e2009b9b..2d61241c738 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -127,7 +127,7 @@ class Donations extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -135,21 +135,21 @@ class Donations extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
         dol_syslog("API Rest request");
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
 
         if ($result)
         {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             $i = 0;
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $don_static = new Don($db);
+            	$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);
@@ -157,9 +157,8 @@ class Donations extends DolibarrApi
                 }
                 $i++;
             }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve donation list : '.$db->lasterror());
+        } else {
+        	throw new RestException(503, 'Error when retrieve donation list : '.$this->db->lasterror());
         }
         if (!count($obj_ret)) {
             throw new RestException(404, 'No donation found');
@@ -230,9 +229,7 @@ class Donations extends DolibarrApi
         if ($this->don->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
         	throw new RestException(500, $this->don->error);
         }
     }
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 59c293e6386..3ccaa573e8c 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -36,12 +36,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class Don extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'don';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'don';
@@ -57,7 +57,7 @@ class Don extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
-    /**
+	/**
 	 * @var string String with name of icon for object don. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'donation';
@@ -65,60 +65,60 @@ class Don extends CommonObject
 	/**
 	 * @var string Date of the donation
 	 */
-    public $date;
+	public $date;
 
-    /**
-     * amount of donation
-     * @var double
-     */
-    public $amount;
+	/**
+	 * amount of donation
+	 * @var double
+	 */
+	public $amount;
 
-    /**
+	/**
 	 * @var string Thirdparty name
 	 */
-    public $societe;
+	public $societe;
 
-    /**
+	/**
 	 * @var string Address
 	 */
 	public $address;
 
-    /**
+	/**
 	 * @var string Zipcode
 	 */
-    public $zip;
+	public $zip;
 
-    /**
+	/**
 	 * @var string Town
 	 */
-    public $town;
+	public $town;
 
-    /**
+	/**
 	 * @var string Email
 	 */
-    public $email;
-    public $public;
+	public $email;
+	public $public;
 
-    /**
-     * @var int project ID
-     */
-    public $fk_project;
+	/**
+	 * @var int project ID
+	 */
+	public $fk_project;
 
-    /**
-     * @var int type payment ID
-     */
-    public $fk_typepayment;
+	/**
+	 * @var int type payment ID
+	 */
+	public $fk_typepayment;
 
 	public $num_payment;
 	public $date_valid;
 	public $modepaymentid = 0;
 
-    /**
+	/**
 	 * @var array Array of status label
 	 */
 	public $labelStatus;
 
-    /**
+	/**
 	 * @var array Array of status label short
 	 */
 	public $labelStatusShort;
@@ -130,436 +130,424 @@ class Don extends CommonObject
 	const STATUS_CANCELED = -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;
+	}
 
 
-    /**
-     * 	Returns the donation status label (draft, valid, abandoned, paid)
-     *
-     *  @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)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
+	/**
+	 * 	Returns the donation status label (draft, valid, abandoned, paid)
+	 *
+	 *  @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)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return the label of a given status
-     *
-     *  @param	int		$status        	Id 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
-    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
-    	{
-	    	global $langs;
-	    	$langs->load("donations");
-	    	$this->labelStatus[-1] = $langs->trans("Canceled");
-	    	$this->labelStatus[0] = $langs->trans("DonationStatusPromiseNotValidated");
-	    	$this->labelStatus[1] = $langs->trans("DonationStatusPromiseValidated");
-	    	$this->labelStatus[2] = $langs->trans("DonationStatusPaid");
-	    	$this->labelStatusShort[-1] = $langs->trans("Canceled");
-	    	$this->labelStatusShort[0] = $langs->trans("DonationStatusPromiseNotValidatedShort");
-	    	$this->labelStatusShort[1] = $langs->trans("DonationStatusPromiseValidatedShort");
-	    	$this->labelStatusShort[2] = $langs->trans("DonationStatusPaidShort");
-    	}
-
-    	$statusType = 'status'.$status;
-    	if ($status == self::STATUS_CANCELED) $statusType = 'status9';
-    	if ($status == self::STATUS_PAID) $statusType = 'status6';
-
-    	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $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()
-    {
-        global $conf, $user, $langs;
-
-        $now = dol_now();
-
-        // Charge tableau des id de societe socids
-        $socids = array();
-
-        $sql = "SELECT rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe";
-        $sql .= " WHERE client IN (1, 3)";
-        $sql .= " AND entity = ".$conf->entity;
-        $sql .= " LIMIT 10";
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num_socs = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num_socs)
-            {
-                $i++;
-
-                $row = $this->db->fetch_row($resql);
-                $socids[$i] = $row[0];
-            }
-        }
-
-        // Initialise parametres
-        $this->id = 0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->lastname = 'Doe';
-        $this->firstname = 'John';
-        $this->socid = 1;
-        $this->date = $now;
-        $this->date_valid = $now;
-        $this->amount = 100;
-        $this->public = 1;
-        $this->societe = 'The Company';
-        $this->address = 'Twist road';
-        $this->zip = '99999';
-        $this->town = 'Town';
-        $this->note_private = 'Private note';
-        $this->note_public = 'Public note';
-        $this->email = 'email@email.com';
-        $this->note = '';
-        $this->statut = 1;
-    }
-
-
-    /**
-     *	Check params and init ->errors array.
-     *  TODO This function seems to not be used by core code.
-     *
-     *	@param	int	$minimum	Minimum
-     *	@return	int				0 if KO, >0 if OK
-     */
-    public function check($minimum = 0)
-    {
-    	global $langs;
-    	$langs->load('main');
-    	$langs->load('companies');
-
-    	$error_string = array();
-        $err = 0;
-
-        if (dol_strlen(trim($this->societe)) == 0)
-        {
-            if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0)
-            {
-            	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Company').'/'.$langs->transnoentitiesnoconv('Firstname').'-'.$langs->transnoentitiesnoconv('Lastname'));
-                $err++;
-            }
-        }
-
-        if (dol_strlen(trim($this->address)) == 0)
-        {
-        	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Address'));
-            $err++;
-        }
-
-        if (dol_strlen(trim($this->zip)) == 0)
-        {
-        	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Zip'));
-            $err++;
-        }
-
-        if (dol_strlen(trim($this->town)) == 0)
-        {
-        	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Town'));
-            $err++;
-        }
-
-        if (dol_strlen(trim($this->email)) == 0)
-        {
-        	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMail'));
-            $err++;
-        }
-
-        $this->amount = trim($this->amount);
-
-        $map = range(0, 9);
-        $len = dol_strlen($this->amount);
-        for ($i = 0; $i < $len; $i++)
-        {
-            if (!isset($map[substr($this->amount, $i, 1)]))
-            {
-            	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
-                $err++;
-                $amount_invalid = 1;
-                break;
-            }
-        }
-
-        if (!$amount_invalid)
-        {
-            if ($this->amount == 0)
-            {
-            	$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
-                $err++;
-            }
-            else
-            {
-                if ($this->amount < $minimum && $minimum > 0)
-                {
-                	$error_string[] = $langs->trans('MinimumAmount', $langs->transnoentitiesnoconv('$minimum'));
-                    $err++;
-                }
-            }
-        }
-
-        if ($err)
-        {
-            $this->errors = $error_string;
-            return 0;
-        }
-        else
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the label of a given status
+	 *
+	 *  @param	int		$status        	Id 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
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
 		{
-            return 1;
-        }
-    }
+			global $langs;
+			$langs->load("donations");
+			$this->labelStatus[-1] = $langs->trans("Canceled");
+			$this->labelStatus[0] = $langs->trans("DonationStatusPromiseNotValidated");
+			$this->labelStatus[1] = $langs->trans("DonationStatusPromiseValidated");
+			$this->labelStatus[2] = $langs->trans("DonationStatusPaid");
+			$this->labelStatusShort[-1] = $langs->trans("Canceled");
+			$this->labelStatusShort[0] = $langs->trans("DonationStatusPromiseNotValidatedShort");
+			$this->labelStatusShort[1] = $langs->trans("DonationStatusPromiseValidatedShort");
+			$this->labelStatusShort[2] = $langs->trans("DonationStatusPaidShort");
+		}
 
-    /**
-     * Create donation record into database
-     *
-     * @param	User	$user		User who created the donation
-     * @param	int		$notrigger	Disable triggers
-     * @return  int  		        <0 if KO, id of created donation if OK
-     * TODO    add numbering module for Ref
-     */
-    public function create($user, $notrigger = 0)
-    {
-        global $conf, $langs;
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_CANCELED) $statusType = 'status9';
+		if ($status == self::STATUS_PAID) $statusType = 'status6';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $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()
+	{
+		global $conf, $user, $langs;
+
+		$now = dol_now();
+
+		// Charge tableau des id de societe socids
+		$socids = array();
+
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE client IN (1, 3)";
+		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " LIMIT 10";
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num_socs = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num_socs)
+			{
+				$i++;
+
+				$row = $this->db->fetch_row($resql);
+				$socids[$i] = $row[0];
+			}
+		}
+
+		// Initialise parametres
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->lastname = 'Doe';
+		$this->firstname = 'John';
+		$this->socid = 1;
+		$this->date = $now;
+		$this->date_valid = $now;
+		$this->amount = 100;
+		$this->public = 1;
+		$this->societe = 'The Company';
+		$this->address = 'Twist road';
+		$this->zip = '99999';
+		$this->town = 'Town';
+		$this->note_private = 'Private note';
+		$this->note_public = 'Public note';
+		$this->email = 'email@email.com';
+		$this->note = '';
+		$this->statut = 1;
+	}
+
+
+	/**
+	 *	Check params and init ->errors array.
+	 *  TODO This function seems to not be used by core code.
+	 *
+	 *	@param	int	$minimum	Minimum
+	 *	@return	int				0 if KO, >0 if OK
+	 */
+	public function check($minimum = 0)
+	{
+		global $langs;
+		$langs->load('main');
+		$langs->load('companies');
+
+		$error_string = array();
+		$err = 0;
+
+		if (dol_strlen(trim($this->societe)) == 0)
+		{
+			if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0)
+			{
+				$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Company').'/'.$langs->transnoentitiesnoconv('Firstname').'-'.$langs->transnoentitiesnoconv('Lastname'));
+				$err++;
+			}
+		}
+
+		if (dol_strlen(trim($this->address)) == 0)
+		{
+			$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Address'));
+			$err++;
+		}
+
+		if (dol_strlen(trim($this->zip)) == 0)
+		{
+			$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Zip'));
+			$err++;
+		}
+
+		if (dol_strlen(trim($this->town)) == 0)
+		{
+			$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Town'));
+			$err++;
+		}
+
+		if (dol_strlen(trim($this->email)) == 0)
+		{
+			$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMail'));
+			$err++;
+		}
+
+		$this->amount = trim($this->amount);
+
+		$map = range(0, 9);
+		$len = dol_strlen($this->amount);
+		for ($i = 0; $i < $len; $i++)
+		{
+			if (!isset($map[substr($this->amount, $i, 1)]))
+			{
+				$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
+				$err++;
+				$amount_invalid = 1;
+				break;
+			}
+		}
+
+		if (!$amount_invalid)
+		{
+			if ($this->amount == 0)
+			{
+				$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
+				$err++;
+			} else {
+				if ($this->amount < $minimum && $minimum > 0)
+				{
+					$error_string[] = $langs->trans('MinimumAmount', $langs->transnoentitiesnoconv('$minimum'));
+					$err++;
+				}
+			}
+		}
+
+		if ($err)
+		{
+			$this->errors = $error_string;
+			return 0;
+		} else {
+			return 1;
+		}
+	}
+
+	/**
+	 * Create donation record into database
+	 *
+	 * @param	User	$user		User who created the donation
+	 * @param	int		$notrigger	Disable triggers
+	 * @return  int  		        <0 if KO, id of created donation if OK
+	 * TODO    add numbering module for Ref
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 		$ret = 0;
-        $now = dol_now();
+		$now = dol_now();
 
-        // Clean parameters
-        $this->address = ($this->address > 0 ? $this->address : $this->address);
-        $this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
-        $this->town = ($this->town > 0 ? $this->town : $this->town);
-        $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
-        $this->country = ($this->country ? $this->country : $this->country);
+		// Clean parameters
+		$this->address = ($this->address > 0 ? $this->address : $this->address);
+		$this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
+		$this->town = ($this->town > 0 ? $this->town : $this->town);
+		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		$this->country = ($this->country ? $this->country : $this->country);
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."don (";
-        $sql .= "datec";
-        $sql .= ", entity";
-        $sql .= ", amount";
-        $sql .= ", fk_payment";
-        $sql .= ", fk_soc";
-        $sql .= ", firstname";
-        $sql .= ", lastname";
-        $sql .= ", societe";
-        $sql .= ", address";
-        $sql .= ", zip";
-        $sql .= ", town";
-        $sql .= ", fk_country";
-        $sql .= ", public";
-        $sql .= ", fk_projet";
-        $sql .= ", note_private";
-        $sql .= ", note_public";
-        $sql .= ", fk_user_author";
-        $sql .= ", fk_user_valid";
-        $sql .= ", datedon";
-        $sql .= ", email";
-        $sql .= ", phone";
-        $sql .= ", phone_mobile";
-        $sql .= ") VALUES (";
-        $sql .= "'".$this->db->idate($now)."'";
-        $sql .= ", ".$conf->entity;
-        $sql .= ", ".price2num($this->amount);
-        $sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");
-        $sql .= ", ".($this->socid > 0 ? $this->socid : "null");
-        $sql .= ", '".$this->db->escape($this->firstname)."'";
-        $sql .= ", '".$this->db->escape($this->lastname)."'";
-        $sql .= ", '".$this->db->escape($this->societe)."'";
-        $sql .= ", '".$this->db->escape($this->address)."'";
-        $sql .= ", '".$this->db->escape($this->zip)."'";
-        $sql .= ", '".$this->db->escape($this->town)."'";
-        $sql .= ", ".($this->country_id > 0 ? $this->country_id : '0');
-        $sql .= ", ".((int) $this->public);
-        $sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
-       	$sql .= ", ".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."don (";
+		$sql .= "datec";
+		$sql .= ", entity";
+		$sql .= ", amount";
+		$sql .= ", fk_payment";
+		$sql .= ", fk_soc";
+		$sql .= ", firstname";
+		$sql .= ", lastname";
+		$sql .= ", societe";
+		$sql .= ", address";
+		$sql .= ", zip";
+		$sql .= ", town";
+		$sql .= ", fk_country";
+		$sql .= ", public";
+		$sql .= ", fk_projet";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", fk_user_author";
+		$sql .= ", fk_user_valid";
+		$sql .= ", datedon";
+		$sql .= ", email";
+		$sql .= ", phone";
+		$sql .= ", phone_mobile";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->idate($now)."'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".price2num($this->amount);
+		$sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");
+		$sql .= ", ".($this->socid > 0 ? $this->socid : "null");
+		$sql .= ", '".$this->db->escape($this->firstname)."'";
+		$sql .= ", '".$this->db->escape($this->lastname)."'";
+		$sql .= ", '".$this->db->escape($this->societe)."'";
+		$sql .= ", '".$this->db->escape($this->address)."'";
+		$sql .= ", '".$this->db->escape($this->zip)."'";
+		$sql .= ", '".$this->db->escape($this->town)."'";
+		$sql .= ", ".($this->country_id > 0 ? $this->country_id : '0');
+		$sql .= ", ".((int) $this->public);
+		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+	   	$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 .= ", ".$user->id;
-        $sql .= ", null";
-        $sql .= ", '".$this->db->idate($this->date)."'";
-        $sql .= ", '".$this->db->escape($this->email)."'";
-        $sql .= ", '".$this->db->escape($this->phone)."'";
-        $sql .= ", '".$this->db->escape($this->phone_mobile)."'";
-        $sql .= ")";
+		$sql .= ", ".$user->id;
+		$sql .= ", null";
+		$sql .= ", '".$this->db->idate($this->date)."'";
+		$sql .= ", '".$this->db->escape($this->email)."'";
+		$sql .= ", '".$this->db->escape($this->phone)."'";
+		$sql .= ", '".$this->db->escape($this->phone_mobile)."'";
+		$sql .= ")";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."don");
 			$ret = $this->id;
 
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('DON_CREATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->errno = $this->db->lasterrno();
-            $error++;
-        }
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('DON_CREATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->errno = $this->db->lasterrno();
+			$error++;
+		}
 
 		// Update extrafield
-        if (!$error) {
-        	if (!$error)
-        	{
-        		$result = $this->insertExtraFields();
-        		if ($result < 0)
-        		{
-        			$error++;
-        		}
-        	}
-        }
+		if (!$error) {
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
 
 		if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
-        {
-            //$res = $this->setValid($user);
-            //if ($res < 0) $error++;
-        }
+		{
+			//$res = $this->setValid($user);
+			//if ($res < 0) $error++;
+		}
 
-        if (!$error)
-        {
-            $this->db->commit();
-            return $ret;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return $ret;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *  Update a donation record
-     *
-     *  @param 		User	$user   Objet utilisateur qui met a jour le don
-     *  @param      int		$notrigger	Disable triggers
-     *  @return     int      		>0 if OK, <0 if KO
-     */
-    public function update($user, $notrigger = 0)
-    {
-        global $langs, $conf;
+	/**
+	 *  Update a donation record
+	 *
+	 *  @param 		User	$user   Objet utilisateur qui met a jour le don
+	 *  @param      int		$notrigger	Disable triggers
+	 *  @return     int      		>0 if OK, <0 if KO
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		global $langs, $conf;
 
 		$error = 0;
 
-        // Clean parameters
-        $this->address = ($this->address > 0 ? $this->address : $this->address);
-        $this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
-        $this->town = ($this->town > 0 ? $this->town : $this->town);
-        $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
-        $this->country = ($this->country ? $this->country : $this->country);
+		// Clean parameters
+		$this->address = ($this->address > 0 ? $this->address : $this->address);
+		$this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
+		$this->town = ($this->town > 0 ? $this->town : $this->town);
+		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		$this->country = ($this->country ? $this->country : $this->country);
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."don SET ";
-        $sql .= "amount = ".price2num($this->amount);
-        $sql .= ",fk_payment = ".($this->modepaymentid ? $this->modepaymentid : "null");
-        $sql .= ",firstname = '".$this->db->escape($this->firstname)."'";
-        $sql .= ",lastname='".$this->db->escape($this->lastname)."'";
-        $sql .= ",societe='".$this->db->escape($this->societe)."'";
-        $sql .= ",address='".$this->db->escape($this->address)."'";
-        $sql .= ",zip='".$this->db->escape($this->zip)."'";
-        $sql .= ",town='".$this->db->escape($this->town)."'";
-        $sql .= ",fk_country = ".($this->country_id > 0 ? $this->country_id : '0');
-        $sql .= ",public=".$this->public;
-        $sql .= ",fk_projet=".($this->fk_project > 0 ? $this->fk_project : 'null');
-        $sql .= ",note_private=".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
-        $sql .= ",note_public=".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
-        $sql .= ",datedon='".$this->db->idate($this->date)."'";
-        $sql .= ",date_valid=".($this->date_valid ? "'".$this->db->idate($this->date)."'" : "null");
-        $sql .= ",email='".$this->db->escape($this->email)."'";
-        $sql .= ",phone='".$this->db->escape($this->phone)."'";
-        $sql .= ",phone_mobile='".$this->db->escape($this->phone_mobile)."'";
-        $sql .= ",fk_statut=".$this->statut;
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET ";
+		$sql .= "amount = ".price2num($this->amount);
+		$sql .= ",fk_payment = ".($this->modepaymentid ? $this->modepaymentid : "null");
+		$sql .= ",firstname = '".$this->db->escape($this->firstname)."'";
+		$sql .= ",lastname='".$this->db->escape($this->lastname)."'";
+		$sql .= ",societe='".$this->db->escape($this->societe)."'";
+		$sql .= ",address='".$this->db->escape($this->address)."'";
+		$sql .= ",zip='".$this->db->escape($this->zip)."'";
+		$sql .= ",town='".$this->db->escape($this->town)."'";
+		$sql .= ",fk_country = ".($this->country_id > 0 ? $this->country_id : '0');
+		$sql .= ",public=".$this->public;
+		$sql .= ",fk_projet=".($this->fk_project > 0 ? $this->fk_project : 'null');
+		$sql .= ",note_private=".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
+		$sql .= ",note_public=".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
+		$sql .= ",datedon='".$this->db->idate($this->date)."'";
+		$sql .= ",date_valid=".($this->date_valid ? "'".$this->db->idate($this->date)."'" : "null");
+		$sql .= ",email='".$this->db->escape($this->email)."'";
+		$sql .= ",phone='".$this->db->escape($this->phone)."'";
+		$sql .= ",phone_mobile='".$this->db->escape($this->phone_mobile)."'";
+		$sql .= ",fk_statut=".$this->statut;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::Update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if (!$notrigger)
-            {
-				// Call trigger
-                $result = $this->call_trigger('DON_MODIFY', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-
-            // Update extrafield
-            if (!$error)
+		dol_syslog(get_class($this)."::Update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (!$notrigger)
 			{
-              	if (!$error)
-               	{
-               		$result = $this->insertExtraFields();
-               		if ($result < 0)
-               		{
-               			$error++;
-               		}
-               	}
-            }
+				// Call trigger
+				$result = $this->call_trigger('DON_MODIFY', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+
+			// Update extrafield
+			if (!$error)
+			{
+			  	if (!$error)
+			   	{
+			   		$result = $this->insertExtraFields();
+			   		if ($result < 0)
+			   		{
+			   			$error++;
+			   		}
+			   	}
+			}
 
 			if (!$error)
-            {
-                $this->db->commit();
-                $result = 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                $result = -1;
-            }
-        }
-        else
-		{
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->error;
-            $this->db->rollback();
-            dol_syslog(get_class($this)."::Update error -2 ".$this->error, LOG_ERR);
-            $result = -2;
-        }
+			{
+				$this->db->commit();
+				$result = 1;
+			} else {
+				$this->db->rollback();
+				$result = -1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::Update error -2 ".$this->error, LOG_ERR);
+			$result = -2;
+		}
 		return $result;
 	}
 
-    /**
-     *    Delete a donation from database
-     *
-     *    @param       User		$user            User
-     *    @param       int		$notrigger       Disable triggers
-     *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
-     */
-    public function delete($user, $notrigger = 0)
-    {
+	/**
+	 *    Delete a donation from database
+	 *
+	 *    @param       User		$user            User
+	 *    @param       int		$notrigger       Disable triggers
+	 *    @return      int       			      <0 if KO, 0 if not possible, >0 if OK
+	 */
+	public function delete($user, $notrigger = 0)
+	{
 		global $user, $conf, $langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -568,161 +556,157 @@ class Don extends CommonObject
 		$this->db->begin();
 
    		if (!$error)
-        {
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('DON_DELETE', $user);
+		{
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('DON_DELETE', $user);
 
-                if ($result < 0) {
-                    $error++;
-                }
-                // End call triggers
-            }
-        }
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		}
 
-        // Delete donation
-        if (!$error)
-        {
-	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."don_extrafields";
-	        $sql .= " WHERE fk_object=".$this->id;
+		// Delete donation
+		if (!$error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."don_extrafields";
+			$sql .= " WHERE fk_object=".$this->id;
 
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $this->db->lasterror();
-	        	$error++;
-	        }
-        }
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		}
 
 		if (!$error)
-        {
-	        $sql = "DELETE FROM ".MAIN_DB_PREFIX."don";
-	        $sql .= " WHERE rowid=".$this->id;
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."don";
+			$sql .= " WHERE rowid=".$this->id;
 
-	        $resql = $this->db->query($sql);
-	        if (!$resql)
-	        {
-	        	$this->errors[] = $this->db->lasterror();
-	        	$error++;
-	        }
-        }
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		}
 
-    	if (!$error)
-    	{
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-        	foreach ($this->errors as $errmsg)
-        	{
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			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 ".$this->error, LOG_ERR);
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *      Load donation from database
-     *
-     *      @param      int		$id      Id of donation to load
-     *      @param      string	$ref        Ref of donation to load
-     *      @return     int      			<0 if KO, >0 if OK
-     */
-    public function fetch($id, $ref = '')
-    {
-        global $conf;
+	/**
+	 *      Load donation from database
+	 *
+	 *      @param      int		$id      Id of donation to load
+	 *      @param      string	$ref        Ref of donation to load
+	 *      @return     int      			<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $ref = '')
+	{
+		global $conf;
 
-        $sql = "SELECT d.rowid, d.datec, d.date_valid, d.tms as datem, d.datedon,";
-        $sql .= " d.fk_soc as socid,d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, ";
-        $sql .= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, d.email, d.phone, ";
-        $sql .= " d.phone_mobile, d.fk_projet as fk_project, d.model_pdf,";
-        $sql .= " p.ref as project_ref,";
-        $sql .= " cp.libelle as payment_label, cp.code as payment_code,";
-        $sql .= " c.code as country_code, c.label as country";
-        $sql .= " FROM ".MAIN_DB_PREFIX."don as d";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_projet";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid";
-        $sql .= " WHERE d.entity IN (".getEntity('donation').")";
-        if (!empty($id))
-        {
-        	$sql .= " AND d.rowid=".$id;
-        }
-        elseif (!empty($ref))
-        {
-        	$sql .= " AND d.ref='".$this->db->escape($ref)."'";
-        }
+		$sql = "SELECT d.rowid, d.datec, d.date_valid, d.tms as datem, d.datedon,";
+		$sql .= " d.fk_soc as socid,d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, ";
+		$sql .= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, d.email, d.phone, ";
+		$sql .= " d.phone_mobile, d.fk_projet as fk_project, d.model_pdf,";
+		$sql .= " p.ref as project_ref,";
+		$sql .= " cp.libelle as payment_label, cp.code as payment_code,";
+		$sql .= " c.code as country_code, c.label as country";
+		$sql .= " FROM ".MAIN_DB_PREFIX."don as d";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_projet";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid";
+		$sql .= " WHERE d.entity IN (".getEntity('donation').")";
+		if (!empty($id))
+		{
+			$sql .= " AND d.rowid=".$id;
+		} elseif (!empty($ref))
+		{
+			$sql .= " AND d.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->ref                = $obj->rowid;
-                $this->date_creation      = $this->db->jdate($obj->datec);
-                $this->datec              = $this->db->jdate($obj->datec);
-                $this->date_validation    = $this->db->jdate($obj->date_valid);
-                $this->date_valid = $this->db->jdate($obj->date_valid);
-                $this->date_modification  = $this->db->jdate($obj->datem);
-                $this->datem              = $this->db->jdate($obj->datem);
-                $this->date               = $this->db->jdate($obj->datedon);
-                $this->socid              = $obj->socid;
-                $this->firstname          = $obj->firstname;
-                $this->lastname           = $obj->lastname;
-                $this->societe            = $obj->societe;
-                $this->statut             = $obj->fk_statut;
-                $this->address            = $obj->address;
-                $this->zip                = $obj->zip;
-                $this->town               = $obj->town;
-                $this->country_id         = $obj->fk_country;
-                $this->country_code       = $obj->country_code;
-                $this->country            = $obj->country;
-                $this->country_olddata    = $obj->country_olddata; // deprecated
-                $this->email              = $obj->email;
-                $this->phone              = $obj->phone;
-                $this->phone_mobile       = $obj->phone_mobile;
-                $this->project            = $obj->project_ref;
-                $this->fk_projet          = $obj->fk_project; // deprecated
-                $this->fk_project         = $obj->fk_project;
-                $this->public             = $obj->public;
-                $this->mode_reglement_id  = $obj->fk_payment;
-                $this->mode_reglement_code = $obj->payment_code;
-                $this->mode_reglement     = $obj->payment_label;
-                $this->paid = $obj->paid;
-                $this->amount             = $obj->amount;
-                $this->note_private	      = $obj->note_private;
-                $this->note_public = $obj->note_public;
-                $this->modelpdf           = $obj->model_pdf;
+				$this->id                 = $obj->rowid;
+				$this->ref                = $obj->rowid;
+				$this->date_creation      = $this->db->jdate($obj->datec);
+				$this->datec              = $this->db->jdate($obj->datec);
+				$this->date_validation    = $this->db->jdate($obj->date_valid);
+				$this->date_valid = $this->db->jdate($obj->date_valid);
+				$this->date_modification  = $this->db->jdate($obj->datem);
+				$this->datem              = $this->db->jdate($obj->datem);
+				$this->date               = $this->db->jdate($obj->datedon);
+				$this->socid              = $obj->socid;
+				$this->firstname          = $obj->firstname;
+				$this->lastname           = $obj->lastname;
+				$this->societe            = $obj->societe;
+				$this->statut             = $obj->fk_statut;
+				$this->address            = $obj->address;
+				$this->zip                = $obj->zip;
+				$this->town               = $obj->town;
+				$this->country_id         = $obj->fk_country;
+				$this->country_code       = $obj->country_code;
+				$this->country            = $obj->country;
+				$this->country_olddata    = $obj->country_olddata; // deprecated
+				$this->email              = $obj->email;
+				$this->phone              = $obj->phone;
+				$this->phone_mobile       = $obj->phone_mobile;
+				$this->project            = $obj->project_ref;
+				$this->fk_projet          = $obj->fk_project; // deprecated
+				$this->fk_project         = $obj->fk_project;
+				$this->public             = $obj->public;
+				$this->mode_reglement_id  = $obj->fk_payment;
+				$this->mode_reglement_code = $obj->payment_code;
+				$this->mode_reglement     = $obj->payment_label;
+				$this->paid = $obj->paid;
+				$this->amount             = $obj->amount;
+				$this->note_private	      = $obj->note_private;
+				$this->note_public = $obj->note_public;
+				$this->model_pdf          = $obj->model_pdf;
+				$this->modelpdf           = $obj->model_pdf;	// deprecated
 
-                // Retreive all extrafield
-                // fetch optionals attributes and labels
-                $this->fetch_optionals();
-            }
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
+			}
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 	/**
 	 *	Validate a intervention
-     *
-     *	@param		User		$user		User that validate
-     *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return		int						<0 if KO, >0 if OK
-     */
+	 *
+	 *	@param		User		$user		User that validate
+	 *  @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)
 	{
 		return $this->valid_promesse($this->id, $user->id, $notrigger);
@@ -730,14 +714,14 @@ class Don extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *    Validate a promise of donation
-     *
-     *    @param	int		$id   		id of donation
-     *    @param  	int		$userid  	User who validate the donation/promise
-     *    @param	int		$notrigger	Disable triggers
-     *    @return   int     			<0 if KO, >0 if OK
-     */
-    public function valid_promesse($id, $userid, $notrigger = 0)
+	 *    Validate a promise of donation
+	 *
+	 *    @param	int		$id   		id of donation
+	 *    @param  	int		$userid  	User who validate the donation/promise
+	 *    @param	int		$notrigger	Disable triggers
+	 *    @return   int     			<0 if KO, >0 if OK
+	 */
+	public function valid_promesse($id, $userid, $notrigger = 0)
 	{
 		// phpcs:enable
 		global $langs, $user;
@@ -746,211 +730,197 @@ class Don extends CommonObject
 
 		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = ".$userid." WHERE rowid = ".$id." AND fk_statut = 0";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = ".$userid." WHERE rowid = ".$id." AND fk_statut = 0";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->affected_rows($resql))
-            {
-            	if (!$notrigger)
-            	{
-            		// Call trigger
-            		$result = $this->call_trigger('DON_VALIDATE', $user);
-            		if ($result < 0) { $error++; }
-            		// End call triggers
-            	}
-            }
-        }
-        else
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-        }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->affected_rows($resql))
+			{
+				if (!$notrigger)
+				{
+					// Call trigger
+					$result = $this->call_trigger('DON_VALIDATE', $user);
+					if ($result < 0) { $error++; }
+					// End call triggers
+				}
+			}
+		} else {
+			$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;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Classify the donation as paid, the donation was received
-     *
-     *    @param	int		$id           	    id of donation
-     *    @param    int		$modepayment   	    mode of payment
-     *    @return   int      					<0 if KO, >0 if OK
-     */
-    public function set_paid($id, $modepayment = 0)
-    {
-        // phpcs:enable
-        $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
-        if ($modepayment)
-        {
-            $sql .= ", fk_payment=".$modepayment;
-        }
-        $sql .= " WHERE rowid = ".$id." AND fk_statut = 1";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Classify the donation as paid, the donation was received
+	 *
+	 *    @param	int		$id           	    id of donation
+	 *    @param    int		$modepayment   	    mode of payment
+	 *    @return   int      					<0 if KO, >0 if OK
+	 */
+	public function set_paid($id, $modepayment = 0)
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
+		if ($modepayment)
+		{
+			$sql .= ", fk_payment=".$modepayment;
+		}
+		$sql .= " WHERE rowid = ".$id." AND fk_statut = 1";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->affected_rows($resql))
-            {
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->affected_rows($resql))
+			{
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Set donation to status cancelled
-     *
-     *    @param	int		$id   	    id of donation
-     *    @return   int     			<0 if KO, >0 if OK
-     */
-    public function set_cancel($id)
-    {
-        // phpcs:enable
-        $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$id;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Set donation to status cancelled
+	 *
+	 *    @param	int		$id   	    id of donation
+	 *    @return   int     			<0 if KO, >0 if OK
+	 */
+	public function set_cancel($id)
+	{
+		// phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$id;
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->affected_rows($resql))
-            {
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->affected_rows($resql))
+			{
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Sum of donations
-     *
-     *	@param	string	$param	1=promesses de dons validees , 2=xxx, 3=encaisses
-     *	@return	int				Summ of donations
-     */
-    public function sum_donations($param)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Sum of donations
+	 *
+	 *	@param	string	$param	1=promesses de dons validees , 2=xxx, 3=encaisses
+	 *	@return	int				Summ of donations
+	 */
+	public function sum_donations($param)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $result = 0;
+		$result = 0;
 
-        $sql = "SELECT sum(amount) as total";
-        $sql .= " FROM ".MAIN_DB_PREFIX."don";
-        $sql .= " WHERE fk_statut = ".$param;
-        $sql .= " AND entity = ".$conf->entity;
+		$sql = "SELECT sum(amount) as total";
+		$sql .= " FROM ".MAIN_DB_PREFIX."don";
+		$sql .= " WHERE fk_statut = ".$param;
+		$sql .= " AND entity = ".$conf->entity;
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            $result = $obj->total;
-        }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			$result = $obj->total;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Charge indicateurs this->nb pour le tableau de bord
-     *
-     *	@return     int         <0 if KO, >0 if OK
-     */
-    public function load_state_board()
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Charge indicateurs this->nb pour le tableau de bord
+	 *
+	 *	@return     int         <0 if KO, >0 if OK
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
+		global $conf;
 
-        $this->nb = array();
+		$this->nb = array();
 
-        $sql = "SELECT count(d.rowid) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."don as d";
-        $sql .= " WHERE d.fk_statut > 0";
-        $sql .= " AND d.entity IN (".getEntity('donation').")";
+		$sql = "SELECT count(d.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."don as d";
+		$sql .= " WHERE d.fk_statut > 0";
+		$sql .= " AND d.entity IN (".getEntity('donation').")";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $this->nb["donations"] = $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["donations"] = $obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			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	$moretitle					Add more text to title 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, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
-    {
-        global $conf, $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	$moretitle					Add more text to title 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, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
+	{
+		global $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 = '';
-        $label = '<u>'.$langs->trans("Donation").'</u>';
-        if (!empty($this->id)) {
-        	$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
-        }
-        if ($moretitle) $label .= ' - '.$moretitle;
+		$result = '';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Donation").'</u>';
+		if (!empty($this->id)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
+		}
+		if ($moretitle) $label .= ' - '.$moretitle;
 
-        $url = DOL_URL_ROOT.'/don/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/don/card.php?id='.$this->id;
 
-       	$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_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>';
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend = '</a>';
 
-        $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);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $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);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
 
-        return $result;
-    }
+		return $result;
+	}
 
 	/**
 	 * Information on record
@@ -990,9 +960,7 @@ class Don extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1017,8 +985,8 @@ class Don extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'html_cerfafr';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->DON_ADDON_MODEL)) {
 				$modele = $conf->global->DON_ADDON_MODEL;
 			}
@@ -1088,17 +1056,13 @@ class Don extends CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				dol_delete_preview($object);
 				return 1;
-			}
-			else
-			{
+			} else {
 				$outputlangs->charset_output = $sav_charset_output;
 				dol_syslog("Erreur dans don_create");
 				dol_print_error($this->db, $obj->error);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $file);
 			return 0;
 		}
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 64644d18971..e9a38c50bef 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -167,9 +167,7 @@ class PaymentDonation extends CommonObject
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_donation");
 				$this->ref = $this->id;
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 		}
@@ -188,9 +186,7 @@ class PaymentDonation extends CommonObject
             $this->total = $totalamount; // deprecated
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -258,9 +254,7 @@ class PaymentDonation extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -341,9 +335,7 @@ class PaymentDonation extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -411,9 +403,7 @@ class PaymentDonation extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -466,9 +456,7 @@ class PaymentDonation extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -592,9 +580,7 @@ class PaymentDonation extends CommonObject
                         dol_print_error($this->db);
                     }
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -603,9 +589,7 @@ class PaymentDonation extends CommonObject
         if (!$error)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -628,9 +612,7 @@ class PaymentDonation extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index f2994b95577..9265692241d 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -45,7 +45,7 @@ $langs->loadLangs(array("companies", "other", "donations"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
@@ -56,8 +56,8 @@ $result = restrictedArea($user, 'don', $id, '');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -186,9 +186,7 @@ if ($object->id)
     $permtoedit = $user->rights->don->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index d8df1f910fc..030d61d03de 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -246,8 +246,7 @@ if ($resql)
         }
     }
     print "</table><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 print '</div></div></div>';
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index 170c577dc00..8a12e319ef8 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -35,7 +35,7 @@ $langs->load("donations");
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 65ec24b1458..c98f2f8a000 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -96,7 +96,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS
 $sql .= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('donation').")";
 if ($search_status != '' && $search_status != '-4')
 {
-	$sql .= " AND d.fk_statut IN (".$db->escape($search_status).")";
+	$sql .= " AND d.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
 }
 if (trim($search_ref) != '')
 {
@@ -269,8 +269,7 @@ if ($resql)
 				$projectstatic->public = $objp->public;
 				$projectstatic->title = $objp->title;
 				print $projectstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print "</td>\n";
 		}
 		print '<td class="right">'.price($objp->amount).'</td>';
@@ -283,9 +282,7 @@ if ($resql)
     print '</div>';
     print "</form>\n";
     $db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 111ea2399a3..6df77ad2bc1 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array("companies", "bills", "donations"));
 
 $id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index e1784dc4b8b..26f540969ee 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -33,9 +33,9 @@ if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank
 $langs->loadLangs(array("bills", "banks", "companies"));
 
 // Security check
-$id = GETPOST('rowid') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
+$id = GETPOST('rowid') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
-$confirm = GETPOST('confirm');
+$confirm = GETPOST('confirm', 'alpha');
 if ($user->socid) $socid = $user->socid;
 // TODO Add rule to restrict access payment
 //$result = restrictedArea($user, 'facture', $id,'');
@@ -63,9 +63,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supp
         $db->commit();
         header("Location: ".DOL_URL_ROOT."/don/index.php");
         exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -82,28 +80,26 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->don->cree
 	{
 		$db->commit();
 
-		$factures = array(); // TODO Get all id of invoices linked to this payment
-		foreach ($factures as $id)
+		$donations = array(); // TODO Get all id of donation linked to this payment
+		foreach ($donations as $id)
 		{
-			$fac = new Facture($db);
-			$fac->fetch($id);
+			$donation = new Don($db);
+			$donation->fetch($id);
 
 			$outputlangs = $langs;
-			if (!empty($_REQUEST['lang_id']))
+			if (!empty(GETPOST('lang_id')))
 			{
 				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
+				$outputlangs->setDefaultLang(GETPOST('lang_id'));
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->modelpdf, $outputlangs);
+				$donation->generateDocument($donation->model_pdf, $outputlangs);
 			}
 		}
 
 		header('Location: card.php?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -141,8 +137,7 @@ if ($action == 'delete')
  */
 if ($action == 'valide')
 {
-	$facid = GETPOST('facid', 'int');
-	print $form->formconfirm('card.php?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
+	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
 }
 
 
@@ -253,9 +248,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -269,29 +262,14 @@ dol_fiche_end();
  */
 print '<div class="tabsAction">';
 
-/*
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-{
-	if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '')
-	{
-		if ($user->rights->facture->paiement)
-		{
-			print '<a class="butAction" href="card.php?id='.$_GET['id'].'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
-		}
-	}
-}
-*/
-
 if (empty($action))
 {
 	if ($user->rights->don->supprimer)
 	{
 		if (!$disable_delete)
 		{
-			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
+			print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index b3ab7e2d360..3983765d904 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -107,7 +107,7 @@ if ($action == 'add_payment')
     		$payment->amounts      = $amounts; // Tableau de montant
     		$payment->paymenttype  = GETPOST("paymenttype", 'int');
     		$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
-    		$payment->note_public  = GETPOST("note_public", 'none');
+    		$payment->note_public  = GETPOST("note_public", 'restricthtml');
 
     		if (!$error)
     		{
@@ -137,9 +137,7 @@ if ($action == 'add_payment')
                 $loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
                 header('Location: '.$loc);
                 exit;
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
         }
@@ -260,9 +258,7 @@ if ($action == 'create')
 		{
 			$namef = "amount_".$objp->id;
 			print '<input type="text" size="8" name="'.$namef.'">';
-		}
-		else
-		{
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 46b0d93d564..bda437fa6b5 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -75,9 +75,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
@@ -285,8 +283,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index 9f4820cd723..e817f6af4a4 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -28,7 +28,7 @@ if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $element = GETPOST('element', 'alpha');
 
 /*
@@ -114,15 +114,11 @@ if (isset($action) && !empty($action))
 						//print "Yes with id ".$parentdirisindatabase."<br>\n";
 						$fk_parent = $parentdirisindatabase;
 						//break;  // We found parent, we can stop the while loop
-					}
-					else
-					{
+					} else {
 						dol_syslog("No");
 						//print "No<br>\n";
 					}
-				}
-				else
-				{
+				} else {
 					dol_syslog("Parent is root");
 					$fk_parent = 0; // Parent is root
 				}
@@ -148,13 +144,10 @@ if (isset($action) && !empty($action))
 						$sqltree[] = $newdirsql; // We complete fulltree for following loops
 						//var_dump($sqltree);
 						$adirwascreated = 1;
-					}
-					else
-					{
+					} else {
 						dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
 					}
-				}
-				else {
+				} else {
 					$txt = "Parent of ".$dirdesc['fullname']." not found";
 					dol_syslog($txt);
 					//print $txt."<br>\n";
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 3bddd70bfaa..dc39550c0cf 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -25,7 +25,7 @@
 /**
  *  Class to manage ECM directories
  */
-class EcmDirectory // extends CommonObject
+class EcmDirectory extends CommonObject
 {
 	/**
 	 * @var string ID to identify managed object
@@ -35,7 +35,7 @@ class EcmDirectory // extends CommonObject
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	//public $table_element='ecm_directories';
+	public $table_element = 'ecm_directories';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -164,9 +164,7 @@ class EcmDirectory // extends CommonObject
 			$this->error = "ErrorDirAlreadyExists";
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 			return -1;
-		}
-		else
-		{
+		} else {
 			$this->db->begin();
 
 			// Insert request
@@ -207,15 +205,11 @@ class EcmDirectory // extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = "Error ".$this->db->lasterror();
 				$this->db->rollback();
 				return -1;
@@ -273,9 +267,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -302,9 +294,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
-		}
-		else
-		{
+		} else {
 		    if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value;
 		    elseif ($value == '+') $this->cachenbofdoc++;
 		    elseif ($value == '-') $this->cachenbofdoc--;
@@ -331,7 +321,7 @@ class EcmDirectory // extends CommonObject
 		$sql .= " t.fk_user_c,";
 		$sql .= " t.fk_user_m,";
 		$sql .= " t.date_c as date_c,";
-		$sql .= " t.date_m as date_m";
+		$sql .= " t.tms as date_m";
 		$sql .= " FROM ".MAIN_DB_PREFIX."ecm_directories as t";
 		$sql .= " WHERE t.rowid = ".$id;
 
@@ -355,12 +345,14 @@ class EcmDirectory // extends CommonObject
 				$this->date_m = $this->db->jdate($obj->date_m);
 			}
 
+			// Retrieve all extrafields for ecm_files
+			// fetch optionals attributes and labels
+			$this->fetch_optionals();
+
 			$this->db->free($resql);
 
 			return $obj ? 1 : 0;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -398,9 +390,7 @@ class EcmDirectory // extends CommonObject
 			$this->db->rollback();
 			$this->error = "Error ".$this->db->lasterror();
 			return -2;
-		}
-		else
-		{
+		} else {
             // Call trigger
             $result = $this->call_trigger('MYECMDIR_DELETE', $user);
             if ($result < 0)
@@ -417,9 +407,7 @@ class EcmDirectory // extends CommonObject
 			if ($deletedirrecursive)
 			{
 				$result = @dol_delete_dir_recursive($file, 0, 0);
-			}
-			else
-			{
+			} else {
 				$result = @dol_delete_dir($file, 0);
 			}
 		}
@@ -427,9 +415,7 @@ class EcmDirectory // extends CommonObject
 		if ($result || !@is_dir(dol_osencode($file)))
 		{
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorFailToDeleteDir';
 			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
@@ -529,8 +515,7 @@ class EcmDirectory // extends CommonObject
 				$idtosearch = $this->cats[$cursorindex]['id_mere'];
 				$i++;
 			}
-		}
-		while ($cursorindex >= 0 && !empty($idtosearch) && $i < 100); // i avoid infinite loop
+		} while ($cursorindex >= 0 && !empty($idtosearch) && $i < 100); // i avoid infinite loop
 
 		return $ret;
 	}
@@ -564,9 +549,7 @@ class EcmDirectory // extends CommonObject
 				$this->motherof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -672,18 +655,14 @@ class EcmDirectory // extends CommonObject
 						$newelempos = count($this->cats[$obj->rowid]['id_children']);
 						//print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements<br>";
 						$this->cats[$obj->rowid]['id_children'][$newelempos] = $obj->rowid_fille;
-					}
-					else
-					{
+					} else {
 						//print "this->cats[".$obj->rowid."]['id_children'] n'est pas encore un tableau<br>";
 						$this->cats[$obj->rowid]['id_children'] = array($obj->rowid_fille);
 					}
 				}
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -722,9 +701,7 @@ class EcmDirectory // extends CommonObject
             $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
-		{
+		} else {
 			$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
             $this->cats[$id_categ]['fullrelativename'] = $this->cats[$id_categ]['label'];
 			$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
@@ -767,9 +744,7 @@ class EcmDirectory // extends CommonObject
 		if (empty($all))  // By default
 		{
 			$sql .= " WHERE rowid = ".$this->id;
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE entity = ".$conf->entity;
 		}
 
@@ -779,9 +754,7 @@ class EcmDirectory // extends CommonObject
 		{
 			$this->cachenbofdoc = count($filelist);
 			return $this->cachenbofdoc;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -812,9 +785,7 @@ class EcmDirectory // extends CommonObject
             if (!empty($this->errors))
             {
                 $this->errors = array_merge($this->errors, $interface->errors);
-            }
-            else
-            {
+            } else {
                 $this->errors = $interface->errors;
             }
         }
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 85d6d4f0bc2..b0c1df8316f 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -56,9 +56,9 @@ class EcmFiles extends CommonObject
 
 	/**
 	 * hash of file content (md5_file(dol_osencode($destfull))
-     * @var string Ecm Files label
-     */
-    public $label;
+	 * @var string Ecm Files label
+	 */
+	public $label;
 
 	public $share; // hash for file sharing, empty by default (example: getRandomPassword(true))
 
@@ -85,13 +85,13 @@ class EcmFiles extends CommonObject
 	public $date_m = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_c;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_m;
 
 	public $acl;
@@ -126,50 +126,50 @@ class EcmFiles extends CommonObject
 
 		// Clean parameters
 		if (isset($this->ref)) {
-			 $this->ref = trim($this->ref);
+			$this->ref = trim($this->ref);
 		}
 		if (isset($this->label)) {
-			 $this->label = trim($this->label);
+			$this->label = trim($this->label);
 		}
 		if (isset($this->share)) {
-			 $this->share = trim($this->share);
+			$this->share = trim($this->share);
 		}
 		if (isset($this->entity)) {
-			 $this->entity = trim($this->entity);
+			$this->entity = trim($this->entity);
 		}
 		if (isset($this->filename)) {
-			 $this->filename = preg_replace('/\.noexe$/', '', trim($this->filename));
+			$this->filename = preg_replace('/\.noexe$/', '', trim($this->filename));
 		}
 		if (isset($this->filepath)) {
-			 $this->filepath = trim($this->filepath);
-			 $this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath); // Remove last /
+			$this->filepath = trim($this->filepath);
+			$this->filepath = preg_replace('/[\\/]+$/', '', $this->filepath); // Remove last /
 		}
 		if (isset($this->fullpath_orig)) {
-			 $this->fullpath_orig = trim($this->fullpath_orig);
+			$this->fullpath_orig = trim($this->fullpath_orig);
 		}
 		if (isset($this->description)) {
-			 $this->description = trim($this->description);
+			$this->description = trim($this->description);
 		}
 		if (isset($this->keywords)) {
-			 $this->keywords = trim($this->keywords);
+			$this->keywords = trim($this->keywords);
 		}
 		if (isset($this->cover)) {
-			 $this->cover = trim($this->cover);
+			$this->cover = trim($this->cover);
 		}
 		if (isset($this->gen_or_uploaded)) {
-			 $this->gen_or_uploaded = trim($this->gen_or_uploaded);
+			$this->gen_or_uploaded = trim($this->gen_or_uploaded);
 		}
 		if (isset($this->extraparams)) {
-			 $this->extraparams = trim($this->extraparams);
+			$this->extraparams = trim($this->extraparams);
 		}
 		if (isset($this->fk_user_c)) {
-			 $this->fk_user_c = trim($this->fk_user_c);
+			$this->fk_user_c = trim($this->fk_user_c);
 		}
 		if (isset($this->fk_user_m)) {
-			 $this->fk_user_m = trim($this->fk_user_m);
+			$this->fk_user_m = trim($this->fk_user_m);
 		}
 		if (isset($this->acl)) {
-			 $this->acl = trim($this->acl);
+			$this->acl = trim($this->acl);
 		}
 		if (isset($this->src_object_type)) {
 			$this->src_object_type = trim($this->src_object_type);
@@ -182,8 +182,7 @@ class EcmFiles extends CommonObject
 		if (!empty($this->ref))
 		{
 			$ref = $this->ref;
-		}
-		else {
+		} else {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 			$ref = dol_hash($this->filepath.'/'.$this->filename, 3);
 		}
@@ -199,16 +198,12 @@ class EcmFiles extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 				$maxposition = (int) $obj->maxposition;
-			}
-			else
-			{
+			} else {
 				$this->errors[] = 'Error '.$this->db->lasterror();
 				return --$error;
 			}
 			$maxposition = $maxposition + 1;
-		}
-		else
-		{
+		} else {
 			$maxposition = $this->position;
 		}
 
@@ -240,14 +235,14 @@ class EcmFiles extends CommonObject
 		$sql .= 'gen_or_uploaded,';
 		$sql .= 'extraparams,';
 		$sql .= 'date_c,';
-		$sql .= 'date_m,';
+		$sql .= 'tms,';
 		$sql .= 'fk_user_c,';
 		$sql .= 'fk_user_m,';
 		$sql .= 'acl,';
 		$sql .= 'src_object_type,';
 		$sql .= 'src_object_id';
 		$sql .= ') VALUES (';
-		$sql .= " '".$ref."', ";
+		$sql .= " '".$this->db->escape($ref)."', ";
 		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
 		$sql .= ' '.(!isset($this->share) ? 'NULL' : "'".$this->db->escape($this->share)."'").',';
 		$sql .= ' '.$this->entity.',';
@@ -309,7 +304,7 @@ class EcmFiles extends CommonObject
 	 *
 	 * @param  int    $id          	   	Id object
 	 * @param  string $ref         	   	Hash of file name (filename+filepath). Not always defined on some version.
-	 * @param  string $relativepath    	Relative path of file from document directory. Example: path/path2/file
+	 * @param  string $relativepath    	Relative path of file from document directory. Example: 'path/path2/file' or 'path/path2/*'
 	 * @param  string $hashoffile      	Hash of file content. Take the first one found if same file is at different places. This hash will also change if file content is changed.
 	 * @param  string $hashforshare    	Hash of file sharing.
 	 * @param  string $src_object_type 	src_object_type to search
@@ -338,7 +333,7 @@ class EcmFiles extends CommonObject
 		$sql .= " t.gen_or_uploaded,";
 		$sql .= " t.extraparams,";
 		$sql .= " t.date_c,";
-		$sql .= " t.date_m,";
+		$sql .= " t.tms as date_m,";
 		$sql .= " t.fk_user_c,";
 		$sql .= " t.fk_user_m,";
 		$sql .= " t.acl,";
@@ -347,33 +342,32 @@ class EcmFiles extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity because filesystem on disk does not know what is Dolibarr entities
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
-		}*/
+		 if (! empty($conf->multicompany->enabled)) {
+		 $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
+		 }*/
 		if ($relativepath) {
 			$relativepathwithnoexe = preg_replace('/\.noexe$/', '', $relativepath);		// We must never have the .noexe into the database
-			$sql .= " AND t.filepath = '".$this->db->escape(dirname($relativepath))."' AND t.filename = '".$this->db->escape(basename($relativepathwithnoexe))."'";
+			$sql .= " AND t.filepath = '".$this->db->escape(dirname($relativepath))."'";
+			$filename = basename($relativepathwithnoexe);
+			if ($filename != '*') {
+				$sql .= " AND t.filename = '".$this->db->escape($filename)."'";
+			}
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
-		}
-		elseif (!empty($ref)) {		// hash of file path
+		} elseif (!empty($ref)) {		// hash of file path
 			$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
-		}
-		elseif (!empty($hashoffile)) {	// hash of content
+		} elseif (!empty($hashoffile)) {	// hash of content
 			$sql .= " AND t.label = '".$this->db->escape($hashoffile)."'";
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
-		}
-		elseif (!empty($hashforshare)) {
+		} elseif (!empty($hashforshare)) {
 			$sql .= " AND t.share = '".$this->db->escape($hashforshare)."'";
 			//$sql .= " AND t.entity = ".$conf->entity;							// hashforshare already unique
-		}
-		elseif ($src_object_type && $src_object_id)
+		} elseif ($src_object_type && $src_object_id)
 		{
 			// Warning: May return several record, and only first one is returned !
 			$sql .= " AND t.src_object_type ='".$this->db->escape($src_object_type)."' AND t.src_object_id = ".$this->db->escape($src_object_id);
 			$sql .= " AND t.entity = ".$conf->entity;
-		}
-		else {
+		} else {
 			$sql .= ' AND t.rowid = '.$this->db->escape($id); // rowid already unique
 		}
 
@@ -409,9 +403,9 @@ class EcmFiles extends CommonObject
 				$this->src_object_id = $obj->src_object_id;
 			}
 
-			// Retrieve all extrafields for invoice
+			// Retrieve all extrafields for ecm_files
 			// fetch optionals attributes and labels
-			// $this->fetch_optionals();
+			$this->fetch_optionals();
 
 			// $this->fetch_lines();
 
@@ -461,7 +455,7 @@ class EcmFiles extends CommonObject
 		$sql .= " t.gen_or_uploaded,";
 		$sql .= " t.extraparams,";
 		$sql .= " t.date_c,";
-		$sql .= " t.date_m,";
+		$sql .= " t.tms as date_m,";
 		$sql .= " t.fk_user_c,";
 		$sql .= " t.fk_user_m,";
 		$sql .= " t.acl,";
@@ -478,9 +472,9 @@ class EcmFiles extends CommonObject
 		}
 		$sql .= ' WHERE 1 = 1';
 		/* Fetching this table depends on filepath+filename, it must not depends on entity
-		if (! empty($conf->multicompany->enabled)) {
-		    $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
-		}*/
+		 if (! empty($conf->multicompany->enabled)) {
+		 $sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
+		 }*/
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
@@ -618,7 +612,7 @@ class EcmFiles extends CommonObject
 		$sql .= ' gen_or_uploaded = '.(isset($this->gen_or_uploaded) ? "'".$this->db->escape($this->gen_or_uploaded)."'" : "null").',';
 		$sql .= ' extraparams = '.(isset($this->extraparams) ? "'".$this->db->escape($this->extraparams)."'" : "null").',';
 		$sql .= ' date_c = '.(!isset($this->date_c) || dol_strlen($this->date_c) != 0 ? "'".$this->db->idate($this->date_c)."'" : 'null').',';
-		//$sql .= ' date_m = '.(! isset($this->date_m) || dol_strlen($this->date_m) != 0 ? "'".$this->db->idate($this->date_m)."'" : 'null').','; // Field automatically updated
+		//$sql .= ' tms = '.(! isset($this->date_m) || dol_strlen($this->date_m) != 0 ? "'".$this->db->idate($this->date_m)."'" : 'null').','; // Field automatically updated
 		$sql .= ' fk_user_m = '.($this->fk_user_m > 0 ? $this->fk_user_m : $user->id).',';
 		$sql .= ' acl = '.(isset($this->acl) ? "'".$this->db->escape($this->acl)."'" : "null").',';
 		$sql .= ' src_object_id = '.($this->src_object_id > 0 ? $this->src_object_id : "null").',';
@@ -791,8 +785,7 @@ class EcmFiles extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -818,7 +811,7 @@ class EcmFiles extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return the status
 	 *
@@ -828,7 +821,7 @@ class EcmFiles extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 		return '';
 	}
@@ -874,9 +867,9 @@ class EcmFiles extends CommonObject
 class EcmfilesLine
 {
 	/**
-     * @var string ECM files line label
-     */
-    public $label;
+	 * @var string ECM files line label
+	 */
+	public $label;
 
 	/**
 	 * @var int Entity
@@ -901,13 +894,13 @@ class EcmfilesLine
 	public $date_m = '';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_c;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_m;
 
 	public $acl;
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index de9f289eb79..5c84cade8e4 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -69,8 +69,7 @@ class FormEcm
 		{
 			$cat = new EcmDirectory($this->db);
 			$cate_arbo = $cat->get_full_arbo();
-		}
-		elseif ($module == 'medias')
+		} elseif ($module == 'medias')
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			$path = $conf->medias->multidir_output[$conf->entity];
@@ -81,8 +80,7 @@ class FormEcm
 		if (is_array($cate_arbo))
 		{
 			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoDirectoriesFound").'</option>';
-			else
-			{
+			else {
 				$output .= '<option value="-1">&nbsp;</option>';
 				foreach ($cate_arbo as $key => $value)
 				{
@@ -90,9 +88,7 @@ class FormEcm
 					if ($selected && $valueforoption == $selected)
 					{
 						$add = 'selected ';
-					}
-					else
-					{
+					} else {
 						$add = '';
 					}
 					$output .= '<option '.$add.'value="'.dol_escape_htmltag($valueforoption).'">'.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).'</option>';
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index a826c6382ce..a84beb605cb 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -56,8 +56,7 @@ if (empty($urlsection)) $urlsection = 'misc';
 if ($module == 'ecm')
 {
 	$upload_dir = $conf->ecm->dir_output.'/'.$urlsection;
-}
-else	// For example $module == 'medias'
+} else // For example $module == 'medias'
 {
 	$upload_dir = $conf->medias->multidir_output[$conf->entity];
 }
@@ -115,17 +114,15 @@ if ($action == 'add' && $permtoadd)
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager'.($module ? '&module='.$module : ''));
 			exit;
 		}
 	}
 
-	$ref = trim(GETPOST("ref", 'alpha'));
-	$label = trim(GETPOST("label", 'alpha'));
-	$desc = trim(GETPOST("desc", 'alpha'));
+	$ref = GETPOST("ref", 'alpha');
+	$label = GETPOST("label", 'alpha');
+	$desc = GETPOST("desc", 'alpha');
 	$catParent = GETPOST("catParent", 'alpha'); // Can be an int (with ECM) or a string (with generic filemanager)
 	if ($catParent == '-1') $catParent = 0;
 
@@ -155,8 +152,7 @@ if ($action == 'add' && $permtoadd)
 				setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 				$action = 'create';
 			}
-		}
-		else	// For example $module == 'medias'
+		} else // For example $module == 'medias'
 		{
 			$dirfornewdir = '';
 			if ($module == 'medias')
@@ -177,9 +173,7 @@ if ($action == 'add' && $permtoadd)
 				{
 					setEventMessages($langs->trans('ErrorFailToCreateDir', $label), null, 'errors');
 					$error++;
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans("ECMSectionWasCreated", $label), null, 'mesgs');
 				}
 			}
@@ -192,9 +186,7 @@ if ($action == 'add' && $permtoadd)
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/ecm/index.php?action=file_manager');
 			exit;
 		}
@@ -300,10 +292,8 @@ if (empty($action) || $action == 'delete_section')
 	print '<div class="tabsAction">';
 	if ($user->rights->ecm->setup)
 	{
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_section">'.$langs->trans('Delete').'</a>';
-	}
-	else
-	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_section&token='.newToken().'">'.$langs->trans('Delete').'</a>';
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
 	print '</div>';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 9b3da9d8aae..62929c5341f 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by page
 $langs->loadLangs(array('ecm', 'companies', 'other'));
@@ -74,8 +75,7 @@ if ($module == 'ecm')
 
 	$relativepath = $ecmdir->getRelativePath();
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-}
-else	// For example $module == 'medias'
+} else // For example $module == 'medias'
 {
 	$relativepath = $section;
 	$upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
@@ -110,9 +110,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 		if (is_numeric($resupload) && $resupload > 0)
 		{
 			$result = $ecmdir->changeNbOfFiles('+');
-		}
-		else
-		{
+		} else {
    			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
@@ -120,15 +118,12 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
 				// Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-			}
-			else	// Known error
+			} else // Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		// Failed transfer (exceeding the limit file?)
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
@@ -167,20 +162,15 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes')
 			$langs->load('errors');
 			setEventMessages($langs->trans($ecmdir->error, $ecmdir->label), null, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		if ($deletedirrecursive)
 		{
 			$resbool = dol_delete_dir_recursive($upload_dir, 0, 1);
-		}
-		else
-		{
+		} else {
 			$resbool = dol_delete_dir($upload_dir, 1);
 		}
 		if ($resbool) $result = 1;
-		else
-		{
+		else {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFailToDeleteDir", $upload_dir), null, 'errors');
 			$result = 0;
@@ -203,9 +193,7 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		$oldlabel = $ecmdir->label;
 		$olddir = $ecmdir->getRelativePath(0);
 		$olddir = $conf->ecm->dir_output.'/'.$olddir;
-	}
-	else
-	{
+	} else {
 		$olddir = GETPOST('section', 'alpha');
 		$olddir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
 	}
@@ -217,6 +205,16 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		// Fetch was already done
 		$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
 		$ecmdir->description = GETPOST("description");
+		$ret = $extrafields->setOptionalsFromPost(null, $ecmdir);
+		if ($ret < 0) $error++;
+		if (!$error) {
+			// Actions on extra fields
+			$result = $ecmdir->insertExtraFields();
+			if ($result < 0) {
+				setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
+				$error++;
+			}
+		}
 		$result = $ecmdir->update($user);
 		if ($result > 0)
 		{
@@ -242,20 +240,14 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 				// Set new value after renaming
 				$relativepath = $ecmdir->getRelativePath();
 				$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		$newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
 
 		$result = @rename($olddir, $newdir);
@@ -285,6 +277,10 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 $form = new Form($db);
 
 $object = new EcmDirectory($db); // Need to create a new one instance
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
 
 if ($module == 'ecm')
 {
@@ -334,15 +330,12 @@ if ($module == 'ecm')
 		if ($i == 0 && $action == 'edit')
 		{
 			$s = '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$tmpecmdir->label.'">';
-		}
-		else $s = $tmpecmdir->getNomUrl(1).$s;
+		} else $s = $tmpecmdir->getNomUrl(1).$s;
 		if ($tmpecmdir->fk_parent)
 		{
 			$s = ' -> '.$s;
 			$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
-		}
-		else
-		{
+		} else {
 			$tmpecmdir = 0;
 		}
 		$i++;
@@ -365,8 +358,7 @@ if ($module == 'medias')
 				$s .= '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$subdir.'">';
 				$s .= '<input type="hidden" name="oldrelparentdir" value="'.dirname($section).'">';
 				$s .= '<input type="hidden" name="oldreldir" value="'.basename($section).'">';
-			}
-			else $s .= $subdir;
+			} else $s .= $subdir;
 		}
 		if ($i < (count($subdirs) - 1))
 		{
@@ -397,8 +389,7 @@ if ($module == 'ecm')
 		print '<textarea class="flat quatrevingtpercent" name="description">';
 		print $ecmdir->description;
 		print '</textarea>';
-	}
-	else print dol_nl2br($ecmdir->description);
+	} else print dol_nl2br($ecmdir->description);
 	print '</td></tr>';
 
 	print '<tr><td class="titlefield">'.$langs->trans("ECMCreationUser").'</td><td>';
@@ -411,9 +402,7 @@ print '<tr><td class="titlefield">'.$langs->trans("ECMCreationDate").'</td><td>'
 if ($module == 'ecm')
 {
 	print dol_print_date($ecmdir->date_c, 'dayhour');
-}
-else
-{
+} else {
 	//var_dump($upload_dir);
 	print dol_print_date(dol_filemtime($upload_dir), 'dayhour');
 }
@@ -422,9 +411,7 @@ print '<tr><td>'.$langs->trans("ECMDirectoryForFiles").'</td><td>';
 if ($module == 'ecm')
 {
 	print '/ecm/'.$relativepath;
-}
-else
-{
+} else {
 	print '/'.$module.'/'.$relativepath;
 }
 print '</td></tr>';
@@ -443,6 +430,7 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td>';
 print dol_print_size($totalsize);
 print '</td></tr>';
+print $object->showOptionals($extrafields, ($action == 'edit' ? 'edit' : 'view'));
 print '</table>';
 
 if ($action == 'edit')
@@ -477,9 +465,7 @@ if ($action != 'edit' && $action != 'delete')
 	if ($permtoadd)
 	{
 		print '<a class="butAction" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create'.($module ? '&module='.$module : '').'&catParent='.$section.'">'.$langs->trans('ECMAddSection').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
 	}
 
@@ -487,10 +473,8 @@ if ($action != 'edit' && $action != 'delete')
 	//{
 	if ($permtoadd)
 	{
-		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete_dir'.($module ? '&module='.$module : '').'&section='.$section.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
-	}
-	else
-	{
+		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete_dir&token='.newToken().($module ? '&module='.$module : '').'&section='.$section.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
+	} else {
 		print '<a class="butActionDeleteRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 	}
 	/*}
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index e0c9398f9f2..d5a66ca4134 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by page
 $langs->loadLangs(array('ecm', 'companies', 'other', 'users', 'orders', 'propal', 'bills', 'contracts', 'categories'));
@@ -43,8 +44,8 @@ $socid = GETPOST("socid", "int");
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -61,14 +62,14 @@ if (!$sortfield) $sortfield = "label";
 $section = GETPOST("section", 'alpha');
 if (!$section)
 {
-    dol_print_error('', 'Error, section parameter missing');
-    exit;
+	dol_print_error('', 'Error, section parameter missing');
+	exit;
 }
 $urlfile = GETPOST("urlfile");
 if (!$urlfile)
 {
-    dol_print_error('', "ErrorParamNotDefined");
-    exit;
+	dol_print_error('', "ErrorParamNotDefined");
+	exit;
 }
 
 // Load ecm object
@@ -76,8 +77,8 @@ $ecmdir = new EcmDirectory($db);
 $result = $ecmdir->fetch(GETPOST("section", 'alpha'));
 if (!$result > 0)
 {
-    dol_print_error($db, $ecmdir->error);
-    exit;
+	dol_print_error($db, $ecmdir->error);
+	exit;
 }
 $relativepath = $ecmdir->getRelativePath();
 $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
@@ -94,6 +95,10 @@ $filepathtodocument = $relativetodocument.$file->label;
 
 // Try to load object from index
 $object = new ECMFiles($db);
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
 $result = $object->fetch(0, '', $filepathtodocument);
 if ($result < 0)
 {
@@ -109,91 +114,94 @@ if ($result < 0)
 
 if ($cancel)
 {
-    $action = '';
-    if ($backtopage)
-    {
-        header("Location: ".$backtopage);
-        exit;
-    }
-    else
-    {
-    	header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
-        exit;
-    }
+	$action = '';
+	if ($backtopage)
+	{
+		header("Location: ".$backtopage);
+		exit;
+	} else {
+		header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
+		exit;
+	}
 }
 
 // Rename file
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    $oldlabel = GETPOST('urlfile', 'alpha');
-    $newlabel = GETPOST('label', 'alpha');
+	$oldlabel = GETPOST('urlfile', 'alpha');
+	$newlabel = dol_sanitizeFileName(GETPOST('label', 'alpha'));
 	$shareenabled = GETPOST('shareenabled', 'alpha');
 
-    //$db->begin();
+	//$db->begin();
 
-    $olddir = $ecmdir->getRelativePath(0); // Relative to ecm
-    $olddirrelativetodocument = 'ecm/'.$olddir; // Relative to document
-    $newdirrelativetodocument = 'ecm/'.$olddir;
-    $olddir = $conf->ecm->dir_output.'/'.$olddir;
-    $newdir = $olddir;
+	$olddir = $ecmdir->getRelativePath(0); // Relative to ecm
+	$olddirrelativetodocument = 'ecm/'.$olddir; // Relative to document
+	$newdirrelativetodocument = 'ecm/'.$olddir;
+	$olddir = $conf->ecm->dir_output.'/'.$olddir;
+	$newdir = $olddir;
 
-    $oldfile = $olddir.$oldlabel;
-    $newfile = $newdir.$newlabel;
-    $newfileformove = $newfile;
-    // If old file end with .noexe, new file must also end with .noexe
-    if (preg_match('/\.noexe$/', $oldfile) && ! preg_match('/\.noexe$/', $newfileformove)) {
-    	$newfileformove .= '.noexe';
-    }
-    //var_dump($oldfile);var_dump($newfile);exit;
+	$oldfile = $olddir.$oldlabel;
+	$newfile = $newdir.$newlabel;
+	$newfileformove = $newfile;
+	// If old file end with .noexe, new file must also end with .noexe
+	if (preg_match('/\.noexe$/', $oldfile) && ! preg_match('/\.noexe$/', $newfileformove)) {
+		$newfileformove .= '.noexe';
+	}
+	//var_dump($oldfile);var_dump($newfile);exit;
 
-    // Now we update index of file
-    $db->begin();
+	// Now we update index of file
+	$db->begin();
+	//print $oldfile.' - '.$newfile;
+	if ($newlabel != $oldlabel)
+	{
+		$result = dol_move($oldfile, $newfileformove); // This include update of database
+		if (!$result)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans('ErrorFailToRenameFile', $oldfile, $newfile), null, 'errors');
+			$error++;
+		}
 
-    //print $oldfile.' - '.$newfile;
-    if ($newlabel != $oldlabel)
-    {
-    	$result = dol_move($oldfile, $newfileformove); // This include update of database
-        if (!$result)
-        {
-            $langs->load('errors');
-            setEventMessages($langs->trans('ErrorFailToRenameFile', $oldfile, $newfile), null, 'errors');
-            $error++;
-        }
+		// Reload object after the move
+		$result = $object->fetch(0, '', $newdirrelativetodocument.$newlabel);
+		if ($result < 0)
+		{
+			dol_print_error($db, $object->error, $object->errors);
+			exit;
+		}
+	}
 
-        // Reload object after the move
-        $result = $object->fetch(0, '', $newdirrelativetodocument.$newlabel);
-        if ($result < 0)
-        {
-        	dol_print_error($db, $object->error, $object->errors);
-        	exit;
-        }
-    }
-
-    if (!$error)
-    {
+	if (!$error)
+	{
 		if ($shareenabled)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$object->share = getRandomPassword(true);
-		}
-		else
-		{
+		} else {
 			$object->share = '';
 		}
 
 		if ($object->id > 0)
 		{
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) $error++;
+			if (!$error) {
+				// Actions on extra fields
+				$result = $object->insertExtraFields();
+				if ($result < 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
+			}
 			// Call update to set the share key
 			$result = $object->update($user);
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
-		}
-		else
-		{
+		} else {
 			// Call create to insert record
 			$object->entity = $conf->entity;
 			$object->filepath = preg_replace('/[\\/]+$/', '', $newdirrelativetodocument);
@@ -209,25 +217,23 @@ if ($action == 'update')
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
 		}
-    }
+	}
 
-    if (!$error)
-    {
-        $db->commit();
+	if (!$error)
+	{
+		$db->commit();
 
-        $urlfile = $newlabel;
-        // If old file end with .noexe, new file must also end with .noexe
-        if (preg_match('/\.noexe$/', $newfileformove)) {
-        	$urlfile .= '.noexe';
-        }
+		$urlfile = $newlabel;
+		// If old file end with .noexe, new file must also end with .noexe
+		if (preg_match('/\.noexe$/', $newfileformove)) {
+			$urlfile .= '.noexe';
+		}
 
-        header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
-        exit;
-    }
-    else
-    {
-        $db->rollback();
-    }
+		header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
+		exit;
+	} else {
+		$db->rollback();
+	}
 }
 
 
@@ -269,9 +275,7 @@ while ($tmpecmdir && $result > 0)
 	{
 		$s = ' -> '.$s;
 		$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
-	}
-	else
-	{
+	} else {
 		$tmpecmdir = 0;
 	}
 	$i++;
@@ -294,7 +298,7 @@ dol_banner_tab($object, '', $linkback, 0, '', '', $s);
 print '<div class="fichecenter">';
 
 print '<div class="underbanner clearboth"></div>';
-print '<table class="border centpercent">';
+print '<table class="border centpercent tableforfield">';
 print '<tr><td class="titlefield">'.$langs->trans("ECMCreationDate").'</td><td>';
 print dol_print_date(dol_filemtime($fullpath), 'dayhour');
 print '</td></tr>';
@@ -316,9 +320,7 @@ $object->fetch(0, '', $filepathtodocument);
 if (!empty($object->label))
 {
 	print $object->label;
-}
-else
-{
+} else {
 	print img_warning().' '.$langs->trans("FileNotYetIndexedInDatabase");
 }
 print '</td></tr>';
@@ -366,25 +368,20 @@ if (!empty($object->share))
 		if ($action != 'edit') print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 		else print $fulllink;
 		if ($action != 'edit') print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here
-	}
-	else
-	{
+	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
-}
-else
-{
+} else {
 	if ($action != 'edit')
 	{
 		print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
-	}
-	else
-	{
+	} else {
 		print '<input type="checkbox" name="shareenabled"'.($object->share ? ' checked="checked"' : '').' /> ';
 	}
 }
-print '</td></tr>';
-
+print '</td>';
+print '</tr>';
+print $object->showOptionals($extrafields, ($action == 'edit' ? 'edit' : 'view'));
 print '</table>';
 print '</div>';
 
@@ -395,20 +392,20 @@ dol_fiche_end();
 
 if ($action == 'edit')
 {
-    print '<div class="center">';
-    print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
-    print ' &nbsp; &nbsp; ';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; &nbsp; ';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 
 // Confirmation de la suppression d'une ligne categorie
 if ($action == 'delete_file')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
 }
 
 if ($action != 'edit')
@@ -416,14 +413,14 @@ if ($action != 'edit')
 	// Actions buttons
 	print '<div class="tabsAction">';
 
-    if ($user->rights->ecm->setup)
-    {
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
-    }
-    /*
 	if ($user->rights->ecm->setup)
 	{
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_file&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Delete').'</a>';
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
+	}
+	/*
+	if ($user->rights->ecm->setup)
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_file&token='.newToken().'&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Delete').'</a>';
 	}
 	else
 	{
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index c6a47bdfd42..d3ddb99fbdf 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -83,7 +83,7 @@ $error = 0;
 //include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 // Upload file (code similar but different than actions_linkedfiles.inc.php)
-if (GETPOST("sendit", 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
+if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
 	// Define relativepath and upload_dir
     $relativepath = '';
@@ -101,8 +101,7 @@ if (GETPOST("sendit", 'none') && !empty($conf->global->MAIN_UPLOAD_DOC))
 			$error++;
 			if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 				setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 			}
 		}
@@ -128,7 +127,6 @@ if ($action == 'confirm_deletefile')
 
 		$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
 		$file = $upload_dir."/".GETPOST('urlfile', 'alpha');
-
 		$ret = dol_delete_file($file); // This include also the delete from file index in database.
 		if ($ret)
 		{
@@ -136,9 +134,7 @@ if ($action == 'confirm_deletefile')
 			$urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfiletoshow);
 			setEventMessages($langs->trans("FileWasRemoved", $urlfiletoshow), null, 'mesgs');
 			$result = $ecmdir->changeNbOfFiles('-');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile', 'alpha')), null, 'errors');
 		}
 
@@ -159,9 +155,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
@@ -247,15 +241,11 @@ if ($action == 'refreshmanual')
                     //print "Yes with id ".$parentdirisindatabase."<br>\n";
                     $fk_parent = $parentdirisindatabase;
                     //break;  // We found parent, we can stop the while loop
-                }
-                else
-				{
+                } else {
                     dol_syslog("No");
                     //print "No<br>\n";
                 }
-            }
-            else
-            {
+            } else {
                 dol_syslog("Parent is root");
                 $fk_parent = 0; // Parent is root
             }
@@ -281,13 +271,10 @@ if ($action == 'refreshmanual')
                     $sqltree[] = $newdirsql; // We complete fulltree for following loops
                     //var_dump($sqltree);
                     $adirwascreated = 1;
-                }
-                else
-                {
+                } else {
                     dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
                 }
-            }
-            else {
+            } else {
                 $txt = "Parent of ".$dirdesc['fullname']." not found";
                 dol_syslog($txt);
                 //print $txt."<br>\n";
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 39bdc9a1612..e8bf1465fb5 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -102,9 +102,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages('Error '.$langs->trans($ecmdir->error), null, 'errors');
 		$action = "create";
 	}
@@ -127,8 +125,7 @@ if ($action == 'confirm_deletefile')
 	    		exit;
 	    	}
 	    	$relativepath = $ecmdir->getRelativePath();
-    	}
-    	else $relativepath = '';
+    	} 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).
 
@@ -221,15 +218,11 @@ if ($action == 'refreshmanual')
                     //print "Yes with id ".$parentdirisindatabase."<br>\n";
                     $fk_parent = $parentdirisindatabase;
                     //break;  // We found parent, we can stop the while loop
-                }
-                else
-				{
+                } else {
                     dol_syslog("No");
                     //print "No<br>\n";
                 }
-            }
-            else
-            {
+            } else {
                 dol_syslog("Parent is root");
                 $fk_parent = 0; // Parent is root
             }
@@ -255,13 +248,10 @@ if ($action == 'refreshmanual')
                     $sqltree[] = $newdirsql; // We complete fulltree for following loops
                     //var_dump($sqltree);
                     $adirwascreated = 1;
-                }
-                else
-                {
+                } else {
                     dol_syslog("Failed to create directory ".$ecmdirtmp->label, LOG_ERR);
                 }
-            }
-            else {
+            } else {
                 $txt = "Parent of ".$dirdesc['fullname']." not found";
                 dol_syslog($txt);
                 //print $txt."<br>\n";
@@ -325,7 +315,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsByContracts")); }
 	if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
 	if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
-	if (!empty($conf->supplier_proposal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBySupplierProposals")); }
+	if (!empty($conf->supplier_proposal->enabled)) { $langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBySupplierProposals")); }
 	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
 	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
 	if (!empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
@@ -334,6 +324,8 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
 	if (!empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsByExpenseReports")); }
 	if (!empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsByHolidays")); }
 	if (!empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsByBankAccount")); }
+	if (!empty($conf->mrp->enabled)) { $langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsByMO")); }
+	if (!empty($conf->recruitment->enabled)) { $langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsByCandidature")); }
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsByUsers"));
 }
 
@@ -360,7 +352,7 @@ print '<div class="inline-block toolbarbutton centpercent">';
 
 // Toolbar
 $url = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
-print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
+print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
 print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
 print '</a>';
 
@@ -418,9 +410,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 			    print $val['label'];
    			    print '</a>';
-			}
-			else
-			{
+			} else {
 			    print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 			    print $val['label'];
 			    print '</a>';
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index d996f2400ee..8100ff46ba3 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -41,7 +41,7 @@ $user->getrights('ecm');
 
 // Get parameters
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $section = GETPOST('section');
 if (!$section) $section = 0;
 
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 2bc6d6db962..943b7c73fb3 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
 
 
 /**
@@ -35,304 +36,337 @@ require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
  */
 class EmailCollector extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'emailcollector';
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'emailcollector_emailcollector';
-    /**
-     * @var int  Does emailcollector support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     */
-    public $ismultientitymanaged = 1;
-    /**
-     * @var int  Does emailcollector support extrafields ? 0=No, 1=Yes
-     */
-    public $isextrafieldmanaged = 0;
-    /**
-     * @var string String with name of icon for emailcollector. Must be the part after the 'object_' into object_emailcollector.png
-     */
-    public $picto = 'generic';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'emailcollector';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'emailcollector_emailcollector';
+	/**
+	 * @var int  Does emailcollector support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 */
+	public $ismultientitymanaged = 1;
+	/**
+	 * @var int  Does emailcollector support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+	/**
+	 * @var string String with name of icon for emailcollector. Must be the part after the 'object_' into object_emailcollector.png
+	 */
+	public $picto = 'generic';
 
-    /**
-     * @var int    Field with ID of parent key if this field has a parent
-     */
-    public $fk_element = 'fk_emailcollector';
+	/**
+	 * @var int    Field with ID of parent key if this field has a parent
+	 */
+	public $fk_element = 'fk_emailcollector';
 
-    /**
+	/**
 	 * @var array	List of child tables. To test if we can delete object.
-     */
-    protected $childtables = array();
-    /**
-     * @var array	List of child tables. To know object to delete on cascade.
-     */
-    protected $childtablesoncascade = array('emailcollector_emailcollectorfilter', 'emailcollector_emailcollectoraction');
+	 */
+	protected $childtables = array();
+	/**
+	 * @var array	List of child tables. To know object to delete on cascade.
+	 */
+	protected $childtablesoncascade = array('emailcollector_emailcollectorfilter', 'emailcollector_emailcollectoraction');
 
 
-    /**
-     *  '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', 'visible'=>2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1),
-        'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
-        'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1'),
-        'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector'),
-        'description'   => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1),
-        'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com'),
-    	'hostcharset'   => array('type'=>'varchar(16)', 'label'=>'HostCharset', 'visible'=>-1, 'enabled'=>1, 'position'=>91, 'notnull'=>0, 'searchall'=>0, 'comment'=>"IMAP server charset", 'help'=>'Example: "UTF-8" (May be "US-ASCII" with some Office365)'),
-    	'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>101, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
-        'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
-        'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>103, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX'),
-        //'filter' => array('type'=>'text', 'label'=>'Filter', 'visible'=>1, 'enabled'=>1, 'position'=>105),
-        //'actiontodo' => array('type'=>'varchar(255)', 'label'=>'ActionToDo', 'visible'=>1, 'enabled'=>1, 'position'=>106),
-        'target_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxTargetDirectory', 'visible'=>1, 'enabled'=>1, 'position'=>110, 'notnull'=>0, 'help'=>"EmailCollectorTargetDir"),
-        'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>100),
-        'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1,),
-        'codelastresult' => array('type'=>'varchar(16)', 'label'=>'CodeLastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>122, 'notnull'=>-1,),
-        'lastresult' => array('type'=>'varchar(255)', 'label'=>'LastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>123, 'notnull'=>-1,),
-        'datelastok' => array('type'=>'datetime', 'label'=>'DateLastcollectResultOk', 'visible'=>1, 'enabled'=>'$action != "create"', 'position'=>125, 'notnull'=>-1,),
-        'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>0, 'enabled'=>1, 'position'=>61, 'notnull'=>-1,),
-        'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>0, 'enabled'=>1, 'position'=>62, 'notnull'=>-1,),
-        'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-        'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>501, 'notnull'=>1,),
-        //'date_validation' => array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-        'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>510, 'notnull'=>1,),
-        'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>511, 'notnull'=>-1,),
-        //'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-        'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1,),
-        'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Inactive', '1'=>'Active'))
-    );
+	// 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', 'visible'=>2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1),
+		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
+		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1'),
+		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector'),
+		'description'   => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1),
+		'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com'),
+		'hostcharset'   => array('type'=>'varchar(16)', 'label'=>'HostCharset', 'visible'=>-1, 'enabled'=>1, 'position'=>91, 'notnull'=>0, 'searchall'=>0, 'comment'=>"IMAP server charset", 'help'=>'Example: "UTF-8" (May be "US-ASCII" with some Office365)'),
+		'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>101, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
+		'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
+		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>103, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX'),
+		//'filter' => array('type'=>'text', 'label'=>'Filter', 'visible'=>1, 'enabled'=>1, 'position'=>105),
+		//'actiontodo' => array('type'=>'varchar(255)', 'label'=>'ActionToDo', 'visible'=>1, 'enabled'=>1, 'position'=>106),
+		'target_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxTargetDirectory', 'visible'=>1, 'enabled'=>1, 'position'=>110, 'notnull'=>0, 'help'=>"EmailCollectorTargetDir"),
+		'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>100),
+		'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1,),
+		'codelastresult' => array('type'=>'varchar(16)', 'label'=>'CodeLastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>122, 'notnull'=>-1,),
+		'lastresult' => array('type'=>'varchar(255)', 'label'=>'LastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>123, 'notnull'=>-1,),
+		'datelastok' => array('type'=>'datetime', 'label'=>'DateLastcollectResultOk', 'visible'=>1, 'enabled'=>'$action != "create"', 'position'=>125, 'notnull'=>-1,),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>0, 'enabled'=>1, 'position'=>61, 'notnull'=>-1,),
+		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>0, 'enabled'=>1, 'position'=>62, 'notnull'=>-1,),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>501, 'notnull'=>1,),
+		//'date_validation' => array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>510, 'notnull'=>1,),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>511, 'notnull'=>-1,),
+		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1,),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Inactive', '1'=>'Active'))
+	);
 
 
-    /**
-     * @var int ID
-     */
-    public $rowid;
+	/**
+	 * @var int ID
+	 */
+	public $rowid;
 
-    /**
-     * @var string Ref
-     */
-    public $ref;
+	/**
+	 * @var string Ref
+	 */
+	public $ref;
 
-    /**
-     * @var int Entity
-     */
-    public $entity;
+	/**
+	 * @var int Entity
+	 */
+	public $entity;
 
-    /**
-     * @var string label
-     */
-    public $label;
+	/**
+	 * @var string label
+	 */
+	public $label;
 
 
-    /**
-     * @var int Status
-     */
-    public $status;
+	/**
+	 * @var int Status
+	 */
+	public $status;
 
-    /**
-     * @var integer|string date_creation
-     */
-    public $date_creation;
+	/**
+	 * @var integer|string date_creation
+	 */
+	public $date_creation;
 
 
-    public $tms;
+	public $tms;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_creat;
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_creat;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_modif;
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_modif;
 
-    public $import_key;
+	public $import_key;
 
 
-    public $host;
-    public $hostcharset;
-    public $login;
-    public $password;
-    public $source_directory;
-    public $target_directory;
-    public $maxemailpercollect;
+	public $host;
+	public $hostcharset;
+	public $login;
+	public $password;
+	public $source_directory;
+	public $target_directory;
+	public $maxemailpercollect;
 
-    /**
-     * @var integer|string $datelastresult
-     */
-    public $datelastresult;
+	/**
+	 * @var integer|string $datelastresult
+	 */
+	public $datelastresult;
 
 
-    public $lastresult;
-    // END MODULEBUILDER PROPERTIES
+	public $lastresult;
+	// END MODULEBUILDER PROPERTIES
 
-    public $filters;
-    public $actions;
+	public $filters;
+	public $actions;
 
-    public $debuginfo;
+	public $debuginfo;
 
 
-    const STATUS_DISABLED = 0;
-    const STATUS_ENABLED = 1;
+	const STATUS_DISABLED = 0;
+	const STATUS_ENABLED = 1;
 
 
-    /**
-     * 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 (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)
-    {
-        return $this->createCommon($user, $notrigger);
-    }
+	/**
+	 * 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)
+	{
+		$id = $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, $extrafields;
-        $error = 0;
+		if (is_array($this->filters) && count($this->filters)) {
+			$emailcollectorfilter = new EmailCollectorFilter($this->db);
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
+			foreach ($this->filters as $filter) {
+				$emailcollectorfilter->type = $filter['type'];
+				$emailcollectorfilter->rulevalue = $filter['rulevalue'];
+				$emailcollectorfilter->fk_emailcollector = $this->id;
+				$emailcollectorfilter->status = $filter['status'];
 
-        $object = new self($this->db);
+				$emailcollectorfilter->create($user);
+			}
+		}
 
-        $this->db->begin();
+		if (is_array($this->filters) && count($this->filters)) {
+			$emailcollectoroperation = new EmailCollectorAction($this->db);
 
-        // Load source object
-        $object->fetchCommon($fromid);
-        // Reset some properties
-        unset($object->id);
-        unset($object->fk_user_creat);
-        unset($object->import_key);
+			foreach ($this->actions as $operation) {
+				$emailcollectoroperation->type = $operation['type'];
+				$emailcollectoroperation->actionparam = $operation['actionparam'];
+				$emailcollectoroperation->fk_emailcollector = $this->id;
+				$emailcollectoroperation->status = $operation['status'];
+				$emailcollectoroperation->position = $operation['position'];
 
-        // 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]);
-                }
-            }
-        }
+				$emailcollectoroperation->create($user);
+			}
+		}
 
-        // Create clone
-        $object->context['createfromclone'] = 'createfromclone';
-        $result = $object->createCommon($user);
-        if ($result < 0) {
-            $error++;
-            $this->error = $object->error;
-            $this->errors = $object->errors;
-        }
+		return $id;
+	}
 
-        unset($object->context['createfromclone']);
+	/**
+	 * 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, $extrafields;
+		$error = 0;
 
-        // End
-        if (!$error) {
-            $this->db->commit();
-            return $object;
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-    /**
-     * 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;
-    }
+		$object = new self($this->db);
 
-    /**
-     * Load object lines in memory from the database
-     *
-     * @return int         <0 if KO, 0 if not found, >0 if OK
-     */
-    /*
+		$this->db->begin();
+
+		// Load source object
+		$object->fetchCommon($fromid);
+
+		$object->fetchFilters(); // Rules
+		$object->fetchActions(); // Operations
+
+		// 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]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->create($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		unset($object->context['createfromclone']);
+
+		// 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 lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	/*
     public function fetchLines()
     {
         $this->lines=array();
@@ -343,671 +377,678 @@ class EmailCollector extends CommonObject
     }
     */
 
-    /**
-     * Fetch all account and load objects into an array
-     *
-     * @param   User    $user           User
-     * @param   int     $activeOnly     filter if active
-     * @param   string  $sortfield      field for sorting
-     * @param   string  $sortorder      sorting order
-     * @param   int     $limit          sort limit
-     * @param   int     $page           page to start on
-     * @return  array   Array with key => EmailCollector object
-     */
-    public function fetchAll(User $user, $activeOnly = 0, $sortfield = 's.rowid', $sortorder = 'ASC', $limit = 100, $page = 0)
-    {
-        global $langs;
+	/**
+	 * Fetch all account and load objects into an array
+	 *
+	 * @param   User    $user           User
+	 * @param   int     $activeOnly     filter if active
+	 * @param   string  $sortfield      field for sorting
+	 * @param   string  $sortorder      sorting order
+	 * @param   int     $limit          sort limit
+	 * @param   int     $page           page to start on
+	 * @return  array   Array with key => EmailCollector object
+	 */
+	public function fetchAll(User $user, $activeOnly = 0, $sortfield = 's.rowid', $sortorder = 'ASC', $limit = 100, $page = 0)
+	{
+		global $langs;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        $sql = "SELECT s.rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector as s";
-        $sql .= ' WHERE s.entity IN ('.getEntity('emailcollector').')';
-        if ($activeOnly) {
-            $sql .= " AND s.status = 1";
-        }
-        $sql .= $this->db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
+		$sql = "SELECT s.rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector as s";
+		$sql .= ' WHERE s.entity IN ('.getEntity('emailcollector').')';
+		if ($activeOnly) {
+			$sql .= " AND s.status = 1";
+		}
+		$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);
-                $emailcollector_static = new EmailCollector($this->db);
-                if ($emailcollector_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $emailcollector_static;
-                }
-                $i++;
-            }
-        } else {
-            $this->errors[] = 'EmailCollector::fetchAll Error when retrieve emailcollector list';
-            dol_syslog('EmailCollector::fetchAll Error when retrieve emailcollector list', LOG_ERR);
-            $ret = -1;
-        }
-        if (!count($obj_ret)) {
-            dol_syslog('EmailCollector::fetchAll No emailcollector found', 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);
+				$emailcollector_static = new EmailCollector($this->db);
+				if ($emailcollector_static->fetch($obj->rowid)) {
+					$obj_ret[] = $emailcollector_static;
+				}
+				$i++;
+			}
+		} else {
+			$this->errors[] = 'EmailCollector::fetchAll Error when retrieve emailcollector list';
+			dol_syslog('EmailCollector::fetchAll Error when retrieve emailcollector list', LOG_ERR);
+			$ret = -1;
+		}
+		if (!count($obj_ret)) {
+			dol_syslog('EmailCollector::fetchAll No emailcollector found', LOG_DEBUG);
+		}
 
-        return $obj_ret;
-    }
+		return $obj_ret;
+	}
 
-    /**
-     * 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, 1);
-    }
+	/**
+	 * 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, 1);
+	}
 
-    /**
-     *  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 $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', ...)
+	 *  @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 = '<u>'.$langs->trans("EmailCollector").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("EmailCollector").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/admin/emailcollector_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/admin/emailcollector_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("ShowEmailCollector");
-                $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("ShowEmailCollector");
+				$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('emailcollectordao'));
-        $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('emailcollectordao'));
+		$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) || empty($this->labelStatusShort))
-        {
-            global $langs;
-            //$langs->load("mymodule");
-            $this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
-            $this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
-            $this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
-            $this->labelStatusShort[self::STATUS_DISABLED] = $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) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
+		}
 
-        $statusType = 'status5';
-        if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+		$statusType = 'status5';
+		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
 
-        return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
 
-    /**
-     *	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();
+	}
 
-    /**
-     * Fetch filters
-     *
-     * @return 	int		<0 if KO, >0 if OK
-     */
-    public function fetchFilters()
-    {
-        $this->filters = array();
+	/**
+	 * Fetch filters
+	 *
+	 * @return 	int		<0 if KO, >0 if OK
+	 * @see fetchActions()
+	 */
+	public function fetchFilters()
+	{
+		$this->filters = array();
 
-        $sql = 'SELECT rowid, type, rulevalue, status';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'emailcollector_emailcollectorfilter';
-        $sql .= ' WHERE fk_emailcollector = '.$this->id;
-        //$sql.= ' ORDER BY position';
+		$sql = 'SELECT rowid, type, rulevalue, status';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'emailcollector_emailcollectorfilter';
+		$sql .= ' WHERE fk_emailcollector = '.$this->id;
+		//$sql.= ' ORDER BY position';
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-                $this->filters[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'rulevalue'=>$obj->rulevalue, 'status'=>$obj->status);
-                $i++;
-            }
-            $this->db->free($resql);
-        }
-        else dol_print_error($this->db);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$this->filters[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'rulevalue'=>$obj->rulevalue, 'status'=>$obj->status);
+				$i++;
+			}
+			$this->db->free($resql);
+		} else dol_print_error($this->db);
 
-        return 1;
-    }
+		return 1;
+	}
 
-    /**
-     * Fetch actions
-     *
-     * @return 	int		<0 if KO, >0 if OK
-     */
-    public function fetchActions()
-    {
-        $this->actions = array();
+	/**
+	 * Fetch actions
+	 *
+	 * @return 	int		<0 if KO, >0 if OK
+	 * @see fetchFilters()
+	 */
+	public function fetchActions()
+	{
+		$this->actions = array();
 
-        $sql = 'SELECT rowid, type, actionparam, status';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'emailcollector_emailcollectoraction';
-        $sql .= ' WHERE fk_emailcollector = '.$this->id;
-        $sql .= ' ORDER BY position';
+		$sql = 'SELECT rowid, type, actionparam, status';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'emailcollector_emailcollectoraction';
+		$sql .= ' WHERE fk_emailcollector = '.$this->id;
+		$sql .= ' ORDER BY position';
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-                $this->actions[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'actionparam'=>$obj->actionparam, 'status'=>$obj->status);
-                $i++;
-            }
-            $this->db->free($resql);
-        }
-        else dol_print_error($this->db);
-    }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$this->actions[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'actionparam'=>$obj->actionparam, 'status'=>$obj->status);
+				$i++;
+			}
+			$this->db->free($resql);
+		} else dol_print_error($this->db);
+	}
 
 
-    /**
-     * Return the connectstring to use with IMAP connection function
-     *
-     * @param	int		$ssl		Add /ssl tag
-     * @param	int		$norsh		Add /norsh to connectstring
-     * @return string
-     */
-    public function getConnectStringIMAP($ssl = 1, $norsh = 0)
-    {
-    	global $conf;
+	/**
+	 * Return the connectstring to use with IMAP connection function
+	 *
+	 * @param	int		$ssl		Add /ssl tag
+	 * @param	int		$norsh		Add /norsh to connectstring
+	 * @return string
+	 */
+	public function getConnectStringIMAP($ssl = 1, $norsh = 0)
+	{
+		global $conf;
 
-        // Connect to IMAP
-        $flags = '/service=imap'; // IMAP
-        if ($ssl) $flags .= '/ssl'; // '/tls'
-        $flags .= '/novalidate-cert';
-        //$flags.='/readonly';
-        //$flags.='/debug';
-        if ($norsh || !empty($conf->global->IMPA_FORCE_NORSH)) $flags .= '/norsh';
+		// Connect to IMAP
+		$flags = '/service=imap'; // IMAP
+		if ($ssl) $flags .= '/ssl'; // '/tls'
+		$flags .= '/novalidate-cert';
+		//$flags.='/readonly';
+		//$flags.='/debug';
+		if ($norsh || !empty($conf->global->IMPA_FORCE_NORSH)) $flags .= '/norsh';
 
-        $connectstringserver = '{'.$this->host.':993'.$flags.'}';
+		$connectstringserver = '{'.$this->host.':993'.$flags.'}';
 
-        return $connectstringserver;
-    }
+		return $connectstringserver;
+	}
 
-    /**
-     * Convert str to UTF-7 imap default mailbox names
-     *
-     * @param 	string $str			String to encode
-     * @return 	string				Encode string
-     */
-    public function getEncodedUtf7($str)
-    {
-    	if (function_exists('mb_convert_encoding')) {
-	    	// change spaces by entropy because mb_convert fail with spaces
-	    	$str = preg_replace("/ /", "xyxy", $str);
-	    	// if mb_convert work
-	    	if ($str = mb_convert_encoding($str, "UTF-7")) {
-	    		// change characters
-	    		$str = preg_replace("/\+A/", "&A", $str);
-	    		// change to spaces again
-	    		$str = preg_replace("/xyxy/", " ", $str);
-	    		return $str;
-	    	} else {
-	    		// print error and return false
-	    		$this->error = "error: is not possible to encode this string '".$str."'";
-	     		return false;
-	    	}
-    	}
-    	else {
-    		return $str;
-    	}
-    }
+	/**
+	 * Convert str to UTF-7 imap default mailbox names
+	 *
+	 * @param 	string $str			String to encode
+	 * @return 	string				Encode string
+	 */
+	public function getEncodedUtf7($str)
+	{
+		if (function_exists('mb_convert_encoding')) {
+			// change spaces by entropy because mb_convert fail with spaces
+			$str = preg_replace("/ /", "xyxy", $str);
+			// if mb_convert work
+			if ($str = mb_convert_encoding($str, "UTF-7")) {
+				// change characters
+				$str = preg_replace("/\+A/", "&A", $str);
+				// change to spaces again
+				$str = preg_replace("/xyxy/", " ", $str);
+				return $str;
+			} else {
+				// print error and return false
+				$this->error = "error: is not possible to encode this string '".$str."'";
+		 		return false;
+			}
+		} else {
+			return $str;
+		}
+	}
 
-    /**
-     * Action executed by scheduler
-     * CAN BE A CRON TASK. In such a case, paramerts come from the schedule job setup field 'Parameters'
-     *
-     * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-     */
-    public function doCollect()
-    {
-        global $user;
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, paramerts come from the schedule job setup field 'Parameters'
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doCollect()
+	{
+		global $user;
 
-        $nberror = 0;
+		$nberror = 0;
 
-        $arrayofcollectors = $this->fetchAll($user, 1);
+		$arrayofcollectors = $this->fetchAll($user, 1);
 
-        // Loop on each collector
-        foreach ($arrayofcollectors as $emailcollector)
-        {
-            $result = $emailcollector->doCollectOneCollector();
-            dol_syslog("doCollect result = ".$result." for emailcollector->id = ".$emailcollector->id);
+		// Loop on each collector
+		foreach ($arrayofcollectors as $emailcollector)
+		{
+			$result = $emailcollector->doCollectOneCollector();
+			dol_syslog("doCollect result = ".$result." for emailcollector->id = ".$emailcollector->id);
 
-            $this->error .= 'EmailCollector ID '.$emailcollector->id.':'.$emailcollector->error.'<br>';
-            if (!empty($emailcollector->errors)) $this->error .= join('<br>', $emailcollector->errors);
-            $this->output .= 'EmailCollector ID '.$emailcollector->id.': '.$emailcollector->lastresult.'<br>';
-        }
+			$this->error .= 'EmailCollector ID '.$emailcollector->id.':'.$emailcollector->error.'<br>';
+			if (!empty($emailcollector->errors)) $this->error .= join('<br>', $emailcollector->errors);
+			$this->output .= 'EmailCollector ID '.$emailcollector->id.': '.$emailcollector->lastresult.'<br>';
+		}
 
-        return $nberror;
-    }
+		return $nberror;
+	}
 
-    /**
-     * overwitePropertiesOfObject
-     *
-     * @param	object	$object			Current object
-     * @param	string	$actionparam	Action parameters
-     * @param	string	$messagetext	Body
-     * @param	string	$subject		Subject
-     * @param   string  $header         Header
-     * @return	int						0=OK, Nb of error if error
-     */
-    private function overwritePropertiesOfObject(&$object, $actionparam, $messagetext, $subject, $header)
-    {
-        $errorforthisaction = 0;
+	/**
+	 * overwitePropertiesOfObject
+	 *
+	 * @param	object	$object			Current object
+	 * @param	string	$actionparam	Action parameters
+	 * @param	string	$messagetext	Body
+	 * @param	string	$subject		Subject
+	 * @param   string  $header         Header
+	 * @return	int						0=OK, Nb of error if error
+	 */
+	private function overwritePropertiesOfObject(&$object, $actionparam, $messagetext, $subject, $header)
+	{
+		$errorforthisaction = 0;
 
-        // Overwrite values with values extracted from source email
-        // $this->actionparam = 'opportunity_status=123;abc=EXTRACT:BODY:....'
-        $arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '=');
-        foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty)
-        {
-            $tmpclass = ''; $tmpproperty = '';
-            $tmparray = explode('.', $propertytooverwrite);
-            if (count($tmparray) == 2)
-            {
-                $tmpclass = $tmparray[0];
-                $tmpproperty = $tmparray[1];
-            }
-            else
-            {
-                $tmpproperty = $tmparray[0];
-            }
-            if ($tmpclass && ($tmpclass != $object->element)) continue; // Property is for another type of object
+		// Overwrite values with values extracted from source email
+		// $this->actionparam = 'opportunity_status=123;abc=EXTRACT:BODY:....'
+		$arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '=');
+		foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty)
+		{
+			$tmpclass = ''; $tmpproperty = '';
+			$tmparray = explode('.', $propertytooverwrite);
+			if (count($tmparray) == 2)
+			{
+				$tmpclass = $tmparray[0];
+				$tmpproperty = $tmparray[1];
+			} else {
+				$tmpproperty = $tmparray[0];
+			}
+			if ($tmpclass && ($tmpclass != $object->element)) continue; // Property is for another type of object
 
-            //if (property_exists($object, $tmpproperty) || preg_match('/^options_/', $tmpproperty))
-            if ($tmpproperty)
-            {
-                $sourcestring = '';
-                $sourcefield = '';
-                $regexstring = '';
-                //$transformationstring='';
-                $regforregex = array();
-                if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*):([^:])$/', $valueforproperty, $regforregex))
-                {
-                    $sourcefield = $regforregex[1];
-                    $regexstring = $regforregex[2];
-                    //$transofrmationstring=$regforregex[3];
-                }
-                elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
-                {
-                    $sourcefield = $regforregex[1];
-                    $regexstring = $regforregex[2];
-                }
-                if (!empty($sourcefield) && !empty($regexstring))
-                {
-                    if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
-                    elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
-                    elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
+			//if (property_exists($object, $tmpproperty) || preg_match('/^options_/', $tmpproperty))
+			if ($tmpproperty)
+			{
+				$sourcestring = '';
+				$sourcefield = '';
+				$regexstring = '';
+				//$transformationstring='';
+				$regforregex = array();
+				if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*):([^:])$/', $valueforproperty, $regforregex))
+				{
+					$sourcefield = $regforregex[1];
+					$regexstring = $regforregex[2];
+					//$transofrmationstring=$regforregex[3];
+				} elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
+				{
+					$sourcefield = $regforregex[1];
+					$regexstring = $regforregex[2];
+				}
+				if (!empty($sourcefield) && !empty($regexstring))
+				{
+					if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
+					elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
+					elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
 
-                    if ($sourcestring)
-                    {
-                        $regforval = array();
-                        $regexoptions = '';
-                        if (strtolower($sourcefield) == 'body') $regexoptions = 'ms'; // The m means ^ and $ char is valid at each new line. The s means the char '.' is valid for new lines char too
-                        if (strtolower($sourcefield) == 'header') $regexoptions = 'm'; // The m means ^ and $ char is valid at each new line.
+					if ($sourcestring)
+					{
+						$regforval = array();
+						$regexoptions = '';
+						if (strtolower($sourcefield) == 'body') $regexoptions = 'ms'; // The m means ^ and $ char is valid at each new line. The s means the char '.' is valid for new lines char too
+						if (strtolower($sourcefield) == 'header') $regexoptions = 'm'; // The m means ^ and $ char is valid at each new line.
 
-                        //var_dump($tmpproperty.' - '.$regexstring.' - '.$regexoptions.' - '.$sourcestring);
-                        if (preg_match('/'.$regexstring.'/'.$regexoptions, $sourcestring, $regforval))
-                        {
-                            //var_dump($regforval[count($regforval)-1]);exit;
-                            // Overwrite param $tmpproperty
-                            $object->$tmpproperty = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
-                        }
-                        else
-                        {
-                            // Regex not found
-                            $object->$tmpproperty = null;
-                        }
-                    }
-                    else
-                    {
-                        // Nothing can be done for this param
-                        $errorforthisaction++;
-                        $this->error = 'The extract rule to use has on an unknown source (must be HEADER, SUBJECT or BODY)';
-                        $this->errors[] = $this->error;
-                    }
-                }
-                elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex))
-                {
-                    $valuecurrent = '';
-                    if (preg_match('/^options_/', $tmpproperty)) $valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
-                    else $valuecurrent = $object->$tmpproperty;
+						//var_dump($tmpproperty.' - '.$regexstring.' - '.$regexoptions.' - '.$sourcestring);
+						if (preg_match('/'.$regexstring.'/'.$regexoptions, $sourcestring, $regforval))
+						{
+							//var_dump($regforval[count($regforval)-1]);exit;
+							// Overwrite param $tmpproperty
+							$valueextracted = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
+							if (strtolower($sourcefield) == 'header') {
+								$object->$tmpproperty = $this->decodeSMTPSubject($valueextracted);
+							} else {
+								$object->$tmpproperty = $valueextracted;
+							}
+						} else {
+							// Regex not found
+							$object->$tmpproperty = null;
+						}
+					} else {
+						// Nothing can be done for this param
+						$errorforthisaction++;
+						$this->error = 'The extract rule to use has on an unknown source (must be HEADER, SUBJECT or BODY)';
+						$this->errors[] = $this->error;
+					}
+				} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex))
+				{
+					$valuecurrent = '';
+					if (preg_match('/^options_/', $tmpproperty)) $valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
+					else $valuecurrent = $object->$tmpproperty;
 
-                    if ($regforregex[1] == 'SET' || empty($valuecurrent))
-                    {
-                        $valuetouse = $regforregex[2];
-                        $substitutionarray = array();
-                        $matcharray = array();
-                        preg_match_all('/__([a-z0-9]+(?:_[a-z0-9]+)?)__/i', $valuetouse, $matcharray);
-                        //var_dump($tmpproperty.' - '.$object->$tmpproperty.' - '.$valuetouse); var_dump($matcharray);
-                        if (is_array($matcharray[1]))    // $matcharray[1] is array with list of substitution key found without the __
-                        {
-                            foreach ($matcharray[1] as $keytoreplace)
-                            {
-                                if ($keytoreplace && isset($object->$keytoreplace))
-                                {
-                                    $substitutionarray['__'.$keytoreplace.'__'] = $object->$keytoreplace;
-                                }
-                            }
-                        }
-                        //var_dump($substitutionarray);
-                        dol_syslog(var_export($substitutionarray, true));
-                        //var_dump($substitutionarray);
-                        $valuetouse = make_substitutions($valuetouse, $substitutionarray);
-                        if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
-                        else $object->$tmpproperty = $valuetouse;
-                    }
-                }
-                else
-                {
-                    $errorforthisaction++;
-                    $this->error = 'Bad syntax for description of action parameters: '.$actionparam;
-                    $this->errors[] = $this->error;
-                }
-            }
-        }
+					if ($regforregex[1] == 'SET' || empty($valuecurrent))
+					{
+						$valuetouse = $regforregex[2];
+						$substitutionarray = array();
+						$matcharray = array();
+						preg_match_all('/__([a-z0-9]+(?:_[a-z0-9]+)?)__/i', $valuetouse, $matcharray);
+						//var_dump($tmpproperty.' - '.$object->$tmpproperty.' - '.$valuetouse); var_dump($matcharray);
+						if (is_array($matcharray[1]))    // $matcharray[1] is array with list of substitution key found without the __
+						{
+							foreach ($matcharray[1] as $keytoreplace)
+							{
+								if ($keytoreplace && isset($object->$keytoreplace))
+								{
+									$substitutionarray['__'.$keytoreplace.'__'] = $object->$keytoreplace;
+								}
+							}
+						}
+						//var_dump($substitutionarray);
+						dol_syslog(var_export($substitutionarray, true));
+						//var_dump($substitutionarray);
+						$valuetouse = make_substitutions($valuetouse, $substitutionarray);
+						if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
+						else $object->$tmpproperty = $valuetouse;
+					}
+				} else {
+					$errorforthisaction++;
+					$this->error = 'Bad syntax for description of action parameters: '.$actionparam;
+					$this->errors[] = $this->error;
+				}
+			}
+		}
 
-        return $errorforthisaction;
-    }
+		return $errorforthisaction;
+	}
 
-    /**
-     * Execute collect for current collector loaded previously with fetch.
-     *
-     * @return	int			<0 if KO, >0 if OK
-     */
-    public function doCollectOneCollector()
-    {
-        global $conf, $langs, $user;
+	/**
+	 * Execute collect for current collector loaded previously with fetch.
+	 *
+	 * @return	int			<0 if KO, >0 if OK
+	 */
+	public function doCollectOneCollector()
+	{
+		global $conf, $langs, $user;
 
-        //$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
 
-        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-        dol_syslog("EmailCollector::doCollectOneCollector start", LOG_DEBUG);
+		dol_syslog("EmailCollector::doCollectOneCollector start", LOG_DEBUG);
 
-        $langs->loadLangs(array("project", "companies", "mails", "errors", "ticket", "agenda"));
+		$langs->loadLangs(array("project", "companies", "mails", "errors", "ticket", "agenda"));
 
-        $error = 0;
-        $this->output = '';
-        $this->error = '';
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
 
-        $now = dol_now();
+		$now = dol_now();
 
-        if (empty($this->host))
-        {
-            $this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMailHost'));
-            return -1;
-        }
-        if (empty($this->login))
-        {
-        	$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Login'));
-            return -1;
-        }
-        if (empty($this->source_directory))
-        {
-        	$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('MailboxSourceDirectory'));
-            return -1;
-        }
-        if (!function_exists('imap_open'))
-        {
-            $this->error = 'IMAP function not enabled on your PHP';
-            return -2;
-        }
+		if (empty($this->host))
+		{
+			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMailHost'));
+			return -1;
+		}
+		if (empty($this->login))
+		{
+			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Login'));
+			return -1;
+		}
+		if (empty($this->source_directory))
+		{
+			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('MailboxSourceDirectory'));
+			return -1;
+		}
+		if (!function_exists('imap_open'))
+		{
+			$this->error = 'IMAP function not enabled on your PHP';
+			return -2;
+		}
 
-        $this->fetchFilters();
-        $this->fetchActions();
+		$this->fetchFilters();
+		$this->fetchActions();
 
-        $sourcedir = $this->source_directory;
-        $targetdir = ($this->target_directory ? $this->target_directory : ''); // Can be '[Gmail]/Trash' or 'mytag'
+		$sourcedir = $this->source_directory;
+		$targetdir = ($this->target_directory ? $this->target_directory : ''); // Can be '[Gmail]/Trash' or 'mytag'
 
-        $connectstringserver = $this->getConnectStringIMAP();
-        $connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
-        $connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
+		$connectstringserver = $this->getConnectStringIMAP();
+		$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
+		$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
 
-        $connection = imap_open($connectstringsource, $this->login, $this->password);
-        if (!$connection)
-        {
-            $this->error = 'Failed to open IMAP connection '.$connectstringsource;
-            return -3;
-        }
-        imap_errors(); // Clear stack of errors.
+		$connection = imap_open($connectstringsource, $this->login, $this->password);
+		if (!$connection)
+		{
+			$this->error = 'Failed to open IMAP connection '.$connectstringsource;
+			return -3;
+		}
+		imap_errors(); // Clear stack of errors.
 
-        $host = dol_getprefix('email');
+		$host = dol_getprefix('email');
 		//$host = '123456';
 
-        // Define the IMAP search string
-        // See https://tools.ietf.org/html/rfc3501#section-6.4.4 for IMAPv4 (PHP not yet compatible)
-        // See https://tools.ietf.org/html/rfc1064 page 13 for IMAPv2
-        //$search='ALL';
-        $search = 'UNDELETED'; // Seems not supported by some servers
-        $searchhead = '';
-        $searchfilterdoltrackid = 0;
-        $searchfilternodoltrackid = 0;
-        foreach ($this->filters as $rule)
-        {
-            if (empty($rule['status'])) continue;
+		// Define the IMAP search string
+		// See https://tools.ietf.org/html/rfc3501#section-6.4.4 for IMAPv4 (PHP not yet compatible)
+		// See https://tools.ietf.org/html/rfc1064 page 13 for IMAPv2
+		//$search='ALL';
+		$search = 'UNDELETED'; // Seems not supported by some servers
+		$searchhead = '';
+		$searchfilterdoltrackid = 0;
+		$searchfilternodoltrackid = 0;
+		$searchfilterisanswer = 0;
+		$searchfilterisnotanswer = 0;
+		foreach ($this->filters as $rule)
+		{
+			if (empty($rule['status'])) continue;
 
-            if ($rule['type'] == 'to')      $search .= ($search ? ' ' : '').'TO "'.str_replace('"', '', $rule['rulevalue']).'"';
-            if ($rule['type'] == 'bcc')     $search .= ($search ? ' ' : '').'BCC';
-            if ($rule['type'] == 'cc')      $search .= ($search ? ' ' : '').'CC';
-            if ($rule['type'] == 'from')    $search .= ($search ? ' ' : '').'FROM "'.str_replace('"', '', $rule['rulevalue']).'"';
-            if ($rule['type'] == 'subject') $search .= ($search ? ' ' : '').'SUBJECT "'.str_replace('"', '', $rule['rulevalue']).'"';
-            if ($rule['type'] == 'body')    $search .= ($search ? ' ' : '').'BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
-            if ($rule['type'] == 'header')  $search .= ($search ? ' ' : '').'HEADER '.$rule['rulevalue'];
+			if ($rule['type'] == 'to') {
+				$tmprulevaluearray = explode('*', $rule['rulevalue']);
+				if (count($tmprulevaluearray) >= 2) {
+					foreach ($tmprulevaluearray as $tmprulevalue) {
+						$search .= ($search ? ' ' : '').'TO "'.str_replace('"', '', $tmprulevalue).'"';
+					}
+				} else {
+					$search .= ($search ? ' ' : '').'TO "'.str_replace('"', '', $rule['rulevalue']).'"';
+				}
+			}
+			if ($rule['type'] == 'bcc')     $search .= ($search ? ' ' : '').'BCC';
+			if ($rule['type'] == 'cc')      $search .= ($search ? ' ' : '').'CC';
+			if ($rule['type'] == 'from')    $search .= ($search ? ' ' : '').'FROM "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'subject') $search .= ($search ? ' ' : '').'SUBJECT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'body')    $search .= ($search ? ' ' : '').'BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'header')  $search .= ($search ? ' ' : '').'HEADER '.$rule['rulevalue'];
 
-            if ($rule['type'] == 'notinsubject') $search .= ($search ? ' ' : '').'SUBJECT NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
-            if ($rule['type'] == 'notinbody') $search .= ($search ? ' ' : '').'BODY NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'notinsubject') $search .= ($search ? ' ' : '').'SUBJECT NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'notinbody') $search .= ($search ? ' ' : '').'BODY NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
 
-            if ($rule['type'] == 'seen')    $search .= ($search ? ' ' : '').'SEEN';
-            if ($rule['type'] == 'unseen')  $search .= ($search ? ' ' : '').'UNSEEN';
-            if ($rule['type'] == 'unanswered') $search .= ($search ? ' ' : '').'UNANSWERED';
-            if ($rule['type'] == 'answered')   $search .= ($search ? ' ' : '').'ANSWERED';
-            if ($rule['type'] == 'smaller') $search .= ($search ? ' ' : '').'SMALLER "'.str_replace('"', '', $rule['rulevalue']).'"';
-            if ($rule['type'] == 'larger')  $search .= ($search ? ' ' : '').'LARGER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'seen')    $search .= ($search ? ' ' : '').'SEEN';
+			if ($rule['type'] == 'unseen')  $search .= ($search ? ' ' : '').'UNSEEN';
+			if ($rule['type'] == 'unanswered') $search .= ($search ? ' ' : '').'UNANSWERED';
+			if ($rule['type'] == 'answered')   $search .= ($search ? ' ' : '').'ANSWERED';
+			if ($rule['type'] == 'smaller') $search .= ($search ? ' ' : '').'SMALLER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'larger')  $search .= ($search ? ' ' : '').'LARGER "'.str_replace('"', '', $rule['rulevalue']).'"';
 
-            if ($rule['type'] == 'withtrackingid') { $searchfilterdoltrackid++; $searchhead .= '/References.*@'.preg_quote($host, '/').'/'; }
-            if ($rule['type'] == 'withouttrackingid') { $searchfilternodoltrackid++; $searchhead .= '! /References.*@'.preg_quote($host, '/').'/'; }
-        }
+			if ($rule['type'] == 'withtrackingidinmsgid') { $searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/'; }
+			if ($rule['type'] == 'withouttrackingidinmsgid') { $searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/'; }
+			if ($rule['type'] == 'withtrackingid') { $searchfilterdoltrackid++; $searchhead .= '/References.*@'.preg_quote($host, '/').'/'; }
+			if ($rule['type'] == 'withouttrackingid') { $searchfilternodoltrackid++; $searchhead .= '! /References.*@'.preg_quote($host, '/').'/'; }
 
-        if (empty($targetdir))	// Use last date as filter if there is no targetdir defined.
-        {
-            $fromdate = 0;
-            if ($this->datelastok) $fromdate = $this->datelastok;
-            if ($fromdate > 0) $search .= ($search ? ' ' : '').'SINCE '.date('j-M-Y', $fromdate - 1); // SENTSINCE not supported. Date must be X-Abc-9999 (X on 1 digit if < 10)
-            //$search.=($search?' ':'').'SINCE 8-Apr-2018';
-        }
-        dol_syslog("IMAP search string = ".$search);
-        //var_dump($search);
+			if ($rule['type'] == 'isanswer') { $searchfilterisanswer++; $searchhead .= '/References.*@.*/'; }
+			if ($rule['type'] == 'isnotanswer') { $searchfilterisnotanswer++; $searchhead .= '! /References.*@.*/'; }
+		}
 
-        $nbemailprocessed = 0;
-        $nbemailok = 0;
-        $nbactiondone = 0;
-        $charset = ($this->hostcharset ? $this->hostcharset : "UTF-8");
+		if (empty($targetdir))	// Use last date as filter if there is no targetdir defined.
+		{
+			$fromdate = 0;
+			if ($this->datelastok) $fromdate = $this->datelastok;
+			if ($fromdate > 0) $search .= ($search ? ' ' : '').'SINCE '.date('j-M-Y', $fromdate - 1); // SENTSINCE not supported. Date must be X-Abc-9999 (X on 1 digit if < 10)
+			//$search.=($search?' ':'').'SINCE 8-Apr-2018';
+		}
+		dol_syslog("IMAP search string = ".$search);
+		//var_dump($search);
 
-        // Scan IMAP inbox
-        $arrayofemail = imap_search($connection, $search, null, $charset);
-        if ($arrayofemail === false)
-        {
-            // Nothing found or search string not understood
-            $mapoferrrors = imap_errors();
-            if ($mapoferrrors !== false)
-            {
-                $error++;
-                $this->error = "Search string not understood - ".join(',', $mapoferrrors);
-                $this->errors[] = $this->error;
-            }
-        }
+		$nbemailprocessed = 0;
+		$nbemailok = 0;
+		$nbactiondone = 0;
+		$charset = ($this->hostcharset ? $this->hostcharset : "UTF-8");
 
-        // Loop on each email found
-        if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0)
-        {
-            // Loop to get part html and plain
-            /*
+		// Scan IMAP inbox
+		$arrayofemail = imap_search($connection, $search, null, $charset);
+		if ($arrayofemail === false)
+		{
+			// Nothing found or search string not understood
+			$mapoferrrors = imap_errors();
+			if ($mapoferrrors !== false)
+			{
+				$error++;
+				$this->error = "Search string not understood - ".join(',', $mapoferrrors);
+				$this->errors[] = $this->error;
+			}
+		}
+
+		// Loop on each email found
+		if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0)
+		{
+			// Loop to get part html and plain
+			/*
              0 multipart/mixed
              1 multipart/alternative
              1.1 text/plain
@@ -1022,14 +1063,14 @@ class EmailCollector extends CommonObject
              2.2.1 text/plain
              2.2.2 text/html
              */
-            /**
-             * create_part_array
-             *
-             * @param 	Object $structure	Structure
-             * @param 	string $prefix		prefix
-             * @return 	array				Array with number and object
-             */
-            /*function createPartArray($structure, $prefix = "")
+			/**
+			 * create_part_array
+			 *
+			 * @param 	Object $structure	Structure
+			 * @param 	string $prefix		prefix
+			 * @return 	array				Array with number and object
+			 */
+			/*function createPartArray($structure, $prefix = "")
             {
                 //print_r($structure);
                 $part_array=array();
@@ -1043,15 +1084,15 @@ class EmailCollector extends CommonObject
                 return $part_array;
             }*/
 
-            /**
-             * Sub function for createPartArray(). Only called by createPartArray() and itself.
-             *
-             * @param 	Object		$obj			Structure
-             * @param 	string		$partno			Part no
-             * @param 	array		$part_array		array
-             * @return	void
-             */
-            /*function addPartToArray($obj, $partno, &$part_array)
+			/**
+			 * Sub function for createPartArray(). Only called by createPartArray() and itself.
+			 *
+			 * @param 	Object		$obj			Structure
+			 * @param 	string		$partno			Part no
+			 * @param 	array		$part_array		array
+			 * @return	void
+			 */
+			/*function addPartToArray($obj, $partno, &$part_array)
             {
                 $part_array[] = array('part_number' => $partno, 'part_object' => $obj);
                 if ($obj->type == 2) { // Check to see if the part is an attached email message, as in the RFC-822 type
@@ -1079,106 +1120,137 @@ class EmailCollector extends CommonObject
                 }
             }*/
 
-            dol_syslog("Start of loop on email", LOG_INFO, 1);
+			dol_syslog("Start of loop on email", LOG_INFO, 1);
 
-            $i = 0;
-            foreach ($arrayofemail as $imapemail)
-            {
-                if ($nbemailprocessed > 1000)
-                {
-                    break; // Do not process more than 1000 email per launch (this is a different protection than maxnbcollectedpercollect
-                }
+			$iforemailloop = 0;
+			foreach ($arrayofemail as $imapemail)
+			{
+				if ($nbemailprocessed > 1000)
+				{
+					break; // Do not process more than 1000 email per launch (this is a different protection than maxnbcollectedpercollect
+				}
 
-                $i++;
+				$iforemailloop++;
 
-                $header = imap_fetchheader($connection, $imapemail, 0);
-                $header = preg_replace('/\r\n\s+/m', ' ', $header);	// When a header line is on several lines, merge lines
-                $matches = array();
-                preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches);
-                $headers = array_combine($matches[1], $matches[2]);
-                //var_dump($headers);
+				$header = imap_fetchheader($connection, $imapemail, 0);
+				$header = preg_replace('/\r\n\s+/m', ' ', $header); // When a header line is on several lines, merge lines
+				/*print $header;
+                print $header;*/
 
-                dol_syslog("** Process email ".$i." References: ".$headers['References']);
+				$matches = array();
+				preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches);
+				$headers = array_combine($matches[1], $matches[2]);
 
-                // If there is a filter on trackid
-                if ($searchfilterdoltrackid > 0)
-                {
-                    if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))
-                    {
-                        $nbemailprocessed++;
-                        continue;
-                    }
-                }
-                if ($searchfilternodoltrackid > 0)
-                {
-                    if (!empty($headers['References']) && preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))
-                    {
-                        $nbemailprocessed++;
-                        continue;
-                    }
-                }
+				if (!empty($headers['in-reply-to']) && empty($headers['In-Reply-To'])) { $headers['In-Reply-To'] = $headers['in-reply-to']; }
+				if (!empty($headers['references']) && empty($headers['References'])) { $headers['References'] = $headers['references']; }
+				if (!empty($headers['message-id']) && empty($headers['Message-ID'])) { $headers['Message-ID'] = $headers['message-id']; }
 
-                $thirdpartystatic = new Societe($this->db);
-                $contactstatic = new Contact($this->db);
-                $projectstatic = new Project($this->db);
-
-                $nbactiondoneforemail = 0;
-                $errorforemail = 0;
-                $errorforactions = 0;
-                $thirdpartyfoundby = '';
-                $contactfoundby = '';
-                $projectfoundby = '';
-
-                $this->db->begin();
+				$headers['Subject'] = $this->decodeSMTPSubject($headers['Subject']);
 
 
-                // GET Email meta datas
-                $overview = imap_fetch_overview($connection, $imapemail, 0);
+				dol_syslog("** Process email ".$iforemailloop." References: ".$headers['References']);
+				//print "Process mail ".$iforemailloop." Subject: ".dol_escape_htmltag($headers['Subject'])." References: ".dol_escape_htmltag($headers['References'])." In-Reply-To: ".dol_escape_htmltag($headers['In-Reply-To'])."<br>\n";
 
-                dol_syslog("msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." subject=".$overview[0]->subject);
+				// If there is a filter on trackid
+				if ($searchfilterdoltrackid > 0)
+				{
+					if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))
+					{
+						$nbemailprocessed++;
+						continue; // Exclude email
+					}
+				}
+				if ($searchfilternodoltrackid > 0)
+				{
+					if (!empty($headers['References']) && preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))
+					{
+						$nbemailprocessed++;
+						continue; // Exclude email
+					}
+				}
 
-                // Decode $overview[0]->subject according to RFC2047
-                // Can use also imap_mime_header_decode($str)
-                // Can use also mb_decode_mimeheader($str)
-                // Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
-                if (function_exists('iconv_mime_decode')) {
-                	$overview[0]->subject = iconv_mime_decode($overview[0]->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
-                }
-                elseif (function_exists('imap_mime_header_decode')) {
-                	$elements = imap_mime_header_decode($overview[0]->subject);
-                	$newstring = '';
-                	if (!empty($elements)) {
-                        $num = count($elements);
-	                	for ($i = 0; $i < $num; $i++) {
-	                		$newstring .= ($newstring ? ' ' : '').$elements[$i]->text;
-	                	}
-	                	$overview[0]->subject = $newstring;
-                	}
-                }
-                elseif (function_exists('mb_decode_mimeheader')) {
-                	$overview[0]->subject = mb_decode_mimeheader($overview[0]->subject);
-                }
-                // Removed emojis
-                $overview[0]->subject = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $overview[0]->subject);
+				if ($searchfilterisanswer > 0) {
+					if (empty($headers['In-Reply-To']))
+					{
+						$nbemailprocessed++;
+						continue; // Exclude email
+					}
+					// Note: we can have
+					// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
+					$isanswer = 0;
+					if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) $isanswer = 1;
+					//if ($headers['In-Reply-To'] != $headers['Message-ID'] && empty($headers['References'])) $isanswer = 1;	// If in-reply-to differs of message-id, this is a reply
+					//if ($headers['In-Reply-To'] != $headers['Message-ID'] && !empty($headers['References']) && strpos($headers['References'], $headers['Message-ID']) !== false) $isanswer = 1;
 
-                // Parse IMAP email structure
-                global $htmlmsg, $plainmsg, $charset, $attachments;
-                $this->getmsg($connection, $imapemail);
+					if (!$isanswer) {
+						$nbemailprocessed++;
+						continue; // Exclude email
+					}
+				}
+				if ($searchfilterisnotanswer > 0) {
+					if (!empty($headers['In-Reply-To']))
+					{
+						// Note: we can have
+						// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
+						$isanswer = 0;
+						if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) $isanswer = 1;
+						//if ($headers['In-Reply-To'] != $headers['Message-ID'] && empty($headers['References'])) $isanswer = 1;	// If in-reply-to differs of message-id, this is a reply
+						//if ($headers['In-Reply-To'] != $headers['Message-ID'] && !empty($headers['References']) && strpos($headers['References'], $headers['Message-ID']) !== false) $isanswer = 1;
+						if ($isanswer) {
+							$nbemailprocessed++;
+							continue; // Exclude email
+						}
+					}
+				}
 
-                //$htmlmsg,$plainmsg,$charset,$attachments
-                $messagetext = $plainmsg ? $plainmsg : dol_string_nohtmltag($htmlmsg, 0);
-                // Removed emojis
-                $messagetext = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $messagetext);
+				//print "Process mail ".$iforemailloop." Subject: ".dol_escape_htmltag($headers['Subject'])." selected<br>\n";
 
-                /*var_dump($plainmsg);
+				$thirdpartystatic = new Societe($this->db);
+				$contactstatic = new Contact($this->db);
+				$projectstatic = new Project($this->db);
+
+				$nbactiondoneforemail = 0;
+				$errorforemail = 0;
+				$errorforactions = 0;
+				$thirdpartyfoundby = '';
+				$contactfoundby = '';
+				$projectfoundby = '';
+				$ticketfoundby = '';
+				$candidaturefoundby = '';
+
+				$this->db->begin();
+
+
+				// GET Email meta datas
+				$overview = imap_fetch_overview($connection, $imapemail, 0);
+
+				dol_syslog("msgid=".$overview[0]->message_id." date=".dol_print_date($overview[0]->udate, 'dayrfc', 'gmt')." from=".$overview[0]->from." to=".$overview[0]->to." subject=".$overview[0]->subject);
+
+				$overview[0]->subject = $this->decodeSMTPSubject($overview[0]->subject);
+
+				$overview[0]->from = $this->decodeSMTPSubject($overview[0]->from);
+
+				// Removed emojis
+				$overview[0]->subject = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $overview[0]->subject);
+
+				// Parse IMAP email structure
+				global $htmlmsg, $plainmsg, $charset, $attachments;
+				$this->getmsg($connection, $imapemail);
+
+				//$htmlmsg,$plainmsg,$charset,$attachments
+				$messagetext = $plainmsg ? $plainmsg : dol_string_nohtmltag($htmlmsg, 0);
+				// Removed emojis
+				$messagetext = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $messagetext);
+
+				/*var_dump($plainmsg);
                 var_dump($htmlmsg);
                 var_dump($messagetext);*/
-                /*var_dump($charset);
+				/*var_dump($charset);
                 var_dump($attachments);
                 exit;*/
 
-                // Parse IMAP email structure
-                /*
+				// Parse IMAP email structure
+				/*
                 $structure = imap_fetchstructure($connection, $imapemail, 0);
 
                 $partplain = $parthtml = -1;
@@ -1217,609 +1289,796 @@ class EmailCollector extends CommonObject
                 $messagetext = imap_fetchbody($connection, $imapemail, ($parthtml != '-1' ? $parthtml : ($partplain != '-1' ? $partplain : 1)), FT_PEEK);
                 */
 
-                //var_dump($messagetext);
-                //var_dump($structure->parts[0]->parts);
-                //print $header;
-                //print $messagetext;
-                //exit;
+				//var_dump($messagetext);
+				//var_dump($structure->parts[0]->parts);
+				//print $header;
+				//print $messagetext;
+				//exit;
 
-                $fromstring = $overview[0]->from;
-                $sender = $overview[0]->sender;
-                $to = $overview[0]->to;
-                $sendtocc = $overview[0]->cc;
-                $sendtobcc = $overview[0]->bcc;
-                $date = $overview[0]->udate;
-                $msgid = str_replace(array('<', '>'), '', $overview[0]->message_id);
-                $subject = $overview[0]->subject;
-                //var_dump($msgid);exit;
+				$fromstring = $overview[0]->from;
 
-                $reg = array();
-                if (preg_match('/^(.*)<(.*)>$/', $fromstring, $reg))
-                {
-                    $from = $reg[2];
-                    $fromtext = $reg[1];
-                }
-                else
-                {
-                    $from = $fromstring;
-                    $fromtext = '';
-                }
-                $fk_element_id = 0; $fk_element_type = '';
+				$sender = $overview[0]->sender;
+				$to = $overview[0]->to;
+				$sendtocc = $overview[0]->cc;
+				$sendtobcc = $overview[0]->bcc;
+				$date = $overview[0]->udate;
+				$msgid = str_replace(array('<', '>'), '', $overview[0]->message_id);
+				$subject = $overview[0]->subject;
+				//var_dump($msgid);exit;
 
-                $contactid = 0; $thirdpartyid = 0; $projectid = 0;
-
-                // Analyze TrackId in field References. For example:
-                // References: <1542377954.SMTPs-dolibarr-thi649@8f6014fde11ec6cdec9a822234fc557e>
-                // References: <1542377954.SMTPs-dolibarr-tic649@8f6014fde11ec6cdec9a822234fc557e>
-                // References: <1542377954.SMTPs-dolibarr-abc649@8f6014fde11ec6cdec9a822234fc557e>
-                $trackid = '';
-                $objectid = 0;
-                $objectemail = null;
-
-                $reg = array();
-                if (!empty($headers['References']) && preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $headers['References'], $reg))
-                {
-                    $trackid = $reg[1].$reg[2];
-
-                    if ($reg[1] == 'inv')
-                    {
-                        $objectid = $reg[2];
-                        $objectemail = new Facture($this->db);
-                    }
-                    if ($reg[1] == 'proj')
-                    {
-                        $objectid = $reg[2];
-                        $objectemail = new Project($this->db);
-                    }
-                    if ($reg[1] == 'con')
-                    {
-                        $objectid = $reg[2];
-                        $objectemail = new Contact($this->db);
-                    }
-                    if ($reg[1] == 'thi')
-                    {
-                        $objectid = $reg[2];
-                        $objectemail = new Societe($this->db);
-                    }
-                    if ($reg[1] == 'use')
-                    {
-                        $objectid = $reg[2];
-                        $objectemail = new User($this->db);
-                    }
-                    if ($reg[1] == 'tic')
-                    {
-                        $objectid = $reg[2];
-                        $objectemail = new Ticket($this->db);
-                    }
-
-                    if (is_object($objectemail))
-                    {
-                        $result = $objectemail->fetch($objectid);
-                        if ($result > 0)
-                        {
-                            $fk_element_id = $objectemail->id;
-                            $fk_element_type = $objectemail->element;
-                            // Fix fk_element_type
-                            if ($fk_element_type == 'facture') $fk_element_type = 'invoice';
-
-                            $thirdpartyid = $objectemail->fk_soc;
-                            $contactid = $objectemail->fk_socpeople;
-                            $projectid = isset($objectemail->fk_project) ? $objectemail->fk_project : $objectemail->fk_projet;
-                        }
-                    }
-
-                    // Project
-                    if ($projectid > 0)
-                    {
-                        $result = $projectstatic->fetch($projectid);
-                        if ($result <= 0) $projectstatic->id = 0;
-                        else
-                        {
-                            $projectid = $projectstatic->id;
-                            $projectfoundby = 'trackid ('.$trackid.')';
-                            if (empty($contactid)) $contactid = $projectstatic->fk_contact;
-                            if (empty($thirdpartyid)) $thirdpartyid = $projectstatic->fk_soc;
-                        }
-                    }
-                    // Contact
-                    if ($contactid > 0)
-                    {
-                        $result = $contactstatic->fetch($contactid);
-                        if ($result <= 0) $contactstatic->id = 0;
-                        else
-                        {
-                            $contactid = $contactstatic->id;
-                            $contactfoundby = 'trackid ('.$trackid.')';
-                            if (empty($thirdpartyid)) $thirdpartyid = $contactstatic->fk_soc;
-                        }
-                    }
-                    // Thirdparty
-                    if ($thirdpartyid > 0)
-                    {
-                        $result = $thirdpartystatic->fetch($thirdpartyid);
-                        if ($result <= 0) $thirdpartystatic->id = 0;
-                        else
-                        {
-                            $thirdpartyid = $thirdpartystatic->id;
-                            $thirdpartyfoundby = 'trackid ('.$trackid.')';
-                        }
-                    }
-                }
-
-                if (empty($contactid))		// Try to find contact using email
-                {
-                    $result = $contactstatic->fetch(0, null, '', $from);
-
-                    if ($result > 0)
-                    {
-                        $contactid = $contactstatic->id;
-                        $contactfoundby = 'email of contact ('.$from.')';
-	                    if ($contactstatic->socid > 0)
-                        {
-	                        $result = $thirdpartystatic->fetch($contactstatic->socid);
-                            if ($result > 0)
-                            {
-                                $thirdpartyid = $thirdpartystatic->id;
-                                $thirdpartyfoundby = 'email of contact ('.$from.')';
-                            }
-                        }
-                    }
-                }
-
-                if (empty($thirdpartyid))		// Try to find thirdparty using email
-                {
-                    $result = $thirdpartystatic->fetch(0, '', '', '', '', '', '', '', '', '', $from);
-                    if ($result > 0) $thirdpartyfoundby = 'email ('.$from.')';
-                }
-
-                // Do operations
-                foreach ($this->actions as $operation)
-                {
-                    if ($errorforactions) break;
-                    if (empty($operation['status'])) continue;
-
-                    // Make Operation
-                    dol_syslog("Execute action ".$operation['type']." actionparam=".$operation['actionparam'].' thirdpartystatic->id='.$thirdpartystatic->id.' contactstatic->id='.$contactstatic->id.' projectstatic->id='.$projectstatic->id);
-
-                    $actioncode = 'EMAIL_IN';
-                    // If we scan the Sent box, we use the code for out email
-                    if ($this->source_directory == 'Sent') $actioncode = 'EMAIL_OUT';
-
-                    $description = $descriptiontitle = $descriptionmeta = $descriptionfull = '';
-                    if (in_array($operation['type'], array('recordevent', 'project', 'ticket')))
-                    {
-                        if ($operation['type'] == 'project') $descriptiontitle = $langs->trans("ProjectCreatedByEmailCollector", $msgid);
-                        elseif ($operation['type'] == 'ticket') $descriptiontitle = $langs->trans("TicketCreatedByEmailCollector", $msgid);
-                        else $descriptiontitle = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
-
-                        $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTopic").' : '.dol_escape_htmltag($subject));
-                        $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailFrom").($langs->trans("MailFrom") != 'From' ? ' (From)' : '').' : '.dol_escape_htmltag($fromstring));
-                        if ($sender) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("Sender").($langs->trans("Sender") != 'Sender' ? ' (Sender)' : '').' : '.dol_escape_htmltag($sender));
-                        $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTo").($langs->trans("MailTo") != 'To' ? ' (To)' : '').' : '.dol_escape_htmltag($to));
-                        if ($sendtocc) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailCC").($langs->trans("MailCC") != 'CC' ? ' (CC)' : '').' : '.dol_escape_htmltag($sendtocc));
-                        //if ($bcc) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("Bcc").' : '.dol_escape_htmltag($bcc));
-                    }
-
-                    // Search and create thirdparty
-                    if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty')
-                    {
-                        if (empty($operation['actionparam']))
-                        {
-                            $errorforactions++;
-                            $this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to extract data";
-                            $this->errors[] = $this->error;
-                        }
-                        else
-                        {
-                            $actionparam = $operation['actionparam'];
-                            $nametouseforthirdparty = '';
-
-                            // $this->actionparam = 'SET:aaa' or 'EXTRACT:BODY:....'
-                            $arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '=');
-                            foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty)
-                            {
-                                $sourcestring = '';
-                                $sourcefield = '';
-                                $regexstring = '';
-                                $regforregex = array();
-
-                                if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
-                                {
-                                    $sourcefield = $regforregex[1];
-                                    $regexstring = $regforregex[2];
-                                }
-
-                                if (!empty($sourcefield) && !empty($regexstring))
-                                {
-                                    if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
-                                    elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
-                                    elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
-
-                                    if ($sourcestring)
-                                    {
-                                        $regforval = array();
-                                        //var_dump($regexstring);var_dump($sourcestring);
-                                        if (preg_match('/'.$regexstring.'/ms', $sourcestring, $regforval))
-                                        {
-                                            //var_dump($regforval[count($regforval)-1]);exit;
-                                            // Overwrite param $tmpproperty
-                                            $nametouseforthirdparty = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
-                                        }
-                                        else
-                                        {
-                                            // Regex not found
-                                            $nametouseforthirdparty = null;
-                                        }
-                                        //var_dump($object->$tmpproperty);exit;
-                                    }
-                                    else
-                                    {
-                                        // Nothing can be done for this param
-                                        $errorforactions++;
-                                        $this->error = 'The extract rule to use to load thirdparty has on an unknown source (must be HEADER, SUBJECT or BODY)';
-                                        $this->errors[] = $this->error;
-                                    }
-                                }
-                                elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg))
-                                {
-                                    //if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $reg[1];
-                                    //else $object->$tmpproperty = $reg[1];
-                                    $nametouseforthirdparty = $reg[2];
-                                }
-                                else
-                                {
-                                    $errorforactions++;
-                                    $this->error = 'Bad syntax for description of action parameters: '.$actionparam;
-                                    $this->errors[] = $this->error;
-                                    break;
-                                }
-                            }
-
-                            if (!$errorforactions && $nametouseforthirdparty)
-                            {
-                                $result = $thirdpartystatic->fetch(0, $nametouseforthirdparty);
-                                if ($result < 0)
-                                {
-                                    $errorforactions++;
-                                    $this->error = 'Error when getting thirdparty with name '.$nametouseforthirdparty.' (may be 2 record exists with same name ?)';
-                                    $this->errors[] = $this->error;
-                                    break;
-                                }
-                                elseif ($result == 0)
-                                {
-                                    if ($operation['type'] == 'loadthirdparty')
-                                    {
-                                        dol_syslog("Third party with name ".$nametouseforthirdparty." was not found");
-
-                                        $errorforactions++;
-                                        $this->error = 'ErrorFailedToLoadThirdParty';
-                                        $this->errors[] = 'ErrorFailedToLoadThirdParty';
-                                    }
-                                    elseif ($operation['type'] == 'loadandcreatethirdparty')
-                                    {
-                                        dol_syslog("Third party with name ".$nametouseforthirdparty." was not found. We try to create it.");
-
-                                        // Create thirdparty
-                                        $thirdpartystatic->name = $nametouseforthirdparty;
-                                        if ($fromtext != $nametouseforthirdparty) $thirdpartystatic->name_alias = $fromtext;
-                                        $thirdpartystatic->email = $from;
-
-                                        // Overwrite values with values extracted from source email
-                                        $errorforthisaction = $this->overwritePropertiesOfObject($thirdpartystatic, $operation['actionparam'], $messagetext, $subject, $header);
-
-                                        if ($errorforthisaction)
-                                        {
-                                            $errorforactions++;
-                                        }
-                                        else
-                                        {
-                                            $result = $thirdpartystatic->create($user);
-                                            if ($result <= 0)
-                                            {
-                                                $errorforactions++;
-                                                $this->error = $thirdpartystatic->error;
-                                                $this->errors = $thirdpartystatic->errors;
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    // Create event
-                    elseif ($operation['type'] == 'recordevent')
-                    {
-                    	$alreadycreated = 0;
-                    	// TODO Check if $msg ID already in database for $conf->entity
+				$reg = array();
+				if (preg_match('/^(.*)<(.*)>$/', $fromstring, $reg))
+				{
+					$from = $reg[2];
+					$fromtext = $reg[1];
+				} else {
+					$from = $fromstring;
+					$fromtext = '';
+				}
+				$fk_element_id = 0; $fk_element_type = '';
 
 
-                    	if (!$alreadycreated)
-                    	{
-	                        if ($projectstatic->id > 0)
-	                        {
-	                            if ($projectfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
-	                        }
-	                        if ($thirdpartystatic->id > 0)
-	                        {
-	                            if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
-	                        }
-	                        if ($contactstatic->id > 0)
-	                        {
-	                            if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
-	                        }
+				$contactid = 0; $thirdpartyid = 0; $projectid = 0; $ticketid = 0;
 
-	                        $description = $descriptiontitle;
-	                        $description = dol_concatdesc($description, "-----");
-	                        $description = dol_concatdesc($description, $descriptionmeta);
-	                        $description = dol_concatdesc($description, "-----");
-	                        $description = dol_concatdesc($description, $messagetext);
+				// Analyze TrackId in field References. For example:
+				// References: <1542377954.SMTPs-dolibarr-thi649@8f6014fde11ec6cdec9a822234fc557e>
+				// References: <1542377954.SMTPs-dolibarr-tic649@8f6014fde11ec6cdec9a822234fc557e>
+				// References: <1542377954.SMTPs-dolibarr-abc649@8f6014fde11ec6cdec9a822234fc557e>
+				$trackid = '';
+				$objectid = 0;
+				$objectemail = null;
 
-	                        $descriptionfull = $description;
-	                        $descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
-	                        $descriptionfull = dol_concatdesc($descriptionfull, $header);
+				$reg = array();
+				if (!empty($headers['References']))
+				{
+					$arrayofreferences = preg_split('/(,|\s+)/', $headers['References']);
+					//var_dump($headers['References']);
+					//var_dump($arrayofreferences);
 
-	                        // Insert record of emails sent
-	                        $actioncomm = new ActionComm($this->db);
-	                        $actioncomm->type_code   = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-	                        $actioncomm->code        = 'AC_'.$actioncode;
-	                        $actioncomm->label       = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
-	                        $actioncomm->note_private = $descriptionfull;
-	                        $actioncomm->fk_project  = $projectstatic->id;
-	                        $actioncomm->datep       = $date;
-	                        $actioncomm->datef       = $date;
-	                        $actioncomm->percentage  = -1; // Not applicable
-	                        $actioncomm->socid       = $thirdpartystatic->id;
-	                        $actioncomm->contactid   = $contactstatic->id;
-		                    $actioncomm->socpeopleassigned = (!empty($contactstatic->id) ? array($contactstatic->id => '') : array());
-	                        $actioncomm->authorid    = $user->id; // User saving action
-	                        $actioncomm->userownerid = $user->id; // Owner of action
-	                        // Fields when action is an email (content should be added into note)
-	                        $actioncomm->email_msgid = $msgid;
-	                        $actioncomm->email_from  = $fromstring;
-	                        $actioncomm->email_sender = $sender;
-	                        $actioncomm->email_to    = $to;
-	                        $actioncomm->email_tocc  = $sendtocc;
-	                        $actioncomm->email_tobcc = $sendtobcc;
-	                        $actioncomm->email_subject = $subject;
-	                        $actioncomm->errors_to   = '';
+					foreach ($arrayofreferences as $reference) {
+						//print "Process mail ".$iforemailloop." email_msgid ".$msgid.", date ".dol_print_date($date, 'dayhour').", subject ".$subject.", reference ".dol_escape_htmltag($reference)."<br>\n";
+						if (preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg)) {
+							// This is a Dolibarr reference
+							$trackid = $reg[1].$reg[2];
 
-	                        if (!in_array($fk_element_type, array('societe', 'contact', 'project', 'user')))
-	                        {
-	                            $actioncomm->fk_element  = $fk_element_id;
-	                            $actioncomm->elementtype = $fk_element_type;
-	                        }
+							$objectid = $reg[2];
+							if ($reg[1] == 'inv')
+							{
+								$objectemail = new Facture($this->db);
+							}
+							if ($reg[1] == 'proj')
+							{
+								$objectemail = new Project($this->db);
+							}
+							if ($reg[1] == 'con')
+							{
+								$objectemail = new Contact($this->db);
+							}
+							if ($reg[1] == 'thi')
+							{
+								$objectemail = new Societe($this->db);
+							}
+							if ($reg[1] == 'use')
+							{
+								$objectemail = new User($this->db);
+							}
+							if ($reg[1] == 'tic')
+							{
+								$objectemail = new Ticket($this->db);
+							}
+							if ($reg[1] == 'recruitmentcandidature')
+							{
+								$objectemail = new RecruitmentCandidature($this->db);
+							}
+						} elseif (preg_match('/<(.*@.*)>/', $reference, $reg)) {
+							// This is an external reference, we check if we have it in our database
+							if (!is_object($objectemail)) {
+								$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."ticket where email_msgid = '".$this->db->escape($reg[1])."'";
+								$resql = $this->db->query($sql);
+								if ($resql) {
+									$obj = $this->db->fetch_object($resql);
+									if ($obj) {
+										$objectid = $obj->rowid;
+										$objectemail = new Ticket($this->db);
+										$ticketfoundby = $langs->transnoentitiesnoconv("EmailMsgID").' ('.$reg[1].')';
+									}
+								} else {
+									$errorforemail++;
+								}
+							}
 
-	                        //$actioncomm->extraparams = $extraparams;
+							if (!is_object($objectemail)) {
+								$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."projet where email_msgid = '".$this->db->escape($reg[1])."'";
+								$resql = $this->db->query($sql);
+								if ($resql) {
+									$obj = $this->db->fetch_object($resql);
+									if ($obj) {
+										$objectid = $obj->rowid;
+										$objectemail = new Project($this->db);
+										$projectfoundby = $langs->transnoentitiesnoconv("EmailMsgID").' ('.$reg[1].')';
+									}
+								} else {
+									$errorforemail++;
+								}
+							}
 
-	                        // Overwrite values with values extracted from source email
-	                        $errorforthisaction = $this->overwritePropertiesOfObject($actioncomm, $operation['actionparam'], $messagetext, $subject, $header);
+							if (!is_object($objectemail)) {
+								$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature where email_msgid = '".$this->db->escape($reg[1])."'";
+								$resql = $this->db->query($sql);
+								if ($resql) {
+									$obj = $this->db->fetch_object($resql);
+									if ($obj) {
+										$objectid = $obj->rowid;
+										$objectemail = new RecruitmentCandidature($this->db);
+										$candidaturefoundby = $langs->transnoentitiesnoconv("EmailMsgID").' ('.$reg[1].')';
+									}
+								} else {
+									$errorforemail++;
+								}
+							}
+						}
 
-	                        if ($errorforthisaction)
-	                        {
-	                            $errorforactions++;
-	                        }
-	                        else
-	                        {
-	                            $result = $actioncomm->create($user);
-	                            if ($result <= 0)
-	                            {
-	                                $errorforactions++;
-	                                $this->errors = $actioncomm->errors;
-	                            }
-	                        }
-                    	}
-                    }
-                    // Create event
-                    elseif ($operation['type'] == 'project')
-                    {
-                        $projecttocreate = new Project($this->db);
-                        if ($thirdpartystatic->id > 0)
-                        {
-                            $projecttocreate->socid = $thirdpartystatic->id;
-                            if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
-                        }
-                        if ($contactstatic->id > 0)
-                        {
-                            $projecttocreate->contact_id = $contactstatic->id;
-                            if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
-                        }
+						// Load object linked to email
+						if (is_object($objectemail))
+						{
+							$result = $objectemail->fetch($objectid);
+							if ($result > 0)
+							{
+								$fk_element_id = $objectemail->id;
+								$fk_element_type = $objectemail->element;
+								// Fix fk_element_type
+								if ($fk_element_type == 'facture') $fk_element_type = 'invoice';
 
-                        $description = $descriptiontitle;
-                        $description = dol_concatdesc($description, "-----");
-                        $description = dol_concatdesc($description, $descriptionmeta);
-                        $description = dol_concatdesc($description, "-----");
-                        $description = dol_concatdesc($description, $messagetext);
+								if (get_class($objectemail) != 'Societe') $thirdpartyid = $objectemail->fk_soc;
+								else $thirdpartyid = $objectemail->id;
 
-                        $descriptionfull = $description;
-                        $descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
-                        $descriptionfull = dol_concatdesc($descriptionfull, $header);
+								if (get_class($objectemail) != 'Contact') $contactid = $objectemail->fk_socpeople;
+								else $contactid = $objectemail->id;
 
-                        $id_opp_status = dol_getIdFromCode($this->db, 'PROSP', 'c_lead_status', 'code', 'rowid');
-                        $percent_opp_status = dol_getIdFromCode($this->db, 'PROSP', 'c_lead_status', 'code', 'percent');
+								if (get_class($objectemail) != 'Project') $projectid = isset($objectemail->fk_project) ? $objectemail->fk_project : $objectemail->fk_projet;
+								else $projectid = $objectemail->id;
+							}
+						}
 
-                        $projecttocreate->title = $subject;
-                        $projecttocreate->date_start = $date;
-                        $projecttocreate->date_end = '';
-                        $projecttocreate->opp_status = $id_opp_status;
-                        $projecttocreate->opp_percent = $percent_opp_status;
-                        $projecttocreate->description = dol_concatdesc(dolGetFirstLineOfText(dol_string_nohtmltag($description, 2), 10), '...'.$langs->transnoentities("SeePrivateNote").'...');
-                        $projecttocreate->note_private = $descriptionfull;
-                        $projecttocreate->entity = $conf->entity;
+						// Project
+						if ($projectid > 0)
+						{
+							$result = $projectstatic->fetch($projectid);
+							if ($result <= 0) $projectstatic->id = 0;
+							else {
+								$projectid = $projectstatic->id;
+								if ($trackid) $projectfoundby = 'trackid ('.$trackid.')';
+								if (empty($contactid)) $contactid = $projectstatic->fk_contact;
+								if (empty($thirdpartyid)) $thirdpartyid = $projectstatic->fk_soc;
+							}
+						}
+						// Contact
+						if ($contactid > 0)
+						{
+							$result = $contactstatic->fetch($contactid);
+							if ($result <= 0) $contactstatic->id = 0;
+							else {
+								$contactid = $contactstatic->id;
+								if ($trackid) $contactfoundby = 'trackid ('.$trackid.')';
+								if (empty($thirdpartyid)) $thirdpartyid = $contactstatic->fk_soc;
+							}
+						}
+						// Thirdparty
+						if ($thirdpartyid > 0)
+						{
+							$result = $thirdpartystatic->fetch($thirdpartyid);
+							if ($result <= 0) $thirdpartystatic->id = 0;
+							else {
+								$thirdpartyid = $thirdpartystatic->id;
+								if ($trackid) $thirdpartyfoundby = 'trackid ('.$trackid.')';
+							}
+						}
 
-                        // Overwrite values with values extracted from source email.
-                        // This may overwrite any $projecttocreate->xxx properties.
-                        $savesocid = $projecttocreate->socid;
-                        $errorforthisaction = $this->overwritePropertiesOfObject($projecttocreate, $operation['actionparam'], $messagetext, $subject, $header);
+						if (is_object($objectemail))
+						{
+							break; // Exit loop of references. We already found an accurate reference
+						}
+					}
+				}
 
-                        // Set project ref if not yet defined
-                        if (empty($projecttocreate->ref))
-                        {
-                            // Get next project Ref
-                            $defaultref = '';
-                            $modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
+				if (empty($contactid))		// Try to find contact using email
+				{
+					$result = $contactstatic->fetch(0, null, '', $from);
 
-                            // Search template files
-                            $file = ''; $classname = ''; $filefound = 0; $reldir = '';
-                            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-                            foreach ($dirmodels as $reldir)
-                            {
-                                $file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
-                                if (file_exists($file))
-                                {
-                                    $filefound = 1;
-                                    $classname = $modele;
-                                    break;
-                                }
-                            }
+					if ($result > 0)
+					{
+						$contactid = $contactstatic->id;
+						$contactfoundby = 'email of contact ('.$from.')';
+						if (empty($thirdpartyid) && $contactstatic->socid > 0)
+						{
+							$result = $thirdpartystatic->fetch($contactstatic->socid);
+							if ($result > 0)
+							{
+								$thirdpartyid = $thirdpartystatic->id;
+								$thirdpartyfoundby = 'email of contact ('.$from.')';
+							}
+						}
+					}
+				}
 
-                            if ($filefound)
-                            {
-                                $result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
-                                $modProject = new $classname;
+				if (empty($thirdpartyid))		// Try to find thirdparty using email
+				{
+					$result = $thirdpartystatic->fetch(0, '', '', '', '', '', '', '', '', '', $from);
+					if ($result > 0) $thirdpartyfoundby = 'email ('.$from.')';
+				}
 
-                                if ($savesocid > 0)
-                                {
-                                    if ($savesocid != $projecttocreate->socid)
-                                    {
-                                        $errorforactions++;
-                                        setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$projecttocreate->socid.') by setting socid in operation with a different value', null, 'errors');
-                                    }
-                                }
-                                else {
-                                    if ($projecttocreate->socid > 0)
-                                    {
-                                        $thirdpartystatic->fetch($projecttocreate->socid);
-                                    }
-                                }
+				// Do operations
+				foreach ($this->actions as $operation)
+				{
+					$errorforthisaction = 0;
 
-                                $defaultref = $modProject->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $projecttocreate);
-                            }
-                            $projecttocreate->ref = $defaultref;
-                        }
+					if ($errorforactions) break;
+					if (empty($operation['status'])) continue;
 
-                        if ($errorforthisaction)
-                        {
-                            $errorforactions++;
-                        }
-                        else
-                        {
-                            if (empty($projecttocreate->ref) || (is_numeric($projecttocreate->ref) && $projecttocreate->ref <= 0))
-                            {
-                                $errorforactions++;
-                                $this->error = 'Failed to create project: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
-                            }
-                            else
-                            {
-                                // Create project
-                                $result = $projecttocreate->create($user);
-                                if ($result <= 0)
-                                {
-                                    $errorforactions++;
-                                    $this->error = 'Failed to create project: '.$langs->trans($projecttocreate->error);
-                                    $this->errors = $projecttocreate->errors;
-                                }
-                            }
-                        }
-                    }
-                    // Create event
-                    elseif ($operation['type'] == 'ticket')
-                    {
-                        $tickettocreate = new Ticket($this->db);
-                        if ($thirdpartystatic->id > 0)
-                        {
-                            $tickettocreate->socid = $thirdpartystatic->id;
-                            if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
-                        }
-                        if ($contactstatic->id > 0)
-                        {
-                            $tickettocreate->contact_id = $contactstatic->id;
-                            if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
-                        }
+					// Make Operation
+					dol_syslog("Execute action ".$operation['type']." actionparam=".$operation['actionparam'].' thirdpartystatic->id='.$thirdpartystatic->id.' contactstatic->id='.$contactstatic->id.' projectstatic->id='.$projectstatic->id);
+					dol_syslog("Execute action fk_element_id=".$fk_element_id." fk_element_type=".$fk_element_type);
 
-                        $description = $descriptiontitle;
-                        $description = dol_concatdesc($description, "-----");
-                        $description = dol_concatdesc($description, $descriptionmeta);
-                        $description = dol_concatdesc($description, "-----");
-                        $description = dol_concatdesc($description, $messagetext);
+					$actioncode = 'EMAIL_IN';
+					// If we scan the Sent box, we use the code for out email
+					if ($this->source_directory == 'Sent') $actioncode = 'EMAIL_OUT';
 
-                        $descriptionfull = $description;
-                        $descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
-                        $descriptionfull = dol_concatdesc($descriptionfull, $header);
+					$description = $descriptiontitle = $descriptionmeta = $descriptionfull = '';
 
-                        $tickettocreate->subject = $subject;
-                        $tickettocreate->message = $description;
-                        $tickettocreate->type_code = 0;
-                        $tickettocreate->category_code = 0;
-                        $tickettocreate->severity_code = 0;
-                        $tickettocreate->origin_email = $from;
-                        $tickettocreate->fk_user_create = $user->id;
-                        $tickettocreate->datec = $date;
-                        $tickettocreate->fk_project = $projectstatic->id;
-                        $tickettocreate->fk_soc = $thirdpartystatic->id;
-                        $tickettocreate->notify_tiers_at_create = 0;
-                        $tickettocreate->note_private = $descriptionfull;
-                        $tickettocreate->entity = $conf->entity;
-                        //$tickettocreate->fk_contact = $contactstatic->id;
+					$descriptiontitle = $langs->trans("RecordCreatedByEmailCollector", $this->ref, $msgid);
 
-                        // Overwrite values with values extracted from source email.
-                        // This may overwrite any $projecttocreate->xxx properties.
-                        $savesocid = $tickettocreate->socid;
-                        $errorforthisaction = $this->overwritePropertiesOfObject($tickettocreate, $operation['actionparam'], $messagetext, $subject, $header);
+					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTopic").' : '.dol_escape_htmltag($subject));
+					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailFrom").($langs->trans("MailFrom") != 'From' ? ' (From)' : '').' : '.dol_escape_htmltag($fromstring));
+					if ($sender) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("Sender").($langs->trans("Sender") != 'Sender' ? ' (Sender)' : '').' : '.dol_escape_htmltag($sender));
+					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTo").($langs->trans("MailTo") != 'To' ? ' (To)' : '').' : '.dol_escape_htmltag($to));
+					if ($sendtocc) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailCC").($langs->trans("MailCC") != 'CC' ? ' (CC)' : '').' : '.dol_escape_htmltag($sendtocc));
 
-                        // Set ticket ref if not yet defined
-                        if (empty($tickettocreate->ref))
-                        {
-                            // Get next project Ref
-                            $defaultref = '';
-                            $modele = empty($conf->global->TICKET_ADDON) ? 'mod_ticket_simple' : $conf->global->TICKET_ADDON;
+					// Search and create thirdparty
+					if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty')
+					{
+						if (empty($operation['actionparam']))
+						{
+							$errorforactions++;
+							$this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to extract data";
+							$this->errors[] = $this->error;
+						} else {
+							$actionparam = $operation['actionparam'];
+							$nametouseforthirdparty = '';
 
-                            // Search template files
-                            $file = ''; $classname = ''; $filefound = 0; $reldir = '';
-                            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-                            foreach ($dirmodels as $reldir)
-                            {
-                                $file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
-                                if (file_exists($file))
-                                {
-                                    $filefound = 1;
-                                    $classname = $modele;
-                                    break;
-                                }
-                            }
+							// $this->actionparam = 'SET:aaa' or 'EXTRACT:BODY:....'
+							$arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '=');
+							foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty)
+							{
+								$sourcestring = '';
+								$sourcefield = '';
+								$regexstring = '';
+								$regforregex = array();
 
-                            if ($filefound)
-                            {
-                                $result = dol_include_once($reldir."core/modules/ticket/".$modele.'.php');
-                                $modTicket = new $classname;
+								if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
+								{
+									$sourcefield = $regforregex[1];
+									$regexstring = $regforregex[2];
+								}
 
-                                if ($savesocid > 0)
-                                {
-                                    if ($savesocid != $tickettocreate->socid)
-                                    {
-                                        $errorforactions++;
-                                        setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$tickettocreate->socid.') by setting socid in operation with a different value', null, 'errors');
-                                    }
-                                }
-                                else {
-                                    if ($tickettocreate->socid > 0)
-                                    {
-                                        $thirdpartystatic->fetch($tickettocreate->socid);
-                                    }
-                                }
+								if (!empty($sourcefield) && !empty($regexstring))
+								{
+									if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
+									elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
+									elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
 
-                                $defaultref = $modTicket->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $tickettocreate);
-                            }
-                            $tickettocreate->ref = $defaultref;
-                        }
-						 // Create event specific on hook
-						// this code action is hook..... for support this call
-						elseif (substr($operation['type'], 0, 4) == 'hook') {
-							global $hookmanager;
+									if ($sourcestring)
+									{
+										$regforval = array();
+										//var_dump($regexstring);var_dump($sourcestring);
+										if (preg_match('/'.$regexstring.'/ms', $sourcestring, $regforval))
+										{
+											//var_dump($regforval[count($regforval)-1]);exit;
+											// Overwrite param $tmpproperty
+											$nametouseforthirdparty = isset($regforval[count($regforval) - 1]) ? trim($regforval[count($regforval) - 1]) : null;
+										} else {
+											// Regex not found
+											$nametouseforthirdparty = null;
+										}
+										//var_dump($object->$tmpproperty);exit;
+									} else {
+										// Nothing can be done for this param
+										$errorforactions++;
+										$this->error = 'The extract rule to use to load thirdparty has on an unknown source (must be HEADER, SUBJECT or BODY)';
+										$this->errors[] = $this->error;
+									}
+								} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg))
+								{
+									//if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $reg[1];
+									//else $object->$tmpproperty = $reg[1];
+									$nametouseforthirdparty = $reg[2];
+								} else {
+									$errorforactions++;
+									$this->error = 'Bad syntax for description of action parameters: '.$actionparam;
+									$this->errors[] = $this->error;
+									break;
+								}
+							}
 
-							if (!is_object($hookmanager))
+							if (!$errorforactions && $nametouseforthirdparty)
+							{
+								$result = $thirdpartystatic->fetch(0, $nametouseforthirdparty);
+								if ($result < 0)
+								{
+									$errorforactions++;
+									$this->error = 'Error when getting thirdparty with name '.$nametouseforthirdparty.' (may be 2 record exists with same name ?)';
+									$this->errors[] = $this->error;
+									break;
+								} elseif ($result == 0)
+								{
+									if ($operation['type'] == 'loadthirdparty')
+									{
+										dol_syslog("Third party with name ".$nametouseforthirdparty." was not found");
+
+										$errorforactions++;
+										$this->error = 'ErrorFailedToLoadThirdParty';
+										$this->errors[] = 'ErrorFailedToLoadThirdParty';
+									} elseif ($operation['type'] == 'loadandcreatethirdparty')
+									{
+										dol_syslog("Third party with name ".$nametouseforthirdparty." was not found. We try to create it.");
+
+										// Create thirdparty
+										$thirdpartystatic->name = $nametouseforthirdparty;
+										if ($fromtext != $nametouseforthirdparty) $thirdpartystatic->name_alias = $fromtext;
+										$thirdpartystatic->email = $from;
+
+										// Overwrite values with values extracted from source email
+										$errorforthisaction = $this->overwritePropertiesOfObject($thirdpartystatic, $operation['actionparam'], $messagetext, $subject, $header);
+
+										if ($errorforthisaction)
+										{
+											$errorforactions++;
+										} else {
+											$result = $thirdpartystatic->create($user);
+											if ($result <= 0)
+											{
+												$errorforactions++;
+												$this->error = $thirdpartystatic->error;
+												$this->errors = $thirdpartystatic->errors;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+					// Create event
+					elseif ($operation['type'] == 'recordevent')
+					{
+						$actioncomm = new ActionComm($this->db);
+
+						$alreadycreated = $actioncomm->fetch(0, '', '', $msgid);
+						if ($alreadycreated == 0)
+						{
+							if ($projectstatic->id > 0)
+							{
+								if ($projectfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
+							}
+							if ($thirdpartystatic->id > 0)
+							{
+								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+							}
+							if ($contactstatic->id > 0)
+							{
+								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+							}
+
+							$description = $descriptiontitle;
+							$description = dol_concatdesc($description, "-----");
+							$description = dol_concatdesc($description, $descriptionmeta);
+							$description = dol_concatdesc($description, "-----");
+							$description = dol_concatdesc($description, $messagetext);
+
+							$descriptionfull = $description;
+							if (empty($conf->global->MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER)) {
+								$descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
+								$descriptionfull = dol_concatdesc($descriptionfull, $header);
+							}
+
+							// Insert record of emails sent
+							$actioncomm->type_code   = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+							$actioncomm->code        = 'AC_'.$actioncode;
+							$actioncomm->label       = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
+							$actioncomm->note_private = $descriptionfull;
+							$actioncomm->fk_project  = $projectstatic->id;
+							$actioncomm->datep       = $date;
+							$actioncomm->datef       = $date;
+							$actioncomm->percentage  = -1; // Not applicable
+							$actioncomm->socid       = $thirdpartystatic->id;
+							$actioncomm->contact_id = $contactstatic->id;
+							$actioncomm->socpeopleassigned = (!empty($contactstatic->id) ? array($contactstatic->id => '') : array());
+							$actioncomm->authorid    = $user->id; // User saving action
+							$actioncomm->userownerid = $user->id; // Owner of action
+							// Fields when action is an email (content should be added into note)
+							$actioncomm->email_msgid = $msgid;
+							$actioncomm->email_from  = $fromstring;
+							$actioncomm->email_sender = $sender;
+							$actioncomm->email_to    = $to;
+							$actioncomm->email_tocc  = $sendtocc;
+							$actioncomm->email_tobcc = $sendtobcc;
+							$actioncomm->email_subject = $subject;
+							$actioncomm->errors_to   = '';
+
+							if (!in_array($fk_element_type, array('societe', 'contact', 'project', 'user')))
+							{
+								$actioncomm->fk_element  = $fk_element_id;
+								$actioncomm->elementid = $fk_element_id;
+								$actioncomm->elementtype = $fk_element_type;
+								if (is_object($objectemail) && $objectemail->module) {
+									$actioncomm->elementtype .= '@'.$objectemail->module;
+								}
+							}
+
+							//$actioncomm->extraparams = $extraparams;
+
+							// Overwrite values with values extracted from source email
+							$errorforthisaction = $this->overwritePropertiesOfObject($actioncomm, $operation['actionparam'], $messagetext, $subject, $header);
+
+							/*var_dump($fk_element_id);
+	                        var_dump($fk_element_type);
+	                        var_dump($alreadycreated);
+	                        var_dump($operation['type']);
+	                        var_dump($actioncomm);
+	                        exit;*/
+
+							if ($errorforthisaction)
+							{
+								$errorforactions++;
+							} else {
+								$result = $actioncomm->create($user);
+								if ($result <= 0)
+								{
+									$errorforactions++;
+									$this->errors = $actioncomm->errors;
+								}
+							}
+						}
+					}
+					// Create project / lead
+					elseif ($operation['type'] == 'project')
+					{
+						$projecttocreate = new Project($this->db);
+
+						$alreadycreated = $projecttocreate->fetch(0, '', '', $msgid);
+						if ($alreadycreated == 0)
+						{
+							if ($thirdpartystatic->id > 0)
+							{
+								$projecttocreate->socid = $thirdpartystatic->id;
+								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+							}
+							if ($contactstatic->id > 0)
+							{
+								$projecttocreate->contact_id = $contactstatic->id;
+								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+							}
+
+							$description = $descriptiontitle;
+							$description = dol_concatdesc($description, "-----");
+							$description = dol_concatdesc($description, $descriptionmeta);
+							$description = dol_concatdesc($description, "-----");
+							$description = dol_concatdesc($description, $messagetext);
+
+							$descriptionfull = $description;
+							if (empty($conf->global->MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER)) {
+								$descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
+								$descriptionfull = dol_concatdesc($descriptionfull, $header);
+							}
+
+							$id_opp_status = dol_getIdFromCode($this->db, 'PROSP', 'c_lead_status', 'code', 'rowid');
+							$percent_opp_status = dol_getIdFromCode($this->db, 'PROSP', 'c_lead_status', 'code', 'percent');
+
+							$projecttocreate->title = $subject;
+							$projecttocreate->date_start = $date;
+							$projecttocreate->date_end = '';
+							$projecttocreate->opp_status = $id_opp_status;
+							$projecttocreate->opp_percent = $percent_opp_status;
+							$projecttocreate->description = dol_concatdesc(dolGetFirstLineOfText(dol_string_nohtmltag($description, 2), 10), '...'.$langs->transnoentities("SeePrivateNote").'...');
+							$projecttocreate->note_private = $descriptionfull;
+							$projecttocreate->entity = $conf->entity;
+							$projecttocreate->email_msgid = $msgid;
+
+							$savesocid = $projecttocreate->socid;
+
+							// Overwrite values with values extracted from source email.
+							// This may overwrite any $projecttocreate->xxx properties.
+							$errorforthisaction = $this->overwritePropertiesOfObject($projecttocreate, $operation['actionparam'], $messagetext, $subject, $header);
+
+							// Set project ref if not yet defined
+							if (empty($projecttocreate->ref))
+							{
+								// Get next Ref
+								$defaultref = '';
+								$modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
+
+								// Search template files
+								$file = ''; $classname = ''; $filefound = 0; $reldir = '';
+								$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+								foreach ($dirmodels as $reldir)
+								{
+									$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
+									if (file_exists($file))
+									{
+										$filefound = 1;
+										$classname = $modele;
+										break;
+									}
+								}
+
+								if ($filefound)
+								{
+									if ($savesocid > 0)
+									{
+										if ($savesocid != $projecttocreate->socid)
+										{
+											$errorforactions++;
+											setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$projecttocreate->socid.') by setting socid in operation with a different value', null, 'errors');
+										}
+									} else {
+										if ($projecttocreate->socid > 0)
+										{
+											$thirdpartystatic->fetch($projecttocreate->socid);
+										}
+									}
+
+									$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
+									$modModuleToUseForNextValue = new $classname;
+									$defaultref = $modModuleToUseForNextValue->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $projecttocreate);
+								}
+								$projecttocreate->ref = $defaultref;
+							}
+
+							if ($errorforthisaction)
+							{
+								$errorforactions++;
+							} else {
+								if (empty($projecttocreate->ref) || (is_numeric($projecttocreate->ref) && $projecttocreate->ref <= 0))
+								{
+									$errorforactions++;
+									$this->error = 'Failed to create project: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
+								} else {
+									// Create project
+									$result = $projecttocreate->create($user);
+									if ($result <= 0)
+									{
+										$errorforactions++;
+										$this->error = 'Failed to create project: '.$langs->trans($projecttocreate->error);
+										$this->errors = $projecttocreate->errors;
+									}
+								}
+							}
+						}
+					}
+					// Create ticket
+					elseif ($operation['type'] == 'ticket')
+					{
+						$tickettocreate = new Ticket($this->db);
+
+						$alreadycreated = $tickettocreate->fetch(0, '', '', $msgid);
+						if ($alreadycreated == 0)
+						{
+							if ($thirdpartystatic->id > 0)
+							{
+								$tickettocreate->socid = $thirdpartystatic->id;
+								$tickettocreate->fk_soc = $thirdpartystatic->id;
+								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+							}
+							if ($contactstatic->id > 0)
+							{
+								$tickettocreate->contact_id = $contactstatic->id;
+								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+							}
+
+							$description = $descriptiontitle;
+							$description = dol_concatdesc($description, "-----");
+							$description = dol_concatdesc($description, $descriptionmeta);
+							$description = dol_concatdesc($description, "-----");
+							$description = dol_concatdesc($description, $messagetext);
+
+							$descriptionfull = $description;
+							if (empty($conf->global->MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER)) {
+								$descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
+								$descriptionfull = dol_concatdesc($descriptionfull, $header);
+							}
+
+							$tickettocreate->subject = $subject;
+							$tickettocreate->message = $description;
+							$tickettocreate->type_code = (!empty($conf->global->MAIN_EMAILCOLLECTOR_TICKET_TYPE_CODE) ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_TYPE_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_type', 'use_default', 'code', 1));
+							$tickettocreate->category_code = (!empty($conf->global->MAIN_EMAILCOLLECTOR_TICKET_CATEGORY_CODE) ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_CATEGORY_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_category', 'use_default', 'code', 1));
+							$tickettocreate->severity_code = (!empty($conf->global->MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE) ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_severity', 'use_default', 'code', 1));
+							$tickettocreate->origin_email = $from;
+							$tickettocreate->fk_user_create = $user->id;
+							$tickettocreate->datec = $date;
+							$tickettocreate->fk_project = $projectstatic->id;
+							$tickettocreate->notify_tiers_at_create = 0;
+							$tickettocreate->note_private = $descriptionfull;
+							$tickettocreate->entity = $conf->entity;
+							$tickettocreate->email_msgid = $msgid;
+							//$tickettocreate->fk_contact = $contactstatic->id;
+
+							$savesocid = $tickettocreate->socid;
+
+							// Overwrite values with values extracted from source email.
+							// This may overwrite any $projecttocreate->xxx properties.
+							$errorforthisaction = $this->overwritePropertiesOfObject($tickettocreate, $operation['actionparam'], $messagetext, $subject, $header);
+
+							// Set ticket ref if not yet defined
+							if (empty($tickettocreate->ref))
+							{
+								// Get next Ref
+								$defaultref = '';
+								$modele = empty($conf->global->TICKET_ADDON) ? 'mod_ticket_simple' : $conf->global->TICKET_ADDON;
+
+								// Search template files
+								$file = ''; $classname = ''; $filefound = 0; $reldir = '';
+								$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+								foreach ($dirmodels as $reldir)
+								{
+									$file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
+									if (file_exists($file))
+									{
+										$filefound = 1;
+										$classname = $modele;
+										break;
+									}
+								}
+
+								if ($filefound)
+								{
+									if ($savesocid > 0)
+									{
+										if ($savesocid != $tickettocreate->socid)
+										{
+											$errorforactions++;
+											setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$tickettocreate->socid.') by setting socid in operation with a different value', null, 'errors');
+										}
+									} else {
+										if ($tickettocreate->socid > 0)
+										{
+											$thirdpartystatic->fetch($tickettocreate->socid);
+										}
+									}
+
+									$result = dol_include_once($reldir."core/modules/ticket/".$modele.'.php');
+									$modModuleToUseForNextValue = new $classname;
+									$defaultref = $modModuleToUseForNextValue->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $tickettocreate);
+								}
+								$tickettocreate->ref = $defaultref;
+							}
+
+							if ($errorforthisaction)
+							{
+								$errorforactions++;
+							} else {
+								if (is_numeric($tickettocreate->ref) && $tickettocreate->ref <= 0)
+								{
+									$errorforactions++;
+									$this->error = 'Failed to create ticket: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
+								} else {
+									// Create project
+									$result = $tickettocreate->create($user);
+									if ($result <= 0)
+									{
+										$errorforactions++;
+										$this->error = 'Failed to create ticket: '.$langs->trans($tickettocreate->error);
+										$this->errors = $tickettocreate->errors;
+									}
+								}
+							}
+						}
+					}
+					// Create candidature
+					elseif ($operation['type'] == 'candidature')
+					{
+						$candidaturetocreate = new RecruitmentCandidature($this->db);
+
+						$alreadycreated = $candidaturetocreate->fetch(0, '', $msgid);
+						if ($alreadycreated == 0)
+						{
+							$description = $descriptiontitle;
+							$description = dol_concatdesc($description, "-----");
+							$description = dol_concatdesc($description, $descriptionmeta);
+							$description = dol_concatdesc($description, "-----");
+							$description = dol_concatdesc($description, $messagetext);
+
+							$descriptionfull = $description;
+							$descriptionfull = dol_concatdesc($descriptionfull, "----- Header");
+							$descriptionfull = dol_concatdesc($descriptionfull, $header);
+
+							$candidaturetocreate->subject = $subject;
+							$candidaturetocreate->message = $description;
+							$candidaturetocreate->type_code = 0;
+							$candidaturetocreate->category_code = null;
+							$candidaturetocreate->severity_code = null;
+							$candidaturetocreate->email = $from;
+							//$candidaturetocreate->lastname = $langs->trans("Anonymous").' - '.$from;
+							$candidaturetocreate->fk_user_creat = $user->id;
+							$candidaturetocreate->date_creation = $date;
+							$candidaturetocreate->fk_project = $projectstatic->id;
+							$candidaturetocreate->description = $description;
+							$candidaturetocreate->note_private = $descriptionfull;
+							$candidaturetocreate->entity = $conf->entity;
+							$candidaturetocreate->email_msgid = $msgid;
+							$candidaturetocreate->status = $candidaturetocreate::STATUS_DRAFT;
+							//$candidaturetocreate->fk_contact = $contactstatic->id;
+
+							// Overwrite values with values extracted from source email.
+							// This may overwrite any $projecttocreate->xxx properties.
+							$errorforthisaction = $this->overwritePropertiesOfObject($candidaturetocreate, $operation['actionparam'], $messagetext, $subject, $header);
+
+							// Set candidature ref if not yet defined
+							/*if (empty($candidaturetocreate->ref))				We do not need this because we create object in draft status
+	                    	{
+	                    		// Get next Ref
+	                    		$defaultref = '';
+	                    		$modele = empty($conf->global->CANDIDATURE_ADDON) ? 'mod_candidature_simple' : $conf->global->CANDIDATURE_ADDON;
+
+	                    		// Search template files
+	                    		$file = ''; $classname = ''; $filefound = 0; $reldir = '';
+	                    		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	                    		foreach ($dirmodels as $reldir)
+	                    		{
+	                    			$file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
+	                    			if (file_exists($file))
+	                    			{
+	                    				$filefound = 1;
+	                    				$classname = $modele;
+	                    				break;
+	                    			}
+	                    		}
+
+	                    		if ($filefound)
+	                    		{
+	                    			if ($savesocid > 0)
+	                    			{
+	                    				if ($savesocid != $candidaturetocreate->socid)
+	                    				{
+	                    					$errorforactions++;
+	                    					setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$candidaturetocreate->socid.') by setting socid in operation with a different value', null, 'errors');
+	                    				}
+	                    			} else {
+	                    				if ($candidaturetocreate->socid > 0)
+	                    				{
+	                    					$thirdpartystatic->fetch($candidaturetocreate->socid);
+	                    				}
+	                    			}
+
+	                    			$result = dol_include_once($reldir."core/modules/ticket/".$modele.'.php');
+	                    			$modModuleToUseForNextValue = new $classname;
+	                    			$defaultref = $modModuleToUseForNextValue->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $tickettocreate);
+	                    		}
+	                    		$candidaturetocreate->ref = $defaultref;
+	                    	}*/
+
+							if ($errorforthisaction)
+							{
+								$errorforactions++;
+							} else {
+								// Create project
+								$result = $candidaturetocreate->create($user);
+								if ($result <= 0)
+								{
+									$errorforactions++;
+									$this->error = 'Failed to create ticket: '.join(', ', $candidaturetocreate->errors);
+									$this->errors = $candidaturetocreate->errors;
+								}
+							}
+						}
+					}
+					// Create event specific on hook
+					// this code action is hook..... for support this call
+					elseif (substr($operation['type'], 0, 4) == 'hook') {
+						global $hookmanager;
+
+						if (!is_object($hookmanager)) {
 							$hookmanager->initHooks(array('emailcollectorcard'));
+						}
 
-							$parameters = array(
+						$parameters = array(
 							'connection'=>  $connection,
 							'imapemail'=>$imapemail,
 							'overview'=>$overview,
@@ -1829,8 +2088,6 @@ class EmailCollector extends CommonObject
 
 							'actionparam'=>  $operation['actionparam'],
 
-
-
 							'thirdpartyid' => $thirdpartyid,
 							'objectid'=> $objectid,
 							'objectemail'=> $objectemail,
@@ -1838,164 +2095,137 @@ class EmailCollector extends CommonObject
 							'messagetext'=>$messagetext,
 							'subject'=>$subject,
 							'header'=>$header,
-							);
-							$res = $hookmanager->executeHooks('doCollectOneCollector', $parameters, $this, $operation['type']);
+						);
+						$res = $hookmanager->executeHooks('doCollectOneCollector', $parameters, $this, $operation['type']);
 
-							if ($res < 0)
-							 $this->error = $hookmanager->resPrint;
+						if ($res < 0) {
+							$errorforthisaction++;
+							$this->error = $hookmanager->resPrint;
 						}
+						if ($errorforthisaction)
+						{
+							$errorforactions++;
+						}
+					}
 
-                        if ($errorforthisaction)
-                        {
-                            $errorforactions++;
-                        }
-                        else
-                        {
-                            if (is_numeric($tickettocreate->ref) && $tickettocreate->ref <= 0)
-                            {
-                                $errorforactions++;
-                                $this->error = 'Failed to create ticket: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
-                            }
-                            else
-                            {
-                                // Create project
-                                $result = $tickettocreate->create($user);
-                                if ($result <= 0)
-                                {
-                                    $errorforactions++;
-                                    $this->error = 'Failed to create ticket: '.$langs->trans($tickettocreate->error);
-                                    $this->errors = $tickettocreate->errors;
-                                }
-                            }
-                        }
-                    }
+					if (!$errorforactions)
+					{
+						$nbactiondoneforemail++;
+					}
+				}
 
-                    if (!$errorforactions)
-                    {
-                        $nbactiondoneforemail++;
-                    }
-                }
+				// Error for email or not ?
+				if (!$errorforactions)
+				{
+					if ($targetdir)
+					{
+						dol_syslog("EmailCollector::doCollectOneCollector move message ".$imapemail." to ".$connectstringtarget, LOG_DEBUG);
+						$res = imap_mail_move($connection, $imapemail, $targetdir, 0);
+						if ($res == false) {
+							$errorforemail++;
+							$this->error = imap_last_error();
+							$this->errors[] = $this->error;
+							dol_syslog(imap_last_error());
+						}
+					} else {
+						dol_syslog("EmailCollector::doCollectOneCollector message ".$imapemail." to ".$connectstringtarget." was set to read", LOG_DEBUG);
+					}
+				} else {
+					$errorforemail++;
+				}
 
-                // Error for email or not ?
-                if (!$errorforactions)
-                {
-                    if ($targetdir)
-                    {
-                        dol_syslog("EmailCollector::doCollectOneCollector move message ".$imapemail." to ".$connectstringtarget, LOG_DEBUG);
-                        $res = imap_mail_move($connection, $imapemail, $targetdir, 0);
-                        if ($res == false) {
-                            $errorforemail++;
-                            $this->error = imap_last_error();
-                            $this->errors[] = $this->error;
-                            dol_syslog(imap_last_error());
-                        }
-                    }
-                    else
-                    {
-                        dol_syslog("EmailCollector::doCollectOneCollector message ".$imapemail." to ".$connectstringtarget." was set to read", LOG_DEBUG);
-                    }
-                }
-                else
-                {
-                    $errorforemail++;
-                }
+				unset($objectemail);
+				unset($projectstatic);
+				unset($thirdpartystatic);
+				unset($contactstatic);
 
-                unset($objectemail);
-                unset($projectstatic);
-                unset($thirdpartystatic);
-                unset($contactstatic);
+				$nbemailprocessed++;
 
-                $nbemailprocessed++;
+				if (!$errorforemail)
+				{
+					$nbactiondone += $nbactiondoneforemail;
+					$nbemailok++;
 
-                if (!$errorforemail)
-                {
-                    $nbactiondone += $nbactiondoneforemail;
-                    $nbemailok++;
+					$this->db->commit();
 
-                    $this->db->commit();
+					// Stop the loop to process email if we reach maximum collected per collect
+					if ($this->maxemailpercollect > 0 && $nbemailok >= $this->maxemailpercollect)
+					{
+						dol_syslog("EmailCollect::doCollectOneCollector We reach maximum of ".$nbemailok." collected with success, so we stop this collector now.");
+						break;
+					}
+				} else {
+					$error++;
 
-                    // Stop the loop to process email if we reach maximum collected per collect
-                    if ($this->maxemailpercollect > 0 && $nbemailok >= $this->maxemailpercollect)
-                    {
-                        dol_syslog("EmailCollect::doCollectOneCollector We reach maximum of ".$nbemailok." collected with success, so we stop this collector now.");
-                        break;
-                    }
-                }
-                else
-                {
-                    $error++;
+					$this->db->rollback();
+				}
+			}
 
-                    $this->db->rollback();
-                }
-            }
+			$output = $langs->trans('XEmailsDoneYActionsDone', $nbemailprocessed, $nbemailok, $nbactiondone);
 
-            $output = $langs->trans('XEmailsDoneYActionsDone', $nbemailprocessed, $nbemailok, $nbactiondone);
+			dol_syslog("End of loop on emails", LOG_INFO, -1);
+		} else {
+			$output = $langs->trans('NoNewEmailToProcess');
+		}
 
-            dol_syslog("End of loop on emails", LOG_INFO, -1);
-        }
-        else
-        {
-            $output = $langs->trans('NoNewEmailToProcess');
-        }
+		imap_expunge($connection); // To validate any move
 
-        imap_expunge($connection); // To validate any move
+		imap_close($connection);
 
-        imap_close($connection);
+		$this->datelastresult = $now;
+		$this->lastresult = $output;
+		$this->debuginfo = 'IMAP search string used : '.$search;
+		if ($searchhead) $this->debuginfo .= '<br>Then search string into email header : '.$searchhead;
 
-        $this->datelastresult = $now;
-        $this->lastresult = $output;
-        $this->debuginfo = 'IMAP search string used : '.$search;
-        if ($searchhead) $this->debuginfo .= '<br>Then search string into email header : '.$searchhead;
+		if (!$error) $this->datelastok = $now;
 
-        if (!$error) $this->datelastok = $now;
+		if (!empty($this->errors)) $this->lastresult .= " - ".join(" - ", $this->errors);
+		$this->codelastresult = ($error ? 'KO' : 'OK');
+		$this->update($user);
 
-        if (!empty($this->errors)) $this->lastresult .= " - ".join(" - ", $this->errors);
-        $this->codelastresult = ($error ? 'KO' : 'OK');
-        $this->update($user);
+		dol_syslog("EmailCollector::doCollectOneCollector end", LOG_DEBUG);
 
-        dol_syslog("EmailCollector::doCollectOneCollector end", LOG_DEBUG);
-
-        return $error ?-1 : 1;
-    }
+		return $error ?-1 : 1;
+	}
 
 
 
-    // Loop to get part html and plain. Code found on PHP imap_fetchstructure documentation
+	// Loop to get part html and plain. Code found on PHP imap_fetchstructure documentation
 
-    /**
-     * getmsg
-     *
-     * @param 	Object $mbox     	Structure
-     * @param 	string $mid		    prefix
-     * @return 	array				Array with number and object
-     */
-    private function getmsg($mbox, $mid)
-    {
-        // input $mbox = IMAP stream, $mid = message id
-        // output all the following:
-        global $charset, $htmlmsg, $plainmsg, $attachments;
-        $htmlmsg = $plainmsg = $charset = '';
-        $attachments = array();
+	/**
+	 * getmsg
+	 *
+	 * @param 	Object $mbox     	Structure
+	 * @param 	string $mid		    prefix
+	 * @return 	array				Array with number and object
+	 */
+	private function getmsg($mbox, $mid)
+	{
+		// input $mbox = IMAP stream, $mid = message id
+		// output all the following:
+		global $charset, $htmlmsg, $plainmsg, $attachments;
+		$htmlmsg = $plainmsg = $charset = '';
+		$attachments = array();
 
-        // HEADER
-        //$h = imap_header($mbox,$mid);
-        // add code here to get date, from, to, cc, subject...
+		// HEADER
+		//$h = imap_header($mbox,$mid);
+		// add code here to get date, from, to, cc, subject...
 
-        // BODY
-        $s = imap_fetchstructure($mbox, $mid);
+		// BODY
+		$s = imap_fetchstructure($mbox, $mid);
 
-        if (!$s->parts) {
-            // simple
-            $this->getpart($mbox, $mid, $s, 0); // pass 0 as part-number
-        } else {
-            // multipart: cycle through each part
-            foreach ($s->parts as $partno0 => $p) {
-                $this->getpart($mbox, $mid, $p, $partno0 + 1);
-            }
-        }
-    }
+		if (!$s->parts) {
+			// simple
+			$this->getpart($mbox, $mid, $s, 0); // pass 0 as part-number
+		} else {
+			// multipart: cycle through each part
+			foreach ($s->parts as $partno0 => $p) {
+				$this->getpart($mbox, $mid, $p, $partno0 + 1);
+			}
+		}
+	}
 
-    /* partno string
+	/* partno string
      0 multipart/mixed
      1 multipart/alternative
      1.1 text/plain
@@ -2010,92 +2240,91 @@ class EmailCollector extends CommonObject
      2.2.1 text/plain
      2.2.2 text/html
      */
-    /**
-     * Sub function for getpart(). Only called by createPartArray() and itself.
-     *
-     * @param 	Object		$mbox			Structure
-     * @param 	string		$mid			Part no
-     * @param 	Object		$p              Object p
-     * @param   string      $partno         Partno
-     * @return	void
-     */
-    private function getpart($mbox, $mid, $p, $partno)
-    {
-        // $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
-        global $htmlmsg, $plainmsg, $charset, $attachments;
+	/**
+	 * Sub function for getpart(). Only called by createPartArray() and itself.
+	 *
+	 * @param 	Object		$mbox			Structure
+	 * @param 	string		$mid			Part no
+	 * @param 	Object		$p              Object p
+	 * @param   string      $partno         Partno
+	 * @return	void
+	 */
+	private function getpart($mbox, $mid, $p, $partno)
+	{
+		// $partno = '1', '2', '2.1', '2.1.3', etc for multipart, 0 if simple
+		global $htmlmsg, $plainmsg, $charset, $attachments;
 
-        // DECODE DATA
-        $data = ($partno) ?
-        imap_fetchbody($mbox, $mid, $partno) : // multipart
-        imap_body($mbox, $mid); // simple
-        // Any part may be encoded, even plain text messages, so check everything.
-        if ($p->encoding == 4)
-            $data = quoted_printable_decode($data);
-        elseif ($p->encoding == 3)
-            $data = base64_decode($data);
+		// DECODE DATA
+		$data = ($partno) ?
+		imap_fetchbody($mbox, $mid, $partno) : // multipart
+		imap_body($mbox, $mid); // simple
+		// Any part may be encoded, even plain text messages, so check everything.
+		if ($p->encoding == 4)
+			$data = quoted_printable_decode($data);
+		elseif ($p->encoding == 3)
+			$data = base64_decode($data);
 
-        // PARAMETERS
-        // get all parameters, like charset, filenames of attachments, etc.
-        $params = array();
-        if ($p->parameters)
-        {
-            foreach ($p->parameters as $x)
-            {
-                $params[strtolower($x->attribute)] = $x->value;
-            }
-        }
-        if ($p->dparameters)
-        {
-            foreach ($p->dparameters as $x)
-            {
-                $params[strtolower($x->attribute)] = $x->value;
-            }
-        }
+		// PARAMETERS
+		// get all parameters, like charset, filenames of attachments, etc.
+		$params = array();
+		if ($p->parameters)
+		{
+			foreach ($p->parameters as $x)
+			{
+				$params[strtolower($x->attribute)] = $x->value;
+			}
+		}
+		if ($p->dparameters)
+		{
+			foreach ($p->dparameters as $x)
+			{
+				$params[strtolower($x->attribute)] = $x->value;
+			}
+		}
 
-        // ATTACHMENT
-        // Any part with a filename is an attachment,
-        // so an attached text file (type 0) is not mistaken as the message.
-        if ($params['filename'] || $params['name']) {
-            // filename may be given as 'Filename' or 'Name' or both
-            $filename = ($params['filename']) ? $params['filename'] : $params['name'];
-            // filename may be encoded, so see imap_mime_header_decode()
-            $attachments[$filename] = $data; // this is a problem if two files have same name
-        }
+		// ATTACHMENT
+		// Any part with a filename is an attachment,
+		// so an attached text file (type 0) is not mistaken as the message.
+		if ($params['filename'] || $params['name']) {
+			// filename may be given as 'Filename' or 'Name' or both
+			$filename = ($params['filename']) ? $params['filename'] : $params['name'];
+			// filename may be encoded, so see imap_mime_header_decode()
+			$attachments[$filename] = $data; // this is a problem if two files have same name
+		}
 
-        // TEXT
-        if ($p->type == 0 && $data) {
+		// TEXT
+		if ($p->type == 0 && $data) {
 			if (!empty($params['charset'])) {
-                $data = $this->convertStringEncoding($data, $params['charset']);
-            }
-            // Messages may be split in different parts because of inline attachments,
-            // so append parts together with blank row.
-            if (strtolower($p->subtype) == 'plain')
-                $plainmsg .= trim($data)."\n\n";
-            else
-                $htmlmsg .= $data."<br><br>";
-            $charset = $params['charset']; // assume all parts are same charset
-        }
+				$data = $this->convertStringEncoding($data, $params['charset']);
+			}
+			// Messages may be split in different parts because of inline attachments,
+			// so append parts together with blank row.
+			if (strtolower($p->subtype) == 'plain')
+				$plainmsg .= trim($data)."\n\n";
+			else $htmlmsg .= $data."<br><br>";
+			$charset = $params['charset']; // assume all parts are same charset
+		}
 
-        // EMBEDDED MESSAGE
-        // Many bounce notifications embed the original message as type 2,
-        // but AOL uses type 1 (multipart), which is not handled here.
-        // There are no PHP functions to parse embedded messages,
-        // so this just appends the raw source to the main message.
-        elseif ($p->type == 2 && $data) {
+		// EMBEDDED MESSAGE
+		// Many bounce notifications embed the original message as type 2,
+		// but AOL uses type 1 (multipart), which is not handled here.
+		// There are no PHP functions to parse embedded messages,
+		// so this just appends the raw source to the main message.
+		elseif ($p->type == 2 && $data) {
 			if (!empty($params['charset'])) {
-                $data = $this->convertStringEncoding($data, $params['charset']);
-            }
-            $plainmsg .= $data."\n\n";
-        }
+				$data = $this->convertStringEncoding($data, $params['charset']);
+			}
+			$plainmsg .= $data."\n\n";
+		}
 
-        // SUBPART RECURSION
-        if ($p->parts) {
-            foreach ($p->parts as $partno0=>$p2)
-            {
-                $this->getpart($mbox, $mid, $p2, $partno.'.'.($partno0 + 1)); // 1.2, 1.2.1, etc.
-            }
-        }
-    }
+		// SUBPART RECURSION
+		if ($p->parts) {
+			foreach ($p->parts as $partno0=>$p2)
+			{
+				$this->getpart($mbox, $mid, $p2, $partno.'.'.($partno0 + 1)); // 1.2, 1.2.1, etc.
+			}
+		}
+	}
 
 	/**
 	 * Converts a string from one encoding to another.
@@ -2120,4 +2349,40 @@ class EmailCollector extends CommonObject
   		}
   		return $convertedString;
   	}
+
+  	/**
+  	 * Decode a subject string according to RFC2047
+  	 * Example: '=?Windows-1252?Q?RE=A0:_ABC?=' => 'RE : ABC...'
+  	 * Example: '=?UTF-8?Q?A=C3=A9B?=' => 'AéB'
+  	 * Example: '=?UTF-8?B?2KLYstmF2KfbjNi0?=' =>
+  	 * Example: '=?utf-8?B?UkU6IG1vZHVsZSBkb2xpYmFyciBnZXN0aW9ubmFpcmUgZGUgZmljaGllcnMg?= =?utf-8?B?UsOpZsOpcmVuY2UgZGUgbGEgY29tbWFuZGUgVFVHRURJSklSIOKAkyBwYXNz?= =?utf-8?B?w6llIGxlIDIyLzA0LzIwMjA=?='
+  	 *
+  	 * @param 	string	$subject		Subject
+  	 * @return 	string					Decoded subject (in UTF-8)
+  	 */
+  	protected function decodeSMTPSubject($subject)
+  	{
+  		// Decode $overview[0]->subject according to RFC2047
+  		// Can use also imap_mime_header_decode($str)
+  		// Can use also mb_decode_mimeheader($str)
+  		// Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
+		if (function_exists('imap_mime_header_decode') && function_exists('iconv_mime_decode')) {
+  			$elements = imap_mime_header_decode($subject);
+  			$newstring = '';
+  			if (!empty($elements)) {
+  				$num = count($elements);
+  				for ($i = 0; $i < $num; $i++) {
+  					$stringinutf8 = (in_array(strtoupper($elements[$i]->charset), array('DEFAULT', 'UTF-8')) ? $elements[$i]->text : iconv_mime_decode($elements[$i]->text, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, $elements[$i]->charset));
+  					$newstring .= $stringinutf8;
+  				}
+  				$subject = $newstring;
+  			}
+		} elseif (!function_exists('mb_decode_mimeheader')) {
+			$subject = mb_decode_mimeheader($subject);
+		} elseif (function_exists('iconv_mime_decode')) {
+  			$subject = iconv_mime_decode($subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
+  		}
+
+  		return $subject;
+  	}
 }
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index d0d6239a7f2..ed6942f34d6 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -369,8 +369,7 @@ class EmailCollectorAction extends CommonObject
              $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.'>';
@@ -425,32 +424,26 @@ class EmailCollectorAction extends CommonObject
         if ($mode == 0)
         {
             return $this->labelStatus[$status];
-        }
-        elseif ($mode == 1)
+        } elseif ($mode == 1)
         {
             return $this->labelStatus[$status];
-        }
-        elseif ($mode == 2)
+        } 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)
+        } 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)
+        } 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)
+        } 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)
+        } 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');
@@ -503,9 +496,7 @@ class EmailCollectorAction extends CommonObject
             }
 
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 63521e81c3a..cb8db05fa34 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -165,11 +165,11 @@ class EmailCollectorFilter extends CommonObject
 			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			return -1;
 		}
-		if (!in_array($this->type, array('seen', 'unseen', 'unanswered', 'answered', 'withtrackingid', 'withouttrackingid')) && empty($this->rulevalue))
+		if (!in_array($this->type, array('seen', 'unseen', 'unanswered', 'answered', 'withtrackingidinmsgid', 'withouttrackingidinmsgid', 'withtrackingid', 'withouttrackingid', 'isanswer', 'isnotanswer')) && empty($this->rulevalue))
 		{
 			$langs->load("errors");
 			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("SearchString"));
-			return -1;
+			return -2;
 		}
 
 		return $this->createCommon($user, $notrigger);
@@ -344,8 +344,7 @@ class EmailCollectorFilter extends CommonObject
              $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.'>';
@@ -400,32 +399,26 @@ class EmailCollectorFilter extends CommonObject
 		if ($mode == 0)
 		{
 			return $this->labelStatus[$status];
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			return $this->labelStatus[$status];
-		}
-		elseif ($mode == 2)
+		} 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)
+		} 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)
+		} 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)
+		} 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)
+		} 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');
@@ -478,9 +471,7 @@ class EmailCollectorFilter extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index f2cb455cc6b..86ec2ee5c38 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -50,8 +50,8 @@ if (!empty($conf->product->enabled) || !empty($conf->service->enabled))  require
 if (!empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 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';
 }
 
 // Load translation files required by the page
@@ -116,11 +116,11 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel)
+	if ($cancel)
 	{
 		$action = '';
 		$object->fetch($id); // show shipment also after canceling modification
-    }
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
@@ -132,31 +132,31 @@ if (empty($reshook))
 	// Reopen
 	if ($action == 'reopen' && $user->rights->expedition->creer)
 	{
-	    $object->fetch($id);
-	    $result = $object->reOpen();
+		$object->fetch($id);
+		$result = $object->reOpen();
 	}
 
 	// 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_customer')
 	{
-        $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_customer', GETPOST('ref_customer', 'alpha'), '', null, 'text', '', $user, 'SHIPMENT_MODIFY');
-        if ($result < 0) {
-            setEventMessages($object->error, $object->errors, 'errors');
-            $action = 'editref_customer';
-        } else {
-            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-            exit;
-        }
+		$result = $object->setValueFrom('ref_customer', GETPOST('ref_customer', 'alpha'), '', null, 'text', '', $user, 'SHIPMENT_MODIFY');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'editref_customer';
+		} else {
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		}
 	}
 
 	if ($action == 'update_extras')
@@ -164,72 +164,72 @@ if (empty($reshook))
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
-	    $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
-	    if ($ret < 0) $error++;
+		$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';
 	}
 
 	// Create shipment
 	if ($action == 'add' && $user->rights->expedition->creer)
 	{
-	    $error = 0;
-	    $predef = '';
+		$error = 0;
+		$predef = '';
 
-	    $db->begin();
+		$db->begin();
 
-	    $object->note = GETPOST('note', 'alpha');
-	    $object->origin				= $origin;
-        $object->origin_id = $origin_id;
-        $object->fk_project = GETPOST('projectid', 'int');
-	    $object->weight				= GETPOST('weight', 'int') == '' ? "NULL" : GETPOST('weight', 'int');
-	    $object->sizeH				= GETPOST('sizeH', 'int') == '' ? "NULL" : GETPOST('sizeH', 'int');
-	    $object->sizeW				= GETPOST('sizeW', 'int') == '' ? "NULL" : GETPOST('sizeW', 'int');
-	    $object->sizeS				= GETPOST('sizeS', 'int') == '' ? "NULL" : GETPOST('sizeS', 'int');
-	    $object->size_units = GETPOST('size_units', 'int');
-	    $object->weight_units = GETPOST('weight_units', 'int');
+		$object->note = GETPOST('note', 'alpha');
+		$object->origin				= $origin;
+		$object->origin_id = $origin_id;
+		$object->fk_project = GETPOST('projectid', 'int');
+		$object->weight				= GETPOST('weight', 'int') == '' ? "NULL" : GETPOST('weight', 'int');
+		$object->sizeH				= GETPOST('sizeH', 'int') == '' ? "NULL" : GETPOST('sizeH', 'int');
+		$object->sizeW				= GETPOST('sizeW', 'int') == '' ? "NULL" : GETPOST('sizeW', 'int');
+		$object->sizeS				= GETPOST('sizeS', 'int') == '' ? "NULL" : GETPOST('sizeS', 'int');
+		$object->size_units = GETPOST('size_units', 'int');
+		$object->weight_units = GETPOST('weight_units', 'int');
 
-	    $date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
+		$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
 
-	    // We will loop on each line of the original document to complete the shipping object with various info and quantity to deliver
-	    $classname = ucfirst($object->origin);
-	    $objectsrc = new $classname($db);
-	    $objectsrc->fetch($object->origin_id);
+		// We will loop on each line of the original document to complete the shipping object with various info and quantity to deliver
+		$classname = ucfirst($object->origin);
+		$objectsrc = new $classname($db);
+		$objectsrc->fetch($object->origin_id);
 
-	    $object->socid = $objectsrc->socid;
-	    $object->ref_customer = GETPOST('ref_customer', 'alpha');
-	    $object->model_pdf = GETPOST('model');
-	    $object->date_delivery = $date_delivery; // Date delivery planed
-	    $object->fk_delivery_address	= $objectsrc->fk_delivery_address;
-	    $object->shipping_method_id		= GETPOST('shipping_method_id', 'int');
-	    $object->tracking_number = GETPOST('tracking_number', 'alpha');
-	    $object->ref_int = GETPOST('ref_int', 'alpha');
-	    $object->note_private = GETPOST('note_private', 'none');
-	    $object->note_public = GETPOST('note_public', 'none');
+		$object->socid = $objectsrc->socid;
+		$object->ref_customer = GETPOST('ref_customer', 'alpha');
+		$object->model_pdf = GETPOST('model');
+		$object->date_delivery = $date_delivery; // Date delivery planed
+		$object->fk_delivery_address	= $objectsrc->fk_delivery_address;
+		$object->shipping_method_id		= GETPOST('shipping_method_id', 'int');
+		$object->tracking_number = GETPOST('tracking_number', 'alpha');
+		$object->ref_int = GETPOST('ref_int', 'alpha');
+		$object->note_private = GETPOST('note_private', 'restricthtml');
+		$object->note_public = GETPOST('note_public', 'restricthtml');
 		$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 		$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
-	    $batch_line = array();
+		$batch_line = array();
 		$stockLine = array();
 		$array_options = array();
 
-	    $num = count($objectsrc->lines);
-	    $totalqty = 0;
+		$num = count($objectsrc->lines);
+		$totalqty = 0;
 
-	    for ($i = 0; $i < $num; $i++)
-	    {
+		for ($i = 0; $i < $num; $i++)
+		{
 			$idl = "idl".$i;
 
 			$sub_qty = array();
@@ -238,67 +238,62 @@ if (empty($reshook))
 			$j = 0;
 			$batch = "batchl".$i."_0";
 			$stockLocation = "ent1".$i."_0";
-	    	$qty = "qtyl".$i;
+			$qty = "qtyl".$i;
 
 			if ($objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
 			{
-			    if (GETPOSTISSET($batch))
-			    {
-    				//shipment line with batch-enable product
-    				$qty .= '_'.$j;
-    				while (GETPOSTISSET($batch))
-    				{
-    					// save line of detail into sub_qty
-    				    $sub_qty[$j]['q'] = GETPOST($qty, 'int'); // the qty we want to move for this stock record
-    				    $sub_qty[$j]['id_batch'] = GETPOST($batch, 'int'); // the id into llx_product_batch of stock record to move
-    					$subtotalqty += $sub_qty[$j]['q'];
+				if (GETPOSTISSET($batch))
+				{
+					//shipment line with batch-enable product
+					$qty .= '_'.$j;
+					while (GETPOSTISSET($batch))
+					{
+						// save line of detail into sub_qty
+						$sub_qty[$j]['q'] = GETPOST($qty, 'int'); // the qty we want to move for this stock record
+						$sub_qty[$j]['id_batch'] = GETPOST($batch, 'int'); // the id into llx_product_batch of stock record to move
+						$subtotalqty += $sub_qty[$j]['q'];
 
-    					//var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
+						//var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
 
-    					$j++;
-    					$batch = "batchl".$i."_".$j;
-    					$qty = "qtyl".$i.'_'.$j;
-    				}
+						$j++;
+						$batch = "batchl".$i."_".$j;
+						$qty = "qtyl".$i.'_'.$j;
+					}
 
-    				$batch_line[$i]['detail'] = $sub_qty; // array of details
-    				$batch_line[$i]['qty'] = $subtotalqty;
-    				$batch_line[$i]['ix_l'] = GETPOST($idl, 'int');
+					$batch_line[$i]['detail'] = $sub_qty; // array of details
+					$batch_line[$i]['qty'] = $subtotalqty;
+					$batch_line[$i]['ix_l'] = GETPOST($idl, 'int');
 
-    				$totalqty += $subtotalqty;
-			    }
-			    else
-			    {
-			        // No detail were provided for lots
-			        if (!empty($_POST[$qty]))
-			        {
-			            // We try to set an amount
-    			        // Case we dont use the list of available qty for each warehouse/lot
-    			        // GUI does not allow this yet
-    			        setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse"), null, 'errors');
-			        }
-			    }
-			}
-			elseif (GETPOSTISSET($stockLocation))
+					$totalqty += $subtotalqty;
+				} else {
+					// No detail were provided for lots
+					if (!empty($_POST[$qty]))
+					{
+						// We try to set an amount
+						// Case we dont use the list of available qty for each warehouse/lot
+						// GUI does not allow this yet
+						setEventMessages($langs->trans("StockIsRequiredToChooseWhichLotToUse"), null, 'errors');
+					}
+				}
+			} elseif (GETPOSTISSET($stockLocation))
 			{
-			    //shipment line from multiple stock locations
-			    $qty .= '_'.$j;
-			    while (GETPOSTISSET($stockLocation))
-			    {
-			        // save sub line of warehouse
-			        $stockLine[$i][$j]['qty'] = GETPOST($qty, 'int');
-			        $stockLine[$i][$j]['warehouse_id'] = GETPOST($stockLocation, 'int');
-			        $stockLine[$i][$j]['ix_l'] = GETPOST($idl, 'int');
+				//shipment line from multiple stock locations
+				$qty .= '_'.$j;
+				while (GETPOSTISSET($stockLocation))
+				{
+					// save sub line of warehouse
+					$stockLine[$i][$j]['qty'] = GETPOST($qty, 'int');
+					$stockLine[$i][$j]['warehouse_id'] = GETPOST($stockLocation, 'int');
+					$stockLine[$i][$j]['ix_l'] = GETPOST($idl, 'int');
 
-			        $totalqty += GETPOST($qty, 'int');
+					$totalqty += GETPOST($qty, 'int');
 
-			        $j++;
-			        $stockLocation = "ent1".$i."_".$j;
-			        $qty = "qtyl".$i.'_'.$j;
-			    }
-			}
-			else
-			{
-			    //var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
+					$j++;
+					$stockLocation = "ent1".$i."_".$j;
+					$qty = "qtyl".$i.'_'.$j;
+				}
+			} else {
+				//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
 				if (GETPOST($qty, 'int') > 0) $totalqty += GETPOST($qty, 'int');
 			}
@@ -312,38 +307,36 @@ if (empty($reshook))
 					unset($_POST["options_".$key]);
 				}
 			}
-	    }
+		}
 
-	    //var_dump($batch_line[2]);
+		//var_dump($batch_line[2]);
 
-	    if ($totalqty > 0)		// There is at least one thing to ship
-	    {
-	        //var_dump($_POST);exit;
-	        for ($i = 0; $i < $num; $i++)
-	        {
-	            $qty = "qtyl".$i;
+		if ($totalqty > 0)		// There is at least one thing to ship
+		{
+			//var_dump($_POST);exit;
+			for ($i = 0; $i < $num; $i++)
+			{
+				$qty = "qtyl".$i;
 				if (!isset($batch_line[$i]))
 				{
 					// not batch mode
 					if (isset($stockLine[$i]))
 					{
-    					//shipment from multiple stock locations
-					    $nbstockline = count($stockLine[$i]);
-    					for ($j = 0; $j < $nbstockline; $j++)
-    					{
-    					    if ($stockLine[$i][$j]['qty'] > 0)
-    					    {
-    					        $ret = $object->addline($stockLine[$i][$j]['warehouse_id'], $stockLine[$i][$j]['ix_l'], $stockLine[$i][$j]['qty'], $array_options[$i]);
-    					        if ($ret < 0)
-    					        {
-    					            setEventMessages($object->error, $object->errors, 'errors');
-    					            $error++;
-    					        }
-    					    }
-    					}
-					}
-					else
-					{
+						//shipment from multiple stock locations
+						$nbstockline = count($stockLine[$i]);
+						for ($j = 0; $j < $nbstockline; $j++)
+						{
+							if ($stockLine[$i][$j]['qty'] > 0)
+							{
+								$ret = $object->addline($stockLine[$i][$j]['warehouse_id'], $stockLine[$i][$j]['ix_l'], $stockLine[$i][$j]['qty'], $array_options[$i]);
+								if ($ret < 0)
+								{
+									setEventMessages($object->error, $object->errors, 'errors');
+									$error++;
+								}
+							}
+						}
+					} else {
 						if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
 						{
 							$ent = "entl".$i;
@@ -360,9 +353,7 @@ if (empty($reshook))
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					// batch mode
 					if ($batch_line[$i]['qty'] > 0)
 					{
@@ -374,39 +365,35 @@ if (empty($reshook))
 						}
 					}
 				}
-	        }
-	        // 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 (!$error)
-	        {
-	            $ret = $object->create($user); // This create shipment (like Odoo picking) and lines of shipments. Stock movement will be done when validating shipment.
-	            if ($ret <= 0)
-	            {
-	                setEventMessages($object->error, $object->errors, 'errors');
-	                $error++;
-	            }
-	        }
-	    }
-	    else
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToShip").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-	        $error++;
-	    }
+			if (!$error)
+			{
+				$ret = $object->create($user); // This create shipment (like Odoo picking) and lines of shipments. Stock movement will be done when validating shipment.
+				if ($ret <= 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
+			}
+		} else {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToShip").'/'.$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';
+		}
 	}
 
 	/*
@@ -414,81 +401,67 @@ if (empty($reshook))
 	 */
 	elseif ($action == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)
 	{
-	    $result = $object->create_delivery($user);
-	    if ($result > 0)
-	    {
-	        header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
-	        exit;
-	    }
-	    else
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
-        ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
+		$result = $object->create_delivery($user);
+		if ($result > 0)
+		{
+			header("Location: ".DOL_URL_ROOT.'/livraison/card.php?action=create_delivery&id='.$result);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_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), $object->errors, '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->modelpdf;
-	    		$ret = $object->fetch($id); // Reload to get new records
+		} 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);
-	    	}
-	    }
-	}
-
-	elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->expedition->supprimer)
+				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($result < 0) dol_print_error($db, $result);
+			}
+		}
+	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->expedition->supprimer)
 	{
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
-	    $result = $object->cancel(0, $also_update_stock);
-	    if ($result > 0)
-	    {
-	        $result = $object->setStatut(-1);
-	    }
-	    else
+		$result = $object->cancel(0, $also_update_stock);
+		if ($result > 0)
 		{
+			$result = $object->setStatut(-1);
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
-	    }
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
+		}
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
 	{
-	    $also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
-	    $result = $object->delete(0, $also_update_stock);
-	    if ($result > 0)
-	    {
-	        header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
-	        exit;
-	    }
-	    else
+		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
+		$result = $object->delete(0, $also_update_stock);
+		if ($result > 0)
 		{
+			header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
+			exit;
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		}
 	}
 	// TODO add alternative status
 	/*elseif ($action == 'reopen' && (! empty($user->rights->expedition->creer) || ! empty($user->rights->expedition->shipping_advance->validate)))
@@ -502,15 +475,15 @@ if (empty($reshook))
 
 	elseif ($action == 'setdate_livraison' && $user->rights->expedition->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->set_date_livraison($user, $datedelivery);
-	    if ($result < 0)
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$object->fetch($id);
+		$result = $object->set_date_livraison($user, $datedelivery);
+		if ($result < 0)
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Action update
@@ -525,54 +498,50 @@ if (empty($reshook))
 		&& $user->rights->expedition->creer
 		)
 	{
-	    $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 = "";
-	}
-
-	elseif ($action == 'classifybilled')
+		$action = "";
+	} 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();
+		}
 		setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	elseif ($action == 'classifyclosed')
+	} 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();
+		}
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
@@ -600,9 +569,7 @@ if (empty($reshook))
 							$error++;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					// delete single warehouse line
 					$line->id = $line_id;
 					if (!$error && $line->delete($user) < 0)
@@ -617,9 +584,7 @@ if (empty($reshook))
 		if (!$error) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
-		}
-		else
-		{
+		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
 	}
@@ -683,9 +648,7 @@ if (empty($reshook))
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								}
-							}
-							else
-							{
+							} else {
 								setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 								$error++;
 							}
@@ -712,8 +675,7 @@ if (empty($reshook))
 								{
 									$lineIdToAddLot = $line_id;
 								}
-							}
-							elseif (count($lines[$i]->details_entrepot) > 1)
+							} elseif (count($lines[$i]->details_entrepot) > 1)
 							{
 								// multi warehouse shipment lines
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -737,15 +699,11 @@ if (empty($reshook))
 										setEventMessages($line->error, $line->errors, 'errors');
 										$error++;
 									}
-								}
-								else
-								{
+								} else {
 									setEventMessages($line->error, $line->errors, 'errors');
 									$error++;
 								}
-							}
-							else
-							{
+							} else {
 								// create new line with new lot
 								$line->origin_line_id = $lines[$i]->origin_line_id;
 								$line->entrepot_id = $lotStock->warehouseid;
@@ -760,16 +718,12 @@ if (empty($reshook))
 									$error++;
 								}
 							}
-						}
-						else
-						{
+						} else {
 							setEventMessages($lotStock->error, $lotStock->errors, 'errors');
 							$error++;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					if ($lines[$i]->fk_product > 0)
 					{
 						// line without lot
@@ -787,8 +741,7 @@ if (empty($reshook))
 							}
 							unset($_POST[$stockLocation]);
 							unset($_POST[$qty]);
-						}
-						elseif (count($lines[$i]->details_entrepot) > 1)
+						} elseif (count($lines[$i]->details_entrepot) > 1)
 						{
 							// multi warehouse shipment lines
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -812,10 +765,8 @@ if (empty($reshook))
 								}
 							}
 						}
-					}
-					else
-					{
-                        // Product no predefined
+					} else {
+						// Product no predefined
 						$qty = "qtyl".$line_id;
 						$line->id = $line_id;
 						$line->qty = GETPOST($qty, 'int');
@@ -847,11 +798,9 @@ if (empty($reshook))
 				}
 
 				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
-		{
+		} else {
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // To redisplay the form being edited
 			exit();
 		}
@@ -889,163 +838,163 @@ $warehousestatic = new Entrepot($db);
 
 if ($action == 'create2')
 {
-    print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
+	print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
 
-    print '<br>'.$langs->trans("ShipmentCreationIsDoneFromOrder");
-    $action = ''; $id = ''; $ref = '';
+	print '<br>'.$langs->trans("ShipmentCreationIsDoneFromOrder");
+	$action = ''; $id = ''; $ref = '';
 }
 
 // Mode creation.
 if ($action == 'create')
 {
-    $expe = new Expedition($db);
+	$expe = new Expedition($db);
 
-    print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
+	print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
 
-    if (!$origin)
-    {
-        setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
-    }
+	if (!$origin)
+	{
+		setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
+	}
 
-    if ($origin)
-    {
-        $classname = ucfirst($origin);
+	if ($origin)
+	{
+		$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').'">';
+			}
 
-            dol_fiche_head('');
+			dol_fiche_head('');
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Ref
-            print '<tr><td class="titlefieldcreate fieldrequired">';
-            if ($origin == 'commande' && !empty($conf->commande->enabled))
-            {
-                print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/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 == 'commande' && !empty($conf->commande->enabled))
+			{
+				print $langs->trans("RefOrder").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/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 == 'commande') print $langs->trans('RefCustomerOrder');
-            elseif ($origin == 'propal') print $langs->trans('RefCustomerOrder');
-            else print $langs->trans('RefCustomer');
-            print '</td><td colspan="3">';
-            print '<input type="text" name="ref_customer" value="'.$object->ref_client.'" />';
-            print '</td>';
-            print '</tr>';
+			// Ref client
+			print '<tr><td>';
+			if ($origin == 'commande') print $langs->trans('RefCustomerOrder');
+			elseif ($origin == 'propal') print $langs->trans('RefCustomerOrder');
+			else print $langs->trans('RefCustomer');
+			print '</td><td colspan="3">';
+			print '<input type="text" name="ref_customer" value="'.$object->ref_client.'" />';
+			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">';
-                print img_picto('', 'project');
-                $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
-                print ' <a class="paddingleft" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
-                print '</td>';
-                print '</tr>';
-            }
+				$langs->load("projects");
+				print '<tr>';
+				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
+				print img_picto('', 'project');
+				$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
+				print ' <a class="paddingleft" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle"></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("DeliveryMethod")."</td>";
-            print '<td colspan="3">';
-            $expe->fetch_delivery_methods();
-            print $form->selectarray("shipping_method_id", $expe->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("DeliveryMethod")."</td>";
+			print '<td colspan="3">';
+			$expe->fetch_delivery_methods();
+			print $form->selectarray("shipping_method_id", $expe->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, $expe, $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, $expe, $action); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 
 			if (empty($reshook)) {
 				// copy from order
@@ -1056,192 +1005,191 @@ if ($action == 'create')
 			}
 
 
-            // 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/expedition/modules_expedition.php';
 			$liste = ModelePdfExpedition::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->EXPEDITION_ADDON_PDF);
-                print "</td></tr>\n";
+				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
+				print '<td colspan="3">';
+				print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF);
+				print "</td></tr>\n";
 			}
 
-            print "</table>";
+			print "</table>";
 
-            dol_fiche_end();
+			dol_fiche_end();
 
 
-            // Shipment lines
+			// Shipment lines
 
-            $numAsked = count($object->lines);
+			$numAsked = count($object->lines);
 
-            print '<script type="text/javascript" language="javascript">
+			print '<script type="text/javascript" language="javascript">
             jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function() {';
-    	    $i = 0;
-    	    while ($i < $numAsked)
-    	    {
-    	    	print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
-    	    	$i++;
-    	    }
-        	print '});
+			$i = 0;
+			while ($i < $numAsked)
+			{
+				print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+				if (!empty($conf->productbatch->enabled)) print 'jQuery("#qtyl'.$i.'_'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+				$i++;
+			}
+			print '});
 	            jQuery("#autoreset").click(function() {';
-    	    $i = 0;
-    	    while ($i < $numAsked)
-    	    {
-    	    	print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
-    	    	$i++;
-    	    }
-        	print '});
+			$i = 0;
+			while ($i < $numAsked)
+			{
+				print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
+				if (!empty($conf->productbatch->enabled)) print 'jQuery("#qtyl'.$i.'_'.$i.'").val(0);'."\n";
+				$i++;
+			}
+			print '});
         	});
             </script>';
 
-            print '<br>';
+			print '<br>';
 
-            print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            // Load shipments already done for same order
-            $object->loadExpeditions();
+			// Load shipments already done for same order
+			$object->loadExpeditions();
 
-            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("QtyShipped").'</td>';
-                print '<td class="center">'.$langs->trans("QtyToShip");
+			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("QtyShipped").'</td>';
+				print '<td class="center">'.$langs->trans("QtyToShip");
 				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 ' / ';
+				} else {
+					print '<br>';
 				}
-                print '</td>';
-                if (!empty($conf->stock->enabled))
-                {
+				print '<a href="#" id="autoreset">'.$langs->trans("Reset").'</a>';
+				print '</td>';
+				if (!empty($conf->stock->enabled))
+				{
 					if (empty($conf->productbatch->enabled))
 					{
-                    	print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
-					}
-					else
-					{
+						print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
+					} else {
 						print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
 					}
-                }
-                print "</tr>\n";
-            }
+				}
+				print "</tr>\n";
+			}
 
-            $indiceAsked = 0;
-            while ($indiceAsked < $numAsked)
-            {
-                $product = new Product($db);
+			$indiceAsked = 0;
+			while ($indiceAsked < $numAsked)
+			{
+				$product = new Product($db);
 
-                $line = $object->lines[$indiceAsked];
+				$line = $object->lines[$indiceAsked];
 
-                $parameters = array('i' => $indiceAsked, 'line' => $line, 'num' => $numAsked);
-                $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
-                if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				$parameters = array('i' => $indiceAsked, 'line' => $line, 'num' => $numAsked);
+				$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-                if (empty($reshook))
-                {
-	                // 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;
+				if (empty($reshook))
+				{
+					// 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]);
-
-	                    print '<td>';
-	                    print '<a name="'.$line->rowid.'"></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;
-	                    $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));
-
-	                    // 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
+					// Product label
+					if ($line->fk_product > 0)  // If predefined product
 					{
-					    print "<td>";
-	                    if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
-	                    else $text = img_object($langs->trans('Product'), 'product');
+						$product->fetch($line->fk_product);
+						$product->load_stock('warehouseopen'); // Load all $product->stock_warehouse[idwarehouse]->detail_batch
+						//var_dump($product->stock_warehouse[1]);
 
-	                    if (!empty($line->label)) {
-	                    	$text .= ' <strong>'.$line->label.'</strong>';
-	                    	print $form->textwithtooltip($text, $line->desc, 3, '', '', $i);
-	                    } else {
-	                    	print $text.' '.nl2br($line->desc);
-	                    }
+						print '<td>';
+						print '<a name="'.$line->rowid.'"></a>'; // ancre pour retourner sur la ligne
 
-	                    // Show range
-	                    print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
-	                    print "</td>\n";
-	                }
+						// 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);
 
-	                // Qty
-	                print '<td class="center">'.$line->qty;
-	                print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
-	                print '</td>';
-	                $qtyProdCom = $line->qty;
+						// Show range
+						print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
 
-	                // Qty already shipped
-	                print '<td class="center">';
-	                $quantityDelivered = $object->expeditions[$line->id];
-	                print $quantityDelivered;
-	                print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
-	                print '</td>';
+						// 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) : '';
+						}
 
-	                // Qty to ship
-	                $quantityAsked = $line->qty;
+						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);
+						}
+
+						// 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;
+					print '<input name="qtyasked'.$indiceAsked.'" id="qtyasked'.$indiceAsked.'" type="hidden" value="'.$line->qty.'">';
+					print '</td>';
+					$qtyProdCom = $line->qty;
+
+					// Qty already shipped
+					print '<td class="center">';
+					$quantityDelivered = $object->expeditions[$line->id];
+					print $quantityDelivered;
+					print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
+					print '</td>';
+
+					// Qty to ship
+					$quantityAsked = $line->qty;
 					if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
 					{
 						$quantityToBeDelivered = 0;
-					}
-					else
-					{
+					} else {
 						$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
 					}
-	                $warehouse_id = GETPOST('entrepot_id', 'int');
+					$warehouse_id = GETPOST('entrepot_id', 'int');
 
 					$warehouseObject = null;
 					if ($warehouse_id > 0 || !($line->fk_product > 0) || 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 -->';
 						//ship from preselected location
 						$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
 						$deliverableQty = min($quantityToBeDelivered, $stock);
@@ -1252,11 +1200,10 @@ 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')) $deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
-	                            print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
+								if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty = 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");
+							} else print $langs->trans("NA");
 							print '</td>';
 
 							// Stock
@@ -1271,13 +1218,13 @@ if ($action == 'create')
 									$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : $warehouse_id;
 									if ($line->fk_product > 0)
 									{
-									    print '<!-- Show warehouse selection -->';
+										print '<!-- Show warehouse selection -->';
 
-                                        $stockMin = false;
-									    if (empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) {
-									        $stockMin = 0;
-									    }
-                                        print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1, 0, array(), 'minwidth200', '', 1, $stockMin, 'stock DESC, e.ref');
+										$stockMin = false;
+										if (empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) {
+											$stockMin = 0;
+										}
+										print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1, 0, array(), 'minwidth200', '', 1, $stockMin, 'stock DESC, e.ref');
 
 										if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id)
 										{
@@ -1288,9 +1235,7 @@ if ($action == 'create')
 											}
 										}
 									}
-								}
-								else
-								{
+								} else {
 									print $langs->trans("Service");
 								}
 								print '</td>';
@@ -1320,10 +1265,8 @@ if ($action == 'create')
 									}
 								}
 							}
-						}
-						else
-						{
-						    // Product need lot
+						} else {
+							// Product need lot
 							print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 							print '<!-- Case product need lot -->';
 
@@ -1335,11 +1278,11 @@ if ($action == 'create')
 							$nbofsuggested = 0;
 							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
 							{
-							    foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
-							    {
-							        $nbofsuggested++;
-							    }
-						    }
+								foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
+								{
+									$nbofsuggested++;
+								}
+							}
 							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
 							{
@@ -1362,8 +1305,12 @@ if ($action == 'create')
 
 									$detail = '';
 									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
-									$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
-									$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+									if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
+									}
+									if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+									}
 									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 									$detail .= '<br>';
 									print $detail;
@@ -1376,38 +1323,34 @@ if ($action == 'create')
 									$subj++;
 									print '</td></tr>';
 								}
-							}
-							else
-							{
-							    print '<!-- Case there is no details of lot at all -->';
-							    print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
-							    print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
-							    print '</td>';
+							} else {
+								print '<!-- Case there is no details of lot at all -->';
+								print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
+								print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0" disabled="disabled"> ';
+								print '</td>';
 
-							    print '<td class="left">';
-							    print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->label);
-							    print '</td></tr>';
+								print '<td class="left">';
+								print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $staticwarehouse->label);
+								print '</td></tr>';
 							}
 						}
-					}
-					else
-					{
+					} else {
 						// ship from multiple locations
 						if (empty($conf->productbatch->enabled) || !$product->hasbatch())
 						{
-						    print '<!-- Case warehouse not already known and product does not need lot -->';
-						    print '<td></td><td></td></tr>'."\n"; // end line and start a new one for each warehouse
+							print '<!-- Case warehouse not already known and product does not need lot -->';
+							print '<td></td><td></td></tr>'."\n"; // end line and start a new one for each warehouse
 
 							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 							$subj = 0;
-	    					// Define nb of lines suggested for this order line
+							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
 							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
 							{
 								if ($stock_warehouse->real > 0)
 								{
-	                                $nbofsuggested++;
-							    }
+									$nbofsuggested++;
+								}
 							}
 							$tmpwarehouseObject = new Entrepot($db);
 							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
@@ -1425,8 +1368,7 @@ if ($action == 'create')
 									{
 										print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
-									}
-									else print $langs->trans("NA");
+									} else print $langs->trans("NA");
 									print '</td>';
 
 									// Stock
@@ -1439,9 +1381,7 @@ if ($action == 'create')
 
 											print '<!-- Show details of stock -->';
 											print '('.$stock.')';
-										}
-										else
-										{
+										} else {
 											print $langs->trans("Service");
 										}
 										print '</td>';
@@ -1479,11 +1419,9 @@ if ($action == 'create')
 									}
 								}
 							}
-						}
-						else
-						{
-						    print '<!-- Case warehouse not already known and product need lot -->';
-						    print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
+						} else {
+							print '<!-- Case warehouse not already known and product need lot -->';
+							print '<td></td><td></td></tr>'; // end line and start a new one for lot/serial
 
 							$subj = 0;
 							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
@@ -1494,18 +1432,18 @@ if ($action == 'create')
 							$nbofsuggested = 0;
 							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
 							{
-							    if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-							        foreach ($stock_warehouse->detail_batch as $dbatch)
+								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
+									foreach ($stock_warehouse->detail_batch as $dbatch)
 									{
-	                                    $nbofsuggested++;
+										$nbofsuggested++;
 									}
-							    }
+								}
 							}
 							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
 							{
 								$tmpwarehouseObject->fetch($warehouse_id);
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-							        foreach ($stock_warehouse->detail_batch as $dbatch)
+									foreach ($stock_warehouse->detail_batch as $dbatch)
 									{
 										//var_dump($dbatch);
 										$batchStock = + $dbatch->qty; // To get a numeric
@@ -1549,40 +1487,34 @@ if ($action == 'create')
 
 							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 							{
-							    $disabled = '';
-						        if (!empty($conf->productbatch->enabled) && $product->hasbatch())
-						        {
-	                                $disabled = 'disabled="disabled"';
-							    }
-							    if ($warehouse_selected_id <= 0) {		// We did not force a given warehouse, so we won't have no warehouse to change qty.
-							    	$disabled = 'disabled="disabled"';
-							    }
-	    						print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
-							}
-							else
-							{
-							    print $langs->trans("NA");
+								$disabled = '';
+								if (!empty($conf->productbatch->enabled) && $product->hasbatch())
+								{
+									$disabled = 'disabled="disabled"';
+								}
+								if ($warehouse_selected_id <= 0) {		// We did not force a given warehouse, so we won't have no warehouse to change qty.
+									$disabled = 'disabled="disabled"';
+								}
+								print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="0"'.($disabled ? ' '.$disabled : '').'> ';
+							} else {
+								print $langs->trans("NA");
 							}
 							print '</td>';
 
 							print '<td class="left">';
 							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 							{
-	    						if ($warehouse_selected_id > 0)
-	    						{
-	    							$warehouseObject = new Entrepot($db);
-	    							$warehouseObject->fetch($warehouse_selected_id);
-	    							print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
-	    						}
-	    						else
-	    						{
-	    						    if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
-	    						    else print '';
-	    						}
-							}
-							else
-							{
-							    print $langs->trans("Service");
+								if ($warehouse_selected_id > 0)
+								{
+									$warehouseObject = new Entrepot($db);
+									$warehouseObject->fetch($warehouse_selected_id);
+									print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
+								} else {
+									if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
+									else print '';
+								}
+							} else {
+								print $langs->trans("Service");
 							}
 							print '</td>';
 							print '</tr>';
@@ -1603,32 +1535,29 @@ if ($action == 'create')
 
 						print $expLine->showOptionals($extrafields, 'edit', array('style'=>'class="drag drop oddeven"', 'colspan'=>$colspan), $indiceAsked, '', 1);
 					}
-                }
+				}
 
-	            $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);
-        }
-    }
-}
-elseif ($id || $ref)
+			print '<br>';
+		} else {
+			dol_print_error($db);
+		}
+	}
+} elseif ($id || $ref)
 /* *************************************************************************** */
 /*                                                                             */
 /* Edit and view mode                                                          */
@@ -1662,26 +1591,26 @@ elseif ($id || $ref)
 		// Confirm deleteion
 		if ($action == 'delete')
 		{
-		    $formquestion = array();
-		    if ($object->statut == Expedition::STATUS_CLOSED && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
-		        $formquestion = array(
-                        array(
-                            'label' => $langs->trans('ShipmentIncrementStockOnDelete'),
-                            'name' => 'alsoUpdateStock',
-                            'type' => 'checkbox',
-                            'value' => 0
-                        ),
-                    );
-            }
-		    $formconfirm = $form->formconfirm(
-			    $_SERVER['PHP_SELF'].'?id='.$object->id,
-                $langs->trans('DeleteSending'),
-                $langs->trans("ConfirmDeleteSending", $object->ref),
-                'confirm_delete',
-                $formquestion,
-                0,
-                1
-            );
+			$formquestion = array();
+			if ($object->statut == Expedition::STATUS_CLOSED && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+				$formquestion = array(
+						array(
+							'label' => $langs->trans('ShipmentIncrementStockOnDelete'),
+							'name' => 'alsoUpdateStock',
+							'type' => 'checkbox',
+							'value' => 0
+						),
+					);
+			}
+			$formconfirm = $form->formconfirm(
+				$_SERVER['PHP_SELF'].'?id='.$object->id,
+				$langs->trans('DeleteSending'),
+				$langs->trans("ConfirmDeleteSending", $object->ref),
+				'confirm_delete',
+				$formquestion,
+				0,
+				1
+			);
 		}
 
 		// Confirmation validation
@@ -1691,9 +1620,7 @@ elseif ($id || $ref)
 			if ($objectref == 'PROV')
 			{
 				$numref = $object->getNextNumRef($soc);
-			}
-			else
-			{
+			} else {
 				$numref = $object->ref;
 			}
 
@@ -1733,13 +1660,13 @@ elseif ($id || $ref)
 
 		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);
 		}
 
 		// Shipment card
@@ -1749,52 +1676,52 @@ elseif ($id || $ref)
 		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->rights->expedition->creer, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $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>';
 
 
-    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    	print '<div class="fichecenter">';
-    	print '<div class="fichehalfleft">';
-    	print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-        print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield" width="100%">';
 
 		// Linked documents
 		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
@@ -1838,9 +1765,7 @@ elseif ($id || $ref)
 			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
@@ -1862,14 +1787,12 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->trueWeight;
 			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").': ';
@@ -1897,9 +1820,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 		}
@@ -1921,17 +1842,16 @@ elseif ($id || $ref)
 		$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 sending 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');
-			}
-			else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
+				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)
 		{
@@ -1975,9 +1895,7 @@ elseif ($id || $ref)
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
@@ -1997,23 +1915,21 @@ elseif ($id || $ref)
 		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->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/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->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/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
-			{
+			} 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>';
 		}
 
 		// Other attributes
@@ -2043,7 +1959,7 @@ elseif ($id || $ref)
 		}
 		print '<br>';
 
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%" id="tablelines" >';
 		print '<thead>';
 		print '<tr class="liste_titre">';
@@ -2069,9 +1985,7 @@ elseif ($id || $ref)
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToShip").' - ';
-			}
-			else
-			{
+			} else {
 				print $langs->trans("QtyShipped").' - ';
 			}
 			if (!empty($conf->stock->enabled))
@@ -2083,15 +1997,11 @@ elseif ($id || $ref)
 				print $langs->trans("Batch");
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			if ($object->statut <= 1)
 			{
 				print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
 			}
 			if (!empty($conf->stock->enabled))
@@ -2133,43 +2043,43 @@ elseif ($id || $ref)
 		$alreadysent = array();
 		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 shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
-    		$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
-    		//if ($conf->livraison_bon->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."expeditiondet as ed";
-    		$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
-    		$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
-    		//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = 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('expedition').")";
-    		$sql .= " AND obj.fk_".$origin." = ".$origin_id;
-    		$sql .= " AND obj.rowid = ed.fk_origin_line";
-    		$sql .= " AND ed.fk_expedition = e.rowid";
-    		//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 shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
+			$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
+			//if ($conf->livraison_bon->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."expeditiondet as ed";
+			$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
+			$sql .= ", ".MAIN_DB_PREFIX.$origin."det as obj";
+			//if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = 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('expedition').")";
+			$sql .= " AND obj.fk_".$origin." = ".$origin_id;
+			$sql .= " AND obj.rowid = ed.fk_origin_line";
+			$sql .= " AND ed.fk_expedition = e.rowid";
+			//if ($filter) $sql.= $filter;
+			$sql .= " ORDER BY obj.fk_product";
 
-    		dol_syslog("get list of shipment lines", LOG_DEBUG);
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    		    $num = $db->num_rows($resql);
-    		    $i = 0;
+			dol_syslog("get list of shipment 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->shipmentline_id] = array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($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->shipmentline_id] = array('shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped, 'date_valid'=>$db->jdate($obj->date_valid), 'date_delivery'=>$db->jdate($obj->date_delivery));
+					}
+					$i++;
+				}
+			}
+			//var_dump($alreadysent);
 		}
 
 		print '<tbody>';
@@ -2182,7 +2092,7 @@ elseif ($id || $ref)
 
 			if (empty($reshook))
 			{
-			    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" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'" >';
 
 				// #
@@ -2200,9 +2110,7 @@ elseif ($id || $ref)
 						$prod = new Product($db);
 						$prod->fetch($lines[$i]->fk_product);
 						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
-					}
-					else
-						$label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
+					} else $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
 
 					print '<td class="linecoldescription">';
 
@@ -2235,9 +2143,7 @@ elseif ($id || $ref)
 						print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 					}
 					print "</td>\n";
-				}
-				else
-				{
+				} else {
 					print '<td class="linecoldescription" >';
 					if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
 					else $text = img_object($langs->trans('Product'), 'product');
@@ -2257,35 +2163,35 @@ elseif ($id || $ref)
 				print '<td class="center linecolqty">'.$lines[$i]->qty_asked.'</td>';
 
 				// Qty in other shipments (with shipment and warehouse used)
-	    		if ($origin && $origin_id > 0)
-	    		{
-	    			print '<td class="linecolqtyinothershipments center nowrap">';
-	    			foreach ($alreadysent as $key => $val)
-	    			{
-	    			    if ($lines[$i]->fk_origin_line == $key)
-	    			    {
-	    			        $j = 0;
-	    			        foreach ($val as $shipmentline_id=> $shipmentline_var)
-	    			        {
-	    			            if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
+				if ($origin && $origin_id > 0)
+				{
+					print '<td class="linecolqtyinothershipments center nowrap">';
+					foreach ($alreadysent as $key => $val)
+					{
+						if ($lines[$i]->fk_origin_line == $key)
+						{
+							$j = 0;
+							foreach ($val as $shipmentline_id=> $shipmentline_var)
+							{
+								if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
 
-	    			            $j++;
-	    			            if ($j > 1) print '<br>';
-	    			            $shipment_static->fetch($shipmentline_var['shipment_id']);
-	    			            print $shipment_static->getNomUrl(1);
-	    			            print ' - '.$shipmentline_var['qty_shipped'];
-	    			            $htmltext = $langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
-	    			            if (!empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
-	    			            {
-	    			                $warehousestatic->fetch($shipmentline_var['warehouse']);
-	    			                $htmltext .= '<br>'.$langs->trans("FromLocation").' : '.$warehousestatic->getNomUrl(1, '', 0, 1);
-	    			            }
-	    			            print ' '.$form->textwithpicto('', $htmltext, 1);
-	    			        }
-	    			    }
-	    			}
-	    			print '</td>';
-	    		}
+								$j++;
+								if ($j > 1) print '<br>';
+								$shipment_static->fetch($shipmentline_var['shipment_id']);
+								print $shipment_static->getNomUrl(1);
+								print ' - '.$shipmentline_var['qty_shipped'];
+								$htmltext = $langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
+								if (!empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
+								{
+									$warehousestatic->fetch($shipmentline_var['warehouse']);
+									$htmltext .= '<br>'.$langs->trans("FromLocation").' : '.$warehousestatic->getNomUrl(1, '', 0, 1);
+								}
+								print ' '.$form->textwithpicto('', $htmltext, 1);
+							}
+						}
+					}
+					print '</td>';
+				}
 
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
@@ -2316,8 +2222,7 @@ elseif ($id || $ref)
 						// Batch number managment
 						print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
 						print '</tr>';
-					}
-					elseif (!empty($conf->stock->enabled))
+					} elseif (!empty($conf->stock->enabled))
 					{
 						if ($lines[$i]->fk_product > 0)
 						{
@@ -2332,8 +2237,7 @@ elseif ($id || $ref)
 								// Batch number managment
 								print '<td> - '.$langs->trans("NA").'</td>';
 								print '</tr>';
-							}
-							elseif (count($lines[$i]->details_entrepot) > 1)
+							} elseif (count($lines[$i]->details_entrepot) > 1)
 							{
 								print '<!-- case edit 3 -->';
 								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -2347,15 +2251,11 @@ elseif ($id || $ref)
 									print '<td> - '.$langs->trans("NA").'</td>';
 									print '</tr>';
 								}
-							}
-							else
-							{
+							} else {
 								print '<!-- case edit 4 -->';
 								print '<tr><td colspan="3">'.$langs->trans("NotEnoughStock").'</td></tr>';
 							}
-						}
-						else
-						{
+						} else {
 							print '<!-- case edit 5 -->';
 							print '<tr>';
 							// Qty to ship or shipped
@@ -2369,9 +2269,7 @@ elseif ($id || $ref)
 					}
 
 					print '</table></td>';
-				}
-				else
-				{
+				} else {
 					// Qty to ship or shipped
 					print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.'</td>';
 
@@ -2384,8 +2282,7 @@ elseif ($id || $ref)
 							$entrepot = new Entrepot($db);
 							$entrepot->fetch($lines[$i]->entrepot_id);
 							print $entrepot->getNomUrl(1);
-						}
-						elseif (count($lines[$i]->details_entrepot) > 1)
+						} elseif (count($lines[$i]->details_entrepot) > 1)
 						{
 							$detail = '';
 							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
@@ -2415,15 +2312,17 @@ elseif ($id || $ref)
 								foreach ($lines[$i]->detail_batch as $dbatch)	// $dbatch is instance of ExpeditionLineBatch
 								{
 									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
-									$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
-									$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+									if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
+									}
+									if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+									}
 									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 									$detail .= '<br>';
 								}
 								print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
-							}
-							else
-							{
+							} else {
 								print $langs->trans("NA");
 							}
 							print '</td>';
@@ -2454,15 +2353,14 @@ elseif ($id || $ref)
 					print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
 					print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 					print '</td>';
-				}
-				elseif ($object->statut == Expedition::STATUS_DRAFT)
+				} elseif ($object->statut == Expedition::STATUS_DRAFT)
 				{
 					// edit-delete buttons
 					print '<td class="linecoledit center">';
 					print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
 					print '</td>';
 					print '<td class="linecoldelete" width="10">';
-					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
+					print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
 					print '</td>';
 
 					// Display lines extrafields
@@ -2488,9 +2386,7 @@ elseif ($id || $ref)
 					if ($action == 'editline' && $line->id == $line_id)
 					{
 						print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
-					}
-					else
-					{
+					} else {
 						print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 					}
 				}
@@ -2521,18 +2417,16 @@ elseif ($id || $ref)
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		                                                                                               // modified by hook
+																									   // modified by hook
 		if (empty($reshook))
 		{
 			if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0)
 			{
 				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
-	  		     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
+	  			 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
@@ -2544,10 +2438,8 @@ elseif ($id || $ref)
 				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 				{
 					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>';
+				} else {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
 
@@ -2558,8 +2450,7 @@ elseif ($id || $ref)
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-					}
-					else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+					} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
 				}
 			}
 
@@ -2589,8 +2480,8 @@ elseif ($id || $ref)
 					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on shipments instead of orders
 					if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // 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>';
 				}
@@ -2599,16 +2490,16 @@ elseif ($id || $ref)
 			// Cancel
 			if ($object->statut == Expedition::STATUS_VALIDATED)
 			{
-    			if ($user->rights->expedition->supprimer)
-    			{
-    				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a>';
-    			}
+				if ($user->rights->expedition->supprimer)
+				{
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a>';
+				}
 			}
 
 			// Delete
 			if ($user->rights->expedition->supprimer)
 			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
 			}
 		}
 
@@ -2622,9 +2513,9 @@ elseif ($id || $ref)
 
 	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->expedition->dir_output."/sending/".$objectref;
 
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
@@ -2632,7 +2523,7 @@ elseif ($id || $ref)
 		$genallowed = $user->rights->expedition->lire;
 		$delallowed = $user->rights->expedition->creer;
 
-		print $formfile->showdocuments('expedition', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		print $formfile->showdocuments('expedition', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
 
 		// Show links to link elements
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index e337ee5ffb8..1f85ade883b 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -138,7 +138,7 @@ class Shipments extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -146,29 +146,28 @@ class Shipments extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
         dol_syslog("API Rest request");
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
 
         if ($result)
         {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             $i = 0;
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $shipment_static = new Expedition($db);
+            	$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 : '.$db->lasterror());
+        } else {
+        	throw new RestException(503, 'Error when retrieve commande list : '.$this->db->lasterror());
         }
         if (!count($obj_ret)) {
             throw new RestException(404, 'No shipment found');
@@ -398,9 +397,7 @@ class Shipments extends DolibarrApi
         $updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid);
         if ($updateRes > 0) {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(405, $this->shipment->error);
         }
     }
@@ -435,9 +432,7 @@ class Shipments extends DolibarrApi
         if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->shipment->error);
         }
     }
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index f3e9d5f26f8..bdf79081fe2 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -36,6 +36,7 @@
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
@@ -46,6 +47,8 @@ if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/exped
  */
 class Expedition extends CommonObject
 {
+	use CommonIncoterm;
+
 	/**
 	 * @var string ID to identify managed object
 	 */
@@ -79,6 +82,13 @@ class Expedition extends CommonObject
 
 	public $socid;
 
+	/**
+	 * @var string Customer ref
+	 * @deprecated
+	 * @see $ref_customer
+	 */
+	public $ref_client;
+
 	/**
 	 * @var string Customer ref
 	 */
@@ -251,15 +261,11 @@ class Expedition extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
 			return "";
 		}
@@ -368,9 +374,7 @@ class Expedition extends CommonObject
 						{
 							$error++;
 						}
-					}
-					else
-					{	// with batch management
+					} else {	// with batch management
 						if (!$this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
@@ -408,9 +412,7 @@ class Expedition extends CommonObject
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						foreach ($this->errors as $errmsg)
 						{
 							dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -419,25 +421,19 @@ class Expedition extends CommonObject
 						$this->db->rollback();
 						return -1 * $error;
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
@@ -506,9 +502,7 @@ class Expedition extends CommonObject
 			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $line_ext->rang, $array_options)) < 0)
 			{
 				$error++;
-			}
-			else
-			{
+			} else {
 				// create shipment batch lines for stockLocation
 				foreach ($tab as $detbatch)
 				{
@@ -586,6 +580,7 @@ class Expedition extends CommonObject
 				$this->date_shipping        = $this->db->jdate($obj->date_expedition); // Date real
 				$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;
 				$this->shipping_method_id   = $obj->fk_shipping_method;
 				$this->shipping_method = $obj->shipping_method;
@@ -649,16 +644,12 @@ class Expedition extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
 				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -709,9 +700,7 @@ class Expedition extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
-		}
-		else
-		{
+		} else {
 			$numref = "EXP".$this->id;
 		}
 		$this->newref = dol_sanitizeFileName($numref);
@@ -720,7 +709,7 @@ class Expedition extends CommonObject
 
 		// Validate
 		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-		$sql .= " ref='".$numref."'";
+		$sql .= " ref='".$this->db->escape($numref)."'";
 		$sql .= ", fk_statut = 1";
 		$sql .= ", date_valid = '".$this->db->idate($now)."'";
 		$sql .= ", fk_user_valid = ".$user->id;
@@ -762,9 +751,7 @@ class Expedition extends CommonObject
 					if (empty($obj->edbrowid))
 					{
 						$qty = $obj->qty;
-					}
-					else
-					{
+					} else {
 						$qty = $obj->edbqty;
 					}
 					if ($qty <= 0) continue;
@@ -786,9 +773,7 @@ class Expedition extends CommonObject
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// 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.
@@ -802,9 +787,7 @@ class Expedition extends CommonObject
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
@@ -878,9 +861,7 @@ class Expedition extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -910,16 +891,12 @@ class Expedition extends CommonObject
 				if ($result > 0)
 				{
 					return $result;
-				}
-				else
-				{
+				} else {
 					$this->error = $delivery->error;
 					return $result;
 				}
-			}
-			else return 0;
-		}
-		else return 0;
+			} else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -970,9 +947,7 @@ class Expedition extends CommonObject
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
 					$product_stock = $product->stock_warehouse[$entrepot_id]->real;
-				}
-				else
-					$product_stock = $product->stock_reel;
+				} else $product_stock = $product->stock_reel;
 
 				$product_type = $product->type;
 				if ($product_type == 0 && $product_stock < $qty)
@@ -1102,7 +1077,7 @@ class Expedition extends CommonObject
 		if (isset($this->trueWeight)) $this->weight = trim($this->trueWeight);
 		if (isset($this->note_private)) $this->note = trim($this->note_private);
 		if (isset($this->note_public)) $this->note = trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
+		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
 
 
 
@@ -1168,9 +1143,7 @@ class Expedition extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1264,9 +1237,7 @@ class Expedition extends CommonObject
 							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
 						foreach ($lotArray as $lot)
@@ -1281,9 +1252,7 @@ class Expedition extends CommonObject
 						if ($error) break; // break for loop incase of error
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1361,36 +1330,26 @@ class Expedition extends CommonObject
 							}
 
 							return 1;
-						}
-						else
-						{
+						} else {
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}//*/
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1484,9 +1443,7 @@ class Expedition extends CommonObject
 							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
 						foreach ($lotArray as $lot)
@@ -1501,9 +1458,7 @@ class Expedition extends CommonObject
 						if ($error) break; // break for loop incase of error
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -1590,36 +1545,26 @@ class Expedition extends CommonObject
 							}
 
 							return 1;
-						}
-						else
-						{
+						} else {
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1776,9 +1721,7 @@ class Expedition extends CommonObject
 						if ($originline != $obj->fk_origin_line)
 						{
 							$line->detail_batch = $newdetailbatch;
-						}
-						else
-						{
+						} else {
 							$line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
 						}
 					}
@@ -1788,9 +1731,7 @@ class Expedition extends CommonObject
 				{
 					$this->lines[$lineindex] = $line;
 					$lineindex++;
-				}
-				else
-				{
+				} else {
 					$line->total_ht += $tabprice[0];
 					$line->total_localtax1 	+= $tabprice[9];
 					$line->total_localtax2 	+= $tabprice[10];
@@ -1803,9 +1744,7 @@ class Expedition extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -3;
 		}
@@ -1837,15 +1776,11 @@ class Expedition extends CommonObject
 
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -2045,15 +1980,11 @@ class Expedition extends CommonObject
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -2138,9 +2069,7 @@ class Expedition extends CommonObject
 			$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
-		{
+		} 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'])."'";
@@ -2214,9 +2143,7 @@ class Expedition extends CommonObject
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
-		}
-		else
-		{
+		} else {
 			$this->tracking_url = $value;
 		}
 	}
@@ -2306,9 +2233,7 @@ class Expedition extends CommonObject
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else
-						{
+						} else {
 							$qty = $obj->edbqty;
 						}
 						if ($qty <= 0) continue;
@@ -2328,9 +2253,7 @@ class Expedition extends CommonObject
 								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
-						{
+						} else {
 							// 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
@@ -2342,9 +2265,7 @@ class Expedition extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -2358,9 +2279,7 @@ class Expedition extends CommonObject
 					$error++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$error++;
 		}
@@ -2369,9 +2288,7 @@ class Expedition extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->db->rollback();
 			return -1;
@@ -2414,9 +2331,7 @@ class Expedition extends CommonObject
 		if (empty($error)) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->billed = 0;
 			$this->db->rollback();
@@ -2483,9 +2398,7 @@ class Expedition extends CommonObject
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else
-						{
+						} else {
 							$qty = $obj->edbqty;
 						}
 						if ($qty <= 0) continue;
@@ -2506,9 +2419,7 @@ class Expedition extends CommonObject
 								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
-						{
+						} else {
 							// 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
@@ -2520,9 +2431,7 @@ class Expedition extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -2544,9 +2453,7 @@ class Expedition extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->statut = self::STATUS_CLOSED;
 			$this->billed = $oldbilled;
 			$this->db->rollback();
@@ -2799,9 +2706,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->free($result);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->errors[] = $this->db->lasterror();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -2893,9 +2798,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$error++;
 		}
 	}
@@ -2954,9 +2857,7 @@ class ExpeditionLigne extends CommonObjectLine
 				}
 				// End call triggers
 			}
-		}
-		else
-		{
+		} else {
 			$this->errors[] = $this->db->lasterror()." - sql=$sql";
 			$error++;
 		}
@@ -2964,9 +2865,7 @@ class ExpeditionLigne extends CommonObjectLine
 		if (!$error) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -3008,9 +2907,7 @@ class ExpeditionLigne extends CommonObjectLine
 				dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
 				$this->errors[] = 'ErrorBadParameters';
 				$error++;
-			}
-			else
-			{
+			} else {
 				$batch = $this->detail_batch[0]->batch;
 				$batch_id = $this->detail_batch[0]->fk_origin_stock;
 				$expedition_batch_id = $this->detail_batch[0]->id;
@@ -3022,8 +2919,7 @@ class ExpeditionLigne extends CommonObjectLine
 				}
 				$qty = price2num($this->detail_batch[0]->qty);
 			}
-		}
-		elseif (!empty($this->detail_batch))
+		} elseif (!empty($this->detail_batch))
 		{
 			$batch = $this->detail_batch->batch;
 			$batch_id = $this->detail_batch->fk_origin_stock;
@@ -3064,9 +2960,7 @@ class ExpeditionLigne extends CommonObjectLine
 			{
 				$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
-			}
-			else
-			{
+			} else {
 				// caculate new total line qty
 				foreach ($lotArray as $lot)
 				{
@@ -3163,9 +3057,7 @@ class ExpeditionLigne extends CommonObjectLine
 		if (!$error) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 6c9942dd9a8..703d44e6896 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -90,9 +90,7 @@ class ExpeditionLineBatch extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -135,9 +133,7 @@ class ExpeditionLineBatch extends CommonObject
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
 			$this->fk_expeditiondet = $id_line_expdet;
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -166,9 +162,7 @@ class ExpeditionLineBatch extends CommonObject
 		if ($db->query($sql))
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -230,9 +224,7 @@ class ExpeditionLineBatch extends CommonObject
 			}
 			$db->free($resql);
 			return $ret;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			return -1;
 		}
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 36d471b59d3..69c5080ea83 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('orders', 'sendings', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -87,9 +87,7 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
@@ -117,8 +115,7 @@ elseif ($action == 'deletecontact' && $user->rights->expedition->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 6047be5fe0e..69f59cb3385 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -176,12 +176,10 @@ if ($id > 0 || !empty($ref)) {
 		$permtoedit = $user->rights->expedition->creer;
 		$param = '&id='.$object->id;
 		include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
-}
-else {
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index d3fec260d95..6f21683cc69 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
+ * Copyright (C) 2020      Tobias Sekan         <tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -84,7 +85,7 @@ if (!$user->rights->societe->client->voir && !$socid)
 	$sql .= $clause." sc.fk_user = ".$user->id;
 	$clause = " AND ";
 }
-$sql .= $clause." e.fk_statut = 0";
+$sql .= $clause." e.fk_statut = ".Expedition::STATUS_DRAFT;
 $sql .= " AND e.entity IN (".getEntity('expedition').")";
 if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 
@@ -96,7 +97,13 @@ if ($resql)
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
+	print '<th colspan="3">';
+	print $langs->trans("SendingsToValidate").' ';
+	print '<a href="'.DOL_URL_ROOT.'/expedition/list.php?search_status='.Expedition::STATUS_DRAFT.'">';
+	print '<span class="badge">'.$num.'</span>';
+	print '</a>';
+	print '</th>';
+	print '</tr>';
 
 	if ($num)
 	{
@@ -120,8 +127,7 @@ if ($resql)
 			print '</td></tr>';
 			$i++;
 		}
-	} else
-	{
+	} else {
 		print '<tr><td>'.$langs->trans("None").'</td><td></td><td></td></tr>';
 	}
 
@@ -157,13 +163,21 @@ $resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="4">';
+	print $langs->trans("LastSendings").' ';
+	print '<a href="'.DOL_URL_ROOT.'/expedition/list.php?search_status='.Expedition::STATUS_VALIDATED.'">';
+	print '<span class="badge">'.$num.'</span>';
+	print '</a>';
+	print '</th>';
+	print '</tr>';
+
 	if ($num)
 	{
 		$i = 0;
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="4">'.$langs->trans("LastSendings", $num).'</th></tr>';
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -190,11 +204,12 @@ if ($resql)
 			print '</tr>';
 			$i++;
 		}
-		print "</table></div><br>";
+	} else {
+		print '<tr><td>'.$langs->trans("None").'</td><td></td><td></td><td></td></tr>';
 	}
+	print "</table></div><br>";
 	$db->free($resql);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 /*
  * Open orders
@@ -216,13 +231,21 @@ if ($resql)
 	$langs->load("orders");
 
 	$num = $db->num_rows($resql);
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+
+	print '<tr class="liste_titre">';
+	print '<th colspan="3">'.$langs->trans("OrdersToProcess").' ';
+	print '<a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_VALIDATED.','.Commande::STATUS_ACCEPTED.'">';
+	print '<span class="badge">'.$num.'</span>';
+	print '</a>';
+	print '</th>';
+	print '</tr>';
+
 	if ($num)
 	{
 		$i = 0;
-        print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("OrdersToProcess").' <span class="badge">'.$num.'</span></th></tr>';
 		while ($i < $num && $i < 10)
 		{
 			$obj = $db->fetch_object($resql);
@@ -256,11 +279,12 @@ if ($resql)
 			print '<td></td>';
 			print '</tr>';
 		}
-
-		print "</table></div><br>";
+	} else {
+		print '<tr><td>'.$langs->trans("None").'</td><td></td><td></td></tr>';
 	}
-}
-else dol_print_error($db);
+
+	print "</table></div><br>";
+} else dol_print_error($db);
 
 
 print '</div></div></div>';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 999bde3fb32..37bee98d73f 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -56,9 +56,10 @@ $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
 $search_ref_liv = GETPOST('search_ref_liv', 'alpha');
 $search_ref_customer = GETPOST('search_ref_customer', 'alpha');
 $search_company = GETPOST("search_company", 'alpha');
+$search_tracking = GETPOST("search_tracking", 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
-$search_state = trim(GETPOST("search_state"));
+$search_state = GETPOST("search_state");
 $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_billed = GETPOST("search_billed", 'int');
@@ -70,13 +71,13 @@ $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all',
 $socid = GETPOST('socid', 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
-$search_categ_cus = trim(GETPOST("search_categ_cus", 'int'));
+$search_categ_cus = GETPOST("search_categ_cus", 'int');
 $search_product_category = GETPOST('search_product_category', 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortfield) $sortfield = "e.ref";
 if (!$sortorder) $sortorder = "DESC";
@@ -106,6 +107,7 @@ $fieldstosearchall = array(
 	'e.ref'=>"Ref",
 	's.nom'=>"ThirdParty",
 	'e.note_public'=>'NotePublic',
+	'e.tracking_number'=>"TrackingNumber",
 );
 if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate";
 
@@ -120,6 +122,7 @@ $arrayfields = array(
 	'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.tracking_number'=>array('label'=>$langs->trans("TrackingNumber"), 'checked'=>1),
 	'e.weight'=>array('label'=>$langs->trans("Weight"), 'checked'=>0),
 	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
@@ -172,6 +175,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_state = "";
 	$search_type = '';
 	$search_country = '';
+	$search_tracking='';
 	$search_type_thirdparty = '';
 	$search_billed = '';
 	$search_datedelivery_start = '';
@@ -214,7 +218,7 @@ llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed,";
+$sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as date_livraison, l.date_delivery as date_reception, e.fk_statut, e.billed, e.tracking_number,";
 $sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -273,6 +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_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);
@@ -330,6 +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_town)      $param .= '&search_town='.urlencode($search_town);
 	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
 
@@ -353,11 +359,11 @@ if ($resql)
 	if (in_array($massaction, array('presend'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-	$newcardbutton = '';
-	if ($user->rights->expedition->creer)
-	{
-		$newcardbutton .= dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expedition/card.php?action=create2');
-	}
+	// Currently: a sending can't create from sending list
+	// $url = DOL_URL_ROOT.'/expedition/card.php?action=create';
+	// if (!empty($socid)) $url .= '&socid='.$socid;
+	// $newcardbutton = dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', $url, '', $user->rights->expedition->creer);
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewSending'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expedition/card.php?action=create2', '', $user->rights->expedition->creer);
 
 	$i = 0;
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -402,7 +408,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -411,7 +417,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -507,6 +513,13 @@ if ($resql)
 		print '</div>';
 		print '</td>';
 	}
+	// Tracking number
+	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).'">';
+		print '</td>';
+	}
 	if (!empty($arrayfields['l.ref']['checked']))
 	{
 		// Delivery ref
@@ -579,6 +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['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
@@ -686,9 +700,7 @@ if ($resql)
 				$tmparray = $object->getTotalWeightVolume();
 				print showDimensionInBestUnit($tmparray['weight'], 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 $form->textwithpicto('', $langs->trans('EstimatedWeight'), 1);
-			}
-			else
-			{
+			} else {
 				print $object->trueWeight;
 				print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 			}
@@ -699,13 +711,19 @@ if ($resql)
 		if (!empty($arrayfields['e.date_delivery']['checked']))
 		{
 			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_livraison), "day");
+			print dol_print_date($db->jdate($obj->date_livraison), "dayhour");
 			/*$now = time();
     		if ( ($now - $db->jdate($obj->date_expedition)) > $conf->warnings->lim && $obj->statutid == 1 )
     		{
     		}*/
 			print "</td>\n";
 		}
+		// Tracking number
+		if (! empty($arrayfields['e.tracking_number']['checked']))
+		{
+			print '<td class="center">'.$obj->tracking_number."</td>\n";
+			if (! $i) $totalarray['nbfield']++;
+		}
 
 		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
 		{
@@ -782,7 +800,7 @@ if ($resql)
 	}
 	$db->free($resql);
 
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$parameters = array('arrayfields'=>$arrayfields, 'totalarray' => $totalarray, 'sql'=>$sql);
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
@@ -803,9 +821,7 @@ if ($resql)
 	$title      = '';
 
 	print $formfile->showdocuments('massfilesarea_sendings', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 3c029463e16..199782398a6 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('sendings', 'companies', 'bills', 'deliveries', 'orders'
 
 $id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = '';
@@ -115,7 +115,7 @@ if ($id > 0 || !empty($ref))
                 // $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="'.$_SESSION['newtoken'].'">';
+                $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>';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 75ee2ef4da3..152dee7cd36 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -46,7 +46,7 @@ $langs->loadLangs(array('orders', "companies", "bills", 'propal', 'deliveries',
 
 $id     = GETPOST('id', 'int'); // id of order
 $ref    = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $hookmanager->initHooks(array('ordershipmentcard'));
 
@@ -103,16 +103,17 @@ if (empty($reshook))
     }
 
     if ($action == 'setdatedelivery' && $user->rights->commande->creer)
-    {
-    	//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-    	$datelivraison = dol_mktime(0, 0, 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 = new Commande($db);
-    	$object->fetch($id);
-    	$result = $object->set_date_livraison($user, $datelivraison);
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
-    }
+	    $object->fetch($id);
+	    $result = $object->set_date_livraison($user, $datedelivery);
+	    if ($result < 0)
+	    {
+	        setEventMessages($object->error, $object->errors, 'errors');
+	    }
+	}
     /*
     if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
     {
@@ -189,7 +190,7 @@ if (empty($reshook))
     	$object->oldcopy = dol_clone($object);
 
     	// Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
         if ($ret < 0) $error++;
 
         if (!$error)
@@ -352,7 +353,7 @@ if ($id > 0 || !empty($ref))
 		// Date
 		print '<tr><td>'.$langs->trans('Date').'</td>';
 		print '<td colspan="2">';
-		print dol_print_date($object->date, 'daytext');
+		print dol_print_date($object->date, 'day');
 		if ($object->hasDelay() && empty($object->date_livraison)) {
 		    print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}
@@ -373,13 +374,11 @@ if ($id > 0 || !empty($ref))
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdatedelivery">';
-			print $form->selectDate($object->date_livraison > 0 ? $object->date_livraison : -1, 'liv_', '', '', '', "setdatedelivery");
+			print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
-			print dol_print_date($object->date_livraison, 'daytext');
+		} 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");
 			}
@@ -530,9 +529,7 @@ if ($id > 0 || !empty($ref))
 		    if ($action != 'editincoterm')
 		    {
 		        print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		    }
-		    else
-		    {
+		    } 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>';
@@ -643,9 +640,7 @@ if ($id > 0 || !empty($ref))
 			if (!empty($conf->stock->enabled))
 			{
 				print '<td class="center">'.$langs->trans("RealStock").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>&nbsp;</td>';
 			}
 			print "</tr>\n";
@@ -696,9 +691,7 @@ if ($id > 0 || !empty($ref))
 							}
 
 							$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-						}
-						else
-							$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
+						} else $label = (!empty($objp->label) ? $objp->label : $objp->product_label);
 
 						print '<td>';
 						print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
@@ -738,9 +731,7 @@ if ($id > 0 || !empty($ref))
 						}
 
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print "<td>";
 						if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
@@ -775,9 +766,7 @@ if ($id > 0 || !empty($ref))
 						$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
 						$toBeShippedTotal += $toBeShipped[$objp->fk_product];
 						print $toBeShipped[$objp->fk_product];
-					}
-					else
-					{
+					} else {
 						print '0 ('.$langs->trans("Service").')';
 					}
 					print '</td>';
@@ -798,9 +787,7 @@ if ($id > 0 || !empty($ref))
 							print ' '.img_warning($langs->trans("StockTooLow"));
 						}
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td>&nbsp;</td>';
 					}
 					print "</tr>\n";
@@ -843,9 +830,7 @@ if ($id > 0 || !empty($ref))
 			}
 
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -870,9 +855,7 @@ if ($id > 0 || !empty($ref))
 					{
 						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
 					}
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
 				}
 			}
@@ -934,9 +917,7 @@ if ($id > 0 || !empty($ref))
 				print '</div>';
 
 				$somethingshown = 1;
-			}
-			else
-			{
+			} else {
 				print '<div class="tabsAction">';
 				print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateShipment").'</a>';
 				print '</div>';
@@ -944,9 +925,7 @@ if ($id > 0 || !empty($ref))
 		}
 
 		show_list_sending_receive('commande', $object->id);
-	}
-	else
-	{
+	} else {
 		/* Order not found */
 		setEventMessages($langs->trans("NonExistentOrder"), null, 'errors');
 	}
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index db28b094e65..9521cd46d10 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -74,9 +74,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
 }
 
@@ -271,8 +269,12 @@ foreach ($data as $val)
 
 	print '<tr class="oddeven" height="24">';
 	print '<td class="center">';
-	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a>';
-	else print $langs->trans("ValidationDateNotDefinedEvenIfShipmentValidated");
+	if ($year) {
+		print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a>';
+	} else {
+		// Technical error that should not happen
+		print 'Error: validation date of shipment is not defined. This looks strange because shipment is validated. Try to run /install/repair.php?standard=confirmed';
+	}
 	print '</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
 	/*print '<td class="right">'.price(price2num($val['total'],'MT'),1).'</td>';
@@ -290,8 +292,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();
diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php
index b2c89f68e41..413bc061fbf 100644
--- a/htdocs/expensereport/ajax/ajaxik.php
+++ b/htdocs/expensereport/ajax/ajaxik.php
@@ -52,22 +52,18 @@ $fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat');
 
 if (empty($fk_expense) || $fk_expense < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense')));
 elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat')));
-else
-{
+else {
 	// @see ndfp.class.php:3576 (method: compute_total_km)
 	$expense = new ExpenseReport($db);
 	if ($expense->fetch($fk_expense) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_expense' => $fk_expense));
-	else
-	{
+	else {
 		$userauthor = new User($db);
 		if ($userauthor->fetch($expense->fk_user_author) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author));
-		else
-		{
+		else {
 			$range = ExpenseReportIk::getRangeByUser($userauthor, $fk_c_exp_tax_cat);
 
 			if (empty($range)) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'range' => $range));
-			else
-			{
+			else {
 				$ikoffset = price($range->ikoffset, 0, $langs, 1, -1, -1, $conf->currency);
 				echo json_encode(array('up' => $range->coef, 'ikoffset' => $range->ikoffset, 'title' => $langs->transnoentitiesnoconv('ExpenseRangeOffset', $offset), 'comment' => 'offset should be apply on addline or updateline'));
 			}
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
index 2fdb0cd4fdb..49a7bd4201e 100644
--- a/htdocs/expensereport/ajax/ajaxprojet.php
+++ b/htdocs/expensereport/ajax/ajaxprojet.php
@@ -76,13 +76,9 @@ if (GETPOST('fk_projet') != '')
 	    }
 
 	    echo json_encode($return_arr);
-	}
-	else
-	{
+	} else {
 	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
-}
-else
-{
+} else {
     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 2a0f804b196..4579c1a3e8f 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2017  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
@@ -27,10 +27,11 @@
  */
 
 require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
@@ -60,7 +61,7 @@ $date = dol_mktime(0, 0, 0, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int
 $fk_project = GETPOST('fk_project', 'int');
 $vatrate = GETPOST('vatrate', 'alpha');
 $ref = GETPOST("ref", 'alpha');
-$comments = GETPOST('comments', 'none');
+$comments = GETPOST('comments', 'restricthtml');
 $fk_c_type_fees = GETPOST('fk_c_type_fees', 'int');
 $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('socid_id', 'int');
 
@@ -115,14 +116,14 @@ $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object-
 
 if ($object->id > 0)
 {
-    // Check current user can read this expense report
-    $canread = 0;
-    if (!empty($user->rights->expensereport->readall)) $canread = 1;
-    if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
-    if (!$canread)
-    {
-        accessforbidden();
-    }
+	// Check current user can read this expense report
+	$canread = 0;
+	if (!empty($user->rights->expensereport->readall)) $canread = 1;
+	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
 }
 
 
@@ -145,255 +146,258 @@ if (empty($reshook))
 		}
 		$action = '';
 
-    	$fk_project = '';
-    	$date_start = '';
-    	$date_end = '';
-    	$date = '';
-    	$comments = '';
-    	$vatrate = '';
-    	$value_unit_ht = '';
-    	$value_unit = '';
-    	$qty = 1;
-    	$fk_c_type_fees = -1;
+		$fk_project = '';
+		$date_start = '';
+		$date_end = '';
+		$date = '';
+		$comments = '';
+		$vatrate = '';
+		$value_unit_ht = '';
+		$value_unit = '';
+		$qty = 1;
+		$fk_c_type_fees = -1;
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 	if (GETPOSTISSET('sendit'))    // If we just submit a file
 	{
-	    if ($action == 'updateline') $action = 'editline'; // To avoid to make the updateline now
-	    else $action = ''; // To avoid to make the addline now
+		if ($action == 'updateline') $action = 'editline'; // To avoid to make the updateline now
+		else $action = ''; // To avoid to make the addline now
 	}
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
-    // Action clone object
-    if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->expensereport->creer)
-    {
-        if (1 == 0 && !GETPOST('clone_content', 'alpha') && !GETPOST('clone_receivers', 'alpha'))
-        {
-            setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-        }
-        else
-        {
-            if ($object->id > 0)
-            {
-                // Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
-                $orig = clone $object;
+	// Action clone object
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->expensereport->creer)
+	{
+		if (1 == 0 && !GETPOST('clone_content', 'alpha') && !GETPOST('clone_receivers', 'alpha'))
+		{
+			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+		} else {
+			if ($object->id > 0)
+			{
+				// Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
+				$orig = clone $object;
 
-                $result = $object->createFromClone($user, GETPOST('fk_user_author', 'int'));
-                if ($result > 0)
-                {
-                    header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
-                    exit;
-                }
-                else
-                {
-                    setEventMessages($object->error, $object->errors, 'errors');
-                    $object = $orig;
-                    $action = '';
-                }
-            }
-        }
-    }
+				$result = $object->createFromClone($user, GETPOST('fk_user_author', 'int'));
+				if ($result > 0)
+				{
+					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+					exit;
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+					$object = $orig;
+					$action = '';
+				}
+			}
+		}
+	}
 
-    if ($action == 'confirm_delete' && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->supprimer)
-    {
-    	$object = new ExpenseReport($db);
-    	$result = $object->fetch($id);
-    	$result = $object->delete($user);
-    	if ($result >= 0)
-    	{
-    		header("Location: index.php");
-    		exit;
-    	}
-    	else
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+	if ($action == 'confirm_delete' && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->supprimer)
+	{
+		$object = new ExpenseReport($db);
+		$result = $object->fetch($id);
+		$result = $object->delete($user);
+		if ($result >= 0)
+		{
+			header("Location: index.php");
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 
-    if ($action == 'add' && $user->rights->expensereport->creer)
-    {
-    	$object = new ExpenseReport($db);
+	if ($action == 'add' && $user->rights->expensereport->creer)
+	{
+		$error = 0;
 
-    	$object->date_debut = $date_start;
-    	$object->date_fin = $date_end;
+		$object = new ExpenseReport($db);
 
-    	$object->fk_user_author = GETPOST('fk_user_author', 'int');
-    	if (!($object->fk_user_author > 0)) $object->fk_user_author = $user->id;
+		$object->date_debut = $date_start;
+		$object->date_fin = $date_end;
 
-    	$fuser = new User($db);
-    	$fuser->fetch($object->fk_user_author);
+		$object->fk_user_author = GETPOST('fk_user_author', 'int');
+		if (!($object->fk_user_author > 0)) $object->fk_user_author = $user->id;
 
-    	$object->fk_statut = 1;
-    	$object->fk_c_paiement = GETPOST('fk_c_paiement', 'int');
-    	$object->fk_user_validator = GETPOST('fk_user_validator', 'int');
-    	$object->note_public = GETPOST('note_public', 'none');
-    	$object->note_private = GETPOST('note_private', 'none');
-    	// Fill array 'array_options' with data from add form
-    	if (!$error)
-    	{
-    	    $ret = $extrafields->setOptionalsFromPost(null, $object);
-    	    if ($ret < 0) $error++;
-    	}
+		// Check that expense report is for a user inside the hierarchy or advanced permission for all is set
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) {
+			$error++;
+			setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
+		} else {
+			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
+				if (! in_array($object->fk_user_author, $childids)) {
+					$error++;
+					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+				}
+			}
+		}
 
-    	if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS) && $object->periode_existe($fuser, $object->date_debut, $object->date_fin))
-    	{
-    		$error++;
-    		setEventMessages($langs->trans("ErrorDoubleDeclaration"), null, 'errors');
-    		$action = 'create';
-    	}
+		$fuser = new User($db);
+		$fuser->fetch($object->fk_user_author);
 
-    	if (!$error)
-    	{
-    		$db->begin();
+		$object->status = 1;
+		$object->fk_c_paiement = GETPOST('fk_c_paiement', 'int');
+		$object->fk_user_validator = GETPOST('fk_user_validator', 'int');
+		$object->note_public = GETPOST('note_public', 'restricthtml');
+		$object->note_private = GETPOST('note_private', 'restricthtml');
+		// Fill array 'array_options' with data from add form
+		if (!$error)
+		{
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) $error++;
+		}
 
-    		$id = $object->create($user);
-    		if ($id <= 0)
-    		{
-    			$error++;
-    		}
+		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS) && $object->periode_existe($fuser, $object->date_debut, $object->date_fin))
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorDoubleDeclaration"), null, 'errors');
+			$action = 'create';
+		}
 
-    		if (!$error)
-    		{
-    			$db->commit();
-    			Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    			exit;
-    		}
-    		else
-    		{
-    			setEventMessages($object->error, $object->errors, 'errors');
-    			$db->rollback();
-    			$action = 'create';
-    		}
-    	}
-    }
+		if (!$error)
+		{
+			$db->begin();
 
-    if ($action == 'update' && $user->rights->expensereport->creer)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
+			$id = $object->create($user);
+			if ($id <= 0)
+			{
+				$error++;
+			}
 
-    	$object->date_debut = $date_start;
-    	$object->date_fin = $date_end;
+			if (!$error)
+			{
+				$db->commit();
+				Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$db->rollback();
+				$action = 'create';
+			}
+		}
+	}
 
-    	if ($object->fk_statut < 3)
-    	{
-    		$object->fk_user_validator = GETPOST('fk_user_validator', 'int');
-    	}
+	if ($action == 'update' && $user->rights->expensereport->creer)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
 
-    	$object->fk_c_paiement = GETPOST('fk_c_paiement', 'int');
-    	$object->note_public = GETPOST('note_public', 'none');
-    	$object->note_private = GETPOST('note_private', 'none');
-    	$object->fk_user_modif = $user->id;
+		$object->date_debut = $date_start;
+		$object->date_fin = $date_end;
 
-    	$result = $object->update($user);
-    	if ($result > 0)
-    	{
-    		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
-    		exit;
-    	}
-    	else
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+		if ($object->status < 3)
+		{
+			$object->fk_user_validator = GETPOST('fk_user_validator', 'int');
+		}
 
-    if ($action == 'update_extras')
-    {
-    	$object->oldcopy = dol_clone($object);
+		$object->fk_c_paiement = GETPOST('fk_c_paiement', 'int');
+		$object->note_public = GETPOST('note_public', 'restricthtml');
+		$object->note_private = GETPOST('note_private', 'restricthtml');
+		$object->fk_user_modif = $user->id;
 
-    	// Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
-        if ($ret < 0) $error++;
+		$result = $object->update($user);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 
-        if (!$error)
-        {
-            // Actions on extra fields
-           	$result = $object->insertExtraFields('EXPENSEREPORT_MODIFY');
+	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++;
+
+		if (!$error)
+		{
+			// Actions on extra fields
+		   	$result = $object->insertExtraFields('EXPENSEREPORT_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-        }
+		}
 
-        if ($error)
-            $action = 'edit_extras';
-    }
+		if ($error)
+			$action = 'edit_extras';
+	}
 
-    if ($action == "confirm_validate" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
-    {
-    	$error = 0;
+	if ($action == "confirm_validate" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
+	{
+		$error = 0;
 
-    	$db->begin();
+		$db->begin();
 
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
 
-    	$result = $object->setValidate($user);
+		$result = $object->setValidate($user);
 
-    	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->modelpdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+		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, $hidedetails, $hidedesc, $hideref);
-    		}
-    	}
-    	else
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    		$error++;
-    	}
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$error++;
+		}
 
-    	if (!$error && $result > 0 && $object->fk_user_validator > 0)
-    	{
-    		$langs->load("mails");
+		if (!$error && $result > 0 && $object->fk_user_validator > 0)
+		{
+			$langs->load("mails");
 
-    		// TO
-    		$destinataire = new User($db);
-    		$destinataire->fetch($object->fk_user_validator);
-    		$emailTo = $destinataire->email;
+			// TO
+			$destinataire = new User($db);
+			$destinataire->fetch($object->fk_user_validator);
+			$emailTo = $destinataire->email;
 
-    		// FROM
-    		$expediteur = new User($db);
-    		$expediteur->fetch($object->fk_user_author);
-    		$emailFrom = $expediteur->email;
+			// FROM
+			$expediteur = new User($db);
+			$expediteur->fetch($object->fk_user_author);
+			$emailFrom = $expediteur->email;
 
-    		if ($emailTo && $emailFrom)
-    		{
-    			$filename = array(); $filedir = array(); $mimetype = array();
+			if ($emailTo && $emailFrom)
+			{
+				$filename = array(); $filedir = array(); $mimetype = array();
 
-    			// SUBJECT
-    			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-    			if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				// SUBJECT
+				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-    			$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForApproval");
+				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForApproval");
 
-    			// CONTENT
-    			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+				// CONTENT
+				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$link = '<a href="'.$link.'">'.$link.'</a>';
-    			$message = $langs->transnoentities("ExpenseReportWaitingForApprovalMessage", $expediteur->getFullName($langs), get_date_range($object->date_debut, $object->date_fin, '', $langs), $link);
+				$message = $langs->transnoentities("ExpenseReportWaitingForApprovalMessage", $expediteur->getFullName($langs), get_date_range($object->date_debut, $object->date_fin, '', $langs), $link);
 
-    			// Rebuild pdf
-    			/*
+				// Rebuild pdf
+				/*
     			$object->setDocModel($user,"");
     			$resultPDF = expensereport_pdf_create($db,$id,'',"",$langs);
 
@@ -404,88 +408,78 @@ if (empty($reshook))
     			array_push($mimetype,"application/pdf");
     			*/
 
-    			// PREPARE SEND
-    			$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
+				// PREPARE SEND
+				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-    			if ($mailfile)
-    			{
-    				// SEND
-    				$result = $mailfile->sendfile();
-    				if ($result)
-    				{
-    					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
-    					setEventMessages($mesg, null, 'mesgs');
-    				}
-    				else
-    				{
-    					$langs->load("other");
-    					if ($mailfile->error)
-    					{
-    						$mesg = '';
-    						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-    						$mesg .= '<br>'.$mailfile->error;
-    						setEventMessages($mesg, null, 'errors');
-    					}
-    					else
-    					{
-    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-    					}
-    				}
-    			}
-    			else
-    			{
-    				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-    				$action = '';
-    			}
-    		}
-    		else
-    		{
-    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
-    			$action = '';
-    		}
-    	}
+				if ($mailfile)
+				{
+					// SEND
+					$result = $mailfile->sendfile();
+					if ($result)
+					{
+						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
+						setEventMessages($mesg, null, 'mesgs');
+					} else {
+						$langs->load("other");
+						if ($mailfile->error)
+						{
+							$mesg = '';
+							$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+							$mesg .= '<br>'.$mailfile->error;
+							setEventMessages($mesg, null, 'errors');
+						} else {
+							setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+						}
+					}
+				} else {
+					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+					$action = '';
+				}
+			} else {
+				setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+				$action = '';
+			}
+		}
 
 		if (!$error)
 		{
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-    }
+	}
 
-    if ($action == "confirm_save_from_refuse" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
-    	$result = $object->set_save_from_refuse($user);
+	if ($action == "confirm_save_from_refuse" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
+		$result = $object->set_save_from_refuse($user);
 
-    	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->modelpdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+		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, $hidedetails, $hidedesc, $hideref);
-    		}
-    	}
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
 
-    	if ($result > 0)
-    	{
-    		// Send mail
+		if ($result > 0)
+		{
+			// Send mail
 
    			// TO
    			$destinataire = new User($db);
@@ -499,19 +493,19 @@ if (empty($reshook))
 
    			if ($emailFrom && $emailTo)
    			{
-    			$filename = array(); $filedir = array(); $mimetype = array();
+				$filename = array(); $filedir = array(); $mimetype = array();
 
-   			    // SUBJECT
-    			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-    			if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+   				// SUBJECT
+				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-    			$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForReApproval");
+				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForReApproval");
 
-    			// CONTENT
-    			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+				// CONTENT
+				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$link = '<a href="'.$link.'">'.$link.'</a>';
 				$dateRefusEx = explode(" ", $object->date_refuse);
-    			$message = $langs->transnoentities("ExpenseReportWaitingForReApprovalMessage", $dateRefusEx[0], $object->detail_refuse, $expediteur->getFullName($langs), $link);
+				$message = $langs->transnoentities("ExpenseReportWaitingForReApprovalMessage", $dateRefusEx[0], $object->detail_refuse, $expediteur->getFullName($langs), $link);
 
    				// Rebuild pdf
 				/*
@@ -529,85 +523,75 @@ if (empty($reshook))
 				*/
 
 
-    			// PREPARE SEND
-    			$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
+				// PREPARE SEND
+				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-    			if ($mailfile)
-    			{
-    				// SEND
-    				$result = $mailfile->sendfile();
-    				if ($result)
-    				{
-    					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
-    					setEventMessages($mesg, null, 'mesgs');
-    					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    					exit;
-    				}
-    				else
-    				{
-    					$langs->load("other");
-    					if ($mailfile->error)
-    					{
-    						$mesg = '';
-    						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-    						$mesg .= '<br>'.$mailfile->error;
-    						setEventMessages($mesg, null, 'errors');
-    					}
-    					else
-    					{
-    						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-    					}
-    				}
-    			}
-    			else
-    			{
-    				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-    				$action = '';
-    			}
-    		}
-    		else
-    		{
-    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
-    			$action = '';
-    		}
-    	}
-    	else
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+				if ($mailfile)
+				{
+					// SEND
+					$result = $mailfile->sendfile();
+					if ($result)
+					{
+						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
+						setEventMessages($mesg, null, 'mesgs');
+						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+						exit;
+					} else {
+						$langs->load("other");
+						if ($mailfile->error)
+						{
+							$mesg = '';
+							$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+							$mesg .= '<br>'.$mailfile->error;
+							setEventMessages($mesg, null, 'errors');
+						} else {
+							setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+						}
+					}
+				} else {
+					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+					$action = '';
+				}
+			} else {
+				setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+				$action = '';
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 
-    // Approve
-    if ($action == "confirm_approve" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
+	// Approve
+	if ($action == "confirm_approve" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
 
-    	$result = $object->setApproved($user);
+		$result = $object->setApproved($user);
 
-    	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->modelpdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+		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, $hidedetails, $hidedesc, $hideref);
-    		}
-    	}
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
 
-    	if ($result > 0)
-    	{
-    		// Send mail
+		if ($result > 0)
+		{
+			// Send mail
 
   			// TO
    			$destinataire = new User($db);
@@ -616,7 +600,7 @@ if (empty($reshook))
 
    			// CC
    			$emailCC = $conf->global->NDF_CC_EMAILS;
-            if (empty($emailTo)) $emailTo = $emailCC;
+			if (empty($emailTo)) $emailTo = $emailCC;
 
 			// FROM
    			$expediteur = new User($db);
@@ -625,21 +609,21 @@ if (empty($reshook))
 
    			if ($emailFrom && $emailTo)
    			{
-    			$filename = array(); $filedir = array(); $mimetype = array();
+				$filename = array(); $filedir = array(); $mimetype = array();
 
-   			    // SUBJECT
-    			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-    			if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+   				// SUBJECT
+				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-    			$subject = $societeName." - ".$langs->transnoentities("ExpenseReportApproved");
+				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportApproved");
 
-       			// CONTENT
-       			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+	   			// CONTENT
+	   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$link = '<a href="'.$link.'">'.$link.'</a>';
-       			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
+	   			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
 
-       			// Rebuilt pdf
-    			/*
+	   			// Rebuilt pdf
+				/*
         		$object->setDocModel($user,"");
         		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
 
@@ -653,113 +637,103 @@ if (empty($reshook))
     			}
     			*/
 
-        		$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
+				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-       			if ($mailfile)
-       			{
-       				// SEND
-       				$result = $mailfile->sendfile();
-       				if ($result)
-       				{
-       					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
-       					setEventMessages($mesg, null, 'mesgs');
-       					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-       					exit;
-       				}
-       				else
-       				{
-       					$langs->load("other");
-       					if ($mailfile->error)
-       					{
-       						$mesg = '';
-       						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-       						$mesg .= '<br>'.$mailfile->error;
-       						setEventMessages($mesg, null, 'errors');
-       					}
-       					else
-       					{
-       						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-       					}
-       				}
-       			}
-       			else
-       			{
-       				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-       				$action = '';
-       			}
-   			}
-    		else
-    		{
-    			setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
-    			$action = '';
-    		}
-    	}
-   		else
-   		{
+	   			if ($mailfile)
+	   			{
+	   				// SEND
+	   				$result = $mailfile->sendfile();
+	   				if ($result)
+	   				{
+	   					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
+	   					setEventMessages($mesg, null, 'mesgs');
+	   					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+	   					exit;
+	   				} else {
+	   					$langs->load("other");
+	   					if ($mailfile->error)
+	   					{
+	   						$mesg = '';
+	   						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+	   						$mesg .= '<br>'.$mailfile->error;
+	   						setEventMessages($mesg, null, 'errors');
+	   					} else {
+	   						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+	   					}
+	   				}
+	   			} else {
+	   				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+	   				$action = '';
+	   			}
+   			} else {
+				setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+				$action = '';
+			}
+		} else {
    			setEventMessages($langs->trans("FailedtoSetToApprove"), null, 'warnings');
    			$action = '';
    		}
    	}
 
-    if ($action == "confirm_refuse" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
+	if ($action == "confirm_refuse" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
 
 		$detailRefuse = GETPOST('detail_refuse', 'alpha');
-    	$result = $object->setDeny($user, $detailRefuse);
+		$result = $object->setDeny($user, $detailRefuse);
 
-    	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->modelpdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+		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, $hidedetails, $hidedesc, $hideref);
-    		}
-    	}
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
 
-    	if ($result > 0)
-    	{
-    		// Send mail
+		if ($result > 0)
+		{
+			// Send mail
 
-    		// TO
-    		$destinataire = new User($db);
-    		$destinataire->fetch($object->fk_user_author);
-    		$emailTo = $destinataire->email;
+			// TO
+			$destinataire = new User($db);
+			$destinataire->fetch($object->fk_user_author);
+			$emailTo = $destinataire->email;
 
-    		// FROM
-    		$expediteur = new User($db);
-    		$expediteur->fetch($object->fk_user_refuse);
-    		$emailFrom = $expediteur->email;
+			// FROM
+			$expediteur = new User($db);
+			$expediteur->fetch($object->fk_user_refuse);
+			$emailFrom = $expediteur->email;
 
-    		if ($emailFrom && $emailTo)
-    		{
-    			$filename = array(); $filedir = array(); $mimetype = array();
+			if ($emailFrom && $emailTo)
+			{
+				$filename = array(); $filedir = array(); $mimetype = array();
 
-    		    // SUBJECT
-    			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-    			if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				// SUBJECT
+				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-    			$subject = $societeName." - ".$langs->transnoentities("ExpenseReportRefused");
+				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportRefused");
 
-       			// CONTENT
-       			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+	   			// CONTENT
+	   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$link = '<a href="'.$link.'">'.$link.'</a>';
-    			$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $detailRefuse, $link);
+				$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $detailRefuse, $link);
 
-       			// Rebuilt pdf
-    			/*
+	   			// Rebuilt pdf
+				/*
         		$object->setDocModel($user,"");
         		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
 
@@ -773,123 +747,111 @@ if (empty($reshook))
     			}
     			*/
 
-        		// PREPARE SEND
-        		$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
+				// PREPARE SEND
+				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-        		if ($mailfile)
-        		{
-        			// SEND
-        			$result = $mailfile->sendfile();
-        			if ($result)
-        			{
-        				$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
-        				setEventMessages($mesg, null, 'mesgs');
-        				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-        				exit;
-        			}
-        			else
-        			{
-        				$langs->load("other");
-        				if ($mailfile->error)
-        				{
-        					$mesg = '';
-        					$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-        					$mesg .= '<br>'.$mailfile->error;
-        					setEventMessages($mesg, null, 'errors');
-        				}
-        				else
-        				{
-        					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-        				}
-        			}
-        		}
-        		else
-        		{
-        			setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-        			$action = '';
-        		}
-        	}
-        	else
-        	{
-        		setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
-        		$action = '';
-        	}
-    	}
-    	else
-    	{
-    	    setEventMessages($langs->trans("FailedtoSetToDeny"), null, 'warnings');
-    	    $action = '';
-    	}
-    }
+				if ($mailfile)
+				{
+					// SEND
+					$result = $mailfile->sendfile();
+					if ($result)
+					{
+						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
+						setEventMessages($mesg, null, 'mesgs');
+						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+						exit;
+					} else {
+						$langs->load("other");
+						if ($mailfile->error)
+						{
+							$mesg = '';
+							$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+							$mesg .= '<br>'.$mailfile->error;
+							setEventMessages($mesg, null, 'errors');
+						} else {
+							setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+						}
+					}
+				} else {
+					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+					$action = '';
+				}
+			} else {
+				setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+				$action = '';
+			}
+		} else {
+			setEventMessages($langs->trans("FailedtoSetToDeny"), null, 'warnings');
+			$action = '';
+		}
+	}
 
-    //var_dump($user->id == $object->fk_user_validator);exit;
-    if ($action == "confirm_cancel" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
-    {
-    	if (!GETPOST('detail_cancel', 'alpha'))
-    	{
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
-    	}
-    	else
-    	{
-	    	$object = new ExpenseReport($db);
-	    	$object->fetch($id);
+	//var_dump($user->id == $object->fk_user_validator);exit;
+	if ($action == "confirm_cancel" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
+	{
+		if (!GETPOST('detail_cancel', 'alpha'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
+		} else {
+			$object = new ExpenseReport($db);
+			$object->fetch($id);
 
-	    	if ($user->id == $object->fk_user_valid || $user->id == $object->fk_user_author)
-	    	{
+			if ($user->id == $object->fk_user_valid || $user->id == $object->fk_user_author)
+			{
 				$detailCancel = GETPOST('detail_cancel', 'alpha');
-	    		$result = $object->set_cancel($user, $detailCancel);
+				$result = $object->set_cancel($user, $detailCancel);
 
-	    		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->modelpdf;
-	    				$ret = $object->fetch($id); // Reload to get new records
+				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, $hidedetails, $hidedesc, $hideref);
-	    			}
-	    		}
+						$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					}
+				}
 
-	    		if ($result > 0)
-	    		{
-	    			// Send mail
+				if ($result > 0)
+				{
+					// Send mail
 
-	    			// TO
-	    			$destinataire = new User($db);
-	    			$destinataire->fetch($object->fk_user_author);
-	    			$emailTo = $destinataire->email;
+					// TO
+					$destinataire = new User($db);
+					$destinataire->fetch($object->fk_user_author);
+					$emailTo = $destinataire->email;
 
-	    			// FROM
-	    			$expediteur = new User($db);
-	    			$expediteur->fetch($object->fk_user_cancel);
-	    			$emailFrom = $expediteur->email;
+					// FROM
+					$expediteur = new User($db);
+					$expediteur->fetch($object->fk_user_cancel);
+					$emailFrom = $expediteur->email;
 
-	    			if ($emailFrom && $emailTo)
-	    			{
-	    			    $filename = array(); $filedir = array(); $mimetype = array();
+					if ($emailFrom && $emailTo)
+					{
+						$filename = array(); $filedir = array(); $mimetype = array();
 
-	    			    // SUBJECT
-	    			    $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-	    			    if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+						// SUBJECT
+						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-	    			    $subject = $societeName." - ".$langs->transnoentities("ExpenseReportCanceled");
+						$subject = $societeName." - ".$langs->transnoentities("ExpenseReportCanceled");
 
-	    				// CONTENT
-	    				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+						// CONTENT
+						$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 						$link = '<a href="'.$link.'">'.$link.'</a>';
-	    				$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $detailCancel, $link);
+						$message = $langs->transnoentities("ExpenseReportCanceledMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $detailCancel, $link);
 
-	    				// Rebuilt pdf
-	    				/*
+						// Rebuilt pdf
+						/*
 	    				$object->setDocModel($user,"");
 	    				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
 
@@ -903,344 +865,318 @@ if (empty($reshook))
 	    				}
 	    				*/
 
-	        			// PREPARE SEND
-	        			$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
+						// PREPARE SEND
+						$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-	        			if ($mailfile)
-	        			{
-	        				// SEND
-	        				$result = $mailfile->sendfile();
-	        				if ($result)
-	        				{
-	        					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
-	        					setEventMessages($mesg, null, 'mesgs');
-	        					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-	        					exit;
-	        				}
-	        				else
-	        				{
-	        					$langs->load("other");
-	        					if ($mailfile->error)
-	        					{
-	        						$mesg = '';
-	        						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-	        						$mesg .= '<br>'.$mailfile->error;
-	        						setEventMessages($mesg, null, 'errors');
-	        					}
-	        					else
-	        					{
-	        						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-	        					}
-	        				}
-	        			}
-	        			else
-	        			{
-	        				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-	        				$action = '';
-	        			}
-	    			}
-	    			else
-	    			{
-	    			    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
-	    			    $action = '';
-	    			}
-	    		}
-	    		else
-	    		{
-	    			setEventMessages($langs->trans("FailedToSetToCancel"), null, 'warnings');
-	    			$action = '';
-	    		}
-	    	}
-	    	else
-	    	{
-	    		setEventMessages($object->error, $object->errors, 'errors');
-	    	}
-    	}
-    }
+						if ($mailfile)
+						{
+							// SEND
+							$result = $mailfile->sendfile();
+							if ($result)
+							{
+								$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
+								setEventMessages($mesg, null, 'mesgs');
+								header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+								exit;
+							} else {
+								$langs->load("other");
+								if ($mailfile->error)
+								{
+									$mesg = '';
+									$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+									$mesg .= '<br>'.$mailfile->error;
+									setEventMessages($mesg, null, 'errors');
+								} else {
+									setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+								}
+							}
+						} else {
+							setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+							$action = '';
+						}
+					} else {
+						setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+						$action = '';
+					}
+				} else {
+					setEventMessages($langs->trans("FailedToSetToCancel"), null, 'warnings');
+					$action = '';
+				}
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	}
 
-    if ($action == "confirm_setdraft" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
-    	if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
-    	{
-    		$result = $object->setStatut(0);
+	if ($action == "confirm_setdraft" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
+		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
+		{
+			$result = $object->setStatut(0);
 
-    		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->modelpdf;
-    				$ret = $object->fetch($id); // Reload to get new records
+			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, $hidedetails, $hidedesc, $hideref);
-    			}
-    		}
+					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
+			}
 
-    		if ($result > 0)
-    		{
-    			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-    			exit;
-    		}
-    		else
-    		{
-    			setEventMessages($object->error, $object->errors, 'errors');
-    		}
-    	}
-    	else
-    	{
-    		setEventMessages("NOT_AUTHOR", '', 'errors');
-    	}
-    }
+			if ($result > 0)
+			{
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		} else {
+			setEventMessages("NOT_AUTHOR", '', 'errors');
+		}
+	}
 
-    if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
+	if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
 
-    	$result = $object->set_unpaid($user);
+		$result = $object->set_unpaid($user);
 
-    	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->modelpdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+		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, $hidedetails, $hidedesc, $hideref);
-    		}
-    	}
-    }
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+	}
 
-    if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
+	if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
 
-    	$result = $object->set_unpaid($user);
+		$result = $object->set_unpaid($user);
 
-    	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->modelpdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+		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, $hidedetails, $hidedesc, $hideref);
-    		}
-    	}
-    }
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+	}
 
-    if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
+	if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
 
-    	$result = $object->set_paid($id, $user);
+		$result = $object->set_paid($id, $user);
 
-    	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->modelpdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+		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, $hidedetails, $hidedesc, $hideref);
-    		}
-    	}
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
 
-    	if ($result > 0)
-    	{
-    		// Send mail
+		if ($result > 0)
+		{
+			// Send mail
 
-    		// TO
-    		$destinataire = new User($db);
-    		$destinataire->fetch($object->fk_user_author);
-    		$emailTo = $destinataire->email;
+			// TO
+			$destinataire = new User($db);
+			$destinataire->fetch($object->fk_user_author);
+			$emailTo = $destinataire->email;
 
-    		// FROM
-    		$expediteur = new User($db);
-    		$expediteur->fetch($user->id);
-    		$emailFrom = $expediteur->email;
+			// FROM
+			$expediteur = new User($db);
+			$expediteur->fetch($user->id);
+			$emailFrom = $expediteur->email;
 
-    		if ($emailFrom && $emailTo)
-    		{
-    			$filename = array(); $filedir = array(); $mimetype = array();
+			if ($emailFrom && $emailTo)
+			{
+				$filename = array(); $filedir = array(); $mimetype = array();
 
-    		    // SUBJECT
-    			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-    			if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				// SUBJECT
+				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-    			$subject = $societeName." - ".$langs->transnoentities("ExpenseReportPaid");
+				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportPaid");
 
-    			// CONTENT
-    			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+				// CONTENT
+				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$link = '<a href="'.$link.'">'.$link.'</a>';
-    			$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
+				$message = $langs->transnoentities("ExpenseReportPaidMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
 
-        		// Generate pdf before attachment
-        		$object->setDocModel($user, "");
-        		$resultPDF = expensereport_pdf_create($db, $object, '', "", $langs);
+				// Generate pdf before attachment
+				$object->setDocModel($user, "");
+				$resultPDF = expensereport_pdf_create($db, $object, '', "", $langs);
 
-        		// PREPARE SEND
-        		$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
+				// PREPARE SEND
+				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-        		if ($mailfile)
-        		{
-        			// SEND
-    				$result = $mailfile->sendfile();
-        			if ($result)
-        			{
-        				$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
-        				setEventMessages($mesg, null, 'mesgs');
-        				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-        				exit;
-        			}
-        			else
-        			{
-    					$langs->load("other");
-        				if ($mailfile->error)
-        				{
-        					$mesg = '';
-        					$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-        					$mesg .= '<br>'.$mailfile->error;
-        					setEventMessages($mesg, null, 'errors');
-        				}
-        				else
-        				{
-        					setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-        				}
-        			}
-        		}
-        		else
-        		{
-        			setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-        			$action = '';
-        		}
-    		}
-    		else
-    		{
-    		    setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
-    		    $action = '';
-    		}
-    	}
-    	else
-    	{
-    		setEventMessages($langs->trans("FailedToSetPaid"), null, 'warnings');
-    		$action = '';
-    	}
-    }
+				if ($mailfile)
+				{
+					// SEND
+					$result = $mailfile->sendfile();
+					if ($result)
+					{
+						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
+						setEventMessages($mesg, null, 'mesgs');
+						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+						exit;
+					} else {
+						$langs->load("other");
+						if ($mailfile->error)
+						{
+							$mesg = '';
+							$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+							$mesg .= '<br>'.$mailfile->error;
+							setEventMessages($mesg, null, 'errors');
+						} else {
+							setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+						}
+					}
+				} else {
+					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+					$action = '';
+				}
+			} else {
+				setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
+				$action = '';
+			}
+		} else {
+			setEventMessages($langs->trans("FailedToSetPaid"), null, 'warnings');
+			$action = '';
+		}
+	}
 
-    if ($action == "addline" && $user->rights->expensereport->creer)
-    {
-    	$error = 0;
+	if ($action == "addline" && $user->rights->expensereport->creer)
+	{
+		$error = 0;
 
-    	// First save uploaded file
-    	$fk_ecm_files = 0;
-    	if (GETPOSTISSET('attachfile'))
-    	{
-    	    $arrayoffiles = GETPOST('attachfile', 'array');
-    	    if (is_array($arrayoffiles) && !empty($arrayoffiles[0]))
-    	    {
-    	        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-    	        $relativepath = 'expensereport/'.$object->ref.'/'.$arrayoffiles[0];
-    	        $ecmfiles = new EcmFiles($db);
-    	        $ecmfiles->fetch(0, '', $relativepath);
-    	        $fk_ecm_files = $ecmfiles->id;
-    	    }
-    	}
+		// First save uploaded file
+		$fk_ecm_files = 0;
+		if (GETPOSTISSET('attachfile'))
+		{
+			$arrayoffiles = GETPOST('attachfile', 'array');
+			if (is_array($arrayoffiles) && !empty($arrayoffiles[0]))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+				$relativepath = 'expensereport/'.$object->ref.'/'.$arrayoffiles[0];
+				$ecmfiles = new EcmFiles($db);
+				$ecmfiles->fetch(0, '', $relativepath);
+				$fk_ecm_files = $ecmfiles->id;
+			}
+		}
 
 		// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
-    	if (empty($vatrate)) $vatrate = "0.000";
-    	$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $vatrate));
+		if (empty($vatrate)) $vatrate = "0.000";
+		$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $vatrate));
 
 		$value_unit_ht = price2num(GETPOST('value_unit_ht', 'alpha'), 'MU');
 		$value_unit = price2num(GETPOST('value_unit', 'alpha'), 'MU');
 		if (empty($value_unit))
 		{
-		    $value_unit = price2num($value_unit_ht + ($value_unit_ht * $tmpvat / 100), 'MU');
+			$value_unit = price2num($value_unit_ht + ($value_unit_ht * $tmpvat / 100), 'MU');
 		}
 
 		$fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
 
-    	$qty = GETPOST('qty', 'int');
-    	if (empty($qty)) $qty = 1;
+		$qty = GETPOST('qty', 'int');
+		if (empty($qty)) $qty = 1;
 
-    	if (!($fk_c_type_fees > 0))
-    	{
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-    		$action = '';
-    	}
+		if (!($fk_c_type_fees > 0))
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+			$action = '';
+		}
 
-    	if ((int) $tmpvat < 0 || $tmpvat == '')
-    	{
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("VAT")), null, 'errors');
-    		$action = '';
-    	}
+		if ((int) $tmpvat < 0 || $tmpvat == '')
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("VAT")), null, 'errors');
+			$action = '';
+		}
 
-    	// Si aucune date n'est rentrée
-    	if (empty($date) || $date == "--")
-    	{
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-    	}
-    	// Si aucun prix n'est rentré
-    	if ($value_unit == 0)
-    	{
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PriceUTTC")), null, 'errors');
-    	}
-    	// Warning if date out of range
-    	if ($date < $object->date_debut || $date > ($object->date_fin + (24 * 3600 - 1)))
-    	{
-    		$langs->load("errors");
-    		setEventMessages($langs->trans("WarningDateOfLineMustBeInExpenseReportRange"), null, 'warnings');
-    	}
+		// Si aucune date n'est rentrée
+		if (empty($date) || $date == "--")
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+		}
+		// Si aucun prix n'est rentré
+		if ($value_unit == 0)
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PriceUTTC")), null, 'errors');
+		}
+		// Warning if date out of range
+		if ($date < $object->date_debut || $date > ($object->date_fin + (24 * 3600 - 1)))
+		{
+			$langs->load("errors");
+			setEventMessages($langs->trans("WarningDateOfLineMustBeInExpenseReportRange"), null, 'warnings');
+		}
 
-    	if (!$error)
-    	{
-    		$type = 0; // TODO What if service ? We should take the type product/service from the type of expense report llx_c_type_fees
+		if (!$error)
+		{
+			$type = 0; // TODO What if service ? We should take the type product/service from the type of expense report llx_c_type_fees
 
 			// Insert line
-    		$result = $object->addline($qty, $value_unit, $fk_c_type_fees, $vatrate, $date, $comments, $fk_project, $fk_c_exp_tax_cat, $type, $fk_ecm_files);
+			$result = $object->addline($qty, $value_unit, $fk_c_type_fees, $vatrate, $date, $comments, $fk_project, $fk_c_exp_tax_cat, $type, $fk_ecm_files);
 			if ($result > 0)
 			{
 				$ret = $object->fetch($object->id); // Reload to get new records
@@ -1256,7 +1192,7 @@ if (empty($reshook))
 						$outputlangs->setDefaultLang($newlang);
 					}
 
-					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
 				unset($qty);
@@ -1271,163 +1207,159 @@ if (empty($reshook))
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-    	}
+		}
 
-    	$action = '';
-    }
+		$action = '';
+	}
 
-    if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->rights->expensereport->creer)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
+	if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->rights->expensereport->creer)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
 
-    	$object_ligne = new ExpenseReportLine($db);
-    	$object_ligne->fetch(GETPOST("rowid", 'int'));
-    	$total_ht = $object_ligne->total_ht;
-    	$total_tva = $object_ligne->total_tva;
+		$object_ligne = new ExpenseReportLine($db);
+		$object_ligne->fetch(GETPOST("rowid", 'int'));
+		$total_ht = $object_ligne->total_ht;
+		$total_tva = $object_ligne->total_tva;
 
-    	$result = $object->deleteline(GETPOST("rowid", 'int'), $user);
-    	if ($result >= 0)
-    	{
-    		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->modelpdf;
-    				$ret = $object->fetch($id); // Reload to get new records
+		$result = $object->deleteline(GETPOST("rowid", 'int'), $user);
+		if ($result >= 0)
+		{
+			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, $hidedetails, $hidedesc, $hideref);
-    			}
-    		}
+					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
+			}
 
-    		$object->update_totaux_del($object_ligne->total_ht, $object_ligne->total_tva);
-    		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_GET['id']);
-    		exit;
-    	}
-    	else
-    	{
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+			$object->update_totaux_del($object_ligne->total_ht, $object_ligne->total_tva);
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_GET['id']);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 
-    if ($action == "updateline" && $user->rights->expensereport->creer)
-    {
-    	$object = new ExpenseReport($db);
-    	$object->fetch($id);
+	if ($action == "updateline" && $user->rights->expensereport->creer)
+	{
+		$object = new ExpenseReport($db);
+		$object->fetch($id);
 
-    	// First save uploaded file
-    	$fk_ecm_files = 0;
-    	if (GETPOSTISSET('attachfile'))
-    	{
-    	    $arrayoffiles = GETPOST('attachfile', 'array');
-    	    if (is_array($arrayoffiles) && !empty($arrayoffiles[0]))
-    	    {
-    	        include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
-    	        $relativepath = 'expensereport/'.$object->ref.'/'.$arrayoffiles[0];
-    	        $ecmfiles = new EcmFiles($db);
-    	        $ecmfiles->fetch(0, '', $relativepath);
-    	        $fk_ecm_files = $ecmfiles->id;
-    	    }
-    	}
+		// First save uploaded file
+		$fk_ecm_files = 0;
+		if (GETPOSTISSET('attachfile'))
+		{
+			$arrayoffiles = GETPOST('attachfile', 'array');
+			if (is_array($arrayoffiles) && !empty($arrayoffiles[0]))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
+				$relativepath = 'expensereport/'.$object->ref.'/'.$arrayoffiles[0];
+				$ecmfiles = new EcmFiles($db);
+				$ecmfiles->fetch(0, '', $relativepath);
+				$fk_ecm_files = $ecmfiles->id;
+			}
+		}
 
-    	$rowid = $_POST['rowid'];
-    	$type_fees_id = GETPOST('fk_c_type_fees', 'int');
+		$rowid = $_POST['rowid'];
+		$type_fees_id = GETPOST('fk_c_type_fees', 'int');
 		$fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
-    	$projet_id = $fk_project;
-    	$comments = GETPOST('comments', 'none');
-    	$qty = GETPOST('qty', 'int');
-    	$vatrate = GETPOST('vatrate', 'alpha');
+		$projet_id = $fk_project;
+		$comments = GETPOST('comments', 'restricthtml');
+		$qty = GETPOST('qty', 'int');
+		$vatrate = GETPOST('vatrate', 'alpha');
 
-    	// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
-    	if (empty($vatrate)) $vatrate = "0.000";
-    	$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $vatrate));
+		// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
+		if (empty($vatrate)) $vatrate = "0.000";
+		$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $vatrate));
 
-    	$value_unit_ht = price2num(GETPOST('value_unit_ht', 'alpha'), 'MU');
-    	$value_unit = price2num(GETPOST('value_unit', 'alpha'), 'MU');
-    	if (empty($value_unit))
-    	{
-    	    $value_unit = price2num($value_unit_ht + ($value_unit_ht * $tmpvat / 100), 'MU');
-    	}
+		$value_unit_ht = price2num(GETPOST('value_unit_ht', 'alpha'), 'MU');
+		$value_unit = price2num(GETPOST('value_unit', 'alpha'), 'MU');
+		if (empty($value_unit))
+		{
+			$value_unit = price2num($value_unit_ht + ($value_unit_ht * $tmpvat / 100), 'MU');
+		}
 
-    	if (!GETPOST('fk_c_type_fees', 'int') > 0)
-    	{
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-    		$action = '';
-    	}
-    	if ((int) $tmpvat < 0 || $tmpvat == '')
-    	{
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Vat")), null, 'errors');
-    		$action = '';
-    	}
-    	// Warning if date out of range
+		if (!GETPOST('fk_c_type_fees', 'int') > 0)
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+			$action = '';
+		}
+		if ((int) $tmpvat < 0 || $tmpvat == '')
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Vat")), null, 'errors');
+			$action = '';
+		}
+		// Warning if date out of range
 		if ($date < $object->date_debut || $date > ($object->date_fin + (24 * 3600 - 1)))
-    	{
-    		$langs->load("errors");
-    		setEventMessages($langs->trans("WarningDateOfLineMustBeInExpenseReportRange"), null, 'warnings');
-    	}
+		{
+			$langs->load("errors");
+			setEventMessages($langs->trans("WarningDateOfLineMustBeInExpenseReportRange"), null, 'warnings');
+		}
 
-    	if (!$error)
-    	{
-    	    // TODO Use update method of ExpenseReportLine
-    	    $result = $object->updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $id, $fk_c_exp_tax_cat, $fk_ecm_files);
-    		if ($result >= 0)
-    		{
-    			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->modelpdf;
-    					$ret = $object->fetch($id); // Reload to get new records
+		if (!$error)
+		{
+			// TODO Use update method of ExpenseReportLine
+			$result = $object->updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $id, $fk_c_exp_tax_cat, $fk_ecm_files);
+			if ($result >= 0)
+			{
+				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, $hidedetails, $hidedesc, $hideref);
-    				}
-    			}
+						$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					}
+				}
 
-    			$result = $object->recalculer($id);
+				$result = $object->recalculer($id);
 
-    			//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');
+			}
+		}
+	}
 
 	// Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'EXPENSEREPORT_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_EXPENSEREPORT_TO';
-    $trackid = 'exp'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'EXPENSEREPORT_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_EXPENSEREPORT_TO';
+	$trackid = 'exp'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Actions to build doc
-    $upload_dir = $conf->expensereport->dir_output;
-    $permissiontoadd = $user->rights->expensereport->creer;
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	// Actions to build doc
+	$upload_dir = $conf->expensereport->dir_output;
+	$permissiontoadd = $user->rights->expensereport->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -1437,6 +1369,7 @@ if (empty($reshook))
 
 $title = $langs->trans("ExpenseReport")." - ".$langs->trans("Card");
 $helpurl = "EN:Module_Expense_Reports";
+
 llxHeader("", $title, $helpurl);
 
 $form = new Form($db);
@@ -1446,6 +1379,7 @@ $projecttmp = new Project($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
 $bankaccountstatic = new Account($db);
 $ecmfilesstatic = new EcmFiles($db);
+$formexpensereport = new FormExpenseReport($db);
 
 // Create
 if ($action == 'create')
@@ -1483,8 +1417,8 @@ if ($action == 'create')
 	print '<td>';
 	$defaultselectuser = $user->id;
 	if (GETPOST('fk_user_author', 'int') > 0) $defaultselectuser = GETPOST('fk_user_author', 'int');
-    $include_users = 'hierarchyme';
-    if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expensereport->writeall_advance)) $include_users = array();
+	$include_users = 'hierarchyme';
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expensereport->writeall_advance)) $include_users = array();
 	$s = $form->select_dolusers($defaultselectuser, "fk_user_author", 0, "", 0, $include_users, '', '0,'.$conf->entity);
 	print $s;
 	print '</td>';
@@ -1497,13 +1431,12 @@ if ($action == 'create')
 	$object = new ExpenseReport($db);
 	$include_users = $object->fetch_users_approver_expensereport();
 	if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateExpenseReport");
-	else
-	{
-    	$defaultselectuser = (empty($user->fk_user_expense_validator) ? $user->fk_user : $user->fk_user_expense_validator); // Will work only if supervisor has permission to approve so is inside include_users
-    	if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR; // Can force default approver
-    	if (GETPOST('fk_user_validator', 'int') > 0) $defaultselectuser = GETPOST('fk_user_validator', 'int');
-    	$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", ((empty($defaultselectuser) || empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE)) ? 0 : 1), $include_users);
-    	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+	else {
+		$defaultselectuser = (empty($user->fk_user_expense_validator) ? $user->fk_user : $user->fk_user_expense_validator); // Will work only if supervisor has permission to approve so is inside include_users
+		if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR; // Can force default approver
+		if (GETPOST('fk_user_validator', 'int') > 0) $defaultselectuser = GETPOST('fk_user_validator', 'int');
+		$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", ((empty($defaultselectuser) || empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE)) ? 0 : 1), $include_users);
+		print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 	}
 	print '</td>';
 	print '</tr>';
@@ -1542,9 +1475,9 @@ if ($action == 'create')
 	// Other attributes
 	$parameters = array('colspan' => ' colspan="3"', 'cols' => 3);
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
-    print $hookmanager->resPrint;
+	print $hookmanager->resPrint;
 	if (empty($reshook)) {
-	    print $object->showOptionals($extrafields, 'edit', $parameters);
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	print '<tbody>';
@@ -1558,9 +1491,7 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-}
-else
-{
+} else {
 	if ($id > 0 || $ref)
 	{
 		$result = $object->fetch($id, $ref);
@@ -1572,7 +1503,7 @@ else
 			if (!in_array($object->fk_user_author, $user->getAllChildIds(1)))
 			{
 				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)))
 				{
 					print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
 
@@ -1581,8 +1512,8 @@ else
 					print '</div>';
 
 					// End of page
-                    llxFooter();
-                    $db->close();
+					llxFooter();
+					$db->close();
 
 					exit;
 				}
@@ -1590,7 +1521,7 @@ else
 
 			$head = expensereport_prepare_head($object);
 
-			if ($action == 'edit' && ($object->fk_statut < 3 || $object->fk_statut == 99))
+			if ($action == 'edit' && ($object->status < 3 || $object->status == 99))
 			{
 				print "<form name='update' action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n";
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1598,12 +1529,10 @@ else
 
 				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
 
-				if ($object->fk_statut == 99)
+				if ($object->status == 99)
 				{
 					print '<input type="hidden" name="action" value="updateFromRefuse">';
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="action" value="update">';
 				}
 
@@ -1617,15 +1546,15 @@ else
 				$userfee = new User($db);
 				if ($object->fk_user_author > 0)
 				{
-				    $userfee->fetch($object->fk_user_author);
-				    print $userfee->getNomUrl(-1);
+					$userfee->fetch($object->fk_user_author);
+					print $userfee->getNomUrl(-1);
 				}
 				print '</td></tr>';
 
-            	// Ref
-            	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>';
-            	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-            	print '</td></tr>';
+				// Ref
+				print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>';
+				print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+				print '</td></tr>';
 
 				print '<tr>';
 				print '<td>'.$langs->trans("DateStart").'</td>';
@@ -1650,7 +1579,7 @@ else
 					print '</tr>';
 				}
 
-				if ($object->fk_statut < 3)
+				if ($object->status < 3)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // Approbator
@@ -1660,9 +1589,7 @@ else
 					print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 					print '</td>';
 					print '</tr>';
-				}
-				else
-				{
+				} else {
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDOR").'</td>';
 					print '<td>';
@@ -1672,7 +1599,7 @@ else
 					print '</td></tr>';
 				}
 
-				if ($object->fk_statut == 6)
+				if ($object->status == 6)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
@@ -1697,22 +1624,20 @@ else
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				dol_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
 				// Clone confirmation
 				if ($action == 'clone') {
-				    // Create an array for form
-				    $criteriaforfilter = 'hierarchyme';
-				    if (!empty($user->rights->expensereport->readall)) $criteriaforfilter = '';
-				    $formquestion = array(
-				        'text' => '',
-				        array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter))
-                    );
-				    // Paiement incomplet. On demande si motif = escompte ou autre
-				    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+					// Create an array for form
+					$criteriaforfilter = 'hierarchyme';
+					if (!empty($user->rights->expensereport->readall)) $criteriaforfilter = '';
+					$formquestion = array(
+						'text' => '',
+						array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
+					);
+					// Paiement incomplet. On demande si motif = escompte ou autre
+					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 				}
 
 				if ($action == 'save')
@@ -1748,7 +1673,7 @@ else
 
 				if ($action == 'setdraft')
 				{
-				    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("BrouillonnerTrip"), $langs->trans("ConfirmBrouillonnerTrip"), "confirm_setdraft", "", "", 1);
+					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("BrouillonnerTrip"), $langs->trans("ConfirmBrouillonnerTrip"), "confirm_setdraft", "", "", 1);
 				}
 
 				if ($action == 'refuse')		// Deny
@@ -1823,10 +1748,10 @@ else
 				print '<td>';
 				if ($object->fk_user_author > 0)
 				{
-				    $userauthor = new User($db);
-				    $result = $userauthor->fetch($object->fk_user_author);
-				    if ($result < 0) dol_print_error('', $userauthor->error);
-				    elseif ($result > 0) print $userauthor->getNomUrl(-1);
+					$userauthor = new User($db);
+					$result = $userauthor->fetch($object->fk_user_author);
+					if ($result < 0) dol_print_error('', $userauthor->error);
+					elseif ($result > 0) print $userauthor->getNomUrl(-1);
 				}
 				print '</td></tr>';
 
@@ -1854,7 +1779,7 @@ else
 				print '</tr>';
 
 				// User to inform for approval
-				if ($object->fk_statut <= ExpenseReport::STATUS_VALIDATED)	// informed
+				if ($object->status <= ExpenseReport::STATUS_VALIDATED)	// informed
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // approver
@@ -1866,13 +1791,12 @@ else
 						if ($result > 0) print $userfee->getNomUrl(-1);
 						if (empty($userfee->email) || !isValidEmail($userfee->email))
 						{
-						    $langs->load("errors");
-						    print img_warning($langs->trans("ErrorBadEMail", $userfee->email));
+							$langs->load("errors");
+							print img_warning($langs->trans("ErrorBadEMail", $userfee->email));
 						}
 					}
 					print '</td></tr>';
-				}
-				elseif ($object->fk_statut == ExpenseReport::STATUS_CANCELED)
+				} elseif ($object->status == ExpenseReport::STATUS_CANCELED)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
@@ -1893,9 +1817,7 @@ else
 					print '<td>'.$langs->trans("DATE_CANCEL").'</td>';
 					print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td></tr>';
 					print '</tr>';
-				}
-				else
-				{
+				} else {
 					print '<tr>';
 					print '<td>'.$langs->trans("ApprovedBy").'</td>';
 					print '<td>';
@@ -1913,7 +1835,7 @@ else
 					print '</tr>';
 				}
 
-				if ($object->fk_statut == 99 || !empty($object->detail_refuse))
+				if ($object->status == 99 || !empty($object->detail_refuse))
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("REFUSEUR").'</td>';
@@ -1931,7 +1853,7 @@ else
 					print '</tr>';
 				}
 
-				if ($object->fk_statut == 6)
+				if ($object->status == $object::STATUS_CLOSED)
 				{
 					/* TODO this fields are not yet filled
 					print '<tr>';
@@ -1966,11 +1888,11 @@ else
 				print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
 				print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
 				$rowspan = 5;
-				if ($object->fk_statut <= ExpenseReport::STATUS_VALIDATED) $rowspan++;
-				elseif ($object->fk_statut == ExpenseReport::STATUS_CANCELED) $rowspan += 2;
+				if ($object->status <= ExpenseReport::STATUS_VALIDATED) $rowspan++;
+				elseif ($object->status == ExpenseReport::STATUS_CANCELED) $rowspan += 2;
 				else $rowspan += 2;
-				if ($object->fk_statut == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) $rowspan += 2;
-				if ($object->fk_statut == ExpenseReport::STATUS_CLOSED) $rowspan += 2;
+				if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) $rowspan += 2;
+				if ($object->status == ExpenseReport::STATUS_CLOSED) $rowspan += 2;
 				print "</td>";
 				print '</tr>';
 
@@ -2020,26 +1942,25 @@ else
 				$resql = $db->query($sql);
 				if ($resql)
 				{
-				    $num = $db->num_rows($resql);
-				    $i = 0; $totalpaid = 0;
-				    while ($i < $num)
-				    {
-				        $objp = $db->fetch_object($resql);
+					$num = $db->num_rows($resql);
+					$i = 0; $totalpaid = 0;
+					while ($i < $num)
+					{
+						$objp = $db->fetch_object($resql);
 
-				        $paymentexpensereportstatic->id = $objp->rowid;
-				        $paymentexpensereportstatic->datepaye = $db->jdate($objp->dp);
-				        $paymentexpensereportstatic->ref = $objp->rowid;
-				        $paymentexpensereportstatic->num_paiement = $objp->num_payment;
-				        $paymentexpensereportstatic->num_payment = $objp->num_payment;
-				        $paymentexpensereportstatic->payment_code = $objp->payment_code;
+						$paymentexpensereportstatic->id = $objp->rowid;
+						$paymentexpensereportstatic->datepaye = $db->jdate($objp->dp);
+						$paymentexpensereportstatic->ref = $objp->rowid;
+						$paymentexpensereportstatic->num_payment = $objp->num_payment;
+						$paymentexpensereportstatic->payment_code = $objp->payment_code;
 
-				        print '<tr class="oddseven">';
-				        print '<td>';
+						print '<tr class="oddseven">';
+						print '<td>';
 						print $paymentexpensereportstatic->getNomUrl(1);
 						print '</td>';
-				        print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-				        $labeltype = $langs->trans("PaymentType".$objp->p_code) != ("PaymentType".$objp->p_code) ? $langs->trans("PaymentType".$objp->p_code) : $objp->payment_type;
-				        print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
+						print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
+						$labeltype = $langs->trans("PaymentType".$objp->p_code) != ("PaymentType".$objp->p_code) ? $langs->trans("PaymentType".$objp->p_code) : $objp->payment_type;
+						print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
 						if (!empty($conf->banque->enabled))
 						{
 							$bankaccountstatic->id = $objp->baid;
@@ -2060,42 +1981,39 @@ else
 								print $bankaccountstatic->getNomUrl(1, 'transactions');
 							print '</td>';
 						}
-				        print '<td class="right">'.price($objp->amount)."</td>";
-				        print '<td></td>';
-				        print "</tr>";
-				        $totalpaid += $objp->amount;
-				        $i++;
-				    }
+						print '<td class="right">'.price($objp->amount)."</td>";
+						print '<td></td>';
+						print "</tr>";
+						$totalpaid += $objp->amount;
+						$i++;
+					}
 					if (!is_null($totalpaid))
 					{
-				        $totalpaid = price2num($totalpaid); // Round $totalpaid to fix floating problem after addition into loop
+						$totalpaid = price2num($totalpaid); // Round $totalpaid to fix floating problem after addition into loop
 					}
 
-				    $remaintopay = price2num($object->total_ttc - $totalpaid);
-				    $resteapayeraffiche = $remaintopay;
+					$remaintopay = price2num($object->total_ttc - $totalpaid);
+					$resteapayeraffiche = $remaintopay;
 
-				    $cssforamountpaymentcomplete = 'amountpaymentcomplete';
+					$cssforamountpaymentcomplete = 'amountpaymentcomplete';
 
-				    if ($object->status == ExpenseReport::STATUS_REFUSED)
-				    {
-				    	$cssforamountpaymentcomplete = 'amountpaymentneutral';
-				    	$resteapayeraffiche = 0;
-				    }
-			    	elseif ($object->paid == 0)
-			    	{
-			    		$cssforamountpaymentcomplete = 'amountpaymentneutral';
-			    	}
-			        print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").':</td><td class="right">'.price($totalpaid).'</td><td></td></tr>';
-			        print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected").':</td><td class="right">'.price($object->total_ttc).'</td><td></td></tr>';
+					if ($object->status == ExpenseReport::STATUS_REFUSED)
+					{
+						$cssforamountpaymentcomplete = 'amountpaymentneutral';
+						$resteapayeraffiche = 0;
+					} elseif ($object->paid == 0)
+					{
+						$cssforamountpaymentcomplete = 'amountpaymentneutral';
+					}
+					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").':</td><td class="right">'.price($totalpaid).'</td><td></td></tr>';
+					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected").':</td><td class="right">'.price($object->total_ttc).'</td><td></td></tr>';
 
-			        print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay").':</td>';
-			        print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td></td></tr>';
+					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay").':</td>';
+					print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td><td></td></tr>';
 
-				    $db->free($resql);
-				}
-				else
-				{
-				    dol_print_error($db);
+					$db->free($resql);
+				} else {
+					dol_print_error($db);
 				}
 				print "</table>";
 
@@ -2108,7 +2026,7 @@ else
 				print '<div style="clear: both;"></div>';
 
 				$actiontouse = 'updateline';
-				if (($object->fk_statut == 0 || $object->fk_statut == 99) && $action != 'editline') $actiontouse = 'addline';
+				if (($object->status == 0 || $object->status == 99) && $action != 'editline') $actiontouse = 'addline';
 
 				print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="post" >';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2128,8 +2046,8 @@ else
 					//print '<td class="center">'.$langs->trans('Piece').'</td>';
 					print '<td class="center">'.$langs->trans('Date').'</td>';
 					if (!empty($conf->projet->enabled)) print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print '<td>'.$langs->trans('CarCategory').'</td>';
 					print '<td class="center">'.$langs->trans('Type').'</td>';
+					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print '<td>'.$langs->trans('CarCategory').'</td>';
 					print '<td>'.$langs->trans('Description').'</td>';
 					print '<td class="right">'.$langs->trans('VAT').'</td>';
 					print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
@@ -2140,11 +2058,11 @@ else
 						print '<td class="right">'.$langs->trans('AmountHT').'</td>';
 						print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
 					}
-                    // Picture
+					// Picture
 					print '<td>';
 					print '</td>';
 					// Ajout des boutons de modification/suppression
-					if (($object->fk_statut < 2 || $object->fk_statut == 99) && $user->rights->expensereport->creer)
+					if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer)
 					{
 						print '<td class="right"></td>';
 					}
@@ -2179,6 +2097,13 @@ else
 								}
 								print '</td>';
 							}
+
+							// Type of fee
+							print '<td class="center">';
+							$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
+							print $labeltype;
+							print '</td>';
+
 							// IK
 							if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
 							{
@@ -2186,26 +2111,20 @@ else
 								print dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
 								print '</td>';
 							}
-							// Type of fee
-							print '<td class="center">';
-							$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
-							print $labeltype;
-							print '</td>';
+
 							// Comment
 							print '<td class="left">'.dol_nl2br($line->comments).'</td>';
 							// VAT rate
 							print '<td class="right">'.vatrate($line->vatrate, true).'</td>';
-                            // Unit price HT
+							// Unit price HT
 							print '<td class="right">';
 							if (!empty($line->value_unit_ht))
 							{
-							    print price($line->value_unit_ht);
-							}
-							else
-							{
-							    $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
-							    $pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
-							    print $pricenettoshow;
+								print price($line->value_unit_ht);
+							} else {
+								$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
+								$pricenettoshow = price2num($line->value_unit / (1 + $tmpvat / 100), 'MU');
+								print $pricenettoshow;
 							}
 							print '</td>';
 
@@ -2223,85 +2142,83 @@ else
 							print '<td class="center">';
 							if ($line->fk_ecm_files > 0)
 							{
-							    $modulepart = 'expensereport';
-							    $maxheightmini = 32;
+								$modulepart = 'expensereport';
+								$maxheightmini = 32;
 
-                                $result = $ecmfilesstatic->fetch($line->fk_ecm_files);
-                                if ($result > 0)
-                                {
-                                    $relativepath = preg_replace('/expensereport\//', '', $ecmfilesstatic->filepath);
-                                    $fileinfo = pathinfo($ecmfilesstatic->filepath.'/'.$ecmfilesstatic->filename);
-                                    if (image_format_supported($fileinfo['basename']) > 0)
-                                    {
-                                        $minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-                                        if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) $minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
-                                        //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($relativepath.$fileinfo['filename'].'.'.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 '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
-                                        print '</a>';
-                                    }
-                                    else
-                                    {
-                                        $modulepart = 'expensereport';
-                                        $thumbshown = 0;
-                                        if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename))
-                                        {
-                                            $filepdf = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename;
-                                            $fileimage = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
-                                            $relativepathimage = $relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
+								$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
+								if ($result > 0)
+								{
+									$relativepath = preg_replace('/expensereport\//', '', $ecmfilesstatic->filepath);
+									$fileinfo = pathinfo($ecmfilesstatic->filepath.'/'.$ecmfilesstatic->filename);
+									if (image_format_supported($fileinfo['basename']) > 0)
+									{
+										$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
+										if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) $minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+										//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($relativepath.$fileinfo['filename'].'.'.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 '<img class="photo" height="'.$maxheightmini.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.'/'.$minifile).'" title="">';
+										print '</a>';
+									} else {
+										$modulepart = 'expensereport';
+										$thumbshown = 0;
+										if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename))
+										{
+											$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename;
+											$fileimage = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
+											$relativepathimage = $relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
 
-                                            $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++;
-                                                    }
-                                                }
-                                            }
+											$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 && !$error)
-                                            {
-                                                $heightforphotref = 70;
-                                                if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
-                                                // If the preview file is found
-                                                if (file_exists($fileimage))
-                                                {
-                                                    $thumbshown = 1;
-                                                    print '<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 = 1;
+													print '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
+												}
+											}
+										}
 
-                                        if (!$thumbshown)
-                                        {
-                                            print img_mime($ecmfilesstatic->filename);
-                                        }
-                                    }
-                                }
+										if (!$thumbshown)
+										{
+											print img_mime($ecmfilesstatic->filename);
+										}
+									}
+								}
 							}
 							print '</td>';
 
 							// Ajout des boutons de modification/suppression
-							if (($object->fk_statut < ExpenseReport::STATUS_VALIDATED || $object->fk_statut == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer)
+							if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer)
 							{
 								print '<td class="nowrap right">';
 
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$line->rowid.'">';
+								print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
 								print img_edit();
 								print '</a> &nbsp; ';
-								print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_line&amp;rowid='.$line->rowid.'">';
+								print '<a class="paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_line&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
 								print img_delete();
 								print '</a>';
 
@@ -2313,30 +2230,30 @@ else
 
 						if ($action == 'editline' && $line->rowid == GETPOST('rowid', 'int'))
 						{
-						    // Add line with link to add new file or attach line to an existing file
-						    $colspan = 10;
-						    if (!empty($conf->projet->enabled)) $colspan++;
-						    if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) $colspan++;
+							// Add line with link to add new file or attach line to an existing file
+							$colspan = 10;
+							if (!empty($conf->projet->enabled)) $colspan++;
+							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) $colspan++;
 
-						    print '<tr class="tredited">';
+							print '<tr class="tredited">';
 
-						    print '<td class="center">';
-						    print $numline;
-						    print '</td>';
+							print '<td class="center">';
+							print $numline;
+							print '</td>';
 
-						    print '<td colspan="'.($colspan - 1).'" class="liste_titre">';
-						    print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
-						    print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
-						    print '</a>';
-						    if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
-						    {
-						        print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
-						        print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
-						        print '</a>';
-						    }
+							print '<td colspan="'.($colspan - 1).'" class="liste_titre">';
+							print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
+							print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+							print '</a>';
+							if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
+							{
+								print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
+								print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+								print '</a>';
+							}
 
-						    print '<script language="javascript">'."\n";
-						    print '$(document).ready(function() {
+							print '<script language="javascript">'."\n";
+							print '$(document).ready(function() {
         				        $( ".auploadnewfilenow" ).click(function() {
         				            jQuery(".truploadnewfilenow").toggle();
                                     jQuery(".trattachnewfilenow").hide();
@@ -2347,29 +2264,29 @@ else
                                     jQuery(".truploadnewfilenow").hide();
                                     return false;
                                 });';
-						    if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')))
-						    {
-						        print 'jQuery(".trattachnewfilenow").toggle();'."\n";
-						    }
-						    print '
+							if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')))
+							{
+								print 'jQuery(".trattachnewfilenow").toggle();'."\n";
+							}
+							print '
                             });
         				    ';
-						    print '</script>'."\n";
-						    print '</td></tr>';
+							print '</script>'."\n";
+							print '</td></tr>';
 
-						    $filenamelinked = '';
-						    if ($line->fk_ecm_files > 0)
-						    {
-						        $result = $ecmfilesstatic->fetch($line->fk_ecm_files);
-						        if ($result > 0)
-						        {
-						            $filenamelinked = $ecmfilesstatic->filename;
-						        }
-						    }
+							$filenamelinked = '';
+							if ($line->fk_ecm_files > 0)
+							{
+								$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
+								if ($result > 0)
+								{
+									$filenamelinked = $ecmfilesstatic->filename;
+								}
+							}
 
-						    $tredited = 'tredited';
-						    include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
-						    include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
+							$tredited = 'tredited';
+							include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
+							include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
 
 							print '<tr class="oddeven tredited">';
 
@@ -2388,6 +2305,11 @@ else
 								print '</td>';
 							}
 
+							// Select type
+							print '<td class="center">';
+							print $formexpensereport->selectTypeExpenseReport($line->fk_c_type_fees, 'fk_c_type_fees');
+							print '</td>';
+
 							if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
 							{
 								print '<td class="fk_c_exp_tax_cat">';
@@ -2396,11 +2318,6 @@ else
 								print '</td>';
 							}
 
-							// Select type
-							print '<td class="center">';
-							select_type_fees_id($line->fk_c_type_fees, 'fk_c_type_fees');
-							print '</td>';
-
 							// Add comments
 							print '<td>';
 							print '<textarea name="comments" class="flat_ndf centpercent">'.dol_escape_htmltag($line->comments, 0, 1).'</textarea>';
@@ -2447,44 +2364,44 @@ else
 					}
 				}
 
-				// Add a line
-				if (($object->fk_statut == ExpenseReport::STATUS_DRAFT || $object->fk_statut == ExpenseReport::STATUS_REFUSED)
-				    && $action != 'editline'
-				    && $user->rights->expensereport->creer)
+				// Add a new line
+				if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED)
+					&& $action != 'editline'
+					&& $user->rights->expensereport->creer)
 				{
-				    $colspan = 11;
-				    if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) $colspan++;
-				    if (!empty($conf->projet->enabled)) $colspan++;
-				    if ($action != 'editline') $colspan++;
+					$colspan = 11;
+					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) $colspan++;
+					if (!empty($conf->projet->enabled)) $colspan++;
+					if ($action != 'editline') $colspan++;
 
-				    $nbFiles = $nbLinks = 0;
-				    $arrayoffiles = array();
-				    if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
-				    {
-				        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);
-				    }
+					$nbFiles = $nbLinks = 0;
+					$arrayoffiles = array();
+					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
+					{
+						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);
+					}
 
-				    // Add line with link to add new file or attach to an existing file
-				    print '<tr class="liste_titre">';
-				    print '<td colspan="'.$colspan.'" class="liste_titre">';
-				    print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
-				    print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
-				    print '</a>';
-				    if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
-				    {
-				        print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
-				        print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
-				        print '</a>';
-				    }
+					// Add line with link to add new file or attach to an existing file
+					print '<tr class="liste_titre">';
+					print '<td colspan="'.$colspan.'" class="liste_titre">';
+					print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
+					print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+					print '</a>';
+					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
+					{
+						print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
+						print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
+						print '</a>';
+					}
 
-				    print '<script language="javascript">'."\n";
-				    print '$(document).ready(function() {
+					print '<script language="javascript">'."\n";
+					print '$(document).ready(function() {
 				        $( ".auploadnewfilenow" ).click(function() {
 				            jQuery(".truploadnewfilenow").toggle();
                             jQuery(".trattachnewfilenow").hide();
@@ -2495,25 +2412,29 @@ else
                             jQuery(".truploadnewfilenow").hide();
                             return false;
                         });'."\n";
-				    if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline')
-				    {
-				        print 'jQuery(".trattachnewfilenow").show();'."\n";
-				    }
-				    print '
+					if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline')
+					{
+						print 'jQuery(".trattachnewfilenow").show();'."\n";
+					}
+					print '
                     });
 				    ';
-				    print '</script>'."\n";
-				    print '</td></tr>';
+					print '</script>'."\n";
+					print '</td></tr>';
 
-				    include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
-				    include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
+					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
+					include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
 
 					print '<tr class="liste_titre">';
 					print '<td></td>';
 					print '<td class="center">'.$langs->trans('Date').'</td>';
-					if (!empty($conf->projet->enabled)) print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print '<td>'.$langs->trans('CarCategory').'</td>';
+					if (!empty($conf->projet->enabled)) {
+						print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
+					}
 					print '<td class="center">'.$langs->trans('Type').'</td>';
+					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+						print '<td>'.$langs->trans('CarCategory').'</td>';
+					}
 					print '<td>'.$langs->trans('Description').'</td>';
 					print '<td class="right">'.$langs->trans('VAT').'</td>';
 					print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
@@ -2543,19 +2464,19 @@ else
 						print '</td>';
 					}
 
+					// Select type
+					print '<td class="center">';
+					print $formexpensereport->selectTypeExpenseReport($fk_c_type_fees, 'fk_c_type_fees', 1);
+					print '</td>';
+
 					if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
 					{
 						print '<td class="fk_c_exp_tax_cat">';
 						$params = array('fk_expense' => $object->id);
-						print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
+						print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params, 0);
 						print '</td>';
 					}
 
-					// Select type
-					print '<td class="center">';
-					select_type_fees_id($fk_c_type_fees, 'fk_c_type_fees', 1);
-					print '</td>';
-
 					// Add comments
 					print '<td>';
 					print '<textarea class="flat_ndf centpercent" name="comments" rows="'.ROWS_2.'">'.dol_escape_htmltag($comments, 0, 1).'</textarea>';
@@ -2625,8 +2546,7 @@ else
 				dol_fiche_end();
 			} // end edit or not edit
 		}	// end of if result
-		else
-		{
+		else {
 			dol_print_error($db);
 		}
 	} //fin si id > 0
@@ -2645,7 +2565,7 @@ if ($action != 'create' && $action != 'edit')
 
 	// Send
 	if (empty($user->socid)) {
-		if ($object->fk_statut > ExpenseReport::STATUS_DRAFT) {
+		if ($object->status > ExpenseReport::STATUS_DRAFT) {
 			//if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expensereport->expensereport_advance->send)) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 			//} else
@@ -2658,7 +2578,7 @@ if ($action != 'create' && $action != 'edit')
 	*	ET fk_user_author == user courant
 	* 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	*/
-	if ($user->rights->expensereport->creer && $object->fk_statut == ExpenseReport::STATUS_DRAFT)
+	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_DRAFT)
 	{
 		if (in_array($object->fk_user_author, $user->getAllChildIds(1)) || !empty($user->rights->expensereport->writeall_advance))
 		{
@@ -2678,7 +2598,7 @@ if ($action != 'create' && $action != 'edit')
 	 *	ET fk_user_author == user courant
 	 * 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	 */
-	if ($user->rights->expensereport->creer && $object->fk_statut == ExpenseReport::STATUS_REFUSED)
+	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_REFUSED)
 	{
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
 		{
@@ -2692,12 +2612,12 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 
-	if ($user->rights->expensereport->to_paid && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->to_paid && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
 		{
 			// setdraft
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=setdraft&id='.$object->id.'">'.$langs->trans('SetToDraft').'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=setdraft&token='.newToken().'&id='.$object->id.'">'.$langs->trans('SetToDraft').'</a></div>';
 		}
 	}
 
@@ -2706,16 +2626,16 @@ if ($action != 'create' && $action != 'edit')
 	 *	ET fk_user_validator == user courant
 	 *	Afficher : "Valider" / "Refuser" / "Supprimer"
 	 */
-	if ($object->fk_statut == ExpenseReport::STATUS_VALIDATED)
+	if ($object->status == ExpenseReport::STATUS_VALIDATED)
 	{
 		if (in_array($object->fk_user_author, $user->getAllChildIds(1)))
 		{
 			// set draft
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=setdraft&id='.$object->id.'">'.$langs->trans('SetToDraft').'</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=setdraft&token='.newToken().'&id='.$object->id.'">'.$langs->trans('SetToDraft').'</a></div>';
 		}
 	}
 
-	if ($user->rights->expensereport->approve && $object->fk_statut == ExpenseReport::STATUS_VALIDATED)
+	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_VALIDATED)
 	{
 		//if($object->fk_user_validator==$user->id)
 		//{
@@ -2736,69 +2656,66 @@ if ($action != 'create' && $action != 'edit')
 	// If status is Approved
 	// ---------------------
 
-	if ($user->rights->expensereport->approve && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
-	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
 	}
 
 	// If bank module is used
-	if ($user->rights->expensereport->to_paid && !empty($conf->banque->enabled) && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->to_paid && !empty($conf->banque->enabled) && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
 		// Pay
 		if ($remaintopay == 0)
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
-		}
-		else
-		{
+		} else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
 		}
 	}
 
 	// If bank module is not used
-	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
 		//if ((round($remaintopay) == 0 || empty($conf->banque->enabled)) && $object->paid == 0)
 		if ($object->paid == 0)
 		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=set_paid&token='.newToken().'">'.$langs->trans("ClassifyPaid")."</a></div>";
 		}
 	}
 
-	if ($user->rights->expensereport->creer && ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) && $object->fk_statut == ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->creer && ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) && $object->status == ExpenseReport::STATUS_APPROVED)
 	{
-    	// Cancel
-   		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
+		// Cancel
+   		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
 	}
 
-    // TODO Replace this. It should be SetUnpaid and should go back to status unpaid not canceled.
-	if (($user->rights->expensereport->approve || $user->rights->expensereport->to_paid) && $object->fk_statut == ExpenseReport::STATUS_CLOSED)
+	// TODO Replace this. It should be SetUnpaid and should go back to status unpaid not canceled.
+	if (($user->rights->expensereport->approve || $user->rights->expensereport->to_paid) && $object->status == ExpenseReport::STATUS_CLOSED)
 	{
-	    // Cancel
-	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
+		// Cancel
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Cancel').'</a></div>';
 	}
 
-	if ($user->rights->expensereport->to_paid && $object->paid && $object->fk_statut == ExpenseReport::STATUS_CLOSED)
+	if ($user->rights->expensereport->to_paid && $object->paid && $object->status == ExpenseReport::STATUS_CLOSED)
 	{
 		// Set unpaid
-		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=set_unpaid&id='.$object->id.'">'.$langs->trans('ClassifyUnPaid').'</a></div>';
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=set_unpaid&token='.newToken().'&id='.$object->id.'">'.$langs->trans('ClassifyUnPaid').'</a></div>';
 	}
 
 	// Clone
 	if ($user->rights->expensereport->creer) {
-	    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone">'.$langs->trans("ToClone").'</a></div>';
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken().'">'.$langs->trans("ToClone").'</a></div>';
 	}
 
 	/* If draft, validated, cancel, and user can create, he can always delete its card before it is approved */
-	if ($user->rights->expensereport->creer && $user->id == $object->fk_user_author && $object->fk_statut < ExpenseReport::STATUS_APPROVED)
+	if ($user->rights->expensereport->creer && $user->id == $object->fk_user_author && $object->status < ExpenseReport::STATUS_APPROVED)
 	{
-	    // Delete
-		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
-	}
-	elseif ($user->rights->expensereport->supprimer && $object->fk_statut != ExpenseReport::STATUS_CLOSED)
+		// Delete
+		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
+	} elseif ($user->rights->expensereport->supprimer && $object->status != ExpenseReport::STATUS_CLOSED)
 	{
-    	// Delete
-	    print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
+		// Delete
+		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
 	}
 
 	$parameters = array();
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 18fef29e04c..405ba52be93 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -119,7 +119,7 @@ class ExpenseReports extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -127,27 +127,26 @@ class ExpenseReports extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
 
         if ($result)
         {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $expensereport_static = new ExpenseReport($db);
+            	$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 : '.$db->lasterror());
+        } 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');
@@ -411,9 +410,7 @@ class ExpenseReports extends DolibarrApi
         if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->expensereport->error);
         }
     }
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 092e29ba642..3f7caca5890 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -34,80 +34,87 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.ph
  */
 class ExpenseReport extends CommonObject
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'expensereport';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'expensereport';
 
-    public $table_element_line = 'expensereport_det';
-    public $fk_element = 'fk_expensereport';
+	public $table_element_line = 'expensereport_det';
+	public $fk_element = 'fk_expensereport';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'trip';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'trip';
 
-    public $lines = array();
+	public $lines = array();
 
-    public $date_debut;
+	public $date_debut;
 
-    public $date_fin;
+	public $date_fin;
 
-    /**
-     * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
-     *
-     * @var int		Status
-     */
-    public $status;
-    public $fk_statut;
+	/**
+	 * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+	 *
+	 * @var int		Status
+	 */
+	public $status;
 
-    public $fk_c_paiement;
-    public $paid;
+	/**
+	 * 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+	 *
+	 * @var int		Status
+	 * @deprecated
+	 */
+	public $fk_statut;
 
-    public $user_author_infos;
-    public $user_validator_infos;
+	public $fk_c_paiement;
+	public $paid;
 
-    // ACTIONS
+	public $user_author_infos;
+	public $user_validator_infos;
 
-    // Create
-    public $date_create;
-    public $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
+	// ACTIONS
 
-    // Update
+	// Create
+	public $date_create;
+	public $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
+
+	// Update
 	public $date_modif;
-    public $fk_user_modif;
+	public $fk_user_modif;
 
-    // Refus
-    public $date_refuse;
-    public $detail_refuse;
-    public $fk_user_refuse;
+	// Refus
+	public $date_refuse;
+	public $detail_refuse;
+	public $fk_user_refuse;
 
-    // Annulation
-    public $date_cancel;
-    public $detail_cancel;
-    public $fk_user_cancel;
+	// Annulation
+	public $date_cancel;
+	public $detail_cancel;
+	public $fk_user_cancel;
 
-    public $fk_user_validator; // User that is defined to approve
+	public $fk_user_validator; // User that is defined to approve
 
-    // Validation
-    public $date_valid; // User making validation
-    public $fk_user_valid;
-    public $user_valid_infos;
+	// Validation
+	public $date_valid; // User making validation
+	public $fk_user_valid;
+	public $user_valid_infos;
 
-    // Approve
-    public $date_approve;
-    public $fk_user_approve; // User that has approved
+	// Approve
+	public $date_approve;
+	public $fk_user_approve; // User that has approved
 
-    // Paiement
-    public $user_paid_infos;
+	// Paiement
+	public $user_paid_infos;
 
 
-    /**
+	/**
 	 * Draft status
 	 */
 	const STATUS_DRAFT = 0;
@@ -185,157 +192,156 @@ class ExpenseReport extends CommonObject
 	);
 
 	/**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db     Handler acces base de donnees
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->total_ht = 0;
-        $this->total_ttc = 0;
-        $this->total_tva = 0;
-        $this->modepaymentid = 0;
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db     Handler acces base de donnees
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->total_ht = 0;
+		$this->total_ttc = 0;
+		$this->total_tva = 0;
+		$this->modepaymentid = 0;
 
-        // List of language codes for status
-        $this->statuts_short = array(0 => 'Draft', 2 => 'Validated', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
-        $this->statuts = array(0 => 'Draft', 2 => 'ValidatedWaitingApproval', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
-        $this->statuts_logo = array(0 => 'status0', 2 => 'status1', 4 => 'status6', 5 => 'status4', 6 => 'status6', 99 => 'status5');
-    }
+		// List of language codes for status
+		$this->statuts_short = array(0 => 'Draft', 2 => 'Validated', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
+		$this->statuts = array(0 => 'Draft', 2 => 'ValidatedWaitingApproval', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused');
+		$this->statuts_logo = array(0 => 'status0', 2 => 'status1', 4 => 'status6', 5 => 'status4', 6 => 'status6', 99 => 'status5');
+	}
 
-    /**
-     * Create object in database
-     *
-     * @param   User    $user   User that create
-     * @param   int     $notrigger   Disable triggers
-     * @return  int             <0 if KO, >0 if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-        global $conf, $langs;
+	/**
+	 * Create object in database
+	 *
+	 * @param   User    $user   User that create
+	 * @param   int     $notrigger   Disable triggers
+	 * @return  int             <0 if KO, >0 if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $error = 0;
+		$error = 0;
 
-        // Check parameters
-        if (empty($this->date_debut) || empty($this->date_fin))
-        {
-            $this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Date'));
-            return -1;
-        }
+		// Check parameters
+		if (empty($this->date_debut) || empty($this->date_fin))
+		{
+			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Date'));
+			return -1;
+		}
 
-        $fuserid = $this->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
-        if (empty($fuserid)) $fuserid = $user->id;
+		$fuserid = $this->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
+		if (empty($fuserid)) $fuserid = $user->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql .= "ref";
-        $sql .= ",total_ht";
-        $sql .= ",total_ttc";
-        $sql .= ",total_tva";
-        $sql .= ",date_debut";
-        $sql .= ",date_fin";
-        $sql .= ",date_create";
-        $sql .= ",fk_user_author";
-        $sql .= ",fk_user_validator";
-        $sql .= ",fk_user_approve";
-        $sql .= ",fk_user_modif";
-        $sql .= ",fk_statut";
-        $sql .= ",fk_c_paiement";
-        $sql .= ",paid";
-        $sql .= ",note_public";
-        $sql .= ",note_private";
-        $sql .= ",entity";
-        $sql .= ") VALUES(";
-        $sql .= "'(PROV)'";
-        $sql .= ", ".$this->total_ht;
-        $sql .= ", ".$this->total_ttc;
-        $sql .= ", ".$this->total_tva;
-        $sql .= ", '".$this->db->idate($this->date_debut)."'";
-        $sql .= ", '".$this->db->idate($this->date_fin)."'";
-        $sql .= ", '".$this->db->idate($now)."'";
-        $sql .= ", ".$fuserid;
-        $sql .= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator : "null");
-        $sql .= ", ".($this->fk_user_approve > 0 ? $this->fk_user_approve : "null");
-        $sql .= ", ".($this->fk_user_modif > 0 ? $this->fk_user_modif : "null");
-        $sql .= ", ".($this->fk_statut > 1 ? $this->fk_statut : 0);
-        $sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");
-        $sql .= ", 0";
-        $sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
-        $sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
-        $sql .= ", ".$conf->entity;
-        $sql .= ")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql .= "ref";
+		$sql .= ",total_ht";
+		$sql .= ",total_ttc";
+		$sql .= ",total_tva";
+		$sql .= ",date_debut";
+		$sql .= ",date_fin";
+		$sql .= ",date_create";
+		$sql .= ",fk_user_author";
+		$sql .= ",fk_user_validator";
+		$sql .= ",fk_user_approve";
+		$sql .= ",fk_user_modif";
+		$sql .= ",fk_statut";
+		$sql .= ",fk_c_paiement";
+		$sql .= ",paid";
+		$sql .= ",note_public";
+		$sql .= ",note_private";
+		$sql .= ",entity";
+		$sql .= ") VALUES(";
+		$sql .= "'(PROV)'";
+		$sql .= ", ".$this->total_ht;
+		$sql .= ", ".$this->total_ttc;
+		$sql .= ", ".$this->total_tva;
+		$sql .= ", '".$this->db->idate($this->date_debut)."'";
+		$sql .= ", '".$this->db->idate($this->date_fin)."'";
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".$fuserid;
+		$sql .= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator : "null");
+		$sql .= ", ".($this->fk_user_approve > 0 ? $this->fk_user_approve : "null");
+		$sql .= ", ".($this->fk_user_modif > 0 ? $this->fk_user_modif : "null");
+		$sql .= ", ".($this->fk_statut > 1 ? $this->fk_statut : 0);
+		$sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");
+		$sql .= ", 0";
+		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", ".$conf->entity;
+		$sql .= ")";
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-            $this->ref = '(PROV'.$this->id.')';
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->ref = '(PROV'.$this->id.')';
 
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                $this->error = $this->db->lasterror();
-                $error++;
-            }
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
 
-            if (!$error)
-            {
-                if (is_array($this->lines) && count($this->lines) > 0)
-                {
-    	            foreach ($this->lines as $line)
-    	            {
-    	            	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-    	            	//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-    	            	if (!is_object($line)) {
-    	            		$line = (object) $line;
-    	            		$newndfline = new ExpenseReportLine($this->db);
-    	            		$newndfline->fk_expensereport = $line->fk_expensereport;
-    	            		$newndfline->fk_c_type_fees = $line->fk_c_type_fees;
-    	            		$newndfline->fk_project = $line->fk_project;
-    	            		$newndfline->vatrate = $line->vatrate;
-    	            		$newndfline->vat_src_code = $line->vat_src_code;
-    	            		$newndfline->comments = $line->comments;
-    	            		$newndfline->qty = $line->qty;
-    	            		$newndfline->value_unit = $line->value_unit;
-    	            		$newndfline->total_ht = $line->total_ht;
-    	            		$newndfline->total_ttc = $line->total_ttc;
-    	            		$newndfline->total_tva = $line->total_tva;
-    	            		$newndfline->date = $line->date;
-    	            		$newndfline->rule_warning_message = $line->rule_warning_message;
-    	            		$newndfline->fk_c_exp_tax_cat = $line->fk_c_exp_tax_cat;
-    	            		$newndfline->fk_ecm_files = $line->fk_ecm_files;
-    	            	}
-    	            	else {
-    	            		$newndfline = $line;
-    	            	}
-    	                //$newndfline=new ExpenseReportLine($this->db);
-    	                $newndfline->fk_expensereport = $this->id;
-    	                $result = $newndfline->insert();
-        	            if ($result < 0)
-        	            {
-        	                $this->error = $newndfline->error;
-        	                $error++;
-        	                break;
-        	            }
-    	            }
-                }
-            }
+			if (!$error)
+			{
+				if (is_array($this->lines) && count($this->lines) > 0)
+				{
+					foreach ($this->lines as $line)
+					{
+						// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+						//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
+						if (!is_object($line)) {
+							$line = (object) $line;
+							$newndfline = new ExpenseReportLine($this->db);
+							$newndfline->fk_expensereport = $line->fk_expensereport;
+							$newndfline->fk_c_type_fees = $line->fk_c_type_fees;
+							$newndfline->fk_project = $line->fk_project;
+							$newndfline->vatrate = $line->vatrate;
+							$newndfline->vat_src_code = $line->vat_src_code;
+							$newndfline->comments = $line->comments;
+							$newndfline->qty = $line->qty;
+							$newndfline->value_unit = $line->value_unit;
+							$newndfline->total_ht = $line->total_ht;
+							$newndfline->total_ttc = $line->total_ttc;
+							$newndfline->total_tva = $line->total_tva;
+							$newndfline->date = $line->date;
+							$newndfline->rule_warning_message = $line->rule_warning_message;
+							$newndfline->fk_c_exp_tax_cat = $line->fk_c_exp_tax_cat;
+							$newndfline->fk_ecm_files = $line->fk_ecm_files;
+						} else {
+							$newndfline = $line;
+						}
+						//$newndfline=new ExpenseReportLine($this->db);
+						$newndfline->fk_expensereport = $this->id;
+						$result = $newndfline->insert();
+						if ($result < 0)
+						{
+							$this->error = $newndfline->error;
+							$error++;
+							break;
+						}
+					}
+				}
+			}
 
-            if (!$error)
-            {
-            	$result = $this->insertExtraFields();
-           		if ($result < 0) $error++;
-            }
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+		   		if ($result < 0) $error++;
+			}
 
-            if (!$error)
-            {
-                $result = $this->update_price();
-                if ($result > 0)
-                {
+			if (!$error)
+			{
+				$result = $this->update_price();
+				if ($result > 0)
+				{
 					if (!$notrigger)
 					{
 						// Call trigger
@@ -351,145 +357,144 @@ class ExpenseReport extends CommonObject
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						$this->db->rollback();
 						return -4;
 					}
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -3;
-                }
-            }
-            else
-            {
-                dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror()." sql=".$sql;
-            $this->db->rollback();
-            return -1;
-        }
-    }
+				} else {
+					$this->db->rollback();
+					return -3;
+				}
+			} else {
+				dol_syslog(get_class($this)."::create error ".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->lasterror()." sql=".$sql;
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *	Load an object from its id and create a new one in database
-     *
+	/**
+	 *	Load an object from its id and create a new one in database
+	 *
 	 *  @param	    User	$user		        User making the clone
-     *	@param		int     $fk_user_author		Id of new user
-     *	@return		int							New id of clone
-     */
-    public function createFromClone(User $user, $fk_user_author)
-    {
-        global $hookmanager;
+	 *	@param		int     $fk_user_author		Id of new user
+	 *	@return		int							New id of clone
+	 */
+	public function createFromClone(User $user, $fk_user_author)
+	{
+		global $hookmanager;
 
-        $error = 0;
+		$error = 0;
 
-        if (empty($fk_user_author)) $fk_user_author = $user->id;
+		if (empty($fk_user_author)) $fk_user_author = $user->id;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // get extrafields so they will be clone
-        //foreach($this->lines as $line)
-	        //$line->fetch_optionals();
+		// get extrafields so they will be clone
+		//foreach($this->lines as $line)
+			//$line->fetch_optionals();
 
-        // Load source object
-        $objFrom = clone $this;
+		// Load source object
+		$objFrom = clone $this;
 
-        $this->id = 0;
-        $this->ref = '';
-        $this->status = 0;
-        $this->fk_statut = 0;
+		$this->id = 0;
+		$this->ref = '';
+		$this->status = 0;
+		$this->fk_statut = 0; // deprecated
 
-        // Clear fields
-        $this->fk_user_author     = $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
-        $this->fk_user_valid      = '';
-        $this->date_create = '';
-        $this->date_creation      = '';
-        $this->date_validation    = '';
+		// Clear fields
+		$this->fk_user_author     = $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
+		$this->fk_user_valid      = '';
+		$this->date_create = '';
+		$this->date_creation      = '';
+		$this->date_validation    = '';
 
-        // Create clone
-        $this->context['createfromclone'] = 'createfromclone';
-        $result = $this->create($user);
-        if ($result < 0) $error++;
+		// Remove link on lines to a joined file
+		if (is_array($this->lines) && count($this->lines) > 0)
+		{
+			foreach ($this->lines as $key => $line)
+			{
+				$this->lines[$key]->fk_ecm_files = 0;
+			}
+		}
 
-        if (!$error)
-        {
-            // Hook of thirdparty module
-            if (is_object($hookmanager))
-            {
-                $parameters = array('objFrom'=>$objFrom);
-                $action = '';
-                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
-            }
-        }
+		// Create clone
+		$this->context['createfromclone'] = 'createfromclone';
+		$result = $this->create($user);
+		if ($result < 0) $error++;
 
-        unset($this->context['createfromclone']);
+		if (!$error)
+		{
+			// Hook of thirdparty module
+			if (is_object($hookmanager))
+			{
+				$parameters = array('objFrom'=>$objFrom);
+				$action = '';
+				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+			}
+		}
 
-        // End
-        if (!$error)
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		unset($this->context['createfromclone']);
+
+		// End
+		if (!$error)
+		{
+			$this->db->commit();
+			return $this->id;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     * update
-     *
-     * @param   User    $user                   User making change
+	/**
+	 * update
+	 *
+	 * @param   User    $user                   User making change
 	 * @param   int     $notrigger              Disable triggers
-     * @param   User    $userofexpensereport    New user we want to have the expense report on.
-     * @return  int                             <0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0, $userofexpensereport = null)
-    {
-        global $langs;
+	 * @param   User    $userofexpensereport    New user we want to have the expense report on.
+	 * @return  int                             <0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0, $userofexpensereport = null)
+	{
+		global $langs;
 
 		$error = 0;
 		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " total_ht = ".$this->total_ht;
-        $sql .= " , total_ttc = ".$this->total_ttc;
-        $sql .= " , total_tva = ".$this->total_tva;
-        $sql .= " , date_debut = '".$this->db->idate($this->date_debut)."'";
-        $sql .= " , date_fin = '".$this->db->idate($this->date_fin)."'";
-        if ($userofexpensereport && is_object($userofexpensereport))
-        {
-            $sql .= " , fk_user_author = ".($userofexpensereport->id > 0 ? "'".$userofexpensereport->id."'" : "null"); // Note fk_user_author is not the 'author' but the guy the expense report is for.
-        }
-        $sql .= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator : "null");
-        $sql .= " , fk_user_valid = ".($this->fk_user_valid > 0 ? $this->fk_user_valid : "null");
-        $sql .= " , fk_user_approve = ".($this->fk_user_approve > 0 ? $this->fk_user_approve : "null");
-        $sql .= " , fk_user_modif = ".$user->id;
-        $sql .= " , fk_statut = ".($this->fk_statut >= 0 ? $this->fk_statut : '0');
-        $sql .= " , fk_c_paiement = ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement : "null");
-        $sql .= " , note_public = ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "''");
-        $sql .= " , note_private = ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "''");
-        $sql .= " , detail_refuse = ".(!empty($this->detail_refuse) ? "'".$this->db->escape($this->detail_refuse)."'" : "''");
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " total_ht = ".$this->total_ht;
+		$sql .= " , total_ttc = ".$this->total_ttc;
+		$sql .= " , total_tva = ".$this->total_tva;
+		$sql .= " , date_debut = '".$this->db->idate($this->date_debut)."'";
+		$sql .= " , date_fin = '".$this->db->idate($this->date_fin)."'";
+		if ($userofexpensereport && is_object($userofexpensereport))
+		{
+			$sql .= " , fk_user_author = ".($userofexpensereport->id > 0 ? $userofexpensereport->id : "null"); // Note fk_user_author is not the 'author' but the guy the expense report is for.
+		}
+		$sql .= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator : "null");
+		$sql .= " , fk_user_valid = ".($this->fk_user_valid > 0 ? $this->fk_user_valid : "null");
+		$sql .= " , fk_user_approve = ".($this->fk_user_approve > 0 ? $this->fk_user_approve : "null");
+		$sql .= " , fk_user_modif = ".$user->id;
+		$sql .= " , fk_statut = ".($this->fk_statut >= 0 ? $this->fk_statut : '0');
+		$sql .= " , fk_c_paiement = ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement : "null");
+		$sql .= " , note_public = ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "''");
+		$sql .= " , note_private = ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "''");
+		$sql .= " , detail_refuse = ".(!empty($this->detail_refuse) ? "'".$this->db->escape($this->detail_refuse)."'" : "''");
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if (!$notrigger)
+		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if (!$notrigger)
 			{
 				// Call trigger
 				$result = $this->call_trigger('EXPENSE_REPORT_UPDATE', $user);
@@ -504,145 +509,137 @@ class ExpenseReport extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
 			}
-        }
-        else
-        {
+		} else {
 			$this->db->rollback();
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     *  Load an object from database
-     *
-     *  @param  int     $id     Id                      {@min 1}
-     *  @param  string  $ref    Ref                     {@name ref}
-     *  @return int             <0 if KO, >0 if OK
-     */
-    public function fetch($id, $ref = '')
-    {
-        global $conf;
+	/**
+	 *  Load an object from database
+	 *
+	 *  @param  int     $id     Id                      {@min 1}
+	 *  @param  string  $ref    Ref                     {@name ref}
+	 *  @return int             <0 if KO, >0 if OK
+	 */
+	public function fetch($id, $ref = '')
+	{
+		global $conf;
 
-        $sql = "SELECT d.rowid, d.ref, d.note_public, d.note_private,"; // DEFAULT
-        $sql .= " d.detail_refuse, d.detail_cancel, d.fk_user_refuse, d.fk_user_cancel,"; // ACTIONS
-        $sql .= " d.date_refuse, d.date_cancel,"; // ACTIONS
-        $sql .= " d.total_ht, d.total_ttc, d.total_tva,"; // TOTAUX (int)
-        $sql .= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve,"; // DATES (datetime)
-        $sql .= " d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
-        $sql .= " d.fk_user_valid, d.fk_user_approve,";
-        $sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
-        if ($ref) $sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
-        else $sql .= " WHERE d.rowid = ".$id;
-        //$sql.= $restrict;
+		$sql = "SELECT d.rowid, d.ref, d.note_public, d.note_private,"; // DEFAULT
+		$sql .= " d.detail_refuse, d.detail_cancel, d.fk_user_refuse, d.fk_user_cancel,"; // ACTIONS
+		$sql .= " d.date_refuse, d.date_cancel,"; // ACTIONS
+		$sql .= " d.total_ht, d.total_ttc, d.total_tva,"; // TOTAUX (int)
+		$sql .= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve,"; // DATES (datetime)
+		$sql .= " d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
+		$sql .= " d.fk_user_valid, d.fk_user_approve,";
+		$sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
+		if ($ref) $sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
+		else $sql .= " WHERE d.rowid = ".$id;
+		//$sql.= $restrict;
 
-        dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id           = $obj->rowid;
-                $this->ref          = $obj->ref;
-                $this->total_ht     = $obj->total_ht;
-                $this->total_tva    = $obj->total_tva;
-                $this->total_ttc    = $obj->total_ttc;
-                $this->note_public  = $obj->note_public;
-                $this->note_private = $obj->note_private;
-                $this->detail_refuse = $obj->detail_refuse;
-                $this->detail_cancel = $obj->detail_cancel;
+		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id           = $obj->rowid;
+				$this->ref          = $obj->ref;
+				$this->total_ht     = $obj->total_ht;
+				$this->total_tva    = $obj->total_tva;
+				$this->total_ttc    = $obj->total_ttc;
+				$this->note_public  = $obj->note_public;
+				$this->note_private = $obj->note_private;
+				$this->detail_refuse = $obj->detail_refuse;
+				$this->detail_cancel = $obj->detail_cancel;
 
-                $this->date_debut       = $this->db->jdate($obj->date_debut);
-                $this->date_fin         = $this->db->jdate($obj->date_fin);
-                $this->date_valid       = $this->db->jdate($obj->date_valid);
-                $this->date_approve     = $this->db->jdate($obj->date_approve);
-                $this->date_create      = $this->db->jdate($obj->date_create);
-                $this->date_modif       = $this->db->jdate($obj->date_modif);
-                $this->date_refuse      = $this->db->jdate($obj->date_refuse);
-                $this->date_cancel      = $this->db->jdate($obj->date_cancel);
+				$this->date_debut       = $this->db->jdate($obj->date_debut);
+				$this->date_fin         = $this->db->jdate($obj->date_fin);
+				$this->date_valid       = $this->db->jdate($obj->date_valid);
+				$this->date_approve     = $this->db->jdate($obj->date_approve);
+				$this->date_create      = $this->db->jdate($obj->date_create);
+				$this->date_modif       = $this->db->jdate($obj->date_modif);
+				$this->date_refuse      = $this->db->jdate($obj->date_refuse);
+				$this->date_cancel      = $this->db->jdate($obj->date_cancel);
 
-                $this->fk_user_author           = $obj->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
-                $this->fk_user_modif            = $obj->fk_user_modif;
-                $this->fk_user_validator        = $obj->fk_user_validator;
-                $this->fk_user_valid            = $obj->fk_user_valid;
-                $this->fk_user_refuse           = $obj->fk_user_refuse;
-                $this->fk_user_cancel           = $obj->fk_user_cancel;
-                $this->fk_user_approve          = $obj->fk_user_approve;
+				$this->fk_user_author           = $obj->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
+				$this->fk_user_modif            = $obj->fk_user_modif;
+				$this->fk_user_validator        = $obj->fk_user_validator;
+				$this->fk_user_valid            = $obj->fk_user_valid;
+				$this->fk_user_refuse           = $obj->fk_user_refuse;
+				$this->fk_user_cancel           = $obj->fk_user_cancel;
+				$this->fk_user_approve          = $obj->fk_user_approve;
 
-                $user_author = new User($this->db);
-                if ($this->fk_user_author > 0) $user_author->fetch($this->fk_user_author);
+				$user_author = new User($this->db);
+				if ($this->fk_user_author > 0) $user_author->fetch($this->fk_user_author);
 
-                $this->user_author_infos = dolGetFirstLastname($user_author->firstname, $user_author->lastname);
+				$this->user_author_infos = dolGetFirstLastname($user_author->firstname, $user_author->lastname);
 
-                $user_approver = new User($this->db);
-                if ($this->fk_user_approve > 0) $user_approver->fetch($this->fk_user_approve);
-                elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator); // For backward compatibility
-                $this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
+				$user_approver = new User($this->db);
+				if ($this->fk_user_approve > 0) $user_approver->fetch($this->fk_user_approve);
+				elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator); // For backward compatibility
+				$this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
 
-                $this->fk_statut                = $obj->status; // deprecated
-                $this->status                   = $obj->status;
-                $this->fk_c_paiement            = $obj->fk_c_paiement;
-                $this->paid                     = $obj->paid;
+				$this->fk_statut                = $obj->status; // deprecated
+				$this->status                   = $obj->status;
+				$this->fk_c_paiement            = $obj->fk_c_paiement;
+				$this->paid                     = $obj->paid;
 
-                if ($this->fk_statut == self::STATUS_APPROVED || $this->fk_statut == self::STATUS_CLOSED)
-                {
-                    $user_valid = new User($this->db);
-                    if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
-                    $this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
-                }
+				if ($this->status == self::STATUS_APPROVED || $this->status == self::STATUS_CLOSED)
+				{
+					$user_valid = new User($this->db);
+					if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
+					$this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
+				}
 
-                $this->lines = array();
+				$this->lines = array();
 
-                $result = $this->fetch_lines();
+				$result = $this->fetch_lines();
 
-                return $result;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+				return $result;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Classify the expense report as paid
-     *
-     *    @param    int     $id                 Id of expense report
-     *    @param    user    $fuser              User making change
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Classify the expense report as paid
+	 *
+	 *    @param    int     $id                 Id of expense report
+	 *    @param    user    $fuser              User making change
 	 *    @param    int     $notrigger          Disable triggers
-     *    @return   int                         <0 if KO, >0 if OK
-     */
-    public function set_paid($id, $fuser, $notrigger = 0)
-    {
-        // phpcs:enable
+	 *    @return   int                         <0 if KO, >0 if OK
+	 */
+	public function set_paid($id, $fuser, $notrigger = 0)
+	{
+		// phpcs:enable
 		$error = 0;
 		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."expensereport";
-        $sql .= " SET fk_statut = ".self::STATUS_CLOSED.", paid=1";
-        $sql .= " WHERE rowid = ".$id." AND fk_statut = ".self::STATUS_APPROVED;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."expensereport";
+		$sql .= " SET fk_statut = ".self::STATUS_CLOSED.", paid=1";
+		$sql .= " WHERE rowid = ".$id." AND fk_statut = ".self::STATUS_APPROVED;
 
-        dol_syslog(get_class($this)."::set_paid sql=".$sql, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->affected_rows($resql))
-            {
+		dol_syslog(get_class($this)."::set_paid sql=".$sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->affected_rows($resql))
+			{
 				if (!$notrigger)
 				{
 					// Call trigger
@@ -658,276 +655,268 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else
-            {
+			} else {
 				$this->db->commit();
-                return 0;
-            }
-        }
-        else
-        {
+				return 0;
+			}
+		} else {
 			$this->db->rollback();
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *  Returns the label status
-     *
-     *  @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
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->status, $mode);
-    }
+	/**
+	 *  Returns the label status
+	 *
+	 *  @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
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Returns the label of a statut
-     *
-     *  @param      int     $status     id statut
-     *  @param      int     $mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-     *  @return     string              Label
-     */
-    public function LibStatut($status, $mode = 0)
-    {
-    	// phpcs:enable
-    	global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Returns the label of a 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
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-    	$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
-    	$labelStatusShort = $langs->transnoentitiesnoconv($this->statuts_short[$status]);
+		$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
+		$labelStatusShort = $langs->transnoentitiesnoconv($this->statuts_short[$status]);
 
-    	$statusType = $this->statuts_logo[$status];
+		$statusType = $this->statuts_logo[$status];
 
-    	return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
-    }
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
+	}
 
 
-    /**
-     *  Load information on object
-     *
-     *  @param  int     $id      Id of object
-     *  @return void
-     */
-    public function info($id)
-    {
-        global $conf;
+	/**
+	 *  Load information on object
+	 *
+	 *  @param  int     $id      Id of object
+	 *  @return void
+	 */
+	public function info($id)
+	{
+		global $conf;
 
-        $sql = "SELECT f.rowid,";
-        $sql .= " f.date_create as datec,";
-        $sql .= " f.tms as date_modification,";
-        $sql .= " f.date_valid as datev,";
-        $sql .= " f.date_approve as datea,";
-        //$sql.= " f.fk_user_author as fk_user_creation,";      // This is not user of creation but user the expense is for.
-        $sql .= " f.fk_user_modif as fk_user_modification,";
-        $sql .= " f.fk_user_valid,";
-        $sql .= " f.fk_user_approve";
-        $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as f";
-        $sql .= " WHERE f.rowid = ".$id;
-        $sql .= " AND f.entity = ".$conf->entity;
+		$sql = "SELECT f.rowid,";
+		$sql .= " f.date_create as datec,";
+		$sql .= " f.tms as date_modification,";
+		$sql .= " f.date_valid as datev,";
+		$sql .= " f.date_approve as datea,";
+		//$sql.= " f.fk_user_author as fk_user_creation,";      // This is not user of creation but user the expense is for.
+		$sql .= " f.fk_user_modif as fk_user_modification,";
+		$sql .= " f.fk_user_valid,";
+		$sql .= " f.fk_user_approve";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as f";
+		$sql .= " WHERE f.rowid = ".$id;
+		$sql .= " AND f.entity = ".$conf->entity;
 
-        $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->date_creation = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->date_modification);
-                $this->date_validation = $this->db->jdate($obj->datev);
-                $this->date_approbation = $this->db->jdate($obj->datea);
+				$this->date_creation = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
+				$this->date_validation = $this->db->jdate($obj->datev);
+				$this->date_approbation = $this->db->jdate($obj->datea);
 
-                $cuser = new User($this->db);
-                $cuser->fetch($obj->fk_user_author);
-                $this->user_creation = $cuser;
+				$cuser = new User($this->db);
+				$cuser->fetch($obj->fk_user_author);
+				$this->user_creation = $cuser;
 
-                if ($obj->fk_user_creation)
-                {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_creation);
-                    $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_modification)
-                {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modification);
-                    $this->user_modification = $muser;
-                }
-                if ($obj->fk_user_approve)
-                {
-                    $auser = new User($this->db);
-                    $auser->fetch($obj->fk_user_approve);
-                    $this->user_approve = $auser;
-                }
-            }
-            $this->db->free($resql);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+				if ($obj->fk_user_creation)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_creation);
+					$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_modification)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modification);
+					$this->user_modification = $muser;
+				}
+				if ($obj->fk_user_approve)
+				{
+					$auser = new User($this->db);
+					$auser->fetch($obj->fk_user_approve);
+					$this->user_approve = $auser;
+				}
+			}
+			$this->db->free($resql);
+		} 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()
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  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;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Initialise parametres
-        $this->id = 0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->date_create = $now;
-        $this->date_debut = $now;
-        $this->date_fin = $now;
-        $this->date_valid = $now;
-        $this->date_approve = $now;
+		// Initialise parametres
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->date_create = $now;
+		$this->date_debut = $now;
+		$this->date_fin = $now;
+		$this->date_valid = $now;
+		$this->date_approve = $now;
 
-        $type_fees_id = 2; // TF_TRIP
+		$type_fees_id = 2; // TF_TRIP
 
-        $this->status = 5;
-        $this->fk_statut = 5;
+		$this->status = 5;
+		$this->fk_statut = 5;
 
-        $this->fk_user_author = $user->id;
-        $this->fk_user_validator = $user->id;
-        $this->fk_user_valid = $user->id;
-        $this->fk_user_approve = $user->id;
+		$this->fk_user_author = $user->id;
+		$this->fk_user_validator = $user->id;
+		$this->fk_user_valid = $user->id;
+		$this->fk_user_approve = $user->id;
 
-        $this->note_private = 'Private note';
-        $this->note_public = 'SPECIMEN';
-        $nbp = 5;
-        $xnbp = 0;
-        while ($xnbp < $nbp) {
-            $line = new ExpenseReportLine($this->db);
-            $line->comments = $langs->trans("Comment")." ".$xnbp;
-            $line->date = ($now - 3600 * (1 + $xnbp));
-            $line->total_ht = 100;
-            $line->total_tva = 20;
-            $line->total_ttc = 120;
-            $line->qty = 1;
-            $line->vatrate = 20;
-            $line->value_unit = 120;
-            $line->fk_expensereport = 0;
-            $line->type_fees_code = 'TRA';
-            $line->fk_c_type_fees = $type_fees_id;
+		$this->note_private = 'Private note';
+		$this->note_public = 'SPECIMEN';
+		$nbp = 5;
+		$xnbp = 0;
+		while ($xnbp < $nbp) {
+			$line = new ExpenseReportLine($this->db);
+			$line->comments = $langs->trans("Comment")." ".$xnbp;
+			$line->date = ($now - 3600 * (1 + $xnbp));
+			$line->total_ht = 100;
+			$line->total_tva = 20;
+			$line->total_ttc = 120;
+			$line->qty = 1;
+			$line->vatrate = 20;
+			$line->value_unit = 120;
+			$line->fk_expensereport = 0;
+			$line->type_fees_code = 'TRA';
+			$line->fk_c_type_fees = $type_fees_id;
 
-            $line->projet_ref = 'ABC';
+			$line->projet_ref = 'ABC';
 
-            $this->lines[$xnbp] = $line;
-            $xnbp++;
+			$this->lines[$xnbp] = $line;
+			$xnbp++;
 
-            $this->total_ht += $line->total_ht;
-            $this->total_tva += $line->total_tva;
-            $this->total_ttc += $line->total_ttc;
-        }
-    }
+			$this->total_ht += $line->total_ht;
+			$this->total_tva += $line->total_tva;
+			$this->total_ttc += $line->total_ttc;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * fetch_line_by_project
-     *
-     * @param   int     $projectid      Project id
-     * @param   User    $user           User
-     * @return  int                     <0 if KO, >0 if OK
-     */
-    public function fetch_line_by_project($projectid, $user = '')
-    {
-        // phpcs:enable
-        global $conf, $db, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * fetch_line_by_project
+	 *
+	 * @param   int     $projectid      Project id
+	 * @param   User    $user           User
+	 * @return  int                     <0 if KO, >0 if OK
+	 */
+	public function fetch_line_by_project($projectid, $user = '')
+	{
+		// phpcs:enable
+		global $conf, $db, $langs;
 
-        $langs->load('trips');
+		$langs->load('trips');
 
-        if ($user->rights->expensereport->lire) {
-            $sql = "SELECT de.fk_expensereport, de.date, de.comments, de.total_ht, de.total_ttc";
-            $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as de";
-            $sql .= " WHERE de.fk_projet = ".$projectid;
+		if ($user->rights->expensereport->lire) {
+			$sql = "SELECT de.fk_expensereport, de.date, de.comments, de.total_ht, de.total_ttc";
+			$sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as de";
+			$sql .= " WHERE de.fk_projet = ".$projectid;
 
-            dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $num = $db->num_rows($result);
-                $i = 0;
-                $total_HT = 0;
-                $total_TTC = 0;
+			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
+			$result = $this->db->query($sql);
+			if ($result)
+			{
+				$num = $this->db->num_rows($result);
+				$i = 0;
+				$total_HT = 0;
+				$total_TTC = 0;
 
-                while ($i < $num)
-                {
-                    $objp = $db->fetch_object($result);
+				while ($i < $num)
+				{
+					$objp = $this->db->fetch_object($result);
 
-                    $sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut";
-                    $sql2 .= " FROM ".MAIN_DB_PREFIX."expensereport as d";
-                    $sql2 .= " WHERE d.rowid = '".$objp->fk_expensereport."'";
+					$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut as status";
+					$sql2 .= " FROM ".MAIN_DB_PREFIX."expensereport as d";
+					$sql2 .= " WHERE d.rowid = ".((int) $objp->fk_expensereport);
 
-                    $result2 = $db->query($sql2);
-                    $obj = $db->fetch_object($result2);
+					$result2 = $this->db->query($sql2);
+					$obj = $this->db->fetch_object($result2);
 
-                    $objp->fk_user_author = $obj->fk_user_author;
-                    $objp->ref = $obj->ref;
-                    $objp->fk_c_expensereport_status = $obj->fk_statut;
-                    $objp->rowid = $obj->rowid;
+					$objp->fk_user_author = $obj->fk_user_author;
+					$objp->ref = $obj->ref;
+					$objp->fk_c_expensereport_status = $obj->status;
+					$objp->rowid = $obj->rowid;
 
-                    $total_HT = $total_HT + $objp->total_ht;
-                    $total_TTC = $total_TTC + $objp->total_ttc;
-                    $author = new User($db);
-                    $author->fetch($objp->fk_user_author);
+					$total_HT = $total_HT + $objp->total_ht;
+					$total_TTC = $total_TTC + $objp->total_ttc;
+					$author = new User($this->db);
+					$author->fetch($objp->fk_user_author);
 
-                    print '<tr>';
-                    print '<td><a href="'.DOL_URL_ROOT.'/expensereport/card.php?id='.$objp->rowid.'">'.$objp->ref_num.'</a></td>';
-                    print '<td class="center">'.dol_print_date($objp->date, 'day').'</td>';
-                    print '<td>'.$author->getNomUrl(1).'</td>';
-                    print '<td>'.$objp->comments.'</td>';
-                    print '<td class="right">'.price($objp->total_ht).'</td>';
-                    print '<td class="right">'.price($objp->total_ttc).'</td>';
-                    print '<td class="right">';
+					print '<tr>';
+					print '<td><a href="'.DOL_URL_ROOT.'/expensereport/card.php?id='.$objp->rowid.'">'.$objp->ref_num.'</a></td>';
+					print '<td class="center">'.dol_print_date($objp->date, 'day').'</td>';
+					print '<td>'.$author->getNomUrl(1).'</td>';
+					print '<td>'.$objp->comments.'</td>';
+					print '<td class="right">'.price($objp->total_ht).'</td>';
+					print '<td class="right">'.price($objp->total_ttc).'</td>';
+					print '<td class="right">';
 
-                    switch ($objp->fk_c_expensereport_status) {
-                        case 4:
-                            print img_picto($langs->trans('StatusOrderCanceled'), 'statut5');
-                            break;
-                        case 1:
-                            print $langs->trans('Draft').' '.img_picto($langs->trans('Draft'), 'statut0');
-                            break;
-                        case 2:
-                            print $langs->trans('TripForValid').' '.img_picto($langs->trans('TripForValid'), 'statut3');
-                            break;
-                        case 5:
-                            print $langs->trans('TripForPaid').' '.img_picto($langs->trans('TripForPaid'), 'statut3');
-                            break;
-                        case 6:
-                            print $langs->trans('TripPaid').' '.img_picto($langs->trans('TripPaid'), 'statut4');
-                            break;
-                    }
-                    /*
+					switch ($objp->fk_c_expensereport_status) {
+						case 4:
+							print img_picto($langs->trans('StatusOrderCanceled'), 'statut5');
+							break;
+						case 1:
+							print $langs->trans('Draft').' '.img_picto($langs->trans('Draft'), 'statut0');
+							break;
+						case 2:
+							print $langs->trans('TripForValid').' '.img_picto($langs->trans('TripForValid'), 'statut3');
+							break;
+						case 5:
+							print $langs->trans('TripForPaid').' '.img_picto($langs->trans('TripForPaid'), 'statut3');
+							break;
+						case 6:
+							print $langs->trans('TripPaid').' '.img_picto($langs->trans('TripPaid'), 'statut4');
+							break;
+					}
+					/*
                      if ($status==4) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
                     if ($status==1) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
                     if ($status==2) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
@@ -935,251 +924,237 @@ class ExpenseReport extends CommonObject
                     if ($status==5) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
                     if ($status==6) return img_picto($langs->trans('StatusOrderOnProcess'),'statut6');
                     */
-                    print '</td>';
-                    print '</tr>';
+					print '</td>';
+					print '</tr>';
 
-                    $i++;
-                }
+					$i++;
+				}
 
-                print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Number").': '.$i.'</td>';
-                print '<td class="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_HT).'</td>';
-                print '<td class="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_TTC).'</td>';
-                print '<td>&nbsp;</td>';
-                print '</tr>';
-            }
-            else
-            {
-                $this->error = $db->lasterror();
-                return -1;
-            }
-        }
-    }
+				print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Number").': '.$i.'</td>';
+				print '<td class="right" width="100">'.$langs->trans("TotalHT").' : '.price($total_HT).'</td>';
+				print '<td class="right" width="100">'.$langs->trans("TotalTTC").' : '.price($total_TTC).'</td>';
+				print '<td>&nbsp;</td>';
+				print '</tr>';
+			} else {
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		}
+	}
 
-    /**
-     * recalculer
-     * TODO Replace this with call to update_price if not already done
-     *
-     * @param   int         $id     Id of expense report
-     * @return  int                 <0 if KO, >0 if OK
-     */
-    public function recalculer($id)
-    {
-        $sql = 'SELECT tt.total_ht, tt.total_ttc, tt.total_tva';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as tt';
-        $sql .= ' WHERE tt.'.$this->fk_element.' = '.$id;
+	/**
+	 * recalculer
+	 * TODO Replace this with call to update_price if not already done
+	 *
+	 * @param   int         $id     Id of expense report
+	 * @return  int                 <0 if KO, >0 if OK
+	 */
+	public function recalculer($id)
+	{
+		$sql = 'SELECT tt.total_ht, tt.total_ttc, tt.total_tva';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as tt';
+		$sql .= ' WHERE tt.'.$this->fk_element.' = '.$id;
 
-        $total_ht = 0; $total_tva = 0; $total_ttc = 0;
+		$total_ht = 0; $total_tva = 0; $total_ttc = 0;
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num):
-                $objp = $this->db->fetch_object($result);
-                $total_ht += $objp->total_ht;
-                $total_tva += $objp->total_tva;
-                $i++;
-            endwhile;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num):
+				$objp = $this->db->fetch_object($result);
+				$total_ht += $objp->total_ht;
+				$total_tva += $objp->total_tva;
+				$i++;
+			endwhile;
 
-            $total_ttc = $total_ht + $total_tva;
-            $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-            $sql .= " total_ht = ".$total_ht;
-            $sql .= " , total_ttc = ".$total_ttc;
-            $sql .= " , total_tva = ".$total_tva;
-            $sql .= " WHERE rowid = ".$id;
-            $result = $this->db->query($sql);
-            if ($result):
-                $this->db->free($result);
-                return 1;
-            else:
-                $this->error = $this->db->lasterror();
-                dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
-                return -3;
-            endif;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
-            return -3;
-        }
-    }
+			$total_ttc = $total_ht + $total_tva;
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+			$sql .= " total_ht = ".$total_ht;
+			$sql .= " , total_ttc = ".$total_ttc;
+			$sql .= " , total_tva = ".$total_tva;
+			$sql .= " WHERE rowid = ".$id;
+			$result = $this->db->query($sql);
+			if ($result):
+				$this->db->free($result);
+				return 1;
+			else :
+				$this->error = $this->db->lasterror();
+				dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
+				return -3;
+			endif;
+		} else {
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
+			return -3;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * fetch_lines
-     *
-     * @return  int     <0 if OK, >0 if KO
-     */
-    public function fetch_lines()
-    {
-        // phpcs:enable
-    	global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * fetch_lines
+	 *
+	 * @return  int     <0 if OK, >0 if KO
+	 */
+	public function fetch_lines()
+	{
+		// phpcs:enable
+		global $conf;
 
-    	$this->lines = array();
+		$this->lines = array();
 
-        $sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date, de.rang,';
-        $sql .= ' de.'.$this->fk_element.', de.fk_c_type_fees, de.fk_c_exp_tax_cat, de.fk_projet as fk_project, de.tva_tx, de.fk_ecm_files,';
-        $sql .= ' de.total_ht, de.total_tva, de.total_ttc,';
-        $sql .= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees,';
-        $sql .= ' p.ref as ref_projet, p.title as title_projet';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as de';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
-        $sql .= ' WHERE de.'.$this->fk_element.' = '.$this->id;
-        if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID))
-        {
-        	$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
-        }
-        else
-        {
-        	$sql .= ' ORDER BY de.rang ASC, de.date ASC';
-        }
+		$sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date, de.rang,';
+		$sql .= ' de.'.$this->fk_element.', de.fk_c_type_fees, de.fk_c_exp_tax_cat, de.fk_projet as fk_project, de.tva_tx, de.fk_ecm_files,';
+		$sql .= ' de.total_ht, de.total_tva, de.total_ttc,';
+		$sql .= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees,';
+		$sql .= ' p.ref as ref_projet, p.title as title_projet';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as de';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
+		$sql .= ' WHERE de.'.$this->fk_element.' = '.$this->id;
+		if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID))
+		{
+			$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
+		} else {
+			$sql .= ' ORDER BY de.rang ASC, de.date ASC';
+		}
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $objp = $this->db->fetch_object($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$objp = $this->db->fetch_object($resql);
 
-                $deplig = new ExpenseReportLine($this->db);
+				$deplig = new ExpenseReportLine($this->db);
 
-                $deplig->rowid          = $objp->rowid;
-                $deplig->id             = $objp->rowid;
-                $deplig->comments       = $objp->comments;
-                $deplig->qty            = $objp->qty;
-                $deplig->value_unit     = $objp->value_unit;
-                $deplig->date           = $objp->date;
-                $deplig->dates          = $this->db->jdate($objp->date);
+				$deplig->rowid          = $objp->rowid;
+				$deplig->id             = $objp->rowid;
+				$deplig->comments       = $objp->comments;
+				$deplig->qty            = $objp->qty;
+				$deplig->value_unit     = $objp->value_unit;
+				$deplig->date           = $objp->date;
+				$deplig->dates          = $this->db->jdate($objp->date);
 
-                $deplig->fk_expensereport = $objp->fk_expensereport;
-                $deplig->fk_c_type_fees   = $objp->fk_c_type_fees;
-                $deplig->fk_c_exp_tax_cat = $objp->fk_c_exp_tax_cat;
-                $deplig->fk_projet        = $objp->fk_project; // deprecated
-                $deplig->fk_project       = $objp->fk_project;
-                $deplig->fk_ecm_files     = $objp->fk_ecm_files;
+				$deplig->fk_expensereport = $objp->fk_expensereport;
+				$deplig->fk_c_type_fees   = $objp->fk_c_type_fees;
+				$deplig->fk_c_exp_tax_cat = $objp->fk_c_exp_tax_cat;
+				$deplig->fk_projet        = $objp->fk_project; // deprecated
+				$deplig->fk_project       = $objp->fk_project;
+				$deplig->fk_ecm_files     = $objp->fk_ecm_files;
 
-                $deplig->total_ht         = $objp->total_ht;
-                $deplig->total_tva        = $objp->total_tva;
-                $deplig->total_ttc        = $objp->total_ttc;
+				$deplig->total_ht         = $objp->total_ht;
+				$deplig->total_tva        = $objp->total_tva;
+				$deplig->total_ttc        = $objp->total_ttc;
 
-                $deplig->type_fees_code     = empty($objp->code_type_fees) ? 'TF_OTHER' : $objp->code_type_fees;
-                $deplig->type_fees_libelle  = $objp->libelle_type_fees;
+				$deplig->type_fees_code     = empty($objp->code_type_fees) ? 'TF_OTHER' : $objp->code_type_fees;
+				$deplig->type_fees_libelle  = $objp->libelle_type_fees;
 				$deplig->tva_tx = $objp->tva_tx;
-                $deplig->vatrate            = $objp->tva_tx;
-                $deplig->projet_ref         = $objp->ref_projet;
-                $deplig->projet_title       = $objp->title_projet;
+				$deplig->vatrate            = $objp->tva_tx;
+				$deplig->projet_ref         = $objp->ref_projet;
+				$deplig->projet_title       = $objp->title_projet;
 
-                $deplig->rang               = $objp->rang;
+				$deplig->rang               = $objp->rang;
 
-                $this->lines[$i] = $deplig;
+				$this->lines[$i] = $deplig;
 
-                $i++;
-            }
-            $this->db->free($resql);
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch_lines: Error ".$this->error, LOG_ERR);
-            return -3;
-        }
-    }
+				$i++;
+			}
+			$this->db->free($resql);
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch_lines: Error ".$this->error, LOG_ERR);
+			return -3;
+		}
+	}
 
 
-    /**
-     * delete
-     *
-     * @param   User    $fuser      User that delete
-     * @return  int                 <0 if KO, >0 if OK
-     */
-    public function delete(User $fuser = null)
-    {
-        global $user, $langs, $conf;
+	/**
+	 * delete
+	 *
+	 * @param   User    $fuser      User that delete
+	 * @return  int                 <0 if KO, >0 if OK
+	 */
+	public function delete(User $fuser = null)
+	{
+		global $user, $langs, $conf;
 
-        if (!$rowid) $rowid = $this->id;
+		if (!$rowid) $rowid = $this->id;
 
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line.' WHERE '.$this->fk_element.' = '.$rowid;
-        if ($this->db->query($sql))
-        {
-            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid = '.$rowid;
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->error = $this->db->error()." sql=".$sql;
-                dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-                $this->db->rollback();
-                return -6;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->error()." sql=".$sql;
-            dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-            $this->db->rollback();
-            return -4;
-        }
-    }
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line.' WHERE '.$this->fk_element.' = '.$rowid;
+		if ($this->db->query($sql))
+		{
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid = '.$rowid;
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->error = $this->db->error()." sql=".$sql;
+				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -6;
+			}
+		} else {
+			$this->error = $this->db->error()." sql=".$sql;
+			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+			$this->db->rollback();
+			return -4;
+		}
+	}
 
-    /**
-     * Set to status validate
-     *
-     * @param   User    $fuser      User
+	/**
+	 * Set to status validate
+	 *
+	 * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
-     * @return  int                 <0 if KO, 0 if nothing done, >0 if OK
-     */
-    public function setValidate($fuser, $notrigger = 0)
-    {
-        global $conf, $langs, $user;
+	 * @return  int                 <0 if KO, 0 if nothing done, >0 if OK
+	 */
+	public function setValidate($fuser, $notrigger = 0)
+	{
+		global $conf, $langs, $user;
 
 		$error = 0;
 		$now = dol_now();
 
-        // Protection
-        if ($this->statut == self::STATUS_VALIDATED)
-        {
-            dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
-            return 0;
-        }
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED)
+		{
+			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
 
-        $this->date_valid = $now; // Required for the getNextNum later.
+		$this->date_valid = $now; // Required for the getNextNum later.
 
 		// 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
-        {
-            $num = $this->getNextNumRef();
-        }
-        else
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
-            $num = $this->ref;
-        }
-        if (empty($num) || $num < 0) return -1;
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		if (empty($num) || $num < 0) return -1;
 
-        $this->newref = dol_sanitizeFileName($num);
+		$this->newref = dol_sanitizeFileName($num);
 
 		$this->db->begin();
 
-        // Validate
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " SET ref = '".$num."',";
-        $sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
-        $sql .= " date_valid='".$this->db->idate($this->date_valid)."',";
-        $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 .= " fk_statut = ".self::STATUS_VALIDATED.",";
+		$sql .= " date_valid='".$this->db->idate($this->date_valid)."',";
+		$sql .= " fk_user_valid = ".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
 			if (!$error && !$notrigger)
 			{
 				// Call trigger
@@ -1192,42 +1167,42 @@ class ExpenseReport extends CommonObject
 
 			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))
-			    {
-			    	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+				// Rename directory if dir was a temporary ref
+				if (preg_match('/^[\(]?PROV/i', $this->ref))
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-			    	// 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 = 'expensereport/".$this->db->escape($this->newref)."'";
-			    	$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expensereport/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+					// 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 = 'expensereport/".$this->db->escape($this->newref)."'";
+					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expensereport/".$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
+					// 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->expensereport->dir_output.'/'.$oldref;
 					$dirdest = $conf->expensereport->dir_output.'/'.$newref;
 					if (!$error && file_exists($dirsource))
 					{
-					    dol_syslog(get_class($this)."::setValidate() rename dir ".$dirsource." into ".$dirdest);
+						dol_syslog(get_class($this)."::setValidate() 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->expensereport->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->expensereport->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);
+							}
+						}
 					}
 				}
 			}
@@ -1235,102 +1210,94 @@ class ExpenseReport extends CommonObject
 			// Set new ref and current status
 			if (!$error)
 			{
-			    $this->ref = $num;
-			    $this->statut = self::STATUS_VALIDATED;
+				$this->ref = $num;
+				$this->status = self::STATUS_VALIDATED;
 			}
 
 			if (empty($error))
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
 			}
-        }
-        else
-        {
+		} else {
 			$this->db->rollback();
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * set_save_from_refuse
-     *
-     * @param   User    $fuser      User
-     * @return  int                 <0 if KO, >0 if OK
-     */
-    public function set_save_from_refuse($fuser)
-    {
-        // phpcs:enable
-        global $conf, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * set_save_from_refuse
+	 *
+	 * @param   User    $fuser      User
+	 * @return  int                 <0 if KO, >0 if OK
+	 */
+	public function set_save_from_refuse($fuser)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        // Sélection de la date de début de la NDF
-        $sql = 'SELECT date_debut';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' WHERE rowid = '.$this->id;
+		// Sélection de la date de début de la NDF
+		$sql = 'SELECT date_debut';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' WHERE rowid = '.$this->id;
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        $objp = $this->db->fetch_object($result);
+		$objp = $this->db->fetch_object($result);
 
-        $this->date_debut = $this->db->jdate($objp->date_debut);
+		$this->date_debut = $this->db->jdate($objp->date_debut);
 
-        if ($this->fk_statut != self::STATUS_VALIDATED)
-        {
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET fk_statut = ".self::STATUS_VALIDATED;
-            $sql .= ' WHERE rowid = '.$this->id;
+		if ($this->status != self::STATUS_VALIDATED)
+		{
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET fk_statut = ".self::STATUS_VALIDATED;
+			$sql .= ' WHERE rowid = '.$this->id;
 
-            dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
 
-            if ($this->db->query($sql))
-            {
-                return 1;
-            }
-            else
-            {
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::set_save_from_refuse expensereport already with save status", LOG_WARNING);
-        }
-    }
+			if ($this->db->query($sql))
+			{
+				return 1;
+			} else {
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this)."::set_save_from_refuse expensereport already with save status", LOG_WARNING);
+		}
+	}
 
-    /**
-     * Set status to approved
-     *
-     * @param   User    $fuser      User
+	/**
+	 * Set status to approved
+	 *
+	 * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
-     * @return  int                 <0 if KO, 0 if nothing done, >0 if OK
-     */
-    public function setApproved($fuser, $notrigger = 0)
-    {
-        $now = dol_now();
-        $error = 0;
+	 * @return  int                 <0 if KO, 0 if nothing done, >0 if OK
+	 */
+	public function setApproved($fuser, $notrigger = 0)
+	{
+		$now = dol_now();
+		$error = 0;
 
-        // date approval
-        $this->date_approve = $now;
-        if ($this->fk_statut != self::STATUS_APPROVED)
-        {
+		// date approval
+		$this->date_approve = $now;
+		if ($this->status != self::STATUS_APPROVED)
+		{
 			$this->db->begin();
 
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_APPROVED.", fk_user_approve = ".$fuser->id.",";
-            $sql .= " date_approve='".$this->db->idate($this->date_approve)."'";
-            $sql .= ' WHERE rowid = '.$this->id;
-            if ($this->db->query($sql))
-            {
-                if (!$notrigger)
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_APPROVED.", fk_user_approve = ".$fuser->id.",";
+			$sql .= " date_approve='".$this->db->idate($this->date_approve)."'";
+			$sql .= ' WHERE rowid = '.$this->id;
+			if ($this->db->query($sql))
+			{
+				if (!$notrigger)
 				{
 					// Call trigger
 					$result = $this->call_trigger('EXPENSE_REPORT_APPROVE', $fuser);
@@ -1345,57 +1312,52 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else
-            {
+			} else {
 				$this->db->rollback();
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::setApproved expensereport already with approve status", LOG_WARNING);
-        }
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this)."::setApproved expensereport already with approve status", LOG_WARNING);
+		}
 
-        return 0;
-    }
+		return 0;
+	}
 
-    /**
-     * setDeny
-     *
-     * @param User      $fuser      User
-     * @param string    $details    Details
-     * @param int       $notrigger  Disable triggers
-     * @return int
-     */
-    public function setDeny($fuser, $details, $notrigger = 0)
-    {
-        $now = dol_now();
+	/**
+	 * setDeny
+	 *
+	 * @param User      $fuser      User
+	 * @param string    $details    Details
+	 * @param int       $notrigger  Disable triggers
+	 * @return int
+	 */
+	public function setDeny($fuser, $details, $notrigger = 0)
+	{
+		$now = dol_now();
 		$error = 0;
 
-        // date de refus
-		if ($this->fk_statut != self::STATUS_REFUSED)
-        {
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_REFUSED.", fk_user_refuse = ".$fuser->id.",";
-            $sql .= " date_refuse='".$this->db->idate($now)."',";
-            $sql .= " detail_refuse='".$this->db->escape($details)."',";
-            $sql .= " fk_user_approve = NULL";
-            $sql .= ' WHERE rowid = '.$this->id;
-            if ($this->db->query($sql))
-            {
-                $this->fk_statut = 99;
-                $this->fk_user_refuse = $fuser->id;
-                $this->detail_refuse = $details;
-                $this->date_refuse = $now;
+		// date de refus
+		if ($this->status != self::STATUS_REFUSED)
+		{
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_REFUSED.", fk_user_refuse = ".$fuser->id.",";
+			$sql .= " date_refuse='".$this->db->idate($now)."',";
+			$sql .= " detail_refuse='".$this->db->escape($details)."',";
+			$sql .= " fk_user_approve = NULL";
+			$sql .= ' WHERE rowid = '.$this->id;
+			if ($this->db->query($sql))
+			{
+				$this->fk_statut = 99; // deprecated
+				$this->status = 99;
+				$this->fk_user_refuse = $fuser->id;
+				$this->detail_refuse = $details;
+				$this->date_refuse = $now;
 
 				if (!$notrigger)
 				{
@@ -1412,49 +1374,43 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else
-            {
+			} else {
 				$this->db->rollback();
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::setDeny expensereport already with refuse status", LOG_WARNING);
-        }
-    }
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this)."::setDeny expensereport already with refuse status", LOG_WARNING);
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * set_unpaid
-     *
-     * @param   User    $fuser      User
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * set_unpaid
+	 *
+	 * @param   User    $fuser      User
 	 * @param   int     $notrigger  Disable triggers
-     * @return  int                 <0 if KO, >0 if OK
-     */
-    public function set_unpaid($fuser, $notrigger = 0)
-    {
-        // phpcs:enable
+	 * @return  int                 <0 if KO, >0 if OK
+	 */
+	public function set_unpaid($fuser, $notrigger = 0)
+	{
+		// phpcs:enable
 		$error = 0;
 
 		if ($this->paid)
-        {
+		{
 			$this->db->begin();
 
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET paid = 0, fk_statut = ".self::STATUS_APPROVED;
-            $sql .= ' WHERE rowid = '.$this->id;
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET paid = 0, fk_statut = ".self::STATUS_APPROVED;
+			$sql .= ' WHERE rowid = '.$this->id;
 
-            dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
 
 			if ($this->db->query($sql))
 			{
@@ -1473,55 +1429,49 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -1;
 			}
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::set_unpaid expensereport already with unpaid status", LOG_WARNING);
-        }
-    }
+		} else {
+			dol_syslog(get_class($this)."::set_unpaid expensereport already with unpaid status", LOG_WARNING);
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * set_cancel
-     *
-     * @param   User    $fuser      User
-     * @param   string  $detail     Detail
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * set_cancel
+	 *
+	 * @param   User    $fuser      User
+	 * @param   string  $detail     Detail
 	 * @param   int     $notrigger  Disable triggers
-     * @return  int                 <0 if KO, >0 if OK
-     */
-    public function set_cancel($fuser, $detail, $notrigger = 0)
-    {
-        // phpcs:enable
+	 * @return  int                 <0 if KO, >0 if OK
+	 */
+	public function set_cancel($fuser, $detail, $notrigger = 0)
+	{
+		// phpcs:enable
 		$error = 0;
-        $this->date_cancel = $this->db->idate(dol_now());
-        if ($this->fk_statut != self::STATUS_CANCELED)
-        {
+		$this->date_cancel = $this->db->idate(dol_now());
+		if ($this->status != self::STATUS_CANCELED)
+		{
 			$this->db->begin();
 
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-            $sql .= " SET fk_statut = ".self::STATUS_CANCELED.", fk_user_cancel = ".$fuser->id;
-            $sql .= ", date_cancel='".$this->db->idate($this->date_cancel)."'";
-            $sql .= " ,detail_cancel='".$this->db->escape($detail)."'";
-            $sql .= ' WHERE rowid = '.$this->id;
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET fk_statut = ".self::STATUS_CANCELED.", fk_user_cancel = ".$fuser->id;
+			$sql .= ", date_cancel='".$this->db->idate($this->date_cancel)."'";
+			$sql .= " ,detail_cancel='".$this->db->escape($detail)."'";
+			$sql .= ' WHERE rowid = '.$this->id;
 
-            dol_syslog(get_class($this)."::set_cancel sql=".$sql, LOG_DEBUG);
+			dol_syslog(get_class($this)."::set_cancel sql=".$sql, LOG_DEBUG);
 
-            if ($this->db->query($sql))
-            {
+			if ($this->db->query($sql))
+			{
 				if (!$notrigger)
 				{
 					// Call trigger
@@ -1537,207 +1487,200 @@ class ExpenseReport extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = $this->db->error();
 					return -2;
 				}
-            }
-            else
-            {
+			} else {
 				$this->db->rollback();
-                $this->error = $this->db->error();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::set_cancel expensereport already with cancel status", LOG_WARNING);
-        }
-    }
+				$this->error = $this->db->error();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this)."::set_cancel expensereport already with cancel status", LOG_WARNING);
+		}
+	}
 
-    /**
-     * Return next reference of expense report not already used
-     *
-     * @return    string            free ref
-     */
-    public function getNextNumRef()
-    {
-        global $langs, $conf;
-        $langs->load("trips");
+	/**
+	 * Return next reference of expense report not already used
+	 *
+	 * @return    string            free ref
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("trips");
 
-        if (!empty($conf->global->EXPENSEREPORT_ADDON))
-        {
-        	$mybool = false;
+		if (!empty($conf->global->EXPENSEREPORT_ADDON))
+		{
+			$mybool = false;
 
-        	$file = $conf->global->EXPENSEREPORT_ADDON.".php";
+			$file = $conf->global->EXPENSEREPORT_ADDON.".php";
 			$classname = $conf->global->EXPENSEREPORT_ADDON;
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 			foreach ($dirmodels as $reldir)
 			{
-                $dir = dol_buildpath($reldir."core/modules/expensereport/");
+				$dir = dol_buildpath($reldir."core/modules/expensereport/");
 
-                // 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($this);
+			$obj = new $classname();
+			$numref = $obj->getNextValue($this);
 
-            if ($numref != "")
-            {
-            	return $numref;
-            }
-            else
+			if ($numref != "")
 			{
+				return $numref;
+			} else {
 				$this->error = $obj->error;
 				$this->errors = $obj->errors;
-            	//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
-            	return -1;
-            }
-        }
-        else
-        {
-            $this->error = "Error_EXPENSEREPORT_ADDON_NotDefined";
-            return -2;
-        }
-    }
+				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+				return -1;
+			}
+		} else {
+			$this->error = "Error_EXPENSEREPORT_ADDON_NotDefined";
+			return -2;
+		}
+	}
 
-    /**
-     *  Return clicable name (with picto eventually)
-     *
-     *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param		int		$max						Max length of shown 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
-     *	@return		string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
-    {
-        global $langs, $conf;
+	/**
+	 *  Return clicable name (with picto eventually)
+	 *
+	 *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param		int		$max						Max length of shown 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
+	 *	@return		string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
+	{
+		global $langs, $conf;
 
-        $result = '';
+		$result = '';
 
-        $url = DOL_URL_ROOT.'/expensereport/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/expensereport/card.php?id='.$this->id;
 
-        if ($short) return $url;
+		if ($short) return $url;
 
-        $label = '<u>'.$langs->trans("ShowExpenseReport").'</u>';
-        if (!empty($this->ref))
-            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-        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 ($moretitle) $label .= ' - '.$moretitle;
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ExpenseReport").'</u>';
+		if (!empty($this->ref))
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		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 ($moretitle) $label .= ' - '.$moretitle;
 
-        //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';
+		//}
 
-        $ref = $this->ref;
-        if (empty($ref)) $ref = $this->id;
+		$ref = $this->ref;
+		if (empty($ref)) $ref = $this->id;
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowExpenseReport");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip"';
-        }
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowExpenseReport");
+				$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, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= ($max ?dol_trunc($ref, $max) : $ref);
-        $result .= $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);
+		if ($withpicto != 2) $result .= ($max ?dol_trunc($ref, $max) : $ref);
+		$result .= $linkend;
 
-        return $result;
-    }
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update total of an expense report when you add a line.
-     *
-     *  @param    string    $ligne_total_ht    Amount without taxes
-     *  @param    string    $ligne_total_tva    Amount of all taxes
-     *  @return    void
-     */
-    public function update_totaux_add($ligne_total_ht, $ligne_total_tva)
-    {
-        // phpcs:enable
-        $this->total_ht = $this->total_ht + $ligne_total_ht;
-        $this->total_tva = $this->total_tva + $ligne_total_tva;
-        $this->total_ttc = $this->total_ht + $this->total_tva;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update total of an expense report when you add a line.
+	 *
+	 *  @param    string    $ligne_total_ht    Amount without taxes
+	 *  @param    string    $ligne_total_tva    Amount of all taxes
+	 *  @return    void
+	 */
+	public function update_totaux_add($ligne_total_ht, $ligne_total_tva)
+	{
+		// phpcs:enable
+		$this->total_ht = $this->total_ht + $ligne_total_ht;
+		$this->total_tva = $this->total_tva + $ligne_total_tva;
+		$this->total_ttc = $this->total_ht + $this->total_tva;
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " total_ht = ".$this->total_ht;
-        $sql .= " , total_ttc = ".$this->total_ttc;
-        $sql .= " , total_tva = ".$this->total_tva;
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " total_ht = ".$this->total_ht;
+		$sql .= " , total_ttc = ".$this->total_ttc;
+		$sql .= " , total_tva = ".$this->total_tva;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $result = $this->db->query($sql);
-        if ($result):
-            return 1;
-        else:
-            $this->error = $this->db->error();
-            return -1;
-        endif;
-    }
+		$result = $this->db->query($sql);
+		if ($result):
+			return 1;
+		else :
+			$this->error = $this->db->error();
+			return -1;
+		endif;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Update total of an expense report when you delete a line.
-     *
-     *  @param    string    $ligne_total_ht    Amount without taxes
-     *  @param    string    $ligne_total_tva    Amount of all taxes
-     *  @return    void
-     */
-    public function update_totaux_del($ligne_total_ht, $ligne_total_tva)
-    {
-        // phpcs:enable
-        $this->total_ht = $this->total_ht - $ligne_total_ht;
-        $this->total_tva = $this->total_tva - $ligne_total_tva;
-        $this->total_ttc = $this->total_ht + $this->total_tva;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Update total of an expense report when you delete a line.
+	 *
+	 *  @param    string    $ligne_total_ht    Amount without taxes
+	 *  @param    string    $ligne_total_tva    Amount of all taxes
+	 *  @return    void
+	 */
+	public function update_totaux_del($ligne_total_ht, $ligne_total_tva)
+	{
+		// phpcs:enable
+		$this->total_ht = $this->total_ht - $ligne_total_ht;
+		$this->total_tva = $this->total_tva - $ligne_total_tva;
+		$this->total_ttc = $this->total_ht + $this->total_tva;
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= " total_ht = ".$this->total_ht;
-        $sql .= " , total_ttc = ".$this->total_ttc;
-        $sql .= " , total_tva = ".$this->total_tva;
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " total_ht = ".$this->total_ht;
+		$sql .= " , total_ttc = ".$this->total_ttc;
+		$sql .= " , total_tva = ".$this->total_tva;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $result = $this->db->query($sql);
-        if ($result):
-            return 1;
-        else:
-            $this->error = $this->db->error();
-            return -1;
-        endif;
-    }
+		$result = $this->db->query($sql);
+		if ($result):
+			return 1;
+		else :
+			$this->error = $this->db->error();
+			return -1;
+		endif;
+	}
 
 	/**
 	 * addline
@@ -1754,13 +1697,13 @@ class ExpenseReport extends CommonObject
 	 * @param    int         $fk_ecm_files             Id of ECM file to link to this expensereport line
 	 * @return   int                                   <0 if KO, >0 if OK
 	 */
-    public function addline($qty = 0, $up = 0, $fk_c_type_fees = 0, $vatrate = 0, $date = '', $comments = '', $fk_project = 0, $fk_c_exp_tax_cat = 0, $type = 0, $fk_ecm_files = 0)
+	public function addline($qty = 0, $up = 0, $fk_c_type_fees = 0, $vatrate = 0, $date = '', $comments = '', $fk_project = 0, $fk_c_exp_tax_cat = 0, $type = 0, $fk_ecm_files = 0)
 	{
 		global $conf, $langs, $mysoc;
 
-        dol_syslog(get_class($this)."::addline qty=$qty, up=$up, fk_c_type_fees=$fk_c_type_fees, vatrate=$vatrate, date=$date, fk_project=$fk_project, type=$type, comments=$comments", LOG_DEBUG);
+		dol_syslog(get_class($this)."::addline qty=$qty, up=$up, fk_c_type_fees=$fk_c_type_fees, vatrate=$vatrate, date=$date, fk_project=$fk_project, type=$type, comments=$comments", LOG_DEBUG);
 
-		if ($this->fk_statut == self::STATUS_DRAFT)
+		if ($this->status == self::STATUS_DRAFT)
 		{
 			if (empty($qty)) $qty = 0;
 			if (empty($fk_c_type_fees) || $fk_c_type_fees < 0) $fk_c_type_fees = 0;
@@ -1815,34 +1758,28 @@ class ExpenseReport extends CommonObject
 			$this->checkRules($type, $seller);
 
 			$result = $this->line->insert(0, true);
-            if ($result > 0)
-            {
-                $result = $this->update_price(); // 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->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->error = $this->line->error;
-                dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
-                $this->db->rollback();
-                return -2;
-            }
-		}
-		else
-        {
-            dol_syslog(get_class($this)."::addline status of expense report must be Draft to allow use of ->addline()", LOG_ERR);
+			if ($result > 0)
+			{
+				$result = $this->update_price(); // 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->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->error = $this->line->error;
+				dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			dol_syslog(get_class($this)."::addline status of expense report must be Draft to allow use of ->addline()", LOG_ERR);
 			$this->error = 'ErrorExpenseNotDraft';
-            return -3;
-        }
+			return -3;
+		}
 	}
 
 	/**
@@ -1887,9 +1824,7 @@ class ExpenseReport extends CommonObject
 
 					$new_current_total_ttc -= $amount_to_test - $rule->amount; // ex, entered 16€, limit 12€, subtracts 4€;
 					$rule_warning_message_tab[] = $langs->trans('ExpenseReportConstraintViolationError', $rule->id, price($amount_to_test, 0, $langs, 1, -1, -1, $conf->currency), price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency), $langs->trans('by'.$rule->code_expense_rules_type, price($new_current_total_ttc, 0, $langs, 1, -1, -1, $conf->currency)));
-				}
-				else
-				{
+				} else {
 					$this->error = 'ExpenseReportConstraintViolationWarning';
 					$this->errors[] = $this->error;
 
@@ -1912,8 +1847,7 @@ class ExpenseReport extends CommonObject
 			$this->line->total_tva = $tmp[1];
 
 			return false;
-		}
-		else return true;
+		} else return true;
 	}
 
 	/**
@@ -1984,348 +1918,336 @@ class ExpenseReport extends CommonObject
 		{
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) return true;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
 		return false;
 	}
 
-    /**
-     * Update an expense report line
-     *
-     * @param   int         $rowid                  Line to edit
-     * @param   int         $type_fees_id           Type payment
-     * @param   int         $projet_id              Project id
-     * @param   double      $vatrate                Vat rate. Can be '8.5' or '8.5* (8.5NPROM...)'
-     * @param   string      $comments               Description
-     * @param   float       $qty                    Qty
-     * @param   double      $value_unit             Value init
-     * @param   int         $date                   Date
-     * @param   int         $expensereport_id       Expense report id
-     * @param   int         $fk_c_exp_tax_cat       Id of category of car
+	/**
+	 * Update an expense report line
+	 *
+	 * @param   int         $rowid                  Line to edit
+	 * @param   int         $type_fees_id           Type payment
+	 * @param   int         $projet_id              Project id
+	 * @param   double      $vatrate                Vat rate. Can be '8.5' or '8.5* (8.5NPROM...)'
+	 * @param   string      $comments               Description
+	 * @param   float       $qty                    Qty
+	 * @param   double      $value_unit             Value init
+	 * @param   int         $date                   Date
+	 * @param   int         $expensereport_id       Expense report id
+	 * @param   int         $fk_c_exp_tax_cat       Id of category of car
 	 * @param   int         $fk_ecm_files           Id of ECM file to link to this expensereport line
-     * @return  int                                 <0 if KO, >0 if OK
-     */
-    public function updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $expensereport_id, $fk_c_exp_tax_cat = 0, $fk_ecm_files = 0)
-    {
-        global $user, $mysoc;
+	 * @return  int                                 <0 if KO, >0 if OK
+	 */
+	public function updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $expensereport_id, $fk_c_exp_tax_cat = 0, $fk_ecm_files = 0)
+	{
+		global $user, $mysoc;
 
-        if ($this->fk_statut == 0 || $this->fk_statut == 99)
-        {
-            $this->db->begin();
+		if ($this->status == self::STATUS_DRAFT || $this->status == self::STATUS_REFUSED)
+		{
+			$this->db->begin();
 
-            $type = 0; // TODO What if type is service ?
+			$type = 0; // TODO What if type is service ?
 
-            // We don't know seller and buyer for expense reports
-            $seller = $mysoc;
-            $buyer = new Societe($this->db);
+			// We don't know seller and buyer for expense reports
+			$seller = $mysoc;
+			$buyer = new Societe($this->db);
 
-            $localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
+			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
 
-            // Clean vat code
-            $vat_src_code = '';
-            if (preg_match('/\((.*)\)/', $vatrate, $reg))
-            {
-                $vat_src_code = $reg[1];
-                $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
-            }
-            $vatrate = preg_replace('/\*/', '', $vatrate);
+			// Clean vat code
+			$vat_src_code = '';
+			if (preg_match('/\((.*)\)/', $vatrate, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
+			}
+			$vatrate = preg_replace('/\*/', '', $vatrate);
 
-            $tmp = calcul_price_total($qty, $value_unit, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller, $localtaxes_type);
+			$tmp = calcul_price_total($qty, $value_unit, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller, $localtaxes_type);
 
-            // calcul total of line
-            //$total_ttc  = price2num($qty*$value_unit, 'MT');
+			// calcul total of line
+			//$total_ttc  = price2num($qty*$value_unit, 'MT');
 
-            $tx_tva = $vatrate / 100;
-            $tx_tva = $tx_tva + 1;
-            $total_ht = price2num($total_ttc / $tx_tva, 'MT');
+			$tx_tva = $vatrate / 100;
+			$tx_tva = $tx_tva + 1;
+			$total_ht = price2num($total_ttc / $tx_tva, 'MT');
 
-            $total_tva = price2num($total_ttc - $total_ht, 'MT');
-            // fin calculs
+			$total_tva = price2num($total_ttc - $total_ht, 'MT');
+			// fin calculs
 
-            $this->line = new ExpenseReportLine($this->db);
-            $this->line->comments        = $comments;
-            $this->line->qty             = $qty;
-            $this->line->value_unit      = $value_unit;
-            $this->line->date            = $date;
+			$this->line = new ExpenseReportLine($this->db);
+			$this->line->comments        = $comments;
+			$this->line->qty             = $qty;
+			$this->line->value_unit      = $value_unit;
+			$this->line->date            = $date;
 
-            $this->line->fk_expensereport = $expensereport_id;
-            $this->line->fk_c_type_fees  = $type_fees_id;
-            $this->line->fk_c_exp_tax_cat = $fk_c_exp_tax_cat;
-            $this->line->fk_projet       = $projet_id; // deprecated
-            $this->line->fk_project      = $projet_id;
+			$this->line->fk_expensereport = $expensereport_id;
+			$this->line->fk_c_type_fees  = $type_fees_id;
+			$this->line->fk_c_exp_tax_cat = $fk_c_exp_tax_cat;
+			$this->line->fk_projet       = $projet_id; // deprecated
+			$this->line->fk_project      = $projet_id;
 
-            $this->line->vat_src_code = $vat_src_code;
-            $this->line->vatrate = price2num($vatrate);
-            $this->line->total_ttc = $tmp[2];
-            $this->line->total_ht = $tmp[0];
-            $this->line->total_tva = $tmp[1];
-            $this->line->localtax1_tx = $localtaxes_type[1];
-            $this->line->localtax2_tx = $localtaxes_type[3];
-            $this->line->localtax1_type = $localtaxes_type[0];
-            $this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->vat_src_code = $vat_src_code;
+			$this->line->vatrate = price2num($vatrate);
+			$this->line->total_ttc = $tmp[2];
+			$this->line->total_ht = $tmp[0];
+			$this->line->total_tva = $tmp[1];
+			$this->line->localtax1_tx = $localtaxes_type[1];
+			$this->line->localtax2_tx = $localtaxes_type[3];
+			$this->line->localtax1_type = $localtaxes_type[0];
+			$this->line->localtax2_type = $localtaxes_type[2];
 
-            $this->line->fk_ecm_files = $fk_ecm_files;
+			$this->line->fk_ecm_files = $fk_ecm_files;
 
-            $this->line->id = $rowid;
+			$this->line->id = $rowid;
 
-            // Select des infos sur le type fees
-            $sql = "SELECT c.code as code_type_fees, c.label as libelle_type_fees";
-            $sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
-            $sql .= " WHERE c.id = ".$type_fees_id;
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $objp_fees = $this->db->fetch_object($resql);
-                $this->line->type_fees_code      = $objp_fees->code_type_fees;
-                $this->line->type_fees_libelle   = $objp_fees->libelle_type_fees;
-                $this->db->free($resql);
-            }
+			// Select des infos sur le type fees
+			$sql = "SELECT c.code as code_type_fees, c.label as libelle_type_fees";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
+			$sql .= " WHERE c.id = ".$type_fees_id;
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$objp_fees = $this->db->fetch_object($resql);
+				$this->line->type_fees_code      = $objp_fees->code_type_fees;
+				$this->line->type_fees_libelle   = $objp_fees->libelle_type_fees;
+				$this->db->free($resql);
+			}
 
-            // Select des informations du projet
-            $sql = "SELECT p.ref as ref_projet, p.title as title_projet";
-            $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-            $sql .= " WHERE p.rowid = ".$projet_id;
-            $resql = $this->db->query($sql);
-            if ($resql) {
-            	$objp_projet = $this->db->fetch_object($resql);
-            	$this->line->projet_ref          = $objp_projet->ref_projet;
-            	$this->line->projet_title        = $objp_projet->title_projet;
-            	$this->db->free($resql);
-            }
+			// Select des informations du projet
+			$sql = "SELECT p.ref as ref_projet, p.title as title_projet";
+			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+			$sql .= " WHERE p.rowid = ".$projet_id;
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$objp_projet = $this->db->fetch_object($resql);
+				$this->line->projet_ref          = $objp_projet->ref_projet;
+				$this->line->projet_title        = $objp_projet->title_projet;
+				$this->db->free($resql);
+			}
 
 			$this->applyOffset();
 			$this->checkRules();
 
-            $result = $this->line->update($user);
-            if ($result > 0)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->error = $this->line->error;
-                $this->errors = $this->line->errors;
-                $this->db->rollback();
-                return -2;
-            }
-        }
-    }
+			$result = $this->line->update($user);
+			if ($result > 0)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->error = $this->line->error;
+				$this->errors = $this->line->errors;
+				$this->db->rollback();
+				return -2;
+			}
+		}
+	}
 
-    /**
-     * deleteline
-     *
-     * @param   int     $rowid      Row id
-     * @param   User    $fuser      User
-     * @return  int                 <0 if KO, >0 if OK
-     */
-    public function deleteline($rowid, $fuser = '')
-    {
-        $this->db->begin();
+	/**
+	 * deleteline
+	 *
+	 * @param   int     $rowid      Row id
+	 * @param   User    $fuser      User
+	 * @return  int                 <0 if KO, >0 if OK
+	 */
+	public function deleteline($rowid, $fuser = '')
+	{
+		$this->db->begin();
 
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line;
-        $sql .= ' WHERE rowid = '.$rowid;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+		$sql .= ' WHERE rowid = '.$rowid;
 
-        dol_syslog(get_class($this)."::deleteline sql=".$sql);
-        $result = $this->db->query($sql);
-        if (!$result)
-        {
-            $this->error = $this->db->error();
-            dol_syslog(get_class($this)."::deleteline  Error ".$this->error, LOG_ERR);
-            $this->db->rollback();
-            return -1;
-        }
+		dol_syslog(get_class($this)."::deleteline sql=".$sql);
+		$result = $this->db->query($sql);
+		if (!$result)
+		{
+			$this->error = $this->db->error();
+			dol_syslog(get_class($this)."::deleteline  Error ".$this->error, LOG_ERR);
+			$this->db->rollback();
+			return -1;
+		}
 
-        $this->db->commit();
+		$this->db->commit();
 
-        return 1;
-    }
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * periode_existe
-     *
-     * @param   User       $fuser          User
-     * @param   integer    $date_debut     Start date
-     * @param   integer    $date_fin       End date
-     * @return  int                        <0 if KO, >0 if OK
-     */
-    public function periode_existe($fuser, $date_debut, $date_fin)
-    {
-        // phpcs:enable
-        $sql = "SELECT rowid, date_debut, date_fin";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " WHERE fk_user_author = '{$fuser->id}'";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * periode_existe
+	 *
+	 * @param   User       $fuser          User
+	 * @param   integer    $date_debut     Start date
+	 * @param   integer    $date_fin       End date
+	 * @return  int                        <0 if KO, >0 if OK
+	 */
+	public function periode_existe($fuser, $date_debut, $date_fin)
+	{
+		// phpcs:enable
+		$sql = "SELECT rowid, date_debut, date_fin";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE fk_user_author = '{$fuser->id}'";
 
-        dol_syslog(get_class($this)."::periode_existe sql=".$sql);
-        $result = $this->db->query($sql);
-        if ($result) {
-            $num_rows = $this->db->num_rows($result); $i = 0;
+		dol_syslog(get_class($this)."::periode_existe sql=".$sql);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num_rows = $this->db->num_rows($result); $i = 0;
 
-            if ($num_rows > 0)
-            {
-                $date_d_form = $date_debut;
-                $date_f_form = $date_fin;
+			if ($num_rows > 0)
+			{
+				$date_d_form = $date_debut;
+				$date_f_form = $date_fin;
 
-                $existe = false;
+				$existe = false;
 
-                while ($i < $num_rows)
-                {
-                    $objp = $this->db->fetch_object($result);
+				while ($i < $num_rows)
+				{
+					$objp = $this->db->fetch_object($result);
 
-                    $date_d_req = $this->db->jdate($objp->date_debut); // 3
-                    $date_f_req = $this->db->jdate($objp->date_fin); // 4
+					$date_d_req = $this->db->jdate($objp->date_debut); // 3
+					$date_f_req = $this->db->jdate($objp->date_fin); // 4
 
-                    if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) $existe = true;
+					if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) $existe = true;
 
-                    $i++;
-                }
+					$i++;
+				}
 
-                if ($existe) return 1;
-                else return 0;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this)."::periode_existe  Error ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
+				if ($existe) return 1;
+				else return 0;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this)."::periode_existe  Error ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return list of people with permission to validate expense reports.
-     * Search for permission "approve expense report"
-     *
-     * @return  array       Array of user ids
-     */
-    public function fetch_users_approver_expensereport()
-    {
-        // phpcs:enable
-        $users_validator = array();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return list of people with permission to validate expense reports.
+	 * Search for permission "approve expense report"
+	 *
+	 * @return  array       Array of user ids
+	 */
+	public function fetch_users_approver_expensereport()
+	{
+		// phpcs:enable
+		$users_validator = array();
 
-        $sql = "SELECT DISTINCT ur.fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
-        $sql .= " WHERE ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'"; // Permission 'Approve';
-        $sql .= "UNION";
-        $sql .= " SELECT DISTINCT ugu.fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."usergroup_user as ugu, ".MAIN_DB_PREFIX."usergroup_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
-        $sql .= " WHERE ugu.fk_usergroup = ur.fk_usergroup AND ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'"; // Permission 'Approve';
-        //print $sql;
+		$sql = "SELECT DISTINCT ur.fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
+		$sql .= " WHERE ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'"; // Permission 'Approve';
+		$sql .= "UNION";
+		$sql .= " SELECT DISTINCT ugu.fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup_user as ugu, ".MAIN_DB_PREFIX."usergroup_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
+		$sql .= " WHERE ugu.fk_usergroup = ur.fk_usergroup AND ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'"; // Permission 'Approve';
+		//print $sql;
 
-        dol_syslog(get_class($this)."::fetch_users_approver_expensereport sql=".$sql);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num_rows = $this->db->num_rows($result); $i = 0;
-            while ($i < $num_rows)
-            {
-                $objp = $this->db->fetch_object($result);
-                array_push($users_validator, $objp->fk_user);
-                $i++;
-            }
-            return $users_validator;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch_users_approver_expensereport  Error ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
+		dol_syslog(get_class($this)."::fetch_users_approver_expensereport sql=".$sql);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num_rows = $this->db->num_rows($result); $i = 0;
+			while ($i < $num_rows)
+			{
+				$objp = $this->db->fetch_object($result);
+				array_push($users_validator, $objp->fk_user);
+				$i++;
+			}
+			return $users_validator;
+		} else {
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch_users_approver_expensereport  Error ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
 
-    /**
-     *  Create a document onto disk accordign to template module.
-     *
-     *  @param      string      $modele         Force le mnodele a utiliser ('' to not force)
-     *  @param      Translate   $outputlangs    objet lang a utiliser pour traduction
-     *  @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
-     *  @return     int                         0 if KO, 1 if OK
-     */
-    public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
-    {
-        global $conf, $langs;
+	/**
+	 *  Create a document onto disk accordign to template module.
+	 *
+	 *  @param      string      $modele         Force le mnodele a utiliser ('' to not force)
+	 *  @param      Translate   $outputlangs    objet lang a utiliser pour traduction
+	 *  @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
+	 *  @return     int                         0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
 
-        $langs->load("trips");
+		$langs->load("trips");
 
-	    if (!dol_strlen($modele)) {
-		    $modele = 'standard';
+		if (!dol_strlen($modele)) {
+			$modele = 'standard';
 
-		    if ($this->modelpdf) {
-			    $modele = $this->modelpdf;
-		    } elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
-			    $modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
-		    }
-	    }
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
+				$modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
+			}
+		}
 
-        $modelpath = "core/modules/expensereport/doc/";
+		$modelpath = "core/modules/expensereport/doc/";
 
-        return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-    }
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+	}
 
-    /**
-     * List of types
-     *
-     * @param   int     $active     Active or not
-     * @return  array
-     */
-    public function listOfTypes($active = 1)
-    {
-        global $langs;
-        $ret = array();
-        $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);
-        }
-        return $ret;
-    }
+	/**
+	 * List of types
+	 *
+	 * @param   int     $active     Active or not
+	 * @return  array
+	 */
+	public function listOfTypes($active = 1)
+	{
+		global $langs;
+		$ret = array();
+		$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);
+		}
+		return $ret;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Charge indicateurs this->nb pour le tableau de bord
-     *
-     *      @return     int         <0 if KO, >0 if OK
-     */
-    public function load_state_board()
-    {
-        // phpcs:enable
-        global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Charge indicateurs this->nb pour le tableau de bord
+	 *
+	 *      @return     int         <0 if KO, >0 if OK
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-        $this->nb = array();
+		$this->nb = array();
 
-        $sql = "SELECT count(ex.rowid) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
-        $sql .= " WHERE ex.fk_statut > 0";
-        $sql .= " AND ex.entity IN (".getEntity('expensereport').")";
+		$sql = "SELECT count(ex.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
+		$sql .= " WHERE ex.fk_statut > 0";
+		$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
 		if (empty($user->rights->expensereport->readall))
 		{
 			$userchildids = $user->getAllChildIds(1);
@@ -2333,157 +2255,145 @@ class ExpenseReport extends CommonObject
 			$sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
 		}
 
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            while ($obj = $this->db->fetch_object($resql)) {
-                $this->nb["expensereports"] = $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["expensereports"] = $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
-     *      @param  string  $option         'topay' or 'toapprove'
-     *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
-     */
-    public function load_board($user, $option = 'topay')
-    {
-        // 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
+	 *      @param  string  $option         'topay' or 'toapprove'
+	 *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 */
+	public function load_board($user, $option = 'topay')
+	{
+		// 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 ex.rowid, ex.date_valid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
-        if ($option == 'toapprove') $sql .= " WHERE ex.fk_statut = 2";
-        else $sql .= " WHERE ex.fk_statut = 5";
-        $sql .= " AND ex.entity IN (".getEntity('expensereport').")";
-        if (empty($user->rights->expensereport->readall))
-        {
+		$sql = "SELECT ex.rowid, ex.date_valid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
+		if ($option == 'toapprove') $sql .= " WHERE ex.fk_statut = ".self::STATUS_VALIDATED;
+		else $sql .= " WHERE ex.fk_statut = ".self::STATUS_APPROVED;
+		$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
+		if (empty($user->rights->expensereport->readall))
+		{
 			$userchildids = $user->getAllChildIds(1);
 			$sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
 			$sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
 		}
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-	        $langs->load("trips");
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$langs->load("trips");
 
-	        $response = new WorkboardResponse();
-	        if ($option == 'toapprove')
-	        {
-	            $response->warning_delay = $conf->expensereport->approve->warning_delay / 60 / 60 / 24;
-	            $response->label = $langs->trans("ExpenseReportsToApprove");
-	            $response->labelShort = $langs->trans("ToApprove");
-	            $response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=2';
-	        }
-	        else
-	        {
-	            $response->warning_delay = $conf->expensereport->payment->warning_delay / 60 / 60 / 24;
-	            $response->label = $langs->trans("ExpenseReportsToPay");
-	            $response->labelShort = $langs->trans("StatusToPay");
-	            $response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut=5';
-	        }
-	        $response->img = img_object('', "trip");
+			$response = new WorkboardResponse();
+			if ($option == 'toapprove')
+			{
+				$response->warning_delay = $conf->expensereport->approve->warning_delay / 60 / 60 / 24;
+				$response->label = $langs->trans("ExpenseReportsToApprove");
+				$response->labelShort = $langs->trans("ToApprove");
+				$response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut='.self::STATUS_VALIDATED;
+			} else {
+				$response->warning_delay = $conf->expensereport->payment->warning_delay / 60 / 60 / 24;
+				$response->label = $langs->trans("ExpenseReportsToPay");
+				$response->labelShort = $langs->trans("StatusToPay");
+				$response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&amp;statut='.self::STATUS_APPROVED;
+			}
+			$response->img = img_object('', "trip");
 
-            while ($obj = $this->db->fetch_object($resql))
-            {
-	            $response->nbtodo++;
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
 
-	            if ($option == 'toapprove')
-	            {
-	                if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->approve->warning_delay)) {
-	                    $response->nbtodolate++;
-	                }
-	            }
-	            else
-	            {
-                    if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->payment->warning_delay)) {
-    	                $response->nbtodolate++;
-                    }
-	            }
-            }
+				if ($option == 'toapprove')
+				{
+					if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->approve->warning_delay)) {
+						$response->nbtodolate++;
+					}
+				} else {
+					if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->payment->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;
+		}
+	}
 
-    /**
-     * Return if an expense report is late or not
-     *
-     * @param  string  $option          'topay' or 'toapprove'
-     * @return boolean                  True if late, False if not late
-     */
-    public function hasDelay($option)
-    {
-        global $conf;
+	/**
+	 * Return if an expense report is late or not
+	 *
+	 * @param  string  $option          'topay' or 'toapprove'
+	 * @return boolean                  True if late, False if not late
+	 */
+	public function hasDelay($option)
+	{
+		global $conf;
 
-        // Only valid expenses reports
-        if ($option == 'toapprove' && $this->status != 2) return false;
-        if ($option == 'topay' && $this->status != 5) return false;
+		// Only valid expenses reports
+		if ($option == 'toapprove' && $this->status != 2) return false;
+		if ($option == 'topay' && $this->status != 5) return false;
 
-        $now = dol_now();
-        if ($option == 'toapprove')
-        {
-            return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
-        }
-        else
-            return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
-    }
+		$now = dol_now();
+		if ($option == 'toapprove')
+		{
+			return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
+		} else return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
+	}
 
-    /**
-     *	Return if an expensereport was dispatched into bookkeeping
-     *
-     *	@return     int         <0 if KO, 0=no, 1=yes
-     */
-    public function getVentilExportCompta()
-    {
-    	$alreadydispatched = 0;
+	/**
+	 *	Return if an expensereport was dispatched into bookkeeping
+	 *
+	 *	@return     int         <0 if KO, 0=no, 1=yes
+	 */
+	public function getVentilExportCompta()
+	{
+		$alreadydispatched = 0;
 
-    	$type = 'expense_report';
+		$type = 'expense_report';
 
-    	$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$this->id;
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$obj = $this->db->fetch_object($resql);
-    		if ($obj)
-    		{
-    			$alreadydispatched = $obj->nb;
-    		}
-    	}
-    	else
-    	{
-    		$this->error = $this->db->lasterror();
-    		return -1;
-    	}
+		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->id;
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$alreadydispatched = $obj->nb;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
 
-    	if ($alreadydispatched)
-    	{
-    		return 1;
-    	}
-    	return 0;
-    }
+		if ($alreadydispatched)
+		{
+			return 1;
+		}
+		return 0;
+	}
 
 	/**
 	 * 	Return amount of payments already done
@@ -2506,9 +2416,7 @@ class ExpenseReport extends CommonObject
 			$obj = $this->db->fetch_object($resql);
 			$this->db->free($resql);
 			return $obj->amount;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2521,174 +2429,174 @@ class ExpenseReport extends CommonObject
  */
 class ExpenseReportLine
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error = '';
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $rowid;
 
-    public $comments;
-    public $qty;
-    public $value_unit;
-    public $date;
+	public $comments;
+	public $qty;
+	public $value_unit;
+	public $date;
 
-    /**
-     * @var int ID
-     */
-    public $fk_c_type_fees;
+	/**
+	 * @var int ID
+	 */
+	public $fk_c_type_fees;
 
-    /**
-     * @var int ID
-     */
-    public $fk_c_exp_tax_cat;
+	/**
+	 * @var int ID
+	 */
+	public $fk_c_exp_tax_cat;
 
-    /**
-     * @var int ID
-     */
-    public $fk_projet;
+	/**
+	 * @var int ID
+	 */
+	public $fk_projet;
 
-    /**
-     * @var int ID
-     */
-    public $fk_expensereport;
+	/**
+	 * @var int ID
+	 */
+	public $fk_expensereport;
 
-    public $type_fees_code;
-    public $type_fees_libelle;
+	public $type_fees_code;
+	public $type_fees_libelle;
 
-    public $projet_ref;
-    public $projet_title;
+	public $projet_ref;
+	public $projet_title;
 
-    public $vatrate;
-    public $total_ht;
-    public $total_tva;
-    public $total_ttc;
+	public $vatrate;
+	public $total_ht;
+	public $total_tva;
+	public $total_ttc;
 
-    /**
-     * @var int ID into llx_ecm_files table to link line to attached file
-     */
-    public $fk_ecm_files;
+	/**
+	 * @var int ID into llx_ecm_files table to link line to attached file
+	 */
+	public $fk_ecm_files;
 
 
-    /**
-     * Constructor
-     *
-     * @param DoliDB    $db     Handlet database
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB    $db     Handlet database
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
-    /**
-     * Fetch record for expense report detailed line
-     *
-     * @param   int     $rowid      Id of object to load
-     * @return  int                 <0 if KO, >0 if OK
-     */
-    public function fetch($rowid)
-    {
-        $sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_c_exp_tax_cat, fde.fk_projet as fk_project, fde.date,';
-        $sql .= ' fde.tva_tx as vatrate, fde.vat_src_code, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc, fde.fk_ecm_files,';
-        $sql .= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
-        $sql .= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON fde.fk_c_type_fees=ctf.id'; // Sometimes type of expense report has been removed, so we use a left join here.
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
-        $sql .= ' WHERE fde.rowid = '.$rowid;
+	/**
+	 * Fetch record for expense report detailed line
+	 *
+	 * @param   int     $rowid      Id of object to load
+	 * @return  int                 <0 if KO, >0 if OK
+	 */
+	public function fetch($rowid)
+	{
+		$sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_c_exp_tax_cat, fde.fk_projet as fk_project, fde.date,';
+		$sql .= ' fde.tva_tx as vatrate, fde.vat_src_code, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc, fde.fk_ecm_files,';
+		$sql .= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
+		$sql .= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON fde.fk_c_type_fees=ctf.id'; // Sometimes type of expense report has been removed, so we use a left join here.
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
+		$sql .= ' WHERE fde.rowid = '.$rowid;
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-            $objp = $this->db->fetch_object($result);
+		if ($result)
+		{
+			$objp = $this->db->fetch_object($result);
 
-            $this->rowid = $objp->rowid;
-            $this->id = $objp->rowid;
-            $this->ref = $objp->ref;
-            $this->fk_expensereport = $objp->fk_expensereport;
-            $this->comments = $objp->comments;
-            $this->qty = $objp->qty;
-            $this->date = $objp->date;
-            $this->dates = $this->db->jdate($objp->date);
-            $this->value_unit = $objp->value_unit;
-            $this->fk_c_type_fees = $objp->fk_c_type_fees;
-            $this->fk_c_exp_tax_cat = $objp->fk_c_exp_tax_cat;
-            $this->fk_projet = $objp->fk_project; // deprecated
-            $this->fk_project = $objp->fk_project;
-            $this->type_fees_code = $objp->type_fees_code;
-            $this->type_fees_libelle = $objp->type_fees_libelle;
-            $this->projet_ref = $objp->projet_ref;
-            $this->projet_title = $objp->projet_title;
-            $this->vatrate = $objp->vatrate;
-            $this->vat_src_code = $objp->vat_src_code;
-            $this->total_ht = $objp->total_ht;
-            $this->total_tva = $objp->total_tva;
-            $this->total_ttc = $objp->total_ttc;
-            $this->fk_ecm_files = $objp->fk_ecm_files;
+			$this->rowid = $objp->rowid;
+			$this->id = $objp->rowid;
+			$this->ref = $objp->ref;
+			$this->fk_expensereport = $objp->fk_expensereport;
+			$this->comments = $objp->comments;
+			$this->qty = $objp->qty;
+			$this->date = $objp->date;
+			$this->dates = $this->db->jdate($objp->date);
+			$this->value_unit = $objp->value_unit;
+			$this->fk_c_type_fees = $objp->fk_c_type_fees;
+			$this->fk_c_exp_tax_cat = $objp->fk_c_exp_tax_cat;
+			$this->fk_projet = $objp->fk_project; // deprecated
+			$this->fk_project = $objp->fk_project;
+			$this->type_fees_code = $objp->type_fees_code;
+			$this->type_fees_libelle = $objp->type_fees_libelle;
+			$this->projet_ref = $objp->projet_ref;
+			$this->projet_title = $objp->projet_title;
+			$this->vatrate = $objp->vatrate;
+			$this->vat_src_code = $objp->vat_src_code;
+			$this->total_ht = $objp->total_ht;
+			$this->total_tva = $objp->total_tva;
+			$this->total_ttc = $objp->total_ttc;
+			$this->fk_ecm_files = $objp->fk_ecm_files;
 
-            $this->db->free($result);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    /**
-     * insert
-     *
-     * @param   int     $notrigger      1=No trigger
-     * @param   bool    $fromaddline    false=keep default behavior, true=exclude the update_price() of parent object
-     * @return  int                     <0 if KO, >0 if OK
-     */
-    public function insert($notrigger = 0, $fromaddline = false)
-    {
-        global $langs, $user, $conf;
+	/**
+	 * insert
+	 *
+	 * @param   int     $notrigger      1=No trigger
+	 * @param   bool    $fromaddline    false=keep default behavior, true=exclude the update_price() of parent object
+	 * @return  int                     <0 if KO, >0 if OK
+	 */
+	public function insert($notrigger = 0, $fromaddline = false)
+	{
+		global $langs, $user, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        dol_syslog("ExpenseReportLine::Insert rang=".$this->rang, LOG_DEBUG);
+		dol_syslog("ExpenseReportLine::Insert rang=".$this->rang, LOG_DEBUG);
 
-        // Clean parameters
-        $this->comments = trim($this->comments);
-        if (!$this->value_unit_HT) $this->value_unit_HT = 0;
-        $this->qty = price2num($this->qty);
-        $this->vatrate = price2num($this->vatrate);
+		// Clean parameters
+		$this->comments = trim($this->comments);
+		if (!$this->value_unit_HT) $this->value_unit_HT = 0;
+		$this->qty = price2num($this->qty);
+		$this->vatrate = price2num($this->vatrate);
 		if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'expensereport_det';
-        $sql .= ' (fk_expensereport, fk_c_type_fees, fk_projet,';
-        $sql .= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date, rule_warning_message, fk_c_exp_tax_cat, fk_ecm_files)';
-        $sql .= " VALUES (".$this->db->escape($this->fk_expensereport).",";
-        $sql .= " ".$this->db->escape($this->fk_c_type_fees).",";
-        $sql .= " ".$this->db->escape($this->fk_project > 0 ? $this->fk_project : ($this->fk_projet > 0 ? $this->fk_projet : 'null')).",";
-        $sql .= " ".$this->db->escape($this->vatrate).",";
-        $sql .= " '".$this->db->escape($this->vat_src_code)."',";
-        $sql .= " '".$this->db->escape($this->comments)."',";
-        $sql .= " ".$this->db->escape($this->qty).",";
-        $sql .= " ".$this->db->escape($this->value_unit).",";
-        $sql .= " ".$this->db->escape($this->total_ht).",";
-        $sql .= " ".$this->db->escape($this->total_tva).",";
-        $sql .= " ".$this->db->escape($this->total_ttc).",";
-        $sql .= " '".$this->db->idate($this->date)."',";
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'expensereport_det';
+		$sql .= ' (fk_expensereport, fk_c_type_fees, fk_projet,';
+		$sql .= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date, rule_warning_message, fk_c_exp_tax_cat, fk_ecm_files)';
+		$sql .= " VALUES (".$this->db->escape($this->fk_expensereport).",";
+		$sql .= " ".$this->db->escape($this->fk_c_type_fees).",";
+		$sql .= " ".$this->db->escape($this->fk_project > 0 ? $this->fk_project : ($this->fk_projet > 0 ? $this->fk_projet : 'null')).",";
+		$sql .= " ".$this->db->escape($this->vatrate).",";
+		$sql .= " '".$this->db->escape($this->vat_src_code)."',";
+		$sql .= " '".$this->db->escape($this->comments)."',";
+		$sql .= " ".$this->db->escape($this->qty).",";
+		$sql .= " ".$this->db->escape($this->value_unit).",";
+		$sql .= " ".$this->db->escape($this->total_ht).",";
+		$sql .= " ".$this->db->escape($this->total_tva).",";
+		$sql .= " ".$this->db->escape($this->total_ttc).",";
+		$sql .= " '".$this->db->idate($this->date)."',";
 		$sql .= " '".$this->db->escape($this->rule_warning_message)."',";
 		$sql .= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
 		$sql .= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
-        $sql .= ")";
+		$sql .= ")";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'expensereport_det');
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'expensereport_det');
 
 			if (!$fromaddline)
 			{
@@ -2702,25 +2610,21 @@ class ExpenseReportLine
 					$this->errors = $tmpparent->errors;
 				}
 			}
-        }
-		else
-		{
+		} else {
 			$error++;
 		}
 
-        if (!$error)
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            dol_syslog("ExpenseReportLine::insert Error ".$this->error, LOG_ERR);
-            $this->db->rollback();
-            return -2;
-        }
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return $this->id;
+		} else {
+			$this->error = $this->db->lasterror();
+			dol_syslog("ExpenseReportLine::insert Error ".$this->error, LOG_ERR);
+			$this->db->rollback();
+			return -2;
+		}
+	}
 
 	/**
 	 * Function to get total amount in expense reports for a same rule
@@ -2755,178 +2659,88 @@ class ExpenseReportLine
 				$obj = $this->db->fetch_object($resql);
 				$amount = (double) $obj->total_amount;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
 		return $amount + $this->total_ttc;
 	}
 
-    /**
-     * Update line
-     *
-     * @param   User    $user      User
-     * @return  int                <0 if KO, >0 if OK
-     */
-    public function update(User $user)
-    {
-        global $langs, $conf;
+	/**
+	 * Update line
+	 *
+	 * @param   User    $user      User
+	 * @return  int                <0 if KO, >0 if OK
+	 */
+	public function update(User $user)
+	{
+		global $langs, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        // Clean parameters
-        $this->comments = trim($this->comments);
-        $this->vatrate = price2num($this->vatrate);
-        $this->value_unit = price2num($this->value_unit);
+		// Clean parameters
+		$this->comments = trim($this->comments);
+		$this->vatrate = price2num($this->vatrate);
+		$this->value_unit = price2num($this->value_unit);
 		if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Update line in database
-        $sql = "UPDATE ".MAIN_DB_PREFIX."expensereport_det SET";
-        $sql .= " comments='".$this->db->escape($this->comments)."'";
-        $sql .= ",value_unit=".$this->db->escape($this->value_unit);
-        $sql .= ",qty=".$this->db->escape($this->qty);
-        $sql .= ",date='".$this->db->idate($this->date)."'";
-        $sql .= ",total_ht=".$this->db->escape($this->total_ht)."";
-        $sql .= ",total_tva=".$this->db->escape($this->total_tva)."";
-        $sql .= ",total_ttc=".$this->db->escape($this->total_ttc)."";
-        $sql .= ",tva_tx=".$this->db->escape($this->vatrate);
+		// Update line in database
+		$sql = "UPDATE ".MAIN_DB_PREFIX."expensereport_det SET";
+		$sql .= " comments='".$this->db->escape($this->comments)."'";
+		$sql .= ",value_unit=".$this->db->escape($this->value_unit);
+		$sql .= ",qty=".$this->db->escape($this->qty);
+		$sql .= ",date='".$this->db->idate($this->date)."'";
+		$sql .= ",total_ht=".$this->db->escape($this->total_ht)."";
+		$sql .= ",total_tva=".$this->db->escape($this->total_tva)."";
+		$sql .= ",total_ttc=".$this->db->escape($this->total_ttc)."";
+		$sql .= ",tva_tx=".$this->db->escape($this->vatrate);
 		$sql .= ",vat_src_code='".$this->db->escape($this->vat_src_code)."'";
-        $sql .= ",rule_warning_message='".$this->db->escape($this->rule_warning_message)."'";
+		$sql .= ",rule_warning_message='".$this->db->escape($this->rule_warning_message)."'";
 		$sql .= ",fk_c_exp_tax_cat=".$this->db->escape($this->fk_c_exp_tax_cat);
 		$sql .= ",fk_ecm_files=".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
 		if ($this->fk_c_type_fees) $sql .= ",fk_c_type_fees=".$this->db->escape($this->fk_c_type_fees);
-        else $sql .= ",fk_c_type_fees=null";
-        if ($this->fk_project > 0) $sql .= ",fk_projet=".$this->db->escape($this->fk_project);
-        else $sql .= ",fk_projet=null";
-        $sql .= " WHERE rowid = ".$this->db->escape($this->rowid ? $this->rowid : $this->id);
+		else $sql .= ",fk_c_type_fees=null";
+		if ($this->fk_project > 0) $sql .= ",fk_projet=".$this->db->escape($this->fk_project);
+		else $sql .= ",fk_projet=null";
+		$sql .= " WHERE rowid = ".$this->db->escape($this->rowid ? $this->rowid : $this->id);
 
-        dol_syslog("ExpenseReportLine::update sql=".$sql);
+		dol_syslog("ExpenseReportLine::update sql=".$sql);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $tmpparent = new ExpenseReport($this->db);
-            $result = $tmpparent->fetch($this->fk_expensereport);
-            if ($result > 0)
-            {
-                $result = $tmpparent->update_price();
-                if ($result < 0)
-                {
-                    $error++;
-                    $this->error = $tmpparent->error;
-                    $this->errors = $tmpparent->errors;
-                }
-            }
-            else
-            {
-                $error++;
-                $this->error = $tmpparent->error;
-                $this->errors = $tmpparent->errors;
-            }
-        }
-        else
-        {
-            $error++;
-            dol_print_error($this->db);
-        }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$tmpparent = new ExpenseReport($this->db);
+			$result = $tmpparent->fetch($this->fk_expensereport);
+			if ($result > 0)
+			{
+				$result = $tmpparent->update_price();
+				if ($result < 0)
+				{
+					$error++;
+					$this->error = $tmpparent->error;
+					$this->errors = $tmpparent->errors;
+				}
+			} else {
+				$error++;
+				$this->error = $tmpparent->error;
+				$this->errors = $tmpparent->errors;
+			}
+		} else {
+			$error++;
+			dol_print_error($this->db);
+		}
 
-        if (!$error)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            dol_syslog("ExpenseReportLine::update Error ".$this->error, LOG_ERR);
-            $this->db->rollback();
-            return -2;
-        }
-    }
-}
-
-
-/**
- *    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
- */
-function select_expensereport_statut($selected = '', $htmlname = 'fk_statut', $useempty = 1, $useshortlabel = 0)
-{
-    global $db, $langs;
-
-    $tmpep = new ExpenseReport($db);
-
-    print '<select class="flat" 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>';
-}
-
-/**
- *  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
- */
-function select_type_fees_id($selected = '', $htmlname = 'type', $showempty = 0, $active = 1)
-{
-    global $db, $langs, $user;
-    $langs->load("trips");
-
-    print '<select class="flat" name="'.$htmlname.'">';
-    if ($showempty)
-    {
-        print '<option value="-1"';
-        if ($selected == -1) print ' selected';
-        print '>&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 = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
-            print '<option value="'.$obj->id.'"';
-            if ($obj->code == $selected || $obj->id == $selected) print ' selected';
-            print '>';
-            if ($obj->code != $langs->trans($obj->code)) print $langs->trans($obj->code);
-            else print $langs->trans($obj->type);
-            $i++;
-        }
-    }
-    print '</select>';
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			dol_syslog("ExpenseReportLine::update Error ".$this->error, LOG_ERR);
+			$this->db->rollback();
+			return -2;
+		}
+	}
 }
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index c7bf959e27e..59de531a662 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -122,9 +122,7 @@ class ExpenseReportIk extends CoreObject
 			{
 				$categories[$obj->rowid] = $obj;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -182,9 +180,7 @@ class ExpenseReportIk extends CoreObject
 					$ranges[] = $object;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -222,9 +218,7 @@ class ExpenseReportIk extends CoreObject
 				if (!isset($ranges[$obj->fk_c_exp_tax_cat])) $ranges[$obj->fk_c_exp_tax_cat] = array('label' => $obj->label, 'active' => $obj->cat_active, 'ranges' => array());
 				$ranges[$obj->fk_c_exp_tax_cat]['ranges'][] = $obj;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -255,9 +249,7 @@ class ExpenseReportIk extends CoreObject
 		{
 			$obj = $db->fetch_object($resql);
 			return $obj->nbRange;
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index b98552f681d..7ed3a5ecb09 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -185,9 +185,7 @@ class ExpenseReportRule extends CoreObject
 				if ($rule->fetch($obj->rowid) > 0) $rules[$rule->id] = $rule;
 				else dol_print_error($db);
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -209,9 +207,7 @@ class ExpenseReportRule extends CoreObject
 			if ($group->fetch($this->fk_usergroup) > 0)
 			{
 				return $group->nom;
-			}
-			else
-			{
+			} else {
 				$this->error = $group->error;
 				$this->errors[] = $this->error;
 			}
@@ -235,9 +231,7 @@ class ExpenseReportRule extends CoreObject
 			if ($u->fetch($this->fk_user) > 0)
 			{
 				return dolGetFirstLastname($u->firstname, $u->lastname);
-			}
-			else
-			{
+			} else {
 				$this->error = $u->error;
 				$this->errors[] = $this->error;
 			}
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index f400d5e4277..174c2be4ccf 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -136,7 +136,7 @@ class ExpenseReportStats extends Stats
 	{
 		$sql = "SELECT date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%m') as dm, sum(".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		$sql .= " WHERE date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%Y') = '".$year."'";
+		$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');
@@ -156,7 +156,7 @@ class ExpenseReportStats extends Stats
 	{
 		$sql = "SELECT date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%m') as dm, avg(".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		$sql .= " WHERE date_format(".$this->db->ifsql('e.'.$this->datetouse.' IS NULL', 'e.date_create', 'e.'.$this->datetouse).",'%Y') = '".$year."'";
+		$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');
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index d06303364dd..cad3d62420e 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -159,9 +159,7 @@ class PaymentExpenseReport extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_expensereport");
-			}
-			else
-			{
+			} else {
 				$error++;
 			}
 		}
@@ -171,9 +169,7 @@ class PaymentExpenseReport extends CommonObject
 		    $this->amount = $totalamount;
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -240,9 +236,7 @@ class PaymentExpenseReport extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -311,9 +305,7 @@ class PaymentExpenseReport extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -368,9 +360,7 @@ class PaymentExpenseReport extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -419,9 +409,7 @@ class PaymentExpenseReport extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -574,9 +562,7 @@ class PaymentExpenseReport extends CommonObject
                         }
                     }
                 }
-            }
-            else
-            {
+            } else {
                 $this->error = $acc->error;
                 $error++;
             }
@@ -585,9 +571,7 @@ class PaymentExpenseReport extends CommonObject
         if (!$error)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             return -1;
         }
     }
@@ -610,9 +594,7 @@ class PaymentExpenseReport extends CommonObject
 		if ($result)
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
@@ -684,9 +666,7 @@ class PaymentExpenseReport extends CommonObject
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
     }
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 17b7eb57619..6814c0a5b0d 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -39,9 +39,11 @@ $langs->loadLangs(array("other", "trips", "companies", "interventions"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
+$childids = $user->getAllChildIds(1);
+
 // Security check
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
@@ -49,8 +51,8 @@ $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -61,7 +63,10 @@ if (!$sortfield) $sortfield = "position_name";
 
 
 $object = new ExpenseReport($db);
-$object->fetch($id, $ref);
+if (!$object->fetch($id, $ref) > 0)
+{
+	dol_print_error($db);
+}
 
 $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'trip';
@@ -69,6 +74,18 @@ $modulepart = 'trip';
 // Load object
 //include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
+if ($object->id > 0)
+{
+	// Check current user can read this expense report
+	$canread = 0;
+	if (!empty($user->rights->expensereport->readall)) $canread = 1;
+	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
+}
+
 
 /*
  * Actions
@@ -133,9 +150,7 @@ if ($object->id)
     $permtoedit = $user->rights->expensereport->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 0597d1b29a2..3c30154f7f1 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -233,14 +233,11 @@ if ($result)
 
             $i++;
         }
-    }
-    else
-    {
+    } else {
         print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
     }
     print '</table></div><br>';
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 print '</div></div></div>';
 
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index b52680ad215..0b50a69071f 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -31,11 +31,33 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 // Load translation files required by the page
 $langs->load("trips");
 
-// Security check
 $id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+
+$childids = $user->getAllChildIds(1);
+
+// Security check
 if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
+$object = new ExpenseReport($db);
+if (!$object->fetch($id, $ref) > 0)
+{
+	dol_print_error($db);
+}
+
+if ($object->id > 0)
+{
+	// Check current user can read this expense report
+	$canread = 0;
+	if (!empty($user->rights->expensereport->readall)) $canread = 1;
+	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
+}
+
 
 /*
  * View
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index ec54b88a31b..0a264c59a2a 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php';
 
@@ -74,8 +75,8 @@ $diroutputmassaction = $conf->expensereport->dir_output.'/temp/massgeneration/'.
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -199,51 +200,6 @@ if (empty($reshook))
     $permissiontodelete = $user->rights->expensereport->supprimer;
     $uploaddir = $conf->expensereport->dir_output;
     include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-
-    if ($action == 'update' && !$cancel)
-    {
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-    	if ($canedituser)    // Case we can edit all field
-    	{
-    		$error = 0;
-
-    		if (!$error)
-    		{
-    			$objectuser->fetch($id);
-
-    			$objectuser->oldcopy = clone $objectuser;
-
-    			$db->begin();
-
-    			$objectuser->default_range = GETPOST('default_range');
-    			$objectuser->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat');
-
-    			if (!$error) {
-    				$ret = $objectuser->update($user);
-    				if ($ret < 0) {
-    					$error++;
-    					if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-    						$langs->load("errors");
-    						setEventMessages($langs->trans("ErrorLoginAlreadyExists", $objectuser->login), null, 'errors');
-    					}
-    					else
-    					{
-    						setEventMessages($objectuser->error, $objectuser->errors, 'errors');
-    					}
-    				}
-    			}
-
-    			if (!$error && !count($objectuser->errors)) {
-    				setEventMessages($langs->trans("UserModified"), null, 'mesgs');
-    				$db->commit();
-    			}
-    			else {
-    				$db->rollback();
-    			}
-    		}
-    	}
-    }
 }
 
 
@@ -254,6 +210,7 @@ if (empty($reshook))
 $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
+$formexpensereport = new FormExpenseReport($db);
 
 $fuser = new User($db);
 
@@ -305,7 +262,7 @@ if ($search_amount_ttc != '') $sql .= natural_search('d.total_ttc', $search_amou
 // User
 if ($search_user != '' && $search_user >= 0) $sql .= " AND u.rowid = '".$db->escape($search_user)."'";
 // Status
-if ($search_status != '' && $search_status >= 0) $sql .= " AND d.fk_statut IN (".$db->escape($search_status).")";
+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)))
@@ -388,93 +345,36 @@ if ($resql)
 
 		dol_banner_tab($fuser, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-		print '<div class="fichecenter">';
-		print '<div class="underbanner clearboth"></div>';
-
-		if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
-		{
-			print '<table class="border centpercent">';
-
-			if ($action == 'edit')
-			{
-				print '<tr><td class="titlefield">'.$langs->trans("DefaultCategoryCar").'</td>';
-				print '<td>';
-				print $form->selectExpenseCategories($fuser->default_c_exp_tax_cat, 'default_c_exp_tax_cat', 1);
-				print '</td></tr>';
-
-				print '<tr><td>'.$langs->trans("DefaultRangeNumber").'</td>';
-				print '<td>';
-				$maxRangeNum = ExpenseReportIk::getMaxRangeNumber($fuser->default_c_exp_tax_cat);
-				print $form->selectarray('default_range', range(0, $maxRangeNum), $fuser->default_range);
-				print '</td></tr>';
-			}
-			else
-			{
-				print '<tr><td class="titlefield">'.$langs->trans("DefaultCategoryCar").'</td>';
-				print '<td class="fk_c_exp_tax_cat">';
-				print dol_getIdFromCode($db, $fuser->default_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
-				print '</td></tr>';
-
-				print '<tr><td>'.$langs->trans("DefaultRangeNumber").'</td>';
-				print '<td>';
-				print $fuser->default_range;
-				print '</td></tr>';
-			}
-
-			print '</table>';
-		}
-
-		print '</div>';
-
-		/*if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
-		{
-			print '<div class="underbanner clearboth"></div>';
-
-			print '<br>';
-
-			showMyBalance($holiday, $user_id);
-		}*/
-
 		dol_fiche_end();
 
 		if ($action != 'edit')
 		{
 			print '<div class="tabsAction">';
 
-			if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
-			{
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$user_id.'" class="butAction">'.$langs->trans("Modify").'</a>';
-			}
-
 			$childids = $user->getAllChildIds(1);
 
 			$canedit = ((in_array($user_id, $childids) && $user->rights->expensereport->creer)
 				|| ($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->expensereport->writeall_advance));
 
 			// Buttons for actions
-			if ($canedit)
-			{
+			if ($canedit) {
 				print '<a href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create&fk_user_author='.$fuser->id.'" class="butAction">'.$langs->trans("AddTrip").'</a>';
+			} else {
+				print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotEnoughPermission").'">'.$langs->trans("AddTrip").'</a>';
 			}
 
 			print '</div>';
-		}
-		else
-		{
+		} else {
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 			print '</div><br>';
 		}
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans("ListTripsAndExpenses");
 
-		$newcardbutton = '';
-		if ($user->rights->expensereport->creer)
-		{
-            $newcardbutton .= dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/expensereport/card.php?action=create');
-		}
+		$url = DOL_URL_ROOT.'/expensereport/card.php?action=create';
+		if (!empty($socid)) $url .= '&socid='.$socid;
+		$newcardbutton = dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', $url, '', $user->rights->expensereport->creer);
 
 		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'trip', 0, $newcardbutton, '', $limit, 0, 0, 1);
 	}
@@ -608,7 +508,7 @@ if ($resql)
 	if (!empty($arrayfields['d.fk_statut']['checked']))
 	{
     	print '<td class="liste_titre right">';
-    	select_expensereport_statut($search_status, 'search_status', 1, 1);
+    	$formexpensereport->selectExpensereportStatus($search_status, 'search_status', 1, 1);
     	print '</td>';
 	}
 	// Action column
@@ -805,9 +705,7 @@ if ($resql)
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		$colspan = 1;
 		foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
@@ -842,9 +740,7 @@ if ($resql)
 
 		print $formfile->showdocuments('massfilesarea_expensereport', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index 8447fd4fcbc..171e8980fab 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -35,7 +35,9 @@ $langs->loadLangs(array('trips', 'companies', 'bills', 'orders'));
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
+
+$childids = $user->getAllChildIds(1);
 
 // Security check
 $socid = 0;
@@ -51,6 +53,18 @@ if (!$object->fetch($id, $ref) > 0)
 
 $permissionnote = $user->rights->expensereport->creer; // Used by the include of actions_setnotes.inc.php
 
+if ($object->id > 0)
+{
+	// Check current user can read this expense report
+	$canread = 0;
+	if (!empty($user->rights->expensereport->readall)) $canread = 1;
+	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
+}
+
 
 /*
  * Actions
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 85bc3cc300c..9bc50341973 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -64,9 +64,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
         $db->commit();
         header("Location: ".DOL_URL_ROOT."/expensereport/index.php");
         exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
         $db->rollback();
 	}
@@ -96,15 +94,13 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensere
 				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->modelpdf, $outputlangs);
+				$fac->generateDocument($fac->model_pdf, $outputlangs);
 			}
 		}
 
 		header('Location: card.php?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -280,9 +276,7 @@ if ($resql)
 	print '</div>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -299,10 +293,8 @@ if ($action == '')
 	{
 		if (!$disable_delete)
 		{
-			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else
-		{
+			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($title_button).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/expensereport/payment/info.php b/htdocs/expensereport/payment/info.php
index 4a5cd165fc5..b548eb54be2 100644
--- a/htdocs/expensereport/payment/info.php
+++ b/htdocs/expensereport/payment/info.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array('bills', 'trips'));
 
 $id = GETPOST('id');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 /*
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 872bd5a0792..c17f3ec10ee 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -119,7 +119,7 @@ if ($action == 'add_payment')
     		$payment->total          = $total;
     		$payment->fk_typepayment = GETPOST("fk_typepayment", 'int');
     		$payment->num_payment    = GETPOST("num_payment", 'alphanothtml');
-    		$payment->note_public    = GETPOST("note_public", 'none');
+    		$payment->note_public    = GETPOST("note_public", 'restricthtml');
 
     		if (!$error)
     		{
@@ -158,9 +158,7 @@ if ($action == 'add_payment')
                 $loc = DOL_URL_ROOT.'/expensereport/card.php?id='.$id;
                 header('Location: '.$loc);
                 exit;
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
         }
@@ -321,9 +319,7 @@ if ($action == 'create' || empty($action))
 			$remaintopay = $objp->total_ttc - $sumpaid; // autofill remainder amount
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">'; // autofill remainder amount
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
-		}
-		else
-		{
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index 3b931bd4418..2079a2bf045 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -75,7 +75,7 @@ print load_fiche_titre($title, '', 'trip');
 dol_mkdir($dir);
 
 $stats = new ExpenseReportStats($db, $socid, $userid);
-if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND e.fk_statut IN ('.$db->escape($object_status).')';
+if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND e.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
 
 // Build graphic number of object
 // $data = array(array('Lib',val1,val2,val3),...)
@@ -151,9 +151,7 @@ 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';
-}
-else
-{
+} 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';
@@ -289,8 +287,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index d0096390489..f4f460719a0 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -42,9 +42,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
                 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
-            {
+            } else {
                 $error = 0;
                 $thumbshown = '';
 
@@ -106,8 +104,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 	                {
 	                    $checked = ' checked';
 	                    break;
-	                }
-	                elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
+	                } elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
 	                    $checked = ' checked';
 	                    break;
 	                }
@@ -132,9 +129,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
         print '</script>';
 
         print '</td></tr>';
-    }
-    else
-    {
+    } 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>';
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 978a3059ace..89ae2103476 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -141,9 +141,7 @@ class Export
 	    									if (!empty($perm[2]))
 	    									{
 	    										$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									}
-	    									else
-	    									{
+	    									} else {
 	    										$bool = $user->rights->{$perm[0]}->{$perm[1]};
 	    									}
 	    									if ($perm[0] == 'user' && $user->admin) $bool = true;
@@ -295,8 +293,7 @@ class Export
 			case 'Text':
 				if (!(strpos($ValueField, '%') === false))
 					$szFilterQuery .= " ".$NameField." LIKE '".$ValueField."'";
-				else
-					$szFilterQuery .= " ".$NameField." = '".$ValueField."'";
+				else $szFilterQuery .= " ".$NameField." = '".$ValueField."'";
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
@@ -305,13 +302,10 @@ class Export
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery = "(".$this->conditionDate($NameField, trim($ValueArray[0]), ">=");
 					$szFilterQuery .= " AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")";
-				}
-				else
-				{
+				} else {
 					if (is_numeric(substr($ValueField, 0, 1)))
 						$szFilterQuery = $this->conditionDate($NameField, trim($ValueField), "=");
-					else
-						$szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
+					else $szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
 				}
 				break;
 			case 'Duree':
@@ -324,13 +318,10 @@ class Export
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery = "(".$NameField.">=".$ValueArray[0];
 					$szFilterQuery .= " AND ".$NameField."<=".$ValueArray[1].")";
-				}
-				else
-				{
+				} else {
 					if (is_numeric(substr($ValueField, 0, 1)))
 						$szFilterQuery = " ".$NameField."=".$ValueField;
-					else
-						$szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
+					else $szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
 				}
 				break;
 			case 'Boolean':
@@ -343,12 +334,11 @@ class Export
 				else {
                     if (!(strpos($ValueField, '%') === false))
                         $szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
-                    else
-                        $szFilterQuery = " ".$NameField." = '".$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;
@@ -367,7 +357,7 @@ class Export
 		// 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;
+		else $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
     }
 
@@ -428,8 +418,7 @@ class Export
 
 				if (!empty($InfoFieldList[3]))
 					$keyList = $InfoFieldList[3];
-				else
-					$keyList = 'rowid';
+				else $keyList = 'rowid';
 				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
 				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
 				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
@@ -473,9 +462,7 @@ class Export
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
 								$szFilterField .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-							else
-							{
+							} else {
 								$szFilterField .= '<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
 							$i++;
@@ -484,8 +471,7 @@ class Export
 					$szFilterField .= "</select>";
 
 					$this->db->free($resql);
-				}
-				else dol_print_error($this->db);
+				} else dol_print_error($this->db);
 				break;
 		}
 
@@ -553,6 +539,7 @@ class Export
 		if (empty($this->array_export_fields) || !is_array($this->array_export_fields))
 		{
 			$this->error = "ErrorBadParameter";
+			dol_syslog($this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -564,8 +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)
@@ -595,8 +581,7 @@ class Export
 			//$this->array_export_label[$indice]
 			if ($conf->global->EXPORT_PREFIX_SPEC)
 				$filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			else
-				$filename = "export_".$datatoexport;
+			else $filename = "export_".$datatoexport;
 			$filename .= '.'.$objmodel->getDriverExtension();
 			$dirname = $conf->export->dir_temp.'/'.$user->id;
 
@@ -664,9 +649,7 @@ class Export
 								    $remaintopay = $tmpobjforcomputecall->getRemainToPay();
 								}
 								$obj->$alias = $remaintopay;
-							}
-							else
-							{
+							} 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);
@@ -688,16 +671,12 @@ class Export
 				$objmodel->close_file();
 
         		return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." - sql=".$sql;
 			return -1;
 		}
@@ -727,10 +706,10 @@ class Export
 		$sql .= 'filter';
 		$sql .= ') VALUES (';
 		$sql .= "'".$this->db->escape($this->model_name)."',";
-		$sql .= "'".$this->db->escape($this->datatoexport)."',";
-		$sql .= "'".$this->db->escape($this->hexa)."',";
-		$sql .= "'".$user->id."',";
-		$sql .= "'".$this->db->escape($this->hexafiltervalue)."'";
+		$sql .= " '".$this->db->escape($this->datatoexport)."',";
+		$sql .= " '".$this->db->escape($this->hexa)."',";
+		$sql .= ' '.($user->id > 0 ? $user->id : 'null').",";
+		$sql .= " '".$this->db->escape($this->hexafiltervalue)."'";
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -739,9 +718,7 @@ class Export
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
@@ -759,7 +736,7 @@ class Export
     {
 		$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 = '.$id;
+		$sql .= ' WHERE em.rowid = '.((int) $id);
 
 		dol_syslog("Export::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -776,15 +753,11 @@ class Export
 				$this->hexafiltervalue = $obj->filter;
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = "ModelNotFound";
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -3;
 		}
@@ -822,9 +795,7 @@ class Export
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -874,7 +845,7 @@ class Export
 				}
 				// suppression de l'export
 				print '<td class="right">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteprof&id='.$obj->rowid.'">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteprof&token='.newToken().'&id='.$obj->rowid.'">';
 				print img_delete();
 				print '</a>';
 				print "</tr>";
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 6543747d1f7..d7075d86e1b 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -130,7 +130,7 @@ $entitytolang = array(
 $array_selected = isset($_SESSION["export_selected_fields"]) ? $_SESSION["export_selected_fields"] : array();
 $array_filtervalue = isset($_SESSION["export_filtered_fields"]) ? $_SESSION["export_filtered_fields"] : array();
 $datatoexport = GETPOST("datatoexport", "aZ09");
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $step = GETPOST("step", "int") ?GETPOST("step", "int") : 1;
 $export_name = GETPOST("export_name", "alphanohtml");
@@ -173,9 +173,7 @@ if ($action == 'selectfield')     // Selection of field at step 2
 		    //print_r($array_selected);
 		    $_SESSION["export_selected_fields"] = $array_selected;
 		}
-    }
-    else
-    {
+    } else {
         $warnings = array();
 
         $array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
@@ -190,8 +188,7 @@ if ($action == 'selectfield')     // Selection of field at step 2
             $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]))
+        } 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'))
@@ -222,9 +219,7 @@ if ($action == 'unselectfield')
     {
 		$array_selected = array();
 		$_SESSION["export_selected_fields"] = $array_selected;
-    }
-    else
-    {
+    } else {
 	    unset($array_selected[$_GET["field"]]);
 	    // Renumber fields of array_selected (from 1 to nb_elements)
 	    asort($array_selected);
@@ -287,9 +282,7 @@ if ($action == 'builddoc')
 	{
 		setEventMessages($objexport->error, $objexport->errors, 'errors');
 		$sqlusedforexport = $objexport->sqlusedforexport;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	    $sqlusedforexport = $objexport->sqlusedforexport;
     }
@@ -309,9 +302,9 @@ if ($step == 5 && $action == 'confirm_deletefile' && $confirm == 'yes')
 
 if ($action == 'deleteprof')
 {
-	if ($_GET["id"])
+	if (GETPOST("id", 'int'))
 	{
-		$objexport->fetch($_GET["id"]);
+		$objexport->fetch(GETPOST('id', 'int'));
 		$result = $objexport->delete($user);
 	}
 }
@@ -350,18 +343,13 @@ if ($action == 'add_export_model')
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ExportModelSaved", $objexport->model_name), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
-			else
-				setEventMessages($objexport->error, $objexport->errors, 'errors');
+			else setEventMessages($objexport->error, $objexport->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors');
 	}
 }
@@ -471,17 +459,13 @@ if ($step == 1 || !$datatoexport)
             print '</td><td class="right">';
             if ($objexport->array_export_perms[$key])
             {
-            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'filenew').'</a>';
-            }
-            else
-            {
+            	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
-    {
+    } else {
         print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
     }
     print '</table>';
@@ -546,8 +530,7 @@ if ($step == 2 && $datatoexport)
     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 {
+    } else {
     	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1);
     }
     print ' ';
@@ -614,9 +597,7 @@ if ($step == 2 && $datatoexport)
         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
-        {
+        } else {
             $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
    		if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -642,9 +623,7 @@ if ($step == 2 && $datatoexport)
             print $form->textwithpicto($text, $htmltext);
 			//print ' ('.$code.')';
             print '</td>';
-        }
-        else
-        {
+        } else {
         	// Fields not selected
             print '<td>';
 			//print $text.'-'.$htmltext."<br>";
@@ -672,14 +651,10 @@ if ($step == 2 && $datatoexport)
 		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
 		{
 			print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SelectAtLeastOneField")).'">'.$langs->trans("NextStep").'</a>';
 	}
 
@@ -810,9 +785,7 @@ if ($step == 3 && $datatoexport)
         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
-		{
+		} else {
 		    $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
 		if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -841,9 +814,7 @@ if ($step == 3 && $datatoexport)
 			{
 				$tmp = $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 				print $form->textwithpicto($tmp, $szInfoFiltre);
-			}
-			else
-			{
+			} else {
 				print $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 			}
 		}
@@ -1005,9 +976,7 @@ if ($step == 4 && $datatoexport)
         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
-        {
+        } else {
             $htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
         }
         if (!empty($objexport->array_export_examplevalues[0][$code]))
@@ -1085,13 +1054,13 @@ 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" value="'.$langs->trans("Save").'">';
+        print '<input type="submit" class="button reposition" value="'.$langs->trans("Save").'">';
         print '</td></tr>';
 
         // List of existing export profils
     	$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
-		$sql .= " WHERE type = '".$datatoexport."'";
+		$sql .= " WHERE type = '".$db->escape($datatoexport)."'";
 		if (empty($conf->global->EXPORTS_SHARE_MODELS))$sql .= " AND fk_user=".$user->id;
 		$sql .= " ORDER BY rowid";
 		$resql = $db->query($sql);
@@ -1105,15 +1074,14 @@ if ($step == 4 && $datatoexport)
 				print '<tr class="oddeven"><td>';
 				print $obj->label;
 				print '</td><td class="right">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=deleteprof&id='.$obj->rowid.'">';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=deleteprof&token='.newToken().'&id='.$obj->rowid.'">';
 				print img_delete();
 				print '</a>';
 				print '</tr>';
 				$i++;
 			}
-		}
-		else {
-			dol_print_error($this->db);
+		} else {
+			dol_print_error($db);
 		}
 
         print '</table>';
@@ -1306,6 +1274,5 @@ function getablenamefromfield($code, $sqlmaxforexport)
 	if (preg_match($regexstring, $newsql, $reg))
 	{
 		return $reg[1]; // The tablename
-	}
-	else return '';
+	} else return '';
 }
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index b1e3dc7fac8..cb73403356b 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('admin', 'other', 'externalsite'));
 
 $def = array();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Sauvegardes parametres
 if ($action == 'update')
@@ -50,7 +50,7 @@ if ($action == 'update')
 	$db->begin();
 
 	$label  = GETPOST('EXTERNALSITE_LABEL', 'alpha');
-	$exturl = GETPOST('EXTERNALSITE_URL', 'none');
+	$exturl = GETPOST('EXTERNALSITE_URL', 'restricthtml');
 
 	$i += dolibarr_set_const($db, 'EXTERNALSITE_LABEL', trim($label), 'chaine', 0, '', $conf->entity);
 	$i += dolibarr_set_const($db, 'EXTERNALSITE_URL', trim($exturl), 'chaine', 0, '', $conf->entity);
@@ -59,9 +59,7 @@ if ($action == 'update')
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($db->lasterror(), null, 'errors');
 	}
@@ -103,7 +101,7 @@ print "</tr>";
 print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("ExternalSiteURL")."</td>";
 print '<td><textarea class="flat minwidth500" name="EXTERNALSITE_URL">';
-print (GETPOST('EXTERNALSITE_URL', 'none') ?GETPOST('EXTERNALSITE_URL', 'none') : (empty($conf->global->EXTERNALSITE_URL) ? '' : $conf->global->EXTERNALSITE_URL));
+print (GETPOST('EXTERNALSITE_URL', 'restricthtml') ?GETPOST('EXTERNALSITE_URL', 'restricthtml') : (empty($conf->global->EXTERNALSITE_URL) ? '' : $conf->global->EXTERNALSITE_URL));
 print '</textarea></td>';
 print "<td>http://localhost/myurl/";
 print "<br>https://wikipedia.org/";
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 3a1b1c04b82..4827d832af4 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -63,19 +63,15 @@ if (!empty($keyforcontent))
 	{
 		$langs->load("errors");
 		print $langs->trans("ErrorBadSyntaxForParamKeyForContent", 'EXTERNAL_SITE_CONTENT_', 'EXTERNAL_SITE_URL_');
-	}
-	elseif (empty($conf->global->$keyforcontent))
+	} elseif (empty($conf->global->$keyforcontent))
 	{
 		$langs->load("errors");
 		print $langs->trans("ErrorVariableKeyForContentMustBeSet", 'EXTERNAL_SITE_CONTENT_'.$keyforcontent, 'EXTERNAL_SITE_URL_'.$keyforcontent);
-	}
-	else
-	{
+	} else {
 		if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
 		{
 			print $conf->global->$keyforcontent;
-		}
-		elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
+		} elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
 		{
 			/*print "
 			<html>
@@ -114,9 +110,7 @@ if (!empty($keyforcontent))
 
 	print '<div>';
 	llxFooter();
-}
-else
-{
+} else {
 	if (preg_match('/^\//', $conf->global->EXTERNALSITE_URL) || preg_match('/^http/i', $conf->global->EXTERNALSITE_URL))
 	{
 		print "
@@ -150,9 +144,7 @@ else
 
 	</html>
 	";
-	}
-	else
-	{
+	} else {
 		llxHeader();
 		print '<div class="framecontent" style="height: '.($_SESSION['dol_screenheight'] - 90).'px">';
 		print $conf->global->EXTERNALSITE_URL;
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 5199e9de0db..c19bce3c9d1 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'fichinter'; //Must be the $element of the class that manage extrafield
 
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index 62dc9025209..768de47cfd0 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'fichinterdet'; //Must be the $element of the class that manage extrafield
 
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index b5b259f2430..b8ff3714596 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -51,7 +51,7 @@ $langs->loadLangs(array("interventions", "admin", "compta", "bills"));
 
 // Security check
 $id = (GETPOST('fichinterid', 'int') ?GETPOST('fichinterid', 'int') : GETPOST('id', 'int'));
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 if ($user->socid) $socid = $user->socid;
 $objecttype = 'fichinter_rec';
 if ($action == "create" || $action == "add") $objecttype = '';
@@ -131,7 +131,7 @@ if ($action == 'add') {
 	if (!$error) {
 		$object->id_origin = $id;
 		$object->title			= GETPOST('titre', 'alpha');
-		$object->description	= GETPOST('description', 'alpha');
+		$object->description	= GETPOST('description', 'restricthtml');
 		$object->socid			= GETPOST('socid', 'alpha');
 		$object->fk_project		= GETPOST('projectid', 'int');
 		$object->fk_contract	= GETPOST('contractid', 'int');
@@ -424,8 +424,7 @@ if ($action == 'create') {
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
-	}
-	else {
+	} else {
 		dol_print_error('', "Error, no fichinter ".$object->id);
 	}
 } elseif ($action == 'selsocforcreatefrommodel') {
@@ -596,8 +595,7 @@ if ($action == 'create') {
 			} else {
 				if ($object->frequency > 0)
 					print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-				else
-					print $langs->trans("NotARecurringInterventionalTemplate");
+				else print $langs->trans("NotARecurringInterventionalTemplate");
 			}
 			print '</td></tr>';
 
@@ -619,15 +617,12 @@ if ($action == 'create') {
 			print '<tr><td>';
 			if ($user->rights->ficheinter->creer && ($action == 'nb_gen_max' || $object->frequency > 0)) {
 				print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-			} else
-				print $langs->trans("MaxPeriodNumber");
+			} else print $langs->trans("MaxPeriodNumber");
 
 			print '</td><td>';
 			if ($action == 'nb_gen_max' || $object->frequency > 0) {
 				print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
-			}
-			else
-				print '';
+			} else print '';
 
 			print '</td>';
 			print '</tr>';
@@ -693,8 +688,7 @@ if ($action == 'create') {
 				// Show product and description
 				if (isset($object->lines[$i]->product_type))
 					$type = $object->lines[$i]->product_type;
-				else
-					$object->lines[$i]->fk_product_type;
+				else $object->lines[$i]->fk_product_type;
 				// Try to enhance type detection using date_start and date_end for free lines when type
 				// was not saved.
 				if (!empty($objp->date_start)) $type = 1;
@@ -720,19 +714,18 @@ if ($action == 'create') {
 
 			if ($user->rights->ficheinter->creer) {
 				print '<div class="inline-block divButAction">';
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=createfrommodel';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=createfrommodel&token='.newToken().'';
 				print '&socid='.$object->thirdparty->id.'&id='.$object->id.'">';
 				print $langs->trans("CreateFichInter").'</a></div>';
 			}
 
 			if ($user->rights->ficheinter->supprimer) {
 				print '<div class="inline-block divButAction">';
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">';
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$object->id.'">';
 				print $langs->trans('Delete').'</a></div>';
 			}
 			print '</div>';
-		} else
-			print $langs->trans("ErrorRecordNotFound");
+		} else print $langs->trans("ErrorRecordNotFound");
 	} else {
 		/*
 		 *  List mode
@@ -860,10 +853,8 @@ if ($action == 'create') {
 								print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=createfrommodel';
 								print '&socid='.$objp->socid.'&id='.$objp->fich_rec.'">';
 								print $langs->trans("CreateFichInter").'</a>';
-							} else
-								print $langs->trans("DateIsNotEnough");
-						} else
-							print "&nbsp;";
+							} else print $langs->trans("DateIsNotEnough");
+						} else print "&nbsp;";
 
 						print "</td>";
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 404955f8ef4..e4afe4b0452 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -65,7 +65,7 @@ $confirm	= GETPOST('confirm', 'alpha');
 $mesg = GETPOST('msg', 'alpha');
 $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOST('originid', 'int') ?GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
-$note_public = GETPOST('note_public', 'none');
+$note_public = GETPOST('note_public', 'restricthtml');
 $lineid = GETPOST('line_id', 'int');
 
 //PDF
@@ -129,9 +129,7 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0)
 			{
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
@@ -142,9 +140,7 @@ if (empty($reshook))
 				{
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -171,19 +167,15 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->modelpdf : GETPOST('model', 'alpha'), $outputlangs);
+				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
+		} else {
+			$mesg = $object->error;
 		}
-		else
-		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
-		}
-	}
-
-	elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer)
 	{
 		$result = $object->setDraft($user);
 		if ($result >= 0)
@@ -200,30 +192,26 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->modelpdf : GETPOST('model', 'alpha'), $outputlangs);
+				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
+		} else {
+			$mesg = $object->error;
 		}
-		else
-		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
-		}
-	}
-
-	elseif ($action == 'add' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'add' && $user->rights->ficheinter->creer)
 	{
-	    $object->socid = $socid;
-	    $object->duration = GETPOST('duration', 'int');
-	    $object->fk_project		= GETPOST('projectid', 'int');
-	    $object->fk_contrat		= GETPOST('contratid', 'int');
-	    $object->author = $user->id;
-	    $object->description	= GETPOST('description', 'none');
-	    $object->ref = $ref;
-	    $object->modelpdf = GETPOST('model', 'alpha');
-	    $object->note_private = GETPOST('note_private', 'none');
-	    $object->note_public = GETPOST('note_public', 'none');
+		$object->socid = $socid;
+		$object->duration = GETPOST('duration', 'int');
+		$object->fk_project		= GETPOST('projectid', 'int');
+		$object->fk_contrat		= GETPOST('contratid', 'int');
+		$object->author = $user->id;
+		$object->description	= GETPOST('description', 'restricthtml');
+		$object->ref = $ref;
+		$object->model_pdf = GETPOST('model', 'alpha');
+		$object->note_private = GETPOST('note_private', 'restricthtml');
+		$object->note_public = GETPOST('note_public', 'restricthtml');
 
 		if ($object->socid > 0)
 		{
@@ -263,7 +251,7 @@ if (empty($reshook))
 				$extrafields = new ExtraFields($db);
 				$array_options = $extrafields->getOptionalsFromPost($object->table_element);
 
-		        $object->array_options = $array_options;
+				$object->array_options = $array_options;
 
 				$id = $object->create($user);
 
@@ -368,12 +356,12 @@ if (empty($reshook))
 
 									$result = $object->addline(
 										$user,
-				                        $id,
-				                        $desc,
-							            $date_intervention,
-		                 				$duration,
-		                 				$array_options
-				                    );
+										$id,
+										$desc,
+										$date_intervention,
+						 				$duration,
+						 				$array_options
+									);
 
 									if ($result < 0)
 									{
@@ -383,63 +371,51 @@ if (empty($reshook))
 								}
 							}
 						}
-		            }
-		            else
-		            {
-		                $mesg = $srcobject->error;
-		                $error++;
-		            }
-		        }
-		        else
-		        {
-		            $mesg = $object->error;
-		            $error++;
-		        }
-		    }
-		    else
-		    {
-		    	// Fill array 'array_options' with data from add form
-		    	$ret = $extrafields->setOptionalsFromPost(null, $object);
-		    	if ($ret < 0) {
-		    		$error++;
-		    		$action = 'create';
-		    	}
+					} else {
+						$mesg = $srcobject->error;
+						$error++;
+					}
+				} else {
+					$mesg = $object->error;
+					$error++;
+				}
+			} else {
+				// Fill array 'array_options' with data from add form
+				$ret = $extrafields->setOptionalsFromPost(null, $object);
+				if ($ret < 0) {
+					$error++;
+					$action = 'create';
+				}
 
-		    	if (!$error)
-		    	{
-		    		// Extrafields
-		    		$array_options = $extrafields->getOptionalsFromPost($object->table_element);
+				if (!$error)
+				{
+					// Extrafields
+					$array_options = $extrafields->getOptionalsFromPost($object->table_element);
 
-		    		$object->array_options = $array_options;
+					$object->array_options = $array_options;
 
-		    		$result = $object->create($user);
-		    		if ($result > 0)
-		    		{
-		    			$id = $result; // Force raffraichissement sur fiche venant d'etre cree
-		    		}
-		    		else
-		    		{
-		    			$langs->load("errors");
-		    			setEventMessages($object->error, $object->errors, 'errors');
-		    			$action = 'create';
-		    		}
-		    	}
-	        }
-	    }
-	    else
-	    {
-	    	$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")).'</div>';
-	        $action = 'create';
-	    }
-	}
-
-	elseif ($action == 'update' && $user->rights->ficheinter->creer)
+					$result = $object->create($user);
+					if ($result > 0)
+					{
+						$id = $result; // Force raffraichissement sur fiche venant d'etre cree
+					} else {
+						$langs->load("errors");
+						setEventMessages($object->error, $object->errors, 'errors');
+						$action = 'create';
+					}
+				}
+			}
+		} else {
+			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty"));
+			$action = 'create';
+		}
+	} elseif ($action == 'update' && $user->rights->ficheinter->creer)
 	{
 		$object->socid = $socid;
 		$object->fk_project		= GETPOST('projectid', 'int');
 		$object->fk_contrat		= GETPOST('contratid', 'int');
 		$object->author = $user->id;
-		$object->description	= GETPOST('description', 'alpha');
+		$object->description	= GETPOST('description', 'restricthtml');
 		$object->ref = $ref;
 
 		$result = $object->update($user);
@@ -460,9 +436,7 @@ if (empty($reshook))
 	{
 		$result = $object->set_contrat($user, GETPOST('contratid', 'int'));
 		if ($result < 0) dol_print_error($db, $object->error);
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
 	{
 		$result = $object->delete($user);
 		if ($result < 0) {
@@ -471,9 +445,7 @@ if (empty($reshook))
 
 		header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter&restore_lastsearch_values=1');
 		exit;
-	}
-
-	elseif ($action == 'setdescription' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'setdescription' && $user->rights->ficheinter->creer)
 	{
 		$result = $object->set_description($user, GETPOST('description'));
 		if ($result < 0) dol_print_error($db, $object->error);
@@ -484,17 +456,17 @@ if (empty($reshook))
 	{
 		if (!GETPOST('np_desc', 'restricthtml') && empty($conf->global->FICHINTER_EMPTY_LINE_DESC))
  		{
-			$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")).'</div>';
+			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description"));
 			$error++;
 		}
 		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && !GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int'))
 		{
-			$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Duration")).'</div>';
+			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Duration"));
 			$error++;
 		}
 		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && GETPOST('durationhour', 'int') >= 24 && GETPOST('durationmin', 'int') > 0)
 		{
-			$mesg = '<div class="error">'.$langs->trans("ErrorValueTooHigh").'</div>';
+			$mesg = $langs->trans("ErrorValueTooHigh");
 			$error++;
 		}
 		if (!$error)
@@ -510,14 +482,14 @@ if (empty($reshook))
 			$extrafields->fetch_name_optionals_label($object->table_element_line);
 			$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);
 
-        	$result = $object->addline(
+			$result = $object->addline(
 				$user,
-	            $id,
-	            $desc,
-	            $date_intervention,
-	            $duration,
-	            $array_options
-	        );
+				$id,
+				$desc,
+				$date_intervention,
+				$duration,
+				$array_options
+			);
 
 			// Define output language
 			$outputlangs = $langs;
@@ -534,12 +506,10 @@ if (empty($reshook))
 			{
 				$db->commit();
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$mesg = $object->error;
 				$db->rollback();
 			}
@@ -554,9 +524,7 @@ if (empty($reshook))
 		{
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -569,26 +537,36 @@ if (empty($reshook))
 		{
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
+		} else {
+			$mesg = $object->error;
 		}
 	}
 
 	// Classify Done
 	elseif ($action == 'classifydone' && $user->rights->ficheinter->creer)
 	{
-	    $result = $object->setStatut(3);
-	    if ($result > 0)
-	    {
-	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	        exit;
-	    }
-	    else
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$result = $object->setStatut(3);
+		if ($result > 0)
+		{
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
+	// Reopen
+	elseif ($action == 'confirm_reopen' && $user->rights->ficheinter->creer)
+	{
+		$result = $object->setStatut(Fichinter::STATUS_VALIDATED);
+		if ($result > 0)
+		{
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		}
+		else {
+			$mesg = $object->error;
+		}
 	}
 
 	/*
@@ -613,9 +591,9 @@ if (empty($reshook))
 		$date_inter = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
 		$duration = convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int'));
 
-	    $objectline->datei = $date_inter;
-	    $objectline->desc = $desc;
-	    $objectline->duration = $duration;
+		$objectline->datei = $date_inter;
+		$objectline->desc = $desc;
+		$objectline->duration = $duration;
 
 		// Extrafields
 		$extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -623,11 +601,11 @@ if (empty($reshook))
 		$objectline->array_options = $array_options;
 
 		$result = $objectline->update($user);
-	    if ($result < 0)
-	    {
-	        dol_print_error($db);
-	        exit;
-	    }
+		if ($result < 0)
+		{
+			dol_print_error($db);
+			exit;
+		}
 
 		// Define output language
 		$outputlangs = $langs;
@@ -639,7 +617,7 @@ if (empty($reshook))
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
@@ -674,7 +652,7 @@ if (empty($reshook))
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 	}
 
 	/*
@@ -694,13 +672,11 @@ if (empty($reshook))
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid);
 		exit;
-	}
-
-	elseif ($action == 'down' && $user->rights->ficheinter->creer)
+	} elseif ($action == 'down' && $user->rights->ficheinter->creer)
 	{
 		$object->line_down($lineid);
 
@@ -714,7 +690,7 @@ if (empty($reshook))
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->modelpdf, $outputlangs);
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid);
 		exit;
@@ -739,7 +715,7 @@ if (empty($reshook))
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
@@ -769,17 +745,13 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
-					$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-				}
-				else
-				{
-					$mesg = '<div class="error">'.$object->error.'</div>';
+					$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
+				} else {
+					$mesg = $object->error;
 				}
 			}
 		}
@@ -799,8 +771,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -827,7 +798,11 @@ if ($action == 'create')
 
 	print load_fiche_titre($langs->trans("AddIntervention"), '', 'intervention');
 
-	dol_htmloutput_mesg($mesg);
+	if ($error > 0) {
+		dol_htmloutput_errors($mesg);
+	} else {
+		dol_htmloutput_mesg($mesg);
+	}
 
 	if ($socid) $res = $soc->fetch($socid);
 
@@ -842,13 +817,11 @@ if ($action == 'create')
 			$subelement = $regs[2];
 		}
 
-        if ($element == 'project')
-        {
-            $projectid = GETPOST('originid', 'int');
-        }
-        else
+		if ($element == 'project')
 		{
-            // For compatibility
+			$projectid = GETPOST('originid', 'int');
+		} else {
+			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
 				$element = $subelement = 'commande';
 			}
@@ -875,14 +848,13 @@ if ($action == 'create')
 
 			$soc = $objectsrc->thirdparty;
 
-			$note_private = (!empty($objectsrc->note) ? $objectsrc->note : (!empty($objectsrc->note_private) ? $objectsrc->note_private : GETPOST('note_private', 'none')));
-			$note_public = (!empty($objectsrc->note_public) ? $objectsrc->note_public : GETPOST('note_public', 'none'));
+			$note_private = (!empty($objectsrc->note) ? $objectsrc->note : (!empty($objectsrc->note_private) ? $objectsrc->note_private : GETPOST('note_private', 'restricthtml')));
+			$note_public = (!empty($objectsrc->note_public) ? $objectsrc->note_public : GETPOST('note_public', 'restricthtml'));
 
 			// Object source contacts list
 			$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 		}
-	}
-	else {
+	} else {
 		$projectid = GETPOST('projectid', 'int');
 	}
 
@@ -932,27 +904,27 @@ if ($action == 'create')
 
 			$langs->load("project");
 
-            print '<tr><td>'.$langs->trans("Project").'</td><td>';
-            /* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
+			print '<tr><td>'.$langs->trans("Project").'</td><td>';
+			/* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
             if ($societe->fournisseur==1)
             	$numprojet=select_projects(-1,$_POST["projectid"],'projectid');
             else
             	$numprojet=select_projects($societe->id,$_POST["projectid"],'projectid');
             	*/
-            $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid');
-            if ($numprojet == 0)
-            {
-                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
-            }
-            print '</td></tr>';
-        }
+			$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid');
+			if ($numprojet == 0)
+			{
+				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
+			}
+			print '</td></tr>';
+		}
 
 		// Contract
 		if ($conf->contrat->enabled)
 		{
 			$langs->load("contracts");
 			print '<tr><td>'.$langs->trans("Contract").'</td><td>';
-			$numcontrat = $formcontract->select_contract($soc->id, GETPOST('contratid', 'int'), 'contratid', 0, 1);
+			$numcontrat = $formcontract->select_contract($soc->id, GETPOST('contratid', 'int'), 'contratid', 0, 1, 1);
 			if ($numcontrat == 0)
 			{
 				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddContract").'"></span></a>';
@@ -960,53 +932,53 @@ if ($action == 'create')
 			print '</td></tr>';
 		}
 
-        // Model
-        print '<tr>';
-        print '<td>'.$langs->trans("DefaultModel").'</td>';
-        print '<td>';
-        $liste = ModelePDFFicheinter::liste_modeles($db);
-        print $form->selectarray('model', $liste, $conf->global->FICHEINTER_ADDON_PDF);
-        print "</td></tr>";
+		// Model
+		print '<tr>';
+		print '<td>'.$langs->trans("DefaultModel").'</td>';
+		print '<td>';
+		$liste = ModelePDFFicheinter::liste_modeles($db);
+		print $form->selectarray('model', $liste, $conf->global->FICHEINTER_ADDON_PDF);
+		print "</td></tr>";
 
-        // Public note
-        print '<tr>';
-        print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-        print '<td>';
-        $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        print $doleditor->Create(1);
-        //print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
-        print '</td></tr>';
+		// Public note
+		print '<tr>';
+		print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
+		print '<td>';
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		print $doleditor->Create(1);
+		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
+		print '</td></tr>';
 
-        // Private note
-        if (empty($user->socid))
-        {
-        	print '<tr>';
-        	print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-        	print '<td>';
-        	$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        	print $doleditor->Create(1);
-        	//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
-        	print '</td></tr>';
-        }
+		// Private note
+		if (empty($user->socid))
+		{
+			print '<tr>';
+			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
+			print '<td>';
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			print $doleditor->Create(1);
+			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
+			print '</td></tr>';
+		}
 
-        // Other attributes
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook))
+		// Other attributes
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit');
 		}
 
-        // Show link to origin object
-        if (!empty($origin) && !empty($originid) && is_object($objectsrc))
-        {
-        	$newclassname = $classname;
-        	if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
-        	print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
+		// Show link to origin object
+		if (!empty($origin) && !empty($originid) && is_object($objectsrc))
+		{
+			$newclassname = $classname;
+			if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
+			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
 
-        	// Amount
-        	/* Hide amount because we only copy services so amount may differ than source
+			// Amount
+			/* Hide amount because we only copy services so amount may differ than source
         	print '<tr><td>' . $langs->trans('AmountHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
         	print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
         	if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
@@ -1028,14 +1000,14 @@ if ($action == 'create')
         		print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
         	}
         	*/
-        }
+		}
 
-        print '</table>';
+		print '</table>';
 
-	    if (is_object($objectsrc))
-	    {
-	        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-	        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+		if (is_object($objectsrc))
+		{
+			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 		} elseif ($origin == 'project' && !empty($projectid)) {
 			print '<input type="hidden" name="projectid" value="'.$projectid.'">';
 		}
@@ -1044,8 +1016,8 @@ if ($action == 'create')
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-    	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
 		print '</form>';
@@ -1061,9 +1033,7 @@ if ($action == 'create')
 
 			print '</table>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
@@ -1088,14 +1058,13 @@ if ($action == 'create')
 		print '<div class="center">';
 		print '<input type="hidden" name="action" value="create">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-    	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
 		print '</form>';
 	}
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
 {
 	/*
 	 * Affichage en mode visu
@@ -1107,7 +1076,11 @@ elseif ($id > 0 || !empty($ref))
 	$soc = new Societe($db);
 	$soc->fetch($object->socid);
 
-	dol_htmloutput_mesg($mesg);
+	if ($error > 0) {
+		dol_htmloutput_errors($mesg);
+	} else {
+		dol_htmloutput_mesg($mesg);
+	}
 
 	$head = fichinter_prepare_head($object);
 
@@ -1134,9 +1107,7 @@ elseif ($id > 0 || !empty($ref))
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			$numref = $object->ref;
 		}
 		$text = $langs->trans('ConfirmValidateIntervention', $numref);
@@ -1150,6 +1121,12 @@ elseif ($id > 0 || !empty($ref))
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify', '', 0, 1);
 	}
 
+	// Confirm back to open
+	if ($action == 'reopen')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Reopen'), $langs->trans('ConfirmReopenIntervention', $object->ref), 'confirm_reopen', '', 0, 1);
+	}
+
 	// Confirm deletion of line
 	if ($action == 'ask_deleteline')
 	{
@@ -1195,46 +1172,46 @@ elseif ($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> : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->ficheinter->creer)
+		{
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield" width="100%">';
 
 	if (!empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES))
 	{
@@ -1289,54 +1266,50 @@ elseif ($id > 0 || !empty($ref))
 		if ($action == 'contrat')
 		{
 			$formcontract = new Formcontract($db);
-			$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
-		}
-		else
-		{
+			$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1, 1);
+		} else {
 			if ($object->fk_contrat)
-            {
-                $contratstatic = new Contrat($db);
-                $contratstatic->fetch($object->fk_contrat);
-                //print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
-                print $contratstatic->getNomUrl(0, '', 1);
-            }
-            else
-            {
-                print "&nbsp;";
-            }
+			{
+				$contratstatic = new Contrat($db);
+				$contratstatic->fetch($object->fk_contrat);
+				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
+				print $contratstatic->getNomUrl(0, '', 1);
+			} else {
+				print "&nbsp;";
+			}
 		}
 		print '</td>';
 		print '</tr>';
 	}
 
-    // Other attributes
-    $cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '<div class="fichehalfright">';
-    print '<div class="ficheaddleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
-    {
-        // Duration
-        print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
-        print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
-        print '</tr>';
-    }
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
+	{
+		// Duration
+		print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
+		print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
+		print '</tr>';
+	}
 
 	print "</table>";
 
 	print '</div>';
-    print '</div>';
-    print '</div>';
+	print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div><br>';
+	print '<div class="clearboth"></div><br>';
 
 
 	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
@@ -1363,9 +1336,7 @@ elseif ($id > 0 || !empty($ref))
 		{
 			print '<input type="hidden" name="action" value="updateline">';
 			print '<input type="hidden" name="line_id" value="'.GETPOST('line_id', 'int').'">';
-		}
-		else
-		{
+		} else {
 			print '<input type="hidden" name="action" value="addline">';
 		}
 
@@ -1388,8 +1359,13 @@ elseif ($id > 0 || !empty($ref))
 			{
 				print '<br>';
 				print '<table class="noborder centpercent">';
-
 				print '<tr class="liste_titre">';
+
+				// No.
+				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+					print '<td width="5" class="center linecolnum"></td>';
+				}
+
 				print '<td class="liste_titre">'.$langs->trans('Description').'</td>';
 				print '<td class="liste_titre center">'.$langs->trans('Date').'</td>';
 				print '<td class="liste_titre right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
@@ -1401,11 +1377,16 @@ elseif ($id > 0 || !empty($ref))
 			{
 				$objp = $db->fetch_object($resql);
 
-
 				// Ligne en mode visu
 				if ($action != 'editline' || GETPOST('line_id', 'int') != $objp->rowid)
 				{
 					print '<tr class="oddeven">';
+
+					// No.
+					if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+						print '<td class="center linecolnum">'.($i + 1).'</td>';
+					}
+
 					print '<td>';
 					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
 					print dol_htmlentitiesbr($objp->description);
@@ -1446,9 +1427,7 @@ elseif ($id > 0 || !empty($ref))
 							}
 						}
 						print '</td>';
-					}
-					else
-					{
+					} else {
 						print '<td colspan="2">&nbsp;</td>';
 					}
 
@@ -1468,6 +1447,12 @@ elseif ($id > 0 || !empty($ref))
 				if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id', 'int') == $objp->rowid)
 				{
 					print '<tr class="oddeven nohover">';
+
+					// No.
+					if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+						print '<td class="center linecolnum">'.($i + 1).'</td>';
+					}
+
 					print '<td>';
 					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
 
@@ -1479,25 +1464,25 @@ elseif ($id > 0 || !empty($ref))
 
 					// Date d'intervention
 					print '<td class="center nowrap">';
-                    if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
-                        print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention");
-                    } else {
-                        print $form->selectDate($db->jdate($objp->date_intervention), 'di', 1, 1, 0, "date_intervention");
-                    }
+					if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+						print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention");
+					} else {
+						print $form->selectDate($db->jdate($objp->date_intervention), 'di', 1, 1, 0, "date_intervention");
+					}
 					print '</td>';
 
-                    // Duration
-                    print '<td class="right">';
-                    if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
-                        $selectmode = 'select';
-                        if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION))
-                            $selectmode = 'text';
-                        $form->select_duration('duration', $objp->duree, 0, $selectmode);
-                    }
-                    print '</td>';
+					// Duration
+					print '<td class="right">';
+					if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
+						$selectmode = 'select';
+						if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION))
+							$selectmode = 'text';
+						$form->select_duration('duration', $objp->duree, 0, $selectmode);
+					}
+					print '</td>';
 
-                    print '<td class="center" colspan="5" valign="center">';
-                    print '<input type="submit" class="button buttongen marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
+					print '<td class="center" colspan="5" valign="center">';
+					print '<input type="submit" class="button buttongen marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
 					print '<input type="submit" class="button buttongen marginbottomonly" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
 					print '</tr>'."\n";
 
@@ -1520,56 +1505,68 @@ elseif ($id > 0 || !empty($ref))
 			{
 				if (!$num)
 				{
-				    print '<br><table class="noborder centpercent">';
+					print '<br>';
+					print '<table class="noborder centpercent">';
+					print '<tr class="liste_titre">';
 
-    				print '<tr class="liste_titre">';
-    				print '<td>';
-    				print '<a name="add"></a>'; // ancre
-    				print $langs->trans('Description').'</td>';
-    				print '<td class="center">'.$langs->trans('Date').'</td>';
-    				print '<td class="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
-      				print '<td colspan="3">&nbsp;</td>';
-    				print "</tr>\n";
+					// No.
+					if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+						print '<td width="5" class="center linecolnum"></td>';
+					}
+
+					print '<td>';
+					print '<a name="add"></a>'; // ancre
+					print $langs->trans('Description').'</td>';
+					print '<td class="center">'.$langs->trans('Date').'</td>';
+					print '<td class="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
+	  				print '<td colspan="3">&nbsp;</td>';
+					print "</tr>\n";
 				}
 
 				print '<tr class="oddeven nohover">'."\n";
-                print '<td>';
-                // editeur wysiwyg
-                if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                    $doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
-                    $doleditor->Create();
-                }
-                print '</td>';
 
-                // Date intervention
-                print '<td class="center nowrap">';
+				// No.
+				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+					print '<td class="center linecolnum">'.($i + 1).'</td>';
+				}
+
+				print '<td>';
+				// editeur wysiwyg
+				if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					$doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
+					$doleditor->Create();
+				}
+				print '</td>';
+
+				// Date intervention
+				print '<td class="center nowrap">';
 				$now = dol_now();
 				$timearray = dol_getdate($now);
 				if (!GETPOST('diday', 'int')) {
-                    $timewithnohour = dol_mktime(0, 0, 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
-                } else {
-                    $timewithnohour = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
-                }
-                if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
-                    print $form->selectDate($timewithnohour, 'di', 0, 0, 0, "addinter");
-                } else {
-                    print $form->selectDate($timewithnohour, 'di', 1, 1, 0, "addinter");
-                }
+					$timewithnohour = dol_mktime(0, 0, 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
+				} else {
+					$timewithnohour = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
+				}
+				if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+					print $form->selectDate($timewithnohour, 'di', 0, 0, 0, "addinter");
+				} else {
+					print $form->selectDate($timewithnohour, 'di', 1, 1, 0, "addinter");
+				}
 				print '</td>';
 
-                // Duration
-                print '<td class="right">';
-                if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
-                    $selectmode = 'select';
-                    if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
-                        $selectmode = 'text';
-                    }
-                    $form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode);
-                }
-                print '</td>';
+				// Duration
+				print '<td class="right">';
+				if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
+					$selectmode = 'select';
+					if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
+						$selectmode = 'text';
+					}
+					$form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode);
+				}
+				print '</td>';
 
-                print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
+				print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
 				print '</tr>';
 
 				//Line extrafield
@@ -1584,9 +1581,7 @@ elseif ($id > 0 || !empty($ref))
 			}
 
 			if ($num) print '</table>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -1606,22 +1601,22 @@ elseif ($id > 0 || !empty($ref))
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		                                                                                          // modified by hook
+																								  // modified by hook
 	if (empty($reshook))
 	{
 		if ($user->socid == 0)
 		{
-            if ($action != 'editdescription' && ($action != 'presend')) {
-                // Validate
-                if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
-                    if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->validate)) {
-                        print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
-                        print '>'.$langs->trans("Validate").'</a></div>';
-                    }
-                }
+			if ($action != 'editdescription' && ($action != 'presend')) {
+				// Validate
+				if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
+					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->validate)) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
+						print '>'.$langs->trans("Validate").'</a></div>';
+					}
+				}
 
-                // Modify
-                if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate)))
+				// Modify
+				if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate)))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modify">';
 					if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify");
@@ -1629,6 +1624,15 @@ elseif ($id > 0 || !empty($ref))
 					print '</a></div>';
 				}
 
+				// Reopen
+				if ($object->statut >= Fichinter::STATUS_CLOSED)
+				{
+					if ($user->rights->ficheinter->creer)
+					{
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans('Reopen').'</a></div>';
+					} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Reopen').'</a></div>';
+				}
+
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut > Fichinter::STATUS_DRAFT)
@@ -1636,13 +1640,12 @@ elseif ($id > 0 || !empty($ref))
 						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						}
-						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
 				// create intervention model
-				if ($conf->global->MAIN_FEATURES_LEVEL >= 2 && $object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
+				if ($conf->global->MAIN_FEATURES_LEVEL >= 1 && $object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
 					print '<div class="inline-block divButAction">';
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';
 					print '</div>';
@@ -1674,16 +1677,14 @@ elseif ($id > 0 || !empty($ref))
 						if ($object->statut != Fichinter::STATUS_BILLED)
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
-						}
-						else
-						{
+						} else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("InterventionClassifyUnBilled").'</a></div>';
 						}
 					}
 				}
 
 				// Done
-            	if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED)
+				if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifydone">'.$langs->trans("InterventionClassifyDone").'</a></div>';
 				}
@@ -1696,7 +1697,7 @@ elseif ($id > 0 || !empty($ref))
 				// Delete
 				if (($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
 				{
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'"';
 					print '>'.$langs->trans('Delete').'</a></div>';
 				}
 			}
@@ -1717,7 +1718,7 @@ elseif ($id > 0 || !empty($ref))
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = $user->rights->ficheinter->lire;
 		$delallowed = $user->rights->ficheinter->creer;
-		print $formfile->showdocuments('ficheinter', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		print $formfile->showdocuments('ficheinter', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('fichinter'));
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 4f81930355e..c2328e5cfd3 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -144,7 +144,7 @@ class Interventions extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -152,29 +152,28 @@ class Interventions extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
         dol_syslog("API Rest request");
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
 
         if ($result)
         {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             $i = 0;
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $fichinter_static = new Fichinter($db);
+            	$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 : '.$db->lasterror());
+        } else {
+        	throw new RestException(503, 'Error when retrieve intervention list : '.$this->db->lasterror());
         }
         if (!count($obj_ret)) {
             throw new RestException(404, 'No intervention found');
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index f370b8bb571..930c6e07978 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011-2020 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015      Charlie Benke        <charlie@patas-monkey.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>
  *
@@ -206,9 +206,7 @@ class Fichinter extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -281,7 +279,7 @@ class Fichinter extends CommonObject
 		$sql .= ", ".$user->id;
 		$sql .= ", ".$user->id;
 		$sql .= ", ".($this->description ? "'".$this->db->escape($this->description)."'" : "null");
-		$sql .= ", '".$this->db->escape($this->modelpdf)."'";
+		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
 		$sql .= ", ".($this->fk_project ? $this->fk_project : 0);
 		$sql .= ", ".($this->fk_contrat ? $this->fk_contrat : 0);
 		$sql .= ", ".$this->statut;
@@ -334,17 +332,13 @@ class Fichinter extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = join(',', $this->errors);
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -404,9 +398,7 @@ class Fichinter extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -431,8 +423,7 @@ class Fichinter extends CommonObject
 		if ($ref) {
 			$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 			$sql .= " AND f.ref='".$this->db->escape($ref)."'";
-		}
-		else $sql .= " WHERE f.rowid=".$rowid;
+		} else $sql .= " WHERE f.rowid=".$rowid;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -457,7 +448,8 @@ class Fichinter extends CommonObject
 				$this->fk_project   = $obj->fk_project;
 				$this->note_public  = $obj->note_public;
 				$this->note_private = $obj->note_private;
-				$this->modelpdf = $obj->model_pdf;
+				$this->model_pdf    = $obj->model_pdf;
+				$this->modelpdf     = $obj->model_pdf;	// deprecated
 				$this->fk_contrat = $obj->fk_contrat;
 
 				$this->user_creation = $obj->fk_user_author;
@@ -480,9 +472,7 @@ class Fichinter extends CommonObject
 				$this->db->free($resql);
 				return 1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -535,9 +525,7 @@ class Fichinter extends CommonObject
 			    $this->db->rollback();
 			    return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -568,9 +556,7 @@ class Fichinter extends CommonObject
 			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 			{
 				$num = $this->getNextNumRef($this->thirdparty);
-			}
-			else
-			{
+			} else {
 				$num = $this->ref;
 			}
 			$this->newref = dol_sanitizeFileName($num);
@@ -655,9 +641,7 @@ class Fichinter extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
 				return -1;
@@ -781,7 +765,7 @@ class Fichinter extends CommonObject
 
 		$result = '';
 
-		$label = '<u>'.$langs->trans("ShowIntervention").'</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Intervention").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (isset($this->status)) {
 			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
@@ -826,7 +810,7 @@ class Fichinter extends CommonObject
 		$result .= $linkend;
 
 		global $action;
-		$hookmanager->initHooks(array('intervnetiondao'));
+		$hookmanager->initHooks(array('interventiondao'));
 		$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;
@@ -877,15 +861,11 @@ class Fichinter extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				dol_print_error($db, "Fichinter::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined");
 			return "";
@@ -943,9 +923,7 @@ class Fichinter extends CommonObject
 				}
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1067,9 +1045,7 @@ class Fichinter extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1099,9 +1075,7 @@ class Fichinter extends CommonObject
 			{
 				$this->date_delivery = $date_delivery;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_date_delivery Erreur SQL");
 				return -1;
@@ -1133,9 +1107,7 @@ class Fichinter extends CommonObject
 			{
 				$this->description = $description;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				dol_syslog("Fichinter::set_description Erreur SQL");
 				return -1;
@@ -1160,16 +1132,14 @@ class Fichinter extends CommonObject
 		if ($user->rights->ficheinter->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
-			$sql .= " SET fk_contrat = '".$contractid."'";
+			$sql .= " SET fk_contrat = ".((int) $contractid);
 			$sql .= " WHERE rowid = ".$this->id;
 
 			if ($this->db->query($sql))
 			{
 				$this->fk_contrat = $contractid;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -1259,9 +1229,7 @@ class Fichinter extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1305,9 +1273,7 @@ class Fichinter extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -1;
@@ -1398,9 +1364,7 @@ class Fichinter extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -1503,9 +1467,7 @@ class FichinterLigne extends CommonObjectLine
 
 			$this->db->free($result);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error().' sql='.$sql;
 			return -1;
 		}
@@ -1539,9 +1501,7 @@ class FichinterLigne extends CommonObjectLine
 			{
 				$obj = $this->db->fetch_object($resql);
 				$rangToUse = $obj->max + 1;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				$this->db->rollback();
 				return -1;
@@ -1593,15 +1553,11 @@ class FichinterLigne extends CommonObjectLine
 			if (!$error) {
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." sql=".$sql;
 			$this->db->rollback();
 			return -1;
@@ -1661,16 +1617,12 @@ class FichinterLigne extends CommonObjectLine
 			{
 				$this->db->commit();
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1714,16 +1666,12 @@ class FichinterLigne extends CommonObjectLine
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -1773,22 +1721,16 @@ class FichinterLigne extends CommonObjectLine
 
 					$this->db->commit();
 					return $result;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index a09547b3164..c9e689ffd4c 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -38,780 +38,777 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
  */
 class FichinterRec extends Fichinter
 {
-    public $element = 'fichinterrec';
-    public $table_element = 'fichinter_rec';
-    public $table_element_line = 'fichinter_rec';
-    public $fk_element = 'fk_fichinter';
+	public $element = 'fichinterrec';
+	public $table_element = 'fichinter_rec';
+	public $table_element_line = 'fichinter_rec';
+	public $fk_element = 'fk_fichinter';
 
-    /**
+	/**
 	 * {@inheritdoc}
 	 */
 	protected $table_ref_field = 'titre';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'intervention';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'intervention';
 
-    public $title;
-    public $number;
-    public $date;
-    public $amount;
-    public $remise;
-    public $tva;
-    public $total;
-    public $db_table;
-    public $propalid;
+	public $title;
+	public $number;
+	public $date;
+	public $amount;
+	public $remise;
+	public $tva;
+	public $total;
+	public $db_table;
+	public $propalid;
 
-    public $date_last_gen;
-    public $date_when;
-    public $nb_gen_done;
-    public $nb_gen_max;
+	public $date_last_gen;
+	public $date_when;
+	public $nb_gen_done;
+	public $nb_gen_max;
 
-    public $rang;
-    public $special_code;
+	public $rang;
+	public $special_code;
 
-    public $usenewprice = 0;
+	public $usenewprice = 0;
 
-    /**
-     *	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;
 
-        //status dans l'ordre de l'intervention
-        $this->statuts[0] = 'Draft';
-        $this->statuts[1] = 'Closed';
+		//status dans l'ordre de l'intervention
+		$this->statuts[0] = 'Draft';
+		$this->statuts[1] = 'Closed';
 
-        $this->statuts_short[0] = 'Draft';
-        $this->statuts_short[1] = 'Closed';
+		$this->statuts_short[0] = 'Draft';
+		$this->statuts_short[1] = 'Closed';
 
-        $this->statuts_logo[0] = 'statut0';
-        $this->statuts_logo[1] = 'statut1';
-    }
+		$this->statuts_logo[0] = 'statut0';
+		$this->statuts_logo[1] = 'statut1';
+	}
 
-    /**
-     *	Returns the label status
-     *
-     *	@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
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->statut, $mode);
-    }
+	/**
+	 *	Returns the label status
+	 *
+	 *	@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
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
 
 
-    /**
-     *  Create a predefined fichinter
-     *
-     *  @param      User    $user       User object
-     *  @param      int     $notrigger  no trigger
-     *  @return     int                 <0 if KO, id of fichinter if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-        global $conf;
+	/**
+	 *  Create a predefined fichinter
+	 *
+	 *  @param      User    $user       User object
+	 *  @param      int     $notrigger  no trigger
+	 *  @return     int                 <0 if KO, id of fichinter if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf;
 
-        $error = 0;
-        $now = dol_now();
+		$error = 0;
+		$now = dol_now();
 
-        // Clean parameters
-        $this->title = trim($this->title);
-        $this->description = trim($this->description);
+		// Clean parameters
+		$this->title = trim($this->title);
+		$this->description = trim($this->description);
 
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Load fichinter model
-        $fichintsrc = new Fichinter($this->db);
+		// Load fichinter model
+		$fichintsrc = new Fichinter($this->db);
 
-        $result = $fichintsrc->fetch($this->id_origin);
-        $result = $fichintsrc->fetch_lines(1); // to get all lines
+		$result = $fichintsrc->fetch($this->id_origin);
+		$result = $fichintsrc->fetch_lines(1); // to get all lines
 
 
-        if ($result > 0) {
-            // On positionne en mode brouillon la facture
-            $this->brouillon = 1;
+		if ($result > 0) {
+			// On positionne en mode brouillon la facture
+			$this->brouillon = 1;
 
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."fichinter_rec (";
-            $sql .= "titre";
-            $sql .= ", fk_soc";
-            $sql .= ", entity";
-            $sql .= ", datec";
-            $sql .= ", duree";
-            $sql .= ", description";
-            $sql .= ", note_private";
-            $sql .= ", note_public";
-            $sql .= ", fk_user_author";
-            $sql .= ", fk_projet";
-            $sql .= ", fk_contrat";
-            $sql .= ", modelpdf";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."fichinter_rec (";
+			$sql .= "titre";
+			$sql .= ", fk_soc";
+			$sql .= ", entity";
+			$sql .= ", datec";
+			$sql .= ", duree";
+			$sql .= ", description";
+			$sql .= ", note_private";
+			$sql .= ", note_public";
+			$sql .= ", fk_user_author";
+			$sql .= ", fk_projet";
+			$sql .= ", fk_contrat";
+			$sql .= ", modelpdf";
 
-            $sql .= ", frequency";
-            $sql .= ", unit_frequency";
-            $sql .= ", date_when";
-            $sql .= ", date_last_gen";
-            $sql .= ", nb_gen_done";
-            $sql .= ", nb_gen_max";
-            // $sql.= ", auto_validate";
+			$sql .= ", frequency";
+			$sql .= ", unit_frequency";
+			$sql .= ", date_when";
+			$sql .= ", date_last_gen";
+			$sql .= ", nb_gen_done";
+			$sql .= ", nb_gen_max";
+			// $sql.= ", auto_validate";
 
-            $sql .= ") VALUES (";
-            $sql .= "'".$this->db->escape($this->title)."'";
-            $sql .= ", ".($this->socid > 0 ? $this->socid : 'null');
-            $sql .= ", ".$conf->entity;
-            $sql .= ", '".$this->db->idate($now)."'";
-            $sql .= ", ".(!empty($fichintsrc->duration) ? $fichintsrc->duration : '0');
-            $sql .= ", ".(!empty($this->description) ? ("'".$this->db->escape($this->description)."'") : "null");
-            $sql .= ", ".(!empty($fichintsrc->note_private) ? ("'".$this->db->escape($fichintsrc->note_private)."'") : "null");
-            $sql .= ", ".(!empty($fichintsrc->note_public) ? ("'".$this->db->escape($fichintsrc->note_public)."'") : "null");
-            $sql .= ", '".$user->id."'";
-            // si c'est la même société on conserve les liens vers le projet et le contrat
-            if ($this->socid == $fichintsrc->socid) {
-                $sql .= ", ".(!empty($fichintsrc->fk_project) ? $fichintsrc->fk_project : "null");
-                $sql .= ", ".(!empty($fichintsrc->fk_contrat) ? $fichintsrc->fk_contrat : "null");
-            } else {
-                $sql .= ", null, null";
-            }
+			$sql .= ") VALUES (";
+			$sql .= "'".$this->db->escape($this->title)."'";
+			$sql .= ", ".($this->socid > 0 ? $this->socid : 'null');
+			$sql .= ", ".$conf->entity;
+			$sql .= ", '".$this->db->idate($now)."'";
+			$sql .= ", ".(!empty($fichintsrc->duration) ? $fichintsrc->duration : '0');
+			$sql .= ", ".(!empty($this->description) ? ("'".$this->db->escape($this->description)."'") : "null");
+			$sql .= ", ".(!empty($fichintsrc->note_private) ? ("'".$this->db->escape($fichintsrc->note_private)."'") : "null");
+			$sql .= ", ".(!empty($fichintsrc->note_public) ? ("'".$this->db->escape($fichintsrc->note_public)."'") : "null");
+			$sql .= ", ".$user->id;
+			// si c'est la même société on conserve les liens vers le projet et le contrat
+			if ($this->socid == $fichintsrc->socid) {
+				$sql .= ", ".(!empty($fichintsrc->fk_project) ? $fichintsrc->fk_project : "null");
+				$sql .= ", ".(!empty($fichintsrc->fk_contrat) ? $fichintsrc->fk_contrat : "null");
+			} else {
+				$sql .= ", null, null";
+			}
 
-            $sql .= ", ".(!empty($fichintsrc->modelpdf) ? "'".$this->db->escape($fichintsrc->modelpdf)."'" : "''");
+			$sql .= ", ".(!empty($fichintsrc->model_pdf) ? "'".$this->db->escape($fichintsrc->model_pdf)."'" : "''");
 
-            // récurrence
-            $sql .= ", ".(!empty($this->frequency) ? $this->frequency : "null");
-            $sql .= ", '".$this->db->escape($this->unit_frequency)."'";
-            $sql .= ", ".(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'null');
-            $sql .= ", ".(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'null');
-            $sql .= ", 0"; // we start à 0
-            $sql .= ", ".$this->nb_gen_max;
-            // $sql.= ", ".$this->auto_validate;
-            $sql .= ")";
+			// récurrence
+			$sql .= ", ".(!empty($this->frequency) ? $this->frequency : "null");
+			$sql .= ", '".$this->db->escape($this->unit_frequency)."'";
+			$sql .= ", ".(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'null');
+			$sql .= ", ".(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'null');
+			$sql .= ", 0"; // we start à 0
+			$sql .= ", ".$this->nb_gen_max;
+			// $sql.= ", ".$this->auto_validate;
+			$sql .= ")";
 
-            if ($this->db->query($sql)) {
-                $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			if ($this->db->query($sql)) {
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-                /*
+				/*
                  * Lines
                  */
-                $num = count($fichintsrc->lines);
-                for ($i = 0; $i < $num; $i++) {
-                    //$result=$fichintlignesrc->fetch($fichintsrc->lines[$i]->id);
-
-                    //var_dump($fichintsrc->lines[$i]);
-                    $result_insert = $this->addline(
-                        $fichintsrc->lines[$i]->desc,
-                        $fichintsrc->lines[$i]->duration,
-                        $fichintsrc->lines[$i]->datei,
-                        $fichintsrc->lines[$i]->rang,
-                        $fichintsrc->lines[$i]->subprice,
-                        $fichintsrc->lines[$i]->qty,
-                        $fichintsrc->lines[$i]->tva_tx,
-                        $fichintsrc->lines[$i]->fk_product,
-                        $fichintsrc->lines[$i]->remise_percent,
-                        'HT',
-                        0,
-                        '',
-                        0,
-                        $fichintsrc->lines[$i]->product_type,
-                        $fichintsrc->lines[$i]->special_code,
-                        $fichintsrc->lines[$i]->label,
-                        $fichintsrc->lines[$i]->fk_unit
-                    );
-
-                    if ($result_insert < 0)
-                        $error++;
-                }
-
-                if ($error)
-                    $this->db->rollback();
-                else {
-                    $this->db->commit();
-                    return $this->id;
-                }
-            } else {
-                $this->error = $this->db->error().' sql='.$sql;
-                $this->db->rollback();
-                return -2;
-            }
-        } else {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Recupere l'objet facture et ses lignes de factures
-     *
-     *	@param	  int		$rowid	   	Id of object to load
-     * 	@param		string	$ref			Reference of fichinter
-     * 	@param		string	$ref_ext		External reference of fichinter
-     *	@return	 int		 			>0 if OK, <0 if KO, 0 if not found
-     */
-    public function fetch($rowid = 0, $ref = '', $ref_ext = '')
-    {
-        $sql = 'SELECT f.titre, f.fk_soc';
-        $sql .= ', f.datec, f.duree, f.fk_projet, f.fk_contrat, f.description';
-        $sql .= ', f.note_private, f.note_public, f.fk_user_author';
-        $sql .= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.auto_validate';
-        $sql .= ', f.note_private, f.note_public, f.fk_user_author';
-
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter_rec as f';
-        if ($rowid > 0) $sql .= ' WHERE f.rowid='.$rowid;
-        elseif ($ref) $sql .= " WHERE f.titre='".$this->db->escape($ref)."'";
-
-        dol_syslog(get_class($this)."::fetch rowid=".$rowid, LOG_DEBUG);
-
-        $result = $this->db->query($sql);
-        if ($result) {
-            if ($this->db->num_rows($result)) {
-                $obj = $this->db->fetch_object($result);
-
-                $this->id = $rowid;
-                $this->titre				= $obj->titre;
-                $this->ref = $obj->titre;
-                $this->description = $obj->description;
-                $this->datec				= $obj->datec;
-                $this->duration = $obj->duree;
-                $this->socid				= $obj->fk_soc;
-                $this->statut = 0;
-                $this->fk_project			= $obj->fk_projet;
-                $this->fk_contrat			= $obj->fk_contrat;
-                $this->note_private = $obj->note_private;
-                $this->note_public			= $obj->note_public;
-                $this->user_author			= $obj->fk_user_author;
-                $this->modelpdf				= $obj->model_pdf;
-                $this->rang = $obj->rang;
-                $this->special_code = $obj->special_code;
-                $this->frequency			= $obj->frequency;
-                $this->unit_frequency = $obj->unit_frequency;
-                $this->date_when			= $this->db->jdate($obj->date_when);
-                $this->date_last_gen		= $this->db->jdate($obj->date_last_gen);
-                $this->nb_gen_done = $obj->nb_gen_done;
-                $this->nb_gen_max = $obj->nb_gen_max;
-                $this->auto_validate		= $obj->auto_validate;
-
-                $this->brouillon = 1;
-
-                /*
-                 * Lines
-                 */
-                $result = $this->fetch_lines();
-                if ($result < 0) {
-                    $this->error = $this->db->error();
-                    return -3;
-                }
-                return 1;
-            } else {
-                $this->error = 'Interventional with id '.$rowid.' not found sql='.$sql;
-                dol_syslog(get_class($this).'::Fetch Error '.$this->error, LOG_ERR);
-                return -2;
-            }
-        } else {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Recupere les lignes de factures predefinies dans this->lines
-     *  @param   int	$sall   sall
-     *
-     *  @return	 int            1 if OK, < 0 if KO
-     */
-    public function fetch_lines($sall = 0)
-    {
-        // phpcs:enable
-        $sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, ';
-        $sql .= ' l.price, l.qty, l.tva_tx, l.remise, l.remise_percent, l.subprice, l.duree, ';
-        $sql .= ' l.total_ht, l.total_tva, l.total_ttc,';
-        $sql .= ' l.rang, l.special_code,';
-        $sql .= ' l.fk_unit, p.ref as product_ref, p.fk_product_type as fk_product_type,';
-        $sql .= ' p.label as product_label, p.description as product_desc';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet_rec as l';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-        $sql .= ' WHERE l.fk_fichinter = '.$this->id;
-
-        dol_syslog('FichInter-rec::fetch_lines', LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num) {
-                $objp = $this->db->fetch_object($result);
-                $line = new FichinterLigne($this->db);
-
-                $line->id = $objp->rowid;
-                $line->label = $objp->custom_label; // Label line
-                $line->desc = $objp->description; // Description line
-                $line->product_type = $objp->product_type; // Type of line
-                $line->product_ref = $objp->product_ref; // Ref product
-                $line->product_label = $objp->product_label; // Label product
-                $line->product_desc = $objp->product_desc; // Description product
-                $line->fk_product_type = $objp->fk_product_type; // Type of product
-                $line->qty = $objp->qty;
-                $line->duree = $objp->duree;
-                $line->duration = $objp->duree;
-                $line->datei = $objp->date;
-                $line->subprice = $objp->subprice;
-                $line->tva_tx = $objp->tva_tx;
-                $line->remise_percent = $objp->remise_percent;
-                $line->fk_remise_except = $objp->fk_remise_except;
-                $line->fk_product = $objp->fk_product;
-                $line->date_start = $objp->date_start;
-                $line->date_end = $objp->date_end;
-                $line->date_start = $objp->date_start;
-                $line->date_end = $objp->date_end;
-                $line->info_bits = $objp->info_bits;
-                $line->total_ht = $objp->total_ht;
-                $line->total_tva = $objp->total_tva;
-                $line->total_ttc = $objp->total_ttc;
-                $line->code_ventilation = $objp->fk_code_ventilation;
-                $line->rang = $objp->rang;
-                $line->special_code = $objp->special_code;
-                $line->fk_unit = $objp->fk_unit;
-
-                // Ne plus utiliser
-                $line->price = $objp->price;
-                $line->remise = $objp->remise;
-
-                $this->lines[$i] = $line;
-
-                $i++;
-            }
-
-            $this->db->free($result);
-            return 1;
-        } else {
-            $this->error = $this->db->error();
-            return -3;
-        }
-    }
-
-
-    /**
-     * 	Delete template fichinter rec
-     *
-     *	@param	 	int		$rowid	  	    Id of fichinter rec to delete. If empty, we delete current instance of fichinter rec
-     *	@param		int		$notrigger	    1=Does not execute triggers, 0= execute triggers
-     *	@param		int		$idwarehouse    Id warehouse to use for stock change.
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function delete($rowid = 0, $notrigger = 0, $idwarehouse = -1)
-    {
-        if (empty($rowid)) $rowid = $this->id;
-
-        dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
-
-        $error = 0;
-        $this->db->begin();
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet_rec WHERE fk_fichinter = ".$rowid;
-        dol_syslog($sql);
-        if ($this->db->query($sql)) {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinter_rec WHERE rowid = ".$rowid;
-            dol_syslog($sql);
-            if (!$this->db->query($sql)) {
-                $this->error = $this->db->lasterror();
-                $error = -1;
-            }
-        } else {
-            $this->error = $this->db->lasterror();
-            $error = -2;
-        }
-
-        if (!$error) {
-            $this->db->commit();
-            return 1;
-        } else {
-            $this->db->rollback();
-            return $error;
-        }
-    }
-
-
-    /**
-    *  Add a line to fichinter rec
-    *
-    *  @param		string		$desc               Description de la ligne
-    *  @param		integer		$duration           Durée
-    *  @param		string	    $datei				Date
-    *  @param	    int			$rang			    Position of line
-    *  @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		int			$fk_product	  	    Id du produit/service predefini
-    *  @param		double		$remise_percent  	Pourcentage de remise de la ligne
-    *  @param		string		$price_base_type	HT or TTC
-    *  @param		int			$info_bits			Bits de type de lignes
-    *  @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			$special_code		Special code
-    *  @param		string		$label				Label of the line
-    *  @param		string		$fk_unit			Unit
-    *  @return		int			 				    <0 if KO, Id of line if OK
-    */
-    public function addline($desc, $duration, $datei, $rang = -1, $pu_ht = 0, $qty = 0, $txtva = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $special_code = 0, $label = '', $fk_unit = null)
-    {
-        global $mysoc;
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-        // Check parameters
-        if ($type < 0) return -1;
-
-        if ($this->brouillon) {
-            // Clean parameters
-            $remise_percent = price2num($remise_percent);
-            $qty = price2num($qty);
-            if (!$qty) $qty = 1;
-            if (!$info_bits) $info_bits = 0;
-            $pu_ht = price2num($pu_ht);
-            $pu_ttc = price2num($pu_ttc);
-            $txtva = price2num($txtva);
-
-            if ($price_base_type == 'HT') {
-                $pu = $pu_ht;
-            } else {
-                $pu = $pu_ttc;
-            }
-
-
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et 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.
-            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, 0, 0, 0, $price_base_type, $info_bits, $type, $mysoc);
-
-            $total_ht  = $tabprice[0];
-            $total_tva = $tabprice[1];
-            $total_ttc = $tabprice[2];
-
-            $product_type = $type;
-            if ($fk_product) {
-                $product = new Product($this->db);
-                $result = $product->fetch($fk_product);
-                $product_type = $product->type;
-            }
-
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."fichinterdet_rec (";
-            $sql .= "fk_fichinter";
-            $sql .= ", label";
-            $sql .= ", description";
-            $sql .= ", date";
-            $sql .= ", duree";
-            //$sql.= ", price";
-            //$sql.= ", qty";
-            //$sql.= ", tva_tx";
-            $sql .= ", fk_product";
-            $sql .= ", product_type";
-            $sql .= ", remise_percent";
-            //$sql.= ", subprice";
-            $sql .= ", remise";
-            $sql .= ", total_ht";
-            $sql .= ", total_tva";
-            $sql .= ", total_ttc";
-            $sql .= ", rang";
-            //$sql.= ", special_code";
-            $sql .= ", fk_unit";
-            $sql .= ") VALUES (";
-            $sql .= (int) $this->id;
-            $sql .= ", ".(!empty($label) ? "'".$this->db->escape($label)."'" : "null");
-            $sql .= ", ".(!empty($desc) ? "'".$this->db->escape($desc)."'" : "null");
-            $sql .= ", ".(!empty($datei) ? "'".$this->db->idate($datei)."'" : "null");
-            $sql .= ", ".$duration;
-            //$sql.= ", ".price2num($pu_ht);
-            //$sql.= ", ".(!empty($qty)? $qty :(!empty($duration)? $duration :"null"));
-            //$sql.= ", ".price2num($txtva);
-            $sql .= ", ".(!empty($fk_product) ? $fk_product : "null");
-            $sql .= ", ".$product_type;
-            $sql .= ", ".(!empty($remise_percent) ? $remise_percent : "null");
-            //$sql.= ", '".price2num($pu_ht)."'";
-            $sql .= ", null";
-            $sql .= ", '".price2num($total_ht)."'";
-            $sql .= ", '".price2num($total_tva)."'";
-            $sql .= ", '".price2num($total_ttc)."'";
-            $sql .= ", ".(int) $rang;
-            //$sql.= ", ".$special_code;
-            $sql .= ", ".(!empty($fk_unit) ? $fk_unit : "null");
-            $sql .= ")";
-
-            dol_syslog(get_class($this)."::addline", LOG_DEBUG);
-            if ($this->db->query($sql)) {
-                return 1;
-            } else {
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Rend la fichinter automatique
-     *
-     *	@param		User	$user		User object
-     *	@param		int		$freq		Freq
-     *	@param		string	$courant	Courant
-     *	@return		int					0 if OK, <0 if KO
-     */
-    public function set_auto($user, $freq, $courant)
-    {
-        // phpcs:enable
-        if ($user->rights->fichinter->creer) {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."fichinter_rec ";
-            $sql .= " SET frequency='".$this->db->escape($freq)."'";
-            $sql .= ", date_last_gen='".$this->db->escape($courant)."'";
-            $sql .= " WHERE rowid = ".$this->id;
-
-            $resql = $this->db->query($sql);
-
-            if ($resql) {
-                $this->frequency = $freq;
-                $this->date_last_gen = $courant;
-                return 0;
-            } else {
-                dol_print_error($this->db);
-                return -1;
-            }
-        } else {
-            return -2;
-        }
-    }
-
-    /**
-     *  Return clicable name (with picto eventually)
-     *
-     *  @param	int		$withpicto      Add picto into link
-     *  @param  string	$option		    Where point the link
-     *  @param  int		$max			Maxlength of ref
-     *  @param  int		$short		    1=Return just URL
-     *  @param  string   $moretitle     Add more text to title tooltip
-     *  @return string 					String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '')
-    {
-        global $langs;
-
-        $result = '';
-        $label = $langs->trans("ShowInterventionModel").': '.$this->ref;
-
-        $url = DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$this->id;
-
-        if ($short) return $url;
-
-        $picto = 'intervention';
-
-        $link = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-        $linkend = '</a>';
-
-        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;
-    }
-
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *	@param	string		$option		''=Create a specimen fichinter with lines, 'nolines'=No lines
-     *  @return	void
-     */
-    public function initAsSpecimen($option = '')
-    {
-        global $user, $langs, $conf;
-
-        $now = dol_now();
-        $arraynow = dol_getdate($now);
-        $nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
-
-        parent::initAsSpecimen($option);
-
-        $this->usenewprice = 1;
-    }
-
-    /**
-     * Function used to replace a thirdparty id with another one.
-     *
-     * @param DoliDB $db Database handler
-     * @param int $origin_id Old thirdparty id
-     * @param int $dest_id New thirdparty id
-     * @return bool
-     */
-    public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
-    {
-        $tables = array('fichinter_rec');
-
-        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-    }
-
-
-    /**
-     *	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 called with table_element not defined", LOG_ERR);
-            return -1;
-        }
-
-        if (!empty($frequency) && empty($unit)) {
-            dol_syslog(get_class($this)."::setFrequencyAndUnit called with frequency defined but unit not ", 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;
-
-        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;
-        }
-
-        if (empty($nb)) $nb = 0;
-
-        $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;
-        }
-    }
-
-    /**
-     *	Update the auto validate fichinter
-     *
-     *	@param	 	int		$validate		0 to create in draft, 1 to create and validate fichinter
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function setAutoValidate($validate)
-    {
-        if (!$this->table_element) {
-            dol_syslog(get_class($this)."::setAutoValidate called 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;
-
-        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 Number of Generation Done
-     *
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function updateNbGenDone()
-    {
-        if (!$this->table_element) {
-            dol_syslog(get_class($this)."::updateNbGenDone called with property table_element not defined", LOG_ERR);
-            return -1;
-        }
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' SET nb_gen_done = nb_gen_done + 1';
-        $sql .= ' , date_last_gen = now()';
-        // si on et arrivé à la fin des génération
-        if ($this->nb_gen_max == $this->nb_gen_done + 1)
-            $sql .= ' , statut = 1';
-
-        $sql .= ' WHERE rowid = '.$this->id;
-
-        dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
-        if ($this->db->query($sql)) {
-            $this->nb_gen_done = $this->nb_gen_done + 1;
-            $this->nb_gen_done = dol_now();
-            return 1;
-        } else {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+				$num = count($fichintsrc->lines);
+				for ($i = 0; $i < $num; $i++) {
+					//var_dump($fichintsrc->lines[$i]);
+					$result_insert = $this->addline(
+						$fichintsrc->lines[$i]->desc,
+						$fichintsrc->lines[$i]->duration,
+						$fichintsrc->lines[$i]->datei,
+						$fichintsrc->lines[$i]->rang,
+						$fichintsrc->lines[$i]->subprice,
+						$fichintsrc->lines[$i]->qty,
+						$fichintsrc->lines[$i]->tva_tx,
+						$fichintsrc->lines[$i]->fk_product,
+						$fichintsrc->lines[$i]->remise_percent,
+						'HT',
+						0,
+						'',
+						0,
+						$fichintsrc->lines[$i]->product_type,
+						$fichintsrc->lines[$i]->special_code,
+						$fichintsrc->lines[$i]->label,
+						$fichintsrc->lines[$i]->fk_unit
+					);
+
+					if ($result_insert < 0)
+						$error++;
+				}
+
+				if ($error)
+					$this->db->rollback();
+				else {
+					$this->db->commit();
+					return $this->id;
+				}
+			} else {
+				$this->error = $this->db->error().' sql='.$sql;
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Get the template of intervention object and lines
+	 *
+	 *	@param	  int		$rowid	   	Id of object to load
+	 * 	@param		string	$ref			Reference of fichinter
+	 * 	@param		string	$ref_ext		External reference of fichinter
+	 *	@return	 int		 			>0 if OK, <0 if KO, 0 if not found
+	 */
+	public function fetch($rowid = 0, $ref = '', $ref_ext = '')
+	{
+		$sql = 'SELECT f.titre as title, f.fk_soc';
+		$sql .= ', f.datec, f.duree, f.fk_projet, f.fk_contrat, f.description';
+		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
+		$sql .= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.auto_validate';
+		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter_rec as f';
+		if ($rowid > 0) $sql .= ' WHERE f.rowid='.$rowid;
+		elseif ($ref) $sql .= " WHERE f.titre='".$this->db->escape($ref)."'";
+
+		dol_syslog(get_class($this)."::fetch rowid=".$rowid, LOG_DEBUG);
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+
+				$this->id = $rowid;
+				$this->titre				= $obj->title;
+				$this->title				= $obj->title;
+				$this->ref = $obj->title;
+				$this->description = $obj->description;
+				$this->datec				= $obj->datec;
+				$this->duration = $obj->duree;
+				$this->socid				= $obj->fk_soc;
+				$this->statut = 0;
+				$this->fk_project			= $obj->fk_projet;
+				$this->fk_contrat			= $obj->fk_contrat;
+				$this->note_private = $obj->note_private;
+				$this->note_public			= $obj->note_public;
+				$this->user_author			= $obj->fk_user_author;
+				$this->model_pdf			= $obj->model_pdf;
+				$this->modelpdf				= $obj->model_pdf;
+				$this->rang = $obj->rang;
+				$this->special_code = $obj->special_code;
+				$this->frequency			= $obj->frequency;
+				$this->unit_frequency = $obj->unit_frequency;
+				$this->date_when			= $this->db->jdate($obj->date_when);
+				$this->date_last_gen		= $this->db->jdate($obj->date_last_gen);
+				$this->nb_gen_done = $obj->nb_gen_done;
+				$this->nb_gen_max = $obj->nb_gen_max;
+				$this->auto_validate		= $obj->auto_validate;
+
+				$this->brouillon = 1;
+
+				// Lines
+				$result = $this->fetch_lines();
+				if ($result < 0) {
+					$this->error = $this->db->error();
+					return -3;
+				}
+				return 1;
+			} else {
+				$this->error = 'Interventional with id '.$rowid.' not found sql='.$sql;
+				dol_syslog(get_class($this).'::Fetch Error '.$this->error, LOG_ERR);
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load all lines of template of intervention into this->lines
+	 *
+	 *  @param   int	$sall   sall
+	 *  @return	 int            1 if OK, < 0 if KO
+	 */
+	public function fetch_lines($sall = 0)
+	{
+		// phpcs:enable
+		$sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, ';
+		$sql .= ' l.price, l.qty, l.tva_tx, l.remise, l.remise_percent, l.subprice, l.duree, ';
+		$sql .= ' l.total_ht, l.total_tva, l.total_ttc,';
+		$sql .= ' l.rang, l.special_code,';
+		$sql .= ' l.fk_unit, p.ref as product_ref, p.fk_product_type as fk_product_type,';
+		$sql .= ' p.label as product_label, p.description as product_desc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet_rec as l';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+		$sql .= ' WHERE l.fk_fichinter = '.$this->id;
+
+		dol_syslog('FichInter-rec::fetch_lines', LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num) {
+				$objp = $this->db->fetch_object($result);
+				$line = new FichinterLigne($this->db);
+
+				$line->id = $objp->rowid;
+				$line->label = $objp->custom_label; // Label line
+				$line->desc = $objp->description; // Description line
+				$line->product_type = $objp->product_type; // Type of line
+				$line->product_ref = $objp->product_ref; // Ref product
+				$line->product_label = $objp->product_label; // Label product
+				$line->product_desc = $objp->product_desc; // Description product
+				$line->fk_product_type = $objp->fk_product_type; // Type of product
+				$line->qty = $objp->qty;
+				$line->duree = $objp->duree;
+				$line->duration = $objp->duree;
+				$line->datei = $objp->date;
+				$line->subprice = $objp->subprice;
+				$line->tva_tx = $objp->tva_tx;
+				$line->remise_percent = $objp->remise_percent;
+				$line->fk_remise_except = $objp->fk_remise_except;
+				$line->fk_product = $objp->fk_product;
+				$line->date_start = $objp->date_start;
+				$line->date_end = $objp->date_end;
+				$line->date_start = $objp->date_start;
+				$line->date_end = $objp->date_end;
+				$line->info_bits = $objp->info_bits;
+				$line->total_ht = $objp->total_ht;
+				$line->total_tva = $objp->total_tva;
+				$line->total_ttc = $objp->total_ttc;
+				$line->code_ventilation = $objp->fk_code_ventilation;
+				$line->rang = $objp->rang;
+				$line->special_code = $objp->special_code;
+				$line->fk_unit = $objp->fk_unit;
+
+				// Ne plus utiliser
+				$line->price = $objp->price;
+				$line->remise = $objp->remise;
+
+				$this->lines[$i] = $line;
+
+				$i++;
+			}
+
+			$this->db->free($result);
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -3;
+		}
+	}
+
+
+	/**
+	 * 	Delete template fichinter rec
+	 *
+	 *	@param	 	int		$rowid	  	    Id of fichinter rec to delete. If empty, we delete current instance of fichinter rec
+	 *	@param		int		$notrigger	    1=Does not execute triggers, 0= execute triggers
+	 *	@param		int		$idwarehouse    Id warehouse to use for stock change.
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function delete($rowid = 0, $notrigger = 0, $idwarehouse = -1)
+	{
+		if (empty($rowid)) $rowid = $this->id;
+
+		dol_syslog(get_class($this)."::delete rowid=".$rowid, LOG_DEBUG);
+
+		$error = 0;
+		$this->db->begin();
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet_rec WHERE fk_fichinter = ".$rowid;
+		dol_syslog($sql);
+		if ($this->db->query($sql)) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinter_rec WHERE rowid = ".$rowid;
+			dol_syslog($sql);
+			if (!$this->db->query($sql)) {
+				$this->error = $this->db->lasterror();
+				$error = -1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$error = -2;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return $error;
+		}
+	}
+
+
+	/**
+	 *  Add a line to fichinter rec
+	 *
+	 *  @param		string		$desc               Description de la ligne
+	 *  @param		integer		$duration           Durée
+	 *  @param		string	    $datei				Date
+	 *  @param	    int			$rang			    Position of line
+	 *  @param		double		$pu_ht			    Unit price without tax (> 0 even for credit note)
+	 *  @param		double		$qty			 	Quantity
+	 *  @param		double		$txtva		   	    Forced VAT rate, otherwise -1
+	 *  @param		int			$fk_product	  	    Id of predefined product/service
+	 *  @param		double		$remise_percent  	Percentage of discount on line
+	 *  @param		string		$price_base_type	HT or TTC
+	 *  @param		int			$info_bits			Bits for type of lines
+	 *  @param		int			$fk_remise_except   Id discount
+	 *  @param		double		$pu_ttc			    Unit price with tax (> 0 even for credit note)
+	 *  @param		int			$type				Type of line (0=product, 1=service)
+	 *  @param		int			$special_code		Special code
+	 *  @param		string		$label				Label of the line
+	 *  @param		string		$fk_unit			Unit
+	 *  @return		int			 				    <0 if KO, Id of line if OK
+	 */
+	public function addline($desc, $duration, $datei, $rang = -1, $pu_ht = 0, $qty = 0, $txtva = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $info_bits = 0, $fk_remise_except = '', $pu_ttc = 0, $type = 0, $special_code = 0, $label = '', $fk_unit = null)
+	{
+		global $mysoc;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		// Check parameters
+		if ($type < 0) return -1;
+
+		if ($this->brouillon) {
+			// Clean parameters
+			$remise_percent = price2num($remise_percent);
+			$qty = price2num($qty);
+			if (!$qty) $qty = 1;
+			if (!$info_bits) $info_bits = 0;
+			$pu_ht = price2num($pu_ht);
+			$pu_ttc = price2num($pu_ttc);
+			$txtva = price2num($txtva);
+
+			if ($price_base_type == 'HT') {
+				$pu = $pu_ht;
+			} else {
+				$pu = $pu_ttc;
+			}
+
+
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et 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.
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, 0, 0, 0, $price_base_type, $info_bits, $type, $mysoc);
+
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+
+			$product_type = $type;
+			if ($fk_product) {
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				$product_type = $product->type;
+			}
+
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."fichinterdet_rec (";
+			$sql .= "fk_fichinter";
+			$sql .= ", label";
+			$sql .= ", description";
+			$sql .= ", date";
+			$sql .= ", duree";
+			//$sql.= ", price";
+			//$sql.= ", qty";
+			//$sql.= ", tva_tx";
+			$sql .= ", fk_product";
+			$sql .= ", product_type";
+			$sql .= ", remise_percent";
+			//$sql.= ", subprice";
+			$sql .= ", remise";
+			$sql .= ", total_ht";
+			$sql .= ", total_tva";
+			$sql .= ", total_ttc";
+			$sql .= ", rang";
+			//$sql.= ", special_code";
+			$sql .= ", fk_unit";
+			$sql .= ") VALUES (";
+			$sql .= (int) $this->id;
+			$sql .= ", ".(!empty($label) ? "'".$this->db->escape($label)."'" : "null");
+			$sql .= ", ".(!empty($desc) ? "'".$this->db->escape($desc)."'" : "null");
+			$sql .= ", ".(!empty($datei) ? "'".$this->db->idate($datei)."'" : "null");
+			$sql .= ", ".$duration;
+			//$sql.= ", ".price2num($pu_ht);
+			//$sql.= ", ".(!empty($qty)? $qty :(!empty($duration)? $duration :"null"));
+			//$sql.= ", ".price2num($txtva);
+			$sql .= ", ".(!empty($fk_product) ? $fk_product : "null");
+			$sql .= ", ".$product_type;
+			$sql .= ", ".(!empty($remise_percent) ? $remise_percent : "null");
+			//$sql.= ", '".price2num($pu_ht)."'";
+			$sql .= ", null";
+			$sql .= ", '".price2num($total_ht)."'";
+			$sql .= ", '".price2num($total_tva)."'";
+			$sql .= ", '".price2num($total_ttc)."'";
+			$sql .= ", ".(int) $rang;
+			//$sql.= ", ".$special_code;
+			$sql .= ", ".(!empty($fk_unit) ? $fk_unit : "null");
+			$sql .= ")";
+
+			dol_syslog(get_class($this)."::addline", LOG_DEBUG);
+			if ($this->db->query($sql)) {
+				return 1;
+			} else {
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		}
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Rend la fichinter automatique
+	 *
+	 *	@param		User	$user		User object
+	 *	@param		int		$freq		Freq
+	 *	@param		string	$courant	Courant
+	 *	@return		int					0 if OK, <0 if KO
+	 */
+	public function set_auto($user, $freq, $courant)
+	{
+		// phpcs:enable
+		if ($user->rights->fichinter->creer) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter_rec ";
+			$sql .= " SET frequency='".$this->db->escape($freq)."'";
+			$sql .= ", date_last_gen='".$this->db->escape($courant)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+
+			$resql = $this->db->query($sql);
+
+			if ($resql) {
+				$this->frequency = $freq;
+				$this->date_last_gen = $courant;
+				return 0;
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
+		} else {
+			return -2;
+		}
+	}
+
+	/**
+	 *  Return clicable name (with picto eventually)
+	 *
+	 *  @param	int		$withpicto      Add picto into link
+	 *  @param  string	$option		    Where point the link
+	 *  @param  int		$max			Maxlength of ref
+	 *  @param  int		$short		    1=Return just URL
+	 *  @param  string   $moretitle     Add more text to title tooltip
+	 *  @return string 					String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '')
+	{
+		global $langs;
+
+		$result = '';
+		$label = $langs->trans("ShowInterventionModel").': '.$this->ref;
+
+		$url = DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$this->id;
+
+		if ($short) return $url;
+
+		$picto = 'intervention';
+
+		$link = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend = '</a>';
+
+		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;
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *	@param	string		$option		''=Create a specimen fichinter with lines, 'nolines'=No lines
+	 *  @return	void
+	 */
+	public function initAsSpecimen($option = '')
+	{
+		global $user, $langs, $conf;
+
+		$now = dol_now();
+		$arraynow = dol_getdate($now);
+		$nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
+
+		parent::initAsSpecimen($option);
+
+		$this->usenewprice = 1;
+	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array('fichinter_rec');
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+
+
+	/**
+	 *	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 called with table_element not defined", LOG_ERR);
+			return -1;
+		}
+
+		if (!empty($frequency) && empty($unit)) {
+			dol_syslog(get_class($this)."::setFrequencyAndUnit called with frequency defined but unit not ", 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;
+
+		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;
+		}
+
+		if (empty($nb)) $nb = 0;
+
+		$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;
+		}
+	}
+
+	/**
+	 *	Update the auto validate fichinter
+	 *
+	 *	@param	 	int		$validate		0 to create in draft, 1 to create and validate fichinter
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setAutoValidate($validate)
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this)."::setAutoValidate called 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;
+
+		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 Number of Generation Done
+	 *
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function updateNbGenDone()
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this)."::updateNbGenDone called with property table_element not defined", LOG_ERR);
+			return -1;
+		}
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' SET nb_gen_done = nb_gen_done + 1';
+		$sql .= ' , date_last_gen = now()';
+		// si on et arrivé à la fin des génération
+		if ($this->nb_gen_max == $this->nb_gen_done + 1)
+			$sql .= ' , statut = 1';
+
+		$sql .= ' WHERE rowid = '.$this->id;
+
+		dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
+		if ($this->db->query($sql)) {
+			$this->nb_gen_done = $this->nb_gen_done + 1;
+			$this->nb_gen_done = dol_now();
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index fa0ec89d558..1eb0df5147a 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('interventions', 'sendings', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -66,9 +66,7 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -95,8 +93,7 @@ elseif ($action == 'deletecontact' && $user->rights->ficheinter->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index a6b4c88ed09..49988e27e78 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -43,7 +43,7 @@ $langs->loadLangs(array('other', 'fichinter', 'companies', 'interventions'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -53,8 +53,8 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -170,9 +170,7 @@ if ($object->id)
     $permtoedit = $user->rights->ficheinter->creer;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 1ee24997e87..ccadf89f1e4 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -179,9 +179,7 @@ if ($resql)
     //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
-{
+} else {
     dol_print_error($db);
 }
 
@@ -298,8 +296,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
@@ -369,8 +366,7 @@ if (!empty($conf->ficheinter->enabled))
 		}
 
 		print "</table></div><br>";
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 print '</div></div></div>';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 42031e25ce5..f6b95678f9d 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('companies', 'bills', 'interventions'));
 if (!empty($conf->projet->enabled))     $langs->load("projects");
 if (!empty($conf->contrat->enabled))    $langs->load("contracts");
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -65,8 +65,8 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -95,9 +95,10 @@ $fieldstosearchall = array(
 	's.nom'=>"ThirdParty",
 	'f.description'=>'Description',
 	'f.note_public'=>'NotePublic',
+	'fd.description'=>'DescriptionOfLine',
 );
 if (empty($user->socid)) $fieldstosearchall["f.note_private"] = "NotePrivate";
-if (!empty($conf->global->FICHINTER_DISABLE_DETAILS)) unset($fieldstosearchall['f.description']);
+if (!empty($conf->global->FICHINTER_DISABLE_DETAILS)) unset($fieldstosearchall['fd.description']);
 
 // Definition of fields for list
 $arrayfields = array(
@@ -108,6 +109,8 @@ $arrayfields = array(
 	'f.description'=>array('label'=>'Description', 'checked'=>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))),
+	'f.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
 	'f.fk_statut'=>array('label'=>'Status', 'checked'=>1, 'position'=>1000),
 	'fd.description'=>array('label'=>"DescriptionOfLine", 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0),
 	'fd.date'=>array('label'=>'DateOfLine', 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0),
@@ -200,7 +203,7 @@ foreach ($arrayfields as $tmpkey => $tmpval)
 }
 
 $sql = "SELECT";
-$sql .= " f.ref, f.rowid, f.fk_statut as status, f.description, f.datec as date_creation, f.tms as date_update, f.note_private,";
+$sql .= " f.ref, f.rowid, f.fk_statut as status, f.description, f.datec as date_creation, f.tms as date_update, f.note_public, f.note_private,";
 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)) {
@@ -319,7 +322,10 @@ if ($resql)
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$newcardbutton = '';
-	$morehtmlcenter .= dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/fichinter/card.php?action=create', '', $user->rights->ficheinter->creer);
+
+	$url = DOL_URL_ROOT.'/fichinter/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->rights->ficheinter->creer);
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -414,6 +420,18 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['f.note_public']['checked']))
+	{
+		// Note public
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['f.note_private']['checked']))
+	{
+		// Note private
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	// Status
 	if (!empty($arrayfields['f.fk_statut']['checked']))
 	{
@@ -458,6 +476,8 @@ if ($resql)
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	if (!empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	if (!empty($arrayfields['f.note_public']['checked']))       print_liste_field_titre($arrayfields['f.note_public']['label'], $_SERVER["PHP_SELF"], "f.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	if (!empty($arrayfields['f.note_private']['checked']))       print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	if (!empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['fd.description']['checked'])) print_liste_field_titre($arrayfields['fd.description']['label'], $_SERVER["PHP_SELF"], '');
 	if (!empty($arrayfields['fd.date']['checked']))        print_liste_field_titre($arrayfields['fd.date']['label'], $_SERVER["PHP_SELF"], "fd.date", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -583,6 +603,22 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+		// Note public
+		if (!empty($arrayfields['f.note_public']['checked']))
+		{
+			print '<td class="center">';
+			print dol_escape_htmltag($obj->note_public);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Note private
+		if (!empty($arrayfields['f.note_private']['checked']))
+		{
+			print '<td class="center">';
+			print dol_escape_htmltag($obj->note_private);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Status
 		if (!empty($arrayfields['f.fk_statut']['checked']))
 		{
@@ -650,9 +686,7 @@ if ($resql)
 	$delallowed = $user->rights->ficheinter->creer;
 
 	print $formfile->showdocuments('massfilesarea_interventions', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index b5ef5f91241..42003b8a27a 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('companies', 'interventions'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 0ca948312c6..90d9741fbc3 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -70,7 +70,7 @@ print load_fiche_titre($title, '', 'intervention');
 dol_mkdir($dir);
 
 $stats = new FichinterStats($db, $socid, $mode, ($userid > 0 ? $userid : 0));
-if ($object_status != '' && $object_status > -1) $stats->where .= ' AND c.fk_statut IN ('.$db->escape($object_status).')';
+if ($object_status != '' && $object_status > -1) $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
@@ -81,9 +81,7 @@ 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';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/interventionsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$year.'.png';
 }
@@ -121,9 +119,7 @@ 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';
-}
-else
-{
+} else {
     $filenameamount = $dir.'/interventionsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$year.'.png';
 }
@@ -160,9 +156,7 @@ 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';
-}
-else
-{
+} else {
     $filename_avg = $dir.'/interventionsaverage-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$year.'.png';
 }
@@ -313,8 +307,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     /*print "<br>\n";
     print $px2->show();
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 94ecf930724..8912fd2a299 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (!defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');
-if (!defined('DOL_VERSION')) define('DOL_VERSION', '12.0.3'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (!defined('DOL_VERSION')) define('DOL_VERSION', '13.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (!defined('EURO')) define('EURO', chr(128));
 
@@ -87,9 +87,7 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done
     	// 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
-    {
+    } 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
@@ -114,9 +112,7 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done
 if (!empty($dolibarr_strict_mode))
 {
 	error_reporting(E_ALL | E_STRICT);
-}
-else
-{
+} else {
 	error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
 }
 
@@ -156,8 +152,7 @@ if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
     {
     	$csrfattack = false;
     	if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used
-    	else
-    	{
+    	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;
@@ -247,20 +242,16 @@ define('MAIN_DB_PREFIX', $dolibarr_main_db_prefix);
  */
 // Path to root libraries
 if (!defined('ADODB_PATH')) { define('ADODB_PATH', (!isset($dolibarr_lib_ADODB_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/adodbtime/' : (empty($dolibarr_lib_ADODB_PATH) ? '' : $dolibarr_lib_ADODB_PATH.'/')); }
-if (!defined('FPDF_PATH')) { define('FPDF_PATH', (empty($dolibarr_lib_FPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/fpdf/' : $dolibarr_lib_FPDF_PATH.'/'); }	// Used only for package that can't include tcpdf
 if (!defined('TCPDF_PATH')) { define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/'); }
-if (!defined('FPDI_PATH')) { define('FPDI_PATH', (empty($dolibarr_lib_FPDI_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/fpdfi/' : $dolibarr_lib_FPDI_PATH.'/'); }
 if (!defined('TCPDI_PATH')) { define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH.'/'); }
 if (!defined('NUSOAP_PATH')) { define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH.'/')); }
 if (!defined('PHPEXCEL_PATH')) { define('PHPEXCEL_PATH', (!isset($dolibarr_lib_PHPEXCEL_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/phpoffice/phpexcel/Classes/' : (empty($dolibarr_lib_PHPEXCEL_PATH) ? '' : $dolibarr_lib_PHPEXCEL_PATH.'/')); }
 if (!defined('PHPEXCELNEW_PATH')) { define('PHPEXCELNEW_PATH', (!isset($dolibarr_lib_PHPEXCELNEW_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/phpoffice/PhpSpreadsheet/' : (empty($dolibarr_lib_PHPEXCELNEW_PATH) ? '' : $dolibarr_lib_PHPEXCELNEW_PATH.'/')); }
-if (!defined('GEOIP_PATH')) { define('GEOIP_PATH', (!isset($dolibarr_lib_GEOIP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/geoip/' : (empty($dolibarr_lib_GEOIP_PATH) ? '' : $dolibarr_lib_GEOIP_PATH.'/')); }
 if (!defined('ODTPHP_PATH')) { define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH.'/')); }
 if (!defined('ODTPHP_PATHTOPCLZIP')) { define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/')); }
 if (!defined('JS_CKEDITOR')) { define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR)) ? '' : (empty($dolibarr_js_CKEDITOR) ? '' : $dolibarr_js_CKEDITOR.'/')); }
 if (!defined('JS_JQUERY')) { define('JS_JQUERY', (!isset($dolibarr_js_JQUERY)) ? '' : (empty($dolibarr_js_JQUERY) ? '' : $dolibarr_js_JQUERY.'/')); }
 if (!defined('JS_JQUERY_UI')) { define('JS_JQUERY_UI', (!isset($dolibarr_js_JQUERY_UI)) ? '' : (empty($dolibarr_js_JQUERY_UI) ? '' : $dolibarr_js_JQUERY_UI.'/')); }
-if (!defined('JS_JQUERY_FLOT')) { define('JS_JQUERY_FLOT', (!isset($dolibarr_js_JQUERY_FLOT)) ? '' : (empty($dolibarr_js_JQUERY_FLOT) ? '' : $dolibarr_js_JQUERY_FLOT.'/')); }
 // Other required path
 if (!defined('DOL_DEFAULT_TTF')) { define('DOL_DEFAULT_TTF', (!isset($dolibarr_font_DOL_DEFAULT_TTF)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/Aerial.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF) ? '' : $dolibarr_font_DOL_DEFAULT_TTF)); }
 if (!defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/AerialBd.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD) ? '' : $dolibarr_font_DOL_DEFAULT_TTF_BOLD)); }
@@ -285,8 +276,8 @@ include_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
 //print memory_get_usage();
 
-// If password is encoded, we decode it
-if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))
+// If password is encoded, we decode it. Note: When page is called for install, $dolibarr_main_db_pass may not be defined yet.
+if (!empty($dolibarr_main_db_pass) && preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_db_encrypted_pass))
 {
 	if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
 	{
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index b467fdbd366..9aeef877bab 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -118,7 +118,7 @@ if (empty($reshook))
         $object->oldcopy = dol_clone($object);
 
         // Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 
         if ($ret < 0) $error++;
 
@@ -235,9 +235,7 @@ if ($object->id > 0)
 	if ($action == 'editconditions')
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', -1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'none');
 	}
 	print "</td>";
@@ -254,9 +252,7 @@ if ($object->id > 0)
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'mode_reglement_supplier_id', 'DBIT', 1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'none');
 	}
 	print "</td>";
@@ -334,9 +330,7 @@ if ($object->id > 0)
         {
             $adh->ref = $adh->getFullName($langs);
             print $adh->getNomUrl(1);
-        }
-        else
-        {
+        } else {
             print $langs->trans("ThirdpartyNotLinkedToMember");
         }
         print '</td>';
@@ -372,7 +366,7 @@ if ($object->id > 0)
 	    $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).' '.$text.'</span><br>';
+	    $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>';
@@ -390,7 +384,7 @@ if ($object->id > 0)
 	    $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).' '.$text.'</span><br>';
+	    $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>';
@@ -408,7 +402,7 @@ if ($object->id > 0)
 	    $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).' '.$text.'</span><br>';
+	    $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>';
@@ -419,7 +413,7 @@ if ($object->id > 0)
 	    $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).' '.$text.'</span><br>';
+	    $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>';
@@ -566,9 +560,7 @@ if ($object->id > 0)
 	            if ($obj->dc)
 	            {
 	                print dol_print_date($db->jdate($obj->dc), 'day');
-	            }
-	            else
-	            {
+	            } else {
 	                print "-";
 	            }
 	            print '</td>';
@@ -579,9 +571,7 @@ if ($object->id > 0)
 	        $db->free($resql);
 
 	        if ($num > 0) print "</table>";
-	    }
-	    else
-	    {
+	    } else {
 	        dol_print_error($db);
 	    }
 	}
@@ -605,12 +595,10 @@ if ($object->id > 0)
 		// Show orders we can bill
 		if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
 		{
-			$sql2 .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; //  Must match filter in htdocs/fourn/orderstoinvoice.php
-		}
-		else
-		{
+			$sql2 .= " AND c.fk_statut IN (".$db->sanitize(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY).")"; //  Must match filter in htdocs/fourn/commande/list.php
+		} else {
 			// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
-			$sql2 .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
+			$sql2 .= " AND c.fk_statut IN (".$db->sanitize($db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS)).")";
 		}
 		$sql2 .= " AND c.billed = 0";
 		// Find order that are not already invoiced
@@ -677,9 +665,7 @@ if ($object->id > 0)
 				if ($obj->dc)
 				{
 					print dol_print_date($db->jdate($obj->dc), 'day');
-				}
-				else
-				{
+				} else {
 					print "-";
 				}
 				print '</td>';
@@ -690,9 +676,7 @@ if ($object->id > 0)
 			$db->free($resql);
 
 			if ($num > 0) print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -761,9 +745,7 @@ if ($object->id > 0)
 			}
 			$db->free($resql);
 			if ($num > 0) print '</table>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -813,17 +795,13 @@ if ($object->id > 0)
 		{
 			if (!empty($orders2invoice) && $orders2invoice > 0)
 			{
-				if ($object->status == 1)
-				{
+				if ($object->status == 1) {
 					// Company is open
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-				}
-				else
-				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisSupplier").'</a></div>';
+				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 				}
-			}
-			else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')').'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+			} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')').'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 		}
 
 		if ($user->rights->fournisseur->facture->creer)
@@ -842,9 +820,7 @@ if ($object->id > 0)
         	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
-        	{
+        	} else {
             	print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
         	}
     	}
@@ -870,9 +846,7 @@ if ($object->id > 0)
     	// List of done actions
     	show_actions_done($conf, $langs, $db, $object);
 	}
-}
-else
-{
+} 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 b42c578a783..8c3ca0108e3 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -30,520 +30,519 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
  */
 class SupplierInvoices 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 FactureFournisseur $invoice {@type FactureFournisseur}
-     */
-    public $invoice;
+	/**
+	 * @var FactureFournisseur $invoice {@type FactureFournisseur}
+	 */
+	public $invoice;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-        $this->invoice = new FactureFournisseur($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+		$this->invoice = new FactureFournisseur($this->db);
+	}
 
-    /**
-     * Get properties of a supplier invoice object
-     *
-     * Return an array with supplier invoice information
-     *
-     * @param 	int 	$id ID of supplier invoice
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    public function get($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->lire) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get properties of a supplier invoice object
+	 *
+	 * Return an array with supplier invoice information
+	 *
+	 * @param 	int 	$id ID of supplier invoice
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        $this->invoice->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->invoice);
-    }
-
-    /**
-     * List invoices
-     *
-     * Get a list of supplier invoices
-     *
-     * @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 invoices of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
-     * @param string	$status		      Filter by invoice status : draft | unpaid | paid | cancelled
-     * @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 invoice objects
-     *
-     * @throws RestException
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $status = '', $sqlfilters = '')
-    {
-        global $db;
-
-        $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;
-
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir) $search_sale = DolibarrApiAccess::$user->id;
-
-        $sql = "SELECT t.rowid";
-        // 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 || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t";
-
-        // We need this table joined to the select in order to filter by sale
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-
-        $sql .= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
-        if (!DolibarrApiAccess::$user->rights->societe->client->voir || $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
-
-        // Filter by status
-        if ($status == 'draft') {
-            $sql .= " AND t.fk_statut IN (0)";
-        }
-        if ($status == 'unpaid') {
-            $sql .= " AND t.fk_statut IN (1)";
-        }
-        if ($status == 'paid') {
-            $sql .= " AND t.fk_statut IN (2)";
-        }
-        if ($status == 'cancelled') {
-            $sql .= " AND t.fk_statut IN (3)";
-        }
-        // 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 .= $db->order($sortfield, $sortorder);
-        if ($limit) {
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-        if ($result) {
-            $i = 0;
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $invoice_static = new FactureFournisseur($db);
-                if ($invoice_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($invoice_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve supplier invoice list : '.$db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No supplier invoice found');
-        }
-        return $obj_ret;
-    }
-
-    /**
-     * Create supplier invoice object
-     *
-     * @param array $request_data Request datas
-     *
-     * @return int  ID of supplier invoice
-     *
-     * @throws RestException 401
-     * @throws RestException 500
-     */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-
-        foreach ($request_data as $field => $value) {
-            $this->invoice->$field = $value;
-        }
-        if (!array_key_exists('date', $request_data)) {
-            $this->invoice->date = dol_now();
-        }
-
-        if ($this->invoice->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating order", array_merge(array($this->invoice->error), $this->invoice->errors));
-        }
-        return $this->invoice->id;
-    }
-
-    /**
-     * Update supplier invoice
-     *
-     * @param int   $id             Id of supplier invoice to update
-     * @param array $request_data   Datas
-     *
-     * @return int
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
-            throw new RestException(401);
-        }
-
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
-            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;
-        }
-
-        if ($this->invoice->update($id, DolibarrApiAccess::$user))
-            return $this->get($id);
-
-        return false;
-    }
-
-    /**
-     * Delete supplier invoice
-     *
-     * @param int   $id Supplier invoice ID
-     *
-     * @return array
-     *
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-
-        if ($this->invoice->delete(DolibarrApiAccess::$user) < 0)
-        {
-            throw new RestException(500);
-        }
-
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Supplier invoice deleted'
-            )
-        );
-    }
-
-    /**
-     * Validate an order
-     *
-     * @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
-     *
-     * @return  array
-     *
-     * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 405
-     * @throws RestException 500
-     */
-    public function validate($id, $idwarehouse = 0, $notrigger = 0)
-    {
-        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Invoice not found');
-        }
-
-        if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
-            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);
-        }
-
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Invoice validated (Ref='.$this->invoice->ref.')'
-            )
-        );
-    }
-
-    /**
-     * Get list of payments of a given supplier invoice
-     *
-     * @param int   $id             Id of SupplierInvoice
-     *
-     * @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->fournisseur->facture->lire) {
-            throw new RestException(401);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Invoice ID is mandatory');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
 			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');
-        }
+		$this->invoice->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->invoice);
+	}
 
-        $result = $this->invoice->getListOfPayments();
-        if ($result < 0) {
-            throw new RestException(405, $this->invoice->error);
-        }
+	/**
+	 * List invoices
+	 *
+	 * Get a list of supplier invoices
+	 *
+	 * @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 invoices of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string	$status		      Filter by invoice status : draft | unpaid | paid | cancelled
+	 * @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 invoice objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $status = '', $sqlfilters = '')
+	{
+		global $db;
 
-        return $result;
-    }
+		$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;
+
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir) $search_sale = DolibarrApiAccess::$user->id;
+
+		$sql = "SELECT t.rowid";
+		// 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 || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t";
+
+		// We need this table joined to the select in order to filter by sale
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+
+		$sql .= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir || $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
+
+		// Filter by status
+		if ($status == 'draft') {
+			$sql .= " AND t.fk_statut IN (0)";
+		}
+		if ($status == 'unpaid') {
+			$sql .= " AND t.fk_statut IN (1)";
+		}
+		if ($status == 'paid') {
+			$sql .= " AND t.fk_statut IN (2)";
+		}
+		if ($status == 'cancelled') {
+			$sql .= " AND t.fk_statut IN (3)";
+		}
+		// 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->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);
+				$invoice_static = new FactureFournisseur($this->db);
+				if ($invoice_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($invoice_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve supplier invoice list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No supplier invoice found');
+		}
+		return $obj_ret;
+	}
+
+	/**
+	 * Create supplier invoice object
+	 *
+	 * @param array $request_data Request datas
+	 *
+	 * @return int  ID of supplier invoice
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 500
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		foreach ($request_data as $field => $value) {
+			$this->invoice->$field = $value;
+		}
+		if (!array_key_exists('date', $request_data)) {
+			$this->invoice->date = dol_now();
+		}
+
+		if ($this->invoice->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating order", array_merge(array($this->invoice->error), $this->invoice->errors));
+		}
+		return $this->invoice->id;
+	}
+
+	/**
+	 * Update supplier invoice
+	 *
+	 * @param int   $id             Id of supplier invoice to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			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;
+		}
+
+		if ($this->invoice->update($id, DolibarrApiAccess::$user))
+			return $this->get($id);
+
+		return false;
+	}
+
+	/**
+	 * Delete supplier invoice
+	 *
+	 * @param int   $id Supplier invoice ID
+	 *
+	 * @return array
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if ($this->invoice->delete(DolibarrApiAccess::$user) < 0)
+		{
+			throw new RestException(500);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Supplier invoice deleted'
+			)
+		);
+	}
+
+	/**
+	 * Validate an invoice
+	 *
+	 * @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
+	 *
+	 * @throws RestException 304
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 405
+	 * @throws RestException 500
+	 */
+	public function validate($id, $idwarehouse = 0, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Invoice not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			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. The invoice is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Invoice validated (Ref='.$this->invoice->ref.')'
+			)
+		);
+	}
+
+	/**
+	 * Get list of payments of a given supplier invoice
+	 *
+	 * @param int   $id             Id of SupplierInvoice
+	 *
+	 * @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->fournisseur->facture->lire) {
+			throw new RestException(401);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			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 supplier 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     $paiementid         {@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 (optional)
-     * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if paiementcode = '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, $paiementid, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
-    {
-        global $conf;
+	/**
+	 * Add payment line to a specific supplier 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     $payment_mode_id    {@from body}  Payment mode ID (look it up via REST GET to /setup/dictionary/payment_types) {@min 1}
+	 * @param string  $closepaidinvoices  {@from body}  Close paid invoices {@choice yes,no}
+	 * @param int     $accountid          {@from body}  Bank account ID (look it up via REST GET to /bankaccounts) {@min 1}
+	 * @param string  $num_payment        {@from body}  Payment number (optional)
+	 * @param string  $comment            {@from body}  Note (optional)
+	 * @param string  $chqemetteur        {@from body}  Payment issuer (mandatory if payment_mode_id corresponds to 'CHQ'-payment type)
+	 * @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, $payment_mode_id, $closepaidinvoices, $accountid, $num_payment = '', $comment = '', $chqemetteur = '', $chqbank = '')
+	{
+		global $conf;
 
-        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
-            throw new RestException(403);
-        }
-        if (empty($id)) {
-            throw new RestException(400, 'Invoice ID is mandatory');
-        }
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+			throw new RestException(403);
+		}
+		if (empty($id)) {
+			throw new RestException(400, 'Invoice ID is mandatory');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			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 (!empty($conf->banque->enabled)) {
+			if (empty($accountid)) {
+				throw new RestException(400, 'Bank account ID is mandatory');
+			}
+		}
 
-        if (empty($paiementid)) {
-            throw new RestException(400, 'Paiement ID or Paiement Code is mandatory');
-        }
+		if (empty($payment_mode_id)) {
+			throw new RestException(400, 'Payment mode ID is mandatory');
+		}
 
 
-        $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');
+		}
 
-        // Calculate amount to pay
-        $totalpaye = $this->invoice->getSommePaiement();
-        $totaldeposits = $this->invoice->getSumDepositsUsed();
-        $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totaldeposits, 'MT');
+		// Calculate amount to pay
+		$totalpaye = $this->invoice->getSommePaiement();
+		$totaldeposits = $this->invoice->getSumDepositsUsed();
+		$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totaldeposits, 'MT');
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $amounts = array();
-        $multicurrency_amounts = array();
+		$amounts = array();
+		$multicurrency_amounts = array();
 
-        $resteapayer = price2num($resteapayer, 'MT');
-        $amounts[$id] = $resteapayer;
+		$resteapayer = price2num($resteapayer, 'MT');
+		$amounts[$id] = $resteapayer;
 
-        // Multicurrency
-        $newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
-        $multicurrency_amounts[$id] = $newvalue;
+		// Multicurrency
+		$newvalue = price2num($this->invoice->multicurrency_total_ttc, 'MT');
+		$multicurrency_amounts[$id] = $newvalue;
 
-        // Creation of payment line
-        $paiement = new PaiementFourn($this->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 = $paiementid;
-        $paiement->paiementcode = dol_getIdFromCode($this->db, $paiementid, 'c_paiement', 'id', 'code', 1);
-        $paiement->oper = $paiement->paiementcode;	// For backward compatibility
-        $paiement->num_payment = $num_payment;
-        $paiement->note_public = $comment;
+		// Creation of payment line
+		$paiement = new PaiementFourn($this->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 = $payment_mode_id;
+		$paiement->paiementcode = dol_getIdFromCode($this->db, $payment_mode_id, 'c_paiement', 'id', 'code', 1);
+		$paiement->oper = $paiement->paiementcode; // For backward compatibility
+		$paiement->num_payment = $num_payment;
+		$paiement->note_public = $comment;
 
-        $paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-        if ($paiement_id < 0)
-        {
-            $this->db->rollback();
-            throw new RestException(400, 'Payment error : '.$paiement->error);
-        }
+		$paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
+		if ($paiement_id < 0)
+		{
+			$this->db->rollback();
+			throw new RestException(400, 'Payment error : '.$paiement->error);
+		}
 
-        if (!empty($conf->banque->enabled)) {
-            $result = $paiement->addPaymentToBank(DolibarrApiAccess::$user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, $chqemetteur, $chqbank);
-            if ($result < 0)
-            {
-                $this->db->rollback();
-                throw new RestException(400, 'Add payment to bank error : '.$paiement->error);
-            }
-        }
+		if (!empty($conf->banque->enabled)) {
+			$result = $paiement->addPaymentToBank(DolibarrApiAccess::$user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, $chqemetteur, $chqbank);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				throw new RestException(400, 'Add payment to bank error : '.$paiement->error);
+			}
+		}
 
-        $this->db->commit();
+		$this->db->commit();
 
-        return $paiement_id;
-    }
+		return $paiement_id;
+	}
 
-    /**
-     * Get lines of a supplier invoice
-     *
-     * @param int   $id             Id of supplier invoice
-     *
-     * @url	GET {id}/lines
-     *
-     * @return array
-     */
-    public function getLines($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Get lines of a supplier invoice
+	 *
+	 * @param int   $id             Id of supplier invoice
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return array
+	 */
+	public function getLines($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->invoice->fetch_lines();
-        $result = array();
-        foreach ($this->invoice->lines as $line) {
-            array_push($result, $this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->invoice->fetch_lines();
+		$result = array();
+		foreach ($this->invoice->lines as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
 
-    /**
-     * Add a line to given supplier invoice
-     *
-     * @param int   $id             Id of supplier invoice to update
-     * @param array $request_data   supplier invoice line data
-     *
-     * @url	POST {id}/lines
-     *
-     * @return int|bool
-     */
-    public function postLine($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Add a line to given supplier invoice
+	 *
+	 * @param int   $id             Id of supplier invoice to update
+	 * @param array $request_data   supplier invoice line data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int|bool
+	 */
+	public function postLine($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
 
-        $updateRes = $this->invoice->addline(
-            $request_data->description,
-    		$request_data->pu_ht,
+		$updateRes = $this->invoice->addline(
+			$request_data->description,
+			$request_data->pu_ht,
 			$request_data->tva_tx,
-    		$request_data->localtax1_tx,
-    		$request_data->localtax2_tx,
-    		$request_data->qty,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->qty,
 			$request_data->fk_product,
 			$request_data->remise_percent,
 			$request_data->date_start,
@@ -560,54 +559,53 @@ class SupplierInvoices extends DolibarrApi
 			$request_data->multicurrency_subprice,
 			$request_data->ref_supplier,
 			$request_data->special_code
-        );
+		);
 
-        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;
+	}
 
-    /**
-     * Update a line to a given supplier invoice
-     *
-     * @param int   $id             Id of supplier invoice to update
-     * @param int   $lineid         Id of line to update
-     * @param array $request_data   InvoiceLine data
-     *
-     * @url	PUT {id}/lines/{lineid}
-     *
-     * @return object
-     *
-     * @throws 200
-     * @throws 304
-     * @throws 401
-     * @throws 404
-     */
-    public function putLine($id, $lineid, $request_data = null)
-    {
-    	if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
-            throw new RestException(401);
-        }
+	/**
+	 * Update a line to a given supplier invoice
+	 *
+	 * @param int   $id             Id of supplier invoice to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   InvoiceLine data
+	 *
+	 * @url	PUT {id}/lines/{lineid}
+	 *
+	 * @return object
+	 *
+	 * @throws RestException 401 Not allowed
+	 * @throws RestException 404 Not found
+	 * @throws RestException 304 Error
+	 */
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-    	$request_data = (object) $request_data;
-        $updateRes = $this->invoice->updateline(
-    		$lineid,
-    		$request_data->description,
-    		$request_data->pu_ht,
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->invoice->updateline(
+			$lineid,
+			$request_data->description,
+			$request_data->pu_ht,
 			$request_data->tva_tx,
-    		$request_data->localtax1_tx,
-    		$request_data->localtax2_tx,
-    		$request_data->qty,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->qty,
 			$request_data->fk_product,
 			'HT',
 			$request_data->info_bits,
@@ -620,100 +618,98 @@ class SupplierInvoices extends DolibarrApi
 			$request_data->fk_unit,
 			$request_data->multicurrency_subprice,
 			$request_data->ref_supplier
-    	);
+		);
 
-    	if ($updateRes > 0) {
-    		$result = $this->get($id);
-    		unset($result->line);
-    		return $this->_cleanObjectDatas($result);
-	    } else {
-	    	throw new RestException(304, $this->invoice->error);
-    	}
-    }
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		} else {
+			throw new RestException(304, $this->invoice->error);
+		}
+	}
 
 	/**
-     * Deletes a line of a given supplier invoice
-     *
-     * @param int   $id             Id of supplier invoice
-     * @param int   $lineid 		Id of the line to delete
-     *
-     * @url     DELETE {id}/lines/{lineid}
-     *
-     * @return array
-     *
-     * @throws 400
-     * @throws 401
-     * @throws 404
-     * @throws 405
-     */
-    public function deleteLine($id, $lineid)
-    {
+	 * Deletes a line of a given supplier invoice
+	 *
+	 * @param int   $id             Id of supplier invoice
+	 * @param int   $lineid 		Id of the line to delete
+	 *
+	 * @url     DELETE {id}/lines/{lineid}
+	 *
+	 * @return array
+	 *
+	 * @throws RestException 400 Bad parameters
+	 * @throws RestException 401 Not allowed
+	 * @throws RestException 404 Not found
+	 * @throws RestException 405 Error
+	 */
+	public function deleteLine($id, $lineid)
+	{
 		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
-            throw new RestException(401);
-        }
+			throw new RestException(401);
+		}
 
 		$result = $this->invoice->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
+		if (!$result) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
 
-    	if (empty($lineid)) {
-    		throw new RestException(400, 'Line ID is mandatory');
-    	}
+		if (empty($lineid)) {
+			throw new RestException(400, 'Line ID is mandatory');
+		}
 
-    	if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
+			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
 
-    	$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);
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   Object  $object    Object to clean
-     * @return  array              Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object    Object to clean
+	 * @return  array              Array of cleaned object properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->rowid);
-        unset($object->barcode_type);
-        unset($object->barcode_type_code);
-        unset($object->barcode_type_label);
-        unset($object->barcode_type_coder);
+		unset($object->rowid);
+		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   Datas to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    private function _validate($data)
-    {
-        $invoice = array();
-        foreach (SupplierInvoices::$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 $data   Datas to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	private function _validate($data)
+	{
+		$invoice = array();
+		foreach (SupplierInvoices::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$invoice[$field] = $data[$field];
+		}
+		return $invoice;
+	}
 }
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 9e22d952920..0fd06790011 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -149,7 +149,7 @@ class SupplierOrders extends DolibarrApi
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-		$sql .= $db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
 			if ($page < 0)
 			{
@@ -157,27 +157,26 @@ class SupplierOrders extends DolibarrApi
 			}
 			$offset = $limit * $page;
 
-			$sql .= $db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
-		$result = $db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			$i = 0;
-			$num = $db->num_rows($result);
+			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			while ($i < $min)
 			{
-				$obj = $db->fetch_object($result);
-				$order_static = new CommandeFournisseur($db);
+				$obj = $this->db->fetch_object($result);
+				$order_static = new CommandeFournisseur($this->db);
 				if ($order_static->fetch($obj->rowid)) {
 					$obj_ret[] = $this->_cleanObjectDatas($order_static);
 				}
 				$i++;
 			}
-		}
-		else {
-			throw new RestException(503, 'Error when retrieve supplier order list : '.$db->lasterror());
+		} else {
+			throw new RestException(503, 'Error when retrieve supplier order list : '.$this->db->lasterror());
 		}
 		if (!count($obj_ret)) {
 			throw new RestException(404, 'No supplier order found');
@@ -188,6 +187,8 @@ class SupplierOrders extends DolibarrApi
 	/**
 	 * Create supplier order object
 	 *
+	 * Example: {"ref": "auto", "ref_supplier": "1234", "socid": "1", "multicurrency_code": "SEK", "multicurrency_tx": 1, "tva_tx": 25, "note": "Imported via the REST API"}
+	 *
 	 * @param array $request_data   Request datas
 	 * @return int  ID of supplier order
 	 */
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 30995b3b0df..e9ba334313c 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -95,9 +95,7 @@ class Fournisseur extends Societe
 		{
 			$obj = $this->db->fetch_object($resql);
 			return $obj->nb;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -136,9 +134,7 @@ class Fournisseur extends Societe
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -166,9 +162,7 @@ class Fournisseur extends Societe
 		{
 			dol_syslog("Fournisseur::CreateCategory : Success");
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog("Fournisseur::CreateCategory : Failed (".$this->error.")");
 			return -1;
@@ -204,9 +198,7 @@ class Fournisseur extends Societe
 			{
 				$arr[$obj->rowid] = $obj->name;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 		}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index dd6f6d8ac13..f354b89186d 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -42,22 +42,22 @@ require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
  */
 class CommandeFournisseur extends CommonOrder
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'order_supplier';
 
-    /**
+	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
 	public $table_element = 'commande_fournisseur';
 
-    /**
+	/**
 	 * @var int    Name of subtable line
 	 */
 	public $table_element_line = 'commande_fournisseurdet';
 
-    /**
+	/**
 	 * @var int Field with ID of parent key if this field has a parent
 	 */
 	public $fk_element = 'fk_commande';
@@ -67,24 +67,24 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public $picto = 'supplier_order';
 
-    /**
-     * 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;
 
-    /**
-     * 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}
-     */
-    protected $table_ref_field = 'ref';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
@@ -93,75 +93,70 @@ class CommandeFournisseur extends CommonOrder
 	 * Supplier order reference
 	 * @var string
 	 */
-    public $ref;
+	public $ref;
 
-    public $ref_supplier;
-    public $brouillon;
-    public $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Ordered/Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
-    //                                                                                          -> 7=Canceled/Never received -> (reopen) 3=Process runing
-    //									                            -> 6=Canceled -> (reopen) 2=Approved
-    //  		                                      -> 9=Refused  -> (reopen) 1=Validated
-    //  Note: billed or not is on another field "billed"
-    public $statuts; // List of status
+	public $ref_supplier;
+	public $brouillon;
+	public $statut; // 0=Draft -> 1=Validated -> 2=Approved -> 3=Ordered/Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
+	//                                                                                          -> 7=Canceled/Never received -> (reopen) 3=Process runing
+	//									                            -> 6=Canceled -> (reopen) 2=Approved
+	//  		                                      -> 9=Refused  -> (reopen) 1=Validated
+	//  Note: billed or not is on another field "billed"
+	public $statuts; // List of status
 
-    public $billed;
+	public $billed;
 
-    public $socid;
-    public $fourn_id;
-    public $date;
-    public $date_valid;
-    public $date_approve;
-    public $date_approve2; // Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
-    public $date_commande;
+	public $socid;
+	public $fourn_id;
+	public $date;
+	public $date_valid;
+	public $date_approve;
+	public $date_approve2; // Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
+	public $date_commande;
 
-    /**
-     * Delivery date
-     */
-    public $date_livraison;
+	/**
+	 * Delivery date
+	 */
+	public $date_livraison;
 
-    public $total_ht;
-    public $total_tva;
-    public $total_localtax1; // Total Local tax 1
-    public $total_localtax2; // Total Local tax 2
-    public $total_ttc;
-    public $source;
+	public $total_ht;
+	public $total_tva;
+	public $total_localtax1; // Total Local tax 1
+	public $total_localtax2; // Total Local tax 2
+	public $total_ttc;
+	public $source;
 
 	/**
 	 * @deprecated
 	 * @see $note_private, $note_public
 	 */
-    public $note;
+	public $note;
 
 	public $note_private;
-    public $note_public;
-    public $model_pdf;
+	public $note_public;
+	public $model_pdf;
 
-    /**
-     * @var int ID
-     */
-    public $fk_project;
+	/**
+	 * @var int ID
+	 */
+	public $fk_project;
 
-    public $cond_reglement_id;
-    public $cond_reglement_code;
+	public $cond_reglement_id;
+	public $cond_reglement_code;
 
-    /**
-     * @var int ID
-     */
-    public $fk_account;
+	/**
+	 * @var int ID
+	 */
+	public $fk_account;
 
-    public $mode_reglement_id;
-    public $mode_reglement_code;
-    public $user_author_id;
-    public $user_valid_id;
-    public $user_approve_id;
-    public $user_approve_id2; // Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
+	public $mode_reglement_id;
+	public $mode_reglement_code;
+	public $user_author_id;
+	public $user_valid_id;
+	public $user_approve_id;
+	public $user_approve_id2; // Used when SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set
 
-	//Incoterms
-    public $fk_incoterms;
-    public $location_incoterms;
-    public $label_incoterms; //Used into tooltip
-
-    public $extraparams = array();
+	public $extraparams = array();
 
 	/**
 	 * @var CommandeFournisseurLigne[]
@@ -169,74 +164,74 @@ class CommandeFournisseur extends CommonOrder
 	public $lines = array();
 
 	//Add for supplier_proposal
-    public $origin;
-    public $origin_id;
-    public $linked_objects = array();
+	public $origin;
+	public $origin_id;
+	public $linked_objects = array();
 
 	// Multicurrency
 	/**
-     * @var int ID
-     */
-    public $fk_multicurrency;
+	 * @var int ID
+	 */
+	public $fk_multicurrency;
 
-    public $multicurrency_code;
-    public $multicurrency_tx;
-    public $multicurrency_total_ht;
-    public $multicurrency_total_tva;
-    public $multicurrency_total_ttc;
+	public $multicurrency_code;
+	public $multicurrency_tx;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
 
 
 
-    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),
-    	'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-    	'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>25),
-    	'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>30, 'index'=>1),
-    	'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>35),
-    	'ref_supplier' =>array('type'=>'varchar(255)', 'label'=>'RefSupplier', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-    	'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-    	'date_creation' =>array('type'=>'datetime', 'label'=>'Date creation', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-    	'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-    	'date_approve' =>array('type'=>'datetime', 'label'=>'Date approve', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-    	'date_approve2' =>array('type'=>'datetime', 'label'=>'Date approve2', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-    	'date_commande' =>array('type'=>'date', 'label'=>'Date commande', 'enabled'=>1, 'visible'=>-1, 'position'=>70),
-    	'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-    	'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>80),
-    	'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-    	'fk_user_approve' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserApproval', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-    	'fk_user_approve2' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserSecondApproval', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-    	'source' =>array('type'=>'smallint(6)', 'label'=>'Source', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>100),
-    	'billed' =>array('type'=>'smallint(6)', 'label'=>'Billed', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-    	'amount_ht' =>array('type'=>'double(24,8)', 'label'=>'Amount ht', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-    	'remise_percent' =>array('type'=>'double', 'label'=>'Remise percent', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
-    	'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-    	'tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>-1, 'position'=>130, 'isameasure'=>1),
-    	'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>135, 'isameasure'=>1),
-    	'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>140, 'isameasure'=>1),
-    	'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>145, 'isameasure'=>1),
-    	'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>150, 'isameasure'=>1),
-    	'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>155),
-    	'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>160),
-    	'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>165),
-    	'fk_input_method' =>array('type'=>'integer', 'label'=>'InputMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-    	'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
-    	'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
-    	'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-    	'date_livraison' =>array('type'=>'datetime', 'label'=>'DeliveryDate', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-    	'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>1, 'visible'=>-1, 'position'=>200),
-    	'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
-    	'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
-    	'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-    	'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'MulticurrencyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>220),
-    	'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
-    	'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>230),
-    	'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>235),
-    	'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>240),
-    	'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>245),
-    	'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
-    	'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
-    );
+	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),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
+		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>25),
+		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>30, 'index'=>1),
+		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>35),
+		'ref_supplier' =>array('type'=>'varchar(255)', 'label'=>'RefSupplier', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
+		'date_creation' =>array('type'=>'datetime', 'label'=>'Date creation', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
+		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
+		'date_approve' =>array('type'=>'datetime', 'label'=>'Date approve', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
+		'date_approve2' =>array('type'=>'datetime', 'label'=>'Date approve2', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
+		'date_commande' =>array('type'=>'date', 'label'=>'Date commande', 'enabled'=>1, 'visible'=>-1, 'position'=>70),
+		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
+		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>80),
+		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
+		'fk_user_approve' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserApproval', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
+		'fk_user_approve2' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserSecondApproval', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
+		'source' =>array('type'=>'smallint(6)', 'label'=>'Source', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>100),
+		'billed' =>array('type'=>'smallint(6)', 'label'=>'Billed', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
+		'amount_ht' =>array('type'=>'double(24,8)', 'label'=>'Amount ht', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
+		'remise_percent' =>array('type'=>'double', 'label'=>'Remise percent', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
+		'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
+		'tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>-1, 'position'=>130, 'isameasure'=>1),
+		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>135, 'isameasure'=>1),
+		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>140, 'isameasure'=>1),
+		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>145, 'isameasure'=>1),
+		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>150, 'isameasure'=>1),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>155),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>160),
+		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>165),
+		'fk_input_method' =>array('type'=>'integer', 'label'=>'InputMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
+		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
+		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
+		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
+		'date_livraison' =>array('type'=>'datetime', 'label'=>'DeliveryDate', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
+		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>1, 'visible'=>-1, 'position'=>200),
+		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
+		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
+		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
+		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'MulticurrencyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>220),
+		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
+		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>230),
+		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>235),
+		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>240),
+		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>245),
+		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
+		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
+	);
 
 
 	/**
@@ -288,111 +283,112 @@ class CommandeFournisseur extends CommonOrder
 
 
 	/**
-     * 	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->products = array();
-    }
+		$this->products = array();
+	}
 
 
-    /**
-     *	Get object and lines from database
-     *
-     * 	@param	int		$id			Id of order to load
-     * 	@param	string	$ref		Ref of object
-     *	@return int 		        >0 if OK, <0 if KO, 0 if not found
-     */
-    public function fetch($id, $ref = '')
-    {
-        global $conf;
+	/**
+	 *	Get object and lines from database
+	 *
+	 * 	@param	int		$id			Id of order to load
+	 * 	@param	string	$ref		Ref of object
+	 *	@return int 		        >0 if OK, <0 if KO, 0 if not found
+	 */
+	public function fetch($id, $ref = '')
+	{
+		global $conf;
 
-        // Check parameters
-        if (empty($id) && empty($ref)) return -1;
+		// Check parameters
+		if (empty($id) && empty($ref)) return -1;
 
-        $sql = "SELECT c.rowid, c.entity, c.ref, ref_supplier, c.fk_soc, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_vat,";
-        $sql .= " c.localtax1, c.localtax2, ";
-        $sql .= " c.date_creation, c.date_valid, c.date_approve, c.date_approve2,";
-        $sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve, c.fk_user_approve2,";
-        $sql .= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
-        $sql .= " c.fk_account,";
-        $sql .= " c.note_private, c.note_public, c.model_pdf, c.extraparams, c.billed,";
-        $sql .= " c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc,";
-        $sql .= " cm.libelle as methode_commande,";
-        $sql .= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc,";
-        $sql .= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle";
-        $sql .= ', c.fk_incoterms, c.location_incoterms';
-        $sql .= ', i.libelle as label_incoterms';
-        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON c.fk_cond_reglement = cr.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON c.fk_mode_reglement = p.id";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_input_method as cm ON cm.rowid = c.fk_input_method";
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
+		$sql = "SELECT c.rowid, c.entity, c.ref, ref_supplier, c.fk_soc, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.tva as total_vat,";
+		$sql .= " c.localtax1, c.localtax2, ";
+		$sql .= " c.date_creation, c.date_valid, c.date_approve, c.date_approve2,";
+		$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve, c.fk_user_approve2,";
+		$sql .= " c.date_commande as date_commande, c.date_livraison as date_livraison, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
+		$sql .= " c.fk_account,";
+		$sql .= " c.note_private, c.note_public, c.model_pdf, c.extraparams, c.billed,";
+		$sql .= " c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva, c.multicurrency_total_ttc,";
+		$sql .= " cm.libelle as methode_commande,";
+		$sql .= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc,";
+		$sql .= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle";
+		$sql .= ', c.fk_incoterms, c.location_incoterms';
+		$sql .= ', i.libelle as label_incoterms';
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON c.fk_cond_reglement = cr.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON c.fk_mode_reglement = p.id";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_input_method as cm ON cm.rowid = c.fk_input_method";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
 
-        if (empty($id)) $sql .= " WHERE c.entity IN (".getEntity('supplier_order').")";
-        else $sql .= " WHERE c.rowid=".$id;
+		if (empty($id)) $sql .= " WHERE c.entity IN (".getEntity('supplier_order').")";
+		else $sql .= " WHERE c.rowid=".$id;
 
-        if ($ref) $sql .= " AND c.ref='".$this->db->escape($ref)."'";
+		if ($ref) $sql .= " AND c.ref='".$this->db->escape($ref)."'";
 
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if (!$obj)
-            {
-                $this->error = 'Bill with id '.$id.' not found';
-                dol_syslog(get_class($this).'::fetch '.$this->error);
-                return 0;
-            }
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if (!$obj)
+			{
+				$this->error = 'Bill with id '.$id.' not found';
+				dol_syslog(get_class($this).'::fetch '.$this->error);
+				return 0;
+			}
 
-            $this->id = $obj->rowid;
-            $this->entity = $obj->entity;
+			$this->id = $obj->rowid;
+			$this->entity = $obj->entity;
 
-            $this->ref = $obj->ref;
-            $this->ref_supplier = $obj->ref_supplier;
-            $this->socid = $obj->fk_soc;
-            $this->fourn_id = $obj->fk_soc;
-            $this->statut				= $obj->fk_statut;
-            $this->status				= $obj->fk_statut;
-            $this->billed				= $obj->billed;
-            $this->user_author_id = $obj->fk_user_author;
-            $this->user_valid_id = $obj->fk_user_valid;
-            $this->user_approve_id = $obj->fk_user_approve;
-            $this->user_approve_id2 = $obj->fk_user_approve2;
-            $this->total_ht				= $obj->total_ht;
-            $this->total_tva			= $obj->total_vat;
-            $this->total_localtax1		= $obj->localtax1;
-            $this->total_localtax2		= $obj->localtax2;
-            $this->total_ttc			= $obj->total_ttc;
-            $this->date = $this->db->jdate($obj->date_creation);
-            $this->date_valid = $this->db->jdate($obj->date_valid);
-            $this->date_approve			= $this->db->jdate($obj->date_approve);
-            $this->date_approve2		= $this->db->jdate($obj->date_approve2);
-            $this->date_commande		= $this->db->jdate($obj->date_commande); // date we make the order to supplier
+			$this->ref = $obj->ref;
+			$this->ref_supplier = $obj->ref_supplier;
+			$this->socid = $obj->fk_soc;
+			$this->fourn_id = $obj->fk_soc;
+			$this->statut				= $obj->fk_statut;
+			$this->status				= $obj->fk_statut;
+			$this->billed				= $obj->billed;
+			$this->user_author_id = $obj->fk_user_author;
+			$this->user_valid_id = $obj->fk_user_valid;
+			$this->user_approve_id = $obj->fk_user_approve;
+			$this->user_approve_id2 = $obj->fk_user_approve2;
+			$this->total_ht				= $obj->total_ht;
+			$this->total_tva			= $obj->total_vat;
+			$this->total_localtax1		= $obj->localtax1;
+			$this->total_localtax2		= $obj->localtax2;
+			$this->total_ttc			= $obj->total_ttc;
+			$this->date = $this->db->jdate($obj->date_creation);
+			$this->date_valid = $this->db->jdate($obj->date_valid);
+			$this->date_approve			= $this->db->jdate($obj->date_approve);
+			$this->date_approve2		= $this->db->jdate($obj->date_approve2);
+			$this->date_commande		= $this->db->jdate($obj->date_commande); // date we make the order to supplier
 			$this->date_livraison = $this->db->jdate($obj->date_livraison);
-            $this->remise_percent = $obj->remise_percent;
-            $this->methode_commande_id = $obj->fk_input_method;
-            $this->methode_commande = $obj->methode_commande;
+			$this->remise_percent = $obj->remise_percent;
+			$this->methode_commande_id = $obj->fk_input_method;
+			$this->methode_commande = $obj->methode_commande;
 
-            $this->source = $obj->source;
-            $this->fk_project = $obj->fk_project;
-            $this->cond_reglement_id = $obj->fk_cond_reglement;
-            $this->cond_reglement_code = $obj->cond_reglement_code;
-            $this->cond_reglement = $obj->cond_reglement_libelle;
-            $this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
-            $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->note = $obj->note_private; // deprecated
-            $this->note_private = $obj->note_private;
-            $this->note_public = $obj->note_public;
-            $this->modelpdf = $obj->model_pdf;
+			$this->source = $obj->source;
+			$this->fk_project = $obj->fk_project;
+			$this->cond_reglement_id = $obj->fk_cond_reglement;
+			$this->cond_reglement_code = $obj->cond_reglement_code;
+			$this->cond_reglement = $obj->cond_reglement_libelle;
+			$this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
+			$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->note = $obj->note_private; // deprecated
+			$this->note_private = $obj->note_private;
+			$this->note_public = $obj->note_public;
+			$this->model_pdf = $obj->model_pdf;
+			$this->modelpdf = $obj->model_pdf;	// deprecated
 
 			//Incoterms
 			$this->fk_incoterms = $obj->fk_incoterms;
@@ -407,113 +403,109 @@ class CommandeFournisseur extends CommonOrder
 			$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 			$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-            $this->extraparams = (array) json_decode($obj->extraparams, true);
+			$this->extraparams = (array) json_decode($obj->extraparams, true);
 
-            $this->db->free($resql);
+			$this->db->free($resql);
 
-            // Retreive all extrafield
-            // fetch optionals attributes and labels
-            $this->fetch_optionals();
+			// Retreive all extrafield
+			// fetch optionals attributes and labels
+			$this->fetch_optionals();
 
-            if ($this->statut == 0) $this->brouillon = 1;
+			if ($this->statut == 0) $this->brouillon = 1;
 
-            /*
+			/*
              * Lines
              */
-            $result = $this->fetch_lines();
-            if ($result < 0)
-            {
-            	return -1;
-            }
-            else
-            {
-            	return 1;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->error()." sql=".$sql;
-            return -1;
-        }
-    }
+			$result = $this->fetch_lines();
+			if ($result < 0)
+			{
+				return -1;
+			} else {
+				return 1;
+			}
+		} else {
+			$this->error = $this->db->error()." sql=".$sql;
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Load array lines
-     *
-     * @param		int		$only_product	Return only physical products
-     * @return		int						<0 if KO, >0 if OK
-     */
-    public function fetch_lines($only_product = 0)
-    {
-    	global $conf;
-        // phpcs:enable
-    	//$result=$this->fetch_lines();
-    	$this->lines = array();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Load array lines
+	 *
+	 * @param		int		$only_product	Return only physical products
+	 * @return		int						<0 if KO, >0 if OK
+	 */
+	public function fetch_lines($only_product = 0)
+	{
+		global $conf;
+		// phpcs:enable
+		//$result=$this->fetch_lines();
+		$this->lines = array();
 
-    	$sql = "SELECT l.rowid, l.ref as ref_supplier, l.fk_product, l.product_type, l.label, l.description, l.qty,";
-    	$sql .= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
-    	$sql .= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
-    	$sql .= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
-    	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
-    	$sql .= " l.fk_unit,";
-    	$sql .= " l.date_start, l.date_end,";
-    	$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
+		$sql = "SELECT l.rowid, l.ref as ref_supplier, l.fk_product, l.product_type, l.label, l.description, l.qty,";
+		$sql .= " l.vat_src_code, l.tva_tx, l.remise_percent, l.subprice,";
+		$sql .= " l.localtax1_tx, l. localtax2_tx, l.localtax1_type, l. localtax2_type, l.total_localtax1, l.total_localtax2,";
+		$sql .= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,";
+		$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,";
+		$sql .= " l.fk_unit,";
+		$sql .= " l.date_start, l.date_end,";
+		$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
 			$sql .= ", pfp.rowid as fk_pfp, pfp.packaging";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
-    	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet	as l";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON l.fk_product = pfp.fk_product and l.ref = pfp.ref_fourn";
-    	$sql .= " WHERE l.fk_commande = ".$this->id;
-    	if ($only_product) $sql .= ' AND p.fk_product_type = 0';
-    	$sql .= " ORDER BY l.rang, l.rowid";
-    	//print $sql;
+		$sql .= " WHERE l.fk_commande = ".$this->id;
+		if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+		$sql .= " ORDER BY l.rang, l.rowid";
+		//print $sql;
 
-    	dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-    		$num = $this->db->num_rows($result);
-    		$i = 0;
+		dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
 
-    		while ($i < $num)
-    		{
-    			$objp = $this->db->fetch_object($result);
+			while ($i < $num)
+			{
+				$objp = $this->db->fetch_object($result);
 
-    			$line = new CommandeFournisseurLigne($this->db);
+				$line = new CommandeFournisseurLigne($this->db);
 
-    			$line->id                  = $objp->rowid;
-    			$line->desc                = $objp->description;
-    			$line->description         = $objp->description;
-    			$line->qty                 = $objp->qty;
-    			$line->tva_tx              = $objp->tva_tx;
-    			$line->localtax1_tx		   = $objp->localtax1_tx;
-    			$line->localtax2_tx		   = $objp->localtax2_tx;
-    			$line->localtax1_type	   = $objp->localtax1_type;
-    			$line->localtax2_type	   = $objp->localtax2_type;
-    			$line->subprice            = $objp->subprice;
-    			$line->pu_ht = $objp->subprice;
-    			$line->remise_percent      = $objp->remise_percent;
+				$line->id                  = $objp->rowid;
+				$line->desc                = $objp->description;
+				$line->description         = $objp->description;
+				$line->qty                 = $objp->qty;
+				$line->tva_tx              = $objp->tva_tx;
+				$line->localtax1_tx		   = $objp->localtax1_tx;
+				$line->localtax2_tx		   = $objp->localtax2_tx;
+				$line->localtax1_type	   = $objp->localtax1_type;
+				$line->localtax2_type	   = $objp->localtax2_type;
+				$line->subprice            = $objp->subprice;
+				$line->pu_ht = $objp->subprice;
+				$line->remise_percent      = $objp->remise_percent;
 
-    			$line->vat_src_code        = $objp->vat_src_code;
-    			$line->total_ht            = $objp->total_ht;
-    			$line->total_tva           = $objp->total_tva;
-    			$line->total_localtax1	   = $objp->total_localtax1;
-    			$line->total_localtax2	   = $objp->total_localtax2;
-    			$line->total_ttc           = $objp->total_ttc;
-    			$line->product_type        = $objp->product_type;
+				$line->vat_src_code        = $objp->vat_src_code;
+				$line->total_ht            = $objp->total_ht;
+				$line->total_tva           = $objp->total_tva;
+				$line->total_localtax1	   = $objp->total_localtax1;
+				$line->total_localtax2	   = $objp->total_localtax2;
+				$line->total_ttc           = $objp->total_ttc;
+				$line->product_type        = $objp->product_type;
 
-    			$line->fk_product          = $objp->fk_product;
+				$line->fk_product          = $objp->fk_product;
 
-    			$line->libelle             = $objp->product_label; // deprecated
-    			$line->product_label       = $objp->product_label;
-    			$line->product_desc        = $objp->product_desc;
+				$line->libelle             = $objp->product_label; // deprecated
+				$line->product_label       = $objp->product_label;
+				$line->product_desc        = $objp->product_desc;
 
-    			$line->ref                 = $objp->product_ref; // Ref of product
-    			$line->product_ref         = $objp->product_ref; // Ref of product
-    			$line->ref_fourn           = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
-    			$line->ref_supplier        = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
+				$line->ref                 = $objp->product_ref; // Ref of product
+				$line->product_ref         = $objp->product_ref; // Ref of product
+				$line->ref_fourn           = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
+				$line->ref_supplier        = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
 				{
@@ -522,784 +514,740 @@ class CommandeFournisseur extends CommonOrder
 				}
 
 				$line->date_start = $this->db->jdate($objp->date_start);
-    			$line->date_end            = $this->db->jdate($objp->date_end);
-    			$line->fk_unit             = $objp->fk_unit;
+				$line->date_end            = $this->db->jdate($objp->date_end);
+				$line->fk_unit             = $objp->fk_unit;
 
-    			// Multicurrency
-    			$line->fk_multicurrency = $objp->fk_multicurrency;
-    			$line->multicurrency_code = $objp->multicurrency_code;
-    			$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
-    			$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
-    			$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
-    			$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+				// Multicurrency
+				$line->fk_multicurrency = $objp->fk_multicurrency;
+				$line->multicurrency_code = $objp->multicurrency_code;
+				$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+				$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+				$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+				$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
 
-    			$line->special_code        = $objp->special_code;
-    			$line->fk_parent_line      = $objp->fk_parent_line;
+				$line->special_code        = $objp->special_code;
+				$line->fk_parent_line      = $objp->fk_parent_line;
 
-    			$line->rang                = $objp->rang;
+				$line->rang                = $objp->rang;
 
-    			// Retreive all extrafield
-    			// fetch optionals attributes and labels
-    			$line->fetch_optionals();
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$line->fetch_optionals();
 
-    			$this->lines[$i] = $line;
+				$this->lines[$i] = $line;
 
-    			$i++;
-    		}
-    		$this->db->free($result);
+				$i++;
+			}
+			$this->db->free($result);
 
-    		return $num;
-    	}
-    	else
-    	{
-    		$this->error = $this->db->error()." sql=".$sql;
-    		return -1;
-    	}
-    }
+			return $num;
+		} else {
+			$this->error = $this->db->error()." sql=".$sql;
+			return -1;
+		}
+	}
 
-    /**
-     *	Validate an order
-     *
-     *	@param	User	$user			Validator User
-     *	@param	int		$idwarehouse	Id of warehouse to use for stock decrease
-     *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function valid($user, $idwarehouse = 0, $notrigger = 0)
-    {
-        global $langs, $conf;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	/**
+	 *	Validate an order
+	 *
+	 *	@param	User	$user			Validator User
+	 *	@param	int		$idwarehouse	Id of warehouse to use for stock decrease
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function valid($user, $idwarehouse = 0, $notrigger = 0)
+	{
+		global $langs, $conf;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error = 0;
+		$error = 0;
 
-        dol_syslog(get_class($this)."::valid");
-        $result = 0;
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->creer))
-       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate)))
-        {
-            $this->db->begin();
+		dol_syslog(get_class($this)."::valid");
+		$result = 0;
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->creer))
+	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate)))
+		{
+			$this->db->begin();
 
-            // Definition of supplier order numbering model name
-            $soc = new Societe($this->db);
-            $soc->fetch($this->fourn_id);
+			// Definition of supplier order numbering model name
+			$soc = new Societe($this->db);
+			$soc->fetch($this->fourn_id);
 
-            // Check if object has a temporary ref
-            if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-            {
-                $num = $this->getNextNumRef($soc);
-            }
-            else
+			// Check if object has a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 			{
-                $num = $this->ref;
-            }
-            $this->newref = dol_sanitizeFileName($num);
+				$num = $this->getNextNumRef($soc);
+			} else {
+				$num = $this->ref;
+			}
+			$this->newref = dol_sanitizeFileName($num);
 
-            $sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur";
-            $sql .= " SET ref='".$this->db->escape($num)."',";
-            $sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
-            $sql .= " date_valid='".$this->db->idate(dol_now())."',";
-            $sql .= " fk_user_valid = ".$user->id;
-            $sql .= " WHERE rowid = ".$this->id;
-            $sql .= " AND fk_statut = ".self::STATUS_DRAFT;
+			$sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur";
+			$sql .= " SET ref='".$this->db->escape($num)."',";
+			$sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
+			$sql .= " date_valid='".$this->db->idate(dol_now())."',";
+			$sql .= " fk_user_valid = ".$user->id;
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND fk_statut = ".self::STATUS_DRAFT;
 
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                dol_print_error($this->db);
-                $error++;
-            }
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				dol_print_error($this->db);
+				$error++;
+			}
 
-            if (!$error && !$notrigger)
-            {
+			if (!$error && !$notrigger)
+			{
 				// Call trigger
 				$result = $this->call_trigger('ORDER_SUPPLIER_VALIDATE', $user);
 				if ($result < 0) $error++;
 				// End call triggers
-            }
+			}
 
-            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 = 'fournisseur/commande/".$this->db->escape($this->newref)."'";
-                	$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/commande/".$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->fournisseur->commande->dir_output.'/'.$oldref;
-                    $dirdest = $conf->fournisseur->commande->dir_output.'/'.$newref;
-                    if (!$error && file_exists($dirsource))
-                    {
-                        dol_syslog(get_class($this)."::valid 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->fournisseur->commande->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 (!$error)
-            {
-                $result = 1;
-                $this->statut = self::STATUS_VALIDATED;
-                $this->ref = $num;
-            }
-
-            if (!$error)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error = 'NotAuthorized';
-            dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
-
-    /**
-     *  Return label of the status of object
-     *
-	 *  @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
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->statut, $mode, $this->billed);
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return label of a status
-     *
-     * 	@param  int		$status		Id statut
-	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-     *  @param  int     $billed     1=Billed
-     *  @return string				Label of status
-     */
-    public function LibStatut($status, $mode = 0, $billed = 0)
-    {
-        // phpcs:enable
-    	global $conf, $langs;
-
-    	if (empty($this->statuts) || empty($this->statutshort)) {
-	        $langs->load('orders');
-
-	        $this->statuts[0] = 'StatusSupplierOrderDraft';
-	        $this->statuts[1] = 'StatusSupplierOrderValidated';
-	        $this->statuts[2] = 'StatusSupplierOrderApproved';
-	        if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusSupplierOrderOnProcess';
-	        else $this->statuts[3] = 'StatusSupplierOrderOnProcessWithValidation';
-	        $this->statuts[4] = 'StatusSupplierOrderReceivedPartially';
-	        $this->statuts[5] = 'StatusSupplierOrderReceivedAll';
-	        $this->statuts[6] = 'StatusSupplierOrderCanceled'; // Approved->Canceled
-	        $this->statuts[7] = 'StatusSupplierOrderCanceled'; // Process running->canceled
-	        $this->statuts[9] = 'StatusSupplierOrderRefused';
-
-	        // List of language codes for status
-	        $this->statutshort[0] = 'StatusSupplierOrderDraftShort';
-	        $this->statutshort[1] = 'StatusSupplierOrderValidatedShort';
-	        $this->statutshort[2] = 'StatusSupplierOrderApprovedShort';
-	        $this->statutshort[3] = 'StatusSupplierOrderOnProcessShort';
-	        $this->statutshort[4] = 'StatusSupplierOrderReceivedPartiallyShort';
-	        $this->statutshort[5] = 'StatusSupplierOrderReceivedAllShort';
-	        $this->statutshort[6] = 'StatusSupplierOrderCanceledShort';
-	        $this->statutshort[7] = 'StatusSupplierOrderCanceledShort';
-	        $this->statutshort[9] = 'StatusSupplierOrderRefusedShort';
-    	}
-
-        $statustrans = array(
-            0 => 'status0',
-            1 => 'status1b',
-            2 => 'status1',
-            3 => 'status4',
-            4 => 'status4b',
-            5 => 'status6',
-            6 => 'status9',
-            7 => 'status9',
-            9 => 'status9',
-        );
-
-        $statusClass = 'status0';
-        if (!empty($statustrans[$status])) {
-            $statusClass = $statustrans[$status];
-        }
-
-        $billedtext = '';
-        if ($billed) {
-        	$billedtext = ' - '.$langs->trans("Billed");
-        }
-        if ($status == 5 && $billed) $statusClass = 'status6';
-
-        $statusLong = $langs->trans($this->statuts[$status]).$billedtext;
-        $statusShort = $langs->trans($this->statutshort[$status]);
-
-        return dolGetStatus($statusLong, $statusShort, '', $statusClass, $mode);
-    }
-
-
-    /**
-     *	Return clicable name (with picto eventually)
-     *
-     *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param		string	$option						On what the link points
-     *  @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				Add link to show notes
-     *	@return		string								Chain with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
-    {
-        global $langs, $conf, $user;
-
-        $result = '';
-        $label = '<u>'.$langs->trans("ShowOrder").'</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);
-
-        $picto = 'order';
-        $url = DOL_URL_ROOT.'/fourn/commande/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("ShowOrder");
-                $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>';
-
-        $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);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
-
-        if ($addlinktonotes)
-        {
-        	$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-        	if ($txttoshow)
-        	{
-        		$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
-        		$result .= ' <span class="note inline-block">';
-        		$result .= '<a href="'.DOL_URL_ROOT.'/fourn/commande/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
-        		$result .= img_picto('', 'note');
-        		$result .= '</a>';
-        		//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
-        		//$result.='</a>';
-        		$result .= '</span>';
-        	}
-        }
-
-        return $result;
-    }
-
-
-    /**
-     *  Returns the following order reference not used depending on the numbering model activated
-     *                  defined within COMMANDE_SUPPLIER_ADDON_NUMBER
-     *
-     *  @param	    Societe		$soc  		company object
-     *  @return     string                  free reference for the invoice
-     */
-    public function getNextNumRef($soc)
-    {
-        global $db, $langs, $conf;
-        $langs->load("orders");
-
-        if (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER))
-        {
-            $mybool = false;
-
-            $file = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER.'.php';
-            $classname = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
-
-            // Include file with class
-            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
-            foreach ($dirmodels as $reldir) {
-                $dir = dol_buildpath($reldir."core/modules/supplier_order/");
-
-                // Load file with numbering class (if found)
-                $mybool |= @include_once $dir.$file;
-            }
-
-            if ($mybool === false) {
-                dol_print_error('', "Failed to include file ".$file);
-                return '';
-            }
-
-            $obj = new $classname();
-            $numref = $obj->getNextValue($soc, $this);
-
-            if ($numref != "")
-            {
-                return $numref;
-            }
-            else
+			if (!$error)
 			{
-                $this->error = $obj->error;
-                return -1;
-            }
-        }
-        else
-		{
-            $this->error = "Error_COMMANDE_SUPPLIER_ADDON_NotDefined";
-            return -2;
-        }
-    }
-	/**
-     *	Class invoiced the supplier order
-     *
-     *  @param      User        $user       Object user making the change
-     *	@return     int     	            <0 if KO, >0 if KO
-     */
-    public function classifyBilled(User $user)
-    {
-        $error = 0;
-        $this->db->begin();
+				$this->oldref = $this->ref;
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur SET billed = 1';
-        $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+				// 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 = 'fournisseur/commande/".$this->db->escape($this->newref)."'";
+					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/commande/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+					$resql = $this->db->query($sql);
+					if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
 
-        if ($this->db->query($sql))
-        {
-        	if (!$error)
-        	{
-        	    // Call trigger
-        	    $result = $this->call_trigger('ORDER_SUPPLIER_CLASSIFY_BILLED', $user);
-        	    if ($result < 0) $error++;
-        	    // End call triggers
-        	}
+					// 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->fournisseur->commande->dir_output.'/'.$oldref;
+					$dirdest = $conf->fournisseur->commande->dir_output.'/'.$newref;
+					if (!$error && file_exists($dirsource))
+					{
+						dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
 
-        	if (!$error)
-        	{
-        	    $this->billed = 1;
+						if (@rename($dirsource, $dirdest))
+						{
+							dol_syslog("Rename ok");
+							// Rename docs starting with $oldref with $newref
+							$listoffiles = dol_dir_list($conf->fournisseur->commande->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);
+							}
+						}
+					}
+				}
+			}
 
-        	    $this->db->commit();
-        	    return 1;
-        	}
-        	else
-        	{
-        	    $this->db->rollback();
-                return -1;
-        	}
-        }
-        else
-        {
-        	dol_print_error($this->db);
+			if (!$error)
+			{
+				$result = 1;
+				$this->statut = self::STATUS_VALIDATED;
+				$this->ref = $num;
+			}
 
-        	$this->db->rollback();
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = 'NotAuthorized';
+			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
-        }
-    }
+		}
+	}
 
-    /**
-     * 	Approve a supplier order
-     *
-     *	@param	User	$user			Object user
-     *	@param	int		$idwarehouse	Id of warhouse for stock change
-     *  @param	int		$secondlevel	0=Standard approval, 1=Second level approval (used when option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function approve($user, $idwarehouse = 0, $secondlevel = 0)
-    {
-        global $langs, $conf;
+	/**
+	 *  Return label of the status of object
+	 *
+	 *  @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
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode, $this->billed);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return label of a status
+	 *
+	 * 	@param  int		$status		Id statut
+	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @param  int     $billed     1=Billed
+	 *  @return string				Label of status
+	 */
+	public function LibStatut($status, $mode = 0, $billed = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs;
+
+		if (empty($this->statuts) || empty($this->statutshort)) {
+			$langs->load('orders');
+
+			$this->statuts[0] = 'StatusSupplierOrderDraft';
+			$this->statuts[1] = 'StatusSupplierOrderValidated';
+			$this->statuts[2] = 'StatusSupplierOrderApproved';
+			if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusSupplierOrderOnProcess';
+			else $this->statuts[3] = 'StatusSupplierOrderOnProcessWithValidation';
+			$this->statuts[4] = 'StatusSupplierOrderReceivedPartially';
+			$this->statuts[5] = 'StatusSupplierOrderReceivedAll';
+			$this->statuts[6] = 'StatusSupplierOrderCanceled'; // Approved->Canceled
+			$this->statuts[7] = 'StatusSupplierOrderCanceled'; // Process running->canceled
+			$this->statuts[9] = 'StatusSupplierOrderRefused';
+
+			// List of language codes for status
+			$this->statutshort[0] = 'StatusSupplierOrderDraftShort';
+			$this->statutshort[1] = 'StatusSupplierOrderValidatedShort';
+			$this->statutshort[2] = 'StatusSupplierOrderApprovedShort';
+			$this->statutshort[3] = 'StatusSupplierOrderOnProcessShort';
+			$this->statutshort[4] = 'StatusSupplierOrderReceivedPartiallyShort';
+			$this->statutshort[5] = 'StatusSupplierOrderReceivedAllShort';
+			$this->statutshort[6] = 'StatusSupplierOrderCanceledShort';
+			$this->statutshort[7] = 'StatusSupplierOrderCanceledShort';
+			$this->statutshort[9] = 'StatusSupplierOrderRefusedShort';
+		}
+
+		$statustrans = array(
+			0 => 'status0',
+			1 => 'status1b',
+			2 => 'status1',
+			3 => 'status4',
+			4 => 'status4b',
+			5 => 'status6',
+			6 => 'status9',
+			7 => 'status9',
+			9 => 'status9',
+		);
+
+		$statusClass = 'status0';
+		if (!empty($statustrans[$status])) {
+			$statusClass = $statustrans[$status];
+		}
+
+		$billedtext = '';
+		if ($billed) {
+			$billedtext = ' - '.$langs->trans("Billed");
+		}
+		if ($status == 5 && $billed) $statusClass = 'status6';
+
+		$statusLong = $langs->trans($this->statuts[$status]).$billedtext;
+		$statusShort = $langs->trans($this->statutshort[$status]);
+
+		return dolGetStatus($statusLong, $statusShort, '', $statusClass, $mode);
+	}
+
+
+	/**
+	 *	Return clicable name (with picto eventually)
+	 *
+	 *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param		string	$option						On what the link points
+	 *  @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				Add link to show notes
+	 *	@return		string								Chain with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
+	{
+		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);
+
+		$picto = 'order';
+		$url = DOL_URL_ROOT.'/fourn/commande/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("ShowOrder");
+				$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>';
+
+		$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);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
+
+		if ($addlinktonotes)
+		{
+			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
+			if ($txttoshow)
+			{
+				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
+				$result .= ' <span class="note inline-block">';
+				$result .= '<a href="'.DOL_URL_ROOT.'/fourn/commande/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
+				$result .= img_picto('', 'note');
+				$result .= '</a>';
+				//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
+				//$result.='</a>';
+				$result .= '</span>';
+			}
+		}
+
+		return $result;
+	}
+
+
+	/**
+	 *  Returns the following order reference not used depending on the numbering model activated
+	 *                  defined within COMMANDE_SUPPLIER_ADDON_NUMBER
+	 *
+	 *  @param	    Societe		$soc  		company object
+	 *  @return     string                  free reference for the invoice
+	 */
+	public function getNextNumRef($soc)
+	{
+		global $db, $langs, $conf;
+		$langs->load("orders");
+
+		if (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER))
+		{
+			$mybool = false;
+
+			$file = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER.'.php';
+			$classname = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/supplier_order/");
+
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
+
+			if ($mybool === false) {
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
+
+			$obj = new $classname();
+			$numref = $obj->getNextValue($soc, $this);
+
+			if ($numref != "")
+			{
+				return $numref;
+			} else {
+				$this->error = $obj->error;
+				return -1;
+			}
+		} else {
+			$this->error = "Error_COMMANDE_SUPPLIER_ADDON_NotDefined";
+			return -2;
+		}
+	}
+	/**
+	 *	Class invoiced the supplier order
+	 *
+	 *  @param      User        $user       Object user making the change
+	 *	@return     int     	            <0 if KO, >0 if KO
+	 */
+	public function classifyBilled(User $user)
+	{
+		$error = 0;
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur SET billed = 1';
+		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
+
+		if ($this->db->query($sql))
+		{
+			if (!$error)
+			{
+				// Call trigger
+				$result = $this->call_trigger('ORDER_SUPPLIER_CLASSIFY_BILLED', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+
+			if (!$error)
+			{
+				$this->billed = 1;
+
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			dol_print_error($this->db);
+
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * 	Approve a supplier order
+	 *
+	 *	@param	User	$user			Object user
+	 *	@param	int		$idwarehouse	Id of warhouse for stock change
+	 *  @param	int		$secondlevel	0=Standard approval, 1=Second level approval (used when option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function approve($user, $idwarehouse = 0, $secondlevel = 0)
+	{
+		global $langs, $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error = 0;
+		$error = 0;
 
-        dol_syslog(get_class($this)."::approve");
+		dol_syslog(get_class($this)."::approve");
 
-        if ($user->rights->fournisseur->commande->approuver)
-        {
-        	$now = dol_now();
+		if ($user->rights->fournisseur->commande->approuver)
+		{
+			$now = dol_now();
 
-            $this->db->begin();
+			$this->db->begin();
 
 			// Definition of order numbering model name
-            $soc = new Societe($this->db);
-            $soc->fetch($this->fourn_id);
+			$soc = new Societe($this->db);
+			$soc->fetch($this->fourn_id);
 
-            // Check if object has a temporary ref
-            if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-            {
-                $num = $this->getNextNumRef($soc);
-            }
-            else
+			// Check if object has a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 			{
-                $num = $this->ref;
-            }
-            $this->newref = dol_sanitizeFileName($num);
+				$num = $this->getNextNumRef($soc);
+			} else {
+				$num = $this->ref;
+			}
+			$this->newref = dol_sanitizeFileName($num);
 
-            // Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated)
+			// Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated)
 			$movetoapprovestatus = true;
 			$comment = '';
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
 			$sql .= " SET ref='".$this->db->escape($num)."',";
 			if (empty($secondlevel))	// standard or first level approval
 			{
-	            $sql .= " date_approve='".$this->db->idate($now)."',";
-    	        $sql .= " fk_user_approve = ".$user->id;
-    	        if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
-    	        {
-    	        	if (empty($this->user_approve_id2))
-    	        	{
-    	        	    $movetoapprovestatus = false; // second level approval not done
-    	        	    $comment = ' (first level)';
-    	        	}
-    	        }
-			}
-			else	// request a second level approval
+				$sql .= " date_approve='".$this->db->idate($now)."',";
+				$sql .= " fk_user_approve = ".$user->id;
+				if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
+				{
+					if (empty($this->user_approve_id2))
+					{
+						$movetoapprovestatus = false; // second level approval not done
+						$comment = ' (first level)';
+					}
+				}
+			} else // request a second level approval
 			{
-            	$sql .= " date_approve2='".$this->db->idate($now)."',";
-            	$sql .= " fk_user_approve2 = ".$user->id;
-    	        if (empty($this->user_approve_id)) $movetoapprovestatus = false; // first level approval not done
-    	        $comment = ' (second level)';
+				$sql .= " date_approve2='".$this->db->idate($now)."',";
+				$sql .= " fk_user_approve2 = ".$user->id;
+				if (empty($this->user_approve_id)) $movetoapprovestatus = false; // first level approval not done
+				$comment = ' (second level)';
 			}
 			// If double approval is required and first approval, we keep status to 1 = validated
 			if ($movetoapprovestatus) $sql .= ", fk_statut = ".self::STATUS_ACCEPTED;
 			else $sql .= ", fk_statut = ".self::STATUS_VALIDATED;
-            $sql .= " WHERE rowid = ".$this->id;
-            $sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
+			$sql .= " WHERE rowid = ".$this->id;
+			$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
-            if ($this->db->query($sql))
-            {
-            	if (!empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT))
-	            {
+			if ($this->db->query($sql))
+			{
+				if (!empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT))
+				{
 					$result = $this->add_contact($user->id, 'SALESREPFOLL', 'internal', 1);
 					if ($result < 0 && $result != -2)	// -2 means already exists
 					{
 						$error++;
 					}
-	            }
+				}
 
-                // If stock is incremented on validate order, we must increment it
-                if (!$error && $movetoapprovestatus && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER))
-                {
-                    require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-                    $langs->load("agenda");
+				// If stock is incremented on validate order, we must increment it
+				if (!$error && $movetoapprovestatus && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER))
+				{
+					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+					$langs->load("agenda");
 
-                    $cpt = count($this->lines);
-                    for ($i = 0; $i < $cpt; $i++)
-                    {
-                        // Product with reference
-                        if ($this->lines[$i]->fk_product > 0)
-                        {
-                            $this->line = $this->lines[$i];
-                            $mouvP = new MouvementStock($this->db);
-                            $mouvP->origin = &$this;
-                            // We decrement stock of product (and sub-products)
-	                        $up_ht_disc = $this->lines[$i]->subprice;
-    	                    if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
-                            $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr", $this->ref));
-                            if ($result < 0) { $error++; }
-                            unset($this->line);
-                        }
-                    }
-                }
+					$cpt = count($this->lines);
+					for ($i = 0; $i < $cpt; $i++)
+					{
+						// Product with reference
+						if ($this->lines[$i]->fk_product > 0)
+						{
+							$this->line = $this->lines[$i];
+							$mouvP = new MouvementStock($this->db);
+							$mouvP->origin = &$this;
+							// We decrement stock of product (and sub-products)
+							$up_ht_disc = $this->lines[$i]->subprice;
+							if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr", $this->ref));
+							if ($result < 0) { $error++; }
+							unset($this->line);
+						}
+					}
+				}
 
-                if (!$error)
-                {
+				if (!$error)
+				{
 					// Call trigger
 					$result = $this->call_trigger('ORDER_SUPPLIER_APPROVE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
-                }
+				}
 
-                if (!$error)
-                {
-                	$this->ref = $this->newref;
+				if (!$error)
+				{
+					$this->ref = $this->newref;
 
-                	if ($movetoapprovestatus) $this->statut = self::STATUS_ACCEPTED;
+					if ($movetoapprovestatus) $this->statut = self::STATUS_ACCEPTED;
 					else $this->statut = self::STATUS_VALIDATED;
-           			if (empty($secondlevel))	// standard or first level approval
+		   			if (empty($secondlevel))	// standard or first level approval
 					{
-			            $this->date_approve = $now;
-		    	        $this->user_approve_id = $user->id;
-					}
-					else	// request a second level approval
+						$this->date_approve = $now;
+						$this->user_approve_id = $user->id;
+					} else // request a second level approval
 					{
-			            $this->date_approve2 = $now;
-		    	        $this->user_approve_id2 = $user->id;
+						$this->date_approve2 = $now;
+						$this->user_approve_id2 = $user->id;
 					}
 
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error = $this->db->lasterror();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
-        }
-        return -1;
-    }
+					$this->db->commit();
+					return 1;
+				} else {
+					$this->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this)."::approve Not Authorized", LOG_ERR);
+		}
+		return -1;
+	}
 
-    /**
-     * 	Refuse an order
-     *
-     * 	@param		User	$user		User making action
-     *	@return		int					0 if Ok, <0 if Ko
-     */
-    public function refuse($user)
-    {
-        global $conf, $langs;
+	/**
+	 * 	Refuse an order
+	 *
+	 * 	@param		User	$user		User making action
+	 *	@return		int					0 if Ok, <0 if Ko
+	 */
+	public function refuse($user)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 
-        dol_syslog(get_class($this)."::refuse");
-        $result = 0;
-        if ($user->rights->fournisseur->commande->approuver)
-        {
-            $this->db->begin();
+		dol_syslog(get_class($this)."::refuse");
+		$result = 0;
+		if ($user->rights->fournisseur->commande->approuver)
+		{
+			$this->db->begin();
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".self::STATUS_REFUSED;
-            $sql .= " WHERE rowid = ".$this->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".self::STATUS_REFUSED;
+			$sql .= " WHERE rowid = ".$this->id;
 
-            if ($this->db->query($sql))
-            {
-                $result = 0;
+			if ($this->db->query($sql))
+			{
+				$result = 0;
 
-                if ($error == 0)
-                {
+				if ($error == 0)
+				{
 					// Call trigger
 					$result = $this->call_trigger('ORDER_SUPPLIER_REFUSE', $user);
 					if ($result < 0)
-                    {
-                        $error++;
-                        $this->db->rollback();
-                    }
-                    else
-                    	$this->db->commit();
+					{
+						$error++;
+						$this->db->rollback();
+					} else $this->db->commit();
 					// End call triggers
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error = $this->db->lasterror();
-                dol_syslog(get_class($this)."::refuse Error -1");
-                $result = -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::refuse Not Authorized");
-        }
-        return $result;
-    }
+				}
+			} else {
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+				dol_syslog(get_class($this)."::refuse Error -1");
+				$result = -1;
+			}
+		} else {
+			dol_syslog(get_class($this)."::refuse Not Authorized");
+		}
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Cancel an approved order.
-     *	The cancellation is done after approval
-     *
-     * 	@param	User	$user			User making action
-     *	@param	int		$idwarehouse	Id warehouse to use for stock change (not used for supplier orders).
-     * 	@return	int						>0 if Ok, <0 if Ko
-     */
-    public function Cancel($user, $idwarehouse = -1)
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Cancel an approved order.
+	 *	The cancellation is done after approval
+	 *
+	 * 	@param	User	$user			User making action
+	 *	@param	int		$idwarehouse	Id warehouse to use for stock change (not used for supplier orders).
+	 * 	@return	int						>0 if Ok, <0 if Ko
+	 */
+	public function Cancel($user, $idwarehouse = -1)
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        //dol_syslog("CommandeFournisseur::Cancel");
-        $result = 0;
-        if ($user->rights->fournisseur->commande->commander)
-        {
-            $statut = self::STATUS_CANCELED;
+		//dol_syslog("CommandeFournisseur::Cancel");
+		$result = 0;
+		if ($user->rights->fournisseur->commande->commander)
+		{
+			$statut = self::STATUS_CANCELED;
 
-            $this->db->begin();
+			$this->db->begin();
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".$statut;
-            $sql .= " WHERE rowid = ".$this->id;
-            dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
-            if ($this->db->query($sql))
-            {
-                $result = 0;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".$statut;
+			$sql .= " WHERE rowid = ".$this->id;
+			dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
+			if ($this->db->query($sql))
+			{
+				$result = 0;
 
 				// Call trigger
 				$result = $this->call_trigger('ORDER_SUPPLIER_CANCEL', $user);
 				if ($result < 0) $error++;
 				// End call triggers
 
-                if ($error == 0)
-                {
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->db->rollback();
-                $this->error = $this->db->lasterror();
-                dol_syslog(get_class($this)."::cancel ".$this->error);
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::cancel Not Authorized");
-            return -1;
-        }
-    }
+				if ($error == 0)
+				{
+					$this->db->commit();
+					return 1;
+				} else {
+					$this->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+				dol_syslog(get_class($this)."::cancel ".$this->error);
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this)."::cancel Not Authorized");
+			return -1;
+		}
+	}
 
-    /**
-     * 	Submit a supplier order to supplier
-     *
-     * 	@param		User	$user		User making change
-     * 	@param		integer	$date		Date
-     * 	@param		int		$methode	Method
-     * 	@param		string	$comment	Comment
-     * 	@return		int			        <0 if KO, >0 if OK
-     */
-    public function commande($user, $date, $methode, $comment = '')
-    {
-        global $langs;
-        dol_syslog(get_class($this)."::commande");
-        $error = 0;
-        if ($user->rights->fournisseur->commande->commander)
-        {
-            $this->db->begin();
+	/**
+	 * 	Submit a supplier order to supplier
+	 *
+	 * 	@param		User	$user		User making change
+	 * 	@param		integer	$date		Date
+	 * 	@param		int		$methode	Method
+	 * 	@param		string	$comment	Comment
+	 * 	@return		int			        <0 if KO, >0 if OK
+	 */
+	public function commande($user, $date, $methode, $comment = '')
+	{
+		global $langs;
+		dol_syslog(get_class($this)."::commande");
+		$error = 0;
+		if ($user->rights->fournisseur->commande->commander)
+		{
+			$this->db->begin();
 
-            $newnoteprivate = $this->note_private;
-            if ($comment) $newnoteprivate = dol_concatdesc($newnoteprivate, $langs->trans("Comment").': '.$comment);
+			$newnoteprivate = $this->note_private;
+			if ($comment) $newnoteprivate = dol_concatdesc($newnoteprivate, $langs->trans("Comment").': '.$comment);
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql .= " SET fk_statut=".self::STATUS_ORDERSENT.", fk_input_method=".$methode.", date_commande='".$this->db->idate($date)."', ";
-            $sql .= " note_private='".$this->db->escape($newnoteprivate)."'";
-            $sql .= " WHERE rowid=".$this->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql .= " SET fk_statut=".self::STATUS_ORDERSENT.", fk_input_method=".$methode.", date_commande='".$this->db->idate($date)."', ";
+			$sql .= " note_private='".$this->db->escape($newnoteprivate)."'";
+			$sql .= " WHERE rowid=".$this->id;
 
-            dol_syslog(get_class($this)."::commande", LOG_DEBUG);
-            if ($this->db->query($sql))
-            {
-                $this->statut = self::STATUS_ORDERSENT;
-                $this->methode_commande_id = $methode;
-                $this->date_commande = $date;
-                $this->context = array('comments' => $comment);
+			dol_syslog(get_class($this)."::commande", LOG_DEBUG);
+			if ($this->db->query($sql))
+			{
+				$this->statut = self::STATUS_ORDERSENT;
+				$this->methode_commande_id = $methode;
+				$this->date_commande = $date;
+				$this->context = array('comments' => $comment);
 
-                // Call trigger
-                $result = $this->call_trigger('ORDER_SUPPLIER_SUBMIT', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-            else
-            {
-                $error++;
-                $this->error = $this->db->lasterror();
-                $this->errors[] = $this->db->lasterror();
-            }
+				// Call trigger
+				$result = $this->call_trigger('ORDER_SUPPLIER_SUBMIT', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			} else {
+				$error++;
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
+			}
 
-            if (!$error)
-            {
-                $this->db->commit();
-            }
-            else
-            {
-                $this->db->rollback();
-            }
-        }
-        else
-        {
-            $error++;
-            $this->error = $langs->trans('NotAuthorized');
-            $this->errors[] = $langs->trans('NotAuthorized');
-            dol_syslog(get_class($this)."::commande User not Authorized", LOG_WARNING);
-        }
+			if (!$error)
+			{
+				$this->db->commit();
+			} else {
+				$this->db->rollback();
+			}
+		} else {
+			$error++;
+			$this->error = $langs->trans('NotAuthorized');
+			$this->errors[] = $langs->trans('NotAuthorized');
+			dol_syslog(get_class($this)."::commande User not Authorized", LOG_WARNING);
+		}
 
-        return ($error ? -1 : 1);
-    }
+		return ($error ? -1 : 1);
+	}
 
-    /**
-     *  Create order with draft status
-     *
-     *  @param      User	$user       User making creation
-     *	@param		int		$notrigger	Disable all triggers
-     *  @return     int         		<0 if KO, Id of supplier order if OK
-     */
-    public function create($user, $notrigger = 0)
-    {
-        global $langs, $conf, $hookmanager;
+	/**
+	 *  Create order with draft status
+	 *
+	 *  @param      User	$user       User making creation
+	 *	@param		int		$notrigger	Disable all triggers
+	 *  @return     int         		<0 if KO, Id of supplier order if OK
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $langs, $conf, $hookmanager;
 
-        $this->db->begin();
+		$this->db->begin();
 
 		$error = 0;
-        $now = dol_now();
+		$now = dol_now();
 
 		// $date_commande is deprecated
 		$date = ($this->date_commande ? $this->date_commande : $this->date); // in case of date is set
-		if(empty($date)) $date = $now;
+		if (empty($date)) $date = $now;
 
-        // Clean parameters
-        if (empty($this->source)) $this->source = 0;
+		// Clean parameters
+		if (empty($this->source)) $this->source = 0;
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
 		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
@@ -1311,104 +1259,104 @@ class CommandeFournisseur extends CommonOrder
 			$this->multicurrency_tx = 1;
 		}
 
-        // We set order into draft status
-        $this->brouillon = 1;
+		// We set order into draft status
+		$this->brouillon = 1;
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur (";
-        $sql .= "ref";
-        $sql .= ", ref_supplier";
-        $sql .= ", note_private";
-        $sql .= ", note_public";
-        $sql .= ", entity";
-        $sql .= ", fk_soc";
-        $sql .= ", fk_projet";
-        $sql .= ", date_creation";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur (";
+		$sql .= "ref";
+		$sql .= ", ref_supplier";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", entity";
+		$sql .= ", fk_soc";
+		$sql .= ", fk_projet";
+		$sql .= ", date_creation";
 		$sql .= ", date_livraison";
-        $sql .= ", fk_user_author";
-        $sql .= ", fk_statut";
-        $sql .= ", source";
-        $sql .= ", model_pdf";
-        $sql .= ", fk_mode_reglement";
+		$sql .= ", fk_user_author";
+		$sql .= ", fk_statut";
+		$sql .= ", source";
+		$sql .= ", model_pdf";
+		$sql .= ", fk_mode_reglement";
 		$sql .= ", fk_cond_reglement";
-        $sql .= ", fk_account";
+		$sql .= ", fk_account";
 		$sql .= ", fk_incoterms, location_incoterms";
-        $sql .= ", fk_multicurrency";
-        $sql .= ", multicurrency_code";
-        $sql .= ", multicurrency_tx";
-        $sql .= ") ";
-        $sql .= " VALUES (";
-        $sql .= "''";
-        $sql .= ", '".$this->db->escape($this->ref_supplier)."'";
-        $sql .= ", '".$this->db->escape($this->note_private)."'";
-        $sql .= ", '".$this->db->escape($this->note_public)."'";
-        $sql .= ", ".$conf->entity;
-        $sql .= ", ".$this->socid;
-        $sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
-        $sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", fk_multicurrency";
+		$sql .= ", multicurrency_code";
+		$sql .= ", multicurrency_tx";
+		$sql .= ") ";
+		$sql .= " VALUES (";
+		$sql .= "''";
+		$sql .= ", '".$this->db->escape($this->ref_supplier)."'";
+		$sql .= ", '".$this->db->escape($this->note_private)."'";
+		$sql .= ", '".$this->db->escape($this->note_public)."'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".$this->socid;
+		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
+		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", ".($this->date_livraison ? "'".$this->db->idate($this->date_livraison)."'" : "null");
-        $sql .= ", ".$user->id;
-        $sql .= ", ".self::STATUS_DRAFT;
-        $sql .= ", ".$this->db->escape($this->source);
-        $sql .= ", '".$conf->global->COMMANDE_SUPPLIER_ADDON_PDF."'";
-        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
-        $sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
-        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
-        $sql .= ", ".(int) $this->fk_incoterms;
-        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", ".$user->id;
+		$sql .= ", ".self::STATUS_DRAFT;
+		$sql .= ", ".$this->db->escape($this->source);
+		$sql .= ", '".$this->db->escape($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)."'";
+		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
+		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
+		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+		$sql .= ", ".(int) $this->fk_incoterms;
+		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ", ".(int) $this->fk_multicurrency;
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql .= ", ".(double) $this->multicurrency_tx;
-        $sql .= ")";
+		$sql .= ")";
 
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."commande_fournisseur");
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."commande_fournisseur");
 
 			if ($this->id) {
 				$num = count($this->lines);
 
-	            // insert products details into database
-	            for ($i = 0; $i < $num; $i++)
-	            {
-	                $this->special_code = $this->lines[$i]->special_code; // TODO : remove this in 9.0 and add special_code param to addline()
+				// insert products details into database
+				for ($i = 0; $i < $num; $i++)
+				{
+					$this->special_code = $this->lines[$i]->special_code; // TODO : remove this in 9.0 and add special_code param to addline()
 
-                    // This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
-                    $result = $this->addline(
-	                    $this->lines[$i]->desc,
-	                    $this->lines[$i]->subprice,
-	                    $this->lines[$i]->qty,
-	                    $this->lines[$i]->tva_tx,
-	                    $this->lines[$i]->localtax1_tx,
-	                    $this->lines[$i]->localtax2_tx,
-	                    $this->lines[$i]->fk_product,
-	                    0,
-	                    $this->lines[$i]->ref_fourn, // $this->lines[$i]->ref_fourn comes from field ref into table of lines. Value may ba a ref that does not exists anymore, so we first try with value of product
-	                    $this->lines[$i]->remise_percent,
-	                    'HT',
-	                    0,
-	                    $this->lines[$i]->product_type,
-	                    $this->lines[$i]->info_bits,
-                        false,
-	                    $this->lines[$i]->date_start,
-                        $this->lines[$i]->date_end,
-                        $this->lines[$i]->array_options,
-                        $this->lines[$i]->fk_unit
-	                );
-	                if ($result < 0)
-	                {
-	                    dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functionnal error
-	                    $this->db->rollback();
-	                    return -1;
-	                }
-	            }
+					// This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
+					$result = $this->addline(
+						$this->lines[$i]->desc,
+						$this->lines[$i]->subprice,
+						$this->lines[$i]->qty,
+						$this->lines[$i]->tva_tx,
+						$this->lines[$i]->localtax1_tx,
+						$this->lines[$i]->localtax2_tx,
+						$this->lines[$i]->fk_product,
+						0,
+						$this->lines[$i]->ref_fourn, // $this->lines[$i]->ref_fourn comes from field ref into table of lines. Value may ba a ref that does not exists anymore, so we first try with value of product
+						$this->lines[$i]->remise_percent,
+						'HT',
+						0,
+						$this->lines[$i]->product_type,
+						$this->lines[$i]->info_bits,
+						false,
+						$this->lines[$i]->date_start,
+						$this->lines[$i]->date_end,
+						$this->lines[$i]->array_options,
+						$this->lines[$i]->fk_unit
+					);
+					if ($result < 0)
+					{
+						dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functionnal error
+						$this->db->rollback();
+						return -1;
+					}
+				}
 
-	            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-	            $sql .= " SET ref='(PROV".$this->id.")'";
-	            $sql .= " WHERE rowid=".$this->id;
-	            dol_syslog(get_class($this)."::create", LOG_DEBUG);
-	            if ($this->db->query($sql))
-	            {
+				$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+				$sql .= " SET ref='(PROV".$this->id.")'";
+				$sql .= " WHERE rowid=".$this->id;
+				dol_syslog(get_class($this)."::create", LOG_DEBUG);
+				if ($this->db->query($sql))
+				{
 					// Add link with price request and supplier order
 					if ($this->id)
 					{
@@ -1424,87 +1372,82 @@ class CommandeFournisseur extends CommonOrder
 						{
 							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)
-							            {
-							                dol_print_error($this->db);
-							                $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;
+								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)
+										{
+											dol_print_error($this->db);
+											$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)
 									{
 										dol_print_error($this->db);
 										$error++;
 									}
-							    }
+								}
 							}
 						}
 					}
 
-	                if (!$error)
-                    {
-                    	$result = $this->insertExtraFields();
-	                    if ($result < 0) $error++;
-                    }
+					if (!$error)
+					{
+						$result = $this->insertExtraFields();
+						if ($result < 0) $error++;
+					}
 
 					if (!$error && !$notrigger)
-	                {
+					{
 						// Call trigger
 						$result = $this->call_trigger('ORDER_SUPPLIER_CREATE', $user);
 						if ($result < 0)
-	                    {
-	                        $this->db->rollback();
-	                        return -1;
-	                    }
+						{
+							$this->db->rollback();
+							return -1;
+						}
 						// End call triggers
-	                }
+					}
 
-	                $this->db->commit();
-	                return $this->id;
-	            }
-	            else
-	            {
-	                $this->error = $this->db->lasterror();
-	                $this->db->rollback();
-	                return -2;
-	            }
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+					$this->db->commit();
+					return $this->id;
+				} else {
+					$this->error = $this->db->lasterror();
+					$this->db->rollback();
+					return -2;
+				}
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *	Load an object from its id and create a new one in database
-     *
+	/**
+	 *	Load an object from its id and create a new one in database
+	 *
 	 *  @param	    User	$user		User making the clone
 	 *	@param		int		$socid		Id of thirdparty
-     *	@return		int					New id of clone
-     */
-    public function createFromClone(User $user, $socid = 0)
-    {
-    	global $conf, $user, $hookmanager;
+	 *	@return		int					New id of clone
+	 */
+	public function createFromClone(User $user, $socid = 0)
+	{
+		global $conf, $user, $hookmanager;
 
-        $error = 0;
+		$error = 0;
 
 		$this->db->begin();
 
-        // get extrafields so they will be clone
-        foreach ($this->lines as $line)
-            $line->fetch_optionals();
+		// get extrafields so they will be clone
+		foreach ($this->lines as $line)
+			$line->fetch_optionals();
 
 		// Load source object
 		$objFrom = clone $this;
@@ -1526,94 +1469,92 @@ class CommandeFournisseur extends CommonOrder
 			// TODO Change product price if multi-prices
 		}
 
-        $this->id = 0;
-        $this->statut = self::STATUS_DRAFT;
+		$this->id = 0;
+		$this->statut = self::STATUS_DRAFT;
 
-        // Clear fields
-        $this->user_author_id     = $user->id;
-        $this->user_valid         = '';
-        $this->date_creation      = '';
-        $this->date_validation    = '';
-        $this->ref_supplier       = '';
-        $this->user_approve_id    = '';
-        $this->user_approve_id2   = '';
-        $this->date_approve       = '';
-        $this->date_approve2      = '';
+		// Clear fields
+		$this->user_author_id     = $user->id;
+		$this->user_valid         = '';
+		$this->date_creation      = '';
+		$this->date_validation    = '';
+		$this->ref_supplier       = '';
+		$this->user_approve_id    = '';
+		$this->user_approve_id2   = '';
+		$this->date_approve       = '';
+		$this->date_approve2      = '';
 
-        // Create clone
-        $this->context['createfromclone'] = 'createfromclone';
-        $result = $this->create($user);
-        if ($result < 0) $error++;
+		// Create clone
+		$this->context['createfromclone'] = 'createfromclone';
+		$result = $this->create($user);
+		if ($result < 0) $error++;
 
-        if (!$error)
-        {
-            // Hook of thirdparty module
-            if (is_object($hookmanager))
-            {
-                $parameters = array('objFrom'=>$objFrom);
-                $action = '';
-                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
-            }
-        }
+		if (!$error)
+		{
+			// Hook of thirdparty module
+			if (is_object($hookmanager))
+			{
+				$parameters = array('objFrom'=>$objFrom);
+				$action = '';
+				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+			}
+		}
 
 		unset($this->context['createfromclone']);
 
 		// End
-        if (!$error)
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		if (!$error)
+		{
+			$this->db->commit();
+			return $this->id;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *	Add order line
-     *
-     *	@param      string	$desc            		Description
-     *	@param      float	$pu_ht              	Unit price
-     *	@param      float	$qty             		Quantity
-     *	@param      float	$txtva           		Taux tva
-     *	@param      float	$txlocaltax1        	Localtax1 tax
-     *  @param      float	$txlocaltax2        	Localtax2 tax
-     *	@param      int		$fk_product      		Id product
-     *  @param      int		$fk_prod_fourn_price	Id supplier price
-     *  @param      string	$ref_supplier			Supplier reference price
-     *	@param      float	$remise_percent  		Remise
-     *	@param      string	$price_base_type		HT or TTC
-     *	@param		float	$pu_ttc					Unit price TTC
-     *	@param		int		$type					Type of line (0=product, 1=service)
-     *	@param		int		$info_bits				More information
-     *  @param		bool	$notrigger				Disable triggers
-     *  @param		int		$date_start				Date start of service
-     *  @param		int		$date_end				Date end of service
+	/**
+	 *	Add order line
+	 *
+	 *	@param      string	$desc            		Description
+	 *	@param      float	$pu_ht              	Unit price
+	 *	@param      float	$qty             		Quantity
+	 *	@param      float	$txtva           		Taux tva
+	 *	@param      float	$txlocaltax1        	Localtax1 tax
+	 *  @param      float	$txlocaltax2        	Localtax2 tax
+	 *	@param      int		$fk_product      		Id product
+	 *  @param      int		$fk_prod_fourn_price	Id supplier price
+	 *  @param      string	$ref_supplier			Supplier reference price
+	 *	@param      float	$remise_percent  		Remise
+	 *	@param      string	$price_base_type		HT or TTC
+	 *	@param		float	$pu_ttc					Unit price TTC
+	 *	@param		int		$type					Type of line (0=product, 1=service)
+	 *	@param		int		$info_bits				More information
+	 *  @param		bool	$notrigger				Disable triggers
+	 *  @param		int		$date_start				Date start of service
+	 *  @param		int		$date_end				Date end of service
 	 *  @param		array	$array_options			extrafields array
-     *  @param 		string	$fk_unit 				Code of the unit to use. Null to use the default one
+	 *  @param 		string	$fk_unit 				Code of the unit to use. Null to use the default one
 	 *  @param 		string	$pu_ht_devise			Amount in currency
 	 *  @param		string	$origin					'order', ...
 	 *  @param		int		$origin_id				Id of origin object
-     *	@return     int             				<=0 if KO, >0 if OK
-     */
+	 *	@return     int             				<=0 if KO, >0 if OK
+	 */
 	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0.0, $txlocaltax2 = 0.0, $fk_product = 0, $fk_prod_fourn_price = 0, $ref_supplier = '', $remise_percent = 0.0, $price_base_type = 'HT', $pu_ttc = 0.0, $type = 0, $info_bits = 0, $notrigger = false, $date_start = null, $date_end = null, $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $origin = '', $origin_id = 0)
-    {
-        global $langs, $mysoc, $conf;
+	{
+		global $langs, $mysoc, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $info_bits, $notrigger, $date_start, $date_end, $fk_unit, $pu_ht_devise, $origin, $origin_id");
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $info_bits, $notrigger, $date_start, $date_end, $fk_unit, $pu_ht_devise, $origin, $origin_id");
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		if ($this->statut == self::STATUS_DRAFT)
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
-			if (!$qty) $qty = 1;
+			if (empty($qty)) $qty = 0;
 			if (!$info_bits) $info_bits = 0;
 			if (empty($txtva)) $txtva = 0;
 			if (empty($txlocaltax1)) $txlocaltax1 = 0;
@@ -1633,9 +1574,7 @@ class CommandeFournisseur extends CommonOrder
 			if ($price_base_type == 'HT')
 			{
 				$pu = $pu_ht;
-			}
-			else
-			{
+			} else {
 				$pu = $pu_ttc;
 			}
 			$desc = trim($desc);
@@ -1654,65 +1593,63 @@ class CommandeFournisseur extends CommonOrder
 			}
 
 
-            $this->db->begin();
+			$this->db->begin();
 
-            if ($fk_product > 0)
-            {
-            	if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY))
-                {
-                    // Check quantity is enough
-                    dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." ref_supplier=".$ref_supplier);
-                    $prod = new Product($this->db);
-                    if ($prod->fetch($fk_product) > 0)
-                    {
-                        $product_type = $prod->type;
-                        $label = $prod->label;
+			if ($fk_product > 0)
+			{
+				if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY))
+				{
+					// Check quantity is enough
+					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_prod_fourn_price=".$fk_prod_fourn_price." qty=".$qty." ref_supplier=".$ref_supplier);
+					$prod = new Product($this->db);
+					if ($prod->fetch($fk_product) > 0)
+					{
+						$product_type = $prod->type;
+						$label = $prod->label;
 
-                        // We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
-                        // If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
-                        $result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
-                        // If supplier order created from customer order, we take best supplier price
-                        // If $pu (defined previously from pu_ht or pu_ttc) is not defined at all, we also take the best supplier price
-                        if ($result > 0 && ($origin == 'commande' || $pu === ''))
-                        {
-                        	$pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
-                        	$ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
-                        	// is remise percent not keyed but present for the product we add it
-                        	if ($remise_percent == 0 && $prod->remise_percent != 0) $remise_percent = $prod->remise_percent;
-                        }
-                        if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
-                        {
-                            $langs->load("errors");
-                            $this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
-                            $this->db->rollback();
-                            dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
-                            //$pu    = $prod->fourn_pu;     // We do not overwrite unit price
-                            //$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
-                            return -1;
-                        }
-                        if ($result == -1)
-                        {
-                            $langs->load("errors");
-                            $this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
-                            $this->db->rollback();
-                            dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
-                            return -1;
-                        }
-                        if ($result < -1)
-                        {
-                            $this->error = $prod->error;
-                            $this->db->rollback();
-                            dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
-                            return -1;
-                        }
-                    }
-                    else
-    				{
-                        $this->error = $prod->error;
-                        $this->db->rollback();
-                        return -1;
-                    }
-                }
+						// We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
+						// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+						$result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+						// If supplier order created from customer order, we take best supplier price
+						// If $pu (defined previously from pu_ht or pu_ttc) is not defined at all, we also take the best supplier price
+						if ($result > 0 && ($origin == 'commande' || $pu === ''))
+						{
+							$pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+							$ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
+							// is remise percent not keyed but present for the product we add it
+							if ($remise_percent == 0 && $prod->remise_percent != 0) $remise_percent = $prod->remise_percent;
+						}
+						if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
+						{
+							$langs->load("errors");
+							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
+							//$pu    = $prod->fourn_pu;     // We do not overwrite unit price
+							//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
+							return -1;
+						}
+						if ($result == -1)
+						{
+							$langs->load("errors");
+							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
+							return -1;
+						}
+						if ($result < -1)
+						{
+							$this->error = $prod->error;
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
+							return -1;
+						}
+					} else {
+						$this->error = $prod->error;
+						$this->db->rollback();
+						return -1;
+					}
+				}
 
 				// redefine quantity according to packaging
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
@@ -1722,9 +1659,7 @@ class CommandeFournisseur extends CommonOrder
 					if ($qty < $prod->packaging)
 					{
 						$qty = $prod->packaging;
-					}
-					else
-					{
+					} else {
 						if (($qty % $prod->packaging) > 0)
 						{
 							$coeff = intval($qty / $prod->packaging) + 1;
@@ -1733,469 +1668,447 @@ class CommandeFournisseur extends CommonOrder
 						}
 					}
 				}
-            }
-            else
-            {
-                $product_type = $type;
-            }
+			} else {
+				$product_type = $type;
+			}
 
-            if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
-            	$pu = 0;
-            }
+			if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+				$pu = 0;
+			}
 
-            $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
+			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
-            // 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.
+			}
 
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et 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.
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et 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.
 
-            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $this->thirdparty, $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, $product_type, $this->thirdparty, $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 = $pu_ht = $tabprice[3];
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
+			$pu = $pu_ht = $tabprice[3];
 
 			// MultiCurrency
 			$multicurrency_total_ht = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-            $localtax1_type = $localtaxes_type[0];
+			$localtax1_type = $localtaxes_type[0];
 			$localtax2_type = $localtaxes_type[2];
 
-            $subprice = price2num($pu, 'MU');
+			$subprice = price2num($pu, 'MU');
 
-            $rangmax = $this->line_max();
-            $rang = $rangmax + 1;
+			$rangmax = $this->line_max();
+			$rang = $rangmax + 1;
 
-            // Insert line
-            $this->line = new CommandeFournisseurLigne($this->db);
+			// Insert line
+			$this->line = new CommandeFournisseurLigne($this->db);
 
-            $this->line->context = $this->context;
+			$this->line->context = $this->context;
 
-            $this->line->fk_commande = $this->id;
-            $this->line->label = $label;
-            $this->line->ref_fourn = $ref_supplier;
-            $this->line->ref_supplier = $ref_supplier;
-            $this->line->desc = $desc;
-            $this->line->qty = $qty;
-            $this->line->tva_tx = $txtva;
-            $this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
-            $this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-            $this->line->localtax1_type = $localtaxes_type[0];
-            $this->line->localtax2_type = $localtaxes_type[2];
-            $this->line->fk_product = $fk_product;
-            $this->line->product_type = $product_type;
-            $this->line->remise_percent = $remise_percent;
-            $this->line->subprice = $pu_ht;
-            $this->line->rang = $rang;
-            $this->line->info_bits = $info_bits;
+			$this->line->fk_commande = $this->id;
+			$this->line->label = $label;
+			$this->line->ref_fourn = $ref_supplier;
+			$this->line->ref_supplier = $ref_supplier;
+			$this->line->desc = $desc;
+			$this->line->qty = $qty;
+			$this->line->tva_tx = $txtva;
+			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
+			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
+			$this->line->localtax1_type = $localtaxes_type[0];
+			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->fk_product = $fk_product;
+			$this->line->product_type = $product_type;
+			$this->line->remise_percent = $remise_percent;
+			$this->line->subprice = $pu_ht;
+			$this->line->rang = $rang;
+			$this->line->info_bits = $info_bits;
 
-            $this->line->vat_src_code = $vat_src_code;
-            $this->line->total_ht = $total_ht;
-            $this->line->total_tva = $total_tva;
-            $this->line->total_localtax1 = $total_localtax1;
-            $this->line->total_localtax2 = $total_localtax2;
-            $this->line->total_ttc = $total_ttc;
-            $this->line->product_type = $type;
-            $this->line->special_code = $this->special_code;
-            $this->line->origin = $origin;
-            $this->line->origin_id = $origin_id;
-            $this->line->fk_unit = $fk_unit;
+			$this->line->vat_src_code = $vat_src_code;
+			$this->line->total_ht = $total_ht;
+			$this->line->total_tva = $total_tva;
+			$this->line->total_localtax1 = $total_localtax1;
+			$this->line->total_localtax2 = $total_localtax2;
+			$this->line->total_ttc = $total_ttc;
+			$this->line->product_type = $type;
+			$this->line->special_code = $this->special_code;
+			$this->line->origin = $origin;
+			$this->line->origin_id = $origin_id;
+			$this->line->fk_unit = $fk_unit;
 
-            $this->line->date_start = $date_start;
-            $this->line->date_end = $date_end;
+			$this->line->date_start = $date_start;
+			$this->line->date_end = $date_end;
 
-            // Multicurrency
-            $this->line->fk_multicurrency = $this->fk_multicurrency;
-            $this->line->multicurrency_code = $this->multicurrency_code;
-            $this->line->multicurrency_subprice		= $pu_ht_devise;
-            $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			// Multicurrency
+			$this->line->fk_multicurrency = $this->fk_multicurrency;
+			$this->line->multicurrency_code = $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= $pu_ht_devise;
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-            $this->line->subprice = $pu_ht;
-            $this->line->price = $this->line->subprice;
+			$this->line->subprice = $pu_ht;
+			$this->line->price = $this->line->subprice;
 
-            $this->line->remise_percent = $remise_percent;
+			$this->line->remise_percent = $remise_percent;
 
-            if (is_array($array_options) && count($array_options) > 0) {
-                $this->line->array_options = $array_options;
-            }
+			if (is_array($array_options) && count($array_options) > 0) {
+				$this->line->array_options = $array_options;
+			}
 
-            $result = $this->line->insert($notrigger);
-            if ($result > 0)
-            {
-                // Reorder if child line
-                if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+			$result = $this->line->insert($notrigger);
+			if ($result > 0)
+			{
+				// Reorder if child line
+				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
-                // Mise a jour informations denormalisees au niveau de la commande meme
-                $result = $this->update_price(1, 'auto', 0, $this->thirdparty); // 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->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->error = $this->line->error;
-                $this->errors = $this->line->errors;
-                dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
-                $this->db->rollback();
-                return -1;
-            }
-        }
-    }
+				// Mise a jour informations denormalisees au niveau de la commande meme
+				$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // 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->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->error = $this->line->error;
+				$this->errors = $this->line->errors;
+				dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -1;
+			}
+		}
+	}
 
 
-    /**
-     * Save a receiving into the tracking table of receiving (commande_fournisseur_dispatch) and add product into stock warehouse.
-     *
-     * @param 	User		$user					User object making change
-     * @param 	int			$product				Id of product to dispatch
-     * @param 	double		$qty					Qty to dispatch
-     * @param 	int			$entrepot				Id of warehouse to add product
-     * @param 	double		$price					Unit Price for PMP value calculation (Unit price without Tax and taking into account discount)
-     * @param	string		$comment				Comment for stock movement
+	/**
+	 * Save a receiving into the tracking table of receiving (commande_fournisseur_dispatch) and add product into stock warehouse.
+	 *
+	 * @param 	User		$user					User object making change
+	 * @param 	int			$product				Id of product to dispatch
+	 * @param 	double		$qty					Qty to dispatch
+	 * @param 	int			$entrepot				Id of warehouse to add product
+	 * @param 	double		$price					Unit Price for PMP value calculation (Unit price without Tax and taking into account discount)
+	 * @param	string		$comment				Comment for stock movement
 	 * @param	integer		$eatby					eat-by date
 	 * @param	integer		$sellby					sell-by date
 	 * @param	string		$batch					Lot number
 	 * @param	int			$fk_commandefourndet	Id of supplier order line
-     * @param	int			$notrigger          	1 = notrigger
-     * @return 	int						<0 if KO, >0 if OK
-     */
-    public function dispatchProduct($user, $product, $qty, $entrepot, $price = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $fk_commandefourndet = 0, $notrigger = 0)
-    {
-        global $conf, $langs;
+	 * @param	int			$notrigger          	1 = notrigger
+	 * @return 	int						<0 if KO, >0 if OK
+	 */
+	public function dispatchProduct($user, $product, $qty, $entrepot, $price = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $fk_commandefourndet = 0, $notrigger = 0)
+	{
+		global $conf, $langs;
 
-        $error = 0;
-        require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+		$error = 0;
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
-        // Check parameters (if test are wrong here, there is bug into caller)
-        if ($entrepot <= 0)
-        {
-            $this->error = 'ErrorBadValueForParameterWarehouse';
-            return -1;
-        }
-        if ($qty == 0)
-        {
-            $this->error = 'ErrorBadValueForParameterQty';
-            return -1;
-        }
+		// Check parameters (if test are wrong here, there is bug into caller)
+		if ($entrepot <= 0)
+		{
+			$this->error = 'ErrorBadValueForParameterWarehouse';
+			return -1;
+		}
+		if ($qty == 0)
+		{
+			$this->error = 'ErrorBadValueForParameterQty';
+			return -1;
+		}
 
-        $dispatchstatus = 1;
-        if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0; // Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
+		$dispatchstatus = 1;
+		if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0; // Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
 
-        $now = dol_now();
+		$now = dol_now();
 
-        if (($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY || $this->statut == self::STATUS_RECEIVED_COMPLETELY))
-        {
-            $this->db->begin();
+		if (($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY || $this->statut == self::STATUS_RECEIVED_COMPLETELY))
+		{
+			$this->db->begin();
 
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
-            $sql .= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch) VALUES";
-            $sql .= " ('".$this->id."','".$product."','".$qty."',".($entrepot > 0 ? "'".$entrepot."'" : "null").",'".$user->id."','".$this->db->idate($now)."','".$fk_commandefourndet."', ".$dispatchstatus.", '".$this->db->escape($comment)."', ";
-            $sql .= ($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ".($batch ? "'".$batch."'" : "null");
-            $sql .= ")";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
+			$sql .= " (fk_commande, fk_product, qty, fk_entrepot, fk_user, datec, fk_commandefourndet, status, comment, eatby, sellby, batch) VALUES";
+			$sql .= " ('".$this->id."','".$product."','".$qty."',".($entrepot > 0 ? "'".$entrepot."'" : "null").",'".$user->id."','".$this->db->idate($now)."','".$fk_commandefourndet."', ".$dispatchstatus.", '".$this->db->escape($comment)."', ";
+			$sql .= ($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ".($batch ? "'".$this->db->escape($batch)."'" : "null");
+			$sql .= ")";
 
-            dol_syslog(get_class($this)."::dispatchProduct", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                if (!$notrigger)
-                {
-                    global $conf, $langs, $user;
+			dol_syslog(get_class($this)."::dispatchProduct", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				if (!$notrigger)
+				{
+					global $conf, $langs, $user;
 					// Call trigger
 					$result = $this->call_trigger('LINEORDER_SUPPLIER_DISPATCH', $user);
 					if ($result < 0)
-                    {
-                        $error++;
-                    }
+					{
+						$error++;
+					}
 					// End call triggers
-                }
-            }
-            else
+				}
+			} else {
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+
+			// If module stock is enabled and the stock increase is done on purchase order dispatching
+			if (!$error && $entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
 			{
-                $this->error = $this->db->lasterror();
-                $error++;
-            }
-
-            // If module stock is enabled and the stock increase is done on purchase order dispatching
-            if (!$error && $entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
-            {
-                $mouv = new MouvementStock($this->db);
-                if ($product > 0)
-                {
-                	// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
-                	$mouv->origin = &$this;
+				$mouv = new MouvementStock($this->db);
+				if ($product > 0)
+				{
+					// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
+					$mouv->origin = &$this;
 					$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch);
-                    if ($result < 0)
-                    {
-                        $this->error = $mouv->error;
-                        $this->errors = $mouv->errors;
-                        dol_syslog(get_class($this)."::dispatchProduct ".$this->error." ".join(',', $this->errors), LOG_ERR);
-                        $error++;
-                    }
-                }
-            }
+					if ($result < 0)
+					{
+						$this->error = $mouv->error;
+						$this->errors = $mouv->errors;
+						dol_syslog(get_class($this)."::dispatchProduct ".$this->error." ".join(',', $this->errors), LOG_ERR);
+						$error++;
+					}
+				}
+			}
 
-            if ($error == 0)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
+			if ($error == 0)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = 'BadStatusForObject';
+			return -2;
+		}
+	}
+
+	/**
+	 * 	Delete line
+	 *
+	 *	@param	int		$idline		Id of line to delete
+	 *	@param	int		$notrigger	1=Disable call to triggers
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function deleteline($idline, $notrigger = 0)
+	{
+		if ($this->statut == 0)
 		{
-            $this->error = 'BadStatusForObject';
-            return -2;
-        }
-    }
+			$line = new CommandeFournisseurLigne($this->db);
 
-    /**
-     * 	Delete line
-     *
-     *	@param	int		$idline		Id of line to delete
-     *	@param	int		$notrigger	1=Disable call to triggers
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function deleteline($idline, $notrigger = 0)
-    {
-        if ($this->statut == 0)
-        {
-            $line = new CommandeFournisseurLigne($this->db);
+			if ($line->fetch($idline) <= 0)
+			{
+				return 0;
+			}
 
-            if ($line->fetch($idline) <= 0)
-            {
-                return 0;
-            }
+			if ($line->delete($notrigger) > 0)
+			{
+				$this->update_price();
+				return 1;
+			} else {
+				$this->error = $line->error;
+				$this->errors = $line->errors;
+				return -1;
+			}
+		} else {
+			return -2;
+		}
+	}
 
-            if ($line->delete($notrigger) > 0)
-            {
-                $this->update_price();
-                return 1;
-            }
-            else
-            {
-                $this->error = $line->error;
-                $this->errors = $line->errors;
-                return -1;
-            }
-        }
-        else
-        {
-            return -2;
-        }
-    }
+	/**
+	 *  Delete an order
+	 *
+	 *	@param	User	$user		Object user
+	 *	@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)
+	{
+		global $langs, $conf;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    /**
-     *  Delete an order
-     *
-     *	@param	User	$user		Object user
-     *	@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)
-    {
-        global $langs, $conf;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$error = 0;
 
-        $error = 0;
+		$this->db->begin();
 
-        $this->db->begin();
+		if (empty($notrigger))
+		{
+			// Call trigger
+			$result = $this->call_trigger('ORDER_SUPPLIER_DELETE', $user);
+			if ($result < 0)
+			{
+				$this->errors[] = 'ErrorWhenRunningTrigger';
+				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -1;
+			}
+			// End call triggers
+		}
 
-        if (empty($notrigger))
-        {
-            // Call trigger
-            $result = $this->call_trigger('ORDER_SUPPLIER_DELETE', $user);
-            if ($result < 0)
-            {
-            	$this->errors[] = 'ErrorWhenRunningTrigger';
-            	dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
-            	$this->db->rollback();
-            	return -1;
-            }
-            // End call triggers
-        }
+		$main = MAIN_DB_PREFIX.'commande_fournisseurdet';
+		$ef = $main."_extrafields";
+		$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_commande = ".$this->id.")";
+		dol_syslog(get_class($this)."::delete extrafields lines", LOG_DEBUG);
+		if (!$this->db->query($sql))
+		{
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
+			$error++;
+		}
 
-        $main = MAIN_DB_PREFIX.'commande_fournisseurdet';
-        $ef = $main."_extrafields";
-        $sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_commande = ".$this->id.")";
-        dol_syslog(get_class($this)."::delete extrafields lines", LOG_DEBUG);
-        if (!$this->db->query($sql))
-        {
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->db->lasterror();
-            $error++;
-        }
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =".$this->id;
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		if (!$this->db->query($sql))
+		{
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
+			$error++;
+		}
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =".$this->id;
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        if (!$this->db->query($sql))
-        {
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->db->lasterror();
-            $error++;
-        }
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id;
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		if ($resql = $this->db->query($sql))
+		{
+			if ($this->db->affected_rows($resql) < 1)
+			{
+				$this->error = $this->db->lasterror();
+				$this->errors[] = $this->db->lasterror();
+				$error++;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
+			$error++;
+		}
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id;
-        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-        if ($resql = $this->db->query($sql))
-        {
-            if ($this->db->affected_rows($resql) < 1)
-            {
-                $this->error = $this->db->lasterror();
-                $this->errors[] = $this->db->lasterror();
-                $error++;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->db->lasterror();
-            $error++;
-        }
-
-        // Remove extrafields
-        if (!$error)
-        {
-        	$result = $this->deleteExtraFields();
-        	if ($result < 0)
-        	{
-        		$this->error = 'FailToDeleteExtraFields';
-        		$this->errors[] = 'FailToDeleteExtraFields';
-        		$error++;
-        		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-        	}
-        }
+		// Remove extrafields
+		if (!$error)
+		{
+			$result = $this->deleteExtraFields();
+			if ($result < 0)
+			{
+				$this->error = 'FailToDeleteExtraFields';
+				$this->errors[] = 'FailToDeleteExtraFields';
+				$error++;
+				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+			}
+		}
 
 		// Delete linked object
-    	$res = $this->deleteObjectLinked();
-    	if ($res < 0) {
-    		$this->error = 'FailToDeleteObjectLinked';
-    		$this->errors[] = 'FailToDeleteObjectLinked';
-    		$error++;
-    	}
+		$res = $this->deleteObjectLinked();
+		if ($res < 0) {
+			$this->error = 'FailToDeleteObjectLinked';
+			$this->errors[] = 'FailToDeleteObjectLinked';
+			$error++;
+		}
 
-        if (!$error)
-        {
+		if (!$error)
+		{
         	// 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);
-        	if ($conf->fournisseur->commande->dir_output)
-        	{
-        		$dir = $conf->fournisseur->commande->dir_output."/".$ref;
-        		$file = $dir."/".$ref.".pdf";
-        		if (file_exists($file))
-        		{
-        			if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-        			{
-        				$this->error = 'ErrorFailToDeleteFile';
-        				$this->errors[] = 'ErrorFailToDeleteFile';
-        				$error++;
-        			}
-        		}
-        		if (file_exists($dir))
-        		{
-        			$res = @dol_delete_dir_recursive($dir);
-        			if (!$res)
-        			{
-        				$this->error = 'ErrorFailToDeleteDir';
-        				$this->errors[] = 'ErrorFailToDeleteDir';
-        				$error++;
-        			}
-        		}
-        	}
-        }
+			// We remove directory
+			$ref = dol_sanitizeFileName($this->ref);
+			if ($conf->fournisseur->commande->dir_output)
+			{
+				$dir = $conf->fournisseur->commande->dir_output."/".$ref;
+				$file = $dir."/".$ref.".pdf";
+				if (file_exists($file))
+				{
+					if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
+					{
+						$this->error = 'ErrorFailToDeleteFile';
+						$this->errors[] = 'ErrorFailToDeleteFile';
+						$error++;
+					}
+				}
+				if (file_exists($dir))
+				{
+					$res = @dol_delete_dir_recursive($dir);
+					if (!$res)
+					{
+						$this->error = 'ErrorFailToDeleteDir';
+						$this->errors[] = 'ErrorFailToDeleteDir';
+						$error++;
+					}
+				}
+			}
+		}
 
 		if (!$error)
 		{
 			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 			$this->db->rollback();
 			return -$error;
 		}
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Get list of order methods
-     *
-     *	@return int 0 if OK, <0 if KO
-     */
-    public function get_methodes_commande()
-    {
-        // phpcs:enable
-        $sql = "SELECT rowid, libelle";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_input_method";
-        $sql .= " WHERE active = 1";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Get list of order methods
+	 *
+	 *	@return int 0 if OK, <0 if KO
+	 */
+	public function get_methodes_commande()
+	{
+		// phpcs:enable
+		$sql = "SELECT rowid, libelle";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method";
+		$sql .= " WHERE active = 1";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $i = 0;
-            $num = $this->db->num_rows($resql);
-            $this->methodes_commande = array();
-            while ($i < $num)
-            {
-                $row = $this->db->fetch_row($resql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$i = 0;
+			$num = $this->db->num_rows($resql);
+			$this->methodes_commande = array();
+			while ($i < $num)
+			{
+				$row = $this->db->fetch_row($resql);
 
-                $this->methodes_commande[$row[0]] = $row[1];
+				$this->methodes_commande[$row[0]] = $row[1];
 
-                $i++;
-            }
-            return 0;
-        }
-        else
-        {
-            return -1;
-        }
-    }
+				$i++;
+			}
+			return 0;
+		} else {
+			return -1;
+		}
+	}
 
-    /**
+	/**
 	 * Return array of dispatched lines waiting to be approved for this order
-     *
-     * @since 8.0 Return dispatched quantity (qty).
+	 *
+	 * @since 8.0 Return dispatched quantity (qty).
 	 *
 	 * @param	int		$status		Filter on stats (-1 = no filter, 0 = lines draft to be approved, 1 = approved lines)
 	 * @return	array				Array of lines
-     */
-    public function getDispachedLines($status = -1)
-    {
-    	$ret = array();
+	 */
+	public function getDispachedLines($status = -1)
+	{
+		$ret = array();
 
-    	// List of already dispatched lines
+		// List of already dispatched lines
 		$sql = "SELECT p.ref, p.label,";
 		$sql .= " e.rowid as warehouse_id, e.ref as entrepot,";
 		$sql .= " cfd.rowid as dispatchedlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status";
@@ -2228,476 +2141,456 @@ class CommandeFournisseur extends CommonOrder
 
 				$i++;
 			}
-		}
-		else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
+		} else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
 
 		return $ret;
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Set a delivery in database for this supplier order
-     *
-     *	@param	User	$user		User that input data
-     *	@param	integer	$date		Date of reception
-     *	@param	string	$type		Type of receipt ('tot' = total/done, 'par' = partial, 'nev' = never, 'can' = cancel)
-     *	@param	string	$comment	Comment
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function Livraison($user, $date, $type, $comment)
-    {
-        // phpcs:enable
-    	global $conf, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Set a delivery in database for this supplier order
+	 *
+	 *	@param	User	$user		User that input data
+	 *	@param	integer	$date		Date of reception
+	 *	@param	string	$type		Type of receipt ('tot' = total/done, 'par' = partial, 'nev' = never, 'can' = cancel)
+	 *	@param	string	$comment	Comment
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function Livraison($user, $date, $type, $comment)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        $result = 0;
+		$result = 0;
 		$error = 0;
 
-        dol_syslog(get_class($this)."::Livraison");
+		dol_syslog(get_class($this)."::Livraison");
 
-        if ($user->rights->fournisseur->commande->receptionner)
-        {
-        	// Define the new status
-            if ($type == 'par') $statut = self::STATUS_RECEIVED_PARTIALLY;
-            elseif ($type == 'tot')	$statut = self::STATUS_RECEIVED_COMPLETELY;
-            elseif ($type == 'nev') $statut = self::STATUS_CANCELED_AFTER_ORDER;
-            elseif ($type == 'can') $statut = self::STATUS_CANCELED_AFTER_ORDER;
+		if ($user->rights->fournisseur->commande->receptionner)
+		{
+			// Define the new status
+			if ($type == 'par') $statut = self::STATUS_RECEIVED_PARTIALLY;
+			elseif ($type == 'tot')	$statut = self::STATUS_RECEIVED_COMPLETELY;
+			elseif ($type == 'nev') $statut = self::STATUS_CANCELED_AFTER_ORDER;
+			elseif ($type == 'can') $statut = self::STATUS_CANCELED_AFTER_ORDER;
 			else {
-            	$error++;
-                dol_syslog(get_class($this)."::Livraison Error -2", LOG_ERR);
-                return -2;
+				$error++;
+				dol_syslog(get_class($this)."::Livraison Error -2", LOG_ERR);
+				return -2;
 			}
 
-            // Some checks to accept the record
-            if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
-            {
+			// Some checks to accept the record
+			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
+			{
 				// If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done"
-	        	if (!$error && ($type == 'tot'))
-		    	{
-		    		$dispatchedlinearray = $this->getDispachedLines(0);
-		    		if (count($dispatchedlinearray) > 0)
-		    		{
-		    			$result = -1;
-		    			$error++;
-		    			$this->errors[] = 'ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
-		    			dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
-		    		}
-		    	}
-	    		if (!$error && !empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot'))	// Accept to move to reception done, only if status of all line are ok (refuse denied)
-	    		{
-	    			$dispatcheddenied = $this->getDispachedLines(2);
-	    			if (count($dispatchedlinearray) > 0)
-	    			{
-		    			$result = -1;
-		    			$error++;
-		    			$this->errors[] = 'ErrorCantSetReceptionToTotalDoneWithReceptionDenied';
-		    			dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionDenied', LOG_DEBUG);
-	    			}
-	    		}
-            }
+				if (!$error && ($type == 'tot'))
+				{
+					$dispatchedlinearray = $this->getDispachedLines(0);
+					if (count($dispatchedlinearray) > 0)
+					{
+						$result = -1;
+						$error++;
+						$this->errors[] = 'ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
+						dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
+					}
+				}
+				if (!$error && !empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot'))	// Accept to move to reception done, only if status of all line are ok (refuse denied)
+				{
+					$dispatcheddenied = $this->getDispachedLines(2);
+					if (count($dispatchedlinearray) > 0)
+					{
+						$result = -1;
+						$error++;
+						$this->errors[] = 'ErrorCantSetReceptionToTotalDoneWithReceptionDenied';
+						dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionDenied', LOG_DEBUG);
+					}
+				}
+			}
 
-            // TODO LDR01 Add a control test to accept only if ALL predefined products are received (same qty).
+			// TODO LDR01 Add a control test to accept only if ALL predefined products are received (same qty).
 
 
-            if (!$error)
-            {
-                $this->db->begin();
+			if (!$error)
+			{
+				$this->db->begin();
 
-                $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-                $sql .= " SET fk_statut = ".$statut;
-                $sql .= " WHERE rowid = ".$this->id;
-                $sql .= " AND fk_statut IN (".self::STATUS_ORDERSENT.",".self::STATUS_RECEIVED_PARTIALLY.")"; // Process running or Partially received
+				$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+				$sql .= " SET fk_statut = ".$statut;
+				$sql .= " WHERE rowid = ".$this->id;
+				$sql .= " AND fk_statut IN (".self::STATUS_ORDERSENT.",".self::STATUS_RECEIVED_PARTIALLY.")"; // Process running or Partially received
 
-                dol_syslog(get_class($this)."::Livraison", LOG_DEBUG);
-                $resql = $this->db->query($sql);
-                if ($resql)
-                {
-                    $result = 0;
-                    $old_statut = $this->statut;
-                    $this->statut = $statut;
+				dol_syslog(get_class($this)."::Livraison", LOG_DEBUG);
+				$resql = $this->db->query($sql);
+				if ($resql)
+				{
+					$result = 0;
+					$old_statut = $this->statut;
+					$this->statut = $statut;
 					$this->actionmsg2 = $comment;
 
-                    // Call trigger
-                    $result = $this->call_trigger('ORDER_SUPPLIER_RECEIVE', $user);
-                    if ($result < 0) $error++;
-                    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('ORDER_SUPPLIER_RECEIVE', $user);
+					if ($result < 0) $error++;
+					// End call triggers
 
-                    if (!$error)
-                    {
-                        $this->db->commit();
-                    }
-                    else
-                    {
-                        $this->statut = $old_statut;
-                        $this->db->rollback();
-                        $this->error = $this->db->lasterror();
-                        $result = -1;
-                    }
-                }
-                else
-                {
-                    $this->db->rollback();
-                    $this->error = $this->db->lasterror();
-                    $result = -1;
-                }
-            }
-        }
-        else
-        {
-            $this->error = $langs->trans('NotAuthorized');
-            $this->errors[] = $langs->trans('NotAuthorized');
-            dol_syslog(get_class($this)."::Livraison Not Authorized");
-            $result = -3;
-        }
-        return $result;
-    }
+					if (!$error)
+					{
+						$this->db->commit();
+					} else {
+						$this->statut = $old_statut;
+						$this->db->rollback();
+						$this->error = $this->db->lasterror();
+						$result = -1;
+					}
+				} else {
+					$this->db->rollback();
+					$this->error = $this->db->lasterror();
+					$result = -1;
+				}
+			}
+		} else {
+			$this->error = $langs->trans('NotAuthorized');
+			$this->errors[] = $langs->trans('NotAuthorized');
+			dol_syslog(get_class($this)."::Livraison Not Authorized");
+			$result = -3;
+		}
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Set the planned delivery date
-     *
-     *	@param      User			$user        		Objet user making change
-     *	@param      integer  		$date_livraison     Planned delivery date
-     *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
-     *	@return     int         						<0 if KO, >0 if OK
-     */
-    public function set_date_livraison($user, $date_livraison, $notrigger = 0)
-    {
-        // phpcs:enable
-        if ($user->rights->fournisseur->commande->creer)
-        {
-        	$error = 0;
-
-        	$this->db->begin();
-
-        	$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql .= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-            $sql .= " WHERE rowid = ".$this->id;
-
-        	dol_syslog(__METHOD__, LOG_DEBUG);
-        	$resql = $this->db->query($sql);
-        	if (!$resql)
-        	{
-        		$this->errors[] = $this->db->error();
-        		$error++;
-        	}
-
-        	if (!$error)
-        	{
-        		$this->oldcopy = clone $this;
-        		$this->date_livraison = $date_livraison;
-        	}
-
-        	if (!$notrigger && empty($error))
-        	{
-        		// Call trigger
-        		$result = $this->call_trigger('ORDER_SUPPLIER_MODIFY', $user);
-        		if ($result < 0) $error++;
-        		// End call triggers
-        	}
-
-        	if (!$error)
-        	{
-        		$this->db->commit();
-        		return 1;
-        	}
-        	else
-        	{
-        		foreach ($this->errors as $errmsg)
-        		{
-        			dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-        			$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-        		}
-        		$this->db->rollback();
-        		return -1 * $error;
-        	}
-        }
-        else
-        {
-            return -2;
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-     *	Set the id projet
-     *
-     *	@param      User			$user        		Objet utilisateur qui modifie
-     *	@param      int				$id_projet    	 	Date de livraison
-     *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
-     *	@return     int         						<0 si ko, >0 si ok
-     */
-    public function set_id_projet($user, $id_projet, $notrigger = 0)
-    {
-        // phpcs:enable
-        if ($user->rights->fournisseur->commande->creer)
-        {
-        	$error = 0;
+	 *	Set the planned delivery date
+	 *
+	 *	@param      User			$user        		Objet user making change
+	 *	@param      integer  		$date_livraison     Planned delivery date
+	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         						<0 if KO, >0 if OK
+	 */
+	public function set_date_livraison($user, $date_livraison, $notrigger = 0)
+	{
+		// phpcs:enable
+		if ($user->rights->fournisseur->commande->creer)
+		{
+			$error = 0;
 
-        	$this->db->begin();
+			$this->db->begin();
 
-            $sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
-            $sql .= " SET fk_projet = ".($id_projet > 0 ? (int) $id_projet : 'null');
-            $sql .= " WHERE rowid = ".$this->id;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql .= " SET date_livraison = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
 
-            dol_syslog(__METHOD__, LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-            	$this->errors[] = $this->db->error();
-            	$error++;
-            }
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->error();
+				$error++;
+			}
 
-            if (!$error)
-            {
-            	$this->oldcopy = clone $this;
-            	$this->fk_projet = $id_projet;
-            	$this->fk_project = $id_projet;
-            }
+			if (!$error)
+			{
+				$this->oldcopy = clone $this;
+				$this->date_livraison = $date_livraison;
+			}
 
-            if (!$notrigger && empty($error))
-            {
-            	// Call trigger
-            	$result = $this->call_trigger('ORDER_SUPPLIER_MODIFY', $user);
-            	if ($result < 0) $error++;
-            	// End call triggers
-            }
+			if (!$notrigger && empty($error))
+			{
+				// Call trigger
+				$result = $this->call_trigger('ORDER_SUPPLIER_MODIFY', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
 
-            if (!$error)
-            {
-            	$this->db->commit();
-            	return 1;
-            }
-            else
-            {
-            	foreach ($this->errors as $errmsg)
-            	{
-            		dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
-            		$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            	}
-            	$this->db->rollback();
-            	return -1 * $error;
-            }
-        }
-        else
-        {
-            return -2;
-        }
-    }
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				foreach ($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				}
+				$this->db->rollback();
+				return -1 * $error;
+			}
+		} else {
+			return -2;
+		}
+	}
 
-    /**
-     *  Update a supplier order from a customer order
-     *
-     *  @param  User	$user           User that create
-     *  @param  int		$idc			Id of supplier order to update
-     *  @param	int		$comclientid	Id of customer order to use as template
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function updateFromCommandeClient($user, $idc, $comclientid)
-    {
-        $comclient = new Commande($this->db);
-        $comclient->fetch($comclientid);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Set the id projet
+	 *
+	 *	@param      User			$user        		Objet utilisateur qui modifie
+	 *	@param      int				$id_projet    	 	Date de livraison
+	 *  @param     	int				$notrigger			1=Does not execute triggers, 0= execute triggers
+	 *	@return     int         						<0 si ko, >0 si ok
+	 */
+	public function set_id_projet($user, $id_projet, $notrigger = 0)
+	{
+		// phpcs:enable
+		if ($user->rights->fournisseur->commande->creer)
+		{
+			$error = 0;
 
-        $this->id = $idc;
+			$this->db->begin();
 
-        $this->lines = array();
+			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
+			$sql .= " SET fk_projet = ".($id_projet > 0 ? (int) $id_projet : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
 
-        $num = count($comclient->lines);
-        for ($i = 0; $i < $num; $i++)
-        {
-            $prod = new Product($this->db);
-            $label = '';
-            $ref = '';
-            if ($prod->fetch($comclient->lines[$i]->fk_product) > 0)
-            {
-                $label  = $prod->label;
-                $ref    = $prod->ref;
-            }
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				$this->errors[] = $this->db->error();
+				$error++;
+			}
 
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseurdet";
-            $sql .= " (fk_commande, label, description, fk_product, price, qty, tva_tx, localtax1_tx, localtax2_tx, remise_percent, subprice, remise, ref)";
-            $sql .= " VALUES (".$idc.", '".$this->db->escape($label)."','".$this->db->escape($comclient->lines[$i]->desc)."'";
-            $sql .= ",".$comclient->lines[$i]->fk_product.",'".price2num($comclient->lines[$i]->price)."'";
-            $sql .= ", '".$comclient->lines[$i]->qty."', ".$comclient->lines[$i]->tva_tx.", ".$comclient->lines[$i]->localtax1_tx.", ".$comclient->lines[$i]->localtax2_tx.", ".$comclient->lines[$i]->remise_percent;
-            $sql .= ", '".price2num($comclient->lines[$i]->subprice)."','0','".$ref."');";
-            if ($this->db->query($sql))
-            {
-                $this->update_price();
-            }
-        }
+			if (!$error)
+			{
+				$this->oldcopy = clone $this;
+				$this->fk_projet = $id_projet;
+				$this->fk_project = $id_projet;
+			}
 
-        return 1;
-    }
+			if (!$notrigger && empty($error))
+			{
+				// Call trigger
+				$result = $this->call_trigger('ORDER_SUPPLIER_MODIFY', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
 
-    /**
-     *  Tag order with a particular status
-     *
-     *  @param      User	$user       Object user that change status
-     *  @param      int		$status		New status
-     *  @return     int         		<0 if KO, >0 if OK
-     */
-    public function setStatus($user, $status)
-    {
-        global $conf, $langs;
-        $error = 0;
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				foreach ($this->errors as $errmsg)
+				{
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				}
+				$this->db->rollback();
+				return -1 * $error;
+			}
+		} else {
+			return -2;
+		}
+	}
 
-        $this->db->begin();
+	/**
+	 *  Update a supplier order from a customer order
+	 *
+	 *  @param  User	$user           User that create
+	 *  @param  int		$idc			Id of supplier order to update
+	 *  @param	int		$comclientid	Id of customer order to use as template
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function updateFromCommandeClient($user, $idc, $comclientid)
+	{
+		$comclient = new Commande($this->db);
+		$comclient->fetch($comclientid);
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
-        $sql .= ' SET fk_statut='.$status;
-        $sql .= ' WHERE rowid = '.$this->id;
+		$this->id = $idc;
 
-        dol_syslog(get_class($this)."::setStatus", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Trigger names for each status
-        	$triggerName = array();
-            $triggerName[0] = 'DRAFT';
-            $triggerName[1] = 'VALIDATED';
-            $triggerName[2] = 'APPROVED';
-            $triggerName[3] = 'ORDERED'; // Ordered
-            $triggerName[4] = 'RECEIVED_PARTIALLY';
-            $triggerName[5] = 'RECEIVED_COMPLETELY';
-            $triggerName[6] = 'CANCELED';
-            $triggerName[7] = 'CANCELED';
-            $triggerName[9] = 'REFUSED';
+		$this->lines = array();
 
-            // Call trigger
-            $result = $this->call_trigger("ORDER_SUPPLIER_STATUS_".$triggerName[$status], $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
-        else
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this)."::setStatus ".$this->error);
-        }
+		$num = count($comclient->lines);
+		for ($i = 0; $i < $num; $i++)
+		{
+			$prod = new Product($this->db);
+			$label = '';
+			$ref = '';
+			if ($prod->fetch($comclient->lines[$i]->fk_product) > 0)
+			{
+				$label  = $prod->label;
+				$ref    = $prod->ref;
+			}
 
-        if (!$error)
-        {
-            $this->statut = $status;
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseurdet";
+			$sql .= " (fk_commande, label, description, fk_product, price, qty, tva_tx, localtax1_tx, localtax2_tx, remise_percent, subprice, remise, ref)";
+			$sql .= " VALUES (".$idc.", '".$this->db->escape($label)."', ".$this->db->escape($comclient->lines[$i]->desc);
+			$sql .= ",".$comclient->lines[$i]->fk_product.", ".price2num($comclient->lines[$i]->price);
+			$sql .= ", ".$comclient->lines[$i]->qty.", ".$comclient->lines[$i]->tva_tx.", ".$comclient->lines[$i]->localtax1_tx.", ".$comclient->lines[$i]->localtax2_tx.", ".$comclient->lines[$i]->remise_percent;
+			$sql .= ", '".price2num($comclient->lines[$i]->subprice)."','0', '".$this->db->escape($ref)."');";
+			if ($this->db->query($sql))
+			{
+				$this->update_price();
+			}
+		}
 
-    /**
-     *	Update line
-     *
-     *	@param     	int			$rowid           	Id de la ligne de facture
-     *	@param     	string		$desc            	Description de la ligne
-     *	@param     	double		$pu              	Prix unitaire
-     *	@param     	double		$qty             	Quantity
-     *	@param     	double		$remise_percent  	Percent discount on line
-     *	@param     	double		$txtva          	VAT rate
-     *  @param     	double		$txlocaltax1	    Localtax1 tax
-     *  @param     	double		$txlocaltax2   		Localtax2 tax
-     *  @param     	double		$price_base_type 	Type of price base
-     *	@param		int			$info_bits			Miscellaneous informations
-     *	@param		int			$type				Type of line (0=product, 1=service)
-     *  @param		int			$notrigger			Disable triggers
-     *  @param      integer     $date_start     	Date start of service
-     *  @param      integer     $date_end       	Date end of service
+		return 1;
+	}
+
+	/**
+	 *  Tag order with a particular status
+	 *
+	 *  @param      User	$user       Object user that change status
+	 *  @param      int		$status		New status
+	 *  @return     int         		<0 if KO, >0 if OK
+	 */
+	public function setStatus($user, $status)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
+		$sql .= ' SET fk_statut='.$status;
+		$sql .= ' WHERE rowid = '.$this->id;
+
+		dol_syslog(get_class($this)."::setStatus", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Trigger names for each status
+			$triggerName = array();
+			$triggerName[0] = 'DRAFT';
+			$triggerName[1] = 'VALIDATED';
+			$triggerName[2] = 'APPROVED';
+			$triggerName[3] = 'ORDERED'; // Ordered
+			$triggerName[4] = 'RECEIVED_PARTIALLY';
+			$triggerName[5] = 'RECEIVED_COMPLETELY';
+			$triggerName[6] = 'CANCELED';
+			$triggerName[7] = 'CANCELED';
+			$triggerName[9] = 'REFUSED';
+
+			// Call trigger
+			$result = $this->call_trigger("ORDER_SUPPLIER_STATUS_".$triggerName[$status], $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		} else {
+			$error++;
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this)."::setStatus ".$this->error);
+		}
+
+		if (!$error)
+		{
+			$this->statut = $status;
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update line
+	 *
+	 *	@param     	int			$rowid           	Id de la ligne de facture
+	 *	@param     	string		$desc            	Description de la ligne
+	 *	@param     	double		$pu              	Prix unitaire
+	 *	@param     	double		$qty             	Quantity
+	 *	@param     	double		$remise_percent  	Percent discount on line
+	 *	@param     	double		$txtva          	VAT rate
+	 *  @param     	double		$txlocaltax1	    Localtax1 tax
+	 *  @param     	double		$txlocaltax2   		Localtax2 tax
+	 *  @param     	double		$price_base_type 	Type of price base
+	 *	@param		int			$info_bits			Miscellaneous informations
+	 *	@param		int			$type				Type of line (0=product, 1=service)
+	 *  @param		int			$notrigger			Disable triggers
+	 *  @param      integer     $date_start     	Date start of service
+	 *  @param      integer     $date_end       	Date end of service
 	 *  @param		array		$array_options		Extrafields array
-     * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 *  @param		string		$ref_supplier		Supplier ref
-     *	@return    	int         	    			< 0 if error, > 0 if ok
-     */
-    public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $notrigger = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
-    {
-        global $mysoc, $conf, $langs;
-        dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit");
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+	 *	@return    	int         	    			< 0 if error, > 0 if ok
+	 */
+	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $notrigger = 0, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
+	{
+		global $mysoc, $conf, $langs;
+		dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit");
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-        $error = 0;
+		$error = 0;
 
-        if ($this->brouillon)
-        {
-            // Clean parameters
-            if (empty($qty)) $qty = 0;
-            if (empty($info_bits)) $info_bits = 0;
-            if (empty($txtva)) $txtva = 0;
-            if (empty($txlocaltax1)) $txlocaltax1 = 0;
-            if (empty($txlocaltax2)) $txlocaltax2 = 0;
-            if (empty($remise)) $remise = 0;
-            if (empty($remise_percent)) $remise_percent = 0;
+		if ($this->brouillon)
+		{
+			// Clean parameters
+			if (empty($qty)) $qty = 0;
+			if (empty($info_bits)) $info_bits = 0;
+			if (empty($txtva)) $txtva = 0;
+			if (empty($txlocaltax1)) $txlocaltax1 = 0;
+			if (empty($txlocaltax2)) $txlocaltax2 = 0;
+			if (empty($remise)) $remise = 0;
+			if (empty($remise_percent)) $remise_percent = 0;
 
-            $remise_percent = price2num($remise_percent);
-            $qty = price2num($qty);
-            if (!$qty) $qty = 1;
-            $pu = price2num($pu);
-        	$pu_ht_devise = price2num($pu_ht_devise);
-            $txtva = price2num($txtva);
-            $txlocaltax1 = price2num($txlocaltax1);
-            $txlocaltax2 = price2num($txlocaltax2);
+			$remise_percent = price2num($remise_percent);
+			$qty = price2num($qty);
+			$pu = price2num($pu);
+			$pu_ht_devise = price2num($pu_ht_devise);
+			$txtva = price2num($txtva);
+			$txlocaltax1 = price2num($txlocaltax1);
+			$txlocaltax2 = price2num($txlocaltax2);
 
-            // Check parameters
-            if ($type < 0) return -1;
-            if ($date_start && $date_end && $date_start > $date_end) {
-                $langs->load("errors");
-                $this->error = $langs->trans('ErrorStartDateGreaterEnd');
-                return -1;
-            }
+			// Check parameters
+			if ($type < 0) return -1;
+			if ($date_start && $date_end && $date_start > $date_end) {
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorStartDateGreaterEnd');
+				return -1;
+			}
 
-            $this->db->begin();
+			$this->db->begin();
 
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et 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.
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et 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, $mysoc, $this->thirdparty);
+			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
-            // 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, $this->thirdparty, $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];
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $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];
 
 			// MultiCurrency
 			$multicurrency_total_ht = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-            $localtax1_type = $localtaxes_type[0];
+			$localtax1_type = $localtaxes_type[0];
 			$localtax2_type = $localtaxes_type[2];
 
-            $subprice = price2num($pu_ht, 'MU');
+			$subprice = price2num($pu_ht, 'MU');
 
-            //Fetch current line from the database and then clone the object and set it in $oldline property
-            $this->line = new CommandeFournisseurLigne($this->db);
-            $this->line->fetch($rowid);
-            $this->line->fetch_optionals();
+			//Fetch current line from the database and then clone the object and set it in $oldline property
+			$this->line = new CommandeFournisseurLigne($this->db);
+			$this->line->fetch($rowid);
+			$this->line->fetch_optionals();
 
-            $oldline = clone $this->line;
-            $this->line->oldline = $oldline;
+			$oldline = clone $this->line;
+			$this->line->oldline = $oldline;
 
-            $this->line->context = $this->context;
+			$this->line->context = $this->context;
 
-            $this->line->fk_commande = $this->id;
-            //$this->line->label=$label;
-            $this->line->desc = $desc;
+			$this->line->fk_commande = $this->id;
+			//$this->line->label=$label;
+			$this->line->desc = $desc;
 
 			// redefine quantity according to packaging
 			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
@@ -2705,9 +2598,7 @@ class CommandeFournisseur extends CommonOrder
 				if ($qty < $this->line->packaging)
 				{
 					$qty = $this->line->packaging;
-				}
-				else
-				{
+				} else {
 					if (($qty % $this->line->packaging) > 0)
 					{
 						$coeff = intval($qty / $this->line->packaging) + 1;
@@ -2717,359 +2608,345 @@ class CommandeFournisseur extends CommonOrder
 				}
 			}
 
-            $this->line->qty = $qty;
+			$this->line->qty = $qty;
 			$this->line->ref_supplier = $ref_supplier;
 
-	        $this->line->vat_src_code = $vat_src_code;
-            $this->line->tva_tx         = $txtva;
-            $this->line->localtax1_tx   = $txlocaltax1;
-            $this->line->localtax2_tx   = $txlocaltax2;
-            $this->line->localtax1_type = $localtaxes_type[0];
-            $this->line->localtax2_type = $localtaxes_type[2];
-            $this->line->remise_percent = $remise_percent;
-            $this->line->subprice       = $pu_ht;
-            $this->line->rang           = $this->rang;
-            $this->line->info_bits      = $info_bits;
-            $this->line->total_ht       = $total_ht;
-            $this->line->total_tva      = $total_tva;
-            $this->line->total_localtax1 = $total_localtax1;
-            $this->line->total_localtax2 = $total_localtax2;
-            $this->line->total_ttc      = $total_ttc;
-            $this->line->product_type   = $type;
-            $this->line->special_code   = $this->special_code;
-            $this->line->origin         = $this->origin;
-            $this->line->fk_unit        = $fk_unit;
+			$this->line->vat_src_code = $vat_src_code;
+			$this->line->tva_tx         = $txtva;
+			$this->line->localtax1_tx   = $txlocaltax1;
+			$this->line->localtax2_tx   = $txlocaltax2;
+			$this->line->localtax1_type = $localtaxes_type[0];
+			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->remise_percent = $remise_percent;
+			$this->line->subprice       = $pu_ht;
+			$this->line->rang           = $this->rang;
+			$this->line->info_bits      = $info_bits;
+			$this->line->total_ht       = $total_ht;
+			$this->line->total_tva      = $total_tva;
+			$this->line->total_localtax1 = $total_localtax1;
+			$this->line->total_localtax2 = $total_localtax2;
+			$this->line->total_ttc      = $total_ttc;
+			$this->line->product_type   = $type;
+			$this->line->special_code   = $this->special_code;
+			$this->line->origin         = $this->origin;
+			$this->line->fk_unit        = $fk_unit;
 
-            $this->line->date_start     = $date_start;
-            $this->line->date_end       = $date_end;
+			$this->line->date_start     = $date_start;
+			$this->line->date_end       = $date_end;
 
-            // Multicurrency
-            $this->line->fk_multicurrency = $this->fk_multicurrency;
-            $this->line->multicurrency_code = $this->multicurrency_code;
-            $this->line->multicurrency_subprice		= $pu_ht_devise;
-            $this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+			// Multicurrency
+			$this->line->fk_multicurrency = $this->fk_multicurrency;
+			$this->line->multicurrency_code = $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= $pu_ht_devise;
+			$this->line->multicurrency_total_ht 	= $multicurrency_total_ht;
+			$this->line->multicurrency_total_tva 	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-            $this->line->subprice = $pu_ht;
-            $this->line->price = $this->line->subprice;
+			$this->line->subprice = $pu_ht;
+			$this->line->price = $this->line->subprice;
 
-            $this->line->remise_percent = $remise_percent;
+			$this->line->remise_percent = $remise_percent;
 
-            if (is_array($array_options) && count($array_options) > 0) {
-            	// We replace values in this->line->array_options only for entries defined into $array_options
-            	foreach ($array_options as $key => $value) {
-            		$this->line->array_options[$key] = $array_options[$key];
-            	}
-            }
+			if (is_array($array_options) && count($array_options) > 0) {
+				// We replace values in this->line->array_options only for entries defined into $array_options
+				foreach ($array_options as $key => $value) {
+					$this->line->array_options[$key] = $array_options[$key];
+				}
+			}
 
-            $result = $this->line->update($notrigger);
+			$result = $this->line->update($notrigger);
 
 
-            // Mise a jour info denormalisees au niveau facture
-            if ($result >= 0)
-            {
-                $this->update_price('', 'auto');
+			// Mise a jour info denormalisees au niveau facture
+			if ($result >= 0)
+			{
+				$this->update_price('', 'auto');
 				$this->db->commit();
 				return $result;
-            }
-            else
-            {
-                $this->error = $this->db->lasterror();
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error = "Order status makes operation forbidden";
-            dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
-            return -2;
-        }
-    }
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = "Order status makes operation forbidden";
+			dol_syslog(get_class($this)."::updateline ".$this->error, LOG_ERR);
+			return -2;
+		}
+	}
 
 
-    /**
-     *  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;
+	/**
+	 *  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;
 
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 
-        dol_syslog(get_class($this)."::initAsSpecimen");
+		dol_syslog(get_class($this)."::initAsSpecimen");
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Find first product
-        $prodid = 0;
-        $product = new ProductFournisseur($this->db);
-        $sql = "SELECT rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product";
-        $sql .= " WHERE entity IN (".getEntity('product').")";
-        $sql .= $this->db->order("rowid", "ASC");
-        $sql .= $this->db->plimit(1);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            $prodid = $obj->rowid;
-        }
+		// Find first product
+		$prodid = 0;
+		$product = new ProductFournisseur($this->db);
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= $this->db->order("rowid", "ASC");
+		$sql .= $this->db->plimit(1);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			$prodid = $obj->rowid;
+		}
 
-        // Initialise parametres
-        $this->id = 0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->socid = 1;
-        $this->date = $now;
-        $this->date_commande = $now;
-        $this->date_lim_reglement = $this->date + 3600 * 24 * 30;
-        $this->cond_reglement_code = 'RECEP';
-        $this->mode_reglement_code = 'CHQ';
+		// Initialise parametres
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->socid = 1;
+		$this->date = $now;
+		$this->date_commande = $now;
+		$this->date_lim_reglement = $this->date + 3600 * 24 * 30;
+		$this->cond_reglement_code = 'RECEP';
+		$this->mode_reglement_code = 'CHQ';
 
-        $this->note_public = 'This is a comment (public)';
-        $this->note_private = 'This is a comment (private)';
+		$this->note_public = 'This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
 
-        $this->multicurrency_tx = 1;
-        $this->multicurrency_code = $conf->currency;
+		$this->multicurrency_tx = 1;
+		$this->multicurrency_code = $conf->currency;
 
-        $this->statut = 0;
+		$this->statut = 0;
 
-        // Lines
-        $nbp = 5;
-        $xnbp = 0;
-        while ($xnbp < $nbp)
-        {
-            $line = new CommandeFournisseurLigne($this->db);
-            $line->desc = $langs->trans("Description")." ".$xnbp;
-            $line->qty = 1;
-            $line->subprice = 100;
-            $line->price = 100;
-            $line->tva_tx = 19.6;
-            $line->localtax1_tx = 0;
-            $line->localtax2_tx = 0;
-            if ($xnbp == 2)
-            {
-                $line->total_ht = 50;
-                $line->total_ttc = 59.8;
-                $line->total_tva = 9.8;
-                $line->remise_percent = 50;
-            }
-            else
-            {
-                $line->total_ht = 100;
-                $line->total_ttc = 119.6;
-                $line->total_tva = 19.6;
-                $line->remise_percent = 00;
-            }
-            $line->fk_product = $prodid;
+		// Lines
+		$nbp = 5;
+		$xnbp = 0;
+		while ($xnbp < $nbp)
+		{
+			$line = new CommandeFournisseurLigne($this->db);
+			$line->desc = $langs->trans("Description")." ".$xnbp;
+			$line->qty = 1;
+			$line->subprice = 100;
+			$line->price = 100;
+			$line->tva_tx = 19.6;
+			$line->localtax1_tx = 0;
+			$line->localtax2_tx = 0;
+			if ($xnbp == 2)
+			{
+				$line->total_ht = 50;
+				$line->total_ttc = 59.8;
+				$line->total_tva = 9.8;
+				$line->remise_percent = 50;
+			} else {
+				$line->total_ht = 100;
+				$line->total_ttc = 119.6;
+				$line->total_tva = 19.6;
+				$line->remise_percent = 00;
+			}
+			$line->fk_product = $prodid;
 
-            $this->lines[$xnbp] = $line;
+			$this->lines[$xnbp] = $line;
 
-            $this->total_ht       += $line->total_ht;
-            $this->total_tva      += $line->total_tva;
-            $this->total_ttc      += $line->total_ttc;
+			$this->total_ht       += $line->total_ht;
+			$this->total_tva      += $line->total_tva;
+			$this->total_ttc      += $line->total_ttc;
 
-            $xnbp++;
-        }
-    }
+			$xnbp++;
+		}
+	}
 
-    /**
-     *	Charge les informations d'ordre info dans l'objet facture
-     *
-     *	@param  int		$id       	Id de la facture a charger
-     *	@return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT c.rowid, date_creation as datec, tms as datem, date_valid as date_validation, date_approve as datea, date_approve2 as datea2,';
-        $sql .= ' fk_user_author, fk_user_modif, fk_user_valid, fk_user_approve, fk_user_approve2';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur as c';
-        $sql .= ' WHERE c.rowid = '.$id;
+	/**
+	 *	Charge les informations d'ordre info dans l'objet facture
+	 *
+	 *	@param  int		$id       	Id de la facture a charger
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT c.rowid, date_creation as datec, tms as datem, date_valid as date_validation, date_approve as datea, date_approve2 as datea2,';
+		$sql .= ' fk_user_author, fk_user_modif, fk_user_valid, fk_user_approve, fk_user_approve2';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur 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;
-                if ($obj->fk_user_author)   $this->user_creation_id = $obj->fk_user_author;
-                if ($obj->fk_user_valid)    $this->user_validation_id = $obj->fk_user_valid;
-                if ($obj->fk_user_modif)    $this->user_modification_id = $obj->fk_user_modif;
-                if ($obj->fk_user_approve)  $this->user_approve_id = $obj->fk_user_approve;
-                if ($obj->fk_user_approve2) $this->user_approve_id2 = $obj->fk_user_approve2;
+		$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)   $this->user_creation_id = $obj->fk_user_author;
+				if ($obj->fk_user_valid)    $this->user_validation_id = $obj->fk_user_valid;
+				if ($obj->fk_user_modif)    $this->user_modification_id = $obj->fk_user_modif;
+				if ($obj->fk_user_approve)  $this->user_approve_id = $obj->fk_user_approve;
+				if ($obj->fk_user_approve2) $this->user_approve_id2 = $obj->fk_user_approve2;
 
-                $this->date_creation     = $this->db->idate($obj->datec);
-                $this->date_modification = $this->db->idate($obj->datem);
-                $this->date_approve      = $this->db->idate($obj->datea);
-                $this->date_approve2     = $this->db->idate($obj->datea2);
-                $this->date_validation   = $this->db->idate($obj->date_validation);
-            }
-            $this->db->free($result);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+				$this->date_creation     = $this->db->idate($obj->datec);
+				$this->date_modification = $this->db->idate($obj->datem);
+				$this->date_approve      = $this->db->idate($obj->datea);
+				$this->date_approve2     = $this->db->idate($obj->datea2);
+				$this->date_validation   = $this->db->idate($obj->date_validation);
+			}
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Charge indicateurs this->nb de tableau de bord
-     *
-     *	@return     int         <0 si ko, >0 si ok
-     */
-    public function load_state_board()
-    {
-        // phpcs:enable
-        global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Charge indicateurs this->nb de tableau de bord
+	 *
+	 *	@return     int         <0 si ko, >0 si ok
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-        $this->nb = array();
-        $clause = "WHERE";
+		$this->nb = array();
+		$clause = "WHERE";
 
-        $sql = "SELECT count(co.rowid) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
-        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." co.entity = ".$conf->entity;
+		$sql = "SELECT count(co.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
+		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." co.entity = ".$conf->entity;
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $this->nb["supplier_orders"] = $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["supplier_orders"] = $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
-     *  @param          int		$mode   "opened", "awaiting" for orders awaiting reception
-     *	@return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
-     */
-    public function load_board($user, $mode = 'opened')
-    {
-        // 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
+	 *  @param          int		$mode   "opened", "awaiting" for orders awaiting reception
+	 *	@return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
+	 */
+	public function load_board($user, $mode = 'opened')
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        $clause = " WHERE";
+		$clause = " WHERE";
 
-        $sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date";
-        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
-        if (!$user->rights->societe->client->voir && !$user->socid)
-        {
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
-            $sql .= " WHERE sc.fk_user = ".$user->id;
-            $clause = " AND";
-        }
-        $sql .= $clause." c.entity = ".$conf->entity;
-        if ($mode === 'awaiting') {
-            $sql .= " AND c.fk_statut = ".self::STATUS_ORDERSENT;
-        }
-        else {
-            $sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
-        }
-        if ($user->socid) $sql .= " AND c.fk_soc = ".$user->socid;
+		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
+		if (!$user->rights->societe->client->voir && !$user->socid)
+		{
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
+			$sql .= " WHERE sc.fk_user = ".$user->id;
+			$clause = " AND";
+		}
+		$sql .= $clause." c.entity = ".$conf->entity;
+		if ($mode === 'awaiting') {
+			$sql .= " AND c.fk_statut = ".self::STATUS_ORDERSENT;
+		} else {
+			$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
+		}
+		if ($user->socid) $sql .= " AND c.fk_soc = ".$user->socid;
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $commandestatic = new CommandeFournisseur($this->db);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$commandestatic = new CommandeFournisseur($this->db);
 
-	        $response = new WorkboardResponse();
-	        $response->warning_delay = $conf->commande->fournisseur->warning_delay / 60 / 60 / 24;
-	        $response->label = $langs->trans("SuppliersOrdersToProcess");
-	        $response->labelShort = $langs->trans("Opened");
-	        $response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2&mainmenu=commercial&leftmenu=orders_suppliers';
-	        $response->img = img_object('', "order");
+			$response = new WorkboardResponse();
+			$response->warning_delay = $conf->commande->fournisseur->warning_delay / 60 / 60 / 24;
+			$response->label = $langs->trans("SuppliersOrdersToProcess");
+			$response->labelShort = $langs->trans("Opened");
+			$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2&mainmenu=commercial&leftmenu=orders_suppliers';
+			$response->img = img_object('', "order");
 
-            if ($mode === 'awaiting') {
-                $response->label = $langs->trans("SuppliersOrdersAwaitingReception");
-                $response->labelShort = $langs->trans("AwaitingReception");
-                $response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=3&mainmenu=commercial&leftmenu=orders_suppliers';
-            }
+			if ($mode === 'awaiting') {
+				$response->label = $langs->trans("SuppliersOrdersAwaitingReception");
+				$response->labelShort = $langs->trans("AwaitingReception");
+				$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=3&mainmenu=commercial&leftmenu=orders_suppliers';
+			}
 
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
 
-                $commandestatic->date_livraison = $this->db->jdate($obj->delivery_date);
-                $commandestatic->date_commande = $this->db->jdate($obj->date_commande);
-                $commandestatic->statut = $obj->fk_statut;
+				$commandestatic->date_livraison = $this->db->jdate($obj->delivery_date);
+				$commandestatic->date_commande = $this->db->jdate($obj->date_commande);
+				$commandestatic->statut = $obj->fk_statut;
 
-                if ($commandestatic->hasDelay()) {
-	                $response->nbtodolate++;
-                }
-            }
+				if ($commandestatic->hasDelay()) {
+					$response->nbtodolate++;
+				}
+			}
 
-            return $response;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			return $response;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     * Returns the translated input method of object (defined if $this->methode_commande_id > 0).
-     * This function make a sql request to get translation. No cache yet, try to not use it inside a loop.
-     *
-     * @return string
-     */
-    public function getInputMethod()
-    {
-        global $db, $langs;
+	/**
+	 * Returns the translated input method of object (defined if $this->methode_commande_id > 0).
+	 * This function make a sql request to get translation. No cache yet, try to not use it inside a loop.
+	 *
+	 * @return string
+	 */
+	public function getInputMethod()
+	{
+		global $db, $langs;
 
-        if ($this->methode_commande_id > 0)
-        {
-            $sql = "SELECT rowid, code, libelle as label";
-            $sql .= " FROM ".MAIN_DB_PREFIX.'c_input_method';
-            $sql .= " WHERE active=1 AND rowid = ".$db->escape($this->methode_commande_id);
+		if ($this->methode_commande_id > 0)
+		{
+			$sql = "SELECT rowid, code, libelle as label";
+			$sql .= " FROM ".MAIN_DB_PREFIX.'c_input_method';
+			$sql .= " WHERE active=1 AND rowid = ".$this->db->escape($this->methode_commande_id);
 
-            $resql = $db->query($sql);
-            if ($resql)
-            {
-                if ($db->num_rows($resql))
-                {
-                    $obj = $db->fetch_object($resql);
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				if ($this->db->num_rows($resql))
+				{
+					$obj = $this->db->fetch_object($resql);
 
-                    $string = $langs->trans($obj->code);
-                    if ($string == $obj->code)
-                    {
-                        $string = $obj->label != '-' ? $obj->label : '';
-                    }
-                    return $string;
-                }
-            }
-            else dol_print_error($db);
-        }
+					$string = $langs->trans($obj->code);
+					if ($string == $obj->code)
+					{
+						$string = $obj->label != '-' ? $obj->label : '';
+					}
+					return $string;
+				}
+			} else dol_print_error($this->db);
+		}
 
-        return '';
-    }
+		return '';
+	}
 
 	/**
 	 *  Create a document onto disk according to template model.
@@ -3079,7 +2956,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  @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)
@@ -3092,8 +2969,8 @@ class CommandeFournisseur extends CommonOrder
 		if (!dol_strlen($modele)) {
 			$modele = 'muscadet';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
 				$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
 			}
@@ -3105,13 +2982,13 @@ class CommandeFournisseur extends CommonOrder
 	}
 
 	/**
-     * Return the max number delivery delay in day
-     *
-     * @param	Translate	$langs		Language object
-     * @return 	string                  Translated string
-     */
-    public function getMaxDeliveryTimeDay($langs)
-    {
+	 * Return the max number delivery delay in day
+	 *
+	 * @param	Translate	$langs		Language object
+	 * @return 	string                  Translated string
+	 */
+	public function getMaxDeliveryTimeDay($langs)
+	{
 		if (empty($this->lines)) return '';
 
 		$obj = new ProductFournisseur($this->db);
@@ -3163,231 +3040,219 @@ class CommandeFournisseur extends CommonOrder
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
-    /**
-     * Is the supplier order delayed?
-     *
-     * @return bool
-     */
-    public function hasDelay()
-    {
-        global $conf;
+	/**
+	 * Is the supplier order delayed?
+	 *
+	 * @return bool
+	 */
+	public function hasDelay()
+	{
+		global $conf;
 
-        if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility
+		if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility
 
-        $now = dol_now();
-        $date_to_test = empty($this->date_delivery) ? $this->date_commande : $this->date_delivery;
+		$now = dol_now();
+		$date_to_test = empty($this->date_delivery) ? $this->date_commande : $this->date_delivery;
 
-        return ($this->statut > 0 && $this->statut < 4) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
-    }
+		return ($this->statut > 0 && $this->statut < 4) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
+	}
 
-    /**
-     * Show the customer delayed info
-     *
-     * @return string       Show delayed information
-     */
-    public function showDelay()
-    {
-        global $conf, $langs;
+	/**
+	 * Show the customer delayed info
+	 *
+	 * @return string       Show delayed information
+	 */
+	public function showDelay()
+	{
+		global $conf, $langs;
 
-        if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility
+		if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility
 
-        if (empty($this->date_delivery)) $text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
-        else $text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
-        $text .= ' '.($conf->commande->fournisseur->warning_delay > 0 ? '+' : '-').' '.round(abs($conf->commande->fournisseur->warning_delay) / 3600 / 24, 1).' '.$langs->trans("days").' < '.$langs->trans("Today");
+		if (empty($this->date_delivery)) $text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+		else $text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_delivery, 'day');
+		$text .= ' '.($conf->commande->fournisseur->warning_delay > 0 ? '+' : '-').' '.round(abs($conf->commande->fournisseur->warning_delay) / 3600 / 24, 1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 
-        return $text;
-    }
+		return $text;
+	}
 
 
-    /**
-     * Calc status regarding to dispatched stock
-     *
-     * @param 		User 	$user                   User action
-     * @param       int     $closeopenorder         Close if received
-     * @param		string	$comment				Comment
-     * @return		int		                        <0 if KO, 0 if not applicable, >0 if OK
-     */
-    public function calcAndSetStatusDispatch(User $user, $closeopenorder = 1, $comment = '')
-    {
-    	global $conf, $langs;
+	/**
+	 * Calc status regarding to dispatched stock
+	 *
+	 * @param 		User 	$user                   User action
+	 * @param       int     $closeopenorder         Close if received
+	 * @param		string	$comment				Comment
+	 * @return		int		                        <0 if KO, 0 if not applicable, >0 if OK
+	 */
+	public function calcAndSetStatusDispatch(User $user, $closeopenorder = 1, $comment = '')
+	{
+		global $conf, $langs;
 
-    	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled))
-    	{
-    		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
+		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 
-    		$qtydelivered = array();
-    		$qtywished = array();
+			$qtydelivered = array();
+			$qtywished = array();
 
-    		$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
-    		$filter = array('t.fk_commande'=>$this->id);
-    		if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
-    			$filter['t.status'] = 1; // Restrict to lines with status validated
-    		}
+			$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
+			$filter = array('t.fk_commande'=>$this->id);
+			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+				$filter['t.status'] = 1; // Restrict to lines with status validated
+			}
 
-    		$ret = $supplierorderdispatch->fetchAll('', '', 0, 0, $filter);
-    		if ($ret < 0)
-    		{
-    			$this->error = $supplierorderdispatch->error; $this->errors = $supplierorderdispatch->errors;
-    			return $ret;
-    		}
-    		else
-    		{
-    			if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0)
-    			{
-    				$date_liv = dol_now();
+			$ret = $supplierorderdispatch->fetchAll('', '', 0, 0, $filter);
+			if ($ret < 0)
+			{
+				$this->error = $supplierorderdispatch->error; $this->errors = $supplierorderdispatch->errors;
+				return $ret;
+			} else {
+				if (is_array($supplierorderdispatch->lines) && count($supplierorderdispatch->lines) > 0)
+				{
+					$date_liv = dol_now();
 
-    				// Build array with quantity deliverd by product
-    				foreach ($supplierorderdispatch->lines as $line) {
-    					$qtydelivered[$line->fk_product] += $line->qty;
-    				}
-    				foreach ($this->lines as $line) {
-    					$qtywished[$line->fk_product] += $line->qty;
-    				}
-    				//Compare array
-    				$diff_array = array_diff_assoc($qtydelivered, $qtywished); // Warning: $diff_array is done only on common keys.
-    				$keysinwishednotindelivered = array_diff(array_keys($qtywished), array_keys($qtydelivered)); // To check we also have same number of keys
-    				$keysindeliverednotinwished = array_diff(array_keys($qtydelivered), array_keys($qtywished)); // To check we also have same number of keys
-    				/*var_dump(array_keys($qtydelivered));
+					// Build array with quantity deliverd by product
+					foreach ($supplierorderdispatch->lines as $line) {
+						$qtydelivered[$line->fk_product] += $line->qty;
+					}
+					foreach ($this->lines as $line) {
+						$qtywished[$line->fk_product] += $line->qty;
+					}
+					//Compare array
+					$diff_array = array_diff_assoc($qtydelivered, $qtywished); // Warning: $diff_array is done only on common keys.
+					$keysinwishednotindelivered = array_diff(array_keys($qtywished), array_keys($qtydelivered)); // To check we also have same number of keys
+					$keysindeliverednotinwished = array_diff(array_keys($qtydelivered), array_keys($qtywished)); // To check we also have same number of keys
+					/*var_dump(array_keys($qtydelivered));
     				var_dump(array_keys($qtywished));
     				var_dump($diff_array);
     				var_dump($keysinwishednotindelivered);
     				var_dump($keysindeliverednotinwished);
     				exit;*/
 
-    				if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) //No diff => mean everythings is received
-    				{
-    					if ($closeopenorder)
-    					{
-        					//$ret=$this->setStatus($user,5);
-    						$ret = $this->Livraison($user, $date_liv, 'tot', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-        					if ($ret < 0) {
-        						return -1;
-        					}
-    					    return 5;
-    					}
-    					else
-    					{
-    					    //Diff => received partially
-    					    //$ret=$this->setStatus($user,4);
-    						$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-    					    if ($ret < 0) {
-    					        return -1;
-    					    }
-    					    return 4;
-    					}
-    				} elseif (!empty($conf->global->SUPPLIER_ORDER_MORE_THAN_WISHED)) {
-                        //set livraison to 'tot' if more products received than wished. (and if $closeopenorder is set to 1 of course...)
+					if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) //No diff => mean everythings is received
+					{
+						if ($closeopenorder)
+						{
+							//$ret=$this->setStatus($user,5);
+							$ret = $this->Livraison($user, $date_liv, 'tot', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+							if ($ret < 0) {
+								return -1;
+							}
+							return 5;
+						} else {
+							//Diff => received partially
+							//$ret=$this->setStatus($user,4);
+							$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+							if ($ret < 0) {
+								return -1;
+							}
+							return 4;
+						}
+					} elseif (!empty($conf->global->SUPPLIER_ORDER_MORE_THAN_WISHED)) {
+						//set livraison to 'tot' if more products received than wished. (and if $closeopenorder is set to 1 of course...)
 
-					    $close = 0;
+						$close = 0;
 
-					    if (count($diff_array) > 0)
-					    {
-                            //there are some difference between  the two arrays
+						if (count($diff_array) > 0)
+						{
+							//there are some difference between  the two arrays
 
-						    //scan the array of results
-						    foreach ($diff_array as $key => $value)
-						    {
-                                //if the quantity delivered is greater or equal to wish quantity
-							    if ($qtydelivered[$key] >= $qtywished[$key])
-							    {
-								    $close++;
-							    }
-						    }
-					    }
+							//scan the array of results
+							foreach ($diff_array as $key => $value)
+							{
+								//if the quantity delivered is greater or equal to wish quantity
+								if ($qtydelivered[$key] >= $qtywished[$key])
+								{
+									$close++;
+								}
+							}
+						}
 
 
-					    if ($close == count($diff_array)) {
-                            //all the products are received equal or more than the wished quantity
-						    if ($closeopenorder) {
-    						    $ret = $this->Livraison($user, $date_liv, 'tot', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-        					    if ($ret < 0) {
-        						    return -1;
-        					    }
-    					        return 5;
-    					    }
-    					    else
-    					    {
-    					        //Diff => received partially
-    					        $ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-							    if ($ret < 0) {
-								    return -1;
-							    }
-							    return 4;
-						    }
-					    }
-					    else
-					    {
-                            //all the products are not received
-						    $ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-						    if ($ret < 0) {
-							    return -1;
-						    }
-						    return 4;
-					    }
-				    }
-    				else
-    				{
-    					//Diff => received partially
-    					$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-    					if ($ret < 0) {
-    						return -1;
-    					}
-    					return 4;
-    				}
-    			}
-    			return 1;
-    		}
-    	}
-    	return 0;
-    }
+						if ($close == count($diff_array)) {
+							//all the products are received equal or more than the wished quantity
+							if ($closeopenorder) {
+								$ret = $this->Livraison($user, $date_liv, 'tot', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+								if ($ret < 0) {
+									return -1;
+								}
+								return 5;
+							} else {
+								//Diff => received partially
+								$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+								if ($ret < 0) {
+									return -1;
+								}
+								return 4;
+							}
+						} else {
+							//all the products are not received
+							$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+							if ($ret < 0) {
+								return -1;
+							}
+							return 4;
+						}
+					} else {
+						//Diff => received partially
+						$ret = $this->Livraison($user, $date_liv, 'par', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
+						if ($ret < 0) {
+							return -1;
+						}
+						return 4;
+					}
+				}
+				return 1;
+			}
+		}
+		return 0;
+	}
 
-    /**
-     *	Load array this->receptions of lines of shipments with nb of products sent for each order line
-     *  Note: For a dedicated shipment, the fetch_lines can be used to load the qty_asked and qty_shipped. This function is use to return qty_shipped cumulated for the order
-     *
-     *	@param      int		$filtre_statut      Filter on shipment status
-     * 	@return     int                			<0 if KO, Nb of lines found if OK
-     */
-    public function loadReceptions($filtre_statut = -1)
-    {
-        $this->receptions = array();
+	/**
+	 *	Load array this->receptions of lines of shipments with nb of products sent for each order line
+	 *  Note: For a dedicated shipment, the fetch_lines can be used to load the qty_asked and qty_shipped. This function is use to return qty_shipped cumulated for the order
+	 *
+	 *	@param      int		$filtre_statut      Filter on shipment status
+	 * 	@return     int                			<0 if KO, Nb of lines found if OK
+	 */
+	public function loadReceptions($filtre_statut = -1)
+	{
+		$this->receptions = array();
 
-        $sql = 'SELECT cd.rowid, cd.fk_product,';
-        $sql .= ' sum(cfd.qty) as qty';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch as cfd,';
-        if ($filtre_statut >= 0) $sql .= ' '.MAIN_DB_PREFIX.'reception as e,';
-        $sql .= ' '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
-        $sql .= ' WHERE';
-        if ($filtre_statut >= 0) $sql .= ' cfd.fk_reception = e.rowid AND';
-        $sql .= ' cfd.fk_commandefourndet = cd.rowid';
-        $sql .= ' AND cd.fk_commande ='.$this->id;
-        if ($this->fk_product > 0) $sql .= ' AND cd.fk_product = '.$this->fk_product;
-        if ($filtre_statut >= 0) $sql .= ' AND e.fk_statut >= '.$filtre_statut;
-        $sql .= ' GROUP BY cd.rowid, cd.fk_product';
+		$sql = 'SELECT cd.rowid, cd.fk_product,';
+		$sql .= ' sum(cfd.qty) as qty';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch as cfd,';
+		if ($filtre_statut >= 0) $sql .= ' '.MAIN_DB_PREFIX.'reception as e,';
+		$sql .= ' '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
+		$sql .= ' WHERE';
+		if ($filtre_statut >= 0) $sql .= ' cfd.fk_reception = e.rowid AND';
+		$sql .= ' cfd.fk_commandefourndet = cd.rowid';
+		$sql .= ' AND cd.fk_commande ='.$this->id;
+		if ($this->fk_product > 0) $sql .= ' AND cd.fk_product = '.$this->fk_product;
+		if ($filtre_statut >= 0) $sql .= ' AND e.fk_statut >= '.$filtre_statut;
+		$sql .= ' GROUP BY cd.rowid, cd.fk_product';
 
 
-        dol_syslog(get_class($this)."::loadReceptions", 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);
-                empty($this->receptions[$obj->rowid]) ? $this->receptions[$obj->rowid] = $obj->qty : $this->receptions[$obj->rowid] += $obj->qty;
-                $i++;
-            }
-            $this->db->free();
+		dol_syslog(get_class($this)."::loadReceptions", 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);
+				empty($this->receptions[$obj->rowid]) ? $this->receptions[$obj->rowid] = $obj->qty : $this->receptions[$obj->rowid] += $obj->qty;
+				$i++;
+			}
+			$this->db->free();
 
-            return $num;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+			return $num;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 }
 
 
@@ -3397,7 +3262,7 @@ class CommandeFournisseur extends CommonOrder
  */
 class CommandeFournisseurLigne extends CommonOrderLine
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'commande_fournisseurdet';
@@ -3407,32 +3272,32 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 */
 	public $table_element = 'commande_fournisseurdet';
 
-    public $oldline;
+	public $oldline;
 
-    /**
-     * Id of parent order
-     * @var int
-     */
-    public $fk_commande;
+	/**
+	 * Id of parent order
+	 * @var int
+	 */
+	public $fk_commande;
 
-    // From llx_commande_fournisseurdet
-    /**
-     * @var int ID
-     */
-    public $fk_parent_line;
+	// From llx_commande_fournisseurdet
+	/**
+	 * @var int ID
+	 */
+	public $fk_parent_line;
 
-    /**
-     * @var int ID
-     */
-    public $fk_facture;
+	/**
+	 * @var int ID
+	 */
+	public $fk_facture;
 
-    /**
-     * @var string supplier order line label
-     */
-    public $label;
+	/**
+	 * @var string supplier order line label
+	 */
+	public $label;
 
-    public $rang = 0;
-    public $special_code = 0;
+	public $rang = 0;
+	public $special_code = 0;
 
 	/**
 	 * Unit price without taxes
@@ -3440,100 +3305,100 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 */
 	public $pu_ht;
 
-    public $date_start;
-    public $date_end;
+	public $date_start;
+	public $date_end;
 
-    // From llx_product_fournisseur_price
+	// From llx_product_fournisseur_price
 
 	/**
 	 * Supplier reference of price when we added the line. May have been changed after line was added.
 	 * @var string
 	 */
-    public $ref_supplier;
-    public $remise;
-    public $product_libelle;
+	public $ref_supplier;
+	public $remise;
+	public $product_libelle;
 
 
-    /**
-     *	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 line order
-     *
-     *  @param  int		$rowid      Id line order
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function fetch($rowid)
-    {
-    	global $conf;
+	/**
+	 *  Load line order
+	 *
+	 *  @param  int		$rowid      Id line order
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function fetch($rowid)
+	{
+		global $conf;
 
-        $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.product_type, cd.description, cd.qty, cd.tva_tx, cd.special_code,';
-        $sql .= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref,';
-        $sql .= ' cd.remise, cd.remise_percent, cd.subprice,';
-        $sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
-        $sql .= ' cd.total_localtax1, cd.total_localtax2,';
-        $sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
-        $sql .= ' cd.date_start, cd.date_end, cd.fk_unit,';
+		$sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.product_type, cd.description, cd.qty, cd.tva_tx, cd.special_code,';
+		$sql .= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref,';
+		$sql .= ' cd.remise, cd.remise_percent, cd.subprice,';
+		$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
+		$sql .= ' cd.total_localtax1, cd.total_localtax2,';
+		$sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
+		$sql .= ' cd.date_start, cd.date_end, cd.fk_unit,';
 		$sql .= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc';
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
 			$sql .= ", pfp.rowid as fk_pfp, pfp.packaging";
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON cd.fk_product = pfp.fk_product and cd.ref = pfp.ref_fourn";
-        $sql .= ' WHERE cd.rowid = '.$rowid;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $objp = $this->db->fetch_object($result);
+		$sql .= ' WHERE cd.rowid = '.$rowid;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$objp = $this->db->fetch_object($result);
 
-            if (!empty($objp))
-            {
-                $this->rowid = $objp->rowid;
-	            $this->id               = $objp->rowid;
-	            $this->fk_commande      = $objp->fk_commande;
-	            $this->desc             = $objp->description;
-	            $this->qty              = $objp->qty;
-	            $this->ref_fourn        = $objp->ref;
-	            $this->ref_supplier     = $objp->ref;
-	            $this->subprice         = $objp->subprice;
-	            $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           = $objp->remise;
-	            $this->remise_percent   = $objp->remise_percent;
-	            $this->fk_product       = $objp->fk_product;
-	            $this->info_bits        = $objp->info_bits;
-	            $this->total_ht         = $objp->total_ht;
-	            $this->total_tva        = $objp->total_tva;
-    	        $this->total_localtax1	= $objp->total_localtax1;
-	            $this->total_localtax2	= $objp->total_localtax2;
-	            $this->total_ttc        = $objp->total_ttc;
-	            $this->product_type     = $objp->product_type;
-	            $this->special_code     = $objp->special_code;
+			if (!empty($objp))
+			{
+				$this->rowid = $objp->rowid;
+				$this->id               = $objp->rowid;
+				$this->fk_commande      = $objp->fk_commande;
+				$this->desc             = $objp->description;
+				$this->qty              = $objp->qty;
+				$this->ref_fourn        = $objp->ref;
+				$this->ref_supplier     = $objp->ref;
+				$this->subprice         = $objp->subprice;
+				$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           = $objp->remise;
+				$this->remise_percent   = $objp->remise_percent;
+				$this->fk_product       = $objp->fk_product;
+				$this->info_bits        = $objp->info_bits;
+				$this->total_ht         = $objp->total_ht;
+				$this->total_tva        = $objp->total_tva;
+				$this->total_localtax1	= $objp->total_localtax1;
+				$this->total_localtax2	= $objp->total_localtax2;
+				$this->total_ttc        = $objp->total_ttc;
+				$this->product_type     = $objp->product_type;
+				$this->special_code     = $objp->special_code;
 
-    	        $this->ref = $objp->product_ref;
-	            $this->product_ref      = $objp->product_ref;
-	            $this->product_libelle  = $objp->product_libelle;
-	            $this->product_desc     = $objp->product_desc;
+				$this->ref = $objp->product_ref;
+				$this->product_ref      = $objp->product_ref;
+				$this->product_libelle  = $objp->product_libelle;
+				$this->product_desc     = $objp->product_desc;
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
 				{
 					$this->packaging = $objp->packaging;
 					$this->fk_fournprice = $objp->fk_pfp;
 				}
 
-	            $this->date_start       		= $this->db->jdate($objp->date_start);
-	            $this->date_end         		= $this->db->jdate($objp->date_end);
-		        $this->fk_unit = $objp->fk_unit;
+				$this->date_start       		= $this->db->jdate($objp->date_start);
+				$this->date_end         		= $this->db->jdate($objp->date_end);
+				$this->fk_unit = $objp->fk_unit;
 
 				$this->multicurrency_subprice	= $objp->multicurrency_subprice;
 				$this->multicurrency_total_ht	= $objp->multicurrency_total_ht;
@@ -3542,297 +3407,284 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
 				$this->fetch_optionals();
 
-	            $this->db->free($result);
-    	        return 1;
-            }
-    	    else
-    	    {
-    	        $this->error = 'Supplier order line  with id='.$rowid.' not found';
-    	        dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
-    	        return 0;
-    	    }
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+				$this->db->free($result);
+				return 1;
+			} else {
+				$this->error = 'Supplier order line  with id='.$rowid.' not found';
+				dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR);
+				return 0;
+			}
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *	Insert line into database
-     *
-     *	@param      int		$notrigger		1 = disable triggers
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function insert($notrigger = 0)
-    {
-        global $conf, $user;
+	/**
+	 *	Insert line into database
+	 *
+	 *	@param      int		$notrigger		1 = disable triggers
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function insert($notrigger = 0)
+	{
+		global $conf, $user;
 
-        $error = 0;
+		$error = 0;
 
-        dol_syslog(get_class($this)."::insert rang=".$this->rang);
+		dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
-        // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx = 0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-        if (empty($this->localtax1_type)) $this->localtax1_type = '0';
-        if (empty($this->localtax2_type)) $this->localtax2_type = '0';
-        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-        if (empty($this->rang)) $this->rang = 0;
-        if (empty($this->remise)) $this->remise = 0;
-        if (empty($this->remise_percent)) $this->remise_percent = 0;
-        if (empty($this->info_bits)) $this->info_bits = 0;
-        if (empty($this->special_code)) $this->special_code = 0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-        if (empty($this->pa_ht)) $this->pa_ht = 0;
+		// Clean parameters
+		if (empty($this->tva_tx)) $this->tva_tx = 0;
+		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+		if (empty($this->localtax1_type)) $this->localtax1_type = '0';
+		if (empty($this->localtax2_type)) $this->localtax2_type = '0';
+		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+		if (empty($this->rang)) $this->rang = 0;
+		if (empty($this->remise)) $this->remise = 0;
+		if (empty($this->remise_percent)) $this->remise_percent = 0;
+		if (empty($this->info_bits)) $this->info_bits = 0;
+		if (empty($this->special_code)) $this->special_code = 0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+		if (empty($this->pa_ht)) $this->pa_ht = 0;
 
-        // Multicurrency
-        if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
-        if (empty($this->fk_multicurrency))
-        {
-            $this->multicurrency_code = $conf->currency;
-            $this->fk_multicurrency = 0;
-            $this->multicurrency_tx = 1;
-        }
+		// Multicurrency
+		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = $conf->currency;
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
 
-        // Check parameters
-        if ($this->product_type < 0) return -1;
+		// Check parameters
+		if ($this->product_type < 0) return -1;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Insertion dans base de la ligne
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= " (fk_commande, label, description, date_start, date_end,";
-        $sql .= " fk_product, product_type, special_code, rang,";
-        $sql .= " qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,";
-        $sql .= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit,";
-        $sql .= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc";
-        $sql .= ")";
-        $sql .= " VALUES (".$this->fk_commande.", '".$this->db->escape($this->label)."','".$this->db->escape($this->desc)."',";
-        $sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
-        $sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
-        if ($this->fk_product) { $sql .= $this->fk_product.","; }
-        else { $sql .= "null,"; }
-        $sql .= "'".$this->db->escape($this->product_type)."',";
-        $sql .= "'".$this->db->escape($this->special_code)."',";
-        $sql .= "'".$this->db->escape($this->rang)."',";
-        $sql .= "'".$this->db->escape($this->qty)."', ";
-        $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
-        $sql .= " ".$this->tva_tx.", ";
-        $sql .= " ".$this->localtax1_tx.",";
-        $sql .= " ".$this->localtax2_tx.",";
-        $sql .= " '".$this->db->escape($this->localtax1_type)."',";
-        $sql .= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql .= " ".$this->remise_percent.", ".price2num($this->subprice, 'MU').", '".$this->db->escape($this->ref_supplier)."',";
-        $sql .= " ".price2num($this->total_ht).",";
-        $sql .= " ".price2num($this->total_tva).",";
-        $sql .= " ".price2num($this->total_localtax1).",";
-        $sql .= " ".price2num($this->total_localtax2).",";
-        $sql .= " ".price2num($this->total_ttc).",";
-        $sql .= ($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : "null");
-        $sql .= ", ".($this->fk_multicurrency ? $this->fk_multicurrency : "null");
-        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql .= ", ".($this->multicurrency_subprice ? price2num($this->multicurrency_subprice) : '0');
-        $sql .= ", ".($this->multicurrency_total_ht ? price2num($this->multicurrency_total_ht) : '0');
-        $sql .= ", ".($this->multicurrency_total_tva ? price2num($this->multicurrency_total_tva) : '0');
-        $sql .= ", ".($this->multicurrency_total_ttc ? price2num($this->multicurrency_total_ttc) : '0');
-        $sql .= ")";
+		// Insertion dans base de la ligne
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " (fk_commande, label, description, date_start, date_end,";
+		$sql .= " fk_product, product_type, special_code, rang,";
+		$sql .= " qty, vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,";
+		$sql .= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit,";
+		$sql .= " fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc";
+		$sql .= ")";
+		$sql .= " VALUES (".$this->fk_commande.", '".$this->db->escape($this->label)."','".$this->db->escape($this->desc)."',";
+		$sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
+		$sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
+		if ($this->fk_product) { $sql .= $this->fk_product.","; } else { $sql .= "null,"; }
+		$sql .= "'".$this->db->escape($this->product_type)."',";
+		$sql .= "'".$this->db->escape($this->special_code)."',";
+		$sql .= "'".$this->db->escape($this->rang)."',";
+		$sql .= "'".$this->db->escape($this->qty)."', ";
+		$sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+		$sql .= " ".$this->tva_tx.", ";
+		$sql .= " ".$this->localtax1_tx.",";
+		$sql .= " ".$this->localtax2_tx.",";
+		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
+		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
+		$sql .= " ".$this->remise_percent.", ".price2num($this->subprice, 'MU').", '".$this->db->escape($this->ref_supplier)."',";
+		$sql .= " ".price2num($this->total_ht).",";
+		$sql .= " ".price2num($this->total_tva).",";
+		$sql .= " ".price2num($this->total_localtax1).",";
+		$sql .= " ".price2num($this->total_localtax2).",";
+		$sql .= " ".price2num($this->total_ttc).",";
+		$sql .= ($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : "null");
+		$sql .= ", ".($this->fk_multicurrency ? $this->fk_multicurrency : "null");
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".($this->multicurrency_subprice ? price2num($this->multicurrency_subprice) : '0');
+		$sql .= ", ".($this->multicurrency_total_ht ? price2num($this->multicurrency_total_ht) : '0');
+		$sql .= ", ".($this->multicurrency_total_tva ? price2num($this->multicurrency_total_tva) : '0');
+		$sql .= ", ".($this->multicurrency_total_ttc ? price2num($this->multicurrency_total_ttc) : '0');
+		$sql .= ")";
 
-        dol_syslog(get_class($this)."::insert", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-            $this->rowid = $this->id;
+		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->rowid = $this->id;
 
-            if (!$error)
-            {
-                $result = $this->insertExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
-            if (!$error && !$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('LINEORDER_SUPPLIER_CREATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINEORDER_SUPPLIER_CREATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
 
-            if (!$error) {
-                $this->db->commit();
-                return 1;
-            }
+			if (!$error) {
+				$this->db->commit();
+				return 1;
+			}
 
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->errors[] = ($this->errors ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        }
-        else
-        {
-            $this->errors[] = $this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
-    /**
-     *	Update the line object into db
-     *
-     *	@param      int		$notrigger		1 = disable triggers
-     *	@return		int		<0 si ko, >0 si ok
-     */
-    public function update($notrigger = 0)
-    {
-        global $conf, $user;
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->errors[] = ($this->errors ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->errors[] = $this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
+	/**
+	 *	Update the line object into db
+	 *
+	 *	@param      int		$notrigger		1 = disable triggers
+	 *	@return		int		<0 si ko, >0 si ok
+	 */
+	public function update($notrigger = 0)
+	{
+		global $conf, $user;
 
-        $error = 0;
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql .= "  description='".$this->db->escape($this->desc)."'";
-        $sql .= ", ref='".$this->db->escape($this->ref_supplier)."'";
-        $sql .= ", subprice='".price2num($this->subprice)."'";
-        //$sql.= ",remise='".price2num($remise)."'";
-        $sql .= ", remise_percent='".price2num($this->remise_percent)."'";
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= "  description='".$this->db->escape($this->desc)."'";
+		$sql .= ", ref='".$this->db->escape($this->ref_supplier)."'";
+		$sql .= ", subprice='".price2num($this->subprice)."'";
+		//$sql.= ",remise='".price2num($remise)."'";
+		$sql .= ", remise_percent='".price2num($this->remise_percent)."'";
 
 		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->vat_src_code)."'";
-        $sql .= ", tva_tx='".price2num($this->tva_tx)."'";
-        $sql .= ", localtax1_tx='".price2num($this->total_localtax1)."'";
-        $sql .= ", localtax2_tx='".price2num($this->total_localtax2)."'";
-        $sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
-        $sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-        $sql .= ", qty='".price2num($this->qty)."'";
-        $sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
-        $sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
-        $sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
-        $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 .= ", product_type=".$this->product_type;
-        $sql .= ", special_code=".(!empty($this->special_code) ? $this->special_code : 0);
-        $sql .= ($this->fk_unit ? ", fk_unit='".$this->db->escape($this->fk_unit)."'" : ", fk_unit=null");
+		$sql .= ", tva_tx='".price2num($this->tva_tx)."'";
+		$sql .= ", localtax1_tx='".price2num($this->total_localtax1)."'";
+		$sql .= ", localtax2_tx='".price2num($this->total_localtax2)."'";
+		$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
+		$sql .= ", qty='".price2num($this->qty)."'";
+		$sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
+		$sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
+		$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 .= ", product_type=".$this->product_type;
+		$sql .= ", special_code=".(!empty($this->special_code) ? $this->special_code : 0);
+		$sql .= ($this->fk_unit ? ", fk_unit='".$this->db->escape($this->fk_unit)."'" : ", fk_unit=null");
 
-        // Multicurrency
-        $sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		// Multicurrency
+		$sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+		$sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+		$sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+		$sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result > 0)
-        {
-            if (!$error)
-            {
-                $result = $this->insertExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
+		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result > 0)
+		{
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
-            if (!$error && !$notrigger)
-            {
-                global $user;
-                // Call trigger
-                $result = $this->call_trigger('LINEORDER_SUPPLIER_UPDATE', $user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-                // End call triggers
-            }
+			if (!$error && !$notrigger)
+			{
+				global $user;
+				// Call trigger
+				$result = $this->call_trigger('LINEORDER_SUPPLIER_UPDATE', $user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
+			}
 
-            if (!$error)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     * 	Delete line in database
-     *
-     *	@param      int     $notrigger  1=Disable call to triggers
-     *	@return     int                 <0 if KO, >0 if OK
-     */
-    public function delete($notrigger = 0)
-    {
-        global $user;
+	/**
+	 * 	Delete line in database
+	 *
+	 *	@param      int     $notrigger  1=Disable call to triggers
+	 *	@return     int                 <0 if KO, >0 if OK
+	 */
+	public function delete($notrigger = 0)
+	{
+		global $user;
 
-        $error = 0;
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
 		// extrafields
-        $result = $this->deleteExtraFields();
-        if ($result < 0)
-        {
-            $this->db->rollback();
-            return -1;
-        }
+		$result = $this->deleteExtraFields();
+		if ($result < 0)
+		{
+			$this->db->rollback();
+			return -1;
+		}
 
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid=".$this->id;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX."commande_fournisseurdet WHERE rowid=".$this->id;
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('LINEORDER_SUPPLIER_DELETE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINEORDER_SUPPLIER_DELETE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
 
-            if (!$error)
-            {
-                $this->db->commit();
-                return 1;
-            }
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			}
 
-            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->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+			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->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 }
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 808b217caed..a7abed27369 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -33,10 +33,10 @@ require_once DOL_DOCUMENT_ROOT."/reception/class/reception.class.php";
  */
 class CommandeFournisseurDispatch extends CommonObject
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -59,31 +59,31 @@ class CommandeFournisseurDispatch extends CommonObject
 	public $table_element = 'commande_fournisseur_dispatch'; //!< Name of table without prefix where object is stored
 	public $lines = array();
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_commande;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_commandefourndet;
 
 	public $qty;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_entrepot;
 
 	/**
@@ -107,35 +107,35 @@ class CommandeFournisseurDispatch 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;
 
-        // List of language codes for status
-        $this->statuts[0] = 'Received';
-        $this->statuts[1] = 'Verified';
-        $this->statuts[2] = 'Denied';
-        $this->statutshort[0] = 'Received';
-        $this->statutshort[1] = 'Verified';
-        $this->statutshort[2] = 'Denied';
-    }
+		// List of language codes for status
+		$this->statuts[0] = 'Received';
+		$this->statuts[1] = 'Verified';
+		$this->statuts[2] = 'Denied';
+		$this->statutshort[0] = 'Received';
+		$this->statutshort[1] = 'Verified';
+		$this->statutshort[2] = 'Denied';
+	}
 
 
-    /**
-     *  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;
+	/**
+	 *  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
@@ -155,7 +155,7 @@ class CommandeFournisseurDispatch extends CommonObject
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
 		$sql .= "fk_commande,";
 		$sql .= "fk_product,";
@@ -172,7 +172,7 @@ class CommandeFournisseurDispatch extends CommonObject
 		$sql .= "fk_reception";
 
 
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->fk_commande) ? 'NULL' : "'".$this->db->escape($this->fk_commande)."'").",";
 		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
 		$sql .= " ".(!isset($this->fk_commandefourndet) ? 'NULL' : "'".$this->db->escape($this->fk_commandefourndet)."'").",";
@@ -191,62 +191,60 @@ class CommandeFournisseurDispatch 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.$this->table_element);
+		{
+			$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.
+				// 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
 			}
-        }
+		}
 
-        // Create extrafields
-        if (!$error)
-        {
-        	$result = $this->insertExtraFields();
-        	if ($result < 0) $error++;
-        }
+		// Create extrafields
+		if (!$error)
+		{
+			$result = $this->insertExtraFields();
+			if ($result < 0) $error++;
+		}
 
-        // Commit or rollback
-        if ($error)
+		// Commit or rollback
+		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id    	Id object
-     *  @param	string	$ref	Ref
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    public function fetch($id, $ref = '')
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id    	Id object
+	 *  @param	string	$ref	Ref
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $ref = '')
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
 		$sql .= " t.fk_commande,";
@@ -265,19 +263,19 @@ class CommandeFournisseurDispatch extends CommonObject
 		$sql .= " t.fk_reception";
 
 
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-        if ($ref) $sql .= " WHERE t.ref = '".$ref."'";
-        else $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		if ($ref) $sql .= " WHERE t.ref = '".$ref."'";
+		else $sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch");
-        $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");
+		$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_commande = $obj->fk_commande;
 				$this->fk_product = $obj->fk_product;
@@ -295,29 +293,27 @@ class CommandeFournisseurDispatch extends CommonObject
 				$this->fk_reception = $obj->fk_reception;
 
 				$this->fetch_optionals();
-            }
-            $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 modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    public function update($user, $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, $notrigger = 0)
+	{
+		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -337,8 +333,8 @@ class CommandeFournisseurDispatch extends CommonObject
 		// Check parameters
 		// Put here code to add a control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 
 		$sql .= " fk_commande=".(isset($this->fk_commande) ? $this->fk_commande : "null").",";
 		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
@@ -355,13 +351,13 @@ class CommandeFournisseurDispatch extends CommonObject
 		$sql .= " sellby=".(dol_strlen($this->sellby) != 0 ? "'".$this->db->idate($this->sellby)."'" : 'null')."";
 
 
-        $sql .= " WHERE rowid=".$this->id;
+		$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(); }
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
 		if (!$error)
 		{
@@ -377,39 +373,37 @@ class CommandeFournisseurDispatch extends CommonObject
 
 			if (!$notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            $result = $this->call_trigger('LINERECEPTION_UPDATE', $user);
-	            if ($result < 0) $error++;
-	            //// End call triggers
+				// Uncomment this and change MYOBJECT to your own tag if you
+				$result = $this->call_trigger('LINERECEPTION_UPDATE', $user);
+				if ($result < 0) $error++;
+				//// End call triggers
 			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} 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
-	 */
+ 	 *  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;
@@ -422,16 +416,16 @@ class CommandeFournisseurDispatch extends CommonObject
 			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action calls a trigger.
+				// 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
 			}
 		}
 
-                // Remove extrafields
+				// Remove extrafields
 		if (!$error) {
 			$result = $this->deleteExtraFields();
 			if ($result < 0)
@@ -443,27 +437,25 @@ class CommandeFournisseurDispatch extends CommonObject
 
 		if (!$error)
 		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-    		$sql .= " WHERE rowid=".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE rowid=".$this->id;
 
-    		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
+		// Commit or rollback
 		if ($error)
 		{
 			foreach ($this->errors as $errmsg)
 			{
-	            dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -474,8 +466,8 @@ class CommandeFournisseurDispatch extends CommonObject
 	/**
 	 *	Load an object from its id and create a new one in database
 	 *
- 	 *  @param	User	$user		User making the clone
-     *	@param	int		$fromid     Id of object to clone
+	 *  @param	User	$user		User making the clone
+	 *	@param	int		$fromid     Id of object to clone
 	 * 	@return	int					New id of clone
 	 */
 	public function createFromClone(User $user, $fromid)
@@ -516,9 +508,7 @@ class CommandeFournisseurDispatch extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -526,62 +516,57 @@ class CommandeFournisseurDispatch extends CommonObject
 
 
 
-    /**
-     *  Return label of the status of object
-     *
-     *  @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
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut($this->status, $mode);
-    }
+	/**
+	 *  Return label of the status of object
+	 *
+	 *  @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
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return label of a 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
-     *  @return string				Label of status
-     */
-    public function LibStatut($status, $mode = 0)
-    {
-        // phpcs:enable
-        global $langs;
-        $langs->load('orders');
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return label of a 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
+	 *  @return string				Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
+		$langs->load('orders');
 
-        if ($mode == 0)
-        {
-            return $langs->trans($this->statuts[$status]);
-        }
-        elseif ($mode == 1)
-        {
-            return $langs->trans($this->statutshort[$status]);
-        }
-        elseif ($mode == 2)
-        {
-            return $langs->trans($this->statuts[$status]);
-        }
-        elseif ($mode == 3)
-        {
-            if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0');
-            elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4');
-            elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
-        }
-        elseif ($mode == 4)
-        {
-            if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
-            elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-            elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
-        }
-        elseif ($mode == 5)
-        {
-            if ($status == 0) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut0');
-            elseif ($status == 1) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut4');
-            elseif ($status == 2) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut8');
-        }
-    }
+		if ($mode == 0)
+		{
+			return $langs->trans($this->statuts[$status]);
+		} elseif ($mode == 1)
+		{
+			return $langs->trans($this->statutshort[$status]);
+		} elseif ($mode == 2)
+		{
+			return $langs->trans($this->statuts[$status]);
+		} elseif ($mode == 3)
+		{
+			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0');
+			elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4');
+			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
+		} elseif ($mode == 4)
+		{
+			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+			elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
+		} elseif ($mode == 5)
+		{
+			if ($status == 0) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut0');
+			elseif ($status == 1) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut4');
+			elseif ($status == 2) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+		}
+	}
 
 
 	/**
@@ -642,7 +627,7 @@ class CommandeFournisseurDispatch extends CommonObject
 		$sql .= " t.eatby,";
 		$sql .= " t.sellby";
 
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 
 		// Manage filter
 		$sqlwhere = array();
@@ -691,7 +676,7 @@ class CommandeFournisseurDispatch extends CommonObject
 				$line->batch = $obj->batch;
 				$line->eatby = $this->db->jdate($obj->eatby);
 				$line->sellby = $this->db->jdate($obj->sellby);
-                                $line->fetch_optionals();
+								$line->fetch_optionals();
 
 				$this->lines[$line->id] = $line;
 			}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 99d906edf47..264832cadc2 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -34,7 +34,7 @@
  *  \brief      File of class to manage suppliers invoices
  */
 
-include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -43,54 +43,54 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
  */
 class FactureFournisseur extends CommonInvoice
 {
-    /**
+	/**
 	 * @var string ID to identify managed object
 	 */
 	public $element = 'invoice_supplier';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'facture_fourn';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'facture_fourn';
 
-    /**
-     * @var int    Name of subtable line
-     */
-    public $table_element_line = 'facture_fourn_det';
+	/**
+	 * @var int    Name of subtable line
+	 */
+	public $table_element_line = 'facture_fourn_det';
 
-    /**
-     * @var int Field with ID of parent key if this field has a parent
-     */
-    public $fk_element = 'fk_facture_fourn';
+	/**
+	 * @var int Field with ID of parent key if this field has a parent
+	 */
+	public $fk_element = 'fk_facture_fourn';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'supplier_invoice';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'supplier_invoice';
 
-    /**
-     * 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;
 
-    /**
-     * 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}
-     */
-    protected $table_ref_field = 'ref';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $rowid;
 
-    /**
+	/**
 	 * @var string Ref
 	 */
 	public $ref;
@@ -98,265 +98,257 @@ class FactureFournisseur extends CommonInvoice
 	public $label;
 	public $libelle; // @deprecated
 
-    public $product_ref;
-    public $ref_supplier;
-    public $socid;
-    //Check constants for types
-    public $type = self::TYPE_STANDARD;
+	public $product_ref;
+	public $ref_supplier;
+	public $socid;
+	//Check constants for types
+	public $type = self::TYPE_STANDARD;
 
 	/**
 	 * Supplier invoice status
 	 * @var int
 	 * @see FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_PAID, FactureFournisseur::STATUS_ABANDONED
 	 */
-    public $statut;
+	public $statut;
 
-    /**
-     * Set to 1 if the invoice is completely paid, otherwise is 0
-     * @var int
-     * @deprecated Use statuses stored in self::statut
-     */
-    public $paye;
+	/**
+	 * Set to 1 if the invoice is completely paid, otherwise is 0
+	 * @var int
+	 * @deprecated Use statuses stored in self::statut
+	 */
+	public $paye;
 
-    public $author;
+	public $author;
 
-    /**
-     * 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;
 
-    /**
-     * Invoice date (date)
-     *
-     * @var integer
-     */
-    public $date;
+	/**
+	 * Invoice date (date)
+	 *
+	 * @var integer
+	 */
+	public $date;
 
-    /**
-     * Max payment date (date_echeance)
-     *
-     * @var integer
-     */
-    public $date_echeance;
+	/**
+	 * Max payment date (date_echeance)
+	 *
+	 * @var integer
+	 */
+	public $date_echeance;
 
-    public $amount = 0;
-    public $remise = 0;
-    public $tva = 0;
-    public $localtax1;
-    public $localtax2;
-    public $total_ht = 0;
-    public $total_tva = 0;
-    public $total_localtax1 = 0;
-    public $total_localtax2 = 0;
-    public $total_ttc = 0;
+	public $amount = 0;
+	public $remise = 0;
+	public $tva = 0;
+	public $localtax1;
+	public $localtax2;
+	public $total_ht = 0;
+	public $total_tva = 0;
+	public $total_localtax1 = 0;
+	public $total_localtax2 = 0;
+	public $total_ttc = 0;
 
 	/**
 	 * @deprecated
 	 * @see $note_private, $note_public
 	 */
-    public $note;
+	public $note;
 
-    public $note_private;
-    public $note_public;
-    public $propalid;
-    public $cond_reglement_id;
-    public $cond_reglement_code;
+	public $note_private;
+	public $note_public;
+	public $propalid;
+	public $cond_reglement_id;
+	public $cond_reglement_code;
 
-    /**
-     * @var int ID
-     */
-    public $fk_account;
+	/**
+	 * @var int ID
+	 */
+	public $fk_account;
 
-    public $mode_reglement_id;
-    public $mode_reglement_code;
+	public $mode_reglement_id;
+	public $mode_reglement_code;
 
 	/**
 	 * Invoice lines
 	 * @var SupplierInvoiceLine[]
 	 */
-    public $lines = array();
+	public $lines = array();
 
 	/**
 	 * @deprecated
 	 */
-    public $fournisseur;
+	public $fournisseur;
 
-	/**
-     * @var int ID Incorterms
-     */
-    public $fk_incoterms;
-
-    public $location_incoterms;
-    public $label_incoterms; //Used into tooltip
-
-    public $extraparams = array();
+	public $extraparams = array();
 
 	// Multicurrency
 	/**
-     * @var int ID
-     */
-    public $fk_multicurrency;
+	 * @var int ID
+	 */
+	public $fk_multicurrency;
 
-    public $multicurrency_code;
-    public $multicurrency_tx;
-    public $multicurrency_total_ht;
-    public $multicurrency_total_tva;
-    public $multicurrency_total_ttc;
-    //! id of source var_dump($$this);invoice if replacement invoice or credit note
-    /**
-     * @var int ID
-     */
-    public $fk_facture_source;
+	public $multicurrency_code;
+	public $multicurrency_tx;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
+	//! id of source var_dump($$this);invoice if replacement invoice or credit note
+	/**
+	 * @var int ID
+	 */
+	public $fk_facture_source;
 
 
-    public $fields = array(
-    	'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-    	'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>15),
-    	'ref_supplier' =>array('type'=>'varchar(255)', 'label'=>'RefSupplier', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-    	'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25, 'index'=>1),
-    	'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>30),
-    	'type' =>array('type'=>'smallint(6)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
-    	'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>40),
-    	'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-    	'datef' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-    	'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>55),
-    	'libelle' =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-    	'paye' =>array('type'=>'smallint(6)', 'label'=>'Paye', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>65),
-    	'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
-    	'remise' =>array('type'=>'double(24,8)', 'label'=>'Discount', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-    	'close_code' =>array('type'=>'varchar(16)', 'label'=>'CloseCode', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-    	'close_note' =>array('type'=>'varchar(128)', 'label'=>'CloseNote', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-    	'tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-    	'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-    	'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-    	'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-    	'total_tva' =>array('type'=>'double(24,8)', 'label'=>'TotalVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-    	'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-    	'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-    	'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>130),
-    	'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-    	'fk_facture_source' =>array('type'=>'integer', 'label'=>'Fk facture source', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-    	'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
-    	'fk_account' =>array('type'=>'integer', 'label'=>'Account', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
-    	'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
-    	'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
-    	'date_lim_reglement' =>array('type'=>'date', 'label'=>'DateLimReglement', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-    	'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>170),
-    	'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>175),
-    	'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPdf', 'enabled'=>1, 'visible'=>0, 'position'=>180),
-    	'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-    	'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-    	'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>-1, 'position'=>200),
-    	'fk_multicurrency' =>array('type'=>'integer', 'label'=>'MulticurrencyId', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
-    	'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'MulticurrencyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
-    	'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-    	'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>220),
-    	'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
-    	'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>230),
-    	'date_pointoftax' =>array('type'=>'date', 'label'=>'Date pointoftax', 'enabled'=>1, 'visible'=>-1, 'position'=>235),
-    	'date_valid' =>array('type'=>'date', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>240),
-    	'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'Last main doc', 'enabled'=>1, 'visible'=>-1, 'position'=>245),
-    	'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
-    	'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
-    );
+	public $fields = array(
+		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
+		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>15),
+		'ref_supplier' =>array('type'=>'varchar(255)', 'label'=>'RefSupplier', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
+		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25, 'index'=>1),
+		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>30),
+		'type' =>array('type'=>'smallint(6)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>40),
+		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
+		'datef' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
+		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>55),
+		'libelle' =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
+		'paye' =>array('type'=>'smallint(6)', 'label'=>'Paye', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>65),
+		'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
+		'remise' =>array('type'=>'double(24,8)', 'label'=>'Discount', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
+		'close_code' =>array('type'=>'varchar(16)', 'label'=>'CloseCode', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
+		'close_note' =>array('type'=>'varchar(128)', 'label'=>'CloseNote', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
+		'tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
+		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
+		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
+		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
+		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'TotalVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
+		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
+		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
+		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>130),
+		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
+		'fk_facture_source' =>array('type'=>'integer', 'label'=>'Fk facture source', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
+		'fk_account' =>array('type'=>'integer', 'label'=>'Account', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
+		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
+		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
+		'date_lim_reglement' =>array('type'=>'date', 'label'=>'DateLimReglement', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>170),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>175),
+		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPdf', 'enabled'=>1, 'visible'=>0, 'position'=>180),
+		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
+		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
+		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>-1, 'position'=>200),
+		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'MulticurrencyId', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
+		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'MulticurrencyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
+		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
+		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>220),
+		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
+		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>230),
+		'date_pointoftax' =>array('type'=>'date', 'label'=>'Date pointoftax', 'enabled'=>1, 'visible'=>-1, 'position'=>235),
+		'date_valid' =>array('type'=>'date', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>240),
+		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'Last main doc', 'enabled'=>1, 'visible'=>-1, 'position'=>245),
+		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
+		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
+	);
 
 
-    /**
-     * 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;
 
-    /**
-     * Draft
-     */
-    const STATUS_DRAFT = 0;
+	/**
+	 * Draft
+	 */
+	const STATUS_DRAFT = 0;
 
-    /**
-     * Validated (need to be paid)
-     */
-    const STATUS_VALIDATED = 1;
+	/**
+	 * Validated (need to be paid)
+	 */
+	const STATUS_VALIDATED = 1;
 
-    /**
-     * Classified paid.
-     * If paid partially, $this->close_code can be:
-     * - CLOSECODE_DISCOUNTVAT
-     * - CLOSECODE_BADDEBT
-     * If paid completelly, this->close_code will be null
-     */
-    const STATUS_CLOSED = 2;
+	/**
+	 * Classified paid.
+	 * If paid partially, $this->close_code can be:
+	 * - CLOSECODE_DISCOUNTVAT
+	 * - CLOSECODE_BADDEBT
+	 * If paid completelly, this->close_code will be null
+	 */
+	const STATUS_CLOSED = 2;
 
-    /**
-     * Classified abandoned and no payment done.
-     * $this->close_code can be:
-     * - CLOSECODE_BADDEBT
-     * - CLOSECODE_ABANDONED
-     * - CLOSECODE_REPLACED
-     */
-    const STATUS_ABANDONED = 3;
+	/**
+	 * Classified abandoned and no payment done.
+	 * $this->close_code can be:
+	 * - CLOSECODE_BADDEBT
+	 * - CLOSECODE_ABANDONED
+	 * - CLOSECODE_REPLACED
+	 */
+	const STATUS_ABANDONED = 3;
 
 	const CLOSECODE_DISCOUNTVAT = 'discount_vat';
 	const CLOSECODE_BADCREDIT = 'badsupplier';
 	const CLOSECODE_ABANDONED = 'abandon';
 	const CLOSECODE_REPLACED = 'replaced';
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
 
-        $this->products = array();
-    }
+		$this->products = array();
+	}
 
-    /**
-     *    Create supplier invoice into database
-     *
-     *    @param      User		$user       object utilisateur qui cree
-     *    @return     int    	     		Id invoice created if OK, < 0 if KO
-     */
-    public function create($user)
-    {
-        global $langs, $conf, $hookmanager;
+	/**
+	 *    Create supplier invoice into database
+	 *
+	 *    @param      User		$user       object utilisateur qui cree
+	 *    @return     int    	     		Id invoice created if OK, < 0 if KO
+	 */
+	public function create($user)
+	{
+		global $langs, $conf, $hookmanager;
 
 		$error = 0;
-        $now = dol_now();
+		$now = dol_now();
 
-        // Clean parameters
-        if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
-        if (empty($this->type)) $this->type = self::TYPE_STANDARD;
-        if (empty($this->date)) $this->date = $now;
+		// Clean parameters
+		if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
+		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
+		if (empty($this->date)) $this->date = $now;
 
-        $socid = $this->socid;
-        $ref_supplier = $this->ref_supplier;
-        $amount = $this->amount;
-        $remise = $this->remise;
+		$socid = $this->socid;
+		$ref_supplier = $this->ref_supplier;
+		$amount = $this->amount;
+		$remise = $this->remise;
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
 		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
@@ -368,73 +360,73 @@ class FactureFournisseur extends CommonInvoice
 			$this->multicurrency_tx = 1;
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        if (!$remise) $remise = 0;
+		if (!$remise) $remise = 0;
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (";
 		$sql .= "ref";
-        $sql .= ", ref_supplier";
-        $sql .= ", entity";
-        $sql .= ", type";
-        $sql .= ", libelle";
-        $sql .= ", fk_soc";
-        $sql .= ", datec";
-        $sql .= ", datef";
+		$sql .= ", ref_supplier";
+		$sql .= ", entity";
+		$sql .= ", type";
+		$sql .= ", libelle";
+		$sql .= ", fk_soc";
+		$sql .= ", datec";
+		$sql .= ", datef";
 		$sql .= ", fk_projet";
 		$sql .= ", fk_cond_reglement";
 		$sql .= ", fk_mode_reglement";
-        $sql .= ", fk_account";
-        $sql .= ", note_private";
-        $sql .= ", note_public";
-        $sql .= ", fk_user_author";
-        $sql .= ", date_lim_reglement";
+		$sql .= ", fk_account";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", fk_user_author";
+		$sql .= ", date_lim_reglement";
 		$sql .= ", fk_incoterms, location_incoterms";
-        $sql .= ", fk_multicurrency";
-        $sql .= ", multicurrency_code";
-        $sql .= ", multicurrency_tx";
-        $sql .= ", fk_facture_source";
-        $sql .= ")";
-        $sql .= " VALUES (";
+		$sql .= ", fk_multicurrency";
+		$sql .= ", multicurrency_code";
+		$sql .= ", multicurrency_tx";
+		$sql .= ", fk_facture_source";
+		$sql .= ")";
+		$sql .= " VALUES (";
 		$sql .= "'(PROV)'";
-        $sql .= ", '".$this->db->escape($this->ref_supplier)."'";
-        $sql .= ", ".$conf->entity;
-        $sql .= ", '".$this->db->escape($this->type)."'";
-        $sql .= ", '".$this->db->escape($this->label ? $this->label : $this->libelle)."'";
-        $sql .= ", ".$this->socid;
-        $sql .= ", '".$this->db->idate($now)."'";
-        $sql .= ", '".$this->db->idate($this->date)."'";
+		$sql .= ", '".$this->db->escape($this->ref_supplier)."'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", '".$this->db->escape($this->type)."'";
+		$sql .= ", '".$this->db->escape($this->label ? $this->label : $this->libelle)."'";
+		$sql .= ", ".$this->socid;
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", '".$this->db->idate($this->date)."'";
 		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
 		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : "null");
 		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "null");
-        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
-        $sql .= ", '".$this->db->escape($this->note_private)."'";
-        $sql .= ", '".$this->db->escape($this->note_public)."'";
-        $sql .= ", ".$user->id.",";
-        $sql .= $this->date_echeance != '' ? "'".$this->db->idate($this->date_echeance)."'" : "null";
+		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+		$sql .= ", '".$this->db->escape($this->note_private)."'";
+		$sql .= ", '".$this->db->escape($this->note_public)."'";
+		$sql .= ", ".$user->id.",";
+		$sql .= $this->date_echeance != '' ? "'".$this->db->idate($this->date_echeance)."'" : "null";
 		$sql .= ", ".(int) $this->fk_incoterms;
-        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ", ".(int) $this->fk_multicurrency;
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql .= ", ".(double) $this->multicurrency_tx;
-        $sql .= ", ".(isset($this->fk_facture_source) ? $this->fk_facture_source : "NULL");
-        $sql .= ")";
+		$sql .= ", ".(isset($this->fk_facture_source) ? $this->fk_facture_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.'facture_fourn');
+		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.'facture_fourn');
 
-            // Update ref with new one
-            $this->ref = '(PROV'.$this->id.')';
-            $sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
+			// Update ref with new one
+			$this->ref = '(PROV'.$this->id.')';
+			$sql = 'UPDATE '.MAIN_DB_PREFIX."facture_fourn SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
-            dol_syslog(get_class($this)."::create", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql) $error++;
+			dol_syslog(get_class($this)."::create", LOG_DEBUG);
+			$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
+			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
 			}
@@ -444,121 +436,115 @@ class FactureFournisseur 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)
-				            {
-				                dol_print_error($this->db);
-				                $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)
-    					{
-    						dol_print_error($this->db);
-    						$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)
+							{
+								dol_print_error($this->db);
+								$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)
+						{
+							dol_print_error($this->db);
+							$error++;
+						}
+					}
 				}
 			}
 
 			if (count($this->lines) && is_object($this->lines[0]))	// If this->lines is array of InvoiceLines (preferred mode)
 			{
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
-                foreach ($this->lines as $i => $val)
-                {
-                    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code)';
-                    $sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).')';
+				foreach ($this->lines as $i => $val)
+				{
+					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code)';
+					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).')';
 
-                    $resql_insert = $this->db->query($sql);
-                    if ($resql_insert)
-                    {
-                        $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
+					$resql_insert = $this->db->query($sql);
+					if ($resql_insert)
+					{
+						$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
 
-                        $this->updateline(
-                            $idligne,
-                            $this->lines[$i]->description,
-                            $this->lines[$i]->pu_ht,
-                        	$this->lines[$i]->tva_tx.($this->lines[$i]->vat_src_code ? ' ('.$this->lines[$i]->vat_src_code.')' : ''),
-                            $this->lines[$i]->localtax1_tx,
-                            $this->lines[$i]->localtax2_tx,
-                            $this->lines[$i]->qty,
-                            $this->lines[$i]->fk_product,
-                            'HT',
-                            (!empty($this->lines[$i]->info_bits) ? $this->lines[$i]->info_bits : ''),
-                            $this->lines[$i]->product_type,
-                            $this->lines[$i]->remise_percent,
-                            false,
-                            $this->lines[$i]->date_start,
-                            $this->lines[$i]->date_end,
-                            $this->lines[$i]->array_options,
-                            $this->lines[$i]->fk_unit,
-                            $this->lines[$i]->pu_ht_devise
-                        );
-                    }
-                    else
-                    {
-                        $this->error = $this->db->lasterror();
-                        $this->db->rollback();
-                        return -5;
-                    }
-                }
-			}
-			else	// If this->lines is an array of invoice line arrays
+						$this->updateline(
+							$idligne,
+							$this->lines[$i]->description,
+							$this->lines[$i]->pu_ht,
+							$this->lines[$i]->tva_tx.($this->lines[$i]->vat_src_code ? ' ('.$this->lines[$i]->vat_src_code.')' : ''),
+							$this->lines[$i]->localtax1_tx,
+							$this->lines[$i]->localtax2_tx,
+							$this->lines[$i]->qty,
+							$this->lines[$i]->fk_product,
+							'HT',
+							(!empty($this->lines[$i]->info_bits) ? $this->lines[$i]->info_bits : ''),
+							$this->lines[$i]->product_type,
+							$this->lines[$i]->remise_percent,
+							false,
+							$this->lines[$i]->date_start,
+							$this->lines[$i]->date_end,
+							$this->lines[$i]->array_options,
+							$this->lines[$i]->fk_unit,
+							$this->lines[$i]->pu_ht_devise
+						);
+					} else {
+						$this->error = $this->db->lasterror();
+						$this->db->rollback();
+						return -5;
+					}
+				}
+			} else // If this->lines is an array of invoice line arrays
 			{
-			    dol_syslog("There is ".count($this->lines)." lines that are array lines");
-			    foreach ($this->lines as $i => $val)
-			    {
-                	$line = $this->lines[$i];
+				dol_syslog("There is ".count($this->lines)." lines that are array lines");
+				foreach ($this->lines as $i => $val)
+				{
+					$line = $this->lines[$i];
 
-                	// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
-				    //if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-                	if (!is_object($line)) $line = (object) $line;
+					// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
+					//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
+					if (!is_object($line)) $line = (object) $line;
 
-                	$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code)';
-			        $sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).')';
+					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code)';
+					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).')';
 
-			        $resql_insert = $this->db->query($sql);
-			        if ($resql_insert)
-			        {
-			            $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
+					$resql_insert = $this->db->query($sql);
+					if ($resql_insert)
+					{
+						$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
 
-            			$this->updateline(
-			                $idligne,
-			                $line->description,
-			                $line->pu_ht,
-			                $line->tva_tx,
-			                $line->localtax1_tx,
-			                $line->localtax2_tx,
-			                $line->qty,
-			                $line->fk_product,
-			                'HT',
-			                (!empty($line->info_bits) ? $line->info_bits : ''),
-			                $line->product_type
-			                );
-			        }
-			        else
-			        {
-			            $this->error = $this->db->lasterror();
-			            $this->db->rollback();
-			            return -5;
-			        }
-			    }
+						$this->updateline(
+							$idligne,
+							$line->description,
+							$line->pu_ht,
+							$line->tva_tx,
+							$line->localtax1_tx,
+							$line->localtax2_tx,
+							$line->qty,
+							$line->fk_product,
+							'HT',
+							(!empty($line->info_bits) ? $line->info_bits : ''),
+							$line->product_type
+							);
+					} else {
+						$this->error = $this->db->lasterror();
+						$this->db->rollback();
+						return -5;
+					}
+				}
 			}
 
-            // Update total price
-            $result = $this->update_price();
-            if ($result > 0)
-            {
+			// Update total price
+			$result = $this->update_price();
+			if ($result > 0)
+			{
 				// Actions on extra fields
-            	if (!$error)
+				if (!$error)
 				{
 					$result = $this->insertExtraFields(); // This also set $this->error or $this->errors if errors are found
 					if ($result < 0)
@@ -569,163 +555,155 @@ class FactureFournisseur extends CommonInvoice
 
 				if (!$error)
 				{
-                    // Call trigger
-                    $result = $this->call_trigger('BILL_SUPPLIER_CREATE', $user);
-                    if ($result < 0) $error++;
-                    // End call triggers
+					// Call trigger
+					$result = $this->call_trigger('BILL_SUPPLIER_CREATE', $user);
+					if ($result < 0) $error++;
+					// End call triggers
 				}
 
-                if (!$error)
-                {
-                    $this->db->commit();
-                    return $this->id;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -4;
-                }
-            }
-            else
-            {
-                $this->error = $langs->trans('FailedToUpdatePrice');
-                $this->db->rollback();
-                return -3;
-            }
-        }
-        else
-        {
-            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-            {
-                $this->error = $langs->trans('ErrorRefAlreadyExists');
-                $this->db->rollback();
-                return -1;
-            }
-            else
-            {
-                $this->error = $this->db->lasterror();
-                $this->db->rollback();
-                return -2;
-            }
-        }
-    }
+				if (!$error)
+				{
+					$this->db->commit();
+					return $this->id;
+				} else {
+					$this->db->rollback();
+					return -4;
+				}
+			} else {
+				$this->error = $langs->trans('FailedToUpdatePrice');
+				$this->db->rollback();
+				return -3;
+			}
+		} else {
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				$this->error = $langs->trans('ErrorRefAlreadyExists');
+				$this->db->rollback();
+				return -1;
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return -2;
+			}
+		}
+	}
 
-    /**
-     *    Load object in memory from database
-     *
-     *    @param	int		$id         Id supplier invoice
-     *    @param	string	$ref		Ref supplier invoice
-     *    @return   int        			<0 if KO, >0 if OK, 0 if not found
-     */
-    public function fetch($id = '', $ref = '')
-    {
-        global $langs;
+	/**
+	 *    Load object in memory from database
+	 *
+	 *    @param	int		$id         Id supplier invoice
+	 *    @param	string	$ref		Ref supplier invoice
+	 *    @return   int        			<0 if KO, >0 if OK, 0 if not found
+	 */
+	public function fetch($id = '', $ref = '')
+	{
+		global $langs;
 
-        $sql = "SELECT";
-        $sql .= " t.rowid,";
+		$sql = "SELECT";
+		$sql .= " t.rowid,";
 		$sql .= " t.ref,";
-        $sql .= " t.ref_supplier,";
-        $sql .= " t.entity,";
-        $sql .= " t.type,";
-        $sql .= " t.fk_soc,";
-        $sql .= " t.datec,";
-        $sql .= " t.datef,";
-        $sql .= " t.tms,";
-        $sql .= " t.libelle as label,";
-        $sql .= " t.paye,";
-        $sql .= " t.amount,";
-        $sql .= " t.remise,";
-        $sql .= " t.close_code,";
-        $sql .= " t.close_note,";
-        $sql .= " t.tva,";
-        $sql .= " t.localtax1,";
-        $sql .= " t.localtax2,";
-        $sql .= " t.total_ht,";
-        $sql .= " t.total_tva,";
-        $sql .= " t.total_ttc,";
-        $sql .= " t.fk_statut,";
-        $sql .= " t.fk_user_author,";
-        $sql .= " t.fk_user_valid,";
-        $sql .= " t.fk_facture_source,";
-        $sql .= " t.fk_projet as fk_project,";
-        $sql .= " t.fk_cond_reglement,";
-        $sql .= " t.fk_account,";
-        $sql .= " t.fk_mode_reglement,";
-        $sql .= " t.date_lim_reglement,";
-        $sql .= " t.note_private,";
-        $sql .= " t.note_public,";
-        $sql .= " t.model_pdf,";
-        $sql .= " t.import_key,";
-        $sql .= " t.extraparams,";
-        $sql .= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
-        $sql .= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle,";
-        $sql .= ' s.nom as socnom, s.rowid as socid,';
-        $sql .= ' t.fk_incoterms, t.location_incoterms,';
-        $sql .= " i.libelle as label_incoterms,";
-        $sql .= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON t.fk_cond_reglement = cr.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
+		$sql .= " t.ref_supplier,";
+		$sql .= " t.entity,";
+		$sql .= " t.type,";
+		$sql .= " t.fk_soc,";
+		$sql .= " t.datec,";
+		$sql .= " t.datef,";
+		$sql .= " t.tms,";
+		$sql .= " t.libelle as label,";
+		$sql .= " t.paye,";
+		$sql .= " t.amount,";
+		$sql .= " t.remise,";
+		$sql .= " t.close_code,";
+		$sql .= " t.close_note,";
+		$sql .= " t.tva,";
+		$sql .= " t.localtax1,";
+		$sql .= " t.localtax2,";
+		$sql .= " t.total_ht,";
+		$sql .= " t.total_tva,";
+		$sql .= " t.total_ttc,";
+		$sql .= " t.fk_statut,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.fk_user_valid,";
+		$sql .= " t.fk_facture_source,";
+		$sql .= " t.fk_projet as fk_project,";
+		$sql .= " t.fk_cond_reglement,";
+		$sql .= " t.fk_account,";
+		$sql .= " t.fk_mode_reglement,";
+		$sql .= " t.date_lim_reglement,";
+		$sql .= " t.note_private,";
+		$sql .= " t.note_public,";
+		$sql .= " t.model_pdf,";
+		$sql .= " t.import_key,";
+		$sql .= " t.extraparams,";
+		$sql .= " cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle,";
+		$sql .= " p.code as mode_reglement_code, p.libelle as mode_reglement_libelle,";
+		$sql .= ' s.nom as socnom, s.rowid as socid,';
+		$sql .= ' t.fk_incoterms, t.location_incoterms,';
+		$sql .= " i.libelle as label_incoterms,";
+		$sql .= ' t.fk_multicurrency, t.multicurrency_code, t.multicurrency_tx, t.multicurrency_total_ht, t.multicurrency_total_tva, t.multicurrency_total_ttc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as t';
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON t.fk_cond_reglement = cr.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
-        if ($id)  $sql .= " WHERE t.rowid=".$id;
-        if ($ref) $sql .= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity IN (".getEntity('supplier_invoice').")";
+		if ($id)  $sql .= " WHERE t.rowid=".$id;
+		if ($ref) $sql .= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity IN (".getEntity('supplier_invoice').")";
 
-        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->ref ? $obj->ref : $obj->rowid; // We take rowid if ref is empty for backward compatibility
+				$this->id = $obj->rowid;
+				$this->ref = $obj->ref ? $obj->ref : $obj->rowid; // We take rowid if ref is empty for backward compatibility
 
-                $this->ref_supplier = $obj->ref_supplier;
-                $this->entity				= $obj->entity;
-                $this->type					= empty($obj->type) ? self::TYPE_STANDARD : $obj->type;
-                $this->fk_soc				= $obj->fk_soc;
-                $this->datec				= $this->db->jdate($obj->datec);
-                $this->date					= $this->db->jdate($obj->datef);
-                $this->datep				= $this->db->jdate($obj->datef);
-                $this->tms = $this->db->jdate($obj->tms);
-                $this->libelle = $obj->label; // deprecated
-                $this->label				= $obj->label;
-                $this->paye					= $obj->paye;
-                $this->paid					= $obj->paye;
-                $this->amount				= $obj->amount;
-                $this->remise				= $obj->remise;
-                $this->close_code			= $obj->close_code;
-                $this->close_note			= $obj->close_note;
-                $this->tva = $obj->tva;
-                $this->total_localtax1		= $obj->localtax1;
-                $this->total_localtax2		= $obj->localtax2;
-                $this->total_ht				= $obj->total_ht;
-                $this->total_tva			= $obj->total_tva;
-                $this->total_ttc			= $obj->total_ttc;
-                $this->fk_statut			= $obj->fk_statut;
-                $this->statut				= $obj->fk_statut;
-                $this->fk_user_author = $obj->fk_user_author;
-                $this->author				= $obj->fk_user_author;
-                $this->fk_user_valid = $obj->fk_user_valid;
-                $this->fk_facture_source	= $obj->fk_facture_source;
-                $this->fk_project			= $obj->fk_project;
-                $this->cond_reglement_id	= $obj->fk_cond_reglement;
-	            $this->cond_reglement_code = $obj->cond_reglement_code;
-	            $this->cond_reglement		= $obj->cond_reglement_libelle;
-	            $this->cond_reglement_doc = $obj->cond_reglement_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->date_echeance		= $this->db->jdate($obj->date_lim_reglement);
-                $this->note = $obj->note_private; // deprecated
-                $this->note_private			= $obj->note_private;
-                $this->note_public = $obj->note_public;
-                $this->model_pdf = $obj->model_pdf;
-                $this->modelpdf			    = $obj->model_pdf;
-                $this->import_key = $obj->import_key;
+				$this->ref_supplier = $obj->ref_supplier;
+				$this->entity				= $obj->entity;
+				$this->type					= empty($obj->type) ? self::TYPE_STANDARD : $obj->type;
+				$this->fk_soc				= $obj->fk_soc;
+				$this->datec				= $this->db->jdate($obj->datec);
+				$this->date					= $this->db->jdate($obj->datef);
+				$this->datep				= $this->db->jdate($obj->datef);
+				$this->tms = $this->db->jdate($obj->tms);
+				$this->libelle = $obj->label; // deprecated
+				$this->label				= $obj->label;
+				$this->paye					= $obj->paye;
+				$this->paid					= $obj->paye;
+				$this->amount				= $obj->amount;
+				$this->remise				= $obj->remise;
+				$this->close_code			= $obj->close_code;
+				$this->close_note			= $obj->close_note;
+				$this->tva = $obj->tva;
+				$this->total_localtax1		= $obj->localtax1;
+				$this->total_localtax2		= $obj->localtax2;
+				$this->total_ht				= $obj->total_ht;
+				$this->total_tva			= $obj->total_tva;
+				$this->total_ttc			= $obj->total_ttc;
+				$this->fk_statut			= $obj->fk_statut;
+				$this->statut				= $obj->fk_statut;
+				$this->fk_user_author = $obj->fk_user_author;
+				$this->author				= $obj->fk_user_author;
+				$this->fk_user_valid = $obj->fk_user_valid;
+				$this->fk_facture_source	= $obj->fk_facture_source;
+				$this->fk_project = $obj->fk_project;
+				$this->cond_reglement_id	= $obj->fk_cond_reglement;
+				$this->cond_reglement_code = $obj->cond_reglement_code;
+				$this->cond_reglement = $obj->cond_reglement_libelle;
+				$this->cond_reglement_doc = $obj->cond_reglement_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->date_echeance		= $this->db->jdate($obj->date_lim_reglement);
+				$this->note = $obj->note_private; // deprecated
+				$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->import_key = $obj->import_key;
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -740,116 +718,116 @@ class FactureFournisseur extends CommonInvoice
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-                $this->extraparams = (array) json_decode($obj->extraparams, true);
+				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
-                $this->socid  = $obj->socid;
-                $this->socnom = $obj->socnom;
+				$this->socid  = $obj->socid;
+				$this->socnom = $obj->socnom;
 
-                // Retreive all extrafield
-                // fetch optionals attributes and labels
-                $this->fetch_optionals();
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 
-                if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
 
-                $result = $this->fetch_lines();
-                if ($result < 0)
-                {
-                    $this->error = $this->db->lasterror();
-                    return -3;
-                }
-            }
-            else
-            {
-                $this->error = 'Bill with id '.$id.' not found';
-                dol_syslog(get_class($this).'::fetch '.$this->error);
-                return 0;
-            }
+				$result = $this->fetch_lines();
+				if ($result < 0)
+				{
+					$this->error = $this->db->lasterror();
+					return -3;
+				}
+			} else {
+				$this->error = 'Bill with id '.$id.' not found';
+				dol_syslog(get_class($this).'::fetch '.$this->error);
+				return 0;
+			}
 
-            $this->db->free($resql);
-            return 1;
-        }
-        else
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return 1;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Load this->lines
-     *
-     *  @return     int         1 si ok, < 0 si erreur
-     */
-    public function fetch_lines()
-    {
-        // phpcs:enable
-        $this->lines = array();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Load this->lines
+	 *
+	 *  @return     int         1 si ok, < 0 si erreur
+	 */
+	public function fetch_lines()
+	{
+		// phpcs:enable
+		$this->lines = array();
 
-        $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
-        $sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
-        $sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
-        $sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
-        $sql .= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
-        $sql .= ' WHERE fk_facture_fourn='.$this->id;
-        $sql .= ' ORDER BY f.rang, f.rowid';
+		$sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.date_start, f.date_end, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.vat_src_code, f.tva_tx';
+		$sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
+		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
+		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
+		$sql .= ', fk_code_ventilation, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
+		$sql .= ' WHERE fk_facture_fourn='.$this->id;
+		$sql .= ' ORDER BY f.rang, f.rowid';
 
-        dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
-        $resql_rows = $this->db->query($sql);
-        if ($resql_rows)
-        {
-            $num_rows = $this->db->num_rows($resql_rows);
-            if ($num_rows)
-            {
-                $i = 0;
-                while ($i < $num_rows)
-                {
-                    $obj = $this->db->fetch_object($resql_rows);
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+		$resql_rows = $this->db->query($sql);
+		if ($resql_rows)
+		{
+			$num_rows = $this->db->num_rows($resql_rows);
+			if ($num_rows)
+			{
+				$i = 0;
+				while ($i < $num_rows)
+				{
+					$obj = $this->db->fetch_object($resql_rows);
 
-	                $line = new SupplierInvoiceLine($this->db);
+					$line = new SupplierInvoiceLine($this->db);
 
-                    $line->id = $obj->rowid;
-                    $line->rowid = $obj->rowid;
-                    $line->description = $obj->description;
-                    $line->date_start = $obj->date_start;
-                    $line->date_end = $obj->date_end;
+					$line->id = $obj->rowid;
+					$line->rowid = $obj->rowid;
+					$line->description = $obj->description;
+					$line->date_start = $obj->date_start;
+					$line->date_end = $obj->date_end;
 
-                    $line->product_ref = $obj->product_ref;
-                    $line->ref = $obj->product_ref;
-                    $line->ref_supplier		= $obj->ref_supplier;
-                    $line->libelle			= $obj->label;
-                    $line->label  			= $obj->label;
-                    $line->product_desc		= $obj->product_desc;
-                    $line->subprice = $obj->pu_ht;
-                    $line->pu_ht = $obj->pu_ht;
-                    $line->pu_ttc			= $obj->pu_ttc;
+					$line->product_ref = $obj->product_ref;
+					$line->ref = $obj->product_ref;
+					$line->ref_supplier		= $obj->ref_supplier;
+					$line->libelle			= $obj->label;
+					$line->label  			= $obj->label;
+					$line->product_desc		= $obj->product_desc;
+					$line->subprice = $obj->pu_ht;
+					$line->pu_ht = $obj->pu_ht;
+					$line->pu_ttc			= $obj->pu_ttc;
 
-                    $line->vat_src_code = $obj->vat_src_code;
-                    $line->tva_tx			= $obj->tva_tx;
-                    $line->localtax1_tx		= $obj->localtax1_tx;
-                    $line->localtax2_tx		= $obj->localtax2_tx;
-                    $line->localtax1_type	= $obj->localtax1_type;
-                    $line->localtax2_type	= $obj->localtax2_type;
-                    $line->qty				= $obj->qty;
-                    $line->remise_percent = $obj->remise_percent;
-                    $line->tva				= $obj->total_tva; // deprecated
-                    $line->total_ht			= $obj->total_ht;
-                    $line->total_ttc		= $obj->total_ttc;
-                    $line->total_tva		= $obj->total_tva;
-                    $line->total_localtax1	= $obj->total_localtax1;
-                    $line->total_localtax2	= $obj->total_localtax2;
-                    $line->fk_facture_fourn = $obj->fk_facture_fourn;
-                    $line->fk_product = $obj->fk_product;
-                    $line->product_type		= $obj->product_type;
-                    $line->product_label	= $obj->label;
-                    $line->info_bits = $obj->info_bits;
-                    $line->fk_parent_line   = $obj->fk_parent_line;
-                    $line->special_code		= $obj->special_code;
-                    $line->rang = $obj->rang;
-                    $line->fk_unit          = $obj->fk_unit;
+					$line->vat_src_code = $obj->vat_src_code;
+					$line->tva_tx			= $obj->tva_tx;
+					$line->localtax1_tx		= $obj->localtax1_tx;
+					$line->localtax2_tx		= $obj->localtax2_tx;
+					$line->localtax1_type	= $obj->localtax1_type;
+					$line->localtax2_type	= $obj->localtax2_type;
+					$line->qty				= $obj->qty;
+					$line->remise_percent = $obj->remise_percent;
+					$line->tva				= $obj->total_tva; // deprecated
+					$line->total_ht			= $obj->total_ht;
+					$line->total_ttc		= $obj->total_ttc;
+					$line->total_tva		= $obj->total_tva;
+					$line->total_localtax1	= $obj->total_localtax1;
+					$line->total_localtax2	= $obj->total_localtax2;
+					$line->fk_facture_fourn = $obj->fk_facture_fourn;
+					$line->fk_product = $obj->fk_product;
+					$line->product_type		= $obj->product_type;
+					$line->product_label	= $obj->label;
+					$line->info_bits = $obj->info_bits;
+					$line->fk_parent_line   = $obj->fk_parent_line;
+					$line->special_code		= $obj->special_code;
+					$line->rang = $obj->rang;
+					$line->fk_unit          = $obj->fk_unit;
+
+					// Accountancy
+					$line->code_ventilation = $obj->fk_code_ventilation;
+					$line->fk_accounting_account = $obj->fk_code_ventilation;
 
 					// Multicurrency
 					$line->fk_multicurrency = $obj->fk_multicurrency;
@@ -859,123 +837,121 @@ class FactureFournisseur extends CommonInvoice
 					$line->multicurrency_total_tva = $obj->multicurrency_total_tva;
 					$line->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
 
-	                // Extra fields
+					// Extra fields
 					$line->fetch_optionals();
 
 					$this->lines[$i] = $line;
 
-                    $i++;
-                }
-            }
-            $this->db->free($resql_rows);
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -3;
-        }
-    }
+					$i++;
+				}
+			}
+			$this->db->free($resql_rows);
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -3;
+		}
+	}
 
 
-    /**
-     *  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;
-        $error = 0;
+	/**
+	 *  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;
+		$error = 0;
 
-        // Clean parameters
-        if (empty($this->type)) $this->type = self::TYPE_STANDARD;
+		// Clean parameters
+		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
 		if (isset($this->ref)) $this->ref = trim($this->ref);
-        if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
-        if (isset($this->entity)) $this->entity = trim($this->entity);
-        if (isset($this->type)) $this->type = trim($this->type);
-        if (isset($this->fk_soc)) $this->fk_soc = trim($this->fk_soc);
-        if (isset($this->label)) $this->label = trim($this->label);
-        if (isset($this->libelle)) $this->libelle = trim($this->libelle); // deprecated
-        if (isset($this->paye)) $this->paye = trim($this->paye);
-        if (isset($this->amount)) $this->amount = trim($this->amount);
-        if (isset($this->remise)) $this->remise = trim($this->remise);
-        if (isset($this->close_code)) $this->close_code = trim($this->close_code);
-        if (isset($this->close_note)) $this->close_note = trim($this->close_note);
-        if (isset($this->tva)) $this->tva = trim($this->tva);
-        if (isset($this->localtax1)) $this->localtax1 = trim($this->localtax1);
-        if (isset($this->localtax2)) $this->localtax2 = trim($this->localtax2);
-        if (empty($this->total_ht)) $this->total_ht = 0;
-        if (empty($this->total_tva)) $this->total_tva = 0;
-        //	if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1);
-        //	if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2);
-        if (isset($this->total_ttc)) $this->total_ttc = trim($this->total_ttc);
-        if (isset($this->statut)) $this->statut = (int) $this->statut;
-        if (isset($this->author)) $this->author = trim($this->author);
-        if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
-        if (isset($this->fk_facture_source)) $this->fk_facture_source = trim($this->fk_facture_source);
-        if (isset($this->fk_project)) $this->fk_project = trim($this->fk_project);
-        if (isset($this->cond_reglement_id)) $this->cond_reglement_id = trim($this->cond_reglement_id);
-        if (isset($this->note_private)) $this->note = trim($this->note_private);
-        if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-        if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
-        if (isset($this->import_key)) $this->import_key = trim($this->import_key);
+		if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
+		if (isset($this->entity)) $this->entity = trim($this->entity);
+		if (isset($this->type)) $this->type = trim($this->type);
+		if (isset($this->fk_soc)) $this->fk_soc = trim($this->fk_soc);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->libelle)) $this->libelle = trim($this->libelle); // deprecated
+		if (isset($this->paye)) $this->paye = trim($this->paye);
+		if (isset($this->amount)) $this->amount = trim($this->amount);
+		if (isset($this->remise)) $this->remise = trim($this->remise);
+		if (isset($this->close_code)) $this->close_code = trim($this->close_code);
+		if (isset($this->close_note)) $this->close_note = trim($this->close_note);
+		if (isset($this->tva)) $this->tva = trim($this->tva);
+		if (isset($this->localtax1)) $this->localtax1 = trim($this->localtax1);
+		if (isset($this->localtax2)) $this->localtax2 = trim($this->localtax2);
+		if (empty($this->total_ht)) $this->total_ht = 0;
+		if (empty($this->total_tva)) $this->total_tva = 0;
+		//	if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1);
+		//	if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2);
+		if (isset($this->total_ttc)) $this->total_ttc = trim($this->total_ttc);
+		if (isset($this->statut)) $this->statut = (int) $this->statut;
+		if (isset($this->author)) $this->author = trim($this->author);
+		if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
+		if (isset($this->fk_facture_source)) $this->fk_facture_source = trim($this->fk_facture_source);
+		if (isset($this->fk_project)) $this->fk_project = trim($this->fk_project);
+		if (isset($this->cond_reglement_id)) $this->cond_reglement_id = trim($this->cond_reglement_id);
+		if (isset($this->note_private)) $this->note = trim($this->note_private);
+		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
+		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
+		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 
 
-        // Check parameters
-        // Put here code to add control on parameters values
+		// Check parameters
+		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn SET";
 		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
-        $sql .= " ref_supplier=".(isset($this->ref_supplier) ? "'".$this->db->escape($this->ref_supplier)."'" : "null").",";
-        $sql .= " entity=".(isset($this->entity) ? $this->entity : "null").",";
-        $sql .= " type=".(isset($this->type) ? $this->type : "null").",";
-        $sql .= " fk_soc=".(isset($this->fk_soc) ? $this->fk_soc : "null").",";
-        $sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
-        $sql .= " datef=".(dol_strlen($this->date) != 0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
-        if (dol_strlen($this->tms) != 0) $sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-        $sql .= " libelle=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
-        $sql .= " paye=".(isset($this->paye) ? $this->paye : "null").",";
-        $sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
-        $sql .= " remise=".(isset($this->remise) ? $this->remise : "null").",";
-        $sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
-        $sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
-        $sql .= " tva=".(isset($this->tva) ? $this->tva : "null").",";
-        $sql .= " localtax1=".(isset($this->localtax1) ? $this->localtax1 : "null").",";
-        $sql .= " localtax2=".(isset($this->localtax2) ? $this->localtax2 : "null").",";
-        $sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
-        $sql .= " total_tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
-        $sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
-        $sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
-        $sql .= " fk_user_author=".(isset($this->author) ? $this->author : "null").",";
-        $sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
-        $sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? $this->fk_facture_source : "null").",";
-        $sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
-        $sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
-        $sql .= " date_lim_reglement=".(dol_strlen($this->date_echeance) != 0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";
-        $sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
-        $sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
-        $sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
-        $sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " ref_supplier=".(isset($this->ref_supplier) ? "'".$this->db->escape($this->ref_supplier)."'" : "null").",";
+		$sql .= " entity=".(isset($this->entity) ? $this->entity : "null").",";
+		$sql .= " type=".(isset($this->type) ? $this->type : "null").",";
+		$sql .= " fk_soc=".(isset($this->fk_soc) ? $this->fk_soc : "null").",";
+		$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql .= " datef=".(dol_strlen($this->date) != 0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
+		if (dol_strlen($this->tms) != 0) $sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " libelle=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " paye=".(isset($this->paye) ? $this->paye : "null").",";
+		$sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
+		$sql .= " remise=".(isset($this->remise) ? $this->remise : "null").",";
+		$sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
+		$sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
+		$sql .= " tva=".(isset($this->tva) ? $this->tva : "null").",";
+		$sql .= " localtax1=".(isset($this->localtax1) ? $this->localtax1 : "null").",";
+		$sql .= " localtax2=".(isset($this->localtax2) ? $this->localtax2 : "null").",";
+		$sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
+		$sql .= " total_tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
+		$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
+		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+		$sql .= " fk_user_author=".(isset($this->author) ? $this->author : "null").",";
+		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
+		$sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? $this->fk_facture_source : "null").",";
+		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
+		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
+		$sql .= " date_lim_reglement=".(dol_strlen($this->date_echeance) != 0 ? "'".$this->db->idate($this->date_echeance)."'" : 'null').",";
+		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+		$sql .= " model_pdf=".(isset($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null").",";
+		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "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);
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
 
-        if (!$resql) {
-            $error++;
+		if (!$resql) {
+			$error++;
 
-            if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                $this->errors[] = $langs->trans('ErrorRefAlreadyExists');
-            } else {
-                $this->errors[] = "Error ".$this->db->lasterror();
-            }
-        }
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$this->errors[] = $langs->trans('ErrorRefAlreadyExists');
+			} else {
+				$this->errors[] = "Error ".$this->db->lasterror();
+			}
+		}
 
 		if (!$error)
 		{
@@ -986,170 +962,162 @@ class FactureFournisseur extends CommonInvoice
 			}
 		}
 
-        if (!$error)
-        {
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('BILL_SUPPLIER_UPDATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-        }
+		if (!$error)
+		{
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('BILL_SUPPLIER_UPDATE', $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;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount)
-     *
-     *    @param     int	$idremise	Id of absolute discount
-     *    @return    int          		>0 if OK, <0 if KO
-     */
-    public function insert_discount($idremise)
-    {
-        // phpcs:enable
-    	global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount)
+	 *
+	 *    @param     int	$idremise	Id of absolute discount
+	 *    @return    int          		>0 if OK, <0 if KO
+	 */
+	public function insert_discount($idremise)
+	{
+		// phpcs:enable
+		global $langs;
 
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-    	include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
-    	$this->db->begin();
+		$this->db->begin();
 
-    	$remise = new DiscountAbsolute($this->db);
-    	$result = $remise->fetch($idremise);
+		$remise = new DiscountAbsolute($this->db);
+		$result = $remise->fetch($idremise);
 
-    	if ($result > 0)
-    	{
-    		if ($remise->fk_invoice_supplier)	// Protection against multiple submission
-    		{
-    			$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
-    			$this->db->rollback();
-    			return -5;
-    		}
+		if ($result > 0)
+		{
+			if ($remise->fk_invoice_supplier)	// Protection against multiple submission
+			{
+				$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
+				$this->db->rollback();
+				return -5;
+			}
 
-    		$facligne = new SupplierInvoiceLine($this->db);
-    		$facligne->fk_facture_fourn = $this->id;
-    		$facligne->fk_remise_except = $remise->id;
-    		$facligne->desc = $remise->description; // Description ligne
-    		$facligne->vat_src_code = $remise->vat_src_code;
-    		$facligne->tva_tx = $remise->tva_tx;
-    		$facligne->subprice = -$remise->amount_ht;
-    		$facligne->fk_product = 0; // Id produit predefini
-    		$facligne->product_type = 0;
-    		$facligne->qty = 1;
-    		$facligne->remise_percent = 0;
-    		$facligne->rang = -1;
-    		$facligne->info_bits = 2;
+			$facligne = new SupplierInvoiceLine($this->db);
+			$facligne->fk_facture_fourn = $this->id;
+			$facligne->fk_remise_except = $remise->id;
+			$facligne->desc = $remise->description; // Description ligne
+			$facligne->vat_src_code = $remise->vat_src_code;
+			$facligne->tva_tx = $remise->tva_tx;
+			$facligne->subprice = -$remise->amount_ht;
+			$facligne->fk_product = 0; // Id produit predefini
+			$facligne->product_type = 0;
+			$facligne->qty = 1;
+			$facligne->remise_percent = 0;
+			$facligne->rang = -1;
+			$facligne->info_bits = 2;
 
-    		// Get buy/cost price of invoice that is source of discount
-    		if ($remise->fk_invoice_supplier_source > 0)
-    		{
-    			$srcinvoice = new FactureFournisseur($this->db);
-    			$srcinvoice->fetch($remise->fk_invoice_supplier_source);
-    			$totalcostpriceofinvoice = 0;
-    			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php'; // TODO Move this into commonobject
-    			$formmargin = new FormMargin($this->db);
-    			$arraytmp = $formmargin->getMarginInfosArray($srcinvoice, false);
-    			$facligne->pa_ht = $arraytmp['pa_total'];
-    		}
+			// Get buy/cost price of invoice that is source of discount
+			if ($remise->fk_invoice_supplier_source > 0)
+			{
+				$srcinvoice = new FactureFournisseur($this->db);
+				$srcinvoice->fetch($remise->fk_invoice_supplier_source);
+				$totalcostpriceofinvoice = 0;
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php'; // TODO Move this into commonobject
+				$formmargin = new FormMargin($this->db);
+				$arraytmp = $formmargin->getMarginInfosArray($srcinvoice, false);
+				$facligne->pa_ht = $arraytmp['pa_total'];
+			}
 
-    		$facligne->total_ht  = -$remise->amount_ht;
-    		$facligne->total_tva = -$remise->amount_tva;
-    		$facligne->total_ttc = -$remise->amount_ttc;
+			$facligne->total_ht  = -$remise->amount_ht;
+			$facligne->total_tva = -$remise->amount_tva;
+			$facligne->total_ttc = -$remise->amount_ttc;
 
-    		$facligne->multicurrency_subprice = -$remise->multicurrency_subprice;
-    		$facligne->multicurrency_total_ht = -$remise->multicurrency_total_ht;
-    		$facligne->multicurrency_total_tva = -$remise->multicurrency_total_tva;
-    		$facligne->multicurrency_total_ttc = -$remise->multicurrency_total_ttc;
+			$facligne->multicurrency_subprice = -$remise->multicurrency_subprice;
+			$facligne->multicurrency_total_ht = -$remise->multicurrency_total_ht;
+			$facligne->multicurrency_total_tva = -$remise->multicurrency_total_tva;
+			$facligne->multicurrency_total_ttc = -$remise->multicurrency_total_ttc;
 
-    		$lineid = $facligne->insert();
-    		if ($lineid > 0)
-    		{
-    			$result = $this->update_price(1);
-    			if ($result > 0)
-    			{
-    				// Create link between discount and invoice line
-    				$result = $remise->link_to_invoice($lineid, 0, 'supplier');
-    				if ($result < 0)
-    				{
-    					$this->error = $remise->error;
-    					$this->db->rollback();
-    					return -4;
-    				}
+			$lineid = $facligne->insert();
+			if ($lineid > 0)
+			{
+				$result = $this->update_price(1);
+				if ($result > 0)
+				{
+					// Create link between discount and invoice line
+					$result = $remise->link_to_invoice($lineid, 0, 'supplier');
+					if ($result < 0)
+					{
+						$this->error = $remise->error;
+						$this->db->rollback();
+						return -4;
+					}
 
-    				$this->db->commit();
-    				return 1;
-    			}
-    			else
-    			{
-    				$this->error = $facligne->error;
-    				$this->db->rollback();
-    				return -1;
-    			}
-    		}
-    		else
-    		{
-    			$this->error = $facligne->error;
-    			$this->db->rollback();
-    			return -2;
-    		}
-    	}
-    	else
-    	{
-    		$this->db->rollback();
-    		return -3;
-    	}
-    }
+					$this->db->commit();
+					return 1;
+				} else {
+					$this->error = $facligne->error;
+					$this->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->error = $facligne->error;
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->db->rollback();
+			return -3;
+		}
+	}
 
 
-    /**
-     *	Delete invoice from database
-     *
-     *  @param      User	$user		    User object
-     *	@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)
-    {
-        global $langs, $conf;
+	/**
+	 *	Delete invoice from database
+	 *
+	 *  @param      User	$user		    User object
+	 *	@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)
+	{
+		global $langs, $conf;
 
-        $rowid = $this->id;
+		$rowid = $this->id;
 
-        dol_syslog("FactureFournisseur::delete rowid=".$rowid, LOG_DEBUG);
+		dol_syslog("FactureFournisseur::delete rowid=".$rowid, LOG_DEBUG);
 
-        // TODO Test if there is at least on payment. If yes, refuse to delete.
+		// TODO Test if there is at least on payment. If yes, refuse to delete.
 
-        $error = 0;
-        $this->db->begin();
+		$error = 0;
+		$this->db->begin();
 
-        if (!$error && !$notrigger)
-        {
-            // Call trigger
-            $result = $this->call_trigger('BILL_SUPPLIER_DELETE', $user);
-            if ($result < 0)
-            {
-                $this->db->rollback();
-                return -1;
-            }
-            // Fin appel triggers
-        }
+		if (!$error && !$notrigger)
+		{
+			// Call trigger
+			$result = $this->call_trigger('BILL_SUPPLIER_DELETE', $user);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				return -1;
+			}
+			// Fin appel triggers
+		}
 
 		if (!$error) {
 			// If invoice was converted into a discount not yet consumed, we remove discount
@@ -1178,28 +1146,27 @@ class FactureFournisseur extends CommonInvoice
 			}
 		}
 
-        if (!$error)
-        {
-            $main = MAIN_DB_PREFIX.'facture_fourn_det';
-            $ef = $main."_extrafields";
-            $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture_fourn = $rowid)";
-            $resqlef = $this->db->query($sqlef);
-            $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resqlef && $resql)
-            {
-                $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
-                dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-                $resql2 = $this->db->query($sql);
-                if (!$resql2) {
-                	$error++;
-                }
-            }
-            else {
-            	$error++;
-            }
-        }
+		if (!$error)
+		{
+			$main = MAIN_DB_PREFIX.'facture_fourn_det';
+			$ef = $main."_extrafields";
+			$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture_fourn = $rowid)";
+			$resqlef = $this->db->query($sqlef);
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resqlef && $resql)
+			{
+				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
+				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+				$resql2 = $this->db->query($sql);
+				if (!$resql2) {
+					$error++;
+				}
+			} else {
+				$error++;
+			}
+		}
 
 		if (!$error)
 		{
@@ -1208,461 +1175,441 @@ class FactureFournisseur extends CommonInvoice
 			if ($res < 0) $error++;
 		}
 
-        if (!$error)
-        {
-        	// Delete linked object
-        	$res = $this->deleteObjectLinked();
-        	if ($res < 0) $error++;
-        }
-
-        if (!$error)
-        {
-        	// 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
-        	if ($conf->fournisseur->facture->dir_output)
-        	{
-        		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        		$ref = dol_sanitizeFileName($this->ref);
-        		$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoive_supplier').$ref;
-        		$file = $dir."/".$ref.".pdf";
-        		if (file_exists($file))
-        		{
-        			if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-        			{
-        				$this->error = 'ErrorFailToDeleteFile';
-        				$error++;
-        			}
-        		}
-        		if (file_exists($dir))
-        		{
-        			$res = @dol_delete_dir_recursive($dir);
-
-        			if (!$res)
-        			{
-        				$this->error = 'ErrorFailToDeleteDir';
-        				$error++;
-        			}
-        		}
-        	}
-        }
-
-        // Remove extrafields
-        if (!$error)
-        {
-        	$result = $this->deleteExtraFields();
-        	if ($result < 0)
-        	{
-        		$error++;
-        		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-        	}
-        }
-
-        if (!$error)
-        {
-        	dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
-        	$this->db->commit();
-        	return 1;
-        }
-        else
-        {
-        	$this->error = $this->db->lasterror();
-        	$this->db->rollback();
-        	return -$error;
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Tag invoice as a payed invoice
-     *
-     *	@param  User	$user       Object user
-     *	@param  string	$close_code	Code renseigne si on classe a payee completement alors que paiement incomplet. Not implementd yet.
-     *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet. Not implementd yet.
-     *	@return int         		<0 si ko, >0 si ok
-     */
-    public function set_paid($user, $close_code = '', $close_note = '')
-    {
-        // phpcs:enable
-        global $conf, $langs;
-        $error = 0;
-
-        $this->db->begin();
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
-        $sql .= ' SET paye = 1, fk_statut = '.self::STATUS_CLOSED;
-        $sql .= ' WHERE rowid = '.$this->id;
-
-        dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Call trigger
-            $result = $this->call_trigger('BILL_SUPPLIER_PAYED', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-        else
-        {
-            $error++;
-            $this->error = $this->db->error();
-            dol_print_error($this->db);
-        }
-
-        if (!$error)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
-     *	Fonction utilisee quand un paiement prelevement est refuse,
-     *	ou quand une facture annulee et reouverte.
-     *
-     *	@param      User	$user       Object user that change status
-     *	@return     int         		<0 si ok, >0 si ok
-     */
-    public function set_unpaid($user)
-    {
-        // phpcs:enable
-        global $conf, $langs;
-        $error = 0;
-
-        $this->db->begin();
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
-        $sql .= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
-        $sql .= ' WHERE rowid = '.$this->id;
-
-        dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Call trigger
-            $result = $this->call_trigger('BILL_SUPPLIER_UNPAYED', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-        }
-        else
-        {
-            $error++;
-            $this->error = $this->db->lasterror();
-            dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
-        }
-
-        if (!$error)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Tag invoice as validated + call trigger BILL_VALIDATE
-     *
-     *	@param	User	$user           Object user that validate
-     *	@param  string	$force_number   Reference to force on invoice
-     *	@param	int		$idwarehouse	Id of warehouse for stock change
-     *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *	@return int 			        <0 if KO, =0 if nothing to do, >0 if OK
-     */
-    public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0)
-    {
-        global $conf, $langs;
-
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $now = dol_now();
-
-        $error = 0;
-        dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse);
-
-        // Force to have object complete for checks
-        $this->fetch_thirdparty();
-        $this->fetch_lines();
-
-        // Check parameters
-        if ($this->statut > self::STATUS_DRAFT)	// This is to avoid to validate twice (avoid errors on logs and stock management)
-        {
-            dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
-            return 0;
-        }
-        if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->ref_supplier))
-        {
-        	$langs->load("errors");
-        	$this->error = $langs->trans("ErrorFieldFormat", $langs->transnoentities("RefSupplier")).'. '.$langs->trans('RemoveString', $langs->transnoentitiesnoconv("CopyOf"));
-            return -1;
-        }
-        if (count($this->lines) <= 0)
-        {
-        	$langs->load("errors");
-            $this->error = $langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
-            return -1;
-        }
-
-        $this->db->begin();
-
-        // Define new ref
-        if ($force_number)
-        {
-            $num = $force_number;
-        }
-        elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-        {
-            $num = $this->getNextNumRef($this->thirdparty);
-        }
-        else
+		if (!$error)
 		{
-            $num = $this->ref;
-        }
-        $this->newref = dol_sanitizeFileName($num);
+			// Delete linked object
+			$res = $this->deleteObjectLinked();
+			if ($res < 0) $error++;
+		}
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-        $sql .= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
-        $sql .= " WHERE rowid = ".$this->id;
+		if (!$error)
+		{
+			// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
+			$this->deleteEcmFiles();
 
-        dol_syslog(get_class($this)."::validate", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // Si on incrémente le produit principal et ses composants à la validation de facture fournisseur
-            if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
-            {
-                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-                $langs->load("agenda");
+			// We remove directory
+			if ($conf->fournisseur->facture->dir_output)
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-                $cpt = count($this->lines);
-                for ($i = 0; $i < $cpt; $i++)
-                {
-                    if ($this->lines[$i]->fk_product > 0)
-                    {
-                        $this->line = $this->lines[$i];
-                        $mouvP = new MouvementStock($this->db);
+				$ref = dol_sanitizeFileName($this->ref);
+				$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoive_supplier').$ref;
+				$file = $dir."/".$ref.".pdf";
+				if (file_exists($file))
+				{
+					if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
+					{
+						$this->error = 'ErrorFailToDeleteFile';
+						$error++;
+					}
+				}
+				if (file_exists($dir))
+				{
+					$res = @dol_delete_dir_recursive($dir);
+
+					if (!$res)
+					{
+						$this->error = 'ErrorFailToDeleteDir';
+						$error++;
+					}
+				}
+			}
+		}
+
+		// Remove extrafields
+		if (!$error)
+		{
+			$result = $this->deleteExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+			}
+		}
+
+		if (!$error)
+		{
+			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -$error;
+		}
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Tag invoice as a payed invoice
+	 *
+	 *	@param  User	$user       Object user
+	 *	@param  string	$close_code	Code renseigne si on classe a payee completement alors que paiement incomplet. Not implementd yet.
+	 *	@param  string	$close_note	Commentaire renseigne si on classe a payee alors que paiement incomplet. Not implementd yet.
+	 *	@return int         		<0 si ko, >0 si ok
+	 */
+	public function set_paid($user, $close_code = '', $close_note = '')
+	{
+		// phpcs:enable
+		global $conf, $langs;
+		$error = 0;
+
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
+		$sql .= ' SET paye = 1, fk_statut = '.self::STATUS_CLOSED;
+		$sql .= ' WHERE rowid = '.$this->id;
+
+		dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Call trigger
+			$result = $this->call_trigger('BILL_SUPPLIER_PAYED', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		} else {
+			$error++;
+			$this->error = $this->db->error();
+			dol_print_error($this->db);
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Tag la facture comme non payee completement + appel trigger BILL_UNPAYED
+	 *	Fonction utilisee quand un paiement prelevement est refuse,
+	 *	ou quand une facture annulee et reouverte.
+	 *
+	 *	@param      User	$user       Object user that change status
+	 *	@return     int         		<0 si ok, >0 si ok
+	 */
+	public function set_unpaid($user)
+	{
+		// phpcs:enable
+		global $conf, $langs;
+		$error = 0;
+
+		$this->db->begin();
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn';
+		$sql .= ' SET paye=0, fk_statut=1, close_code=null, close_note=null';
+		$sql .= ' WHERE rowid = '.$this->id;
+
+		dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Call trigger
+			$result = $this->call_trigger('BILL_SUPPLIER_UNPAYED', $user);
+			if ($result < 0) $error++;
+			// End call triggers
+		} else {
+			$error++;
+			$this->error = $this->db->lasterror();
+			dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Tag invoice as validated + call trigger BILL_VALIDATE
+	 *
+	 *	@param	User	$user           Object user that validate
+	 *	@param  string	$force_number   Reference to force on invoice
+	 *	@param	int		$idwarehouse	Id of warehouse for stock change
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return int 			        <0 if KO, =0 if nothing to do, >0 if OK
+	 */
+	public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$now = dol_now();
+
+		$error = 0;
+		dol_syslog(get_class($this).'::validate user='.$user->id.', force_number='.$force_number.', idwarehouse='.$idwarehouse);
+
+		// Force to have object complete for checks
+		$this->fetch_thirdparty();
+		$this->fetch_lines();
+
+		// Check parameters
+		if ($this->statut > self::STATUS_DRAFT)	// This is to avoid to validate twice (avoid errors on logs and stock management)
+		{
+			dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
+			return 0;
+		}
+		if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->ref_supplier))
+		{
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorFieldFormat", $langs->transnoentities("RefSupplier")).'. '.$langs->trans('RemoveString', $langs->transnoentitiesnoconv("CopyOf"));
+			return -1;
+		}
+		if (count($this->lines) <= 0)
+		{
+			$langs->load("errors");
+			$this->error = $langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
+			return -1;
+		}
+
+		$this->db->begin();
+
+		// Define new ref
+		if ($force_number)
+		{
+			$num = $force_number;
+		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+		{
+			$num = $this->getNextNumRef($this->thirdparty);
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = dol_sanitizeFileName($num);
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
+		$sql .= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";
+		$sql .= " WHERE rowid = ".$this->id;
+
+		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// Si on incrémente le produit principal et ses composants à la validation de facture fournisseur
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+				$langs->load("agenda");
+
+				$cpt = count($this->lines);
+				for ($i = 0; $i < $cpt; $i++)
+				{
+					if ($this->lines[$i]->fk_product > 0)
+					{
+						$this->line = $this->lines[$i];
+						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
-                        // We increase stock for product
-                        $up_ht_disc = $this->lines[$i]->pu_ht;
-                        if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
-                        if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
-                        else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
-                        if ($result < 0) { $error++; }
-                        unset($this->line);
-                    }
-                }
-            }
+						// We increase stock for product
+						$up_ht_disc = $this->lines[$i]->pu_ht;
+						if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
+						else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
+						if ($result < 0) { $error++; }
+						unset($this->line);
+					}
+				}
+			}
 
-            // Triggers call
-            if (!$error && empty($notrigger))
-            {
-                // Call trigger
-                $result = $this->call_trigger('BILL_SUPPLIER_VALIDATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
+			// Triggers call
+			if (!$error && empty($notrigger))
+			{
+				// Call trigger
+				$result = $this->call_trigger('BILL_SUPPLIER_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 = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->db->escape($this->newref)."'";
-            		$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$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 = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->db->escape($this->newref)."'";
+					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$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->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$oldref;
-            		$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$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->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$oldref;
+					$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$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->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$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->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$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 define current statut
-            if (!$error)
-            {
-            	$this->ref = $num;
-            	$this->statut = self::STATUS_VALIDATED;
-            	//$this->date_validation=$now; this is stored into log table
-            }
+			// Set new ref and define current statut
+			if (!$error)
+			{
+				$this->ref = $num;
+				$this->statut = self::STATUS_VALIDATED;
+				//$this->date_validation=$now; this is stored into log table
+			}
 
-            if (!$error)
-            {
-                $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->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *	Set draft status
-     *
-     *	@param	User	$user			Object user that modify
-     *	@param	int		$idwarehouse	Id warehouse to use for stock change.
-     *	@return	int						<0 if KO, >0 if OK
-     */
-    public function setDraft($user, $idwarehouse = -1)
-    {
-        // phpcs:enable
-        global $conf, $langs;
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *	@param	int		$idwarehouse	Id warehouse to use for stock change.
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function setDraft($user, $idwarehouse = -1)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        $error = 0;
+		$error = 0;
 
-        if ($this->statut == self::STATUS_DRAFT)
-        {
-            dol_syslog(__METHOD__." already draft status", LOG_WARNING);
-            return 0;
-        }
+		if ($this->statut == self::STATUS_DRAFT)
+		{
+			dol_syslog(__METHOD__." already draft status", LOG_WARNING);
+			return 0;
+		}
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-        $sql .= " SET fk_statut = ".self::STATUS_DRAFT;
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
+		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if (!$error)
-            {
-                $this->oldcopy = clone $this;
-            }
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if (!$error)
+			{
+				$this->oldcopy = clone $this;
+			}
 
-            // Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
-            if ($result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
-            {
-                require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-                $langs->load("agenda");
+			// Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
+			if ($result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+				$langs->load("agenda");
 
-                $cpt = count($this->lines);
-                for ($i = 0; $i < $cpt; $i++)
-                {
-                    if ($this->lines[$i]->fk_product > 0)
-                    {
-                        $mouvP = new MouvementStock($this->db);
-                        $mouvP->origin = &$this;
+				$cpt = count($this->lines);
+				for ($i = 0; $i < $cpt; $i++)
+				{
+					if ($this->lines[$i]->fk_product > 0)
+					{
+						$mouvP = new MouvementStock($this->db);
+						$mouvP->origin = &$this;
 						// We increase stock for product
 						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
-                        else $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
-                    }
-                }
-            }
-            // Triggers call
-            if (!$error && empty($notrigger))
-            {
-                // Call trigger
-                $result = $this->call_trigger('BILL_SUPPLIER_UNVALIDATE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-            if ($error == 0)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+						else $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+					}
+				}
+			}
+			// Triggers call
+			if (!$error && empty($notrigger))
+			{
+				// Call trigger
+				$result = $this->call_trigger('BILL_SUPPLIER_UNVALIDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+			if ($error == 0)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    /**
-     *	Ajoute une ligne de facture (associe a aucun produit/service predefini)
-     *	Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
-     *	de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
-     *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,idprod)
-     *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue).
-     *
-     *	@param    	string	$desc            	Description de la ligne
-     *	@param    	double	$pu              	Prix unitaire (HT ou TTC selon price_base_type, > 0 even for credit note)
-     *	@param    	double	$txtva           	Force Vat rate to use, -1 for auto.
-     *	@param		double	$txlocaltax1		LocalTax1 Rate
-     *	@param		double	$txlocaltax2		LocalTax2 Rate
-     *	@param    	double	$qty             	Quantite
-     *	@param    	int		$fk_product      	Product/Service ID predefined
-     *	@param    	double	$remise_percent  	Percentage discount of the line
-     *	@param    	integer	$date_start      	Date de debut de validite du service
-     * 	@param    	integer	$date_end        	Date de fin de validite du service
-     * 	@param    	string	$ventil          	Code de ventilation comptable
-     *	@param    	int		$info_bits			Bits de type de lines
-     *	@param    	string	$price_base_type 	HT ou TTC
-     *	@param		int		$type				Type of line (0=product, 1=service)
-     *  @param      int		$rang            	Position of line
-     *  @param		int		$notrigger			Disable triggers
+	/**
+	 *	Ajoute une ligne de facture (associe a aucun produit/service predefini)
+	 *	Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
+	 *	de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
+	 *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,idprod)
+	 *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue).
+	 *
+	 *	@param    	string	$desc            	Description de la ligne
+	 *	@param    	double	$pu              	Prix unitaire (HT ou TTC selon price_base_type, > 0 even for credit note)
+	 *	@param    	double	$txtva           	Force Vat rate to use, -1 for auto.
+	 *	@param		double	$txlocaltax1		LocalTax1 Rate
+	 *	@param		double	$txlocaltax2		LocalTax2 Rate
+	 *	@param    	double	$qty             	Quantite
+	 *	@param    	int		$fk_product      	Product/Service ID predefined
+	 *	@param    	double	$remise_percent  	Percentage discount of the line
+	 *	@param    	integer	$date_start      	Date de debut de validite du service
+	 * 	@param    	integer	$date_end        	Date de fin de validite du service
+	 * 	@param    	string	$ventil          	Code de ventilation comptable
+	 *	@param    	int		$info_bits			Bits de type de lines
+	 *	@param    	string	$price_base_type 	HT ou TTC
+	 *	@param		int		$type				Type of line (0=product, 1=service)
+	 *  @param      int		$rang            	Position of line
+	 *  @param		int		$notrigger			Disable triggers
 	 *  @param		array	$array_options		extrafields array
-     * 	@param 		string	$fk_unit 			Code of the unit to use. Null to use the default one
-     *  @param      int     $origin_id          id origin document
+	 * 	@param 		string	$fk_unit 			Code of the unit to use. Null to use the default one
+	 *  @param      int     $origin_id          id origin document
 	 *  @param		double	$pu_ht_devise		Amount in currency
 	 *  @param		string	$ref_supplier		Supplier ref
 	 *  @param      string  $special_code       Special code
-     *	@return    	int             			>0 if OK, <0 if KO
-     */
-    public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_ht_devise = 0, $ref_supplier = '', $special_code = '')
-    {
-    	global $langs, $mysoc, $conf;
+	 *  @param		int		$fk_parent_line		Parent line id
+	 *	@return    	int             			>0 if OK, <0 if KO
+	 */
+	public function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product = 0, $remise_percent = 0, $date_start = '', $date_end = '', $ventil = 0, $info_bits = '', $price_base_type = 'HT', $type = 0, $rang = -1, $notrigger = false, $array_options = 0, $fk_unit = null, $origin_id = 0, $pu_ht_devise = 0, $ref_supplier = '', $special_code = '', $fk_parent_line = 0)
+	{
+		global $langs, $mysoc, $conf;
 
-    	dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		if ($this->statut == self::STATUS_DRAFT)
 		{
@@ -1691,97 +1638,93 @@ class FactureFournisseur extends CommonInvoice
 				return -1;
 			}
 
-	        $this->db->begin();
+			$this->db->begin();
 
-	        if ($fk_product > 0)
-	        {
-	        	if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY))
-	        	{
-	        		// Check quantity is enough
-	        		dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." qty=".$qty." ref_supplier=".$ref_supplier);
-	        		$prod = new Product($this->db, $fk_product);
-	        		if ($prod->fetch($fk_product) > 0)
-	        		{
-	        			$product_type = $prod->type;
-	        			$label = $prod->label;
-	        			$fk_prod_fourn_price = 0;
+			if ($fk_product > 0)
+			{
+				if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY))
+				{
+					// Check quantity is enough
+					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." qty=".$qty." ref_supplier=".$ref_supplier);
+					$prod = new Product($this->db, $fk_product);
+					if ($prod->fetch($fk_product) > 0)
+					{
+						$product_type = $prod->type;
+						$label = $prod->label;
+						$fk_prod_fourn_price = 0;
 
-	        			// We use 'none' instead of $ref_supplier, because $ref_supplier may not exists anymore. So we will take the first supplier price ok.
-	        			// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
-	        			$result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
-	        			if ($result > 0)
-	        			{
-	        				if (empty($pu)) $pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
-	        				$ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
-	        				// is remise percent not keyed but present for the product we add it
-	        				if ($remise_percent == 0 && $prod->remise_percent != 0)
-	        					$remise_percent = $prod->remise_percent;
-	        			}
-	        			if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
-	        			{
-	        				$langs->load("errors");
-	        				$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
-	        				$this->db->rollback();
-	        				dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
-	        				//$pu    = $prod->fourn_pu;     // We do not overwrite unit price
-	        				//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
-	        				return -1;
-	        			}
-	        			if ($result == -1)
-	        			{
-	        				$langs->load("errors");
-	        				$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
-	        				$this->db->rollback();
-	        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
-	        				return -1;
-	        			}
-	        			if ($result < -1)
-	        			{
-	        				$this->error = $prod->error;
-	        				$this->db->rollback();
-	        				dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
-	        				return -1;
-	        			}
-	        		}
-	        		else
-	        		{
-	        			$this->error = $prod->error;
-	        			$this->db->rollback();
-	        			return -1;
-	        		}
-	        	}
-	        }
-	        else
-	        {
-	        	$product_type = $type;
-	        }
+						// We use 'none' instead of $ref_supplier, because $ref_supplier may not exists anymore. So we will take the first supplier price ok.
+						// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+						$result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+						if ($result > 0)
+						{
+							if (empty($pu)) $pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+							$ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
+							// is remise percent not keyed but present for the product we add it
+							if ($remise_percent == 0 && $prod->remise_percent != 0)
+								$remise_percent = $prod->remise_percent;
+						}
+						if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
+						{
+							$langs->load("errors");
+							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
+							//$pu    = $prod->fourn_pu;     // We do not overwrite unit price
+							//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
+							return -1;
+						}
+						if ($result == -1)
+						{
+							$langs->load("errors");
+							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
+							return -1;
+						}
+						if ($result < -1)
+						{
+							$this->error = $prod->error;
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
+							return -1;
+						}
+					} else {
+						$this->error = $prod->error;
+						$this->db->rollback();
+						return -1;
+					}
+				}
+			} else {
+				$product_type = $type;
+			}
 
-	        if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
-	        	$pu = 0;
-	        }
+			if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+				$pu = 0;
+			}
 
-	        $localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
+			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $mysoc, $this->thirdparty);
 
-	        // 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.
+			}
 
-	        // Calcul du total TTC et de la TVA pour la ligne a partir de
-	        // qty, pu, remise_percent et 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.
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et 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.
 
-	        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $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];
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $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];
 
 			// MultiCurrency
@@ -1835,7 +1778,7 @@ class FactureFournisseur extends CommonInvoice
 			$this->line->info_bits = $info_bits;
 
 			$this->line->special_code = ((string) $special_code != '' ? $special_code : $this->special_code);
-			$this->line->fk_parent_line = $this->fk_parent_line;
+			$this->line->fk_parent_line = $fk_parent_line;
 			$this->line->origin = $this->origin;
 			$this->line->origin_id = $origin_id;
 			$this->line->fk_unit = $fk_unit;
@@ -1864,203 +1807,195 @@ class FactureFournisseur extends CommonInvoice
 				{
 					$this->db->commit();
 					return $this->line->id;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->error();
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->line->error;
 				$this->errors = $this->line->errors;
 				$this->db->rollback();
 				return -2;
 			}
-        }
-        else
-        {
-        	return 0;
-        }
-    }
+		} else {
+			return 0;
+		}
+	}
 
-    /**
-     * Update a line detail into database
-     *
-     * @param     	int			$id            		Id of line invoice
-     * @param     	string		$desc         		Description of line
-     * @param     	double		$pu          		Prix unitaire (HT ou TTC selon price_base_type)
-     * @param     	double		$vatrate       		VAT Rate (Can be '8.5', '8.5 (ABC)')
-     * @param		double		$txlocaltax1		LocalTax1 Rate
-     * @param		double		$txlocaltax2		LocalTax2 Rate
-     * @param     	double		$qty           		Quantity
-     * @param     	int			$idproduct			Id produit
-     * @param	  	double		$price_base_type	HT or TTC
-     * @param	  	int			$info_bits			Miscellaneous informations of line
-     * @param		int			$type				Type of line (0=product, 1=service)
-     * @param     	double		$remise_percent  	Percentage discount of the line
-     * @param		int			$notrigger			Disable triggers
-     * @param      	integer 	$date_start     	Date start of service
-     * @param      	integer     $date_end       	Date end of service
+	/**
+	 * Update a line detail into database
+	 *
+	 * @param     	int			$id            		Id of line invoice
+	 * @param     	string		$desc         		Description of line
+	 * @param     	double		$pu          		Prix unitaire (HT ou TTC selon price_base_type)
+	 * @param     	double		$vatrate       		VAT Rate (Can be '8.5', '8.5 (ABC)')
+	 * @param		double		$txlocaltax1		LocalTax1 Rate
+	 * @param		double		$txlocaltax2		LocalTax2 Rate
+	 * @param     	double		$qty           		Quantity
+	 * @param     	int			$idproduct			Id produit
+	 * @param	  	double		$price_base_type	HT or TTC
+	 * @param	  	int			$info_bits			Miscellaneous informations of line
+	 * @param		int			$type				Type of line (0=product, 1=service)
+	 * @param     	double		$remise_percent  	Percentage discount of the line
+	 * @param		int			$notrigger			Disable triggers
+	 * @param      	integer 	$date_start     	Date start of service
+	 * @param      	integer     $date_end       	Date end of service
 	 * @param		array		$array_options		extrafields array
-     * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+	 * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * @param		double		$pu_ht_devise		Amount in currency
 	 * @param		string		$ref_supplier		Supplier ref
-     * @return    	int           					<0 if KO, >0 if OK
-     */
-    public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1 = 0, $txlocaltax2 = 0, $qty = 1, $idproduct = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $remise_percent = 0, $notrigger = false, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
-    {
-    	global $mysoc, $langs;
-        dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$notrigger,$date_start,$date_end,$fk_unit,$pu_ht_devise,$ref_supplier", LOG_DEBUG);
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+	 * @return    	int           					<0 if KO, >0 if OK
+	 */
+	public function updateline($id, $desc, $pu, $vatrate, $txlocaltax1 = 0, $txlocaltax2 = 0, $qty = 1, $idproduct = 0, $price_base_type = 'HT', $info_bits = 0, $type = 0, $remise_percent = 0, $notrigger = false, $date_start = '', $date_end = '', $array_options = 0, $fk_unit = null, $pu_ht_devise = 0, $ref_supplier = '')
+	{
+		global $mysoc, $langs;
+		dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$notrigger,$date_start,$date_end,$fk_unit,$pu_ht_devise,$ref_supplier", LOG_DEBUG);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-        $pu = price2num($pu);
-        $qty = price2num($qty);
+		$pu = price2num($pu);
+		$qty = price2num($qty);
 		$remise_percent = price2num($remise_percent);
 		$pu_ht_devise = price2num($pu_ht_devise);
 
-        // Check parameters
-        //if (! is_numeric($pu) || ! is_numeric($qty)) return -1;
-        if ($type < 0) return -1;
+		// Check parameters
+		//if (! is_numeric($pu) || ! is_numeric($qty)) return -1;
+		if ($type < 0) return -1;
 
-        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;
+		}
 
-        // Clean parameters
+		// Clean parameters
 		if (empty($vatrate)) $vatrate = 0;
-        if (empty($txlocaltax1)) $txlocaltax1 = 0;
-        if (empty($txlocaltax2)) $txlocaltax2 = 0;
+		if (empty($txlocaltax1)) $txlocaltax1 = 0;
+		if (empty($txlocaltax2)) $txlocaltax2 = 0;
 
-        $txlocaltax1 = price2num($txlocaltax1);
-        $txlocaltax2 = price2num($txlocaltax2);
+		$txlocaltax1 = price2num($txlocaltax1);
+		$txlocaltax2 = price2num($txlocaltax2);
 
-        $localtaxes_type = array($txlocaltax1, $txlocaltax2);
+		$localtaxes_type = array($txlocaltax1, $txlocaltax2);
 
-        // Calcul du total TTC et de la TVA pour la ligne a partir de
-        // qty, pu, remise_percent et 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.
+		// Calcul du total TTC et de la TVA pour la ligne a partir de
+		// qty, pu, remise_percent et 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($vatrate, 0, $mysoc, $this->thirdparty);
+		$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $mysoc, $this->thirdparty);
 
-        $reg = array();
+		$reg = array();
 
-        // Clean vat code
-        $vat_src_code = '';
-        if (preg_match('/\((.*)\)/', $vatrate, $reg))
-        {
-            $vat_src_code = $reg[1];
-            $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
-        }
+		// Clean vat code
+		$vat_src_code = '';
+		if (preg_match('/\((.*)\)/', $vatrate, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
+		}
 
-        $tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
-        $total_ht  = $tabprice[0];
-        $total_tva = $tabprice[1];
-        $total_ttc = $tabprice[2];
-        $pu_ht  = $tabprice[3];
-        $pu_tva = $tabprice[4];
-        $pu_ttc = $tabprice[5];
-        $total_localtax1 = $tabprice[9];
-        $total_localtax2 = $tabprice[10];
+		$tabprice = calcul_price_total($qty, $pu, $remise_percent, $vatrate, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+		$total_ht  = $tabprice[0];
+		$total_tva = $tabprice[1];
+		$total_ttc = $tabprice[2];
+		$pu_ht  = $tabprice[3];
+		$pu_tva = $tabprice[4];
+		$pu_ttc = $tabprice[5];
+		$total_localtax1 = $tabprice[9];
+		$total_localtax2 = $tabprice[10];
 
 		// MultiCurrency
 		$multicurrency_total_ht = $tabprice[16];
-        $multicurrency_total_tva = $tabprice[17];
-        $multicurrency_total_ttc = $tabprice[18];
+		$multicurrency_total_tva = $tabprice[17];
+		$multicurrency_total_ttc = $tabprice[18];
 		$pu_ht_devise = $tabprice[19];
 
-        if (empty($info_bits)) $info_bits = 0;
+		if (empty($info_bits)) $info_bits = 0;
 
-        if ($idproduct)
-        {
-            $product = new Product($this->db);
-            $result = $product->fetch($idproduct);
-            $product_type = $product->type;
-        }
-        else
-        {
-            $product_type = $type;
-        }
+		if ($idproduct)
+		{
+			$product = new Product($this->db);
+			$result = $product->fetch($idproduct);
+			$product_type = $product->type;
+		} else {
+			$product_type = $type;
+		}
 
-	    //Fetch current line from the database and then clone the object and set it in $oldline property
-	    $line = new SupplierInvoiceLine($this->db);
-	    $line->fetch($id);
-	    $line->fetch_optionals();
+		//Fetch current line from the database and then clone the object and set it in $oldline property
+		$line = new SupplierInvoiceLine($this->db);
+		$line->fetch($id);
+		$line->fetch_optionals();
 
-	    $staticline = clone $line;
+		$staticline = clone $line;
 
-	    $line->oldline = $staticline;
-	    $line->context = $this->context;
+		$line->oldline = $staticline;
+		$line->context = $this->context;
 
-	    $line->description = $desc;
-	    $line->subprice = $pu_ht;
-	    $line->pu_ht = $pu_ht;
-	    $line->pu_ttc = $pu_ttc;
-	    $line->qty = $qty;
-	    $line->remise_percent = $remise_percent;
-	    $line->ref_supplier = $ref_supplier;
+		$line->description = $desc;
+		$line->subprice = $pu_ht;
+		$line->pu_ht = $pu_ht;
+		$line->pu_ttc = $pu_ttc;
+		$line->qty = $qty;
+		$line->remise_percent = $remise_percent;
+		$line->ref_supplier = $ref_supplier;
 
-	    $line->date_start = $date_start;
-	    $line->date_end = $date_end;
+		$line->date_start = $date_start;
+		$line->date_end = $date_end;
 
-	    $line->vat_src_code = $vat_src_code;
-	    $line->tva_tx = $vatrate;
-	    $line->localtax1_tx = $txlocaltax1;
-	    $line->localtax2_tx = $txlocaltax2;
+		$line->vat_src_code = $vat_src_code;
+		$line->tva_tx = $vatrate;
+		$line->localtax1_tx = $txlocaltax1;
+		$line->localtax2_tx = $txlocaltax2;
 		$line->localtax1_type = $localtaxes_type[0];
 		$line->localtax2_type = $localtaxes_type[2];
 		$line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht);
 		$line->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_tva) : $total_tva);
-	    $line->total_localtax1 = $total_localtax1;
-	    $line->total_localtax2 = $total_localtax2;
-	    $line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc);
-	    $line->fk_product = $idproduct;
-	    $line->product_type = $product_type;
-	    $line->info_bits = $info_bits;
-	    $line->fk_unit = $fk_unit;
+		$line->total_localtax1 = $total_localtax1;
+		$line->total_localtax2 = $total_localtax2;
+		$line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc);
+		$line->fk_product = $idproduct;
+		$line->product_type = $product_type;
+		$line->info_bits = $info_bits;
+		$line->fk_unit = $fk_unit;
 
-	    if (is_array($array_options) && count($array_options) > 0) {
-	    	// We replace values in this->line->array_options only for entries defined into $array_options
-	    	foreach ($array_options as $key => $value) {
-	    		$line->array_options[$key] = $array_options[$key];
-	    	}
-	    }
+		if (is_array($array_options) && count($array_options) > 0) {
+			// We replace values in this->line->array_options only for entries defined into $array_options
+			foreach ($array_options as $key => $value) {
+				$line->array_options[$key] = $array_options[$key];
+			}
+		}
 
-	    // Multicurrency
+		// Multicurrency
 		$line->multicurrency_subprice = $pu_ht_devise;
 		$line->multicurrency_total_ht = $multicurrency_total_ht;
-        $line->multicurrency_total_tva 	= $multicurrency_total_tva;
-        $line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
+		$line->multicurrency_total_tva 	= $multicurrency_total_tva;
+		$line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
-	    $res = $line->update($notrigger);
+		$res = $line->update($notrigger);
 
-	    if ($res < 1) {
-		    $this->errors[] = $line->error;
-	    } else {
-		    // Update total price into invoice record
-		    $res = $this->update_price('', 'auto', 0, $this->thirdparty);
-	    }
+		if ($res < 1) {
+			$this->errors[] = $line->error;
+		} else {
+			// Update total price into invoice record
+			$res = $this->update_price('', 'auto', 0, $this->thirdparty);
+		}
 
-	    return $res;
-    }
+		return $res;
+	}
 
-    /**
-     * 	Delete a detail line from database
-     *
-     * 	@param  int		$rowid      	Id of line to delete
-     *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     * 	@return	int						<0 if KO, >0 if OK
-     */
-    public function deleteline($rowid, $notrigger = 0)
-    {
-        if (!$rowid) {
-	        $rowid = $this->id;
-        }
+	/**
+	 * 	Delete a detail line from database
+	 *
+	 * 	@param  int		$rowid      	Id of line to delete
+	 *	@param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 * 	@return	int						<0 if KO, >0 if OK
+	 */
+	public function deleteline($rowid, $notrigger = 0)
+	{
+		if (!$rowid) {
+			$rowid = $this->id;
+		}
 
 		$this->db->begin();
 
@@ -2078,98 +2013,94 @@ class FactureFournisseur extends CommonInvoice
 			return -2;
 		}
 
-	    $line = new SupplierInvoiceLine($this->db);
+		$line = new SupplierInvoiceLine($this->db);
 
-	    if ($line->fetch($rowid) < 1) {
-		    return -1;
-	    }
+		if ($line->fetch($rowid) < 1) {
+			return -1;
+		}
 
-	    $res = $line->delete($notrigger);
+		$res = $line->delete($notrigger);
 
-	    if ($res < 1) {
+		if ($res < 1) {
 			$this->errors[] = $line->error;
 			$this->db->rollback();
 			return -3;
-	    } else {
+		} else {
 			$res = $this->update_price();
 
 			if ($res > 0)
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -4;
 			}
-	    }
-    }
+		}
+	}
 
 
-    /**
-     *	Charge les informations d'ordre info dans l'objet facture
-     *
-     *	@param  int		$id       	Id de la facture a charger
-     *	@return	void
-     */
-    public function info($id)
-    {
-        $sql = 'SELECT c.rowid, datec, tms as datem, ';
-        $sql .= ' fk_user_author, fk_user_modif, fk_user_valid';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as c';
-        $sql .= ' WHERE c.rowid = '.$id;
+	/**
+	 *	Charge les informations d'ordre info dans l'objet facture
+	 *
+	 *	@param  int		$id       	Id de la facture a charger
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT c.rowid, datec, tms as datem, ';
+		$sql .= ' fk_user_author, fk_user_modif, fk_user_valid';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn 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;
-                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_modif)
-                {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
-                $this->date_creation     = $this->db->idate($obj->datec);
-                $this->date_modification = $this->db->idate($obj->datem);
-                //$this->date_validation   = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders)
-            }
-            $this->db->free($result);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+		$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_modif)
+				{
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+				$this->date_creation     = $this->db->idate($obj->datec);
+				$this->date_modification = $this->db->idate($obj->datem);
+				//$this->date_validation   = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders)
+			}
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
 	 *	Renvoi liste des factures remplacables
 	 *	Statut validee ou abandonnee pour raison autre + non payee + aucun paiement + pas deja remplacee
 	 *
 	 *	@param      int		$socid		Id societe
 	 *	@return    	array|int			Tableau des factures ('id'=>id, 'ref'=>ref, 'status'=>status, 'paymentornot'=>0/1)
-     *                                  <0 if error
-     */
-    public function list_replacable_supplier_invoices($socid = 0)
+	 *                                  <0 if error
+	 */
+	public function list_replacable_supplier_invoices($socid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$return = array();
@@ -2194,22 +2125,20 @@ class FactureFournisseur extends CommonInvoice
 			while ($obj = $this->db->fetch_object($resql))
 			{
 				$return[$obj->rowid] = array(
-                    'id' => $obj->rowid,
-				    'ref' => $obj->ref,
-				    'status' => $obj->fk_statut
-                );
+					'id' => $obj->rowid,
+					'ref' => $obj->ref,
+					'status' => $obj->fk_statut
+				);
 			}
 			//print_r($return);
 			return $return;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Renvoi liste des factures qualifiables pour correction par avoir
 	 *	Les factures qui respectent les regles suivantes sont retournees:
@@ -2217,11 +2146,11 @@ class FactureFournisseur extends CommonInvoice
 	 *
 	 *	@param		int		$socid		Id societe
 	 *	@return    	array|int			Tableau des factures ($id => array('ref'=>,'paymentornot'=>,'status'=>,'paye'=>)
-     *                                  <0 if error
+	 *                                  <0 if error
 	 */
-    public function list_qualified_avoir_supplier_invoices($socid = 0)
+	public function list_qualified_avoir_supplier_invoices($socid = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$return = array();
@@ -2231,8 +2160,8 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid = pf.fk_facturefourn";
 		$sql .= " WHERE f.entity = ".$conf->entity;
 		$sql .= " AND f.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
-        $sql .= " AND NOT EXISTS (SELECT rowid from ".MAIN_DB_PREFIX."facture_fourn as ff WHERE f.rowid = ff.fk_facture_source";
-        $sql .= " AND ff.type=".self::TYPE_REPLACEMENT.")";
+		$sql .= " AND NOT EXISTS (SELECT rowid from ".MAIN_DB_PREFIX."facture_fourn as ff WHERE f.rowid = ff.fk_facture_source";
+		$sql .= " AND ff.type=".self::TYPE_REPLACEMENT.")";
 		$sql .= " AND f.type != ".self::TYPE_CREDIT_NOTE; // Type non 2 si facture non avoir
 		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
 		$sql .= " ORDER BY f.ref";
@@ -2254,348 +2183,340 @@ class FactureFournisseur extends CommonInvoice
 			}
 
 			return $return;
-		}
-		else
-		{
+		} else {
 			$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       Object 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       Object user
+	 *	@return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 */
+	public function load_board($user)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        $sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
-        if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= ' WHERE ff.paye=0';
-        $sql .= ' AND ff.fk_statut > 0';
-        $sql .= " AND ff.entity = ".$conf->entity;
-        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;
+		$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
+		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= ' WHERE ff.paye=0';
+		$sql .= ' AND ff.fk_statut > 0';
+		$sql .= " AND ff.entity = ".$conf->entity;
+		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();
-
-	        $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");
-
-            $facturestatic = new FactureFournisseur($this->db);
-
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-
-                $facturestatic->date_echeance = $this->db->jdate($obj->datefin);
-                $facturestatic->statut = $obj->fk_statut;
-
-                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
-        {
-            dol_print_error($this->db);
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-
-    /**
-     *	Return clicable name (with picto eventually)
-     *
-     *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *	@param		string	$option						Where point the link
-     *	@param		int		$max						Max length of shown 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		$addlinktonotes				Add link to show notes
-     * 	@return		string								String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
-    {
-        global $langs, $conf, $user;
-
-        $result = '';
-
-        if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id.'&type=bank-transfer';
-        elseif ($option == 'document')	$url = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$this->id;
-        else $url = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id;
-
-        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';
-        }
-
-        $picto = $this->picto;
-        if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
-        if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
-        if ($this->type == self::TYPE_DEPOSIT)     $picto .= 'd'; // Deposit invoice
-
-        $label = '<u>'.$langs->trans("SupplierInvoice").'</u>';
-        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>';
-        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->label))
-        	$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-        if (!empty($this->date))
-        	$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
-        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 ($moretitle) $label .= ' - '.$moretitle;
-        if (isset($this->statut) && isset($this->alreadypaid)) {
-        	$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
-        }
-
-        $ref = $this->ref;
-        if (empty($ref)) $ref = $this->id;
-
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowSupplierInvoice");
-                $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>';
-
-        $result .= $linkstart;
-        if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-        if ($withpicto != 2) $result .= ($max ?dol_trunc($ref, $max) : $ref);
-        $result .= $linkend;
-
-        if ($addlinktonotes)
-        {
-        	$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-        	if ($txttoshow)
-        	{
-        		$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
-        		$result .= ' <span class="note inline-block">';
-        		$result .= '<a href="'.DOL_URL_ROOT.'/fourn/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
-        		$result .= img_picto('', 'note');
-        		$result .= '</a>';
-        		//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
-        		//$result.='</a>';
-        		$result .= '</span>';
-        	}
-        }
-
-        return $result;
-    }
-
-	 /**
-      *      Return next reference of supplier invoice not already used (or last reference)
-      *      according to numbering module defined into constant INVOICE_SUPPLIER_ADDON_NUMBER
-      *
-      *      @param	   Societe		$soc		Thirdparty object
-      *      @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')
-    {
-        global $db, $langs, $conf;
-        $langs->load("orders");
-
-        // Clean parameters (if not defined or using deprecated value)
-        if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER = 'mod_facture_fournisseur_cactus';
-
-        $mybool = false;
-
-        $file = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER.".php";
-        $classname = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER;
-
-        // Include file with class
-        $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-
-        foreach ($dirmodels as $reldir) {
-            $dir = dol_buildpath($reldir."core/modules/supplier_invoice/");
-
-            // Load file with numbering class (if found)
-            $mybool |= @include_once $dir.$file;
-        }
-
-        if ($mybool === false) {
-        	dol_print_error('', "Failed to include file ".$file);
-        	return '';
-        }
-
-        $obj = new $classname();
-        $numref = "";
-        $numref = $obj->getNumRef($soc, $this, $mode);
-
-        if ($numref != "")
-        {
-        	return $numref;
-        }
-        else
-        {
-            $this->error = $obj->error;
-            //dol_print_error($db,get_class($this)."::getNextNumRef ".$obj->error);
-            return false;
-        }
-    }
-
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
-     *  @return	void
-     */
-    public function initAsSpecimen($option = '')
-    {
-        global $langs, $conf;
-		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-        $now = dol_now();
-
-        // Load array of products prodids
-        $num_prods = 0;
-        $prodids = array();
-
-        $sql = "SELECT rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product";
-        $sql .= " WHERE entity IN (".getEntity('product').")";
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num_prods = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num_prods)
-            {
-                $i++;
-                $row = $this->db->fetch_row($resql);
-                $prodids[$i] = $row[0];
-            }
-        }
-
-        // Initialise parametres
-        $this->id = 0;
-        $this->ref = 'SPECIMEN';
-        $this->ref_supplier = 'SUPPLIER_REF_SPECIMEN';
-        $this->specimen = 1;
-        $this->socid = 1;
-        $this->date = $now;
-        $this->date_lim_reglement = $this->date + 3600 * 24 * 30;
-        $this->cond_reglement_code = 'RECEP';
-        $this->mode_reglement_code = 'CHQ';
-
-        $this->note_public = 'This is a comment (public)';
-        $this->note_private = 'This is a comment (private)';
-
-        $this->multicurrency_tx = 1;
-        $this->multicurrency_code = $conf->currency;
-
-        if (empty($option) || $option != 'nolines')
+		$resql = $this->db->query($sql);
+		if ($resql)
 		{
-	        // Lines
-	        $nbp = 5;
-	        $xnbp = 0;
-	        while ($xnbp < $nbp)
-	        {
-	            $line = new FactureLigne($this->db);
-	            $line->desc = $langs->trans("Description")." ".$xnbp;
-	            $line->qty = 1;
-	            $line->subprice = 100;
-	            $line->pu_ht = 100; // the canelle template use pu_ht and not subprice
-	            $line->price = 100;
-	            $line->tva_tx = 19.6;
-	            $line->localtax1_tx = 0;
-	            $line->localtax2_tx = 0;
-				if ($xnbp == 2)
-				{
-				    $line->total_ht = 50;
-				    $line->total_ttc = 59.8;
-				    $line->total_tva = 9.8;
-	    			$line->remise_percent = 50;
-				}
-				else
-				{
-				    $line->total_ht = 100;
-				    $line->total_ttc = 119.6;
-				    $line->total_tva = 19.6;
-	    			$line->remise_percent = 0;
+			$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->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);
+
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
+
+				$facturestatic->date_echeance = $this->db->jdate($obj->datefin);
+				$facturestatic->statut = $obj->fk_statut;
+
+				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 {
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-	            if ($num_prods > 0)
-	            {
-					$prodid = mt_rand(1, $num_prods);
-	            	$line->fk_product = $prodids[$prodid];
-	            }
-	            $line->product_type = 0;
 
-	            $this->lines[$xnbp] = $line;
+	/**
+	 *	Return clicable name (with picto eventually)
+	 *
+	 *	@param		int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
+	 *	@param		string	$option						Where point the link
+	 *	@param		int		$max						Max length of shown 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		$addlinktonotes				Add link to show notes
+	 * 	@return		string								String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
+	{
+		global $langs, $conf, $user;
 
-	    		$this->total_ht       += $line->total_ht;
-	    		$this->total_tva      += $line->total_tva;
-	    		$this->total_ttc      += $line->total_ttc;
+		$result = '';
 
-	    		$xnbp++;
-	        }
+		if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id.'&type=bank-transfer';
+		elseif ($option == 'document')	$url = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$this->id;
+		else $url = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id;
+
+		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';
 		}
 
-        $this->amount_ht      = $xnbp * 100;
-        $this->total_ht       = $xnbp * 100;
-        $this->total_tva      = $xnbp * 19.6;
-        $this->total_ttc      = $xnbp * 119.6;
-    }
+		$picto = $this->picto;
+		if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
+		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
+		if ($this->type == self::TYPE_DEPOSIT)     $picto .= 'd'; // Deposit invoice
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+		$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>';
+		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->label))
+			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+		if (!empty($this->date))
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
+		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('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+		if (!empty($this->total_ttc))
+			$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+		if ($moretitle) $label .= ' - '.$moretitle;
+		if (isset($this->statut) && isset($this->alreadypaid)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
+		}
+
+		$ref = $this->ref;
+		if (empty($ref)) $ref = $this->id;
+
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowSupplierInvoice");
+				$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>';
+
+		$result .= $linkstart;
+		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= ($max ?dol_trunc($ref, $max) : $ref);
+		$result .= $linkend;
+
+		if ($addlinktonotes)
+		{
+			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
+			if ($txttoshow)
+			{
+				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
+				$result .= ' <span class="note inline-block">';
+				$result .= '<a href="'.DOL_URL_ROOT.'/fourn/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
+				$result .= img_picto('', 'note');
+				$result .= '</a>';
+				//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
+				//$result.='</a>';
+				$result .= '</span>';
+			}
+		}
+
+		return $result;
+	}
+
+	 /**
+	  *      Return next reference of supplier invoice not already used (or last reference)
+	  *      according to numbering module defined into constant INVOICE_SUPPLIER_ADDON_NUMBER
+	  *
+	  *      @param	   Societe		$soc		Thirdparty object
+	  *      @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')
+	{
+		global $db, $langs, $conf;
+		$langs->load("orders");
+
+		// Clean parameters (if not defined or using deprecated value)
+		if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER = 'mod_facture_fournisseur_cactus';
+
+		$mybool = false;
+
+		$file = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER.".php";
+		$classname = $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER;
+
+		// Include file with class
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+		foreach ($dirmodels as $reldir) {
+			$dir = dol_buildpath($reldir."core/modules/supplier_invoice/");
+
+			// Load file with numbering class (if found)
+			$mybool |= @include_once $dir.$file;
+		}
+
+		if ($mybool === false) {
+			dol_print_error('', "Failed to include file ".$file);
+			return '';
+		}
+
+		$obj = new $classname();
+		$numref = "";
+		$numref = $obj->getNumRef($soc, $this, $mode);
+
+		if ($numref != "")
+		{
+			return $numref;
+		} else {
+			$this->error = $obj->error;
+			return false;
+		}
+	}
+
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
+	 *  @return	void
+	 */
+	public function initAsSpecimen($option = '')
+	{
+		global $langs, $conf;
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+		$now = dol_now();
+
+		// Load array of products prodids
+		$num_prods = 0;
+		$prodids = array();
+
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= $this->db->plimit(100);
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num_prods = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num_prods)
+			{
+				$i++;
+				$row = $this->db->fetch_row($resql);
+				$prodids[$i] = $row[0];
+			}
+		}
+
+		// Initialise parametres
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->ref_supplier = 'SUPPLIER_REF_SPECIMEN';
+		$this->specimen = 1;
+		$this->socid = 1;
+		$this->date = $now;
+		$this->date_lim_reglement = $this->date + 3600 * 24 * 30;
+		$this->cond_reglement_code = 'RECEP';
+		$this->mode_reglement_code = 'CHQ';
+
+		$this->note_public = 'This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
+
+		$this->multicurrency_tx = 1;
+		$this->multicurrency_code = $conf->currency;
+
+		if (empty($option) || $option != 'nolines')
+		{
+			// Lines
+			$nbp = 5;
+			$xnbp = 0;
+			while ($xnbp < $nbp)
+			{
+				$line = new FactureLigne($this->db);
+				$line->desc = $langs->trans("Description")." ".$xnbp;
+				$line->qty = 1;
+				$line->subprice = 100;
+				$line->pu_ht = 100; // the canelle template use pu_ht and not subprice
+				$line->price = 100;
+				$line->tva_tx = 19.6;
+				$line->localtax1_tx = 0;
+				$line->localtax2_tx = 0;
+				if ($xnbp == 2)
+				{
+					$line->total_ht = 50;
+					$line->total_ttc = 59.8;
+					$line->total_tva = 9.8;
+					$line->remise_percent = 50;
+				} else {
+					$line->total_ht = 100;
+					$line->total_ttc = 119.6;
+					$line->total_tva = 19.6;
+					$line->remise_percent = 0;
+				}
+
+				if ($num_prods > 0)
+				{
+					$prodid = mt_rand(1, $num_prods);
+					$line->fk_product = $prodids[$prodid];
+				}
+				$line->product_type = 0;
+
+				$this->lines[$xnbp] = $line;
+
+				$this->total_ht       += $line->total_ht;
+				$this->total_tva      += $line->total_tva;
+				$this->total_ttc      += $line->total_ttc;
+
+				$xnbp++;
+			}
+		}
+
+		$this->amount_ht      = $xnbp * 100;
+		$this->total_ht       = $xnbp * 100;
+		$this->total_tva      = $xnbp * 19.6;
+		$this->total_ttc      = $xnbp * 119.6;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
 	 *      @return         int     <0 if KO, >0 if OK
-     */
-    public function load_state_board()
+	 */
+	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user;
 
 		$this->nb = array();
@@ -2620,94 +2541,90 @@ class FactureFournisseur extends CommonInvoice
 			{
 				$this->nb["supplier_invoices"] = $obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
 		}
 	}
 
-    /**
-     *	Load an object from its id and create a new one in database
-     *
-     *	@param      User	$user        	User that clone
-     *	@param      int		$fromid     	Id of object to clone
-     *	@param		int		$invertdetail	Reverse sign of amounts for lines
-     * 	@return		int						New id of clone
-     */
-    public function createFromClone(User $user, $fromid, $invertdetail = 0)
-    {
-        global $langs;
+	/**
+	 *	Load an object from its id and create a new one in database
+	 *
+	 *	@param      User	$user        	User that clone
+	 *	@param      int		$fromid     	Id of object to clone
+	 *	@param		int		$invertdetail	Reverse sign of amounts for lines
+	 * 	@return		int						New id of clone
+	 */
+	public function createFromClone(User $user, $fromid, $invertdetail = 0)
+	{
+		global $langs;
 
-        $error = 0;
+		$error = 0;
 
-        $object = new FactureFournisseur($this->db);
+		$object = new FactureFournisseur($this->db);
 
 		$this->db->begin();
 
-        // Load source object
-        $object->fetch($fromid);
-        $object->id = 0;
-        $object->statut = self::STATUS_DRAFT;
+		// Load source object
+		$object->fetch($fromid);
+		$object->id = 0;
+		$object->statut = self::STATUS_DRAFT;
 
-        $object->fetch_thirdparty();	// We need it to recalculate VAT localtaxes according to main sale taxes and vendor
+		$object->fetch_thirdparty(); // We need it to recalculate VAT localtaxes according to main sale taxes and vendor
 
-        // Clear fields
-        $object->ref_supplier       = (empty($this->ref_supplier) ? $langs->trans("CopyOf").' '.$object->ref_supplier : $this->ref_supplier);
-        $object->author             = $user->id;
-        $object->user_valid         = '';
-        $object->fk_facture_source  = 0;
-        $object->date_creation      = '';
-        $object->date_validation    = '';
-        $object->date               = (empty($this->date) ? '' : $this->date);
-        $object->date_echeance      = '';
-        $object->ref_client         = '';
-        $object->close_code         = '';
-        $object->close_note         = '';
+		// Clear fields
+		$object->ref_supplier       = (empty($this->ref_supplier) ? $langs->trans("CopyOf").' '.$object->ref_supplier : $this->ref_supplier);
+		$object->author             = $user->id;
+		$object->user_valid         = '';
+		$object->fk_facture_source  = 0;
+		$object->date_creation      = '';
+		$object->date_validation    = '';
+		$object->date               = (empty($this->date) ? '' : $this->date);
+		$object->date_echeance      = '';
+		$object->ref_client         = '';
+		$object->close_code         = '';
+		$object->close_note         = '';
 
-        // Loop on each line of new invoice
-        foreach ($object->lines as $i => $line)
-        {
-            if (isset($object->lines[$i]->info_bits) && ($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
-            {
-                unset($object->lines[$i]);
-            }
-        }
+		// Loop on each line of new invoice
+		foreach ($object->lines as $i => $line)
+		{
+			if (isset($object->lines[$i]->info_bits) && ($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
+			{
+				unset($object->lines[$i]);
+			}
+		}
 
-        // Create clone
-        $object->context['createfromclone'] = 'createfromclone';
-        $result = $object->create($user);
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->create($user);
 
-        // Other options
-        if ($result < 0)
-        {
-            $this->error = $object->error;
-            $this->errors = $object->errors;
-            $error++;
-        }
+		// Other options
+		if ($result < 0)
+		{
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+			$error++;
+		}
 
-        if (!$error)
-        {
-        }
+		if (!$error)
+		{
+		}
 
-        unset($object->context['createfromclone']);
+		unset($object->context['createfromclone']);
 
-        // End
-        if (!$error)
-        {
-            $this->db->commit();
-            return $object->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		// End
+		if (!$error)
+		{
+			$this->db->commit();
+			return $object->id;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 	/**
 	 *	Create a document onto disk according to template model.
@@ -2717,7 +2634,7 @@ class FactureFournisseur 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 nothing done, >0 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -2733,22 +2650,18 @@ class FactureFournisseur extends CommonInvoice
 			if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
 			{
 				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
-			}
-			else
-			{
+			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
 
 		if (empty($modele))
 		{
-		    return 0;
-		}
-		else
-		{
-            $modelpath = "core/modules/supplier_invoice/doc/";
+			return 0;
+		} else {
+			$modelpath = "core/modules/supplier_invoice/doc/";
 
-            return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 		}
 	}
 
@@ -2780,44 +2693,42 @@ class FactureFournisseur extends CommonInvoice
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
-    /**
-     * Is the payment of the supplier invoice having a delay?
-     *
-     * @return bool
-     */
-    public function hasDelay()
-    {
-        global $conf;
+	/**
+	 * Is the payment of the supplier invoice having a delay?
+	 *
+	 * @return bool
+	 */
+	public function hasDelay()
+	{
+		global $conf;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        if (!$this->date_echeance) {
-            return false;
-        }
+		if (!$this->date_echeance) {
+			return false;
+		}
 
-        return ($this->statut == self::STATUS_VALIDATED) && ($this->date_echeance < ($now - $conf->facture->fournisseur->warning_delay));
-    }
+		return ($this->statut == self::STATUS_VALIDATED) && ($this->date_echeance < ($now - $conf->facture->fournisseur->warning_delay));
+	}
 
-    /**
-     * Is credit note used
-     *
-     * @return bool
-     */
-    public function isCreditNoteUsed()
-    {
-        global $db;
+	/**
+	 * Is credit note used
+	 *
+	 * @return bool
+	 */
+	public function isCreditNoteUsed()
+	{
+		$isUsed = false;
 
-        $isUsed = false;
+		$sql = "SELECT fk_invoice_supplier FROM ".MAIN_DB_PREFIX."societe_remise_except WHERE fk_invoice_supplier_source=".$this->id;
+		$resql = $this->db->query($sql);
+		if (!empty($resql)) {
+			$obj = $this->db->fetch_object($resql);
+			if (!empty($obj->fk_invoice_supplier)) $isUsed = true;
+		}
 
-        $sql = "SELECT fk_invoice_supplier FROM ".MAIN_DB_PREFIX."societe_remise_except WHERE fk_invoice_supplier_source=".$this->id;
-        $resql = $db->query($sql);
-        if (!empty($resql)) {
-            $obj = $db->fetch_object($resql);
-            if (!empty($obj->fk_invoice_supplier))$isUsed = true;
-        }
-
-        return $isUsed;
-    }
+		return $isUsed;
+	}
 }
 
 
@@ -2931,63 +2842,63 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public $tva_tx;
 
-    /**
+	/**
 	 * Local tax 1 %
 	 * @var float
 	 */
 	public $localtax1_tx;
 
-    /**
+	/**
 	 * Local tax 2 %
 	 * @var float
 	 */
 	public $localtax2_tx;
 
-    /**
+	/**
 	 * Quantity
 	 * @var double
 	 */
 	public $qty;
 
-    /**
+	/**
 	 * Percent of discount
 	 * @var float
 	 */
 	public $remise_percent;
 
-    /**
+	/**
 	 * Total amount without taxes
 	 * @var float
 	 */
 	public $total_ht;
 
-    /**
+	/**
 	 * Total amount with taxes
 	 * @var float
 	 */
 	public $total_ttc;
 
-    /**
+	/**
 	 * Total amount of taxes
 	 * @var float
 	 */
 	public $total_tva;
 
-    /**
+	/**
 	 * Total local tax 1 amount
 	 * @var float
 	 */
 	public $total_localtax1;
 
-    /**
+	/**
 	 * Total local tax 2 amount
 	 * @var float
 	 */
 	public $total_localtax2;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_product;
 
 	/**
@@ -2996,13 +2907,13 @@ class SupplierInvoiceLine extends CommonObjectLine
 	 */
 	public $product_type;
 
-    /**
+	/**
 	 * Label of the product
 	 * @var string
 	 */
 	public $product_label;
 
-    /**
+	/**
 	 * List of cumulative options:
 	 * Bit 0:	0 si TVA normal - 1 si TVA NPR
 	 * Bit 1:	0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
@@ -3011,24 +2922,24 @@ class SupplierInvoiceLine extends CommonObjectLine
 	public $info_bits;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_parent_line;
 
 	public $special_code;
 
 	/**
-     * @var int rank of line
-     */
+	 * @var int rank of line
+	 */
 	public $rang;
 
-    /**
+	/**
 	 * Total local tax 1 amount
 	 * @var float
 	 */
 	public $localtax1_type;
 
-    /**
+	/**
 	 * Total local tax 2 amount
 	 * @var float
 	 */
@@ -3036,8 +2947,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 	// Multicurrency
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_multicurrency;
 
 	public $multicurrency_code;
@@ -3047,14 +2958,14 @@ class SupplierInvoiceLine extends CommonObjectLine
 	public $multicurrency_total_ttc;
 
 	/**
-     *	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;
+	}
 
 	/**
 	 * Retrieves a supplier invoice line
@@ -3159,15 +3070,15 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->deleteObjectLinked();
 
 		// Remove extrafields
-        if (!$error)
-        {
-        	$result = $this->deleteExtraFields();
-        	if ($result < 0)
-        	{
-        		$error++;
-        		dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-        	}
-        }
+		if (!$error)
+		{
+			$result = $this->deleteExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+			}
+		}
 
 		if (!$error) {
 			// Supprime ligne
@@ -3185,9 +3096,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -3231,7 +3140,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		if (empty($this->fk_unit)) {
 			$fk_unit = "null";
 		} else {
-		    $fk_unit = "'".$this->db->escape($this->fk_unit)."'";
+			$fk_unit = "'".$this->db->escape($this->fk_unit)."'";
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
@@ -3261,9 +3170,9 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 		// Multicurrency
 		$sql .= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql .= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql .= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql .= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+		$sql .= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+		$sql .= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+		$sql .= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
 
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -3309,182 +3218,178 @@ class SupplierInvoiceLine extends CommonObjectLine
 		return 1;
 	}
 
-    /**
-     *	Insert line into database
-     *
-     *	@param      int		$notrigger		1 no triggers
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function insert($notrigger = 0)
-    {
-        global $user, $conf;
+	/**
+	 *	Insert line into database
+	 *
+	 *	@param      int		$notrigger		1 no triggers
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function insert($notrigger = 0)
+	{
+		global $user, $conf;
 
-        $error = 0;
+		$error = 0;
 
-        dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
+		dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
 
-        // Clean parameters
-        $this->desc = trim($this->desc);
-        if (empty($this->tva_tx)) $this->tva_tx = 0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-        if (empty($this->localtax1_type)) $this->localtax1_type = '0';
-        if (empty($this->localtax2_type)) $this->localtax2_type = '0';
-        if (empty($this->total_tva)) $this->total_tva = 0;
-        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-        if (empty($this->rang)) $this->rang = 0;
-        if (empty($this->remise_percent)) $this->remise_percent = 0;
-        if (empty($this->info_bits)) $this->info_bits = 0;
-        if (empty($this->subprice)) $this->subprice = 0;
-        if (empty($this->special_code)) $this->special_code = 0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-        if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
+		// Clean parameters
+		$this->desc = trim($this->desc);
+		if (empty($this->tva_tx)) $this->tva_tx = 0;
+		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+		if (empty($this->localtax1_type)) $this->localtax1_type = '0';
+		if (empty($this->localtax2_type)) $this->localtax2_type = '0';
+		if (empty($this->total_tva)) $this->total_tva = 0;
+		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+		if (empty($this->rang)) $this->rang = 0;
+		if (empty($this->remise_percent)) $this->remise_percent = 0;
+		if (empty($this->info_bits)) $this->info_bits = 0;
+		if (empty($this->subprice)) $this->subprice = 0;
+		if (empty($this->special_code)) $this->special_code = 0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
 
-        if (empty($this->pa_ht)) $this->pa_ht = 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->pa_ht)) $this->pa_ht = 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;
 
 
-        // Check parameters
-        if ($this->product_type < 0)
-        {
-            $this->error = 'ErrorProductTypeMustBe0orMore';
-            return -1;
-        }
-        if (!empty($this->fk_product))
-        {
-            // Check product exists
-            $result = Product::isExistingObject('product', $this->fk_product);
-            if ($result <= 0)
-            {
-                $this->error = 'ErrorProductIdDoesNotExists';
-                return -1;
-            }
-        }
+		// Check parameters
+		if ($this->product_type < 0)
+		{
+			$this->error = 'ErrorProductTypeMustBe0orMore';
+			return -1;
+		}
+		if (!empty($this->fk_product))
+		{
+			// Check product exists
+			$result = Product::isExistingObject('product', $this->fk_product);
+			if ($result <= 0)
+			{
+				$this->error = 'ErrorProductIdDoesNotExists';
+				return -1;
+			}
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Insertion dans base de la ligne
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
-        $sql .= ' (fk_facture_fourn, fk_parent_line, label, description, ref, qty,';
-        $sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-        $sql .= ' fk_product, product_type, remise_percent, pu_ht, pu_ttc,';
-        $sql .= ' date_start, date_end, fk_code_ventilation, rang, special_code,';
-        $sql .= ' info_bits, total_ht, tva, total_ttc, total_localtax1, total_localtax2, fk_unit';
-        $sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
-        $sql .= ')';
-        $sql .= " VALUES (".$this->fk_facture_fourn.",";
-        $sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
-        $sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
-        $sql .= " '".$this->db->escape($this->desc ? $this->desc : $this->description)."',";
-        $sql .= " '".$this->db->escape($this->ref_supplier)."',";
-        $sql .= " ".price2num($this->qty).",";
+		// Insertion dans base de la ligne
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
+		$sql .= ' (fk_facture_fourn, fk_parent_line, label, description, ref, qty,';
+		$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+		$sql .= ' fk_product, product_type, remise_percent, pu_ht, pu_ttc,';
+		$sql .= ' date_start, date_end, fk_code_ventilation, rang, special_code,';
+		$sql .= ' info_bits, total_ht, tva, total_ttc, total_localtax1, total_localtax2, fk_unit';
+		$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+		$sql .= ')';
+		$sql .= " VALUES (".$this->fk_facture_fourn.",";
+		$sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
+		$sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " '".$this->db->escape($this->desc ? $this->desc : $this->description)."',";
+		$sql .= " '".$this->db->escape($this->ref_supplier)."',";
+		$sql .= " ".price2num($this->qty).",";
 
-        $sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
-        $sql .= " ".price2num($this->tva_tx).",";
-        $sql .= " ".price2num($this->localtax1_tx).",";
-        $sql .= " ".price2num($this->localtax2_tx).",";
-        $sql .= " '".$this->db->escape($this->localtax1_type)."',";
-        $sql .= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql .= ' '.(!empty($this->fk_product) ? $this->fk_product : "null").',';
-        $sql .= " ".$this->product_type.",";
-        $sql .= " ".price2num($this->remise_percent).",";
-        $sql .= " ".price2num($this->subprice).",";
-        $sql .= " ".(!empty($this->qty) ?price2num($this->total_ttc / $this->qty) : price2num($this->total_ttc)).",";
-        $sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
-        $sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").",";
-        $sql .= ' '.(!empty($this->fk_code_ventilation) ? $this->fk_code_ventilation : 0).',';
-        $sql .= ' '.$this->rang.',';
-        $sql .= ' '.$this->special_code.',';
-        $sql .= " '".$this->db->escape($this->info_bits)."',";
-        $sql .= " ".price2num($this->total_ht).",";
-        $sql .= " ".price2num($this->total_tva).",";
-        $sql .= " ".price2num($this->total_ttc).",";
-        $sql .= " ".price2num($this->total_localtax1).",";
-        $sql .= " ".price2num($this->total_localtax2);
-        $sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-        $sql .= ", ".(int) $this->fk_multicurrency;
-        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql .= ", ".price2num($this->multicurrency_subprice);
-        $sql .= ", ".price2num($this->multicurrency_total_ht);
-        $sql .= ", ".price2num($this->multicurrency_total_tva);
-        $sql .= ", ".price2num($this->multicurrency_total_ttc);
-        $sql .= ')';
+		$sql .= " ".(empty($this->vat_src_code) ? "''" : "'".$this->db->escape($this->vat_src_code)."'").",";
+		$sql .= " ".price2num($this->tva_tx).",";
+		$sql .= " ".price2num($this->localtax1_tx).",";
+		$sql .= " ".price2num($this->localtax2_tx).",";
+		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
+		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
+		$sql .= ' '.(!empty($this->fk_product) ? $this->fk_product : "null").',';
+		$sql .= " ".$this->product_type.",";
+		$sql .= " ".price2num($this->remise_percent).",";
+		$sql .= " ".price2num($this->subprice).",";
+		$sql .= " ".(!empty($this->qty) ?price2num($this->total_ttc / $this->qty) : price2num($this->total_ttc)).",";
+		$sql .= " ".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null").",";
+		$sql .= " ".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null").",";
+		$sql .= ' '.(!empty($this->fk_code_ventilation) ? $this->fk_code_ventilation : 0).',';
+		$sql .= ' '.$this->rang.',';
+		$sql .= ' '.$this->special_code.',';
+		$sql .= " '".$this->db->escape($this->info_bits)."',";
+		$sql .= " ".price2num($this->total_ht).",";
+		$sql .= " ".price2num($this->total_tva).",";
+		$sql .= " ".price2num($this->total_ttc).",";
+		$sql .= " ".price2num($this->total_localtax1).",";
+		$sql .= " ".price2num($this->total_localtax2);
+		$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+		$sql .= ", ".(int) $this->fk_multicurrency;
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".price2num($this->multicurrency_subprice);
+		$sql .= ", ".price2num($this->multicurrency_total_ht);
+		$sql .= ", ".price2num($this->multicurrency_total_tva);
+		$sql .= ", ".price2num($this->multicurrency_total_ttc);
+		$sql .= ')';
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-            $this->rowid = $this->id; // backward compatibility
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			$this->rowid = $this->id; // backward compatibility
 
-            if (!$error)
-            {
-                $result = $this->insertExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
 
-            if (!$error && !$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('LINEBILL_SUPPLIER_CREATE', $user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    return -2;
-                }
-                // End call triggers
-            }
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINEBILL_SUPPLIER_CREATE', $user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -2;
+				}
+				// End call triggers
+			}
 
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
+			$this->db->commit();
+			return $this->id;
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Mise a jour de l'objet ligne de commande en base
-     *
-     *  @return		int		<0 si ko, >0 si ok
-     */
-    public function update_total()
-    {
-        // phpcs:enable
-        $this->db->begin();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Mise a jour de l'objet ligne de commande en base
+	 *
+	 *  @return		int		<0 si ko, >0 si ok
+	 */
+	public function update_total()
+	{
+		// phpcs:enable
+		$this->db->begin();
 
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
-        $sql .= "  total_ht='".price2num($this->total_ht)."'";
-        $sql .= ", 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 .= " WHERE rowid = ".$this->rowid;
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
+		$sql .= "  total_ht='".price2num($this->total_ht)."'";
+		$sql .= ", 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 .= " WHERE rowid = ".$this->rowid;
 
-        dol_syslog("FactureFournisseurLigne.class.php::update_total", LOG_DEBUG);
+		dol_syslog("FactureFournisseurLigne.class.php::update_total", LOG_DEBUG);
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
 }
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 1643ae69846..8752d17a5d8 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -149,9 +149,7 @@ class ProductFournisseur extends Product
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -287,8 +285,7 @@ class ProductFournisseur extends Product
 			$localtax1 = $localtaxes_array['1'];
 			$localtaxtype2 = $localtaxes_array['2'];
 			$localtax2 = $localtaxes_array['3'];
-		}
-		else     // old method. deprecated because ot can't retreive type
+		} else // old method. deprecated because ot can't retreive type
 		{
 			$localtaxtype1 = '0';
 			$localtax1 = get_localtax($newvat, 1);
@@ -352,8 +349,8 @@ class ProductFournisseur extends Product
 			// TODO Add localtax1 and localtax2
 			//$sql.= " localtax1_tx=".($localtax1>=0?$localtax1:'NULL').",";
 			//$sql.= " localtax2_tx=".($localtax2>=0?$localtax2:'NULL').",";
-			//$sql.= " localtax1_type=".($localtaxtype1!=''?"'".$localtaxtype1."'":"'0'").",";
-			//$sql.= " localtax2_type=".($localtaxtype2!=''?"'".$localtaxtype2."'":"'0'").",";
+			//$sql.= " localtax1_type=".($localtaxtype1!=''?"'".$this->db->escape($localtaxtype1)."'":"'0'").",";
+			//$sql.= " localtax2_type=".($localtaxtype2!=''?"'".$this->db->escape($localtaxtype2)."'":"'0'").",";
 			$sql .= " default_vat_code=".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
 			$sql .= " info_bits = ".$newnpr.",";
 			$sql .= " charges = ".$charges.","; // deprecated
@@ -384,22 +381,16 @@ class ProductFournisseur extends Product
 				{
 					$this->db->commit();
 					return $this->product_fourn_price_id;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error()." sql=".$sql;
 				$this->db->rollback();
 				return -2;
 			}
-        }
-        else
-        {
+        } 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
@@ -447,8 +438,7 @@ class ProductFournisseur extends Product
                 $resql = $this->db->query($sql);
                 if ($resql) {
                     $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
-                }
-                else {
+                } else {
                     $error++;
                 }
 
@@ -566,23 +556,17 @@ class ProductFournisseur extends Product
 	                    if ($this->fourn_qty != 0)
 	                    {
 	                        $this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU');
-	                    }
-	                    else
-	                    {
+	                    } else {
 	                        $this->fourn_unitprice = "";
 	                    }
                     }
                 }
 
             	return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -685,9 +669,7 @@ class ProductFournisseur extends Product
                     if ($prodfourn->fourn_qty != 0)
                     {
                         $prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU');
-                    }
-                    else
-                    {
+                    } else {
                         $prodfourn->fourn_unitprice = "";
                     }
                 }
@@ -697,9 +679,7 @@ class ProductFournisseur extends Product
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -775,9 +755,7 @@ class ProductFournisseur extends Product
             {
                 $this->db->free($resql);
                 return 0;
-            }
-            else
-            {
+            } else {
                 $min = -1;
                 foreach ($record_array as $record)
                 {
@@ -798,9 +776,7 @@ class ProductFournisseur extends Product
                             if ($record["quantity"] != 0)
                             {
                                 $fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU');
-                            }
-                            else
-                            {
+                            } else {
                                 $fourn_unitprice = $fourn_price;
                             }
                         }
@@ -835,9 +811,7 @@ class ProductFournisseur extends Product
 
             $this->db->free($resql);
             return 1;
-        }
-        else
-		{
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -868,9 +842,7 @@ class ProductFournisseur extends Product
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error()." sql=".$sql;
             $this->db->rollback();
             return -1;
@@ -997,9 +969,7 @@ class ProductFournisseur extends Product
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -1087,8 +1057,7 @@ class ProductFournisseur extends Product
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index 42f25a3a5ad..67133ed97b2 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -119,12 +119,11 @@ class PaiementFourn extends Paiement
 				$this->entity         = $obj->entity;
 				$this->date           = $this->db->jdate($obj->dp);
 				$this->datepaye       = $this->db->jdate($obj->dp);
-				$this->num_paiement   = $obj->num_payment;
 				$this->num_payment    = $obj->num_payment;
 				$this->bank_account   = $obj->fk_account;
 				$this->fk_account     = $obj->fk_account;
 				$this->bank_line      = $obj->fk_bank;
-				$this->montant        = $obj->amount;
+				$this->montant        = $obj->amount;		// deprecated
 				$this->amount         = $obj->amount;
 				$this->multicurrency_amount = $obj->multicurrency_amount;
 				$this->note           = $obj->note;
@@ -134,15 +133,11 @@ class PaiementFourn extends Paiement
 				$this->statut         = $obj->statut;
 
 				$error = 1;
-			}
-			else
-			{
+			} else {
 				$error = -2; // TODO Use 0 instead
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$error = -1;
 		}
@@ -174,16 +169,14 @@ class PaiementFourn extends Paiement
 		{
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
-		}
-		else
-		{
+		} else {
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
 
 		foreach ($amounts as $key => $value)
 		{
-			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value, $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');
 
@@ -205,9 +198,7 @@ class PaiementFourn extends Paiement
 			{
 				$total = $totalamount;
 				$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
-			}
-			else
-			{
+			} else {
 				$total = $totalamount_converted; // Maybe use price2num with MT for the converted value
 				$mtotal = $totalamount;
 			}
@@ -215,7 +206,7 @@ class PaiementFourn extends Paiement
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn (';
 			$sql .= 'ref, entity, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, fk_user_author, fk_bank)';
 			$sql .= " VALUES ('".$this->db->escape($ref)."', ".$conf->entity.", '".$this->db->idate($now)."',";
-			$sql .= " '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->db->escape($this->num_paiement)."', '".$this->db->escape($this->note)."', ".$user->id.", 0)";
+			$sql .= " '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', ".$user->id.", 0)";
 
 			$resql = $this->db->query($sql);
 			if ($resql)
@@ -250,8 +241,7 @@ class PaiementFourn extends Paiement
 								if ($remaintopay == 0)
 								{
 									$result = $invoice->set_paid($user, '', '');
-								}
-								else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
+								} else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
 							}
 
 							// Regenerate documents of invoices
@@ -265,21 +255,17 @@ class PaiementFourn extends Paiement
 									$outputlangs->setDefaultLang($newlang);
 								}
 								$ret = $invoice->fetch($facid); // Reload to get new records
-								$result = $invoice->generateDocument($invoice->modelpdf, $outputlangs);
+								$result = $invoice->generateDocument($invoice->model_pdf, $outputlangs);
 								if ($result < 0) {
 									setEventMessages($invoice->error, $invoice->errors, 'errors');
 									$error++;
 								}
 							}
-						}
-						else
-						{
+						} else {
 							$this->error = $this->db->lasterror();
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						dol_syslog(get_class($this).'::Create Amount line '.$key.' not a number. We discard it.');
 					}
 				}
@@ -291,15 +277,11 @@ class PaiementFourn extends Paiement
 					if ($result < 0) $error++;
 					// End call triggers
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = "ErrorTotalIsNull";
 			dol_syslog('PaiementFourn::Create Error '.$this->error, LOG_ERR);
 			$error++;
@@ -313,9 +295,7 @@ class PaiementFourn extends Paiement
 			$this->db->commit();
 			dol_syslog('PaiementFourn::Create Ok Total = '.$this->total);
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -349,9 +329,7 @@ class PaiementFourn extends Paiement
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -2;
 		}
@@ -417,9 +395,7 @@ class PaiementFourn extends Paiement
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error;
 			$this->db->rollback();
 			return -5;
@@ -463,9 +439,7 @@ class PaiementFourn extends Paiement
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -499,9 +473,7 @@ class PaiementFourn extends Paiement
 			}
 
 			return $billsarray;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this).'::getBillsArray Error '.$this->error);
 			return -1;
@@ -708,9 +680,7 @@ class PaiementFourn extends Paiement
 			}
 
 			return $numref;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Supplier"));
 			return "";
@@ -740,9 +710,7 @@ class PaiementFourn extends Paiement
 			if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF))
 			{
 				$modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF;
-			}
-			else
-			{
+			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
@@ -750,9 +718,7 @@ class PaiementFourn extends Paiement
 		if (empty($modele))
 		{
 			return 0;
-		}
-		else
-		{
+		} else {
 			$modelpath = "core/modules/supplier_payment/doc/";
 
 			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 3fb7ae18cbc..7cbe020142f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -99,8 +99,7 @@ if ($id > 0 || !empty($ref))
 	if ($ret < 0) dol_print_error($db, $object->error);
 	$ret = $object->fetch_thirdparty();
 	if ($ret < 0) dol_print_error($db, $object->error);
-}
-elseif (!empty($socid) && $socid > 0)
+} elseif (!empty($socid) && $socid > 0)
 {
 	$fourn = new Fournisseur($db);
 	$ret = $fourn->fetch($socid);
@@ -110,10 +109,25 @@ elseif (!empty($socid) && $socid > 0)
 	if ($ret < 0) dol_print_error($db, $object->error);
 }
 
-$permissionnote = $user->rights->fournisseur->commande->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->fournisseur->commande->creer; // Used by the include of actions_dellink.inc.php
-$permissiontoedit = $user->rights->fournisseur->commande->creer; // Used by the include of actions_lineupdown.inc.php
-$permissiontoadd = $user->rights->fournisseur->commande->creer; // Used by the include of actions_addupdatedelete.inc.php
+// Common permissions
+$usercanread			= $user->rights->fournisseur->commande->lire;
+$usercancreate			= $user->rights->fournisseur->commande->creer;
+$usercandelete			= $user->rights->fournisseur->commande->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_order_advance->validate)));
+
+// Additional area permissions
+$usercanapprove			= $user->rights->fournisseur->commande->approuver;
+$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
+$permissiontoadd		= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
 
 
 /*
@@ -142,128 +156,126 @@ if (empty($reshook))
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
-	if ($action == 'setref_supplier' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'setref_supplier' && $usercancreate)
 	{
 		$result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'ORDER_SUPPLIER_MODIFY');
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// Set incoterm
-	if ($action == 'set_incoterms' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'set_incoterms' && $usercancreate)
 	{
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// payment conditions
-	if ($action == 'setconditions' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'setconditions' && $usercancreate)
 	{
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// payment mode
-	if ($action == 'setmode' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'setmode' && $usercancreate)
 	{
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $user->rights->fournisseur->commande->creer) {
+	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	}
 
 	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $user->rights->fournisseur->commande->creer) {
+	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
 	}
 
 	// bank account
-	if ($action == 'setbankaccount' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'setbankaccount' && $usercancreate)
 	{
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// date of delivery
-	if ($action == 'setdate_livraison' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'setdate_livraison' && $usercancreate)
 	{
 		$result = $object->set_date_livraison($user, $datelivraison);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// Set project
-	if ($action == 'classin' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'classin' && $usercancreate)
 	{
 		$result = $object->setProject($projectid);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-    // Edit Thirdparty
-    if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $user->rights->fournisseur->commande->creer && $object->statut == CommandeFournisseur::STATUS_DRAFT)
-    {
-        $new_socid = GETPOST('new_socid', 'int');
-        if (!empty($new_socid) && $new_socid != $object->thirdparty->id) {
-            $db->begin();
+	// Edit Thirdparty
+	if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $usercancreate && $object->statut == CommandeFournisseur::STATUS_DRAFT)
+	{
+		$new_socid = GETPOST('new_socid', 'int');
+		if (!empty($new_socid) && $new_socid != $object->thirdparty->id) {
+			$db->begin();
 
-            // Update supplier
-            $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
-            $sql .= ' SET fk_soc='.$new_socid;
-            $sql .= ' WHERE fk_soc='.$object->thirdparty->id;
-            $sql .= ' AND rowid='.$object->id;
+			// Update supplier
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
+			$sql .= ' SET fk_soc='.$new_socid;
+			$sql .= ' WHERE fk_soc='.$object->thirdparty->id;
+			$sql .= ' AND rowid='.$object->id;
 
-            $res = $db->query($sql);
+			$res = $db->query($sql);
 
-            if (!$res) $db->rollback();
-            else {
-                $db->commit();
+			if (!$res) $db->rollback();
+			else {
+				$db->commit();
 
-                // Replace prices for each lines by new supplier prices
-                foreach ($object->lines as $l) {
-                    $sql = 'SELECT price, unitprice, tva_tx, ref_fourn';
-                    $sql .= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
-                    $sql .= ' WHERE fk_product='.$l->fk_product;
-                    $sql .= ' AND fk_soc='.$new_socid;
-                    $sql .= ' ORDER BY unitprice ASC';
+				// Replace prices for each lines by new supplier prices
+				foreach ($object->lines as $l) {
+					$sql = 'SELECT price, unitprice, tva_tx, ref_fourn';
+					$sql .= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
+					$sql .= ' WHERE fk_product='.$l->fk_product;
+					$sql .= ' AND fk_soc='.$new_socid;
+					$sql .= ' ORDER BY unitprice ASC';
 
-                    $resql = $db->query($sql);
-                    if ($resql) {
-                        $num_row = $db->num_rows($resql);
-                        if (empty($num_row)) {
-                            // No product price for this supplier !
-                            $l->subprice = 0;
-                            $l->total_ht = 0;
-                            $l->total_tva = 0;
-                            $l->total_ttc = 0;
-                            $l->ref_supplier = '';
-                            $l->update();
-                        }
-                        else {
-                            // No need for loop to keep best supplier price
-                            $obj = $db->fetch_object($resql);
-                            $l->subprice = $obj->unitprice;
-                            $l->total_ht = $obj->price;
-                            $l->tva_tx = $obj->tva_tx;
-                            $l->total_tva = $l->total_ht * ($obj->tva_tx / 100);
-                            $l->total_ttc = $l->total_ht + $l->total_tva;
-                            $l->ref_supplier = $obj->ref_fourn;
-                            $l->update();
-                        }
-                    }
-                    else {
-                        dol_print_error($db);
-                    }
-                    $db->free($resql);
-                }
-                $object->update_price();
-            }
-        }
-        header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
-        exit;
-    }
+					$resql = $db->query($sql);
+					if ($resql) {
+						$num_row = $db->num_rows($resql);
+						if (empty($num_row)) {
+							// No product price for this supplier !
+							$l->subprice = 0;
+							$l->total_ht = 0;
+							$l->total_tva = 0;
+							$l->total_ttc = 0;
+							$l->ref_supplier = '';
+							$l->update();
+						} else {
+							// No need for loop to keep best supplier price
+							$obj = $db->fetch_object($resql);
+							$l->subprice = $obj->unitprice;
+							$l->total_ht = $obj->price;
+							$l->tva_tx = $obj->tva_tx;
+							$l->total_tva = $l->total_ht * ($obj->tva_tx / 100);
+							$l->total_ttc = $l->total_ht + $l->total_tva;
+							$l->ref_supplier = $obj->ref_fourn;
+							$l->update();
+						}
+					} else {
+						dol_print_error($db);
+					}
+					$db->free($resql);
+				}
+				$object->update_price();
+			}
+		}
+		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
+		exit;
+	}
 
-	if ($action == 'setremisepercent' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'setremisepercent' && $usercancreate)
 	{
 		$result = $object->set_remise($user, $_POST['remise_percent']);
 		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
@@ -284,8 +296,7 @@ if (empty($reshook))
 				//$newstatus=3;  // Submited
 				// TODO If there is at least one reception, we can set to Received->Received partially
 				$newstatus = 4; // Received partially
-			}
-			elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved
+			} elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved
 			elseif ($object->statut == 7) $newstatus = 3; // Canceled->Process running
 			elseif ($object->statut == 9) $newstatus = 1; // Refused->Validated
 			else $newstatus = 2;
@@ -316,9 +327,7 @@ if (empty($reshook))
 
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -329,7 +338,7 @@ if (empty($reshook))
 	/*
 	 * Classify supplier order as billed
 	 */
-	if ($action == 'classifybilled' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'classifybilled' && $usercancreate)
 	{
 		$ret = $object->classifyBilled($user);
 		if ($ret < 0) {
@@ -338,7 +347,7 @@ if (empty($reshook))
 	}
 
 	// Add a product line
-	if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'addline' && $usercancreate)
 	{
 		$db->begin();
 
@@ -356,9 +365,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = '';
@@ -399,7 +406,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
-		if (!GETPOST('qty'))
+		if (GETPOST('qty', 'int') == '')
 		{
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
@@ -441,14 +448,11 @@ if (empty($reshook))
 					{
 						$productsupplier->ref_supplier = '';
 					}
-				}
-				else
-				{
+				} else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			}
-			elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+			} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
 			{
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
 				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
@@ -477,7 +481,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;
 				}
 
 				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
@@ -549,8 +553,7 @@ if (empty($reshook))
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 			}
-		}
-		elseif (empty($error)) // $price_ht is already set
+		} elseif (empty($error)) // $price_ht is already set
 		{
 			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 			$tva_tx = str_replace('*', '', $tva_tx);
@@ -570,9 +573,7 @@ if (empty($reshook))
 			if ($price_ht !== '')
 			{
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
-			}
-			else
-			{
+			} else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
@@ -600,7 +601,7 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -638,9 +639,7 @@ if (empty($reshook))
 			unset($_POST['date_endday']);
 			unset($_POST['date_endmonth']);
 			unset($_POST['date_endyear']);
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -651,7 +650,7 @@ if (empty($reshook))
 	/*
 	 *	Updating a line in the order
 	 */
-	if ($action == 'updateline' && $user->rights->fournisseur->commande->creer && !GETPOST('cancel', 'alpha'))
+	if ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
 	{
 		$db->begin();
 
@@ -667,7 +666,7 @@ if (empty($reshook))
 		$productsupplier = new ProductFournisseur($db);
 		if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY))
 		{
-			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0)
+			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty', 'int')), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0)
 			{
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 			}
@@ -682,7 +681,7 @@ if (empty($reshook))
 			$info_bits |= 0x01;
 		}
 
-	    // Define vat_rate
+		// Define vat_rate
 		$vat_rate = str_replace('*', '', $vat_rate);
 		$localtax1_rate = get_localtax($vat_rate, 1, $mysoc, $object->thirdparty);
 		$localtax2_rate = get_localtax($vat_rate, 2, $mysoc, $object->thirdparty);
@@ -691,9 +690,7 @@ if (empty($reshook))
 		{
 			$price_base_type = 'HT';
 			$ht = price2num(GETPOST('price_ht'));
-		}
-		else
-		{
+		} else {
 			$vatratecleaned = $vat_rate;
 			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg))      // If vat is "xx (yy)"
 			{
@@ -722,7 +719,7 @@ if (empty($reshook))
 			$lineid,
 			$_POST['product_desc'],
 			$ht,
-			$_POST['qty'],
+			GETPOST('qty', 'int'),
 			$_POST['remise_percent'],
 			$vat_rate,
 			$localtax1_rate,
@@ -779,7 +776,7 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -787,9 +784,7 @@ if (empty($reshook))
 			}
 
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 
 			dol_print_error($db, $object->error);
@@ -798,7 +793,7 @@ if (empty($reshook))
 	}
 
 	// Remove a product line
-	if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$db->begin();
 
@@ -818,11 +813,9 @@ if (empty($reshook))
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 			// Reset action to avoid asking again confirmation on failure
@@ -840,10 +833,7 @@ if (empty($reshook))
 	}
 
 	// Validate
-	if ($action == 'confirm_valid' && $confirm == 'yes' &&
-		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->creer))
-		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate)))
-		)
+	if ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$db->begin();
 
@@ -862,7 +852,7 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -871,15 +861,13 @@ if (empty($reshook))
 					dol_print_error($db, $result);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
 		// If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step
-		if (!$error && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $user->rights->fournisseur->commande->approuver && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1)))
+		if (!$error && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $usercanapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1)))
 		{
 			$action = 'confirm_approve'; // can make standard or first level approval also if permission is set
 		}
@@ -891,7 +879,7 @@ if (empty($reshook))
 		}
 	}
 
-	if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
+	if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $usercanapprove)
 	{
 		$db->begin();
 
@@ -901,9 +889,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -932,11 +918,9 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -952,31 +936,29 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_refuse' && $confirm == 'yes' && $user->rights->fournisseur->commande->approuver)
+	if ($action == 'confirm_refuse' && $confirm == 'yes' && $usercanapprove)
 	{
 		$result = $object->refuse($user);
 		if ($result > 0)
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
 	// Force mandatory order method
-    if ($action == 'commande') {
-        $methodecommande = GETPOST('methodecommande', 'int');
+	if ($action == 'commande') {
+		$methodecommande = GETPOST('methodecommande', 'int');
 
-        if ($methodecommande <= 0) {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("OrderMode")), null, 'errors');
-            $action = 'makeorder';
-        }
-    }
+		if ($methodecommande <= 0) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("OrderMode")), null, 'errors');
+			$action = 'makeorder';
+		}
+	}
 
-	if ($action == 'confirm_commande' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander)
+	if ($action == 'confirm_commande' && $confirm == 'yes' && $usercanorder)
 	{
 		$db->begin();
 
@@ -993,12 +975,10 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 			$action = '';
-		}
-		else
-		{
+		} else {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -1014,29 +994,25 @@ if (empty($reshook))
 	}
 
 
-	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->commande->supprimer)
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
 	{
 		$result = $object->delete($user);
 		if ($result > 0)
 		{
 			header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate)
 	{
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0)
 			{
 				$orig = clone $object;
@@ -1046,9 +1022,7 @@ if (empty($reshook))
 				{
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$object = $orig;
 					$action = '';
@@ -1058,7 +1032,7 @@ if (empty($reshook))
 	}
 
 	// Set status of reception (complete, partial, ...)
-	if ($action == 'livraison' && $user->rights->fournisseur->commande->receptionner)
+	if ($action == 'livraison' && $usercanreceived)
 	{
 		$db->begin();
 
@@ -1072,20 +1046,15 @@ if (empty($reshook))
 				$langs->load("deliveries");
 				setEventMessages($langs->trans("DeliveryStateSaved"), null);
 				$action = '';
-			}
-			elseif ($result == -3)
+			} elseif ($result == -3)
 			{
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Delivery")), null, 'errors');
 		}
@@ -1097,16 +1066,14 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->fournisseur->commande->commander)
+	if ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanorder)
 	{
 		$result = $object->cancel($user);
 		if ($result > 0)
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -1122,7 +1089,7 @@ if (empty($reshook))
 
 	// Actions to build doc
 	$upload_dir = $conf->fournisseur->commande->dir_output;
-	$permissiontoadd = $user->rights->fournisseur->commande->creer;
+	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
@@ -1131,7 +1098,7 @@ if (empty($reshook))
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
@@ -1155,10 +1122,10 @@ if (empty($reshook))
 	/*
 	 * Create an order
 	 */
-	if ($action == 'add' && $user->rights->fournisseur->commande->creer)
+	if ($action == 'add' && $usercancreate)
 	{
 	 	$error = 0;
-        $selectedLines = GETPOST('toselect', 'array');
+		$selectedLines = GETPOST('toselect', 'array');
 		if ($socid < 1)
 		{
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Supplier')), null, 'errors');
@@ -1176,8 +1143,8 @@ if (empty($reshook))
 			$object->cond_reglement_id = GETPOST('cond_reglement_id');
 			$object->mode_reglement_id = GETPOST('mode_reglement_id');
 			$object->fk_account        = GETPOST('fk_account', 'int');
-			$object->note_private	= GETPOST('note_private', 'none');
-			$object->note_public   	= GETPOST('note_public', 'none');
+			$object->note_private	= GETPOST('note_private', 'restricthtml');
+			$object->note_public   	= GETPOST('note_public', 'restricthtml');
 			$object->date_livraison = $datelivraison;
 			$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 			$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
@@ -1201,14 +1168,11 @@ if (empty($reshook))
 					{
 						$classname = 'Propal';
 						$element = 'comm/propal'; $subelement = 'propal';
-					}
-					elseif ($origin == 'order' || $origin == 'commande')
+					} elseif ($origin == 'order' || $origin == 'commande')
 					{
 						$classname = 'Commande';
 						$element = $subelement = 'commande';
-					}
-					else
-					{
+					} else {
 						$classname = 'SupplierProposal';
 						$element = 'supplier_proposal';
 						$subelement = 'supplier_proposal';
@@ -1280,9 +1244,7 @@ if (empty($reshook))
 										$ref_supplier = $productsupplier->ref_supplier;
 										$product_fourn_price_id = $productsupplier->product_fourn_price_id;
 									}
-								}
-								else
-								{
+								} else {
 									$ref_supplier = $lines[$i]->ref_fourn;
 									$product_fourn_price_id = 0;
 								}
@@ -1314,7 +1276,7 @@ if (empty($reshook))
 									'',
 									null,
 									null,
-                                    $array_option,
+									$array_option,
 									$lines[$i]->fk_unit,
 									0,
 									$element,
@@ -1349,9 +1311,7 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
-				}
-				else
-				{
+				} else {
 			   		$id = $object->create($user);
 					if ($id < 0)
 					{
@@ -1367,9 +1327,7 @@ if (empty($reshook))
 				$db->rollback();
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
-			}
-			else
-			{
+			} else {
 				$db->commit();
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 				exit;
@@ -1456,19 +1414,16 @@ if (empty($reshook))
 			if (empty($result_order["result"]["result_code"])) //No result, check error str
 			{
 				setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-			}
-			elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong
+			} elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong
 			{
 				setEventMessages($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("RemoteOrderRef")." ".$result_order["ref"], null, 'mesgs');
 			}
 		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->commande->creer)
+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate)
 	{
 		if ($action == 'addcontact')
 		{
@@ -1482,16 +1437,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1512,8 +1463,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1534,8 +1484,8 @@ if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 llxHeader('', $langs->trans("Order"), $help_url);
 
-
 $now = dol_now();
+
 if ($action == 'create')
 {
 	print load_fiche_titre($langs->trans('NewOrderSupplier'), '', 'supplier_order');
@@ -1565,14 +1515,11 @@ if ($action == 'create')
 		{
 			$classname = 'Propal';
 			$element = 'comm/propal'; $subelement = 'propal';
-		}
-		elseif ($origin == 'order' || $origin == 'commande')
+		} elseif ($origin == 'order' || $origin == 'commande')
 		{
 			$classname = 'Commande';
 			$element = $subelement = 'commande';
-		}
-		else
-		{
+		} else {
 			$classname = 'SupplierProposal';
 			$element = 'supplier_proposal';
 			$subelement = 'supplier_proposal';
@@ -1617,9 +1564,7 @@ if ($action == 'create')
 
 		// Object source contacts list
 		$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 
@@ -1657,9 +1602,7 @@ if ($action == 'create')
 	{
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
-	}
-	else
-	{
+	} else {
 		print $form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
@@ -1760,7 +1703,7 @@ if ($action == 'create')
 
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public', 'none'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', isset($note_public) ? $note_public : GETPOST('note_public', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
 	//print '<textarea name="note_public" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea>';
@@ -1768,7 +1711,7 @@ if ($action == 'create')
 
 	print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('note_private', isset($note_private) ? $note_private : GETPOST('note_private', 'none'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_private', isset($note_private) ? $note_private : GETPOST('note_private', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
 	//print '<td><textarea name="note_private" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
@@ -1842,10 +1785,8 @@ if ($action == 'create')
 
 		print '</table>';
 	}
-    print "</form>\n";
-}
-elseif (!empty($object->id))
-{
+	print "</form>\n";
+} elseif (!empty($object->id)) {
 	$result = $object->fetch($id, $ref);
 
 	$societe = new Fournisseur($db);
@@ -1892,16 +1833,13 @@ elseif (!empty($object->id))
 		if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) // empty should not happened, but when it occurs, the test save life
 		{
 			$newref = $object->getNextNumRef($object->thirdparty);
-		}
-		else $newref = $object->ref;
+		} else $newref = $object->ref;
 
 		if ($newref < 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
-		}
-		else
-		{
+		} else {
 			$text = $langs->trans('ConfirmValidateOrder', $newref);
 			if (!empty($conf->notification->enabled))
 			{
@@ -1922,9 +1860,7 @@ elseif (!empty($object->id))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -1995,60 +1931,57 @@ elseif (!empty($object->id))
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref supplier
-	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty');
-    if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && !empty($user->rights->fournisseur->commande->creer) && $action == 'edit_thirdparty') {
-        $morehtmlref .= ' : ';
-        $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-        $morehtmlref .= '<input type="hidden" name="action" value="set_thirdparty">';
-        $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-        $morehtmlref .= $form->select_company($object->thirdparty->id, 'new_socid', 's.fournisseur=1', '', 0, 0, array(), 0, 'minwidth300');
-        $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-        $morehtmlref .= '</form>';
-    }
-    if (empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) || $action != 'edit_thirdparty') {
-        if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
-            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=edit_thirdparty&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetThirdParty')).'</a>';
-        }
-        $morehtmlref .= ' : '.$object->thirdparty->getNomUrl(1);
-        if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
-    }
+	if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && !empty($usercancreate) && $action == 'edit_thirdparty') {
+		$morehtmlref .= ' : ';
+		$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+		$morehtmlref .= '<input type="hidden" name="action" value="set_thirdparty">';
+		$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$morehtmlref .= $form->select_company($object->thirdparty->id, 'new_socid', 's.fournisseur=1', '', 0, 0, array(), 0, 'minwidth300');
+		$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		$morehtmlref .= '</form>';
+	}
+	if (empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) || $action != 'edit_thirdparty') {
+		if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
+			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=edit_thirdparty&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetThirdParty')).'</a>';
+		}
+		$morehtmlref .= ' : '.$object->thirdparty->getNomUrl(1);
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</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> : ';
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', 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 .= '';
-            }
-        }
-    }
+	if (!empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($usercancreate) {
+			if ($action != 'classify')
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', 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>';
 
 
@@ -2117,9 +2050,7 @@ elseif (!empty($object->id))
 	if ($action == 'editconditions')
 	{
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-	}
-	else
-	{
+	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 	}
 	print "</td>";
@@ -2137,9 +2068,7 @@ elseif (!empty($object->id))
 	if ($action == 'editmode')
 	{
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
-	}
-	else
-	{
+	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 	}
 	print '</td></tr>';
@@ -2201,7 +2130,7 @@ elseif (!empty($object->id))
 		print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 		print $langs->trans('BankAccount');
 		print '<td>';
-		if ($action != 'editbankaccount' && $user->rights->fournisseur->commande->creer)
+		if ($action != 'editbankaccount' && $usercancreate)
 			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>';
@@ -2232,9 +2161,7 @@ elseif (!empty($object->id))
 		print $form->selectDate($object->date_livraison ? $object->date_livraison : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		$usehourmin = 'day';
 		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
 		print $object->date_livraison ? dol_print_date($object->date_livraison, $usehourmin) : '&nbsp;';
@@ -2257,17 +2184,15 @@ elseif (!empty($object->id))
 		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($user->rights->fournisseur->commande->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		if ($usercancreate) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
 		else print '&nbsp;';
 		print '</td></tr></table>';
 		print '</td>';
 		print '<td>';
 		if ($action != 'editincoterm')
 		{
-			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-		}
-		else
-		{
+			print $form->textwithpicto(dol_escape_htmltag($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>';
@@ -2397,7 +2322,7 @@ elseif (!empty($object->id))
 	$num = count($object->lines);
 
 	// Form to add new line
-	if ($object->statut == CommandeFournisseur::STATUS_DRAFT && $user->rights->fournisseur->commande->creer)
+	if ($object->statut == CommandeFournisseur::STATUS_DRAFT && $usercancreate)
 	{
 		if ($action != 'editline')
 		{
@@ -2432,11 +2357,10 @@ elseif (!empty($object->id))
 			// Validate
 			if ($object->statut == 0 && $num > 0)
 			{
-				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->creer))
-			   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate)))
+				if ($usercanvalidate)
 				{
 					$tmpbuttonlabel = $langs->trans('Validate');
-					if ($user->rights->fournisseur->commande->approuver && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) $tmpbuttonlabel = $langs->trans("ValidateAndApprove");
+					if ($usercanapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) $tmpbuttonlabel = $langs->trans("ValidateAndApprove");
 
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">';
 					print $tmpbuttonlabel;
@@ -2452,7 +2376,7 @@ elseif (!empty($object->id))
 			// Modify
 			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
 			{
-				if ($user->rights->fournisseur->commande->commander)
+				if ($usercanorder)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a>';
 				}
@@ -2461,19 +2385,15 @@ elseif (!empty($object->id))
 			// Approve
 			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
 			{
-				if ($user->rights->fournisseur->commande->approuver)
+				if ($usercanapprove)
 				{
 					if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id))
 					{
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("FirstApprovalAlreadyDone")).'">'.$langs->trans("ApproveOrder").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("ApproveOrder").'</a>';
 				}
 			}
@@ -2483,19 +2403,15 @@ elseif (!empty($object->id))
 			{
 				if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
 				{
-					if ($user->rights->fournisseur->commande->approve2)
+					if ($usercanapprovesecond)
 					{
 						if (!empty($object->user_approve_id2))
 						{
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SecondApprovalAlreadyDone")).'">'.$langs->trans("Approve2Order").'</a>';
-						}
-						else
-						{
+						} else {
 							print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve2">'.$langs->trans("Approve2Order").'</a>';
 						}
-					}
-					else
-					{
+					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Approve2Order").'</a>';
 					}
 				}
@@ -2504,12 +2420,10 @@ elseif (!empty($object->id))
 			// Refuse
 			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
 			{
-				if ($user->rights->fournisseur->commande->approuver || $user->rights->fournisseur->commande->approve2)
+				if ($usercanapprove || $usercanapprovesecond)
 				{
 					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("RefuseOrder").'</a>';
 				}
 			}
@@ -2518,7 +2432,7 @@ elseif (!empty($object->id))
 			if (empty($user->socid)) {
 				if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED, 3, 4, 5)) || !empty($conf->global->SUPPLIER_ORDER_SENDBYEMAIL_FOR_ALL_STATUS))
 				{
-					if ($user->rights->fournisseur->commande->commander)
+					if ($usercanorder)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 					}
@@ -2529,7 +2443,7 @@ elseif (!empty($object->id))
 			if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED)))
 			{
 				$buttonshown = 0;
-				if (!$buttonshown && $user->rights->fournisseur->commande->approuver)
+				if (!$buttonshown && $usercanapprove)
 				{
 					if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY)
 						|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id))
@@ -2538,7 +2452,7 @@ elseif (!empty($object->id))
 						$buttonshown++;
 					}
 				}
-				if (!$buttonshown && $user->rights->fournisseur->commande->approve2 && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED))
+				if (!$buttonshown && $usercanapprovesecond && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED))
 				{
 					if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY)
 						|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2))
@@ -2549,7 +2463,7 @@ elseif (!empty($object->id))
 			}
 			if (in_array($object->statut, array(3, 4, 5, 6, 7, 9)))
 			{
-				if ($user->rights->fournisseur->commande->commander)
+				if ($usercanorder)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
@@ -2563,7 +2477,7 @@ elseif (!empty($object->id))
 				if ($conf->reception->enabled) $labelofbutton = $langs->trans("CreateReception");
 
 				if (in_array($object->statut, array(3, 4, 5))) {
-					if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->receptionner) {
+					if ($conf->fournisseur->enabled && $usercanreceived) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id.'">'.$labelofbutton.'</a></div>';
 					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$labelofbutton.'</a></div>';
@@ -2573,12 +2487,10 @@ elseif (!empty($object->id))
 
 			if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED)
 			{
-				if ($user->rights->fournisseur->commande->commander)
+				if ($usercanorder)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=makeorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
-				}
-				else
-				{
+				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("MakeOrder").'</a></div>';
 				}
 			}
@@ -2586,7 +2498,7 @@ elseif (!empty($object->id))
 			// Classify received (this does not record reception)
 			if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY)
 			{
-				if ($user->rights->fournisseur->commande->receptionner)
+				if ($usercanreceived)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyreception#classifyreception">'.$langs->trans("ClassifyReception").'</a></div>';
 				}
@@ -2605,23 +2517,19 @@ elseif (!empty($object->id))
 			//}
 
 			// Classify billed manually (need one invoice if module invoice is on, no condition on invoice if not)
-			if ($user->rights->fournisseur->commande->creer && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1)  // statut 2 means approved
+			if ($usercancreate && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1)  // statut 2 means approved
 			{
 				if (empty($conf->facture->enabled))
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
-				}
-				else
-				{
+				} else {
 					if (!empty($object->linkedObjectsIds['invoice_supplier']))
 					{
 						if ($user->rights->fournisseur->facture->creer)
 						{
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
 						}
-					}
-					else
-					{
+					} else {
 						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NeedAtLeastOneInvoice")).'">'.$langs->trans("ClassifyBilled").'</a>';
 					}
 				}
@@ -2634,7 +2542,7 @@ elseif (!empty($object->id))
 			}
 
 			// Clone
-			if ($user->rights->fournisseur->commande->creer)
+			if ($usercancreate)
 			{
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a>';
 			}
@@ -2642,16 +2550,16 @@ elseif (!empty($object->id))
 			// Cancel
 			if ($object->statut == 2)
 			{
-				if ($user->rights->fournisseur->commande->commander)
+				if ($usercanorder)
 				{
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("CancelOrder").'</a>';
 				}
 			}
 
 			// Delete
-			if (!empty($user->rights->fournisseur->commande->supprimer) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && !empty($user->rights->fournisseur->commande->creer)))
+			if (!empty($usercandelete) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && !empty($usercancreate)))
 			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
 			}
 		}
 
@@ -2659,7 +2567,7 @@ elseif (!empty($object->id))
 
 
 
-		if ($user->rights->fournisseur->commande->commander && $object->statut == CommandeFournisseur::STATUS_ACCEPTED && $action == 'makeorder')
+		if ($usercanorder && $object->statut == CommandeFournisseur::STATUS_ACCEPTED && $action == 'makeorder')
 		{
 			// Set status to ordered (action=commande)
 			print '<!-- form to record supplier order -->'."\n";
@@ -2676,8 +2584,8 @@ elseif (!empty($object->id))
 			print $form->selectDate($date_com, '', 1, 1, '', "commande", 1, 1);
 			print '</td></tr>';
 
-            // Force mandatory order method
-            print '<tr><td class="fieldrequired">'.$langs->trans("OrderMode").'</td><td>';
+			// Force mandatory order method
+			print '<tr><td class="fieldrequired">'.$langs->trans("OrderMode").'</td><td>';
 			$formorder->selectInputMethod(GETPOST('methodecommande'), "methodecommande", 1);
 			print '</td></tr>';
 
@@ -2703,10 +2611,10 @@ elseif (!empty($object->id))
 			$relativepath = $objref.'/'.$objref.'.pdf';
 			$filedir = $conf->fournisseur->dir_output.'/commande/'.$objref;
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-			$genallowed = $user->rights->fournisseur->commande->lire;
-			$delallowed = $user->rights->fournisseur->commande->creer;
+			$genallowed = $usercanread;
+			$delallowed = $usercancreate;
 
-			print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang);
+			print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang);
 			$somethingshown = $formfile->numoffiles;
 
 			// Show links to link elements
@@ -2717,7 +2625,7 @@ elseif (!empty($object->id))
 
 			if ($action == 'classifyreception')
 			{
-				if ($user->rights->fournisseur->commande->receptionner && ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY))
+				if ($usercanreceived && ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY))
 				{
 					// Set status to received (action=livraison)
 					print '<!-- form to record purchase order received -->'."\n";
@@ -2806,9 +2714,7 @@ elseif (!empty($object->id))
 				{
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
 					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-				}
-				else
-				{
+				} else {
 					$textinput_size = "50";
 					// Webservice url
 					print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
@@ -2828,8 +2734,7 @@ elseif (!empty($object->id))
 				//End table/form
 				print '</form>';
 				print '</table>';
-			}
-			elseif ($mode == "check")
+			} elseif ($mode == "check")
 			{
 				$ws_entity = '';
 				$ws_thirdparty = '';
@@ -2855,9 +2760,7 @@ elseif (!empty($object->id))
 					{
 						setEventMessages($langs->trans("RemoteUserMissingAssociatedSoc"), null, 'errors');
 						$error_occurred = true;
-					}
-					else
-					{
+					} else {
 						//Create SOAP client and connect it to product/service
 						$soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
 						$soapclient_product->soap_defencoding = 'UTF-8';
@@ -2886,15 +2789,12 @@ elseif (!empty($object->id))
 							if (empty($status_code)) //No result, check error str
 							{
 								setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-							}
-							elseif ($status_code != "OK") //Something went wrong
+							} elseif ($status_code != "OK") //Something went wrong
 							{
 								if ($status_code == "NOT_FOUND")
 								{
 									setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
-								}
-								else
-								{
+								} else {
 									setEventMessages($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", null, 'errors');
 									$error_occurred = true;
 									break;
@@ -2929,19 +2829,15 @@ elseif (!empty($object->id))
 							}
 						}
 					}
-				}
-				elseif ($user_status_code == "PERMISSION_DENIED")
+				} elseif ($user_status_code == "PERMISSION_DENIED")
 				{
 					setEventMessages($langs->trans("RemoteUserNotPermission"), null, 'errors');
 					$error_occurred = true;
-				}
-				elseif ($user_status_code == "BAD_CREDENTIALS")
+				} elseif ($user_status_code == "BAD_CREDENTIALS")
 				{
 					setEventMessages($langs->trans("RemoteUserBadCredentials"), null, 'errors');
 					$error_occurred = true;
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans("ResponseNonOK")." '".$user_status_code."'", null, 'errors');
 					$error_occurred = true;
 				}
@@ -2958,9 +2854,7 @@ elseif (!empty($object->id))
 				if ($error_occurred)
 				{
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
-				}
-				else
-				{
+				} else {
 					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
 					print ' &nbsp; &nbsp; ';
 				}
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 7ff0dd1c85a..683658c791e 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array("facture", "orders", "sendings", "companies"));
 
 $id		= GETPOST('id', 'int');
 $ref	= GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -65,16 +65,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->fournisseur->commande->cree
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -193,9 +186,7 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	}
-	else
-	{
+	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 5e285f20457..03297d9f8fc 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -6,9 +6,9 @@
  * Copyright (C) 2010-2019 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014      Cedric Gross         <c.gross@kreiz-it.fr>
  * Copyright (C) 2016      Florian Henry        <florian.henry@atm-consulting.fr>
- * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2017-2020 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
- * Copyright (C) 2019      Christophe Battarel	<christophe@altairis.fr>
+ * Copyright (C) 2019-2020 Christophe Battarel	<christophe@altairis.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
@@ -38,6 +38,8 @@ 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';
+
 if (!empty($conf->projet->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
@@ -53,6 +55,8 @@ $ref = GETPOST('ref');
 $lineid = GETPOST('lineid', 'int');
 $action = GETPOST('action', 'aZ09');
 $fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
+$cancel = GETPOST('cancel', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 
 if ($user->socid)
 	$socid = $user->socid;
@@ -128,9 +132,7 @@ if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -171,9 +173,7 @@ if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCE
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -214,9 +214,7 @@ if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_P
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -245,7 +243,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 
 			if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 				if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
-					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2]);
+					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 					if (!empty($dto)) {
 						$unit_price = price2num(GETPOST("pu_".$reg[1]) * (100 - $dto) / 100, 'MU');
 					}
@@ -271,14 +269,14 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 
 					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
 						if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
-							$dto = GETPOST("dto_".$reg[1].'_'.$reg[2]);
+							$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
 							//update supplier price
 							if (GETPOSTISSET($saveprice)) {
 								// TODO Use class
 								$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price";
 								$sql .= " SET unitprice='".GETPOST($pu)."'";
 								$sql .= ", price=".GETPOST($pu)."*quantity";
-								$sql .= ", remise_percent='".$dto."'";
+								$sql .= ", remise_percent='".(!empty($dto)?$dto:0)."'";
 								$sql .= " WHERE fk_soc=".$object->socid;
 								$sql .= " AND fk_product=".GETPOST($prod, 'int');
 
@@ -308,6 +306,16 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 
 			$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 
+			if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+				if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
+					$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
+					if (!empty($dto)) {
+						$unit_price = price2num(GETPOST("pu_".$reg[1]) * (100 - $dto) / 100, 'MU');
+					}
+					$saveprice = "saveprice_".$reg[1].'_'.$reg[2];
+				}
+			}
+
 			// We ask to move a qty
 			if (GETPOST($qty) > 0) {
 				if (!(GETPOST($ent, 'int') > 0)) {
@@ -330,6 +338,24 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
 					}
+
+					if (!$error && !empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
+						if (empty($conf->multicurrency->enabled) && empty($conf->dynamicprices->enabled)) {
+							$dto = GETPOST("dto_".$reg[1].'_'.$reg[2], 'int');
+							//update supplier price
+							if (GETPOSTISSET($saveprice)) {
+								// TODO Use class
+								$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 .= " WHERE fk_soc=".$object->socid;
+								$sql .= " AND fk_product=".GETPOST($prod, 'int');
+
+								$resql = $db->query($sql);
+							}
+						}
+					}
 				}
 			}
 		}
@@ -366,6 +392,121 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 	}
 }
 
+// Remove a dispatched line
+if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->receptionner)
+{
+	$db->begin();
+
+	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
+	$result = $supplierorderdispatch->fetch($lineid);
+	if ($result > 0)
+	{
+		$qty = $supplierorderdispatch->qty;
+		$entrepot = $supplierorderdispatch->fk_entrepot;
+		$product = $supplierorderdispatch->fk_product;
+		$price = GETPOST('price');
+		$comment = $supplierorderdispatch->comment;
+		$eatby = $supplierorderdispatch->fk_product;
+		$sellby = $supplierorderdispatch->sellby;
+		$batch = $supplierorderdispatch->batch;
+
+		$result = $supplierorderdispatch->delete($user);
+	}
+	if ($result < 0)
+	{
+		$errors = $object->errors;
+		$error++;
+	}
+	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))
+		{
+			$mouv = new MouvementStock($db);
+			if ($product > 0)
+			{
+				$mouv->origin = &$object;
+				$result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+				if ($result < 0)
+				{
+					$errors=$mouv->errors;
+					$error++;
+				}
+			}
+		}
+	}
+	if ($error > 0)
+	{
+		$db->rollback();
+		setEventMessages($error, $errors, 'errors');
+	}
+	else {
+		$db->commit();
+	}
+}
+
+// Update a dispatched line
+if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionner)
+{
+	$db->begin();
+	$error = 0;
+
+	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
+	$result = $supplierorderdispatch->fetch($lineid);
+	if ($result > 0)
+	{
+		$qty = $supplierorderdispatch->qty;
+		$entrepot = $supplierorderdispatch->fk_entrepot;
+		$product = $supplierorderdispatch->fk_product;
+		$price = GETPOST('price');
+		$comment = $supplierorderdispatch->comment;
+		$eatby = $supplierorderdispatch->fk_product;
+		$sellby = $supplierorderdispatch->sellby;
+		$batch = $supplierorderdispatch->batch;
+
+		$supplierorderdispatch->qty = GETPOST('qty', 'int');
+		$supplierorderdispatch->fk_entrepot = GETPOST('fk_entrepot');
+		$result = $supplierorderdispatch->update($user);
+	}
+	if ($result < 0)
+	{
+		$error++;
+		$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))
+		{
+			$mouv = new MouvementStock($db);
+			if ($product > 0)
+			{
+				$mouv->origin = &$object;
+				$result=$mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
+				if ($result < 0)
+				{
+					$errors=$mouv->errors;
+					$error++;
+				}
+				else {
+					$mouv->origin = &$object;
+					$result=$mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
+					if ($result < 0)
+					{
+						$errors=$mouv->errors;
+						$error++;
+					}
+				}
+			}
+		}
+	}
+	if ($error > 0)
+	{
+		$db->rollback();
+		setEventMessages($error, $errors, 'errors');
+	}
+	else {
+		$db->commit();
+	}
+}
 
 /*
  * View
@@ -379,7 +520,7 @@ $warehouse_static = new Entrepot($db);
 $supplierorderdispatch = new CommandeFournisseurDispatch($db);
 
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $langs->trans("Order"), $help_url, '', 0, 0, array('/fourn/js/lib_dispatch.js.php'));
+llxHeader('', $langs->trans("OrderDispatch"), $help_url, '', 0, 0, array('/fourn/js/lib_dispatch.js.php'));
 
 if ($id > 0 || !empty($ref)) {
 	$soc = new Societe($db);
@@ -393,6 +534,23 @@ if ($id > 0 || !empty($ref)) {
 	$title = $langs->trans("SupplierOrder");
 	dol_fiche_head($head, 'dispatch', $title, -1, 'order');
 
+	$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);
+	}
+
+	// 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;
+
+	// Print form confirm
+	print $formconfirm;
 
 	// Supplier order card
 
@@ -407,36 +565,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>';
 
@@ -467,8 +625,8 @@ if ($id > 0 || !empty($ref)) {
 	print '<td>'.$author->getNomUrl(1, '', 0, 0, 0).'</td>';
 	print '</tr>';
 
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
 	print "</table>";
 
@@ -493,9 +651,12 @@ if ($id > 0 || !empty($ref)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$formproduct->loadWarehouses();
+		$entrepot = new Entrepot($db);
+		$listwarehouses=$entrepot->list_array(1);
+
 
 		if (empty($conf->reception->enabled))print '<form method="POST" action="dispatch.php?id='.$object->id.'">';
-        else print '<form method="post" action="'.dol_buildpath('/reception/card.php', 1).'?originid='.$object->id.'&origin=supplierorder">';
+		else print '<form method="post" action="'.dol_buildpath('/reception/card.php', 1).'?originid='.$object->id.'&origin=supplierorder">';
 
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		if (empty($conf->reception->enabled))print '<input type="hidden" name="action" value="dispatch">';
@@ -530,16 +691,16 @@ if ($id > 0 || !empty($ref)) {
 		$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, SUM(l.qty) as qty,";
 		$sql .= " p.ref, p.label, p.tobatch, p.fk_default_warehouse";
 
-        // Enable hooks to alter the SQL query (SELECT)
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks(
-            'printFieldListSelect',
-            $parameters,
-            $object,
-            $action
-        );
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        $sql .= $hookmanager->resPrint;
+		// Enable hooks to alter the SQL query (SELECT)
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks(
+			'printFieldListSelect',
+			$parameters,
+			$object,
+			$action
+		);
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		$sql .= $hookmanager->resPrint;
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product=p.rowid";
@@ -547,16 +708,16 @@ if ($id > 0 || !empty($ref)) {
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			$sql .= " AND l.product_type = 0";
 
-        // Enable hooks to alter the SQL query (WHERE)
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks(
-            'printFieldListWhere',
-            $parameters,
-            $object,
-            $action
-        );
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        $sql .= $hookmanager->resPrint;
+		// Enable hooks to alter the SQL query (WHERE)
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks(
+			'printFieldListWhere',
+			$parameters,
+			$object,
+			$action
+		);
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		$sql .= $hookmanager->resPrint;
 
 		$sql .= " GROUP BY p.ref, p.label, p.tobatch, l.rowid, l.fk_product, l.subprice, l.remise_percent, p.fk_default_warehouse"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
 		$sql .= " ORDER BY p.ref, p.label";
@@ -567,20 +728,18 @@ if ($id > 0 || !empty($ref)) {
 			$i = 0;
 
 			if ($num) {
-				$entrepot = new Entrepot($db);
-				$listwarehouses = $entrepot->list_array(1);
-
 				print '<tr class="liste_titre">';
 
 				print '<td>'.$langs->trans("Description").'</td>';
-				if (!empty($conf->productbatch->enabled))
-				{
+				if (!empty($conf->productbatch->enabled)) {
 					print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
-					print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
-					print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
-				}
-				else
-				{
+					if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+						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>';
+					}
+				} else {
 					print '<td></td>';
 					print '<td></td>';
 					print '<td></td>';
@@ -588,7 +747,8 @@ if ($id > 0 || !empty($ref)) {
 				print '<td class="right">'.$langs->trans("SupplierRef").'</td>';
 				print '<td class="right">'.$langs->trans("QtyOrdered").'</td>';
 				print '<td class="right">'.$langs->trans("QtyDispatchedShort").'</td>';
-				print '<td class="right">'.$langs->trans("QtyToDispatchShort").'</td>';
+				print ' <td class="right">'.$langs->trans("QtyToDispatchShort");
+				print '<br><a href="#" id="autoreset">'.$langs->trans("Reset").'</a></td>';
 				print '<td width="32"></td>';
 
 				if (!empty($conf->global->SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT)) {
@@ -602,27 +762,24 @@ if ($id > 0 || !empty($ref)) {
 				print '<td align="right">'.$langs->trans("Warehouse");
 
 				// Select warehouse to force it everywhere
-				if (count($listwarehouses) > 1)
-				{
+				if (count($listwarehouses) > 1) {
 					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, $disabled);
-				}
-				elseif (count($listwarehouses) == 1)
-				{
+				} elseif (count($listwarehouses) == 1) {
 					print '<br>'.$langs->trans("ForceTo").' '.$form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, $disabled);
 				}
 
 				print '</td>';
 
-                // Enable hooks to append additional columns
-                $parameters = array();
-                $reshook = $hookmanager->executeHooks(
-                    'printFieldListTitle',
-                    $parameters,
-                    $object,
-                    $action
-                );
-                if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-                print $hookmanager->resPrint;
+				// Enable hooks to append additional columns
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks(
+					'printFieldListTitle',
+					$parameters,
+					$object,
+					$action
+				);
+				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				print $hookmanager->resPrint;
 
 				print "</tr>\n";
 			}
@@ -666,8 +823,12 @@ if ($id > 0 || !empty($ref)) {
 								print $linktoprod;
 								print "</td>";
 								print '<td class="dispatch_batch_number"></td>';
-								print '<td class="dispatch_dluo"></td>';
-								print '<td class="dispatch_dlc"></td>';
+								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+									print '<td class="dispatch_dluo"></td>';
+								}
+								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+									print '<td class="dispatch_dlc"></td>';
+								}
 							} else {
 								print '<td>';
 								print $linktoprod;
@@ -675,8 +836,12 @@ if ($id > 0 || !empty($ref)) {
 								print '<td class="dispatch_batch_number">';
 								print $langs->trans("ProductDoesNotUseBatchSerial");
 								print '</td>';
-								print '<td class="dispatch_dluo"></td>';
-								print '<td class="dispatch_dlc"></td>';
+								if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+									print '<td class="dispatch_dluo"></td>';
+								}
+								if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+									print '<td class="dispatch_dlc"></td>';
+								}
 							}
 						} else {
 							print '<td colspan="4">';
@@ -707,21 +872,21 @@ if ($id > 0 || !empty($ref)) {
 							print '</td>'; // Dispatch column
 							print '<td></td>'; // Warehouse column
 
-                            // Enable hooks to append additional columns
-                            $parameters = array(
-                                'is_information_row' => true, // allows hook to distinguish between the
-                                                              // rows with information and the rows with
-                                                              // dispatch form input
-                                'objp' => $objp
-                            );
-                            $reshook = $hookmanager->executeHooks(
-                                'printFieldListValue',
-                                $parameters,
-                                $object,
-                                $action
-                            );
-                            if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-                            print $hookmanager->resPrint;
+							// Enable hooks to append additional columns
+							$parameters = array(
+								'is_information_row' => true, // allows hook to distinguish between the
+															  // rows with information and the rows with
+															  // dispatch form input
+								'objp' => $objp
+							);
+							$reshook = $hookmanager->executeHooks(
+								'printFieldListValue',
+								$parameters,
+								$object,
+								$action
+							);
+							if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+							print $hookmanager->resPrint;
 
 							print '</tr>';
 
@@ -733,11 +898,9 @@ if ($id > 0 || !empty($ref)) {
 							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
 							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
 							{
-							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
-							}
-							else
-							{
-							    print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
+								print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
+							} else {
+								print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
 
 							print '</td>';
@@ -745,17 +908,24 @@ if ($id > 0 || !empty($ref)) {
 							print '<td>';
 							print '<input type="text" class="inputlotnumber quatrevingtquinzepercent" id="lot_number'.$suffix.'" name="lot_number'.$suffix.'" value="'.GETPOST('lot_number'.$suffix).'">';
 							print '</td>';
-							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, '');
-							print '</td>';
-							print '<td class="nowraponall">';
-							$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
-							print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
-							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, '');
+								print '</td>';
+							}
+							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								print '<td class="nowraponall">';
+								$dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo'.$suffix.'month'), GETPOST('dluo'.$suffix.'day'), GETPOST('dluo'.$suffix.'year'));
+								print $form->selectDate($dluodatesuffix, 'dluo'.$suffix, '', '', 1, '');
+								print '</td>';
+							}
 							print '<td colspan="3">&nbsp</td>'; // Supplier ref + Qty ordered + qty already dispatched
 						} else {
 							$type = 'dispatch';
+							$colspan = 7;
+							$colspan = (!empty($conf->global->PRODUCT_DISABLE_EATBY)) ? --$colspan : $colspan;
+							$colspan = (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) ? --$colspan : $colspan;
 							print '<td class="right">';
 							print '</td>'; // Qty to dispatch
 							print '<td>';
@@ -763,37 +933,35 @@ if ($id > 0 || !empty($ref)) {
 							print '</td>'; // Dispatch column
 							print '<td></td>'; // Warehouse column
 
-                            // Enable hooks to append additional columns
-                            $parameters = array(
-                                'is_information_row' => true, // allows hook to distinguish between the
-                                                              // rows with information and the rows with
-                                                              // dispatch form input
-                                'objp' => $objp
-                            );
-                            $reshook = $hookmanager->executeHooks(
-                                'printFieldListValue',
-                                $parameters,
-                                $object,
-                                $action
-                            );
-                            if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-                            print $hookmanager->resPrint;
+							// Enable hooks to append additional columns
+							$parameters = array(
+								'is_information_row' => true, // allows hook to distinguish between the
+															  // rows with information and the rows with
+															  // dispatch form input
+								'objp' => $objp
+							);
+							$reshook = $hookmanager->executeHooks(
+								'printFieldListValue',
+								$parameters,
+								$object,
+								$action
+							);
+							if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+							print $hookmanager->resPrint;
 
 							print '</tr>';
 
 							print '<tr class="oddeven" name="'.$type.$suffix.'">';
-							print '<td colspan="7">';
+							print '<td colspan="'.$colspan.'">';
 							print '<input name="fk_commandefourndet'.$suffix.'" type="hidden" value="'.$objp->rowid.'">';
 							print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
 
 							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
 							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
 							{
-							    print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
-							}
-							else
-							{
-							    print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
+								print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
+							} else {
+								print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
 							}
 
 							print '</td>';
@@ -806,13 +974,11 @@ if ($id > 0 || !empty($ref)) {
 
 						print '<td>';
 						if (!empty($conf->productbatch->enabled) && $objp->tobatch == 1) {
-						    $type = 'batch';
-						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
-						}
-						else
-						{
-						    $type = 'dispatch';
-						    print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
+							$type = 'batch';
+							print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
+						} else {
+							$type = 'dispatch';
+							print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
 						}
 						print '</td>';
 
@@ -825,7 +991,7 @@ if ($id > 0 || !empty($ref)) {
 
 								// Discount
 								print '<td class="right">';
-								print '<input id="pu'.$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
@@ -847,18 +1013,18 @@ if ($id > 0 || !empty($ref)) {
 						}
 						print "</td>\n";
 
-                        // Enable hooks to append additional columns
-                        $parameters = array(
-                            'is_information_row' => false // this is a dispatch form row
-                        );
-                        $reshook = $hookmanager->executeHooks(
-                            'printFieldListValue',
-                            $parameters,
-                            $object,
-                            $action
-                        );
-                        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-                        print $hookmanager->resPrint;
+						// Enable hooks to append additional columns
+						$parameters = array(
+							'is_information_row' => false // this is a dispatch form row
+						);
+						$reshook = $hookmanager->executeHooks(
+							'printFieldListValue',
+							$parameters,
+							$object,
+							$action
+						);
+						if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+						print $hookmanager->resPrint;
 
 						print "</tr>\n";
 					}
@@ -883,20 +1049,20 @@ if ($id > 0 || !empty($ref)) {
 			// modified by hook
 			if (empty($reshook))
 			{
-                if (empty($conf->reception->enabled)) {
-                    print $langs->trans("Comment").' : ';
-                    print '<input type="text" class="minwidth400" maxlength="128" name="comment" value="';
-                    print $_POST["comment"] ? GETPOST("comment") : $langs->trans("DispatchSupplierOrder", $object->ref);
-                    // print ' / '.$object->ref_supplier; // Not yet available
-                    print '" class="flat"><br>';
+				if (empty($conf->reception->enabled)) {
+					print $langs->trans("Comment").' : ';
+					print '<input type="text" class="minwidth400" maxlength="128" name="comment" value="';
+					print $_POST["comment"] ? GETPOST("comment") : $langs->trans("DispatchSupplierOrder", $object->ref);
+					// print ' / '.$object->ref_supplier; // Not yet available
+					print '" class="flat"><br>';
 
-                    print '<input type="checkbox" checked="checked" name="closeopenorder"> '.$checkboxlabel;
-                }
+					print '<input type="checkbox" checked="checked" name="closeopenorder"> '.$checkboxlabel;
+				}
 
-                $dispatchBt = empty($conf->reception->enabled) ? $langs->trans("Receive") : $langs->trans("CreateReception");
+				$dispatchBt = empty($conf->reception->enabled) ? $langs->trans("Receive") : $langs->trans("CreateReception");
 
-                print '<br><input type="submit" class="button" name="dispatch" value="'.dol_escape_htmltag($dispatchBt).'"';
-                if (count($listwarehouses) <= 0)
+				print '<br><input type="submit" class="button" name="dispatch" value="'.dol_escape_htmltag($dispatchBt).'"';
+				if (count($listwarehouses) <= 0)
 					print ' disabled';
 				print '>';
 			}
@@ -905,11 +1071,10 @@ if ($id > 0 || !empty($ref)) {
 
 		// Message if nothing to dispatch
 		if (!$nbproduct) {
-		    print "<br>\n";
-		    if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED))
+			print "<br>\n";
+			if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED))
 				print '<div class="opacitymedium">'.$langs->trans("NoPredefinedProductToDispatch").'</div>'; // No predefined line at all
-			else
-				print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.
+			else print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.
 		}
 
 		print '</form>';
@@ -923,7 +1088,16 @@ if ($id > 0 || !empty($ref)) {
 				$("select[name=fk_default_warehouse]").change(function() {
 					var fk_default_warehouse = $("option:selected", this).val();
 					$("select[name^=entrepot_]").val(fk_default_warehouse).change();
-				});
+                });
+
+	            jQuery("#autoreset").click(function() {';
+	$i = 0;
+	while ($i < $nbproduct) {
+		print '           jQuery("#qty_0_'.$i.'").val("");';
+		$i++;
+	}
+	print '
+                });
 			});
 		</script>';
 
@@ -931,9 +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";
 	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."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;
@@ -961,30 +1137,41 @@ if ($id > 0 || !empty($ref)) {
 			print '<td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 			if (!empty($conf->productbatch->enabled)) {
 				print '<td class="dispatch_batch_number_title">'.$langs->trans("batch_number").'</td>';
-				print '<td class="dispatch_dluo_title">'.$langs->trans("EatByDate").'</td>';
-				print '<td class="dispatch_dlc_title">'.$langs->trans("SellByDate").'</td>';
+				if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+					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="right">'.$langs->trans("QtyDispatched").'</td>';
-			print '<td></td>';
 			print '<td>'.$langs->trans("Warehouse").'</td>';
 			print '<td>'.$langs->trans("Comment").'</td>';
 
 			// Status
 			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && empty($reception->rowid)) {
 				print '<td class="center" colspan="2">'.$langs->trans("Status").'</td>';
-			}
-			elseif (!empty($conf->reception->enabled)) {
+			} elseif (!empty($conf->reception->enabled)) {
 				print '<td class="center"></td>';
 			}
 
-			print '<td class="center"></td>';
+			print '<td class="center" colspan="2"></td>';
 
 			print "</tr>\n";
 
 			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
-				print "<tr ".$bc[$var].">";
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
+				{
+					print '<form name="editdispatchedlines" id="editdispatchedlines" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#line_' . GETPOST('lineid') . '" method="POST">
+					<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
+					<input type="hidden" name="action" value="updateline">
+					<input type="hidden" name="mode" value="">
+					<input type="hidden" name="lineid" value="' . $objp->dispatchlineid . '">';
+				}
+
+				print '<tr ' . $bc[$var] . ' id="line_'.$objp->dispatchlineid.'" >';
 
 				if (!empty($conf->reception->enabled)) {
 					print '<td>';
@@ -1010,8 +1197,12 @@ if ($id > 0 || !empty($ref)) {
 						$lot=new Productlot($db);
 						$lot->fetch(0, $objp->pid, $objp->batch);
 						print '<td class="dispatch_batch_number">'.$lot->getNomUrl(1).'</td>';
-						print '<td class="dispatch_dluo">'.dol_print_date($lot->eatby, 'day').'</td>';
-						print '<td class="dispatch_dlc">'.dol_print_date($lot->sellby, 'day').'</td>';
+						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+							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>';
+						}
 					} else {
 						print '<td class="dispatch_batch_number"></td>';
 						print '<td class="dispatch_dluo"></td>';
@@ -1020,14 +1211,35 @@ if ($id > 0 || !empty($ref)) {
 				}
 
 				// Qty
-				print '<td class="right">'.$objp->qty.'</td>';
-				print '<td>&nbsp;</td>';
+				print '<td class="right">';
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
+				{
+					print '<input style="width: 50px;" type="number" min="1" name="qty" value="' . $objp->qty . '" />';
+				}
+				else {
+					print $objp->qty;
+				}
+				print '<input type="hidden" name="price" value="'.$objp->subprice.'" />';
+				print '</td>';
 
 				// Warehouse
 				print '<td>';
-				$warehouse_static->id = $objp->warehouse_id;
-				$warehouse_static->libelle = $objp->entrepot;
-				print $warehouse_static->getNomUrl(1);
+				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');
+					} 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');
+					} else {
+						$langs->load("errors");
+						print $langs->trans("ErrorNoWarehouseDefined");
+					}
+				}
+				else {
+					$warehouse_static->id = $objp->warehouse_id;
+					$warehouse_static->libelle = $objp->entrepot;
+					print $warehouse_static->getNomUrl(1);
+				}
 				print '</td>';
 
 				// Comment
@@ -1078,9 +1290,32 @@ if ($id > 0 || !empty($ref)) {
 					print '</td>';
 				}
 
-				print '<td class="center"></td>';
+				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 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 img_delete();
+					print '</a>';
+					print '</td>';
+				}
+				else {
+					print '<td class="center valignmiddle">';
+					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 '</td>';
+				}
+
 
 				print "</tr>\n";
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid)  print '</form>';
 
 				$i++;
 			}
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 7db240abf94..e266a466e87 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -43,7 +43,7 @@ $langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries"
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -177,9 +177,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->fournisseur->commande->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index c0272d58a03..6891e3bdf92 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -160,9 +160,7 @@ if ($resql)
 	print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
 
 	print "</table></div><br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -226,9 +224,7 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_T
 	$sql .= " WHERE ((ug.fk_user = u.rowid";
 	$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 	$sql .= " OR u.entity = 0)"; // Show always superadmin
-}
-else
-{
+} else {
 	$sql .= " WHERE (u.entity IN (".getEntity('user')."))";
 }
 $sql .= " AND u.fk_soc IS NULL"; // An external user can not approved
@@ -269,9 +265,7 @@ if ($resql)
 	}
 	print "</table></div><br>";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -344,8 +338,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index f41e9e3fece..07c84a8fa12 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array("suppliers", "orders", "companies", "stocks"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
@@ -55,9 +55,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -196,9 +194,7 @@ 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
-    {
+    } else {
         print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     }
 }
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 417e78023a8..fb2e18a0de2 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2016      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
- * Copyright (C) 2018      Charlene Benke       <charlie@patas-monkey.com>
+ * Copyright (C) 2018-2020 Charlene Benke       <charlie@patas-monkey.com>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formorder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -66,7 +67,7 @@ $search_refsupp = GETPOST('search_refsupp', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
-$search_state = trim(GETPOST("search_state", 'alpha'));
+$search_state = GETPOST("search_state", 'alpha');
 $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_user = GETPOST('search_user', 'int');
@@ -130,6 +131,9 @@ $fieldstosearchall = array(
 	'cf.ref_supplier'=>'RefSupplierOrder',
 	'pd.description'=>'Description',
 	's.nom'=>"ThirdParty",
+	's.name_alias'=>"AliasNameShort",
+	's.zip'=>"Zip",
+	's.town'=>"Town",
 	'cf.note_public'=>'NotePublic',
 );
 if (empty($user->socid)) $fieldstosearchall["cf.note_private"] = "NotePrivate";
@@ -180,7 +184,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  */
 
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createsupplierbills') { $massaction = ''; }
 
 $parameters = array('socid'=>$socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
@@ -244,7 +248,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// TODO Move this into mass action include
-	if ($massaction == 'confirm_createbills')
+	if ($massaction == 'confirm_createsupplierbills')
 	{
 		$orders = GETPOST('toselect', 'array');
 		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
@@ -258,34 +262,36 @@ if (empty($reshook))
 		$db->begin();
 
 		foreach ($orders as $id_order) {
-			$cmd = new Commande($db);
+			$cmd = new CommandeFournisseur($db);
 			if ($cmd->fetch($id_order) <= 0) continue;
 
-			$object = new Facture($db);
-			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+			$objecttmp = new FactureFournisseur($db);
+			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $objecttmp = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
 			else {
-				$object->socid = $cmd->socid;
-				$object->type = Facture::TYPE_STANDARD;
-				$object->cond_reglement_id	= $cmd->cond_reglement_id;
-				$object->mode_reglement_id	= $cmd->mode_reglement_id;
-				$object->fk_project = $cmd->fk_project;
+				$objecttmp->socid = $cmd->socid;
+				$objecttmp->type = $objecttmp::TYPE_STANDARD;
+				$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;
 
-				$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 				if (empty($datefacture))
 				{
-					$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+					$datefacture = dol_now();
 				}
 
-				$object->date = $datefacture;
-				$object->origin    = 'commande';
-				$object->origin_id = $id_order;
+				$objecttmp->date = $datefacture;
+				$objecttmp->origin    = 'order_supplier';
+				$objecttmp->origin_id = $id_order;
 
-				$res = $object->create($user);
+				$res = $objecttmp->create($user);
 
 				if ($res > 0) $nb_bills_created++;
 			}
 
-			if ($object->id > 0)
+			if ($objecttmp->id > 0)
 			{
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
 				$sql .= "fk_source";
@@ -294,9 +300,9 @@ if (empty($reshook))
 				$sql .= ", targettype";
 				$sql .= ") VALUES (";
 				$sql .= $id_order;
-				$sql .= ", '".$object->origin."'";
-				$sql .= ", ".$object->id;
-				$sql .= ", '".$object->element."'";
+				$sql .= ", '".$db->escape($objecttmp->origin)."'";
+				$sql .= ", ".$objecttmp->id;
+				$sql .= ", '".$db->escape($objecttmp->element)."'";
 				$sql .= ")";
 
 				if (!$db->query($sql))
@@ -323,7 +329,7 @@ if (empty($reshook))
 						{
 							// Negative line, we create a discount line
 							$discount = new DiscountAbsolute($db);
-							$discount->fk_soc = $object->socid;
+							$discount->fk_soc = $objecttmp->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);
@@ -333,18 +339,14 @@ if (empty($reshook))
 							$discountid = $discount->create($user);
 							if ($discountid > 0)
 							{
-								$result = $object->insert_discount($discountid);
+								$result = $objecttmp->insert_discount($discountid);
 								//$result=$discount->link_to_invoice($lineid,$id);
-							}
-							else
-							{
+							} else {
 								setEventMessages($discount->error, $discount->errors, 'errors');
 								$error++;
 								break;
 							}
-						}
-						else
-						{
+						} else {
 							// Positive line
 							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 							// Date start
@@ -362,38 +364,35 @@ if (empty($reshook))
 							{
 								$fk_parent_line = 0;
 							}
-                            $result = $object->addline(
+							$result = $objecttmp->addline(
 								$desc,
 								$lines[$i]->subprice,
-								$lines[$i]->qty,
 								$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,
-								$lines[$i]->fk_remise_except,
 								'HT',
-								0,
 								$product_type,
-								$ii,
-								$lines[$i]->special_code,
-								$object->origin,
-								$lines[$i]->rowid,
-								$fk_parent_line,
-								$lines[$i]->fk_fournprice,
+								$lines[$i]->rang,
+								false,
+								$lines[$i]->array_options,
+								$lines[$i]->fk_unit,
+								$objecttmp->origin_id,
 								$lines[$i]->pa_ht,
-								$lines[$i]->label
-								);
+								$lines[$i]->ref_supplier,
+								$lines[$i]->special_code,
+								$fk_parent_line
+							);
 							if ($result > 0)
 							{
 								$lineid = $result;
-							}
-							else
-							{
+							} else {
 								$lineid = 0;
 								$error++;
 								break;
@@ -410,8 +409,8 @@ if (empty($reshook))
 
 			$cmd->classifyBilled($user); // TODO Move this in workflow like done for customer orders
 
-			if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
-			else $TFact[$object->id] = $object;
+			if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $objecttmp;
+			else $TFact[$objecttmp->id] = $objecttmp;
 		}
 
 		// Build doc with all invoices
@@ -421,40 +420,67 @@ if (empty($reshook))
 		if (!$error && $validate_invoices) {
 			$massaction = $action = 'builddoc';
 
-			foreach ($TAllFact as &$object)
+			foreach ($TAllFact as &$objecttmp)
 			{
-				$object->validate($user);
+				$objecttmp->validate($user);
 				if ($result <= 0)
 				{
 					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
+					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					break;
 				}
 
-				$id = $object->id; // For builddoc action
+				$id = $objecttmp->id; // For builddoc action
 
 				// Fac builddoc
 				$donotredirect = 1;
-				$upload_dir = $conf->facture->dir_output;
-				$permissiontoadd = $user->rights->facture->creer;
-				include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+				$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_createsupplierbills';
 		}
 
 		if (!$error)
 		{
 			$db->commit();
 			setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
-		}
-		else
-		{
+
+			// Make a redirect to avoid to bill twice if we make a refresh or back
+			$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 ($socid > 0)             $param .= '&socid='.urlencode($socid);
+			if ($search_status != '')      $param .= '&search_status='.urlencode($search_status);
+			if ($search_orderday)      		$param .= '&search_orderday='.urlencode($search_orderday);
+			if ($search_ordermonth)      		$param .= '&search_ordermonth='.urlencode($search_ordermonth);
+			if ($search_orderyear)       		$param .= '&search_orderyear='.urlencode($search_orderyear);
+			if ($search_deliveryday)   		$param .= '&search_deliveryday='.urlencode($search_deliveryday);
+			if ($search_deliverymonth)   		$param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
+			if ($search_deliveryyear)    		$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
+			if ($search_ref)      		$param .= '&search_ref='.urlencode($search_ref);
+			if ($search_company)  		$param .= '&search_company='.urlencode($search_company);
+			if ($search_ref_customer)	$param .= '&search_ref_customer='.urlencode($search_ref_customer);
+			if ($search_user > 0) 		$param .= '&search_user='.urlencode($search_user);
+			if ($search_sale > 0) 		$param .= '&search_sale='.urlencode($search_sale);
+			if ($search_total_ht != '') $param .= '&search_total_ht='.urlencode($search_total_ht);
+			if ($search_total_vat != '') $param .= '&search_total_vat='.urlencode($search_total_vat);
+			if ($search_total_ttc != '') $param .= '&search_total_ttc='.urlencode($search_total_ttc);
+			if ($search_project_ref >= 0)  	$param .= "&search_project_ref=".urlencode($search_project_ref);
+			if ($show_files)            $param .= '&show_files='.urlencode($show_files);
+			if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
+			if ($billed != '')			$param .= '&billed='.urlencode($billed);
+
+			header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
+			exit;
+		} else {
 			$db->rollback();
 			$action = 'create';
 			$_GET["origin"] = $_POST["origin"];
 			$_GET["originid"] = $_POST["originid"];
-			setEventMessages($object->error, $object->errors, 'errors');
+			setEventMessages("Error", null, 'errors');
 			$error++;
 		}
 	}
@@ -511,7 +537,7 @@ 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
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
@@ -530,6 +556,9 @@ if ($search_user > 0)
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 $sql .= ' WHERE cf.fk_soc = s.rowid';
 $sql .= ' AND cf.entity IN ('.getEntity('supplier_order').')';
 if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
@@ -543,16 +572,16 @@ if ($search_billed != '' && $search_billed >= 0) $sql .= " AND cf.billed = ".$db
 if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
 //Required triple check because statut=0 means draft filter
 if (GETPOST('statut', 'intcomma') !== '')
-	$sql .= " AND cf.fk_statut IN (".$db->escape($db->escape(GETPOST('statut', 'intcomma'))).")";
+	$sql .= " AND cf.fk_statut IN (".$db->sanitize($db->escape(GETPOST('statut', 'intcomma'))).")";
 if ($search_status != '' && $search_status >= 0)
-	$sql .= " AND cf.fk_statut IN (".$db->escape($search_status).")";
+	$sql .= " AND cf.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
 $sql .= dolSqlDateFilter("cf.date_commande", $search_orderday, $search_ordermonth, $search_orderyear);
 $sql .= dolSqlDateFilter("cf.date_livraison", $search_deliveryday, $search_deliverymonth, $search_deliveryyear);
 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 (".$db->escape($search_country).')';
-if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')';
+if ($search_country) $sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
+if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
 if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
 if ($search_user > 0) $sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$db->escape($search_user);
@@ -569,11 +598,12 @@ if ($search_project_ref != '') $sql .= natural_search("p.ref", $search_project_r
 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
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
 
+// Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
@@ -587,6 +617,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
+//print $sql;
 
 $resql = $db->query($sql);
 if ($resql)
@@ -596,9 +627,7 @@ if ($resql)
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfSupplierOrders').' - '.$soc->name;
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans('ListOfSupplierOrders');
 	}
 
@@ -617,23 +646,24 @@ if ($resql)
 	llxHeader('', $title, $help_url);
 
 	$param = '';
-	if ($socid > 0)             $param .= '&socid='.$socid;
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-	if ($sall)					$param .= "&search_all=".$sall;
-	if ($search_orderday)      	$param .= '&search_orderday='.$search_orderday;
-	if ($search_ordermonth)     $param .= '&search_ordermonth='.$search_ordermonth;
-	if ($search_orderyear)      $param .= '&search_orderyear='.$search_orderyear;
-	if ($search_deliveryday)   	$param .= '&search_deliveryday='.$search_deliveryday;
-	if ($search_deliverymonth)  $param .= '&search_deliverymonth='.$search_deliverymonth;
-	if ($search_deliveryyear)   $param .= '&search_deliveryyear='.$search_deliveryyear;
-	if ($search_ref)      		$param .= '&search_ref='.$search_ref;
-	if ($search_company)  		$param .= '&search_company='.$search_company;
-	if ($search_user > 0) 		$param .= '&search_user='.$search_user;
-	if ($search_request_author) $param .= '&search_request_author='.$search_request_author;
-	if ($search_sale > 0) 		$param .= '&search_sale='.$search_sale;
-	if ($search_total_ht != '') $param .= '&search_total_ht='.$search_total_ht;
-	if ($search_total_ttc != '') $param .= "&search_total_ttc=".$search_total_ttc;
+	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 ($socid > 0)             $param .= '&socid='.urlencode($socid);
+	if ($sall)					$param .= "&search_all=".urlencode($sall);
+	if ($search_orderday)      	$param .= '&search_orderday='.urlencode($search_orderday);
+	if ($search_ordermonth)     $param .= '&search_ordermonth='.urlencode($search_ordermonth);
+	if ($search_orderyear)      $param .= '&search_orderyear='.urlencode($search_orderyear);
+	if ($search_deliveryday)   	$param .= '&search_deliveryday='.urlencode($search_deliveryday);
+	if ($search_deliverymonth)  $param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
+	if ($search_deliveryyear)   $param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
+	if ($search_ref)      		$param .= '&search_ref='.urlencode($search_ref);
+	if ($search_company)  		$param .= '&search_company='.urlencode($search_company);
+	if ($search_user > 0) 		$param .= '&search_user='.urlencode($search_user);
+	if ($search_request_author) $param .= '&search_request_author='.urlencode($search_request_author);
+	if ($search_sale > 0) 		$param .= '&search_sale='.urlencode($search_sale);
+	if ($search_total_ht != '') $param .= '&search_total_ht='.urlencode($search_total_ht);
+	if ($search_total_ttc != '') $param .= "&search_total_ttc=".urlencode($search_total_ttc);
 	if ($search_multicurrency_code != '')  $param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
 	if ($search_multicurrency_tx != '')  $param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
 	if ($search_multicurrency_montant_ht != '')  $param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
@@ -648,32 +678,35 @@ if ($resql)
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+	$param .= $hookmanager->resPrint;
+
 	// List of mass actions available
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
-	    'presend'=>$langs->trans("SendByMail"),
+		'presend'=>$langs->trans("SendByMail"),
 	);
-	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+	if ($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisSupplier");
 	if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-	$newcardbutton = '';
-	if ($user->rights->fournisseur->commande->creer)
-	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/fourn/commande/card.php?action=create');
-    }
+	$url = DOL_URL_ROOT.'/fourn/commande/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $user->rights->fournisseur->commande->creer);
 
-	// Fields title search
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	// 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="contextpage" value="'.$contextpage.'">';
 	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 '<input type="hidden" name="socid" value="'.$socid.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'supplier_order', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -686,11 +719,11 @@ if ($resql)
 	if ($massaction == 'createbills')
 	{
 		//var_dump($_REQUEST);
-		print '<input type="hidden" name="massaction" value="confirm_createbills">';
+		print '<input type="hidden" name="massaction" value="confirm_createsupplierbills">';
 
-		print '<table class="border" width="100%" >';
+		print '<table class="noborder" width="100%" >';
 		print '<tr>';
-		print '<td class="titlefieldmiddle">';
+		print '<td class="titlefield">';
 		print $langs->trans('DateInvoice');
 		print '</td>';
 		print '<td>';
@@ -749,7 +782,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -772,7 +805,17 @@ if ($resql)
 
 	$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);
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+	if (GETPOST('autoselectall', 'int')) {
+		$selectedfields .= '<script>';
+		$selectedfields .= '   $(document).ready(function() {';
+		$selectedfields .= '        console.log("Autoclick on checkforselects");';
+		$selectedfields .= '   		$("#checkforselects").click();';
+		$selectedfields .= '        $("#massaction").val("createbills").change();';
+		$selectedfields .= '   });';
+		$selectedfields .= '</script>';
+	}
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -781,17 +824,17 @@ if ($resql)
 	// Ref
 	if (!empty($arrayfields['cf.ref']['checked']))
 	{
-		print '<td class="liste_titre"><input size="8" type="text" class="flat" name="search_ref" value="'.$search_ref.'"></td>';
+		print '<td class="liste_titre"><input size="8" type="text" class="flat maxwidth75" name="search_ref" value="'.$search_ref.'"></td>';
 	}
 	// Ref customer
 	if (!empty($arrayfields['cf.ref_supplier']['checked']))
 	{
-		print '<td class="liste_titre"><input type="text" class="flat" size="8" name="search_refsupp" value="'.$search_refsupp.'"></td>';
+		print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_refsupp" value="'.$search_refsupp.'"></td>';
 	}
 	// Project ref
 	if (!empty($arrayfields['p.project_ref']['checked']))
 	{
-		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'"></td>';
+		print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_project_ref" value="'.$search_project_ref.'"></td>';
 	}
 	// Request author
 	if (!empty($arrayfields['u.login']['checked']))
@@ -945,9 +988,10 @@ if ($resql)
 
 	print "</tr>\n";
 
+	// Fields title
 	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['cf.ref']['checked']))            print_liste_field_titre($arrayfields['cf.ref']['label'], $_SERVER["PHP_SELF"], "cf.ref", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['cf.ref_supplier']['checked']))   print_liste_field_titre($arrayfields['cf.ref_supplier']['label'], $_SERVER["PHP_SELF"], "cf.ref_supplier", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['cf.ref_supplier']['checked']))   print_liste_field_titre($arrayfields['cf.ref_supplier']['label'], $_SERVER["PHP_SELF"], "cf.ref_supplier", "", $param, '', $sortfield, $sortorder, 'tdoverflowmax100imp ');
 	if (!empty($arrayfields['p.project_ref']['checked'])) 	   print_liste_field_titre($arrayfields['p.project_ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['u.login']['checked'])) 	       print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], "u.login", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['s.nom']['checked']))             print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
@@ -995,6 +1039,12 @@ if ($resql)
 	{
 		$obj = $db->fetch_object($resql);
 
+		$notshippable = 0;
+		$warning = 0;
+		$text_info = '';
+		$text_warning = '';
+		$nbprod = 0;
+
 		$objectstatic->id = $obj->rowid;
 		$objectstatic->ref = $obj->ref;
 		$objectstatic->ref_supplier = $obj->ref_supplier;
@@ -1232,23 +1282,26 @@ if ($resql)
 		if (!$i) $totalarray['nbfield']++;
 
 		print "</tr>\n";
+
+		$total += $obj->total_ht;
+		$subtotal += $obj->total_ht;
 		$i++;
 	}
 
 	// Show total line
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
-
-    $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-    $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-
-	print "</table>\n";
-	print '</div>';
-	print "</form>\n";
-
 	$db->free($resql);
 
+	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print '</table>'."\n";
+	print '</div>';
+
+	print '</form>'."\n";
+
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
 
@@ -1261,9 +1314,7 @@ if ($resql)
 	$delallowed = $user->rights->fournisseur->commande->creer;
 
 	print $formfile->showdocuments('massfilesarea_supplier_order', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 87effcd5863..53efd68faa6 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -145,9 +145,7 @@ if ($id > 0 || !empty($ref))
         print '</div>';
 
         dol_fiche_end();
-    }
-    else
-    {
+    } else {
         /* Order not found */
         $langs->load("errors");
         print $langs->trans("ErrorRecordNotFound");
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
deleted file mode 100644
index 909dec03796..00000000000
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ /dev/null
@@ -1,639 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville     <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur   	<eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Barilley / Ocebo  	<marc@ocebo.com>
- * Copyright (C) 2005-2012 Regis Houssin          	<regis.houssin@inodbox.com>
- * Copyright (C) 2012	   Andreu Bisquerra Gaya  	<jove@bisquerra.com>
- * Copyright (C) 2012	   David Rodriguez Martinez <davidrm146@gmail.com>
- * Copyright (C) 2012-2017 Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2014	   Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2015      Marcos García            <marcosgdf@gmail.com>
- * 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/fourn/commande/orderstoinvoice.php
- * \ingroup commande
- * \brief Page to invoice multiple supplier orders
- */
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.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';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
-if (!empty($conf->projet->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array("orders", "companies", "deliveries"));
-
-if (!$user->rights->fournisseur->facture->creer)
-	accessforbidden();
-
-$id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility
-$ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
-$confirm = GETPOST('confirm', 'alpha');
-$sref = GETPOST('sref');
-$sref_client = GETPOST('sref_client');
-$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$socid = GETPOST('socid', 'int');
-$selected = GETPOST('orders_to_invoice');
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$search_status = GETPOST('search_status');
-
-if (!$sortfield)
-	$sortfield = 'c.rowid';
-if (!$sortorder)
-	$sortorder = 'DESC';
-
-$now = dol_now();
-$date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]); // Date for local PHP server
-$date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]);
-$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server
-$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]);
-
-$extrafields = new ExtraFields($db);
-
-$object = new FactureFournisseur($db);
-
-// fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
-
-if ($action == 'create')
-{
-	if (!GETPOST('createbill'))
-	{
-		$action = '';
-	}
-	else
-	{
-		if (!is_array($selected))
-		{
-			//$error++;
-			setEventMessages($langs->trans('Error_OrderNotChecked'), null, 'errors');
-			$action = '';
-		} else {
-			$origin = GETPOST('origin', 'alpha');
-			$originid = GETPOST('originid', 'int');
-		}
-	}
-}
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager = new HookManager($db);
-$hookmanager->initHooks(array('orderstoinvoicesupplier'));
-
-
-/*
- * Actions
- */
-
-if (($action == 'create' || $action == 'add') && !$error) {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-	if (!empty($conf->projet->enabled))
-		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-
-	// Load translation files required by the page
-    $langs->loadLangs(array("bills", "main", "products"));
-
-	if (isset($_GET['orders_to_invoice'])) {
-		$orders_id = GETPOST('orders_to_invoice', '', 1);
-		$n = count($orders_id);
-		$i = 0;
-
-		$originid = $orders_id[0];
-		$_GET['originid'] = $orders_id[0];
-	}
-	if (isset($_POST['orders_to_invoice'])) {
-		$orders_id = GETPOST('orders_to_invoice', '', 2);
-		$nn = count($orders_id);
-		$ii = 0;
-
-		$originid = $orders_id[0];
-		$_POST['originid'] = $orders_id[0];
-	}
-
-	$projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
-	$lineid = GETPOST('lineid', 'int');
-	$userid = GETPOST('userid', 'int');
-	$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref');
-
-	// Security check
-	if ($user->socid)
-		$socid = $user->socid;
-	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-
-	$usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
-	$object = new FactureFournisseur($db);
-
-	// Insert new invoice in database
-	if ($action == 'add' && $user->rights->fournisseur->facture->creer) {
-		$object->socid = GETPOST('socid');
-		$db->begin();
-		$error = 0;
-
-		// Standard or deposit or proforma invoice
-		$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-		if (empty($datefacture)) {
-			$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-		}
-		if (!$error) {
-			$object->ref = GETPOST('ref', 'nohtml');
-			$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
-			$object->socid = GETPOST('socid', 'int');
-			$object->libelle = (GETPOSTISSET('libelle') ? GETPOST('libelle', 'nohtml') : GETPOST('label', 'nohtml'));
-			$object->label = (GETPOSTISSET('libelle') ? GETPOST('libelle', 'nohtml') : GETPOST('label', 'nohtml'));
-			$object->date = $datefacture;
-			$object->date_echeance = $datedue;
-			$object->note_public = GETPOST('note_public', 'none');
-			$object->note_private = GETPOST('note_private', 'none');
-			$object->cond_reglement_id = GETPOST('cond_reglement_id');
-			$object->mode_reglement_id = GETPOST('mode_reglement_id');
-			$projectid = GETPOST('projectid', 'int');
-			if ($projectid > 0)
-				$object->fk_project = $projectid;
-
-				// Auto calculation of date due if not filled by user
-			if (empty($object->date_echeance))
-				$object->date_echeance = $object->calculate_date_lim_reglement();
-
-			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
-
-			if ($_POST['origin'] && $_POST['originid']) {
-				$linked_orders_ids = array();
-				foreach ($orders_id as $origin => $origin_id) {
-					$origin_id = (!empty($origin_id) ? $origin_id : $orders_id[$ii]);
-					$linked_orders_ids[] = $origin_id;
-				}
-				$object->linked_objects = array(GETPOST('origin')=>$linked_orders_ids);
-				$id = $object->create($user);
-
-				if ($id > 0) {
-					while ($ii < $nn) {
-						$objectsrc = new CommandeFournisseur($db);
-						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
-						$result = $objectsrc->fetch($orders_id[$ii]);
-						if ($result > 0) {
-							$lines = $objectsrc->lines;
-							if (empty($lines) && method_exists($objectsrc, 'fetch_lines')) {
-								$objectsrc->fetch_lines();
-								$lines = $objectsrc->lines;
-							}
-							$fk_parent_line = 0;
-							$num = count($lines);
-							for ($i = 0; $i < $num; $i++) {
-								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-
-								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-
-								// Dates
-								// TODO mutualiser
-								$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 = $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;
-								}
-								// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
-								$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, -1, false, 0, $lines[$i]->fk_unit, $line[$i]->id);
-
-								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;
-								}
-							}
-						} else {
-							$mesgs[] = $objectsrc->error;
-							$error++;
-						}
-						$ii++;
-					}
-				} else {
-					$mesgs[] = $object->error;
-					$error++;
-				}
-			}
-		}
-
-		// End of object creation, we show it
-		if ($id > 0 && !$error) {
-			foreach ($orders_id as $fk_supplier_order) {
-				$supplier_order = new CommandeFournisseur($db);
-				if ($supplier_order->fetch($fk_supplier_order) > 0 && $supplier_order->statut == 5)
-				{
-					if ($supplier_order->classifyBilled($user) < 0)
-					{
-						$db->rollback();
-						$action = 'create';
-						$_GET["origin"] = $_POST["origin"];
-						$_GET["originid"] = $_POST["originid"];
-						$mesgs[] = '<div class="error">'.$object->error.'</div>';
-
-						$error++;
-						break;
-					}
-				}
-			}
-
-			if (!$error) {
-				$db->commit();
-				header('Location: '.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$id);
-				exit();
-			}
-		} else {
-			$db->rollback();
-			$action = 'create';
-			$_GET["origin"] = $_POST["origin"];
-			$_GET["originid"] = $_POST["originid"];
-			$mesgs[] = '<div class="error">'.$object->error.'</div>';
-		}
-	}
-}
-
-/*
- * View
- */
-
-$html = new Form($db);
-$htmlother = new FormOther($db);
-$formfile = new FormFile($db);
-
-// Mode creation
-if ($action == 'create' && !$error) {
-	llxHeader();
-	print load_fiche_titre($langs->trans('NewBill'));
-
-	$soc = new Societe($db);
-	if ($socid)
-		$res = $soc->fetch($socid);
-	if ($res) {
-        $cond_reglement_id = $soc->cond_reglement_supplier_id;
-        $mode_reglement_id = $soc->mode_reglement_supplier_id;
-	}
-	$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? -1 : '';
-
-    $objectsrc = new CommandeFournisseur($db);
-    $listoforders = array();
-    foreach ($selected as $sel) {
-        $result = $objectsrc->fetch($sel);
-        if ($result > 0) {
-            $listoforders[] = $objectsrc->ref;
-        }
-
-        if (empty($cond_reglement_id))  $cond_reglement_id = $objectsrc->cond_reglement_id;
-        if (empty($mode_reglement_id))  $mode_reglement_id = $objectsrc->mode_reglement_id;
-    }
-
-	print '<form name="add" 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="socid" value="'.$soc->id.'">'."\n";
-	print '<input name="ref" type="hidden" value="provisoire">';
-	print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
-	print '<input type="hidden" name="originid" value="'.GETPOST('originid').'">';
-	print '<input type="hidden" name="socid" value="'.$soc->id.'">';
-
-	print '<table class="border centpercent">';
-
-	// Ref
-	print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
-
-	// Ref supplier
-	print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.dol_escape_htmltag(isset($_POST['ref_supplier']) ? GETPOST('ref_supplier', 'alpha', 2) : '').'" type="text"></td>';
-	print '</tr>';
-
-	// Date invoice
-	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
-	print $html->selectDate('', '', '', '', '', "add", 1, 1);
-	print '</td></tr>';
-	// Payment term
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	$html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
-	print '</td></tr>';
-	// Payment mode
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	$html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
-	print '</td></tr>';
-	// Project
-	if (!empty($conf->projet->enabled)) {
-		$formproject = new FormProjets($db);
-
-		$langs->load('projects');
-		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects($soc->id, $projectid, 'projectid');
-		print '</td></tr>';
-	}
-
-	// Other attributes
-	$parameters = array(
-			'objectsrc' => $objectsrc,
-			'idsrc' => $listoforders
-	);
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	if (empty($reshook))
-	{
-		$object = new FactureFournisseur($db);
-		print $object->showOptionals($extrafields, 'edit');
-	}
-
-	// Modele PDF
-	print '<tr><td>'.$langs->trans('Model').'</td>';
-	print '<td>';
-	$liste = ModelePDFSuppliersInvoices::liste_modeles($db);
-	print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
-	print "</td></tr>";
-
-	// Public note
-	print '<tr>';
-	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-	print '<td>';
-	print '<textarea name="note_public" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">';
-
-	print $langs->trans("Orders").": ".implode(', ', $listoforders);
-
-	print '</textarea></td></tr>';
-
-	// Private note
-	if (empty($user->socid)) {
-		print '<tr>';
-		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-		print '<td>';
-		print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'">';
-
-		print '</textarea></td></tr>';
-	}
-
-	print '</table>';
-
-	while ($i < $n) {
-		print '<input type="hidden" name="orders_to_invoice[]" value="'.$orders_id[$i].'">';
-
-		$i++;
-	}
-
-	// Button "Create Draft"
-	print '<br><div class="center"><input type="submit" class="button" name="bouton" value="'.$langs->trans('CreateDraft').'" /></div>';
-	print "</form>\n";
-
-	print '</td></tr>';
-	print "</table>\n";
-}
-
-// Mode liste
-if (($action != 'create' && $action != 'add') && !$error) {
-	llxHeader();
-	?>
-	<script type="text/javascript">
-		jQuery(document).ready(function() {
-		jQuery("#checkall").click(function() {
-			jQuery(".checkformerge").prop('checked', true);
-		});
-		jQuery("#checknone").click(function() {
-			jQuery(".checkformerge").prop('checked', false);
-		});
-	});
-	</script>
-	<?php
-
-	$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
-	$sql .= ' c.date_valid, c.date_commande, c.date_livraison, 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 && !$socid)
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= ' WHERE c.entity = '.$conf->entity;
-	$sql .= ' AND c.fk_soc = s.rowid';
-
-	// Show orders we can bill
-	if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
-	{
-		$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/card.php
-	}
-	else
-	{
-		// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
-		$sql .= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
-	}
-
-	$sql .= " AND c.billed = 0";
-
-	// Find order that are not already invoiced
-	//No need due to the billed status
-	//$sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
-
-	if ($socid)
-		$sql .= ' AND s.rowid = '.$socid;
-	if (!$user->rights->societe->client->voir && !$socid)
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($sref) {
-		$sql .= natural_search("c.ref", $sref);
-	}
-	if ($sall) {
-		$sql .= natural_search(array("c.ref", "c.note"), $sall);
-	}
-
-	// Date filter
-	//$sql.= dolSqlDateFilter("c.date_commande", GETPOST("date_startday", 'int'), GETPOST("date_startmonth", 'int'), GETPOST("date_startyear", 'int'));
-	//$sql.= dolSqlDateFilter("c.date_livraison", $search_deliveryday, $search_deliverymonth, $search_deliveryyear);
-	if ($date_start)
-		$sql .= " AND c.date_commande >= '".$db->idate($date_start)."'";
-	if ($date_end)
-		$sql .= " AND c.date_commande <= '".$db->idate($date_end)."'";
-	if ($date_starty)
-		$sql .= " AND c.date_livraison >= '".$db->idate($date_starty)."'";
-	if ($date_endy)
-		$sql .= "  AND c.date_livraison <= '".$db->idate($date_endy)."'";
-
-	if (!empty($sref_client)) {
-		$sql .= natural_search('c.ref_supplier', $sref_client);
-	}
-	$sql .= ' ORDER BY '.$sortfield.' '.$sortorder;
-	dol_syslog('fourn/commande/ordertoinvoice.php sql='.$sql);
-	$resql = $db->query($sql);
-
-	if ($resql) {
-		if ($socid) {
-			$soc = new Societe($db);
-			$soc->fetch($socid);
-		}
-		$title = $langs->trans('ListOfSupplierOrders');
-		$title .= ' - '.$langs->trans('StatusOrderReceivedAllShort');
-		$title .= ' - '.$soc->getNomUrl(1, 'supplier');
-
-		$num = $db->num_rows($resql);
-
-		print load_fiche_titre($title);
-
-		$i = 0;
-		$period = $html->selectDate($date_start, 'date_start', 0, 0, 1, '', 1, 0).' - '.$html->selectDate($date_end, 'date_end', 0, 0, 1, '', 1, 0);
-		$periodely = $html->selectDate($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0).' - '.$html->selectDate($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0);
-
-		print '<form name="orders2invoice" method="GET" action="orderstoinvoice.php">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
-
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print_liste_field_titre('Ref', 'orderstoinvoice.php', 'c.ref', '', '&amp;socid='.$socid, '', $sortfield, $sortorder);
-		print_liste_field_titre('RefSupplier', 'orderstoinvoice.php', 'c.ref_supplier', '', '&amp;socid='.$socid, '', $sortfield, $sortorder);
-		print_liste_field_titre('OrderDate', 'orderstoinvoice.php', 'c.date_commande', '', '&amp;socid='.$socid, '', $sortfield, $sortorder, 'center ');
-		print_liste_field_titre('DeliveryDate', 'orderstoinvoice.php', 'c.date_livraison', '', '&amp;socid='.$socid, '', $sortfield, $sortorder, 'center ');
-		print_liste_field_titre('Status', '', '', '', '', '', '', '', 'right ');
-		print_liste_field_titre('GenerateBill', '', '', '', '', '', '', '', 'center ');
-		print "</tr>\n";
-
-		// Fields title search
-		print '<tr class="liste_titre">';
-
-		print '<td class="liste_titre">';
-		// REF
-		print '<input class="flat" size="10" type="text" name="sref" value="'.$sref.'">';
-		print '</td>';
-
-		// print '<td class="liste_titre">';
-		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="10" name="sref_client" value="'.$sref_client.'">';
-        print '</td>';
-
-		// DATE ORDER
-		print '<td class="liste_titre center">';
-		print $period;
-		print '</td>';
-
-		// DATE DELIVERY
-		print '<td class="liste_titre center">';
-		print $periodely;
-		print '</td>';
-
-		// SEARCH BUTTON
-		print '<td class="right liste_titre">';
-		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>';
-
-		// ALL/NONE
-		print '<td class="liste_titre center">';
-		if ($conf->use_javascript_ajax)
-			print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
-		print '</td>';
-
-		print '</td></tr>';
-
-		$generic_commande = new CommandeFournisseur($db);
-
-		while ($i < $num) {
-			$objp = $db->fetch_object($resql);
-
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">';
-
-			$generic_commande->id = $objp->rowid;
-			$generic_commande->ref = $objp->ref;
-
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			print '<td class="nobordernopadding nowrap">';
-			print $generic_commande->getNomUrl(1, $objp->fk_statut);
-			print '</td>';
-
-			print '<td width="16" class="right nobordernopadding hideonsmartphone">';
-			$filename = dol_sanitizeFileName($objp->ref);
-			$filedir = $conf->fournisseur->commande->dir_output.'/'.dol_sanitizeFileName($objp->ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objp->rowid;
-			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
-			print '</td></tr></table>';
-			print '</td>';
-
-			print '<td>'.$objp->ref_supplier.'</td>';
-
-			// Order date
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($objp->date_commande), 'day');
-			print '</td>';
-
-			// Delivery date
-			print '<td class="center nowrap">';
-			print dol_print_date($db->jdate($objp->date_livraison), 'day');
-			print '</td>';
-
-			// Statut
-			print '<td class="right nowrap">'.$generic_commande->LibStatut($objp->fk_statut, 5).'</td>';
-
-			// Checkbox
-			print '<td class="center">';
-			print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="'.$objp->rowid.'">';
-			print '</td>';
-
-			print '</tr>';
-
-			$total = $total + $objp->price;
-			$subtotal = $subtotal + $objp->price;
-			$i++;
-		}
-		print '</table>';
-
-		/*
-		 * Boutons actions
-		*/
-		print '<div class="center">';
-		print '<div class="right">';
-		print '<input type="hidden" name="socid" value="'.$socid.'">';
-		print '<input type="hidden" name="action" value="create">';
-		print '<input type="hidden" name="origin" value="order_supplier"><br>';
-		// print '<a class="butAction" href="index.php">'.$langs->trans("GoBack").'</a>';
-		print '<input type="submit" class="butAction" name="createbill" value="'.$langs->trans("GenerateBill").'">';
-		print '</div>';
-		print '</div>';
-
-		print '</form>';
-
-		$db->free($resql);
-	} else {
-		dol_print_error($db);
-	}
-}
-
-dol_htmloutput_mesg($mesg, $mesgs);
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 40773f0eca6..edcccbc6a88 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -124,9 +124,7 @@ if ($result)
     }
     print "</table>";
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 6e502b88ac0..029abf36058 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -100,12 +100,20 @@ if (!empty($user->socid)) $socid = $user->socid;
 $isdraft = (($object->statut == FactureFournisseur::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', 'fk_soc', 'rowid', $isdraft);
 
-$usercancreate = $user->rights->fournisseur->facture->creer;
+// Common permissions
+$usercanread		= $user->rights->fournisseur->facture->lire;
+$usercancreate		= $user->rights->fournisseur->facture->creer;
+$usercandelete		= $user->rights->fournisseur->facture->supprimer;
 
-$permissionnote = $user->rights->fournisseur->facture->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->fournisseur->facture->creer; // Used by the include of actions_dellink.inc.php
-$permissiontoedit = $user->rights->fournisseur->facture->creer; // Used by the include of actions_lineupdown.inc.php
-$permissiontoadd = $user->rights->fournisseur->facture->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+// 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);
+
+// 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
+$permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
 
 /*
@@ -145,30 +153,22 @@ if (empty($reshook))
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd)
 	{
-	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
+		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
-	    if (GETPOST('newsupplierref', 'alphanohtml')) $objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
-	    $objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
+		if (GETPOST('newsupplierref', 'alphanohtml')) $objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
+		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
 
-	    $result = $objectutil->createFromClone($user, $id);
-        if ($result > 0)
-        {
-        	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
-        	exit;
-        }
-        else
-        {
-        	$langs->load("errors");
-        	setEventMessages($objectutil->error, $objectutil->errors, 'errors');
-        	$action = '';
-        }
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
-		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
-		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
-	)
-	{
+		$result = $objectutil->createFromClone($user, $id);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+			exit;
+		} else {
+			$langs->load("errors");
+			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
+			$action = '';
+		}
+	}	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) {
 		$idwarehouse = GETPOST('idwarehouse');
 
 		$object->fetch($id);
@@ -178,9 +178,7 @@ if (empty($reshook))
 		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 		{
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
-		}
-		else
-		{
+		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
@@ -214,7 +212,7 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-					$model = $object->modelpdf;
+					$model = $object->model_pdf;
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -222,33 +220,28 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes')
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
 		$isErasable = $object->is_erasable();
 
-		if (($user->rights->fournisseur->facture->supprimer && $isErasable > 0)
-			|| ($user->rights->fournisseur->facture->creer && $isErasable == 1))
+		if (($usercandelete && $isErasable > 0)	|| ($usercancreate && $isErasable == 1))
 		{
 			$result = $object->delete($user);
 			if ($result > 0)
 			{
 				header('Location: list.php?restore_lastsearch_values=1');
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	}
 
 	// Remove a product line
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$result = $object->deleteline($lineid);
 		if ($result > 0)
@@ -266,14 +259,12 @@ if (empty($reshook))
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}*/
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
 			$action = '';
@@ -281,15 +272,12 @@ if (empty($reshook))
 	}
 
 	// Delete link of credit note to invoice
-	elseif ($action == 'unlinkdiscount' && $user->rights->fournisseur->facture->creer)
+	elseif ($action == 'unlinkdiscount' && $usercancreate)
 	{
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
 		$discount->unlink_invoice();
-	}
-
-	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
-	{
+	} elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercancreate) {
 		$object->fetch($id);
 		$result = $object->set_paid($user);
 		if ($result < 0)
@@ -299,15 +287,13 @@ if (empty($reshook))
 	}
 
 	// Set supplier ref
-	if ($action == 'setref_supplier' && $user->rights->fournisseur->facture->creer)
+	if ($action == 'setref_supplier' && $usercancreate)
 	{
 		$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
 
 		if ($object->update($user) < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
@@ -323,13 +309,13 @@ if (empty($reshook))
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 	}
 
 	// payments conditions
-	if ($action == 'setconditions' && $user->rights->fournisseur->facture->creer)
+	if ($action == 'setconditions' && $usercancreate)
 	{
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 	}
@@ -341,36 +327,34 @@ if (empty($reshook))
 	}
 
 	// payment mode
-	elseif ($action == 'setmode' && $user->rights->fournisseur->facture->creer)
+	elseif ($action == 'setmode' && $usercancreate)
 	{
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 	}
 
 	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $user->rights->fournisseur->facture->creer) {
+	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	}
 
 	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $user->rights->fournisseur->facture->creer) {
+	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx', 'alpha')));
 	}
 
 	// bank account
-	elseif ($action == 'setbankaccount' && $user->rights->fournisseur->facture->creer) {
+	elseif ($action == 'setbankaccount' && $usercancreate) {
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	}
 
 	// Set label
-	elseif ($action == 'setlabel' && $user->rights->fournisseur->facture->creer)
+	elseif ($action == 'setlabel' && $usercancreate)
 	{
 		$object->fetch($id);
 		$object->label = GETPOST('label');
 		$result = $object->update($user);
 		if ($result < 0) dol_print_error($db);
-	}
-	elseif ($action == 'setdatef' && $user->rights->fournisseur->facture->creer)
-	{
+	} elseif ($action == 'setdatef' && $usercancreate) {
 		$newdate = dol_mktime(0, 0, 0, $_POST['datefmonth'], $_POST['datefday'], $_POST['datefyear']);
 		if ($newdate > (dol_now() + (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE) ? 0 : $conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)))
 		{
@@ -393,9 +377,7 @@ if (empty($reshook))
 
 		$result = $object->update($user);
 		if ($result < 0) dol_print_error($db, $object->error);
-	}
-	elseif ($action == 'setdate_lim_reglement' && $user->rights->fournisseur->facture->creer)
-	{
+	} elseif ($action == 'setdate_lim_reglement' && $usercancreate) {
 		$object->fetch($id);
 		$object->date_echeance = dol_mktime(12, 0, 0, $_POST['date_lim_reglementmonth'], $_POST['date_lim_reglementday'], $_POST['date_lim_reglementyear']);
 		if (!empty($object->date_echeance) && $object->date_echeance < $object->date)
@@ -405,8 +387,7 @@ if (empty($reshook))
 		}
 		$result = $object->update($user);
 		if ($result < 0) dol_print_error($db, $object->error);
-	}
-	elseif ($action == "setabsolutediscount" && $usercancreate)
+	} elseif ($action == "setabsolutediscount" && $usercancreate)
 	{
 		// POST[remise_id] or POST[remise_id_for_payment]
 
@@ -459,7 +440,7 @@ if (empty($reshook))
 			}
 			$ret = $object->fetch($id); // Reload to get new records
 
-			$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -595,18 +576,14 @@ if (empty($reshook))
 					if ($result >= 0)
 					{
 						$db->commit();
-					}
-					else
-					{
+					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$db->rollback();
 					}
 				} else {
 					$db->commit();
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($discount->error, $discount->errors, 'errors');
 				$db->rollback();
 			}
@@ -615,7 +592,7 @@ if (empty($reshook))
 
 
 	// Delete payment
-	elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+	elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate)
 	{
 	 	$object->fetch($id);
 		if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0)
@@ -674,8 +651,8 @@ if (empty($reshook))
 				$object->libelle = GETPOST('label', 'nohtml');
 				$object->date = $datefacture;
 				$object->date_echeance = $datedue;
-				$object->note_public = GETPOST('note_public', 'none');
-				$object->note_private = GETPOST('note_private', 'none');
+				$object->note_public = GETPOST('note_public', 'restricthtml');
+				$object->note_private = GETPOST('note_private', 'restricthtml');
 				$object->cond_reglement_id	= GETPOST('cond_reglement_id');
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
 				$object->fk_account			= GETPOST('fk_account', 'int');
@@ -739,8 +716,8 @@ if (empty($reshook))
 				$object->label				= GETPOST('label', 'nohtml');
 				$object->date = $datefacture;
 				$object->date_echeance = $datedue;
-				$object->note_public = GETPOST('note_public', 'none');
-				$object->note_private = GETPOST('note_private', 'none');
+				$object->note_public = GETPOST('note_public', 'restricthtml');
+				$object->note_private = GETPOST('note_private', 'restricthtml');
 				$object->cond_reglement_id	= GETPOST('cond_reglement_id');
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
 				$object->fk_account			= GETPOST('fk_account', 'int');
@@ -851,8 +828,8 @@ if (empty($reshook))
 				$object->libelle       = $_POST['label'];
 				$object->date          = $datefacture;
 				$object->date_echeance = $datedue;
-				$object->note_public   = GETPOST('note_public', 'none');
-				$object->note_private  = GETPOST('note_private', 'none');
+				$object->note_public   = GETPOST('note_public', 'restricthtml');
+				$object->note_private  = GETPOST('note_private', 'restricthtml');
 				$object->cond_reglement_id = GETPOST('cond_reglement_id');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id');
 				$object->fk_account        = GETPOST('fk_account', 'int');
@@ -973,9 +950,7 @@ if (empty($reshook))
 								{
 									$pu = 0;
 									$pu_currency = $lines[$i]->multicurrency_subprice;
-								}
-								else
-								{
+								} else {
 									$pu = $lines[$i]->subprice;
 									$pu_currency = 0;
 								}
@@ -1015,18 +990,13 @@ if (empty($reshook))
 
 							// Now reload line
 							$object->fetch_lines();
-						}
-						else
-						{
+						} else {
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						$error++;
 					}
-				}
-				elseif (!$error)
+				} elseif (!$error)
 				{
 					$id = $object->create($user);
 					if ($id < 0)
@@ -1045,14 +1015,12 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 			$_GET['socid'] = $_POST['socid'];
-		}
-		else
-		{
+		} else {
 			$db->commit();
 
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$outputlangs = $langs;
-				$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				if ($result < 0)
 				{
 					dol_print_error($db, $object->error, $object->errors);
@@ -1066,22 +1034,20 @@ if (empty($reshook))
 	}
 
 	// Edit line
-	elseif ($action == 'updateline' && $user->rights->fournisseur->facture->creer)
+	elseif ($action == 'updateline' && $usercancreate)
 	{
 		$db->begin();
 
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
-        $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 
 		if (GETPOST('price_ht') != '')
 		{
 			$up = price2num(GETPOST('price_ht'));
 			$price_base_type = 'HT';
-		}
-		else
-		{
+		} else {
 			$up = price2num(GETPOST('price_ttc'));
 			$price_base_type = 'TTC';
 		}
@@ -1091,7 +1057,7 @@ if (empty($reshook))
 			$productsupplier = new ProductFournisseur($db);
 			if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY))
 			{
-				if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), GETPOST('productid'), 'none', GETPOST('socid', 'int')) < 0)
+				if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), GETPOST('productid', 'int'), 'restricthtml', GETPOST('socid', 'int')) < 0)
 				{
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 				}
@@ -1103,9 +1069,7 @@ if (empty($reshook))
 			if (trim($_POST['product_desc']) != trim($label)) $label = $_POST['product_desc'];
 
 			$type = $prod->type;
-		}
-		else
-		{
+		} else {
 			$label = $_POST['product_desc'];
 			$type = $_POST["type"] ? $_POST["type"] : 0;
 		}
@@ -1113,17 +1077,17 @@ if (empty($reshook))
 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 
-	    // Define info_bits
-	    $info_bits = 0;
-	    if (preg_match('/\*/', $tva_tx))
-	    	$info_bits |= 0x01;
+		// Define info_bits
+		$info_bits = 0;
+		if (preg_match('/\*/', $tva_tx))
+			$info_bits |= 0x01;
 
-	    // Define vat_rate
-	    $tva_tx = str_replace('*', '', $tva_tx);
-        $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
-        $localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
+		// Define vat_rate
+		$tva_tx = str_replace('*', '', $tva_tx);
+		$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
+		$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-        $remise_percent = GETPOST('remise_percent');
+		$remise_percent = GETPOST('remise_percent');
 		$pu_ht_devise = GETPOST('multicurrency_subprice');
 
 		// Extrafields Lines
@@ -1136,12 +1100,12 @@ if (empty($reshook))
 			}
 		}
 
-        $result = $object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units'], $pu_ht_devise, GETPOST('fourn_ref', 'alpha'));
-        if ($result >= 0)
-        {
-            unset($_POST['label']);
-            unset($_POST['fourn_ref']);
-            unset($_POST['date_starthour']);
+		$result = $object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units'], $pu_ht_devise, GETPOST('fourn_ref', 'alpha'));
+		if ($result >= 0)
+		{
+			unset($_POST['label']);
+			unset($_POST['fourn_ref']);
+			unset($_POST['date_starthour']);
 			unset($_POST['date_startmin']);
 			unset($_POST['date_startsec']);
 			unset($_POST['date_startday']);
@@ -1155,16 +1119,11 @@ if (empty($reshook))
 			unset($_POST['date_endyear']);
 
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	elseif ($action == 'addline' && $user->rights->fournisseur->facture->creer)
-	{
+	} elseif ($action == 'addline' && $usercancreate) {
 		$db->begin();
 
 		$ret = $object->fetch($id);
@@ -1190,9 +1149,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = '';
@@ -1275,14 +1232,11 @@ if (empty($reshook))
 					{
 						$productsupplier->ref_supplier = '';
 					}
-				}
-				else
-				{
+				} else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			}
-			elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+			} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
 			{
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
 				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
@@ -1296,7 +1250,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));
@@ -1347,8 +1301,8 @@ if (empty($reshook))
 					$array_options,
 					$productsupplier->fk_unit,
 					0,
-                    $pu_ht_devise,
-                    $ref_supplier,
+					$pu_ht_devise,
+					$ref_supplier,
 					''
 				);
 			}
@@ -1366,8 +1320,7 @@ if (empty($reshook))
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 			}
-		}
-		elseif (empty($error)) // $price_ht is already set
+		} elseif (empty($error)) // $price_ht is already set
 		{
 			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 			$tva_tx = str_replace('*', '', $tva_tx);
@@ -1387,9 +1340,7 @@ if (empty($reshook))
 			if ($price_ht !== '')
 			{
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
-			}
-			else
-			{
+			} else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
@@ -1415,7 +1366,7 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -1454,25 +1405,20 @@ if (empty($reshook))
 			unset($_POST['date_endday']);
 			unset($_POST['date_endmonth']);
 			unset($_POST['date_endyear']);
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
 		$action = '';
-	}
-
-	elseif ($action == 'classin' && $user->rights->fournisseur->facture->creer)
-	{
+	} elseif ($action == 'classin' && $usercancreate) {
 		$object->fetch($id);
 		$result = $object->setProject($projectid);
 	}
 
 
 	// Set invoice to draft status
-	elseif ($action == 'confirm_edit' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
+	elseif ($action == 'confirm_edit' && $confirm == 'yes' && $usercancreate)
 	{
 		$object->fetch($id);
 
@@ -1484,36 +1430,34 @@ if (empty($reshook))
 
 		if (!$ventilExportCompta)
 		{
-		    // On verifie si aucun paiement n'a ete effectue
+			// On verifie si aucun paiement n'a ete effectue
 			if ($resteapayer == price2num($object->total_ttc, 'MT', 1) && $object->statut == FactureFournisseur::STATUS_VALIDATED)
-		    {
-	            $idwarehouse = GETPOST('idwarehouse');
+			{
+				$idwarehouse = GETPOST('idwarehouse');
 
-	            $object->fetch_thirdparty();
+				$object->fetch_thirdparty();
 
-	            $qualified_for_stock_change = 0;
-	            if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-	            {
-	                $qualified_for_stock_change = $object->hasProductsOrServices(2);
-	            }
-	            else
-	            {
-	                $qualified_for_stock_change = $object->hasProductsOrServices(1);
-	            }
+				$qualified_for_stock_change = 0;
+				if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+				{
+					$qualified_for_stock_change = $object->hasProductsOrServices(2);
+				} else {
+					$qualified_for_stock_change = $object->hasProductsOrServices(1);
+				}
 
-	            // Check parameters
-	            if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-	            {
-	                $langs->load("stocks");
-	                if (!$idwarehouse || $idwarehouse == -1)
-	                {
-	                    $error++;
-	                    setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-	                    $action = '';
-	                }
-	            }
+				// Check parameters
+				if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+				{
+					$langs->load("stocks");
+					if (!$idwarehouse || $idwarehouse == -1)
+					{
+						$error++;
+						setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+						$action = '';
+					}
+				}
 
-	            $object->setDraft($user, $idwarehouse);
+				$object->setDraft($user, $idwarehouse);
 
 				// Define output language
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
@@ -1526,7 +1470,7 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-					$model = $object->modelpdf;
+					$model = $object->model_pdf;
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -1539,7 +1483,7 @@ if (empty($reshook))
 	}
 
 	// Set invoice to validated/unpaid status
-	elseif ($action == 'reopen' && $user->rights->fournisseur->facture->creer)
+	elseif ($action == 'reopen' && $usercancreate)
 	{
 		$result = $object->fetch($id);
 		if ($object->statut == FactureFournisseur::STATUS_CLOSED
@@ -1550,9 +1494,7 @@ if (empty($reshook))
 			{
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1570,7 +1512,7 @@ if (empty($reshook))
 
 	// Actions to build doc
 	$upload_dir = $conf->fournisseur->facture->dir_output;
-	$permissiontoadd = $user->rights->fournisseur->facture->creer;
+	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Make calculation according to calculationrule
@@ -1592,7 +1534,7 @@ if (empty($reshook))
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from add form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
@@ -1612,7 +1554,7 @@ if (empty($reshook))
 			$action = 'edit_extras';
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->fournisseur->facture->creer)
+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate)
 	{
 		if ($action == 'addcontact')
 		{
@@ -1628,16 +1570,12 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else
-			{
+			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
@@ -1649,9 +1587,7 @@ if (empty($reshook))
 			if ($object->fetch($id))
 			{
 				$result = $object->swapContactStatus(GETPOST('ligne'));
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1666,8 +1602,7 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
-			}
-			else {
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1767,9 +1702,7 @@ if ($action == 'create')
 		// Replicate extrafields
 		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 		$fk_account         = $societe->fk_account;
@@ -1781,6 +1714,19 @@ if ($action == 'create')
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
 	}
 
+	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
+	if (empty($cond_reglement_id)) {
+		$cond_reglement_id = GETPOST("cond_reglement_id");
+	}
+
+	// when payment mode is empty (means not override by payment condition form a other object, like third-party), try to use default value
+	if (empty($mode_reglement_id)) {
+		$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));
+
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -1805,9 +1751,7 @@ if ($action == 'create')
 		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
-	}
-	else
-	{
+	} else {
 		print $form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
@@ -1827,9 +1771,9 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Ref supplier
-    print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : $objectsrc->ref_supplier).'" type="text"';
-    if ($societe->id > 0) print ' autofocus';
-    print '></td>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : $objectsrc->ref_supplier).'" type="text"';
+	if ($societe->id > 0) print ' autofocus';
+	print '></td>';
 	print '</tr>';
 
 	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td>';
@@ -2019,9 +1963,7 @@ if ($action == 'create')
 
 				print '</div></div>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
 			$text = $tmp.$langs->trans("InvoiceAvoir").' ';
@@ -2073,9 +2015,12 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Bank Account
-	print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
-	$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1);
-	print '</td></tr>';
+	if (!empty($conf->banque->enabled))
+	{
+		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
+		$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1);
+		print '</td></tr>';
+	}
 
 	// Multicurrency
 	if (!empty($conf->multicurrency->enabled))
@@ -2111,21 +2056,16 @@ if ($action == 'create')
 	// Public note
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
-	$note_public = $object->getDefaultCreateValueFor('note_public');
-	if (empty($note_public))$note_public = $objectsrc->note_public;
-	$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'none') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
-    // print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
+	// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
 	print '</tr>';
 
 	// Private note
 	print '<tr><td>'.$langs->trans('NotePrivate').'</td>';
 	print '<td>';
-	$note_private = $object->getDefaultCreateValueFor('note_private');
-	if (empty($note_private))$note_private = $objectsrc->note_private;
-
-	$doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ?GETPOST('note_private', 'none') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+	$doleditor = new DolEditor('note_private', (GETPOSTISSET('note_private') ?GETPOST('note_private', 'restricthtml') : $note_private), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
 	// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
@@ -2224,9 +2164,7 @@ if ($action == 'create')
 
 		print '</table>';
 	}
-}
-else
-{
+} else {
 	if ($id > 0 || !empty($ref))
 	{
 		/* *************************************************************************** */
@@ -2303,8 +2241,8 @@ else
 		{
 			// Create an array for form
 			$formquestion = array(
-			    array('type' => 'text', 'name' => 'newsupplierref', 'label' => $langs->trans("RefSupplier"), 'value' => $langs->trans("CopyOf").' '.$object->ref_supplier),
-			    array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
+				array('type' => 'text', 'name' => 'newsupplierref', 'label' => $langs->trans("RefSupplier"), 'value' => $langs->trans("CopyOf").' '.$object->ref_supplier),
+				array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
 			);
 			// Ask confirmation to clone
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250);
@@ -2319,9 +2257,7 @@ else
 			{
 				$savdate = $object->date;
 				$numref = $object->getNextNumRef($societe);
-			}
-			else
-			{
+			} else {
 				$numref = $object->ref;
 			}
 
@@ -2339,67 +2275,63 @@ else
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
 			{
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
-			}
-			else
-			{
+			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
-            if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-            {
-                $langs->load("stocks");
-                require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-                $formproduct = new FormProduct($db);
-                $warehouse = new Entrepot($db);
-                $warehouse_array = $warehouse->list_array();
-                if (count($warehouse_array) == 1) {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockDecrease", current($warehouse_array)) : $langs->trans("WarehouseForStockIncrease", current($warehouse_array));
-                    $value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
-                } else {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockDecrease") : $langs->trans("SelectWarehouseForStockIncrease");
-                    $value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
-                }
-                $formquestion = array(
-                    array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
-                );
-            }
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+			{
+				$langs->load("stocks");
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+				$formproduct = new FormProduct($db);
+				$warehouse = new Entrepot($db);
+				$warehouse_array = $warehouse->list_array();
+				if (count($warehouse_array) == 1) {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockDecrease", current($warehouse_array)) : $langs->trans("WarehouseForStockIncrease", current($warehouse_array));
+					$value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
+				} else {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockDecrease") : $langs->trans("SelectWarehouseForStockIncrease");
+					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
+				}
+				$formquestion = array(
+					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
+				);
+			}
 
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, 1, 1);
-        }
+		}
 
-        // Confirmation edit (back to draft)
-        if ($action == 'edit')
-        {
-            $formquestion = array();
+		// Confirmation edit (back to draft)
+		if ($action == 'edit')
+		{
+			$formquestion = array();
 
-            $qualified_for_stock_change = 0;
-            if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-            {
-                $qualified_for_stock_change = $object->hasProductsOrServices(2);
-            }
-            else
-            {
-                $qualified_for_stock_change = $object->hasProductsOrServices(1);
-            }
-            if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-            {
-                $langs->load("stocks");
-                require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-                $formproduct = new FormProduct($db);
-                $warehouse = new Entrepot($db);
-                $warehouse_array = $warehouse->list_array();
-                if (count($warehouse_array) == 1) {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockIncrease", current($warehouse_array)) : $langs->trans("WarehouseForStockDecrease", current($warehouse_array));
-                    $value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
-                } else {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockIncrease") : $langs->trans("SelectWarehouseForStockDecrease");
-                    $value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
-                }
-                $formquestion = array(
-                    array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
-                );
-            }
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateBill'), $langs->trans('ConfirmUnvalidateBill', $object->ref), 'confirm_edit', $formquestion, 1, 1);
+			$qualified_for_stock_change = 0;
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+			{
+				$qualified_for_stock_change = $object->hasProductsOrServices(2);
+			} else {
+				$qualified_for_stock_change = $object->hasProductsOrServices(1);
+			}
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+			{
+				$langs->load("stocks");
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+				$formproduct = new FormProduct($db);
+				$warehouse = new Entrepot($db);
+				$warehouse_array = $warehouse->list_array();
+				if (count($warehouse_array) == 1) {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockIncrease", current($warehouse_array)) : $langs->trans("WarehouseForStockDecrease", current($warehouse_array));
+					$value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
+				} else {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockIncrease") : $langs->trans("SelectWarehouseForStockDecrease");
+					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
+				}
+				$formquestion = array(
+					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
+				);
+			}
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateBill'), $langs->trans('ConfirmUnvalidateBill', $object->ref), 'confirm_edit', $formquestion, 1, 1);
 		}
 
 		// Confirmation set paid
@@ -2413,7 +2345,7 @@ else
 		{
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBill'), $langs->trans('ConfirmDeleteBill'), 'confirm_delete', '', 0, 1);
 		}
-		if ($action == 'deletepaiement')
+		if ($action == 'deletepayment')
 		{
 			$payment_id = GETPOST('paiement_id');
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&paiement_id='.$payment_id, $langs->trans('DeletePayment'), $langs->trans('ConfirmDeletePayment'), 'confirm_delete_paiement', '', 0, 1);
@@ -2437,109 +2369,109 @@ else
 		print $formconfirm;
 
 
-        // Supplier invoice card
-        $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		// Supplier invoice card
+		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    	$morehtmlref = '<div class="refidno">';
-    	// Ref supplier
-    	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->facture->creer, 'string', '', 0, 1);
-    	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->facture->creer, '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->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> : ';
-                }
-                if ($action == 'classify') {
-                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                    $morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                    $morehtmlref .= '</form>';
-                } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-                }
-    	    } else {
-    	        if (!empty($object->fk_project)) {
-    	            $proj = new Project($db);
-    	            $proj->fetch($object->fk_project);
-    	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    	            $morehtmlref .= $proj->ref;
-    	            $morehtmlref .= '</a>';
-    	        } else {
-    	            $morehtmlref .= '';
-    	        }
-    	    }
-    	}
-    	$morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Ref supplier
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($usercancreate)
+			{
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
 
-    	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    	print '<div class="fichecenter">';
-    	print '<div class="fichehalfleft">';
-    	print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-    	print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield" width="100%">';
 
-        // Type
-        print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
-        print $object->getLibType();
-        if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
-        {
-            $facreplaced = new FactureFournisseur($db);
-            $facreplaced->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
-        }
-        if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-        {
-            $facusing = new FactureFournisseur($db);
-            $facusing->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
-        }
+		// Type
+		print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
+		print $object->getLibType();
+		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
+		{
+			$facreplaced = new FactureFournisseur($db);
+			$facreplaced->fetch($object->fk_facture_source);
+			print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
+		}
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+		{
+			$facusing = new FactureFournisseur($db);
+			$facusing->fetch($object->fk_facture_source);
+			print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+		}
 
-        $facidavoir = $object->getListIdAvoirFromInvoice();
-        if (count($facidavoir) > 0)
-        {
-            print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-            $i = 0;
-            foreach ($facidavoir as $id)
-            {
-                if ($i == 0) print ' ';
-                else print ',';
-                $facavoir = new FactureFournisseur($db);
-                $facavoir->fetch($id);
-                print $facavoir->getNomUrl(1);
-            }
-            print ')';
-        }
-        if (isset($facidnext) && $facidnext > 0)
-        {
-            $facthatreplace = new FactureFournisseur($db);
-            $facthatreplace->fetch($facidnext);
-            print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
-        }
-        if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
-            $discount = new DiscountAbsolute($db);
-            $result = $discount->fetch(0, 0, $object->id);
-            if ($result > 0) {
-                print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).'<br>';
-            }
-        }
-        print '</td></tr>';
+		$facidavoir = $object->getListIdAvoirFromInvoice();
+		if (count($facidavoir) > 0)
+		{
+			print ' ('.$langs->transnoentities("InvoiceHasAvoir");
+			$i = 0;
+			foreach ($facidavoir as $id)
+			{
+				if ($i == 0) print ' ';
+				else print ',';
+				$facavoir = new FactureFournisseur($db);
+				$facavoir->fetch($id);
+				print $facavoir->getNomUrl(1);
+			}
+			print ')';
+		}
+		if (isset($facidnext) && $facidnext > 0)
+		{
+			$facthatreplace = new FactureFournisseur($db);
+			$facthatreplace->fetch($facidnext);
+			print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
+		}
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
+			$discount = new DiscountAbsolute($db);
+			$result = $discount->fetch(0, 0, $object->id);
+			if ($result > 0) {
+				print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).'<br>';
+			}
+		}
+		print '</td></tr>';
 
 
-        // Relative and absolute discounts
+		// Relative and absolute discounts
 		print '<!-- Discounts --><tr><td>'.$langs->trans('Discounts');
 		print '</td><td>';
 
@@ -2550,18 +2482,18 @@ else
 
 		print '</td></tr>';
 
-        // Label
-        print '<tr>';
-        print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, ($user->rights->fournisseur->facture->creer)).'</td>';
-        print '<td>'.$form->editfieldval("Label", 'label', $object->label, $object, ($user->rights->fournisseur->facture->creer)).'</td>';
-        print '</tr>';
+		// Label
+		print '<tr>';
+		print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
+		print '<td>'.$form->editfieldval("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
+		print '</tr>';
 
-	    $form_permission = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $user->rights->fournisseur->facture->creer && ($object->getSommePaiement() <= 0);
+		$form_permission = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $usercancreate && ($object->getSommePaiement() <= 0);
 
-        // Date
-        print '<tr><td>'.$form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker').'</td><td colspan="3">';
-        print $form->editfieldval("Date", 'datef', $object->datep, $object, $form_permission, 'datepicker');
-        print '</td>';
+		// Date
+		print '<tr><td>'.$form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker').'</td><td colspan="3">';
+		print $form->editfieldval("Date", 'datef', $object->datep, $object, $form_permission, 'datepicker');
+		print '</td>';
 
 		// Default terms of the settlement
 		$langs->load('bills');
@@ -2569,7 +2501,7 @@ else
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('PaymentConditions');
 		print '<td>';
-		if ($action != 'editconditions' && $user->rights->fournisseur->facture->creer) {
+		if ($action != 'editconditions' && $usercancreate) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 		}
 		print '</tr></table>';
@@ -2577,9 +2509,7 @@ else
 		if ($action == 'editconditions')
 		{
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
-		}
-		else
-		{
+		} else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
 		}
 		print "</td>";
@@ -2599,7 +2529,7 @@ else
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('PaymentMode');
 		print '</td>';
-		if ($action != 'editmode' && $user->rights->fournisseur->facture->creer) {
+		if ($action != 'editmode' && $usercancreate) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 		}
 		print '</tr></table>';
@@ -2607,9 +2537,7 @@ else
 		if ($action == 'editmode')
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
-		}
-		else
-		{
+		} else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
 		}
 		print '</td></tr>';
@@ -2664,21 +2592,24 @@ else
 		}
 
 		// Bank Account
-		print '<tr><td class="nowrap">';
-		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-		print $langs->trans('BankAccount');
-		print '<td>';
-		if ($action != 'editbankaccount' && $user->rights->fournisseur->facture->creer)
-			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);
-		} else {
-			 $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+		if (!empty($conf->banque->enabled))
+		{
+			print '<tr><td class="nowrap">';
+			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+			print $langs->trans('BankAccount');
+			print '<td>';
+			if ($action != 'editbankaccount' && $usercancreate)
+				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);
+			} else {
+				$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+			}
+			print "</td>";
+			print '</tr>';
 		}
-		print "</td>";
-		print '</tr>';
 
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
@@ -2687,7 +2618,7 @@ else
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
 			print $langs->trans('IncotermLabel');
 			print '<td><td class="right">';
-			if ($user->rights->fournisseur->facture->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			if ($usercancreate) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
 			else print '&nbsp;';
 			print '</td></tr></table>';
 			print '</td>';
@@ -2695,9 +2626,7 @@ else
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else
-			{
+			} 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>';
@@ -2740,7 +2669,7 @@ else
 		if (GETPOST('calculationrule')) $calculationrule = GETPOST('calculationrule', 'alpha');
 		else $calculationrule = (empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND) ? 'totalofround' : 'roundoftotal');
 		if ($calculationrule == 'totalofround') $calculationrulenum = 1;
-		else  $calculationrulenum = 2;
+		else $calculationrulenum = 2;
 		// Show link for "recalculate"
 		if ($object->getVentilExportCompta() == 0) {
 			$s = $langs->trans("ReCalculate").' ';
@@ -2788,7 +2717,7 @@ else
 		if ($societe->localtax1_assuj == "1") $nbrows++;
 		if ($societe->localtax2_assuj == "1") $nbrows++;
 
-		$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement, p.rowid, p.fk_bank,';
+		$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement as num_payment, p.rowid, p.fk_bank,';
 		$sql .= ' c.id as paiement_type,';
 		$sql .= ' pf.amount,';
 		$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
@@ -2826,7 +2755,7 @@ else
 					$paymentstatic->id = $objp->rowid;
 					$paymentstatic->datepaye = $db->jdate($objp->dp);
 					$paymentstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
-					$paymentstatic->num_paiement = $objp->num_paiement;
+					$paymentstatic->num_payment = $objp->num_payment;
 					$paymentstatic->payment_code = $objp->payment_code;
 
 					print '<tr class="oddeven">';
@@ -2835,7 +2764,7 @@ else
 					print '</td>';
 					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day').'</td>';
 					print '<td>';
-					print $form->form_modes_reglement(null, $objp->paiement_type, 'none').' '.$objp->num_paiement;
+					print $form->form_modes_reglement(null, $objp->paiement_type, 'none').' '.$objp->num_payment;
 					print '</td>';
 					if (!empty($conf->banque->enabled))
 					{
@@ -2860,7 +2789,7 @@ else
 					print '<td class="center">';
 					if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
 					{
-						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepaiement&paiement_id='.$objp->rowid.'">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepayment&token='.newToken().'&paiement_id='.$objp->rowid.'">';
 						print img_delete();
 						print '</a>';
 					}
@@ -2869,9 +2798,7 @@ else
 					$totalpaye += $objp->amount;
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print '<tr class="oddeven"><td colspan="'.$nbcols.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td><td></td><td></td></tr>';
 			}
 
@@ -2889,9 +2816,7 @@ else
 			*/
 
 			$db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -2901,8 +2826,7 @@ else
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			if ($object->type != FactureFournisseur::TYPE_DEPOSIT)
 				print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
-			else
-				print $langs->trans('AlreadyPaid');
+			else print $langs->trans('AlreadyPaid');
 			print ' :</td><td class="right"'.(($totalpaye > 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
 
 			//$resteapayer = $object->total_ttc - $totalpaye;
@@ -2991,13 +2915,11 @@ else
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			if ($resteapayeraffiche >= 0)
 				print $langs->trans('RemainderToPay');
-			else
-				print $langs->trans('ExcessPaid');
+			else print $langs->trans('ExcessPaid');
 			print ' :</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
-		}
-		else // Credit note
+		} else // Credit note
 		{
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
 
@@ -3013,8 +2935,7 @@ else
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			if ($resteapayeraffiche <= 0)
 				print $langs->trans('RemainderToPayBack');
-			else
-				print $langs->trans('ExcessPaid');
+			else print $langs->trans('ExcessPaid');
 			print ' :</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td>';
 			print '<td class="nowrap">&nbsp;</td></tr>';
@@ -3080,7 +3001,7 @@ else
 		$num = count($object->lines);
 
 		// Form to add new line
-		if ($object->statut == FactureFournisseur::STATUS_DRAFT && $user->rights->fournisseur->facture->creer)
+		if ($object->statut == FactureFournisseur::STATUS_DRAFT && $usercancreate)
 		{
 			if ($action != 'editline')
 			{
@@ -3112,8 +3033,8 @@ else
 																									  // modified by hook
 			if (empty($reshook))
 			{
-			    // Modify a validated invoice with no payments
-				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer)
+				// Modify a validated invoice with no payments
+				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $usercancreate)
 				{
 					// We check if lines of invoice are not already transfered into accountancy
 					$ventilExportCompta = $object->getVentilExportCompta(); // Should be 0 since the sum of payments are zero. But we keep the protection.
@@ -3121,9 +3042,7 @@ else
 					if ($ventilExportCompta == 0)
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span></div>';
 					}
 				}
@@ -3136,13 +3055,11 @@ else
 					|| ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && empty($discount->id)))
 					&& ($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED))				// A paid invoice (partially or completely)
 				{
-					if (!$facidnext && $object->close_code != 'replaced' && $user->rights->fournisseur->facture->creer)	// Not replaced by another invoice
+					if (!$facidnext && $object->close_code != 'replaced' && $usercancreate)	// Not replaced by another invoice
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a></div>';
-					}
-					else
-					{
-						if ($user->rights->fournisseur->facture->creer) {
+					} else {
+						if ($usercancreate) {
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span></div>';
 						} elseif (empty($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) {
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('ReOpen').'</span></div>';
@@ -3154,25 +3071,24 @@ else
 				if (empty($user->socid)) {
 					if (($object->statut == FactureFournisseur::STATUS_VALIDATED || $object->statut == FactureFournisseur::STATUS_CLOSED))
 					{
-						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
+						if ($usercansend)
 						{
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						}
-						else print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
-	            // Make payments
-	            if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-	            {
-	                print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create'.($object->fk_account > 0 ? '&amp;accountid='.$object->fk_account : '').'">'.$langs->trans('DoPayment').'</a></div>'; // must use facid because id is for payment id not invoice
-	            }
+				// Make payments
+				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create'.($object->fk_account > 0 ? '&amp;accountid='.$object->fk_account : '').'">'.$langs->trans('DoPayment').'</a></div>'; // must use facid because id is for payment id not invoice
+				}
 
-	            // Classify paid
-	            if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-	            {
-	                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
-	                print '>'.$langs->trans('ClassifyPaid').'</a></div>';
+				// Classify paid
+				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
+					print '>'.$langs->trans('ClassifyPaid').'</a></div>';
 
 					//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
 				}
@@ -3185,49 +3101,44 @@ else
 						if ($resteapayer == 0)
 						{
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span></div>';
-						}
-						else
-						{
+						} else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
 						}
 					}
 
 					// For standard invoice with excess paid
-					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $user->rights->fournisseur->facture->creer && empty($discount->id))
+					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $usercancreate && empty($discount->id))
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessPaidToReduc').'</a></div>';
 					}
 					// For credit note
-					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $user->rights->fournisseur->facture->creer
+					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0 && $usercancreate
 						&& (!empty($conf->global->SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED) || $object->getSommePaiement() == 0)
 						) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReducSupplier2")).'">'.$langs->trans('ConvertToReduc').'</a></div>';
 					}
 					// For deposit invoice
-					if ($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->paye == 1 && $resteapayer == 0 && $user->rights->fournisseur->facture->creer && empty($discount->id))
+					if ($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->paye == 1 && $resteapayer == 0 && $usercancreate && empty($discount->id))
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a></div>';
 					}
 				}
 
-	            // Validate
-	            if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT)
-	            {
-	                if (count($object->lines))
-	                {
-				        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
-				       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
-	                    {
-	                        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
-	                        print '>'.$langs->trans('Validate').'</a></div>';
-	                    }
-	                    else
-	                    {
-	                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
-	                        print '>'.$langs->trans('Validate').'</a></div>';
-	                    }
-	                }
-	            }
+				// Validate
+				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT)
+				{
+					if (count($object->lines))
+					{
+						if ($usercanvalidate)
+						{
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
+							print '>'.$langs->trans('Validate').'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
+							print '>'.$langs->trans('Validate').'</a></div>';
+						}
+					}
+				}
 
 				// Create event
 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -3236,13 +3147,13 @@ else
 				}*/
 
 				// Clone
-				if ($action != 'edit' && $user->rights->fournisseur->facture->creer)
+				if ($action != 'edit' && $usercancreate)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=clone&amp;socid='.$object->socid.'">'.$langs->trans('ToClone').'</a></div>';
 				}
 
 				// Create a credit note
-				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut > 0 && $user->rights->fournisseur->facture->creer)
+				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut > 0 && $usercancreate)
 				{
 					if (!$objectidnext)
 					{
@@ -3250,36 +3161,30 @@ else
 					}
 				}
 
-	            // Delete
+				// Delete
 				$isErasable = $object->is_erasable();
-				if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($user->rights->fournisseur->facture->creer && $isErasable == 1)))	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
-	            {
-	            	//var_dump($isErasable);
-	            	if ($isErasable == -4) {
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable == -3) {	// Should never happen with supplier invoice
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable == -2) {	// Should never happen with supplier invoice
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable == -1) {
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-	            	elseif ($isErasable <= 0)	// Any other cases
-	            	{
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
-	            	}
-                    else
-                    {
-    	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>';
-                    }
-	            }
-	            print '</div>';
+				if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($usercancreate && $isErasable == 1)))	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
+				{
+					//var_dump($isErasable);
+					if ($isErasable == -4) {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable == -3) {	// Should never happen with supplier invoice
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable == -2) {	// Should never happen with supplier invoice
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable == -1) {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable <= 0)	// Any other cases
+					{
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
+					}
+				}
+				print '</div>';
 
-	            if ($action != 'confirm_edit')
-	            {
+				if ($action != 'confirm_edit')
+				{
 					print '<div class="fichecenter"><div class="fichehalfleft">';
 
 					/*
@@ -3289,9 +3194,9 @@ else
 					$subdir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$ref;
 					$filedir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
 					$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
-					$genallowed = $user->rights->fournisseur->facture->lire;
-					$delallowed = $user->rights->fournisseur->facture->creer;
-					$modelpdf = (!empty($object->modelpdf) ? $object->modelpdf : (empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF) ? '' : $conf->global->INVOICE_SUPPLIER_ADDON_PDF));
+					$genallowed = $usercanread;
+					$delallowed = $usercancreate;
+					$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF) ? '' : $conf->global->INVOICE_SUPPLIER_ADDON_PDF));
 
 					print $formfile->showdocuments('facture_fournisseur', $subdir, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 40, 0, '', '', '', $societe->default_lang);
 					$somethingshown = $formfile->numoffiles;
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index eca47acaef5..9be956b32ae 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array("bills", "other", "companies"));
 
 $id		= (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int'));
 $ref	= GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -65,16 +65,12 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $user->rights->fournisseur->facture->creer
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -267,9 +260,7 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	}
-	else
-	{
+	} else {
 		print "ErrorRecordNotFound";
 	}
 }
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 022028bb483..f43ef300b01 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -41,7 +41,7 @@ if (!empty($conf->projet->enabled)) {
 $langs->loadLangs(array('bills', 'other', 'companies'));
 
 $id = GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $ref = GETPOST('ref', 'alpha');
 
@@ -94,56 +94,56 @@ if ($object->id > 0)
 
 	$totalpaye = $object->getSommePaiement();
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Ref supplier
-    $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
-    // Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$langs->load("projects");
-    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->facture->creer)
-    	{
-    		if ($action != 'classify')
-    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-    			$morehtmlref .= ' : ';
-    		if ($action == 'classify') {
-    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-    			$morehtmlref .= '</form>';
-    		} else {
-    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-    		}
-    	} else {
-    		if (!empty($object->fk_project)) {
-    			$proj = new Project($db);
-    			$proj->fetch($object->fk_project);
-    			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    			$morehtmlref .= $proj->ref;
-    			$morehtmlref .= '</a>';
-    		} else {
-    			$morehtmlref .= '';
-    		}
-    	}
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	// Ref supplier
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->facture->creer)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -215,15 +215,15 @@ if ($object->id > 0)
 
 	// Amount Local Taxes
 	//TODO: Place into a function to control showing by country or study better option
-	if ($societe->localtax1_assuj == "1") //Localtax1
+	if ($mysoc->localtax1_assuj == "1") //Localtax1
 	{
-		print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
+		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
-	if ($societe->localtax2_assuj == "1") //Localtax2
+	if ($mysoc->localtax2_assuj == "1") //Localtax2
 	{
-		print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
+		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
@@ -252,11 +252,26 @@ if ($object->id > 0)
 	$permission = $user->rights->fournisseur->facture->creer;
 	$permtoedit = $user->rights->fournisseur->facture->creer;
 	$param = '&facid='.$object->id;
-	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
-    print $langs->trans('ErrorUnknown');
+
+	$defaulttpldir = '/core/tpl';
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+	foreach ($dirtpls as $module => $reldir)
+	{
+		if (!empty($module)) {
+			$tpl = dol_buildpath($reldir.'/document_actions_post_headers.tpl.php');
+		} else {
+			$tpl = DOL_DOCUMENT_ROOT.$reldir.'/document_actions_post_headers.tpl.php';
+		}
+
+		if (empty($conf->file->strict_mode)) {
+			$res = @include $tpl;
+		} else {
+			$res = include $tpl; // for debug
+		}
+		if ($res) break;
+	}
+} else {
+	print $langs->trans('ErrorUnknown');
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 5368b491728..804a78079d3 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -116,26 +116,26 @@ if ($user->rights->fournisseur->facture->lire)
 
 	if ($search_ref)
 	{
-		$sql .= " AND f.ref LIKE '%".$search_ref."%'";
+		$sql .= " AND f.ref LIKE '%".$db->escape($search_ref)."%'";
 	}
 	if ($search_ref_supplier)
 	{
-		$sql .= " AND f.ref_supplier LIKE '%".$search_ref_supplier."%'";
+		$sql .= " AND f.ref_supplier LIKE '%".$db->escape($search_ref_supplier)."%'";
 	}
 
 	if ($search_company)
 	{
-		$sql .= " AND s.nom LIKE '%".$search_company."%'";
+		$sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 	}
 
 	if ($search_amount_no_tax)
 	{
-		$sql .= " AND f.total_ht = '".$search_amount_no_tax."'";
+		$sql .= " AND f.total_ht = '".$db->escape($search_amount_no_tax)."'";
 	}
 
 	if ($search_amount_all_tax)
 	{
-		$sql .= " AND f.total_ttc = '".$search_amount_all_tax."'";
+		$sql .= " AND f.total_ttc = '".$db->escape($search_amount_all_tax)."'";
 	}
 
 	if (dol_strlen(GETPOST('sf_re')) > 0)
@@ -290,9 +290,7 @@ if ($user->rights->fournisseur->facture->lire)
 		print '</form>';
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
new file mode 100644
index 00000000000..c3272544371
--- /dev/null
+++ b/htdocs/fourn/facture/index.php
@@ -0,0 +1,535 @@
+<?php
+/* Copyright (C) 2020	Tobias Sekan	<tobias.sekan@startmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file		htdocs/forun/facture/index.php
+*	\ingroup	facture
+ *	\brief		Home page of customer invoices area
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+
+// Security check
+restrictedArea($user, 'fournisseur', 0, '', 'facture');
+
+// Load translation files required by the page
+$langs->loadLangs(['bills', 'boxes']);
+
+// Filter to show only result of one supplier
+$socid = GETPOST('socid', 'int');
+if (isset($user->socid) && $user->socid > 0)
+{
+	$action = '';
+	$socid = $user->socid;
+}
+
+// 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;
+
+/*
+* View
+*/
+
+llxHeader("", $langs->trans("SupplierInvoicesArea"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
+
+print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'bill');
+
+print '<div class="fichecenter">';
+
+print '<div class="fichethirdleft">';
+
+// This is useless due to the global search combo
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))
+{
+	print getAreaSearchFrom();
+	print '<br>';
+}
+
+print getPieChart($socid);
+print '<br>';
+print getDraftTable($maxDraftCount, $socid);
+
+print '</div>';
+
+print '<div class="fichetwothirdright">';
+print '<div class="ficheaddleft">';
+
+print getLatestEditTable($maxLatestEditCount, $socid);
+print '<br>';
+print getOpenTable($maxOpenCount, $socid);
+
+print '</div>';
+print '</div>';
+
+print '</div>';
+
+// End of page
+llxFooter();
+$db->close();
+
+/**
+ * Return a HTML string that contains a additional search form
+ *
+ * @return string A HTML string that contains a additional search form
+ */
+function getAreaSearchFrom()
+{
+	global $langs;
+
+	$result = '<form method="post" action="'.DOL_URL_ROOT.'/compta/facture/list.php">';
+	$result .= '<div class="div-table-responsive-no-min">';
+	$result .= '<input type="hidden" name="token" value="'.newToken().'">';
+	$result .= '<table class="noborder nohover centpercent">';
+
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="3">'.$langs->trans("Search").'</td>';
+	$result .= '</tr>';
+
+	$result .= '<tr class="oddeven">';
+	$result .= '<td>'.$langs->trans("Invoice").':</td><td><input type="text" class="flat" name="sall" size=18></td>';
+	$result .= '<td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+	$result .= '</tr>';
+
+	$result .= "</table>";
+	$result .= "</div>";
+	$result .= "</form>";
+
+	return $result;
+}
+
+/**
+ * Return a HTML table that contains a pie chart of supplier invoices
+ *
+ * @param	int		$socid		(Optional) Show only results from the supplier with this id
+ * @return	string				A HTML table that contains a pie chart of supplier invoices
+ */
+function getPieChart($socid = 0)
+{
+	global $conf, $db, $langs, $user;
+
+	$sql = "SELECT count(f.rowid), f.fk_statut";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".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.entity IN (".getEntity('facture_fourn').")";
+	if ($user->socid) $sql .= ' AND f.fk_soc = '.$user->socid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " GROUP BY f.fk_statut";
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		return '';
+	}
+
+	$num = $db->num_rows($resql);
+	$i = 0;
+
+	$total = 0;
+	$vals = [];
+
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
+		if ($row)
+		{
+			$vals[$row[1]] = $row[0];
+			$total += $row[0];
+		}
+
+		$i++;
+	}
+
+	$db->free($resql);
+
+	$result = '<div class="div-table-responsive-no-min">';
+	$result .= '<table class="noborder nohover centpercent">';
+
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SupplierInvoice").'</td>';
+	$result .= '</tr>';
+
+	$objectstatic = new FactureFournisseur($db);
+	$array = [FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_CLOSED, FactureFournisseur::STATUS_ABANDONED];
+	$dataseries = [];
+
+	foreach ($array as $status)
+	{
+		$objectstatic->statut = $status;
+		$objectstatic->paye = $status == FactureFournisseur::STATUS_CLOSED ? -1 : 0;
+
+		$dataseries[] = [$objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0)];
+		if (!$conf->use_javascript_ajax)
+		{
+			$result .= '<tr class="oddeven">';
+			$result .= '<td>'.$objectstatic->getLibStatut(0).'</td>';
+			$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
+			$result .= '</tr>';
+		}
+	}
+
+	if ($conf->use_javascript_ajax)
+	{
+		$dolgraph = new DolGraph();
+		$dolgraph->SetData($dataseries);
+		$dolgraph->setShowLegend(1);
+		$dolgraph->setShowPercent(1);
+		$dolgraph->SetType(['pie']);
+		$dolgraph->setWidth('100%');
+		$dolgraph->draw('idgraphthirdparties');
+
+		$result .= '<tr>';
+		$result .= '<td align="center" colspan="2">'.$dolgraph->show($total ? 0 : 1).'</td>';
+		$result .= '</tr>';
+	}
+
+	$result .= '<tr class="liste_total">';
+	$result .= '<td>'.$langs->trans("Total").'</td>';
+	$result .= '<td class="right">'.$total.'</td>';
+	$result .= '</tr>';
+
+	$result .= '</table>';
+	$result .= '</div>';
+
+	return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with supplier invoice drafts
+ *
+ * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
+ * @param	int		$socid		(Optional) Show only results from the supplier with this id
+ * @return	string				A HTML table that contains a list with supplier invoice drafts
+ */
+function getDraftTable($maxCount = 500, $socid = 0)
+{
+	global $db, $langs, $user;
+
+	$sql = "SELECT f.rowid, f.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client, f.total_ttc";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	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('facture_fourn').")";
+	$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
+	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= $db->plimit($maxCount, 0);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		return '';
+	}
+
+	$num = $db->num_rows($resql);
+
+	$result = '<div class="div-table-responsive-no-min">';
+	$result .= '<table class="noborder centpercent">';
+
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="3">';
+	$result .= $langs->trans("SuppliersDraftInvoices");
+	$result .= ' <a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status=0">';
+	$result .= '<span class="badge">'.$num.'</span>';
+	$result .= '</a>';
+	$result .= '</td>';
+	$result .= '</tr>';
+
+	if ($num < 1)
+	{
+		$result .= '</table>';
+		$result .= '</div>';
+		return $result;
+	}
+
+	$objectstatic	= new FactureFournisseur($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;
+
+		$companystatic->id = $obj->socid;
+		$companystatic->name = $obj->socname;
+		$companystatic->client = $obj->client;
+		$companystatic->canvas = $obj->canvas;
+
+		$result .= '<tr class="oddeven">';
+		$result .= '<td class="nowrap">'.$objectstatic->getNomUrl(1).'</td>';
+		$result .= '<td>'.$companystatic->getNomUrl(1, 'supplier', 24).'</td>';
+		$result .= '<td class="right">'.price($obj->total_ttc).'</td>';
+		$result .= '</tr>';
+
+		$i++;
+		$total += $obj->total_ttc;
+	}
+
+	if ($num > $nbofloop)
+	{
+		$result .= '<tr class="liste_total">';
+		$result .= '<td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
+		$result .= '</tr>';
+	}
+	elseif ($total > 0)
+	{
+		$result .= '<tr class="liste_total">';
+		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
+		$result .= '<td class="right">'.price($total).'</td>';
+		$result .= '</tr>';
+	}
+
+	$result .= '</table>';
+	$result .= '</div>';
+	return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with latest edited supplier invoices
+ *
+ * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
+ * @param	int		$socid		(Optional) Show only results from the supplier with this id
+ * @return	string				A HTML table that contains a list with latest edited supplier invoices
+ */
+function getLatestEditTable($maxCount = 5, $socid = 0)
+{
+	global $conf, $db, $langs, $user;
+
+	$sql = "SELECT f.rowid, f.entity, f.ref, f.fk_statut as status, f.paye, s.nom as socname, s.rowid as socid, s.canvas, s.client,";
+	$sql .= " f.datec";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+	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('facture_fourn').")";
+	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	$sql .= " ORDER BY f.tms DESC";
+	$sql .= $db->plimit($maxCount, 0);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		return '';
+	}
+
+	$num = $db->num_rows($resql);
+
+	$result = '<div class="div-table-responsive-no-min">';
+	$result .= '<table class="noborder centpercent">';
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="4">'.$langs->trans("BoxTitleLastSupplierBills", $maxCount).'</td>';
+	$result .= '</tr>';
+
+	if ($num < 1)
+	{
+		$result .= '</table>';
+		$result .= '</div>';
+		return $result;
+	}
+
+	$objectstatic	= new FactureFournisseur($db);
+	$companystatic	= new Societe($db);
+	$formfile		= new FormFile($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;
+
+		$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 .= '<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 .= '</tr>';
+		$result .= '</table>';
+		$result .= '</td>';
+
+		$result .= '<td>'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+		$result .= '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
+		$result .= '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
+
+		$result .= '</tr>';
+
+		$i++;
+	}
+
+	$result .= '</table>';
+	$result .= '</div>';
+	return $result;
+}
+
+/**
+ * Return a HTML table that contains a list with open (unpaid) supplier invoices
+ *
+ * @param	int		$maxCount	(Optional) The maximum count of elements inside the table
+ * @param	int		$socid		(Optional) Show only results from the supplier with this id
+ * @return	string				A HTML table that conatins a list with open (unpaid) supplier invoices
+ */
+function getOpenTable($maxCount = 500, $socid = 0)
+{
+	global $conf, $db, $langs, $user;
+
+	$sql = "SELECT s.nom as socname, s.rowid as socid, s.canvas, s.client";
+	$sql .= ", f.rowid as id, f.entity, f.total_ttc, f.total_ht, f.ref, f.fk_statut";
+	$sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= ", ".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.entity IN (".getEntity('facture_fourn').")";
+	$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
+	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 f.rowid DESC";
+	$sql .= $db->plimit($maxCount, 0);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		return '';
+	}
+
+	$num = $db->num_rows($resql);
+
+	$result = '<div class="div-table-responsive-no-min">';
+	$result .= '<table class="noborder centpercent">';
+	$result .= '<tr class="liste_titre">';
+	$result .= '<td colspan="4">';
+	$result .= $langs->trans("BillsCustomersUnpaid");
+	$result .= ' <a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1">';
+	$result .= '<span class="badge">'.$num.'</span>';
+	$result .= '</a>';
+	$result .= '</td>';
+	$result .= '</tr>';
+
+	if ($num < 1)
+	{
+		$result .= '</table>';
+		$result .= '</div>';
+		return $result;
+	}
+
+	$objectstatic	= new FactureFournisseur($db);
+	$companystatic	= new Societe($db);
+	$formfile		= new FormFile($db);
+	$nbofloop		= min($num, $maxCount);
+	$now			= dol_now();
+	$total			= 0;
+	$i				= 0;
+
+	while ($i < $nbofloop)
+	{
+		$obj = $db->fetch_object($resql);
+
+		$objectstatic->id = $obj->id;
+		$objectstatic->ref = $obj->ref;
+
+		$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 class="oddeven">';
+
+		$result .= '<td class="nowrap" width="140">';
+		$result .= '<table class="nobordernopadding">';
+		$result .= '<tr class="nocellnopadd">';
+
+		$result .= '<td class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
+		$result .= '<td width="18" class="nobordernopadding nowrap">';
+
+		if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay))
+		{
+			$result .= img_warning($langs->trans("Late"));
+		}
+
+		$result .= '</td>';
+
+		$result .= '<td width="16" align="center" class="nobordernopadding">'.$formfile->getDocumentsLink($objectstatic->element, $filename, $filedir).'</td>';
+
+		$result .= '</tr>';
+		$result .= '</table>';
+		$result .= '</td>';
+
+		$result .= '<td class="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
+		$result .= '<td class="right">'.dol_print_date($db->jdate($obj->df), 'day').'</td>';
+		$result .= '<td class="right">'.price($obj->total_ttc).'</td>';
+
+		$result .= '</tr>';
+
+		$i++;
+		$total += $obj->total_ttc;
+	}
+
+	if ($num > $nbofloop)
+	{
+		$result .= '<tr class="liste_total">';
+		$result .= '<td colspan="4" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
+		$result .= '</tr>';
+	}
+	elseif ($total > 0)
+	{
+		$result .= '<tr class="liste_total">';
+		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
+		$result .= '<td align="right">'.price($total).'</td>';
+		$result .= '<td>&nbsp;</td>';
+		$result .= '</tr>';
+	}
+
+	$result .= '</table>';
+	$result .= '</div>';
+	return $result;
+}
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0ebfd024658..2a63e040434 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -49,7 +49,7 @@ if (!$user->rights->fournisseur->facture->lire) accessforbidden();
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'bills', 'companies', 'projects'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -67,7 +67,7 @@ if ($user->socid > 0)
 	$socid = $user->socid;
 }
 
-$mode = GETPOST("mode");
+$mode = GETPOST("mode", 'aZ09');
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_label = GETPOST("search_label", "alpha");
@@ -92,9 +92,10 @@ $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat',
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $search_status = GETPOST('search_status', 'int');
 $search_paymentmode = GETPOST('search_paymentmode', 'int');
+$search_paymentcond = GETPOST('search_paymentcond', 'int');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
-$search_state = trim(GETPOST("search_state"));
+$search_state = GETPOST("search_state");
 $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_user = GETPOST('search_user', 'int');
@@ -165,12 +166,13 @@ $arrayfields = array(
 	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
 	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
 	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-	'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
-	'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1),
-	'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0),
-	'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj == "1"),
-	'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj == "1"),
-	'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0),
+	'f.fk_cond_reglement'=>array('label'=>$langs->trans("PaymentTerm"), 'checked'=>1, 'position'=>50),
+	'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1, 'position'=>52),
+	'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1, 'position'=>105),
+	'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0, 'position'=>110),
+	'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj == "1", 'position'=>95),
+	'f.total_localtax2'=>array('label'=>$langs->transcountry("AmountLT2", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax2_assuj == "1", 'position'=>100),
+	'f.total_ttc'=>array('label'=>$langs->trans("AmountTTC"), 'checked'=>0, 'position'=>115),
 	'u.login'=>array('label'=>"Author", 'checked'=>1),
 	'dynamount_payed'=>array('label'=>$langs->trans("Payed"), 'checked'=>0),
 	'rtp'=>array('label'=>$langs->trans("Rest"), 'checked'=>0),
@@ -240,6 +242,7 @@ if (empty($reshook))
 		$search_multicurrency_montant_ttc = '';
 		$search_status = '';
 		$search_paymentmode = '';
+		$search_paymentcond = '';
 		$search_town = '';
 		$search_zip = "";
 		$search_state = "";
@@ -318,6 +321,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 if (!$search_all) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
 if ($search_all || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det as pd ON f.rowid=pd.fk_facture_fourn';
 if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON f.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -326,7 +330,6 @@ if ($search_user > 0)
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON f.fk_user_author = u.rowid';
 $sql .= ' WHERE f.fk_soc = s.rowid';
 $sql .= ' AND f.entity IN ('.getEntity('facture_fourn').')';
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -367,7 +370,8 @@ if ($search_multicurrency_montant_vat != '') $sql .= natural_search('f.multicurr
 if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
 if ($search_login) $sql .= natural_search('u.login', $search_login);
 if ($search_status != '' && $search_status >= 0) $sql .= " AND f.fk_statut = ".$db->escape($search_status);
-if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
+if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".((int) $search_paymentmode);
+if ($search_paymentcond > 0) $sql .= " AND f.fk_cond_reglement = ".((int) $search_paymentcond);
 $sql .= dolSqlDateFilter("f.datef", $day, $month, $year);
 $sql .= dolSqlDateFilter("f.date_lim_reglement", $day_lim, $month_lim, $year_lim);
 if ($option == 'late') $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
@@ -385,7 +389,7 @@ if ($filter && $filter != -1)
 		$sql .= ' AND '.$db->escape(trim($filt[0])).' = '.$db->escape(trim($filt[1]));
 	}
 }
-if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
+if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 if ($search_user > 0)
 {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='invoice_supplier' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
@@ -415,9 +419,7 @@ if (!$search_all)
 			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ",ef.".$key : '');
 		}
 	}
-}
-else
-{
+} else {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 
@@ -510,11 +512,9 @@ if ($resql)
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-	$newcardbutton = '';
-	if ($user->rights->fournisseur->facture->creer)
-	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/fourn/facture/card.php?action=create');
-	}
+	$url = DOL_URL_ROOT.'/fourn/facture/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', $user->rights->fournisseur->facture->creer);
 
 	$i = 0;
 	print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -599,7 +599,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -724,11 +724,18 @@ if ($resql)
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
 		print '</td>';
 	}
+	// Condition of payment
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		$form->select_conditions_paiements($search_paymentcond, 'search_paymentcond', -1, 1, 1, 'maxwidth100');
+		print '</td>';
+	}
 	// Payment mode
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
 		print '<td class="liste_titre left">';
-		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10);
+		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 20, 1, 'maxwidth100');
 		print '</td>';
 	}
 	if (!empty($arrayfields['f.total_ht']['checked']))
@@ -877,6 +884,7 @@ if ($resql)
 	if (!empty($arrayfields['state.nom']['checked']))            print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_cond_reglement", "", $param, "", $sortfield, $sortorder);
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
 	if (!empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -1100,6 +1108,14 @@ if ($resql)
 				if (!$i) $totalarray['nbfield']++;
 			}
 
+			// Payment condition
+			if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
+			{
+				print '<td>';
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', '', -1);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
 			// Payment mode
 			if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 			{
@@ -1302,9 +1318,7 @@ if ($resql)
     $title = '';
 
     print $formfile->showdocuments('massfilesarea_supplier_invoice', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 48d84a3161b..57a0cd103ab 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("bills", "companies"));
 
 $id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('facid', 'int'));
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index e26357bd4ca..8c2fdbdb5b6 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -129,7 +129,8 @@ if (empty($reshook))
 	    $datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 	    $paiement_id = 0;
 	    $totalpayment = 0;
-	    $atleastonepaymentnotnull = 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);
@@ -138,7 +139,7 @@ if (empty($reshook))
 	        if (substr($key, 0, 7) == 'amount_')
 	        {
 	            $cursorfacid = substr($key, 7);
-	            $amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
+	            $amounts[$cursorfacid] = price2num(GETPOST($key));
 	            if (!empty($amounts[$cursorfacid])) {
 	            	$atleastonepaymentnotnull++;
 	            	if (is_numeric($amounts[$cursorfacid])) {
@@ -168,11 +169,10 @@ if (empty($reshook))
 	            }
 
 	            $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-	        }
-			elseif (substr($key, 0, 21) == 'multicurrency_amount_')
+	        } elseif (substr($key, 0, 21) == 'multicurrency_amount_')
 			{
 				$cursorfacid = substr($key, 21);
-	            $multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
+	            $multicurrency_amounts[$cursorfacid] = (GETPOST($key) ? price2num(GETPOST($key)) : 0);
 	            $multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
 	            if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
 	            $result = $tmpinvoice->fetch($cursorfacid);
@@ -301,9 +301,7 @@ if (empty($reshook))
 
 	        $paiement->num_payment  = GETPOST('num_paiement', 'alphanohtml');
 	        $paiement->note_private = GETPOST('comment', 'alpha');
-	        $paiement->num_paiement = $paiement->num_payment; // For backward compatibility
 	        $paiement->num_payment = $paiement->num_payment;
-	        $paiement->note         = $paiement->note_private; // For backward compatibility
 	        $paiement->note_private = $paiement->note_private;
 
 	        if (!$error)
@@ -345,9 +343,7 @@ if (empty($reshook))
 	            else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
 	            header('Location: '.$loc);
 	            exit;
-	        }
-	        else
-	        {
+	        } else {
 	            $db->rollback();
 	        }
 	    }
@@ -497,9 +493,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 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
-            {
+            } 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>';
@@ -531,9 +525,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	            if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
 	            {
 	                $sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
-	            }
-	            else
-	            {
+	            } else {
 	                $sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
 	            }
                 // Group by because we have a total
@@ -627,9 +619,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        {
 	                            print '<td class="center nowraponall">';
 	                            print dol_print_date($db->jdate($objp->df), 'day').'</td>';
-	                        }
-	                        else
-	                        {
+	                        } else {
 	                            print '<td class="center"><b>!!!</b></td>';
 	                        }
 
@@ -645,9 +635,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                            }
 
 	                            print '</td>';
-	                        }
-	                        else
-	                        {
+	                        } else {
 	                            print '<td class="center"><b>--</b></td>';
 	                        }
 
@@ -700,9 +688,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                        		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
-	                        {
+	                        } 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)).'">';
 	                        }
@@ -725,9 +711,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 											print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
 											print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
 											print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
-									}
-									else
-									{
+									} else {
 										print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
 										print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
 									}
@@ -767,9 +751,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	                    print "</div>";
 	                }
 	                $db->free($resql);
-	            }
-	            else
-	            {
+	            } else {
 	                dol_print_error($db);
 	            }
 			}
@@ -802,259 +784,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
             print '</form>';
         }
-    }
-    else dol_print_error($db);
-}
-
-/*
- * Show list
- */
-if (empty($action) || $action == 'list')
-{
-    $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-    $sortfield = GETPOST("sortfield", 'alpha');
-    $sortorder = GETPOST("sortorder", 'alpha');
-    $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-    if (empty($page) || $page == -1) { $page = 0; }
-    $offset = $limit * $page;
-    $pageprev = $page - 1;
-    $pagenext = $page + 1;
-    if (!$sortorder) $sortorder = 'DESC';
-    if (!$sortfield) $sortfield = 'p.datep';
-
-    $sql = 'SELECT p.rowid as pid, p.ref, p.datep as dp, p.amount as pamount, p.num_paiement,';
-    $sql .= ' s.rowid as socid, s.nom as name,';
-    $sql .= ' c.code as paiement_type, c.libelle as paiement_libelle,';
-    $sql .= ' ba.rowid as bid, ba.label,';
-    if (!$user->rights->societe->client->voir) $sql .= ' sc.fk_soc, sc.fk_user,';
-    $sql .= ' SUM(pf.amount)';
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn AS p';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid=pf.fk_paiementfourn';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid=pf.fk_facturefourn';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-    if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    $sql .= " WHERE f.entity = ".$conf->entity;
-    if (!$user->rights->societe->client->voir) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    if ($socid > 0) $sql .= ' AND f.fk_soc = '.$socid;
-    $sql .= dolSqlDateFilter('p.datep', $day, $month, $year);
-    if ($search_ref)       		    $sql .= natural_search('p.rowid', $search_ref);
-    if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
-    if ($search_paymenttype != "")  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
-    if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
-    if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
-    if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-    $sql .= " GROUP BY p.rowid, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, c.code, c.libelle, ba.rowid, ba.label";
-    if (!$user->rights->societe->client->voir) $sql .= ", sc.fk_soc, sc.fk_user";
-    // Add where from extra fields
-
-    $sql .= $db->order($sortfield, $sortorder);
-
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    {
-        $result = $db->query($sql);
-        $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-        {
-        	$page = 0;
-        	$offset = 0;
-        }
-    }
-
-    $sql .= $db->plimit($limit + 1, $offset);
-
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-
-        $param = '';
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-        if ($day)                   $param .= ($day ? "&day=".urlencode($day) : "");
-        if ($month)                 $param .= ($month ? "&month=".urlencode($month) : "");
-        if ($year)                  $param .= ($year ? "&year=".urlencode($year) : "");
-        if ($search_ref)            $param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : "");
-        if ($search_company)        $param .= ($search_company ? "&search_company=".urlencode($search_company) : "");
-        if ($search_amount != '')   $param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : "");
-        if ($search_payment_num)    $param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : "");
-    	if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
-    	// Add $param from extra fields
-    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-
-    	$massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
-
-        print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-        if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="list">';
-        print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-        print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-        print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-        print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'supplier_invoice', 0, '', '', $limit, 0, 0, 1);
-
-        $moreforfilter = '';
-
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-    	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-    	else $moreforfilter = $hookmanager->resPrint;
-
-        if ($moreforfilter)
-        {
-       		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-            print $moreforfilter;
-            print '</div>';
-        }
-
-        $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-        $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-
-        print '<div class="div-table-responsive">';
-        print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-        // Lines for filters fields
-        print '<tr class="liste_titre_filter">';
-        print '<td  class="liste_titre left">';
-        print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-        print '</td>';
-        print '<td class="liste_titre center">';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-        $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-        print '</td>';
-        print '<td class="liste_titre">';
-        print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
-        print '</td>';
-        print '<td class="liste_titre">';
-        $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
-        print '</td>';
-        print '<td class="liste_titre">';
-        print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
-        print '</td>';
-        if (!empty($conf->banque->enabled))
-        {
-            print '<td class="liste_titre">';
-	        $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	        print '</td>';
-        }
-        print '<td class="liste_titre right">';
-        print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
-        print '</td>';
-        print '<td class="liste_titre maxwidthsearch">';
-        $searchpicto = $form->showFilterAndCheckAddButtons(0);
-        print $searchpicto;
-        print '</td>';
-        print "</tr>\n";
-
-        print '<tr class="liste_titre">';
-        print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], 'p.rowid', '', $param, '', $sortfield, $sortorder);
-        print_liste_field_titre("Date", $_SERVER["PHP_SELF"], 'dp', '', $param, '', $sortfield, $sortorder, 'center ');
-        print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
-        print_liste_field_titre("Type", $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
-        print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "p.num_paiement", "", $param, "", $sortfield, $sortorder);
-        if (!empty($conf->banque->enabled))
-        {
-            print_liste_field_titre("Account", $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
-        }
-        print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'p.amount', '', $param, '', $sortfield, $sortorder, 'right ');
-
-        $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-        $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-
-        print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-        print "</tr>\n";
-
-        $paymentfournstatic = new PaiementFourn($db);
-
-        $i = 0;
-        $totalarray = array();
-        while ($i < min($num, $limit))
-        {
-            $objp = $db->fetch_object($resql);
-
-            $paymentfournstatic->id = $objp->pid;
-            $paymentfournstatic->ref = $objp->ref;
-            $paymentfournstatic->datepaye = $objp->dp;
-
-            print '<tr class="oddeven">';
-
-            // Ref payment
-            print '<td class="nowrap">';
-            print $paymentfournstatic->getNomUrl(1);
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-
-            // Date
-            $dateformatforpayment = 'day';
-            if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
-            print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->dp), $dateformatforpayment)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-
-            // Thirdparty
-            print '<td>';
-            if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.dol_trunc($objp->name, 32).'</a>';
-            else print '&nbsp;';
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-
-            // Type
-            $payment_type = $langs->trans("PaymentType".$objp->paiement_type) != ("PaymentType".$objp->paiement_type) ? $langs->trans("PaymentType".$objp->paiement_type) : $objp->paiement_libelle;
-            print '<td>'.$payment_type.' '.dol_trunc($objp->num_paiement, 32)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-
-            // Payment number
-            print '<td>'.$objp->num_paiement.'</td>';
-            if (!$i) $totalarray['nbfield']++;
-
-            // Account
-            if (!empty($conf->banque->enabled))
-            {
-                print '<td>';
-	            if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'</a>';
-    	        else print '&nbsp;';
-        	    print '</td>';
-            	if (!$i) $totalarray['nbfield']++;
-            }
-
-            // Amount
-            print '<td class="right">'.price($objp->pamount).'</td>';
-            if (!$i) $totalarray['nbfield']++;
-            if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'amount';
-            $totalarray['val']['amount'] += $objp->pamount;
-
-            // Ref invoice
-            /*$invoicesupplierstatic->ref=$objp->ref_supplier;
-            $invoicesupplierstatic->id=$objp->facid;
-            print '<td class="nowrap">';
-            print $invoicesupplierstatic->getNomUrl(1);
-            print '</td>';*/
-
-			print '<td></td>';
-			if (!$i) $totalarray['nbfield']++;
-
-            print '</tr>';
-            $i++;
-        }
-
-        // Show total line
-        include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-        print "</table>";
-        print "</div>";
-        print "</form>\n";
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+    } else dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index f0bf2d85dd1..1c068e19b7d 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2017		ATM-Consulting  	 <support@atm-consulting.fr>
+ * Copyright (C) 2020		Maxime DEMAREST  	 <maxime@indelog.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
@@ -24,6 +25,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/rapport/pdf_paiement_fourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 $langs->loadLangs(array('bills'));
@@ -45,7 +47,7 @@ if ($user->socid > 0)
 $dir = $conf->fournisseur->facture->dir_output.'/payments';
 if (!$user->rights->societe->client->voir || $socid) $dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
 
-$year = $_GET["year"];
+$year = GETPOST("year", 'int');
 if (!$year) { $year = date("Y"); }
 
 
@@ -67,17 +69,15 @@ if ($action == 'builddoc')
     // 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)
+    if ($rap->write_file($dir, GETPOST("remonth", 'int'), GETPOST("reyear", 'int'), $outputlangs) > 0)
     {
         $outputlangs->charset_output = $sav_charset_output;
-    }
-    else
-    {
+    } else {
         $outputlangs->charset_output = $sav_charset_output;
         dol_print_error($db, $obj->error);
     }
 
-    $year = $_POST["reyear"];
+    $year = GETPOST("reyear", 'int');
 }
 
 
@@ -86,6 +86,7 @@ if ($action == 'builddoc')
  */
 
 $formother = new FormOther($db);
+$formfile = new FormFile($db);
 
 $titre = ($year ? $langs->trans("PaymentsReportsForYear", $year) : $langs->trans("PaymentsReports"));
 
@@ -157,7 +158,7 @@ if ($year)
                 {
                     $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></td>';
+                    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>';
                 }
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 1b85082616a..0826a4ab200 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -59,9 +59,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 				// If not abandonned
     			$total = $total + $sign * $objectlink->total_ht;
     			echo price($objectlink->total_ht);
-    		}
-    		else
-    		{
+    		} else {
     			echo '<strike>'.price($objectlink->total_ht).'</strike>';
     		}
     	} ?></td>
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 31638abf848..5d82021bf3c 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -89,9 +89,7 @@ if ($resql)
 	print "</table>";
 	print "<br>\n";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -210,9 +208,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			print "<br>\n";
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -264,9 +260,7 @@ if ($resql)
 	print "</table>\n";
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index e100fb3631d..82c6e1d18d3 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -54,14 +54,12 @@ if ($action == 'setnote' && $user->rights->fournisseur->facture->creer)
 	$db->begin();
 
 	$object->fetch($id);
-	$result = $object->update_note(GETPOST('note', 'none'));
+	$result = $object->update_note(GETPOST('note', 'restricthtml'));
 	if ($result > 0)
 	{
 		$db->commit();
 		$action = '';
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -76,11 +74,9 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
 	if ($result > 0)
 	{
 		$db->commit();
-		header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php');
+		header('Location: '.DOL_URL_ROOT.'/fourn/paiement/list.php');
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -99,9 +95,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' &&
 		$db->commit();
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	}
@@ -114,9 +108,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
@@ -129,9 +121,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 	if ($res === 0)
 	{
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
@@ -176,7 +166,7 @@ if ($result > 0)
 		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide');
 	}
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/paiement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
@@ -199,7 +189,7 @@ if ($result > 0)
 	// Payment mode
 	$labeltype = $langs->trans("PaymentType".$object->type_code) != ("PaymentType".$object->type_code) ? $langs->trans("PaymentType".$object->type_code) : $object->type_label;
 	print '<tr><td colspan="2">'.$langs->trans('PaymentMode').'</td><td colspan="3">'.$labeltype;
-	print $object->num_paiement ? ' - '.$object->num_paiement : '';
+	print $object->num_payment ? ' - '.$object->num_payment : '';
 	print '</td></tr>';
 
 	// Payment numero
@@ -261,9 +251,10 @@ if ($result > 0)
 	print '<br>';
 
 	/**
-	 *	Liste des factures
+	 *	List of vendor invoices
 	 */
-	$sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom as name, s.rowid as socid';
+	$sql = 'SELECT f.rowid, f.rowid as facid, f.ref, f.ref_supplier, f.type, f.paye, f.total_ht, f.total_tva, f.total_ttc, f.datef as date, f.fk_statut as status,';
+	$sql .= ' pf.amount, s.nom as name, s.rowid as socid';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
 	$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
 	$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
@@ -295,6 +286,13 @@ if ($result > 0)
 
 				$facturestatic->id = $objp->facid;
 				$facturestatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
+				$facturestatic->date = $db->jdate($objp->date);
+				$facturestatic->type = $objp->type;
+				$facturestatic->total_ht = $objp->total_ht;
+				$facturestatic->total_tva = $objp->total_tva;
+				$facturestatic->total_ttc = $objp->total_ttc;
+				$facturestatic->statut = $objp->status;
+				$facturestatic->alreadypaid = -1;	// unknown
 
 				print '<tr class="oddeven">';
 				// Ref
@@ -310,7 +308,7 @@ if ($result > 0)
 				// Payed
 				print '<td class="right">'.price($objp->amount).'</td>';
 				// Status
-				print '<td class="right">'.$facturestatic->LibStatut($objp->paye, $objp->fk_statut, 6, 1).'</td>';
+				print '<td class="right">'.$facturestatic->LibStatut($objp->paye, $objp->status, 6, 1).'</td>';
 				print "</tr>\n";
 
 				if ($objp->paye == 1)
@@ -326,9 +324,7 @@ if ($result > 0)
 
 		print "</table>\n";
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -357,10 +353,8 @@ if ($result > 0)
 		{
 			if ($allow_delete)
 			{
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-			}
-			else
-			{
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
 			}
 		}
@@ -381,7 +375,7 @@ if ($result > 0)
 		$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
 		$genallowed = $user->rights->fournisseur->facture->lire;
 		$delallowed = $user->rights->fournisseur->facture->creer;
-		$modelpdf = (!empty($object->modelpdf) ? $object->modelpdf : (empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF) ? '' : $conf->global->SUPPLIER_PAYMENT_ADDON_PDF));
+		$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF) ? '' : $conf->global->SUPPLIER_PAYMENT_ADDON_PDF));
 
 		print $formfile->showdocuments('supplier_payment', $ref, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 40, 0, '', '', '', $societe->default_lang);
 		$somethingshown = $formfile->numoffiles;
@@ -397,9 +391,7 @@ if ($result > 0)
 	*/
 
 	print '</div></div></div>';
-}
-else
-{
+} else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
new file mode 100644
index 00000000000..0310a75fe57
--- /dev/null
+++ b/htdocs/fourn/paiement/list.php
@@ -0,0 +1,446 @@
+<?php
+/* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
+ * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
+ * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2018		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file		htdocs/fourn/paiment/list.php
+*	\ingroup	fournisseur,facture
+ *	\brief		Payment list for supplier invoices
+ */
+
+require '../../main.inc.php';
+
+// Security check
+if ($user->socid) $socid = $user->socid;
+
+// doesn't work :-(
+// restrictedArea($user, 'fournisseur');
+
+// doesn't work :-(
+// require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+// $object = new PaiementFourn($db);
+// restrictedArea($user, $object->element);
+
+if (!$user->rights->fournisseur->facture->lire) {
+	accessforbidden();
+}
+
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
+
+$action					= GETPOST('action', 'alpha');
+$massaction				= GETPOST('massaction', 'alpha');
+$optioncss				= GETPOST('optioncss', 'alpha');
+$contextpage			= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
+
+$socid					= GETPOST('socid', 'int');
+
+$search_ref				= GETPOST('search_ref', 'alpha');
+$search_day				= GETPOST('search_day', 'int');
+$search_month			= GETPOST('search_month', 'int');
+$search_year			= GETPOST('search_year', 'int');
+$search_company			= GETPOST('search_company', 'alpha');
+$search_payment_type	= GETPOST('search_payment_type');
+$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
+$search_bank_account	= GETPOST('search_bank_account', 'int');
+$search_amount			= GETPOST('search_amount', 'alpha');		// alpha because we must be able to search on '< x'
+
+$limit					= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield				= GETPOST('sortfield', 'alpha');
+$sortorder				= GETPOST('sortorder', 'alpha');
+$page					= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+
+if (empty($page) || $page == -1) $page = 0;		// If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "p.datep";
+
+$search_all = trim(GETPOSTISSET("search_all") ? GETPOSTISSET("search_all", 'alpha') : GETPOST('sall'));
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'p.ref'=>"RefPayment",
+	's.nom'=>"ThirdParty",
+	'p.num_paiement'=>"Numero",
+	'p.amount'=>"Amount",
+);
+
+$arrayfields = array(
+	'p.ref'				=>array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
+	'p.datep'			=>array('label'=>"Date", 'checked'=>1, 'position'=>20),
+	's.nom'				=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
+	'c.libelle'			=>array('label'=>"Type", 'checked'=>1, 'position'=>40),
+	'p.num_paiement'	=>array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
+	'ba.label'			=>array('label'=>"Account", 'checked'=>1, 'position'=>60, 'enable'=>(!empty($conf->banque->enabled))),
+	'p.amount'			=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('paymentsupplierlist'));
+$object = new PaiementFourn($db);
+
+/*
+* Actions
+*/
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {	// All tests are required to be compatible with all browsers
+		$search_ref = '';
+		$search_day = '';
+		$search_month = '';
+		$search_year = '';
+		$search_company = '';
+		$search_payment_type = '';
+		$search_cheque_num = '';
+		$search_bank_account = '';
+		$search_amount = '';
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans('ListPayment'));
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$companystatic = new Societe($db);
+$paymentfournstatic = new PaiementFourn($db);
+
+$sql = 'SELECT p.rowid, p.ref, p.datep, p.amount as pamount, p.num_paiement';
+$sql .= ', s.rowid as socid, s.nom as name, s.email';
+$sql .= ', c.code as paiement_type, c.libelle as paiement_libelle';
+$sql .= ', ba.rowid as bid, ba.label';
+if (!$user->rights->societe->client->voir) $sql .= ', sc.fk_soc, sc.fk_user';
+$sql .= ', SUM(pf.amount)';
+
+$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn AS p';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid=pf.fk_paiementfourn';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid=pf.fk_facturefourn';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+if (!$user->rights->societe->client->voir) $sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
+
+$sql .= ' WHERE f.entity = '.$conf->entity;
+if (!$user->rights->societe->client->voir) $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
+if ($socid > 0) $sql .= ' AND f.fk_soc = '.$socid;
+if ($search_ref)				$sql .= natural_search('p.ref', $search_ref);
+$sql .= dolSqlDateFilter('p.datep', $search_day, $search_month, $search_year);
+if ($search_company)			$sql .= natural_search('s.nom', $search_company);
+if ($search_payment_type != '')	$sql .= " AND c.code='".$db->escape($search_payment_type)."'";
+if ($search_cheque_num != '')	$sql .= natural_search('p.num_paiement', $search_cheque_num);
+if ($search_amount)				$sql .= natural_search('p.amount', $search_amount, 1);
+if ($search_bank_account > 0)	$sql .= ' AND b.fk_account='.$search_bank_account."'";
+
+if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+
+$sql .= ' GROUP BY p.rowid, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, c.code, c.libelle, ba.rowid, ba.label';
+if (!$user->rights->societe->client->voir) $sql .= ', sc.fk_soc, sc.fk_user';
+
+$sql .= $db->order($sortfield, $sortorder);
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords) {		// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
+}
+
+$num = $db->num_rows($resql);
+$i = 0;
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($optioncss != '')		$param .= '&optioncss='.urlencode($optioncss);
+
+if ($search_ref)			$param .= '&search_ref='.urlencode($search_ref);
+if ($saerch_day)			$param .= '&search_day='.urlencode($search_day);
+if ($saerch_month)			$param .= '&search_month='.urlencode($search_month);
+if ($search_year)			$param .= '&search_year='.urlencode($search_year);
+if ($search_company)		$param .= '&search_company='.urlencode($search_company);
+if ($search_payment_type)	$param .= '&search_company='.urlencode($search_payment_type);
+if ($search_cheque_num)		$param .= '&search_cheque_num='.urlencode($search_cheque_num);
+if ($search_amount)			$param .= '&search_amount='.urlencode($search_amount);
+
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'supplier_invoice', 0, '', '', $limit, 0, 0, 1);
+
+if ($search_all)
+{
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+if ($moreforfilter) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
+
+print '<tr class="liste_titre_filter">';
+
+// Filter: Ref
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td  class="liste_titre left">';
+	print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Date
+if (!empty($arrayfields['p.datep']['checked'])) {
+	print '<td class="liste_titre center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
+	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
+	$formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5);
+	print '</td>';
+}
+
+// Filter: Thirdparty
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+	print '</td>';
+}
+
+// Filter: Payment type
+if (!empty($arrayfields['c.libelle']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_types_paiements($search_payment_type, 'search_payment_type', '', 2, 1, 1);
+	print '</td>';
+}
+
+// Filter: Cheque number (fund transfer)
+if (!empty($arrayfields['p.num_paiement']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="4" name="search_cheque_num" value="'.dol_escape_htmltag($search_cheque_num).'">';
+	print '</td>';
+}
+
+// Filter: Bank account
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_bank_account, 'search_bank_account', 0, '', 1);
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['p.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Buttons
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print '</tr>';
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.rowid', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.datep']['checked']))				print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['s.nom']['checked']))				print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['c.libelle']['checked']))			print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.num_paiement']['checked']))		print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
+if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.amount']['checked']))			print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], 'p.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print '</tr>';
+
+$checkedCount = 0;
+foreach ($arrayfields as $column) {
+	if ($column['checked']) {
+		$checkedCount++;
+	}
+}
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit)) {
+	$objp = $db->fetch_object($resql);
+
+	$paymentfournstatic->id = $objp->rowid;
+	$paymentfournstatic->ref = $objp->ref;
+	$paymentfournstatic->datepaye = $objp->datep;
+
+	$companystatic->id = $objp->socid;
+	$companystatic->name = $objp->name;
+	$companystatic->email = $objp->email;
+
+	print '<tr class="oddeven">';
+
+	// No
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td class="nowrap">'.$paymentfournstatic->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date
+	if (!empty($arrayfields['p.datep']['checked'])) {
+		$dateformatforpayment = 'day';
+		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
+		print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Thirdparty
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print '<td>';
+		if ($objp->socid > 0) {
+			print $companystatic->getNomUrl(1, '', 24);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Pyament type
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		$payment_type = $langs->trans("PaymentType".$objp->paiement_type) != ("PaymentType".$objp->paiement_type) ? $langs->trans("PaymentType".$objp->paiement_type) : $objp->paiement_libelle;
+		print '<td>'.$payment_type.' '.dol_trunc($objp->num_paiement, 32).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Cheque number (fund transfer)
+	if (!empty($arrayfields['p.num_paiement']['checked'])) {
+		print '<td>'.$objp->num_paiement.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Account
+	if (!empty($arrayfields['ba.label']['checked']))
+	{
+		print '<td>';
+		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'</a>';
+		else print '&nbsp;';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	if (!empty($arrayfields['p.amount']['checked'])) {
+		print '<td class="right">'.price($objp->pamount).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		$totalarray['pos'][$checkedCount] = 'amount';
+		$totalarray['val']['amount'] += $objp->pamount;
+	}
+
+	// Buttons
+	print '<td></td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>';
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print '</table>';
+print '</div>';
+print '</form>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 5e83ae93923..e3d2b5b91d2 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -43,8 +43,8 @@ $optioncss = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -127,7 +127,7 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 
-$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type, p.entity,";
+$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type, p.entity, tosell, tobuy,";
 $sql .= " ppf.fk_soc, ppf.ref_fourn, ppf.price as price, ppf.quantity as qty, ppf.unitprice,";
 $sql .= " s.rowid as socid, s.nom as name";
 // Add fields to SELECT from hooks
@@ -296,6 +296,8 @@ if ($resql)
 		$productstatic->ref = $objp->ref;
 		$productstatic->type = $objp->fk_product_type;
 		$productstatic->entity = $objp->entity;
+		$productstatic->status = $objp->tosell;
+		$productstatic->status_buy = $objp->tobuy;
 		print $productstatic->getNomUrl(1, 'supplier');
 		print '</td>';
 
@@ -331,9 +333,7 @@ if ($resql)
 	print "</table>";
 
 	print '</form>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 8cda5a20d98..540ed1cbc18 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -173,23 +173,17 @@ if ($socid > 0)
                     }
 
                     $db->free($resqlp);
-                }
-                else
-                {
+                } else {
                     dol_print_error($db);
                 }
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
         print "</table>";
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 39f5cc61bd2..70a96546fc2 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -33,7 +33,7 @@ if (!$user->admin) accessforbidden();
 $def = array();
 $lastftpentry = 0;
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $entry = GETPOST('numero_entry', 'alpha');
 
 
@@ -50,9 +50,7 @@ if ($result)
 	$obj = $db->fetch_object($result);
 	preg_match('/([0-9]+)$/i', $obj->name, $reg);
 	if ($reg[1]) $lastftpentry = $reg[1];
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -96,9 +94,7 @@ if ($action == 'add' || GETPOST('modify', 'alpha'))
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			dol_print_error($db);
 		}
@@ -123,9 +119,7 @@ if (GETPOST('delete', 'alpha'))
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else
-        {
+        } else {
             $db->rollback();
             dol_print_error($db);
         }
@@ -148,9 +142,7 @@ print '<br>';
 if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else
-{
+} else {
 	// Formulaire ajout
 	print '<form name="ftpconfig" action="ftpclient.php" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -300,9 +292,7 @@ else
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 0c7f8409992..7c0eab0f352 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -87,7 +87,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	$result = $ecmdir->fetch($_REQUEST["section"]);
+	$result = $ecmdir->fetch(GETPOST("section", 'int'));
 	if (!$result > 0)
 	{
 		dol_print_error($db, $ecmdir->error);
@@ -102,8 +102,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 		if (is_numeric($resupload) && $resupload > 0)
 		{
 			$result = $ecmdir->changeNbOfFiles('+');
-		}
-		else {
+		} else {
 			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
@@ -111,15 +110,12 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
                 // Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-			}
-			else	// Known error
+			} else // Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
@@ -129,25 +125,23 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 // Action ajout d'un rep
 if ($action == 'add' && $user->rights->ftp->setup)
 {
-	$ecmdir->ref                = $_POST["ref"];
-	$ecmdir->label              = $_POST["label"];
-	$ecmdir->description        = $_POST["desc"];
+	$ecmdir->ref                = GETPOST("ref");
+	$ecmdir->label              = GETPOST("label");
+	$ecmdir->description        = GETPOST("desc");
 
 	$id = $ecmdir->create($user);
 	if ($id > 0)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
 		$action = "create";
 	}
 }
 
-// Remove file
-if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
+// Remove 1 file
+if ($action == 'confirm_deletefile' && GETPOST('confirm') == 'yes')
 {
 	// set up a connection or die
 	if (!$conn_id)
@@ -161,22 +155,30 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 
 	if ($conn_id && $ok && !$mesg)
 	{
+		$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
+		}
+
 	    $langs->load("other");
 
 		// Remote file
 		$filename = $file;
-		$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+		$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
 		$newremotefileiso = utf8_decode($remotefile);
 
 		//print "x".$newremotefileiso;
 		dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-		$result = @ftp_delete($conn_id, $newremotefileiso);
+		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+			$result = ssh2_sftp_unlink($conn_id, $newremotefileiso);
+		} else {
+			$result = @ftp_delete($conn_id, $newremotefileiso);
+		}
 		if ($result)
 		{
 			setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 			setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 		}
@@ -184,15 +186,13 @@ if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 		//ftp_close($conn_id);	Close later
 
 		$action = '';
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $mesg);
 	}
 }
 
 // Delete several lines at once
-if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("Delete"))
+if (GETPOST("const", 'array') && GETPOST("delete") && GETPOST("delete") == $langs->trans("Delete"))
 {
 	// set up a connection or die
 	if (!$conn_id)
@@ -206,7 +206,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 
 	if ($conn_id && $ok && !$mesg)
 	{
-		foreach ($_POST["const"] as $const)
+		foreach (GETPOST('const', 'array') as $const)
 		{
 			if ($const["check"])	// Is checkbox checked
 			{
@@ -214,20 +214,26 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 
 				// Remote file
 				$file = $const["file"];
-				$section = $const["section"];
-				$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$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
+				}
+				$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
 				$newremotefileiso = utf8_decode($remotefile);
 
 				//print "x".$newremotefileiso;
-				dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-				$result = @ftp_delete($conn_id, $newremotefileiso);
+				dol_syslog("ftp/index.php ftp_delete n files for ".$newremotefileiso);
+				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+					$result = ssh2_sftp_unlink($conn_id, $newremotefileiso);
+				} else {
+					$result = @ftp_delete($conn_id, $newremotefileiso);
+				}
 				if ($result)
 				{
 					setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
-				}
-				else
-				{
-					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
+				} else {
+					dol_syslog("ftp/index.php ftp_delete n files", LOG_ERR);
 					setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 				}
 
@@ -236,9 +242,7 @@ if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("De
 				$action = '';
 			}
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -258,27 +262,33 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes')
 
 	if ($conn_id && $ok && !$mesg)
 	{
+		$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
+		}
+
 		// Remote file
 		$filename = $file;
-		$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+		$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
 		$newremotefileiso = utf8_decode($remotefile);
 
-		$result = @ftp_rmdir($conn_id, $newremotefileiso);
+		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+			$result = ssh2_sftp_rmdir($conn_id, $newremotefileiso);
+		} else {
+			$result = @ftp_rmdir($conn_id, $newremotefileiso);
+		}
 		if ($result)
 		{
 			setEventMessages($langs->trans("DirWasRemoved", $file), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("FTPFailedToRemoveDir", $file), null, 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
 
 		$action = '';
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $mesg);
 	}
 }
@@ -301,12 +311,22 @@ if ($action == 'download')
 		// Local file
 		$localfile = tempnam($download_dir, 'dol_');
 
+		$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
+		}
+
 		// Remote file
 		$filename = $file;
-		$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+		$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
 		$newremotefileiso = utf8_decode($remotefile);
 
-		$result = ftp_get($conn_id, $localfile, $newremotefileiso, FTP_BINARY);
+		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+			$result = fopen('ssh2.sftp://' . intval($conn_id) . $newremotefileiso, 'r');
+		} else {
+			$result = ftp_get($conn_id, $localfile, $newremotefileiso, FTP_BINARY);
+		}
 		if ($result)
 		{
 			if (!empty($conf->global->MAIN_UMASK))
@@ -314,13 +334,13 @@ if ($action == 'download')
 
 			// Define mime type
 			$type = 'application/octet-stream';
-			if (!empty($_GET["type"])) $type = $_GET["type"];
-			else $type = dol_mimetype($original_file);
+			if (GETPOSTISSET("type")) $type = GETPOST("type");
+			else $type = dol_mimetype($file);
 
 			// Define attachment (attachment=true to force choice popup 'open'/'save as')
 			$attachment = true;
 
-			if ($encoding)   header('Content-Encoding: '.$encoding);
+			//if ($encoding)   header('Content-Encoding: '.$encoding);
 			if ($type)       header('Content-Type: '.$type);
 			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
 			else header('Content-Disposition: inline; filename="'.$filename.'"');
@@ -334,14 +354,10 @@ if ($action == 'download')
 			ftp_close($conn_id);
 
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $remotefile), null, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', $mesg);
 	}
 
@@ -398,21 +414,19 @@ print $langs->trans("FTPAreaDesc")."<br>";
 if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else
-{
+} else {
     if (!empty($ftp_server))
 	{
 		// Confirm remove file
 		if ($action == 'delete')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode(GETPOST('section')).'&file='.urlencode(GETPOST('file')), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
 		}
 
 		// Confirmation de la suppression d'une ligne categorie
 		if ($action == 'delete_section')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode(GETPOST('section')).'&file='.urlencode(GETPOST('file')), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 		}
 
 		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
@@ -455,12 +469,12 @@ else
 		print '<table width="100%" class="noborder">'."\n";
 
 		print '<tr class="liste_titre">'."\n";
-		print '<td class="liste_titre" class="left">'.$langs->trans("Content").'</td>'."\n";
-		print '<td class="liste_titre" class="center">'.$langs->trans("Size").'</td>'."\n";
-		print '<td class="liste_titre" class="center">'.$langs->trans("Date").'</td>'."\n";
-		print '<td class="liste_titre" class="center">'.$langs->trans("Owner").'</td>'."\n";
-		print '<td class="liste_titre" class="center">'.$langs->trans("Group").'</td>'."\n";
-		print '<td class="liste_titre" class="center">'.$langs->trans("Permissions").'</td>'."\n";
+		print '<td class="liste_titre left">'.$langs->trans("Content").'</td>'."\n";
+		print '<td class="liste_titre center">'.$langs->trans("Size").'</td>'."\n";
+		print '<td class="liste_titre center">'.$langs->trans("Date").'</td>'."\n";
+		print '<td class="liste_titre center">'.$langs->trans("Owner").'</td>'."\n";
+		print '<td class="liste_titre center">'.$langs->trans("Group").'</td>'."\n";
+		print '<td class="liste_titre center">'.$langs->trans("Permissions").'</td>'."\n";
 		print '<td class="liste_titre nowrap right">';
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
 		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section ? '&section='.urlencode($section) : '').'">'.img_picto($langs->trans("Refresh"), 'refresh').'</a>&nbsp;';
@@ -488,18 +502,20 @@ else
 			// List content of directory ($newsection = '/', '/home', ...)
 			if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 			{
-			    if ($newsection == '/') $newsection = '/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
+				if ($newsection == '/') {
+					//$newsection = '/./';
+					$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);
-			    //var_dump($dirHandle);
-                $contents = scandir('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
-    		{
+    		} else {
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
                 $contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
         		//var_dump($contents);
@@ -534,9 +550,7 @@ else
 				{
 					if (preg_match('/^d/', $vals[0])) $is_directory = 1;
 					if (preg_match('/^l/', $vals[0])) $is_link = 1;
-				}
-				else
-				{
+				} else {
 					// Remote file
 					$filename = $file;
 					//print "section=".$section.' file='.$file.'X';
@@ -556,7 +570,7 @@ else
 				$newsection = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
 				$newsection = preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@', '/', $newsection); // Change aaa/xxx/.. to new aaa
 				if ($is_directory) print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
-				print $file;
+				print dol_escape_htmltag($file);
 				if ($is_directory) print '</a>';
 				print '</td>';
 				// Size
@@ -581,25 +595,22 @@ else
 				print $vals[0];
 				print '</td>';
 				// Action
-				print '<td class="right" width="64" class="nowrap">';
+				print '<td class="right nowrap" width="64">';
 				if ($is_directory)
 				{
-					if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
+					if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&token='.newToken().'&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
 					else print '&nbsp;';
-				}
-				elseif ($is_link)
+				} elseif ($is_link)
 				{
 					$newfile = $file;
 					$newfile = preg_replace('/ ->.*/', '', $newfile);
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
-				}
-				else
-				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('', 'file').'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
+				} else {
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&token='.newToken().'&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('', 'file').'</a>';
 					print ' &nbsp; ';
 					print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
 					print ' &nbsp; ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
 					print '<input type="hidden" name="const['.$i.'][section]" value="'.$section.'">';
 					print '<input type="hidden" name="const['.$i.'][file]" value="'.$file.'">';
 				}
@@ -635,9 +646,7 @@ else
 		print '</div>';
 
 		print "</form>";
-	}
-	else
-	{
+	} else {
 		$foundsetup = false;
 		$MAXFTP = 20;
 		$i = 1;
@@ -655,9 +664,7 @@ else
 	    if (!$foundsetup)
 	    {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
-	    }
-	    else
-	    {
+	    } else {
 	        print $langs->trans("ChooseAFTPEntryIntoMenu");
 	    }
 	}
@@ -670,13 +677,10 @@ if ($conn_id)
 {
     if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
     {
-    }
-    elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
+    } elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
     {
         ftp_close($conn_id);
-    }
-    else
-    {
+    } else {
         ftp_close($conn_id);
     }
 }
@@ -714,18 +718,13 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 	if ($ok)
 	{
 		$connecttimeout = (empty($conf->global->FTP_CONNECT_TIMEOUT) ? 40 : $conf->global->FTP_CONNECT_TIMEOUT);
-		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
-		{
+		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);
-		}
-		elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL))
-		{
+		} 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);
-		}
-		else
-		{
+		} else {
 		    dol_syslog('Try to connect with ftp_connect');
 		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
 		}
@@ -735,6 +734,7 @@ 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
@@ -746,20 +746,18 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
 		                $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
-    				{
+    				} else {
+    					dol_syslog('Failed to connect to FTP with login '.$ftp_user, LOG_DEBUG);
     					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok = 0;
     				    $error++;
     				}
-				}
-				else
-				{
+				} else {
 				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
     				{
     					// Turn on passive mode transfers (must be after a successful login
@@ -768,18 +766,14 @@ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $sect
     					// Change the dir
     					$newsectioniso = utf8_decode($section);
     					ftp_chdir($conn_id, $newsectioniso);
-    				}
-    				else
-    				{
+    				} else {
     					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok = 0;
     				    $error++;
     				}
 				}
 			}
-		}
-		else
-		{
+		} else {
 		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
 			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
 			$ok = 0;
@@ -804,9 +798,7 @@ function ftp_isdir($connect_id, $dir)
 	{
 		ftp_cdup($connect_id);
 		return 1;
-	}
-	else
-	{
+	} else {
 		return 0;
 	}
 }
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 692b9639805..47f7744c5ae 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -69,20 +69,21 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 if (($id > 0) || $ref)
 {
-    $object->fetch($id, $ref);
+	$object->fetch($id, $ref);
 
-    // Check current user can read this leave request
-    $canread = 0;
-    if (!empty($user->rights->holiday->read_all)) $canread = 1;
-    if (!empty($user->rights->holiday->read) && in_array($object->fk_user, $childids)) $canread = 1;
-    if (!$canread)
-    {
-        accessforbidden();
-    }
+	// Check current user can read this leave request
+	$canread = 0;
+	if (!empty($user->rights->holiday->read_all)) $canread = 1;
+	if (!empty($user->rights->holiday->read) && in_array($object->fk_user, $childids)) $canread = 1;
+	if (!$canread)
+	{
+		accessforbidden();
+	}
 }
 
 $cancreate = 0;
-if (!empty($user->rights->holiday->write_all)) $cancreate = 1;
+
+if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance)) $cancreate = 1;
 if (!empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate = 1;
 
 $candelete = 0;
@@ -111,156 +112,166 @@ if (empty($reshook))
 			header("Location: ".$backtopage);
 			exit;
 		}
-	    $action = '';
+		$action = '';
 	}
 
-	// If create a request
-	if ($action == 'create')
+	// Add leave request
+	if ($action == 'add')
 	{
-	    // If no right to create a request
-	    if (!$cancreate)
-	    {
-	    	$error++;
-	    	setEventMessages($langs->trans('CantCreateCP'), null, 'errors');
-	    	$action = 'request';
-	    }
+		// If no right to create a request
+		if (!$cancreate)
+		{
+			$error++;
+			setEventMessages($langs->trans('CantCreateCP'), null, 'errors');
+			$action = 'create';
+		}
 
-	    if (!$error)
-	    {
-	        $object = new Holiday($db);
+		if (!$error)
+		{
+			$object = new Holiday($db);
 
-	    	$db->begin();
+			$db->begin();
 
-		    $date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
-		    $date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
-		    $date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
-		    $date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
-		    $starthalfday = GETPOST('starthalfday');
-		    $endhalfday = GETPOST('endhalfday');
-		    $type = GETPOST('type');
-		    $halfday = 0;
-		    if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday = 2;
-		    elseif ($starthalfday == 'afternoon') $halfday = -1;
-		    elseif ($endhalfday == 'morning') $halfday = 1;
+			$date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
+			$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
+			$date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
+			$date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
+			$starthalfday = GETPOST('starthalfday');
+			$endhalfday = GETPOST('endhalfday');
+			$type = GETPOST('type');
+			$halfday = 0;
+			if ($starthalfday == 'afternoon' && $endhalfday == 'morning') $halfday = 2;
+			elseif ($starthalfday == 'afternoon') $halfday = -1;
+			elseif ($endhalfday == 'morning') $halfday = 1;
 
-		    $valideur = GETPOST('valideur', 'int');
-		    $description = trim(GETPOST('description'));
+			$valideur = GETPOST('valideur', 'int');
+			$description = trim(GETPOST('description', 'restricthtml'));
 
-	    	// If no type
-		    if ($type <= 0)
-		    {
-		        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-		        $error++;
-		        $action = 'create';
-		    }
+			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
+			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) {
+				$error++;
+				setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
+			} else {
+				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
+					if (! in_array($fuserid, $childids)) {
+						$error++;
+						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+						$action = 'create';
+					}
+				}
+			}
 
-		    // If no start date
-		    if (empty($date_debut))
-		    {
-		        setEventMessages($langs->trans("NoDateDebut"), null, 'errors');
-		        $error++;
-		        $action = 'create';
-		    }
-		    // If no end date
-		    if (empty($date_fin))
-		    {
-		        setEventMessages($langs->trans("NoDateFin"), null, 'errors');
-		        $error++;
-		        $action = 'create';
-		    }
-		    // If start date after end date
-		    if ($date_debut > $date_fin)
-		    {
-		        setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors');
-		        $error++;
-		        $action = 'create';
-		    }
+			// If no type
+			if ($type <= 0)
+			{
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
 
-		    // Check if there is already holiday for this period
-		    $verifCP = $object->verifDateHolidayCP($fuserid, $date_debut, $date_fin, $halfday);
-		    if (!$verifCP)
-		    {
-		        setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
-		        $error++;
-		        $action = 'create';
-		    }
+			// If no start date
+			if (empty($date_debut))
+			{
+				setEventMessages($langs->trans("NoDateDebut"), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
+			// If no end date
+			if (empty($date_fin))
+			{
+				setEventMessages($langs->trans("NoDateFin"), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
+			// If start date after end date
+			if ($date_debut > $date_fin)
+			{
+				setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
 
-		    // If there is no Business Days within request
-		    $nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
-		    if ($nbopenedday < 0.5)
-		    {
-		        setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors');
-		        $error++;
-		        $action = 'create';
-		    }
+			// Check if there is already holiday for this period
+			$verifCP = $object->verifDateHolidayCP($fuserid, $date_debut, $date_fin, $halfday);
+			if (!$verifCP)
+			{
+				setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
 
-		    // If no validator designated
-		    if ($valideur < 1)
-		    {
-		        setEventMessages($langs->transnoentitiesnoconv('InvalidValidatorCP'), null, 'errors');
-		        $error++;
-		    }
+			// If there is no Business Days within request
+			$nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
+			if ($nbopenedday < 0.5)
+			{
+				setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors');		// No working day
+				$error++;
+				$action = 'create';
+			}
 
-		    $result = 0;
+			// If no validator designated
+			if ($valideur < 1)
+			{
+				setEventMessages($langs->transnoentitiesnoconv('InvalidValidatorCP'), null, 'errors');
+				$error++;
+			}
 
-		    if (!$error)
-		    {
-	    	    $object->fk_user = $fuserid;
-	    	    $object->description = $description;
-	    	    $object->fk_validator = $valideur;
-	    		$object->fk_type = $type;
-	    		$object->date_debut = $date_debut;
-	    		$object->date_fin = $date_fin;
-	    		$object->halfday = $halfday;
+			$result = 0;
 
-	    		$result = $object->create($user);
-	    		if ($result <= 0)
-	    		{
-	    			setEventMessages($object->error, $object->errors, 'errors');
-	    			$error++;
-	    		}
-		    }
+			if (!$error)
+			{
+				$object->fk_user = $fuserid;
+				$object->description = $description;
+				$object->fk_validator = $valideur;
+				$object->fk_type = $type;
+				$object->date_debut = $date_debut;
+				$object->date_fin = $date_fin;
+				$object->halfday = $halfday;
 
-		    // If no SQL error we redirect to the request card
-		    if (!$error)
-		    {
+				$result = $object->create($user);
+				if ($result <= 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
+			}
+
+			// If no SQL error we redirect to the request card
+			if (!$error)
+			{
 				$db->commit();
 
-		    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-		        exit;
-		    }
-		    else
-			{
-		    	$db->rollback();
-		    }
-	    }
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 
 	if ($action == 'update' && GETPOSTISSET('savevalidator') && !empty($user->rights->holiday->approve))
 	{
-	    $object->fetch($id);
+		$object->fetch($id);
 
-	    $object->oldcopy = dol_clone($object);
+		$object->oldcopy = dol_clone($object);
 
-	    $object->fk_validator = GETPOST('valideur', 'int');
+		$object->fk_validator = GETPOST('valideur', 'int');
 
-	    if ($object->fk_validator != $object->oldcopy->fk_validator)
-	    {
-	        $verif = $object->update($user);
+		if ($object->fk_validator != $object->oldcopy->fk_validator)
+		{
+			$verif = $object->update($user);
 
-	        if ($verif <= 0)
-	        {
-	            setEventMessages($object->error, $object->errors, 'warnings');
-	            $action = 'editvalidator';
-	        }
-	        else
-	        {
-	            header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	            exit;
-	        }
-	    }
+			if ($verif <= 0)
+			{
+				setEventMessages($object->error, $object->errors, 'warnings');
+				$action = 'editvalidator';
+			} else {
+				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+				exit;
+			}
+		}
 
-	    $action = '';
+		$action = '';
 	}
 
 	if ($action == 'update' && !GETPOSTISSET('savevalidator'))
@@ -276,60 +287,61 @@ if (empty($reshook))
 		elseif ($starthalfday == 'afternoon') $halfday = -1;
 		elseif ($endhalfday == 'morning') $halfday = 1;
 
-	    // If no right to modify a request
-	    if (!$user->rights->holiday->write)
-	    {
-	        header('Location: '.$_SERVER["PHP_SELF"].'?action=request&error=CantUpdate');
-	        exit;
-	    }
+		// If no right to modify a request
+		if (!$user->rights->holiday->write)
+		{
+			setEventMessages($langs->trans("CantUpdate"), null, 'errors');
+			header('Location: '.$_SERVER["PHP_SELF"].'?action=create');
+			exit;
+		}
 
-	    $object->fetch($id);
+		$object->fetch($id);
 
 		// If under validation
-	    if ($object->statut == Holiday::STATUS_DRAFT)
-	    {
-	        // If this is the requestor or has read/write rights
-	        if ($cancreate)
-	        {
-	            $valideur = GETPOST('valideur', 'int');
-	            $description = trim(GETPOST('description', 'none'));
+		if ($object->statut == Holiday::STATUS_DRAFT)
+		{
+			// If this is the requestor or has read/write rights
+			if ($cancreate)
+			{
+				$valideur = GETPOST('valideur', 'int');
+				$description = trim(GETPOST('description', 'restricthtml'));
 
-	            // If no start date
-	            if (empty($_POST['date_debut_'])) {
-	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatedebut');
-	                exit;
-	            }
+				// If no start date
+				if (empty($_POST['date_debut_'])) {
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatedebut');
+					exit;
+				}
 
-	            // If no end date
-	            if (empty($_POST['date_fin_'])) {
-	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatefin');
-	                exit;
-	            }
+				// If no end date
+				if (empty($_POST['date_fin_'])) {
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=nodatefin');
+					exit;
+				}
 
-	            // If start date after end date
-	            if ($date_debut > $date_fin) {
-	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=datefin');
-	                exit;
-	            }
+				// If start date after end date
+				if ($date_debut > $date_fin) {
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=datefin');
+					exit;
+				}
 
-	            // If no validator designated
-	            if ($valideur < 1) {
-	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=Valideur');
-	                exit;
-	            }
+				// If no validator designated
+				if ($valideur < 1) {
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=Valideur');
+					exit;
+				}
 
-	            // If there is no Business Days within request
-	            $nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
-	            if ($nbopenedday < 0.5)
-	            {
-	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=DureeHoliday');
-	                exit;
-	            }
+				// If there is no Business Days within request
+				$nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
+				if ($nbopenedday < 0.5)
+				{
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&error=DureeHoliday');
+					exit;
+				}
 
-	            $object->description = $description;
-	            $object->date_debut = $date_debut;
-	            $object->date_fin = $date_fin;
-	            $object->fk_validator = $valideur;
+				$object->description = $description;
+				$object->date_debut = $date_debut;
+				$object->date_fin = $date_fin;
+				$object->fk_validator = $valideur;
 				$object->halfday = $halfday;
 
 				// Update
@@ -339,24 +351,18 @@ if (empty($reshook))
 				{
 					setEventMessages($object->error, $object->errors, 'warnings');
 					$action = 'edit';
-				}
-				else
-				{
+				} else {
 					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 					exit;
 				}
-	        }
-	        else
-	        {
-	        	setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
-	        	$action = '';
-	        }
-	    }
-	    else
-	    {
-	    	setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors');
-	    	$action = '';
-	    }
+			} else {
+				setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+				$action = '';
+			}
+		} else {
+			setEventMessages($langs->trans("ErrorBadStatus"), null, 'errors');
+			$action = '';
+		}
 	}
 
 	// If delete of request
@@ -368,16 +374,14 @@ if (empty($reshook))
 
 		$object->fetch($id);
 
-	    // If this is a rough draft, approved, canceled or refused
+		// If this is a rough draft, approved, canceled or refused
 		if ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED)
 		{
 			// Si l'utilisateur à le droit de lire cette demande, il peut la supprimer
 			if ($candelete)
 			{
 				$result = $object->delete($user);
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($langs->trans('ErrorCantDeleteCP'), null, 'errors');
 				$action = '';
@@ -389,9 +393,7 @@ if (empty($reshook))
 			$db->commit();
 			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -399,104 +401,100 @@ if (empty($reshook))
 	// Action validate (+ send email for approval)
 	if ($action == 'confirm_send')
 	{
-	    $object->fetch($id);
+		$object->fetch($id);
 
-	    // Si brouillon et créateur
-	    if ($object->statut == Holiday::STATUS_DRAFT && $cancreate)
-	    {
-	    	$object->oldcopy = dol_clone($object);
+		// Si brouillon et créateur
+		if ($object->statut == Holiday::STATUS_DRAFT && $cancreate)
+		{
+			$object->oldcopy = dol_clone($object);
 
-	    	$object->statut = Holiday::STATUS_VALIDATED;
+			$object->statut = Holiday::STATUS_VALIDATED;
 
-	        $verif = $object->validate($user);
+			$verif = $object->validate($user);
 
-	        // Si pas d'erreur SQL on redirige vers la fiche de la demande
-	        if ($verif > 0)
-	        {
-	            // To
-	            $destinataire = new User($db);
-	            $destinataire->fetch($object->fk_validator);
-	            $emailTo = $destinataire->email;
+			// Si pas d'erreur SQL on redirige vers la fiche de la demande
+			if ($verif > 0)
+			{
+				// To
+				$destinataire = new User($db);
+				$destinataire->fetch($object->fk_validator);
+				$emailTo = $destinataire->email;
 
-	            if (!$emailTo)
-	            {
-	                dol_syslog("Expected validator has no email, so we redirect directly to finished page without sending email");
-	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	                exit;
-	            }
+				if (!$emailTo)
+				{
+					dol_syslog("Expected validator has no email, so we redirect directly to finished page without sending email");
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+					exit;
+				}
 
-	            // From
-	            $expediteur = new User($db);
-	            $expediteur->fetch($object->fk_user);
-	            $emailFrom = $expediteur->email;
+				// From
+				$expediteur = new User($db);
+				$expediteur->fetch($object->fk_user);
+				$emailFrom = $expediteur->email;
 
-	            // Subject
+				// Subject
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-	            if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-	            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
+				$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
 
-	            // Content
-	            $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-	            $message .= "\n";
-	            $message .= $langs->transnoentities("HolidaysToValidateBody")."\n";
+				// Content
+				$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+				$message .= "\n";
+				$message .= $langs->transnoentities("HolidaysToValidateBody")."\n";
 
-	            $delayForRequest = $object->getConfCP('delayForRequest');
-	            //$delayForRequest = $delayForRequest * (60*60*24);
+				$delayForRequest = $object->getConfCP('delayForRequest');
+				//$delayForRequest = $delayForRequest * (60*60*24);
 
-	            $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
+				$nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
 
-	            // Si l'option pour avertir le valideur en cas de délai trop court
-	            if ($object->getConfCP('AlertValidatorDelay'))
-	            {
-	                if ($object->date_debut < $nextMonth)
-	                {
-	                    $message .= "\n";
-	                    $message .= $langs->transnoentities("HolidaysToValidateDelay", $object->getConfCP('delayForRequest'))."\n";
-	                }
-	            }
+				// Si l'option pour avertir le valideur en cas de délai trop court
+				if ($object->getConfCP('AlertValidatorDelay'))
+				{
+					if ($object->date_debut < $nextMonth)
+					{
+						$message .= "\n";
+						$message .= $langs->transnoentities("HolidaysToValidateDelay", $object->getConfCP('delayForRequest'))."\n";
+					}
+				}
 
-	            // Si l'option pour avertir le valideur en cas de solde inférieur à la demande
-	            if ($object->getConfCP('AlertValidatorSolde'))
-	            {
-	            	$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
-	                if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type))
-	                {
-	                    $message .= "\n";
-	                    $message .= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
-	                }
-	            }
+				// Si l'option pour avertir le valideur en cas de solde inférieur à la demande
+				if ($object->getConfCP('AlertValidatorSolde'))
+				{
+					$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
+					if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type))
+					{
+						$message .= "\n";
+						$message .= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
+					}
+				}
 
-	            $message .= "\n";
-	            $message .= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-	            $message .= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut, 'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin, 'day')."\n";
-	            $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-	            $message .= "\n";
+				$message .= "\n";
+				$message .= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+				$message .= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut, 'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin, 'day')."\n";
+				$message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+				$message .= "\n";
 
-	            $trackid = 'leav'.$object->id;
+				$trackid = 'leav'.$object->id;
 
-	            $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+				$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
-	            // Envoi du mail
-	            $result = $mail->sendfile();
+				// Envoi du mail
+				$result = $mail->sendfile();
 
-	            if (!$result)
-	            {
-	                setEventMessages($mail->error, $mail->errors, 'warnings');
-	                $action = '';
-	            }
-	            else
-	            {
-	            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	            	exit;
-	            }
-	        }
-	        else
-	        {
-	        	setEventMessages($object->error, $object->errors, 'errors');
-	        	$action = '';
-	        }
-	    }
+				if (!$result)
+				{
+					setEventMessages($mail->error, $mail->errors, 'warnings');
+					$action = '';
+				} else {
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+					exit;
+				}
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			}
+		}
 	}
 
 	if ($action == 'update_extras')
@@ -504,7 +502,7 @@ if (empty($reshook))
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
@@ -525,210 +523,200 @@ if (empty($reshook))
 	// Approve leave request
 	if ($action == 'confirm_valid')
 	{
-	    $object->fetch($id);
+		$object->fetch($id);
 
-	    // Si statut en attente de validation et valideur = utilisateur
-	    if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator)
-	    {
-	    	$object->oldcopy = dol_clone($object);
+		// Si statut en attente de validation et valideur = utilisateur
+		if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator)
+		{
+			$object->oldcopy = dol_clone($object);
 
-	        $object->date_valid = dol_now();
-	        $object->fk_user_valid = $user->id;
-	        $object->statut = Holiday::STATUS_APPROVED;
+			$object->date_valid = dol_now();
+			$object->fk_user_valid = $user->id;
+			$object->statut = Holiday::STATUS_APPROVED;
 
-	        $db->begin();
+			$db->begin();
 
-	        $verif = $object->approve($user);
-	        if ($verif <= 0)
-	        {
-	            setEventMessages($object->error, $object->errors, 'errors');
-	            $error++;
-	        }
+			$verif = $object->approve($user);
+			if ($verif <= 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
 
-	        // Si pas d'erreur SQL on redirige vers la fiche de la demande
-	        if (!$error)
-	        {
-	            // Calculcate number of days consummed
-	            $nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
-	            $soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
-	            $newSolde = ($soldeActuel - $nbopenedday);
+			// Si pas d'erreur SQL on redirige vers la fiche de la demande
+			if (!$error)
+			{
+				// Calculcate number of days consummed
+				$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
+				$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
+				$newSolde = ($soldeActuel - $nbopenedday);
 
-	            // On ajoute la modification dans le LOG
-	            $result = $object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde, $object->fk_type);
-	            if ($result < 0)
-	            {
-	                $error++;
-	            	setEventMessages(null, $object->errors, 'errors');
-	            }
+				// On ajoute la modification dans le LOG
+				$result = $object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("Holidays"), $newSolde, $object->fk_type);
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages(null, $object->errors, 'errors');
+				}
 
-	            //Update balance
-	            $result = $object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
-	            if ($result < 0)
-	            {
-	                $error++;
-	            	setEventMessages(null, $object->errors, 'errors');
-	            }
-	        }
+				//Update balance
+				$result = $object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages(null, $object->errors, 'errors');
+				}
+			}
 
-	        if (!$error)
-	        {
-	            // To
-	            $destinataire = new User($db);
-	            $destinataire->fetch($object->fk_user);
-	            $emailTo = $destinataire->email;
+			if (!$error)
+			{
+				// To
+				$destinataire = new User($db);
+				$destinataire->fetch($object->fk_user);
+				$emailTo = $destinataire->email;
 
-	            if (!$emailTo)
-	            {
-	                dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
-	            }
-	            else
-	            {
-	                // From
-	                $expediteur = new User($db);
-	                $expediteur->fetch($object->fk_validator);
-	                $emailFrom = $expediteur->email;
+				if (!$emailTo)
+				{
+					dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
+				} else {
+					// From
+					$expediteur = new User($db);
+					$expediteur->fetch($object->fk_validator);
+					$emailFrom = $expediteur->email;
 
-	                // Subject
-	    			$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-	                if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+					// Subject
+					$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+					if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-	                $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
+					$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
 
-	                // Content
-	                $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-	                $message .= "\n";
-	                $message .= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
+					// Content
+					$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+					$message .= "\n";
+					$message .= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
 
-	                $message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+					$message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-	                $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-	                $message .= "\n";
+					$message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+					$message .= "\n";
 
-	                $trackid = 'leav'.$object->id;
+					$trackid = 'leav'.$object->id;
 
-	                $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+					$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
-	                // Envoi du mail
-	                $result = $mail->sendfile();
+					// Envoi du mail
+					$result = $mail->sendfile();
 
-	                if (!$result)
-	                {
-	                	setEventMessages($mail->error, $mail->errors, 'warnings'); // Show error, but do no make rollback, so $error is not set to 1
-	                	$action = '';
-	                }
-	            }
-	        }
+					if (!$result)
+					{
+						setEventMessages($mail->error, $mail->errors, 'warnings'); // Show error, but do no make rollback, so $error is not set to 1
+						$action = '';
+					}
+				}
+			}
 
-	        if (!$error)
-	        {
-	            $db->commit();
+			if (!$error)
+			{
+				$db->commit();
 
-	           	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	           	exit;
-	        }
-	        else
-	        {
-	            $db->rollback();
-	        	$action = '';
-	        }
-	    }
+			   	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			   	exit;
+			} else {
+				$db->rollback();
+				$action = '';
+			}
+		}
 	}
 
 	if ($action == 'confirm_refuse' && GETPOST('confirm', 'alpha') == 'yes')
 	{
 		if (!empty($_POST['detail_refuse']))
-	    {
-	        $object->fetch($id);
+		{
+			$object->fetch($id);
 
-	        // Si statut en attente de validation et valideur = utilisateur
-	        if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator)
-	        {
-	            $object->date_refuse = dol_print_date('dayhour', dol_now());
-	            $object->fk_user_refuse = $user->id;
-	            $object->statut = Holiday::STATUS_REFUSED;
-	            $object->detail_refuse = GETPOST('detail_refuse', 'alphanohtml');
+			// Si statut en attente de validation et valideur = utilisateur
+			if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator)
+			{
+				$object->date_refuse = dol_print_date('dayhour', dol_now());
+				$object->fk_user_refuse = $user->id;
+				$object->statut = Holiday::STATUS_REFUSED;
+				$object->detail_refuse = GETPOST('detail_refuse', 'alphanohtml');
 
-	            $db->begin();
+				$db->begin();
 
-	            $verif = $object->update($user);
-	            if ($verif <= 0)
-	            {
-	                $error++;
-	                setEventMessages($object->error, $object->errors, 'errors');
-	            }
+				$verif = $object->update($user);
+				if ($verif <= 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 
-	            // Si pas d'erreur SQL on redirige vers la fiche de la demande
-	            if (!$error)
-	            {
-	                // To
-	                $destinataire = new User($db);
-	                $destinataire->fetch($object->fk_user);
-	                $emailTo = $destinataire->email;
+				// Si pas d'erreur SQL on redirige vers la fiche de la demande
+				if (!$error)
+				{
+					// To
+					$destinataire = new User($db);
+					$destinataire->fetch($object->fk_user);
+					$emailTo = $destinataire->email;
 
-	                if (!$emailTo)
-	                {
-	                    dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
-	                }
-	                else
-	                {
-	                    // From
-	                    $expediteur = new User($db);
-	                    $expediteur->fetch($object->fk_validator);
-	                    $emailFrom = $expediteur->email;
+					if (!$emailTo)
+					{
+						dol_syslog("User that request leave has no email, so we redirect directly to finished page without sending email");
+					} else {
+						// From
+						$expediteur = new User($db);
+						$expediteur->fetch($object->fk_validator);
+						$emailFrom = $expediteur->email;
 
-	    	            // Subject
-	    				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-	    	            if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+						// Subject
+						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-	    	            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
+						$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
 
-	                    // Content
-	                	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-	    	            $message .= "\n";
-	                    $message .= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
-	                    $message .= GETPOST('detail_refuse', 'alpha')."\n\n";
+						// Content
+						$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+						$message .= "\n";
+						$message .= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
+						$message .= GETPOST('detail_refuse', 'alpha')."\n\n";
 
-	    	            $message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+						$message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-	    	            $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-	                    $message .= "\n";
+						$message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+						$message .= "\n";
 
-	    	            $trackid = 'leav'.$object->id;
+						$trackid = 'leav'.$object->id;
 
-	    	            $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+						$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
-	                    // Envoi du mail
-	                    $result = $mail->sendfile();
+						// Envoi du mail
+						$result = $mail->sendfile();
 
-	                    if (!$result)
-	                    {
-	                        setEventMessages($mail->error, $mail->errors, 'warnings'); // Show error, but do no make rollback, so $error is not set to 1
-	                    	$action = '';
-	                    }
-	                }
-	            }
-	            else
-	            {
-	            	$action = '';
-	            }
+						if (!$result)
+						{
+							setEventMessages($mail->error, $mail->errors, 'warnings'); // Show error, but do no make rollback, so $error is not set to 1
+							$action = '';
+						}
+					}
+				} else {
+					$action = '';
+				}
 
-	            if (!$error)
-	            {
-	                $db->commit();
+				if (!$error)
+				{
+					$db->commit();
 
-	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	                exit;
-	            }
-	            else
-	            {
-	                $db->rollback();
-	                $action = '';
-	            }
-	        }
-	    } else {
-	    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DetailRefusCP")), null, 'errors');
-	    	$action = 'refuse';
-	    }
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+					exit;
+				} else {
+					$db->rollback();
+					$action = '';
+				}
+			}
+		} else {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DetailRefusCP")), null, 'errors');
+			$action = 'refuse';
+		}
 	}
 
 
@@ -737,29 +725,27 @@ if (empty($reshook))
 	{
 		$error = 0;
 
-	    $object->fetch($id);
+		$object->fetch($id);
 
-	    $oldstatus = $object->statut;
-	    $object->statut = Holiday::STATUS_DRAFT;
+		$oldstatus = $object->statut;
+		$object->statut = Holiday::STATUS_DRAFT;
 
-	    $result = $object->update($user);
-	    if ($result < 0)
-	    {
-	    	$error++;
-	    	setEventMessages($langs->trans('ErrorBackToDraft').' '.$object->error, $object->errors, 'errors');
-	    }
+		$result = $object->update($user);
+		if ($result < 0)
+		{
+			$error++;
+			setEventMessages($langs->trans('ErrorBackToDraft').' '.$object->error, $object->errors, 'errors');
+		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
+		if (!$error)
+		{
+			$db->commit();
 
-	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	        exit;
-	    }
-	    else
-	    {
-	        $db->rollback();
-	    }
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		} else {
+			$db->rollback();
+		}
 	}
 
 	// Si confirmation of cancellation
@@ -767,104 +753,101 @@ if (empty($reshook))
 	{
 		$error = 0;
 
-	    $object->fetch($id);
+		$object->fetch($id);
 
-	    // Si statut en attente de validation et valideur = valideur ou utilisateur, ou droits de faire pour les autres
-	    if (($object->statut == Holiday::STATUS_VALIDATED || $object->statut == Holiday::STATUS_APPROVED) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || !empty($user->rights->holiday->write_all)))
-	    {
-	    	$db->begin();
+		// Si statut en attente de validation et valideur = valideur ou utilisateur, ou droits de faire pour les autres
+		if (($object->statut == Holiday::STATUS_VALIDATED || $object->statut == Holiday::STATUS_APPROVED) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids)
+			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))))
+		{
+			$db->begin();
 
-	    	$oldstatus = $object->statut;
-	        $object->date_cancel = dol_now();
-	        $object->fk_user_cancel = $user->id;
-	        $object->statut = Holiday::STATUS_CANCELED;
+			$oldstatus = $object->statut;
+			$object->date_cancel = dol_now();
+			$object->fk_user_cancel = $user->id;
+			$object->statut = Holiday::STATUS_CANCELED;
 
-	        $result = $object->update($user);
+			$result = $object->update($user);
 
-	        if ($result >= 0 && $oldstatus == Holiday::STATUS_APPROVED)	// holiday was already validated, status 3, so we must increase back the balance
-	        {
-	        	// Calculcate number of days consummed
-	        	$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
+			if ($result >= 0 && $oldstatus == Holiday::STATUS_APPROVED)	// holiday was already validated, status 3, so we must increase back the balance
+			{
+				// Calculcate number of days consummed
+				$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
 
-	        	$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
-	        	$newSolde = ($soldeActuel + $nbopenedday);
+				$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
+				$newSolde = ($soldeActuel + $nbopenedday);
 
-	        	// On ajoute la modification dans le LOG
-	        	$result1 = $object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde, $object->fk_type);
+				// On ajoute la modification dans le LOG
+				$result1 = $object->addLogCP($user->id, $object->fk_user, $langs->transnoentitiesnoconv("HolidaysCancelation"), $newSolde, $object->fk_type);
 
-	        	// Mise à jour du solde
-	        	$result2 = $object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
+				// Mise à jour du solde
+				$result2 = $object->updateSoldeCP($object->fk_user, $newSolde, $object->fk_type);
 
-	        	if ($result1 < 0 || $result2 < 0)
-	        	{
-	        		$error++;
-	        		setEventMessages($langs->trans('ErrorCantDeleteCP').' '.$object->error, $object->errors, 'errors');
-	        	}
-	        }
+				if ($result1 < 0 || $result2 < 0)
+				{
+					$error++;
+					setEventMessages($langs->trans('ErrorCantDeleteCP').' '.$object->error, $object->errors, 'errors');
+				}
+			}
 
-	        if (!$error)
-	        {
-	        	$db->commit();
-	        }
-	        else
-	        {
-	        	$db->rollback();
-	        }
+			if (!$error)
+			{
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
 
-	        // Si pas d'erreur SQL on redirige vers la fiche de la demande
-	        if (!$error && $result > 0)
-	        {
-	            // To
-	            $destinataire = new User($db);
-	            $destinataire->fetch($object->fk_user);
-	            $emailTo = $destinataire->email;
+			// Si pas d'erreur SQL on redirige vers la fiche de la demande
+			if (!$error && $result > 0)
+			{
+				// To
+				$destinataire = new User($db);
+				$destinataire->fetch($object->fk_user);
+				$emailTo = $destinataire->email;
 
-	            if (!$emailTo)
-	            {
-	                header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	                exit;
-	            }
+				if (!$emailTo)
+				{
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+					exit;
+				}
 
-	            // From
-	            $expediteur = new User($db);
-	            $expediteur->fetch($object->fk_user_cancel);
-	            $emailFrom = $expediteur->email;
+				// From
+				$expediteur = new User($db);
+				$expediteur->fetch($object->fk_user_cancel);
+				$emailFrom = $expediteur->email;
 
-	            // Subject
+				// Subject
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-	            if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
 
-	            $subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
+				$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
 
-	            // Content
-	           	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-	            $message .= "\n";
+				// Content
+			   	$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
+				$message .= "\n";
 
-	            $message .= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
-	            $message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+				$message .= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
+				$message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
 
-	            $message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-	            $message .= "\n";
+				$message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
+				$message .= "\n";
 
-	            $trackid = 'leav'.$object->id;
+				$trackid = 'leav'.$object->id;
 
-	            $mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+				$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
-	            // Envoi du mail
-	            $result = $mail->sendfile();
+				// Envoi du mail
+				$result = $mail->sendfile();
 
-	            if (!$result)
-	            {
-	            	setEventMessages($mail->error, $mail->errors, 'warnings');
-	            	$action = '';
-	            }
-	            else
-	            {
-	            	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	            	exit;
-	            }
-	        }
-	    }
+				if (!$result)
+				{
+					setEventMessages($mail->error, $mail->errors, 'warnings');
+					$action = '';
+				} else {
+					header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+					exit;
+				}
+			}
+		}
 	}
 
 	/*
@@ -897,55 +880,53 @@ $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->t
 
 llxHeader('', $langs->trans('CPTitreMenu'));
 
-if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $action == 'create')
+if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 {
-    // Si l'utilisateur n'a pas le droit de faire une demande
-    if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all)))
-    {
-        $errors[] = $langs->trans('CantCreateCP');
-    }
-    else
-    {
-        // Formulaire de demande de congés payés
-        print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
+	// If user has no permission to create a leave
+	if ((in_array($fuserid, $childids) && empty($user->rights->holiday->write)) || (!in_array($fuserid, $childids) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance))))
+	{
+		$errors[] = $langs->trans('CantCreateCP');
+	} else {
+		// Form to add a leave request
+		print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
 
-        // Si il y a une erreur
-        if (GETPOST('error')) {
-            switch (GETPOST('error')) {
-                case 'datefin' :
-                    $errors[] = $langs->trans('ErrorEndDateCP');
-                    break;
-                case 'SQL_Create' :
-                    $errors[] = $langs->trans('ErrorSQLCreateCP').' <b>'.htmlentities($_GET['msg']).'</b>';
-                    break;
-                case 'CantCreate' :
-                    $errors[] = $langs->trans('CantCreateCP');
-                    break;
-                case 'Valideur' :
-                    $errors[] = $langs->trans('InvalidValidatorCP');
-                    break;
-                case 'nodatedebut' :
-                    $errors[] = $langs->trans('NoDateDebut');
-                    break;
-                case 'nodatefin' :
-                    $errors[] = $langs->trans('NoDateFin');
-                    break;
-                case 'DureeHoliday' :
-                    $errors[] = $langs->trans('ErrorDureeCP');
-                    break;
-                case 'alreadyCP' :
-                    $errors[] = $langs->trans('alreadyCPexist');
-                    break;
-            }
+		// Error management
+		if (GETPOST('error')) {
+			switch (GETPOST('error')) {
+				case 'datefin' :
+					$errors[] = $langs->trans('ErrorEndDateCP');
+					break;
+				case 'SQL_Create' :
+					$errors[] = $langs->trans('ErrorSQLCreateCP').' <b>'.htmlentities($_GET['msg']).'</b>';
+					break;
+				case 'CantCreate' :
+					$errors[] = $langs->trans('CantCreateCP');
+					break;
+				case 'Valideur' :
+					$errors[] = $langs->trans('InvalidValidatorCP');
+					break;
+				case 'nodatedebut' :
+					$errors[] = $langs->trans('NoDateDebut');
+					break;
+				case 'nodatefin' :
+					$errors[] = $langs->trans('NoDateFin');
+					break;
+				case 'DureeHoliday' :
+					$errors[] = $langs->trans('ErrorDureeCP');
+					break;
+				case 'alreadyCP' :
+					$errors[] = $langs->trans('alreadyCPexist');
+					break;
+			}
 
-	        setEventMessages($errors, null, 'errors');
-        }
+			setEventMessages($errors, null, 'errors');
+		}
 
 
-        $delayForRequest = $object->getConfCP('delayForRequest');
-        //$delayForRequest = $delayForRequest * (60*60*24);
+		$delayForRequest = $object->getConfCP('delayForRequest');
+		//$delayForRequest = $delayForRequest * (60*60*24);
 
-        $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
+		$nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
 
 		print '<script type="text/javascript">
 	    function valider()
@@ -976,18 +957,18 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
        	}
        </script>'."\n";
 
-        // Formulaire de demande
-        print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" onsubmit="return valider()" name="demandeCP">'."\n";
-        print '<input type="hidden" name="token" value="'.newToken().'" />'."\n";
-        print '<input type="hidden" name="action" value="create" />'."\n";
+		// Formulaire de demande
+		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" onsubmit="return valider()" name="demandeCP">'."\n";
+		print '<input type="hidden" name="token" value="'.newToken().'" />'."\n";
+		print '<input type="hidden" name="action" value="add" />'."\n";
 
-        if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
-        {
-	        dol_fiche_head('', '', '', -1);
+		if (empty($conf->global->HOLIDAY_HIDE_BALANCE))
+		{
+			dol_fiche_head('', '', '', -1);
 
-	        $out = '';
-	        $typeleaves = $object->getTypes(1, 1);
-	    	foreach ($typeleaves as $key => $val)
+			$out = '';
+			$typeleaves = $object->getTypes(1, 1);
+			foreach ($typeleaves as $key => $val)
 			{
 				$nb_type = $object->getCPforUser($user->id, $val['rowid']);
 				$nb_holiday += $nb_type;
@@ -995,544 +976,536 @@ if ((empty($id) && empty($ref)) || $action == 'add' || $action == 'request' || $
 				$out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
 				//$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
 			}
-	        print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
+			print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
 			print $out;
 
-	        dol_fiche_end();
-        }
-        elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
-        {
-        	print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
-        }
+			dol_fiche_end();
+		} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
+		{
+			print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
+		}
 
-        dol_fiche_head();
+		dol_fiche_head();
 
-        //print '<span>'.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'</span><br><br>';
+		//print '<span>'.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'</span><br><br>';
 
-        print '<table class="border centpercent">';
-        print '<tbody>';
+		print '<table class="border centpercent">';
+		print '<tbody>';
 
-        // User for leave request
-        print '<tr>';
-        print '<td class="titlefield fieldrequired">'.$langs->trans("User").'</td>';
-        print '<td>';
+		// User for leave request
+		print '<tr>';
+		print '<td class="titlefield fieldrequired">'.$langs->trans("User").'</td>';
+		print '<td>';
 
-        if (empty($user->rights->holiday->write_all))
-        {
-        	print $form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
-        	//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
-        }
-        else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
-        print '</td>';
-        print '</tr>';
+		if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance))
+		{
+			print $form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+			//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
+		} else {
+			print $form->select_dolusers(GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+		}
+		print '</td>';
+		print '</tr>';
 
-        // Type
-        print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("Type").'</td>';
-        print '<td>';
-        $typeleaves = $object->getTypes(1, -1);
-        $arraytypeleaves = array();
-        foreach ($typeleaves as $key => $val)
-        {
-        	$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
-        	$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')' : '');
+		// Type
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans("Type").'</td>';
+		print '<td>';
+		$typeleaves = $object->getTypes(1, -1);
+		$arraytypeleaves = array();
+		foreach ($typeleaves as $key => $val)
+		{
+			$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+			$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')' : '');
 			$arraytypeleaves[$val['rowid']] = $labeltoshow;
-        }
-        print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : ''), 1);
-        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-        print '</td>';
-        print '</tr>';
+		}
+		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : ''), 1);
+		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print '</td>';
+		print '</tr>';
 
-        // Date start
-        print '<tr>';
-        print '<td class="fieldrequired">';
-        print $langs->trans("DateDebCP");
-        print ' ('.$langs->trans("FirstDayOfHoliday").')';
-        print '</td>';
-        print '<td>';
-        // Si la demande ne vient pas de l'agenda
-        if (!GETPOST('date_debut_')) {
-            print $form->selectDate(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
-        } else {
-            $tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month', 'int'), GETPOST('date_debut_day', 'int'), GETPOST('date_debut_year', 'int'));
-            print $form->selectDate($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
-        }
-        print ' &nbsp; &nbsp; ';
-        print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday', 'alpha') ?GETPOST('starthalfday', 'alpha') : 'morning'));
-        print '</td>';
-        print '</tr>';
+		// Date start
+		print '<tr>';
+		print '<td class="fieldrequired">';
+		print $form->textwithpicto($langs->trans("DateDebCP"), $langs->trans("FirstDayOfHoliday"));
+		print '</td>';
+		print '<td>';
+		// Si la demande ne vient pas de l'agenda
+		if (!GETPOST('date_debut_')) {
+			print $form->selectDate(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
+		} else {
+			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month', 'int'), GETPOST('date_debut_day', 'int'), GETPOST('date_debut_year', 'int'));
+			print $form->selectDate($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
+		}
+		print ' &nbsp; &nbsp; ';
+		print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday', 'alpha') ?GETPOST('starthalfday', 'alpha') : 'morning'));
+		print '</td>';
+		print '</tr>';
 
-        // Date end
-        print '<tr>';
-        print '<td class="fieldrequired">';
-        print $langs->trans("DateFinCP");
-        print ' ('.$langs->trans("LastDayOfHoliday").')';
-        print '</td>';
-        print '<td>';
-        // Si la demande ne vient pas de l'agenda
-        if (!GETPOST('date_fin_')) {
-            print $form->selectDate(-1, 'date_fin_', 0, 0, 0, '', 1, 1);
-        } else {
-            $tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month', 'int'), GETPOST('date_fin_day', 'int'), GETPOST('date_fin_year', 'int'));
-            print $form->selectDate($tmpdate, 'date_fin_', 0, 0, 0, '', 1, 1);
-        }
-        print ' &nbsp; &nbsp; ';
-        print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday', 'alpha') ?GETPOST('endhalfday', 'alpha') : 'afternoon'));
-        print '</td>';
-        print '</tr>';
+		// Date end
+		print '<tr>';
+		print '<td class="fieldrequired">';
+		print $form->textwithpicto($langs->trans("DateFinCP"), $langs->trans("LastDayOfHoliday"));
+		print '</td>';
+		print '<td>';
+		// Si la demande ne vient pas de l'agenda
+		if (!GETPOST('date_fin_')) {
+			print $form->selectDate(-1, 'date_fin_', 0, 0, 0, '', 1, 1);
+		} else {
+			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month', 'int'), GETPOST('date_fin_day', 'int'), GETPOST('date_fin_year', 'int'));
+			print $form->selectDate($tmpdate, 'date_fin_', 0, 0, 0, '', 1, 1);
+		}
+		print ' &nbsp; &nbsp; ';
+		print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday', 'alpha') ?GETPOST('endhalfday', 'alpha') : 'afternoon'));
+		print '</td>';
+		print '</tr>';
 
-        // Approver
-        print '<tr>';
-        print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
-        print '<td>';
+		// Approver
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
+		print '<td>';
 
-        $object = new Holiday($db);
-        $include_users = $object->fetch_users_approver_holiday();
-        if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
-        else
-        {
-        	$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users
-        	if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
-        	if (GETPOST('valideur', 'int') > 0) $defaultselectuser = GETPOST('valideur', 'int');
-        	$s = $form->select_dolusers($defaultselectuser, "valideur", 1, "", 0, $include_users);
-        	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
-        }
+		$object = new Holiday($db);
+		$include_users = $object->fetch_users_approver_holiday();
+		if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
+		else {
+			$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users
+			if (!empty($conf->global->HOLIDAY_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->HOLIDAY_DEFAULT_VALIDATOR; // Can force default approver
+			if (GETPOST('valideur', 'int') > 0) $defaultselectuser = GETPOST('valideur', 'int');
+			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, "", 0, $include_users);
+			print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+		}
 
-        //print $form->select_dolusers((GETPOST('valideur','int')>0?GETPOST('valideur','int'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
-        print '</td>';
-        print '</tr>';
+		//print $form->select_dolusers((GETPOST('valideur','int')>0?GETPOST('valideur','int'):$user->fk_user), "valideur", 1, ($user->admin ? '' : array($user->id)), 0, '', 0, 0, 0, 0, '', 0, '', '', 1);	// By default, hierarchical parent
+		print '</td>';
+		print '</tr>';
 
-        // Description
-        print '<tr>';
-        print '<td>'.$langs->trans("DescCP").'</td>';
-        print '<td class="tdtop">';
-        $doleditor = new DolEditor('description', GETPOST('description', 'none'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        print $doleditor->Create(1);
-        print '</td></tr>';
+		// Description
+		print '<tr>';
+		print '<td>'.$langs->trans("DescCP").'</td>';
+		print '<td class="tdtop">';
+		$doleditor = new DolEditor('description', GETPOST('description', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		print $doleditor->Create(1);
+		print '</td></tr>';
 
-        // Other attributes
-        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+		// Other attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
-        print '</tbody>';
-        print '</table>';
+		print '</tbody>';
+		print '</table>';
 
-        dol_fiche_end();
+		dol_fiche_end();
 
-        print '<div class="center">';
-        print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
-        print '&nbsp; &nbsp; ';
-        print '<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)">';
-        print '</div>';
+		print '<div class="center">';
+		print '<input type="submit" value="'.$langs->trans("SendRequestCP").'" name="bouton" class="button">';
+		print '&nbsp; &nbsp; ';
+		print '<input type="button" value="'.$langs->trans("Cancel").'" class="button" onclick="history.go(-1)">';
+		print '</div>';
 
-        print '</from>'."\n";
-    }
-}
-else
-{
-    if ($error)
-    {
-        print '<div class="tabBar">';
-        print $error;
-        print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
-        print '</div>';
-    }
-    else
-    {
-        // Affichage de la fiche d'une demande de congés payés
-        if (($id > 0) || $ref)
-        {
-        	$result = $object->fetch($id, $ref);
+		print '</from>'."\n";
+	}
+} else {
+	if ($error)
+	{
+		print '<div class="tabBar">';
+		print $error;
+		print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+		print '</div>';
+	} else {
+		// Affichage de la fiche d'une demande de congés payés
+		if (($id > 0) || $ref)
+		{
+			$result = $object->fetch($id, $ref);
 
-            $valideur = new User($db);
-            $valideur->fetch($object->fk_validator);
+			$valideur = new User($db);
+			$valideur->fetch($object->fk_validator);
 
-            $userRequest = new User($db);
-            $userRequest->fetch($object->fk_user);
+			$userRequest = new User($db);
+			$userRequest->fetch($object->fk_user);
 
-            //print load_fiche_titre($langs->trans('TitreRequestCP'));
+			//print load_fiche_titre($langs->trans('TitreRequestCP'));
 
-            // Si il y a une erreur
-            if (GETPOST('error'))
-            {
-                switch (GETPOST('error'))
-                {
-                    case 'datefin' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
-                        break;
-                    case 'SQL_Create' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorSQLCreateCP').' '.$_GET['msg'];
-                        break;
-                    case 'CantCreate' :
-                        $errors[] = $langs->transnoentitiesnoconv('CantCreateCP');
-                        break;
-                    case 'Valideur' :
-                        $errors[] = $langs->transnoentitiesnoconv('InvalidValidatorCP');
-                        break;
-                    case 'nodatedebut' :
-                        $errors[] = $langs->transnoentitiesnoconv('NoDateDebut');
-                        break;
-                    case 'nodatefin' :
-                        $errors[] = $langs->transnoentitiesnoconv('NoDateFin');
-                        break;
-                    case 'DureeHoliday' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorDureeCP');
-                        break;
-                    case 'NoMotifRefuse' :
-                        $errors[] = $langs->transnoentitiesnoconv('NoMotifRefuseCP');
-                        break;
-                    case 'mail' :
-                        $errors[] = $langs->transnoentitiesnoconv('ErrorMailNotSend')."\n".$_GET['error_content'];
-                        break;
-                }
+			// Si il y a une erreur
+			if (GETPOST('error'))
+			{
+				switch (GETPOST('error'))
+				{
+					case 'datefin' :
+						$errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
+						break;
+					case 'SQL_Create' :
+						$errors[] = $langs->transnoentitiesnoconv('ErrorSQLCreateCP').' '.$_GET['msg'];
+						break;
+					case 'CantCreate' :
+						$errors[] = $langs->transnoentitiesnoconv('CantCreateCP');
+						break;
+					case 'Valideur' :
+						$errors[] = $langs->transnoentitiesnoconv('InvalidValidatorCP');
+						break;
+					case 'nodatedebut' :
+						$errors[] = $langs->transnoentitiesnoconv('NoDateDebut');
+						break;
+					case 'nodatefin' :
+						$errors[] = $langs->transnoentitiesnoconv('NoDateFin');
+						break;
+					case 'DureeHoliday' :
+						$errors[] = $langs->transnoentitiesnoconv('ErrorDureeCP');
+						break;
+					case 'NoMotifRefuse' :
+						$errors[] = $langs->transnoentitiesnoconv('NoMotifRefuseCP');
+						break;
+					case 'mail' :
+						$errors[] = $langs->transnoentitiesnoconv('ErrorMailNotSend')."\n".$_GET['error_content'];
+						break;
+				}
 
-	            setEventMessages($errors, null, 'errors');
-            }
+				setEventMessages($errors, null, 'errors');
+			}
 
-            // On vérifie si l'utilisateur à le droit de lire cette demande
-            if ($cancreate)
-            {
-                $head = holiday_prepare_head($object);
+			// On vérifie si l'utilisateur à le droit de lire cette demande
+			if ($cancreate)
+			{
+				$head = holiday_prepare_head($object);
 
-                if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator'))
-                {
-                	if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) $edit = true;
+				if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator'))
+				{
+					if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) $edit = true;
 
-                    print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'."\n";
-                    print '<input type="hidden" name="token" value="'.newToken().'" />'."\n";
-                    print '<input type="hidden" name="action" value="update"/>'."\n";
-                    print '<input type="hidden" name="id" value="'.$object->id.'" />'."\n";
-                }
+					print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'."\n";
+					print '<input type="hidden" name="token" value="'.newToken().'" />'."\n";
+					print '<input type="hidden" name="action" value="update"/>'."\n";
+					print '<input type="hidden" name="id" value="'.$object->id.'" />'."\n";
+				}
 
-                dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
+				dol_fiche_head($head, 'card', $langs->trans("CPTitreMenu"), -1, 'holiday');
 
-                $linkback = '<a href="'.DOL_URL_ROOT.'/holiday/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+				$linkback = '<a href="'.DOL_URL_ROOT.'/holiday/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-                dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref');
+				dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref');
 
 
-                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 '<tbody>';
+				print '<table class="border tableforfield centpercent">';
+				print '<tbody>';
 
-                // User
-                print '<tr>';
-                print '<td class="titlefield">'.$langs->trans("User").'</td>';
-        		print '<td>';
-        		print $userRequest->getNomUrl(-1, 'leave');
-        		print '</td></tr>';
+				// User
+				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 class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</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 class="nowrap">'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</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>';
-                }
+				if (!$edit)
+				{
+					print '<tr>';
+					print '<td class="nowrap">';
+					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 class="nowrap">';
+					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>';
+				}
 
-                if (!$edit)
-                {
-                    print '<tr>';
-                    print '<td class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</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 class="nowrap">'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</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 class="nowrap">';
+					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 class="nowrap">';
+					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 of days
-                print '<tr>';
-                print '<td class="nowrap">';
-                $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>';
-                print num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
-                print '</td>';
-                print '</tr>';
+				// Nb of days
+				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>';
+				print num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
+				print '</td>';
+				print '</tr>';
 
-                if ($object->statut == Holiday::STATUS_REFUSED)
-                {
-                	print '<tr>';
-                	print '<td>'.$langs->trans('DetailRefusCP').'</td>';
-                	print '<td>'.$object->detail_refuse.'</td>';
-                	print '</tr>';
-                }
+				if ($object->statut == Holiday::STATUS_REFUSED)
+				{
+					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 class="tdtop">';
-                    $doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-                    print $doleditor->Create(1);
-                    print '</td></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 class="tdtop">';
+					$doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+					print $doleditor->Create(1);
+					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';
 
-                print '</tbody>';
-                print '</table>'."\n";
+				print '</tbody>';
+				print '</table>'."\n";
 
-                print '</div>';
-                print '<div class="fichehalfright">';
-                print '<div class="ficheaddleft">';
+				print '</div>';
+				print '<div class="fichehalfright">';
+				print '<div class="ficheaddleft">';
 
-                print '<div class="underbanner clearboth"></div>';
+				print '<div class="underbanner clearboth"></div>';
 
 				// Info workflow
-                print '<table class="border tableforfield centpercent">'."\n";
-                print '<tbody>';
+				print '<table class="border tableforfield centpercent">'."\n";
+				print '<tbody>';
 
-                if (!empty($object->fk_user_create))
-                {
-                	$userCreate = new User($db);
-                	$userCreate->fetch($object->fk_user_create);
-	                print '<tr>';
-	                print '<td class="titlefield">'.$langs->trans('RequestByCP').'</td>';
-	                print '<td>'.$userCreate->getNomUrl(-1).'</td>';
-	                print '</tr>';
-                }
+				if (!empty($object->fk_user_create))
+				{
+					$userCreate = new User($db);
+					$userCreate->fetch($object->fk_user_create);
+					print '<tr>';
+					print '<td class="titlefield">'.$langs->trans('RequestByCP').'</td>';
+					print '<td>'.$userCreate->getNomUrl(-1).'</td>';
+					print '</tr>';
+				}
 
-                // Approver
-                if (!$edit && $action != 'editvalidator') {
-                    print '<tr>';
-                    print '<td class="titlefield">';
-                    if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) print $langs->trans('ApprovedBy');
-                    else print $langs->trans('ReviewedByCP');
-                    print '</td>';
-                    print '<td>'.$valideur->getNomUrl(-1);
-                    $include_users = $object->fetch_users_approver_holiday();
-                    if (is_array($include_users) && in_array($user->id, $include_users) && $object->statut == Holiday::STATUS_VALIDATED)
-                    {
-                        print '<a class="editfielda paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editvalidator">'.img_edit($langs->trans("Edit")).'</a>';
-                    }
-                    print '</td>';
-                    print '</tr>';
-                } else {
-                	print '<tr>';
-                    print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
-                    print '<td>';
-                    $include_users = $object->fetch_users_approver_holiday();
-                    if (!in_array($object->fk_validator, $include_users))  // Add the current validator to the list to not lose it when editing.
-                    {
-                        $include_users[] = $object->fk_validator;
-                    }
-                    if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
-                    else
-                    {
-                    	$arrayofvalidatorstoexclude = (($user->admin || ($user->id != $userRequest->id)) ? '' : array($user->id)); // Nobody if we are admin or if we are not the user of the leave.
-                    	$s = $form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), $arrayofvalidatorstoexclude, 0, $include_users);
-                    	print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
-                    }
-                    if ($action == 'editvalidator')
-                    {
-                        print '<input type="submit" class="button" name="savevalidator" value="'.$langs->trans("Save").'">';
-                        print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-                    }
-                    print '</td>';
-                    print '</tr>';
-                }
+				// Approver
+				if (!$edit && $action != 'editvalidator') {
+					print '<tr>';
+					print '<td class="titlefield">';
+					if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) print $langs->trans('ApprovedBy');
+					else print $langs->trans('ReviewedByCP');
+					print '</td>';
+					print '<td>'.$valideur->getNomUrl(-1);
+					$include_users = $object->fetch_users_approver_holiday();
+					if (is_array($include_users) && in_array($user->id, $include_users) && $object->statut == Holiday::STATUS_VALIDATED)
+					{
+						print '<a class="editfielda paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editvalidator">'.img_edit($langs->trans("Edit")).'</a>';
+					}
+					print '</td>';
+					print '</tr>';
+				} else {
+					print '<tr>';
+					print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
+					print '<td>';
+					$include_users = $object->fetch_users_approver_holiday();
+					if (!in_array($object->fk_validator, $include_users))  // Add the current validator to the list to not lose it when editing.
+					{
+						$include_users[] = $object->fk_validator;
+					}
+					if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
+					else {
+						$arrayofvalidatorstoexclude = (($user->admin || ($user->id != $userRequest->id)) ? '' : array($user->id)); // Nobody if we are admin or if we are not the user of the leave.
+						$s = $form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), $arrayofvalidatorstoexclude, 0, $include_users);
+						print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+					}
+					if ($action == 'editvalidator')
+					{
+						print '<input type="submit" class="button" name="savevalidator" value="'.$langs->trans("Save").'">';
+						print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+					}
+					print '</td>';
+					print '</tr>';
+				}
 
-                print '<tr>';
-                print '<td>'.$langs->trans('DateCreation').'</td>';
-                print '<td>'.dol_print_date($object->date_create, 'dayhour').'</td>';
-                print '</tr>';
-                if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateValidCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_valid, 'dayhour').'</td>'; // warning: date_valid is approval date on holiday module
-                    print '</tr>';
-                }
-                if ($object->statut == Holiday::STATUS_CANCELED) {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateCancelCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td>';
-                    print '</tr>';
-                }
-                if ($object->statut == Holiday::STATUS_REFUSED) {
-                    print '<tr>';
-                    print '<td>'.$langs->trans('DateRefusCP').'</td>';
-                    print '<td>'.dol_print_date($object->date_refuse, 'dayhour').'</td>';
-                    print '</tr>';
-                }
-                print '</tbody>';
-                print '</table>';
+				print '<tr>';
+				print '<td>'.$langs->trans('DateCreation').'</td>';
+				print '<td>'.dol_print_date($object->date_create, 'dayhour').'</td>';
+				print '</tr>';
+				if ($object->statut == Holiday::STATUS_APPROVED || $object->statut == Holiday::STATUS_CANCELED) {
+					print '<tr>';
+					print '<td>'.$langs->trans('DateValidCP').'</td>';
+					print '<td>'.dol_print_date($object->date_valid, 'dayhour').'</td>'; // warning: date_valid is approval date on holiday module
+					print '</tr>';
+				}
+				if ($object->statut == Holiday::STATUS_CANCELED) {
+					print '<tr>';
+					print '<td>'.$langs->trans('DateCancelCP').'</td>';
+					print '<td>'.dol_print_date($object->date_cancel, 'dayhour').'</td>';
+					print '</tr>';
+				}
+				if ($object->statut == Holiday::STATUS_REFUSED) {
+					print '<tr>';
+					print '<td>'.$langs->trans('DateRefusCP').'</td>';
+					print '<td>'.dol_print_date($object->date_refuse, 'dayhour').'</td>';
+					print '</tr>';
+				}
+				print '</tbody>';
+				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();
+				dol_fiche_end();
 
 
-                // Confirmation messages
-                if ($action == 'delete')
-                {
-                	if ($user->rights->holiday->delete)
-                	{
-                		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleDeleteCP"), $langs->trans("ConfirmDeleteCP"), "confirm_delete", '', 0, 1);
-                	}
-                }
+				// Confirmation messages
+				if ($action == 'delete')
+				{
+					if ($user->rights->holiday->delete)
+					{
+						print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleDeleteCP"), $langs->trans("ConfirmDeleteCP"), "confirm_delete", '', 0, 1);
+					}
+				}
 
-                // Si envoi en validation
-                if ($action == 'sendToValidate' && $object->statut == Holiday::STATUS_DRAFT)
-                {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleToValidCP"), $langs->trans("ConfirmToValidCP"), "confirm_send", '', 1, 1);
-                }
+				// Si envoi en validation
+				if ($action == 'sendToValidate' && $object->statut == Holiday::STATUS_DRAFT)
+				{
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleToValidCP"), $langs->trans("ConfirmToValidCP"), "confirm_send", '', 1, 1);
+				}
 
-                // Si validation de la demande
-                if ($action == 'valid')
-                {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleValidCP"), $langs->trans("ConfirmValidCP"), "confirm_valid", '', 1, 1);
-                }
+				// Si validation de la demande
+				if ($action == 'valid')
+				{
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleValidCP"), $langs->trans("ConfirmValidCP"), "confirm_valid", '', 1, 1);
+				}
 
-                // Si refus de la demande
-                if ($action == 'refuse')
-                {
-                	$array_input = array(array('type'=>"text", 'label'=> $langs->trans('DetailRefusCP'), 'name'=>"detail_refuse", 'size'=>"50", 'value'=>""));
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
-                }
+				// Si refus de la demande
+				if ($action == 'refuse')
+				{
+					$array_input = array(array('type'=>"text", 'label'=> $langs->trans('DetailRefusCP'), 'name'=>"detail_refuse", 'size'=>"50", 'value'=>""));
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id."&action=confirm_refuse", $langs->trans("TitleRefuseCP"), $langs->trans('ConfirmRefuseCP'), "confirm_refuse", $array_input, 1, 0);
+				}
 
-                // Si annulation de la demande
-                if ($action == 'cancel')
-                {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleCancelCP"), $langs->trans("ConfirmCancelCP"), "confirm_cancel", '', 1, 1);
-                }
+				// Si annulation de la demande
+				if ($action == 'cancel')
+				{
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleCancelCP"), $langs->trans("ConfirmCancelCP"), "confirm_cancel", '', 1, 1);
+				}
 
-                // Si back to draft
-                if ($action == 'backtodraft')
-                {
-                	print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleSetToDraft"), $langs->trans("ConfirmSetToDraft"), "confirm_draft", '', 1, 1);
-                }
+				// Si back to draft
+				if ($action == 'backtodraft')
+				{
+					print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleSetToDraft"), $langs->trans("ConfirmSetToDraft"), "confirm_draft", '', 1, 1);
+				}
 
-                if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator'))
-                {
-                    if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT)
-                    {
-                        print '<div class="center">';
-                        if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
-                        {
-                            print '<input type="submit" value="'.$langs->trans("Save").'" class="button">';
-                        }
-                        print '</div>';
-                    }
+				if (($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT) || ($action == 'editvalidator'))
+				{
+					if ($action == 'edit' && $object->statut == Holiday::STATUS_DRAFT)
+					{
+						print '<div class="center">';
+						if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
+						{
+							print '<input type="submit" value="'.$langs->trans("Save").'" class="button">';
+						}
+						print '</div>';
+					}
 
-                    print '</form>';
-                }
+					print '</form>';
+				}
 
-                if (!$edit)
-                {
-                	// Buttons for actions
+				if (!$edit)
+				{
+					// Buttons for actions
 
-                	print '<div class="tabsAction">';
+					print '<div class="tabsAction">';
 
-		            if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
-                    {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
-                    }
-                    if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)		// If draft
-                    {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
-                    }
-                    if ($object->statut == Holiday::STATUS_VALIDATED)	// If validated
-                    {
-                        if ($user->id == $object->fk_validator)
-                        {
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
-                            print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
-                        }
-                        else
-                        {
-                            print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("Approve").'</a>';
-                            print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
-                        }
-                    }
-                    if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || !empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
-                    {
-                    	if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
-                    	else print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
-                    }
-                    if ($cancreate && $object->statut == Holiday::STATUS_CANCELED)
-                    {
-                        print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
-                    }
-                    if ($candelete && ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED))	// If draft or canceled or refused
-                    {
-                    	print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
-                    }
+					if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit" class="butAction">'.$langs->trans("EditCP").'</a>';
+					}
+					if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)		// If draft
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sendToValidate" class="butAction">'.$langs->trans("Validate").'</a>';
+					}
+					if ($object->statut == Holiday::STATUS_VALIDATED)	// If validated
+					{
+						if ($user->id == $object->fk_validator)
+						{
+							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=valid" class="butAction">'.$langs->trans("Approve").'</a>';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=refuse" class="butAction">'.$langs->trans("ActionRefuseCP").'</a>';
+						} else {
+							print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("Approve").'</a>';
+							print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
+						}
+					}
+					if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
+					{
+						if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
+						else print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
+					}
+					if ($cancreate && $object->statut == Holiday::STATUS_CANCELED)
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=backtodraft" class="butAction">'.$langs->trans("SetToDraft").'</a>';
+					}
+					if ($candelete && ($object->statut == Holiday::STATUS_DRAFT || $object->statut == Holiday::STATUS_CANCELED || $object->statut == Holiday::STATUS_REFUSED))	// If draft or canceled or refused
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'" class="butActionDelete">'.$langs->trans("DeleteCP").'</a>';
+					}
 
-                    print '</div>';
-                }
-            } else {
-                print '<div class="tabBar">';
-                print $langs->trans('ErrorUserViewCP');
-                print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
-                print '</div>';
-            }
-        } else {
-            print '<div class="tabBar">';
-            print $langs->trans('ErrorIDFicheCP');
-            print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
-            print '</div>';
-        }
-    }
+					print '</div>';
+				}
+			} else {
+				print '<div class="tabBar">';
+				print $langs->trans('ErrorUserViewCP');
+				print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+				print '</div>';
+			}
+		} else {
+			print '<div class="tabBar">';
+			print $langs->trans('ErrorIDFicheCP');
+			print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+			print '</div>';
+		}
+	}
 }
 
 // End of page
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index d2e32766088..b702bbf5353 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -204,16 +204,12 @@ class Holiday extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_HOLIDAY_ADDON_NotDefined");
 			return "";
 		}
@@ -238,9 +234,7 @@ class Holiday extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -344,9 +338,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -427,16 +419,13 @@ class Holiday extends CommonObject
 				$this->fetch_optionals();
 
 				$result = 1;
-			}
-			else {
+			} else {
 				$result = 0;
 			}
 			$this->db->free($resql);
 
 			return $result;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -560,9 +549,7 @@ class Holiday extends CommonObject
 			// Returns 1 with the filled array
 			$this->holiday = $tab_result;
 			return 1;
-		}
-		else
-		{
+		} else {
 			// SQL Error
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -685,9 +672,7 @@ class Holiday extends CommonObject
 			// Returns 1 and adds the array to the variable
 			$this->holiday = $tab_result;
 			return 1;
-		}
-		else
-		{
+		} else {
 			// SQL Error
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -711,9 +696,7 @@ class Holiday extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref) || $this->ref == $this->id))
 		{
 			$num = $this->getNextNumRef(null);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = dol_sanitizeFileName($num);
@@ -757,9 +740,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -871,9 +852,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -984,9 +963,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1037,9 +1014,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1082,8 +1057,7 @@ class Holiday extends CommonObject
 				{
 					return false;
 				}
-			}
-			elseif ($halfday == -1)
+			} elseif ($halfday == -1)
 			{
 				// new start afternoon, new end afternoon
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin'])
@@ -1095,8 +1069,7 @@ class Holiday extends CommonObject
 					if ($dateStart < $dateEnd) return false;
 					if ($dateEnd < $infos_CP['date_fin'] || in_array($infos_CP['halfday'], array(0, -1))) return false;
 				}
-			}
-			elseif ($halfday == 1)
+			} elseif ($halfday == 1)
 			{
 				// new start morning, new end morning
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin'])
@@ -1108,8 +1081,7 @@ class Holiday extends CommonObject
 				{
 					if ($dateEnd > $infos_CP['date_debut'] || in_array($infos_CP['halfday'], array(0, 1))) return false;
 				}
-			}
-			elseif ($halfday == 2)
+			} elseif ($halfday == 2)
 			{
 				// new start afternoon, new end morning
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin'])
@@ -1120,9 +1092,7 @@ class Holiday extends CommonObject
 				{
 					if ($dateEnd > $infos_CP['date_debut'] || in_array($infos_CP['halfday'], array(0, 1))) return false;
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error('', 'Bad value of parameter halfday when calling function verifDateHolidayCP');
 			}
 		}
@@ -1152,7 +1122,7 @@ class Holiday extends CommonObject
 		$sql .= " WHERE cp.entity IN (".getEntity('holiday').")";
 		$sql .= " AND cp.fk_user = ".(int) $fk_user;
 		$sql .= " AND cp.date_debut <= '".$this->db->idate($timestamp)."' AND cp.date_fin >= '".$this->db->idate($timestamp)."'";
-		if ($status != '-1') $sql .= " AND cp.statut IN (".$this->db->escape($status).")";
+		if ($status != '-1') $sql .= " AND cp.statut IN (".$this->db->sanitize($this->db->escape($status)).")";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -1189,8 +1159,7 @@ class Holiday extends CommonObject
 					break;
 				}
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return array('morning'=>$isavailablemorning, 'afternoon'=>$isavailableafternoon);
 	}
@@ -1209,7 +1178,11 @@ class Holiday extends CommonObject
 
 		$result = '';
 
-		$label = $langs->trans("Show").': '.$this->ref;
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Holiday").'</u>';
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (isset($this->statut)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		}
 
 		$url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
 
@@ -1300,21 +1273,22 @@ class Holiday extends CommonObject
 		$nb = count($name) + 1;
 
 		// Select HTML
-		$statut = '<select name="'.$htmlname.'" class="flat">'."\n";
-		$statut .= '<option value="-1">&nbsp;</option>'."\n";
+		$out = '<select name="'.$htmlname.'" id="'.$htmlname.'" class="flat">'."\n";
+		$out .= '<option value="-1">&nbsp;</option>'."\n";
 
 		// Boucle des statuts
 		for ($i = 1; $i < $nb; $i++) {
 			if ($i == $selected) {
-				$statut .= '<option value="'.$i.'" selected>'.$langs->trans($name[$i - 1]).'</option>'."\n";
-			}
-			else {
-				$statut .= '<option value="'.$i.'">'.$langs->trans($name[$i - 1]).'</option>'."\n";
+				$out .= '<option value="'.$i.'" selected>'.$langs->trans($name[$i - 1]).'</option>'."\n";
+			} else {
+				$out .= '<option value="'.$i.'">'.$langs->trans($name[$i - 1]).'</option>'."\n";
 			}
 		}
 
-		$statut .= '</select>'."\n";
-		print $statut;
+		$out .= '</select>'."\n";
+		$out .= ajax_combobox($htmlname);
+
+		print $out;
 	}
 
 	/**
@@ -1328,8 +1302,8 @@ class Holiday extends CommonObject
     {
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
-		$sql .= " value = '".$value."'";
-		$sql .= " WHERE name = '".$name."'";
+		$sql .= " value = '".$this->db->escape($value)."'";
+		$sql .= " WHERE name = '".$this->db->escape($name)."'";
 
 		dol_syslog(get_class($this).'::updateConfCP name='.$name.'', LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1370,20 +1344,14 @@ class Holiday extends CommonObject
 					if ($result)
 					{
 						return $createifnotfound;
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror();
 						return -2;
 					}
-				}
-				else
-				{
+				} else {
 					return '';
 				}
-			}
-			else
-			{
+			} else {
 				return $obj->value;
 			}
 		} else {
@@ -1463,18 +1431,14 @@ class Holiday extends CommonObject
 				{
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
 			}
 
 			return 0;
-		}
-		else
-		{
+		} else {
 			// Mise à jour pour un utilisateur
 			$nbHoliday = price2num($nbHoliday, 5);
 
@@ -1497,9 +1461,7 @@ class Holiday extends CommonObject
 						$error++;
 						$this->errors[] = $this->db->lasterror();
 					}
-				}
-				else
-				{
+				} else {
 					// Insert for user
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users(nb_holiday, fk_user, fk_type) VALUES (";
 					$sql .= $nbHoliday;
@@ -1511,9 +1473,7 @@ class Holiday extends CommonObject
 						$this->errors[] = $this->db->lasterror();
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
@@ -1521,9 +1481,7 @@ class Holiday extends CommonObject
 			if (!$error)
 			{
 				return 1;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
 		}
@@ -1540,7 +1498,7 @@ class Holiday extends CommonObject
 
 		$sql = "SELECT value";
 		$sql .= " FROM ".MAIN_DB_PREFIX."holiday_config";
-		$sql .= " WHERE name = '".$name."'";
+		$sql .= " WHERE name = '".$this->db->escape($name)."'";
 
 		$result = $this->db->query($sql);
 
@@ -1564,7 +1522,7 @@ class Holiday extends CommonObject
 	 */
 	public function createCPusers($single = false, $userid = '')
 	{
-		// Si c'est l'ensemble des utilisateurs à ajouter
+		// do we have to add balance for all users ?
 		if (!$single)
 		{
 			dol_syslog(get_class($this).'::createCPusers');
@@ -1574,17 +1532,15 @@ class Holiday extends CommonObject
 			{
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
 				$sql .= " (fk_user, nb_holiday)";
-				$sql .= " VALUES ('".$users['rowid']."','0')";
+				$sql .= " VALUES (".((int) $users['rowid'])."', '0')";
 
 				$resql = $this->db->query($sql);
 				if (!$resql) dol_print_error($this->db);
 			}
-		}
-		else
-		{
+		} else {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."holiday_users";
 			$sql .= " (fk_user, nb_holiday)";
-			$sql .= " VALUES ('".$userid."','0')";
+			$sql .= " VALUES (".((int) $userid)."', '0')";
 
 			$resql = $this->db->query($sql);
 			if (!$resql) dol_print_error($this->db);
@@ -1601,7 +1557,7 @@ class Holiday extends CommonObject
     {
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."holiday_users";
-		$sql .= " WHERE fk_user = '".$user_id."'";
+		$sql .= " WHERE fk_user = ".((int) $user_id);
 
 		$this->db->query($sql);
 	}
@@ -1629,9 +1585,7 @@ class Holiday extends CommonObject
 			//return number_format($obj->nb_holiday,2);
 			if ($obj) return $obj->nb_holiday;
 			else return null;
-		}
-		else
-		{
+		} else {
 			return null;
 		}
 	}
@@ -1668,9 +1622,7 @@ class Holiday extends CommonObject
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 					$sql .= " OR u.entity = 0)"; // Show always superadmin
-				}
-				else
-				{
+				} else {
 					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 				$sql .= " AND u.statut > 0";
@@ -1699,16 +1651,12 @@ class Holiday extends CommonObject
 					}
 					// Retoune le tableau des utilisateurs
 					return $stringlist;
-				}
-				else
-				{
+				} else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				// We want only list of vacation balance for user ids
 				$sql = "SELECT DISTINCT cpu.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
@@ -1738,17 +1686,13 @@ class Holiday extends CommonObject
 					}
 					// Retoune le tableau des utilisateurs
 					return $stringlist;
-				}
-				else
-				{
+				} else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			// Si faux donc return array
 			// List for Dolibarr users
 			if ($type)
@@ -1767,9 +1711,7 @@ class Holiday extends CommonObject
 					$sql .= " WHERE ((ug.fk_user = u.rowid";
 					$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
 					$sql .= " OR u.entity = 0)"; // Show always superadmin
-				}
-				else
-				{
+				} else {
 					$sql .= " WHERE u.entity IN (".getEntity('user').")";
 				}
 
@@ -1810,9 +1752,7 @@ class Holiday extends CommonObject
 					$this->errors[] = "Error ".$this->db->lasterror();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				// List of vacation balance users
 				$sql = "SELECT cpu.fk_type, cpu.nb_holiday, u.rowid, u.lastname, u.firstname, u.gender, u.photo, u.employee, u.statut, u.fk_user";
 				$sql .= " FROM ".MAIN_DB_PREFIX."holiday_users as cpu, ".MAIN_DB_PREFIX."user as u";
@@ -1850,9 +1790,7 @@ class Holiday extends CommonObject
 					}
 					// Retoune le tableau des utilisateurs
 					return $tab_result;
-				}
-				else
-				{
+				} else {
 					// Erreur SQL
 					$this->error = "Error ".$this->db->lasterror();
 					return -1;
@@ -1895,9 +1833,7 @@ class Holiday extends CommonObject
 				$i++;
 			}
 			return $users_validator;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_users_approver_holiday  Error ".$this->error, LOG_ERR);
 			return -1;
@@ -1989,11 +1925,11 @@ class Holiday extends CommonObject
 		$sql .= "fk_type";
 		$sql .= ") VALUES (";
 		$sql .= " '".$this->db->idate(dol_now())."',";
-		$sql .= " '".$fk_user_action."',";
-		$sql .= " '".$fk_user_update."',";
+		$sql .= " '".$this->db->escape($fk_user_action)."',";
+		$sql .= " '".$this->db->escape($fk_user_update)."',";
 		$sql .= " '".$this->db->escape($label)."',";
-		$sql .= " '".$prev_solde."',";
-		$sql .= " '".$new_solde."',";
+		$sql .= " '".$this->db->escape($prev_solde)."',";
+		$sql .= " '".$this->db->escape($new_solde)."',";
 		$sql .= " ".$fk_type;
 		$sql .= ")";
 
@@ -2018,9 +1954,7 @@ class Holiday extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->optRowid;
 		}
@@ -2091,9 +2025,7 @@ class Holiday extends CommonObject
 			// Retourne 1 et ajoute le tableau à la variable
 			$this->logs = $tab_result;
 			return 1;
-		}
-		else
-		{
+		} else {
 			// Erreur SQL
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -2131,8 +2063,7 @@ class Holiday extends CommonObject
 
 				return $types;
 			}
-		}
-		else dol_print_error($this->db);
+		} else dol_print_error($this->db);
 
 		return array();
 	}
@@ -2195,9 +2126,7 @@ class Holiday extends CommonObject
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
@@ -2253,9 +2182,7 @@ class Holiday extends CommonObject
             }
 
             return $response;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->error();
             return -1;
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 5e8798d901a..af646984045 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -41,8 +41,8 @@ $search_supervisor = GETPOST('search_supervisor', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -232,9 +232,7 @@ if (count($typeleaves) == 0)
     print $langs->trans("NoLeaveWithCounterDefined")."<br>\n";
     print $langs->trans("GoIntoDictionaryHolidayTypes");
     //print '</div>';
-}
-else
-{
+} else {
     $canedit = 0;
     if (!empty($user->rights->holiday->define_holiday)) $canedit = 1;
 
@@ -260,9 +258,7 @@ else
         {
             print '<td class="liste_titre" style="text-align:center"></td>';
         }
-    }
-    else
-    {
+    } else {
         print '<td class="liste_titre"></td>';
     }
     print '<td class="liste_titre"></td>';
@@ -285,9 +281,7 @@ else
         	$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
-    {
+    } else {
         print_liste_field_titre('NoLeaveWithCounterDefined', $_SERVER["PHP_SELF"], '', '', '', '');
     }
     print_liste_field_titre((empty($user->rights->holiday->define_holiday) ? '' : 'Note'), $_SERVER["PHP_SELF"]);
@@ -342,9 +336,7 @@ else
         	    //print ' '.$langs->trans('days');
             	print '</td>'."\n";
         	}
-        }
-        else
-        {
+        } else {
             print '<td></td>';
         }
 
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index a0f8723b92d..bdd791e80f1 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -41,7 +41,7 @@ $langs->loadLangs(array('other', 'holiday', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -50,8 +50,8 @@ $result = restrictedArea($user, 'holiday', $id, 'holiday');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -130,7 +130,8 @@ if ($object->id)
     print '<td>'.$langs->trans("Type").'</td>';
     print '<td>';
     $typeleaves = $object->getTypes(1, -1);
-    print empty($typeleaves[$object->fk_type]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $object->fk_type) : $typeleaves[$object->fk_type]['label'];
+    $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>';
 
@@ -140,17 +141,19 @@ if ($object->id)
     if (!$edit)
     {
         print '<tr>';
-        print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+        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
-    {
+    } else {
         print '<tr>';
-        print '<td>'.$langs->trans('DateDebCP').' ('.$langs->trans("FirstDayOfHoliday").')</td>';
+        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; ';
@@ -162,17 +165,19 @@ if ($object->id)
     if (!$edit)
     {
         print '<tr>';
-        print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
+        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
-    {
+    } else {
         print '<tr>';
-        print '<td>'.$langs->trans('DateFinCP').' ('.$langs->trans("LastDayOfHoliday").')</td>';
+        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; ';
@@ -180,8 +185,17 @@ if ($object->id)
         print '</td>';
         print '</tr>';
     }
+
+    // Nb days consumed
     print '<tr>';
-    print '<td>'.$langs->trans('NbUseDaysCP').'</td>';
+    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>';
 
@@ -200,9 +214,7 @@ if ($object->id)
         print '<td>'.$langs->trans('DescCP').'</td>';
         print '<td>'.nl2br($object->description).'</td>';
         print '</tr>';
-    }
-    else
-    {
+    } 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>';
@@ -289,9 +301,7 @@ if ($object->id)
     $permtoedit = $user->rights->holiday->write;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 42faecc5588..0cd0489c701 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -83,8 +83,8 @@ $diroutputmassaction = $conf->holiday->dir_output.'/temp/massgeneration/'.$user-
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -106,7 +106,7 @@ $search_month_end    = GETPOST('search_month_end', 'int');
 $search_year_end     = GETPOST('search_year_end', 'int');
 $search_employee     = GETPOST('search_employee', 'int');
 $search_valideur     = GETPOST('search_valideur', 'int');
-$search_statut       = GETPOST('search_statut', 'int');
+$search_status       = GETPOST('search_status', 'int');
 $search_type         = GETPOST('search_type', 'int');
 
 // Initialize technical objects
@@ -182,7 +182,7 @@ if (empty($reshook))
 		$search_year_end = "";
 		$search_employee = "";
 		$search_valideur = "";
-		$search_statut = "";
+		$search_status = "";
 		$search_type = '';
 		$toselect = '';
 		$search_array_options = array();
@@ -253,7 +253,7 @@ $sql .= " cp.description,";
 $sql .= " cp.date_debut,";
 $sql .= " cp.date_fin,";
 $sql .= " cp.halfday,";
-$sql .= " cp.statut,";
+$sql .= " cp.statut as status,";
 $sql .= " cp.fk_validator,";
 $sql .= " cp.date_valid,";
 $sql .= " cp.fk_user_valid,";
@@ -268,7 +268,7 @@ $sql .= " uu.firstname as user_firstname,";
 $sql .= " uu.admin as user_admin,";
 $sql .= " uu.email as user_email,";
 $sql .= " uu.login as user_login,";
-$sql .= " uu.statut as user_statut,";
+$sql .= " uu.statut as user_status,";
 $sql .= " uu.photo as user_photo,";
 
 $sql .= " ua.lastname as validator_lastname,";
@@ -276,7 +276,7 @@ $sql .= " ua.firstname as validator_firstname,";
 $sql .= " ua.admin as validator_admin,";
 $sql .= " ua.email as validator_email,";
 $sql .= " ua.login as validator_login,";
-$sql .= " ua.statut as validator_statut,";
+$sql .= " ua.statut as validator_status,";
 $sql .= " ua.photo as validator_photo";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -311,11 +311,11 @@ if (!empty($search_valideur) && $search_valideur != -1) {
 }
 // Type
 if (!empty($search_type) && $search_type != -1) {
-	$sql .= ' AND cp.fk_type IN ('.$db->escape($search_type).')';
+	$sql .= ' AND cp.fk_type IN ('.$db->sanitize($db->escape($search_type)).')';
 }
 // Status
-if (!empty($search_statut) && $search_statut != -1) {
-	$sql .= " AND cp.statut = '".$db->escape($search_statut)."'\n";
+if (!empty($search_status) && $search_status != -1) {
+	$sql .= " AND cp.statut = '".$db->escape($search_status)."'\n";
 }
 
 if (empty($user->rights->holiday->read_all)) $sql .= ' AND cp.fk_user IN ('.join(',', $childids).')';
@@ -371,7 +371,7 @@ if ($resql)
 	if ($search_employee > 0) $param .= '&search_employee='.urlencode($search_employee);
 	if ($search_valideur > 0) $param .= '&search_valideur='.urlencode($search_valideur);
 	if ($search_type > 0)     $param .= '&search_type='.urlencode($search_type);
-	if ($search_statut > 0)   $param .= '&search_statut='.urlencode($search_statut);
+	if ($search_status > 0)   $param .= '&search_status='.urlencode($search_status);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -421,24 +421,18 @@ if ($resql)
 
 		print '<div class="tabsAction">';
 
-		$canedit = (($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && $user->rights->holiday->write_all));
+		$canedit = (($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))));
 
 		if ($canedit)
 		{
-			print '<a href="'.DOL_URL_ROOT.'/holiday/card.php?action=request&fuserid='.$user_id.'" class="butAction">'.$langs->trans("AddCP").'</a>';
+			print '<a href="'.DOL_URL_ROOT.'/holiday/card.php?action=create&fuserid='.$user_id.'" class="butAction">'.$langs->trans("AddCP").'</a>';
 		}
 
 		print '</div>';
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans("ListeCP");
 
-		$newcardbutton = '';
-		if ($user->rights->holiday->write)
-		{
-			$newcardbutton .= dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request');
-	    }
+		$newcardbutton = dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=create', '', $user->rights->holiday->write);
 
 		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit, 0, 0, 1);
 	}
@@ -506,7 +500,7 @@ if ($resql)
 		}
 
 		print '<td class="liste_titre maxwidthonsmartphone left">';
-		print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+		print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth150');
 		print '</td>';
 	}
 
@@ -521,11 +515,9 @@ if ($resql)
 		    $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, '', 'maxwidth200');
+		    print $form->select_dolusers($search_valideur, "search_valideur", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth150');
 		    print '</td>';
-		}
-		else
-		{
+		} else {
 		    print '<td class="liste_titre">&nbsp;</td>';
 		}
 	}
@@ -545,7 +537,7 @@ if ($resql)
 				//$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')':'');
 				$arraytypeleaves[$val['rowid']] = $labeltoshow;
 			}
-			print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1);
+			print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		}
 		print '</td>';
 	}
@@ -603,7 +595,7 @@ if ($resql)
 	if (!empty($arrayfields['cp.statut']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone maxwidth200 right">';
-		$object->selectStatutCP($search_statut, 'search_statut');
+		$object->selectStatutCP($search_status, 'search_status');
 		print '</td>';
 	}
 
@@ -620,7 +612,7 @@ if ($resql)
 	if (!empty($arrayfields['cp.fk_user']['checked']))              print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], "cp.fk_user", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['cp.fk_validator']['checked']))         print_liste_field_titre($arrayfields['cp.fk_validator']['label'], $_SERVER["PHP_SELF"], "cp.fk_validator", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['cp.fk_type']['checked']))              print_liste_field_titre($arrayfields['cp.fk_type']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['duration']['checked']))                print_liste_field_titre($arrayfields['duration']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	if (!empty($arrayfields['duration']['checked']))                print_liste_field_titre($arrayfields['duration']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right maxwidth100');
 	if (!empty($arrayfields['cp.date_debut']['checked']))           print_liste_field_titre($arrayfields['cp.date_debut']['label'], $_SERVER["PHP_SELF"], "cp.date_debut", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['cp.date_fin']['checked']))             print_liste_field_titre($arrayfields['cp.date_fin']['label'], $_SERVER["PHP_SELF"], "cp.date_fin", "", $param, '', $sortfield, $sortorder, 'center ');
 	// Extra fields
@@ -643,8 +635,7 @@ if ($resql)
 		$langs->load("errors");
 		print '<tr class="oddeven opacitymediuem"><td colspan="10">'.$langs->trans("NotEnoughPermissions").'</td></tr>';
 		$result = 0;
-	}
-	elseif ($num > 0 && !empty($mysoc->country_id))
+	} elseif ($num > 0 && !empty($mysoc->country_id))
 	{
 	    // Lines
 	    $userstatic = new User($db);
@@ -661,6 +652,7 @@ if ($resql)
 			// Leave request
 			$holidaystatic->id = $obj->rowid;
 			$holidaystatic->ref = ($obj->ref ? $obj->ref : $obj->rowid);
+			$holidaystatic->statut = $obj->status;
 
 			// User
 			$userstatic->id = $obj->fk_user;
@@ -669,7 +661,7 @@ if ($resql)
 			$userstatic->admin = $obj->user_admin;
 			$userstatic->email = $obj->user_email;
 			$userstatic->login = $obj->user_login;
-			$userstatic->statut = $obj->user_statut;
+			$userstatic->statut = $obj->user_status;
 			$userstatic->photo = $obj->user_photo;
 
 			// Validator
@@ -679,7 +671,7 @@ if ($resql)
 			$approbatorstatic->admin = $obj->validator_admin;
 			$approbatorstatic->email = $obj->validator_email;
 			$approbatorstatic->login = $obj->validator_login;
-			$approbatorstatic->statut = $obj->validator_statut;
+			$approbatorstatic->statut = $obj->validator_status;
 			$approbatorstatic->photo = $obj->validator_photo;
 
 			$date = $obj->date_create;
@@ -699,12 +691,12 @@ if ($resql)
 			}
 			if (!empty($arrayfields['cp.fk_user']['checked']))
 			{
-				print '<td>'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['cp.fk_validator']['checked']))
 			{
-				print '<td>'.$approbatorstatic->getNomUrl(-1).'</td>';
+				print '<td class="tdoverflowmax150">'.$approbatorstatic->getNomUrl(-1).'</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 			if (!empty($arrayfields['cp.fk_type']['checked']))
@@ -727,7 +719,7 @@ if ($resql)
 			{
 				print '<td class="center">';
 				print dol_print_date($db->jdate($obj->date_debut), 'day');
-				print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
+				print ' <span class="opacitymedium nowraponall">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
@@ -735,7 +727,7 @@ if ($resql)
 			{
 				print '<td class="center">';
 				print dol_print_date($db->jdate($obj->date_fin), 'day');
-				print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
+				print ' <span class="opacitymedium nowraponall">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
@@ -760,7 +752,7 @@ if ($resql)
 			}
 			if (!empty($arrayfields['cp.statut']['checked']))
 			{
-				print '<td class="right nowrap">'.$holidaystatic->LibStatut($obj->statut, 5).'</td>';
+				print '<td class="right nowrap">'.$holidaystatic->getLibStatut(5).'</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 
@@ -793,9 +785,7 @@ if ($resql)
 	print '</div>';
 
 	print '</form>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 0444157704b..7e7e7ed29f9 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2007-2010  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2011       François Legastelois    <flegastelois@teclib.com>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Tobias Sekan            <tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,13 +43,85 @@ if ($user->socid > 0)	// Protection if external user
 }
 $result = restrictedArea($user, 'holiday', $id, '');
 
+$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
+$massaction  = GETPOST('massaction', 'alpha');
+$contextpage = GETPOST('contextpage', 'aZ');
+$optioncss   = GETPOST('optioncss', 'aZ');
+
+$search_ref         = GETPOST('search_ref', 'alphanohtml');
+$search_employee    = GETPOST('search_employee', 'int');
+$search_type        = GETPOST('search_type', 'int');
+$search_description = GETPOST('search_description', 'alphanohtml');
+
+$limit       = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield   = GETPOST('sortfield', 'aZ09comma');
+$sortorder   = GETPOST('sortorder', 'alpha');
+
+if (! $sortfield) $sortfield = "cp.rowid";
+if (! $sortorder) $sortorder = "ASC";
+
+$hookmanager->initHooks(array('leavemovementlist'));
+
+$arrayfields = array();
+$arrayofmassactions = array();
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+    {
+        $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 = '';
+    }
+}
+
+$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),
+);
 
 
 /*
  * View
  */
 
-$html = new Form($db);
+$form = new Form($db);
 $formother = new FormOther($db);
 $holidaystatic = new Holiday($db);
 
@@ -56,36 +129,24 @@ $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->t
 
 llxHeader('', $langs->trans('CPTitreMenu'));
 
-print load_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm');
-
-
-// Selection filter
-print '<div class="tabBar">';
-
-print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-
 $search_month = GETPOST("remonth", 'int') ?GETPOST("remonth", 'int') : date("m", time());
 $search_year = GETPOST("reyear", 'int') ?GETPOST("reyear", 'int') : date("Y", time());
-
 $year_month = sprintf("%04d", $search_year).'-'.sprintf("%02d", $search_month);
 
-print $formother->select_month($search_month, 'remonth');
+$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)."')";
 
-print $formother->select_year($search_year, 'reyear');
+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);
 
-print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Search")).'" />';
-
-print '</form>';
-
-
-$sql = "SELECT cp.rowid, 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"; // 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 .= " ORDER BY u.lastname, cp.date_debut";
+$sql.= $db->order($sortfield, $sortorder);
 
 $resql = $db->query($sql);
 if (empty($resql))
@@ -96,33 +157,115 @@ if (empty($resql))
 
 $num = $db->num_rows($resql);
 
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])   $param.= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit)                     $param .= '&limit='.urlencode($limit);
+if (!empty($search_ref))                                            $param .= '&search_ref='.urlencode($search_ref);
+if (!empty($search_employee))                                       $param .= '&search_employee='.urlencode($search_employee);
+if (!empty($search_type))                                           $param .= '&search_type='.urlencode($search_type);
+if (!empty($search_description))                                    $param .= '&search_description='.urlencode($search_description);
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+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.'">';
+
+print load_fiche_titre($langs->trans('MenuReportMonth'), '', 'title_hrm');
+
+// Selection filter
+print '<div class="tabBar">';
+print $formother->select_month($search_month, 'remonth');
+print $formother->select_year($search_year, 'reyear');
+print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Search")).'" />';
 print '</div>';
-
-
 print '<br>';
 
+$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) : '');
+
 print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans('Ref').'</td>';
-print '<td>'.$langs->trans('Employee').'</td>';
-print '<td>'.$langs->trans('Type').'</td>';
-print '<td class="center">'.$langs->trans('DateDebCP').'</td>';
-print '<td class="center">'.$langs->trans('DateFinCP').'</td>';
-print '<td class="right">'.$langs->trans('NbUseDaysCPShort').'</td>';
-print '<td class="center">'.$langs->trans('DateStartInMonth').'</td>';
-print '<td class="center">'.$langs->trans('DateEndInMonth').'</td>';
-print '<td class="right">'.$langs->trans('NbUseDaysCPShortInMonth').'</td>';
-print '<td class="maxwidth300">'.$langs->trans('DescCP').'</td>';
+
+// Filter: Ref
+if (!empty($arrayfields['cp.ref']['checked'])) {
+    print '<td class="liste_titre">';
+    print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+    print '</td>';
+}
+
+// Filter: Employee
+if (!empty($arrayfields['cp.fk_user']['checked'])) {
+    print '<td class="liste_titre">';
+    print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+    print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['ct.label']['checked'])) {
+    $typeleaves = $holidaystatic->getTypes(1, -1);
+    $arraytypeleaves = array();
+    foreach ($typeleaves as $key => $val)
+    {
+        $labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+        $arraytypeleaves[$val['rowid']] = $labeltoshow;
+    }
+
+    print '<td class="liste_titre">';
+    print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+    print '</td>';
+}
+
+if (!empty($arrayfields['cp.date_debut']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['cp.date_fin']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['used_days']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['date_start_month']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['date_end_month']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['used_days_month']['checked'])) print '<td class="liste_titre"></td>';
+
+// Filter: Description
+if (!empty($arrayfields['cp.description']['checked'])) {
+    print '<td class="liste_titre">';
+    print '<input type="text" class="maxwidth100" name="search_description" value="'.$search_description.'">';
+    print '</td>';
+}
+
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>';
+
+print '<tr class="liste_titre">';
+if (!empty($arrayfields['cp.ref']['checked'])) print_liste_field_titre($arrayfields['cp.ref']['label'], $_SERVER["PHP_SELF"], 'cp.ref', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['cp.fk_user']['checked'])) print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], 'cp.fk_user', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['ct.label']['checked'])) print_liste_field_titre($arrayfields['ct.label']['label'], $_SERVER["PHP_SELF"], 'ct.label', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['cp.date_debut']['checked'])) print_liste_field_titre($arrayfields['cp.date_debut']['label'], $_SERVER["PHP_SELF"], 'cp.date_debut', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['cp.date_fin']['checked'])) print_liste_field_titre($arrayfields['cp.date_fin']['label'], $_SERVER["PHP_SELF"], 'cp.date_fin', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['used_days']['checked'])) print_liste_field_titre($arrayfields['used_days']['label'], $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['date_start_month']['checked'])) print_liste_field_titre($arrayfields['date_start_month']['label'], $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['date_end_month']['checked'])) print_liste_field_titre($arrayfields['date_end_month']['label'], $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['used_days_month']['checked'])) print_liste_field_titre($arrayfields['used_days_month']['label'], $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['cp.description']['checked'])) print_liste_field_titre($arrayfields['cp.description']['label'], $_SERVER["PHP_SELF"], 'cp.description', '', '', '', $sortfield, $sortorder);
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 print '</tr>';
 
 if ($num == 0)
 {
     print '<tr><td colspan="10" class="opacitymedium">'.$langs->trans('None').'</td></tr>';
 }
-else
-{
+else {
     while ($obj = $db->fetch_object($resql))
     {
         $user = new User($db);
@@ -163,34 +306,54 @@ else
 
         // Leave request
         $holidaystatic->id = $obj->rowid;
-        $holidaystatic->ref = $obj->rowid;
+        $holidaystatic->ref = $obj->ref;
 
         print '<tr class="oddeven">';
-        print '<td>';
-        print $holidaystatic->getNomUrl(1, 1);
-        print '</td>';
-        print '<td>'.$user->getFullName($langs).'</td>';
-        print '<td>'.$obj->label.'</td>';
-        print '<td class="center">'.dol_print_date($db->jdate($obj->date_debut), 'day');
-        print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfday]).')</span>';
-        print '</td>';
-        print '<td class="center">'.dol_print_date($db->jdate($obj->date_fin), 'day');
-        print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfday]).')</span>';
-        print '</td>';
-        print '<td class="right">'.num_open_day($date_start, $date_end, 0, 1, $obj->halfday).'</td>';
-        print '<td class="center">'.dol_print_date($date_start_inmonth, 'day');
-        print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$starthalfdayinmonth]).')</span>';
-        print '</td>';
-        print '<td class="center">'.dol_print_date($date_end_inmonth, 'day');
-        print ' <span class="opacitymedium">('.$langs->trans($listhalfday[$endhalfdayinmonth]).')</span>';
-        print '</td>';
-        print '<td class="right">'.num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth).'</td>';
-        print '<td class="maxwidth300">'.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).'</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_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['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['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 '</table>';
 print '</div>';
+print '</form>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index ce394cbd691..7043f436e87 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2007-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011      Dimitri Mouillard    <dmouillard@teclib.com>
+ * Copyright (C) 2020      Tobias Sekan         <tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,43 +25,48 @@
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
-$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$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', 'alpha');
-$year = GETPOST('year');
-if (empty($year))
-{
-    $tmpdate = dol_getdate(dol_now());
-    $year = $tmpdate['year'];
+// Security check (access forbidden for external user too)
+if (empty($user->rights->holiday->define_holiday) || $user->socid > 0) {
+	accessforbidden();
 }
 
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+
+$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');
+$search_year        = GETPOST('search_year', 'int');
+$search_employee    = GETPOST('search_employee', 'int');
+$search_validator   = GETPOST('search_validator', 'int');
+$search_description = GETPOST('search_description', 'alphanohtml');
+$search_type        = GETPOST('search_type', 'int');
+$search_prev_solde  = GETPOST('search_prev_solde', 'alphanohtml');
+$search_new_solde   = GETPOST('search_new_solde', 'alphanohtml');
+
 // Load variable for pagination
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$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');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-//if (! $sortfield) $sortfield="p.date_fin";
-//if (! $sortorder) $sortorder="DESC";
-
-
-// Protection if external user
-if ($user->socid > 0) accessforbidden();
+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();
@@ -89,61 +95,126 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_id = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
-    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_id = '';
+		$search_month = '';
+		$search_year = '';
+		$search_employee = '';
+		$search_validator = '';
+		$search_description = '';
+		$search_type = '';
+		$search_prev_solde = '';
+		$search_new_solde = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 
-    // Mass actions
-    /*$objectclass='MyObject';
-    $objectlabel='MyObject';
-    $permissiontoread = $user->rights->mymodule->read;
-    $permissiontodelete = $user->rights->mymodule->delete;
-    $uploaddir = $conf->mymodule->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    */
+	if (GETPOST('button_removefilter_x', 'alpha')
+		|| GETPOST('button_removefilter.x', 'alpha')
+		|| GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha')
+		|| GETPOST('button_search.x', 'alpha')
+		|| GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	/*$objectclass='MyObject';
+	$objectlabel='MyObject';
+	$permissiontoread = $user->rights->mymodule->read;
+	$permissiontodelete = $user->rights->mymodule->delete;
+	$uploaddir = $conf->mymodule->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	*/
 }
 
 
+// Definition of fields for lists
+$arrayfields = array(
+	'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1),
+	'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
+	'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1),
+	'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1),
+	'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
+	'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1),
+	'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1),
+	'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1),
+);
+
 
 /*
  * View
  */
 
 $form = new Form($db);
-
+$formother = new FormOther($db);
+$holidaylogstatic = new stdClass();
 $alltypeleaves = $object->getTypes(1, -1); // To have labels
 
-llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.')');
-
-
+llxHeader('', $langs->trans('CPTitreMenu'));
 
 $sqlwhere = '';
-$sqlwhere .= " AND date_action BETWEEN '".$db->idate(dol_get_first_day($year, 1, 1))."' AND '".$db->idate(dol_get_last_day($year, 12, 1))."'";
-if ($search_id != '') $sqlwhere .= natural_search('rowid', $search_id, 1);
 
-$sqlorder = 'ORDER BY cpl.rowid DESC';
+if (!empty($search_year) && $search_year > 0) {
+	if (!empty($search_month) && $search_month > 0) {
+		$from_date  = dol_get_first_day($search_year, $search_month, 1);
+		$to_date    = dol_get_last_day($search_year, $search_month, 1);
+	} else {
+		$from_date  = dol_get_first_day($search_year, 1, 1);
+		$to_date    = dol_get_last_day($search_year, 12, 1);
+	}
+
+	$sqlwhere .= "AND date_action BETWEEN '".$db->idate($from_date)."' AND '".$db->idate($to_date)."'";
+}
+
+if (!empty($search_id) && $search_id > 0)                   $sqlwhere.= natural_search('rowid', $search_id, 1);
+if (!empty($search_validator) && $search_validator > 0)     $sqlwhere.= natural_search('fk_user_action', $search_validator, 1);
+if (!empty($search_employee) && $search_employee > 0)       $sqlwhere.= natural_search('fk_user_update', $search_employee, 1);
+if (!empty($search_description))                            $sqlwhere.= natural_search('type_action', $search_description);
+if (!empty($search_type) && $search_type > 0)               $sqlwhere.= natural_search('fk_type', $search_type, 1);
+if (!empty($search_prev_solde))                             $sqlwhere.= natural_search('prev_solde', $search_prev_solde, 1);
+if (!empty($search_new_solde))                              $sqlwhere.= natural_search('new_solde', $search_new_solde, 1);
+
+$sqlorder = $db->order($sortfield, $sortorder);
 
 // Recent changes are more important than old changes
 $log_holiday = $object->fetchLog($sqlorder, $sqlwhere); // Load $object->logs
 
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	//TODO: $result = $db->query($sql);
+	//TODO: $nbtotalofrecords = $db->num_rows($result);
+	$nbtotalofrecords = is_array($object->logs) ? count($object->logs) : 0;
+
+	if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+// TODO: $num = $db->num_rows($resql);
+$num = is_array($object->logs) ? count($object->logs) : 0;
+
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_id) $param = '&search_id='.urlencode($search_id);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])   $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit)                     $param .= '&limit='.urlencode($limit);
+if (!empty($search_id))                                             $param .= '&search_statut='.urlencode($search_statut);
+if (!empty($search_month) && $search_month > 0)                     $param .= '&search_month='.urlencode($search_month);
+if (!empty($search_year) && $search_year > 0)                       $param .= '&search_year='.urlencode($search_year);
+if (!empty($search_validator) && $search_validator > 0)             $param .= '&search_validator='.urlencode($search_validator);
+if (!empty($search_employee) && $search_employee > 0)               $param .= '&search_employee='.urlencode($search_employee);
+if (!empty($search_description))                                    $param .= '&search_description='.urlencode($search_description);
+if (!empty($search_type) && $search_type > 0)                       $param .= '&search_type='.urlencode($search_type);
+if (!empty($search_prev_solde))                                     $param .= '&search_prev_solde='.urlencode($search_prev_solde);
+if (!empty($search_new_solde))                                      $param .= '&search_new_solde='.urlencode($search_new_solde);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -155,43 +226,110 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$pagination = '<div class="pagination"><ul><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year - 1).$param.'"><i class="fa fa-chevron-left" title="Previous"></i></a><li class="pagination"><span class="active">'.$langs->trans("Year").' '.$year.'</span></li><li class="pagination"><a href="'.$_SERVER["PHP_SELF"].'?year='.($year + 1).$param.'"><i class="fa fa-chevron-right" title="Next"></i></a></li></lu></div>';
-print load_fiche_titre($langs->trans('LogCP'), $pagination, 'title_hrm.png');
+$newcardbutton = dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request', '', $user->rights->holiday->write);
+print_barre_liste($langs->trans('LogCP'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+print '<div class="info">'.$langs->trans('LastUpdateCP').': ';
 
-print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
 $lastUpdate = $object->getConfCP('lastUpdate');
-if ($lastUpdate)
-{
-    $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
-    $yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
-    print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>';
-    print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>'."\n";
+if ($lastUpdate) {
+	$monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
+	$yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
+	print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>';
+	print '<br>';
+	print $langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>';
+} else {
+	print $langs->trans('None');
 }
-else print $langs->trans('None');
-print "</div><br>\n";
+print '</div>';
+print '<br>';
 
 $moreforfilter = '';
 
 $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) : '');
 $selectedfields = '';
+$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">'."\n";
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">';
 
-print '<tbody>';
+print '<tr class="liste_titre_filter">';
+
+// Filter Id
+if (!empty($arrayfields['cpl.rowid']['checked'])) {
+	print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
+}
+
+// Filter: Date
+if (!empty($arrayfields['cpl.date_action']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
+	print $formother->selectyear($search_year, 'search_year', 1, 10, 5, 0, 0, '', 'maxwidth200', true);
+	print '</td>';
+}
+
+// Filter: Validator
+if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
+	$validator = new UserGroup($db);
+	$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
+	$valideurobjects = $validator->listUsersForGroup($excludefilter);
+	$valideurarray = array();
+
+	foreach ($valideurobjects as $val) {
+		$valideurarray[$val->id] = $val->id;
+	}
+
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_validator, "search_validator", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	print '</td>';
+}
+
+// Filter: User
+if (!empty($arrayfields['cpl.fk_user_update']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	print '</td>';
+}
+
+// Filter: Description
+if (!empty($arrayfields['cpl.type_action']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth50" name="search_description" value="'.$search_description.'">';
+	print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['cpl.fk_type']['checked'])) {
+	foreach ($alltypeleaves as $key => $val) {
+		$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+		$arraytypeleaves[$val['rowid']] = $labeltoshow;
+	}
+
+	print '<td class="liste_titre">';
+	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+	print '</td>';
+}
+
+// Filter: Previous balance
+if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth50" name="search_prev_solde" value="'.$search_prev_solde.'">';
+	print '</td>';
+}
+
+// Filter: Variation (only placeholder)
+if (!empty($arrayfields['variation']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+
+// Filter: New Balance
+if (!empty($arrayfields['cpl.new_solde']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth50" name="search_new_solde" value="'.$search_new_solde.'">';
+	print '</td>';
+}
 
-print '<tr class="liste_titre">';
-print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
-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"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
-print '<td class="liste_titre"></td>';
 // Action column
 print '<td class="liste_titre maxwidthsearch">';
 $searchpicto = $form->showFilterButtons();
@@ -200,56 +338,111 @@ print '</td>';
 print '</tr>';
 
 print '<tr class="liste_titre">';
-print_liste_field_titre('ID');
-print_liste_field_titre('Date', $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'center ');
-print_liste_field_titre('ActionByCP');
-print_liste_field_titre('UserUpdateCP');
-print_liste_field_titre('Description');
-print_liste_field_titre('Type');
-print_liste_field_titre('PrevSoldeCP', $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'right ');
-print_liste_field_titre('Variation', $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'right ');
-print_liste_field_titre('NewSoldeCP', $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'right ');
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!empty($arrayfields['cpl.rowid']['checked'])) print_liste_field_titre($arrayfields['cpl.rowid']['label'], $_SERVER["PHP_SELF"], 'rowid', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['cpl.date_action']['checked'])) print_liste_field_titre($arrayfields['cpl.date_action']['label'], $_SERVER["PHP_SELF"], 'date_action', '', '', '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['cpl.fk_user_action']['checked'])) print_liste_field_titre($arrayfields['cpl.fk_user_action']['label'], $_SERVER["PHP_SELF"], 'fk_user_action', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['cpl.fk_user_update']['checked'])) print_liste_field_titre($arrayfields['cpl.fk_user_update']['label'], $_SERVER["PHP_SELF"], 'fk_user_update', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['cpl.type_action']['checked'])) print_liste_field_titre($arrayfields['cpl.type_action']['label'], $_SERVER["PHP_SELF"], 'type_action', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['cpl.fk_type']['checked'])) print_liste_field_titre($arrayfields['cpl.fk_type']['label'], $_SERVER["PHP_SELF"], 'fk_type', '', '', '', $sortfield, $sortorder);
+if (!empty($arrayfields['cpl.prev_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.prev_solde']['label'], $_SERVER["PHP_SELF"], 'prev_solde', '', '', '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['variation']['checked'])) print_liste_field_titre($arrayfields['variation']['label'], $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['cpl.new_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.new_solde']['label'], $_SERVER["PHP_SELF"], 'new_solde', '', '', '', $sortfield, $sortorder, 'right ');
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print '</tr>';
 
+// TODO: $i = 0;
+$i = 1;
 
-foreach ($object->logs as $logs_CP)
+while ($i < min($num, $limit))
 {
-   	$user_action = new User($db);
-   	$user_action->fetch($logs_CP['fk_user_action']);
+	//TODO: $obj = $db->fetch_object($resql);
+	$obj = next($object->logs);
 
-   	$user_update = new User($db);
-   	$user_update->fetch($logs_CP['fk_user_update']);
+	$holidaylogstatic->id				= $obj['rowid'];
+	$holidaylogstatic->date				= $obj['date_action'];
+	$holidaylogstatic->validator		= $obj['fk_user_action'];
+	$holidaylogstatic->employee			= $obj['fk_user_update'];
+	$holidaylogstatic->description		= $obj['type_action'];
+	$holidaylogstatic->type				= $obj['fk_type'];
+	$holidaylogstatic->balance_previous	= $obj['prev_solde'];
+	$holidaylogstatic->balance_new		= $obj['new_solde'];
 
-   	$delta = price2num($logs_CP['new_solde'] - $logs_CP['prev_solde'], 5);
-   	$detasign = ($delta > 0 ? '+' : '-');
+	print '<tr class="oddeven">';
 
-   	print '<tr class="oddeven">';
-   	print '<td>'.$logs_CP['rowid'].'</td>';
-   	print '<td style="text-align: center;">'.$logs_CP['date_action'].'</td>';
-   	print '<td>'.$user_action->getNomUrl(-1).'</td>';
-   	print '<td>'.$user_update->getNomUrl(-1).'</td>';
-   	print '<td>'.$logs_CP['type_action'].'</td>';
-   	print '<td>';
-   	$label = (($alltypeleaves[$logs_CP['fk_type']]['code'] && $langs->trans($alltypeleaves[$logs_CP['fk_type']]['code']) != $alltypeleaves[$logs_CP['fk_type']]['code']) ? $langs->trans($alltypeleaves[$logs_CP['fk_type']]['code']) : $alltypeleaves[$logs_CP['fk_type']]['label']);
-	print $label ? $label : $logs_CP['fk_type'];
-   	print '</td>';
-   	print '<td style="text-align: right;">'.price2num($logs_CP['prev_solde'], 5).' '.$langs->trans('days').'</td>';
-   	print '<td style="text-align: right;">'.$detasign.$delta.'</td>';
-   	print '<td style="text-align: right;">'.price2num($logs_CP['new_solde'], 5).' '.$langs->trans('days').'</td>';
-   	print '<td></td>';
-   	print '</tr>'."\n";
+	// Id
+	if (!empty($arrayfields['cpl.rowid']['checked'])) {
+		print '<td>'.$holidaylogstatic->id.'</td>';
+	}
+
+	// Date
+	if (!empty($arrayfields['cpl.date_action']['checked'])) {
+		print '<td style="text-align: center">'.$holidaylogstatic->date.'</td>';
+	}
+
+	// Validator
+	if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
+		$user_action = new User($db);
+		$user_action->fetch($holidaylogstatic->validator);
+		print '<td>'.$user_action->getNomUrl(-1).'</td>';
+	}
+
+	// Emloyee
+	if (!empty($arrayfields['cpl.fk_user_update']['checked'])) {
+		$user_update = new User($db);
+		$user_update->fetch($holidaylogstatic->employee);
+		print '<td>'.$user_update->getNomUrl(-1).'</td>';
+	}
+
+	// Description
+	if (!empty($arrayfields['cpl.type_action']['checked'])) {
+		print '<td>'.$holidaylogstatic->description.'</td>';
+	}
+
+	// Type
+	if (!empty($arrayfields['cpl.fk_type']['checked'])) {
+		if ($alltypeleaves[$holidaylogstatic->type]['code'] && $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']) != $alltypeleaves[$holidaylogstatic->type]['code']) {
+			$label = $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']);
+		} else {
+			$label = $alltypeleaves[$holidaylogstatic->type]['label'];
+		}
+
+		print '<td>';
+		print $label ? $label : $holidaylogstatic->type;
+		print '</td>';
+	}
+
+	// Previous balance
+	if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
+		print '<td style="text-align: right;">'.price2num($holidaylogstatic->balance_previous, 5).' '.$langs->trans('days').'</td>';
+	}
+
+	// Variation
+	if (!empty($arrayfields['variation']['checked'])) {
+		$delta = price2num($holidaylogstatic->balance_new - $holidaylogstatic->balance_previous, 5);
+		$detasign = ($delta > 0 ? '+' : '');
+		print '<td style="text-align: right;">'.$detasign.$delta.'</td>';
+	}
+
+	// New Balance
+	if (!empty($arrayfields['cpl.new_solde']['checked'])) {
+		print '<td style="text-align: right;">'.price2num($holidaylogstatic->balance_new, 5).' '.$langs->trans('days').'</td>';
+	}
+
+	// Buttons
+	print '<td></td>';
+
+	print '</tr>';
+
+	$i++;
 }
 
-if ($log_holiday == '2')
-{
-    print '<tr class="opacitymedium">';
-    print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
-    print '</tr>';
+if ($log_holiday == '2') {
+	print '<tr class="opacitymedium">';
+	print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
+	print '</tr>';
 }
 
-print '</tbody>'."\n";
-print '</table>'."\n";
+print '</table>';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index ba98812f1b2..ea266a644e0 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -32,13 +32,6 @@ if (!$user->admin)
 
 $error = 0;
 
-// List of statut
-static $tmpstatus2label = array(
-		'0'=>'OpenEtablishment',
-		'1'=>'CloseEtablishment'
-);
-$status2label = array('');
-foreach ($tmpstatus2label as $key => $val) $status2label[$key] = $langs->trans($val);
 
 /*
  * Actions
@@ -51,11 +44,14 @@ foreach ($tmpstatus2label as $key => $val) $status2label[$key] = $langs->trans($
  * View
  */
 
+$form = new Form($db);
+$establishmenttmp = new Establishment($db);
+
 llxHeader('', $langs->trans("Establishments"));
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortorder     = GETPOST("sortorder");
-$sortfield     = GETPOST("sortfield");
+$sortorder     = GETPOST("sortorder", 'alpha');
+$sortfield     = GETPOST("sortfield", 'alpha');
 if (!$sortorder) $sortorder = "DESC";
 if (!$sortfield) $sortfield = "e.rowid";
 
@@ -68,11 +64,6 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 
-$form = new Form($db);
-$establishmenttmp = new Establishment($db);
-
-dol_htmloutput_mesg($mesg);
-
 // Subheader
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("HRMSetup"), $linkback);
@@ -81,7 +72,7 @@ print load_fiche_titre($langs->trans("HRMSetup"), $linkback);
 $head = hrm_admin_prepare_head();
 dol_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "user");
 
-$sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.status";
+$sql = "SELECT e.rowid, e.label, e.address, e.zip, e.town, e.status";
 $sql .= " FROM ".MAIN_DB_PREFIX."establishment as e";
 $sql .= " WHERE e.entity IN (".getEntity('establishment').')';
 $sql .= $db->order($sortfield, $sortorder);
@@ -96,49 +87,47 @@ if ($result)
 	// Load attribute_label
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Name", $_SERVER["PHP_SELF"], "e.name", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "e.label", "", "", "", $sortfield, $sortorder);
 	print_liste_field_titre("Address", $_SERVER["PHP_SELF"], "e.address", "", "", "", $sortfield, $sortorder);
-	print_liste_field_titre("Zipcode", $_SERVER["PHP_SELF"], "e.zip", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Zip", $_SERVER["PHP_SELF"], "e.zip", "", "", "", $sortfield, $sortorder);
 	print_liste_field_titre("Town", $_SERVER["PHP_SELF"], "e.town", "", "", "", $sortfield, $sortorder);
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "e.status", "", "", '', $sortfield, $sortorder, 'right ');
 	print "</tr>\n";
 
 	if ($num > 0)
-    {
-	    $establishmentstatic = new Establishment($db);
+	{
+		$establishmentstatic = new Establishment($db);
 
 		while ($i < min($num, $limit))
 		{
-            $obj = $db->fetch_object($result);
+			$obj = $db->fetch_object($result);
 
 			$establishmentstatic->id = $obj->rowid;
-			$establishmentstatic->name = $obj->name;
+			$establishmentstatic->ref = $obj->ref;
+			$establishmentstatic->label = $obj->label;
 			$establishmentstatic->status = $obj->status;
 
 
 			print '<tr class="oddeven">';
 			print '<td>'.$establishmentstatic->getNomUrl(1).'</td>';
-            print '<td class="left">'.$obj->address.'</td>';
+			print '<td>'.$obj->label.'</td>';
+			print '<td class="left">'.$obj->address.'</td>';
 			print '<td class="left">'.$obj->zip.'</td>';
 			print '<td class="left">'.$obj->town.'</td>';
-
-            print '<td class="right">';
+			print '<td class="right">';
 			print $establishmentstatic->getLibStatut(5);
 			print '</td>';
-            print "</tr>\n";
+			print "</tr>\n";
 
-            $i++;
-        }
-    }
-    else
-    {
-        print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    }
+			$i++;
+		}
+	} else {
+		print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+	}
 
 	print '</table>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -146,7 +135,7 @@ dol_fiche_end();
 
 // Buttons
 print '<div class="tabsAction">';
-print '<a class="butAction" href="../establishment/card.php?action=create">'.$langs->trans("NewEstablishment").'</a>';
+print '<a class="butAction" href="'.DOL_URL_ROOT.'/hrm/establishment/card.php?action=create">'.$langs->trans("NewEstablishment").'</a>';
 print '</div>';
 
 // End of page
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index c839e7c4cd4..79bf11f7ec9 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -30,11 +30,11 @@ $langs->loadLangs(array('admin', 'hrm'));
 if (!$user->admin)
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Other parameters HRM_*
 $list = array(
-		'HRM_EMAIL_EXTERNAL_SERVICE'   // To prevent your public accountant for example
+//		'HRM_EMAIL_EXTERNAL_SERVICE'   // To prevent your public accountant for example
 );
 
 /*
@@ -58,9 +58,11 @@ if ($action == 'update') {
 	}
 }
 
+
 /*
  * View
  */
+
 llxHeader('', $langs->trans('Parameters'));
 
 $form = new Form($db);
@@ -82,7 +84,7 @@ dol_fiche_head($head, 'parameters', $langs->trans("HRM"), -1, "user");
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans('Journaux').'</td>';
+print '<td colspan="3">'.$langs->trans('Parameters').'</td>';
 print "</tr>\n";
 
 foreach ($list as $key) {
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 621f93ca247..d2b53337abe 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -60,12 +60,12 @@ class Establishment extends CommonObject
 	 */
 	public $picto = 'building';
 
-    /**
+	/**
 	 * @var int ID
 	 */
 	public $id;
 
-    /**
+	/**
 	 * @var string Ref
 	 */
 	public $ref;
@@ -75,7 +75,7 @@ class Establishment extends CommonObject
 	 */
 	public $rowid;
 
-	public $name;
+	public $label;
 
 	/**
 	 * @var string Address
@@ -97,8 +97,32 @@ class Establishment extends CommonObject
 
 	public $country_id;
 
-	public $statuts = array();
-	public $statuts_short = array();
+
+	const STATUS_OPEN = 1;
+	const STATUS_CLOSED = 0;
+
+
+	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' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>20),
+		'label' =>array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>22),
+		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+		'zip' =>array('type'=>'varchar(25)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
+		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
+		'fk_state' =>array('type'=>'integer', 'label'=>'Fkstate', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
+		'fk_country' =>array('type'=>'integer', 'label'=>'Fkcountry', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
+		'profid1' =>array('type'=>'varchar(20)', 'label'=>'Profid1', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
+		'profid2' =>array('type'=>'varchar(20)', 'label'=>'Profid2', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
+		'profid3' =>array('type'=>'varchar(20)', 'label'=>'Profid3', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
+		'phone' =>array('type'=>'varchar(20)', 'label'=>'Phone', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
+		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkuserauthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
+		'fk_user_mod' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkusermod', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
+		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>80),
+		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>85),
+		'status' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
+	);
+
 
 	/**
 	 * Constructor
@@ -108,9 +132,6 @@ class Establishment extends CommonObject
 	public function __construct($db)
 	{
 		$this->db = $db;
-
-		$this->statuts_short = array(0 => 'Closed', 1 => 'Opened');
-        $this->statuts = array(0 => 'Closed', 1 => 'Opened');
 	}
 
 	/**
@@ -124,19 +145,20 @@ class Establishment extends CommonObject
 		global $conf, $langs;
 
 		$error = 0;
-		$ret = 0;
 		$now = dol_now();
 
-        // Clean parameters
-        $this->address = ($this->address > 0 ? $this->address : $this->address);
-        $this->zip = ($this->zip > 0 ? $this->zip : $this->zip);
-        $this->town = ($this->town > 0 ? $this->town : $this->town);
-        $this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
+		// Clean parameters
+		$this->address = trim($this->address);
+		$this->zip = trim($this->zip);
+		$this->town = trim($this->town);
+
+		if (empty($this->ref)) $this->ref = '(PROV)';
 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."establishment (";
-		$sql .= "name";
+		$sql .= "ref";
+		$sql .= ", label";
 		$sql .= ", address";
 		$sql .= ", zip";
 		$sql .= ", town";
@@ -147,10 +169,11 @@ class Establishment extends CommonObject
 		$sql .= ", fk_user_author";
 		$sql .= ", fk_user_mod";
 		$sql .= ") VALUES (";
-		$sql .= " '".$this->db->escape($this->name)."'";
+		$sql .= "'".$this->db->escape($this->ref)."'";
+		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->escape($this->address)."'";
-        $sql .= ", '".$this->db->escape($this->zip)."'";
-        $sql .= ", '".$this->db->escape($this->town)."'";
+		$sql .= ", '".$this->db->escape($this->zip)."'";
+		$sql .= ", '".$this->db->escape($this->town)."'";
 		$sql .= ", ".$this->country_id;
 		$sql .= ", ".$this->status;
 		$sql .= ", ".$conf->entity;
@@ -179,6 +202,12 @@ class Establishment extends CommonObject
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'establishment');
+
+			$sql = 'UPDATE '.MAIN_DB_PREFIX."establishment SET ref = '".$this->db->escape($this->id)."'";
+			$sql .= " WHERE rowid = ".$this->id;
+			$this->db->query($sql);
+
 			$this->db->commit();
 			return $this->id;
 		}
@@ -194,17 +223,18 @@ class Establishment extends CommonObject
 	{
 		global $langs;
 
-        // Check parameters
-        if (empty($this->name))
-        {
-            $this->error = 'ErrorBadParameter';
-            return -1;
-        }
+		// Check parameters
+		if (empty($this->label))
+		{
+			$this->error = 'ErrorBadParameter';
+			return -1;
+		}
 
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."establishment";
-		$sql .= " SET name = '".$this->db->escape($this->name)."'";
+		$sql .= " SET ref = '".$this->db->escape($this->ref)."'";
+		$sql .= ", label = '".$this->db->escape($this->label)."'";
 		$sql .= ", address = '".$this->db->escape($this->address)."'";
 		$sql .= ", zip = '".$this->db->escape($this->zip)."'";
 		$sql .= ", town = '".$this->db->escape($this->town)."'";
@@ -227,17 +257,17 @@ class Establishment 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 e.rowid, e.name, e.address, e.zip, e.town, e.status, e.fk_country as country_id, e.entity,";
+		$sql = "SELECT e.rowid, e.ref, e.label, e.address, e.zip, e.town, e.status, e.fk_country as country_id, e.entity,";
 		$sql .= ' c.code as country_code, c.label as country';
 		$sql .= " FROM ".MAIN_DB_PREFIX."establishment as e";
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON e.fk_country = c.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON e.fk_country = c.rowid';
 		$sql .= " WHERE e.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -247,28 +277,26 @@ class Establishment extends CommonObject
 			$obj = $this->db->fetch_object($result);
 
 			$this->id = $obj->rowid;
-			$this->ref			= $obj->rowid;
-			$this->name			= $obj->name;
+			$this->ref			= $obj->ref;
+			$this->label		= $obj->label;
 			$this->address = $obj->address;
 			$this->zip			= $obj->zip;
 			$this->town			= $obj->town;
 			$this->status = $obj->status;
 			$this->entity = $obj->entity;
 
-            $this->country_id   = $obj->country_id;
-            $this->country_code = $obj->country_code;
-            $this->country      = $obj->country;
+			$this->country_id   = $obj->country_id;
+			$this->country_code = $obj->country_code;
+			$this->country      = $obj->country;
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
 
-    /**
+	/**
 	 *	Delete record
 	 *
 	 *	@param	int		$id		Id of record to delete
@@ -286,9 +314,7 @@ class Establishment extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -298,57 +324,43 @@ class Establishment extends CommonObject
 	/**
 	 * Give a label from a status
 	 *
-	 * @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
+	 * @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
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Give a label from a status
+	 *  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
-	 *  @return string      		Label
+	 *  @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
-		global $langs;
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelStatus[self::STATUS_OPEN] = $langs->trans('Open');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed');
+			$this->labelStatusShort[self::STATUS_OPEN] = $langs->trans('Open');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('Closed');
+		}
 
-		if ($mode == 0)
-		{
-			return $langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 1)
-		{
-			return $langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$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 ($mode == 3)
-		{
-			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$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 ($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]), 'statut5');
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-		}
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_OPEN) $statusType = 'status4';
+		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
+
 	/**
 	 * Information on record
 	 *
@@ -357,7 +369,7 @@ class Establishment extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = 'SELECT e.rowid, e.datec, e.fk_user_author, e.tms, e.fk_user_mod, e.entity';
+		$sql = 'SELECT e.rowid, e.ref, e.datec, e.fk_user_author, e.tms, e.fk_user_mod, e.entity';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'establishment as e';
 		$sql .= ' WHERE e.rowid = '.$id;
 
@@ -388,124 +400,65 @@ class Establishment extends CommonObject
 				}
 			}
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
 
 	/**
-	 * Get on record Establishment
+	 *  Return clicable name (with picto eventually)
 	 *
-	 * @param	int		$id      Id of record
-	 * @return	Object
+	 *  @param      int     $withpicto      0=No picto, 1=Include picto into link, 2=Only picto
+	 *  @return     string                  String with URL
 	 */
-	public function getEstablishment($id)
+	public function getNomUrl($withpicto = 0)
 	{
-		$sql = 'SELECT e.rowid, e.name, e.datec, e.fk_user_author, e.tms, e.fk_user_mod, e.entity';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'establishment as e';
-		$sql .= ' WHERE e.rowid = '.$id;
+		global $langs;
 
-		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
-		$result = $this->db->query($sql);
+		$result = '';
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-			}
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
+		$link = '<a href="'.DOL_URL_ROOT.'/hrm/establishment/card.php?id='.$this->id.'">';
+		$linkend = '</a>';
 
-		return $obj;
+		$picto = 'building';
+
+		$label = '<u>'.$langs->trans("Establishment").'</u>';
+		$label .= '<br>'.$langs->trans("Label").': '.$this->label;
+
+		if ($withpicto) $result .= ($link.img_object($label, $picto).$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto != 2) $result .= $link.$this->label.$linkend;
+		return $result;
 	}
 
-    /**
-     *  Return clicable name (with picto eventually)
-     *
-     *  @param      int     $withpicto      0=No picto, 1=Include picto into link, 2=Only picto
-     *  @return     string                  String with URL
-     */
-    public function getNomUrl($withpicto = 0)
-    {
-        global $langs;
+	/**
+	 * 	Return account country code
+	 *
+	 *	@return		string		country code
+	 */
+	public function getCountryCode()
+	{
+		global $mysoc;
 
-        $result = '';
+		// We return country code of bank account
+		if (!empty($this->country_code)) return $this->country_code;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/hrm/establishment/card.php?id='.$this->id.'">';
-        $linkend = '</a>';
+		// We return country code of managed company
+		if (!empty($mysoc->country_code)) return $mysoc->country_code;
 
-        $picto = 'building';
-
-        $label = $langs->trans("Show").': '.$this->name;
-
-        if ($withpicto) $result .= ($link.img_object($label, $picto).$linkend);
-        if ($withpicto && $withpicto != 2) $result .= ' ';
-        if ($withpicto != 2) $result .= $link.$this->name.$linkend;
-        return $result;
-    }
+		return '';
+	}
 
 	/**
-     *  Return clicable name (with picto eventually)
-     *
-     *  @param		int		$id				Id of record
-     *  @param      int     $withpicto      0=No picto, 1=Include picto into link, 2=Only picto
-     *  @return     string                  String with URL
-     */
-    public function getNomUrlParent($id = 0, $withpicto = 0)
-    {
-        global $langs, $conf;
-
-        $result = '';
-
-        $obj = $this->getEstablishment(($id > 0) ? $id : $conf->entity);
-
-        $link = '<a href="'.DOL_URL_ROOT.'/hrm/establishment/card.php?id='.$obj->rowid.'">';
-        $linkend = '</a>';
-
-        $picto = 'building';
-
-        $label = $langs->trans("Show").': '.$obj->name;
-
-        if ($withpicto) $result .= ($link.img_object($label, $picto).$linkend);
-        if ($withpicto && $withpicto != 2) $result .= ' ';
-        if ($withpicto != 2) $result .= $link.$obj->name.$linkend;
-        return $result;
-    }
-
-	/**
-     * 	Return account country code
-     *
-     *	@return		string		country code
-     */
-    public function getCountryCode()
-    {
-        global $mysoc;
-
-        // We return country code of bank account
-        if (!empty($this->country_code)) return $this->country_code;
-
-        // We return country code of managed company
-        if (!empty($mysoc->country_code)) return $mysoc->country_code;
-
-        return '';
-    }
-
-    /**
-     * Initialise object with example values
-     * Id must be 0 if object instance is a specimen
-     *
-     * @return void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-        $this->ref = 'DEAAA';
-    }
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+		$this->ref = '0';
+		$this->label = 'Department AAA';
+	}
 }
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 0122e92090f..1f43878babf 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -33,7 +33,7 @@ if (!$user->admin) accessforbidden();
 
 $error = 0;
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $id = GETPOST('id', 'int');
@@ -41,7 +41,7 @@ $id = GETPOST('id', 'int');
 // List of status
 static $tmpstatus2label = array(
 		'0'=>'CloseEtablishment',
-        '1'=>'OpenEtablishment'
+		'1'=>'OpenEtablishment'
 );
 $status2label = array('');
 foreach ($tmpstatus2label as $key => $val) $status2label[$key] = $langs->trans($val);
@@ -58,33 +58,29 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 if ($action == 'confirm_delete' && $confirm == "yes")
 {
-    $result = $object->delete($id);
-    if ($result >= 0)
-    {
-        header("Location: ../admin/admin_establishment.php");
-        exit;
-    }
-    else
-    {
-        setEventMessages($object->error, $object->errors, 'errors');
-    }
-}
-
-elseif ($action == 'add')
+	$result = $object->delete($id);
+	if ($result >= 0)
+	{
+		header("Location: ../admin/admin_establishment.php");
+		exit;
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+} elseif ($action == 'add')
 {
-    if (!$cancel)
-    {
-        $error = 0;
+	if (!$cancel)
+	{
+		$error = 0;
 
-		$object->name = GETPOST('name', 'alpha');
-        if (empty($object->name))
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors');
-            $error++;
-        }
+		$object->label = GETPOST('label', 'alpha');
+		if (empty($object->label))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			$error++;
+		}
 
-        if (empty($error))
-        {
+		if (empty($error))
+		{
 			$object->address = GETPOST('address', 'alpha');
 			$object->zip 			= GETPOST('zipcode', 'alpha');
 			$object->town			= GETPOST('town', 'alpha');
@@ -96,26 +92,20 @@ elseif ($action == 'add')
 
 			$id = $object->create($user);
 
-            if ($id > 0)
-            {
-                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-                exit;
-			}
-			else
+			if ($id > 0)
 			{
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-        }
-        else
-        {
-            $action = 'create';
-        }
-    }
-    else
-    {
-        header("Location: ../admin/admin_establishment.php");
-        exit;
-    }
+		} else {
+			$action = 'create';
+		}
+	} else {
+		header("Location: ../admin/admin_establishment.php");
+		exit;
+	}
 }
 
 // Update record
@@ -124,15 +114,15 @@ elseif ($action == 'update')
 	$error = 0;
 
 	if (!$cancel) {
-		$name = GETPOST('name', 'alpha');
+		$name = GETPOST('label', 'alpha');
 		if (empty($name)) {
-			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Name')), null, 'errors');
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label')), null, 'errors');
 			$error++;
 		}
 
 		if (empty($error))
 		{
-			$object->name = GETPOST('name', 'alpha');
+			$object->label = GETPOST('label', 'alphanohtml');
 			$object->address = GETPOST('address', 'alpha');
 			$object->zip 			= GETPOST('zipcode', 'alpha');
 			$object->town			= GETPOST('town', 'alpha');
@@ -143,19 +133,17 @@ elseif ($action == 'update')
 
 			$result = $object->update($user);
 
-            if ($result > 0)
-            {
-                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
-                exit;
-            }
-			else
+			if ($result > 0)
 			{
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
+				exit;
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	} else {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
-        exit;
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
+		exit;
 	}
 }
 
@@ -173,35 +161,38 @@ $formcompany = new FormCompany($db);
  */
 if ($action == 'create')
 {
-    print load_fiche_titre($langs->trans("NewEstablishment"));
+	print load_fiche_titre($langs->trans("NewEstablishment"));
 
-    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">';
 
 	dol_fiche_head();
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
 	// Name
 	print '<tr>';
-	print '<td>'.$form->editfieldkey('Name', 'name', '', $object, 0, 'string', '', 1).'</td>';
-	print '<td><input name="name" id="name" size="32" value="'.GETPOST("name", "alpha").'"></td>';
+	print '<td>'.$form->editfieldkey('Label', 'label', '', $object, 0, 'string', '', 1).'</td>';
+	print '<td><input name="label" id="label" value="'.GETPOST("label", "alphanohtml").'"></td>';
 	print '</tr>';
 
-	// Parent
-	print '<tr>';
-	print '<td>'.$form->editfieldkey('Parent', 'entity', '', $object, 0, 'string', '', 1).'</td>';
-	print '<td class="maxwidthonsmartphone">';
-	print $form->selectEstablishments(GETPOST('entity', 'int') > 0 ?GETPOST('entity', 'int') : $conf->entity, 'entity', 1);
-	print '</td>';
-	print '</tr>';
+	// Entity
+	/*
+	if (! empty($conf->multicompany->enabled)) {
+		print '<tr>';
+		print '<td>'.$form->editfieldkey('Parent', 'entity', '', $object, 0, 'string', '', 1).'</td>';
+		print '<td class="maxwidthonsmartphone">';
+		print $form->selectEstablishments(GETPOST('entity', 'int') > 0 ?GETPOST('entity', 'int') : $conf->entity, 'entity', 1);
+		print '</td>';
+		print '</tr>';
+	} */
 
 	// Address
 	print '<tr>';
 	print '<td>'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
 	print '<td>';
-	print '<input name="address" id="address" class="qutrevingtpercent" value="'.GETPOST('address', 'alpha').'">';
+	print '<input name="address" id="address" class="qutrevingtpercent" value="'.GETPOST('address', 'alphanohtml').'">';
 	print '</td>';
 	print '</tr>';
 
@@ -242,65 +233,68 @@ if ($action == 'create')
 	print '</tr>';
 
 	// Status
-    print '<tr>';
-    print '<td>'.$form->editfieldkey('Status', 'status', '', $object, 0, 'string', '', 1).'</td>';
+	print '<tr>';
+	print '<td>'.$form->editfieldkey('Status', 'status', '', $object, 0, 'string', '', 1).'</td>';
 	print '<td>';
 	print $form->selectarray('status', $status2label, GETPOSTISSET('status') ? GETPOST('status', 'alpha') : 1);
-    print '</td></tr>';
+	print '</td></tr>';
 
-    print '</table>';
+	print '</table>';
 
 	dol_fiche_end();
 
-    print '<div class="center">';
+	print '<div class="center">';
 	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 // Part to edit record
 if (($id || $ref) && $action == 'edit')
 {
-    $result = $object->fetch($id);
-    if ($result > 0)
-    {
-        $head = establishment_prepare_head($object);
+	$result = $object->fetch($id);
+	if ($result > 0)
+	{
+		$head = establishment_prepare_head($object);
 
-        if ($action == 'edit')
-        {
-        	dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building');
+		if ($action == 'edit')
+		{
+			dol_fiche_head($head, 'card', $langs->trans("Establishment"), 0, 'building');
 
-        	print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="id" value="'.$id.'">';
+			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Ref
-            print "<tr>";
-            print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
-            print $object->id;
-            print '</td></tr>';
+			// Ref
+			print "<tr>";
+			print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+			print $object->id;
+			print '</td></tr>';
 
-            // Name
-            print '<tr><td>'.$form->editfieldkey('Name', 'name', '', $object, 0, 'string', '', 1).'</td><td>';
-            print '<input name="name" id="name" class="flat" size="32" value="'.$object->name.'">';
-            print '</td></tr>';
+			// Name
+			print '<tr><td>'.$form->editfieldkey('Label', 'label', '', $object, 0, 'string', '', 1).'</td><td>';
+			print '<input name="label" id="label" class="flat" value="'.$object->label.'">';
+			print '</td></tr>';
 
-			// Parent
-            print '<tr><td>'.$form->editfieldkey('Parent', 'entity', '', $object, 0, 'string', '', 1).'</td>';
-			print '<td class="maxwidthonsmartphone">';
-			print $form->selectEstablishments($object->entity > 0 ? $object->entity : $conf->entity, 'entity', 1);
-            print '</td></tr>';
+			// Entity
+			/*
+            if (! empty($conf->multicompany->enabled)) {
+	            print '<tr><td>'.$form->editfieldkey('Parent', 'entity', '', $object, 0, 'string', '', 1).'</td>';
+				print '<td class="maxwidthonsmartphone">';
+				print $object->entity > 0 ? $object->entity : $conf->entity;
+	            print '</td></tr>';
+            }*/
 
 			// Address
 			print '<tr><td>'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
 			print '<td>';
-			print '<input name="address" id="address" size="32" value="'.$object->address.'">';
+			print '<input name="address" id="address" value="'.$object->address.'">';
 			print '</td></tr>';
 
 			// Zipcode / Town
@@ -328,34 +322,33 @@ if (($id || $ref) && $action == 'edit')
 			print $form->selectarray('status', $status2label, $object->status);
 			print '</td></tr>';
 
-            print '</table>';
+			print '</table>';
 
 			dol_fiche_end();
 
-            print '<div class="center">';
+			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-            print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-            print '</div>';
+			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+			print '</div>';
 
-            print '</form>';
-        }
-    }
-    else dol_print_error($db);
+			print '</form>';
+		}
+	} else dol_print_error($db);
 }
 
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-    $res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
-    $head = establishment_prepare_head($object);
-    dol_fiche_head($head, 'card', $langs->trans("Establishment"), -1, 'building');
+	$head = establishment_prepare_head($object);
+	dol_fiche_head($head, 'card', $langs->trans("Establishment"), -1, 'building');
 
-    // Confirmation to delete
-    if ($action == 'delete')
-    {
-        print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteEstablishment"), $langs->trans("ConfirmDeleteEstablishment"), "confirm_delete");
-    }
+	// Confirmation to delete
+	if ($action == 'delete')
+	{
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteEstablishment"), $langs->trans("ConfirmDeleteEstablishment"), "confirm_delete");
+	}
 
 
 	// Object card
@@ -364,27 +357,30 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/admin/admin_establishment.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-    $morehtmlref .= '</div>';
+	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', $morehtmlref);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    //print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent">'."\n";
+	print '<div class="fichecenter">';
+	//print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">'."\n";
 
 	// Name
 	print '<tr>';
-	print '<td class="titlefield">'.$langs->trans("Name").'</td>';
-	print '<td>'.$object->name.'</td>';
+	print '<td class="titlefield">'.$langs->trans("Label").'</td>';
+	print '<td>'.$object->label.'</td>';
 	print '</tr>';
 
-	// Parent
-	print '<tr>';
-	print '<td class="titlefield">'.$langs->trans("Parent").'</td>';
-	print '<td>'.$object->getNomUrlParent($object->entity).'</td>';
-	print '</tr>';
+	// Entity
+	/*
+	if ($conf->multicompany->enabled) {
+		print '<tr>';
+		print '<td class="titlefield">'.$langs->trans("Entity").'</td>';
+		print '<td>'.$object->entity.'</td>';
+		print '</tr>';
+	}*/
 
 	// Address
 	print '<tr>';
@@ -394,7 +390,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Zipcode
 	print '<tr>';
-	print '<td>'.$langs->trans("Zipcode").'</td>';
+	print '<td>'.$langs->trans("Zip").'</td>';
 	print '<td>'.$object->zip.'</td>';
 	print '</tr>';
 
@@ -417,21 +413,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '</td>';
 	print '</tr>';
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 
-    print '<div class="clearboth"></div><br>';
+	print '<div class="clearboth"></div><br>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    /*
+	/*
      * Barre d'actions
     */
 
-    print '<div class="tabsAction">';
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
-    print '</div>';
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
+	print '</div>';
 }
 
 // End of page
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index a9825ac7b3a..7bd6c5727b7 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -28,31 +28,157 @@ require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'hrm'));
 
-// Security check
-if (!$user->admin) accessforbidden();
-
+// Get parameters
 $id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
 
-// View
-llxHeader();
+if (GETPOST('actioncode', 'array')) {
+	$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));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
 
-if ($id)
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = 'a.datep,a.id';
+if (!$sortorder) $sortorder = 'DESC,DESC';
+
+// Initialize technical objects
+$object = new Establishment($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('hrmagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->hrm->multidir_output[$object->entity]."/".$object->id;
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'mymodule', $object->id);
+
+$permissiontoadd = $user->rights->hrm->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$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))
 {
-	$object = new Establishment($db);
-	$object->fetch($id);
-	$object->info($id);
+	// 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 = '';
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0)
+{
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = '';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = establishment_prepare_head($object);
 
+
 	dol_fiche_head($head, 'info', $langs->trans("Establishment"), -1, 'building');
 
-	print '<table width="100%"><tr><td>';
-	dol_print_object_info($object);
-	print '</td></tr></table>';
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/hrm/hrm/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	print '</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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // 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> : ';
+	 $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 .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	 $morehtmlref .= '</div>';
+
+
+	 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	 print '<div class="fichecenter">';
+	 print '<div class="underbanner clearboth"></div>';
+
+	 $object->info($object->id);
+	 dol_print_object_info($object, 1);
+
+	 print '</div>';
+
+	 dol_fiche_end();
 }
 
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index ba33ecbbdb3..3955e3f849a 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2015	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2014	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015-2016	Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2019           Nicolas ZABOURI         <info@inovea-conseil.com>
+ * 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
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 if ($conf->deplacement->enabled) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 if ($conf->expensereport->enabled) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 
 $hookmanager = new HookManager($db);
@@ -52,9 +53,9 @@ if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INF
 
 $holiday = new Holiday($db);
 $holidaystatic = new Holiday($db);
+$staticrecruitmentcandidature = new RecruitmentCandidature($db);
 
-$max = 3;
-
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 
 /*
@@ -95,42 +96,42 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
-    {
-    	$langs->load("holiday");
-        $listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
-    }
-    if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
-    {
-    	$langs->load("trips");
-        $listofsearchfields['search_deplacement'] = array('text'=>'ExpenseReport');
-    }
-    if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
-    {
-    	$langs->load("trips");
-        $listofsearchfields['search_expensereport'] = array('text'=>'ExpenseReport');
-    }
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
+	{
+		$langs->load("holiday");
+		$listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
+	}
+	if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
+	{
+		$langs->load("trips");
+		$listofsearchfields['search_deplacement'] = array('text'=>'ExpenseReport');
+	}
+	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
+	{
+		$langs->load("trips");
+		$listofsearchfields['search_expensereport'] = array('text'=>'ExpenseReport');
+	}
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr '.$bc[false].'>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -140,28 +141,27 @@ if (!empty($conf->holiday->enabled))
 	{
 		$user_id = $user->id;
 
-        print '<div class="div-table-responsive-no-min">';
-	    print '<table class="noborder nohover centpercent">';
-	    print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
-	    print '<tr class="oddeven">';
-	    print '<td colspan="3">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
+		print '<tr class="oddeven">';
+		print '<td colspan="3">';
 
-	    $out = '';
-	    $typeleaves = $holiday->getTypes(1, 1);
-	    foreach ($typeleaves as $key => $val)
-	    {
-	    	$nb_type = $holiday->getCPforUser($user->id, $val['rowid']);
-	    	$nb_holiday += $nb_type;
-	    	$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
-	    }
-	    print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
-	    print $out;
+		$out = '';
+		$typeleaves = $holiday->getTypes(1, 1);
+		foreach ($typeleaves as $key => $val)
+		{
+			$nb_type = $holiday->getCPforUser($user->id, $val['rowid']);
+			$nb_holiday += $nb_type;
+			$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
+		}
+		print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
+		print $out;
 
-	    print '</td>';
-	    print '</tr>';
-	    print '</table></div><br>';
-	}
-	elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
+		print '</td>';
+		print '</tr>';
+		print '</table></div><br>';
+	} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
 	{
 		print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
 	}
@@ -175,89 +175,88 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Latest leave requests
 if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
 {
-    $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut, x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
-    $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE u.rowid = x.fk_user";
-    $sql .= " AND x.entity = ".$conf->entity;
-    if (empty($user->rights->holiday->read_all)) $sql .= ' AND x.fk_user IN ('.join(',', $childids).')';
-    //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    //if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
-    $sql .= $db->order("x.tms", "DESC");
-    $sql .= $db->plimit($max, 0);
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut as user_status,";
+	$sql .= " x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE u.rowid = x.fk_user";
+	$sql .= " AND x.entity = ".$conf->entity;
+	if (empty($user->rights->holiday->read_all)) $sql .= ' AND x.fk_user IN ('.join(',', $childids).')';
+	//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
+	$sql .= $db->order("x.tms", "DESC");
+	$sql .= $db->plimit($max, 0);
 
-    $result = $db->query($sql);
-    if ($result)
-    {
-        $var = false;
-        $num = $db->num_rows($result);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$var = false;
+		$num = $db->num_rows($result);
 
-        $holidaystatic = new Holiday($db);
-        $userstatic = new User($db);
+		$holidaystatic = new Holiday($db);
+		$userstatic = new User($db);
 
-        $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
-        $typeleaves = $holidaystatic->getTypes(1, -1);
+		$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
+		$typeleaves = $holidaystatic->getTypes(1, -1);
 
-        $i = 0;
+		$i = 0;
 
-        print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder centpercent">';
-        print '<tr class="liste_titre">';
-        print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests", min($max, $num)).'</th>';
-        print '<th>'.$langs->trans("from").'</th>';
-        print '<th>'.$langs->trans("to").'</th>';
-        print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-        print '<th width="16">&nbsp;</th>';
-        print '</tr>';
-        if ($num)
-        {
-            while ($i < $num && $i < $max)
-            {
-                $obj = $db->fetch_object($result);
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests", min($max, $num)).'</th>';
+		print '<th>'.$langs->trans("from").'</th>';
+		print '<th>'.$langs->trans("to").'</th>';
+		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/holiday/list.php?sortfield=cp.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
+		print '</tr>';
+		if ($num)
+		{
+			while ($i < $num && $i < $max)
+			{
+				$obj = $db->fetch_object($result);
 
-                $holidaystatic->id = $obj->rowid;
-                $holidaystatic->ref = $obj->ref;
+				$holidaystatic->id = $obj->rowid;
+				$holidaystatic->ref = $obj->ref;
+				$holidaystatic->statut = $obj->status;
 
-                $userstatic->id = $obj->uid;
-                $userstatic->lastname = $obj->lastname;
-                $userstatic->firstname = $obj->firstname;
-                $userstatic->login = $obj->login;
-                $userstatic->photo = $obj->photo;
-                $userstatic->email = $obj->email;
-                $userstatic->statut = $obj->statut;
+				$userstatic->id = $obj->uid;
+				$userstatic->lastname = $obj->lastname;
+				$userstatic->firstname = $obj->firstname;
+				$userstatic->login = $obj->login;
+				$userstatic->photo = $obj->photo;
+				$userstatic->email = $obj->email;
+				$userstatic->statut = $obj->user_status;
 
-                print '<tr class="oddeven">';
-                print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
-                print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
-                print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
+				print '<tr class="oddeven">';
+				print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
+				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+				print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
 
-                $starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
-                $endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
+				$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
+				$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
-                print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').' '.$langs->trans($listhalfday[$starthalfday]);
-                print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').' '.$langs->trans($listhalfday[$endhalfday]);
-                print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-                print '<td>'.$holidaystatic->LibStatut($obj->status, 3).'</td>';
-                print '</tr>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+				print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
+				print '<td class="right nowrap" width="16">'.$holidaystatic->LibStatut($obj->status, 3).'</td>';
+				print '</tr>';
 
-                $i++;
-            }
-        }
-        else
-        {
-            print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        print '</table>';
-        print '</div>';
-        print '<br>';
-    }
-    else dol_print_error($db);
+				$i++;
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print '</table>';
+		print '</div>';
+		print '<br>';
+	} else dol_print_error($db);
 }
 
 
 // Latest expense report
 if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 {
-	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut, u.photo, x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut as user_status, u.photo,";
+	$sql .= " x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".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 = x.fk_user_author";
@@ -280,8 +279,7 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses", min($max, $num)).'</th>';
 		print '<th class="right">'.$langs->trans("TotalTTC").'</th>';
-		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-		print '<th width="16">&nbsp;</th>';
+		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/expensereport/list.php?sortfield=d.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -295,13 +293,14 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 
 				$expensereportstatic->id = $obj->rowid;
 				$expensereportstatic->ref = $obj->ref;
+				$expensereportstatic->statut = $obj->status;
 
 				$userstatic->id = $obj->uid;
 				$userstatic->lastname = $obj->lastname;
 				$userstatic->firstname = $obj->firstname;
-                $userstatic->email = $obj->email;
+				$userstatic->email = $obj->email;
 				$userstatic->login = $obj->login;
-				$userstatic->statut = $obj->statut;
+				$userstatic->statut = $obj->user_status;
 				$userstatic->photo = $obj->photo;
 
 				print '<tr class="oddeven">';
@@ -309,23 +308,85 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1).'</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>'.$expensereportstatic->LibStatut($obj->status, 3).'</td>';
+				print '<td class="right nowrap" width="16">'.$expensereportstatic->LibStatut($obj->status, 3).'</td>';
 				print '</tr>';
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table>';
 		print '</div>';
-	}
-	else dol_print_error($db);
+		print '<br>';
+	} else dol_print_error($db);
 }
 
 
+// Last modified job position
+if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitmentjobposition->read)
+{
+	$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s ON rc.fk_recruitmentjobposition = s.rowid";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE rc.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 .= " ORDER BY rc.tms DESC";
+	$sql .= $db->plimit($max, 0);
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$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="2">';
+		print $langs->trans("BoxTitleLatestModifiedCandidatures", $max);
+		print '</th>';
+		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/recruitment/recruitmentcandidature_list.php?sortfield=t.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
+		print '</tr>';
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+				$staticrecruitmentcandidature->id = $objp->rowid;
+				$staticrecruitmentcandidature->ref = $objp->ref;
+				$staticrecruitmentcandidature->email = $objp->email;
+				$staticrecruitmentcandidature->status = $objp->status;
+				$staticrecruitmentcandidature->date_creation = $objp->date_creation;
+				$staticrecruitmentcandidature->firstname = $objp->firstname;
+				$staticrecruitmentcandidature->lastname = $objp->lastname;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$staticrecruitmentcandidature->getNomUrl(1, '').'</td>';
+				print '<td class="right nowrap">';
+				print "</td>";
+				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
+				print '<td class="right nowrap" width="16">';
+				print $staticrecruitmentcandidature->getLibStatut(3);
+				print "</td>";
+				print '</tr>';
+				$i++;
+			}
+
+			$db->free($resql);
+		} else {
+			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print "</table>";
+		print "</div>";
+		print "<br>";
+	} else {
+		dol_print_error($db);
+	}
+}
+
 print '</div></div></div>';
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index f2aad5baee3..3684d4d2d7e 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2011       Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2020		Ahmad Jamaly Rabib	<rabib@metroworks.co.jp>
  *
  * 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
@@ -101,6 +102,8 @@ class Import
 				// Defined if module is enabled
 				$enabled = true;
 				$part = strtolower(preg_replace('/^mod/i', '', $modulename));
+				// Adds condition for propal module
+				if ($part === 'propale') $part = 'propal';
 				if (empty($conf->$part->enabled)) $enabled = false;
 
 				if (empty($enabled)) continue;
@@ -171,7 +174,7 @@ class Import
 						// Sql request to run after import
 						$this->array_import_run_sql_after[$i] = (isset($module->import_run_sql_after_array[$r]) ? $module->import_run_sql_after_array[$r] : '');
 						// Module
-						$this->array_import_module[$i] = $module;
+						$this->array_import_module[$i] = array('position_of_profile'=>($module->module_position.'-'.$module->import_code[$r]), 'module'=>$module);
 
 						dol_syslog("Import loaded for module ".$modulename." with index ".$i.", dataset=".$module->import_code[$r].", nb of fields=".count($module->import_fields_array[$r]));
 						$i++;
@@ -260,9 +263,7 @@ class Import
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
@@ -280,7 +281,7 @@ class Import
 	{
 		$sql = 'SELECT em.rowid, em.field, em.label, em.type';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'import_model as em';
-		$sql .= ' WHERE em.rowid = '.$id;
+		$sql .= ' WHERE em.rowid = '.((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -295,15 +296,11 @@ class Import
 				$this->datatoimport         = $obj->type;
 				$this->fk_user              = $obj->fk_user;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = "Model not found";
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -3;
 		}
@@ -353,9 +350,7 @@ class Import
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 0819ce0ac30..6c93d96619f 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -77,8 +77,8 @@ $importmodelid = GETPOST('importmodelid');
 $excludefirstline = (GETPOST('excludefirstline') ? GETPOST('excludefirstline') : 1);
 $endatlinenb		= (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : '');
 $updatekeys			= (GETPOST('updatekeys', 'array') ? GETPOST('updatekeys', 'array') : array());
-$separator			= (GETPOST('separator') ? GETPOST('separator') : (!empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? $conf->global->IMPORT_CSV_SEPARATOR_TO_USE : ','));
-$enclosure			= (GETPOST('enclosure') ? GETPOST('enclosure') : '"');
+$separator			= (GETPOST('separator', 'nohtml') ? GETPOST('separator', 'nohtml') : (!empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? $conf->global->IMPORT_CSV_SEPARATOR_TO_USE : ','));
+$enclosure			= (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"');
 
 $objimport = new Import($db);
 $objimport->load_arrays($user, ($step == 1 ? '' : $datatoimport));
@@ -141,18 +141,16 @@ if ($action == 'builddoc')
 	if ($result < 0)
 	{
 		setEventMessages($objimport->error, $objimport->errors, 'errors');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("FileSuccessfullyBuilt"), null, 'mesgs');
 	}
 }
 
 if ($action == 'deleteprof')
 {
-	if ($_GET["id"])
+	if (GETPOST("id", 'int'))
 	{
-		$objimport->fetch($_GET["id"]);
+		$objimport->fetch(GETPOST("id", 'int'));
 		$result = $objimport->delete($user);
 	}
 }
@@ -178,21 +176,16 @@ if ($action == 'add_import_model')
 		if ($result >= 0)
 		{
 			setEventMessages($langs->trans("ImportModelSaved", $objimport->model_name), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			if ($objimport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				setEventMessages($langs->trans("ErrorImportDuplicateProfil"), null, 'errors');
-			}
-			else {
+			} else {
 				setEventMessages($objimport->error, null, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ImportModelName")), null, 'errors');
 	}
 }
@@ -208,9 +201,7 @@ if ($step == 3 && $datatoimport)
 		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $fullpath, 1) > 0)
 		{
 			dol_syslog("File ".$fullpath." was added for import");
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 		}
@@ -221,9 +212,9 @@ if ($step == 3 && $datatoimport)
 	{
 		$langs->load("other");
 
-		$param = '&datatoimport='.$datatoimport.'&format='.$format;
-		if ($excludefirstline) $param .= '&excludefirstline='.$excludefirstline;
-		if ($endatlinenb) $param .= '&endatlinenb='.$endatlinenb;
+		$param = '&datatoimport='.urlencode($datatoimport).'&format='.urlencode($format);
+		if ($excludefirstline) $param .= '&excludefirstline='.urlencode($excludefirstline);
+		if ($endatlinenb) $param .= '&endatlinenb='.urlencode($endatlinenb);
 
 		$file = $conf->import->dir_temp.'/'.GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 		$ret = dol_delete_file($file);
@@ -330,8 +321,8 @@ if ($step == 1 || !$datatoimport)
 	$_SESSION["dol_array_match_file_to_database"] = '';
 
 	$param = '';
-	if ($excludefirstline) $param .= '&excludefirstline='.$excludefirstline;
-	if ($endatlinenb) $param .= '&endatlinenb='.$endatlinenb;
+	if ($excludefirstline) $param .= '&excludefirstline='.urlencode($excludefirstline);
+	if ($endatlinenb) $param .= '&endatlinenb='.urlencode($endatlinenb);
 	if ($separator) $param .= '&separator='.urlencode($separator);
 	if ($enclosure) $param .= '&enclosure='.urlencode($enclosure);
 
@@ -355,32 +346,28 @@ if ($step == 1 || !$datatoimport)
 
 	if (count($objimport->array_import_module))
 	{
-		$sortedarrayofmodules = dol_sort_array($objimport->array_import_module, 'module_position', 'asc', 0, 0, 1);
+		$sortedarrayofmodules = dol_sort_array($objimport->array_import_module, 'position_of_profile', 'asc', 0, 0, 1);
 		foreach ($sortedarrayofmodules as $key => $value)
 		{
-			//var_dump($objimport->array_import_code[$key]);
+			//var_dump($key.' '.$value['position_of_profile'].' '.$value['import_code'].' '.$objimport->array_import_module[$key]['module']->getName().' '.$objimport->array_import_code[$key]);
 			print '<tr class="oddeven"><td>';
-			$titleofmodule = $objimport->array_import_module[$key]->getName();
+			$titleofmodule = $objimport->array_import_module[$key]['module']->getName();
 			// Special cas for import common to module/services
 			if (in_array($objimport->array_import_code[$key], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
 			print $titleofmodule;
 			print '</td><td>';
-			print img_object($objimport->array_import_module[$key]->getName(), $objimport->array_import_icon[$key]).' ';
+			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">';
 			if ($objimport->array_import_perms[$key])
 			{
-				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'filenew').'</a>';
-			}
-			else
-			{
+				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'</a>';
+			} else {
 				print $langs->trans("NotEnoughPermissions");
 			}
 			print '</td></tr>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoImportableData").'</td></tr>';
 	}
 	print '</table>';
@@ -393,9 +380,9 @@ if ($step == 1 || !$datatoimport)
 // STEP 2: Page to select input format file
 if ($step == 2 && $datatoimport)
 {
-	$param = '&datatoimport='.$datatoimport;
-	if ($excludefirstline) $param .= '&excludefirstline='.$excludefirstline;
-	if ($endatlinenb) $param .= '&endatlinenb='.$endatlinenb;
+	$param = '&datatoimport='.urlencode($datatoimport);
+	if ($excludefirstline) $param .= '&excludefirstline='.urlencode($excludefirstline);
+	if ($endatlinenb) $param .= '&endatlinenb='.urlencode($endatlinenb);
 	if ($separator) $param .= '&separator='.urlencode($separator);
 	if ($enclosure) $param .= '&enclosure='.urlencode($enclosure);
 
@@ -413,7 +400,7 @@ if ($step == 2 && $datatoimport)
 	// Module
 	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
 	print '<td>';
-	$titleofmodule = $objimport->array_import_module[0]->getName();
+	$titleofmodule = $objimport->array_import_module[0]['module']->getName();
 	// Special cas for import common to module/services
 	if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
 	print $titleofmodule;
@@ -422,7 +409,7 @@ if ($step == 2 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
@@ -437,7 +424,7 @@ if ($step == 2 && $datatoimport)
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 
-	print '<span class="opacitymedium">'.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'filenew')).'</span><br><br>';
+	print '<span class="opacitymedium">'.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'next', '')).'</span><br><br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -458,7 +445,7 @@ if ($step == 2 && $datatoimport)
 		print '<td style="text-align:center"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a></td>';
 		// Action button
 		print '<td style="text-align:right">';
-		print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=3&format='.$key.$param.'">'.img_picto($langs->trans("SelectFormat"), 'filenew').'</a>';
+		print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=3&format='.$key.$param.'">'.img_picto($langs->trans("SelectFormat"), 'next', 'class="fa-15x"').'</a>';
 		print '</td>';
 		print '</tr>';
 	}
@@ -473,9 +460,9 @@ if ($step == 2 && $datatoimport)
 // STEP 3: Page to select file
 if ($step == 3 && $datatoimport)
 {
-	$param = '&datatoimport='.$datatoimport.'&format='.$format;
-	if ($excludefirstline) $param .= '&excludefirstline='.$excludefirstline;
-	if ($endatlinenb) $param .= '&endatlinenb='.$endatlinenb;
+	$param = '&datatoimport='.urlencode($datatoimport).'&format='.urlencode($format);
+	if ($excludefirstline) $param .= '&excludefirstline='.urlencode($excludefirstline);
+	if ($endatlinenb) $param .= '&endatlinenb='.urlencode($endatlinenb);
 	if ($separator) $param .= '&separator='.urlencode($separator);
 	if ($enclosure) $param .= '&enclosure='.urlencode($enclosure);
 
@@ -503,7 +490,7 @@ if ($step == 3 && $datatoimport)
 	// Module
 	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
 	print '<td>';
-	$titleofmodule = $objimport->array_import_module[0]->getName();
+	$titleofmodule = $objimport->array_import_module[0]['module']->getName();
 	// Special cas for import common to module/services
 	if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
 	print $titleofmodule;
@@ -512,7 +499,7 @@ if ($step == 3 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
@@ -562,7 +549,7 @@ if ($step == 3 && $datatoimport)
 	print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
 	print '<input type="hidden" value="'.$datatoimport.'" name="datatoimport">';
 
-	print '<span class="opacitymedium">'.$langs->trans("ChooseFileToImport", img_picto('', 'filenew')).'</span><br><br>';
+	print '<span class="opacitymedium">'.$langs->trans("ChooseFileToImport", img_picto('', 'next')).'</span><br><br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -612,9 +599,7 @@ if ($step == 3 && $datatoimport)
         $langs->load('other');
         $out .= ' ';
         $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
-	}
-	else
-	{
+	} else {
 	    $out .= ' ('.$langs->trans("UploadDisabled").')';
 	}
 	print $out;
@@ -654,11 +639,11 @@ if ($step == 3 && $datatoimport)
 			// Affiche date fichier
 			print '<td style="text-align:right">'.dol_print_date(dol_filemtime($dir.'/'.$file), 'dayhour').'</td>';
 			// Del button
-			print '<td style="text-align:right"><a href="'.$_SERVER['PHP_SELF'].'?action=delete&step=3'.$param.'&urlfile='.urlencode($relativepath);
+			print '<td style="text-align:right"><a href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&step=3'.$param.'&urlfile='.urlencode($relativepath);
 			print '">'.img_delete().'</a></td>';
 			// Action button
 			print '<td style="text-align:right">';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"), 'filenew').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'</a>';
 			print '</td>';
 			print '</tr>';
 		}
@@ -768,9 +753,9 @@ if ($step == 4 && $datatoimport)
 
 	// Now $array_match_file_to_database contains  fieldnb(1,2,3...)=>fielddatabase(key in $array_match_file_to_database)
 
-	$param = '&format='.$format.'&datatoimport='.$datatoimport.'&filetoimport='.urlencode($filetoimport);
-	if ($excludefirstline) $param .= '&excludefirstline='.$excludefirstline;
-	if ($endatlinenb) $param .= '&endatlinenb='.$endatlinenb;
+	$param = '&format='.$format.'&datatoimport='.urlencode($datatoimport).'&filetoimport='.urlencode($filetoimport);
+	if ($excludefirstline) $param .= '&excludefirstline='.urlencode($excludefirstline);
+	if ($endatlinenb) $param .= '&endatlinenb='.urlencode($endatlinenb);
 	if ($separator) $param .= '&separator='.urlencode($separator);
 	if ($enclosure) $param .= '&enclosure='.urlencode($enclosure);
 
@@ -788,7 +773,7 @@ if ($step == 4 && $datatoimport)
 	// Module
 	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
 	print '<td>';
-	$titleofmodule = $objimport->array_import_module[0]->getName();
+	$titleofmodule = $objimport->array_import_module[0]['module']->getName();
 	// Special cas for import common to module/services
 	if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
 	print $titleofmodule;
@@ -797,7 +782,7 @@ if ($step == 4 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
@@ -977,15 +962,12 @@ if ($step == 4 && $datatoimport)
 		// Source field info
 		$htmltext = '<b><u>'.$langs->trans("FieldSource").'</u></b><br>';
 		if ($filecolumn > count($fieldssource)) $htmltext .= $langs->trans("DataComeFromNoWhere").'<br>';
-		else
-		{
+		else {
 			if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 			{
 				$filecolumntoshow = $filecolumn;
 				$htmltext .= $langs->trans("DataComeFromFileFieldNb", $filecolumntoshow).'<br>';
-			}
-			else
-			{
+			} else {
 				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')    $htmltext .= $langs->trans("DataComeFromIdFoundFromRef", $filecolumn, $langs->transnoentitiesnoconv($entitylang)).'<br>';
 				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("DataComeFromIdFoundFromCodeId", $filecolumn, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).'<br>';
 			}
@@ -997,9 +979,7 @@ if ($step == 4 && $datatoimport)
 		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>';
-		}
-		else
-		{
+		} 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>';
@@ -1015,9 +995,7 @@ if ($step == 4 && $datatoimport)
 		if (empty($objimport->array_import_convertvalue[0][$code]))	// If source file does not need convertion
 		{
 			$htmltext .= $langs->trans("DataIsInsertedInto").'<br>';
-		}
-		else
-		{
+		} else {
 			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref')    $htmltext .= $langs->trans("DataIDSourceIsInsertedInto").'<br>';
 			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') $htmltext .= $langs->trans("DataCodeIDSourceIsInsertedInto").'<br>';
 		}
@@ -1127,9 +1105,7 @@ if ($step == 4 && $datatoimport)
 		if ($mandatoryfieldshavesource)
 		{
 			print '<a class="butAction" href="import.php?step=5'.$param.'&filetoimport='.urlencode($filetoimport).'">'.$langs->trans("NextStep").'</a>';
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SomeMandatoryFieldHaveNoSource")).'">'.$langs->trans("NextStep").'</a>';
 		}
 	}
@@ -1171,7 +1147,7 @@ if ($step == 4 && $datatoimport)
 		// List of existing import profils
 		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."import_model";
-		$sql .= " WHERE type = '".$datatoimport."'";
+		$sql .= " WHERE type = '".$db->escape($datatoimport)."'";
 		$sql .= " ORDER BY rowid";
 		$resql = $db->query($sql);
 		if ($resql)
@@ -1184,14 +1160,13 @@ if ($step == 4 && $datatoimport)
 				print '<tr class="oddeven"><td>';
 				print $obj->label;
 				print '</td><td style="text-align:right">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.$param.'&action=deleteprof&id='.$obj->rowid.'&filetoimport='.urlencode($filetoimport).'">';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step='.$step.$param.'&action=deleteprof&token='.newToken().'&id='.$obj->rowid.'&filetoimport='.urlencode($filetoimport).'">';
 				print img_delete();
 				print '</a>';
 				print '</tr>';
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($db);
 		}
 
@@ -1238,10 +1213,10 @@ if ($step == 5 && $datatoimport)
 
 	$nboflines = $obj->import_get_nb_of_lines($conf->import->dir_temp.'/'.$filetoimport);
 
-	$param = '&leftmenu=import&format='.$format.'&datatoimport='.$datatoimport.'&filetoimport='.urlencode($filetoimport).'&nboflines='.$nboflines.'&separator='.urlencode($separator).'&enclosure='.urlencode($enclosure);
+	$param = '&leftmenu=import&format='.urlencode($format).'&datatoimport='.urlencode($datatoimport).'&filetoimport='.urlencode($filetoimport).'&nboflines='.urlencode($nboflines).'&separator='.urlencode($separator).'&enclosure='.urlencode($enclosure);
 	$param2 = $param; // $param2 = $param without excludefirstline and endatlinenb
-	if ($excludefirstline)		$param .= '&excludefirstline='.$excludefirstline;
-	if ($endatlinenb)			$param .= '&endatlinenb='.$endatlinenb;
+	if ($excludefirstline)		$param .= '&excludefirstline='.urlencode($excludefirstline);
+	if ($endatlinenb)			$param .= '&endatlinenb='.urlencode($endatlinenb);
 	if (!empty($updatekeys))	$param .= '&updatekeys[]='.implode('&updatekeys[]=', $updatekeys);
 
 	llxHeader('', $langs->trans("NewImport"), 'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
@@ -1264,7 +1239,7 @@ if ($step == 5 && $datatoimport)
 	// Module
 	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
 	print '<td>';
-	$titleofmodule = $objimport->array_import_module[0]->getName();
+	$titleofmodule = $objimport->array_import_module[0]['module']->getName();
 	// Special cas for import common to module/services
 	if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
 	print $titleofmodule;
@@ -1273,7 +1248,7 @@ if ($step == 5 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
@@ -1328,9 +1303,7 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="number" class="maxwidth50" name="excludefirstlinebis" disabled="disabled" value="'.$excludefirstline.'">';
 	    print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
-	}
-	else
-	{
+	} else {
 	    print '<input type="number" class="maxwidth50" name="excludefirstline" value="'.$excludefirstline.'">';
 	    print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
 	}
@@ -1339,9 +1312,7 @@ if ($step == 5 && $datatoimport)
 	{
 	    print '<input type="text" class="maxwidth50" name="endatlinenbbis" disabled="disabled" value="'.$endatlinenb.'">';
 	    print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
-	}
-	else
-	{
+	} else {
 	    print '<input type="text" class="maxwidth50" name="endatlinenb" value="'.$endatlinenb.'">';
 	    print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
 	}
@@ -1356,9 +1327,7 @@ if ($step == 5 && $datatoimport)
 		if (count($updatekeys))
 		{
 			print $form->multiselectarray('updatekeysbis', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%', 'disabled');
-		}
-		else
-		{
+		} else {
 			print '<span class="opacitymedium">'.$langs->trans("NoUpdateAttempt").'</span> &nbsp; -';
 		}
 		foreach ($updatekeys as $val) {
@@ -1370,9 +1339,7 @@ if ($step == 5 && $datatoimport)
         {   //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
-		{
+		} else {
 			print '<span class="opacitymedium">'.$langs->trans("UpdateNotYetSupportedForThisImport").'</span>';
 		}
 	}
@@ -1427,8 +1394,7 @@ if ($step == 5 && $datatoimport)
 			}*/
 			print $newval;
 		}
-	}
-	else print $langs->trans("Error");
+	} else print $langs->trans("Error");
 	print '</td></tr>';
 
 	// Fields imported
@@ -1470,15 +1436,11 @@ if ($step == 5 && $datatoimport)
         if ($user->rights->import->run)
         {
             print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
-        }
-        else
-        {
+        } else {
             print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
         }
         print '</div>';
-    }
-    else
-    {
+    } else {
         // Launch import
         $arrayoferrors = array();
         $arrayofwarnings = array();
@@ -1528,9 +1490,7 @@ if ($step == 5 && $datatoimport)
             }
             // Close file
             $obj->import_close_file();
-        }
-        else
-        {
+        } else {
             print $langs->trans("ErrorFailedToOpenFile", $pathfile);
         }
 
@@ -1560,8 +1520,7 @@ if ($step == 5 && $datatoimport)
         	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>';
+		} else print $langs->trans("NbOfLinesOK", $nbok).'<br><br>';
 
         // Show Errors
         //var_dump($arrayoferrors);
@@ -1628,16 +1587,12 @@ if ($step == 5 && $datatoimport)
             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
-            {
+            } 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
-        {
+        } 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>';
@@ -1687,9 +1642,9 @@ if ($step == 6 && $datatoimport)
 
 	$nboflines = (!empty($_GET["nboflines"]) ? $_GET["nboflines"] : dol_count_nb_of_line($conf->import->dir_temp.'/'.$filetoimport));
 
-	$param = '&format='.$format.'&datatoimport='.$datatoimport.'&filetoimport='.urlencode($filetoimport).'&nboflines='.$nboflines;
-	if ($excludefirstline) $param .= '&excludefirstline='.$excludefirstline;
-	if ($endatlinenb) $param .= '&endatlinenb='.$endatlinenb;
+	$param = '&format='.$format.'&datatoimport='.urlencode($datatoimport).'&filetoimport='.urlencode($filetoimport).'&nboflines='.urlencode($nboflines);
+	if ($excludefirstline) $param .= '&excludefirstline='.urlencode($excludefirstline);
+	if ($endatlinenb) $param .= '&endatlinenb='.urlencode($endatlinenb);
 	if ($separator) $param .= '&separator='.urlencode($separator);
 	if ($enclosure) $param .= '&enclosure='.urlencode($enclosure);
 
@@ -1707,7 +1662,7 @@ if ($step == 6 && $datatoimport)
 	// Module
 	print '<tr><td class="titlefield">'.$langs->trans("Module").'</td>';
 	print '<td>';
-	$titleofmodule = $objimport->array_import_module[0]->getName();
+	$titleofmodule = $objimport->array_import_module[0]['module']->getName();
 	// Special cas for import common to module/services
 	if (in_array($objimport->array_import_code[0], array('produit_supplierprices', 'produit_multiprice', 'produit_languages'))) $titleofmodule = $langs->trans("ProductOrService");
 	print $titleofmodule;
@@ -1716,7 +1671,7 @@ if ($step == 6 && $datatoimport)
 	// Lot de donnees a importer
 	print '<tr><td>'.$langs->trans("DatasetToImport").'</td>';
 	print '<td>';
-	print img_object($objimport->array_import_module[0]->getName(), $objimport->array_import_icon[0]).' ';
+	print img_object($objimport->array_import_module[0]['module']->getName(), $objimport->array_import_icon[0]).' ';
 	print $objimport->array_import_label[0];
 	print '</td></tr>';
 
@@ -1823,8 +1778,7 @@ if ($step == 6 && $datatoimport)
 			}*/
 			print $newval;
 		}
-	}
-	else print $langs->trans("Error");
+	} else print $langs->trans("Error");
 	print '</td></tr>';
 
 	// Fields imported
@@ -1896,15 +1850,12 @@ if ($step == 6 && $datatoimport)
 		}
 		// Close file
 		$obj->import_close_file();
-	}
-	else
-	{
+	} else {
 		print $langs->trans("ErrorFailedToOpenFile", $pathfile);
 	}
 
 	if (count($arrayoferrors) > 0) $db->rollback(); // We force rollback because this was errors.
-	else
-	{
+	else {
 	    $error = 0;
 
 		// Run the sql after import if defined
@@ -1989,8 +1940,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		print $langs->trans("NoFields");
 		print '</td>';
 		print '</tr>';
-	}
-	elseif ($key == 'none')	// Empty line
+	} elseif ($key == 'none')	// Empty line
 	{
 		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
@@ -2000,8 +1950,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		print '&nbsp;';
 		print '</td>';
 		print '</tr>';
-	}
-	else	// Print field of source file
+	} else // Print field of source file
 	{
 		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php
index 365df6086f4..bc68b53cfd0 100644
--- a/htdocs/imports/index.php
+++ b/htdocs/imports/index.php
@@ -45,69 +45,18 @@ llxHeader('', $langs->trans("ImportArea"), 'EN:Module_Imports_En|FR:Module_Impor
 print load_fiche_titre($langs->trans("ImportArea"));
 
 print $langs->trans("FormatedImportDesc1").'<br>';
-//print $langs->trans("FormatedImportDesc2").'<br>';
 print '<br>';
 
 
-//print '<div class="fichecenter"><div class="fichehalfleft">';
-
-
-// List of import set
-/*
-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("ImportableDatas").'</td>';
-//print '<td>&nbsp;</td>';
-print '</tr>';
-
-if (count($import->array_import_code))
-{
-	foreach ($import->array_import_code as $key => $value)
-	{
-		print '<tr class="oddeven"><td>';
-		print img_object($import->array_import_module[$key]->getName(),$import->array_import_module[$key]->picto).' ';
-		print $import->array_import_module[$key]->getName();
-		print '</td><td>';
-		$string=$langs->trans($import->array_import_label[$key]);
-		print ($string!=$import->array_import_label[$key]?$string:$import->array_import_label[$key]);
-		print '</td>';
-		//        print '<td width="24">';
-		//        print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&amp;datatoimport='.$import->array_import_code[$key].'&amp;action=cleanselect">'.img_picto($langs->trans("NewImport"),'filenew').'</a>';
-		//        print '</td>';
-		print '</tr>';
-
-	}
-}
-else
-{
-	print '<tr><td '.$bc[false].' colspan="2">'.$langs->trans("NoImportableData").'</td></tr>';
-}
-print '</table>';
-print '</div>';
-print '<br>';
-*/
-
 print '<div class="center">';
 if (count($import->array_import_code))
 {
-	//if ($user->rights->import->run)
-	//{
     print dolGetButtonTitle($langs->trans('NewImport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/imports/import.php?leftmenu=import');
-	//}
-	//else
-	//{
-	//	print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("NewImport").'</a>';
-	//}
 }
 print '</div>';
 print '<br>';
 
 
-//print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-
-
 // List of available import format
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
@@ -136,8 +85,6 @@ print '</table>';
 print '</div>';
 
 
-//print '</div></div></div>';
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/includes/DebugBar/DataCollector/AssetProvider.php b/htdocs/includes/DebugBar/DataCollector/AssetProvider.php
deleted file mode 100644
index 6910f737e17..00000000000
--- a/htdocs/includes/DebugBar/DataCollector/AssetProvider.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
- * This file is part of the DebugBar package.
- *
- * (c) 2013 Maxime Bouroumeau-Fuseau
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace DebugBar\DataCollector;
-
-/**
- * Indicates that a DataCollector provides some assets
- */
-interface AssetProvider
-{
-    /**
-     * Returns an array with the following keys:
-     *  - base_path
-     *  - base_url
-     *  - css: an array of filenames
-     *  - js: an array of filenames
-     *
-     * @return array
-     */
-    function getAssets();
-}
diff --git a/htdocs/includes/DebugBar/DataCollector/ConfigCollector.php b/htdocs/includes/DebugBar/DataCollector/ConfigCollector.php
deleted file mode 100644
index 7b4ac909f88..00000000000
--- a/htdocs/includes/DebugBar/DataCollector/ConfigCollector.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- * This file is part of the DebugBar package.
- *
- * (c) 2013 Maxime Bouroumeau-Fuseau
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace DebugBar\DataCollector;
-
-/**
- * Collects array data
- */
-class ConfigCollector extends DataCollector implements Renderable
-{
-    protected $name;
-
-    protected $data;
-
-    /**
-     * @param array  $data
-     * @param string $name
-     */
-    public function __construct(array $data = array(), $name = 'config')
-    {
-        $this->name = $name;
-        $this->data = $data;
-    }
-
-    /**
-     * Sets the data
-     *
-     * @param array $data
-     */
-    public function setData(array $data)
-    {
-        $this->data = $data;
-    }
-
-    public function collect()
-    {
-        $data = array();
-        foreach ($this->data as $k => $v) {
-            if (!is_string($v)) {
-                $v = $this->getDataFormatter()->formatVar($v);
-            }
-            $data[$k] = $v;
-        }
-        return $data;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getWidgets()
-    {
-        $name = $this->getName();
-        return array(
-            "$name" => array(
-                "icon" => "gear",
-                "widget" => "PhpDebugBar.Widgets.VariableListWidget",
-                "map" => "$name",
-                "default" => "{}"
-            )
-        );
-    }
-}
diff --git a/htdocs/includes/DebugBar/DataCollector/DataCollector.php b/htdocs/includes/DebugBar/DataCollector/DataCollector.php
deleted file mode 100644
index 081f66e6872..00000000000
--- a/htdocs/includes/DebugBar/DataCollector/DataCollector.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/*
- * This file is part of the DebugBar package.
- *
- * (c) 2013 Maxime Bouroumeau-Fuseau
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace DebugBar\DataCollector;
-
-use DebugBar\DataFormatter\DataFormatter;
-use DebugBar\DataFormatter\DataFormatterInterface;
-
-/**
- * Abstract class for data collectors
- */
-abstract class DataCollector implements DataCollectorInterface
-{
-    private static $defaultDataFormatter;
-
-    protected $dataFormater;
-
-    /**
-     * Sets the default data formater instance used by all collectors subclassing this class
-     *
-     * @param DataFormatterInterface $formater
-     */
-    public static function setDefaultDataFormatter(DataFormatterInterface $formater)
-    {
-        self::$defaultDataFormatter = $formater;
-    }
-
-    /**
-     * Returns the default data formater
-     *
-     * @return DataFormatterInterface
-     */
-    public static function getDefaultDataFormatter()
-    {
-        if (self::$defaultDataFormatter === null) {
-            self::$defaultDataFormatter = new DataFormatter();
-        }
-        return self::$defaultDataFormatter;
-    }
-
-    /**
-     * Sets the data formater instance used by this collector
-     *
-     * @param DataFormatterInterface $formater
-     */
-    public function setDataFormatter(DataFormatterInterface $formater)
-    {
-        $this->dataFormater = $formater;
-        return $this;
-    }
-
-    public function getDataFormatter()
-    {
-        if ($this->dataFormater === null) {
-            $this->dataFormater = self::getDefaultDataFormatter();
-        }
-        return $this->dataFormater;
-    }
-
-    /**
-     * @deprecated
-     */
-    public function formatVar($var)
-    {
-        return $this->getDataFormatter()->formatVar($var);
-    }
-
-    /**
-     * @deprecated
-     */
-    public function formatDuration($seconds)
-    {
-        return $this->getDataFormatter()->formatDuration($seconds);
-    }
-
-    /**
-     * @deprecated
-     */
-    public function formatBytes($size, $precision = 2)
-    {
-        return $this->getDataFormatter()->formatBytes($size, $precision);
-    }
-}
diff --git a/htdocs/includes/DebugBar/DataCollector/PDO/TraceablePDO.php b/htdocs/includes/DebugBar/DataCollector/PDO/TraceablePDO.php
deleted file mode 100644
index 5f7688b978e..00000000000
--- a/htdocs/includes/DebugBar/DataCollector/PDO/TraceablePDO.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-namespace DebugBar\DataCollector\PDO;
-
-use PDO;
-use PDOException;
-
-/**
- * A PDO proxy which traces statements
- */
-class TraceablePDO extends PDO
-{
-    protected $pdo;
-
-    protected $executedStatements = array();
-
-    public function __construct(PDO $pdo)
-    {
-        $this->pdo = $pdo;
-        $this->pdo->setAttribute(PDO::ATTR_STATEMENT_CLASS, array('DebugBar\DataCollector\PDO\TraceablePDOStatement', array($this)));
-    }
-
-    public function beginTransaction()
-    {
-        return $this->pdo->beginTransaction();
-    }
-
-    public function commit()
-    {
-        return $this->pdo->commit();
-    }
-
-    public function errorCode()
-    {
-        return $this->pdo->errorCode();
-    }
-
-    public function errorInfo()
-    {
-        return $this->pdo->errorInfo();
-    }
-
-    public function exec($sql)
-    {
-        return $this->profileCall('exec', $sql, func_get_args());
-    }
-
-    public function getAttribute($attr)
-    {
-        return $this->pdo->getAttribute($attr);
-    }
-
-    public function inTransaction()
-    {
-        return $this->pdo->inTransaction();
-    }
-
-    public function lastInsertId($name = null)
-    {
-        return $this->pdo->lastInsertId($name);
-    }
-
-    public function prepare($sql, $driver_options = array())
-    {
-        return $this->pdo->prepare($sql, $driver_options);
-    }
-
-    public function query($sql)
-    {
-        return $this->profileCall('query', $sql, func_get_args());
-    }
-
-    public function quote($expr, $parameter_type = PDO::PARAM_STR)
-    {
-        return $this->pdo->quote($expr, $parameter_type);
-    }
-
-    public function rollBack()
-    {
-        return $this->pdo->rollBack();
-    }
-
-    public function setAttribute($attr, $value)
-    {
-        return $this->pdo->setAttribute($attr, $value);
-    }
-
-    /**
-     * Profiles a call to a PDO method
-     *
-     * @param string $method
-     * @param string $sql
-     * @param array $args
-     * @return mixed The result of the call
-     */
-    protected function profileCall($method, $sql, array $args)
-    {
-        $trace = new TracedStatement($sql);
-        $trace->start();
-
-        $ex = null;
-        try {
-            $result = call_user_func_array(array($this->pdo, $method), $args);
-        } catch (PDOException $e) {
-            $ex = $e;
-        }
-
-        if ($this->pdo->getAttribute(PDO::ATTR_ERRMODE) !== PDO::ERRMODE_EXCEPTION && $result === false) {
-            $error = $this->pdo->errorInfo();
-            $ex = new PDOException($error[2], $error[0]);
-        }
-
-        $trace->end($ex);
-        $this->addExecutedStatement($trace);
-
-        if ($this->pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_EXCEPTION && $ex !== null) {
-            throw $ex;
-        }
-        return $result;
-    }
-
-    /**
-     * Adds an executed TracedStatement
-     *
-     * @param TracedStatement $stmt
-     */
-    public function addExecutedStatement(TracedStatement $stmt)
-    {
-        $this->executedStatements[] = $stmt;
-    }
-
-    /**
-     * Returns the accumulated execution time of statements
-     *
-     * @return int
-     */
-    public function getAccumulatedStatementsDuration()
-    {
-        return array_reduce($this->executedStatements, function ($v, $s) { return $v + $s->getDuration(); });
-    }
-
-    /**
-     * Returns the peak memory usage while performing statements
-     *
-     * @return int
-     */
-    public function getMemoryUsage()
-    {
-        return array_reduce($this->executedStatements, function ($v, $s) { return $v + $s->getMemoryUsage(); });
-    }
-
-    /**
-     * Returns the peak memory usage while performing statements
-     *
-     * @return int
-     */
-    public function getPeakMemoryUsage()
-    {
-        return array_reduce($this->executedStatements, function ($v, $s) { $m = $s->getEndMemory(); return $m > $v ? $m : $v; });
-    }
-
-    /**
-     * Returns the list of executed statements as TracedStatement objects
-     *
-     * @return array
-     */
-    public function getExecutedStatements()
-    {
-        return $this->executedStatements;
-    }
-
-    /**
-     * Returns the list of failed statements
-     *
-     * @return array
-     */
-    public function getFailedExecutedStatements()
-    {
-        return array_filter($this->executedStatements, function ($s) { return !$s->isSuccess(); });
-    }
-
-    public function __get($name)
-    {
-        return $this->pdo->$name;
-    }
-
-    public function __set($name, $value)
-    {
-        $this->pdo->$name = $value;
-    }
-
-    public function __call($name, $args)
-    {
-        return call_user_func_array(array($this->pdo, $name), $args);
-    }
-}
diff --git a/htdocs/includes/DebugBar/DataCollector/PDO/TraceablePDOStatement.php b/htdocs/includes/DebugBar/DataCollector/PDO/TraceablePDOStatement.php
deleted file mode 100644
index b903b10c361..00000000000
--- a/htdocs/includes/DebugBar/DataCollector/PDO/TraceablePDOStatement.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace DebugBar\DataCollector\PDO;
-
-use PDO;
-use PDOException;
-use PDOStatement;
-
-/**
- * A traceable PDO statement to use with Traceablepdo
- */
-class TraceablePDOStatement extends PDOStatement
-{
-    protected $pdo;
-
-    protected $boundParameters = array();
-
-    protected function __construct(TraceablePDO $pdo)
-    {
-        $this->pdo = $pdo;
-    }
-
-    public function bindColumn($column, &$param, $type = null, $maxlen = null, $driverdata = null)
-    {
-        $this->boundParameters[$column] = $param;
-        $args = array_merge(array($column, &$param), array_slice(func_get_args(), 2));
-        return call_user_func_array(array("parent", 'bindColumn'), $args);
-    }
-
-    public function bindParam($param, &$var, $data_type = PDO::PARAM_STR, $length = null, $driver_options = null)
-    {
-        $this->boundParameters[$param] = $var;
-        $args = array_merge(array($param, &$var), array_slice(func_get_args(), 2));
-        return call_user_func_array(array("parent", 'bindParam'), $args);
-    }
-
-    public function bindValue($param, $value, $data_type = PDO::PARAM_STR)
-    {
-        $this->boundParameters[$param] = $value;
-        return call_user_func_array(array("parent", 'bindValue'), func_get_args());
-    }
-
-    public function execute($params = null)
-    {
-        $preparedId = spl_object_hash($this);
-        $boundParameters = $this->boundParameters;
-        if (is_array($params)) {
-            $boundParameters = array_merge($boundParameters, $params);
-        }
-
-        $trace = new TracedStatement($this->queryString, $boundParameters, $preparedId);
-        $trace->start();
-
-        $ex = null;
-        try {
-            $result = parent::execute($params);
-        } catch (PDOException $e) {
-            $ex = $e;
-        }
-
-        if ($this->pdo->getAttribute(PDO::ATTR_ERRMODE) !== PDO::ERRMODE_EXCEPTION && $result === false) {
-            $error = $this->errorInfo();
-            $ex = new PDOException($error[2], $error[0]);
-        }
-
-        $trace->end($ex, $this->rowCount());
-        $this->pdo->addExecutedStatement($trace);
-
-        if ($this->pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_EXCEPTION && $ex !== null) {
-            throw $ex;
-        }
-        return $result;
-    }
-}
diff --git a/htdocs/includes/DebugBar/DataCollector/RequestDataCollector.php b/htdocs/includes/DebugBar/DataCollector/RequestDataCollector.php
deleted file mode 100644
index 1b8de32cb52..00000000000
--- a/htdocs/includes/DebugBar/DataCollector/RequestDataCollector.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * This file is part of the DebugBar package.
- *
- * (c) 2013 Maxime Bouroumeau-Fuseau
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace DebugBar\DataCollector;
-
-/**
- * Collects info about the current request
- */
-class RequestDataCollector extends DataCollector implements Renderable
-{
-    public function collect()
-    {
-        $vars = array('_GET', '_POST', '_SESSION', '_COOKIE', '_SERVER');
-        $data = array();
-
-        foreach ($vars as $var) {
-            if (isset($GLOBALS[$var])) {
-                $data["$" . $var] = $this->getDataFormatter()->formatVar($GLOBALS[$var]);
-            }
-        }
-
-        return $data;
-    }
-
-    public function getName()
-    {
-        return 'request';
-    }
-
-    public function getWidgets()
-    {
-        return array(
-            "request" => array(
-                "icon" => "tags",
-                "widget" => "PhpDebugBar.Widgets.VariableListWidget",
-                "map" => "request",
-                "default" => "{}"
-            )
-        );
-    }
-}
diff --git a/htdocs/includes/DebugBar/DataFormatter/DataFormatter.php b/htdocs/includes/DebugBar/DataFormatter/DataFormatter.php
deleted file mode 100644
index 73269459838..00000000000
--- a/htdocs/includes/DebugBar/DataFormatter/DataFormatter.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/*
- * This file is part of the DebugBar package.
- *
- * (c) 2013 Maxime Bouroumeau-Fuseau
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace DebugBar\DataFormatter;
-
-class DataFormatter implements DataFormatterInterface
-{
-    public function formatVar($data)
-    {
-        return $this->kintLite($data);
-    }
-
-    public function formatDuration($seconds)
-    {
-        if ($seconds < 0.001) {
-            return round($seconds * 1000000) . 'μs';
-        } elseif ($seconds < 1) {
-            return round($seconds * 1000, 2) . 'ms';
-        }
-        return round($seconds, 2) . 's';
-    }
-
-    public function formatBytes($size, $precision = 2)
-    {
-        if ($size === 0 || $size === null) {
-            return "0B";
-        }
-        $base = log($size) / log(1024);
-        $suffixes = array('B', 'KB', 'MB', 'GB', 'TB');
-        return round(pow(1024, $base - floor($base)), $precision) . $suffixes[floor($base)];
-    }
-
-     /**
-     * lightweight version of Kint::dump(). Uses whitespace for formatting instead of html
-     * sadly not DRY yet
-     *
-     * Extracted from Kint.class.php in raveren/kint, https://github.com/raveren/kint
-     * Copyright (c) 2013 Rokas Šleinius (raveren@gmail.com)
-     *
-     * @param mixed $var
-     * @param int $level
-     *
-     * @return string
-     */
-    protected function kintLite(&$var, $level = 0)
-    {
-        // initialize function names into variables for prettier string output (html and implode are also DRY)
-        $html     = "htmlspecialchars";
-        $implode  = "implode";
-        $strlen   = "strlen";
-        $count    = "count";
-        $getClass = "get_class";
-
-        if ( $var === null ) {
-            return 'NULL';
-        } elseif ( is_bool( $var ) ) {
-            return 'bool ' . ( $var ? 'TRUE' : 'FALSE' );
-        } elseif ( is_float( $var ) ) {
-            return 'float ' . $var;
-        } elseif ( is_int( $var ) ) {
-            return 'integer ' . $var;
-        } elseif ( is_resource( $var ) ) {
-            if ( ( $type = get_resource_type( $var ) ) === 'stream' and $meta = stream_get_meta_data( $var ) ) {
-                if ( isset( $meta['uri'] ) ) {
-                    $file = $meta['uri'];
-
-                    return "resource ({$type}) {$html( $file, 0 )}";
-                } else {
-                    return "resource ({$type})";
-                }
-            } else {
-                return "resource ({$type})";
-            }
-        } elseif ( is_string( $var ) ) {
-            return "string ({$strlen( $var )}) \"{$html( $var )}\"";
-        } elseif ( is_array( $var ) ) {
-            $output = array();
-            $space  = str_repeat( $s = '    ', $level );
-
-            static $marker;
-
-            if ( $marker === null ) {
-                // Make a unique marker
-                $marker = uniqid( "\x00" );
-            }
-
-            if ( empty( $var ) ) {
-                return "array()";
-            } elseif ( isset( $var[$marker] ) ) {
-                $output[] = "[\n$space$s*RECURSION*\n$space]";
-            } elseif ( $level < 7 ) {
-                $isSeq = array_keys( $var ) === range( 0, count( $var ) - 1 );
-
-                $output[] = "[";
-
-                $var[$marker] = true;
-
-                foreach ( $var as $key => &$val ) {
-                    if ( $key === $marker ) {
-                        continue;
-                    }
-
-                    $key = $space . $s . ( $isSeq ? "" : "'{$html( $key, 0 )}' => " );
-
-                    $dump     = $this->kintLite( $val, $level + 1 );
-                    $output[] = "{$key}{$dump}";
-                }
-
-                unset( $var[$marker] );
-                $output[] = "$space]";
-            } else {
-                $output[] = "[\n$space$s*depth too great*\n$space]";
-            }
-            return "array({$count( $var )}) {$implode( "\n", $output )}";
-        } elseif ( is_object( $var ) ) {
-            if ( $var instanceof SplFileInfo ) {
-                return "object SplFileInfo " . $var->getRealPath();
-            }
-
-            // Copy the object as an array
-            $array = (array) $var;
-
-            $output = array();
-            $space  = str_repeat( $s = '    ', $level );
-
-            $hash = spl_object_hash( $var );
-
-            // Objects that are being dumped
-            static $objects = array();
-
-            if ( empty( $array ) ) {
-                return "object {$getClass( $var )} {}";
-            } elseif ( isset( $objects[$hash] ) ) {
-                $output[] = "{\n$space$s*RECURSION*\n$space}";
-            } elseif ( $level < 7 ) {
-                $output[]       = "{";
-                $objects[$hash] = true;
-
-                foreach ( $array as $key => & $val ) {
-                    if ( $key[0] === "\x00" ) {
-                        $access = $key[1] === "*" ? "protected" : "private";
-
-                        // Remove the access level from the variable name
-                        $key = substr( $key, strrpos( $key, "\x00" ) + 1 );
-                    } else {
-                        $access = "public";
-                    }
-
-                    $output[] = "$space$s$access $key -> " . $this->kintLite( $val, $level + 1 );
-                }
-                unset( $objects[$hash] );
-                $output[] = "$space}";
-            } else {
-                $output[] = "{\n$space$s*depth too great*\n$space}";
-            }
-
-            return "object {$getClass( $var )} ({$count( $array )}) {$implode( "\n", $output )}";
-        } else {
-            return gettype( $var ) . htmlspecialchars( var_export( $var, true ), ENT_NOQUOTES );
-        }
-    }
-}
diff --git a/htdocs/includes/DebugBar/RequestIdGenerator.php b/htdocs/includes/DebugBar/RequestIdGenerator.php
deleted file mode 100644
index 934f407ff8f..00000000000
--- a/htdocs/includes/DebugBar/RequestIdGenerator.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/*
- * This file is part of the DebugBar package.
- *
- * (c) 2013 Maxime Bouroumeau-Fuseau
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace DebugBar;
-
-/**
- * Request id generator based on the $_SERVER array
- */
-class RequestIdGenerator implements RequestIdGeneratorInterface
-{
-    public function generate()
-    {
-        return md5(serialize($_SERVER) . microtime());
-    }
-}
diff --git a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css b/htdocs/includes/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css
deleted file mode 100644
index ec53d4d6d5b..00000000000
--- a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/*!
- *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.2.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}
\ No newline at end of file
diff --git a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf b/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf
deleted file mode 100644
index 81c9ad949b4..00000000000
Binary files a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf and /dev/null differ
diff --git a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot b/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot
deleted file mode 100644
index 84677bc0c5f..00000000000
Binary files a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg b/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg
deleted file mode 100644
index d907b25ae60..00000000000
--- a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,520 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#xd8;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" horiz-adv-x="1537" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" horiz-adv-x="1537" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1536 160q0 -119 -84.5 -203.5t-203.5 -84.5h-192v608h203l30 224h-233v143q0 54 28 83t96 29l132 1v207q-96 9 -180 9q-136 0 -218 -80.5t-82 -225.5v-166h-224v-224h224v-608h-544q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5v-960z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1792" />
-<glyph unicode="&#xf117;" horiz-adv-x="1792" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
-<glyph unicode="&#xf15c;" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />
-<glyph unicode="&#xf174;" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf197;" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
-<glyph unicode="&#xf198;" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
-<glyph unicode="&#xf199;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
-<glyph unicode="&#xf19a;" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />
-<glyph unicode="&#xf19b;" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
-<glyph unicode="&#xf19c;" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
-<glyph unicode="&#xf19d;" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
-<glyph unicode="&#xf19e;" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-<glyph unicode="&#xf1a0;" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
-<glyph unicode="&#xf1a1;" horiz-adv-x="1984" d="M831 572q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41t96.5 -41t40.5 -98zM1292 711q56 0 96.5 -41t40.5 -98q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41zM1984 722q0 -62 -31 -114t-83 -82q5 -33 5 -61 q0 -121 -68.5 -230.5t-197.5 -193.5q-125 -82 -285.5 -125.5t-335.5 -43.5q-176 0 -336.5 43.5t-284.5 125.5q-129 84 -197.5 193t-68.5 231q0 29 5 66q-48 31 -77 81.5t-29 109.5q0 94 66 160t160 66q83 0 148 -55q248 158 592 164l134 423q4 14 17.5 21.5t28.5 4.5 l347 -82q22 50 68.5 81t102.5 31q77 0 131.5 -54.5t54.5 -131.5t-54.5 -132t-131.5 -55q-76 0 -130.5 54t-55.5 131l-315 74l-116 -366q327 -14 560 -166q64 58 151 58q94 0 160 -66t66 -160zM1664 1459q-45 0 -77 -32t-32 -77t32 -77t77 -32t77 32t32 77t-32 77t-77 32z M77 722q0 -67 51 -111q49 131 180 235q-36 25 -82 25q-62 0 -105.5 -43.5t-43.5 -105.5zM1567 105q112 73 171.5 166t59.5 194t-59.5 193.5t-171.5 165.5q-116 75 -265.5 115.5t-313.5 40.5t-313.5 -40.5t-265.5 -115.5q-112 -73 -171.5 -165.5t-59.5 -193.5t59.5 -194 t171.5 -166q116 -75 265.5 -115.5t313.5 -40.5t313.5 40.5t265.5 115.5zM1850 605q57 46 57 117q0 62 -43.5 105.5t-105.5 43.5q-49 0 -86 -28q131 -105 178 -238zM1258 237q11 11 27 11t27 -11t11 -27.5t-11 -27.5q-99 -99 -319 -99h-2q-220 0 -319 99q-11 11 -11 27.5 t11 27.5t27 11t27 -11q77 -77 265 -77h2q188 0 265 77z" />
-<glyph unicode="&#xf1a2;" d="M950 393q7 7 17.5 7t17.5 -7t7 -18t-7 -18q-65 -64 -208 -64h-1h-1q-143 0 -207 64q-8 7 -8 18t8 18q7 7 17.5 7t17.5 -7q49 -51 172 -51h1h1q122 0 173 51zM671 613q0 -37 -26 -64t-63 -27t-63 27t-26 64t26 63t63 26t63 -26t26 -63zM1214 1049q-29 0 -50 21t-21 50 q0 30 21 51t50 21q30 0 51 -21t21 -51q0 -29 -21 -50t-51 -21zM1216 1408q132 0 226 -94t94 -227v-894q0 -133 -94 -227t-226 -94h-896q-132 0 -226 94t-94 227v894q0 133 94 227t226 94h896zM1321 596q35 14 57 45.5t22 70.5q0 51 -36 87.5t-87 36.5q-60 0 -98 -48 q-151 107 -375 115l83 265l206 -49q1 -50 36.5 -85t84.5 -35q50 0 86 35.5t36 85.5t-36 86t-86 36q-36 0 -66 -20.5t-45 -53.5l-227 54q-9 2 -17.5 -2.5t-11.5 -14.5l-95 -302q-224 -4 -381 -113q-36 43 -93 43q-51 0 -87 -36.5t-36 -87.5q0 -37 19.5 -67.5t52.5 -45.5 q-7 -25 -7 -54q0 -98 74 -181.5t201.5 -132t278.5 -48.5q150 0 277.5 48.5t201.5 132t74 181.5q0 27 -6 54zM971 702q37 0 63 -26t26 -63t-26 -64t-63 -27t-63 27t-26 64t26 63t63 26z" />
-<glyph unicode="&#xf1a3;" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1a4;" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
-<glyph unicode="&#xf1a5;" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf1a6;" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />
-<glyph unicode="&#xf1a7;" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1a8;" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
-<glyph unicode="&#xf1a9;" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
-<glyph unicode="&#xf1aa;" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />
-<glyph unicode="&#xf1ab;" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />
-<glyph unicode="&#xf1ac;" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
-<glyph unicode="&#xf1ad;" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
-<glyph unicode="&#xf1ae;" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1b0;" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />
-<glyph unicode="&#xf1b1;" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
-<glyph unicode="&#xf1b2;" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />
-<glyph unicode="&#xf1b3;" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />
-<glyph unicode="&#xf1b4;" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
-<glyph unicode="&#xf1b5;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
-<glyph unicode="&#xf1b6;" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
-<glyph unicode="&#xf1b7;" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />
-<glyph unicode="&#xf1b8;" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
-<glyph unicode="&#xf1b9;" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf1ba;" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
-<glyph unicode="&#xf1bb;" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
-<glyph unicode="&#xf1bc;" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1bd;" d="M1397 1408q58 0 98.5 -40.5t40.5 -98.5v-1258q0 -58 -40.5 -98.5t-98.5 -40.5h-1258q-58 0 -98.5 40.5t-40.5 98.5v1258q0 58 40.5 98.5t98.5 40.5h1258zM1465 11v1258q0 28 -20 48t-48 20h-1258q-28 0 -48 -20t-20 -48v-1258q0 -28 20 -48t48 -20h1258q28 0 48 20t20 48 zM694 749l188 -387l533 145v-496q0 -7 -5.5 -12.5t-12.5 -5.5h-1258q-7 0 -12.5 5.5t-5.5 12.5v141l711 195l-212 439q4 1 12 2.5t12 1.5q170 32 303.5 21.5t221 -46t143.5 -94.5q27 -28 -25 -42q-64 -16 -256 -62l-97 198q-111 7 -240 -16zM1397 1287q7 0 12.5 -5.5 t5.5 -12.5v-428q-85 30 -188 52q-294 64 -645 12l-18 -3l-65 134h-233l85 -190q-132 -51 -230 -137v560q0 7 5.5 12.5t12.5 5.5h1258zM286 387q-14 -3 -26 4.5t-14 21.5q-24 203 166 305l129 -270z" />
-<glyph unicode="&#xf1be;" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
-<glyph unicode="&#xf1c0;" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
-<glyph unicode="&#xf1c1;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
-<glyph unicode="&#xf1c2;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />
-<glyph unicode="&#xf1c3;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />
-<glyph unicode="&#xf1c4;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
-<glyph unicode="&#xf1c5;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
-<glyph unicode="&#xf1c6;" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
-<glyph unicode="&#xf1c7;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
-<glyph unicode="&#xf1c8;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
-<glyph unicode="&#xf1c9;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
-<glyph unicode="&#xf1ca;" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
-<glyph unicode="&#xf1cb;" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
-<glyph unicode="&#xf1cc;" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
-<glyph unicode="&#xf1cd;" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-<glyph unicode="&#xf1ce;" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
-<glyph unicode="&#xf1d0;" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
-<glyph unicode="&#xf1d1;" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf1d2;" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d3;" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
-<glyph unicode="&#xf1d4;" d="M825 547l343 588h-150q-21 -39 -63.5 -118.5t-68 -128.5t-59.5 -118.5t-60 -128.5h-3q-21 48 -44.5 97t-52 105.5t-46.5 92t-54 104.5t-49 95h-150l323 -589v-435h134v436zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1d5;" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
-<glyph unicode="&#xf1d6;" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
-<glyph unicode="&#xf1d7;" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
-<glyph unicode="&#xf1d8;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
-<glyph unicode="&#xf1d9;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />
-<glyph unicode="&#xf1da;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1db;" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1dc;" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />
-<glyph unicode="&#xf1dd;" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
-<glyph unicode="&#xf1de;" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
-<glyph unicode="&#xf1e0;" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
-<glyph unicode="&#xf1e1;" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf1e2;" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf1e3;" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
-<glyph unicode="&#xf1e4;" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
-<glyph unicode="&#xf1e5;" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1e6;" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />
-<glyph unicode="&#xf1e7;" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
-<glyph unicode="&#xf1e8;" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
-<glyph unicode="&#xf1e9;" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
-<glyph unicode="&#xf1ea;" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
-<glyph unicode="&#xf1eb;" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
-<glyph unicode="&#xf1ec;" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1ed;" horiz-adv-x="1792" d="M1112 1090q0 159 -237 159h-70q-32 0 -59.5 -21.5t-34.5 -52.5l-63 -276q-2 -5 -2 -16q0 -24 17 -39.5t41 -15.5h53q69 0 128.5 13t112.5 41t83.5 81.5t30.5 126.5zM1716 938q0 -265 -220 -428q-219 -161 -612 -161h-61q-32 0 -59 -21.5t-34 -52.5l-73 -316 q-8 -36 -40.5 -61.5t-69.5 -25.5h-213q-31 0 -53 20t-22 51q0 10 13 65h151q34 0 64 23.5t38 56.5l73 316q8 33 37.5 57t63.5 24h61q390 0 607 160t217 421q0 129 -51 207q183 -92 183 -335zM1533 1123q0 -264 -221 -428q-218 -161 -612 -161h-60q-32 0 -59.5 -22t-34.5 -53 l-73 -315q-8 -36 -40 -61.5t-69 -25.5h-214q-31 0 -52.5 19.5t-21.5 51.5q0 8 2 20l300 1301q8 36 40.5 61.5t69.5 25.5h444q68 0 125 -4t120.5 -15t113.5 -30t96.5 -50.5t77.5 -74t49.5 -103.5t18.5 -136z" />
-<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
-<glyph unicode="&#xf1f0;" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f1;" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f2;" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
-<glyph unicode="&#xf1f3;" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
-<glyph unicode="&#xf1f4;" horiz-adv-x="2304" d="M322 689h-15q-19 0 -19 18q0 28 19 85q5 15 15 19.5t28 4.5q77 0 77 -49q0 -41 -30.5 -59.5t-74.5 -18.5zM664 528q-47 0 -47 29q0 62 123 62l3 -3q-5 -88 -79 -88zM1438 687h-15q-19 0 -19 19q0 28 19 85q5 15 14.5 19t28.5 4q77 0 77 -49q0 -41 -30.5 -59.5 t-74.5 -18.5zM1780 527q-47 0 -47 30q0 62 123 62l3 -3q-5 -89 -79 -89zM373 894h-128q-8 0 -14.5 -4t-8.5 -7.5t-7 -12.5q-3 -7 -45 -190t-42 -192q0 -7 5.5 -12.5t13.5 -5.5h62q25 0 32.5 34.5l15 69t32.5 34.5q47 0 87.5 7.5t80.5 24.5t63.5 52.5t23.5 84.5 q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM719 798q-38 0 -74 -6q-2 0 -8.5 -1t-9 -1.5l-7.5 -1.5t-7.5 -2t-6.5 -3t-6.5 -4t-5 -5t-4.5 -7t-4 -9q-9 -29 -9 -39t9 -10q5 0 21.5 5t19.5 6q30 8 58 8q74 0 74 -36q0 -11 -10 -14q-8 -2 -18 -3t-21.5 -1.5t-17.5 -1.5 q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5q0 -38 26 -59.5t64 -21.5q24 0 45.5 6.5t33 13t38.5 23.5q-3 -7 -3 -15t5.5 -13.5t12.5 -5.5h56q1 1 7 3.5t7.5 3.5t5 3.5t5 5.5t2.5 8l45 194q4 13 4 30q0 81 -145 81zM1247 793h-74q-22 0 -39 -23q-5 -7 -29.5 -51 t-46.5 -81.5t-26 -38.5l-5 4q0 77 -27 166q-1 5 -3.5 8.5t-6 6.5t-6.5 5t-8.5 3t-8.5 1.5t-9.5 1t-9 0.5h-10h-8.5q-38 0 -38 -21l1 -5q5 -53 25 -151t25 -143q2 -16 2 -24q0 -19 -30.5 -61.5t-30.5 -58.5q0 -13 40 -13q61 0 76 25l245 415q10 20 10 26q0 9 -8 9zM1489 892 h-129q-18 0 -29 -23q-6 -13 -46.5 -191.5t-40.5 -190.5q0 -20 43 -20h7.5h9h9t9.5 1t8.5 2t8.5 3t6.5 4.5t5.5 6t3 8.5l21 91q2 10 10.5 17t19.5 7q47 0 87.5 7t80.5 24.5t63.5 52.5t23.5 84q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM1835 798q-26 0 -74 -6 q-38 -6 -48 -16q-7 -8 -11 -19q-8 -24 -8 -39q0 -10 8 -10q1 0 41 12q30 8 58 8q74 0 74 -36q0 -12 -10 -14q-4 -1 -57 -7q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5t26 -58.5t64 -21.5q24 0 45 6t34 13t38 24q-3 -15 -3 -16q0 -5 2 -8.5t6.5 -5.5t8 -3.5 t10.5 -2t9.5 -0.5h9.5h8q42 0 48 25l45 194q3 15 3 31q0 81 -145 81zM2157 889h-55q-25 0 -33 -40q-10 -44 -36.5 -167t-42.5 -190v-5q0 -16 16 -18h1h57q10 0 18.5 6.5t10.5 16.5l83 374h-1l1 5q0 7 -5.5 12.5t-13.5 5.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048 q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f5;" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf1f6;" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f7;" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="&#xf1f8;" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf1f9;" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf1fa;" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
-<glyph unicode="&#xf1fb;" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
-<glyph unicode="&#xf1fc;" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
-<glyph unicode="&#xf1fd;" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
-<glyph unicode="&#xf1fe;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
-<glyph unicode="&#xf200;" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf201;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf202;" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
-<glyph unicode="&#xf203;" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf204;" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
-<glyph unicode="&#xf205;" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
-<glyph unicode="&#xf206;" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf207;" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
-<glyph unicode="&#xf208;" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
-<glyph unicode="&#xf209;" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
-<glyph unicode="&#xf20a;" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
-<glyph unicode="&#xf20b;" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf20c;" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
-<glyph unicode="&#xf20d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf20e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf b/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index 96a3639cdde..00000000000
Binary files a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff b/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 628b6a52a87..00000000000
Binary files a/htdocs/includes/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/htdocs/includes/DebugBar/Resources/vendor/highlightjs/styles/github.css b/htdocs/includes/DebugBar/Resources/vendor/highlightjs/styles/github.css
deleted file mode 100644
index 71967a3739c..00000000000
--- a/htdocs/includes/DebugBar/Resources/vendor/highlightjs/styles/github.css
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-
-github.com style (c) Vasily Polovnyov <vast@whiteants.net>
-
-*/
-
-.hljs {
-  display: block; padding: 0.5em;
-  color: #333;
-  background: #f8f8f8
-}
-
-.hljs-comment,
-.hljs-template_comment,
-.diff .hljs-header,
-.hljs-javadoc {
-  color: #998;
-  font-style: italic
-}
-
-.hljs-keyword,
-.css .rule .hljs-keyword,
-.hljs-winutils,
-.javascript .hljs-title,
-.nginx .hljs-title,
-.hljs-subst,
-.hljs-request,
-.hljs-status {
-  color: #333;
-  font-weight: bold
-}
-
-.hljs-number,
-.hljs-hexcolor,
-.ruby .hljs-constant {
-  color: #099;
-}
-
-.hljs-string,
-.hljs-tag .hljs-value,
-.hljs-phpdoc,
-.tex .hljs-formula {
-  color: #d14
-}
-
-.hljs-title,
-.hljs-id,
-.coffeescript .hljs-params,
-.scss .hljs-preprocessor {
-  color: #900;
-  font-weight: bold
-}
-
-.javascript .hljs-title,
-.lisp .hljs-title,
-.clojure .hljs-title,
-.hljs-subst {
-  font-weight: normal
-}
-
-.hljs-class .hljs-title,
-.haskell .hljs-type,
-.vhdl .hljs-literal,
-.tex .hljs-command {
-  color: #458;
-  font-weight: bold
-}
-
-.hljs-tag,
-.hljs-tag .hljs-title,
-.hljs-rules .hljs-property,
-.django .hljs-tag .hljs-keyword {
-  color: #000080;
-  font-weight: normal
-}
-
-.hljs-attribute,
-.hljs-variable,
-.lisp .hljs-body {
-  color: #008080
-}
-
-.hljs-regexp {
-  color: #009926
-}
-
-.hljs-symbol,
-.ruby .hljs-symbol .hljs-string,
-.lisp .hljs-keyword,
-.tex .hljs-special,
-.hljs-prompt {
-  color: #990073
-}
-
-.hljs-built_in,
-.lisp .hljs-title,
-.clojure .hljs-built_in {
-  color: #0086b3
-}
-
-.hljs-preprocessor,
-.hljs-pragma,
-.hljs-pi,
-.hljs-doctype,
-.hljs-shebang,
-.hljs-cdata {
-  color: #999;
-  font-weight: bold
-}
-
-.hljs-deletion {
-  background: #fdd
-}
-
-.hljs-addition {
-  background: #dfd
-}
-
-.diff .hljs-change {
-  background: #0086b3
-}
-
-.hljs-chunk {
-  color: #aaa
-}
diff --git a/htdocs/includes/DebugBar/Storage/MemcachedStorage.php b/htdocs/includes/DebugBar/Storage/MemcachedStorage.php
deleted file mode 100644
index 9c2eef70019..00000000000
--- a/htdocs/includes/DebugBar/Storage/MemcachedStorage.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
- * This file is part of the DebugBar package.
- *
- * (c) 2013 Maxime Bouroumeau-Fuseau
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace DebugBar\Storage;
-
-use Memcached;
-
-/**
- * Stores collected data into Memcache using the Memcached extension
- */
-class MemcachedStorage implements StorageInterface
-{
-    protected $memcached;
-
-    protected $keyNamespace;
-
-    /**
-     * @param Memcached $memcached
-     */
-    public function __construct(Memcached $memcached, $keyNamespace = 'phpdebugbar')
-    {
-        $this->memcached = $memcached;
-        $this->keyNamespace = $keyNamespace;
-    }
-
-    public function save($id, $data)
-    {
-        $key = $this->createKey($id);
-        $this->memcached->set($key, $data);
-        if (!$this->memcached->append($this->keyNamespace, "|$key")) {
-            $this->memcached->set($this->keyNamespace, $key);
-        }
-    }
-
-    public function get($id)
-    {
-        return $this->memcached->get($this->createKey($id));
-    }
-
-    public function find(array $filters = array(), $max = 20, $offset = 0)
-    {
-        if (!($keys = $this->memcached->get($this->keyNamespace))) {
-            return array();
-        }
-
-        $results = array();
-        foreach (explode('|', $keys) as $key) {
-            if ($data = $this->memcached->get($key)) {
-                $meta = $data['__meta'];
-                if ($this->filter($meta, $filters)) {
-                    $results[] = $meta;
-                }
-            }
-        }
-        return array_slice($results, $offset, $max);
-    }
-
-    /**
-     * Filter the metadata for matches.
-     */
-    protected function filter($meta, $filters)
-    {
-        foreach ($filters as $key => $value) {
-            if (!isset($meta[$key]) || fnmatch($value, $meta[$key]) === false) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public function clear()
-    {
-        if (!($keys = $this->memcached->get($this->keyNamespace))) {
-            return;
-        }
-        $this->memcached->delete($this->keyNamespace);
-        $this->memcached->deleteMulti(explode('|', $keys));
-    }
-
-    protected function createKey($id)
-    {
-        return md5("{$this->keyNamespace}.$id");
-    }
-}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Google.php b/htdocs/includes/OAuth/OAuth2/Service/Google.php
index 0d49609dccb..5ab0f8a474b 100644
--- a/htdocs/includes/OAuth/OAuth2/Service/Google.php
+++ b/htdocs/includes/OAuth/OAuth2/Service/Google.php
@@ -116,6 +116,11 @@ class Google extends AbstractService
     // Android Publisher
     const SCOPE_ANDROID_PUBLISHER           = 'https://www.googleapis.com/auth/androidpublisher';
 
+
+    // Google Gsuite
+	const SCOPE_ADMIN_DIRECTORY_USER =        "https://www.googleapis.com/auth/admin.directory.user";
+	const SCOPE_ADMIN_DIRECTORY_CUSTOMER =        "https://www.googleapis.com/auth/admin.directory.customer";
+
     protected $accessType = 'online';
 
     public function __construct(
@@ -150,7 +155,7 @@ class Google extends AbstractService
         }
         $this->approvalPrompt = $prompt;
     }
-    
+
     /**
      * {@inheritdoc}
      */
diff --git a/htdocs/includes/jquery/js/jquery.js b/htdocs/includes/jquery/js/jquery.js
index 5b16efa11d4..f2fa5e85896 100644
--- a/htdocs/includes/jquery/js/jquery.js
+++ b/htdocs/includes/jquery/js/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v3.4.1
+ * jQuery JavaScript Library v3.5.1
  * https://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2019-05-01T21:04Z
+ * Date: 2020-05-04T22:49Z
  */
 ( function( global, factory ) {
 
@@ -47,13 +47,16 @@
 
 var arr = [];
 
-var document = window.document;
-
 var getProto = Object.getPrototypeOf;
 
 var slice = arr.slice;
 
-var concat = arr.concat;
+var flat = arr.flat ? function( array ) {
+	return arr.flat.call( array );
+} : function( array ) {
+	return arr.concat.apply( [], array );
+};
+
 
 var push = arr.push;
 
@@ -86,6 +89,8 @@ var isWindow = function isWindow( obj ) {
 	};
 
 
+var document = window.document;
+
 
 
 	var preservedScriptAttributes = {
@@ -142,7 +147,7 @@ function toType( obj ) {
 
 
 var
-	version = "3.4.1",
+	version = "3.5.1",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -150,11 +155,7 @@ var
 		// The jQuery object is actually just the init constructor 'enhanced'
 		// Need init if jQuery is called (just allow error to be thrown if not included)
 		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android <=4.0 only
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+	};
 
 jQuery.fn = jQuery.prototype = {
 
@@ -220,6 +221,18 @@ jQuery.fn = jQuery.prototype = {
 		return this.eq( -1 );
 	},
 
+	even: function() {
+		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+			return ( i + 1 ) % 2;
+		} ) );
+	},
+
+	odd: function() {
+		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+			return i % 2;
+		} ) );
+	},
+
 	eq: function( i ) {
 		var len = this.length,
 			j = +i + ( i < 0 ? len : 0 );
@@ -353,9 +366,10 @@ jQuery.extend( {
 		return true;
 	},
 
-	// Evaluates a script in a global context
-	globalEval: function( code, options ) {
-		DOMEval( code, { nonce: options && options.nonce } );
+	// Evaluates a script in a provided context; falls back to the global one
+	// if not specified.
+	globalEval: function( code, options, doc ) {
+		DOMEval( code, { nonce: options && options.nonce }, doc );
 	},
 
 	each: function( obj, callback ) {
@@ -379,13 +393,6 @@ jQuery.extend( {
 		return obj;
 	},
 
-	// Support: Android <=4.0 only
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
 	// results is for internal usage only
 	makeArray: function( arr, results ) {
 		var ret = results || [];
@@ -472,7 +479,7 @@ jQuery.extend( {
 		}
 
 		// Flatten any nested arrays
-		return concat.apply( [], ret );
+		return flat( ret );
 	},
 
 	// A global GUID counter for objects
@@ -489,7 +496,7 @@ if ( typeof Symbol === "function" ) {
 
 // Populate the class2type map
 jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( i, name ) {
+function( _i, name ) {
 	class2type[ "[object " + name + "]" ] = name.toLowerCase();
 } );
 
@@ -511,17 +518,16 @@ function isArrayLike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v2.3.4
+ * Sizzle CSS Selector Engine v2.3.5
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2019-04-08
+ * Date: 2020-03-14
  */
-(function( window ) {
-
+( function( window ) {
 var i,
 	support,
 	Expr,
@@ -561,59 +567,70 @@ var i,
 	},
 
 	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
+	hasOwn = ( {} ).hasOwnProperty,
 	arr = [],
 	pop = arr.pop,
-	push_native = arr.push,
+	pushNative = arr.push,
 	push = arr.push,
 	slice = arr.slice,
+
 	// Use a stripped-down indexOf as it's faster than native
 	// https://jsperf.com/thor-indexof-vs-for/5
 	indexOf = function( list, elem ) {
 		var i = 0,
 			len = list.length;
 		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
+			if ( list[ i ] === elem ) {
 				return i;
 			}
 		}
 		return -1;
 	},
 
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" +
+		"ismap|loop|multiple|open|readonly|required|scoped",
 
 	// Regular expressions
 
 	// http://www.w3.org/TR/css3-selectors/#whitespace
 	whitespace = "[\\x20\\t\\r\\n\\f]",
 
-	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
+	// https://www.w3.org/TR/css-syntax-3/#ident-token-diagram
+	identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace +
+		"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",
 
 	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
 	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+
 		// Operator (capture 2)
 		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
+
+		// "Attribute values must be CSS identifiers [capture 5]
+		// or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" +
+		whitespace + "*\\]",
 
 	pseudos = ":(" + identifier + ")(?:\\((" +
+
 		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
 		// 1. quoted (capture 3; capture 4 or capture 5)
 		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+
 		// 2. simple (capture 6)
 		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+
 		// 3. anything else (capture 2)
 		".*" +
 		")\\)|)",
 
 	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
 	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" +
+		whitespace + "+$", "g" ),
 
 	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace +
+		"*" ),
 	rdescend = new RegExp( whitespace + "|>" ),
 
 	rpseudo = new RegExp( pseudos ),
@@ -625,14 +642,16 @@ var i,
 		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
 		"ATTR": new RegExp( "^" + attributes ),
 		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" +
+			whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" +
+			whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
 		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+
 		// For use in libraries implementing .is()
 		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+		"needsContext": new RegExp( "^" + whitespace +
+			"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
+			"*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
 	},
 
 	rhtml = /HTML$/i,
@@ -648,18 +667,21 @@ var i,
 
 	// CSS escapes
 	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
+	runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ),
+	funescape = function( escape, nonHex ) {
+		var high = "0x" + escape.slice( 1 ) - 0x10000;
+
+		return nonHex ?
+
+			// Strip the backslash prefix from a non-hex escape sequence
+			nonHex :
+
+			// Replace a hexadecimal escape sequence with the encoded Unicode code point
+			// Support: IE <=11+
+			// For values outside the Basic Multilingual Plane (BMP), manually construct a
+			// surrogate pair
 			high < 0 ?
-				// BMP codepoint
 				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
 				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
 	},
 
@@ -675,7 +697,8 @@ var i,
 			}
 
 			// Control characters and (dependent upon position) numbers get escaped as code points
-			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+			return ch.slice( 0, -1 ) + "\\" +
+				ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
 		}
 
 		// Other potentially-special ASCII characters get backslash-escaped
@@ -700,18 +723,20 @@ var i,
 // Optimize for push.apply( _, NodeList )
 try {
 	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
+		( arr = slice.call( preferredDoc.childNodes ) ),
 		preferredDoc.childNodes
 	);
+
 	// Support: Android<4.0
 	// Detect silently failing push.apply
+	// eslint-disable-next-line no-unused-expressions
 	arr[ preferredDoc.childNodes.length ].nodeType;
 } catch ( e ) {
 	push = { apply: arr.length ?
 
 		// Leverage slice if possible
 		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
+			pushNative.apply( target, slice.call( els ) );
 		} :
 
 		// Support: IE<9
@@ -719,8 +744,9 @@ try {
 		function( target, els ) {
 			var j = target.length,
 				i = 0;
+
 			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
+			while ( ( target[ j++ ] = els[ i++ ] ) ) {}
 			target.length = j - 1;
 		}
 	};
@@ -744,24 +770,21 @@ function Sizzle( selector, context, results, seed ) {
 
 	// Try to shortcut find operations (as opposed to filters) in HTML documents
 	if ( !seed ) {
-
-		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-			setDocument( context );
-		}
+		setDocument( context );
 		context = context || document;
 
 		if ( documentIsHTML ) {
 
 			// If the selector is sufficiently simple, try using a "get*By*" DOM method
 			// (excepting DocumentFragment context, where the methods don't exist)
-			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+			if ( nodeType !== 11 && ( match = rquickExpr.exec( selector ) ) ) {
 
 				// ID selector
-				if ( (m = match[1]) ) {
+				if ( ( m = match[ 1 ] ) ) {
 
 					// Document context
 					if ( nodeType === 9 ) {
-						if ( (elem = context.getElementById( m )) ) {
+						if ( ( elem = context.getElementById( m ) ) ) {
 
 							// Support: IE, Opera, Webkit
 							// TODO: identify versions
@@ -780,7 +803,7 @@ function Sizzle( selector, context, results, seed ) {
 						// Support: IE, Opera, Webkit
 						// TODO: identify versions
 						// getElementById can match elements by name instead of ID
-						if ( newContext && (elem = newContext.getElementById( m )) &&
+						if ( newContext && ( elem = newContext.getElementById( m ) ) &&
 							contains( context, elem ) &&
 							elem.id === m ) {
 
@@ -790,12 +813,12 @@ function Sizzle( selector, context, results, seed ) {
 					}
 
 				// Type selector
-				} else if ( match[2] ) {
+				} else if ( match[ 2 ] ) {
 					push.apply( results, context.getElementsByTagName( selector ) );
 					return results;
 
 				// Class selector
-				} else if ( (m = match[3]) && support.getElementsByClassName &&
+				} else if ( ( m = match[ 3 ] ) && support.getElementsByClassName &&
 					context.getElementsByClassName ) {
 
 					push.apply( results, context.getElementsByClassName( m ) );
@@ -806,11 +829,11 @@ function Sizzle( selector, context, results, seed ) {
 			// Take advantage of querySelectorAll
 			if ( support.qsa &&
 				!nonnativeSelectorCache[ selector + " " ] &&
-				(!rbuggyQSA || !rbuggyQSA.test( selector )) &&
+				( !rbuggyQSA || !rbuggyQSA.test( selector ) ) &&
 
 				// Support: IE 8 only
 				// Exclude object elements
-				(nodeType !== 1 || context.nodeName.toLowerCase() !== "object") ) {
+				( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) {
 
 				newSelector = selector;
 				newContext = context;
@@ -819,27 +842,36 @@ function Sizzle( selector, context, results, seed ) {
 				// descendant combinators, which is not what we want.
 				// In such cases, we work around the behavior by prefixing every selector in the
 				// list with an ID selector referencing the scope context.
+				// The technique has to be used as well when a leading combinator is used
+				// as such selectors are not recognized by querySelectorAll.
 				// Thanks to Andrew Dupont for this technique.
-				if ( nodeType === 1 && rdescend.test( selector ) ) {
+				if ( nodeType === 1 &&
+					( rdescend.test( selector ) || rcombinators.test( selector ) ) ) {
 
-					// Capture the context ID, setting it first if necessary
-					if ( (nid = context.getAttribute( "id" )) ) {
-						nid = nid.replace( rcssescape, fcssescape );
-					} else {
-						context.setAttribute( "id", (nid = expando) );
+					// Expand context for sibling selectors
+					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+						context;
+
+					// We can use :scope instead of the ID hack if the browser
+					// supports it & if we're not changing the context.
+					if ( newContext !== context || !support.scope ) {
+
+						// Capture the context ID, setting it first if necessary
+						if ( ( nid = context.getAttribute( "id" ) ) ) {
+							nid = nid.replace( rcssescape, fcssescape );
+						} else {
+							context.setAttribute( "id", ( nid = expando ) );
+						}
 					}
 
 					// Prefix every selector in the list
 					groups = tokenize( selector );
 					i = groups.length;
 					while ( i-- ) {
-						groups[i] = "#" + nid + " " + toSelector( groups[i] );
+						groups[ i ] = ( nid ? "#" + nid : ":scope" ) + " " +
+							toSelector( groups[ i ] );
 					}
 					newSelector = groups.join( "," );
-
-					// Expand context for sibling selectors
-					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
-						context;
 				}
 
 				try {
@@ -872,12 +904,14 @@ function createCache() {
 	var keys = [];
 
 	function cache( key, value ) {
+
 		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
 		if ( keys.push( key + " " ) > Expr.cacheLength ) {
+
 			// Only keep the most recent entries
 			delete cache[ keys.shift() ];
 		}
-		return (cache[ key + " " ] = value);
+		return ( cache[ key + " " ] = value );
 	}
 	return cache;
 }
@@ -896,17 +930,19 @@ function markFunction( fn ) {
  * @param {Function} fn Passed the created element and returns a boolean result
  */
 function assert( fn ) {
-	var el = document.createElement("fieldset");
+	var el = document.createElement( "fieldset" );
 
 	try {
 		return !!fn( el );
-	} catch (e) {
+	} catch ( e ) {
 		return false;
 	} finally {
+
 		// Remove from its parent by default
 		if ( el.parentNode ) {
 			el.parentNode.removeChild( el );
 		}
+
 		// release memory in IE
 		el = null;
 	}
@@ -918,11 +954,11 @@ function assert( fn ) {
  * @param {Function} handler The method that will be applied
  */
 function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
+	var arr = attrs.split( "|" ),
 		i = arr.length;
 
 	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
+		Expr.attrHandle[ arr[ i ] ] = handler;
 	}
 }
 
@@ -944,7 +980,7 @@ function siblingCheck( a, b ) {
 
 	// Check if b follows a
 	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
+		while ( ( cur = cur.nextSibling ) ) {
 			if ( cur === b ) {
 				return -1;
 			}
@@ -972,7 +1008,7 @@ function createInputPseudo( type ) {
 function createButtonPseudo( type ) {
 	return function( elem ) {
 		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
+		return ( name === "input" || name === "button" ) && elem.type === type;
 	};
 }
 
@@ -1015,7 +1051,7 @@ function createDisabledPseudo( disabled ) {
 					// Where there is no isDisabled, check manually
 					/* jshint -W018 */
 					elem.isDisabled !== !disabled &&
-						inDisabledFieldset( elem ) === disabled;
+					inDisabledFieldset( elem ) === disabled;
 			}
 
 			return elem.disabled === disabled;
@@ -1037,21 +1073,21 @@ function createDisabledPseudo( disabled ) {
  * @param {Function} fn
  */
 function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
+	return markFunction( function( argument ) {
 		argument = +argument;
-		return markFunction(function( seed, matches ) {
+		return markFunction( function( seed, matches ) {
 			var j,
 				matchIndexes = fn( [], seed.length, argument ),
 				i = matchIndexes.length;
 
 			// Match elements found at the specified indexes
 			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
+				if ( seed[ ( j = matchIndexes[ i ] ) ] ) {
+					seed[ j ] = !( matches[ j ] = seed[ j ] );
 				}
 			}
-		});
-	});
+		} );
+	} );
 }
 
 /**
@@ -1073,7 +1109,7 @@ support = Sizzle.support = {};
  */
 isXML = Sizzle.isXML = function( elem ) {
 	var namespace = elem.namespaceURI,
-		docElem = (elem.ownerDocument || elem).documentElement;
+		docElem = ( elem.ownerDocument || elem ).documentElement;
 
 	// Support: IE <=8
 	// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
@@ -1091,7 +1127,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 		doc = node ? node.ownerDocument || node : preferredDoc;
 
 	// Return early if doc is invalid or already selected
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( doc == document || doc.nodeType !== 9 || !doc.documentElement ) {
 		return document;
 	}
 
@@ -1100,10 +1140,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 	docElem = document.documentElement;
 	documentIsHTML = !isXML( document );
 
-	// Support: IE 9-11, Edge
+	// Support: IE 9 - 11+, Edge 12 - 18+
 	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	if ( preferredDoc !== document &&
-		(subWindow = document.defaultView) && subWindow.top !== subWindow ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( preferredDoc != document &&
+		( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
 
 		// Support: IE 11, Edge
 		if ( subWindow.addEventListener ) {
@@ -1115,25 +1159,36 @@ setDocument = Sizzle.setDocument = function( node ) {
 		}
 	}
 
+	// Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only,
+	// Safari 4 - 5 only, Opera <=11.6 - 12.x only
+	// IE/Edge & older browsers don't support the :scope pseudo-class.
+	// Support: Safari 6.0 only
+	// Safari 6.0 supports :scope but it's an alias of :root there.
+	support.scope = assert( function( el ) {
+		docElem.appendChild( el ).appendChild( document.createElement( "div" ) );
+		return typeof el.querySelectorAll !== "undefined" &&
+			!el.querySelectorAll( ":scope fieldset div" ).length;
+	} );
+
 	/* Attributes
 	---------------------------------------------------------------------- */
 
 	// Support: IE<8
 	// Verify that getAttribute really returns attributes and not properties
 	// (excepting IE8 booleans)
-	support.attributes = assert(function( el ) {
+	support.attributes = assert( function( el ) {
 		el.className = "i";
-		return !el.getAttribute("className");
-	});
+		return !el.getAttribute( "className" );
+	} );
 
 	/* getElement(s)By*
 	---------------------------------------------------------------------- */
 
 	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( el ) {
-		el.appendChild( document.createComment("") );
-		return !el.getElementsByTagName("*").length;
-	});
+	support.getElementsByTagName = assert( function( el ) {
+		el.appendChild( document.createComment( "" ) );
+		return !el.getElementsByTagName( "*" ).length;
+	} );
 
 	// Support: IE<9
 	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
@@ -1142,38 +1197,38 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Check if getElementById returns elements by name
 	// The broken getElementById methods don't pick up programmatically-set names,
 	// so use a roundabout getElementsByName test
-	support.getById = assert(function( el ) {
+	support.getById = assert( function( el ) {
 		docElem.appendChild( el ).id = expando;
 		return !document.getElementsByName || !document.getElementsByName( expando ).length;
-	});
+	} );
 
 	// ID filter and find
 	if ( support.getById ) {
-		Expr.filter["ID"] = function( id ) {
+		Expr.filter[ "ID" ] = function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
+				return elem.getAttribute( "id" ) === attrId;
 			};
 		};
-		Expr.find["ID"] = function( id, context ) {
+		Expr.find[ "ID" ] = function( id, context ) {
 			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var elem = context.getElementById( id );
 				return elem ? [ elem ] : [];
 			}
 		};
 	} else {
-		Expr.filter["ID"] =  function( id ) {
+		Expr.filter[ "ID" ] =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
 				var node = typeof elem.getAttributeNode !== "undefined" &&
-					elem.getAttributeNode("id");
+					elem.getAttributeNode( "id" );
 				return node && node.value === attrId;
 			};
 		};
 
 		// Support: IE 6 - 7 only
 		// getElementById is not reliable as a find shortcut
-		Expr.find["ID"] = function( id, context ) {
+		Expr.find[ "ID" ] = function( id, context ) {
 			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var node, i, elems,
 					elem = context.getElementById( id );
@@ -1181,7 +1236,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 				if ( elem ) {
 
 					// Verify the id attribute
-					node = elem.getAttributeNode("id");
+					node = elem.getAttributeNode( "id" );
 					if ( node && node.value === id ) {
 						return [ elem ];
 					}
@@ -1189,8 +1244,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 					// Fall back on getElementsByName
 					elems = context.getElementsByName( id );
 					i = 0;
-					while ( (elem = elems[i++]) ) {
-						node = elem.getAttributeNode("id");
+					while ( ( elem = elems[ i++ ] ) ) {
+						node = elem.getAttributeNode( "id" );
 						if ( node && node.value === id ) {
 							return [ elem ];
 						}
@@ -1203,7 +1258,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	}
 
 	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
+	Expr.find[ "TAG" ] = support.getElementsByTagName ?
 		function( tag, context ) {
 			if ( typeof context.getElementsByTagName !== "undefined" ) {
 				return context.getElementsByTagName( tag );
@@ -1218,12 +1273,13 @@ setDocument = Sizzle.setDocument = function( node ) {
 			var elem,
 				tmp = [],
 				i = 0,
+
 				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
 				results = context.getElementsByTagName( tag );
 
 			// Filter out possible comments
 			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
+				while ( ( elem = results[ i++ ] ) ) {
 					if ( elem.nodeType === 1 ) {
 						tmp.push( elem );
 					}
@@ -1235,7 +1291,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		};
 
 	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+	Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) {
 		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
 			return context.getElementsByClassName( className );
 		}
@@ -1256,10 +1312,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// See https://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
-	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
+	if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) {
+
 		// Build QSA regex
 		// Regex strategy adopted from Diego Perini
-		assert(function( el ) {
+		assert( function( el ) {
+
+			var input;
+
 			// Select is set to empty string on purpose
 			// This is to test IE's treatment of not explicitly
 			// setting a boolean content attribute,
@@ -1273,78 +1333,98 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// Nothing should be selected when empty strings follow ^= or $= or *=
 			// The test attribute must be unknown in Opera but "safe" for WinRT
 			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( el.querySelectorAll("[msallowcapture^='']").length ) {
+			if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) {
 				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
 			}
 
 			// Support: IE8
 			// Boolean attributes and "value" are not treated correctly
-			if ( !el.querySelectorAll("[selected]").length ) {
+			if ( !el.querySelectorAll( "[selected]" ).length ) {
 				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
 			}
 
 			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
 			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
+				rbuggyQSA.push( "~=" );
+			}
+
+			// Support: IE 11+, Edge 15 - 18+
+			// IE 11/Edge don't find elements on a `[name='']` query in some cases.
+			// Adding a temporary attribute to the document before the selection works
+			// around the issue.
+			// Interestingly, IE 10 & older don't seem to have the issue.
+			input = document.createElement( "input" );
+			input.setAttribute( "name", "" );
+			el.appendChild( input );
+			if ( !el.querySelectorAll( "[name='']" ).length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" +
+					whitespace + "*(?:''|\"\")" );
 			}
 
 			// Webkit/Opera - :checked should return selected option elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			// IE8 throws error here and will not see later tests
-			if ( !el.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
+			if ( !el.querySelectorAll( ":checked" ).length ) {
+				rbuggyQSA.push( ":checked" );
 			}
 
 			// Support: Safari 8+, iOS 8+
 			// https://bugs.webkit.org/show_bug.cgi?id=136851
 			// In-page `selector#id sibling-combinator selector` fails
 			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
+				rbuggyQSA.push( ".#.+[+~]" );
 			}
-		});
 
-		assert(function( el ) {
+			// Support: Firefox <=3.6 - 5 only
+			// Old Firefox doesn't throw on a badly-escaped identifier.
+			el.querySelectorAll( "\\\f" );
+			rbuggyQSA.push( "[\\r\\n\\f]" );
+		} );
+
+		assert( function( el ) {
 			el.innerHTML = "<a href='' disabled='disabled'></a>" +
 				"<select disabled='disabled'><option/></select>";
 
 			// Support: Windows 8 Native Apps
 			// The type and name attributes are restricted during .innerHTML assignment
-			var input = document.createElement("input");
+			var input = document.createElement( "input" );
 			input.setAttribute( "type", "hidden" );
 			el.appendChild( input ).setAttribute( "name", "D" );
 
 			// Support: IE8
 			// Enforce case-sensitivity of name attribute
-			if ( el.querySelectorAll("[name=d]").length ) {
+			if ( el.querySelectorAll( "[name=d]" ).length ) {
 				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
 			}
 
 			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
 			// IE8 throws error here and will not see later tests
-			if ( el.querySelectorAll(":enabled").length !== 2 ) {
+			if ( el.querySelectorAll( ":enabled" ).length !== 2 ) {
 				rbuggyQSA.push( ":enabled", ":disabled" );
 			}
 
 			// Support: IE9-11+
 			// IE's :disabled selector does not pick up the children of disabled fieldsets
 			docElem.appendChild( el ).disabled = true;
-			if ( el.querySelectorAll(":disabled").length !== 2 ) {
+			if ( el.querySelectorAll( ":disabled" ).length !== 2 ) {
 				rbuggyQSA.push( ":enabled", ":disabled" );
 			}
 
+			// Support: Opera 10 - 11 only
 			// Opera 10-11 does not throw on post-comma invalid pseudos
-			el.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
+			el.querySelectorAll( "*,:x" );
+			rbuggyQSA.push( ",.*:" );
+		} );
 	}
 
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+	if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches ||
 		docElem.webkitMatchesSelector ||
 		docElem.mozMatchesSelector ||
 		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
+		docElem.msMatchesSelector ) ) ) ) {
+
+		assert( function( el ) {
 
-		assert(function( el ) {
 			// Check to see if it's possible to do matchesSelector
 			// on a disconnected node (IE 9)
 			support.disconnectedMatch = matches.call( el, "*" );
@@ -1353,11 +1433,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// Gecko does not error, returns false instead
 			matches.call( el, "[s!='']:x" );
 			rbuggyMatches.push( "!=", pseudos );
-		});
+		} );
 	}
 
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) );
+	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) );
 
 	/* Contains
 	---------------------------------------------------------------------- */
@@ -1374,11 +1454,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 				adown.contains ?
 					adown.contains( bup ) :
 					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
+			) );
 		} :
 		function( a, b ) {
 			if ( b ) {
-				while ( (b = b.parentNode) ) {
+				while ( ( b = b.parentNode ) ) {
 					if ( b === a ) {
 						return true;
 					}
@@ -1407,7 +1487,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 		}
 
 		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+		// Support: IE 11+, Edge 17 - 18+
+		// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+		// two documents; shallow comparisons work.
+		// eslint-disable-next-line eqeqeq
+		compare = ( a.ownerDocument || a ) == ( b.ownerDocument || b ) ?
 			a.compareDocumentPosition( b ) :
 
 			// Otherwise we know they are disconnected
@@ -1415,13 +1499,24 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Disconnected nodes
 		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+			( !support.sortDetached && b.compareDocumentPosition( a ) === compare ) ) {
 
 			// Choose the first element that is related to our preferred document
-			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			// eslint-disable-next-line eqeqeq
+			if ( a == document || a.ownerDocument == preferredDoc &&
+				contains( preferredDoc, a ) ) {
 				return -1;
 			}
-			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			// eslint-disable-next-line eqeqeq
+			if ( b == document || b.ownerDocument == preferredDoc &&
+				contains( preferredDoc, b ) ) {
 				return 1;
 			}
 
@@ -1434,6 +1529,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		return compare & 4 ? -1 : 1;
 	} :
 	function( a, b ) {
+
 		// Exit early if the nodes are identical
 		if ( a === b ) {
 			hasDuplicate = true;
@@ -1449,8 +1545,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Parentless nodes are either documents or disconnected
 		if ( !aup || !bup ) {
-			return a === document ? -1 :
-				b === document ? 1 :
+
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			/* eslint-disable eqeqeq */
+			return a == document ? -1 :
+				b == document ? 1 :
+				/* eslint-enable eqeqeq */
 				aup ? -1 :
 				bup ? 1 :
 				sortInput ?
@@ -1464,26 +1566,32 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Otherwise we need full lists of their ancestors for comparison
 		cur = a;
-		while ( (cur = cur.parentNode) ) {
+		while ( ( cur = cur.parentNode ) ) {
 			ap.unshift( cur );
 		}
 		cur = b;
-		while ( (cur = cur.parentNode) ) {
+		while ( ( cur = cur.parentNode ) ) {
 			bp.unshift( cur );
 		}
 
 		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
+		while ( ap[ i ] === bp[ i ] ) {
 			i++;
 		}
 
 		return i ?
+
 			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
+			siblingCheck( ap[ i ], bp[ i ] ) :
 
 			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			/* eslint-disable eqeqeq */
+			ap[ i ] == preferredDoc ? -1 :
+			bp[ i ] == preferredDoc ? 1 :
+			/* eslint-enable eqeqeq */
 			0;
 	};
 
@@ -1495,10 +1603,7 @@ Sizzle.matches = function( expr, elements ) {
 };
 
 Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
+	setDocument( elem );
 
 	if ( support.matchesSelector && documentIsHTML &&
 		!nonnativeSelectorCache[ expr + " " ] &&
@@ -1510,12 +1615,13 @@ Sizzle.matchesSelector = function( elem, expr ) {
 
 			// IE 9's matchesSelector returns false on disconnected nodes
 			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
+
+				// As well, disconnected nodes are said to be in a document
+				// fragment in IE 9
+				elem.document && elem.document.nodeType !== 11 ) {
 				return ret;
 			}
-		} catch (e) {
+		} catch ( e ) {
 			nonnativeSelectorCache( expr, true );
 		}
 	}
@@ -1524,20 +1630,31 @@ Sizzle.matchesSelector = function( elem, expr ) {
 };
 
 Sizzle.contains = function( context, elem ) {
+
 	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( ( context.ownerDocument || context ) != document ) {
 		setDocument( context );
 	}
 	return contains( context, elem );
 };
 
 Sizzle.attr = function( elem, name ) {
+
 	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( ( elem.ownerDocument || elem ) != document ) {
 		setDocument( elem );
 	}
 
 	var fn = Expr.attrHandle[ name.toLowerCase() ],
+
 		// Don't get fooled by Object.prototype properties (jQuery #13807)
 		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
 			fn( elem, name, !documentIsHTML ) :
@@ -1547,13 +1664,13 @@ Sizzle.attr = function( elem, name ) {
 		val :
 		support.attributes || !documentIsHTML ?
 			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
+			( val = elem.getAttributeNode( name ) ) && val.specified ?
 				val.value :
 				null;
 };
 
 Sizzle.escape = function( sel ) {
-	return (sel + "").replace( rcssescape, fcssescape );
+	return ( sel + "" ).replace( rcssescape, fcssescape );
 };
 
 Sizzle.error = function( msg ) {
@@ -1576,7 +1693,7 @@ Sizzle.uniqueSort = function( results ) {
 	results.sort( sortOrder );
 
 	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
+		while ( ( elem = results[ i++ ] ) ) {
 			if ( elem === results[ i ] ) {
 				j = duplicates.push( i );
 			}
@@ -1604,17 +1721,21 @@ getText = Sizzle.getText = function( elem ) {
 		nodeType = elem.nodeType;
 
 	if ( !nodeType ) {
+
 		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
+		while ( ( node = elem[ i++ ] ) ) {
+
 			// Do not traverse comment nodes
 			ret += getText( node );
 		}
 	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+
 		// Use textContent for elements
 		// innerText usage removed for consistency of new lines (jQuery #11153)
 		if ( typeof elem.textContent === "string" ) {
 			return elem.textContent;
 		} else {
+
 			// Traverse its children
 			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
 				ret += getText( elem );
@@ -1623,6 +1744,7 @@ getText = Sizzle.getText = function( elem ) {
 	} else if ( nodeType === 3 || nodeType === 4 ) {
 		return elem.nodeValue;
 	}
+
 	// Do not include comment or processing instruction nodes
 
 	return ret;
@@ -1650,19 +1772,21 @@ Expr = Sizzle.selectors = {
 
 	preFilter: {
 		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
+			match[ 1 ] = match[ 1 ].replace( runescape, funescape );
 
 			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+			match[ 3 ] = ( match[ 3 ] || match[ 4 ] ||
+				match[ 5 ] || "" ).replace( runescape, funescape );
 
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
+			if ( match[ 2 ] === "~=" ) {
+				match[ 3 ] = " " + match[ 3 ] + " ";
 			}
 
 			return match.slice( 0, 4 );
 		},
 
 		"CHILD": function( match ) {
+
 			/* matches from matchExpr["CHILD"]
 				1 type (only|nth|...)
 				2 what (child|of-type)
@@ -1673,22 +1797,25 @@ Expr = Sizzle.selectors = {
 				7 sign of y-component
 				8 y of y-component
 			*/
-			match[1] = match[1].toLowerCase();
+			match[ 1 ] = match[ 1 ].toLowerCase();
+
+			if ( match[ 1 ].slice( 0, 3 ) === "nth" ) {
 
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
 				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
+				if ( !match[ 3 ] ) {
+					Sizzle.error( match[ 0 ] );
 				}
 
 				// numeric x and y parameters for Expr.filter.CHILD
 				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+				match[ 4 ] = +( match[ 4 ] ?
+					match[ 5 ] + ( match[ 6 ] || 1 ) :
+					2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" ) );
+				match[ 5 ] = +( ( match[ 7 ] + match[ 8 ] ) || match[ 3 ] === "odd" );
 
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
+				// other types prohibit arguments
+			} else if ( match[ 3 ] ) {
+				Sizzle.error( match[ 0 ] );
 			}
 
 			return match;
@@ -1696,26 +1823,28 @@ Expr = Sizzle.selectors = {
 
 		"PSEUDO": function( match ) {
 			var excess,
-				unquoted = !match[6] && match[2];
+				unquoted = !match[ 6 ] && match[ 2 ];
 
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
+			if ( matchExpr[ "CHILD" ].test( match[ 0 ] ) ) {
 				return null;
 			}
 
 			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
+			if ( match[ 3 ] ) {
+				match[ 2 ] = match[ 4 ] || match[ 5 ] || "";
 
 			// Strip excess characters from unquoted arguments
 			} else if ( unquoted && rpseudo.test( unquoted ) &&
+
 				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
+				( excess = tokenize( unquoted, true ) ) &&
+
 				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+				( excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length ) ) {
 
 				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
+				match[ 0 ] = match[ 0 ].slice( 0, excess );
+				match[ 2 ] = unquoted.slice( 0, excess );
 			}
 
 			// Return only captures needed by the pseudo filter method (type and argument)
@@ -1728,7 +1857,9 @@ Expr = Sizzle.selectors = {
 		"TAG": function( nodeNameSelector ) {
 			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
 			return nodeNameSelector === "*" ?
-				function() { return true; } :
+				function() {
+					return true;
+				} :
 				function( elem ) {
 					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
 				};
@@ -1738,10 +1869,16 @@ Expr = Sizzle.selectors = {
 			var pattern = classCache[ className + " " ];
 
 			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
+				( pattern = new RegExp( "(^|" + whitespace +
+					")" + className + "(" + whitespace + "|$)" ) ) && classCache(
+						className, function( elem ) {
+							return pattern.test(
+								typeof elem.className === "string" && elem.className ||
+								typeof elem.getAttribute !== "undefined" &&
+									elem.getAttribute( "class" ) ||
+								""
+							);
+				} );
 		},
 
 		"ATTR": function( name, operator, check ) {
@@ -1757,6 +1894,8 @@ Expr = Sizzle.selectors = {
 
 				result += "";
 
+				/* eslint-disable max-len */
+
 				return operator === "=" ? result === check :
 					operator === "!=" ? result !== check :
 					operator === "^=" ? check && result.indexOf( check ) === 0 :
@@ -1765,10 +1904,12 @@ Expr = Sizzle.selectors = {
 					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
 					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
 					false;
+				/* eslint-enable max-len */
+
 			};
 		},
 
-		"CHILD": function( type, what, argument, first, last ) {
+		"CHILD": function( type, what, _argument, first, last ) {
 			var simple = type.slice( 0, 3 ) !== "nth",
 				forward = type.slice( -4 ) !== "last",
 				ofType = what === "of-type";
@@ -1780,7 +1921,7 @@ Expr = Sizzle.selectors = {
 					return !!elem.parentNode;
 				} :
 
-				function( elem, context, xml ) {
+				function( elem, _context, xml ) {
 					var cache, uniqueCache, outerCache, node, nodeIndex, start,
 						dir = simple !== forward ? "nextSibling" : "previousSibling",
 						parent = elem.parentNode,
@@ -1794,7 +1935,7 @@ Expr = Sizzle.selectors = {
 						if ( simple ) {
 							while ( dir ) {
 								node = elem;
-								while ( (node = node[ dir ]) ) {
+								while ( ( node = node[ dir ] ) ) {
 									if ( ofType ?
 										node.nodeName.toLowerCase() === name :
 										node.nodeType === 1 ) {
@@ -1802,6 +1943,7 @@ Expr = Sizzle.selectors = {
 										return false;
 									}
 								}
+
 								// Reverse direction for :only-* (if we haven't yet done so)
 								start = dir = type === "only" && !start && "nextSibling";
 							}
@@ -1817,22 +1959,22 @@ Expr = Sizzle.selectors = {
 
 							// ...in a gzip-friendly way
 							node = parent;
-							outerCache = node[ expando ] || (node[ expando ] = {});
+							outerCache = node[ expando ] || ( node[ expando ] = {} );
 
 							// Support: IE <9 only
 							// Defend against cloned attroperties (jQuery gh-1709)
 							uniqueCache = outerCache[ node.uniqueID ] ||
-								(outerCache[ node.uniqueID ] = {});
+								( outerCache[ node.uniqueID ] = {} );
 
 							cache = uniqueCache[ type ] || [];
 							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
 							diff = nodeIndex && cache[ 2 ];
 							node = nodeIndex && parent.childNodes[ nodeIndex ];
 
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
+							while ( ( node = ++nodeIndex && node && node[ dir ] ||
 
 								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
+								( diff = nodeIndex = 0 ) || start.pop() ) ) {
 
 								// When found, cache indexes on `parent` and break
 								if ( node.nodeType === 1 && ++diff && node === elem ) {
@@ -1842,16 +1984,18 @@ Expr = Sizzle.selectors = {
 							}
 
 						} else {
+
 							// Use previously-cached element index if available
 							if ( useCache ) {
+
 								// ...in a gzip-friendly way
 								node = elem;
-								outerCache = node[ expando ] || (node[ expando ] = {});
+								outerCache = node[ expando ] || ( node[ expando ] = {} );
 
 								// Support: IE <9 only
 								// Defend against cloned attroperties (jQuery gh-1709)
 								uniqueCache = outerCache[ node.uniqueID ] ||
-									(outerCache[ node.uniqueID ] = {});
+									( outerCache[ node.uniqueID ] = {} );
 
 								cache = uniqueCache[ type ] || [];
 								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
@@ -1861,9 +2005,10 @@ Expr = Sizzle.selectors = {
 							// xml :nth-child(...)
 							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
 							if ( diff === false ) {
+
 								// Use the same loop as above to seek `elem` from the start
-								while ( (node = ++nodeIndex && node && node[ dir ] ||
-									(diff = nodeIndex = 0) || start.pop()) ) {
+								while ( ( node = ++nodeIndex && node && node[ dir ] ||
+									( diff = nodeIndex = 0 ) || start.pop() ) ) {
 
 									if ( ( ofType ?
 										node.nodeName.toLowerCase() === name :
@@ -1872,12 +2017,13 @@ Expr = Sizzle.selectors = {
 
 										// Cache the index of each encountered element
 										if ( useCache ) {
-											outerCache = node[ expando ] || (node[ expando ] = {});
+											outerCache = node[ expando ] ||
+												( node[ expando ] = {} );
 
 											// Support: IE <9 only
 											// Defend against cloned attroperties (jQuery gh-1709)
 											uniqueCache = outerCache[ node.uniqueID ] ||
-												(outerCache[ node.uniqueID ] = {});
+												( outerCache[ node.uniqueID ] = {} );
 
 											uniqueCache[ type ] = [ dirruns, diff ];
 										}
@@ -1898,6 +2044,7 @@ Expr = Sizzle.selectors = {
 		},
 
 		"PSEUDO": function( pseudo, argument ) {
+
 			// pseudo-class names are case-insensitive
 			// http://www.w3.org/TR/selectors/#pseudo-classes
 			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
@@ -1917,15 +2064,15 @@ Expr = Sizzle.selectors = {
 			if ( fn.length > 1 ) {
 				args = [ pseudo, pseudo, "", argument ];
 				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
+					markFunction( function( seed, matches ) {
 						var idx,
 							matched = fn( seed, argument ),
 							i = matched.length;
 						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
+							idx = indexOf( seed, matched[ i ] );
+							seed[ idx ] = !( matches[ idx ] = matched[ i ] );
 						}
-					}) :
+					} ) :
 					function( elem ) {
 						return fn( elem, 0, args );
 					};
@@ -1936,8 +2083,10 @@ Expr = Sizzle.selectors = {
 	},
 
 	pseudos: {
+
 		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
+		"not": markFunction( function( selector ) {
+
 			// Trim the selector passed to compile
 			// to avoid treating leading and trailing
 			// spaces as combinators
@@ -1946,39 +2095,40 @@ Expr = Sizzle.selectors = {
 				matcher = compile( selector.replace( rtrim, "$1" ) );
 
 			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
+				markFunction( function( seed, matches, _context, xml ) {
 					var elem,
 						unmatched = matcher( seed, null, xml, [] ),
 						i = seed.length;
 
 					// Match elements unmatched by `matcher`
 					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
+						if ( ( elem = unmatched[ i ] ) ) {
+							seed[ i ] = !( matches[ i ] = elem );
 						}
 					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
+				} ) :
+				function( elem, _context, xml ) {
+					input[ 0 ] = elem;
 					matcher( input, null, xml, results );
+
 					// Don't keep the element (issue #299)
-					input[0] = null;
+					input[ 0 ] = null;
 					return !results.pop();
 				};
-		}),
+		} ),
 
-		"has": markFunction(function( selector ) {
+		"has": markFunction( function( selector ) {
 			return function( elem ) {
 				return Sizzle( selector, elem ).length > 0;
 			};
-		}),
+		} ),
 
-		"contains": markFunction(function( text ) {
+		"contains": markFunction( function( text ) {
 			text = text.replace( runescape, funescape );
 			return function( elem ) {
 				return ( elem.textContent || getText( elem ) ).indexOf( text ) > -1;
 			};
-		}),
+		} ),
 
 		// "Whether an element is represented by a :lang() selector
 		// is based solely on the element's language value
@@ -1988,25 +2138,26 @@ Expr = Sizzle.selectors = {
 		// The identifier C does not have to be a valid language name."
 		// http://www.w3.org/TR/selectors/#lang-pseudo
 		"lang": markFunction( function( lang ) {
+
 			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
+			if ( !ridentifier.test( lang || "" ) ) {
 				Sizzle.error( "unsupported lang: " + lang );
 			}
 			lang = lang.replace( runescape, funescape ).toLowerCase();
 			return function( elem ) {
 				var elemLang;
 				do {
-					if ( (elemLang = documentIsHTML ?
+					if ( ( elemLang = documentIsHTML ?
 						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+						elem.getAttribute( "xml:lang" ) || elem.getAttribute( "lang" ) ) ) {
 
 						elemLang = elemLang.toLowerCase();
 						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
 					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				} while ( ( elem = elem.parentNode ) && elem.nodeType === 1 );
 				return false;
 			};
-		}),
+		} ),
 
 		// Miscellaneous
 		"target": function( elem ) {
@@ -2019,7 +2170,9 @@ Expr = Sizzle.selectors = {
 		},
 
 		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+			return elem === document.activeElement &&
+				( !document.hasFocus || document.hasFocus() ) &&
+				!!( elem.type || elem.href || ~elem.tabIndex );
 		},
 
 		// Boolean properties
@@ -2027,16 +2180,20 @@ Expr = Sizzle.selectors = {
 		"disabled": createDisabledPseudo( true ),
 
 		"checked": function( elem ) {
+
 			// In CSS3, :checked should return both checked and selected elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+			return ( nodeName === "input" && !!elem.checked ) ||
+				( nodeName === "option" && !!elem.selected );
 		},
 
 		"selected": function( elem ) {
+
 			// Accessing this property makes selected-by-default
 			// options in Safari work properly
 			if ( elem.parentNode ) {
+				// eslint-disable-next-line no-unused-expressions
 				elem.parentNode.selectedIndex;
 			}
 
@@ -2045,6 +2202,7 @@ Expr = Sizzle.selectors = {
 
 		// Contents
 		"empty": function( elem ) {
+
 			// http://www.w3.org/TR/selectors/#empty-pseudo
 			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
 			//   but not by others (comment: 8; processing instruction: 7; etc.)
@@ -2058,7 +2216,7 @@ Expr = Sizzle.selectors = {
 		},
 
 		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
+			return !Expr.pseudos[ "empty" ]( elem );
 		},
 
 		// Element/input types
@@ -2082,39 +2240,40 @@ Expr = Sizzle.selectors = {
 
 				// Support: IE<8
 				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+				( ( attr = elem.getAttribute( "type" ) ) == null ||
+					attr.toLowerCase() === "text" );
 		},
 
 		// Position-in-collection
-		"first": createPositionalPseudo(function() {
+		"first": createPositionalPseudo( function() {
 			return [ 0 ];
-		}),
+		} ),
 
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
+		"last": createPositionalPseudo( function( _matchIndexes, length ) {
 			return [ length - 1 ];
-		}),
+		} ),
 
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"eq": createPositionalPseudo( function( _matchIndexes, length, argument ) {
 			return [ argument < 0 ? argument + length : argument ];
-		}),
+		} ),
 
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
+		"even": createPositionalPseudo( function( matchIndexes, length ) {
 			var i = 0;
 			for ( ; i < length; i += 2 ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		}),
+		} ),
 
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+		"odd": createPositionalPseudo( function( matchIndexes, length ) {
 			var i = 1;
 			for ( ; i < length; i += 2 ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		}),
+		} ),
 
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"lt": createPositionalPseudo( function( matchIndexes, length, argument ) {
 			var i = argument < 0 ?
 				argument + length :
 				argument > length ?
@@ -2124,19 +2283,19 @@ Expr = Sizzle.selectors = {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		}),
+		} ),
 
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"gt": createPositionalPseudo( function( matchIndexes, length, argument ) {
 			var i = argument < 0 ? argument + length : argument;
 			for ( ; ++i < length; ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		})
+		} )
 	}
 };
 
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
+Expr.pseudos[ "nth" ] = Expr.pseudos[ "eq" ];
 
 // Add button/input type pseudos
 for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
@@ -2167,37 +2326,39 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 	while ( soFar ) {
 
 		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
+		if ( !matched || ( match = rcomma.exec( soFar ) ) ) {
 			if ( match ) {
+
 				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
+				soFar = soFar.slice( match[ 0 ].length ) || soFar;
 			}
-			groups.push( (tokens = []) );
+			groups.push( ( tokens = [] ) );
 		}
 
 		matched = false;
 
 		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
+		if ( ( match = rcombinators.exec( soFar ) ) ) {
 			matched = match.shift();
-			tokens.push({
+			tokens.push( {
 				value: matched,
+
 				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
+				type: match[ 0 ].replace( rtrim, " " )
+			} );
 			soFar = soFar.slice( matched.length );
 		}
 
 		// Filters
 		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
+			if ( ( match = matchExpr[ type ].exec( soFar ) ) && ( !preFilters[ type ] ||
+				( match = preFilters[ type ]( match ) ) ) ) {
 				matched = match.shift();
-				tokens.push({
+				tokens.push( {
 					value: matched,
 					type: type,
 					matches: match
-				});
+				} );
 				soFar = soFar.slice( matched.length );
 			}
 		}
@@ -2214,6 +2375,7 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 		soFar.length :
 		soFar ?
 			Sizzle.error( selector ) :
+
 			// Cache the tokens
 			tokenCache( selector, groups ).slice( 0 );
 };
@@ -2223,7 +2385,7 @@ function toSelector( tokens ) {
 		len = tokens.length,
 		selector = "";
 	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
+		selector += tokens[ i ].value;
 	}
 	return selector;
 }
@@ -2236,9 +2398,10 @@ function addCombinator( matcher, combinator, base ) {
 		doneName = done++;
 
 	return combinator.first ?
+
 		// Check against closest ancestor/preceding element
 		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
+			while ( ( elem = elem[ dir ] ) ) {
 				if ( elem.nodeType === 1 || checkNonElements ) {
 					return matcher( elem, context, xml );
 				}
@@ -2253,7 +2416,7 @@ function addCombinator( matcher, combinator, base ) {
 
 			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
 			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
+				while ( ( elem = elem[ dir ] ) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
 						if ( matcher( elem, context, xml ) ) {
 							return true;
@@ -2261,27 +2424,29 @@ function addCombinator( matcher, combinator, base ) {
 					}
 				}
 			} else {
-				while ( (elem = elem[ dir ]) ) {
+				while ( ( elem = elem[ dir ] ) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
+						outerCache = elem[ expando ] || ( elem[ expando ] = {} );
 
 						// Support: IE <9 only
 						// Defend against cloned attroperties (jQuery gh-1709)
-						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
+						uniqueCache = outerCache[ elem.uniqueID ] ||
+							( outerCache[ elem.uniqueID ] = {} );
 
 						if ( skip && skip === elem.nodeName.toLowerCase() ) {
 							elem = elem[ dir ] || elem;
-						} else if ( (oldCache = uniqueCache[ key ]) &&
+						} else if ( ( oldCache = uniqueCache[ key ] ) &&
 							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
 
 							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
+							return ( newCache[ 2 ] = oldCache[ 2 ] );
 						} else {
+
 							// Reuse newcache so results back-propagate to previous elements
 							uniqueCache[ key ] = newCache;
 
 							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+							if ( ( newCache[ 2 ] = matcher( elem, context, xml ) ) ) {
 								return true;
 							}
 						}
@@ -2297,20 +2462,20 @@ function elementMatcher( matchers ) {
 		function( elem, context, xml ) {
 			var i = matchers.length;
 			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
+				if ( !matchers[ i ]( elem, context, xml ) ) {
 					return false;
 				}
 			}
 			return true;
 		} :
-		matchers[0];
+		matchers[ 0 ];
 }
 
 function multipleContexts( selector, contexts, results ) {
 	var i = 0,
 		len = contexts.length;
 	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
+		Sizzle( selector, contexts[ i ], results );
 	}
 	return results;
 }
@@ -2323,7 +2488,7 @@ function condense( unmatched, map, filter, context, xml ) {
 		mapped = map != null;
 
 	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
+		if ( ( elem = unmatched[ i ] ) ) {
 			if ( !filter || filter( elem, context, xml ) ) {
 				newUnmatched.push( elem );
 				if ( mapped ) {
@@ -2343,14 +2508,18 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 	if ( postFinder && !postFinder[ expando ] ) {
 		postFinder = setMatcher( postFinder, postSelector );
 	}
-	return markFunction(function( seed, results, context, xml ) {
+	return markFunction( function( seed, results, context, xml ) {
 		var temp, i, elem,
 			preMap = [],
 			postMap = [],
 			preexisting = results.length,
 
 			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+			elems = seed || multipleContexts(
+				selector || "*",
+				context.nodeType ? [ context ] : context,
+				[]
+			),
 
 			// Prefilter to get matcher input, preserving a map for seed-results synchronization
 			matcherIn = preFilter && ( seed || !selector ) ?
@@ -2358,6 +2527,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				elems,
 
 			matcherOut = matcher ?
+
 				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
 				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
 
@@ -2381,8 +2551,8 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 			// Un-match failing elements by moving them back to matcherIn
 			i = temp.length;
 			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				if ( ( elem = temp[ i ] ) ) {
+					matcherOut[ postMap[ i ] ] = !( matcherIn[ postMap[ i ] ] = elem );
 				}
 			}
 		}
@@ -2390,25 +2560,27 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 		if ( seed ) {
 			if ( postFinder || preFilter ) {
 				if ( postFinder ) {
+
 					// Get the final matcherOut by condensing this intermediate into postFinder contexts
 					temp = [];
 					i = matcherOut.length;
 					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
+						if ( ( elem = matcherOut[ i ] ) ) {
+
 							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
+							temp.push( ( matcherIn[ i ] = elem ) );
 						}
 					}
-					postFinder( null, (matcherOut = []), temp, xml );
+					postFinder( null, ( matcherOut = [] ), temp, xml );
 				}
 
 				// Move matched elements from seed to results to keep them synchronized
 				i = matcherOut.length;
 				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
+					if ( ( elem = matcherOut[ i ] ) &&
+						( temp = postFinder ? indexOf( seed, elem ) : preMap[ i ] ) > -1 ) {
 
-						seed[temp] = !(results[temp] = elem);
+						seed[ temp ] = !( results[ temp ] = elem );
 					}
 				}
 			}
@@ -2426,14 +2598,14 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				push.apply( results, matcherOut );
 			}
 		}
-	});
+	} );
 }
 
 function matcherFromTokens( tokens ) {
 	var checkContext, matcher, j,
 		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
+		leadingRelative = Expr.relative[ tokens[ 0 ].type ],
+		implicitRelative = leadingRelative || Expr.relative[ " " ],
 		i = leadingRelative ? 1 : 0,
 
 		// The foundational matcher ensures that elements are reachable from top-level context(s)
@@ -2445,38 +2617,43 @@ function matcherFromTokens( tokens ) {
 		}, implicitRelative, true ),
 		matchers = [ function( elem, context, xml ) {
 			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
+				( checkContext = context ).nodeType ?
 					matchContext( elem, context, xml ) :
 					matchAnyContext( elem, context, xml ) );
+
 			// Avoid hanging onto element (issue #299)
 			checkContext = null;
 			return ret;
 		} ];
 
 	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		if ( ( matcher = Expr.relative[ tokens[ i ].type ] ) ) {
+			matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
 		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+			matcher = Expr.filter[ tokens[ i ].type ].apply( null, tokens[ i ].matches );
 
 			// Return special upon seeing a positional matcher
 			if ( matcher[ expando ] ) {
+
 				// Find the next relative operator (if any) for proper handling
 				j = ++i;
 				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
+					if ( Expr.relative[ tokens[ j ].type ] ) {
 						break;
 					}
 				}
 				return setMatcher(
 					i > 1 && elementMatcher( matchers ),
 					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+
+					// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+					tokens
+						.slice( 0, i - 1 )
+						.concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } )
 					).replace( rtrim, "$1" ),
 					matcher,
 					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && matcherFromTokens( ( tokens = tokens.slice( j ) ) ),
 					j < len && toSelector( tokens )
 				);
 			}
@@ -2497,28 +2674,40 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 				unmatched = seed && [],
 				setMatched = [],
 				contextBackup = outermostContext,
+
 				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+				elems = seed || byElement && Expr.find[ "TAG" ]( "*", outermost ),
+
 				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				dirrunsUnique = ( dirruns += contextBackup == null ? 1 : Math.random() || 0.1 ),
 				len = elems.length;
 
 			if ( outermost ) {
-				outermostContext = context === document || context || outermost;
+
+				// Support: IE 11+, Edge 17 - 18+
+				// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+				// two documents; shallow comparisons work.
+				// eslint-disable-next-line eqeqeq
+				outermostContext = context == document || context || outermost;
 			}
 
 			// Add elements passing elementMatchers directly to results
 			// Support: IE<9, Safari
 			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+			for ( ; i !== len && ( elem = elems[ i ] ) != null; i++ ) {
 				if ( byElement && elem ) {
 					j = 0;
-					if ( !context && elem.ownerDocument !== document ) {
+
+					// Support: IE 11+, Edge 17 - 18+
+					// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+					// two documents; shallow comparisons work.
+					// eslint-disable-next-line eqeqeq
+					if ( !context && elem.ownerDocument != document ) {
 						setDocument( elem );
 						xml = !documentIsHTML;
 					}
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context || document, xml) ) {
+					while ( ( matcher = elementMatchers[ j++ ] ) ) {
+						if ( matcher( elem, context || document, xml ) ) {
 							results.push( elem );
 							break;
 						}
@@ -2530,8 +2719,9 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 
 				// Track unmatched elements for set filters
 				if ( bySet ) {
+
 					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
+					if ( ( elem = !matcher && elem ) ) {
 						matchedCount--;
 					}
 
@@ -2555,16 +2745,17 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 			// numerically zero.
 			if ( bySet && i !== matchedCount ) {
 				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
+				while ( ( matcher = setMatchers[ j++ ] ) ) {
 					matcher( unmatched, setMatched, context, xml );
 				}
 
 				if ( seed ) {
+
 					// Reintegrate element matches to eliminate the need for sorting
 					if ( matchedCount > 0 ) {
 						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
+							if ( !( unmatched[ i ] || setMatched[ i ] ) ) {
+								setMatched[ i ] = pop.call( results );
 							}
 						}
 					}
@@ -2605,13 +2796,14 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 		cached = compilerCache[ selector + " " ];
 
 	if ( !cached ) {
+
 		// Generate a function of recursive functions that can be used to check each element
 		if ( !match ) {
 			match = tokenize( selector );
 		}
 		i = match.length;
 		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
+			cached = matcherFromTokens( match[ i ] );
 			if ( cached[ expando ] ) {
 				setMatchers.push( cached );
 			} else {
@@ -2620,7 +2812,10 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 		}
 
 		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+		cached = compilerCache(
+			selector,
+			matcherFromGroupMatchers( elementMatchers, setMatchers )
+		);
 
 		// Save selector and tokenization
 		cached.selector = selector;
@@ -2640,7 +2835,7 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 select = Sizzle.select = function( selector, context, results, seed ) {
 	var i, tokens, token, type, find,
 		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
+		match = !seed && tokenize( ( selector = compiled.selector || selector ) );
 
 	results = results || [];
 
@@ -2649,11 +2844,12 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 	if ( match.length === 1 ) {
 
 		// Reduce context if the leading compound selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) {
+		tokens = match[ 0 ] = match[ 0 ].slice( 0 );
+		if ( tokens.length > 2 && ( token = tokens[ 0 ] ).type === "ID" &&
+			context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) {
 
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			context = ( Expr.find[ "ID" ]( token.matches[ 0 ]
+				.replace( runescape, funescape ), context ) || [] )[ 0 ];
 			if ( !context ) {
 				return results;
 
@@ -2666,20 +2862,22 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 		}
 
 		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		i = matchExpr[ "needsContext" ].test( selector ) ? 0 : tokens.length;
 		while ( i-- ) {
-			token = tokens[i];
+			token = tokens[ i ];
 
 			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
+			if ( Expr.relative[ ( type = token.type ) ] ) {
 				break;
 			}
-			if ( (find = Expr.find[ type ]) ) {
+			if ( ( find = Expr.find[ type ] ) ) {
+
 				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
+				if ( ( seed = find(
+					token.matches[ 0 ].replace( runescape, funescape ),
+					rsibling.test( tokens[ 0 ].type ) && testContext( context.parentNode ) ||
+						context
+				) ) ) {
 
 					// If seed is empty or no tokens remain, we can return early
 					tokens.splice( i, 1 );
@@ -2710,7 +2908,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 // One-time assignments
 
 // Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+support.sortStable = expando.split( "" ).sort( sortOrder ).join( "" ) === expando;
 
 // Support: Chrome 14-35+
 // Always assume duplicates if they aren't passed to the comparison function
@@ -2721,58 +2919,59 @@ setDocument();
 
 // Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
 // Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( el ) {
+support.sortDetached = assert( function( el ) {
+
 	// Should return 1, but returns 4 (following)
-	return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
-});
+	return el.compareDocumentPosition( document.createElement( "fieldset" ) ) & 1;
+} );
 
 // Support: IE<8
 // Prevent attribute/property "interpolation"
 // https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( el ) {
+if ( !assert( function( el ) {
 	el.innerHTML = "<a href='#'></a>";
-	return el.firstChild.getAttribute("href") === "#" ;
-}) ) {
+	return el.firstChild.getAttribute( "href" ) === "#";
+} ) ) {
 	addHandle( "type|href|height|width", function( elem, name, isXML ) {
 		if ( !isXML ) {
 			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
 		}
-	});
+	} );
 }
 
 // Support: IE<9
 // Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( el ) {
+if ( !support.attributes || !assert( function( el ) {
 	el.innerHTML = "<input/>";
 	el.firstChild.setAttribute( "value", "" );
 	return el.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
+} ) ) {
+	addHandle( "value", function( elem, _name, isXML ) {
 		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
 			return elem.defaultValue;
 		}
-	});
+	} );
 }
 
 // Support: IE<9
 // Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( el ) {
-	return el.getAttribute("disabled") == null;
-}) ) {
+if ( !assert( function( el ) {
+	return el.getAttribute( "disabled" ) == null;
+} ) ) {
 	addHandle( booleans, function( elem, name, isXML ) {
 		var val;
 		if ( !isXML ) {
 			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
+				( val = elem.getAttributeNode( name ) ) && val.specified ?
 					val.value :
-				null;
+					null;
 		}
-	});
+	} );
 }
 
 return Sizzle;
 
-})( window );
+} )( window );
 
 
 
@@ -3141,7 +3340,7 @@ jQuery.each( {
 	parents: function( elem ) {
 		return dir( elem, "parentNode" );
 	},
-	parentsUntil: function( elem, i, until ) {
+	parentsUntil: function( elem, _i, until ) {
 		return dir( elem, "parentNode", until );
 	},
 	next: function( elem ) {
@@ -3156,10 +3355,10 @@ jQuery.each( {
 	prevAll: function( elem ) {
 		return dir( elem, "previousSibling" );
 	},
-	nextUntil: function( elem, i, until ) {
+	nextUntil: function( elem, _i, until ) {
 		return dir( elem, "nextSibling", until );
 	},
-	prevUntil: function( elem, i, until ) {
+	prevUntil: function( elem, _i, until ) {
 		return dir( elem, "previousSibling", until );
 	},
 	siblings: function( elem ) {
@@ -3169,7 +3368,13 @@ jQuery.each( {
 		return siblings( elem.firstChild );
 	},
 	contents: function( elem ) {
-		if ( typeof elem.contentDocument !== "undefined" ) {
+		if ( elem.contentDocument != null &&
+
+			// Support: IE 11+
+			// <object> elements with no `data` attribute has an object
+			// `contentDocument` with a `null` prototype.
+			getProto( elem.contentDocument ) ) {
+
 			return elem.contentDocument;
 		}
 
@@ -3512,7 +3717,7 @@ jQuery.extend( {
 					var fns = arguments;
 
 					return jQuery.Deferred( function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
+						jQuery.each( tuples, function( _i, tuple ) {
 
 							// Map tuples (progress, done, fail) to arguments (done, fail, progress)
 							var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
@@ -3965,7 +4170,7 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
 			// ...except when executing function values
 			} else {
 				bulk = fn;
-				fn = function( elem, key, value ) {
+				fn = function( elem, _key, value ) {
 					return bulk.call( jQuery( elem ), value );
 				};
 			}
@@ -4000,7 +4205,7 @@ var rmsPrefix = /^-ms-/,
 	rdashAlpha = /-([a-z])/g;
 
 // Used by camelCase as callback to replace()
-function fcamelCase( all, letter ) {
+function fcamelCase( _all, letter ) {
 	return letter.toUpperCase();
 }
 
@@ -4528,27 +4733,6 @@ var isHiddenWithinTree = function( elem, el ) {
 			jQuery.css( elem, "display" ) === "none";
 	};
 
-var swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
 
 
 function adjustCSS( elem, prop, valueParts, tween ) {
@@ -4719,11 +4903,40 @@ var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i );
 
 
 
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
+( function() {
+	var fragment = document.createDocumentFragment(),
+		div = fragment.appendChild( document.createElement( "div" ) ),
+		input = document.createElement( "input" );
+
+	// Support: Android 4.0 - 4.3 only
+	// Check state lost if the name is set (#11217)
+	// Support: Windows Web Apps (WWA)
+	// `name` and `type` must use .setAttribute for WWA (#14901)
+	input.setAttribute( "type", "radio" );
+	input.setAttribute( "checked", "checked" );
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+
+	// Support: Android <=4.1 only
+	// Older WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE <=11 only
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
 
 	// Support: IE <=9 only
-	option: [ 1, "<select multiple='multiple'>", "</select>" ],
+	// IE <=9 replaces <option> tags with their contents when inserted outside of
+	// the select element.
+	div.innerHTML = "<option></option>";
+	support.option = !!div.lastChild;
+} )();
+
+
+// We have to close these tags to support XHTML (#13200)
+var wrapMap = {
 
 	// XHTML parsers do not magically insert elements in the
 	// same way that tag soup parsers do. So we cannot shorten
@@ -4736,12 +4949,14 @@ var wrapMap = {
 	_default: [ 0, "", "" ]
 };
 
-// Support: IE <=9 only
-wrapMap.optgroup = wrapMap.option;
-
 wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
 wrapMap.th = wrapMap.td;
 
+// Support: IE <=9 only
+if ( !support.option ) {
+	wrapMap.optgroup = wrapMap.option = [ 1, "<select multiple='multiple'>", "</select>" ];
+}
+
 
 function getAll( context, tag ) {
 
@@ -4874,32 +5089,6 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 }
 
 
-( function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// Support: Android 4.0 - 4.3 only
-	// Check state lost if the name is set (#11217)
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Android <=4.1 only
-	// Older WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE <=11 only
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-} )();
-
-
 var
 	rkeyEvent = /^key/,
 	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
@@ -5008,8 +5197,8 @@ jQuery.event = {
 			special, handlers, type, namespaces, origType,
 			elemData = dataPriv.get( elem );
 
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
+		// Only attach events to objects that accept data
+		if ( !acceptData( elem ) ) {
 			return;
 		}
 
@@ -5033,7 +5222,7 @@ jQuery.event = {
 
 		// Init the element's event structure and main handler, if this is the first
 		if ( !( events = elemData.events ) ) {
-			events = elemData.events = {};
+			events = elemData.events = Object.create( null );
 		}
 		if ( !( eventHandle = elemData.handle ) ) {
 			eventHandle = elemData.handle = function( e ) {
@@ -5191,12 +5380,15 @@ jQuery.event = {
 
 	dispatch: function( nativeEvent ) {
 
-		// Make a writable jQuery.Event from the native event object
-		var event = jQuery.event.fix( nativeEvent );
-
 		var i, j, ret, matched, handleObj, handlerQueue,
 			args = new Array( arguments.length ),
-			handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
+
+			// Make a writable jQuery.Event from the native event object
+			event = jQuery.event.fix( nativeEvent ),
+
+			handlers = (
+					dataPriv.get( this, "events" ) || Object.create( null )
+				)[ event.type ] || [],
 			special = jQuery.event.special[ event.type ] || {};
 
 		// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -5771,13 +5963,6 @@ jQuery.fn.extend( {
 
 var
 
-	/* eslint-disable max-len */
-
-	// See https://github.com/eslint/eslint/issues/3229
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
-
-	/* eslint-enable */
-
 	// Support: IE <=10 - 11, Edge 12 - 13 only
 	// In IE/Edge using regex groups here causes severe slowdowns.
 	// See https://connect.microsoft.com/IE/feedback/details/1736512/
@@ -5814,7 +5999,7 @@ function restoreScript( elem ) {
 }
 
 function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
+	var i, l, type, pdataOld, udataOld, udataCur, events;
 
 	if ( dest.nodeType !== 1 ) {
 		return;
@@ -5822,13 +6007,11 @@ function cloneCopyEvent( src, dest ) {
 
 	// 1. Copy private data: events, handlers, etc.
 	if ( dataPriv.hasData( src ) ) {
-		pdataOld = dataPriv.access( src );
-		pdataCur = dataPriv.set( dest, pdataOld );
+		pdataOld = dataPriv.get( src );
 		events = pdataOld.events;
 
 		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
+			dataPriv.remove( dest, "handle events" );
 
 			for ( type in events ) {
 				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
@@ -5864,7 +6047,7 @@ function fixInput( src, dest ) {
 function domManip( collection, args, callback, ignored ) {
 
 	// Flatten any nested arrays
-	args = concat.apply( [], args );
+	args = flat( args );
 
 	var fragment, first, scripts, hasScripts, node, doc,
 		i = 0,
@@ -5939,7 +6122,7 @@ function domManip( collection, args, callback, ignored ) {
 							if ( jQuery._evalUrl && !node.noModule ) {
 								jQuery._evalUrl( node.src, {
 									nonce: node.nonce || node.getAttribute( "nonce" )
-								} );
+								}, doc );
 							}
 						} else {
 							DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc );
@@ -5976,7 +6159,7 @@ function remove( elem, selector, keepData ) {
 
 jQuery.extend( {
 	htmlPrefilter: function( html ) {
-		return html.replace( rxhtmlTag, "<$1></$2>" );
+		return html;
 	},
 
 	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
@@ -6238,6 +6421,27 @@ var getStyles = function( elem ) {
 		return view.getComputedStyle( elem );
 	};
 
+var swap = function( elem, options, callback ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.call( elem );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
 var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 
 
@@ -6295,7 +6499,7 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 	}
 
 	var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal,
-		reliableMarginLeftVal,
+		reliableTrDimensionsVal, reliableMarginLeftVal,
 		container = document.createElement( "div" ),
 		div = document.createElement( "div" );
 
@@ -6330,6 +6534,35 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 		scrollboxSize: function() {
 			computeStyleTests();
 			return scrollboxSizeVal;
+		},
+
+		// Support: IE 9 - 11+, Edge 15 - 18+
+		// IE/Edge misreport `getComputedStyle` of table rows with width/height
+		// set in CSS while `offset*` properties report correct values.
+		// Behavior in IE 9 is more subtle than in newer versions & it passes
+		// some versions of this test; make sure not to make it pass there!
+		reliableTrDimensions: function() {
+			var table, tr, trChild, trStyle;
+			if ( reliableTrDimensionsVal == null ) {
+				table = document.createElement( "table" );
+				tr = document.createElement( "tr" );
+				trChild = document.createElement( "div" );
+
+				table.style.cssText = "position:absolute;left:-11111px";
+				tr.style.height = "1px";
+				trChild.style.height = "9px";
+
+				documentElement
+					.appendChild( table )
+					.appendChild( tr )
+					.appendChild( trChild );
+
+				trStyle = window.getComputedStyle( tr );
+				reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
+
+				documentElement.removeChild( table );
+			}
+			return reliableTrDimensionsVal;
 		}
 	} );
 } )();
@@ -6454,7 +6687,7 @@ var
 		fontWeight: "400"
 	};
 
-function setPositiveNumber( elem, value, subtract ) {
+function setPositiveNumber( _elem, value, subtract ) {
 
 	// Any relative (+/-) values have already been
 	// normalized at this point
@@ -6559,17 +6792,26 @@ function getWidthOrHeight( elem, dimension, extra ) {
 	}
 
 
-	// Fall back to offsetWidth/offsetHeight when value is "auto"
-	// This happens for inline elements with no explicit setting (gh-3571)
-	// Support: Android <=4.1 - 4.3 only
-	// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
-	// Support: IE 9-11 only
-	// Also use offsetWidth/offsetHeight for when box sizing is unreliable
-	// We use getClientRects() to check for hidden/disconnected.
-	// In those cases, the computed value can be trusted to be border-box
+	// Support: IE 9 - 11 only
+	// Use offsetWidth/offsetHeight for when box sizing is unreliable.
+	// In those cases, the computed value can be trusted to be border-box.
 	if ( ( !support.boxSizingReliable() && isBorderBox ||
+
+		// Support: IE 10 - 11+, Edge 15 - 18+
+		// IE/Edge misreport `getComputedStyle` of table rows with width/height
+		// set in CSS while `offset*` properties report correct values.
+		// Interestingly, in some cases IE 9 doesn't suffer from this issue.
+		!support.reliableTrDimensions() && nodeName( elem, "tr" ) ||
+
+		// Fall back to offsetWidth/offsetHeight when value is "auto"
+		// This happens for inline elements with no explicit setting (gh-3571)
 		val === "auto" ||
+
+		// Support: Android <=4.1 - 4.3 only
+		// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
 		!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) &&
+
+		// Make sure the element is visible & connected
 		elem.getClientRects().length ) {
 
 		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
@@ -6764,7 +7006,7 @@ jQuery.extend( {
 	}
 } );
 
-jQuery.each( [ "height", "width" ], function( i, dimension ) {
+jQuery.each( [ "height", "width" ], function( _i, dimension ) {
 	jQuery.cssHooks[ dimension ] = {
 		get: function( elem, computed, extra ) {
 			if ( computed ) {
@@ -7537,7 +7779,7 @@ jQuery.fn.extend( {
 			clearQueue = type;
 			type = undefined;
 		}
-		if ( clearQueue && type !== false ) {
+		if ( clearQueue ) {
 			this.queue( type || "fx", [] );
 		}
 
@@ -7620,7 +7862,7 @@ jQuery.fn.extend( {
 	}
 } );
 
-jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+jQuery.each( [ "toggle", "show", "hide" ], function( _i, name ) {
 	var cssFn = jQuery.fn[ name ];
 	jQuery.fn[ name ] = function( speed, easing, callback ) {
 		return speed == null || typeof speed === "boolean" ?
@@ -7841,7 +8083,7 @@ boolHook = {
 	}
 };
 
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( _i, name ) {
 	var getter = attrHandle[ name ] || jQuery.find.attr;
 
 	attrHandle[ name ] = function( elem, name, isXML ) {
@@ -8465,7 +8707,9 @@ jQuery.extend( jQuery.event, {
 				special.bindType || type;
 
 			// jQuery handler
-			handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] &&
+			handle = (
+					dataPriv.get( cur, "events" ) || Object.create( null )
+				)[ event.type ] &&
 				dataPriv.get( cur, "handle" );
 			if ( handle ) {
 				handle.apply( cur, data );
@@ -8576,7 +8820,10 @@ if ( !support.focusin ) {
 
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				var doc = this.ownerDocument || this,
+
+				// Handle: regular nodes (via `this.ownerDocument`), window
+				// (via `this.document`) & document (via `this`).
+				var doc = this.ownerDocument || this.document || this,
 					attaches = dataPriv.access( doc, fix );
 
 				if ( !attaches ) {
@@ -8585,7 +8832,7 @@ if ( !support.focusin ) {
 				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
 			},
 			teardown: function() {
-				var doc = this.ownerDocument || this,
+				var doc = this.ownerDocument || this.document || this,
 					attaches = dataPriv.access( doc, fix ) - 1;
 
 				if ( !attaches ) {
@@ -8601,7 +8848,7 @@ if ( !support.focusin ) {
 }
 var location = window.location;
 
-var nonce = Date.now();
+var nonce = { guid: Date.now() };
 
 var rquery = ( /\?/ );
 
@@ -8733,7 +8980,7 @@ jQuery.fn.extend( {
 				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
 				( this.checked || !rcheckableType.test( type ) );
 		} )
-		.map( function( i, elem ) {
+		.map( function( _i, elem ) {
 			var val = jQuery( this ).val();
 
 			if ( val == null ) {
@@ -9346,7 +9593,8 @@ jQuery.extend( {
 			// Add or update anti-cache param if needed
 			if ( s.cache === false ) {
 				cacheURL = cacheURL.replace( rantiCache, "$1" );
-				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
+				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) +
+					uncached;
 			}
 
 			// Put hash and anti-cache on the URL that will be requested (gh-1732)
@@ -9479,6 +9727,11 @@ jQuery.extend( {
 				response = ajaxHandleResponses( s, jqXHR, responses );
 			}
 
+			// Use a noop converter for missing script
+			if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
+				s.converters[ "text script" ] = function() {};
+			}
+
 			// Convert no matter what (that way responseXXX fields are always set)
 			response = ajaxConvert( s, response, jqXHR, isSuccess );
 
@@ -9569,7 +9822,7 @@ jQuery.extend( {
 	}
 } );
 
-jQuery.each( [ "get", "post" ], function( i, method ) {
+jQuery.each( [ "get", "post" ], function( _i, method ) {
 	jQuery[ method ] = function( url, data, callback, type ) {
 
 		// Shift arguments if data argument was omitted
@@ -9590,8 +9843,17 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
 	};
 } );
 
+jQuery.ajaxPrefilter( function( s ) {
+	var i;
+	for ( i in s.headers ) {
+		if ( i.toLowerCase() === "content-type" ) {
+			s.contentType = s.headers[ i ] || "";
+		}
+	}
+} );
 
-jQuery._evalUrl = function( url, options ) {
+
+jQuery._evalUrl = function( url, options, doc ) {
 	return jQuery.ajax( {
 		url: url,
 
@@ -9609,7 +9871,7 @@ jQuery._evalUrl = function( url, options ) {
 			"text script": function() {}
 		},
 		dataFilter: function( response ) {
-			jQuery.globalEval( response, options );
+			jQuery.globalEval( response, options, doc );
 		}
 	} );
 };
@@ -9931,7 +10193,7 @@ var oldCallbacks = [],
 jQuery.ajaxSetup( {
 	jsonp: "callback",
 	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce.guid++ ) );
 		this[ callback ] = true;
 		return callback;
 	}
@@ -10148,23 +10410,6 @@ jQuery.fn.load = function( url, params, callback ) {
 
 
 
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [
-	"ajaxStart",
-	"ajaxStop",
-	"ajaxComplete",
-	"ajaxError",
-	"ajaxSuccess",
-	"ajaxSend"
-], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-} );
-
-
-
-
 jQuery.expr.pseudos.animated = function( elem ) {
 	return jQuery.grep( jQuery.timers, function( fn ) {
 		return elem === fn.elem;
@@ -10221,6 +10466,12 @@ jQuery.offset = {
 			options.using.call( elem, props );
 
 		} else {
+			if ( typeof props.top === "number" ) {
+				props.top += "px";
+			}
+			if ( typeof props.left === "number" ) {
+				props.left += "px";
+			}
 			curElem.css( props );
 		}
 	}
@@ -10371,7 +10622,7 @@ jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function(
 // Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
 // getComputedStyle returns percent when specified for top/left/bottom/right;
 // rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
+jQuery.each( [ "top", "left" ], function( _i, prop ) {
 	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
 		function( elem, computed ) {
 			if ( computed ) {
@@ -10434,25 +10685,19 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 } );
 
 
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
-	function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
+jQuery.each( [
+	"ajaxStart",
+	"ajaxStop",
+	"ajaxComplete",
+	"ajaxError",
+	"ajaxSuccess",
+	"ajaxSend"
+], function( _i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
 	};
 } );
 
-jQuery.fn.extend( {
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-} );
-
 
 
 
@@ -10474,9 +10719,33 @@ jQuery.fn.extend( {
 		return arguments.length === 1 ?
 			this.off( selector, "**" ) :
 			this.off( types, selector || "**", fn );
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
 	}
 } );
 
+jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
+	function( _i, name ) {
+
+		// Handle event binding
+		jQuery.fn[ name ] = function( data, fn ) {
+			return arguments.length > 0 ?
+				this.on( name, null, data, fn ) :
+				this.trigger( name );
+		};
+	} );
+
+
+
+
+// Support: Android <=4.0 only
+// Make sure we trim BOM and NBSP
+var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+
 // Bind a function to a context, optionally partially applying any
 // arguments.
 // jQuery.proxy is deprecated to promote standards (specifically Function#bind)
@@ -10539,6 +10808,11 @@ jQuery.isNumeric = function( obj ) {
 		!isNaN( obj - parseFloat( obj ) );
 };
 
+jQuery.trim = function( text ) {
+	return text == null ?
+		"" :
+		( text + "" ).replace( rtrim, "" );
+};
 
 
 
@@ -10587,7 +10861,7 @@ jQuery.noConflict = function( deep ) {
 // Expose jQuery and $ identifiers, even in AMD
 // (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
 // and CommonJS for browser emulators (#13566)
-if ( !noGlobal ) {
+if ( typeof noGlobal === "undefined" ) {
 	window.jQuery = window.$ = jQuery;
 }
 
diff --git a/htdocs/includes/jquery/js/jquery.min.js b/htdocs/includes/jquery/js/jquery.min.js
index 07c00cd227d..d467083b62c 100644
--- a/htdocs/includes/jquery/js/jquery.min.js
+++ b/htdocs/includes/jquery/js/jquery.min.js
@@ -1,2 +1,2 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
\ No newline at end of file
+/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
\ No newline at end of file
diff --git a/htdocs/includes/maximebf/debugbar/LICENSE b/htdocs/includes/maximebf/debugbar/LICENSE
new file mode 100644
index 00000000000..1344c989550
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/LICENSE
@@ -0,0 +1,19 @@
+Copyright (C) 2013 Maxime Bouroumeau-Fuseau
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/htdocs/includes/maximebf/debugbar/composer.json b/htdocs/includes/maximebf/debugbar/composer.json
new file mode 100644
index 00000000000..e68fc461f1c
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/composer.json
@@ -0,0 +1,42 @@
+{
+    "name": "maximebf/debugbar",
+    "description": "Debug bar in the browser for php application",
+    "keywords": ["debug", "debugbar"],
+    "homepage": "https://github.com/maximebf/php-debugbar",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Maxime Bouroumeau-Fuseau",
+            "email": "maxime.bouroumeau@gmail.com",
+            "homepage": "http://maximebf.com"
+        },
+        {
+            "name": "Barry vd. Heuvel",
+            "email": "barryvdh@gmail.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.6",
+        "psr/log": "^1.0",
+        "symfony/var-dumper": "^2.6|^3|^4"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5"
+    },
+    "autoload": {
+        "psr-4": {
+            "DebugBar\\": "src/DebugBar/"
+        }
+    },
+    "suggest": {
+        "kriswallsmith/assetic": "The best way to manage assets",
+        "monolog/monolog": "Log using Monolog",
+        "predis/predis": "Redis storage"
+    },
+     "extra": {
+        "branch-alias": {
+            "dev-master": "1.15-dev"
+        }
+    }
+}
diff --git a/htdocs/includes/DebugBar/Bridge/CacheCacheCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/CacheCacheCollector.php
similarity index 85%
rename from htdocs/includes/DebugBar/Bridge/CacheCacheCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/CacheCacheCollector.php
index 3d841c6784e..7e7f46f9ded 100644
--- a/htdocs/includes/DebugBar/Bridge/CacheCacheCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/CacheCacheCollector.php
@@ -31,6 +31,13 @@ class CacheCacheCollector extends MonologCollector
 {
     protected $logger;
 
+    /**
+     * CacheCacheCollector constructor.
+     * @param Cache|null $cache
+     * @param Logger|null $logger
+     * @param bool $level
+     * @param bool $bubble
+     */
     public function __construct(Cache $cache = null, Logger $logger = null, $level = Logger::DEBUG, $bubble = true)
     {
         parent::__construct(null, $level, $bubble);
@@ -45,6 +52,9 @@ class CacheCacheCollector extends MonologCollector
         }
     }
 
+    /**
+     * @param Cache $cache
+     */
     public function addCache(Cache $cache)
     {
         $backend = $cache->getBackend();
@@ -55,6 +65,9 @@ class CacheCacheCollector extends MonologCollector
         $this->addLogger($backend->getLogger());
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return 'cache';
diff --git a/htdocs/includes/DebugBar/Bridge/DoctrineCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/DoctrineCollector.php
similarity index 91%
rename from htdocs/includes/DebugBar/Bridge/DoctrineCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/DoctrineCollector.php
index 6fa358e29ab..7c91da9bff7 100644
--- a/htdocs/includes/DebugBar/Bridge/DoctrineCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/DoctrineCollector.php
@@ -34,6 +34,11 @@ class DoctrineCollector extends DataCollector implements Renderable, AssetProvid
 {
     protected $debugStack;
 
+    /**
+     * DoctrineCollector constructor.
+     * @param $debugStackOrEntityManager
+     * @throws DebugBarException
+     */
     public function __construct($debugStackOrEntityManager)
     {
         if ($debugStackOrEntityManager instanceof EntityManager) {
@@ -45,6 +50,9 @@ class DoctrineCollector extends DataCollector implements Renderable, AssetProvid
         $this->debugStack = $debugStackOrEntityManager;
     }
 
+    /**
+     * @return array
+     */
     public function collect()
     {
         $queries = array();
@@ -67,11 +75,17 @@ class DoctrineCollector extends DataCollector implements Renderable, AssetProvid
         );
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return 'doctrine';
     }
 
+    /**
+     * @return array
+     */
     public function getWidgets()
     {
         return array(
@@ -88,6 +102,9 @@ class DoctrineCollector extends DataCollector implements Renderable, AssetProvid
         );
     }
 
+    /**
+     * @return array
+     */
     public function getAssets()
     {
         return array(
diff --git a/htdocs/includes/DebugBar/Bridge/MonologCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/MonologCollector.php
similarity index 92%
rename from htdocs/includes/DebugBar/Bridge/MonologCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/MonologCollector.php
index 609d5c5f837..f24b296d574 100644
--- a/htdocs/includes/DebugBar/Bridge/MonologCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/MonologCollector.php
@@ -56,6 +56,9 @@ class MonologCollector extends AbstractProcessingHandler implements DataCollecto
         $logger->pushHandler($this);
     }
 
+    /**
+     * @param array $record
+     */
     protected function write(array $record)
     {
         $this->records[] = array(
@@ -66,11 +69,17 @@ class MonologCollector extends AbstractProcessingHandler implements DataCollecto
         );
     }
 
+    /**
+     * @return array
+     */
     public function getMessages()
     {
         return $this->records;
     }
 
+    /**
+     * @return array
+     */
     public function collect()
     {
         return array(
@@ -79,11 +88,17 @@ class MonologCollector extends AbstractProcessingHandler implements DataCollecto
         );
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return $this->name;
     }
 
+    /**
+     * @return array
+     */
     public function getWidgets()
     {
         $name = $this->getName();
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Propel2Collector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Propel2Collector.php
new file mode 100644
index 00000000000..3df4dcc6df4
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Propel2Collector.php
@@ -0,0 +1,307 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2013 Maxime Bouroumeau-Fuseau
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar\Bridge;
+
+use DebugBar\DataCollector\AssetProvider;
+use DebugBar\DataCollector\DataCollector;
+use DebugBar\DataCollector\Renderable;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Connection\ProfilerConnectionWrapper;
+use Propel\Runtime\Propel;
+use Psr\Log\LogLevel;
+use Psr\Log\LoggerInterface;
+
+/**
+ * A Propel logger which acts as a data collector
+ *
+ * http://propelorm.org/
+ *
+ * Will log queries and display them using the SQLQueries widget.
+ *
+ * Example:
+ * <code>
+ * $debugbar->addCollector(new \DebugBar\Bridge\Propel2Collector(\Propel\Runtime\Propel::getServiceContainer()->getReadConnection()));
+ * </code>
+ */
+class Propel2Collector extends DataCollector implements Renderable, AssetProvider
+{
+    /**
+     * @var null|TestHandler
+     */
+    protected $handler = null;
+
+    /**
+     * @var null|Logger
+     */
+    protected $logger = null;
+
+    /**
+     * @var array
+     */
+    protected $config = array();
+
+    /**
+     * @var array
+     */
+    protected $errors = array();
+
+    /**
+     * @var int
+     */
+    protected $queryCount = 0;
+
+    /**
+     * @param ConnectionInterface $connection Propel connection
+     */
+    public function __construct(
+        ConnectionInterface $connection,
+        array $logMethods = array(
+            'beginTransaction',
+            'commit',
+            'rollBack',
+            'forceRollBack',
+            'exec',
+            'query',
+            'execute'
+        )
+    ) {
+        if ($connection instanceof ProfilerConnectionWrapper) {
+            $connection->setLogMethods($logMethods);
+
+            $this->config = $connection->getProfiler()->getConfiguration();
+
+            $this->handler = new TestHandler();
+
+            if ($connection->getLogger() instanceof Logger) {
+                $this->logger = $connection->getLogger();
+                $this->logger->pushHandler($this->handler);
+            } else {
+                $this->errors[] = 'Supported only monolog logger';
+            }
+        } else {
+            $this->errors[] = 'You need set ProfilerConnectionWrapper';
+        }
+    }
+
+    /**
+     * @return TestHandler|null
+     */
+    public function getHandler()
+    {
+        return $this->handler;
+    }
+
+    /**
+     * @return array
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
+
+    /**
+     * @return Logger|null
+     */
+    public function getLogger()
+    {
+        return $this->logger;
+    }
+
+    /**
+     * @return LoggerInterface
+     */
+    protected function getDefaultLogger()
+    {
+        return Propel::getServiceContainer()->getLogger();
+    }
+
+    /**
+     * @return int
+     */
+    protected function getQueryCount()
+    {
+        return $this->queryCount;
+    }
+
+    /**
+     * @param array $records
+     * @param array $config
+     * @return array
+     */
+    protected function getStatements($records, $config)
+    {
+        $statements = array();
+        foreach ($records as $record) {
+            $duration = null;
+            $memory = null;
+
+            $isSuccess = ( LogLevel::INFO === strtolower($record['level_name']) );
+
+            $detailsCount = count($config['details']);
+            $parameters = explode($config['outerGlue'], $record['message'], $detailsCount + 1);
+            if (count($parameters) === ($detailsCount + 1)) {
+                $parameters = array_map('trim', $parameters);
+                $_details = array();
+                foreach (array_splice($parameters, 0, $detailsCount) as $string) {
+                    list($key, $value) = array_map('trim', explode($config['innerGlue'], $string, 2));
+                    $_details[$key] = $value;
+                }
+
+                $details = array();
+                foreach ($config['details'] as $key => $detail) {
+                    if (isset($_details[$detail['name']])) {
+                        $value = $_details[$detail['name']];
+                        if ('time' === $key) {
+                            if (substr_count($value, 'ms')) {
+                                $value = (float)$value / 1000;
+                            } else {
+                                $value = (float)$value;
+                            }
+                        } else {
+                            $suffixes = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+                            $suffix = substr($value, -2);
+                            $i = array_search($suffix, $suffixes, true);
+                            $i = (false === $i) ? 0 : $i;
+
+                            $value = ((float)$value) * pow(1024, $i);
+                        }
+                        $details[$key] = $value;
+                    }
+                }
+
+                if (isset($details['time'])) {
+                    $duration = $details['time'];
+                }
+                if (isset($details['memDelta'])) {
+                    $memory = $details['memDelta'];
+                }
+
+                $message = end($parameters);
+
+                if ($isSuccess) {
+                    $this->queryCount++;
+                }
+
+            } else {
+                $message = $record['message'];
+            }
+
+            $statement = array(
+                'sql' => $message,
+                'is_success' => $isSuccess,
+                'duration' => $duration,
+                'duration_str' => $this->getDataFormatter()->formatDuration($duration),
+                'memory' => $memory,
+                'memory_str' => $this->getDataFormatter()->formatBytes($memory),
+            );
+
+            if (false === $isSuccess) {
+                $statement['sql'] = '';
+                $statement['error_code'] = $record['level'];
+                $statement['error_message'] = $message;
+            }
+
+            $statements[] = $statement;
+        }
+        return $statements;
+    }
+
+    /**
+     * @return array
+     */
+    public function collect()
+    {
+        if (count($this->errors)) {
+            return array(
+                'statements' => array_map(function ($message) {
+                    return array('sql' => '', 'is_success' => false, 'error_code' => 500, 'error_message' => $message);
+                }, $this->errors),
+                'nb_statements' => 0,
+                'nb_failed_statements' => count($this->errors),
+            );
+        }
+
+        if ($this->getHandler() === null) {
+            return array();
+        }
+
+        $statements = $this->getStatements($this->getHandler()->getRecords(), $this->getConfig());
+
+        $failedStatement = count(array_filter($statements, function ($statement) {
+            return false === $statement['is_success'];
+        }));
+        $accumulatedDuration = array_reduce($statements, function ($accumulatedDuration, $statement) {
+        
+            $time = isset($statement['duration']) ? $statement['duration'] : 0;
+            return $accumulatedDuration += $time;
+        });
+        $memoryUsage = array_reduce($statements, function ($memoryUsage, $statement) {
+        
+            $time = isset($statement['memory']) ? $statement['memory'] : 0;
+            return $memoryUsage += $time;
+        });
+
+        return array(
+            'nb_statements' => $this->getQueryCount(),
+            'nb_failed_statements' => $failedStatement,
+            'accumulated_duration' => $accumulatedDuration,
+            'accumulated_duration_str' => $this->getDataFormatter()->formatDuration($accumulatedDuration),
+            'memory_usage' => $memoryUsage,
+            'memory_usage_str' => $this->getDataFormatter()->formatBytes($memoryUsage),
+            'statements' => $statements
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        $additionalName  = '';
+        if ($this->getLogger() !== $this->getDefaultLogger()) {
+            $additionalName = ' ('.$this->getLogger()->getName().')';
+        }
+
+        return 'propel2'.$additionalName;
+    }
+
+    /**
+     * @return array
+     */
+    public function getWidgets()
+    {
+        return array(
+            $this->getName() => array(
+                'icon' => 'bolt',
+                'widget' => 'PhpDebugBar.Widgets.SQLQueriesWidget',
+                'map' => $this->getName(),
+                'default' => '[]'
+            ),
+            $this->getName().':badge' => array(
+                'map' => $this->getName().'.nb_statements',
+                'default' => 0
+            ),
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getAssets()
+    {
+        return array(
+            'css' => 'widgets/sqlqueries/widget.css',
+            'js' => 'widgets/sqlqueries/widget.js'
+        );
+    }
+}
diff --git a/htdocs/includes/DebugBar/Bridge/PropelCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/PropelCollector.php
similarity index 100%
rename from htdocs/includes/DebugBar/Bridge/PropelCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/PropelCollector.php
diff --git a/htdocs/includes/DebugBar/Bridge/SlimCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/SlimCollector.php
similarity index 100%
rename from htdocs/includes/DebugBar/Bridge/SlimCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/SlimCollector.php
diff --git a/htdocs/includes/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php
similarity index 100%
rename from htdocs/includes/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php
diff --git a/htdocs/includes/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php
similarity index 100%
rename from htdocs/includes/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php
new file mode 100644
index 00000000000..3611d2d8efa
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php
@@ -0,0 +1,60 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2017 Tim Riemenschneider
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar\Bridge\Twig;
+
+use DebugBar\DataCollector\TimeDataCollector;
+use Twig_Profiler_Profile;
+
+/**
+ * Class TimeableTwigExtensionProfiler
+ *
+ * Extends Twig_Extension_Profiler to add rendering times to the TimeDataCollector
+ *
+ * @package DebugBar\Bridge\Twig
+ */
+class TimeableTwigExtensionProfiler extends \Twig_Extension_Profiler
+{
+    /**
+     * @var \DebugBar\DataCollector\TimeDataCollector
+     */
+    private $timeDataCollector;
+
+    /**
+     * @param \DebugBar\DataCollector\TimeDataCollector $timeDataCollector
+     */
+    public function setTimeDataCollector(TimeDataCollector $timeDataCollector)
+    {
+        $this->timeDataCollector = $timeDataCollector;
+    }
+
+    public function __construct(\Twig_Profiler_Profile $profile, TimeDataCollector $timeDataCollector = null)
+    {
+        parent::__construct($profile);
+
+        $this->timeDataCollector = $timeDataCollector;
+    }
+
+    public function enter(Twig_Profiler_Profile $profile)
+    {
+        if ($this->timeDataCollector && $profile->isTemplate()) {
+            $this->timeDataCollector->startMeasure($profile->getName(), 'template ' . $profile->getName());
+        }
+        parent::enter($profile);
+    }
+
+    public function leave(Twig_Profiler_Profile $profile)
+    {
+        parent::leave($profile);
+        if ($this->timeDataCollector && $profile->isTemplate()) {
+            $this->timeDataCollector->stopMeasure($profile->getName());
+        }
+    }
+}
\ No newline at end of file
diff --git a/htdocs/includes/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php
similarity index 98%
rename from htdocs/includes/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php
index 0d4c957f5b2..cdaae7a4525 100644
--- a/htdocs/includes/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php
@@ -118,9 +118,9 @@ class TraceableTwigEnvironment extends Twig_Environment
         return $this->twig->isStrictVariables();
     }
 
-    public function getCache()
+    public function getCache($original = true)
     {
-        return $this->twig->getCache();
+        return $this->twig->getCache($original);
     }
 
     public function setCache($cache)
diff --git a/htdocs/includes/DebugBar/Bridge/Twig/TraceableTwigTemplate.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigTemplate.php
similarity index 93%
rename from htdocs/includes/DebugBar/Bridge/Twig/TraceableTwigTemplate.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigTemplate.php
index dab53d15e1f..648f7baf4da 100644
--- a/htdocs/includes/DebugBar/Bridge/Twig/TraceableTwigTemplate.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigTemplate.php
@@ -16,7 +16,7 @@ use Twig_TemplateInterface;
 /**
  * Wraps a Twig_Template to add profiling features
  */
-class TraceableTwigTemplate implements Twig_TemplateInterface
+class TraceableTwigTemplate extends Twig_Template implements Twig_TemplateInterface
 {
     protected $template;
 
@@ -35,6 +35,11 @@ class TraceableTwigTemplate implements Twig_TemplateInterface
         return call_user_func_array(array($this->template, $name), $arguments);
     }
 
+    public function doDisplay(array $context, array $blocks = array())
+    {
+        return $this->template->doDisplay($context, $blocks);
+    }
+
     public function getTemplateName()
     {
         return $this->template->getTemplateName();
diff --git a/htdocs/includes/DebugBar/Bridge/Twig/TwigCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TwigCollector.php
similarity index 96%
rename from htdocs/includes/DebugBar/Bridge/Twig/TwigCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TwigCollector.php
index fde5a3f85ba..c571d835bcc 100644
--- a/htdocs/includes/DebugBar/Bridge/Twig/TwigCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/Twig/TwigCollector.php
@@ -68,7 +68,7 @@ class TwigCollector extends DataCollector implements Renderable, AssetProvider
                 'icon' => 'leaf',
                 'widget' => 'PhpDebugBar.Widgets.TemplatesWidget',
                 'map' => 'twig',
-                'default' => '[]'
+                'default' => json_encode(array('templates' => array())),
             ),
             'twig:badge' => array(
                 'map' => 'twig.nb_templates',
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/TwigProfileCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/TwigProfileCollector.php
new file mode 100644
index 00000000000..efd3a7d523e
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Bridge/TwigProfileCollector.php
@@ -0,0 +1,197 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2017 Tim Riemenschneider
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar\Bridge;
+
+use DebugBar\DataCollector\AssetProvider;
+use DebugBar\DataCollector\DataCollector;
+use DebugBar\DataCollector\Renderable;
+
+/**
+ * Collects data about rendered templates
+ *
+ * http://twig.sensiolabs.org/
+ *
+ * A Twig_Extension_Profiler should be added to your Twig_Environment
+ * The root-Twig_Profiler_Profile-object should then be injected into this collector
+ *
+ * you can optionally provide the Twig_Environment or the Twig_Loader to also create
+ * debug-links.
+ *
+ * @see \Twig_Extension_Profiler, \Twig_Profiler_Profile
+ *
+ * <code>
+ * $env = new Twig_Environment($loader); // Or from a PSR11-container
+ * $profile = new Twig_Profiler_Profile();
+ * $env->addExtension(new Twig_Extension_Profile($profile));
+ * $debugbar->addCollector(new TwigProfileCollector($profile, $env));
+ * // or: $debugbar->addCollector(new TwigProfileCollector($profile, $loader));
+ * </code>
+ */
+class TwigProfileCollector extends DataCollector implements Renderable, AssetProvider
+{
+    /**
+     * @var \Twig_Profiler_Profile
+     */
+    private $profile;
+    /**
+     * @var \Twig_LoaderInterface
+     */
+    private $loader;
+    /** @var int */
+    private $templateCount;
+    /** @var int */
+    private $blockCount;
+    /** @var int */
+    private $macroCount;
+    /**
+     * @var array[] {
+     * @var string $name
+     * @var int    $render_time
+     * @var string $render_time_str
+     * @var string $memory_str
+     * @var string $xdebug_link
+     * }
+     */
+    private $templates;
+
+    /**
+     * TwigProfileCollector constructor.
+     *
+     * @param \Twig_Profiler_Profile $profile
+     * @param \Twig_LoaderInterface|\Twig_Environment $loaderOrEnv
+     */
+    public function __construct(\Twig_Profiler_Profile $profile, $loaderOrEnv = null)
+    {
+        $this->profile     = $profile;
+        if ($loaderOrEnv instanceof \Twig_Environment) {
+            $loaderOrEnv = $loaderOrEnv->getLoader();
+        }
+        $this->loader = $loaderOrEnv;
+    }
+
+    /**
+     * Returns a hash where keys are control names and their values
+     * an array of options as defined in {@see DebugBar\JavascriptRenderer::addControl()}
+     *
+     * @return array
+     */
+    public function getWidgets()
+    {
+        return array(
+            'twig'       => array(
+                'icon'    => 'leaf',
+                'widget'  => 'PhpDebugBar.Widgets.TemplatesWidget',
+                'map'     => 'twig',
+                'default' => json_encode(array('templates' => array())),
+            ),
+            'twig:badge' => array(
+                'map'     => 'twig.badge',
+                'default' => 0,
+            ),
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function getAssets()
+    {
+        return array(
+            'css' => 'widgets/templates/widget.css',
+            'js'  => 'widgets/templates/widget.js',
+        );
+    }
+
+    /**
+     * Called by the DebugBar when data needs to be collected
+     *
+     * @return array Collected data
+     */
+    public function collect()
+    {
+        $this->templateCount = $this->blockCount = $this->macroCount = 0;
+        $this->templates     = array();
+        $this->computeData($this->profile);
+
+        return array(
+            'nb_templates'                => $this->templateCount,
+            'nb_blocks'                   => $this->blockCount,
+            'nb_macros'                   => $this->macroCount,
+            'templates'                   => $this->templates,
+            'accumulated_render_time'     => $this->profile->getDuration(),
+            'accumulated_render_time_str' => $this->getDataFormatter()->formatDuration($this->profile->getDuration()),
+            'memory_usage_str'            => $this->getDataFormatter()->formatBytes($this->profile->getMemoryUsage()),
+            'callgraph'                   => $this->getHtmlCallGraph(),
+            'badge'                       => implode(
+                '/',
+                array(
+                    $this->templateCount,
+                    $this->blockCount,
+                    $this->macroCount,
+                )
+            ),
+        );
+    }
+
+    /**
+     * Returns the unique name of the collector
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'twig';
+    }
+
+    public function getHtmlCallGraph()
+    {
+        $dumper = new \Twig_Profiler_Dumper_Html();
+
+        return $dumper->dump($this->profile);
+    }
+
+    /**
+     * Get an Xdebug Link to a file
+     *
+     * @return array {
+     *  @var string url
+     *  @var bool ajax
+     * }
+     */
+    public function getXdebugLink($template, $line = 1)
+    {
+        if (is_null($this->loader)) {
+            return null;
+        }
+        $file = $this->loader->getSourceContext($template)->getPath();
+
+        return parent::getXdebugLink($file, $line);
+    }
+
+    private function computeData(\Twig_Profiler_Profile $profile)
+    {
+        $this->templateCount += ($profile->isTemplate() ? 1 : 0);
+        $this->blockCount    += ($profile->isBlock() ? 1 : 0);
+        $this->macroCount    += ($profile->isMacro() ? 1 : 0);
+        if ($profile->isTemplate()) {
+            $this->templates[] = array(
+                'name'            => $profile->getName(),
+                'render_time'     => $profile->getDuration(),
+                'render_time_str' => $this->getDataFormatter()->formatDuration($profile->getDuration()),
+                'memory_str'      => $this->getDataFormatter()->formatBytes($profile->getMemoryUsage()),
+                'xdebug_link'     => $this->getXdebugLink($profile->getTemplate()),
+            );
+        }
+        foreach ($profile as $p) {
+            $this->computeData($p);
+        }
+    }
+}
diff --git a/htdocs/includes/DebugBar/DataCollector/AggregatedCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/AggregatedCollector.php
similarity index 90%
rename from htdocs/includes/DebugBar/DataCollector/AggregatedCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/AggregatedCollector.php
index 6c8e711ef76..c1fd96aef26 100644
--- a/htdocs/includes/DebugBar/DataCollector/AggregatedCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/AggregatedCollector.php
@@ -100,6 +100,9 @@ class AggregatedCollector implements DataCollectorInterface, ArrayAccess
         return $this->sort;
     }
 
+    /**
+     * @return array
+     */
     public function collect()
     {
         $aggregate = array();
@@ -136,6 +139,9 @@ class AggregatedCollector implements DataCollectorInterface, ArrayAccess
         return $data;
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return $this->name;
@@ -144,21 +150,38 @@ class AggregatedCollector implements DataCollectorInterface, ArrayAccess
     // --------------------------------------------
     // ArrayAccess implementation
 
+    /**
+     * @param mixed $key
+     * @param mixed $value
+     * @throws DebugBarException
+     */
     public function offsetSet($key, $value)
     {
         throw new DebugBarException("AggregatedCollector[] is read-only");
     }
 
+    /**
+     * @param mixed $key
+     * @return mixed
+     */
     public function offsetGet($key)
     {
         return $this->collectors[$key];
     }
 
+    /**
+     * @param mixed $key
+     * @return bool
+     */
     public function offsetExists($key)
     {
         return isset($this->collectors[$key]);
     }
 
+    /**
+     * @param mixed $key
+     * @throws DebugBarException
+     */
     public function offsetUnset($key)
     {
         throw new DebugBarException("AggregatedCollector[] is read-only");
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/AssetProvider.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/AssetProvider.php
new file mode 100644
index 00000000000..58425d899cb
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/AssetProvider.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2013 Maxime Bouroumeau-Fuseau
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar\DataCollector;
+
+/**
+ * Indicates that a DataCollector provides some assets
+ */
+interface AssetProvider
+{
+    /**
+     * Returns an array with the following keys:
+     *  - base_path
+     *  - base_url
+     *  - css: an array of filenames
+     *  - js: an array of filenames
+     *  - inline_css: an array map of content ID to inline CSS content (not including <style> tag)
+     *  - inline_js: an array map of content ID to inline JS content (not including <script> tag)
+     *  - inline_head: an array map of content ID to arbitrary inline HTML content (typically
+     *        <style>/<script> tags); it must be embedded within the <head> element
+     *
+     * All keys are optional.
+     *
+     * Ideally, you should store static assets in filenames that are returned via the normal css/js
+     * keys.  However, the inline asset elements are useful when integrating with 3rd-party
+     * libraries that require static assets that are only available in an inline format.
+     *
+     * The inline content arrays require special string array keys:  the caller of this function
+     * will use them to deduplicate content.  This is particularly useful if multiple instances of
+     * the same asset provider are used.  Inline assets from all collectors are merged together into
+     * the same array, so these content IDs effectively deduplicate the inline assets.
+     *
+     * @return array
+     */
+    function getAssets();
+}
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/ConfigCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/ConfigCollector.php
new file mode 100644
index 00000000000..75817ba20fd
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/ConfigCollector.php
@@ -0,0 +1,120 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2013 Maxime Bouroumeau-Fuseau
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar\DataCollector;
+
+/**
+ * Collects array data
+ */
+class ConfigCollector extends DataCollector implements Renderable, AssetProvider
+{
+    protected $name;
+
+    protected $data;
+
+    // The HTML var dumper requires debug bar users to support the new inline assets, which not all
+    // may support yet - so return false by default for now.
+    protected $useHtmlVarDumper = false;
+
+    /**
+     * Sets a flag indicating whether the Symfony HtmlDumper will be used to dump variables for
+     * rich variable rendering.
+     *
+     * @param bool $value
+     * @return $this
+     */
+    public function useHtmlVarDumper($value = true)
+    {
+        $this->useHtmlVarDumper = $value;
+        return $this;
+    }
+
+    /**
+     * Indicates whether the Symfony HtmlDumper will be used to dump variables for rich variable
+     * rendering.
+     *
+     * @return mixed
+     */
+    public function isHtmlVarDumperUsed()
+    {
+        return $this->useHtmlVarDumper;
+    }
+
+    /**
+     * @param array  $data
+     * @param string $name
+     */
+    public function __construct(array $data = array(), $name = 'config')
+    {
+        $this->name = $name;
+        $this->data = $data;
+    }
+
+    /**
+     * Sets the data
+     *
+     * @param array $data
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @return array
+     */
+    public function collect()
+    {
+        $data = array();
+        foreach ($this->data as $k => $v) {
+            if ($this->isHtmlVarDumperUsed()) {
+                $v = $this->getVarDumper()->renderVar($v);
+            } else if (!is_string($v)) {
+                $v = $this->getDataFormatter()->formatVar($v);
+            }
+            $data[$k] = $v;
+        }
+        return $data;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAssets() {
+        return $this->isHtmlVarDumperUsed() ? $this->getVarDumper()->getAssets() : array();
+    }
+
+    /**
+     * @return array
+     */
+    public function getWidgets()
+    {
+        $name = $this->getName();
+        $widget = $this->isHtmlVarDumperUsed()
+            ? "PhpDebugBar.Widgets.HtmlVariableListWidget"
+            : "PhpDebugBar.Widgets.VariableListWidget";
+        return array(
+            "$name" => array(
+                "icon" => "gear",
+                "widget" => $widget,
+                "map" => "$name",
+                "default" => "{}"
+            )
+        );
+    }
+}
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/DataCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/DataCollector.php
new file mode 100644
index 00000000000..5e3d52f231e
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/DataCollector.php
@@ -0,0 +1,234 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2013 Maxime Bouroumeau-Fuseau
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar\DataCollector;
+
+use DebugBar\DataFormatter\DataFormatter;
+use DebugBar\DataFormatter\DataFormatterInterface;
+use DebugBar\DataFormatter\DebugBarVarDumper;
+
+/**
+ * Abstract class for data collectors
+ */
+abstract class DataCollector implements DataCollectorInterface
+{
+    private static $defaultDataFormatter;
+    private static $defaultVarDumper;
+
+    protected $dataFormater;
+    protected $varDumper;
+    protected $xdebugLinkTemplate = '';
+    protected $xdebugShouldUseAjax = false;
+    protected $xdebugReplacements = array();
+
+    /**
+     * Sets the default data formater instance used by all collectors subclassing this class
+     *
+     * @param DataFormatterInterface $formater
+     */
+    public static function setDefaultDataFormatter(DataFormatterInterface $formater)
+    {
+        self::$defaultDataFormatter = $formater;
+    }
+
+    /**
+     * Returns the default data formater
+     *
+     * @return DataFormatterInterface
+     */
+    public static function getDefaultDataFormatter()
+    {
+        if (self::$defaultDataFormatter === null) {
+            self::$defaultDataFormatter = new DataFormatter();
+        }
+        return self::$defaultDataFormatter;
+    }
+
+    /**
+     * Sets the data formater instance used by this collector
+     *
+     * @param DataFormatterInterface $formater
+     * @return $this
+     */
+    public function setDataFormatter(DataFormatterInterface $formater)
+    {
+        $this->dataFormater = $formater;
+        return $this;
+    }
+
+    /**
+     * @return DataFormatterInterface
+     */
+    public function getDataFormatter()
+    {
+        if ($this->dataFormater === null) {
+            $this->dataFormater = self::getDefaultDataFormatter();
+        }
+        return $this->dataFormater;
+    }
+
+    /**
+     * Get an Xdebug Link to a file
+     *
+     * @param string $file
+     * @param int    $line
+     *
+     * @return array {
+     * @var string   $url
+     * @var bool     $ajax should be used to open the url instead of a normal links
+     * }
+     */
+    public function getXdebugLink($file, $line = 1)
+    {
+        if (count($this->xdebugReplacements)) {
+            $file = strtr($file, $this->xdebugReplacements);
+        }
+
+        $url = strtr($this->getXdebugLinkTemplate(), ['%f' => $file, '%l' => $line]);
+        if ($url) {
+            return ['url' => $url, 'ajax' => $this->getXdebugShouldUseAjax()];
+        }
+    }
+  
+    /**  
+     * Sets the default variable dumper used by all collectors subclassing this class
+     *
+     * @param DebugBarVarDumper $varDumper
+     */
+    public static function setDefaultVarDumper(DebugBarVarDumper $varDumper)
+    {
+        self::$defaultVarDumper = $varDumper;
+    }
+
+    /**
+     * Returns the default variable dumper
+     *
+     * @return DebugBarVarDumper
+     */
+    public static function getDefaultVarDumper()
+    {
+        if (self::$defaultVarDumper === null) {
+            self::$defaultVarDumper = new DebugBarVarDumper();
+        }
+        return self::$defaultVarDumper;
+    }
+
+    /**
+     * Sets the variable dumper instance used by this collector
+     *
+     * @param DebugBarVarDumper $varDumper
+     * @return $this
+     */
+    public function setVarDumper(DebugBarVarDumper $varDumper)
+    {
+        $this->varDumper = $varDumper;
+        return $this;
+    }
+
+    /**
+     * Gets the variable dumper instance used by this collector; note that collectors using this
+     * instance need to be sure to return the static assets provided by the variable dumper.
+     *
+     * @return DebugBarVarDumper
+     */
+    public function getVarDumper()
+    {
+        if ($this->varDumper === null) {
+            $this->varDumper = self::getDefaultVarDumper();
+        }
+        return $this->varDumper;
+    }
+
+    /**
+     * @deprecated
+     */
+    public function formatVar($var)
+    {
+        return $this->getDataFormatter()->formatVar($var);
+    }
+
+    /**
+     * @deprecated
+     */
+    public function formatDuration($seconds)
+    {
+        return $this->getDataFormatter()->formatDuration($seconds);
+    }
+
+    /**
+     * @deprecated
+     */
+    public function formatBytes($size, $precision = 2)
+    {
+        return $this->getDataFormatter()->formatBytes($size, $precision);
+    }
+
+    /**
+     * @return string
+     */
+    public function getXdebugLinkTemplate()
+    {
+        if (empty($this->xdebugLinkTemplate) && !empty(ini_get('xdebug.file_link_format'))) {
+            $this->xdebugLinkTemplate = ini_get('xdebug.file_link_format');
+        }
+
+        return $this->xdebugLinkTemplate;
+    }
+
+    /**
+     * @param string $xdebugLinkTemplate
+     * @param bool $shouldUseAjax
+     */
+    public function setXdebugLinkTemplate($xdebugLinkTemplate, $shouldUseAjax = false)
+    {
+        if ($xdebugLinkTemplate === 'idea') {
+            $this->xdebugLinkTemplate  = 'http://localhost:63342/api/file/?file=%f&line=%l';
+            $this->xdebugShouldUseAjax = true;
+        } else {
+            $this->xdebugLinkTemplate  = $xdebugLinkTemplate;
+            $this->xdebugShouldUseAjax = $shouldUseAjax;
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function getXdebugShouldUseAjax()
+    {
+        return $this->xdebugShouldUseAjax;
+    }
+
+    /**
+     * returns an array of filename-replacements
+     *
+     * this is useful f.e. when using vagrant or remote servers,
+     * where the path of the file is different between server and
+     * development environment
+     *
+     * @return array key-value-pairs of replacements, key = path on server, value = replacement
+     */
+    public function getXdebugReplacements()
+    {
+        return $this->xdebugReplacements;
+    }
+
+    /**
+     * @param array $xdebugReplacements
+     */
+    public function setXdebugReplacements($xdebugReplacements)
+    {
+        $this->xdebugReplacements = $xdebugReplacements;
+    }
+
+    public function setXdebugReplacement($serverPath, $replacement)
+    {
+        $this->xdebugReplacements[$serverPath] = $replacement;
+    }
+}
diff --git a/htdocs/includes/DebugBar/DataCollector/DataCollectorInterface.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/DataCollectorInterface.php
similarity index 100%
rename from htdocs/includes/DebugBar/DataCollector/DataCollectorInterface.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/DataCollectorInterface.php
diff --git a/htdocs/includes/DebugBar/DataCollector/ExceptionsCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/ExceptionsCollector.php
similarity index 72%
rename from htdocs/includes/DebugBar/DataCollector/ExceptionsCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/ExceptionsCollector.php
index 8bf08d404ef..285bc971102 100644
--- a/htdocs/includes/DebugBar/DataCollector/ExceptionsCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/ExceptionsCollector.php
@@ -11,6 +11,7 @@
 namespace DebugBar\DataCollector;
 
 use Exception;
+use Symfony\Component\Debug\Exception\FatalThrowableError;
 
 /**
  * Collects info about exceptions
@@ -24,12 +25,23 @@ class ExceptionsCollector extends DataCollector implements Renderable
      * Adds an exception to be profiled in the debug bar
      *
      * @param Exception $e
+     * @deprecated in favor on addThrowable
      */
     public function addException(Exception $e)
+    {
+        $this->addThrowable($e);
+    }
+
+    /**
+     * Adds a Throwable to be profiled in the debug bar
+     *
+     * @param \Throwable $e
+     */
+    public function addThrowable($e)
     {
         $this->exceptions[] = $e;
         if ($this->chainExceptions && $previous = $e->getPrevious()) {
-            $this->addException($previous);
+            $this->addThrowable($previous);
         }
     }
 
@@ -46,7 +58,7 @@ class ExceptionsCollector extends DataCollector implements Renderable
     /**
      * Returns the list of exceptions being profiled
      *
-     * @return array[Exception]
+     * @return array[\Throwable]
      */
     public function getExceptions()
     {
@@ -57,7 +69,7 @@ class ExceptionsCollector extends DataCollector implements Renderable
     {
         return array(
             'count' => count($this->exceptions),
-            'exceptions' => array_map(array($this, 'formatExceptionData'), $this->exceptions)
+            'exceptions' => array_map(array($this, 'formatThrowableData'), $this->exceptions)
         );
     }
 
@@ -66,8 +78,20 @@ class ExceptionsCollector extends DataCollector implements Renderable
      *
      * @param Exception $e
      * @return array
+     * @deprecated in favor on formatThrowableData
      */
     public function formatExceptionData(Exception $e)
+    {
+        return $this->formatThrowableData($e);
+    }
+
+    /**
+     * Returns Throwable data as an array
+     *
+     * @param \Throwable $e
+     * @return array
+     */
+    public function formatThrowableData($e)
     {
         $filePath = $e->getFile();
         if ($filePath && file_exists($filePath)) {
@@ -84,15 +108,23 @@ class ExceptionsCollector extends DataCollector implements Renderable
             'code' => $e->getCode(),
             'file' => $filePath,
             'line' => $e->getLine(),
-            'surrounding_lines' => $lines
+            'stack_trace' => $e->getTraceAsString(),
+            'surrounding_lines' => $lines,
+            'xdebug_link' => $this->getXdebugLink($filePath, $e->getLine())
         );
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return 'exceptions';
     }
 
+    /**
+     * @return array
+     */
     public function getWidgets()
     {
         return array(
diff --git a/htdocs/includes/DebugBar/DataCollector/LocalizationCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/LocalizationCollector.php
similarity index 92%
rename from htdocs/includes/DebugBar/DataCollector/LocalizationCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/LocalizationCollector.php
index 98b9e6334b2..276cd0e32e4 100644
--- a/htdocs/includes/DebugBar/DataCollector/LocalizationCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/LocalizationCollector.php
@@ -35,6 +35,9 @@ class LocalizationCollector extends DataCollector implements Renderable
         return textdomain();
     }
 
+    /**
+     * @return array
+     */
     public function collect()
     {
         return array(
@@ -43,11 +46,17 @@ class LocalizationCollector extends DataCollector implements Renderable
         );
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return 'localization';
     }
 
+    /**
+     * @return array
+     */
     public function getWidgets()
     {
         return array(
diff --git a/htdocs/includes/DebugBar/DataCollector/MemoryCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/MemoryCollector.php
similarity index 59%
rename from htdocs/includes/DebugBar/DataCollector/MemoryCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/MemoryCollector.php
index 1a27c40bf3a..894f8870adc 100644
--- a/htdocs/includes/DebugBar/DataCollector/MemoryCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/MemoryCollector.php
@@ -15,8 +15,32 @@ namespace DebugBar\DataCollector;
  */
 class MemoryCollector extends DataCollector implements Renderable
 {
+    protected $realUsage = false;
+
     protected $peakUsage = 0;
 
+    /**
+     * Returns whether total allocated memory page size is used instead of actual used memory size
+     * by the application.  See $real_usage parameter on memory_get_peak_usage for details.
+     *
+     * @return bool
+     */
+    public function getRealUsage()
+    {
+        return $this->realUsage;
+    }
+
+    /**
+     * Sets whether total allocated memory page size is used instead of actual used memory size
+     * by the application.  See $real_usage parameter on memory_get_peak_usage for details.
+     *
+     * @param bool $realUsage
+     */
+    public function setRealUsage($realUsage)
+    {
+        $this->realUsage = $realUsage;
+    }
+
     /**
      * Returns the peak memory usage
      *
@@ -32,9 +56,12 @@ class MemoryCollector extends DataCollector implements Renderable
      */
     public function updatePeakUsage()
     {
-        $this->peakUsage = memory_get_peak_usage(true);
+        $this->peakUsage = memory_get_peak_usage($this->realUsage);
     }
 
+    /**
+     * @return array
+     */
     public function collect()
     {
         $this->updatePeakUsage();
@@ -44,11 +71,17 @@ class MemoryCollector extends DataCollector implements Renderable
         );
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return 'memory';
     }
 
+    /**
+     * @return array
+     */
     public function getWidgets()
     {
         return array(
diff --git a/htdocs/includes/DebugBar/DataCollector/MessagesAggregateInterface.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/MessagesAggregateInterface.php
similarity index 100%
rename from htdocs/includes/DebugBar/DataCollector/MessagesAggregateInterface.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/MessagesAggregateInterface.php
diff --git a/htdocs/includes/DebugBar/DataCollector/MessagesCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/MessagesCollector.php
similarity index 57%
rename from htdocs/includes/DebugBar/DataCollector/MessagesCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/MessagesCollector.php
index e2e3d4b8b56..f26d3716ca2 100644
--- a/htdocs/includes/DebugBar/DataCollector/MessagesCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/MessagesCollector.php
@@ -11,11 +11,13 @@
 namespace DebugBar\DataCollector;
 
 use Psr\Log\AbstractLogger;
+use DebugBar\DataFormatter\DataFormatterInterface;
+use DebugBar\DataFormatter\DebugBarVarDumper;
 
 /**
  * Provides a way to log messages
  */
-class MessagesCollector extends AbstractLogger implements DataCollectorInterface, MessagesAggregateInterface, Renderable
+class MessagesCollector extends AbstractLogger implements DataCollectorInterface, MessagesAggregateInterface, Renderable, AssetProvider
 {
     protected $name;
 
@@ -25,6 +27,12 @@ class MessagesCollector extends AbstractLogger implements DataCollectorInterface
 
     protected $dataFormater;
 
+    protected $varDumper;
+
+    // The HTML var dumper requires debug bar users to support the new inline assets, which not all
+    // may support yet - so return false by default for now.
+    protected $useHtmlVarDumper = false;
+
     /**
      * @param string $name
      */
@@ -37,6 +45,7 @@ class MessagesCollector extends AbstractLogger implements DataCollectorInterface
      * Sets the data formater instance used by this collector
      *
      * @param DataFormatterInterface $formater
+     * @return $this
      */
     public function setDataFormatter(DataFormatterInterface $formater)
     {
@@ -44,6 +53,9 @@ class MessagesCollector extends AbstractLogger implements DataCollectorInterface
         return $this;
     }
 
+    /**
+     * @return DataFormatterInterface
+     */
     public function getDataFormatter()
     {
         if ($this->dataFormater === null) {
@@ -52,6 +64,56 @@ class MessagesCollector extends AbstractLogger implements DataCollectorInterface
         return $this->dataFormater;
     }
 
+    /**
+     * Sets the variable dumper instance used by this collector
+     *
+     * @param DebugBarVarDumper $varDumper
+     * @return $this
+     */
+    public function setVarDumper(DebugBarVarDumper $varDumper)
+    {
+        $this->varDumper = $varDumper;
+        return $this;
+    }
+
+    /**
+     * Gets the variable dumper instance used by this collector
+     *
+     * @return DebugBarVarDumper
+     */
+    public function getVarDumper()
+    {
+        if ($this->varDumper === null) {
+            $this->varDumper = DataCollector::getDefaultVarDumper();
+        }
+        return $this->varDumper;
+    }
+
+    /**
+     * Sets a flag indicating whether the Symfony HtmlDumper will be used to dump variables for
+     * rich variable rendering.  Be sure to set this flag before logging any messages for the
+     * first time.
+     *
+     * @param bool $value
+     * @return $this
+     */
+    public function useHtmlVarDumper($value = true)
+    {
+        $this->useHtmlVarDumper = $value;
+        return $this;
+    }
+
+    /**
+     * Indicates whether the Symfony HtmlDumper will be used to dump variables for rich variable
+     * rendering.
+     *
+     * @return mixed
+     */
+    public function isHtmlVarDumperUsed()
+    {
+        return $this->useHtmlVarDumper;
+    }
+
     /**
      * Adds a message
      *
@@ -62,12 +124,19 @@ class MessagesCollector extends AbstractLogger implements DataCollectorInterface
      */
     public function addMessage($message, $label = 'info', $isString = true)
     {
+        $messageText = $message;
+        $messageHtml = null;
         if (!is_string($message)) {
-            $message = $this->getDataFormatter()->formatVar($message);
+            // Send both text and HTML representations; the text version is used for searches
+            $messageText = $this->getDataFormatter()->formatVar($message);
+            if ($this->isHtmlVarDumperUsed()) {
+                $messageHtml = $this->getVarDumper()->renderVar($message);
+            }
             $isString = false;
         }
         $this->messages[] = array(
-            'message' => $message,
+            'message' => $messageText,
+            'message_html' => $messageHtml,
             'is_string' => $isString,
             'label' => $label,
             'time' => microtime(true)
@@ -84,6 +153,9 @@ class MessagesCollector extends AbstractLogger implements DataCollectorInterface
         $this->aggregates[] = $messages;
     }
 
+    /**
+     * @return array
+     */
     public function getMessages()
     {
         $messages = $this->messages;
@@ -106,6 +178,11 @@ class MessagesCollector extends AbstractLogger implements DataCollectorInterface
         return $messages;
     }
 
+    /**
+     * @param $level
+     * @param $message
+     * @param array $context
+     */
     public function log($level, $message, array $context = array())
     {
         $this->addMessage($message, $level);
@@ -119,6 +196,9 @@ class MessagesCollector extends AbstractLogger implements DataCollectorInterface
         $this->messages = array();
     }
 
+    /**
+     * @return array
+     */
     public function collect()
     {
         $messages = $this->getMessages();
@@ -128,11 +208,24 @@ class MessagesCollector extends AbstractLogger implements DataCollectorInterface
         );
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return $this->name;
     }
 
+    /**
+     * @return array
+     */
+    public function getAssets() {
+        return $this->isHtmlVarDumperUsed() ? $this->getVarDumper()->getAssets() : array();
+    }
+
+    /**
+     * @return array
+     */
     public function getWidgets()
     {
         $name = $this->getName();
diff --git a/htdocs/includes/DebugBar/DataCollector/PDO/PDOCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/PDOCollector.php
similarity index 90%
rename from htdocs/includes/DebugBar/DataCollector/PDO/PDOCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/PDOCollector.php
index 37e7b020b1f..e1eb35ad0bc 100644
--- a/htdocs/includes/DebugBar/DataCollector/PDO/PDOCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/PDOCollector.php
@@ -43,11 +43,17 @@ class PDOCollector extends DataCollector implements Renderable, AssetProvider
         $this->sqlQuotationChar = $quotationChar;
     }
 
+    /**
+     * @return bool
+     */
     public function isSqlRenderedWithParams()
     {
         return $this->renderSqlWithParams;
     }
 
+    /**
+     * @return string
+     */
     public function getSqlQuotationChar()
     {
         return $this->sqlQuotationChar;
@@ -77,6 +83,9 @@ class PDOCollector extends DataCollector implements Renderable, AssetProvider
         return $this->connections;
     }
 
+    /**
+     * @return array
+     */
     public function collect()
     {
         $data = array(
@@ -89,7 +98,7 @@ class PDOCollector extends DataCollector implements Renderable, AssetProvider
         );
 
         foreach ($this->connections as $name => $pdo) {
-            $pdodata = $this->collectPDO($pdo, $this->timeCollector);
+            $pdodata = $this->collectPDO($pdo, $this->timeCollector, $name);
             $data['nb_statements'] += $pdodata['nb_statements'];
             $data['nb_failed_statements'] += $pdodata['nb_failed_statements'];
             $data['accumulated_duration'] += $pdodata['accumulated_duration'];
@@ -111,10 +120,16 @@ class PDOCollector extends DataCollector implements Renderable, AssetProvider
      *
      * @param TraceablePDO $pdo
      * @param TimeDataCollector $timeCollector
+     * @param string|null $connectionName the pdo connection (eg default | read | write)
      * @return array
      */
-    protected function collectPDO(TraceablePDO $pdo, TimeDataCollector $timeCollector = null)
+    protected function collectPDO(TraceablePDO $pdo, TimeDataCollector $timeCollector = null, $connectionName = null)
     {
+        if (empty($connectionName) || $connectionName == 'default') {
+            $connectionName = 'pdo';
+        } else {
+            $connectionName = 'pdo ' . $connectionName;
+        }
         $stmts = array();
         foreach ($pdo->getExecutedStatements() as $stmt) {
             $stmts[] = array(
@@ -134,7 +149,7 @@ class PDOCollector extends DataCollector implements Renderable, AssetProvider
                 'error_message' => $stmt->getErrorMessage()
             );
             if ($timeCollector !== null) {
-                $timeCollector->addMeasure($stmt->getSql(), $stmt->getStartTime(), $stmt->getEndTime());
+                $timeCollector->addMeasure($stmt->getSql(), $stmt->getStartTime(), $stmt->getEndTime(), array(), $connectionName);
             }
         }
 
@@ -151,16 +166,22 @@ class PDOCollector extends DataCollector implements Renderable, AssetProvider
         );
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return 'pdo';
     }
 
+    /**
+     * @return array
+     */
     public function getWidgets()
     {
         return array(
             "database" => array(
-                "icon" => "inbox",
+                "icon" => "database",
                 "widget" => "PhpDebugBar.Widgets.SQLQueriesWidget",
                 "map" => "pdo",
                 "default" => "[]"
@@ -172,6 +193,9 @@ class PDOCollector extends DataCollector implements Renderable, AssetProvider
         );
     }
 
+    /**
+     * @return array
+     */
     public function getAssets()
     {
         return array(
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php
new file mode 100644
index 00000000000..e448a794ad3
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php
@@ -0,0 +1,311 @@
+<?php
+
+namespace DebugBar\DataCollector\PDO;
+
+use PDO;
+use PDOException;
+use DebugBar\DataCollector\PDO\TraceablePDOStatement;
+
+/**
+ * A PDO proxy which traces statements
+ */
+class TraceablePDO extends PDO
+{
+    /** @var PDO */
+    protected $pdo;
+
+    /** @var TracedStatement[] */
+    protected $executedStatements = [];
+
+    public function __construct(PDO $pdo)
+    {
+        $this->pdo = $pdo;
+        $this->pdo->setAttribute(PDO::ATTR_STATEMENT_CLASS, [TraceablePDOStatement::class, [$this]]);
+    }
+
+	/**
+	 * Initiates a transaction
+         *
+	 * @link   http://php.net/manual/en/pdo.begintransaction.php
+	 * @return bool TRUE on success or FALSE on failure.
+	 */
+    public function beginTransaction()
+    {
+        return $this->pdo->beginTransaction();
+    }
+
+    /**
+     * Commits a transaction
+     *
+     * @link   http://php.net/manual/en/pdo.commit.php
+     * @return bool TRUE on success or FALSE on failure.
+     */
+    public function commit()
+    {
+        return $this->pdo->commit();
+    }
+
+    /**
+     * Fetch extended error information associated with the last operation on the database handle
+     *
+     * @link   http://php.net/manual/en/pdo.errorinfo.php
+     * @return array PDO::errorInfo returns an array of error information
+     */
+    public function errorCode()
+    {
+        return $this->pdo->errorCode();
+    }
+
+    /**
+     * Fetch extended error information associated with the last operation on the database handle
+     *
+     * @link   http://php.net/manual/en/pdo.errorinfo.php
+     * @return array PDO::errorInfo returns an array of error information
+     */
+    public function errorInfo()
+    {
+        return $this->pdo->errorInfo();
+    }
+
+    /**
+     * Execute an SQL statement and return the number of affected rows
+     *
+     * @link   http://php.net/manual/en/pdo.exec.php
+     * @param  string   $statement
+     * @return int|bool PDO::exec returns the number of rows that were modified or deleted by the
+     * SQL statement you issued. If no rows were affected, PDO::exec returns 0. This function may
+     * return Boolean FALSE, but may also return a non-Boolean value which evaluates to FALSE.
+     * Please read the section on Booleans for more information
+     */
+    public function exec($statement)
+    {
+        return $this->profileCall('exec', $statement, func_get_args());
+    }
+
+    /**
+     * Retrieve a database connection attribute
+     *
+     * @link   http://php.net/manual/en/pdo.getattribute.php
+     * @param  int   $attribute One of the PDO::ATTR_* constants
+     * @return mixed A successful call returns the value of the requested PDO attribute.
+     * An unsuccessful call returns null.
+     */
+    public function getAttribute($attribute)
+    {
+        return $this->pdo->getAttribute($attribute);
+    }
+
+    /**
+     * Checks if inside a transaction
+     *
+     * @link   http://php.net/manual/en/pdo.intransaction.php
+     * @return bool TRUE if a transaction is currently active, and FALSE if not.
+     */
+    public function inTransaction()
+    {
+        return $this->pdo->inTransaction();
+    }
+
+    /**
+     * Returns the ID of the last inserted row or sequence value
+     *
+     * @link   http://php.net/manual/en/pdo.lastinsertid.php
+     * @param  string $name [optional]
+     * @return string If a sequence name was not specified for the name parameter, PDO::lastInsertId
+     * returns a string representing the row ID of the last row that was inserted into the database.
+     */
+    public function lastInsertId($name = null)
+    {
+        return $this->pdo->lastInsertId($name);
+    }
+
+	/**
+	 * Prepares a statement for execution and returns a statement object
+   *
+	 * @link   http://php.net/manual/en/pdo.prepare.php
+	 * @param  string $statement This must be a valid SQL statement template for the target DB server.
+	 * @param  array  $driver_options [optional] This array holds one or more key=&gt;value pairs to
+	 * set attribute values for the PDOStatement object that this method returns.
+	 * @return TraceablePDOStatement|bool If the database server successfully prepares the statement,
+   * PDO::prepare returns a PDOStatement object. If the database server cannot successfully prepare
+   * the statement, PDO::prepare returns FALSE or emits PDOException (depending on error handling).
+	 */
+    public function prepare($statement, $driver_options = [])
+    {
+        return $this->pdo->prepare($statement, $driver_options);
+    }
+
+	/**
+	 * Executes an SQL statement, returning a result set as a PDOStatement object
+   *
+	 * @link   http://php.net/manual/en/pdo.query.php
+	 * @param  string $statement
+	 * @return TraceablePDOStatement|bool PDO::query returns a PDOStatement object, or FALSE on
+   * failure.
+   */
+    public function query($statement)
+    {
+        return $this->profileCall('query', $statement, func_get_args());
+    }
+
+    /**
+     * Quotes a string for use in a query.
+     *
+     * @link   http://php.net/manual/en/pdo.quote.php
+     * @param  string $string The string to be quoted.
+     * @param  int    $parameter_type [optional] Provides a data type hint for drivers that have
+     * alternate quoting styles.
+     * @return string|bool A quoted string that is theoretically safe to pass into an SQL statement.
+     * Returns FALSE if the driver does not support quoting in this way.
+     */
+    public function quote($string, $parameter_type = PDO::PARAM_STR)
+    {
+        return $this->pdo->quote($string, $parameter_type);
+    }
+
+    /**
+     * Rolls back a transaction
+     *
+     * @link   http://php.net/manual/en/pdo.rollback.php
+     * @return bool TRUE on success or FALSE on failure.
+     */
+    public function rollBack()
+    {
+        return $this->pdo->rollBack();
+    }
+
+    /**
+     * Set an attribute
+     *
+     * @link   http://php.net/manual/en/pdo.setattribute.php
+     * @param  int $attribute
+     * @param  mixed $value
+     * @return bool TRUE on success or FALSE on failure.
+     */
+    public function setAttribute($attribute, $value)
+    {
+        return $this->pdo->setAttribute($attribute, $value);
+    }
+
+    /**
+     * Profiles a call to a PDO method
+     *
+     * @param  string $method
+     * @param  string $sql
+     * @param  array  $args
+     * @return mixed  The result of the call
+     */
+    protected function profileCall($method, $sql, array $args)
+    {
+        $trace = new TracedStatement($sql);
+        $trace->start();
+
+        $ex = null;
+        try {
+            $result = $this->__call($method, $args);
+        } catch (PDOException $e) {
+            $ex = $e;
+        }
+
+        if ($this->pdo->getAttribute(PDO::ATTR_ERRMODE) !== PDO::ERRMODE_EXCEPTION && $result === false) {
+            $error = $this->pdo->errorInfo();
+            $ex = new PDOException($error[2], $error[0]);
+        }
+
+        $trace->end($ex);
+        $this->addExecutedStatement($trace);
+
+        if ($this->pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_EXCEPTION && $ex !== null) {
+            throw $ex;
+        }
+        return $result;
+    }
+
+    /**
+     * Adds an executed TracedStatement
+     *
+     * @param TracedStatement $stmt
+     */
+    public function addExecutedStatement(TracedStatement $stmt)
+    {
+        $this->executedStatements[] = $stmt;
+    }
+
+    /**
+     * Returns the accumulated execution time of statements
+     *
+     * @return int
+     */
+    public function getAccumulatedStatementsDuration()
+    {
+        return array_reduce($this->executedStatements, function ($v, $s) { return $v + $s->getDuration(); });
+    }
+
+    /**
+     * Returns the peak memory usage while performing statements
+     *
+     * @return int
+     */
+    public function getMemoryUsage()
+    {
+        return array_reduce($this->executedStatements, function ($v, $s) { return $v + $s->getMemoryUsage(); });
+    }
+
+    /**
+     * Returns the peak memory usage while performing statements
+     *
+     * @return int
+     */
+    public function getPeakMemoryUsage()
+    {
+        return array_reduce($this->executedStatements, function ($v, $s) { $m = $s->getEndMemory(); return $m > $v ? $m : $v; });
+    }
+
+    /**
+     * Returns the list of executed statements as TracedStatement objects
+     *
+     * @return TracedStatement[]
+     */
+    public function getExecutedStatements()
+    {
+        return $this->executedStatements;
+    }
+
+    /**
+     * Returns the list of failed statements
+     *
+     * @return TracedStatement[]
+     */
+    public function getFailedExecutedStatements()
+    {
+        return array_filter($this->executedStatements, function ($s) { return !$s->isSuccess(); });
+    }
+
+    /**
+     * @param $name
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        return $this->pdo->$name;
+    }
+
+    /**
+     * @param $name
+     * @param $value
+     */
+    public function __set($name, $value)
+    {
+        $this->pdo->$name = $value;
+    }
+
+    /**
+     * @param $name
+     * @param $args
+     * @return mixed
+     */
+    public function __call($name, $args)
+    {
+        return call_user_func_array([$this->pdo, $name], $args);
+    }
+}
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDOStatement.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDOStatement.php
new file mode 100644
index 00000000000..d125b19a2eb
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDOStatement.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace DebugBar\DataCollector\PDO;
+
+use PDO;
+use PDOException;
+use PDOStatement;
+
+/**
+ * A traceable PDO statement to use with Traceablepdo
+ */
+class TraceablePDOStatement extends PDOStatement
+{
+    /** @var PDO */
+    protected $pdo;
+
+    /** @var array */
+    protected $boundParameters = [];
+
+    /**
+     * TraceablePDOStatement constructor.
+     *
+     * @param TraceablePDO $pdo
+     */
+    protected function __construct(TraceablePDO $pdo)
+    {
+        $this->pdo = $pdo;
+    }
+
+    /**
+     * Bind a column to a PHP variable
+     *
+     * @link   http://php.net/manual/en/pdostatement.bindcolumn.php
+     * @param  mixed $column Number of the column (1-indexed) or name of the column in the result set
+     * @param  mixed $param  Name of the PHP variable to which the column will be bound.
+     * @param  int   $type [optional] Data type of the parameter, specified by the PDO::PARAM_*
+     * constants.
+     * @param  int   $maxlen [optional] A hint for pre-allocation.
+     * @param  mixed $driverdata [optional] Optional parameter(s) for the driver.
+     * @return bool  TRUE on success or FALSE on failure.
+     */
+    public function bindColumn($column, &$param, $type = null, $maxlen = null, $driverdata = null)
+    {
+        $this->boundParameters[$column] = $param;
+        $args = array_merge([$column, &$param], array_slice(func_get_args(), 2));
+        return call_user_func_array(['parent', 'bindColumn'], $args);
+    }
+
+    /**
+     * Binds a parameter to the specified variable name
+     *
+     * @link   http://php.net/manual/en/pdostatement.bindparam.php
+     * @param  mixed $parameter Parameter identifier. For a prepared statement using named
+     * placeholders, this will be a parameter name of the form :name. For a prepared statement using
+     * question mark placeholders, this will be the 1-indexed position of the parameter.
+     * @param  mixed $variable  Name of the PHP variable to bind to the SQL statement parameter.
+     * @param  int $data_type [optional] Explicit data type for the parameter using the PDO::PARAM_*
+     * constants.
+     * @param  int $length [optional] Length of the data type. To indicate that a parameter is an OUT
+     * parameter from a stored procedure, you must explicitly set the length.
+     * @param  mixed $driver_options [optional]
+     * @return bool TRUE on success or FALSE on failure.
+     */
+    public function bindParam($parameter, &$variable, $data_type = PDO::PARAM_STR, $length = null, $driver_options = null)
+    {
+        $this->boundParameters[$parameter] = $variable;
+        $args = array_merge([$parameter, &$variable], array_slice(func_get_args(), 2));
+        return call_user_func_array(['parent', 'bindParam'], $args);
+    }
+
+    /**
+     * Binds a value to a parameter
+     *
+     * @link   http://php.net/manual/en/pdostatement.bindvalue.php
+     * @param  mixed $parameter Parameter identifier. For a prepared statement using named
+     * placeholders, this will be a parameter name of the form :name. For a prepared statement using
+     * question mark placeholders, this will be the 1-indexed position of the parameter.
+     * @param  mixed $value The value to bind to the parameter.
+     * @param  int   $data_type [optional] Explicit data type for the parameter using the PDO::PARAM_*
+     * constants.
+     * @return bool TRUE on success or FALSE on failure.
+     */
+    public function bindValue($parameter, $value, $data_type = PDO::PARAM_STR)
+    {
+        $this->boundParameters[$parameter] = $value;
+        return call_user_func_array(['parent', 'bindValue'], func_get_args());
+    }
+
+    /**
+     * Executes a prepared statement
+     *
+     * @link   http://php.net/manual/en/pdostatement.execute.php
+     * @param  array $input_parameters [optional] An array of values with as many elements as there
+     * are bound parameters in the SQL statement being executed. All values are treated as
+     * PDO::PARAM_STR.
+     * @throws PDOException
+     * @return bool TRUE on success or FALSE on failure.
+     */
+    public function execute($input_parameters = null)
+    {
+        $preparedId = spl_object_hash($this);
+        $boundParameters = $this->boundParameters;
+        if (is_array($input_parameters)) {
+            $boundParameters = array_merge($boundParameters, $input_parameters);
+        }
+
+        $trace = new TracedStatement($this->queryString, $boundParameters, $preparedId);
+        $trace->start();
+
+        $ex = null;
+        try {
+            $result = parent::execute($input_parameters);
+        } catch (PDOException $e) {
+            $ex = $e;
+        }
+
+        if ($this->pdo->getAttribute(PDO::ATTR_ERRMODE) !== PDO::ERRMODE_EXCEPTION && $result === false) {
+            $error = $this->errorInfo();
+            $ex = new PDOException($error[2], (int) $error[0]);
+        }
+
+        $trace->end($ex, $this->rowCount());
+        $this->pdo->addExecutedStatement($trace);
+
+        if ($this->pdo->getAttribute(PDO::ATTR_ERRMODE) === PDO::ERRMODE_EXCEPTION && $ex !== null) {
+            throw $ex;
+        }
+        return $result;
+    }
+}
diff --git a/htdocs/includes/DebugBar/DataCollector/PDO/TracedStatement.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TracedStatement.php
similarity index 72%
rename from htdocs/includes/DebugBar/DataCollector/PDO/TracedStatement.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TracedStatement.php
index dc51cee1764..c4eef46aaeb 100644
--- a/htdocs/includes/DebugBar/DataCollector/PDO/TracedStatement.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TracedStatement.php
@@ -31,30 +31,35 @@ class TracedStatement
      * @param string $sql
      * @param array $params
      * @param string $preparedId
-     * @param integer $rowCount
-     * @param integer $startTime
-     * @param integer $endTime
-     * @param integer $memoryUsage
-     * @param \Exception $e
      */
-    public function __construct($sql, array $params = array(), $preparedId = null)
+    public function __construct($sql, array $params = [], $preparedId = null)
     {
         $this->sql = $sql;
         $this->parameters = $this->checkParameters($params);
         $this->preparedId = $preparedId;
     }
 
+    /**
+     * @param null $startTime
+     * @param null $startMemory
+     */
     public function start($startTime = null, $startMemory = null)
     {
         $this->startTime = $startTime ?: microtime(true);
-        $this->startMemory = $startMemory ?: memory_get_usage(true);
+        $this->startMemory = $startMemory ?: memory_get_usage(false);
     }
 
+    /**
+     * @param \Exception|null $exception
+     * @param int $rowCount
+     * @param float $endTime
+     * @param int $endMemory
+     */
     public function end(\Exception $exception = null, $rowCount = 0, $endTime = null, $endMemory = null)
     {
         $this->endTime = $endTime ?: microtime(true);
         $this->duration = $this->endTime - $this->startTime;
-        $this->endMemory = $endMemory ?: memory_get_usage(true);
+        $this->endMemory = $endMemory ?: memory_get_usage(false);
         $this->memoryDelta = $this->endMemory - $this->startMemory;
         $this->exception = $exception;
         $this->rowCount = $rowCount;
@@ -63,8 +68,8 @@ class TracedStatement
     /**
      * Check parameters for illegal (non UTF-8) strings, like Binary data.
      *
-     * @param $params
-     * @return mixed
+     * @param array $params
+     * @return array
      */
     public function checkParameters($params)
     {
@@ -77,7 +82,7 @@ class TracedStatement
     }
 
     /**
-     * Returns the SQL string used for the query
+     * Returns the SQL string used for the query, without filled parameters
      *
      * @return string
      */
@@ -102,15 +107,29 @@ class TracedStatement
         }
 
         $sql = $this->sql;
+
+        $cleanBackRefCharMap = ['%' => '%%', '$' => '$%', '\\' => '\\%'];
+
         foreach ($this->parameters as $k => $v) {
-            $v = "$quoteLeft$v$quoteRight";
-            if (!is_numeric($k)) {
-                $sql = str_replace($k, $v, $sql);
+
+            $backRefSafeV = strtr($v, $cleanBackRefCharMap);
+
+            $v = "$quoteLeft$backRefSafeV$quoteRight";
+
+            if (is_numeric($k)) {
+                $marker = "\?";
             } else {
-                $p = strpos($sql, '?');
-                $sql = substr($sql, 0, $p) . $v. substr($sql, $p + 1);
+                $marker = (preg_match("/^:/", $k)) ? $k : ":" . $k;
+            }
+
+            $matchRule = "/({$marker}(?!\w))(?=(?:[^$quotationChar]|[$quotationChar][^$quotationChar]*[$quotationChar])*$)/";
+            for ($i = 0; $i <= mb_substr_count($sql, $k); $i++) {
+                $sql = preg_replace($matchRule, $v, $sql, 1);
             }
         }
+
+        $sql = strtr($sql, array_flip($cleanBackRefCharMap));
+
         return $sql;
     }
 
@@ -131,9 +150,9 @@ class TracedStatement
      */
     public function getParameters()
     {
-        $params = array();
-        foreach ($this->parameters as $param) {
-            $params[] = htmlentities($param, ENT_QUOTES, 'UTF-8', false);
+        $params = [];
+        foreach ($this->parameters as $name => $param) {
+            $params[$name] = htmlentities($param, ENT_QUOTES, 'UTF-8', false);
         }
         return $params;
     }
@@ -158,31 +177,43 @@ class TracedStatement
         return $this->preparedId !== null;
     }
 
+    /**
+     * @return float
+     */
     public function getStartTime()
     {
         return $this->startTime;
     }
 
+    /**
+     * @return float
+     */
     public function getEndTime()
     {
         return $this->endTime;
     }
 
     /**
-     * Returns the duration in seconds of the execution
+     * Returns the duration in seconds + microseconds of the execution
      *
-     * @return int
+     * @return float
      */
     public function getDuration()
     {
         return $this->duration;
     }
 
+    /**
+     * @return int
+     */
     public function getStartMemory()
     {
         return $this->startMemory;
     }
 
+    /**
+     * @return int
+     */
     public function getEndMemory()
     {
         return $this->endMemory;
@@ -221,7 +252,7 @@ class TracedStatement
     /**
      * Returns the exception's code
      *
-     * @return string
+     * @return int|string
      */
     public function getErrorCode()
     {
diff --git a/htdocs/includes/DebugBar/DataCollector/PhpInfoCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PhpInfoCollector.php
similarity index 100%
rename from htdocs/includes/DebugBar/DataCollector/PhpInfoCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/PhpInfoCollector.php
diff --git a/htdocs/includes/DebugBar/DataCollector/Renderable.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/Renderable.php
similarity index 100%
rename from htdocs/includes/DebugBar/DataCollector/Renderable.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/Renderable.php
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/RequestDataCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/RequestDataCollector.php
new file mode 100644
index 00000000000..6bd781eee19
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/RequestDataCollector.php
@@ -0,0 +1,100 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2013 Maxime Bouroumeau-Fuseau
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar\DataCollector;
+
+/**
+ * Collects info about the current request
+ */
+class RequestDataCollector extends DataCollector implements Renderable, AssetProvider
+{
+    // The HTML var dumper requires debug bar users to support the new inline assets, which not all
+    // may support yet - so return false by default for now.
+    protected $useHtmlVarDumper = false;
+
+    /**
+     * Sets a flag indicating whether the Symfony HtmlDumper will be used to dump variables for
+     * rich variable rendering.
+     *
+     * @param bool $value
+     * @return $this
+     */
+    public function useHtmlVarDumper($value = true)
+    {
+        $this->useHtmlVarDumper = $value;
+        return $this;
+    }
+
+    /**
+     * Indicates whether the Symfony HtmlDumper will be used to dump variables for rich variable
+     * rendering.
+     *
+     * @return mixed
+     */
+    public function isHtmlVarDumperUsed()
+    {
+        return $this->useHtmlVarDumper;
+    }
+
+    /**
+     * @return array
+     */
+    public function collect()
+    {
+        $vars = array('_GET', '_POST', '_SESSION', '_COOKIE', '_SERVER');
+        $data = array();
+
+        foreach ($vars as $var) {
+            if (isset($GLOBALS[$var])) {
+                $key = "$" . $var;
+                if ($this->isHtmlVarDumperUsed()) {
+                    $data[$key] = $this->getVarDumper()->renderVar($GLOBALS[$var]);
+                } else {
+                    $data[$key] = $this->getDataFormatter()->formatVar($GLOBALS[$var]);
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return 'request';
+    }
+
+    /**
+     * @return array
+     */
+    public function getAssets() {
+        return $this->isHtmlVarDumperUsed() ? $this->getVarDumper()->getAssets() : array();
+    }
+
+    /**
+     * @return array
+     */
+    public function getWidgets()
+    {
+        $widget = $this->isHtmlVarDumperUsed()
+            ? "PhpDebugBar.Widgets.HtmlVariableListWidget"
+            : "PhpDebugBar.Widgets.VariableListWidget";
+        return array(
+            "request" => array(
+                "icon" => "tags",
+                "widget" => $widget,
+                "map" => "request",
+                "default" => "{}"
+            )
+        );
+    }
+}
diff --git a/htdocs/includes/DebugBar/DataCollector/TimeDataCollector.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/TimeDataCollector.php
similarity index 93%
rename from htdocs/includes/DebugBar/DataCollector/TimeDataCollector.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/TimeDataCollector.php
index 19e5a63ced1..27a2e1a2df2 100644
--- a/htdocs/includes/DebugBar/DataCollector/TimeDataCollector.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataCollector/TimeDataCollector.php
@@ -50,7 +50,7 @@ class TimeDataCollector extends DataCollector implements Renderable
                 $requestStartTime = microtime(true);
             }
         }
-        $this->requestStartTime = $requestStartTime;
+        $this->requestStartTime = (float)$requestStartTime;
     }
 
     /**
@@ -187,6 +187,10 @@ class TimeDataCollector extends DataCollector implements Renderable
         return microtime(true) - $this->requestStartTime;
     }
 
+    /**
+     * @return array
+     * @throws DebugBarException
+     */
     public function collect()
     {
         $this->requestEndTime = microtime(true);
@@ -194,6 +198,13 @@ class TimeDataCollector extends DataCollector implements Renderable
             $this->stopMeasure($name);
         }
 
+        usort($this->measures, function($a, $b) {
+            if ($a['start'] == $b['start']) {
+                return 0;
+            }
+            return $a['start'] < $b['start'] ? -1 : 1;
+        });
+
         return array(
             'start' => $this->requestStartTime,
             'end' => $this->requestEndTime,
@@ -203,11 +214,17 @@ class TimeDataCollector extends DataCollector implements Renderable
         );
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return 'time';
     }
 
+    /**
+     * @return array
+     */
     public function getWidgets()
     {
         return array(
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatter.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatter.php
new file mode 100644
index 00000000000..7ffb19892c8
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatter.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2013 Maxime Bouroumeau-Fuseau
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar\DataFormatter;
+
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+
+class DataFormatter implements DataFormatterInterface
+{
+    /**
+     * DataFormatter constructor.
+     */
+    public function __construct()
+    {
+        $this->cloner = new VarCloner();
+        $this->dumper = new CliDumper();
+    }
+
+    /**
+     * @param $data
+     * @return string
+     */
+    public function formatVar($data)
+    {
+        $output = '';
+
+        $this->dumper->dump(
+            $this->cloner->cloneVar($data),
+            function ($line, $depth) use (&$output) {
+                // A negative depth means "end of dump"
+                if ($depth >= 0) {
+                    // Adds a two spaces indentation to the line
+                    $output .= str_repeat('  ', $depth).$line."\n";
+                }
+            }
+        );
+
+        return trim($output);
+    }
+
+    /**
+     * @param float $seconds
+     * @return string
+     */
+    public function formatDuration($seconds)
+    {
+        if ($seconds < 0.001) {
+            return round($seconds * 1000000) . 'μs';
+        } elseif ($seconds < 1) {
+            return round($seconds * 1000, 2) . 'ms';
+        }
+        return round($seconds, 2) . 's';
+    }
+
+    /**
+     * @param string $size
+     * @param int $precision
+     * @return string
+     */
+    public function formatBytes($size, $precision = 2)
+    {
+        if ($size === 0 || $size === null) {
+            return "0B";
+        }
+
+        $sign = $size < 0 ? '-' : '';
+        $size = abs($size);
+
+        $base = log($size) / log(1024);
+        $suffixes = array('B', 'KB', 'MB', 'GB', 'TB');
+        return $sign . round(pow(1024, $base - floor($base)), $precision) . $suffixes[floor($base)];
+    }
+}
diff --git a/htdocs/includes/DebugBar/DataFormatter/DataFormatterInterface.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatterInterface.php
similarity index 100%
rename from htdocs/includes/DebugBar/DataFormatter/DataFormatterInterface.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatterInterface.php
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/DebugBarVarDumper.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/DebugBarVarDumper.php
new file mode 100644
index 00000000000..7b92ddf0a34
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/DebugBarVarDumper.php
@@ -0,0 +1,315 @@
+<?php
+
+namespace DebugBar\DataFormatter;
+
+use DebugBar\DataCollector\AssetProvider;
+use DebugBar\DataFormatter\VarDumper\DebugBarHtmlDumper;
+use DebugBar\DataFormatter\VarDumper\SeekingData;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+
+/**
+ * Clones and renders variables in HTML format using the Symfony VarDumper component.
+ *
+ * Cloning is decoupled from rendering, so that dumper users can have the fastest possible cloning
+ * performance, while delaying rendering until it is actually needed.
+ */
+class DebugBarVarDumper implements AssetProvider
+{
+    protected static $defaultClonerOptions = array();
+
+    protected static $defaultDumperOptions = array(
+        'expanded_depth' => 0,
+        'styles' => array(
+            // NOTE:  'default' CSS is also specified in debugbar.css
+            'default' => 'word-wrap: break-word; white-space: pre-wrap; word-break: normal',
+            'num' => 'font-weight:bold; color:#1299DA',
+            'const' => 'font-weight:bold',
+            'str' => 'font-weight:bold; color:#3A9B26',
+            'note' => 'color:#1299DA',
+            'ref' => 'color:#7B7B7B',
+            'public' => 'color:#000000',
+            'protected' => 'color:#000000',
+            'private' => 'color:#000000',
+            'meta' => 'color:#B729D9',
+            'key' => 'color:#3A9B26',
+            'index' => 'color:#1299DA',
+            'ellipsis' => 'color:#A0A000',
+        ),
+    );
+
+    protected $clonerOptions;
+
+    protected $dumperOptions;
+
+    /** @var VarCloner */
+    protected $cloner;
+
+    /** @var DebugBarHtmlDumper */
+    protected $dumper;
+
+    /**
+     * Gets the VarCloner instance with configuration options set.
+     *
+     * @return VarCloner
+     */
+    protected function getCloner()
+    {
+        if (!$this->cloner) {
+            $clonerOptions = $this->getClonerOptions();
+            if (isset($clonerOptions['casters'])) {
+                $this->cloner = new VarCloner($clonerOptions['casters']);
+            } else {
+                $this->cloner = new VarCloner();
+            }
+            if (isset($clonerOptions['additional_casters'])) {
+                $this->cloner->addCasters($clonerOptions['additional_casters']);
+            }
+            if (isset($clonerOptions['max_items'])) {
+                $this->cloner->setMaxItems($clonerOptions['max_items']);
+            }
+            if (isset($clonerOptions['max_string'])) {
+                $this->cloner->setMaxString($clonerOptions['max_string']);
+            }
+            // setMinDepth was added to Symfony 3.4:
+            if (isset($clonerOptions['min_depth']) && method_exists($this->cloner, 'setMinDepth')) {
+                $this->cloner->setMinDepth($clonerOptions['min_depth']);
+            }
+        }
+        return $this->cloner;
+    }
+
+    /**
+     * Gets the DebugBarHtmlDumper instance with configuration options set.
+     *
+     * @return DebugBarHtmlDumper
+     */
+    protected function getDumper()
+    {
+        if (!$this->dumper) {
+            $this->dumper = new DebugBarHtmlDumper();
+            $dumperOptions = $this->getDumperOptions();
+            if (isset($dumperOptions['styles'])) {
+                $this->dumper->setStyles($dumperOptions['styles']);
+            }
+        }
+        return $this->dumper;
+    }
+
+    /**
+     * Gets the array of non-default VarCloner configuration options.
+     *
+     * @return array
+     */
+    public function getClonerOptions()
+    {
+        if ($this->clonerOptions === null) {
+            $this->clonerOptions = self::$defaultClonerOptions;
+        }
+        return $this->clonerOptions;
+    }
+
+    /**
+     * Merges an array of non-default VarCloner configuration options with the existing non-default
+     * options.
+     *
+     * Configuration options are:
+     *  - casters: a map of VarDumper Caster objects to use instead of the default casters.
+     *  - additional_casters: a map of VarDumper Caster objects to use in addition to the default
+     *    casters.
+     *  - max_items: maximum number of items to clone beyond the minimum depth.
+     *  - max_string: maximum string size
+     *  - min_depth: minimum tree depth to clone before counting items against the max_items limit.
+     *    (Requires Symfony 3.4; ignored on older versions.)
+     *
+     * @param array $options
+     */
+    public function mergeClonerOptions($options)
+    {
+        $this->clonerOptions = $options + $this->getClonerOptions();
+        $this->cloner = null;
+    }
+
+    /**
+     * Resets the array of non-default VarCloner configuration options without retaining any of the
+     * existing non-default options.
+     *
+     * Configuration options are:
+     *  - casters: a map of VarDumper Caster objects to use instead of the default casters.
+     *  - additional_casters: a map of VarDumper Caster objects to use in addition to the default
+     *    casters.
+     *  - max_items: maximum number of items to clone beyond the minimum depth.
+     *  - max_string: maximum string size
+     *  - min_depth: minimum tree depth to clone before counting items against the max_items limit.
+     *    (Requires Symfony 3.4; ignored on older versions.)
+     *
+     * @param array $options
+     */
+    public function resetClonerOptions($options = null)
+    {
+        $this->clonerOptions = ($options ?: array()) + self::$defaultClonerOptions;
+        $this->cloner = null;
+    }
+
+    /**
+     * Gets the array of non-default HtmlDumper configuration options.
+     *
+     * @return array
+     */
+    public function getDumperOptions()
+    {
+        if ($this->dumperOptions === null) {
+            $this->dumperOptions = self::$defaultDumperOptions;
+        }
+        return $this->dumperOptions;
+    }
+
+    /**
+     * Merges an array of non-default HtmlDumper configuration options with the existing non-default
+     * options.
+     *
+     * Configuration options are:
+     *  - styles: a map of CSS styles to include in the assets, as documented in
+     *    HtmlDumper::setStyles.
+     *  - expanded_depth: the tree depth to initially expand.
+     *    (Requires Symfony 3.2; ignored on older versions.)
+     *  - max_string: maximum string size.
+     *    (Requires Symfony 3.2; ignored on older versions.)
+     *  - file_link_format: link format for files; %f expanded to file and %l expanded to line
+     *    (Requires Symfony 3.2; ignored on older versions.)
+     *
+     * @param array $options
+     */
+    public function mergeDumperOptions($options)
+    {
+        $this->dumperOptions = $options + $this->getDumperOptions();
+        $this->dumper = null;
+    }
+
+    /**
+     * Resets the array of non-default HtmlDumper configuration options without retaining any of the
+     * existing non-default options.
+     *
+     * Configuration options are:
+     *  - styles: a map of CSS styles to include in the assets, as documented in
+     *    HtmlDumper::setStyles.
+     *  - expanded_depth: the tree depth to initially expand.
+     *    (Requires Symfony 3.2; ignored on older versions.)
+     *  - max_string: maximum string size.
+     *    (Requires Symfony 3.2; ignored on older versions.)
+     *  - file_link_format: link format for files; %f expanded to file and %l expanded to line
+     *    (Requires Symfony 3.2; ignored on older versions.)
+     *
+     * @param array $options
+     */
+    public function resetDumperOptions($options = null)
+    {
+        $this->dumperOptions = ($options ?: array()) + self::$defaultDumperOptions;
+        $this->dumper = null;
+    }
+
+    /**
+     * Captures the data from a variable and serializes it for later rendering.
+     *
+     * @param mixed $data The variable to capture.
+     * @return string Serialized variable data.
+     */
+    public function captureVar($data)
+    {
+        return serialize($this->getCloner()->cloneVar($data));
+    }
+
+    /**
+     * Gets the display options for the HTML dumper.
+     *
+     * @return array
+     */
+    protected function getDisplayOptions()
+    {
+        $displayOptions = array();
+        $dumperOptions = $this->getDumperOptions();
+        // Only used by Symfony 3.2 and newer:
+        if (isset($dumperOptions['expanded_depth'])) {
+            $displayOptions['maxDepth'] = $dumperOptions['expanded_depth'];
+        }
+        // Only used by Symfony 3.2 and newer:
+        if (isset($dumperOptions['max_string'])) {
+            $displayOptions['maxStringLength'] = $dumperOptions['max_string'];
+        }
+        // Only used by Symfony 3.2 and newer:
+        if (isset($dumperOptions['file_link_format'])) {
+            $displayOptions['fileLinkFormat'] = $dumperOptions['file_link_format'];
+        }
+        return $displayOptions;
+    }
+
+    /**
+     * Renders previously-captured data from captureVar to HTML and returns it as a string.
+     *
+     * @param string $capturedData Captured data from captureVar.
+     * @param array $seekPath Pass an array of keys to traverse if you only want to render a subset
+     *                        of the data.
+     * @return string HTML rendering of the variable.
+     */
+    public function renderCapturedVar($capturedData, $seekPath = array())
+    {
+        $data = unserialize($capturedData);
+        // The seek method was added in Symfony 3.2; emulate the behavior via SeekingData for older
+        // Symfony versions.
+        if (!method_exists($data, 'seek')) {
+            $data = new SeekingData($data->getRawData());
+        }
+
+        foreach ($seekPath as $key) {
+            $data = $data->seek($key);
+        }
+
+        return $this->dump($data);
+    }
+
+    /**
+     * Captures and renders the data from a variable to HTML and returns it as a string.
+     *
+     * @param mixed $data The variable to capture and render.
+     * @return string HTML rendering of the variable.
+     */
+    public function renderVar($data)
+    {
+        return $this->dump($this->getCloner()->cloneVar($data));
+    }
+
+    /**
+     * Returns assets required for rendering variables.
+     *
+     * @return array
+     */
+    public function getAssets() {
+        $dumper = $this->getDumper();
+        $dumper->setDumpHeader(null); // this will cause the default dump header to regenerate
+        return array(
+            'inline_head' => array(
+                'html_var_dumper' => $dumper->getDumpHeaderByDebugBar(),
+            ),
+        );
+    }
+
+    /**
+     * Helper function to dump a Data object to HTML.
+     *
+     * @param Data $data
+     * @return string
+     */
+    protected function dump(Data $data)
+    {
+        $dumper = $this->getDumper();
+        $output = fopen('php://memory', 'r+b');
+        $dumper->setOutput($output);
+        $dumper->setDumpHeader(''); // we don't actually want a dump header
+        // NOTE:  Symfony 3.2 added the third $extraDisplayOptions parameter.  Older versions will
+        // safely ignore it.
+        $dumper->dump($data, null, $this->getDisplayOptions());
+        $result = stream_get_contents($output, -1, 0);
+        fclose($output);
+        return $result;
+    }
+}
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/DebugBarHtmlDumper.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/DebugBarHtmlDumper.php
new file mode 100644
index 00000000000..0ff4919c18b
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/DebugBarHtmlDumper.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace DebugBar\DataFormatter\VarDumper;
+
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+
+/**
+ * We have to extend the base HtmlDumper class in order to get access to the protected-only
+ * getDumpHeader function.
+ */
+class DebugBarHtmlDumper extends HtmlDumper
+{
+    public function getDumpHeaderByDebugBar() {
+        // getDumpHeader is protected:
+        return str_replace('pre.sf-dump', '.phpdebugbar pre.sf-dump', $this->getDumpHeader());
+    }
+}
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/SeekingData.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/SeekingData.php
new file mode 100644
index 00000000000..be71ebfc9ce
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/SeekingData.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace DebugBar\DataFormatter\VarDumper;
+
+use Symfony\Component\VarDumper\Cloner\Cursor;
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Cloner\DumperInterface;
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * This class backports the seek() function from Symfony 3.2 to older versions - up to v2.6.  The
+ * class should not be used with newer Symfony versions that provide the seek function, as it relies
+ * on a lot of undocumented functionality.
+ */
+class SeekingData extends Data
+{
+    // Because the class copies/pastes the seek() implementation from Symfony 3.2, we reproduce its
+    // copyright here; this class is subject to the following additional copyright:
+
+    /*
+     * Copyright (c) 2014-2017 Fabien Potencier
+     *
+     * Permission is hereby granted, free of charge, to any person obtaining a copy
+     * of this software and associated documentation files (the "Software"), to deal
+     * in the Software without restriction, including without limitation the rights
+     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+     * copies of the Software, and to permit persons to whom the Software is furnished
+     * to do so, subject to the following conditions:
+     *
+     * The above copyright notice and this permission notice shall be included in all
+     * copies or substantial portions of the Software.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+     * THE SOFTWARE.
+     */
+    private $position = 0;
+    private $key = 0;
+
+    /**
+     * Seeks to a specific key in nested data structures.
+     *
+     * @param string|int $key The key to seek to
+     *
+     * @return self|null A clone of $this of null if the key is not set
+     */
+    public function seek($key)
+    {
+        $thisData = $this->getRawData();
+        $item = $thisData[$this->position][$this->key];
+
+        if (!$item instanceof Stub || !$item->position) {
+            return;
+        }
+        $keys = array($key);
+
+        switch ($item->type) {
+            case Stub::TYPE_OBJECT:
+                $keys[] = "\0+\0".$key;
+                $keys[] = "\0*\0".$key;
+                $keys[] = "\0~\0".$key;
+                $keys[] = "\0$item->class\0$key";
+            case Stub::TYPE_ARRAY:
+            case Stub::TYPE_RESOURCE:
+                break;
+            default:
+                return;
+        }
+
+        $data = null;
+        $children = $thisData[$item->position];
+
+        foreach ($keys as $key) {
+            if (isset($children[$key]) || array_key_exists($key, $children)) {
+                $data = clone $this;
+                $data->key = $key;
+                $data->position = $item->position;
+                break;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dump(DumperInterface $dumper)
+    {
+        // Override the base class dump to use the position and key
+        $refs = array(0);
+        $class = new \ReflectionClass($this);
+        $dumpItem = $class->getMethod('dumpItem');
+        $dumpItem->setAccessible(true);
+        $data = $this->getRawData();
+        $args = array($dumper, new Cursor(), &$refs, $data[$this->position][$this->key]);
+        $dumpItem->invokeArgs($this, $args);
+    }
+}
diff --git a/htdocs/includes/DebugBar/DebugBar.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DebugBar.php
similarity index 92%
rename from htdocs/includes/DebugBar/DebugBar.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DebugBar.php
index 6b114375ffa..af900a801e8 100644
--- a/htdocs/includes/DebugBar/DebugBar.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/DebugBar.php
@@ -84,6 +84,7 @@ class DebugBar implements ArrayAccess
      *
      * @param string $name
      * @return DataCollectorInterface
+     * @throws DebugBarException
      */
     public function getCollector($name)
     {
@@ -107,6 +108,7 @@ class DebugBar implements ArrayAccess
      * Sets the request id generator
      *
      * @param RequestIdGeneratorInterface $generator
+     * @return $this
      */
     public function setRequestIdGenerator(RequestIdGeneratorInterface $generator)
     {
@@ -142,6 +144,7 @@ class DebugBar implements ArrayAccess
      * Sets the storage backend to use to store the collected data
      *
      * @param StorageInterface $storage
+     * @return $this
      */
     public function setStorage(StorageInterface $storage = null)
     {
@@ -171,6 +174,7 @@ class DebugBar implements ArrayAccess
      * Sets the HTTP driver
      *
      * @param HttpDriverInterface $driver
+     * @return $this
      */
     public function setHttpDriver(HttpDriverInterface $driver)
     {
@@ -200,14 +204,33 @@ class DebugBar implements ArrayAccess
      */
     public function collect()
     {
-        $this->data = array(
-            '__meta' => array(
-                'id' => $this->getCurrentRequestId(),
-                'datetime' => date('Y-m-d H:i:s'),
-                'utime' => microtime(true),
+        if (php_sapi_name() === 'cli') {
+            $ip = gethostname();
+            if ($ip) {
+                $ip = gethostbyname($ip);
+            } else {
+                $ip = '127.0.0.1';
+            }
+            $request_variables = array(
+                'method' => 'CLI',
+                'uri' => isset($_SERVER['SCRIPT_FILENAME']) ? realpath($_SERVER['SCRIPT_FILENAME']) : null,
+                'ip' => $ip
+            );
+        } else {
+            $request_variables = array(
                 'method' => isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : null,
                 'uri' => isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null,
                 'ip' => isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null
+            );
+        }
+        $this->data = array(
+            '__meta' => array_merge(
+                array(
+                    'id' => $this->getCurrentRequestId(),
+                    'datetime' => date('Y-m-d H:i:s'),
+                    'utime' => microtime(true)
+                ),
+                $request_variables
             )
         );
 
@@ -287,6 +310,7 @@ class DebugBar implements ArrayAccess
      * @param bool $useOpenHandler
      * @param string $headerName
      * @param integer $maxHeaderLength
+     * @return $this
      */
     public function sendDataInHeaders($useOpenHandler = null, $headerName = 'phpdebugbar', $maxHeaderLength = 4096)
     {
@@ -369,6 +393,7 @@ class DebugBar implements ArrayAccess
      * Sets the key to use in the $_SESSION array
      *
      * @param string $ns
+     * @return $this
      */
     public function setStackDataSessionNamespace($ns)
     {
@@ -391,6 +416,7 @@ class DebugBar implements ArrayAccess
      * if a storage is enabled
      *
      * @param boolean $enabled
+     * @return $this
      */
     public function setStackAlwaysUseSessionStorage($enabled = true)
     {
@@ -411,8 +437,8 @@ class DebugBar implements ArrayAccess
 
     /**
      * Initializes the session for stacked data
-     *
      * @return HttpDriverInterface
+     * @throws DebugBarException
      */
     protected function initStackSession()
     {
@@ -430,9 +456,8 @@ class DebugBar implements ArrayAccess
 
     /**
      * Returns a JavascriptRenderer for this instance
-     *
      * @param string $baseUrl
-     * @param string $basePathng
+     * @param string $basePath
      * @return JavascriptRenderer
      */
     public function getJavascriptRenderer($baseUrl = null, $basePath = null)
diff --git a/htdocs/includes/DebugBar/DebugBarException.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/DebugBarException.php
similarity index 100%
rename from htdocs/includes/DebugBar/DebugBarException.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/DebugBarException.php
diff --git a/htdocs/includes/DebugBar/HttpDriverInterface.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/HttpDriverInterface.php
similarity index 96%
rename from htdocs/includes/DebugBar/HttpDriverInterface.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/HttpDriverInterface.php
index f91b1398514..1a7a3cf46d1 100644
--- a/htdocs/includes/DebugBar/HttpDriverInterface.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/HttpDriverInterface.php
@@ -19,7 +19,8 @@ interface HttpDriverInterface
     /**
      * Sets HTTP headers
      *
-     * @param string $headers
+     * @param array $headers
+     * @return
      */
     function setHeaders(array $headers);
 
diff --git a/htdocs/includes/DebugBar/JavascriptRenderer.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/JavascriptRenderer.php
similarity index 72%
rename from htdocs/includes/DebugBar/JavascriptRenderer.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/JavascriptRenderer.php
index d4ac750e992..16689992c4c 100644
--- a/htdocs/includes/DebugBar/JavascriptRenderer.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/JavascriptRenderer.php
@@ -60,6 +60,8 @@ class JavascriptRenderer
 
     protected $enableJqueryNoConflict = true;
 
+    protected $useRequireJs = false;
+
     protected $initialization;
 
     protected $controls = array();
@@ -68,10 +70,14 @@ class JavascriptRenderer
 
     protected $ajaxHandlerClass = 'PhpDebugBar.AjaxHandler';
 
+    protected $ajaxHandlerBindToFetch = false;
+
     protected $ajaxHandlerBindToJquery = true;
 
     protected $ajaxHandlerBindToXHR = false;
 
+    protected $ajaxHandlerAutoShow = true;
+
     protected $openHandlerClass = 'PhpDebugBar.OpenHandler';
 
     protected $openHandlerUrl;
@@ -115,6 +121,7 @@ class JavascriptRenderer
      *  - ignore_collectors
      *  - ajax_handler_classname
      *  - ajax_handler_bind_to_jquery
+     *  - ajax_handler_auto_show
      *  - open_handler_classname
      *  - open_handler_url
      *
@@ -143,6 +150,9 @@ class JavascriptRenderer
         if (array_key_exists('enable_jquery_noconflict', $options)) {
             $this->setEnableJqueryNoConflict($options['enable_jquery_noconflict']);
         }
+        if (array_key_exists('use_requirejs', $options)) {
+            $this->setUseRequireJs($options['use_requirejs']);
+        }
         if (array_key_exists('controls', $options)) {
             foreach ($options['controls'] as $name => $control) {
                 $this->addControl($name, $control);
@@ -164,6 +174,9 @@ class JavascriptRenderer
         if (array_key_exists('ajax_handler_bind_to_jquery', $options)) {
             $this->setBindAjaxHandlerToJquery($options['ajax_handler_bind_to_jquery']);
         }
+        if (array_key_exists('ajax_handler_auto_show', $options)) {
+            $this->setAjaxHandlerAutoShow($options['ajax_handler_auto_show']);
+        }
         if (array_key_exists('open_handler_classname', $options)) {
             $this->setOpenHandlerClass($options['open_handler_classname']);
         }
@@ -352,6 +365,28 @@ class JavascriptRenderer
         return $this->enableJqueryNoConflict;
     }
 
+    /**
+     * Sets whether to use RequireJS or not
+     *
+     * @param boolean $enabled
+     * @return $this
+     */
+    public function setUseRequireJs($enabled = true)
+    {
+        $this->useRequireJs = $enabled;
+        return $this;
+    }
+
+    /**
+     * Checks if RequireJS is used
+     *
+     * @return boolean
+     */
+    public function isRequireJsUsed()
+    {
+        return $this->useRequireJs;
+    }
+
     /**
      * Adds a control to initialize
      *
@@ -444,6 +479,27 @@ class JavascriptRenderer
         return $this->ajaxHandlerClass;
     }
 
+    /**
+     * Sets whether to call bindToFetch() on the ajax handler
+     *
+     * @param boolean $bind
+     */
+    public function setBindAjaxHandlerToFetch($bind = true)
+    {
+        $this->ajaxHandlerBindToFetch = $bind;
+        return $this;
+    }
+
+    /**
+     * Checks whether bindToFetch() will be called on the ajax handler
+     *
+     * @return boolean
+     */
+    public function isAjaxHandlerBoundToFetch()
+    {
+        return $this->ajaxHandlerBindToFetch;
+    }
+
     /**
      * Sets whether to call bindToJquery() on the ajax handler
      *
@@ -486,6 +542,28 @@ class JavascriptRenderer
         return $this->ajaxHandlerBindToXHR;
     }
 
+    /**
+     * Sets whether new ajax debug data will be immediately shown.  Setting to false could be useful
+     * if there are a lot of tracking events cluttering things.
+     *
+     * @param boolean $autoShow
+     */
+    public function setAjaxHandlerAutoShow($autoShow = true)
+    {
+        $this->ajaxHandlerAutoShow = $autoShow;
+        return $this;
+    }
+
+    /**
+     * Checks whether the ajax handler will immediately show new ajax requests.
+     *
+     * @return boolean
+     */
+    public function isAjaxHandlerAutoShow()
+    {
+        return $this->ajaxHandlerAutoShow;
+    }
+
     /**
      * Sets the class name of the js open handler
      *
@@ -529,12 +607,13 @@ class JavascriptRenderer
     }
 
     /**
-     * Add assets to render in the head
+     * Add assets stored in files to render in the head
      *
      * @param array $cssFiles An array of filenames
      * @param array $jsFiles  An array of filenames
      * @param string $basePath Base path of those files
      * @param string $baseUrl  Base url of those files
+     * @return $this
      */
     public function addAssets($cssFiles, $jsFiles, $basePath = null, $baseUrl = null)
     {
@@ -547,10 +626,37 @@ class JavascriptRenderer
         return $this;
     }
 
+    /**
+     * Add inline assets to render inline in the head.  Ideally, you should store static assets in
+     * files that you add with the addAssets function.  However, adding inline assets is useful when
+     * integrating with 3rd-party libraries that require static assets that are only available in an
+     * inline format.
+     *
+     * The inline content arrays require special string array keys:  they are used to deduplicate
+     * content.  This is particularly useful if multiple instances of the same asset end up being
+     * added.  Inline assets from all collectors are merged together into the same array, so these
+     * content IDs effectively deduplicate the inline assets.
+     *
+     * @param array $inlineCss  An array map of content ID to inline CSS content (not including <style> tag)
+     * @param array $inlineJs   An array map of content ID to inline JS content (not including <script> tag)
+     * @param array $inlineHead An array map of content ID to arbitrary inline HTML content (typically
+     *                          <style>/<script> tags); it must be embedded within the <head> element
+     * @return $this
+     */
+    public function addInlineAssets($inlineCss, $inlineJs, $inlineHead)
+    {
+        $this->additionalAssets[] = array(
+            'inline_css' => (array) $inlineCss,
+            'inline_js' => (array) $inlineJs,
+            'inline_head' => (array) $inlineHead
+        );
+        return $this;
+    }
+
     /**
      * Returns the list of asset files
      *
-     * @param string $type Only return css or js files
+     * @param string $type 'css', 'js', 'inline_css', 'inline_js', 'inline_head', or null for all
      * @param string $relativeTo The type of path to which filenames must be relative (path, url or null)
      * @return array
      */
@@ -558,6 +664,9 @@ class JavascriptRenderer
     {
         $cssFiles = $this->cssFiles;
         $jsFiles = $this->jsFiles;
+        $inlineCss = array();
+        $inlineJs = array();
+        $inlineHead = array();
 
         if ($this->includeVendors !== false) {
             if ($this->includeVendors === true || in_array('css', $this->includeVendors)) {
@@ -588,11 +697,29 @@ class JavascriptRenderer
             $root = $this->getRelativeRoot($relativeTo,
                 $this->makeUriRelativeTo($basePath, $this->basePath),
                 $this->makeUriRelativeTo($baseUrl, $this->baseUrl));
-            $cssFiles = array_merge($cssFiles, $this->makeUriRelativeTo((array) $assets['css'], $root));
-            $jsFiles = array_merge($jsFiles, $this->makeUriRelativeTo((array) $assets['js'], $root));
+            if (isset($assets['css'])) {
+                $cssFiles = array_merge($cssFiles, $this->makeUriRelativeTo((array) $assets['css'], $root));
+            }
+            if (isset($assets['js'])) {
+                $jsFiles = array_merge($jsFiles, $this->makeUriRelativeTo((array) $assets['js'], $root));
+            }
+
+            if (isset($assets['inline_css'])) {
+                $inlineCss = array_merge($inlineCss, (array) $assets['inline_css']);
+            }
+            if (isset($assets['inline_js'])) {
+                $inlineJs = array_merge($inlineJs, (array) $assets['inline_js']);
+            }
+            if (isset($assets['inline_head'])) {
+                $inlineHead = array_merge($inlineHead, (array) $assets['inline_head']);
+            }
         }
 
-        return $this->filterAssetArray(array($cssFiles, $jsFiles), $type);
+        // Deduplicate files
+        $cssFiles = array_unique($cssFiles);
+        $jsFiles = array_unique($jsFiles);
+
+        return $this->filterAssetArray(array($cssFiles, $jsFiles, $inlineCss, $inlineJs, $inlineHead), $type);
     }
 
     /**
@@ -642,53 +769,64 @@ class JavascriptRenderer
     }
 
     /**
-     * Filters a tuple of (css, js) assets according to $type
+     * Filters a tuple of (css, js, inline_css, inline_js, inline_head) assets according to $type
      *
      * @param array $array
-     * @param string $type 'css', 'js' or null for both
+     * @param string $type 'css', 'js', 'inline_css', 'inline_js', 'inline_head', or null for all
      * @return array
      */
     protected function filterAssetArray($array, $type = null)
     {
-        $type = strtolower($type);
-        if ($type === 'css') {
-            return $array[0];
-        }
-        if ($type === 'js') {
-            return $array[1];
-        }
-        return $array;
+        $types = array('css', 'js', 'inline_css', 'inline_js', 'inline_head');
+        $typeIndex = array_search(strtolower($type), $types);
+        return $typeIndex !== false ? $array[$typeIndex] : $array;
     }
 
     /**
-     * Returns a tuple where the both items are Assetic AssetCollection,
-     * the first one being css files and the second js files
+     * Returns an array where all items are Assetic AssetCollection:
+     *  - The first one contains the CSS files
+     *  - The second one contains the JS files
+     *  - The third one contains arbitrary inline HTML (typically composed of <script>/<style>
+     *    elements); it must be embedded within the <head> element
      *
-     * @param string $type Only return css or js collection
-     * @return array or \Assetic\Asset\AssetCollection
+     * @param string $type Optionally return only 'css', 'js', or 'inline_head' collection
+     * @return array|\Assetic\Asset\AssetCollection
      */
     public function getAsseticCollection($type = null)
     {
-        list($cssFiles, $jsFiles) = $this->getAssets();
-        return $this->filterAssetArray(array(
-            $this->createAsseticCollection($cssFiles),
-            $this->createAsseticCollection($jsFiles)
-        ), $type);
+        $types = array('css', 'js', 'inline_head');
+        $typeIndex = array_search(strtolower($type), $types);
+
+        list($cssFiles, $jsFiles, $inlineCss, $inlineJs, $inlineHead) = $this->getAssets();
+        $collections = array(
+            $this->createAsseticCollection($cssFiles, $inlineCss),
+            $this->createAsseticCollection($jsFiles, $inlineJs),
+            $this->createAsseticCollection(null, $inlineHead)
+        );
+        return $typeIndex !== false ? $collections[$typeIndex] : $collections;
     }
 
     /**
-     * Create an Assetic AssetCollection with the given files.
+     * Create an Assetic AssetCollection with the given content.
      * Filenames will be converted to absolute path using
      * the base path.
      *
-     * @param array $files
+     * @param array|null $files Array of asset filenames.
+     * @param array|null $content Array of inline asset content.
      * @return \Assetic\Asset\AssetCollection
      */
-    protected function createAsseticCollection($files)
+    protected function createAsseticCollection($files = null, $content = null)
     {
         $assets = array();
-        foreach ($files as $file) {
-            $assets[] = new \Assetic\Asset\FileAsset($file);
+        if ($files) {
+            foreach ($files as $file) {
+                $assets[] = new \Assetic\Asset\FileAsset($file);
+            }
+        }
+        if ($content) {
+            foreach ($content as $item) {
+                $assets[] = new \Assetic\Asset\StringAsset($item);
+            }
         }
         return new \Assetic\Asset\AssetCollection($assets);
     }
@@ -700,7 +838,7 @@ class JavascriptRenderer
      */
     public function dumpCssAssets($targetFilename = null)
     {
-        $this->dumpAssets($this->getAssets('css'), $targetFilename);
+        $this->dumpAssets($this->getAssets('css'), $this->getAssets('inline_css'), $targetFilename);
     }
 
     /**
@@ -710,25 +848,48 @@ class JavascriptRenderer
      */
     public function dumpJsAssets($targetFilename = null)
     {
-        $this->dumpAssets($this->getAssets('js'), $targetFilename);
+        $this->dumpAssets($this->getAssets('js'), $this->getAssets('inline_js'), $targetFilename, $this->useRequireJs);
+    }
+
+    /**
+     * Write all inline HTML header assets to standard output or in a file (only returns assets not
+     * already returned by dumpCssAssets or dumpJsAssets)
+     *
+     * @param string $targetFilename
+     */
+    public function dumpHeadAssets($targetFilename = null)
+    {
+        $this->dumpAssets(null, $this->getAssets('inline_head'), $targetFilename);
     }
 
     /**
      * Write assets to standard output or in a file
      *
-     * @param array $files
+     * @param array|null $files Filenames containing assets
+     * @param array|null $content Inline content to dump
      * @param string $targetFilename
+     * @param bool $useRequireJs
      */
-    protected function dumpAssets($files, $targetFilename = null)
+    protected function dumpAssets($files = null, $content = null, $targetFilename = null, $useRequireJs = false)
     {
-        $content = '';
-        foreach ($files as $file) {
-            $content .= file_get_contents($file) . "\n";
+        $dumpedContent = '';
+        if ($files) {
+            foreach ($files as $file) {
+                $dumpedContent .= file_get_contents($file) . "\n";
+            }
+        }
+        if ($content) {
+            foreach ($content as $item) {
+                $dumpedContent .= $item . "\n";
+            }
+        }
+        if ($useRequireJs) {
+            $dumpedContent = "define('debugbar', ['jquery'], function($){\r\n" . $dumpedContent . "\r\n return PhpDebugBar; \r\n});";
         }
         if ($targetFilename !== null) {
-            file_put_contents($targetFilename, $content);
+            file_put_contents($targetFilename, $dumpedContent);
         } else {
-            echo $content;
+            echo $dumpedContent;
         }
     }
 
@@ -741,18 +902,30 @@ class JavascriptRenderer
      */
     public function renderHead()
     {
-        list($cssFiles, $jsFiles) = $this->getAssets(null, self::RELATIVE_URL);
+        list($cssFiles, $jsFiles, $inlineCss, $inlineJs, $inlineHead) = $this->getAssets(null, self::RELATIVE_URL);
         $html = '';
 
         foreach ($cssFiles as $file) {
             $html .= sprintf('<link rel="stylesheet" type="text/css" href="%s">' . "\n", $file);
         }
 
+        foreach ($inlineCss as $content) {
+            $html .= sprintf('<style type="text/css">%s</style>' . "\n", $content);
+        }
+
         foreach ($jsFiles as $file) {
             $html .= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $file);
         }
 
-        if ($this->enableJqueryNoConflict) {
+        foreach ($inlineJs as $content) {
+            $html .= sprintf('<script type="text/javascript">%s</script>' . "\n", $content);
+        }
+
+        foreach ($inlineHead as $content) {
+            $html .= $content . "\n";
+        }
+
+        if ($this->enableJqueryNoConflict && !$this->useRequireJs) {
             $html .= '<script type="text/javascript">jQuery.noConflict(true);</script>' . "\n";
         }
 
@@ -764,6 +937,8 @@ class JavascriptRenderer
      *
      * @param boolean $here Set position of HTML. True if is to current position or false for end file
      * @param boolean $initialize Whether to render the de bug bar initialization code
+     * @param bool $renderStackedData
+     * @param bool $head
      * @return string Return "{--DEBUGBAR_OB_START_REPLACE_ME--}" or return an empty string if $here == false
      */
     public function renderOnShutdown($here = true, $initialize = true, $renderStackedData = true, $head = false)
@@ -795,6 +970,8 @@ class JavascriptRenderer
      *
      * @param boolean $here Set position of HTML. True if is to current position or false for end file
      * @param boolean $initialize Whether to render the de bug bar initialization code
+     * @param bool $renderStackedData
+     * @param bool $head
      */
     public function replaceTagInBuffer($here = true, $initialize = true, $renderStackedData = true, $head = false)
     {
@@ -815,7 +992,8 @@ class JavascriptRenderer
      *
      * AJAX request should not render the initialization code.
      *
-     * @param boolean $initialize Whether to render the de bug bar initialization code
+     * @param boolean $initialize Whether or not to render the debug bar initialization code
+     * @param boolean $renderStackedData Whether or not to render the stacked data
      * @return string
      */
     public function render($initialize = true, $renderStackedData = true)
@@ -835,7 +1013,12 @@ class JavascriptRenderer
         $suffix = !$initialize ? '(ajax)' : null;
         $js .= $this->getAddDatasetCode($this->debugBar->getCurrentRequestId(), $this->debugBar->getData(), $suffix);
 
-        return "<script type=\"text/javascript\">\n$js\n</script>\n";
+        if ($this->useRequireJs){
+            return "<script type=\"text/javascript\">\nrequire(['debugbar'], function(PhpDebugBar){ $js });\n</script>\n";
+        } else {
+            return "<script type=\"text/javascript\">\n$js\n</script>\n";
+        }
+
     }
 
     /**
@@ -856,7 +1039,15 @@ class JavascriptRenderer
         }
 
         if ($this->ajaxHandlerClass) {
-            $js .= sprintf("%s.ajaxHandler = new %s(%s);\n", $this->variableName, $this->ajaxHandlerClass, $this->variableName);
+            $js .= sprintf("%s.ajaxHandler = new %s(%s, undefined, %s);\n",
+                $this->variableName,
+                $this->ajaxHandlerClass,
+                $this->variableName,
+                $this->ajaxHandlerAutoShow ? 'true' : 'false'
+            );
+            if ($this->ajaxHandlerBindToFetch) {
+                $js .= sprintf("%s.ajaxHandler.bindToFetch();\n", $this->variableName);
+            }
             if ($this->ajaxHandlerBindToXHR) {
                 $js .= sprintf("%s.ajaxHandler.bindToXHR();\n", $this->variableName);
             } elseif ($this->ajaxHandlerBindToJquery) {
@@ -945,6 +1136,7 @@ class JavascriptRenderer
      *
      * @param string $requestId
      * @param array $data
+     * @param mixed $suffix
      * @return string
      */
     protected function getAddDatasetCode($requestId, $data, $suffix = null)
diff --git a/htdocs/includes/DebugBar/OpenHandler.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/OpenHandler.php
similarity index 90%
rename from htdocs/includes/DebugBar/OpenHandler.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/OpenHandler.php
index cbabea268ae..ee4df413792 100644
--- a/htdocs/includes/DebugBar/OpenHandler.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/OpenHandler.php
@@ -19,6 +19,7 @@ class OpenHandler
 
     /**
      * @param DebugBar $debugBar
+     * @throws DebugBarException
      */
     public function __construct(DebugBar $debugBar)
     {
@@ -32,6 +33,10 @@ class OpenHandler
      * Handles the current request
      *
      * @param array $request Request data
+     * @param bool $echo
+     * @param bool $sendHeader
+     * @return string
+     * @throws DebugBarException
      */
     public function handle($request = null, $echo = true, $sendHeader = true)
     {
@@ -62,6 +67,8 @@ class OpenHandler
 
     /**
      * Find operation
+     * @param $request
+     * @return array
      */
     protected function find($request)
     {
@@ -87,6 +94,9 @@ class OpenHandler
 
     /**
      * Get operation
+     * @param $request
+     * @return array
+     * @throws DebugBarException
      */
     protected function get($request)
     {
diff --git a/htdocs/includes/DebugBar/PhpHttpDriver.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/PhpHttpDriver.php
similarity index 74%
rename from htdocs/includes/DebugBar/PhpHttpDriver.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/PhpHttpDriver.php
index af07060d279..36e56f80bb0 100644
--- a/htdocs/includes/DebugBar/PhpHttpDriver.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/PhpHttpDriver.php
@@ -15,6 +15,9 @@ namespace DebugBar;
  */
 class PhpHttpDriver implements HttpDriverInterface
 {
+    /**
+     * @param array $headers
+     */
     function setHeaders(array $headers)
     {
         foreach ($headers as $name => $value) {
@@ -22,26 +25,44 @@ class PhpHttpDriver implements HttpDriverInterface
         }
     }
 
+    /**
+     * @return bool
+     */
     function isSessionStarted()
     {
         return isset($_SESSION);
     }
 
+    /**
+     * @param string $name
+     * @param string $value
+     */
     function setSessionValue($name, $value)
     {
         $_SESSION[$name] = $value;
     }
 
+    /**
+     * @param string $name
+     * @return bool
+     */
     function hasSessionValue($name)
     {
         return array_key_exists($name, $_SESSION);
     }
 
+    /**
+     * @param string $name
+     * @return mixed
+     */
     function getSessionValue($name)
     {
         return $_SESSION[$name];
     }
 
+    /**
+     * @param string $name
+     */
     function deleteSessionValue($name)
     {
         unset($_SESSION[$name]);
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/RequestIdGenerator.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/RequestIdGenerator.php
new file mode 100644
index 00000000000..90c1728b0bb
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/RequestIdGenerator.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2013 Maxime Bouroumeau-Fuseau
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar;
+
+/**
+ * Basic request ID generator
+ */
+class RequestIdGenerator implements RequestIdGeneratorInterface
+{
+    protected $index = 0;
+
+    /**
+     * @return string
+     */
+    public function generate()
+    {
+        if (function_exists('random_bytes')) {
+            // PHP 7 only
+            return 'X' . bin2hex(random_bytes(16));
+        } else if (function_exists('openssl_random_pseudo_bytes')) {
+            // PHP >= 5.3.0, but OpenSSL may not always be available
+            return 'X' . bin2hex(openssl_random_pseudo_bytes(16));
+        } else {
+            // Fall back to a rudimentary ID generator:
+            //  * $_SERVER array will make the ID unique to this request.
+            //  * spl_object_hash($this) will make the ID unique to this object instance.
+            //    (note that object hashes can be reused, but the other data here should prevent issues here).
+            //  * uniqid('', true) will use the current microtime(), plus additional random data.
+            //  * $this->index guarantees the uniqueness of IDs from the current object.
+            $this->index++;
+            $entropy = serialize($_SERVER) . uniqid('', true) . spl_object_hash($this) . $this->index;
+            return 'X' . md5($entropy);
+        }
+    }
+}
diff --git a/htdocs/includes/DebugBar/RequestIdGeneratorInterface.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/RequestIdGeneratorInterface.php
similarity index 52%
rename from htdocs/includes/DebugBar/RequestIdGeneratorInterface.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/RequestIdGeneratorInterface.php
index c72762484dd..3d9b4af7b2c 100644
--- a/htdocs/includes/DebugBar/RequestIdGeneratorInterface.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/RequestIdGeneratorInterface.php
@@ -13,7 +13,11 @@ namespace DebugBar;
 interface RequestIdGeneratorInterface
 {
     /**
-     * Generates a unique id for the current request
+     * Generates a unique id for the current request.  If called repeatedly, a new unique id must
+     * always be returned on each call to generate() - even across different object instances.
+     *
+     * To avoid any potential confusion in ID --> value maps, the returned value must be
+     * guaranteed to not be all-numeric.
      *
      * @return string
      */
diff --git a/htdocs/includes/DebugBar/Resources/debugbar.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/debugbar.css
similarity index 55%
rename from htdocs/includes/DebugBar/Resources/debugbar.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/debugbar.css
index 61ca0aae538..502d2482954 100644
--- a/htdocs/includes/DebugBar/Resources/debugbar.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/debugbar.css
@@ -11,15 +11,19 @@ div.phpdebugbar {
   left: 0;
   width: 100%;
   border-top: 0;
-  font-family: arial, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif;
   background: #fff;
   z-index: 10000;
   font-size: 14px;
   color: #000;
   text-align: left;
+  line-height: 1;
+  letter-spacing: normal;
+  direction: ltr;
 }
 
-div.phpdebugbar a {
+div.phpdebugbar a,
+div.phpdebugbar-openhandler {
   cursor: pointer;
 }
 
@@ -32,7 +36,7 @@ div.phpdebugbar-drag-capture {
   z-index: 10001;
   background: none;
   display: none;
-  cursor: n-resize;
+  cursor: ns-resize;
 }
 
 div.phpdebugbar-closed {
@@ -40,23 +44,57 @@ div.phpdebugbar-closed {
 }
 
 div.phpdebugbar * {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-weight: normal;
+  text-decoration: none;
+  clear: initial;
+  width: auto;
+  -moz-box-sizing: content-box;
+       box-sizing: content-box;
+}
 
-    -moz-box-sizing: content-box;
-         box-sizing: content-box;
+div.phpdebugbar ol, div.phpdebugbar ul {
+  list-style: none;
+}
+
+div.phpdebugbar table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+div.phpdebugbar input[type='text'], div.phpdebugbar input[type='password'] {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif;
+  background: #fff;
+  font-size: 14px;
+  color: #000;
+  border: 0;
+  padding: 0;
+  margin: 0;
+}
+
+div.phpdebugbar code, div.phpdebugbar pre, div.phpdebugbar samp {
+  background: none;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  font-size: 1em;
+  border: 0;
+  padding: 0;
+  margin: 0;
 }
 
 div.phpdebugbar code, div.phpdebugbar pre {
-    background: none;
-    font-family: monospace;
-    font-size: 1em;
-    border: 0;
-    padding: 0;
-    margin: 0;
+  color: #000;
+}
+
+div.phpdebugbar pre.sf-dump {
+  color: #a0a000;
+  outline: 0;
 }
 
 a.phpdebugbar-restore-btn {
   float: left;
-  padding: 10px 8px;
+  padding: 5px 8px;
   font-size: 14px;
   color: #555;
   text-decoration: none;
@@ -70,7 +108,7 @@ div.phpdebugbar-resize-handle {
   width: 100%;
   background: none;
   border-bottom: 1px solid #ccc;
-  cursor: n-resize;
+  cursor: ns-resize;
 }
 
 div.phpdebugbar-closed, div.phpdebugbar-minimized{
@@ -79,10 +117,10 @@ div.phpdebugbar-closed, div.phpdebugbar-minimized{
 /* -------------------------------------- */
 
 div.phpdebugbar-header, a.phpdebugbar-restore-btn {
-    background: #efefef url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADsAAAA7CAMAAADy+wKBAAABelBMVEUaSnYbS3ccTHgdTXkeTnofT3sgUHwhUX0iUn4jU38kVIAlVYEmVoInV4MoWIQpWYUqWoYrW4csXIgtXYkuXoovWoQvX4swW4UwX4wxYI0yYY4zYo80Y5A1ZJE2Yow2ZZI3ZpM4ZI04Z5Q5aJU6Zo86aZY7apc8a5g9aJI9bJk+bZo/bptAaI5Da5JFcZtGcptHcJZKcplPdJhPdZlbfZ5bgKRcfp9cgaVdfp9df6BegKFfgaJggqNghalhg6RihKVjhaZkhqdlh6dlh6hmiKlniapoiapoiqtpi6xqiadqjK1rja5sjq9tj7Bwjqx9mbOCnriCnrmDn7mEoLuFobyGoryHobmIobmJorqKo7uLpLyRqsKUrcWVrsaXq8GcscaftMqous2pu82pu863xtW3xta8zNvDz9vE0NzF0d3F0d7G0t7G09/H09/I1ODT2+TT3OXU3ebW3+fX4Onh6O3j6e/j6u/j6vDv8/bw8/bw8/fx9Pfx9Pj////KUJTtAAABt0lEQVR4AaXNZ1PVQBSH8WORWy5YROwIgr2IBbuigF2wKwj2HpXYS+R8eIcXnjzZTHLj7u/Vzn/OMyt7/ckef0Htbn9B7U5/Qe0Of0Htdn8ySEOTrqHBYtl2UvO+vXl8tqAdILb069GBgbzyFlBb208TWuznRL9D+ui6lrnfl5Vvq8fSS9e03L1eks3Urp0/zusqLcSZdhNd0Xbu4lo20mU1P2YXPIvns+1XXBe2sW2x0lG0G+gS2nS9w79n013W00U1c5hvo8Ve0sIcYrRr6QJa7rfQ7rJV1tA4Wu6H0I7bKt00puZjN6EdszGoXU2jaj5w34Z21FZZRefROrs5aGu19inadJWVdA4t5q1/1HxJZ1lBaN9jfq2pl+ksy2lETWTjllcKN9Lrtu3Ii4RpgmvpojNou25GUfRdHc9xLZ10Gm3nDBKzH9f/2c7wWlqE9l3rYT793CJp0im0zXybHGlSpRYpSYNOom1Mu+nhRpbU6QTautN+2ld3VG2T6XqO1OiYmre1KTW/p9bV8qSDhtF2PPj3enIVJ4DW1TO8oKf4QJb5k6X+gtol/oLaxf6C2kX+gtoAfwHyDK0lVxrWYgAAAABJRU5ErkJggg==) no-repeat 10px 8px / 20px 20px;
+    background: #efefef url(data:image/svg+xml,%3Csvg%20viewBox%3D%220%200%2020%2020%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Ccircle%20fill%3D%22%23000%22%20cx%3D%2210%22%20cy%3D%2210%22%20r%3D%229%22%2F%3E%3Cpath%20d%3D%22M6.039%208.342c.463%200%20.772.084.927.251.154.168.191.455.11.862-.084.424-.247.727-.487.908-.241.182-.608.272-1.1.272h-.743l.456-2.293h.837zm-2.975%204.615h1.22l.29-1.457H5.62c.461%200%20.84-.047%201.139-.142.298-.095.569-.254.812-.477.205-.184.37-.387.497-.608.127-.222.217-.466.27-.734.13-.65.032-1.155-.292-1.518-.324-.362-.84-.543-1.545-.543H4.153l-1.089%205.479zM9.235%206.02h1.21l-.289%201.458h1.079c.679%200%201.147.115%201.405.347.258.231.335.607.232%201.125l-.507%202.55h-1.23l.481-2.424c.055-.276.035-.464-.06-.565-.095-.1-.298-.15-.608-.15H9.98L9.356%2011.5h-1.21l1.089-5.48M15.566%208.342c.464%200%20.773.084.928.251.154.168.19.455.11.862-.084.424-.247.727-.488.908-.24.182-.607.272-1.1.272h-.742l.456-2.293h.836zm-2.974%204.615h1.22l.29-1.457h1.046c.461%200%20.84-.047%201.139-.142.298-.095.569-.254.812-.477.205-.184.37-.387.497-.608.127-.222.217-.466.27-.734.129-.65.032-1.155-.292-1.518-.324-.362-.84-.543-1.545-.543H13.68l-1.089%205.479z%22%20fill%3D%22%23FFF%22%2F%3E%3C%2Fsvg%3E)  no-repeat 5px 4px / 20px 20px;
 }
 div.phpdebugbar-header {
-  padding-left: 40px;
+  padding-left: 29px;
   min-height: 26px;
   line-height: 16px;
 }
@@ -101,11 +139,10 @@ div.phpdebugbar-header-right {
   float: right;
 }
 div.phpdebugbar-header > div > * {
-  padding: 10px 10px;
+  padding: 5px 5px;
   font-size: 14px;
   color: #555;
   text-decoration: none;
-  outline: none;
 }
 div.phpdebugbar-header-left > * {
   float: left;
@@ -126,25 +163,24 @@ a.phpdebugbar-close-btn {
 }
 
 a.phpdebugbar-tab.phpdebugbar-active {
-  background: #3d6c99;
-  color: #fff;
+  background: #ccc;
+  color: #444;
+  background-image: linear-gradient(bottom, rgb(173,173,173) 41%, rgb(209,209,209) 71%);
+  background-image: -o-linear-gradient(bottom, rgb(173,173,173) 41%, rgb(209,209,209) 71%);
+  background-image: -moz-linear-gradient(bottom, rgb(173,173,173) 41%, rgb(209,209,209) 71%);
+  background-image: -webkit-linear-gradient(bottom, rgb(173,173,173) 41%, rgb(209,209,209) 71%);
+  background-image: -ms-linear-gradient(bottom, rgb(173,173,173) 41%, rgb(209,209,209) 71%);
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.41, rgb(173,173,173)), color-stop(0.71, rgb(209,209,209)));
 }
-
-a.phpdebugbar-tab.phpdebugbar-active span.phpdebugbar-badge {
-  background: #fff;
-  color: #3d6c99;
-}
-
   a.phpdebugbar-tab span.phpdebugbar-badge {
     display: none;
     margin-left: 5px;
-    float: right;
     font-size: 11px;
     line-height: 14px;
-    padding: 1px 7px;
-    background: #3d6c99;
+    padding: 0 6px;
+    background: #ccc;
     border-radius: 4px;
-    color: #fff;
+    color: #555;
     font-weight: normal;
     text-shadow: none;
     vertical-align: middle;
@@ -153,23 +189,21 @@ a.phpdebugbar-tab.phpdebugbar-active span.phpdebugbar-badge {
     display: none;
     vertical-align: middle;
   }
+  a.phpdebugbar-tab span.phpdebugbar-badge.phpdebugbar-visible {
+    display: inline;
+  }
   a.phpdebugbar-tab span.phpdebugbar-badge.phpdebugbar-important {
     background: #ed6868;
     color: white;
   }
 
-a.phpdebugbar-close-btn, a.phpdebugbar-open-btn, a.phpdebugbar-minimize-btn , a.phpdebugbar-maximize-btn {
+a.phpdebugbar-close-btn, a.phpdebugbar-open-btn, a.phpdebugbar-restore-btn, a.phpdebugbar-minimize-btn , a.phpdebugbar-maximize-btn {
   width: 16px;
   height: 16px;
 }
 
-a.phpdebugbar-restore-btn {
-  width: 26px;
-  height: 16px;
-}
-
 a.phpdebugbar-minimize-btn , a.phpdebugbar-maximize-btn {
-  padding-right: 0px !important;
+  padding-right: 0 !important;
 }
 
 a.phpdebugbar-maximize-btn { display: none}
@@ -181,19 +215,19 @@ div.phpdebugbar-minimized a.phpdebugbar-maximize-btn { display: block}
 div.phpdebugbar-minimized a.phpdebugbar-minimize-btn { display: none}
 
 a.phpdebugbar-minimize-btn {
-  background: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201792%201792%22%20id%3D%22chevron-down%22%3E%3Cpath%20d%3D%22M1683%20808l-742%20741q-19%2019-45%2019t-45-19l-742-741q-19-19-19-45.5t19-45.5l166-165q19-19%2045-19t45%2019l531%20531%20531-531q19-19%2045-19t45%2019l166%20165q19%2019%2019%2045.5t-19%2045.5z%22%2F%3E%3C%2Fsvg%3E) no-repeat 10px 10px / 14px 14px;
+  background:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201792%201792%22%20id%3D%22chevron-down%22%3E%3Cpath%20d%3D%22M1683%20808l-742%20741q-19%2019-45%2019t-45-19l-742-741q-19-19-19-45.5t19-45.5l166-165q19-19%2045-19t45%2019l531%20531%20531-531q19-19%2045-19t45%2019l166%20165q19%2019%2019%2045.5t-19%2045.5z%22%2F%3E%3C%2Fsvg%3E) no-repeat 6px 6px / 14px 14px;
 }
 
 a.phpdebugbar-maximize-btn {
-  background: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201792%201792%22%20id%3D%22chevron-up%22%3E%3Cpath%20d%3D%22M1683%201331l-166%20165q-19%2019-45%2019t-45-19l-531-531-531%20531q-19%2019-45%2019t-45-19l-166-165q-19-19-19-45.5t19-45.5l742-741q19-19%2045-19t45%2019l742%20741q19%2019%2019%2045.5t-19%2045.5z%22%2F%3E%3C%2Fsvg%3E) no-repeat 10px 10px / 14px 14px;
+  background:url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201792%201792%22%20id%3D%22chevron-up%22%3E%3Cpath%20d%3D%22M1683%201331l-166%20165q-19%2019-45%2019t-45-19l-531-531-531%20531q-19%2019-45%2019t-45-19l-166-165q-19-19-19-45.5t19-45.5l742-741q19-19%2045-19t45%2019l742%20741q19%2019%2019%2045.5t-19%2045.5z%22%2F%3E%3C%2Fsvg%3E) no-repeat 6px 6px / 14px 14px;
 }
 
 a.phpdebugbar-close-btn {
-  background: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201792%201792%22%20id%3D%22close%22%3E%3Cpath%20d%3D%22M1490%201322q0%2040-28%2068l-136%20136q-28%2028-68%2028t-68-28l-294-294-294%20294q-28%2028-68%2028t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28%2068-28t68%2028l294%20294%20294-294q28-28%2068-28t68%2028l136%20136q28%2028%2028%2068t-28%2068l-294%20294%20294%20294q28%2028%2028%2068z%22%2F%3E%3C%2Fsvg%3E) no-repeat 10px 10px / 14px 14px;
+  background: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201792%201792%22%20id%3D%22close%22%3E%3Cpath%20d%3D%22M1490%201322q0%2040-28%2068l-136%20136q-28%2028-68%2028t-68-28l-294-294-294%20294q-28%2028-68%2028t-68-28l-136-136q-28-28-28-68t28-68l294-294-294-294q-28-28-28-68t28-68l136-136q28-28%2068-28t68%2028l294%20294%20294-294q28-28%2068-28t68%2028l136%20136q28%2028%2028%2068t-28%2068l-294%20294%20294%20294q28%2028%2028%2068z%22%2F%3E%3C%2Fsvg%3E) no-repeat 9px 6px / 14px 14px;
 }
 
 a.phpdebugbar-open-btn {
-  background: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201792%201792%22%20id%3D%22folder-open%22%3E%3Cpath%20d%3D%22M1815%20952q0%2031-31%2066l-336%20396q-43%2051-120.5%2086.5t-143.5%2035.5h-1088q-34%200-60.5-13t-26.5-43q0-31%2031-66l336-396q43-51%20120.5-86.5t143.5-35.5h1088q34%200%2060.5%2013t26.5%2043zm-343-344v160h-832q-94%200-197%2047.5t-164%20119.5l-337%20396-5%206q0-4-.5-12.5t-.5-12.5v-960q0-92%2066-158t158-66h320q92%200%20158%2066t66%20158v32h544q92%200%20158%2066t66%20158z%22%2F%3E%3C%2Fsvg%3E) no-repeat 10px 10px / 14px 14px;
+  background: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%201792%201792%22%20id%3D%22folder-open%22%3E%3Cpath%20d%3D%22M1815%20952q0%2031-31%2066l-336%20396q-43%2051-120.5%2086.5t-143.5%2035.5h-1088q-34%200-60.5-13t-26.5-43q0-31%2031-66l336-396q43-51%20120.5-86.5t143.5-35.5h1088q34%200%2060.5%2013t26.5%2043zm-343-344v160h-832q-94%200-197%2047.5t-164%20119.5l-337%20396-5%206q0-4-.5-12.5t-.5-12.5v-960q0-92%2066-158t158-66h320q92%200%20158%2066t66%20158v32h544q92%200%20158%2066t66%20158z%22%2F%3E%3C%2Fsvg%3E) no-repeat 8px 6px / 14px 14px;
 }
 
 .phpdebugbar-indicator {
@@ -206,8 +240,9 @@ a.phpdebugbar-open-btn {
   .phpdebugbar-indicator span.phpdebugbar-tooltip {
     display: none;
     position: absolute;
-    bottom: 45px;
+    top: -30px;
     background: #efefef;
+    opacity: .7;
     border: 1px solid #ccc;
     color: #555;
     font-size: 11px;
@@ -220,21 +255,11 @@ a.phpdebugbar-open-btn {
   .phpdebugbar-indicator:hover span.phpdebugbar-tooltip:not(.phpdebugbar-disabled) {
     display: block;
   }
-  .phpdebugbar-indicator span.phpdebugbar-tooltip-wide {
-    width: 300%;
-  }
-  .phpdebugbar-indicator span.phpdebugbar-tooltip-extra-wide {
-    width: 400%;
-  }
-  .phpdebugbar-indicator span.phpdebugbar-tooltip-html {
-    display: inline-block;
-    text-align: left;
-  }
 
 select.phpdebugbar-datasets-switcher {
   float: right;
   display: none;
-  margin: 8px 0 0 7px;
+  margin: 2px 0 0 7px;
   max-width: 200px;
   max-height: 23px;
   padding: 0;
diff --git a/htdocs/includes/DebugBar/Resources/debugbar.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/debugbar.js
similarity index 88%
rename from htdocs/includes/DebugBar/Resources/debugbar.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/debugbar.js
index 1dcbec2146f..09c3caebdc6 100644
--- a/htdocs/includes/DebugBar/Resources/debugbar.js
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/debugbar.js
@@ -95,7 +95,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
 
     // ------------------------------------------------------------------
-    
+
     /**
      * Base class for all elements with a visual component
      *
@@ -123,7 +123,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Called after the constructor
-         * 
+         *
          * @param {Object} options
          */
         initialize: function(options) {
@@ -137,7 +137,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Sets the value of an attribute
-         * 
+         *
          * @param {String} attr Can also be an object to set multiple attributes at once
          * @param {Object} value
          */
@@ -159,7 +159,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Checks if an attribute exists and is not null
-         * 
+         *
          * @param {String} attr
          * @return {[type]} [description]
          */
@@ -169,7 +169,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Returns the value of an attribute
-         * 
+         *
          * @param {String} attr
          * @return {Object}
          */
@@ -181,7 +181,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
          * Registers a callback function that will be called whenever the value of the attribute changes
          *
          * If cb is a jQuery element, text() will be used to fill the element
-         * 
+         *
          * @param {String} attr
          * @param {Function} cb
          */
@@ -213,7 +213,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
      * Creates a subclass
      *
      * Code from Backbone.js
-     * 
+     *
      * @param {Array} props Prototype properties
      * @return {Function}
      */
@@ -223,7 +223,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
         var child = function() { return parent.apply(this, arguments); };
         $.extend(child, parent);
 
-        var Surrogate = function(){ this.constructor = child; };
+        var Surrogate = function() { this.constructor = child; };
         Surrogate.prototype = parent.prototype;
         child.prototype = new Surrogate;
         $.extend(child.prototype, props);
@@ -237,7 +237,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
     /**
      * Tab
-     * 
+     *
      * A tab is composed of a tab label which is always visible and
      * a tab panel which is visible only when the tab is active.
      *
@@ -260,7 +260,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
             this.$icon = $('<i />').appendTo(this.$tab);
             this.bindAttr('icon', function(icon) {
                 if (icon) {
-                    this.$icon.attr('class', 'fa fa-' + icon);
+                    this.$icon.attr('class', 'phpdebugbar-fa phpdebugbar-fa-' + icon);
                 } else {
                     this.$icon.attr('class', '');
                 }
@@ -272,9 +272,9 @@ if (typeof(PhpDebugBar) == 'undefined') {
             this.bindAttr('badge', function(value) {
                 if (value !== null) {
                     this.$badge.text(value);
-                    this.$badge.show();
+                    this.$badge.addClass(csscls('visible'));
                 } else {
-                    this.$badge.hide();
+                    this.$badge.removeClass(csscls('visible'));
                 }
             });
 
@@ -315,7 +315,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
             this.$icon = $('<i />').appendTo(this.$el);
             this.bindAttr('icon', function(icon) {
                 if (icon) {
-                    this.$icon.attr('class', 'fa fa-' + icon);
+                    this.$icon.attr('class', 'phpdebugbar-fa phpdebugbar-fa-' + icon);
                 } else {
                     this.$icon.attr('class', '');
                 }
@@ -350,7 +350,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Formats the title of a dataset
-         * 
+         *
          * @this {DatasetTitleFormater}
          * @param {String} id
          * @param {Object} data
@@ -409,17 +409,19 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         className: "phpdebugbar " + csscls('minimized'),
 
+        options: {
+            bodyMarginBottom: true,
+            bodyMarginBottomHeight: 0
+        },
+
         initialize: function() {
-            this.options = {
-                bodyMarginBottom: true,
-                bodyMarginBottomHeight: parseInt($('body').css('margin-bottom')),
-            };
             this.controls = {};
             this.dataMap = {};
             this.datasets = {};
             this.firstTabName = null;
             this.activePanelName = null;
             this.datesetTitleFormater = new DatasetTitleFormater(this);
+            this.options.bodyMarginBottomHeight = parseInt($('body').css('margin-bottom'));
             this.registerResizeHandler();
         },
 
@@ -594,7 +596,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
          */
         createTab: function(name, widget, title) {
             var tab = new Tab({
-                title: title || (name.replace(/[_\-]/g, ' ').charAt(0).toUpperCase() + name.slice(1)), 
+                title: title || (name.replace(/[_\-]/g, ' ').charAt(0).toUpperCase() + name.slice(1)),
                 widget: widget
             });
             return this.addTab(name, tab);
@@ -650,7 +652,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Adds an indicator
-         * 
+         *
          * @this {DebugBar}
          * @param {String} name Internal name
          * @param {Indicator} indicator Indicator object
@@ -673,7 +675,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Returns a control
-         * 
+         *
          * @param {String} name
          * @return {Object}
          */
@@ -685,7 +687,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Checks if there's a control under the specified name
-         * 
+         *
          * @this {DebugBar}
          * @param {String} name
          * @return {Boolean}
@@ -696,7 +698,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Checks if a tab with the specified name exists
-         * 
+         *
          * @this {DebugBar}
          * @param {String} name
          * @return {Boolean}
@@ -707,7 +709,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Checks if an indicator with the specified name exists
-         * 
+         *
          * @this {DebugBar}
          * @param {String} name
          * @return {Boolean}
@@ -718,7 +720,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Removes all tabs and indicators from the debug bar and hides it
-         * 
+         *
          * @this {DebugBar}
          */
         reset: function() {
@@ -735,7 +737,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Open the debug bar and display the specified tab
-         * 
+         *
          * @this {DebugBar}
          * @param {String} name If not specified, display the first tab
          */
@@ -786,13 +788,13 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Checks if the panel is minimized
-         * 
+         *
          * @return {Boolean}
          */
         isMinimized: function() {
             return this.$el.hasClass(csscls('minimized'));
         },
-        
+
         /**
          * Close the debug bar
          *
@@ -846,8 +848,8 @@ if (typeof(PhpDebugBar) == 'undefined') {
                 if (this.isClosed()) {
                     return $('body').css('margin-bottom', this.options.bodyMarginBottomHeight || '');
                 }
-                
-                var offset = parseInt(this.$el.height()) + this.options.bodyMarginBottomHeight;
+
+                var offset = parseInt(this.$el.height()) + (this.options.bodyMarginBottomHeight || 0);
                 $('body').css('margin-bottom', offset);
             }
         },
@@ -863,7 +865,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
          *
          * Example:
          *     {"memory": ["memory.peak_usage_str", "0B"]}
-         * 
+         *
          * @this {DebugBar}
          * @param {Object} map
          */
@@ -887,7 +889,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
          *
          * For this method to be usefull, you need to specify
          * a dataMap using setDataMap()
-         * 
+         *
          * @this {DebugBar}
          * @param {Object} data
          * @return {String} Dataset's id
@@ -902,17 +904,18 @@ if (typeof(PhpDebugBar) == 'undefined') {
          *
          * If more than one dataset are added, the dataset selector
          * will be displayed.
-         * 
+         *
          * For this method to be usefull, you need to specify
          * a dataMap using setDataMap()
-         * 
+         *
          * @this {DebugBar}
          * @param {Object} data
          * @param {String} id The name of this set, optional
          * @param {String} suffix
+         * @param {Bool} show Whether to show the new dataset, optional (default: true)
          * @return {String} Dataset's id
          */
-        addDataSet: function(data, id, suffix) {
+        addDataSet: function(data, id, suffix, show) {
             var label = this.datesetTitleFormater.format(id, data, suffix);
             id = id || (getObjectSize(this.datasets) + 1);
             this.datasets[id] = data;
@@ -922,29 +925,32 @@ if (typeof(PhpDebugBar) == 'undefined') {
                 this.$datasets.show();
             }
 
-            this.showDataSet(id);
+            if (typeof(show) == 'undefined' || show) {
+                this.showDataSet(id);
+            }
             return id;
         },
 
         /**
          * Loads a dataset using the open handler
-         * 
+         *
          * @param {String} id
+         * @param {Bool} show Whether to show the new dataset, optional (default: true)
          */
-        loadDataSet: function(id, suffix, callback) {
+        loadDataSet: function(id, suffix, callback, show) {
             if (!this.openHandler) {
                 throw new Error('loadDataSet() needs an open handler');
             }
             var self = this;
             this.openHandler.load(id, function(data) {
-                self.addDataSet(data, id, suffix);
+                self.addDataSet(data, id, suffix, show);
                 callback && callback(data);
             });
         },
 
         /**
          * Returns the data from a dataset
-         * 
+         *
          * @this {DebugBar}
          * @param {String} id
          * @return {Object}
@@ -955,7 +961,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Switch the currently displayed dataset
-         * 
+         *
          * @this {DebugBar}
          * @param {String} id
          */
@@ -966,7 +972,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Called when the current dataset is modified.
-         * 
+         *
          * @this {DebugBar}
          * @param {Object} data
          */
@@ -985,7 +991,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Sets the handler to open past dataset
-         * 
+         *
          * @this {DebugBar}
          * @param {object} handler
          */
@@ -1000,7 +1006,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Returns the handler to open past dataset
-         * 
+         *
          * @this {DebugBar}
          * @return {object}
          */
@@ -1014,43 +1020,68 @@ if (typeof(PhpDebugBar) == 'undefined') {
     DebugBar.Indicator = Indicator;
 
     // ------------------------------------------------------------------
-    
+
     /**
      * AjaxHandler
      *
      * Extract data from headers of an XMLHttpRequest and adds a new dataset
+     *
+     * @param {Bool} autoShow Whether to immediately show new datasets, optional (default: true)
      */
-    var AjaxHandler = PhpDebugBar.AjaxHandler = function(debugbar, headerName) {
+    var AjaxHandler = PhpDebugBar.AjaxHandler = function(debugbar, headerName, autoShow) {
         this.debugbar = debugbar;
         this.headerName = headerName || 'phpdebugbar';
+        this.autoShow = typeof(autoShow) == 'undefined' ? true : autoShow;
     };
 
     $.extend(AjaxHandler.prototype, {
 
         /**
-         * Handles an XMLHttpRequest
-         * 
+         * Handles a Fetch API Response or an XMLHttpRequest
+         *
          * @this {AjaxHandler}
-         * @param {XMLHttpRequest} xhr
+         * @param {Response|XMLHttpRequest} response
          * @return {Bool}
          */
-        handle: function(xhr) {
-            if (!this.loadFromId(xhr)) {
-                return this.loadFromData(xhr);
+        handle: function(response) {
+            // Check if the debugbar header is available
+            if (this.isFetch(response) && !response.headers.has(this.headerName + '-id')) {
+                return true;
+            } else if (this.isXHR(response) && response.getAllResponseHeaders().indexOf(this.headerName) === -1) {
+                return true;
+            }
+            if (!this.loadFromId(response)) {
+                return this.loadFromData(response);
             }
             return true;
         },
 
+        getHeader: function(response, header) {
+            if (this.isFetch(response)) {
+                return response.headers.get(header)
+            }
+
+            return response.getResponseHeader(header)
+        },
+
+        isFetch: function(response) {
+            return Object.prototype.toString.call(response) == '[object Response]'
+        },
+
+        isXHR: function(response) {
+            return Object.prototype.toString.call(response) == '[object XMLHttpRequest]'
+        },
+
         /**
          * Checks if the HEADER-id exists and loads the dataset using the open handler
-         * 
-         * @param {XMLHttpRequest} xhr
+         *
+         * @param {Response|XMLHttpRequest} response
          * @return {Bool}
          */
-        loadFromId: function(xhr) {
-            var id = this.extractIdFromHeaders(xhr);
+        loadFromId: function(response) {
+            var id = this.extractIdFromHeaders(response);
             if (id && this.debugbar.openHandler) {
-                this.debugbar.loadDataSet(id, "(ajax)");
+                this.debugbar.loadDataSet(id, "(ajax)", undefined, this.autoShow);
                 return true;
             }
             return false;
@@ -1058,22 +1089,22 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Extracts the id from the HEADER-id
-         * 
-         * @param {XMLHttpRequest} xhr
+         *
+         * @param {Response|XMLHttpRequest} response
          * @return {String}
          */
-        extractIdFromHeaders: function(xhr) {
-            return xhr.getResponseHeader(this.headerName + '-id');
+        extractIdFromHeaders: function(response) {
+            return this.getHeader(response, this.headerName + '-id');
         },
 
         /**
          * Checks if the HEADER exists and loads the dataset
-         * 
-         * @param {XMLHttpRequest} xhr
+         *
+         * @param {Response|XMLHttpRequest} response
          * @return {Bool}
          */
-        loadFromData: function(xhr) {
-            var raw = this.extractDataFromHeaders(xhr);
+        loadFromData: function(response) {
+            var raw = this.extractDataFromHeaders(response);
             if (!raw) {
                 return false;
             }
@@ -1082,25 +1113,25 @@ if (typeof(PhpDebugBar) == 'undefined') {
             if (data.error) {
                 throw new Error('Error loading debugbar data: ' + data.error);
             } else if(data.data) {
-                this.debugbar.addDataSet(data.data, data.id, "(ajax)");
+                this.debugbar.addDataSet(data.data, data.id, "(ajax)", this.autoShow);
             }
             return true;
         },
 
         /**
          * Extract the data as a string from headers of an XMLHttpRequest
-         * 
+         *
          * @this {AjaxHandler}
-         * @param {XMLHttpRequest} xhr
+         * @param {Response|XMLHttpRequest} response
          * @return {string}
          */
-        extractDataFromHeaders: function(xhr) {
-            var data = xhr.getResponseHeader(this.headerName);
+        extractDataFromHeaders: function(response) {
+            var data = this.getHeader(response, this.headerName);
             if (!data) {
                 return;
             }
             for (var i = 1;; i++) {
-                var header = xhr.getResponseHeader(this.headerName + '-' + i);
+                var header = this.getHeader(response, this.headerName + '-' + i);
                 if (!header) {
                     break;
                 }
@@ -1111,7 +1142,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         /**
          * Parses the string data into an object
-         * 
+         *
          * @this {AjaxHandler}
          * @param {string} data
          * @return {string}
@@ -1120,9 +1151,35 @@ if (typeof(PhpDebugBar) == 'undefined') {
             return JSON.parse(data);
         },
 
+        /**
+         * Attaches an event listener to fetch
+         *
+         * @this {AjaxHandler}
+         */
+        bindToFetch: function() {
+            var self = this;
+            var proxied = window.fetch;
+
+            if (proxied === undefined && proxied.polyfill !== undefined) {
+                return;
+            }
+
+            window.fetch = function () {
+                var promise = proxied.apply(this, arguments);
+
+                promise.then(function (response) {
+                    self.handle(response);
+                }, function (e) {
+                    self.handle(response);
+                });
+
+                return promise;
+            };
+        },
+
         /**
          * Attaches an event listener to jQuery.ajaxComplete()
-         * 
+         *
          * @this {AjaxHandler}
          * @param {jQuery} jq Optional
          */
@@ -1134,10 +1191,10 @@ if (typeof(PhpDebugBar) == 'undefined') {
                 }
             });
         },
-        
+
         /**
          * Attaches an event listener to XMLHttpRequest
-         * 
+         *
          * @this {AjaxHandler}
          */
         bindToXHR: function() {
diff --git a/htdocs/includes/DebugBar/Resources/openhandler.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/openhandler.css
similarity index 97%
rename from htdocs/includes/DebugBar/Resources/openhandler.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/openhandler.css
index d72aba5a6f6..863a8bd5849 100644
--- a/htdocs/includes/DebugBar/Resources/openhandler.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/openhandler.css
@@ -19,10 +19,11 @@ div.phpdebugbar-openhandler {
     width: 70%;
     height: 70%;
     background: #fff;
+    color: #000;
     border: 2px solid #888;
     overflow: auto;
     z-index: 20001;
-    font-family: arial;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-size: 14px;
     padding-bottom: 10px;
 }
diff --git a/htdocs/includes/DebugBar/Resources/openhandler.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/openhandler.js
similarity index 98%
rename from htdocs/includes/DebugBar/Resources/openhandler.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/openhandler.js
index 08d13b3fd27..5633043ff3a 100644
--- a/htdocs/includes/DebugBar/Resources/openhandler.js
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/openhandler.js
@@ -20,9 +20,9 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         render: function() {
             var self = this;
-            
+
             this.$el.appendTo('body').hide();
-            this.$closebtn = $('<a><i class="fa fa-times"></i></a>');
+            this.$closebtn = $('<a><i class="phpdebugbar-fa phpdebugbar-fa-times"></i></a>');
             this.$table = $('<tbody />');
             $('<div>PHP DebugBar | Open</div>').addClass(csscls('header')).append(this.$closebtn).appendTo(this.$el);
             $('<table><thead><tr><th width="150">Date</th><th width="55">Method</th><th>URL</th><th width="125">IP</th><th width="100">Filter data</th></tr></thead></table>').append(this.$table).appendTo(this.$el);
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css
new file mode 100644
index 00000000000..3559d52d8c2
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css
@@ -0,0 +1,4 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'PhpDebugbarFontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.phpdebugbar-fa{display:inline-block;font:normal normal normal 14px/1 PhpDebugbarFontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.phpdebugbar-fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.phpdebugbar-fa-2x{font-size:2em}.phpdebugbar-fa-3x{font-size:3em}.phpdebugbar-fa-4x{font-size:4em}.phpdebugbar-fa-5x{font-size:5em}.phpdebugbar-fa-fw{width:1.28571429em;text-align:center}.phpdebugbar-fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.phpdebugbar-fa-ul>li{position:relative}.phpdebugbar-fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.phpdebugbar-fa-li.phpdebugbar-fa-lg{left:-1.85714286em}.phpdebugbar-fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.phpdebugbar-fa-pull-left{float:left}.phpdebugbar-fa-pull-right{float:right}.phpdebugbar-fa.phpdebugbar-fa-pull-left{margin-right:.3em}.phpdebugbar-fa.phpdebugbar-fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.phpdebugbar-fa.pull-left{margin-right:.3em}.phpdebugbar-fa.pull-right{margin-left:.3em}.phpdebugbar-fa-spin{-webkit-animation:phpdebugbar-fa-spin 2s infinite linear;animation:phpdebugbar-fa-spin 2s infinite linear}.phpdebugbar-fa-pulse{-webkit-animation:phpdebugbar-fa-spin 1s infinite steps(8);animation:phpdebugbar-fa-spin 1s infinite steps(8)}@-webkit-keyframes phpdebugbar-fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes phpdebugbar-fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.phpdebugbar-fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.phpdebugbar-fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.phpdebugbar-fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.phpdebugbar-fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.phpdebugbar-fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .phpdebugbar-fa-rotate-90,:root .phpdebugbar-fa-rotate-180,:root .phpdebugbar-fa-rotate-270,:root .phpdebugbar-fa-flip-horizontal,:root .phpdebugbar-fa-flip-vertical{filter:none}.phpdebugbar-fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.phpdebugbar-fa-stack-1x,.phpdebugbar-fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.phpdebugbar-fa-stack-1x{line-height:inherit}.phpdebugbar-fa-stack-2x{font-size:2em}.phpdebugbar-fa-inverse{color:#fff}.phpdebugbar-fa-glass:before{content:"\f000"}.phpdebugbar-fa-music:before{content:"\f001"}.phpdebugbar-fa-search:before{content:"\f002"}.phpdebugbar-fa-envelope-o:before{content:"\f003"}.phpdebugbar-fa-heart:before{content:"\f004"}.phpdebugbar-fa-star:before{content:"\f005"}.phpdebugbar-fa-star-o:before{content:"\f006"}.phpdebugbar-fa-user:before{content:"\f007"}.phpdebugbar-fa-film:before{content:"\f008"}.phpdebugbar-fa-th-large:before{content:"\f009"}.phpdebugbar-fa-th:before{content:"\f00a"}.phpdebugbar-fa-th-list:before{content:"\f00b"}.phpdebugbar-fa-check:before{content:"\f00c"}.phpdebugbar-fa-remove:before,.phpdebugbar-fa-close:before,.phpdebugbar-fa-times:before{content:"\f00d"}.phpdebugbar-fa-search-plus:before{content:"\f00e"}.phpdebugbar-fa-search-minus:before{content:"\f010"}.phpdebugbar-fa-power-off:before{content:"\f011"}.phpdebugbar-fa-signal:before{content:"\f012"}.phpdebugbar-fa-gear:before,.phpdebugbar-fa-cog:before{content:"\f013"}.phpdebugbar-fa-trash-o:before{content:"\f014"}.phpdebugbar-fa-home:before{content:"\f015"}.phpdebugbar-fa-file-o:before{content:"\f016"}.phpdebugbar-fa-clock-o:before{content:"\f017"}.phpdebugbar-fa-road:before{content:"\f018"}.phpdebugbar-fa-download:before{content:"\f019"}.phpdebugbar-fa-arrow-circle-o-down:before{content:"\f01a"}.phpdebugbar-fa-arrow-circle-o-up:before{content:"\f01b"}.phpdebugbar-fa-inbox:before{content:"\f01c"}.phpdebugbar-fa-play-circle-o:before{content:"\f01d"}.phpdebugbar-fa-rotate-right:before,.phpdebugbar-fa-repeat:before{content:"\f01e"}.phpdebugbar-fa-refresh:before{content:"\f021"}.phpdebugbar-fa-list-alt:before{content:"\f022"}.phpdebugbar-fa-lock:before{content:"\f023"}.phpdebugbar-fa-flag:before{content:"\f024"}.phpdebugbar-fa-headphones:before{content:"\f025"}.phpdebugbar-fa-volume-off:before{content:"\f026"}.phpdebugbar-fa-volume-down:before{content:"\f027"}.phpdebugbar-fa-volume-up:before{content:"\f028"}.phpdebugbar-fa-qrcode:before{content:"\f029"}.phpdebugbar-fa-barcode:before{content:"\f02a"}.phpdebugbar-fa-tag:before{content:"\f02b"}.phpdebugbar-fa-tags:before{content:"\f02c"}.phpdebugbar-fa-book:before{content:"\f02d"}.phpdebugbar-fa-bookmark:before{content:"\f02e"}.phpdebugbar-fa-print:before{content:"\f02f"}.phpdebugbar-fa-camera:before{content:"\f030"}.phpdebugbar-fa-font:before{content:"\f031"}.phpdebugbar-fa-bold:before{content:"\f032"}.phpdebugbar-fa-italic:before{content:"\f033"}.phpdebugbar-fa-text-height:before{content:"\f034"}.phpdebugbar-fa-text-width:before{content:"\f035"}.phpdebugbar-fa-align-left:before{content:"\f036"}.phpdebugbar-fa-align-center:before{content:"\f037"}.phpdebugbar-fa-align-right:before{content:"\f038"}.phpdebugbar-fa-align-justify:before{content:"\f039"}.phpdebugbar-fa-list:before{content:"\f03a"}.phpdebugbar-fa-dedent:before,.phpdebugbar-fa-outdent:before{content:"\f03b"}.phpdebugbar-fa-indent:before{content:"\f03c"}.phpdebugbar-fa-video-camera:before{content:"\f03d"}.phpdebugbar-fa-photo:before,.phpdebugbar-fa-image:before,.phpdebugbar-fa-picture-o:before{content:"\f03e"}.phpdebugbar-fa-pencil:before{content:"\f040"}.phpdebugbar-fa-map-marker:before{content:"\f041"}.phpdebugbar-fa-adjust:before{content:"\f042"}.phpdebugbar-fa-tint:before{content:"\f043"}.phpdebugbar-fa-edit:before,.phpdebugbar-fa-pencil-square-o:before{content:"\f044"}.phpdebugbar-fa-share-square-o:before{content:"\f045"}.phpdebugbar-fa-check-square-o:before{content:"\f046"}.phpdebugbar-fa-arrows:before{content:"\f047"}.phpdebugbar-fa-step-backward:before{content:"\f048"}.phpdebugbar-fa-fast-backward:before{content:"\f049"}.phpdebugbar-fa-backward:before{content:"\f04a"}.phpdebugbar-fa-play:before{content:"\f04b"}.phpdebugbar-fa-pause:before{content:"\f04c"}.phpdebugbar-fa-stop:before{content:"\f04d"}.phpdebugbar-fa-forward:before{content:"\f04e"}.phpdebugbar-fa-fast-forward:before{content:"\f050"}.phpdebugbar-fa-step-forward:before{content:"\f051"}.phpdebugbar-fa-eject:before{content:"\f052"}.phpdebugbar-fa-chevron-left:before{content:"\f053"}.phpdebugbar-fa-chevron-right:before{content:"\f054"}.phpdebugbar-fa-plus-circle:before{content:"\f055"}.phpdebugbar-fa-minus-circle:before{content:"\f056"}.phpdebugbar-fa-times-circle:before{content:"\f057"}.phpdebugbar-fa-check-circle:before{content:"\f058"}.phpdebugbar-fa-question-circle:before{content:"\f059"}.phpdebugbar-fa-info-circle:before{content:"\f05a"}.phpdebugbar-fa-crosshairs:before{content:"\f05b"}.phpdebugbar-fa-times-circle-o:before{content:"\f05c"}.phpdebugbar-fa-check-circle-o:before{content:"\f05d"}.phpdebugbar-fa-ban:before{content:"\f05e"}.phpdebugbar-fa-arrow-left:before{content:"\f060"}.phpdebugbar-fa-arrow-right:before{content:"\f061"}.phpdebugbar-fa-arrow-up:before{content:"\f062"}.phpdebugbar-fa-arrow-down:before{content:"\f063"}.phpdebugbar-fa-mail-forward:before,.phpdebugbar-fa-share:before{content:"\f064"}.phpdebugbar-fa-expand:before{content:"\f065"}.phpdebugbar-fa-compress:before{content:"\f066"}.phpdebugbar-fa-plus:before{content:"\f067"}.phpdebugbar-fa-minus:before{content:"\f068"}.phpdebugbar-fa-asterisk:before{content:"\f069"}.phpdebugbar-fa-exclamation-circle:before{content:"\f06a"}.phpdebugbar-fa-gift:before{content:"\f06b"}.phpdebugbar-fa-leaf:before{content:"\f06c"}.phpdebugbar-fa-fire:before{content:"\f06d"}.phpdebugbar-fa-eye:before{content:"\f06e"}.phpdebugbar-fa-eye-slash:before{content:"\f070"}.phpdebugbar-fa-warning:before,.phpdebugbar-fa-exclamation-triangle:before{content:"\f071"}.phpdebugbar-fa-plane:before{content:"\f072"}.phpdebugbar-fa-calendar:before{content:"\f073"}.phpdebugbar-fa-random:before{content:"\f074"}.phpdebugbar-fa-comment:before{content:"\f075"}.phpdebugbar-fa-magnet:before{content:"\f076"}.phpdebugbar-fa-chevron-up:before{content:"\f077"}.phpdebugbar-fa-chevron-down:before{content:"\f078"}.phpdebugbar-fa-retweet:before{content:"\f079"}.phpdebugbar-fa-shopping-cart:before{content:"\f07a"}.phpdebugbar-fa-folder:before{content:"\f07b"}.phpdebugbar-fa-folder-open:before{content:"\f07c"}.phpdebugbar-fa-arrows-v:before{content:"\f07d"}.phpdebugbar-fa-arrows-h:before{content:"\f07e"}.phpdebugbar-fa-bar-chart-o:before,.phpdebugbar-fa-bar-chart:before{content:"\f080"}.phpdebugbar-fa-twitter-square:before{content:"\f081"}.phpdebugbar-fa-facebook-square:before{content:"\f082"}.phpdebugbar-fa-camera-retro:before{content:"\f083"}.phpdebugbar-fa-key:before{content:"\f084"}.phpdebugbar-fa-gears:before,.phpdebugbar-fa-cogs:before{content:"\f085"}.phpdebugbar-fa-comments:before{content:"\f086"}.phpdebugbar-fa-thumbs-o-up:before{content:"\f087"}.phpdebugbar-fa-thumbs-o-down:before{content:"\f088"}.phpdebugbar-fa-star-half:before{content:"\f089"}.phpdebugbar-fa-heart-o:before{content:"\f08a"}.phpdebugbar-fa-sign-out:before{content:"\f08b"}.phpdebugbar-fa-linkedin-square:before{content:"\f08c"}.phpdebugbar-fa-thumb-tack:before{content:"\f08d"}.phpdebugbar-fa-external-link:before{content:"\f08e"}.phpdebugbar-fa-sign-in:before{content:"\f090"}.phpdebugbar-fa-trophy:before{content:"\f091"}.phpdebugbar-fa-github-square:before{content:"\f092"}.phpdebugbar-fa-upload:before{content:"\f093"}.phpdebugbar-fa-lemon-o:before{content:"\f094"}.phpdebugbar-fa-phone:before{content:"\f095"}.phpdebugbar-fa-square-o:before{content:"\f096"}.phpdebugbar-fa-bookmark-o:before{content:"\f097"}.phpdebugbar-fa-phone-square:before{content:"\f098"}.phpdebugbar-fa-twitter:before{content:"\f099"}.phpdebugbar-fa-facebook-f:before,.phpdebugbar-fa-facebook:before{content:"\f09a"}.phpdebugbar-fa-github:before{content:"\f09b"}.phpdebugbar-fa-unlock:before{content:"\f09c"}.phpdebugbar-fa-credit-card:before{content:"\f09d"}.phpdebugbar-fa-feed:before,.phpdebugbar-fa-rss:before{content:"\f09e"}.phpdebugbar-fa-hdd-o:before{content:"\f0a0"}.phpdebugbar-fa-bullhorn:before{content:"\f0a1"}.phpdebugbar-fa-bell:before{content:"\f0f3"}.phpdebugbar-fa-certificate:before{content:"\f0a3"}.phpdebugbar-fa-hand-o-right:before{content:"\f0a4"}.phpdebugbar-fa-hand-o-left:before{content:"\f0a5"}.phpdebugbar-fa-hand-o-up:before{content:"\f0a6"}.phpdebugbar-fa-hand-o-down:before{content:"\f0a7"}.phpdebugbar-fa-arrow-circle-left:before{content:"\f0a8"}.phpdebugbar-fa-arrow-circle-right:before{content:"\f0a9"}.phpdebugbar-fa-arrow-circle-up:before{content:"\f0aa"}.phpdebugbar-fa-arrow-circle-down:before{content:"\f0ab"}.phpdebugbar-fa-globe:before{content:"\f0ac"}.phpdebugbar-fa-wrench:before{content:"\f0ad"}.phpdebugbar-fa-tasks:before{content:"\f0ae"}.phpdebugbar-fa-filter:before{content:"\f0b0"}.phpdebugbar-fa-briefcase:before{content:"\f0b1"}.phpdebugbar-fa-arrows-alt:before{content:"\f0b2"}.phpdebugbar-fa-group:before,.phpdebugbar-fa-users:before{content:"\f0c0"}.phpdebugbar-fa-chain:before,.phpdebugbar-fa-link:before{content:"\f0c1"}.phpdebugbar-fa-cloud:before{content:"\f0c2"}.phpdebugbar-fa-flask:before{content:"\f0c3"}.phpdebugbar-fa-cut:before,.phpdebugbar-fa-scissors:before{content:"\f0c4"}.phpdebugbar-fa-copy:before,.phpdebugbar-fa-files-o:before{content:"\f0c5"}.phpdebugbar-fa-paperclip:before{content:"\f0c6"}.phpdebugbar-fa-save:before,.phpdebugbar-fa-floppy-o:before{content:"\f0c7"}.phpdebugbar-fa-square:before{content:"\f0c8"}.phpdebugbar-fa-navicon:before,.phpdebugbar-fa-reorder:before,.phpdebugbar-fa-bars:before{content:"\f0c9"}.phpdebugbar-fa-list-ul:before{content:"\f0ca"}.phpdebugbar-fa-list-ol:before{content:"\f0cb"}.phpdebugbar-fa-strikethrough:before{content:"\f0cc"}.phpdebugbar-fa-underline:before{content:"\f0cd"}.phpdebugbar-fa-table:before{content:"\f0ce"}.phpdebugbar-fa-magic:before{content:"\f0d0"}.phpdebugbar-fa-truck:before{content:"\f0d1"}.phpdebugbar-fa-pinterest:before{content:"\f0d2"}.phpdebugbar-fa-pinterest-square:before{content:"\f0d3"}.phpdebugbar-fa-google-plus-square:before{content:"\f0d4"}.phpdebugbar-fa-google-plus:before{content:"\f0d5"}.phpdebugbar-fa-money:before{content:"\f0d6"}.phpdebugbar-fa-caret-down:before{content:"\f0d7"}.phpdebugbar-fa-caret-up:before{content:"\f0d8"}.phpdebugbar-fa-caret-left:before{content:"\f0d9"}.phpdebugbar-fa-caret-right:before{content:"\f0da"}.phpdebugbar-fa-columns:before{content:"\f0db"}.phpdebugbar-fa-unsorted:before,.phpdebugbar-fa-sort:before{content:"\f0dc"}.phpdebugbar-fa-sort-down:before,.phpdebugbar-fa-sort-desc:before{content:"\f0dd"}.phpdebugbar-fa-sort-up:before,.phpdebugbar-fa-sort-asc:before{content:"\f0de"}.phpdebugbar-fa-envelope:before{content:"\f0e0"}.phpdebugbar-fa-linkedin:before{content:"\f0e1"}.phpdebugbar-fa-rotate-left:before,.phpdebugbar-fa-undo:before{content:"\f0e2"}.phpdebugbar-fa-legal:before,.phpdebugbar-fa-gavel:before{content:"\f0e3"}.phpdebugbar-fa-dashboard:before,.phpdebugbar-fa-tachometer:before{content:"\f0e4"}.phpdebugbar-fa-comment-o:before{content:"\f0e5"}.phpdebugbar-fa-comments-o:before{content:"\f0e6"}.phpdebugbar-fa-flash:before,.phpdebugbar-fa-bolt:before{content:"\f0e7"}.phpdebugbar-fa-sitemap:before{content:"\f0e8"}.phpdebugbar-fa-umbrella:before{content:"\f0e9"}.phpdebugbar-fa-paste:before,.phpdebugbar-fa-clipboard:before{content:"\f0ea"}.phpdebugbar-fa-lightbulb-o:before{content:"\f0eb"}.phpdebugbar-fa-exchange:before{content:"\f0ec"}.phpdebugbar-fa-cloud-download:before{content:"\f0ed"}.phpdebugbar-fa-cloud-upload:before{content:"\f0ee"}.phpdebugbar-fa-user-md:before{content:"\f0f0"}.phpdebugbar-fa-stethoscope:before{content:"\f0f1"}.phpdebugbar-fa-suitcase:before{content:"\f0f2"}.phpdebugbar-fa-bell-o:before{content:"\f0a2"}.phpdebugbar-fa-coffee:before{content:"\f0f4"}.phpdebugbar-fa-cutlery:before{content:"\f0f5"}.phpdebugbar-fa-file-text-o:before{content:"\f0f6"}.phpdebugbar-fa-building-o:before{content:"\f0f7"}.phpdebugbar-fa-hospital-o:before{content:"\f0f8"}.phpdebugbar-fa-ambulance:before{content:"\f0f9"}.phpdebugbar-fa-medkit:before{content:"\f0fa"}.phpdebugbar-fa-fighter-jet:before{content:"\f0fb"}.phpdebugbar-fa-beer:before{content:"\f0fc"}.phpdebugbar-fa-h-square:before{content:"\f0fd"}.phpdebugbar-fa-plus-square:before{content:"\f0fe"}.phpdebugbar-fa-angle-double-left:before{content:"\f100"}.phpdebugbar-fa-angle-double-right:before{content:"\f101"}.phpdebugbar-fa-angle-double-up:before{content:"\f102"}.phpdebugbar-fa-angle-double-down:before{content:"\f103"}.phpdebugbar-fa-angle-left:before{content:"\f104"}.phpdebugbar-fa-angle-right:before{content:"\f105"}.phpdebugbar-fa-angle-up:before{content:"\f106"}.phpdebugbar-fa-angle-down:before{content:"\f107"}.phpdebugbar-fa-desktop:before{content:"\f108"}.phpdebugbar-fa-laptop:before{content:"\f109"}.phpdebugbar-fa-tablet:before{content:"\f10a"}.phpdebugbar-fa-mobile-phone:before,.phpdebugbar-fa-mobile:before{content:"\f10b"}.phpdebugbar-fa-circle-o:before{content:"\f10c"}.phpdebugbar-fa-quote-left:before{content:"\f10d"}.phpdebugbar-fa-quote-right:before{content:"\f10e"}.phpdebugbar-fa-spinner:before{content:"\f110"}.phpdebugbar-fa-circle:before{content:"\f111"}.phpdebugbar-fa-mail-reply:before,.phpdebugbar-fa-reply:before{content:"\f112"}.phpdebugbar-fa-github-alt:before{content:"\f113"}.phpdebugbar-fa-folder-o:before{content:"\f114"}.phpdebugbar-fa-folder-open-o:before{content:"\f115"}.phpdebugbar-fa-smile-o:before{content:"\f118"}.phpdebugbar-fa-frown-o:before{content:"\f119"}.phpdebugbar-fa-meh-o:before{content:"\f11a"}.phpdebugbar-fa-gamepad:before{content:"\f11b"}.phpdebugbar-fa-keyboard-o:before{content:"\f11c"}.phpdebugbar-fa-flag-o:before{content:"\f11d"}.phpdebugbar-fa-flag-checkered:before{content:"\f11e"}.phpdebugbar-fa-terminal:before{content:"\f120"}.phpdebugbar-fa-code:before{content:"\f121"}.phpdebugbar-fa-mail-reply-all:before,.phpdebugbar-fa-reply-all:before{content:"\f122"}.phpdebugbar-fa-star-half-empty:before,.phpdebugbar-fa-star-half-full:before,.phpdebugbar-fa-star-half-o:before{content:"\f123"}.phpdebugbar-fa-location-arrow:before{content:"\f124"}.phpdebugbar-fa-crop:before{content:"\f125"}.phpdebugbar-fa-code-fork:before{content:"\f126"}.phpdebugbar-fa-unlink:before,.phpdebugbar-fa-chain-broken:before{content:"\f127"}.phpdebugbar-fa-question:before{content:"\f128"}.phpdebugbar-fa-info:before{content:"\f129"}.phpdebugbar-fa-exclamation:before{content:"\f12a"}.phpdebugbar-fa-superscript:before{content:"\f12b"}.phpdebugbar-fa-subscript:before{content:"\f12c"}.phpdebugbar-fa-eraser:before{content:"\f12d"}.phpdebugbar-fa-puzzle-piece:before{content:"\f12e"}.phpdebugbar-fa-microphone:before{content:"\f130"}.phpdebugbar-fa-microphone-slash:before{content:"\f131"}.phpdebugbar-fa-shield:before{content:"\f132"}.phpdebugbar-fa-calendar-o:before{content:"\f133"}.phpdebugbar-fa-fire-extinguisher:before{content:"\f134"}.phpdebugbar-fa-rocket:before{content:"\f135"}.phpdebugbar-fa-maxcdn:before{content:"\f136"}.phpdebugbar-fa-chevron-circle-left:before{content:"\f137"}.phpdebugbar-fa-chevron-circle-right:before{content:"\f138"}.phpdebugbar-fa-chevron-circle-up:before{content:"\f139"}.phpdebugbar-fa-chevron-circle-down:before{content:"\f13a"}.phpdebugbar-fa-html5:before{content:"\f13b"}.phpdebugbar-fa-css3:before{content:"\f13c"}.phpdebugbar-fa-anchor:before{content:"\f13d"}.phpdebugbar-fa-unlock-alt:before{content:"\f13e"}.phpdebugbar-fa-bullseye:before{content:"\f140"}.phpdebugbar-fa-ellipsis-h:before{content:"\f141"}.phpdebugbar-fa-ellipsis-v:before{content:"\f142"}.phpdebugbar-fa-rss-square:before{content:"\f143"}.phpdebugbar-fa-play-circle:before{content:"\f144"}.phpdebugbar-fa-ticket:before{content:"\f145"}.phpdebugbar-fa-minus-square:before{content:"\f146"}.phpdebugbar-fa-minus-square-o:before{content:"\f147"}.phpdebugbar-fa-level-up:before{content:"\f148"}.phpdebugbar-fa-level-down:before{content:"\f149"}.phpdebugbar-fa-check-square:before{content:"\f14a"}.phpdebugbar-fa-pencil-square:before{content:"\f14b"}.phpdebugbar-fa-external-link-square:before{content:"\f14c"}.phpdebugbar-fa-share-square:before{content:"\f14d"}.phpdebugbar-fa-compass:before{content:"\f14e"}.phpdebugbar-fa-toggle-down:before,.phpdebugbar-fa-caret-square-o-down:before{content:"\f150"}.phpdebugbar-fa-toggle-up:before,.phpdebugbar-fa-caret-square-o-up:before{content:"\f151"}.phpdebugbar-fa-toggle-right:before,.phpdebugbar-fa-caret-square-o-right:before{content:"\f152"}.phpdebugbar-fa-euro:before,.phpdebugbar-fa-eur:before{content:"\f153"}.phpdebugbar-fa-gbp:before{content:"\f154"}.phpdebugbar-fa-dollar:before,.phpdebugbar-fa-usd:before{content:"\f155"}.phpdebugbar-fa-rupee:before,.phpdebugbar-fa-inr:before{content:"\f156"}.phpdebugbar-fa-cny:before,.phpdebugbar-fa-rmb:before,.phpdebugbar-fa-yen:before,.phpdebugbar-fa-jpy:before{content:"\f157"}.phpdebugbar-fa-ruble:before,.phpdebugbar-fa-rouble:before,.phpdebugbar-fa-rub:before{content:"\f158"}.phpdebugbar-fa-won:before,.phpdebugbar-fa-krw:before{content:"\f159"}.phpdebugbar-fa-bitcoin:before,.phpdebugbar-fa-btc:before{content:"\f15a"}.phpdebugbar-fa-file:before{content:"\f15b"}.phpdebugbar-fa-file-text:before{content:"\f15c"}.phpdebugbar-fa-sort-alpha-asc:before{content:"\f15d"}.phpdebugbar-fa-sort-alpha-desc:before{content:"\f15e"}.phpdebugbar-fa-sort-amount-asc:before{content:"\f160"}.phpdebugbar-fa-sort-amount-desc:before{content:"\f161"}.phpdebugbar-fa-sort-numeric-asc:before{content:"\f162"}.phpdebugbar-fa-sort-numeric-desc:before{content:"\f163"}.phpdebugbar-fa-thumbs-up:before{content:"\f164"}.phpdebugbar-fa-thumbs-down:before{content:"\f165"}.phpdebugbar-fa-youtube-square:before{content:"\f166"}.phpdebugbar-fa-youtube:before{content:"\f167"}.phpdebugbar-fa-xing:before{content:"\f168"}.phpdebugbar-fa-xing-square:before{content:"\f169"}.phpdebugbar-fa-youtube-play:before{content:"\f16a"}.phpdebugbar-fa-dropbox:before{content:"\f16b"}.phpdebugbar-fa-stack-overflow:before{content:"\f16c"}.phpdebugbar-fa-instagram:before{content:"\f16d"}.phpdebugbar-fa-flickr:before{content:"\f16e"}.phpdebugbar-fa-adn:before{content:"\f170"}.phpdebugbar-fa-bitbucket:before{content:"\f171"}.phpdebugbar-fa-bitbucket-square:before{content:"\f172"}.phpdebugbar-fa-tumblr:before{content:"\f173"}.phpdebugbar-fa-tumblr-square:before{content:"\f174"}.phpdebugbar-fa-long-arrow-down:before{content:"\f175"}.phpdebugbar-fa-long-arrow-up:before{content:"\f176"}.phpdebugbar-fa-long-arrow-left:before{content:"\f177"}.phpdebugbar-fa-long-arrow-right:before{content:"\f178"}.phpdebugbar-fa-apple:before{content:"\f179"}.phpdebugbar-fa-windows:before{content:"\f17a"}.phpdebugbar-fa-android:before{content:"\f17b"}.phpdebugbar-fa-linux:before{content:"\f17c"}.phpdebugbar-fa-dribbble:before{content:"\f17d"}.phpdebugbar-fa-skype:before{content:"\f17e"}.phpdebugbar-fa-foursquare:before{content:"\f180"}.phpdebugbar-fa-trello:before{content:"\f181"}.phpdebugbar-fa-female:before{content:"\f182"}.phpdebugbar-fa-male:before{content:"\f183"}.phpdebugbar-fa-gittip:before,.phpdebugbar-fa-gratipay:before{content:"\f184"}.phpdebugbar-fa-sun-o:before{content:"\f185"}.phpdebugbar-fa-moon-o:before{content:"\f186"}.phpdebugbar-fa-archive:before{content:"\f187"}.phpdebugbar-fa-bug:before{content:"\f188"}.phpdebugbar-fa-vk:before{content:"\f189"}.phpdebugbar-fa-weibo:before{content:"\f18a"}.phpdebugbar-fa-renren:before{content:"\f18b"}.phpdebugbar-fa-pagelines:before{content:"\f18c"}.phpdebugbar-fa-stack-exchange:before{content:"\f18d"}.phpdebugbar-fa-arrow-circle-o-right:before{content:"\f18e"}.phpdebugbar-fa-arrow-circle-o-left:before{content:"\f190"}.phpdebugbar-fa-toggle-left:before,.phpdebugbar-fa-caret-square-o-left:before{content:"\f191"}.phpdebugbar-fa-dot-circle-o:before{content:"\f192"}.phpdebugbar-fa-wheelchair:before{content:"\f193"}.phpdebugbar-fa-vimeo-square:before{content:"\f194"}.phpdebugbar-fa-turkish-lira:before,.phpdebugbar-fa-try:before{content:"\f195"}.phpdebugbar-fa-plus-square-o:before{content:"\f196"}.phpdebugbar-fa-space-shuttle:before{content:"\f197"}.phpdebugbar-fa-slack:before{content:"\f198"}.phpdebugbar-fa-envelope-square:before{content:"\f199"}.phpdebugbar-fa-wordpress:before{content:"\f19a"}.phpdebugbar-fa-openid:before{content:"\f19b"}.phpdebugbar-fa-institution:before,.phpdebugbar-fa-bank:before,.phpdebugbar-fa-university:before{content:"\f19c"}.phpdebugbar-fa-mortar-board:before,.phpdebugbar-fa-graduation-cap:before{content:"\f19d"}.phpdebugbar-fa-yahoo:before{content:"\f19e"}.phpdebugbar-fa-google:before{content:"\f1a0"}.phpdebugbar-fa-reddit:before{content:"\f1a1"}.phpdebugbar-fa-reddit-square:before{content:"\f1a2"}.phpdebugbar-fa-stumbleupon-circle:before{content:"\f1a3"}.phpdebugbar-fa-stumbleupon:before{content:"\f1a4"}.phpdebugbar-fa-delicious:before{content:"\f1a5"}.phpdebugbar-fa-digg:before{content:"\f1a6"}.phpdebugbar-fa-pied-piper-pp:before{content:"\f1a7"}.phpdebugbar-fa-pied-piper-alt:before{content:"\f1a8"}.phpdebugbar-fa-drupal:before{content:"\f1a9"}.phpdebugbar-fa-joomla:before{content:"\f1aa"}.phpdebugbar-fa-language:before{content:"\f1ab"}.phpdebugbar-fa-fax:before{content:"\f1ac"}.phpdebugbar-fa-building:before{content:"\f1ad"}.phpdebugbar-fa-child:before{content:"\f1ae"}.phpdebugbar-fa-paw:before{content:"\f1b0"}.phpdebugbar-fa-spoon:before{content:"\f1b1"}.phpdebugbar-fa-cube:before{content:"\f1b2"}.phpdebugbar-fa-cubes:before{content:"\f1b3"}.phpdebugbar-fa-behance:before{content:"\f1b4"}.phpdebugbar-fa-behance-square:before{content:"\f1b5"}.phpdebugbar-fa-steam:before{content:"\f1b6"}.phpdebugbar-fa-steam-square:before{content:"\f1b7"}.phpdebugbar-fa-recycle:before{content:"\f1b8"}.phpdebugbar-fa-automobile:before,.phpdebugbar-fa-car:before{content:"\f1b9"}.phpdebugbar-fa-cab:before,.phpdebugbar-fa-taxi:before{content:"\f1ba"}.phpdebugbar-fa-tree:before{content:"\f1bb"}.phpdebugbar-fa-spotify:before{content:"\f1bc"}.phpdebugbar-fa-deviantart:before{content:"\f1bd"}.phpdebugbar-fa-soundcloud:before{content:"\f1be"}.phpdebugbar-fa-database:before{content:"\f1c0"}.phpdebugbar-fa-file-pdf-o:before{content:"\f1c1"}.phpdebugbar-fa-file-word-o:before{content:"\f1c2"}.phpdebugbar-fa-file-excel-o:before{content:"\f1c3"}.phpdebugbar-fa-file-powerpoint-o:before{content:"\f1c4"}.phpdebugbar-fa-file-photo-o:before,.phpdebugbar-fa-file-picture-o:before,.phpdebugbar-fa-file-image-o:before{content:"\f1c5"}.phpdebugbar-fa-file-zip-o:before,.phpdebugbar-fa-file-archive-o:before{content:"\f1c6"}.phpdebugbar-fa-file-sound-o:before,.phpdebugbar-fa-file-audio-o:before{content:"\f1c7"}.phpdebugbar-fa-file-movie-o:before,.phpdebugbar-fa-file-video-o:before{content:"\f1c8"}.phpdebugbar-fa-file-code-o:before{content:"\f1c9"}.phpdebugbar-fa-vine:before{content:"\f1ca"}.phpdebugbar-fa-codepen:before{content:"\f1cb"}.phpdebugbar-fa-jsfiddle:before{content:"\f1cc"}.phpdebugbar-fa-life-bouy:before,.phpdebugbar-fa-life-buoy:before,.phpdebugbar-fa-life-saver:before,.phpdebugbar-fa-support:before,.phpdebugbar-fa-life-ring:before{content:"\f1cd"}.phpdebugbar-fa-circle-o-notch:before{content:"\f1ce"}.phpdebugbar-fa-ra:before,.phpdebugbar-fa-resistance:before,.phpdebugbar-fa-rebel:before{content:"\f1d0"}.phpdebugbar-fa-ge:before,.phpdebugbar-fa-empire:before{content:"\f1d1"}.phpdebugbar-fa-git-square:before{content:"\f1d2"}.phpdebugbar-fa-git:before{content:"\f1d3"}.phpdebugbar-fa-y-combinator-square:before,.phpdebugbar-fa-yc-square:before,.phpdebugbar-fa-hacker-news:before{content:"\f1d4"}.phpdebugbar-fa-tencent-weibo:before{content:"\f1d5"}.phpdebugbar-fa-qq:before{content:"\f1d6"}.phpdebugbar-fa-wechat:before,.phpdebugbar-fa-weixin:before{content:"\f1d7"}.phpdebugbar-fa-send:before,.phpdebugbar-fa-paper-plane:before{content:"\f1d8"}.phpdebugbar-fa-send-o:before,.phpdebugbar-fa-paper-plane-o:before{content:"\f1d9"}.phpdebugbar-fa-history:before{content:"\f1da"}.phpdebugbar-fa-circle-thin:before{content:"\f1db"}.phpdebugbar-fa-header:before{content:"\f1dc"}.phpdebugbar-fa-paragraph:before{content:"\f1dd"}.phpdebugbar-fa-sliders:before{content:"\f1de"}.phpdebugbar-fa-share-alt:before{content:"\f1e0"}.phpdebugbar-fa-share-alt-square:before{content:"\f1e1"}.phpdebugbar-fa-bomb:before{content:"\f1e2"}.phpdebugbar-fa-soccer-ball-o:before,.phpdebugbar-fa-futbol-o:before{content:"\f1e3"}.phpdebugbar-fa-tty:before{content:"\f1e4"}.phpdebugbar-fa-binoculars:before{content:"\f1e5"}.phpdebugbar-fa-plug:before{content:"\f1e6"}.phpdebugbar-fa-slideshare:before{content:"\f1e7"}.phpdebugbar-fa-twitch:before{content:"\f1e8"}.phpdebugbar-fa-yelp:before{content:"\f1e9"}.phpdebugbar-fa-newspaper-o:before{content:"\f1ea"}.phpdebugbar-fa-wifi:before{content:"\f1eb"}.phpdebugbar-fa-calculator:before{content:"\f1ec"}.phpdebugbar-fa-paypal:before{content:"\f1ed"}.phpdebugbar-fa-google-wallet:before{content:"\f1ee"}.phpdebugbar-fa-cc-visa:before{content:"\f1f0"}.phpdebugbar-fa-cc-mastercard:before{content:"\f1f1"}.phpdebugbar-fa-cc-discover:before{content:"\f1f2"}.phpdebugbar-fa-cc-amex:before{content:"\f1f3"}.phpdebugbar-fa-cc-paypal:before{content:"\f1f4"}.phpdebugbar-fa-cc-stripe:before{content:"\f1f5"}.phpdebugbar-fa-bell-slash:before{content:"\f1f6"}.phpdebugbar-fa-bell-slash-o:before{content:"\f1f7"}.phpdebugbar-fa-trash:before{content:"\f1f8"}.phpdebugbar-fa-copyright:before{content:"\f1f9"}.phpdebugbar-fa-at:before{content:"\f1fa"}.phpdebugbar-fa-eyedropper:before{content:"\f1fb"}.phpdebugbar-fa-paint-brush:before{content:"\f1fc"}.phpdebugbar-fa-birthday-cake:before{content:"\f1fd"}.phpdebugbar-fa-area-chart:before{content:"\f1fe"}.phpdebugbar-fa-pie-chart:before{content:"\f200"}.phpdebugbar-fa-line-chart:before{content:"\f201"}.phpdebugbar-fa-lastfm:before{content:"\f202"}.phpdebugbar-fa-lastfm-square:before{content:"\f203"}.phpdebugbar-fa-toggle-off:before{content:"\f204"}.phpdebugbar-fa-toggle-on:before{content:"\f205"}.phpdebugbar-fa-bicycle:before{content:"\f206"}.phpdebugbar-fa-bus:before{content:"\f207"}.phpdebugbar-fa-ioxhost:before{content:"\f208"}.phpdebugbar-fa-angellist:before{content:"\f209"}.phpdebugbar-fa-cc:before{content:"\f20a"}.phpdebugbar-fa-shekel:before,.phpdebugbar-fa-sheqel:before,.phpdebugbar-fa-ils:before{content:"\f20b"}.phpdebugbar-fa-meanpath:before{content:"\f20c"}.phpdebugbar-fa-buysellads:before{content:"\f20d"}.phpdebugbar-fa-connectdevelop:before{content:"\f20e"}.phpdebugbar-fa-dashcube:before{content:"\f210"}.phpdebugbar-fa-forumbee:before{content:"\f211"}.phpdebugbar-fa-leanpub:before{content:"\f212"}.phpdebugbar-fa-sellsy:before{content:"\f213"}.phpdebugbar-fa-shirtsinbulk:before{content:"\f214"}.phpdebugbar-fa-simplybuilt:before{content:"\f215"}.phpdebugbar-fa-skyatlas:before{content:"\f216"}.phpdebugbar-fa-cart-plus:before{content:"\f217"}.phpdebugbar-fa-cart-arrow-down:before{content:"\f218"}.phpdebugbar-fa-diamond:before{content:"\f219"}.phpdebugbar-fa-ship:before{content:"\f21a"}.phpdebugbar-fa-user-secret:before{content:"\f21b"}.phpdebugbar-fa-motorcycle:before{content:"\f21c"}.phpdebugbar-fa-street-view:before{content:"\f21d"}.phpdebugbar-fa-heartbeat:before{content:"\f21e"}.phpdebugbar-fa-venus:before{content:"\f221"}.phpdebugbar-fa-mars:before{content:"\f222"}.phpdebugbar-fa-mercury:before{content:"\f223"}.phpdebugbar-fa-intersex:before,.phpdebugbar-fa-transgender:before{content:"\f224"}.phpdebugbar-fa-transgender-alt:before{content:"\f225"}.phpdebugbar-fa-venus-double:before{content:"\f226"}.phpdebugbar-fa-mars-double:before{content:"\f227"}.phpdebugbar-fa-venus-mars:before{content:"\f228"}.phpdebugbar-fa-mars-stroke:before{content:"\f229"}.phpdebugbar-fa-mars-stroke-v:before{content:"\f22a"}.phpdebugbar-fa-mars-stroke-h:before{content:"\f22b"}.phpdebugbar-fa-neuter:before{content:"\f22c"}.phpdebugbar-fa-genderless:before{content:"\f22d"}.phpdebugbar-fa-facebook-official:before{content:"\f230"}.phpdebugbar-fa-pinterest-p:before{content:"\f231"}.phpdebugbar-fa-whatsapp:before{content:"\f232"}.phpdebugbar-fa-server:before{content:"\f233"}.phpdebugbar-fa-user-plus:before{content:"\f234"}.phpdebugbar-fa-user-times:before{content:"\f235"}.phpdebugbar-fa-hotel:before,.phpdebugbar-fa-bed:before{content:"\f236"}.phpdebugbar-fa-viacoin:before{content:"\f237"}.phpdebugbar-fa-train:before{content:"\f238"}.phpdebugbar-fa-subway:before{content:"\f239"}.phpdebugbar-fa-medium:before{content:"\f23a"}.phpdebugbar-fa-yc:before,.phpdebugbar-fa-y-combinator:before{content:"\f23b"}.phpdebugbar-fa-optin-monster:before{content:"\f23c"}.phpdebugbar-fa-opencart:before{content:"\f23d"}.phpdebugbar-fa-expeditedssl:before{content:"\f23e"}.phpdebugbar-fa-battery-4:before,.phpdebugbar-fa-battery:before,.phpdebugbar-fa-battery-full:before{content:"\f240"}.phpdebugbar-fa-battery-3:before,.phpdebugbar-fa-battery-three-quarters:before{content:"\f241"}.phpdebugbar-fa-battery-2:before,.phpdebugbar-fa-battery-half:before{content:"\f242"}.phpdebugbar-fa-battery-1:before,.phpdebugbar-fa-battery-quarter:before{content:"\f243"}.phpdebugbar-fa-battery-0:before,.phpdebugbar-fa-battery-empty:before{content:"\f244"}.phpdebugbar-fa-mouse-pointer:before{content:"\f245"}.phpdebugbar-fa-i-cursor:before{content:"\f246"}.phpdebugbar-fa-object-group:before{content:"\f247"}.phpdebugbar-fa-object-ungroup:before{content:"\f248"}.phpdebugbar-fa-sticky-note:before{content:"\f249"}.phpdebugbar-fa-sticky-note-o:before{content:"\f24a"}.phpdebugbar-fa-cc-jcb:before{content:"\f24b"}.phpdebugbar-fa-cc-diners-club:before{content:"\f24c"}.phpdebugbar-fa-clone:before{content:"\f24d"}.phpdebugbar-fa-balance-scale:before{content:"\f24e"}.phpdebugbar-fa-hourglass-o:before{content:"\f250"}.phpdebugbar-fa-hourglass-1:before,.phpdebugbar-fa-hourglass-start:before{content:"\f251"}.phpdebugbar-fa-hourglass-2:before,.phpdebugbar-fa-hourglass-half:before{content:"\f252"}.phpdebugbar-fa-hourglass-3:before,.phpdebugbar-fa-hourglass-end:before{content:"\f253"}.phpdebugbar-fa-hourglass:before{content:"\f254"}.phpdebugbar-fa-hand-grab-o:before,.phpdebugbar-fa-hand-rock-o:before{content:"\f255"}.phpdebugbar-fa-hand-stop-o:before,.phpdebugbar-fa-hand-paper-o:before{content:"\f256"}.phpdebugbar-fa-hand-scissors-o:before{content:"\f257"}.phpdebugbar-fa-hand-lizard-o:before{content:"\f258"}.phpdebugbar-fa-hand-spock-o:before{content:"\f259"}.phpdebugbar-fa-hand-pointer-o:before{content:"\f25a"}.phpdebugbar-fa-hand-peace-o:before{content:"\f25b"}.phpdebugbar-fa-trademark:before{content:"\f25c"}.phpdebugbar-fa-registered:before{content:"\f25d"}.phpdebugbar-fa-creative-commons:before{content:"\f25e"}.phpdebugbar-fa-gg:before{content:"\f260"}.phpdebugbar-fa-gg-circle:before{content:"\f261"}.phpdebugbar-fa-tripadvisor:before{content:"\f262"}.phpdebugbar-fa-odnoklassniki:before{content:"\f263"}.phpdebugbar-fa-odnoklassniki-square:before{content:"\f264"}.phpdebugbar-fa-get-pocket:before{content:"\f265"}.phpdebugbar-fa-wikipedia-w:before{content:"\f266"}.phpdebugbar-fa-safari:before{content:"\f267"}.phpdebugbar-fa-chrome:before{content:"\f268"}.phpdebugbar-fa-firefox:before{content:"\f269"}.phpdebugbar-fa-opera:before{content:"\f26a"}.phpdebugbar-fa-internet-explorer:before{content:"\f26b"}.phpdebugbar-fa-tv:before,.phpdebugbar-fa-television:before{content:"\f26c"}.phpdebugbar-fa-contao:before{content:"\f26d"}.phpdebugbar-fa-500px:before{content:"\f26e"}.phpdebugbar-fa-amazon:before{content:"\f270"}.phpdebugbar-fa-calendar-plus-o:before{content:"\f271"}.phpdebugbar-fa-calendar-minus-o:before{content:"\f272"}.phpdebugbar-fa-calendar-times-o:before{content:"\f273"}.phpdebugbar-fa-calendar-check-o:before{content:"\f274"}.phpdebugbar-fa-industry:before{content:"\f275"}.phpdebugbar-fa-map-pin:before{content:"\f276"}.phpdebugbar-fa-map-signs:before{content:"\f277"}.phpdebugbar-fa-map-o:before{content:"\f278"}.phpdebugbar-fa-map:before{content:"\f279"}.phpdebugbar-fa-commenting:before{content:"\f27a"}.phpdebugbar-fa-commenting-o:before{content:"\f27b"}.phpdebugbar-fa-houzz:before{content:"\f27c"}.phpdebugbar-fa-vimeo:before{content:"\f27d"}.phpdebugbar-fa-black-tie:before{content:"\f27e"}.phpdebugbar-fa-fonticons:before{content:"\f280"}.phpdebugbar-fa-reddit-alien:before{content:"\f281"}.phpdebugbar-fa-edge:before{content:"\f282"}.phpdebugbar-fa-credit-card-alt:before{content:"\f283"}.phpdebugbar-fa-codiepie:before{content:"\f284"}.phpdebugbar-fa-modx:before{content:"\f285"}.phpdebugbar-fa-fort-awesome:before{content:"\f286"}.phpdebugbar-fa-usb:before{content:"\f287"}.phpdebugbar-fa-product-hunt:before{content:"\f288"}.phpdebugbar-fa-mixcloud:before{content:"\f289"}.phpdebugbar-fa-scribd:before{content:"\f28a"}.phpdebugbar-fa-pause-circle:before{content:"\f28b"}.phpdebugbar-fa-pause-circle-o:before{content:"\f28c"}.phpdebugbar-fa-stop-circle:before{content:"\f28d"}.phpdebugbar-fa-stop-circle-o:before{content:"\f28e"}.phpdebugbar-fa-shopping-bag:before{content:"\f290"}.phpdebugbar-fa-shopping-basket:before{content:"\f291"}.phpdebugbar-fa-hashtag:before{content:"\f292"}.phpdebugbar-fa-bluetooth:before{content:"\f293"}.phpdebugbar-fa-bluetooth-b:before{content:"\f294"}.phpdebugbar-fa-percent:before{content:"\f295"}.phpdebugbar-fa-gitlab:before{content:"\f296"}.phpdebugbar-fa-wpbeginner:before{content:"\f297"}.phpdebugbar-fa-wpforms:before{content:"\f298"}.phpdebugbar-fa-envira:before{content:"\f299"}.phpdebugbar-fa-universal-access:before{content:"\f29a"}.phpdebugbar-fa-wheelchair-alt:before{content:"\f29b"}.phpdebugbar-fa-question-circle-o:before{content:"\f29c"}.phpdebugbar-fa-blind:before{content:"\f29d"}.phpdebugbar-fa-audio-description:before{content:"\f29e"}.phpdebugbar-fa-volume-control-phone:before{content:"\f2a0"}.phpdebugbar-fa-braille:before{content:"\f2a1"}.phpdebugbar-fa-assistive-listening-systems:before{content:"\f2a2"}.phpdebugbar-fa-asl-interpreting:before,.phpdebugbar-fa-american-sign-language-interpreting:before{content:"\f2a3"}.phpdebugbar-fa-deafness:before,.phpdebugbar-fa-hard-of-hearing:before,.phpdebugbar-fa-deaf:before{content:"\f2a4"}.phpdebugbar-fa-glide:before{content:"\f2a5"}.phpdebugbar-fa-glide-g:before{content:"\f2a6"}.phpdebugbar-fa-signing:before,.phpdebugbar-fa-sign-language:before{content:"\f2a7"}.phpdebugbar-fa-low-vision:before{content:"\f2a8"}.phpdebugbar-fa-viadeo:before{content:"\f2a9"}.phpdebugbar-fa-viadeo-square:before{content:"\f2aa"}.phpdebugbar-fa-snapchat:before{content:"\f2ab"}.phpdebugbar-fa-snapchat-ghost:before{content:"\f2ac"}.phpdebugbar-fa-snapchat-square:before{content:"\f2ad"}.phpdebugbar-fa-pied-piper:before{content:"\f2ae"}.phpdebugbar-fa-first-order:before{content:"\f2b0"}.phpdebugbar-fa-yoast:before{content:"\f2b1"}.phpdebugbar-fa-themeisle:before{content:"\f2b2"}.phpdebugbar-fa-google-plus-circle:before,.phpdebugbar-fa-google-plus-official:before{content:"\f2b3"}.phpdebugbar-fa-fa:before,.phpdebugbar-fa-font-awesome:before{content:"\f2b4"}.phpdebugbar-fa-handshake-o:before{content:"\f2b5"}.phpdebugbar-fa-envelope-open:before{content:"\f2b6"}.phpdebugbar-fa-envelope-open-o:before{content:"\f2b7"}.phpdebugbar-fa-linode:before{content:"\f2b8"}.phpdebugbar-fa-address-book:before{content:"\f2b9"}.phpdebugbar-fa-address-book-o:before{content:"\f2ba"}.phpdebugbar-fa-vcard:before,.phpdebugbar-fa-address-card:before{content:"\f2bb"}.phpdebugbar-fa-vcard-o:before,.phpdebugbar-fa-address-card-o:before{content:"\f2bc"}.phpdebugbar-fa-user-circle:before{content:"\f2bd"}.phpdebugbar-fa-user-circle-o:before{content:"\f2be"}.phpdebugbar-fa-user-o:before{content:"\f2c0"}.phpdebugbar-fa-id-badge:before{content:"\f2c1"}.phpdebugbar-fa-drivers-license:before,.phpdebugbar-fa-id-card:before{content:"\f2c2"}.phpdebugbar-fa-drivers-license-o:before,.phpdebugbar-fa-id-card-o:before{content:"\f2c3"}.phpdebugbar-fa-quora:before{content:"\f2c4"}.phpdebugbar-fa-free-code-camp:before{content:"\f2c5"}.phpdebugbar-fa-telegram:before{content:"\f2c6"}.phpdebugbar-fa-thermometer-4:before,.phpdebugbar-fa-thermometer:before,.phpdebugbar-fa-thermometer-full:before{content:"\f2c7"}.phpdebugbar-fa-thermometer-3:before,.phpdebugbar-fa-thermometer-three-quarters:before{content:"\f2c8"}.phpdebugbar-fa-thermometer-2:before,.phpdebugbar-fa-thermometer-half:before{content:"\f2c9"}.phpdebugbar-fa-thermometer-1:before,.phpdebugbar-fa-thermometer-quarter:before{content:"\f2ca"}.phpdebugbar-fa-thermometer-0:before,.phpdebugbar-fa-thermometer-empty:before{content:"\f2cb"}.phpdebugbar-fa-shower:before{content:"\f2cc"}.phpdebugbar-fa-bathtub:before,.phpdebugbar-fa-s15:before,.phpdebugbar-fa-bath:before{content:"\f2cd"}.phpdebugbar-fa-podcast:before{content:"\f2ce"}.phpdebugbar-fa-window-maximize:before{content:"\f2d0"}.phpdebugbar-fa-window-minimize:before{content:"\f2d1"}.phpdebugbar-fa-window-restore:before{content:"\f2d2"}.phpdebugbar-fa-times-rectangle:before,.phpdebugbar-fa-window-close:before{content:"\f2d3"}.phpdebugbar-fa-times-rectangle-o:before,.phpdebugbar-fa-window-close-o:before{content:"\f2d4"}.phpdebugbar-fa-bandcamp:before{content:"\f2d5"}.phpdebugbar-fa-grav:before{content:"\f2d6"}.phpdebugbar-fa-etsy:before{content:"\f2d7"}.phpdebugbar-fa-imdb:before{content:"\f2d8"}.phpdebugbar-fa-ravelry:before{content:"\f2d9"}.phpdebugbar-fa-eercast:before{content:"\f2da"}.phpdebugbar-fa-microchip:before{content:"\f2db"}.phpdebugbar-fa-snowflake-o:before{content:"\f2dc"}.phpdebugbar-fa-superpowers:before{content:"\f2dd"}.phpdebugbar-fa-wpexplorer:before{content:"\f2de"}.phpdebugbar-fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf
new file mode 100644
index 00000000000..401ec0f36e4
Binary files /dev/null and b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf differ
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot
new file mode 100644
index 00000000000..e9f60ca953f
Binary files /dev/null and b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot differ
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg
new file mode 100644
index 00000000000..855c845e538
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg
@@ -0,0 +1,2671 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg>
+<metadata>
+Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
+ By ,,,
+Copyright Dave Gandy 2016. All rights reserved.
+</metadata>
+<defs>
+<font id="FontAwesome" horiz-adv-x="1536" >
+  <font-face 
+    font-family="FontAwesome"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="1792"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="1536"
+    descent="-256"
+    bbox="-1.02083 -256.962 2304.6 1537.02"
+    underline-thickness="0"
+    underline-position="0"
+    unicode-range="U+0020-F500"
+  />
+<missing-glyph horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".notdef" horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
+ />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
+ />
+    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792" 
+d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+    <glyph glyph-name="music" unicode="&#xf001;" 
+d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
+t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664" 
+d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
+t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792" 
+d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
+t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z
+M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792" 
+d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
+q-18 -18 -44 -18z" />
+    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664" 
+d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
+l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
+d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
+l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
+d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
+t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 
+d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
+q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45
+t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128
+q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19
+t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664" 
+d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
+h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792" 
+d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+    <glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408" 
+d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
+t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+    <glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
+q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5
+t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
+M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z
+" />
+    <glyph glyph-name="off" unicode="&#xf011;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
+t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
+    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792" 
+d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="cog" unicode="&#xf013;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
+q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13
+l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22
+q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
+    <glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408" 
+d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832
+q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664" 
+d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
+l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+    <glyph glyph-name="file_alt" unicode="&#xf016;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+" />
+    <glyph glyph-name="time" unicode="&#xf017;" 
+d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920" 
+d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
+q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
+    <glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664" 
+d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
+q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
+    <glyph glyph-name="download" unicode="&#xf01a;" 
+d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
+t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="upload" unicode="&#xf01b;" 
+d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
+t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="inbox" unicode="&#xf01c;" 
+d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
+q25 -61 25 -123z" />
+    <glyph glyph-name="play_circle" unicode="&#xf01d;" 
+d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="repeat" unicode="&#xf01e;" 
+d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
+l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+    <glyph glyph-name="refresh" unicode="&#xf021;" 
+d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
+q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5
+q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792" 
+d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z
+M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5
+t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152" 
+d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792" 
+d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
+t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664" 
+d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
+t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5
+t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
+    <glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+    <glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5
+t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289
+t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
+    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408" 
+d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
+M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+    <glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792" 
+d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
+M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+    <glyph glyph-name="tag" unicode="&#xf02b;" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664" 
+d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
+q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906
+q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5
+t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
+    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280" 
+d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664" 
+d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
+v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+    <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
+d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
+q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664" 
+d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
+q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -5 -0.5 -13.5t-0.5 -12.5q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5
+q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
+    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408" 
+d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
+q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5
+t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68 -0.5t68 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5
+t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
+    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
+d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
+q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
+    <glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792" 
+d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
+t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5
+q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
+    <glyph glyph-name="text_width" unicode="&#xf035;" 
+d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
+t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5
+t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49
+t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
+    <glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
+h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792" 
+d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
+t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344
+q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192
+q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792" 
+d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792" 
+d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792" 
+d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
+q39 -17 39 -59z" />
+    <glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920" 
+d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
+q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="pencil" unicode="&#xf040;" 
+d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
+q53 0 91 -38l235 -234q37 -39 37 -91z" />
+    <glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024" 
+d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+    <glyph glyph-name="adjust" unicode="&#xf042;" 
+d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024" 
+d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
+q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792" 
+d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92
+l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
+    <glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664" 
+d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
+q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5
+t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664" 
+d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
+q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110
+q24 -24 24 -57t-24 -57z" />
+    <glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
+t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024" 
+d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z" />
+    <glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792" 
+d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
+q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
+d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408" 
+d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+    <glyph glyph-name="pause" unicode="&#xf04c;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="stop" unicode="&#xf04d;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
+q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
+    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538" 
+d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+    <glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280" 
+d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280" 
+d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="plus_sign" unicode="&#xf055;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
+t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="minus_sign" unicode="&#xf056;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="remove_sign" unicode="&#xf057;" 
+d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
+q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_sign" unicode="&#xf058;" 
+d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="question_sign" unicode="&#xf059;" 
+d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
+q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="info_sign" unicode="&#xf05a;" 
+d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
+t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="screenshot" unicode="&#xf05b;" 
+d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
+q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143
+q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="remove_circle" unicode="&#xf05c;" 
+d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5
+t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_circle" unicode="&#xf05d;" 
+d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
+t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ban_circle" unicode="&#xf05e;" 
+d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
+t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+    <glyph glyph-name="arrow_left" unicode="&#xf060;" 
+d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
+t32.5 -90.5z" />
+    <glyph glyph-name="arrow_right" unicode="&#xf061;" 
+d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+    <glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664" 
+d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
+q37 -39 37 -91z" />
+    <glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664" 
+d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+    <glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792" 
+d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
+t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+    <glyph glyph-name="resize_full" unicode="&#xf065;" 
+d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
+q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="resize_small" unicode="&#xf066;" 
+d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
+t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664" 
+d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
+q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+    <glyph glyph-name="exclamation_sign" unicode="&#xf06a;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
+q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+    <glyph glyph-name="gift" unicode="&#xf06b;" 
+d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
+q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5
+t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792" 
+d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
+q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-43 0 -63.5 17.5t-45.5 59.5q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5
+t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
+    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408" 
+d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
+q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
+    <glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792" 
+d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
+t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
+    <glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792" 
+d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
+q-106 -189 -316 -567t-315 -566l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5
+q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z
+" />
+    <glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792" 
+d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
+q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408" 
+d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
+q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+    <glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664" 
+d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
+M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64
+q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47
+h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792" 
+d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
+t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5
+v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111
+t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792" 
+d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
+q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="magnet" unicode="&#xf076;" 
+d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
+q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792" 
+d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792" 
+d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
+d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
+zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z
+" />
+    <glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664" 
+d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
+t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664" 
+d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920" 
+d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
+t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768" 
+d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048" 
+d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
+    <glyph glyph-name="twitter_sign" unicode="&#xf081;" 
+d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
+q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5
+t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="facebook_sign" unicode="&#xf082;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792" 
+d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
+t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280
+q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792" 
+d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
+l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5
+t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
+    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920" 
+d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -11 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5
+l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7
+l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -8 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31
+q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20
+t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68
+q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70
+q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
+    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792" 
+d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
+q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7
+q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
+    <glyph glyph-name="thumbs_up_alt" unicode="&#xf087;" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
+t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769
+q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128
+q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="thumbs_down_alt" unicode="&#xf088;" 
+d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
+t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z
+M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5
+h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z" />
+    <glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896" 
+d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+    <glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792" 
+d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
+q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5
+q224 0 351 -124t127 -344z" />
+    <glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664" 
+d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
+q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
+    <glyph glyph-name="linkedin_sign" unicode="&#xf08c;" 
+d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
+q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152" 
+d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
+t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+    <glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792" 
+d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="signin" unicode="&#xf090;" 
+d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
+q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664" 
+d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
+t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96
+q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="github_sign" unicode="&#xf092;" 
+d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
+q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
+t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
+q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664" 
+d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
+t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
+    <glyph glyph-name="lemon" unicode="&#xf094;" 
+d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
+q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44
+q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5
+q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
+    <glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408" 
+d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
+q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174q2 -1 19 -11.5t24 -14
+t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
+    <glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408" 
+d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280" 
+d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
+q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="phone_sign" unicode="&#xf098;" 
+d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
+t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5
+t320.5 -216.5q6 -2 30 -11t33 -12.5t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z
+" />
+    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664" 
+d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
+q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024" 
+d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
+    <glyph glyph-name="github" unicode="&#xf09b;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
+q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5
+t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
+q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
+M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
+    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664" 
+d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
+t316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920" 
+d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
+q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408" 
+d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
+t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294
+q187 -186 294 -425.5t120 -501.5z" />
+    <glyph glyph-name="hdd" unicode="&#xf0a0;" 
+d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
+h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75
+l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
+    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792" 
+d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
+t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+    <glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
+M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5
+t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
+d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
+l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70
+l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
+    <glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
+q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43
+q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5
+t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
+d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
+t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45z
+M1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128q0 122 81.5 189t206.5 67
+q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="hand_up" unicode="&#xf0a6;" 
+d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
+q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5
+t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76
+q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
+    <glyph glyph-name="hand_down" unicode="&#xf0a7;" 
+d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
+t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580
+q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100
+q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
+    <glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;" 
+d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;" 
+d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;" 
+d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="globe" unicode="&#xf0ac;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
+q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 11t-9.5 10q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5
+q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5
+q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5
+t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-4 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3
+q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25
+q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5
+t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5
+t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10.5t17 -19.5q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21
+q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5
+q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3
+q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5
+t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q8 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5
+q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7
+q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
+    <glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664" 
+d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
+t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+    <glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792" 
+d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
+t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408" 
+d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+    <glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792" 
+d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
+t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="fullscreen" unicode="&#xf0b2;" 
+d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
+l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z
+" />
+    <glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920" 
+d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75
+t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5
+t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
+    <glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664" 
+d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
+l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15
+t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207
+q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
+    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920" 
+d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
+" />
+    <glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664" 
+d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792" 
+d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
+q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148
+q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108
+q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6
+q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
+    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792" 
+d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
+h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+    <glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408" 
+d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
+l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235
+z" />
+    <glyph glyph-name="save" unicode="&#xf0c7;" 
+d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
+h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="sign_blank" unicode="&#xf0c8;" 
+d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="reorder" unicode="&#xf0c9;" 
+d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
+t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792" 
+d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z
+M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792" 
+d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
+q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5
+t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
+q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792" 
+d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
+l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -56 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23
+l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
+    <glyph glyph-name="underline" unicode="&#xf0cd;" 
+d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
+q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41
+q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472
+q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
+    <glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664" 
+d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
+v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192
+q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192
+q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113
+z" />
+    <glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664" 
+d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
+l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792" 
+d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
+t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38
+t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="pinterest" unicode="&#xf0d2;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
+q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33
+q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="pinterest_sign" unicode="&#xf0d3;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
+t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5
+t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="google_plus_sign" unicode="&#xf0d4;" 
+d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
+h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
+d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
+q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
+    <glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920" 
+d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
+v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024" 
+d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640" 
+d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640" 
+d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664" 
+d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792" 
+d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
+q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
+    <glyph glyph-name="linkedin" unicode="&#xf0e1;" 
+d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
+q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+    <glyph glyph-name="undo" unicode="&#xf0e2;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
+    <glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792" 
+d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
+t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14
+q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28
+q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
+    <glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792" 
+d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
+t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5
+t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29
+q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792" 
+d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
+q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5
+t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792" 
+d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
+t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5
+t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129
+q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
+    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896" 
+d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792" 
+d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664" 
+d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
+q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69
+q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
+    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792" 
+d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
+h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024" 
+d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
+q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47
+q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5
+t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
+    <glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792" 
+d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
+q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920" 
+d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920" 
+d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408" 
+d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
+t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68
+t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
+t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252
+t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792" 
+d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
+t66 -158z" />
+    <glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
+t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920" 
+d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
+t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408" 
+d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
+t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="file_text_alt" unicode="&#xf0f6;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704
+q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
+    <glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5
+t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320
+v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920" 
+d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152
+q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792" 
+d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
+q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920" 
+d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
+q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z" />
+    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664" 
+d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+    <glyph glyph-name="h_sign" unicode="&#xf0fd;" 
+d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="f0fe" unicode="&#xf0fe;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024" 
+d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
+l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152" 
+d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
+q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152" 
+d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640" 
+d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152" 
+d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152" 
+d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920" 
+d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
+t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920" 
+d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
+M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152" 
+d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
+q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768" 
+d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
+q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="circle_blank" unicode="&#xf10c;" 
+d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
+t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664" 
+d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
+M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664" 
+d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
+v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792" 
+d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z
+M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5
+q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="circle" unicode="&#xf111;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792" 
+d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
+l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+    <glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664" 
+d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
+q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86
+t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218
+q0 -87 -27 -168q136 -160 136 -398z" />
+    <glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664" 
+d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
+q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920" 
+d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
+v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z
+" />
+    <glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="smile" unicode="&#xf118;" 
+d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5
+t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="frown" unicode="&#xf119;" 
+d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204
+t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="meh" unicode="&#xf11a;" 
+d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920" 
+d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150
+t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
+    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920" 
+d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
+h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16
+h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96
+q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896
+h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792" 
+d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
+h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102
+q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792" 
+d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
+q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266
+q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8
+q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664" 
+d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920" 
+d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
+l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
+    <glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792" 
+d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
+q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
+    <glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664" 
+d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
+l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+    <glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408" 
+d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+    <glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664" 
+d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024" 
+d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
+q-2 -287 -226 -414q-67 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497
+q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
+d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
+q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18
+l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9
+t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024" 
+d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
+t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
+    <glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640" 
+d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
+q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640" 
+d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+    <glyph glyph-name="superscript" unicode="&#xf12b;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1534 846v-206h-514l-3 27q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5
+t-65.5 -51.5t-30.5 -63h232v80h126z" />
+    <glyph glyph-name="subscript" unicode="&#xf12c;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1536 -50v-206h-514l-4 27q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73
+h232v80h126z" />
+    <glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920" 
+d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+    <glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664" 
+d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
+t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89
+q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117
+q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
+    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152" 
+d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
+t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+    <glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408" 
+d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
+q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23
+t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
+    <glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280" 
+d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
+t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664" 
+d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408" 
+d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
+q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113
+q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
+    <glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664" 
+d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
+q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792" 
+d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+    <glyph glyph-name="chevron_sign_left" unicode="&#xf137;" 
+d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_right" unicode="&#xf138;" 
+d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_up" unicode="&#xf139;" 
+d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_down" unicode="&#xf13a;" 
+d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408" 
+d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792" 
+d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792" 
+d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
+q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19
+t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152" 
+d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
+v-320h736z" />
+    <glyph glyph-name="bullseye" unicode="&#xf140;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
+t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408" 
+d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384" 
+d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="_303" unicode="&#xf143;" 
+d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
+q13 0 23 10t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="play_sign" unicode="&#xf144;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
+q16 -8 32 -8q17 0 32 9z" />
+    <glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792" 
+d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
+t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+    <glyph glyph-name="minus_sign_alt" unicode="&#xf146;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
+t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024" 
+d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+    <glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024" 
+d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+    <glyph glyph-name="check_sign" unicode="&#xf14a;" 
+d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
+t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="edit_sign" unicode="&#xf14b;" 
+d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_312" unicode="&#xf14c;" 
+d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
+q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="share_sign" unicode="&#xf14d;" 
+d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
+t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="compass" unicode="&#xf14e;" 
+d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="collapse" unicode="&#xf150;" 
+d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="collapse_top" unicode="&#xf151;" 
+d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_317" unicode="&#xf152;" 
+d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024" 
+d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
+t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26
+l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
+    <glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024" 
+d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
+q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+    <glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024" 
+d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
+t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5
+t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50
+t53 -63.5t31.5 -76.5t13 -94z" />
+    <glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898" 
+d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
+q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027" 
+d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
+l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+    <glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280" 
+d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
+q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+    <glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792" 
+d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
+t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28
+q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280" 
+d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
+l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30
+t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
+    <glyph glyph-name="file" unicode="&#xf15b;" 
+d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
+    <glyph glyph-name="file_text" unicode="&#xf15c;" 
+d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
+    <glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664" 
+d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
+v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162
+l230 -662h70z" />
+    <glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664" 
+d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
+v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248
+v119h121z" />
+    <glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792" 
+d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
+q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792" 
+d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
+q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_order" unicode="&#xf162;" 
+d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
+zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5
+t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
+    <glyph glyph-name="sort_by_order_alt" unicode="&#xf163;" 
+d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
+t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13
+q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
+    <glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664" 
+d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
+q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5
+t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
+    <glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664" 
+d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
+t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121
+t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
+    <glyph glyph-name="youtube_sign" unicode="&#xf166;" 
+d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
+q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38
+q21 -29 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5
+q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
+q-51 0 -78 -38q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5
+h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube" unicode="&#xf167;" 
+d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
+q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51
+q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99
+q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-38 -51 -106 -51q-67 0 -105 51
+q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
+    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408" 
+d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
+q25 45 64 45h241q22 0 31 -15z" />
+    <glyph glyph-name="xing_sign" unicode="&#xf169;" 
+d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
+l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
+d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
+l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
+q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
+    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792" 
+d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+    <glyph glyph-name="stackexchange" unicode="&#xf16c;" 
+d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
+    <glyph glyph-name="instagram" unicode="&#xf16d;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
+q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
+t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
+q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
+    <glyph glyph-name="flickr" unicode="&#xf16e;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
+t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+    <glyph glyph-name="adn" unicode="&#xf170;" 
+d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408" 
+d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
+t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18
+t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5
+t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
+    <glyph glyph-name="bitbucket_sign" unicode="&#xf172;" 
+d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
+t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z
+M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024" 
+d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
+q78 2 134 29z" />
+    <glyph glyph-name="tumblr_sign" unicode="&#xf174;" 
+d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768" 
+d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+    <glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768" 
+d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+    <glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792" 
+d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792" 
+d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408" 
+d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
+q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
+    <glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
+d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408" 
+d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
+t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5
+h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
+    <glyph glyph-name="linux" unicode="&#xf17c;" 
+d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
+M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7
+q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15
+q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5
+t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19
+q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63
+q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18q-2 -1 -4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92
+q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152
+q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-6 0 -8 -2t0 -4
+t5 -3q14 -4 18 -31q0 -3 8 2q2 2 2 3zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5
+t-30 -18.5t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43
+q-19 4 -51 9.5t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49
+t-14 -48q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54
+q110 143 124 195q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5
+t-40.5 -33.5t-61 -14q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5
+t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+    <glyph glyph-name="dribble" unicode="&#xf17d;" 
+d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
+t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19
+q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -5 6.5 -17t7.5 -17q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6
+t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="skype" unicode="&#xf17e;" 
+d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
+t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5
+q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80
+q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
+    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280" 
+d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
+M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324
+l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
+    <glyph glyph-name="trello" unicode="&#xf181;" 
+d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
+q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280" 
+d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
+q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024" 
+d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
+M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="gittip" unicode="&#xf184;" 
+d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792" 
+d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
+l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94
+q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
+    <glyph glyph-name="_366" unicode="&#xf186;" 
+d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
+t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+    <glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792" 
+d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
+q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664" 
+d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
+q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19
+t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
+    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
+d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
+t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6
+q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q16 19 38 30q53 26 239 24
+q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2
+q39 5 64 -2.5t31 -16.5z" />
+    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792" 
+d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
+q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422
+q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178
+q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z
+M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
+    <glyph glyph-name="renren" unicode="&#xf18b;" 
+d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
+q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+    <glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408" 
+d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
+t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56
+t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -4 1 -50t-1 -72q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5
+t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
+    <glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280" 
+d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
+" />
+    <glyph glyph-name="_374" unicode="&#xf18e;" 
+d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;" 
+d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_376" unicode="&#xf191;" 
+d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="dot_circle_alt" unicode="&#xf192;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
+t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664" 
+d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
+q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+    <glyph glyph-name="vimeo_square" unicode="&#xf194;" 
+d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
+q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152" 
+d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
+q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
+q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176" 
+d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
+t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29
+q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
+    <glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664" 
+d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
+q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102
+t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
+    <glyph glyph-name="_384" unicode="&#xf199;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
+q-47 32 -142 92.5t-142 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13
+t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
+    <glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792" 
+d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
+t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21
+t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286
+t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273
+t273 -182.5t331.5 -68z" />
+    <glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792" 
+d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
+    <glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048" 
+d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
+q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
+    <glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304" 
+d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
+q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
+    <glyph glyph-name="_389" unicode="&#xf19e;" 
+d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
+q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
+    <glyph glyph-name="uniF1A0" unicode="&#xf1a0;" 
+d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
+t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
+    <glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792" 
+d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
+t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37
+q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191
+t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_392" unicode="&#xf1a2;" 
+d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
+q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83
+q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_393" unicode="&#xf1a3;" 
+d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
+v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103
+t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920" 
+d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
+v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
+    <glyph glyph-name="_395" unicode="&#xf1a5;" 
+d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048" 
+d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
+v-369h123z" />
+    <glyph glyph-name="_397" unicode="&#xf1a7;" 
+d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
+v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038" 
+d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
+q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24
+q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33
+q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5
+t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43
+q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5
+t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13
+t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
+    <glyph glyph-name="_399" unicode="&#xf1a9;" 
+d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
+q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14
+q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14
+t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44
+q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
+    <glyph glyph-name="_400" unicode="&#xf1aa;" 
+d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
+M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5
+t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5
+q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126
+t135.5 51q85 0 145 -60.5t60 -145.5z" />
+    <glyph glyph-name="f1ab" unicode="&#xf1ab;" 
+d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
+q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28
+q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z
+M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11
+q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
+q20 0 20 -21v-418z" />
+    <glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792" 
+d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
+l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23
+t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128
+q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128
+q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
+    <glyph glyph-name="_403" unicode="&#xf1ad;" 
+d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
+t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9
+t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9
+t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
+    <glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280" 
+d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
+q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664" 
+d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
+q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819
+q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5
+t100.5 134t141.5 55.5z" />
+    <glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768" 
+d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
+    <glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792" 
+d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
+" />
+    <glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304" 
+d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
+t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-4 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70
+v-400l434 -186q36 -16 57 -48t21 -70z" />
+    <glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048" 
+d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
+q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204
+q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
+    <glyph glyph-name="_410" unicode="&#xf1b5;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
+t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217
+t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
+    <glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792" 
+d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
+q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89
+q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
+    <glyph glyph-name="_412" unicode="&#xf1b7;" 
+d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
+q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5
+q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z
+" />
+    <glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792" 
+d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
+l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5
+t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1
+q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
+    <glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048" 
+d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
+q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5
+l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048" 
+d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
+t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z
+M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
+    <glyph glyph-name="_416" unicode="&#xf1bb;" 
+d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
+q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
+    <glyph glyph-name="_417" unicode="&#xf1bc;" 
+d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
+q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37
+q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024" 
+d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
+    <glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304" 
+d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
+q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245
+q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785
+l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242
+q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236
+q0 -11 -8 -19t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786
+q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
+    <glyph glyph-name="uniF1C0" unicode="&#xf1c0;" 
+d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
+t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5
+t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
+    <glyph glyph-name="uniF1C1" unicode="&#xf1c1;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197
+q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8
+q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
+    <glyph glyph-name="_422" unicode="&#xf1c2;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
+t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
+    <glyph glyph-name="_423" unicode="&#xf1c3;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107
+h-290v-107h68l189 -272l-194 -283h-68z" />
+    <glyph glyph-name="_424" unicode="&#xf1c4;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
+    <glyph glyph-name="_425" unicode="&#xf1c5;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
+    <glyph glyph-name="_426" unicode="&#xf1c6;" 
+d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
+v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79
+q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
+    <glyph glyph-name="_427" unicode="&#xf1c7;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5
+q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
+    <glyph glyph-name="_428" unicode="&#xf1c8;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
+    <glyph glyph-name="_429" unicode="&#xf1c9;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243
+l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
+    <glyph glyph-name="_430" unicode="&#xf1ca;" 
+d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
+q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
+    <glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792" 
+d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
+q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
+    <glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048" 
+d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
+q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55
+t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z" />
+    <glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
+q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5
+t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
+    <glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
+d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
+t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
+    <glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792" 
+d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
+t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170
+t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136
+q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
+    <glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792" 
+d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
+l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162
+q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33
+q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5
+t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF1D2" unicode="&#xf1d2;" 
+d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
+q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392
+q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072
+q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792" 
+d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
+q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47
+q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171
+v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
+    <glyph glyph-name="_439" unicode="&#xf1d4;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280" 
+d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
+t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153
+t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
+    <glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792" 
+d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
+q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20
+t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5
+t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
+    <glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048" 
+d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
+q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5
+q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109
+q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
+    <glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
+    <glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
+l863 639l-478 -797z" />
+    <glyph glyph-name="_445" unicode="&#xf1da;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23
+t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_446" unicode="&#xf1db;" 
+d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792" 
+d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
+t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2
+t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160
+q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5
+q0 -26 -12 -48t-36 -22z" />
+    <glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280" 
+d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
+q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
+    <glyph glyph-name="_449" unicode="&#xf1de;" 
+d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
+q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
+    <glyph glyph-name="uniF1E0" unicode="&#xf1e0;" 
+d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
+t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
+    <glyph glyph-name="_451" unicode="&#xf1e1;" 
+d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
+t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792" 
+d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
+t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91
+q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9
+t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792" 
+d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
+l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
+    <glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792" 
+d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5
+t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
+    <glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792" 
+d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
+M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
+d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
+l401 400q38 37 91 37t90 -37z" />
+    <glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792" 
+d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
+t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z
+M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q4 -2 11.5 -7
+t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
+    <glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792" 
+d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
+    <glyph glyph-name="_459" unicode="&#xf1e9;" 
+d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
+q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q71 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5
+t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87
+q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
+    <glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048" 
+d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
+t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
+    <glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048" 
+d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
+q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z
+M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
+    <glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792" 
+d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5
+t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38
+h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_463" unicode="&#xf1ed;" 
+d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
+q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598
+q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
+    <glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
+d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
+q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
+    <glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304" 
+d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
+q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128
+q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
+d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
+q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
+M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
+h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
+q0 3 1 4q0 2 2 4l1 1q2 0 2 1q2 1 4 1q3 0 4 -1l4 -2l2 -4v-1q1 -2 1 -3l-1 -1v-3t-1 -1l-1 -2q-2 -2 -4 -2q-1 -1 -4 -1zM599 7h30v85q0 24 -14.5 38.5t-39.5 15.5q-32 0 -47 -24q-14 24 -45 24q-24 0 -39 -20v16h-30v-135h30v75q0 36 33 36q30 0 30 -36v-75h29v75
+q0 36 33 36q30 0 30 -36v-75zM765 7h29v68v67h-29v-16q-17 20 -43 20q-29 0 -48 -20t-19 -51t19 -51t48 -20q28 0 43 20v-17zM943 48q0 34 -47 40l-14 2q-23 4 -23 14q0 15 25 15q23 0 43 -11l12 24q-22 14 -55 14q-26 0 -41 -12t-15 -32q0 -33 47 -39l13 -2q24 -4 24 -14
+q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l-8 25q-13 -7 -26 -7q-19 0 -19 22v61h48v27h-48v41h-30v-41h-28v-27h28v-61q0 -50 47 -50q21 0 36 10zM1159 146q-29 0 -48 -20t-19 -51q0 -32 19.5 -51.5t49.5 -19.5q33 0 55 19l-14 22
+q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
+q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
+h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
+t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304" 
+d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
+q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604
+v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569
+q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73
+t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
+    <glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304" 
+d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
+M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260
+l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279
+v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040
+q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168
+q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5
+t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21
+h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5
+t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
+    <glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304" 
+d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
+t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76
+q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59
+t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489
+l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66
+q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304" 
+d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
+q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118
+q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151
+q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31
+q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048" 
+d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
+l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5
+l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048" 
+d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
+q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161
+q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408" 
+d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167
+q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_474" unicode="&#xf1f9;" 
+d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
+t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5
+t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_475" unicode="&#xf1fa;" 
+d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
+q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24
+t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61
+t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
+    <glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792" 
+d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
+t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
+    <glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792" 
+d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
+t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
+    <glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
+d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
+t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38
+t-58 27t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448
+h256v448h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5
+q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
+    <glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
+    <glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792" 
+d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792" 
+d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
+q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50
+t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1
+q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
+    <glyph glyph-name="_483" unicode="&#xf203;" 
+d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
+q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110
+q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048" 
+d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
+t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5
+t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
+    <glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048" 
+d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
+t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
+    <glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304" 
+d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
+q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469
+q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400
+q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="_487" unicode="&#xf207;" 
+d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
+h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
+    <glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048" 
+d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
+q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5
+q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
+    <glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280" 
+d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
+t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5
+t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14
+q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88
+q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5
+t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
+    <glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048" 
+d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
+q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307
+t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14
+t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
+    <glyph glyph-name="_491" unicode="&#xf20b;" 
+d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
+t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_492" unicode="&#xf20c;" 
+d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
+q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410
+q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
+    <glyph glyph-name="_493" unicode="&#xf20d;" 
+d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
+    <glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048" 
+d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
+q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5
+q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
+h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13zM552 226h402l64 66
+l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224l213 -225zM1023 946
+l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196l-48 -227l130 227h-82
+zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
+    <glyph glyph-name="f210" unicode="&#xf210;" 
+d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
+    <glyph glyph-name="_496" unicode="&#xf211;" 
+d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
+q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
+    <glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048" 
+d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
+q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25
+q209 0 374 -102q172 107 374 102z" />
+    <glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048" 
+d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
+q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284
+q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
+    <glyph glyph-name="_499" unicode="&#xf214;" 
+d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
+l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114
+v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z
+M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378
+v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51
+h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5
+t-43 -34t-16.5 -53.5z" />
+    <glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048" 
+d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
+q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
+    <glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048" 
+d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
+t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113
+t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5
+q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
+    <glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664" 
+d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048" 
+d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
+l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
+    <glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048" 
+d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83
+q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314
+v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
+    <glyph glyph-name="_506" unicode="&#xf21b;" 
+d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
+t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5
+q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31
+t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
+    <glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304" 
+d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
+t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105
+l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226
+t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
+    <glyph glyph-name="_508" unicode="&#xf21d;" 
+d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
+q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384
+q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5
+t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792" 
+d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
+q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124
+t127 -344z" />
+    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
+q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
+    <glyph glyph-name="_511" unicode="&#xf222;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
+q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280" 
+d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
+t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_513" unicode="&#xf224;" 
+d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792" 
+d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9
+t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792" 
+d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
+t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391
+q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391
+q0 -226 -154 -391q103 -57 218 -57z" />
+    <glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920" 
+d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
+q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9
+t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128
+q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
+    <glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048" 
+d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
+t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9
+t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5
+t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
+    <glyph glyph-name="_518" unicode="&#xf229;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
+t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280" 
+d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
+t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5
+t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048" 
+d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
+t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5
+t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280" 
+d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
+t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
+    <glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_525" unicode="&#xf230;" 
+d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
+    <glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280" 
+d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
+l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5
+q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
+    <glyph glyph-name="_527" unicode="&#xf232;" 
+d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
+t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233
+l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
+    <glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792" 
+d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
+q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
+    <glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
+t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
+    <glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
+q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69
+t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
+    <glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048" 
+d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
+q-26 0 -45 -19t-19 -45v-384h1152z" />
+    <glyph glyph-name="_532" unicode="&#xf237;" 
+d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
+    <glyph glyph-name="_533" unicode="&#xf238;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
+t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
+    <glyph glyph-name="_534" unicode="&#xf239;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
+t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
+    <glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
+d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
+q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
+    <glyph glyph-name="_536" unicode="&#xf23b;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
+    <glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296" 
+d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
+q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5
+q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42
+q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37
+q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5
+q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139
+q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 5 5 8q16 18 60 23h13q5 18 19 30t33 8
+t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132
+q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132
+q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z
+M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-105 2 -211 0v1q-1 -27 2.5 -86
+t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103
+q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34q0 2 0.5 3.5t1.5 3t1 2.5v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4
+l-10 -2.5t-12 -2l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-6 -1 -9 -1q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130
+t-73 70q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -1 -1 -4t-1 -5q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150
+q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12
+q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
+    <glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304" 
+d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
+t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5
+t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
+    <glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792" 
+d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
+t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23
+t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512
+q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
+    <glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304" 
+d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
+v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304" 
+d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304" 
+d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304" 
+d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304" 
+d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
+v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280" 
+d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
+    <glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024" 
+d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
+    <glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048" 
+d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
+h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
+    <glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304" 
+d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
+v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
+    <glyph glyph-name="_549" unicode="&#xf249;" 
+d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
+    <glyph glyph-name="_550" unicode="&#xf24a;" 
+d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304" 
+d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
+t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88
+t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90
+t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304" 
+d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
+t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z
+M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792" 
+d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
+zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304" 
+d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91
+t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5
+t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
+    <glyph glyph-name="_555" unicode="&#xf250;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5
+t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_556" unicode="&#xf251;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
+    <glyph glyph-name="_557" unicode="&#xf252;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
+    <glyph glyph-name="_558" unicode="&#xf253;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196
+h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_559" unicode="&#xf254;" 
+d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
+t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9
+h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
+    <glyph glyph-name="_560" unicode="&#xf255;" 
+d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
+q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27
+t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21
+q72 69 174 69z" />
+    <glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792" 
+d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
+t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52
+h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
+    <glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792" 
+d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
+q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17
+t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5
+t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5
+q0 -42 -23 -78t-61 -53l-310 -141h91z" />
+    <glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048" 
+d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
+q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68
+q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
+    <glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
+d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
+t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
+q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
+l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
+    <glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792" 
+d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
+q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5
+v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32
+v-384h32z" />
+    <glyph glyph-name="_566" unicode="&#xf25b;" 
+d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
+v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46
+q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5
+q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308
+q0 -53 37.5 -90.5t90.5 -37.5h668z" />
+    <glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973" 
+d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
+t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141
+q13 0 22 -8.5t10 -20.5z" />
+    <glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792" 
+d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
+t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640
+q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792" 
+d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
+q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5
+t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376
+q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
+    <glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048" 
+d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
+    <glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792" 
+d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304" 
+d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
+t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197
+t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5
+t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5
+t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5
+q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
+    <glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280" 
+d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
+t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94
+q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
+    <glyph glyph-name="_574" unicode="&#xf264;" 
+d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
+q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5
+zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720" 
+d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
+l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
+    <glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304" 
+d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
+q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81
+l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
+    <glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792" 
+d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
+q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5
+t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5
+t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5
+t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191
+t191 -286t71 -348z" />
+    <glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792" 
+d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
+q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
+    <glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792" 
+d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
+q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5
+q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
+    <glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
+d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
+q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
+" />
+    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
+d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
+q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
+M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
+    <glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048" 
+d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
+v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792" 
+d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
+h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100
+q-68 175 -180 287z" />
+    <glyph glyph-name="_584" unicode="&#xf26e;" 
+d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
+q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
+q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
+q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
+q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
+t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
+    <glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792" 
+d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
+M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30
+q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57
+t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133
+q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
+    <glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792" 
+d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
+h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224
+v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
+    <glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792" 
+d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
+t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792" 
+d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
+M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792" 
+d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
+t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792" 
+d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
+    <glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
+d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
+q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
+    <glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792" 
+d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
+q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
+    <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
+d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
+v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
+    <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
+d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
+q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
+    <glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792" 
+d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37
+t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792" 
+d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5
+t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51
+t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
+    <glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
+d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
+    <glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792" 
+d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
+q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
+    <glyph glyph-name="f27e" unicode="&#xf27e;" 
+d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
+    <glyph glyph-name="uniF280" unicode="&#xf280;" 
+d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
+h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275
+l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
+    <glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
+d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
+l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
+t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
+q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
+    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
+d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
+q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
+    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
+d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
+    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
+d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
+t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
+t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
+    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
+d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
+    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
+d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
+q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
+q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
+q16 0 16 -16z" />
+    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
+d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
+q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
+t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
+    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
+d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
+t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
+d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
+q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
+q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
+q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
+    <glyph glyph-name="_610" unicode="&#xf28a;" 
+d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
+t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
+q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
+t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
+    <glyph glyph-name="_611" unicode="&#xf28b;" 
+d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
+t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_612" unicode="&#xf28c;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
+    <glyph glyph-name="_613" unicode="&#xf28d;" 
+d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="_614" unicode="&#xf28e;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
+    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
+d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
+d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
+t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
+q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
+h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
+    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
+d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
+q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
+q15 0 25 -12q9 -12 6 -28z" />
+    <glyph glyph-name="_618" unicode="&#xf293;" 
+d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
+t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
+    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
+d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
+    <glyph glyph-name="_620" unicode="&#xf295;" 
+d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
+t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
+d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
+    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
+d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
+q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
+    <glyph glyph-name="_623" unicode="&#xf298;" 
+d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
+t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
+    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
+d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
+q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
+q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
+    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
+d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
+q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
+t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_626" unicode="&#xf29b;" 
+d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
+l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
+M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
+    <glyph glyph-name="_627" unicode="&#xf29c;" 
+d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
+t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
+t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5
+t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
+d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
+q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
+q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
+q3 -1 7 1t7 4l3 2q11 9 11 17z" />
+    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
+d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
+t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
+t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
+h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
+t9.5 -70.5z" />
+    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
+d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
+q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
+l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
+t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
+q-18 -19 -45 -19z" />
+    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
+d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
+t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
+t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
+t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
+t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
+d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
+M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
+t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
+t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
+q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
+    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
+d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
+q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
+q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
+q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
+q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
+q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
+    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
+d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
+t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
+t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
+l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
+    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
+d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
+q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
+q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
+d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
+l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
+q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
+q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
+    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
+d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
+t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
+l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
+q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
+l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
+    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
+d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
+q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
+q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
+q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
+    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
+d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
+q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
+M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
+    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
+d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
+M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
+q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AB" unicode="&#xf2ab;" 
+d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
+q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
+t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
+d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
+q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
+t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
+    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
+d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
+q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
+t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
+d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
+q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
+q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
+    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
+d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
+q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
+l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
+M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
+    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
+d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
+t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
+    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
+d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
+t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
+q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
+q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
+t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
+q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
+q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
+t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
+    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
+d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
+h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="uniF2B4" unicode="&#xf2b4;" 
+d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
+q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
+d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
+l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
+q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
+M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
+q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
+d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
+t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
+q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
+    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
+d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
+l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
+h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
+q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
+    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
+d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
+l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
+q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
+q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
+    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
+d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
+q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
+q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
+d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
+t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
+q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
+q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
+    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
+d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
+M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
+q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
+h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
+d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
+q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
+q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
+t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
+t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
+d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
+t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
+t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z" />
+    <glyph glyph-name="uniF2C0" unicode="&#xf2c0;" 
+d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
+t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
+q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
+    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
+d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
+t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
+q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
+d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
+t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
+v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
+q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
+d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
+M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
+h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
+d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
+q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
+t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
+    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
+d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
+t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
+t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
+t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
+q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
+t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
+q2 -42 2 -64z" />
+    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
+d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
+M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
+    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
+d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
+t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
+t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
+t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
+    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
+d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
+q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
+t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
+t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
+    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
+d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
+t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
+q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
+q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
+t72.5 -263.5z" />
+    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
+d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
+d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
+d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
+d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
+l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
+d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
+d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
+d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
+t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
+t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
+q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
+q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
+q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
+t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
+d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
+q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
+t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
+    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
+d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
+t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
+h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
+v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
+d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
+q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
+q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
+q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
+q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
+t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
+    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
+d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
+q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
+t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
+t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
+t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
+    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
+d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
+q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
+t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
+q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
+h48q16 0 16 -16z" />
+    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
+d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
+t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
+q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
+l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
+q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
+    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
+d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
+q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
+    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
+d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
+t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
+t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
+d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
+t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
+q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
+q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
+t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q28 19 60.5 13t52.5 -34zM1579 562q69 -113 42.5 -244.5t-134.5 -207.5q-90 -63 -199 -60q-20 -80 -84.5 -127t-143.5 -44.5t-140 57.5q-12 -9 -13 -10q-103 -71 -225 -48.5t-193 126.5
+q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
+M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
+q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
+q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
+    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
+ />
+  </font>
+</defs></svg>
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf
new file mode 100644
index 00000000000..35acda2fa11
Binary files /dev/null and b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf differ
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff
new file mode 100644
index 00000000000..400014a4b06
Binary files /dev/null and b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff differ
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff2 b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff2
new file mode 100644
index 00000000000..4d13fc60404
Binary files /dev/null and b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff2 differ
diff --git a/htdocs/includes/DebugBar/Resources/vendor/highlightjs/highlight.pack.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/highlight.pack.js
similarity index 100%
rename from htdocs/includes/DebugBar/Resources/vendor/highlightjs/highlight.pack.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/highlight.pack.js
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/styles/github.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/styles/github.css
new file mode 100644
index 00000000000..b1efcdb2480
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/styles/github.css
@@ -0,0 +1,125 @@
+/*
+
+github.com style (c) Vasily Polovnyov <vast@whiteants.net>
+
+*/
+
+div.phpdebugbar .hljs {
+  display: block; padding: 0.5em;
+  color: #333;
+  background: #f8f8f8
+}
+
+div.phpdebugbar .hljs-comment,
+div.phpdebugbar .hljs-template_comment,
+div.phpdebugbar .diff .hljs-header,
+div.phpdebugbar .hljs-javadoc {
+  color: #998;
+  font-style: italic
+}
+
+div.phpdebugbar .hljs-keyword,
+div.phpdebugbar .css .rule .hljs-keyword,
+div.phpdebugbar .hljs-winutils,
+div.phpdebugbar .javascript .hljs-title,
+div.phpdebugbar .nginx .hljs-title,
+div.phpdebugbar .hljs-subst,
+div.phpdebugbar .hljs-request,
+div.phpdebugbar .hljs-status {
+  color: #333;
+  font-weight: bold
+}
+
+div.phpdebugbar .hljs-number,
+div.phpdebugbar .hljs-hexcolor,
+div.phpdebugbar .ruby .hljs-constant {
+  color: #099;
+}
+
+div.phpdebugbar .hljs-string,
+div.phpdebugbar .hljs-tag .hljs-value,
+div.phpdebugbar .hljs-phpdoc,
+div.phpdebugbar .tex .hljs-formula {
+  color: #d14
+}
+
+div.phpdebugbar .hljs-title,
+div.phpdebugbar .hljs-id,
+div.phpdebugbar .coffeescript .hljs-params,
+div.phpdebugbar .scss .hljs-preprocessor {
+  color: #900;
+  font-weight: bold
+}
+
+div.phpdebugbar .javascript .hljs-title,
+div.phpdebugbar .lisp .hljs-title,
+div.phpdebugbar .clojure .hljs-title,
+div.phpdebugbar .hljs-subst {
+  font-weight: normal
+}
+
+div.phpdebugbar .hljs-class .hljs-title,
+div.phpdebugbar .haskell .hljs-type,
+div.phpdebugbar .vhdl .hljs-literal,
+div.phpdebugbar .tex .hljs-command {
+  color: #458;
+  font-weight: bold
+}
+
+div.phpdebugbar .hljs-tag,
+div.phpdebugbar .hljs-tag .hljs-title,
+div.phpdebugbar .hljs-rules .hljs-property,
+div.phpdebugbar .django .hljs-tag .hljs-keyword {
+  color: #000080;
+  font-weight: normal
+}
+
+div.phpdebugbar .hljs-attribute,
+div.phpdebugbar .hljs-variable,
+div.phpdebugbar .lisp .hljs-body {
+  color: #008080
+}
+
+div.phpdebugbar .hljs-regexp {
+  color: #009926
+}
+
+div.phpdebugbar .hljs-symbol,
+div.phpdebugbar .ruby .hljs-symbol .hljs-string,
+div.phpdebugbar .lisp .hljs-keyword,
+div.phpdebugbar .tex .hljs-special,
+div.phpdebugbar .hljs-prompt {
+  color: #990073
+}
+
+div.phpdebugbar .hljs-built_in,
+div.phpdebugbar .lisp .hljs-title,
+div.phpdebugbar .clojure .hljs-built_in {
+  color: #0086b3
+}
+
+div.phpdebugbar .hljs-preprocessor,
+div.phpdebugbar .hljs-pragma,
+div.phpdebugbar .hljs-pi,
+div.phpdebugbar .hljs-doctype,
+div.phpdebugbar .hljs-shebang,
+div.phpdebugbar .hljs-cdata {
+  color: #999;
+  font-weight: bold
+}
+
+div.phpdebugbar .hljs-deletion {
+  background: #fdd
+}
+
+div.phpdebugbar .hljs-addition {
+  background: #dfd
+}
+
+div.phpdebugbar .diff .hljs-change {
+  background: #0086b3
+}
+
+div.phpdebugbar .hljs-chunk {
+  color: #aaa
+}
diff --git a/htdocs/includes/DebugBar/Resources/vendor/jquery/dist/jquery.min.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery/dist/jquery.min.js
similarity index 100%
rename from htdocs/includes/DebugBar/Resources/vendor/jquery/dist/jquery.min.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery/dist/jquery.min.js
diff --git a/htdocs/includes/DebugBar/Resources/widgets.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.css
similarity index 84%
rename from htdocs/includes/DebugBar/Resources/widgets.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.css
index e8ad62ec475..b4d7b08727e 100644
--- a/htdocs/includes/DebugBar/Resources/widgets.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.css
@@ -28,13 +28,14 @@ pre.phpdebugbar-widgets-code-block {
     border-right: 1px solid #aaa;
     text-align: right;
   }
+
 /* -------------------------------------- */
 
 ul.phpdebugbar-widgets-list {
   margin: 0;
   padding: 0;
   list-style: none;
-  font-family: monospace;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
 }
   ul.phpdebugbar-widgets-list li.phpdebugbar-widgets-list-item {
     padding: 3px 6px;
@@ -56,7 +57,7 @@ div.phpdebugbar-widgets-messages {
     padding-bottom: 20px;
   }
   div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-value.phpdebugbar-widgets-warning:before {
-    font-family: FontAwesome;
+    font-family: PhpDebugbarFontAwesome;
     content: "\f071";
     margin-right: 8px;
     font-size: 11px;
@@ -66,12 +67,15 @@ div.phpdebugbar-widgets-messages {
     color: red;
   }
   div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-value.phpdebugbar-widgets-error:before {
-    font-family: FontAwesome;
+    font-family: PhpDebugbarFontAwesome;
     content: "\f057";
     margin-right: 8px;
     font-size: 11px;
     color: red;
   }
+  div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item pre.sf-dump {
+    display: inline;
+  }
   div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-collector,
   div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-label {
     float: right;
@@ -93,9 +97,6 @@ div.phpdebugbar-widgets-messages {
     bottom: 0;
     width: 100%;
     background: #fff;
-  }
-  div.phpdebugbar-widgets-messages div.phpdebugbar-widgets-toolbar i.fa-search {
-    margin-left: 7px;
   }
     div.phpdebugbar-widgets-messages div.phpdebugbar-widgets-toolbar input {
       border: 0;
@@ -111,7 +112,7 @@ div.phpdebugbar-widgets-messages {
         float: right;
         font-size: 12px;
         padding: 2px 4px;
-        background: #3d6c99;
+        background: #7cacd5;
         margin: 0 2px;
         border-radius: 4px;
         color: #fff;
@@ -148,9 +149,13 @@ dl.phpdebugbar-widgets-kvlist {
 
 /* -------------------------------------- */
 
-dl.phpdebugbar-widgets-varlist {
-  font-family: monospace;
+dl.phpdebugbar-widgets-varlist,
+dl.phpdebugbar-widgets-htmlvarlist {
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
 }
+  dl.phpdebugbar-widgets-htmlvarlist dd {
+    cursor: initial;
+  }
 
 /* -------------------------------------- */
 
@@ -172,20 +177,21 @@ ul.phpdebugbar-widgets-timeline {
     ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-collector {
       position: absolute;
       font-size: 12px;
-      font-family: monospace;
+      font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
       color: #555;
       top: 4px;
       left: 5px;
       background: none;
       text-shadow: none;
       font-weight: normal;
+      white-space: pre;
     }
     ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-collector {
       left: initial;
       right: 5px;
     }
     ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-value {
-      display: block; 
+      display: block;
       position: absolute;
       height: 10px;
       background: #3db9ec;
@@ -198,7 +204,7 @@ ul.phpdebugbar-widgets-timeline {
       width: 70%;
       margin: 10px;
       border: 1px solid #ddd;
-      font-family: monospace;
+      font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
       border-collapse: collapse;
     }
       ul.phpdebugbar-widgets-timeline table.phpdebugbar-widgets-params td {
@@ -239,5 +245,17 @@ div.phpdebugbar-widgets-exceptions li.phpdebugbar-widgets-list-item {
     margin: 10px;
     padding: 5px;
     border: 1px solid #ddd;
-    font-family: monospace;
+    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
   }
+
+div.phpdebugbar-widgets-exceptions a.phpdebugbar-widgets-editor-link:before {
+  font-family: PhpDebugbarFontAwesome;
+  margin-right: 4px;
+  font-size: 12px;
+  font-style: normal;
+}
+
+div.phpdebugbar-widgets-exceptions a.phpdebugbar-widgets-editor-link:before {
+  content: "\f08e";
+  margin-left: 4px;
+}
diff --git a/htdocs/includes/DebugBar/Resources/widgets.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.js
similarity index 76%
rename from htdocs/includes/DebugBar/Resources/widgets.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.js
index 025a9618b74..b4a583dfc52 100644
--- a/htdocs/includes/DebugBar/Resources/widgets.js
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets.js
@@ -65,7 +65,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
         return code;
     };
 
-     /**
+    /**
      * Creates a <pre> element with a block of code
      *
      * @param  {String} code
@@ -118,7 +118,6 @@ if (typeof(PhpDebugBar) == 'undefined') {
         return pre;
     };
 
-
     // ------------------------------------------------------------------
     // Generic widgets
     // ------------------------------------------------------------------
@@ -250,7 +249,28 @@ if (typeof(PhpDebugBar) == 'undefined') {
     });
 
     // ------------------------------------------------------------------
-    
+
+    /**
+     * An extension of KVListWidget where the data represents a list
+     * of variables whose contents are HTML; this is useful for showing
+     * variable output from VarDumper's HtmlDumper.
+     *
+     * Options:
+     *  - data
+     */
+    var HtmlVariableListWidget = PhpDebugBar.Widgets.HtmlVariableListWidget = KVListWidget.extend({
+
+        className: csscls('kvlist htmlvarlist'),
+
+        itemRenderer: function(dt, dd, key, value) {
+            $('<span />').attr('title', key).text(key).appendTo(dt);
+            dd.html(value);
+        }
+
+    });
+
+    // ------------------------------------------------------------------
+
     /**
      * Iframe widget
      *
@@ -296,38 +316,42 @@ if (typeof(PhpDebugBar) == 'undefined') {
             var self = this;
 
             this.$list = new ListWidget({ itemRenderer: function(li, value) {
-                var m = value.message;
-                if (m.length > 100) {
-                    m = m.substr(0, 100) + "...";
-                }
-
-                var val = $('<span />').addClass(csscls('value')).text(m).appendTo(li);
-                if (!value.is_string || value.message.length > 100) {
-                    var prettyVal = value.message;
-                    if (!value.is_string) {
-                        prettyVal = null;
+                if (value.message_html) {
+                    var val = $('<span />').addClass(csscls('value')).html(value.message_html).appendTo(li);
+                } else {
+                    var m = value.message;
+                    if (m.length > 100) {
+                        m = m.substr(0, 100) + "...";
                     }
-                    li.css('cursor', 'pointer').click(function() {
-                        if (val.hasClass(csscls('pretty'))) {
-                            val.text(m).removeClass(csscls('pretty'));
-                        } else {
-                            prettyVal = prettyVal || createCodeBlock(value.message, 'php');
-                            val.addClass(csscls('pretty')).empty().append(prettyVal);
+
+                    var val = $('<span />').addClass(csscls('value')).text(m).appendTo(li);
+                    if (!value.is_string || value.message.length > 100) {
+                        var prettyVal = value.message;
+                        if (!value.is_string) {
+                            prettyVal = null;
                         }
-                    });
+                        li.css('cursor', 'pointer').click(function () {
+                            if (val.hasClass(csscls('pretty'))) {
+                                val.text(m).removeClass(csscls('pretty'));
+                            } else {
+                                prettyVal = prettyVal || createCodeBlock(value.message, 'php');
+                                val.addClass(csscls('pretty')).empty().append(prettyVal);
+                            }
+                        });
+                    }
                 }
 
+                if (value.collector) {
+                    $('<span />').addClass(csscls('collector')).text(value.collector).prependTo(li);
+                }
                 if (value.label) {
                     val.addClass(csscls(value.label));
-                    $('<span />').addClass(csscls('label')).text(value.label).appendTo(li);
-                }
-                if (value.collector) {
-                    $('<span />').addClass(csscls('collector')).text(value.collector).appendTo(li);
+                    $('<span />').addClass(csscls('label')).text(value.label).prependTo(li);
                 }
             }});
 
             this.$list.$el.appendTo(this.$el);
-            this.$toolbar = $('<div><i class="fa fa-search"></i></div>').addClass(csscls('toolbar')).appendTo(this.$el);
+            this.$toolbar = $('<div><i class="phpdebugbar-fa phpdebugbar-fa-search"></i></div>').addClass(csscls('toolbar')).appendTo(this.$el);
 
             $('<input type="text" />')
                 .on('change', function() { self.set('search', this.value); })
@@ -404,10 +428,29 @@ if (typeof(PhpDebugBar) == 'undefined') {
 
         render: function() {
             this.bindAttr('data', function(data) {
+
+                // ported from php DataFormatter
+                var formatDuration = function(seconds) {
+                    if (seconds < 0.001)
+                        return (seconds * 1000000).toFixed() + 'μs';
+                    else if (seconds < 1)
+                        return (seconds * 1000).toFixed(2) + 'ms';
+                    return (seconds).toFixed(2) +  's';
+                };
+
                 this.$el.empty();
                 if (data.measures) {
+                    var aggregate = {};
+
                     for (var i = 0; i < data.measures.length; i++) {
                         var measure = data.measures[i];
+
+                        if(!aggregate[measure.label])
+                            aggregate[measure.label] = { count: 0, duration: 0 };
+
+                        aggregate[measure.label]['count'] += 1;
+                        aggregate[measure.label]['duration'] += measure.duration;
+
                         var m = $('<div />').addClass(csscls('measure')),
                             li = $('<li />'),
                             left = (measure.relative_start * 100 / data.duration).toFixed(2),
@@ -444,6 +487,30 @@ if (typeof(PhpDebugBar) == 'undefined') {
                             });
                         }
                     }
+
+                    // convert to array and sort by duration
+                    aggregate = $.map(aggregate, function(data, label) {
+                       return {
+                           label: label,
+                           data: data
+                       }
+                    }).sort(function(a, b) {
+                        return b.data.duration - a.data.duration
+                    });
+
+                    // build table and add
+                    var aggregateTable = $('<table style="display: table; border: 0; width: 99%"></table>').addClass(csscls('params'));
+                    $.each(aggregate, function(i, aggregate) {
+                        width = Math.min((aggregate.data.duration * 100 / data.duration).toFixed(2), 100);
+
+                        aggregateTable.append('<tr><td class="' + csscls('name') + '">' + aggregate.data.count + ' x ' + aggregate.label + ' (' + width + '%)</td><td class="' + csscls('value') + '">' +
+                            '<div class="' + csscls('measure') +'">' +
+                                '<span class="' + csscls('value') + '" style="width:' + width + '%"></span>' +
+                                '<span class="' + csscls('label') + '">' + formatDuration(aggregate.data.duration) + '</span>' +
+                            '</div></td></tr>');
+                    });
+
+                    this.$el.append('<li/>').find('li:last').append(aggregateTable);
                 }
             });
         }
@@ -466,7 +533,17 @@ if (typeof(PhpDebugBar) == 'undefined') {
             this.$list = new ListWidget({ itemRenderer: function(li, e) {
                 $('<span />').addClass(csscls('message')).text(e.message).appendTo(li);
                 if (e.file) {
-                    $('<span />').addClass(csscls('filename')).text(e.file + "#" + e.line).appendTo(li);
+                    var header = $('<span />').addClass(csscls('filename')).text(e.file + "#" + e.line);
+                    if (e.xdebug_link) {
+                        if (e.xdebug_link.ajax) {
+                            $('<a title="' + e.xdebug_link.url + '"></a>').on('click', function () {
+                                $.ajax(e.xdebug_link.url);
+                            }).addClass(csscls('editor-link')).appendTo(header);
+                        } else {
+                            $('<a href="' + e.xdebug_link.url + '"></a>').addClass(csscls('editor-link')).appendTo(header);
+                        }
+                    }
+                    header.appendTo(li);
                 }
                 if (e.type) {
                     $('<span />').addClass(csscls('type')).text(e.type).appendTo(li);
@@ -481,6 +558,13 @@ if (typeof(PhpDebugBar) == 'undefined') {
                         }
                     });
                 }
+                if (e.stack_trace) {
+                  e.stack_trace.split("\n").forEach(function(trace) {
+                    var $traceLine = $('<div />');
+                    $('<span />').addClass(csscls('filename')).text(trace).appendTo($traceLine);
+                    $traceLine.appendTo(li);
+                  });
+                }
             }});
             this.$list.$el.appendTo(this.$el);
 
diff --git a/htdocs/includes/DebugBar/Resources/widgets/mails/widget.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css
similarity index 74%
rename from htdocs/includes/DebugBar/Resources/widgets/mails/widget.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css
index a43957a60ce..8e91858be63 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/mails/widget.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css
@@ -8,5 +8,5 @@ div.phpdebugbar-widgets-mails li.phpdebugbar-widgets-list-item pre.phpdebugbar-w
   margin: 10px;
   padding: 5px;
   border: 1px solid #ddd;
-  font-family: monospace;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
 }
diff --git a/htdocs/includes/DebugBar/Resources/widgets/mails/widget.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.js
similarity index 100%
rename from htdocs/includes/DebugBar/Resources/widgets/mails/widget.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.js
diff --git a/htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css
similarity index 64%
rename from htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css
index 322f2ba7004..04fd0afb357 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css
@@ -1,5 +1,5 @@
 div.phpdebugbar-widgets-sqlqueries .phpdebugbar-widgets-status {
-  font-family: monospace;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
   padding: 6px 6px;
   border-bottom: 1px solid #ddd;
   font-weight: bold;
@@ -11,28 +11,37 @@ div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item.phpdebugbar-
   color: red;
 }
 
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-duration,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-memory,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-row-count,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-copy-clipboard,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id {
   float: right;
   margin-left: 8px;
   color: #888;
 }
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-database,
 div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-duration,
 div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-memory,
 div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-row-count,
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-copy-clipboard,
 div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-status span.phpdebugbar-widgets-stmt-id {
   color: #555;
 }
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database:before,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-duration:before,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-memory:before,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-row-count:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-copy-clipboard:before,
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before {
-  font-family: FontAwesome;
+  font-family: PhpDebugbarFontAwesome;
   margin-right: 4px;
   font-size: 12px;
 }
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database:before {
+  content: "\f1c0";
+}
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-duration:before {
   content: "\f017";
 }
@@ -45,12 +54,15 @@ div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-row-count:before {
 div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before {
   content: "\f08d";
 }
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-copy-clipboard:before {
+  content: "\f0c5";
+}
 div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params {
   display: none;
   width: 70%;
   margin: 10px;
   border: 1px solid #ddd;
-  font-family: monospace;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
   border-collapse: collapse;
 }
   div.phpdebugbar-widgets-sqlqueries table.phpdebugbar-widgets-params td {
@@ -80,3 +92,27 @@ div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item.phpdebugbar-
 div.phpdebugbar-widgets-sqlqueries li.phpdebugbar-widgets-list-item.phpdebugbar-widgets-sql-duplicate:hover {
   background-color: #ffc;
 }
+
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-toolbar {
+  display:none;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  background: #fff;
+  z-index: 1;
+}
+
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-toolbar a.phpdebugbar-widgets-filter {
+  float: right;
+  font-size: 12px;
+  padding: 2px 4px;
+  background: #7cacd5;
+  margin: 0 2px;
+  border-radius: 4px;
+  color: #fff;
+  text-decoration: none;
+}
+div.phpdebugbar-widgets-sqlqueries div.phpdebugbar-widgets-toolbar a.phpdebugbar-widgets-filter.phpdebugbar-widgets-excluded {
+  background: #eee;
+  color: #888;
+}
diff --git a/htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js
similarity index 54%
rename from htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js
index 80be93b80cc..514915c7613 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/sqlqueries/widget.js
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js
@@ -12,10 +12,52 @@
 
         className: csscls('sqlqueries'),
 
+        onFilterClick: function(el) {
+            $(el).toggleClass(csscls('excluded'));
+
+            var excludedLabels = [];
+            this.$toolbar.find(csscls('.filter') + csscls('.excluded')).each(function() {
+                excludedLabels.push(this.rel);
+            });
+
+            this.$list.$el.find("li[connection=" + $(el).attr("rel") + "]").toggle();
+
+            this.set('exclude', excludedLabels);
+        },
+        onCopyToClipboard: function (el) {
+            var code = $(el).parent('li').find('code').get(0);
+            var copy = function () {
+                try {
+                    document.execCommand('copy');
+                    alert('Query copied to the clipboard');
+                } catch (err) {
+                    console.log('Oops, unable to copy');
+                }
+            };
+            var select = function (node) {
+                if (document.selection) {
+                    var range = document.body.createTextRange();
+                    range.moveToElementText(node);
+                    range.select();
+                } else if (window.getSelection) {
+                    var range = document.createRange();
+                    range.selectNodeContents(node);
+                    window.getSelection().removeAllRanges();
+                    window.getSelection().addRange(range);
+                }
+                copy();
+                window.getSelection().removeAllRanges();
+            };
+            select(code);
+        },
         render: function() {
             this.$status = $('<div />').addClass(csscls('status')).appendTo(this.$el);
 
-            this.$list = new  PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, stmt) {
+            this.$toolbar = $('<div></div>').addClass(csscls('toolbar')).appendTo(this.$el);
+
+            var filters = [], self = this;
+
+            this.$list = new PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, stmt) {
                 $('<code />').addClass(csscls('sql')).html(PhpDebugBar.Widgets.highlight(stmt.sql, 'sql')).appendTo(li);
                 if (stmt.duration_str) {
                     $('<span title="Duration" />').addClass(csscls('duration')).text(stmt.duration_str).appendTo(li);
@@ -23,21 +65,47 @@
                 if (stmt.memory_str) {
                     $('<span title="Memory usage" />').addClass(csscls('memory')).text(stmt.memory_str).appendTo(li);
                 }
-                if (typeof(stmt.is_success) != 'undefined' && !stmt.is_success) {
-                    li.addClass(csscls('error'));
-                    li.append($('<span />').addClass(csscls('error')).text("[" + stmt.error_code + "] " + stmt.error_message));
-                } else if (typeof(stmt.row_count) != 'undefined') {
+                if (typeof(stmt.row_count) != 'undefined') {
                     $('<span title="Row count" />').addClass(csscls('row-count')).text(stmt.row_count).appendTo(li);
                 }
                 if (typeof(stmt.stmt_id) != 'undefined' && stmt.stmt_id) {
                     $('<span title="Prepared statement ID" />').addClass(csscls('stmt-id')).text(stmt.stmt_id).appendTo(li);
                 }
+                if (stmt.connection) {
+                    $('<span title="Connection" />').addClass(csscls('database')).text(stmt.connection).appendTo(li);
+                    li.attr("connection",stmt.connection);
+                    if ( $.inArray(stmt.connection, filters) == -1 ) {
+                        filters.push(stmt.connection);
+                        $('<a />')
+                            .addClass(csscls('filter'))
+                            .text(stmt.connection)
+                            .attr('rel', stmt.connection)
+                            .on('click', function() { self.onFilterClick(this); })
+                            .appendTo(self.$toolbar);
+                        if (filters.length>1) {
+                            self.$toolbar.show();
+                            self.$list.$el.css("margin-bottom","20px");
+                        }
+                    }
+                }
+                if (typeof(stmt.is_success) != 'undefined' && !stmt.is_success) {
+                    li.addClass(csscls('error'));
+                    li.append($('<span />').addClass(csscls('error')).text("[" + stmt.error_code + "] " + stmt.error_message));
+                }
+                $('<span title="Copy to clipboard" />')
+                    .addClass(csscls('copy-clipboard'))
+                    .css('cursor', 'pointer')
+                    .on('click', function (event) {
+                        self.onCopyToClipboard(this);
+                        event.stopPropagation();
+                    })
+                    .appendTo(li);
                 if (stmt.params && !$.isEmptyObject(stmt.params)) {
                     var table = $('<table><tr><th colspan="2">Params</th></tr></table>').addClass(csscls('params')).appendTo(li);
                     for (var key in stmt.params) {
                         if (typeof stmt.params[key] !== 'function') {
                             table.append('<tr><td class="' + csscls('name') + '">' + key + '</td><td class="' + csscls('value') +
-                            '">' + stmt.params[key] + '</td></tr>');
+                                '">' + stmt.params[key] + '</td></tr>');
                         }
                     }
                     li.css('cursor', 'pointer').click(function() {
@@ -52,11 +120,15 @@
             this.$list.$el.appendTo(this.$el);
 
             this.bindAttr('data', function(data) {
+                // the PDO collector maybe is empty
+                if (data.length <= 0) {
+                    return false;
+                }
                 this.$list.set('data', data.statements);
                 this.$status.empty();
 
                 // Search for duplicate statements.
-                for (var sql = {}, duplicate = 0, i = 0; i < data.statements.length; i++) {
+                for (var sql = {}, unique = 0, duplicate = 0, i = 0; i < data.statements.length; i++) {
                     var stmt = data.statements[i].sql;
                     if (data.statements[i].params && !$.isEmptyObject(data.statements[i].params)) {
                         stmt += ' {' + $.param(data.statements[i].params, false) + '}';
@@ -67,11 +139,13 @@
                 // Add classes to all duplicate SQL statements.
                 for (var stmt in sql) {
                     if (sql[stmt].keys.length > 1) {
-                        duplicate++;
+                        duplicate += sql[stmt].keys.length;
                         for (var i = 0; i < sql[stmt].keys.length; i++) {
                             this.$list.$el.find('.' + csscls('list-item')).eq(sql[stmt].keys[i])
-                                .addClass(csscls('sql-duplicate')).addClass(csscls('sql-duplicate-'+duplicate));
+                                .addClass(csscls('sql-duplicate'));
                         }
+                    } else {
+                        unique++;
                     }
                 }
 
@@ -80,7 +154,8 @@
                     t.append(", " + data.nb_failed_statements + " of which failed");
                 }
                 if (duplicate) {
-                    t.append(", " + duplicate + " of which were duplicated");
+                    t.append(", " + duplicate + " of which were duplicates");
+                    t.append(", " + unique + " unique");
                 }
                 if (data.accumulated_duration_str) {
                     this.$status.append($('<span title="Accumulated duration" />').addClass(csscls('duration')).text(data.accumulated_duration_str));
diff --git a/htdocs/includes/DebugBar/Resources/widgets/templates/widget.css b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css
similarity index 83%
rename from htdocs/includes/DebugBar/Resources/widgets/templates/widget.css
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css
index 1fa9878d7ed..29f6ab979bc 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/templates/widget.css
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css
@@ -1,6 +1,6 @@
 
 div.phpdebugbar-widgets-templates div.phpdebugbar-widgets-status {
-  font-family: monospace;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
   padding: 6px 6px;
   border-bottom: 1px solid #ddd;
   font-weight: bold;
@@ -25,8 +25,10 @@ div.phpdebugbar-widgets-templates div.phpdebugbar-widgets-status span.phpdebugba
 div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-render-time:before,
 div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-memory:before,
 div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-param-count:before,
-div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-type:before {
-  font-family: FontAwesome;
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-type:before,
+div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
+{
+  font-family: PhpDebugbarFontAwesome;
   margin-right: 4px;
   font-size: 12px;
 }
@@ -42,12 +44,16 @@ div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-param-count:before {
 div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-type:before {
   content: "\f121";
 }
+div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before {
+  content: "\f08e";
+  margin-left: 4px;
+}
 div.phpdebugbar-widgets-templates table.phpdebugbar-widgets-params {
   display: none;
   width: 70%;
   margin: 10px;
   border: 1px solid #ddd;
-  font-family: monospace;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
   border-collapse: collapse;
 }
 div.phpdebugbar-widgets-templates table.phpdebugbar-widgets-params td {
diff --git a/htdocs/includes/DebugBar/Resources/widgets/templates/widget.js b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js
similarity index 70%
rename from htdocs/includes/DebugBar/Resources/widgets/templates/widget.js
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js
index 362d4a45a24..8763e7eda68 100644
--- a/htdocs/includes/DebugBar/Resources/widgets/templates/widget.js
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js
@@ -17,6 +17,16 @@
 
             this.$list = new  PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, tpl) {
                 $('<span />').addClass(csscls('name')).text(tpl.name).appendTo(li);
+
+                if (typeof tpl.xdebug_link !== 'undefined' && tpl.xdebug_link !== null) {
+                    if (tpl.xdebug_link.ajax) {
+                        $('<a title="' + tpl.xdebug_link.url + '"></a>').on('click', function () {
+                            $.ajax(tpl.xdebug_link.url);
+                        }).addClass(csscls('editor-link')).appendTo(li);
+                    } else {
+                        $('<a href="' + tpl.xdebug_link.url + '"></a>').addClass(csscls('editor-link')).appendTo(li);
+                    }
+                }
                 if (tpl.render_time_str) {
                     $('<span title="Render time" />').addClass(csscls('render-time')).text(tpl.render_time_str).appendTo(li);
                 }
@@ -47,13 +57,15 @@
                 }
             }});
             this.$list.$el.appendTo(this.$el);
+            this.$callgraph = $('<div />').addClass(csscls('callgraph')).appendTo(this.$el);
 
             this.bindAttr('data', function(data) {
                 this.$list.set('data', data.templates);
                 this.$status.empty();
+                this.$callgraph.empty();
 
                 var sentence = data.sentence || "templates were rendered";
-                $('<span />').text(data.templates.length + " " + sentence).appendTo(this.$status);
+                $('<span />').text(data.nb_templates + " " + sentence).appendTo(this.$status);
 
                 if (data.accumulated_render_time_str) {
                     this.$status.append($('<span title="Accumulated render time" />').addClass(csscls('render-time')).text(data.accumulated_render_time_str));
@@ -61,6 +73,15 @@
                 if (data.memory_usage_str) {
                     this.$status.append($('<span title="Memory usage" />').addClass(csscls('memory')).text(data.memory_usage_str));
                 }
+                if (data.nb_blocks > 0) {
+                    $('<div />').text(data.nb_blocks + " blocks were rendered").appendTo(this.$status);
+                }
+                if (data.nb_macros > 0) {
+                    $('<div />').text(data.nb_macros + " macros were rendered").appendTo(this.$status);
+                }
+                if (typeof data.callgraph !== 'undefined') {
+                    this.$callgraph.html(data.callgraph);
+                }
             });
         }
 
diff --git a/htdocs/includes/DebugBar/StandardDebugBar.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/StandardDebugBar.php
similarity index 100%
rename from htdocs/includes/DebugBar/StandardDebugBar.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/StandardDebugBar.php
diff --git a/htdocs/includes/DebugBar/Storage/FileStorage.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php
similarity index 90%
rename from htdocs/includes/DebugBar/Storage/FileStorage.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php
index b37234976e2..98923e272b3 100644
--- a/htdocs/includes/DebugBar/Storage/FileStorage.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php
@@ -25,6 +25,9 @@ class FileStorage implements StorageInterface
         $this->dirname = rtrim($dirname, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function save($id, $data)
     {
         if (!file_exists($this->dirname)) {
@@ -33,11 +36,17 @@ class FileStorage implements StorageInterface
         file_put_contents($this->makeFilename($id), json_encode($data));
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function get($id)
     {
         return json_decode(file_get_contents($this->makeFilename($id)), true);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function find(array $filters = array(), $max = 20, $offset = 0)
     {
         //Loop through all .json files and remember the modified time and id.
@@ -81,6 +90,10 @@ class FileStorage implements StorageInterface
 
     /**
      * Filter the metadata for matches.
+     * 
+     * @param  array $meta
+     * @param  array $filters
+     * @return bool
      */
     protected function filter($meta, $filters)
     {
@@ -92,6 +105,9 @@ class FileStorage implements StorageInterface
         return true;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function clear()
     {
         foreach (new \DirectoryIterator($this->dirname) as $file) {
@@ -101,6 +117,10 @@ class FileStorage implements StorageInterface
         }
     }
 
+    /**
+     * @param  string $id
+     * @return string 
+     */
     public function makeFilename($id)
     {
         return $this->dirname . basename($id). ".json";
diff --git a/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php
new file mode 100644
index 00000000000..c1ef873421b
--- /dev/null
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php
@@ -0,0 +1,158 @@
+<?php
+/*
+ * This file is part of the DebugBar package.
+ *
+ * (c) 2013 Maxime Bouroumeau-Fuseau
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace DebugBar\Storage;
+
+use Memcached;
+use ReflectionMethod;
+
+/**
+ * Stores collected data into Memcache using the Memcached extension
+ */
+class MemcachedStorage implements StorageInterface
+{
+    protected $memcached;
+
+    protected $keyNamespace;
+
+    protected $expiration;
+
+    protected $newGetMultiSignature;
+
+    /**
+     * @param Memcached $memcached
+     * @param string $keyNamespace Namespace for Memcached key names (to avoid conflict with other Memcached users).
+     * @param int $expiration Expiration for Memcached entries (see Expiration Times in Memcached documentation).
+     */
+    public function __construct(Memcached $memcached, $keyNamespace = 'phpdebugbar', $expiration = 0)
+    {
+        $this->memcached = $memcached;
+        $this->keyNamespace = $keyNamespace;
+        $this->expiration = $expiration;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save($id, $data)
+    {
+        $key = $this->createKey($id);
+        $this->memcached->set($key, $data, $this->expiration);
+        if (!$this->memcached->append($this->keyNamespace, "|$key")) {
+            $this->memcached->set($this->keyNamespace, $key, $this->expiration);
+        } else if ($this->expiration) {
+            // append doesn't support updating expiration, so do it here:
+            $this->memcached->touch($this->keyNamespace, $this->expiration);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get($id)
+    {
+        return $this->memcached->get($this->createKey($id));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function find(array $filters = array(), $max = 20, $offset = 0)
+    {
+        if (!($keys = $this->memcached->get($this->keyNamespace))) {
+            return array();
+        }
+
+        $results = array();
+        $keys = array_reverse(explode('|', $keys)); // Reverse so newest comes first
+        $keyPosition = 0; // Index in $keys to try to get next items from
+        $remainingItems = $max + $offset; // Try to obtain this many remaining items
+        // Loop until we've found $remainingItems matching items or no more items may exist.
+        while ($remainingItems > 0 && $keyPosition < count($keys)) {
+            // Consume some keys from $keys:
+            $itemsToGet = array_slice($keys, $keyPosition, $remainingItems);
+            $keyPosition += $remainingItems;
+            // Try to get them, and filter them:
+            $newItems = $this->memcachedGetMulti($itemsToGet, Memcached::GET_PRESERVE_ORDER);
+            if ($newItems) {
+                foreach ($newItems as $data) {
+                    $meta = $data['__meta'];
+                    if ($this->filter($meta, $filters)) {
+                        $remainingItems--;
+                        // Keep the result only if we've discarded $offset items first
+                        if ($offset <= 0) {
+                            $results[] = $meta;
+                        } else {
+                            $offset--;
+                        }
+                    }
+                }
+            }
+        }
+        return $results;
+    }
+
+    /**
+     * Filter the metadata for matches.
+     * 
+     * @param  array $meta
+     * @param  array $filters
+     * @return bool
+     */
+    protected function filter($meta, $filters)
+    {
+        foreach ($filters as $key => $value) {
+            if (!isset($meta[$key]) || fnmatch($value, $meta[$key]) === false) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear()
+    {
+        if (!($keys = $this->memcached->get($this->keyNamespace))) {
+            return;
+        }
+        $this->memcached->delete($this->keyNamespace);
+        $this->memcached->deleteMulti(explode('|', $keys));
+    }
+
+    /**
+     * @param  string $id
+     * @return string 
+     */
+    protected function createKey($id)
+    {
+        return md5("{$this->keyNamespace}.$id");
+    }
+
+    /**
+     * The memcached getMulti function changed in version 3.0.0 to only have two parameters.
+     *
+     * @param array $keys
+     * @param int $flags
+     */
+    protected function memcachedGetMulti($keys, $flags)
+    {
+        if ($this->newGetMultiSignature === null) {
+            $this->newGetMultiSignature = (new ReflectionMethod('Memcached', 'getMulti'))->getNumberOfParameters() === 2;
+        }
+        if ($this->newGetMultiSignature) {
+            return $this->memcached->getMulti($keys, $flags);
+        } else {
+            $null = null;
+            return $this->memcached->getMulti($keys, $null, $flags);
+        }
+    }
+}
diff --git a/htdocs/includes/DebugBar/Storage/PdoStorage.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php
similarity index 86%
rename from htdocs/includes/DebugBar/Storage/PdoStorage.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php
index e7695ef69fa..ef9d568d275 100644
--- a/htdocs/includes/DebugBar/Storage/PdoStorage.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php
@@ -24,12 +24,13 @@ class PdoStorage implements StorageInterface
     protected $sqlQueries = array(
         'save' => "INSERT INTO %tablename% (id, data, meta_utime, meta_datetime, meta_uri, meta_ip, meta_method) VALUES (?, ?, ?, ?, ?, ?, ?)",
         'get' => "SELECT data FROM %tablename% WHERE id = ?",
-        'find' => "SELECT data FROM %tablename% %where% LIMIT %limit% OFFSET %offset%",
+        'find' => "SELECT data FROM %tablename% %where% ORDER BY meta_datetime DESC LIMIT %limit% OFFSET %offset%",
         'clear' => "DELETE FROM %tablename%"
     );
 
     /**
-     * @param string $dirname Directories where to store files
+     * @param \PDO $pdo The PDO instance
+     * @param string $tableName
      * @param array $sqlQueries
      */
     public function __construct(PDO $pdo, $tableName = 'phpdebugbar', array $sqlQueries = array())
@@ -49,6 +50,9 @@ class PdoStorage implements StorageInterface
         $this->sqlQueries = array_merge($this->sqlQueries, $queries);
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function save($id, $data)
     {
         $sql = $this->getSqlQuery('save');
@@ -57,6 +61,9 @@ class PdoStorage implements StorageInterface
         $stmt->execute(array($id, serialize($data), $meta['utime'], $meta['datetime'], $meta['uri'], $meta['ip'], $meta['method']));
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function get($id)
     {
         $sql = $this->getSqlQuery('get');
@@ -68,6 +75,9 @@ class PdoStorage implements StorageInterface
         return null;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function find(array $filters = array(), $max = 20, $offset = 0)
     {
         $where = array();
@@ -100,11 +110,21 @@ class PdoStorage implements StorageInterface
         return $results;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function clear()
     {
         $this->pdo->exec($this->getSqlQuery('clear'));
     }
 
+    /**
+     * Get a SQL Query for a task, with the variables replaced
+     *
+     * @param  string $name
+     * @param  array  $vars
+     * @return string
+     */
     protected function getSqlQuery($name, array $vars = array())
     {
         $sql = $this->sqlQueries[$name];
diff --git a/htdocs/includes/DebugBar/Storage/RedisStorage.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php
similarity index 51%
rename from htdocs/includes/DebugBar/Storage/RedisStorage.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php
index 42d8e3ce4dc..f145369660b 100644
--- a/htdocs/includes/DebugBar/Storage/RedisStorage.php
+++ b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php
@@ -10,8 +10,6 @@
 
 namespace DebugBar\Storage;
 
-use Predis\Client;
-
 /**
  * Stores collected data into Redis
  */
@@ -22,35 +20,57 @@ class RedisStorage implements StorageInterface
     protected $hash;
 
     /**
-     * @param string $dirname Directories where to store files
+     * @param  \Predis\Client $redis Redis Client
+     * @param  string $hash
      */
-    public function __construct(Client $redis, $hash = 'phpdebugbar')
+    public function __construct($redis, $hash = 'phpdebugbar')
     {
         $this->redis = $redis;
         $this->hash = $hash;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function save($id, $data)
     {
-        $this->redis->hset($this->hash, $id, serialize($data));
+        $this->redis->hset("$this->hash:meta", $id, serialize($data['__meta']));
+        unset($data['__meta']);
+        $this->redis->hset("$this->hash:data", $id, serialize($data));
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function get($id)
     {
-        return unserialize($this->redis->hget($this->hash, $id));
+        return array_merge(unserialize($this->redis->hget("$this->hash:data", $id)),
+            array('__meta' => unserialize($this->redis->hget("$this->hash:meta", $id))));
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function find(array $filters = array(), $max = 20, $offset = 0)
     {
         $results = array();
-        foreach ($this->redis->hgetall($this->hash) as $id => $data) {
-            if ($data = unserialize($data)) {
-                $meta = $data['__meta'];
-                if ($this->filter($meta, $filters)) {
-                    $results[] = $meta;
+        $cursor = "0";
+        do {
+            list($cursor, $data) = $this->redis->hscan("$this->hash:meta", $cursor);
+
+            foreach ($data as $meta) {
+                if ($meta = unserialize($meta)) {
+                    if ($this->filter($meta, $filters)) {
+                        $results[] = $meta;
+                    }
                 }
             }
-        }
+        } while($cursor);
+        
+        usort($results, function ($a, $b) {
+            return $a['utime'] < $b['utime'];
+        });
+        
         return array_slice($results, $offset, $max);
     }
 
@@ -67,6 +87,9 @@ class RedisStorage implements StorageInterface
         return true;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function clear()
     {
         $this->redis->del($this->hash);
diff --git a/htdocs/includes/DebugBar/Storage/StorageInterface.php b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/StorageInterface.php
similarity index 100%
rename from htdocs/includes/DebugBar/Storage/StorageInterface.php
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/StorageInterface.php
diff --git a/htdocs/includes/DebugBar/Storage/pdo_storage_schema.sql b/htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/pdo_storage_schema.sql
similarity index 100%
rename from htdocs/includes/DebugBar/Storage/pdo_storage_schema.sql
rename to htdocs/includes/maximebf/debugbar/src/DebugBar/Storage/pdo_storage_schema.sql
diff --git a/htdocs/includes/nnnick/chartjs/.gitignore b/htdocs/includes/nnnick/chartjs/.gitignore
index c4998047b01..6a066b92f38 100644
--- a/htdocs/includes/nnnick/chartjs/.gitignore
+++ b/htdocs/includes/nnnick/chartjs/.gitignore
@@ -1,6 +1,7 @@
 /_book
 /coverage
 /custom
+/dist
 /docs/index.md
 /gh-pages
 /jsdoc
diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php
index cd8bec8c4ff..ca8797ba577 100644
--- a/htdocs/includes/odtphp/Segment.php
+++ b/htdocs/includes/odtphp/Segment.php
@@ -231,14 +231,10 @@ class Segment implements IteratorAggregate, Countable
             //throw new SegmentException("var $key not found in {$this->getName()}");
         }
 
-		$value=$this->odf->htmlToUTFAndPreOdf($value);
+        $tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
 
-		$value = $encode ? htmlspecialchars($value) : $value;
-		$value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value;
-
-		$value=$this->odf->preOdfToOdf($value);
-
-        $this->vars[$this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT')] = $value;
+		$this->vars[$tag] = $this->odf->convertVarToOdf($value, $encode, $charset);
+        
         return $this;
     }
     /**
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index d84559eb459..f6e15b2e8a2 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -141,8 +141,24 @@ class Odf
 			//}
 		}
 
+		$this->vars[$tag] = $this->convertVarToOdf($value, $encode, $charset);
+		
+		return $this;
+	}
+
+	/**
+     * Replaces html tags in odt tags and returns a compatible string
+     * @param string   $key        Name of the variable within the template
+	 * @param string   $value      Replacement value
+	 * @param bool     $encode     If true, special XML characters are encoded
+	 * @param string   $charset    Charset
+     * @return string
+     */
+	public function convertVarToOdf($value, $encode = true, $charset = 'ISO-8859')
+	{
 		$value = $encode ? htmlspecialchars($value) : $value;
 		$value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value;
+		$convertedValue = $value;
 
 		// Check if the value includes html tags
 		if ($this->_hasHtmlTag($value) === true) {
@@ -156,7 +172,7 @@ class Odf
 				'<style:style style:name="supText" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>'
 			);
 	
-			$this->vars[$tag] = $this->_replaceHtmlWithOdtTag($this->_getDataFromHtml($value), $customStyles, $fontDeclarations);
+			$convertedValue = $this->_replaceHtmlWithOdtTag($this->_getDataFromHtml($value), $customStyles, $fontDeclarations);
 	
 			foreach ($customStyles as $key => $val) {
 				array_push($automaticStyles, '<style:style style:name="customStyle' . $key . '" style:family="text">' . $val . '</style:style>');
@@ -180,9 +196,9 @@ class Odf
 			}
 			$this->contentXml = str_replace('</office:font-face-decls>', $fonts . '</office:font-face-decls>', $this->contentXml);
 		}
-		else $this->vars[$tag] = preg_replace('/(\r\n|\r|\n)/i', "<text:line-break/>", $value);
-		
-		return $this;
+		else $convertedValue = preg_replace('/(\r\n|\r|\n)/i', "<text:line-break/>", $value);
+
+		return $convertedValue;
 	}
 
 	/**
@@ -321,7 +337,7 @@ class Odf
                     $tempHtml = substr($tempHtml, $tagOffset);
                 }
                 // Extract the attribute data from the html tag
-                preg_match_all('/([0-9A-Za-z]+(?:="[0-9A-Za-z\:\-\s\,\;]*")?)+/', $matches[2][0], $explodedAttributes);
+                preg_match_all('/([0-9A-Za-z]+(?:="[0-9A-Za-z\:\-\s\,\;\#]*")?)+/', $matches[2][0], $explodedAttributes);
                 $explodedAttributes = array_filter($explodedAttributes[0]);
                 $attributes = array();
                 // Store each attribute with its name in the $attributes array
diff --git a/htdocs/includes/symfony/var-dumper/CHANGELOG.md b/htdocs/includes/symfony/var-dumper/CHANGELOG.md
new file mode 100644
index 00000000000..6b08aa77ac7
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/CHANGELOG.md
@@ -0,0 +1,7 @@
+CHANGELOG
+=========
+
+2.7.0
+-----
+
+ * deprecated Cloner\Data::getLimitedClone(). Use withMaxDepth, withMaxItemsPerDepth or withRefHandles instead.
diff --git a/htdocs/includes/symfony/var-dumper/Caster/AmqpCaster.php b/htdocs/includes/symfony/var-dumper/Caster/AmqpCaster.php
new file mode 100644
index 00000000000..4e9b351c181
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/AmqpCaster.php
@@ -0,0 +1,164 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts Amqp related classes to array representation.
+ *
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+class AmqpCaster
+{
+    private static $flags = array(
+        AMQP_DURABLE => 'AMQP_DURABLE',
+        AMQP_PASSIVE => 'AMQP_PASSIVE',
+        AMQP_EXCLUSIVE => 'AMQP_EXCLUSIVE',
+        AMQP_AUTODELETE => 'AMQP_AUTODELETE',
+        AMQP_INTERNAL => 'AMQP_INTERNAL',
+        AMQP_NOLOCAL => 'AMQP_NOLOCAL',
+        AMQP_AUTOACK => 'AMQP_AUTOACK',
+        AMQP_IFEMPTY => 'AMQP_IFEMPTY',
+        AMQP_IFUNUSED => 'AMQP_IFUNUSED',
+        AMQP_MANDATORY => 'AMQP_MANDATORY',
+        AMQP_IMMEDIATE => 'AMQP_IMMEDIATE',
+        AMQP_MULTIPLE => 'AMQP_MULTIPLE',
+        AMQP_NOWAIT => 'AMQP_NOWAIT',
+        AMQP_REQUEUE => 'AMQP_REQUEUE',
+    );
+
+    private static $exchangeTypes = array(
+        AMQP_EX_TYPE_DIRECT => 'AMQP_EX_TYPE_DIRECT',
+        AMQP_EX_TYPE_FANOUT => 'AMQP_EX_TYPE_FANOUT',
+        AMQP_EX_TYPE_TOPIC => 'AMQP_EX_TYPE_TOPIC',
+        AMQP_EX_TYPE_HEADERS => 'AMQP_EX_TYPE_HEADERS',
+    );
+
+    public static function castConnection(\AMQPConnection $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        // BC layer in the ampq lib
+        if (method_exists($c, 'getReadTimeout')) {
+            $timeout = $c->getReadTimeout();
+        } else {
+            $timeout = $c->getTimeout();
+        }
+
+        $a += array(
+            $prefix.'isConnected' => $c->isConnected(),
+            $prefix.'login' => $c->getLogin(),
+            $prefix.'password' => $c->getPassword(),
+            $prefix.'host' => $c->getHost(),
+            $prefix.'port' => $c->getPort(),
+            $prefix.'vhost' => $c->getVhost(),
+            $prefix.'readTimeout' => $timeout,
+        );
+
+        return $a;
+    }
+
+    public static function castChannel(\AMQPChannel $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        $a += array(
+            $prefix.'isConnected' => $c->isConnected(),
+            $prefix.'channelId' => $c->getChannelId(),
+            $prefix.'prefetchSize' => $c->getPrefetchSize(),
+            $prefix.'prefetchCount' => $c->getPrefetchCount(),
+            $prefix.'connection' => $c->getConnection(),
+        );
+
+        return $a;
+    }
+
+    public static function castQueue(\AMQPQueue $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        $a += array(
+            $prefix.'name' => $c->getName(),
+            $prefix.'flags' => self::extractFlags($c->getFlags()),
+            $prefix.'arguments' => $c->getArguments(),
+            $prefix.'connection' => $c->getConnection(),
+            $prefix.'channel' => $c->getChannel(),
+        );
+
+        return $a;
+    }
+
+    public static function castExchange(\AMQPExchange $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        $a += array(
+            $prefix.'name' => $c->getName(),
+            $prefix.'flags' => self::extractFlags($c->getFlags()),
+            $prefix.'type' => isset(self::$exchangeTypes[$c->getType()]) ? new ConstStub(self::$exchangeTypes[$c->getType()], $c->getType()) : $c->getType(),
+            $prefix.'arguments' => $c->getArguments(),
+            $prefix.'channel' => $c->getChannel(),
+            $prefix.'connection' => $c->getConnection(),
+        );
+
+        return $a;
+    }
+
+    public static function castEnvelope(\AMQPEnvelope $c, array $a, Stub $stub, $isNested, $filter = 0)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        if (!($filter & Caster::EXCLUDE_VERBOSE)) {
+            $a += array($prefix.'body' => $c->getBody());
+        }
+
+        $a += array(
+            $prefix.'routingKey' => $c->getRoutingKey(),
+            $prefix.'deliveryTag' => $c->getDeliveryTag(),
+            $prefix.'deliveryMode' => new ConstStub($c->getDeliveryMode().(2 === $c->getDeliveryMode() ? ' (persistent)' : ' (non-persistent)'), $c->getDeliveryMode()),
+            $prefix.'exchangeName' => $c->getExchangeName(),
+            $prefix.'isRedelivery' => $c->isRedelivery(),
+            $prefix.'contentType' => $c->getContentType(),
+            $prefix.'contentEncoding' => $c->getContentEncoding(),
+            $prefix.'type' => $c->getType(),
+            $prefix.'timestamp' => $c->getTimestamp(),
+            $prefix.'priority' => $c->getPriority(),
+            $prefix.'expiration' => $c->getExpiration(),
+            $prefix.'userId' => $c->getUserId(),
+            $prefix.'appId' => $c->getAppId(),
+            $prefix.'messageId' => $c->getMessageId(),
+            $prefix.'replyTo' => $c->getReplyTo(),
+            $prefix.'correlationId' => $c->getCorrelationId(),
+            $prefix.'headers' => $c->getHeaders(),
+        );
+
+        return $a;
+    }
+
+    private static function extractFlags($flags)
+    {
+        $flagsArray = array();
+
+        foreach (self::$flags as $value => $name) {
+            if ($flags & $value) {
+                $flagsArray[] = $name;
+            }
+        }
+
+        if (!$flagsArray) {
+            $flagsArray = array('AMQP_NOPARAM');
+        }
+
+        return new ConstStub(implode('|', $flagsArray), $flags);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/Caster.php b/htdocs/includes/symfony/var-dumper/Caster/Caster.php
new file mode 100644
index 00000000000..23e72e87701
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/Caster.php
@@ -0,0 +1,116 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+/**
+ * Helper for filtering out properties in casters.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class Caster
+{
+    const EXCLUDE_VERBOSE = 1;
+    const EXCLUDE_VIRTUAL = 2;
+    const EXCLUDE_DYNAMIC = 4;
+    const EXCLUDE_PUBLIC = 8;
+    const EXCLUDE_PROTECTED = 16;
+    const EXCLUDE_PRIVATE = 32;
+    const EXCLUDE_NULL = 64;
+    const EXCLUDE_EMPTY = 128;
+    const EXCLUDE_NOT_IMPORTANT = 256;
+    const EXCLUDE_STRICT = 512;
+
+    const PREFIX_VIRTUAL = "\0~\0";
+    const PREFIX_DYNAMIC = "\0+\0";
+    const PREFIX_PROTECTED = "\0*\0";
+
+    /**
+     * Casts objects to arrays and adds the dynamic property prefix.
+     *
+     * @param object           $obj       The object to cast.
+     * @param \ReflectionClass $reflector The class reflector to use for inspecting the object definition.
+     *
+     * @return array The array-cast of the object, with prefixed dynamic properties.
+     */
+    public static function castObject($obj, \ReflectionClass $reflector)
+    {
+        if ($reflector->hasMethod('__debugInfo')) {
+            $a = $obj->__debugInfo();
+        } else {
+            $a = (array) $obj;
+        }
+
+        if ($a) {
+            $p = array_keys($a);
+            foreach ($p as $i => $k) {
+                if (!isset($k[0]) || ("\0" !== $k[0] && !$reflector->hasProperty($k))) {
+                    $p[$i] = self::PREFIX_DYNAMIC.$k;
+                } elseif (isset($k[16]) && "\0" === $k[16] && 0 === strpos($k, "\0class@anonymous\0")) {
+                    $p[$i] = "\0".$reflector->getParentClass().'@anonymous'.strrchr($k, "\0");
+                }
+            }
+            $a = array_combine($p, $a);
+        }
+
+        return $a;
+    }
+
+    /**
+     * Filters out the specified properties.
+     *
+     * By default, a single match in the $filter bit field filters properties out, following an "or" logic.
+     * When EXCLUDE_STRICT is set, an "and" logic is applied: all bits must match for a property to be removed.
+     *
+     * @param array    $a                The array containing the properties to filter.
+     * @param int      $filter           A bit field of Caster::EXCLUDE_* constants specifying which properties to filter out.
+     * @param string[] $listedProperties List of properties to exclude when Caster::EXCLUDE_VERBOSE is set, and to preserve when Caster::EXCLUDE_NOT_IMPORTANT is set.
+     *
+     * @return array The filtered array
+     */
+    public static function filter(array $a, $filter, array $listedProperties = array())
+    {
+        foreach ($a as $k => $v) {
+            $type = self::EXCLUDE_STRICT & $filter;
+
+            if (null === $v) {
+                $type |= self::EXCLUDE_NULL & $filter;
+            }
+            if (empty($v)) {
+                $type |= self::EXCLUDE_EMPTY & $filter;
+            }
+            if ((self::EXCLUDE_NOT_IMPORTANT & $filter) && !in_array($k, $listedProperties, true)) {
+                $type |= self::EXCLUDE_NOT_IMPORTANT;
+            }
+            if ((self::EXCLUDE_VERBOSE & $filter) && in_array($k, $listedProperties, true)) {
+                $type |= self::EXCLUDE_VERBOSE;
+            }
+
+            if (!isset($k[1]) || "\0" !== $k[0]) {
+                $type |= self::EXCLUDE_PUBLIC & $filter;
+            } elseif ('~' === $k[1]) {
+                $type |= self::EXCLUDE_VIRTUAL & $filter;
+            } elseif ('+' === $k[1]) {
+                $type |= self::EXCLUDE_DYNAMIC & $filter;
+            } elseif ('*' === $k[1]) {
+                $type |= self::EXCLUDE_PROTECTED & $filter;
+            } else {
+                $type |= self::EXCLUDE_PRIVATE & $filter;
+            }
+
+            if ((self::EXCLUDE_STRICT & $filter) ? $type === $filter : $type) {
+                unset($a[$k]);
+            }
+        }
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ConstStub.php b/htdocs/includes/symfony/var-dumper/Caster/ConstStub.php
new file mode 100644
index 00000000000..f20e03cdf0d
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/ConstStub.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Represents a PHP constant and its value.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ConstStub extends Stub
+{
+    public function __construct($name, $value)
+    {
+        $this->class = $name;
+        $this->value = $value;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/CutArrayStub.php b/htdocs/includes/symfony/var-dumper/Caster/CutArrayStub.php
new file mode 100644
index 00000000000..f2a803053a6
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/CutArrayStub.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+/**
+ * Represents a cut array.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CutArrayStub extends CutStub
+{
+    public $preservedSubset;
+
+    public function __construct(array $value, array $preservedKeys)
+    {
+        parent::__construct($value);
+
+        $this->preservedSubset = array_intersect_key($value, array_flip($preservedKeys));
+        $this->cut -= count($this->preservedSubset);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/CutStub.php b/htdocs/includes/symfony/var-dumper/Caster/CutStub.php
new file mode 100644
index 00000000000..8781f5cf3c6
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/CutStub.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Represents the main properties of a PHP variable, pre-casted by a caster.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CutStub extends Stub
+{
+    public function __construct($value)
+    {
+        $this->value = $value;
+
+        switch (gettype($value)) {
+            case 'object':
+                $this->type = self::TYPE_OBJECT;
+                $this->class = get_class($value);
+                $this->cut = -1;
+                break;
+
+            case 'array':
+                $this->type = self::TYPE_ARRAY;
+                $this->class = self::ARRAY_ASSOC;
+                $this->cut = $this->value = count($value);
+                break;
+
+            case 'resource':
+            case 'unknown type':
+                $this->type = self::TYPE_RESOURCE;
+                $this->handle = (int) $value;
+                $this->class = @get_resource_type($value);
+                $this->cut = -1;
+                break;
+
+            case 'string':
+                $this->type = self::TYPE_STRING;
+                $this->class = preg_match('//u', $value) ? self::STRING_UTF8 : self::STRING_BINARY;
+                $this->cut = self::STRING_BINARY === $this->class ? strlen($value) : mb_strlen($value, 'UTF-8');
+                $this->value = '';
+                break;
+        }
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/DOMCaster.php b/htdocs/includes/symfony/var-dumper/Caster/DOMCaster.php
new file mode 100644
index 00000000000..e04cf9534b3
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/DOMCaster.php
@@ -0,0 +1,302 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts DOM related classes to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DOMCaster
+{
+    private static $errorCodes = array(
+        DOM_PHP_ERR => 'DOM_PHP_ERR',
+        DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR',
+        DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR',
+        DOM_HIERARCHY_REQUEST_ERR => 'DOM_HIERARCHY_REQUEST_ERR',
+        DOM_WRONG_DOCUMENT_ERR => 'DOM_WRONG_DOCUMENT_ERR',
+        DOM_INVALID_CHARACTER_ERR => 'DOM_INVALID_CHARACTER_ERR',
+        DOM_NO_DATA_ALLOWED_ERR => 'DOM_NO_DATA_ALLOWED_ERR',
+        DOM_NO_MODIFICATION_ALLOWED_ERR => 'DOM_NO_MODIFICATION_ALLOWED_ERR',
+        DOM_NOT_FOUND_ERR => 'DOM_NOT_FOUND_ERR',
+        DOM_NOT_SUPPORTED_ERR => 'DOM_NOT_SUPPORTED_ERR',
+        DOM_INUSE_ATTRIBUTE_ERR => 'DOM_INUSE_ATTRIBUTE_ERR',
+        DOM_INVALID_STATE_ERR => 'DOM_INVALID_STATE_ERR',
+        DOM_SYNTAX_ERR => 'DOM_SYNTAX_ERR',
+        DOM_INVALID_MODIFICATION_ERR => 'DOM_INVALID_MODIFICATION_ERR',
+        DOM_NAMESPACE_ERR => 'DOM_NAMESPACE_ERR',
+        DOM_INVALID_ACCESS_ERR => 'DOM_INVALID_ACCESS_ERR',
+        DOM_VALIDATION_ERR => 'DOM_VALIDATION_ERR',
+    );
+
+    private static $nodeTypes = array(
+        XML_ELEMENT_NODE => 'XML_ELEMENT_NODE',
+        XML_ATTRIBUTE_NODE => 'XML_ATTRIBUTE_NODE',
+        XML_TEXT_NODE => 'XML_TEXT_NODE',
+        XML_CDATA_SECTION_NODE => 'XML_CDATA_SECTION_NODE',
+        XML_ENTITY_REF_NODE => 'XML_ENTITY_REF_NODE',
+        XML_ENTITY_NODE => 'XML_ENTITY_NODE',
+        XML_PI_NODE => 'XML_PI_NODE',
+        XML_COMMENT_NODE => 'XML_COMMENT_NODE',
+        XML_DOCUMENT_NODE => 'XML_DOCUMENT_NODE',
+        XML_DOCUMENT_TYPE_NODE => 'XML_DOCUMENT_TYPE_NODE',
+        XML_DOCUMENT_FRAG_NODE => 'XML_DOCUMENT_FRAG_NODE',
+        XML_NOTATION_NODE => 'XML_NOTATION_NODE',
+        XML_HTML_DOCUMENT_NODE => 'XML_HTML_DOCUMENT_NODE',
+        XML_DTD_NODE => 'XML_DTD_NODE',
+        XML_ELEMENT_DECL_NODE => 'XML_ELEMENT_DECL_NODE',
+        XML_ATTRIBUTE_DECL_NODE => 'XML_ATTRIBUTE_DECL_NODE',
+        XML_ENTITY_DECL_NODE => 'XML_ENTITY_DECL_NODE',
+        XML_NAMESPACE_DECL_NODE => 'XML_NAMESPACE_DECL_NODE',
+    );
+
+    public static function castException(\DOMException $e, array $a, Stub $stub, $isNested)
+    {
+        $k = Caster::PREFIX_PROTECTED.'code';
+        if (isset($a[$k], self::$errorCodes[$a[$k]])) {
+            $a[$k] = new ConstStub(self::$errorCodes[$a[$k]], $a[$k]);
+        }
+
+        return $a;
+    }
+
+    public static function castLength($dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'length' => $dom->length,
+        );
+
+        return $a;
+    }
+
+    public static function castImplementation($dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            Caster::PREFIX_VIRTUAL.'Core' => '1.0',
+            Caster::PREFIX_VIRTUAL.'XML' => '2.0',
+        );
+
+        return $a;
+    }
+
+    public static function castNode(\DOMNode $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'nodeName' => $dom->nodeName,
+            'nodeValue' => new CutStub($dom->nodeValue),
+            'nodeType' => new ConstStub(self::$nodeTypes[$dom->nodeType], $dom->nodeType),
+            'parentNode' => new CutStub($dom->parentNode),
+            'childNodes' => $dom->childNodes,
+            'firstChild' => new CutStub($dom->firstChild),
+            'lastChild' => new CutStub($dom->lastChild),
+            'previousSibling' => new CutStub($dom->previousSibling),
+            'nextSibling' => new CutStub($dom->nextSibling),
+            'attributes' => $dom->attributes,
+            'ownerDocument' => new CutStub($dom->ownerDocument),
+            'namespaceURI' => $dom->namespaceURI,
+            'prefix' => $dom->prefix,
+            'localName' => $dom->localName,
+            'baseURI' => $dom->baseURI,
+            'textContent' => new CutStub($dom->textContent),
+        );
+
+        return $a;
+    }
+
+    public static function castNameSpaceNode(\DOMNameSpaceNode $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'nodeName' => $dom->nodeName,
+            'nodeValue' => new CutStub($dom->nodeValue),
+            'nodeType' => new ConstStub(self::$nodeTypes[$dom->nodeType], $dom->nodeType),
+            'prefix' => $dom->prefix,
+            'localName' => $dom->localName,
+            'namespaceURI' => $dom->namespaceURI,
+            'ownerDocument' => new CutStub($dom->ownerDocument),
+            'parentNode' => new CutStub($dom->parentNode),
+        );
+
+        return $a;
+    }
+
+    public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, $isNested, $filter = 0)
+    {
+        $a += array(
+            'doctype' => $dom->doctype,
+            'implementation' => $dom->implementation,
+            'documentElement' => new CutStub($dom->documentElement),
+            'actualEncoding' => $dom->actualEncoding,
+            'encoding' => $dom->encoding,
+            'xmlEncoding' => $dom->xmlEncoding,
+            'standalone' => $dom->standalone,
+            'xmlStandalone' => $dom->xmlStandalone,
+            'version' => $dom->version,
+            'xmlVersion' => $dom->xmlVersion,
+            'strictErrorChecking' => $dom->strictErrorChecking,
+            'documentURI' => $dom->documentURI,
+            'config' => $dom->config,
+            'formatOutput' => $dom->formatOutput,
+            'validateOnParse' => $dom->validateOnParse,
+            'resolveExternals' => $dom->resolveExternals,
+            'preserveWhiteSpace' => $dom->preserveWhiteSpace,
+            'recover' => $dom->recover,
+            'substituteEntities' => $dom->substituteEntities,
+        );
+
+        if (!($filter & Caster::EXCLUDE_VERBOSE)) {
+            $formatOutput = $dom->formatOutput;
+            $dom->formatOutput = true;
+            $a += array(Caster::PREFIX_VIRTUAL.'xml' => $dom->saveXML());
+            $dom->formatOutput = $formatOutput;
+        }
+
+        return $a;
+    }
+
+    public static function castCharacterData(\DOMCharacterData $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'data' => $dom->data,
+            'length' => $dom->length,
+        );
+
+        return $a;
+    }
+
+    public static function castAttr(\DOMAttr $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'name' => $dom->name,
+            'specified' => $dom->specified,
+            'value' => $dom->value,
+            'ownerElement' => $dom->ownerElement,
+            'schemaTypeInfo' => $dom->schemaTypeInfo,
+        );
+
+        return $a;
+    }
+
+    public static function castElement(\DOMElement $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'tagName' => $dom->tagName,
+            'schemaTypeInfo' => $dom->schemaTypeInfo,
+        );
+
+        return $a;
+    }
+
+    public static function castText(\DOMText $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'wholeText' => $dom->wholeText,
+        );
+
+        return $a;
+    }
+
+    public static function castTypeinfo(\DOMTypeinfo $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'typeName' => $dom->typeName,
+            'typeNamespace' => $dom->typeNamespace,
+        );
+
+        return $a;
+    }
+
+    public static function castDomError(\DOMDomError $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'severity' => $dom->severity,
+            'message' => $dom->message,
+            'type' => $dom->type,
+            'relatedException' => $dom->relatedException,
+            'related_data' => $dom->related_data,
+            'location' => $dom->location,
+        );
+
+        return $a;
+    }
+
+    public static function castLocator(\DOMLocator $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'lineNumber' => $dom->lineNumber,
+            'columnNumber' => $dom->columnNumber,
+            'offset' => $dom->offset,
+            'relatedNode' => $dom->relatedNode,
+            'uri' => $dom->uri,
+        );
+
+        return $a;
+    }
+
+    public static function castDocumentType(\DOMDocumentType $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'name' => $dom->name,
+            'entities' => $dom->entities,
+            'notations' => $dom->notations,
+            'publicId' => $dom->publicId,
+            'systemId' => $dom->systemId,
+            'internalSubset' => $dom->internalSubset,
+        );
+
+        return $a;
+    }
+
+    public static function castNotation(\DOMNotation $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'publicId' => $dom->publicId,
+            'systemId' => $dom->systemId,
+        );
+
+        return $a;
+    }
+
+    public static function castEntity(\DOMEntity $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'publicId' => $dom->publicId,
+            'systemId' => $dom->systemId,
+            'notationName' => $dom->notationName,
+            'actualEncoding' => $dom->actualEncoding,
+            'encoding' => $dom->encoding,
+            'version' => $dom->version,
+        );
+
+        return $a;
+    }
+
+    public static function castProcessingInstruction(\DOMProcessingInstruction $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'target' => $dom->target,
+            'data' => $dom->data,
+        );
+
+        return $a;
+    }
+
+    public static function castXPath(\DOMXPath $dom, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            'document' => $dom->document,
+        );
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/DoctrineCaster.php b/htdocs/includes/symfony/var-dumper/Caster/DoctrineCaster.php
new file mode 100644
index 00000000000..f6573b34fd1
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/DoctrineCaster.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Doctrine\Common\Proxy\Proxy as CommonProxy;
+use Doctrine\ORM\Proxy\Proxy as OrmProxy;
+use Doctrine\ORM\PersistentCollection;
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts Doctrine related classes to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class DoctrineCaster
+{
+    public static function castCommonProxy(CommonProxy $proxy, array $a, Stub $stub, $isNested)
+    {
+        foreach (array('__cloner__', '__initializer__') as $k) {
+            if (array_key_exists($k, $a)) {
+                unset($a[$k]);
+                ++$stub->cut;
+            }
+        }
+
+        return $a;
+    }
+
+    public static function castOrmProxy(OrmProxy $proxy, array $a, Stub $stub, $isNested)
+    {
+        foreach (array('_entityPersister', '_identifier') as $k) {
+            if (array_key_exists($k = "\0Doctrine\\ORM\\Proxy\\Proxy\0".$k, $a)) {
+                unset($a[$k]);
+                ++$stub->cut;
+            }
+        }
+
+        return $a;
+    }
+
+    public static function castPersistentCollection(PersistentCollection $coll, array $a, Stub $stub, $isNested)
+    {
+        foreach (array('snapshot', 'association', 'typeClass') as $k) {
+            if (array_key_exists($k = "\0Doctrine\\ORM\\PersistentCollection\0".$k, $a)) {
+                $a[$k] = new CutStub($a[$k]);
+            }
+        }
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/EnumStub.php b/htdocs/includes/symfony/var-dumper/Caster/EnumStub.php
new file mode 100644
index 00000000000..67bb2e16390
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/EnumStub.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Represents an enumeration of values.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class EnumStub extends Stub
+{
+    public function __construct(array $values)
+    {
+        $this->value = $values;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ExceptionCaster.php b/htdocs/includes/symfony/var-dumper/Caster/ExceptionCaster.php
new file mode 100644
index 00000000000..a5a8773e859
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/ExceptionCaster.php
@@ -0,0 +1,238 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Exception\ThrowingCasterException;
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts common Exception classes to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ExceptionCaster
+{
+    public static $srcContext = 1;
+    public static $traceArgs = true;
+    public static $errorTypes = array(
+        E_DEPRECATED => 'E_DEPRECATED',
+        E_USER_DEPRECATED => 'E_USER_DEPRECATED',
+        E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
+        E_ERROR => 'E_ERROR',
+        E_WARNING => 'E_WARNING',
+        E_PARSE => 'E_PARSE',
+        E_NOTICE => 'E_NOTICE',
+        E_CORE_ERROR => 'E_CORE_ERROR',
+        E_CORE_WARNING => 'E_CORE_WARNING',
+        E_COMPILE_ERROR => 'E_COMPILE_ERROR',
+        E_COMPILE_WARNING => 'E_COMPILE_WARNING',
+        E_USER_ERROR => 'E_USER_ERROR',
+        E_USER_WARNING => 'E_USER_WARNING',
+        E_USER_NOTICE => 'E_USER_NOTICE',
+        E_STRICT => 'E_STRICT',
+    );
+
+    public static function castError(\Error $e, array $a, Stub $stub, $isNested, $filter = 0)
+    {
+        return self::filterExceptionArray($stub->class, $a, "\0Error\0", $filter);
+    }
+
+    public static function castException(\Exception $e, array $a, Stub $stub, $isNested, $filter = 0)
+    {
+        return self::filterExceptionArray($stub->class, $a, "\0Exception\0", $filter);
+    }
+
+    public static function castErrorException(\ErrorException $e, array $a, Stub $stub, $isNested)
+    {
+        if (isset($a[$s = Caster::PREFIX_PROTECTED.'severity'], self::$errorTypes[$a[$s]])) {
+            $a[$s] = new ConstStub(self::$errorTypes[$a[$s]], $a[$s]);
+        }
+
+        return $a;
+    }
+
+    public static function castThrowingCasterException(ThrowingCasterException $e, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_PROTECTED;
+        $xPrefix = "\0Exception\0";
+
+        if (isset($a[$xPrefix.'previous'], $a[$xPrefix.'trace'])) {
+            $b = (array) $a[$xPrefix.'previous'];
+            array_unshift($b[$xPrefix.'trace'], array(
+                'function' => 'new '.get_class($a[$xPrefix.'previous']),
+                'file' => $b[$prefix.'file'],
+                'line' => $b[$prefix.'line'],
+            ));
+            $a[$xPrefix.'trace'] = new TraceStub($b[$xPrefix.'trace'], false, 0, -1 - count($a[$xPrefix.'trace']->value));
+        }
+
+        unset($a[$xPrefix.'previous'], $a[$prefix.'code'], $a[$prefix.'file'], $a[$prefix.'line']);
+
+        return $a;
+    }
+
+    public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, $isNested)
+    {
+        if (!$isNested) {
+            return $a;
+        }
+        $stub->class = '';
+        $stub->handle = 0;
+        $frames = $trace->value;
+
+        $a = array();
+        $j = count($frames);
+        if (0 > $i = $trace->sliceOffset) {
+            $i = max(0, $j + $i);
+        }
+        if (!isset($trace->value[$i])) {
+            return array();
+        }
+        $lastCall = isset($frames[$i]['function']) ? ' ==> '.(isset($frames[$i]['class']) ? $frames[0]['class'].$frames[$i]['type'] : '').$frames[$i]['function'].'()' : '';
+
+        for ($j += $trace->numberingOffset - $i++; isset($frames[$i]); ++$i, --$j) {
+            $call = isset($frames[$i]['function']) ? (isset($frames[$i]['class']) ? $frames[$i]['class'].$frames[$i]['type'] : '').$frames[$i]['function'].'()' : '???';
+
+            $a[Caster::PREFIX_VIRTUAL.$j.'. '.$call.$lastCall] = new FrameStub(
+                array(
+                    'object' => isset($frames[$i]['object']) ? $frames[$i]['object'] : null,
+                    'class' => isset($frames[$i]['class']) ? $frames[$i]['class'] : null,
+                    'type' => isset($frames[$i]['type']) ? $frames[$i]['type'] : null,
+                    'function' => isset($frames[$i]['function']) ? $frames[$i]['function'] : null,
+                ) + $frames[$i - 1],
+                $trace->keepArgs,
+                true
+            );
+
+            $lastCall = ' ==> '.$call;
+        }
+        $a[Caster::PREFIX_VIRTUAL.$j.'. {main}'.$lastCall] = new FrameStub(
+            array(
+                'object' => null,
+                'class' => null,
+                'type' => null,
+                'function' => '{main}',
+            ) + $frames[$i - 1],
+            $trace->keepArgs,
+            true
+        );
+        if (null !== $trace->sliceLength) {
+            $a = array_slice($a, 0, $trace->sliceLength, true);
+        }
+
+        return $a;
+    }
+
+    public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, $isNested)
+    {
+        if (!$isNested) {
+            return $a;
+        }
+        $f = $frame->value;
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        if (isset($f['file'], $f['line'])) {
+            if (preg_match('/\((\d+)\)(?:\([\da-f]{32}\))? : (?:eval\(\)\'d code|runtime-created function)$/', $f['file'], $match)) {
+                $f['file'] = substr($f['file'], 0, -strlen($match[0]));
+                $f['line'] = (int) $match[1];
+            }
+            if (file_exists($f['file']) && 0 <= self::$srcContext) {
+                $src[$f['file'].':'.$f['line']] = self::extractSource(explode("\n", file_get_contents($f['file'])), $f['line'], self::$srcContext);
+
+                if (!empty($f['class']) && is_subclass_of($f['class'], 'Twig_Template') && method_exists($f['class'], 'getDebugInfo')) {
+                    $template = isset($f['object']) ? $f['object'] : new $f['class'](new \Twig_Environment(new \Twig_Loader_Filesystem()));
+
+                    try {
+                        $templateName = $template->getTemplateName();
+                        $templateSrc = explode("\n", method_exists($template, 'getSource') ? $template->getSource() : $template->getEnvironment()->getLoader()->getSource($templateName));
+                        $templateInfo = $template->getDebugInfo();
+                        if (isset($templateInfo[$f['line']])) {
+                            $src[$templateName.':'.$templateInfo[$f['line']]] = self::extractSource($templateSrc, $templateInfo[$f['line']], self::$srcContext);
+                        }
+                    } catch (\Twig_Error_Loader $e) {
+                    }
+                }
+            } else {
+                $src[$f['file']] = $f['line'];
+            }
+            $a[$prefix.'src'] = new EnumStub($src);
+        }
+
+        unset($a[$prefix.'args'], $a[$prefix.'line'], $a[$prefix.'file']);
+        if ($frame->inTraceStub) {
+            unset($a[$prefix.'class'], $a[$prefix.'type'], $a[$prefix.'function']);
+        }
+        foreach ($a as $k => $v) {
+            if (!$v) {
+                unset($a[$k]);
+            }
+        }
+        if ($frame->keepArgs && isset($f['args'])) {
+            $a[$prefix.'args'] = $f['args'];
+        }
+
+        return $a;
+    }
+
+    private static function filterExceptionArray($xClass, array $a, $xPrefix, $filter)
+    {
+        if (isset($a[$xPrefix.'trace'])) {
+            $trace = $a[$xPrefix.'trace'];
+            unset($a[$xPrefix.'trace']); // Ensures the trace is always last
+        } else {
+            $trace = array();
+        }
+
+        if (!($filter & Caster::EXCLUDE_VERBOSE)) {
+            array_unshift($trace, array(
+                'function' => $xClass ? 'new '.$xClass : null,
+                'file' => $a[Caster::PREFIX_PROTECTED.'file'],
+                'line' => $a[Caster::PREFIX_PROTECTED.'line'],
+            ));
+            $a[$xPrefix.'trace'] = new TraceStub($trace);
+        }
+        if (empty($a[$xPrefix.'previous'])) {
+            unset($a[$xPrefix.'previous']);
+        }
+        unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);
+
+        return $a;
+    }
+
+    private static function extractSource(array $srcArray, $line, $srcContext)
+    {
+        $src = array();
+
+        for ($i = $line - 1 - $srcContext; $i <= $line - 1 + $srcContext; ++$i) {
+            $src[] = (isset($srcArray[$i]) ? $srcArray[$i] : '')."\n";
+        }
+
+        $ltrim = 0;
+        while (' ' === $src[0][$ltrim] || "\t" === $src[0][$ltrim]) {
+            $i = $srcContext << 1;
+            while ($i > 0 && $src[0][$ltrim] === $src[$i][$ltrim]) {
+                --$i;
+            }
+            if ($i) {
+                break;
+            }
+            ++$ltrim;
+        }
+        if ($ltrim) {
+            foreach ($src as $i => $line) {
+                $src[$i] = substr($line, $ltrim);
+            }
+        }
+
+        return implode('', $src);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/FrameStub.php b/htdocs/includes/symfony/var-dumper/Caster/FrameStub.php
new file mode 100644
index 00000000000..1e1194dc85b
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/FrameStub.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+/**
+ * Represents a single backtrace frame as returned by debug_backtrace() or Exception->getTrace().
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class FrameStub extends EnumStub
+{
+    public $keepArgs;
+    public $inTraceStub;
+
+    public function __construct(array $frame, $keepArgs = true, $inTraceStub = false)
+    {
+        $this->value = $frame;
+        $this->keepArgs = $keepArgs;
+        $this->inTraceStub = $inTraceStub;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/MongoCaster.php b/htdocs/includes/symfony/var-dumper/Caster/MongoCaster.php
new file mode 100644
index 00000000000..92258f06fa2
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/MongoCaster.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts classes from the MongoDb extension to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class MongoCaster
+{
+    public static function castCursor(\MongoCursorInterface $cursor, array $a, Stub $stub, $isNested)
+    {
+        if ($info = $cursor->info()) {
+            foreach ($info as $k => $v) {
+                $a[Caster::PREFIX_VIRTUAL.$k] = $v;
+            }
+        }
+        $a[Caster::PREFIX_VIRTUAL.'dead'] = $cursor->dead();
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/PdoCaster.php b/htdocs/includes/symfony/var-dumper/Caster/PdoCaster.php
new file mode 100644
index 00000000000..e60b9275fd8
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/PdoCaster.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts PDO related classes to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class PdoCaster
+{
+    private static $pdoAttributes = array(
+        'CASE' => array(
+            \PDO::CASE_LOWER => 'LOWER',
+            \PDO::CASE_NATURAL => 'NATURAL',
+            \PDO::CASE_UPPER => 'UPPER',
+        ),
+        'ERRMODE' => array(
+            \PDO::ERRMODE_SILENT => 'SILENT',
+            \PDO::ERRMODE_WARNING => 'WARNING',
+            \PDO::ERRMODE_EXCEPTION => 'EXCEPTION',
+        ),
+        'TIMEOUT',
+        'PREFETCH',
+        'AUTOCOMMIT',
+        'PERSISTENT',
+        'DRIVER_NAME',
+        'SERVER_INFO',
+        'ORACLE_NULLS' => array(
+            \PDO::NULL_NATURAL => 'NATURAL',
+            \PDO::NULL_EMPTY_STRING => 'EMPTY_STRING',
+            \PDO::NULL_TO_STRING => 'TO_STRING',
+        ),
+        'CLIENT_VERSION',
+        'SERVER_VERSION',
+        'STATEMENT_CLASS',
+        'EMULATE_PREPARES',
+        'CONNECTION_STATUS',
+        'STRINGIFY_FETCHES',
+        'DEFAULT_FETCH_MODE' => array(
+            \PDO::FETCH_ASSOC => 'ASSOC',
+            \PDO::FETCH_BOTH => 'BOTH',
+            \PDO::FETCH_LAZY => 'LAZY',
+            \PDO::FETCH_NUM => 'NUM',
+            \PDO::FETCH_OBJ => 'OBJ',
+        ),
+    );
+
+    public static function castPdo(\PDO $c, array $a, Stub $stub, $isNested)
+    {
+        $attr = array();
+        $errmode = $c->getAttribute(\PDO::ATTR_ERRMODE);
+        $c->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+
+        foreach (self::$pdoAttributes as $k => $v) {
+            if (!isset($k[0])) {
+                $k = $v;
+                $v = array();
+            }
+
+            try {
+                $attr[$k] = 'ERRMODE' === $k ? $errmode : $c->getAttribute(constant('PDO::ATTR_'.$k));
+                if ($v && isset($v[$attr[$k]])) {
+                    $attr[$k] = new ConstStub($v[$attr[$k]], $attr[$k]);
+                }
+            } catch (\Exception $e) {
+            }
+        }
+
+        $prefix = Caster::PREFIX_VIRTUAL;
+        $a += array(
+            $prefix.'inTransaction' => method_exists($c, 'inTransaction'),
+            $prefix.'errorInfo' => $c->errorInfo(),
+            $prefix.'attributes' => new EnumStub($attr),
+        );
+
+        if ($a[$prefix.'inTransaction']) {
+            $a[$prefix.'inTransaction'] = $c->inTransaction();
+        } else {
+            unset($a[$prefix.'inTransaction']);
+        }
+
+        if (!isset($a[$prefix.'errorInfo'][1], $a[$prefix.'errorInfo'][2])) {
+            unset($a[$prefix.'errorInfo']);
+        }
+
+        $c->setAttribute(\PDO::ATTR_ERRMODE, $errmode);
+
+        return $a;
+    }
+
+    public static function castPdoStatement(\PDOStatement $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+        $a[$prefix.'errorInfo'] = $c->errorInfo();
+
+        if (!isset($a[$prefix.'errorInfo'][1], $a[$prefix.'errorInfo'][2])) {
+            unset($a[$prefix.'errorInfo']);
+        }
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/PgSqlCaster.php b/htdocs/includes/symfony/var-dumper/Caster/PgSqlCaster.php
new file mode 100644
index 00000000000..88414e4ccff
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/PgSqlCaster.php
@@ -0,0 +1,154 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts pqsql resources to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class PgSqlCaster
+{
+    private static $paramCodes = array(
+        'server_encoding',
+        'client_encoding',
+        'is_superuser',
+        'session_authorization',
+        'DateStyle',
+        'TimeZone',
+        'IntervalStyle',
+        'integer_datetimes',
+        'application_name',
+        'standard_conforming_strings',
+    );
+
+    private static $transactionStatus = array(
+        PGSQL_TRANSACTION_IDLE => 'PGSQL_TRANSACTION_IDLE',
+        PGSQL_TRANSACTION_ACTIVE => 'PGSQL_TRANSACTION_ACTIVE',
+        PGSQL_TRANSACTION_INTRANS => 'PGSQL_TRANSACTION_INTRANS',
+        PGSQL_TRANSACTION_INERROR => 'PGSQL_TRANSACTION_INERROR',
+        PGSQL_TRANSACTION_UNKNOWN => 'PGSQL_TRANSACTION_UNKNOWN',
+    );
+
+    private static $resultStatus = array(
+        PGSQL_EMPTY_QUERY => 'PGSQL_EMPTY_QUERY',
+        PGSQL_COMMAND_OK => 'PGSQL_COMMAND_OK',
+        PGSQL_TUPLES_OK => 'PGSQL_TUPLES_OK',
+        PGSQL_COPY_OUT => 'PGSQL_COPY_OUT',
+        PGSQL_COPY_IN => 'PGSQL_COPY_IN',
+        PGSQL_BAD_RESPONSE => 'PGSQL_BAD_RESPONSE',
+        PGSQL_NONFATAL_ERROR => 'PGSQL_NONFATAL_ERROR',
+        PGSQL_FATAL_ERROR => 'PGSQL_FATAL_ERROR',
+    );
+
+    private static $diagCodes = array(
+        'severity' => PGSQL_DIAG_SEVERITY,
+        'sqlstate' => PGSQL_DIAG_SQLSTATE,
+        'message' => PGSQL_DIAG_MESSAGE_PRIMARY,
+        'detail' => PGSQL_DIAG_MESSAGE_DETAIL,
+        'hint' => PGSQL_DIAG_MESSAGE_HINT,
+        'statement position' => PGSQL_DIAG_STATEMENT_POSITION,
+        'internal position' => PGSQL_DIAG_INTERNAL_POSITION,
+        'internal query' => PGSQL_DIAG_INTERNAL_QUERY,
+        'context' => PGSQL_DIAG_CONTEXT,
+        'file' => PGSQL_DIAG_SOURCE_FILE,
+        'line' => PGSQL_DIAG_SOURCE_LINE,
+        'function' => PGSQL_DIAG_SOURCE_FUNCTION,
+    );
+
+    public static function castLargeObject($lo, array $a, Stub $stub, $isNested)
+    {
+        $a['seek position'] = pg_lo_tell($lo);
+
+        return $a;
+    }
+
+    public static function castLink($link, array $a, Stub $stub, $isNested)
+    {
+        $a['status'] = pg_connection_status($link);
+        $a['status'] = new ConstStub(PGSQL_CONNECTION_OK === $a['status'] ? 'PGSQL_CONNECTION_OK' : 'PGSQL_CONNECTION_BAD', $a['status']);
+        $a['busy'] = pg_connection_busy($link);
+
+        $a['transaction'] = pg_transaction_status($link);
+        if (isset(self::$transactionStatus[$a['transaction']])) {
+            $a['transaction'] = new ConstStub(self::$transactionStatus[$a['transaction']], $a['transaction']);
+        }
+
+        $a['pid'] = pg_get_pid($link);
+        $a['last error'] = pg_last_error($link);
+        $a['last notice'] = pg_last_notice($link);
+        $a['host'] = pg_host($link);
+        $a['port'] = pg_port($link);
+        $a['dbname'] = pg_dbname($link);
+        $a['options'] = pg_options($link);
+        $a['version'] = pg_version($link);
+
+        foreach (self::$paramCodes as $v) {
+            if (false !== $s = pg_parameter_status($link, $v)) {
+                $a['param'][$v] = $s;
+            }
+        }
+
+        $a['param']['client_encoding'] = pg_client_encoding($link);
+        $a['param'] = new EnumStub($a['param']);
+
+        return $a;
+    }
+
+    public static function castResult($result, array $a, Stub $stub, $isNested)
+    {
+        $a['num rows'] = pg_num_rows($result);
+        $a['status'] = pg_result_status($result);
+        if (isset(self::$resultStatus[$a['status']])) {
+            $a['status'] = new ConstStub(self::$resultStatus[$a['status']], $a['status']);
+        }
+        $a['command-completion tag'] = pg_result_status($result, PGSQL_STATUS_STRING);
+
+        if (-1 === $a['num rows']) {
+            foreach (self::$diagCodes as $k => $v) {
+                $a['error'][$k] = pg_result_error_field($result, $v);
+            }
+        }
+
+        $a['affected rows'] = pg_affected_rows($result);
+        $a['last OID'] = pg_last_oid($result);
+
+        $fields = pg_num_fields($result);
+
+        for ($i = 0; $i < $fields; ++$i) {
+            $field = array(
+                'name' => pg_field_name($result, $i),
+                'table' => sprintf('%s (OID: %s)', pg_field_table($result, $i), pg_field_table($result, $i, true)),
+                'type' => sprintf('%s (OID: %s)', pg_field_type($result, $i), pg_field_type_oid($result, $i)),
+                'nullable' => (bool) pg_field_is_null($result, $i),
+                'storage' => pg_field_size($result, $i).' bytes',
+                'display' => pg_field_prtlen($result, $i).' chars',
+            );
+            if (' (OID: )' === $field['table']) {
+                $field['table'] = null;
+            }
+            if ('-1 bytes' === $field['storage']) {
+                $field['storage'] = 'variable size';
+            } elseif ('1 bytes' === $field['storage']) {
+                $field['storage'] = '1 byte';
+            }
+            if ('1 chars' === $field['display']) {
+                $field['display'] = '1 char';
+            }
+            $a['fields'][] = new EnumStub($field);
+        }
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ReflectionCaster.php b/htdocs/includes/symfony/var-dumper/Caster/ReflectionCaster.php
new file mode 100644
index 00000000000..936e11982ee
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/ReflectionCaster.php
@@ -0,0 +1,310 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts Reflector related classes to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ReflectionCaster
+{
+    private static $extraMap = array(
+        'docComment' => 'getDocComment',
+        'extension' => 'getExtensionName',
+        'isDisabled' => 'isDisabled',
+        'isDeprecated' => 'isDeprecated',
+        'isInternal' => 'isInternal',
+        'isUserDefined' => 'isUserDefined',
+        'isGenerator' => 'isGenerator',
+        'isVariadic' => 'isVariadic',
+    );
+
+    public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+        $c = new \ReflectionFunction($c);
+
+        $stub->class = 'Closure'; // HHVM generates unique class names for closures
+        $a = static::castFunctionAbstract($c, $a, $stub, $isNested);
+
+        if (isset($a[$prefix.'parameters'])) {
+            foreach ($a[$prefix.'parameters']->value as &$v) {
+                $param = $v;
+                $v = new EnumStub(array());
+                foreach (static::castParameter($param, array(), $stub, true) as $k => $param) {
+                    if ("\0" === $k[0]) {
+                        $v->value[substr($k, 3)] = $param;
+                    }
+                }
+                unset($v->value['position'], $v->value['isVariadic'], $v->value['byReference'], $v);
+            }
+        }
+
+        if ($f = $c->getFileName()) {
+            $a[$prefix.'file'] = $f;
+            $a[$prefix.'line'] = $c->getStartLine().' to '.$c->getEndLine();
+        }
+
+        $prefix = Caster::PREFIX_DYNAMIC;
+        unset($a['name'], $a[$prefix.'0'], $a[$prefix.'this'], $a[$prefix.'parameter'], $a[Caster::PREFIX_VIRTUAL.'extra']);
+
+        return $a;
+    }
+
+    public static function castGenerator(\Generator $c, array $a, Stub $stub, $isNested)
+    {
+        return class_exists('ReflectionGenerator', false) ? self::castReflectionGenerator(new \ReflectionGenerator($c), $a, $stub, $isNested) : $a;
+    }
+
+    public static function castType(\ReflectionType $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        $a += array(
+            $prefix.'type' => $c->__toString(),
+            $prefix.'allowsNull' => $c->allowsNull(),
+            $prefix.'isBuiltin' => $c->isBuiltin(),
+        );
+
+        return $a;
+    }
+
+    public static function castReflectionGenerator(\ReflectionGenerator $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        if ($c->getThis()) {
+            $a[$prefix.'this'] = new CutStub($c->getThis());
+        }
+        $x = $c->getFunction();
+        $frame = array(
+            'class' => isset($x->class) ? $x->class : null,
+            'type' => isset($x->class) ? ($x->isStatic() ? '::' : '->') : null,
+            'function' => $x->name,
+            'file' => $c->getExecutingFile(),
+            'line' => $c->getExecutingLine(),
+        );
+        if ($trace = $c->getTrace(DEBUG_BACKTRACE_IGNORE_ARGS)) {
+            $x = new \ReflectionGenerator($c->getExecutingGenerator());
+            array_unshift($trace, array(
+                'function' => 'yield',
+                'file' => $x->getExecutingFile(),
+                'line' => $x->getExecutingLine() - 1,
+            ));
+            $trace[] = $frame;
+            $a[$prefix.'trace'] = new TraceStub($trace, false, 0, -1, -1);
+        } else {
+            $x = new FrameStub($frame, false, true);
+            $x = ExceptionCaster::castFrameStub($x, array(), $x, true);
+            $a[$prefix.'executing'] = new EnumStub(array(
+                $frame['class'].$frame['type'].$frame['function'].'()' => $x[$prefix.'src'],
+            ));
+        }
+
+        return $a;
+    }
+
+    public static function castClass(\ReflectionClass $c, array $a, Stub $stub, $isNested, $filter = 0)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        if ($n = \Reflection::getModifierNames($c->getModifiers())) {
+            $a[$prefix.'modifiers'] = implode(' ', $n);
+        }
+
+        self::addMap($a, $c, array(
+            'extends' => 'getParentClass',
+            'implements' => 'getInterfaceNames',
+            'constants' => 'getConstants',
+        ));
+
+        foreach ($c->getProperties() as $n) {
+            $a[$prefix.'properties'][$n->name] = $n;
+        }
+
+        foreach ($c->getMethods() as $n) {
+            $a[$prefix.'methods'][$n->name] = $n;
+        }
+
+        if (!($filter & Caster::EXCLUDE_VERBOSE) && !$isNested) {
+            self::addExtra($a, $c);
+        }
+
+        return $a;
+    }
+
+    public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, array $a, Stub $stub, $isNested, $filter = 0)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        self::addMap($a, $c, array(
+            'returnsReference' => 'returnsReference',
+            'returnType' => 'getReturnType',
+            'class' => 'getClosureScopeClass',
+            'this' => 'getClosureThis',
+        ));
+
+        if (isset($a[$prefix.'returnType'])) {
+            $a[$prefix.'returnType'] = (string) $a[$prefix.'returnType'];
+        }
+        if (isset($a[$prefix.'this'])) {
+            $a[$prefix.'this'] = new CutStub($a[$prefix.'this']);
+        }
+
+        foreach ($c->getParameters() as $v) {
+            $k = '$'.$v->name;
+            if ($v->isPassedByReference()) {
+                $k = '&'.$k;
+            }
+            if (method_exists($v, 'isVariadic') && $v->isVariadic()) {
+                $k = '...'.$k;
+            }
+            $a[$prefix.'parameters'][$k] = $v;
+        }
+        if (isset($a[$prefix.'parameters'])) {
+            $a[$prefix.'parameters'] = new EnumStub($a[$prefix.'parameters']);
+        }
+
+        if ($v = $c->getStaticVariables()) {
+            foreach ($v as $k => &$v) {
+                $a[$prefix.'use']['$'.$k] = &$v;
+            }
+            unset($v);
+            $a[$prefix.'use'] = new EnumStub($a[$prefix.'use']);
+        }
+
+        if (!($filter & Caster::EXCLUDE_VERBOSE) && !$isNested) {
+            self::addExtra($a, $c);
+        }
+
+        // Added by HHVM
+        unset($a[Caster::PREFIX_DYNAMIC.'static']);
+
+        return $a;
+    }
+
+    public static function castMethod(\ReflectionMethod $c, array $a, Stub $stub, $isNested)
+    {
+        $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
+
+        return $a;
+    }
+
+    public static function castParameter(\ReflectionParameter $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        // Added by HHVM
+        unset($a['info']);
+
+        self::addMap($a, $c, array(
+            'position' => 'getPosition',
+            'isVariadic' => 'isVariadic',
+            'byReference' => 'isPassedByReference',
+        ));
+
+        try {
+            if (method_exists($c, 'hasType')) {
+                if ($c->hasType()) {
+                    $a[$prefix.'typeHint'] = $c->getType()->__toString();
+                }
+            } elseif ($c->isArray()) {
+                $a[$prefix.'typeHint'] = 'array';
+            } elseif (method_exists($c, 'isCallable') && $c->isCallable()) {
+                $a[$prefix.'typeHint'] = 'callable';
+            } elseif ($v = $c->getClass()) {
+                $a[$prefix.'typeHint'] = $v->name;
+            }
+        } catch (\ReflectionException $e) {
+            if (preg_match('/^Class ([^ ]++) does not exist$/', $e->getMessage(), $m)) {
+                $a[$prefix.'typeHint'] = $m[1];
+            }
+        }
+
+        try {
+            $a[$prefix.'default'] = $v = $c->getDefaultValue();
+            if (method_exists($c, 'isDefaultValueConstant') && $c->isDefaultValueConstant()) {
+                $a[$prefix.'default'] = new ConstStub($c->getDefaultValueConstantName(), $v);
+            }
+        } catch (\ReflectionException $e) {
+            if (isset($a[$prefix.'typeHint']) && $c->allowsNull()) {
+                $a[$prefix.'default'] = null;
+            }
+        }
+
+        return $a;
+    }
+
+    public static function castProperty(\ReflectionProperty $c, array $a, Stub $stub, $isNested)
+    {
+        $a[Caster::PREFIX_VIRTUAL.'modifiers'] = implode(' ', \Reflection::getModifierNames($c->getModifiers()));
+        self::addExtra($a, $c);
+
+        return $a;
+    }
+
+    public static function castExtension(\ReflectionExtension $c, array $a, Stub $stub, $isNested)
+    {
+        self::addMap($a, $c, array(
+            'version' => 'getVersion',
+            'dependencies' => 'getDependencies',
+            'iniEntries' => 'getIniEntries',
+            'isPersistent' => 'isPersistent',
+            'isTemporary' => 'isTemporary',
+            'constants' => 'getConstants',
+            'functions' => 'getFunctions',
+            'classes' => 'getClasses',
+        ));
+
+        return $a;
+    }
+
+    public static function castZendExtension(\ReflectionZendExtension $c, array $a, Stub $stub, $isNested)
+    {
+        self::addMap($a, $c, array(
+            'version' => 'getVersion',
+            'author' => 'getAuthor',
+            'copyright' => 'getCopyright',
+            'url' => 'getURL',
+        ));
+
+        return $a;
+    }
+
+    private static function addExtra(&$a, \Reflector $c)
+    {
+        $x = isset($a[Caster::PREFIX_VIRTUAL.'extra']) ? $a[Caster::PREFIX_VIRTUAL.'extra']->value : array();
+
+        if (method_exists($c, 'getFileName') && $m = $c->getFileName()) {
+            $x['file'] = $m;
+            $x['line'] = $c->getStartLine().' to '.$c->getEndLine();
+        }
+
+        self::addMap($x, $c, self::$extraMap, '');
+
+        if ($x) {
+            $a[Caster::PREFIX_VIRTUAL.'extra'] = new EnumStub($x);
+        }
+    }
+
+    private static function addMap(&$a, \Reflector $c, $map, $prefix = Caster::PREFIX_VIRTUAL)
+    {
+        foreach ($map as $k => $m) {
+            if (method_exists($c, $m) && false !== ($m = $c->$m()) && null !== $m) {
+                $a[$prefix.$k] = $m instanceof \Reflector ? $m->name : $m;
+            }
+        }
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/ResourceCaster.php b/htdocs/includes/symfony/var-dumper/Caster/ResourceCaster.php
new file mode 100644
index 00000000000..903641f69c6
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/ResourceCaster.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts common resource types to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ResourceCaster
+{
+    public static function castCurl($h, array $a, Stub $stub, $isNested)
+    {
+        return curl_getinfo($h);
+    }
+
+    public static function castDba($dba, array $a, Stub $stub, $isNested)
+    {
+        $list = dba_list();
+        $a['file'] = $list[(int) $dba];
+
+        return $a;
+    }
+
+    public static function castProcess($process, array $a, Stub $stub, $isNested)
+    {
+        return proc_get_status($process);
+    }
+
+    public static function castStream($stream, array $a, Stub $stub, $isNested)
+    {
+        return stream_get_meta_data($stream) + static::castStreamContext($stream, $a, $stub, $isNested);
+    }
+
+    public static function castStreamContext($stream, array $a, Stub $stub, $isNested)
+    {
+        return stream_context_get_params($stream);
+    }
+
+    public static function castGd($gd, array $a, Stub $stub, $isNested)
+    {
+        $a['size'] = imagesx($gd).'x'.imagesy($gd);
+        $a['trueColor'] = imageistruecolor($gd);
+
+        return $a;
+    }
+
+    public static function castMysqlLink($h, array $a, Stub $stub, $isNested)
+    {
+        $a['host'] = mysql_get_host_info($h);
+        $a['protocol'] = mysql_get_proto_info($h);
+        $a['server'] = mysql_get_server_info($h);
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/SplCaster.php b/htdocs/includes/symfony/var-dumper/Caster/SplCaster.php
new file mode 100644
index 00000000000..97f21463821
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/SplCaster.php
@@ -0,0 +1,203 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts SPL related classes to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class SplCaster
+{
+    private static $splFileObjectFlags = array(
+        \SplFileObject::DROP_NEW_LINE => 'DROP_NEW_LINE',
+        \SplFileObject::READ_AHEAD => 'READ_AHEAD',
+        \SplFileObject::SKIP_EMPTY => 'SKIP_EMPTY',
+        \SplFileObject::READ_CSV => 'READ_CSV',
+    );
+
+    public static function castArrayObject(\ArrayObject $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+        $class = $stub->class;
+        $flags = $c->getFlags();
+
+        $b = array(
+            $prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
+            $prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),
+            $prefix.'iteratorClass' => $c->getIteratorClass(),
+            $prefix.'storage' => $c->getArrayCopy(),
+        );
+
+        if ($class === 'ArrayObject') {
+            $a = $b;
+        } else {
+            if (!($flags & \ArrayObject::STD_PROP_LIST)) {
+                $c->setFlags(\ArrayObject::STD_PROP_LIST);
+                $a = Caster::castObject($c, new \ReflectionClass($class));
+                $c->setFlags($flags);
+            }
+
+            $a += $b;
+        }
+
+        return $a;
+    }
+
+    public static function castHeap(\Iterator $c, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            Caster::PREFIX_VIRTUAL.'heap' => iterator_to_array(clone $c),
+        );
+
+        return $a;
+    }
+
+    public static function castDoublyLinkedList(\SplDoublyLinkedList $c, array $a, Stub $stub, $isNested)
+    {
+        $prefix = Caster::PREFIX_VIRTUAL;
+        $mode = $c->getIteratorMode();
+        $c->setIteratorMode(\SplDoublyLinkedList::IT_MODE_KEEP | $mode & ~\SplDoublyLinkedList::IT_MODE_DELETE);
+
+        $a += array(
+            $prefix.'mode' => new ConstStub((($mode & \SplDoublyLinkedList::IT_MODE_LIFO) ? 'IT_MODE_LIFO' : 'IT_MODE_FIFO').' | '.(($mode & \SplDoublyLinkedList::IT_MODE_KEEP) ? 'IT_MODE_KEEP' : 'IT_MODE_DELETE'), $mode),
+            $prefix.'dllist' => iterator_to_array($c),
+        );
+        $c->setIteratorMode($mode);
+
+        return $a;
+    }
+
+    public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, $isNested)
+    {
+        static $map = array(
+            'path' => 'getPath',
+            'filename' => 'getFilename',
+            'basename' => 'getBasename',
+            'pathname' => 'getPathname',
+            'extension' => 'getExtension',
+            'realPath' => 'getRealPath',
+            'aTime' => 'getATime',
+            'mTime' => 'getMTime',
+            'cTime' => 'getCTime',
+            'inode' => 'getInode',
+            'size' => 'getSize',
+            'perms' => 'getPerms',
+            'owner' => 'getOwner',
+            'group' => 'getGroup',
+            'type' => 'getType',
+            'writable' => 'isWritable',
+            'readable' => 'isReadable',
+            'executable' => 'isExecutable',
+            'file' => 'isFile',
+            'dir' => 'isDir',
+            'link' => 'isLink',
+            'linkTarget' => 'getLinkTarget',
+        );
+
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        foreach ($map as $key => $accessor) {
+            try {
+                $a[$prefix.$key] = $c->$accessor();
+            } catch (\Exception $e) {
+            }
+        }
+
+        if (isset($a[$prefix.'perms'])) {
+            $a[$prefix.'perms'] = new ConstStub(sprintf('0%o', $a[$prefix.'perms']), $a[$prefix.'perms']);
+        }
+
+        static $mapDate = array('aTime', 'mTime', 'cTime');
+        foreach ($mapDate as $key) {
+            if (isset($a[$prefix.$key])) {
+                $a[$prefix.$key] = new ConstStub(date('Y-m-d H:i:s', $a[$prefix.$key]), $a[$prefix.$key]);
+            }
+        }
+
+        return $a;
+    }
+
+    public static function castFileObject(\SplFileObject $c, array $a, Stub $stub, $isNested)
+    {
+        static $map = array(
+            'csvControl' => 'getCsvControl',
+            'flags' => 'getFlags',
+            'maxLineLen' => 'getMaxLineLen',
+            'fstat' => 'fstat',
+            'eof' => 'eof',
+            'key' => 'key',
+        );
+
+        $prefix = Caster::PREFIX_VIRTUAL;
+
+        foreach ($map as $key => $accessor) {
+            try {
+                $a[$prefix.$key] = $c->$accessor();
+            } catch (\Exception $e) {
+            }
+        }
+
+        if (isset($a[$prefix.'flags'])) {
+            $flagsArray = array();
+            foreach (self::$splFileObjectFlags as $value => $name) {
+                if ($a[$prefix.'flags'] & $value) {
+                    $flagsArray[] = $name;
+                }
+            }
+            $a[$prefix.'flags'] = new ConstStub(implode('|', $flagsArray), $a[$prefix.'flags']);
+        }
+
+        if (isset($a[$prefix.'fstat'])) {
+            $a[$prefix.'fstat'] = new CutArrayStub($a[$prefix.'fstat'], array('dev', 'ino', 'nlink', 'rdev', 'blksize', 'blocks'));
+        }
+
+        return $a;
+    }
+
+    public static function castFixedArray(\SplFixedArray $c, array $a, Stub $stub, $isNested)
+    {
+        $a += array(
+            Caster::PREFIX_VIRTUAL.'storage' => $c->toArray(),
+        );
+
+        return $a;
+    }
+
+    public static function castObjectStorage(\SplObjectStorage $c, array $a, Stub $stub, $isNested)
+    {
+        $storage = array();
+        unset($a[Caster::PREFIX_DYNAMIC."\0gcdata"]); // Don't hit https://bugs.php.net/65967
+
+        foreach ($c as $obj) {
+            $storage[spl_object_hash($obj)] = array(
+                'object' => $obj,
+                'info' => $c->getInfo(),
+             );
+        }
+
+        $a += array(
+            Caster::PREFIX_VIRTUAL.'storage' => $storage,
+        );
+
+        return $a;
+    }
+
+    public static function castOuterIterator(\OuterIterator $c, array $a, Stub $stub, $isNested)
+    {
+        $a[Caster::PREFIX_VIRTUAL.'innerIterator'] = $c->getInnerIterator();
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/StubCaster.php b/htdocs/includes/symfony/var-dumper/Caster/StubCaster.php
new file mode 100644
index 00000000000..ebad5ba9844
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/StubCaster.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts a caster's Stub.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class StubCaster
+{
+    public static function castStub(Stub $c, array $a, Stub $stub, $isNested)
+    {
+        if ($isNested) {
+            $stub->type = $c->type;
+            $stub->class = $c->class;
+            $stub->value = $c->value;
+            $stub->handle = $c->handle;
+            $stub->cut = $c->cut;
+
+            return array();
+        }
+    }
+
+    public static function castCutArray(CutArrayStub $c, array $a, Stub $stub, $isNested)
+    {
+        return $isNested ? $c->preservedSubset : $a;
+    }
+
+    public static function cutInternals($obj, array $a, Stub $stub, $isNested)
+    {
+        if ($isNested) {
+            $stub->cut += count($a);
+
+            return array();
+        }
+
+        return $a;
+    }
+
+    public static function castEnum(EnumStub $c, array $a, Stub $stub, $isNested)
+    {
+        if ($isNested) {
+            $stub->class = '';
+            $stub->handle = 0;
+            $stub->value = null;
+
+            $a = array();
+
+            if ($c->value) {
+                foreach (array_keys($c->value) as $k) {
+                    $keys[] = Caster::PREFIX_VIRTUAL.$k;
+                }
+                // Preserve references with array_combine()
+                $a = array_combine($keys, $c->value);
+            }
+        }
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/TraceStub.php b/htdocs/includes/symfony/var-dumper/Caster/TraceStub.php
new file mode 100644
index 00000000000..59548acaee6
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/TraceStub.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Represents a backtrace as returned by debug_backtrace() or Exception->getTrace().
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class TraceStub extends Stub
+{
+    public $keepArgs;
+    public $sliceOffset;
+    public $sliceLength;
+    public $numberingOffset;
+
+    public function __construct(array $trace, $keepArgs = true, $sliceOffset = 0, $sliceLength = null, $numberingOffset = 0)
+    {
+        $this->value = $trace;
+        $this->keepArgs = $keepArgs;
+        $this->sliceOffset = $sliceOffset;
+        $this->sliceLength = $sliceLength;
+        $this->numberingOffset = $numberingOffset;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Caster/XmlResourceCaster.php b/htdocs/includes/symfony/var-dumper/Caster/XmlResourceCaster.php
new file mode 100644
index 00000000000..5d0207ee81d
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Caster/XmlResourceCaster.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Caster;
+
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * Casts XML resources to array representation.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class XmlResourceCaster
+{
+    private static $xmlErrors = array(
+        XML_ERROR_NONE => 'XML_ERROR_NONE',
+        XML_ERROR_NO_MEMORY => 'XML_ERROR_NO_MEMORY',
+        XML_ERROR_SYNTAX => 'XML_ERROR_SYNTAX',
+        XML_ERROR_NO_ELEMENTS => 'XML_ERROR_NO_ELEMENTS',
+        XML_ERROR_INVALID_TOKEN => 'XML_ERROR_INVALID_TOKEN',
+        XML_ERROR_UNCLOSED_TOKEN => 'XML_ERROR_UNCLOSED_TOKEN',
+        XML_ERROR_PARTIAL_CHAR => 'XML_ERROR_PARTIAL_CHAR',
+        XML_ERROR_TAG_MISMATCH => 'XML_ERROR_TAG_MISMATCH',
+        XML_ERROR_DUPLICATE_ATTRIBUTE => 'XML_ERROR_DUPLICATE_ATTRIBUTE',
+        XML_ERROR_JUNK_AFTER_DOC_ELEMENT => 'XML_ERROR_JUNK_AFTER_DOC_ELEMENT',
+        XML_ERROR_PARAM_ENTITY_REF => 'XML_ERROR_PARAM_ENTITY_REF',
+        XML_ERROR_UNDEFINED_ENTITY => 'XML_ERROR_UNDEFINED_ENTITY',
+        XML_ERROR_RECURSIVE_ENTITY_REF => 'XML_ERROR_RECURSIVE_ENTITY_REF',
+        XML_ERROR_ASYNC_ENTITY => 'XML_ERROR_ASYNC_ENTITY',
+        XML_ERROR_BAD_CHAR_REF => 'XML_ERROR_BAD_CHAR_REF',
+        XML_ERROR_BINARY_ENTITY_REF => 'XML_ERROR_BINARY_ENTITY_REF',
+        XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF => 'XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF',
+        XML_ERROR_MISPLACED_XML_PI => 'XML_ERROR_MISPLACED_XML_PI',
+        XML_ERROR_UNKNOWN_ENCODING => 'XML_ERROR_UNKNOWN_ENCODING',
+        XML_ERROR_INCORRECT_ENCODING => 'XML_ERROR_INCORRECT_ENCODING',
+        XML_ERROR_UNCLOSED_CDATA_SECTION => 'XML_ERROR_UNCLOSED_CDATA_SECTION',
+        XML_ERROR_EXTERNAL_ENTITY_HANDLING => 'XML_ERROR_EXTERNAL_ENTITY_HANDLING',
+    );
+
+    public static function castXml($h, array $a, Stub $stub, $isNested)
+    {
+        $a['current_byte_index'] = xml_get_current_byte_index($h);
+        $a['current_column_number'] = xml_get_current_column_number($h);
+        $a['current_line_number'] = xml_get_current_line_number($h);
+        $a['error_code'] = xml_get_error_code($h);
+
+        if (isset(self::$xmlErrors[$a['error_code']])) {
+            $a['error_code'] = new ConstStub(self::$xmlErrors[$a['error_code']], $a['error_code']);
+        }
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/AbstractCloner.php b/htdocs/includes/symfony/var-dumper/Cloner/AbstractCloner.php
new file mode 100644
index 00000000000..2807ceb935b
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Cloner/AbstractCloner.php
@@ -0,0 +1,313 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Cloner;
+
+use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Exception\ThrowingCasterException;
+
+/**
+ * AbstractCloner implements a generic caster mechanism for objects and resources.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+abstract class AbstractCloner implements ClonerInterface
+{
+    public static $defaultCasters = array(
+        'Symfony\Component\VarDumper\Caster\CutStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
+        'Symfony\Component\VarDumper\Caster\CutArrayStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castCutArray',
+        'Symfony\Component\VarDumper\Caster\ConstStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castStub',
+        'Symfony\Component\VarDumper\Caster\EnumStub' => 'Symfony\Component\VarDumper\Caster\StubCaster::castEnum',
+
+        'Closure' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClosure',
+        'Generator' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castGenerator',
+        'ReflectionType' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castType',
+        'ReflectionGenerator' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castReflectionGenerator',
+        'ReflectionClass' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castClass',
+        'ReflectionFunctionAbstract' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castFunctionAbstract',
+        'ReflectionMethod' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castMethod',
+        'ReflectionParameter' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castParameter',
+        'ReflectionProperty' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castProperty',
+        'ReflectionExtension' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castExtension',
+        'ReflectionZendExtension' => 'Symfony\Component\VarDumper\Caster\ReflectionCaster::castZendExtension',
+
+        'Doctrine\Common\Persistence\ObjectManager' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+        'Doctrine\Common\Proxy\Proxy' => 'Symfony\Component\VarDumper\Caster\DoctrineCaster::castCommonProxy',
+        'Doctrine\ORM\Proxy\Proxy' => 'Symfony\Component\VarDumper\Caster\DoctrineCaster::castOrmProxy',
+        'Doctrine\ORM\PersistentCollection' => 'Symfony\Component\VarDumper\Caster\DoctrineCaster::castPersistentCollection',
+
+        'DOMException' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castException',
+        'DOMStringList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+        'DOMNameList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+        'DOMImplementation' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castImplementation',
+        'DOMImplementationList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+        'DOMNode' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castNode',
+        'DOMNameSpaceNode' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castNameSpaceNode',
+        'DOMDocument' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castDocument',
+        'DOMNodeList' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+        'DOMNamedNodeMap' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLength',
+        'DOMCharacterData' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castCharacterData',
+        'DOMAttr' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castAttr',
+        'DOMElement' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castElement',
+        'DOMText' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castText',
+        'DOMTypeinfo' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castTypeinfo',
+        'DOMDomError' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castDomError',
+        'DOMLocator' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castLocator',
+        'DOMDocumentType' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castDocumentType',
+        'DOMNotation' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castNotation',
+        'DOMEntity' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castEntity',
+        'DOMProcessingInstruction' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castProcessingInstruction',
+        'DOMXPath' => 'Symfony\Component\VarDumper\Caster\DOMCaster::castXPath',
+
+        'ErrorException' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castErrorException',
+        'Exception' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castException',
+        'Error' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castError',
+        'Symfony\Component\DependencyInjection\ContainerInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+        'Symfony\Component\VarDumper\Exception\ThrowingCasterException' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castThrowingCasterException',
+        'Symfony\Component\VarDumper\Caster\TraceStub' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castTraceStub',
+        'Symfony\Component\VarDumper\Caster\FrameStub' => 'Symfony\Component\VarDumper\Caster\ExceptionCaster::castFrameStub',
+
+        'PHPUnit_Framework_MockObject_MockObject' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+        'Prophecy\Prophecy\ProphecySubjectInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+        'Mockery\MockInterface' => 'Symfony\Component\VarDumper\Caster\StubCaster::cutInternals',
+
+        'PDO' => 'Symfony\Component\VarDumper\Caster\PdoCaster::castPdo',
+        'PDOStatement' => 'Symfony\Component\VarDumper\Caster\PdoCaster::castPdoStatement',
+
+        'AMQPConnection' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castConnection',
+        'AMQPChannel' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castChannel',
+        'AMQPQueue' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castQueue',
+        'AMQPExchange' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castExchange',
+        'AMQPEnvelope' => 'Symfony\Component\VarDumper\Caster\AmqpCaster::castEnvelope',
+
+        'ArrayObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castArrayObject',
+        'SplDoublyLinkedList' => 'Symfony\Component\VarDumper\Caster\SplCaster::castDoublyLinkedList',
+        'SplFileInfo' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileInfo',
+        'SplFileObject' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFileObject',
+        'SplFixedArray' => 'Symfony\Component\VarDumper\Caster\SplCaster::castFixedArray',
+        'SplHeap' => 'Symfony\Component\VarDumper\Caster\SplCaster::castHeap',
+        'SplObjectStorage' => 'Symfony\Component\VarDumper\Caster\SplCaster::castObjectStorage',
+        'SplPriorityQueue' => 'Symfony\Component\VarDumper\Caster\SplCaster::castHeap',
+        'OuterIterator' => 'Symfony\Component\VarDumper\Caster\SplCaster::castOuterIterator',
+
+        'MongoCursorInterface' => 'Symfony\Component\VarDumper\Caster\MongoCaster::castCursor',
+
+        ':curl' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castCurl',
+        ':dba' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castDba',
+        ':dba persistent' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castDba',
+        ':gd' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castGd',
+        ':mysql link' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castMysqlLink',
+        ':pgsql large object' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castLargeObject',
+        ':pgsql link' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castLink',
+        ':pgsql link persistent' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castLink',
+        ':pgsql result' => 'Symfony\Component\VarDumper\Caster\PgSqlCaster::castResult',
+        ':process' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castProcess',
+        ':stream' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castStream',
+        ':stream-context' => 'Symfony\Component\VarDumper\Caster\ResourceCaster::castStreamContext',
+        ':xml' => 'Symfony\Component\VarDumper\Caster\XmlResourceCaster::castXml',
+    );
+
+    protected $maxItems = 2500;
+    protected $maxString = -1;
+    protected $useExt;
+
+    private $casters = array();
+    private $prevErrorHandler;
+    private $classInfo = array();
+    private $filter = 0;
+
+    /**
+     * @param callable[]|null $casters A map of casters.
+     *
+     * @see addCasters
+     */
+    public function __construct(array $casters = null)
+    {
+        if (null === $casters) {
+            $casters = static::$defaultCasters;
+        }
+        $this->addCasters($casters);
+        $this->useExt = extension_loaded('symfony_debug');
+    }
+
+    /**
+     * Adds casters for resources and objects.
+     *
+     * Maps resources or objects types to a callback.
+     * Types are in the key, with a callable caster for value.
+     * Resource types are to be prefixed with a `:`,
+     * see e.g. static::$defaultCasters.
+     *
+     * @param callable[] $casters A map of casters.
+     */
+    public function addCasters(array $casters)
+    {
+        foreach ($casters as $type => $callback) {
+            $this->casters[strtolower($type)][] = $callback;
+        }
+    }
+
+    /**
+     * Sets the maximum number of items to clone past the first level in nested structures.
+     *
+     * @param int $maxItems
+     */
+    public function setMaxItems($maxItems)
+    {
+        $this->maxItems = (int) $maxItems;
+    }
+
+    /**
+     * Sets the maximum cloned length for strings.
+     *
+     * @param int $maxString
+     */
+    public function setMaxString($maxString)
+    {
+        $this->maxString = (int) $maxString;
+    }
+
+    /**
+     * Clones a PHP variable.
+     *
+     * @param mixed $var    Any PHP variable.
+     * @param int   $filter A bit field of Caster::EXCLUDE_* constants.
+     *
+     * @return Data The cloned variable represented by a Data object.
+     */
+    public function cloneVar($var, $filter = 0)
+    {
+        $this->prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context) {
+            if (E_RECOVERABLE_ERROR === $type || E_USER_ERROR === $type) {
+                // Cloner never dies
+                throw new \ErrorException($msg, 0, $type, $file, $line);
+            }
+
+            if ($this->prevErrorHandler) {
+                return call_user_func($this->prevErrorHandler, $type, $msg, $file, $line, $context);
+            }
+
+            return false;
+        });
+        $this->filter = $filter;
+
+        try {
+            $data = $this->doClone($var);
+        } catch (\Exception $e) {
+        }
+        restore_error_handler();
+        $this->prevErrorHandler = null;
+
+        if (isset($e)) {
+            throw $e;
+        }
+
+        return new Data($data);
+    }
+
+    /**
+     * Effectively clones the PHP variable.
+     *
+     * @param mixed $var Any PHP variable.
+     *
+     * @return array The cloned variable represented in an array.
+     */
+    abstract protected function doClone($var);
+
+    /**
+     * Casts an object to an array representation.
+     *
+     * @param Stub $stub     The Stub for the casted object.
+     * @param bool $isNested True if the object is nested in the dumped structure.
+     *
+     * @return array The object casted as array.
+     */
+    protected function castObject(Stub $stub, $isNested)
+    {
+        $obj = $stub->value;
+        $class = $stub->class;
+
+        if (isset($class[15]) && "\0" === $class[15] && 0 === strpos($class, "class@anonymous\x00")) {
+            $stub->class = get_parent_class($class).'@anonymous';
+        }
+        if (isset($this->classInfo[$class])) {
+            $classInfo = $this->classInfo[$class];
+        } else {
+            $classInfo = array(
+                new \ReflectionClass($class),
+                array_reverse(array($class => $class) + class_parents($class) + class_implements($class) + array('*' => '*')),
+            );
+
+            $this->classInfo[$class] = $classInfo;
+        }
+
+        $a = $this->callCaster('Symfony\Component\VarDumper\Caster\Caster::castObject', $obj, $classInfo[0], null, $isNested);
+
+        foreach ($classInfo[1] as $p) {
+            if (!empty($this->casters[$p = strtolower($p)])) {
+                foreach ($this->casters[$p] as $p) {
+                    $a = $this->callCaster($p, $obj, $a, $stub, $isNested);
+                }
+            }
+        }
+
+        return $a;
+    }
+
+    /**
+     * Casts a resource to an array representation.
+     *
+     * @param Stub $stub     The Stub for the casted resource.
+     * @param bool $isNested True if the object is nested in the dumped structure.
+     *
+     * @return array The resource casted as array.
+     */
+    protected function castResource(Stub $stub, $isNested)
+    {
+        $a = array();
+        $res = $stub->value;
+        $type = $stub->class;
+
+        if (!empty($this->casters[':'.$type])) {
+            foreach ($this->casters[':'.$type] as $c) {
+                $a = $this->callCaster($c, $res, $a, $stub, $isNested);
+            }
+        }
+
+        return $a;
+    }
+
+    /**
+     * Calls a custom caster.
+     *
+     * @param callable        $callback The caster.
+     * @param object|resource $obj      The object/resource being casted.
+     * @param array           $a        The result of the previous cast for chained casters.
+     * @param Stub            $stub     The Stub for the casted object/resource.
+     * @param bool            $isNested True if $obj is nested in the dumped structure.
+     *
+     * @return array The casted object/resource.
+     */
+    private function callCaster($callback, $obj, $a, $stub, $isNested)
+    {
+        try {
+            $cast = call_user_func($callback, $obj, $a, $stub, $isNested, $this->filter);
+
+            if (is_array($cast)) {
+                $a = $cast;
+            }
+        } catch (\Exception $e) {
+            $a[(Stub::TYPE_OBJECT === $stub->type ? Caster::PREFIX_VIRTUAL : '').'⚠'] = new ThrowingCasterException($e);
+        }
+
+        return $a;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/ClonerInterface.php b/htdocs/includes/symfony/var-dumper/Cloner/ClonerInterface.php
new file mode 100644
index 00000000000..c1df5933dbf
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Cloner/ClonerInterface.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Cloner;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface ClonerInterface
+{
+    /**
+     * Clones a PHP variable.
+     *
+     * @param mixed $var Any PHP variable.
+     *
+     * @return Data The cloned variable represented by a Data object.
+     */
+    public function cloneVar($var);
+}
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/Cursor.php b/htdocs/includes/symfony/var-dumper/Cloner/Cursor.php
new file mode 100644
index 00000000000..162f3293cf2
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Cloner/Cursor.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Cloner;
+
+/**
+ * Represents the current state of a dumper while dumping.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class Cursor
+{
+    const HASH_INDEXED = Stub::ARRAY_INDEXED;
+    const HASH_ASSOC = Stub::ARRAY_ASSOC;
+    const HASH_OBJECT = Stub::TYPE_OBJECT;
+    const HASH_RESOURCE = Stub::TYPE_RESOURCE;
+
+    public $depth = 0;
+    public $refIndex = 0;
+    public $softRefTo = 0;
+    public $softRefCount = 0;
+    public $softRefHandle = 0;
+    public $hardRefTo = 0;
+    public $hardRefCount = 0;
+    public $hardRefHandle = 0;
+    public $hashType;
+    public $hashKey;
+    public $hashKeyIsBinary;
+    public $hashIndex = 0;
+    public $hashLength = 0;
+    public $hashCut = 0;
+    public $stop = false;
+}
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/Data.php b/htdocs/includes/symfony/var-dumper/Cloner/Data.php
new file mode 100644
index 00000000000..43a7b67971e
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Cloner/Data.php
@@ -0,0 +1,218 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Cloner;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class Data
+{
+    private $data;
+    private $maxDepth = 20;
+    private $maxItemsPerDepth = -1;
+    private $useRefHandles = -1;
+
+    /**
+     * @param array $data A array as returned by ClonerInterface::cloneVar().
+     */
+    public function __construct(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @return array The raw data structure.
+     */
+    public function getRawData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Returns a depth limited clone of $this.
+     *
+     * @param int $maxDepth The max dumped depth level.
+     *
+     * @return self A clone of $this.
+     */
+    public function withMaxDepth($maxDepth)
+    {
+        $data = clone $this;
+        $data->maxDepth = (int) $maxDepth;
+
+        return $data;
+    }
+
+    /**
+     * Limits the numbers of elements per depth level.
+     *
+     * @param int $maxItemsPerDepth The max number of items dumped per depth level.
+     *
+     * @return self A clone of $this.
+     */
+    public function withMaxItemsPerDepth($maxItemsPerDepth)
+    {
+        $data = clone $this;
+        $data->maxItemsPerDepth = (int) $maxItemsPerDepth;
+
+        return $data;
+    }
+
+    /**
+     * Enables/disables objects' identifiers tracking.
+     *
+     * @param bool $useRefHandles False to hide global ref. handles.
+     *
+     * @return self A clone of $this.
+     */
+    public function withRefHandles($useRefHandles)
+    {
+        $data = clone $this;
+        $data->useRefHandles = $useRefHandles ? -1 : 0;
+
+        return $data;
+    }
+
+    /**
+     * Dumps data with a DumperInterface dumper.
+     */
+    public function dump(DumperInterface $dumper)
+    {
+        $refs = array(0);
+        $this->dumpItem($dumper, new Cursor(), $refs, $this->data[0][0]);
+    }
+
+    /**
+     * Depth-first dumping of items.
+     *
+     * @param DumperInterface $dumper The dumper being used for dumping.
+     * @param Cursor          $cursor A cursor used for tracking dumper state position.
+     * @param array           &$refs  A map of all references discovered while dumping.
+     * @param mixed           $item   A Stub object or the original value being dumped.
+     */
+    private function dumpItem($dumper, $cursor, &$refs, $item)
+    {
+        $cursor->refIndex = 0;
+        $cursor->softRefTo = $cursor->softRefHandle = $cursor->softRefCount = 0;
+        $cursor->hardRefTo = $cursor->hardRefHandle = $cursor->hardRefCount = 0;
+        $firstSeen = true;
+
+        if (!$item instanceof Stub) {
+            $type = gettype($item);
+        } elseif (Stub::TYPE_REF === $item->type) {
+            if ($item->handle) {
+                if (!isset($refs[$r = $item->handle - (PHP_INT_MAX >> 1)])) {
+                    $cursor->refIndex = $refs[$r] = $cursor->refIndex ?: ++$refs[0];
+                } else {
+                    $firstSeen = false;
+                }
+                $cursor->hardRefTo = $refs[$r];
+                $cursor->hardRefHandle = $this->useRefHandles & $item->handle;
+                $cursor->hardRefCount = $item->refCount;
+            }
+            $type = $item->class ?: gettype($item->value);
+            $item = $item->value;
+        }
+        if ($item instanceof Stub) {
+            if ($item->refCount) {
+                if (!isset($refs[$r = $item->handle])) {
+                    $cursor->refIndex = $refs[$r] = $cursor->refIndex ?: ++$refs[0];
+                } else {
+                    $firstSeen = false;
+                }
+                $cursor->softRefTo = $refs[$r];
+            }
+            $cursor->softRefHandle = $this->useRefHandles & $item->handle;
+            $cursor->softRefCount = $item->refCount;
+            $cut = $item->cut;
+
+            if ($item->position && $firstSeen) {
+                $children = $this->data[$item->position];
+
+                if ($cursor->stop) {
+                    if ($cut >= 0) {
+                        $cut += count($children);
+                    }
+                    $children = array();
+                }
+            } else {
+                $children = array();
+            }
+            switch ($item->type) {
+                case Stub::TYPE_STRING:
+                    $dumper->dumpString($cursor, $item->value, Stub::STRING_BINARY === $item->class, $cut);
+                    break;
+
+                case Stub::TYPE_ARRAY:
+                    $item = clone $item;
+                    $item->type = $item->class;
+                    $item->class = $item->value;
+                    // No break;
+                case Stub::TYPE_OBJECT:
+                case Stub::TYPE_RESOURCE:
+                    $withChildren = $children && $cursor->depth !== $this->maxDepth && $this->maxItemsPerDepth;
+                    $dumper->enterHash($cursor, $item->type, $item->class, $withChildren);
+                    if ($withChildren) {
+                        $cut = $this->dumpChildren($dumper, $cursor, $refs, $children, $cut, $item->type);
+                    } elseif ($children && 0 <= $cut) {
+                        $cut += count($children);
+                    }
+                    $dumper->leaveHash($cursor, $item->type, $item->class, $withChildren, $cut);
+                    break;
+
+                default:
+                    throw new \RuntimeException(sprintf('Unexpected Stub type: %s', $item->type));
+            }
+        } elseif ('array' === $type) {
+            $dumper->enterHash($cursor, Cursor::HASH_INDEXED, 0, false);
+            $dumper->leaveHash($cursor, Cursor::HASH_INDEXED, 0, false, 0);
+        } elseif ('string' === $type) {
+            $dumper->dumpString($cursor, $item, false, 0);
+        } else {
+            $dumper->dumpScalar($cursor, $type, $item);
+        }
+    }
+
+    /**
+     * Dumps children of hash structures.
+     *
+     * @param DumperInterface $dumper
+     * @param Cursor          $parentCursor The cursor of the parent hash.
+     * @param array           &$refs        A map of all references discovered while dumping.
+     * @param array           $children     The children to dump.
+     * @param int             $hashCut      The number of items removed from the original hash.
+     * @param string          $hashType     A Cursor::HASH_* const.
+     *
+     * @return int The final number of removed items.
+     */
+    private function dumpChildren($dumper, $parentCursor, &$refs, $children, $hashCut, $hashType)
+    {
+        $cursor = clone $parentCursor;
+        ++$cursor->depth;
+        $cursor->hashType = $hashType;
+        $cursor->hashIndex = 0;
+        $cursor->hashLength = count($children);
+        $cursor->hashCut = $hashCut;
+        foreach ($children as $key => $child) {
+            $cursor->hashKeyIsBinary = isset($key[0]) && !preg_match('//u', $key);
+            $cursor->hashKey = $key;
+            $this->dumpItem($dumper, $cursor, $refs, $child);
+            if (++$cursor->hashIndex === $this->maxItemsPerDepth || $cursor->stop) {
+                $parentCursor->stop = true;
+
+                return $hashCut >= 0 ? $hashCut + $cursor->hashLength - $cursor->hashIndex : $hashCut;
+            }
+        }
+
+        return $hashCut;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/DumperInterface.php b/htdocs/includes/symfony/var-dumper/Cloner/DumperInterface.php
new file mode 100644
index 00000000000..eba23d42297
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Cloner/DumperInterface.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Cloner;
+
+/**
+ * DumperInterface used by Data objects.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface DumperInterface
+{
+    /**
+     * Dumps a scalar value.
+     *
+     * @param Cursor $cursor The Cursor position in the dump.
+     * @param string $type   The PHP type of the value being dumped.
+     * @param scalar $value  The scalar value being dumped.
+     */
+    public function dumpScalar(Cursor $cursor, $type, $value);
+
+    /**
+     * Dumps a string.
+     *
+     * @param Cursor $cursor The Cursor position in the dump.
+     * @param string $str    The string being dumped.
+     * @param bool   $bin    Whether $str is UTF-8 or binary encoded.
+     * @param int    $cut    The number of characters $str has been cut by.
+     */
+    public function dumpString(Cursor $cursor, $str, $bin, $cut);
+
+    /**
+     * Dumps while entering an hash.
+     *
+     * @param Cursor $cursor   The Cursor position in the dump.
+     * @param int    $type     A Cursor::HASH_* const for the type of hash.
+     * @param string $class    The object class, resource type or array count.
+     * @param bool   $hasChild When the dump of the hash has child item.
+     */
+    public function enterHash(Cursor $cursor, $type, $class, $hasChild);
+
+    /**
+     * Dumps while leaving an hash.
+     *
+     * @param Cursor $cursor   The Cursor position in the dump.
+     * @param int    $type     A Cursor::HASH_* const for the type of hash.
+     * @param string $class    The object class, resource type or array count.
+     * @param bool   $hasChild When the dump of the hash has child item.
+     * @param int    $cut      The number of items the hash has been cut by.
+     */
+    public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut);
+}
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/Stub.php b/htdocs/includes/symfony/var-dumper/Cloner/Stub.php
new file mode 100644
index 00000000000..f58a57a7276
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Cloner/Stub.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Cloner;
+
+/**
+ * Represents the main properties of a PHP variable.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class Stub
+{
+    const TYPE_REF = 'ref';
+    const TYPE_STRING = 'string';
+    const TYPE_ARRAY = 'array';
+    const TYPE_OBJECT = 'object';
+    const TYPE_RESOURCE = 'resource';
+
+    const STRING_BINARY = 'bin';
+    const STRING_UTF8 = 'utf8';
+
+    const ARRAY_ASSOC = 'assoc';
+    const ARRAY_INDEXED = 'indexed';
+
+    public $type = self::TYPE_REF;
+    public $class = '';
+    public $value;
+    public $cut = 0;
+    public $handle = 0;
+    public $refCount = 0;
+    public $position = 0;
+}
diff --git a/htdocs/includes/symfony/var-dumper/Cloner/VarCloner.php b/htdocs/includes/symfony/var-dumper/Cloner/VarCloner.php
new file mode 100644
index 00000000000..98d6e9e51c1
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Cloner/VarCloner.php
@@ -0,0 +1,300 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Cloner;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class VarCloner extends AbstractCloner
+{
+    private static $hashMask = 0;
+    private static $hashOffset = 0;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doClone($var)
+    {
+        $useExt = $this->useExt;
+        $i = 0;                         // Current iteration position in $queue
+        $len = 1;                       // Length of $queue
+        $pos = 0;                       // Number of cloned items past the first level
+        $refs = 0;                      // Hard references counter
+        $queue = array(array($var));    // This breadth-first queue is the return value
+        $arrayRefs = array();           // Map of queue indexes to stub array objects
+        $hardRefs = array();            // Map of original zval hashes to stub objects
+        $objRefs = array();             // Map of original object handles to their stub object couterpart
+        $resRefs = array();             // Map of original resource handles to their stub object couterpart
+        $values = array();              // Map of stub objects' hashes to original values
+        $maxItems = $this->maxItems;
+        $maxString = $this->maxString;
+        $cookie = (object) array();     // Unique object used to detect hard references
+        $gid = uniqid(mt_rand(), true); // Unique string used to detect the special $GLOBALS variable
+        $a = null;                      // Array cast for nested structures
+        $stub = null;                   // Stub capturing the main properties of an original item value
+                                        // or null if the original value is used directly
+        $zval = array(                  // Main properties of the current value
+            'type' => null,
+            'zval_isref' => null,
+            'zval_hash' => null,
+            'array_count' => null,
+            'object_class' => null,
+            'object_handle' => null,
+            'resource_type' => null,
+        );
+        if (!self::$hashMask) {
+            self::initHashMask();
+        }
+        $hashMask = self::$hashMask;
+        $hashOffset = self::$hashOffset;
+
+        for ($i = 0; $i < $len; ++$i) {
+            $indexed = true;            // Whether the currently iterated array is numerically indexed or not
+            $j = -1;                    // Position in the currently iterated array
+            $step = $queue[$i];         // Copy of the currently iterated array used for hard references detection
+            foreach ($step as $k => $v) {
+                // $k is the original key
+                // $v is the original value or a stub object in case of hard references
+                if ($indexed && $k !== ++$j) {
+                    $indexed = false;
+                }
+                if ($useExt) {
+                    $zval = symfony_zval_info($k, $step);
+                } else {
+                    $step[$k] = $cookie;
+                    if ($zval['zval_isref'] = $queue[$i][$k] === $cookie) {
+                        $zval['zval_hash'] = $v instanceof Stub ? spl_object_hash($v) : null;
+                    }
+                    $zval['type'] = gettype($v);
+                }
+                if ($zval['zval_isref']) {
+                    $queue[$i][$k] = &$stub;    // Break hard references to make $queue completely
+                    unset($stub);               // independent from the original structure
+                    if (isset($hardRefs[$zval['zval_hash']])) {
+                        $queue[$i][$k] = $useExt ? ($v = $hardRefs[$zval['zval_hash']]) : ($step[$k] = $v);
+                        if ($v->value instanceof Stub && (Stub::TYPE_OBJECT === $v->value->type || Stub::TYPE_RESOURCE === $v->value->type)) {
+                            ++$v->value->refCount;
+                        }
+                        ++$v->refCount;
+                        continue;
+                    }
+                }
+                // Create $stub when the original value $v can not be used directly
+                // If $v is a nested structure, put that structure in array $a
+                switch ($zval['type']) {
+                    case 'string':
+                        if (isset($v[0]) && !preg_match('//u', $v)) {
+                            $stub = new Stub();
+                            $stub->type = Stub::TYPE_STRING;
+                            $stub->class = Stub::STRING_BINARY;
+                            if (0 <= $maxString && 0 < $cut = strlen($v) - $maxString) {
+                                $stub->cut = $cut;
+                                $stub->value = substr($v, 0, -$cut);
+                            } else {
+                                $stub->value = $v;
+                            }
+                        } elseif (0 <= $maxString && isset($v[1 + ($maxString >> 2)]) && 0 < $cut = iconv_strlen($v, 'UTF-8') - $maxString) {
+                            $stub = new Stub();
+                            $stub->type = Stub::TYPE_STRING;
+                            $stub->class = Stub::STRING_UTF8;
+                            $stub->cut = $cut;
+                            $stub->value = iconv_substr($v, 0, $maxString, 'UTF-8');
+                        }
+                        break;
+
+                    case 'integer':
+                        break;
+
+                    case 'array':
+                        if ($v) {
+                            $stub = $arrayRefs[$len] = new Stub();
+                            $stub->type = Stub::TYPE_ARRAY;
+                            $stub->class = Stub::ARRAY_ASSOC;
+
+                            // Copies of $GLOBALS have very strange behavior,
+                            // let's detect them with some black magic
+                            $a = $v;
+                            $a[$gid] = true;
+
+                            // Happens with copies of $GLOBALS
+                            if (isset($v[$gid])) {
+                                unset($v[$gid]);
+                                $a = array();
+                                foreach ($v as $gk => &$gv) {
+                                    $a[$gk] = &$gv;
+                                }
+                            } else {
+                                $a = $v;
+                            }
+
+                            $stub->value = $zval['array_count'] ?: count($a);
+                        }
+                        break;
+
+                    case 'object':
+                        if (empty($objRefs[$h = $zval['object_handle'] ?: ($hashMask ^ hexdec(substr(spl_object_hash($v), $hashOffset, PHP_INT_SIZE)))])) {
+                            $stub = new Stub();
+                            $stub->type = Stub::TYPE_OBJECT;
+                            $stub->class = $zval['object_class'] ?: get_class($v);
+                            $stub->value = $v;
+                            $stub->handle = $h;
+                            $a = $this->castObject($stub, 0 < $i);
+                            if ($v !== $stub->value) {
+                                if (Stub::TYPE_OBJECT !== $stub->type || null === $stub->value) {
+                                    break;
+                                }
+                                if ($useExt) {
+                                    $zval['type'] = $stub->value;
+                                    $zval = symfony_zval_info('type', $zval);
+                                    $h = $zval['object_handle'];
+                                } else {
+                                    $h = $hashMask ^ hexdec(substr(spl_object_hash($stub->value), $hashOffset, PHP_INT_SIZE));
+                                }
+                                $stub->handle = $h;
+                            }
+                            $stub->value = null;
+                            if (0 <= $maxItems && $maxItems <= $pos) {
+                                $stub->cut = count($a);
+                                $a = null;
+                            }
+                        }
+                        if (empty($objRefs[$h])) {
+                            $objRefs[$h] = $stub;
+                        } else {
+                            $stub = $objRefs[$h];
+                            ++$stub->refCount;
+                            $a = null;
+                        }
+                        break;
+
+                    case 'resource':
+                    case 'unknown type':
+                        if (empty($resRefs[$h = (int) $v])) {
+                            $stub = new Stub();
+                            $stub->type = Stub::TYPE_RESOURCE;
+                            $stub->class = $zval['resource_type'] ?: get_resource_type($v);
+                            $stub->value = $v;
+                            $stub->handle = $h;
+                            $a = $this->castResource($stub, 0 < $i);
+                            $stub->value = null;
+                            if (0 <= $maxItems && $maxItems <= $pos) {
+                                $stub->cut = count($a);
+                                $a = null;
+                            }
+                        }
+                        if (empty($resRefs[$h])) {
+                            $resRefs[$h] = $stub;
+                        } else {
+                            $stub = $resRefs[$h];
+                            ++$stub->refCount;
+                            $a = null;
+                        }
+                        break;
+                }
+
+                if (isset($stub)) {
+                    if ($zval['zval_isref']) {
+                        if ($useExt) {
+                            $queue[$i][$k] = $hardRefs[$zval['zval_hash']] = $v = new Stub();
+                            $v->value = $stub;
+                        } else {
+                            $step[$k] = new Stub();
+                            $step[$k]->value = $stub;
+                            $h = spl_object_hash($step[$k]);
+                            $queue[$i][$k] = $hardRefs[$h] = &$step[$k];
+                            $values[$h] = $v;
+                        }
+                        $queue[$i][$k]->handle = ++$refs;
+                    } else {
+                        $queue[$i][$k] = $stub;
+                    }
+
+                    if ($a) {
+                        if ($i && 0 <= $maxItems) {
+                            $k = count($a);
+                            if ($pos < $maxItems) {
+                                if ($maxItems < $pos += $k) {
+                                    $a = array_slice($a, 0, $maxItems - $pos);
+                                    if ($stub->cut >= 0) {
+                                        $stub->cut += $pos - $maxItems;
+                                    }
+                                }
+                            } else {
+                                if ($stub->cut >= 0) {
+                                    $stub->cut += $k;
+                                }
+                                $stub = $a = null;
+                                unset($arrayRefs[$len]);
+                                continue;
+                            }
+                        }
+                        $queue[$len] = $a;
+                        $stub->position = $len++;
+                    }
+                    $stub = $a = null;
+                } elseif ($zval['zval_isref']) {
+                    if ($useExt) {
+                        $queue[$i][$k] = $hardRefs[$zval['zval_hash']] = new Stub();
+                        $queue[$i][$k]->value = $v;
+                    } else {
+                        $step[$k] = $queue[$i][$k] = new Stub();
+                        $step[$k]->value = $v;
+                        $h = spl_object_hash($step[$k]);
+                        $hardRefs[$h] = &$step[$k];
+                        $values[$h] = $v;
+                    }
+                    $queue[$i][$k]->handle = ++$refs;
+                }
+            }
+
+            if (isset($arrayRefs[$i])) {
+                if ($indexed) {
+                    $arrayRefs[$i]->class = Stub::ARRAY_INDEXED;
+                }
+                unset($arrayRefs[$i]);
+            }
+        }
+
+        foreach ($values as $h => $v) {
+            $hardRefs[$h] = $v;
+        }
+
+        return $queue;
+    }
+
+    private static function initHashMask()
+    {
+        $obj = (object) array();
+        self::$hashOffset = 16 - PHP_INT_SIZE;
+        self::$hashMask = -1;
+
+        if (defined('HHVM_VERSION')) {
+            self::$hashOffset += 16;
+        } else {
+            // check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below
+            $obFuncs = array('ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush');
+            foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $frame) {
+                if (isset($frame['function'][0]) && !isset($frame['class']) && 'o' === $frame['function'][0] && in_array($frame['function'], $obFuncs)) {
+                    $frame['line'] = 0;
+                    break;
+                }
+            }
+            if (!empty($frame['line'])) {
+                ob_start();
+                debug_zval_dump($obj);
+                self::$hashMask = substr(ob_get_clean(), 17);
+            }
+        }
+
+        self::$hashMask ^= hexdec(substr(spl_object_hash($obj), self::$hashOffset, PHP_INT_SIZE));
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Dumper/AbstractDumper.php b/htdocs/includes/symfony/var-dumper/Dumper/AbstractDumper.php
new file mode 100644
index 00000000000..f8b9c107779
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Dumper/AbstractDumper.php
@@ -0,0 +1,176 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Dumper;
+
+use Symfony\Component\VarDumper\Cloner\Data;
+use Symfony\Component\VarDumper\Cloner\DumperInterface;
+
+/**
+ * Abstract mechanism for dumping a Data object.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+abstract class AbstractDumper implements DataDumperInterface, DumperInterface
+{
+    public static $defaultOutput = 'php://output';
+
+    protected $line = '';
+    protected $lineDumper;
+    protected $outputStream;
+    protected $decimalPoint; // This is locale dependent
+    protected $indentPad = '  ';
+
+    private $charset;
+
+    /**
+     * @param callable|resource|string|null $output  A line dumper callable, an opened stream or an output path, defaults to static::$defaultOutput.
+     * @param string                        $charset The default character encoding to use for non-UTF8 strings.
+     */
+    public function __construct($output = null, $charset = null)
+    {
+        $this->setCharset($charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8');
+        $this->decimalPoint = (string) 0.5;
+        $this->decimalPoint = $this->decimalPoint[1];
+        $this->setOutput($output ?: static::$defaultOutput);
+        if (!$output && is_string(static::$defaultOutput)) {
+            static::$defaultOutput = $this->outputStream;
+        }
+    }
+
+    /**
+     * Sets the output destination of the dumps.
+     *
+     * @param callable|resource|string $output A line dumper callable, an opened stream or an output path.
+     *
+     * @return callable|resource|string The previous output destination.
+     */
+    public function setOutput($output)
+    {
+        $prev = null !== $this->outputStream ? $this->outputStream : $this->lineDumper;
+
+        if (is_callable($output)) {
+            $this->outputStream = null;
+            $this->lineDumper = $output;
+        } else {
+            if (is_string($output)) {
+                $output = fopen($output, 'wb');
+            }
+            $this->outputStream = $output;
+            $this->lineDumper = array($this, 'echoLine');
+        }
+
+        return $prev;
+    }
+
+    /**
+     * Sets the default character encoding to use for non-UTF8 strings.
+     *
+     * @param string $charset The default character encoding to use for non-UTF8 strings.
+     *
+     * @return string The previous charset.
+     */
+    public function setCharset($charset)
+    {
+        $prev = $this->charset;
+
+        $charset = strtoupper($charset);
+        $charset = null === $charset || 'UTF-8' === $charset || 'UTF8' === $charset ? 'CP1252' : $charset;
+
+        $this->charset = $charset;
+
+        return $prev;
+    }
+
+    /**
+     * Sets the indentation pad string.
+     *
+     * @param string $pad A string the will be prepended to dumped lines, repeated by nesting level.
+     *
+     * @return string The indent pad.
+     */
+    public function setIndentPad($pad)
+    {
+        $prev = $this->indentPad;
+        $this->indentPad = $pad;
+
+        return $prev;
+    }
+
+    /**
+     * Dumps a Data object.
+     *
+     * @param Data                          $data   A Data object.
+     * @param callable|resource|string|null $output A line dumper callable, an opened stream or an output path.
+     */
+    public function dump(Data $data, $output = null)
+    {
+        $exception = null;
+        if ($output) {
+            $prevOutput = $this->setOutput($output);
+        }
+        try {
+            $data->dump($this);
+            $this->dumpLine(-1);
+        } catch (\Exception $exception) {
+            // Re-thrown below
+        }
+        if ($output) {
+            $this->setOutput($prevOutput);
+        }
+        if (null !== $exception) {
+            throw $exception;
+        }
+    }
+
+    /**
+     * Dumps the current line.
+     *
+     * @param int $depth The recursive depth in the dumped structure for the line being dumped.
+     */
+    protected function dumpLine($depth)
+    {
+        call_user_func($this->lineDumper, $this->line, $depth, $this->indentPad);
+        $this->line = '';
+    }
+
+    /**
+     * Generic line dumper callback.
+     *
+     * @param string $line  The line to write.
+     * @param int    $depth The recursive depth in the dumped structure.
+     */
+    protected function echoLine($line, $depth, $indentPad)
+    {
+        if (-1 !== $depth) {
+            fwrite($this->outputStream, str_repeat($indentPad, $depth).$line."\n");
+        }
+    }
+
+    /**
+     * Converts a non-UTF-8 string to UTF-8.
+     *
+     * @param string $s The non-UTF-8 string to convert.
+     *
+     * @return string The string converted to UTF-8.
+     */
+    protected function utf8Encode($s)
+    {
+        if (false !== $c = @iconv($this->charset, 'UTF-8', $s)) {
+            return $c;
+        }
+        if ('CP1252' !== $this->charset && false !== $c = @iconv('CP1252', 'UTF-8', $s)) {
+            return $c;
+        }
+
+        return iconv('CP850', 'UTF-8', $s);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Dumper/CliDumper.php b/htdocs/includes/symfony/var-dumper/Dumper/CliDumper.php
new file mode 100644
index 00000000000..bca2abcb3d0
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Dumper/CliDumper.php
@@ -0,0 +1,471 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Dumper;
+
+use Symfony\Component\VarDumper\Cloner\Cursor;
+
+/**
+ * CliDumper dumps variables for command line output.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CliDumper extends AbstractDumper
+{
+    public static $defaultColors;
+    public static $defaultOutput = 'php://stdout';
+
+    protected $colors;
+    protected $maxStringWidth = 0;
+    protected $styles = array(
+        // See http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
+        'default' => '38;5;208',
+        'num' => '1;38;5;38',
+        'const' => '1;38;5;208',
+        'str' => '1;38;5;113',
+        'note' => '38;5;38',
+        'ref' => '38;5;247',
+        'public' => '',
+        'protected' => '',
+        'private' => '',
+        'meta' => '38;5;170',
+        'key' => '38;5;113',
+        'index' => '38;5;38',
+    );
+
+    protected static $controlCharsRx = '/[\x00-\x1F\x7F]+/';
+    protected static $controlCharsMap = array(
+        "\t" => '\t',
+        "\n" => '\n',
+        "\v" => '\v',
+        "\f" => '\f',
+        "\r" => '\r',
+        "\033" => '\e',
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($output = null, $charset = null)
+    {
+        parent::__construct($output, $charset);
+
+        if ('\\' === DIRECTORY_SEPARATOR && false !== @getenv('ANSICON')) {
+            // Use only the base 16 xterm colors when using ANSICON
+            $this->setStyles(array(
+                'default' => '31',
+                'num' => '1;34',
+                'const' => '1;31',
+                'str' => '1;32',
+                'note' => '34',
+                'ref' => '1;30',
+                'meta' => '35',
+                'key' => '32',
+                'index' => '34',
+            ));
+        }
+    }
+
+    /**
+     * Enables/disables colored output.
+     *
+     * @param bool $colors
+     */
+    public function setColors($colors)
+    {
+        $this->colors = (bool) $colors;
+    }
+
+    /**
+     * Sets the maximum number of characters per line for dumped strings.
+     *
+     * @param int $maxStringWidth
+     */
+    public function setMaxStringWidth($maxStringWidth)
+    {
+        $this->maxStringWidth = (int) $maxStringWidth;
+    }
+
+    /**
+     * Configures styles.
+     *
+     * @param array $styles A map of style names to style definitions.
+     */
+    public function setStyles(array $styles)
+    {
+        $this->styles = $styles + $this->styles;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dumpScalar(Cursor $cursor, $type, $value)
+    {
+        $this->dumpKey($cursor);
+
+        $style = 'const';
+        $attr = array();
+
+        switch ($type) {
+            case 'integer':
+                $style = 'num';
+                break;
+
+            case 'double':
+                $style = 'num';
+
+                switch (true) {
+                    case INF === $value:  $value = 'INF';  break;
+                    case -INF === $value: $value = '-INF'; break;
+                    case is_nan($value):  $value = 'NAN';  break;
+                    default:
+                        $value = (string) $value;
+                        if (false === strpos($value, $this->decimalPoint)) {
+                            $value .= $this->decimalPoint.'0';
+                        }
+                        break;
+                }
+                break;
+
+            case 'NULL':
+                $value = 'null';
+                break;
+
+            case 'boolean':
+                $value = $value ? 'true' : 'false';
+                break;
+
+            default:
+                $attr['value'] = isset($value[0]) && !preg_match('//u', $value) ? $this->utf8Encode($value) : $value;
+                $value = isset($type[0]) && !preg_match('//u', $type) ? $this->utf8Encode($type) : $type;
+                break;
+        }
+
+        $this->line .= $this->style($style, $value, $attr);
+
+        $this->dumpLine($cursor->depth, true);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dumpString(Cursor $cursor, $str, $bin, $cut)
+    {
+        $this->dumpKey($cursor);
+
+        if ($bin) {
+            $str = $this->utf8Encode($str);
+        }
+        if ('' === $str) {
+            $this->line .= '""';
+            $this->dumpLine($cursor->depth, true);
+        } else {
+            $attr = array(
+                'length' => 0 <= $cut ? iconv_strlen($str, 'UTF-8') + $cut : 0,
+                'binary' => $bin,
+            );
+            $str = explode("\n", $str);
+            if (isset($str[1]) && !isset($str[2]) && !isset($str[1][0])) {
+                unset($str[1]);
+                $str[0] .= "\n";
+            }
+            $m = count($str) - 1;
+            $i = $lineCut = 0;
+
+            if ($bin) {
+                $this->line .= 'b';
+            }
+
+            if ($m) {
+                $this->line .= '"""';
+                $this->dumpLine($cursor->depth);
+            } else {
+                $this->line .= '"';
+            }
+
+            foreach ($str as $str) {
+                if ($i < $m) {
+                    $str .= "\n";
+                }
+                if (0 < $this->maxStringWidth && $this->maxStringWidth < $len = iconv_strlen($str, 'UTF-8')) {
+                    $str = iconv_substr($str, 0, $this->maxStringWidth, 'UTF-8');
+                    $lineCut = $len - $this->maxStringWidth;
+                }
+                if ($m && 0 < $cursor->depth) {
+                    $this->line .= $this->indentPad;
+                }
+                if ('' !== $str) {
+                    $this->line .= $this->style('str', $str, $attr);
+                }
+                if ($i++ == $m) {
+                    if ($m) {
+                        if ('' !== $str) {
+                            $this->dumpLine($cursor->depth);
+                            if (0 < $cursor->depth) {
+                                $this->line .= $this->indentPad;
+                            }
+                        }
+                        $this->line .= '"""';
+                    } else {
+                        $this->line .= '"';
+                    }
+                    if ($cut < 0) {
+                        $this->line .= '…';
+                        $lineCut = 0;
+                    } elseif ($cut) {
+                        $lineCut += $cut;
+                    }
+                }
+                if ($lineCut) {
+                    $this->line .= '…'.$lineCut;
+                    $lineCut = 0;
+                }
+
+                $this->dumpLine($cursor->depth, $i > $m);
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function enterHash(Cursor $cursor, $type, $class, $hasChild)
+    {
+        $this->dumpKey($cursor);
+
+        if (!preg_match('//u', $class)) {
+            $class = $this->utf8Encode($class);
+        }
+        if (Cursor::HASH_OBJECT === $type) {
+            $prefix = $class && 'stdClass' !== $class ? $this->style('note', $class).' {' : '{';
+        } elseif (Cursor::HASH_RESOURCE === $type) {
+            $prefix = $this->style('note', $class.' resource').($hasChild ? ' {' : ' ');
+        } else {
+            $prefix = $class ? $this->style('note', 'array:'.$class).' [' : '[';
+        }
+
+        if ($cursor->softRefCount || 0 < $cursor->softRefHandle) {
+            $prefix .= $this->style('ref', (Cursor::HASH_RESOURCE === $type ? '@' : '#').(0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->softRefTo), array('count' => $cursor->softRefCount));
+        } elseif ($cursor->hardRefTo && !$cursor->refIndex && $class) {
+            $prefix .= $this->style('ref', '&'.$cursor->hardRefTo, array('count' => $cursor->hardRefCount));
+        } elseif (!$hasChild && Cursor::HASH_RESOURCE === $type) {
+            $prefix = substr($prefix, 0, -1);
+        }
+
+        $this->line .= $prefix;
+
+        if ($hasChild) {
+            $this->dumpLine($cursor->depth);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut)
+    {
+        $this->dumpEllipsis($cursor, $hasChild, $cut);
+        $this->line .= Cursor::HASH_OBJECT === $type ? '}' : (Cursor::HASH_RESOURCE !== $type ? ']' : ($hasChild ? '}' : ''));
+        $this->dumpLine($cursor->depth, true);
+    }
+
+    /**
+     * Dumps an ellipsis for cut children.
+     *
+     * @param Cursor $cursor   The Cursor position in the dump.
+     * @param bool   $hasChild When the dump of the hash has child item.
+     * @param int    $cut      The number of items the hash has been cut by.
+     */
+    protected function dumpEllipsis(Cursor $cursor, $hasChild, $cut)
+    {
+        if ($cut) {
+            $this->line .= ' …';
+            if (0 < $cut) {
+                $this->line .= $cut;
+            }
+            if ($hasChild) {
+                $this->dumpLine($cursor->depth + 1);
+            }
+        }
+    }
+
+    /**
+     * Dumps a key in a hash structure.
+     *
+     * @param Cursor $cursor The Cursor position in the dump.
+     */
+    protected function dumpKey(Cursor $cursor)
+    {
+        if (null !== $key = $cursor->hashKey) {
+            if ($cursor->hashKeyIsBinary) {
+                $key = $this->utf8Encode($key);
+            }
+            $attr = array('binary' => $cursor->hashKeyIsBinary);
+            $bin = $cursor->hashKeyIsBinary ? 'b' : '';
+            $style = 'key';
+            switch ($cursor->hashType) {
+                default:
+                case Cursor::HASH_INDEXED:
+                    $style = 'index';
+                case Cursor::HASH_ASSOC:
+                    if (is_int($key)) {
+                        $this->line .= $this->style($style, $key).' => ';
+                    } else {
+                        $this->line .= $bin.'"'.$this->style($style, $key).'" => ';
+                    }
+                    break;
+
+                case Cursor::HASH_RESOURCE:
+                    $key = "\0~\0".$key;
+                    // No break;
+                case Cursor::HASH_OBJECT:
+                    if (!isset($key[0]) || "\0" !== $key[0]) {
+                        $this->line .= '+'.$bin.$this->style('public', $key).': ';
+                    } elseif (0 < strpos($key, "\0", 1)) {
+                        $key = explode("\0", substr($key, 1), 2);
+
+                        switch ($key[0]) {
+                            case '+': // User inserted keys
+                                $attr['dynamic'] = true;
+                                $this->line .= '+'.$bin.'"'.$this->style('public', $key[1], $attr).'": ';
+                                break 2;
+                            case '~':
+                                $style = 'meta';
+                                break;
+                            case '*':
+                                $style = 'protected';
+                                $bin = '#'.$bin;
+                                break;
+                            default:
+                                $attr['class'] = $key[0];
+                                $style = 'private';
+                                $bin = '-'.$bin;
+                                break;
+                        }
+
+                        $this->line .= $bin.$this->style($style, $key[1], $attr).': ';
+                    } else {
+                        // This case should not happen
+                        $this->line .= '-'.$bin.'"'.$this->style('private', $key, array('class' => '')).'": ';
+                    }
+                    break;
+            }
+
+            if ($cursor->hardRefTo) {
+                $this->line .= $this->style('ref', '&'.($cursor->hardRefCount ? $cursor->hardRefTo : ''), array('count' => $cursor->hardRefCount)).' ';
+            }
+        }
+    }
+
+    /**
+     * Decorates a value with some style.
+     *
+     * @param string $style The type of style being applied.
+     * @param string $value The value being styled.
+     * @param array  $attr  Optional context information.
+     *
+     * @return string The value with style decoration.
+     */
+    protected function style($style, $value, $attr = array())
+    {
+        if (null === $this->colors) {
+            $this->colors = $this->supportsColors();
+        }
+
+        $style = $this->styles[$style];
+
+        $map = static::$controlCharsMap;
+        $startCchr = $this->colors ? "\033[m\033[{$this->styles['default']}m" : '';
+        $endCchr = $this->colors ? "\033[m\033[{$style}m" : '';
+        $value = preg_replace_callback(static::$controlCharsRx, function ($c) use ($map, $startCchr, $endCchr) {
+            $s = $startCchr;
+            $c = $c[$i = 0];
+            do {
+                $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
+            } while (isset($c[++$i]));
+
+            return $s.$endCchr;
+        }, $value, -1, $cchrCount);
+
+        if ($this->colors) {
+            if ($cchrCount && "\033" === $value[0]) {
+                $value = substr($value, strlen($startCchr));
+            } else {
+                $value = "\033[{$style}m".$value;
+            }
+            if ($cchrCount && $endCchr === substr($value, -strlen($endCchr))) {
+                $value = substr($value, 0, -strlen($endCchr));
+            } else {
+                $value .= "\033[{$this->styles['default']}m";
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * @return bool Tells if the current output stream supports ANSI colors or not.
+     */
+    protected function supportsColors()
+    {
+        if ($this->outputStream !== static::$defaultOutput) {
+            return @(is_resource($this->outputStream) && function_exists('posix_isatty') && posix_isatty($this->outputStream));
+        }
+        if (null !== static::$defaultColors) {
+            return static::$defaultColors;
+        }
+        if (isset($_SERVER['argv'][1])) {
+            $colors = $_SERVER['argv'];
+            $i = count($colors);
+            while (--$i > 0) {
+                if (isset($colors[$i][5])) {
+                    switch ($colors[$i]) {
+                        case '--ansi':
+                        case '--color':
+                        case '--color=yes':
+                        case '--color=force':
+                        case '--color=always':
+                            return static::$defaultColors = true;
+
+                        case '--no-ansi':
+                        case '--color=no':
+                        case '--color=none':
+                        case '--color=never':
+                            return static::$defaultColors = false;
+                    }
+                }
+            }
+        }
+
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            static::$defaultColors = @(false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') || 'xterm' === getenv('TERM'));
+        } elseif (function_exists('posix_isatty')) {
+            $h = stream_get_meta_data($this->outputStream) + array('wrapper_type' => null);
+            $h = 'Output' === $h['stream_type'] && 'PHP' === $h['wrapper_type'] ? fopen('php://stdout', 'wb') : $this->outputStream;
+            static::$defaultColors = @posix_isatty($h);
+        } else {
+            static::$defaultColors = false;
+        }
+
+        return static::$defaultColors;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function dumpLine($depth, $endOfValue = false)
+    {
+        if ($this->colors) {
+            $this->line = sprintf("\033[%sm%s\033[m", $this->styles['default'], $this->line);
+        }
+        parent::dumpLine($depth);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Dumper/DataDumperInterface.php b/htdocs/includes/symfony/var-dumper/Dumper/DataDumperInterface.php
new file mode 100644
index 00000000000..ee6060cebf6
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Dumper/DataDumperInterface.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Dumper;
+
+use Symfony\Component\VarDumper\Cloner\Data;
+
+/**
+ * DataDumperInterface for dumping Data objects.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+interface DataDumperInterface
+{
+    /**
+     * Dumps a Data object.
+     *
+     * @param Data $data A Data object.
+     */
+    public function dump(Data $data);
+}
diff --git a/htdocs/includes/symfony/var-dumper/Dumper/HtmlDumper.php b/htdocs/includes/symfony/var-dumper/Dumper/HtmlDumper.php
new file mode 100644
index 00000000000..28af8e4cb22
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Dumper/HtmlDumper.php
@@ -0,0 +1,452 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Dumper;
+
+use Symfony\Component\VarDumper\Cloner\Cursor;
+use Symfony\Component\VarDumper\Cloner\Data;
+
+/**
+ * HtmlDumper dumps variables as HTML.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class HtmlDumper extends CliDumper
+{
+    public static $defaultOutput = 'php://output';
+
+    protected $dumpHeader;
+    protected $dumpPrefix = '<pre class=sf-dump id=%s data-indent-pad="%s">';
+    protected $dumpSuffix = '</pre><script>Sfdump("%s")</script>';
+    protected $dumpId = 'sf-dump';
+    protected $colors = true;
+    protected $headerIsDumped = false;
+    protected $lastDepth = -1;
+    protected $styles = array(
+        'default' => 'background-color:#18171B; color:#FF8400; line-height:1.2em; font:12px Menlo, Monaco, Consolas, monospace; word-wrap: break-word; white-space: pre-wrap; position:relative; z-index:100000; word-break: normal',
+        'num' => 'font-weight:bold; color:#1299DA',
+        'const' => 'font-weight:bold',
+        'str' => 'font-weight:bold; color:#56DB3A',
+        'note' => 'color:#1299DA',
+        'ref' => 'color:#A0A0A0',
+        'public' => 'color:#FFFFFF',
+        'protected' => 'color:#FFFFFF',
+        'private' => 'color:#FFFFFF',
+        'meta' => 'color:#B729D9',
+        'key' => 'color:#56DB3A',
+        'index' => 'color:#1299DA',
+    );
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($output = null, $charset = null)
+    {
+        AbstractDumper::__construct($output, $charset);
+        $this->dumpId = 'sf-dump-'.mt_rand();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setOutput($output)
+    {
+        if ($output !== $prev = parent::setOutput($output)) {
+            $this->headerIsDumped = false;
+        }
+
+        return $prev;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setStyles(array $styles)
+    {
+        $this->headerIsDumped = false;
+        $this->styles = $styles + $this->styles;
+    }
+
+    /**
+     * Sets an HTML header that will be dumped once in the output stream.
+     *
+     * @param string $header An HTML string.
+     */
+    public function setDumpHeader($header)
+    {
+        $this->dumpHeader = $header;
+    }
+
+    /**
+     * Sets an HTML prefix and suffix that will encapse every single dump.
+     *
+     * @param string $prefix The prepended HTML string.
+     * @param string $suffix The appended HTML string.
+     */
+    public function setDumpBoundaries($prefix, $suffix)
+    {
+        $this->dumpPrefix = $prefix;
+        $this->dumpSuffix = $suffix;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function dump(Data $data, $output = null)
+    {
+        parent::dump($data, $output);
+        $this->dumpId = 'sf-dump-'.mt_rand();
+    }
+
+    /**
+     * Dumps the HTML header.
+     */
+    protected function getDumpHeader()
+    {
+        $this->headerIsDumped = true;
+
+        if (null !== $this->dumpHeader) {
+            return $this->dumpHeader;
+        }
+
+        $line = <<<'EOHTML'
+<script>
+Sfdump = window.Sfdump || (function (doc) {
+
+var refStyle = doc.createElement('style'),
+    rxEsc = /([.*+?^${}()|\[\]\/\\])/g,
+    idRx = /\bsf-dump-\d+-ref[012]\w+\b/,
+    keyHint = 0 <= navigator.platform.toUpperCase().indexOf('MAC') ? 'Cmd' : 'Ctrl',
+    addEventListener = function (e, n, cb) {
+        e.addEventListener(n, cb, false);
+    };
+
+(doc.documentElement.firstElementChild || doc.documentElement.children[0]).appendChild(refStyle);
+
+if (!doc.addEventListener) {
+    addEventListener = function (element, eventName, callback) {
+        element.attachEvent('on' + eventName, function (e) {
+            e.preventDefault = function () {e.returnValue = false;};
+            e.target = e.srcElement;
+            callback(e);
+        });
+    };
+}
+
+function toggle(a, recursive) {
+    var s = a.nextSibling || {}, oldClass = s.className, arrow, newClass;
+
+    if ('sf-dump-compact' == oldClass) {
+        arrow = '▼';
+        newClass = 'sf-dump-expanded';
+    } else if ('sf-dump-expanded' == oldClass) {
+        arrow = '▶';
+        newClass = 'sf-dump-compact';
+    } else {
+        return false;
+    }
+
+    a.lastChild.innerHTML = arrow;
+    s.className = newClass;
+
+    if (recursive) {
+        try {
+            a = s.querySelectorAll('.'+oldClass);
+            for (s = 0; s < a.length; ++s) {
+                if (a[s].className !== newClass) {
+                    a[s].className = newClass;
+                    a[s].previousSibling.lastChild.innerHTML = arrow;
+                }
+            }
+        } catch (e) {
+        }
+    }
+
+    return true;
+};
+
+return function (root) {
+    root = doc.getElementById(root);
+
+    function a(e, f) {
+        addEventListener(root, e, function (e) {
+            if ('A' == e.target.tagName) {
+                f(e.target, e);
+            } else if ('A' == e.target.parentNode.tagName) {
+                f(e.target.parentNode, e);
+            }
+        });
+    };
+    function isCtrlKey(e) {
+        return e.ctrlKey || e.metaKey;
+    }
+    addEventListener(root, 'mouseover', function (e) {
+        if ('' != refStyle.innerHTML) {
+            refStyle.innerHTML = '';
+        }
+    });
+    a('mouseover', function (a) {
+        if (a = idRx.exec(a.className)) {
+            try {
+                refStyle.innerHTML = 'pre.sf-dump .'+a[0]+'{background-color: #B729D9; color: #FFF !important; border-radius: 2px}';
+            } catch (e) {
+            }
+        }
+    });
+    a('click', function (a, e) {
+        if (/\bsf-dump-toggle\b/.test(a.className)) {
+            e.preventDefault();
+            if (!toggle(a, isCtrlKey(e))) {
+                var r = doc.getElementById(a.getAttribute('href').substr(1)),
+                    s = r.previousSibling,
+                    f = r.parentNode,
+                    t = a.parentNode;
+                t.replaceChild(r, a);
+                f.replaceChild(a, s);
+                t.insertBefore(s, r);
+                f = f.firstChild.nodeValue.match(indentRx);
+                t = t.firstChild.nodeValue.match(indentRx);
+                if (f && t && f[0] !== t[0]) {
+                    r.innerHTML = r.innerHTML.replace(new RegExp('^'+f[0].replace(rxEsc, '\\$1'), 'mg'), t[0]);
+                }
+                if ('sf-dump-compact' == r.className) {
+                    toggle(s, isCtrlKey(e));
+                }
+            }
+
+            if (doc.getSelection) {
+                try {
+                    doc.getSelection().removeAllRanges();
+                } catch (e) {
+                    doc.getSelection().empty();
+                }
+            } else {
+                doc.selection.empty();
+            }
+        }
+    });
+
+    var indentRx = new RegExp('^('+(root.getAttribute('data-indent-pad') || '  ').replace(rxEsc, '\\$1')+')+', 'm'),
+        elt = root.getElementsByTagName('A'),
+        len = elt.length,
+        i = 0,
+        t = [];
+
+    while (i < len) t.push(elt[i++]);
+
+    elt = root.getElementsByTagName('SAMP');
+    len = elt.length;
+    i = 0;
+
+    while (i < len) t.push(elt[i++]);
+
+    root = t;
+    len = t.length;
+    i = t = 0;
+
+    while (i < len) {
+        elt = root[i];
+        if ("SAMP" == elt.tagName) {
+            elt.className = "sf-dump-expanded";
+            a = elt.previousSibling || {};
+            if ('A' != a.tagName) {
+                a = doc.createElement('A');
+                a.className = 'sf-dump-ref';
+                elt.parentNode.insertBefore(a, elt);
+            } else {
+                a.innerHTML += ' ';
+            }
+            a.title = (a.title ? a.title+'\n[' : '[')+keyHint+'+click] Expand all children';
+            a.innerHTML += '<span>▼</span>';
+            a.className += ' sf-dump-toggle';
+            if ('sf-dump' != elt.parentNode.className) {
+                toggle(a);
+            }
+        } else if ("sf-dump-ref" == elt.className && (a = elt.getAttribute('href'))) {
+            a = a.substr(1);
+            elt.className += ' '+a;
+
+            if (/[\[{]$/.test(elt.previousSibling.nodeValue)) {
+                a = a != elt.nextSibling.id && doc.getElementById(a);
+                try {
+                    t = a.nextSibling;
+                    elt.appendChild(a);
+                    t.parentNode.insertBefore(a, t);
+                    if (/^[@#]/.test(elt.innerHTML)) {
+                        elt.innerHTML += ' <span>▶</span>';
+                    } else {
+                        elt.innerHTML = '<span>▶</span>';
+                        elt.className = 'sf-dump-ref';
+                    }
+                    elt.className += ' sf-dump-toggle';
+                } catch (e) {
+                    if ('&' == elt.innerHTML.charAt(0)) {
+                        elt.innerHTML = '…';
+                        elt.className = 'sf-dump-ref';
+                    }
+                }
+            }
+        }
+        ++i;
+    }
+};
+
+})(document);
+</script>
+<style>
+pre.sf-dump {
+    display: block;
+    white-space: pre;
+    padding: 5px;
+}
+pre.sf-dump span {
+    display: inline;
+}
+pre.sf-dump .sf-dump-compact {
+    display: none;
+}
+pre.sf-dump abbr {
+    text-decoration: none;
+    border: none;
+    cursor: help;
+}
+pre.sf-dump a {
+    text-decoration: none;
+    cursor: pointer;
+    border: 0;
+    outline: none;
+}
+EOHTML;
+
+        foreach ($this->styles as $class => $style) {
+            $line .= 'pre.sf-dump'.('default' !== $class ? ' .sf-dump-'.$class : '').'{'.$style.'}';
+        }
+
+        return $this->dumpHeader = preg_replace('/\s+/', ' ', $line).'</style>'.$this->dumpHeader;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function enterHash(Cursor $cursor, $type, $class, $hasChild)
+    {
+        parent::enterHash($cursor, $type, $class, false);
+
+        if ($hasChild) {
+            if ($cursor->refIndex) {
+                $r = Cursor::HASH_OBJECT !== $type ? 1 - (Cursor::HASH_RESOURCE !== $type) : 2;
+                $r .= $r && 0 < $cursor->softRefHandle ? $cursor->softRefHandle : $cursor->refIndex;
+
+                $this->line .= sprintf('<samp id=%s-ref%s>', $this->dumpId, $r);
+            } else {
+                $this->line .= '<samp>';
+            }
+            $this->dumpLine($cursor->depth);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function leaveHash(Cursor $cursor, $type, $class, $hasChild, $cut)
+    {
+        $this->dumpEllipsis($cursor, $hasChild, $cut);
+        if ($hasChild) {
+            $this->line .= '</samp>';
+        }
+        parent::leaveHash($cursor, $type, $class, $hasChild, 0);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function style($style, $value, $attr = array())
+    {
+        if ('' === $value) {
+            return '';
+        }
+
+        $v = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+
+        if ('ref' === $style) {
+            if (empty($attr['count'])) {
+                return sprintf('<a class=sf-dump-ref>%s</a>', $v);
+            }
+            $r = ('#' !== $v[0] ? 1 - ('@' !== $v[0]) : 2).substr($value, 1);
+
+            return sprintf('<a class=sf-dump-ref href=#%s-ref%s title="%d occurrences">%s</a>', $this->dumpId, $r, 1 + $attr['count'], $v);
+        }
+
+        if ('const' === $style && array_key_exists('value', $attr)) {
+            $style .= sprintf(' title="%s"', htmlspecialchars(json_encode($attr['value']), ENT_QUOTES, 'UTF-8'));
+        } elseif ('public' === $style) {
+            $style .= sprintf(' title="%s"', empty($attr['dynamic']) ? 'Public property' : 'Runtime added dynamic property');
+        } elseif ('str' === $style && 1 < $attr['length']) {
+            $style .= sprintf(' title="%s%s characters"', $attr['length'], $attr['binary'] ? ' binary or non-UTF-8' : '');
+        } elseif ('note' === $style && false !== $c = strrpos($v, '\\')) {
+            return sprintf('<abbr title="%s" class=sf-dump-%s>%s</abbr>', $v, $style, substr($v, $c + 1));
+        } elseif ('protected' === $style) {
+            $style .= ' title="Protected property"';
+        } elseif ('private' === $style) {
+            $style .= sprintf(' title="Private property defined in class:&#10;`%s`"', $attr['class']);
+        }
+
+        $map = static::$controlCharsMap;
+        $style = "<span class=sf-dump-{$style}>";
+        $v = preg_replace_callback(static::$controlCharsRx, function ($c) use ($map, $style) {
+            $s = '</span>';
+            $c = $c[$i = 0];
+            do {
+                $s .= isset($map[$c[$i]]) ? $map[$c[$i]] : sprintf('\x%02X', ord($c[$i]));
+            } while (isset($c[++$i]));
+
+            return $s.$style;
+        }, $v, -1, $cchrCount);
+
+        if ($cchrCount && '<' === $v[0]) {
+            $v = substr($v, 7);
+        } else {
+            $v = $style.$v;
+        }
+        if ($cchrCount && '>' === substr($v, -1)) {
+            $v = substr($v, 0, -strlen($style));
+        } else {
+            $v .= '</span>';
+        }
+
+        return $v;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function dumpLine($depth, $endOfValue = false)
+    {
+        if (-1 === $this->lastDepth) {
+            $this->line = sprintf($this->dumpPrefix, $this->dumpId, $this->indentPad).$this->line;
+        }
+        if (!$this->headerIsDumped) {
+            $this->line = $this->getDumpHeader().$this->line;
+        }
+
+        if (-1 === $depth) {
+            $this->line .= sprintf($this->dumpSuffix, $this->dumpId);
+        }
+        $this->lastDepth = $depth;
+
+        $this->line = mb_convert_encoding($this->line, 'HTML-ENTITIES', 'UTF-8');
+
+        if (-1 === $depth) {
+            AbstractDumper::dumpLine(0);
+        }
+        AbstractDumper::dumpLine($depth);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Exception/ThrowingCasterException.php b/htdocs/includes/symfony/var-dumper/Exception/ThrowingCasterException.php
new file mode 100644
index 00000000000..976f4439b67
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Exception/ThrowingCasterException.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Exception;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ThrowingCasterException extends \Exception
+{
+    /**
+     * @param \Exception $prev The exception thrown from the caster
+     */
+    public function __construct(\Exception $prev)
+    {
+        parent::__construct('Unexpected '.get_class($prev).' thrown from a caster: '.$prev->getMessage(), 0, $prev);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/LICENSE b/htdocs/includes/symfony/var-dumper/LICENSE
new file mode 100644
index 00000000000..ef1cde91a61
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2014-2015 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/htdocs/includes/symfony/var-dumper/README.md b/htdocs/includes/symfony/var-dumper/README.md
new file mode 100644
index 00000000000..71bff335a70
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/README.md
@@ -0,0 +1,14 @@
+Symfony mechanism for exploring and dumping PHP variables
+=========================================================
+
+This component provides a mechanism that allows exploring then dumping
+any PHP variable.
+
+It handles scalars, objects and resources properly, taking hard and soft
+references into account. More than being immune to infinite recursion
+problems, it allows dumping where references link to each other.
+It explores recursive structures using a breadth-first algorithm.
+
+The component exposes all the parts involved in the different steps of
+cloning then dumping a PHP variable, while applying size limits and having
+specialized output formats and methods.
diff --git a/htdocs/includes/symfony/var-dumper/Resources/functions/dump.php b/htdocs/includes/symfony/var-dumper/Resources/functions/dump.php
new file mode 100644
index 00000000000..b6c243c8b6e
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Resources/functions/dump.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Component\VarDumper\VarDumper;
+
+if (!function_exists('dump')) {
+    /**
+     * @author Nicolas Grekas <p@tchwork.com>
+     */
+    function dump($var)
+    {
+        foreach (func_get_args() as $var) {
+            VarDumper::dump($var);
+        }
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php b/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php
new file mode 100644
index 00000000000..e5f6bf5b98e
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Test/VarDumperTestTrait.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Test;
+
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+trait VarDumperTestTrait
+{
+    public function assertDumpEquals($dump, $data, $message = '')
+    {
+        $this->assertSame(rtrim($dump), $this->getDump($data), $message);
+    }
+
+    public function assertDumpMatchesFormat($dump, $data, $message = '')
+    {
+        $this->assertStringMatchesFormat(rtrim($dump), $this->getDump($data), $message);
+    }
+
+    protected function getDump($data)
+    {
+        $h = fopen('php://memory', 'r+b');
+        $cloner = new VarCloner();
+        $cloner->setMaxItems(-1);
+        $dumper = new CliDumper($h);
+        $dumper->setColors(false);
+        $dumper->dump($cloner->cloneVar($data)->withRefHandles(false));
+        $data = stream_get_contents($h, -1, 0);
+        fclose($h);
+
+        return rtrim($data);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php
new file mode 100644
index 00000000000..43d389ce1c0
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/CasterTest.php
@@ -0,0 +1,180 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use Symfony\Component\VarDumper\Caster\Caster;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CasterTest extends \PHPUnit_Framework_TestCase
+{
+    use VarDumperTestTrait;
+
+    private $referenceArray = array(
+        'null' => null,
+        'empty' => false,
+        'public' => 'pub',
+        "\0~\0virtual" => 'virt',
+        "\0+\0dynamic" => 'dyn',
+        "\0*\0protected" => 'prot',
+        "\0Foo\0private" => 'priv',
+    );
+
+    /**
+     * @dataProvider provideFilter
+     */
+    public function testFilter($filter, $expectedDiff, $listedProperties = null)
+    {
+        if (null === $listedProperties) {
+            $filteredArray = Caster::filter($this->referenceArray, $filter);
+        } else {
+            $filteredArray = Caster::filter($this->referenceArray, $filter, $listedProperties);
+        }
+
+        $this->assertSame($expectedDiff, array_diff_assoc($this->referenceArray, $filteredArray));
+    }
+
+    public function provideFilter()
+    {
+        return array(
+            array(
+                0,
+                array(),
+            ),
+            array(
+                Caster::EXCLUDE_PUBLIC,
+                array(
+                    'null' => null,
+                    'empty' => false,
+                    'public' => 'pub',
+                ),
+            ),
+            array(
+                Caster::EXCLUDE_NULL,
+                array(
+                    'null' => null,
+                ),
+            ),
+            array(
+                Caster::EXCLUDE_EMPTY,
+                array(
+                    'null' => null,
+                    'empty' => false,
+                ),
+            ),
+            array(
+                Caster::EXCLUDE_VIRTUAL,
+                array(
+                    "\0~\0virtual" => 'virt',
+                ),
+            ),
+            array(
+                Caster::EXCLUDE_DYNAMIC,
+                array(
+                    "\0+\0dynamic" => 'dyn',
+                ),
+            ),
+            array(
+                Caster::EXCLUDE_PROTECTED,
+                array(
+                    "\0*\0protected" => 'prot',
+                ),
+            ),
+            array(
+                Caster::EXCLUDE_PRIVATE,
+                array(
+                    "\0Foo\0private" => 'priv',
+                ),
+            ),
+            array(
+                Caster::EXCLUDE_VERBOSE,
+                array(
+                    'public' => 'pub',
+                    "\0*\0protected" => 'prot',
+                ),
+                array('public', "\0*\0protected"),
+            ),
+            array(
+                Caster::EXCLUDE_NOT_IMPORTANT,
+                array(
+                    'null' => null,
+                    'empty' => false,
+                    "\0~\0virtual" => 'virt',
+                    "\0+\0dynamic" => 'dyn',
+                    "\0Foo\0private" => 'priv',
+                ),
+                array('public', "\0*\0protected"),
+            ),
+            array(
+                Caster::EXCLUDE_VIRTUAL | Caster::EXCLUDE_DYNAMIC,
+                array(
+                    "\0~\0virtual" => 'virt',
+                    "\0+\0dynamic" => 'dyn',
+                ),
+            ),
+            array(
+                Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_VERBOSE,
+                $this->referenceArray,
+                array('public', "\0*\0protected"),
+            ),
+            array(
+                Caster::EXCLUDE_NOT_IMPORTANT | Caster::EXCLUDE_EMPTY,
+                array(
+                    'null' => null,
+                    'empty' => false,
+                    "\0~\0virtual" => 'virt',
+                    "\0+\0dynamic" => 'dyn',
+                    "\0*\0protected" => 'prot',
+                    "\0Foo\0private" => 'priv',
+                ),
+                array('public', 'empty'),
+            ),
+            array(
+                Caster::EXCLUDE_VERBOSE | Caster::EXCLUDE_EMPTY | Caster::EXCLUDE_STRICT,
+                array(
+                    'empty' => false,
+                ),
+                array('public', 'empty'),
+            ),
+        );
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testAnonymousClass()
+    {
+        $c = eval('return new class extends stdClass { private $foo = "foo"; };');
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+stdClass@anonymous {
+  -foo: "foo"
+}
+EOTXT
+            , $c
+        );
+
+        $c = eval('return new class { private $foo = "foo"; };');
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+@anonymous {
+  -foo: "foo"
+}
+EOTXT
+            , $c
+        );
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/PdoCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/PdoCasterTest.php
new file mode 100644
index 00000000000..faa65341170
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/PdoCasterTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use Symfony\Component\VarDumper\Caster\PdoCaster;
+use Symfony\Component\VarDumper\Cloner\Stub;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class PdoCasterTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @requires extension pdo_sqlite
+     */
+    public function testCastPdo()
+    {
+        $pdo = new \PDO('sqlite::memory:');
+        $pdo->setAttribute(\PDO::ATTR_STATEMENT_CLASS, array('PDOStatement', array($pdo)));
+
+        $cast = PdoCaster::castPdo($pdo, array(), new Stub(), false);
+
+        $this->assertInstanceOf('Symfony\Component\VarDumper\Caster\EnumStub', $cast["\0~\0attributes"]);
+
+        $attr = $cast["\0~\0attributes"] = $cast["\0~\0attributes"]->value;
+        $this->assertInstanceOf('Symfony\Component\VarDumper\Caster\ConstStub', $attr['CASE']);
+        $this->assertSame('NATURAL', $attr['CASE']->class);
+        $this->assertSame('BOTH', $attr['DEFAULT_FETCH_MODE']->class);
+
+        $xCast = array(
+            "\0~\0inTransaction" => $pdo->inTransaction(),
+            "\0~\0attributes" => array(
+                'CASE' => $attr['CASE'],
+                'ERRMODE' => $attr['ERRMODE'],
+                'PERSISTENT' => false,
+                'DRIVER_NAME' => 'sqlite',
+                'ORACLE_NULLS' => $attr['ORACLE_NULLS'],
+                'CLIENT_VERSION' => $pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION),
+                'SERVER_VERSION' => $pdo->getAttribute(\PDO::ATTR_SERVER_VERSION),
+                'STATEMENT_CLASS' => array('PDOStatement'),
+                'DEFAULT_FETCH_MODE' => $attr['DEFAULT_FETCH_MODE'],
+            ),
+        );
+        unset($cast["\0~\0attributes"]['STATEMENT_CLASS'][1]);
+
+        $this->assertSame($xCast, $cast);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
new file mode 100644
index 00000000000..0d7147fbcd2
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/ReflectionCasterTest.php
@@ -0,0 +1,228 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+use Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class ReflectionCasterTest extends \PHPUnit_Framework_TestCase
+{
+    use VarDumperTestTrait;
+
+    public function testReflectionCaster()
+    {
+        $var = new \ReflectionClass('ReflectionClass');
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+ReflectionClass {
+  +name: "ReflectionClass"
+%Aimplements: array:%d [
+    0 => "Reflector"
+%A]
+  constants: array:3 [
+    "IS_IMPLICIT_ABSTRACT" => 16
+    "IS_EXPLICIT_ABSTRACT" => 32
+    "IS_FINAL" => %d
+  ]
+  properties: array:%d [
+    "name" => ReflectionProperty {
+%A    +name: "name"
+      +class: "ReflectionClass"
+%A    modifiers: "public"
+    }
+%A]
+  methods: array:%d [
+%A
+    "export" => ReflectionMethod {
+      +name: "export"
+      +class: "ReflectionClass"
+      parameters: {
+        $%s: ReflectionParameter {
+%A         position: 0
+%A
+}
+EOTXT
+            , $var
+        );
+    }
+
+    public function testClosureCaster()
+    {
+        $a = $b = 123;
+        $var = function ($x) use ($a, &$b) {};
+
+        $this->assertDumpMatchesFormat(
+            <<<EOTXT
+Closure {
+%Aparameters: {
+    \$x: {}
+  }
+  use: {
+    \$a: 123
+    \$b: & 123
+  }
+  file: "%sReflectionCasterTest.php"
+  line: "65 to 65"
+}
+EOTXT
+            , $var
+        );
+    }
+
+    public function testReflectionParameter()
+    {
+        $var = new \ReflectionParameter(__NAMESPACE__.'\reflectionParameterFixture', 0);
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+ReflectionParameter {
+  +name: "arg1"
+  position: 0
+  typeHint: "Symfony\Component\VarDumper\Tests\Caster\NotExistingClass"
+  default: null
+}
+EOTXT
+            , $var
+        );
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testReflectionParameterScalar()
+    {
+        $f = eval('return function (int $a) {};');
+        $var = new \ReflectionParameter($f, 0);
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+ReflectionParameter {
+  +name: "a"
+  position: 0
+  typeHint: "int"
+}
+EOTXT
+            , $var
+        );
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testReturnType()
+    {
+        $f = eval('return function ():int {};');
+        $line = __LINE__ - 1;
+
+        $this->assertDumpMatchesFormat(
+            <<<EOTXT
+Closure {
+  returnType: "int"
+  class: "Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest"
+  this: Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest { …}
+  file: "%sReflectionCasterTest.php($line) : eval()'d code"
+  line: "1 to 1"
+}
+EOTXT
+            , $f
+        );
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testGenerator()
+    {
+        $g = new GeneratorDemo();
+        $g = $g->baz();
+        $r = new \ReflectionGenerator($g);
+
+        $xDump = <<<'EODUMP'
+Generator {
+  this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
+  executing: {
+    Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz(): {
+      %sGeneratorDemo.php:14: """
+        {\n
+            yield from bar();\n
+        }\n
+        """
+    }
+  }
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, $g);
+
+        foreach ($g as $v) {
+            break;
+        }
+
+        $xDump = <<<'EODUMP'
+array:2 [
+  0 => ReflectionGenerator {
+    this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
+    trace: {
+      3. Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() ==> yield(): {
+        src: {
+          %sGeneratorDemo.php:9: """
+            {\n
+                yield 1;\n
+            }\n
+            """
+        }
+      }
+      2. Symfony\Component\VarDumper\Tests\Fixtures\bar() ==> Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo(): {
+        src: {
+          %sGeneratorDemo.php:20: """
+            {\n
+                yield from GeneratorDemo::foo();\n
+            }\n
+            """
+        }
+      }
+      1. Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() ==> Symfony\Component\VarDumper\Tests\Fixtures\bar(): {
+        src: {
+          %sGeneratorDemo.php:14: """
+            {\n
+                yield from bar();\n
+            }\n
+            """
+        }
+      }
+    }
+  }
+  1 => Generator {
+    executing: {
+      Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo(): {
+        %sGeneratorDemo.php:10: """
+                  yield 1;\n
+              }\n
+          \n
+          """
+      }
+    }
+  }
+]
+EODUMP;
+
+        $this->assertDumpMatchesFormat($xDump, array($r, $r->getExecutingGenerator()));
+    }
+}
+
+function reflectionParameterFixture(NotExistingClass $arg1 = null, $arg2)
+{
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php b/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php
new file mode 100644
index 00000000000..5d71e8d379d
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Caster/SplCasterTest.php
@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Caster;
+
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Grégoire Pineau <lyrixx@lyrixx.info>
+ */
+class SplCasterTest extends \PHPUnit_Framework_TestCase
+{
+    use VarDumperTestTrait;
+
+    public function getCastFileInfoTests()
+    {
+        return array(
+            array(__FILE__, <<<'EOTXT'
+SplFileInfo {
+%Apath: "%sCaster"
+  filename: "SplCasterTest.php"
+  basename: "SplCasterTest.php"
+  pathname: "%sSplCasterTest.php"
+  extension: "php"
+  realPath: "%sSplCasterTest.php"
+  aTime: %s-%s-%d %d:%d:%d
+  mTime: %s-%s-%d %d:%d:%d
+  cTime: %s-%s-%d %d:%d:%d
+  inode: %d
+  size: %d
+  perms: 0%d
+  owner: %d
+  group: %d
+  type: "file"
+  writable: true
+  readable: true
+  executable: false
+  file: true
+  dir: false
+  link: false
+%A}
+EOTXT
+            ),
+            array('https://google.com/about', <<<'EOTXT'
+SplFileInfo {
+%Apath: "https://google.com"
+  filename: "about"
+  basename: "about"
+  pathname: "https://google.com/about"
+  extension: ""
+  realPath: false
+  writable: false
+  readable: false
+  executable: false
+  file: false
+  dir: false
+  link: false
+%A}
+EOTXT
+            ),
+        );
+    }
+
+    /** @dataProvider getCastFileInfoTests */
+    public function testCastFileInfo($file, $dump)
+    {
+        $this->assertDumpMatchesFormat($dump, new \SplFileInfo($file));
+    }
+
+    public function testCastFileObject()
+    {
+        $var = new \SplFileObject(__FILE__);
+        $var->setFlags(\SplFileObject::DROP_NEW_LINE | \SplFileObject::SKIP_EMPTY);
+        $dump = <<<'EOTXT'
+SplFileObject {
+%Apath: "%sCaster"
+  filename: "SplCasterTest.php"
+  basename: "SplCasterTest.php"
+  pathname: "%sSplCasterTest.php"
+  extension: "php"
+  realPath: "%sSplCasterTest.php"
+  aTime: %s-%s-%d %d:%d:%d
+  mTime: %s-%s-%d %d:%d:%d
+  cTime: %s-%s-%d %d:%d:%d
+  inode: %d
+  size: %d
+  perms: 0%d
+  owner: %d
+  group: %d
+  type: "file"
+  writable: true
+  readable: true
+  executable: false
+  file: true
+  dir: false
+  link: false
+%AcsvControl: array:2 [
+    0 => ","
+    1 => """
+  ]
+  flags: DROP_NEW_LINE|SKIP_EMPTY
+  maxLineLen: 0
+  fstat: array:26 [
+    "dev" => %d
+    "ino" => %d
+    "nlink" => %d
+    "rdev" => 0
+    "blksize" => %i
+    "blocks" => %i
+     …20
+  ]
+  eof: false
+  key: 0
+}
+EOTXT;
+        $this->assertDumpMatchesFormat($dump, $var);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php b/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php
new file mode 100644
index 00000000000..cd6d64d1c03
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/CliDumperTest.php
@@ -0,0 +1,441 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests;
+
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class CliDumperTest extends \PHPUnit_Framework_TestCase
+{
+    use VarDumperTestTrait;
+
+    public function testGet()
+    {
+        require __DIR__.'/Fixtures/dumb-var.php';
+
+        $dumper = new CliDumper('php://output');
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+        $cloner->addCasters(array(
+            ':stream' => function ($res, $a) {
+                unset($a['uri'], $a['wrapper_data']);
+
+                return $a;
+            },
+        ));
+        $data = $cloner->cloneVar($var);
+
+        ob_start();
+        $dumper->dump($data);
+        $out = ob_get_clean();
+        $out = preg_replace('/[ \t]+$/m', '', $out);
+        $intMax = PHP_INT_MAX;
+        $res = (int) $var['res'];
+
+        $r = defined('HHVM_VERSION') ? '' : '#%d';
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+array:24 [
+  "number" => 1
+  0 => &1 null
+  "const" => 1.1
+  1 => true
+  2 => false
+  3 => NAN
+  4 => INF
+  5 => -INF
+  6 => {$intMax}
+  "str" => "déjà\\n"
+  7 => b"é\\x00"
+  "[]" => []
+  "res" => stream resource {@{$res}
+    wrapper_type: "plainfile"
+    stream_type: "STDIO"
+    mode: "r"
+    unread_bytes: 0
+    seekable: true
+    timed_out: false
+    blocked: true
+    eof: false
+    options: []
+  }
+  "obj" => Symfony\Component\VarDumper\Tests\Fixture\DumbFoo {#%d
+    +foo: "foo"
+    +"bar": "bar"
+  }
+  "closure" => Closure {{$r}
+    class: "Symfony\Component\VarDumper\Tests\CliDumperTest"
+    this: Symfony\Component\VarDumper\Tests\CliDumperTest {{$r} …}
+    parameters: {
+      \$a: {}
+      &\$b: {
+        typeHint: "PDO"
+        default: null
+      }
+    }
+    file: "{$var['file']}"
+    line: "{$var['line']} to {$var['line']}"
+  }
+  "line" => {$var['line']}
+  "nobj" => array:1 [
+    0 => &3 {#%d}
+  ]
+  "recurs" => &4 array:1 [
+    0 => &4 array:1 [&4]
+  ]
+  8 => &1 null
+  "sobj" => Symfony\Component\VarDumper\Tests\Fixture\DumbFoo {#%d}
+  "snobj" => &3 {#%d}
+  "snobj2" => {#%d}
+  "file" => "{$var['file']}"
+  b"bin-key-é" => ""
+]
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    /**
+     * @requires extension xml
+     */
+    public function testXmlResource()
+    {
+        $var = xml_parser_create();
+
+        $this->assertDumpMatchesFormat(
+            <<<EOTXT
+xml resource {
+  current_byte_index: %i
+  current_column_number: %i
+  current_line_number: 1
+  error_code: XML_ERROR_NONE
+}
+EOTXT
+            ,
+            $var
+        );
+    }
+
+    public function testClosedResource()
+    {
+        if (defined('HHVM_VERSION') && HHVM_VERSION_ID < 30600) {
+            $this->markTestSkipped();
+        }
+
+        $var = fopen(__FILE__, 'r');
+        fclose($var);
+
+        $dumper = new CliDumper('php://output');
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+        $data = $cloner->cloneVar($var);
+
+        ob_start();
+        $dumper->dump($data);
+        $out = ob_get_clean();
+        $res = (int) $var;
+
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+Unknown resource @{$res}
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    public function testThrowingCaster()
+    {
+        $out = fopen('php://memory', 'r+b');
+
+        require_once __DIR__.'/Fixtures/Twig.php';
+        $twig = new \__TwigTemplate_VarDumperFixture_u75a09(new \Twig_Environment(new \Twig_Loader_Filesystem()));
+
+        $dumper = new CliDumper();
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+        $cloner->addCasters(array(
+            ':stream' => function ($res, $a) {
+                unset($a['wrapper_data']);
+
+                return $a;
+            },
+        ));
+        $cloner->addCasters(array(
+            ':stream' => eval('return function () use ($twig) {
+                try {
+                    $twig->render(array());
+                } catch (\Twig_Error_Runtime $e) {
+                    throw $e->getPrevious();
+                }
+            };'),
+        ));
+        $line = __LINE__ - 2;
+        $ref = (int) $out;
+
+        $data = $cloner->cloneVar($out);
+        $dumper->dump($data, $out);
+        rewind($out);
+        $out = stream_get_contents($out);
+
+        if (method_exists($twig, 'getSource')) {
+            $twig = <<<EOTXT
+          foo.twig:2: """
+            foo bar\\n
+                twig source\\n
+            \\n
+            """
+
+EOTXT;
+        } else {
+            $twig = '';
+        }
+
+        $r = defined('HHVM_VERSION') ? '' : '#%d';
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+stream resource {@{$ref}
+  wrapper_type: "PHP"
+  stream_type: "MEMORY"
+  mode: "%s+b"
+  unread_bytes: 0
+  seekable: true
+  uri: "php://memory"
+  timed_out: false
+  blocked: true
+  eof: false
+  options: []
+  ⚠: Symfony\Component\VarDumper\Exception\ThrowingCasterException {{$r}
+    #message: "Unexpected Exception thrown from a caster: Foobar"
+    -trace: {
+      %d. __TwigTemplate_VarDumperFixture_u75a09->doDisplay() ==> new Exception(): {
+        src: {
+          %sTwig.php:19: """
+                // line 2\\n
+                throw new \Exception('Foobar');\\n
+            }\\n
+            """
+{$twig}        }
+      }
+      %d. Twig_Template->displayWithErrorHandling() ==> __TwigTemplate_VarDumperFixture_u75a09->doDisplay(): {
+        src: {
+          %sTemplate.php:%d: """
+            try {\\n
+                \$this->doDisplay(\$context, \$blocks);\\n
+            } catch (Twig_Error \$e) {\\n
+            """
+        }
+      }
+      %d. Twig_Template->display() ==> Twig_Template->displayWithErrorHandling(): {
+        src: {
+          %sTemplate.php:%d: """
+            {\\n
+                \$this->displayWithErrorHandling(\$this->env->mergeGlobals(\$context), array_merge(\$this->blocks, \$blocks));\\n
+            }\\n
+            """
+        }
+      }
+      %d. Twig_Template->render() ==> Twig_Template->display(): {
+        src: {
+          %sTemplate.php:%d: """
+            try {\\n
+                \$this->display(\$context);\\n
+            } catch (Exception \$e) {\\n
+            """
+        }
+      }
+      %d. %slosure%s() ==> Twig_Template->render(): {
+        src: {
+          %sCliDumperTest.php:{$line}: """
+                    }\\n
+                };'),\\n
+            ));\\n
+            """
+        }
+      }
+    }
+  }
+}
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    public function testRefsInProperties()
+    {
+        $var = (object) array('foo' => 'foo');
+        $var->bar = &$var->foo;
+
+        $dumper = new CliDumper();
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+
+        $out = fopen('php://memory', 'r+b');
+        $data = $cloner->cloneVar($var);
+        $dumper->dump($data, $out);
+        rewind($out);
+        $out = stream_get_contents($out);
+
+        $r = defined('HHVM_VERSION') ? '' : '#%d';
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+{{$r}
+  +"foo": &1 "foo"
+  +"bar": &1 "foo"
+}
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     * @requires PHP 5.6
+     */
+    public function testSpecialVars56()
+    {
+        $var = $this->getSpecialVars();
+
+        $this->assertDumpEquals(
+            <<<EOTXT
+array:3 [
+  0 => array:1 [
+    0 => &1 array:1 [
+      0 => &1 array:1 [&1]
+    ]
+  ]
+  1 => array:1 [
+    "GLOBALS" => &2 array:1 [
+      "GLOBALS" => &2 array:1 [&2]
+    ]
+  ]
+  2 => &2 array:1 [&2]
+]
+EOTXT
+            ,
+            $var
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testGlobalsNoExt()
+    {
+        $var = $this->getSpecialVars();
+        unset($var[0]);
+        $out = '';
+
+        $dumper = new CliDumper(function ($line, $depth) use (&$out) {
+            if ($depth >= 0) {
+                $out .= str_repeat('  ', $depth).$line."\n";
+            }
+        });
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+
+        $refl = new \ReflectionProperty($cloner, 'useExt');
+        $refl->setAccessible(true);
+        $refl->setValue($cloner, false);
+
+        $data = $cloner->cloneVar($var);
+        $dumper->dump($data);
+
+        $this->assertSame(
+            <<<EOTXT
+array:2 [
+  1 => array:1 [
+    "GLOBALS" => &1 array:1 [
+      "GLOBALS" => &1 array:1 [&1]
+    ]
+  ]
+  2 => &1 array:1 [&1]
+]
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testBuggyRefs()
+    {
+        if (PHP_VERSION_ID >= 50600) {
+            $this->markTestSkipped('PHP 5.6 fixed refs counting');
+        }
+
+        $var = $this->getSpecialVars();
+        $var = $var[0];
+
+        $dumper = new CliDumper();
+        $dumper->setColors(false);
+        $cloner = new VarCloner();
+
+        $data = $cloner->cloneVar($var)->withMaxDepth(3);
+        $out = '';
+        $dumper->dump($data, function ($line, $depth) use (&$out) {
+            if ($depth >= 0) {
+                $out .= str_repeat('  ', $depth).$line."\n";
+            }
+        });
+
+        $this->assertSame(
+            <<<EOTXT
+array:1 [
+  0 => array:1 [
+    0 => array:1 [
+      0 => array:1 [ …1]
+    ]
+  ]
+]
+
+EOTXT
+            ,
+            $out
+        );
+    }
+
+    private function getSpecialVars()
+    {
+        foreach (array_keys($GLOBALS) as $var) {
+            if ('GLOBALS' !== $var) {
+                unset($GLOBALS[$var]);
+            }
+        }
+
+        $var = function &() {
+            $var = array();
+            $var[] = &$var;
+
+            return $var;
+        };
+
+        return array($var(), $GLOBALS, &$GLOBALS);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Fixtures/GeneratorDemo.php b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/GeneratorDemo.php
new file mode 100644
index 00000000000..e2d24c8c0ea
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/GeneratorDemo.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+class GeneratorDemo
+{
+    public static function foo()
+    {
+        yield 1;
+    }
+
+    public function baz()
+    {
+        yield from bar();
+    }
+}
+
+function bar()
+{
+    yield from GeneratorDemo::foo();
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Fixtures/Twig.php b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/Twig.php
new file mode 100644
index 00000000000..c74a2de8e60
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/Twig.php
@@ -0,0 +1,34 @@
+<?php
+
+/* foo.twig */
+class __TwigTemplate_VarDumperFixture_u75a09 extends Twig_Template
+{
+    public function __construct(Twig_Environment $env)
+    {
+        parent::__construct($env);
+
+        $this->parent = false;
+
+        $this->blocks = array(
+        );
+    }
+
+    protected function doDisplay(array $context, array $blocks = array())
+    {
+        // line 2
+        throw new \Exception('Foobar');
+    }
+
+    public function getTemplateName()
+    {
+        return 'foo.twig';
+    }
+
+    public function getDebugInfo()
+    {
+        return array (19 => 2);
+    }
+}
+/* foo bar*/
+/*     twig source*/
+/* */
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Fixtures/dumb-var.php b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/dumb-var.php
new file mode 100644
index 00000000000..59ee19bdad1
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Fixtures/dumb-var.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixture;
+
+if (!class_exists('Symfony\Component\VarDumper\Tests\Fixture\DumbFoo')) {
+    class DumbFoo
+    {
+        public $foo = 'foo';
+    }
+}
+
+$foo = new DumbFoo();
+$foo->bar = 'bar';
+
+$g = fopen(__FILE__, 'r');
+
+$var = array(
+    'number' => 1, null,
+    'const' => 1.1, true, false, NAN, INF, -INF, PHP_INT_MAX,
+    'str' => "déjà\n", "\xE9\x00",
+    '[]' => array(),
+    'res' => $g,
+    'obj' => $foo,
+    'closure' => function ($a, \PDO &$b = null) {},
+    'line' => __LINE__ - 1,
+    'nobj' => array((object) array()),
+);
+
+$r = array();
+$r[] = &$r;
+
+$var['recurs'] = &$r;
+$var[] = &$var[0];
+$var['sobj'] = $var['obj'];
+$var['snobj'] = &$var['nobj'][0];
+$var['snobj2'] = $var['nobj'][0];
+$var['file'] = __FILE__;
+$var["bin-key-\xE9"] = '';
+
+unset($g, $r);
diff --git a/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php b/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php
new file mode 100644
index 00000000000..3090435c5d4
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/HtmlDumperTest.php
@@ -0,0 +1,142 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests;
+
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class HtmlDumperTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGet()
+    {
+        require __DIR__.'/Fixtures/dumb-var.php';
+
+        $dumper = new HtmlDumper('php://output');
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $cloner = new VarCloner();
+        $cloner->addCasters(array(
+            ':stream' => function ($res, $a) {
+                unset($a['uri'], $a['wrapper_data']);
+
+                return $a;
+            },
+        ));
+        $data = $cloner->cloneVar($var);
+
+        ob_start();
+        $dumper->dump($data);
+        $out = ob_get_clean();
+        $out = preg_replace('/[ \t]+$/m', '', $out);
+        $var['file'] = htmlspecialchars($var['file'], ENT_QUOTES, 'UTF-8');
+        $intMax = PHP_INT_MAX;
+        preg_match('/sf-dump-\d+/', $out, $dumpId);
+        $dumpId = $dumpId[0];
+        $res = (int) $var['res'];
+
+        $r = defined('HHVM_VERSION') ? '' : '<a class=sf-dump-ref>#%d</a>';
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+<foo></foo><bar><span class=sf-dump-note>array:24</span> [<samp>
+  "<span class=sf-dump-key>number</span>" => <span class=sf-dump-num>1</span>
+  <span class=sf-dump-key>0</span> => <a class=sf-dump-ref href=#{$dumpId}-ref01 title="2 occurrences">&amp;1</a> <span class=sf-dump-const>null</span>
+  "<span class=sf-dump-key>const</span>" => <span class=sf-dump-num>1.1</span>
+  <span class=sf-dump-key>1</span> => <span class=sf-dump-const>true</span>
+  <span class=sf-dump-key>2</span> => <span class=sf-dump-const>false</span>
+  <span class=sf-dump-key>3</span> => <span class=sf-dump-num>NAN</span>
+  <span class=sf-dump-key>4</span> => <span class=sf-dump-num>INF</span>
+  <span class=sf-dump-key>5</span> => <span class=sf-dump-num>-INF</span>
+  <span class=sf-dump-key>6</span> => <span class=sf-dump-num>{$intMax}</span>
+  "<span class=sf-dump-key>str</span>" => "<span class=sf-dump-str title="5 characters">d&%s;j&%s;</span>\\n"
+  <span class=sf-dump-key>7</span> => b"<span class=sf-dump-str title="2 binary or non-UTF-8 characters">&%s;</span>\\x00"
+  "<span class=sf-dump-key>[]</span>" => []
+  "<span class=sf-dump-key>res</span>" => <span class=sf-dump-note>stream resource</span> <a class=sf-dump-ref>@{$res}</a><samp>
+    <span class=sf-dump-meta>wrapper_type</span>: "<span class=sf-dump-str title="9 characters">plainfile</span>"
+    <span class=sf-dump-meta>stream_type</span>: "<span class=sf-dump-str title="5 characters">STDIO</span>"
+    <span class=sf-dump-meta>mode</span>: "<span class=sf-dump-str>r</span>"
+    <span class=sf-dump-meta>unread_bytes</span>: <span class=sf-dump-num>0</span>
+    <span class=sf-dump-meta>seekable</span>: <span class=sf-dump-const>true</span>
+    <span class=sf-dump-meta>timed_out</span>: <span class=sf-dump-const>false</span>
+    <span class=sf-dump-meta>blocked</span>: <span class=sf-dump-const>true</span>
+    <span class=sf-dump-meta>eof</span>: <span class=sf-dump-const>false</span>
+    <span class=sf-dump-meta>options</span>: []
+  </samp>}
+  "<span class=sf-dump-key>obj</span>" => <abbr title="Symfony\Component\VarDumper\Tests\Fixture\DumbFoo" class=sf-dump-note>DumbFoo</abbr> {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="2 occurrences">#%d</a><samp id={$dumpId}-ref2%d>
+    +<span class=sf-dump-public title="Public property">foo</span>: "<span class=sf-dump-str title="3 characters">foo</span>"
+    +"<span class=sf-dump-public title="Runtime added dynamic property">bar</span>": "<span class=sf-dump-str title="3 characters">bar</span>"
+  </samp>}
+  "<span class=sf-dump-key>closure</span>" => <span class=sf-dump-note>Closure</span> {{$r}<samp>
+    <span class=sf-dump-meta>class</span>: "<span class=sf-dump-str title="48 characters">Symfony\Component\VarDumper\Tests\HtmlDumperTest</span>"
+    <span class=sf-dump-meta>this</span>: <abbr title="Symfony\Component\VarDumper\Tests\HtmlDumperTest" class=sf-dump-note>HtmlDumperTest</abbr> {{$r} &%s;}
+    <span class=sf-dump-meta>parameters</span>: {<samp>
+      <span class=sf-dump-meta>\$a</span>: {}
+      <span class=sf-dump-meta>&amp;\$b</span>: {<samp>
+        <span class=sf-dump-meta>typeHint</span>: "<span class=sf-dump-str title="3 characters">PDO</span>"
+        <span class=sf-dump-meta>default</span>: <span class=sf-dump-const>null</span>
+      </samp>}
+    </samp>}
+    <span class=sf-dump-meta>file</span>: "<span class=sf-dump-str title="%d characters">{$var['file']}</span>"
+    <span class=sf-dump-meta>line</span>: "<span class=sf-dump-str title="%d characters">{$var['line']} to {$var['line']}</span>"
+  </samp>}
+  "<span class=sf-dump-key>line</span>" => <span class=sf-dump-num>{$var['line']}</span>
+  "<span class=sf-dump-key>nobj</span>" => <span class=sf-dump-note>array:1</span> [<samp>
+    <span class=sf-dump-index>0</span> => <a class=sf-dump-ref href=#{$dumpId}-ref03 title="2 occurrences">&amp;3</a> {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="3 occurrences">#%d</a>}
+  </samp>]
+  "<span class=sf-dump-key>recurs</span>" => <a class=sf-dump-ref href=#{$dumpId}-ref04 title="2 occurrences">&amp;4</a> <span class=sf-dump-note>array:1</span> [<samp id={$dumpId}-ref04>
+    <span class=sf-dump-index>0</span> => <a class=sf-dump-ref href=#{$dumpId}-ref04 title="2 occurrences">&amp;4</a> <span class=sf-dump-note>array:1</span> [<a class=sf-dump-ref href=#{$dumpId}-ref04 title="2 occurrences">&amp;4</a>]
+  </samp>]
+  <span class=sf-dump-key>8</span> => <a class=sf-dump-ref href=#{$dumpId}-ref01 title="2 occurrences">&amp;1</a> <span class=sf-dump-const>null</span>
+  "<span class=sf-dump-key>sobj</span>" => <abbr title="Symfony\Component\VarDumper\Tests\Fixture\DumbFoo" class=sf-dump-note>DumbFoo</abbr> {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="2 occurrences">#%d</a>}
+  "<span class=sf-dump-key>snobj</span>" => <a class=sf-dump-ref href=#{$dumpId}-ref03 title="2 occurrences">&amp;3</a> {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="3 occurrences">#%d</a>}
+  "<span class=sf-dump-key>snobj2</span>" => {<a class=sf-dump-ref href=#{$dumpId}-ref2%d title="3 occurrences">#%d</a>}
+  "<span class=sf-dump-key>file</span>" => "<span class=sf-dump-str title="%d characters">{$var['file']}</span>"
+  b"<span class=sf-dump-key>bin-key-&%s;</span>" => ""
+</samp>]
+</bar>
+
+EOTXT
+            ,
+
+            $out
+        );
+    }
+
+    public function testCharset()
+    {
+        $var = mb_convert_encoding('Словарь', 'CP1251', 'UTF-8');
+
+        $dumper = new HtmlDumper('php://output', 'CP1251');
+        $dumper->setDumpHeader('<foo></foo>');
+        $dumper->setDumpBoundaries('<bar>', '</bar>');
+        $cloner = new VarCloner();
+
+        $data = $cloner->cloneVar($var);
+        $out = fopen('php://memory', 'r+b');
+        $dumper->dump($data, $out);
+        rewind($out);
+        $out = stream_get_contents($out);
+
+        $this->assertStringMatchesFormat(
+            <<<EOTXT
+<foo></foo><bar>b"<span class=sf-dump-str title="7 binary or non-UTF-8 characters">&#1057;&#1083;&#1086;&#1074;&#1072;&#1088;&#1100;</span>"
+</bar>
+
+EOTXT
+            ,
+
+            $out
+        );
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php b/htdocs/includes/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
new file mode 100644
index 00000000000..3295797179c
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/Test/VarDumperTestTraitTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests\Test;
+
+use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
+
+class VarDumperTestTraitTest extends \PHPUnit_Framework_TestCase
+{
+    use VarDumperTestTrait;
+
+    public function testItComparesLargeData()
+    {
+        $howMany = 700;
+        $data = array_fill_keys(range(0, $howMany), array('a', 'b', 'c', 'd'));
+
+        $expected = sprintf("array:%d [\n", $howMany + 1);
+        for ($i = 0; $i <= $howMany; ++$i) {
+            $expected .= <<<EODUMP
+  $i => array:4 [
+    0 => "a"
+    1 => "b"
+    2 => "c"
+    3 => "d"
+  ]\n
+EODUMP;
+        }
+        $expected .= "]\n";
+
+        $this->assertDumpEquals($expected, $data);
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/Tests/VarClonerTest.php b/htdocs/includes/symfony/var-dumper/Tests/VarClonerTest.php
new file mode 100644
index 00000000000..31e3a40ae04
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/Tests/VarClonerTest.php
@@ -0,0 +1,187 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper\Tests;
+
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class VarClonerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMaxIntBoundary()
+    {
+        $data = array(PHP_INT_MAX => 123);
+
+        $cloner = new VarCloner();
+        $clone = $cloner->cloneVar($data);
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Cloner\Data Object
+(
+    [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
+        (
+            [0] => Array
+                (
+                    [0] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => array
+                            [class] => assoc
+                            [value] => 1
+                            [cut] => 0
+                            [handle] => 0
+                            [refCount] => 0
+                            [position] => 1
+                        )
+
+                )
+
+            [1] => Array
+                (
+                    [%s] => 123
+                )
+
+        )
+
+    [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
+    [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+    [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+)
+
+EOTXT;
+        $this->assertSame(sprintf($expected, PHP_INT_MAX), print_r($clone, true));
+    }
+
+    public function testClone()
+    {
+        $json = json_decode('{"1":{"var":"val"},"2":{"var":"val"}}');
+
+        $cloner = new VarCloner();
+        $clone = $cloner->cloneVar($json);
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Cloner\Data Object
+(
+    [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
+        (
+            [0] => Array
+                (
+                    [0] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => object
+                            [class] => stdClass
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 1
+                        )
+
+                )
+
+            [1] => Array
+                (
+                    [\000+\0001] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => object
+                            [class] => stdClass
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 2
+                        )
+
+                    [\000+\0002] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => object
+                            [class] => stdClass
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 3
+                        )
+
+                )
+
+            [2] => Array
+                (
+                    [\000+\000var] => val
+                )
+
+            [3] => Array
+                (
+                    [\000+\000var] => val
+                )
+
+        )
+
+    [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
+    [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+    [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+)
+
+EOTXT;
+        $this->assertStringMatchesFormat($expected, print_r($clone, true));
+    }
+
+    public function testCaster()
+    {
+        $cloner = new VarCloner(array(
+            '*' => function ($obj, $array) {
+                return array('foo' => 123);
+            },
+            __CLASS__ => function ($obj, $array) {
+                ++$array['foo'];
+
+                return $array;
+            },
+        ));
+        $clone = $cloner->cloneVar($this);
+
+        $expected = <<<EOTXT
+Symfony\Component\VarDumper\Cloner\Data Object
+(
+    [data:Symfony\Component\VarDumper\Cloner\Data:private] => Array
+        (
+            [0] => Array
+                (
+                    [0] => Symfony\Component\VarDumper\Cloner\Stub Object
+                        (
+                            [type] => object
+                            [class] => %s
+                            [value] => 
+                            [cut] => 0
+                            [handle] => %i
+                            [refCount] => 0
+                            [position] => 1
+                        )
+
+                )
+
+            [1] => Array
+                (
+                    [foo] => 124
+                )
+
+        )
+
+    [maxDepth:Symfony\Component\VarDumper\Cloner\Data:private] => 20
+    [maxItemsPerDepth:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+    [useRefHandles:Symfony\Component\VarDumper\Cloner\Data:private] => -1
+)
+
+EOTXT;
+        $this->assertStringMatchesFormat($expected, print_r($clone, true));
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/VarDumper.php b/htdocs/includes/symfony/var-dumper/VarDumper.php
new file mode 100644
index 00000000000..8c610c5d33b
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/VarDumper.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\VarDumper;
+
+use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\CliDumper;
+use Symfony\Component\VarDumper\Dumper\HtmlDumper;
+
+// Load the global dump() function
+require_once __DIR__.'/Resources/functions/dump.php';
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+class VarDumper
+{
+    private static $handler;
+
+    public static function dump($var)
+    {
+        if (null === self::$handler) {
+            $cloner = new VarCloner();
+            $dumper = 'cli' === PHP_SAPI ? new CliDumper() : new HtmlDumper();
+            self::$handler = function ($var) use ($cloner, $dumper) {
+                $dumper->dump($cloner->cloneVar($var));
+            };
+        }
+
+        return call_user_func(self::$handler, $var);
+    }
+
+    public static function setHandler(callable $callable = null)
+    {
+        $prevHandler = self::$handler;
+        self::$handler = $callable;
+
+        return $prevHandler;
+    }
+}
diff --git a/htdocs/includes/symfony/var-dumper/composer.json b/htdocs/includes/symfony/var-dumper/composer.json
new file mode 100644
index 00000000000..a90729b6bbe
--- /dev/null
+++ b/htdocs/includes/symfony/var-dumper/composer.json
@@ -0,0 +1,44 @@
+{
+	"name" : "symfony/var-dumper",
+	"type" : "library",
+	"description" : "Symfony mechanism for exploring and dumping PHP variables",
+	"keywords" : [
+		"dump",
+		"debug"
+	],
+	"homepage" : "https://symfony.com",
+	"license" : "MIT",
+	"authors" : [{
+			"name" : "Nicolas Grekas",
+			"email" : "p@tchwork.com"
+		}, {
+			"name" : "Symfony Community",
+			"homepage" : "https://symfony.com/contributors"
+		}
+	],
+	"require" : {
+		"php" : ">=5.5.9",
+		"symfony/polyfill-mbstring" : "~1.0"
+	},
+	"require-dev" : {
+		"twig/twig" : "~1.20|~2.0"
+	},
+	"suggest" : {},
+	"autoload" : {
+		"files" : [
+			"Resources/functions/dump.php"
+		],
+		"psr-4" : {
+			"Symfony\\Component\\VarDumper\\" : ""
+		},
+		"exclude-from-classmap" : [
+			"/Tests/"
+		]
+	},
+	"minimum-stability" : "dev",
+	"extra" : {
+		"branch-alias" : {
+			"dev-master" : "3.0-dev"
+		}
+	}
+}
\ No newline at end of file
diff --git a/htdocs/includes/tcpdi/tcpdi_parser.php b/htdocs/includes/tcpdi/tcpdi_parser.php
index d8374ec8c00..13e9839f2b4 100644
--- a/htdocs/includes/tcpdi/tcpdi_parser.php
+++ b/htdocs/includes/tcpdi/tcpdi_parser.php
@@ -703,11 +703,11 @@ class tcpdi_parser {
 		$objtype = ''; // object type to be returned
 		$objval = ''; // object value to be returned
 		// skip initial white space chars: \x00 null (NUL), \x09 horizontal tab (HT), \x0A line feed (LF), \x0C form feed (FF), \x0D carriage return (CR), \x20 space (SP)
-		while (strspn($data{$offset}, "\x00\x09\x0a\x0c\x0d\x20") == 1) {
+		while (strspn($data[$offset], "\x00\x09\x0a\x0c\x0d\x20") == 1) {
 			$offset++;
 		}
 		// get first char
-		$char = $data{$offset};
+		$char = $data[$offset];
 		// get object type
 		switch ($char) {
 			case '%': { // \x25 PERCENT SIGN
@@ -738,10 +738,10 @@ class tcpdi_parser {
 				if ($char == '(') {
 					$open_bracket = 1;
 					while ($open_bracket > 0) {
-						if (!isset($data{$strpos})) {
+						if (!isset($data[$strpos])) {
 							break;
 						}
-						$ch = $data{$strpos};
+						$ch = $data[$strpos];
 						switch ($ch) {
 							case '\\': { // REVERSE SOLIDUS (5Ch) (Backslash)
 								// skip next character
@@ -786,7 +786,7 @@ class tcpdi_parser {
 			}
 			case '<':   // \x3C LESS-THAN SIGN
 			case '>': { // \x3E GREATER-THAN SIGN
-				if (isset($data{($offset + 1)}) AND ($data{($offset + 1)} == $char)) {
+				if (isset($data[($offset + 1)]) AND ($data[($offset + 1)] == $char)) {
 					// dictionary object
 					$objtype = PDF_TYPE_DICTIONARY;
 					if ($char == '<') {
@@ -809,7 +809,7 @@ class tcpdi_parser {
 				break;
 			}
 			default: {
-				$frag = $data{$offset} . @$data{$offset+1} . @$data{$offset+2} . @$data{$offset+3};
+				$frag = $data[$offset] . @$data[$offset+1] . @$data[$offset+2] . @$data[$offset+3];
 				switch ($frag) {
 					case 'endo':
 						// indirect object
@@ -886,16 +886,16 @@ class tcpdi_parser {
 		$dict = '';
 		$offset += 2;
 		do {
-			if ($data{$offset} == '>' && $data{$offset+1} == '>') {
+			if ($data[$offset] == '>' && $data[$offset+1] == '>') {
 				$i--;
 				$dict .= '>>';
 				$offset += 2;
-			} else if ($data{$offset} == '<' && $data{$offset+1} == '<') {
+			} else if ($data[$offset] == '<' && $data[$offset+1] == '<') {
 				$i++;
 				$dict .= '<<';
 				$offset += 2;
 			} else {
-				$dict .= $data{$offset};
+				$dict .= $data[$offset];
 				$offset++;
 			}
 		} while ($i>0);
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
index 67bb255d187..969bb165e62 100644
--- a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
+++ b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_static.php
@@ -1814,19 +1814,14 @@ class TCPDF_STATIC {
      */
     public static function fopenLocal($filename, $mode)
     {
-        if (strpos($filename, '//') === 0)
-        {
+        if (strpos($filename, '//') === 0) {
             // Share folder on a (windows) server
             // e.g.: "//[MyServerName]/[MySharedFolder]/"
             //
             // nothing to change
-        }
-        elseif (strpos($filename, '://') === false)
-        {
+        } elseif (strpos($filename, '://') === false) {
             $filename = 'file://'.$filename;
-        }
-        elseif (stream_is_local($filename) !== true)
-        {
+        } elseif (stream_is_local($filename) !== true) {
             return false;
         }
 
@@ -1862,8 +1857,8 @@ class TCPDF_STATIC {
 	 * Wrapper for file_exists.
 	 * Checks whether a file or directory exists.
 	 * Only allows some protocols and local files.
-	 * @param filename (string) Path to the file or directory. 
-	 * @return Returns TRUE if the file or directory specified by filename exists; FALSE otherwise.  
+	 * @param filename (string) Path to the file or directory.
+	 * @return Returns TRUE if the file or directory specified by filename exists; FALSE otherwise.
 	 * @public static
 	 */
 	public static function file_exists($filename) {
@@ -1880,7 +1875,7 @@ class TCPDF_STATIC {
 	 * Reads entire file into a string.
 	 * The file can be also an URL.
 	 * @param $file (string) Name of the file or URL to read.
-	 * @return The function returns the read data or FALSE on failure. 
+	 * @return The function returns the read data or FALSE on failure.
 	 * @author Nicola Asuni
 	 * @since 6.0.025
 	 * @public static
@@ -2110,7 +2105,7 @@ class TCPDF_STATIC {
 		return $a['i'];
 	}
 
-	
+
 	/**
 	 * Array of page formats
 	 * measures are calculated in this way: (inches * 72) or (millimeters * 72 / 25.4)
diff --git a/htdocs/index.php b/htdocs/index.php
index dc0a05ae98b..4eea2353d3e 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -43,13 +43,13 @@ $hookmanager->initHooks(array('index'));
 // Check if company name is defined (first install)
 if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM))
 {
-    header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
-    exit;
+	header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
+	exit;
 }
 if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
 {
-    header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
-    exit;
+	header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
+	exit;
 }
 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
 {
@@ -84,19 +84,19 @@ print load_fiche_titre('&nbsp;', $resultboxes['selectboxlist'], '', 0, '', 'titl
 
 if (!empty($conf->global->MAIN_MOTD))
 {
-    $conf->global->MAIN_MOTD = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD);
-    if (!empty($conf->global->MAIN_MOTD))
-    {
-        $substitutionarray = getCommonSubstitutionArray($langs);
-        complete_substitutions_array($substitutionarray, $langs);
-        $texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);
+	$conf->global->MAIN_MOTD = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $conf->global->MAIN_MOTD);
+	if (!empty($conf->global->MAIN_MOTD))
+	{
+		$substitutionarray = getCommonSubstitutionArray($langs);
+		complete_substitutions_array($substitutionarray, $langs);
+		$texttoshow = make_substitutions($conf->global->MAIN_MOTD, $substitutionarray, $langs);
 
-        print "\n<!-- Start of welcome text -->\n";
-        print '<table width="100%" class="notopnoleftnoright"><tr><td>';
-        print dol_htmlentitiesbr($texttoshow);
-        print '</td></tr></table><br>';
-        print "\n<!-- End of welcome text -->\n";
-    }
+		print "\n<!-- Start of welcome text -->\n";
+		print '<table width="100%" class="notopnoleftnoright"><tr><td>';
+		print dol_htmlentitiesbr($texttoshow);
+		print '</td></tr></table><br>';
+		print "\n<!-- End of welcome text -->\n";
+	}
 }
 
 
@@ -117,210 +117,211 @@ $langs->loadLangs(array('commercial', 'bills', 'orders', 'contracts'));
 // Load global statistics of objects
 if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 {
-    $object = new stdClass();
-    $parameters = array();
-    $action = '';
-    $reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-    $boxstatFromHook = $hookmanager->resPrint;
+	$object = new stdClass();
+	$parameters = array();
+	$action = '';
+	$reshook = $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	$boxstatFromHook = $hookmanager->resPrint;
 
-    if (empty($reshook))
-    {
-    	// Cle array returned by the method load_state_board for each line
-    	$keys = array(
-    		'users',
-    		'members',
-    		'expensereports',
-    		'holidays',
-    		'customers',
-    		'prospects',
-    		'suppliers',
-    		'contacts',
-    		'products',
-    		'services',
-    		'projects',
-    		'proposals',
-    		'orders',
-    		'invoices',
-    		'donations',
-    		'supplier_proposals',
-    		'supplier_orders',
-    		'supplier_invoices',
-    		'contracts',
-    		'interventions',
-    		'ticket'
-    	);
+	if (empty($reshook))
+	{
+		// Cle array returned by the method load_state_board for each line
+		$keys = array(
+			'users',
+			'members',
+			'expensereports',
+			'holidays',
+			'customers',
+			'prospects',
+			'suppliers',
+			'contacts',
+			'products',
+			'services',
+			'projects',
+			'proposals',
+			'orders',
+			'invoices',
+			'donations',
+			'supplier_proposals',
+			'supplier_orders',
+			'supplier_invoices',
+			'contracts',
+			'interventions',
+			'ticket'
+		);
 
-	    // Condition to be checked for each display line dashboard
-	    $conditions = array(
-	    	'users' => $user->rights->user->user->lire,
-	    	'members' => !empty($conf->adherent->enabled) && $user->rights->adherent->lire,
-	    	'customers' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
-	    	'prospects' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
-	    	'suppliers' => !empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
-		    'contacts' => !empty($conf->societe->enabled) && $user->rights->societe->contact->lire,
-		    'products' => !empty($conf->product->enabled) && $user->rights->produit->lire,
-		    'services' => !empty($conf->service->enabled) && $user->rights->service->lire,
-		    'proposals' => !empty($conf->propal->enabled) && $user->rights->propale->lire,
-		    'orders' => !empty($conf->commande->enabled) && $user->rights->commande->lire,
-		    'invoices' => !empty($conf->facture->enabled) && $user->rights->facture->lire,
-	    	'donations' => !empty($conf->don->enabled) && $user->rights->don->lire,
-	    	'contracts' => !empty($conf->contrat->enabled) && $user->rights->contrat->lire,
-		    'interventions' => !empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,
+		// Condition to be checked for each display line dashboard
+		$conditions = array(
+			'users' => $user->rights->user->user->lire,
+			'members' => !empty($conf->adherent->enabled) && $user->rights->adherent->lire,
+			'customers' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
+			'prospects' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
+			'suppliers' => !empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
+			'contacts' => !empty($conf->societe->enabled) && $user->rights->societe->contact->lire,
+			'products' => !empty($conf->product->enabled) && $user->rights->produit->lire,
+			'services' => !empty($conf->service->enabled) && $user->rights->service->lire,
+			'proposals' => !empty($conf->propal->enabled) && $user->rights->propale->lire,
+			'orders' => !empty($conf->commande->enabled) && $user->rights->commande->lire,
+			'invoices' => !empty($conf->facture->enabled) && $user->rights->facture->lire,
+			'donations' => !empty($conf->don->enabled) && $user->rights->don->lire,
+			'contracts' => !empty($conf->contrat->enabled) && $user->rights->contrat->lire,
+			'interventions' => !empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,
 			'supplier_orders' => !empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
 			'supplier_invoices' => !empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
 			'supplier_proposals' => !empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
-		    'projects' => !empty($conf->projet->enabled) && $user->rights->projet->lire,
-		    'expensereports' => !empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
-	        'holidays' => !empty($conf->holiday->enabled) && $user->rights->holiday->read,
-		    'ticket' => !empty($conf->ticket->enabled) && $user->rights->ticket->read
-	    );
-	    // Class file containing the method load_state_board for each line
-	    $includes = array(
-	    	'users' => DOL_DOCUMENT_ROOT."/user/class/user.class.php",
-	    	'members' => DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
-	    	'customers' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
-	    	'prospects' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
-	    	'suppliers' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
-	    	'contacts' => DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
-	    	'products' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
-	    	'services' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
-	    	'proposals' => DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
-	    	'orders' => DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
-	    	'invoices' => DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
-	    	'donations' => DOL_DOCUMENT_ROOT."/don/class/don.class.php",
-	    	'contracts' => DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
-	    	'interventions' => DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
-	    	'supplier_orders' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
-	    	'supplier_invoices' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
-	    	'supplier_proposals' => DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
-	    	'projects' => DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
-	    	'expensereports' => DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
-	    	'holidays' => DOL_DOCUMENT_ROOT."/holiday/class/holiday.class.php",
-	    	'ticket' => DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php"
-	    );
-	    // Name class containing the method load_state_board for each line
-	    $classes = array(
-	    	'users' => 'User',
-	    	'members' => 'Adherent',
-	    	'customers' => 'Client',
-	    	'prospects' => 'Client',
-	    	'suppliers' => 'Fournisseur',
-	    	'contacts' => 'Contact',
-	    	'products' => 'Product',
-	    	'services' => 'ProductService',
-	    	'proposals' => 'Propal',
-	    	'orders' => 'Commande',
-	    	'invoices' => 'Facture',
-	    	'donations' => 'Don',
-	    	'contracts' => 'Contrat',
-	    	'interventions' => 'Fichinter',
-	    	'supplier_orders' => 'CommandeFournisseur',
-	    	'supplier_invoices' => 'FactureFournisseur',
-	    	'supplier_proposals' => 'SupplierProposal',
-	    	'projects' => 'Project',
-	    	'expensereports' => 'ExpenseReport',
-	    	'holidays' => 'Holiday',
-	    	'ticket' => 'Ticket',
-	    );
-	    // Translation keyword
-	    $titres = array(
-	    	'users' => "Users",
-	    	'members' => "Members",
-	    	'customers' => "ThirdPartyCustomersStats",
-	    	'prospects' => "ThirdPartyProspectsStats",
-	    	'suppliers' => "Suppliers",
-	    	'contacts' => "Contacts",
-	    	'products' => "Products",
-	    	'services' => "Services",
-	    	'proposals' => "CommercialProposalsShort",
-	    	'orders' => "CustomersOrders",
-	    	'invoices' => "BillsCustomers",
-	    	'donations' => "Donations",
-	    	'contracts' => "Contracts",
-	    	'interventions' => "Interventions",
-	    	'supplier_orders' => "SuppliersOrders",
-	    	'supplier_invoices' => "SuppliersInvoices",
-	    	'supplier_proposals' => "SupplierProposalShort",
-	    	'projects' => "Projects",
-	    	'expensereports' => "ExpenseReports",
-	    	'holidays' => "Holidays",
-	    	'ticket' => "Ticket",
-	    );
-	    // Dashboard Link lines
-	    $links = array(
-	    	'users' => DOL_URL_ROOT.'/user/list.php',
-	    	'members' => DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
-	    	'customers' => DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',
-	    	'prospects' => DOL_URL_ROOT.'/societe/list.php?type=p&mainmenu=companies',
-	    	'suppliers' => DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',
-	    	'contacts' => DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',
-	    	'products' => DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
-	    	'services' => DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
-	    	'proposals' => DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
-	    	'orders' => DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial&leftmenu=orders',
-	    	'invoices' => DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
-	    	'donations' => DOL_URL_ROOT.'/don/list.php?leftmenu=donations',
-	    	'contracts' => DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
-	    	'interventions' => DOL_URL_ROOT.'/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
-	    	'supplier_orders' => DOL_URL_ROOT.'/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
-	    	'supplier_invoices' => DOL_URL_ROOT.'/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
-	    	'supplier_proposals' => DOL_URL_ROOT.'/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
-	    	'projects' => DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
-	    	'expensereports' => DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
-	    	'holidays' => DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
-	    	'ticket' => DOL_URL_ROOT.'/ticket/list.php?leftmenu=ticket'
-	    );
-	    // Translation lang files
-	    $langfile = array(
-	    	'customers' => "companies",
-	    	'contacts' => "companies",
-	    	'services' => "products",
-	    	'proposals' => "propal",
-	    	'invoices' => "bills",
-	    	'supplier_orders' => "orders",
-	    	'supplier_invoices' => "bills",
-	    	'supplier_proposals' => 'supplier_proposal',
-	    	'expensereports' => "trips",
-	    	'holidays' => "holiday",
-	    );
+			'projects' => !empty($conf->projet->enabled) && $user->rights->projet->lire,
+			'expensereports' => !empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
+			'holidays' => !empty($conf->holiday->enabled) && $user->rights->holiday->read,
+			'ticket' => !empty($conf->ticket->enabled) && $user->rights->ticket->read
+		);
+		// Class file containing the method load_state_board for each line
+		$includes = array(
+			'users' => DOL_DOCUMENT_ROOT."/user/class/user.class.php",
+			'members' => DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
+			'customers' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+			'prospects' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+			'suppliers' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
+			'contacts' => DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
+			'products' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+			'services' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+			'proposals' => DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
+			'orders' => DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
+			'invoices' => DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
+			'donations' => DOL_DOCUMENT_ROOT."/don/class/don.class.php",
+			'contracts' => DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+			'interventions' => DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
+			'supplier_orders' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
+			'supplier_invoices' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
+			'supplier_proposals' => DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
+			'projects' => DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
+			'expensereports' => DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
+			'holidays' => DOL_DOCUMENT_ROOT."/holiday/class/holiday.class.php",
+			'ticket' => DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php"
+		);
+		// Name class containing the method load_state_board for each line
+		$classes = array(
+			'users' => 'User',
+			'members' => 'Adherent',
+			'customers' => 'Client',
+			'prospects' => 'Client',
+			'suppliers' => 'Fournisseur',
+			'contacts' => 'Contact',
+			'products' => 'Product',
+			'services' => 'ProductService',
+			'proposals' => 'Propal',
+			'orders' => 'Commande',
+			'invoices' => 'Facture',
+			'donations' => 'Don',
+			'contracts' => 'Contrat',
+			'interventions' => 'Fichinter',
+			'supplier_orders' => 'CommandeFournisseur',
+			'supplier_invoices' => 'FactureFournisseur',
+			'supplier_proposals' => 'SupplierProposal',
+			'projects' => 'Project',
+			'expensereports' => 'ExpenseReport',
+			'holidays' => 'Holiday',
+			'ticket' => 'Ticket',
+		);
+		// Translation keyword
+		$titres = array(
+			'users' => "Users",
+			'members' => "Members",
+			'customers' => "ThirdPartyCustomersStats",
+			'prospects' => "ThirdPartyProspectsStats",
+			'suppliers' => "Suppliers",
+			'contacts' => "Contacts",
+			'products' => "Products",
+			'services' => "Services",
+			'proposals' => "CommercialProposalsShort",
+			'orders' => "CustomersOrders",
+			'invoices' => "BillsCustomers",
+			'donations' => "Donations",
+			'contracts' => "Contracts",
+			'interventions' => "Interventions",
+			'supplier_orders' => "SuppliersOrders",
+			'supplier_invoices' => "SuppliersInvoices",
+			'supplier_proposals' => "SupplierProposalShort",
+			'projects' => "Projects",
+			'expensereports' => "ExpenseReports",
+			'holidays' => "Holidays",
+			'ticket' => "Ticket",
+		);
+		// Dashboard Link lines
+		$links = array(
+			'users' => DOL_URL_ROOT.'/user/list.php',
+			'members' => DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
+			'customers' => DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',
+			'prospects' => DOL_URL_ROOT.'/societe/list.php?type=p&mainmenu=companies',
+			'suppliers' => DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',
+			'contacts' => DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',
+			'products' => DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
+			'services' => DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
+			'proposals' => DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
+			'orders' => DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial&leftmenu=orders',
+			'invoices' => DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
+			'donations' => DOL_URL_ROOT.'/don/list.php?leftmenu=donations',
+			'contracts' => DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
+			'interventions' => DOL_URL_ROOT.'/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
+			'supplier_orders' => DOL_URL_ROOT.'/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
+			'supplier_invoices' => DOL_URL_ROOT.'/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
+			'supplier_proposals' => DOL_URL_ROOT.'/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
+			'projects' => DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
+			'expensereports' => DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
+			'holidays' => DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
+			'ticket' => DOL_URL_ROOT.'/ticket/list.php?leftmenu=ticket'
+		);
+		// Translation lang files
+		$langfile = array(
+			'customers' => "companies",
+			'contacts' => "companies",
+			'services' => "products",
+			'proposals' => "propal",
+			'invoices' => "bills",
+			'supplier_orders' => "orders",
+			'supplier_invoices' => "bills",
+			'supplier_proposals' => 'supplier_proposal',
+			'expensereports' => "trips",
+			'holidays' => "holiday",
+		);
 
 
-	    // Loop and displays each line of table
+		// Loop and displays each line of table
 		$boardloaded = array();
-	    foreach ($keys as $val)
-	    {
-	        if ($conditions[$val])
-	        {
-                $boxstatItem = '';
-	            $class = $classes[$val];
-	            // Search in cache if load_state_board is already realized
-	            if (!isset($boardloaded[$class]) || !is_object($boardloaded[$class]))
-	            {
-	            	include_once $includes[$val]; // Loading a class cost around 1Mb
+		foreach ($keys as $val)
+		{
+			if ($conditions[$val])
+			{
+				$boxstatItem = '';
+				$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
 
-	                $board = new $class($db);
-	                $board->load_state_board();
-	                $boardloaded[$class] = $board;
-	            }
-	            else
-	            {
-	                $board = $boardloaded[$class];
-	            }
+				if (!isset($boardloaded[$classkeyforcache]) || !is_object($boardloaded[$classkeyforcache]))
+				{
+					include_once $includes[$val]; // Loading a class cost around 1Mb
 
-            	$langs->load(empty($langfile[$val]) ? $val : $langfile[$val]);
+					$board = new $class($db);
+					$board->load_state_board();
+					$boardloaded[$class] = $board;
+				} else {
+					$board = $boardloaded[$classkeyforcache];
+				}
 
-	            $text = $langs->trans($titres[$val]);
-	            $boxstatItem .= '<a href="'.$links[$val].'" class="boxstatsindicator thumbstat nobold nounderline">';
-	            $boxstatItem .= '<div class="boxstats">';
-	            $boxstatItem .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
-	            $boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';
-	            $boxstatItem .= '</div>';
-	            $boxstatItem .= '</a>';
+				$langs->load(empty($langfile[$val]) ? $val : $langfile[$val]);
 
-                $boxstatItems[$val] = $boxstatItem;
-	        }
-	    }
-    }
+				$text = $langs->trans($titres[$val]);
+				$boxstatItem .= '<a href="'.$links[$val].'" class="boxstatsindicator thumbstat nobold nounderline">';
+				$boxstatItem .= '<div class="boxstats">';
+				$boxstatItem .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
+				$boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.($board->nb[$val] ? $board->nb[$val] : 0).'</span>';
+				$boxstatItem .= '</div>';
+				$boxstatItem .= '</a>';
+
+				$boxstatItems[$val] = $boxstatItem;
+			}
+		}
+	}
 }
 
 
@@ -329,549 +330,549 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 // Dolibarr Working Board with weather
 
 if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
-    $showweather = (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO == 2) ? 1 : 0;
-
-    //Array that contains all WorkboardResponse classes to process them
-    $dashboardlines = array();
-
-    // Do not include sections without management permission
-    require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
-
-    // Number of actions to do (late)
-    if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) {
-        include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-        $board = new ActionComm($db);
-        $dashboardlines[$board->element] = $board->load_board($user);
-    }
-
-    // Number of project opened
-    if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
-        include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-        $board = new Project($db);
-        $dashboardlines[$board->element] = $board->load_board($user);
-    }
-
-    // Number of tasks to do (late)
-    if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
-        include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-        $board = new Task($db);
-        $dashboardlines[$board->element] = $board->load_board($user);
-    }
-
-    // Number of commercial proposals open (expired)
-    if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
-        include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-        $board = new Propal($db);
-        $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
-        // Number of commercial proposals CLOSED signed (billed)
-        $dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
-    }
-
-    // Number of commercial proposals open (expired)
-    if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
-        include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-        $board = new SupplierProposal($db);
-        $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
-        // Number of commercial proposals CLOSED signed (billed)
-        $dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
-    }
-
-    // Number of customer orders a deal
-    if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-        include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-        $board = new Commande($db);
-        $dashboardlines[$board->element] = $board->load_board($user);
-    }
-
-    // Number of suppliers orders a deal
-    if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-        $board = new CommandeFournisseur($db);
-        $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
-        $dashboardlines[$board->element.'_awaiting'] = $board->load_board($user, 'awaiting');
-    }
-
-    // Number of contract / services enabled (delayed)
-    if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
-        include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-        $board = new Contrat($db);
-        $dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");
-        // Number of active services (expired)
-        $dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");
-    }
-
-    // Number of tickets open
-    if (!empty($conf->ticket->enabled) && $user->rights->ticket->read) {
-    	include_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
-    	$board = new Ticket($db);
-    	$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
-    	// Number of active services (expired)
-    	//$dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");
-    }
-
-    // Number of invoices customers (paid)
-    if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
-        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        $board = new Facture($db);
-        $dashboardlines[$board->element] = $board->load_board($user);
-    }
-
-    // Number of supplier invoices (paid)
-    if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {
-        include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-        $board = new FactureFournisseur($db);
-        $dashboardlines[$board->element] = $board->load_board($user);
-    }
-
-    // Number of transactions to conciliate
-    if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid) {
-        include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-        $board = new Account($db);
-        $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate
-        if ($nb > 0) {
-            $dashboardlines[$board->element] = $board->load_board($user);
-        }
-    }
-
-    // Number of cheque to send
-    if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
-        include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
-        $board = new RemiseCheque($db);
-        $dashboardlines[$board->element] = $board->load_board($user);
-    }
-
-    // Number of foundation members
-    if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->socid) {
-        include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-        $board = new Adherent($db);
-        $dashboardlines[$board->element.'_shift'] = $board->load_board($user, 'shift');
-        $dashboardlines[$board->element.'_expired'] = $board->load_board($user, 'expired');
-    }
-
-    // Number of expense reports to approve
-    if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
-        include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-        $board = new ExpenseReport($db);
-        $dashboardlines[$board->element . '_toapprove'] = $board->load_board($user, 'toapprove');
-    }
-
-    // Number of expense reports to pay
-    if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
-        include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-        $board = new ExpenseReport($db);
-        $dashboardlines[$board->element . '_topay'] = $board->load_board($user, 'topay');
-    }
-
-    // Number of holidays to approve
-    if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) {
-        include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
-        $board = new Holiday($db);
-        $dashboardlines[$board->element] = $board->load_board($user);
-    }
-
-    $object = new stdClass();
-    $parameters = array();
-    $action = '';
-    $reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object,
-        $action); // Note that $action and $object may have been modified by some hooks
-    if ($reshook == 0) {
-        $dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);
-    }
-
-    /* Open object dashboard */
-    $dashboardgroup = array(
-        'action' =>
-            array(
-                'groupName' => 'Agenda',
-                'stats' => array('action'),
-            ),
-        'project' =>
-            array(
-                'groupName' => 'Projects',
-                'globalStatsKey' => 'projects',
-                'stats' => array('project', 'project_task'),
-            ),
-        'propal' =>
-            array(
-                'groupName' => 'Proposals',
-                'globalStatsKey' => 'proposals',
-                'stats' =>
-                    array('propal_opened', 'propal_signed'),
-            ),
-        'commande' =>
-            array(
-                'groupName' => 'Orders',
-                'globalStatsKey' => 'orders',
-                'stats' =>
-                    array('commande'),
-            ),
-        'facture' =>
-            array(
-                'groupName' => 'Invoices',
-                'globalStatsKey' => 'invoices',
-                'stats' =>
-                    array('facture'),
-            ),
-        'supplier_proposal' =>
-            array(
-                'groupName' => 'SupplierProposals',
-                'globalStatsKey' => 'askprice',
-                'stats' =>
-                    array('supplier_proposal_opened', 'supplier_proposal_signed'),
-            ),
-        'order_supplier' =>
-            array(
-                'groupName' => 'SuppliersOrders',
-                'globalStatsKey' => 'supplier_orders',
-                'stats' =>
-                    array('order_supplier_opened', 'order_supplier_awaiting'),
-            ),
-        'invoice_supplier' =>
-            array(
-                'groupName' => 'BillsSuppliers',
-                'globalStatsKey' => 'supplier_invoices',
-                'stats' =>
-                    array('invoice_supplier'),
-            ),
-    	'contrat' =>
-	    	array(
-	    		'groupName' => 'Contracts',
-	    		'globalStatsKey' => 'Contracts',
-	    		'stats' =>
-	    		array('contrat_inactive', 'contrat_active'),
-	    	),
-    	'ticket' =>
-	    	array(
-	    		'groupName' => 'Tickets',
-	    		'globalStatsKey' => 'ticket',
-	    		'stats' =>
-	    			array('ticket_opened'),
-	    	),
-    	'bank_account' =>
-            array(
-                'groupName' => 'BankAccount',
-                'stats' =>
-                    array('bank_account', 'chequereceipt'),
-            ),
-        'member' =>
-            array(
-                'groupName' => 'Members',
-                'globalStatsKey' => 'members',
-                'stats' =>
-                    array('member_shift', 'member_expired'),
-            ),
-        'expensereport' =>
-            array(
-                'groupName' => 'ExpenseReport',
-                'globalStatsKey' => 'expensereports',
-                'stats' =>
-                    array('expensereport_toapprove', 'expensereport_topay'),
-            ),
-        'holiday' =>
-            array(
-                'groupName' => 'Holidays',
-                'globalStatsKey' => 'holidays',
-                'stats' =>
-                    array('holiday'),
-            ),
-    );
-
-    $object = new stdClass();
-    $parameters = array(
-        'dashboardgroup' => $dashboardgroup
-    );
-    $reshook = $hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-    if ($reshook == 0) {
-        $dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray);
-    }
-
-
-    // Calculate total nb of late
-    $totallate = $totaltodo = 0;
-
-    //Remove any invalid response
-    //load_board can return an integer if failed or WorkboardResponse if OK
-    $valid_dashboardlines = array();
-    foreach ($dashboardlines as $infoKey => $tmp) {
-        if ($tmp instanceof WorkboardResponse) {
-            $valid_dashboardlines[$infoKey] = $tmp;
-        }
-    }
-
-    // We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
-    foreach ($valid_dashboardlines as $board) {
-        if ($board->nbtodolate > 0) {
-            $totaltodo += $board->nbtodo;
-            $totallate += $board->nbtodolate;
-        }
-    }
-
-    $openedDashBoardSize = 'info-box-sm'; // use sm by default
-    foreach ($dashboardgroup as $dashbordelement) {
-        if (is_array($dashbordelement['stats']) && count($dashbordelement['stats']) > 2) {
-            $openedDashBoardSize = ''; // use default info box size : big
-            break;
-        }
-    }
-
-    $totalLateNumber = $totallate;
-    $totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0);
-    if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-        $totallate = $totallatePercentage;
-    }
-
-    $boxwork = '';
-    $boxwork .= '<div class="box">';
-    $boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">'."\n";
-    $boxwork .= '<tr class="liste_titre">';
-    $boxwork .= '<th class="liste_titre"><div class="inline-block valignmiddle">'.$langs->trans("DolibarrWorkBoard").'</div>';
-    if ($showweather) {
-        if ($totallate > 0) {
-            $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",
-                    $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
-        } else {
-            $text = $langs->transnoentitiesnoconv("NoItemLate");
-        }
-        $text .= '. '.$langs->transnoentitiesnoconv("LateDesc");
-        //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
-        $options = 'height="24px" style="float: right"';
-        $boxwork .= showWeather($totallate, $text, $options, 'inline-block valignmiddle');
-    }
-    $boxwork .= '</th>';
-    $boxwork .= '</tr>'."\n";
-
-    // Show dashboard
-    $nbworkboardempty = 0;
-    $isIntopOpenedDashBoard = $globalStatInTopOpenedDashBoard = array();
-    if (!empty($valid_dashboardlines)) {
-        $openedDashBoard = '';
-
-        $boxwork .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer centpercent"><div style="display: flex: flex-wrap: wrap">';
-
-        foreach ($dashboardgroup as $groupKey => $groupElement) {
-            $boards = array();
-
-            if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {
-                foreach ($groupElement['stats'] as $infoKey) {
-                    if (!empty($valid_dashboardlines[$infoKey])) {
-                        $boards[] = $valid_dashboardlines[$infoKey];
-                        $isIntopOpenedDashBoard[] = $infoKey;
-                    }
-                }
-            }
-
-            if (!empty($boards)) {
-                $groupName = $langs->trans($groupElement['groupName']);
-                $groupKeyLowerCase = strtolower($groupKey);
-                $nbTotalForGroup = 0;
-
-                // global stats
-                $globalStatsKey = false;
-                if (!empty($groupElement['globalStatsKey']) && empty($groupElement['globalStats'])) { // can be filled by hook
-                    $globalStatsKey = $groupElement['globalStatsKey'];
-                    $groupElement['globalStats'] = array();
-
-                    if (is_array($keys) && in_array($globalStatsKey, $keys))
-                    {
-                        // get key index of stats used in $includes, $classes, $keys, $icons, $titres, $links
-                        $keyIndex = array_search($globalStatsKey, $keys);
-
-                        $classe = $classes[$keyIndex];
-                        if (isset($boardloaded[$classe]) && is_object($boardloaded[$classe]))
-                        {
-                            $groupElement['globalStats']['total'] = $boardloaded[$classe]->nb[$globalStatsKey] ? $boardloaded[$classe]->nb[$globalStatsKey] : 0;
-                            $nbTotal = doubleval($groupElement['globalStats']['total']);
-                            if ($nbTotal >= 10000) { $nbTotal = round($nbTotal / 1000, 2).'k'; }
-                            $groupElement['globalStats']['text'] = $langs->trans('Total').' : '.$langs->trans($titres[$keyIndex]).' ('.$groupElement['globalStats']['total'].')';
-                            $groupElement['globalStats']['total'] = $nbTotal;
-                            $groupElement['globalStats']['link'] = $links[$keyIndex];
-                        }
-                    }
-                }
-
-                $openedDashBoard .= '<div class="box-flex-item"><div class="box-flex-item-with-margin">'."\n";
-                $openedDashBoard .= '	<div class="info-box '.$openedDashBoardSize.'">'."\n";
-                $openedDashBoard .= '		<span class="info-box-icon bg-infobox-'.$groupKeyLowerCase.'">'."\n";
-                $openedDashBoard .= '		<i class="fa fa-dol-'.$groupKeyLowerCase.'"></i>'."\n";
-
-                // Show the span for the total of record
-                if (!empty($groupElement['globalStats'])) {
-                    $globalStatInTopOpenedDashBoard[] = $globalStatsKey;
-                    $openedDashBoard .= '		<span class="info-box-icon-text" title="'.$groupElement['globalStats']['text'].'">'.$nbTotal.'</span>'."\n";
-                }
-
-                $openedDashBoard .= '		</span>'."\n";
-                $openedDashBoard .= '		<div class="info-box-content">'."\n";
-
-                $openedDashBoard .= '			<span class="info-box-title" title="'.strip_tags($groupName).'">'.$groupName.'</span>'."\n";
-
-                foreach ($boards as $board) {
-                    if (!empty($board->labelShort)) {
-                        $infoName = '<span title="'.$board->label.'">'.$board->labelShort.'</span>';
-                    } else {
-                        $infoName = $board->label;
-                    }
-
-                    $textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);
-                    $textLateTitle .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-
-                    $textLate = '';
-                    if ($board->nbtodolate > 0) {
-                        $textLate .= '<span title="'.dol_htmlentities($textLateTitle).'" class="classfortooltip badge badge-warning">';
-                        $textLate .= '<i class="fa fa-exclamation-triangle"></i> '.$board->nbtodolate;
-                        $textLate .= '</span>';
-                    }
-
-                    $openedDashBoard .= '<div class="info-box-line">';
-
-                    $nbtodClass = '';
-                    if ($board->nbtodo > 0) {
-                        $nbtodClass = 'badge badge-info';
-                    }
-
-                    $openedDashBoard .= '			<a href="'.$board->url.'" class="info-box-text info-box-text-a">'.$infoName.' : <span class="'.$nbtodClass.' classfortooltip" title="'.$board->label.'" >'.$board->nbtodo.'</span>';
-                    if ($textLate) {
-                    	if ($board->url_late) {
-                    		$openedDashBoard .= '</a>';
-                    		$openedDashBoard .= ' <a href="'.$board->url_late.'" class="info-box-text info-box-text-a paddingleft">';
-                    	} else {
-                    		$openedDashBoard .= ' ';
-                    	}
-                    	$openedDashBoard .= $textLate;
-                    }
-                    $openedDashBoard .= '</a>'."\n";
-
-                    if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
-                        $openedDashBoard .= '<a href="'.$board->url.'" class="info-box-text">'.$langs->trans('Total').' : '.price($board->total).'</a>';
-                    }
-
-                    $openedDashBoard .= '</div>';
-                }
-
-                $openedDashBoard .= '		</div><!-- /.info-box-content -->'."\n";
-                $openedDashBoard .= '	</div><!-- /.info-box -->'."\n";
-                $openedDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";
-                $openedDashBoard .= '</div><!-- /.box-flex-item -->'."\n";
-                $openedDashBoard .= "\n";
-            }
-        }
-
-        if ($showweather && !empty($isIntopOpenedDashBoard)) {
-            $appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '';
-            $weather = getWeatherStatus($totallate);
-
-            $text = '';
-            if ($totallate > 0) {
-                $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",
-                        $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
-            } else {
-                $text = $langs->transnoentitiesnoconv("NoItemLate");
-            }
-            $text .= '. '.$langs->transnoentitiesnoconv("LateDesc");
-
-            $weatherDashBoard = '<div class="box-flex-item '.$appendClass.'"><div class="box-flex-item-with-margin">'."\n";
-            $weatherDashBoard .= '	<div class="info-box '.$openedDashBoardSize.' info-box-weather info-box-weather-level'.$weather->level.'">'."\n";
-            $weatherDashBoard .= '		<span class="info-box-icon">';
-            $weatherDashBoard .= img_weather('', $weather->level, '', 0, 'valignmiddle width50');
-            $weatherDashBoard .= '       </span>'."\n";
-            $weatherDashBoard .= '		<div class="info-box-content">'."\n";
-            $weatherDashBoard .= '			<span class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</span>'."\n";
-
-            if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
-                $weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate",
-                        price($totallatePercentage).'%').'</span>'."\n";
-                $weatherDashBoard .= '			<span class="progress-description">'.$langs->trans('NActionsLate',
-                        $totalLateNumber).'</span>'."\n";
-            } else {
-                $weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate",
-                        $totalLateNumber).'</span>'."\n";
-                if ($totallatePercentage > 0) {
-                    $weatherDashBoard .= '			<span class="progress-description">'.$langs->trans('NActionsLate',
-                            price($totallatePercentage).'%').'</span>'."\n";
-                }
-            }
-
-            $weatherDashBoard .= '		</div><!-- /.info-box-content -->'."\n";
-            $weatherDashBoard .= '	</div><!-- /.info-box -->'."\n";
-            $weatherDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";
-            $weatherDashBoard .= '</div><!-- /.box-flex-item -->'."\n";
-            $weatherDashBoard .= "\n";
-
-            $openedDashBoard = $weatherDashBoard.$openedDashBoard;
-        }
-
-        if (!empty($isIntopOpenedDashBoard)) {
-            for ($i = 1; $i <= 10; $i++) {
-                $openedDashBoard .= '<div class="box-flex-item filler"></div>';
-            }
-        }
-
-        $nbworkboardcount = 0;
-        foreach ($valid_dashboardlines as $infoKey => $board) {
-            if (in_array($infoKey, $isIntopOpenedDashBoard)) {
-                // skip if info is present on top
-                continue;
-            }
-
-            if (empty($board->nbtodo)) {
-                $nbworkboardempty++;
-            }
-            $nbworkboardcount++;
-
-
-            $textlate = $langs->trans("NActionsLate", $board->nbtodolate);
-            $textlate .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-
-
-            $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
-            $boxwork .= '<div class="boxstatscontent">';
-            $boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' '.$board->label.'</span><br>';
-            $boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>';
-            if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
-                $boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.price($board->total).'</span></a>';
-            }
-            $boxwork .= '</div>';
-            if ($board->nbtodolate > 0) {
-                $boxwork .= '<div class="dashboardlinelatecoin nowrap">';
-                $boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late).'">';
-                //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
-                $boxwork .= img_picto($textlate, "warning_white",
-                        'class="inline-block hideonsmartphone valigntextbottom"').'';
-                $boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'">';
-                $boxwork .= $board->nbtodolate;
-                $boxwork .= '</span>';
-                $boxwork .= '</a>';
-                $boxwork .= '</div>';
-            }
-            $boxwork .= '</div></div>';
-            $boxwork .= "\n";
-        }
-
-        $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
-        $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
-        $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
-        $boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
-
-        $boxwork .= '</div>';
-        $boxwork .= '</td></tr>';
-    } else {
-        $boxwork .= '<tr class="nohover">';
-        $boxwork .= '<td class="nohover valignmiddle opacitymedium">';
-        $boxwork .= $langs->trans("NoOpenedElementToProcess");
-        $boxwork .= '</td>';
-        $boxwork .= '</tr>';
-    }
-
-    $boxwork .= '</td></tr>';
-
-    $boxwork .= '</table>'; // End table array of working board
-    $boxwork .= '</div>';
-
-    if (!empty($isIntopOpenedDashBoard)) {
-        print '<div class="fichecenter">';
-        print '<div class="opened-dash-board-wrap"><div class="box-flex-container">'.$openedDashBoard.'</div></div>';
-        print '</div>';
-    }
+	$showweather = (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO == 2) ? 1 : 0;
+
+	//Array that contains all WorkboardResponse classes to process them
+	$dashboardlines = array();
+
+	// Do not include sections without management permission
+	require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
+
+	// Number of actions to do (late)
+	if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) {
+		include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+		$board = new ActionComm($db);
+		$dashboardlines[$board->element] = $board->load_board($user);
+	}
+
+	// Number of project opened
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+		$board = new Project($db);
+		$dashboardlines[$board->element] = $board->load_board($user);
+	}
+
+	// Number of tasks to do (late)
+	if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
+		include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		$board = new Task($db);
+		$dashboardlines[$board->element] = $board->load_board($user);
+	}
+
+	// Number of commercial proposals open (expired)
+	if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
+		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+		$board = new Propal($db);
+		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
+		// Number of commercial proposals CLOSED signed (billed)
+		$dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
+	}
+
+	// Number of commercial proposals open (expired)
+	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
+		include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+		$board = new SupplierProposal($db);
+		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
+		// Number of commercial proposals CLOSED signed (billed)
+		$dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
+	}
+
+	// Number of customer orders a deal
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+		$board = new Commande($db);
+		$dashboardlines[$board->element] = $board->load_board($user);
+	}
+
+	// Number of suppliers orders a deal
+	if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+		$board = new CommandeFournisseur($db);
+		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
+		$dashboardlines[$board->element.'_awaiting'] = $board->load_board($user, 'awaiting');
+	}
+
+	// Number of contract / services enabled (delayed)
+	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+		include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+		$board = new Contrat($db);
+		$dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");
+		// Number of active services (expired)
+		$dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");
+	}
+
+	// Number of tickets open
+	if (!empty($conf->ticket->enabled) && $user->rights->ticket->read) {
+		include_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+		$board = new Ticket($db);
+		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
+		// Number of active services (expired)
+		//$dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");
+	}
+
+	// Number of invoices customers (paid)
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		$board = new Facture($db);
+		$dashboardlines[$board->element] = $board->load_board($user);
+	}
+
+	// Number of supplier invoices (paid)
+	if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {
+		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+		$board = new FactureFournisseur($db);
+		$dashboardlines[$board->element] = $board->load_board($user);
+	}
+
+	// Number of transactions to conciliate
+	if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid) {
+		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		$board = new Account($db);
+		$nb = $board->countAccountToReconcile(); // Get nb of account to reconciliate
+		if ($nb > 0) {
+			$dashboardlines[$board->element] = $board->load_board($user);
+		}
+	}
+
+	// Number of cheque to send
+	if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->socid && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
+		include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+		$board = new RemiseCheque($db);
+		$dashboardlines[$board->element] = $board->load_board($user);
+	}
+
+	// Number of foundation members
+	if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->socid) {
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		$board = new Adherent($db);
+		$dashboardlines[$board->element.'_shift'] = $board->load_board($user, 'shift');
+		$dashboardlines[$board->element.'_expired'] = $board->load_board($user, 'expired');
+	}
+
+	// Number of expense reports to approve
+	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
+		include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+		$board = new ExpenseReport($db);
+		$dashboardlines[$board->element.'_toapprove'] = $board->load_board($user, 'toapprove');
+	}
+
+	// Number of expense reports to pay
+	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
+		include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+		$board = new ExpenseReport($db);
+		$dashboardlines[$board->element.'_topay'] = $board->load_board($user, 'topay');
+	}
+
+	// Number of holidays to approve
+	if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) {
+		include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+		$board = new Holiday($db);
+		$dashboardlines[$board->element] = $board->load_board($user);
+	}
+
+	$object = new stdClass();
+	$parameters = array();
+	$action = '';
+	$reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object,
+		$action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook == 0) {
+		$dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);
+	}
+
+	/* Open object dashboard */
+	$dashboardgroup = array(
+		'action' =>
+			array(
+				'groupName' => 'Agenda',
+				'stats' => array('action'),
+			),
+		'project' =>
+			array(
+				'groupName' => 'Projects',
+				'globalStatsKey' => 'projects',
+				'stats' => array('project', 'project_task'),
+			),
+		'propal' =>
+			array(
+				'groupName' => 'Proposals',
+				'globalStatsKey' => 'proposals',
+				'stats' =>
+					array('propal_opened', 'propal_signed'),
+			),
+		'commande' =>
+			array(
+				'groupName' => 'Orders',
+				'globalStatsKey' => 'orders',
+				'stats' =>
+					array('commande'),
+			),
+		'facture' =>
+			array(
+				'groupName' => 'Invoices',
+				'globalStatsKey' => 'invoices',
+				'stats' =>
+					array('facture'),
+			),
+		'supplier_proposal' =>
+			array(
+				'groupName' => 'SupplierProposals',
+				'globalStatsKey' => 'askprice',
+				'stats' =>
+					array('supplier_proposal_opened', 'supplier_proposal_signed'),
+			),
+		'order_supplier' =>
+			array(
+				'groupName' => 'SuppliersOrders',
+				'globalStatsKey' => 'supplier_orders',
+				'stats' =>
+					array('order_supplier_opened', 'order_supplier_awaiting'),
+			),
+		'invoice_supplier' =>
+			array(
+				'groupName' => 'BillsSuppliers',
+				'globalStatsKey' => 'supplier_invoices',
+				'stats' =>
+					array('invoice_supplier'),
+			),
+		'contrat' =>
+			array(
+				'groupName' => 'Contracts',
+				'globalStatsKey' => 'Contracts',
+				'stats' =>
+				array('contrat_inactive', 'contrat_active'),
+			),
+		'ticket' =>
+			array(
+				'groupName' => 'Tickets',
+				'globalStatsKey' => 'ticket',
+				'stats' =>
+					array('ticket_opened'),
+			),
+		'bank_account' =>
+			array(
+				'groupName' => 'BankAccount',
+				'stats' =>
+					array('bank_account', 'chequereceipt'),
+			),
+		'member' =>
+			array(
+				'groupName' => 'Members',
+				'globalStatsKey' => 'members',
+				'stats' =>
+					array('member_shift', 'member_expired'),
+			),
+		'expensereport' =>
+			array(
+				'groupName' => 'ExpenseReport',
+				'globalStatsKey' => 'expensereports',
+				'stats' =>
+					array('expensereport_toapprove', 'expensereport_topay'),
+			),
+		'holiday' =>
+			array(
+				'groupName' => 'Holidays',
+				'globalStatsKey' => 'holidays',
+				'stats' =>
+					array('holiday'),
+			),
+	);
+
+	$object = new stdClass();
+	$parameters = array(
+		'dashboardgroup' => $dashboardgroup
+	);
+	$reshook = $hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook == 0) {
+		$dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray);
+	}
+
+
+	// Calculate total nb of late
+	$totallate = $totaltodo = 0;
+
+	//Remove any invalid response
+	//load_board can return an integer if failed or WorkboardResponse if OK
+	$valid_dashboardlines = array();
+	foreach ($dashboardlines as $infoKey => $tmp) {
+		if ($tmp instanceof WorkboardResponse) {
+			$valid_dashboardlines[$infoKey] = $tmp;
+		}
+	}
+
+	// We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
+	foreach ($valid_dashboardlines as $board) {
+		if ($board->nbtodolate > 0) {
+			$totaltodo += $board->nbtodo;
+			$totallate += $board->nbtodolate;
+		}
+	}
+
+	$openedDashBoardSize = 'info-box-sm'; // use sm by default
+	foreach ($dashboardgroup as $dashbordelement) {
+		if (is_array($dashbordelement['stats']) && count($dashbordelement['stats']) > 2) {
+			$openedDashBoardSize = ''; // use default info box size : big
+			break;
+		}
+	}
+
+	$totalLateNumber = $totallate;
+	$totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0);
+	if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+		$totallate = $totallatePercentage;
+	}
+
+	$boxwork = '';
+	$boxwork .= '<div class="box">';
+	$boxwork .= '<table summary="'.dol_escape_htmltag($langs->trans("WorkingBoard")).'" class="noborder boxtable boxtablenobottom boxworkingboard" width="100%">'."\n";
+	$boxwork .= '<tr class="liste_titre">';
+	$boxwork .= '<th class="liste_titre"><div class="inline-block valignmiddle">'.$langs->trans("DolibarrWorkBoard").'</div>';
+	if ($showweather) {
+		if ($totallate > 0) {
+			$text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",
+					$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
+		} else {
+			$text = $langs->transnoentitiesnoconv("NoItemLate");
+		}
+		$text .= '. '.$langs->transnoentitiesnoconv("LateDesc");
+		//$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
+		$options = 'height="24px" style="float: right"';
+		$boxwork .= showWeather($totallate, $text, $options, 'inline-block valignmiddle');
+	}
+	$boxwork .= '</th>';
+	$boxwork .= '</tr>'."\n";
+
+	// Show dashboard
+	$nbworkboardempty = 0;
+	$isIntopOpenedDashBoard = $globalStatInTopOpenedDashBoard = array();
+	if (!empty($valid_dashboardlines)) {
+		$openedDashBoard = '';
+
+		$boxwork .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer centpercent"><div style="display: flex: flex-wrap: wrap">';
+
+		foreach ($dashboardgroup as $groupKey => $groupElement) {
+			$boards = array();
+
+			if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {
+				foreach ($groupElement['stats'] as $infoKey) {
+					if (!empty($valid_dashboardlines[$infoKey])) {
+						$boards[] = $valid_dashboardlines[$infoKey];
+						$isIntopOpenedDashBoard[] = $infoKey;
+					}
+				}
+			}
+
+			if (!empty($boards)) {
+				$groupName = $langs->trans($groupElement['groupName']);
+				$groupKeyLowerCase = strtolower($groupKey);
+				$nbTotalForGroup = 0;
+
+				// global stats
+				$globalStatsKey = false;
+				if (!empty($groupElement['globalStatsKey']) && empty($groupElement['globalStats'])) { // can be filled by hook
+					$globalStatsKey = $groupElement['globalStatsKey'];
+					$groupElement['globalStats'] = array();
+
+					if (is_array($keys) && in_array($globalStatsKey, $keys))
+					{
+						// get key index of stats used in $includes, $classes, $keys, $icons, $titres, $links
+						$keyIndex = array_search($globalStatsKey, $keys);
+
+						$classe = $classes[$keyIndex];
+						if (isset($boardloaded[$classe]) && is_object($boardloaded[$classe]))
+						{
+							$groupElement['globalStats']['total'] = $boardloaded[$classe]->nb[$globalStatsKey] ? $boardloaded[$classe]->nb[$globalStatsKey] : 0;
+							$nbTotal = doubleval($groupElement['globalStats']['total']);
+							if ($nbTotal >= 10000) { $nbTotal = round($nbTotal / 1000, 2).'k'; }
+							$groupElement['globalStats']['text'] = $langs->trans('Total').' : '.$langs->trans($titres[$keyIndex]).' ('.$groupElement['globalStats']['total'].')';
+							$groupElement['globalStats']['total'] = $nbTotal;
+							$groupElement['globalStats']['link'] = $links[$keyIndex];
+						}
+					}
+				}
+
+				$openedDashBoard .= '<div class="box-flex-item"><div class="box-flex-item-with-margin">'."\n";
+				$openedDashBoard .= '	<div class="info-box '.$openedDashBoardSize.'">'."\n";
+				$openedDashBoard .= '		<span class="info-box-icon bg-infobox-'.$groupKeyLowerCase.'">'."\n";
+				$openedDashBoard .= '		<i class="fa fa-dol-'.$groupKeyLowerCase.'"></i>'."\n";
+
+				// Show the span for the total of record
+				if (!empty($groupElement['globalStats'])) {
+					$globalStatInTopOpenedDashBoard[] = $globalStatsKey;
+					$openedDashBoard .= '		<span class="info-box-icon-text" title="'.$groupElement['globalStats']['text'].'">'.$nbTotal.'</span>'."\n";
+				}
+
+				$openedDashBoard .= '		</span>'."\n";
+				$openedDashBoard .= '		<div class="info-box-content">'."\n";
+
+				$openedDashBoard .= '			<span class="info-box-title" title="'.strip_tags($groupName).'">'.$groupName.'</span>'."\n";
+
+				foreach ($boards as $board) {
+					if (!empty($board->labelShort)) {
+						$infoName = '<span title="'.$board->label.'">'.$board->labelShort.'</span>';
+					} else {
+						$infoName = $board->label;
+					}
+
+					$textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);
+					$textLateTitle .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+
+					$textLate = '';
+					if ($board->nbtodolate > 0) {
+						$textLate .= '<span title="'.dol_htmlentities($textLateTitle).'" class="classfortooltip badge badge-warning">';
+						$textLate .= '<i class="fa fa-exclamation-triangle"></i> '.$board->nbtodolate;
+						$textLate .= '</span>';
+					}
+
+					$openedDashBoard .= '<div class="info-box-line">';
+
+					$nbtodClass = '';
+					if ($board->nbtodo > 0) {
+						$nbtodClass = 'badge badge-info';
+					}
+
+					$openedDashBoard .= '			<a href="'.$board->url.'" class="info-box-text info-box-text-a">'.$infoName.' : <span class="'.$nbtodClass.' classfortooltip" title="'.$board->label.'" >'.$board->nbtodo.'</span>';
+					if ($textLate) {
+						if ($board->url_late) {
+							$openedDashBoard .= '</a>';
+							$openedDashBoard .= ' <a href="'.$board->url_late.'" class="info-box-text info-box-text-a paddingleft">';
+						} else {
+							$openedDashBoard .= ' ';
+						}
+						$openedDashBoard .= $textLate;
+					}
+					$openedDashBoard .= '</a>'."\n";
+
+					if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
+						$openedDashBoard .= '<a href="'.$board->url.'" class="info-box-text">'.$langs->trans('Total').' : '.price($board->total).'</a>';
+					}
+
+					$openedDashBoard .= '</div>';
+				}
+
+				$openedDashBoard .= '		</div><!-- /.info-box-content -->'."\n";
+				$openedDashBoard .= '	</div><!-- /.info-box -->'."\n";
+				$openedDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";
+				$openedDashBoard .= '</div><!-- /.box-flex-item -->'."\n";
+				$openedDashBoard .= "\n";
+			}
+		}
+
+		if ($showweather && !empty($isIntopOpenedDashBoard)) {
+			$appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '';
+			$weather = getWeatherStatus($totallate);
+
+			$text = '';
+			if ($totallate > 0) {
+				$text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",
+						$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
+			} else {
+				$text = $langs->transnoentitiesnoconv("NoItemLate");
+			}
+			$text .= '. '.$langs->transnoentitiesnoconv("LateDesc");
+
+			$weatherDashBoard = '<div class="box-flex-item '.$appendClass.'"><div class="box-flex-item-with-margin">'."\n";
+			$weatherDashBoard .= '	<div class="info-box '.$openedDashBoardSize.' info-box-weather info-box-weather-level'.$weather->level.'">'."\n";
+			$weatherDashBoard .= '		<span class="info-box-icon">';
+			$weatherDashBoard .= img_weather('', $weather->level, '', 0, 'valignmiddle width50');
+			$weatherDashBoard .= '       </span>'."\n";
+			$weatherDashBoard .= '		<div class="info-box-content">'."\n";
+			$weatherDashBoard .= '			<span class="info-box-title">'.$langs->trans('GlobalOpenedElemView').'</span>'."\n";
+
+			if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+				$weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate",
+						price($totallatePercentage).'%').'</span>'."\n";
+				$weatherDashBoard .= '			<span class="progress-description">'.$langs->trans('NActionsLate',
+						$totalLateNumber).'</span>'."\n";
+			} else {
+				$weatherDashBoard .= '			<span class="info-box-number">'.$langs->transnoentitiesnoconv("NActionsLate",
+						$totalLateNumber).'</span>'."\n";
+				if ($totallatePercentage > 0) {
+					$weatherDashBoard .= '			<span class="progress-description">'.$langs->trans('NActionsLate',
+							price($totallatePercentage).'%').'</span>'."\n";
+				}
+			}
+
+			$weatherDashBoard .= '		</div><!-- /.info-box-content -->'."\n";
+			$weatherDashBoard .= '	</div><!-- /.info-box -->'."\n";
+			$weatherDashBoard .= '</div><!-- /.box-flex-item-with-margin -->'."\n";
+			$weatherDashBoard .= '</div><!-- /.box-flex-item -->'."\n";
+			$weatherDashBoard .= "\n";
+
+			$openedDashBoard = $weatherDashBoard.$openedDashBoard;
+		}
+
+		if (!empty($isIntopOpenedDashBoard)) {
+			for ($i = 1; $i <= 10; $i++) {
+				$openedDashBoard .= '<div class="box-flex-item filler"></div>';
+			}
+		}
+
+		$nbworkboardcount = 0;
+		foreach ($valid_dashboardlines as $infoKey => $board) {
+			if (in_array($infoKey, $isIntopOpenedDashBoard)) {
+				// skip if info is present on top
+				continue;
+			}
+
+			if (empty($board->nbtodo)) {
+				$nbworkboardempty++;
+			}
+			$nbworkboardcount++;
+
+
+			$textlate = $langs->trans("NActionsLate", $board->nbtodolate);
+			$textlate .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+
+
+			$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats130 boxstatsborder">';
+			$boxwork .= '<div class="boxstatscontent">';
+			$boxwork .= '<span class="boxstatstext" title="'.dol_escape_htmltag($board->label).'">'.$board->img.' <span>'.$board->label.'</span></span><br>';
+			$boxwork .= '<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.$board->nbtodo.'</span></a>';
+			if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
+				$boxwork .= '&nbsp;/&nbsp;<a class="valignmiddle dashboardlineindicator" href="'.$board->url.'"><span class="dashboardlineindicator'.(($board->nbtodo == 0) ? ' dashboardlineok' : '').'">'.price($board->total).'</span></a>';
+			}
+			$boxwork .= '</div>';
+			if ($board->nbtodolate > 0) {
+				$boxwork .= '<div class="dashboardlinelatecoin nowrap">';
+				$boxwork .= '<a title="'.dol_escape_htmltag($textlate).'" class="valignmiddle dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'" href="'.((!$board->url_late) ? $board->url : $board->url_late).'">';
+				//$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
+				$boxwork .= img_picto($textlate, "warning_white",
+						'class="inline-block hideonsmartphone valigntextbottom"').'';
+				$boxwork .= '<span class="dashboardlineindicatorlate'.($board->nbtodolate > 0 ? ' dashboardlineko' : ' dashboardlineok').'">';
+				$boxwork .= $board->nbtodolate;
+				$boxwork .= '</span>';
+				$boxwork .= '</a>';
+				$boxwork .= '</div>';
+			}
+			$boxwork .= '</div></div>';
+			$boxwork .= "\n";
+		}
+
+		$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
+		$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
+		$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
+		$boxwork .= '<div class="boxstatsindicator thumbstat150 nobold nounderline"><div class="boxstats150empty"></div></div>';
+
+		$boxwork .= '</div>';
+		$boxwork .= '</td></tr>';
+	} else {
+		$boxwork .= '<tr class="nohover">';
+		$boxwork .= '<td class="nohover valignmiddle opacitymedium">';
+		$boxwork .= $langs->trans("NoOpenedElementToProcess");
+		$boxwork .= '</td>';
+		$boxwork .= '</tr>';
+	}
+
+	$boxwork .= '</td></tr>';
+
+	$boxwork .= '</table>'; // End table array of working board
+	$boxwork .= '</div>';
+
+	if (!empty($isIntopOpenedDashBoard)) {
+		print '<div class="fichecenter">';
+		print '<div class="opened-dash-board-wrap"><div class="box-flex-container">'.$openedDashBoard.'</div></div>';
+		print '</div>';
+	}
 }
 
 
@@ -899,46 +900,46 @@ $boxlist .= '</div>';
 
 if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
 {
-    // Remove allready present info in new dash board
-    if (!empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD) && is_array($boxstatItems) && count($boxstatItems) > 0) {
-        foreach ($boxstatItems as $boxstatItemKey => $boxstatItemHtml) {
-            if (in_array($boxstatItemKey, $globalStatInTopOpenedDashBoard)) {
-                unset($boxstatItems[$boxstatItemKey]);
-            }
-        }
-    }
+	// Remove allready present info in new dash board
+	if (!empty($conf->global->MAIN_INCLUDE_GLOBAL_STATS_IN_OPENED_DASHBOARD) && is_array($boxstatItems) && count($boxstatItems) > 0) {
+		foreach ($boxstatItems as $boxstatItemKey => $boxstatItemHtml) {
+			if (in_array($boxstatItemKey, $globalStatInTopOpenedDashBoard)) {
+				unset($boxstatItems[$boxstatItemKey]);
+			}
+		}
+	}
 
-    if (!empty($boxstatFromHook) || !empty($boxstatItems)) {
-    	$boxstat .= '<!-- Database statistics -->'."\n";
-        $boxstat .= '<div class="box">';
-        $boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover widgetstats" width="100%">';
-        $boxstat .= '<tr class="liste_titre box_titre">';
-        $boxstat .= '<td class="liste_titre">';
-        $boxstat .= '<div class="inline-block valignmiddle">'.$langs->trans("DolibarrStateBoard").'</div>';
-        $boxstat .= '</td>';
-        $boxstat .= '</tr>';
-        $boxstat .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer">';
+	if (!empty($boxstatFromHook) || !empty($boxstatItems)) {
+		$boxstat .= '<!-- Database statistics -->'."\n";
+		$boxstat .= '<div class="box">';
+		$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="noborder boxtable boxtablenobottom nohover widgetstats" width="100%">';
+		$boxstat .= '<tr class="liste_titre box_titre">';
+		$boxstat .= '<td class="liste_titre">';
+		$boxstat .= '<div class="inline-block valignmiddle">'.$langs->trans("DolibarrStateBoard").'</div>';
+		$boxstat .= '</td>';
+		$boxstat .= '</tr>';
+		$boxstat .= '<tr class="nobottom nohover"><td class="tdboxstats nohover flexcontainer">';
 
-        $boxstat .= $boxstatFromHook;
+		$boxstat .= $boxstatFromHook;
 
-        if (is_array($boxstatItems) && count($boxstatItems) > 0)
-        {
-            $boxstat .= implode('', $boxstatItems);
-        }
+		if (is_array($boxstatItems) && count($boxstatItems) > 0)
+		{
+			$boxstat .= implode('', $boxstatItems);
+		}
 
-        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
-        $boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
+		$boxstat .= '<a class="boxstatsindicator thumbstat nobold nounderline"><div class="boxstatsempty"></div></a>';
 
-        $boxstat .= '</td></tr>';
-        $boxstat .= '</table>';
-        $boxstat .= '</div>';
-    }
+		$boxstat .= '</td></tr>';
+		$boxstat .= '</table>';
+		$boxstat .= '</div>';
+	}
 }
 
 $boxlist .= '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
@@ -964,32 +965,32 @@ print '</div>';
 // Security warning repertoire install existe (si utilisateur admin)
 if ($user->admin && empty($conf->global->MAIN_REMOVE_INSTALL_WARNING))
 {
-    $message = '';
+	$message = '';
 
-    // Check if install lock file is present
-    $lockfile = DOL_DATA_ROOT.'/install.lock';
-    if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install"))
-    {
-        $langs->load("errors");
-        //if (! empty($message)) $message.='<br>';
-        $message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
-    }
+	// Check if install lock file is present
+	$lockfile = DOL_DATA_ROOT.'/install.lock';
+	if (!empty($lockfile) && !file_exists($lockfile) && is_dir(DOL_DOCUMENT_ROOT."/install"))
+	{
+		$langs->load("errors");
+		//if (! empty($message)) $message.='<br>';
+		$message .= info_admin($langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT).' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
+	}
 
-    // Conf files must be in read only mode
-    if (is_writable($conffile))
-    {
-        $langs->load("errors");
-        //$langs->load("other");
-        //if (! empty($message)) $message.='<br>';
-        $message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
-    }
+	// Conf files must be in read only mode
+	if (is_writable($conffile))
+	{
+		$langs->load("errors");
+		//$langs->load("other");
+		//if (! empty($message)) $message.='<br>';
+		$message .= info_admin($langs->transnoentities("WarningConfFileMustBeReadOnly").' '.$langs->trans("WarningUntilDirRemoved", DOL_DOCUMENT_ROOT."/install"), 0, 0, '1', 'clearboth');
+	}
 
-    if ($message)
-    {
-        print $message;
-        //$message.='<br>';
-        //print info_admin($langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
-    }
+	if ($message)
+	{
+		print $message;
+		//$message.='<br>';
+		//print info_admin($langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"));
+	}
 }
 
 //print 'mem='.memory_get_usage().' - '.memory_get_peak_usage();
@@ -1011,10 +1012,10 @@ $db->close();
  */
 function showWeather($totallate, $text, $options, $morecss = '')
 {
-    global $conf;
+	global $conf;
 
-    $weather = getWeatherStatus($totallate);
-    return img_weather($text, $weather->picto, $options, 0, $morecss);
+	$weather = getWeatherStatus($totallate);
+	return img_weather($text, $weather->picto, $options, 0, $morecss);
 }
 
 
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 1b7ac620057..267e1629f36 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -82,14 +82,11 @@ if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0)        // M
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
 	$checksok = 0; // 0=error, 1=warning
-}
-elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0)    // Minimum supported (warning if lower)
+} 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
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPVersion")." ".versiontostring(versionphparray());
 }
 if (empty($force_install_nophpinfo)) print ' (<a href="phpinfo.php" target="_blank">'.$langs->trans("MoreInformation").'</a>)';
@@ -103,9 +100,7 @@ if (!isset($_GET["testget"]) && !isset($_POST["testpost"]))
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
 	print "<br>\n";
 	$checksok = 0;
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk")."<br>\n";
 }
 
@@ -115,9 +110,7 @@ if (!function_exists("session_id"))
 {
 	print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions")."<br>\n";
 	$checksok = 0;
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportSessions")."<br>\n";
 }
 
@@ -128,9 +121,7 @@ if (!function_exists("imagecreate"))
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportGD")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportGD")."<br>\n";
 }
 
@@ -141,9 +132,7 @@ 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)
-}
-else
-{
+} else {
     print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCurl")."<br>\n";
 }
 
@@ -151,9 +140,7 @@ else
 if (!function_exists("easter_date"))
 {
     print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
-}
-else
-{
+} else {
     print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportCalendar")."<br>\n";
 }
 
@@ -164,9 +151,7 @@ if (!function_exists("utf8_encode"))
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportUTF8")."<br>\n";
 }
 
@@ -179,9 +164,7 @@ if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@loc
 	    $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
-	{
+	} else {
 	    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
 	}
 }
@@ -191,9 +174,7 @@ if (!class_exists('ZipArchive'))
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupport", "ZIP")."<br>\n";
 	// $checksok = 0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
-}
-else
-{
+} else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupport", "ZIP")."<br>\n";
 }
 
@@ -214,9 +195,7 @@ if ($memmaxorig != '')
 	if ($memmax >= $memrequired || $memmax == -1)
 	{
 		print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPMemoryOK", $memmaxorig, $memrequiredorig)."<br>\n";
-	}
-	else
-	{
+	} else {
 		print '<img src="../theme/eldy/img/warning.png" alt="Warning"> '.$langs->trans("PHPMemoryTooLow", $memmaxorig, $memrequiredorig)."<br>\n";
 	}
 }
@@ -235,14 +214,10 @@ if (is_readable($conffile) && filesize($conffile) > 8)
 	{
 		// Already installed for all parts (config and database). We can propose upgrade.
 		$allowupgrade = true;
-	}
-	else
-	{
+	} else {
 		$allowupgrade = false;
 	}
-}
-else
-{
+} else {
 	// If not, we create it
 	dolibarr_install_syslog("check: we try to create conf file '".$conffile."'");
 	$confexists = 0;
@@ -252,9 +227,7 @@ else
 	{
 		// Success
 		dolibarr_install_syslog("check: successfully copied file ".$conffile.".example into ".$conffile);
-	}
-	else
-	{
+	} else {
 		// If failed, we try to create an empty file
 		dolibarr_install_syslog("check: failed to copy file ".$conffile.".example into ".$conffile.". We try to create it.", LOG_WARNING);
 
@@ -264,8 +237,7 @@ else
 			@fwrite($fp, '<?php');
 			@fputs($fp, "\n");
 			fclose($fp);
-		}
-		else dolibarr_install_syslog("check: failed to create a new file ".$conffile." into current dir ".getcwd().". Please check permissions.", LOG_ERR);
+		} else dolibarr_install_syslog("check: failed to create a new file ".$conffile." into current dir ".getcwd().". Please check permissions.", LOG_ERR);
 	}
 
 	// First install: no upgrade necessary/required
@@ -284,9 +256,7 @@ if (!file_exists($conffile))
 
 	print $langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok');
 	$err++;
-}
-else
-{
+} else {
 	if (dol_is_dir($conffile))
 	{
 		print '<img src="../theme/eldy/img/error.png" alt="Warning"> '.$langs->trans("ConfFileMustBeAFileNotADir", $conffiletoshow);
@@ -299,9 +269,7 @@ else
 		if ($confexists)
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists", $conffiletoshow);
-		}
-		else
-		{
+		} else {
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated", $conffiletoshow);
 		}
 		print "<br>";
@@ -311,14 +279,11 @@ else
 		$allowinstall = 0;
 	}
 	// File exists and can be modified
-	else
-	{
+	else {
 		if ($confexists)
 		{
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileExists", $conffiletoshow);
-		}
-		else
-		{
+		} else {
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated", $conffiletoshow);
 		}
 		print "<br>";
@@ -344,9 +309,7 @@ else
 				{
                     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
-				{
+				} else {
                     require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 
                     // If password is encoded, we decode it
@@ -357,8 +320,7 @@ else
                         {
                             $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);
+                        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
                     }
 
     				// $conf already created in inc.php
@@ -404,8 +366,7 @@ else
 			//print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));
 			print '<br>';
 			print '<br>';
-		}
-		else print "<br>\n";
+		} else print "<br>\n";
 
 		//print $langs->trans("InstallEasy")." ";
 		print '<h3><span class="soustitre">'.$langs->trans("ChooseYourSetupMode").'</span></h3>';
@@ -439,9 +400,7 @@ else
 		if ($allowinstall)
 		{
             $choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
-		}
-		else
-		{
+		} else {
 			$choice .= ($foundrecommandedchoice ? '<span class="warning">' : '').$langs->trans("InstallNotAllowed").($foundrecommandedchoice ? '</span>' : '');
 		}
         $choice .= '</td>'."\n";
@@ -479,7 +438,8 @@ else
 								array('from'=>'8.0.0', 'to'=>'9.0.0'),
 								array('from'=>'9.0.0', 'to'=>'10.0.0'),
 								array('from'=>'10.0.0', 'to'=>'11.0.0'),
-								array('from'=>'11.0.0', 'to'=>'12.0.0')
+								array('from'=>'11.0.0', 'to'=>'12.0.0'),
+								array('from'=>'12.0.0', 'to'=>'13.0.0')
 		);
 
 		$count = 0;
@@ -516,8 +476,7 @@ else
                         $foundrecommandedchoice = 1; // To show only once
                         $recommended_choice = true;
                     }
-                }
-                else {
+                } else {
                     // We cannot recommend a choice.
                     // A version of install may be known, but we need last upgrade.
                 }
@@ -558,14 +517,10 @@ else
 				if ($disabled)
                 {
                     $choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
-                }
-				else
-                {
+                } 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
-			{
+			} else {
                 $choice .= $langs->trans("NotAvailable");
 			}
             $choice .= '</td>';
diff --git a/htdocs/install/doctemplates/products/template_product.odt b/htdocs/install/doctemplates/products/template_product.odt
index 344fcfa391a..c73fa69d92d 100644
Binary files a/htdocs/install/doctemplates/products/template_product.odt and b/htdocs/install/doctemplates/products/template_product.odt differ
diff --git a/htdocs/install/doctemplates/stocks/template_warehouse.odt b/htdocs/install/doctemplates/stocks/template_warehouse.odt
new file mode 100644
index 00000000000..5d4340230a1
Binary files /dev/null and b/htdocs/install/doctemplates/stocks/template_warehouse.odt differ
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate.zip b/htdocs/install/doctemplates/websites/website_template-corporate.zip
index 80f16714c78..9186b95fdb6 100644
Binary files a/htdocs/install/doctemplates/websites/website_template-corporate.zip and b/htdocs/install/doctemplates/websites/website_template-corporate.zip differ
diff --git a/htdocs/install/doctemplates/websites/website_template-stellar.zip b/htdocs/install/doctemplates/websites/website_template-stellar.zip
index 5cf573d21d2..399a32e579d 100644
Binary files a/htdocs/install/doctemplates/websites/website_template-stellar.zip and b/htdocs/install/doctemplates/websites/website_template-stellar.zip differ
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 3a3adc2322c..ff983618c41 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -123,14 +123,10 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
                     $includeconferror = 'ErrorBadValueForDolibarrMainDBType';
                 }
             }
-        }
-        else
-        {
+        } else {
             $includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
         }
-    }
-    else
-    {
+    } else {
         $includeconferror = 'ErrorBadFormatForConfFile';
     }
 }
@@ -209,9 +205,7 @@ if (@file_exists($lockfile))
         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
-    {
+    } else {
         print 'If you always reach this page, you must remove install.lock file manually.<br>';
     }
     exit;
@@ -364,9 +358,7 @@ function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl
     {
         $jQueryCustomPath = $forcejqueryurl;
         $jQueryUiCustomPath = $forcejqueryurl;
-    }
-    else
-    {
+    } else {
         $jQueryCustomPath = (defined('JS_JQUERY') && constant('JS_JQUERY')) ? JS_JQUERY : false;
         $jQueryUiCustomPath = (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) ? JS_JQUERY_UI : false;
     }
@@ -547,11 +539,9 @@ function detect_dolibarr_main_url_root()
 		$proto = ((!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443)) ? 'https' : 'http';
 		if (!empty($_SERVER["HTTP_HOST"])) {
 			$serverport = $_SERVER["HTTP_HOST"];
-		}
-		elseif (!empty($_SERVER["SERVER_NAME"])) {
+		} elseif (!empty($_SERVER["SERVER_NAME"])) {
 			$serverport = $_SERVER["SERVER_NAME"];
-		}
-		else {
+		} else {
 			$serverport = 'localhost';
 		}
 		$dolibarr_main_url_root = $proto."://".$serverport.$_SERVER["SCRIPT_NAME"];
diff --git a/htdocs/install/lib/repair.lib.php b/htdocs/install/lib/repair.lib.php
index 9e58ac4230f..1a05dad1b77 100644
--- a/htdocs/install/lib/repair.lib.php
+++ b/htdocs/install/lib/repair.lib.php
@@ -40,8 +40,7 @@ function checkElementExist($id, $table)
 		$num = $db->num_rows($resql);
 		if ($num > 0) return true;
 		else return false;
-	}
-	else return true; // for security
+	} else return true; // for security
 }
 
 /**
@@ -131,14 +130,13 @@ function clean_data_ecm_directories()
 			$newlabel = dol_sanitizeFileName($label);
 			if ($label != $newlabel)
 			{
-				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set label='".$newlabel."' WHERE rowid=".$id;
+				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."ecm_directories set label='".$db->escape($newlabel)."' WHERE rowid=".$id;
 				print '<tr><td>'.$sqlupdate."</td></tr>\n";
 				$resqlupdate = $db->query($sqlupdate);
 				if (!$resqlupdate) dol_print_error($db, 'Failed to update');
 			}
 		}
-	}
-	else dol_print_error($db, 'Failed to run request');
+	} else dol_print_error($db, 'Failed to run request');
 
 	return;
 }
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index dee1200389c..eeca137dbc0 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -124,11 +124,25 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','mrp',660);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','mrp',661);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','mrp',662);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','mrp',663);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact address record','contact',51);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52);
+
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516);
+
 -- actions not enabled by default : they are excluded when we enable the module Agenda (except TASK_...)
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_CREATE','Task created','Executed when a project task is created','project',150);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',151);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',152);
+
diff --git a/htdocs/install/mysql/data/llx_c_actioncomm.sql b/htdocs/install/mysql/data/llx_c_actioncomm.sql
index 238a096fcb2..9a0d8c223b6 100644
--- a/htdocs/install/mysql/data/llx_c_actioncomm.sql
+++ b/htdocs/install/mysql/data/llx_c_actioncomm.sql
@@ -36,6 +36,7 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 2,'AC_FAX','system','Send Fax',NULL, 1, 3);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 4,'AC_EMAIL','system','Send Email',NULL, 1, 4);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 5,'AC_RDV','system','Rendez-vous',NULL, 1, 1);
+insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 6,'AC_EMAIL_IN','system','reception Email',NULL, 1, 4);
 insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values (11,'AC_INT','system','Intervention on site',NULL, 1, 4);
 -- Code kept for backward compatibility < 3.3 
 --insert into llx_c_actioncomm (id, code, type, libelle, module, active, position) values ( 3,'AC_PROP','systemauto', 'Send commercial proposal by email','propal',0,10);
diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index f417804ff93..253ace246e7 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -30,3 +30,5 @@ INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_u
 INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingEmailOnCancelation)'            ,50,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__',       '__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'adherent','member','',0,null,null,'(SendingAnEMailToMember)'               ,60,'$conf->adherent->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__',                     '__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'                    ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswerMessage)__<br>__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+
diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index 628d42d4144..a51b2bbd70f 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -326,3 +326,14 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (178,
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (178, '17804', 'Sociedad Civil', 1);
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (178, '17805', 'Sociedad Anónima', 1);
 
+-- Algeria (id country=13)
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1300','Personne physique');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1301','Société à responsabilité limitée (SARL)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1302','Entreprise unipersonnelle à responsabilité limitée (EURL)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1303','Société en Nom Collectif (SNC)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1304','société par actions (SPA)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1305','Société en Commandite Simple (SCS)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1306','Société en commandite par actions (SCA)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1307','Société en participation');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (13, '1308','Groupe de sociétés');
+
diff --git a/htdocs/install/mysql/data/llx_c_incoterms.sql b/htdocs/install/mysql/data/llx_c_incoterms.sql
index 3f2e4cbac2e..b77e58d1ae5 100644
--- a/htdocs/install/mysql/data/llx_c_incoterms.sql
+++ b/htdocs/install/mysql/data/llx_c_incoterms.sql
@@ -5,6 +5,7 @@
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
 -- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
+-- Copyright (C) 2020      Udo Tamm             <software@dolibit.de>
 --
 -- 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,21 +22,24 @@
 --
 --
 
+--
+-- Do not place a comment at the end of the line, this file is parsed when
+-- from the install and all '--' are removed.
 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
 
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('EXW', 'Ex Works, au départ non chargé, non dédouané sortie d''usine (uniquement adapté aux flux domestiques, nationaux)', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('FCA', 'Free Carrier, marchandises dédouanées et chargées dans le pays de départ, chez le vendeur ou chez le commissionnaire de transport de l''acheteur', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('FAS', 'Free Alongside Ship, sur le quai du port de départ', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('FOB', 'Free On Board, chargé sur le bateau, les frais de chargement dans celui-ci étant fonction du liner term indiqué par la compagnie maritime (à la charge du vendeur)', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CFR', 'Cost and Freight, chargé dans le bateau, livraison au port de départ, frais payés jusqu''au port d''arrivée, sans assurance pour le transport, non déchargé du navire à destination (les frais de déchargement sont inclus ou non au port d''arrivée)', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CIF', 'Cost, Insurance and Freight, chargé sur le bateau, frais jusqu''au port d''arrivée, avec l''assurance marchandise transportée souscrite par le vendeur pour le compte de l''acheteur', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CPT', 'Carriage Paid To, livraison au premier transporteur, frais jusqu''au déchargement du mode de transport, sans assurance pour le transport', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CIP', 'Carriage and Insurance Paid to, idem CPT, avec assurance marchandise transportée souscrite par le vendeur pour le compte de l''acheteur', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAT', 'Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l''acheteur)', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAP', 'Delivered At Place, marchandises (non déchargées) mises à disposition de l''acheteur dans le pays d''importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l''acheteur)', 1);
-INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l''acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)', 1);
-
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('EXW', 'Ex Works', 'Ex Works, au départ non chargé, non dédouané sortie d''usine (uniquement adapté aux flux domestiques, nationaux)', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('FCA', 'Free Carrier', 'Free Carrier, marchandises dédouanées et chargées dans le pays de départ, chez le vendeur ou chez le commissionnaire de transport de l''acheteur', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('FAS', 'Free Alongside Ship', 'Free Alongside Ship, sur le quai du port de départ', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('FOB', 'Free On Board', 'Free On Board, chargé sur le bateau, les frais de chargement dans celui-ci étant fonction du liner term indiqué par la compagnie maritime (à la charge du vendeur)', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('CFR', 'Cost and Freight', 'Cost and Freight, chargé dans le bateau, livraison au port de départ, frais payés jusqu''au port d''arrivée, sans assurance pour le transport, non déchargé du navire à destination (les frais de déchargement sont inclus ou non au port d''arrivée)', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('CIF', 'Cost, Insurance, Freight', 'Cost, Insurance and Freight, chargé sur le bateau, frais jusqu''au port d''arrivée, avec l''assurance marchandise transportée souscrite par le vendeur pour le compte de l''acheteur', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('CPT', 'Carriage Paid To', 'Carriage Paid To, livraison au premier transporteur, frais jusqu''au déchargement du mode de transport, sans assurance pour le transport', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('CIP', 'Carriage Insurance Paid', 'Carriage and Insurance Paid to, idem CPT, avec assurance marchandise transportée souscrite par le vendeur pour le compte de l''acheteur', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('DAT', 'Delivered At Terminal', 'Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l''acheteur)', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('DAP', 'Delivered At Place', 'Delivered At Place, marchandises (non déchargées) mises à disposition de l''acheteur dans le pays d''importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l''acheteur)', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('DDP', 'Delivered Duty Paid', 'Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l''acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)', 1);
+INSERT INTO llx_c_incoterms (code, label, libelle, active) VALUES ('DPU', 'Delivered at Place Unloaded', 'Delivered at Place unloaded', 1);
diff --git a/htdocs/install/mysql/data/llx_c_prospectcontactlevel.sql b/htdocs/install/mysql/data/llx_c_prospectcontactlevel.sql
new file mode 100644
index 00000000000..b45239ca992
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_prospectcontactlevel.sql
@@ -0,0 +1,31 @@
+-- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+--
+-- Prospect level for contacts
+--
+
+--delete from llx_c_prospectcontactlevel;
+insert into llx_c_prospectcontactlevel (code,label,sortorder) values ('PL_NONE',      'None',     1);
+insert into llx_c_prospectcontactlevel (code,label,sortorder) values ('PL_LOW',       'Low',      2);
+insert into llx_c_prospectcontactlevel (code,label,sortorder) values ('PL_MEDIUM',    'Medium',   3);
+insert into llx_c_prospectcontactlevel (code,label,sortorder) values ('PL_HIGH',      'High',     4);
diff --git a/htdocs/install/mysql/data/llx_c_stcommcontact.sql b/htdocs/install/mysql/data/llx_c_stcommcontact.sql
new file mode 100644
index 00000000000..53e6aad1cca
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_stcommcontact.sql
@@ -0,0 +1,32 @@
+-- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+--
+-- Types action st for contacts
+--
+
+delete from llx_c_stcommcontact;
+insert into llx_c_stcommcontact (id,code,libelle) values (-1, 'ST_NO',    'Do not contact');
+insert into llx_c_stcommcontact (id,code,libelle) values ( 0, 'ST_NEVER', 'Never contacted');
+insert into llx_c_stcommcontact (id,code,libelle) values ( 1, 'ST_TODO',  'To contact');
+insert into llx_c_stcommcontact (id,code,libelle) values ( 2, 'ST_PEND',  'Contact in progress');
+insert into llx_c_stcommcontact (id,code,libelle) values ( 3, 'ST_DONE',  'Contacted');
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 8138711e8a0..831097ebf48 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -360,6 +360,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (23
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2322,232,    '12','0','VAT 12%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2323,232,     '8','0','VAT 8%',1);
 
+-- ALGERIA(id country=13)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 131, 13,     '0','0','TVA 0%',   1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 13,  '9','0','TVA 9%',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 13,     '19','0','TVA 19%',   1);
 
 
 -- Example of code to insert a vat rate 0 for each country
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index ced4a0d8427..99da23f53a5 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -97,3 +97,9 @@ insert into llx_const (name, value, type, visible, entity) VALUES ('CONTRACT_ADD
 insert into llx_const (name, value, type, visible, entity) VALUES ('USERGROUP_ADDON_PDF_ODT_PATH', 'DOL_DATA_ROOT/doctemplates/usergroups', 'chaine', 0, 1);
 insert into llx_const (name, value, type, visible, entity) VALUES ('USER_ADDON_PDF_ODT_PATH',      'DOL_DATA_ROOT/doctemplates/users', 'chaine', 0, 1);
 
+
+--
+-- PRODUCTS
+--
+INSERT INTO llx_const (name, entity, value, type, visible) VALUES ('PRODUCT_PRICE_BASE_TYPE', 0, 'HT', 'string', 0);
+
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index b66d205ef40..9bb097d10b2 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -119,7 +119,7 @@ ALTER TABLE llx_categorie_warehouse ADD CONSTRAINT fk_categorie_warehouse_fk_war
 create table llx_holiday_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -135,7 +135,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 create table llx_entrepot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -165,7 +165,7 @@ ALTER TABLE llx_events ADD COLUMN prefix_session varchar(255) NULL;
 create table llx_payment_salary_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- salary payment id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -183,8 +183,8 @@ ALTER TABLE llx_oauth_token ADD COLUMN fk_soc integer DEFAULT NULL after token;
 
 ALTER TABLE llx_adherent_type ADD COLUMN duration varchar(6) DEFAULT NULL after morphy;
 
-ALTER TABLE llx_mailing ADD COLUMN tms timestamp;
-ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp;
+ALTER TABLE llx_mailing ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_projet ADD COLUMN usage_opportunity integer DEFAULT 0;
 ALTER TABLE llx_projet ADD COLUMN usage_task integer DEFAULT 1;
@@ -458,7 +458,7 @@ create table llx_c_shipment_package_type
 
 CREATE TABLE llx_product_fournisseur_price_extrafields (
 	rowid               integer AUTO_INCREMENT PRIMARY KEY,
-	tms                 timestamp,
+	tms                 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_object           integer NOT NULL,
 	import_key          varchar(14) -- import key
 ) ENGINE=innodb;
@@ -478,7 +478,7 @@ CREATE TABLE llx_mrp_mo(
     note_private text,
     date_creation datetime NOT NULL,
     date_valid datetime NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_user_creat integer NOT NULL,
     fk_user_modif integer,
     fk_user_valid integer,
@@ -514,7 +514,7 @@ ALTER TABLE llx_mrp_mo ADD INDEX idx_mrp_mo_fk_project (fk_project);
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -551,7 +551,7 @@ CREATE TABLE llx_mrp_production(
 	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
 	fk_stock_movement integer,		-- id of stock movement when movements are validated
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14)
@@ -576,7 +576,7 @@ ALTER TABLE llx_facture_rec MODIFY COLUMN fk_cond_reglement integer NOT NULL DEF
 create table llx_commande_fournisseur_dispatch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -587,7 +587,7 @@ ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande
 create table llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 994e5d89495..488548ae8b1 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -36,7 +36,7 @@ UPDATE llx_c_units set scale = 86400 where code = 'D' and unit_type = 'time';
 create table llx_commande_fournisseur_dispatch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -57,7 +57,7 @@ create table llx_c_shipment_package_type
 create table llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -69,7 +69,7 @@ ALTER TABLE llx_facture_rec MODIFY COLUMN titre varchar(200) NOT NULL;
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -303,7 +303,7 @@ ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_
 ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_website_page_rowid FOREIGN KEY (fk_website_page) REFERENCES llx_website_page (rowid);
 
 ALTER TABLE llx_categorie ADD COLUMN date_creation	datetime;
-ALTER TABLE llx_categorie ADD COLUMN tms     		timestamp;
+ALTER TABLE llx_categorie ADD COLUMN tms     		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_categorie ADD COLUMN fk_user_creat	integer;
 ALTER TABLE llx_categorie ADD COLUMN fk_user_modif	integer;
 
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
new file mode 100644
index 00000000000..8820fe1968c
--- /dev/null
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -0,0 +1,368 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 13.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex
+-- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (postgres):
+-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
+-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
+-- -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN rowid SET DEFAULT nextval('llx_table_rowid_seq');
+-- -- VPGSQL8.2 SELECT setval('llx_table_rowid_seq', MAX(rowid)) FROM llx_table;
+-- To set a field as NULL:                     -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL;
+-- To set a field as NULL:                     -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL;
+-- To set a field as NOT NULL:                 -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL;
+-- To set a field as NOT NULL:                 -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL;
+-- To set a field as default NULL:             -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL;
+-- Note: fields with type BLOB/TEXT can't have default value.
+
+
+-- Missing in v12 or lower
+
+ALTER TABLE llx_payment_salary MODIFY COLUMN ref varchar(30) NULL;
+ALTER TABLE llx_payment_various MODIFY COLUMN ref varchar(30) NULL;
+
+ALTER TABLE llx_prelevement_bons ADD COLUMN type varchar(16) DEFAULT 'debit-order';
+
+ALTER TABLE llx_prelevement_facture_demande ADD INDEX idx_prelevement_facture_demande_fk_facture (fk_facture);
+ALTER TABLE llx_prelevement_facture_demande ADD INDEX idx_prelevement_facture_demande_fk_facture_fourn (fk_facture_fourn);
+
+ALTER TABLE llx_document_model MODIFY COLUMN type varchar(64);
+
+ALTER TABLE llx_bom_bom MODIFY COLUMN duration double(24,8);
+
+ALTER TABLE llx_bom_bom_extrafields ADD INDEX idx_bom_bom_extrafields_fk_object (fk_object);
+
+create table llx_mrp_mo_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                                 -- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_mrp_mo_extrafields DROP INDEX idx_fk_object;
+
+ALTER TABLE llx_mrp_mo_extrafields ADD INDEX idx_mrp_mo_fk_object(fk_object);
+
+
+-- For v13
+
+ALTER TABLE llx_bom_bom ADD COLUMN bomtype integer DEFAULT 0;
+
+UPDATE llx_emailcollector_emailcollector SET ref = 'Collect_Ticket_Requests' WHERE ref = 'Collect_Ticket_Requets';
+UPDATE llx_emailcollector_emailcollector SET ref = 'Collect_Responses_In' WHERE ref = 'Collect_Responses';
+
+
+UPDATE llx_document_model set nom = 'standard' where nom = 'Standard' and type ='stock';
+UPDATE llx_document_model set nom = 'stdmovement', type = 'movement' where nom = 'StdMouvement' and type ='mouvement';
+
+
+UPDATE llx_const SET value = 0 WHERE name = 'FACTURE_TVAOPTION' and value = 'franchise';
+UPDATE llx_const SET value = 1 WHERE name = 'FACTURE_TVAOPTION' and value <> 'franchise' AND value <> '0' AND value <> '1';
+
+ALTER TABLE llx_commande MODIFY COLUMN date_livraison DATETIME;
+
+ALTER TABLE llx_website ADD COLUMN position integer DEFAULT 0;
+
+ALTER TABLE llx_establishment ADD COLUMN ref varchar(30);
+ALTER TABLE llx_establishment ADD COLUMN label varchar(128);
+UPDATE llx_establishment SET ref = rowid WHERE ref IS NULL;
+ALTER TABLE llx_establishment MODIFY COLUMN ref varchar(30) NOT NULL;
+ALTER TABLE llx_establishment MODIFY COLUMN label varchar(128);
+
+INSERT INTO llx_const (name, entity, value, type, visible) VALUES ('PRODUCT_PRICE_BASE_TYPE', 0, 'HT', 'string', 0);
+
+ALTER TABLE llx_subscription MODIFY COLUMN datef DATETIME;
+
+ALTER TABLE llx_loan_schedule ADD column fk_payment_loan INTEGER;
+
+
+ALTER TABLE llx_user DROP COLUMN jabberid;
+ALTER TABLE llx_user DROP COLUMN skype;
+ALTER TABLE llx_user DROP COLUMN twitter;
+ALTER TABLE llx_user DROP COLUMN facebook;
+ALTER TABLE llx_user DROP COLUMN linkedin;
+ALTER TABLE llx_user DROP COLUMN instagram;
+ALTER TABLE llx_user DROP COLUMN snapchat;
+ALTER TABLE llx_user DROP COLUMN googleplus;
+ALTER TABLE llx_user DROP COLUMN youtube;
+ALTER TABLE llx_user DROP COLUMN whatsapp;
+
+ALTER TABLE llx_user ADD COLUMN datestartvalidity datetime;
+ALTER TABLE llx_user ADD COLUMN dateendvalidity   datetime;
+
+ALTER TABLE llx_c_incoterms ADD COLUMN label varchar(100) NULL;
+
+
+
+CREATE TABLE llx_recruitment_recruitmentjobposition(
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
+	entity INTEGER DEFAULT 1 NOT NULL,
+	label varchar(255) NOT NULL,
+	qty integer DEFAULT 1 NOT NULL,
+	fk_soc integer,
+	fk_project integer,
+	fk_user_recruiter integer,
+	fk_user_supervisor integer,
+	fk_establishment integer,
+	date_planned date,
+	remuneration_suggested varchar(255),
+	description text,
+	note_public text,
+	note_private text,
+	date_creation datetime NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer,
+	last_main_doc varchar(255),
+	import_key varchar(14),
+	model_pdf varchar(255),
+	status smallint NOT NULL
+) ENGINE=innodb;
+
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_rowid (rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_ref (ref);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_fk_soc (fk_soc);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_fk_project (fk_project);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD CONSTRAINT llx_recruitment_recruitmentjobposition_fk_user_recruiter FOREIGN KEY (fk_user_recruiter) REFERENCES llx_user(rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD CONSTRAINT llx_recruitment_recruitmentjobposition_fk_user_supervisor FOREIGN KEY (fk_user_supervisor) REFERENCES llx_user(rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD CONSTRAINT llx_recruitment_recruitmentjobposition_fk_establishment FOREIGN KEY (fk_establishment) REFERENCES llx_establishment(rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD CONSTRAINT llx_recruitment_recruitmentjobposition_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_status (status);
+
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD COLUMN email_recruiter varchar(255);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD COLUMN entity INTEGER DEFAULT 1 NOT NULL;
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD COLUMN remuneration_suggested varchar(255);
+
+create table llx_recruitment_recruitmentjobposition_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD INDEX idx_recruitmentjobposition_fk_object(fk_object);
+
+
+
+CREATE TABLE llx_recruitment_recruitmentcandidature(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	entity integer NOT NULL DEFAULT 1,
+	fk_recruitmentjobposition INTEGER NULL,
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
+	description text,
+	note_public text,
+	note_private text,
+	date_creation datetime NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_creat integer NOT NULL,
+	fk_user_modif integer,
+	import_key varchar(14),
+	model_pdf varchar(255),
+	status smallint NOT NULL,
+	firstname varchar(128),
+	lastname varchar(128),
+	email varchar(255),
+	phone varchar(64),
+	date_birth date,
+	remuneration_requested integer,
+	remuneration_proposed integer,
+	email_msgid varchar(255),
+	fk_recruitment_origin INTEGER NULL
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
+
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN entity integer NOT NULL DEFAULT 1;
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN email_msgid varchar(255);
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN fk_recruitment_origin INTEGER NULL;
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN date_birth date;
+
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_rowid (rowid);
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_ref (ref);
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD CONSTRAINT llx_recruitment_recruitmentcandidature_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_status (status);
+
+create table llx_recruitment_recruitmentcandidature_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields ADD INDEX idx_recruitmentcandidature_fk_object(fk_object);
+
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD UNIQUE INDEX uk_recruitmentcandidature_email_msgid(email_msgid);
+
+
+ALTER TABLE llx_product_attribute ADD COLUMN ref_ext VARCHAR(255) after ref;
+ALTER TABLE llx_product_attribute_combination ADD COLUMN variation_ref_ext varchar(255) AFTER variation_weight;
+
+
+CREATE TABLE llx_product_attribute_combination_price_level
+(
+  rowid INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_attribute_combination INTEGER DEFAULT 1 NOT NULL,
+  fk_price_level INTEGER DEFAULT 1 NOT NULL,
+  variation_price DOUBLE(24,8) NOT NULL,
+  variation_price_percentage INTEGER NULL
+)ENGINE=innodb;
+
+ALTER TABLE llx_product_attribute_combination_price_level ADD UNIQUE( fk_product_attribute_combination, fk_price_level);
+
+
+
+-- Add dictionary for prospect level and action commercial on contacts (Using this is not recommanded)
+
+create table llx_c_prospectcontactlevel
+(
+  code            varchar(12) PRIMARY KEY,
+  label           varchar(30),
+  sortorder       smallint,
+  active          smallint    DEFAULT 1 NOT NULL,
+  module          varchar(32) NULL
+) ENGINE=innodb;
+insert into llx_c_prospectcontactlevel (code,label,sortorder) values ('PL_NONE',      'None',     1);
+insert into llx_c_prospectcontactlevel (code,label,sortorder) values ('PL_LOW',       'Low',      2);
+insert into llx_c_prospectcontactlevel (code,label,sortorder) values ('PL_MEDIUM',    'Medium',   3);
+insert into llx_c_prospectcontactlevel (code,label,sortorder) values ('PL_HIGH',      'High',     4);
+
+create table llx_c_stcommcontact
+(
+  id       integer      PRIMARY KEY,
+  code     varchar(12)  NOT NULL,
+  libelle  varchar(30),
+  picto    varchar(128),
+  active   tinyint default 1  NOT NULL
+)ENGINE=innodb;
+ALTER TABLE llx_c_stcommcontact ADD UNIQUE INDEX uk_c_stcommcontact(code);
+
+insert into llx_c_stcommcontact (id,code,libelle) values (-1, 'ST_NO',    'Do not contact');
+insert into llx_c_stcommcontact (id,code,libelle) values ( 0, 'ST_NEVER', 'Never contacted');
+insert into llx_c_stcommcontact (id,code,libelle) values ( 1, 'ST_TODO',  'To contact');
+insert into llx_c_stcommcontact (id,code,libelle) values ( 2, 'ST_PEND',  'Contact in progress');
+insert into llx_c_stcommcontact (id,code,libelle) values ( 3, 'ST_DONE',  'Contacted');
+
+ALTER TABLE llx_socpeople ADD COLUMN fk_prospectcontactlevel varchar(12) AFTER priv;
+ALTER TABLE llx_socpeople ADD COLUMN fk_stcommcontact integer DEFAULT 0 NOT NULL AFTER fk_prospectcontactlevel;
+
+create table llx_c_recruitment_origin
+(
+  rowid      	integer AUTO_INCREMENT PRIMARY KEY,
+  code          varchar(32) NOT NULL,
+  label 	    varchar(64)	NOT NULL,
+  active  	    tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
+
+
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD UNIQUE INDEX uk_recruitmentcandidature_email_msgid(email_msgid);
+
+
+ALTER TABLE llx_product MODIFY COLUMN seuil_stock_alerte float;
+ALTER TABLE llx_product MODIFY COLUMN desiredstock float;
+ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN seuil_stock_alerte float;
+ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN desiredstock float;
+
+ALTER TABLE llx_product ADD COLUMN fk_state integer DEFAULT NULL;
+
+ALTER TABLE llx_projet ADD COLUMN email_msgid varchar(255);
+ALTER TABLE llx_ticket ADD COLUMN email_msgid varchar(255);
+ALTER TABLE llx_actioncomm ADD COLUMN reply_to varchar(255);
+
+ALTER TABLE llx_paiement ADD pos_change DOUBLE(24,8) DEFAULT 0 AFTER fk_export_compta;
+
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52);
+
+ALTER TABLE llx_ecm_directories CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE llx_ecm_files CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+
+INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'                    ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswer)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
+
+ALTER TABLE llx_c_action_trigger MODIFY COLUMN code varchar(64) NOT NULL;
+
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516);
+
+ALTER TABLE llx_actioncomm_reminder ADD COLUMN entity integer NOT NULL DEFAULT 1;
+ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_actioncomm integer NOT NULL;
+ALTER TABLE llx_actioncomm_reminder ADD COLUMN fk_email_template integer;
+
+ALTER TABLE llx_actioncomm_reminder DROP INDEX uk_actioncomm_reminder_unique;
+ALTER TABLE llx_actioncomm_reminder ADD UNIQUE uk_actioncomm_reminder_unique (fk_user, typeremind, offsetvalue, offsetunit, fk_actioncomm);
+
+ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_status (status);
+
+
+ALTER TABLE llx_inventorydet ADD UNIQUE uk_inventorydet(fk_inventory, fk_warehouse, fk_product, batch);
+
+ALTER TABLE llx_commandedet ADD COLUMN ref_ext varchar(255) AFTER label;
+ALTER TABLE llx_facturedet ADD COLUMN ref_ext varchar(255) AFTER multicurrency_total_ttc;
+
+ALTER TABLE llx_c_ticket_category ADD COLUMN fk_parent integer DEFAULT 0 NOT NULL;
+ALTER TABLE llx_c_ticket_category ADD COLUMN force_severity varchar(32) NULL;
+
+ALTER TABLE llx_expensereport_ik ADD COLUMN ikoffset double DEFAULT 0 NOT NULL;
+
+ALTER TABLE llx_paiement ADD COLUMN ref_ext varchar(255) AFTER ref;
+
+ALTER TABLE llx_bank ADD COLUMN origin_id integer;
+ALTER TABLE llx_bank ADD COLUMN origin_type varchar(64) NULL;
+ALTER TABLE llx_bank ADD COLUMN import_key varchar(14);
+
+ALTER TABLE llx_menu MODIFY COLUMN enabled text;
+
+CREATE TABLE llx_ecm_files_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                             -- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_ecm_files_extrafields ADD INDEX idx_ecm_files_extrafields (fk_object);
+
+CREATE TABLE llx_ecm_directories_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                             -- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_ecm_directories_extrafields ADD INDEX idx_ecm_directories_extrafields (fk_object);
+ALTER TABLE llx_website_page ADD COLUMN object_type varchar(255);
+ALTER TABLE llx_website_page ADD COLUMN fk_object varchar(255);
+
+DELETE FROM llx_const WHERE name in ('MAIN_INCLUDE_ZERO_VAT_IN_REPORTS');
+
+UPDATE llx_projet_task_time SET tms = null WHERE tms = 0;
+ALTER TABLE llx_projet_task_time MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+
+ALTER TABLE llx_projet_task_time MODIFY COLUMN datec datetime;
+
+DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous'); 
+DELETE FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous';
+
diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
index a4ab666299d..4104d74da51 100644
--- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
+++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
@@ -419,19 +419,19 @@ update llx_actioncomm set elementtype='order' where elementtype='commande';
 update llx_actioncomm set elementtype='contract' where elementtype='contrat';
 
 
-alter table llx_propal add column   tms             timestamp after fk_projet;
+alter table llx_propal add column   tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after fk_projet;
 
 
 create table llx_product_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL
 ) ENGINE=innodb;
 create table llx_societe_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL
 ) ENGINE=innodb;
 
@@ -487,7 +487,7 @@ ALTER TABLE llx_don ADD   phone           varchar(24) after email;
 ALTER TABLE llx_element_element MODIFY sourcetype varchar(32) NOT NULL;
 ALTER TABLE llx_element_element MODIFY targettype varchar(32) NOT NULL;
 
-ALTER TABLE llx_societe_prices MODIFY tms timestamp NULL;
+ALTER TABLE llx_societe_prices MODIFY tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 -- ALTER TABLE llx_societe_prices ALTER COLUMN tms DROP NOT NULL;
 
 -- Fix: It seems this is missing for some users
diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
index 044b1652029..c7356cc18ff 100644
--- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
+++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
@@ -62,7 +62,7 @@ ALTER TABLE llx_societe MODIFY code_compta varchar(24);
 ALTER TABLE llx_societe MODIFY code_compta_fournisseur varchar(24);
 
   
-ALTER TABLE llx_chargesociales ADD COLUMN tms                   timestamp;
+ALTER TABLE llx_chargesociales ADD COLUMN tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_chargesociales ADD COLUMN date_creation         datetime; 
 ALTER TABLE llx_chargesociales ADD COLUMN date_valid            datetime;
 
@@ -118,7 +118,7 @@ CREATE TABLE llx_localtax
 (
 	rowid			integer		AUTO_INCREMENT PRIMARY KEY,
 	entity			integer			NOT NULL DEFAULT '1',
-	tms				timestamp,
+	tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datep			date			DEFAULT NULL,
 	datev			date			DEFAULT NULL,
 	amount			double			NOT NULL DEFAULT '0',
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index c0efe6d68b3..07b390f32c4 100644
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -39,7 +39,7 @@ ALTER TABLE llx_societe DROP COLUMN description;
 ALTER TABLE llx_societe DROP COLUMN services;
 ALTER TABLE llx_societe MODIFY COLUMN ref_ext varchar(128);
 
-ALTER TABLE llx_bank ADD COLUMN tms timestamp after datec;
+ALTER TABLE llx_bank ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after datec;
   
 -- Monaco VAT Rates
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 271,  27,'19.6','0','VAT standard rate (France hors DOM-TOM)',1);
@@ -267,7 +267,7 @@ ALTER TABLE llx_extrafields ADD COLUMN fieldrequired INTEGER DEFAULT 0;
 create table llx_socpeople_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -276,7 +276,7 @@ ALTER TABLE llx_socpeople_extrafields ADD INDEX idx_socpeople_extrafields (fk_ob
 create table llx_actioncomm_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -835,7 +835,7 @@ CREATE TABLE llx_product_price_by_qty
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
   fk_product_price	integer NOT NULL,
-  date_price		timestamp,
+  date_price		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   price			double (24,8) DEFAULT 0,
   price_ttc		double (24,8) DEFAULT 0,
   qty_min		real DEFAULT 0
@@ -910,7 +910,7 @@ ALTER TABLE llx_bank_account MODIFY COLUMN code_banque varchar(8);
 create table llx_user_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- member id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
index 88d9ae1b685..edc2c931ee1 100644
--- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
+++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
@@ -23,7 +23,7 @@ ALTER TABLE llx_menu MODIFY COLUMN leftmenu varchar(100);
 create table llx_adherent_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -115,7 +115,7 @@ ALTER TABLE llx_c_shipment_mode ADD COLUMN tracking VARCHAR(255) NOT NULL DEFAUL
 
 -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
 -- VPGSQL8.2 DROP table llx_c_shipment_mode;
--- VPGSQL8.2 CREATE TABLE llx_c_shipment_mode (rowid SERIAL PRIMARY KEY, tms timestamp, code varchar(30) NOT NULL, libelle varchar(50) NOT NULL, description text, tracking varchar(255) NOT NULL, active integer DEFAULT 0, module varchar(32) NULL);
+-- VPGSQL8.2 CREATE TABLE llx_c_shipment_mode (rowid SERIAL PRIMARY KEY, tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, code varchar(30) NOT NULL, libelle varchar(50) NOT NULL, description text, tracking varchar(255) NOT NULL, active integer DEFAULT 0, module varchar(32) NULL);
 -- VPGSQL8.2 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','Catch','Catch by client','',1);
 -- VPGSQL8.2 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Transporter','Generic transporter','',1);
 -- VPGSQL8.2 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi','',0);
@@ -136,7 +136,7 @@ ALTER TABLE llx_stock_mouvement MODIFY COLUMN value real;
 create table llx_propal_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -145,7 +145,7 @@ ALTER TABLE llx_propal_extrafields ADD INDEX idx_propal_extrafields (fk_object);
 create table llx_facture_extrafields
 (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) -- import key
 ) ENGINE=innodb;
@@ -205,7 +205,7 @@ ALTER TABLE llx_facturedet DROP COLUMN fk_export_compta;
 CREATE TABLE llx_cronjob 
 (
 	rowid 			integer AUTO_INCREMENT PRIMARY KEY,
-	tms 			timestamp,
+	tms 			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 			datetime,
 	jobtype			varchar(10) NOT NULL,
   	label 			text NOT NULL,
@@ -249,7 +249,7 @@ DROP TABLE llx_printer_ipp;
 CREATE TABLE llx_printer_ipp 
 (
 	rowid integer AUTO_INCREMENT PRIMARY KEY,
-	tms 	timestamp,
+	tms 	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 	datetime,
 	printer_name text NOT NULL, 
 	printer_location text NOT NULL,
@@ -265,7 +265,7 @@ ALTER TABLE llx_adherent MODIFY COLUMN ref_ext varchar(128);
 create table llx_commande_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -299,7 +299,7 @@ ALTER TABLE llx_socpeople CHANGE COLUMN note note_private text;
 create table llx_projet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -308,7 +308,7 @@ ALTER TABLE llx_projet_extrafields ADD INDEX idx_projet_extrafields (fk_object);
 create table llx_projet_task_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -319,7 +319,7 @@ CREATE TABLE llx_opensurvey_comments (
     id_comment INTEGER unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
     id_sondage CHAR(16) NOT NULL,
     comment text NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     usercomment text
 ) ENGINE=InnoDB;
 
@@ -336,7 +336,7 @@ CREATE TABLE llx_opensurvey_sondage (
        survey_link_visible integer DEFAULT 1,
 	   canedit integer DEFAULT 0,
        origin varchar(64),
-       tms timestamp,
+       tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	   sujet TEXT
 ) ENGINE=InnoDB;
 CREATE TABLE llx_opensurvey_user_studs (
@@ -344,7 +344,7 @@ CREATE TABLE llx_opensurvey_user_studs (
     nom VARCHAR(64) NOT NULL,
     id_sondage VARCHAR(16) NOT NULL,
     reponses VARCHAR(100) NOT NULL,
-    tms timestamp
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=InnoDB;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN id_sondage_admin CHAR(24);
@@ -367,7 +367,7 @@ UPDATE llx_extrafields SET elementtype='societe' WHERE elementtype='company';
 create table llx_commande_fournisseur_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -376,7 +376,7 @@ ALTER TABLE llx_commande_fournisseur_extrafields ADD INDEX idx_commande_fourniss
 create table llx_facture_fourn_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
index c6dc0ff9bd7..af3ea13fa5c 100644
--- a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
+++ b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
@@ -43,7 +43,7 @@ ALTER TABLE llx_socpeople ADD COLUMN statut tinyint DEFAULT 1 NOT NULL AFTER imp
 create table llx_fichinter_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -55,7 +55,7 @@ ALTER TABLE llx_product ADD COLUMN desiredstock integer DEFAULT 0;
 create table llx_commandedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    
   import_key       varchar(14)      	
 )ENGINE=innodb;
@@ -69,7 +69,7 @@ ALTER TABLE llx_facturedet_rec ADD COLUMN info_bits	integer DEFAULT 0 after tota
 create table llx_facturedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -79,7 +79,7 @@ ALTER TABLE llx_facturedet_extrafields ADD INDEX idx_facturedet_extrafields (fk_
 create table llx_propaldet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -314,7 +314,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 
 -- Add ref_ext on bordereau_cheque
 ALTER TABLE llx_bordereau_cheque ADD ref_ext VARCHAR(255);
-ALTER TABLE llx_bordereau_cheque ADD tms timestamp;
+ALTER TABLE llx_bordereau_cheque ADD tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 
 -- Task 1011
@@ -337,7 +337,7 @@ ALTER TABLE llx_contratdet ADD column product_type integer DEFAULT 1 after total
 create table llx_contrat_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
index 5727b946bcb..32ed4c32538 100644
--- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
+++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -74,7 +74,7 @@ ALTER TABLE llx_bookmark MODIFY COLUMN url varchar(255) NOT NULL;
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
--- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+-- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
@@ -108,7 +108,7 @@ create table llx_product_customer_price
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec					datetime,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer NOT NULL,
   fk_soc				integer NOT NULL,
   price						double(24,8) DEFAULT 0,
@@ -164,7 +164,7 @@ ALTER TABLE llx_product ADD COLUMN tobatch tinyint DEFAULT 0 NOT NULL;
 
 CREATE TABLE llx_product_batch (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product_stock integer NOT NULL,
   eatby datetime DEFAULT NULL,
   sellby datetime DEFAULT NULL,
@@ -187,7 +187,7 @@ CREATE TABLE llx_expeditiondet_batch (
 --DROP TABLE llx_payment_salary
 CREATE TABLE llx_payment_salary (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user integer NOT NULL,
   datep date,
   datev date,
@@ -229,7 +229,7 @@ ALTER TABLE llx_projet_task_time ADD thm double(24,8) AFTER fk_user;
 create table llx_categories_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -283,7 +283,7 @@ CREATE TABLE llx_resource
   fk_code_type_resource varchar(32),
   note_public     		text,
   note_private    		text,
-  tms         			timestamp
+  tms         			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_resource ADD INDEX fk_code_type_resource_idx (fk_code_type_resource);
@@ -298,7 +298,7 @@ CREATE TABLE llx_element_resources
   busy			  integer,
   mandatory		  integer,
   fk_user_create   integer,
-  tms             timestamp
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_element_resources ADD UNIQUE INDEX idx_element_resources_idx1 (resource_id, resource_type, element_id, element_type);
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 6dc2521ca5d..640f22e4bee 100644
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -137,7 +137,7 @@ DROP TABLE llx_compta_compte_generaux;
 -- Align size for accounting account
 ALTER TABLE llx_accountingaccount MODIFY COLUMN account_number varchar(32);
 ALTER TABLE llx_accountingaccount MODIFY COLUMN account_parent varchar(32);
-ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec;
+ALTER TABLE llx_accountingaccount add column tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER datec;
 ALTER TABLE llx_accountingdebcred MODIFY COLUMN account_number varchar(32);
 ALTER TABLE llx_bank_account MODIFY COLUMN account_number varchar(32);
 ALTER TABLE llx_c_chargesociales MODIFY COLUMN accountancy_code varchar(32);
@@ -233,7 +233,7 @@ create table llx_accounting_fiscalyear
 	statut			tinyint DEFAULT 0 NOT NULL,
 	entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
 	datec			datetime NOT NULL,
-	tms				timestamp,
+	tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_author	integer NULL,
 	fk_user_modif	integer NULL
 )ENGINE=innodb;
@@ -1050,7 +1050,7 @@ create table llx_c_email_templates
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   fk_user         integer,                        -- Id utilisateur si modele prive, sinon null
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(255),					  -- Label of predefined email
   position        smallint,					      -- Position
   active          tinyint DEFAULT 1  NOT NULL,
@@ -1112,7 +1112,7 @@ ALTER TABLE llx_projet_task MODIFY COLUMN planned_workload real DEFAULT 0 NULL;
 CREATE TABLE llx_fichinterdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -1121,7 +1121,7 @@ ALTER TABLE llx_fichinterdet_extrafields ADD INDEX idx_ficheinterdet_extrafields
 
 CREATE TABLE llx_usergroup_extrafields (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index ca677fc5224..00bf30f6672 100644
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -49,7 +49,7 @@ create table llx_loan
   rowid							integer AUTO_INCREMENT PRIMARY KEY,
   entity						integer DEFAULT 1 NOT NULL,
   datec							datetime,
-  tms							timestamp,
+  tms							timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label							varchar(80) NOT NULL,
   fk_bank						integer,
   capital						real     DEFAULT 0 NOT NULL,
@@ -75,7 +75,7 @@ create table llx_payment_loan
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,
   amount_capital	real DEFAULT 0,
   amount_insurance	real DEFAULT 0,
@@ -145,7 +145,7 @@ ALTER TABLE llx_product ADD COLUMN lifo double(24,8) AFTER fifo;
 CREATE TABLE llx_printing
 (
  rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  datec datetime,
  printer_name text NOT NULL,
  printer_location text NOT NULL,
@@ -177,7 +177,7 @@ DELETE from llx_const where name = 'MAIN_USE_JQUERY_MULTISELECT' and value = '1'
 create table llx_bank_account_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -198,7 +198,7 @@ ALTER TABLE llx_bank_account_extrafields ADD INDEX idx_bank_account_extrafields
 create table llx_contratdet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -210,7 +210,7 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN delivery_time_days integer;
 
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN comment	varchar(255);
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN status integer;
-ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN tms timestamp;
+ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN batch varchar(30) DEFAULT NULL;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN eatby date DEFAULT NULL;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN sellby date DEFAULT NULL;
@@ -240,7 +240,7 @@ CREATE TABLE llx_expensereport (
   date_approve		datetime,
   date_refuse 		datetime,
   date_cancel 		datetime,
-  tms 		 		timestamp,
+  tms 		 		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_author 	integer NOT NULL,
   fk_user_modif 	integer DEFAULT NULL,
   fk_user_valid 	integer DEFAULT NULL,
@@ -297,7 +297,7 @@ create table llx_payment_expensereport
   rowid                   integer AUTO_INCREMENT PRIMARY KEY,
   fk_expensereport        integer,
   datec                   datetime,           -- date de creation
-  tms                     timestamp,
+  tms                     timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep                   datetime,           -- payment date
   amount                  real DEFAULT 0,
   fk_typepayment          integer NOT NULL,
@@ -316,7 +316,7 @@ ALTER TABLE llx_societe ADD COLUMN name_alias varchar(128) NULL;
 create table llx_commande_fournisseurdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -327,7 +327,7 @@ ALTER TABLE llx_commande_fournisseurdet_extrafields ADD INDEX idx_commande_fourn
 create table llx_facture_fourn_det_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -357,7 +357,7 @@ CREATE TABLE llx_askpricesupplier (
   ref_int varchar(255) DEFAULT NULL,
   fk_soc integer DEFAULT NULL,
   fk_projet integer DEFAULT NULL,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec datetime DEFAULT NULL,
   date_valid datetime DEFAULT NULL,
   date_cloture datetime DEFAULT NULL,
@@ -422,14 +422,14 @@ CREATE TABLE llx_askpricesupplierdet (
 
 CREATE TABLE llx_askpricesupplier_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
 
 CREATE TABLE llx_askpricesupplierdet_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
@@ -491,7 +491,7 @@ ALTER TABLE llx_don CHANGE COLUMN fk_project fk_projet integer NULL;
 create table llx_don_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -503,7 +503,7 @@ create table llx_payment_donation
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_donation     integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          real DEFAULT 0,
   fk_typepayment  integer NOT NULL,
@@ -585,7 +585,7 @@ CREATE TABLE IF NOT EXISTS llx_propal_merge_pdf_product (
   fk_user_author integer DEFAULT NULL,
   fk_user_mod integer NOT NULL,
   datec datetime NOT NULL,
-  tms timestamp NOT NULL,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=InnoDB;
 
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index f749e57b432..363288708d4 100644
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -146,7 +146,7 @@ CREATE TABLE llx_ecm_files
   cover             text,                           -- is this file a file to use for a cover
   extraparams		varchar(255),					-- for stock other parameters with json format
   date_c			datetime,
-  date_m			timestamp,
+  date_m			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
   acl				text							-- for future permission 'per file'
@@ -227,7 +227,7 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   fk_user_author 	integer NOT NULL,
   fk_user_mod		integer NOT NULL,
   datec				datetime NOT NULL,
-  tms				timestamp NOT NULL,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   status            smallint DEFAULT 1
 ) ENGINE=InnoDB;
 
@@ -236,7 +236,7 @@ CREATE TABLE IF NOT EXISTS llx_user_rib (
   fk_user        integer      NOT NULL,
   entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   datec          datetime,
-  tms            timestamp,
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label          varchar(30),
   bank           varchar(255),  -- bank name
   code_banque    varchar(128),  -- bank code
@@ -263,7 +263,7 @@ create table llx_stock_lotserial
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
@@ -282,7 +282,7 @@ create table llx_budget
   date_start	date,
   date_end		date,
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
@@ -296,7 +296,7 @@ create table llx_budget_lines
   fk_project_ids	varchar(255) NOT NULL,		-- List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'.
   amount		double(24,8) NOT NULL,
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
@@ -369,7 +369,7 @@ create table llx_categorie_project
 create table llx_expedition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -379,7 +379,7 @@ ALTER TABLE llx_expedition_extrafields ADD INDEX idx_expedition_extrafields (fk_
 create table llx_expeditiondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -392,7 +392,7 @@ ALTER TABLE llx_expeditiondet_extrafields ADD INDEX idx_expeditiondet_extrafield
 create table llx_livraison_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -402,7 +402,7 @@ ALTER TABLE llx_livraison_extrafields ADD INDEX idx_livraison_extrafields (fk_ob
 create table llx_livraisondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -595,7 +595,7 @@ insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays
 
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN doc_ref varchar(300) NOT NULL;
 
-ALTER TABLE llx_holiday ADD COLUMN tms timestamp;
+ALTER TABLE llx_holiday ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_holiday ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_holiday ADD INDEX idx_holiday_entity (entity);
 
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 6ec4fc35f92..6bf230df12a 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -54,7 +54,7 @@ CREATE TABLE llx_product_lot (
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer
@@ -140,7 +140,7 @@ CREATE TABLE llx_website
 	fk_default_home integer,
     date_creation     datetime,
     date_modification datetime,
-	tms           timestamp
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 ALTER TABLE llx_website ADD COLUMN fk_default_home integer;
 ALTER TABLE llx_website CHANGE COLUMN shortname ref varchar(24) NOT NULL;
@@ -158,7 +158,7 @@ CREATE TABLE llx_website_page
     status        integer,
     date_creation     datetime,
     date_modification datetime,
-	tms           timestamp
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
@@ -475,7 +475,7 @@ CREATE TABLE llx_advtargetemailing
   fk_user_author integer NOT NULL,
   datec datetime NOT NULL,
   fk_user_mod integer NOT NULL,
-  tms timestamp NOT NULL
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=InnoDB;
 
 ALTER TABLE llx_advtargetemailing ADD UNIQUE INDEX uk_advtargetemailing_name (name);
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 175e03ec179..7578c633be4 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -114,7 +114,7 @@ ALTER TABLE llx_societe_remise ADD COLUMN entity	integer DEFAULT 1 NOT NULL afte
 create table llx_expensereport_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -133,7 +133,7 @@ UPDATE llx_adherent_type SET subscription = '1' WHERE subscription = 'yes';
 CREATE TABLE llx_product_lot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -145,7 +145,7 @@ ALTER TABLE llx_website_page MODIFY COLUMN content MEDIUMTEXT;
 CREATE TABLE llx_product_warehouse_properties
 (
   rowid           		integer AUTO_INCREMENT PRIMARY KEY,
-  tms             		timestamp,
+  tms             		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product      		integer NOT NULL,
   fk_entrepot     		integer NOT NULL,
   seuil_stock_alerte    integer DEFAULT 0,
@@ -156,7 +156,7 @@ CREATE TABLE llx_product_warehouse_properties
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN fk_user_modif     integer;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_creation		datetime;
-ALTER TABLE llx_accounting_bookkeeping ADD COLUMN tms               timestamp;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 -- VMYSQL4.3 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN numero_compte varchar(32) NOT NULL;
 -- VMYSQL4.3 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_journal varchar(32) NOT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_accounting_bookkeeping ALTER COLUMN numero_compte SET NOT NULL;
@@ -186,7 +186,7 @@ ALTER TABLE llx_entrepot ADD COLUMN fk_parent integer DEFAULT 0;
 create table llx_resource_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -222,7 +222,7 @@ create table llx_user_employment
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   fk_user			integer,
   datec             datetime,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat     integer,
   fk_user_modif     integer,
   job				varchar(128),				-- job position. may be a dictionary
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index b53b25f93b1..87eda0668b1 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -61,7 +61,7 @@ ALTER TABLE llx_supplier_proposaldet CHANGE COLUMN fk_askpricesupplier fk_suppli
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
--- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+-- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;
@@ -160,7 +160,7 @@ ALTER TABLE llx_projet ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer;
 
 ALTER TABLE llx_projet_task_time ADD COLUMN datec date;
-ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp;
+ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_product_price ADD COLUMN fk_multicurrency integer;
 ALTER TABLE llx_product_price ADD COLUMN multicurrency_code	varchar(255);
@@ -171,12 +171,12 @@ ALTER TABLE llx_product_price ADD COLUMN multicurrency_price_ttc double(24,8) DE
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_creat integer;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_product_price_by_qty DROP COLUMN date_price;
-ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp;
+ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN import_key varchar(14);
 
 ALTER TABLE llx_user ADD COLUMN import_key varchar(14);
 
-ALTER TABLE llx_facture_rec ADD COLUMN tms timestamp;
+ALTER TABLE llx_facture_rec ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 UPDATE llx_facture_rec SET tms = datec where tms < '2000-01-01';
 
 CREATE TABLE llx_product_attribute
@@ -295,7 +295,7 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification 
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					--					| date last modification 
   import_key            varchar(14),
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
@@ -391,7 +391,7 @@ ALTER TABLE llx_contratdet ADD COLUMN vat_src_code varchar(10) DEFAULT '';
 CREATE TABLE llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec                 datetime,
   datep                 date,
   datev                 date,
@@ -438,7 +438,7 @@ rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
 entity integer DEFAULT 0, 
 ref varchar(48),
 datec datetime DEFAULT NULL,
-tms timestamp, 
+tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 fk_user_author	integer,
 fk_user_modif     integer,
 fk_user_valid		integer,
@@ -453,7 +453,7 @@ CREATE TABLE llx_inventorydet
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
 datec datetime DEFAULT NULL,
-tms timestamp, 
+tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
@@ -467,7 +467,7 @@ new_pmp double DEFAULT 0
 )ENGINE=InnoDB;
 
 ALTER TABLE llx_inventory ADD COLUMN datec datetime DEFAULT NULL;
-ALTER TABLE llx_inventory ADD COLUMN tms timestamp;
+ALTER TABLE llx_inventory ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);
@@ -502,7 +502,7 @@ CREATE TABLE llx_loan_schedule
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,         
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,         
   amount_capital	real DEFAULT 0,
   amount_insurance	real DEFAULT 0,
@@ -547,7 +547,7 @@ CREATE TABLE llx_website_page
     fk_user_create integer,
     fk_user_modif  integer,
     date_creation  datetime,
-	tms            timestamp
+	tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
@@ -566,7 +566,7 @@ UPDATE llx_extrafields set elementtype='categorie' where elementtype='categories
 CREATE TABLE llx_blockedlog 
 ( 
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
-	tms	timestamp,
+	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
 	amounts real NOT NULL, 
 	signature varchar(100) NOT NULL, 
@@ -593,7 +593,7 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);
@@ -613,7 +613,7 @@ ALTER TABLE llx_mailing_cibles MODIFY COLUMN source_url varchar(255);
 CREATE TABLE llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -623,7 +623,7 @@ ALTER TABLE llx_facture_rec_extrafields ADD INDEX idx_facture_rec_extrafields (f
 CREATE TABLE llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,
   import_key       varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index ff6a1fe03fb..93a7a447c18 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -265,7 +265,7 @@ ALTER TABLE llx_menu MODIFY fk_leftmenu varchar(100);
 CREATE TABLE llx_website_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -285,7 +285,7 @@ CREATE TABLE llx_website_account(
     date_last_login     datetime,
     date_previous_login datetime,
 	date_creation       datetime NOT NULL, 
-	tms                 timestamp, 
+	tms                 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat       integer NOT NULL, 
 	fk_user_modif       integer, 
 	import_key          varchar(14), 
@@ -307,7 +307,7 @@ ALTER TABLE llx_website_account ADD CONSTRAINT llx_website_account_fk_website FO
 CREATE TABLE llx_website_account_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -326,7 +326,7 @@ alter table llx_user add column pass_encoding varchar(24) NULL;
 CREATE TABLE IF NOT EXISTS llx_expensereport_ik (
     rowid           integer  AUTO_INCREMENT PRIMARY KEY,
     datec           datetime  DEFAULT NULL,
-    tms             timestamp,
+    tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_c_exp_tax_cat integer DEFAULT 0 NOT NULL,
     fk_range        integer DEFAULT 0 NOT NULL,
     coef            double DEFAULT 0 NOT NULL,
@@ -441,7 +441,7 @@ INSERT INTO llx_c_exp_tax_range (rowid,fk_c_exp_tax_cat,range_ik, entity, active
 CREATE TABLE llx_expensereport_rules (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     dates datetime NOT NULL,
     datee datetime NOT NULL,
     amount numeric(24,8) NOT NULL,
@@ -464,7 +464,7 @@ ALTER TABLE llx_extrafields ADD COLUMN fk_user_author integer;
 ALTER TABLE llx_extrafields ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_extrafields ADD COLUMN datec datetime;
 ALTER TABLE llx_extrafields ADD COLUMN enabled varchar(255) DEFAULT '1';
-ALTER TABLE llx_extrafields ADD COLUMN tms timestamp;
+ALTER TABLE llx_extrafields ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 -- We fix value of 'list' from 0 to 1 for all extrafields created before this migration
 --VMYSQL4.1 UPDATE llx_extrafields SET list = 1 WHERE list = 0 AND fk_user_author IS NULL and fk_user_modif IS NULL and datec IS NULL;		
@@ -528,7 +528,7 @@ DROP TABLE llx_projet_task_comment;
 CREATE TABLE llx_comment (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     description text NOT NULL,
     fk_user_author integer DEFAULT NULL,
     fk_element integer DEFAULT NULL,
@@ -572,7 +572,7 @@ create table llx_c_email_senderprofile
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   date_creation   datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(255),					  -- Label of predefined email
   email           varchar(255),					  -- Email
   signature		  text,                           -- Predefined signature
@@ -655,7 +655,7 @@ create table llx_onlinesignature
   object_type               varchar(32) NOT NULL,
   object_id					integer NOT NULL,
   datec                     datetime NOT NULL,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   name						varchar(255) NOT NULL,
   ip						varchar(128),
   pathoffile				varchar(255)
@@ -709,7 +709,7 @@ ALTER TABLE llx_resource ADD CONSTRAINT fk_resource_fk_country FOREIGN KEY (fk_c
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
index 380c64c28fc..888f4fefdd0 100644
--- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
+++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
@@ -149,7 +149,7 @@ CREATE TABLE llx_societe_remise_supplier
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer DEFAULT 1 NOT NULL,			-- multi company id
   fk_soc			integer NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
   remise_supplier	double(6,3)  DEFAULT 0 NOT NULL,	-- discount
@@ -246,7 +246,7 @@ CREATE TABLE llx_ticket
 	date_read datetime,
 	date_close datetime,
 	notify_tiers_at_create tinyint,
-	tms timestamp
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_ticket ADD COLUMN notify_tiers_at_create integer;
@@ -271,7 +271,7 @@ ALTER TABLE llx_ticket_msg ADD CONSTRAINT fk_ticket_msg_fk_track_id FOREIGN KEY
 CREATE TABLE llx_ticket_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    
   import_key       varchar(14)
 )ENGINE=innodb;
@@ -279,7 +279,7 @@ CREATE TABLE llx_ticket_extrafields
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -371,7 +371,7 @@ CREATE TABLE llx_societe_account(
     date_last_login   datetime,
     date_previous_login datetime,
 	date_creation datetime NOT NULL, 
-	tms timestamp NOT NULL, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
@@ -433,7 +433,7 @@ CREATE TABLE llx_asset(
 	note_public text,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
@@ -449,7 +449,7 @@ ALTER TABLE llx_asset ADD INDEX idx_asset_fk_asset_type (fk_asset_type);
 create table llx_asset_extrafields
 (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14)
 ) ENGINE=innodb;
@@ -458,7 +458,7 @@ create table llx_asset_type
 (
   rowid                                 integer AUTO_INCREMENT PRIMARY KEY,
   entity                                integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms                                   timestamp,
+  tms                                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label                                 varchar(50) NOT NULL,
   accountancy_code_asset                varchar(32),
   accountancy_code_depreciation_asset   varchar(32),
@@ -473,7 +473,7 @@ ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_asset_type FOREIGN KEY (fk_asset_t
 create table llx_asset_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
index b7fe131c3f9..36a15d5b85d 100644
--- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
+++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -43,7 +43,7 @@ ALTER TABLE llx_facture ADD COLUMN pos_source varchar(32);
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -182,7 +182,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
         note_public text,
         note_private text,
         date_creation datetime NOT NULL,
-        tms timestamp NOT NULL,
+        tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
         fk_user_creat integer NOT NULL,
         fk_user_modif integer,
         import_key varchar(14),
@@ -202,7 +202,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
 	type varchar(128) NOT NULL,
 	rulevalue varchar(128) NULL,
 	date_creation datetime NOT NULL,
-	tms timestamp NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
@@ -217,7 +217,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
 	type varchar(128) NOT NULL,
 	actionparam varchar(255) NULL,
 	date_creation datetime NOT NULL,
-	tms timestamp NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	position integer DEFAULT 0,
diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index a56cb45e4fe..b9a406515ec 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -87,7 +87,7 @@ create table llx_mailing_unsubscribe
   unsubscribegroup	varchar(128) DEFAULT '',
   ip				varchar(128),
   date_creat		datetime,                            -- creation date
-  tms               timestamp
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_mailing_unsubscribe ADD UNIQUE uk_mailing_unsubscribe(email, entity, unsubscribegroup);
@@ -223,7 +223,7 @@ CREATE TABLE llx_bom_bom(
 	qty double(24,8),
 	efficiency double(8,4),
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	date_valid datetime, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
@@ -240,7 +240,7 @@ ALTER TABLE llx_bom_bom ADD COLUMN date_valid datetime;
 create table llx_bom_bom_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -266,7 +266,7 @@ ALTER TABLE llx_bom_bomline ADD COLUMN position integer NOT NULL;
 create table llx_bom_bomline_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -335,7 +335,7 @@ UPDATE llx_c_shipment_mode SET label = 'https://www.laposte.fr/outils/suivre-vos
 create table llx_reception
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
@@ -383,7 +383,7 @@ ALTER TABLE llx_reception ADD INDEX idx_reception_fk_shipping_method (fk_shippin
 create table llx_reception_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index aa5ab65d3ff..c9c916ed3ad 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -383,6 +383,7 @@ delete from llx_commande_fournisseur_dispatch where fk_commandefourndet = 0 or f
 delete from llx_menu where menu_handler = 'smartphone';
 
 update llx_expedition set date_valid = date_creation where fk_statut = 1 and date_valid IS NULL;
+update llx_expedition set date_valid = NOW() where fk_statut = 1 and date_valid IS NULL;
 
 -- Detect bad consistency between duraction_effective of a task and sum of time of tasks
 -- select pt.rowid, pt.duration_effective, SUM(ptt.task_duration) as y from llx_projet_task as pt, llx_projet_task_time as ptt where ptt.fk_task = pt.rowid group by pt.rowid, pt.duration_effective having pt.duration_effective <> y;
diff --git a/htdocs/install/mysql/tables/llx_accounting_account.sql b/htdocs/install/mysql/tables/llx_accounting_account.sql
index 7af83585c7f..893cb19d9ab 100644
--- a/htdocs/install/mysql/tables/llx_accounting_account.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_account.sql
@@ -24,7 +24,7 @@ create table llx_accounting_account
   rowid                     bigint AUTO_INCREMENT PRIMARY KEY,
   entity                    integer DEFAULT 1 NOT NULL,
   datec                     datetime,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_pcg_version            varchar(32)  NOT NULL,			  -- Chart system
   pcg_type                  varchar(20)  NOT NULL,			  -- First part of Key for predefined groups
   account_number            varchar(32)  NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index cf1c3334092..23e7d489e09 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -45,7 +45,7 @@ CREATE TABLE llx_accounting_bookkeeping
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					--					| last modification date
   fk_user               integer NULL,               -- The id of user that validate the accounting source document
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
index cbf387b9b70..2b8277c70bd 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
@@ -44,7 +44,7 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					--					| last modification date
   fk_user               integer NULL,				-- The id of user that validate the accounting source document
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
diff --git a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
index 90590fb427d..17e9d9dccfb 100644
--- a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
@@ -25,7 +25,7 @@ create table llx_accounting_fiscalyear
 	statut			tinyint DEFAULT 0 NOT NULL,
 	entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
 	datec			datetime NOT NULL,
-	tms				timestamp,
+	tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_author	integer DEFAULT NULL,
 	fk_user_modif	integer DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index f335a93cfeb..82d97d3ec98 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -33,7 +33,7 @@ create table llx_actioncomm
   code				varchar(50) NULL,				-- code of action for automatic action ('AC_OTH_AUTO' for automatic actions, 'AC_EMAILIN_AUTO' for email input, 'AC_xxx' for manual action...) 
   
   datec				datetime,						-- date creation
-  tms				timestamp,						-- date modification
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,						-- last modification date
   fk_user_author	integer,						-- user id of user that has created record
   fk_user_mod		integer,						-- user id of user that has modified record
 
@@ -66,6 +66,7 @@ create table llx_actioncomm
   email_tocc		varchar(255),					-- when event was an email, we store here the email_tocc
   email_tobcc		varchar(255),					-- when event was an email, we store here the email_tobcc
   errors_to			varchar(255),					-- when event was an email, we store here the erros_to
+  reply_to			varchar(255),					-- when event was an email, we store here the reply_to
   
   recurid           varchar(128),                   -- used to store event id to link each other all the repeating event record. It can be the 'iCalUID' as in RFC5545 (an id similar for all the same serie)
   recurrule         varchar(128),					-- contains string with ical format recurring rule like 'FREQ=MONTHLY;INTERVAL=2;BYMONTHDAY=19' or 'FREQ=WEEKLY;BYDAY=MO'
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
index c820feac430..95a415116ab 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_actioncomm_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_reminder.key.sql b/htdocs/install/mysql/tables/llx_actioncomm_reminder.key.sql
index 94e50d05634..6cc9a8cbd37 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_reminder.key.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_reminder.key.sql
@@ -15,11 +15,11 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_rowid (rowid);
 ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_dateremind (dateremind);
 ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_fk_user (fk_user);
+ALTER TABLE llx_actioncomm_reminder ADD INDEX idx_actioncomm_reminder_status (status);
 -- END MODULEBUILDER INDEXES
 
-ALTER TABLE llx_actioncomm_reminder ADD UNIQUE INDEX uk_actioncomm_reminder_unique(fk_user, typeremind, offsetvalue, offsetunit);
+ALTER TABLE llx_actioncomm_reminder ADD UNIQUE INDEX uk_actioncomm_reminder_unique(fk_actioncomm, fk_user, typeremind, offsetvalue, offsetunit);
 
 
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql b/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql
index 2edb11c45c5..78dd00d6ea5 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_reminder.sql
@@ -22,6 +22,10 @@ CREATE TABLE llx_actioncomm_reminder(
 	fk_user integer NOT NULL, 
 	offsetvalue integer NOT NULL, 
 	offsetunit varchar(1) NOT NULL,
-	status integer NOT NULL DEFAULT 0
+	status integer NOT NULL DEFAULT 0,
+	entity integer NOT NULL DEFAULT 1,
+	fk_actioncomm integer NOT NULL,
+	fk_email_template integer
+
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 1917e80c81a..6b5490b282d 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -72,7 +72,7 @@ create table llx_adherent
   model_pdf		   varchar(255),
   datevalid        datetime,  -- date de validation
   datec            datetime,  -- date de creation
-  tms              timestamp, -- date de modification
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- last modification date
   fk_user_author   integer,   -- can be null because member can be create by a guest
   fk_user_mod      integer,
   fk_user_valid    integer,
diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
index 50f47c7954b..6b67944a321 100644
--- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
@@ -21,7 +21,7 @@
 create table llx_adherent_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- member id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql
index 7e9270b89dc..bdce18ef0bc 100644
--- a/htdocs/install/mysql/tables/llx_adherent_type.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type.sql
@@ -26,7 +26,7 @@ create table llx_adherent_type
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   entity           integer DEFAULT 1 NOT NULL,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   statut           smallint NOT NULL DEFAULT 0,
   libelle          varchar(50) NOT NULL,
   morphy           varchar(3) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
index 2950147730b..d13056a2894 100644
--- a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_adherent_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
index 22d49768887..34bd7eb53bf 100644
--- a/htdocs/install/mysql/tables/llx_advtargetemailing.sql
+++ b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
@@ -28,5 +28,5 @@ CREATE TABLE llx_advtargetemailing
   fk_user_author integer NOT NULL,
   datec datetime NOT NULL,
   fk_user_mod integer NOT NULL,
-  tms timestamp NOT NULL
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset.sql b/htdocs/install/mysql/tables/llx_asset.sql
index b5bb1d1bfe2..52eeda3ba58 100644
--- a/htdocs/install/mysql/tables/llx_asset.sql
+++ b/htdocs/install/mysql/tables/llx_asset.sql
@@ -26,7 +26,7 @@ CREATE TABLE llx_asset(
 	note_public text,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
diff --git a/htdocs/install/mysql/tables/llx_asset_extrafields.sql b/htdocs/install/mysql/tables/llx_asset_extrafields.sql
index 364f0e3d08f..c93fac7b20a 100644
--- a/htdocs/install/mysql/tables/llx_asset_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_asset_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_asset_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_type.sql b/htdocs/install/mysql/tables/llx_asset_type.sql
index bd1c300d087..1205acb959b 100644
--- a/htdocs/install/mysql/tables/llx_asset_type.sql
+++ b/htdocs/install/mysql/tables/llx_asset_type.sql
@@ -17,7 +17,7 @@ create table llx_asset_type
 (
   rowid                                 integer AUTO_INCREMENT PRIMARY KEY,
   entity                                integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms                                   timestamp,
+  tms                                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label                                 varchar(50) NOT NULL,
   accountancy_code_asset                varchar(32),
   accountancy_code_depreciation_asset   varchar(32),
diff --git a/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql b/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
index 59ebe94c7d8..7ff09176216 100644
--- a/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_asset_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql
index eb04e314545..0e1dbc403da 100644
--- a/htdocs/install/mysql/tables/llx_bank.sql
+++ b/htdocs/install/mysql/tables/llx_bank.sql
@@ -21,7 +21,7 @@ create table llx_bank
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datev           date,                      -- date de valeur
   dateo           date,                      -- date operation
   amount          double(24,8) NOT NULL default 0,
@@ -32,11 +32,14 @@ create table llx_bank
   fk_type         varchar(6),                -- TIP,VIR,PRE,CB,CHQ,... (Code in llx_c_paiement)
   num_releve      varchar(50),
   num_chq         varchar(50),
-  numero_compte   varchar(32) NULL,		     -- FEC:CompteNum	| account number
+  numero_compte   varchar(32) NULL,		       -- FEC:CompteNum	| account number
   rappro          tinyint default 0,
   note            text,
   fk_bordereau    integer DEFAULT 0,
-  banque          varchar(255),             -- banque pour les cheques
-  emetteur        varchar(255),             -- emetteur du cheque
-  author          varchar(40)               -- a supprimer apres migration
+  banque          varchar(255),              -- banque pour les cheques
+  emetteur        varchar(255),              -- emetteur du cheque
+  author          varchar(40),               -- a supprimer apres migration
+  origin_id       integer,
+  origin_type     varchar(64) NULL,
+  import_key	  varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 28a1a0baf34..4ac90dd961d 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -26,7 +26,7 @@ create table llx_bank_account
 (
   rowid						integer AUTO_INCREMENT PRIMARY KEY,
   datec						datetime,
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref						varchar(12) NOT NULL,
   label						varchar(30) NOT NULL,
   entity					integer DEFAULT 1 NOT NULL,	-- multi company id
diff --git a/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql b/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
index 5d9d8847154..a30e81ab96c 100644
--- a/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_bank_account_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index 889b28d7a73..f8145718ea6 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_blockedlog
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	entity integer DEFAULT 1 NOT NULL, 
 	date_creation	datetime,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
 	amounts double(24,8) NOT NULL, 
 	element varchar(50), 
diff --git a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
index 9e7dae8f23c..eb491f93af4 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
@@ -3,5 +3,5 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bom_bom.sql b/htdocs/install/mysql/tables/llx_bom_bom.sql
index d61b404806d..01ec2e63a3e 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom.sql
@@ -18,7 +18,8 @@ CREATE TABLE llx_bom_bom(
 	-- BEGIN MODULEBUILDER FIELDS
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	entity integer DEFAULT 1 NOT NULL,
-	ref varchar(128) NOT NULL, 
+	ref varchar(128) NOT NULL,
+	bomtype integer DEFAULT 0,                  -- 0 for a BOM to manufacture, 1 for a BOM to dismantle 
 	label varchar(255), 
 	fk_product integer, 
 	description text, 
@@ -30,7 +31,7 @@ CREATE TABLE llx_bom_bom(
 	duration double(24,8) DEFAULT NULL,
 	date_creation datetime NOT NULL,
 	date_valid datetime,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer, 
 	fk_user_valid integer, 
diff --git a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql
new file mode 100644
index 00000000000..e0b217c2917
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.key.sql
@@ -0,0 +1,21 @@
+-- ===================================================================
+-- Copyright (C) 2014 Florian Henry	<florian.henry@open-concept.pro>
+--
+-- 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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_bom_bom_extrafields ADD INDEX idx_bom_bom_extrafields_fk_object (fk_object);
+
diff --git a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
index 10c44459a8b..15210546fda 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_bom_bom_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
index 1b468da3a22..8ed3e96bd11 100644
--- a/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_bom_bomline_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
index 3050b831eec..9b1d6e24ad4 100644
--- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
+++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
@@ -33,7 +33,7 @@ create table llx_bordereau_cheque
   fk_bank_account   integer,
   fk_user_author    integer,
   statut            smallint NOT NULL DEFAULT 0,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   note              text,
   entity            integer DEFAULT 1 NOT NULL			-- multi company id
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql
index 285bbc22603..fbdf0e3ed36 100644
--- a/htdocs/install/mysql/tables/llx_boxes_def.sql
+++ b/htdocs/install/mysql/tables/llx_boxes_def.sql
@@ -23,6 +23,6 @@ create table llx_boxes_def
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
   file        varchar(200) NOT NULL,        -- Do not increase this as file+note must be small to allow index
   entity      integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms         timestamp,  
+  tms         timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,  
   note        varchar(130)                  -- Do not increase this as file+note must be small to allow index
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_budget.sql b/htdocs/install/mysql/tables/llx_budget.sql
index d67e65e8f2b..ab9ed79a64a 100644
--- a/htdocs/install/mysql/tables/llx_budget.sql
+++ b/htdocs/install/mysql/tables/llx_budget.sql
@@ -26,7 +26,7 @@ create table llx_budget
   date_start	date,
   date_end		date,
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
index 1397b604316..ffdf33aa38f 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -23,7 +23,7 @@ create table llx_budget_lines
   fk_project_ids	varchar(180) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' or 'FILTER:categid=123' = Can also be a dynamic rule to select projects.
   amount			double(24,8) NOT NULL,
   datec        		datetime,
-  tms           	timestamp,
+  tms           	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat 	integer,
   fk_user_modif 	integer,
   import_key    	integer  
diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql
index c29f13b9fd4..8f7450d0fe9 100644
--- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql
@@ -23,7 +23,7 @@ create table llx_c_action_trigger
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
   elementtype	varchar(64) 			NOT NULL,
-  code			varchar(32)				NOT NULL,
+  code			varchar(64)				NOT NULL,
   label			varchar(128)			NOT NULL,
   description	varchar(255),
   rang			integer		DEFAULT 0
diff --git a/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql b/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
index cd81eb4c42a..8b99059acdd 100644
--- a/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
@@ -23,7 +23,7 @@ create table llx_c_email_senderprofile
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
   private         smallint DEFAULT 0 NOT NULL,    -- Template public (0) or private (id of user)
   date_creation   datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(255),					  -- Label of predefined email
   email           varchar(255) NOT NULL,		  -- Email
   signature		  text,                           -- Predefined signature
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
index 3fd97fb2804..04130a208fe 100644
--- a/htdocs/install/mysql/tables/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql
@@ -27,7 +27,7 @@ create table llx_c_email_templates
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   fk_user         integer,                        -- Id user owner if template is private, or null
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(180),					  -- Label of predefined email
   position        smallint,					      -- Position
   enabled         varchar(255) DEFAULT '1',		  -- Condition to have this module visible
diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql
index c99bfe91690..9177228b363 100644
--- a/htdocs/install/mysql/tables/llx_c_field_list.sql
+++ b/htdocs/install/mysql/tables/llx_c_field_list.sql
@@ -24,7 +24,7 @@
 create table llx_c_field_list
 (
   rowid			integer  AUTO_INCREMENT PRIMARY KEY,
-  tms			timestamp,
+  tms			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   element		varchar(64)        			NOT NULL,		-- name of element list
   entity		integer			DEFAULT 1 	NOT NULL,		-- entity id
   name			varchar(32)        			NOT NULL,		-- name of field with table alias (ex: p.ref)
diff --git a/htdocs/install/mysql/tables/llx_c_incoterms.sql b/htdocs/install/mysql/tables/llx_c_incoterms.sql
index 5b4dc3f60e2..aa690d6ce07 100644
--- a/htdocs/install/mysql/tables/llx_c_incoterms.sql
+++ b/htdocs/install/mysql/tables/llx_c_incoterms.sql
@@ -1,5 +1,6 @@
 -- ========================================================================
 -- Copyright (C) 2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2020 Udo Tamm             <software@dolibit.de>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -19,6 +20,7 @@
 CREATE TABLE llx_c_incoterms (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
   code varchar(3) NOT NULL,
+  label varchar(100),
   libelle varchar(255) NOT NULL,
   active tinyint DEFAULT 1  NOT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
new file mode 100644
index 00000000000..421b3452371
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_prospectcontactlevel.sql
@@ -0,0 +1,27 @@
+-- ===================================================================
+-- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_c_prospectcontactlevel
+(
+  code            varchar(12) PRIMARY KEY,
+  label           varchar(30),
+  sortorder       smallint,
+  active          smallint    DEFAULT 1 NOT NULL,
+  module          varchar(32) NULL
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql b/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
new file mode 100644
index 00000000000..b18f7eb383c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_recruitment_origin.sql
@@ -0,0 +1,33 @@
+-- ========================================================================
+-- Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- 
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- Defini les types de contact d'un element sert de reference pour
+-- la table llx_element_contact
+--
+-- element est le nom de la table utilisant le type de contact.
+-- i.e. contact, facture, projet, societe (sans le llx_ devant).
+-- Libelle est un texte decrivant le type de contact.
+-- active precise si cette valeur est 'active' ou 'archive'.
+--
+-- ========================================================================
+
+create table llx_c_recruitment_origin
+(
+  rowid      	integer AUTO_INCREMENT PRIMARY KEY,
+  code          varchar(32) NOT NULL,
+  label 	    varchar(64)	NOT NULL,
+  active  	    tinyint DEFAULT 1  NOT NULL
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
index 9adc6b3cb0c..6f49f682f24 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
@@ -20,7 +20,7 @@ create table llx_c_shipment_mode
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   entity				   integer	DEFAULT 1 NOT NULL,	-- multi company id
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   code             varchar(30) NOT NULL,
   libelle          varchar(50) NOT NULL,
   description      text,
diff --git a/htdocs/install/mysql/tables/llx_c_stcommcontact.key.sql b/htdocs/install/mysql/tables/llx_c_stcommcontact.key.sql
new file mode 100644
index 00000000000..12402658a65
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_stcommcontact.key.sql
@@ -0,0 +1,19 @@
+-- ========================================================================
+-- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+ALTER TABLE llx_c_stcommcontact ADD UNIQUE INDEX uk_c_stcommcontact(code);
diff --git a/htdocs/install/mysql/tables/llx_c_stcommcontact.sql b/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
new file mode 100644
index 00000000000..c906e4f5103
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_stcommcontact.sql
@@ -0,0 +1,27 @@
+-- ========================================================================
+-- Copyright (C) 2020 	   Open-Dsi  <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+create table llx_c_stcommcontact
+(
+  id       integer      PRIMARY KEY,
+  code     varchar(12)  NOT NULL,
+  libelle  varchar(30),
+  picto    varchar(128),
+  active   tinyint default 1  NOT NULL
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_c_ticket_category.sql b/htdocs/install/mysql/tables/llx_c_ticket_category.sql
index 2ccfe4d0758..58126633ce1 100644
--- a/htdocs/install/mysql/tables/llx_c_ticket_category.sql
+++ b/htdocs/install/mysql/tables/llx_c_ticket_category.sql
@@ -17,12 +17,14 @@
 
 create table llx_c_ticket_category
 (
-  rowid			integer AUTO_INCREMENT PRIMARY KEY,
-  entity		integer DEFAULT 1,
-  code			varchar(32)				NOT NULL,
-  pos			varchar(32)				NOT NULL,
-  label			varchar(128)			NOT NULL,
-  active		integer DEFAULT 1,
-  use_default	integer DEFAULT 1,
-  description	varchar(255)
+  rowid			 integer AUTO_INCREMENT PRIMARY KEY,
+  entity		 integer DEFAULT 1,
+  code			 varchar(32) NOT NULL,
+  pos			 varchar(32) NOT NULL,
+  label			 varchar(128) NOT NULL,
+  active		 integer DEFAULT 1,
+  use_default	 integer DEFAULT 1,
+  fk_parent      integer DEFAULT 0 NOT NULL,	-- Parent group
+  force_severity varchar(32) NULL,				-- To force the severity if we choosed this category
+  description	  varchar(255)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql
index cf1df953ba5..29cb5a260e6 100644
--- a/htdocs/install/mysql/tables/llx_categorie.sql
+++ b/htdocs/install/mysql/tables/llx_categorie.sql
@@ -32,7 +32,7 @@ create table llx_categorie
 	fk_soc          integer DEFAULT NULL,				-- not used by default. Used when option CATEGORY_ASSIGNED_TO_A_CUSTOMER is set.
 	visible         tinyint DEFAULT 1 NOT NULL,			-- determine if the products are visible or not
     date_creation	datetime,							-- date creation 
-    tms     		timestamp,							-- date modification
+    tms     		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,							-- last modification date
     fk_user_creat	integer,							-- user making creation
     fk_user_modif	integer,							-- user making last change
     import_key      varchar(14)							-- Import key
diff --git a/htdocs/install/mysql/tables/llx_categories_extrafields.sql b/htdocs/install/mysql/tables/llx_categories_extrafields.sql
index 8a2a82f7382..82c52f1b7ee 100644
--- a/htdocs/install/mysql/tables/llx_categories_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_categories_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_categories_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 57434c93d98..db9e82ac779 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -25,7 +25,7 @@ create table llx_chargesociales
   date_ech          datetime NOT NULL,              -- date echeance
   libelle           varchar(80) NOT NULL,
   entity            integer DEFAULT 1 NOT NULL,     -- multi company id
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation     datetime,                       -- date de creation 
   date_valid        datetime,                       -- date de validation
   fk_user_author    integer,                        -- user making creation
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 676e768c73b..add836ce5d5 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -32,7 +32,7 @@ create table llx_commande
   fk_soc					integer NOT NULL,
   fk_projet					integer DEFAULT NULL,			-- projet auquel est rattache la commande
 
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation				datetime,						-- date de creation 
   date_valid				datetime,						-- date de validation
   date_cloture				datetime,						-- date de cloture
@@ -64,8 +64,8 @@ create table llx_commande
   fk_currency				varchar(3),						-- currency code
   fk_cond_reglement			integer,						-- condition de reglement
   fk_mode_reglement			integer,						-- mode de reglement
-  
-  date_livraison			date 	  default NULL,
+
+  date_livraison			datetime 	  default NULL,
   fk_shipping_method		integer,						-- shipping method id
   fk_warehouse				integer default NULL,
   fk_availability			integer NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_extrafields.sql
index e6f3f768489..922bcd820a1 100644
--- a/htdocs/install/mysql/tables/llx_commande_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_commande_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index bc5cadea228..a9f155a2abb 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -32,7 +32,7 @@ create table llx_commande_fournisseur
   fk_soc					integer NOT NULL,
   fk_projet					integer DEFAULT 0,             -- project id
 
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation				datetime,                      -- date de creation 
   date_valid				datetime,                      -- date de validation
   date_approve				datetime,                      -- date de approve
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
index 22a0e241dd6..b5f85fea250 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
@@ -36,5 +36,5 @@ create table llx_commande_fournisseur_dispatch
   sellby         date DEFAULT NULL,
   status         integer,
   datec          datetime,
-  tms            timestamp
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
index c30cc1c75dd..2c85521ea84 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_commande_fournisseur_dispatch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
index 6f72a447f10..40c5785dbad 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
@@ -23,7 +23,7 @@
 create table llx_commande_fournisseur_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
index 4c576f16f51..c75e9718526 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
@@ -20,7 +20,7 @@
 create table llx_commande_fournisseur_log
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datelog          datetime NOT NULL,
   fk_commande      integer NOT NULL,
   fk_statut        smallint NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
index 189b4d7d593..cc22da09720 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
@@ -24,7 +24,7 @@
 create table llx_commande_fournisseurdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql
index 615ec8f269c..c7b94a46add 100644
--- a/htdocs/install/mysql/tables/llx_commandedet.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet.sql
@@ -57,6 +57,7 @@ create table llx_commandedet
   rang							integer      DEFAULT 0,
   fk_unit						integer      DEFAULT NULL,       -- lien vers table des unités
   import_key					varchar(14),
+  ref_ext                       varchar(255) DEFAULT NULL,
   
   fk_commandefourndet			integer DEFAULT NULL,            -- link to detail line of commande fourn (resplenish)
   
diff --git a/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql b/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
index 37b7dd6a349..331a3fbe54a 100644
--- a/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_commandedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_comment.sql b/htdocs/install/mysql/tables/llx_comment.sql
index 22b2c40b9f1..3e839d83b4c 100644
--- a/htdocs/install/mysql/tables/llx_comment.sql
+++ b/htdocs/install/mysql/tables/llx_comment.sql
@@ -19,7 +19,7 @@
 CREATE TABLE llx_comment (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     description text NOT NULL,
     fk_user_author integer DEFAULT NULL,
     fk_user_modif integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql
index fcca5f57023..96594bb60b4 100644
--- a/htdocs/install/mysql/tables/llx_const.sql
+++ b/htdocs/install/mysql/tables/llx_const.sql
@@ -32,7 +32,7 @@ create table llx_const
   type        varchar(64) DEFAULT 'string', -- null or 'encrypted' if param has been encrypted 
   visible     tinyint DEFAULT 1 NOT NULL,
   note        text,
-  tms         timestamp
+  tms         timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql
index fbb36a5674b..dcdc1288d37 100644
--- a/htdocs/install/mysql/tables/llx_contrat.sql
+++ b/htdocs/install/mysql/tables/llx_contrat.sql
@@ -26,7 +26,7 @@ create table llx_contrat
   ref_supplier				varchar(255),		            -- supplier contract ref
   ref_ext					varchar(255),		            -- external contract ref
   entity					integer DEFAULT 1 NOT NULL,		-- multi company id
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec						datetime,                   	-- creation date
   date_contrat				datetime,
   statut					smallint DEFAULT 0,				-- not used. deprecated
diff --git a/htdocs/install/mysql/tables/llx_contrat_extrafields.sql b/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
index 7ab3dfbbdc9..f93ab94d4ca 100644
--- a/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_contrat_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql
index 4705bbab218..933fc50ec54 100644
--- a/htdocs/install/mysql/tables/llx_contratdet.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet.sql
@@ -20,7 +20,7 @@
 create table llx_contratdet
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 
   fk_contrat            integer       NOT NULL,
   fk_product            integer       NULL,                -- doit pouvoir etre nul pour ligne detail sans produits
diff --git a/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql b/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
index 8933fa66e16..ccd0846e81e 100644
--- a/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_contratdet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql
index b13791f4832..f52ced561c7 100644
--- a/htdocs/install/mysql/tables/llx_contratdet_log.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql
@@ -19,7 +19,7 @@
 create table llx_contratdet_log
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_contratdet         integer NOT NULL,
   date                  datetime NOT NULL,
   statut                smallint NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql
index 97057e6f41e..a9aa8960991 100644
--- a/htdocs/install/mysql/tables/llx_cronjob.sql
+++ b/htdocs/install/mysql/tables/llx_cronjob.sql
@@ -21,7 +21,7 @@
 CREATE TABLE llx_cronjob 
 (
 	rowid 			integer AUTO_INCREMENT PRIMARY KEY,
-	tms 			timestamp,
+	tms 			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 			datetime,
 	jobtype			varchar(10) NOT NULL,
   	label 			text NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql
index 8b9fa2a04ae..50bfe8d7cfd 100644
--- a/htdocs/install/mysql/tables/llx_deplacement.sql
+++ b/htdocs/install/mysql/tables/llx_deplacement.sql
@@ -24,7 +24,7 @@ create table llx_deplacement
   ref				varchar(30) DEFAULT NULL,		-- Ref donation (TODO change to NOT NULL)
   entity			integer DEFAULT 1 NOT NULL,		-- multi company id
   datec				datetime NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   dated				datetime,
   fk_user			integer NOT NULL,
   fk_user_author	integer,
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index f03e82d6143..95181a3b30e 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -25,7 +25,7 @@ create table llx_don
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(30) DEFAULT NULL,     -- Ref donation (TODO change to NOT NULL)
   entity          integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
   amount          double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_don_extrafields.sql b/htdocs/install/mysql/tables/llx_don_extrafields.sql
index bf2b780fcee..a4a560d0f8a 100644
--- a/htdocs/install/mysql/tables/llx_don_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_don_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_don_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql
index 1fa1467e296..a02a72118b2 100644
--- a/htdocs/install/mysql/tables/llx_ecm_directories.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql
@@ -30,7 +30,7 @@ CREATE TABLE llx_ecm_directories
   fullpath    		varchar(750),
   extraparams		varchar(255),					-- for stock other parameters with json format
   date_c			datetime,
-  date_m			timestamp,
+  date_m			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
   acl				text
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql b/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql
new file mode 100644
index 00000000000..a84fa2c845c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_ecm_directories_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- 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
+-- 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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_ecm_directories_extrafields ADD INDEX idx_ecm_directories_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql b/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql
new file mode 100644
index 00000000000..8bb7d98c592
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_ecm_directories_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                             -- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index c459e2ca219..52521e2af3e 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -35,7 +35,7 @@ CREATE TABLE llx_ecm_files
   gen_or_uploaded   varchar(12),                    -- 'generated' or 'uploaded' 
   extraparams		varchar(255),					-- for stocking other parameters with json format
   date_c			datetime,
-  date_m			timestamp,
+  date_m			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
   acl				text							-- for future permission 'per file'
diff --git a/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql
new file mode 100644
index 00000000000..3ebd3712184
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- 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
+-- 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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_ecm_files_extrafields ADD INDEX idx_ecm_files_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql
new file mode 100644
index 00000000000..485db3a0f72
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_ecm_files_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                             -- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_element_resources.sql b/htdocs/install/mysql/tables/llx_element_resources.sql
index 95ee9b5a751..693a2f990f0 100644
--- a/htdocs/install/mysql/tables/llx_element_resources.sql
+++ b/htdocs/install/mysql/tables/llx_element_resources.sql
@@ -28,5 +28,5 @@ CREATE TABLE llx_element_resources
   mandatory		  integer,
   duree				real,               -- total duration of using ressource
   fk_user_create  integer,
-  tms             timestamp
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
index 87581f418e8..389093241ce 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
@@ -35,7 +35,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
         note_public text, 
         note_private text, 
         date_creation datetime NOT NULL, 
-        tms timestamp, 
+        tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
         fk_user_creat integer NOT NULL, 
         fk_user_modif integer, 
         import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
index 226f74ce884..c45a3dcd1c4 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
 	type varchar(128) NOT NULL, 
 	actionparam varchar(255) NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	position integer DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
index 5f49227f655..4e708116e21 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
 	type varchar(128) NOT NULL, 
 	rulevalue varchar(128) NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql
index 2cabb457016..2a390f008e2 100644
--- a/htdocs/install/mysql/tables/llx_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot.sql
@@ -23,7 +23,7 @@ create table llx_entrepot
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(255) NOT NULL,
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   entity          integer DEFAULT 1 NOT NULL,	-- multi company id
   description     text,
   lieu            varchar(64),					-- resume lieu situation
diff --git a/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql b/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
index 9fa75455f19..95a78b4ce6c 100644
--- a/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_entrepot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_establishment.sql b/htdocs/install/mysql/tables/llx_establishment.sql
index 83cfadb7307..7159a53059c 100644
--- a/htdocs/install/mysql/tables/llx_establishment.sql
+++ b/htdocs/install/mysql/tables/llx_establishment.sql
@@ -22,7 +22,8 @@
 CREATE TABLE llx_establishment (
   rowid 			integer NOT NULL auto_increment PRIMARY KEY,
   entity 			integer NOT NULL DEFAULT 1,
-  name				varchar(50),
+  ref				varchar(30),
+  name				varchar(128),
   address           varchar(255),
   zip               varchar(25),
   town              varchar(50),
@@ -35,7 +36,7 @@ CREATE TABLE llx_establishment (
   fk_user_author 	integer NOT NULL,
   fk_user_mod		integer,
   datec				datetime NOT NULL,
-  tms				timestamp NOT NULL,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL,
   status            tinyint DEFAULT 1
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql
index c3ae55f47e2..ffa4f1029e7 100644
--- a/htdocs/install/mysql/tables/llx_events.sql
+++ b/htdocs/install/mysql/tables/llx_events.sql
@@ -24,7 +24,7 @@
 create table llx_events
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
-  tms            timestamp,                   -- date creation/modification
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                   -- last modification date
   type           varchar(32)  NOT NULL,       -- action type
   entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   prefix_session varchar(255) NULL,				  -- prefix of session, obtained with dol_getprefix
diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql
index e4c216f3da4..4214fef7f44 100644
--- a/htdocs/install/mysql/tables/llx_expedition.sql
+++ b/htdocs/install/mysql/tables/llx_expedition.sql
@@ -22,7 +22,7 @@
 create table llx_expedition
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_expedition_extrafields.sql b/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
index af4228efb41..6b9721a2826 100644
--- a/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_expedition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
index 112e41e9578..a71b45946a1 100644
--- a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_expeditiondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expensereport.sql b/htdocs/install/mysql/tables/llx_expensereport.sql
index a212bc55273..1f13a5a90b5 100644
--- a/htdocs/install/mysql/tables/llx_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport.sql
@@ -34,7 +34,7 @@ CREATE TABLE llx_expensereport (
   date_approve		datetime,
   date_refuse 		datetime,
   date_cancel 		datetime,
-  tms 		 		timestamp,
+  tms 		 		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_author 	integer NOT NULL,				-- not the user author but the user the expense report is for
   fk_user_modif 	integer DEFAULT NULL,
   fk_user_valid 	integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql b/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
index 8b6ad4e998f..1e78afb8513 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_expensereport_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expensereport_ik.sql b/htdocs/install/mysql/tables/llx_expensereport_ik.sql
index 3e767a8c396..839fbac8e9a 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_ik.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_ik.sql
@@ -21,10 +21,10 @@
 CREATE TABLE IF NOT EXISTS llx_expensereport_ik (
     rowid           integer  AUTO_INCREMENT PRIMARY KEY,
     datec           datetime  DEFAULT NULL,
-    tms             timestamp,
+    tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_c_exp_tax_cat integer DEFAULT 0 NOT NULL,
     fk_range        integer DEFAULT 0 NOT NULL,	  	  
     coef            double DEFAULT 0 NOT NULL,  
-    ikoffset          double DEFAULT 0 NOT NULL,
+    ikoffset        double DEFAULT 0 NOT NULL,
     active          integer DEFAULT 1         
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expensereport_rules.sql b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
index 2a10cc24a7d..ae8f9b09496 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_rules.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
@@ -20,7 +20,7 @@
 CREATE TABLE llx_expensereport_rules (
   rowid						integer AUTO_INCREMENT PRIMARY KEY,
   datec						datetime  DEFAULT NULL,
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   dates						datetime NOT NULL,
   datee						datetime NOT NULL,
   amount					double(24,8) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 3578414d98b..1ade8502bf5 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -43,5 +43,5 @@ create table llx_extrafields
 	fk_user_author	integer,									-- user making creation
 	fk_user_modif	integer,	                                -- user making last change
 	datec			datetime,									-- date de creation
-	tms             timestamp									-- date of last update
+	tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP									-- last modification date
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index 429095e1111..82319a4beef 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -39,7 +39,7 @@ create table llx_facture
   datef					date,									-- date invoice
   date_pointoftax		date DEFAULT NULL,									-- date point of tax (for GB)
   date_valid			date,									-- date validation
-  tms					timestamp,								-- date creation/modification
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,								-- last modification date
   date_closing				datetime,						-- date de cloture
   paye					smallint DEFAULT 0 NOT NULL,
   --amount				double(24,8)     DEFAULT 0 NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_facture_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_extrafields.sql
index 4f7b902c97f..bc826d72ce4 100644
--- a/htdocs/install/mysql/tables/llx_facture_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql
index 78b06370d8d..1d5fdcf13bf 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql
@@ -35,7 +35,7 @@ create table llx_facture_fourn
   datef					date,                          -- date de la facture
   date_pointoftax		date DEFAULT NULL,			   -- date point of tax (for GB)
   date_valid			date,						   -- date validation
-  tms					timestamp,                     -- date creation/modification
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                     -- last modification date
   libelle				varchar(255),
   paye					smallint         DEFAULT 0 NOT NULL,
   amount				double(24,8)     DEFAULT 0 NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
index 7be8ff1c552..7fca2588bdf 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_fourn_det_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
index 8fb018cbfcc..48556ec6d33 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_fourn_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index 220c1fa608a..0db78d62252 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -26,7 +26,7 @@ create table llx_facture_rec
   entity             integer DEFAULT 1 NOT NULL,	 -- multi company id
   fk_soc             integer NOT NULL,
   datec              datetime,            -- date de creation
-  tms				 timestamp,           -- date creation/modification
+  tms				 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,           -- last modification date
 
   suspended          integer DEFAULT 0,					-- 1=suspended
   
diff --git a/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql
index 6895a7e2291..8a51efb2914 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
index ff2b28d9a7f..73e64fa1c6a 100644
--- a/htdocs/install/mysql/tables/llx_facturedet.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet.sql
@@ -74,12 +74,7 @@ create table llx_facturedet
   multicurrency_subprice		double(24,8) DEFAULT 0,
   multicurrency_total_ht		double(24,8) DEFAULT 0,
   multicurrency_total_tva		double(24,8) DEFAULT 0,
-  multicurrency_total_ttc		double(24,8) DEFAULT 0
+  multicurrency_total_ttc		double(24,8) DEFAULT 0,
+  ref_ext varchar(255) DEFAULT NULL
 )ENGINE=innodb;
 
--- 
--- List of codes for special_code
---
--- 1 : frais de port
--- 2 : ecotaxe
---
diff --git a/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql b/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
index 693abf00001..99f0b87a943 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facturedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql b/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql
index da2314ecffb..c220a7e0f0f 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
index e2508c372ca..7c1ef4cf184 100644
--- a/htdocs/install/mysql/tables/llx_fichinter.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter.sql
@@ -26,7 +26,7 @@ create table llx_fichinter
   ref				varchar(30) NOT NULL,       -- number
   ref_ext			varchar(255),
   entity			integer DEFAULT 1 NOT NULL, -- multi company id
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,                   -- date de creation 
   date_valid		datetime,                   -- date de validation
   datei				date,						-- date de livraison du bon d'intervention
diff --git a/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
index 13c7dd15dab..c866669d667 100644
--- a/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_fichinter_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
index 65584c02201..f2ced33ec0d 100644
--- a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
@@ -19,7 +19,7 @@
 CREATE TABLE llx_fichinterdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index e8116c477a8..3cd5727d867 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -42,7 +42,7 @@ fk_user_cancel integer DEFAULT NULL,
 detail_refuse  varchar( 250 ) DEFAULT NULL,
 note_private   text,
 note_public    text,
-tms            timestamp,
+tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 import_key			varchar(14),
 extraparams			varchar(255)				-- for other parameters with json format
 ) 
diff --git a/htdocs/install/mysql/tables/llx_holiday_extrafields.sql b/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
index 29881bbb0cb..8b6e3ef8dc9 100644
--- a/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_holiday_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory.sql
index 4ccb234e26e..aa35ebb0c42 100644
--- a/htdocs/install/mysql/tables/llx_inventory.sql
+++ b/htdocs/install/mysql/tables/llx_inventory.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_inventory
   entity integer DEFAULT 0, 
   ref varchar(48),
   date_creation datetime DEFAULT NULL,
-  tms timestamp, 
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
   fk_user_creat	integer,					-- user making creation
   fk_user_modif integer,                    -- user making last change
   fk_user_valid integer,                    -- valideur de la fiche
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.key.sql b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
index 44890608b7e..cfe82448fd6 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.key.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.key.sql
@@ -20,3 +20,6 @@
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_tms (tms);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_datec (datec);
 ALTER TABLE llx_inventorydet ADD INDEX idx_inventorydet_fk_inventory (fk_inventory);
+
+ALTER TABLE llx_inventorydet ADD UNIQUE uk_inventorydet(fk_inventory, fk_warehouse, fk_product, batch);
+
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index 161e34183a0..ce23fe0f749 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -19,15 +19,15 @@
 
 CREATE TABLE llx_inventorydet 
 ( 
-rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
-datec datetime DEFAULT NULL,
-tms timestamp, 
-fk_inventory integer DEFAULT 0, 
-fk_warehouse integer DEFAULT 0,
-fk_product integer DEFAULT 0,  
-batch varchar(128) DEFAULT NULL,	 -- Lot or serial number
-qty_stock double DEFAULT NULL,   -- The targeted value. can be filled during draft edition
-qty_view double DEFAULT NULL, 	   -- must be filled once regulation is done
-qty_regulated double DEFAULT NULL  -- must be filled once regulation is done
+	rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+	datec datetime DEFAULT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
+	fk_inventory integer DEFAULT 0, 
+	fk_warehouse integer DEFAULT 0,
+	fk_product integer DEFAULT 0,  
+	batch varchar(128) DEFAULT NULL,	 -- Lot or serial number
+	qty_stock double DEFAULT NULL,   -- The targeted value. can be filled during draft edition
+	qty_view double DEFAULT NULL, 	   -- must be filled once regulation is done
+	qty_regulated double DEFAULT NULL  -- must be filled once regulation is done
 ) 
 ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql
index 31af38edfb6..e58e8c3c0bd 100644
--- a/htdocs/install/mysql/tables/llx_livraison.sql
+++ b/htdocs/install/mysql/tables/llx_livraison.sql
@@ -20,7 +20,7 @@
 create table llx_livraison
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)  NOT NULL,			-- delivery number
   entity                integer DEFAULT 1 NOT NULL,		-- multi company id
   fk_soc                integer      NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_livraison_extrafields.sql b/htdocs/install/mysql/tables/llx_livraison_extrafields.sql
index 70248d0ceca..d1fc611bfdd 100644
--- a/htdocs/install/mysql/tables/llx_livraison_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_livraison_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_livraison_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
index cb6300a8ca1..667f66ae0a8 100644
--- a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_livraisondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index a1a187b5ba4..f82597c71c5 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -22,7 +22,7 @@ create table llx_loan
   rowid							integer AUTO_INCREMENT PRIMARY KEY,
   entity						integer DEFAULT 1 NOT NULL,
   datec							datetime,
-  tms							timestamp,
+  tms							timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 
   label							varchar(80) NOT NULL,
   fk_bank						integer,
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
index 42592815526..dd68a426e61 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -22,7 +22,7 @@ create table llx_loan_schedule
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,         -- creation date
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,         -- payment date
   amount_capital	double(24,8) DEFAULT 0,
   amount_insurance	double(24,8) DEFAULT 0,
@@ -32,6 +32,7 @@ create table llx_loan_schedule
   note_private      text,
   note_public       text,
   fk_bank			integer NOT NULL,
+  fk_payment_loan     integer,
   fk_user_creat		integer,          -- creation user
   fk_user_modif		integer           -- last modification user
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_localtax.sql b/htdocs/install/mysql/tables/llx_localtax.sql
index b7aa682567f..b883c710f7b 100644
--- a/htdocs/install/mysql/tables/llx_localtax.sql
+++ b/htdocs/install/mysql/tables/llx_localtax.sql
@@ -22,7 +22,7 @@ create table llx_localtax
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity          integer DEFAULT 1 NOT NULL,
   localtaxtype    tinyint,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           date,								-- date of payment
   datev           date,								-- date of value
   amount          double,
diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql
index 8706159ad46..d9fc0832045 100644
--- a/htdocs/install/mysql/tables/llx_mailing.sql
+++ b/htdocs/install/mysql/tables/llx_mailing.sql
@@ -43,7 +43,7 @@ create table llx_mailing
   date_valid		datetime,                            -- 
   date_appro		datetime,                            -- 
   date_envoi		datetime,                            -- date d'envoi
-  tms				timestamp,  
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,  
   fk_user_creat		integer,                             -- user creator
   fk_user_valid		integer,                             -- user validator
   fk_user_appro		integer,                             -- not used
diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
index b523c1d11eb..096142b10ad 100644
--- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
@@ -34,6 +34,6 @@ create table llx_mailing_cibles
   source_id			integer,
   source_type		varchar(16),
   date_envoi		datetime,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   error_text		varchar(255)						-- text with error if statut is -1
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql b/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql
index 00424256957..543015f5829 100644
--- a/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql
@@ -26,5 +26,5 @@ create table llx_mailing_unsubscribe
   unsubscribegroup	varchar(128) DEFAULT '',
   ip				varchar(128),
   date_creat		datetime,                            -- creation date
-  tms               timestamp
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql
index cb279cb5c56..9cff110981a 100644
--- a/htdocs/install/mysql/tables/llx_menu.sql
+++ b/htdocs/install/mysql/tables/llx_menu.sql
@@ -39,8 +39,8 @@ CREATE TABLE llx_menu
 	langs         varchar(100),								-- Lang file to load for translation
 	level         smallint,									-- Deprecated. Not used.
 	perms         text,										-- Condition to show enabled or disabled
-	enabled       varchar(255) NULL default '1', 		    -- Condition to show or hide
+	enabled       text NULL, 					            -- Condition to show or hide
 	usertype      integer NOT NULL DEFAULT 0,				-- 0 if menu for all users, 1 for external only, 2 for internal only
-	tms           timestamp
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 	
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo.sql b/htdocs/install/mysql/tables/llx_mrp_mo.sql
index d3aa294104b..de1933ccfed 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo.sql
@@ -27,7 +27,7 @@ CREATE TABLE llx_mrp_mo(
 	note_private text, 
 	date_creation datetime NOT NULL, 
 	date_valid datetime NULL,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer,
 	fk_user_valid integer,
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
index 97eab584cc7..517c269cf0f 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.sql b/htdocs/install/mysql/tables/llx_mrp_production.sql
index 509d78a5c0e..bd0cd722f1a 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production.sql
@@ -28,7 +28,7 @@ CREATE TABLE llx_mrp_production(
 	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
 	fk_stock_movement integer,		-- id of stock movement when movements are validated
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14)
diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql
index 3ec7d05268e..d2e3bf93076 100644
--- a/htdocs/install/mysql/tables/llx_notify.sql
+++ b/htdocs/install/mysql/tables/llx_notify.sql
@@ -22,7 +22,7 @@
 create table llx_notify
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   daten           datetime,           -- date de la notification
   fk_action       integer NOT NULL,
   fk_soc          integer NULL,
diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql
index bb516444b04..aed10027347 100644
--- a/htdocs/install/mysql/tables/llx_notify_def.sql
+++ b/htdocs/install/mysql/tables/llx_notify_def.sql
@@ -21,7 +21,7 @@
 create table llx_notify_def
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           date,             			-- date de creation
   fk_action       integer NOT NULL,
   fk_soc          integer,
diff --git a/htdocs/install/mysql/tables/llx_online_signatures.sql b/htdocs/install/mysql/tables/llx_online_signatures.sql
index 312cde50671..fbba814dd4d 100644
--- a/htdocs/install/mysql/tables/llx_online_signatures.sql
+++ b/htdocs/install/mysql/tables/llx_online_signatures.sql
@@ -22,7 +22,7 @@ create table llx_onlinesignature
   object_type               varchar(32) NOT NULL,
   object_id					integer NOT NULL,
   datec                     datetime NOT NULL,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   name						varchar(255) NOT NULL,
   ip						varchar(128),
   pathoffile				varchar(255)
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_comments.sql b/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
index 3fcc5a0abf9..52d938b7c47 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
@@ -19,7 +19,7 @@ CREATE TABLE llx_opensurvey_comments (
     id_comment INTEGER unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
     id_sondage CHAR(16) NOT NULL,
     comment text NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     usercomment text
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
index a2ddafa1b54..03ad9b35ec5 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
@@ -20,5 +20,5 @@ CREATE TABLE llx_opensurvey_user_studs (
     nom VARCHAR(64) NOT NULL,
     id_sondage VARCHAR(16) NOT NULL,
     reponses VARCHAR(100) NOT NULL,		-- Not used for 'F' surveys
-    tms timestamp
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql
index d0cfd727d95..bbf7d52e6c7 100644
--- a/htdocs/install/mysql/tables/llx_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_paiement.sql
@@ -22,9 +22,10 @@ create table llx_paiement
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   ref              varchar(30) NULL,                    -- payment reference number
+  ref_ext          varchar(255) NULL,                    -- payment external reference
   entity           integer   DEFAULT 1 NOT NULL,		-- Multi company id
   datec            datetime,							-- date de creation
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep            datetime,							-- payment date
   amount           double(24,8) DEFAULT 0,				-- amount paid in Dolibarr currency
   multicurrency_amount double(24,8) DEFAULT 0,			-- amount paid in invoice currency	
@@ -37,5 +38,6 @@ create table llx_paiement
   fk_user_creat    integer,								-- utilisateur qui a cree l'info
   fk_user_modif    integer,								-- utilisateur qui a modifie l'info
   statut           smallint DEFAULT 0 NOT NULL,			-- Satut, 0 ou 1, 1 n'est plus supprimable
-  fk_export_compta integer DEFAULT 0 NOT NULL			-- fk_export_compta 0 pas exporte
+  fk_export_compta integer DEFAULT 0 NOT NULL,			-- fk_export_compta 0 pas exporte
+  pos_change       double(24,8) DEFAULT 0  				-- Excess received in TakePOS cash payment
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
index b489588777a..640f5f0af54 100644
--- a/htdocs/install/mysql/tables/llx_paiementcharge.sql
+++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql
@@ -21,7 +21,7 @@ create table llx_paiementcharge
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_charge       integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 519526f764a..04066435f20 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -22,7 +22,7 @@ create table llx_paiementfourn
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   ref					varchar(30),
   entity				integer DEFAULT 1,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec					datetime,          -- date de creation de l'enregistrement
   datep					datetime,          -- date de paiement
   amount				double(24,8) DEFAULT 0,    -- montant
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index 6573bcb7119..088138bf96f 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -21,7 +21,7 @@ create table llx_payment_donation
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_donation     integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepayment  integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 8a75bfcdbfd..a83c0c926a4 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -21,7 +21,7 @@ create table llx_payment_expensereport
   rowid                   integer AUTO_INCREMENT PRIMARY KEY,
   fk_expensereport        integer,
   datec                   datetime,           -- date de creation
-  tms                     timestamp,
+  tms                     timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep                   datetime,           -- payment date
   amount                  double(24,8) DEFAULT 0,
   fk_typepayment          integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index a646ba1917b..0e080a1bdb7 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -22,7 +22,7 @@ create table llx_payment_loan
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,         -- creation date
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,         -- payment date
   amount_capital	double(24,8) DEFAULT 0,
   amount_insurance	double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index cc4aaf94ccb..d6ad2ffcfed 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -20,7 +20,7 @@ create table llx_payment_salary
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(30) NULL,           -- payment reference number (currently NULL because there is no numbering manager yet)
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,                   -- Create date
   fk_user         integer NOT NULL,
   datep           date,                       -- payment date
diff --git a/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql b/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
index 3bfed602cff..5f15918ef18 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_payment_salary_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- salary payment id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_payment_various.sql b/htdocs/install/mysql/tables/llx_payment_various.sql
index 4b48c649578..17bbf7c7a16 100644
--- a/htdocs/install/mysql/tables/llx_payment_various.sql
+++ b/htdocs/install/mysql/tables/llx_payment_various.sql
@@ -22,7 +22,7 @@ create table llx_payment_various
   ref                   varchar(30) NULL,           -- payment reference number (currently NULL because there is no numbering manager yet)
   num_payment           varchar(50),				-- num cheque or other
   label                 varchar(255),
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec                 datetime,                   -- Create date
   datep                 date,                       -- date de paiement
   datev                 date,                       -- date de valeur (this field should not be here, only into bank tables)
diff --git a/htdocs/install/mysql/tables/llx_printing.sql b/htdocs/install/mysql/tables/llx_printing.sql
index 0f0c7c71d1b..ecfe050240b 100644
--- a/htdocs/install/mysql/tables/llx_printing.sql
+++ b/htdocs/install/mysql/tables/llx_printing.sql
@@ -20,7 +20,7 @@
 CREATE TABLE llx_printing 
 (
  rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  datec datetime,
  printer_name text NOT NULL, 
  printer_location text NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index b360b4d7f9d..bc583a76ce2 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -30,7 +30,7 @@ create table llx_product
   ref_ext                       varchar(128),                       -- reference into an external system (not used by dolibarr)
 
   datec                         datetime,
-  tms                           timestamp,
+  tms                           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_parent                     integer	  DEFAULT 0,                -- Not used. Used by external modules. Virtual product id
 
   label                         varchar(255) NOT NULL,
@@ -39,6 +39,7 @@ create table llx_product
   note                          text,
   customcode                    varchar(32),                        -- Optionnal custom code
   fk_country                    integer DEFAULT NULL,               -- Optionnal id of original country
+  fk_state                      integer DEFAULT NULL,               -- Optionnal id of original state/province
   price                         double(24,8) DEFAULT 0,
   price_ttc                     double(24,8) DEFAULT 0,
   price_min                     double(24,8) DEFAULT 0,
@@ -60,7 +61,7 @@ create table llx_product
   tobatch                       tinyint      DEFAULT 0 NOT NULL,    -- Is it a product that need a batch management (eat-by or lot management)
   fk_product_type               integer      DEFAULT 0,             -- Type of product: 0 for regular product, 1 for service, 9 for other (used by external module)
   duration                      varchar(6),
-  seuil_stock_alerte            integer      DEFAULT NULL,
+  seuil_stock_alerte            float      DEFAULT NULL,
   url                           varchar(255),
   barcode                       varchar(180) DEFAULT NULL,          -- barcode
   fk_barcode_type               integer      DEFAULT NULL,          -- barcode type
@@ -96,7 +97,7 @@ create table llx_product
   import_key                    varchar(14),                        -- Import key
   model_pdf                     varchar(255),                       -- model save dodument used
   fk_price_expression           integer,                            -- Link to the rule for dynamic price calculation
-  desiredstock                  integer      DEFAULT 0,
+  desiredstock                  float      DEFAULT 0,
   fk_unit                       integer      DEFAULT NULL,
   price_autogen                 tinyint      DEFAULT 0,
   fk_project                    integer      DEFAULT NULL           -- Used when product was generated by a project or is specifif to a project
diff --git a/htdocs/install/mysql/tables/llx_product_attribute.sql b/htdocs/install/mysql/tables/llx_product_attribute.sql
index f7ebee3cc23..362c104b95c 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
 -- Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
+-- Copyright (C) 2020      Laurent Destailleur   <eldy@users.sourceforge.net>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -14,12 +15,15 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
+-- llx_product_attribute is table for labels of product variants attributes. For exemple: COLOR, SIZE, ... 
+-- The different possible values (for example BLUE, GREEN, ... for COLOR) are defined into llx_product_attribute_value.
 -- ============================================================================
 
 CREATE TABLE llx_product_attribute
 (
   rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
   ref VARCHAR(255) NOT NULL,
+  ref_ext VARCHAR(255) NULL,
   label VARCHAR(255) NOT NULL,
   rang INT DEFAULT 0 NOT NULL,
   entity INT DEFAULT 1 NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
index 2e80a4b2af2..ce64eafde0e 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
 -- Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
+-- Copyright (C) 2020      Laurent Destailleur   <eldy@users.sourceforge.net>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -14,15 +15,17 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
+-- Table to store links between a parent product and its variant products.
 -- ============================================================================
 
 CREATE TABLE llx_product_attribute_combination
 (
   rowid INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT,
-  fk_product_parent INTEGER NOT NULL,
-  fk_product_child INTEGER NOT NULL,
+  fk_product_parent INTEGER NOT NULL,					-- id of product id that is parent product
+  fk_product_child INTEGER NOT NULL,					-- id of product id that is variant (child) product
   variation_price DOUBLE(24,8) NOT NULL,
   variation_price_percentage INTEGER NULL,
   variation_weight REAL NOT NULL,
+  variation_ref_ext VARCHAR(255) NULL,
   entity INTEGER DEFAULT 1 NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.key.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.key.sql
new file mode 100644
index 00000000000..4c191193754
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.key.sql
@@ -0,0 +1,21 @@
+-- ============================================================================
+-- Copyright (C) 2020      John BOTELLA         <john.botella@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+
+ALTER TABLE llx_product_attribute_combination_price_level ADD UNIQUE( fk_product_attribute_combination, fk_price_level);
+
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.sql b/htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.sql
new file mode 100644
index 00000000000..70086f82068
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_attribute_combination_price_level.sql
@@ -0,0 +1,27 @@
+-- ============================================================================
+-- Copyright (C) 2020      John BOTELLA         <john.botella@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TABLE llx_product_attribute_combination_price_level
+(
+  rowid INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_attribute_combination INTEGER DEFAULT 1 NOT NULL,
+  fk_price_level INTEGER DEFAULT 1 NOT NULL,
+  variation_price DOUBLE(24,8) NOT NULL,
+  variation_price_percentage INTEGER NULL
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_value.sql b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
index c4e0ec91459..09e7d325d0d 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute_value.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
@@ -15,6 +15,8 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
+-- llx_product_attribute_value is table for different available values of a product variants attributes.
+-- For example BLUE, GREEN, ... for the product attribute COLOR.
 -- ============================================================================
 
 CREATE TABLE llx_product_attribute_value
diff --git a/htdocs/install/mysql/tables/llx_product_batch.sql b/htdocs/install/mysql/tables/llx_product_batch.sql
index 9b736278e3a..7300c49874f 100644
--- a/htdocs/install/mysql/tables/llx_product_batch.sql
+++ b/htdocs/install/mysql/tables/llx_product_batch.sql
@@ -20,7 +20,7 @@
 
 CREATE TABLE llx_product_batch (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product_stock integer NOT NULL,
   eatby datetime DEFAULT NULL,			-- deprecated. should not be used here but should be stored into a table llx_product_lot
   sellby datetime DEFAULT NULL,			-- deprecated. should not be used here but should be stored into a table llx_product_lot
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price.sql b/htdocs/install/mysql/tables/llx_product_customer_price.sql
index c7b6f1eb1a2..7cd481c3c75 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price.sql
@@ -25,7 +25,7 @@ create table llx_product_customer_price
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec					datetime,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer NOT NULL,
   fk_soc				integer NOT NULL,	   
   price						double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql
index b265340d11c..24e53d9bda6 100644
--- a/htdocs/install/mysql/tables/llx_product_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_product_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 7e61a2df6b1..20d4db7492b 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -24,7 +24,7 @@ create table llx_product_fournisseur_price
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec					datetime,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer,
   fk_soc				integer,
   ref_fourn				varchar(30),
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql
index 51d5499e825..728915521a7 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql
@@ -18,7 +18,7 @@
 
 Create Table llx_product_fournisseur_price_extrafields (
 	rowid               integer AUTO_INCREMENT PRIMARY KEY,
-	tms                 timestamp,
+	tms                 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_object           integer NOT NULL,
 	import_key          varchar(14) -- import key
 ) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_lot.sql b/htdocs/install/mysql/tables/llx_product_lot.sql
index 4d59a46c153..86cca7d0f04 100644
--- a/htdocs/install/mysql/tables/llx_product_lot.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot.sql
@@ -25,7 +25,7 @@ CREATE TABLE llx_product_lot (
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer
diff --git a/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql b/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
index b3843ed9ba6..8fbbbde1bc5 100644
--- a/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_product_lot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
index 75a5355afe7..ff862e427e0 100644
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -25,7 +25,7 @@ create table llx_product_price
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer   DEFAULT 1 NOT NULL,		-- Multi company id
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product		integer NOT NULL,
   date_price		datetime NOT NULL,
   price_level		smallint NULL DEFAULT 1,
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
index 7cb8b327b4d..dc3a21bfedb 100644
--- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
+++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
@@ -40,6 +40,6 @@ create table llx_product_price_by_qty
   multicurrency_price	double(24,8) DEFAULT NULL,
   multicurrency_price_ttc	double(24,8) DEFAULT NULL,
   
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   import_key    	varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql
index 586c5b410c7..c5a2f4ad005 100644
--- a/htdocs/install/mysql/tables/llx_product_stock.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock.sql
@@ -21,7 +21,7 @@
 create table llx_product_stock
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product      integer NOT NULL,
   fk_entrepot     integer NOT NULL,
   reel            real,           			-- physical stock
diff --git a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
index b5d69defd9e..d6d5e57e549 100644
--- a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
@@ -21,11 +21,11 @@
 create table llx_product_warehouse_properties
 (
   rowid           		integer AUTO_INCREMENT PRIMARY KEY,
-  tms             		timestamp,
+  tms             		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product      		integer NOT NULL,
   fk_entrepot     		integer NOT NULL,
-  seuil_stock_alerte    integer DEFAULT '0',
-  desiredstock    		integer DEFAULT '0',
+  seuil_stock_alerte    float DEFAULT '0',
+  desiredstock    		float DEFAULT '0',
   import_key      		varchar(14)               -- Import key
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index 940ee03bea2..a36adb3a672 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -22,7 +22,7 @@ create table llx_projet
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   fk_soc           integer,
   datec            datetime,					-- date creation project
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   dateo            date,						-- date start project
   datee            date,						-- date end project
   ref              varchar(50),
@@ -39,6 +39,7 @@ create table llx_projet
   fk_user_close    integer DEFAULT NULL,
   note_private     text,
   note_public      text,
+  email_msgid      varchar(255),				-- if project or lead is created by email collector, we store here MSG ID
   --budget_days      real,                      -- budget in days is sum of field planned_workload of tasks
   opp_amount       double(24,8),
   budget_amount    double(24,8),
diff --git a/htdocs/install/mysql/tables/llx_projet_extrafields.sql b/htdocs/install/mysql/tables/llx_projet_extrafields.sql
index 8a96a715b05..0001d4e8876 100644
--- a/htdocs/install/mysql/tables/llx_projet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_projet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_projet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql
index cc1088cf7a7..01edb857738 100644
--- a/htdocs/install/mysql/tables/llx_projet_task.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task.sql
@@ -25,7 +25,7 @@ create table llx_projet_task
   fk_projet				integer NOT NULL,
   fk_task_parent		integer DEFAULT 0 NOT NULL,
   datec					datetime,						-- date creation
-  tms					timestamp,						-- date creation/modification
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,						-- last modification date
   dateo					datetime,						-- date start task
   datee					datetime,						-- date end task
   datev					datetime,						-- date validation
diff --git a/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql b/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
index 256c9025dc0..bf3d25e6922 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_projet_task_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index e1c857af2c3..786d8907588 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -29,7 +29,7 @@ create table llx_projet_task_time
   invoice_id       integer DEFAULT NULL,				-- If we need to invoice each line of timespent, we can save invoice id here
   invoice_line_id  integer DEFAULT NULL,                -- If we need to invoice each line of timespent, we can save invoice line id here
   import_key	   varchar(14),					-- Import key
-  datec            date,						-- Date creation time
-  tms              timestamp,					-- Date update time
+  datec            datetime,					-- date creation time
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					-- last modification date
   note             text							-- A comment
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index d21d9ef2d7e..662db791094 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -32,7 +32,7 @@ create table llx_propal
   fk_soc				integer,
   fk_projet				integer     DEFAULT NULL,		-- projet auquel est rattache la propale
 
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec					datetime,						-- date de creation 
   datep					date,							-- date de la propal
   fin_validite			datetime,						-- date de fin de validite
diff --git a/htdocs/install/mysql/tables/llx_propal_extrafields.sql b/htdocs/install/mysql/tables/llx_propal_extrafields.sql
index f6ccb68b39b..31201e37b55 100644
--- a/htdocs/install/mysql/tables/llx_propal_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_propal_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_propal_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
index 0c636b2507c..b599702d560 100644
--- a/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
+++ b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
@@ -22,7 +22,7 @@ CREATE TABLE llx_propal_merge_pdf_product (
   fk_user_author integer DEFAULT NULL,
   fk_user_mod integer NOT NULL,
   datec datetime NOT NULL,
-  tms timestamp NOT NULL,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql b/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
index 74986b1c641..7235d65eccd 100644
--- a/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_propaldet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_reception.sql b/htdocs/install/mysql/tables/llx_reception.sql
index 05ed6ca4604..71cc000ffc1 100644
--- a/htdocs/install/mysql/tables/llx_reception.sql
+++ b/htdocs/install/mysql/tables/llx_reception.sql
@@ -22,7 +22,7 @@
 create table llx_reception
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_reception_extrafields.sql b/htdocs/install/mysql/tables/llx_reception_extrafields.sql
index e2f83794a0b..13d3be5fe77 100644
--- a/htdocs/install/mysql/tables/llx_reception_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_reception_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_reception_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.key.sql
new file mode 100644
index 00000000000..eae967704b4
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.key.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) 2020	Laurent Destailleur	<eldy@users.sourceforge.net>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_rowid (rowid);
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_ref (ref);
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD CONSTRAINT llx_recruitment_recruitmentcandidature_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_recruitmentcandidature_status (status);
+-- END MODULEBUILDER INDEXES
+
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD UNIQUE INDEX uk_recruitmentcandidature_email_msgid(email_msgid);
+
+-- ALTER TABLE llx_recruitment_recruitmentcandidature ADD CONSTRAINT llx_mymodule_myobject_fk_field FOREIGN KEY (fk_field) REFERENCES llx_mymodule_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
new file mode 100644
index 00000000000..ded61d49e8b
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
@@ -0,0 +1,43 @@
+-- Copyright (C) 2020	Laurent Destailleur	<eldy@users.sourceforge.net>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+
+CREATE TABLE llx_recruitment_recruitmentcandidature(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	entity integer NOT NULL DEFAULT 1,
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
+	fk_recruitmentjobposition INTEGER NULL,
+	description text, 
+	note_public text, 
+	note_private text, 
+	date_creation datetime NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
+	fk_user_creat integer NOT NULL, 
+	fk_user_modif integer, 
+	import_key varchar(14), 
+	model_pdf varchar(255), 
+	status smallint NOT NULL, 
+	firstname varchar(128), 
+	lastname varchar(128), 
+	email varchar(255),
+	phone varchar(64), 
+	date_birth date,
+	remuneration_requested integer, 
+	remuneration_proposed integer,
+	email_msgid varchar(255),
+	fk_recruitment_origin INTEGER NULL
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.key.sql
new file mode 100644
index 00000000000..72a90391471
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.key.sql
@@ -0,0 +1,19 @@
+-- Copyright (C) 2020	Laurent Destailleur	<eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_recruitment_recruitmentcandidature_extrafields ADD INDEX idx_recruitmentcandidature_fk_object(fk_object);
+-- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql
new file mode 100644
index 00000000000..77cf71b9b00
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql
@@ -0,0 +1,23 @@
+-- Copyright (C) 2020	Laurent Destailleur	<eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+create table llx_recruitment_recruitmentcandidature_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.key.sql
new file mode 100644
index 00000000000..32f6701a6a2
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.key.sql
@@ -0,0 +1,32 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- 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/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_rowid (rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_ref (ref);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_fk_soc (fk_soc);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_fk_project (fk_project);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD CONSTRAINT llx_recruitment_recruitmentjobposition_fk_user_recruiter FOREIGN KEY (fk_user_recruiter) REFERENCES llx_user(rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD CONSTRAINT llx_recruitment_recruitmentjobposition_fk_user_supervisor FOREIGN KEY (fk_user_supervisor) REFERENCES llx_user(rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD CONSTRAINT llx_recruitment_recruitmentjobposition_fk_establishment FOREIGN KEY (fk_establishment) REFERENCES llx_establishment(rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD CONSTRAINT llx_recruitment_recruitmentjobposition_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_recruitment_recruitmentjobposition ADD INDEX idx_recruitment_recruitmentjobposition_status (status);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_recruitment_recruitmentjobposition ADD UNIQUE INDEX uk_recruitment_recruitmentjobposition_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_recruitment_recruitmentjobposition ADD CONSTRAINT llx_recruitment_recruitmentjobposition_fk_field FOREIGN KEY (fk_field) REFERENCES llx_recruitment_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql
new file mode 100644
index 00000000000..4ad1198d808
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql
@@ -0,0 +1,44 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+
+CREATE TABLE llx_recruitment_recruitmentjobposition(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
+	entity INTEGER DEFAULT 1 NOT NULL,
+	label varchar(255) NOT NULL, 
+	qty integer DEFAULT 1 NOT NULL, 
+	fk_soc integer, 
+	fk_project integer, 
+	fk_user_recruiter integer,
+	email_recruiter varchar(255),
+	fk_user_supervisor integer, 
+	fk_establishment integer, 
+	date_planned date,
+	remuneration_suggested varchar(255), 
+	description text, 
+	note_public text, 
+	note_private text, 
+	date_creation datetime NOT NULL, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
+	fk_user_creat integer NOT NULL, 
+	fk_user_modif integer, 
+	last_main_doc varchar(255), 
+	import_key varchar(14), 
+	model_pdf varchar(255), 
+	status smallint NOT NULL
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.key.sql
new file mode 100644
index 00000000000..dfb495c3efc
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.key.sql
@@ -0,0 +1,19 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- 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/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_recruitment_recruitmentjobposition_extrafields ADD INDEX idx_recruitmentjobposition_fk_object(fk_object);
+-- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql
new file mode 100644
index 00000000000..21b1ec081bf
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql
@@ -0,0 +1,23 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+create table llx_recruitment_recruitmentjobposition_extrafields
+(
+  rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  fk_object                 integer NOT NULL,
+  import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_resource.sql b/htdocs/install/mysql/tables/llx_resource.sql
index 7dc709ad83a..30bd2bcbbf3 100644
--- a/htdocs/install/mysql/tables/llx_resource.sql
+++ b/htdocs/install/mysql/tables/llx_resource.sql
@@ -34,5 +34,5 @@ CREATE TABLE llx_resource
   import_key			varchar(14),
   extraparams			varchar(255),					-- for stock other parameters with json format
   fk_country          integer DEFAULT NULL,          -- Optional id of original country
-  tms         			  timestamp
+  tms         			  timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_resource_extrafields.sql b/htdocs/install/mysql/tables/llx_resource_extrafields.sql
index 6e828258339..88bcc7606c8 100644
--- a/htdocs/install/mysql/tables/llx_resource_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_resource_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_resource_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index a98be7912f7..88a0fcbda46 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -114,7 +114,7 @@ create table llx_societe
   webservices_url          varchar(255),                            	-- supplier webservice url
   webservices_key          varchar(128),                            	-- supplier webservice key
 
-  tms                      timestamp,									-- last modification date
+  tms                      timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,									-- last modification date
   datec	                   datetime,                            		-- creation date
   fk_user_creat            integer NULL,                        		-- utilisateur qui a cree l'info
   fk_user_modif            integer,                             		-- utilisateur qui a modifie l'info
diff --git a/htdocs/install/mysql/tables/llx_societe_account.sql b/htdocs/install/mysql/tables/llx_societe_account.sql
index 6a78a9a7839..b200d4f3854 100644
--- a/htdocs/install/mysql/tables/llx_societe_account.sql
+++ b/htdocs/install/mysql/tables/llx_societe_account.sql
@@ -33,7 +33,7 @@ CREATE TABLE llx_societe_account(
 	date_last_login   datetime,
 	date_previous_login datetime,
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql
index 626b0155519..2b5f2d57146 100644
--- a/htdocs/install/mysql/tables/llx_societe_address.sql
+++ b/htdocs/install/mysql/tables/llx_societe_address.sql
@@ -21,7 +21,7 @@ create table llx_societe_address
 (
   rowid              integer AUTO_INCREMENT PRIMARY KEY,
   datec	             datetime,                            -- creation date
-  tms                timestamp,                           -- modification date
+  tms                timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                           -- last modification date
   label              varchar(30),                         --
   fk_soc	         integer        DEFAULT 0,            --
   name               varchar(60),                         -- company name
diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql
index e277db15821..a4b5b269358 100644
--- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_societe_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql
index 2b88340e611..2e9178774f5 100644
--- a/htdocs/install/mysql/tables/llx_societe_prices.sql
+++ b/htdocs/install/mysql/tables/llx_societe_prices.sql
@@ -20,7 +20,7 @@ create table llx_societe_prices
 (
   rowid              integer AUTO_INCREMENT PRIMARY KEY,
   fk_soc             integer   DEFAULT 0,
-  tms                timestamp, 
+  tms                timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
   datec	             datetime,
   fk_user_author     integer,
   price_level        tinyint   DEFAULT 1
diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql
index a3a265cce5f..2d4e3a9c258 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise.sql
@@ -24,7 +24,7 @@ create table llx_societe_remise
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer DEFAULT 1 NOT NULL,			-- multi company id
   fk_soc			integer NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
   remise_client		double(6,3)  DEFAULT 0 NOT NULL,	-- discount
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
index 3786b16b76a..d6dfdc20d9d 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
@@ -24,7 +24,7 @@ create table llx_societe_remise_supplier
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer DEFAULT 1 NOT NULL,			-- multi company id
   fk_soc			integer NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
   remise_supplier	double(6,3)  DEFAULT 0 NOT NULL,	-- discount
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql
index 7d00d9fb1dd..ece4b2edffe 100644
--- a/htdocs/install/mysql/tables/llx_societe_rib.sql
+++ b/htdocs/install/mysql/tables/llx_societe_rib.sql
@@ -27,7 +27,7 @@ create table llx_societe_rib
   label          varchar(200),
   fk_soc         integer NOT NULL,
   datec          datetime,
-  tms            timestamp,
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 
   -- For BAN
   bank           varchar(255),  -- bank name
diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
index fceb2044649..decc229e3e7 100644
--- a/htdocs/install/mysql/tables/llx_socpeople.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople.sql
@@ -2,6 +2,7 @@
 -- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
 -- Copyright (C) 2008      Laurent Destailleur  <eldy@users.sourceforge.net>
 -- Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
+-- Copyright (C) 2020      Open-Dsi        		<support@open-dsi.fr>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -22,7 +23,7 @@ create table llx_socpeople
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   datec				datetime,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_soc			integer,									-- lien vers la societe
   entity			integer DEFAULT 1 NOT NULL,					-- multi company id
   ref_ext           varchar(255),                               -- reference into an external system (not used by dolibarr)
@@ -57,6 +58,8 @@ create table llx_socpeople
   photo				varchar(255),
   no_email			smallint NOT NULL DEFAULT 0,				-- deprecated. Use table llx_mailing_unsubscribe instead
   priv				smallint NOT NULL DEFAULT 0,
+  fk_prospectcontactlevel  	varchar(12),                         		-- prospect level (in llx_c_prospectcontactlevel)
+  fk_stcommcontact  		integer        DEFAULT 0 NOT NULL,      	-- commercial statut
   fk_user_creat		integer DEFAULT 0,							-- user qui a creel'enregistrement
   fk_user_modif		integer,
   note_private		text,
diff --git a/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql b/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
index 66220ce7e98..f2f594e12f3 100644
--- a/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_socpeople_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
index 94501a516dd..2cd094c1b05 100644
--- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
@@ -20,7 +20,7 @@
 create table llx_stock_mouvement
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datem           datetime,						-- Date and hour of movement
   fk_product      integer NOT NULL,				-- Id of product
   batch           varchar(128) DEFAULT NULL,	-- Lot or serial number
diff --git a/htdocs/install/mysql/tables/llx_subscription.sql b/htdocs/install/mysql/tables/llx_subscription.sql
index a3562f12c57..8e86e216d3f 100644
--- a/htdocs/install/mysql/tables/llx_subscription.sql
+++ b/htdocs/install/mysql/tables/llx_subscription.sql
@@ -19,12 +19,12 @@
 create table llx_subscription
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,
   fk_adherent     integer,
   fk_type         integer,
   dateadh         datetime,
-  datef           date,
+  datef           datetime,
   subscription    double(24,8),
   fk_bank         integer DEFAULT NULL,
   fk_user_creat   integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
index 5e7393112d8..e63c4ff64c7 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_supplier_proposal (
   ref_int varchar(255) DEFAULT NULL,
   fk_soc integer DEFAULT NULL,
   fk_projet integer DEFAULT NULL,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec datetime DEFAULT NULL,
   date_valid datetime DEFAULT NULL,
   date_cloture datetime DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
index a13c74d0d04..8dfed18bbbc 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
@@ -17,7 +17,7 @@
 
 CREATE TABLE llx_supplier_proposal_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
index 0501aecc68b..df6b5216c21 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
@@ -17,7 +17,7 @@
 
 CREATE TABLE llx_supplier_proposaldet_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ticket.sql b/htdocs/install/mysql/tables/llx_ticket.sql
index 82e692a7f0d..c053e787dfa 100644
--- a/htdocs/install/mysql/tables/llx_ticket.sql
+++ b/htdocs/install/mysql/tables/llx_ticket.sql
@@ -38,6 +38,7 @@ CREATE TABLE llx_ticket
 	date_read datetime,
 	date_close datetime,
 	notify_tiers_at_create tinyint,
-	tms timestamp,
+	email_msgid varchar(255),				-- if ticket is created by email collector, we store here MSG ID
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key        varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql b/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
index 538da09692e..31f82064461 100644
--- a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
@@ -18,7 +18,7 @@
 create table llx_ticket_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- ticket id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index 2804d410e7d..6cf97e6b4c6 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -20,7 +20,7 @@
 create table llx_tva
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index 16170267bee..c734192ad64 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -29,7 +29,7 @@ create table llx_user
   fk_establishment  integer        DEFAULT 0,
 
   datec             datetime,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat     integer,
   fk_user_modif     integer,
   login             varchar(50) NOT NULL,
@@ -57,32 +57,27 @@ create table llx_user
   personal_email    varchar(255),
 
   socialnetworks    text DEFAULT NULL,       -- json with socialnetworks
-  jabberid			varchar(255),
-  skype				varchar(255),
-  twitter			varchar(255),                        		--
-  facebook			varchar(255),                        		--
-  linkedin                  varchar(255),                         	--
-  instagram                varchar(255),                        		--
-  snapchat                 varchar(255),                        		--
-  googleplus               varchar(255),                        		--
-  youtube                  varchar(255),                        		--
-  whatsapp                 varchar(255),                        		--
 
   signature         text DEFAULT NULL,
   admin             smallint DEFAULT 0,
+  
   module_comm       smallint DEFAULT 1,
   module_compta     smallint DEFAULT 1,
+  
   fk_soc			integer,
   fk_socpeople      integer,
   fk_member         integer,
   fk_user           integer,					-- Hierarchic parent
   fk_user_expense_validator           integer,
   fk_user_holiday_validator           integer,
+  
   note_public		text,
   note              text DEFAULT NULL,
   model_pdf         varchar(255) DEFAULT NULL,
   datelastlogin     datetime,
   datepreviouslogin datetime,
+  datestartvalidity datetime,
+  dateendvalidity   datetime,
   iplastlogin       varchar(250),
   ippreviouslogin   varchar(250),
   egroupware_id     integer,
@@ -90,7 +85,7 @@ create table llx_user
   openid            varchar(255),
   statut            tinyint DEFAULT 1,
   photo             varchar(255),				-- filename or url of photo
-  lang              varchar(6),
+  lang              varchar(6),					-- default language for communication. Note that language selected by user as interface language is savec into llx_user_param.
   color				varchar(6),
   barcode			varchar(255) DEFAULT NULL,
   fk_barcode_type	integer      DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_user_employment.sql b/htdocs/install/mysql/tables/llx_user_employment.sql
index ff2a87028d4..c06df0189d2 100644
--- a/htdocs/install/mysql/tables/llx_user_employment.sql
+++ b/htdocs/install/mysql/tables/llx_user_employment.sql
@@ -25,7 +25,7 @@ create table llx_user_employment
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   fk_user			integer,
   datec             datetime,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat     integer,
   fk_user_modif     integer,
   job				varchar(128),				-- job position. may be a dictionary
diff --git a/htdocs/install/mysql/tables/llx_user_extrafields.sql b/htdocs/install/mysql/tables/llx_user_extrafields.sql
index b7ba9116630..c38e9435a63 100644
--- a/htdocs/install/mysql/tables/llx_user_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_user_extrafields.sql
@@ -21,7 +21,7 @@
 create table llx_user_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- member id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_user_rib.sql b/htdocs/install/mysql/tables/llx_user_rib.sql
index 1349e77a77b..4463a1f6f2b 100644
--- a/htdocs/install/mysql/tables/llx_user_rib.sql
+++ b/htdocs/install/mysql/tables/llx_user_rib.sql
@@ -22,7 +22,7 @@ create table llx_user_rib
   fk_user        integer      NOT NULL,
   entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   datec          datetime,
-  tms            timestamp,
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label          varchar(30),
   bank           varchar(255),  -- bank name
   code_banque    varchar(128),  -- bank code
diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql
index 43bbba9dbb1..959dfbca3d9 100644
--- a/htdocs/install/mysql/tables/llx_usergroup.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup.sql
@@ -24,7 +24,7 @@ create table llx_usergroup
   nom           varchar(180) NOT NULL,
   entity        integer DEFAULT 1 NOT NULL,	-- multi company id
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   note          text,
   model_pdf     varchar(255) DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
index e2e96f142d9..ea358509eff 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
@@ -18,7 +18,7 @@
 
 CREATE TABLE llx_usergroup_extrafields (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index 743d4ec9ca8..b2103177972 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -35,6 +35,7 @@ CREATE TABLE llx_website
     fk_user_creat integer,
     fk_user_modif integer,
     date_creation datetime,
-	tms           timestamp,
+    position      integer DEFAULT 0,
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key    varchar(14)      -- import key	
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website_extrafields.sql b/htdocs/install/mysql/tables/llx_website_extrafields.sql
index ff39e2c51c4..b3fd6786a09 100644
--- a/htdocs/install/mysql/tables/llx_website_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_website_extrafields.sql
@@ -16,7 +16,7 @@
 CREATE TABLE llx_website_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website_page.sql b/htdocs/install/mysql/tables/llx_website_page.sql
index bacbc8e802b..4b1b3045d6b 100644
--- a/htdocs/install/mysql/tables/llx_website_page.sql
+++ b/htdocs/install/mysql/tables/llx_website_page.sql
@@ -38,6 +38,8 @@ CREATE TABLE llx_website_page
     fk_user_modif integer,
     author_alias  varchar(64),
     date_creation datetime,
-	tms           timestamp,
-    import_key    varchar(14)      -- import key
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    import_key    varchar(14),      -- import key
+    object_type varchar(255),
+    fk_object     varchar(255)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_zapier_hook.sql b/htdocs/install/mysql/tables/llx_zapier_hook.sql
index 27d56352bff..b54fbc0d348 100644
--- a/htdocs/install/mysql/tables/llx_zapier_hook.sql
+++ b/htdocs/install/mysql/tables/llx_zapier_hook.sql
@@ -22,8 +22,8 @@ CREATE TABLE llx_zapier_hook(
     module varchar(128),
     action varchar(128),
     status integer,
-    date_creation DATETIME NOT NULL,
+    date_creation datetime NOT NULL,
     fk_user integer NOT NULL,
-    tms TIMESTAMP NOT NULL,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key varchar(14)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql b/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql
index 09fef4cc399..0b4f6e97238 100644
--- a/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_zapier_hook_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          -- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index 22c122a1164..309343b7789 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -102,6 +102,8 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_cronjob FOR EACH ROW
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_deplacement FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_don FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_don_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_directories FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_files FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_element_resources FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_emailcollector_emailcollector FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_emailcollector_emailcollectoraction FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -150,6 +152,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_customer_pri
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_fournisseur_price FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_price FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_price_by_qty FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_stock FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_projet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -161,6 +164,10 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_extrafields F
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_merge_pdf_product FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propaldet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_resource FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentjobposition FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentjobposition_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentcandidature FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentcandidature_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe_address FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_societe_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -178,13 +185,5 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user FOR EACH ROW EX
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_usergroup FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_usergroup_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_product_price_by_qty FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_website FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_website_page FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-
-
--- Add triggers for timestamp fields named date_m
-CREATE OR REPLACE FUNCTION update_modified_column_date_m()	RETURNS TRIGGER AS $$ BEGIN NEW.date_m = now(); RETURN NEW; END; $$ LANGUAGE plpgsql;
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_directories FOR EACH ROW EXECUTE PROCEDURE update_modified_column_date_m();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_files FOR EACH ROW EXECUTE PROCEDURE update_modified_column_date_m();
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 034741c7c7e..e8965adedb3 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -30,7 +30,6 @@ include_once $dolibarr_main_document_root.'/core/lib/images.lib.php';
 require_once $dolibarr_main_document_root.'/core/class/extrafields.class.php';
 require_once 'lib/repair.lib.php';
 
-$grant_query = '';
 $step = 2;
 $ok = 0;
 
@@ -93,14 +92,13 @@ $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);
+	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
@@ -119,44 +117,40 @@ $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf
 
 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>";
-    dolibarr_install_syslog("repair: ".$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>";
-    dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
-    $ok = 0;
+	print '<tr><td class="nowrap">';
+	print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td class=\"right\">".$langs->trans("OK")."</td></tr>";
+	dolibarr_install_syslog("repair: ".$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>";
+	dolibarr_install_syslog("repair: ".$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>";
-        dolibarr_install_syslog("repair: 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>";
-        dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
-        $ok = 0;
-    }
+	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>";
+		dolibarr_install_syslog("repair: 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>";
+		dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
+		$ok = 0;
+	}
 }
 
 // Show database 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("repair: ".$langs->transnoentities("ServerVersion").": ".$version);
-    //print '<td class="right">'.join('.',$versionarray).'</td></tr>';
+	$version = $db->getVersion();
+	$versionarray = $db->getVersionArray();
+	print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
+	print '<td class="right">'.$version.'</td></tr>';
+	dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerVersion").": ".$version);
+	//print '<td class="right">'.join('.',$versionarray).'</td></tr>';
 }
 
 $conf->setValues($db);
@@ -185,41 +179,41 @@ if ($ok && GETPOST('standard', 'alpha'))
 {
 	$dir = "mysql/migration/";
 
-    $filelist = array();
-    $i = 0;
-    $ok = 0;
+	$filelist = array();
+	$i = 0;
+	$ok = 0;
 
-    // Recupere list fichier
-    $filesindir = array();
-    $handle = opendir($dir);
-    if (is_resource($handle))
-    {
-        while (($file = readdir($handle)) !== false)
-        {
-            if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
-        }
-    }
-    sort($filesindir);
+	// Recupere list fichier
+	$filesindir = array();
+	$handle = opendir($dir);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle)) !== false)
+		{
+			if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
+		}
+	}
+	sort($filesindir);
 
-    foreach ($filesindir as $file)
-    {
-        if (preg_match('/repair/i', $file))
-        {
-            $filelist[] = $file;
-        }
-    }
+	foreach ($filesindir as $file)
+	{
+		if (preg_match('/repair/i', $file))
+		{
+			$filelist[] = $file;
+		}
+	}
 
-    // Loop on each file
-    foreach ($filelist as $file)
-    {
-        print '<tr><td class="nowrap">*** ';
-        print $langs->trans("Script").'</td><td class="right">'.$file.'</td></tr>';
+	// Loop on each file
+	foreach ($filelist as $file)
+	{
+		print '<tr><td class="nowrap">*** ';
+		print $langs->trans("Script").'</td><td class="right">'.$file.'</td></tr>';
 
-        $name = substr($file, 0, dol_strlen($file) - 4);
+		$name = substr($file, 0, dol_strlen($file) - 4);
 
-        // Run sql script
-        $ok = run_sql($dir.$file, 0, '', 1);
-    }
+		// Run sql script
+		$ok = run_sql($dir.$file, 0, '', 1);
+	}
 }
 
 
@@ -236,106 +230,98 @@ if ($ok && GETPOST('standard', 'alpha'))
 	print '<tr><td colspan="2"><br>*** Check fields into extra table structure match table of definition. If not add column into table</td></tr>';
 	foreach ($listofmodulesextra as $tablename => $elementtype)
 	{
-	    // Get list of fields
-	    $tableextra = MAIN_DB_PREFIX.$tablename.'_extrafields';
+		// Get list of fields
+		$tableextra = MAIN_DB_PREFIX.$tablename.'_extrafields';
 
-	    // Define $arrayoffieldsdesc
-	    $arrayoffieldsdesc = $extrafields->fetch_name_optionals_label($elementtype);
+		// Define $arrayoffieldsdesc
+		$arrayoffieldsdesc = $extrafields->fetch_name_optionals_label($elementtype);
 
-	    // Define $arrayoffieldsfound
-	    $arrayoffieldsfound = array();
-	    $resql = $db->DDLDescTable($tableextra);
-	    if ($resql)
-	    {
-	        print '<tr><td>Check availability of extra field for '.$tableextra."<br>\n";
-	        $i = 0;
-	        while ($obj = $db->fetch_object($resql))
-	        {
-	            $fieldname = $fieldtype = '';
-	            if (preg_match('/mysql/', $db->type))
-	            {
-	                $fieldname = $obj->Field;
-	                $fieldtype = $obj->Type;
-	            }
-	            else
-	            {
-	                $fieldname = isset($obj->Key) ? $obj->Key : $obj->attname;
-	                $fieldtype = isset($obj->Type) ? $obj->Type : 'varchar';
-	            }
+		// Define $arrayoffieldsfound
+		$arrayoffieldsfound = array();
+		$resql = $db->DDLDescTable($tableextra);
+		if ($resql)
+		{
+			print '<tr><td>Check availability of extra field for '.$tableextra."<br>\n";
+			$i = 0;
+			while ($obj = $db->fetch_object($resql))
+			{
+				$fieldname = $fieldtype = '';
+				if (preg_match('/mysql/', $db->type))
+				{
+					$fieldname = $obj->Field;
+					$fieldtype = $obj->Type;
+				} else {
+					$fieldname = isset($obj->Key) ? $obj->Key : $obj->attname;
+					$fieldtype = isset($obj->Type) ? $obj->Type : 'varchar';
+				}
 
-	            if (empty($fieldname)) continue;
-	            if (in_array($fieldname, array('rowid', 'tms', 'fk_object', 'import_key'))) continue;
-	            $arrayoffieldsfound[$fieldname] = array('type'=>$fieldtype);
-	        }
+				if (empty($fieldname)) continue;
+				if (in_array($fieldname, array('rowid', 'tms', 'fk_object', 'import_key'))) continue;
+				$arrayoffieldsfound[$fieldname] = array('type'=>$fieldtype);
+			}
 
-	        // If it does not match, we create fields
-	        foreach ($arrayoffieldsdesc as $code => $label)
-	        {
-	            if (!in_array($code, array_keys($arrayoffieldsfound)))
-	            {
-	                print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> ";
-	                $type = $extrafields->attributes[$elementtype]['type'][$code]; $length = $extrafields->attributes[$elementtype]['size'][$code]; $attribute = ''; $default = ''; $extra = ''; $null = 'null';
+			// If it does not match, we create fields
+			foreach ($arrayoffieldsdesc as $code => $label)
+			{
+				if (!in_array($code, array_keys($arrayoffieldsfound)))
+				{
+					print 'Found field '.$code.' declared into '.MAIN_DB_PREFIX.'extrafields table but not found into desc of table '.$tableextra." -> ";
+					$type = $extrafields->attributes[$elementtype]['type'][$code]; $length = $extrafields->attributes[$elementtype]['size'][$code]; $attribute = ''; $default = ''; $extra = ''; $null = 'null';
 
-           			if ($type == 'boolean') {
-        				$typedb = 'int';
-        				$lengthdb = '1';
-        			} elseif ($type == 'price') {
-        				$typedb = 'double';
-        				$lengthdb = '24,8';
-        			} elseif ($type == 'phone') {
-        				$typedb = 'varchar';
-        				$lengthdb = '20';
-        			}elseif ($type == 'mail') {
-        				$typedb = 'varchar';
-        				$lengthdb = '128';
-        			} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
-        				$typedb = 'text';
-        				$lengthdb = '';
-        			} elseif ($type == 'link') {
-        				$typedb = 'int';
-        				$lengthdb = '11';
-        			} else {
-        				$typedb = $type;
-        				$lengthdb = $length;
-        			}
+		   			if ($type == 'boolean') {
+						$typedb = 'int';
+						$lengthdb = '1';
+					} elseif ($type == 'price') {
+						$typedb = 'double';
+						$lengthdb = '24,8';
+					} elseif ($type == 'phone') {
+						$typedb = 'varchar';
+						$lengthdb = '20';
+					} elseif ($type == 'mail') {
+						$typedb = 'varchar';
+						$lengthdb = '128';
+					} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
+						$typedb = 'text';
+						$lengthdb = '';
+					} elseif ($type == 'link') {
+						$typedb = 'int';
+						$lengthdb = '11';
+					} else {
+						$typedb = $type;
+						$lengthdb = $length;
+					}
 
-	                $field_desc = array(
-	                	'type'=>$typedb,
-	                	'value'=>$lengthdb,
-	                	'attribute'=>$attribute,
-	                	'default'=>$default,
-	                	'extra'=>$extra,
-	                	'null'=>$null
-	                );
-	                //var_dump($field_desc);exit;
+					$field_desc = array(
+						'type'=>$typedb,
+						'value'=>$lengthdb,
+						'attribute'=>$attribute,
+						'default'=>$default,
+						'extra'=>$extra,
+						'null'=>$null
+					);
+					//var_dump($field_desc);exit;
 
-	                $result = 0;
-	                if (GETPOST('standard', 'alpha') == 'confirmed')
-	                {
-	                	$result = $db->DDLAddField($tableextra, $code, $field_desc, "");
+					$result = 0;
+					if (GETPOST('standard', 'alpha') == 'confirmed')
+					{
+						$result = $db->DDLAddField($tableextra, $code, $field_desc, "");
 
-		                if ($result < 0)
-		                {
-	    	                print "KO ".$db->lasterror."<br>\n";
-	        	        }
-	            	    else
-	                	{
-	                    	print "OK<br>\n";
-		                }
-	                }
-	                else
-	                {
-	                	print ' - Mode test, no column added.';
-	                }
-	            }
-	        }
+						if ($result < 0)
+						{
+							print "KO ".$db->lasterror."<br>\n";
+						} else {
+							print "OK<br>\n";
+						}
+					} else {
+						print ' - Mode test, no column added.';
+					}
+				}
+			}
 
-	        print "</td><td>&nbsp;</td></tr>\n";
-	    }
-	    else
-	    {
-	    	dol_print_error($db);
-	    }
+			print "</td><td>&nbsp;</td></tr>\n";
+		} else {
+			dol_print_error($db);
+		}
 	}
 }
 
@@ -398,14 +384,10 @@ if ($ok && GETPOST('standard', 'alpha'))
 								$db->query($sqldelete);
 
 								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module '.$name.' not enabled in entity '.$obj->entity.', we delete record</td></tr>';
-							}
-							else
-							{
+							} else {
 								print '<tr><td>Widget '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module '.$name.' not enabled in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
-						}
-						else
-						{
+						} else {
 							//print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module found in entity '.$obj->entity.', we keep record</td></tr>';
 						}
 					}
@@ -462,8 +444,8 @@ if ($ok && GETPOST('standard', 'alpha'))
 						if ($obj2 && $obj2->nb == 0)
 						{
 							// Module not found, so we canremove entry
-							$sqldeletea = "DELETE FROM ".MAIN_DB_PREFIX."boxes WHERE entity = ".$obj->entity." AND box_id IN (SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$obj->file."' AND entity = ".$obj->entity.")";
-							$sqldeleteb = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$obj->file."' AND entity = ".$obj->entity;
+							$sqldeletea = "DELETE FROM ".MAIN_DB_PREFIX."boxes WHERE entity = ".$obj->entity." AND box_id IN (SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$db->escape($obj->file)."' AND entity = ".$obj->entity.")";
+							$sqldeleteb = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def WHERE file = '".$db->escape($obj->file)."' AND entity = ".$obj->entity;
 
 							if (GETPOST('standard', 'alpha') == 'confirmed')
 							{
@@ -471,14 +453,10 @@ if ($ok && GETPOST('standard', 'alpha'))
 								$db->query($sqldeleteb);
 
 								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we delete record</td></tr>';
-							}
-							else
-							{
+							} else {
 								print '<tr><td>Constant '.$obj->file.' set in boxes_def for entity '.$obj->entity.' but MAIN_MODULE_'.strtoupper($module).' not defined in entity '.$obj->entity.', we should delete record (not done, mode test)</td></tr>';
 							}
-						}
-						else
-						{
+						} else {
 							//print '<tr><td>Constant '.$obj->name.' set in entity '.$obj->entity.' with value '.$obj->value.' -> Module found in entity '.$obj->entity.', we keep record</td></tr>';
 						}
 					}
@@ -566,9 +544,7 @@ if ($ok && GETPOST('restore_thirdparties_logos'))
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		$ok = 0;
 		dol_print_error($db);
 	}
@@ -670,9 +646,7 @@ if ($ok && GETPOST('restore_user_pictures', 'alpha'))
 
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		$ok = 0;
 		dol_print_error($db);
 	}
@@ -684,65 +658,63 @@ if ($ok && GETPOST('restore_user_pictures', 'alpha'))
 // rebuild_product_thumbs: Rebuild thumbs for product files
 if ($ok && GETPOST('rebuild_product_thumbs', 'alpha'))
 {
-    $ext = '';
-    global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
+	$ext = '';
+	global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
 
-    print '<tr><td colspan="2"><br>*** Rebuild product thumbs<br>';
+	print '<tr><td colspan="2"><br>*** Rebuild product thumbs<br>';
 
-    $sql = "SELECT s.rowid, s.ref FROM ".MAIN_DB_PREFIX."product as s ORDER BY s.ref";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
+	$sql = "SELECT s.rowid, s.ref FROM ".MAIN_DB_PREFIX."product as s ORDER BY s.ref";
+	$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 (!empty($obj->ref))
-            {
-                $files = dol_dir_list($dolibarr_main_data_root.'/produit/'.$obj->ref, 'files', 0);
-                foreach ($files as $file)
-                {
+			if (!empty($obj->ref))
+			{
+				$files = dol_dir_list($dolibarr_main_data_root.'/produit/'.$obj->ref, 'files', 0);
+				foreach ($files as $file)
+				{
 					// Generate thumbs.
 					if (image_format_supported($file['fullname']) == 1)
 					{
-					    $imgThumbSmall = 'notbuild';
-                        if (GETPOST('rebuild_product_thumbs', 'alpha') == 'confirmed')
-                        {
-                            // Used on logon for example
-                            $imgThumbSmall = vignette($file['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
-                        }
-					    print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbSmall." maxwidthsmall=".$maxwidthsmall." maxheightsmall=".$maxheightsmall."<br>\n";
-					    $imgThumbMini = 'notbuild';
-                        if (GETPOST('rebuild_product_thumbs', 'alpha') == 'confirmed')
-                        {
-                            // Create mini thumbs for image (Ratio is near 16/9)
-                            // Used on menu or for setup page for example
-                            $imgThumbMini = vignette($file['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
-                        }
-					    print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbMini." maxwidthmini=".$maxwidthmini." maxheightmini=".$maxheightmini."<br>\n";
+						$imgThumbSmall = 'notbuild';
+						if (GETPOST('rebuild_product_thumbs', 'alpha') == 'confirmed')
+						{
+							// Used on logon for example
+							$imgThumbSmall = vignette($file['fullname'], $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
+						}
+						print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbSmall." maxwidthsmall=".$maxwidthsmall." maxheightsmall=".$maxheightsmall."<br>\n";
+						$imgThumbMini = 'notbuild';
+						if (GETPOST('rebuild_product_thumbs', 'alpha') == 'confirmed')
+						{
+							// Create mini thumbs for image (Ratio is near 16/9)
+							// Used on menu or for setup page for example
+							$imgThumbMini = vignette($file['fullname'], $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
+						}
+						print 'Check product '.$obj->rowid.", file ".$file['fullname']." -> ".$imgThumbMini." maxwidthmini=".$maxwidthmini." maxheightmini=".$maxheightmini."<br>\n";
 					}
-                }
-            }
+				}
+			}
 
-            $i++;
-        }
-    }
-    else
-    {
-        $ok = 0;
-        dol_print_error($db);
-    }
+			$i++;
+		}
+	} else {
+		$ok = 0;
+		dol_print_error($db);
+	}
 
-    print '</td></tr>';
+	print '</td></tr>';
 }
 
 // clean_linked_elements: Check and clean linked elements
 if ($ok && GETPOST('clean_linked_elements', 'alpha'))
 {
-    print '<tr><td colspan="2"><br>*** Check table of linked elements and delete orphelins links</td></tr>';
+	print '<tr><td colspan="2"><br>*** Check table of linked elements and delete orphelins links</td></tr>';
 	// propal => order
 	print '<tr><td colspan="2">'.checkLinkedElements('propal', 'commande')."</td></tr>\n";
 
@@ -809,23 +781,17 @@ if ($ok && GETPOST('clean_menus', 'alpha'))
 						print ' - Module condition '.$modulecond.' seems ko, we delete menu entry.';
 						if (GETPOST('clean_menus') == 'confirmed')
 						{
-							$sql2 = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE module = '".$modulecond."'";
+							$sql2 = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE module = '".$db->escape($modulecond)."'";
 							$resql2 = $db->query($sql2);
 							if (!$resql2)
 							{
 								$error++;
 								dol_print_error($db);
-							}
-							else
-								print ' - <span class="warning">Cleaned</span>';
-						}
-						else
-						{
+							} else print ' - <span class="warning">Cleaned</span>';
+						} else {
 							print ' - <span class="warning">Canceled (test mode)</span>';
 						}
-					}
-					else
-					{
+					} else {
 						print ' - Module condition '.$modulecond.' is ok, we do nothing.';
 					}
 				}
@@ -839,14 +805,10 @@ if ($ok && GETPOST('clean_menus', 'alpha'))
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr><td>No menu entries of disabled menus found</td></tr>';
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -856,442 +818,414 @@ if ($ok && GETPOST('clean_menus', 'alpha'))
 // clean_orphelin_dir: Run purge of directory
 if ($ok && GETPOST('clean_orphelin_dir', 'alpha'))
 {
-    $listmodulepart = array('company', 'invoice', 'invoice_supplier', 'propal', 'order', 'order_supplier', 'contract', 'tax');
-    foreach ($listmodulepart as $modulepart)
-    {
-        $filearray = array();
-        $upload_dir = isset($conf->$modulepart->dir_output) ? $conf->$modulepart->dir_output : '';
-        if ($modulepart == 'company') $upload_dir = $conf->societe->dir_output; // TODO change for multicompany sharing
-        if ($modulepart == 'invoice') $upload_dir = $conf->facture->dir_output;
-        if ($modulepart == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
-        if ($modulepart == 'order') $upload_dir = $conf->commande->dir_output;
-        if ($modulepart == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
-        if ($modulepart == 'contract') $upload_dir = $conf->contrat->dir_output;
+	$listmodulepart = array('company', 'invoice', 'invoice_supplier', 'propal', 'order', 'order_supplier', 'contract', 'tax');
+	foreach ($listmodulepart as $modulepart)
+	{
+		$filearray = array();
+		$upload_dir = isset($conf->$modulepart->dir_output) ? $conf->$modulepart->dir_output : '';
+		if ($modulepart == 'company') $upload_dir = $conf->societe->dir_output; // TODO change for multicompany sharing
+		if ($modulepart == 'invoice') $upload_dir = $conf->facture->dir_output;
+		if ($modulepart == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
+		if ($modulepart == 'order') $upload_dir = $conf->commande->dir_output;
+		if ($modulepart == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
+		if ($modulepart == 'contract') $upload_dir = $conf->contrat->dir_output;
 
-        if (empty($upload_dir)) continue;
+		if (empty($upload_dir)) continue;
 
-        print '<tr><td colspan="2"><br>*** Clean orphelins files into files '.$upload_dir.'</td></tr>';
+		print '<tr><td colspan="2"><br>*** Clean orphelins files into files '.$upload_dir.'</td></tr>';
 
-        $filearray = dol_dir_list($upload_dir, "files", 1, '', array('^SPECIMEN\.pdf$', '^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^payments$', '^CVS$', '^thumbs$'), '', SORT_DESC, 1, true);
+		$filearray = dol_dir_list($upload_dir, "files", 1, '', array('^SPECIMEN\.pdf$', '^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^payments$', '^CVS$', '^thumbs$'), '', SORT_DESC, 1, true);
 
-        // To show ref or specific information according to view to show (defined by $module)
-        if ($modulepart == 'company')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-            $object_instance = new Societe($db);
-        }
-        if ($modulepart == 'invoice')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-            $object_instance = new Facture($db);
-        }
-        elseif ($modulepart == 'invoice_supplier')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-            $object_instance = new FactureFournisseur($db);
-        }
-        elseif ($modulepart == 'propal')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-            $object_instance = new Propal($db);
-        }
-        elseif ($modulepart == 'order')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-            $object_instance = new Commande($db);
-        }
-        elseif ($modulepart == 'order_supplier')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-            $object_instance = new CommandeFournisseur($db);
-        }
-        elseif ($modulepart == 'contract')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-            $object_instance = new Contrat($db);
-        }
-        elseif ($modulepart == 'tax')
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
-            $object_instance = new ChargeSociales($db);
-        }
+		// To show ref or specific information according to view to show (defined by $module)
+		if ($modulepart == 'company')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+			$object_instance = new Societe($db);
+		}
+		if ($modulepart == 'invoice')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$object_instance = new Facture($db);
+		} elseif ($modulepart == 'invoice_supplier')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+			$object_instance = new FactureFournisseur($db);
+		} elseif ($modulepart == 'propal')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+			$object_instance = new Propal($db);
+		} elseif ($modulepart == 'order')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+			$object_instance = new Commande($db);
+		} elseif ($modulepart == 'order_supplier')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+			$object_instance = new CommandeFournisseur($db);
+		} elseif ($modulepart == 'contract')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+			$object_instance = new Contrat($db);
+		} elseif ($modulepart == 'tax')
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+			$object_instance = new ChargeSociales($db);
+		}
 
-        foreach ($filearray as $key => $file)
-        {
-            if (!is_dir($file['name'])
-            && $file['name'] != '.'
-            && $file['name'] != '..'
-            && $file['name'] != 'CVS'
-            )
-            {
-                // Define relative path used to store the file
-                $relativefile = preg_replace('/'.preg_quote($upload_dir.'/', '/').'/', '', $file['fullname']);
+		foreach ($filearray as $key => $file)
+		{
+			if (!is_dir($file['name'])
+			&& $file['name'] != '.'
+			&& $file['name'] != '..'
+			&& $file['name'] != 'CVS'
+			)
+			{
+				// Define relative path used to store the file
+				$relativefile = preg_replace('/'.preg_quote($upload_dir.'/', '/').'/', '', $file['fullname']);
 
-                //var_dump($file);
-                $id = 0; $ref = ''; $object_instance->id = 0; $object_instance->ref = ''; $label = '';
+				//var_dump($file);
+				$id = 0; $ref = ''; $object_instance->id = 0; $object_instance->ref = ''; $label = '';
 
-                // To show ref or specific information according to view to show (defined by $module)
-                if ($modulepart == 'invoice') {
-                    preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
-                }
-                if ($modulepart == 'invoice_supplier') {
-                    preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = empty($reg[1]) ? '' : $reg[1];
-                }
-                if ($modulepart == 'propal') {
-                    preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
-                }
-                if ($modulepart == 'order') {
-                    preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
-                }
-                if ($modulepart == 'order_supplier') {
-                    preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
-                }
-                if ($modulepart == 'contract') {
-                    preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
-                }
-                if ($modulepart == 'tax') {
-                    preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = $reg[1];
-                }
+				// To show ref or specific information according to view to show (defined by $module)
+				if ($modulepart == 'invoice') {
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
+				}
+				if ($modulepart == 'invoice_supplier') {
+					preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = empty($reg[1]) ? '' : $reg[1];
+				}
+				if ($modulepart == 'propal') {
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
+				}
+				if ($modulepart == 'order') {
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
+				}
+				if ($modulepart == 'order_supplier') {
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
+				}
+				if ($modulepart == 'contract') {
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $ref = $reg[1];
+				}
+				if ($modulepart == 'tax') {
+					preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = $reg[1];
+				}
 
-                if ($id || $ref)
-                {
-                    //print 'Fetch '.$id.' or '.$ref.'<br>';
-                    $result = $object_instance->fetch($id, $ref);
-                    //print $result.'<br>';
-                    if ($result == 0)    // Not found but no error
-                    {
-                        // Clean of orphelins directories are done into repair.php
-                        print '<tr><td colspan="2">';
-                        print 'Delete orphelins file '.$file['fullname'].'<br>';
-                        if (GETPOST('clean_orphelin_dir', 'alpha') == 'confirmed')
-                        {
-                            dol_delete_file($file['fullname'], 1, 1, 1);
-                            dol_delete_dir(dirname($file['fullname']), 1);
-                        }
-                        print "</td></tr>";
-                    }
-                    elseif ($result < 0) print 'Error in '.get_class($object_instance).'.fetch of id'.$id.' ref='.$ref.', result='.$result.'<br>';
-                }
-            }
-        }
-    }
+				if ($id || $ref)
+				{
+					//print 'Fetch '.$id.' or '.$ref.'<br>';
+					$result = $object_instance->fetch($id, $ref);
+					//print $result.'<br>';
+					if ($result == 0)    // Not found but no error
+					{
+						// Clean of orphelins directories are done into repair.php
+						print '<tr><td colspan="2">';
+						print 'Delete orphelins file '.$file['fullname'].'<br>';
+						if (GETPOST('clean_orphelin_dir', 'alpha') == 'confirmed')
+						{
+							dol_delete_file($file['fullname'], 1, 1, 1);
+							dol_delete_dir(dirname($file['fullname']), 1);
+						}
+						print "</td></tr>";
+					} elseif ($result < 0) print 'Error in '.get_class($object_instance).'.fetch of id'.$id.' ref='.$ref.', result='.$result.'<br>';
+				}
+			}
+		}
+	}
 }
 
 // clean_linked_elements: Check and clean linked elements
 if ($ok && GETPOST('clean_product_stock_batch', 'alpha'))
 {
-    $methodtofix = GETPOST('methodtofix', 'alpha') ?GETPOST('methodtofix', 'alpha') : 'updatestock';
+	$methodtofix = GETPOST('methodtofix', 'alpha') ?GETPOST('methodtofix', 'alpha') : 'updatestock';
 
-    print '<tr><td colspan="2"><br>*** Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)</td></tr>';
+	print '<tr><td colspan="2"><br>*** Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)</td></tr>';
 
-    $sql = "SELECT p.rowid, p.ref, p.tobatch, ps.rowid as psrowid, ps.fk_entrepot, ps.reel, SUM(pb.qty) as reelbatch";
-    $sql .= " FROM ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."product_stock as ps LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb ON ps.rowid = pb.fk_product_stock";
-    $sql .= " WHERE p.rowid = ps.fk_product";
-    $sql .= " AND p.tobatch = 1";
-    $sql .= " GROUP BY p.rowid, p.ref, p.tobatch, ps.rowid, ps.fk_entrepot, ps.reel";
-    $sql .= " HAVING reel != SUM(pb.qty) or SUM(pb.qty) IS NULL";
-    print $sql;
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
+	$sql = "SELECT p.rowid, p.ref, p.tobatch, ps.rowid as psrowid, ps.fk_entrepot, ps.reel, SUM(pb.qty) as reelbatch";
+	$sql .= " FROM ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."product_stock as ps LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb ON ps.rowid = pb.fk_product_stock";
+	$sql .= " WHERE p.rowid = ps.fk_product";
+	$sql .= " AND p.tobatch = 1";
+	$sql .= " GROUP BY p.rowid, p.ref, p.tobatch, ps.rowid, ps.fk_entrepot, ps.reel";
+	$sql .= " HAVING reel != SUM(pb.qty) or SUM(pb.qty) IS NULL";
+	print $sql;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                print '<tr><td>Product '.$obj->rowid.'-'.$obj->ref.' in warehose '.$obj->fk_entrepot.' -> '.$obj->psrowid.': '.$obj->reel.' (product_stock.reel) != '.($obj->reelbatch ? $obj->reelbatch : '0').' (sum product_batch)';
+		if ($num)
+		{
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				print '<tr><td>Product '.$obj->rowid.'-'.$obj->ref.' in warehose '.$obj->fk_entrepot.' -> '.$obj->psrowid.': '.$obj->reel.' (product_stock.reel) != '.($obj->reelbatch ? $obj->reelbatch : '0').' (sum product_batch)';
 
-                // Fix
-                if ($obj->reel != $obj->reelbatch)
-                {
-                    if ($methodtofix == 'updatebatch')
-                    {
-                        // Method 1
-                        print ' -> Insert qty '.($obj->reel - $obj->reelbatch).' with lot 000000 linked to fk_product_stock='.$obj->psrowid;
-                        if (GETPOST('clean_product_stock_batch') == 'confirmed')
-                        {
-                            $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_batch(fk_product_stock, batch, qty)";
-                            $sql2 .= "VALUES(".$obj->psrowid.", '000000', ".($obj->reel - $obj->reelbatch).")";
-                            $resql2 = $db->query($sql2);
-                            if (!$resql2)
-                            {
-                                // TODO If it fails, we must make update
-                                //$sql2 ="UPDATE ".MAIN_DB_PREFIX."product_batch";
-                                //$sql2.=" SET ".$obj->psrowid.", '000000', ".($obj->reel - $obj->reelbatch).")";
-                                //$sql2.=" WHERE fk_product_stock = ".$obj->psrowid"
-                            }
-                        }
-                    }
-                    if ($methodtofix == 'updatestock')
-                    {
-                        // Method 2
-                        print ' -> Update qty of product_stock with qty = '.($obj->reelbatch ? $obj->reelbatch : '0').' for ps.rowid = '.$obj->psrowid;
-                        if (GETPOST('clean_product_stock_batch') == 'confirmed')
-                        {
-                            $error = 0;
+				// Fix
+				if ($obj->reel != $obj->reelbatch)
+				{
+					if ($methodtofix == 'updatebatch')
+					{
+						// Method 1
+						print ' -> Insert qty '.($obj->reel - $obj->reelbatch).' with lot 000000 linked to fk_product_stock='.$obj->psrowid;
+						if (GETPOST('clean_product_stock_batch') == 'confirmed')
+						{
+							$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_batch(fk_product_stock, batch, qty)";
+							$sql2 .= "VALUES(".$obj->psrowid.", '000000', ".($obj->reel - $obj->reelbatch).")";
+							$resql2 = $db->query($sql2);
+							if (!$resql2)
+							{
+								// TODO If it fails, we must make update
+								//$sql2 ="UPDATE ".MAIN_DB_PREFIX."product_batch";
+								//$sql2.=" SET ".$obj->psrowid.", '000000', ".($obj->reel - $obj->reelbatch).")";
+								//$sql2.=" WHERE fk_product_stock = ".$obj->psrowid"
+							}
+						}
+					}
+					if ($methodtofix == 'updatestock')
+					{
+						// Method 2
+						print ' -> Update qty of product_stock with qty = '.($obj->reelbatch ? $obj->reelbatch : '0').' for ps.rowid = '.$obj->psrowid;
+						if (GETPOST('clean_product_stock_batch') == 'confirmed')
+						{
+							$error = 0;
 
-                            $db->begin();
+							$db->begin();
 
-                            $sql2 = "UPDATE ".MAIN_DB_PREFIX."product_stock";
-                            $sql2 .= " SET reel = ".($obj->reelbatch ? $obj->reelbatch : '0')." WHERE rowid = ".$obj->psrowid;
-                            $resql2 = $db->query($sql2);
-                            if ($resql2)
-                            {
-                                // We update product_stock, so we must field stock into product too.
-                                $sql3 = '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)';
-                                $resql3 = $db->query($sql3);
-                                if (!$resql3)
-                                {
-                                    $error++;
-                                    dol_print_error($db);
-                                }
-                            }
-                            else
-                            {
-                                $error++;
-                                dol_print_error($db);
-                            }
+							$sql2 = "UPDATE ".MAIN_DB_PREFIX."product_stock";
+							$sql2 .= " SET reel = ".($obj->reelbatch ? $obj->reelbatch : '0')." WHERE rowid = ".$obj->psrowid;
+							$resql2 = $db->query($sql2);
+							if ($resql2)
+							{
+								// We update product_stock, so we must fill p.stock into product too.
+								$sql3 = '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)';
+								$resql3 = $db->query($sql3);
+								if (!$resql3)
+								{
+									$error++;
+									dol_print_error($db);
+								}
+							} else {
+								$error++;
+								dol_print_error($db);
+							}
 
-                            if (!$error) $db->commit();
-                            else $db->rollback();
-                        }
-                    }
-                }
+							if (!$error) $db->commit();
+							else $db->rollback();
+						}
+					}
+				}
 
-                print'</td></tr>';
+				print'</td></tr>';
 
-                $i++;
-            }
-        }
-        else
-        {
-            print '<tr><td colspan="2">Nothing to do</td></tr>';
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+				$i++;
+			}
+		} else {
+			print '<tr><td colspan="2">Nothing to do</td></tr>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
 // clean_product_stock_negative_if_batch
 if ($ok && GETPOST('clean_product_stock_negative_if_batch', 'alpha'))
 {
-    print '<tr><td colspan="2"><br>Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)</td></tr>';
+	print '<tr><td colspan="2"><br>Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)</td></tr>';
 
-    $sql = "SELECT p.rowid, p.ref, p.tobatch, ps.rowid as psrowid, ps.fk_entrepot, ps.reel, SUM(pb.qty) as reelbatch";
-    $sql .= " FROM ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product_batch as pb";
-    $sql .= " WHERE p.rowid = ps.fk_product AND ps.rowid = pb.fk_product_stock";
-    $sql .= " AND p.tobatch = 1";
-    $sql .= " GROUP BY p.rowid, p.ref, p.tobatch, ps.rowid, ps.fk_entrepot, ps.reel";
-    $sql .= " HAVING reel != SUM(pb.qty)";
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
+	$sql = "SELECT p.rowid, p.ref, p.tobatch, ps.rowid as psrowid, ps.fk_entrepot, ps.reel, SUM(pb.qty) as reelbatch";
+	$sql .= " FROM ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product_batch as pb";
+	$sql .= " WHERE p.rowid = ps.fk_product AND ps.rowid = pb.fk_product_stock";
+	$sql .= " AND p.tobatch = 1";
+	$sql .= " GROUP BY p.rowid, p.ref, p.tobatch, ps.rowid, ps.fk_entrepot, ps.reel";
+	$sql .= " HAVING reel != SUM(pb.qty)";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                print '<tr><td>'.$obj->rowid.'-'.$obj->ref.'-'.$obj->fk_entrepot.' -> '.$obj->psrowid.': '.$obj->reel.' != '.$obj->reelbatch;
+		if ($num)
+		{
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				print '<tr><td>'.$obj->rowid.'-'.$obj->ref.'-'.$obj->fk_entrepot.' -> '.$obj->psrowid.': '.$obj->reel.' != '.$obj->reelbatch;
 
-                // TODO
-            }
-        }
-    }
+				// TODO
+			}
+		}
+	}
 }
 
 // set_empty_time_spent_amount
 if ($ok && GETPOST('set_empty_time_spent_amount', 'alpha'))
 {
-    print '<tr><td colspan="2"><br>*** Set value of time spent without amount</td></tr>';
+	print '<tr><td colspan="2"><br>*** Set value of time spent without amount</td></tr>';
 
-    $sql = "SELECT COUNT(ptt.rowid) as nb, u.rowid as user_id, u.login, u.thm as user_thm";
-    $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as ptt, ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE ptt.fk_user = u.rowid";
-    $sql .= " AND ptt.thm IS NULL and u.thm > 0";
-    $sql .= " GROUP BY u.rowid, u.login, u.thm";
+	$sql = "SELECT COUNT(ptt.rowid) as nb, u.rowid as user_id, u.login, u.thm as user_thm";
+	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as ptt, ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE ptt.fk_user = u.rowid";
+	$sql .= " AND ptt.thm IS NULL and u.thm > 0";
+	$sql .= " GROUP BY u.rowid, u.login, u.thm";
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
 
-        if ($num)
-        {
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                print '<tr><td>'.$obj->login.'-'.$obj->user_id.' ('.$obj->nb.' lines to fix) -> '.$obj->user_thm;
+		if ($num)
+		{
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				print '<tr><td>'.$obj->login.'-'.$obj->user_id.' ('.$obj->nb.' lines to fix) -> '.$obj->user_thm;
 
-                $db->begin();
+				$db->begin();
 
-                if (GETPOST('set_empty_time_spent_amount') == 'confirmed')
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
-                    $sql2 .= " SET thm = ".$obj->user_thm." WHERE thm IS NULL AND fk_user = ".$obj->user_id;
-                    $resql2 = $db->query($sql2);
-                    if (!$resql2)
-                    {
-                        $error++;
-                        dol_print_error($db);
-                    }
-                }
+				if (GETPOST('set_empty_time_spent_amount') == 'confirmed')
+				{
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
+					$sql2 .= " SET thm = ".$obj->user_thm." WHERE thm IS NULL AND fk_user = ".$obj->user_id;
+					$resql2 = $db->query($sql2);
+					if (!$resql2)
+					{
+						$error++;
+						dol_print_error($db);
+					}
+				}
 
-                if (!$error) $db->commit();
-                else $db->rollback();
+				if (!$error) $db->commit();
+				else $db->rollback();
 
-                print'</td></tr>';
+				print'</td></tr>';
 
-                if ($error) break;
+				if ($error) break;
 
-                $i++;
-            }
-        }
-        else
-        {
-            print '<tr><td>No time spent with empty line on users with a hourly rate defined</td></tr>';
-        }
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+				$i++;
+			}
+		} else {
+			print '<tr><td>No time spent with empty line on users with a hourly rate defined</td></tr>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
 // force_disable_of_modules_not_found
 if ($ok && GETPOST('force_disable_of_modules_not_found', 'alpha'))
 {
-    print '<tr><td colspan="2"><br>*** Force modules not found physicaly to be disabled (only modules adding js, css or hooks can be detected as removed physicaly)</td></tr>';
+	print '<tr><td colspan="2"><br>*** Force modules not found physicaly to be disabled (only modules adding js, css or hooks can be detected as removed physicaly)</td></tr>';
 
-    $arraylistofkey = array('hooks', 'js', 'css');
+	$arraylistofkey = array('hooks', 'js', 'css');
 
-    foreach ($arraylistofkey as $key)
-    {
-	    $sql = "SELECT DISTINCT name, value";
-	    $sql .= " FROM ".MAIN_DB_PREFIX."const as c";
-	    $sql .= " WHERE name LIKE 'MAIN_MODULE_%_".strtoupper($key)."'";
-	    $sql .= " ORDER BY name";
+	foreach ($arraylistofkey as $key)
+	{
+		$sql = "SELECT DISTINCT name, value";
+		$sql .= " FROM ".MAIN_DB_PREFIX."const as c";
+		$sql .= " WHERE name LIKE 'MAIN_MODULE_%_".strtoupper($key)."'";
+		$sql .= " ORDER BY name";
 
-	    $resql = $db->query($sql);
-	    if ($resql)
-	    {
-	        $num = $db->num_rows($resql);
-	        if ($num)
-	        {
-	            $i = 0;
-	            while ($i < $num)
-	            {
-	                $obj = $db->fetch_object($resql);
-	                $constantname = $obj->name; // Name of constant for hook or js or css declaration
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			if ($num)
+			{
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = $db->fetch_object($resql);
+					$constantname = $obj->name; // Name of constant for hook or js or css declaration
 
-	                print '<tr><td>';
-	                print $constantname;
+					print '<tr><td>';
+					print $constantname;
 
-	                $db->begin();
+					$db->begin();
 
-	                $reg = array();
-	                if (preg_match('/MAIN_MODULE_(.*)_'.strtoupper($key).'/i', $constantname, $reg))
-	                {
-	                    $name = strtolower($reg[1]);
+					$reg = array();
+					if (preg_match('/MAIN_MODULE_(.*)_'.strtoupper($key).'/i', $constantname, $reg))
+					{
+						$name = strtolower($reg[1]);
 
-	                    if ($name)		// An entry for key $key and module $name was found in database.
-	                    {
-	                    	$reloffile = '';
+						if ($name)		// An entry for key $key and module $name was found in database.
+						{
+							$reloffile = '';
 							$result = 'found';
 
-	                    	if ($key == 'hooks') $reloffile = $name.'/class/actions_'.$name.'.class.php';
-	                    	if ($key == 'js')
-	                    	{
-		                    	$value = $obj->value;
-		                    	$valuearray = json_decode($value);
-	                    		$reloffile = $valuearray[0];
-	                    		$reloffile = preg_replace('/^\//', '', $valuearray[0]);
-	                    	}
-	                    	if ($key == 'css')
-	                    	{
-		                    	$value = $obj->value;
-		                    	$valuearray = json_decode($value);
-		                    	if ($value && count($valuearray) == 0) $valuearray[0] = $value; // If value was not a json array but a string
-	                    		$reloffile = preg_replace('/^\//', '', $valuearray[0]);
-	                    	}
+							if ($key == 'hooks') $reloffile = $name.'/class/actions_'.$name.'.class.php';
+							if ($key == 'js')
+							{
+								$value = $obj->value;
+								$valuearray = json_decode($value);
+								$reloffile = $valuearray[0];
+								$reloffile = preg_replace('/^\//', '', $valuearray[0]);
+							}
+							if ($key == 'css')
+							{
+								$value = $obj->value;
+								$valuearray = json_decode($value);
+								if ($value && count($valuearray) == 0) $valuearray[0] = $value; // If value was not a json array but a string
+								$reloffile = preg_replace('/^\//', '', $valuearray[0]);
+							}
 
-	                    	if ($reloffile)
-	                    	{
-		                    	//var_dump($key.' - '.$value.' - '.$reloffile);
-		                    	try {
-		                        	$result = dol_buildpath($reloffile, 0, 2);
-		                    	}
-		                    	catch (Exception $e)
-		                    	{
+							if ($reloffile)
+							{
+								//var_dump($key.' - '.$value.' - '.$reloffile);
+								try {
+									$result = dol_buildpath($reloffile, 0, 2);
+								} catch (Exception $e)
+								{
 									// No catch yet
 									$result = 'found'; // If error, we force lke if we found to avoid any deletion
-		                    	}
-	                    	}
+								}
+							}
 
-	                        if (!$result)
-	                        {
-	                            print ' - File of '.$key.' ('.$reloffile.') NOT found, we disable the module.';
-	                            if (GETPOST('force_disable_of_modules_not_found') == 'confirmed')
-	                            {
-	                                $sql2 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'MAIN_MODULE_".strtoupper($name)."_".strtoupper($key)."'";
-	                                $resql2 = $db->query($sql2);
-	                                if (!$resql2)
-	                                {
-	                                    $error++;
-	                                    dol_print_error($db);
-	                                }
-	                                $sql3 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'MAIN_MODULE_".strtoupper($name)."'";
-	                                $resql3 = $db->query($sql3);
-	                                if (!$resql3)
-	                                {
-	                                    $error++;
-	                                    dol_print_error($db);
-	                                }
-	                                else
-	                                    print ' - <span class="warning">Cleaned</span>';
-	                            }
-	                            else
-	                            {
-	                                print ' - <span class="warning">Canceled (test mode)</span>';
-	                            }
-	                        }
-	                        else
-	                        {
-	                            print ' - File of '.$key.' ('.$reloffile.') found, we do nothing.';
-	                        }
-	                    }
+							if (!$result)
+							{
+								print ' - File of '.$key.' ('.$reloffile.') NOT found, we disable the module.';
+								if (GETPOST('force_disable_of_modules_not_found') == 'confirmed')
+								{
+									$sql2 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'MAIN_MODULE_".strtoupper($name)."_".strtoupper($key)."'";
+									$resql2 = $db->query($sql2);
+									if (!$resql2)
+									{
+										$error++;
+										dol_print_error($db);
+									}
+									$sql3 = "DELETE FROM ".MAIN_DB_PREFIX."const WHERE name = 'MAIN_MODULE_".strtoupper($name)."'";
+									$resql3 = $db->query($sql3);
+									if (!$resql3)
+									{
+										$error++;
+										dol_print_error($db);
+									} else print ' - <span class="warning">Cleaned</span>';
+								} else {
+									print ' - <span class="warning">Canceled (test mode)</span>';
+								}
+							} else {
+								print ' - File of '.$key.' ('.$reloffile.') found, we do nothing.';
+							}
+						}
 
-	                    if (!$error) $db->commit();
-	                    else $db->rollback();
-	                }
+						if (!$error) $db->commit();
+						else $db->rollback();
+					}
 
-	                print'</td></tr>';
+					print'</td></tr>';
 
-	                if ($error) break;
+					if ($error) break;
 
-	                $i++;
-	            }
-	        }
-	        else
-	        {
-	            print '<tr><td>No active module with missing files found by searching on MAIN_MODULE_(.*)_'.strtoupper($key).'</td></tr>';
-	        }
-	    }
-	    else
-	    {
-	        dol_print_error($db);
-	    }
-    }
+					$i++;
+				}
+			} else {
+				print '<tr><td>No active module with missing files found by searching on MAIN_MODULE_(.*)_'.strtoupper($key).'</td></tr>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+	}
 }
 
 
@@ -1333,14 +1267,10 @@ if ($ok && GETPOST('clean_perm_table', 'alpha'))
 				}
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr><td>No lines of a disabled external module (with id > 100000) found into table rights_def</td></tr>';
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -1350,57 +1280,54 @@ if ($ok && GETPOST('clean_perm_table', 'alpha'))
 // force utf8 on tables
 if ($ok && GETPOST('force_utf8_on_tables', 'alpha'))
 {
-    print '<tr><td colspan="2"><br>*** Force page code and collation of tables into utf8/utf8_unicode_ci (for mysql/mariadb only)</td></tr>';
+	print '<tr><td colspan="2"><br>*** Force page code and collation of tables into utf8/utf8_unicode_ci (for mysql/mariadb only)</td></tr>';
 
-    if ($db->type == "mysql" || $db->type == "mysqli")
-    {
-    	$force_utf8_on_tables = GETPOST('force_utf8_on_tables', 'alpha');
+	if ($db->type == "mysql" || $db->type == "mysqli")
+	{
+		$force_utf8_on_tables = GETPOST('force_utf8_on_tables', 'alpha');
 
-    	$listoftables = $db->DDLListTables($db->database_name);
+		$listoftables = $db->DDLListTables($db->database_name);
 
-        // Disable foreign key checking for avoid errors
-    	if ($force_utf8_on_tables == 'confirmed')
-    	{
-    		$sql = 'SET FOREIGN_KEY_CHECKS=0';
-    		print '<!-- '.$sql.' -->';
-    		$resql = $db->query($sql);
-    	}
+		// Disable foreign key checking for avoid errors
+		if ($force_utf8_on_tables == 'confirmed')
+		{
+			$sql = 'SET FOREIGN_KEY_CHECKS=0';
+			print '<!-- '.$sql.' -->';
+			$resql = $db->query($sql);
+		}
 
-        foreach ($listoftables as $table)
-        {
-        	// do not convert llx_const if mysql encrypt/decrypt is used
-        	if ($conf->db->dolibarr_main_db_encryption != 0 && preg_match('/\_const$/', $table)) continue;
+		foreach ($listoftables as $table)
+		{
+			// do not convert llx_const if mysql encrypt/decrypt is used
+			if ($conf->db->dolibarr_main_db_encryption != 0 && preg_match('/\_const$/', $table)) continue;
 
-            print '<tr><td colspan="2">';
-            print $table;
-            $sql = 'ALTER TABLE '.$table.' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci';
-            print '<!-- '.$sql.' -->';
-            if ($force_utf8_on_tables == 'confirmed')
-            {
-            	$resql = $db->query($sql);
-            	print ' - Done ('.($resql ? 'OK' : 'KO').')';
-            }
-            else print ' - Disabled';
-            print '</td></tr>';
-        }
+			print '<tr><td colspan="2">';
+			print $table;
+			$sql = 'ALTER TABLE '.$table.' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci';
+			print '<!-- '.$sql.' -->';
+			if ($force_utf8_on_tables == 'confirmed')
+			{
+				$resql = $db->query($sql);
+				print ' - Done ('.($resql ? 'OK' : 'KO').')';
+			} else print ' - Disabled';
+			print '</td></tr>';
+		}
 
-        // Enable foreign key checking
-        if ($force_utf8_on_tables == 'confirmed')
-        {
-        	$sql = 'SET FOREIGN_KEY_CHECKS=1';
-        	print '<!-- '.$sql.' -->';
-        	$resql = $db->query($sql);
-        }
-    }
-    else
-    {
-        print '<tr><td colspan="2">Not available with database type '.$db->type.'</td></tr>';
-    }
+		// Enable foreign key checking
+		if ($force_utf8_on_tables == 'confirmed')
+		{
+			$sql = 'SET FOREIGN_KEY_CHECKS=1';
+			print '<!-- '.$sql.' -->';
+			$resql = $db->query($sql);
+		}
+	} else {
+		print '<tr><td colspan="2">Not available with database type '.$db->type.'</td></tr>';
+	}
 }
 
 //
 if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
-    /*
+	/*
      * This script is meant to be run when upgrading from a dolibarr version < 3.8
      * to a newer version.
      *
@@ -1426,115 +1353,113 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
 	$repair_link_dispatch_lines_supplier_order_lines = GETPOST('repair_link_dispatch_lines_supplier_order_lines', 'alpha');
 
 
-    echo '<tr><th>Repair llx_commande_fournisseur_dispatch.fk_commandefourndet</th></tr>';
-    echo '<tr><td>Repair in progress. This may take a while.</td></tr>';
+	echo '<tr><th>Repair llx_commande_fournisseur_dispatch.fk_commandefourndet</th></tr>';
+	echo '<tr><td>Repair in progress. This may take a while.</td></tr>';
 
-    $sql_dispatch = 'SELECT * FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch WHERE COALESCE(fk_commandefourndet, 0) = 0';
-    $db->begin();
-    $resql_dispatch = $db->query($sql_dispatch);
-    $n_processed_rows = 0;
-    $errors = array();
-    if ($resql_dispatch) {
-        if ($db->num_rows($resql_dispatch) == 0) {
-            echo '<tr><td>Nothing to do.</td></tr>';
-            exit;
-        }
-        while ($obj_dispatch = $db->fetch_object($resql_dispatch)) {
-            $sql_line = 'SELECT line.rowid, line.qty FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet AS line';
-            $sql_line .= ' WHERE line.fk_commande = '.$obj_dispatch->fk_commande;
-            $sql_line .= ' AND   line.fk_product  = '.$obj_dispatch->fk_product;
-            $resql_line = $db->query($sql_line);
+	$sql_dispatch = 'SELECT * FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch WHERE COALESCE(fk_commandefourndet, 0) = 0';
+	$db->begin();
+	$resql_dispatch = $db->query($sql_dispatch);
+	$n_processed_rows = 0;
+	$errors = array();
+	if ($resql_dispatch) {
+		if ($db->num_rows($resql_dispatch) == 0) {
+			echo '<tr><td>Nothing to do.</td></tr>';
+			exit;
+		}
+		while ($obj_dispatch = $db->fetch_object($resql_dispatch)) {
+			$sql_line = 'SELECT line.rowid, line.qty FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet AS line';
+			$sql_line .= ' WHERE line.fk_commande = '.$obj_dispatch->fk_commande;
+			$sql_line .= ' AND   line.fk_product  = '.$obj_dispatch->fk_product;
+			$resql_line = $db->query($sql_line);
 
-            // s’il y a plusieurs lignes avec le même produit sur cette commande fournisseur,
-            // on divise la ligne de dispatch en autant de lignes qu’on en a sur la commande pour le produit
-            // et on met la quantité de la ligne dans la limite du "budget" indiqué par dispatch.qty
+			// s’il y a plusieurs lignes avec le même produit sur cette commande fournisseur,
+			// on divise la ligne de dispatch en autant de lignes qu’on en a sur la commande pour le produit
+			// et on met la quantité de la ligne dans la limite du "budget" indiqué par dispatch.qty
 
-            $remaining_qty = $obj_dispatch->qty;
-            $first_iteration = true;
-            if (!$resql_line) {
-                echo '<tr><td>Unable to find a matching supplier order line for dispatch #'.$obj_dispatch->rowid.'</td></tr>';
-                $errors[] = $sql_line;
-                $n_processed_rows++;
-                continue;
-            }
-            if ($db->num_rows($resql_line) == 0) continue;
-            while ($obj_line = $db->fetch_object($resql_line)) {
-                if (!$remaining_qty) break;
-                if (!$obj_line->rowid) {
-                    continue;
-                }
-                $qty_for_line = min($remaining_qty, $obj_line->qty);
-                if ($first_iteration) {
-                    $sql_attach = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
-                    $sql_attach .= ' SET fk_commandefourndet = '.$obj_line->rowid.', qty = '.$qty_for_line;
-                    $sql_attach .= ' WHERE rowid = '.$obj_dispatch->rowid;
-                    $first_iteration = false;
-                } else {
-                    $sql_attach_values = array(
-                        $obj_dispatch->fk_commande,
-                        $obj_dispatch->fk_product,
-                        $obj_line->rowid,
-                        $qty_for_line,
-                        $obj_dispatch->fk_entrepot,
-                        $obj_dispatch->fk_user,
-                        $obj_dispatch->datec ? '"'.$db->escape($obj_dispatch->datec).'"' : 'NULL',
-                        $obj_dispatch->comment ? '"'.$db->escape($obj_dispatch->comment).'"' : 'NULL',
-                        $obj_dispatch->status ?: 'NULL',
-                        $obj_dispatch->tms ? '"'.$db->escape($obj_dispatch->tms).'"' : 'NULL',
-                        $obj_dispatch->batch ?: 'NULL',
-                        $obj_dispatch->eatby ? '"'.$db->escape($obj_dispatch->eatby).'"' : 'NULL',
-                        $obj_dispatch->sellby ? '"'.$db->escape($obj_dispatch->sellby).'"' : 'NULL'
-                    );
-                    $sql_attach_values = join(', ', $sql_attach_values);
+			$remaining_qty = $obj_dispatch->qty;
+			$first_iteration = true;
+			if (!$resql_line) {
+				echo '<tr><td>Unable to find a matching supplier order line for dispatch #'.$obj_dispatch->rowid.'</td></tr>';
+				$errors[] = $sql_line;
+				$n_processed_rows++;
+				continue;
+			}
+			if ($db->num_rows($resql_line) == 0) continue;
+			while ($obj_line = $db->fetch_object($resql_line)) {
+				if (!$remaining_qty) break;
+				if (!$obj_line->rowid) {
+					continue;
+				}
+				$qty_for_line = min($remaining_qty, $obj_line->qty);
+				if ($first_iteration) {
+					$sql_attach = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
+					$sql_attach .= ' SET fk_commandefourndet = '.$obj_line->rowid.', qty = '.$qty_for_line;
+					$sql_attach .= ' WHERE rowid = '.$obj_dispatch->rowid;
+					$first_iteration = false;
+				} else {
+					$sql_attach_values = array(
+						$obj_dispatch->fk_commande,
+						$obj_dispatch->fk_product,
+						$obj_line->rowid,
+						$qty_for_line,
+						$obj_dispatch->fk_entrepot,
+						$obj_dispatch->fk_user,
+						$obj_dispatch->datec ? '"'.$db->escape($obj_dispatch->datec).'"' : 'NULL',
+						$obj_dispatch->comment ? '"'.$db->escape($obj_dispatch->comment).'"' : 'NULL',
+						$obj_dispatch->status ?: 'NULL',
+						$obj_dispatch->tms ? '"'.$db->escape($obj_dispatch->tms).'"' : 'NULL',
+						$obj_dispatch->batch ?: 'NULL',
+						$obj_dispatch->eatby ? '"'.$db->escape($obj_dispatch->eatby).'"' : 'NULL',
+						$obj_dispatch->sellby ? '"'.$db->escape($obj_dispatch->sellby).'"' : 'NULL'
+					);
+					$sql_attach_values = join(', ', $sql_attach_values);
 
-                    $sql_attach = 'INSERT INTO '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
-                    $sql_attach .= ' (fk_commande, fk_product, fk_commandefourndet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)';
-                    $sql_attach .= ' VALUES ('.$sql_attach_values.')';
-                }
+					$sql_attach = 'INSERT INTO '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch';
+					$sql_attach .= ' (fk_commande, fk_product, fk_commandefourndet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)';
+					$sql_attach .= ' VALUES ('.$sql_attach_values.')';
+				}
 
-                if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed')
-                {
-	                $resql_attach = $db->query($sql_attach);
-                }
-                else
-                {
-                	$resql_attach = true; // Force success in test mode
-                }
+				if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed')
+				{
+					$resql_attach = $db->query($sql_attach);
+				} else {
+					$resql_attach = true; // Force success in test mode
+				}
 
-                if ($resql_attach) {
-                    $remaining_qty -= $qty_for_line;
-                } else {
-                    $errors[] = $sql_attach;
-                }
+				if ($resql_attach) {
+					$remaining_qty -= $qty_for_line;
+				} else {
+					$errors[] = $sql_attach;
+				}
 
-                $first_iteration = false;
-            }
-            $n_processed_rows++;
+				$first_iteration = false;
+			}
+			$n_processed_rows++;
 
-            // report progress every 256th row
-            if (!($n_processed_rows & 0xff)) {
-                echo '<tr><td>Processed '.$n_processed_rows.' rows with '.count($errors).' errors…'."</td></tr>\n";
-                flush();
-                ob_flush();
-            }
-        }
-    } else {
-        echo '<tr><td>Unable to find any dispatch without an fk_commandefourndet.'."</td></tr>\n";
-        echo $sql_dispatch."\n";
-    }
-    echo '<tr><td>Fixed '.$n_processed_rows.' rows with '.count($errors).' errors…'."</td></tr>\n";
-    echo '<tr><td>DONE.'."</td></tr>\n";
+			// report progress every 256th row
+			if (!($n_processed_rows & 0xff)) {
+				echo '<tr><td>Processed '.$n_processed_rows.' rows with '.count($errors).' errors…'."</td></tr>\n";
+				flush();
+				ob_flush();
+			}
+		}
+	} else {
+		echo '<tr><td>Unable to find any dispatch without an fk_commandefourndet.'."</td></tr>\n";
+		echo $sql_dispatch."\n";
+	}
+	echo '<tr><td>Fixed '.$n_processed_rows.' rows with '.count($errors).' errors…'."</td></tr>\n";
+	echo '<tr><td>DONE.'."</td></tr>\n";
 
-    if (count($errors)) {
-        $db->rollback();
-        echo '<tr><td>The transaction was rolled back due to errors: nothing was changed by the script.</td></tr>';
-    } else {
-        $db->commit();
-    }
-    $db->close();
+	if (count($errors)) {
+		$db->rollback();
+		echo '<tr><td>The transaction was rolled back due to errors: nothing was changed by the script.</td></tr>';
+	} else {
+		$db->commit();
+	}
+	$db->close();
 
-    echo '<tr><td><h3>SQL queries with errors:</h3></tr></td>';
-    echo '<tr><td>'.join('</td></tr><tr><td>', $errors).'</td></tr>';
+	echo '<tr><td><h3>SQL queries with errors:</h3></tr></td>';
+	echo '<tr><td>'.join('</td></tr><tr><td>', $errors).'</td></tr>';
 }
 
 print '</table>';
@@ -1543,7 +1468,7 @@ print '</table>';
 
 if (empty($actiondone))
 {
-    print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>';
+	print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>';
 }
 
 if ($oneoptionset)
@@ -1551,9 +1476,7 @@ if ($oneoptionset)
 	print '<div class="center" style="padding-top: 10px"><a href="../index.php?mainmenu=home&leftmenu=home'.(isset($_POST["login"]) ? '&username='.urlencode($_POST["login"]) : '').'">';
 	print $langs->trans("GoToDolibarr");
 	print '</a></div>';
-}
-else
-{
+} else {
 	print '<div class="center warning" style="padding-top: 10px">';
 	print $langs->trans("SetAtLeastOneOptionAsUrlParameter");
 	print '</div>';
diff --git a/htdocs/install/sqlite3/functions/index.html b/htdocs/install/sqlite3/functions/index.html
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/htdocs/install/sqlite3/functions/index.html
@@ -0,0 +1 @@
+
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index a5e6b9d3377..9d0d0a99038 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -55,8 +55,8 @@ $db_user = GETPOST('db_user', 'alpha') ?GETPOST('db_user', 'alpha') : (empty($ar
 $db_pass = GETPOST('db_pass', 'none') ?GETPOST('db_pass', 'none') : (empty($argv[12]) ? '' : $argv[12]);
 $db_port = GETPOST('db_port', 'int') ?GETPOST('db_port', 'int') : (empty($argv[13]) ? '' : $argv[13]);
 $db_prefix = GETPOST('db_prefix', 'aZ09') ?GETPOST('db_prefix', 'aZ09') : (empty($argv[14]) ? '' : $argv[14]);
-$db_create_database = GETPOST('db_create_database', 'none') ?GETPOST('db_create_database', 'none') : (empty($argv[15]) ? '' : $argv[15]);
-$db_create_user = GETPOST('db_create_user', 'none') ?GETPOST('db_create_user', 'none') : (empty($argv[16]) ? '' : $argv[16]);
+$db_create_database = GETPOST('db_create_database', 'alpha') ?GETPOST('db_create_database', 'alpha') : (empty($argv[15]) ? '' : $argv[15]);
+$db_create_user = GETPOST('db_create_user', 'alpha') ?GETPOST('db_create_user', 'alpha') : (empty($argv[16]) ? '' : $argv[16]);
 // Force https
 $main_force_https = ((GETPOST("main_force_https", 'alpha') && (GETPOST("main_force_https", 'alpha') == "on" || GETPOST("main_force_https", 'alpha') == 1)) ? '1' : '0');
 // Use alternative directory
@@ -226,13 +226,10 @@ if (!$error) {
                 if ($db_type == 'mysql' || $db_type == 'mysqli')
                 {
                     $databasefortest = 'mysql';
-                }
-                elseif ($db_type == 'pgsql')
+                } elseif ($db_type == 'pgsql')
                 {
                     $databasefortest = 'postgres';
-                }
-                else
-                {
+                } else {
                     $databasefortest = 'master';
                 }
             }
@@ -274,9 +271,7 @@ if (!$error) {
                 $error++;
             }
         }
-    }
-    else
-    {
+    } 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();">';
@@ -284,10 +279,7 @@ if (!$error) {
         //print '</a>';
         $error++;
     }
-}
-
-else
-{
+} else {
     if (isset($db)) print $db->lasterror();
     if (isset($db) && !$db->connected) print '<br>'.$langs->trans("BecauseConnectionFailedParametersMayBeWrong").'<br><br>';
     print $langs->trans("ErrorGoBackAndCorrectParameters");
@@ -317,8 +309,7 @@ if (!$error && $db->connected)
 
         $defaultCharacterSet = $db->forcecharset;
     	$defaultDBSortingCollation = $db->forcecollate;
-    }
-    else	// If already created, we take current value
+    } else // If already created, we take current value
     {
         $defaultCharacterSet = $db->getDefaultCharacterSetDatabase();
         $defaultDBSortingCollation = $db->getDefaultCollationDatabase();
@@ -400,9 +391,7 @@ if (!$error && $db->connected && $action == "set")
             print "</td></tr>";
             print '<tr><td colspan="2"><br>'.$langs->trans("CorrectProblemAndReloadPage", $_SERVER['PHP_SELF'].'?testget=ok').'</td></tr>';
             $error++;
-        }
-        else
-        {
+        } else {
             // Create .htaccess file in document directory
             $pathhtaccess = $main_data_dir.'/.htaccess';
             if (!file_exists($pathhtaccess))
@@ -437,9 +426,7 @@ if (!$error && $db->connected && $action == "set")
                 if (is_dir($dir[$i]))
                 {
                     dolibarr_install_syslog("step1: directory '".$dir[$i]."' exists");
-                }
-                else
-                {
+                } else {
                     if (dol_mkdir($dir[$i]) < 0)
                     {
                         print "<tr><td>";
@@ -448,9 +435,7 @@ if (!$error && $db->connected && $action == "set")
                         print $langs->trans("Error");
                         print "</td></tr>";
                         $error++;
-                    }
-                    else
-                    {
+                    } else {
                         dolibarr_install_syslog("step1: directory '".$dir[$i]."' created");
                     }
                 }
@@ -471,9 +456,7 @@ if (!$error && $db->connected && $action == "set")
                 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
-            {
+            } else {
             	//ODT templates
             	$srcroot = $main_dir.'/install/doctemplates';
             	$destroot = $main_data_dir.'/doctemplates';
@@ -546,12 +529,10 @@ if (!$error && $db->connected && $action == "set")
             if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
             {
                 $databasefortest = 'mysql';
-            }
-            elseif ($conf->db->type == 'pgsql')
+            } elseif ($conf->db->type == 'pgsql')
             {
                 $databasefortest = 'postgres';
-            }
-            elseif ($conf->db->type == 'mssql')
+            } elseif ($conf->db->type == 'mssql')
             {
                 $databasefortest = 'master';
             }
@@ -591,9 +572,7 @@ if (!$error && $db->connected && $action == "set")
                         print $dolibarr_main_db_user;
                         print '</td>';
                         print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-                    }
-                    else
-                    {
+                    } else {
                         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_USER_ALREADY_EXISTS')
@@ -604,9 +583,7 @@ if (!$error && $db->connected && $action == "set")
                             print $dolibarr_main_db_user;
                             print '</td>';
                             print '<td>'.$langs->trans("LoginAlreadyExists").'</td></tr>';
-                        }
-                        else
-                        {
+                        } else {
                             dolibarr_install_syslog("step1: failed to create user", LOG_ERR);
                             print '<tr><td>';
                             print $langs->trans("UserCreation").' : ';
@@ -617,9 +594,7 @@ if (!$error && $db->connected && $action == "set")
                     }
 
                     $db->close();
-                }
-                else
-                {
+                } else {
                     print '<tr><td>';
                     print $langs->trans("UserCreation").' : ';
                     print $dolibarr_main_db_user;
@@ -667,9 +642,7 @@ if (!$error && $db->connected && $action == "set")
                     // 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
-                {
+                } else {
                     // warning message
                     print '<tr><td colspan="2"><br>';
                     print $langs->trans("ErrorFailedToCreateDatabase", $dolibarr_main_db_name).'<br>';
@@ -682,8 +655,7 @@ if (!$error && $db->connected && $action == "set")
                     $error++;
                 }
                 $newdb->close();
-            }
-            else {
+            } else {
                 print '<tr><td>';
                 print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
                 print $dolibarr_main_db_name;
@@ -734,9 +706,7 @@ if (!$error && $db->connected && $action == "set")
                     print "</td></tr>";
 
                     $error = 0;
-                }
-                else
-                {
+                } 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.") : ";
@@ -754,9 +724,7 @@ if (!$error && $db->connected && $action == "set")
 
                     $error++;
                 }
-            }
-            else
-            {
+            } 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.") : ";
@@ -871,7 +839,7 @@ function write_conf_file($conffile)
     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, $force_dolibarr_js_JQUERY_FLOT;
+    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;
@@ -1004,9 +972,6 @@ function write_conf_file($conffile)
         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");
-        if (empty($force_dolibarr_js_JQUERY_FLOT)) { fputs($fp, '//'); $force_dolibarr_js_JQUERY_FLOT = ''; }
-        fputs($fp, '$dolibarr_js_JQUERY_FLOT=\''.$force_dolibarr_js_JQUERY_FLOT.'\';');
-        fputs($fp, "\n");
 
         // Write params to overwrites default font path
         fputs($fp, "\n");
@@ -1030,9 +995,7 @@ function write_conf_file($conffile)
 			print "</td><td>";
 			print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
 			print "</td></tr>";
-		}
-		else
-		{
+		} else {
 			$error++;
 		}
 	}
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 4f4accf6fa7..25fde52dd58 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -99,9 +99,7 @@ if ($action == "set")
         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
-    {
+    } 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>';
     }
 
@@ -110,9 +108,7 @@ if ($action == "set")
         if ($db->database_selected)
         {
             dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
-        }
-        else
-        {
+        } 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;
@@ -201,9 +197,7 @@ if ($action == "set")
                 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
-                {
+                } else {
                     // Keyword ENGINE is MySQL-specific, so scrub it for
                     // other database types (mssql, pgsql)
                     $buffer = preg_replace('/type=innodb/i', '', $buffer);
@@ -225,16 +219,12 @@ if ($action == "set")
                 {
                     // print "<td>OK requete ==== $buffer</td></tr>";
                     $db->free($resql);
-                }
-                else
-                {
+                } 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
-                    {
+                    } else {
                         print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
                         print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
                         print "\n</td>";
@@ -242,9 +232,7 @@ if ($action == "set")
                         $error++;
                     }
                 }
-            }
-            else
-            {
+            } 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>';
@@ -261,9 +249,7 @@ if ($action == "set")
                 print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
                 $ok = 1;
             }
-        }
-        else
-        {
+        } 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);
         }
@@ -368,9 +354,7 @@ if ($action == "set")
                         {
                             //print "<td>OK requete ==== $buffer</td></tr>";
                             $db->free($resql);
-                        }
-                        else
-                        {
+                        } else {
                             if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
                             $db->errno() == 'DB_ERROR_CANNOT_CREATE' ||
                             $db->errno() == 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS' ||
@@ -379,9 +363,7 @@ if ($action == "set")
                             {
                                 //print "<td>Deja existante</td></tr>";
                                 $key_exists = 1;
-                            }
-                            else
-                            {
+                            } else {
                                 print "<tr><td>".$langs->trans("CreateOtherKeysForTable", $name);
                                 print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
                                 print "\n</td>";
@@ -391,9 +373,7 @@ if ($action == "set")
                         }
                     }
                 }
-            }
-            else
-            {
+            } 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>";
@@ -464,16 +444,12 @@ if ($action == "set")
                     {
                         $ok = 1;
                         $db->free($resql);
-                    }
-                    else
-                    {
+                    } else {
                         if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
                         || $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS')
                         {
                             //print "Insert line : ".$buffer."<br>\n";
-                        }
-                        else
-                        {
+                        } else {
                             $ok = 0;
 
                             print "<tr><td>".$langs->trans("FunctionsCreation");
@@ -490,9 +466,7 @@ if ($action == "set")
             if ($ok)
             {
                 print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-            }
-            else
-            {
+            } else {
                 print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
                 $ok = 1;
             }
@@ -588,15 +562,11 @@ if ($action == "set")
                     if ($resql)
                     {
                         //$db->free($resql);     // Not required as request we launch here does not return memory needs.
-                    }
-                    else
-                    {
+                    } else {
                         if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
                         {
                             //print "<tr><td>Insertion ligne : $buffer</td><td>";
-                        }
-                        else
-                        {
+                        } else {
                             $ok = 0;
                             $okallfile = 0;
                             print '<span class="error">'.$langs->trans("ErrorSQL")." : ".$db->lasterrno()." - ".$db->lastqueryerror()." - ".$db->lasterror()."</span><br>";
@@ -613,17 +583,13 @@ if ($action == "set")
         if ($ok)
         {
             print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
-        }
-        else
-        {
+        } 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
-{
+} else {
     print 'Parameter action=set not defined';
 }
 
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index b74594ce8da..ed64de7cbb1 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -130,8 +130,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 			$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);
+		} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
 	}
 
 	$conf->db->type = $dolibarr_main_db_type;
@@ -187,8 +186,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 					dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0); // All entities
 					if (function_exists('password_hash'))
 						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0); // All entities
-					else
-						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0); // All entities
+					else dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0); // All entities
 				}
 
 				dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = '.$conf->global->DATABASE_PWD_ENCRYPTED.' MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO, LOG_INFO);
@@ -214,17 +212,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 			{
 				print $langs->trans("AdminLoginCreatedSuccessfuly", $login)."<br>";
 				$success = 1;
-			}
-			else
-			{
+			} else {
 				if ($newuser->error == 'ErrorLoginAlreadyExists')
 				{
 					dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
 					print '<br><div class="warning">'.$langs->trans("AdminLoginAlreadyExists", $login)."</div><br>";
 					$success = 1;
-				}
-				else
-				{
+				} else {
 					dolibarr_install_syslog('step5: FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
 					print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
 				}
@@ -240,9 +234,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 				{
 					$conf->global->MAIN_VERSION_FIRST_INSTALL = $targetversion;
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					//if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
 					$db->commit();
 				}
@@ -292,9 +284,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 
 				$db->commit();
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ErrorFailedToConnect")."<br>";
 		}
 	}
@@ -311,8 +301,7 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 			// Define if we need to update the MAIN_VERSION_LAST_UPGRADE value in database
 			$tagdatabase = false;
 			if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) $tagdatabase = true; // We don't know what it was before, so now we consider we are version choosed.
-			else
-			{
+			else {
 				$mainversionlastupgradearray = preg_split('/[.-]/', $conf->global->MAIN_VERSION_LAST_UPGRADE);
 				$targetversionarray = preg_split('/[.-]/', $targetversion);
 				if (versioncompare($targetversionarray, $mainversionlastupgradearray) > 0) $tagdatabase = true;
@@ -326,19 +315,13 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 				$resql = $db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version for last upgrade',0)");
 				if (!$resql) dol_print_error($db, 'Error in setup program');
 				$conf->global->MAIN_VERSION_LAST_UPGRADE = $targetversion;
-			}
-			else
-			{
+			} else {
 				dolibarr_install_syslog('step5: we run an upgrade to version '.$targetversion.' but database was already upgraded to '.$conf->global->MAIN_VERSION_LAST_UPGRADE.'. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ErrorFailedToConnect")."<br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error('', 'step5.php: unknown choice of action');
 	}
 
@@ -389,9 +372,7 @@ if ($action == "set" && $success)
 		print '<div class="center"><a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($login) ? '&username='.urlencode($login) : '').'">';
 		print '<span class="fas fa-external-link-alt"></span> '.$langs->trans("GoToSetupArea");
 		print '</a></div>';
-	}
-	else
-	{
+	} else {
 		// If here MAIN_VERSION_LAST_UPGRADE is not empty
 		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
 		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
@@ -437,9 +418,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print '<div class="center"><a href="../index.php?mainmenu=home'.(isset($login) ? '&username='.urlencode($login) : '').'">';
 		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToDolibarr").'...';
 		print '</a></div><br>';
-	}
-	else
-	{
+	} else {
 		// If here MAIN_VERSION_LAST_UPGRADE is not empty
 		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
 		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
@@ -450,9 +429,7 @@ elseif (empty($action) || preg_match('/upgrade/i', $action))
 		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToUpgradePage");
 		print '</a></div>';
 	}
-}
-else
-{
+} else {
 	dol_print_error('', 'step5.php: unknown choice of action');
 }
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index b71707bef4b..af05fb374d2 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -120,8 +120,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             $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);
+        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
     }
 
     // $conf is already instancied inside inc.php
@@ -150,9 +149,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         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
-    {
+    } 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;
@@ -166,9 +163,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             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
-        {
+        } 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;
@@ -292,9 +287,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             				$i++;
             			}
             			$db->free($resql);
-            		}
-            		else
-            		{
+            		} else {
             			if ($db->lasterrno() != 'DB_ERROR_NOSUCHTABLE')
             			{
             				print '<tr><td colspan="2"><span class="error">'.$sql.' : '.$db->lasterror()."</font></td></tr>\n";
@@ -334,9 +327,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             	if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
             }
             sort($filesindir);
-        }
-        else
-		{
+        } else {
             print '<div class="error">'.$langs->trans("ErrorCanNotReadDir", $dir).'</div>';
         }
 
@@ -346,8 +337,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             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.*
+            } elseif (preg_match('/'.$to.'/i', $file))	// First test may be false if we migrate from x.y.* to x.y.*
             {
                 $filelist[] = $file;
             }
@@ -356,9 +346,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         if (count($filelist) == 0)
         {
         	print '<div class="error">'.$langs->trans("ErrorNoMigrationFilesFoundForParameters").'</div>';
-        }
-		else
-		{
+        } else {
 			$listoffileprocessed = array(); // Protection to avoid to process twice the same file
 
 	        // Loop on each migrate files
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 765a8796a76..6c154ca062a 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -1,6 +1,4 @@
 <?php
-use Sabre\VObject\Recur\EventIterator\HandleRDateExpandTest;
-
 /* Copyright (C) 2005       Marc Barilley / Ocebo   <marc@ocebo.com>
  * Copyright (C) 2005-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2011  Regis Houssin           <regis.houssin@inodbox.com>
@@ -68,8 +66,7 @@ $err = error_reporting();
 error_reporting(0);
 if (!empty($conf->global->MAIN_OVERRIDE_TIME_LIMIT))
 	@set_time_limit((int) $conf->global->MAIN_OVERRIDE_TIME_LIMIT);
-else
-	@set_time_limit(600);
+else @set_time_limit(600);
 error_reporting($err);
 
 $setuplang = GETPOST("selectlang", 'aZ09', 3) ?GETPOST("selectlang", 'aZ09', 3) : 'auto';
@@ -127,8 +124,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
             $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);
+        } else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
     }
 
     // $conf is already instancied inside inc.php
@@ -158,9 +154,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         if ($db->database_selected)
         {
             dolibarr_install_syslog('upgrade2: database connection successful :'.$dolibarr_main_db_name);
-        }
-        else
-        {
+        } else {
             $error++;
         }
     }
@@ -535,17 +529,13 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
                 print $hookmanager->error;
                 print "<!-- (".$reshook.") -->";
                 print '</td></tr>';
-            }
-            else
-            {
+            } else {
                 print '<tr><td colspan="4">';
                 print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: OK';
                 print "<!-- (".$reshook.") -->";
                 print '</td></tr>';
             }
-        }
-        else
-        {
+        } 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
             {
@@ -584,9 +574,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
     migrate_rename_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
 
     print '<div><br>'.$langs->trans("MigrationFinished").'</div>';
-}
-else
-{
+} else {
     print '<div class="error">'.$langs->trans('ErrorWrongParameters').'</div>';
     $error++;
 }
@@ -645,9 +633,7 @@ function migrate_paiements($db, $langs, $conf)
                 $row[$i][2] = $obj->amount;
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
@@ -677,20 +663,14 @@ function migrate_paiements($db, $langs, $conf)
             {
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('MigrationPaymentsNothingToUpdate')."<br>\n";
     }
 
@@ -752,9 +732,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
                 }
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
@@ -793,9 +771,7 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
 
                         print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
                     }
-                }
-                else
-                {
+                } else {
                     print 'ERROR';
                 }
             }
@@ -803,21 +779,15 @@ function migrate_paiements_orphelins_1($db, $langs, $conf)
             if ($res > 0)
             {
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
             }
 
             $db->commit();
-        }
-        else
-        {
+        } else {
             print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
     }
 
@@ -878,9 +848,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
                 }
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
@@ -920,9 +888,7 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
 
                         print $langs->trans('MigrationProcessPaymentUpdate', 'facid='.$facid.'-paymentid='.$row[$i]['paymentid'].'-amount='.$row[$i]['pamount'])."<br>\n";
                     }
-                }
-                else
-                {
+                } else {
                     print 'ERROR';
                     $nberr++;
                 }
@@ -931,16 +897,12 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
             if ($res > 0)
             {
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
             }
 
             $db->commit();
-        }
-        else
-        {
+        } else {
             print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
         }
 
@@ -953,15 +915,11 @@ function migrate_paiements_orphelins_2($db, $langs, $conf)
         if (!$nberr)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             print 'ERROR';
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('MigrationPaymentsNothingUpdatable')."<br>\n";
     }
 
@@ -1020,20 +978,18 @@ function migrate_contracts_det($db, $langs, $conf)
                 $sql .= $obj->cref.", ".($obj->fk_product ? $obj->fk_product : 0).", ";
                 $sql .= "0, ";
                 $sql .= "'".$db->escape($obj->label)."', null, ";
-                $sql .= ($obj->date_contrat ? "'".$obj->date_contrat."'" : "null").", ";
+                $sql .= ($obj->date_contrat ? "'".$db->escape($obj->date_contrat)."'" : "null").", ";
                 $sql .= "null, ";
                 $sql .= "null, ";
-                $sql .= "'".$obj->tva_tx."' , 1, ";
-                $sql .= "'".$obj->price."', '".$obj->price."', ".$obj->fk_user_author.",";
+                $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
-                {
+                } else {
                     dol_print_error($db);
                     $nberr++;
                 }
@@ -1046,20 +1002,14 @@ function migrate_contracts_det($db, $langs, $conf)
                 //      $db->rollback();
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('MigrationContractsNothingToUpdate')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('MigrationContractsFieldDontExist')."<br>\n";
         //    dol_print_error($db);
     }
@@ -1132,19 +1082,14 @@ function migrate_links_transfert($db, $langs, $conf)
                 //      $db->rollback();
                 $db->commit();
                 print $langs->trans('MigrationSuccessfullUpdate')."<br>";
-            }
-            else
-            {
+            } else {
                 $db->rollback();
                 print $langs->trans('MigrationUpdateFailed').'<br>';
             }
-        }
-        else {
+        } else {
             print $langs->trans('MigrationBankTransfertsNothingToUpdate')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
@@ -1172,8 +1117,7 @@ function migrate_contracts_date1($db, $langs, $conf)
     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";
+    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");
@@ -1181,8 +1125,7 @@ function migrate_contracts_date1($db, $langs, $conf)
     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";
+    else print $langs->trans('MigrationContractsEmptyCreationDatesNothingToUpdate')."<br>\n";
 
     print '</td></tr>';
 }
@@ -1228,9 +1171,11 @@ function migrate_contracts_date2($db, $langs, $conf)
                 $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='".$obj->datemin."'";
+                    $sql .= " SET date_contrat='".$db->idate($datemin)."'";
                     $sql .= " WHERE rowid=".$obj->cref;
                     $resql2 = $db->query($sql);
                     if (!$resql2) dol_print_error($db);
@@ -1244,12 +1189,9 @@ function migrate_contracts_date2($db, $langs, $conf)
 
             if ($nbcontratsmodifie)
             print $langs->trans('MigrationContractsInvalidDatesNumber', $nbcontratsmodifie)."<br>\n";
-            else
-            print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
+            else print  $langs->trans('MigrationContractsInvalidDatesNothingToUpdate')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
@@ -1277,8 +1219,7 @@ function migrate_contracts_date3($db, $langs, $conf)
     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";
+    else print $langs->trans('MigrationContractsIncoherentCreationDateNothingToUpdate')."<br>\n";
 
     print '</td></tr>';
 }
@@ -1333,11 +1274,9 @@ function migrate_contracts_open($db, $langs, $conf)
 
             if ($nbcontratsmodifie)
             print $langs->trans('MigrationReopenedContractsNumber', $nbcontratsmodifie)."<br>\n";
-            else
-            print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+            else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
         }
-    }
-    else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
+    } else print $langs->trans('MigrationReopeningContractsNothingToUpdate')."<br>\n";
 
     print '</td></tr>';
 }
@@ -1415,24 +1354,18 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
                         {
                             $nb++;
                             print '<td><span style="color:green">'.$langs->trans("OK").'</span></td>';
-                        }
-                        else
-                        {
+                        } else {
                             print '<td><span style="color:red">Error on insert</span></td>';
                             $error++;
                         }
                         print '</tr>';
                     }
-                }
-                else
-                {
+                } else {
                     $error++;
                 }
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             $error++;
         }
 
@@ -1446,15 +1379,11 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
 
             $sql = "ALTER TABLE ".MAIN_DB_PREFIX."paiementfourn DROP COLUMN fk_facture_fourn";
             $db->query($sql);
-        }
-        else
-        {
+        } else {
             print '<tr><td>'.$langs->trans("Error").'</td></tr>';
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print '<tr><td>'.$langs->trans("AlreadyDone").'</td></tr>';
     }
 }
@@ -1539,15 +1468,11 @@ function migrate_price_facture($db, $langs, $conf)
                         if ($facture->update_price() > 0)
                         {
                             //print $facture->id;
-                        }
-                        else
-                        {
+                        } else {
                             print "Error id=".$facture->id;
                             $err++;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         print "Error #3";
                         $err++;
                     }
@@ -1556,17 +1481,13 @@ function migrate_price_facture($db, $langs, $conf)
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
         $db->free($resql);
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
         $err++;
 
@@ -1664,18 +1585,14 @@ function migrate_price_propal($db, $langs, $conf)
                  */
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
         $db->free($resql);
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1753,18 +1670,14 @@ function migrate_price_contrat($db, $langs, $conf)
 
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
         $db->free($resql);
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1860,9 +1773,7 @@ function migrate_price_commande($db, $langs, $conf)
                  */
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1879,9 +1790,7 @@ function migrate_price_commande($db, $langs, $conf)
          */
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -1977,9 +1886,7 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
                  */
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans("AlreadyDone");
         }
 
@@ -1996,9 +1903,7 @@ function migrate_price_commande_fournisseur($db, $langs, $conf)
          */
 
         $db->commit();
-    }
-    else
-    {
+    } else {
         print "Error #1 ".$db->error();
 
         $db->rollback();
@@ -2125,20 +2030,14 @@ function migrate_commande_expedition($db, $langs, $conf)
                 $sql = "ALTER TABLE ".MAIN_DB_PREFIX."expedition DROP COLUMN fk_commande";
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2191,9 +2090,11 @@ function migrate_commande_livraison($db, $langs, $conf)
 
                     if ($resql2)
                     {
+                    	$date_livraison = $db->jdate($obj->date_livraison);
+
                         $sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-                        $sqlu .= " ref_client='".$obj->ref_client."'";
-                        $sqlu .= ", date_livraison='".$obj->date_livraison."'";
+                        $sqlu .= " ref_client='".$db->escape($obj->ref_client)."'";
+                        $sqlu .= ", date_livraison='".$db->idate($date_livraison)."'";
                         $sqlu .= " WHERE rowid = ".$obj->rowid;
                         $resql3 = $db->query($sqlu);
                         if (!$resql3)
@@ -2201,9 +2102,7 @@ function migrate_commande_livraison($db, $langs, $conf)
                             $error++;
                             dol_print_error($db);
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2218,20 +2117,14 @@ function migrate_commande_livraison($db, $langs, $conf)
                 $sql = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_commande";
                 print $langs->trans('FieldRenamed')."<br>\n";
                 $db->query($sql);
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2283,8 +2176,8 @@ function migrate_detail_livraison($db, $langs, $conf)
                     $sql = "UPDATE ".MAIN_DB_PREFIX."livraisondet SET";
                     $sql .= " fk_product=".$obj->fk_product;
                     $sql .= ",description='".$db->escape($obj->description)."'";
-                    $sql .= ",subprice='".$obj->subprice."'";
-                    $sql .= ",total_ht='".$obj->total_ht."'";
+                    $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);
 
@@ -2301,7 +2194,7 @@ function migrate_detail_livraison($db, $langs, $conf)
                             $total_ht = $obju->total_ht + $obj->total_ht;
 
                             $sqlu = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-                            $sqlu .= " total_ht='".$total_ht."'";
+                            $sqlu .= " total_ht='".$db->escape($total_ht)."'";
                             $sqlu .= " WHERE rowid=".$obj->fk_livraison;
                             $resql4 = $db->query($sqlu);
                             if (!$resql4)
@@ -2309,15 +2202,11 @@ function migrate_detail_livraison($db, $langs, $conf)
                                 $error++;
                                 dol_print_error($db);
                             }
-                        }
-                        else
-                        {
+                        } else {
                             $error++;
                             dol_print_error($db);
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2332,20 +2221,14 @@ function migrate_detail_livraison($db, $langs, $conf)
                 $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
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         $result = $db->DDLDescTable(MAIN_DB_PREFIX."livraisondet", "fk_origin_line");
         $obj = $db->fetch_object($result);
         if (!$obj)
@@ -2395,15 +2278,13 @@ function migrate_stocks($db, $langs, $conf)
                 $obj = $db->fetch_object($resql);
 
                 $sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
-                $sql .= " stock = '".$obj->total."'";
+                $sql .= " stock = '".$db->escape($obj->total)."'";
                 $sql .= " WHERE rowid=".$obj->fk_product;
 
                 $resql2 = $db->query($sql);
                 if ($resql2)
                 {
-                }
-                else
-                {
+                } else {
                     $error++;
                     dol_print_error($db);
                 }
@@ -2415,14 +2296,10 @@ function migrate_stocks($db, $langs, $conf)
         if ($error == 0)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2470,16 +2347,14 @@ function migrate_menus($db, $langs, $conf)
                     $obj = $db->fetch_object($resql);
 
                     $sql = "UPDATE ".MAIN_DB_PREFIX."menu SET";
-                    $sql .= " enabled = '".$obj->action."'";
+                    $sql .= " enabled = '".$db->escape($obj->action)."'";
                     $sql .= " WHERE rowid=".$obj->rowid;
                     $sql .= " AND enabled = '1'";
 
                     $resql2 = $db->query($sql);
                     if ($resql2)
                     {
-                    }
-                    else
-                    {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
@@ -2491,20 +2366,14 @@ function migrate_menus($db, $langs, $conf)
             if ($error == 0)
             {
                 $db->commit();
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -2554,7 +2423,7 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
                     $obj = $db->fetch_object($resql);
 
                     $sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-                    $sql .= " fk_adresse_livraison = '".$obj->fk_adresse_livraison."'";
+                    $sql .= " fk_adresse_livraison = '".$db->escape($obj->fk_adresse_livraison)."'";
                     $sql .= " WHERE rowid=".$obj->fk_expedition;
 
                     $resql2 = $db->query($sql);
@@ -2566,29 +2435,21 @@ function migrate_commande_deliveryaddress($db, $langs, $conf)
                     print ". ";
                     $i++;
                 }
-            }
-            else
-            {
+            } else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
             if ($error == 0)
             {
                 $db->commit();
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -2651,7 +2512,7 @@ function migrate_restore_missing_links($db, $langs, $conf)
 
                 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." = '".$obj->rowid."'";
+                $sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
                 $sql .= " WHERE rowid=".$obj->field;
 
                 $resql2 = $db->query($sql);
@@ -2663,20 +2524,15 @@ function migrate_restore_missing_links($db, $langs, $conf)
                 //print ". ";
                 $i++;
             }
-        }
-        else print $langs->trans('AlreadyDone')."<br>\n";
+        } else print $langs->trans('AlreadyDone')."<br>\n";
 
         if ($error == 0)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2716,7 +2572,7 @@ function migrate_restore_missing_links($db, $langs, $conf)
 
                 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." = '".$obj->rowid."'";
+                $sql .= " ".$field2." = '".$db->escape($obj->rowid)."'";
                 $sql .= " WHERE rowid=".$obj->field;
 
                 $resql2 = $db->query($sql);
@@ -2728,23 +2584,17 @@ function migrate_restore_missing_links($db, $langs, $conf)
                 //print ". ";
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
 
         if ($error == 0)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -2825,25 +2675,17 @@ function migrate_project_user_resp($db, $langs, $conf)
                 if ($db->query($sqlDrop))
                 {
                     $db->commit();
-                }
-                else
-                {
+                } else {
                     $db->rollback();
                 }
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2917,25 +2759,17 @@ function migrate_project_task_actors($db, $langs, $conf)
                 if ($db->query($sqlDrop))
                 {
                     $db->commit();
-                }
-                else
-                {
+                } else {
                     $db->rollback();
                 }
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
     print '</td></tr>';
@@ -2991,9 +2825,9 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
                     $sqlInsert .= ", targettype";
                     $sqlInsert .= ") VALUES (";
                     $sqlInsert .= $obj->$fk_source;
-                    $sqlInsert .= ", '".$sourcetype."'";
+                    $sqlInsert .= ", '".$db->escape($sourcetype)."'";
                     $sqlInsert .= ", ".$obj->$fk_target;
-                    $sqlInsert .= ", '".$targettype."'";
+                    $sqlInsert .= ", '".$db->escape($targettype)."'";
                     $sqlInsert .= ")";
 
                     $result = $db->query($sqlInsert);
@@ -3005,9 +2839,7 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
                     print ". ";
                     $i++;
                 }
-            }
-            else
-            {
+            } else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
@@ -3017,25 +2849,17 @@ function migrate_relationship_tables($db, $langs, $conf, $table, $fk_source, $so
                 if ($db->query($sqlDrop))
                 {
                     $db->commit();
-                }
-                else
-                {
+                } else {
                     $db->rollback();
                 }
-            }
-            else
-            {
+            } else {
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3103,9 +2927,7 @@ function migrate_project_task_time($db, $langs, $conf)
                     $oldtime++;
                     if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $newtime;
                     else $totaltime[$obj->fk_task] = $newtime;
-                }
-                else
-                {
+                } else {
                     if (!empty($totaltime[$obj->fk_task])) $totaltime[$obj->fk_task] += $obj->task_duration;
                     else $totaltime[$obj->fk_task] = $obj->task_duration;
                 }
@@ -3130,33 +2952,23 @@ function migrate_project_task_time($db, $langs, $conf)
                             dol_print_error($db);
                         }
                     }
-                }
-                else
-                {
+                } else {
                     print $langs->trans('AlreadyDone')."<br>\n";
                 }
-            }
-            else
-            {
+            } else {
                 dol_print_error($db);
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
     }
 
     if ($error == 0)
     {
         $db->commit();
-    }
-    else
-    {
+    } else {
         $db->rollback();
     }
 
@@ -3215,8 +3027,8 @@ function migrate_customerorder_shipping($db, $langs, $conf)
                         $obj = $db->fetch_object($resql);
 
                         $sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-                        $sqlUpdate .= " ref_customer = '".$obj->ref_client."'";
-                        $sqlUpdate .= ", date_delivery = '".($obj->date_livraison ? $obj->date_livraison : 'null')."'";
+                        $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);
@@ -3228,36 +3040,26 @@ function migrate_customerorder_shipping($db, $langs, $conf)
                         print ". ";
                         $i++;
                     }
-                }
-                else
-                {
+                } else {
                     print $langs->trans('AlreadyDone')."<br>\n";
                 }
 
                 if ($error == 0)
                 {
                     $db->commit();
-                }
-                else
-                {
+                } else {
                     dol_print_error($db);
                     $db->rollback();
                 }
-            }
-            else
-            {
+            } else {
                 dol_print_error($db);
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3330,17 +3132,13 @@ function migrate_shipping_delivery($db, $langs, $conf)
                             dol_print_error($db);
                         }
                         print ". ";
-                    }
-                    else
-                    {
+                    } else {
                         $error++;
                         dol_print_error($db);
                     }
                     $i++;
                 }
-            }
-            else
-            {
+            } else {
                 print $langs->trans('AlreadyDone')."<br>\n";
             }
 
@@ -3354,21 +3152,15 @@ function migrate_shipping_delivery($db, $langs, $conf)
                 // DDL commands must not be inside a transaction
                 $sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."livraison DROP COLUMN fk_expedition";
                 $db->query($sqlDrop);
-            }
-            else
-            {
+            } else {
                 dol_print_error($db);
                 $db->rollback();
             }
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         print $langs->trans('AlreadyDone')."<br>\n";
     }
 
@@ -3422,8 +3214,8 @@ function migrate_shipping_delivery2($db, $langs, $conf)
                 $obj = $db->fetch_object($resql);
 
                 $sqlUpdate = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-                $sqlUpdate .= " ref_customer = '".$obj->ref_customer."',";
-                $sqlUpdate .= " date_delivery = ".($obj->date_delivery ? "'".$obj->date_delivery."'" : 'null');
+                $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);
@@ -3435,24 +3227,18 @@ function migrate_shipping_delivery2($db, $langs, $conf)
                 print ". ";
                 $i++;
             }
-        }
-        else
-        {
+        } else {
             print $langs->trans('AlreadyDone')."<br>\n";
         }
 
         if ($error == 0)
         {
             $db->commit();
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
             $db->rollback();
         }
-    }
-    else
-    {
+    } else {
         dol_print_error($db);
         $db->rollback();
     }
@@ -3495,7 +3281,7 @@ function migrate_actioncomm_element($db, $langs, $conf)
 			$db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm SET ";
-			$sql .= "fk_element = ".$field.", elementtype = '".$type."'";
+			$sql .= "fk_element = ".$field.", elementtype = '".$db->escape($type)."'";
 			$sql .= " WHERE ".$field." IS NOT NULL";
 			$sql .= " AND fk_element IS NULL";
 			$sql .= " AND elementtype IS NULL";
@@ -3510,15 +3296,11 @@ function migrate_actioncomm_element($db, $langs, $conf)
 				//$sqlDrop = "ALTER TABLE ".MAIN_DB_PREFIX."actioncomm DROP COLUMN ".$field;
 				//$db->query($sqlDrop);
 				//print ". ";
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 	}
@@ -3558,7 +3340,7 @@ function migrate_mode_reglement($db, $langs, $conf)
 		$sqlSelect = "SELECT id";
 		$sqlSelect .= " FROM ".MAIN_DB_PREFIX."c_paiement";
 		$sqlSelect .= " WHERE id = ".$old_id;
-		$sqlSelect .= " AND code = '".$elements['code'][$key]."'";
+		$sqlSelect .= " AND code = '".$db->escape($elements['code'][$key])."'";
 
 		$resql = $db->query($sqlSelect);
 		if ($resql)
@@ -3573,13 +3355,13 @@ function migrate_mode_reglement($db, $langs, $conf)
 				$sqla = "UPDATE ".MAIN_DB_PREFIX."paiement SET ";
 				$sqla .= "fk_paiement = ".$elements['new_id'][$key];
 				$sqla .= " WHERE fk_paiement = ".$old_id;
-				$sqla .= " AND fk_paiement IN (SELECT id FROM ".MAIN_DB_PREFIX."c_paiement WHERE id = ".$old_id." AND code = '".$elements['code'][$key]."')";
+				$sqla .= " AND fk_paiement IN (SELECT id FROM ".MAIN_DB_PREFIX."c_paiement WHERE id = ".$old_id." AND code = '".$db->escape($elements['code'][$key])."')";
 				$resqla = $db->query($sqla);
 
 				$sql = "UPDATE ".MAIN_DB_PREFIX."c_paiement SET ";
 				$sql .= "id = ".$elements['new_id'][$key];
 				$sql .= " WHERE id = ".$old_id;
-				$sql .= " AND code = '".$elements['code'][$key]."'";
+				$sql .= " AND code = '".$db->escape($elements['code'][$key])."'";
 				$resql = $db->query($sql);
 
 				if ($resqla && $resql)
@@ -3602,15 +3384,11 @@ function migrate_mode_reglement($db, $langs, $conf)
 					if (!$error)
 					{
 						$db->commit();
-					}
-					else
-					{
+					} else {
 						dol_print_error($db);
 						$db->rollback();
 					}
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 					$db->rollback();
 				}
@@ -3693,17 +3471,13 @@ function migrate_clean_association($db, $langs, $conf)
                         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
-                    {
+                    } else {
                         print '<tr><td>'.$langs->trans("MigrationCategorieAssociation").'</td>';
                         print '<td class="right">'.$langs->trans("RemoveDuplicates").' '.$langs->trans("Failed").'</td></tr>';
                         $db->rollback();
                     }
                 }
-            }
-            else
-            {
+            } else {
                 print '<tr><td>'.$langs->trans("Error").'</td>';
                 print '<td class="right"><div class="error">'.$db->lasterror().'</div></td></tr>';
             }
@@ -3763,9 +3537,7 @@ function migrate_categorie_association($db, $langs, $conf)
 					print ". ";
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				print $langs->trans('AlreadyDone')."<br>\n";
 			}
 
@@ -3785,20 +3557,14 @@ function migrate_categorie_association($db, $langs, $conf)
 				*/
 
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		print $langs->trans('AlreadyDone')."<br>\n";
 	}
 
@@ -3857,23 +3623,17 @@ function migrate_event_assignement($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -3934,23 +3694,17 @@ function migrate_event_assignement_contact($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4021,9 +3775,7 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 						{
 							$error++;
 							dol_print_error($db);
-						}
-						else
-						{
+						} else {
 							// Add set line
 							$object = new stdClass();
 							$object->id = 1;
@@ -4040,36 +3792,26 @@ function migrate_reset_blocked_log($db, $langs, $conf)
 								$error++;
 							}
 						}
-					}
-					else
-					{
+					} else {
 						print ' - '.$langs->trans('AlreadyInV7').'<br>';
 					}
-				}
-				else
-				{
+				} else {
 					dol_print_error($db);
 				}
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('NothingToDo')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4131,23 +3873,17 @@ function migrate_remise_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4199,16 +3935,13 @@ function migrate_remise_except_entity($db, $langs, $conf)
 					$sqlSelect2 = "SELECT f.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."facture as f";
 					$sqlSelect2 .= " WHERE f.rowid = ".$fk_facture;
-				}
-				elseif (!empty($obj->fk_facture_line))
+				} elseif (!empty($obj->fk_facture_line))
 				{
 					$sqlSelect2 = "SELECT f.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as fd";
 					$sqlSelect2 .= " WHERE fd.rowid = ".$obj->fk_facture_line;
 					$sqlSelect2 .= " AND fd.fk_facture = f.rowid";
-				}
-				else
-				{
+				} else {
 					$sqlSelect2 = "SELECT s.entity";
 					$sqlSelect2 .= " FROM ".MAIN_DB_PREFIX."societe as s";
 					$sqlSelect2 .= " WHERE s.rowid = ".$obj->fk_soc;
@@ -4232,9 +3965,7 @@ function migrate_remise_except_entity($db, $langs, $conf)
 							dol_print_error($db);
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$error++;
 					dol_print_error($db);
 				}
@@ -4242,23 +3973,17 @@ function migrate_remise_except_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4318,23 +4043,17 @@ function migrate_user_rights_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4394,23 +4113,17 @@ function migrate_usergroup_rights_entity($db, $langs, $conf)
 				print ". ";
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans('AlreadyDone')."<br>\n";
 		}
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 		$db->rollback();
 	}
@@ -4593,8 +4306,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_API')
+		} elseif ($moduletoreload == 'MAIN_MODULE_API')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Rest API module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modApi.class.php';
@@ -4603,8 +4315,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_BARCODE')
+		} elseif ($moduletoreload == 'MAIN_MODULE_BARCODE')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Barcode module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modBarcode.class.php';
@@ -4613,8 +4324,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_CRON')
+		} elseif ($moduletoreload == 'MAIN_MODULE_CRON')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Cron module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modCron.class.php';
@@ -4623,8 +4333,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE')
+		} elseif ($moduletoreload == 'MAIN_MODULE_SOCIETE')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Societe module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modSociete.class.php';
@@ -4633,8 +4342,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
+		} elseif ($moduletoreload == 'MAIN_MODULE_PRODUIT')    // Permission has changed into 2.7
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Produit module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modProduct.class.php';
@@ -4643,8 +4351,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
+		} elseif ($moduletoreload == 'MAIN_MODULE_SERVICE')    // Permission has changed into 2.7
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Service module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
@@ -4653,8 +4360,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
+		} elseif ($moduletoreload == 'MAIN_MODULE_COMMANDE')   // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Commande module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
@@ -4663,8 +4369,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
+		} elseif ($moduletoreload == 'MAIN_MODULE_FACTURE')    // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Facture module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
@@ -4673,8 +4378,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
+		} elseif ($moduletoreload == 'MAIN_MODULE_FOURNISSEUR')    // Permission has changed into 2.9
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Fournisseur module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php';
@@ -4683,8 +4387,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_HOLIDAY')    // Permission and tabs has changed into 3.8
+		} elseif ($moduletoreload == 'MAIN_MODULE_HOLIDAY')    // Permission and tabs has changed into 3.8
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Leave Request module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modHoliday.class.php';
@@ -4693,8 +4396,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_DEPLACEMENT')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Deplacement module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modDeplacement.class.php';
@@ -4703,8 +4405,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_EXPENSEREPORT')
+		} elseif ($moduletoreload == 'MAIN_MODULE_EXPENSEREPORT')
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Expense Report module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modExpenseReport.class.php';
@@ -4713,8 +4414,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_DON')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Don module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modDon.class.php';
@@ -4723,8 +4423,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				//$mod->remove('noboxes');
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
+		} elseif ($moduletoreload == 'MAIN_MODULE_ECM')    // Permission has changed into 3.0 and 3.1
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate ECM module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
@@ -4733,8 +4432,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because a permission id has been removed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_PAYBOX')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Paybox module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modPaybox.class.php';
@@ -4743,8 +4441,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because id of module has changed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL')		// Module after 3.5
+		} elseif ($moduletoreload == 'MAIN_MODULE_SUPPLIERPROPOSAL')		// Module after 3.5
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Supplier Proposal module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modSupplierProposal.class.php';
@@ -4753,8 +4450,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because id of module has changed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_OPENSURVEY')    // Permission has changed into 3.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Opensurvey module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modOpenSurvey.class.php';
@@ -4763,8 +4459,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because menu entries has changed
 				$mod->init($reloadmode);
 			}
-		}
-		elseif ($moduletoreload == 'MAIN_MODULE_TAKEPOS')    // Permission has changed into 10.0
+		} elseif ($moduletoreload == 'MAIN_MODULE_TAKEPOS')    // Permission has changed into 10.0
 		{
 			dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate Takepos module");
 			$res = @include_once DOL_DOCUMENT_ROOT.'/core/modules/modTakePos.class.php';
@@ -4773,9 +4468,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				$mod->remove('noboxes'); // We need to remove because menu entries has changed
 				$mod->init($reloadmode);
 			}
-		}
-		else
-		{
+		} else {
 			$reg = array();
 			$tmp = preg_match('/MAIN_MODULE_([a-zA-Z0-9]+)/', $moduletoreload, $reg);
 			if (!empty($reg[1]))
@@ -4783,8 +4476,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 				if (strtoupper($moduletoreload) == $moduletoreload)	// If key is un uppercase
 				{
 					$moduletoreloadshort = ucfirst(strtolower($reg[1]));
-				}
-				else												// If key is a mix of up and low case
+				} else // If key is a mix of up and low case
 				{
 					$moduletoreloadshort = $reg[1];
 				}
@@ -4795,9 +4487,7 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 					$mod = new $classname($db);
 					//$mod->remove('noboxes');
 					$mod->init($reloadmode);
-				}
-				else
-				{
+				} else {
 					dolibarr_install_syslog('Failed to include '.DOL_DOCUMENT_ROOT.'/core/modules/mod'.$moduletoreloadshort.'.class.php');
 
 					$res = @dol_include_once(strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php');
@@ -4806,15 +4496,11 @@ function migrate_reload_modules($db, $langs, $conf, $listofmodule = array(), $fo
 						$mod = new $classname($db);
 						//$mod->remove('noboxes');
 						$mod->init($reloadmode);
-					}
-					else
-					{
+					} else {
 						dolibarr_install_syslog('Failed to include '.strtolower($moduletoreloadshort).'/core/modules/mod'.$moduletoreloadshort.'.class.php');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dolibarr_install_syslog("Error, can't find module with name ".$moduletoreload, LOG_WARNING);
 				print "Error, can't find module with name ".$moduletoreload;
 			}
@@ -4948,8 +4634,7 @@ function migrate_user_photospath()
 					    			}
 									// dol_delete_dir($origin.'/'.$file);
 			        			}
-			    			}
-			    			else								// it is a file
+			    			} else // it is a file
 			    			{
 			    				if (!dol_is_file($destin.'/'.$file))
 			    				{
diff --git a/htdocs/langs/am_ET/accountancy.lang b/htdocs/langs/am_ET/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/am_ET/accountancy.lang
+++ b/htdocs/langs/am_ET/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/am_ET/agenda.lang b/htdocs/langs/am_ET/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/am_ET/agenda.lang
+++ b/htdocs/langs/am_ET/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/am_ET/boxes.lang b/htdocs/langs/am_ET/boxes.lang
index bd62684421a..d6fd298a3a7 100644
--- a/htdocs/langs/am_ET/boxes.lang
+++ b/htdocs/langs/am_ET/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/am_ET/cashdesk.lang b/htdocs/langs/am_ET/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/am_ET/cashdesk.lang
+++ b/htdocs/langs/am_ET/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/am_ET/compta.lang b/htdocs/langs/am_ET/compta.lang
index 8a8c837ac87..8f4f058bb87 100644
--- a/htdocs/langs/am_ET/compta.lang
+++ b/htdocs/langs/am_ET/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
diff --git a/htdocs/langs/am_ET/contracts.lang b/htdocs/langs/am_ET/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/am_ET/contracts.lang
+++ b/htdocs/langs/am_ET/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/am_ET/languages.lang b/htdocs/langs/am_ET/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/am_ET/languages.lang
+++ b/htdocs/langs/am_ET/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/am_ET/mails.lang b/htdocs/langs/am_ET/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/am_ET/mails.lang
+++ b/htdocs/langs/am_ET/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang
index adbc443198f..0af5c66f0e0 100644
--- a/htdocs/langs/am_ET/main.lang
+++ b/htdocs/langs/am_ET/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/am_ET/members.lang b/htdocs/langs/am_ET/members.lang
index dd0a5bf49e2..5ef946ddf67 100644
--- a/htdocs/langs/am_ET/members.lang
+++ b/htdocs/langs/am_ET/members.lang
@@ -81,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/am_ET/mrp.lang b/htdocs/langs/am_ET/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/am_ET/mrp.lang
+++ b/htdocs/langs/am_ET/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/am_ET/projects.lang
+++ b/htdocs/langs/am_ET/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/am_ET/propal.lang b/htdocs/langs/am_ET/propal.lang
index 273996ab1b1..95085002f66 100644
--- a/htdocs/langs/am_ET/propal.lang
+++ b/htdocs/langs/am_ET/propal.lang
@@ -85,3 +85,7 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
diff --git a/htdocs/langs/am_ET/recruitment.lang b/htdocs/langs/am_ET/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/am_ET/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/am_ET/stocks.lang b/htdocs/langs/am_ET/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/am_ET/stocks.lang
+++ b/htdocs/langs/am_ET/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/am_ET/suppliers.lang b/htdocs/langs/am_ET/suppliers.lang
index b69b11272b4..51562b8bb7a 100644
--- a/htdocs/langs/am_ET/suppliers.lang
+++ b/htdocs/langs/am_ET/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/am_ET/ticket.lang b/htdocs/langs/am_ET/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/am_ET/ticket.lang
+++ b/htdocs/langs/am_ET/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/am_ET/users.lang b/htdocs/langs/am_ET/users.lang
index 41a5ebd0981..25d9205457b 100644
--- a/htdocs/langs/am_ET/users.lang
+++ b/htdocs/langs/am_ET/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/am_ET/withdrawals.lang b/htdocs/langs/am_ET/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/am_ET/withdrawals.lang
+++ b/htdocs/langs/am_ET/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/am_ET/workflow.lang b/htdocs/langs/am_ET/workflow.lang
index be126eef0f4..299be277e1d 100644
--- a/htdocs/langs/am_ET/workflow.lang
+++ b/htdocs/langs/am_ET/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/am_ET/zapier.lang b/htdocs/langs/am_ET/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/am_ET/zapier.lang
+++ b/htdocs/langs/am_ET/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/ar_EG/assets.lang b/htdocs/langs/ar_EG/assets.lang
new file mode 100644
index 00000000000..9fd138a21f5
--- /dev/null
+++ b/htdocs/langs/ar_EG/assets.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - assets
+Settings =الإعدادات
diff --git a/htdocs/langs/ar_EG/members.lang b/htdocs/langs/ar_EG/members.lang
index d03eb406cea..f8082fe9fe8 100644
--- a/htdocs/langs/ar_EG/members.lang
+++ b/htdocs/langs/ar_EG/members.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - members
 MemberStatusDraft=مسودة(مطلوب الاعتماد)
 MemberStatusActiveShort=معتمد
+MemberStatusNoSubscriptionShort=معتمد
diff --git a/htdocs/langs/ar_EG/recruitment.lang b/htdocs/langs/ar_EG/recruitment.lang
new file mode 100644
index 00000000000..1ed064a91d3
--- /dev/null
+++ b/htdocs/langs/ar_EG/recruitment.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - recruitment
+ModuleRecruitmentName =توظيف
+ModuleRecruitmentDesc =إدارة ومتابعة حملات التوظيف لشغل وظائف جديدة
+RecruitmentSetup =إعداد التوظيف
diff --git a/htdocs/langs/ar_EG/ticket.lang b/htdocs/langs/ar_EG/ticket.lang
index 4185fd359c1..9aadaa6918b 100644
--- a/htdocs/langs/ar_EG/ticket.lang
+++ b/htdocs/langs/ar_EG/ticket.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - ticket
 Closed=مقفول
+TicketSettings=الإعدادات
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index d016d076e00..cf3e6a34fc5 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=دفتر البيع اليومي
 ACCOUNTING_PURCHASE_JOURNAL=دفتر الشراء اليومي
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=لم يتم تسويتة
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 2ffea4af0ba..2e014d03b3f 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=ميزة لا تتوفر على مثل أنظمة يونكس. sendmail برنامج الاختبار الخاص بك محليا.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=إذا ترجمة لهذه اللغة ليست كاملة أو تجد الأخطاء، يمكنك تصحيح هذا عن طريق تحرير الملفات إلى دليل <b>LANGS /%s</b> وتقديم الملفات التي تم تعديلها على dolibarr.org/forum أو للمطورين على github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=إعداد وحدة
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=نظام
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=يجب تمكين <b>وحدة%s</b> أولا إذا ك
 SecurityToken=المفتاح لعناوين المواقع الآمنة
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=تعديل على الأسعار مع القيمة الم
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=سلسلة
+String1Line=String (1 line)
 TextLong=نص طويل
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=عدد صحيح
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcodes إدارة
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=انقر للاتصال
 Module58Desc=ClickToDial التكامل
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=إنشاء / تعديل الخدمات
 Permission534=حذف خدمات
 Permission536=انظر / إدارة الخدمات الخفية
 Permission538=تصدير الخدمات
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
@@ -848,6 +858,8 @@ Permission773=حذف تقارير المصاريف
 Permission774=قراءة جميع التقارير حساب (حتى للمستخدم لا المرؤوسين)
 Permission775=الموافقة على التقارير حساب
 Permission776=دفع نفقة تقارير
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=تقارير حساب التصدير
 Permission1001=قراءة مخزونات
 Permission1002=إنشاء / تعديل المستودعات
@@ -900,6 +912,7 @@ Permission2515=إعداد وثائق وأدلة
 Permission2801=استخدام عميل FTP في وضع القراءة (تصفح وتحميل فقط)
 Permission2802=العميل استخدام بروتوكول نقل الملفات في وضع الكتابة (حذف أو تحميل الملفات)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=آفاق محتملة
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=المناطق
 DictionaryCountry=الدول
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=الوحدات
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=آفاق الوضع
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليمنى
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=يجب على الأقل تمكين 1 وحدة
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=نعم في الصيف
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=علامة التبويب التي تريد فتح افتراضيا عند اختيار القائمة جدول الأعمال
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=مجرد استخدام الرابط "الهاتف:" على أرقام الهواتف
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=يحتوي هذا الحقل على إشارة لتحديد الخ
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=موقف خط في قوائم السرد
 SellTaxRate=بيع معدل الضريبة
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=عقود
+MailToSendReception=Receptions
 MailToThirdparty=أطراف ثالثة
 MailToMember=أعضاء
 MailToUser=المستخدمين
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=الرمز البريدي
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 74e5281b488..98168cd43b1 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=عدد الأحداث
 ListOfActions=قائمة الأحداث
 EventReports=تقارير الحدث
 Location=الموقع
-ToUserOfGroup=إلي أى مستخدم في المجموعة
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=الأحداث في كامل اليوم (أيام)
 MenuToDoActions=جميع الأحداث الغير مكتملة
 MenuDoneActions=جميع الأحداث الملغية
@@ -86,6 +86,8 @@ ProposalDeleted=تم حذف العرض
 OrderDeleted=تم حذف الطلب
 InvoiceDeleted=تم حذف الفاتورة
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=المنتج %s تم انشاؤه
 PRODUCT_MODIFYInDolibarr=المنتج %sتم تعديلة
 PRODUCT_DELETEInDolibarr=المنتج%s تم حذفة
@@ -158,3 +160,9 @@ DateStartPlusOne=تاريخ بدء + 1 ساعة
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index 27d8107738d..58b9e904429 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -21,14 +21,14 @@ BoxFicheInter=Latest interventions
 BoxCurrentAccounts=ميزان الحسابات المفتوحة
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
 BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Products/Services: latest %s modified
+BoxTitleLastProducts=Products/Services: last %s modified
 BoxTitleProductsAlertStock=Products: stock alert
 BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Vendors: latest %s modified
-BoxTitleLastModifiedCustomers=Customers: latest %s modified
+BoxTitleLastModifiedSuppliers=Vendors: last %s modified
+BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=عملاء الفواتير
 ForCustomersOrders=أوامر العملاء
 ForProposals=اقتراحات
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=المحاسبة
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index 65dc5675c49..bdad092c1c5 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index 7eb313a3d83..b83bfef9a8a 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=الضريبة الاجتماعية أو المالية
 SocialContributions=الضرائب الاجتماعية أو المالية
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=المصروفات الخاصة
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang
index ed4cf534d90..896c170b296 100644
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=ادارة الخدمات
 MenuExpiredServices=انتهت الخدمات
 MenuClosedServices=أغلقت الخدمات
 NewContract=العقد الجديد
-NewContractSubscription=العقد الجديد / الاشتراك
+NewContractSubscription=New contract or subscription
 AddContract=إنشاء العقد
 DeleteAContract=الغاء العقد
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 5a14435d323..8348252dd0b 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=قيمة جديدة لا يمكن أن يكون 
 ErrorFailedToValidatePasswordReset=فشل في reinit كلمة المرور. قد يكون وقد تم بالفعل reinit (هذا الرابط يمكن استخدامها مرة واحدة فقط). إن لم يكن، في محاولة لاستئناف عملية reinit.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=فشل في إضافة جهة اتصال
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=وتم تشكيل لطريقة الدفع لكتابة٪ الصورة ولكن لم يكتمل الإعداد من وحدة الفاتورة لتحديد المعلومات لاظهار هذه طريقة الدفع.
 ErrorPHPNeedModule=خطأ، يجب PHP الخاص بتثبيت <b>وحدة٪ s إلى</b> استخدام هذه الميزة.
 ErrorOpenIDSetupNotComplete=يمكنك إعداد Dolibarr ملف التكوين للسماح بالمصادقة رض، ولكن لم يتم تعريف URL الخدمة رض إلى المستمر٪ الصورة
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
diff --git a/htdocs/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang
index 35b01886b06..065aec3d17b 100644
--- a/htdocs/langs/ar_SA/languages.lang
+++ b/htdocs/langs/ar_SA/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=العربية
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=العربية
+Language_az_AZ=Azerbaijani
 Language_bn_BD=بنغالي
+Language_bn_IN=Bengali (India)
 Language_bg_BG=البلغارية
 Language_bs_BA=البوسنية
 Language_ca_ES=كاتالاني
@@ -20,6 +23,7 @@ Language_en_GB=الانجليزية (المملكة المتحدة)
 Language_en_IN=الإنكليزية (الهند)
 Language_en_NZ=الإنجليزية (نيوزيلندا)
 Language_en_SA=الإنجليزية (المملكة العربية السعودية)
+Language_en_SG=English (Singapore)
 Language_en_US=الإنكليزية (الولايات المتحدة)
 Language_en_ZA=الإنكليزية (جنوب أفريقيا)
 Language_es_ES=الأسبانية
@@ -29,6 +33,7 @@ Language_es_CL=الإسبانية (تشيلي)
 Language_es_CO=الأسبانية (كولومبيا)
 Language_es_DO=الأسبانية (جمهورية الدومنيكان)
 Language_es_EC=الإسبانية (إكوادور)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=الأسبانية (هندوراس)
 Language_es_MX=الإسبانية (المكسيك)
 Language_es_PA=الإسبانية (بنما)
@@ -36,6 +41,7 @@ Language_es_PY=الأسبانية (باراغواي)
 Language_es_PE=الإسبانية (بيرو)
 Language_es_PR=الأسبانية (بورتو ريكو)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=الإسبانية (فنزويلا)
 Language_et_EE=الإستونية
 Language_eu_ES=الباسكي
@@ -44,15 +50,22 @@ Language_fi_FI=اللغة الفنلندية
 Language_fr_BE=الفرنسية (بلجيكا)
 Language_fr_CA=الفرنسية (كندا)
 Language_fr_CH=الفرنسية (سويسرا)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=الفرنسية
+Language_fr_GA=French (Gabon)
 Language_fr_NC=الفرنسية (كاليدونيا الجديدة)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=الفريزية
+Language_gl_ES=Galician
 Language_he_IL=اللغة العبرية
+Language_hi_IN=Hindi (India)
 Language_hr_HR=الكرواتية
 Language_hu_HU=المجري
 Language_id_ID=الأندونيسية
 Language_is_IS=الآيسلندي
 Language_it_IT=الإيطالي
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=اليابانية
 Language_ka_GE=الجورجية
 Language_km_KH=الخمير
@@ -64,6 +77,7 @@ Language_lv_LV=اللاتفية
 Language_mk_MK=المقدونية
 Language_mn_MN=المنغولية
 Language_nb_NO=النرويجية (بوكمال)
+Language_ne_NP=Nepali
 Language_nl_BE=الهولندية (بلجيكا)
 Language_nl_NL=Dutch
 Language_pl_PL=بولندي
@@ -86,4 +100,5 @@ Language_uz_UZ=الأوزبكي
 Language_vi_VN=الفيتنامية
 Language_zh_CN=الصينية
 Language_zh_TW=الصينية (التقليدية)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 0f3ece4cca0..8e4e3308318 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=معلومات
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 43d429b67e5..aab36cc5808 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=UP (شركة الضريبة)
 Amount=كمية
 AmountInvoice=قيمة الفاتورة
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=مبلغ الدفع
 AmountHTShort=Amount (excl.)
 AmountTTCShort=المبلغ (المؤتمر الوطني العراقي. الضريبية)
@@ -485,6 +485,7 @@ Categories=الكلمات / فئات
 Category=العلامة / فئة
 By=بواسطة
 From=من عند
+FromDate=من عند
 FromLocation=من عند
 to=إلى
 To=إلى
@@ -687,6 +688,7 @@ Method=الطريقة
 Receive=استقبال
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=جزئي
 TotalWoman=المجموع
 NeverReceived=لم يتلق
@@ -703,6 +705,7 @@ MenuECM=وثائق
 MenuAWStats=AWStats
 MenuMembers=أعضاء
 MenuAgendaGoogle=جوجل جدول الأعمال
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup= 
 NoFileFound=لا الوثائق المحفوظة في هذا المجلد
 CurrentUserLanguage=الصيغة الحالية
@@ -725,7 +728,7 @@ Page=صفحة
 Notes=وتلاحظ
 AddNewLine=إضافة خط جديد
 AddFile=إضافة ملف
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=استنساخ وجوه مع السمات الرئيسية
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=تي
 ShortFriday=واو
 ShortSaturday=دإ
 ShortSunday=دإ
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=تعيين المرجع
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=معلومات
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 364db7f969f..8793c6b77cd 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=أعضاء مشروع
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=التحقق من صحة
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=مساهمة جديدة
 PaymentSubscription=دفع مساهمة جديدة
 SubscriptionEndDate=تاريخ انتهاء الاكتتاب
@@ -78,7 +81,7 @@ DeleteType=حذف
 VoteAllowed=يسمح التصويت
 Physical=المادية
 Moral=الأخلاقية
-MorPhy=المعنوية / المادية
+MorPhy=طبيعة
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/ar_SA/mrp.lang b/htdocs/langs/ar_SA/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/ar_SA/mrp.lang
+++ b/htdocs/langs/ar_SA/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 7f5d46312d3..cd09294d71d 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index be4388b23b3..6515241f6e6 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=حدد نوع الباركود
 BarcodeValue=قيمة الباركود
 NoteNotVisibleOnBill=ملحوظة(غيرمرئية على الفواتير والعروض...)
 ServiceLimitedDuration=إذا كان المنتج هو خدمة لفترة محدودة :
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=عدد من السعر
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=بلد المنشأ
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=التسمية قصيرة
 Unit=وحدة
 p=ش.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=جديد السمة
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 001ab2e2466..044268aa210 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=مساهم
 TypeContact_project_task_external_TASKCONTRIBUTOR=مساهم
 SelectElement=حدد العنصر
 AddElement=تصل إلى العنصر
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=إحصاءات عن المشاريع / يؤدي
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=المهمة الموكلة. يجب دخول الوقت على هذه المهمة يكون ممكنا.
 IdTaskTime=الوقت مهمة معرف
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/ar_SA/recruitment.lang b/htdocs/langs/ar_SA/recruitment.lang
new file mode 100644
index 00000000000..a3f61ffc4ff
--- /dev/null
+++ b/htdocs/langs/ar_SA/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = حول
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 8e02fb0a3a5..681a987ef17 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=حذف ارسال
 Stock=الأسهم
 Stocks=الاسهم
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=الأسهم عن طريق القرعة / المسلسل
@@ -95,14 +95,16 @@ RealStock=الحقيقية للاسهم
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=الأسهم الافتراضية
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=معرف مخزن
 DescWareHouse=وصف المخزن
 LieuWareHouse=المكان مخزن
 WarehousesAndProducts=والمستودعات والمنتجات
 WarehousesAndProductsBatchDetail=مستودعات والمنتجات (مع التفاصيل في الكثير / مسلسل)
-AverageUnitPricePMPShort=متوسط أسعار المدخلات
-AverageUnitPricePMP=متوسط أسعار المدخلات
+AverageUnitPricePMPShort=المتوسط المرجح لسعر
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=بيع سعر الوحدة
 EstimatedStockValueSellShort=قيمة للبيع
 EstimatedStockValueSell=قيمة للبيع
@@ -141,7 +143,7 @@ Replenishments=التجديد
 NbOfProductBeforePeriod=كمية من الناتج٪ الصورة في الأوراق المالية قبل الفترة المختارة (<٪ ق)
 NbOfProductAfterPeriod=كمية من الناتج٪ الصورة في الأوراق المالية بعد الفترة المختارة (>٪ ق)
 MassMovement=حركة جماهيرية
-SelectProductInAndOutWareHouse=حدد المنتج، والكمية، ومستودع مصدر ومستودع الهدف، ثم انقر فوق "٪ الصورة". حالما يتم ذلك لجميع الحركات المطلوبة، انقر على "٪ الصورة".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=إيصالات لهذا النظام
 StockMovementRecorded=تحركات الأسهم سجلت
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 68a3ee5d152..dfdc55be12c 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=بعض المنتجات الفرعية التي لا
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=ويرتبط هذا المورد بالفعل مرجع مع مرجع : %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=توفر
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=الموافقة على هذا النظام
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=إنكار هذا النظام
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=تأخير التسليم في أيام
-DescNbDaysToDelivery=أكبر تسليم تأخير من المنتجات من هذا النظام
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index 47dd928bbc5..bbaece1060f 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=اكتب
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=مجموعة
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=مجموعة
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index 2d79e755885..4caca7196f6 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=وسوف يكون المستخدم إنشاء مستخد
 IdPhoneCaller=رقم تعريف الهاتف المتصل
 NewUserCreated=مستخدم ٪ ق إنشاء
 NewUserPassword=لتغيير كلمة المرور ل ٪
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=مستخدم تعديل ق ٪
 UserDisabled=مستخدم ٪ ق المعوقين
 UserEnabled=مستخدم ٪ ق تفعيلها
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 338e9c87d46..bbf352bb2b2 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=رفضت فاتورة (اشحن الرفض للعملاء)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=انتظار
 StatusTrans=أحال
+StatusDebited=Debited
 StatusCredited=الفضل
+StatusPaid=دفع
 StatusRefused=رفض
 StatusMotif0=غير محدد
 StatusMotif1=توفير insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=سبب آخر
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=مكتب فقط
 CreateBanque=البنك الوحيد
 OrderWaiting=الانتظار لتلقي العلاج
-NotifyTransmision=انسحاب البث
-NotifyCredit=انسحاب الائتمان
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=رقم المرسل وطنية
 WithBankUsingRIB=عن الحسابات المصرفية باستخدام RIB
 WithBankUsingBANBIC=عن الحسابات المصرفية باستخدام IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=الائتمان على
 WithdrawalFileNotCapable=غير قادر على توليد ملف استلام الانسحاب لبلدكم٪ الصورة (لا يتم اعتماد البلد)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=ملف الانسحاب
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=تعيين إلى حالة "المرسلة ملف"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=إحصاءات عن طريق وضع خطوط
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=المبلغ: %s <br> Metode: %s <br> تاريخ: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=لم يتم تعيين خيار الوضع الحقيقي، ونحن بعد توقف هذه المحاكاة
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/ar_SA/workflow.lang b/htdocs/langs/ar_SA/workflow.lang
index 46316c36c49..30d0fdd1c87 100644
--- a/htdocs/langs/ar_SA/workflow.lang
+++ b/htdocs/langs/ar_SA/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=إعداد وحدة تدفق العمل
-WorkflowDesc=تم تصميم هذه الوحدة لتعديل سلوك الإجراءات التلقائية إلى التطبيق. افتراضيا، سير العمل مفتوح (يمكنك القيام بالأشياء بالترتيب الذي تريده). يمكنك تفعيل الإجراءات التلقائية التي تهمك.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=لا توجد تعديلات على سير العمل متوفرة مع الوحدات النشطة.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=إنشاء طلب عميل تلقائيا بعد التوقيع على اقتراح تجاري (سيكون الطلب الجديد بنفس المبلغ من الاقتراح)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=إنشاء فاتورة العملاء تلقائيا بعد التوقيع على اقتراح تجاري (سيكون للفاتورة الجديدة نفس المبلغ من الاقتراح)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيا بعد التحقق من صحة العقد
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تلقائيا بعد إغلاق طلب العميل (فاتورة جديدة سيكون لها نفس المبلغ من النظام)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=تصنيف اقتراح (مقترحات) المصدر المرتبط بالفوترة عند تعيين طلب العميل على الفاتورة (وإذا كان مقدار الطلب هو نفسه من إجمالي مبلغ الاقتراحات المرتبطة التي تم توقيعها)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=تصنيف مقترح (مقترحات) المصدر المرتبط بالفوترة عندما يتم التحقق من صحة فاتورة العميل (وإذا كان مبلغ الفاتورة هو نفسه من إجمالي مبلغ الاقتراحات المرتبطة التي تم توقيعها)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=تصنيف طلب (أوامر) العميل المصدر المرتبط بالفوترة عندما يتم التحقق من صحة فاتورة العميل (وإذا كان مبلغ الفاتورة هو نفسه من إجمالي مبلغ الطلبات المرتبطة)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=تصنيف طلب (أوامر) العميل المصدر المرتبط إلى الفاتورة عندما يتم تعيين فاتورة العميل على الدفع (وإذا كان مبلغ الفاتورة هو نفسه من إجمالي مبلغ الطلبات المرتبطة)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=تصنيف مرتبط النظام العميل المصدر لشحنها عندما يتم التحقق من صحة الشحنة (وإذا الكمية التي يتم شحنها من قبل جميع الشحنات هو نفسه كما في الأمر لتحديث)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=إنشاء تلقائي
 AutomaticClassification=التصنيف التلقائي
diff --git a/htdocs/langs/ar_SA/zapier.lang b/htdocs/langs/ar_SA/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/ar_SA/zapier.lang
+++ b/htdocs/langs/ar_SA/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/az_AZ/accountancy.lang
+++ b/htdocs/langs/az_AZ/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/az_AZ/agenda.lang b/htdocs/langs/az_AZ/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/az_AZ/agenda.lang
+++ b/htdocs/langs/az_AZ/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/az_AZ/boxes.lang b/htdocs/langs/az_AZ/boxes.lang
index bd62684421a..d6fd298a3a7 100644
--- a/htdocs/langs/az_AZ/boxes.lang
+++ b/htdocs/langs/az_AZ/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/az_AZ/cashdesk.lang b/htdocs/langs/az_AZ/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/az_AZ/cashdesk.lang
+++ b/htdocs/langs/az_AZ/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/az_AZ/compta.lang b/htdocs/langs/az_AZ/compta.lang
index 8a8c837ac87..8f4f058bb87 100644
--- a/htdocs/langs/az_AZ/compta.lang
+++ b/htdocs/langs/az_AZ/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
diff --git a/htdocs/langs/az_AZ/contracts.lang b/htdocs/langs/az_AZ/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/az_AZ/contracts.lang
+++ b/htdocs/langs/az_AZ/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/az_AZ/languages.lang b/htdocs/langs/az_AZ/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/az_AZ/languages.lang
+++ b/htdocs/langs/az_AZ/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/az_AZ/mails.lang b/htdocs/langs/az_AZ/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/az_AZ/mails.lang
+++ b/htdocs/langs/az_AZ/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang
index adbc443198f..0af5c66f0e0 100644
--- a/htdocs/langs/az_AZ/main.lang
+++ b/htdocs/langs/az_AZ/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/az_AZ/members.lang b/htdocs/langs/az_AZ/members.lang
index dd0a5bf49e2..5ef946ddf67 100644
--- a/htdocs/langs/az_AZ/members.lang
+++ b/htdocs/langs/az_AZ/members.lang
@@ -81,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/az_AZ/mrp.lang b/htdocs/langs/az_AZ/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/az_AZ/mrp.lang
+++ b/htdocs/langs/az_AZ/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/az_AZ/projects.lang b/htdocs/langs/az_AZ/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/az_AZ/projects.lang
+++ b/htdocs/langs/az_AZ/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/az_AZ/recruitment.lang b/htdocs/langs/az_AZ/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/az_AZ/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/az_AZ/stocks.lang b/htdocs/langs/az_AZ/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/az_AZ/stocks.lang
+++ b/htdocs/langs/az_AZ/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/az_AZ/suppliers.lang b/htdocs/langs/az_AZ/suppliers.lang
index b69b11272b4..51562b8bb7a 100644
--- a/htdocs/langs/az_AZ/suppliers.lang
+++ b/htdocs/langs/az_AZ/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/az_AZ/ticket.lang b/htdocs/langs/az_AZ/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/az_AZ/ticket.lang
+++ b/htdocs/langs/az_AZ/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/az_AZ/users.lang b/htdocs/langs/az_AZ/users.lang
index 41a5ebd0981..25d9205457b 100644
--- a/htdocs/langs/az_AZ/users.lang
+++ b/htdocs/langs/az_AZ/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/az_AZ/withdrawals.lang b/htdocs/langs/az_AZ/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/az_AZ/withdrawals.lang
+++ b/htdocs/langs/az_AZ/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/az_AZ/workflow.lang b/htdocs/langs/az_AZ/workflow.lang
index be126eef0f4..299be277e1d 100644
--- a/htdocs/langs/az_AZ/workflow.lang
+++ b/htdocs/langs/az_AZ/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/az_AZ/zapier.lang b/htdocs/langs/az_AZ/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/az_AZ/zapier.lang
+++ b/htdocs/langs/az_AZ/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 0b88b5b2253..2841467f8c7 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Разрешава управление на различ
 BANK_DISABLE_DIRECT_INPUT=Деактивиране на директно добавяне на транзакция в банкова сметка
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Активиране на експортиране на журнали в състояние на чернова
 ACCOUNTANCY_COMBO_FOR_AUX=Активиране на комбиниран списък за дъщерна сметка (може да създаде забавяне, ако имате много контрагенти)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Журнал за продажби
 ACCOUNTING_PURCHASE_JOURNAL=Журнал за покупки
@@ -284,6 +285,7 @@ ShowTutorial=Показване на урок
 NotReconciled=Не е съгласувано
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Прилагане на масови категории
 AddAccountFromBookKeepingWithNoCategories=Наличната сметка не е част от персонализирана група
 CategoryDeleted=Категорията за счетоводната сметка е премахната
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 68f6effb731..cd0b1e059b1 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Имейл на подателя по подразб
 UserEmail=Имейл на потребител
 CompanyEmail=Имейл на фирмата
 FeatureNotAvailableOnLinux=Функцията не е налична в Unix подобни системи. Тествайте вашата програма Sendmail локално.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Ако преводът за този език не е завършен или сте открили грешки, може да ги коригирате като редактирате файловете в директорията <b>langs/%s</b> и предоставите вашите промени в www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Ако преводът за този език не е завършен или ако сте открили грешки, може да коригирате това, като редактирате файловете в директорията <b>langs/%s</b> и предоставите вашите промени на dolibarr.org/forum или за разработчици на github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Настройка на модул
 ModulesSetup=Настройка на Модули / Приложения
 ModuleFamilyBase=Система
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Модулът <b>%s</b> трябва да бъде а
 SecurityToken=Ключ за защитени URL адреси
 NoSmsEngine=Няма наличен мениджър за подател на SMS. Мениджърът на подателя на SMS не е инсталиран по подразбиране, защото зависи от външен доставчик, но можете да намерите някои от тях на адрес %s
 PDF=PDF
-PDFDesc=Глобални настройки за генериране на PDF.
-PDFAddressForging=Правила за адресни кутии
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Скриване на цялата информация, свързана с данък върху продажбите / ДДС
 PDFRulesForSalesTax=Правила за данък върху продажбите / ДДС
 PDFLocaltax=Правила за %s
-HideLocalTaxOnPDF=Скриване на %s ставка в колоната ДДС
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Скриване на описанието на продукти
 HideRefOnPDF=Скриване на продуктови номера
 HideDetailsOnPDF=Скриване на подробности за продуктовите линии
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Променяне на цените с базова ре
 MassConvert=Стартиране на групово превръщане
 PriceFormatInCurrentLanguage=Формат на цената в текущия език
 String=Низ
+String1Line=String (1 line)
 TextLong=Дълъг текст
+TextLongNLines=Long text (n lines)
 HtmlText=HTML текст
 Int=Цяло число
 Float=Десетично число
@@ -543,9 +546,9 @@ Module54Desc=Управление на договори (услуги или п
 Module55Name=Баркодове
 Module55Desc=Управление на баркодове
 Module56Name=Плащане с кредитен превод
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Банкови плащания с директен дебит
-Module57Desc=Управление на платежни нареждания за директен дебит. Включва генериране на SEPA файл за европейските страни.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Интегриране на система ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Създаване / променяне на услуги
 Permission534=Изтриване на услуги
 Permission536=Преглед / управление на скрити услуги
 Permission538=Експортиране на услуги
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Преглед на спецификации
 Permission651=Създаване / променяне на спецификации
 Permission652=Изтриване на спецификации
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Преглед на дарения
 Permission702=Създаване / променяне на дарения
 Permission703=Изтриване на дарения
@@ -848,6 +858,8 @@ Permission773=Изтриване на разходни отчети
 Permission774=Преглед на всички разходни отчети (дори на служители които не са подчинени на служителя)
 Permission775=Одобряване на разходни отчети
 Permission776=Плащане на разходни отчети
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Експортиране на разходни отчети
 Permission1001=Преглед на наличности
 Permission1002=Създаване / променяне на складове
@@ -900,6 +912,7 @@ Permission2515=Настройка на директории за докумен
 Permission2801=Използване на FTP клиент в режим на четене (само за преглед и изтегляне)
 Permission2802=Използване на FTP клиент в режим на писане (изтриване или качване на файлове)
 Permission3200=Преглед на архивирани събития и пръстови отпечатъци
+Permission3301=Generate new modules
 Permission4001=Преглед на служители
 Permission4002=Създаване на служители
 Permission4003=Изтриване на служители
@@ -947,7 +960,8 @@ Permission63003=Изтриване на ресурси
 Permission63004=Свързване на ресурси към събития от календара
 DictionaryCompanyType=Видове контрагенти
 DictionaryCompanyJuridicalType=Правна форма на контрагенти
-DictionaryProspectLevel=Потенциал на потенциални клиенти
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Области / Региони
 DictionaryRegion=Региони
 DictionaryCountry=Държави
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Шаблони за имейли
 DictionaryUnits=Единици
 DictionaryMeasuringUnits=Измервателни единици
 DictionarySocialNetworks=Социални мрежи
-DictionaryProspectStatus=Статус на потенциален клиент
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Видове отпуск
 DictionaryOpportunityStatus=Статус на възможността за проект / възможност
 DictionaryExpenseTaxCat=Разходен отчет - Транспортни категории
@@ -1076,7 +1091,7 @@ LoginPage=Входна страница
 BackgroundImageLogin=Фоново изображение
 PermanentLeftSearchForm=Формуляр за постоянно търсене в лявото меню
 DefaultLanguage=Език по подразбиране
-EnableMultilangInterface=Активиране на многоезикова поддръжка
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Показване на фирменото лого в менюто
 CompanyInfo=Фирма / Организация
 CompanyIds=Идентификационни данни на фирма / организация
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Изисква се критерий за
 NewTranslationStringToShow=Нов преводен низ, който да се покаже
 OriginalValueWas=Оригиналния превод е презаписан. Първоначалната стойност е:<br><br>%s
 TransKeyWithoutOriginalValue=Наложихте нов превод за ключа за превод "<strong>%s</strong>", който не съществува в нито един от езиковите файлове
-TotalNumberOfActivatedModules=Активирани приложения / модули: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Трябва да активирате поне 1 модул
 ClassNotFoundIntoPathWarning=Не е намерен клас %s в описания PHP път
 YesInSummer=Да през лятото
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Използване на видове събития (у
 AGENDA_USE_EVENT_TYPE_DEFAULT=Автоматично задаване на стойност по подразбиране за вид събитие във формуляра при създаване на събитие
 AGENDA_DEFAULT_FILTER_TYPE=Автоматично задаване на стойност по подразбиране за вид събитие във филтъра за търсене на календара
 AGENDA_DEFAULT_FILTER_STATUS=Автоматично задаване на стойност по подразбиране за статус на събитие във филтъра за търсене на календара
-AGENDA_DEFAULT_VIEW=Кой раздел да се зарежда по подразбиране, когато се отваря календара
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Активиране на напомняне за събития, <b>чрез имейли</b> (опцията за напомняне / закъснение може да бъде определена за всяко събитие). Забележка: Модулът <strong>%s</strong> трябва да бъде активиран и правилно настроен, за да се изпращат напомняния в определеното време.
 AGENDA_REMINDER_BROWSER=Активиране на напомняне за събития <b>в браузъра на потребителя</b> (когато бъде достигната датата на събитието, всеки потребител може да отхвърли известието от браузъра)
 AGENDA_REMINDER_BROWSER_SOUND=Активиране на звуково известяване
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Показване на свързания обект
 ##### Clicktodial #####
 ClickToDialSetup=Настройка на модула за набиране (ClickToDial)
 ClickToDialUrlDesc=URL, който се извиква при кликване върху телефонен номер. В URL адреса може да използвате маркери <br> <b>__PHONETO__</b>, който ще бъде заменен с телефонния номер на лицето, на което ще се обаждате <br> <b>__PHONEFROM__</b>, който ще бъде заменен с телефонния номер на обаждащия се (вашият) <br> <b>__LOGIN__</b>, който ще бъде заменен с clicktodial потребителско име (дефиниран в картата на потребителя) <br> <b>__PASS__</b>, който ще бъде заменен с clicktodial парола (дефинирана в картата на потребителя).
-ClickToDialDesc=Този модул прави възможно кликването върху телефонни номера. С едно щракване върху иконата ще наберете телефонният номер. Това може да се използва за извикване на Call-Center система от Dolibarr, която може да избере например телефонен номер в SIP система.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Просто използвайте връзката "tel:" за телефонни номера
 ClickToDialUseTelLinkDesc=Използвайте този метод, ако вашите потребители имат softphone или софтуерен интерфейс, инсталиран на същия компютър заедно с браузъра и се обаждат, когато кликнете върху връзка във вашия браузър, която започва "tel:". Ако имате нужда от пълно сървърно решение (няма нужда от локална софтуерна инсталация), трябва да изберете стойност "Не" и да попълните следващото поле.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Това поле съдържа референция за иден
 Enter0or1=Въведете 0 или 1
 UnicodeCurrency=Въведете тук между скобите, десетичен код, който представлява символа на валутата. Например: за $, въведете [36] - за Бразилски Реал R$ [82,36] - за €, въведете [8364]
 ColorFormat=RGB цвета е в HEX формат, например: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Позиция на реда в комбинирани списъци
 SellTaxRate=Ставка на данъка върху продажби
 RecuperableOnly=Да за ДДС "Не възприеман, но възстановим", предназначен за някои области във Франция. Запазете стойността "Не" във всички останали случаи.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Запитване за оферта
 MailToSendSupplierOrder=Поръчки за покупка
 MailToSendSupplierInvoice=Фактури за доставка
 MailToSendContract=Договори
+MailToSendReception=Стокови разписки
 MailToThirdparty=Контрагенти
 MailToMember=Членове
 MailToUser=Потребители
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s е наличен. В
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s е наличен. Версия %s е поддържаща версия, така че съдържа само корекции на грешки. Препоръчваме на всички потребители да актуализират до тази версия. Изданието за поддръжка не въвежда нови функции или промени в базата данни. Може да се изтегли от раздела за изтегляне в портала https://www.dolibarr.org (подраздел Стабилни версии). Прочетете <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> за пълен списък с промените.
 MultiPriceRuleDesc=Когато опцията "Няколко нива на цени за продукт / услуга" е активирана може да определите различни цени (по едно за ниво цена) за всеки продукт. За да спестите време тук може да въведете правило за автоматично изчисляване на цена за всяко ниво на базата на цената от първото ниво, така че ще трябва да въведете само цена за първото ниво за всеки продукт. Тази страница е предназначена да ви спести време, но е полезна само ако цените за всяко ниво са относителни към първо ниво. В повечето случаи може да игнорирате тази страница.
 ModelModulesProduct=Шаблони за продуктови документи
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=За да можете автоматично да генерирате кодове, първо трябва да определите мениджър, за да дефинирате автоматично номера на баркода.
 SeeSubstitutionVars=Вижте * Забележка за списък на възможните заместващи променливи
 SeeChangeLog=Вижте файла ChangeLog (само на английски)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Лява граница в PDF
 MAIN_PDF_MARGIN_RIGHT=Дясна граница в PDF
 MAIN_PDF_MARGIN_TOP=Горна граница в PDF
 MAIN_PDF_MARGIN_BOTTOM=Долна граница в PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=За този модул не е необходима специфична настройка.
 SetToYesIfGroupIsComputationOfOtherGroups=Посочете стойност 'Да', ако тази група е съвкупност от други групи.
 EnterCalculationRuleIfPreviousFieldIsYes=Въведете правило за изчисление, ако предишното поле е настроено на "Да" (например "CODEGRP1 + CODEGRP2")
@@ -1933,13 +1953,14 @@ NothingProcessed=Нищо не е направено
 XEmailsDoneYActionsDone=Открити са %s имейл адреса, %s имейл адреса са успешно обработени (за %s записа / действия)
 RecordEvent=Записване на имейл събитие
 CreateLeadAndThirdParty=Създаване на възможност (и контрагент, ако е необходимо)
-CreateTicketAndThirdParty=Създаване на тикет (и контрагент, ако е необходимо)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Код на последния резултат
 NbOfEmailsInInbox=Брой имейли в директорията източник
 LoadThirdPartyFromName=Зареждане на името на контрагента от %s (само за зареждане)
 LoadThirdPartyFromNameOrCreate=Зареждане на името на контрагента от %s (да се създаде, ако не е намерено)
-WithDolTrackingID=Намерена е Dolibarr референция в идентификационния номер на съобщението
-WithoutDolTrackingID=Не е намерена Dolibarr референция в идентификационния номер на съобщението
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Код на меню (главно меню)
 ECMAutoTree=Показване на автоматично ECM дърво
@@ -1981,7 +2002,7 @@ ImportSetup=Настройка на модула за импортиране н
 InstanceUniqueID=Уникален идентификатор на инстанцията
 SmallerThan=По-малък от
 LargerThan=По-голям от
-IfTrackingIDFoundEventWillBeLinked=Обърнете внимание, че ако е намерен проследяващ код във входящата електронна поща, събитието ще бъде автоматично свързано със свързаните обекти.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=С GMail акаунт, ако сте активирали валидирането в 2 стъпки е препоръчително да създадете специална втора парола за приложението, вместо да използвате своята парола за акаунта от 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=Може да използвате това действие, за да намерите и заредите съществуващ контрагент във вашата база данни, чрез съдържанието на имейла. Намереният (или създаден) контрагент ще бъде използван при следващи действия, които се нуждаят от това. В полето на параметъра може да използвате, например 'EXTRACT:BODY:Name:\\s([^\\s]*)', ако искате да извлечете името на контрагента от низ 'Name: name to find', който е открит в съдържанието на имейла.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index 497307d363d..d2fbae50f13 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Брой събития
 ListOfActions=Списък на събития
 EventReports=Справки за събития
 Location=Местоположение
-ToUserOfGroup=на всеки потребител от група
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Целодневно събитие
 MenuToDoActions=Всички незавършени събития
 MenuDoneActions=Всички завършени събития
@@ -86,6 +86,8 @@ ProposalDeleted=Предложението е изтрито
 OrderDeleted=Поръчката е изтрита
 InvoiceDeleted=Фактурата е изтрита
 DraftInvoiceDeleted=Черновата фактура е изтрита
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Продукт %s е създаден
 PRODUCT_MODIFYInDolibarr=Продукт %s е променен
 PRODUCT_DELETEInDolibarr=Продукт %s е изтрит
@@ -158,3 +160,9 @@ DateStartPlusOne=Начална дата + 1 час
 SetAllEventsToTodo=Задаване на статус 'За извършване' за всички събития
 SetAllEventsToInProgress=Задаване на статус 'В процес' за всички събития
 SetAllEventsToFinished=Задаване на статус 'Завършено' за всички събития
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index 5d283cd67d8..f360c2f0d01 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -27,20 +27,20 @@ BoxTitleLastSuppliers=Доставчици: %s последно добавени
 BoxTitleLastModifiedSuppliers=Доставчици: %s последно променени
 BoxTitleLastModifiedCustomers=Клиенти: %s последно променени
 BoxTitleLastCustomersOrProspects=Клиенти или потенциални клиенти: %s последно добавени
-BoxTitleLastCustomerBills=Фактури за продажба: %s последно добавени
-BoxTitleLastSupplierBills=Фактури за доставка: %s последно добавени
+BoxTitleLastCustomerBills=Фактури за продажба: %s последно променени
+BoxTitleLastSupplierBills=Фактури за доставка: %s последно променени
 BoxTitleLastModifiedProspects=Потенциални клиенти: %s последно променени
 BoxTitleLastModifiedMembers=Членове: %s последно добавени
 BoxTitleLastFicheInter=Интервенции: %s последно променени
 BoxTitleOldestUnpaidCustomerBills=Фактури за продажба: %s най-стари неплатени
 BoxTitleOldestUnpaidSupplierBills=Фактури за доставка: %s най-стари неплатени
-BoxTitleCurrentAccounts=Отворени сметки: баланси
+BoxTitleCurrentAccounts=Активни сметки: баланси
 BoxTitleSupplierOrdersAwaitingReception=Поръчки за покупка в очакване за получаване
 BoxTitleLastModifiedContacts=Контакти / Адреси: %s последно променени
 BoxMyLastBookmarks=Отметки: %s последни
 BoxOldestExpiredServices=Най-стари изтекли активни услуги
 BoxLastExpiredServices=Договори: %s най-стари договори с активни изтекли услуги
-BoxTitleLastActionsToDo=Действия за извършване: %s последни
+BoxTitleLastActionsToDo=Действия: %s последни за извършване
 BoxTitleLastContracts=Договори: %s последно променени
 BoxTitleLastModifiedDonations=Дарения: %s последно променени
 BoxTitleLastModifiedExpenses=Разходни отчети: %s последно променени
@@ -51,11 +51,11 @@ BoxGoodCustomers=Добри клиенти
 BoxTitleGoodCustomers=%s Добри клиенти
 FailedToRefreshDataInfoNotUpToDate=Неуспешно опресняване на RSS поток. Последното успешно опресняване е на дата: %s
 LastRefreshDate=Последна дата на опресняване
-NoRecordedBookmarks=Не са дефинирани отметки
+NoRecordedBookmarks=Не са дефинирани отметки.
 ClickToAdd=Кликнете тук, за да добавите.
 NoRecordedCustomers=Няма регистрирани клиенти
 NoRecordedContacts=Няма регистрирани контакти
-NoActionsToDo=Няма дейности за извършване
+NoActionsToDo=Няма действия за извършване
 NoRecordedOrders=Няма регистрирани поръчки за продажба
 NoRecordedProposals=Няма регистрирани предложения
 NoRecordedInvoices=Няма регистрирани фактури за продажба
@@ -77,12 +77,14 @@ BoxSuppliersOrdersPerMonth=Поръчки за покупка на месец
 BoxProposalsPerMonth=Търговски предложения за месец
 NoTooLowStockProducts=Няма продукти в наличност, които да са под желания минимум.
 BoxProductDistribution=Дистрибуция на продукти / услуги
-ForObject=По %s
+ForObject=по %s
 BoxTitleLastModifiedSupplierBills=Фактури за доставка: %s последно променени
 BoxTitleLatestModifiedSupplierOrders=Поръчки за покупка: %s последно променени
 BoxTitleLastModifiedCustomerBills=Фактури за продажба: %s последно променени
 BoxTitleLastModifiedCustomerOrders=Поръчки за продажба: %s последно променени
 BoxTitleLastModifiedPropals=Търговски предложения: %s последно променени
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Фактури за продажба
 ForCustomersOrders=Поръчки на продажба
 ForProposals=Предложения
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Не е дефинирана временна смет
 BoxLastCustomerShipments=Последни пратки към клиенти
 BoxTitleLastCustomerShipments=Пратки: %s последни към клиенти
 NoRecordedShipments=Няма регистрирани пратки към клиенти
+# Pages
+AccountancyHome=Счетоводство
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index b79c6547916..a30ed1b0a22 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=ПОС модул
 BasicPhoneLayout=Използване на просто оформление за телефони
 SetupOfTerminalNotComplete=Настройката на терминала %s не е завършена
 DirectPayment=Директно плащане
-DirectPaymentButton=Бутон за директно плащане в брой
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Фактурата вече е валидирана
 NoLinesToBill=Няма редове за фактуриране
 CustomReceipt=Персонализирана разписка
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Метод на отпечатване
 ReceiptPrinterMethodDescription=Мощен метод с много параметри. Пълно персонализиране с шаблони. Не може да отпечатва от облака.
 ByTerminal=По терминал
-TakeposNumpadUsePaymentIcon=Използване на икона за плащане в цифровия панел
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> тагът се използва за добавяне на номера на терминала
 TakeposGroupSameProduct=Групиране на едни и същи продукти
 StartAParallelSale=Стартиране на нова паралелна продажба
-ControlCashOpening=Контролиране на каса при стартиране на ПОС
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Паричен отчет
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 3f0f420a1d3..c9dd8bc51e4 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Социален или фискален данък
 SocialContributions=Социални или фискални данъци
 SocialContributionsDeductibles=Приспадащи се социални или фискални данъци
 SocialContributionsNondeductibles=Не приспадащи се социални или фискални данъци
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Име на вноска
 TypeContrib=Тип вноска
 MenuSpecialExpenses=Специални разходи
diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang
index eb9fd5776c3..5ab3eed1309 100644
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Активни услуги
 MenuExpiredServices=Изтекли услуги
 MenuClosedServices=Прекратени услуги
 NewContract=Нов договор
-NewContractSubscription=Нов договор / абонамент
+NewContractSubscription=New contract or subscription
 AddContract=Създаване на договор
 DeleteAContract=Изтриване на договор
 ActivateAllOnContract=Активиране на всички услуги
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 0224767c9de..622d5c15041 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Новата стойност не може да
 ErrorFailedToValidatePasswordReset=Неуспешно преинициализиране на паролата. Може би преинициализирането вече е било направено (този линк може да се използва само веднъж). Ако не е така, опитайте да рестартирате преинициализиращия процес.
 ErrorToConnectToMysqlCheckInstance=Връзката с базата данни е неуспешна. Проверете дали сървърът на базата данни работи (например за mysql/mariadb можете да го стартирате от командния ред със 'sudo service mysql start').
 ErrorFailedToAddContact=Неуспешно добавяне на контакт
-ErrorDateMustBeBeforeToday=Датата не може да бъде по-голяма от днешната
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Режим на заплащане е зададен като тип %s, но настройката на модул Фактури не е попълнена с информация, която да се показва за този режим на плащане.
 ErrorPHPNeedModule=Грешка, вашето PHP трябва да им инсталиран <b>%s</b> модул, за да използвате тази функция.
 ErrorOpenIDSetupNotComplete=Задали сте в конфирурационния файл на Dolibarr да се позволява OpenID удостоверяване, но URL на OpenID услугата не е зададено в константата %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Няма достатъчн
 ErrorOnlyOneFieldForGroupByIsPossible=Възможно е само едно поле за 'Групиране по' (другите се пренебрегват)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашата стойност на PHP параметър upload_max_filesize (%s) е по-голяма от стойността на PHP параметър post_max_size (%s). Това не е последователна настройка.
 WarningPasswordSetWithNoAccount=За този член бе зададена парола. Въпреки това, не е създаден потребителски акаунт. Така че тази парола е съхранена, но не може да се използва за влизане в Dolibarr. Може да се използва от външен модул/интерфейс, но ако не е необходимо да дефинирате потребителско име или парола за член може да деактивирате опцията "Управление на вход за всеки член" от настройката на модула Членове. Ако трябва да управлявате вход, но не се нуждаете от парола, можете да запазите това поле празно, за да избегнете това предупреждение. Забележка: Имейлът може да се използва и като вход, ако членът е свързан с потребител.
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 42ec6841727..6de645ed856 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -84,7 +84,7 @@ PleaseTypePassword=Моля, въведете парола, празно пол
 PleaseTypeALogin=Моля, въведете данни за вход!
 PasswordsMismatch=Паролите са различни, моля, опитайте отново!
 SetupEnd=Край на настройката
-SystemIsInstalled=Инсталация е завършена.
+SystemIsInstalled=Инсталацията е завършена.
 SystemIsUpgraded=Dolibarr е успешно актуализиран.
 YouNeedToPersonalizeSetup=Трябва да конфигурирате Dolibarr според вашите нужди (външен вид, функции, ...). За да направите това, моля последвайте връзката по-долу:
 AdminLoginCreatedSuccessfuly=Администраторския профил '<b> %s </b>' за Dolibarr е успешно създаден.
@@ -139,7 +139,7 @@ MigrationCustomerOrderShipping=Миграция на хранилище за д
 MigrationShippingDelivery=Надграждане на хранилище на доставки
 MigrationShippingDelivery2=Надграждане на хранилище на доставки 2
 MigrationFinished=Миграцията завърши
-LastStepDesc=<strong> Последна стъпка </strong>: Определете тук потребителското име и паролата, които искате да използвате, за да се свържете с Dolibarr. <b> Не губете това, тъй като това е главният акаунт за администриране на всички други / допълнителни потребителски акаунти. </b>
+LastStepDesc=<strong>Последна стъпка</strong>: Създаване на потребителско име и парола, които да използвате за свързване с Dolibarr. <b>Не ги губете, тъй като това е главният акаунт за администриране на всички други / допълнителни потребителски акаунти.</b>
 ActivateModule=Активиране на модул %s
 ShowEditTechnicalParameters=Кликнете тук, за да покажете / редактирате разширените параметри (експертен режим)
 WarningUpgrade=Внимание:\nАрхивирахте ли преди това базата данни?\nТова е силно препоръчително. Загубата на данни (поради грешки в mysql версия 5.5.40/41/42/43) може да е възможна по време на този процес, така че е важно да се направи пълно архивиране на базата данни преди започване на миграция.\n\nКликнете върху „OK“, за да започнете процеса на мигриране...
diff --git a/htdocs/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang
index 28dac2e4a02..a6d388a20f9 100644
--- a/htdocs/langs/bg_BG/languages.lang
+++ b/htdocs/langs/bg_BG/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Арабски
 Language_ar_EG=Арабски (Египет)
 Language_ar_SA=Арабски
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Бенгали
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Български
 Language_bs_BA=Босненски
 Language_ca_ES=Каталонски
@@ -20,6 +23,7 @@ Language_en_GB=Английски (Обединено кралство)
 Language_en_IN=Английски (Индия)
 Language_en_NZ=Английски (Нова Зеландия)
 Language_en_SA=Английски (Саудитска Арабия)
+Language_en_SG=English (Singapore)
 Language_en_US=Английски (САЩ)
 Language_en_ZA=Английски (Южна Африка)
 Language_es_ES=Испански
@@ -29,6 +33,7 @@ Language_es_CL=Испански (Чили)
 Language_es_CO=Испански (Колумбия)
 Language_es_DO=Испански (Доминиканска република)
 Language_es_EC=Испански (Еквадор)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Испански (Хондурас)
 Language_es_MX=Испански (Мексико)
 Language_es_PA=Испански (Панама)
@@ -36,6 +41,7 @@ Language_es_PY=Испански (Парагвай)
 Language_es_PE=Испански (Перу)
 Language_es_PR=Испански (Пуерто Рико)
 Language_es_UY=Испански (Уругвай)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Испански (Венецуела)
 Language_et_EE=Естонски
 Language_eu_ES=Баскски
@@ -44,15 +50,22 @@ Language_fi_FI=Фински
 Language_fr_BE=Френски (Белгия)
 Language_fr_CA=Френски (Канада)
 Language_fr_CH=Френски (Швейцария)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Френски
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Френски (Нова Каледония)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Фризийски
+Language_gl_ES=Galician
 Language_he_IL=Иврит
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Хърватски
 Language_hu_HU=Унгарски
 Language_id_ID=Инодонезийски
 Language_is_IS=Исландски
 Language_it_IT=Италиански
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Японски
 Language_ka_GE=Грузински
 Language_km_KH=Кхмерски
@@ -64,6 +77,7 @@ Language_lv_LV=Латвийски
 Language_mk_MK=Македонски
 Language_mn_MN=Монголски
 Language_nb_NO=Норвежки (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Холандски (Белгия)
 Language_nl_NL=Холандски
 Language_pl_PL=Полски
@@ -86,4 +100,5 @@ Language_uz_UZ=Узбекски
 Language_vi_VN=Виетнамски
 Language_zh_CN=Китайски
 Language_zh_TW=Китайски (традиционен)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Малайски
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 561646e7805..998b2de9d97 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Настройка на изходяща елек
 DefaultOutgoingEmailSetup=Настройка на изходящата поща по подразбиране
 Information=Информация
 ContactsWithThirdpartyFilter=Контакти с филтър за контрагент
+Unanswered=Unanswered
+Answered=Отговорен
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index e9cfd3c09ec..f0cf63d6366 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=Ед. цена (с ДДС)
 Amount=Сума
 AmountInvoice=Фактурна стойност
 AmountInvoiced=Фактурирана сума
-AmountInvoicedHT=Фактурирана сума (с ДДС)
-AmountInvoicedTTC=Фактурирана сума (без ДДС)
+AmountInvoicedHT=Фактурирана сума (без ДДС)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Сума за плащане
 AmountHTShort=Сума (без ДДС)
 AmountTTCShort=Сума (с ДДС)
@@ -485,6 +485,7 @@ Categories=Тагове / Категории
 Category=Таг / Категория
 By=От
 From=От
+FromDate=От
 FromLocation=От
 to=за
 To=за
@@ -687,6 +688,7 @@ Method=Метод
 Receive=Получаване
 CompleteOrNoMoreReceptionExpected=Завършено или не се очаква нищо повече
 ExpectedValue=Очаквана стойност
+ExpectedQty=Expected Qty
 PartialWoman=Частично
 TotalWoman=Обща
 NeverReceived=Никога не е получавано
@@ -703,6 +705,7 @@ MenuECM=Документи
 MenuAWStats=AWStats
 MenuMembers=Членове
 MenuAgendaGoogle=Google календар
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Ограничение на системата (Меню Начало - Настройка - Сигурност): %s Kb, ограничение на PHP: %s Kb
 NoFileFound=Няма записани документи в тази директория
 CurrentUserLanguage=Текущ език
@@ -725,7 +728,7 @@ Page=Страница
 Notes=Бележки
 AddNewLine=Добавяне на нов ред
 AddFile=Добавяне на файл
-FreeZone=Не е предварително определен продукт / услуга
+FreeZone=Free-text product
 FreeLineOfType=Елемент със свободен текст, тип:
 CloneMainAttributes=Клониране на обекта с неговите основни атрибути
 ReGeneratePDF=Повторно генериране на PDF
@@ -942,6 +945,39 @@ ShortThursday=Чт
 ShortFriday=Пт
 ShortSaturday=Сб
 ShortSunday=Нд
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Изберете шаблон за имейл
 SetRef=Задаване на референция
 Select2ResultFoundUseArrows=Намерени са някои резултати. Използвайте стрелките, за да изберете.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Превключете в режим на ре
 NotUsedForThisCustomer=Не се използва за този клиент
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Информация
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 7174efa4909..49b94a21117 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -81,7 +81,7 @@ DeleteType=Изтриване
 VoteAllowed=Може да гласува
 Physical=Реален
 Moral=Морален
-MorPhy=Морален / Реален
+MorPhy=Същност
 Reenable=Повторно активиране
 ResiliateMember=Деактивиране на член
 ConfirmResiliateMember=Сигурни ли сте, че искате да деактивирате този член?
diff --git a/htdocs/langs/bg_BG/mrp.lang b/htdocs/langs/bg_BG/mrp.lang
index f7de7b6522b..a3c2904513a 100644
--- a/htdocs/langs/bg_BG/mrp.lang
+++ b/htdocs/langs/bg_BG/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Поръчки за производство
 MO=Поръчка за производство
+MOs=Manufacturing orders
 MRPDescription=Модул за управление на поръчки за производство (ПП)
 MRPArea=Секция за планиране на материални изисквания
 MrpSetupPage=Настройка на модул за планиране на материални изисквания
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index ff7d312e709..b256d336fd7 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Здравейте)__,\n\nМоля, в
 PredefinedMailContentSendSupplierInvoice=__(Здравейте)__,\n\nМоля, вижте приложената фактура __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Здравейте)__,\n\nМоля, вижте приложената доставка __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Здравейте)__,\n\nМоля, вижте приложената интервенция __REF__\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Здравейте)__,\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Здравейте)__,\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Здравейте)__,\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Може да кликнете върху връзката по-долу, за да направите плащане, в случай, че не сте го извършили.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Здравейте)__,\n\n\n__(Поздрави)__,\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr е компактна ERP / CRM система, която поддържа различни работни модули. Няма смисъл от демонстрация, показваща всички модули, тъй като такъв сценарий никога не се случва (на разположение са стотици модули). Налични са няколко демо профила.
 ChooseYourDemoProfil=Изберете демо профила, който най-добре отговаря на вашите нужди...
 ChooseYourDemoProfilMore=...или създайте свой собствен профил<br>(свободен избор на модули)
@@ -280,7 +278,9 @@ LinesToImport=Редове за импортиране
 
 MemoryUsage=Използване на памет
 RequestDuration=Продължителност на заявлението
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Продукти / Услуги по популярност в предложения
 PopuCom=Продукти / Услуги по популярност в поръчки
 ProductStatistics=Статистика за продукти / услуги
 NbOfQtyInOrders=Количество в поръчки
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index cd841756739..48218d729b0 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Задаване на тип баркод
 BarcodeValue=Баркод стойност
 NoteNotVisibleOnBill=Бележка (не се вижда на фактури, предложения...)
 ServiceLimitedDuration=Ако продуктът е услуга с ограничена продължителност:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Множество ценови сегменти за продукт / услуга (всеки клиент е в един ценови сегмент)
 MultiPricesNumPrices=Брой цени
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Доставни цени (на продук
 CustomCode=Митнически / Стоков / ХС код
 CountryOrigin=Държава на произход
 Nature=Произход на продукта (суровина / произведен)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Кратко означение
 Unit=Мярка
 p=е.
@@ -359,6 +362,9 @@ SelectCombination=Избиране на комбинация
 ProductCombinationGenerator=Генератор на варианти
 Features=Характеристики
 PriceImpact=Въздействие върху цената
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Въздействие върху теглото
 NewProductAttribute=Нов атрибут
 NewProductAttributeValue=Нова стойност на атрибута
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index a7d2b3a46c5..a60103602e1 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Сътрудник
 TypeContact_project_task_external_TASKCONTRIBUTOR=Сътрудник
 SelectElement=Избиране на елемент
 AddElement=Връзка към елемент
+LinkToElementShort=Връзка към
 # Documents models
 DocumentModelBeluga=Шаблон на проектен документ за преглед на свързани елементи
 DocumentModelBaleine=Шаблон на проектен документ за задачи
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Брой създадени проекти на месе
 ProjectNbTaskByMonth=Брой създадени задачи на месец
 ProjectOppAmountOfProjectsByMonth=Сума на възможностите на месец
 ProjectWeightedOppAmountOfProjectsByMonth=Изчислена сума на възможностите на месец
-ProjectOpenedProjectByOppStatus=Активен проект / възможност по статус на възможността
-ProjectsStatistics=Статистики на проекти / възможности
-TasksStatistics=Статистика на задачи
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Задачата е възложена. Въвеждането на време по тази задача трябва да е възможно.
 IdTaskTime=Идентификатор на време на задача
 YouCanCompleteRef=Ако искате да завършите номера с някакъв суфикс, препоръчително е да добавите символ "-", за да го отделите, така че автоматичното номериране да продължи да работи правилно за следващите проекти. Например %s-Суфикс
diff --git a/htdocs/langs/bg_BG/recruitment.lang b/htdocs/langs/bg_BG/recruitment.lang
new file mode 100644
index 00000000000..30dc001edfa
--- /dev/null
+++ b/htdocs/langs/bg_BG/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Настройки
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Относно
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index c9e8f72b3dc..49166064915 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Изтриване на изпращане
 Stock=Наличност
 Stocks=Наличности
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Наличности по партида / сериен №
@@ -95,14 +95,16 @@ RealStock=Реална наличност
 RealStockDesc=Физическа / реална наличност е наличността, която в момента се намира в складовете.
 RealStockWillAutomaticallyWhen=Реалната наличност ще бъде модифицирана според това правило (както е определено в модула на Наличности):
 VirtualStock=Виртуална наличност
-VirtualStockDesc=Виртуална наличност е изчислената наличност, която се образува след като всички активни / предстоящи действия (които засягат наличности) са приключени (получени поръчки за покупка, изпратени поръчки за продажба и т.н.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Идентификатор на склад
 DescWareHouse=Описание на склад
 LieuWareHouse=Местоположение на склад
 WarehousesAndProducts=Складове и продукти
 WarehousesAndProductsBatchDetail=Складове и продукти (с подробности за партида / сериен №)
-AverageUnitPricePMPShort=Средно измерена входна цена
-AverageUnitPricePMP=Средно измерена входна цена
+AverageUnitPricePMPShort=Средно измерена цена
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Единична продажна цена
 EstimatedStockValueSellShort=Стойност за продажба
 EstimatedStockValueSell=Стойност за продажба
@@ -141,7 +143,7 @@ Replenishments=Попълвания на наличности
 NbOfProductBeforePeriod=Количество на продукта %s в наличност преди избрания период (< %s)
 NbOfProductAfterPeriod=Количество на продукта %s в наличност след избрания период (> %s)
 MassMovement=Масово движение
-SelectProductInAndOutWareHouse=Изберете продукт, количество, изпращащ и получаващ склад, след което кликнете върху '%s'. След като направите това за всички необходими движения, кликнете върху '%s'.
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Регистриране на прехвърляне
 ReceivingForSameOrder=Разписки за тази поръчка
 StockMovementRecorded=Движенията на наличностите са регистрирани
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index d04a4d622aa..125f6e9a528 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -9,8 +9,8 @@ ShowSupplier=Показване на доставчик
 OrderDate=Дата на поръчка
 BuyingPriceMin=Най-добра покупна цена
 BuyingPriceMinShort=Най-добра покупна цена
-TotalBuyingPriceMinShort=Обща сума от покупните цени на субпродукти
-TotalSellingPriceMinShort=Обща сума от продажните цени на субпродукти
+TotalBuyingPriceMinShort=Обща сума от покупни цени на подпродукти
+TotalSellingPriceMinShort=Обща сума от продажни цени на подпродукти
 SomeSubProductHaveNoPrices=Някои субпродукти нямат дефинирана цена
 AddSupplierPrice=Добавяне на покупна цена
 ChangeSupplierPrice=Промяна на покупна цена
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Ниско качество
 ReputationForThisProduct=Репутация
 BuyerName=Име на купувача
 AllProductServicePrices=Всички цени на продукти / услуги
-AllProductReferencesOfSupplier=Всички референтни номера за продукти / услуги на доставчик
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Доставни цени
diff --git a/htdocs/langs/bg_BG/ticket.lang b/htdocs/langs/bg_BG/ticket.lang
index ddb9d38d96b..196f2f14856 100644
--- a/htdocs/langs/bg_BG/ticket.lang
+++ b/htdocs/langs/bg_BG/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Изтрит
 
 # Dict
 Type=Вид
-Category=Категория
 Severity=Приоритет
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Автоматично възлагане на тике
 TicketsAutoAssignTicketHelp=При създаване на тикет, той може автоматично да бъде възложен на потребителя, който го е създал.
 TicketNumberingModules=Модул за номериране на тикети
 TicketNotifyTiersAtCreation=Уведомяване на контрагента при създаване
-TicketGroup=Група
 TicketsDisableCustomerEmail=Деактивиране на имейлите, когато тикетът е създаден от публичния интерфейс
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Създаден от
 NewTicket=Нов тикет
 SubjectAnswerToTicket=Отговор на тикет
 TicketTypeRequest=Вид на тикета
-TicketCategory=Категория
+TicketCategory=Група
 SeeTicket=Преглед на тикет
 TicketMarkedAsRead=Тикетът е маркиран като прочетен
 TicketReadOn=Прочетен на
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index 1b4c5498b36..9ffab6ba5ab 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Деактивиран в режим на поддръж
 UserAccountancyCode=Счетоводен код на потребителя
 UserLogoff=Излизане от потребителя
 UserLogged=Потребителят е регистриран
+DateOfEmployment=Employment date
 DateEmployment=Дата на назначаване
 DateEmploymentEnd=Дата на освобождаване
 CantDisableYourself=Не можете да забраните собствения си потребителски запис
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Принудително валидиране на м
 ValidatorIsSupervisorByDefault=По подразбиране валидиращият е ръководителя на потребителя. Оставете празно, за да запазите това поведение.
 UserPersonalEmail=Личен имейл
 UserPersonalMobile=Личен моб. телефон
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index 4717d36e8f5..00e2744c5ba 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Нареждания с директен дебит
 WithdrawalReceipt=Нареждане с директен дебит
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Файлове с директен дебит: %s последни
@@ -63,7 +63,9 @@ InvoiceRefused=Фактурата е отказана (Таксувай отхв
 StatusDebitCredit=Статус дебит / кредит
 StatusWaiting=Очаквано
 StatusTrans=Изпратено
+StatusDebited=Debited
 StatusCredited=Кредитирано
+StatusPaid=Платена
 StatusRefused=Отхвърлено
 StatusMotif0=Неуточнено
 StatusMotif1=Недостатъчни средства
@@ -77,13 +79,13 @@ StatusMotif8=Друга причина
 CreateForSepaFRST=Създаване на файл с директен дебит (SEPA FRST)
 CreateForSepaRCUR=Създаване на файл с директен дебит (SEPA RCUR)
 CreateAll=Създаване на файл с директен дебит (всички)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Само офис
 CreateBanque=Само банка
 OrderWaiting=Очаква обработка
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Национален номер на наредителя
 WithBankUsingRIB=За банкови сметки, използващи RIB
 WithBankUsingBANBIC=За банкови сметки, използващи IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Кредит на
 WithdrawalFileNotCapable=Не може да се генерира файл с разписка за теглене за вашата държава %s (Вашата държава не се поддържа)
 ShowWithdraw=Показване на нареждане с директен дебит
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ако обаче фактурата има поне едно нареждане за плащане с директен дебит, което е все още необработено, то няма да бъде зададено като платено, за да позволи предварително управление на тегленето.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Файл за теглене
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Задаване на статус 'Изпратен файл'
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Статистика по статус на редове
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Начин на плащане
 ModeRECUR=Периодично плащане
 ModeFRST=Еднократно плащане
 PleaseCheckOne=Моля, проверете само един
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Създадена е поръчка с директен дебит %s
 AmountRequested=Заявена сума
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Сума: %s <br> Метод: %s <br> Дата: %s
 InfoRejectSubject=Платежното нареждане с директен дебит е отхвърлено
 InfoRejectMessage=Здравейте, <br><br> Платежното нареждане с директен дебит по фактура %s, отнасящо се до фирма %s, със сума от %s е отказано от банката. <br><br>--<br>%s
 ModeWarning=Опцията за реален режим не беше зададена, спираме след тази симулация
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/bg_BG/workflow.lang b/htdocs/langs/bg_BG/workflow.lang
index dec1f41bc78..ed2fb4312cf 100644
--- a/htdocs/langs/bg_BG/workflow.lang
+++ b/htdocs/langs/bg_BG/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Класифициране на с
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Класифициране на свързаното за запитване към доставчик - първоизточник като фактурираното след валидиране на доставната фактура (и ако стойността на фактурата е същата като общата сума на свързаното запитване)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Класифициране на свързаната поръчка за покупка - първоизточник като фактурирана след валидиране на доставна фактура (и ако стойността на фактурата е същата като общата сума на свързаната поръчка)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Автоматично създаване
 AutomaticClassification=Автоматично класифициране
diff --git a/htdocs/langs/bg_BG/zapier.lang b/htdocs/langs/bg_BG/zapier.lang
index 36779e36087..36b711c3fae 100644
--- a/htdocs/langs/bg_BG/zapier.lang
+++ b/htdocs/langs/bg_BG/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Модул Zapier за Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Настройка на Zapier за Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/bn_BD/agenda.lang b/htdocs/langs/bn_BD/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/bn_BD/agenda.lang
+++ b/htdocs/langs/bn_BD/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index 8fe1f84b149..d6fd298a3a7 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index 6cd046c5607..8f4f058bb87 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/bn_BD/contracts.lang b/htdocs/langs/bn_BD/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/bn_BD/contracts.lang
+++ b/htdocs/langs/bn_BD/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/bn_BD/languages.lang
+++ b/htdocs/langs/bn_BD/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index dd0f4362996..0149ae4d2ce 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang
index 5886c598d52..5ef946ddf67 100644
--- a/htdocs/langs/bn_BD/members.lang
+++ b/htdocs/langs/bn_BD/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/bn_BD/mrp.lang b/htdocs/langs/bn_BD/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/bn_BD/mrp.lang
+++ b/htdocs/langs/bn_BD/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/bn_BD/recruitment.lang b/htdocs/langs/bn_BD/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/bn_BD/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/bn_BD/suppliers.lang b/htdocs/langs/bn_BD/suppliers.lang
index d0cf540d3eb..51562b8bb7a 100644
--- a/htdocs/langs/bn_BD/suppliers.lang
+++ b/htdocs/langs/bn_BD/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/bn_BD/ticket.lang b/htdocs/langs/bn_BD/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/bn_BD/ticket.lang
+++ b/htdocs/langs/bn_BD/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index aea4e7676e4..25d9205457b 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index cccd8196481..a80c1865a0a 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Processed
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/bn_BD/workflow.lang b/htdocs/langs/bn_BD/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/bn_BD/workflow.lang
+++ b/htdocs/langs/bn_BD/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/bn_BD/zapier.lang b/htdocs/langs/bn_BD/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/bn_BD/zapier.lang
+++ b/htdocs/langs/bn_BD/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/bn_IN/accountancy.lang
+++ b/htdocs/langs/bn_IN/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/bn_IN/agenda.lang b/htdocs/langs/bn_IN/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/bn_IN/agenda.lang
+++ b/htdocs/langs/bn_IN/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/bn_IN/boxes.lang b/htdocs/langs/bn_IN/boxes.lang
index bd62684421a..d6fd298a3a7 100644
--- a/htdocs/langs/bn_IN/boxes.lang
+++ b/htdocs/langs/bn_IN/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/bn_IN/cashdesk.lang b/htdocs/langs/bn_IN/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/bn_IN/cashdesk.lang
+++ b/htdocs/langs/bn_IN/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/bn_IN/compta.lang b/htdocs/langs/bn_IN/compta.lang
index 8a8c837ac87..8f4f058bb87 100644
--- a/htdocs/langs/bn_IN/compta.lang
+++ b/htdocs/langs/bn_IN/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
diff --git a/htdocs/langs/bn_IN/contracts.lang b/htdocs/langs/bn_IN/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/bn_IN/contracts.lang
+++ b/htdocs/langs/bn_IN/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/bn_IN/languages.lang b/htdocs/langs/bn_IN/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/bn_IN/languages.lang
+++ b/htdocs/langs/bn_IN/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/bn_IN/mails.lang b/htdocs/langs/bn_IN/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/bn_IN/mails.lang
+++ b/htdocs/langs/bn_IN/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang
index adbc443198f..0af5c66f0e0 100644
--- a/htdocs/langs/bn_IN/main.lang
+++ b/htdocs/langs/bn_IN/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/bn_IN/members.lang b/htdocs/langs/bn_IN/members.lang
index dd0a5bf49e2..5ef946ddf67 100644
--- a/htdocs/langs/bn_IN/members.lang
+++ b/htdocs/langs/bn_IN/members.lang
@@ -81,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/bn_IN/mrp.lang
+++ b/htdocs/langs/bn_IN/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/bn_IN/projects.lang
+++ b/htdocs/langs/bn_IN/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/bn_IN/recruitment.lang b/htdocs/langs/bn_IN/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/bn_IN/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/bn_IN/stocks.lang b/htdocs/langs/bn_IN/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/bn_IN/stocks.lang
+++ b/htdocs/langs/bn_IN/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/bn_IN/suppliers.lang b/htdocs/langs/bn_IN/suppliers.lang
index b69b11272b4..51562b8bb7a 100644
--- a/htdocs/langs/bn_IN/suppliers.lang
+++ b/htdocs/langs/bn_IN/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/bn_IN/ticket.lang b/htdocs/langs/bn_IN/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/bn_IN/ticket.lang
+++ b/htdocs/langs/bn_IN/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/bn_IN/users.lang b/htdocs/langs/bn_IN/users.lang
index 41a5ebd0981..25d9205457b 100644
--- a/htdocs/langs/bn_IN/users.lang
+++ b/htdocs/langs/bn_IN/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/bn_IN/withdrawals.lang b/htdocs/langs/bn_IN/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/bn_IN/withdrawals.lang
+++ b/htdocs/langs/bn_IN/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/bn_IN/workflow.lang b/htdocs/langs/bn_IN/workflow.lang
index be126eef0f4..299be277e1d 100644
--- a/htdocs/langs/bn_IN/workflow.lang
+++ b/htdocs/langs/bn_IN/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/bn_IN/zapier.lang b/htdocs/langs/bn_IN/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/bn_IN/zapier.lang
+++ b/htdocs/langs/bn_IN/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index e57fc06e4a3..b21215a1589 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Dnevnik prodaje
 ACCOUNTING_PURCHASE_JOURNAL=Dnevnik nabavki
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Nije izmireno
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 5db1c28e5a3..48a667ba744 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Postavke modula
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Postavke direktorija za dokumente
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Potencijal mogućeg klijenta
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Jedinice
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Status mogućeg klijenta
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Kompanija/organizacija
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Narudžbe za nabavku
 MailToSendSupplierInvoice=Fakture prodavača
 MailToSendContract=Ugovori
+MailToSendReception=Receptions
 MailToThirdparty=Subjekti
 MailToMember=Članovi
 MailToUser=Korisnici
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index 5fe55463a70..e3fd4c2b551 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Broj događaja
 ListOfActions=Lista događaja
 EventReports=Event reports
 Location=Lokacija
-ToUserOfGroup=Bilo koji korisnik u grupi
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Događaj za cijeli dan(e)
 MenuToDoActions=Svi nepotpuni događaji
 MenuDoneActions=Sve završeni događaji
@@ -86,6 +86,8 @@ ProposalDeleted=Ponuda obrisana
 OrderDeleted=Narudžba obrisana
 InvoiceDeleted=Faktura obrisana
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Datum početka + 1 sat
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index 7a65920bf0d..7106f0a31c4 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Posljednjih %s unesenih dobavljača
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Posljednjih %s kupaca ili prospekata
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Najnovijih %s članova
 BoxTitleLastFicheInter=Posljednjih %s izmijenjenih intervencija
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Posljednjih %s izmijenjenih ponuda
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Fakture kupaca
 ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Računovodstvo
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index e415d20f155..b0ffb1d3f05 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index 488ffaee0e9..90a8289d2d9 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang
index 9ec496057d1..9198e656369 100644
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Aktivne usluge
 MenuExpiredServices=Istekle usluge
 MenuClosedServices=Završene usluge
 NewContract=Novi ugovor
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Obrisati ugovor
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 7ea5c6cef62..d3460403a51 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/bs_BA/languages.lang b/htdocs/langs/bs_BA/languages.lang
index b5fe554d77e..f30cffc94c2 100644
--- a/htdocs/langs/bs_BA/languages.lang
+++ b/htdocs/langs/bs_BA/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arapski
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arapski
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bugarski
 Language_bs_BA=Bosanski
 Language_ca_ES=Katalonski
@@ -20,6 +23,7 @@ Language_en_GB=Engleski (United Kingdom)
 Language_en_IN=Engleski (Indija)
 Language_en_NZ=Engleski (Novi Zeland)
 Language_en_SA=Engleski (Saudijska Arabija)
+Language_en_SG=English (Singapore)
 Language_en_US=Engleski (United States)
 Language_en_ZA=Engleski (Južna Afrika)
 Language_es_ES=Španski
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Španjolski (Honduras)
 Language_es_MX=Španjolski (Meksiko)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Španjolski (Paragvaj)
 Language_es_PE=Španjolski (Peru)
 Language_es_PR=Španjolski (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonski
 Language_eu_ES=Baskijski
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Francuski (Belgija)
 Language_fr_CA=Francuski (Kanada)
 Language_fr_CH=Francuski (Švajcarska)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Francuski
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Francuski (Nova Kaledonija)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Jevrejski
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Hrvatski
 Language_hu_HU=Mađarski
 Language_id_ID=Indonesian
 Language_is_IS=Islandski
 Language_it_IT=Italijanski
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanski
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Letonski
 Language_mk_MK=Makedonski
 Language_mn_MN=Mongolian
 Language_nb_NO=Norveški (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgija)
 Language_nl_NL=Dutch
 Language_pl_PL=Poljski
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vijetnamski
 Language_zh_CN=Kineski
 Language_zh_TW=Kineski (tradicionalni)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 3b41f698ef6..93bde73c33f 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Inromacije
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 19185a7375f..477e64c7237 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=J.C. (uklj. PDV)
 Amount=Iznos
 AmountInvoice=Iznos fakture
 AmountInvoiced=Fakturisani iznos
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Iznos plaćanja
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Iznos (uklj. PDV)
@@ -485,6 +485,7 @@ Categories=Oznake/kategorije
 Category=Oznaka/kategorija
 By=Od
 From=Od
+FromDate=Od
 FromLocation=Od
 to=za
 To=za
@@ -687,6 +688,7 @@ Method=Metoda
 Receive=Primiti
 CompleteOrNoMoreReceptionExpected=Završeno ili se ne očekuje više
 ExpectedValue=Očekivana vrijednost
+ExpectedQty=Expected Qty
 PartialWoman=Djelimično
 TotalWoman=Ukupno
 NeverReceived=Nikad primljeno
@@ -703,6 +705,7 @@ MenuECM=Dokumenti
 MenuAWStats=AWStats
 MenuMembers=Članovi
 MenuAgendaGoogle=Google kalendar
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr ograničenje (Meni Početna-Postavke-Sigurnost): %s Kb, PHP ograničenje: %s Kb
 NoFileFound=Nema dokumenata spremljenih u ovom direktoriju
 CurrentUserLanguage=Trenutni jezik
@@ -725,7 +728,7 @@ Page=Stranica
 Notes=Napomene
 AddNewLine=Dodaj novi red
 AddFile=Dodaj datoteku
-FreeZone=Nije predefinisan proizvod/usluga
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Kloniraj objekt sa njegovim osnovnim osobinama
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=Č
 ShortFriday=P
 ShortSaturday=S
 ShortSunday=N
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Odaberite šablon emaila
 SetRef=Postavi ref.
 Select2ResultFoundUseArrows=Pronađeni neki rezultati. Koristite strelice za odabir.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Inromacije
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index 415317e90cf..70359336519 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Potvrđeno
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Obriši
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/bs_BA/mrp.lang b/htdocs/langs/bs_BA/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/bs_BA/mrp.lang
+++ b/htdocs/langs/bs_BA/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 3b543fcee8d..024bf6013d5 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Linija za uvoz
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 990bc66d759..4b43f471d39 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Jedinica
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Novi atribut
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 76ce913f66e..2a1023dec52 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link ka
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/bs_BA/recruitment.lang b/htdocs/langs/bs_BA/recruitment.lang
new file mode 100644
index 00000000000..babb96232f7
--- /dev/null
+++ b/htdocs/langs/bs_BA/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = O programu
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 22d0df4aa79..73ea1445906 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Obriši slanje
 Stock=Zaliha
 Stocks=Zalihe
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Stvarna zaliha
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Viruelna zaliha
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
 WarehousesAndProducts=Skladišta i proizvodi
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Ponderirani prosjek ulazne cijene
-AverageUnitPricePMP=Ponderirani prosjek ulazne cijene
+AverageUnitPricePMPShort=Ponderirana/vagana aritmetička sredina - PAS
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Prodajna cijena jedinice
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Nadopune
 NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda (%s)
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihi poslije odabranog perioda (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Odaberite proizvod, kolilinu, izvordno skladište i ciljano skladište. zatim kliknite "%s". Kada je ovo završeno za sva potrebna kretanja, kliknite "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Kretanja zalihe zapisana
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 2131b7bfec6..eb8fe5c46fb 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -1,29 +1,29 @@
-# Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Vendors
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Dobavljači
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
+NewSupplier=Novi dobavljač
 History=Historija
-ListOfSuppliers=List of vendors
+ListOfSuppliers=Spisak dobavljača
 ShowSupplier=Show vendor
 OrderDate=Datum narudžbe
 BuyingPriceMin=Best buying price
 BuyingPriceMinShort=Best buying price
 TotalBuyingPriceMinShort=Ukupan iznos za kupovne cijene podproizvoda
-TotalSellingPriceMinShort=Total of subproducts selling prices
+TotalSellingPriceMinShort=Ukupno za prodajne cijene podproizvoda
 SomeSubProductHaveNoPrices=Neki podproizvodi nemaju definisanu cijenu
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ova referentni dobavljač je već povezan sa referencom: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
+RefSupplierShort=Ref. prodavača
 Availability=Dostupnost
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Odobri ovu narudžbu
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/bs_BA/ticket.lang b/htdocs/langs/bs_BA/ticket.lang
index bcfd05169d8..c93c3a3c59e 100644
--- a/htdocs/langs/bs_BA/ticket.lang
+++ b/htdocs/langs/bs_BA/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Tip
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Grupa
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Grupa
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index 06906541007..4c99cebb83a 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Napravljeni korisnik će biti vanjski korisnik (jer je po
 IdPhoneCaller=Id telefonskog pozivatelja
 NewUserCreated=Korisnik %s kreiran
 NewUserPassword=Promjena šifre za %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Korisnik %s izmijenjen
 UserDisabled=Korisnik %s isključen
 UserEnabled=Korisnik %s aktiviran
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Onemogućeno u načinu održavanja
 UserAccountancyCode=User accounting code
 UserLogoff=Odjava korisnika
 UserLogged=Korisnik prijavljen
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index 2b9c9f32ffe..ae61a690ede 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Nalog za plaćanje
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Čekanje
 StatusTrans=Poslano
+StatusDebited=Debited
 StatusCredited=Pripisano
+StatusPaid=Plaćeno
 StatusRefused=Odbijeno
 StatusMotif0=Neodređeno
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Drugi razlog
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Samo office
 CreateBanque=Samo banka
 OrderWaiting=Čeka na razmatranje
-NotifyTransmision=Prijenos podizanja
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/bs_BA/workflow.lang b/htdocs/langs/bs_BA/workflow.lang
index d2b25e8b01a..81f8088f74d 100644
--- a/htdocs/langs/bs_BA/workflow.lang
+++ b/htdocs/langs/bs_BA/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Postavke workflow modula
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/bs_BA/zapier.lang b/htdocs/langs/bs_BA/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/bs_BA/zapier.lang
+++ b/htdocs/langs/bs_BA/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 80a469ad9eb..3cee41a264d 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Gestiona un nombre diferent de zero al final d'un compte
 BANK_DISABLE_DIRECT_INPUT=Des-habilitar l'enregistrament directe de transaccions al compte bancari 
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilita l'exportació d'esborrany en el diari
 ACCOUNTANCY_COMBO_FOR_AUX=Activa la llista de combo per al compte subsidiari (pot ser lent si tens molts tercers)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Diari de venda
 ACCOUNTING_PURCHASE_JOURNAL=Diari de compra
@@ -284,6 +285,7 @@ ShowTutorial=Mostrar Tutorial
 NotReconciled=No conciliat
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Aplica categories massives
 AddAccountFromBookKeepingWithNoCategories=Compte disponible encara no al grup personalitzat
 CategoryDeleted=La categoria per al compte contable ha sigut eliminada
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 2a4317379b9..b524a7b8a73 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -219,7 +219,7 @@ Nouveauté=Novetat
 AchatTelechargement=Comprar / Descarregar
 GoModuleSetupArea=Per desplegar / instal·lar un nou mòdul, aneu a l'àrea de configuració del mòdul: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Llista d’empreses que ofereixen mòduls o funcions desenvolupades a mida. <br> Nota: ja que Dolibarr és una aplicació de codi obert, <i> qualsevol usuari </i> experimentat en la programació PHP hauria de poder desenvolupar un mòdul.
 WebSiteDesc=Llocs web de referència per trobar més mòduls (no core)...
 DevelopYourModuleDesc=Algunes solucions per desenvolupar el vostre propi mòdul...
 URL=URL
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Remitent per defecte per a correus enviats manualment
 UserEmail=Correu electrònic de l'usuari
 CompanyEmail=Correu electrònic de l'empresa
 FeatureNotAvailableOnLinux=Funcionalitat no disponible en sistemes Unix. Proveu el seu sendmail localment.
+FixOnTransifex=Corregeix la traducció a la plataforma de traducció en línia del projecte
 SubmitTranslation=Si la traducció d'aquest idioma no està completa o trobes errors, pots corregir-ho editant els arxius en el directori<b>langs/%s</b> i enviant els canvis a www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Si la traducció d'aquest idioma no està completa o trobes errors, pots corregir-ho editant els fitxers en el directori<b>langs/%s</b> i enviant els fitxers modificats al fòrum de www.dolibarr.es o pels desenvolupadors a github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=Si la traducció d’aquest idioma no és completa o si trobeu errors, podeu corregir-la editant fitxers al directori <b> langs / %s </b> i envieu fitxers modificats a dolibarr.org/forum o, si sou un desenvolupador, amb un PR a github .com / Dolibarr / dolibarr
 ModuleSetup=Configuració del mòdul
 ModulesSetup=Configuració de mòduls/aplicacions
 ModuleFamilyBase=Sistema
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=El mòdul "<b>%s</b>" ha d'habilitar-se primer si neces
 SecurityToken=Clau per encriptar urls
 NoSmsEngine=No hi ha cap gestor d'enviament de SMS. Els gestors d'enviament de SMS no s'instal·len per defecte ja que depenen de cada proveïdor, però pot trobar-los a la plataforma %s
 PDF=PDF
-PDFDesc=Opcions globals per a la generació de PDF.
-PDFAddressForging=Regles per als quadres d'adreces
+PDFDesc=Opcions globals de generació de PDF
+PDFAddressForging=Regles per a la secció d’adreces
 HideAnyVATInformationOnPDF=Amaga tota la informació relacionada amb l'IVA
 PDFRulesForSalesTax=Regles per l'IVA
 PDFLocaltax=Regles per %s
-HideLocalTaxOnPDF=Amagar %s de taxa a la columna d'impostos de venda
+HideLocalTaxOnPDF=Amagueu la tarifa %s a la columna Impost de venda / IVA
 HideDescOnPDF=Amaga la descripció dels productes
 HideRefOnPDF=Amaga la ref. dels productes
 HideDetailsOnPDF=Amaga els detalls de les línies de producte
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Canviar el preu on la referència de base és
 MassConvert=Inicia la conversió massiva
 PriceFormatInCurrentLanguage=Format del preu en idioma actual
 String=Cadena
+String1Line=Cadena (1 línia)
 TextLong=Text llarg
+TextLongNLines=Text llarg (n línies)
 HtmlText=Text Html
 Int=Enter
 Float=Decimal
@@ -542,10 +545,10 @@ Module54Name=Contractes/Subscripcions
 Module54Desc=Gestió de contractes (serveis o subscripcions recurrents)
 Module55Name=Codis de barra
 Module55Desc=Gestió dels codis de barra
-Module56Name=Pagaments per transferència de crèdit
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Pagaments directes de deute bancari
-Module57Desc=Gestió de domiciliacions. També inclou generació del fitxer SEPA per als països europeus.
+Module56Name=Pagament per transferència bancària
+Module56Desc=Gestió del pagament de proveïdors mitjançant comandes de transferència de crèdit. Inclou la generació de fitxers SEPA per a països europeus.
+Module57Name=Pagaments mitjançant dèbit directe
+Module57Desc=Gestió de comandes de dèbit directe. Inclou la generació de fitxers SEPA per a països europeus.
 Module58Name=ClickToDial
 Module58Desc=Integració amb ClickToDial
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Crear/modificar serveis
 Permission534=Eliminar serveis
 Permission536=Veure / gestionar els serveis ocults
 Permission538=Exportar serveis
-Permission650=Llegiu factures de materials
-Permission651=Crear / actualitzar factures de materials
-Permission652=Eliminar factures de materials
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
+Permission650=Llegeix llistes de materials
+Permission651=Crea / actualitza llistes de materials
+Permission652=Elimina llistes de materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
@@ -848,6 +858,8 @@ Permission773=Eliminar els informes de despeses
 Permission774=Consulta tots els informes de despeses (inclòs els usuaris no subordinats)
 Permission775=Aprovar els informes de despeses
 Permission776=Pagar informes de despeses
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Exportar informes de despeses
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar els magatzems
@@ -900,6 +912,7 @@ Permission2515=Configuració carpetes de documents
 Permission2801=Utilitzar el client FTP en mode lectura (només explorar i descarregar)
 Permission2802=Utilitzar el client FTP en mode escriptura (esborrar o pujar arxius)
 Permission3200=Llegiu els esdeveniments arxivats i les empremtes dactilars
+Permission3301=Generate new modules
 Permission4001=Vegeu empleats
 Permission4002=Crea empleats
 Permission4003=Suprimeix els empleats
@@ -947,7 +960,8 @@ Permission63003=Elimina recursos
 Permission63004=Enllaça recursos en esdeveniments de l'agenda
 DictionaryCompanyType=Tipus de tercer
 DictionaryCompanyJuridicalType=Formes jurídiques de tercers
-DictionaryProspectLevel=Nivell de client potencial
+DictionaryProspectLevel=Nivell potencial de perspectiva per a empreses
+DictionaryProspectContactLevel=Nivell potencial de perspectiva dels contactes
 DictionaryCanton=Estats/Províncies
 DictionaryRegion=Regions
 DictionaryCountry=Països
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Plantilles Email
 DictionaryUnits=Unitats
 DictionaryMeasuringUnits=Unitats de mesura
 DictionarySocialNetworks=Xarxes socials
-DictionaryProspectStatus=Estat del pressupost
+DictionaryProspectStatus=Estat de perspectiva de les empreses
+DictionaryProspectContactStatus=Estat de perspectiva dels contactes
 DictionaryHolidayTypes=Tipus de dies lliures
 DictionaryOpportunityStatus=Estat de d'oportunitat pel projecte/oportunitat
 DictionaryExpenseTaxCat=Informe de despeses - Categories de transport
@@ -1076,7 +1091,7 @@ LoginPage=Pàgina de login
 BackgroundImageLogin=Imatge de fons
 PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra
 DefaultLanguage=Idioma per defecte
-EnableMultilangInterface=Habilita el suport multiidioma
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Mostra el logotip de l'organització al menú
 CompanyInfo=Empresa/Organització
 CompanyIds=Identitats d'empresa/organització
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Es necessita un criteri de cerca com a m
 NewTranslationStringToShow=Nova cadena de traducció a mostrar
 OriginalValueWas=La traducció original s'ha sobreescrit. El valor original era: <br><br>%s
 TransKeyWithoutOriginalValue=Heu obligat una nova traducció de la clau de traducció '<strong> %s </strong>' que no existeix en cap fitxer d'idioma
-TotalNumberOfActivatedModules=Mòduls/Aplicacions activats: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Mòduls activats
+TotalNumberOfActivatedModules=Mòduls activats: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Ha d'activar almenys 1 mòdul.
 ClassNotFoundIntoPathWarning=La classe %s no s'ha trobat a la ruta PHP
 YesInSummer=Sí a l'estiu
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Utilitzeu tipus d'esdeveniments (gestionats en el menú Co
 AGENDA_USE_EVENT_TYPE_DEFAULT=Estableix automàticament aquest valor predeterminat per al tipus d'esdeveniment en el formulari de creació de l'esdeveniment
 AGENDA_DEFAULT_FILTER_TYPE=Estableix automàticament aquest tipus d'esdeveniment al filtre de cerca de la vista d'agenda
 AGENDA_DEFAULT_FILTER_STATUS=Estableix automàticament aquest estat per a esdeveniments al filtre de cerca de la visualització d'agenda
-AGENDA_DEFAULT_VIEW=Establir la pestanya per defecte al seleccionar el menú Agenda
+AGENDA_DEFAULT_VIEW=Quina vista voleu obrir de manera predeterminada en seleccionar el menú Agenda
 AGENDA_REMINDER_EMAIL=Activar el recordatori d'esdeveniments <b>per correu electrònic</b> (es pot definir l'opció retard en cada esdeveniment). Nota: el mòdul <strong>%s</strong> ha d'estar habilitat i configurat correctament per tenir un recordatori enviat amb la freqüència correcta.
 AGENDA_REMINDER_BROWSER=Activa el recordatori de l'esdeveniment <b> al navegador de l'usuari </b> (quan s'aconsegueix la data de l'esdeveniment, cada usuari pot rebutjar això des de la pregunta de confirmació del navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilita les notificacions sonores
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Mostra l'objecte vinculat a la vista d'agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuració del mòdul Click To Dial
 ClickToDialUrlDesc=Es crida l'URL quan es fa un clic a la imatge miniatura de telèfon. A l'URL, pots utilitzar les etiquetes <br><b>__PHONETO__</b> que serà reemplaçada pel número de telèfon de la persona a trucar <br><b>__PHONEFROM__</b> que serà reemplaçada pel número de telèfon de la persona que truca (el vostre)  <br><b>__LOGIN__</b> que serà reemplaçada pel teu usuari d'inici de clicktodial (definit a la fitxa d'usuari)  <br><b>__PASS__</b> que serà reemplaçada per la contrasenya de clicktodial (definida a la fitxa d'usuari).
-ClickToDialDesc=Aquest mòdul makea números de telèfon enllaços clics. Un clic a la icona farà que el telèfon truqui al número. Això es pot utilitzar per trucar a un sistema de centre de trucades de Dolibarr que pot trucar al número de telèfon d'un sistema SIP, per exemple.
+ClickToDialDesc=Aquest mòdul canvia els números de telèfon quan s'utilitza un ordinador d'escriptori en enllaços clicables. Un clic trucarà al número. Es pot utilitzar per iniciar la trucada telefònica quan s'utilitza un telèfon suau a l'escriptori o quan s'utilitza un sistema CTI basat en el protocol SIP per exemple. Nota: quan utilitzeu un telèfon intel·ligent, els números de telèfon sempre es poden fer clic.
 ClickToDialUseTelLink=Utilitzar sols l'enllaç "tel:" als números de telèfon
 ClickToDialUseTelLinkDesc=Utilitzeu aquest mètode si els vostres usuaris tenen un softphone o una interfície de programari instal·lada a la mateixa computadora que el navegador, i us demani quan feu clic a un enllaç al vostre navegador que comença per "tel:". Si necessiteu una solució completa de servidor (no cal instal·lar programari local), heu d'establir això a "No" i omplir el camp següent.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Aquest camp conté una referència a un identificador de línia. In
 Enter0or1=Introdueix 0 o 1
 UnicodeCurrency=Introduïu aquí entre claudàtors, llista del número de bytes que representa el símbol monetari. Per exemple: per $, introduïu [36] - per Brasil real R $ [82,36] - per €, introduïu [8364]
 ColorFormat=El color RGB es troba en format HEX, per exemple: FF0000
+PictoHelp=Nom de la icona en format dolibarr ("image.png" si es troba al directori temàtic actual, "image.png@nom_du_module" si es troba al directori / img / d'un mòdul)
 PositionIntoComboList=Posició de la línia en llistes combo
 SellTaxRate=Valor de l'IVA
 RecuperableOnly=Sí per l'IVA "No percebut sinó recuperable" dedicat per a algun estat a França. Manteniu el valor "No" en tots els altres casos.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Sol·licitud de cotització
 MailToSendSupplierOrder=Comandes de compra
 MailToSendSupplierInvoice=Factures del proveïdor
 MailToSendContract=Contractes
+MailToSendReception=Recepcions
 MailToThirdparty=Tercers
 MailToMember=Socis
 MailToUser=Usuaris
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versió %
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió de manteniment, de manera que només conté correccions d'errors. Us recomanem que tots els usuaris actualitzeu aquesta versió. Un llançament de manteniment no introdueix novetats ni canvis a la base de dades. Podeu descarregar-lo des de l'àrea de descàrrega del portal https://www.dolibarr.org (subdirectori de les versions estables). Podeu llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> per obtenir una llista completa dels canvis.
 MultiPriceRuleDesc=Quan s'activa l'opció "Diversos nivells de preus per producte / servei", podeu definir preus diferents (un per preu) per a cada producte. Per estalviar-vos temps, aquí podeu introduir una regla per calcular automàticament un preu per a cada nivell en funció del preu del primer nivell, de manera que només haureu d'introduir un preu del primer nivell per a cada producte. Aquesta pàgina està dissenyada per estalviar temps, però és útil només si els preus de cada nivell són relatius al primer nivell. Podeu ignorar aquesta pàgina en la majoria dels casos.
 ModelModulesProduct=Plantilles per documents de productes
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=Per poder generar codis automàticament, primer heu de definir un gestor per definir automàticament el número del codi de barres.
 SeeSubstitutionVars=Veure * nota per llistat de possibles variables de substitució
 SeeChangeLog=Veure el fitxer ChangeLog (només en anglès)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Marge esquerre al PDF
 MAIN_PDF_MARGIN_RIGHT=Marge dret al PDF
 MAIN_PDF_MARGIN_TOP=Marge superior al PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge inferior al PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Alçada del logotip en PDF
 NothingToSetup=No hi ha cap configuració específica necessària per a aquest mòdul.
 SetToYesIfGroupIsComputationOfOtherGroups=Estableixi a SÍ si aquest grup és un càlcul d'altres grups
 EnterCalculationRuleIfPreviousFieldIsYes=Introduïu la regla de càlcul si el camp anterior estava establert a Sí (Per exemple 'CODEGRP1 + CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=No s'ha fet res
 XEmailsDoneYActionsDone=%s correus electrònics qualificats, %s correus electrònics processats amb èxit (per %s registre / accions realitzades)
 RecordEvent=Registre d'esdeveniments de correu electrònic
 CreateLeadAndThirdParty=Crea Client Potencial (i tercer si és necessari)
-CreateTicketAndThirdParty=Crear tiquet (i tercers si cal)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Últim codi retornat
 NbOfEmailsInInbox=Nombre de correus electrònics en el directori font
 LoadThirdPartyFromName=Carregueu la cerca de tercers al %s (només carrega)
 LoadThirdPartyFromNameOrCreate=Carregueu la cerca de tercers a %s (crear si no es troba)
-WithDolTrackingID=S'ha trobat la referència de Dolibarr a l'ID del missatge
-WithoutDolTrackingID=No s'ha trobat la referència de Dolibarr a l'ID del missatge
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Codi postal
 MainMenuCode=Codi d'entrada del menú (menu principal)
 ECMAutoTree=Mostra l'arbre ECM automàtic
@@ -1981,9 +2002,9 @@ ImportSetup=Configuració del mòdul Import
 InstanceUniqueID=ID únic de la instància
 SmallerThan=Menor que
 LargerThan=Major que
-IfTrackingIDFoundEventWillBeLinked=Tingueu en compte que si es troba un identificador de seguiment al correu electrònic entrant, l’esdeveniment s’enllaçarà automàticament als objectes relacionats.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Amb un compte de GMail, si heu activat la validació de dos passos, es recomana crear una segona contrasenya dedicada a l’aplicació en comptes d’utilitzar la contrasenya del vostre compte des de 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.
+EmailCollectorTargetDir=Pot ser un comportament desitjat traslladar el correu electrònic a una altra etiqueta / directori quan s'ha processat correctament. Només heu de definir el nom del directori per utilitzar aquesta funció (NO utilitzeu caràcters especials en nom). Tingueu en compte que també heu d'utilitzar un compte d'inici de sessió de lectura / escriptura.
 EmailCollectorLoadThirdPartyHelp=Podeu utilitzar aquesta acció per utilitzar el contingut de correu electrònic per cercar i carregar una tercera part existent a la base de dades. La tercera part trobada (o creada) s'utilitzarà per a les accions que ho necessitin. Al camp del paràmetre podeu fer servir, per exemple, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si voleu extreure el nom de la tercera part d'una cadena "Name: nom a trobar" que es troba a la cos.
 EndPointFor=Punt final per %s: %s
 DeleteEmailCollector=Suprimeix el recollidor de correu electrònic
@@ -2005,3 +2026,7 @@ RssNote=Nota: Cada definició de canal RSS proporciona un giny que heu d'habilit
 JumpToBoxes=Vés a Configuració -> Ginys
 MeasuringUnitTypeDesc=Utilitzeu aquí un valor com "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=La escala és el nombre de llocs que heu de moure la part decimal per coincidir amb la unitat de referència predeterminada. Per al tipus d'unitat "temps", és el nombre de segons. Valors entre 80 i 99 són valors reservats.
+TemplateAdded=S'ha afegit la plantilla
+TemplateUpdated=Plantilla actualitzada
+TemplateDeleted=S'ha suprimit la plantilla
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 8fbb5f56fa7..04ba47cdfb9 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Nombre d'esdeveniments
 ListOfActions=Llista d'esdeveniments
 EventReports=Informes d'esdeveniments
 Location=Localització
-ToUserOfGroup=A qualsevol usuari del grup
+ToUserOfGroup=Esdeveniment assignat a qualsevol usuari del grup
 EventOnFullDay=Esdeveniment per tot el dia
 MenuToDoActions=Tots els esdeveniments incomplets
 MenuDoneActions=Esdeveniments acabats
@@ -63,7 +63,7 @@ ShipmentClassifyClosedInDolibarr=Expedició %s classificada com a facturada
 ShipmentUnClassifyCloseddInDolibarr=Enviament %s classificat com a re-obert
 ShipmentBackToDraftInDolibarr=Enviament %s retornat a l'estat d'esborrany
 ShipmentDeletedInDolibarr=Expedició %s eliminada
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=S'ha validat la recepció %s
 OrderCreatedInDolibarr=Comanda %s creada
 OrderValidatedInDolibarr=Comanda %s validada
 OrderDeliveredInDolibarr=Comanda %s classificada com a enviada
@@ -86,6 +86,8 @@ ProposalDeleted=Pressupost esborrat
 OrderDeleted=Comanda esborrada
 InvoiceDeleted=Factura esborrada
 DraftInvoiceDeleted=S'ha suprimit l'esborrany de factura
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Producte %s creat
 PRODUCT_MODIFYInDolibarr=Producte %s modificat
 PRODUCT_DELETEInDolibarr=Producte %s eliminat
@@ -158,3 +160,9 @@ DateStartPlusOne=Data d'inici + 1 hora
 SetAllEventsToTodo=Definir tots els events com a pendents
 SetAllEventsToInProgress=Definir tots els events en progrés
 SetAllEventsToFinished=Definir tots els events com a enllestits
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 47dc59c574d..d3ed5063135 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -37,9 +37,9 @@ IbanValid=BAN vàlid
 IbanNotValid=BAN no vàlid
 StandingOrders=Domiciliacions
 StandingOrder=Domiciliació
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Pagaments per transferència de crèdit
-PaymentByBankTransfer=Pagaments per transferència de crèdit
+PaymentByDirectDebit=Cobrament per domiciliació bancària
+PaymentByBankTransfers=Pagaments per transferència bancària
+PaymentByBankTransfer=Pagament per transferència bancària
 AccountStatement=Extracte
 AccountStatementShort=Extracte
 AccountStatements=Extractes
@@ -106,8 +106,8 @@ SupplierInvoicePayment=Pagament al proveïdor
 SubscriptionPayment=Pagament de quota
 WithdrawalPayment=Ordre de pagament de dèbit
 SocialContributionPayment=Pagament d'impostos varis
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Transferència bancària
+BankTransfers=Transferències bancàries
 MenuBankInternalTransfer=Transferència interna
 TransferDesc=Traspassa d'un compte a un altre, Dolibarr generarà dos registres (dèbit en compte origen i crèdit en compte destí). Per aquesta transacció s'utilitzarà el mateix import (excepte el signe), l'etiqueta i la data).
 TransferFrom=De
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index c351345b199..725581fa07d 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -561,7 +561,7 @@ ToCreateARecurringInvoiceGeneAuto=Si necessites tenir cada factura generada auto
 DeleteRepeatableInvoice=Elimina la factura recurrent
 ConfirmDeleteRepeatableInvoice=Vols eliminar la plantilla de factura?
 CreateOneBillByThird=Crea una factura per tercer (per la resta, una factura per comanda)
-BillCreated=%s càrrec(s) creats
+BillCreated=%s factura(es) creades
 StatusOfGeneratedDocuments=Estat de la generació de documents
 DoNotGenerateDoc=No generar cap fitxer de document
 AutogenerateDoc=Genera automàticament el fitxer del document
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index e9f06e9626b..e82b52c32a0 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -44,7 +44,7 @@ BoxTitleLastActionsToDo=Últims %s events a realitzar
 BoxTitleLastContracts=Últims %s contractes modificats
 BoxTitleLastModifiedDonations=Últimes %s donacions modificades
 BoxTitleLastModifiedExpenses=Últimes %s despeses modificades
-BoxTitleLatestModifiedBoms=Últimes %s factures de material modificades
+BoxTitleLatestModifiedBoms=Últimes %s llistes de material modificades
 BoxTitleLatestModifiedMos=Últimes %s Ordres de Fabricació modificades
 BoxGlobalActivity=Activitat global
 BoxGoodCustomers=Bons clients
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Comandes a Proveïdor: últimes %s modifica
 BoxTitleLastModifiedCustomerBills=Factures del client: últimes %s modificades
 BoxTitleLastModifiedCustomerOrders=Comandes de venda: últimes %s modificades
 BoxTitleLastModifiedPropals=Últims %s pressupostos modificats
+BoxTitleLatestModifiedJobPositions=Els darrers %s treballs modificats
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Factures a clients
 ForCustomersOrders=Comandes de clients
 ForProposals=Pressupostos
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=El compte de suspens no està definit
 BoxLastCustomerShipments=Últims enviaments de clients
 BoxTitleLastCustomerShipments=Últims %s enviaments de clients
 NoRecordedShipments=Cap enviament de client registrat
+# Pages
+AccountancyHome=Comptabilitat
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 998b9816314..c18d86147d6 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=Mòdul TPV
 BasicPhoneLayout=Utilitzeu el disseny bàsic dels telèfons
 SetupOfTerminalNotComplete=La configuració del terminal %s no està completa
 DirectPayment=Pagament directe
-DirectPaymentButton=Botó de pagament directe en efectiu
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=La factura ja està validada
 NoLinesToBill=No hi ha línies a facturar
 CustomReceipt=Rebut personalitzat
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Mòdul extern amb funcions addicionals. Possib
 PrintMethod=Mètode d'impressió
 ReceiptPrinterMethodDescription=Mètode potent amb molts paràmetres. Completament personalitzable amb plantilles. No es pot imprimir des del núvol.
 ByTerminal=Per terminal
-TakeposNumpadUsePaymentIcon=Utilitzar la icona de pagament al teclat numèric
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Mòdul de numeració per a vendes del Punt de Venda (POS)
 CashDeskGenericMaskCodes6 = <br>l'etiqueta <b>{TN}</b> s'utilitza per afegir el numero de terminal
 TakeposGroupSameProduct=Agrupa les mateixes línies de productes
 StartAParallelSale=Inicia una nova venda paral·lela
-ControlCashOpening=Control de caixa en obrir el Punt de Venda (POS)
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Tanca el recompte d'efectiu
 CashReport=Informe d'efectiu
 MainPrinterToUse=Impressora principal a utilitzar
@@ -110,10 +110,15 @@ BarRestaurant=Bar Restaurant
 AutoOrder=Comanda del propi client
 RestaurantMenu=Menú
 CustomerMenu=Menú de clients
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+ScanToMenu=Escaneja el codi QR per veure el menú
+ScanToOrder=Escaneja el codi QR per demanar
+Appearance=Aparença
+HideCategoryImages=Amaga les imatges de la categoria
+HideProductImages=Amaga les imatges del producte
+NumberOfLinesToShow=Nombre de línies d'imatges a mostrar
+DefineTablePlan=Definiu el pla de les taules
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Rebut de regal
+ModuleReceiptPrinterMustBeEnabled=La impressora de recepció del mòdul deu haver estat habilitada primer
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index d4ddc530767..25f37badd76 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -425,7 +425,7 @@ ListSuppliersShort=Llistat de proveïdors
 ListProspectsShort=Llistat de clients potencials
 ListCustomersShort=Llistat de clients
 ThirdPartiesArea=Àrea de tercers i contactes
-LastModifiedThirdParties=Latest %s modified Third Parties
+LastModifiedThirdParties=Últims %s tercers modificats
 UniqueThirdParties=Total de Tercers
 InActivity=Actiu
 ActivityCeased=Tancat
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 4b0f9440d26..a12ab3ac428 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Impost varis
 SocialContributions=Impostos varis
 SocialContributionsDeductibles=Impostos varis deduïbles
 SocialContributionsNondeductibles=Impostos varis no deduïbles
+DateOfSocialContribution=Data de l’impost social o fiscal
 LabelContrib=Etiqueta de aportació
 TypeContrib=Tipus d'aportació
 MenuSpecialExpenses=Pagaments especials
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index f0a12b9b39a..4d1ade9a707 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Serveis actius
 MenuExpiredServices=Serveis expirats
 MenuClosedServices=Serveis tancats
 NewContract=Nou contracte
-NewContractSubscription=Nou contracte/subscripció
+NewContractSubscription=Nou contracte o subscripció
 AddContract=Crear contracte
 DeleteAContract=Eliminar un contracte
 ActivateAllOnContract=Activar tots els serveis
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 07fabc3059c..5a2ffeb9abf 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Sintaxi incorrecta per al codi del proveïdor
 ErrorSupplierCodeRequired=Es requereix el codi del proveïdor
 ErrorSupplierCodeAlreadyUsed=Codi de proveïdor ja utilitzat
 ErrorBadParameters=Paràmetres incorrectes
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Falten paràmetres o són incorrectes
 ErrorBadValueForParameter=Valor incorrecte '%s' del paràmetre '%s'
 ErrorBadImageFormat=L'arxiu de la imatge no és un format suportat (El seu PHP no suporta les funciones de conversió d'aquest format d'imatge)
 ErrorBadDateFormat=El valor '%s' té un format de data no reconegut
@@ -120,7 +120,7 @@ ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
 ErrorBadValueForCode=Valor incorrecte per codi de seguretat. Torna a intentar-ho amb un nou valor...
 ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius
 ErrorFieldCantBeNegativeOnInvoice=El camp <strong> %s </strong> no pot ser negatiu en aquest tipus de factura. Si voleu afegir una línia de descompte, només cal que creeu el descompte en primer lloc (amb el camp "%s" de la fitxa del tercer) i després apliqueu-lo a la factura.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeForOneVATRate=El total de línies (net d’impostos) no pot ser negatiu per a un tipus d’IVA determinat no nul (s’ha trobat un total negatiu per a l’IVA <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=Les línies no poden ser negatives en un dipòsit. Si ho feu, podreu tenir problemes quan necessiteu consumir el dipòsit a la factura final
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantitat a les línies de factures a client no poden ser negatives
 ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web <b>%s</b> no disposa dels permisos per això
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=El Nou valor no pot ser igual al antic
 ErrorFailedToValidatePasswordReset=No s'ha pogut restablir la contrasenya. És possible que aquest enllaç ja s'hagi utilitzat (aquest enllaç només es pot utilitzar una vegada). Si no és el cas prova de reiniciar el procés de restabliment de contrasenya des del principi.
 ErrorToConnectToMysqlCheckInstance=Error de connexió amb la base de dades. Comprovi que el servidor de la base de dades està funcionant (per exemple, amb mysql/mariadb, pot iniciar-lo amb el comandament 'sudo service mysql start')
 ErrorFailedToAddContact=Error en l'addició del contacte
-ErrorDateMustBeBeforeToday=La data no pot ser més gran que avui
+ErrorDateMustBeBeforeToday=La data ha de ser inferior a la d’avui
+ErrorDateMustBeInFuture=La data ha de ser major que avui
 ErrorPaymentModeDefinedToWithoutSetup=S'ha establert la forma de pagament al tipus %s però a la configuració del mòdul de factures no s'ha indicat la informació per mostrar aquesta forma de pagament.
 ErrorPHPNeedModule=Error, el seu PHP ha de tenir instal·lat el mòdul <b>%s</b> per utilitzar aquesta funcionalitat.
 ErrorOpenIDSetupNotComplete=Ha configurat Dolibarr per acceptar l'autentificació OpenID, però la URL del servei OpenID no es troba definida a la constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No hi ha quantitat suficien
 ErrorOnlyOneFieldForGroupByIsPossible=Només és possible un camp per a "GROUP BY" -agrupar per- (els altres són descartats)
 ErrorTooManyDifferentValueForSelectedGroupBy=S'han trobat massa valors diferents (més que <b> %s </b>) per al camp "<b> %s </b>", de manera que no es pot utilitzar com a 'GROUP BY' per gràfics. El camp 'GROUP BY' s'ha suprimit. Pot ser que vulgueu utilitzar-ho com a eix X?
 ErrorReplaceStringEmpty=Error, la cadena a on fer la substitució és buida
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
@@ -265,4 +269,4 @@ WarningNumberOfRecipientIsRestrictedInMassAction=Advertència: el nombre de dest
 WarningDateOfLineMustBeInExpenseReportRange=Advertència, la data de la línia no està dins del rang de l'informe de despeses
 WarningProjectClosed=El projecte està tancat. Heu de tornar a obrir primer.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algunes transaccions bancàries es van suprimir després que es generés el rebut que les conté. Per tant, el nombre de xecs i el total de rebuts poden diferir del nombre i el total a la llista.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Alerta, no s'ha pogut afegir l'entrada al fitxer a la taula d'índexs de base de dades ECM
diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
index 94f979c4114..ad4ee4e00b6 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -11,7 +11,7 @@ CloseEtablishment=Tanca l'establiment
 # Dictionary
 DictionaryPublicHolidays=HRM - Festius
 DictionaryDepartment=HRM - Llistat de departament
-DictionaryFunction=HRM - Job positions
+DictionaryFunction=HRM: llocs de treball
 # Module
 Employees=Empleats
 Employee=Empleat
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index e42c3dfa8ac..fe7dcfae281 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -218,6 +218,6 @@ ErrorFoundDuringMigration=S'han reportat error(s) durant el procés de migració
 YouTryInstallDisabledByDirLock=L'aplicació ha intentat actualitzar-se automàticament, però les pàgines d'instal·lació / actualització s'han desactivat per a la seguretat (el directori rep el nom amb el sufix .lock). <br>
 YouTryInstallDisabledByFileLock=L'aplicació s'ha intentat actualitzar automàticament, però les pàgines d'instal·lació / actualització s'han desactivat per a la seguretat (per l'existència d'un fitxer de bloqueig <strong> install.lock </strong> al directori de documents del dolibarr). <br>
 ClickHereToGoToApp=Fes clic aquí per anar a la teva aplicació
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+ClickOnLinkOrRemoveManualy=Si una actualització està en curs, espereu. Si no, feu clic al següent enllaç. Si sempre veieu aquesta mateixa pàgina, heu de suprimir / canviar el nom del fitxer install.lock del directori de documents.
 Loaded=Carregat
 FunctionTest=Prova de funció
diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang
index cc4178420f1..4cd7b0a8c33 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Etíop
 Language_ar_AR=Àrab
 Language_ar_EG=Àrab (Egipte)
 Language_ar_SA=Àrab
+Language_az_AZ=Azerbaidjan
 Language_bn_BD=Bengalí
+Language_bn_IN=Bengalí (Índia)
 Language_bg_BG=Búlgar
 Language_bs_BA=Bosni
 Language_ca_ES=Català
@@ -20,6 +23,7 @@ Language_en_GB=Anglès (Regne Unit)
 Language_en_IN=Anglès (Índia)
 Language_en_NZ=Anglès (Nova Zelanda)
 Language_en_SA=Anglès (Aràbia Saudita)
+Language_en_SG=Anglès (Singapur)
 Language_en_US=Anglès (Estats Units)
 Language_en_ZA=Anglès (Àfrica del Sud)
 Language_es_ES=Espanyol
@@ -29,6 +33,7 @@ Language_es_CL=Espanyol (Chile)
 Language_es_CO=Espanyol (Colòmbia)
 Language_es_DO=Espenyol (Republica Dominicana)
 Language_es_EC=Espanyol (Equador)
+Language_es_GT=Espanyol (Guatemala)
 Language_es_HN=Espanyol (Honduras)
 Language_es_MX=Espanyol (Mèxic)
 Language_es_PA=Espanyol (Panamà)
@@ -36,6 +41,7 @@ Language_es_PY=Espanyol (Paraguai)
 Language_es_PE=Espanyol (Perú)
 Language_es_PR=Espanyol (Puerto Rico)
 Language_es_UY=Espanyol (Uruguai)
+Language_es_GT=Espanyol (Guatemala)
 Language_es_VE=Espanyol (Veneçuela)
 Language_et_EE=Estonià
 Language_eu_ES=Basc
@@ -44,15 +50,22 @@ Language_fi_FI=Finès
 Language_fr_BE=Francès (Bèlgica)
 Language_fr_CA=Francès (Canadà)
 Language_fr_CH=Francès (Suïssa)
+Language_fr_CI=Francès (Costa d'Ivori)
+Language_fr_CM=Francès (Camerun)
 Language_fr_FR=Francès
+Language_fr_GA=Francès (Gabon)
 Language_fr_NC=Francès (Nova Caledònia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Gallec
 Language_he_IL=Hebreu
+Language_hi_IN=Hindi (Índia)
 Language_hr_HR=Croat
 Language_hu_HU=Hongarès
 Language_id_ID=Indonesia
 Language_is_IS=Islandès
 Language_it_IT=Italià
+Language_it_CH=Italià (Suïssa)
 Language_ja_JP=Japonès
 Language_ka_GE=Georgià
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Letó
 Language_mk_MK=Macedoni
 Language_mn_MN=Mongol
 Language_nb_NO=Noruec (Bokmal)
+Language_ne_NP=Nepalí
 Language_nl_BE=Neerlandès (Bèlgica)
 Language_nl_NL=Holandès
 Language_pl_PL=Polonès
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamita
 Language_zh_CN=Xinès
 Language_zh_TW=Xinès (Tradicional)
+Language_zh_HK=Xinès (Hong Kong)
 Language_bh_MY=Malai
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
index 6f71107fa0d..18f46dd529c 100644
--- a/htdocs/langs/ca_ES/loan.lang
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -23,9 +23,9 @@ AddLoan=Crea un préstec
 FinancialCommitment=Compromís financer
 InterestAmount=Interessos
 CapitalRemain=Capital restant
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Aquest termini ja està pagat
+CantUseScheduleWithLoanStartedToPaid = No es pot utilitzar el planificador per a un préstec amb el pagament iniciat
+CantModifyInterestIfScheduleIsUsed = No pots modificar l’interès si fas servir la programació
 # Admin
 ConfigLoan=Configuració del mòdul de préstecs
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable del capital per defecte
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index ad93c59173d..be984d41323 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Configuració del correu sortint (per al mòdul %s
 DefaultOutgoingEmailSetup=Configuració per defecte del correu electrònic sortint 
 Information=Informació
 ContactsWithThirdpartyFilter=Contactes amb filtre de tercers
+Unanswered=Unanswered
+Answered=Respost
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index bb4106af37c..f38f6109954 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=Preu unitari (IVA inclòs)
 Amount=Import
 AmountInvoice=Import factura
 AmountInvoiced=Import facturat
-AmountInvoicedHT=Import facturat (amb impostos)
-AmountInvoicedTTC=Import facturat (sense impostos)
+AmountInvoicedHT=Import facturat (sense impostos)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Import pagament
 AmountHTShort=Import (exclòs)
 AmountTTCShort=Import
@@ -485,6 +485,7 @@ Categories=Etiquetes
 Category=Etiqueta
 By=Per
 From=De
+FromDate=De
 FromLocation=De
 to=a
 To=a
@@ -687,6 +688,7 @@ Method=Mètode
 Receive=Recepció
 CompleteOrNoMoreReceptionExpected=Completat o no s'espera res més
 ExpectedValue=Valor esperat
+ExpectedQty=Quantitat esperada
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Mai rebut
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Socis
 MenuAgendaGoogle=Agenda Google
+MenuTaxesAndSpecialExpenses=Impostos | Despeses especials
 ThisLimitIsDefinedInSetup=Límit Dolibarr (Menú inici-configuració-seguretat): %s Kb, PHP limit: %s Kb
 NoFileFound=No hi ha documents guardats en aquesta carpeta
 CurrentUserLanguage=Idioma actual
@@ -725,7 +728,7 @@ Page=Pàgina
 Notes=Notes
 AddNewLine=Afegir nova línia
 AddFile=Afegir arxiu
-FreeZone=No hi ha un producte/servei predefinit
+FreeZone=Producte de text lliure
 FreeLineOfType=Element de text lliure, escriviu:
 CloneMainAttributes=Clonar l'objecte amb aquests atributs principals
 ReGeneratePDF=Tornar a generar PDF
@@ -843,7 +846,7 @@ Sincerely=Sincerament
 ConfirmDeleteObject=Esteu segur que voleu suprimir aquest objecte?
 DeleteLine=Elimina la línia
 ConfirmDeleteLine=Esteu segur de voler eliminar aquesta línia ?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Error: el fitxer no s'ha generat. Comproveu que la comanda "pdftk" estigui instal·lada en un directori inclòs a la variable d'entorn $ PATH (només linux / unix) o poseu-vos en contacte amb l'administrador del vostre sistema.
 NoPDFAvailableForDocGenAmongChecked=No hi havia PDF disponibles per a la generació de document entre els registre comprovats
 TooManyRecordForMassAction=S'ha seleccionat massa registres per a l'acció massiva. L'acció està restringida a una llista de %s registres.
 NoRecordSelected=No s'han seleccionat registres
@@ -942,6 +945,39 @@ ShortThursday=Dj
 ShortFriday=Dv
 ShortSaturday=Ds
 ShortSunday=Dg
+one=un
+two=dos
+three=tres
+four=quatre
+five=cinc
+six=sis
+seven=set
+eight=vuit
+nine=nou
+ten=deu
+eleven=onze
+twelve=dotze
+thirteen=setze
+fourteen=catorze
+fifteen=quinze
+sixteen=setze
+seventeen=disset
+eighteen=divuit
+nineteen=dinou
+twenty=vint
+thirty=trenta
+forty=quaranta
+fifty=cinquanta
+sixty=seixanta
+seventy=setanta
+eighty=vuitanta
+ninety=noranta
+hundred=cent
+thousand=mil
+million=milions
+billion=mil milions
+trillion=bilions
+quadrillion=quadril·ló
 SelectMailModel=Seleccioneu una plantilla de correu electrònic
 SetRef=Indica ref
 Select2ResultFoundUseArrows=Alguns resultats trobats. Fes servir les fletxes per seleccionar.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Canviar a mode d'edició per afegir traduccions
 NotUsedForThisCustomer=No s'utilitza per a aquest client
 AmountMustBePositive=L'import ha de ser positiu
 ByStatus=Per estat
+InformationMessage=Informació
+Used=Used
+ASAP=El més aviat possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 7bd9de33351..7f27a36f24c 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -81,7 +81,7 @@ DeleteType=Elimina
 VoteAllowed=Vot autoritzat
 Physical=Físic
 Moral=Moral
-MorPhy=Moral/Físic
+MorPhy=Caràcter
 Reenable=Reactivar
 ResiliateMember=Dona de baixa un soci
 ConfirmResiliateMember=Vols donar de baixa aquest soci?
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 0877d3aed5c..7c607a0e6d3 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -139,4 +139,4 @@ ForeignKey=Clau forània
 TypeOfFieldsHelp=Tipus de camps: <br> varchar(99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName: relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que afegim un botó + després del desplegable per crear el registre, 'filtre' pot ser 'status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)' per exemple)
 AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+TableNotEmptyDropCanceled=La taula no està buida. S'ha cancel·lat l'eliminació.
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index a143763ecb2..b37b577475c 100644
--- a/htdocs/langs/ca_ES/mrp.lang
+++ b/htdocs/langs/ca_ES/mrp.lang
@@ -1,17 +1,18 @@
 Mrp=Comandes de Fabricació
 MO=Comanda de fabricació
+MOs=Manufacturing orders
 MRPDescription=Mòdul per gestionar ordres de producció i fabricació (MO).
 MRPArea=Àrea MRP
 MrpSetupPage=Configuració del mòdul MRP
-MenuBOM=Factures de material
-LatestBOMModified=Últimes %s Factures de materials modificades
+MenuBOM=Llistes de material
+LatestBOMModified=Últimes %s llistes de materials modificades
 LatestMOModified=Últimes %s Ordres de Fabricació modificades
 Bom=Llista de materials
-BillOfMaterials=Llista de materials
+BillOfMaterials=Llista de material
 BOMsSetup=Configuració del mòdul BOM
 ListOfBOMs=Llista de factures de material - BOM
 ListOfManufacturingOrders=Llista de comandes de fabricació
-NewBOM=Nova factura de material
+NewBOM=Nova llista de material
 ProductBOMHelp=Producte a crear amb aquest BOM. <br> Nota: els productes amb la propietat &quot;Natura del producte&quot; = &quot;Matèria primera&quot; no són visibles a aquesta llista.
 BOMsNumberingModules=Plantilles de numeració BOM
 BOMsModelModule=Plantilles de document BOM
@@ -27,9 +28,9 @@ ManufacturingEfficiency=Eficiència en la fabricació
 ConsumptionEfficiency=Eficiència del consum
 ValueOfMeansLoss=El valor de 0,95 significa una mitjana de 5%% de pèrdues durant la producció
 ValueOfMeansLossForProductProduced=Un valor de 0,95 significa una mitjana de 5%% de pèrdues de producte produït
-DeleteBillOfMaterials=Suprimeix la factura de materials
+DeleteBillOfMaterials=Suprimeix la llista de materials
 DeleteMo=Eliminar Ordre de Fabricació
-ConfirmDeleteBillOfMaterials=Esteu segur que voleu suprimir aquesta factura de material?
+ConfirmDeleteBillOfMaterials=Estàs segur que vols suprimir aquesta llista de material?
 ConfirmDeleteMo=Esteu segur que voleu suprimir aquesta factura de material?
 MenuMRP=Comandes de Fabricació
 NewMO=Nova comanda de fabricació
@@ -38,7 +39,7 @@ DateStartPlannedMo=Data d’inici prevista
 DateEndPlannedMo=Data prevista de finalització
 KeepEmptyForAsap=Buit significa &quot;el més aviat possible&quot;
 EstimatedDuration=Durada estimada
-EstimatedDurationDesc=Durada estimada per fabricar aquest producte mitjançant aquesta BOM (llista de material)
+EstimatedDurationDesc=Durada estimada per fabricar aquest producte mitjançant aquesta llista de material
 ConfirmValidateBom=Segur que voleu validar la llista de material amb la referència <strong>%s</strong> (podreu utilitzar-lo per crear noves Ordres de Fabricació)
 ConfirmCloseBom=Esteu segur que voleu cancel·lar aquesta llista de materials (ja no la podreu utilitzar per crear noves Ordres de Fabricació)?
 ConfirmReopenBom=Segur que voleu tornar a obrir aquesta llista de material (podreu utilitzar-lo per crear noves Ordres de Fabricació)
@@ -48,12 +49,12 @@ QuantityFrozen=Quantitat congelada
 QuantityConsumedInvariable=Quan és actiu aquest indicador, la quantitat consumida sempre és el valor definit i no té relació a la quantitat produïda.
 DisableStockChange=Canvi d'estoc desactivat
 DisableStockChangeHelp=Quan és actiu aquest indicador, no hi ha cap canvi d’estoc en aquest producte, sigui quina sigui la quantitat consumida
-BomAndBomLines=Factures de material i línies
+BomAndBomLines=Llistes de material i línies
 BOMLine=Línia BOM
 WarehouseForProduction=Magatzem per a la producció
 CreateMO=Crear OF
 ToConsume=Consumir
-ToProduce=Poduïr
+ToProduce=Produïr
 QtyAlreadyConsumed=Qnt. ja consumida
 QtyAlreadyProduced=Qnt. ja produïda
 QtyRequiredIfNoLoss=Quantitat necessària sense pèrdues (Eficiència de fabricació del 100%%)
@@ -74,4 +75,4 @@ ProductsToConsume=Productes a consumir
 ProductsToProduce=Productes a produir
 UnitCost=Cost unitari
 TotalCost=Cost total
-BOMTotalCost=El cost de produir aquesta BOM (Llista de materials) en funció del cost de cada quantitat i producte a consumir (utilitza el preu de cost si està definit, altrament el preu mitjà ponderat si està definit, altrament el millor preu de compra)
+BOMTotalCost=El cost de produir aquesta Llista de materials en funció del cost de cada quantitat i producte a consumir (utilitza el preu de cost si està definit, altrament el preu mitjà ponderat si està definit, altrament el millor preu de compra)
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index fc3f4c9c3da..ac055c9738c 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -85,8 +85,8 @@ MaxSize=Tamany màxim
 AttachANewFile=Adjuntar nou arxiu/document
 LinkedObject=Objecte adjuntat
 NbOfActiveNotifications=Nombre de notificacions (número de correus electrònics del destinatari)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailTest=__(Hola)__\nAquest és un missatge de prova enviat a __EMAIL__.\nLes línies estan separades per una tornada de carro.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__ (Hola) __ <br> Aquesta és una prova <b> </b> enviada a __EMAIL__ (la paraula test ha de ser en negreta). <br> Les línies estan separades per una tornada de carro. <br> <br> __USER_SIGNATURE__
 PredefinedMailContentContract=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hola)__\n\nTrobeu la factura __REF__ adjunta\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (Atentament) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hola)__\n\nUs recordem que la factura __REF__ sembla que no s'ha pagat. S'adjunta una còpia de la factura com a recordatori.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__ (Atentament) __\n\n__USER_SIGNATURE__
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hola)__\n\nTrobeu la nostra comanda __
 PredefinedMailContentSendSupplierInvoice=__(Hola)__\n\nTrobeu la factura __REF__ adjunta\n\n\n__ (Atentament) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hola)__\n\nTrobeu l'enviament __REF__ adjuntat\n\n\n__ (Atentament) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hola)__\n\nTrobeu la intervenció __REF__ adjunta\n\n\n__ (Atentament) __\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Podeu fer clic a l'enllaç següent per fer el pagament si encara no està fet.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr és un ERP/CRM per a la gestió de negocis (professionals o associacions), compost de mòduls funcionals independents i opcionals. Una demostració que incloga tots aquests mòduls no té sentit perquè no utilitzarà tots els mòduls al mateix temps. Per això, hi han disponibles diferents tipus de perfils de demostració.
 ChooseYourDemoProfil=Selecciona el perfil de demo que cobreixi millor les teves necessitats...
 ChooseYourDemoProfilMore=o construeix el teu perfil<br>(selecció de mòduls manual)
@@ -280,7 +278,9 @@ LinesToImport=Línies per importar
 
 MemoryUsage=Ús de memòria
 RequestDuration=Durada de la sol·licitud
+ProductsPerPopularity=Productes / Serveis per popularitat
 PopuProp=Productes / Serveis per popularitat als pressupostos
 PopuCom=Productes / Serveis per popularitat a les comandes
 ProductStatistics=Productes / Serveis Estadístiques
 NbOfQtyInOrders=Quantitat en comandes
+SelectTheTypeOfObjectToAnalyze=Seleccioneu el tipus d'objecte a analitzar ...
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 3e887f35f7c..b588c475cf3 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Serveis només en venda
 ServicesOnPurchaseOnly=Serveis només per compra
 ServicesNotOnSell=Serveis no a la venda i no per a la compra
 ServicesOnSellAndOnBuy=Serveis en venda o de compra
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Els %s últims productes/serveis modificats
 LastRecordedProducts=Últims %s productes registrats
 LastRecordedServices=Últims %s serveis registrats
 CardProduct0=Producte
@@ -104,9 +104,10 @@ SetDefaultBarcodeType=Indica el tipus de codi de barres
 BarcodeValue=Valor del codi de barres
 NoteNotVisibleOnBill=Nota (no visible en les factures, pressupostos, etc.)
 ServiceLimitedDuration=Si el servei és de durada limitada:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Segments de preus múltiples per producte / servei (cada client està en un segment de preus)
 MultiPricesNumPrices=Nº de preus
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
+DefaultPriceType=Base de preus per defecte (contra impostos) en afegir preus de venda nous
 AssociatedProductsAbility=Activa els productes virtuals (kits)
 AssociatedProducts=Productes virtuals
 AssociatedProductsNumber=Nº de productes que composen aquest producte
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Preus del venedor (de productes o serveis)
 CustomCode=Duana / mercaderia / codi HS
 CountryOrigin=País d'origen
 Nature=Naturalesa del producte (material/acabat)
+NatureOfProductShort=Naturalesa del producte
+NatureOfProductDesc=Matèria primera o producte acabat
 ShortLabel=Etiqueta curta
 Unit=Unitat
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Selecciona la combinació
 ProductCombinationGenerator=Generador de variants
 Features=Funcionalitats
 PriceImpact=Impacte en el preu
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Impacte en el pes
 NewProductAttribute=Nou atribut
 NewProductAttributeValue=Nou valor de l'atribut
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index fec5786b759..b1ca69ba454 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Participant
 TypeContact_project_task_external_TASKCONTRIBUTOR=Participant
 SelectElement=Seleccioni element
 AddElement=Vincular a element
+LinkToElementShort=Enllaça a
 # Documents models
 DocumentModelBeluga=Plantilla de document del projecte per a la descripció general dels objectes vinculats
 DocumentModelBaleine=Plantilla de document del projecte per a tasques
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Nombre de projectes creats per mes
 ProjectNbTaskByMonth=Nº de tasques creades per mes
 ProjectOppAmountOfProjectsByMonth=Quantitat de clients potencials per mes
 ProjectWeightedOppAmountOfProjectsByMonth=Quantitat ponderada de clients potencials per mes
-ProjectOpenedProjectByOppStatus=Projectes oberts per estats d'oportunitat
-ProjectsStatistics=Estadístiques en projectes/leads
-TasksStatistics=Estadístiques de tasques de projecte/lideratge
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Tasca assignada. És possible entrar els temps en aquesta tasca.
 IdTaskTime=Id de temps de tasca
 YouCanCompleteRef=Si voleu completar la referència amb algun sufix, es recomana afegir un caràcter per separar-lo, de manera que la numeració automàtica encara funcionarà correctament per als propers projectes. Per exemple %s-MYSUFFIX
diff --git a/htdocs/langs/ca_ES/receptions.lang b/htdocs/langs/ca_ES/receptions.lang
index 447ce65cffc..ec31d8c4e8e 100644
--- a/htdocs/langs/ca_ES/receptions.lang
+++ b/htdocs/langs/ca_ES/receptions.lang
@@ -43,5 +43,5 @@ ProductQtyInSuppliersReceptionAlreadyRecevied=Quantitat de producte des de coman
 ValidateOrderFirstBeforeReception=Primer has de validar la comanda abans de poder fer recepcions.
 ReceptionsNumberingModules=Mòdul de numeració per a recepcions
 ReceptionsReceiptModel=Plantilles de documents per a recepcions
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
+NoMorePredefinedProductToDispatch=No hi ha més productes predefinits per ser enviats
 
diff --git a/htdocs/langs/ca_ES/recruitment.lang b/htdocs/langs/ca_ES/recruitment.lang
new file mode 100644
index 00000000000..47d4fb8d555
--- /dev/null
+++ b/htdocs/langs/ca_ES/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Contractació
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Gestiona i segueix les campanyes de contractació de nous llocs de treball
+
+#
+# Admin page
+#
+RecruitmentSetup = Configuració de la contractació
+Settings = Configuració
+RecruitmentSetupPage = Introduïu aquí la configuració de les opcions principals del mòdul de contractació
+RecruitmentArea=Àrea de contractació
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Sobre
+RecruitmentAbout = Quant a la contractació
+RecruitmentAboutPage = Pàgina quant a la contractació
+NbOfEmployeesExpected=Nº previst d'empleats
+JobLabel=Descripció del lloc de treball
+WorkPlace=Lloc de treball
+DateExpected=Data prevista
+FutureManager=Futur gerent
+ResponsibleOfRecruitement=Responsable de la contractació
+IfJobIsLocatedAtAPartner=Si la feina es troba en l'espai del client
+PositionToBeFilled=Oferta de feina a emplenar
+PositionsToBeFilled=S'han d'omplir les ofertes de treball
+ListOfPositionsToBeFilled=Llista d’ofertes de treball a complir
+NewPositionToBeFilled=S'han d'omplir les noves ofertes de treball
+
+JobOfferToBeFilled=Oferta de feina a emplenar
+ThisIsInformationOnJobPosition=Informació del lloc de treball a ocupar
+ContactForRecruitment=Contacte per contractació
+EmailRecruiter=El reclutador de correu electrònic
+ToUseAGenericEmail=Per utilitzar un correu electrònic genèric. Si no està definit, s’utilitzarà el correu electrònic del responsable de la contractació
+NewCandidature=New candidature
+ListOfCandidatures=List of candidatures
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index ee0225cf434..080bbfd1d2c 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Cancel·la l'enviament
 DeleteSending=Elimina l'enviament
 Stock=Estoc
 Stocks=Estocs
-MissingStocks=Missing stocks
-StockAtDate=Stock at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Estoc que falta
+StockAtDate=Existències en data
+StockAtDateInPast=Data passada
+StockAtDateInFuture=Data en el futur
 StocksByLotSerial=Estocs per lot/sèrie
 LotSerial=Lots/Sèries
 LotSerialList=Llista de lots/sèries
@@ -34,7 +34,7 @@ StockMovementForId=ID de moviment %d
 ListMouvementStockProject=Llista de moviments d'estoc associats al projecte
 StocksArea=Àrea de magatzems
 AllWarehouses=Tots els magatzems
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Incloure també estoc desitjat indefinit
 IncludeAlsoDraftOrders=Inclou també projectes d'ordre
 Location=Lloc
 LocationSummary=Nom curt del lloc
@@ -65,8 +65,8 @@ RuleForWarehouse=Regles per als magatzems
 WarehouseAskWarehouseDuringOrder=Estableix un magatzem per a les comandes de venda
 UserDefaultWarehouse=Estableix un magatzem per Usuaris
 MainDefaultWarehouse=Magatzem predeterminat
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
+MainDefaultWarehouseUser=Utilitzeu un magatzem per defecte per a cada usuari
+MainDefaultWarehouseUserDesc=Si activeu aquesta opció, durant la creació d’un producte, es definirà el magatzem assignat al producte en aquest. Si no es defineix cap magatzem per a l'usuari, es defineix el magatzem per defecte.
 IndependantSubProductStock=L'estoc de productes i subproductes són independents
 QtyDispatched=Quantitat desglossada
 QtyDispatchedShort=Quant. rebuda
@@ -95,14 +95,16 @@ RealStock=Estoc real
 RealStockDesc=L'estoc físic o real és l'estoc que tens actualment als teus magatzems/emplaçaments interns.
 RealStockWillAutomaticallyWhen=L'estoc real es modificarà d'acord amb aquesta regla (tal com es defineix al mòdul d'accions):
 VirtualStock=Estoc virtual
-VirtualStockDesc=L'existència virtual és l'estoc calculat disponible quan es tanquen totes les accions obertes / pendents (que afecten les accions) que es reben (les ordres de compra rebudes, les comandes de venda enviades, etc.)
+VirtualStockAtDate=Estoc virtual a la data
+VirtualStockAtDateDesc=Estoc virtual un cop totes les comandes pendents que es preveu fer abans de la data finalitzin
+VirtualStockDesc=L’acció virtual és l’estoc calculat disponible disponible un cop tancades totes les accions obertes / pendents (que afectin a les existències) (comandes de compra rebudes, comandes de venda enviades, comandes de fabricació produïdes, etc.)
 IdWarehouse=Id. magatzem
 DescWareHouse=Descripció magatzem
 LieuWareHouse=Localització magatzem
 WarehousesAndProducts=Magatzems i productes
 WarehousesAndProductsBatchDetail=Magatzems i productes (amb detalls per lot/serie)
-AverageUnitPricePMPShort=Preu mitjà ponderat (PMP)
-AverageUnitPricePMP=Preu mitjà ponderat (PMP) d'aquisició
+AverageUnitPricePMPShort=Valor (PMP)
+AverageUnitPricePMPDesc=El preu unitari mitjà d’entrada que hem de pagar als proveïdors per incorporar el producte a les nostres existències.
 SellPriceMin=Preu de venda unitari
 EstimatedStockValueSellShort=Valor per vendre
 EstimatedStockValueSell=Valor per vendre
@@ -130,18 +132,18 @@ CurentlyUsingPhysicalStock=Estoc físic
 RuleForStockReplenishment=Regla pels reaprovisionaments d'estoc
 SelectProductWithNotNullQty=Seleccioneu com a mínim un producte amb un valor no nul i un proveïdor
 AlertOnly= Només alertes
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Incloure també estocs negatius per als productes sense la quantitat desitjada definida, per restaurar-los a 0
 WarehouseForStockDecrease=Per la disminució d'estoc s'utilitzara el magatzem <b>%s</b>
 WarehouseForStockIncrease=Pe l'increment d'estoc s'utilitzara el magatzem <b>%s</b>
 ForThisWarehouse=Per aquest magatzem
 ReplenishmentStatusDesc=Es tracta d'una llista de tots els productes amb una borsa menor que l'estoc desitjat (o inferior al valor d'alerta si la casella de verificació "només alerta" està marcada). Amb la casella de verificació, podeu crear comandes de compra per omplir la diferència.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
+ReplenishmentStatusDescPerWarehouse=Si voleu una reposició basada en la quantitat desitjada definida per magatzem, heu d’afegir un filtre al magatzem.
 ReplenishmentOrdersDesc=Aquesta és una llista de totes les comandes de compra oberta incloent productes predefinits. Només s'obren ordres amb productes predefinits, de manera que les comandes que poden afectar les existències, són visibles aquí.
 Replenishments=reaprovisionament
 NbOfProductBeforePeriod=Quantitat del producte %s en estoc abans del periode seleccionat (< %s)
 NbOfProductAfterPeriod=Quantitat del producte %s en estoc despres del periode seleccionat (> %s)
 MassMovement=Moviments en massa
-SelectProductInAndOutWareHouse=Seleccioni un producte, una quantitat, un magatzem origen i un magatzem destí, seguidament faci clic "%s". Una vegada seleccionats tots els moviments, faci clic en "%s".
+SelectProductInAndOutWareHouse=Seleccioneu un magatzem d'origen i un magatzem destí, un producte i una quantitat i feu clic a "%s". Un cop fet això per a tots els moviments necessaris, feu clic a "%s".
 RecordMovement=Registre de transferència
 ReceivingForSameOrder=Recepcions d'aquesta comanda
 StockMovementRecorded=Moviments d'estoc registrat
@@ -232,6 +234,9 @@ InventoryForASpecificProduct=Inventari d’un producte específic
 StockIsRequiredToChooseWhichLotToUse=Es requereix estoc per escollir el lot que cal fer servir
 ForceTo=Obligar a
 AlwaysShowFullArbo=Mostra l'arbre complet de magatzems a la finestra emergent dels enllaços de magatzem (Advertència: pot disminuir el rendiment de manera espectacular)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
+StockAtDatePastDesc=Podeu veure aquí el valor (accions reals) en una data determinada en el passat
+StockAtDateFutureDesc=Podeu veure aquí l'estoc (accions virtuals) en una data determinada en endavant
+CurrentStock=Estoc actual
+InventoryRealQtyHelp=Estableix el valor a 0 per restablir qty <br> Mantenir el camp buit o suprimir la línia per mantenir-la sense canvis
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index 65f34605229..2c6d50ed7a0 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Baixa qualitat
 ReputationForThisProduct=Reputació
 BuyerName=Nom del comprador
 AllProductServicePrices=Tots els preus de producte / servei
-AllProductReferencesOfSupplier=Totes les referències de producte / servei del proveïdor
+AllProductReferencesOfSupplier=Totes les referències del proveïdor
 BuyingPriceNumShort=Preus del proveïdor
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 9b9d2cb3e16..712924a9dbd 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Esborrat
 
 # Dict
 Type=Tipus
-Category=Codi analític
 Severity=Gravetat
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Assigna automàticament l'usuari que va crear el tiquet
 TicketsAutoAssignTicketHelp=Quan es crea un tiquet, l'usuari pot assignar-se automàticament al tiquet.
 TicketNumberingModules=Mòdul de numeració de tiquets
 TicketNotifyTiersAtCreation=Notifica la creació de tercers
-TicketGroup=Grup
 TicketsDisableCustomerEmail=Desactiveu sempre els correus electrònics quan es crea un tiquet des de la interfície pública
 TicketsPublicNotificationNewMessage=Enviar correu(s) electonic(s) quan s'afegeix un nou missatge
 TicketsPublicNotificationNewMessageHelp=Enviar correu(s) electrònic(s) quan un nou missatge s'afegeix des d'una interfície pública (cap a l'usuari assignat o la notificació del correu electrònic cap a (actualitzar) i/o les notificacions del correu electrònic cap a)
@@ -162,7 +160,7 @@ CreatedBy=Creat per
 NewTicket=Nou tiquet
 SubjectAnswerToTicket=Resposta de tiquet
 TicketTypeRequest=Tipus de sol·licitud
-TicketCategory=Codi analític
+TicketCategory=Grup
 SeeTicket=Consultar tiquet
 TicketMarkedAsRead=Tiquet ha estat marcat com llegit
 TicketReadOn=Segueix llegint
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 06cd3247a05..bc3479618ed 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Deshabilitat en mode manteniment
 UserAccountancyCode=Codi comptable de l'usuari
 UserLogoff=Usuari desconnectat
 UserLogged=Usuari connectat
+DateOfEmployment=Data de treball
 DateEmployment=Data d'inici de l'ocupació
 DateEmploymentEnd=Data de finalització de l'ocupació
 CantDisableYourself=No podeu desactivar el vostre propi registre d'usuari
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Forçar validador de sol·licitud d'abandonament
 ValidatorIsSupervisorByDefault=Per defecte, el validador és el supervisor de l’usuari. Deixar buit per mantenir aquest comportament.
 UserPersonalEmail=Correu electrònic personal
 UserPersonalMobile=Telèfon mòbil personal
+WarningNotLangOfInterface=Avís, aquest és l'idioma principal que parla l'usuari, no el llenguatge de la interfície que va triar per veure. Per canviar l’idioma de la interfície visible per aquest usuari, aneu a la pestanya %s
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index f2048c17676..5b5dac6c952 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -58,10 +58,10 @@ NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
 SyntaxHelp=Ajuda sobre consells de sintaxi específics
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Podeu incloure el codi PHP en aquesta font mitjançant les etiquetes <strong> &lt;? php? &gt; a0a65d071f6fc9z Estan disponibles les variables globals següents: $ conf, $ db, $ mysoc, $ user, $ lloc web, $ pàgina web, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> També podeu incloure contingut d'una altra pàgina / contenidor amb la següent sintaxi: <br> <strong> a03900dfdf ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Vostè pot fer una redirecció a una altra pàgina / Contenidor amb la següent sintaxi (Nota: no emeten cap contingut abans d'una redirecció) :? <br> <strong> &lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> Per afegir un vincle a una altra pàgina, utilitzeu la sintaxi: <br> <strong> &lt;a href = "alias_of_page_to_link_to.php" &gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span> Per incloure un enllaç per a descàrrega <strong> </strong> un arxiu emmagatzemat en els documents <strong> un directori </strong>, utilitzeu el document <strong> document.php </strong> embolcall: <br> Exemple, per a un fitxer a documents / ecm (cal registrar-se)? ] nom de fitxer.ext "&gt; </strong> <br> Per a un fitxer a documents / suports (directori obert per a accés públic), la sintaxi és: <br> <strong> a03900dfre31ecz "/document.php?modulepart=medias&file=[relative_dir/ Alanfilename.ext"&gt; </strong> <br> Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la tecla hash compartida del fitxer), una sintaxis es0a0z0z0a009 /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> per incloure un </strong> imatge <strong> emmagatzemat en els documents <strong> </strong> directori, utilitzeu el <strong> viewimage.php </strong> embolcall: <br> exemple, per a una imatge en documents / arxius multimèdia (obert directori d’accés públic), la sintaxi és: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir /] filename.ext" a0129
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=Per a una imatge compartida amb un enllaç compartit (accés obert mitjançant la tecla hash compartida del fitxer), la sintaxi és: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7dcbe087987
+YouCanEditHtmlSourceMore= <br> Més exemples de codi HTML o dinàmic disponibles a <a href="%s" target="_blank"> la documentació wiki </a> <br>.
 ClonePage=Clona la pàgina/contenidor
 CloneSite=Clona el lloc
 SiteAdded=S'ha afegit el lloc web
@@ -124,7 +124,7 @@ ShowSubContainersOnOff=El mode per executar &quot;contingut dinàmic&quot; és %
 GlobalCSSorJS=Fitxer CSS / JS / Capçalera global del lloc web
 BackToHomePage=Torna a la pàgina principal...
 TranslationLinks=Enllaços de traducció
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
+YouTryToAccessToAFileThatIsNotAWebsitePage=Intenteu accedir a una pàgina que no està disponible. <br> (ref = %s, type = %s, status = %s)
 UseTextBetween5And70Chars=Per seguir bones pràctiques de SEO, utilitzeu un text entre 5 i 70 caràcters
 MainLanguage=Idioma principal
 OtherLanguages=Altres idiomes
@@ -134,4 +134,4 @@ AvailableLanguagesAreDefinedIntoWebsiteProperties=Els idiomes disponibles es def
 ReplacementDoneInXPages=Substitució realitzada  %s pàgines o contenidors
 RSSFeed=Fils RSS
 RSSFeedDesc=Podeu obtenir un feed RSS dels darrers articles amb el tipus "blogpost" mitjançant aquesta URL
-PagesRegenerated=%s page(s)/container(s) regenerated
+PagesRegenerated=%s pàgina (es) / contenidor (s) regenerada
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 5ac7a352381..76f4b8e84ae 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -1,46 +1,46 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Ordres de pagament mitjançant domiciliació bancària
-StandingOrderPayment=Ordre de pagament de domiciliació
+CustomersStandingOrdersArea=Pagaments per ordres de domiciliació bancària
+SuppliersStandingOrdersArea=Pagaments per transferència bancària
+StandingOrdersPayment=Ordres de cobrament per domiciliació
+StandingOrderPayment=Ordre de cobrament per domiciliació
 NewStandingOrder=Nova ordre de domiciliació bancària
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=Nou pagament mitjançant transferència bancària
 StandingOrderToProcess=A processar
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Ordres de transferència bancària
+PaymentByBankTransferLines=Línies d'ordres de transferència bancària
 WithdrawalsReceipts=Domiciliacions
 WithdrawalReceipt=Domiciliació
-BankTransferReceipts=Credit transfer order
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
+BankTransferReceipts=Ordres de transferència bancària
+BankTransferReceipt=Ordre de transferència bancària
+LatestBankTransferReceipts=Les %s últimes ordres de transferència bancària
 LastWithdrawalReceipts=Últims %s fitxers per a la domiciliació bancària
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
-WithdrawalsLines=Línies de ordres de domiciliació bancària
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+WithdrawalsLine=Línia d'ordre de domiciliació
+CreditTransferLine=Línia de transferència bancària
+WithdrawalsLines=Línies d'ordre de domiciliació
+CreditTransferLines=Línies de transferència bancària
+RequestStandingOrderToTreat=Peticions per a processar ordres de pagament per domiciliació
+RequestStandingOrderTreated=Peticions processades d'ordres de pagament per domiciliació
+RequestPaymentsByBankTransferToTreat=Peticions de transferència bancària a processar
+RequestPaymentsByBankTransferTreated=Peticions de transferència bancària processades
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Encara no és possible. L'estat de la domiciliació ter que ser 'abonada' abans de poder realitzar devolucions a les seves línies
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdraw=Nº de factures de client qualificades que esperen una ordre de domiciliació
 NbOfInvoiceToWithdrawWithInfo=Número de factures a client en espera de domiciliació per a clients que tenen el número de compte definida
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+NbOfInvoiceToPayByBankTransfer=Nº de factures de proveïdors qualificats que esperen un pagament per transferència bancària
+SupplierInvoiceWaitingWithdraw=Factura de venedor en espera de pagament mitjançant transferència bancària
 InvoiceWaitingWithdraw=Factura esperant per domiciliació bancària
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Factura en espera de transferència bancària
 AmountToWithdraw=Import a domiciliar
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=No hi ha cap factura oberta per a '%s'. Vés a la fitxa "%s" de la targeta de factura per sol·licitar una sol·licitud.
 NoSupplierInvoiceToWithdraw=No hi ha cap factura de proveïdor pendent amb "sol·licituds de crèdit directe" obertes. Aneu a la pestanya "%s" de la fitxa de la factura per fer una sol·licitud.
 ResponsibleUser=Usuari responsable
 WithdrawalsSetup=Configuració del pagament mitjançant domiciliació bancària
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Configuració de transferència bancària
 WithdrawStatistics=Estadístiques del pagament mitjançant domiciliació bancària
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Estadístiques de transferència bancària
 Rejects=Devolucions
 LastWithdrawalReceipt=Últims %s rebuts domiciliats
 MakeWithdrawRequest=Fer una petició de pagament per domiciliació bancària
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Fes una petició de transferència bancària
 WithdrawRequestsDone=%s domiciliacions registrades
 ThirdPartyBankCode=Codi bancari de tercers
 NoInvoiceCouldBeWithdrawed=Cap factura s'ha carregat amb èxit. Comproveu que els tercers de les factures tenen un IBAN vàlid i que IBAN té un RUM (Referència de mandat exclusiva) amb mode <strong>%s</strong>.
@@ -53,7 +53,7 @@ Lines=línies
 StandingOrderReject=Emetre una devolució
 WithdrawsRefused=Domiciliació bancària refusada
 WithdrawalRefused=Devolució de domiciliació
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Transferències bancàries rebutjades
 WithdrawalRefusedConfirm=¿Està segur de voler crear una devolució de domiciliació per a l'empresa
 RefusedData=Data de devolució
 RefusedReason=Motiu de devolució
@@ -63,12 +63,14 @@ InvoiceRefused=Factura rebutjada (Carregar les despeses al client)
 StatusDebitCredit=Estat dèbit/crèdit
 StatusWaiting=En espera
 StatusTrans=Enviada
+StatusDebited=Debitat
 StatusCredited=Abonada
+StatusPaid=Tractada
 StatusRefused=Tornada
 StatusMotif0=No especificat
 StatusMotif1=Provisió insuficient
 StatusMotif2=Ordre del client
-StatusMotif3=No pagament per domiciliació bancària
+StatusMotif3=No hi ha cobrament per domiciliació
 StatusMotif4=Comanda de vendes
 StatusMotif5=Compte inexistent
 StatusMotif6=Compte sense saldo
@@ -77,27 +79,28 @@ StatusMotif8=Altre motiu
 CreateForSepaFRST=Crear un fitxer de domiciliació bancària (SEPA FRST)
 CreateForSepaRCUR=Crea un fitxer de domiciliació bancària (SEPA RCUR)
 CreateAll=Crear un fitxer de domiciliació bancària (tot)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Crea un fitxer per a transferència de crèdit
+CreateSepaFileForPaymentByBankTransfer=Crea un fitxer de transferència bancària (SEPA)
 CreateGuichet=Només oficina
 CreateBanque=Només banc
 OrderWaiting=A l'espera de procés
-NotifyTransmision=Enviament de domiciliació
-NotifyCredit=Abonament de domiciliació
+NotifyTransmision=Registre la transmissió del fitxer de la comanda
+NotifyCredit=Registre de crèdit de la comanda
 NumeroNationalEmetter=Número Nacional del Emissor
 WithBankUsingRIB=Per als comptes bancaris que utilitzen CCC
 WithBankUsingBANBIC=Per als comptes bancaris que utilitzen el codi BAN/BIC/SWIFT
 BankToReceiveWithdraw=Recepció del compte bancari
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToPayCreditTransfer=Compte bancari utilitzat com a font de pagaments
 CreditDate=Abonada el
 WithdrawalFileNotCapable=No és possible generar el fitxer bancari de domiciliació pel país %s (El país no esta suportat)
-ShowWithdraw=Mostra la comanda de domiciliació directa
+ShowWithdraw=Mostra l'ordre de domiciliació
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tanmateix, si la factura té com a mínim una ordre de pagament de domiciliació bancària que encara no ha estat processada, no es definirà com a pagament per permetre la gestió prèvia de la retirada.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Arxiu de la domiciliació
+DoStandingOrdersBeforePayments=Aquesta pestanya et permet sol·licitar una ordre de domiciliació. Un cop fet, ves al menú Banc->Cobrament per domiciliació per generar i gestionar l’ordre de domiciliació. Quan es tanqui l’ordre de domiciliació, es registrarà automàticament el cobrament de les factures i es tancaran les factures si no queda cobrament pendent.
+DoCreditTransferBeforePayments=Aquesta pestanya et permet sol·licitar una ordre de transferència bancària. Un cop fet, ves al menú Banc->Pagament per transferència bancària per generar i gestionar l’ordre de transferència bancària. Quan es tanqui l’ordre de transferència bancària, es registrarà automàticament el pagament de les factures i es tancaran les factures si no queda pagament pendent.
+WithdrawalFile=Fitxer de comanda de dèbit
+CreditTransferFile=Fitxer de transferència de crèdit
 SetToStatusSent=Classificar com "Arxiu enviat"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=També registrarà els pagaments en les factures i els classificarà com a "Pagats" si resten a pagar és nul
 StatisticsByLineStatus=Estadístiques per estats de línies
 RUM=UMR
 DateRUM=Data de signatura del mandat
@@ -105,7 +108,7 @@ RUMLong=Referència de mandat única (UMR)
 RUMWillBeGenerated=Si està buit, es generarà una UMR (Referència de mandat únic) una vegada que es guardi la informació del compte bancari.
 WithdrawMode=Modo de domiciliació bancària (FRST o RECUR)
 WithdrawRequestAmount=Import de la domiciliació
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Import de la petició de transferència bancària:
 WithdrawRequestErrorNilAmount=No és possible crear una domiciliació sense import
 SepaMandate=Mandat de domiciliació bancària SEPA 
 SepaMandateShort=Mandat SEPA
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Tipus de pagament
 ModeRECUR=Pagament recurrent
 ModeFRST=Pagament únic
 PleaseCheckOne=Si us plau marqui només una
+CreditTransferOrderCreated=S'ha creat una ordre de transferència de crèdit %s
 DirectDebitOrderCreated=S'ha creat l'ordre de domiciliació bancària %s
 AmountRequested=Quantitat sol·licitada
 SEPARCUR=SEPA CUR
@@ -133,7 +137,7 @@ USTRD=Etiqueta XML de la SEPA "no estructurada"
 ADDDAYS=Afegiu dies a la data d'execució
 NoDefaultIBANFound=No s'ha trobat IBAN per defecte per a aquest tercer
 ### Notifications
-InfoCreditSubject=Pagament de rebuts domiciliats %s pel banc
+InfoCreditSubject=Cobrament de l'ordre de domiciliació %s pel banc
 InfoCreditMessage=El rebut domiciliat %s ha estat pagat pel banc<br>Data de pagament: %s
 InfoTransSubject=Transmissió de rebuts domiciliats %s al banc
 InfoTransMessage=El rebut domiciliat %s ha estat enviat al banc per %s %s.<br><br>
@@ -141,3 +145,4 @@ InfoTransData=Import: %s<br>Mètode: %s<br>Data: %s
 InfoRejectSubject=Rebut de domiciliació bancària rebutjat
 InfoRejectMessage=Hola,<br><br>el rebut domiciliat de la factura %s relacionada amb la companyia %s, amb un import de %s ha estat rebutjada pel banc.<br><br>--<br>%s
 ModeWarning=No s'ha establert l'opció de treball en real, ens aturarem després d'aquesta simulació
+ErrorCompanyHasDuplicateDefaultBAN=L’empresa amb l’identificador %s té més d’un compte bancari per defecte. No hi ha manera de saber quin utilitzar.
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index e8b2b8956e1..dfbe8ee6172 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica les comandes vinculades
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classifica el pressupost de proveïdor vinculat com facturat quan la factura de proveïdor és validada (i si l'import de la factura és igual a l'import total del pressupost vinculat)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classifica la comanda de proveïdor vinculada com facturada quan la factura de proveïdor és validada (i si l'import de la factura és igual a l'import total de la comanda vinculada)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Creació automàtica
 AutomaticClassification=Classificació automàtica
diff --git a/htdocs/langs/ca_ES/zapier.lang b/htdocs/langs/ca_ES/zapier.lang
index d1cf95a01f8..4918d3bcb0f 100644
--- a/htdocs/langs/ca_ES/zapier.lang
+++ b/htdocs/langs/ca_ES/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Mòdul Zapier per a Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Configuració de Zapier per a Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index cceb4acf21f..d95720c9bfd 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Umožňuje spravovat různé počty nul na konci účetn
 BANK_DISABLE_DIRECT_INPUT=Zakázat přímé nahrávání transakce v bankovním účtu
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Povolit návrh exportu v žurnálu
 ACCOUNTANCY_COMBO_FOR_AUX=Povolit seznam combo pro pomocný účet (může být pomalý, pokud máte spoustu třetích stran)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Prodejní deník
 ACCOUNTING_PURCHASE_JOURNAL=Nákupní deník
@@ -284,6 +285,7 @@ ShowTutorial=Zobrazit výuku
 NotReconciled=Nesladěno
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Aplikovat hmotnostní kategorie
 AddAccountFromBookKeepingWithNoCategories=Dostupný účet ještě není v personalizované skupině
 CategoryDeleted=Kategorie účetního účtu byla odstraněna
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index e0e91baaff7..966a28af104 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -219,7 +219,7 @@ Nouveauté=Novinka
 AchatTelechargement=Koupit / stáhnout
 GoModuleSetupArea=Chcete-li nasadit / nainstalovat nový modul, přejděte do oblasti nastavení modulu: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, oficiální trh pro download externích modulů Dolibarr ERP / CRM
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Seznam společností poskytujících moduly nebo funkce vyvinuté na míru. <br> Poznámka: Protože Dolibarr je open source aplikace, <i> kdokoli </i>, který má zkušenosti s programováním PHP, by měl být schopen vyvinout modul.
 WebSiteDesc=Externí webové stránky pro další (doplňkové) moduly ...
 DevelopYourModuleDesc=Některá řešení pro vývoj vlastního modulu ...
 URL=URL
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=E-mail odesílatele ve výchozím nastavení pro manu
 UserEmail=Uživatelský e-mail
 CompanyEmail=Společnost Email
 FeatureNotAvailableOnLinux=Funkce není k dispozici na Unixových systémech. Otestujte svůj sendmail program lokálně.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Pokud překlad pro tento jazyk je neúplný, nebo chybný, můžete jej opravit editací souborů v adresáři <b>langs/%s</b> a předložit změněné soubory na fóru www.dolibarr.org.\n\nAktuální překlady získáte na https://www.transifex.com/dolibarr-association/dolibarr/dashboard/ kde se také můžete po vytvoření účtu na překladech podílet.
-SubmitTranslationENUS=Pokud překlad pro tento jazyk není úplný nebo najdete chyby, můžete to opravit úpravou souborů do adresáře <b> langs / %s </b> a odeslat modifikované soubory na dolibarr.org/forum nebo vývojáři na github.com/Dolibarr/dolibarr. Překlady lze editovat online také na www.transifex.com/dolibarr-association/\nPoznámka: překlady je třeba doupravit podle kontextu, většina překladů byla provedena pomocí překladače
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Nastavení modulu
 ModulesSetup=Nastavení modulu/aplikace
 ModuleFamilyBase=Systém
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modul <b> %s </b> musí být aktivován nejprve, pokud
 SecurityToken=Klíč k zabezpečené URL
 NoSmsEngine=Není k dispozici správce odesílatelů SMS. Správce odesílatele SMS není nainstalován s výchozím rozdělením, protože závisí na externím dodavateli, ale některé můžete najít na %s
 PDF=PDF
-PDFDesc=Globální možnosti generování PDF.
-PDFAddressForging=Pravidla pro pole adres
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Skrýt všechny informace týkající se daně z prodeje / DPH
 PDFRulesForSalesTax=Pravidla pro daň z prodeje / DPH
 PDFLocaltax=Pravidla pro %s
-HideLocalTaxOnPDF=Skrýt hodnotu %s ve sloupci Výprodej daní
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Skrýt popis produktů
 HideRefOnPDF=Skrýt produkty ref.
 HideDetailsOnPDF=Skryjte podrobnosti o produktech
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Změňte ceny podle základní referenční hodnoty defino
 MassConvert=Spusťte hromadnou konverzi
 PriceFormatInCurrentLanguage=Formát ceny v aktuálním jazyce
 String=Řetěz
+String1Line=String (1 line)
 TextLong=Dlouhý text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Celé číslo
 Float=Plovoucí
@@ -543,9 +546,9 @@ Module54Desc=Správa smluv (služby nebo opakované předplatné)
 Module55Name=Čárové kódy
 Module55Desc=Správa čárových kódů
 Module56Name=Platba převodem
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit platby
-Module57Desc=Správa platebních příkazů inkasních příkazů. Zahrnuje generování souboru SEPA pro evropské země.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrace ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Vytvářejte/upravujte služby
 Permission534=Smazat služby
 Permission536=Zobrazení/správa skrytých služeb
 Permission538=Export služeb
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Přečtěte si kusovníky
 Permission651=Vytvářejte/aktualizujte kusovníky
 Permission652=Smazat kusovníky
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Přečtěte si dary
 Permission702=Vytvářejte/upravujte dary
 Permission703=Odstranit dary
@@ -848,6 +858,8 @@ Permission773=Odstraňte přehledy výdajů
 Permission774=Přečtěte si všechny přehledy výdajů (i pro uživatele, kteří nejsou podřízenými)
 Permission775=Schvalovat zprávy o výdajích
 Permission776=Zaplatit vyúčtování výdajů
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export výkazů o výdajích
 Permission1001=Přečtěte si zásoby
 Permission1002=Vytvářejte/upravujte sklady
@@ -900,6 +912,7 @@ Permission2515=Nastavení adresářů dokumentů
 Permission2801=Používejte FTP klienta v režimu čtení (pouze procházení a stahování)
 Permission2802=Použití FTP klienta v režimu zápisu (mazání nebo odesílání souborů)
 Permission3200=Přečtěte si archivované události a otisky prstů
+Permission3301=Generate new modules
 Permission4001=Viz zaměstnanci
 Permission4002=Vytvářejte zaměstnance
 Permission4003=Smazat zaměstnance
@@ -947,7 +960,8 @@ Permission63003=Odstranit zdroje
 Permission63004=Propojte zdroje s událostmi programu
 DictionaryCompanyType=Typy subjektů
 DictionaryCompanyJuridicalType=Právní formy subjektů
-DictionaryProspectLevel=Potenciální cíl
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Stát/Okres
 DictionaryRegion=Regiony
 DictionaryCountry=Země
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Šablony e-mailů
 DictionaryUnits=Jednotky
 DictionaryMeasuringUnits=Měřící jednotky
 DictionarySocialNetworks=Sociální sítě
-DictionaryProspectStatus=Stav cíle
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Druhy dovolené
 DictionaryOpportunityStatus=Stav olova pro projekt / vedoucí
 DictionaryExpenseTaxCat=Zpráva o výdajích - Kategorie dopravy
@@ -1076,7 +1091,7 @@ LoginPage=přihlašovací stránka
 BackgroundImageLogin=obrázek na pozadí
 PermanentLeftSearchForm=Permanentní vyhledávací formulář na levém menu
 DefaultLanguage=Základní jazyk
-EnableMultilangInterface=Povolit vícejazyčnou podporu
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Zobrazte v nabídce logo společnosti
 CompanyInfo=Společnost/Organizace
 CompanyIds=Identita společnosti/organizace
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Kritéria vyhledávání jsou požadován
 NewTranslationStringToShow=Nový překladový řetězec se zobrazí
 OriginalValueWas=Původní překlad je přepsán. Původní hodnota byla: <br> <br> %s
 TransKeyWithoutOriginalValue=Vynutili jste nový překlad překladového klíče "<strong> %s </strong>", který neexistuje v žádných jazykových souborech
-TotalNumberOfActivatedModules=Aktivní aplikace / moduly: <b> %s </b> / <b> %s </b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povolit alespoň jeden modul
 ClassNotFoundIntoPathWarning=Třída %s nebyla nalezena v PHP cestě
 YesInSummer=Ano v létě
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Používejte typy událostí (spravované v menu Nastaven
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automaticky nastavte tuto výchozí hodnotu pro typ události ve formuláři pro tvorbu událostí
 AGENDA_DEFAULT_FILTER_TYPE=Automaticky nastavte tento typ události ve filtru vyhledávání v agendě
 AGENDA_DEFAULT_FILTER_STATUS=Automaticky nastavte tento stav událostí ve filtru vyhledávání v agendě
-AGENDA_DEFAULT_VIEW=Karta, kterou chcete otevřít ve výchozím nastavení při výběru v menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Povolení připomenutí události <b> pomocí e-mailů </b> (pro každou událost lze definovat možnost připomenutí / zpoždění). Poznámka: Modul <strong> %s </strong> musí být povolen a správně nastaven tak, aby bylo upozornění odesláno na správnou frekvenci.
 AGENDA_REMINDER_BROWSER=Povolení připomenutí události <b> v prohlížeči uživatele </b> (při dosažení data události je každý uživatel schopen odmítnout tuto otázku z potvrzení prohlížeče)
 AGENDA_REMINDER_BROWSER_SOUND=Povolit zvukové upozornění
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Zobrazit propojený objekt do zobrazení agendy
 ##### Clicktodial #####
 ClickToDialSetup=Klepněte na tlačítko Nastavení vytáčení modulu
 ClickToDialUrlDesc=Url volal po kliknutí na telefonní pikto. V URL, můžete použít tagy <br> <b> __PHONETO__ </b> který bude nahrazen s telefonním číslem osoby volat <br> <b> __PHONEFROM__ </b>, které budou nahrazeny telefonní číslo volajícího (vy) <br> <b> __LOGIN__ </b>, které budou nahrazeny clicktodial přihlášení (definováno na uživatelské kartě) <br> <b> __PASS__ </b>, který bude nahrazen heslem pro heslo (definováno na kartě uživatele).
-ClickToDialDesc=Tento modul vytváří telefonní čísla, na kterých lze kliknout na odkazy. Klepnutím na ikonu telefon zavoláte na číslo. To může být použito k volání systému call centra od společnosti Dolibarr, který může volat například telefonní číslo v systému SIP.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Na telefonních číslech použijte pouze odkaz "tel:"
 ClickToDialUseTelLinkDesc=Tuto metodu použijte, pokud mají uživatelé softwarové rozhraní nebo softwarové rozhraní nainstalované ve stejném počítači jako prohlížeč a volaly po kliknutí na odkaz v prohlížeči, který začíná na "tel:". Pokud potřebujete úplné řešení serveru (není potřeba lokální instalace softwaru), musíte jej nastavit na "Ne" a vyplnit další pole.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Toto pole obsahuje odkaz k identifikaci řádku. Zadat libovolnou h
 Enter0or1=Zadejte 0 nebo 1
 UnicodeCurrency=Zde zadejte mezi zarážkami, seznam čísel bytu, který představuje symbol měny. Například: pro $, zadejte [36] - pro Brazílii skutečné R $ [82,36] - za €, zadejte [8364]
 ColorFormat=RGB barva je ve formátu HEX, např. FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Umístění řádku do seznamů combo
 SellTaxRate=Sazba daně z prodeje
 RecuperableOnly=Ano pro DPH "Neočekávané, ale obnovitelné" určené pro některé státy ve Francii. U všech ostatních případů udržujte hodnotu "Ne".
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Žádost o nabídku
 MailToSendSupplierOrder=Objednávky
 MailToSendSupplierInvoice=Faktury dodavatele
 MailToSendContract=Smlouvy
+MailToSendReception=Recepce
 MailToThirdparty=Subjekty
 MailToMember=Členové
 MailToUser=Uživatelé
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP a CRM %s je k dispozici. Verze
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP a CRM %s je k dispozici. Verze %s je verze pro údržbu, takže obsahuje pouze opravy chyb. Doporučujeme všem uživatelům přejít na tuto verzi. Uvolnění údržby nezavádí do databáze nové funkce ani změny. Můžete jej stáhnout z oblasti stahování https://www.dolibarr.org portálu (podadresář Stable verze). Můžete přečíst <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> pro úplný seznam změn.
 MultiPriceRuleDesc=Pokud je povolena možnost "Několik úrovní cen na produkt / službu", můžete pro každý produkt definovat různé ceny (jedna za cenovou úroveň). Chcete-li ušetřit čas, můžete zde zadat pravidlo pro automatickou kalkulaci ceny za každou úroveň na základě ceny první úrovně, takže budete muset zadat pouze cenu za první úroveň pro každý produkt. Tato stránka je navržena tak, aby vám šetřila čas, ale je užitečná pouze tehdy, pokud jsou ceny pro každou úroveň relativní vzhledem k první úrovni. Tuto stránku můžete ignorovat ve většině případů.
 ModelModulesProduct=Šablony pro dokumenty produktů
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=Chcete-li automaticky generovat kódy, musíte nejprve definovat správce, který automaticky definuje číslo čárového kódu.
 SeeSubstitutionVars=Viz * Poznámka k seznamu možných substitučních proměnných
 SeeChangeLog=Viz soubor ChangeLog (pouze v angličtině)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Levý okraj ve formátu PDF
 MAIN_PDF_MARGIN_RIGHT=Pravý okraj v PDF
 MAIN_PDF_MARGIN_TOP=Nejvyšší okraj ve formátu PDF
 MAIN_PDF_MARGIN_BOTTOM=Dolní okraj v PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Pro tento modul není požadováno žádné zvláštní nastavení.
 SetToYesIfGroupIsComputationOfOtherGroups=Pokud je tato skupina výpočtem jiných skupin, nastavte to na ano
 EnterCalculationRuleIfPreviousFieldIsYes=Zadejte pravidlo výpočtu, pokud bylo předchozí pole nastaveno na Ano (Například 'CODEGRP1 + CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nic se nestalo
 XEmailsDoneYActionsDone=%s e-maily kvalifikovány, %s úspěšně zpracovány emaily (pro %s záznam / akce provedeny) podle sběratele
 RecordEvent=Nahrávat událost e-mailu
 CreateLeadAndThirdParty=Vytvoření vedení (a případně subjekty)
-CreateTicketAndThirdParty=Vytvořit lístek (a případně subjekt)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Výstup posledního kódu
 NbOfEmailsInInbox=Počet e-mailů ve zdrojovém adresáři
 LoadThirdPartyFromName=Načíst vyhledávání subjektem na adrese %s (pouze načíst)
 LoadThirdPartyFromNameOrCreate=Načíst vyhledávání subjektů na adrese %s (vytvořit, pokud nebyly nalezeny)
-WithDolTrackingID=Odkaz Dolibarr nalezen v ID zprávy
-WithoutDolTrackingID=Odkaz Dolibarr nebyl nalezen v ID zprávy
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Vstupní kód nabídky (hlavní menu)
 ECMAutoTree=Zobrazit automatický strom ECM
@@ -1981,9 +2002,9 @@ ImportSetup=Nastavení modulu Import
 InstanceUniqueID=Jedinečné ID instance
 SmallerThan=Menší než
 LargerThan=Větší než
-IfTrackingIDFoundEventWillBeLinked=Všimněte si, že je-li ID ID nalezeno v příchozím e-mailu, bude událost automaticky propojena s příslušnými objekty.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Pokud jste s účtem GMail povolili ověření ve 2 - dvou krocích, doporučuje se pro aplikaci vytvořit vyhrazené druhé heslo namísto použití hesla pro vlastní účet z adresy 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.
+EmailCollectorTargetDir=Po úspěšném zpracování může být žádoucí chování při přesunu e-mailu do jiné značky/adresáře. Chcete-li tuto funkci použít, stačí zadat název adresáře (NEPOUŽÍVEJTE v názvu speciální znaky). Musíte také použít přihlašovací účet pro čtení a zápis.
 EmailCollectorLoadThirdPartyHelp=Pomocí této akce můžete pomocí obsahu e-mailu najít a načíst existující třetí stranu ve vaší databázi. Nalezená (nebo vytvořená) třetí strana bude použita pro následující akce, které ji potřebují. V poli parametrů můžete použít například 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)', pokud chcete extrahovat jméno třetí strany z řetězce 'Name: name to find' nalezeného do tělo.
 EndPointFor=Koncový bod pro %s: %s
 DeleteEmailCollector=Smazat sběratele e-mailu
@@ -2005,3 +2026,7 @@ RssNote=Poznámka: Každá definice zdroje RSS obsahuje widget, který musíte p
 JumpToBoxes=Přejít na nastavení -> Widgety
 MeasuringUnitTypeDesc=Použijte zde hodnotu jako „velikost“, „povrch“, „objem“, „hmotnost“, „čas“
 MeasuringScaleDesc=Měřítko je počet míst, která musíte přesunout desítkovou část tak, aby odpovídala výchozí referenční jednotce. U typu „čas“ je to počet sekund. Hodnoty mezi 80 a 99 jsou rezervované hodnoty.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 62ba1fc0337..15134263d8e 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Počet událostí
 ListOfActions=Seznam událostí
 EventReports=Přehledy událostí
 Location=Umístění
-ToUserOfGroup=Každému uživateli ve skupině
+ToUserOfGroup=Událost přiřazená každému uživateli ve skupině
 EventOnFullDay=Událost pro celý den (y)
 MenuToDoActions=Všechny neúplné události
 MenuDoneActions=Všechny ukončené události
@@ -63,7 +63,7 @@ ShipmentClassifyClosedInDolibarr=Zásilka %s klasifikováno účtoval
 ShipmentUnClassifyCloseddInDolibarr=Zásilka %s byla znovu otevřena
 ShipmentBackToDraftInDolibarr=Doprava %s se vrátí zpět na stav konceptu
 ShipmentDeletedInDolibarr=Doprava %s odstraněna
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Příjem %s byl ověřen
 OrderCreatedInDolibarr=Objednat %s vytvořil
 OrderValidatedInDolibarr=Objednávka %s ověřena
 OrderDeliveredInDolibarr=Objednávka %s označena jako dodaná
@@ -86,6 +86,8 @@ ProposalDeleted=Návrh odstraněn
 OrderDeleted=Příkaz odstraněn
 InvoiceDeleted=faktura smazána
 DraftInvoiceDeleted=Koncept faktury byl smazán
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Produkt %s byl vytvořen
 PRODUCT_MODIFYInDolibarr=Produkt %s byl upraven 
 PRODUCT_DELETEInDolibarr=Produkt %s byl smazán
@@ -158,3 +160,9 @@ DateStartPlusOne=Datum zahájení + 1 hodina
 SetAllEventsToTodo=Nastavte všechny události na todo
 SetAllEventsToInProgress=Nastavit všechny probíhající události
 SetAllEventsToFinished=Nastavit všechny události na konec
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 2c7dd9202ef..8188134be65 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -37,7 +37,7 @@ IbanValid=BAN platný
 IbanNotValid=BAN není platná
 StandingOrders=příkazy k inkasu
 StandingOrder=Trvalý příkaz
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=Platba inkasem
 PaymentByBankTransfers=Platby převodem
 PaymentByBankTransfer=Platba převodem
 AccountStatement=Výpis z účtu
@@ -106,8 +106,8 @@ SupplierInvoicePayment=Dodavatelská platba
 SubscriptionPayment=Platba předplatného
 WithdrawalPayment=Debetní platební příkaz
 SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Převod peněz
+BankTransfers=Kreditní převody
 MenuBankInternalTransfer=Internal transfer
 TransferDesc=Převod z jednoho účtu na jiný, Dolibarr zapíše dva záznamy (debet na zdrojovém účtu a kredit na cílový účet). Pro tuto transakci bude použita stejná částka (kromě znaménka), štítek a datum)
 TransferFrom=Z
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index e593c83b92d..75b7c51af59 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -441,8 +441,8 @@ BankAccountNumberKey=Kontrolní součet
 Residence=Adresa
 IBANNumber=Číslo účtu IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN zákazníka
+SupplierIBAN=IBAN prodejce
 BIC=BIC/SWIFT
 BICNumber=BIC / SWIFT kód
 ExtraInfos=Extra informace
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index f99108a20da..b7104985e78 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Objednávky dodavatele: poslední %s změn
 BoxTitleLastModifiedCustomerBills=Zákaznické faktury: poslední změna %s
 BoxTitleLastModifiedCustomerOrders=Prodejní objednávky: poslední %s změny
 BoxTitleLastModifiedPropals=Poslední modifikované návrhy %s
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Zákaznické faktury
 ForCustomersOrders=Zákaznické objednávky
 ForProposals=Nabídky
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Účet pozastavení není definován
 BoxLastCustomerShipments=Poslední zásilky zákazníků
 BoxTitleLastCustomerShipments=Nejnovější %s zásilky zákazníků
 NoRecordedShipments=Žádná zaznamenaná zásilka zákazníka
+# Pages
+AccountancyHome=Účetnictví
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index dc85e287c65..e83a9e313de 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -4,20 +4,20 @@ CashDesk=Prodejní místo
 CashDeskBankCash=Bankovní účet (hotovost)
 CashDeskBankCB=Bankovní účet (karta)
 CashDeskBankCheque=Bankovní účet (šek)
-CashDeskWarehouse=Skladiště
+CashDeskWarehouse=Sklad
 CashdeskShowServices=Prodej služeb
 CashDeskProducts=Produkty
-CashDeskStock=Sklad
+CashDeskStock=Skladem
 CashDeskOn=na
-CashDeskThirdParty=Třetí strana
+CashDeskThirdParty=Subjekt
 ShoppingCart=Nákupní vozík
 NewSell=Nový prodej
 AddThisArticle=Přidat tento článek
 RestartSelling=Vraťte se na prodej
-SellFinished=Sale complete
+SellFinished=Prodej dokončen
 PrintTicket=Tisk dokladu
 SendTicket=Odeslat lístek
-NoProductFound=Žádný článek nalezen
+NoProductFound=Nebyl nalezen žádný článek
 ProductFound=vyhledané výrobky
 NoArticle=Žádný článek
 Identification=Identifikace
@@ -25,10 +25,10 @@ Article=Článek
 Difference=Rozdíl
 TotalTicket=Celkem účtenka
 NoVAT=Bez DPH pro tento prodej
-Change=Nadbytek obdržel
+Change=Přebytek byl přijat
 BankToPay=Účet pro platbu
 ShowCompany=Zobrazit společnost
-ShowStock=Zobrazit skladiště
+ShowStock=Zobrazit sklad
 DeleteArticle=Klepnutím odeberete tento článek
 FilterRefOrLabelOrBC=Vyhledávání (Ref./Štítekl)
 UserNeedPermissionToEditStockToUsePos=Ptáte se na snížení zásoby na vytvořené faktuře, ale uživatel, který používá POS musí mít oprávnění k úpravám zásob.
@@ -77,7 +77,7 @@ POSModule=POS modul
 BasicPhoneLayout=Použít základní rozvržení pro telefony
 SetupOfTerminalNotComplete=Nastavení terminálu %s není dokončeno
 DirectPayment=Přímá platba
-DirectPaymentButton=Tlačítko přímé platby v hotovosti
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Faktura je již ověřena
 NoLinesToBill=Žádné řádky k vyúčtování
 CustomReceipt=Vlastní příjem
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Externí modul s extra funkcemi. Možnost tisk
 PrintMethod=Metoda tisku
 ReceiptPrinterMethodDescription=Výkonná metoda se spoustou parametrů. Plně přizpůsobitelné pomocí šablon. Nelze tisknout z cloudu.
 ByTerminal=Terminálem
-TakeposNumpadUsePaymentIcon=Použijte ikonu platby na numpadu
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Modul číslování pro prodej POS
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> se používá k přidání čísla terminálu
 TakeposGroupSameProduct=Seskupte stejné produktové řady
 StartAParallelSale=Zahajte nový paralelní prodej
-ControlCashOpening=Kontrolní pokladna při otevření poz
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Zavřete hotovostní plot
 CashReport=Hotovostní zpráva
 MainPrinterToUse=Hlavní tiskárna k použití
@@ -107,13 +107,18 @@ OrderPrinterToUse=Objednejte tiskárnu k použití
 MainTemplateToUse=Hlavní šablona k použití
 OrderTemplateToUse=Objednejte šablonu k použití
 BarRestaurant=Barová restaurace
-AutoOrder=Order by the customer himself
+AutoOrder=Objednávka samotným zákazníkem
 RestaurantMenu=Menu
 CustomerMenu=Zákaznické menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+ScanToMenu=Naskenujte QR kód a zobrazí se nabídka
+ScanToOrder=Naskenujte QR kód
+Appearance=Vzhled
+HideCategoryImages=Skrýt obrázky kategorií
+HideProductImages=Skrýt obrázky produktů
+NumberOfLinesToShow=Počet řádků obrázků k zobrazení
+DefineTablePlan=Definujte plán tabulek
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index 108f4511ac7..9e64b689ff2 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Sociální nebo daňová daň
 SocialContributions=Sociální nebo daně za
 SocialContributionsDeductibles=Odečitatelné sociální či daně za
 SocialContributionsNondeductibles=Nondeductible sociální či daně za
+DateOfSocialContribution=Datum sociální nebo daňové daně
 LabelContrib=Příspěvek štítek
 TypeContrib=Typ příspěvku
 MenuSpecialExpenses=Zvláštní výdaje
diff --git a/htdocs/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang
index dacdba6b57d..a8be703a483 100644
--- a/htdocs/langs/cs_CZ/contracts.lang
+++ b/htdocs/langs/cs_CZ/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Spuštěné služby
 MenuExpiredServices=Expirované služby
 MenuClosedServices=Uzavřené služby
 NewContract=Nová smlouva
-NewContractSubscription=Nová smlouva / předplatné
+NewContractSubscription=Nová smlouva nebo předplatné
 AddContract=Vytvoření smlouvy
 DeleteAContract=Odstranit smlouvu
 ActivateAllOnContract=Aktivujte všechny služby
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Obchodní zástupce následující-up
 TypeContact_contrat_external_BILLING=Fakturační kontakt zákazníka
 TypeContact_contrat_external_CUSTOMER=Navazující kontakt se zákazníkem
 TypeContact_contrat_external_SALESREPSIGN=Podepsání smlouvy kontakt se zákazníkem
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Ve výchozím nastavení skrýt uzavřené služby
+ShowClosedServices=Zobrazit uzavřené služby
+HideClosedServices=Skrýt uzavřené služby
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 30660856858..a9028d01278 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -23,7 +23,7 @@ ErrorFailToGenerateFile=Nepodařilo se vytvořit soubor '<b> %s</b>.
 ErrorThisContactIsAlreadyDefinedAsThisType=Tento kontakt je již definován jako kontakt pro tento typ.
 ErrorCashAccountAcceptsOnlyCashMoney=Tento bankovní účet je hotovostní účet, takže přijímá pouze platby typu hotovosti.
 ErrorFromToAccountsMustDiffers=Zdrojové a cílové bankovní účty musí být různé.
-ErrorBadThirdPartyName=Špatná hodnota názvu subjektu
+ErrorBadThirdPartyName=Špatná hodnota názvu subjektu nebo třetí strany
 ErrorProdIdIsMandatory=%s je povinné
 ErrorBadCustomerCodeSyntax=Špatná syntaxe kódu zákazníka
 ErrorBadBarCodeSyntax=Špatná syntaxe pro čárový kód. Možná jste nastavili špatný typ čárového kódu nebo jste definovali masku čárového kódu pro číslování, které nesouhlasí s naskenovanou hodnotou.
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Špatná syntaxe pro kód dodavatele
 ErrorSupplierCodeRequired=Je vyžadován kód dodavatele
 ErrorSupplierCodeAlreadyUsed=Kód dodavatele je již použit
 ErrorBadParameters=Špatné parametry. Tak takto opravdu ne ......
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Chybné nebo chybějící parametry
 ErrorBadValueForParameter=Chybná hodnota ‚%s‘ pro parametr ‚%s‘
 ErrorBadImageFormat=Obrázek nemá podporovaný formát (Váš PHP nepodporuje funkce pro převod obrázků z tohoto formátu)
 ErrorBadDateFormat=Hodnota '%s' má nesprávný formát data
@@ -120,7 +120,7 @@ ErrorLoginHasNoEmail=Tento uživatel nemá žádnou e-mailovou adresu. Proces p
 ErrorBadValueForCode=Špatná hodnota pro bezpečnostní kód. Zkuste znovu s novou hodnotou ...
 ErrorBothFieldCantBeNegative=Pole %s a %s nemohou být záporná
 ErrorFieldCantBeNegativeOnInvoice=Pole <strong> %s </strong> nemůže být u tohoto typu faktury záporné. Pokud potřebujete přidat řádek slevy, nejprve vytvořte slevu (z pole „%s“ na kartě subjektu) a přiložte ji na fakturu.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeForOneVATRate=Celkový počet řádků (bez daně) nemůže být záporný pro danou neplatnou sazbu DPH (Nalezený záporný součet pro sazbu DPH <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=Linky nemohou být v záloze záporné. Pokud tak učiníte, budete čelit problémům, kdy budete muset složit zálohu v konečné faktuře.
 ErrorQtyForCustomerInvoiceCantBeNegative=Množství řádku do zákaznických faktur nemůže být záporné
 ErrorWebServerUserHasNotPermission=Uživatelský účet <b> %s </b>, který byl použit k provádění webového serveru, nemá k tomu povolení
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Nová hodnota nemůže být stejná jako stará
 ErrorFailedToValidatePasswordReset=Nepodařilo se obnovit heslo. Může být reinit byl již hotový (tento odkaz může být použit pouze jednou). Pokud tomu tak není, pokuste se znovu spustit proces obnovení.
 ErrorToConnectToMysqlCheckInstance=Připojení k databázi selhalo. Zkontrolujte, zda je databázový server spuštěn (například pomocí mysql / mariadb můžete spustit z příkazového řádku s 'sudo service mysql start').
 ErrorFailedToAddContact=Nepodařilo se přidat kontakt
-ErrorDateMustBeBeforeToday=Datum nemůže být větší než dnešní. Nejsme v SSSR.
+ErrorDateMustBeBeforeToday=Datum musí být nižší než dnes
+ErrorDateMustBeInFuture=Datum musí být delší než dnes
 ErrorPaymentModeDefinedToWithoutSetup=Platební režim byl nastaven na typ %s, ale nastavení modulu Faktura nebylo dokončeno pro definování informací, které se mají zobrazit v tomto režimu platby.
 ErrorPHPNeedModule=Chyba, váš PHP musí mít nainstalovaný modul <b> %s </b> pro použití této funkce.
 ErrorOpenIDSetupNotComplete=Nastavíte konfigurační soubor Dolibarr, abyste povolili ověřování OpenID, ale URL služby OpenID není definována do konstantního %s
@@ -184,7 +185,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Špatná definice pole nabídek
 ErrorSavingChanges=Při ukládání změn došlo k chybě
 ErrorWarehouseRequiredIntoShipmentLine=Sklad je vyžadován na lince k odeslání
 ErrorFileMustHaveFormat=Soubor musí mít formát %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=Název souboru nemůže začínat znakem „.“
 ErrorSupplierCountryIsNotDefined=Země pro tohoto dodavatele není definována. Nejprve to opravte.
 ErrorsThirdpartyMerge=Nepodařilo se sloučit dva záznamy. Požadavek zrušen.
 ErrorStockIsNotEnoughToAddProductOnOrder=Zásoba nestačí na produkt %s, který ji přidá do nové objednávky.
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Na produkt „%s“ ve skla
 ErrorOnlyOneFieldForGroupByIsPossible=Je možné pouze 1 - slovy jedno pole pro „Group by“ (ostatní jsou zahozeny)
 ErrorTooManyDifferentValueForSelectedGroupBy=Bylo nalezeno příliš mnoho různých hodnot (více než <b> %s </b>) pro pole „<b> %s </b>“, takže ji nelze použít jako grafiku a. Pole „Skupina podle“ bylo odstraněno. Možná budete chtít použít jako X-Axis?
 ErrorReplaceStringEmpty=Chyba, řetězec, který chcete nahradit, je prázdný
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Váš parametr PHP upload_max_filesize (%s) je vyšší než parametr PHP post_max_size (%s). Toto není konzistentní nastavení.
 WarningPasswordSetWithNoAccount=Pro tohoto člena bylo nastaveno heslo. Nebyl však vytvořen žádný uživatelský účet. Toto heslo je uloženo, ale nemůže být použito pro přihlášení k Dolibarr. Může být použito externím modulem / rozhraním, ale pokud nemáte pro člena definováno žádné přihlašovací jméno ani heslo, můžete vypnout možnost "Správa přihlášení pro každého člena" z nastavení modulu člena. Pokud potřebujete spravovat přihlašovací údaje, ale nepotřebujete žádné heslo, můžete toto pole ponechat prázdné, abyste se tomuto varování vyhnuli. Poznámka: E-mail může být také použit jako přihlašovací jméno, pokud je člen připojen k uživateli.
diff --git a/htdocs/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang
index 53bbcc27024..b551ca150a1 100644
--- a/htdocs/langs/cs_CZ/languages.lang
+++ b/htdocs/langs/cs_CZ/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Etiopský
 Language_ar_AR=Arabština
 Language_ar_EG=Arabština (Egypt)
 Language_ar_SA=Arabština
+Language_az_AZ=Ázerbájdžán
 Language_bn_BD=Bengálština
+Language_bn_IN=Bengálština (Indie)
 Language_bg_BG=Bulharština
 Language_bs_BA=Bosenština
 Language_ca_ES=Katalánština
@@ -20,6 +23,7 @@ Language_en_GB=Angličtina (Velká Británie)
 Language_en_IN=Angličtina (Indie)
 Language_en_NZ=Angličtina (Nový Zéland)
 Language_en_SA=Angličtina (Saúdská Arábie)
+Language_en_SG=Angličtina (Singapur)
 Language_en_US=Angličtina (Spojené státy)
 Language_en_ZA=Angličtina (Jižní Afrika)
 Language_es_ES=Španělština
@@ -29,6 +33,7 @@ Language_es_CL=Španělština (Chile)
 Language_es_CO=Španělština (Kolumbie)
 Language_es_DO=Španělština (Dominikánská republika)
 Language_es_EC=Španělština (Ekvádor)
+Language_es_GT=Španělština (Guatemala)
 Language_es_HN=Španělština (Honduras)
 Language_es_MX=Španělština (Mexiko)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Španělština (Paraguay)
 Language_es_PE=Španělština (Peru)
 Language_es_PR=Španělština (Puerto Rico)
 Language_es_UY=Španělština (Urugway)
+Language_es_GT=Španělština (Guatemala)
 Language_es_VE=Španělština (Venezuela)
 Language_et_EE=Estonština
 Language_eu_ES=Baskičtina
@@ -44,15 +50,22 @@ Language_fi_FI=Finština
 Language_fr_BE=Francouzština (Belgie)
 Language_fr_CA=Francouzština (Kanada)
 Language_fr_CH=Francouzština (Švýcarsko)
+Language_fr_CI=Francouzština (Cost Ivory)
+Language_fr_CM=Francouzština (Cameroun)
 Language_fr_FR=Francouzsky
+Language_fr_GA=Francouzština (Gabun)
 Language_fr_NC=Francouzština (Nová Kaledonie)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galicijština
 Language_he_IL=Hebrejština
+Language_hi_IN=Hindština (Indie)
 Language_hr_HR=Chorvatský
 Language_hu_HU=Maďarština
 Language_id_ID=Indonésie
 Language_is_IS=Islandština
 Language_it_IT=Italština
+Language_it_CH=Italština (Švýcarsko)
 Language_ja_JP=Japonsky
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Lotyština
 Language_mk_MK=Makedonský
 Language_mn_MN=Mongolian
 Language_nb_NO=Norština (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Nizozemí (Belgie)
 Language_nl_NL=holandský
 Language_pl_PL=Polsky
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbecký
 Language_vi_VN=Vietnamština
 Language_zh_CN=Čínština
 Language_zh_TW=Čínština (tradiční)
+Language_zh_HK=Čínština (Hongkong)
 Language_bh_MY=Malajština
diff --git a/htdocs/langs/cs_CZ/loan.lang b/htdocs/langs/cs_CZ/loan.lang
index 43660683731..a4760506519 100644
--- a/htdocs/langs/cs_CZ/loan.lang
+++ b/htdocs/langs/cs_CZ/loan.lang
@@ -23,9 +23,9 @@ AddLoan=vytvoření úvěru
 FinancialCommitment=Finanční závazek
 InterestAmount=Zájem
 CapitalRemain=Zůstatek kapitálu
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Tento termín je již zaplacen
+CantUseScheduleWithLoanStartedToPaid = Nelze použít plánovač pro půjčku se zaplacením
+CantModifyInterestIfScheduleIsUsed = Pokud používáte plán, nemůžete změnit zájem
 # Admin
 ConfigLoan=Konfigurace modulu úvěru
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Účetní účetní kapitál ve výchozím nastavení
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index a8bbd0da669..aad25597cf4 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Nastavení odchozí pošty (pro modul %s)
 DefaultOutgoingEmailSetup=Výchozí nastavení odchozí pošty
 Information=Informace
 ContactsWithThirdpartyFilter=Kontakty s filtrem subjektu
+Unanswered=Unanswered
+Answered=Odpovězeno
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 3683f0ce169..94780679f14 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (Včetně daně)
 Amount=Množství
 AmountInvoice=Fakturovaná částka
 AmountInvoiced=Fakturovaná částka
-AmountInvoicedHT=Fakturovaná částka (včetně daně)
-AmountInvoicedTTC=Fakturovaná částka (bez daně)
+AmountInvoicedHT=Fakturovaná částka (bez daně)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Částka platby
 AmountHTShort=Částka (bez)
 AmountTTCShort=Částka (vč. DPH)
@@ -485,6 +485,7 @@ Categories=Tagy/kategorie
 Category=Tag/kategorie
 By=Podle
 From=Z
+FromDate=Z
 FromLocation=Z
 to=na
 To=na
@@ -687,6 +688,7 @@ Method=Metoda
 Receive=Přijmout
 CompleteOrNoMoreReceptionExpected=Dokončeno nebo nic víc očekávaného
 ExpectedValue=Očekávaná hodnota
+ExpectedQty=Expected Qty
 PartialWoman=Částečný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
@@ -703,6 +705,7 @@ MenuECM=Dokumenty
 MenuAWStats=AW Statistiky
 MenuMembers=Členové
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Daně/Zvláštní výdaje
 ThisLimitIsDefinedInSetup=Dolibarr limit (menu Domů-nastavení-zabezpečení): %s Kb, PHP limit: %s Kb
 NoFileFound=Žádné dokumenty nejsou uložené v tomto adresáři
 CurrentUserLanguage=Aktuální jazyk
@@ -725,7 +728,7 @@ Page=Strana
 Notes=Poznámky
 AddNewLine=Přidat nový řádek
 AddFile=Přidat soubor
-FreeZone=Nejedná se o předdefinovaný produkt/službu
+FreeZone=Produkt s volným textem
 FreeLineOfType=Volně textová položka, typ:
 CloneMainAttributes=Duplikovat objekt s jeho hlavními atributy
 ReGeneratePDF=Znovu generovat PDF
@@ -942,6 +945,39 @@ ShortThursday=Č
 ShortFriday=PÁ
 ShortSaturday=S
 ShortSunday=N
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Vyberte šablonu e-mailu
 SetRef=nastavit ref
 Select2ResultFoundUseArrows=Byly nalezeny některé výsledky. Pomocí šipek vyberte.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Přepnutím v režimu úprav přidáte překlad
 NotUsedForThisCustomer=Nepoužívá se pro tohoto zákazníka
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Informace
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index e173badf8d6..50770d35641 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -81,7 +81,7 @@ DeleteType=Vymazat
 VoteAllowed=Hlasování povoleno
 Physical=Fyzický
 Moral=Morální
-MorPhy=Morální / fyzický
+MorPhy=Příroda
 Reenable=Znovu povolit
 ResiliateMember=Ukončit člena
 ConfirmResiliateMember=Jste si jisti, že chcete ukončit tyto členy?
diff --git a/htdocs/langs/cs_CZ/mrp.lang b/htdocs/langs/cs_CZ/mrp.lang
index 85aecf46280..ee97c7b368f 100644
--- a/htdocs/langs/cs_CZ/mrp.lang
+++ b/htdocs/langs/cs_CZ/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Výrobní zakázky
 MO=Výrobní zakázka
+MOs=Manufacturing orders
 MRPDescription=Modul pro správu výrobních a výrobních objednávek (MO).
 MRPArea=Oblast MRP
 MrpSetupPage=Nastavení modulu MRP
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index f544f4da7d6..ba0a69321c7 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Ahoj)__\n\nObraťte se na naši objedn
 PredefinedMailContentSendSupplierInvoice=__(Ahoj)__\n\nNajděte fakturu __REF__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Ahoj)__\n\nNajděte prosím dodací lhůtu __REF__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Ahoj)__\n\nNajděte zásah __REF__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Ahoj)__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Ahoj)__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Ahoj)__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Klepnutím na níže uvedený odkaz proveďte platbu, pokud ještě není hotovo.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Ahoj)__\n\n\n__(S pozdravem)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr je kompaktní ERP/CRM systém, který se  skládá z více funkčních modulů. Demo, které obsahuje všechny moduly vám nepředstaví všechny možnosti, protože v reálné situaci všechny moduly najednou používat nebudete.  Pro lepší a snadnější seznámení s celým systémem máte k dispozici několik demo profilů lépe vystihujících vaše požadavky. 
 ChooseYourDemoProfil=Vyberte demo profil, který nejlépe odpovídá vaší činnosti, nebo zaměření ...
 ChooseYourDemoProfilMore=... nebo vytvořit vlastní profil <br> (manuální výběr požadovaných modulů)
@@ -280,7 +278,9 @@ LinesToImport=Řádky, které chcete importovat
 
 MemoryUsage=Využití paměti
 RequestDuration=Doba trvání žádosti
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Produkty / služby podle oblíbenosti v návrzích
 PopuCom=Produkty / služby podle oblíbenosti v objednávkách
 ProductStatistics=Statistika produktů / služeb
 NbOfQtyInOrders=Množství v objednávkách
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 28779340308..4a14c6581fc 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -104,9 +104,10 @@ SetDefaultBarcodeType=Nastavte typ čárového kódu
 BarcodeValue=Hodnota čárového kódu
 NoteNotVisibleOnBill=Poznámka (není vidět na návrzích faktury, ...)
 ServiceLimitedDuration=Je-li výrobek službou s omezeným trváním:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Více cenových segmentů na produkt / službu (každý zákazník je v jednom cenovém segmentu)
 MultiPricesNumPrices=Počet cen
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
+DefaultPriceType=Základ cen za prodlení (s versus bez daně) při přidávání nových prodejních cen
 AssociatedProductsAbility=Aktivovat virtuální produkty (sady)
 AssociatedProducts=Virtuální produkty
 AssociatedProductsNumber=Počet výrobků tvořících tento virtuální produkt
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Ceny prodejců (produktů nebo služeb)
 CustomCode=Kód cla / komodity / HS
 CountryOrigin=Země původu
 Nature=Druh produktu (materiál / hotový)
+NatureOfProductShort=Druh produktu
+NatureOfProductDesc=Surovina nebo hotový produkt
 ShortLabel=Krátký štítek
 Unit=Jednotka
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Vyberte kombinaci
 ProductCombinationGenerator=Generátor variant
 Features=Funkce
 PriceImpact=Dopad na ceny
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Hmotnostní dopady
 NewProductAttribute=Nový atribut
 NewProductAttributeValue=Nová hodnota atributu
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 2458223a877..e75df1f5d9e 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Oblast projektů
 ProjectStatus=Stav projektu
 SharedProject=Všichni
 PrivateProject=Kontakty projektu
-ProjectsImContactFor=Projects for which I am explicitly a contact
+ProjectsImContactFor=Projekty, pro které jsem výslovně kontakt
 AllAllowedProjects=Celý projekt mohu číst (moje + veřejnost)
 AllProjects=Všechny projekty
 MyProjectsDesc=Tento pohled je omezen na projekty u kterých jste uveden jako kontakt 
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Přispěvatel
 TypeContact_project_task_external_TASKCONTRIBUTOR=Přispěvatel
 SelectElement=Vyberte prvek
 AddElement=Odkaz na prvek
+LinkToElementShort=odkaz na
 # Documents models
 DocumentModelBeluga=Šablona dokumentu dokumentu pro přehled propojených objektů
 DocumentModelBaleine=Šablona dokumentu projektu pro úkoly
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Počet vytvořených projektů podle měsíce
 ProjectNbTaskByMonth=Počet vytvořených úkolů měsíčně
 ProjectOppAmountOfProjectsByMonth=Množství potenciálních zákazníků měsíčně
 ProjectWeightedOppAmountOfProjectsByMonth=Vážená částka vedoucích podle měsíce
-ProjectOpenedProjectByOppStatus=Otevření projektu / vedení podle stavu vedení
-ProjectsStatistics=Statistiky týkající se projektů / vodičů
-TasksStatistics=Statistiky projektů / vedoucích úkolů
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Úkol přidělen. Zadání času na tomto úkolu by mělo být možné.
 IdTaskTime=Čas úlohy Id
 YouCanCompleteRef=Chcete-li doplnit odkaz nějakou příponou, doporučujeme přidat znak - aby se oddělil, takže automatické číslování bude fungovat správně pro další projekty. Například %s-MYSUFFIX
@@ -265,4 +266,4 @@ NewInvoice=Nová faktura
 OneLinePerTask=Jeden řádek na úkol
 OneLinePerPeriod=Jeden řádek za období
 RefTaskParent=Ref. Nadřazený úkol
-ProfitIsCalculatedWith=Profit is calculated using
+ProfitIsCalculatedWith=Zisk se vypočítá pomocí
diff --git a/htdocs/langs/cs_CZ/propal.lang b/htdocs/langs/cs_CZ/propal.lang
index 5578239af42..a945b46a66a 100644
--- a/htdocs/langs/cs_CZ/propal.lang
+++ b/htdocs/langs/cs_CZ/propal.lang
@@ -84,4 +84,4 @@ DefaultModelPropalClosed=Výchozí šablona při uzavírání obchodní nabídky
 ProposalCustomerSignature=Písemný souhlas, razítko firmy, datum a podpis
 ProposalsStatisticsSuppliers=Statistika návrhů dodavatelů
 CaseFollowedBy=Případ následovaný
-SignedOnly=Signed only
+SignedOnly=Podepsáno pouze
diff --git a/htdocs/langs/cs_CZ/receiptprinter.lang b/htdocs/langs/cs_CZ/receiptprinter.lang
index b141c33ce18..ae6a4880b0b 100644
--- a/htdocs/langs/cs_CZ/receiptprinter.lang
+++ b/htdocs/langs/cs_CZ/receiptprinter.lang
@@ -77,6 +77,6 @@ DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Zůstatek na účtu zákazníka
 DOL_VALUE_MYSOC_NAME=Název vaší společnosti
 VendorLastname=Příjmení dodavatele
 VendorFirstname=Jméno dodavatele
-VendorEmail=Vendor email
+VendorEmail=E-mail dodavatele
 DOL_VALUE_CUSTOMER_POINTS=Zákaznické body
 DOL_VALUE_OBJECT_POINTS=Body bodů
diff --git a/htdocs/langs/cs_CZ/receptions.lang b/htdocs/langs/cs_CZ/receptions.lang
index 015132d8d84..f5217377215 100644
--- a/htdocs/langs/cs_CZ/receptions.lang
+++ b/htdocs/langs/cs_CZ/receptions.lang
@@ -43,5 +43,5 @@ ProductQtyInSuppliersReceptionAlreadyRecevied=Množství produktu již obdrženo
 ValidateOrderFirstBeforeReception=Nejprve musíte potvrdit objednávku, než budete moci přijímat recepce.
 ReceptionsNumberingModules=Modul číslování pro recepce
 ReceptionsReceiptModel=Šablony dokumentů pro recepce
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
+NoMorePredefinedProductToDispatch=Žádné další předdefinované produkty k odeslání
 
diff --git a/htdocs/langs/cs_CZ/recruitment.lang b/htdocs/langs/cs_CZ/recruitment.lang
new file mode 100644
index 00000000000..25cc7d16349
--- /dev/null
+++ b/htdocs/langs/cs_CZ/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Nastavení
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = O aplikaci
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 2e524586ff4..ef9fbfdb1eb 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Karta skladiště
+WarehouseCard=Karta skladu
 Warehouse=Sklad
 Warehouses=Sklady
 ParentWarehouse=Nadřazený sklad
-NewWarehouse=Nový sklad / umístění skladu
+NewWarehouse=Nový sklad/umístění skladu
 WarehouseEdit=Upravit sklad
 MenuNewWarehouse=Nový sklad
 WarehouseSource=Zdrojový sklad
-WarehouseSourceNotDefined=Není definován žádné skladiště
+WarehouseSourceNotDefined=Není definován žádný sklad,
 AddWarehouse=Vytvořte sklad
-AddOne=Přidat jedno
+AddOne=Přidejte jeden
 DefaultWarehouse=Výchozí sklad
 WarehouseTarget=Cílový sklad
-ValidateSending=Smazat odeslání
-CancelSending=Zrušit zasílání
+ValidateSending=Smazat odesílání
+CancelSending=Zrušit odesílání
 DeleteSending=Smazat odeslání
-Stock=Sklad
-Stocks=Sklady
-MissingStocks=Missing stocks
-StockAtDate=Stock at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
-StocksByLotSerial=Sklad množství/série
-LotSerial=Loty / seriály
-LotSerialList=Seznam partitur / seriálů
+Stock=Skladem
+Stocks=Zásoby
+MissingStocks=Chybějící zásoby
+StockAtDate=Zásoby k datu
+StockAtDateInPast=Datum v minulosti
+StockAtDateInFuture=Datum v budoucnosti
+StocksByLotSerial=Zásoby podle šarže/serie
+LotSerial=Šarže/série
+LotSerialList=Seznam šarže/serie
 Movements=Pohyby
 ErrorWarehouseRefRequired=Referenční jméno skladiště je povinné
-ListOfWarehouses=Seznam skladišť
+ListOfWarehouses=Seznam skladů
 ListOfStockMovements=Přehled skladových pohybů
 ListOfInventories=Seznam zásob
 MovementId=ID pohybu
@@ -34,7 +34,7 @@ StockMovementForId=ID pohybu %d
 ListMouvementStockProject=Seznam pohybů zásob spojené s projektem
 StocksArea=Skladové prostory
 AllWarehouses=Všechny sklady
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Zahrňte také nedefinované požadované zásoby
 IncludeAlsoDraftOrders=Zahrnout také návrhy objednávek
 Location=Umístění
 LocationSummary=Krátký název umístění
@@ -65,9 +65,9 @@ RuleForWarehouse=Pravidlo pro sklady
 WarehouseAskWarehouseDuringOrder=Nastavit sklad na prodejní objednávky
 UserDefaultWarehouse=Nastavit sklad na Uživatelé
 MainDefaultWarehouse=Výchozí sklad
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
-IndependantSubProductStock=Produktová skladová zásoba a podprojekt jsou nezávislé
+MainDefaultWarehouseUser=Použijte výchozí sklad pro každého uživatele
+MainDefaultWarehouseUserDesc=Aktivací této možnosti bude při vytváření produktu v tomto skladu definován sklad přiřazený k produktu. Není-li u uživatele definován žádný sklad, je definován výchozí sklad.
+IndependantSubProductStock=Sklad produktu a dílčí produkt jsou nezávislé
 QtyDispatched=Množství odesláno
 QtyDispatchedShort=Odeslané množství
 QtyToDispatchShort=Odesílané množství
@@ -95,25 +95,27 @@ RealStock=Skutečný sklad
 RealStockDesc=Fyzické / skutečné zásoby jsou zásoby, které jsou v současné době ve skladech.
 RealStockWillAutomaticallyWhen=Reálná aktiva bude upravena podle tohoto pravidla (jak je definováno v modulu Akcie):
 VirtualStock=Virtuální sklad
-VirtualStockDesc=Virtuální zásoba je vypočítaná zásoba, jakmile jsou všechny otevřené / čekající akce (které ovlivňují akcie) uzavřeny (přijaté nákupní objednávky, zaslané objednávky atd.)
+VirtualStockAtDate=Virtuální sklad k datu
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtuální sklad je vypočítaná zásoba dostupná po uzavření všech otevřených/čekajících akcí (které mají vliv na zásoby) (přijaté objednávky, dodané prodejní objednávky, vyrobené výrobní objednávky atd.)
 IdWarehouse=ID skladu
-DescWareHouse=Popis skladiště
-LieuWareHouse=Lokalizace skladiště
-WarehousesAndProducts=Skladiště a produkty
-WarehousesAndProductsBatchDetail=Skladiště a výrobky (s detaily na množství/série)
-AverageUnitPricePMPShort=Vážený průměr cen vstupů
-AverageUnitPricePMP=Vážený průměr cen vstupů
-SellPriceMin=Prodejní jednotka Cena
+DescWareHouse=Popis skladu
+LieuWareHouse=Lokalizace skladu
+WarehousesAndProducts=Sklady a výrobky
+WarehousesAndProductsBatchDetail=Sklady a produkty (s podrobnostmi o šarži/sérii)
+AverageUnitPricePMPShort=Vážená průměrná cena
+AverageUnitPricePMPDesc=Vstupní průměrná jednotková cena, kterou jsme museli platit dodavatelům, aby dostali produkt do naší zásoby.
+SellPriceMin=Prodejní jednotková cena
 EstimatedStockValueSellShort=Hodnota k prodeji
 EstimatedStockValueSell=Hodnota k prodeji
 EstimatedStockValueShort=Vstupní hodnota zásob
 EstimatedStockValue=Vstupní hodnota zásob
-DeleteAWarehouse=Odstranění skladiště
+DeleteAWarehouse=Odstranit sklad
 ConfirmDeleteWarehouse=Opravdu chcete vymazat sklad <b> %s </b>?
 PersonalStock=Osobní sklad %s
 ThisWarehouseIsPersonalStock=Tento sklad představuje osobní zásobu %s %s
-SelectWarehouseForStockDecrease=Zvolte skladiště pro použití snížení zásob
-SelectWarehouseForStockIncrease=Zvolte skladiště pro zvýšení stavu zásob
+SelectWarehouseForStockDecrease=Vyberte sklad, který chcete použít pro snížení zásob
+SelectWarehouseForStockIncrease=Vyberte sklad, který chcete použít pro zvýšení zásob
 NoStockAction=Žádné akce ve skladu
 DesiredStock=Požadované optimální zásoby
 DesiredStockDesc=Tato částka bude hodnota použitá k vyplnění zásoby podle funkce doplnění.
@@ -130,18 +132,18 @@ CurentlyUsingPhysicalStock=Fyzické zásoby
 RuleForStockReplenishment=Pravidlo pro doplňování zásob
 SelectProductWithNotNullQty=Vyberte alespoň jeden produkt s množství větším než 0 a dodavatelem
 AlertOnly= Pouze upozornění
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
-WarehouseForStockDecrease=Skladiště <b>%s</b> budou použity pro snížení skladu
-WarehouseForStockIncrease=Skladiště <b>%s</b> budou použity pro zvýšení stavu zásob
-ForThisWarehouse=Z tohoto skladiště
+IncludeProductWithUndefinedAlerts = Zahrňte také negativní zásobu produktů bez definovaného požadovaného množství, abyste je obnovili na 0
+WarehouseForStockDecrease=Sklad <b> %s </b> bude použit pro snížení zásob
+WarehouseForStockIncrease=Ke zvýšení zásob bude použit sklad <b> %s </b>.
+ForThisWarehouse=Pro tento sklad
 ReplenishmentStatusDesc=Toto je seznam všech produktů, jejichž zásoba je nižší než požadovaná zásoba (nebo je nižší než hodnota výstrahy, pokud je zaškrtnuto políčko "pouze výstraha"). Pomocí zaškrtávacího políčka můžete vytvořit objednávky k vyplnění rozdílu.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
+ReplenishmentStatusDescPerWarehouse=Pokud chcete doplnění na základě požadovaného množství definovaného pro sklad, musíte do skladu přidat filtr.
 ReplenishmentOrdersDesc=Jedná se o seznam všech otevřených objednávek včetně předdefinovaných produktů. Otevřeny jsou pouze objednávky s předdefinovanými produkty, takže objednávky, které mohou ovlivnit zásoby, jsou zde viditelné.
 Replenishments=Splátky
 NbOfProductBeforePeriod=Množství produktů %s na skladě, než zvolené období (< %s)
 NbOfProductAfterPeriod=Množství produktů %s na skladě po zvolené období (> %s)
 MassMovement=Hromadný pohyb
-SelectProductInAndOutWareHouse=Vyberte produkt, množství, zdrojový sklad a cílový sklad, pak klikněte na  "%s". Jakmile se tak stane pro všechny požadované pohyby, klikněte na  "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Záznam přenosu
 ReceivingForSameOrder=Příjmy pro tuto objednávku
 StockMovementRecorded=Zaznamenány pohyby zásob
@@ -232,6 +234,9 @@ InventoryForASpecificProduct=Inventář konkrétního produktu
 StockIsRequiredToChooseWhichLotToUse=Zásoba je povinna zvolit, které množství se má použít
 ForceTo=Vynutit
 AlwaysShowFullArbo=Zobrazit plný strom skladu v rozbalovacím seznamu propojení skladu (Upozornění: Může to dramaticky snížit výkon)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
+StockAtDatePastDesc=Zde si můžete zobrazit akcie (skutečné zásoby) k danému datu v minulosti
+StockAtDateFutureDesc=Zde si můžete v budoucnu zobrazit akcie (virtuální akcie) k danému datu
+CurrentStock=Aktuální stav
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index 37ac3549c00..ce2434b6a84 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/suppliers.lang
@@ -1,47 +1,47 @@
-# Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Dodavatelé
+SuppliersInvoice=Faktura dodavatele
+ShowSupplierInvoice=Zobrazit fakturu dodavatele
+NewSupplier=Nový dodavatel
 History=Historie
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
+ListOfSuppliers=Seznam dodavatelů
+ShowSupplier=Zobrazit dodavatele
 OrderDate=Datum objednávky
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
+BuyingPriceMin=Nejlepší nákupní cena
+BuyingPriceMinShort=Nejlepší nákupní cena
 TotalBuyingPriceMinShort=Nákupní ceny vedlejších produktů celkem
-TotalSellingPriceMinShort=Total of subproducts selling prices
+TotalSellingPriceMinShort=Celkem podprodávané prodejní ceny
 SomeSubProductHaveNoPrices=Některé vedlejší produkty nemají stanovené žádné ceny
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
-SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tato referenční dodavatel je již spojeno s odkazem: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
-SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
+AddSupplierPrice=Přidat nákupní cenu
+ChangeSupplierPrice=Změna nákupní ceny
+SupplierPrices=Ceny prodejců
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tato referenční nabídka dodavatele je již spojena s produktem: %s
+NoRecordedSuppliers=Žádný dodavatel nebyl zaznamenán
+SupplierPayment=Dodavatelská platba
+SuppliersArea=Oblast dodavatelů
+RefSupplierShort=Ref. dodavatel
 Availability=Dostupnost
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_1=Prodejní faktury a fakturační údaje
+ExportDataset_fournisseur_2=Prodejní faktury a platby
+ExportDataset_fournisseur_3=Nákupní objednávky a podrobnosti o objednávce
 ApproveThisOrder=Schválit tuto objednávku
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+ConfirmApproveThisOrder=Jste si jisti, že chcete schválit tuto objednávku <b>%s?</b>
 DenyingThisOrder=Zakázat tuto objednávku
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Zpoždění dodávky  ve dnech
-DescNbDaysToDelivery=Největší zpoždění dodávek z produktů z této objednávky
-SupplierReputation=Vendor reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Vendor prices
+ConfirmDenyingThisOrder=Opravdu chcete zakázat tuto objednávku <b> %s </b>?
+ConfirmCancelThisOrder=Jste si jisti, že chcete zrušit tuto objednávku  <b>%s</b> ?
+AddSupplierOrder=Vytvořit objednávku
+AddSupplierInvoice=Vytvořte fakturu dodavatele
+ListOfSupplierProductForSupplier=Seznam produktů a cen pro dodavatele <b>%s</b>
+SentToSuppliers=Odesláno prodejcům
+ListOfSupplierOrders=Seznam objednávek
+MenuOrdersSupplierToBill=Objednávky k fakturám
+NbDaysToDelivery=Dodací lhůta (dny)
+DescNbDaysToDelivery=Nejdelší dodací lhůta produktů z této objednávky
+SupplierReputation=Reputace prodejce
+DoNotOrderThisProductToThisSupplier=Ne objednávejte
+NotTheGoodQualitySupplier=Nízká kvalita
+ReputationForThisProduct=Pověst
+BuyerName=Jméno kupujícího
+AllProductServicePrices=Všechny ceny produktů / služeb
+AllProductReferencesOfSupplier=Všechny reference dodavatele
+BuyingPriceNumShort=Ceny prodejců
diff --git a/htdocs/langs/cs_CZ/ticket.lang b/htdocs/langs/cs_CZ/ticket.lang
index 7584a4ffc07..83a4e3cd4e6 100644
--- a/htdocs/langs/cs_CZ/ticket.lang
+++ b/htdocs/langs/cs_CZ/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Smazáno
 
 # Dict
 Type=Typ
-Category=Analytický kód
 Severity=Vážnost
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automaticky přiřadit uživateli, který vytvořil lís
 TicketsAutoAssignTicketHelp=Při tvorbě vstupenky může být uživateli automaticky přiřazen lístek.
 TicketNumberingModules=Modul číslování vstupenek
 TicketNotifyTiersAtCreation=Upozornit subjekt na vytvoření
-TicketGroup=Skupina
 TicketsDisableCustomerEmail=Pokud je lístek vytvořen z veřejného rozhraní, vždy zakažte e-maily
 TicketsPublicNotificationNewMessage=Po přidání nové zprávy odešlete e-mail(y)
 TicketsPublicNotificationNewMessageHelp=Odeslat e-mail(y) při přidání nové zprávy z veřejného rozhraní (přiřazenému uživateli nebo e-mailu s oznámením do (aktualizace) a/nebo e-mailu s oznámením do)
@@ -162,7 +160,7 @@ CreatedBy=Vytvořil
 NewTicket=Nová vstupenka
 SubjectAnswerToTicket=Odpověď na lístek
 TicketTypeRequest=Typ požadavku
-TicketCategory=Analytický kód
+TicketCategory=Skupina
 SeeTicket=Viz lístek
 TicketMarkedAsRead=Lístek byl označen jako přečtený
 TicketReadOn=Číst dál
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index 83d483648c6..3346f1c50ef 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -20,11 +20,11 @@ DeleteAUser=Vymazat uživatele
 EnableAUser=Povolit uživatele
 DeleteGroup=Vymazat
 DeleteAGroup=Smazat skupinu
-ConfirmDisableUser=Jste si jisti, že chcete zakázat uživatele <b> %s </ b>?
-ConfirmDeleteUser=Jste si jisti, že chcete smazat uživatele <b> %s </ b>?
-ConfirmDeleteGroup=Jste si jisti, že chcete smazat skupinu <b> %s </ b>?
+ConfirmDisableUser=Opravdu chcete deaktivovat uživatele <b> %s </b>?
+ConfirmDeleteUser=Opravdu chcete smazat uživatele <b> %s </b>?
+ConfirmDeleteGroup=Opravdu chcete smazat skupinu <b> %s </b>?
 ConfirmEnableUser=Jste si jisti, že chcete povolit uživatele <b>%s?</b>
-ConfirmReinitPassword=Jste si jisti, že chcete vytvořit nové heslo pro uživatele <b> %s </ b>?
+ConfirmReinitPassword=Opravdu chcete vygenerovat nové heslo pro uživatele <b> %s </b>?
 ConfirmSendNewPassword=Jste si jisti, že chcete vytvořit a odeslat nové heslo uživateli <b>%s?</b>
 NewUser=Nový uživatel
 CreateUser=Vytvořit uživatele
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Zakázán v režimu údržby
 UserAccountancyCode=Účetní kód uživatele
 UserLogoff=odhlášení uživatele
 UserLogged=přihlášený uživatel
+DateOfEmployment=Datum zaměstnání
 DateEmployment=Datum zahájení zaměstnání
 DateEmploymentEnd=Datum ukončení zaměstnání
 CantDisableYourself=Nelze zakázat vlastní uživatelský záznam
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Vynutit validátor žádosti o dovolenou
 ValidatorIsSupervisorByDefault=Ve výchozím nastavení je validátor nadřazený nad uživatelem. Chcete-li zachovat toto chování, ponechte prázdné.
 UserPersonalEmail=Osobní email
 UserPersonalMobile=Osobní mobilní telefon
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index d986b10c558..a91cf601e84 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -16,7 +16,7 @@ WEBSITE_ROBOT=Soubor pro roboty (soubor robots.txt)
 WEBSITE_HTACCESS=Soubor .htaccess
 WEBSITE_MANIFEST_JSON=Soubor manifest.json webové stránky
 WEBSITE_README=Soubor README.md
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
+WEBSITE_KEYWORDSDesc=Hodnoty oddělte čárkou
 EnterHereLicenseInformation=Sem zadejte metadata nebo licenční informace a vyplňte soubor README.md. Pokud distribuujete svůj web jako šablonu, bude soubor zahrnut do temptátového balíčku.
 HtmlHeaderPage=Záhlaví HTML (pouze pro tuto stránku)
 PageNameAliasHelp=Název nebo alias stránky. <br> Tento alias je také používán k vytvoření adresy URL při běhu webových stránek z virtuálního hostitele webového serveru (jako Apacke, Nginx, ...). Pomocí tlačítka "<strong> %s </strong>" upravte tento alias.
@@ -60,8 +60,8 @@ SyntaxHelp=Nápověda ke konkrétním tipům pro syntaxi
 YouCanEditHtmlSourceckeditor=Zdrojový kód HTML můžete upravit pomocí tlačítka "Zdroj" v editoru.
 YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=Pro obraz sdílený pomocí sdíleného odkazu (otevřený přístup pomocí klíče sdílení hash souboru) je syntaxe: <br> <strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSourceMore= <br> Další příklady HTML nebo dynamického kódu jsou k dispozici na <a href="%s" target="_blank"> wiki dokumentaci </a> <br>.
 ClonePage=Klonovat stránku / kontejner
 CloneSite=Kopie stránky
 SiteAdded=Webová stránka byla přidána
@@ -124,7 +124,7 @@ ShowSubContainersOnOff=Režim provádění „dynamického obsahu“ je %s
 GlobalCSSorJS=Globální soubor CSS / JS / Header na webové stránce
 BackToHomePage=Zpět na domovskou stránku...
 TranslationLinks=Překladové odkazy
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
+YouTryToAccessToAFileThatIsNotAWebsitePage=Pokusíte se o přístup na stránku, která není k dispozici. <br> (ref = %s, typ = %s, status = %s)
 UseTextBetween5And70Chars=Pro osvědčené postupy SEO použijte text mezi 5 a 70 znaky
 MainLanguage=Hlavní jazyk
 OtherLanguages=Jiné jazyky
@@ -134,4 +134,4 @@ AvailableLanguagesAreDefinedIntoWebsiteProperties=Dostupné jazyky jsou definov
 ReplacementDoneInXPages=Výměna se provádí na stránkách nebo kontejnerech %s
 RSSFeed=RSS Feed
 RSSFeedDesc=Pomocí této adresy URL můžete získat RSS kanál nejnovějších článků typu blogpost
-PagesRegenerated=%s page(s)/container(s) regenerated
+PagesRegenerated=%s regenerováno stránky / kontejnery
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index 153688ffecf..1d5f1bb8ada 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+CustomersStandingOrdersArea=Platby příkazu k inkasu
+SuppliersStandingOrdersArea=Platby převodem
 StandingOrdersPayment=Inkasní příkazy k úhradě
 StandingOrderPayment=Příkaz k inkasu
 NewStandingOrder=Nový příkaz k inkasu
@@ -10,37 +10,37 @@ PaymentByBankTransferReceipts=Příkazy k úhradě
 PaymentByBankTransferLines=Řádky bankovních převodů
 WithdrawalsReceipts=příkazy k inkasu
 WithdrawalReceipt=Trvalý příkaz
-BankTransferReceipts=Credit transfer order
-BankTransferReceipt=Credit transfer order
+BankTransferReceipts=Příkazy k úhradě
+BankTransferReceipt=Příkaz k převodu
 LatestBankTransferReceipts=Poslední příkazy k úhradě %s
 LastWithdrawalReceipts=Poslední %s soubory inkasní
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Řádek přímého inkasa
+CreditTransferLine=Řádek na úhradu
 WithdrawalsLines=Řádky výběrů
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+CreditTransferLines=Řádky na úhradu
+RequestStandingOrderToTreat=Žádosti o zpracování příkazu k inkasu
+RequestStandingOrderTreated=Byly zpracovány žádosti o příkaz k inkasu
+RequestPaymentsByBankTransferToTreat=Žádosti o převod kreditu ke zpracování
+RequestPaymentsByBankTransferTreated=Žádosti o úhradu zpracovány
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Zatím to není možné. Před prohlášením o odmítnutí na konkrétních řádcích musí být stav výběru zrušen.
 NbOfInvoiceToWithdraw=Počet kvalifikovaných zákaznických faktur s čekající inkasní objednávkou
 NbOfInvoiceToWithdrawWithInfo=Počet zákaznických faktur s inkasními platebními příkazy s definovanými informacemi o bankovním účtu
 NbOfInvoiceToPayByBankTransfer=Počet faktur kvalifikovaných dodavatelů čekajících na platbu převodem
 SupplierInvoiceWaitingWithdraw=Faktura dodavatele čekající na platbu převodem
 InvoiceWaitingWithdraw=Faktura čeká na inkaso
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Faktura čeká na převod peněz
 AmountToWithdraw=Částka výběru
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=Neexistuje žádná otevřená faktura pro „%s“. Na kartě faktury přejděte na kartu „%s“ a požádejte o ni.
 NoSupplierInvoiceToWithdraw=Čeká dodavatelská faktura s otevřeným „přímým požadavkem na kredit“. Na kartě faktury přejděte na kartu „%s“ a požádejte o ni.
 ResponsibleUser=Odpovědný uživatel
 WithdrawalsSetup=Nastavení platby inkasem
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Nastavení úhrady
 WithdrawStatistics=Statistiky plateb přímého inkasa
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Statistiky převodů
 Rejects=Odmítnuto
 LastWithdrawalReceipt=Poslední %s přímého inkasa debetní
 MakeWithdrawRequest=Zadejte žádost o platbu inkasem
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Proveďte žádost o převod
 WithdrawRequestsDone=%s zaznamenané žádosti o inkaso
 ThirdPartyBankCode=Kód banky subjektu
 NoInvoiceCouldBeWithdrawed=Žádná faktura nebyla odepsána úspěšně. Zkontrolujte, zda jsou faktury u společností s platným IBAN a zda má IBAN UMR (Unique Mandate Reference) s režimem <strong> %s </strong>.
@@ -53,7 +53,7 @@ Lines=Řádky
 StandingOrderReject=Vydat odmítnutí
 WithdrawsRefused=Přímé inkaso odmítnuto
 WithdrawalRefused=Výběr odmítnut
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Kreditní převody odmítnuty
 WithdrawalRefusedConfirm=Opravdu chcete zadat odmítnutí výběru společnosti
 RefusedData=Datum odmítnutí
 RefusedReason=Důvod odmítnutí
@@ -63,7 +63,9 @@ InvoiceRefused=Faktura odmítnuta (Účtujte odmítnutí k zákazníkovi)
 StatusDebitCredit=Stav debetní / kreditní
 StatusWaiting=Čekání
 StatusTrans=odesláno
+StatusDebited=Debited
 StatusCredited=Připsání
+StatusPaid=Placeno
 StatusRefused=Odmítnutí
 StatusMotif0=Nespecifikovaný
 StatusMotif1=Nedostatek finančních prostředků
@@ -77,13 +79,13 @@ StatusMotif8=Jiný důvod
 CreateForSepaFRST=Vytvoření souboru s inkasem (SEPA FRST)
 CreateForSepaRCUR=Vytvořte soubor inkasa (SEPA RCUR)
 CreateAll=Vytvořit soubor s inkasem (všechny)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateSepaFileForPaymentByBankTransfer=Vytvoření souboru pro převod kreditů (SEPA)
 CreateGuichet=Pouze kancelář
 CreateBanque=Pouze banky
 OrderWaiting=Čekání na léčbu
-NotifyTransmision=Převod výběru
-NotifyCredit=Výběr kreditu
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Národní převodní číslo
 WithBankUsingRIB=U bankovních účtů pomocí RIB
 WithBankUsingBANBIC=U bankovních účtů pomocí IBAN/BIC/SWIFT
@@ -93,25 +95,26 @@ CreditDate=Kredit na
 WithdrawalFileNotCapable=Nelze generovat soubor výběru příjmu pro vaši zemi %s (Vaše země není podporována)
 ShowWithdraw=Zobrazit příkaz k inkasu
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Pokud však na faktuře dosud nebyl zpracován alespoň jeden příkaz k inkasu, nebude nastavena jako zaplacená, aby bylo možné provést předchozí výběr.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Soubor výběru
+DoStandingOrdersBeforePayments=Na této kartě můžete požádat o příkaz k inkasu. Po dokončení přejděte do nabídky Bank-> Platba inkasem a vygenerujte a spravujte příkaz k inkasu. Když je příkaz k inkasu uzavřen, platby na fakturách budou automaticky zaznamenány a faktury uzavřeny, pokud je zbývající částka k platbě nulová.
+DoCreditTransferBeforePayments=Tato karta umožňuje vyžádat si příkaz k úhradě. Po dokončení přejděte do nabídky Bank-> Platba převodem, abyste vygenerovali a spravovali příkaz k úhradě. Když je příkaz k úhradě uzavřen, bude automaticky zaznamenána platba na fakturách a faktury uzavřeny, pokud je zbývající částka k platbě nulová.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Nastavte na stav "Odeslaný soubor"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Zaznamenají se také platby na fakturách a klasifikují se jako „placené“, pokud je zbývající částka k zaplacení nulová
 StatisticsByLineStatus=Statistika podle stavu řádků
 RUM=UMR
 DateRUM=Povinné datum podpisu
-RUMLong=Unikátní Mandát Referenční
+RUMLong=Unikátní odkaz na mandát
 RUMWillBeGenerated=Pokud je prázdná, po uložení informací o bankovním účtu se vytvoří UMR (jedinečný mandátový odkaz).
 WithdrawMode=Režim přímé inkaso (FRST nebo opakovat)
 WithdrawRequestAmount=Množství přání inkasa
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Částka žádosti o převod:
 WithdrawRequestErrorNilAmount=Nelze vytvořit inkasa Žádost o prázdnou hodnotu.
 SepaMandate=Mandát přímého inkasa SEPA
 SepaMandateShort=SEPA Mandát
 PleaseReturnMandate=Prosím, vraťte tento mandát formulář poštou na adresu %s nebo poštou na adresu
 SEPALegalText=Podpisem tohoto mandátu formuláře opravňujete (A) %s zaslat instrukce do své banky, aby vrub vašeho účtu a (b) vaše banka k tíži účtu v souladu s pokyny od %s. Jako součást svých práv, máte nárok na vrácení peněz od banky v souladu s podmínkami a podmínkami vaší smlouvy se svou bankou. Náhrada musí být uplatněna nejpozději do 8 týdnů od data, kdy byl váš účet odepsána. Vaše práva týkající se výše uvedeného pověření jsou vysvětleny v prohlášení, které můžete získat od své banky.
-CreditorIdentifier=věřitel Identifier
+CreditorIdentifier=Identifikátor věřitele
 CreditorName=Název věřitele
 SEPAFillForm=(B) Vyplňte prosím všechna pole označená *
 SEPAFormYourName=Vaše jméno
@@ -120,7 +123,8 @@ SEPAFormYourBIC=Váš identifikační kód banky (BIC)
 SEPAFrstOrRecur=Způsob platby
 ModeRECUR=Opakovaná platba
 ModeFRST=Jednorázová platba
-PleaseCheckOne=Zkontrolujte prosím jen jeden
+PleaseCheckOne=Zkontrolujte prosím pouze jednu
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Byla vytvořena objednávka inkasa %s
 AmountRequested=Požadovaná částka
 SEPARCUR=SEPA CUR
@@ -131,7 +135,7 @@ ICS=Identifikátor věřitele CI
 END_TO_END="EndToEndId" SEPA XML tag - jedinečný identifikátor přiřazený ke každé transakci
 USTRD="Nestrukturovaná" značka SEPA XML
 ADDDAYS=Přidání dnů do data provedení
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=U tohoto subjektu nebyl nalezen žádný výchozí IBAN
 ### Notifications
 InfoCreditSubject=Placení inkasní příkaz k úhradě %s bankou
 InfoCreditMessage=Trvalý příkaz %s byl vyplacen bankou <br> Údaje o platbě: %s
@@ -141,3 +145,4 @@ InfoTransData=Částka: %s<br>Metoda: %s<br>Datum: %s
 InfoRejectSubject=Příkaz k inkasu odmítnut
 InfoRejectMessage=Dobrý den, <br> <br> příkaz k inkasu faktury %s týkající se společnosti %s, částkou %s, byla bankou odmítnuta. <br> <br> - <br> %s
 ModeWarning=Volba pro reálný režim nebyl nastaven, můžeme zastavit tuto simulaci
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/cs_CZ/workflow.lang b/htdocs/langs/cs_CZ/workflow.lang
index efd2eed1d14..3e06aed94aa 100644
--- a/htdocs/langs/cs_CZ/workflow.lang
+++ b/htdocs/langs/cs_CZ/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Nastavení workflow modulu
-WorkflowDesc=Tento modul je určen k úpravě chování automatických akcí, v aplikaci. Ve výchozím nastavení workflow je otevřen (uděláte něco, co chcete). Můžete aktivovat automatické akce, které jsou zajímavé.
+WorkflowDesc=Tento modul poskytuje několik automatických akcí. Ve výchozím nastavení je pracovní postup otevřený (můžete dělat věci v pořadí, které chcete), ale zde můžete aktivovat některé automatické akce.
 ThereIsNoWorkflowToModify=Workflow zde není nastaven, můžete upravit modul pokud ho chcete aktivovat.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatické vytvoření objednávky prodeje po podpisu obchodního návrhu (nová objednávka bude mít stejnou částku jako návrh)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automaticky vytvořit zákaznickou fakturu po podpisu obchodního návrhu (nová faktura bude mít stejnou částku jako návrh)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automaticky vytvoří zákaznickou faktury poté, co smlouva byla ověřena
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automaticky vytvořit zákaznickou fakturu po uzavření prodejní objednávky (nová faktura bude mít stejnou částku jako objednávka)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Zařadit návrh propojeného zdroje jako fakturovaný, když je objednávka prodeje nastavena na fakturaci (a pokud je výše objednávky shodná s celkovou částkou podepsaného propojeného návrhu)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Zařadit návrh propojeného zdroje jako fakturovaný při potvrzení faktury zákazníka (a pokud je částka faktury shodná s celkovou částkou podepsaného propojeného návrhu)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Zařadit propojenou prodejní objednávku jako fakturovanou při ověření faktury zákazníka (a pokud je částka faktury shodná s celkovou částkou propojené objednávky)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Zařadit propojenou prodejní objednávku jako fakturovanou, když je zákaznická faktura nastavena jako zaplacená (a pokud je částka faktury shodná s celkovou částkou propojené objednávky)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klasifikujte propojenou prodejní objednávku dodávanou při ověření zásilky (a pokud je množství odeslané všemi zásilkami stejné jako v aktualizovaném pořadí)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Označte návrh dodavatele propojeného zdroje jako fakturovaný při validaci dodavatele (a pokud je částka faktury shodná s celkovou částkou propojeného návrhu)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Zařadit propojenou objednávku zdroje jako fakturovanou fakturaci dodavatele (a pokud je částka faktury shodná s celkovou částkou propojené objednávky)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatická tvorba
 AutomaticClassification=Automatická klasifikace
diff --git a/htdocs/langs/cs_CZ/zapier.lang b/htdocs/langs/cs_CZ/zapier.lang
index 406cc11f80d..605cf509252 100644
--- a/htdocs/langs/cs_CZ/zapier.lang
+++ b/htdocs/langs/cs_CZ/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier pro Dolibarr modul
 # Admin page
 #
 ZapierForDolibarrSetup = Nastavení Zapieru pro Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 9952ccdde2a..b600c4805fe 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Tillad at administrere forskellige antal nuller i slutnin
 BANK_DISABLE_DIRECT_INPUT=Deaktiver direkte registrering af transaktionen på bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivér udkast til eksport på Journal
 ACCOUNTANCY_COMBO_FOR_AUX=Aktivér kombinationsliste for subsidiær konto (kan være langsom, hvis du har en masse tredjeparter)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Salgskladde
 ACCOUNTING_PURCHASE_JOURNAL=Indkøbskladde
@@ -284,6 +285,7 @@ ShowTutorial=Vis selvstudie
 NotReconciled=Ikke afstemt
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Anvend massekategorier
 AddAccountFromBookKeepingWithNoCategories=Tilgængelig konto endnu ikke i den personaliserede gruppe
 CategoryDeleted=Kategori for regnskabskonto er blevet slettet
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 21c89acd158..2d6fe963905 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Standard afsender email til manuel afsendelse (Bruger
 UserEmail=Bruger e-mail
 CompanyEmail=Firma Email
 FeatureNotAvailableOnLinux=Funktionen ikke til rådighed på Unix-lignende systemer. Test din sendmail program lokalt.
+FixOnTransifex=Fix oversættelsen på projektets online oversættelsesplatform
 SubmitTranslation=Hvis oversættelsen for dette sprog ikke er komplet, eller du finder fejl, kan du rette det ved at redigere filer i mappen <b> langs / %s </b> og indsende din ændring til www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Hvis oversættelsen for dette sprog ikke er færdigt, eller du finder fejl, kan du rette dette ved at redigere filer i mappen <b> langs / %s </b> og indsende ændrede filer på dolibarr.org/forum eller til udviklere på github.com/ Dolibarr / Dolibarr.
+SubmitTranslationENUS=Hvis oversættelsen til dette sprog ikke er komplet, eller du finder fejl, kan du rette dette ved at redigere filer i bibliotek <b>langs /%s</b> og indsende ændrede filer på dolibarr.org/forum eller, hvis du er en udvikler, med en PR på github.com/ Dolibarr / Dolibarr
 ModuleSetup=Modulopsætning
 ModulesSetup=Moduler / Applikation sætop
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modul <b>%s</b> skal være aktiveret, hvis du har brug
 SecurityToken=Nøglen til sikker URL'er
 NoSmsEngine=Ingen SMS afsender manager tilgængelig. En SMS-afsender manager er ikke installeret med standardfordelingen, fordi de afhænger af en ekstern leverandør, men du kan finde nogle på %s
 PDF=PDF
-PDFDesc=Globale muligheder for PDF generation.
-PDFAddressForging=Regler for adressekasser
+PDFDesc=Globale muligheder for PDF generation
+PDFAddressForging=Regler for adresse sektion
 HideAnyVATInformationOnPDF=Skjul alle oplysninger relateret til salgsafgift / moms
 PDFRulesForSalesTax=Regler for salgs moms
 PDFLocaltax=Regler for %s
-HideLocalTaxOnPDF=Skjul %s sats i kolonne Skatteudsalg
+HideLocalTaxOnPDF=Skjul %s sats i kolonnen Salgsmoms / moms
 HideDescOnPDF=Skjul produktbeskrivelse
 HideRefOnPDF=Skjul produkter ref.
 HideDetailsOnPDF=Skjul produktlinjer detaljer
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Rediger priser med basisreferenceværdi defineret på
 MassConvert=Start bulkkonvertering
 PriceFormatInCurrentLanguage=Prisformat på nuværende sprog
 String=String
+String1Line=String (1 line)
 TextLong=Lang tekst
+TextLongNLines=Long text (n lines)
 HtmlText=Html tekst
 Int=Heltal
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Forvaltning af kontrakter (tjenester eller tilbagevendende abonneme
 Module55Name=Stregkoder
 Module55Desc=Stregkoder administration
 Module56Name=Betaling med kreditoverførsel
-Module56Desc=Håndtering af betaling af leverandører ved kredit overførsels ordrer. Det inkluderer generation af SEPA-filer til europæiske lande.
-Module57Name=Bank Direkte Debit betalinger
-Module57Desc=Forvaltning af ordrer med direkte debitering. Det omfatter generering af SEPA-fil for europæiske lande.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integration
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Opret/rediger ydelser
 Permission534=Slet ydelser
 Permission536=Se/administrer skjulte ydelser
 Permission538=Eksport af tjenesteydelser
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Læs regninger af materialer
 Permission651=Opret / opdater materialeregninger
 Permission652=Slet materialeregninger
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Læs donationer
 Permission702=Opret/rediger donationer
 Permission703=Slet donationer
@@ -848,6 +858,8 @@ Permission773=Slet udgiftsrapporter
 Permission774=Læs alle udgiftsrapporter (selv for brugere, der ikke er underordnede)
 Permission775=Godkendelse af udgiftsrapporter
 Permission776=Betalingsomkostningsrapporter
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Eksportudgiftsrapporter
 Permission1001=Læs bestande
 Permission1002=Opret/rediger varehuse
@@ -900,6 +912,7 @@ Permission2515=Opsæt dokumentdokumenter
 Permission2801=Brug FTP-klient i læsemodus (kun gennemse og download)
 Permission2802=Brug FTP-klient i skrivefunktion (slet eller upload filer)
 Permission3200=Læs arkiverede begivenheder og fingeraftryk
+Permission3301=Generate new modules
 Permission4001=Se medarbejdere
 Permission4002=Opret medarbejdere
 Permission4003=Slet medarbejdere
@@ -947,7 +960,8 @@ Permission63003=Slet ressourcer
 Permission63004=Link ressourcer til begivenheder i tidsplan
 DictionaryCompanyType=Tredjepartstyper
 DictionaryCompanyJuridicalType=Tredjeparts juridiske enheder
-DictionaryProspectLevel=Kundepotentiale
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Stater / provinser
 DictionaryRegion=Regioner
 DictionaryCountry=Lande
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email skabeloner
 DictionaryUnits=Enheder
 DictionaryMeasuringUnits=Måleenheder
 DictionarySocialNetworks=Sociale netværk
-DictionaryProspectStatus=Status på potentielle kunde
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Typer af orlov
 DictionaryOpportunityStatus=Ledestatus for projekt / bly
 DictionaryExpenseTaxCat=Udgiftsrapport - Transportkategorier
@@ -1076,7 +1091,7 @@ LoginPage=Login side
 BackgroundImageLogin=Baggrundsbillede
 PermanentLeftSearchForm=Faste search form på venstre menu
 DefaultLanguage=Standard sprog
-EnableMultilangInterface=Aktivér multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Vis firmaets logo i menuen
 CompanyInfo=Virksomhed/Organisation
 CompanyIds=Virksomhed / Organisations identiteter
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Et søgekriterium kræves i det mindste f
 NewTranslationStringToShow=Ny oversættelsestreng, der skal vises
 OriginalValueWas=Den oprindelige oversættelse overskrives. Oprindelig værdi var: <br> <br> %s
 TransKeyWithoutOriginalValue=Du har tvinget en ny oversættelse til oversættelsessnøglen '<strong> %s </ strong>', der ikke findes i nogen sprogfiler
-TotalNumberOfActivatedModules=Aktiveret applikation / moduler: <b> %s </b> / <b> %s </b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du skal i det mindste aktivere 1 modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke fundet i PHP-sti
 YesInSummer=Ja om sommeren
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Brug begivenhedstyper (styret i menuopsætning -> Ordbøge
 AGENDA_USE_EVENT_TYPE_DEFAULT=Indstil denne standardværdi automatisk for type begivenhed i begivenhedsoprettelsesformular
 AGENDA_DEFAULT_FILTER_TYPE=Indstil denne type begivenhed automatisk i søgefilter i dagsordblik
 AGENDA_DEFAULT_FILTER_STATUS=Indstil denne status automatisk for begivenheder i søgefilter i dagsordblik
-AGENDA_DEFAULT_VIEW=Hvilket faneblad, der skal åbnes som standard, når menuen Tidsplan vælges
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Aktivér hændelsespåmindelse <b> via e-mails </b> (påmindelsesindstilling / forsinkelse kan defineres på hver hændelse). Bemærk: Modul <strong> %s </strong> skal være aktiveret og korrekt konfigureret for at få påmindelse sendt med den korrekte frekvens.
 AGENDA_REMINDER_BROWSER=Aktivér hændelsespåmindelse <b> på brugerens browser </ b> (når hændelsesdatoen er nået, kan hver bruger nægte dette fra browserbekræftelsesspørgsmålet)
 AGENDA_REMINDER_BROWSER_SOUND=Aktivér lydmeddelelse
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Vis linkede objekter i tidsplanvisning
 ##### Clicktodial #####
 ClickToDialSetup=Opsætning af Klik-for-at-ringe-modulet
 ClickToDialUrlDesc=Url kaldes, når man klikke på telefon billed. I URL kan du bruge tags <br> <b> __ PHONETO __ </b>, der vil blive erstattet med telefonnummeret til den person, der skal ringe <br> <b> __ PHONEFROM __ </b>, der vil blive erstattet med telefonnummeret til opkaldet person (din) <br> <b> __ LOGIN __ </b>, der vil blive erstattet med clicktodial login (defineret på brugerkort) <br> <b> __ PASS __ </b>, der vil blive erstattet med clicktodial adgangskode (defineret på bruger kort).
-ClickToDialDesc=Dette modul gør telefonnumre til klikbare links. Et klik på ikonet vil få dit telefonopkald til nummeret. Dette kan bruges til at ringe til et callcenter-system fra Dolibarr, der f.eks. Kan ringe til telefonnummeret på et SIP-system.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Brug kun et link "tel:" på telefonnumre
 ClickToDialUseTelLinkDesc=Brug denne metode, hvis dine brugere har en softphone eller en software-grænseflade installeret på samme computer som browseren, og kaldes, når du klikker på et link i din browser, der starter med "tel:". Hvis du har brug for en fuld serverløsning (uden brug af lokal softwareinstallation), skal du indstille dette til "Nej" og udfylde næste felt.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Dette felt indeholder en reference til at identificere linje. Indta
 Enter0or1=Tryk 0 eller 1
 UnicodeCurrency=Indtast her mellem seler, liste over byte nummer, der repræsenterer valutasymbolet. For eksempel: for $, indtast [36] - for Brasilien real R $ [82,36] - for €, indtast [8364]
 ColorFormat=RGB-farven er i HEX-format, fx: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Linjens placering i kombinationslister
 SellTaxRate=Salgsskattesats
 RecuperableOnly=Ja for moms "Ikke opfattet, men genoprettelig" dedikeret til nogle stater i Frankrig. Hold værdi til "Nej" i alle andre tilfælde.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Anmodning om citat
 MailToSendSupplierOrder=Indkøbsordre
 MailToSendSupplierInvoice=Leverandørfakturaer
 MailToSendContract=Kontrakter
+MailToSendReception=Modtagelse
 MailToThirdparty=Tredjepart
 MailToMember=Medlemmer
 MailToUser=Brugere
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgængelig. Versi
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgængelig. Version %s er en vedligeholdelsesversion, der indeholder kun fejlrettelser. Vi anbefaler alle brugere at opgradere til denne version. En vedligeholdelsesfrigivelse introducerer ikke nye funktioner eller ændringer i databasen. Du kan hente den fra downloadområdet på https://www.dolibarr.org portal (underkatalog Stable versioner). Du kan læse <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for en komplet liste over ændringer.
 MultiPriceRuleDesc=Når valgmuligheden "Flere prisniveauer pr. Produkt / service" er aktiveret, kan du definere forskellige priser (et pr. Prisniveau) for hvert produkt. For at spare tid, kan du her angive en regel for at autokalulere en pris for hvert niveau baseret på prisen på første niveau, så du skal kun angive en pris for første niveau for hvert produkt. Denne side er designet til at spare dig tid, men er kun nyttig, hvis dine priser for hvert niveau er i forhold til første niveau. Du kan ignorere denne side i de fleste tilfælde.
 ModelModulesProduct=Skabeloner til produktdokumenter
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=For at kunne generere koder automatisk skal du først definere en manager for at definere stregkodenummeret automatisk.
 SeeSubstitutionVars=Se * note for liste over mulige substitutionsvariabler
 SeeChangeLog=Se ChangeLog-fil (kun engelsk)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Venstre margin på PDF
 MAIN_PDF_MARGIN_RIGHT=Højre margin på PDF
 MAIN_PDF_MARGIN_TOP=Top margin på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bundmargen på PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Højde for logo på PDF
 NothingToSetup=Der kræves ingen specifik opsætning for dette modul.
 SetToYesIfGroupIsComputationOfOtherGroups=Indstil dette til ja, hvis denne gruppe er en beregning af andre grupper
 EnterCalculationRuleIfPreviousFieldIsYes=Indtast beregningsregel, hvis tidligere felt blev sat til Ja (For eksempel 'CODEGRP1 + CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Intet gjort
 XEmailsDoneYActionsDone=%s e-mails kvalificerede, %s e-mails er behandlet (for %s-registrering / handlinger udført)
 RecordEvent=Optag email-begivenhed
 CreateLeadAndThirdParty=Opret ledelse (og tredjepart om nødvendigt)
-CreateTicketAndThirdParty=Opret billet (og eventuelt tredjepart)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Antal e-mails i kildekataloget
 LoadThirdPartyFromName=Indlæs tredjeparts søgning på %s (kun belastning)
 LoadThirdPartyFromNameOrCreate=Indlæs tredjepartssøgning på %s (opret hvis ikke fundet)
-WithDolTrackingID=Dolibarr Reference findes i meddelelses-ID
-WithoutDolTrackingID=Dolibarr Reference findes ikke i meddelelses-ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Postnummer
 MainMenuCode=Menu indtastningskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
@@ -1981,7 +2002,7 @@ ImportSetup=Opsætning af modul til import
 InstanceUniqueID=Forekomstets unikke ID
 SmallerThan=Mindre end
 LargerThan=Større end
-IfTrackingIDFoundEventWillBeLinked=Bemærk, at hvis der findes et sporings-ID i indgående e-mail, vil begivenheden automatisk blive knyttet til de relaterede objekter.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Hvis du aktiverer valideringen af 2 trin med en GMail konto, anbefales det at oprette en dedikeret anden adgangskode til applikationen i stedet for at bruge dit eget kontos kodeord fra https://myaccount.google.com/.
 EmailCollectorTargetDir=Det kan være en ønsket opførsel at flytte e-mailen til et andet tag/bibliotek, når den blev behandlet med succes. Angiv blot navnet på kataloget her for at bruge denne funktion (Brug IKKE specialtegn i navnet). Bemærk, at du også skal bruge en læse/skrive logind konto.
 EmailCollectorLoadThirdPartyHelp=Du kan bruge denne handling til at bruge e-mail-indholdet til at finde og indlæse en eksisterende tredjepart i din database. Den fundne (eller oprettede) tredjepart bruges til følgende handlinger, der har brug for det. I parameterfeltet kan du bruge f.eks. 'UDTAGELSE: KROPP: Navn: \\ s ([^ \\ s] *)', hvis du vil udpakke navnet på tredjeparten fra en streng 'Navn: navn for at finde' fundet i legeme.
@@ -2005,3 +2026,7 @@ RssNote=Bemærk: Hver RSS-feed-definition indeholder en widget, som du skal akti
 JumpToBoxes=Gå til Opsætning -> Widgets
 MeasuringUnitTypeDesc=Brug her en værdi som "størrelse", "overflade", "volumen", "vægt", "tid"
 MeasuringScaleDesc=Skalaen er antallet af steder, du skal flytte decimaldelen for at matche standardreferenceenheden. For "tid" -enhedstype er det antallet af sekunder. Værdier mellem 80 og 99 er reserverede værdier.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index d825358e737..e9673610b68 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Antal begivenheder
 ListOfActions=Liste over begivenheder
 EventReports=Hændelsesrapporter
 Location=Placering
-ToUserOfGroup=Til enhver bruger i gruppe
+ToUserOfGroup=Begivenhed tildelt enhver bruger i gruppen
 EventOnFullDay=Begivenhed varer hele dagen
 MenuToDoActions=Alle udestående
 MenuDoneActions=Alle gennemførte
@@ -86,6 +86,8 @@ ProposalDeleted=Forslag slettet
 OrderDeleted=Ordre slettet
 InvoiceDeleted=Faktura slettet
 DraftInvoiceDeleted=Udkast til faktura slettet
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Vare %s oprettet
 PRODUCT_MODIFYInDolibarr=Vare %s ændret
 PRODUCT_DELETEInDolibarr=Vare %s slettet
@@ -158,3 +160,9 @@ DateStartPlusOne=Dato start + 1 time
 SetAllEventsToTodo=Indstil alle begivenheder til at gøre
 SetAllEventsToInProgress=Indstil alle begivenheder til at være i gang
 SetAllEventsToFinished=Indstil alle begivenheder til færdige
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 1fc45108615..81e842e525c 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -37,7 +37,7 @@ IbanValid=BAN gyldig
 IbanNotValid=BAN er ikke gyldigt
 StandingOrders="Direkte debit" ordre
 StandingOrder="Direkte debit" bestiling
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=Betaling med direct debit
 PaymentByBankTransfers=Betalinger ved kreditoverførsel
 PaymentByBankTransfer=Betaling med kreditoverførsel
 AccountStatement=Kontoudtog
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index 4947d3f111b..1481c03b97f 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Leverandør Ordrer: senest %s ændret
 BoxTitleLastModifiedCustomerBills=Kundefakturaer: sidst %s ændret
 BoxTitleLastModifiedCustomerOrders=Salgsordrer: sidst %s ændret
 BoxTitleLastModifiedPropals=Seneste %s tilrettede tilbud
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Kundernes fakturaer
 ForCustomersOrders=Customers orders
 ForProposals=Tilbud
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Midlertidig konto er ikke defineret
 BoxLastCustomerShipments=Sidste kunde forsendelser
 BoxTitleLastCustomerShipments=Nyeste %s forsendelser kunde
 NoRecordedShipments=Ingen registreret kundeforsendelse
+# Pages
+AccountancyHome=Bogføring
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index 824c06fea82..bcba80e2087 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Modulet
 BasicPhoneLayout=Brug grundlæggende layout til telefoner
 SetupOfTerminalNotComplete=Opsætning af terminal %s er ikke afsluttet
 DirectPayment=Direkte betaling
-DirectPaymentButton=Knap med direkte kontant betaling
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Fakturaen er allerede valideret
 NoLinesToBill=Ingen linjer til fakturering
 CustomReceipt=Tilpasset kvittering
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Eksternt modul med ekstra funktioner. Mulighed
 PrintMethod=Udskrivningsmetode
 ReceiptPrinterMethodDescription=Kraftig metode med en masse parametre. Fuld tilpasning med skabeloner. Kan ikke udskrive fra cloud.
 ByTerminal=Med terminal
-TakeposNumpadUsePaymentIcon=Brug betalingsikonet på numerisktastatur 
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Nummereringsmodul til POS-salg
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b>  tag bruges til at tilføje terminal nummere
 TakeposGroupSameProduct=Grupper sammen produktlinjer
 StartAParallelSale=Start et nyt parallelt salg
-ControlCashOpening=Optæl kassen ved åbning af pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Luk kontantindhold
 CashReport=Kontantrapport
 MainPrinterToUse=Fortrukket printer til brug
@@ -112,8 +112,13 @@ RestaurantMenu=Menu
 CustomerMenu=Kunde menu
 ScanToMenu=Scan QR-kode for at se menuen
 ScanToOrder=Scan QR-kode for at bestille
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+Appearance=Udseende
+HideCategoryImages=Skjul Kategori billeder
+HideProductImages=Skjul produktbilleder
+NumberOfLinesToShow=Antal linjer af billeder, der skal vises
+DefineTablePlan=Definer tabeller planlægger
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index bc98ecb15b4..22641410445 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Skat/afgift
 SocialContributions=Skatter/afgifter
 SocialContributionsDeductibles=Fradragsberettigede skatter/afgifter
 SocialContributionsNondeductibles=Ikke-fradragsberettigede skatter/afgifter
+DateOfSocialContribution=Dato for social eller skattemæssig skat
 LabelContrib=Etiketbidrag
 TypeContrib=Type bidrag
 MenuSpecialExpenses=Særlige udgifter
diff --git a/htdocs/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang
index c4130a2f644..346be77971c 100644
--- a/htdocs/langs/da_DK/contracts.lang
+++ b/htdocs/langs/da_DK/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Kørsel tjenester
 MenuExpiredServices=Udløbet tjenester
 MenuClosedServices=Lukket tjenester
 NewContract=Ny kontrakt
-NewContractSubscription=New contract/subscription
+NewContractSubscription=Ny kontrakt eller abonnement
 AddContract=Create contract
 DeleteAContract=Slet en kontrakt
 ActivateAllOnContract=Aktivér alle tjenester
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 92cc702a224..9306acbcee1 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Dårlig syntax for leverandør kode
 ErrorSupplierCodeRequired=Leverandørkode kræves
 ErrorSupplierCodeAlreadyUsed=Leverandørkode allerede brugt
 ErrorBadParameters=Bad parametre
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Forkerte eller manglende parametre
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
 ErrorBadDateFormat=Værdi '%s' har forkert datoformat
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Forbindelse til database fejler. Check databaseserveren kører (for eksempel med mysql / mariadb kan du starte det fra kommandolinjen med 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=Datoen skal være før end i dag
+ErrorDateMustBeInFuture=Datoen skal være efter dags dato
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Ikke tilstrækkelig mængde
 ErrorOnlyOneFieldForGroupByIsPossible=Kun 1 felt for 'Group by' er muligt (andre kasseres)
 ErrorTooManyDifferentValueForSelectedGroupBy=Fundet for mange forskellig værdi (mere end <b>%s</b>) til feltet '<b>%s</b>', så vi ikke kan bruge det som en 'gruppe af' for grafik. Feltet 'Gruppe Af' er blevet fjernet. Kan være du ønskede at bruge det som en X-akse?
 ErrorReplaceStringEmpty=Fejl, strengen, der skal erstattes til, er tom
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) er højere end PHP-parameter post_max_size (%s). Dette er ikke en ensartet opsætning.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang
index ab6bd973969..9a8b424fdfe 100644
--- a/htdocs/langs/da_DK/languages.lang
+++ b/htdocs/langs/da_DK/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=etiopiske
 Language_ar_AR=Arabisk
 Language_ar_EG=Arabisk (Egypten)
 Language_ar_SA=Arabisk
+Language_az_AZ=Aserbajdsjansk
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (Indien)
 Language_bg_BG=Bulgarsk
 Language_bs_BA=Bosnisk
 Language_ca_ES=Catalansk
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=Engelsk (Indien)
 Language_en_NZ=Engelsk (New Zealand)
 Language_en_SA=English (Saudi-Arabien)
+Language_en_SG=Engelsk (Singapore)
 Language_en_US=Engelsk (USA)
 Language_en_ZA=Engelsk (Sydafrika)
 Language_es_ES=Spansk
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spansk (Guatemala)
 Language_es_HN=Spansk (Honduras)
 Language_es_MX=Spansk (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
 Language_es_UY=Spansk (Uruguay)
+Language_es_GT=Spansk (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estisk
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Fransk (Belgien)
 Language_fr_CA=Fransk (Canada)
 Language_fr_CH=Fransk (Schweiz)
+Language_fr_CI=Fransk (Cost Ivory)
+Language_fr_CM=Fransk (Cameroun)
 Language_fr_FR=Fransk
+Language_fr_GA=Fransk (Gabon)
 Language_fr_NC=Fransk (Ny Kaledonien)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=galicisk
 Language_he_IL=Hebræisk
+Language_hi_IN=Hindi (Indien)
 Language_hr_HR=Kroatisk
 Language_hu_HU=Ungarsk
 Language_id_ID=Indonesian
 Language_is_IS=Islandsk
 Language_it_IT=Italiensk
+Language_it_CH=Italiensk (Schweiz)
 Language_ja_JP=Japansk
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,8 +77,9 @@ Language_lv_LV=Lettisk
 Language_mk_MK=Makedonsk
 Language_mn_MN=Mongolian
 Language_nb_NO=Norsk (Bokmål)
+Language_ne_NP=nepalesisk
 Language_nl_BE=Hollandsk (Belgien)
-Language_nl_NL=Dutch
+Language_nl_NL=Hollandske
 Language_pl_PL=Polsk
 Language_pt_BR=Portugisisk (Brasilien)
 Language_pt_PT=Portugisisk
@@ -86,4 +100,5 @@ Language_uz_UZ=Usbekisk
 Language_vi_VN=Vietnamesisk
 Language_zh_CN=Kinesisk
 Language_zh_TW=Kinesisk (traditionelt)
+Language_zh_HK=Kinesisk (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index a2fcde474c6..bfd9b1dd5ea 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Udgående e-mail opsætning (til modul%s)
 DefaultOutgoingEmailSetup=Standard udgående e-mail opsætning
 Information=Information
 ContactsWithThirdpartyFilter=Kontakter med tredjepart filter
+Unanswered=Unanswered
+Answered=Besvaret
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index ccec15bd0f5..3ca6eed1fa6 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=Brutto(Inkl.Moms)
 Amount=Beløb
 AmountInvoice=Fakturabeløbet
 AmountInvoiced=Beløb faktureres
-AmountInvoicedHT=Faktureret beløb (inkl. Moms)
-AmountInvoicedTTC=Faktureret beløb (ekskl. Moms)
+AmountInvoicedHT=Faktureret beløb (ekskl. Moms)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Indbetalingsbeløb
 AmountHTShort=Beløb (ekskl.)
 AmountTTCShort=Beløb (inkl. moms)
@@ -485,6 +485,7 @@ Categories=Tags/kategorier
 Category=Tags/kategori
 By=Ved
 From=Fra
+FromDate=Fra
 FromLocation=Fra
 to=til
 To=til
@@ -687,6 +688,7 @@ Method=Metode
 Receive=Modtag
 CompleteOrNoMoreReceptionExpected=Komplet eller intet mere at forvente
 ExpectedValue=Forventet værdi
+ExpectedQty=Expected Qty
 PartialWoman=Delvis
 TotalWoman=I alt
 NeverReceived=Aldrig modtaget
@@ -703,6 +705,7 @@ MenuECM=Dokumenter
 MenuAWStats=AWStats
 MenuMembers=Medlemmer
 MenuAgendaGoogle=Google dagsorden
+MenuTaxesAndSpecialExpenses=Skatter | Særlige udgifter
 ThisLimitIsDefinedInSetup=Dolibarr grænse (Menu hjemme-setup-sikkerhed): %s Kb, PHP grænse: %s Kb
 NoFileFound=Ingen dokumenter gemt i denne mappe
 CurrentUserLanguage=Valgt sprog
@@ -725,7 +728,7 @@ Page=Side
 Notes=Noter
 AddNewLine=Tilføj ny linje
 AddFile=Tilføj fil
-FreeZone=Ingen registrerede varer/ydelser
+FreeZone=Fritekst produkt
 FreeLineOfType=Fritekst artikel, type:
 CloneMainAttributes=Klon formål med sine vigtigste attributter
 ReGeneratePDF=Re-generer PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=L
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Vælg en Email-skabelon
 SetRef=Sæt ref.
 Select2ResultFoundUseArrows=Nogle resultater fundet. Brug pilene til at vælge.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Skift i redigeringsfunktion for at tilføje ove
 NotUsedForThisCustomer=Ikke brugt til denne kunde
 AmountMustBePositive=Beløbet skal være positivt
 ByStatus=Efter status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index 3bd92cbd594..13cf5a491bc 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -81,7 +81,7 @@ DeleteType=Slet
 VoteAllowed=Afstemning tilladt
 Physical=Fysisk
 Moral=Moral
-MorPhy=Moralske / Fysisk
+MorPhy=Natur
 Reenable=Genaktivere
 ResiliateMember=Afslut en medlem
 ConfirmResiliateMember=Er du sikker på at du vil opsige denne medlem?
diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang
index fb16840d5aa..f9474dbaaf5 100644
--- a/htdocs/langs/da_DK/mrp.lang
+++ b/htdocs/langs/da_DK/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Fremstillingsordrer
 MO=Fremstillingsordre
+MOs=Manufacturing orders
 MRPDescription=Modul til styring af produktions- og produktionsordrer (MO).
 MRPArea=MRP-område
 MrpSetupPage=Opsætning af modul MRP
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index d4108e1bf13..31fb1453cd4 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nDu kan finde vores ordre _
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nVedlagt faktura __REF__ vedhæftet\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nFind forsendelse __REF__ vedhæftet\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nFind intervention __REF__ vedhæftet\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hej)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hej)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hej)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Du kan klikke på linket herunder for at foretage din betaling, hvis den ikke allerede er færdig.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hej)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr er en kompakt ERP / CRM, der understøtter flere forretningsmoduler. En demo, der viser alle moduler, giver ingen mening, da dette scenario aldrig forekommer (flere hundrede tilgængelige). Så flere demo profiler er tilgængelige.
 ChooseYourDemoProfil=Vælg den demoprofil, der passer bedst til dine behov ...
 ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuel modulvalg)
@@ -280,7 +278,9 @@ LinesToImport=Linjer at importere
 
 MemoryUsage=Brug af hukommelse
 RequestDuration=Anmodningens varighed
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Produkter/tjenester efter popularitet i forslag
 PopuCom=Produkter/tjenester efter popularitet i ordrer
 ProductStatistics=Produkter / services statistik
 NbOfQtyInOrders=Antal i ordrer
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 91863253ba2..9a5409b6002 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Vælg stregkodetype
 BarcodeValue=Stregkodeværdi
 NoteNotVisibleOnBill=Note (ikke synlig på fakturaer, tilbud ...)
 ServiceLimitedDuration=Hvis varen er en ydelse med begrænset varighed:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Flere prissegmenter pr. Produkt / service (hver kunde er i et prissegment)
 MultiPricesNumPrices=Antal priser
 DefaultPriceType=Prisgrundlag pr. Standard (med eller uden skat) ved tilføjelse af nye salgspriser
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Sælgerpriser (af produkter eller tjenester)
 CustomCode=Told / vare / HS-kode
 CountryOrigin=Oprindelsesland
 Nature=Produktets art (materiale / færdig)
+NatureOfProductShort=Produktets art
+NatureOfProductDesc=Råmateriale eller færdigt produkt
 ShortLabel=Kort etiket
 Unit=Enhed
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Vælg kombination
 ProductCombinationGenerator=Varianter generator
 Features=Funktioner
 PriceImpact=Prispåvirkning
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Vægtpåvirkning
 NewProductAttribute=Ny attribut
 NewProductAttributeValue=Ny attributværdi
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 645fe6db7bc..b0bac561043 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Bidragyder
 TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragyder
 SelectElement=Vælg element
 AddElement=Link til element
+LinkToElementShort=Link til
 # Documents models
 DocumentModelBeluga=Projektdokumentskabelon for oversigt over objekter
 DocumentModelBaleine=Projektdokumentskabelon til opgaver
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Antal oprettet projekter pr. Måned
 ProjectNbTaskByMonth=Antal oprettet opgaver efter måned
 ProjectOppAmountOfProjectsByMonth=Mængden af ​​kundeemner pr. Måned
 ProjectWeightedOppAmountOfProjectsByMonth=Vægtet antal kundeemner pr. Måned
-ProjectOpenedProjectByOppStatus=Åbn projekt / bly med blystatus
-ProjectsStatistics=Statistik over projekter / ledere
-TasksStatistics=Statistik over projekt / hovedopgaver
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Opgave tildelt. Indtastning af tid på denne opgave skal være muligt.
 IdTaskTime=Id opgave tid
 YouCanCompleteRef=Hvis du ønsker at afslutte ref med et eller flere suffiks, anbefales det at tilføje et - tegn for at adskille det, så den automatiske nummerering stadig fungerer korrekt til næste projekter. For eksempel %s-MYSUFFIX
diff --git a/htdocs/langs/da_DK/recruitment.lang b/htdocs/langs/da_DK/recruitment.lang
new file mode 100644
index 00000000000..c17570af6f4
--- /dev/null
+++ b/htdocs/langs/da_DK/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Rekruttering
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Administrer og følg rekrutteringskampagner til nye stillinger
+
+#
+# Admin page
+#
+RecruitmentSetup = Rekrutteringsopsætning
+Settings = Indstillinger
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Rekrutteringsområde
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Om
+RecruitmentAbout = Om rekruttering
+RecruitmentAboutPage = Rekruttering om side
+NbOfEmployeesExpected=Forventet nb af medarbejdere
+JobLabel=Mærkning af jobposition
+WorkPlace=Arbejdsplads
+DateExpected=Forventet dato
+FutureManager=Fremtidig leder
+ResponsibleOfRecruitement=Ansættelsesansvarlig
+IfJobIsLocatedAtAPartner=Hvis jobbet er placeret på en partner sted
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 04226ca8ff6..b2db5f656a3 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Annuller afsendelse
 DeleteSending=Slet afsendelse
 Stock=Lager
 Stocks=Lagre
-MissingStocks=Missing stocks
-StockAtDate=Lager på dato
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Manglende lagre
+StockAtDate=Lagrene på dato
+StockAtDateInPast=Over dato
+StockAtDateInFuture=Dato i fremtiden
 StocksByLotSerial=Lagerført efter parti/seriel
 LotSerial=Parti/Serienr
 LotSerialList=Liste over partier/seriernr.
@@ -34,7 +34,7 @@ StockMovementForId=Bevægelses-id %d
 ListMouvementStockProject=Liste over lagerbevægelser forbundet med projektet
 StocksArea=Pakhuse
 AllWarehouses=Alle lagre
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Medtag også udefineret ønsket lager
 IncludeAlsoDraftOrders=Medtag også udkast til ordrer
 Location=Placering
 LocationSummary=Kort placerings navn
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Fysisk / reel materiel er den aktuel lager i lageret.
 RealStockWillAutomaticallyWhen=Den reelle bestand ændres i henhold til denne regel (som defineret i Aktiemodulet):
 VirtualStock=Virtual lager
-VirtualStockDesc=Virtuelt lager er det beregnede lager, der er tilgængeligt, når alle åbne / afventende handlinger (som påvirker lagrene) er lukket (modtagne ordreordrer, salgsordrer sendt osv.)
+VirtualStockAtDate=Virtuelt lager på dato
+VirtualStockAtDateDesc=Virtuelt lager, når alle ventende ordrer, der er planlagt udført før datoen, er afsluttet
+VirtualStockDesc=Virtuelt lager er det beregnede lager, der er tilgængeligt, når alle åbne / afventende handlinger (som påvirker lagrene) er lukket (modtagne indkøbsordrer, salgsordrer, produktionsordrer produceret osv.)
 IdWarehouse=Lager ID
 DescWareHouse=Beskrivelse lager
 LieuWareHouse=Lager placering
 WarehousesAndProducts=Varelagre og varer
 WarehousesAndProductsBatchDetail=Lager og produkter (med detaljer pr. Lot / serie)
-AverageUnitPricePMPShort=Gennemsnitlig input pris
-AverageUnitPricePMP=Gennemsnitlig input pris
+AverageUnitPricePMPShort=Værdi
+AverageUnitPricePMPDesc=Den gennemsnitlige input-enhedspris, vi var nødt til at betale til leverandører for at få produktet i vores lager.
 SellPriceMin=Salgsenhed Pris
 EstimatedStockValueSellShort=Værdi for salg
 EstimatedStockValueSell=Værdi for salg
@@ -130,7 +132,7 @@ CurentlyUsingPhysicalStock=Fysiske lager
 RuleForStockReplenishment=Regel for lageropfyldning
 SelectProductWithNotNullQty=Vælg mindst et produkt med et antal ikke nul og en leverandør
 AlertOnly= Kun advarsler
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Medtag også negativt lager for produkter uden defineret ønsket mængde for at gendanne dem til 0
 WarehouseForStockDecrease=Lageret <b> %s </ b> vil blive brugt til lagernedgang
 WarehouseForStockIncrease=Lageret <b> %s </ b> vil blive brugt til lagerforhøjelse
 ForThisWarehouse=Til dette lager
@@ -141,7 +143,7 @@ Replenishments=genopfyldninger
 NbOfProductBeforePeriod=Mængde af produkt %s på lager inden valgt periode (<%s)
 NbOfProductAfterPeriod=Mængde af produkt %s på lager efter valgt periode (> %s)
 MassMovement=Massebehandling
-SelectProductInAndOutWareHouse=Vælg et produkt, en mængde, et kildelager og et mållager, og klik derefter på "%s". Når dette er gjort for alle nødvendige bevægelser, skal du klikke på "%s".
+SelectProductInAndOutWareHouse=Vælg et kildelager og et mållager, et produkt og en mængde, og klik derefter på "%s". Når dette er gjort for alle nødvendige bevægelser, skal du klikke på "%s".
 RecordMovement=Optag overførsel
 ReceivingForSameOrder=Kvitteringer for denne ordre
 StockMovementRecorded=Aktiebevægelser registreret
@@ -234,4 +236,7 @@ ForceTo=Tving til
 AlwaysShowFullArbo=Vis hele træets lagertrin ved pop op af warehouse-links (Advarsel: Dette kan mindske ydeevne dramatisk)
 StockAtDatePastDesc=Du kan her se aktien (ægte aktier) på en given dato i fortiden
 StockAtDateFutureDesc=Du kan her se bestanden (virtuel bestand) på en given dato fremover
-CurrentStock=Current stock
+CurrentStock=Aktuel lager
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index 955fae6de5c..8a16ebe031f 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Lav kvalitet
 ReputationForThisProduct=Omdømme
 BuyerName=Navn på køber
 AllProductServicePrices=Alle produkt- / servicepriser
-AllProductReferencesOfSupplier=Alle produkt / servicereferencer hos leverandøren
+AllProductReferencesOfSupplier=Alle henvisninger til leverandør
 BuyingPriceNumShort=Leverandørpriser
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index f45b737fe9f..9bc8f5b81c7 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Slettet
 
 # Dict
 Type=Type
-Category=Analytisk kode
 Severity=Alvorlighed
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Tildel automatisk brugeren, der oprettede opgaven
 TicketsAutoAssignTicketHelp=Når du opretter en opgave, kan brugeren automatisk tildeles opgaven.
 TicketNumberingModules=Opgave nummerering modul
 TicketNotifyTiersAtCreation=Underret tredjepart ved oprettelsen
-TicketGroup=Gruppe
 TicketsDisableCustomerEmail=Deaktiver altid Emails, når en opgave oprettes fra den offentlige grænseflade
 TicketsPublicNotificationNewMessage=Send e-mail (s), når en ny besked tilføjes
 TicketsPublicNotificationNewMessageHelp=Send e-mail (s), når en ny meddelelse tilføjes fra den offentlige grænseflade (til den tildelte bruger eller meddelelses-e-mailen til (opdatering) og / eller meddelelses-e-mailen til)
@@ -162,7 +160,7 @@ CreatedBy=Lavet af
 NewTicket=Ny opgave
 SubjectAnswerToTicket=Opgave svar
 TicketTypeRequest=Anmodningstype
-TicketCategory=Analytisk kode
+TicketCategory=Gruppe
 SeeTicket=Se opgave
 TicketMarkedAsRead=Opgaven er blevet markeret som læst
 TicketReadOn=Læs videre
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 60ddd269457..88f93206be6 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Deaktiveret i vedligeholdelsestilstand
 UserAccountancyCode=Regnskabskode for bruger
 UserLogoff=Bruger logout
 UserLogged=Bruger logget
+DateOfEmployment=Ansættelsesdato
 DateEmployment=Ansættelsesstartdato
 DateEmploymentEnd=Ansættelses slutdato
 CantDisableYourself=Du kan ikke deaktivere din egen brugerpost
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Tving orlov anmodning validator
 ValidatorIsSupervisorByDefault=Som standard validatoren er supervisor for brugeren. Hold tom for at bevare denne opførsel.
 UserPersonalEmail=Personlig e-mail
 UserPersonalMobile=Personlig mobiltelefon
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 20d2be9829f..0ae1c22b6f9 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -10,8 +10,8 @@ PaymentByBankTransferReceipts=Kredit overførsels ordrer
 PaymentByBankTransferLines=kredit overførsels ordrer Linjer
 WithdrawalsReceipts=Direkte debitordre
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
-BankTransferReceipt=Credit transfer order
+BankTransferReceipts=Kredit overførsels ordrer
+BankTransferReceipt=Kredit overførsels ordre
 LatestBankTransferReceipts=Seneste %s kredit overførsels ordrer
 LastWithdrawalReceipts=Seneste %s direkte debit-filer
 WithdrawalsLine=Linje med direkte debitering
@@ -63,7 +63,9 @@ InvoiceRefused=Faktura nægtet (Oplad afvisningen til kunden)
 StatusDebitCredit=Status debet / kredit
 StatusWaiting=Venter
 StatusTrans=Transmitteret
+StatusDebited=Debited
 StatusCredited=Krediteres
+StatusPaid=Betalt
 StatusRefused=Afviste
 StatusMotif0=Uspecificeret
 StatusMotif1=Levering insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=Andre grunde
 CreateForSepaFRST=Opret direkte debit fil (SEPA FRST)
 CreateForSepaRCUR=Opret direkte debitering fil (SEPA RCUR)
 CreateAll=Opret direkte debitfil (alle)
-CreateFileForPaymentByBankTransfer=Opret kreditoverførsel (alle)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Opret kreditoverførselsfil (SEPA)
 CreateGuichet=Kun kontor
 CreateBanque=Kun bank
 OrderWaiting=Venter på behandling
-NotifyTransmision=Tilbagetrækning Transmission
-NotifyCredit=Tilbagetrækning Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Antal
 WithBankUsingRIB=For bankkonti ved hjælp af RIB
 WithBankUsingBANBIC=For bankkonti ved hjælp af IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Kredit på
 WithdrawalFileNotCapable=Kan ikke generere tilbagekøbskvitteringsfil for dit land %s (Dit land understøttes ikke)
 ShowWithdraw=Vis direkte debiteringsordre
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Hvis fakturaen dog har mindst en betalingsordre til direkte debitering, der endnu ikke er behandlet, indstilles den ikke til at blive betalt for at tillade forudgående udtræksstyring.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Udtagelsesfil
+DoStandingOrdersBeforePayments=Denne fane giver dig mulighed for at anmode om en betalingsordre med direkte debitering. Når det er gjort, skal du gå til menuen Bank-> Betaling med direkte debet for at generere og administrere direkte debetordre. Når ordre med direkte debitering lukkes, registreres betaling på fakturaer automatisk, og fakturaer lukkes, hvis resten til betaling er null.
+DoCreditTransferBeforePayments=Denne fane giver dig mulighed for at anmode om en kredit overførselsordre. Når det er gjort, skal du gå til menuen Bank-> Betaling med kreditoverførsel for at generere og administrere kredit overførselsordren. Når pengeoverførsel er lukket, vil betaling på fakturaer oplysninger registreres automatisk, og fakturaer lukkes, hvis resten til løn er nul.\n 
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Sæt til status "Fil sendt"
 ThisWillAlsoAddPaymentOnInvoice=Dette registrerer også betalinger på fakturaer og klassificerer dem som "Betalt", hvis resterende betaling er null
 StatisticsByLineStatus=Statistikker efter status af linjer
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Betalings type
 ModeRECUR=Tilbagevendende betaling
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Tjek venligst kun en
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direkte debitering %s oprettet
 AmountRequested=Beløb anmodet
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Beløb: %s <br> Methodology: %s <br> Dato: %s
 InfoRejectSubject=Betalingsordren afvises
 InfoRejectMessage=Hej, <br> <br> Betalingsordre for faktura %s relateret til firmaet %s, med et beløb på %s er blevet afvist af banken. <br> <br> <br> <br> %s
 ModeWarning=Mulighed for real mode ikke var indstillet, vi stopper efter denne simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/da_DK/workflow.lang b/htdocs/langs/da_DK/workflow.lang
index 1da27b225ad..a9659eb77ee 100644
--- a/htdocs/langs/da_DK/workflow.lang
+++ b/htdocs/langs/da_DK/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassificer den tilknyttede kildes
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klassificer tilsluttet kildeleverandørforslag som faktureret, når leverandørfakturaen er bekræftet (og hvis fakturaens størrelse er det samme som det samlede beløb for det linkede forslag)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klassificer købt købsordre med kilden som faktureret, når leverandørfakturaen er bekræftet (og hvis fakturaens størrelse er den samme som det samlede beløb for den tilknyttede ordre)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatisk oprettelse
 AutomaticClassification=Automatisk klassificering
diff --git a/htdocs/langs/da_DK/zapier.lang b/htdocs/langs/da_DK/zapier.lang
index 81c99c875b9..27884d7005a 100644
--- a/htdocs/langs/da_DK/zapier.lang
+++ b/htdocs/langs/da_DK/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier til Dolibarr-modul
 # Admin page
 #
 ZapierForDolibarrSetup = Opsætning af Zapier til Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 3c086bfecd7..1e86ef15672 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -152,7 +152,6 @@ MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 MAIN_OPTIMIZEFORCOLORBLINDDesc=Aktiviere diese Option wenn Sie Farbenblind sind, in machen Fällen wird die Farbeinstellung geändert um den Kontrast zu erhöhen.
-IfTrackingIDFoundEventWillBeLinked=Beachten Sie, dass das Ereignis automatisch mit den zugehörigen Objekten verknüpft wird, wenn in der eingehenden E-Mail eine Tracking-ID gefunden wird.
 WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die Überprüfung in zwei Schritten aktiviert haben, wird empfohlen, ein dediziertes zweites Kennwort für die Anwendung zu erstellen, anstatt Ihr eigenes Kontokennwort von https://myaccount.google.com/ zu verwenden.
 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=Endpunkt für %s: %s
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index 545ae518ec7..124392e3512 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -19,7 +19,6 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
 NoRecordFound=Kein Eintrag gefunden
 NoRecordDeleted=Kein Eintrag gelöscht
 NoError=Kein Fehler
diff --git a/htdocs/langs/de_AT/members.lang b/htdocs/langs/de_AT/members.lang
index fbbc8af7928..6686b3d49f0 100644
--- a/htdocs/langs/de_AT/members.lang
+++ b/htdocs/langs/de_AT/members.lang
@@ -16,6 +16,5 @@ SubscriptionLate=Versätet
 NewMemberType=Neues Mitgliedsrt
 Physical=Physisch
 Moral=Rechtlich
-MorPhy=Physisch/Rechtlich
 Filehtpasswd=htpasswd-Datei
 HTPasswordExport=htpassword-Dateierstellung
diff --git a/htdocs/langs/de_AT/projects.lang b/htdocs/langs/de_AT/projects.lang
index febb477ca2a..0b737b1d55e 100644
--- a/htdocs/langs/de_AT/projects.lang
+++ b/htdocs/langs/de_AT/projects.lang
@@ -12,3 +12,4 @@ ProjectContact=Projektansprechpartner
 DoNotShowMyTasksOnly=Zeige auch die Aufgaben Anderer
 TypeContact_project_task_internal_TASKEXECUTIVE=Task Exekutive
 TypeContact_project_task_external_TASKEXECUTIVE=Task Exekutive
+LinkToElementShort=Verknüpfen mit...
diff --git a/htdocs/langs/de_AT/propal.lang b/htdocs/langs/de_AT/propal.lang
index 56b3659b888..c96a462a74a 100644
--- a/htdocs/langs/de_AT/propal.lang
+++ b/htdocs/langs/de_AT/propal.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - propal
 PropalsDraft=Entwurf
 PropalStatusSigned=Unterzeichnet (auf Rechnung)
-PropalStatusClosedShort=geschlossen
 RefProposal=Angebots Nr.
 DatePropal=Datum des Angebots
 DateEndPropal=Ablauf der Bindefrist
diff --git a/htdocs/langs/de_AT/stocks.lang b/htdocs/langs/de_AT/stocks.lang
index 1ce29517677..4ca91729c42 100644
--- a/htdocs/langs/de_AT/stocks.lang
+++ b/htdocs/langs/de_AT/stocks.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - stocks
 Location=Ort
 PMPValue=Warenwert
+AverageUnitPricePMPShort=Warenwert
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index ae4d1317412..07ca78d80ee 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -160,7 +160,6 @@ MAIN_MAIL_DEFAULT_FROMTYPE=E-Mail - Absender für manuell erzeugte Nachrichten (
 UserEmail=Email des Benutzers
 CompanyEmail=Firmen - E-Mailadresse
 SubmitTranslation=Du hast Übersetzungsfehler gefunden? Hilf uns, indem du die Sprachdateien im Verzeichnis '<b>langs/%s</b>' anpasst und die Verbesserungen auf "www.transifex.com/dolibarr-association/dolibarr/" einreichst.
-SubmitTranslationENUS=Sollte die Übersetzung für eine Sprache nicht vollständig sein oder Fehler beinhalten, können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b>  bearbeiten und anschliessend Ihre Änderungen an dolibarr.org/forum oder für Entwickler auf github.com/Dolibarr/dolibarr. übertragen.
 ModulesSetup=Modul-/Applikationseinstellung
 ModuleFamilySrm=Lieferantenbeziehungsmanagement (VRM)
 ModuleFamilyProducts=Produktmanagement (PM)
@@ -202,11 +201,8 @@ ThisForceAlsoTheme=Dieser Menu Manager übersteuert die Benutzereinstellung. Er
 ConnectionTimeout=Zeitüberschreitung in der Verbindung
 ResponseTimeout=Antwort Timeout
 NoSmsEngine=Es ist kein SMS Sendedienst verfügbar.\nIn der Standardinstallation ist keiner installiert, denn das gibt es bei externen Anbietern.\nFinde deinen Anbieter via %s.
-PDFDesc=Globale Einstellungen für automatisch generierte PDFs
-PDFAddressForging=Regeln für Adressfelder
 HideAnyVATInformationOnPDF=Verstecke MWST - Informationen.
 PDFRulesForSalesTax=Regeln für die MWST
-HideLocalTaxOnPDF=Verstecke den %s Satz
 HideDescOnPDF=Verstecke Produktbeschreibungen
 HideRefOnPDF=Verstecke Produktnummern
 HideDetailsOnPDF=Verstecke Produktzeilen
@@ -281,7 +277,6 @@ Module50Desc=Produkteverwaltung
 Module52Name=Produktbestände
 Module53Desc=Dienstleistungen
 Module54Name=Verträge/Abonnements
-Module57Name=Debit - Zahlungen
 Module70Name=Arbeitseinsätze
 Module80Name=Auslieferungen
 Module80Desc=Versand und Lieferverfolgung
@@ -392,7 +387,6 @@ Permission2414=Aktionen und Aufgaben anderer exportieren
 Permission59002=Gewinspanne definieren
 DictionaryCompanyType=Geschäftspartner Typen
 DictionaryCompanyJuridicalType=Rechtsformen von Unternehmen
-DictionaryProspectLevel=Lead-Potenzial
 DictionaryActions=Arten von Kalenderereignissen
 DictionaryVAT=MwSt.-Sätze
 DictionaryPaperFormat=Papierformate
@@ -525,6 +519,7 @@ TypeOfTemplate=Type der Vorlage
 MailToSendProposal=Angebote Kunde
 MailToSendOrder=Kundenbestellungen
 MailToSendIntervention=Arbeitseinsätze
+MailToSendReception=Lieferungen
 MailToThirdparty=Geschäftspartner
 ModelModulesProduct=Vorlage für Produktdokumente
 SeeSubstitutionVars=Siehe * für eine Liste der Verfügbaren Variablen
diff --git a/htdocs/langs/de_CH/agenda.lang b/htdocs/langs/de_CH/agenda.lang
index a3b8a81a70b..69537fa3a04 100644
--- a/htdocs/langs/de_CH/agenda.lang
+++ b/htdocs/langs/de_CH/agenda.lang
@@ -1,9 +1,10 @@
 # Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID Veranstaltung
 Agenda=Terminplanung
 EventReports=Ereignisberichte
-ToUserOfGroup=Für alle Benutzer in der Gruppe
 MenuDoneActions=Alle abgeschl. Termine
 MenuDoneMyActions=Meine abgeschl. Termine
+ActionsAskedBy=Termine eingetragen von
 ViewCal=Kalenderansicht
 ViewPerUser=Benutzeransicht
 ViewPerType=Ansicht pro Typ
@@ -12,6 +13,8 @@ AgendaSetupOtherDesc=Hier gibst Du die Exportoptionen zu externen Kalendern, wie
 EventRemindersByEmailNotEnabled=Benachrichtigungen sind in den Moduleinstellungen deaktiviert (%s).
 NewCompanyToDolibarr=Partner %s erzeugt
 COMPANY_DELETEInDolibarr=Partner %s gelöscht.
+PropalValidatedInDolibarr=Angebot freigegeben
+InvoiceValidatedInDolibarr=Rechnung freigegeben
 MemberModifiedInDolibarr=Mitglied %s bearbeitet
 MemberResiliatedInDolibarr=Mitlglied %s geschlossen.
 MemberSubscriptionAddedInDolibarr=Abonnement %s für Mitlglied %s hinzugefügt
@@ -21,7 +24,12 @@ ShipmentClassifyClosedInDolibarr=Lieferung %s auf verrechnet gesetzt
 ShipmentUnClassifyCloseddInDolibarr=Lieferung %s auf wiedereröffnet gesetzt
 ShipmentBackToDraftInDolibarr=Lieferung %s ist wieder im Entwurfsstatus.
 OrderCreatedInDolibarr=Bestellung %s erzeugt
+OrderDeliveredInDolibarr=Bestellung %s als geliefert markieren
 OrderCanceledInDolibarr=Auftrag storniert %s
+OrderBilledInDolibarr=Bestellung %s als bezahlt markieren
+OrderApprovedInDolibarr=Bestellen %s genehmigt
+OrderRefusedInDolibarr=Bestellung %s abgelehnt
+OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status
 ProposalSentByEMail=Offerte %s per E-Mail versandt
 ContractSentByEMail=Contract %s per E-Mail versandt
 OrderSentByEMail=Bestellung %sper E-Mail versandt
@@ -30,6 +38,7 @@ SupplierOrderSentByEMail=Lieferantenbestellung %sper E-Mail versandt
 ORDER_SUPPLIER_DELETEInDolibarr=Lieferantenbestellung %s  gelöscht
 SupplierInvoiceSentByEMail=Lieferantenrechnung %sper E-Mail versandt
 ShippingSentByEMail=Lieferung %s per E-Mail versandt
+OrderDeleted=Bestellung gelöscht
 PRODUCT_CREATEInDolibarr=Produkt %s erzeugt
 PRODUCT_MODIFYInDolibarr=Produkt %s bearbeitet
 HOLIDAY_CREATEInDolibarr=Ferienantrag %s erzeugt
@@ -55,12 +64,16 @@ MRP_MO_VALIDATEInDolibarr=Arbeitsauftrag (MO) genehmigt
 MRP_MO_PRODUCEDInDolibarr=Arbeitsauftrag (MO) fertig gestellt.
 MRP_MO_DELETEInDolibarr=Arbeitsauftrag (MO) gelöscht
 AgendaModelModule=Vorlagen zum Ereignis
+DateActionEnd=Endet
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> ,zum Aktionen, die nicht vom Benutzer <b>%s</b> sind, anzuzeigen.
 AgendaUrlOptions4=<b>logint=%s</b> ,um Einträge für dem Benutzer <b>%s</b> zugewiesene Aktionen anzuzeigen.
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> um Aktionen vom Projekt <b>__PROJECT_ID__</b> anzuzeigen.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b>, um automatische Einträge auszublenden.
 AgendaUrlOptionsIncludeHolidays=Setze <b>includeholidays=1</b> um Ferien im Kalender anzuzeigen.
 AgendaHideBirthdayEvents=Geburtstage von Kontakten verstecken
+Busy=Besetzt
+DefaultWorkingHours=Reguläre Arbeitszeit pro Tag (z.B. 9-18)
+ExportCal=Export Kalender
 ExtSitesEnableThisTool=Externe Kalender gemäss systemweiten Einstellungen anzeigen. Externe Kalender, die Benutzer definiert haben, sind davon nicht betroffen.
 DateActionBegin=Beginnzeit des Ereignis
 ConfirmCloneEvent=Willst du das Ereignis <b>%s</b> wirklich duplizieren?
diff --git a/htdocs/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang
index 9b8ff55d675..e597dd56def 100644
--- a/htdocs/langs/de_CH/boxes.lang
+++ b/htdocs/langs/de_CH/boxes.lang
@@ -21,8 +21,7 @@ BoxTitleLastRssInfos=%s neueste News von %s
 BoxTitleLastProducts=%s zuletzt bearbeitete Produkte/Leistungen
 BoxTitleLastModifiedSuppliers=%s zuletzt bearbeitete Lieferanten
 BoxTitleLastModifiedCustomers=%s zuletzt bearbeitete Kunden
-BoxTitleLastCustomerBills=%s neueste Kundenrechnungen
-BoxTitleLastSupplierBills=%s neueste Lieferantenrechnungen
+BoxTitleLastCustomersOrProspects=%s neueste Kunden oder Interessenten
 BoxTitleLastModifiedProspects=Interessenten: zuletzt %s geändert
 BoxTitleLastFicheInter=%s zuletzt bearbietet Eingriffe
 BoxTitleOldestUnpaidCustomerBills=Älteste %s offene Kundenrechnungen
@@ -49,6 +48,7 @@ NoTooLowStockProducts=Keine Produkte unter der min. Warenlimite
 BoxProductDistribution=Vertrieb Produkte / Dienstleistungen
 ForObject=Am %s
 BoxTitleLastModifiedSupplierBills=Älteste %s geänderte Lieferantenrechnungen
+BoxTitleLatestModifiedSupplierOrders=%s zuletzt bearbeitete Lieferantenbestellungen
 BoxTitleLastModifiedCustomerBills=Älteste %s geänderte Kundenrechnungen
 BoxTitleLastModifiedCustomerOrders=%s zuletzt bearbeitete Kundenbestellungen
 BoxTitleLastModifiedPropals=%s neueste geänderte Offerten
@@ -65,3 +65,4 @@ SuspenseAccountNotDefined=Es ist kein Wartestellungskonto festgelegt.
 BoxLastCustomerShipments=Letzte Lieferungen an Kunden
 BoxTitleLastCustomerShipments=Die neuesten %s Lieferungen an Kunden
 NoRecordedShipments=Es gibt noch keine Lieferungen an Kunden.
+AccountancyHome=Rechnungswesen
diff --git a/htdocs/langs/de_CH/cashdesk.lang b/htdocs/langs/de_CH/cashdesk.lang
index d2e628d9fca..2c7addd512e 100644
--- a/htdocs/langs/de_CH/cashdesk.lang
+++ b/htdocs/langs/de_CH/cashdesk.lang
@@ -4,3 +4,4 @@ CashDeskBankCheque=Bankkonto(Scheckzahlung)
 TotalTicket=Gesamtanzahl Ticket
 BankToPay=Zahlungskonto
 FilterRefOrLabelOrBC=Suche (Art-Nr./Name)
+Receipt=Beleg
diff --git a/htdocs/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
index ff7bc4d6bcb..aa7f34b7ea1 100644
--- a/htdocs/langs/de_CH/errors.lang
+++ b/htdocs/langs/de_CH/errors.lang
@@ -27,7 +27,6 @@ ErrorPleaseTypeBankTransactionReportName=Gib hier den Bankkontoauszug im Format
 ErrorProdIdAlreadyExist=%s wurde bereits einem Geschäftspartner zugewiesen
 ErrorForbidden3=Es scheint keine ordnungsgemässe Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...)
 ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
-ErrorDateMustBeBeforeToday=Datum darf nicht in der Zukunft sein
 ErrorWarehouseRequiredIntoShipmentLine=Warenlager ist auf der Lieferzeile erforderlich.
 ErrorFileMustHaveFormat=Datei muss das Format %s haben
 ErrorsThirdpartyMerge=Die zwei Einträge können nicht zusammengeführt werden. Aktion abgebrochen.
diff --git a/htdocs/langs/de_CH/hrm.lang b/htdocs/langs/de_CH/hrm.lang
index 4b7bc012ad1..cd212704e9a 100644
--- a/htdocs/langs/de_CH/hrm.lang
+++ b/htdocs/langs/de_CH/hrm.lang
@@ -8,6 +8,5 @@ ConfirmDeleteEstablishment=Willst du diesen Betrieb wirklich löschen?
 OpenEtablishment=Betrieb wählen
 CloseEtablishment=Betrieb schliessen
 DictionaryDepartment=Personalverwaltung - Abteilungsliste
-Employees=Mitarbeiter
 Employee=Mitarbeiter
 NewEmployee=Neuer Mitarbeiter
diff --git a/htdocs/langs/de_CH/mails.lang b/htdocs/langs/de_CH/mails.lang
index 4bd3ed40bc9..3bcda95e62c 100644
--- a/htdocs/langs/de_CH/mails.lang
+++ b/htdocs/langs/de_CH/mails.lang
@@ -4,6 +4,7 @@ MailTitle=Titel
 MailFrom=Absender
 MailErrorsTo=Fehler an
 MailText=E-Mail-Text
+MailMessage=E-Mail Text
 MailingStatusSent=Gesendet
 MailingStatusSentPartialy=Teileweise gesendet
 MailingStatusSentCompletely=Vollständig gesendet
@@ -26,6 +27,7 @@ LimitSendingEmailing=Hinweis: Aus Sicherheits- und Zeitüberschreitungsgründen
 ToAddRecipientsChooseHere=Fügen Sie Empfänger über die Listenauswahl hinzu
 NbOfEMailingsSend=E-Mail-Kampagne versandt
 TagUnsubscribe=Abmelde Link
+NoEmailSentBadSenderOrRecipientEmail=Kein E-Mail gesendet. Ungültige Absender oder Empfänger Adresse. Benutzerprofil kontrollieren.
 NoNotificationsWillBeSent=Für dieses Ereignis und diesen Geschäftspartner sind keine Benachrichtigungen geplant
 ANotificationsWillBeSent=Eine Benachrichtigung wird per E-Mail versandt
 SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 60ec3c2adff..3e5caad9224 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -21,7 +21,6 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 NoTemplateDefined=Für diesen Emailtyp habe ich keine Vorlage..
 AvailableVariables=Verfügbare Ersatzvariablen
-EmptySearchString=Enter non empty search criterias
 NoRecordDeleted=Es wurde kein Datensatz gelöscht
 NotEnoughDataYet=Nicht genügend Daten
 NoError=Kein Fehler
@@ -100,6 +99,8 @@ DurationOfLine=Dauer
 Model=Dokumentenvorlage
 DefaultModel=Standardvorlage
 Connection=Anmeldung
+Alert=Warnung
+Card=Karte
 DateToday=Aktuelles Datum
 DateModificationShort=Änd.Datum
 DateLastModification=Zuletzt geändert am
@@ -182,6 +183,8 @@ DolibarrStateBoard=Datenbankstatistiken
 DolibarrWorkBoard=Offene Aktionen
 NoOpenedElementToProcess=Keine offenen Aktionen
 Categories=Suchwörter/Kategorien
+Category=Stichwort / Kategorie
+FromDate=Von
 FromLocation=Von
 OtherInformations=Weitere Informationen
 Qty=Anz.
@@ -192,6 +195,7 @@ Opened=Offen
 ClosedAll=Geschlossen (alle Typen)
 Size=Grösse
 OriginalSize=Originalgrösse
+Topic=Thema
 ByCompanies=Von Geschäftspartnern
 ByUsers=Nach Benutzer
 NoneOrSeveral=Keine oder einige
@@ -214,6 +218,8 @@ UndoExpandAll=Ausklappen rückgängig machen
 SeeAll=Zeige alles an
 CloseWindow=Fenster schliessen
 SendAcknowledgementByMail=Bestätigungsemail senden
+SendMail=sende E-Mail
+NoEMail=Keine E-Mail
 AlreadyRead=Gelesen
 NoMobilePhone=Kein Mobiltelefon
 ValueIsNotValid=Der Wert ist leider ungültig.
@@ -221,6 +227,7 @@ RecordCreatedSuccessfully=Eintrag erfolgreich erstellt
 RecordsModified=Geänderte Einträge: %s
 RecordsDeleted=Gelöschte Einträge: %s
 RecordsGenerated=Erzeugte Einträge: %s
+MoveBox=Box verschieben
 CompleteOrNoMoreReceptionExpected=Vollständig oder keine Aktionen mehr erwartet
 YouCanChangeValuesForThisListFromDictionarySetup=Du kannst die Werte für diese Liste in Einstellungen -> Stammdaten anpassen.
 YouCanChangeValuesForThisListFrom=Du kannst die Werte für diese Liste im Menu %s einstellen.
@@ -229,7 +236,6 @@ CurrentTheme=Aktuelle Oberfläche
 Screen=Bildschirm
 DateOfSignature=Unterschriftsdatum
 RootOfMedias=Stammverzeichnis für öffentliche Bilder (/medias)
-FreeZone=Nicht hinterlegte Position vom Typ
 FreeLineOfType=Freitext vom Typ
 ReGeneratePDF=PDF erneut erzeugen
 DocumentModelStandardPDF=Standardvorlage (PDF)
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index 567980cd881..4f52f16aa71 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - members
 MemberCard=Mitgliederkarte
+SubscriptionCard=Abo-Karte
 ShowMember=Mitgliederkarte anzeigen
 UserNotLinkedToMember=Benutzer nicht mit einem Mitglied verknüpft
 FundationMembers=Gründungsmitglieder
@@ -13,35 +14,66 @@ MembersListValid=Liste der verifizierten Mitglieder
 MembersListUpToDate=Liste der verifizierten aktiven Mitglieder
 DateSubscription=Start des Abonnements
 DateEndSubscription=Ende des Abonnements
+EndSubscription=Abo-Ende
 SubscriptionId=Abo-ID
 MemberId=Mitgliedernummer
 MemberType=Mitgliederart
 MembersTypes=Mitgliederarten
 MemberStatusDraft=Entwürfe (benötigen Bestätigung)
+MemberStatusNoSubscriptionShort=Bestätigt
+SubscriptionEndDate=Enddatum des Abonnements
+NewSubscription=Neues Abonnement
 NewSubscriptionDesc=Mit diesem Formular können Sie Ihr Abonnement als neues Mitglied der Stiftung registrieren. Wenn Sie Ihr Abonnement verlängern möchten (falls Sie bereits Mitglied sind), wenden Sie sich stattdessen per E-Mail an den Stiftungsrat. %s.
+Subscription=Abonnement
 Subscriptions=Abonnemente
+SubscriptionNotReceived=Abonnement nie erhalten
 ListOfSubscriptions=Liste der Abonnemente
 NewMemberType=Neue Mitgliederart
 WelcomeEMail=Begrüssungs-E-Mail
 SubscriptionRequired=Abonnement notwendig
 VoteAllowed=Abstimmen erlaubt
+DeleteSubscription=Abonnement löschen
+ConfirmDeleteSubscription=Möchten Sie dieses Abonnement wirklich löschen?
+BlankSubscriptionForm=Öffentliches Formular zur Selbstregistrierung
+BlankSubscriptionFormDesc=Dolibarr kann Ihnen eine öffentliche URL / Website zur Verfügung stellen, über die externe Besucher ein Abonnement der Stiftung anfragen können. Wenn ein Online-Zahlungsmodul aktiviert ist, kann auch automatisch ein Zahlungsformular bereitgestellt werden.
+EnablePublicSubscriptionForm=Aktivieren Sie die öffentliche Website mit dem Formular zur Selbstregistrierung
+LastSubscriptionsModified=Letzte %s geänderte Abonnements
+SubscriptionNotRecorded=Abo nicht erfasst
+AddSubscription=Abonnement erstellen
 ShowSubscription=Abonnement anzeigen
+SendingEmailOnAutoSubscription=E-Mail bei automatischer Registrierung senden
+SendingEmailOnNewSubscription=E-Mail bei neuem Abonnement senden
+SendingReminderForExpiredSubscription=Erinnerung für abgelaufene Abonnements senden
+YourSubscriptionWasRecorded=Ihr neues Abonnement wurde aufgenommen
+SubscriptionReminderEmail=Abo-Erinnerung
 CardContent=Inhalt Ihrer Mitgliederkarte
+ThisIsContentOfYourMembershipRequestWasReceived=Wir möchten Sie darüber informieren, dass Ihre Mitgliedschaftsanfrage eingegangen ist. <br><br>
+ThisIsContentOfYourMembershipWasValidated=Wir möchten Sie darüber informieren, dass Ihre Mitgliedschaft mit den folgenden Informationen bestätigt wurde: <br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Wir möchten Sie darüber informieren, dass Ihr neues Abonnement erfasst wurde. <br><br>
+ThisIsContentOfSubscriptionReminderEmail=Wir möchten Sie darüber informieren, dass Ihr Abonnement in Kürze abläuft oder bereits abgelaufen ist (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Wir hoffen, dass Sie es erneuern. <br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Betreff der Benachrichtigungs-E-Mail bei automatischer Anmeldung eines Gastes
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Inhalt der Benachrichtigungs-E-Mail, bei automatischer Anmeldung eines Gastes
 DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=E-Mail-Vorlage zum Senden von E-Mails an ein Mitglied bei Mitglieder-Autoabonnements
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-Mail-Vorlage zum Senden von E-Mails an ein Mitglied bei der Mitgliederüberprüfung
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-Mail-Vorlage zum Senden einer E-Mail an ein Mitglied bei der Aufnahme eines neuen Abonnements
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-Mail-Vorlage zum Senden einer E-Mail an ein Mitglied bei der Erfassung eines neuen Abonnements
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-Mail-Vorlage zum Senden einer E-Mail-Erinnerung, wenn das Abonnement abläuft
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-Mail-Vorlage zum Senden von E-Mails an ein Mitglied bei Kündigung der Mitgliedschaft
 DescADHERENT_MAIL_FROM=Absender E-Mail für automatische E-Mails
 HTPasswordExport=htpassword Datei generieren
 MembersAndSubscriptions=Mitglieder und Abonnemente
 SubscriptionPayment=Zahlung des Mitgliedsbeitrags
+LastSubscriptionDate=Datum der letzten Abo-Zahlung
+LastSubscriptionAmount=Betrag des letzten Abonnements
 MembersStatisticsByCountries=Mitgliederstatistik nach Land
 MembersStatisticsByState=Mitgliederstatistik nach Kanton
 MembersStatisticsByTown=Mitgliederstatistik nach Ort
+MembersStatisticsByRegion=Mitgliederstatistik nach Region
 NoValidatedMemberYet=Keine verifizierten Mitglieder gefunden
 LatestSubscriptionDate=Enddatum des Abonnementes
-Public=Informationen sind öffentlich
-NewMemberbyWeb=Neues Mitglied hinzugefügt. Warten auf Genehmigung
+NewMemberbyWeb=Neues Mitglied wurde hinzugefügt. Warten auf Genehmigung
+SubscriptionsStatistics=Statistiken zu Abonnements
+NbOfSubscriptions=Anzahl der Abonnements
+AmountOfSubscriptions=Anzahl der Abonnements
+SubscriptionRecorded=Abo erfasst
+SendReminderForExpiredSubscriptionTitle=Erinnerung per E-Mail senden, wenn das Abonnement abgelaufen ist
+SendReminderForExpiredSubscription=Erinnerung per E-Mail an Mitglieder senden, wenn das Abonnement abläuft (Parameter ist die Anzahl der Tage vor dem Ende des Abonnements, um die Erinnerung zu senden. Dies kann eine durch ein Semikolon getrennte Liste von Tagen sein, z. B. '10; 5; 0; -5')
diff --git a/htdocs/langs/de_CH/other.lang b/htdocs/langs/de_CH/other.lang
index 4f942e32521..bc73e4c58b0 100644
--- a/htdocs/langs/de_CH/other.lang
+++ b/htdocs/langs/de_CH/other.lang
@@ -8,10 +8,8 @@ Notify_FICHINTER_SENTBYMAIL=Service per E-Mail versendet
 TotalSizeOfAttachedFiles=Gesamtgrösse der angehängten Dateien/Dokumente
 MaxSize=Maximalgrösse
 PredefinedMailContentContract=__(Hallo)__\n\n\n__(Mit freundlichen Grüssen)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__ (Hallo) __ __ (Mit freundlichen Grüssen) __ __USER_SIGNATURE__
-PredefinedMailContentContact=__ (Hallo) __ __ (Mit freundlichen Grüssen) __ __USER_SIGNATURE__
-PredefinedMailContentUser=__ (Hallo) __ __ (Mit freundlichen Grüssen) __ __USER_SIGNATURE__
 PredefinedMailContentLink=Sie können auf den unten stehenden Link klicken, um Ihre Zahlung zu tätigen, falls dies noch nicht geschehen ist. %s
+PredefinedMailContentGeneric=__(Hallo)__\n\n\n__(Mit freundlichen Grüssen)__\n\n__USER_SIGNATURE__
 ChooseYourDemoProfil=Bitte wählen Sie das Demo-Profil das Ihrem Einsatzgebiet am ehesten entspricht
 ModifiedById=Letzte Änderung durch User
 ModifiedByLogin=Letzte Änderung durch Userlogin
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index 0f2072b4e04..1d7fd648719 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - products
+Service=Leistung
 Create=Erstelle
 Reference=Referenz
 ProductVatMassChange=Globale MWST - Änderung
@@ -19,6 +20,7 @@ ServicesOnSaleOnly=Dienstleistungen nur für den Verkauf
 ServicesOnPurchaseOnly=Dienstleistungen nur für den Einkauf
 ServicesNotOnSell=Dienstleistungen weder für den Ein-, noch Verkauf
 LastRecordedProducts=%s zuletzt erfasste Produkte
+LastRecordedServices=%s zuletzt erfasste Leistungen
 MenuStocks=Warenbestände
 Stocks=Lagerbestände und Lagerorte (Warenlager)
 AppliedPricesFrom=Angelegt von
@@ -54,6 +56,7 @@ NoPriceDefinedForThisSupplier=Ich habe weder Preis- noch Mengenangaben für dies
 NoSupplierPriceDefinedForThisProduct=Ich habe weder Preis- noch Mengenangaben für diesen Anbiter und seine Produkte.
 PredefinedProductsToSell=Vordefiniertes Verkaufsprodukt
 PredefinedServicesToSell=Vordefinierte Dienstleistung zum Verkauf
+PredefinedProductsAndServicesToSell=Vordefinierte Produkte/Leistungen für Verkauf
 PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte
 PredefinedProductsAndServicesToPurchase=Vordefinierte Produkte / Dienstleistungen für den Einkauf
 ConfirmCloneProduct=Bist du sicher, dass du diese Position <b>%s</b> duplizieren willst?
@@ -69,6 +72,8 @@ CustomerPrices=Kunden Preise
 SuppliersPrices=Lieferantenpreise
 SuppliersPricesOfProductsOrServices=Anbieterpreise
 CustomCode=Zolltarifnummer (z.B. HSN)
+set=gesetzt
+se=gesetzt
 kilogram=Kilo
 unitP=Teil
 unitSET=Satz
diff --git a/htdocs/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
index a7776df946c..b9344b1a49c 100644
--- a/htdocs/langs/de_CH/stocks.lang
+++ b/htdocs/langs/de_CH/stocks.lang
@@ -13,8 +13,6 @@ StockLimitShort=Alarmschwelle
 StockLimit=Sicherungsbestand für autom. Benachrichtigung
 RealStock=Realer Lagerbestand
 VirtualStock=Theoretisches Warenlager
-AverageUnitPricePMPShort=Gewichteter Durchschnitts-Einstandspreis
-AverageUnitPricePMP=Gewichteter Durchschnittpreis bei Erwerb
 DesiredStockDesc=Dieser Bestand wird für die Nachbestellfunktion verwendet.
 UseVirtualStockByDefault=Nutze theoretische Lagerbestände anstatt des physischem Bestands für die Nachbestellungsfunktion
 UseVirtualStock=theoretisches Warenlager verwenden
diff --git a/htdocs/langs/de_CH/ticket.lang b/htdocs/langs/de_CH/ticket.lang
index 9a55f674e15..2c200f923ce 100644
--- a/htdocs/langs/de_CH/ticket.lang
+++ b/htdocs/langs/de_CH/ticket.lang
@@ -2,7 +2,5 @@
 TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt / Störfallverfolgung
 NotRead=Ungelesen
 InProgress=In Bearbeitung
-Category=Analysecode
-TicketCategory=Analysecode
 TicketCloseOn=Schliessungsdatum
 TicketAddIntervention=Einsatz erstellen
diff --git a/htdocs/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
index e3216933e71..18929f1b851 100644
--- a/htdocs/langs/de_CH/users.lang
+++ b/htdocs/langs/de_CH/users.lang
@@ -15,8 +15,10 @@ DefaultRightsDesc=Hier kannst du alle Berechtigungen setzen, die jeder neue Benu
 ListOfGroups=Liste von Gruppen
 PasswordChangeRequest=Antrag zur Passwortänderung von <b>%s</b>
 ConfirmPasswordReset=Bestätige das Zurücksetzen des Passwortes.
+MenuUsersAndGroups=Benutzer & Gruppen
 LastGroupsCreated=Die %s neuesten Benutzergruppen
 LastUsersCreated=%s neueste Benutzer
+NonAffectedUsers=Nicht betroffene Benutzer
 LinkToCompanyContact=Mit Geschäftspartner/Kontakt verknüpfen
 LinkedToDolibarrThirdParty=Mit Geschäftspartner verknüpft
 CreateDolibarrThirdParty=Neuen Geschäftspartner erstellen
diff --git a/htdocs/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang
index 67f56d21654..4a0aee41836 100644
--- a/htdocs/langs/de_CH/withdrawals.lang
+++ b/htdocs/langs/de_CH/withdrawals.lang
@@ -2,4 +2,7 @@
 StandingOrderPayment=Bankeinzug/Lastschrift
 WithdrawalReceipt=Bankeinzug / Lastschrift
 WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diesem Geschäftspartner erstellen?
+StatusPaid=Verarbeitet
 StatusMotif4=Kundenbestellungen
+OrderWaiting=Wartend
+NumeroNationalEmetter=Nat. Überweisernummer
diff --git a/htdocs/langs/de_CH/workflow.lang b/htdocs/langs/de_CH/workflow.lang
index 9daef2f4ba4..663b51e6c16 100644
--- a/htdocs/langs/de_CH/workflow.lang
+++ b/htdocs/langs/de_CH/workflow.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Workflow Moduleinstellungen
 WorkflowDesc=Grundsätzlich sind alle Abläufe frei definierbar. Trotzdem kannst du hier einige vorgefertigte Abläufe aktivieren.
 ThereIsNoWorkflowToModify=Für die aktiven Module sind keine Workflow - Änderungen möglich.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erzeuge automatisch eine Kundenbestellung, sobald die Offerte unterzeichnet ist (Positionen und Beträge, wie offeriert).
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 2a92500e6f2..296314e7df6 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Verwalten der Null am Ende eines Buchhaltungskontos. \nIn
 BANK_DISABLE_DIRECT_INPUT=Deaktivieren der direkte Aufzeichnung von Transaktion auf dem Bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Entwurfexport für Journal aktivieren
 ACCOUNTANCY_COMBO_FOR_AUX=Kombinationsliste für Nebenkonto aktivieren \n(kann langsam sein, wenn Sie viele Geschäftspartner haben)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Verkaufsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal
@@ -284,6 +285,7 @@ ShowTutorial=Tutorial anzeigen
 NotReconciled=nicht ausgeglichen
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Massenaktualisierung der Kategorien
 AddAccountFromBookKeepingWithNoCategories=Verfügbares Konto noch nicht in der personalisierten Gruppe
 CategoryDeleted=Die Gruppe für das Buchhaltungskonto wurde entfernt
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 448fe83ac82..c93ae8157fe 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -219,7 +219,7 @@ Nouveauté=Neuheit
 AchatTelechargement=Kaufen / Herunterladen
 GoModuleSetupArea=Um ein neues Modul zu installieren/verteilen, gehen Sie in den Modul-Setup Bereich <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Liste der Unternehmen, die speziell entwickelte Module oder Funktionen bereitstellen. <br> Hinweis: Da Dolibarr eine Open Source-Anwendung ist, kann <i>jeder, der</i> Erfahrung mit PHP-Programmierung hat, ein Modul entwickeln.
 WebSiteDesc=Externe Webseiten mit zusätzlichen Add-on (nicht zum Grundumfang gehörend) Modulen ...
 DevelopYourModuleDesc=einige Lösungen um eigene Module zu entwickeln ...
 URL=Link
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Standard Absender e-Mail für manuelle Sendungen (Ben
 UserEmail=E-Mail des Benutzers
 CompanyEmail=Unternehmens-E-Mail 
 FeatureNotAvailableOnLinux=Diese Funktion ist auf Unix-Umgebungen nicht verfügbar. Testen Sie Ihr Programm sendmail lokal.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Wenn die Übersetzung für diese Sprache nicht vollständig ist oder Sie Fehler finden, können Sie dies korrigieren, indem Sie Dateien im Verzeichnis <b>langs/%s</b> bearbeiten und Ihre Änderung an www.transifex.com/dolibarr-association/dolibarr/ senden.
-SubmitTranslationENUS=Sollte die Übersetzung für eine Sprache nicht vollständig sein oder Fehler beinhalten, können Sie die entsprechenden Sprachdateien im Verzeichnis <b>langs/%s</b> bearbeiten und anschließend Ihre Änderungen mit der Entwicklergemeinschaft auf www.dolibarr.org teilen.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Moduleinstellung
 ModulesSetup=Modul-/Anwendungseinstellungen
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modul <b>%s</b> muss aktiviert sein, wenn Sie dieses Fe
 SecurityToken=Schlüssel um die URLs zu entschlüsseln
 NoSmsEngine=Kein SMS-Sendermanager verfügbar. Ein SMS-Sendermanager ist nicht mit der Standardverteilung installiert, da er von einem externen Anbieter abhängig ist, können Sie einige davon finden unter %s
 PDF=PDF
-PDFDesc=Globale Einstellungen für die PDF-Erzeugung
-PDFAddressForging=Zusätzliche Felder im Adressfeld
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Alle Informationen zu Steuern und MWSt. im generierten PDF ausblenden
 PDFRulesForSalesTax=Regeln für Umsatzsteuer / MwSt.
 PDFLocaltax=Regeln für %s
-HideLocalTaxOnPDF=Steuersatz%s in der Spalte Steuerverkauf ausblenden
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Verstecke Produktbeschreibung
 HideRefOnPDF=Artikelnummer nicht anzeigen
 HideDetailsOnPDF=Verstecke Produkt-Zeilen Details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
 MassConvert=Starte Massenkonvertierung
 PriceFormatInCurrentLanguage=Preisformat in der aktuellen Sprache
 String=Zeichenkette
+String1Line=String (1 line)
 TextLong=Langer Text
+TextLongNLines=Long text (n lines)
 HtmlText=HTML-Text
 Int=Ganzzahl
 Float=Fließkommazahl
@@ -543,9 +546,9 @@ Module54Desc=Verwaltung von Verträgen (Dienstleistungen oder wiederkehrende Abo
 Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Zahlung per Überweisung
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Lastschrifteinzug
-Module57Desc=Verwaltung von Lastschriftzahlungsaufträgen. Es beinhaltet die Erstellung einer SEPA-Datei für europäische Länder.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
 Module59Name=Bookmark4u
@@ -573,7 +576,7 @@ Module240Desc=Werkzeug zum Datenexport (mit Assistenten)
 Module250Name=Daten Importe
 Module250Desc=Werkzeug zum Datenimport (mit Assistenten)
 Module310Name=Mitglieder
-Module310Desc=Mitgiederverwaltung für Stiftungen und Vereine
+Module310Desc=Mitgliederverwaltung für Stiftungen und Vereine
 Module320Name=RSS Feed
 Module320Desc=Einen RSS-Feed zu den Dolibarr-Seiten hinzufügen
 Module330Name=Lesezeichen
@@ -836,9 +839,16 @@ Permission532=Leistungen erstellen/bearbeiten
 Permission534=Leistungen löschen
 Permission536=Versteckte Leistungen einsehen/verwalten
 Permission538=Leistungen exportieren
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Stücklisten anzeigen
 Permission651=Stücklisten erstellen / aktualisieren
 Permission652=Stücklisten löschen
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Spenden anzeigen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
@@ -848,6 +858,8 @@ Permission773=Spesenabrechnung löschen
 Permission774=Spesenabrechnungen einsehen  (Alle Benutzer auch die nicht Untergebenen)
 Permission775=Spesenabrechnung genehmigen
 Permission776=Spesenabrechnung bezahlen
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Spesenabrechnung exportieren
 Permission1001=Warenbestände einsehen
 Permission1002=Warenlager erstellen/ändern
@@ -900,6 +912,7 @@ Permission2515=Dokumentverzeichnisse verwalten
 Permission2801=FTP-Client im Lesemodus nutzen (nur ansehen und herunterladen)
 Permission2802=FTP-Client im Schreibmodus nutzen (Dateien löschen oder hochladen)
 Permission3200=Eingetragene Ereignisse und Fingerprints lesen
+Permission3301=Generate new modules
 Permission4001=Mitarbeiter anzeigen
 Permission4002=Mitarbeiter erstellen
 Permission4003=Mitarbeiter löschen
@@ -947,7 +960,8 @@ Permission63003=Ressource löschen
 Permission63004=Verbinden von  Ressourcen zu Ereignissen
 DictionaryCompanyType=Arten von Partnern 
 DictionaryCompanyJuridicalType=Rechtsformen von Partnern
-DictionaryProspectLevel=Interessenten-Potenzial
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Bundesland/Kanton
 DictionaryRegion=Regionen
 DictionaryCountry=Länder
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=E-Mail-Vorlagen
 DictionaryUnits=Einheiten
 DictionaryMeasuringUnits=Maßeinheiten
 DictionarySocialNetworks=Soziale Netzwerke
-DictionaryProspectStatus=Lead-Status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Urlaubsarten
 DictionaryOpportunityStatus=Verkaufschancen für Projekt/Lead
 DictionaryExpenseTaxCat=Spesenbericht - Mobilität
@@ -1076,7 +1091,7 @@ LoginPage=Anmeldeseite
 BackgroundImageLogin=Hintergrundbild
 PermanentLeftSearchForm=Ständiges Suchfeld auf der linken Seite
 DefaultLanguage=Standardsprache
-EnableMultilangInterface=Mehrsprachen-Support zulassen
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Firmenlogo im Menü anzgeigen
 CompanyInfo=Firma oder Institution
 CompanyIds=Firmen-/Organisations-IDs
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Es sind mindestens ein Suchkriterium erfo
 NewTranslationStringToShow=Meine Übersetzung
 OriginalValueWas=Original-Übersetzung überschrieben. Der frühere Wert war:<br><br>%s
 TransKeyWithoutOriginalValue=Sie haben eine neue Übersetzung für den Schlüssel '<strong>%s</strong>' erzwungen, der in keiner der Sprachdateien vorhanden ist.
-TotalNumberOfActivatedModules=Aktivierte Anwendungen/Module: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
 ClassNotFoundIntoPathWarning=Klasse %s nicht im PHP-Pfad gefunden
 YesInSummer=Ja im Sommer
@@ -1361,8 +1377,8 @@ WatermarkOnDraftContractCards=Wasserzeichen auf Vertragsentwurf (leerlassen wenn
 MembersSetup=Modul Mitglieder - Einstellungen
 MemberMainOptions=Haupteinstellungen
 AdherentLoginRequired= Verwalten Sie eine Anmeldung für jedes Mitglied
-AdherentMailRequired=Für die Anlage eines neuen Mitgliedes ist eine E-Mail-Adresse erforderlich 
-MemberSendInformationByMailByDefault=Das Kontrollkästchen für den automatischen Mail-Bestätigungsversand an Mitglieder (bei Freigabe oder neuem Abonnement) ist standardmäßig aktiviert
+AdherentMailRequired=Für das Anlegen eines neuen Mitglieds ist eine E-Mail-Adresse erforderlich
+MemberSendInformationByMailByDefault=Das Kontrollkästchen für den automatischen Versand einer E-Mail-Bestätigung an Mitglieder (bei Freigabe oder neuem Abonnement) ist standardmäßig aktiviert
 VisitorCanChooseItsPaymentMode=Der Besucher kann aus verschiedenen Zahlungsmethoden auswählen
 MEMBER_REMINDER_EMAIL=Aktivieren Sie die automatische Erinnerung <b> per E-Mail </b> an abgelaufene Abonnements. Hinweis: Das Modul <strong> %s </strong> muss aktiviert und ordnungsgemäß eingerichtet sein, damit Erinnerungen gesendet werden können.
 ##### LDAP setup #####
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Verwenden Ereignissarten \nEinstellen unter (Start -> Eins
 AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im  Ereignis Erstell-Formular verwenden.
 AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
-AGENDA_DEFAULT_VIEW=Welchen Reiter möchten Sie beim Öffnen der Agenda automatisch anzeigen
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Aktiviere Terminbenachrichtigungen <b>via E-Mail</b> (Die Benachrichtigungszeit/Frequenz kann auf dem jeweiligen Termin eingestellt werden). Info: Modul <strong>%s</strong> muss aktiviert und richtig konfiguriert sein, damit die Erinnerungen korrekt versendet werden können.
 AGENDA_REMINDER_BROWSER=Ereigniserinnerung aktivieren <b> im Browser des Benutzers </b> (Wenn das Ereignisdatum erreicht ist, kann jeder Benutzer dies in der Frage zur Browserbestätigung ablehnen.)
 AGENDA_REMINDER_BROWSER_SOUND=Aktiviere Tonbenachrichtigung
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Verknüpfte Objekte in Agenda anzeigen
 ##### Clicktodial #####
 ClickToDialSetup=Click-to-Dial Moduleinstellungen
 ClickToDialUrlDesc=URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können die folgenden Tags verwendet werden: <br><b>__PHONETO__</b> Telefonnummer des Angerufenen<br><b>__PHONEFROM__</b> Telefonnummer des Anrufers (Ihre)<br><b>__LOGIN__</b> Ihren Benutzernamen für Click-to-Dial (siehe Benutzerdaten)<br><b>__PASS__</b> Ihr Click-to-Dial-Passwort (siehe Benutzerdaten).
-ClickToDialDesc=Dieses Modul macht aus Telefonnummern anklickbare Links. Ein Klick auf das Symbol bewirkt, dass Ihr Telefon die Nummer anruft. Dies kann verwendet werden, um ein Call-Center-System von Dolibarr aus anzurufen, das beispielsweise die Telefonnummer eines SIP-Systems anrufen kann.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Nur einen Link "Tel:" bei Telefonnummern verwenden
 ClickToDialUseTelLinkDesc=Benutzen Sie diese Methode, wenn Ihre Benutzer ein Software-Telefon oder ein Interface für ein Telefon auf demselben Computer wie der Browser installiert haben. Dieses Telefon/Interface wird aufgerufen, wenn Sie auf einen Link klicken, der mit "tel:" beginnt. Wenn Sie eine vollständige Server-Lösung nutzen wollen (ohne lokale Software-Installation), wählen Sie hier "Nein" und füllen das nächste Feld.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Dieses Feld enthält eine Referenz um die Zeile zu identifizieren.
 Enter0or1=Gib 0 oder 1 ein
 UnicodeCurrency=Geben Sie hier zwischen geschweiften Klammern die Liste der Bytes ein, die das Währungssymbol darstellen. Zum Beispiel: Geben Sie für $ [36] ein - für brasilianische Real-R $ [82,36] - geben Sie für € [8364] ein
 ColorFormat=Die RGB Farben sind im Hexformat, zB. FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Zeilenposition in der Combo-Listen
 SellTaxRate=Mehrwertsteuersatz
 RecuperableOnly=Ja für USt. "Wahrgenommene nicht Erstattungsfähig" für einige Regionen in Frankreich. Nein für alle anderen Fälle.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Offertanfrage
 MailToSendSupplierOrder=Lieferantenbestellungen
 MailToSendSupplierInvoice=Lieferantenrechnungen
 MailToSendContract=Verträge
+MailToSendReception=Wareneingänge
 MailToThirdparty=Partner
 MailToMember=Mitglieder
 MailToUser=Benutzer
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s ist verfügbar. Versio
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist ein Wartungsupdate, das nur Fehlerbereinigungen enthält. Wir empfehlen allen Benutzern ein Upgrade auf diese Version. Wie bei jedem Wartungsupdate sind keinen neuen Features oder Änderungen in den Datenstrukturen enthalten. Sie können die Version aus dem Downloadbereich des Portals https://www.dolibarr.org laden (Unterverzeichnis &quot;stabile Versionen&quot;). Lesen Sie die komplette Liste der Änderungen im <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>.
 MultiPriceRuleDesc=Wenn die Option "Mehrere Preisstufen pro Produkt / Dienstleistung" aktiviert ist, können Sie für jedes Produkt unterschiedliche Preise definieren (einen pro Preisstufe). Um Zeit zu sparen, können Sie hier eine Regel eingeben, um einen Preis für jede Ebene auf der Grundlage des Preises der ersten Ebene automatisch zu berechnen, sodass Sie für jedes Produkt nur einen Preis für die erste Ebene eingeben müssen. Diese Seite soll Ihnen Zeit sparen, ist jedoch nur dann nützlich, wenn Ihre Preise für jedes Level im Verhältnis zum ersten Level stehen. Sie können diese Seite in den meisten Fällen ignorieren.
 ModelModulesProduct=Vorlagen für Produktdokumente
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=Um Codes automatisch generieren zu können, muß zuerst ein Manager für die automatische Generierung von Barcode-Nummer festgelegt werden.
 SeeSubstitutionVars=Siehe * für einen Liste möglicher Ersetzungsvariablen
 SeeChangeLog=Siehe ChangeLog-Datei (nur Englisch)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Linker Rand im PDF
 MAIN_PDF_MARGIN_RIGHT=Rechter Rand im PDF
 MAIN_PDF_MARGIN_TOP=Oberer Rand im PDF
 MAIN_PDF_MARGIN_BOTTOM=Unterer Rand im PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Dieses Modul benötigt keine speziellen Einstellungen.
 SetToYesIfGroupIsComputationOfOtherGroups=Setzen Sie dieses Fehld auf Ja, wenn diese Gruppe eine Berechnung von anderen Gruppen ist
 EnterCalculationRuleIfPreviousFieldIsYes=Berechnungsregel eingeben, falls das vorangehende Feld auf Ja gesetzt ist. (Beispiel: 'CODEGPR1+CODEGRP2')
@@ -1920,7 +1940,7 @@ EMailHost=Hostname des IMAP-Servers
 MailboxSourceDirectory=Quellverzechnis des eMail-Kontos
 MailboxTargetDirectory=Zielverzechnis des eMail-Kontos
 EmailcollectorOperations=Aktivitäten, die der eMail-Collector ausführen soll
-MaxEmailCollectPerCollect=Maximale Anzahl an einzusammelnden eMails je Collect-Vorgang 
+MaxEmailCollectPerCollect=Maximale Anzahl an einzusammelnden E-Mails je Collect-Vorgang 
 CollectNow=Jetzt abrufen
 ConfirmCloneEmailCollector=Sind Sie sicher, dass Sie den eMail-Collektor %s duplizieren möchten?
 DateLastCollectResult=Datum des letzten eMail-Collect-Versuchs
@@ -1930,16 +1950,17 @@ EmailCollectorConfirmCollectTitle=eMail-Collect-Bestätigung
 EmailCollectorConfirmCollect=Möchten Sie den Einsammelvorgang für diesen eMail-Collector starten?
 NoNewEmailToProcess=Keine neue e-Mail (passende Filter) zum Verarbeiten
 NothingProcessed=Nicht ausgeführt
-XEmailsDoneYActionsDone=%seMails qualifiziert, %seMails erfolgreich verarbeitet (für %sAufzeichnungen/Aktionen durchgeführt)
+XEmailsDoneYActionsDone=%sE-Mail(s) qualifiziert, %s E-Mail(s) erfolgreich verarbeitet (für %s Aufzeichnung(en) / Aktion(en) durchgeführt)
 RecordEvent=eMail-Ereignis aufzeichnen/registrieren
 CreateLeadAndThirdParty=als potentiellen Verkaufskontakt anlegen
-CreateTicketAndThirdParty=als (Support-)Ticket anlegen
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Letzter Resultatcode
 NbOfEmailsInInbox=Anzahl E-Mails im Quellverzeichnis
 LoadThirdPartyFromName=Drittanbieter-Suche auf %s laden (nur laden)
 LoadThirdPartyFromNameOrCreate=Drittanbieter-Suche auf %s laden (erstellen, wenn nicht gefunden)
-WithDolTrackingID=Dolibarr-Referenz in Nachrichten-ID gefunden
-WithoutDolTrackingID=Dolibarr-Referenz nicht in Nachrichten-ID gefunden
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=PLZ
 MainMenuCode=Menüpunktcode (Hauptmenü)
 ECMAutoTree=Automatischen ECM-Baum anzeigen
@@ -1981,7 +2002,7 @@ ImportSetup=Einrichtung des Modulimports
 InstanceUniqueID=Eindeutige ID dieser Instanz
 SmallerThan=Kleiner als
 LargerThan=Größer als
-IfTrackingIDFoundEventWillBeLinked=Beachten Sie, dass,wenn in eingehenden e-Mail eine Tracking-ID gefunden wird, das Ereignis automatisch mit den verwanten/verknüpfte Objekte verknüpft wird.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die 2-stufige Validierung aktiviert haben, wird empfohlen, ein spezielles zweites Passwort für die Anwendung zu erstellen, anstatt Ihr eigenes Konto-Passwort von https://myaccount.google.com/. zu verwenden.
 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=Mit dieser Aktion können Sie den E-Mail-Inhalt verwenden, um einen vorhandenen Dritten in Ihrer Datenbank zu suchen und zu laden. Der gefundene (oder erstellte) Drittanbieter wird für die folgenden erforderlichen Aktionen verwendet. Im Parameterfeld können Sie zum Beispiel 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' verwenden, wenn Sie den Namen des Drittanbieters aus einer Zeichenfolge 'Name: Name zu finden' extrahieren, und in den body einfügen möchten.
@@ -2005,3 +2026,7 @@ RssNote=Hinweis: Jede RSS-Feed-Definition enthält ein Widget, das Sie aktiviere
 JumpToBoxes=Wechseln Sie zu Einstellungen -> Widgets
 MeasuringUnitTypeDesc=Verwenden Sie hier einen Wert wie "Größe", "Oberfläche", "Volumen", "Gewicht", "Zeit".
 MeasuringScaleDesc=Die Skala gibt die Anzahl der Stellen an, an denen Sie den Dezimalteil verschieben müssen, um mit der Standardreferenzeinheit übereinzustimmen. Für den Einheitentyp "Zeit" ist dies die Anzahl der Sekunden. Werte zwischen 80 und 99 sind reservierte Werte.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 8dcb1a0339a..84e9a4c07dd 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID Veranstaltung
+IdAgenda=Ereignis-ID
 Actions=Ereignisse
 Agenda=Terminplan
 TMenuAgenda=Terminplanung
@@ -14,14 +14,14 @@ EventsNb=Anzahl der Ereignisse
 ListOfActions=Liste Ereignisse
 EventReports=Ereignisbericht
 Location=Ort
-ToUserOfGroup=für jeden Benutzer in der Gruppe
+ToUserOfGroup=Ereignis, für jeden Benutzer in einer Gruppe zugewiesen ist
 EventOnFullDay=Ganztägig
 MenuToDoActions=Alle unvollst. Termine
 MenuDoneActions=Alle abgeschlossenen Termine
 MenuToDoMyActions=Meine unvollst. Termine
 MenuDoneMyActions=Meine abgeschlossenen Termine
 ListOfEvents=Liste Ereignisse (interner Kalender)
-ActionsAskedBy=Termine eingetragen von
+ActionsAskedBy=Ereignisse eingetragen von
 ActionsToDoBy=Ereignisse zugewiesen an
 ActionsDoneBy=Termine erledigt von
 ActionAssignedTo=Ereignis zugewiesen an
@@ -43,9 +43,9 @@ ContractValidatedInDolibarr=Vertrag %s freigegeben
 CONTRACT_DELETEInDolibarr=Vertrag %s gelöscht
 PropalClosedSignedInDolibarr=Angebot %s unterschrieben
 PropalClosedRefusedInDolibarr=Angebot %s abgelehnt
-PropalValidatedInDolibarr=Angebot freigegeben
+PropalValidatedInDolibarr=Angebot %s freigegeben
 PropalClassifiedBilledInDolibarr=Angebot %s als verrechnet eingestuft
-InvoiceValidatedInDolibarr=Rechnung freigegeben
+InvoiceValidatedInDolibarr=Rechnung %s freigegeben
 InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert
 InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen
 InvoiceDeleteDolibarr=Rechnung %s gelöscht
@@ -63,37 +63,39 @@ ShipmentClassifyClosedInDolibarr=Lieferung %s als verrechnet markiert
 ShipmentUnClassifyCloseddInDolibarr=Lieferung %s als wiedereröffnet markieren
 ShipmentBackToDraftInDolibarr=Sendung %s zurück zum Entwurfsstatus
 ShipmentDeletedInDolibarr=Lieferung %s gelöscht
-ReceptionValidatedInDolibarr=Reception %s validated
-OrderCreatedInDolibarr= Auftragserteilung %s erstellt
+ReceptionValidatedInDolibarr=Empfang %s validiert
+OrderCreatedInDolibarr= Auftrag %s erstellt
 OrderValidatedInDolibarr=Auftrag %s freigegeben
-OrderDeliveredInDolibarr=Bestellung %s als geliefert markieren
+OrderDeliveredInDolibarr=Auftrag %s als geliefert markiert
 OrderCanceledInDolibarr=Auftrag %s storniert
-OrderBilledInDolibarr=Bestellung %s als bezahlt markieren
-OrderApprovedInDolibarr=Bestellen %s genehmigt
-OrderRefusedInDolibarr=Bestellung %s abgelehnt
-OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status
+OrderBilledInDolibarr=Auftrag %s als bezahlt markiert
+OrderApprovedInDolibarr=Auftrag %s genehmigt
+OrderRefusedInDolibarr=Auftrag %s abgelehnt
+OrderBackToDraftInDolibarr=Auftrag %s zurück in Entwurf-Status
 ProposalSentByEMail=Angebot %s per E-Mail gesendet
 ContractSentByEMail=Vertrag %s per E-Mail gesendet
 OrderSentByEMail=Kundenauftrag %s per E-Mail gesendet
 InvoiceSentByEMail=Kundenrechnung %s per E-Mail versendet
-SupplierOrderSentByEMail=Bestellung %s per E-Mail gesendet
-ORDER_SUPPLIER_DELETEInDolibarr=Bestellung %s gelöscht
+SupplierOrderSentByEMail=Lieferantenbestellung %s per E-Mail gesendet
+ORDER_SUPPLIER_DELETEInDolibarr=Lieferantenbestellung %s gelöscht
 SupplierInvoiceSentByEMail=Lieferantenrechnung %s per E-Mail gesendet
 ShippingSentByEMail=Lieferung %s per E-Mail versendet
 ShippingValidated= Lieferung %s freigegeben
 InterventionSentByEMail=Serviceauftrag %s per E-Mail versendet
 ProposalDeleted=Angebot gelöscht
-OrderDeleted=Bestellung gelöscht
+OrderDeleted=Auftrag gelöscht
 InvoiceDeleted=Rechnung gelöscht
 DraftInvoiceDeleted=Rechnungsentwurf gelöscht
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Produkt %s erstellt
-PRODUCT_MODIFYInDolibarr=Produkt %s aktualisiert
+PRODUCT_MODIFYInDolibarr=Produkt %s geändert
 PRODUCT_DELETEInDolibarr=Produkt %s gelöscht
-HOLIDAY_CREATEInDolibarr=Anfrage für Urlaubsantrag %s erstellt
-HOLIDAY_MODIFYInDolibarr=Anfrage für Urlaubsantrag %s bearbeitet
-HOLIDAY_APPROVEInDolibarr=Anfrage für Urlaubsantrag %s genehmigt
-HOLIDAY_VALIDATEInDolibarr=Anfrage für Urlaubsantrag %s validiert
-HOLIDAY_DELETEInDolibarr=Anfrage für Urlaubsantrag %s gelöscht
+HOLIDAY_CREATEInDolibarr=Urlaubsantrag %s erstellt
+HOLIDAY_MODIFYInDolibarr=Urlaubsantrag %s bearbeitet
+HOLIDAY_APPROVEInDolibarr=Urlaubsantrag %s genehmigt
+HOLIDAY_VALIDATEInDolibarr=Urlaubsantrag %s validiert
+HOLIDAY_DELETEInDolibarr=Urlaubsantrag %s gelöscht
 EXPENSE_REPORT_CREATEInDolibarr=Spesenabrechnung %s erstellt
 EXPENSE_REPORT_VALIDATEInDolibarr=Ausgabenbericht %s validiert
 EXPENSE_REPORT_APPROVEInDolibarr=Spesenabrechnung %s genehmigt
@@ -113,14 +115,14 @@ BOM_CLOSEInDolibarr=Stückliste deaktiviert
 BOM_REOPENInDolibarr=Stückliste wiedereröffnet
 BOM_DELETEInDolibarr=Stückliste gelöscht
 MRP_MO_VALIDATEInDolibarr=Fertigungsauftrag freigegeben
-MRP_MO_UNVALIDATEInDolibarr=Setze Fertigungsauftrag auf Status 'Entwurf'
+MRP_MO_UNVALIDATEInDolibarr=Fertigungsauftrag auf Status 'Entwurf' gesetzt
 MRP_MO_PRODUCEDInDolibarr=Fertigungsauftrag produziert
 MRP_MO_DELETEInDolibarr=Fertigungsauftrag gelöscht
 MRP_MO_CANCELInDolibarr=Fertigungsauftrag storniert
 ##### End agenda events #####
 AgendaModelModule=Dokumentvorlagen für Ereignisse
 DateActionStart=Beginnt
-DateActionEnd=Endet
+DateActionEnd=Ende
 AgendaUrlOptions1=Sie können die Ausgabe über folgende Parameter filtern:
 AgendaUrlOptions3=<b>logina=%s</b> begrenzt die Ausgabe auf den Benutzer <b>%s</b> erstellte Ereignissen.
 AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> begrenzt die Ausgabe auf dem Benutzer <b>%s</b> nicht als Eigentümer zugewiesene Aktionen.
@@ -130,12 +132,12 @@ AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> um automatische Eve
 AgendaUrlOptionsIncludeHolidays=<b> includeseholidays = 1 </b>, um Ereignisse von Feiertagen einzuschließen.
 AgendaShowBirthdayEvents=Geburtstage von Kontakten anzeigen
 AgendaHideBirthdayEvents=Geburtstage von Kontakten nicht anzeigen
-Busy=Besetzt
+Busy=Beschäftigt
 ExportDataset_event1=Liste Ereignisse des Kalender
 DefaultWorkingDays=Standard-Werktage der Woche (z.B. 1-5, 1-6)
-DefaultWorkingHours=Reguläre Arbeitszeit pro Tag (z.B. 9-18)
+DefaultWorkingHours=Reguläre Arbeitszeit pro Tag (z.B. 9-17)
 # External Sites ical
-ExportCal=Export Kalender
+ExportCal=Kalender exportieren
 ExtSites=Importieren von externen Kalendern
 ExtSitesEnableThisTool=Zeige externe Kalender (im globalen Setup definiert) in der Agenda. \nBetrifft nicht benutzerdefinierte externe Kalender. 
 ExtSitesNbOfAgenda=Anzahl der Kalender
@@ -155,6 +157,12 @@ EveryMonth=Jeden Monat
 DayOfMonth=Tag des Monat
 DayOfWeek=Tag der Woche
 DateStartPlusOne=Startdatum + 1 Stunde
-SetAllEventsToTodo=Setze alle Ereignisse auf Status 'ToDo'
-SetAllEventsToInProgress=Setze alle Ereignisse auf Status 'In Bearbeitung'
+SetAllEventsToTodo=Setze alle Ereignisse auf Status 'zu erledigen'
+SetAllEventsToInProgress=Setze alle Ereignisse auf Status 'in Bearbeitung'
 SetAllEventsToFinished=Setze alle Ereignisse auf Status 'Abgeschlossen'
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 7eeb4e7f05f..dd8f1a9db3e 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -37,7 +37,7 @@ IbanValid=Bankkonto gültig
 IbanNotValid=Bankkonto nicht gültig
 StandingOrders=Lastschriften
 StandingOrder=Lastschrift
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=Zahlung per Lastschrift
 PaymentByBankTransfers=Zahlung per Überweisung
 PaymentByBankTransfer=Bezahlung per Überweisung
 AccountStatement=Kontoauszug
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 1a542a7e675..43059614877 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -5,10 +5,10 @@ BillsCustomers=Kundenrechnungen
 BillsCustomer=Kundenrechnung
 BillsSuppliers=Lieferantenrechnungen
 BillsCustomersUnpaid=unbezahlte Kundenrechnungen
-BillsCustomersUnpaidForCompany=Offene Kundenrechnungen von %s
-BillsSuppliersUnpaid=Unbezahlte Lieferantenrechnungen
+BillsCustomersUnpaidForCompany=offene Kundenrechnungen von %s
+BillsSuppliersUnpaid=unbezahlte Lieferantenrechnungen
 BillsSuppliersUnpaidForCompany=Unbezahlte Rechnungen des Lieferanten %s
-BillsLate=Verspätete Zahlungen
+BillsLate=verspätete Zahlungen
 BillsStatistics=Statistik Kundenrechnungen
 BillsStatisticsSuppliers=Statistik Lieferantenrechnungen
 DisabledBecauseDispatchedInBookkeeping=Deaktiviert, da die Rechnung schon in die Buchhaltung übernommen wurde
@@ -573,5 +573,5 @@ MaxNumberOfGenerationReached=Maximal Anzahl Generierungen erreicht
 BILL_DELETEInDolibarr=Rechnung gelöscht
 BILL_SUPPLIER_DELETEInDolibarr=Lieferantenrechnung gelöscht
 UnitPriceXQtyLessDiscount=Stückpreis x Anzahl - Rabatt
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
+CustomersInvoicesArea=Abrechnungsbereich Kunden
+SupplierInvoicesArea=Abrechnungsbereich Lieferanten
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 69626d33d65..b633a2ef019 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=zuletzt bearbeitete Lieferantenbestellungen
 BoxTitleLastModifiedCustomerBills=Zuletzt bearbeitete Kundenrechnungen (maximal %s)
 BoxTitleLastModifiedCustomerOrders=Zuletzt bearbeitete Kundenaufträge (maximal %s)
 BoxTitleLastModifiedPropals=Zuletzt bearbeitete Angebote (maximal %s)
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Kundenrechnungen
 ForCustomersOrders=Kundenaufträge
 ForProposals=Angebote
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Zwischenkonto ist nicht definiert
 BoxLastCustomerShipments=Letzte Kundenlieferungen
 BoxTitleLastCustomerShipments=Neueste %s Kundensendungen
 NoRecordedShipments=Keine erfasste Kundensendung
+# Pages
+AccountancyHome=Buchführung
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index df753f166bc..095e3d6e1f8 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -43,8 +43,8 @@ Place=Tisch
 TakeposConnectorNecesary='TakePOS Connector' erforderlich
 OrderPrinters=Bondrucker
 SearchProduct=Produkt suchen
-Receipt=Beleg
-Header=Header
+Receipt=globale Druckeinstellungen
+Header=Kopfzeile
 Footer=Fußzeile
 AmountAtEndOfPeriod=Betrag am Ende der Periode (Tag, Monat oder Jahr)
 TheoricalAmount=Theoretischer Betrag
@@ -76,8 +76,8 @@ POSTerminal=POS-Terminal
 POSModule=POS-Modul
 BasicPhoneLayout=Verwenden Sie das Basislayout für Telefone
 SetupOfTerminalNotComplete=Die Einrichtung von Terminal %s ist nicht abgeschlossen
-DirectPayment=Direkte Zahlung
-DirectPaymentButton=Taste für direkte Barzahlung
+DirectPayment=Direktzahlung
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Rechnung ist bereits geprüft
 NoLinesToBill=Keine Zeilen zu berechnen
 CustomReceipt=Benutzerdefinierte Quittung
@@ -94,26 +94,31 @@ TakeposConnectorMethodDescription=Externes Modul mit zusätzlichen Funktionen. M
 PrintMethod=Druckmethode
 ReceiptPrinterMethodDescription=Leistungsstarke Methode mit vielen Parametern. Vollständig anpassbar mit Vorlagen. Kann nicht aus der Cloud drucken.
 ByTerminal=über Terminal
-TakeposNumpadUsePaymentIcon=Verwenden Sie das Zahlungssymbol auf dem Nummernblock
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Nummerierungsmodul für POS-Verkäufe
 CashDeskGenericMaskCodes6 =  Das Tag <br> <b> {TN} </b> wird zum Hinzufügen der Terminalnummer verwendet
 TakeposGroupSameProduct=Gruppieren Sie dieselben Produktlinien
 StartAParallelSale=Starten Sie einen neuen Parallelverkauf
-ControlCashOpening=Kassenkontrolle bei POS-Öffnung
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Kasse schließen
 CashReport=Kassenbericht
-MainPrinterToUse=Zu verwendender Hauptdrucker
-OrderPrinterToUse=Drucker zur Verwendung bestellen
-MainTemplateToUse=Hauptvorlage zu verwenden
-OrderTemplateToUse=Bestellvorlage zur Verwendung
+MainPrinterToUse=Quittungsdrucker
+OrderPrinterToUse=Drucker für Bestellungen
+MainTemplateToUse=Vorlage für Quittungsdrucker
+OrderTemplateToUse=Vorlage für Bestelldrucker
 BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+AutoOrder=Bestellung durch den Kunden selbst
+RestaurantMenu=Menü
+CustomerMenu=Kundenmenü
+ScanToMenu=Scannen Sie den QR-Code, um das Menü anzuzeigen
+ScanToOrder=Scannen Sie den QR-Code auf Bestellung
+Appearance=Aussehen
+HideCategoryImages=Kategorie Bilder ausblenden
+HideProductImages=Produktbilder ausblenden
+NumberOfLinesToShow=Anzahl der anzuzeigenden Bildzeilen
+DefineTablePlan=Tabellenplan definieren
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index b2d9a2b4c1f..6d646740b35 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Sozialabgabe oder Steuersatz
 SocialContributions= Steuern- oder Sozialabgaben
 SocialContributionsDeductibles=Abzugsberechtigte Sozialabgaben oder Steuern
 SocialContributionsNondeductibles=Nicht abzugsberechtigte Sozialabgaben oder Steuern
+DateOfSocialContribution=Datum der Sozial- oder Fiskalsteuer
 LabelContrib=Beitrag Bezeichnung
 TypeContrib=Beitrag Typ
 MenuSpecialExpenses=Sonstige Ausgaben
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index 057d4dc37cf..1aa291c6ab2 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Laufende Leistungen
 MenuExpiredServices=Abgelaufene Leistungen
 MenuClosedServices=Geschlossene Services
 NewContract=Neuer Vertrag
-NewContractSubscription=Neuer Vertrag/Abonnement
+NewContractSubscription=Neuer Vertrag oder Abonnement
 AddContract=Vertrag erstellen
 DeleteAContract=Löschen eines Vertrages
 ActivateAllOnContract=Alle Dienstleistungen aktivieren
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Vertrag Nachbetreuung durch Vertreter
 TypeContact_contrat_external_BILLING=Rechnungskontakt des Kunden
 TypeContact_contrat_external_CUSTOMER=Nachbetreuung durch Kundenkontakt
 TypeContact_contrat_external_SALESREPSIGN=Vertragsunterzeichnung durch Kundenkontakt
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Verstecke beendete Dienste (standard)
+ShowClosedServices=Zeige beendete Dienste
+HideClosedServices=Verstecke beendete Dienste
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index a7972415afc..77988952bc9 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Ungültige Syntax für Lieferantennummer.
 ErrorSupplierCodeRequired=Lieferantennummer notwendig
 ErrorSupplierCodeAlreadyUsed=Lieferanten Nr. bereits vergeben.
 ErrorBadParameters=Ungültige Werte
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Falsche oder fehlende Parameter
 ErrorBadValueForParameter=Ungültiger Wert '%s' für Paramter '%s'
 ErrorBadImageFormat=Bildformat nicht unsterstützt (Ihr PHP hat keine Konvertierungsfunktion für dieses Format)
 ErrorBadDateFormat=Eintrag '%s' hat falsche Datumsformat
@@ -120,7 +120,7 @@ ErrorLoginHasNoEmail=Dieser Benutzer hat keine E-Mail-Adresse. Prozess abgebroch
 ErrorBadValueForCode=Sicherheitsschlüssel falsch
 ErrorBothFieldCantBeNegative=Die Felder %s und %s können nicht gleichzeitig negativ sein
 ErrorFieldCantBeNegativeOnInvoice=Das Feld <strong> %s </strong> darf für diesen Rechnungstyp nicht negativ sein. Wenn Sie eine Rabattzeile hinzufügen müssen, erstellen Sie zuerst den Rabatt (aus dem Feld '%s' auf der Karte eines Drittanbieters) und wenden Sie ihn dann auf die Rechnung an.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeForOneVATRate=Die Summe der Zeilen (nach Steuern) kann für einen bestimmten nicht null Mehrwertsteuersatz nicht negativ sein (Es wurde eine negative Summe für den Mehrwertsteuersatz <b> %s </b> %% gefunden).
 ErrorLinesCantBeNegativeOnDeposits=Zeilen in einer Anzahlung können nicht negativ sein. Es entstehen Probleme, wenn die Anzahlung in einer Rechnung verrechnet wird.
 ErrorQtyForCustomerInvoiceCantBeNegative=Mengen in Kundenrechnungen dürfen nicht negativ sein
 ErrorWebServerUserHasNotPermission=Der Benutzerkonto <b>%s</b> wurde verwendet um auf dem Webserver etwas auszuführen, hat aber keine Rechte dafür.
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Neuer Wert darf nicht altem Wert entsprechen
 ErrorFailedToValidatePasswordReset=Kennwort konnte nicht zurückgesetzt werden. Möglicherweise wurde dies bereits getan (dieser Link kann nur einmal verwendet werden). Wenn nicht, versuchen Sie den Rücksetz-Prozess neu zu starten.
 ErrorToConnectToMysqlCheckInstance=Verbindung zur Datenbank fehlgeschlagen. Prüfen Sie, ob der Mysql-Server läuft (in den meisten Fällen können Sie ihn von der Kommandozeile mit 'sudo service mysql start' starten).
 ErrorFailedToAddContact=Fehler beim Hinzufügen des Kontakts
-ErrorDateMustBeBeforeToday=Das Datum kann nicht in der Zukunft sein
+ErrorDateMustBeBeforeToday=Das Datum muss früher sein als heute
+ErrorDateMustBeInFuture=Das Datum muss älter sein als heute
 ErrorPaymentModeDefinedToWithoutSetup=Eine Zahlungsart wurde auf Typ %s gesetzt, aber das Rechnungsmodul wurde noch nicht konfiguriert dies anzuzeigen.
 ErrorPHPNeedModule=Fehler, Ihr PHP muss das Modul <b>%s</b> installiert haben um diese Option zu benutzen.
 ErrorOpenIDSetupNotComplete=Sie haben im Dolibarr Konfigurationsfile eingestellt, dass die Anmeldung mit OpenID möglich ist, aber die URL zum OpenID Service ist noch nicht in %s definiert.
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Bestand nicht ausreichend f
 ErrorOnlyOneFieldForGroupByIsPossible=Nur ein Feld ist für 'Gruppieren nach' möglich (andere werden verworfen)
 ErrorTooManyDifferentValueForSelectedGroupBy=Es wurden zu viele unterschiedliche Werte (mehr als <b> %s </b>) für das Feld '<b> %s </b>' gefunden um 'Gruppieren nach' anzuzeigen. Das Feld 'Gruppieren nach' wurde entfernt. Vielleicht wollten Sie es als X-Achse verwenden?
 ErrorReplaceStringEmpty=Fehler: die zu ersetzende Zeichenfolge ist leer
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
@@ -265,4 +269,4 @@ WarningNumberOfRecipientIsRestrictedInMassAction=Achtung, die Anzahl der verschi
 WarningDateOfLineMustBeInExpenseReportRange=Das Datum dieser Positionszeile ist ausserhalb der Datumsspanne dieser Spesenabrechnung
 WarningProjectClosed=Projekt ist geschlossen. Sie müssen es zuerst wieder öffnen.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Einige Bank-Transaktionen wurden entfernt, nachdem der Kassenbon, der diese enthielt, erzeugt wurde. Daher wird sich die Anzahl der Checks und die Endsumme auf dem Kassenbon von der Anzahl und Endsumme in der Liste unterscheiden.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Warnung, Dateieintrag zur ECM-Datenbankindextabelle konnte nicht hinzugefügt werden.
diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
index f5c3dfb7a5c..dcfae812e33 100644
--- a/htdocs/langs/de_DE/hrm.lang
+++ b/htdocs/langs/de_DE/hrm.lang
@@ -11,8 +11,8 @@ CloseEtablishment=Einrichtung schliessen
 # Dictionary
 DictionaryPublicHolidays=PV - Öffentliche Feiertage
 DictionaryDepartment=PV - Abteilungsliste
-DictionaryFunction=HRM - Job positions
+DictionaryFunction=HRM - Stellenangebote
 # Module
-Employees=die Mitarbeiter
+Employees=Mitarbeiter
 Employee=Mitarbeiter/in
 NewEmployee=neuer Mitarbeiter
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 84260f8cc78..b38d1b4b6d9 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -218,6 +218,6 @@ ErrorFoundDuringMigration=Während des Migrationsprozesses wurden Fehler gemelde
 YouTryInstallDisabledByDirLock=Die Anwendung hat versucht, sich selbst zu aktualisieren, aber die Installations- / Aktualisierungsseiten wurden aus Sicherheitsgründen deaktiviert (Verzeichnis umbenannt mit .lock-Suffix). <br>
 YouTryInstallDisabledByFileLock=Die Anwendung hat versucht, sich selbst zu aktualisieren, aber die Installations-/Upgrade-Seiten wurden aus Sicherheitsgründen deaktiviert (durch die Existenz einer Sperrdatei <strong>install.lock</strong> im Dokumenten-Verzeichnis).<br>
 ClickHereToGoToApp=Hier klicken um zu Ihrer Anwendung zu kommen
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
+ClickOnLinkOrRemoveManualy=Wenn ein Upgrade durchgeführt wird, warten Sie bitte. Wenn nicht, klicken Sie auf den folgenden Link. Wenn Sie immer dieselbe Seite sehen, müssen Sie die Datei install.lock im Dokumentenverzeichnis entfernen / umbenennen.
 Loaded=Geladen
 FunctionTest=Funktionstest
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index 8f3d78eafb9..8cb1b4fe32c 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopisch
 Language_ar_AR=Arabisch
 Language_ar_EG=Arabisch (Ägypten)
 Language_ar_SA=Arabisch
+Language_az_AZ=Aserbaidschanisch
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (Indien)
 Language_bg_BG=Bulgarisch
 Language_bs_BA=Bosnisch
 Language_ca_ES=Katalanisch
@@ -20,6 +23,7 @@ Language_en_GB=Englisch (Großbritannien)
 Language_en_IN=Englisch (Indien)
 Language_en_NZ=Englisch (Neuseeland)
 Language_en_SA=Englisch (Saudi-Arabien)
+Language_en_SG=Englisch (Singapur)
 Language_en_US=Englisch (USA)
 Language_en_ZA=Englisch (Südafrika)
 Language_es_ES=Spanisch
@@ -29,6 +33,7 @@ Language_es_CL=Spanisch (Chile)
 Language_es_CO=Spanisch (Kolumbien)
 Language_es_DO=Spanisch (Dominikanische Republik)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanisch (Guatemala)
 Language_es_HN=Spanisch (Honduras)
 Language_es_MX=Spanisch (Mexiko)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanisch (Paraguay)
 Language_es_PE=Spanisch (Peru)
 Language_es_PR=Spanisch (Puerto Rico)
 Language_es_UY=Spanisch (Uruguay)
+Language_es_GT=Spanisch (Guatemala)
 Language_es_VE=Spanisch (Venezuela)
 Language_et_EE=Estnisch
 Language_eu_ES=Baskisch
@@ -44,15 +50,22 @@ Language_fi_FI=Finnisch
 Language_fr_BE=Französisch (Belgien)
 Language_fr_CA=Französisch (Kanada)
 Language_fr_CH=Französisch (Schweiz)
+Language_fr_CI=Französisch (Elfenbeinküste)
+Language_fr_CM=Französisch (Kamerun)
 Language_fr_FR=Französisch
+Language_fr_GA=Französisch (Gabon)
 Language_fr_NC=Französisch (Neukaledonien)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Friesisch
+Language_gl_ES=Galizisch
 Language_he_IL=Hebräisch
+Language_hi_IN=Hindi (Indien)
 Language_hr_HR=Kroatisch
 Language_hu_HU=Ungarisch
 Language_id_ID=Indonesisch
 Language_is_IS=Isländisch
 Language_it_IT=Italienisch
+Language_it_CH=Italienisch (Schweiz)
 Language_ja_JP=Japanisch
 Language_ka_GE=Georgisch
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Litauisch
 Language_mk_MK=Mazedonisch
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegisch (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Niederländisch (Belgien)
 Language_nl_NL=Niederländisch
 Language_pl_PL=Polnisch
@@ -86,4 +100,5 @@ Language_uz_UZ=Usbekisch
 Language_vi_VN=Vietnamesisch
 Language_zh_CN=Chinesisch
 Language_zh_TW=Chinesisch (Traditionell)
+Language_zh_HK=Chinesisch (Hong Kong)
 Language_bh_MY=Malaiisch
diff --git a/htdocs/langs/de_DE/loan.lang b/htdocs/langs/de_DE/loan.lang
index e83223dd36d..fce87a5e38b 100644
--- a/htdocs/langs/de_DE/loan.lang
+++ b/htdocs/langs/de_DE/loan.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - loan
 Loan=Kredit
 Loans=Kredite
-NewLoan=Neuer Kredit
-ShowLoan=Zeige Kredit
-PaymentLoan=Kreditauszahlung
-LoanPayment=Kreditauszahlung
-ShowLoanPayment=Zeige Kreditauszahlung
+NewLoan=neuer Kredit
+ShowLoan=zeige Kredit
+PaymentLoan=Kreditzahlung
+LoanPayment=Kreditzahlung
+ShowLoanPayment=zeige Kreditzahlung
 LoanCapital=Kapital
 Insurance=Versicherung
-Interest=Zins
+Interest=Zinsen
 Nbterms=Anzahl der Bedingungen
 Term=Bedingungen
 LoanAccountancyCapitalCode=Buchhaltungskonto Kapital
@@ -21,11 +21,11 @@ LoanPaid=Kredit bezahlt
 ListLoanAssociatedProject=Liste der Darlehen in dem Projekt
 AddLoan=Darlehen erstellen
 FinancialCommitment=Finanzielle Verpflichtung
-InterestAmount=Zins
+InterestAmount=Zinsen
 CapitalRemain=Verbleibendes Kapital
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Diese Laufzeit ist bereits bezahlt
+CantUseScheduleWithLoanStartedToPaid = Der Scheduler kann nicht für ein Darlehen verwendet werden, bei dem die Zahlung gestartet wurde.
+CantModifyInterestIfScheduleIsUsed = Sie können die Zinsen nicht ändern, wenn Sie den Zeitplan verwenden.
 # Admin
 ConfigLoan=Konfiguration des Modul Kredite
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard-Buchhaltungskonto Kapital
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 43b147f90a6..413cb8e07f1 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Einrichtung ausgehender E-Mails (für Modul %s)
 DefaultOutgoingEmailSetup=Standardeinstellungen für ausgehende E-Mails
 Information=Information
 ContactsWithThirdpartyFilter=Kontakte mit Drittanbieter-Filter
+Unanswered=Unanswered
+Answered=Beantwortet
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 72d62e9e4de..24a97f6c837 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=St.-Pr. (inkl. Steuern)
 Amount=Betrag
 AmountInvoice=Rechnungsbetrag
 AmountInvoiced=berechneter Betrag
-AmountInvoicedHT=Rechnungsbetrag (inkl. MwSt.)
-AmountInvoicedTTC=Rechnungsbetrag (ohne MwSt.)
+AmountInvoicedHT=Rechnungsbetrag (ohne MwSt.)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Zahlungsbetrag
 AmountHTShort=Nettobetrag
 AmountTTCShort=Bruttobetrag
@@ -485,6 +485,7 @@ Categories=Kategorien
 Category=Suchwort/Kategorie
 By=Durch
 From=Von
+FromDate=von
 FromLocation=von
 to=An
 To=An
@@ -658,7 +659,7 @@ TextUsedInTheMessageBody=E-Mail Text
 SendAcknowledgementByMail=Bestätigungsmail senden
 SendMail=E-Mail versenden
 Email=E-Mail
-NoEMail=Keine E-Mail
+NoEMail=Keine E-Mail-Adresse(n) vorhanden
 AlreadyRead=Bereits gelesen
 NotRead=Nicht gelesen
 NoMobilePhone=Kein Handy
@@ -687,6 +688,7 @@ Method=Methode
 Receive=Erhalten
 CompleteOrNoMoreReceptionExpected=Vollständig oder nichts mehr erwartet
 ExpectedValue=Erwarteter Wert
+ExpectedQty=Expected Qty
 PartialWoman=Teilweise
 TotalWoman=Vollständig
 NeverReceived=Nie erhalten
@@ -703,6 +705,7 @@ MenuECM=Dokumente
 MenuAWStats=Statistiken
 MenuMembers=Mitglieder
 MenuAgendaGoogle=Google-Agenda
+MenuTaxesAndSpecialExpenses=Steuern | Sonderausgaben
 ThisLimitIsDefinedInSetup=Gesetzte Dolibarr-Limits (Menü Start-Einstellungen-Sicherheit): %s Kb, PHP Limit: %s Kb
 NoFileFound=Keine Dokumente in diesem Verzeichnis
 CurrentUserLanguage=Aktuelle Benutzersprache
@@ -725,7 +728,7 @@ Page=Seite
 Notes=Hinweise
 AddNewLine=Neue Zeile hinzufügen
 AddFile=Datei hinzufügen
-FreeZone=Freier Text
+FreeZone=Freitextprodukt
 FreeLineOfType=Freitextelement, Typ:
 CloneMainAttributes=Objekt mit Haupteigenschaften duplizieren
 ReGeneratePDF=PDF neu erstellen
@@ -942,6 +945,39 @@ ShortThursday=Do
 ShortFriday=Fr
 ShortSaturday=Sa
 ShortSunday=So
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Wähle E-Mail-Vorlage
 SetRef=Set Ref
 Select2ResultFoundUseArrows=Einige Ergebnisse gefunden. Nutzen Sie die Pfeiltasten um auszuwählen.
@@ -1037,5 +1073,13 @@ DeleteFileText=Möchten Sie diese Datei wirklich löschen?
 ShowOtherLanguages=Andere Sprachen anzeigen
 SwitchInEditModeToAddTranslation=Wechseln Sie in den Bearbeitungsmodus, um Übersetzungen für diese Sprache hinzuzufügen
 NotUsedForThisCustomer=Wird für diesen Kunden nicht verwendet
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+AmountMustBePositive=Der Betrag muss positiv sein
+ByStatus=Nach Status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 4ebec8377c0..a500c379f9a 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -77,11 +77,11 @@ NoTypeDefinedGoToSetup=Sie haben noch keine Mitgliedsart definiert.\nSie können
 NewMemberType=Neue Mitgliedsart
 WelcomeEMail=Willkommen per E-Mail
 SubscriptionRequired=Beitrag erforderlich
-DeleteType=Lösche Gruppe
+DeleteType=Löschen
 VoteAllowed=Stimmrecht
 Physical=natürliche Person
 Moral=juristische Person
-MorPhy=juristisch/natürlich
+MorPhy=Art
 Reenable=Reaktivieren
 ResiliateMember=Mitglied deaktivieren
 ConfirmResiliateMember=Möchten Sie dieses Mitglied wirklich deaktivieren?
@@ -176,15 +176,15 @@ MenuMembersStats=Statistik
 LastMemberDate=Letztes Mitgliedschaftsdatum
 LatestSubscriptionDate=Letztes Beitragsdatum
 MemberNature=Art des Mitglieds
-Public=Informationen sind öffentlich (nein = privat)
+Public=Informationen sind öffentlich
 NewMemberbyWeb=Neues Mitglied hinzugefügt, wartet auf Genehmigung.
 NewMemberForm=Formular neues Mitglied
 SubscriptionsStatistics=Statistik der Beiträge
 NbOfSubscriptions=Anzahl der Beiträge
 AmountOfSubscriptions=Betrag der Beiträge
 TurnoverOrBudget=Umsatz (Firma) oder Budget (Verein/Stiftung)
-DefaultAmount=Standardbetrag für den Beitrag
-CanEditAmount=Besucher können die Beitragshöhe auswählen oder ändern
+DefaultAmount=Standardhöhe des Mitgliedsbeitrags
+CanEditAmount=Besucher können die Höhe des Mitgliedsbeitrags anpassen
 MEMBER_NEWFORM_PAYONLINE=Zur integrierten Bezahlseite gehen
 ByProperties=Natürlich
 MembersStatisticsByProperties=Natürliche Mitgliederstatistiken
@@ -192,7 +192,7 @@ MembersByNature=Anzeige der Mitgliederstatistiken
 MembersByRegion=Anzeige der Mitgliederstatistiken nach Regionen.
 VATToUseForSubscriptions=Mehrwertsteuersatz für Beitrag
 NoVatOnSubscription=Beitrag ohne Mehrwertsteuer
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt/Leistung verwendet für den Beitrag in der Rechnungszeile: %s
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Verwendete(s) Produkt / Leistung für den Beitrag in der Rechnungszeile: %s
 NameOrCompany=Name oder Firma
 SubscriptionRecorded=Beitrag erfasst
 NoEmailSentToMember=Keine E-Mail an Mitglied gesendet
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index 9b189cac632..04d3f86d971 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -18,19 +18,19 @@ ModuleBuilderDescobjects=Definieren Sie hier die Objekte, die Sie mit Ihrem Modu
 ModuleBuilderDescmenus=This tab is dedicated to define menu entries provided by your module.
 ModuleBuilderDescpermissions=Diese Registerkarte dient zur Definition der neuen Berechtigungen, die Sie mit Ihrem Modul bereitstellen möchten.
 ModuleBuilderDesctriggers=Dies ist die Ansicht der von Ihrem Modul bereitgestellten Trigger. Um Code einzufügen, der beim Start eines ausgelösten Ereignisses ausgeführt wird, bearbeiten Sie einfach diese Datei.
-ModuleBuilderDeschooks=This tab is dedicated to hooks.
-ModuleBuilderDescwidgets=This tab is dedicated to manage/build widgets.
+ModuleBuilderDeschooks=Registerkarte zum Verwalten von Hooks
+ModuleBuilderDescwidgets=Diese Registerkarte dient zum Verwalten / Erstellen von Widgets.
 ModuleBuilderDescbuildpackage=Sie können hier eine "ready to distribute" Paketdatei (eine normalisierte.zip-Datei) Ihres Moduls und eine "ready to distribute" Dokumentationsdatei erzeugen. Klicken Sie einfach auf die Schaltfläche, um das Paket oder die Dokumentationsdatei zu erstellen.
 EnterNameOfModuleToDeleteDesc=Sie können Ihr Modul löschen. WARNUNG: Alle Codedateien des Moduls (generiert oder manuell erstellt) UND strukturierte Daten und Dokumentationen werden gelöscht!
 EnterNameOfObjectToDeleteDesc=Sie können ein Objekt löschen. WARNUNG: Alle Codedateien (generiert oder manuell erstellt), die sich auf das Objekt beziehen, werden gelöscht!
 DangerZone=Gefahrenzone
-BuildPackage=Packet erstellen
+BuildPackage=Paket erstellen
 BuildPackageDesc=Sie können ein Zip-Paket Ihrer Anwendung erstellen, um es auf Dolibarr-Installationen verteilen können. Sie können es auch vertreiben oder auf einem Marktplatz wie <a href="https://www.dolistore.com"> DoliStore.com </a> verkaufen.
 BuildDocumentation=Dokumentation erstellen
 ModuleIsNotActive=Dieses Modul ist noch nicht aktiviert. Gehe zu %s zum aktivieren oder klicke hier
 ModuleIsLive=Dieses Modul wurde aktiviert. Jede Änderung kann aktuelle Live-Funktionen beeinträchtigen.
-DescriptionLong=Long description
-EditorName=Name of editor
+DescriptionLong=Lange Beschreibung
+EditorName=Name des Erstellers
 EditorUrl=URL of editor
 DescriptorFile=Descriptor file of module
 ClassFile=File for PHP DAO CRUD class
@@ -43,7 +43,7 @@ PageForNoteTab=PHP page for note tab
 PathToModulePackage=Pfad des zu komprimierenden Moduls/Anwendungspakets
 PathToModuleDocumentation=Pfad zur Datei der Modul- / Anwendungsdokumentation (%s)
 SpaceOrSpecialCharAreNotAllowed=Leer- oder Sonderzeichen sind nicht erlaubt.
-FileNotYetGenerated=File not yet generated
+FileNotYetGenerated=Datei noch nicht generiert
 RegenerateClassAndSql=Erzwinge die Aktualisierung von .class und .sql Dateien
 RegenerateMissingFiles=Generate missing files
 SpecificationFile=Dokumentationsdatei
@@ -65,7 +65,7 @@ JSFile=Javascript-Datei
 ReadmeFile=Readme Datei
 ChangeLog=ChangeLog Datei
 TestClassFile=Datei für PHP Unit Testklasse
-SqlFile=Sql Datei
+SqlFile=SQL Datei
 PageForLib=Datei für die gemeinsame PHP-Bibliothek
 PageForObjLib=Datei für die Objekt-PHP-Bibliothek
 SqlFileExtraFields=SQL Datei für zusätzliche Eigenschaften
@@ -73,7 +73,7 @@ SqlFileKey=SQL Datei für Schlüsselwerte
 SqlFileKeyExtraFields=SQL-Datei für die Schlüssel der Extrafields
 AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
 UseAsciiDocFormat=Sie können das Markdown-Format verwenden, empfohlen wird jedoch, das Asciidoc-Format zu verwenden (Vergleich zwischen .md und .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Is a measure
+IsAMeasure=Ist eine Maßnahme
 DirScanned=Verzeichnis gescannt
 NoTrigger=Kein Trigger
 NoWidget=Kein Widget 
@@ -100,7 +100,7 @@ HooksDefDesc=Definieren Sie in der Eigenschaft <b> module_parts ['hooks'] </b> i
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
 SeeIDsInUse=Zeige die ID's die in Ihrer Installation verwendet werden
 SeeReservedIDsRangeHere=Zeige die reservierten ID Bereiche
-ToolkitForDevelopers=Toolir für Dolibarr Entwickler
+ToolkitForDevelopers=Toolkit für Dolibarr Entwickler
 TryToUseTheModuleBuilder=Sind Kenntnisse in SQL und PHP vorhanden, können Sie den Assistenten zum Erstellen nativer Module verwenden. <br> Aktivieren Sie das Modul <strong> %s </strong> und verwenden Sie den Assistenten, indem Sie oben rechts auf <span class="fa fa-bug"> </span> klicken. <br> Warnung: Dies ist eine erweiterte Entwicklerfunktion.  <b> Keine </b> Experimente auf Produktivseiten!
 SeeTopRightMenu=Siehe <span class="fa fa-bug"></span>im Menü Oben Rechts
 AddLanguageFile=Sprachdatei hinzufügen
@@ -108,7 +108,7 @@ YouCanUseTranslationKey=You can use here a key that is the translation key found
 DropTableIfEmpty=(Tabelle löschen wenn leer)
 TableDoesNotExists=Die Tabelle %s existiert nicht
 TableDropped=Tabelle %s gelöscht
-InitStructureFromExistingTable=Build the structure array string of an existing table
+InitStructureFromExistingTable=Erstelle die Struktur-Array-Zeichenfolge einer vorhandenen Tabelle
 UseAboutPage=About-Seite deaktivieren 
 UseDocFolder=Deaktiviere den Dokumentationsordner
 UseSpecificReadme=Ein spezifisches Readme verwenden
@@ -139,4 +139,4 @@ ForeignKey=Unbekannter Schlüssel
 TypeOfFieldsHelp=Feldtypen:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' heißt, wir ergänzen eine + Schaltfläche nach der Kombobox, um den Eintrag zu erstellen, 'filter' kann sein 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' zum Beispiel)
 AsciiToHtmlConverter=Ascii zu HTML Konverter
 AsciiToPdfConverter=Ascii zu PDF Konverter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+TableNotEmptyDropCanceled=Tabelle nicht leer. Löschen wurde abgebrochen.
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index b99efb6f04f..abb37ad22ba 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Fertigungsaufträge
 MO=Fertigungsauftrag
+MOs=Manufacturing orders
 MRPDescription=Modul zur Verwaltung von Produktions- und Fertigungsaufträgen (MO).
 MRPArea=MRP Bereich
 MrpSetupPage=Einrichtung des Moduls MRP
diff --git a/htdocs/langs/de_DE/opensurvey.lang b/htdocs/langs/de_DE/opensurvey.lang
index 146e47c971d..7825d264d61 100644
--- a/htdocs/langs/de_DE/opensurvey.lang
+++ b/htdocs/langs/de_DE/opensurvey.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - opensurvey
 Survey=Umfrage
 Surveys=Umfragen
-OrganizeYourMeetingEasily=Organisieren Sie Ihre Meetings und Umfragen ganz einfach. \nWählen Sie zuerst die Art der Umfrage ...
+OrganizeYourMeetingEasily=Lassen Sie über Termine und andere Optionen ganz einfach abstimmen. Bitte wählen Sie zuerst den Umfragen-Typ:
 NewSurvey=Neue Umfrage
 OpenSurveyArea=Umfragen-Übersicht
 AddACommentForPoll=Hier können Sie einen Kommentar zur Umfrage hinzufügen:
@@ -21,17 +21,17 @@ TheBestChoices=Die besten Optionen / Möglichkeiten sind momentan
 with=mit
 OpenSurveyHowTo=Wenn Sie an dieser Abstimmung teilnehmen möchten, tragen Sie Ihren Namen ein, wählen Sie die für Sie beste Option / Möglichkeit und bestätigen mit dem Plus-Zeichen am Ende der Zeile.
 CommentsOfVoters=Kommentare der Teilnehmer
-ConfirmRemovalOfPoll=Sind Sie sicher, dass Sie diese Umfrage löschen wollen (inklusive aller gespeicherten Stimmen)
-RemovePoll=Entferne Umfrage
+ConfirmRemovalOfPoll=Sind Sie sicher, dass Sie diese Umfrage inklusive aller gespeicherten Stimmen löschen wollen?
+RemovePoll=Umfrage löschen
 UrlForSurvey=URL für einen Direktzugriff auf die Umfrage
 PollOnChoice=Sie erstellen eine Multiple-Choice-Umfrage. Geben Sie alle möglichen Varianten für die Abstimmung ein und wählen Sie den gewünschten Typ.
 CreateSurveyDate=Erstelle Datums-Umfrage
 CreateSurveyStandard=Erstelle Standard-Umfrage
 CheckBox=Einfaches Kontrollkästchen
 YesNoList=Liste (leer/ja/nein)
-PourContreList=Liste (leer/dafür/dagegen)
+PourContreList=Liste ([leer]/dafür/dagegen)
 AddNewColumn=Neue Spalte hinzufügen
-TitleChoice=Beschreibung wählen
+TitleChoice=Option
 ExportSpreadsheet=Exportiere Abstimmungsergebnis
 ExpireDate=Frist
 NbOfSurveys=Anzahl an Umfragen
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 58a72f1e1f8..042c7fe53c8 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -103,8 +103,8 @@ DraftSuppliersOrders=Entwürfe Lieferantenbestellungen
 OnProcessOrders=Bestellungen in Bearbeitung
 RefOrder=Bestell-Nr.
 RefCustomerOrder=Kunden-BestellNr.
-RefOrderSupplier=Bestell Nr. für Lieferant
-RefOrderSupplierShort=Lieferanten-BestellNr.
+RefOrderSupplier=Best.-Nr. für Lieferant
+RefOrderSupplierShort=Lieferanten-Best.-Nr.
 SendOrderByMail=Bestellung per Post versenden
 ActionsOnOrder=Ereignisse zu dieser Bestellung
 NoArticleOfTypeProduct=Keine Artikel vom Typ 'Produkt' und deshalb keine Versandkostenposition
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 8d226cac1cc..49c7e511d24 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hallo)__\n\nBitte entnehmen Sie dem An
 PredefinedMailContentSendSupplierInvoice=__(Hallo)__\n\nAnbei erhalten Sie die Rechnung __REF__\n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hallo)__\n\nAls Anlage erhalten Sie unsere Lieferung \n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hallo)__\n\nBitte finden Sie den Serviceauftrag __REF__ im Anhang\n\n\n__(Mit freundlichen Grüßen)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Sie können den folgenden Link anklicken um die Zahlung auszuführen, falls sie noch nicht getätigt wurde.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr ist eine Management-Software die mehrere Business-Module anbietet. Eine Demo, die alle Module beinhaltet ist nicht sinnvoll , weil der Fall nie existiert (Hunderte von verfügbaren Module). Es stehen auch einige Demo-Profile Typen zur Verfügung.
 ChooseYourDemoProfil=Bitte wählen Sie das Demo-Profil das Ihrem Anwendgsfall am ehesten entspricht
 ChooseYourDemoProfilMore=...oder bauen Sie Ihr eigenes Profil <br> (manuelle Auswahl der Module)
@@ -280,7 +278,9 @@ LinesToImport=Positionen zum importieren
 
 MemoryUsage=Speichernutzung
 RequestDuration=Dauer der Anfrage
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Produkte / Dienstleistungen nach Beliebtheit in Angeboten
 PopuCom=Produkte / Dienstleistungen nach Beliebtheit in Bestellungen
 ProductStatistics=Produkt- / Dienstleistungsstatistik
 NbOfQtyInOrders=Menge in Bestellungen
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index a9a2266b6c3..b3b7d721c8a 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -73,7 +73,7 @@ SellingPrice=Verkaufspreis
 SellingPriceHT=Verkaufspreis (ohne Steuern) 
 SellingPriceTTC=Verkaufspreis (inkl. USt.)
 SellingMinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.)
-CostPriceDescription=In diesem Preisfeld (ohne MwSt.) Können Sie den Durchschnittsbetrag speichern, den dieses Produkt für Ihr Unternehmen kostet. Dies kann jeder Preis sein, den Sie selbst berechnen, beispielsweise aus dem durchschnittlichen Einkaufspreis zuzüglich der durchschnittlichen Produktions- und Vertriebskosten.
+CostPriceDescription=In diesem Preisfeld (ohne MwSt.) können Sie den Durchschnittsbetrag speichern, den dieses Produkt Ihr Unternehmen kostet. Dies kann jeder Preis sein, den Sie selbst berechnen, beispielsweise aus dem durchschnittlichen Einkaufspreis zuzüglich der durchschnittlichen Produktions- und Vertriebskosten.
 CostPriceUsage=Dieser Wert könnte für Margenberechnung genutzt werden.
 SoldAmount=Verkaufte Menge
 PurchasedAmount=angeschaffte Menge
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Wählen Sie den standardmäßigen Barcode-Typ
 BarcodeValue=Barcode-Wert
 NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...)
 ServiceLimitedDuration=Ist die Erbringung einer Dienstleistung zeitlich beschränkt:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Mehrere Preissegmente pro Produkt / Dienstleistung (jeder Kunde befindet sich in einem Preissegment)
 MultiPricesNumPrices=Anzahl Preise
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,11 +170,13 @@ SuppliersPricesOfProductsOrServices=Herstellerpreise (von Produkten oder Dienstl
 CustomCode=Zolltarifnummer
 CountryOrigin=Urspungsland
 Nature=Produkttyp  (Material / Fertig)
+NatureOfProductShort=Art des Produkts
+NatureOfProductDesc=Rohstoff oder Fertigprodukt
 ShortLabel=Kurzbezeichnung
 Unit=Einheit
 p=u.
-set=gesetzt
-se=gesetzt
+set=set
+se=set
 second=Sekunde
 s=s
 hour=Stunde
@@ -192,7 +195,7 @@ m3=m³
 liter=Liter
 l=L
 unitP=Stück
-unitSET=Set
+unitSET=Zusammenstellung
 unitS=Sekunden
 unitH=Stunden
 unitD=Tag
@@ -359,6 +362,9 @@ SelectCombination=Kombination wählen
 ProductCombinationGenerator=Varianten-Generator
 Features=Funktionen
 PriceImpact=Auswirkungen auf die Preise
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Auswirkungen auf Gewicht
 NewProductAttribute=Neues Attribut
 NewProductAttributeValue=Wert des neuen Attributs
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 346fad6180e..9b5ba8768f6 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Projekte - Übersicht
 ProjectStatus=Projekt Status
 SharedProject=Jeder
 PrivateProject=Projektkontakte
-ProjectsImContactFor=Projects for which I am explicitly a contact
+ProjectsImContactFor=Projekte, für die ich ausdrücklich ein Ansprechpartner bin
 AllAllowedProjects=Alle Projekte die ich sehen kann (eigene + öffentliche)
 AllProjects=alle Projekte
 MyProjectsDesc=Ansicht beschränkt auf Projekte mit mir als Ansprechpartner
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Mitwirkender
 TypeContact_project_task_external_TASKCONTRIBUTOR=Mitwirkender
 SelectElement=Element wählen
 AddElement=Mit Element verknüpfen
+LinkToElementShort=Link zu
 # Documents models
 DocumentModelBeluga=Projektdokumentvorlage für eine Übersicht der verknüpften Objekte
 DocumentModelBaleine=Projektdokumentvorlage für Aufgaben
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Anzahl der erstellten Projekte pro Monat
 ProjectNbTaskByMonth=Anzahl der erstellten Aufgaben pro Monat
 ProjectOppAmountOfProjectsByMonth=Anzahl der Leads pro Monat
 ProjectWeightedOppAmountOfProjectsByMonth=Gewichtete Anzahl von Leads pro Monat
-ProjectOpenedProjectByOppStatus=Projekt / Lead nach Leadstatus öffnen
-ProjectsStatistics=Statistik über Projekte und Leads
-TasksStatistics=Statistik über Projekte und Lead Aufgaben
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Aufgabe zugewiesen. Eingabe der Zeit zu diese Aufgabe sollte möglich sein.
 IdTaskTime=ID Zeit Aufgabe
 YouCanCompleteRef=Wenn die Referenz mit einem Suffix ergänzt werden soll, ist es empfehlenswert, ein Trennstrich '-' zu verwenden, so dass die automatische Numerierung für weitere Projekte funktioniert. Zum Beispiel %s-MYSUFFIX
@@ -265,4 +266,4 @@ NewInvoice=Neue Rechnung
 OneLinePerTask=Eine Zeile pro Aufgabe
 OneLinePerPeriod=Eine Zeile pro Zeitraum
 RefTaskParent=Übergeordnete Aufgabe
-ProfitIsCalculatedWith=Profit is calculated using
+ProfitIsCalculatedWith=Der Gewinn wird berechnet mit
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index b3918b87ca6..0956cf4900f 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -34,7 +34,7 @@ PropalStatusNotSigned=Nicht unterzeichnet (geschlossen)
 PropalStatusBilled=Verrechnet
 PropalStatusDraftShort=Entwurf
 PropalStatusValidatedShort=Bestätigt (offen)
-PropalStatusClosedShort=Geschlossen
+PropalStatusClosedShort=geschlossen
 PropalStatusSignedShort=beauftragt
 PropalStatusNotSignedShort=abgelehnt
 PropalStatusBilledShort=Verrechnet
@@ -84,4 +84,8 @@ DefaultModelPropalClosed=Standard Schablone wenn sie ein Geschäftsangebot schli
 ProposalCustomerSignature=Bei Beauftragung: Name in Klarschrift, Ort, Datum, Unterschrift
 ProposalsStatisticsSuppliers=Statistik Lieferantenanfragen
 CaseFollowedBy=Fall gefolgt von
-SignedOnly=Signed only
+SignedOnly=nur signiert
+IdProposal=Angebots-ID
+IdProduct=Produkt ID
+PrParentLine=Übergeordnete Zeile des Vorschlags
+LineBuyPriceHT=Kaufpreis Betrag abzüglich Steuern für Linie
diff --git a/htdocs/langs/de_DE/receiptprinter.lang b/htdocs/langs/de_DE/receiptprinter.lang
index e496b5877b6..dd8f3e068d1 100644
--- a/htdocs/langs/de_DE/receiptprinter.lang
+++ b/htdocs/langs/de_DE/receiptprinter.lang
@@ -3,12 +3,12 @@ ReceiptPrinterSetup=Einstellungen für das Quittungsdrucker-Modul
 PrinterAdded=Drucker %s zugefügt
 PrinterUpdated=Drucker %s geändert
 PrinterDeleted=Drucker %s gelöscht
-TestSentToPrinter=Sende Test zu Drucker %s
+TestSentToPrinter=Sende Testseite zu Drucker %s
 ReceiptPrinter=Quittungsdrucker
 ReceiptPrinterDesc=Einstellungen  Quittungsdrucker
 ReceiptPrinterTemplateDesc=Einrichtung von Vorlagen
-ReceiptPrinterTypeDesc=Beschreibung des Typs des Quittungsdruckers
-ReceiptPrinterProfileDesc=Beschreibung des Profils des Quittungsdruckers
+ReceiptPrinterTypeDesc=Einzustellende Parameter nach Druckertyp
+ReceiptPrinterProfileDesc=Auswahlhilfe für die Dropdown-Liste "Profile"
 ListPrinters=Druckerliste
 SetupReceiptTemplate=Vorlagen Setup
 CONNECTOR_DUMMY=Dummy Drucker
diff --git a/htdocs/langs/de_DE/recruitment.lang b/htdocs/langs/de_DE/recruitment.lang
new file mode 100644
index 00000000000..18910b48d3d
--- /dev/null
+++ b/htdocs/langs/de_DE/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Rekrutierung
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Einstellungen
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Über
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Arbeitsplatz
+DateExpected=Erwartetes Datum
+FutureManager=Zukünftiger Manager
+ResponsibleOfRecruitement=Verantwortlich für die Rekrutierung
+IfJobIsLocatedAtAPartner=If job is located at a partner place
+PositionToBeFilled=Zu besetzendes Stellenangebot
+PositionsToBeFilled=Zu besetzende Stellenangebote
+ListOfPositionsToBeFilled=List of job offers to be filled
+NewPositionToBeFilled=New job offers to be filled
+
+JobOfferToBeFilled=Zu besetzendes Stellenangebot
+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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 1f06b8460f2..71c8092fb07 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -36,7 +36,7 @@ StatusSendingProcessed=Verarbeitete
 StatusSendingDraftShort=Entwurf
 StatusSendingValidatedShort=Freigegeben
 StatusSendingProcessedShort=Fertig
-SendingSheet=Auslieferungen
+SendingSheet=Lieferschein
 ConfirmDeleteSending=Möchten Sie diesen Versand wirklich löschen?
 ConfirmValidateSending=Möchten Sie diesen Versand mit der Referenz <b>%s</b> wirklich freigeben?
 ConfirmCancelSending=Möchten Sie diesen Versand wirklich abbrechen?
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index be581d24234..c134bf06907 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Lieferung stornieren
 DeleteSending=Lieferung löschen
 Stock=Warenbestand
 Stocks=Warenbestände
-MissingStocks=Missing stocks
-StockAtDate=Stock at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Fehlende Bestände
+StockAtDate=Lagerbestände zum Datum
+StockAtDateInPast=Datum in der Vergangenheit
+StockAtDateInFuture=Datum in der Zukunft
 StocksByLotSerial=Lagerbestand nach Chargen-/Seriennummer
 LotSerial=Chargen/Serien-Nummern
 LotSerialList=Liste der Chargen-/Seriennummern
@@ -34,7 +34,7 @@ StockMovementForId=Lagerbewegung Nr. %d
 ListMouvementStockProject=Lagerbewegungen für Projekt
 StocksArea=Warenlager - Übersicht
 AllWarehouses=Alle Warenlager
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Schließen Sie auch undefinierten gewünschten Bestand ein
 IncludeAlsoDraftOrders=Fügen Sie auch Auftragsentwürfe hinzu
 Location=Standort
 LocationSummary=Kurzbezeichnung Standort
@@ -61,11 +61,11 @@ PMPValueShort=DSWP
 EnhancedValueOfWarehouses=Lagerwert
 UserWarehouseAutoCreate=Automatisch ein Lager erstellen wenn ein neuer Benutzer erstellt wird
 AllowAddLimitStockByWarehouse=Verwalten Sie zusätzlich zum Wert für den Mindest- und den gewünschten Bestand pro Paar (Produktlager) auch den Wert für den Mindest- und den gewünschten Bestand pro Produkt
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
-UserDefaultWarehouse=Set a warehouse on Users
+RuleForWarehouse=Regel für Lager
+WarehouseAskWarehouseDuringOrder=Legen Sie ein Lager für Verkaufsaufträge fest
+UserDefaultWarehouse=Legen Sie ein Lager für Benutzer fest
 MainDefaultWarehouse=Standardlager
-MainDefaultWarehouseUser=Use a default warehouse for each user
+MainDefaultWarehouseUser=Verwenden Sie für jeden Benutzer ein Standardlager
 MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
 IndependantSubProductStock=Produkt- und Unterproduktbestände sind unabhängig voneinander
 QtyDispatched=Versandmenge
@@ -95,14 +95,16 @@ RealStock=Realer Bestand
 RealStockDesc=Der aktuelle Lagerbestand ist die Stückzahl, die aktuell und physikalisch in Ihren Warenlagern vorhanden ist.
 RealStockWillAutomaticallyWhen=Der reale Bestand wird gemäß dieser Regel geändert (wie im Bestandsmodul definiert):
 VirtualStock=Theoretischer Lagerbestand
-VirtualStockDesc=Der virtuelle Bestand entspricht dem berechnete Bestand, der dann verfügbar ist, wenn alle offenen / anstehenden Aktionen (mit Bestandsauswirkung) abgeschlossen sind (Bestellungen erhalten, Kundenaufträge versendet usw.).
+VirtualStockAtDate=Virtueller Bestand zum Datum
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Warenlager ID
 DescWareHouse=Beschreibung Warenlager
 LieuWareHouse=Standort Warenlager
 WarehousesAndProducts=Warenlager und Produkte
 WarehousesAndProductsBatchDetail=Warenlager und Produkte (mit Detail per lot / serial)
-AverageUnitPricePMPShort=Gewogener durchschnittlicher Einkaufspreis 
-AverageUnitPricePMP=Gewogener durchschnittlicher Einkaufspreis
+AverageUnitPricePMPShort=Gewichteter Warenwert
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Verkaufspreis
 EstimatedStockValueSellShort=Verkaufswert
 EstimatedStockValueSell=Verkaufswert
@@ -141,7 +143,7 @@ Replenishments=Nachbestellung
 NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s)
 NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
 MassMovement=Massenbewegung
-SelectProductInAndOutWareHouse=Wählen Sie ein Produkt, eine Menge, ein Quellen- und ein Ziel-Lager und klicken Sie dann auf "%s". Sobald Sie dies für alle erforderlichen Bewegungen getan haben, klicken Sie auf "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Umbuchung
 ReceivingForSameOrder=Verbuchungen zu dieser Bestellung
 StockMovementRecorded=Lagerbewegungen aufgezeichnet
@@ -234,4 +236,7 @@ ForceTo=Erzwingen
 AlwaysShowFullArbo=Anzeige des vollständigen Angebots (Popup des Lager-Links). Warnung: Dies kann die Leistung erheblich beeinträchtigen.
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
+CurrentStock=Aktueller Lagerbestand
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index 1b7a9d0e773..ecd657c9db9 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -37,11 +37,11 @@ ListOfSupplierOrders=Liste der Lieferantenbestellungen
 MenuOrdersSupplierToBill=Bestellungen zu Rechnungen
 NbDaysToDelivery=Lieferverzug (Tage)
 DescNbDaysToDelivery=Die längste Lieferverzögerung der Produkte aus dieser Bestellung
-SupplierReputation=Lieferanten Reputation
-DoNotOrderThisProductToThisSupplier=Nicht sortieren
+SupplierReputation=Lieferanten-Reputation
+DoNotOrderThisProductToThisSupplier=hier nicht bestellen
 NotTheGoodQualitySupplier=Geringe Qualität
 ReputationForThisProduct=Reputation
 BuyerName=Käufer
 AllProductServicePrices=Alle Produkt/Leistung Preise
-AllProductReferencesOfSupplier=Alle Produkt- / Servicereferenzen des Anbieters
+AllProductReferencesOfSupplier=alle Referenzen des Anbieters
 BuyingPriceNumShort=Lieferantenpreise
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index cf6b92fca90..697e9678441 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Gelöscht
 
 # Dict
 Type=Typ
-Category=Analyse-Code
 Severity=Dringlichkeit
 
 # Email templates
@@ -128,11 +127,10 @@ TicketsAutoAssignTicket=Den Ersteller automatisch dem Ticket zuweisen
 TicketsAutoAssignTicketHelp=Wenn ein Ticket erstellt wird, kann der Ersteller automatisch dem Ticket zugewiesen werden.
 TicketNumberingModules=Ticketnummerierungsmodul
 TicketNotifyTiersAtCreation=Partner über Ticketerstellung informieren
-TicketGroup=Gruppe
 TicketsDisableCustomerEmail=E-Mails immer deaktivieren, wenn ein Ticket über die öffentliche Oberfläche erstellt wird
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessage=Senden Sie E-Mails, wenn eine neue Nachricht hinzugefügt wird
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
+TicketPublicNotificationNewMessageDefaultEmail=Benachrichtigungen per E-Mail an (Update)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
 #
 # Index & list page
@@ -162,7 +160,7 @@ CreatedBy=Erstellt durch
 NewTicket=Ticket erstellen
 SubjectAnswerToTicket=Ticketantwort
 TicketTypeRequest=Anfrageart
-TicketCategory=Analyse-Code
+TicketCategory=Gruppe
 SeeTicket=Ticket zeigen
 TicketMarkedAsRead=Ticket als gelesen markiert
 TicketReadOn=Gelesen um
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 6ab47a75663..fc859a67ca4 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -52,7 +52,7 @@ LastGroupsCreated=Zuletzt erstellte Gruppen (%s)
 LastUsersCreated=Zuletzt erstellte Benutzer (%s)
 ShowGroup=Zeige Gruppe
 ShowUser=Zeige Benutzer
-NonAffectedUsers=Nicht betroffene Benutzer
+NonAffectedUsers=Noch nicht zugeordnete Benutzer
 UserModified=Benutzer erfolgreich bearbeitet
 PhotoFile=Bilddatei
 ListOfUsersInGroup=Liste der Benutzer in dieser Gruppe
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Deaktiviert im Wartungsmodus
 UserAccountancyCode=Buchhaltungscode Benutzer
 UserLogoff=Benutzer abmelden
 UserLogged=Benutzer angemeldet
+DateOfEmployment=Anstellungsdatum
 DateEmployment=Beschäftigungsbeginn
 DateEmploymentEnd=Beschäftigungsende
 CantDisableYourself=Sie können nicht ihr eigenes Benutzerkonto deaktivieren
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Gültigkeitsprüfer für Urlaubsanträge erzwingen
 ValidatorIsSupervisorByDefault=Standardmäßig ist der Prüfer der Supervisor des Benutzers. Leer lassen, um dieses Verhalten beizubehalten.
 UserPersonalEmail=Private E-Mail-Adresse
 UserPersonalMobile=Private Mobiltelefonnummer
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index b70dc7d183c..7d91f729fba 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -16,7 +16,7 @@ WEBSITE_ROBOT=Roboterdatei (robots.txt)
 WEBSITE_HTACCESS=Website  .htaccess Datei 
 WEBSITE_MANIFEST_JSON=Website manifest.json Datei 
 WEBSITE_README=Datei README.md
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
+WEBSITE_KEYWORDSDesc=Verwenden Sie ein Komma, um Werte zu trennen
 EnterHereLicenseInformation=Geben Sie hier Metadaten oder Lizenzinformationen ein, um eine README.md-Datei zu füllen. Wenn Sie Ihre Website als Vorlage verteilen, wird die Datei in die Vorlage aufgenommen.
 HtmlHeaderPage=HTML Header (Nur für diese Seite)
 PageNameAliasHelp=Name oder Alias der Seite. <br>Dieser Alias wird auch zum erstellen einer SEO URL verwendet, wenn die Webseite auf einem Virtuellen Webserver läuft. Verwenden Sie der Button "<strong>%s</strong>" um den Alias zu ändern.
@@ -134,4 +134,4 @@ AvailableLanguagesAreDefinedIntoWebsiteProperties=Verfügbare Sprachen werden in
 ReplacementDoneInXPages=Ersetzt in %s Seiten oder Containern 
 RSSFeed=RSS Feed
 RSSFeedDesc=Über diese URL können Sie einen RSS-Feed mit den neuesten Artikeln vom Typ "Blogpost" abrufen
-PagesRegenerated=%s page(s)/container(s) regenerated
+PagesRegenerated=%s Seite(n) / Container neu generiert
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index 776347748f1..8ed5c2711fc 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Zahlungen per Lastschriftauftrag
-SuppliersStandingOrdersArea=Payments by Credit transfer
+SuppliersStandingOrdersArea=Zahlungen per Überweisung
 StandingOrdersPayment=SEPA Lastschrift
 StandingOrderPayment=Lastschrift
 NewStandingOrder=Neue Bestellung mit Zahlart Lastschrift 
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=neue Zahlung per Überweisung
 StandingOrderToProcess=Zu bearbeiten
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Überweisungsaufträge
+PaymentByBankTransferLines=Überweisungsauftragspositionen
 WithdrawalsReceipts=Lastschriften
 WithdrawalReceipt=Lastschrift
-BankTransferReceipts=Credit transfer order
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
+BankTransferReceipts=Überweisungsaufträge
+BankTransferReceipt=Überweisungsauftrag
+LatestBankTransferReceipts=Neueste %s Überweisungsaufträge
 LastWithdrawalReceipts=Letzte %s Abbuchungsbelege
 WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+CreditTransferLine=Überweisungspositionen
 WithdrawalsLines=Abbuchungszeilen
-CreditTransferLines=Credit transfer lines
+CreditTransferLines=Überweisungszeilen
 RequestStandingOrderToTreat=Requests for direct debit payment order to process
 RequestStandingOrderTreated=Requests for direct debit payment order processed
 RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
@@ -28,21 +28,21 @@ NbOfInvoiceToWithdrawWithInfo=Anzahl der Kundenrechnungen mit Lastschriftaufträ
 NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
 SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
 InvoiceWaitingWithdraw=Rechnung wartet auf Lastschrifteinzug
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Rechnung wartet auf Überweisung
 AmountToWithdraw=Abbuchungsbetrag
 NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
 NoSupplierInvoiceToWithdraw=Es wartet keine Lieferantenrechnung mit offenen 'Direktgutschriftsanträgen'. Gehen Sie auf die Registerkarte '%s' auf der Rechnungskarte, um eine Anfrage zu stellen.
 ResponsibleUser=Verantwortlicher Benutzer
 WithdrawalsSetup=Einstellungen für Lastschriftaufträge
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Setup Überweisungen
 WithdrawStatistics=Statistik Lastschriftzahlungen
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Statistiken Überweisungen
 Rejects=Ablehnungen
 LastWithdrawalReceipt=Letzte 1%s Einnahmen per Lastschrift
 MakeWithdrawRequest=Erstelle eine  Lastschrift
 MakeBankTransferOrder=Make a credit transfer request
 WithdrawRequestsDone=%s Lastschrift-Zahlungsaufforderungen aufgezeichnet
-ThirdPartyBankCode=BLZ Partner
+ThirdPartyBankCode=Bankcode Geschäftspartner
 NoInvoiceCouldBeWithdrawed=Keine Rechnung mit Erfolg eingezogen. Überprüfen Sie, ob die Rechnungen auf Unternehmen mit einer gültigen IBAN Nummer verweisen und die IBAN Nummer eine eindeutige Mandatsreferenz besitzt <strong>%s</strong>.
 ClassCredited=Als eingegangen markieren
 ClassCreditedConfirm=Möchten Sie diesen Abbuchungsbeleg wirklich als auf Ihrem Konto eingegangen markieren?
@@ -53,7 +53,7 @@ Lines=Zeilen
 StandingOrderReject=Ablehnung ausstellen
 WithdrawsRefused=Lastschrift-Einzug abgelehnt
 WithdrawalRefused=Abbuchung abgelehnt
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Überweisungen abgelehnt
 WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diesem Partner erstellen?
 RefusedData=Ablehnungsdatum
 RefusedReason=Ablehnungsgrund
@@ -63,7 +63,9 @@ InvoiceRefused=Rechnung abgelehnt (Abweisung dem Kunden berechnen)
 StatusDebitCredit=Status Debit/Kredit
 StatusWaiting=Wartend
 StatusTrans=Gesendet
+StatusDebited=Debited
 StatusCredited=Eingelöst
+StatusPaid=Bezahlt
 StatusRefused=Abgelehnt
 StatusMotif0=Nicht spezifiziert
 StatusMotif1=Unzureichende Deckung
@@ -77,25 +79,26 @@ StatusMotif8=Andere Gründe
 CreateForSepaFRST=Lastschriftdatei erstellen (SEPA FRST)
 CreateForSepaRCUR=Lastschriftdatei erstellen (SEPA RCUR)
 CreateAll=Lastschriftdatei erstellen (alle)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateSepaFileForPaymentByBankTransfer=Überweisungsdatei erstellen (SEPA)
 CreateGuichet=Nur Büro
 CreateBanque=Nur Bank
-OrderWaiting=Wartend
-NotifyTransmision=Abbuchungsüberweisung
-NotifyCredit=Abbuchungsgutschrift
-NumeroNationalEmetter=Nat. Überweisernummer
+OrderWaiting=Warte auf Bearbeitung
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
+NumeroNationalEmetter=Nationale Sendernummer
 WithBankUsingRIB=Bankkonten mit RIB
 WithBankUsingBANBIC=Bankkonten mit IBAN/BIC
 BankToReceiveWithdraw=Bankkonto für Abbuchungen
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToPayCreditTransfer=Bankkonto als Zahlungsquelle verwendet
 CreditDate=Am
 WithdrawalFileNotCapable=Abbuchungsformular für Ihr Land %s konnte nicht erstellt werden (Dieses Land wird nicht unterstützt).
 ShowWithdraw=Zeige Lastschrift
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Wenn auf der Rechnung mindestens ein Lastschrift-Zahlungsauftrag noch nicht verarbeitet wurde, wird dieser nicht als bezahlt festgelegt, um eine vorherige Abhebungsverwaltung zu ermöglichen.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Datei abbuchen
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Setze in Status "Datei versandt"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistiken nach Statuszeilen
@@ -105,7 +108,7 @@ RUMLong=Eindeutige Mandatsreferenz
 RUMWillBeGenerated=Wenn leer, wird die Mandatsreferenz generiert, sobald die Bankkontodaten gespeichert sind
 WithdrawMode=Lastschriftmodus (FRST oder RECUR)
 WithdrawRequestAmount=Lastschrifteinzug Einzugs Betrag:
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Betrag der Überweisungsanforderung:
 WithdrawRequestErrorNilAmount=Es kann keine Lastschriftanforderung für einen leeren Betrag erstellt werden.
 SepaMandate=SEPA-Lastschriftmandat
 SepaMandateShort=SEPA-Mandate
@@ -121,10 +124,11 @@ SEPAFrstOrRecur=Zahlungsart
 ModeRECUR=Wiederkehrende Zahlungen
 ModeFRST=Einmalzahlung
 PleaseCheckOne=Bitte prüfen sie nur eine
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Lastschrift %s erstellt
 AmountRequested=angeforderter Betrag
 SEPARCUR=SEPA CUR
-SEPAFRST=SEPA ERST
+SEPAFRST=SEPA FRST
 ExecutionDate=Ausführungsdatum
 CreateForSepa=Erstellen Sie eine Lastschriftdatei
 ICS=Gläubigeridentifikator CI
@@ -141,3 +145,4 @@ InfoTransData=Betrag: %s<br>Verwendungszweck: %s<br>Datum: %s
 InfoRejectSubject=Lastschriftauftrag abgelehnt
 InfoRejectMessage=Hallo,<br><br> der Lastschrift-Zahlungsauftrag der Rechnung %s im Zusammenhang mit dem Unternehmen %s, mit einem Betrag von %s wurde von der Bank abgelehnt <br> -- <br> %s
 ModeWarning=Echtzeit-Modus wurde nicht aktiviert, wir stoppen nach der Simulation.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 2303c72355e..9cde674b9e3 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow Moduleinstellungen
+WorkflowSetup=Einstellungen Modul Workflow
 WorkflowDesc=Dieses Modul liefert verschiedene, automatisierte Aktionen. Standardmäßig ist der Workflow flexibel (d.h. Sie sind frei in der Reihenfolge der Abarbeitung) aber über diesen Modul können Sie einige Aktionen automatisiert ablaufen lassen.
 ThereIsNoWorkflowToModify=Es sind keine Workflow-Änderungen möglich mit den aktivierten Modulen.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erstellt automatisch eine Bestellung, nachdem ein Angebot als "unterzeichnet" markiert wurde. Die neue Bestellung hat dann den selben Wert wie das Angebot.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erstelle automatisch einen Kundenauftrag, nachdem ein Angebot auf "unterzeichnet" gesetzt wurde. Die neue Bestellung hat dann den selben Wert wie das Angebot.
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem ein Angebot als "unterzeichnet" markiert wurde. Diese neue Kundenrechnung lautet über den selben Betrag wie das Angebot.
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Erstelle automatisch eine Kundenrechnung, nachdem der Vertrag bestätigt wurde.
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem eine Bestellung geschlossen wurde. Die neue Kundenrechnung lautet über den selben Betrag wie die Bestellung.
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Kennzeichne die verknüpften Auftr
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Setzt das verknüpfte Lieferantenangebot auf "abgerechnet", sofern die Lieferanrenrechnung erstellt wurde und sofern der Rechnungsbetrag identisch zur Angebotsumme ist. 
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Kennzeichne die verknüpfte Einkaufsbestellung als abgerechnet wenn die Lieferantenrechnung erstellt wurde und wenn die Beträge überein stimmen.
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=automatische Erstellung
 AutomaticClassification=Automatische Klassifikation
diff --git a/htdocs/langs/de_DE/zapier.lang b/htdocs/langs/de_DE/zapier.lang
index 5922ed95485..4d874ef8f7f 100644
--- a/htdocs/langs/de_DE/zapier.lang
+++ b/htdocs/langs/de_DE/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Modul: Zapier für Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Zapier für Dolibarr einrichten
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 57d08cd31b7..598f5dc9ab5 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Να επιτρέπεται η διαχείριση δι
 BANK_DISABLE_DIRECT_INPUT=Απενεργοποιήστε την απευθείας εγγραφή συναλλαγής σε τραπεζικό λογαριασμό
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποιήστε το σχέδιο εξαγωγής στο περιοδικό
 ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας για επικουρικό λογαριασμό (μπορεί να είναι αργή αν έχετε πολλούς τρίτους)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
@@ -284,6 +285,7 @@ ShowTutorial=Εμφάνιση εκπαιδευτικού προγράμματο
 NotReconciled=Δεν ταιριάζουν
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Εφαρμογή κατηγοριών μάζας
 AddAccountFromBookKeepingWithNoCategories=Διαθέσιμος λογαριασμός που δεν έχει ακόμα εγγραφεί στην εξατομικευμένη ομάδα
 CategoryDeleted=Η κατηγορία για τον λογαριασμό λογιστηρίου έχει καταργηθεί
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index ce2117d1079..a5208c3615a 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Προεπιλεγμένο μήνυμα αποστο
 UserEmail=Ηλεκτρονικό ταχυδρομείο χρήστη
 CompanyEmail=Εταιρεία ηλεκτρονικού ταχυδρομείου
 FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι διαθέσιμη σε συστήματα Unix like. Δοκιμάστε το πρόγραμμα sendmail τοπικά.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Εάν η μετάφραση για αυτήν τη γλώσσα δεν είναι πλήρης ή βρίσκετε σφάλματα, μπορείτε να διορθώσετε αυτό με την επεξεργασία αρχείων στον κατάλογο <b>langs / %s</b> και να υποβάλετε την αλλαγή σας στο www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Εάν η μετάφραση για αυτήν τη γλώσσα δεν είναι πλήρης ή βρίσκετε σφάλματα, μπορείτε να διορθώσετε αυτήν την ενέργεια επεξεργάζοντας τα αρχεία σε <b>langs / %s</b> και να υποβάλλετε τροποποιημένα αρχεία σε dolibarr.org/forum ή για προγραμματιστές στο github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Διαχείριση Αρθρώματος
 ModulesSetup=Ενότητες / Ρύθμιση εφαρμογής
 ModuleFamilyBase=Σύστημα
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Το άρθρωμα <b>%s</b> πρέπει να ενε
 SecurityToken=Security Token
 NoSmsEngine=Δεν διατίθεται διαχειριστής αποστολέων SMS. Ένας διαχειριστής αποστολέα SMS δεν είναι εγκατεστημένος με την προεπιλεγμένη διανομή επειδή εξαρτάται από έναν εξωτερικό προμηθευτή, αλλά μπορείτε να βρείτε μερικούς από τους %s
 PDF=PDF
-PDFDesc=Γενικές επιλογές για δημιουργία PDF.
-PDFAddressForging=Κανόνες για πλαίσια διευθύνσεων
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με το φόρο επί των πωλήσεων / ΦΠΑ
 PDFRulesForSalesTax=Κανόνες φόρου επί των πωλήσεων / ΦΠΑ
 PDFLocaltax=Κανόνες για %s
-HideLocalTaxOnPDF=Απόκρυψη συντελεστή %s στη στήλη Φόρος Πωλήσεων
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Απόκρυψη περιγραφής προϊόντων
 HideRefOnPDF=Απόκρυψη προϊόντων ref.
 HideDetailsOnPDF=Απόκρυψη λεπτομερειών γραμμών προϊόντων
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τ
 MassConvert=Ξεκινήστε τη μαζική μετατροπή
 PriceFormatInCurrentLanguage=Μορφή τιμής στην τρέχουσα γλώσσα
 String=String
+String1Line=String (1 line)
 TextLong=Μεγάλο κείμενο
+TextLongNLines=Long text (n lines)
 HtmlText=Html κείμενο
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Διαχείριση συμβολαίων (υπηρεσίες ή ε
 Module55Name=Barcodes
 Module55Desc=Διαχείριση barcode
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Πληρωμές με χρεώσεις της Τράπεζας Direct
-Module57Desc=Διαχείριση εντολών πληρωμής άμεσης χρέωσης. Περιλαμβάνει τη δημιουργία αρχείου SEPA για τις ευρωπαϊκές χώρες.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Ενοποίηση ενός συστήματος ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Δημιουργία / τροποποίηση υπηρεσιών
 Permission534=Διαγραφή υπηρεσιών
 Permission536=Δείτε / διαχειριστείτε τις κρυφές υπηρεσίες
 Permission538=Εξαγωγή υπηρεσιών
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Διαβάστε τα Γραμμάτια Υλικών
 Permission651=Δημιουργία / Ενημέρωση τιμολογίων
 Permission652=Διαγραφή λογαριασμών
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Διαβάστε τις δωρεές
 Permission702=Δημιουργία / τροποποίηση δωρεές
 Permission703=Διαγραφή δωρεές
@@ -848,6 +858,8 @@ Permission773=Διαγραφή αναφοράς εξόδων
 Permission774=Διαβάστε όλες τις αναφορές δαπανών (ακόμη και για χρήστες που δεν είναι υφιστάμενοι)
 Permission775=Έγκριση σε αναφορές εξόδων
 Permission776=Πληρωμή αναφοράς εξόδων
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Εξαγωγή αναφοράς εξόδων
 Permission1001=Διαβάστε τα αποθέματα
 Permission1002=Δημιουργία/τροποποίηση αποθηκών
@@ -900,6 +912,7 @@ Permission2515=Ρύθμιση καταλόγων εγγράφων
 Permission2801=Χρησιμοποίησε FTP πελάτη σε λειτουργία ανάγνωσης (περιήγηση και λήψη μόνο)
 Permission2802=Χρησιμοποίησε FTP πελάτη σε λειτουργία εγγραφής (διαγραφή ή μεταφόρτωση αρχείων)
 Permission3200=Διαβάστε αρχειακά συμβάντα και δακτυλικά αποτυπώματα
+Permission3301=Generate new modules
 Permission4001=Δείτε τους υπαλλήλους
 Permission4002=Δημιουργήστε υπαλλήλους
 Permission4003=Διαγράψτε τους υπαλλήλους
@@ -947,7 +960,8 @@ Permission63003=Διαγράψτε τους πόρους
 Permission63004=Συνδέστε τους πόρους στις εκδηλώσεις της ατζέντας
 DictionaryCompanyType=Τύποι τρίτου μέρους
 DictionaryCompanyJuridicalType=Νομικές οντότητες τρίτων
-DictionaryProspectLevel=Δυναμική προοπτικής
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Κράτη / Επαρχίες
 DictionaryRegion=Περιοχές
 DictionaryCountry=Χώρες
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Πρότυπα ηλεκτρονικού ταχυδρο
 DictionaryUnits=Μονάδες
 DictionaryMeasuringUnits=Μονάδες μέτρησης
 DictionarySocialNetworks=Κοινωνικά Δίκτυα
-DictionaryProspectStatus=Κατάσταση προοπτικής
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Είδη αδειών
 DictionaryOpportunityStatus=Κατάσταση μολύβδου για έργο / μόλυβδο
 DictionaryExpenseTaxCat=Έκθεση δαπανών - Κατηγορίες μεταφορών
@@ -1076,7 +1091,7 @@ LoginPage=Σελίδα σύνδεσης
 BackgroundImageLogin=Εικόνα φόντου
 PermanentLeftSearchForm=Μόνιμη φόρμα αναζήτησης στο αριστερό μενού
 DefaultLanguage=Προεπιλεγμένη γλώσσα
-EnableMultilangInterface=Ενεργοποιήστε την πολυγλωσσική υποστήριξη
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Εμφανίστε το λογότυπο της εταιρείας στο μενού
 CompanyInfo=Εταιρεία / Οργανισμός
 CompanyIds=Ταυτότητα εταιρείας / οργανισμού
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Απαιτείται ένα κριτήρ
 NewTranslationStringToShow=Νέα συμβολοσειρά μετάφρασης για εμφάνιση
 OriginalValueWas=Η αρχική μετάφραση αντικαθίσταται. Η αρχική τιμή ήταν: <br><br> %s
 TransKeyWithoutOriginalValue=Αναγκάσθηκε μια νέα μετάφραση για το κλειδί μετάφρασης &#39; <strong>%s</strong> &#39; που δεν υπάρχει σε κανένα αρχείο γλώσσας
-TotalNumberOfActivatedModules=Ενεργοποιημένη εφαρμογή / ενότητες: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Η κλάση %s δεν βρέθηκε στη διαδρομή PHP
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Χρήση τύπων συμβάντων (διαχειρί
 AGENDA_USE_EVENT_TYPE_DEFAULT=Αυτόματη ρύθμιση αυτής της προεπιλεγμένης τιμής για τον τύπο συμβάντος στη φόρμα δημιουργίας συμβάντος
 AGENDA_DEFAULT_FILTER_TYPE=Αυτόματη ρύθμιση αυτού του τύπου συμβάντος στο φίλτρο αναζήτησης της προβολής ατζέντας
 AGENDA_DEFAULT_FILTER_STATUS=Αυτόματη ρύθμιση αυτής της κατάστασης για συμβάντα στο φίλτρο αναζήτησης της προβολής ατζέντας
-AGENDA_DEFAULT_VIEW=Ποια καρτέλα θέλετε να ανοίξετε από προεπιλογή κατά την επιλογή του μενού Ατζέντα
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Ενεργοποιήστε την υπενθύμιση συμβάντων <b>μέσω μηνυμάτων ηλεκτρονικού ταχυδρομείου</b> (η επιλογή επιλογής / καθυστέρησης μπορεί να οριστεί σε κάθε συμβάν). Σημείωση: Η ενότητα <strong>%s</strong> πρέπει να ενεργοποιηθεί και να ρυθμιστεί σωστά ώστε να έχει αποσταλεί υπενθύμιση στη σωστή συχνότητα.
 AGENDA_REMINDER_BROWSER=Ενεργοποίηση υπενθύμισης συμβάντων <b>στο πρόγραμμα περιήγησης του χρήστη</b> (όταν φτάσει η ημερομηνία συμβάντος, κάθε χρήστης μπορεί να το αρνηθεί από την ερώτηση επιβεβαίωσης του προγράμματος περιήγησης)
 AGENDA_REMINDER_BROWSER_SOUND=Ενεργοποίηση ειδοποίησης ήχου
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Εμφάνιση συνδεδεμένου αντικε
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Η διεύθυνση URL ονομάζεται όταν γίνεται κλικ στο τηλέφωνο picto. Στη διεύθυνση URL, μπορείτε να χρησιμοποιήσετε ετικέτες <br> <b>__PHONETO__</b> που θα αντικατασταθεί με τον αριθμό τηλεφώνου του ατόμου που καλεί <br> <b>__PHONEFROM__</b> που θα αντικατασταθεί με τον αριθμό τηλεφώνου του καλούντος (του δικού σας) <br> <b>__LOGIN__</b> που θα αντικατασταθεί με σύνδεση με κλικ (καθορισμένη στην κάρτα χρήστη) <br> <b>__PASS__</b> που θα αντικατασταθεί με κωδικό πρόσβασης (που ορίζεται στην κάρτα χρήστη).
-ClickToDialDesc=Αυτή η ενότητα δημιουργεί τηλεφωνικούς αριθμούς με συνδέσμους με δυνατότητα κλικ. Κάνοντας κλικ στο εικονίδιο, το τηλέφωνό σας θα καλέσει τον αριθμό. Αυτό μπορεί να χρησιμοποιηθεί για να καλέσετε ένα σύστημα τηλεφωνικού κέντρου από το Dolibarr που μπορεί να καλέσει τον αριθμό τηλεφώνου σε ένα σύστημα SIP, για παράδειγμα.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Χρησιμοποιήστε μόνο έναν σύνδεσμο &quot;τηλ::&quot; σε αριθμούς τηλεφώνου
 ClickToDialUseTelLinkDesc=Χρησιμοποιήστε αυτή τη μέθοδο εάν οι χρήστες σας έχουν ένα λογισμικό softphone ή μια διασύνδεση λογισμικού που είναι εγκατεστημένος στον ίδιο υπολογιστή με το πρόγραμμα περιήγησης και καλούνται όταν κάνετε κλικ σε ένα σύνδεσμο στο πρόγραμμα περιήγησης που ξεκινάει με &quot;tel:&quot;. Αν χρειάζεστε μια λύση πλήρους διακομιστή (δεν χρειάζεται τοπική εγκατάσταση λογισμικού), πρέπει να το ορίσετε σε &quot;Όχι&quot; και να συμπληρώσετε το επόμενο πεδίο.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Αυτό το πεδίο περιέχει μια αναφορά γ
 Enter0or1=Εισαγάγετε 0 ή 1
 UnicodeCurrency=Εισαγάγετε εδώ μεταξύ τιράντες, λίστα αριθμού byte που αντιπροσωπεύει το σύμβολο νομίσματος. Για παράδειγμα: για το $, πληκτρολογήστε [36] - για την Βραζιλία, το πραγματικό R $ [82,36] - για €, πληκτρολογήστε [8364]
 ColorFormat=Το χρώμα RGB είναι σε μορφή HEX, π.χ.: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Θέση γραμμής σε σύνθετο πλαίσιο
 SellTaxRate=Φόρος πωλήσεων
 RecuperableOnly=Ναι για ΦΠΑ &quot;Δεν γίνεται αντιληπτό αλλά ανακτήσιμο&quot; αφιερωμένο σε κάποια χώρα στη Γαλλία. Διατηρήστε την τιμή &quot;Όχι&quot; σε όλες τις άλλες περιπτώσεις.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Αίτημα προσφοράς
 MailToSendSupplierOrder=Εντολές αγοράς
 MailToSendSupplierInvoice=Τιμολόγια προμηθευτή
 MailToSendContract=Συμβόλαια
+MailToSendReception=Receptions
 MailToThirdparty=Πελ./Προμ.
 MailToMember=Μέλη
 MailToUser=Χρήστες
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Το Dolibarr ERP &amp; CRM %s είναι δ
 ExampleOfNewsMessageForMaintenanceRelease=Το Dolibarr ERP &amp; CRM %s είναι διαθέσιμο. Η έκδοση %s είναι μια έκδοση συντήρησης, έτσι περιέχει μόνο διορθώσεις σφαλμάτων. Συνιστούμε σε όλους τους χρήστες να αναβαθμίσουν σε αυτήν την έκδοση. Μια έκδοση συντήρησης δεν εισάγει νέες λειτουργίες ή αλλαγές στη βάση δεδομένων. Μπορείτε να το κατεβάσετε από την περιοχή λήψης της πύλης https://www.dolibarr.org (υποκατάστατο Σταθερές εκδόσεις). Μπορείτε να διαβάσετε το <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> για την πλήρη λίστα των αλλαγών.
 MultiPriceRuleDesc=Όταν είναι ενεργοποιημένη η επιλογή &quot;Πολλά επίπεδα τιμών ανά προϊόν / υπηρεσία&quot;, μπορείτε να ορίσετε διαφορετικές τιμές (μία ανά επίπεδο τιμής) για κάθε προϊόν. Για να εξοικονομήσετε χρόνο, μπορείτε να εισαγάγετε έναν κανόνα για να υπολογίσετε αυτόματα μια τιμή για κάθε επίπεδο με βάση την τιμή του πρώτου επιπέδου, οπότε θα πρέπει να εισαγάγετε μόνο μια τιμή για το πρώτο επίπεδο για κάθε προϊόν. Αυτή η σελίδα έχει σχεδιαστεί για να σας εξοικονομήσει χρόνο αλλά είναι χρήσιμη μόνο αν οι τιμές σας για κάθε επίπεδο είναι σχετικές με το πρώτο επίπεδο. Μπορείτε να αγνοήσετε αυτή τη σελίδα στις περισσότερες περιπτώσεις.
 ModelModulesProduct=Πρότυπα για έγγραφα προϊόντων
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=Για να μπορείτε να δημιουργείτε αυτόματα κωδικούς, πρέπει πρώτα να ορίσετε έναν διαχειριστή για τον αυτόματο ορισμό του αριθμού γραμμικού κώδικα.
 SeeSubstitutionVars=Δείτε τη σημείωση * για λίστα πιθανών μεταβλητών υποκατάστασης
 SeeChangeLog=Δείτε το αρχείο ChangeLog (μόνο στα αγγλικά)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Αριστερό περιθώριο σε PDF
 MAIN_PDF_MARGIN_RIGHT=Δεξί περιθώριο στο PDF
 MAIN_PDF_MARGIN_TOP=Κορυφή περιθώριο σε PDF
 MAIN_PDF_MARGIN_BOTTOM=Κάτω περιθώριο σε PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Δεν απαιτείται συγκεκριμένη ρύθμιση για αυτήν την ενότητα.
 SetToYesIfGroupIsComputationOfOtherGroups=Ορίστε αυτό το ναι αν αυτή η ομάδα είναι ένας υπολογισμός άλλων ομάδων
 EnterCalculationRuleIfPreviousFieldIsYes=Εισαγάγετε τον κανόνα υπολογισμού εάν το προηγούμενο πεδίο είχε οριστεί σε Ναι (για παράδειγμα &#39;CODEGRP1 + CODEGRP2&#39;)
@@ -1933,13 +1953,14 @@ NothingProcessed=Τίποτα δεν έγινε
 XEmailsDoneYActionsDone=%s τα κατάλληλα μηνύματα ηλεκτρονικού ταχυδρομείου, τα emails %s υποβλήθηκαν σε επιτυχή επεξεργασία (για %s η εγγραφή / οι ενέργειες έγιναν)
 RecordEvent=Εγγραφή συμβάντος ηλεκτρονικού ταχυδρομείου
 CreateLeadAndThirdParty=Δημιουργία μολύβδου (και τρίτου εάν είναι απαραίτητο)
-CreateTicketAndThirdParty=Δημιουργία εισιτηρίου (και τρίτου εάν είναι απαραίτητο)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Τελευταίος κωδικός αποτελέσματος
 NbOfEmailsInInbox=Αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου στον κατάλογο προέλευσης
 LoadThirdPartyFromName=Φόρτωση αναζήτησης τρίτου μέρους στο %s (μόνο φόρτωση)
 LoadThirdPartyFromNameOrCreate=Φόρτωση αναζήτησης τρίτου μέρους στο %s (δημιουργία αν δεν βρεθεί)
-WithDolTrackingID=Αναφορά Dolibarr που βρίσκεται στο ID του μηνύματος
-WithoutDolTrackingID= \nΑναφορά Dolibarr που δεν βρίσκεται στο ID του μηνύματος
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Κωδικός εισόδου μενού (mainmenu)
 ECMAutoTree=Εμφάνιση αυτόματης δομής ECM
@@ -1981,7 +2002,7 @@ ImportSetup=Ρύθμιση εισαγωγής λειτουργικής μονά
 InstanceUniqueID=Μοναδικό αναγνωριστικό της παρουσίας
 SmallerThan=Μικρότερη από
 LargerThan=Μεγαλύτερο από
-IfTrackingIDFoundEventWillBeLinked=Σημειώστε ότι Εάν εντοπιστεί ένα αναγνωριστικό παρακολούθησης στα εισερχόμενα μηνύματα ηλεκτρονικού ταχυδρομείου, το συμβάν θα συνδεθεί αυτόματα με τα σχετικά αντικείμενα.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Με ένα λογαριασμό GMail, εάν έχετε ενεργοποιήσει την επικύρωση 2 βημάτων, σας συνιστούμε να δημιουργήσετε έναν ειδικό δευτερεύοντα κωδικό πρόσβασης για την εφαρμογή αντί να χρησιμοποιήσετε τη δική σας passsword από 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=Μπορείτε να χρησιμοποιήσετε αυτήν την ενέργεια για να χρησιμοποιήσετε το περιεχόμενο ηλεκτρονικού ταχυδρομείου για να βρείτε και να φορτώσετε ένα υπάρχον τρίτο μέρος στη βάση δεδομένων σας. Το τρίτο μέρος που βρέθηκε (ή δημιουργήθηκε) θα χρησιμοποιηθεί για τις ακόλουθες ενέργειες που το χρειάζονται. Στο πεδίο παραμέτρων μπορείτε να χρησιμοποιήσετε για παράδειγμα το EXTRACT: BODY: Name: \\ s ([^ \\ s] *) εάν θέλετε να εξαγάγετε το όνομα του τρίτου μέρους από μια συμβολοσειρά 'Name: name to find' μέσα στο σώμα της εντολής.
@@ -2005,3 +2026,7 @@ RssNote=Σημείωση: Κάθε ορισμός τροφοδοσίας RSS π
 JumpToBoxes=Μετάβαση στη ρύθμιση -> Widgets
 MeasuringUnitTypeDesc=Χρησιμοποιήστε εδώ μια τιμή όπως "μέγεθος", "επιφάνεια", "όγκος", "βάρος", "χρόνος"
 MeasuringScaleDesc=Η κλίμακα είναι ο αριθμός των θέσεων που πρέπει να μετακινήσετε το δεκαδικό μέρος ώστε να ταιριάζει με την προεπιλεγμένη μονάδα αναφοράς. Για τον τύπο μονάδας "time", είναι ο αριθμός των δευτερολέπτων. Οι τιμές μεταξύ 80 και 99 είναι δεσμευμένες τιμές.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 299f3af2faf..f4220eb7dc8 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Αριθμός γεγονότων
 ListOfActions=Λίστα γεγονότων
 EventReports=Αναφορές συμβάντων
 Location=Τοποθεσία
-ToUserOfGroup=Σε κάθε χρήστη της ομάδας
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Ολοήμερο Γεγονός
 MenuToDoActions=Όλες οι ημιτελής ενέργειες
 MenuDoneActions=Όλες οι ολοκληρ. ενέργειες
@@ -86,6 +86,8 @@ ProposalDeleted=Η προσφορά διαγράφηκε
 OrderDeleted=Η παραγγελία διαγράφηκε
 InvoiceDeleted=Το τιμολόγιο διαγράφηκε
 DraftInvoiceDeleted=Το πρόχειρο τιμολόγιο διαγράφηκε
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Το προϊόν %s δημιουργήθηκε
 PRODUCT_MODIFYInDolibarr=Το προϊόν %s τροποποιήθηκε
 PRODUCT_DELETEInDolibarr=Το προϊόν %s διαγράφηκε
@@ -158,3 +160,9 @@ DateStartPlusOne=Έναρξη ημέρας + 1 ώρα
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index adbaf333776..bc59ca654da 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Οι τελευταίοι %s κατέγραψαν προμ
 BoxTitleLastModifiedSuppliers=Προμηθευτές: τελευταία τροποποίηση %s
 BoxTitleLastModifiedCustomers=Πελάτες: τελευταία τροποποίηση %s
 BoxTitleLastCustomersOrProspects=Τελευταίοι %s πελάτες ή προοπτικές
-BoxTitleLastCustomerBills=Τελευταία %s Τιμολόγια πελατών
-BoxTitleLastSupplierBills=Τελευταία %s Τιμολόγια προμηθευτή
+BoxTitleLastCustomerBills=Τελευταία τιμολόγια πελατών τροποποιημένα %s
+BoxTitleLastSupplierBills=Τελευταία %s τροποποιημένα τιμολόγια προμηθευτών
 BoxTitleLastModifiedProspects=Προοπτικές: τελευταία τροποποίηση %s
 BoxTitleLastModifiedMembers=Τελευταία %s Μέλη
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Παραγγελίες προμηθευτή
 BoxTitleLastModifiedCustomerBills=Τιμολόγια πελατών: τροποποιήθηκε τελευταία %s
 BoxTitleLastModifiedCustomerOrders=Παραγγελίες πώλησης: τελευταία τροποποίηση %s
 BoxTitleLastModifiedPropals=Τελευταίες τροποποιημένες προτάσεις %s
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Τιμολόγια Πελάτη
 ForCustomersOrders=Παραγγελίες πελατών
 ForProposals=Προσφορές
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Ο λογαριασμός Suspense δεν έχει ο
 BoxLastCustomerShipments=Τελευταίες αποστολές πελάτη
 BoxTitleLastCustomerShipments=Τελευταίες %s αποστολές πελάτη
 NoRecordedShipments=Καμία καταγεγραμμένη αποστολή πελάτη
+# Pages
+AccountancyHome=Λογιστική
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index cad08d2b11d..53dcd336847 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=Μονάδα POS
 BasicPhoneLayout=Χρησιμοποιήστε τη βασική διάταξη για τα τηλέφωνα
 SetupOfTerminalNotComplete=Η εγκατάσταση του τερματικού %s δεν έχει ολοκληρωθεί
 DirectPayment=Άμεση πληρωμή
-DirectPaymentButton=Πλήκτρο άμεσης πληρωμής μετρητών
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Το τιμολόγιο έχει ήδη επικυρωθεί
 NoLinesToBill=Δεν υπάρχουν γραμμές που να χρεώνουν
 CustomReceipt=Προσαρμοσμένη παραλαβή
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Εξωτερική μονάδα με επιπ
 PrintMethod=Μέθοδος εκτύπωσης
 ReceiptPrinterMethodDescription=Ισχυρή μέθοδος με πολλές παραμέτρους. Πλήρως προσαρμόσιμο με πρότυπα. Δεν είναι δυνατή η εκτύπωση από το σύννεφο.
 ByTerminal=Από τερματικό
-TakeposNumpadUsePaymentIcon=Χρησιμοποιήστε το εικονίδιο πληρωμής στο Numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> ετικέτα χρησιμοποιείται για την προσθήκη του αριθμού τερματικού
 TakeposGroupSameProduct=Ομαδοποιήστε τις ίδιες σειρές προϊόντων
 StartAParallelSale=Ξεκινήστε μια νέα παράλληλη πώληση
-ControlCashOpening=Ελέγξτε το κουτί μετρητών κατά το άνοιγμα θέσης
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Κλείστε το φράχτη μετρητών
 CashReport=Έκθεση μετρητών
 MainPrinterToUse=Κύριος εκτυπωτής προς χρήση
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index d187476e8bb..274e8851e74 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Κοινωνική ή φορολογική εισφορά
 SocialContributions=Κοινωνικές ή φορολογικές εισφορές
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Ειδικά έξοδα
@@ -157,9 +158,9 @@ SeeReportInInputOutputMode=Ανατρέξτε στο %sanalysis of payments%s γ
 SeeReportInDueDebtMode=Ανατρέξτε στο %sanalysis των τιμολογίων%s για έναν υπολογισμό βασισμένο σε γνωστά καταγεγραμμένα τιμολόγια, ακόμη και αν δεν έχουν ακόμη καταλογιστεί στο Ledger.
 SeeReportInBookkeepingMode=Δείτε <b>%sBookeeping report%s</b> για έναν υπολογισμό στον <b>πίνακα &quot;</b> <b>Λογαριασμός Λογιστηρίου&quot;</b>
 RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultDue=- Περιλαμβάνει εκκρεμή τιμολόγια, έξοδα, ΦΠΑ, δωρεές είτε πληρώνονται είτε όχι. Περιλαμβάνει επίσης πληρωμένους μισθούς. <br> - Βασίζεται στην ημερομηνία χρέωσης των τιμολογίων και στην ημερομηνία λήξης των εξόδων ή των φόρων. Για τους μισθούς που ορίζονται με την ενότητα Μισθός, χρησιμοποιείται η ημερομηνία αξίας πληρωμής.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCADue=- Περιλαμβάνει τα οφειλόμενα τιμολόγια του πελάτη, είτε πληρώνονται είτε όχι. <br> - Βασίζεται στην ημερομηνία χρέωσης αυτών των τιμολογίων. <br>
 RulesCAIn=- Περιλαμβάνει όλες τις πραγματικές πληρωμές τιμολογίων που εισπράττονται από πελάτες. <br> - Βασίζεται στην ημερομηνία πληρωμής αυτών των τιμολογίων <br>
 RulesCATotalSaleJournal=Περιλαμβάνει όλες τις πιστωτικές γραμμές από το περιοδικό Sale.
 RulesAmountOnInOutBookkeepingRecord=Περιλαμβάνει την εγγραφή στον Λογαριασμό σας με Λογαριασμούς Λογαριασμού που έχει την ομάδα &quot;ΕΞΟΔΑ&quot; ή &quot;ΕΙΣΟΔΟΣ&quot;
@@ -255,10 +256,12 @@ TurnoverbyVatrate=Ο κύκλος εργασιών τιμολογείται απ
 TurnoverCollectedbyVatrate=Ο κύκλος εργασιών που εισπράττεται από το φορολογικό συντελεστή πώλησης
 PurchasebyVatrate=Ποσοστό φόρου επί των πωλήσεων
 LabelToShow=Σύντομη ετικέτα
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
+PurchaseTurnover=Κύκλος εργασιών αγοράς
+PurchaseTurnoverCollected=Συλλέχθηκε ο κύκλος εργασιών αγοράς
+RulesPurchaseTurnoverDue=- Περιλαμβάνει τα οφειλόμενα τιμολόγια του προμηθευτή, είτε πληρώνονται είτε όχι. <br> - Βασίζεται στην ημερομηνία τιμολογίου αυτών των τιμολογίων. <br>
+RulesPurchaseTurnoverIn=- Περιλαμβάνει όλες τις αποτελεσματικές πληρωμές τιμολογίων που πραγματοποιούνται σε προμηθευτές. <br> - Βασίζεται στην ημερομηνία πληρωμής αυτών των τιμολογίων <br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Περιλαμβάνει όλες τις χρεωστικές γραμμές από το περιοδικό αγορών.
+ReportPurchaseTurnover=Τιμολόγηση κύκλου εργασιών αγοράς
+ReportPurchaseTurnoverCollected=Συλλέχθηκε ο κύκλος εργασιών αγοράς
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index 44e5a7b609b..f97abb6769c 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Ενεργές Υπηρεσίες
 MenuExpiredServices=Ληγμένες Υπηρεσίες
 MenuClosedServices=Τερματισμένες Υπηρεσίες
 NewContract=Νέο Συμβόλαιο
-NewContractSubscription=Νέα σύμβαση/συνδρομή
+NewContractSubscription=New contract or subscription
 AddContract=Δημιουργία σύμβασης
 DeleteAContract=Διαγραφή Συμβολαίου
 ActivateAllOnContract=Ενεργοποιήστε όλες τις υπηρεσίες
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 126a486b0c4..393b97c7174 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Η σύνδεση με τη βάση δεδομένων αποτυγχάνει. Ελέγξτε ότι ο διακομιστής βάσης δεδομένων εκτελείται (για παράδειγμα, με το mysql / mariadb, μπορείτε να το ξεκινήσετε από τη γραμμή εντολών με το &#39;sudo service mysql start&#39;).
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=Η ημερομηνία δεν μπορεί να είναι μεταγενέστερη από τη σημερινή
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Σφάλμα, η PHP σας πρέπει να έχει το module <b>%s</ b> εγκατεστημένο για να χρησιμοποιήσετε αυτήν τη δυνατότητα.
 ErrorOpenIDSetupNotComplete=Μπορείτε να ρυθμίσετε το Dolibarr αρχείο config να επιτρέψει OpenID ταυτότητα, αλλά το URL OpenID υπηρεσίας δεν ορίζεται σε συνεχή %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Δεν υπάρχει αρ
 ErrorOnlyOneFieldForGroupByIsPossible=Είναι δυνατό μόνο 1 πεδίο για την «Ομάδα κατά» (άλλα απορρίπτονται)
 ErrorTooManyDifferentValueForSelectedGroupBy=Βρέθηκαν πάρα πολλές διαφορετικές τιμές (περισσότερες από <b> %s </b>) για το πεδίο "<b> %s </b>", οπότε δεν μπορούμε να το χρησιμοποιήσουμε ως γραφικά " Το πεδίο "Group By" έχει αφαιρεθεί. Μπορεί να θέλετε να το χρησιμοποιήσετε ως άξονα X;
 ErrorReplaceStringEmpty=Σφάλμα, η συμβολοσειρά για αντικατάσταση είναι κενή
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτό δεν είναι μια σταθερή ρύθμιση.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang
index d5115d8c6c6..da99fbcb992 100644
--- a/htdocs/langs/el_GR/languages.lang
+++ b/htdocs/langs/el_GR/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Αραβικά
 Language_ar_EG=Αραβικά (Αίγυπτος)
 Language_ar_SA=Αραβικά
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Βουλγαρικά
 Language_bs_BA=Βοσνιακά
 Language_ca_ES=Καταλανικά
@@ -20,6 +23,7 @@ Language_en_GB=Αγγλικά (Ηνωμένο Βασίλειο)
 Language_en_IN=Αγγλικά (Ινδία)
 Language_en_NZ=Αγγλικά (Νέα Ζηλανδία)
 Language_en_SA=Αγγλικά (Σαουδική Αραβία)
+Language_en_SG=English (Singapore)
 Language_en_US=Αγγλικά (Ηνωμένων Πολιτειών)
 Language_en_ZA=Αγγλικά (Νότια Αφρική)
 Language_es_ES=Ισπανικά
@@ -29,6 +33,7 @@ Language_es_CL=Ισπανικά (Χιλή)
 Language_es_CO=Ισπανικά (Κολομβίας)
 Language_es_DO=Ισπανικά (Δομινικανή Δημοκρατία)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Ισπανικά (Ονδούρα)
 Language_es_MX=Ισπανικά (Μεξικό)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Ισπανικά (Παραγουάη)
 Language_es_PE=Ισπανικά (Περού)
 Language_es_PR=Ισπανικά (Πουέρτο Ρίκο)
 Language_es_UY=Ισπανικά (Ουρουγουάη)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Ισπανικά (Βενεζουέλας)
 Language_et_EE=Εσθονίας
 Language_eu_ES=Βάσκων
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Γαλλικά (Βέλγιο)
 Language_fr_CA=Γαλλικά (Καναδά)
 Language_fr_CH=Γαλλικά (Ελβετία)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Γαλλικά
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Γαλλικά (Νέα Καληδονία)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Εβραϊκά
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Κροατία
 Language_hu_HU=Ουγγρικά
 Language_id_ID=Ινδονησίας
 Language_is_IS=Ισλανδικά
 Language_it_IT=Ιταλικά
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Ιαπωνικά
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,8 +77,9 @@ Language_lv_LV=Λετονίας
 Language_mk_MK=πΓΔΜ
 Language_mn_MN=Mongolian
 Language_nb_NO=Νορβηγικά (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Ολλανδικά (Βέλγιο)
-Language_nl_NL=Dutch
+Language_nl_NL=Ολλανδός
 Language_pl_PL=Πολωνικά
 Language_pt_BR=Πορτογαλικά (Βραζιλίας)
 Language_pt_PT=Πορτογαλικά
@@ -86,4 +100,5 @@ Language_uz_UZ=Ουζμπεκιστάν
 Language_vi_VN=Βιετνάμ
 Language_zh_CN=Κινέζικα
 Language_zh_TW=Κινέζικα (παραδοσιακά)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 42f4399baf0..cd95cc106e2 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -164,7 +164,11 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetupForEmailing=Εγκατάσταση εξερχόμενου email (για ενότητα %s)
 DefaultOutgoingEmailSetup=Προεπιλεγμένη ρύθμιση εξερχόμενων email
 Information=Πληροφορίες
 ContactsWithThirdpartyFilter=Επαφές με φίλτρο τρίτου μέρους
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index f616bc7c169..fcac93efc25 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=Τιμή μον. (συμπ. Φ.Π.Α.)
 Amount=Ποσό
 AmountInvoice=Ποσό Τιμολογίου
 AmountInvoiced=Ποσό τιμολογημένο
-AmountInvoicedHT=Ποσό που έχει τιμολογηθεί (συμπεριλαμβανομένου του φόρου)
-AmountInvoicedTTC=Ποσό που έχει τιμολογηθεί (χωρίς φόρο)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Ποσό Πληρωμής
 AmountHTShort=Ποσό (εκτός)
 AmountTTCShort=Ποσό (με Φ.Π.Α.)
@@ -485,6 +485,7 @@ Categories=Ετικέτες/Κατηγορίες
 Category=Ετικέτα/Κατηγορία
 By=Από
 From=Από
+FromDate=Από
 FromLocation=Από
 to=πρός
 To=πρός
@@ -687,6 +688,7 @@ Method=Μέθοδος
 Receive=Παραλαβή
 CompleteOrNoMoreReceptionExpected=Ολοκληρώθηκε ή δεν αναμένετε κάτι περισσότερο
 ExpectedValue=Αναμενόμενη αξία
+ExpectedQty=Expected Qty
 PartialWoman=Μερική
 TotalWoman=Συνολικές
 NeverReceived=Δεν παραλήφθηκε
@@ -703,6 +705,7 @@ MenuECM=Έγγραφα
 MenuAWStats=AWStats
 MenuMembers=Μέλη
 MenuAgendaGoogle=Ημερολόγιο Google
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Όριο Dolibarr (Μενού Ρυθμίσεις-Ασφάλεια): %s Kb, Όριο PHP: %s Kb
 NoFileFound=Δεν υπάρχουν έγγραφα σε αυτόν τον φάκελο
 CurrentUserLanguage=Τρέχουσα Γλώσσα
@@ -725,7 +728,7 @@ Page=Σελίδα
 Notes=Σημειώσεις
 AddNewLine=Προσθήκη Γραμμής
 AddFile=Προσθήκη Αρχείου
-FreeZone=Δεν είναι ένα προκαθορισμένο προϊόν / υπηρεσία
+FreeZone=Free-text product
 FreeLineOfType=Στοιχείο ελεύθερου κειμένου, πληκτρολογήστε:
 CloneMainAttributes=Κλωνοποίηση αντικειμένου με τα βασικά του χαρακτηριστικά
 ReGeneratePDF=Επαναπαραγωγή PDF
@@ -942,6 +945,39 @@ ShortThursday=Π
 ShortFriday=Π
 ShortSaturday=Σ
 ShortSunday=Κ
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Επιλέξτε ένα πρότυπο ηλεκτρονικού ταχυδρομείου
 SetRef=Ρύθμιση αναφ
 Select2ResultFoundUseArrows=Βρέθηκαν αποτελέσματα. Χρησιμοποιήστε τα βέλη για να επιλέξετε.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Μεταβείτε στη λειτουργία
 NotUsedForThisCustomer=Δεν χρησιμοποιείται για αυτόν τον πελάτη
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Πληροφορίες
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 895cb0c460c..5cc7769499e 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -6,7 +6,7 @@ Member=Μέλος
 Members=Μέλη
 ShowMember=Εμφάνιση καρτέλα μέλους
 UserNotLinkedToMember=Ο χρήστης δεν συνδέετε με κάποιο μέλος
-ThirdpartyNotLinkedToMember=Third party not linked to a member
+ThirdpartyNotLinkedToMember=Τρίτο μέρος που δεν συνδέεται με κάποιο μέλος
 MembersTickets=Tickets Μελών
 FundationMembers=Μέλη οργανισμού
 ListOfValidatedPublicMembers=Λίστα πιστοποιημένων δημοσίων μελών
@@ -21,15 +21,15 @@ MembersListToValid=Λίστα πρόχειρων Μελών (προς επικύ
 MembersListValid=Λίστα έγκυρων μελών
 MembersListUpToDate=Λίστα επικυρωμένων μελών που έχουν συνδρομή
 MembersListNotUpToDate=Λίστα επικυρωμένων μελών που δεν έχουν συνδρομή
-MembersListResiliated=List of terminated members
+MembersListResiliated=Κατάλογος καταγγελθέντων μελών
 MembersListQualified=Λίστα επικυρωμένων μελών
 MenuMembersToValidate=Πρόχειρα Μέλη
 MenuMembersValidated=Επικυρωμένα μέλη
 MenuMembersUpToDate=Up to date members
 MenuMembersNotUpToDate=Out of date members
-MenuMembersResiliated=Terminated members
+MenuMembersResiliated=Καταλήγοντας μέλη
 MembersWithSubscriptionToReceive=Μέλη αναμένοντα για  λήψη συνδρομής
-MembersWithSubscriptionToReceiveShort=Subscription to receive
+MembersWithSubscriptionToReceiveShort=Εγγραφή για λήψη
 DateSubscription=Ημερομηνία συνδρομής
 DateEndSubscription=Ημερομηνία Λήξης Συνδρομής
 EndSubscription=Λήξη συνδρομής
@@ -49,9 +49,12 @@ MemberStatusActiveLateShort=Ληγμένη
 MemberStatusPaid=Συνδρομή σε εξέλιξη
 MemberStatusPaidShort=Up to date
 MemberStatusResiliated=Μέλος χωρίς Συνδρομή
-MemberStatusResiliatedShort=Terminated
+MemberStatusResiliatedShort=Τερματίστηκε
 MembersStatusToValid=Πρόχειρα Μέλη
-MembersStatusResiliated=Terminated members
+MembersStatusResiliated=Καταλήγοντας μέλη
+MemberStatusNoSubscription=Επικυρωμένο (δεν απαιτείται εγγραφή)
+MemberStatusNoSubscriptionShort=Επικυρώθηκε
+SubscriptionNotNeeded=Δεν απαιτείται συνδρομή
 NewCotisation=Νέα Δωρεά
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Ημερομηνία Λήξης Συνδρομής
@@ -68,19 +71,19 @@ Subscriptions=Συνδρομές
 SubscriptionLate=Καθυστ.
 SubscriptionNotReceived=Ποσό Συνδρομής δεν έχει παραληφθεί
 ListOfSubscriptions=Λίστα Συνδρομών
-SendCardByMail=Send card by email
+SendCardByMail=Στείλτε την κάρτα με email
 AddMember=Δημιουργία μέλους
 NoTypeDefinedGoToSetup=Νέος τύπος μέλους. Πηγαίνετε στις Ρυθμίσεις -> Τύποι μελών
 NewMemberType=Νέος τύπος μέλους
-WelcomeEMail=Welcome email
+WelcomeEMail=Καλώς ήλθατε
 SubscriptionRequired=Απαιτείται Συνδρομή
 DeleteType=Διαγραφή
 VoteAllowed=Δικαίωμα ψήφου
 Physical=Φυσικό
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Επανενεργοποίηση
-ResiliateMember=Terminate a member
+ResiliateMember=Τερματίστε ένα μέλος
 ConfirmResiliateMember=Είστε σίγουροι για τη διακοπή της συνδρομής του Μέλους;
 DeleteMember=Διαγραφή ενός μέλους
 ConfirmDeleteMember=Είστε σίγουροι ότι θέλετε να διαγράψετε οριστικά αυτο το μέλος (Η διαγραφή ενός Μέλους συνεπάγεται και την αυτόματη διαγραφή των συνδρομών του)?
@@ -88,13 +91,13 @@ DeleteSubscription=Διαγραφή συνδρομής
 ConfirmDeleteSubscription=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την συνδρομή?
 Filehtpasswd=htpasswd file
 ValidateMember=Επικύρωση ενός μέλους
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+ConfirmValidateMember=Είστε βέβαιοι ότι θέλετε να επιβεβαιώσετε αυτό το μέλος;
+FollowingLinksArePublic=Οι παρακάτω σύνδεσμοι είναι ανοιχτές σελίδες που δεν προστατεύονται από οποιαδήποτε άδεια Dolibarr. Δεν είναι μορφοποιημένες σελίδες, παρέχονται ως παράδειγμα για να παρουσιάσουν τον τρόπο ταξινόμησης της βάσης δεδομένων των μελών.
 PublicMemberList=Λίστα δημόσιων μελών
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
+BlankSubscriptionForm=Δημόσια μορφή αυτοπροβολής
+BlankSubscriptionFormDesc=Το Dolibarr μπορεί να σας παράσχει ένα δημόσιο URL / ιστοσελίδα για να επιτρέψει στους εξωτερικούς επισκέπτες να ζητήσουν να εγγραφούν στο ίδρυμα. Εάν είναι ενεργοποιημένη μια ηλεκτρονική ενότητα πληρωμής, μπορεί να παρέχεται αυτόματα και μια φόρμα πληρωμής.
+EnablePublicSubscriptionForm=Ενεργοποιήστε τον δημόσιο ιστότοπο με φόρμα αυτοεξυπηρέτησης
+ForceMemberType=Αναγκάστε τον τύπο μέλους
 ExportDataset_member_1=Μέλη & Συνδρομές
 ImportDataset_member_1=Μέλη
 LastMembersModified=Τελευταία %s μέλη που τροποποιήθηκαν
@@ -108,33 +111,33 @@ SubscriptionNotRecorded=Η συνδρομή δεν καταγράφηκε
 AddSubscription=Δημιουργία εγγραφής
 ShowSubscription=Δείτε τη Συνδρομή
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=Αποστολή ηλεκτρονικού μηνύματος ηλεκτρονικού ταχυδρομείου στο μέλος
+SendingEmailOnAutoSubscription=Αποστολή ηλεκτρονικού ταχυδρομείου στην αυτόματη εγγραφή
+SendingEmailOnMemberValidation=Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου σχετικά με την επικύρωση νέου μέλους
+SendingEmailOnNewSubscription=Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου σε νέα συνδρομή
+SendingReminderForExpiredSubscription=Αποστολή υπενθύμισης για συνδρομές που έχουν λήξει
+SendingEmailOnCancelation=Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου σχετικά με την ακύρωση
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
+YourMembershipRequestWasReceived=Η πρόσβασή σας έγινε δεκτή.
+YourMembershipWasValidated=Η ιδιότητα μέλους σας επικυρώθηκε
+YourSubscriptionWasRecorded=Η νέα συνδρομή σας καταγράφηκε
+SubscriptionReminderEmail=Υπενθύμιση εγγραφής
+YourMembershipWasCanceled=Η εγγραφή σας ακυρώθηκε
 CardContent=Περιεχόμενα καρτέλας
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
-ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
-ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subscription is about to expire or has already expired (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hope you will renew it.<br><br>
-ThisIsContentOfYourCard=This is a summary of the information we have about you. Please contact us if anything is incorrect.<br><br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the notification email received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Content of the notification email received in case of auto-inscription of a guest
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member autosubscription
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Email template to use to send email to a member on member validation
-DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Email template to use to send email to a member on new subscription recording
-DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Email template to use to send email reminder when subscription is about to expire
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Email template to use to send email to a member on member cancelation
-DescADHERENT_MAIL_FROM=Sender Email for automatic emails
+ThisIsContentOfYourMembershipRequestWasReceived=Θα θέλαμε να σας ενημερώσουμε ότι το αίτημά σας για συμμετοχή έγινε δεκτό. <br><br>
+ThisIsContentOfYourMembershipWasValidated=Θέλουμε να σας ενημερώσουμε ότι η ιδιότητα μέλους σας έχει επικυρωθεί με τις ακόλουθες πληροφορίες: <br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Θέλουμε να σας ενημερώσουμε ότι η νέα συνδρομή σας έχει καταγραφεί. <br><br>
+ThisIsContentOfSubscriptionReminderEmail=Θα θέλαμε να σας ενημερώσουμε ότι η συνδρομή σας πρόκειται να λήξει ή έχει ήδη λήξει (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Ελπίζουμε ότι θα το ανανεώσετε. <br><br>
+ThisIsContentOfYourCard=Αυτή είναι μια περίληψη των πληροφοριών που έχουμε σχετικά με εσάς. Επικοινωνήστε μαζί μας αν κάτι είναι λανθασμένο. <br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Αντικείμενο του μηνύματος ηλεκτρονικού ταχυδρομείου ειδοποίησης που λαμβάνεται σε περίπτωση αυτόματης εγγραφής επισκέπτη
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Περιεχόμενο του μηνύματος ηλεκτρονικού ταχυδρομείου ειδοποίησης που λαμβάνεται σε περίπτωση αυτόματης εγγραφής επισκέπτη
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου σε ένα μέλος που είναι μέλος της αυτόματης εγγραφής
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου σε μέλος σχετικά με την επικύρωση μέλους
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου σε ένα μέλος στη νέα εγγραφή εγγραφής
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου όταν η συνδρομή λήγει
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου σε μέλος σχετικά με την ακύρωση μέλους
+DescADHERENT_MAIL_FROM=Email αποστολέα για αυτόματα μηνύματα ηλεκτρονικού ταχυδρομείου
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
 DescADHERENT_CARD_TYPE=Format of cards page
@@ -148,8 +151,8 @@ NoThirdPartyAssociatedToMember=Κανένας Πελ./Προμ. δεν είνα
 MembersAndSubscriptions= Μέλη & Συνδρομές
 MoreActions=Complementary action on recording
 MoreActionsOnSubscription=Συμπληρωματικές δράσεις, που προτείνονται από προεπιλογή κατά την συνδρομή
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
+MoreActionBankDirect=Δημιουργήστε μια απευθείας εγγραφή σε τραπεζικό λογαριασμό
+MoreActionBankViaInvoice=Δημιουργήστε ένα τιμολόγιο και μια πληρωμή σε τραπεζικό λογαριασμό
 MoreActionInvoiceOnly=Create an invoice with no payment
 LinkToGeneratedPages=Generate visit cards
 LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
@@ -157,8 +160,8 @@ DocForAllMembersCards=Generate business cards for all members (Format for output
 DocForOneMemberCards=Generate business cards for a particular member (Format for output actually setup: <b>%s</b>)
 DocForLabels=Generate address sheets (Format for output actually setup: <b>%s</b>)
 SubscriptionPayment=Πληρωμή συνδρομής
-LastSubscriptionDate=Date of latest subscription payment
-LastSubscriptionAmount=Amount of latest subscription
+LastSubscriptionDate=Ημερομηνία της τελευταίας πληρωμής εγγραφής
+LastSubscriptionAmount=Ποσό τελευταίας συνδρομής
 MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
 MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
 MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
@@ -170,9 +173,9 @@ MembersByStateDesc=Αυτή η οθόνη σας δείξει στατιστικ
 MembersByTownDesc=Αυτή η οθόνη σας δείξει στατιστικά στοιχεία σχετικά με τα μέλη από την πόλη.
 MembersStatisticsDesc=Επιλέξτε στατιστικά στοιχεία που θέλετε να διαβάσετε ...
 MenuMembersStats=Στατιστικά
-LastMemberDate=Latest member date
+LastMemberDate=Τελευταία ημερομηνία μέλους
 LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
+MemberNature=Φύση του μέλους
 Public=Δημόσιο
 NewMemberbyWeb=Νέο μέλος πρόσθεσε. Εν αναμονή έγκρισης
 NewMemberForm=Νέα μορφή μέλος
@@ -183,19 +186,19 @@ TurnoverOrBudget=Κύκλος εργασιών (για μια επιχείρησ
 DefaultAmount=Προεπιλογή ποσό της συνδρομής
 CanEditAmount=Επισκέπτης μπορεί να επιλέξει / επεξεργαστείτε το ποσό της συνδρομής του
 MEMBER_NEWFORM_PAYONLINE=Μετάβαση στην ολοκληρωμένη ηλεκτρονική σελίδα πληρωμής
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
+ByProperties=Εκ ΦΥΣΕΩΣ
+MembersStatisticsByProperties=Στατιστικά στοιχεία μελών κατά φύση
 MembersByNature=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη του από τη φύση τους.
 MembersByRegion=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη κατά περιοχή.
 VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές
-NoVatOnSubscription=No VAT for subscriptions
+NoVatOnSubscription=Δεν υπάρχει ΦΠΑ για συνδρομές
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Το προϊόν χρησιμοποιείται για τη γραμμή από συνδρομές στο τιμολόγιο: %s
 NameOrCompany=Όνομα ή Επωνυμία
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
-MembershipPaid=Membership paid for current period (until %s)
-YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
-XMembersClosed=%s member(s) closed
+SubscriptionRecorded=Εγγραφή εγγραφής
+NoEmailSentToMember=Δεν αποστέλλεται μήνυμα ηλεκτρονικού ταχυδρομείου στο μέλος
+EmailSentToMember=Το email αποστέλλεται στο μέλος στο %s
+SendReminderForExpiredSubscriptionTitle=Στείλτε υπενθύμιση μέσω ηλεκτρονικού ταχυδρομείου για τη λήξη συνδρομής
+SendReminderForExpiredSubscription=Αποστολή υπενθύμισης μέσω ηλεκτρονικού ταχυδρομείου στα μέλη όταν η συνδρομή λήγει (η παράμετρος είναι ο αριθμός ημερών πριν από το τέλος της συνδρομής για να στείλετε την υπενθύμιση.) Μπορεί να είναι μια λίστα ημερών που χωρίζονται με ένα ερωτηματικό, για παράδειγμα &#39;10, 5, 0; &#39;)
+MembershipPaid=Καταβολή συνδρομής για την τρέχουσα περίοδο (μέχρι %s)
+YouMayFindYourInvoiceInThisEmail=Μπορείτε να βρείτε το τιμολόγιο που επισυνάπτεται σε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου
+XMembersClosed=%s μέλος (τα) έκλεισε
diff --git a/htdocs/langs/el_GR/mrp.lang b/htdocs/langs/el_GR/mrp.lang
index 71ba5135b5c..b3936567cdd 100644
--- a/htdocs/langs/el_GR/mrp.lang
+++ b/htdocs/langs/el_GR/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Παραγγελίες Παραγωγής
 MO=Παραγγελία Παραγωγής
+MOs=Manufacturing orders
 MRPDescription=Ενότητα για τη διαχείριση της παραγωγής και των Παραγγελιών Παραγωγής (MO).
 MRPArea=Περιοχή MRP
 MrpSetupPage=Ρύθμιση της μονάδας MRP
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index f5e3ecc7213..28a0f808756 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__ (Γεια σας) __ Βρείτε τη
 PredefinedMailContentSendSupplierInvoice=__ (Γεια σας) __ Βρείτε το τιμολόγιο __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
 PredefinedMailContentSendShipping=__ (Γεια σας) __ Παρακαλούμε βρείτε την αποστολή __REF__ συνημμένο __ (ειλικρινά) __ __USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__ (Γεια σας) __ Βρείτε την παρέμβαση __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
-PredefinedMailContentThirdparty=__ (Γεια σας) __ __ (ειλικρινά) __ __USER_SIGNATURE__
-PredefinedMailContentContact=__ (Γεια σας) __ __ (ειλικρινά) __ __USER_SIGNATURE__
-PredefinedMailContentUser=__ (Γεια σας) __ __ (ειλικρινά) __ __USER_SIGNATURE__
 PredefinedMailContentLink=Μπορείτε να κάνετε κλικ στον παρακάτω σύνδεσμο για να πραγματοποιήσετε την πληρωμή σας, αν δεν έχει γίνει ήδη. %s
+PredefinedMailContentGeneric=__ (Γεια σας) __ __ (ειλικρινά) __ __USER_SIGNATURE__
 DemoDesc=Το Dolibarr είναι ένα συμπαγές ERP / CRM που υποστηρίζει διάφορες λειτουργικές μονάδες. Ένα demo που παρουσιάζει όλες τις μονάδες δεν έχει νόημα καθώς το σενάριο αυτό δεν εμφανίζεται ποτέ (αρκετές εκατοντάδες διαθέσιμες). Έτσι, πολλά προφίλ επίδειξης είναι διαθέσιμα.
 ChooseYourDemoProfil=Επιλέξτε το προφίλ επίδειξης που ταιριάζει καλύτερα στις ανάγκες σας ...
 ChooseYourDemoProfilMore=... ή να δημιουργήσετε το δικό σας προφίλ <br> (επιλογή χειροκίνητης μονάδας)
@@ -280,7 +278,9 @@ LinesToImport=Γραμμές για εισαγωγή
 
 MemoryUsage=Χρήση μνήμης
 RequestDuration=Διάρκεια αίτησης
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Προϊόντα / Υπηρεσίες κατά δημοτικότητα στις Προτάσεις
 PopuCom=Προϊόντα / Υπηρεσίες κατά δημοτικότητα στις παραγγελίες
 ProductStatistics=Στατιστικά Προϊόντων / Υπηρεσιών
 NbOfQtyInOrders=Ποσότητα σε παραγγελίες
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index dfe17650e02..4ecc503cf8d 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Ορισμός τύπου barcode
 BarcodeValue=Τιμή Barcode
 NoteNotVisibleOnBill=Σημείωση (μη ορατή σε τιμολόγια, προτάσεις...)
 ServiceLimitedDuration=Εάν το προϊόν είναι μια υπηρεσία με περιορισμένη διάρκεια:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Πολλαπλά τμήματα τιμών ανά προϊόν / υπηρεσία (κάθε πελάτης βρίσκεται σε ένα τμήμα τιμών)
 MultiPricesNumPrices=Αριθμός τιμής
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Τιμές πωλητών (προϊόντω
 CustomCode=Τελωνείο / εμπορεύματα / κωδικός ΕΣ
 CountryOrigin=Χώρα προέλευσης
 Nature=Φύση προϊόντος (υλικό / τελικό)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Σύντομη ετικέτα
 Unit=Μονάδα
 p=Μονάδα
@@ -359,6 +362,9 @@ SelectCombination=Επιλέξτε συνδυασμό
 ProductCombinationGenerator=Γεννήτρια παραλλαγών
 Features=Χαρακτηριστικά
 PriceImpact=Επιπτώσεις στις τιμές
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Επιπτώσεις στο βάρος
 NewProductAttribute=Νέο χαρακτηριστικό
 NewProductAttributeValue=Νέα τιμή χαρακτηριστικού
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index bca4c6264b1..de4fe4901f7 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Συνεισφέρων
 TypeContact_project_task_external_TASKCONTRIBUTOR=Συνεισφέρων
 SelectElement=Επιλέξτε το στοιχείο
 AddElement=Σύνδεση με το στοιχείο
+LinkToElementShort=Σύνδεση σε
 # Documents models
 DocumentModelBeluga=Πρότυπο εγγράφου έργου για επισκόπηση συνδεδεμένων αντικειμένων
 DocumentModelBaleine=Πρότυπο εγγράφου έργου για εργασίες
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Αριθμός δημιουργηθέντων έργων
 ProjectNbTaskByMonth=Αριθμός δημιουργημένων εργασιών ανά μήνα
 ProjectOppAmountOfProjectsByMonth=Ποσό οδηγιών ανά μήνα
 ProjectWeightedOppAmountOfProjectsByMonth=Σταθμισμένο ποσό οδηγεί κατά μήνα
-ProjectOpenedProjectByOppStatus=Ανοίξτε το έργο / οδηγήστε από την κατάσταση του οδηγού
-ProjectsStatistics=Στατιστικά στοιχεία σχετικά με τα σχέδια / οδηγούς
-TasksStatistics=Στατιστικά στοιχεία σχετικά με τα έργα / εργασίες
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Η εργασία έχει εκχωρηθεί. Πρέπει να είναι δυνατή η εισαγωγή του χρόνου αυτού του έργου.
 IdTaskTime=Χρόνος εργασίας Id
 YouCanCompleteRef=Εάν θέλετε να συμπληρώσετε το ref με κάποιο επίθημα, συνιστάται να προσθέσετε ένα χαρακτήρα για να το διαχωρίσετε, οπότε η αυτόματη αρίθμηση θα εξακολουθήσει να λειτουργεί σωστά για τα επόμενα έργα. Για παράδειγμα %s-MYSUFFIX
diff --git a/htdocs/langs/el_GR/recruitment.lang b/htdocs/langs/el_GR/recruitment.lang
new file mode 100644
index 00000000000..56b5b4347f5
--- /dev/null
+++ b/htdocs/langs/el_GR/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Ρυθμίσεις
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Πληροφορίες
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 76464e42488..d812268d788 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Διαγραφή αποστολής
 Stock=Στοκ
 Stocks=Αποθέματα
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Αποθέματα ανά παρτίδα / σειρά
@@ -95,14 +95,16 @@ RealStock=Real Χρηματιστήριο
 RealStockDesc=Το φυσικό / πραγματικό απόθεμα είναι το απόθεμα που βρίσκεται σήμερα στις αποθήκες.
 RealStockWillAutomaticallyWhen=Το πραγματικό απόθεμα θα τροποποιηθεί σύμφωνα με αυτόν τον κανόνα (όπως ορίζεται στην ενότητα του αποθέματος):
 VirtualStock=Εικονική απόθεμα
-VirtualStockDesc=Το εικονικό απόθεμα είναι το διαθέσιμο διαθέσιμο απόθεμα αφού κλείσει όλες οι ανοιχτές / εκκρεμείς ενέργειες (που επηρεάζουν τα αποθέματα) (παραγγελίες αγοράς, παραγγελίες πώλησης κ.λπ.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id αποθήκη
 DescWareHouse=Αποθήκη Περιγραφή
 LieuWareHouse=Αποθήκη Localisation
 WarehousesAndProducts=Αποθήκες και τα προϊόντα
 WarehousesAndProductsBatchDetail=Αποθήκες και προϊόντα (με λεπτομέρεια ανά παρτίδα / σειρά)
-AverageUnitPricePMPShort=Μέση σταθμική τιμή εισόδου
-AverageUnitPricePMP=Μέση σταθμική τιμή εισόδου
+AverageUnitPricePMPShort=Μέση σταθμική τιμή
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Πώληση Τιμή μονάδας
 EstimatedStockValueSellShort=Τιμή για πώληση
 EstimatedStockValueSell=Τιμή για πώληση
@@ -141,7 +143,7 @@ Replenishments=Αναπληρώσεις
 NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s)
 NbOfProductAfterPeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (> %s)
 MassMovement=Μαζική μετακίνηση
-SelectProductInAndOutWareHouse=Επιλέξτε ένα προϊόν, ποσότητα, μια αποθήκη πηγή και μια αποθήκη στόχο, στη συνέχεια, κάντε κλικ στο "%s". Μόλις γίνει αυτό για όλες τις απαιτούμενες κινήσεις, κάντε κλικ στο "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Μεταφορά εγγραφών
 ReceivingForSameOrder=Αποδείξεις για αυτή την παραγγελία
 StockMovementRecorded=Οι κινήσεις των αποθεμάτων καταγράφονται
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 99f2734abee..542e6305bd1 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Χαμηλή ποιότητα
 ReputationForThisProduct=Φήμη
 BuyerName=Όνομα αγοραστή
 AllProductServicePrices=Όλες οι τιμές προϊόντων / υπηρεσιών
-AllProductReferencesOfSupplier=Όλες οι αναφορές προϊόντων / υπηρεσιών του πωλητή
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Τιμές πωλητών
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 7beaf684a88..67327d94483 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Διαγράφηκε
 
 # Dict
 Type=Τύπος
-Category=Αναλυτικός κώδικας
 Severity=Δριμύτητα
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Ορίστε αυτόματα τον χρήστη που
 TicketsAutoAssignTicketHelp=Κατά τη δημιουργία ενός εισιτηρίου, ο χρήστης μπορεί να αντιστοιχιστεί αυτόματα στο εισιτήριο.
 TicketNumberingModules=Μονάδα αρίθμησης εισιτηρίων
 TicketNotifyTiersAtCreation=Ειδοποιήστε τρίτο μέρος στη δημιουργία
-TicketGroup=Ομάδα
 TicketsDisableCustomerEmail=Πάντα να απενεργοποιείτε τα μηνύματα ηλεκτρονικού ταχυδρομείου όταν δημιουργείται ένα εισιτήριο από τη δημόσια διασύνδεση
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Δημιουργήθηκε από
 NewTicket=Νέο εισιτήριο
 SubjectAnswerToTicket=Απάντηση εισιτηρίου
 TicketTypeRequest=Τύπος αιτήματος
-TicketCategory=Αναλυτικός κώδικας
+TicketCategory=Ομάδα
 SeeTicket=Δείτε εισιτήριο
 TicketMarkedAsRead=Το εισιτήριο έχει επισημανθεί ως αναγνωσμένο
 TicketReadOn=Συνέχισε να διαβάζεις
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index bc56e33fb69..af7a6c554df 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -70,7 +70,7 @@ ExportDataset_user_1=Χρήστες και τις ιδιότητές τους
 DomainUser=Domain user %s
 Reactivate=Reactivate
 CreateInternalUserDesc=Αυτή η φόρμα σάς επιτρέπει να δημιουργήσετε έναν εσωτερικό χρήστη στην εταιρεία / οργανισμό σας. Για να δημιουργήσετε έναν εξωτερικό χρήστη (πελάτη, προμηθευτή κ.λπ.), χρησιμοποιήστε το κουμπί &quot;Δημιουργία χρήστη Dolibarr&quot; από την κάρτα επαφών του τρίτου μέρους.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=Ένας εσωτερικός <b> </b> χρήστης είναι ένας χρήστης που ανήκει στην εταιρεία / τον οργανισμό σας. <br> Ένας εξωτερικός χρήστης <b> </b> είναι πελάτης, προμηθευτής ή άλλος (Η δημιουργία εξωτερικού χρήστη για τρίτο μέρος μπορεί να γίνει από την εγγραφή επαφής του τρίτου μέρους). <br> <br> Και στις δύο περιπτώσεις, τα δικαιώματα ορίζουν δικαιώματα στο Dolibarr, επίσης ο εξωτερικός χρήστης μπορεί να έχει διαφορετικό διαχειριστή μενού από τον εσωτερικό χρήστη (Βλέπε Αρχική σελίδα - Ρύθμιση - Οθόνη)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
 UserWillBeInternalUser=Δημιουργήθηκε χρήστη θα είναι ένας εσωτερικός χρήστης (επειδή δεν συνδέεται με ένα συγκεκριμένο τρίτο μέρος)
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Δημιουργήθηκε χρήστης θα είναι
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,11 +108,13 @@ DisabledInMonoUserMode=Απενεργοποιημένο σε κατάσταση
 UserAccountancyCode=Κωδικός λογαριασμού χρήστη
 UserLogoff=Αποσύνδεση χρήστη
 UserLogged=Ο χρήστης καταγράφηκε
+DateOfEmployment=Employment date
 DateEmployment=Ημερομηνία έναρξης απασχόλησης
 DateEmploymentEnd=Ημερομηνία λήξης απασχόλησης
 CantDisableYourself=Δεν μπορείτε να απενεργοποιήσετε το δικό σας αρχείο χρήστη
 ForceUserExpenseValidator=Έγκριση έκθεσης εξόδου ισχύος
 ForceUserHolidayValidator=Έγκριση αίτησης για άδεια εξόδου
 ValidatorIsSupervisorByDefault=Από προεπιλογή, ο επικυρωτής είναι ο επόπτης του χρήστη. Κρατήστε κενό για να διατηρήσετε αυτή τη συμπεριφορά.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
+UserPersonalEmail=Προσωπικό email
+UserPersonalMobile=Προσωπικό κινητό τηλέφωνο
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index b352801103d..b4cebd19f0c 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Τελευταία αρχεία άμεσης χρέωσης %s
@@ -63,7 +63,9 @@ InvoiceRefused=Τιμολόγιο απορρίφθηκε (Φορτίστε τη
 StatusDebitCredit=Κατάσταση χρέωσης / πίστωσης
 StatusWaiting=Αναμονή
 StatusTrans=Απεσταλμένο
+StatusDebited=Debited
 StatusCredited=Πιστωθεί
+StatusPaid=Επεξεργάστηκε
 StatusRefused=Αρνήθηκε
 StatusMotif0=Απροσδιόριστο
 StatusMotif1=Ανεπαρκή κεφάλαια
@@ -77,13 +79,13 @@ StatusMotif8=Άλλος λόγος
 CreateForSepaFRST=Δημιουργία αρχείου άμεσης χρέωσης (SEPA FRST)
 CreateForSepaRCUR=Δημιουργία αρχείου άμεσης χρέωσης (SEPA RCUR)
 CreateAll=Δημιουργία αρχείου άμεσης χρέωσης (όλα)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Μόνο το γραφείο
 CreateBanque=Μόνο τράπεζα
 OrderWaiting=Αναμονή για θεραπεία
-NotifyTransmision=Η μετάδοση Απόσυρση
-NotifyCredit=Πιστωτικές Απόσυρση
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Εθνικό Αριθμός Transmitter
 WithBankUsingRIB=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν RIB
 WithBankUsingBANBIC=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Πιστωτικές με
 WithdrawalFileNotCapable=Αδύνατο να δημιουργηθεί το αρχείο παραλαβή απόσυρση για τη χώρα σας %s (η χώρα σας δεν υποστηρίζεται)
 ShowWithdraw=Εμφάνιση εντολής άμεσης χρέωσης
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο έχει τουλάχιστον μία εντολή πληρωμής άμεσης χρέωσης που δεν έχει ακόμη υποβληθεί σε επεξεργασία, δεν θα οριστεί ως πληρωμή για να επιτραπεί η προηγούμενη διαχείριση ανάληψης.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Απόσυρση αρχείο
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Στατιστικά στοιχεία από την κατάσταση των γραμμών
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Είδος πληρωμής
 ModeRECUR=Επαναλαμβανόμενη πληρωμή
 ModeFRST=Εφάπαξ πληρωμή
 PleaseCheckOne=Παρακαλώ επιλέξτε ένα μόνο
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Η εντολή άμεσης χρέωσης %s δημιουργήθηκε
 AmountRequested=Ποσό που ζητήθηκε
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Ποσό: %s<br>Μέθοδος: %s<br>Ημερομηνία: %s
 InfoRejectSubject=Η εντολή πληρωμής άμεσης χρέωσης απορρίφθηκε
 InfoRejectMessage=Γεια σας, <br><br> η εντολή πληρωμής άμεσης χρέωσης του τιμολογίου %s σχετικά με την εταιρεία %s, με το ποσό %s απορρίφθηκε από την τράπεζα. <br><br> - <br> %s
 ModeWarning=Επιλογή για την πραγματική κατάσταση, δεν είχε καθοριστεί, σταματάμε μετά από αυτή την προσομοίωση
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/el_GR/workflow.lang b/htdocs/langs/el_GR/workflow.lang
index 2b8baea5955..0c31b6ae167 100644
--- a/htdocs/langs/el_GR/workflow.lang
+++ b/htdocs/langs/el_GR/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Ροής εργασίας ρύθμιση μονάδας
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+WorkflowDesc=Αυτή η ενότητα παρέχει ορισμένες αυτόματες ενέργειες. Από προεπιλογή, η ροή εργασιών είναι ανοιχτή (μπορείτε να κάνετε πράγματα με τη σειρά που θέλετε), αλλά εδώ μπορείτε να ενεργοποιήσετε ορισμένες αυτόματες ενέργειες.
+ThereIsNoWorkflowToModify=Δεν υπάρχουν τροποποιήσεις ροής εργασίας με τις ενεργοποιημένες μονάδες.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Δημιουργήστε αυτόματα μια εντολή πώλησης μετά την υπογραφή μιας εμπορικής πρότασης (η νέα παραγγελία θα έχει το ίδιο ποσό με την πρόταση)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Αυτόματη δημιουργία τιμολογίου πελάτη μετά την υπογραφή εμπορικής πρότασης (το νέο τιμολόγιο θα έχει το ίδιο ποσό με την πρόταση)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Αυτόματη δημιουργία τιμολογίου πελάτη μετά την επικύρωση μιας σύμβασης
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Αυτόματη δημιουργία τιμολογίου πελάτη μετά την ολοκλήρωση της παραγγελίας πώλησης (το νέο τιμολόγιο θα έχει το ίδιο ποσό με την παραγγελία)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Ταξινόμηση της πρότασης συνδεδεμένης πηγής ως χρεώνεται όταν η εντολή πώλησης έχει οριστεί σε τιμολόγια (και αν το ποσό της παραγγελίας είναι το ίδιο με το συνολικό ποσό της υπογεγραμμένης συνδεδεμένης πρότασης)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Ταξινόμηση της προτεινόμενης πρότασης πηγής ως χρεώνεται όταν επικυρώνεται το τιμολόγιο πελάτη (και αν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της υπογεγραμμένης συνδεδεμένης πρότασης)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως χρεώνεται όταν έχει επικυρωθεί το τιμολόγιο πελάτη (και εάν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης παραγγελίας)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως χρεώνεται όταν το τιμολόγιο πελάτη έχει οριστεί για πληρωμή (και αν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης παραγγελίας)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως αποστολής κατά την επικύρωση μιας αποστολής (και εάν η ποσότητα που αποστέλλεται από όλες τις αποστολές είναι η ίδια με τη σειρά για την ενημέρωση)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Ταξινόμηση της πρότασης προμηθευτή συνδεδεμένης πηγής ως τιμολογίου όταν επικυρωθεί το τιμολόγιο πωλητή (και εάν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης πρότασης)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Ταξινόμηση της εντολής αγοράς συνδεδεμένης πηγής ως χρεώνεται όταν επικυρώνεται το τιμολόγιο πωλητή (και αν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης παραγγελίας)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+AutomaticCreation=Αυτόματη δημιουργία
+AutomaticClassification=Αυτόματη ταξινόμηση
diff --git a/htdocs/langs/el_GR/zapier.lang b/htdocs/langs/el_GR/zapier.lang
index b8f19d33469..84986a17471 100644
--- a/htdocs/langs/el_GR/zapier.lang
+++ b/htdocs/langs/el_GR/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Μονάδα Zapier για Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Εγκατάσταση του Zapier για Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 50add47a7d4..0980facb414 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
 DictionaryVAT=GST Rates or Sales Tax Rates
diff --git a/htdocs/langs/en_AU/cashdesk.lang b/htdocs/langs/en_AU/cashdesk.lang
index 463a094b82f..adbd9cf9e57 100644
--- a/htdocs/langs/en_AU/cashdesk.lang
+++ b/htdocs/langs/en_AU/cashdesk.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - cashdesk
 NoVAT=No GST for this sale
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
index f51ad592766..102482cbd63 100644
--- a/htdocs/langs/en_AU/main.lang
+++ b/htdocs/langs/en_AU/main.lang
@@ -19,7 +19,6 @@ FormatDateHourShort=%d/%m/%Y %I:%M %p
 FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
 ErrorNoVATRateDefinedForSellerCountry=Error, no GST rates defined for country '%s'.
 Quadri=Quarter
 PriceUTTC=U.P. (incl GST)
@@ -36,3 +35,4 @@ TTC=Incl GST
 VAT=GST
 VATRate=GST Rate
 Check=Cheque
+CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_AU/stocks.lang b/htdocs/langs/en_AU/stocks.lang
new file mode 100644
index 00000000000..0cf57e3a1c3
--- /dev/null
+++ b/htdocs/langs/en_AU/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_AU/website.lang b/htdocs/langs/en_AU/website.lang
deleted file mode 100644
index ff992a2be9e..00000000000
--- a/htdocs/langs/en_AU/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang
deleted file mode 100644
index efea7bd6270..00000000000
--- a/htdocs/langs/en_AU/withdrawals.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index a7c6cc9d271..62dd510c5e0 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 LocalTax1Management=PST Management
 CompanyZip=Postal code
 LDAPFieldZip=Postal code
diff --git a/htdocs/langs/en_CA/cashdesk.lang b/htdocs/langs/en_CA/cashdesk.lang
deleted file mode 100644
index 8990ec63d62..00000000000
--- a/htdocs/langs/en_CA/cashdesk.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang
index 7ce3e998978..2fcf148aea0 100644
--- a/htdocs/langs/en_CA/main.lang
+++ b/htdocs/langs/en_CA/main.lang
@@ -19,7 +19,6 @@ FormatDateHourShort=%d.%m.%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rate defined for country '%s'.
 AmountVAT=Amount GST
 AmountLT1=Amount PST
@@ -27,3 +26,4 @@ TotalVAT=Total GST
 TotalLT1=Total PST
 VAT=GST
 VATRate=GST rate
+CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_CA/stocks.lang b/htdocs/langs/en_CA/stocks.lang
new file mode 100644
index 00000000000..0cf57e3a1c3
--- /dev/null
+++ b/htdocs/langs/en_CA/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_CA/website.lang b/htdocs/langs/en_CA/website.lang
deleted file mode 100644
index ff992a2be9e..00000000000
--- a/htdocs/langs/en_CA/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/en_CA/withdrawals.lang b/htdocs/langs/en_CA/withdrawals.lang
deleted file mode 100644
index efea7bd6270..00000000000
--- a/htdocs/langs/en_CA/withdrawals.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 1d26334c78d..11a52c3a368 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -20,7 +20,6 @@ ImportPostgreSqlDesc=To import a backup file, you must use the pg_restore comman
 CommandsToDisableForeignKeysForImportWarning=This is mandatory if you want to restore your sql dumps later
 ModulesMarketPlaceDesc=You can find more modules to download from external websites on the Internet...
 ModulesMarketPlaces=Find external applications and modules
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is enabled
 InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>with<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>with<br><b>$dolibarr_main_db_pass="%s";</b>
diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
index f50d62701a3..a71bc9ac60c 100644
--- a/htdocs/langs/en_GB/banks.lang
+++ b/htdocs/langs/en_GB/banks.lang
@@ -1,7 +1,15 @@
 # Dolibarr language file - Source file is en_US - banks
 CheckTransmitter=Drawer
+ValidateCheckReceipt=Validate this cheque receipt?
+ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt? No change will be possible once this is done.
+DeleteCheckReceipt=Delete this cheque receipt?
+ConfirmDeleteCheckReceipt=Are you sure you want to delete this cheque receipt?
 BankChecks=Bank cheques
+BankChecksToReceipt=Cheques awaiting deposit
+BankChecksToReceiptShort=Cheques awaiting deposit
 ShowCheckReceipt=Show cheque deposit receipt
+NumberOfCheques=No. of cheques
+SelectChequeTransactionAndGenerate=Select/filter cheques to include in the cheque deposit receipt, then click "Create".
 InputReceiptNumber=Identify the bank statement to reconcile. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Specify a category in which to classify the records, if required
 ThenCheckLinesAndConciliate=Select the lines shown on the bank statement and click
@@ -11,5 +19,7 @@ LabelRIB=Bank account Label
 NoBANRecord=No bank account record
 DeleteARib=Delete bank account record
 RejectCheck=Cheque returned
+ConfirmRejectCheck=Are you sure you want to mark this cheque as rejected?
 RejectCheckDate=Date the cheque was returned
 CheckRejected=Cheque returned
+CheckRejectedAndInvoicesReopened=Cheque returned and invoices reopened
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index 6017c065657..edab2e8bb42 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -17,7 +17,14 @@ ChequeMaker=Cheque/Transfer drawer
 ChequeBank=Bank of Cheque
 CheckBank=Cheque
 PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+PaymentByChequeOrderedTo=Cheque payments (including tax) are payable to %s, send to
+PaymentByChequeOrderedToShort=Cheque payments (incl. tax) are payable to
+MenuChequeDeposits=Cheque Deposits
 MenuCheques=Cheques
+MenuChequesReceipts=Cheque receipts
+ChequesReceipts=Cheque receipts
+ChequesArea=Cheque deposits area
+ChequeDeposits=Cheque deposits
 Cheques=Cheques
 NbCheque=Number of cheques
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
diff --git a/htdocs/langs/en_GB/cashdesk.lang b/htdocs/langs/en_GB/cashdesk.lang
index 5528ba978e2..0188074370e 100644
--- a/htdocs/langs/en_GB/cashdesk.lang
+++ b/htdocs/langs/en_GB/cashdesk.lang
@@ -6,5 +6,3 @@ NewSell=New sale
 RestartSelling=Go back to sales
 NoProductFound=No product found
 NoArticle=No product
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang
index 5811bc86b24..e6fe573fe69 100644
--- a/htdocs/langs/en_GB/compta.lang
+++ b/htdocs/langs/en_GB/compta.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - compta
 CheckReceipt=Cheque deposit
 CheckReceiptShort=Cheque deposit
+LastCheckReceiptShort=Last %s cheque receipts
 NewCheckDeposit=New cheque deposit
 NewCheckDepositOn=Create receipt for deposit to account: %s
 NoWaitingChecks=No cheques awaiting deposit.
 DateChequeReceived=Cheque reception date
+NbOfCheques=No. of cheques
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index b712cacaa69..9fb796ec07a 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -19,7 +19,6 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
 ErrorNoVATRateDefinedForSellerCountry=Error, no VAT rates defined for country '%s'.
 NotAuthorized=You are not authorised to do that.
 BackgroundColorByDefault=Default background colour
@@ -41,3 +40,4 @@ Canceled=Cancelled
 Color=Colour
 NoPhotoYet=No picture available yet
 SearchIntoSupplierProposals=Vendor quotes
+CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang
index f7af001b916..d1dcfa24f6f 100644
--- a/htdocs/langs/en_GB/stocks.lang
+++ b/htdocs/langs/en_GB/stocks.lang
@@ -14,3 +14,4 @@ IsInPackage=Packaged
 ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (<strong>%s</strong>) already exists but with different useby or sellby dates (found <strong>%s</strong> but you entered <strong>%s</strong>).
 OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so total of stock by sales value can't be calculated
 AddNewProductStockWarehouse=Set new limit for alert and desired optimal stock level
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_GB/website.lang b/htdocs/langs/en_GB/website.lang
index f2cfbf3456c..ef8e16da6ad 100644
--- a/htdocs/langs/en_GB/website.lang
+++ b/htdocs/langs/en_GB/website.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - website
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge an SEO URL when the website is run from a Virtual host of a Web server (like Apache, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
index 5ff06df1221..b1d58194878 100644
--- a/htdocs/langs/en_GB/withdrawals.lang
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Payment status must be set to 'credited' before declaring reject on specific lines.
 AmountToWithdraw=Amount to pay
 MakeWithdrawRequest=Make a Direct Debit payment request
@@ -10,12 +9,7 @@ RefusedInvoicing=Invoicing the rejection
 NoInvoiceRefused=Do not charge for the rejection
 StatusMotif6=Account without a balance
 OrderWaiting=Waiting for action
-NotifyTransmision=Payment Transmission
-NotifyCredit=Payment Credit
 WithdrawalFileNotCapable=Unable to generate Payment receipt file for your country %s (Your country is not supported)
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Payment file
 WithdrawRequestAmount=The amount of Direct Debit request:
 WithdrawRequestErrorNilAmount=Unable to create a Direct Debit request for an empty amount.
 SEPALegalText=By signing this mandate form, you authorise (A) %s to send instructions to your bank to debit your account and (B) your bank to debit your account in accordance with the instructions from %s. As part of your rights, you are entitled to a refund from your bank under the terms and conditions of your agreement with your bank. A refund must be claimed within 8 weeks starting from the date on which your account was debited. Your rights regarding the above mandate are explained in a statement that you can obtain from your bank.
diff --git a/htdocs/langs/en_GB/workflow.lang b/htdocs/langs/en_GB/workflow.lang
index 76a0eacdf1f..57fc547e54d 100644
--- a/htdocs/langs/en_GB/workflow.lang
+++ b/htdocs/langs/en_GB/workflow.lang
@@ -1,4 +1,2 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions within the application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available within the activated modules.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have the same amount than proposal)
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index ebfc7deb6d3..4b3c42b80b1 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 Module20Name=Quotations
 Module20Desc=Management of quotations
 Permission21=Read quotations
diff --git a/htdocs/langs/en_IN/cashdesk.lang b/htdocs/langs/en_IN/cashdesk.lang
deleted file mode 100644
index 8990ec63d62..00000000000
--- a/htdocs/langs/en_IN/cashdesk.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang
index 15902ff1c4d..2012bdeac9d 100644
--- a/htdocs/langs/en_IN/main.lang
+++ b/htdocs/langs/en_IN/main.lang
@@ -19,8 +19,8 @@ FormatDateHourShort=%d/%m/%Y %I:%M %p
 FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
 CommercialProposalsShort=Quotations
 LinkToProposal=Link to quotation
 SearchIntoCustomerProposals=Quotations
 ContactDefault_propal=Quotation
+CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_IN/stocks.lang b/htdocs/langs/en_IN/stocks.lang
new file mode 100644
index 00000000000..0cf57e3a1c3
--- /dev/null
+++ b/htdocs/langs/en_IN/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_IN/website.lang b/htdocs/langs/en_IN/website.lang
deleted file mode 100644
index ff992a2be9e..00000000000
--- a/htdocs/langs/en_IN/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/en_IN/withdrawals.lang b/htdocs/langs/en_IN/withdrawals.lang
deleted file mode 100644
index efea7bd6270..00000000000
--- a/htdocs/langs/en_IN/withdrawals.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
index bdc794e1b31..c1d306ec390 100644
--- a/htdocs/langs/en_SG/admin.lang
+++ b/htdocs/langs/en_SG/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 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.
diff --git a/htdocs/langs/en_SG/cashdesk.lang b/htdocs/langs/en_SG/cashdesk.lang
deleted file mode 100644
index 8990ec63d62..00000000000
--- a/htdocs/langs/en_SG/cashdesk.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/en_SG/main.lang b/htdocs/langs/en_SG/main.lang
index 0f9be27b22f..d7e1fe7e8a5 100644
--- a/htdocs/langs/en_SG/main.lang
+++ b/htdocs/langs/en_SG/main.lang
@@ -19,4 +19,4 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
+CREATEInDolibarr=Record %s create
diff --git a/htdocs/langs/en_SG/stocks.lang b/htdocs/langs/en_SG/stocks.lang
new file mode 100644
index 00000000000..0cf57e3a1c3
--- /dev/null
+++ b/htdocs/langs/en_SG/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/en_SG/website.lang b/htdocs/langs/en_SG/website.lang
deleted file mode 100644
index ff992a2be9e..00000000000
--- a/htdocs/langs/en_SG/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/en_SG/withdrawals.lang b/htdocs/langs/en_SG/withdrawals.lang
deleted file mode 100644
index efea7bd6270..00000000000
--- a/htdocs/langs/en_SG/withdrawals.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index fea7bf9d0ef..24255577b11 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -18,12 +18,14 @@ DefaultForService=Default for service
 DefaultForProduct=Default for product
 CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -33,8 +35,8 @@ OtherInfo=Other information
 DeleteCptCategory=Remove accounting account from group
 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
 JournalizationInLedgerStatus=Status of journalization
-AlreadyInGeneralLedger=Already journalized in ledgers
-NotYetInGeneralLedger=Not yet journalized in ledgers
+AlreadyInGeneralLedger=Already transferred in accounting journals and ledger
+NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger
 GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group
 DetailByAccount=Show detail by account
 AccountWithNonZeroValues=Accounts with non-zero values
@@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -89,6 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -110,7 +116,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -149,6 +155,8 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -168,6 +176,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
 DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
@@ -202,16 +212,16 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
 ThirdpartyAccountNotDefined=Account for third party not defined
 ProductAccountNotDefined=Account for product not defined
@@ -237,6 +247,7 @@ PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Opening balance
 ShowOpeningBalance=Show opening balance
 HideOpeningBalance=Hide opening balance
+ShowSubtotalByGroup=Show subtotal by group
 
 Pcgtype=Group of account
 PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
@@ -283,6 +294,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
@@ -302,6 +314,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use
 AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Number of entries
 NumberOfAccountancyMovements=Number of movements
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
 ExportDraftJournal=Export draft journal
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 431ef75ac63..f8912b87eeb 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -71,7 +71,7 @@ DisableJavascriptNote=Note: For test or debug purpose. For optimization for blin
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
+DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient.
 NumberOfKeyToSearch=Number of characters to trigger search: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
@@ -219,7 +219,7 @@ Nouveauté=Novelty
 AchatTelechargement=Buy / Download
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming may develop a module.
+DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 WebSiteDesc=External websites for more add-on (non-core) modules...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=URL
@@ -289,6 +289,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
 MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
 MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
 MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
@@ -387,12 +388,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -438,9 +439,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- id_field is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter which is the current id of current object<br>To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
-ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
+ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath
 ExtrafieldParamHelpSeparator=Keep empty for a simple separator<br>Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)<br>Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session)
 LibraryToBuildPDF=Library used for PDF generation
 LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:<br>1: local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3: local tax apply on products without vat (localtax is calculated on amount without tax)<br>4: local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5: local tax apply on services without vat (localtax is calculated on amount without tax)<br>6: local tax apply on services including vat (localtax is calculated on amount + tax)
@@ -478,8 +479,11 @@ ModuleCompanyCodeCustomerDigitaria=%s followed by the truncated customer name by
 ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by the number of characters: %s for the supplier accounting code.
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
-WarningPHPMail=WARNING: It is often better to setup outgoing emails to use the email server of your provider instead of the default setup. Some email providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted (be careful also of your email provider's sending quota).<br>If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider.
-WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (for example with some SMTP relay like smtp-relay.google.com), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
+WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
+WarningPHPMailA=- Using the server of the Email Service Provider increase the trustability of your email, so it increase the deliverablity without being flagging as SPAM
+WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
+WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
@@ -551,8 +555,6 @@ Module57Name=Payments by Direct Debit
 Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
-Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
 Module60Name=Stickers
 Module60Desc=Management of stickers
 Module70Name=Interventions
@@ -656,7 +658,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -671,7 +673,7 @@ Module63000Name=Resources
 Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
+Permission13=Invalidate customer invoices
 Permission14=Validate customer invoices
 Permission15=Send customer invoices by email
 Permission16=Create payments for customer invoices
@@ -688,6 +690,7 @@ Permission32=Create/modify products
 Permission34=Delete products
 Permission36=See/manage hidden products
 Permission38=Export products
+Permission39=Ignore minimum price
 Permission41=Read projects and tasks (shared project and projects I'm contact for). Can also enter time consumed, for me or my hierarchy, on assigned tasks (Timesheet)
 Permission42=Create/modify projects (shared project and projects I'm contact for). Can also create tasks and assign users to project and tasks
 Permission44=Delete projects (shared project and projects I'm contact for)
@@ -696,6 +699,9 @@ Permission61=Read interventions
 Permission62=Create/modify interventions
 Permission64=Delete interventions
 Permission67=Export interventions
+Permission68=Send interventions by email
+Permission69=Validate interventions
+Permission70=Invalidate interventions
 Permission71=Read members
 Permission72=Create/modify members
 Permission74=Delete members
@@ -718,6 +724,7 @@ Permission95=Read reports
 Permission101=Read sendings
 Permission102=Create/modify sendings
 Permission104=Validate sendings
+Permission105=Send sendings by email
 Permission106=Export sendings
 Permission109=Delete sendings
 Permission111=Read financial accounts
@@ -843,6 +850,9 @@ Permission561=Read payment orders by credit transfer
 Permission562=Create/modify payment order by credit transfer
 Permission563=Send/Transmit payment order by credit transfer
 Permission564=Record Debits/Rejections of credit transfer
+Permission601=Read stickers
+Permission602=Create/modify stickers
+Permission609=Delete stickers
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
@@ -884,7 +894,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
+Permission1189=Check/Uncheck a purchase order reception
 Permission1190=Approve (second approval) purchase orders
+Permission1191=Export supplier orders and their attributes
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read vendor invoices
@@ -898,6 +910,8 @@ Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1322=Reopen a paid bill
 Permission1421=Export sales orders and attributes
+Permission1521=Read documents
+Permission1522=Delete documents
 Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
 Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
 Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
@@ -932,9 +946,13 @@ Permission23001=Read Scheduled job
 Permission23002=Create/update Scheduled job
 Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
-Permission50101=Use Point of Sale
+Permission50101=Use Point of Sale (SimplePOS)
+Permission50151=Use Point of Sale (TakePOS)
 Permission50201=Read transactions
 Permission50202=Import transactions
+Permission50330=Read objects of Zapier
+Permission50331=Create/Update objects of Zapier
+Permission50332=Delete objects of Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -958,9 +976,18 @@ Permission63001=Read resources
 Permission63002=Create/modify resources
 Permission63003=Delete resources
 Permission63004=Link resources to agenda events
+Permission64001=Allow direct printing
+Permission67000=Allow printing of receipts
+Permission941601=Read receipts
+Permission941602=Create and modify receipts
+Permission941603=Validate receipts
+Permission941604=Send receipts by email
+Permission941605=Export receipts
+Permission941606=Delete receipts
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -990,7 +1017,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1045,6 +1073,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 LabelOrTranslationKey=Label or translation key
 ValueOfConstantKey=Value of a configuration constant
+ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
 CurrentNext=Current/Next
@@ -1089,7 +1118,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1192,7 +1221,8 @@ RestoreDesc=To restore a Dolibarr backup, two steps are required.
 RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (<b>%s</b>).
 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
+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. 
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Existing archive files
 WeekStartOnDay=First day of the week
@@ -1253,7 +1283,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1279,7 +1310,7 @@ GetBarCode=Get barcode
 NumberingModules=Numbering models
 DocumentModules=Document models
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
@@ -1568,9 +1599,9 @@ SyslogLevel=Level
 SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
-SyslogFileNumberOfSaves=Log backups
+SyslogFileNumberOfSaves=Number of backup logs to keep
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
 ##### Donations #####
 DonationsSetup=Donation module setup
@@ -1691,7 +1722,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1791,7 +1822,6 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
-ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index
 ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Expense reports numbering module
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
@@ -1830,6 +1860,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1870,6 +1901,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1908,6 +1940,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1947,13 +1980,16 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+WithDolTrackingIDInMsgId=Message sent from Dolibarr
+WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1995,7 +2031,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+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. 
@@ -2022,4 +2058,5 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-SwitchThisForABetterSecurity=Switching this value to 1 is recommended for more security
+MailToSendEventPush=Template for event reminder emails
+SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 4e51762d759..4ab87aa8420 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in the group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -150,8 +152,19 @@ ActionType=Event type
 DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
+OnceOnly=Once only
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
 DayOfWeek=Day of week
 DateStartPlusOne=Date start + 1 hour
+SetAllEventsToTodo=Set all events to todo
+SetAllEventsToInProgress=Set all events to in progress
+SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
+EventReminder=Event Reminder
\ No newline at end of file
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 75f9549dca5..ffe5ee9ca1c 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment
 VariousPayments=Miscellaneous payments
 ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
+VariousPaymentId=Miscellaneous payment ID
+VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index dccc80b1918..9c918bd0a15 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -383,6 +383,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=View available discounts
+GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -572,3 +573,6 @@ MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Invoice deleted
 BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
 UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
+CustomersInvoicesArea=Customer billing area
+SupplierInvoicesArea=Supplier billing area
+FacParentLine=Invoice Line Parent
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 2405bfd5e64..14db79809bc 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs 
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures 
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -102,3 +104,4 @@ BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
 # Pages
 AccountancyHome=Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index ce5cdaf4ba6..549646ab110 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -117,4 +117,9 @@ HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
 NumberOfLinesToShow=Number of lines of images to show 
 DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
+WeighingScale=Weighing scale
\ No newline at end of file
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 9bb71984ecf..c813f6d694f 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -84,7 +84,7 @@ AddProductServiceIntoCategory=Add the following product/service
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
+StocksCategoriesArea=Warehouses Categories
+ActionCommCategoriesArea=Events Categories
+WebsitePagesCategoriesArea=Page-Container Categories
 UseOrOperatorForCategories=Use or operator for categories
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 92674363ced..4145d7184c5 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -354,6 +354,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -456,3 +457,6 @@ PaymentTermsSupplier=Payment Term - Vendor
 PaymentTypeBoth=Payment Type - Customer and Vendor
 MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
+InEEC=Europe (EEC)
+RestOfEurope=Rest of Europe (EEC)
+OutOfEurope=Out of Europe (EEC)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 8a8c837ac87..715c3dfb8f5 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -168,12 +169,15 @@ RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting
 SeePageForSetup=See menu <a href="%s">%s</a> for setup
 DepositsAreNotIncluded=- Down payment invoices are not included
 DepositsAreIncluded=- Down payment invoices are included
+LT1ReportByMonth=Tax 2 report by month
+LT2ReportByMonth=Tax 3 report by month
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=Report by third party IRPF
 VATReport=Sale tax report
 VATReportByPeriods=Sale tax report by period
+VATReportByMonth=Sale tax report by month
 VATReportByRates=Sale tax report by rates
 VATReportByThirdParties=Sale tax report by third parties
 VATReportByCustomers=Sale tax report by customer
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index de7145b4548..49a65fdb39d 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -99,3 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up cont
 TypeContact_contrat_external_BILLING=Billing customer contact
 TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
 TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
+HideClosedServiceByDefault=Hide closed services by default
+ShowClosedServices=Show Closed Services
+HideClosedServices=Hide Closed Services
\ No newline at end of file
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 1de1251831a..bb61ed13bbe 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -14,6 +14,7 @@ FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
 CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
 CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
 CronMethodDoesNotExists=Class %s does not contains any method %s
+CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
 CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
 CronJobProfiles=List of predefined cron job profiles
 # Menu
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 369ac6dfdfa..aaf81b0f346 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -50,3 +50,6 @@ ReSyncListOfDir=Resync list of directories
 HashOfFileContent=Hash of file content
 NoDirectoriesFound=No directories found
 FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ExtraFieldsEcmFiles=Extrafields Ecm Files
+ExtraFieldsEcmDirectories=Extrafields Ecm Directories
+ECMSetup=ECM Setup
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 75a12d517d0..e388c505663 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -215,7 +216,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using kits to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number.
 ErrorDescRequiredForFreeProductLines=Description is mandatory for lines with free product
 ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong> has the same name or alternative alias that the one your try to use
 ErrorDuringChartLoad=Error when loading chart of accounts. If few accounts were not loaded, you can still enter them manually.
@@ -239,6 +240,11 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be enabled into <b>conf/conf.php<b> to allow use of Command Line Interface by the internal job scheduler
+ErrorLoginDateValidity=Error, this login is outside the validity date range
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -265,4 +271,6 @@ WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different re
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
\ No newline at end of file
+WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
+WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningCreateSubAccounts=Warning, you can't create directly a sub account, you must create a third party or an user and assign them an accounting code to find them in this list
diff --git a/htdocs/langs/en_US/ftp.lang b/htdocs/langs/en_US/ftp.lang
index d80b87c2715..254a2a698ce 100644
--- a/htdocs/langs/en_US/ftp.lang
+++ b/htdocs/langs/en_US/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen shows a view of an FTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
+FTPClientSetup=FTP or SFTP Client module setup
+NewFTPClient=New FTP/FTPS connection setup
+FTPArea=FTP/FTPS Area
+FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
+FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
 FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
 FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
 FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
+ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
 FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index e5936f8246e..51079fca278 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -64,3 +64,5 @@ InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
 RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+Reopen=Reopen
+ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
index 534dee08867..d271ed0c140 100644
--- a/htdocs/langs/en_US/loan.lang
+++ b/htdocs/langs/en_US/loan.lang
@@ -23,6 +23,9 @@ AddLoan=Create loan
 FinancialCommitment=Financial commitment
 InterestAmount=Interest
 CapitalRemain=Capital remain
+TermPaidAllreadyPaid = This term is allready paid
+CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
+CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
 # Admin
 ConfigLoan=Configuration of the module loan
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 7b3bfd3852a..7e34db3d8b8 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -125,12 +125,13 @@ TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
+NotificationsAuto=Notifications Auto.
+NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+ANotificationsWillBeSent=1 automatic notification will be sent by email
+SomeNotificationsWillBeSent=%s automatic notifications will be sent by email
+AddNewNotification=Activate a new automatic email notification target/event
+ListOfActiveNotifications=List all active targets/events for automatic email notification
+ListOfNotificationsDone=List all automatic email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
@@ -165,6 +166,11 @@ NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category
 OutGoingEmailSetup=Outgoing email setup
 InGoingEmailSetup=Incoming email setup
 OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
+RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 6d2892cddad..789d3836e37 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -28,7 +28,7 @@ NoTemplateDefined=No template available for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=No translation
 Translation=Translation
-EmptySearchString=Enter a non empty search string
+EmptySearchString=Enter non empty search criterias
 NoRecordFound=No record found
 NoRecordDeleted=No record deleted
 NotEnoughDataYet=Not enough data
@@ -155,6 +155,7 @@ RemoveLink=Remove link
 AddToDraft=Add to draft
 Update=Update
 Close=Close
+CloseAs=Set status to
 CloseBox=Remove widget from your dashboard
 Confirm=Confirm
 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to <b>%s</b>?
@@ -187,6 +188,8 @@ ShowCardHere=Show card
 Search=Search
 SearchOf=Search
 SearchMenuShortCut=Ctrl + shift + f
+QuickAdd=Quick add
+QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Valid
 Approve=Approve
 Disapprove=Disapprove
@@ -317,6 +320,7 @@ Morning=Morning
 Afternoon=Afternoon
 Quadri=Quadri
 MonthOfDay=Month of the day
+DaysOfWeek=Days of week
 HourShort=H
 MinuteShort=mn
 Rate=Rate
@@ -367,6 +371,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencySubPrice=Amount sub price multi currency
 AmountLT1=Amount tax 2
 AmountLT2=Amount tax 3
 AmountLT1ES=Amount RE
@@ -483,6 +488,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -506,6 +512,7 @@ Draft=Draft
 Drafts=Drafts
 StatusInterInvoiced=Invoiced
 Validated=Validated
+ValidatedToProduce=Validated (To produce)
 Opened=Open
 OpenAll=Open (All)
 ClosedAll=Closed (All)
@@ -652,6 +659,7 @@ Response=Response
 Priority=Priority
 SendByMail=Send by email
 MailSentBy=Email sent by
+NotSent=Not sent
 TextUsedInTheMessageBody=Email body
 SendAcknowledgementByMail=Send confirmation email
 SendMail=Send email
@@ -685,6 +693,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -724,7 +733,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -832,6 +841,7 @@ ListOfTemplates=List of templates
 Gender=Gender
 Genderman=Man
 Genderwoman=Woman
+Genderother=Other
 ViewList=List view
 ViewGantt=Gantt view
 ViewKanban=Kanban view
@@ -1004,6 +1014,9 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
+SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
 CommentPage=Comments space
@@ -1073,3 +1086,15 @@ AmountMustBePositive=Amount must be positive
 ByStatus=By status
 InformationMessage=Information
 Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s created
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
+DefaultMailModel=Default Mail Model
+PublicVendorName=Public name of vendor
+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
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index dd0a5bf49e2..1a1419aa6da 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -19,14 +19,12 @@ MembersCards=Members business cards
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
+MembersListUpToDate=List of valid members with up-to-date subscription
+MembersListNotUpToDate=List of valid members with out-of-date subscription
 MembersListResiliated=List of terminated members
 MembersListQualified=List of qualified members
 MenuMembersToValidate=Draft members
 MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
 MenuMembersResiliated=Terminated members
 MembersWithSubscriptionToReceive=Members with subscription to receive
 MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -34,6 +32,7 @@ DateSubscription=Subscription date
 DateEndSubscription=Subscription end date
 EndSubscription=End subscription
 SubscriptionId=Subscription id
+WithoutSubscription=Without subscription
 MemberId=Member id
 NewMember=New member
 MemberType=Member type
@@ -81,7 +80,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -117,6 +116,7 @@ SendingEmailOnMemberValidation=Sending email on new member validation
 SendingEmailOnNewSubscription=Sending email on new subscription
 SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
 SendingEmailOnCancelation=Sending email on cancelation
+SendingReminderActionComm=Sending reminder for agenda event
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
@@ -167,6 +167,7 @@ MembersStatisticsByState=Members statistics by state/province
 MembersStatisticsByTown=Members statistics by town
 MembersStatisticsByRegion=Members statistics by region
 NbOfMembers=Number of members
+NbOfActiveMembers=Number of current active members
 NoValidatedMemberYet=No validated members found
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index b1f8fbf6384..6b61f8c06c1 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -77,7 +77,7 @@ IsAMeasure=Is a measure
 DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
-GoToApiExplorer=Go to API explorer
+GoToApiExplorer=API explorer
 ListOfMenusEntries=List of menu entries
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index faa8eb60cf4..f4c6eb9246a 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
@@ -74,4 +75,6 @@ ProductsToConsume=Products to consume
 ProductsToProduce=Products to produce
 UnitCost=Unit cost
 TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) 
\ No newline at end of file
+BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it.
+ 
\ No newline at end of file
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 65f002cf52c..7495291cf3f 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -5,8 +5,6 @@ Tools=Tools
 TMenuTools=Tools
 ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
 Birthday=Birthday
-BirthdayDate=Birthday date
-DateToBirth=Birth date
 BirthdayAlertOn=birthday alert active
 BirthdayAlertOff=birthday alert inactive
 TransKey=Translation of the key TransKey
@@ -16,6 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
+PreviousMonth=Previous month
+CurrentMonth=Current month
 ZipFileGeneratedInto=Zip file generated into <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -97,11 +97,9 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -261,7 +259,7 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
-
+ 
 ##### Export #####
 ExportsArea=Exports area
 AvailableFormats=Available formats
@@ -281,7 +279,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
index 1bbbef4017b..6f320c03181 100644
--- a/htdocs/langs/en_US/paybox.lang
+++ b/htdocs/langs/en_US/paybox.lang
@@ -20,7 +20,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=New Paybox payment received
 NewPayboxPaymentFailed=New Paybox payment tried but failed
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index fb4379f5e1a..51f547dbdce 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -104,22 +104,24 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
-AssociatedProductsAbility=Activate virtual products (kits)
-AssociatedProducts=Virtual products
-AssociatedProductsNumber=Number of products composing this virtual product
+DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
+AssociatedProductsAbility=Activate kits (virtual products)
+AssociatedProducts=Kits
+AssociatedProductsNumber=Number of products composing this kit
 ParentProductsNumber=Number of parent packaging product
 ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual product
+IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
+IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
 KeywordFilter=Keyword filter
 CategoryFilter=Category filter
 ProductToAddSearch=Search product to add
 NoMatchFound=No match found
 ListOfProductsServices=List of products/services
-ProductAssociationList=List of products/services that are component(s) of this virtual product/kit
-ProductParentList=List of virtual products/services with this product as a component
+ProductAssociationList=List of products/services that are component(s) of this kit
+ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
 DeleteProduct=Delete a product/service
 ConfirmDeleteProduct=Are you sure you want to delete this product/service?
@@ -168,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -358,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index a068fe247fe..f5f6bf3dd9d 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -76,12 +76,12 @@ MyActivities=My tasks/activities
 MyProjects=My projects
 MyProjectsArea=My projects Area
 DurationEffective=Effective duration
-ProgressDeclared=Declared progress
+ProgressDeclared=Declared real progress
 TaskProgressSummary=Task progress
 CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
-ProgressCalculated=Calculated progress
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared real progress is more %s than the progress on consumption
+ProgressCalculated=Progress on consumption
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Time
@@ -211,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index 273996ab1b1..557df2f840f 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -47,7 +47,6 @@ SendPropalByMail=Send commercial proposal by mail
 DatePropal=Date of proposal
 DateEndPropal=Validity ending date
 ValidityDuration=Validity duration
-CloseAs=Set status to
 SetAcceptedRefused=Set accepted/refused
 ErrorPropalNotFound=Propal %s not found
 AddToDraftProposals=Add to draft proposal
@@ -85,3 +84,8 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
+
diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang
index 83a003f388d..284c4fa61fa 100644
--- a/htdocs/langs/en_US/receiptprinter.lang
+++ b/htdocs/langs/en_US/receiptprinter.lang
@@ -54,7 +54,7 @@ DOL_DOUBLE_WIDTH=Double width size
 DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
 DOL_UNDERLINE=Enable underline
 DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
+DOL_BEEP=Beep sound
 DOL_PRINT_TEXT=Print text
 DateInvoiceWithTime=Invoice date and time
 YearInvoice=Invoice year
diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang
new file mode 100644
index 00000000000..52290baf926
--- /dev/null
+++ b/htdocs/langs/en_US/recruitment.lang
@@ -0,0 +1,72 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+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.
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 5ce3b7f67e9..e1cb168500a 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -65,6 +65,7 @@ ValidateOrderFirstBeforeShipment=You must first validate the order before being
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=More complete document model for delivery receipts (logo...)
+DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
 SumOfProductVolumes=Sum of product volumes
 SumOfProductWeights=Sum of product weights
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index cd11bdb9803..ac97c24085c 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -17,6 +17,10 @@ CancelSending=Cancel sending
 DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
+MissingStocks=Missing stocks
+StockAtDate=Stocks at date
+StockAtDateInPast=Date in past
+StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
 LotSerial=Lots/Serials
 LotSerialList=List of lot/serials
@@ -30,6 +34,7 @@ StockMovementForId=Movement ID %d
 ListMouvementStockProject=List of stock movements associated to project
 StocksArea=Warehouses area
 AllWarehouses=All warehouses
+IncludeEmptyDesiredStock=Include also undefined desired stock
 IncludeAlsoDraftOrders=Include also draft orders
 Location=Location
 LocationSummary=Short name location
@@ -56,6 +61,12 @@ PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
 AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+RuleForWarehouse=Rule for warehouses
+WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
+UserDefaultWarehouse=Set a warehouse on Users
+MainDefaultWarehouse=Default warehouse
+MainDefaultWarehouseUser=Use a default warehouse for each user
+MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
 IndependantSubProductStock=Product stock and subproduct stock are independent
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -84,7 +95,9 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
@@ -119,6 +132,7 @@ CurentlyUsingPhysicalStock=Physical stock
 RuleForStockReplenishment=Rule for stocks replenishment
 SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Alerts only
+IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
 WarehouseForStockDecrease=The warehouse <b>%s</b> will be used for stock decrease
 WarehouseForStockIncrease=The warehouse <b>%s</b> will be used for stock increase
 ForThisWarehouse=For this warehouse
@@ -129,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -184,8 +198,6 @@ inventoryWarningProductAlreadyExists=This product is already into list
 SelectCategory=Category filter
 SelectFournisseur=Vendor filter
 inventoryOnDate=Inventory
-INVENTORY_DISABLE_VIRTUAL=Virtual product (kit): do not decrement stock of a child product
-INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Use the buy price if no last buy price can be found
 INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
 inventoryChangePMPPermission=Allow to change PMP value for a product
 ColumnNewPMP=New unit PMP
@@ -219,3 +231,11 @@ InventoryForASpecificWarehouse=Inventory for a specific warehouse
 InventoryForASpecificProduct=Inventory for a specific product
 StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
 ForceTo=Force to
+AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
+StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
+StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
+CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaning=Update by scaning
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|serial barcode)
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 0eac6842199..0eba2f5c286 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -28,7 +28,6 @@ AccountParameter=Account parameters
 UsageParameter=Usage parameters
 InformationToFindParameters=Help to find your %s account information
 STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-VendorName=Name of vendor
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewStripePaymentReceived=New Stripe payment received
 NewStripePaymentFailed=New Stripe payment tried but failed
diff --git a/htdocs/langs/en_US/supplier_proposal.lang b/htdocs/langs/en_US/supplier_proposal.lang
index ce5bdf0425a..ca75eddb7df 100644
--- a/htdocs/langs/en_US/supplier_proposal.lang
+++ b/htdocs/langs/en_US/supplier_proposal.lang
@@ -13,6 +13,7 @@ SupplierProposalArea=Vendor proposals area
 SupplierProposalShort=Vendor proposal
 SupplierProposals=Vendor proposals
 SupplierProposalsShort=Vendor proposals
+AskPrice=Price request
 NewAskPrice=New price request
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 80518c3401a..cf370fbdca0 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -31,10 +31,8 @@ TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
 TicketDictResolution=Ticket - Resolution
-TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
-TicketTypeShortBUGHARD=Dysfonctionnement matériel
-TicketTypeShortCOM=Commercial question
 
+TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Request for functionnal help
 TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortREQUEST=Change or enhancement request
@@ -44,7 +42,7 @@ TicketTypeShortOTHER=Other
 TicketSeverityShortLOW=Low
 TicketSeverityShortNORMAL=Normal
 TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical/Blocking
+TicketSeverityShortBLOCKING=Critical, Blocking
 
 ErrorBadEmailAddress=Field '%s' incorrect
 MenuTicketMyAssign=My tickets
@@ -72,7 +70,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,8 +125,11 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
+TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
+TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
+TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
 #
 # Index & list page
 #
@@ -158,7 +158,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index 654f14d6bf7..de31172e9d7 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -110,7 +110,7 @@ ExpenseReportPayment=Expense report payment
 ExpenseReportsToApprove=Expense reports to approve
 ExpenseReportsToPay=Expense reports to pay
 ConfirmCloneExpenseReport=Are you sure you want to clone this expense report ?
-ExpenseReportsIk=Expense report milles index
+ExpenseReportsIk=Configuration of mileage charges
 ExpenseReportsRules=Expense report rules
 ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. <b>d</b> is the distance in kilometers
 ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report
@@ -145,7 +145,7 @@ nolimitbyEX_DAY=by day (no limitation)
 nolimitbyEX_MON=by month (no limitation)
 nolimitbyEX_YEA=by year (no limitation)
 nolimitbyEX_EXP=by line (no limitation)
-CarCategory=Category of car
+CarCategory=Vehicle category
 ExpenseRangeOffset=Offset amount: %s
 RangeIk=Mileage range
 AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 9b75a2ff37e..d6ffb849aa8 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -46,6 +46,8 @@ RemoveFromGroup=Remove from group
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequest=Request to change password for <b>%s</b>
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+IfLoginExistPasswordRequestSent=If this login is a valid account, an email to reset password has been sent.
+IfEmailExistPasswordRequestSent=If this email is a valid account, an email to reset password has been sent.
 ConfirmPasswordReset=Confirm password reset
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Latest %s groups created
@@ -108,11 +110,15 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
-DateEmployment=Employment Start Date
+DateOfEmployment=Employment date
+DateEmployment=Employment
+DateEmploymentstart=Employment Start Date
 DateEmploymentEnd=Employment End Date
+RangeOfLoginValidity=Date range of login validity
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Force expense report validator
 ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s 
\ No newline at end of file
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index deb5f8dee38..c32fcd06f09 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Add website
 Webpage=Web page/container
 AddPage=Add page/container
 HomePage=Home Page
-PageContainer=Page/container
+PageContainer=Page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first '<strong>Import a full website template</strong>' or just '<strong>Add a page/container</strong>'.
 RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this.
 SiteDeleted=Web site '%s' deleted
@@ -124,7 +124,7 @@ ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
 GlobalCSSorJS=Global CSS/JS/Header file of web site
 BackToHomePage=Back to home page...
 TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not a website page
+YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
 UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
 MainLanguage=Main language
 OtherLanguages=Other languages
@@ -134,4 +134,5 @@ AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are define
 ReplacementDoneInXPages=Replacement done in %s pages or containers
 RSSFeed=RSS Feed
 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
\ No newline at end of file
+PagesRegenerated=%s page(s)/container(s) regenerated
+RegenerateWebsiteContent=Regenerate web site cache files
\ No newline at end of file
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index a18ff7a8d31..553e3ac0eaa 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -79,7 +79,7 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create file for credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index be126eef0f4..646b97ec31d 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed 
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/en_US/zapier.lang b/htdocs/langs/en_US/zapier.lang
index 6d6eda71313..c688a0c307f 100644
--- a/htdocs/langs/en_US/zapier.lang
+++ b/htdocs/langs/en_US/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
\ No newline at end of file
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 6d84a8e991f..716fc69f6c6 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -35,7 +35,6 @@ WarningModuleNotActive=El módulo <b> %s </b> debe estar habilitado
 WarningOnlyPermissionOfActivatedModules=Aquí solo se muestran los permisos relacionados con los módulos activados. Puede activar otros módulos en la página Inicio-> Configuración-> Módulos.
 DolibarrSetup=Dolibarr instala o actualiza
 GUISetup=Interfaz Gráfica
-SetupArea=Preparar
 UploadNewTemplate=Subir nueva (s) plantilla (s)
 FormToTestFileUploadForm=Formulario para probar la carga de archivos (según la configuración)
 IfModuleEnabled=Nota: solo es efectivo si el módulo <b> %s </b> está habilitado
@@ -161,6 +160,7 @@ ModulesDevelopYourModule=Desarrolle su propia aplicación / módulos
 ModulesDevelopDesc=También puede desarrollar su propio módulo o encontrar un socio para desarrollar uno para usted.
 DOLISTOREdescriptionLong=En lugar de activar el sitio web <a href="https://www.dolistore.com"> www.dolistore.com </a> para encontrar un módulo externo, puede utilizar esta herramienta integrada que realizará la búsqueda en el Mercado externo para usted (puede ser lento, necesita un acceso a Internet) ...
 NotCompatible=Este modulo no parece ser compatible con su Dolibarr %s (Min %s - Max %s).
+SeeSetupOfModule=Ver la configuración del módulo %s
 AchatTelechargement=Comprar / Descargar
 GoModuleSetupArea=Para implementar/instalar un nuevo módulo, vaya al área de configuración del Módulo: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, la tienda oficial para adquirir módulos externos de Dolibarr ERP/CRM
@@ -224,7 +224,6 @@ UserEmail=Email del usuario
 CompanyEmail=Email de la empresa
 FeatureNotAvailableOnLinux=Característica no disponible en Unix como sistemas. Prueba tu programa de sendmail localmente.
 SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregirlos editando los archivos en el directorio <b> langs / %s </b> y enviar su cambio a www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Si la traducción de este idioma no está completa o si encuentra errores, puede corregirlo editando los archivos en el directorio <b> langs / %s </b> y presentando los archivos modificados en dolibarr.org/forum o para los desarrolladores en github.com/ Dolibarr / dolibarr.
 ModulesSetup=Configuración de módulos / aplicaciones
 ModuleFamilyCrm=Gestión de la relación con el cliente (CRM)
 ModuleFamilySrm=Gestión de relaciones con proveedores (VRM)
@@ -260,6 +259,8 @@ AddCRIfTooLong=No hay ajuste de texto automático. El texto que es demasiado lar
 ExampleOfDirectoriesForModelGen=Ejemplo de  sintaxis:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 String=Cuerda
 Module30Name=Facturas
+Module40Desc=Gestión de proveedores y compras (órdenes de compra y facturas de proveedores)
+Module52Name=Inventarios(Stocks)
 Module54Name=Contratos/suscripciones
 Module80Name=Envíos
 Module80Desc=Gestión de envíos y remitos
@@ -270,8 +271,6 @@ Permission23001=Leer tarea programada
 Permission23002=Crear/actualizar tarea programada
 Permission23003=Eliminar tarea programada
 Permission23004=Ejecutar tarea programada
-DictionaryProspectLevel=Cliente potencia
-DictionaryProspectStatus=Estado del cliente potencial
 DictionaryExpenseTaxRange=Informe de gastos - Rango categoría de transporte
 BackToModuleList=Volver a la lista de módulos
 BackToDictionaryList=Volver a la lista de diccionarios
@@ -401,7 +400,6 @@ WarningAtLeastKeyOrTranslationRequired=Se requiere un criterio de búsqueda al m
 NewTranslationStringToShow=Nueva cadena de traducción para mostrar
 OriginalValueWas=La traducción original se sobrescribe. El valor original era: <br> <br> %s
 TransKeyWithoutOriginalValue=Has forzado una nueva traducción para la clave de traducción '<strong> %s </strong>' que no existe en ningún archivo de idioma
-TotalNumberOfActivatedModules=Aplicación / módulos activados: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Debes habilitar al menos 1 módulo
 ClassNotFoundIntoPathWarning=La clase %s no se encuentra en la ruta de PHP
 YesInSummer=Si en verano
@@ -534,6 +532,7 @@ LDAPFieldCompany=Compañía
 ViewProductDescInFormAbility=Mostrar descripción de productos en formularios (de otro forma es mostrado en una venta emergente tooltip popup)
 ViewProductDescInThirdpartyLanguageAbility=Mostrar descripciones de productos en el lenguaje del tercero
 Target=Destino
+Sell=Vender
 PositionIntoComboList=Posición de la línea en las listas de combo
 SellTaxRate=Tasa de impuesto de venta
 RecuperableOnly=Sí, para el IVA "No percibido pero recuperable" dedicado a algún estado de Francia. Mantenga el valor en "No" en todos los demás casos.
diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang
index 7f068578411..06f7b03da61 100644
--- a/htdocs/langs/es_AR/main.lang
+++ b/htdocs/langs/es_AR/main.lang
@@ -22,7 +22,6 @@ FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Conexión de base de datos
 NoTemplateDefined=No hay plantilla para este tipo de email
 AvailableVariables=Variables disponibles de substitución
-EmptySearchString=Enter non empty search criterias
 NoRecordFound=Sin registros
 NoRecordDeleted=Sin registros eliminados
 NotEnoughDataYet=Sin datos suficientes
@@ -202,8 +201,7 @@ PriceUTTC=P.U. (con imp.)
 Amount=Monto
 AmountInvoice=Monto de factura
 AmountInvoiced=Monto facturado
-AmountInvoicedHT=Monto facturado (con imp.)
-AmountInvoicedTTC=Monto facturado (neto)
+AmountInvoicedHT=Monto facturado (neto)
 AmountPayment=Monto pagado
 AmountHTShort=Monto (neto)
 AmountTTCShort=Monto (con imp.)
@@ -291,6 +289,7 @@ DolibarrWorkBoard=Items Abiertos
 NoOpenedElementToProcess=No hay elementos abiertos para procesar
 NotYetAvailable=Todavía no disponible
 Categories=Etiquetas/categorías
+Category=Etiqueta/categoría
 to=para
 To=para
 Qty=Ctd
@@ -421,7 +420,6 @@ UnHidePassword=Mostrar comando real con contraseña visible
 RootOfMedias=Carpeta raíz de medios públicos (/medios)
 AddNewLine=Agregar nueva línea
 AddFile=Agregar archivo
-FreeZone=No hay producto/servicio predefinido
 FreeLineOfType=Item libre del tipo:
 CloneMainAttributes=Clonar objeto con principales atributos
 PDFMerge=Unir PDF
@@ -466,8 +464,7 @@ AdminTools=Herramientas de Admin
 SystemTools=Herramientas de sistema
 ModulesSystemTools=Herramientas de módulos
 NoPhotoYet=No hay fotos disponibles todavía
-Dashboard=Escritorio
-MyDashboard=Mi Escritorio
+MyDashboard=Mi Tablero
 from=desde
 toward=en dirección a
 SelectTargetUser=Seleccione usuario/empleado al que apuntar
diff --git a/htdocs/langs/es_AR/members.lang b/htdocs/langs/es_AR/members.lang
index 8b4b025101f..89e31bb3375 100644
--- a/htdocs/langs/es_AR/members.lang
+++ b/htdocs/langs/es_AR/members.lang
@@ -59,7 +59,6 @@ NoTypeDefinedGoToSetup=No hay tipos de miembros definidos. Vé al menú "Tipos d
 WelcomeEMail=Correo de bienvenida
 SubscriptionRequired=Se requiere suscripción
 VoteAllowed=Voto permitido
-MorPhy=Moral/Físico
 ResiliateMember=Terminar a un miembro
 ConfirmResiliateMember=¿Estás seguro de que quieres terminar con este miembro?
 DeleteMember=Eliminar a un miembro
diff --git a/htdocs/langs/es_AR/other.lang b/htdocs/langs/es_AR/other.lang
index 47aa202007c..a221f16e4b7 100644
--- a/htdocs/langs/es_AR/other.lang
+++ b/htdocs/langs/es_AR/other.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - other
 Notify_BILL_VALIDATE=Factura de cliente validada
 Notify_BILL_PAYED=Factura de cliente pagada
+SeeModuleSetup=Ver la configuración del módulo %s
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
index c42f5e892b4..10ea57249c6 100644
--- a/htdocs/langs/es_AR/products.lang
+++ b/htdocs/langs/es_AR/products.lang
@@ -3,5 +3,74 @@ ProductRef=Ref. Producto
 ProductLabel=Etiqueta del producto
 ProductLabelTranslated=Etiqueta traducida del producto
 ProductDescriptionTranslated=Descripción traducida del producto
+ProductNoteTranslated=Nota de producto traducida
+ProductServiceCard=Ficha de Productos/Servicios
+ProductId=Id de Producto/Servicio
+NewProduct=Nuevo Producto
+NewService=Nuevo Servicio
+ProductVatMassChange=Actualización global de IVA
+ProductVatMassChangeDesc=¡Esta herramienta actualiza el IVA definido en <b><u>TODOS los</u></b>  productos y servicios!
+ProductsAndServices=Productos y Servicios
+ProductsOrServices=Productos o Servicios
+ProductsOnSale=Productos para vender
+ProductsOnPurchase=Productos a comprar
+ProductsOnSaleOnly=Productos para vender únicamente
+ProductsOnPurchaseOnly=Productos para comprar únicamente
+ProductsNotOnSell=Productos que no se venden ni se compran
+ProductsOnSellAndOnBuy=Productos para vender y para comprar
+ServicesOnSale=Servicios a la venta
+ServicesOnPurchase=Servicios que se adquieren
+ServicesOnSaleOnly=Servicios que se venden únicamente
+ServicesOnPurchaseOnly=Servicios que se adquieren únicamente
+ServicesNotOnSell=Servicios que no se venden ni se adquieren
+ServicesOnSellAndOnBuy=Servicios que se vender y se adquieren
+LastModifiedProductsAndServices=Últimos %s productos/servicios modificados
+MenuStocks=Inventarios(Stocks)
+Stocks=Inventarios y ubicaciones (almacenes) de productos
+OnSell=Para vender
+OnBuy=Para comprar
+NotOnSell=No se vende
+ProductStatusOnSell=Para vender
+ProductStatusNotOnSell=No se vende
+ProductStatusOnSellShort=Para vender
+ProductStatusNotOnSellShort=No se vende
+ProductStatusOnBuy=Para comprar
+ProductStatusNotOnBuy=No se compra
+ProductStatusOnBuyShort=Para comprar
+ProductStatusNotOnBuyShort=No se compra
+UpdateVAT=Actualizar IVA
+UpdateDefaultPrice=Actualizar precio por defecto
+UpdateLevelPrices=Actualizar precio para cada nivel
+SellingPriceHT=Precio de venta (excluyente impuestos)
+SellingPriceTTC=Precio de venta (incluyendo impuestos)
+SellingMinPriceTTC=Precio de Venta Mínimo (incluyendo impuestos)
+SoldAmount=Cantidad vendida
+PurchasedAmount=Cantidad comprada
+EditSellingPriceLabel=Editar etiqueta de precio
+CantBeLessThanMinPrice=El precio de venta no puede ser menor al mínimo permitido por el producto (%s sin impuestos). Esta mensaje también parece si el descuento es demasiado importante.
+ErrorProductAlreadyExists=Y existe un producto con la referencia %s.
+ErrorProductBadRefOrLabel=Valor incorrecto de referencia o etiqueta.
+ErrorProductClone=Hubo un problema al tratar de clonar el productos o servicio.
+ErrorPriceCantBeLowerThanMinPrice=¡Error! El precio no puede ser menor a precio mínimo.
+SupplierRef=Referencia interna del proveedor (SKU)
+ProductsAndServicesArea=Área de Productos y Servicios
+ProductsArea=Área de Productos
+ServicesArea=Área de Servicios
+ListOfStockMovements=Lista de movimientos de inventario
+PriceForEachProduct=Productos con precios particulares
+SupplierCard=Ficha de proveedor
+PriceRemoved=Precio removido
+SetDefaultBarcodeType=Definir tipo de código de barras
+NoteNotVisibleOnBill=Nota (No visible en facturas, presupuestos...)
+ServiceLimitedDuration=Si un producto es un servicio con duración limitada:
+AssociatedProducts=Productos virtuales
+KeywordFilter=Filtro por Palabra Clave
+CategoryFilter=Filtro por Categoría
 ExportDataset_produit_1=Productos
+DeleteProductLine=Borrar línea de producto
+ConfirmDeleteProductLine=¿Está seguro que quiere borrar esta línea de producto?
+QtyMin=Mín. cantidad a comprar
+PriceQtyMin=Precio para cantidad mín.
+PriceQtyMinCurrency=Precio (moneda) para esta cant. (sin descuento)
+PredefinedProductsToSell=Producto Predefinido
 SuppliersPrices=Precio de Proveedor
diff --git a/htdocs/langs/es_AR/recruitment.lang b/htdocs/langs/es_AR/recruitment.lang
new file mode 100644
index 00000000000..63df7968f48
--- /dev/null
+++ b/htdocs/langs/es_AR/recruitment.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - recruitment
+ModuleRecruitmentName =Contrataciones
+ModuleRecruitmentDesc =Administrar y seguir campañas de contrataciones para nuevos puestos de trabajo
+RecruitmentSetup =Ajustes de Contrataciones
+RecruitmentArea=Area de contrataciones
+RecruitmentAbout =Acerca de contrataciones
+RecruitmentAboutPage =Sitio de Acerca de contrataciones
+NbOfEmployeesExpected=Cantidad esperada de trabajadores
+JobLabel=Etiqueta de puesto de trabajo
+WorkPlace=Lugar de trabajo
+DateExpected=Fecha esperada
+FutureManager=Futuro gerente
+ResponsibleOfRecruitement=Responsable de contrataciones
+IfJobIsLocatedAtAPartner=Si el trabajo se encuentra en un lugar asociado
diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
index ecd269206da..c291bc59434 100644
--- a/htdocs/langs/es_AR/stocks.lang
+++ b/htdocs/langs/es_AR/stocks.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - stocks
 inventoryEdit=Editar
 inventoryDraft=Activos
+SelectCategory=Filtro por Categoría
 AddProduct=Agregar
 inventoryDeleteLine=Eliminar línea
 ListInventory=Lista
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
index 891247f8c41..7c806c8b5f3 100644
--- a/htdocs/langs/es_AR/withdrawals.lang
+++ b/htdocs/langs/es_AR/withdrawals.lang
@@ -35,6 +35,7 @@ NoInvoiceRefused=No cargar el rechazo
 InvoiceRefused=Factura rechazada (cargar el rechazo al cliente)
 StatusTrans=Enviar
 StatusCredited=Acreditado
+StatusPaid=Pagado
 StatusRefused=Rechazado
 StatusMotif0=Sin especificar
 StatusMotif1=Fondos insuficientes
@@ -47,8 +48,6 @@ CreateForSepaFRST=Crear archivo de débito automático (SEPA FRST)
 CreateForSepaRCUR=Crear archivo de débito automático (SEPA RCUR)
 CreateAll=Crear archivo de débito automático (todos)
 OrderWaiting=A la espera de procesamiento
-NotifyTransmision=Transmisión de extracción
-NotifyCredit=Crédito de Extracción
 NumeroNationalEmetter=Número de transmisor nacional
 WithBankUsingRIB=Para cuentas bancarias que utilizan RIB
 WithBankUsingBANBIC=Para cuentas bancarias que utilizan IBAN/BIC/SWIFT
@@ -57,7 +56,6 @@ CreditDate=Acreditar en
 WithdrawalFileNotCapable=No se puede generar el archivo de comprobante de extracción para su país %s (su país no es compatible)
 ShowWithdraw=Mostrar orden de débito automático
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene al menos una orden de pago por débito automático aún no procesada, no se establecerá como pagada para permitir la administración previa de extracciones.
-WithdrawalFile=Archivo de extracción
 SetToStatusSent=Colocar estado como "Archivo enviado"
 StatisticsByLineStatus=Estadísticas por estado de líneas
 RUMLong=Referencia única de mandato
diff --git a/htdocs/langs/es_AR/workflow.lang b/htdocs/langs/es_AR/workflow.lang
index c5bed780ec6..92a2b43b960 100644
--- a/htdocs/langs/es_AR/workflow.lang
+++ b/htdocs/langs/es_AR/workflow.lang
@@ -10,6 +10,6 @@ descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar su propuesta de origen como
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar su propuesta de origen como facturada cuando la factura de cliente esté validada (y el monto de la factura sea el mismo que el total de su propuesta firmada)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar su orden de venta como facturada cuando la factura de cliente esté validada (y el monto de la factura sea el mismo que el total de su orden)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar su orden de venta como facturada cuando la factura del cliente esté marcada como "Pagada" (y el monto de la factura sea el mismo que el total de su orden)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar su orden de venta como enviada cuando el viaje esté validado (y la cantidad enviada en todos sus viajes sea la misma que en el pedido para actualizar)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar su pedido vinculado como enviado cuando el envío esté validado (y la cantidad enviada en todos los envíos sea la misma que en el pedido a actualizar)
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar su propuesta de origen de proveedor como facturada cuando la factura del proveedor esté validada (y que el monto de la factura sea el mismo que el total de su propuesta)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar su orden de compra como facturada cuando la factura de proveedor esté validada (y el monto de la factura sea el mismo que el total de su orden)
diff --git a/htdocs/langs/es_BO/main.lang b/htdocs/langs/es_BO/main.lang
index 0f9be27b22f..2e691473326 100644
--- a/htdocs/langs/es_BO/main.lang
+++ b/htdocs/langs/es_BO/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 2c5b0fedb7c..c4fae1266ad 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -214,7 +214,6 @@ UserEmail=Correo electrónico del usuario
 CompanyEmail=Email de la empresa
 FeatureNotAvailableOnLinux=Característica no disponible en sistemas como Unix. Pruebe su programa sendmail localmente.
 SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregirlos editando los archivos en el directorio <b>langs / %s</b> y envíe su cambio a www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Si la traducción de este idioma no está completa o si encuentra errores, puede corregir esto editando archivos en el directorio <b>langs /%s</b> y enviando archivos modificados en dolibarr.org/forum o para desarrolladores en github.com/Dolibarr/dolibarr.
 ModulesSetup=Módulos / configuración de la aplicación
 ModuleFamilyCrm=Gestión de la relación con el cliente (CRM)
 ModuleFamilySrm=Gestión de relaciones con proveedores (VRM)
@@ -282,10 +281,8 @@ SmsTestMessage=Mensaje de prueba de __PHONEFROM__ a __PHONETO__
 ModuleMustBeEnabledFirst=El módulo <b>%s</b> debe estar habilitado primero si necesitas esta característica.
 SecurityToken=Clave para asegurar URLs
 NoSmsEngine=No hay administrador de remitente de SMS disponible. Un administrador de remitentes de SMS no se instala con la distribución predeterminada porque dependen de un proveedor externo, pero puede encontrar algunos en %s
-PDFAddressForging=Reglas para cajas de direcciones
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el Impuesto de Ventas / IVA
 PDFRulesForSalesTax=Reglas para el impuesto a las ventas / IVA
-HideLocalTaxOnPDF=Ocultar la tasa %s en la columna Venta de impuestos
 HideDescOnPDF=Ocultar descripción de productos
 HideRefOnPDF=Ocultar productos ref.
 HideDetailsOnPDF=Ocultar detalles de líneas de productos
@@ -393,8 +390,6 @@ Module51Desc=Gerencia de correo de papel en masa
 Module52Desc=Gestion de Stocks
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Gestión del código de barras
-Module57Name=Pagos de débito directo bancario
-Module57Desc=Gestión de órdenes de pago de débito directo. Incluye generación de archivo SEPA para países europeos.
 Module58Desc=Integración de un sistema ClickToDial (Asterisk, ...)
 Module59Desc=Agregar función para generar una cuenta de Bookmark4u desde una cuenta de Dolibarr
 Module70Desc=Gestión de intervención
@@ -692,7 +687,6 @@ Permission59003=Lea cada margen de usuario
 Permission63004=Enlace de recursos a eventos de la agenda
 DictionaryCompanyType=Tipos de terceros
 DictionaryCompanyJuridicalType=Entidades legales de terceros
-DictionaryProspectLevel=Potencial de prospecto
 DictionaryCanton=Estados / Provincias
 DictionarySocialContributions=Tipos de impuestos sociales o fiscales.
 DictionaryVAT=Tipos de IVA o tasas de impuestos a las ventas
@@ -713,7 +707,6 @@ DictionaryAccountancyJournal=Libros contables
 DictionaryEMailTemplates=Plantillas de correo electrónico
 DictionaryMeasuringUnits=Unidades de medida
 DictionarySocialNetworks=Redes Sociales
-DictionaryProspectStatus=Estado de la perspectiva
 DictionaryHolidayTypes=Tipos de licencia
 DictionaryOpportunityStatus=Estado de plomo para proyecto / lider
 BackToModuleList=Volver a la lista de módulos
@@ -777,7 +770,6 @@ DefaultMaxSizeShortList=Longitud máxima predeterminada para listas cortas (es d
 MessageLogin=Mensaje de la página de inicio
 LoginPage=Página de inicio de sesión
 PermanentLeftSearchForm=Formulario de búsqueda permanente en el menú de la izquierda
-EnableMultilangInterface=Habilitar soporte multilenguaje
 CompanyInfo=Empresa / Organización
 CompanyIds=Identidades de la empresa / organización
 CompanyCurrency=Moneda principal
@@ -896,7 +888,6 @@ WarningAtLeastKeyOrTranslationRequired=Se requiere un criterio de búsqueda al m
 NewTranslationStringToShow=Nueva cadena de traducción para mostrar
 OriginalValueWas=La traducción original se sobrescribe. El valor original fue: <br> <br> %s
 TransKeyWithoutOriginalValue=Obligó una nueva traducción para la clave de traducción &#39; <strong>%s</strong> &#39; que no existe en ningún archivo de idioma
-TotalNumberOfActivatedModules=Aplicaciones/módulos activos: <b>%s</b>/<b>%s</b>
 YouMustEnableOneModule=Debe al menos habilitar 1 módulo
 ClassNotFoundIntoPathWarning=La clase %s no se encuentra en la ruta de PHP
 OnlyFollowingModulesAreOpenedToExternalUsers=Tenga en cuenta que solo los siguientes módulos están disponibles para usuarios externos (independientemente de los permisos de dichos usuarios) y solo si se otorgan permisos: <br>
@@ -1219,13 +1210,11 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
 AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
-AGENDA_DEFAULT_VIEW=¿Qué pestaña desea abrir de forma predeterminada al seleccionar el menú Agenda?
 AGENDA_REMINDER_EMAIL=Habilite el recordatorio de eventos <b>por correo electrónico</b>  (la opción recordar/demorar se puede definir en cada evento). Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para que el recordatorio se envíe con la frecuencia correcta.
 AGENDA_REMINDER_BROWSER=Active el recordatorio de eventos <b>en el navegador del usuario</b> (cuando se alcanza la fecha del evento, cada usuario puede rechazar esto de la pregunta de confirmación del navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar notificación de sonido
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 ClickToDialUrlDesc=Se llama a Url cuando se hace clic en el picto de un teléfono. En la URL, puede usar etiquetas <br> <b> __ PHONETO __ </ b> que se reemplazarán por el número de teléfono de la persona a quien llamar <br> <b> __ PHONEFROM __ </ b> que se reemplazará por el número de teléfono de la llamada persona (suya) <br> <b> __ LOGIN __ </ b> que se reemplazará con clicktodial de inicio de sesión (definido en la tarjeta de usuario) <br> <b> __ PASS __ </ b> que se reemplazará con clicktodial contraseña (definida en usuario tarjeta).
-ClickToDialDesc=Este módulo hace que los números de teléfono hagan clic enlaces Un clic en el icono hará que su teléfono llame al número. Esto se puede usar para llamar a un sistema de centro de llamadas de Dolibarr que puede llamar al número de teléfono en un sistema SIP, por ejemplo.
 ClickToDialUseTelLink=Use solo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Use este método si sus usuarios tienen un softphone o una interfaz de software instalada en la misma computadora que el navegador y se le llama cuando hace clic en un enlace de su navegador que comienza con &quot;tel:&quot;. Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe configurar esto en &quot;No&quot; y completar el siguiente campo.
 CashDeskSetup=Configuración del módulo de punto de venta
@@ -1409,8 +1398,6 @@ CodeLastResult=Código de resultado más reciente
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargar búsqueda de terceros en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargar búsqueda de terceros en %s (crear si no se encuentra)
-WithDolTrackingID=Dolibarr Referencia encontrada en el ID de Mensaje
-WithoutDolTrackingID=Dolibarr Referencia no encontrada ID de mensaje
 ECMAutoTree=Mostrar arbol ECM automatico
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 OpeningHoursDesc=Introduzca aquí el horario habitual de apertura de su empresa.
@@ -1432,7 +1419,6 @@ DebugBar=Barra de debug
 WarningValueHigherSlowsDramaticalyOutput=Advertencia, los valores más altos ralentizan dramáticamente la salida.
 ModuleActivated=El módulo %s está activado y ralentiza la interfaz
 EXPORTS_SHARE_MODELS=Los modelos de exportación se comparten con todos.
-IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento en el correo electrónico entrante, el evento se vinculará automáticamente a los objetos relacionados.
 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=Punto final para %s: %s
 DeleteEmailCollector=Eliminar el colector de correo electrónico
diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang
index 45d8af34b9d..07801879db5 100644
--- a/htdocs/langs/es_CL/agenda.lang
+++ b/htdocs/langs/es_CL/agenda.lang
@@ -4,7 +4,6 @@ ActionsOwnedBy=Evento propiedad de
 Event=Evento
 EventsNb=Cantidad de eventos
 ListOfActions=Lista de eventos
-ToUserOfGroup=Para cualquier usuario en grupo
 EventOnFullDay=Evento todo el día (s)
 MenuToDoActions=Todos los eventos incompletos
 MenuDoneActions=Todos los eventos terminados
diff --git a/htdocs/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang
index 8d7d7389ea4..e8b72e33d75 100644
--- a/htdocs/langs/es_CL/boxes.lang
+++ b/htdocs/langs/es_CL/boxes.lang
@@ -14,8 +14,6 @@ BoxTitleLastProducts=Productos / Servicios: Última modificación %s.
 BoxTitleLastModifiedSuppliers=Proveedores: última modificación de %s
 BoxTitleLastModifiedCustomers=Clientes: última %s modificada
 BoxTitleLastCustomersOrProspects=Últimos %s clientes o prospectos
-BoxTitleLastCustomerBills=Las últimas facturas de los clientes %s
-BoxTitleLastSupplierBills=Las últimas facturas de proveedores %s
 BoxTitleLastModifiedProspects=Perspectivas: última modificación de %s
 BoxTitleLastModifiedMembers=Últimos miembros de %s
 BoxTitleLastFicheInter=Últimas intervenciones modificadas con %s
diff --git a/htdocs/langs/es_CL/cashdesk.lang b/htdocs/langs/es_CL/cashdesk.lang
index a7597878ea3..2d9ac0386f3 100644
--- a/htdocs/langs/es_CL/cashdesk.lang
+++ b/htdocs/langs/es_CL/cashdesk.lang
@@ -40,4 +40,3 @@ ConfirmDiscardOfThisPOSSale=¿Quieres descartar esta venta actual?
 History=Historia
 TerminalSelect=Seleccione el terminal que desea utilizar:
 BasicPhoneLayout=Usar diseño básico para teléfonos.
-DirectPaymentButton=Botón de pago directo en efectivo
diff --git a/htdocs/langs/es_CL/errors.lang b/htdocs/langs/es_CL/errors.lang
index 58aca3bb9e9..f5567607900 100644
--- a/htdocs/langs/es_CL/errors.lang
+++ b/htdocs/langs/es_CL/errors.lang
@@ -115,7 +115,6 @@ ErrorNewValueCantMatchOldValue=El nuevo valor no puede ser igual al anterior
 ErrorFailedToValidatePasswordReset=Error al reiniciar la contraseña Puede ser que el reinicio ya haya sido hecho (este enlace puede usarse solo una vez). Si no, intente reiniciar el proceso de reinicio.
 ErrorToConnectToMysqlCheckInstance=La conexión a la base de datos falla. Comprobar el servidor de la base de datos se está ejecutando (por ejemplo, con mysql / mariadb, puede ejecutarlo desde la línea de comandos con 'sudo service mysql start').
 ErrorFailedToAddContact=Error al agregar contacto
-ErrorDateMustBeBeforeToday=La fecha no puede ser mayor que hoy
 ErrorPaymentModeDefinedToWithoutSetup=Se configuró un modo de pago para que escriba %s pero la configuración de la Factura del módulo no se completó para definir la información que se mostrará para este modo de pago.
 ErrorPHPNeedModule=Error, su PHP debe tener el módulo <b>%s</b> instalado para usar esta característica.
 ErrorOpenIDSetupNotComplete=Configura el archivo de configuración de Dolibarr para permitir la autenticación de OpenID, pero la URL del servicio OpenID no está definida en la constante %s
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 0c12ed62b34..6895438fd44 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -22,7 +22,6 @@ FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexión a la base
 NoTemplateDefined=No hay plantilla disponible para este tipo de correo electrónico
 AvailableVariables=Variables de sustitución disponibles
-EmptySearchString=Enter non empty search criterias
 NoRecordFound=Ningún record fue encontrado
 NoRecordDeleted=No se eliminó ningún registro
 NoError=No hay error
@@ -264,6 +263,7 @@ GeneratedOn=Construir en %s
 DolibarrWorkBoard=Artículos abiertos
 NotYetAvailable=No disponible aún
 Categories=Etiquetas / categorías
+Category=Etiqueta / categoría
 To=para
 Qty=Cantidad
 ChangedBy=Cambiado por
@@ -371,7 +371,6 @@ UnHidePassword=Mostrar comando real con contraseña clara
 RootOfMedias=Raíz de los medios públicos (/ medios)
 AddNewLine=Agregar nueva línea
 AddFile=Agregar archivo
-FreeZone=No es un producto / servicio predefinido
 FreeLineOfType=Artículo de texto libre, escriba:
 CloneMainAttributes=Clonar objeto con sus atributos principales
 ReGeneratePDF=Volver a generar PDF
diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
index c360e73cbaf..e77bd64bf9b 100644
--- a/htdocs/langs/es_CL/members.lang
+++ b/htdocs/langs/es_CL/members.lang
@@ -22,6 +22,7 @@ MenuMembersUpToDate=Miembros actualizados
 MenuMembersNotUpToDate=Miembros desactualizados
 MenuMembersResiliated=Miembros finalizados
 MembersWithSubscriptionToReceive=Miembros con suscripción para recibir
+MembersWithSubscriptionToReceiveShort=Suscripción para recibir
 DateSubscription=Fecha de suscripción
 DateEndSubscription=Fecha de finalización de la suscripción
 EndSubscription=Terminar suscripción
@@ -55,7 +56,6 @@ NoTypeDefinedGoToSetup=Ningún tipo de miembro definido. Ir al menú "Tipos de m
 WelcomeEMail=Correo de bienvenida
 SubscriptionRequired=Suscripción requerida
 VoteAllowed=Voto permitido
-MorPhy=Moral / Físico
 Reenable=Rehabilitar
 ResiliateMember=Terminar un miembro
 ConfirmResiliateMember=¿Estás seguro de que quieres cancelar este miembro?
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index 5deec3f8fc2..fd50392c8ea 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -141,9 +141,6 @@ ProjectNbProjectByMonth=Nº de proyectos creados por mes.
 ProjectNbTaskByMonth=Nº de tareas creadas por mes.
 ProjectOppAmountOfProjectsByMonth=Cantidad de clientes potenciales por mes
 ProjectWeightedOppAmountOfProjectsByMonth=Cantidad ponderada de clientes potenciales por mes
-ProjectOpenedProjectByOppStatus=Abrir proyecto / liderar por estado de plomo
-ProjectsStatistics=Estadísticas de proyectos / leads
-TasksStatistics=Estadísticas sobre proyectos/tareas principales
 TaskAssignedToEnterTime=Tarea asignada Ingresar el tiempo en esta tarea debería ser posible.
 IdTaskTime=Tiempo de la tarea de identificación
 YouCanCompleteRef=Si desea completar la referencia con algún sufijo, se recomienda agregar un carácter para separarlo, por lo que la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-MYSUFFIX
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
index ffd436fb51a..57c3d5885ac 100644
--- a/htdocs/langs/es_CL/stocks.lang
+++ b/htdocs/langs/es_CL/stocks.lang
@@ -61,12 +61,9 @@ StockLimitDesc=(vacío) significa que no hay advertencia. <br> 0 se puede utiliz
 PhysicalStock=Inventario FISICO
 RealStockDesc=El stock físico / real es el stock actualmente en los almacenes.
 RealStockWillAutomaticallyWhen=El stock real se modificará de acuerdo con esta regla (como se define en el módulo de Stock):
-VirtualStockDesc=El stock virtual es el stock calculado disponible una vez que se cierran todas las acciones abiertas / pendientes (que afectan a las acciones) (pedidos recibidos, pedidos de ventas enviados, etc.)
 IdWarehouse=Id almacén
 LieuWareHouse=Almacén de localización
 WarehousesAndProductsBatchDetail=Almacenes y productos (con detalle por lote / serie)
-AverageUnitPricePMPShort=Precio de entrada promedio ponderado
-AverageUnitPricePMP=Precio de entrada promedio ponderado
 SellPriceMin=Precio unitario de venta
 EstimatedStockValueSellShort=Valor para la venta
 EstimatedStockValueSell=Valor para la venta
@@ -97,7 +94,6 @@ Replenishments=Reposición
 NbOfProductBeforePeriod=Cantidad de producto %s en stock antes del período seleccionado (<%s)
 NbOfProductAfterPeriod=Cantidad de producto %s en stock después del período seleccionado (> %s)
 MassMovement=Movimiento masivo
-SelectProductInAndOutWareHouse=Seleccione un producto, una cantidad, un almacén de origen y un almacén de destino, luego haga clic en "%s". Una vez hecho esto para todos los movimientos requeridos, haga clic en "%s".
 RecordMovement=Transferencia de registros
 ReceivingForSameOrder=Recibos por esta orden
 StockMovementRecorded=Movimientos de stock grabados
diff --git a/htdocs/langs/es_CL/ticket.lang b/htdocs/langs/es_CL/ticket.lang
index ee8c228d5fb..7e8bb612452 100644
--- a/htdocs/langs/es_CL/ticket.lang
+++ b/htdocs/langs/es_CL/ticket.lang
@@ -17,7 +17,6 @@ Notify_TICKET_SENTBYMAIL=Enviar mensaje de Ticket por correo electrónico
 NotRead=No leer
 Read=Leer
 NeedMoreInformation=Esperando informacion
-Answered=Contestada
 Waiting=Esperando
 Type=Tipo
 MailToSendTicketMessage=Para enviar un correo electrónico desde un mensaje de ticket
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
index 302939afe1d..ae95201deba 100644
--- a/htdocs/langs/es_CL/withdrawals.lang
+++ b/htdocs/langs/es_CL/withdrawals.lang
@@ -36,6 +36,7 @@ StatusDebitCredit=Estado de débito / crédito
 StatusWaiting=Esperando
 StatusTrans=Expedido
 StatusCredited=Acreditado
+StatusPaid=Pagado
 StatusRefused=Rechazado
 StatusMotif0=Sin especificar
 StatusMotif1=Fondos insuficientes
@@ -50,8 +51,6 @@ CreateAll=Crear un archivo de domiciliación bancaria (todos)
 CreateGuichet=Solo oficina
 CreateBanque=Solo banco
 OrderWaiting=Esperando tratamiento
-NotifyTransmision=Transmisión de extracción
-NotifyCredit=Crédito de Retiro
 NumeroNationalEmetter=Número de transmisor nacional
 WithBankUsingRIB=Para cuentas bancarias que usan RIB
 WithBankUsingBANBIC=Para cuentas bancarias que usan IBAN / BIC / SWIFT
@@ -60,7 +59,6 @@ CreditDate=Crédito en
 WithdrawalFileNotCapable=No se puede generar un archivo de recibo de retiro para su país %s (Su país no es compatible)
 ShowWithdraw=Mostrar orden de débito directo
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene al menos una orden de pago por débito directo aún no procesada, no se establecerá como pagada para permitir la gestión previa de retiros.
-WithdrawalFile=Archivo de retiro
 SetToStatusSent=Establecer el estado "Archivo enviado"
 StatisticsByLineStatus=Estadísticas por estado de líneas
 RUMLong=Referencia única de mandatos
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 24271750d60..0fbbffc35f6 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -196,7 +196,6 @@ MAIN_MAIL_SMS_FROM=Número de teléfono del remitente predeterminado para el env
 MAIN_MAIL_DEFAULT_FROMTYPE=Correo electrónico predeterminado del remitente para envío manual (correo electrónico del usuario o correo electrónico de la empresa)
 UserEmail=Email del usuario
 FeatureNotAvailableOnLinux=Característica no disponible en Unix como sistemas. Prueba tu programa de sendmail localmente.
-SubmitTranslationENUS=Si la traducción de este idioma no está completa o si encuentra errores, puede corregirlos editando los archivos en el directorio <b> langs / %s </b> y enviar los archivos modificados en dolibarr.org/forum o para los desarrolladores en github.com/ Dolibarr / dolibarr.
 ModulesSetup=Configuración de módulos / aplicaciones
 ModuleFamilyHr=Gestión de Recursos Humanos (HR)
 ModuleFamilyProjects=Proyectos / Trabajo colaborativo.
@@ -330,7 +329,6 @@ Module52Name=Cepo
 Module54Name=Contratos / Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Gestión de códigos de barras
-Module57Desc=Gestión de órdenes de pago de débito directo. Incluye la generación de archivo SEPA para países europeos.
 Module58Desc=Integración de un sistema ClickToDial (Asterisco, ...)
 Module59Desc=Agregar función para generar una cuenta Bookmark4u desde una cuenta Dolibarr
 Module70Desc=Gestión de la intervención
@@ -572,7 +570,7 @@ DictionaryAccountancysystem=Modelos para el plan de cuentas.
 DictionaryAccountancyJournal=Revistas contables
 DictionaryEMailTemplates=Plantillas de correo electrónico
 DictionaryHolidayTypes=Tipos de licencia
-DictionaryOpportunityStatus=Estado de plomo para proyecto / plomo
+DictionaryOpportunityStatus=Principal estado para proyecto / Iniciativa
 DictionaryExpenseTaxRange=Informe de gastos - Gama por categoría de transporte
 TypeOfRevenueStamp=Tipo de timbre fiscal
 LTRate=Tipo
@@ -706,7 +704,6 @@ WarningAtLeastKeyOrTranslationRequired=Se requiere un criterio de búsqueda al m
 NewTranslationStringToShow=Nueva cadena de traducción para mostrar
 OriginalValueWas=La traducción original se sobrescribe. El valor original era: <br> <br> %s
 TransKeyWithoutOriginalValue=Has forzado una nueva traducción para la clave de traducción '<strong> %s </strong>' que no existe en ningún archivo de idioma
-TotalNumberOfActivatedModules=Aplicación / módulos activados: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Debes habilitar al menos 1 módulo
 ClassNotFoundIntoPathWarning=La clase %s no se encuentra en la ruta de PHP
 YesInSummer=Si en verano
@@ -981,7 +978,6 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
 AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
-AGENDA_DEFAULT_VIEW=¿Qué pestaña desea abrir de forma predeterminada al seleccionar el menú Agenda?
 AGENDA_REMINDER_EMAIL=Habilite el recordatorio del evento <b> por correos electrónicos </b> (la opción de recordatorio / retraso se puede definir en cada evento). Nota: el módulo <strong> %s </strong> debe estar habilitado y configurado correctamente para que se envíe un recordatorio con la frecuencia correcta.
 AGENDA_REMINDER_BROWSER=Habilite el recordatorio de evento <b> en el navegador del usuario </b> (cuando se alcanza la fecha del evento, cada usuario puede rechazar esto de la pregunta de confirmación del navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar notificación de sonido
@@ -1132,6 +1128,7 @@ EmailcollectorOperations=Operaciones a realizar por coleccionista.
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
 RecordEvent=Grabar evento de correo electrónico
+CreateLeadAndThirdParty=Crea principal (y tercero de ser necesario)
 FormatZip=Cremallera
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 DisabledResourceLinkUser=Deshabilitar la función para vincular un recurso a los usuarios
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index 038f333d9ea..f4a6163ecd8 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -21,7 +21,6 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 NoTemplateDefined=No hay plantilla disponible para este tipo de correo electrónico.
 AvailableVariables=Variables de sustitución disponibles
-EmptySearchString=Enter non empty search criterias
 NoRecordFound=No se encontraron registros
 NoRecordDeleted=Ningún registro eliminado
 Errors=Los errores
@@ -117,6 +116,7 @@ Completed=Terminado
 RequestAlreadyDone=La solicitud ya ha sido procesada
 FilterOnInto=Los criterios de búsqueda '<strong> %s </strong>' en los campos %s
 Categories=Etiquetas / categorías
+Category=Etiqueta / categoría
 Topic=Tema
 NoItemLate=Sin artículo atrasado
 DeletePicture=Borrar imagen
@@ -125,14 +125,6 @@ LoginEmail=Ingreso (correo)
 LoginOrEmail=Login o correo electrónico
 EnterLoginDetail=Ingrese los detalles de inicio de sesión
 December=diciembre
-MonthVeryShort02=V
-MonthVeryShort03=L
-MonthVeryShort04=UNA
-MonthVeryShort05=L
-MonthVeryShort08=UNA
-MonthVeryShort09=D
-MonthVeryShort11=norte
-MonthVeryShort12=re
 JoinMainDoc=Únete al documento principal
 Keyword=Palabra clave
 FindBug=Señalar un bug
@@ -152,7 +144,6 @@ YouCanChangeValuesForThisListFromDictionarySetup=Puede cambiar los valores para
 YouCanChangeValuesForThisListFrom=Puede cambiar los valores para esta lista desde el menú %s
 YouCanSetDefaultValueInModuleSetup=Puede configurar el valor predeterminado utilizado al crear un nuevo registro en la configuración del módulo
 Layout=Diseño
-FreeZone=No es un producto / servicio predefinido
 DocumentModelStandardPDF=Plantilla PDF estándar
 CoreErrorMessage=Disculpe, ocurrió un error. Póngase en contacto con el administrador del sistema para consultar los registros o deshabilite $ dolibarr_main_prod = 1 para obtener más información.
 FieldsWithIsForPublic=Los campos con <b> %s </b> se muestran en la lista pública de miembros. Si no quieres esto, desmarca la casilla "público".
@@ -214,13 +205,13 @@ AutomaticallyCalculated=Calculado automaticamente
 TitleSetToDraft=Volver al borrador
 ConfirmSetToDraft=¿Está seguro de que desea volver al estado de borrador?
 EMailTemplates=Plantillas de correo electrónico
-LeadOrProject=Plomo Proyecto
-LeadsOrProjects=Lleva | Proyectos
-Lead=Dirigir
-Leads=Lleva
+LeadOrProject=Iniciativa | Proyecto
+LeadsOrProjects=Iniciativas | Proyectos
+Lead=Principal
+Leads=Principales
 ListOpenLeads=Lista de clientes potenciales abiertos
 ListOpenProjects=Listar proyectos abiertos
-NewLeadOrProject=Nuevo plomo o proyecto
+NewLeadOrProject=Nueva Iniciativa o proyecto
 LineNb=Línea no.
 SelectMailModel=Seleccione una plantilla de correo electrónico
 Select2ResultFoundUseArrows=Algunos resultados encontrados. Usa las flechas para seleccionar.
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index 1f376268421..897242503e0 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -96,7 +96,7 @@ p=u
 d=re
 g=sol
 m=metro
-unitP=Trozo
+unitP=Unidad
 ProductCodeModel=Plantilla de referencia del producto
 ServiceCodeModel=Plantilla de servicio de ref
 AlwaysUseNewPrice=Utilizar siempre el precio actual del producto / servicio.
diff --git a/htdocs/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
index 0d25bd82f87..5bb088ffa15 100644
--- a/htdocs/langs/es_CO/projects.lang
+++ b/htdocs/langs/es_CO/projects.lang
@@ -102,9 +102,14 @@ ErrorShiftTaskDate=Imposible cambiar la fecha de la tarea de acuerdo con la nuev
 TaskCreatedInDolibarr=Tarea %s creada
 TaskModifiedInDolibarr=Tarea %s modificada
 TaskDeletedInDolibarr=Tarea %s eliminada
-OpportunityStatus=Estado de plomo
-OpportunityProbability=Probabilidad de plomo
-OpportunityAmount=Cantidad de plomo
+OpportunityStatus=Estado de iniciativa
+OpportunityStatusShort=Estado de iniciativa
+OpportunityProbability=Probabilidad de la Iniciativa
+OpportunityProbabilityShort=Prob. de Iniciativa
+OpportunityAmount=Monto de iniciativa
+OpportunityAmountShort=Monto de iniciativa
+OpportunityAmountAverageShort=Monto promedio
+OpportunityAmountWeigthedShort=Monto ponderado
 WonLostExcluded=Ganados / Perdidos excluidos
 TypeContact_project_internal_PROJECTLEADER=Líder del proyecto
 TypeContact_project_external_PROJECTLEADER=Líder del proyecto
@@ -138,9 +143,6 @@ ProjectNbProjectByMonth=Nº de proyectos creados por mes.
 ProjectNbTaskByMonth=Nº de tareas creadas por mes.
 ProjectOppAmountOfProjectsByMonth=Cantidad de leads por mes
 ProjectWeightedOppAmountOfProjectsByMonth=Cantidad ponderada de clientes potenciales por mes
-ProjectOpenedProjectByOppStatus=Abrir proyecto / liderar por estado de plomo
-ProjectsStatistics=Estadísticas sobre proyectos / leads
-TasksStatistics=Estadísticas de proyecto / tareas de plomo
 TaskAssignedToEnterTime=Tarea asignada. Debe ser posible introducir el tiempo en esta tarea.
 IdTaskTime=Tiempo de tarea de identificación
 OpenedProjectsByThirdparties=Proyectos abiertos por terceros.
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
index 7ea4665b427..28b80e7fa90 100644
--- a/htdocs/langs/es_CO/stocks.lang
+++ b/htdocs/langs/es_CO/stocks.lang
@@ -1,4 +1,7 @@
 # Dolibarr language file - Source file is en_US - stocks
+UnitPurchaseValue=Precio unitario de compra
+PMPValue=Precio promedio ponderado
+AverageUnitPricePMPShort=Precio promedio ponderado
 inventoryEdit=Editar
 SelectCategory=Filtro de categoria
 inventoryDeleteLine=Eliminar linea
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
index 2320346b97c..33ea339dcd8 100644
--- a/htdocs/langs/es_CO/withdrawals.lang
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -2,4 +2,5 @@
 StandingOrderPayment=Orden de pago de domiciliación bancaria
 WithdrawalsReceipts=Órdenes de débito directo
 WithdrawalReceipt=Orden de domiciliación bancaria
+StatusPaid=Pagado
 StatusRefused=Rechazado
diff --git a/htdocs/langs/es_DO/main.lang b/htdocs/langs/es_DO/main.lang
index 0f9be27b22f..2e691473326 100644
--- a/htdocs/langs/es_DO/main.lang
+++ b/htdocs/langs/es_DO/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index c7cde3f1591..130c6ec61a6 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -228,7 +228,6 @@ UserEmail=Correo electrónico del usuario
 CompanyEmail=Email de la empresa
 FeatureNotAvailableOnLinux=Característica no disponible en sistemas Unix. Comprobar el programa de Sendmail localmente.
 SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregirlos editando los archivos en el directorio <b> langs / %s </b> y enviar su cambio a www.transifex.com/dolibarr-association/dolibarr /
-SubmitTranslationENUS=Los archivos en el directorio <b> langs / %s </b> y se enviarán los archivos modificados a dolibarr.org/forum o para los expertos en github. com / Dolibarr / Dolibarr.
 ModuleSetup=Módulo de configuración
 ModulesSetup=Módulos de configuración / Aplicación
 ModuleFamilyCrm=Gestión de la relación con el cliente (CRM)
@@ -302,10 +301,8 @@ SmsTestMessage=Mensaje de prueba desde __PHONEFROM__ a __PHONETO__
 ModuleMustBeEnabledFirst=Módulo <b>%s</b> debe estar habilitado primero si necesita esta función.
 SecurityToken=Clave para proteger las URL
 NoSmsEngine=No hay administrador de remitente de SMS disponible. Un administrador de remitentes de SMS no se instala con la distribución predeterminada porque dependen de un proveedor externo, pero puede encontrar algunos en %s
-PDFAddressForging=Reglas para cajas de direcciones
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el impuesto a las ventas / IVA
 PDFRulesForSalesTax=Reglas para el impuesto a las ventas / IVA
-HideLocalTaxOnPDF=Ocultar %s tasa en columna Impuestos Venta
 HideDescOnPDF=Ocultar descripción de productos
 HideRefOnPDF=Ocultar productos ref.
 HideDetailsOnPDF=Ocultar detalles de líneas de productos
@@ -424,8 +421,6 @@ Module52Desc=Gestion de Stocks
 Module54Name=Contratos / Suscripciones
 Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes).
 Module55Desc=Administración de código de barras
-Module57Name=Pagos de débito directo bancario
-Module57Desc=Gestión de órdenes de pago de débito directo. Incluye la generación de archivo SEPA para países europeos.
 Module58Desc=Integración de un sistema ClickToDial (Asterisco, ...)
 Module59Desc=Añadir función para generar una cuenta Bookmark4u desde una cuenta de Dolibarr
 Module60Name=Adhesivos
@@ -740,7 +735,6 @@ Permission63002=Crear / modificar recursos
 Permission63004=Enlazar los recursos con los eventos de la agenda.
 DictionaryCompanyType=Tipos de cliente/proveedor
 DictionaryCompanyJuridicalType=Entidades legales de cliente/proveedor
-DictionaryProspectLevel=Potencial de prospecto
 DictionaryCanton=Estados / Provincias
 DictionaryCivility=Títulos honoríficos
 DictionaryActions=Tipos de eventos de agenda
@@ -761,7 +755,6 @@ DictionaryAccountancysystem=Modelos para el plan de cuentas
 DictionaryAccountancyJournal=Diarios / libros de contabilidad
 DictionaryEMailTemplates=Plantillas de correo electrónico
 DictionaryMeasuringUnits=Unidades de medida
-DictionaryProspectStatus=Estado del prospecto
 DictionaryHolidayTypes=Tipos de licencia
 DictionaryOpportunityStatus=Estado de plomo para proyecto / lider
 SetupSaved=Configuración Guardada
@@ -831,7 +824,6 @@ DefaultMaxSizeShortList=Longitud máxima predeterminada para listas cortas (es d
 MessageLogin=Mensaje de la página de inicio de sesión
 LoginPage=Página de inicio de sesión
 PermanentLeftSearchForm=Formulario de búsqueda permanente en el menú de la izquierda
-EnableMultilangInterface=Habilitar soporte multilenguaje
 CompanyInfo=Empresa / Organización
 CompanyIds=Identidades de la empresa / organización
 CompanyZip=Código Postal
@@ -954,7 +946,6 @@ WarningAtLeastKeyOrTranslationRequired=Se requiere un criterio de búsqueda al m
 NewTranslationStringToShow=Nueva cadena de traducción para mostrar
 OriginalValueWas=La traducción original se inscribe. El valor original fue: <br> <br> %s
 TransKeyWithoutOriginalValue=Has forzado una nueva traducción para la clave de traducción '<strong> %s </strong>' que no existe en ningún archivo de idioma
-TotalNumberOfActivatedModules=Aplicación activada / módulos: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Debe activar al menos 1 módulo
 ClassNotFoundIntoPathWarning=La clase %s no se encuentra en la ruta de PHP
 YesInSummer=Si en verano
@@ -1293,14 +1284,12 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento
 AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda
-AGENDA_DEFAULT_VIEW=Qué pestaña desea abrir de forma predeterminada al seleccionar el menú Agenda
 AGENDA_REMINDER_EMAIL=Habilite el recordatorio de eventos <b> por correo electrónico </b> (la opción recordar / demora se puede definir en cada evento). Nota: El módulo <strong> %s </strong> debe estar habilitado y configurado correctamente para enviar un recordatorio a la frecuencia correcta.
 AGENDA_REMINDER_BROWSER=Habilite el recordatorio de evento <b> en el navegador del usuario </b> (cuando se alcanza la fecha del evento, cada usuario puede rechazar esto de la pregunta de confirmación del navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar la notificación de sonido
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto relacionado en la vista de la agenda
 ClickToDialSetup=Configuración del módulo - Haga clic para marcar
 ClickToDialUrlDesc=URL llamada cuando se hace clic en el icono de teléfono. En URL, puede usar las etiquetas <br> <b> __PHONETO__ </b> que se reemplazarán con el número de teléfono de la persona a quien llamar <br> <b> __PHONEFROM__ </b> que será reemplazado por el número de teléfono de la persona que llama (suyo) <br> <b> __LOGIN__ </b> que se reemplazará con el inicio de sesión de "hacer clic para marcar" (definido en la tarjeta de usuario) <br> <b> __PASS __ < / b> que se reemplazará con la contraseña de "haga clic para marcar" (definida en el usuario tarjeta).
-ClickToDialDesc=Este módulo hace que los números de teléfono hagan clic en los enlaces. Un clic en el icono hará que su teléfono llame al número. Esto se puede usar para llamar a un sistema de centro de llamadas de Dolibarr que puede llamar al número de teléfono en un sistema SIP, por ejemplo.
 ClickToDialUseTelLink=Utilizar sólo un enlace "tel:" en los números de teléfono
 ClickToDialUseTelLinkDesc=Use este método si sus usuarios tienen un softphone o una interfaz de software instalada en la misma computadora que el navegador y se le llama cuando hace clic en un enlace de su navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe configurar esto en "No" y completar el siguiente campo.
 CashDeskSetup=Configuración del módulo de punto de venta
@@ -1490,7 +1479,6 @@ NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para
 XEmailsDoneYActionsDone=%s correos electrónicos calificados, %s correos electrónicos procesados con éxito (para %s registro/acciones realizadas)
 RecordEvent=Grabar evento de correo electrónico
 CreateLeadAndThirdParty=Crear plomo (y tercero si es necesario)
-CreateTicketAndThirdParty=Crear ticket (y un tercero si es necesario)
 CodeLastResult=Último código de resultado
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargue la búsqueda de terceros en %s (solo carga)
@@ -1522,7 +1510,6 @@ ModuleActivated=El módulo %s está activado y ralentiza la interfaz
 EXPORTS_SHARE_MODELS=Los modelos de exportación se comparten con todos
 ExportSetup=Configuración del módulo Exportar
 InstanceUniqueID=ID único de la instancia
-IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra una identificación de seguimiento en el correo electrónico entrante, el evento se vinculará automáticamente a los objetos relacionados.
 WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar la contraseña de su propia cuenta de https://myaccount.google.com/.
 EmailCollectorLoadThirdPartyHelp=Puede usar esta acción para usar el contenido del correo electrónico para buscar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo necesiten. En el campo de parámetros puede usar, por ejemplo, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si desea extraer el nombre del cliente/proveedor de una cadena 'Nombre: nombre para encontrar' que se encuentra en el cuerpo.
 EndPointFor=Punto final para %s: %s
diff --git a/htdocs/langs/es_EC/agenda.lang b/htdocs/langs/es_EC/agenda.lang
index 0d763814ff8..c7beb16acb1 100644
--- a/htdocs/langs/es_EC/agenda.lang
+++ b/htdocs/langs/es_EC/agenda.lang
@@ -2,7 +2,6 @@
 ActionsOwnedBy=Evento propiedad de
 Event=Evento
 ListOfActions=Lista de eventos
-ToUserOfGroup=A cualquier usuario en grupo
 EventOnFullDay=Evento todo el día(s)
 MenuToDoActions=Todos los eventos incompletos
 MenuDoneActions=Todos los eventos terminados
diff --git a/htdocs/langs/es_EC/cashdesk.lang b/htdocs/langs/es_EC/cashdesk.lang
index 5ec640fca13..3361d257dc5 100644
--- a/htdocs/langs/es_EC/cashdesk.lang
+++ b/htdocs/langs/es_EC/cashdesk.lang
@@ -48,7 +48,6 @@ ConfirmDeletionOfThisPOSSale=¿Confirma la eliminación de esta venta actual?
 ConfirmDiscardOfThisPOSSale=¿Quieres descartar esta venta actual?
 History=Historia
 BasicPhoneLayout=Usar diseño básico para teléfonos
-DirectPaymentButton=Botón de pago directo en efectivo
 Colorful=Vistoso
 SortProductField=Campo para clasificar productos
 BrowserMethodDescription=Impresión de recibos simple y fácil. Solo unos pocos parámetros para configurar el recibo. Imprimir a través del navegador.
@@ -57,7 +56,6 @@ CashDeskRefNumberingModules=Módulo de numeración para ventas POS
 CashDeskGenericMaskCodes6 =<br><b>{TN} </b>la etiqueta se usa para agregar el número de terminal
 TakeposGroupSameProduct=Agrupar las mismas líneas de productos
 StartAParallelSale=Comience una nueva venta paralela
-ControlCashOpening=Control de caja en la posición de apertura
 CloseCashFence=Cerca de efectivo
 CashReport=Informe de caja
 MainPrinterToUse=Impresora principal para usar
diff --git a/htdocs/langs/es_EC/errors.lang b/htdocs/langs/es_EC/errors.lang
index 4176946c8f0..d857d9acdeb 100644
--- a/htdocs/langs/es_EC/errors.lang
+++ b/htdocs/langs/es_EC/errors.lang
@@ -114,7 +114,6 @@ ErrorNewValueCantMatchOldValue=El nuevo valor no puede ser igual al anterior
 ErrorFailedToValidatePasswordReset=Error al reiniciar la contraseña. Puede ser el reinit ya estaba hecho (este enlace puede ser utilizado sólo una vez). Si no es así, intente reiniciar el proceso reinit.
 ErrorToConnectToMysqlCheckInstance=La conexión a la base de datos fallo. Compruebe el servidor de base de datos si está en ejecución (por ejemplo, con MySQL/MariaDB, se puede iniciar desde la línea de comandos con 'sudo service mysql start').
 ErrorFailedToAddContact=No se pudo agregar el contacto
-ErrorDateMustBeBeforeToday=La fecha no puede ser mayor que hoy
 ErrorPaymentModeDefinedToWithoutSetup=Se estableció un modo de pago para escribir%s, pero la configuración del módulo Factura no se completó para definir la información que se mostrará para este modo de pago.
 ErrorPHPNeedModule=Error, tu PHP debe tener el módulo <b>%s</b> instalado para usar esta función.
 ErrorOpenIDSetupNotComplete=Configure el archivo de configuración Dolibarr para permitir la autenticación OpenID, pero la URL del servicio OpenID no está definida en%s constante
diff --git a/htdocs/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
index 8f5a90b7d7b..b24a2b0d5f6 100644
--- a/htdocs/langs/es_EC/mails.lang
+++ b/htdocs/langs/es_EC/mails.lang
@@ -126,3 +126,4 @@ NoContactLinkedToThirdpartieWithCategoryFound=No hay contacto/dirección con una
 OutGoingEmailSetup=Configuración de correo saliente
 InGoingEmailSetup=Configuración de correo entrante
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros
+Answered=Contestada
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 2dd7a66de05..a8b753d0290 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -22,7 +22,6 @@ FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexión con la base de datos
 NoTemplateDefined=No hay plantilla disponible para este tipo de correo electrónico
 AvailableVariables=Variables de sustitución disponibles
-EmptySearchString=Enter non empty search criterias
 NoRecordFound=Ningún registro encontrado
 NoRecordDeleted=Ningún registro eliminado
 NoError=No hay error
@@ -187,8 +186,7 @@ PriceUTTC=Precio (inc. IVA)
 Amount=Cantidad
 AmountInvoice=Valor de la factura
 AmountInvoiced=Monto facturado
-AmountInvoicedHT=Valor facturada (con impuestos)
-AmountInvoicedTTC=Valor facturado (sin impuestos)
+AmountInvoicedHT=Valor facturado (sin impuestos)
 AmountPayment=Monto del pago
 AmountHTShort=Valor (excl.)
 AmountTTCShort=Valor (inc. IVA)
@@ -272,6 +270,7 @@ DolibarrWorkBoard=Artículos abiertos
 NoOpenedElementToProcess=No hay elementos abiertos para procesar
 NotYetAvailable=No disponible aún
 Categories=Etiquetas/categorías
+Category=Etiquetas/categoría
 ChangedBy=Cambiado por
 ResultKo=Fallo
 Reporting=Informes
@@ -403,7 +402,6 @@ HidePassword=Mostrar comando con la contraseña oculta
 UnHidePassword=Mostrar comando real con contraseña clara
 RootOfMedias=Raíz de los medios públicos (/medios)
 AddFile=Agregar archivo
-FreeZone=No es un producto/servicio predefinido
 FreeLineOfType=Elemento de texto libre, escriba:
 CloneMainAttributes=Clonar objeto con sus atributos principales
 PDFMerge=Combinar PDF
diff --git a/htdocs/langs/es_EC/members.lang b/htdocs/langs/es_EC/members.lang
index 36bd3d0b1d2..97fc61a0f8d 100644
--- a/htdocs/langs/es_EC/members.lang
+++ b/htdocs/langs/es_EC/members.lang
@@ -62,7 +62,6 @@ SubscriptionRequired=Se requiere suscripción
 VoteAllowed=Voto permitido
 Physical=Natural
 Moral=Juridica
-MorPhy=Juridica/Natural
 ResiliateMember=Terminar un miembro
 ConfirmResiliateMember=¿Estás seguro de que quieres terminar este miembro?
 ConfirmDeleteMember=¿Está seguro de que desea eliminar este miembro (la eliminación de un miembro eliminará todas sus suscripciones)?
diff --git a/htdocs/langs/es_EC/other.lang b/htdocs/langs/es_EC/other.lang
index 9d8d38b3e92..48461bc5410 100644
--- a/htdocs/langs/es_EC/other.lang
+++ b/htdocs/langs/es_EC/other.lang
@@ -71,9 +71,7 @@ PredefinedMailContentSendSupplierOrder=__(Hola)__\n\nPor favor encuentre nuestro
 PredefinedMailContentSendSupplierInvoice=__(Hola)__\n\nEncuentre la factura __REF__ adjunta\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
 PredefinedMailContentSendShipping=__(Hola)__\n\nPor favor encuentre el envío __REF__ adjunto\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
 PredefinedMailContentSendFichInter=__(Hola)__\n\nPor favor encuentre la intervención __REF__ adjunta\n\n\n__(Sinceramente)__\n\n__ FIRMA DEL USUARIO__
-PredefinedMailContentThirdparty=__CONTACTCIVNAME __\n\n__PERSONALIZED __\n\n__SIGNATURE__
-PredefinedMailContentContact=aa__PERSONALIZED __\n\n__SIGNATURE__
-PredefinedMailContentUser=aa__PERSONALIZED __\n\n__SIGNATURE__
+PredefinedMailContentGeneric=aa__PERSONALIZED __\n\n__SIGNATURE__
 DemoDesc=Dolibarr es un ERP/CRM compacto que soporta varios módulos de negocio. Una demostración que muestra todos los módulos no tiene sentido ya que este escenario nunca ocurre (varios cientos disponibles). Por lo tanto, varios perfiles de demostración están disponibles.
 ChooseYourDemoProfil=Elige el perfil de demostración que mejor se adapte a tus necesidades ...
 ChooseYourDemoProfilMore=...o crear su propio perfil</b> (selección manual de módulos)
diff --git a/htdocs/langs/es_EC/projects.lang b/htdocs/langs/es_EC/projects.lang
index d86e42e1eda..ec9d4afe521 100644
--- a/htdocs/langs/es_EC/projects.lang
+++ b/htdocs/langs/es_EC/projects.lang
@@ -129,6 +129,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contribuyente
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contribuyente
 SelectElement=Seleccionar elemento
 AddElement=Enlace al elemento
+LinkToElementShort=Enlace a
 DocumentModelBeluga=Plantilla de documento de proyecto para la descripción de objetos vinculados
 DocumentModelBaleine=Plantilla de documento de proyecto para tareas
 DocumentModelTimeSpent=Plantilla de informe de proyecto por tiempo dedicado
@@ -148,8 +149,6 @@ ProjectNbProjectByMonth=Nº de proyectos creados por mes.
 ProjectNbTaskByMonth=Nº de tareas creadas por mes.
 ProjectOppAmountOfProjectsByMonth=Cantidad de clientes potenciales por mes
 ProjectWeightedOppAmountOfProjectsByMonth=Cantidad ponderada de clientes potenciales por mes
-ProjectOpenedProjectByOppStatus=Abrir proyecto / liderar por estado de clientes potenciales
-TasksStatistics=Estadísticas sobre tareas de proyecto/lead
 TaskAssignedToEnterTime=Tarea asignada. Es posible introducir tiempo en esta tarea.
 IdTaskTime=Tiempo de la tarea de identificación
 YouCanCompleteRef=Si desea completar la referencia con algún sufijo, se recomienda agregar un carácter - para separarlo, por lo que la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-MYSUFFIX
diff --git a/htdocs/langs/es_EC/recruitment.lang b/htdocs/langs/es_EC/recruitment.lang
new file mode 100644
index 00000000000..f7b234800a0
--- /dev/null
+++ b/htdocs/langs/es_EC/recruitment.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - recruitment
+About =page
diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
index 88ed5a7e742..00cba31ae26 100644
--- a/htdocs/langs/es_EC/stocks.lang
+++ b/htdocs/langs/es_EC/stocks.lang
@@ -38,6 +38,7 @@ PMPValue=Precio medio ponderado
 EnhancedValueOfWarehouses=Valor de almacenes
 UserWarehouseAutoCreate=Crear un almacén de usuario automáticamente al crear un usuario
 AllowAddLimitStockByWarehouse=Administre también el valor del stock mínimo y deseado por emparejamiento (almacén de productos) además del valor del stock mínimo y deseado por producto
+MainDefaultWarehouse=Almacén predeterminado
 IndependantSubProductStock=El stock de producto y el stock de subproducto son independientes.
 QtyDispatched=Cantidad despachada
 QtyDispatchedShort=Cantidad enviada
@@ -66,13 +67,11 @@ RealStock=Inventario Real
 RealStockDesc=El stock físico / real es el stock actualmente en los almacenes.
 RealStockWillAutomaticallyWhen=El stock real se modificará de acuerdo con esta regla (como se define en el módulo Stock):
 VirtualStock=Inventario Virtual
-VirtualStockDesc=El stock virtual es el stock calculado disponible una vez que se cierran todas las acciones abiertas / pendientes (que afectan a los stocks) (órdenes de compra recibidas, órdenes de venta enviadas, etc.)
 IdWarehouse=Id del Almacén
 DescWareHouse=Descripción de almacén
 LieuWareHouse=Almacén de localización
 WarehousesAndProductsBatchDetail=Almacenes y productos (con detalle por lote / serie)
-AverageUnitPricePMPShort=Precio medio ponderado de los insumos
-AverageUnitPricePMP=Precio medio ponderado de los insumos
+AverageUnitPricePMPShort=Precio medio ponderado
 SellPriceMin=Precio unitario de venta
 EstimatedStockValueSellShort=Valor para la venta
 EstimatedStockValueSell=Valor para la venta
@@ -105,7 +104,6 @@ Replenishments=Reabastecimientos
 NbOfProductBeforePeriod=Cantidad del producto%s en Inventario antes del período seleccionado (<%s)
 NbOfProductAfterPeriod=Cantidad del producto%s en Inventario después del período seleccionado (>%s)
 MassMovement=Movimiento masivo
-SelectProductInAndOutWareHouse=Seleccione un producto, una cantidad, un almacén de origen y un almacén de destino, luego haga clic en "%s". Una vez hecho esto para todos los movimientos requeridos, haga clic en "%s".
 RecordMovement=Transferencia de registros
 ReceivingForSameOrder=Recibos para este pedido
 StockMovementRecorded=Movimientos de inventario registrados
diff --git a/htdocs/langs/es_EC/ticket.lang b/htdocs/langs/es_EC/ticket.lang
index 86683e42093..1b7ecded84a 100644
--- a/htdocs/langs/es_EC/ticket.lang
+++ b/htdocs/langs/es_EC/ticket.lang
@@ -15,7 +15,6 @@ Notify_TICKET_SENTBYMAIL=Enviar mensaje del ticket por correo electrónico
 NotRead=No leer
 Read=Leer
 NeedMoreInformation=Esperando información
-Answered=Contestada
 Waiting=Esperando
 Type=Tipo
 MailToSendTicketMessage=Para enviar un correo electrónico desde un ticket
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
index 35fb87b8fe6..ba83f5af30c 100644
--- a/htdocs/langs/es_EC/withdrawals.lang
+++ b/htdocs/langs/es_EC/withdrawals.lang
@@ -36,6 +36,7 @@ InvoiceRefused=Factura rechazada (Cargar el rechazo al cliente)
 StatusWaiting=Esperando
 StatusTrans=Enviado
 StatusCredited=Acreditado
+StatusPaid=Pagado
 StatusRefused=Rechazado
 StatusMotif1=Fondos insuficientes
 StatusMotif2=Solicitud impugnada
@@ -48,8 +49,6 @@ CreateForSepaRCUR=Crear archivo de débito directo (SEPA RCUR)
 CreateAll=Crear archivo de débito directo (todos)
 CreateBanque=Solo banco
 OrderWaiting=Esperando tratamiento
-NotifyTransmision=Transmisión de retirada
-NotifyCredit=Crédito por Retiro
 NumeroNationalEmetter=Número del Transmisor Nacional
 WithBankUsingRIB=Para cuentas bancarias utilizando RIB
 WithBankUsingBANBIC=Para cuentas bancarias utilizando IBAN/BIC/SWIFT
@@ -58,7 +57,6 @@ CreditDate=Crédito en
 WithdrawalFileNotCapable=No se puede generar el archivo de recibo de retiro para su país %s (su país no es compatible)
 ShowWithdraw=Mostrar orden de débito directo
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene al menos una orden de pago de débito directo aún no procesada, no se establecerá como pagada para permitir la gestión previa de retiros.
-WithdrawalFile=Archivo de retiro
 SetToStatusSent=Establecer en estado "Archivo enviado"
 StatisticsByLineStatus=Estadísticas por estado de las líneas
 RUMLong=Referencia única de mandato
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index e7240dd7f6d..59f43c94cc7 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Gestiona el cero al final de una cuenta contable. Necesar
 BANK_DISABLE_DIRECT_INPUT=Desactivar transacciones directas en cuenta bancaria
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borradores al diario
 ACCOUNTANCY_COMBO_FOR_AUX=Habilitar la lista combinada para la cuenta subsidiaria (puede ser lento si tiene muchos terceros)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Diario de ventas
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
@@ -284,6 +285,7 @@ ShowTutorial=Ver Tutorial
 NotReconciled=No reconciliado
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Aplicar categorías en masa
 AddAccountFromBookKeepingWithNoCategories=Cuenta disponible sin grupo personalizado
 CategoryDeleted=La categoría para la cuenta contable ha sido eliminada
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index a88a57efcf5..31204078eb6 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Remitente de e-mails para envíos manuales (e-mail de
 UserEmail=e-mail de usuario
 CompanyEmail=E-mail de empresa
 FeatureNotAvailableOnLinux=Funcionalidad no disponible en sistemas  Unix. Pruebe su sendmail localmente.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregir esto editando los archivos en el directorio <b>langs/%s</b> y enviar su cambio a www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Si la traducción de este idioma es incompleta o si encuentra errores, puede corregirlos mediante la edición de los archivos en el directorio <b>langs/%s</b> y el envío los cambios al foro www.dolibarr.es o a los desarrolladores en github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Configuración del módulo
 ModulesSetup=Configuración de los módulos
 ModuleFamilyBase=Sistema
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=El módulo <b>%s</b> debe ser activado antes si necesit
 SecurityToken=Clave para encriptar urls
 NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de envío de SMS no se instalan por defecto ya que dependen de cada proveedor, sin embargo puede encontrarlos en la plataforma %s
 PDF=PDF
-PDFDesc=Opciones globales para la generación de PDF.
-PDFAddressForging=Reglas para las direcciones
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el Impuesto/IVA
 PDFRulesForSalesTax=Reglas de IVA
 PDFLocaltax=Reglas para %s
-HideLocalTaxOnPDF=Ocultar la tasa %s en la columna de impuesto
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Ocultar descripción de los productos
 HideRefOnPDF=Ocultar referencia de los productos
 HideDetailsOnPDF=Ocultar detalles de las líneas de productos
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Cambiar el precio cuya referencia de base es
 MassConvert=Lanzar la conversión en masa
 PriceFormatInCurrentLanguage=Formato de precio en el idioma actual
 String=Cadena de texto
+String1Line=String (1 line)
 TextLong=Texto largo
+TextLongNLines=Long text (n lines)
 HtmlText=Texto html
 Int=Numérico entero
 Float=Decimal
@@ -543,9 +546,9 @@ Module54Desc=Gestión de contratos (servicios o suscripciones recurrentes)
 Module55Name=Códigos de barras
 Module55Desc=Gestión de los códigos de barras
 Module56Name=Pago por transferencia bancaria
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Pagos por domiciliaciones
-Module57Desc=Gestión de domiciliaciones. También incluye generación de archivo SEPA para los países europeos.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integración con ClickToDial
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Crear/modificar servicios
 Permission534=Eliminar servicios
 Permission536=Ver/gestionar los servicios ocultos
 Permission538=Exportar servicios
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Leer lista de materiales
 Permission651=Crear/Actualizar lista de material
 Permission652=Eliminar lista de material
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
@@ -848,6 +858,8 @@ Permission773=Eliminar informe de gastos
 Permission774=Leer todos los informes de gastos (incluidos los no subordinados)
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar almacenes
@@ -900,6 +912,7 @@ Permission2515=Configuración directorios de documentos
 Permission2801=Utilizar el cliente FTP en modo lectura (sólo explorar y descargar)
 Permission2802=Utilizar el cliente FTP en modo escritura (borrar o subir archivos)
 Permission3200=Leer eventos archivados y huellas digitales
+Permission3301=Generate new modules
 Permission4001=Ver empleados
 Permission4002=Crear empleados
 Permission4003=Eliminar empleados
@@ -947,7 +960,8 @@ Permission63003=Eliminar recursos
 Permission63004=Enlazar recursos a eventos de la agenda
 DictionaryCompanyType=Tipos de Terceros
 DictionaryCompanyJuridicalType=Tipo de entidad legar para Terceros
-DictionaryProspectLevel=Cliente potencial
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Provincias
 DictionaryRegion=Regiones
 DictionaryCountry=Países
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Plantillas E-Mails
 DictionaryUnits=Unidades
 DictionaryMeasuringUnits=Unidades de Medida
 DictionarySocialNetworks=Redes sociales
-DictionaryProspectStatus=Estado cliente potencial
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Tipos de vacaciones
 DictionaryOpportunityStatus=Estado de oportunidad para el proyecto/oportunidad
 DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
@@ -1076,7 +1091,7 @@ LoginPage=Página de login
 BackgroundImageLogin=Imagen de fondo
 PermanentLeftSearchForm=Zona de búsqueda permanente del menú izquierdo
 DefaultLanguage=Idioma predeterminado
-EnableMultilangInterface=Activar soporte multi-idioma
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Mostrar el logo de la empresa en el menú
 CompanyInfo=Empresa/Organización
 CompanyIds=Identificación de la empresa/organización
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Se necesita un criterio de búsqueda al m
 NewTranslationStringToShow=Nueva cadena traducida a mostrar
 OriginalValueWas=La traducción original se ha sobreescrito. El valor original era:<br><br>%s
 TransKeyWithoutOriginalValue=Forzó una nueva traducción para la clave de traducción '<strong>%s</strong>' que no existe en ningún archivo de idioma
-TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Debe activar al menos un módulo.
 ClassNotFoundIntoPathWarning=No se ha encontrado la clase %s en su path PHP
 YesInSummer=Sí en verano
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de evento (gestionados en el menú Configuraci
 AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor por defecto para el tipo de evento en la creación de un evento
 AGENDA_DEFAULT_FILTER_TYPE=Establecer por defecto este tipo de evento en el filtro de búsqueda en la vista de la agenda
 AGENDA_DEFAULT_FILTER_STATUS=Establecer por defecto este estado de eventos en el filtro de búsqueda en la vista de la agenda
-AGENDA_DEFAULT_VIEW=Establecer la pestaña por defecto al seleccionar el menú Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Habilitar recordatorio de eventos por <b>e-mail</b> (definido en cada evento). Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para que el recordatorio se envíe a la frecuencia correcta.
 AGENDA_REMINDER_BROWSER=Habilitar recordatorio de eventos en el <b>navegador de los usuarios</b> (cuando llega la fecha del evento, cada usuario puede rechazar esto desde la pregunta de confirmación del navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Activar sonido de notificación
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Mostrar el link en la agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuración del módulo Click To Dial
 ClickToDialUrlDesc=Url llamada cuando se hace clic en el icono de teléfono. En la URL, puede usar los tags <br><b>__PHONETO__</b> que se reemplazará con el número de teléfono de la persona a llamar  <br><b>__PHONEFROM__</b>  que será reemplazado por el número de teléfono de la persona que llama (suyo)<br><b>__LOGIN__</b> que se reemplazará con el login clicktodial (definido en la tarjeta de usuario)<br><b>__PASS__</b> que será Sustituido por la contraseña clicktodial (definida en la ficha de usuario).
-ClickToDialDesc=Este módulo permite hacer clicables los números de teléfono. Un clic en este icono hará que su teléfono llame al número de teléfono. Esto puede ser usado para llamar a un sistema de centralitas desde Dolibarr que puede llamar al número de teléfono en un sistema SIP, por ejemplo.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Utilice el enlace "tel:" que aparece en los números de teléfono
 ClickToDialUseTelLinkDesc=Utilice este método si los usuarios tienen un softphone o una interfaz de software instalado en mismo equipo que el navegador, y se llama al hacer clic en un enlace en el navegador que comienza con "tel:". Si necesita una solución de servidor completa (sin necesidad de instalación de software local), debe establecer este en "No" y rellenar siguiente campo.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Este campo contiene una referencia para identificar la línea. Intr
 Enter0or1=Introduzca 0 o 1
 UnicodeCurrency=Ingrese aquí entre llaves, lista con número de byte que representa el símbolo de moneda. Por ejemplo: para $, introduzca [36] - para Brasil Real R$ [82,36] - para €, introduzca [8364]
 ColorFormat=El color RGB es en formato HEX, ej: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Posición de la línea en listas de combo
 SellTaxRate=Tasa de IVA
 RecuperableOnly=Sí para el IVA "Non Perçue Récupérable" usados en algunas provincias en Francia. Mantenga el valor a "No" en los demás casos.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Para enviar solicitud de presupuesto de pr
 MailToSendSupplierOrder=Pedidos a proveedor
 MailToSendSupplierInvoice=Facturas proveedor
 MailToSendContract=Contratos
+MailToSendReception=Recepciones
 MailToThirdparty=Terceros
 MailToMember=Miembros
 MailToUser=Usuarios
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versión
 ExampleOfNewsMessageForMaintenanceRelease=Disponible ERP/CRM Dolibarr %s. La versión %s es una versión de mantenimiento, por lo que sólo contiene correcciones de errores. Recomendamos a todo el mundo que use una versión anterior que actualice a esta. Como cualquier versión de mantenimiento, no hay novedades. Se puede descargar desde la sección de descargas del portal https://www.dolibarr.org (subdirectorio versiones estables subdirectorio). Puede leer <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para ver la lista completa de los cambios.
 MultiPriceRuleDesc=Cuando la opción "Diferentes niveles de precios por productos/servicios" esta activada, puede definir diferentes precios (uno por nivel de precios) para cada producto.  Para ahorrarle tiempo, puede escribir una regla para auto calcular un precio basado en el precio del primer nivel para cada producto, así solo tendrá que poner un solo precio para el primer nivel de cada producto. Esta página esta diseñada para ahorrarle tiempo, pero solamente será útil si los precios para cada nivel son relativos al primero. Puede ignorar esta página en la mayoría de los casos.
 ModelModulesProduct=Plantillas de documentos de productos
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=Para poder generar códigos automáticamente, primero debe indicar un gestor para autogenerar códigos de barras
 SeeSubstitutionVars=Vea * nota para un listado de posibles variables de sustitución
 SeeChangeLog=Ver archivo ChangeLog (solo inglés)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Margen izquierdo en PDF
 MAIN_PDF_MARGIN_RIGHT=Margen derecho en PDF
 MAIN_PDF_MARGIN_TOP=Margen superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Margen inferior en PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=No hay ninguna configuración a realizar en este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto a sí si este grupo es un cálculo de otros grupos
 EnterCalculationRuleIfPreviousFieldIsYes=Ingrese regla de cálculo si el campo anterior se estableció en Sí (por ejemplo, 'CODEGRP1 + CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nada hecho
 XEmailsDoneYActionsDone=%s e-mails analizados, %s e-mails procesados ​​con éxito (para %s registro/acciones realizadas)
 RecordEvent=Registro de evento de email
 CreateLeadAndThirdParty=Crear lead (y tercero si es necesario)
-CreateTicketAndThirdParty=Crear ticket (y tercero si es necesario)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Resultado último código
 NbOfEmailsInInbox=Número de emails en el directorio fuente
 LoadThirdPartyFromName=Cargar terceros buscando en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargar terceros terceros buscando en %s (crear si no se encuentra)
-WithDolTrackingID=Referencia Dolibarr encontrada en ID de mensaje
-WithoutDolTrackingID=Referencia Dolibarr no encontrada en ID de mensaje
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Código postal
 MainMenuCode=Código de entrada del menú (menú principal)
 ECMAutoTree=Mostrar arbol automático GED
@@ -1981,7 +2002,7 @@ ImportSetup=Configuración del módulo Importar
 InstanceUniqueID=ID única de la instancia
 SmallerThan=Menor que
 LargerThan=Mayor que
-IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento en el e-mail entrante, el evento se vinculará automáticamente a los objetos relacionados.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar su propia contraseña de 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=Puede usar esta acción para usar el contenido del email para encontrar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo necesiten. En el campo de parámetros puede usar, por ejemplo, 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' si desea extraer el nombre del tercero de una cadena 'Name: nombre a encontrar' encontrado en el body.
@@ -2005,3 +2026,7 @@ RssNote=Nota: Cada definición de fuente RSS proporciona un widget que debe habi
 JumpToBoxes=Vaya a Configuración -> Módulos
 MeasuringUnitTypeDesc=Utilice aquí un valor como "tamaño", "superficie", "volumen", "peso", "tiempo"
 MeasuringScaleDesc=La escala es el número de lugares que tiene que mover la parte decimal para que coincida con la unidad de referencia predeterminada. Para el tipo de unidad de "tiempo", es el número de segundos. Los valores entre 80 y 99 son valores reservados.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 3a4cb8986a5..ecf2af5c4f4 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Número de eventos
 ListOfActions=Listado de eventos
 EventReports=Informes de eventos
 Location=Localización
-ToUserOfGroup=A todos los usuarios del grupo
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Evento para todo el día
 MenuToDoActions=Eventos incompletos
 MenuDoneActions=Eventos terminados
@@ -86,6 +86,8 @@ ProposalDeleted=Presupuesto eliminado
 OrderDeleted=Pedido eliminado
 InvoiceDeleted=Factura eliminada
 DraftInvoiceDeleted=Borrador de factura eliminado
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Producto %s creado
 PRODUCT_MODIFYInDolibarr=Producto %s modificado
 PRODUCT_DELETEInDolibarr=Producto %s eliminado
@@ -158,3 +160,9 @@ DateStartPlusOne=Fecha inicio +1 hora
 SetAllEventsToTodo=Establecer todos los eventos para hacer
 SetAllEventsToInProgress=Establecer todos los eventos en progreso
 SetAllEventsToFinished=Establecer todos los eventos para finalizar
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index f25225d400b..c5871f7db00 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Últimos %s pedidos de clientes modificados
 BoxTitleLastModifiedCustomerBills=Últimas %s  facturas a clientes modificadas
 BoxTitleLastModifiedCustomerOrders=Últimos %s pedidos de clientes modificados
 BoxTitleLastModifiedPropals=Últimos %s presupuestos modificados
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedidos de clientes
 ForProposals=Presupuestos
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=La cuenta de suspenso no está definida
 BoxLastCustomerShipments=Últimos envíos a clientes
 BoxTitleLastCustomerShipments=Últimos %s envíos a clientes 
 NoRecordedShipments=Ningún envío a clientes registrado
+# Pages
+AccountancyHome=Contabilidad
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index 2029e24b02c..bf0b61bff10 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=Módulo POS
 BasicPhoneLayout=Utilizar diseño básico para teléfonos.
 SetupOfTerminalNotComplete=La configuración del terminal %s no está completa
 DirectPayment=Pago directo
-DirectPaymentButton=Botón de pago en efectivo
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=La factura ya está validada
 NoLinesToBill=No hay líneas para facturar
 CustomReceipt=Recibo personalizado
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Módulo externo para impresión directa.
 PrintMethod=Método de impresión
 ReceiptPrinterMethodDescription=Método potente con muchos parámetros. Completamente personalizable con plantillas. No se puede imprimir desde la nube.
 ByTerminal=Por terminal
-TakeposNumpadUsePaymentIcon=Usar icono de pago en el teclado numérico
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Módulo de numeración para el TPV
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag es usado para añadir el número de terminal
 TakeposGroupSameProduct=Agrupar mismas líneas de producto
 StartAParallelSale=Nueva venta simultánea 
-ControlCashOpening=Control de caja al abrir el TPV
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Cierre de caja
 CashReport=Arqueo
 MainPrinterToUse=Impresora principal
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index f6d1c29c1f7..b0b4b087cb1 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Impuestos sociales o fiscales
 SocialContributions=Impuestos sociales o fiscales
 SocialContributionsDeductibles=Impuestos sociales o fiscales deducibles
 SocialContributionsNondeductibles=Impuestos sociales o fiscales no deducibles
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Etiqueta
 TypeContrib=Tipo
 MenuSpecialExpenses=Pagos especiales
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 954d751ea81..caf7a7d363b 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Servicios activos
 MenuExpiredServices=Servicios expirados
 MenuClosedServices=Servicios cerrados
 NewContract=Nuevo contrato
-NewContractSubscription=Nuevo contrato/suscripción
+NewContractSubscription=New contract or subscription
 AddContract=Crear contrato
 DeleteAContract=Eliminar un contrato
 ActivateAllOnContract=Activar todos los servicios
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 8318013c60e..2bc9c1698ef 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=El nuevo valor no puede ser igual al antiguo
 ErrorFailedToValidatePasswordReset=No se ha podido restablecer la contraseña. Es posible que este enlace ya se haya utilizado (este enlace sólo puede usarse una vez). Si no es el caso, trate de reiniciar el proceso de restablecimiento de contraseña desde el principio.
 ErrorToConnectToMysqlCheckInstance=Error de conexión con la base de datos. Compruebe que el servidor de base de datos está en marcha (por ejemplo, con mysql/maríadb, pudes lanzarlo con la línea de comando 'sudo service mysql start').
 ErrorFailedToAddContact=Error en la adición del contacto
-ErrorDateMustBeBeforeToday=La fecha no puede ser posterior a hoy
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Se ha establecido el modo de pago al tipo %s pero en la configuración del módulo de facturas no se ha indicado la información para mostrar de este modo de pago.
 ErrorPHPNeedModule=Error, su PHP debe tener instalado el módulo <b>%s</b> para usar esta funcionalidad.
 ErrorOpenIDSetupNotComplete=Ha configurado Dolibarr para aceptar la autentificación OpenID, pero la URL del servicio OpenID no se encuentra definida en la constante %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No hay suficiente cantidad
 ErrorOnlyOneFieldForGroupByIsPossible=Solo es posible un campo para 'Agrupar por' (otros se descartan)
 ErrorTooManyDifferentValueForSelectedGroupBy=Se encontraron demasiados valores diferentes (más de <b>%s</b>) para el campo '<b>%s</b>', así que no podemos usarlo como 'Agrupar por' para gráficos. El campo 'Agrupar por' ha sido eliminado. ¿Puede ser que quieras usarlo como un eje X?
 ErrorReplaceStringEmpty=Error, la cadena para reemplazar está vacía
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index 2277b2ac10a..ad58634371b 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Árabe
 Language_ar_EG=Árabe (Egipto)
 Language_ar_SA=Árabe
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengalí
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Búlgaro
 Language_bs_BA=Bosnio
 Language_ca_ES=Catalán
@@ -20,6 +23,7 @@ Language_en_GB=Inglés (Reino Unido)
 Language_en_IN=Inglés (India)
 Language_en_NZ=Inglés (Nueva Zelanda)
 Language_en_SA=Inglés (Arabia Saudita)
+Language_en_SG=English (Singapore)
 Language_en_US=Inglés (Estados Unidos)
 Language_en_ZA=Inglés (Sudáfrica)
 Language_es_ES=Español
@@ -29,6 +33,7 @@ Language_es_CL=Español (Chile)
 Language_es_CO=Español (Colombia)
 Language_es_DO=Español (República Dominicana)
 Language_es_EC=Español (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Español (Honduras)
 Language_es_MX=Español (México)
 Language_es_PA=Español (Panamá)
@@ -36,6 +41,7 @@ Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Puerto Rico)
 Language_es_UY=Español (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Español (Venezuela)
 Language_et_EE=Estonio
 Language_eu_ES=Vasco
@@ -44,15 +50,22 @@ Language_fi_FI=Finés
 Language_fr_BE=Francés (Bélgica)
 Language_fr_CA=Francés (Canadá)
 Language_fr_CH=Francés (Suiza)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Francés
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Francés (Nueva Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisio
+Language_gl_ES=Galician
 Language_he_IL=Hebreo
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croata
 Language_hu_HU=Húngaro
 Language_id_ID=Indonesio
 Language_is_IS=Islandés
 Language_it_IT=Italiano
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japonés
 Language_ka_GE=Georgiano
 Language_km_KH=Jemer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvio
 Language_mk_MK=Macedonio
 Language_mn_MN=Mongol
 Language_nb_NO=Noruego (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Neerlandés (Bélgica)
 Language_nl_NL=Holandés
 Language_pl_PL=Polaco
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbeco
 Language_vi_VN=Vietnamita
 Language_zh_CN=Chino
 Language_zh_TW=Chino (Tradicional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malayo
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 247879c790f..947cb08fdef 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Configuración del correo electrónico saliente (p
 DefaultOutgoingEmailSetup=Configuración de correo saliente predeterminada
 Information=Información
 ContactsWithThirdpartyFilter=Contactos con filtro de terceros.
+Unanswered=Unanswered
+Answered=Contestado
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 976a88feedc..20639672a7d 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=P.U. (i.i.)
 Amount=Importe
 AmountInvoice=Importe factura
 AmountInvoiced=Importe facturado
-AmountInvoicedHT=Cantidad facturada (impuestos incluidos)
-AmountInvoicedTTC=Importe facturado (sin impuestos)
+AmountInvoicedHT=Importe facturado (sin impuestos)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Importe pago
 AmountHTShort=Base imp.
 AmountTTCShort=Importe
@@ -485,6 +485,7 @@ Categories=Etiquetas/Categorías
 Category=Etiqueta/Categoría
 By=Por
 From=De
+FromDate=De
 FromLocation=De
 to=a
 To=a
@@ -687,6 +688,7 @@ Method=Método
 Receive=Recepción
 CompleteOrNoMoreReceptionExpected=Completado o no se espera más
 ExpectedValue=Valor esperado
+ExpectedQty=Expected Qty
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca recibido
@@ -703,6 +705,7 @@ MenuECM=Documentos
 MenuAWStats=AWStats
 MenuMembers=Miembros
 MenuAgendaGoogle=Agenda Google
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú inicio-configuración-seguridad): %s Kb, PHP limit: %s Kb
 NoFileFound=No hay documentos guardados en este directorio
 CurrentUserLanguage=Idioma actual
@@ -725,7 +728,7 @@ Page=Página
 Notes=Notas
 AddNewLine=Añadir nueva línea
 AddFile=Añadir archivo
-FreeZone=Entrada libre
+FreeZone=Free-text product
 FreeLineOfType=Entrada libre del tipo
 CloneMainAttributes=Clonar el objeto con estos atributos principales
 ReGeneratePDF=Regenerar PDF
@@ -942,6 +945,39 @@ ShortThursday=J
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Seleccione una plantilla de e-mail
 SetRef=Establecer ref
 Select2ResultFoundUseArrows=Varios resultados encontrados. Use las flechas para seleccionar.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Cambie al modo de edición para agregar traducc
 NotUsedForThisCustomer=No se utiliza para este cliente.
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Información
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index f36303eca3e..21c55f7972a 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -81,7 +81,7 @@ DeleteType=Eliminar
 VoteAllowed=Voto autorizado
 Physical=Físico
 Moral=Jurídico
-MorPhy=Jurídico/Físico
+MorPhy=Naturaleza
 Reenable=Reactivar
 ResiliateMember=Dar de baja un miembro
 ConfirmResiliateMember=¿Está seguro de querer dar de baja a este miembro?
diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang
index 8a35d78dd40..47ae2fc9595 100644
--- a/htdocs/langs/es_ES/mrp.lang
+++ b/htdocs/langs/es_ES/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Órdenes de fabricación
 MO=Orden de fabricación
+MOs=Manufacturing orders
 MRPDescription=Módulo para gestionar producción y Órdenes de Fabricación (OF).
 MRPArea=Área MRP
 MrpSetupPage=Configuración del módulo MRP
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 748f05813d5..dcaaa909282 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nNos ponemos en contacto co
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle la factura __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle el envío __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nNos ponemos en contacto con usted para facilitarle la intervención __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hola)__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hola)__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hola)__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Puede hacer clic en el siguiente enlace para realizar su pago, si aún no lo ha hecho.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hola)__\n\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr es un ERP/CRM para la gestión de negocios (profesionales o asociaciones), compuesto de módulos funcionales independientes y opcionales. Una demostración que incluya todos estos módulos no tiene sentido porque no utilizará todos los módulos. Además, tiene disponibles varios tipos de perfiles de demostración.
 ChooseYourDemoProfil=Elija el perfil de demostración que mejor se adapte a sus necesidades ...
 ChooseYourDemoProfilMore=... o construya su perfil<br>(modo de selección manual)
@@ -280,7 +278,9 @@ LinesToImport=Líneas a importar
 
 MemoryUsage=Uso de memoria
 RequestDuration=Duración de la solicitud
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Productos/Servicios por popularidad en Presupuestos
 PopuCom=Productos/Servicios por popularidad en Pedidos
 ProductStatistics=Estadísticas de productos/servicios
 NbOfQtyInOrders=Cantidad en pedidos
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 40468c14c77..a4b527c3730 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Defina el tipo de código de barras
 BarcodeValue=Valor del código de barras
 NoteNotVisibleOnBill=Nota (no visible en las facturas, presupuestos, etc.)
 ServiceLimitedDuration=Si el servicio es de duración limitada :
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Varios segmentos de precios por producto/servicio (cada cliente está en un segmento)
 MultiPricesNumPrices=Nº de precios
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Precios de proveedores (productos o servicio
 CustomCode=Código aduanero
 CountryOrigin=País de origen
 Nature=Naturaleza del producto (materia prima/producto acabado)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Etiqueta corta
 Unit=Unidad
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Seleccione combinación
 ProductCombinationGenerator=Generador de variantes
 Features=Funciones
 PriceImpact=Impacto en el precio
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Impacto en el peso
 NewProductAttribute=Nuevo atributo
 NewProductAttributeValue=Nuevo valor de atributo
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 7af2c7b1996..2adccf038e2 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Participante
 TypeContact_project_task_external_TASKCONTRIBUTOR=Participante
 SelectElement=Seleccione elemento
 AddElement=Vincular a elmento
+LinkToElementShort=Enlazar a
 # Documents models
 DocumentModelBeluga=Plantilla de proyecto de resumen objetos vinculados
 DocumentModelBaleine=Plantilla de informe del proyecto para tareas
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Nº de proyectos creados por mes
 ProjectNbTaskByMonth=Nº de tareas creadas por mes
 ProjectOppAmountOfProjectsByMonth=Importe de oportunidades por mes
 ProjectWeightedOppAmountOfProjectsByMonth=Importe medio oportinidades por mes
-ProjectOpenedProjectByOppStatus=Proyectos/oportunidades abiertos por estado oportunidad
-ProjectsStatistics=Estadísticas de proyectos/leads
-TasksStatistics=Estadísticas sobre tareas de proyecto/oportunidad
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Tarea asignada. Debería poder introducir tiempos en esta tarea.
 IdTaskTime=Id
 YouCanCompleteRef=Si desea completar la referencia con alguna información (para usarlo como filtros de búsqueda), se recomienda añadir un carácter - para separarlo, la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-ABC. 
diff --git a/htdocs/langs/es_ES/recruitment.lang b/htdocs/langs/es_ES/recruitment.lang
new file mode 100644
index 00000000000..30961723abb
--- /dev/null
+++ b/htdocs/langs/es_ES/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Configuraciones
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Acerca de
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 5e6c825c1ac..d496387ada5 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Eliminar envío
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks por lotes/serie
@@ -95,14 +95,16 @@ RealStock=Stock real
 RealStockDesc=El stock físico o real es la stock que tiene actualmente en sus almacenes.
 RealStockWillAutomaticallyWhen=El stock real cambiará automáticamente de acuerdo con esta regla (según configuración del módulo de stock):
 VirtualStock=Stock virtual
-VirtualStockDesc=El stock virtual es el stock que obtendrá una vez que todas las acciones pendientes que afecten a las existencias serán cerradas (pedidos a proveedor del proveedor recibidos, pedidos de clientes enviados, ...)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id. almacén
 DescWareHouse=Descripción almacén
 LieuWareHouse=Localización almacén
 WarehousesAndProducts=Almacenes y productos
 WarehousesAndProductsBatchDetail=Almacenes y productos (con detalle por lote/serie)
-AverageUnitPricePMPShort=Precio medio ponderado (PMP)
-AverageUnitPricePMP=Precio Medio Ponderado (PMP) de adquisición
+AverageUnitPricePMPShort=Valor (PMP)
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Precio de venta unitario
 EstimatedStockValueSellShort=Valor de venta
 EstimatedStockValueSell=Valor de venta
@@ -141,7 +143,7 @@ Replenishments=Reaprovisionamiento
 NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s)
 NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo seleccionado (> %s)
 MassMovement=Movimientos en masa
-SelectProductInAndOutWareHouse=Selecccione un producto, una cantidad, un almacén origen y un almacén destino, seguidamente haga clic "%s". Una vez seleccionados todos los movimientos, haga clic en "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Registrar transferencia
 ReceivingForSameOrder=Recepciones de este pedido
 StockMovementRecorded=Movimiento de stock registrado
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Mostrar el árbol completo del almacén en la ventana emergen
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index 1b70614dd94..f0577abc0f4 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Mala calidad
 ReputationForThisProduct=Reputación
 BuyerName=Nombre del comprador
 AllProductServicePrices=Todos los precios de producto / servicio
-AllProductReferencesOfSupplier=Todos los precios de producto / servicio del proveedor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Precios de proveedores
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index 6b941a656be..ccc27036015 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Eliminado
 
 # Dict
 Type=Tasa
-Category=Código analítico
 Severity=Gravedad
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Asignar automáticamente al usuario que creó el ticket
 TicketsAutoAssignTicketHelp=Al crear un ticket, el usuario puede asignarse automáticamente al ticket.
 TicketNumberingModules=Módulo de numeración de tickets
 TicketNotifyTiersAtCreation=Notificar a los terceros en la creación
-TicketGroup=Grupo
 TicketsDisableCustomerEmail=Desactivar siempre los e-mails al crear tickets desde la interfaz pública
 TicketsPublicNotificationNewMessage=Enviar e-mail(s) cuando se añade un nuevo mensaje
 TicketsPublicNotificationNewMessageHelp=Enviar e-mail(s) cuando se añade un nuevo mensaje desde la interfaz pública (al usuario asignado o al e-mail de notificaciones (actualización) y o el e-mail de notificaciones a)
@@ -162,7 +160,7 @@ CreatedBy=Creado por
 NewTicket=Nuevo ticket
 SubjectAnswerToTicket=Respuesta
 TicketTypeRequest=Tipo de solicitud
-TicketCategory=Código analítico
+TicketCategory=Grupo
 SeeTicket=Ver ticket
 TicketMarkedAsRead=El ticket ha sido marcado como leído
 TicketReadOn=Leído el
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index fa387b382d7..900c65e6201 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Desactivado en modo mantenimiento
 UserAccountancyCode=Código contable usuario
 UserLogoff=Usuario desconectado
 UserLogged=Usuario conectado
+DateOfEmployment=Employment date
 DateEmployment=Fecha de inicio de empleo
 DateEmploymentEnd=Fecha de finalización de empleo
 CantDisableYourself=No puede deshabilitar su propio registro de usuario
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Forzar validador de solicitud de días libres
 ValidatorIsSupervisorByDefault=Por defecto, el validador es el supervisor del usuario. Mantener vacío para mantener este comportamiento.
 UserPersonalEmail=Email personal
 UserPersonalMobile=Teléfono móvil personal
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 8ae4288b200..b2e4eeb7439 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Órdenes de transferencia bancaria
 PaymentByBankTransferLines=Líneas de orden de transferencia bancaria
 WithdrawalsReceipts=Domiciliaciones
 WithdrawalReceipt=Domiciliación
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Órdenes de transferencia bancaria
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Últimas %s órdenes de transferencia bancaria 
 LastWithdrawalReceipts=Últimas %s domiciliaciones
@@ -63,7 +63,9 @@ InvoiceRefused=Factura rechazada (Cargar los gastos al cliente)
 StatusDebitCredit=Estado de débito/crédito
 StatusWaiting=En espera
 StatusTrans=Enviada
+StatusDebited=Debited
 StatusCredited=Abonada
+StatusPaid=Tratada
 StatusRefused=Devuelta
 StatusMotif0=No especificado
 StatusMotif1=Provisión insuficiente
@@ -77,13 +79,13 @@ StatusMotif8=Otro motivo
 CreateForSepaFRST=Domiciliar (SEPA FRST)
 CreateForSepaRCUR=Domiciliar (SEPA RCUR)
 CreateAll=Domiciliar todas
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Sólo oficina
 CreateBanque=Sólo banco
 OrderWaiting=En espera de proceso
-NotifyTransmision=Envío de domiciliación
-NotifyCredit=Abono de domiciliación
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Número Nacional del Emisor
 WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC
 WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Abonada el
 WithdrawalFileNotCapable=No es posible generar el fichero bancario de domiciliación para el país %s (El país no está soportado)
 ShowWithdraw=Mostrar domiciliación
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Sin embargo, si la factura tiene pendiente algún pago por domiciliación no procesado, no será marcada como pagada para permitir la gestión de la domiciliación.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Archivo de la domiciliación
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Clasificar como "Archivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Estadísticas por estados de líneas
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Tipo de pago
 ModeRECUR=Pago recurrente
 ModeFRST=Pago único
 PleaseCheckOne=Escoja solamente uno
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Domiciliación %s creada
 AmountRequested=Importe solicitado
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Importe: %s<br>Método: %s<br>Fecha: %s
 InfoRejectSubject=Domiciliación devuelta
 InfoRejectMessage=Buenos días:<br><br>la domiciliación de la factura %s por cuenta de la empresa %s, con un importe de %s ha sido devuelta por el banco.<br><br>--<br>%s
 ModeWarning=No se ha establecido la opción de modo real, nos detendremos después de esta simulación
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang
index 3eded0b5314..b5f9ba0ffd8 100644
--- a/htdocs/langs/es_ES/workflow.lang
+++ b/htdocs/langs/es_ES/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar automáticamente el pedi
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar automáticamente el presupuestos de proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total del presupuesto)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar automáticamente el pedido a proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total del pedido enlazado)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Creación automática
 AutomaticClassification=Clasificación automática
diff --git a/htdocs/langs/es_ES/zapier.lang b/htdocs/langs/es_ES/zapier.lang
index 6b28c81832e..0a2286c8401 100644
--- a/htdocs/langs/es_ES/zapier.lang
+++ b/htdocs/langs/es_ES/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier para el módulo Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Configuración de Zapier para Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/es_GT/main.lang b/htdocs/langs/es_GT/main.lang
index 0f9be27b22f..2e691473326 100644
--- a/htdocs/langs/es_GT/main.lang
+++ b/htdocs/langs/es_GT/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/es_HN/main.lang b/htdocs/langs/es_HN/main.lang
index 7579f1f4693..0d6b013ca18 100644
--- a/htdocs/langs/es_HN/main.lang
+++ b/htdocs/langs/es_HN/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 532e8a55edc..574d1db4a09 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -159,6 +159,7 @@ DOLISTOREdescriptionLong=En vez de cambiar al sitio <a href="https://www.dolisto
 NotCompatible=Este módulo no parece ser compatible con tu Dolibarr %s (Min %s- Max %s).
 CompatibleAfterUpdate=Este  módulo requiere una actualización de tu Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=Ver en Market place
+SeeSetupOfModule=Ver configuración del módulo %s
 AchatTelechargement=Comprar / Descargar
 GoModuleSetupArea=Para implementar/instalar un nuevo módulo, vaya al área de configuración del Módulo: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, el lugar oficial para módulos externos Dolibarr ERP / CRM
@@ -228,12 +229,12 @@ Module30Name=Facturas
 Module40Name=Vendedores
 DictionaryAccountancyJournal=Diarios de contabilidad
 DictionarySocialNetworks=Redes Sociales
-DictionaryProspectStatus=Estatus del cliente potencial
 Upgrade=Actualizar
 LDAPFieldFirstName=Nombre(s)
 AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda
 ConfFileMustContainCustom=Instalar o construir un módulo externo desde la aplicación necesita guardar los archivos del módulo en el directorio <strong> %s </strong>. Para que este directorio sea procesado por Dolibarr, debe configurar su <strong> conf/conf.php </strong> para agregar las 2 líneas de directiva: <strong> $dolibarr_main_url_root_alt='/custom'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
 MailToSendProposal=Propuestas de clientes
 MailToSendInvoice=Facturas de clientes
+MailToSendSupplierOrder=Ordenes de compra
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 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.
diff --git a/htdocs/langs/es_MX/agenda.lang b/htdocs/langs/es_MX/agenda.lang
index aa8f360dcfd..285a00342d7 100644
--- a/htdocs/langs/es_MX/agenda.lang
+++ b/htdocs/langs/es_MX/agenda.lang
@@ -2,7 +2,6 @@
 ActionsOwnedBy=Evento propiedad de
 Event=Evento
 ListOfActions=Lista de eventos
-ToUserOfGroup=A cualquier usuario del grupo
 EventOnFullDay=Evento de todo el día(s)
 MenuToDoActions=Todos los eventos incompletos
 MenuDoneActions=Todos los eventos finalizados
diff --git a/htdocs/langs/es_MX/boxes.lang b/htdocs/langs/es_MX/boxes.lang
index 4ca95308953..681fe36e07c 100644
--- a/htdocs/langs/es_MX/boxes.lang
+++ b/htdocs/langs/es_MX/boxes.lang
@@ -9,5 +9,6 @@ BoxOldestUnpaidSupplierBills=Facturas de proveedores sin pagar más antiguas
 BoxLastProposals=Últimas propuestas comerciales
 BoxLastCustomerOrders=Últimos pedidos de venta
 BoxCurrentAccounts=Saldo de cuentas abiertas
+BoxSuppliersOrdersPerMonth=Órdenes a proveedor por mes
 BoxTitleLastModifiedPropals=Últimas %s cotizaciones modificadas
 ForProposals=Propuestas
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 7405807c6c8..4d0eb80f605 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -20,7 +20,6 @@ FormatDateHourSecShort=%I:%M:%S %p %d/%m/%Y
 FormatDateHourTextShort=%I:%M %p, %d %b %Y
 FormatDateHourText=%I:%M %p, %d %B %Y
 AvailableVariables=Variables de sustitución disponibles
-EmptySearchString=Enter non empty search criterias
 NoRecordFound=Ningún registro fue encontrado
 NoError=No hay error
 ErrorFieldFormat=El campo '%s' contiene un valor incorrecto
@@ -119,6 +118,7 @@ RemoveFilter=Remover filtro
 ChartGenerated=Gráfico generado
 GeneratedOn=Generado en %s
 NotYetAvailable=No disponible aún
+Category=Tag/Categoría
 ChangedBy=Cambiado por
 ResultKo=Fallo
 Reporting=Informes
@@ -267,6 +267,7 @@ ShortThursday=MJ
 Select2NotFound=No se encontró ningún resultado
 Select2Enter=Entrar
 SearchIntoCustomerInvoices=Facturas de clientes
+SearchIntoSupplierOrders=Ordenes de compra
 SearchIntoCustomerProposals=Propuestas comerciales
 SearchIntoExpenseReports=Reporte de gastos
 AssignedTo=Asignado a
diff --git a/htdocs/langs/es_MX/members.lang b/htdocs/langs/es_MX/members.lang
index 585f0369074..92dcc885dd1 100644
--- a/htdocs/langs/es_MX/members.lang
+++ b/htdocs/langs/es_MX/members.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - members
+MemberStatusDraft=Borrador (necesita ser validado)
 SubscriptionLate=Tarde
 SubscriptionPayment=Pago de suscripción
diff --git a/htdocs/langs/es_MX/other.lang b/htdocs/langs/es_MX/other.lang
index ac900b15595..6de5307f29a 100644
--- a/htdocs/langs/es_MX/other.lang
+++ b/htdocs/langs/es_MX/other.lang
@@ -2,3 +2,4 @@
 Tools=Herramientas
 TMenuTools=Herramientas
 Notify_COMPANY_CREATE=Tercero creado
+SeeModuleSetup=Ver configuración del módulo %s
diff --git a/htdocs/langs/es_MX/recruitment.lang b/htdocs/langs/es_MX/recruitment.lang
new file mode 100644
index 00000000000..e6b91c78167
--- /dev/null
+++ b/htdocs/langs/es_MX/recruitment.lang
@@ -0,0 +1,14 @@
+# Dolibarr language file - Source file is en_US - recruitment
+ModuleRecruitmentName =Reclutamiento
+ModuleRecruitmentDesc =Gestione y de seguimiento a campañas de reclutamiento para nuevos puestos de trabajo.
+RecruitmentSetup =Configuración de reclutamiento
+RecruitmentArea=Área de reclutamiento
+RecruitmentAbout =Sobre el reclutamiento
+RecruitmentAboutPage =Página acerca de reclutamiento
+NbOfEmployeesExpected=Número esperado de empleados
+JobLabel=Etiqueta del puesto de trabajo
+WorkPlace=Lugar de trabajo
+DateExpected=Fecha esperada
+FutureManager=Futuro gerente
+ResponsibleOfRecruitement=Responsable de reclutamiento
+IfJobIsLocatedAtAPartner=Si el trabajo se encuentra en un el lugar de un asociado
diff --git a/htdocs/langs/es_MX/withdrawals.lang b/htdocs/langs/es_MX/withdrawals.lang
index bfed27b108a..52a15f0786e 100644
--- a/htdocs/langs/es_MX/withdrawals.lang
+++ b/htdocs/langs/es_MX/withdrawals.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 WithdrawalReceipt=Orden de domiciliación bancaria
 Rejects=Rechazos
+StatusPaid=Pagado
 StatusRefused=Rechazado
diff --git a/htdocs/langs/es_PA/main.lang b/htdocs/langs/es_PA/main.lang
index bcdd3f914eb..1602d6a7ffa 100644
--- a/htdocs/langs/es_PA/main.lang
+++ b/htdocs/langs/es_PA/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index 7140f0a388b..541a023bb7c 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -19,9 +19,14 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
+DatabaseConnection=Conexión a Base de Datos
+NoTemplateDefined=No hay plantilla disponible para este tipo de email
+AvailableVariables=Variables de sustitución disponible
+EmptySearchString=No ingrese criterios de búsqueda vacíos
+NoRecordFound=No se encontró registro
+NoRecordDeleted=No se borró el registro
 NoError=Sin error
-ErrorNoVATRateDefinedForSellerCountry=Error, no hay tipos de IGV definidos para el país '%s'.
+ErrorNoVATRateDefinedForSellerCountry=Error, no hay tasas de IGV definidas para el país '%s'.
 NotClosed=No se ha cerrado
 AddLink=Añadir enlace
 RemoveLink=Remover enlace
@@ -31,12 +36,12 @@ Delete=Borrar
 Remove=Remover
 Resiliate=Terminar
 Cancel=Cancelar
-SaveAndStay=Grabar y permanecer
-SaveAndNew=Grabar y nuevo
+Save=Guardar
+SaveAs=Guardar Como
 TestConnection=Prueba de conexión
 ToClone=Duplicar
-ConfirmClone=Seleccione los datos que desea clonar:
-NoCloneOptionsSpecified=No ha definido los datos a clonar.
+ConfirmClone=Seleccione los datos que desea duplicar:
+NoCloneOptionsSpecified=No ha definido los datos a duplicar.
 Run=Ejecutar
 Show=Mostrar
 Hide=Ocultar
@@ -46,7 +51,7 @@ Upload=Subir
 AmountVAT=Importe impuesto
 MulticurrencyAmountVAT=Importe impuesto, moneda original
 TotalVAT=Total impuesto
-TTC=IGV incluido
+TTC=Inc. impuesto
 INCVATONLY=Inc. IGV
 VAT=IGV
 VATs=Impuesto a las ventas
@@ -56,10 +61,10 @@ LT2=Impuesto 3
 LT2Type=Tipo de impuesto 3
 VATRate=Tasa Impuesto
 VATCode=Código de la Tasa del Impuesto
-Drafts=Borrador
 Opened=Abrir
 SearchIntoMO=Órdenes de Fabricación
 SearchIntoCustomerInvoices=Facturas de Clientes
 ContactDefault_invoice_supplier=Factura de Proveedor
+ContactDefault_order_supplier=Orden de Compra
 ContactDefault_propal=Cotización
 ContactDefault_supplier_proposal=Cotización de Proveedor
diff --git a/htdocs/langs/es_PY/main.lang b/htdocs/langs/es_PY/main.lang
index bcdd3f914eb..1602d6a7ffa 100644
--- a/htdocs/langs/es_PY/main.lang
+++ b/htdocs/langs/es_PY/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/es_US/main.lang b/htdocs/langs/es_US/main.lang
index 0f9be27b22f..2e691473326 100644
--- a/htdocs/langs/es_US/main.lang
+++ b/htdocs/langs/es_US/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/es_UY/main.lang b/htdocs/langs/es_UY/main.lang
index bcdd3f914eb..1602d6a7ffa 100644
--- a/htdocs/langs/es_UY/main.lang
+++ b/htdocs/langs/es_UY/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index b3e98598310..74b465f966a 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -9,7 +9,6 @@ Permission255=Eliminar o desactivar otros usuarios
 Permission256=Consultar sus permisos
 Permission1321=Exportar facturas a clientes, atributos y cobros
 Permission20003=Eliminar peticiones de días libres retribuidos
-DictionaryProspectStatus=Estado prospección
 ExtraFields=Atributos adicionales
 ExtraFieldsLines=Atributos adicionales (líneas)
 ExtraFieldsSupplierOrdersLines=Atributos complementarios (líneas de pedido)
diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang
index 1785d537814..6db9ce60111 100644
--- a/htdocs/langs/es_VE/main.lang
+++ b/htdocs/langs/es_VE/main.lang
@@ -19,7 +19,6 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
 DateEnd=Fecha finalización
 AmountLT1ES=Importe de retención
 AmountLT2ES=Importe ISLR
@@ -27,6 +26,7 @@ TotalLT1ES=Total retenido
 TotalLT2ES=Total ISLR
 LT1ES=Retención
 LT2ES=ISLR
+FromDate=Emisor
 FromLocation=Emisor
 Opened=Abierta
 MonthVeryShort02=V
diff --git a/htdocs/langs/es_VE/members.lang b/htdocs/langs/es_VE/members.lang
index 2140c44adb9..9509a94e6af 100644
--- a/htdocs/langs/es_VE/members.lang
+++ b/htdocs/langs/es_VE/members.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - members
 MemberStatusDraftShort=A validar
 MemberStatusActiveShort=Validada
+MemberStatusNoSubscriptionShort=Validada
diff --git a/htdocs/langs/es_VE/withdrawals.lang b/htdocs/langs/es_VE/withdrawals.lang
new file mode 100644
index 00000000000..fb9616a1788
--- /dev/null
+++ b/htdocs/langs/es_VE/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+StatusPaid=Pagada
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index f06ea3b1334..e6ecde693aa 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 90178743010..9a9f6dc2925 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=Kasutaja e-post
 CompanyEmail=Ettevõtte e-post
 FeatureNotAvailableOnLinux=Funktsionaalsus pole kasutatav Unixi laadsel süsteemil. Kontrolli oma sendmail programmi seadistust.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Moodulite seadistamine
 ModulesSetup=Moodulid / rakenduse seadistamine
 ModuleFamilyBase=Süsteem
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Selle funktsiooni kasutamiseks tuleb kõigepealt aktive
 SecurityToken=URLide kaitsmiseks kasutatav võti
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=PDFi globaalsed seaded.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Peida kõik müügimaksu / käibemaksuga seotud andmed
 PDFRulesForSalesTax=Müügimaksu / käibemaksu reeglid
 PDFLocaltax=%s reeglid
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Muuda hindadel, mille baasväärtus on defineeritud kui
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Sõna
+String1Line=String (1 line)
 TextLong=Pikk tekst
+TextLongNLines=Long text (n lines)
 HtmlText=HTML-tekst
 Int=Täisarv
 Float=Ujukomaarv
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Vöötkoodid
 Module55Desc=Vöötkoodide haldamine
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial süsteemiga (Asterisk jne) integreerimine
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Teenuste loomine/muutmine
 Permission534=Teenuste kustutamine
 Permission536=Peidetud teenuste vaatamine/haldamine
 Permission538=Teenuste eksport
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Annetuste vaatamine
 Permission702=Annetuste loomine/muutmine
 Permission703=Annetuste kustutamine
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Laojääkide vaatamine
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Dokumendikaustade seadistamine
 Permission2801=FTP kliendi kasutamine lugemisrežiimis (ainult sirvimine ja alla laadimine)
 Permission2802=FTP kliendi kasutamine kirjutusrežiimis (failide kustutamine või üles laadimine)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Huvilise potentsiaal
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Piirkonnad
 DictionaryCountry=Riigid
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Ühikud
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Sotsiaalvõrgud
-DictionaryProspectStatus=Huvilise staatus
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Vasakus menüüs on alati otsingu vorm
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Pead vähemalt 1 mooduli sisse lülitama
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Suviti 'jah'
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Vaikimisi avatav sakk päevakava avamisel
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial mooduli seadistamine
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Tarnija arved
 MailToSendContract=Lepingud
+MailToSendReception=Receptions
 MailToThirdparty=Kolmandad isikud
 MailToMember=Liikmed
 MailToUser=Kasutajad
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Postiindeks
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 28eae07f9f7..98053cf19ef 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Tegevuste arv
 ListOfActions=Tegevuste nimekiri
 EventReports=Tegevuste aruanded
 Location=Asukoht
-ToUserOfGroup=Iga grupi kasutajale
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Tegevus kestab kogu/kõik päeva(d)
 MenuToDoActions=Kõik lõpetamata tegevused
 MenuDoneActions=Kõik lõpetatud tegevused
@@ -86,6 +86,8 @@ ProposalDeleted=Pakkumine kustutatud
 OrderDeleted=Tellimus kustutatud
 InvoiceDeleted=Arve kustutatud
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Toode %s loodud
 PRODUCT_MODIFYInDolibarr=Toote %s muudetud
 PRODUCT_DELETEInDolibarr=Toode %s kustutatud
@@ -158,3 +160,9 @@ DateStartPlusOne=Kuupäeva algus + 1 tund
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index cdf3353df47..7c9fca21f40 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Müügiarved
 ForCustomersOrders=Müügiarved
 ForProposals=Pakkumised
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Raamatupidamine
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index bfa14297ae6..ce7e0354ab2 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 51037afab90..5be099381a7 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Erikulud
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang
index 11e7c2a2c50..ff7bc521727 100644
--- a/htdocs/langs/et_EE/contracts.lang
+++ b/htdocs/langs/et_EE/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Aktiivsed teenused
 MenuExpiredServices=Aegunud teenused
 MenuClosedServices=Suletud teenused
 NewContract=Uus leping
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Loo leping
 DeleteAContract=Kustuta leping
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index cea8deb3421..11b82753a43 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Uus väärtus ei saa olla vanaga võrdne
 ErrorFailedToValidatePasswordReset=Parooli uuesti initsialiseerimine ebaõnnestus. Võib-olla on uuesti initsialiseerimine juba tehtud (antud linki saab kasutada vaid ühe korra). Kui ei, siis proovi uuesti initsialiseerida.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Kontakti lisamine ebaõnnestus
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Makseviis on seatud tüübile %s, kuid Arved mooduli seadistamine ei ole täielik ning selle makseviisi jaoks näidatav info on määratlemata.
 ErrorPHPNeedModule=Viga: selle võimaluse kasutamiseks peab PHPs olema võimaldatud moodul <b>%s</b>.
 ErrorOpenIDSetupNotComplete=Dolibarri seadistusfail lubab OpenIDga autentimist, ent konstandis %s ei ole OpenID teenuse URL määratletud
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/et_EE/languages.lang b/htdocs/langs/et_EE/languages.lang
index 309fb61d5e0..b352df45118 100644
--- a/htdocs/langs/et_EE/languages.lang
+++ b/htdocs/langs/et_EE/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Araabia
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Araabia
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgaaria
 Language_bs_BA=Bosnia
 Language_ca_ES=Katalaani
@@ -20,6 +23,7 @@ Language_en_GB=Inglise (Ühendkuningriigid)
 Language_en_IN=Inglise (India)
 Language_en_NZ=Inglise (Uus-Meremaa)
 Language_en_SA=Inglise (Saudi Araabia)
+Language_en_SG=English (Singapore)
 Language_en_US=Inglise (Ameerika Ühendriigid)
 Language_en_ZA=Inglise (Lõuna-Aafrika)
 Language_es_ES=Hispaania
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Hispaania (Honduras)
 Language_es_MX=Hispaania (Mehhiko)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Hispaania (Paraguay)
 Language_es_PE=Hispaania (Peruu)
 Language_es_PR=Hispaania (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Eesti
 Language_eu_ES=Baski
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Prantsuse (Belgia)
 Language_fr_CA=Prantsuse (Kanada)
 Language_fr_CH=Prantsuse (Šveits)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Prantsuse
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Prantsuse (Uus-Kaledoonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Heebrea
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Horvaadi
 Language_hu_HU=Ungari
 Language_id_ID=Indonesian
 Language_is_IS=Islandi
 Language_it_IT=Itaalia
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Jaapani
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Läti
 Language_mk_MK=Makedoonia
 Language_mn_MN=Mongolian
 Language_nb_NO=Norra (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Hollandi (Belgia)
 Language_nl_NL=Dutch
 Language_pl_PL=Poola
@@ -86,4 +100,5 @@ Language_uz_UZ=Usbeki
 Language_vi_VN=Vietnami
 Language_zh_CN=Hiina
 Language_zh_TW=Hiina (traditsiooniline)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index 3df50cb7057..bd62e283b06 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informatsioon
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index c1e0181e3f5..c4b68666af8 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Summa
 AmountInvoice=Arve summa
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Makse summa
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Summa (koos km-ga)
@@ -485,6 +485,7 @@ Categories=Sildid/kategooriad
 Category=Silt/kategooria
 By=Isik
 From=Kellelt
+FromDate=Kellelt
 FromLocation=Kellelt
 to=kellele
 To=kellele
@@ -687,6 +688,7 @@ Method=Meetod
 Receive=Võta vastu
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Osaline
 TotalWoman=Täielik
 NeverReceived=Pole vastu võetud
@@ -703,6 +705,7 @@ MenuECM=Dokumendid
 MenuAWStats=AWStats
 MenuMembers=Liikmed
 MenuAgendaGoogle=Google päevakava
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr piir (menüü Kodu->Seaded->Turvalisus): %s Kb, PHP piir: %s Kb
 NoFileFound=Antud kausta pole dokumente salvestatud
 CurrentUserLanguage=Aktiivne keel
@@ -725,7 +728,7 @@ Page=Lehekülg
 Notes=Märkused
 AddNewLine=Lisa uus rida
 AddFile=Lisa fail
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Klooni objekt selle põhiliste omadustega
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=N
 ShortFriday=R
 ShortSaturday=L
 ShortSunday=P
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Informatsioon
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 7734fa695b5..3df1d30b7d9 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Liikmete mustand
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Kinnitatud
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Uus annetus
 PaymentSubscription=Uus annetuse makse
 SubscriptionEndDate=Liikmemaksu lõppkuupäev
@@ -78,7 +81,7 @@ DeleteType=Kustuta
 VoteAllowed=Hääletamine lubatud
 Physical=Füüsiline
 Moral=Moraalne
-MorPhy=Moraalne/füüsiline
+MorPhy=Loomus
 Reenable=Luba uuesti
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/et_EE/mrp.lang b/htdocs/langs/et_EE/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/et_EE/mrp.lang
+++ b/htdocs/langs/et_EE/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 782d3bd2cf3..a1aa2f9a67b 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 28705cf475e..74cf8f08516 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Määra vöötkoodi tüüp
 BarcodeValue=Vöötkoodi väärtus
 NoteNotVisibleOnBill=Märkus (ei ole nähtav arvetel, pakkumistel jne)
 ServiceLimitedDuration=Kui toode on piiratud kestusega teenus:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hindasid
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Päritolumaa
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Ühik
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Uus atribuut
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 4b9d9c562c8..d9f635dd8a5 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Toetaja
 TypeContact_project_task_external_TASKCONTRIBUTOR=Toetaja
 SelectElement=Vali element
 AddElement=Seosta elemendiga
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/et_EE/recruitment.lang b/htdocs/langs/et_EE/recruitment.lang
new file mode 100644
index 00000000000..02a90af05dc
--- /dev/null
+++ b/htdocs/langs/et_EE/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Seaded
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Dolibarri kohta
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 58b8cd18969..20dd3c22617 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Kustuta saatmine
 Stock=Laojääk
 Stocks=Laojäägid
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Reaalne laojääk
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuaalne laojääk
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Lao ID
 DescWareHouse=Lao kirjeldus
 LieuWareHouse=Lao lokaliseerimine
 WarehousesAndProducts=Laod ja tooted
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Kaalutud keskmine sisendhind
-AverageUnitPricePMP=Kaalutud keskmine sisendhind
+AverageUnitPricePMPShort=Kaalutud keskmine hind
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Ühiku müügihind
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Värskendamised
 NbOfProductBeforePeriod=Toote %s laojääk enne valitud perioodi (< %s)
 NbOfProductAfterPeriod=Toote %s laojääk pärast valitud perioodi (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Vali toode, kogus, lähteladu ja sihtladu, siis klõpsa "%s". Kui see on kõigi soovitud liikumiste jaoks tehtud, klõpsa "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 715be4d8897..86a9e774975 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/et_EE/ticket.lang b/htdocs/langs/et_EE/ticket.lang
index 77b37fec903..6ebd80a96c2 100644
--- a/htdocs/langs/et_EE/ticket.lang
+++ b/htdocs/langs/et_EE/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Liik
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Rühm
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Rühm
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index df908040ddf..8966333a09b 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Loodav kasutaja on väline kasutaja (kuna on seotud mõne
 IdPhoneCaller=Helistaja ID
 NewUserCreated=Loodi kasutaja %s
 NewUserPassword=Muudeti kasutaja %s parool
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Muudeti kasutajat %s
 UserDisabled=Keelati kasutaja %s
 UserEnabled=Aktiveeriti kasutaja %s
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index 7a3e9aecfbf..f1edf12b9b0 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Ootel
 StatusTrans=Saadetud
+StatusDebited=Debited
 StatusCredited=Krediteeritud
+StatusPaid=Makstud
 StatusRefused=Keeldutud
 StatusMotif0=Määramata
 StatusMotif1=Pole piisavalt raha
@@ -77,13 +79,13 @@ StatusMotif8=Muu põhjus
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Ainult kontor
 CreateBanque=Ainult pank
 OrderWaiting=Ootab töötlemist
-NotifyTransmision=Väljamakse ülekandmine
-NotifyCredit=Väljamakse kreedit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=Pankadele, mis kasutavad RIB
 WithBankUsingBANBIC=Pankadele, mis kasutavad IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Krediteeri
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Väljamaksete fail
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Märgi staatuseks 'Fail saadetud'
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Summa: %s<br>Meetod: %s<br>Kuupäev: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Tootmisrežiim ei olnud seadistatud, pärast seda peatatakse simulatsioon
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/et_EE/workflow.lang b/htdocs/langs/et_EE/workflow.lang
index 92e41fafbbd..03c55985b03 100644
--- a/htdocs/langs/et_EE/workflow.lang
+++ b/htdocs/langs/et_EE/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Töövoo mooduli seaded
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/et_EE/zapier.lang b/htdocs/langs/et_EE/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/et_EE/zapier.lang
+++ b/htdocs/langs/et_EE/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 016c1d3c39d..d667dfe0be5 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Moduluaren konfigurazioa
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistema
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Katea
+String1Line=String (1 line)
 TextLong=Testu luzea
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Zenbaki osoa
 Float=Zenbaki hamartarra
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barra-kodeak
 Module55Desc=Barra-kodeak kudeatzea
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Dokumentuen karpetak konfiguratzea
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Proiektuaren egoera
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Kontratuak
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Kideak
 MailToUser=Erabiltzaileak
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index c62f7b94ae5..74d5dec55a8 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Gertaera kopurua
 ListOfActions=Gertaeren zerrenda
 EventReports=Event reports
 Location=Kokapena
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index 76c9a54a5b4..ebe7ba3d683 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposamenak
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index 1737f3e2dc4..c671c19b97e 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index 2d8e20c7ec2..9aca33839a6 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/eu_ES/contracts.lang b/htdocs/langs/eu_ES/contracts.lang
index a8ae643b3b4..b3d10b340ed 100644
--- a/htdocs/langs/eu_ES/contracts.lang
+++ b/htdocs/langs/eu_ES/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang
index 85505defff4..aac76345a55 100644
--- a/htdocs/langs/eu_ES/languages.lang
+++ b/htdocs/langs/eu_ES/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Katalana
@@ -20,6 +23,7 @@ Language_en_GB=Ingelesa (Erresuma Batua)
 Language_en_IN=Ingelesa (India)
 Language_en_NZ=Ingelesa (Zelanda Berria)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=Ingelesa (Estatu Batuak)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Gaztelania
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Gaztelania (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Euskera
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Frantsesa (Belgika)
 Language_fr_CA=Frantsesa (Kanada)
 Language_fr_CH=Frantsea (Suitza)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Frantsesa
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italiera
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 3c35c12be7a..1f26534ddc7 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informazioa
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index b580de42e52..6a5f8a75250 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Ordainketaren zenbatekoa
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Kideak
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Informazioa
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/eu_ES/members.lang b/htdocs/langs/eu_ES/members.lang
index ba7f85e4917..e133e2ae77f 100644
--- a/htdocs/langs/eu_ES/members.lang
+++ b/htdocs/langs/eu_ES/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Ezabatu
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/eu_ES/mrp.lang b/htdocs/langs/eu_ES/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/eu_ES/mrp.lang
+++ b/htdocs/langs/eu_ES/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 305a5b045db..f855300b038 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index d5db31c6366..84be483e557 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 9bcf3461e80..4ec830cce10 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/eu_ES/recruitment.lang b/htdocs/langs/eu_ES/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/eu_ES/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 8b127a429f7..c53f1607dd0 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stock-ak
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index d0cf540d3eb..51562b8bb7a 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/eu_ES/ticket.lang b/htdocs/langs/eu_ES/ticket.lang
index 35acbe43211..d03e28f558d 100644
--- a/htdocs/langs/eu_ES/ticket.lang
+++ b/htdocs/langs/eu_ES/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Mota
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Taldea
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Taldea
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index 2d4f828a737..c3d64917656 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/eu_ES/workflow.lang b/htdocs/langs/eu_ES/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/eu_ES/workflow.lang
+++ b/htdocs/langs/eu_ES/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/eu_ES/zapier.lang b/htdocs/langs/eu_ES/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/eu_ES/zapier.lang
+++ b/htdocs/langs/eu_ES/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index a156ebf15c9..00e11436d1a 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=امکان تغییر تعداد دیگری از صفر 
 BANK_DISABLE_DIRECT_INPUT=غیرفعال کردن ثبت مستقیم تراکنش در حساب بانکی
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=فعال کردن خروجی پیش‌نویس از دفتر
 ACCOUNTANCY_COMBO_FOR_AUX=فعال کردن فهرست ترکیبی برای حساب وابسته(ممکن است در صورتی که شخص‌سوم‌های زیادی داشته باشید، کند باشد)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=دفتر فروش
 ACCOUNTING_PURCHASE_JOURNAL=دفتر خرید
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=وفق داده نشده
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=انتساب دست‌جمعی دسته‌بندی
 AddAccountFromBookKeepingWithNoCategories=حساب فعال هنوز در یک گروه‌ شخصی‌سازی‌شده نیست
 CategoryDeleted=دسته‌بندی حساب حساب‌داری حذف شد
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index e73b0db2aab..71e01680216 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=نشانی پیش‌فرض برای فرستندۀ ر
 UserEmail=رایانامۀ کاربر
 CompanyEmail=رایانامۀ شرکت
 FeatureNotAvailableOnLinux=این قابلیت در سامانه‌های ردۀ یونیکس وجود ندارد. برنامۀ ارسال رایانامۀ محلی خود را آزمایش کنید.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=در صورتی که ترجمۀ این زبان کامل نیست یا شما خطائی سراغ دارید، شما می‌توانید فایل‌های موجود در پوشۀ <b>langs/%s</b>  را ویرایش کرده و تغییرات مورد نظر خود را به www.transifex.com/dolibarr-association/dolibarr/ بفرستید.
-SubmitTranslationENUS=در صورتی که ترجمۀ این زبان کامل نیست یا شما خطائی سراغ دارید، شما می‌توانید فایل‌های موجود در پوشۀ <b>langs/%s</b> را ویرایش کرده و فایل‌های تغییر کرده را به  dolibarr.org/forum یا توسعه دهندگان در github.com/Dolibarr/dolibarr ارسال فرمائید.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=برپاسازی واحد‌ها
 ModulesSetup=برپاسازی واحد‌ها و برنامه‌ها
 ModuleFamilyBase=سامانه
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=برای استفاده از این امکان، واح
 SecurityToken=کلیدواژۀ ایمن‌سازی نشانی‌ها
 NoSmsEngine=هیچ مدیر ارسال پیامکی وجود ندارد. مدیر ارسال پیامک به همراه توزیع پیش‌فرض نصب نشده است چون به تامین کنندۀ بیرونی وابسته است، اما شما می‌توانید در %s این نیاز را تامین کنید.
 PDF=PDF
-PDFDesc=گزینه‌های عمومی برای تولید PDF
-PDFAddressForging=قوانین کادرهای نشانی
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=پنهان کردن همۀ اطلاعات مربوط به مالیات بر فروش و مالیات بر ارزش افزوده
 PDFRulesForSalesTax=قواعد مالیات‌برارزش‌افزوده و مالیات‌برفروش
 PDFLocaltax=قواعد %s
-HideLocalTaxOnPDF=پنهان کردن نرخ %s در ستون مالیات بر فروش
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=پنهان کردن توضیح محصولات
 HideRefOnPDF=پنهان کردن شمارۀ مرجع
 HideDetailsOnPDF=پنهان کردن جزئیات سطور محصولات
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=تغییر قیمت‌ها بر پایۀ مقدار مرج
 MassConvert=اجرای تبدیل دسته‌ای
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=رشته
+String1Line=String (1 line)
 TextLong=متن طولانی
+TextLongNLines=Long text (n lines)
 HtmlText=نوشتۀ HTML
 Int=عدد صحیح
 Float=شناور
@@ -543,9 +546,9 @@ Module54Desc=مدیریت قراردادها (خدمات یا اشتراک‌ه
 Module55Name=بارکدها
 Module55Desc=مدیریت بارکد
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=برداشت‌های مستقیم بانکی
-Module57Desc=مدیریت سفارش برداشت‌های مستقیم بانکی. این شامل تولید فایل SEPA برای کشورهای اروپائی است.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=کلیک برای تماس
 Module58Desc=یکپارچه سازی سیستم ClickToDial (استریسک، ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=ایجاد/ویرایش خدمات
 Permission534=حذف خدمات
 Permission536=مشاهده/مدیریت خدمات پنهان
 Permission538=صادرکردن خدمات
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=خواندن صورت‌حساب‌های مواد
 Permission651=ایجاد/به‌هنگام سازی صورت‌حساب‌های موا
 Permission652=حذف صورت‌حساب‌های مواد
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=ملاحظۀ کمک‌های‌مالی
 Permission702=ایجاد/ویرایش کمک‌های‌مالی
 Permission703=حذف کمک‌های‌مالی
@@ -848,6 +858,8 @@ Permission773=حذف گزارش‌های هزینه
 Permission774=ملاحظۀ همۀ گزارش‌های هزینه (حتی مربوط به کاربرانی که زیرنظر شما نیستند)
 Permission775=تائید گزارش‌های هزینه
 Permission776=پرداخت گزارش‌های هزینه
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=صادرکردن گزارش‌های هزینه
 Permission1001=ملاحظۀ موجودی
 Permission1002=ساخت/ویرایش انبار
@@ -900,6 +912,7 @@ Permission2515=تنظیم پوشه‌های مستندات
 Permission2801=استفاده از متقاضی FTP در حالت خواندنی (منحصر به مرور و دریافت)
 Permission2802=استفاده از متقاضی FTP در حالت نوشتنی (حذف یا ارسال فایل)
 Permission3200=خواندن روی‌دادهای بایگانی شده و اثرانگشت‌ها
+Permission3301=Generate new modules
 Permission4001=نمایش کارمندان
 Permission4002=ساخت کارمند
 Permission4003=حذف کارمند
@@ -947,7 +960,8 @@ Permission63003=حذف منابع
 Permission63004=پیونددادن منابع به روی‌داد جلسه
 DictionaryCompanyType=انواع شخص‌سوم
 DictionaryCompanyJuridicalType=موجودیت حقوقی شخص‌سوم
-DictionaryProspectLevel=قابلیت‌بالقوۀ مشتری‌احتمالی
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=ایالت‌ها/استان‌ها
 DictionaryRegion=مناطق
 DictionaryCountry=کشورها
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=قالب‌های رایانامه
 DictionaryUnits=واحدها
 DictionaryMeasuringUnits=واحدهای محاسبه
 DictionarySocialNetworks=شبکه‌های اجتماعی
-DictionaryProspectStatus=وضعیت مشتری‌احتمالی
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=انواع مرخصی
 DictionaryOpportunityStatus=وضعیت سرنخ برای طرح/سرنخ
 DictionaryExpenseTaxCat=گزارش هزینه - دسته‌بندی‌های حمل‌ونقل
@@ -1076,7 +1091,7 @@ LoginPage=صفحۀ ورود
 BackgroundImageLogin=تصویر پس‌زمینه
 PermanentLeftSearchForm=واحد دائمی جستجو در فهرست سمت چپ
 DefaultLanguage=زبان پیش‌فرض
-EnableMultilangInterface=پشتیبانی از چندزبانگی
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=شرکت/سازمان
 CompanyIds=هویت‌های شرکت/سازمان
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=حداقل یک شرایط جستجو ب
 NewTranslationStringToShow=عبارت جدید ترجمه برای نمایش
 OriginalValueWas=ترجمۀ اصلی بازنویسی شد. مقدار اصلی <br><br>%s بود
 TransKeyWithoutOriginalValue=شما یک ترجمۀ جدید برای کلیدترجمۀ "<strong>%s</strong>" الزام کردید که در هیچ‌یک از فایل‌های ترجمه وجود ندارد
-TotalNumberOfActivatedModules=واحد‌ها/برنامه‌های فعال‌شده: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=شما حداقل باید 1 واحد را فعال نمائید
 ClassNotFoundIntoPathWarning=کلاس %s در مسیر PHP پیدا نشد
 YesInSummer=بله در فصل تابستان
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=استفاده از انواع رخداد (قابل‌مد
 AGENDA_USE_EVENT_TYPE_DEFAULT=ثبت خودکار این مقدار پیش‌فرض برای نوع رخداد در برگۀ ساخت رخداد
 AGENDA_DEFAULT_FILTER_TYPE=ثبت خودکار این نوع از رخداد در صافی جستجوی نمای جلسات
 AGENDA_DEFAULT_FILTER_STATUS=ثبت خودکار این وضعیت جلسه در صافی جستجوی نمای جلسات
-AGENDA_DEFAULT_VIEW=زبانه‌ای که به طور پیش‌فرض در هنگام باز کردن فهرست جلسات باید باز باشد
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=فعال‌کردن یادآوری رخدادها <b>توسط رایانامه</b> (توجه داشته بشید در خصوص هر رخداد گزینه‌ها/تاخیر قابل تعریف هستند). نکته:  برای ارسال با بسامد صحیح رایانامه‌های یادآوری واحد <strong>%s</strong> باید فعال بوده و به‌‌درستی پیکربندی شده باشد.
 AGENDA_REMINDER_BROWSER=فعال‌کردن یادآوری رخداد <b>روی مرورگر کاربر</b> (در هنگامی که رخداد سررسید، هر کاربر می‌تواند این کار را از طریق سوال تائید مرورگر نفی کند)
 AGENDA_REMINDER_BROWSER_SOUND=فعال‌کردن آگاهی‌رسانی صوتی
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=نمایش شیء پیوند شده به نمای جل
 ##### Clicktodial #####
 ClickToDialSetup=برپاسازی واحد کلیک برای شماره‌گیری
 ClickToDialUrlDesc=یک نشانی‌اینترنتی در هنگام کلیک بر روی نماد تلفن فراخوان می‌شود. در نشانی‌اینترنتی شما می‌توانید از برچسب‌های <br><b>__PHONETO__</b> که با شمارۀ یک شخص برای تماس است تعویض خواهد شد، <br><b>__PHONEFROM__</b> که با شمارۀ شخص تماس گیرنده (شما) تعویض خواهد شد <br><b>__LOGIN__</b> که با شناسۀ ورود clicktodial (تعریف شده در کارت کاربر) تعویض خواهد شد، <br><b>__PASS__</b> که با گذرواژۀ clicktodial (تعریف شده در کارت کاربر) تعویض خواهد شد.
-ClickToDialDesc=این واحد شماره‌تلفن‌ها را تبدیل به پیوندهای قابل کلیک می‌کند. یک کلیک روی نمادک باعث می‌شود تلفن شما شماره‌گیری کند. این قابل استفاده برای تماس با یک سامانۀ مرکزتماس از طریق Dolibarr است که می‌تواند به‌عنوان مثال از یک سامانۀ SIP تماس حاصل نماید.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=فقط یک عبارت "tel:" به پیوند شماره‌تلفن‌ها اضافه شود
 ClickToDialUseTelLinkDesc=این گزینه را برای حالتی اضافه کنید که کاربران شما یک تلفن‌مجازی یا یک رابط نرم‌افزاری روی رایانۀ خود و یا مرورگر خود نصب دارند، این نرم‌افزارها در هنگامی فراخوان خواهند شد که پیوندی با پیشوند "tel:" کلیک شود. در صورتی که شما به یک سرور تمام عیار احتیاج دارید (که نیازی به نصب نرم افزار محلی ندارد)، شما باید گزینۀ "خیر" را انتخاب کرده و بخش بعدی را پر کنید.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=این بخش حاوی ارجاعی به یک سطر شناسه ا
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=در اینجا بین دو براکت فهرست اعداد بایت‌هائی را که نمایاندۀ نماد واحدپولی است وارد نمائید. برای مثال، برای $ مقدار [36] را وارد نمائید، برای ریال برزیل R$ مقدار [82,36] و برای €، مقدار [8364]
 ColorFormat=رنگ RGB در مبنای HEX، مثال: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=مکان سطر در فهرست‌های ترکیبی
 SellTaxRate=نرخ مالیات‌برفروش
 RecuperableOnly=بله برای م‌ب‌اا "در نظر گرفته نمی‌شود اما قابل بازیابی است" که مربوط به برخی استان‌های فرانسه است. مقدار "خیر" را برای همۀ سایر شرایط حفظ کنید.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=درخواست مظنه
 MailToSendSupplierOrder=سفارشات خرید
 MailToSendSupplierInvoice=صورت‌حساب‌های فروشندگان
 MailToSendContract=قراردادها
+MailToSendReception=دریافت‌های کالا
 MailToThirdparty=طرف‌های سوم
 MailToMember=اعضا
 MailToUser=کاربران
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=سامانۀ Dolibarr مدیریت ارتب
 ExampleOfNewsMessageForMaintenanceRelease=سامانۀ Dolibarr مدیریت ارتباط با مشتری و مدیریت منابع سازمانی نسخۀ %s در دسترس است. نسخۀ %s یک نسخۀ بهبود دهنده است که این تنها به معنای رفع اشکالات است ما به همۀ کاربران توصیه می‌کنیم به این نسخه ارتقا دهند. یک نسخۀ بهبود دربردارندۀ قابلیت‌های جدید یا تغییرات در پایگاه داده نیست. شما می‌توانید از بخش download وبگاه https://www.dolibarr.org (زیرپوشۀ نسخه‌های پایدار) آن را دریافت نمائید. شما می‌توانید برای ملاحظۀ <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">فهرست کامل تغییرات گزارش کار</a> تغییرات را ببینید.
 MultiPriceRuleDesc=هنگامی که گزینۀ "چند سطح قیمت برای هر محصول/خدمات" فعال باشد شما می‌توانید برای هر محصول، چند قیمت (یکی برای هر سطح) تعریف نمائید. برای صرفه‌جوئی در زمان، شما می‌توانید قاعده‌ای برای محاسبۀ خودکار یک هر یک از این سطوح قیمتی مبنی بر قیمت سطح اول تعریف کنید و بدین‌ترتیب شما تنها قیمت سطح اول را برای هر محصول وارد خواهید نمود. این صفحه برای صرفه‌جوئی در زمان ایجاد شده است اما تنها هنگامی مؤثر است که سایر قیمت‌ها در سطوح دیگر، با سطح اولیۀ قیمت یک رابطه داشته باشند. در اکثر موارد شما می‌توانید این صفحه را نادیده بگیرید.
 ModelModulesProduct=قالب‌های مربوط به مستندات محصول
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=برای امکان تولید خودکار کدها، شما می‌توانید ابتدا یک "مدیر" مخصوص برای تعریف خودکار شمارۀ بارکد تعریف کنید.
 SeeSubstitutionVars=یادداشت * را برای فهرست متغیرهای قابل استفادۀ جایگزین نگاه کنید
 SeeChangeLog=فایل گزارش‌کار تغییرات را نگاه کنید (فقط انگلیسی است)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=فاصلۀحاشیۀ چپ PDF
 MAIN_PDF_MARGIN_RIGHT=فاصلۀحاشیۀ راست PDF
 MAIN_PDF_MARGIN_TOP=فاصلۀحاشیۀ بالای PDF
 MAIN_PDF_MARGIN_BOTTOM=فاصلۀحاشیۀ پائین PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=تنظیمات خاصی برای این واحدموردنیاز نیست
 SetToYesIfGroupIsComputationOfOtherGroups=در صورتی که این گروه جهت محاسبۀ سایر گروه‌هاست این گزینه را انتخاب کنید
 EnterCalculationRuleIfPreviousFieldIsYes=در صورتی که بخش قبلی به "بله" تنظیم شده باشد، قاعدۀ محاسبه را وارد نمائید (برای مثال 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=کاری انجام نشد
 XEmailsDoneYActionsDone=%s رایانامه دارای شرایط لازم بود، %s رایانامه با موفقیت پردازش شد ( برای %s مورد ثبت/کنش انجام شد)
 RecordEvent=ثبت رخداد رایانامه
 CreateLeadAndThirdParty=افزودن سرنخ (و شخص سوم در صورت ضرورت)
-CreateTicketAndThirdParty=ساخت برگۀ‌پشتیبانی (و شخص‌سوم در صورت ضرورت)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=آخرین کد نتیجه
 NbOfEmailsInInbox=تعداد رایانامه‌های موجود در پوشۀ منبع
 LoadThirdPartyFromName=بارگذاری جستجوی شخص‌سوم روی %s (فقط بارگذاری)
 LoadThirdPartyFromNameOrCreate=بارگذاری جستجوی شخص سوم روی %s (ساختن در صورت عدم یافتن)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=کدپستی
 MainMenuCode=کد ورودی فهرست (فهرست اصلی)
 ECMAutoTree=نمایش ساختاردرختی خودکار ECM
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=شناسۀ منحصر به‌فرد نمونه
 SmallerThan=کوچک‌تر از
 LargerThan=بزرگتر از
-IfTrackingIDFoundEventWillBeLinked=توجه کنید در صورتی که یک شناسۀ ره‌گیری در یک رایانامۀ دریافتی یافت شود، روی‌داد به طور خودکار به اشیاء مربوطه متصل خواهد شد
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=با یک حساب GMail در صورتی که تائید 2 گامی را انتخاب کرده باشید، پیشنهاد می‌شود یک گذرواژۀ دوم برای استفادۀ برنامه به‌جای گذرواژۀ خودتان برای حساب بسازید. این کار از 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index b642b0f3248..9eaf43ec4df 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=تعداد روی‌دادها
 ListOfActions=فهرست‌روی‌دادها
 EventReports=گزارش روی‌دادها
 Location=محل
-ToUserOfGroup=به همۀ کاربران این گروه
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=روی‌داد در تمام روز (ها)
 MenuToDoActions=همه روی‌دادهای ناقص
 MenuDoneActions=همۀ روی‌دادهای لغو شده
@@ -86,6 +86,8 @@ ProposalDeleted=پیشنهاد حذف شد
 OrderDeleted=سفارش حذف شد
 InvoiceDeleted=صورت‌حساب حذف شد
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=محصول %s ساخته شد
 PRODUCT_MODIFYInDolibarr=محصول %s ویرایش شد
 PRODUCT_DELETEInDolibarr=محصول %s حذف شد
@@ -158,3 +160,9 @@ DateStartPlusOne=تاریخ شروع + 1 ساعت
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 749d350f2e9..3ee603aee83 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=آخرین %s تامین کنندۀ ثبت شده
 BoxTitleLastModifiedSuppliers=فروشندگان: آخرین %s تغییریافته
 BoxTitleLastModifiedCustomers=مشتریان: آخرین %s تغییریافته
 BoxTitleLastCustomersOrProspects=آخرین %sمشتری یا مشتری‌احتمالی
-BoxTitleLastCustomerBills=آخرین %sصورت‌حساب مشتری
-BoxTitleLastSupplierBills=آخرین %s صورت‌حساب فروشنده 
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=مشتریان احتمالی: آخرین %s تغییریافته
 BoxTitleLastModifiedMembers=آخرین %s عضو
 BoxTitleLastFicheInter=آخرین %s واسطه‌گری تغییریافته
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=سفارشات به فروشنده: آخر
 BoxTitleLastModifiedCustomerBills=صورت‌حساب‌های مشتری: آخرین %s تغییریافته
 BoxTitleLastModifiedCustomerOrders=سفارشات فروش: آخرین %s تغییریافته
 BoxTitleLastModifiedPropals=آخرین %s پیشنهاد تغییریافته
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=صورت‌حساب‌های مشتریان
 ForCustomersOrders=سفارشات مشتریان
 ForProposals=پیشنهادات
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=حسابداری
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index ad309da3a2b..40313762c8d 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index 530a5514a9f..cdf21783347 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=مالیات اجتماعی و ساختاری
 SocialContributions=مالیات‌های اجتماعی و ساختاری
 SocialContributionsDeductibles=مالیات‌های اجتماعی و ساختاری کسرپذیر
 SocialContributionsNondeductibles=مالیات‌های اجتماعی و ساختاری کسرناپذیر
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=تسهیم برچسب
 TypeContrib=تسهیم نوع
 MenuSpecialExpenses=هزینه‌های ویژه
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang
index 73e45a0e539..d6f0ab88379 100644
--- a/htdocs/langs/fa_IR/contracts.lang
+++ b/htdocs/langs/fa_IR/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=خدمات در حال اجرا
 MenuExpiredServices=خدمات منقضی شده
 MenuClosedServices=خدمات متوقف شده
 NewContract=قرارداد جدید
-NewContractSubscription=قرارداد جدید/اشتراک جدید
+NewContractSubscription=New contract or subscription
 AddContract=ساخت قرارداد
 DeleteAContract=حذف یک قرارداد
 ActivateAllOnContract=فعال کردن همۀ خدما
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 3f5eef40181..3547d8ea6cb 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=مقدار جدید نمی‌تواند براب
 ErrorFailedToValidatePasswordReset=بازسازی گذرواژه مقدور نبود. ممکن است این بازسازی قبلا انجام شده باشد (این پیوند فقط یک بار قابل استفاده است). در صورتی که چنین نیست، روند بازسازی را از سر بگیرید.
 ErrorToConnectToMysqlCheckInstance=اتصال به پایگاه‌داده مقدور نیست. مطمئن شوید سرور پایگاه داده فعال است. (برای مثال، Mysql/Mariadb شما می‌توانید از خط فرمان لینوکس دستور 'sudo service mysql start' را اجرا کنید).
 ErrorFailedToAddContact=اضافه کردن طرف‌تماس مقدور نبود
-ErrorDateMustBeBeforeToday=تاریخ نمی‌تواند بیشتر از امروز باشد
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=حالت پرداخت به %s تنظیم شده اما برپاسازی واحد صورت‌حساب کامل نیست تا اطلاعات مربوط به این حالت پرداخت را تعریف کرده و نمایش دهد.
 ErrorPHPNeedModule=خطا، برای استفاده از این قابلیت روی PHP شما باید واحد <b>%s</b> نصب شده باشد.
 ErrorOpenIDSetupNotComplete=شما تنظیمات Dolibarr را پیکربندی کرده‌اید تا تصدیق ورود OpenID  را مجاز کنید، اما نشانی خدمات openID در مقدارثابت %s تعریف نشده است
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=یک گذرواژه برای این عضو تنظیم شده است. با این‌حال هیچ حساب کاربری‌ای ساخته نشده است. بنابراین این گذرواژه برای ورود به Dolibarr قابل استفاده نیست. ممکن است برای یک رابط/واحد بیرونی قابل استفاده باشد، اما اگر شما نخواهید هیچ نام کاربری ورود و گذرواژه‌ای برای یک عضو استفاده کنید، شما می‌توانید گزینۀ "ایجاد یک نام‌ورد برای هر عضو" را از برپاسازی واحد اعضاء غیرفعال کنید. در صورتی که نیاز دارید که نام‌ورود داشته باشید اما گذرواژه نداشته باشید، می‌توانید این بخش را خالی گذاشته تا از این هشدار بر حذر باشید. نکته: همچنین نشانی رایانامه می‌تواند در صورتی که عضو به یک‌کاربر متصل باشد، می‌‌تواند مورد استفاده قرار گیرد
diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang
index 5f87c5a9e14..e3a6fbcac16 100644
--- a/htdocs/langs/fa_IR/languages.lang
+++ b/htdocs/langs/fa_IR/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=عربی
 Language_ar_EG=عربی (مصر)
 Language_ar_SA=عربی
+Language_az_AZ=Azerbaijani
 Language_bn_BD=بنگالی
+Language_bn_IN=Bengali (India)
 Language_bg_BG=بلغاری
 Language_bs_BA=بوسنی
 Language_ca_ES=کاتالانی
@@ -20,6 +23,7 @@ Language_en_GB=انگلیسی بریتانیا
 Language_en_IN=انگلیسی هند
 Language_en_NZ=انگلیسی نیوزلند
 Language_en_SA=انگلیسی عربستان سعودی
+Language_en_SG=English (Singapore)
 Language_en_US=انگلیسی آمریکا
 Language_en_ZA=انگلیسی آفریقای جنوبی
 Language_es_ES=اسپانیایی
@@ -29,6 +33,7 @@ Language_es_CL=اسپانیایی (شیلی)
 Language_es_CO=اسپانیائی (کلمبیا)
 Language_es_DO=اسپانیایی (جمهوری دومینیکن)
 Language_es_EC=اسپانیائی (اکوادور)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=اسپانیایی (هندوراس)
 Language_es_MX=اسپانیایی (مکزیک)
 Language_es_PA=اسپانیائی (پاناما)
@@ -36,6 +41,7 @@ Language_es_PY=اسپانیایی پروگوئه
 Language_es_PE=اسپانیایی پرو
 Language_es_PR=اسپانیایی (پورتوریکو)
 Language_es_UY=اسپانیائی (اروگوئه)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=اسپانیائی (ونزوئلا)
 Language_et_EE=زبان استونی
 Language_eu_ES=باسک
@@ -44,15 +50,22 @@ Language_fi_FI=فنلاندی
 Language_fr_BE=فرانسوی بلژیکی
 Language_fr_CA=فرانسوی کانادا
 Language_fr_CH=فرانسوی سوییس
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=فرانسوی
+Language_fr_GA=French (Gabon)
 Language_fr_NC=فرانسه (کالدونیای جدید)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=فریسی
+Language_gl_ES=Galician
 Language_he_IL=عبری
+Language_hi_IN=Hindi (India)
 Language_hr_HR=کرواتی
 Language_hu_HU=مجارستانی
 Language_id_ID=اندونزی
 Language_is_IS=ایسلندی
 Language_it_IT=ایتالیایی
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=ژاپنی
 Language_ka_GE=گرجی
 Language_km_KH=خمر
@@ -64,6 +77,7 @@ Language_lv_LV=لتونی
 Language_mk_MK=مقدونی
 Language_mn_MN=مغولی
 Language_nb_NO=نروژی
+Language_ne_NP=Nepali
 Language_nl_BE=آلمانی نروژی
 Language_nl_NL=Dutch
 Language_pl_PL=پلندی
@@ -86,4 +100,5 @@ Language_uz_UZ=ازبک
 Language_vi_VN=ویتنامی
 Language_zh_CN=چینی
 Language_zh_TW=چینی (سنتی)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=مالائی
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index b25c03b7177..75df4395c03 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=اطلاعات
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=پاسخ داده شده
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 672210b1c09..7392e0e2498 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (با مالیات)
 Amount=مبلغ
 AmountInvoice=مبلغ صورت‌حساب
 AmountInvoiced=مبلغ صورت‌حساب شده
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=مبلغ پرداخت
 AmountHTShort=مبلغ (بدون م.)
 AmountTTCShort=مبلغ (با مالیات)
@@ -485,6 +485,7 @@ Categories=کلیدواژه‌ها/دسته‌بندی‌ها
 Category=کلیدواژه/دسته‌بندی
 By=توسط
 From=از
+FromDate=از
 FromLocation=از
 to=به
 To=به
@@ -687,6 +688,7 @@ Method=روش
 Receive=دریافت
 CompleteOrNoMoreReceptionExpected=کامل‌شده یا در انتظار چیز دیگری نیست
 ExpectedValue=مقدار مورد انتظار
+ExpectedQty=Expected Qty
 PartialWoman=جزئی
 TotalWoman=کل
 NeverReceived=هرگز دریافت نشده
@@ -703,6 +705,7 @@ MenuECM=اسناد
 MenuAWStats=AWStats
 MenuMembers=اعضاء
 MenuAgendaGoogle=دستورکار گوگل
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=محدودیت Dolibarr  (فهرست خانه-برپاسازی-امنیت):  %s کیلوبایت، محدودیت PHP برابر با: %s کیلوبایت
 NoFileFound=هیچ سندی در این پوشه ذخیره نشده است
 CurrentUserLanguage=زبان کنونی
@@ -725,7 +728,7 @@ Page=صفحه
 Notes=یادداشت‌ها
 AddNewLine=افزودن سطرجدید
 AddFile=افزودن فایل
-FreeZone=یک محصول/خدمات ازپیش‌تعریف شده نیست
+FreeZone=Free-text product
 FreeLineOfType=عنوان با متن دلخواه - نوع :
 CloneMainAttributes=نسخه‌برداری از شیء با ویژگی‌های اصلی آن
 ReGeneratePDF=بازتولید PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=یک قالب رایانامه انتخاب کنید
 SetRef=تنظیم ارجا
 Select2ResultFoundUseArrows=نتیجه‌هائی پیدا شد. از کلیدهای جهت برای انتخاب استفاده کنید.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=اطلاعات
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index 6ad9abfb8a2..b729941a1c7 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=عضو پیش نویس
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=معتبر شد
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=سهم های جدید
 PaymentSubscription=پرداخت سهم جدید
 SubscriptionEndDate=تاریخ پایان اشتراک در
@@ -78,7 +81,7 @@ DeleteType=حذف کردن
 VoteAllowed=رای اجازه
 Physical=فیزیکی
 Moral=اخلاقی
-MorPhy=با اخلاق / فیزیکی
+MorPhy=طبیعت
 Reenable=را دوباره فعال کنید
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/fa_IR/mrp.lang b/htdocs/langs/fa_IR/mrp.lang
index b7189492a94..74aa70bfac9 100644
--- a/htdocs/langs/fa_IR/mrp.lang
+++ b/htdocs/langs/fa_IR/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=بخش برنامه‌ریزی مواد اولیه
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index bb6ea1ec8a9..8bd88a5db5d 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index d0044c00125..64c5b787fb4 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=تنظیم نوع بارکد
 BarcodeValue=مقدار بارکد
 NoteNotVisibleOnBill=یادداشت (در صورت‌حساب‌ها، پیشنهادها و غیره نمایش داده نمی‌شود)
 ServiceLimitedDuration=در صورتی که محصول، خدماتی با مدت‌زمان محدود است:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=چند قسمت قیمتی در هر محصول/خدمات (هر مشتری در یک قسمت قیمتی است)
 MultiPricesNumPrices=تعداد قیمت‌ها
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=قیمت‌های فروشنده (مربوط
 CustomCode=گمرک / کالا / کدبندی هماهنگ کالا
 CountryOrigin=کشور مبدا
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=برچسب کوتاه
 Unit=واحد
 p=واحد
@@ -359,6 +362,9 @@ SelectCombination=انتخاب یک ترکیب
 ProductCombinationGenerator=تولیدکننده انواع
 Features=قابلیت‌ها
 PriceImpact=تاثیر قیم
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=تاثیر وزن
 NewProductAttribute=ویژگی های جدید
 NewProductAttributeValue=نوع جدید ویژگی
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 174acca3b5f..4f56d44dcf4 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=مشارکت کننده
 TypeContact_project_task_external_TASKCONTRIBUTOR=مشارکت کننده
 SelectElement=انتخاب عنصر
 AddElement=پیوند به عنصر
+LinkToElementShort=پیوند به
 # Documents models
 DocumentModelBeluga=مستند قالبی طرح برای پیش‌نمایش اشیاء پیوند شده
 DocumentModelBaleine=مستند قالبی طرح برای وظایف
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=تعداد طرح‌های ساخته شده در ماه
 ProjectNbTaskByMonth=تعداد وظایف ساخته شده در ماه
 ProjectOppAmountOfProjectsByMonth=مبلغ سرنخ‌ها در ماه
 ProjectWeightedOppAmountOfProjectsByMonth=مبلغ متوازن سرنخ‌ها در ماه
-ProjectOpenedProjectByOppStatus=بازکردن طرح/سرنخ برحسب وضعیت سرنخ
-ProjectsStatistics=آمار برای طرح‌ها/سرنخ‌ها
-TasksStatistics=آمار برای وظایف طرح‌ها/سرنخ‌ها
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=وظیفه محول شد. وارد کردن زمان به این وظیفه باید ممکن باشد.
 IdTaskTime=شناسۀ زمان وظیفه
 YouCanCompleteRef=اگر بخواهید عبارت ارجاع را با پس‌وند تکمیل کنید، پیشنهاد می‌شود یک نویسۀ خط‌فاصله - برای جدا کردن آن استفاده کنی،  که شماره‌گذاری خودکار برای طرح‌های بعدی نیز به درستی کار کند. برای مثال %s-پس‌وند من
diff --git a/htdocs/langs/fa_IR/recruitment.lang b/htdocs/langs/fa_IR/recruitment.lang
new file mode 100644
index 00000000000..f8aab043f93
--- /dev/null
+++ b/htdocs/langs/fa_IR/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = تنظیمات
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = درباره
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 2740c8d9190..9542e4071fb 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=حذف جابجائی
 Stock=موجودی
 Stocks=موجودی
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=موجودی به‌واسطۀ سری‌ساخت/شماره‌سری
@@ -95,14 +95,16 @@ RealStock=موجودی واقعی
 RealStockDesc=موجودی فیزیکی/واقعی موجودی‌هائی هستند که اکنون در انبارها وجود دارند.
 RealStockWillAutomaticallyWhen=موجودی واقعی با توجه به این قاعده ویرایش خواهد شد (طوری که در واحد موجودی تعریف شده است):
 VirtualStock=موجودی مجازی
-VirtualStockDesc=موجودی مجازی، موجودی محاسبه شده‌ای است که در هنگام بسته شدن همۀ کنش‌های باز/درحال‌انجام (که روی موجودی اثر دارند) در دسترس خواهد بود. (یعنی پس از دریافت سفارش‌های خرید، پس از حمل سفارشات فروش و غیره).
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=شناسۀ انبار
 DescWareHouse=توضیحات مربوط به انبار
 LieuWareHouse=محل انبار
 WarehousesAndProducts=انبارها و محصولا
 WarehousesAndProductsBatchDetail=انبارها و محصولات (با جزئیات مربوط به سری‌ساخت/سریال)
-AverageUnitPricePMPShort=قیمت ورودی متوازن میانگین
-AverageUnitPricePMP=قیمت ورودی متوازن میانگین
+AverageUnitPricePMPShort=قیمت میانگین متوازن
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=قیمت فروش واحد
 EstimatedStockValueSellShort=مقدار برای فروش
 EstimatedStockValueSell=مقدار برای فروش
@@ -141,7 +143,7 @@ Replenishments=دوباره‌پر‌کردن
 NbOfProductBeforePeriod=تعداد موجودی %s پیش از بازۀ انتخابی (< %s)
 NbOfProductAfterPeriod=تعداد موجودی  %s پس از بازۀ انتخابی (> %s)
 MassMovement=جابجائی انبوه
-SelectProductInAndOutWareHouse=یک محصول، مقدار و یک انبار مبدأ و یک انبار مقصد انتخاب کنید، سپس بر روی "%s" کلیک نمائید. پس از انجام این‌کار برای همۀ جابجائی‌هائی مورد نیاز، بر روی "%s" کلیک نمائید.
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=ثبت جابجائی
 ReceivingForSameOrder=رسیدهای این سفارش
 StockMovementRecorded=جابجائی موجودی‌ها ثبت شد
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index d7e7773f461..56671fe59be 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=کم کیفیت
 ReputationForThisProduct=اعتبار
 BuyerName=نام خریدار
 AllProductServicePrices=همۀ قیمت‌های محصولات/خدمات
-AllProductReferencesOfSupplier=ارجاع همۀ محصولات / خدمات فرونشده
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=قیمت‌های فروشنده
diff --git a/htdocs/langs/fa_IR/ticket.lang b/htdocs/langs/fa_IR/ticket.lang
index 32be25bf695..a1ad4eacc4e 100644
--- a/htdocs/langs/fa_IR/ticket.lang
+++ b/htdocs/langs/fa_IR/ticket.lang
@@ -72,7 +72,6 @@ Deleted=حذف شده
 
 # Dict
 Type=نوع
-Category=کد Analytic
 Severity=حساسیت
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=نسبت دادن خودکار کاربری که برگ
 TicketsAutoAssignTicketHelp=در هنگام ساخت برگۀ‌پشتیبانی، کاربر می‌تواند به شکل خودکار به برگه نسبت داده شود
 TicketNumberingModules=واحد شماره‌دهی برگه‌های پشتیبانی
 TicketNotifyTiersAtCreation=اطلاع‌رسانی به شخص‌سوم در هنگام ساخت
-TicketGroup=گروه
 TicketsDisableCustomerEmail=همواره در هنگامی که یک برگۀ‌پشتیبانی از طریق رابط عمومی ساخته می‌شود، قابلیت رایانامه غیرفعال شود
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=ساخته‌شده توسط
 NewTicket=برگۀ جدید
 SubjectAnswerToTicket=پاسخ برگه
 TicketTypeRequest=نوع درخواست
-TicketCategory=کد Analytic
+TicketCategory=گروه
 SeeTicket=نمایش برگه
 TicketMarkedAsRead=برگه به صورت خوانده شده علامت‌گذاری شد
 TicketReadOn=خواندن
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index 012f6b0d90a..72e544afadd 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=کاربری که ایجاد می‌شود یک کارب
 IdPhoneCaller=شناسۀ تماس‌گیرنده تلفن
 NewUserCreated=کاربر %s ساخته شد
 NewUserPassword=گذرواژه برای %s تغییر یافت
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=کاربر %s تغییر یافت
 UserDisabled=کاربر %s ناپویا شد
 UserEnabled=کاربر %s پویا شد.
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=غیرفعال در حالت نگهداری‌و‌تعم
 UserAccountancyCode=کد حساب‌داری کاربر
 UserLogoff=خروج کاربر
 UserLogged=کاربر وارد شده
+DateOfEmployment=Employment date
 DateEmployment=تاریخ شروع استخدام
 DateEmploymentEnd=تاریخ پایان استخدام
 CantDisableYourself=شما نمی‌توانید ردیف کاربری خود را غیرفعال کنید
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index 9a1b0130009..5c0b517c19a 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=سفارش‌های برداشت مستقیم
 WithdrawalReceipt=سفارش برداشت مستقیم
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=آخرین %s مستند دریافت مستقیم
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=انتظار
 StatusTrans=فرستاده
+StatusDebited=Debited
 StatusCredited=اعتبار
+StatusPaid=پرداخت‌شده
 StatusRefused=رد
 StatusMotif0=نامشخص
 StatusMotif1=منابع مالی ناکافی
@@ -77,13 +79,13 @@ StatusMotif8=دلیل دیگر
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=تنها دفتر
 CreateBanque=تنها بانک
 OrderWaiting=در انتظار درمان
-NotifyTransmision=برداشت انتقال
-NotifyCredit=برداشت اعتباری
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=شماره ملی فرستنده
 WithBankUsingRIB=برای حساب های بانکی با استفاده از RIB
 WithBankUsingBANBIC=برای حساب های بانکی با استفاده از IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=در اعتباری
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=فایل برداشت
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=تنظیم به وضعیت "فایل ارسال شد"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=مقدار:٪ s را <br> روش: از٪ s <br> تاریخ:٪ s ر
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=انتخاب برای حالت واقعی تنظیم نشده بود، ما بعد از این شبیه سازی را متوقف کند
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/fa_IR/workflow.lang b/htdocs/langs/fa_IR/workflow.lang
index 527acaf70d2..d3fc0934cf1 100644
--- a/htdocs/langs/fa_IR/workflow.lang
+++ b/htdocs/langs/fa_IR/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=راه اندازی ماژول گردش کار
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/fa_IR/zapier.lang b/htdocs/langs/fa_IR/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/fa_IR/zapier.lang
+++ b/htdocs/langs/fa_IR/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 5533700c09f..a702faa322c 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Myyntipäiväkirja
 ACCOUNTING_PURCHASE_JOURNAL=Ostopäiväkirja
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Täsmäyttämätön
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 0d0986dcaea..221c3dd5919 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Oletussähköpostiosoite käsin lähetettäessä (Kä
 UserEmail=Käyttäjän sähköposti
 CompanyEmail=Yrityksen sähköposti
 FeatureNotAvailableOnLinux=Ominaisuus ei ole Unix-koneissa. Testaa sendmail ohjelmaa paikallisesti.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Moduuli asetukset
 ModulesSetup=Moduulit/Applikaatio asetukset
 ModuleFamilyBase=Järjestelmä
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Avain turvallinen URL
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Yleiset asetukset PDF: n luontiin
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Piilota kaikki myyntiveroihin/ALViin liittyvä tieto
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Käynnistä massamuutos
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Merkkijono
+String1Line=String (1 line)
 TextLong=Pitkä teksti
+TextLongNLines=Long text (n lines)
 HtmlText=Html teksti
 Int=Kokonaisluku
 Float=Liukuluku
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Viivakoodit
 Module55Desc=Viivakoodien hallinta
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial yhdentyminen
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Luo/Muokkaa palveluita
 Permission534=Poista palvelut
 Permission536=Katso / hoitaa piilotettu palvelut
 Permission538=Vienti palvelut
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Lue materiaaliluettelo
 Permission651=Luo/päivitä materiaaliluettelo
 Permission652=Poista materiaaliluettelo
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Lue lahjoitukset
 Permission702=Luoda / muuttaa lahjoitusten
 Permission703=Poista lahjoitukset
@@ -848,6 +858,8 @@ Permission773=Poista kuluraportit
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Hyväksy kuluraportit
 Permission776=Maksa kuluraportit
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Kuluraporttien vienti
 Permission1001=Lue varastot
 Permission1002=Luo/muuta varastoja
@@ -900,6 +912,7 @@ Permission2515=Asiakirjojen hakemistoasetukset
 Permission2801=Käytä FTP ohjelmaa lukutilassa (vain selain ja lataukset)
 Permission2802=Käytä FTP ohjelmaa kirjoitustilassa (poista tai päivitä tiedostot)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=Selaa työntekijöitä
 Permission4002=Luo työntekijä
 Permission4003=Poista työntekijöitä
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospekti potentiaali
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Alueiden
 DictionaryCountry=Maat
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Mallisähköpostit
 DictionaryUnits=Yksiköt
 DictionaryMeasuringUnits=Mittayksiköt
 DictionarySocialNetworks=Sosiaaliset verkostot
-DictionaryProspectStatus=Prospektin tila
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Vapaan tyyppi
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Kirjautumissivu
 BackgroundImageLogin=Taustakuva
 PermanentLeftSearchForm=Pysyvä hakulomake vasemmassa valikossa
 DefaultLanguage=Oletuskieli
-EnableMultilangInterface=Usean kielen tuki
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Näytä yrityksen logo valikossa
 CompanyInfo=Yritys/Organisaatio
 CompanyIds=Yrityksen/Organisaation tiedot
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Sinulla pitää olla ainakin 1 moduuli käytössä
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Ota käyttöön ilmoitusäänet
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial'-moduulin asetukset
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Myynnin veroprosentti
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Tarjouspyyntö
 MailToSendSupplierOrder=Ostotilaukset
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Sopimukset
+MailToSendReception=Receptions
 MailToThirdparty=Sidosryhmät
 MailToMember=Jäsenet
 MailToUser=Käyttäjät
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Mallipohjat tuotedokumentaatiolle
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=PDF:n vasen marginaali
 MAIN_PDF_MARGIN_RIGHT=PDF:n oikea marginaali
 MAIN_PDF_MARGIN_TOP=PDF:n ylämarginaali
 MAIN_PDF_MARGIN_BOTTOM=PDF:n alamarginaali
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Postinumero
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Instanssin ID
 SmallerThan=Pienempi kuin
 LargerThan=Suurempi kuin
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index d9757084740..979cc048c3c 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=Luettelo tapahtumista
 EventReports=Event reports
 Location=Sijainti
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Tapahtuma on koko päivä
 MenuToDoActions=Kaikki puutteelliset toimet
 MenuDoneActions=Kaikki irti toimia
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Lasku poistettu
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index 0f33f5000ad..a63ed303fb5 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -1,54 +1,54 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLoginInformation=Login Information
-BoxLastRssInfos=RSS Information
-BoxLastProducts=Latest %s Products/Services
-BoxProductsAlertStock=Stock alerts for products
-BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest Vendor invoices
-BoxLastCustomerBills=Latest Customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid vendor invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
+BoxLastRssInfos=RSS tiedot
+BoxLastProducts=Viimeisimmät %sTuotteet/Palvelut
+BoxProductsAlertStock=Tuotteiden saldohälytykset
+BoxLastProductsInContract=Viimeisimmät %ssopimukset tuotteista/palveluista
+BoxLastSupplierBills=Viimeisimmät ostolaskut
+BoxLastCustomerBills=Viimeisimmät laskut
+BoxOldestUnpaidCustomerBills=Vanhimmat avoimet laskut
+BoxOldestUnpaidSupplierBills=Vanhimmat avoimet ostolaskut
+BoxLastProposals=Viimeisimmät tarjoukset
+BoxLastProspects=Viimeisimmät käsitellyt prospektit
+BoxLastCustomers=Viimeisimmät käsitellyt asiakkaat
+BoxLastSuppliers=Viimeisimmät käsitellyt toimittajat
 BoxLastCustomerOrders=Viimeisimmät myyntitilaukset
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Products/Services: last %s modified
-BoxTitleProductsAlertStock=Products: stock alert
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Vendors: last %s modified
-BoxTitleLastModifiedCustomers=Customers: last %s modified
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxLastActions=Viimeisimmät käsittelyt
+BoxLastContracts=Viimeisimmät sopimukset
+BoxLastContacts=Viimeisimmät käsitellyt yhteystiedot
+BoxLastMembers=Viimeisimmät käyttäjät
+BoxFicheInter=Viimeisimmät välitykset
+BoxCurrentAccounts=Avoimet saatavat yhteensä
+BoxTitleMemberNextBirthdays=Käyttäjien syntymäpäivät tässä kuussa
+BoxTitleLastRssInfos=Viimeisimmät %s uutiset %s
+BoxTitleLastProducts=Tuotteet/Palvelut: viimeisimmät %s muokatut
+BoxTitleProductsAlertStock=Tuotteet: saldohälytys
+BoxTitleLastSuppliers=Toimittajat: viimeisimmät %stallennetut 
+BoxTitleLastModifiedSuppliers=Toimittajat: viimeisimmät %s muokatut 
+BoxTitleLastModifiedCustomers=Asiakkaat: viimeisimmät %smuokatut 
+BoxTitleLastCustomersOrProspects=Viimeisimmät %s asiakkaat tai prospektit
+BoxTitleLastCustomerBills=Viimeisimmät %s muokatut myyntilaskut
+BoxTitleLastSupplierBills=Viimeisimmät %s muokatut ostolaskut
+BoxTitleLastModifiedProspects=Prospektit: viimeisimmät %s muokatut
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Customer Invoices: oldest %s unpaid
+BoxTitleOldestUnpaidCustomerBills=Asiakaslaskut: vanhimmat %s maksamattomat
 BoxTitleOldestUnpaidSupplierBills=Vendor Invoices: oldest %s unpaid
-BoxTitleCurrentAccounts=Open Accounts: balances
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
+BoxTitleCurrentAccounts=Avoimet asiakkaittain
+BoxTitleSupplierOrdersAwaitingReception=Saavutusta odottavat tilaukset
+BoxTitleLastModifiedContacts=Kontaktit/Osoitteet: viimeisimmät %s muokatut
 BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Vanhimat aktiiviset päättyneet palvelut
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
 BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxTitleLastModifiedExpenses=Viimeisimmät %s muokatut matka- ja kuluraportit
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
 BoxGlobalActivity=Yleisaktiviteetit (laskut, ehdotukset, tilaukset)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
+BoxGoodCustomers=Hyvät asiakkaat
+BoxTitleGoodCustomers=%s Hyvät asiakkaat
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
 LastRefreshDate=Latest refresh date
 NoRecordedBookmarks=Kirjanmerkkejä ei ole määritelty.
@@ -70,9 +70,9 @@ NoRecordedInterventions=Ei tallennettuja väliintuloja
 BoxLatestSupplierOrders=Latest purchase orders
 BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
 NoSupplierOrder=No recorded purchase order
-BoxCustomersInvoicesPerMonth=Customer Invoices per month
-BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
-BoxCustomersOrdersPerMonth=Sales Orders per month
+BoxCustomersInvoicesPerMonth=Myyntilaskut per kk
+BoxSuppliersInvoicesPerMonth=Ostolaskut per kk
+BoxCustomersOrdersPerMonth=Myyntitilaukset per kk
 BoxSuppliersOrdersPerMonth=Vendor Orders per month
 BoxProposalsPerMonth=Mahdollisuutta kuukausittain
 NoTooLowStockProducts=No products are under the low stock limit
@@ -83,12 +83,14 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Viimeisimmät %s muokatut tarjoukset
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Asiakkaiden laskut
 ForCustomersOrders=Asiakkaiden tilaukset
 ForProposals=Ehdotukset
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard
-BoxAdded=Widget was added in your dashboard
+ChooseBoxToAdd=Lisää dashboardiin
+BoxAdded=Lisätty dashboardiin
 BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
 BoxLastManualEntries=Last manual entries in accountancy
 BoxTitleLastManualEntries=%s latest manual entries
@@ -97,6 +99,8 @@ BoxSuspenseAccount=Count accountancy operation with suspense account
 BoxTitleSuspenseAccount=Number of unallocated lines
 NumberOfLinesInSuspenseAccount=Number of line in suspense account
 SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
+BoxLastCustomerShipments=Viimeisimmät asiakastoimitukset
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Kirjanpito
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 3297976168b..3cb4a43d36f 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 88b914cd030..a4dbebfc263 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Erityismenot (Verot, sosiaaliturvamaksut ja osingot)
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang
index 99929266f57..2b1ebbc8517 100644
--- a/htdocs/langs/fi_FI/contracts.lang
+++ b/htdocs/langs/fi_FI/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Käynnissä olevat palvelut
 MenuExpiredServices=Lakkaa palvelut
 MenuClosedServices=Suljetut palvelut
 NewContract=Uusi sopimus
-NewContractSubscription=Uusi sopimus/ jatkuva tilaus
+NewContractSubscription=New contract or subscription
 AddContract=Luo sopimus
 DeleteAContract=Poista sopimuksen
 ActivateAllOnContract=Aktivoi kaikki palvelut
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index c9c67dc59b5..90dc974eeeb 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Yhteystiedon lisääminen epäonnistui
-ErrorDateMustBeBeforeToday=Päivämäärä ei voi olla isompi kuin tämä päivämäärä
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/fi_FI/languages.lang b/htdocs/langs/fi_FI/languages.lang
index 9ad78570230..51d52f45896 100644
--- a/htdocs/langs/fi_FI/languages.lang
+++ b/htdocs/langs/fi_FI/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabia
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarialainen
 Language_bs_BA=Bosnian
 Language_ca_ES=Katalaani
@@ -20,6 +23,7 @@ Language_en_GB=Englanti (Yhdistynyt kuningaskunta)
 Language_en_IN=Englanti (Intia)
 Language_en_NZ=Englanti (Uusi-Seelanti)
 Language_en_SA=Englanti (Saudi-Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=Englanti (Yhdysvallat)
 Language_en_ZA=Englanti (Etelä-Afrikka)
 Language_es_ES=Espanjalainen
@@ -29,6 +33,7 @@ Language_es_CL=Espanja (Chile)
 Language_es_CO=Espanja (Kolumbia)
 Language_es_DO=Espanja (Dominikaaninen tasavalta)
 Language_es_EC=Espanja (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Espanja (Honduras)
 Language_es_MX=Espanja (Meksiko)
 Language_es_PA=Espanja (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Espanja (Paraguay)
 Language_es_PE=Espanja (Peru)
 Language_es_PR=Espanja (Puerto Rico)
 Language_es_UY=Espanja (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Espanja (Venezuela)
 Language_et_EE=Virolainen
 Language_eu_ES=Baski
@@ -44,15 +50,22 @@ Language_fi_FI=Suomi
 Language_fr_BE=Ranska (Belgia)
 Language_fr_CA=Ranska (Kanada)
 Language_fr_CH=Ranska (Sveitsi)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Ranskalainen
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Ranskan (Uusi-Kaledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Heprea
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Kroaatti
 Language_hu_HU=Unkari
 Language_id_ID=Indonesian
 Language_is_IS=Islannin
 Language_it_IT=Italialainen
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanin kieli
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvia
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norja (bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Hollanti (Belgia)
 Language_nl_NL=Dutch
 Language_pl_PL=Puola
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbekki
 Language_vi_VN=Vietnam
 Language_zh_CN=Kiinalainen
 Language_zh_TW=Kiina (perinteinen)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index 005cf01f18a..c327a9bc3c9 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 509b865b458..9000c0a2800 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=Verollinen hinta
 Amount=Määrä
 AmountInvoice=Laskun summa
 AmountInvoiced=Laskutettu summa
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Maksun summa
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Määrä (sis. alv)
@@ -485,6 +485,7 @@ Categories=Tagit/luokat
 Category=Tagi/luokka
 By=Mennessä
 From=Mistä
+FromDate=Laskuttaja
 FromLocation=Laskuttaja
 to=on
 To=on
@@ -687,6 +688,7 @@ Method=Menetelmä
 Receive=Vastaanota
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Odotettu Arvo
+ExpectedQty=Expected Qty
 PartialWoman=Osittainen
 TotalWoman=Yhteensä
 NeverReceived=Ei ole saapunut
@@ -703,6 +705,7 @@ MenuECM=Asiakirjat
 MenuAWStats=AWStats
 MenuMembers=Jäsenet
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr raja (Valikko koti-setup-turvallisuus): %s Kb, PHP raja: %s Kb
 NoFileFound=Ei asiakirjoja tallennettuna tähän hakemistoon
 CurrentUserLanguage=Nykyinen kieli
@@ -725,7 +728,7 @@ Page=Sivu
 Notes=Huomiot
 AddNewLine=Lisää uusi rivi
 AddFile=Lisää tiedosto
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Klooni objekti sen tärkeimmät attribuutit
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=TO
 ShortFriday=PE
 ShortSaturday=LA
 ShortSunday=SU
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Valitse sähköpostipohja
 SetRef=Aseta viite
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index aee1b053fec..06fa737473e 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Luonnos jäseniä
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Hyväksytty
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Uusi rahoitusosuus
 PaymentSubscription=Uusi osuus maksu
 SubscriptionEndDate=Tilaus päättymispäivämäärän
@@ -78,7 +81,7 @@ DeleteType=Poistaa
 VoteAllowed=Äänestys sallittua
 Physical=Fyysinen
 Moral=Moraalinen
-MorPhy=Moraalinen / Fysikaaliset
+MorPhy=Luonto
 Reenable=Ottaa ne uudelleen
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/fi_FI/mrp.lang b/htdocs/langs/fi_FI/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/fi_FI/mrp.lang
+++ b/htdocs/langs/fi_FI/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index f60df123de9..4a6a9b8c6c6 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 314f6263b73..bf71d42d33f 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Aseta viivakoodin tyyppi
 BarcodeValue=Viivakoodin arvo
 NoteNotVisibleOnBill=Huomautus (ei näy laskuissa ehdotuksia ...)
 ServiceLimitedDuration=Jos tuote on palvelu, rajoitettu kesto:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Hintojen lukumäärä
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Alkuperämaa
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Yksikkö
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Valitse yhdistelmä
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Uusi ominaisuus
 NewProductAttributeValue=Uuden ominaisuuden arvo
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 352da42faad..36d5e4a6d8b 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Avustaja
 TypeContact_project_task_external_TASKCONTRIBUTOR=Avustaja
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Linkki
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/fi_FI/recruitment.lang b/htdocs/langs/fi_FI/recruitment.lang
new file mode 100644
index 00000000000..7451732ec87
--- /dev/null
+++ b/htdocs/langs/fi_FI/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Asetukset
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Yleisesti
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 48e248486ca..217e28589fb 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Poista lähettäminen
 Stock=Kanta
 Stocks=Varastot
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Varastossa
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual varastossa
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id-varasto
 DescWareHouse=Kuvaus varasto
 LieuWareHouse=Lokalisointi varasto
 WarehousesAndProducts=Varastot ja tuotteet
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Keskimääräiset tulohintajärjestelmää
-AverageUnitPricePMP=Keskimääräiset tulohintajärjestelmää
+AverageUnitPricePMPShort=Value
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Myynnin Yksikköhinta
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index 00666f6625a..e928b322281 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Maine
 BuyerName=Ostajan nimi
 AllProductServicePrices=Kaikkien tuotteiden / palveluiden hinnat
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/fi_FI/ticket.lang b/htdocs/langs/fi_FI/ticket.lang
index 631ebfa2572..d25c38981fc 100644
--- a/htdocs/langs/fi_FI/ticket.lang
+++ b/htdocs/langs/fi_FI/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Tyyppi
-Category=Analytic code
 Severity=Vakavuus
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Ryhmä
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Luonut
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Ryhmä
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Jatka lukemista
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index 780bb758259..bc2fe0013df 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Luotu käyttäjä tulee ulkopuolinen käyttäjä (koska l
 IdPhoneCaller=Id puhelimeen soittajan
 NewUserCreated=Käyttäjä %s on luotu
 NewUserPassword=Salasana muutos %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Käyttäjän %s muuntamattomat
 UserDisabled=Käyttäjän %s pois päältä
 UserEnabled=Käyttäjän %s aktivoitu
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 62a312ab2eb..aba0cc2a0cc 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Suoraveloitus tilaus
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Odottaa
 StatusTrans=Lähetetty
+StatusDebited=Debited
 StatusCredited=Hyvitetty
+StatusPaid=Maksettu
 StatusRefused=Hylätty
 StatusMotif0=Määrittelemätön
 StatusMotif1=Säännös insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=Muu syy
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Vain toimisto
 CreateBanque=Vain pankki
 OrderWaiting=Odottelen hoito
-NotifyTransmision=Irtisanominen Lähetetty
-NotifyCredit=Irtisanominen Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Kansallinen lähetin määrä
 WithBankUsingRIB=Jos pankkitilit käyttäen RIB
 WithBankUsingBANBIC=Jos pankkitilit käyttäen IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Luottoa
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Määrä: %s <br> Metode: %s <br> Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Vaihtoehto todellista tilaa ei ole asetettu, pysähdymme jälkeen simulointi
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/fi_FI/workflow.lang b/htdocs/langs/fi_FI/workflow.lang
index 5a947b361bb..6fe6bba4b8b 100644
--- a/htdocs/langs/fi_FI/workflow.lang
+++ b/htdocs/langs/fi_FI/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automaattinen luonti
 AutomaticClassification=Automaattinen luokitus
diff --git a/htdocs/langs/fi_FI/zapier.lang b/htdocs/langs/fi_FI/zapier.lang
index 2a84e392559..4465a404aee 100644
--- a/htdocs/langs/fi_FI/zapier.lang
+++ b/htdocs/langs/fi_FI/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier Dolibarr-moduulille
 # Admin page
 #
 ZapierForDolibarrSetup = Zapier Dolibarr:lle asetukset
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 3d058e6b61d..5d24a311ccd 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -14,7 +14,6 @@ WarningModuleNotActive=Le module <b>%s</b> doit être activé
 WarningOnlyPermissionOfActivatedModules=Seules les permissions liées à des modules activés sont montrées ici. Vous pouvez activer d'autres modules sur la page Accueil->Configuration->Modules.
 FormToTestFileUploadForm=Formulaire pour tester l'upload de fichiers (selon la configuration)
 IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 Module20Name=Propales
 Module30Name=Factures
 Target=Objectif
diff --git a/htdocs/langs/fr_BE/cashdesk.lang b/htdocs/langs/fr_BE/cashdesk.lang
deleted file mode 100644
index 8990ec63d62..00000000000
--- a/htdocs/langs/fr_BE/cashdesk.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index e425c275844..3042af1642f 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -19,7 +19,6 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
 Update=Mise à jour
 DateStart=Date de début
 DateEnd=Date de fin
diff --git a/htdocs/langs/fr_BE/stocks.lang b/htdocs/langs/fr_BE/stocks.lang
new file mode 100644
index 00000000000..0cf57e3a1c3
--- /dev/null
+++ b/htdocs/langs/fr_BE/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_BE/website.lang b/htdocs/langs/fr_BE/website.lang
deleted file mode 100644
index ff992a2be9e..00000000000
--- a/htdocs/langs/fr_BE/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/fr_BE/withdrawals.lang b/htdocs/langs/fr_BE/withdrawals.lang
index c6b0130cce6..eb336cadcc0 100644
--- a/htdocs/langs/fr_BE/withdrawals.lang
+++ b/htdocs/langs/fr_BE/withdrawals.lang
@@ -1,5 +1,2 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
 StatusTrans=Envoyé
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 09df3da74ad..a0f940824b8 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -39,7 +39,6 @@ CompatibleAfterUpdate=Ce module nécessite une mise à jour de votre Dolibarr %s
 SeeInMarkerPlace=Voir dans Market place
 Updated=Mis à jour
 AchatTelechargement=Acheter / Télécharger
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 DevelopYourModuleDesc=Quelques solutions pour développer votre propre module ...
 InstrucToEncodePass=Pour chiffrer le mot de passe de la base dans le fichier de configuration <b>conf.php</b>, remplacer la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>par<br><b>$dolibarr_main_db_pass="%s"</b>
@@ -51,7 +50,6 @@ EMailsSetup=Configuration des courriels
 EmailSenderProfiles=Profils d'expéditeurs d'e-mails
 MAIN_MAIL_FORCE_SENDTO=Envoyer tous les emails à (au lieu des destinataires réels, à des fins de test)
 UserEmail=Courrier électronique de l'utilisateur
-SubmitTranslationENUS=Si la traduction de cette langue est incomplète ou vous trouvez des erreurs , vous pouvez corriger cela en modifiant les fichiers dans le répertoire <b> langs/%s </b> et soumettre les fichiers modifiés sur dolibarr.org/forum ou pour les développeurs sur github.com/Dolibarr/dolibarr.
 ModulesSetup=Modules / Configuration de l'application
 ModuleFamilyHr=Gestion des ressources humaines (GRH)
 ModuleFamilyInterface=Interfaces avec les systèmes externes
@@ -120,11 +118,9 @@ Permission23004=Exécuté Travail planifié
 Permission59001=Consulter les propositions commerciales
 Permission63002=Créer / modifier des ressources
 Permission63004=Relier les ressources aux événements de l'agenda
-DictionaryProspectLevel=Potentiel du prospect
 DictionaryActions=Types d'événements de l'agenda
 DictionaryVAT=Taux de TPS/TVH ou de Taxes de Ventes
 DictionaryAccountancyJournal=Revues comptables
-DictionaryProspectStatus=Status prospection
 SetupNotSaved=Le programme d'installation n'a pas été enregistré
 CurrentNext=Actuel / Suivant
 DefaultMaxSizeList=Longueur maximale des listes
@@ -146,7 +142,6 @@ TranslationString=Chaîne de traduction
 WarningAtLeastKeyOrTranslationRequired=Un critère de recherche est requis au moins pour une clé ou une chaîne de traduction
 NewTranslationStringToShow=Nouvelle chaîne de traduction à afficher
 OriginalValueWas=La traduction originale est écrasée. La valeur d'origine était: <br> <br> %s
-TotalNumberOfActivatedModules=Application / modules activés: <b>%s</b> / <b>%s</b>
 SearchOptim=Optimization des recherches
 PasswordGenerationPerso=Retour un mot de passe en fonction de votre configuration personnellement défini.
 PasswordPatternDesc=Description du modèle de mot de passe
diff --git a/htdocs/langs/fr_CA/agenda.lang b/htdocs/langs/fr_CA/agenda.lang
index 152de6fe0e9..94cf4102fab 100644
--- a/htdocs/langs/fr_CA/agenda.lang
+++ b/htdocs/langs/fr_CA/agenda.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - agenda
-ToUserOfGroup=À n'importe quel utilisateur du groupe
 NewCompanyToDolibarr=Le tiers %s a été créé
 PropalClassifiedBilledInDolibarr=Proposition %s classée facturée
 InvoicePaidInDolibarr=La facture %s a changé en payé
@@ -13,6 +12,7 @@ OrderCreatedInDolibarr=L'ordre %s a été créé
 OrderDeliveredInDolibarr=Commande %s classée Délivrée
 ProposalDeleted=Proposition supprimée
 AgendaModelModule=Modèles de document pour l'événement
+AgendaUrlOptions1=Vous pouvez aussi ajouter les paramètres suivants pour filtrer les réponses :
 AgendaShowBirthdayEvents=Afficher les dates d'anniversaire des contacts
 AgendaHideBirthdayEvents=Cacher les dates d'anniversaire des contacts
 ExportDataset_event1=Liste évênements de l'agenda
diff --git a/htdocs/langs/fr_CA/cashdesk.lang b/htdocs/langs/fr_CA/cashdesk.lang
index ac9a96f7d95..2f3da52b1f5 100644
--- a/htdocs/langs/fr_CA/cashdesk.lang
+++ b/htdocs/langs/fr_CA/cashdesk.lang
@@ -2,5 +2,3 @@
 NoVAT=Pas de TVA (TAXE) pour cette vente
 BankToPay=Compte pour le paiement
 DolibarrReceiptPrinter=Imprimante de reçu Dolibarr
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 0da76b0aab2..75d2c1a9515 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -20,7 +20,6 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Connexion à la base de donnée
-EmptySearchString=Enter non empty search criterias
 ErrorCanNotCreateDir=Impossible de créer le dir %s
 ErrorCanNotReadDir=Impossible de lire le dir %s
 ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini pour le pays '%s'.
@@ -78,6 +77,7 @@ VATRate=Taux TPS/TVH
 Module=Module / Application
 Modules=Modules / Applications
 FilterOnInto=Critères de recherche '<strong>%s</strong>' dans les champs %s
+FromDate=De
 FromLocation=De
 Approved=Approuver
 Opened=Ouverte
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index fc77987a5a6..94325f44baa 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -48,6 +48,7 @@ MemberStatusResiliated=Membre résilié
 MemberStatusResiliatedShort=Terminé
 MembersStatusToValid=Ébauche de membres
 MembersStatusResiliated=Membres résiliés
+MemberStatusNoSubscriptionShort=Validée
 NewCotisation=Nouvelle contribution
 PaymentSubscription=Nouveau paiement de contribution
 SubscriptionEndDate=Date de fin de l'abonnement
@@ -62,7 +63,7 @@ ListOfSubscriptions=Liste des abonnements
 AddMember=Créer un membre
 NoTypeDefinedGoToSetup=Aucun type de membre n'est défini. Aller au menu "Types de membres"
 SubscriptionRequired=Abonnement requis
-MorPhy=Moral / Physique
+MorPhy=La nature
 Reenable=Reignable
 ResiliateMember=Terminer un membre
 ConfirmResiliateMember=Êtes-vous sûr de vouloir mettre fin à ce membre?
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index 3f030415866..d1497e026ec 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -99,8 +99,6 @@ SelectTaskToAssign=Sélectionnez la tâche à affecter ...
 AssignTask=Attribuer
 ProjectOverview=Aperçu
 ManageOpportunitiesStatus=Utiliser des projets pour suivre les pistes / opportunités
-ProjectsStatistics=Statistiques sur les projets / prospects
-TasksStatistics=Statistiques sur les tâches de projet / chef de file
 TaskAssignedToEnterTime=Tâche attribuée. La saisie de cette tâche devrait être possible.
 IdTaskTime=Id temps de tâche
 OpenedProjectsByThirdparties=Projets ouverts par des tiers
diff --git a/htdocs/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
index 8c85ddc91fd..387c0a20f85 100644
--- a/htdocs/langs/fr_CA/stocks.lang
+++ b/htdocs/langs/fr_CA/stocks.lang
@@ -35,8 +35,6 @@ StockLimit=Limite de stock pour l'alerte
 IdWarehouse=Id entrepôt
 LieuWareHouse=Entrepôt de localisation
 WarehousesAndProductsBatchDetail=Entrepôts et produits (avec détail par lot / série)
-AverageUnitPricePMPShort=Prix ​​moyen pondéré des intrants
-AverageUnitPricePMP=Prix ​​moyen pondéré des intrants
 SellPriceMin=Prix ​​unitaire de vente
 EstimatedStockValueSellShort=Valeur à vendre
 EstimatedStockValueSell=Valeur à vendre
@@ -63,7 +61,6 @@ WarehouseForStockIncrease=L'entrepôt <b>%s</b> sera utilisé pour augmenter les
 NbOfProductBeforePeriod=Quantité de produit %s en stock avant la période sélectionnée (<%s)
 NbOfProductAfterPeriod=Quantité de produit %s en stock après la période sélectionnée (> %s)
 MassMovement=Mouvement de masse
-SelectProductInAndOutWareHouse=Sélectionnez un produit, une quantité, un entrepôt source et un entrepôt cible, puis cliquez sur "%s". Une fois que cela est fait pour tous les mouvements requis, cliquez sur "%s".
 RecordMovement=Transfert d'enregistrement
 ReceivingForSameOrder=Reçus pour cette commande
 StockMovementRecorded=Mouvements de stock enregistrés
@@ -105,3 +102,4 @@ InventoryFlushed=Inventaire rincé
 ExitEditMode=Édition de sortie
 inventoryDeleteLine=Suppression de ligne
 RegulateStock=Réglez Stock
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_CA/website.lang b/htdocs/langs/fr_CA/website.lang
index f6c1b71c174..5255b2f9da5 100644
--- a/htdocs/langs/fr_CA/website.lang
+++ b/htdocs/langs/fr_CA/website.lang
@@ -7,4 +7,3 @@ EditMenu=Menu Edition
 ViewSiteInNewTab=Afficher le site dans un nouvel onglet
 ViewPageInNewTab=Afficher la page dans un nouvel onglet
 ViewWebsiteInProduction=Afficher le site Web à l'aide d'URL d'accueil
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index 14fe1d7b39d..d1c2577c8d4 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -4,7 +4,6 @@ NewStandingOrder=Nouveau décret direct
 StandingOrderToProcess=Procéder
 WithdrawalsReceipts=Ordres de débit direct
 WithdrawalReceipt=Ordre de débit direct
-BankTransferReceipts=Credit transfer order
 LastWithdrawalReceipts=Derniers fichiers de débit direct %s
 WithdrawalsLines=Lignes de commande de débit direct
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Pas encore possible. L'état de retrait doit être défini sur 'crédité' avant de déclarer le rejet sur des lignes spécifiques.
@@ -37,16 +36,11 @@ StatusMotif6=Compte sans solde
 StatusMotif8=Autre raison
 CreateGuichet=Seul bureau
 CreateBanque=Seulement la banque
-NotifyTransmision=Transmission de retrait
-NotifyCredit=Crédit de retrait
 NumeroNationalEmetter=Numéro national de l'émetteur
 WithBankUsingRIB=Pour les comptes bancaires utilisant RIB
 WithBankUsingBANBIC=Pour les comptes bancaires utilisant IBAN / BIC / SWIFT
 CreditDate=Crédit sur
 WithdrawalFileNotCapable=Impossible de générer un fichier de retrait de retrait pour votre pays %s (Votre pays n'est pas pris en charge)
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Fichier de retrait
 SetToStatusSent=Définir le statut "Fichier envoyé"
 StatisticsByLineStatus=Statistiques par état des lignes
 RUMLong=Référence de mandat unique
diff --git a/htdocs/langs/fr_CA/workflow.lang b/htdocs/langs/fr_CA/workflow.lang
index 18356f83120..82d77d58424 100644
--- a/htdocs/langs/fr_CA/workflow.lang
+++ b/htdocs/langs/fr_CA/workflow.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Configuration du module de workflow
-WorkflowDesc=Ce module est conçu pour modifier le comportement des actions automatiques en application. Par défaut, le workflow est ouvert (vous pouvez faire les choses dans l'ordre que vous voulez) . Vous pouvez activer les actions automatiques qui vous intéressent .
 ThereIsNoWorkflowToModify=Il n'y a pas de modification de flux de travail disponibles avec les modules activés .
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer automatiquement une facture client après un contrat est validé
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index bdc794e1b31..c1d306ec390 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 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.
diff --git a/htdocs/langs/fr_CH/cashdesk.lang b/htdocs/langs/fr_CH/cashdesk.lang
deleted file mode 100644
index 8990ec63d62..00000000000
--- a/htdocs/langs/fr_CH/cashdesk.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index 75d787bb95c..65f49b2ef5e 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%d/%m/%Y %I:%M %p
 FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y, %I:%M %p
 FormatDateHourText=%d %B %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/fr_CH/stocks.lang b/htdocs/langs/fr_CH/stocks.lang
new file mode 100644
index 00000000000..0cf57e3a1c3
--- /dev/null
+++ b/htdocs/langs/fr_CH/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_CH/website.lang b/htdocs/langs/fr_CH/website.lang
deleted file mode 100644
index ff992a2be9e..00000000000
--- a/htdocs/langs/fr_CH/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/fr_CH/withdrawals.lang b/htdocs/langs/fr_CH/withdrawals.lang
deleted file mode 100644
index efea7bd6270..00000000000
--- a/htdocs/langs/fr_CH/withdrawals.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
index bdc794e1b31..c1d306ec390 100644
--- a/htdocs/langs/fr_CI/admin.lang
+++ b/htdocs/langs/fr_CI/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 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.
diff --git a/htdocs/langs/fr_CI/cashdesk.lang b/htdocs/langs/fr_CI/cashdesk.lang
deleted file mode 100644
index 8990ec63d62..00000000000
--- a/htdocs/langs/fr_CI/cashdesk.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/fr_CI/main.lang b/htdocs/langs/fr_CI/main.lang
index 0f9be27b22f..2e691473326 100644
--- a/htdocs/langs/fr_CI/main.lang
+++ b/htdocs/langs/fr_CI/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/fr_CI/stocks.lang b/htdocs/langs/fr_CI/stocks.lang
new file mode 100644
index 00000000000..0cf57e3a1c3
--- /dev/null
+++ b/htdocs/langs/fr_CI/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_CI/website.lang b/htdocs/langs/fr_CI/website.lang
deleted file mode 100644
index ff992a2be9e..00000000000
--- a/htdocs/langs/fr_CI/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/fr_CI/withdrawals.lang b/htdocs/langs/fr_CI/withdrawals.lang
deleted file mode 100644
index efea7bd6270..00000000000
--- a/htdocs/langs/fr_CI/withdrawals.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
index bdc794e1b31..c1d306ec390 100644
--- a/htdocs/langs/fr_CM/admin.lang
+++ b/htdocs/langs/fr_CM/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 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.
diff --git a/htdocs/langs/fr_CM/cashdesk.lang b/htdocs/langs/fr_CM/cashdesk.lang
deleted file mode 100644
index 8990ec63d62..00000000000
--- a/htdocs/langs/fr_CM/cashdesk.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/fr_CM/main.lang b/htdocs/langs/fr_CM/main.lang
index 0f9be27b22f..2e691473326 100644
--- a/htdocs/langs/fr_CM/main.lang
+++ b/htdocs/langs/fr_CM/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/fr_CM/stocks.lang b/htdocs/langs/fr_CM/stocks.lang
new file mode 100644
index 00000000000..0cf57e3a1c3
--- /dev/null
+++ b/htdocs/langs/fr_CM/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_CM/website.lang b/htdocs/langs/fr_CM/website.lang
deleted file mode 100644
index ff992a2be9e..00000000000
--- a/htdocs/langs/fr_CM/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/fr_CM/withdrawals.lang b/htdocs/langs/fr_CM/withdrawals.lang
deleted file mode 100644
index efea7bd6270..00000000000
--- a/htdocs/langs/fr_CM/withdrawals.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 65a017711e0..6381caebbec 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Permettre de gérer un nombre différent de zéro à la f
 BANK_DISABLE_DIRECT_INPUT=Désactiver la saisie directe de transactions en banque
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Activer l'export brouillon sur les journaux comptables
 ACCOUNTANCY_COMBO_FOR_AUX=Activer la liste déroulante pour le compte auxiliaire (peut être lent si vous avez beaucoup de tiers)
+ACCOUNTING_DATE_START_BINDING=Définissez une date pour commencer la liaison et le transfert en comptabilité. En dessous de cette date, les transactions ne seront jamais transférées à la comptabilité.
 
 ACCOUNTING_SELL_JOURNAL=Journal des ventes
 ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
@@ -278,12 +279,13 @@ GeneralLedgerSomeRecordWasNotRecorded=Certaines des opérations n'ont pu être j
 NoNewRecordSaved=Plus d'enregistrements à journaliser
 ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte comptable
 ChangeBinding=Changer les liens
-Accounted=Comptabilisé
-NotYetAccounted=Pas encore comptabilisé
+Accounted=En comptabilité
+NotYetAccounted=Pas encore en comptabilité
 ShowTutorial=Afficher le tutoriel
 NotReconciled=Non rapproché
 
 ## Admin
+BindingOptions=Options de liaisons avec les codes comptables
 ApplyMassCategories=Application en masse des catégories
 AddAccountFromBookKeepingWithNoCategories=Comptes disponibles pas encore dans le groupe personnalisé
 CategoryDeleted=Le groupe de comptes comptables a été supprimé
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index c4025fb1577..d7842084c17 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -289,6 +289,7 @@ MAIN_MAIL_SMTPS_ID=ID SMTP (si le serveur d'envoi nécessite une authentificatio
 MAIN_MAIL_SMTPS_PW=Mot de passe SMTP (si le serveur d'envoi nécessite une authentification)
 MAIN_MAIL_EMAIL_TLS=Utilisation du chiffrement TLS (SSL)
 MAIN_MAIL_EMAIL_STARTTLS=Utiliser le cryptage TTS (STARTTLS)
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Authorise les certificats auto-signés
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Utiliser DKIM pour signer les emails
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Nom de domaine pour la signature DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Nom du sélecteur DKIM
@@ -300,8 +301,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Expéditeur par défaut des e-mails pour les envois m
 UserEmail=Email utilisateur
 CompanyEmail=Email organization
 FeatureNotAvailableOnLinux=Fonctionnalité non disponible sous systèmes Unix. Tester votre sendmail localement.
+FixOnTransifex=Corriger la traduction sur la plate-forme en ligne de traduction du projet
 SubmitTranslation=Si la traduction de cette langue est incomplète ou si vous trouvez des erreurs, vous pouvez corriger cela en éditant les fichiers dans le répertoire <b>langs/%s</b> et soumettre vos changements sur www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Si la traduction pour cette langue est incomplète ou si vous trouvez des erreurs, vous pouvez les corriger en éditant les fichiers dans le répertoire <b>langs/%s</b> et soumettre les modifications sur le forum dolibarr.org/forum ou pour les développeurs sur github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=Si la traduction pour cette langue est incomplète ou si vous trouvez des erreurs, vous pouvez les corriger en éditant les fichiers dans le dossier <b>langs/%s</b> et soumettre les fichiers modifiés sur le forum dolibarr.org/forum ou, pour les développeurs, via une PR sur github.com/Dolibarr/dolibarr
 ModuleSetup=Configuration du module
 ModulesSetup=Configuration Modules/Application
 ModuleFamilyBase=Système
@@ -387,7 +389,7 @@ SecurityToken=Clé de sécurisation des URLs
 NoSmsEngine=Aucun gestionnaire d'envoi de SMS n'est disponible. Les gestionnaires d'envois SMS ne sont pas installés en standard, car dépendent d'un fournisseur externe, mais vous pourrez en trouver depuis la plateforme %s
 PDF=PDF
 PDFDesc=Options globales sur la génération des PDF
-PDFAddressForging=Règles de fabrication des zones adresses
+PDFAddressForging=Règles pour le contenu des sections Adresse
 HideAnyVATInformationOnPDF=Masquer toutes les informations relatives à la Taxe de vente / TVA sur les PDF générés
 PDFRulesForSalesTax=Règles pour la taxe de vente / TVA
 PDFLocaltax=Règles pour %s
@@ -408,7 +410,9 @@ PriceBaseTypeToChange=Modifier sur les prix dont la référence de base est le
 MassConvert=Convertir en masse
 PriceFormatInCurrentLanguage=Format de prix dans la langue actuelle
 String=Chaîne
+String1Line=Chaîne de caractères (1 ligne)
 TextLong=Texte long
+TextLongNLines=Texte long (n lignes)
 HtmlText=Texte HTML
 Int=Numérique entier
 Float=Décimal
@@ -475,7 +479,7 @@ ModuleCompanyCodeCustomerDigitaria=%s suivi du nom de client tronqué du nombre
 ModuleCompanyCodeSupplierDigitaria=%s suivi du nom du fournisseur tronqué du nombre de caractères: %s pour le code comptable fournisseur.
 Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être créées et approuvées par 2 utilisateurs différents (une étape/utilisateur pour créer et une étape/utilisateur pour approuver. Notez que si un utilisateur à les deux permissions, ces deux actions sont effectuées en une seule fois). Cette option ajoute la nécessité d'une approbation par une troisième étape/utilisateur, si le montant de la commande est supérieur au montant d'une valeur définie (soit 3 étapes nécessaire: 1 =Validation, 2=Première approbation et 3=seconde approbation si le montant l'exige).<br>Laissez le champ vide si une seule approbation (2 étapes) est suffisante, placez une valeur très faible (0.1) si une deuxième approbation (3 étapes) est toujours exigée.
 UseDoubleApproval=Activer l'approbation en trois étapes si le montant HT est supérieur à...
-WarningPHPMail=Attention : Il est préférable de configurer les emails sortant pour utiliser le serveur email de votre fournisseur plutôt que la configuration par défaut. Certains fournisseurs email (comme Yahoo) ne permettent pas l'envoi d'e-mails depuis un autre serveur que le leur si l'adresse d'envoi utilisée est une adresse autre que la leur. Votre configuration actuelle utilise le serveur de l'application pour l'envoi d'e-mails et non le serveur de votre fournisseur de messagerie, aussi certains destinataires (ceux compatibles avec le protocole restrictif DMARC) demanderont au fournisseur d'email si ils peuvent accepter l'email et certains fournisseurs (comme Yahoo) peuvent répondre "non" car le serveur utilisé pour l'envoi n'est pas un serveur appartenant au fournisseur, aussi certains de vos emails envoyés peuvent ne pas etre accepté (faites attention aussi aux quotas de votre fournisseur d'email). <br>SI votre fournisseur d'email (comme Yahoo) impose cette restriction, vous devrez modifier votre configuration et opter pour l'autre méthode d'envoi "SMTP server" et saisir les identifiants SMTP de votre compte fournis par votre fournisseur d'e-mail (à demander à votre fournisseur d'e-mail)
+WarningPHPMail=Attention : La configuration d'envoi d'email utilise une configuration par défaut. Il est préférable de configurer les emails sortant pour utiliser le serveur email de votre fournisseur plutôt que la configuration par défaut pour plusieurs raisons:
 WarningPHPMail2=Si votre fournisseur de messagerie SMTP a besoin de restreindre le client de messagerie à certaines adresses IP (très rare), voici l'adresse IP du mail user agent (MUA) de votre application CRM ERP : <strong> %s </strong>.
 WarningPHPMailSPF=Si le nom de domaine de votre adresse e-mail d'expéditeur est protégé par SPF (demandez à votre fournisseur d'e-mail), vous devez inclure les adresses IP suivantes dans l'enregistrement SPF du DNS de votre domaine: <strong> %s </strong>.
 ClickToShowDescription=Cliquer pour afficher la description
@@ -543,9 +547,9 @@ Module54Desc=Gestion des contrats (services ou abonnements récurrents)
 Module55Name=Codes-barres
 Module55Desc=Gestion des codes-barres
 Module56Name=Paiement par virement bancaire
-Module56Desc=Gestion des paiements par virement bancaire. Cela inclut la génération de fichiers SEPA pour les pays européens.
-Module57Name=Prélèvements
-Module57Desc=Gestion des paiements par prélèvements. Inclut également la génération du fichier de virement des paiements SEPA pour les pays européens.
+Module56Desc=Gestion des paiements de fournisseurs par virement bancaire. Est incluse la génération des fichiers SEPA pour les pays européens.
+Module57Name=Règlement par Prélèvement
+Module57Desc=Gestion des règlements clients par prélèvements. Est incluse la génération des fichiers SEPA pour les pays européens.
 Module58Name=ClickToDial
 Module58Desc=Intégration d'un système de « ClickToDial » (Asterisk, …)
 Module59Name=Bookmark4u
@@ -836,9 +840,16 @@ Permission532=Créer/modifier les services
 Permission534=Supprimer les services
 Permission536=Voir/gérer les services cachés
 Permission538=Exporter les services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Lire les Nomenclatures (BOM)
 Permission651=Créer/modifier les Nomenclatures (BOM)
 Permission652=Supprimer les Nomenclatures (BOM)
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Consulter les dons
 Permission702=Créer/modifier les dons
 Permission703=Supprimer les dons
@@ -848,6 +859,8 @@ Permission773=Supprimer les notes de frais
 Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
 Permission775=Approuver les notes de frais
 Permission776=Payer les notes de frais
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Exporter les notes de frais
 Permission1001=Consulter les stocks
 Permission1002=Créer/modifier entrepôts
@@ -900,6 +913,7 @@ Permission2515=Administrer les rubriques de documents
 Permission2801=Utiliser un client FTP en mode lecture (parcours et téléchargement de fichiers)
 Permission2802=Utiliser un client FTP en mode écriture (suppression et envoi de fichiers)
 Permission3200=Lire les événements archivés et leurs empreintes
+Permission3301=Generate new modules
 Permission4001=Voir les employés
 Permission4002=Créer/modifier les employés
 Permission4003=Supprimer les employés
@@ -947,7 +961,8 @@ Permission63003=Supprimer les ressources
 Permission63004=Lier les ressources aux événements de l'agenda
 DictionaryCompanyType=Type de Tiers
 DictionaryCompanyJuridicalType=Formes juridiques des Tiers
-DictionaryProspectLevel=Niveau de potentiel des prospects
+DictionaryProspectLevel=Niveau de prospection des sociétés
+DictionaryProspectContactLevel=Potentiel de prospection des contacts
 DictionaryCanton=Etats/Province
 DictionaryRegion=Régions
 DictionaryCountry=Pays
@@ -977,7 +992,8 @@ DictionaryEMailTemplates=Modèles des courriels
 DictionaryUnits=Unités
 DictionaryMeasuringUnits=Unités de mesure
 DictionarySocialNetworks=Réseaux sociaux
-DictionaryProspectStatus=Statut prospect
+DictionaryProspectStatus=Statut de prospection des sociétés
+DictionaryProspectContactStatus=Statut de prospection des contacts
 DictionaryHolidayTypes=Type de congés
 DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
 DictionaryExpenseTaxCat=Note de frais - catégories de déplacement
@@ -1076,7 +1092,7 @@ LoginPage=Page de connexion
 BackgroundImageLogin=Image de fond
 PermanentLeftSearchForm=Zone de recherche permanente du menu de gauche
 DefaultLanguage=Langue par défaut
-EnableMultilangInterface=Activer l'interface multi-langue
+EnableMultilangInterface=Activer la prise en charge multilingue pour la relation client ou fournisseur
 EnableShowLogo=Afficher le logo de la société dans le menu
 CompanyInfo=Société/Organisation
 CompanyIds=Identifiants société/organisation
@@ -1240,6 +1256,7 @@ WarningAtLeastKeyOrTranslationRequired=Un critère de recherche est nécessaire
 NewTranslationStringToShow=Nouvelle traduction à afficher
 OriginalValueWas=La traduction d'origine est écrasée. La valeur initiale était: <br><br> %s
 TransKeyWithoutOriginalValue=Vous avez forcé une nouvelle traduction pour la clé de traduction '<strong>%s</strong>' qui n'existe dans aucun fichier de langue
+TitleNumberOfActivatedModules=Modules activés
 TotalNumberOfActivatedModules=Modules activés : <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Vous devez activer au moins une fonctionnalité
 ClassNotFoundIntoPathWarning=La classe %s n'a pas été trouvée dans le chemin PHP
@@ -1686,8 +1703,8 @@ AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuration du module Click To Dial
 ClickToDialUrlDesc=URL appelée quand un clic sur l'icône téléphone est fait. Dans l'URL, vous pouvez utiliser les tags<br><b>__PHONETO__</b> qui sera remplacée par le numéro de téléphone de la personne à appeler<br><b>__PHONEFROM__</b> qui sera remplacée par le numéro de l'appelant (vous)<br><b>__LOGIN__</b> qui sera remplacée par l'identifiant d'accès de l'utilisateur à l'application d'appel (à définir sur la fiche utilisateur) et <br><b>__PASS__</b> qui sera remplacée par le mot de passe d'accès de l'utilisateur à l'application d'appel (également à définir sur la fiche utilisateur).
-ClickToDialDesc=Ce module permet de rendre les numéros de téléphone cliquables. Un clic sur cette icône appellera votre téléphone à composer le numéro de téléphone. Cela peut être utilisé pour appeler un système de centre d'appels de Dolibarr qui peut appeler le numéro de téléphone d'un système SIP, par exemple.
-ClickToDialUseTelLink=Utiliser un lien «Tel.» sur les numéros de téléphone
+ClickToDialDesc=Ce module permet de rendre les numéros de téléphone cliquables lorsque vous utilisez l'application sur un ordinateur de bureau. Un clic sur cette icône composera le numéro de téléphone. Cela peut être utilisé pour commencer une conversation avec un soft phone sur votre bureau ou lorsque vous utilisez un système basé sur le protocole SIP par exemple. Note: Sur un smartphone, les numéros de téléphones sont toujours clicables.
+ClickToDialUseTelLink=Utiliser un lien "tel:" sur les numéros de téléphone
 ClickToDialUseTelLinkDesc=Utilisez cette méthode si vos utilisateurs ont un softphone ou une interface de logiciel installé sur un même ordinateur que le navigateur, et a appelé lorsque vous cliquez sur un lien dans votre navigateur qui commencent par "tel:". Si vous avez besoin d'une solution de serveur complet (pas besoin d'installation locale du logiciel), vous devez définir ceci à  "Non" et remplir le champ suivant.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point de Vente
@@ -1817,6 +1834,7 @@ EnterAnyCode=Ce champ contient une référence pour identifier le champ. Entrez
 Enter0or1=Saisir 0 ou 1 
 UnicodeCurrency=Saisissez ici entre accolades, la liste du numéro des octets qui représentent le symbole de la monnaie. Pour exemple: pour $, entrez [36] - pour le Real Brésilien R$ [82,36] - pour l'euro €, entrez [8364]
 ColorFormat=La couleur RVB au format HEX est, par exemple: FF0000
+PictoHelp=Nom de l'icône au format Dolibarr ("image.png" si elle se trouve dans le dossier du thème activé, "image.png@nom_du_module" si elle se trouve dans les dossiers du module)
 PositionIntoComboList=Position de la ligne dans des listes déroulantes
 SellTaxRate=Taux de TVA
 RecuperableOnly=Oui pour une TVA "Non Perçue mais Récupérable" dédiée à certains pays comme la France. Gardez la valeur à "Non" dans tous les autres cas.
@@ -1843,10 +1861,11 @@ MailToSendSupplierRequestForQuotation=Demande de devis
 MailToSendSupplierOrder=Commandes fournisseurs
 MailToSendSupplierInvoice=Factures fournisseur
 MailToSendContract=Contrats
+MailToSendReception=Réceptions
 MailToThirdparty=Tiers
 MailToMember=Adhérents
 MailToUser=Utilisateurs
-MailToProject=Fiche projets
+MailToProject=Projets
 MailToTicket=Tickets
 ByDefaultInList=Afficher par défaut sur les vues listes
 YouUseLastStableVersion=Vous utilisez la dernière version stable
@@ -1856,6 +1875,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s est disponible. La ver
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version de maintenance, aussi elle ne contient que des correctifs de bugs. Nous recommandons à toute personne utilisant une version plus ancienne de migrer vers celle-ci. En tant que version de maintenance, aucune nouvelle fonctionnalité n'est ajoutée, ni modification de format de données. Vous pouvez télécharger cette version à partir de la zone de téléchargement du portail https://www.dolibarr.org (sous-répertoire "Versions stables"). Vous pouvez lire le <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pour la liste complète des changements.
 MultiPriceRuleDesc=Quand l'option "Plusieurs niveaux de prix par produit/service" est activée, vous pouvez définir différents prix (un par niveau de prix) pour chaque produits. Pour gagner du temps, vous pouvez entrer ici une règle pour avoir un prix pour chaque niveau calculé automatiquement. Cette page est destiné à vous faire gagner du temps mais n'est utile que si vos prix pour chaque niveaux sont relatif au premier niveau. Vous pouvez ignorer cette page dans la plupart des cas.
 ModelModulesProduct=Modèles des documents de produits
+WarehouseModelModules=Modèles pour les documents des entrepôts
 ToGenerateCodeDefineAutomaticRuleFirst=Pour pouvoir générer automatiquement des codes, vous devez d'abord définir un gestionnaire de numérotation pour définir automatiquement les numéros du code-barre.
 SeeSubstitutionVars=Voir * note pour la liste des variables de substitutions possibles
 SeeChangeLog=Voir le fichier ChangeLog (anglais)
@@ -1881,7 +1901,7 @@ UrlToGetKeyToUseAPIs=Url pour obtenir le jeton pour utiliser l'API (une fois le
 ListOfAvailableAPIs=Liste des APIs disponibles
 activateModuleDependNotSatisfied=Le module "%s" dépend du module "%s" qui est manquant, aussi le module "%1$s" peut ne pas fonctionner correctement. Merci d'installer le module "%2$s" ou désactiver le module "%1$s" si vous ne souhaitez pas avoir de mauvaise surprise
 CommandIsNotInsideAllowedCommands=La commande que vous essayez d'exécuter ne figure pas dans la liste des commandes autorisées définies dans le paramètre <strong> $dolibarr_main_restrict_os_commands </strong> du fichier <strong> conf.php </strong>.
-LandingPage=Page cible
+LandingPage=Page d'accueil
 SamePriceAlsoForSharedCompanies=Si vous utilisez un module multi-société, avec le choix «prix unique», le prix sera aussi le même pour toutes les sociétés si les produits sont partagés entre les environnements
 ModuleEnabledAdminMustCheckRights=Le module a été activé. Les permissions pour le(s) module(s) activé(s) ont été donnés aux utilisateurs admin uniquement. Vous devrez peut-être accorder des autorisations aux autres utilisateurs ou groupes manuellement si nécessaire.
 UserHasNoPermissions=Cet utilisateur n'a pas de permission définie
@@ -1894,6 +1914,7 @@ MAIN_PDF_MARGIN_LEFT=Marge gauche sur les PDF
 MAIN_PDF_MARGIN_RIGHT=Marge droite sur les PDF
 MAIN_PDF_MARGIN_TOP=Marge haute sur les PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge bas sur les PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Hauteur du logo sur les PDFs
 NothingToSetup=Aucune configuration particulière n'est requise pour ce module.
 SetToYesIfGroupIsComputationOfOtherGroups=Réglez ceci sur Oui si ce groupe est un calcul d'autres groupes
 EnterCalculationRuleIfPreviousFieldIsYes=Entrez la règle de calcul si le champ précédent a été défini sur Oui (par exemple, 'CODEGRP1 + CODEGRP2')
@@ -1933,13 +1954,14 @@ NothingProcessed=Aucune action faite
 XEmailsDoneYActionsDone=%s e-mails qualifiés, %s e-mails traités avec succès (pour %s enregistrements/actions réalisés)
 RecordEvent=Enregistrer événement email entrant
 CreateLeadAndThirdParty=Créer opportunité (et tiers si nécessaire)
-CreateTicketAndThirdParty=Créer un ticket (et un Tiers si nécessaire)
+CreateTicketAndThirdParty=Créer un ticket (avec un lien vers un tiers s'il a été chargé par une opération précédente)
 CodeLastResult=Dernier code de retour
 NbOfEmailsInInbox=Nombre de courriels dans le répertoire source
 LoadThirdPartyFromName=Charger le Tiers en cherchant sur %s (chargement uniquement)
 LoadThirdPartyFromNameOrCreate=Charger le Tiers en cherchant sur %s (créer si non trouvé)
-WithDolTrackingID=Référence Dolibarr trouvée dans l'ID du message
-WithoutDolTrackingID=Référence Dolibarr non trouvée dans l'ID du message
+WithDolTrackingID=Message d'une conversation initiée par un premier mail envoyé depuis Dolibarr
+WithoutDolTrackingID=Message d'une conversation initiée par un premier e-mail NON envoyé depuis Dolibarr
+CreateCandidature=Créer une candidature
 FormatZip=Zip
 MainMenuCode=Code d'entrée du menu (mainmenu)
 ECMAutoTree=Afficher l'arborescence GED automatique
@@ -1955,7 +1977,7 @@ ConfirmUnactivation=Confirmer réinitialisation du module
 OnMobileOnly=Sur petit écran (smartphone) uniquement
 DisableProspectCustomerType=Désactiver le type de tiers "Prospect + Client" (le tiers doit donc être un client potentiel ou un client, mais ne peut pas être les deux)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifier l'interface pour les malvoyants
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activez cette option si vous êtes une personne malvoyante ou utilisez l'application à partir d'un navigateur de texte tel que Lynx ou Links.
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activez cette option si vous êtes une personne malvoyante ou si vous utilisez l'application à partir d'un navigateur de texte tel que Lynx ou Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Changer la couleur de l'interface pour daltoniens
 MAIN_OPTIMIZEFORCOLORBLINDDesc=Activez cette option si vous êtes daltonien. Dans certains cas, l'interface changera la configuration des couleurs pour augmenter le contraste.
 Protanopia=Protanopia
@@ -1981,7 +2003,7 @@ ImportSetup=Configuration du module Import
 InstanceUniqueID=ID unique de l'instance
 SmallerThan=Plus petit que
 LargerThan=Plus grand que
-IfTrackingIDFoundEventWillBeLinked=Notez que si un ID de suivi est trouvé dans le courrier électronique entrant, l'événement sera automatiquement lié aux bons objets.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Avec un compte GMail, si vous avez activé la validation en 2 étapes, il est recommandé de créer un deuxième mot de passe dédié à l'application, au lieu d'utiliser votre propre mot de passe de compte, à partir de https://myaccount.google.com/.
 EmailCollectorTargetDir=Il peut être souhaitable de déplacer l'e-mail dans un autre tag/répertoire lorsqu'il a été traité avec succès. Définissez simplement une valeur ici pour utiliser cette fonction (N'utilisez PAS de caractères spéciaux dans le nom). Notez que vous devez également utiliser un compte de connexion en lecture/écriture.
 EmailCollectorLoadThirdPartyHelp=Vous pouvez utiliser cette action pour utiliser le contenu de l'e-mail pour rechercher et charger un tiers existant dans votre base de données. Le tiers trouvé (ou créé) sera utilisée pour les actions suivantes qui en ont besoin. Dans le champ 'Paramètre', vous pouvez utiliser par exemple 'EXTRACT: BODY:Name:\\s([^\\s]*)' si vous souhaitez extraire le nom du tiers d'une chaîne 'Name: nom du tiers' trouvé dans le corps du message.
@@ -2005,3 +2027,7 @@ RssNote=Remarque: Chaque définition de flux RSS fournit un widget que vous deve
 JumpToBoxes=Aller à la Configuration -> Widgets
 MeasuringUnitTypeDesc=Utilisez ici une valeur comme "taille", "surface", "volume", "poids", "temps"
 MeasuringScaleDesc=L'échelle est le nombre de positions où vous devez déplacer la partie décimale pour qu'elle corresponde à l'unité de référence par défaut. Pour le type d'unité "temps", c'est le nombre de secondes. Les valeurs comprises entre 80 et 99 sont des valeurs réservées.
+TemplateAdded=Modèle ajouté
+TemplateUpdated=Modèle mis à jour
+TemplateDeleted=Modèle supprimé
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 2e0ac6e5ed1..3b7a9f0e8c0 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Nombre d'événements
 ListOfActions=Liste des événements
 EventReports=Rapport des évènements
 Location=Lieu
-ToUserOfGroup=à tout utilisateur du groupe
+ToUserOfGroup=Assigné à tout utilisateur du groupe
 EventOnFullDay=Événement sur la(les) journée(s)
 MenuToDoActions=Événements incomplets
 MenuDoneActions=Événements terminés
@@ -86,6 +86,8 @@ ProposalDeleted=Proposition commerciale supprimée
 OrderDeleted=Commande supprimée
 InvoiceDeleted=Facture supprimée
 DraftInvoiceDeleted=Facture brouillon supprimée
+CONTACT_CREATEInDolibarr=Contact/Adresse %s créé
+CONTACT_DELETEInDolibarr=Contact/Adresse %s supprimé
 PRODUCT_CREATEInDolibarr=Produit %s créé
 PRODUCT_MODIFYInDolibarr=Produit %s modifié
 PRODUCT_DELETEInDolibarr=Produit%ssupprimé
@@ -121,10 +123,10 @@ MRP_MO_CANCELInDolibarr=OF annulé
 AgendaModelModule=Modèle de document pour les événements
 DateActionStart=Date de début
 DateActionEnd=Date de fin
-AgendaUrlOptions1=Vous pouvez aussi ajouter les paramètres suivants pour filtrer les réponses :
+AgendaUrlOptions1=Vous pouvez aussi ajouter les paramètres suivants pour filtrer les réponses :
 AgendaUrlOptions3=<b>logina=%s</b> pour limiter l'export aux actions dont l'utilisateur <b>%s</b> est propriétaire.
-AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> pour limiter l'export aux actions non assignées à l'utilisateur <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b> pour limiter l'export aux actions assignées à l'utilisateur <b>%s</b> (propriétaire et autres).
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> pour limiter l'export aux actions n'appartenant pas à l'utilisateur <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b>pour limiter l'export aux actions assignées à l'utilisateur <b>%s</b> (propriétaire et autres).
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> pour restreindre aux événements associés au projet <b>__PROJECT_ID__</b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> pour exclure les événements automatiques.
 AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> pour inclure les événements de type congé.
@@ -158,3 +160,10 @@ DateStartPlusOne=Date de début + 1 heure
 SetAllEventsToTodo=Réglez tous les événements à "A faire"
 SetAllEventsToInProgress=Définir tous les événements à "En cours"
 SetAllEventsToFinished=Définir tous les événements sur "Terminés"
+ReminderTime=Délai de rappel avant l'événement
+TimeType=Type de durée
+ReminderType=Type de rappel
+AddReminder=Créer une notification de rappel automatique pour cet évènement
+ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel de cet événement
+BrowserPush=Notification navigateur
+EventReminder=Rappel événement
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 5da6bda8133..37745a85490 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -58,7 +58,7 @@ SuppliersInvoices=Factures fournisseurs
 SupplierBill=Facture fournisseur
 SupplierBills=Factures fournisseurs
 Payment=Règlement
-PaymentBack=Rembourser
+PaymentBack=Remboursement
 CustomerInvoicePaymentBack=Rembourser
 Payments=Règlements
 PaymentsBack=Remboursements
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index b1c47ec14d1..e2964afd6a3 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=les %s derniers fournisseurs enregistrés
 BoxTitleLastModifiedSuppliers=Les %s derniers fournisseurs modifiés
 BoxTitleLastModifiedCustomers=Les %s derniers clients modifiés
 BoxTitleLastCustomersOrProspects=Les %s derniers clients ou prospects
-BoxTitleLastCustomerBills=Les %s dernières factures client
-BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs
+BoxTitleLastCustomerBills=Les %s dernières factures clients modifiées
+BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs modifiées
 BoxTitleLastModifiedProspects=Les %s derniers prospects modifiés
 BoxTitleLastModifiedMembers=Les %s derniers adhérents
 BoxTitleLastFicheInter=Les %s dernières interventions modifiées
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Les %s dernières commandes fournisseurs mo
 BoxTitleLastModifiedCustomerBills=Les %s dernières factures clients modifiées
 BoxTitleLastModifiedCustomerOrders=Les %s dernières commandes clients modifiées
 BoxTitleLastModifiedPropals=Les %s dernières propositions commerciales modifiées
+BoxTitleLatestModifiedJobPositions=Les %s dernières offres d'emploi modifiées
+BoxTitleLatestModifiedCandidatures=Les %s dernières candidatures modifiées
 ForCustomersInvoices=Factures clients
 ForCustomersOrders=Commandes clients
 ForProposals=Propositions commerciales
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Le compte d'attente n'est pas défini
 BoxLastCustomerShipments=Dernières expéditions clients
 BoxTitleLastCustomerShipments=Les %s dernières expéditions clients 
 NoRecordedShipments=Aucune expédition client
+# Pages
+AccountancyHome=Comptabilité
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 8ed5994e3f3..525062f1f32 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=Module POS (PDV)
 BasicPhoneLayout=Utiliser une interface basique pour les smartphones
 SetupOfTerminalNotComplete=La configuration du terminal %s n'est pas terminée
 DirectPayment=Paiement direct
-DirectPaymentButton=Bouton de paiement direct en espèces
+DirectPaymentButton=Ajouter un bouton "Paiement direct en espèces"
 InvoiceIsAlreadyValidated=La facture est déjà validée
 NoLinesToBill=Aucune ligne à facturer
 CustomReceipt=Reçu personnalisé
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Module externe avec fonctionnalités suppléme
 PrintMethod=Méthode d'impression
 ReceiptPrinterMethodDescription=Méthode puissante avec beaucoup de paramètres. Entièrement personnalisable avec des modèles. Impossible d'imprimer à partir du cloud.
 ByTerminal=Par terminal
-TakeposNumpadUsePaymentIcon=Utiliser l'icône de paiement sur le pavé numérique
+TakeposNumpadUsePaymentIcon=Utilisez un icône au lieu du texte sur les boutons de paiement du pavé numérique
 CashDeskRefNumberingModules=Module de numérotation pour le POS
 CashDeskGenericMaskCodes6 = <br>La balise <b> {TN} </b> est utilisée pour ajouter le numéro de terminal
 TakeposGroupSameProduct=Regrouper les mêmes lignes de produits
 StartAParallelSale=Lancer une nouvelle vente en parallèle
-ControlCashOpening=Popup d'ouverture de caisse à l'ouverture
+ControlCashOpening=Fenêtre de contrôle de caisse à l'ouverture du PDV
 CloseCashFence=Clôturer la caisse
 CashReport=Rapport de caisse
 MainPrinterToUse=Imprimante principale à utiliser
@@ -115,5 +115,10 @@ ScanToOrder=Scannez le code QR pour commander
 Appearance=Apparence
 HideCategoryImages=Masquer les images de catégorie
 HideProductImages=Masquer les images de produits
-NumberOfLinesToShow=Nombre de lignes d'image à afficher
+NumberOfLinesToShow=Nombre de lignes d'images à afficher
 DefineTablePlan=Définir le plan des tables
+GiftReceiptButton=Ajouter un bouton "Reçu cadeau"
+GiftReceipt=Reçu cadeau
+ModuleReceiptPrinterMustBeEnabled=Le module Imprimante de reçus doit d'abord avoir été activée
+AllowDelayedPayment=Autoriser le paiement différé
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 6245901d321..bc79d32d709 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Charge sociale ou fiscale
 SocialContributions=Charges fiscales ou sociales
 SocialContributionsDeductibles=Charge ou taxe déductible
 SocialContributionsNondeductibles=Charge ou taxe non déductible
+DateOfSocialContribution=Date de la charge fiscale ou sociale
 LabelContrib=Libellé de la dépense
 TypeContrib=Type de la charge
 MenuSpecialExpenses=Dépenses spéciales
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 5bfcd36ce0b..97d3e48f512 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=La nouvelle valeur ne peut être égale à l'anci
 ErrorFailedToValidatePasswordReset=Echec de la réinitialisation du mot de passe. Il est possible que ce lien ait déjà été utilisé (l'utilisation de ce lien ne fonctionne qu'une fois). Si ce n'est pas le cas, essayez de recommencer le processus de réinitialisation de mot de passe depuis le début.
 ErrorToConnectToMysqlCheckInstance=Echec de la connection au serveur de base de données. Vérifier que votre serveur est bien lancé (par exemple, avec MySQL/MariaDB, vous pouvez le lancer depuis la ligne de commande avec 'sudo service mysql start').
 ErrorFailedToAddContact=Echec à l'ajout du contact
-ErrorDateMustBeBeforeToday=La date ne peut pas être supérieure à aujourd'hui
+ErrorDateMustBeBeforeToday=La date doit être inférieure à la date courante
+ErrorDateMustBeInFuture=La date doit être postérieure à la date courante
 ErrorPaymentModeDefinedToWithoutSetup=Un mode de paiement a été défini de type %s mais la configuration du module Facture n'a pas été complétée pour définir les informations affichées pour ce mode de paiement.
 ErrorPHPNeedModule=Erreur, votre PHP doit avoir le module <b>%s</b> installé pour utiliser cette fonctionnalité.
 ErrorOpenIDSetupNotComplete=Vous avez configuré Dolibarr pour accepter l'authentication OpenID, mais l'URL du service OpenID n'est pas défini dans la constante %s
@@ -213,7 +214,7 @@ ErrorObjectMustHaveLinesToBeValidated=L'objet %s doit contenir des lignes
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Seules les factures validées peuvent être envoyées à l'aide de l'action de masse "Envoyer par courrier électronique".
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=Vous devez choisir si l'article est un produit prédéfini ou non
 ErrorDiscountLargerThanRemainToPaySplitItBefore=La réduction que vous essayez d'appliquer est supérieure au montant du paiement. Auparavant, divisez le rabais en 2 rabais plus petits.
-ErrorFileNotFoundWithSharedLink=Fichier non trouvé. Peut que la clé de partage a été modifié ou le fichier a été récemment supprimé.
+ErrorFileNotFoundWithSharedLink=Fichier non trouvé. Peut être que la clé de partage a été modifiée ou le fichier a été récemment supprimé.
 ErrorProductBarCodeAlreadyExists=Le code-barre du produit %s existe déjà sur une autre référence de produit
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Notez également que l'utilisation d'un produit virtuel pour augmenter ou réduire automatiquement les sous-produits n'est pas possible lorsqu'au moins un sous-produit (ou sous-produit de sous-produits) a besoin d'un numéro de série/lot.
 ErrorDescRequiredForFreeProductLines=La description est obligatoire pour les lignes avec un produit non prédéfini
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Pas assez de quantité pour
 ErrorOnlyOneFieldForGroupByIsPossible=1 seul champ pour le 'Grouper par' est possible (les autres sont supprimés)
 ErrorTooManyDifferentValueForSelectedGroupBy=Trop de valeurs différentes trouvées (plus de <b> %s </b>) pour le champ '<b>%s</b>', nous ne pouvons donc pas l'utiliser pour 'Grouper par' dans les graphiques. Le champ 'Grouper Par' a été supprimé. Peut-être vouliez-vous l'utiliser comme un simple axe X ?
 ErrorReplaceStringEmpty=Erreur, la chaîne à remplacer est vide
+ErrorProductNeedBatchNumber=Erreur, le produit '<b> %s </b>' a besoin d'un numéro de lot/série
+ErrorProductDoesNotNeedBatchNumber=Erreur, le produit '<b> %s </b>' n'accepte pas un numéro de lot/série
+ErrorFailedToReadObject=Erreur, échec de la lecture de l'objet de type <b> %s </b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 9da1ef41151..6cde9682397 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopien
 Language_ar_AR=Arabe
 Language_ar_EG=Arabe (Egypte)
 Language_ar_SA=Arabe
+Language_az_AZ=Azerbaïdjanais
 Language_bn_BD=Bengalais
+Language_bn_IN=Bengali (Inde)
 Language_bg_BG=Bulgare
 Language_bs_BA=Bosniaque
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=Anglais (Royaume-Uni)
 Language_en_IN=Anglais (Inde)
 Language_en_NZ=Anglais (Nouvelle Zeland)
 Language_en_SA=Anglais (Arabie Saoudite)
+Language_en_SG=Anglais (Singapour)
 Language_en_US=Anglais (Etats-Unis)
 Language_en_ZA=Anglais (Afrique du Sud)
 Language_es_ES=Espagnol
@@ -29,6 +33,7 @@ Language_es_CL=Espagnol (Chili)
 Language_es_CO=Espagnol (Colombie)
 Language_es_DO=Espagnol (République dominicaine)
 Language_es_EC=Espagnol (Équateur)
+Language_es_GT=Espagnol (Guatemala)
 Language_es_HN=Espagnol (Honduras)
 Language_es_MX=Espagnol (Mexique)
 Language_es_PA=Espagnol (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Espagnol (Paraguay)
 Language_es_PE=Espagnol (Peru)
 Language_es_PR=Espagnol (Puerto Rico)
 Language_es_UY=Espagnol (Uruguay)
+Language_es_GT=Espagnol (Guatemala)
 Language_es_VE=Espagnol (Venezuela)
 Language_et_EE=Estonien
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finlandais
 Language_fr_BE=Français (Belgique)
 Language_fr_CA=Français (Canada)
 Language_fr_CH=Français (Suisse)
+Language_fr_CI=Français (Cote d'Ivoire)
+Language_fr_CM=Français (Cameroun)
 Language_fr_FR=Français
+Language_fr_GA=Français (Gabon)
 Language_fr_NC=Français (Nouvelle Calédonie)
+Language_fr_SN=Français (Sénégal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galicien
 Language_he_IL=Hébreux
+Language_hi_IN=Hindi (Inde)
 Language_hr_HR=Croate
 Language_hu_HU=Hongrois
 Language_id_ID=Indonésien
 Language_is_IS=Islandais
 Language_it_IT=Italien
+Language_it_CH=Italien (Suisse)
 Language_ja_JP=Japonais
 Language_ka_GE=Géorgien
 Language_km_KH=Khmer
@@ -64,8 +77,9 @@ Language_lv_LV=Léton
 Language_mk_MK=Macédonien
 Language_mn_MN=Mongol
 Language_nb_NO=Norvégien (Bokmal)
+Language_ne_NP=Népalais
 Language_nl_BE=Néerlandais (Belgique)
-Language_nl_NL=Dutch
+Language_nl_NL=Néerlandais
 Language_pl_PL=Polonais
 Language_pt_BR=Portugais (Brésil)
 Language_pt_PT=Portugais
@@ -86,4 +100,5 @@ Language_uz_UZ=Ouzbek
 Language_vi_VN=Vietnamien
 Language_zh_CN=Chinois
 Language_zh_TW=Chinois (Traditionel)
+Language_zh_HK=Chinois (Hong-Kong)
 Language_bh_MY=Malais
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 59999521019..66bc8728cd4 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -164,7 +164,11 @@ NoContactWithCategoryFound=Pas de contact/adresses avec cette catégorie
 NoContactLinkedToThirdpartieWithCategoryFound=Pas de contact/adresses associés à un ters avec cette catégorie
 OutGoingEmailSetup=Configuration email sortant
 InGoingEmailSetup=Configuration email entrant
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetupForEmailing=Configuration des e-mails sortants (pour le module %s)
 DefaultOutgoingEmailSetup=Configuration des emails sortant
 Information=Information
 ContactsWithThirdpartyFilter=Contacts ayant pour tiers
+Unanswered=Sans réponse
+Answered=Répondu
+IsNotAnAnswer=N'est pas une réponse (e-mail initial)
+IsAnAnswer=Est une réponse à un e-mail initial
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 6fb3b71414a..e0df096ca2b 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -485,6 +485,7 @@ Categories=Tags/catégories
 Category=Tag/catégorie
 By=Par
 From=Du
+FromDate=A partir du
 FromLocation=A partir du
 to=au
 To=au
@@ -687,6 +688,7 @@ Method=Méthode
 Receive=Réceptionner
 CompleteOrNoMoreReceptionExpected=Complète ou plus de réception attendue
 ExpectedValue=Valeur attendue
+ExpectedQty=Qté attendue
 PartialWoman=Partielle
 TotalWoman=Totale
 NeverReceived=Jamais reçu
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Adhérents
 MenuAgendaGoogle=Agenda Google
+MenuTaxesAndSpecialExpenses=Charges | Dépenses spéciales
 ThisLimitIsDefinedInSetup=Limite Dolibarr (Menu accueil-configuration-sécurité): %s Ko, Limite PHP: %s Ko
 NoFileFound=Pas de documents stockés dans cette rubrique
 CurrentUserLanguage=Langue utilisateur actuelle
@@ -942,6 +945,39 @@ ShortThursday=J
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
+one=un
+two=deux
+three=trois
+four=quatre
+five=cinq
+six=six
+seven=sept
+eight=huit
+nine=neuf
+ten=dix
+eleven=onze
+twelve=douze
+thirteen=treize
+fourteen=quatorze
+fifteen=quinze
+sixteen=soixante
+seventeen=dix-sept
+eighteen=dix-huit
+nineteen=dix-neuf
+twenty=vingt
+thirty=trente
+forty=quarante
+fifty=cinquante
+sixty=soixante
+seventy=soixante-dix
+eighty=quatre-vingts
+ninety=quatre vingt dix
+hundred=cent
+thousand=mille
+million=million
+billion=milliard
+trillion=mille milliards
+quadrillion=million de milliards
 SelectMailModel=Sélectionner un modèle d'e-mail
 SetRef=Définir réf.
 Select2ResultFoundUseArrows=Résultats trouvés. Utilisez les flèches pour sélectionner.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Passer en mode édition pour ajouter des traduc
 NotUsedForThisCustomer=Non utilisé pour ce client
 AmountMustBePositive=Le montant doit être positif.
 ByStatus=Par statut
+InformationMessage=Information
+Used=Used
+ASAP=Dès que possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 5d709ff8bdc..c7b3fedbdc4 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -81,7 +81,7 @@ DeleteType=Supprimer
 VoteAllowed=Vote autorisé
 Physical=Physique
 Moral=Morale
-MorPhy=Moral/Physique
+MorPhy=Nature
 Reenable=Réactiver
 ResiliateMember=Résilier un adhérent
 ConfirmResiliateMember=Êtes-vous sûr de vouloir résilier cet adhérent ?
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 5a6d8b77e54..32d53d270cd 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Ordres de fabrication
 MO=Ordre de fabrication
+MOs=Manufacturing orders
 MRPDescription=Module de gestion de production et Ordres de Fabrication (OF).
 MRPArea=Espace MRP
 MrpSetupPage=Configuration du module MRP
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 09c378008f3..0a5abbfbf3a 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -101,6 +101,8 @@ PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNA
 PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Vous pouvez cliquer sur le lien ci-dessous pour effectuer votre paiement si ce n'est déjà fait.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Rappel événement "__EVENT_LABEL__" le __EVENT_DATE__ à __EVENT_TIME__<br><br>Ceci est un message automatique, merci de ne pas répondre.
 DemoDesc=Dolibarr est un logiciel de gestion proposant plusieurs modules métiers. Une démonstration qui inclut tous ces modules n'a pas de sens car ce cas n'existe jamais (plusieurs centaines de modules disponibles). Aussi, quelques profils type de démo sont disponibles.
 ChooseYourDemoProfil=Veuillez choisir le profil de démonstration qui correspond le mieux à votre activité…
 ChooseYourDemoProfilMore=...ou construisez votre propre profil<br>(sélection manuelle des modules)
@@ -280,7 +282,9 @@ LinesToImport=Lignes à importer
 
 MemoryUsage=Utilisation de la mémoire
 RequestDuration=Durée de la demande
+ProductsPerPopularity=Produits / services par popularité
 PopuProp=Produits / services par popularité dans les propositions
 PopuCom=Produits/services par popularité dans les commandes
 ProductStatistics=Statistiques sur les produits / services
 NbOfQtyInOrders=Qté en commandes
+SelectTheTypeOfObjectToAnalyze=Sélectionnez le type d'objet à analyser ...
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 8366e029c2f..f32a30d9a81 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Définissez le type de code-barres
 BarcodeValue=Valeur du code-barres
 NoteNotVisibleOnBill=Note (non visible sur les factures, propals...)
 ServiceLimitedDuration=Si produit de type service à durée limitée :
+FillWithLastServiceDates=Remplissez avec la date de la dernière ligne de service
 MultiPricesAbility=Plusieurs niveaux de prix par produit/service (chaque client est dans un et un seul niveau)
 MultiPricesNumPrices=Nombre de prix
 DefaultPriceType=Base des prix par défaut (avec ou hors taxes) lors de l’ajout de nouveaux prix de vente
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services)
 CustomCode=Nomenclature douanière / Code SH
 CountryOrigin=Pays d'origine
 Nature=Nature du produit (matière première / produit fini)
+NatureOfProductShort=Nature de produit
+NatureOfProductDesc=Matière première ou produit fini
 ShortLabel=Libellé court
 Unit=Unité
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Sélectionner la combinaison
 ProductCombinationGenerator=Générateur de variantes
 Features=Fonctionnalités
 PriceImpact=Impact sur le prix
+ImpactOnPriceLevel=Impact sur le niveau de prix %s
+ApplyToAllPriceImpactLevel= Appliquer à tous les niveaux
+ApplyToAllPriceImpactLevelHelp=En cliquant ici, vous définissez le même impact prix à tous les niveaux
 WeightImpact=Impact sur le poids
 NewProductAttribute=Nouvel attribut
 NewProductAttributeValue=Nouvelle valeur de l'attribut
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index c521a0a965a..3ffd43a0fbe 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributeur
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributeur
 SelectElement=Séléctionnez l'élément
 AddElement=Associer l'élément
+LinkToElementShort=Lier à
 # Documents models
 DocumentModelBeluga=Modèle de document project pour l'aperçu des objets liées
 DocumentModelBaleine=Modèles de document de rapport de tâches de projets
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Nb de projets créés par mois
 ProjectNbTaskByMonth=Nb de tâches créées par mois
 ProjectOppAmountOfProjectsByMonth=Montant des opportunités par mois
 ProjectWeightedOppAmountOfProjectsByMonth=Montant pondéré des opportunités par mois
-ProjectOpenedProjectByOppStatus=Opportunités ouvertes par statut d'opportunité
-ProjectsStatistics=Statistics sur les projets
-TasksStatistics=Statistiques sur le projet/tâche principale
+ProjectOpenedProjectByOppStatus=Projets ouverts par statut de prospection
+ProjectsStatistics=Statistiques sur les projets ou opportunités
+TasksStatistics=Statistiques sur les tâches des projets ou opportunités
 TaskAssignedToEnterTime=Tâche assignée. La saisie de temps sur cette tâche devrait être possible.
 IdTaskTime=Id ligne de temps
 YouCanCompleteRef=Si vous souhaitez compléter la référence avec un suffixe, il est recommandé d'ajouter un caractère - pour le séparer, de sorte que la numérotation automatique fonctionne toujours correctement pour les projets à venir. Par exemple %s-MONSUFFIX
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index fea0bcd75f0..64199c5248d 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -85,3 +85,20 @@ ProposalCustomerSignature=Cachet, Date, Signature et mention "Bon pour Accord"
 ProposalsStatisticsSuppliers=Statistiques de propositions commerciales
 CaseFollowedBy=Affaire suivie par
 SignedOnly=Signé seulement
+IsNotADraft = n'est pas un brouillon
+PassedInOpenStatus = passé au statut "ouvert"
+CantBeSign = ne peut pas être signée
+Sign = Signer
+Signed = signé
+CantBeSign = ne peut pas être signé
+CantBeValidated = Ne peut pas être validé
+ConfirmMassValidation = Confirmer la validation ?
+ConfirmMassSignature = Confirmer la signature ?
+ConfirmMassValidationQuestion = Voulez-vous confirmer la validation des devis brouillons selectionnés ?
+ConfirmMassSignatureQuestion = Voulez-vous confirmer la signature des devis ouvert selectionnés ?
+PropNoProductOrService = devis ne contient pas de produits ni de services
+PropsNoProductOrService = devis ne contiennent pas de produits ni de services
+IdProposal=ID de proposition
+IdProduct=ID produit
+PrParentLine=Ligne parent de proposition
+LineBuyPriceHT=Prix ​​d'achat Montant net de taxe pour la ligne
diff --git a/htdocs/langs/fr_FR/recruitment.lang b/htdocs/langs/fr_FR/recruitment.lang
new file mode 100644
index 00000000000..2ceb91db78e
--- /dev/null
+++ b/htdocs/langs/fr_FR/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recrutement
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Gestion et suivi des campagnes de recrutement
+
+#
+# Admin page
+#
+RecruitmentSetup = Paramétrages du recrutement
+Settings = Paramétrages
+RecruitmentSetupPage = Entrez ici la configuration des principales options du module de recrutement
+RecruitmentArea=Espace recrutement
+PublicInterfaceRecruitmentDesc=Les pages publiques des postes ouverts sont des URL publiques pour afficher et répondre aux postes ouverts. Il existe un lien différent pour chaque offre d'emploi, visible sur chaque fiche de poste.
+EnablePublicRecruitmentPages=Activer les pages publiques des postes ouverts
+
+#
+# About page
+#
+About = À propos
+RecruitmentAbout = À propos du module Recrutement
+RecruitmentAboutPage = À propos du module Recrutement
+NbOfEmployeesExpected=Nombre de postes disponibles
+JobLabel=Intitulé du poste
+WorkPlace=Lieu de travail
+DateExpected=Date souhaitée
+FutureManager=Responsable futur
+ResponsibleOfRecruitement=Responsable du recrutement
+IfJobIsLocatedAtAPartner=Si le poste est localisé chez un partenaire
+PositionToBeFilled=Poste à pourvoir
+PositionsToBeFilled=Postes à pourvoir
+ListOfPositionsToBeFilled=Liste des postes à pourvoir
+NewPositionToBeFilled=Nouveau poste à pourvoir
+
+JobOfferToBeFilled=Poste à pourvoir
+ThisIsInformationOnJobPosition=Informations sur le poste à pourvoir
+ContactForRecruitment=Contact pour le recrutement
+EmailRecruiter=Email recruteur
+ToUseAGenericEmail=Pour utiliser un e-mail générique. S'il n'est pas défini, l'email du responsable du recrutement sera utilisé
+NewCandidature=Nouvelle candidature
+ListOfCandidatures=Liste des candidatures
+RequestedRemuneration=Rémunération demandée
+ProposedRemuneration=Rémunération proposée
+ContractProposed=Contrat proposé
+ContractSigned=Contrat signé
+RecruitmentCandidature=Candidature
+JobPositions=Offres d'emploi
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Entretien à faire
+AnswerCandidature=Réponse de candidature
+YourCandidature=Votre candidature
+YourCandidatureAnswerMessage=Merci pour votre candidature. <br> ...
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index fa44e8e1172..8cc6c9d0abd 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -95,14 +95,16 @@ RealStock=Stock réel
 RealStockDesc=Le stock physique ou réel est le stock présent dans les entrepôts.
 RealStockWillAutomaticallyWhen=Le stock réel sera modifié selon ces règles (voir la configuration du module Stock) :
 VirtualStock=Stock virtuel
-VirtualStockDesc=Le stock virtuel est la quantité de produit en stock après que les opération affectant les stock sont terminées (réceptions de commandes fournisseurs, expéditions de commandes clients,...)
+VirtualStockAtDate=Stock virtuel à date
+VirtualStockAtDateDesc=Stock virtuel une fois que toutes les commandes en attente qui doivent être effectuées avant la date seront terminées
+VirtualStockDesc=Le stock virtuel est la quantité de produit en stock après que les opérations en cours (et qui affectent les stocks) soient terminées (réceptions de commandes fournisseurs, expéditions de commandes clients, production des ordres de fabrications, etc)
 IdWarehouse=Identifiant entrepôt
 DescWareHouse=Description entrepôt
 LieuWareHouse=Lieu entrepôt
 WarehousesAndProducts=Entrepôts et produits
 WarehousesAndProductsBatchDetail=Entrepôts et produits (avec détail par lot/série)
 AverageUnitPricePMPShort=Prix moyen pondéré (PMP)
-AverageUnitPricePMP=Prix moyen pondéré (PMP) d'acquisition
+AverageUnitPricePMPDesc=Le prix unitaire moyen d'entrée que nous avons dû payer aux fournisseurs pour intégrer le produit dans notre stock.
 SellPriceMin=Prix de vente unitaire
 EstimatedStockValueSellShort=Valeur à la vente
 EstimatedStockValueSell=Valeur vente
@@ -141,7 +143,7 @@ Replenishments=Réapprovisionnement
 NbOfProductBeforePeriod=Quantité du produit <b>%s</b> en stock avant la période sélectionnée (< <b>%s</b>)
 NbOfProductAfterPeriod=Quantité du produit <b>%s</b> en stock après la période sélectionnée (> <b>%s</b>)
 MassMovement=Mouvement en masse
-SelectProductInAndOutWareHouse=Sélectionner un produit, une quantité à transférer, un entrepôt source et destination et cliquer sur "%s". Une fois tous les mouvements choisis, cliquer sur "%s".
+SelectProductInAndOutWareHouse=Sélectionner un entrepôt source et destination, un produit et une quantité à transférer, puis cliquer sur "%s". Une fois tous les mouvements choisis, cliquer sur "%s".
 RecordMovement=Enregistrer transfert
 ReceivingForSameOrder=Réceptions pour cette commande
 StockMovementRecorded=Mouvement de stocks enregistré
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Afficher l'arborescence complète de l'entrepôt sur la popup
 StockAtDatePastDesc=Vous pouvez voir ici le stock (stock réel) à une date donnée dans le passé
 StockAtDateFutureDesc=Vous pouvez voir ici le stock (stock virtuel) à une date donnée dans le futur
 CurrentStock=Stock actuel
+InventoryRealQtyHelp=Définissez la valeur sur 0 pour réinitialiser la quantité <br> Gardez le champ vide ou supprimez la ligne pour qu'il reste inchangé
+UpdateByScaningProductBarcode=Mettre à jour par scan (code-barres produit)
+UpdateByScaningLot=Mettre à jour par scan (code-barres lot/série)
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 81860c25a45..2b4ab9dcf70 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Fournisseurs
 SuppliersInvoice=Facture fournisseur
 ShowSupplierInvoice=Montrer la facture fournisseur
@@ -15,7 +15,7 @@ SomeSubProductHaveNoPrices=Certains sous-produits n'ont pas de prix définis
 AddSupplierPrice=Ajouter un prix d'achat
 ChangeSupplierPrice=Modifier un prix d'achat
 SupplierPrices=Prix fournisseurs
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Cette référence fournisseur est déjà associée à la référence : %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Cette référence fournisseur est déjà associée à un produit : %s
 NoRecordedSuppliers=Pas de fournisseur enregistré
 SupplierPayment=Paiement fournisseur
 SuppliersArea=Espace fournisseurs
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 73a7fd2a971..54e7ec0be33 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Supprimé
 
 # Dict
 Type=Type
-Category=Code analytique
 Severity=Sévérité
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Affecter automatiquement l'utilisateur qui a créé le t
 TicketsAutoAssignTicketHelp=Lors de la création d'un ticket, l'utilisateur peut être automatiquement affecté au ticket.
 TicketNumberingModules=Module de numérotation des tickets
 TicketNotifyTiersAtCreation=Notifier le tiers à la création
-TicketGroup=Groupe
 TicketsDisableCustomerEmail=Toujours désactiver les courriels lorsqu'un ticket est créé depuis l'interface publique
 TicketsPublicNotificationNewMessage=Envoyer un (des) courriel (s) lorsqu’un nouveau message est ajouté
 TicketsPublicNotificationNewMessageHelp=Envoyer un (des) courriel(s) lorsqu’un nouveau message est ajouté à partir de l’interface publique (à l’utilisateur désigné ou au courriel de notification  (mise à jour) et/ou au courriel de notification)
@@ -162,7 +160,7 @@ CreatedBy=Créé par
 NewTicket=Nouveau ticket
 SubjectAnswerToTicket=Réponse ticket
 TicketTypeRequest=Type de demande
-TicketCategory=Code analytique
+TicketCategory=Groupe
 SeeTicket=Voir le ticket
 TicketMarkedAsRead=Le ticket a été marqué comme lu
 TicketReadOn=Lu
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 1ed6c956e66..73b9e504f74 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Désactivé en mode maintenance
 UserAccountancyCode=Code comptable de l'utilisateur
 UserLogoff=Déconnexion de l'utilisateur
 UserLogged=Utilisateur connecté
+DateOfEmployment=Date d'embauche
 DateEmployment=Date d'embauche
 DateEmploymentEnd=Date de fin d'emploi
 CantDisableYourself=Vous ne pouvez pas désactiver votre propre compte utilisateur
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Forcer le valideur des congés
 ValidatorIsSupervisorByDefault=Par défaut, le valideur est le responsable hiérarchique de l'utilisateur. Gardez vide pour conserver ce comportement.
 UserPersonalEmail=Email personnel
 UserPersonalMobile=Téléphone portable personnel
+WarningNotLangOfInterface=Attention, c'est la langue principale parlée par l'utilisateur, pas la langue de l'interface qu'il a choisi de voir. Pour changer la langue de l'interface visible par cet utilisateur, allez sur l'onglet %s
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index d05f2663cfc..1649b7271de 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Ordres de virement bancaire
 PaymentByBankTransferLines=Lignes d'ordre de virement bancaire
 WithdrawalsReceipts=Bons de prélèvements
 WithdrawalReceipt=Bon de prélèvement
-BankTransferReceipts=Ordres de virement
+BankTransferReceipts=Ordres de virement bancaire
 BankTransferReceipt=Ordre de virement
 LatestBankTransferReceipts=Les %s derniers ordres de virement bancaire
 LastWithdrawalReceipts=Les %s derniers bons de prélèvements
@@ -63,7 +63,9 @@ InvoiceRefused=Facture refusée (Charges de rejet imputable au client)
 StatusDebitCredit=Statut Débit/Crédit
 StatusWaiting=En attente
 StatusTrans=Transmise
+StatusDebited=Débité
 StatusCredited=Crédité
+StatusPaid=Payé
 StatusRefused=Rejeté
 StatusMotif0=Non renseigné
 StatusMotif1=Provision insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=Autre motif
 CreateForSepaFRST=Créer fichier de prélèvement (SEPA FRST)
 CreateForSepaRCUR=Créer fichier de prélèvement (SEPA RCUR)
 CreateAll=Créer le fichier de prélèvement (tout)
-CreateFileForPaymentByBankTransfer=Créer un fichier de virement
+CreateFileForPaymentByBankTransfer=Créer fichier pour les virements
 CreateSepaFileForPaymentByBankTransfer=Créer un fichier de virement (SEPA)
 CreateGuichet=Seulement guichet
 CreateBanque=Seulement banque
 OrderWaiting=En attente de traitement
-NotifyTransmision=Transmission du bon
-NotifyCredit=Crédit du bon
+NotifyTransmision=Enregistrer l'envoi du fichier d'ordres
+NotifyCredit=Enregistrer le crédit de l'ordre
 NumeroNationalEmetter=Numéro National Émetteur
 WithBankUsingRIB=Pour les comptes bancaires utilisant le RIB
 WithBankUsingBANBIC=Pour les comptes bancaires utilisant le code BAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Crédité le
 WithdrawalFileNotCapable=Impossible de générer le fichier de reçu des prélèvement pour votre pays %s (Votre pays n'est pas supporté)
 ShowWithdraw=Afficher ordre de prélèvement
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins une demande de prélèvement non traité, elle ne sera pas classée payée afin de permettre le prélèvement d'abord.
-DoStandingOrdersBeforePayments=Cet onglet vous permet de demander un prélèvement. Une fois la demande faite, allez dans le menu Banque->Paiement par prélèvement pour gérer l'ordre de prélèvement. Lorsque l'ordre de paiement est clos, le paiement sur la facture sera automatiquement enregistrée, et la facture fermée si le reste à payer est nul.
-DoCreditTransferBeforePayments=Cet onglet vous permet de demander un ordre de virement. Une fois fait, allez dans le menu Banque -> Paiements par virement pour gérer l'ordre de virement. Lorsque le virement est clôturé, le paiement des factures sera automatiquement enregistré et les factures clôturées si le solde à payer est nul.
+DoStandingOrdersBeforePayments=Cet onglet vous permet de demander un prélèvement. Une fois la demande faite, allez dans le menu Banque->Paiement par prélèvement pour générer l'ordre de prélèvement. Lorsque l'ordre de paiement est clos, le paiement sur les factures seront automatiquement enregistrés, et les factures fermées si le reste à payer est nul.
+DoCreditTransferBeforePayments=Cet onglet vous permet de demander un ordre de virement. Une fois fait, allez dans le menu Banque ->Paiements par virement pour gérer l'ordre de virement. Lorsque le virement est clôturé, le paiement des factures fournisseurs sera automatiquement enregistré et les factures clôturées si le solde à payer est nul.
 WithdrawalFile=Fichier de prélèvement
+CreditTransferFile=Fichier de virement
 SetToStatusSent=Mettre au statut "Fichier envoyé"
 ThisWillAlsoAddPaymentOnInvoice=Cette action enregistrera aussi les règlements des factures et les classera au statut "Payé" si le solde est nul
 StatisticsByLineStatus=Statistiques par statut des lignes
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type de paiement
 ModeRECUR=Payment récurrent
 ModeFRST=Paiement unitaire
 PleaseCheckOne=Cocher un choix uniquement
+CreditTransferOrderCreated=Ordre de virement %s créé
 DirectDebitOrderCreated=Ordre de prélèvement %s créé
 AmountRequested=Montant réclamé
 SEPARCUR=SEPA RCUR
@@ -141,3 +145,4 @@ InfoTransData=Montant : %s<br>Méthode : %s<br>Date : %s
 InfoRejectSubject=Ordre de prélèvement rejeté
 InfoRejectMessage=Bonjour, <br><br> l'ordre de prélèvement de la facture %s liée à la société %s, avec un montant de %s a été refusé par la banque.<br><br>--<br>%s
 ModeWarning=Option mode réel non établi, nous allons arrêter après cette simulation
+ErrorCompanyHasDuplicateDefaultBAN=La société avec l'identifiant %s a plus d'un compte bancaire par défaut. Aucun moyen de savoir lequel utiliser.
diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
index a3dbe4cb07e..0c753a2529e 100644
--- a/htdocs/langs/fr_FR/workflow.lang
+++ b/htdocs/langs/fr_FR/workflow.lang
@@ -13,9 +13,11 @@ descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classer la/les proposition(s) commer
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) facturée(s) à la validation de la facture client (et si le montant de la facture est le même que le montant total des commandes liées)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) à Facturée quand une facture client est passée à Payé (et si le montant de la facture est identique à la somme des commandes sources)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classer la commande source à expédiée à la validation d'une expédition (et si les quantités expédiées dans le bon d'expédition sont les même que dans la commande mise à jour)
-# Autoclassify supplier order
+# Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classer la ou les proposition(s) commerciale(s) fournisseur sources facturées quand une facture fournisseur est validée (et si le montant de la facture est le même que le total des propositions sources liées)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classer la ou les commande(s) fournisseur(s) de source(s) à facturée(s) lorsque la facture fournisseur est validée (et si le montant de la facture est le même que le montant total des commandes liées)
-descWORKFLOW_BILL_ON_RECEPTION=Classer la/les réception(s) facturée(s) à la validation d'une facture fournisseur 
+descWORKFLOW_BILL_ON_RECEPTION=Classer les réceptions en "facturées" lorsqu'une commande fournisseur liée est validée
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Fermer toutes les interventions liées au ticket lorsqu'un ticket est fermé
 AutomaticCreation=Création automatique
 AutomaticClassification=Classification automatique
diff --git a/htdocs/langs/fr_FR/zapier.lang b/htdocs/langs/fr_FR/zapier.lang
index 78103a55bae..cdd9e953847 100644
--- a/htdocs/langs/fr_FR/zapier.lang
+++ b/htdocs/langs/fr_FR/zapier.lang
@@ -14,35 +14,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #
-# Générique
+# Generic
 #
 
 # Module label 'ModuleZapierForDolibarrName'
-ModuleZapierForDolibarrName = ZapierForDolibarr
+ModuleZapierForDolibarrName = Zapier pour Dolibarr
 # Module description 'ModuleZapierForDolibarrDesc'
-ModuleZapierForDolibarrDesc = Description de ZapierForDolibarr
+ModuleZapierForDolibarrDesc = Module Zapier pour Dolibarr
 
 #
-# Page d'administration
+# Admin page
 #
-ZapierForDolibarrSetup = Configuration du module ZapierForDolibarr
-Settings = Réglages
-ZapierForDolibarrSetupPage = Page de configuration du module ZapierForDolibarr
-
-#
-# Page À propos
-#
-About = À propos
-ZapierForDolibarrAbout = À propos de ZapierForDolibarr
-ZapierForDolibarrAboutPage = Page à propos de ZapierForDolibarr
-
-#
-# Page d'exemple
-#
-MyPageName = Nom de ma page
-
-#
-# Box d'exemple
-#
-MyWidget = Mon widget
-MyWidgetDescription = Description de mon widget
+ZapierForDolibarrSetup = Configuration de Zapier pour Dolibarr
+ZapierDescription=Interface avec Zapier
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index bdc794e1b31..c1d306ec390 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - admin
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 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.
diff --git a/htdocs/langs/fr_GA/cashdesk.lang b/htdocs/langs/fr_GA/cashdesk.lang
deleted file mode 100644
index 8990ec63d62..00000000000
--- a/htdocs/langs/fr_GA/cashdesk.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - cashdesk
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
diff --git a/htdocs/langs/fr_GA/main.lang b/htdocs/langs/fr_GA/main.lang
index 0f9be27b22f..2e691473326 100644
--- a/htdocs/langs/fr_GA/main.lang
+++ b/htdocs/langs/fr_GA/main.lang
@@ -19,4 +19,3 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-EmptySearchString=Enter non empty search criterias
diff --git a/htdocs/langs/fr_GA/stocks.lang b/htdocs/langs/fr_GA/stocks.lang
new file mode 100644
index 00000000000..0cf57e3a1c3
--- /dev/null
+++ b/htdocs/langs/fr_GA/stocks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - stocks
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/fr_GA/website.lang b/htdocs/langs/fr_GA/website.lang
deleted file mode 100644
index ff992a2be9e..00000000000
--- a/htdocs/langs/fr_GA/website.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - website
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/fr_GA/withdrawals.lang b/htdocs/langs/fr_GA/withdrawals.lang
deleted file mode 100644
index efea7bd6270..00000000000
--- a/htdocs/langs/fr_GA/withdrawals.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - withdrawals
-BankTransferReceipts=Credit transfer order
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index fd3875d601c..2c6f92c301b 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
-Accountancy=Accountancy
+Accountancy=Contabilidade
 Accounting=Contabilidade
 ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columnas no ficheiro de exportación
 ACCOUNTING_EXPORT_DATE=Formato de data no ficheiro de exportación
@@ -17,7 +17,7 @@ ThisProduct=Este produto
 DefaultForService=Predeterminado para o servizo
 DefaultForProduct=Predeterminado para o produto
 CantSuggest=Non pode suxerirse
-AccountancySetupDoneFromAccountancyMenu=A maior parte da configuración da contabilidad realizase dende o menú %s
+AccountancySetupDoneFromAccountancyMenu=A maior parte da configuración da contabilidade realizase dende o menú %s
 ConfigAccountingExpert=Configuración do módulo contabilidade avanzada
 Journalization=Procesar diarios
 Journaux=Diarios
@@ -27,15 +27,15 @@ Chartofaccounts=Plan contable
 CurrentDedicatedAccountingAccount=Conta contable adicada
 AssignDedicatedAccountingAccount=Nova conta a asignar
 InvoiceLabel=Etiqueta factura
-OverviewOfAmountOfLinesNotBound=Resumo da cantidade de liñas non vinculadas a unha conta contable
-OverviewOfAmountOfLinesBound=Resumo da cantidade de liñas xa vinculadas a unha conta contable
+OverviewOfAmountOfLinesNotBound=Resumo da cantidade de liñas non ligadas a unha conta contable
+OverviewOfAmountOfLinesBound=Resumo da cantidade de liñas xa ligadas a unha conta contable
 OtherInfo=Outra información
 DeleteCptCategory=Eliminar a conta contable do grupo
 ConfirmDeleteCptCategory=¿Está certo de querer eliminar esta conta contable do grupo de contas contables?
 JournalizationInLedgerStatus=Estado de diario
 AlreadyInGeneralLedger=Xa rexistrado no Libro Maior
 NotYetInGeneralLedger=Non foi rexistrado aínda no Libro Maior
-GroupIsEmptyCheckSetup=O grupo está baleiro, comprobe a configuración d a personalización de grupos contables
+GroupIsEmptyCheckSetup=O grupo está baleiro, comprobe a configuración da personalización de grupos contables
 DetailByAccount=Amosar detalles por conta
 AccountWithNonZeroValues=Contas con valores non cero
 ListOfAccounts=Listaxe de contas
@@ -49,7 +49,7 @@ MainAccountForCustomersNotDefined=Conta contable principal para clientes non def
 MainAccountForSuppliersNotDefined=Conta contable principal para provedores non definida na configuración
 MainAccountForUsersNotDefined=Conta contable principal para usuarios non definida na configuración
 MainAccountForVatPaymentNotDefined=Conta contable principal para pagos de IVE non definida na configuración
-MainAccountForSubscriptionPaymentNotDefined=Conta contable principal para o pago de subscricións non definida na configuración
+MainAccountForSubscriptionPaymentNotDefined=Conta contable principal para o pago de afiliacións non definida na configuración
 
 AccountancyArea=Área contabilidade
 AccountancyAreaDescIntro=O uso do módulo de contabilidade realízase en varios pasos:
@@ -58,22 +58,22 @@ AccountancyAreaDescActionOnceBis=Os seguintes pasos deben facerse para aforrar t
 AccountancyAreaDescActionFreq=As seguintes accións execútanse normalmente cada mes, semana ou día en empresas moi grandes...
 
 AccountancyAreaDescJournalSetup=PASO %s: Cree ou mire o contido da sua listaxe de diarios dende o menú %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescChartModel=PASO %s: Crea un modelo do plan xeral contable dende o menú %s
+AccountancyAreaDescChart=PASO %s: Crear ou completar o contido do seu plan xeral contable dende o menú %s
 
 AccountancyAreaDescVat=PASO %s: Defina as contas contables para cada tasa de IVE. Para iso, use a entrada do menú %s.
 AccountancyAreaDescDefault=PASO %s: Defina as contas contables por defecto. Para iso, use a entrada do menú %s.
 AccountancyAreaDescExpenseReport=PASO %s: Defina as contas contables por defecto para cada tipo de informe de gastos. Para iso, use a entrada do menú %s.
 AccountancyAreaDescSal=PASO %s: Defina as contas contables para os pagos de salarios. Para iso, use a entrada do menú %s.
 AccountancyAreaDescContrib=PASO %s: Defina as contas contables dos gastos especiais (impostos varios). Para iso, use a entrada do menú %s.
-AccountancyAreaDescDonation=PASO %s: Defina as contas contables para as donacións. Para iso, use a entrada do menú %s.
+AccountancyAreaDescDonation=PASO %s: Defina as contas contables para as doacións/subvencións. Para iso, use a entrada do menú %s.
 AccountancyAreaDescSubscription=STEP %s: Defina as contas contables por defecto para a subscrición de membros. Para iso, use a entrada do menú %s.
 AccountancyAreaDescMisc=PASO %s: Defina a conta por defecto obrigada e as contas contables por defecto para transaccións varias. Para iso, use a entrada do menú %s.
 AccountancyAreaDescLoan=PASO %s: Defina as contas contables por defecto para préstamos. Para iso, use a entrada do menú %s.\n
 AccountancyAreaDescBank=PASO %s: Defina as contas contables e o código para cada conta bancaria e financiera. Pode empezar dende a páxina %s.
 AccountancyAreaDescProd=PASO %s: Defina as contas contables nos seus produtos/servizos. Para elo pode utilizar o menú %s.
 
-AccountancyAreaDescBind=PASO %s: Mire que os enlaces entre as liñas %s existentes e as contas contables son correctos, para que a aplicación poda rexistrar as transaccións no Libro Maior nun só clic. Complete os enlaces que falten. Para iso, utilice a entrada de menú %s.
+AccountancyAreaDescBind=PASO %s: Mire que as ligazóns entre as liñas %s existentes e as contas contables son correctos, para que a aplicación poda rexistrar as transaccións no Libro Maior nun só clic. Complete as ligazóns que falten. Para iso, utilice a entrada de menú %s.
 AccountancyAreaDescWriteRecords=PASO %s: Escribir as transaccións no Libro Maior. Para iso, entre no menú <strong>%s</strong>, e faga clic no botón <strong>%s</strong>.
 AccountancyAreaDescAnalyze=PASO %s: Engadir ou editar transaccións existentes, xerar informes e exportacións.
 
@@ -98,11 +98,11 @@ MenuExpenseReportAccounts=Contas de informes de gastos
 MenuLoanAccounts=Contas de préstamos
 MenuProductsAccounts=Contas de produtos
 MenuClosureAccounts=Contas de peche
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=Validate movements
+MenuAccountancyClosure=Peche
+MenuAccountancyValidationMovements=Validar movementos
 ProductsBinding=Contas de produtos
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
+TransferInAccounting=Transferencia en contabilidade
+RegistrationInAccounting=Rexistro en contabilidade
 Binding=Contabilizar
 CustomersVentilation=Contabilizar facturas a clientes
 SuppliersVentilation=Contabilizar facturas de provedores
@@ -110,7 +110,7 @@ ExpenseReportsVentilation=Contabilizar informes de gastos
 CreateMvts=Crear nova transacción
 UpdateMvts=Modificación dunha transacción
 ValidTransaction=Transacción validada
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Rexistrar movimentos no Libro Maior
 Bookkeeping=Libro Maior
 AccountBalance=Saldo da conta
 ObjectsRef=Referencia de obxecto orixe
@@ -121,7 +121,7 @@ InvoiceLinesDone=Liñas de facturas contabilizadas
 ExpenseReportLines=Liñas de informes de gastos a contabilizar
 ExpenseReportLinesDone=Liñas de informes de gastos contabilizadas
 IntoAccount=Contabilizar liña coa conta contable
-TotalForAccount=Total for accounting account
+TotalForAccount=Total para a conta contable
 
 
 Ventilate=Contabilizar
@@ -146,9 +146,10 @@ ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncate product & services account descri
 ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts (If you set value to 6 here, the account '706' will appear like '706000' on screen)
 ACCOUNTING_LENGTH_AACCOUNT=Length of the third-party accounting accounts (If you set value to 6 here, the account '401' will appear like '401000' on screen)
 ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of an accounting account. Needed by some countries (like Switzerland). If set to off (default), you can set the following two parameters to ask the application to add virtual zeros.
-BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
-ACCOUNTANCY_COMBO_FOR_AUX=Habilita a lista combinada para a conta subsidiaria (pode ser lento se tes moitos terceiros)
+BANK_DISABLE_DIRECT_INPUT=Desactivar transaccións directas en conta bancaria
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borradores al diario
+ACCOUNTANCY_COMBO_FOR_AUX=Habilita a listaxe combinada para a conta subsidiaria (pode ser lento se ten moitos terceiros)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Diario de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
@@ -158,17 +159,17 @@ ACCOUNTING_SOCIAL_JOURNAL=Diario social
 ACCOUNTING_HAS_NEW_JOURNAL=Ten un novo diario
 
 ACCOUNTING_RESULT_PROFIT=Conta de resultado contable (Beneficio)
-ACCOUNTING_RESULT_LOSS=Conta de resultado contable (Perda)
+ACCOUNTING_RESULT_LOSS=Conta de resultado contable (Perdas)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Diario de peche
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta contable de transferencia bancaria
-TransitionalAccount=Transitional bank transfer account
+TransitionalAccount=Conta de transferencia bancaria de transición
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Conta contable de operacións pendentes de asignar
-DONATION_ACCOUNTINGACCOUNT=Conta contable de rexistro de donacións
+DONATION_ACCOUNTINGACCOUNT=Conta contable de rexistro de doacións/subvencións
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contable de rexistro subscricións
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para produtos comprados (usada se non están definidos na folla de produtos)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contable predeterminada para os produtos vendidos (usada se non están definidos na folla de produtos)
@@ -179,8 +180,8 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contable predeterminada para os servizos co
 ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contable predeterminada para os servizos vendidos (usada se non están definidos na folla de servizos)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conta contable predeterminada para os servizos vendidos en EU (usada se non están definidos na folla de servizos)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=AConta contable predeterminada para os servizos vendidos e exportados fora da EU  (usada se non están definidos na folla de servizos)
 
 Doctype=Tipo de documento
 Docdate=Data
@@ -189,29 +190,29 @@ LabelAccount=Etiqueta conta
 LabelOperation=Etiqueta operación
 Sens=Sentido
 LetteringCode=Codigo de letras
-Lettering=Lettering
+Lettering=Letras
 Codejournal=Diario
 JournalLabel=Etiqueta diario
 NumPiece=Apunte
 TransactionNumShort=Núm. transacción
-AccountingCategory=Grupos personalizados
+AccountingCategory=Grupos persoalizados
 GroupByAccountAccounting=Agrupar por conta contable
 AccountingAccountGroupsDesc=Pode definir aquí algúns grupos de contas contables. Serán usadas para informes de contabilidade personalizados.
 ByAccounts=Por contas
 ByPredefinedAccountGroups=Por grupos predefinidos
-ByPersonalizedAccountGroups=Por grupos personalizados
+ByPersonalizedAccountGroups=Por grupos persoalizados
 ByYear=Por ano
 NotMatch=Non establecido
 DeleteMvt=Eliminar liñas do Libro Maior
-DelMonth=Month to delete
+DelMonth=Mes a eliminar
 DelYear=Ano a eliminar
 DelJournal=Diario a eliminar
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=Isto eliminará todas as liñas do Libro Maior do ano e/ou dun diario específico. Precísase alo menos un criterio.
+ConfirmDeleteMvtPartial=Isto eliminará a transacción do libro maior (serán  eliminadas todas as liñas relacionadas coa mesma transacción)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger.
+DescFinanceJournal=O diario financiero inclúe todos os tipos de pagos por conta bancaria
+DescJournalOnlyBindedVisible=Ista é una vista do rexistro ligada a unha conta contable e que pode ser rexistrada no Libro Maior.
 VATAccountNotDefined=Conta contable para IVE non definida
 ThirdpartyAccountNotDefined=Conta contable para terceiro non definida
 ProductAccountNotDefined=Conta contable para produto non definida
@@ -229,154 +230,155 @@ DescThirdPartyReport=Consulte aquí o listaxe de clientes e provedores e os seus
 ListAccounts=Listaxe de contas contables
 UnknownAccountForThirdparty=Conta contable de terceiro descoñecida, usaremos %s
 UnknownAccountForThirdpartyBlocking=Conta contable de terceiro descoñecida. Erro de bloqueo.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Third-party account not defined or third party unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Conta contable de terceiro non definida ou terceiro descoñecido. Usaremos a %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Conta contable de terceiro non definida ou terceiro descoñecido. Erro de bloqueo.
-UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
-PaymentsNotLinkedToProduct=Payment not linked to any product / service
-OpeningBalance=Opening balance
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by group
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Conta do terceiro descoñecida ou terceiro descoñecido. Erro de bloqueo
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta do terceiros descoñecida e conta de espera non definida. Erro de bloqueo
+PaymentsNotLinkedToProduct=Pagos non ligados a un produto/servizo
+OpeningBalance=Saldo de apertura
+ShowOpeningBalance=Amosar saldo de apertura
+HideOpeningBalance=Ocultar saldo de apertura
+ShowSubtotalByGroup=Amosar subtotal por grupo
 
 Pcgtype=Grupo de conta
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Grupo e subgrupo de conta utilízanse como criterios predefinidos de "filtro" e "agrupación" para algúns informes de contabilidade. Por exemplo, "INGRESOS" ou "GASTOS" usanse como grupos para contas contables de produtos para construir o informe de gastos/ingresos.
 
 Reconcilable=Reconcilable
 
 TotalVente=Total facturación antes de impostos
 TotalMarge=Total marxe vendas
 
-DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
-DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still have some lines not bound to an account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
-DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
-ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
+DescVentilCustomer=Consulte aquí a lista de liñas de facturas a clientes ligadas (ou non) a unha conta contable de produto
+DescVentilMore=Na maioría dos casos, se utiliza produtos ou servizos predefinidos e establece a conta contable na ficha do produto/servizo, a aplicación será capaz de facer toda a contabilización entre as liñas da factura e a conta contable do seu plan xeral contable, cun clic no botón <strong>"%s"</strong>, Se non estableceu a conta contable na ficha do produto/servizo ou se aínda ten algunhas liñas non contabilizadas a alguna conta, terá que facer unha contabilización manual dende o menú "<strong>%s</strong>".
+DescVentilDoneCustomer=Consulte aquí as liñas de facturas a clientes e as contas contables dos seus produtos
+DescVentilTodoCustomer=Contabilizar liñas de factura aínda non contabilizadas cunha conta contable de produto
+ChangeAccount=Cambie a conta do produto/servizo para as liñas seleccionadas á conta:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
-DescVentilDoneSupplier=Consult here the list of the lines of vendor invoices and their accounting account
-DescVentilTodoExpenseReport=Bind expense report lines not already bound with a fee accounting account
-DescVentilExpenseReport=Consult here the list of expense report lines bound (or not) to a fee accounting account
-DescVentilExpenseReportMore=If you setup accounting account on type of expense report lines, the application will be able to make all the binding between your expense report lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on fees dictionary or if you still have some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
-DescVentilDoneExpenseReport=Consult here the list of the lines of expenses reports and their fees accounting account
+DescVentilSupplier=Consulte aquí a listaxe de liñas de facturas de provedores ligadas (ou non) a unha conta contable de produto
+DescVentilDoneSupplier=Consulte aquí a listaxe de facturas de provedores e as súas contas contables
+DescVentilTodoExpenseReport=Contabilizar liñas de informes de gastos aínda non contabilizadas cunha conta contable de gastos
+DescVentilExpenseReport=Consulte aquí a listaxe de liñas de informes de gastos (ou non) a unha conta contable de gastos
+DescVentilExpenseReportMore=Se configura as contas contables dos tipos de informes de gastos, a aplicación será capaz de facer a ligazón entre as súas liñas de informes de gastos e as contas contables, simplemente cun clic no botón <strong>"%s"</strong> , Se non estableceu a conta contable no diccionario ou se aínda ten algunhas liñas non contabilizadas a alguna conta, terá que facer unha contabilización manual dende o menú "<strong>%s</strong>".
+DescVentilDoneExpenseReport=Consulte aquí as liñas de informes de gastos e as súas contas contables
 
 DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
 OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
-ValidateMovements=Validate movements
+ValidateMovements=Validar os movementos
 DescValidateMovements=Any modification or deletion of writing, lettering and deletes will be prohibited. All entries for an exercise must be validated otherwise closing will not be possible
-SelectMonthAndValidate=Select month and validate movements
+SelectMonthAndValidate=Selecciona mes e valida movementos
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic binding done
+ValidateHistory=Contabilizar automáticamente
+AutomaticBindingDone=Ligazón automática finalizada
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
-Balancing=Balancing
-FicheVentilation=Binding card
-GeneralLedgerIsWritten=Transactions are written in the Ledger
-GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalized. If there is no other error message, this is probably because they were already journalized.
-NoNewRecordSaved=No more record to journalize
-ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
-ChangeBinding=Change the binding
-Accounted=Accounted in ledger
-NotYetAccounted=Not yet accounted in ledger
-ShowTutorial=Show Tutorial
+ErrorAccountancyCodeIsAlreadyUse=Erro, non pode eliminar esta conta xa que está a ser utilizada
+MvtNotCorrectlyBalanced=Asento contabilizado incorrectamente. Debe=%s. Haber=%s
+Balancing=Saldo
+FicheVentilation=Ficha contable
+GeneralLedgerIsWritten=Transaccións escritas no Libro Maior
+GeneralLedgerSomeRecordWasNotRecorded=Algunhas das operaciones non poden contabilizarse. Se non hai outra mensaxe de erro, é probable que xa estén contabilizadas.
+NoNewRecordSaved=Non hai mais rexistros para o diario
+ListOfProductsWithoutAccountingAccount=Listaxe de produtos sen contas contables
+ChangeBinding=Cambiar a unión
+Accounted=Contabilizada no Libro Maior
+NotYetAccounted=Aínda non contabilizada no Libro Maior
+ShowTutorial=Amosar Tutorial
 NotReconciled=Non reconciliado
 
 ## Admin
-ApplyMassCategories=Apply mass categories
-AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
-CategoryDeleted=Category for the accounting account has been removed
+BindingOptions=Binding options
+ApplyMassCategories=Aplicar categorías en masa
+AddAccountFromBookKeepingWithNoCategories=Conta dispoñible sen grupo persoalizado
+CategoryDeleted=A categoría para a conta contable foi eliminada
 AccountingJournals=Diarios contables
-AccountingJournal=Accounting journal
-NewAccountingJournal=New accounting journal
+AccountingJournal=Diario contable
+NewAccountingJournal=Novo diario contable
 ShowAccountingJournal=Amosar diario contable
-NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
+NatureOfJournal=Natureza do diario
+AccountingJournalType1=Operacións varias
 AccountingJournalType2=Vendas
 AccountingJournalType3=Compras
 AccountingJournalType4=Banco
-AccountingJournalType5=Expenses report
+AccountingJournalType5=Informes de gastos
 AccountingJournalType8=Inventario
-AccountingJournalType9=Has-new
-ErrorAccountingJournalIsAlreadyUse=This journal is already use
-AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu <b>%s</b> - <b>%s</b>
-NumberOfAccountancyEntries=Number of entries
-NumberOfAccountancyMovements=Number of movements
+AccountingJournalType9=Haber
+ErrorAccountingJournalIsAlreadyUse=Este diario xa está a ser utilizado
+AccountingAccountForSalesTaxAreDefinedInto=Nota: A conta contable do IVE nas vendas defínese no menú <b> %s</b> - <b> %s</b>
+NumberOfAccountancyEntries=Número de entradas
+NumberOfAccountancyMovements=Número de movementos
 
 ## Export
-ExportDraftJournal=Export draft journal
-Modelcsv=Model of export
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export for CEGID Expert Comptabilité
-Modelcsv_COALA=Export for Sage Coala
-Modelcsv_bob50=Export for Sage BOB 50
-Modelcsv_ciel=Export for Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export for Quadratus QuadraCompta
-Modelcsv_ebp=Export for EBP
-Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
-Modelcsv_openconcerto=Export for OpenConcerto (Test)
-Modelcsv_configurable=Export CSV Configurable
-Modelcsv_FEC=Export FEC
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
-ChartofaccountsId=Chart of accounts Id
+ExportDraftJournal=Exportar libro borrador
+Modelcsv=Modelo de exportación
+Selectmodelcsv=Seleccione un modelo de exportación
+Modelcsv_normal=Exportación clásica
+Modelcsv_CEGID=Exportar cara a CEGID Expert Comptabilité
+Modelcsv_COALA=Exportar cara a Sage Celoala
+Modelcsv_bob50=Exportar cara a Sage BOB 50
+Modelcsv_ciel=Exportar cara a Sage Ciel Compta o Compta Evolution
+Modelcsv_quadratus=Exportar cara a Quadratus QuadraCompta
+Modelcsv_ebp=Exportar a EBP
+Modelcsv_cogilog=Exportar a Cogilog
+Modelcsv_agiris=Exportar a Agiris
+Modelcsv_LDCompta=Exportar a LD Compta (v9 & maior) (En Probas)
+Modelcsv_LDCompta10=Exportar a LD Compta (v10 & maior)
+Modelcsv_openconcerto=Exportar a OpenConcerto (En probas)
+Modelcsv_configurable=Exportar a CSV Configurable
+Modelcsv_FEC=Exportar FEC (Art. L47 A)
+Modelcsv_Sage50_Swiss=Exportar a Sage 50 Suiza
+Modelcsv_winfic=Exportar a Winfic - eWinfic - WinSis Conta
+ChartofaccountsId=Id do plan contable
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases.
-DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductSellIntra=Mode sales exported in EEC
-OptionModeProductSellExport=Mode sales exported in other countries
-OptionModeProductBuy=Mode purchases
+InitAccountancy=Iniciar contabilidade
+InitAccountancyDesc=Pode usar esta páxina para inicializar o código contable en produtos e servizos que non teñen código contable definido para vendas e compras
+DefaultBindingDesc=Esta páxina pode usarse para establecer unha conta predeterminada que se utilizará para ligar rexistros de salarios, doncións, impostos e IVE cando non estexa establecida unha conta contable.
+DefaultClosureDesc=Esta páxina pode usarse para configurar os parámetros que se usarán para incluir un balance xeral.
+Options=Opcións
+OptionModeProductSell=Modo vendas
+OptionModeProductSellIntra=Modo Vendas exportación CEE
+OptionModeProductSellExport=Modo vendas exportación outros paises
+OptionModeProductBuy=Modo compras
 OptionModeProductBuyIntra=Mode purchases imported in EEC
 OptionModeProductBuyExport=Mode purchased imported from other countries
-OptionModeProductSellDesc=Show all products with accounting account for sales.
-OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
-OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
-OptionModeProductBuyDesc=Show all products with accounting account for purchases.
+OptionModeProductSellDesc=Amosar todos os produtos con conta contable de vendas
+OptionModeProductSellIntraDesc=Amosar todos os produtos con conta contable para vendas na CEE.
+OptionModeProductSellExportDesc=Amosar todos os produtos con conta contable para outras vendas ao exterior.
+OptionModeProductBuyDesc=Amosar todos os produtos con conta contable de compras
 OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
 OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
-CleanFixHistory=Remove accounting code from lines that not exists into charts of account
-CleanHistory=Reset all bindings for selected year
-PredefinedGroups=Predefined groups
-WithoutValidAccount=Without valid dedicated account
-WithValidAccount=With valid dedicated account
-ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account
-AccountRemovedFromGroup=Account removed from group
-SaleLocal=Local sale
-SaleExport=Export sale
-SaleEEC=Sale in EEC
+CleanFixHistory=Eliminar código contable das liñas que no existen no plan contable
+CleanHistory=Resetear todos os vínculos do ano seleccionado
+PredefinedGroups=Grupos persoalizados
+WithoutValidAccount=Sen conta adicada válida
+WithValidAccount=Con conta adicada válida
+ValueNotIntoChartOfAccount=Este valor de conta contable non existe no plan xeral contable
+AccountRemovedFromGroup=Conta eliminada do grupo
+SaleLocal=Venda local
+SaleExport=Venda de exportación
+SaleEEC=Venda na CEE
 SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
 SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
 
 ## Dictionary
-Range=Range of accounting account
+Range=Rango de conta contable
 Calculated=Calculado
 Formula=Fórmula
 
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
-ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
-ErrorInvoiceContainsLinesNotYetBounded=You try to journalize some lines of the invoice <strong>%s</strong>, but some other lines are not yet bounded to accounting account. Journalization of all invoice lines for this invoice are refused.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Some lines on invoice are not bound to accounting account.
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookkeeping
-NoJournalDefined=No journal defined
-Binded=Lines bound
-ToBind=Lines to bind
-UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
+SomeMandatoryStepsOfSetupWereNotDone=Algúns pasos precisoss da configuración non foron realizados, prégase completalos.
+ErrorNoAccountingCategoryForThisCountry=Non hai grupos contables dispoñibles para %s (Vexa Inicio - Configuración - Diccionarios)
+ErrorInvoiceContainsLinesNotYetBounded=Tenta facer un diario de algunhas liñas da factura <strong>%s</strong>, pero algunhas outras liñas aínda non están ligadas a contas contables. Rexeitase a contabilización de todas as liñas de factura desta factura.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Algunhas liñas da factura non están ligadas a contas contables.
+ExportNotSupported=O formato de exportación configurado non é soportado nesta páxina
+BookeppingLineAlreayExists=Liñas xa existentes na contabilidade
+NoJournalDefined=Sen diario definido
+Binded=Liñas contabilizadas
+ToBind=Liñas a contabilizar
+UseMenuToSetBindindManualy=Non é posible autodetectar, utilice o menú <a href="%s"> %s </a> para realizar o apunte manualmente
 
 ## Import
-ImportAccountingEntries=Accounting entries
-DateExport=Date export
-WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manually in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate.
-ExpenseReportJournal=Expense Report Journal
-InventoryJournal=Inventory Journal
+ImportAccountingEntries=Entradas contables
+DateExport=Data de exportación
+WarningReportNotReliable=Advertencia, este informe non está baseado no Libro Maior, polo que non contén modificacións manualmente realizadas no Libro Maior. Se o seu diario está actualizado, a vista contable é mais precisa.
+ExpenseReportJournal=Informe de gastos diario
+InventoryJournal=Inventario
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index b4e5f205f5d..8b46f093b21 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Configuración do Módulo
 ModulesSetup=Configuración dos Módulos/Aplicacións
 ModuleFamilyBase=Sistema
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=O módulo <b>%s</b> debe ser activado antes se precisa
 SecurityToken=Chave para cifrar urls
 NoSmsEngine=Non hai dispoñible ningún xestor de envío de SMS. Os xestores de envío de SMS no son instalados por defecto xa que dependen de cada provedor, porén pode atopalos na plataforma %s
 PDF=PDF
-PDFDesc=Pode definir aquí as opcións globais para xerar os PDF
-PDFAddressForging=Regras de visualización de enderezos
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Ocultar toda a información relacionada co IVE ao xerar os PDF
 PDFRulesForSalesTax=Regras de IVE
 PDFLocaltax=Regras para %s
-HideLocalTaxOnPDF=Ocultar a taxa %s na columna de impostos do pdf
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Ocultar descrición dos produtos ao xerar os PDF
 HideRefOnPDF=Ocultar referencia dos produtos ao xerar os PDF
 HideDetailsOnPDF=Ocultar detalles das liñas ao xerar os PDF
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Cambiar o prezo cuxa referencia de base é
 MassConvert=Convertir masivamente
 PriceFormatInCurrentLanguage=Formato de prezo na lingua utilizada
 String=Cadea de texto
+String1Line=String (1 line)
 TextLong=Texto longo
+TextLongNLines=Long text (n lines)
 HtmlText=Texto html
 Int=Numérico enteiro
 Float=Decimal
@@ -427,7 +430,7 @@ ExtrafieldRadio=Botón tipo radio (só un seleccionado)
 ExtrafieldCheckBox=Caixa de verificación
 ExtrafieldCheckBoxFromList=Caixa de verificación da táboa
 ExtrafieldLink=Vínculo a un obxecto
-ComputedFormula=Computed field
+ComputedFormula=Campo combinado
 ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
@@ -543,9 +546,9 @@ Module54Desc=Xestión de contratos (servizos ou suscripcións recurrentes)
 Module55Name=Códigos de barras
 Module55Desc=Xestión dos códigos de barras
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Domiciliacións bancarias
-Module57Desc=Xestión de domiciliacións. Tamén inclue xeración de ficheiro SEPA para países Europeos.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integración con sistema ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Crear/modificar servizos
 Permission534=Eliminar servizos
 Permission536=Ver/xestionar os servizos ocultos
 Permission538=Exportar servizos
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Consultar lista de materiais
 Permission651=Crear/Actualizar lista de material
 Permission652=Eliminar lista de material
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Consultar doacións/subvencións
 Permission702=Crear/modificar doacións/subvencións
 Permission703=Eliminar doacións/subvencións
@@ -848,6 +858,8 @@ Permission773=Eliminar informe de gastos
 Permission774=Consultar todos os informes de gastos (incluidos os non subordinados)
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar almacéns
@@ -900,6 +912,7 @@ Permission2515=Configuración directorios de documentos
 Permission2801=Utilizar o cliente FTP en modo leitura (só explorar e descargar)
 Permission2802=Utilizar o cliente FTP en modo escritura (borrar ou subir ficheiros)
 Permission3200=Consultar eventos arquivados e huellas dixitais
+Permission3301=Generate new modules
 Permission4001=Ver empregados
 Permission4002=Crear empregados
 Permission4003=Eliminar empregados
@@ -947,7 +960,8 @@ Permission63003=Eliminar recursos
 Permission63004=Ligar recursos a eventos da axenda
 DictionaryCompanyType=Tipos de terceiros
 DictionaryCompanyJuridicalType=Formas xurídicas de terceiros
-DictionaryProspectLevel=Cliente potencial
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Provincias
 DictionaryRegion=Rexións
 DictionaryCountry=Países
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Prantillas E-Mails
 DictionaryUnits=Unidades
 DictionaryMeasuringUnits=Unidades de Medida
 DictionarySocialNetworks=Redes sociais
-DictionaryProspectStatus=Estado cliente potencial
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Tipos de vacacións
 DictionaryOpportunityStatus=Estado de oportunidade para o proxecto/oportunidade
 DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
@@ -1076,7 +1091,7 @@ LoginPage=Páxina de login
 BackgroundImageLogin=Imaxe de fondo
 PermanentLeftSearchForm=Zona de procura permanente do menú esquerdo
 DefaultLanguage=Idioma por defecto
-EnableMultilangInterface=Activar interfaz multi-idioma
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Amosar o logotipo no menú da esquerda
 CompanyInfo=Empresa/Organización
 CompanyIds=Identificación da empresa/organización
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Sí en verano
@@ -1595,7 +1611,7 @@ MailingDelay=Seconds to wait after sending next message
 ##### Notification #####
 NotificationSetup=Email Notification module setup
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
-FixedEmailTarget=Recipient
+FixedEmailTarget=Destinatario
 ##### Sendings #####
 SendingsSetup=Shipping module setup
 SendingsReceiptModel=Sending receipt model
@@ -1658,7 +1674,7 @@ OptionVatDebitOptionDesc=VAT is due:<br>- on delivery of goods (based on invoice
 OptionPaymentForProductAndServices=Cash basis for products and services
 OptionPaymentForProductAndServicesDesc=VAT is due:<br>- on payment for goods<br>- on payments for services
 SummaryOfVatExigibilityUsedByDefault=Time of VAT eligibility by default according to chosen option:
-OnDelivery=On delivery
+OnDelivery=Pagamento á entrega
 OnPayment=On payment
 OnInvoice=On invoice
 SupposedToBePaymentDate=Payment date used
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,11 +1702,11 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
+CashDesk=Terminales Punto de Venda
 CashDeskSetup=Point of Sales module setup
 CashDeskThirdPartyForSell=Default generic third party to use for sales
 CashDeskBankAccountForSell=Default account to use to receive cash payments
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Para enviar solicitude de orzamento a prov
 MailToSendSupplierOrder=Pedimentos a provedor
 MailToSendSupplierInvoice=Facturas provedor
 MailToSendContract=Contratos
+MailToSendReception=Receptions
 MailToThirdparty=Terceiros
 MailToMember=Membros
 MailToUser=Usuarios
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Marxe esquerdo en PDF
 MAIN_PDF_MARGIN_RIGHT=Marxe dereito en PDF
 MAIN_PDF_MARGIN_TOP=Marxe superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Marxe inferior en PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=ID única da instancia
 SmallerThan=Menor que
 LargerThan=Maior que
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/gl_ES/agenda.lang b/htdocs/langs/gl_ES/agenda.lang
index 20eb9aefaf6..b76942ad53e 100644
--- a/htdocs/langs/gl_ES/agenda.lang
+++ b/htdocs/langs/gl_ES/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Número de eventos
 ListOfActions=Listaxe de eventos
 EventReports=Informes de evento
 Location=Localización
-ToUserOfGroup=A calquera usuario do grupo
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Evento para todo o(s) día(s)
 MenuToDoActions=Todos os eventos incompletos
 MenuDoneActions=Todos os eventos rematados
@@ -86,6 +86,8 @@ ProposalDeleted=Orzamento eliminado
 OrderDeleted=Pedido eliminado
 InvoiceDeleted=Factura eliminada
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Produto %s creado
 PRODUCT_MODIFYInDolibarr=Produto %s modificado
 PRODUCT_DELETEInDolibarr=Produto %s eliminado
@@ -158,3 +160,9 @@ DateStartPlusOne=Data inicio +1 hora
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/gl_ES/assets.lang b/htdocs/langs/gl_ES/assets.lang
index 7bc7e8d73a1..a8ede67427d 100644
--- a/htdocs/langs/gl_ES/assets.lang
+++ b/htdocs/langs/gl_ES/assets.lang
@@ -16,44 +16,44 @@
 #
 # Generic
 #
-Assets = Assets
-NewAsset = New asset
-AccountancyCodeAsset = Accounting code (asset)
-AccountancyCodeDepreciationAsset = Accounting code (depreciation asset account)
-AccountancyCodeDepreciationExpense = Accounting code (depreciation expense account)
-NewAssetType=New asset type
-AssetsTypeSetup=Asset type setup
-AssetTypeModified=Asset type modified
-AssetType=Asset type
-AssetsLines=Assets
+Assets = Activos
+NewAsset = Novo activo
+AccountancyCodeAsset = Código contable (activo)
+AccountancyCodeDepreciationAsset = Código contable (conta depreciación activo)
+AccountancyCodeDepreciationExpense = Código contable (conta depreciación gastos)
+NewAssetType=Nuevo tipo de activo
+AssetsTypeSetup=Configuración tipos de activos
+AssetTypeModified=Tipo de activo modificado
+AssetType=Tipo de activo
+AssetsLines=Activos
 DeleteType=Eliminar
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
-ShowTypeCard=Show type '%s'
+DeleteAnAssetType=Eliminar un tipo de activo
+ConfirmDeleteAssetType=¿Está certo de querer eliminar este tipo de activo?
+ShowTypeCard=Ver tipo '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
+ModuleAssetsName = Activos
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Assets description
+ModuleAssetsDesc = Descrición ben
 
 #
 # Admin page
 #
-AssetsSetup = Assets setup
-Settings = Settings
-AssetsSetupPage = Assets setup page
-ExtraFieldsAssetsType = Complementary attributes (Asset type)
-AssetsType=Asset type
-AssetsTypeId=Asset type id
-AssetsTypeLabel=Asset type label
-AssetsTypes=Assets types
+AssetsSetup = Configuración activos
+Settings = Configuracións
+AssetsSetupPage = Configuración activos
+ExtraFieldsAssetsType = Campos adicionais (tipos de activos)
+AssetsType=Tipo de activo
+AssetsTypeId=Id tipo de activo
+AssetsTypeLabel=Etiqueta tipo de activo
+AssetsTypes=Tipos de activos
 
 #
 # Menu
 #
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
+MenuAssets = Activos
+MenuNewAsset = Novo ben
+MenuTypeAssets = Tipo de activos
 MenuListAssets = Listaxe
 MenuNewTypeAssets = Novo
 MenuListTypeAssets = Listaxe
@@ -61,5 +61,5 @@ MenuListTypeAssets = Listaxe
 #
 # Module
 #
-NewAssetType=New asset type
-NewAsset=New asset
+NewAssetType=Nuevo tipo de activo
+NewAsset=Novo activo
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index 029c6deba8e..93160d3254e 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Banco
 MenuBankCash=Bancos | Caixa
-MenuVariousPayment=Pagos varios
-MenuNewVariousPayment=Novos pagos varios
+MenuVariousPayment=Pagamentos varios
+MenuNewVariousPayment=Novos pagamentos varios
 BankName=Nome do banco
 FinancialAccount=Conta
 BankAccount=Conta bancaria
@@ -35,7 +35,7 @@ SwiftValid=BIC/SWIFT válido
 SwiftVNotalid=BIC/SWIFT non válido
 IbanValid=IBAN válido
 IbanNotValid=IBAN non válido
-StandingOrders=Direct debit orders
+StandingOrders=Domiciliacións
 StandingOrder=Domiciliación
 PaymentByDirectDebit=Payment by direct debit
 PaymentByBankTransfers=Payments by credit transfer
@@ -76,7 +76,7 @@ BankTransaction=Rexistro bancario
 ListTransactions=Listaxe rexistros
 ListTransactionsByCategory=Listaxe rexistros/categoría
 TransactionsToConciliate=Rexistros a conciliar
-TransactionsToConciliateShort=To reconcile
+TransactionsToConciliateShort=A conciliar
 Conciliable=Pode ser conciliado
 Conciliate=Conciliar
 Conciliation=Conciliación
@@ -88,7 +88,7 @@ AccountToCredit=Conta de crédito
 AccountToDebit=Conta de débito
 DisableConciliation=Desactivar a función de conciliación para esta conta
 ConciliationDisabled=Función de conciliación desactivada
-LinkedToAConciliatedTransaction=Vinculada a un rexistro conciliado
+LinkedToAConciliatedTransaction=Ligada a un rexistro conciliado
 StatusAccountOpened=Aberta
 StatusAccountClosed=Pechada
 AccountIdShort=Número
@@ -98,31 +98,31 @@ AddBankRecordLong=Engadir rexistro manual
 Conciliated=Reconciliado
 ConciliatedBy=Reconciliado por
 DateConciliating=Data de reconciliación
-BankLineConciliated=Entry reconciled with bank receipt
+BankLineConciliated=Rexistro reconciliado
 Reconciled=Reconciliado
 NotReconciled=Non reconciliado
 CustomerInvoicePayment=Cobro a cliente
-SupplierInvoicePayment=Pago a provedor
-SubscriptionPayment=Pago cota
-WithdrawalPayment=Debit payment order
-SocialContributionPayment=Pago de imposto social/fiscal
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+SupplierInvoicePayment=Pagamento a provedor
+SubscriptionPayment=Pagamento cota
+WithdrawalPayment=Cobro de domiciliación
+SocialContributionPayment=Pagamento de imposto social/fiscal
+BankTransfer=Transferencia bancaria
+BankTransfers=Transferencias bancarias
 MenuBankInternalTransfer=Transferencia interna
 TransferDesc=Ao transferir dunha conta a outra, Dolibarr crea dous rexistros contables (un de débito na conta orixe e un de crédito na conta destino). Do mesmo importe (salvo o signo), a etiqueta e a data serán usadas para esta transacción.
 TransferFrom=De
 TransferTo=A
 TransferFromToDone=A transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s foi rexistrada.
 CheckTransmitter=Emisor
-ValidateCheckReceipt=¿Validar este cheque recibido?
+ValidateCheckReceipt=¿Validar este talón recibido?
 ConfirmValidateCheckReceipt=¿Está certo de querer validar esta remesa? (ningunha modificación será posible unha vez sexa aprobada)
 DeleteCheckReceipt=¿Eliminar esta remesa?
 ConfirmDeleteCheckReceipt=¿Está certo de querer eliminar esta remesa?
-BankChecks=Cheques bancarios
-BankChecksToReceipt=Cheques agardando o deposito
-BankChecksToReceiptShort=Cheques agardando o deposito
+BankChecks=Talóns bancarios
+BankChecksToReceipt=Talóns agardando o deposito
+BankChecksToReceiptShort=Talóns agardando deposito
 ShowCheckReceipt=Amosar remesa recibida
-NumberOfCheques=Nº de cheque
+NumberOfCheques=Nº de talón
 DeleteTransaction=Eliminar rexistro
 ConfirmDeleteTransaction=¿Está certo de querer eliminar este rexistro?
 ThisWillAlsoDeleteBankRecord=Isto tamén eliminará o rexistro bancario
@@ -132,21 +132,21 @@ Graph=Gráficos
 ExportDataset_banque_1=Rexistros bancarios e extractos de conta
 ExportDataset_banque_2=Xustificante bancario
 TransactionOnTheOtherAccount=Transacción sobre a outra conta
-PaymentNumberUpdateSucceeded=Número de pago actualizado correctamente
-PaymentNumberUpdateFailed=Numero de pago non puido ser actualizado
-PaymentDateUpdateSucceeded=Data de pago actualizada correctamente
-PaymentDateUpdateFailed=Data de pago non puido ser actualizada
+PaymentNumberUpdateSucceeded=Número de pagamento actualizado correctamente
+PaymentNumberUpdateFailed=Numero de pagamento non puido ser actualizado
+PaymentDateUpdateSucceeded=Data de pagamento actualizada correctamente
+PaymentDateUpdateFailed=Data de pagamento non puido ser actualizada
 Transactions=Transaccións
 BankTransactionLine=Rexistro bancario
 AllAccounts=Todas as contas bancarias e de caixa
 BackToAccount=Voltar á conta
 ShowAllAccounts=Amosar para todas as contas
 FutureTransaction=Transacción futura. Non é posible a reconciliación.
-SelectChequeTransactionAndGenerate=Seleccione/filtre cheques a engadir na remesa de cheches e facga click en "Crear".
+SelectChequeTransactionAndGenerate=Seleccione/filtre talóns a engadir na remesa de cheches e facga click en "Crear".
 InputReceiptNumber=Escolla o extracto relacionado coa conciliación. Use o valor númerico ordenable: YYMM or YYYYMMDD
 EventualyAddCategory=Eventualmente, especifique a categoría na que quere clasificar os rexistros
 ToConciliate=A reconciliar?
-ThenCheckLinesAndConciliate=Entón, chequea as liñas presentes no extracto bancario e faga click
+ThenCheckLinesAndConciliate=Entón, comprobe as liñas presentes no extracto bancario e faga click
 DefaultRIB=Conta bancaria por defecto
 AllRIB=Todas as contas bancarias
 LabelRIB=Nome da conta bancaria
@@ -154,18 +154,18 @@ NoBANRecord=Ningunha conta bancaria
 DeleteARib=Borrar rexistro bancario
 ConfirmDeleteRib=¿Está certo de querer eliminar esta conta bancaria?
 RejectCheck=Cheque rexeitado
-ConfirmRejectCheck=¿Está certo de querer marcar este cheque como rexeitado?
-RejectCheckDate=Data de rexeitamento do cheque
+ConfirmRejectCheck=¿Está certo de querer marcar este talón como rexeitado?
+RejectCheckDate=Data de rexeitamento do talón
 CheckRejected=Cheque rexeitado
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+CheckRejectedAndInvoicesReopened=Cheque de volta e facturas abertas de novo
 BankAccountModelModule=Modelos de documentos para contas bancarias
 DocumentModelSepaMandate=Prantilla de orde SEPA. Útil só para países membros da UE.
 DocumentModelBan=Prantilla para imprimir unha páxina coa información IBAN.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
-VariousPayments=Pagos varios
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
+NewVariousPayment=Novo pagamento varios
+VariousPayment=Pagamento varios
+VariousPayments=Pagamentos varios
+ShowVariousPayment=Amosar pagamentos varios
+AddVariousPayment=Engadir pagamentos varios
 SEPAMandate=Orde SEPA
 YourSEPAMandate=A súa orde SEPA
 FindYourSEPAMandate=Esta é a súa orde SEPA para autorizar a nosa empresa a realizar un petición de débito ao seu banco. Envíea de volta asinada (dixitalice o documento asinado) ou envíe por correo a
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index 477aecd928f..a11d0d3fecd 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -1,150 +1,150 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Factura
-Bills=Facturas e abonos
+Bills=Facturas
 BillsCustomers=Facturas a clientes
-BillsCustomer=Customer invoice
-BillsSuppliers=Facturas provedor
-BillsCustomersUnpaid=Unpaid customer invoices
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
-BillsLate=Late payments
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Vendors invoices statistics
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
-DisabledBecauseNotErasable=Disabled because cannot be erased
-InvoiceStandard=Standard invoice
-InvoiceStandardAsk=Standard invoice
-InvoiceStandardDesc=This kind of invoice is the common invoice.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
+BillsCustomer=Factura a cliente
+BillsSuppliers=Facturas de provedores
+BillsCustomersUnpaid=Facturas a clientes pendentes de cobro
+BillsCustomersUnpaidForCompany=Facturas pendentes de cobro de %s
+BillsSuppliersUnpaid=Facturas de provedores pendentes de pagamento
+BillsSuppliersUnpaidForCompany=Facturas pendentes de pagamento a %s
+BillsLate=Atraso no pagamento
+BillsStatistics=Estatísticas de facturas a clientes
+BillsStatisticsSuppliers=Estatísticas de facturas de provedores
+DisabledBecauseDispatchedInBookkeeping=Desactivado porque a factura contabilizouse
+DisabledBecauseNotLastInvoice=Desactivado porque a factura non pódese borrar. Foron creadas facturas despois desta e crearían ocos no contador.
+DisabledBecauseNotErasable=Desactivado xa que non pode eliminarse
+InvoiceStandard=Factura estándar
+InvoiceStandardAsk=Factura estándar
+InvoiceStandardDesc=Este tipo de factura é a factura tradicional.
+InvoiceDeposit=Factura de anticipo
+InvoiceDepositAsk=Factura de anticipo
 InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
-InvoiceProForma=Proforma invoice
-InvoiceProFormaAsk=Proforma invoice
-InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
-InvoiceReplacement=Replacement invoice
-InvoiceReplacementAsk=Replacement invoice for invoice
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
-InvoiceAvoir=Credit note
-InvoiceAvoirAsk=Credit note to correct invoice
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
-ReplaceInvoice=Replace invoice %s
-ReplacementInvoice=Replacement invoice
-ReplacedByInvoice=Replaced by invoice %s
-ReplacementByInvoice=Replaced by invoice
-CorrectInvoice=Correct invoice %s
-CorrectionInvoice=Correction invoice
-UsedByInvoice=Used to pay invoice %s
-ConsumedBy=Consumed by
-NotConsumed=Not consumed
-NoReplacableInvoice=No replaceable invoices
-NoInvoiceToCorrect=No invoice to correct
-InvoiceHasAvoir=Was source of one or several credit notes
-CardBill=Invoice card
-PredefinedInvoices=Predefined Invoices
+InvoiceProForma=Factura proforma
+InvoiceProFormaAsk=Factura proforma
+InvoiceProFormaDesc=A <b>factura proforma</b> é a imaxe dunha factura definitiva, pero que non ten ningún valor contable.
+InvoiceReplacement=Factura rectificativa
+InvoiceReplacementAsk=Factura rectificativa da factura
+InvoiceReplacementDesc=A <b>factura rectificativa</b> serve para cancelar e sustituir unha factura existente sobre a que ainda non hai pagamentos recibidos.<br><br>Nota: Só poden rectificarse as facturas sen pagamentos rexistrados. Se esta última non está pechada, pasará automáticamente ao estado 'abandonada'.
+InvoiceAvoir=Factura con rectificación parcial
+InvoiceAvoirAsk=Abono para corrixir a factura
+InvoiceAvoirDesc=O <b>abono</b> é unha factura negativa destinada a compensar un importe de factura que difire do importe realmente pagado (por ter pagado de mais ou por devolución de produtos, por exemplo).
+invoiceAvoirWithLines=Crear abono coas liñas da factura orixinal
+invoiceAvoirWithPaymentRestAmount=Crear abono co resto a cobrar da factura orixe
+invoiceAvoirLineWithPaymentRestAmount=Abono do resto por cobrar
+ReplaceInvoice=Rectificar a factura %s
+ReplacementInvoice=Rectificación factura
+ReplacedByInvoice=Rectificada pola factura %s
+ReplacementByInvoice=Rectificada por factura
+CorrectInvoice=Correción factura %s
+CorrectionInvoice=Correción
+UsedByInvoice=Aplicado á factura %s
+ConsumedBy=Consumido por
+NotConsumed=Non consumido
+NoReplacableInvoice=Sen facturas rectificables
+NoInvoiceToCorrect=Sen facturas a corrixir
+InvoiceHasAvoir=Corrixida por un ou mais abonos
+CardBill=Ficha factura
+PredefinedInvoices=Factura predefinida
 Invoice=Factura
 PdfInvoiceTitle=Factura
-Invoices=Facturas e abonos
-InvoiceLine=Invoice line
-InvoiceCustomer=Customer invoice
-CustomerInvoice=Customer invoice
+Invoices=Facturas
+InvoiceLine=Liña de factura
+InvoiceCustomer=Factura a cliente
+CustomerInvoice=Factura a cliente
 CustomersInvoices=Facturas a clientes
 SupplierInvoice=Factura de provedor
-SuppliersInvoices=Vendors invoices
+SuppliersInvoices=Facturas provedores
 SupplierBill=Factura de provedor
-SupplierBills=suppliers invoices
-Payment=Payment
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
-Payments=Payments
-PaymentsBack=Refunds
-paymentInInvoiceCurrency=in invoices currency
-PaidBack=Paid back
-DeletePayment=Delete payment
-ConfirmDeletePayment=Are you sure you want to delete this payment?
+SupplierBills=Facturas de provedores
+Payment=Pagamento
+PaymentBack=Reembolso
+CustomerInvoicePaymentBack=Reembolso
+Payments=Pagamentos
+PaymentsBack=Reembolsos
+paymentInInvoiceCurrency=na moeda das facturas
+PaidBack=Reembolsado
+DeletePayment=Eliminar o pagamento
+ConfirmDeletePayment=¿Está certo de querer eliminar este pagamento?
 ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
 ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
 ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
 ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
 SupplierPayments=Pagamentos a provedores
-ReceivedPayments=Received payments
-ReceivedCustomersPayments=Payments received from customers
-PayedSuppliersPayments=Payments paid to vendors
-ReceivedCustomersPaymentsToValid=Received customers payments to validate
-PaymentsReportsForYear=Payments reports for %s
-PaymentsReports=Payments reports
-PaymentsAlreadyDone=Payments already done
-PaymentsBackAlreadyDone=Refunds already done
-PaymentRule=Payment rule
-PaymentMode=Payment Type
-PaymentTypeDC=Debit/Credit Card
+ReceivedPayments=Pagamentos recibidos
+ReceivedCustomersPayments=Pagamentos recibidos de cliente
+PayedSuppliersPayments=Pagamentos realizados a provedores
+ReceivedCustomersPaymentsToValid=Pagamentos recibidos de cliente a validar
+PaymentsReportsForYear=Informes de pagamentos de %s
+PaymentsReports=Informes de pagamentos
+PaymentsAlreadyDone=Pagamentos efectuados
+PaymentsBackAlreadyDone=Reembolsos xa efectuados
+PaymentRule=Forma de pagamento
+PaymentMode=Forma de pagamento
+PaymentTypeDC=Tarxeta de Débito/Crédito
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
+IdPaymentMode=Tipo de pagamento (id)
+CodePaymentMode=Tipo de pagamento (código)
+LabelPaymentMode=Tipo de pagamento (etiqueta)
+PaymentModeShort=Forma de pagamento
+PaymentTerm=Condición de pagamento
 PaymentConditions=Condicións de pagamento
 PaymentConditionsShort=Condicións de pagamento
-PaymentAmount=Importe pago
-PaymentHigherThanReminderToPay=Payment higher than reminder to pay
+PaymentAmount=Importe pagamento
+PaymentHigherThanReminderToPay=Pagamento superior ao resto a pagar
 HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
-ClassifyPaid=Classify 'Paid'
-ClassifyUnPaid=Classify 'Unpaid'
-ClassifyPaidPartially=Classify 'Paid partially'
-ClassifyCanceled=Classify 'Abandoned'
-ClassifyClosed=Classify 'Closed'
-ClassifyUnBilled=Classify 'Unbilled'
-CreateBill=Create Invoice
-CreateCreditNote=Create credit note
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
-DeleteBill=Delete invoice
-SearchACustomerInvoice=Search for a customer invoice
-SearchASupplierInvoice=Search for a vendor invoice
-CancelBill=Cancel an invoice
-SendRemindByMail=Send reminder by email
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
-EnterPaymentReceivedFromCustomer=Enter payment received from customer
-EnterPaymentDueToCustomer=Make payment due to customer
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
-PriceBase=Price base
-BillStatus=Invoice status
-StatusOfGeneratedInvoices=Status of generated invoices
-BillStatusDraft=Borrador (é preciso validar)
-BillStatusPaid=Pago
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
-BillStatusCanceled=Abandoned
-BillStatusValidated=Validated (needs to be paid)
-BillStatusStarted=Started
-BillStatusNotPaid=Not paid
-BillStatusNotRefunded=Not refunded
-BillStatusClosedUnpaid=Closed (unpaid)
-BillStatusClosedPaidPartially=Paid (partially)
+ClassifyPaid=Clasificar 'Pagado'
+ClassifyUnPaid=Clasificar 'Non pagado'
+ClassifyPaidPartially=Clasificar 'Pagado parcialmente'
+ClassifyCanceled=Clasificar 'Abandonado'
+ClassifyClosed=Clasificar 'Pechado'
+ClassifyUnBilled=Clasificar 'Non facturado'
+CreateBill=Crear factura
+CreateCreditNote=Crear abono
+AddBill=Crear factura ou abono
+AddToDraftInvoices=Engadir a factura borrador
+DeleteBill=Eliminar factura
+SearchACustomerInvoice=Atopar unha factura a cliente
+SearchASupplierInvoice=Atopar unha factura de provedores
+CancelBill=Anular unha factura
+SendRemindByMail=Enviar recordatorio
+DoPayment=Engadir pagamento
+DoPaymentBack=Engadir reembolso
+ConvertToReduc=Convertir en crédito dispoñible
+ConvertExcessReceivedToReduc=Convertir o recibido en exceso en crédito dispoñible
+ConvertExcessPaidToReduc=Convertir o recibido en exceso en desconto disponible
+EnterPaymentReceivedFromCustomer=Engadir pagamento recibido de cliente
+EnterPaymentDueToCustomer=Realizar pagamento de abonos ao cliente
+DisabledBecauseRemainderToPayIsZero=Desactivado xa que o resto a pagar é 0
+PriceBase=Prezo base
+BillStatus=Estado da factura
+StatusOfGeneratedInvoices=Estado das facturas xeradas
+BillStatusDraft=Borrador (a validar)
+BillStatusPaid=Pagada
+BillStatusPaidBackOrConverted=Reembolsada ou convertida en desconto
+BillStatusConverted=Pagada (lista para usarse en factura final)
+BillStatusCanceled=Abandonada
+BillStatusValidated=Validada (a pagar)
+BillStatusStarted=Pagada parcialmente
+BillStatusNotPaid=Pendente de pagamento
+BillStatusNotRefunded=Non reembolsada
+BillStatusClosedUnpaid=Pechada (pendente de pagamento)
+BillStatusClosedPaidPartially=Pechada (pagada parcialmente)
 BillShortStatusDraft=Borrador
-BillShortStatusPaid=Pago
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
+BillShortStatusPaid=Pagada
+BillShortStatusPaidBackOrConverted=Reembolsada ou convertida
+Refunded=Reembolsada
 BillShortStatusConverted=Pago
-BillShortStatusCanceled=Abandoned
-BillShortStatusValidated=Validado
-BillShortStatusStarted=Started
-BillShortStatusNotPaid=Not paid
-BillShortStatusNotRefunded=Not refunded
-BillShortStatusClosedUnpaid=Pechada
-BillShortStatusClosedPaidPartially=Paid (partially)
+BillShortStatusCanceled=Abandonada
+BillShortStatusValidated=Validada
+BillShortStatusStarted=Pagamento parcial
+BillShortStatusNotPaid=Pte. pagamento
+BillShortStatusNotRefunded=Non reembolsada
+BillShortStatusClosedUnpaid=Pechada (pte. pagamento)
+BillShortStatusClosedPaidPartially=Pechada (pagamento parcial)
 PaymentStatusToValidShort=A validar
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
+ErrorVATIntraNotConfigured=Número de CIF intracomunitario aínda non configurado
 ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
 ErrorBillNotFound=Invoice %s does not exist
@@ -166,25 +166,25 @@ LastBills=Latest %s invoices
 LatestTemplateInvoices=Latest %s template invoices
 LatestCustomerTemplateInvoices=Latest %s customer template invoices
 LatestSupplierTemplateInvoices=Latest %s vendor template invoices
-LastCustomersBills=Latest %s customer invoices
-LastSuppliersBills=Latest %s vendor invoices
-AllBills=All invoices
-AllCustomerTemplateInvoices=All template invoices
-OtherBills=Other invoices
-DraftBills=Draft invoices
-CustomersDraftInvoices=Customer draft invoices
-SuppliersDraftInvoices=Vendor draft invoices
-Unpaid=Unpaid
-ErrorNoPaymentDefined=Error No payment defined
-ConfirmDeleteBill=Are you sure you want to delete this invoice?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Are you sure you want to change invoice <b>%s</b> to draft status?
-ConfirmClassifyPaidBill=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmCancelBill=Are you sure you want to cancel invoice <b>%s</b>?
-ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What is the reason for closing this invoice?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularize the VAT with a credit note.
+LastCustomersBills=Últimas %s facturas a clientes
+LastSuppliersBills=Últimas %s facturas de provedores
+AllBills=Todas as facturas
+AllCustomerTemplateInvoices=Todas as prantillas de facturas
+OtherBills=Outras facturas
+DraftBills=Facturas borrador
+CustomersDraftInvoices=Facturas a cliente borrador
+SuppliersDraftInvoices=Facturas de provedores borrador
+Unpaid=Pendentes
+ErrorNoPaymentDefined=Erro no pagamento definido
+ConfirmDeleteBill=¿Está certo de querer eliminar esta factura?
+ConfirmValidateBill=¿Está certo de querer validar esta factura coa referencia <b>%s</b>?
+ConfirmUnvalidateBill=¿Está certo de querer cambiar o estado da factura <b>%s</b> a borrador?
+ConfirmClassifyPaidBill=¿Está certo de querer cambiar o estado da factura <b>%s</b> a pagado?
+ConfirmCancelBill=¿Está certo de querer anular a factura <b>%s</b>?
+ConfirmCancelBillQuestion=¿Por qué quere clasificar esta factura como 'abandoada'?
+ConfirmClassifyPaidPartially=¿Está certo de querer cambiar o estado da factura <b>%s</b> a pagado?
+ConfirmClassifyPaidPartiallyQuestion=Esta factura non foi pagada completamente. ¿Cal é a razón para pechar esta factura?
+ConfirmClassifyPaidPartiallyReasonAvoir=O resto a pagar <b>(%s %s)</b> é un desconto outorgado por pronto pagamento. Regularizaré o IVE cun abono.
 ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
@@ -199,16 +199,16 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when p
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all others are not suitable, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
 ConfirmClassifyAbandonReasonOther=Outro
 ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
-ConfirmCustomerPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmSupplierPayment=Do you confirm this payment input for <b>%s</b> %s?
-ConfirmValidatePayment=Are you sure you want to validate this payment? No change can be made once payment is validated.
-ValidateBill=Validate invoice
-UnvalidateBill=Unvalidate invoice
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
-AmountOfBills=Amount of invoices
-AmountOfBillsHT=Amount of invoices (net of tax)
-AmountOfBillsByMonthHT=Amount of invoices by month (net of tax)
+ConfirmCustomerPayment=¿Confirma o proceso  deste pagamento de <b>%s</b> %s?
+ConfirmSupplierPayment=¿Confirma o proceso  deste pagamento de <b>%s</b> %s?
+ConfirmValidatePayment=¿Está certo de querer validar este pagamento? Non permitense cambios despois de validar o pagamento.
+ValidateBill=Validar factura
+UnvalidateBill=Voltar factura a borrador
+NumberOfBills=Nº de facturas
+NumberOfBillsByMonth=Nº de facturas por mes
+AmountOfBills=Importe das facturas
+AmountOfBillsHT=Importe das facturas (Sen IVE)
+AmountOfBillsByMonthHT=Importe das facturas por mes (Sen IVE)
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
@@ -226,146 +226,146 @@ setretainedwarranty=Set retained warranty
 setretainedwarrantyDateLimit=Set retained warranty date limit
 RetainedWarrantyDateLimit=Retained warranty date limit
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
-AlreadyPaid=Already paid
-AlreadyPaidBack=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
-Abandoned=Abandoned
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to refund
+AlreadyPaid=Xa pago
+AlreadyPaidBack=Xa reembolsado
+AlreadyPaidNoCreditNotesNoDeposits=Xa pago (excluidos os abonos e anticipos)
+Abandoned=Abandoada
+RemainderToPay=Resta por pagar
+RemainderToTake=Resta por cobrar
+RemainderToPayBack=Resta por reembolsar
 Rest=Pendente
-AmountExpected=Amount claimed
-ExcessReceived=Excess received
-ExcessPaid=Excess paid
-EscompteOffered=Discount offered (payment before term)
+AmountExpected=Importe reclamado
+ExcessReceived=Recibido en exceso
+ExcessPaid=Pagado en exceso
+EscompteOffered=Desconto (Pronto pagamento)
 EscompteOfferedShort=Desconto
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-NoDraftBills=No draft invoices
-NoOtherDraftBills=No other draft invoices
-NoDraftInvoices=No draft invoices
-RefBill=Invoice ref
-ToBill=To bill
-RemainderToBill=Remainder to bill
-SendBillByMail=Send invoice by email
-SendReminderBillByMail=Send reminder by email
-RelatedCommercialProposals=Related commercial proposals
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
-MenuToValid=To valid
-DateMaxPayment=Payment due on
-DateInvoice=Invoice date
-DatePointOfTax=Point of tax
-NoInvoice=No invoice
-ClassifyBill=Classify invoice
-SupplierBillsToPay=Unpaid vendor invoices
-CustomerBillsUnpaid=Unpaid customer invoices
-NonPercuRecuperable=Non-recoverable
-SetConditions=Set Payment Terms
-SetMode=Set Payment Type
-SetRevenuStamp=Set revenue stamp
+SendBillRef=Envío da factura %s
+SendReminderBillRef=Envío da factura %s (recordatorio)
+NoDraftBills=Ningunha factura borrador
+NoOtherDraftBills=Ningunha outra factura borrador
+NoDraftInvoices=Sen facturas borrador
+RefBill=Ref. factura
+ToBill=A facturar
+RemainderToBill=Queda por facturar
+SendBillByMail=Enviar a factura por E-Mail
+SendReminderBillByMail=Enviar un recordatorio por E-Mail
+RelatedCommercialProposals=Presupuestos asociados
+RelatedRecurringCustomerInvoices=Facturas recorrentes asociadas
+MenuToValid=A validar
+DateMaxPayment=Data límite de pagamento
+DateInvoice=Data facturación
+DatePointOfTax=Impostos
+NoInvoice=Ninguna factura
+ClassifyBill=Clasificar a factura
+SupplierBillsToPay=Facturas de provedor pendentes de pagamento
+CustomerBillsUnpaid=Facturas a cliente pendentes de cobro
+NonPercuRecuperable=Non percibido recuperable
+SetConditions=Definir condicións de pagamento
+SetMode=Definir modo de pagamento
+SetRevenuStamp=Establecer selo fiscal
 Billed=Facturado
-RecurringInvoices=Recurring invoices
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice details
-CustomersInvoicesAndPayments=Customer invoices and payments
-ExportDataset_invoice_1=Customer invoices and invoice details
-ExportDataset_invoice_2=Customer invoices and payments
-ProformaBill=Proforma Bill:
-Reduction=Reduction
-ReductionShort=Disc.
-Reductions=Reductions
-ReductionsShort=Disc.
-Discounts=Discounts
-AddDiscount=Create discount
-AddRelativeDiscount=Create relative discount
-EditRelativeDiscount=Edit relative discount
-AddGlobalDiscount=Create absolute discount
-EditGlobalDiscounts=Edit absolute discounts
-AddCreditNote=Create credit note
-ShowDiscount=Show discount
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+RecurringInvoices=Facturas recurrentes
+RepeatableInvoice=Prantilla de factura
+RepeatableInvoices=Prantilla de facturas
+Repeatable=Prantilla
+Repeatables=Prantillas
+ChangeIntoRepeatableInvoice=Convertir en prantilla
+CreateRepeatableInvoice=Crear prantilla de factura
+CreateFromRepeatableInvoice=Crear desde prantilla de factura
+CustomersInvoicesAndInvoiceLines=Facturas a clientes e líñas de facturas
+CustomersInvoicesAndPayments=Facturas a clientes e pagamentos
+ExportDataset_invoice_1=Facturas a clientes e liñas de facturas
+ExportDataset_invoice_2=Facturas a clientes e pagamentos
+ProformaBill=Factura proforma:
+Reduction=Redución
+ReductionShort=Dto.
+Reductions=Descontos
+ReductionsShort=Dto.
+Discounts=Descontos
+AddDiscount=Crear desconto fixo
+AddRelativeDiscount=Crear desconto relativo
+EditRelativeDiscount=Editar desconto relativo
+AddGlobalDiscount=Crear desconto fixo
+EditGlobalDiscounts=Editar desconto fixo
+AddCreditNote=Crear factura de abono
+ShowDiscount=Amosar o desconto
+ShowReduc=Amosar a dedución
+ShowSourceInvoice=Amosar a factura fonte
 RelativeDiscount=Desconto relativo
-GlobalDiscount=Global discount
-CreditNote=Credit note
-CreditNotes=Credit notes
-CreditNotesOrExcessReceived=Credit notes or excess received
-Deposit=Down payment
-Deposits=Down payments
-DiscountFromCreditNote=Discount from credit note %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
-AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
-NewGlobalDiscount=New absolute discount
-NewRelativeDiscount=New relative discount
-DiscountType=Discount type
-NoteReason=Note/Reason
-ReasonDiscount=Razón
-DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
-SupplierDiscounts=Vendors discounts
-BillAddress=Bill address
+GlobalDiscount=Desconto fixo
+CreditNote=Abono
+CreditNotes=Abonos
+CreditNotesOrExcessReceived=Abonos ou exceso recibido
+Deposit=Anticipo
+Deposits=Anticipos
+DiscountFromCreditNote=Desconto resultante do abono %s
+DiscountFromDeposit=Pagamentos da factura de anticipo %s
+DiscountFromExcessReceived=Pagamentos recibidos en exceso da factura %s
+DiscountFromExcessPaid=Pagamentos recibidos en exceso da factura %s
+AbsoluteDiscountUse=Este tipo de desconto non pode utilizarse nunha factura antes da súa validación
+CreditNoteDepositUse=A factura debe ser validada para usar este tipo de crédito.
+NewGlobalDiscount=Novo desconto fixo
+NewRelativeDiscount=Novo desconto
+DiscountType=Tipo de desconto
+NoteReason=Nota/Motivo
+ReasonDiscount=Motivo
+DiscountOfferedBy=Acordado por
+DiscountStillRemaining=Descontos dispoñibles
+DiscountAlreadyCounted=Descontos xa consumidos
+CustomerDiscounts=Descontos a clientes
+SupplierDiscounts=Descontos de provedores
+BillAddress=Enderezo de facturación
 HelpEscompte=This discount is a discount granted to customer because payment was made before term.
 HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loss.
 HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by another for example)
-IdSocialContribution=Social/fiscal tax payment id
-PaymentId=Payment id
-PaymentRef=Payment ref.
-InvoiceId=Invoice id
-InvoiceRef=Invoice ref.
-InvoiceDateCreation=Invoice creation date
-InvoiceStatus=Invoice status
-InvoiceNote=Invoice note
-InvoicePaid=Invoice paid
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
-OrderBilled=Order billed
-DonationPaid=Donation paid
-PaymentNumber=Payment number
-RemoveDiscount=Remove discount
-WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty)
-InvoiceNotChecked=No invoice selected
-ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
-DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
-NbOfPayments=No. of payments
-SplitDiscount=Split discount in two
-ConfirmSplitDiscount=Are you sure you want to split this discount of <b>%s</b> %s into two smaller discounts?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts:
-TotalOfTwoDiscountMustEqualsOriginal=The total of the two new discounts must be equal to the original discount amount.
-ConfirmRemoveDiscount=Are you sure you want to remove this discount?
-RelatedBill=Related invoice
-RelatedBills=Related invoices
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related vendor invoices
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoices already exist
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-ListOfSituationInvoices=List of situation invoices
-CurrentSituationTotal=Total current situation
+IdSocialContribution=Id pagamento tasa social/fiscal
+PaymentId=ID pagamento
+PaymentRef=Ref. pagamento
+InvoiceId=Id factura
+InvoiceRef=Ref. factura
+InvoiceDateCreation=Data creación factura
+InvoiceStatus=Estado factura
+InvoiceNote=Nota factura
+InvoicePaid=Factura pagada
+InvoicePaidCompletely=Factura pagada completamente
+InvoicePaidCompletelyHelp=Factura pagada completamente. Isto exclúe facturas que foron pagadas parcialmente. Colle listaxe de todas as facturas "Pechadas" ou non "Pechadas", preferible ao uso do filtro no estado da factura.
+OrderBilled=Pedido facturado
+DonationPaid=Doación paga
+PaymentNumber=Número de pagamento
+RemoveDiscount=Eliminar desconto
+WatermarkOnDraftBill=Marca de auga en facturas borrador (nada se está baleira)
+InvoiceNotChecked=Ningunha factura está seleccionada
+ConfirmCloneInvoice=¿Está certo de querer clonar esta factura <b>%s</b>?
+DisabledBecauseReplacedInvoice=Acción desactivada porque é unha factura reemplazada
+DescTaxAndDividendsArea=Este área amosa un resumo de todos os pagamentos realizados en gastos especiais. So incluense os rexistros do ano seleccionado.
+NbOfPayments=Nº de pagamentos
+SplitDiscount=Dividir o dto. en dous
+ConfirmSplitDiscount=¿Está certo de querer dividir este desconto de <b>%s</b> %s en dous descontos menores?
+TypeAmountOfEachNewDiscount=Indique o importe para cada parte:
+TotalOfTwoDiscountMustEqualsOriginal=A suma do importe dos dous novos descontos debe ser a mesma que o importe do desconto a dividir.
+ConfirmRemoveDiscount=¿Está certo de querer borrar este desconto?
+RelatedBill=Factura asociada
+RelatedBills=Facturas asociadas
+RelatedCustomerInvoices=Facturas a clientes asociadas
+RelatedSupplierInvoices=Facturas de provedores asociadas
+LatestRelatedBill=Última factura relacionada
+WarningBillExist=Atención, xa existe alo menos unha factura
+MergingPDFTool=Herramienta de fusión PDF
+AmountPaymentDistributedOnInvoice=Importe do pagamento distribuido na factura
+PaymentOnDifferentThirdBills=Permitir pagamentos de diferentes terceiros da empresa nai
+PaymentNote=Nota do pagamento
+ListOfPreviousSituationInvoices=Listaxe de facturas de situación previas
+ListOfNextSituationInvoices=Listaxe das próximas facturas de situación
+ListOfSituationInvoices=Listaxe de facturas de situación
+CurrentSituationTotal=Total situación actual
 DisabledBecauseNotEnouthCreditNote=To remove a situation invoice from cycle, this invoice's credit note total must cover this invoice total
 RemoveSituationFromCycle=Remove this invoice from cycle
 ConfirmRemoveSituationFromCycle=Remove this invoice %s from cycle ?
 ConfirmOuting=Confirm outing
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-FrequencyUnit=Frequency unit
+FrequencyPer_d=Cada %s días
+FrequencyPer_m=Cada %s meses
+FrequencyPer_y=Cada %s anos
+FrequencyUnit=Frecuencia
 toolTipFrequency=Examples:<br><b>Set 7, Day</b>: give a new invoice every 7 days<br><b>Set 3, Month</b>: give a new invoice every 3 month
 NextDateToExecution=Date for next invoice generation
 NextDateToExecutionShort=Date next gen.
@@ -386,127 +386,127 @@ ViewAvailableGlobalDiscounts=View available discounts
 GroupPaymentsByModOnReports=Group payments by mode on reports
 # PaymentConditions
 Statut=Estado
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
-PaymentConditionShort30D=30 days
-PaymentCondition30D=30 days
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
-PaymentConditionShort60D=60 days
-PaymentCondition60D=60 days
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
-PaymentConditionShortPT_DELIVERY=Delivery
-PaymentConditionPT_DELIVERY=On delivery
-PaymentConditionShortPT_ORDER=Pedido
-PaymentConditionPT_ORDER=On order
-PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-PaymentConditionShort10D=10 days
-PaymentCondition10D=10 days
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
-PaymentConditionShort14D=14 days
-PaymentCondition14D=14 days
-PaymentConditionShort14DENDMONTH=14 days of month-end
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount - 1 line with label '%s'
-VarAmount=Variable amount (%% tot.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
+PaymentConditionShortRECEP=Acuse de recibo
+PaymentConditionRECEP=Acuse de recibo
+PaymentConditionShort30D=30 días
+PaymentCondition30D=Pagamento a 30 días
+PaymentConditionShort30DENDMONTH=30 días a fin de mes
+PaymentCondition30DENDMONTH=30 días a fin de mes
+PaymentConditionShort60D=60 días
+PaymentCondition60D=Pagamento aos 60 días
+PaymentConditionShort60DENDMONTH=60 días fin de mes
+PaymentCondition60DENDMONTH=60 días a fin de mes
+PaymentConditionShortPT_DELIVERY=Á entrega
+PaymentConditionPT_DELIVERY=Pagamento á entrega
+PaymentConditionShortPT_ORDER=Orde
+PaymentConditionPT_ORDER=Á recepción do pedimento
+PaymentConditionShortPT_5050=50/50
+PaymentConditionPT_5050=Pagamento 50%% por adiantado, 50%% á entrega
+PaymentConditionShort10D=10 días
+PaymentCondition10D=Pagamento aos 10 días
+PaymentConditionShort10DENDMONTH=10 días fin de mes
+PaymentCondition10DENDMONTH=10 días a fin de mes
+PaymentConditionShort14D=14 días
+PaymentCondition14D=Pagamento aos 14 días
+PaymentConditionShort14DENDMONTH=14 días fin de mes
+PaymentCondition14DENDMONTH=14 días a fin de més
+FixAmount=Importe fixo
+VarAmount=Importe variable (%% total)
+VarAmountOneLine=Cantidade variable (%% tot.) - 1 liña coa etiqueta '%s'
 VarAmountAllLines=Variable amount (%% tot.) - all same lines
 # PaymentType
 PaymentTypeVIR=Transferencia bancaria
 PaymentTypeShortVIR=Transferencia bancaria
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
+PaymentTypePRE=Domiciliación
+PaymentTypeShortPRE=Domiciliación
+PaymentTypeLIQ=Efectivo
+PaymentTypeShortLIQ=Efectivo
 PaymentTypeCB=Tarxeta de crédito
 PaymentTypeShortCB=Tarxeta de crédito
 PaymentTypeCHQ=Verificar
 PaymentTypeShortCHQ=Verificar
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
-PaymentTypeTRA=Bank draft
+PaymentTypeTIP=TIP (Titulo interbancario de pagamento)
+PaymentTypeShortTIP=Pagamento TIP
+PaymentTypeVAD=Pagamento en liña
+PaymentTypeShortVAD=Pagamento en liña
+PaymentTypeTRA=Banco borrador
 PaymentTypeShortTRA=Borrador
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
-BankDetails=Bank details
-BankCode=Bank code
-DeskCode=Branch code
-BankAccountNumber=Account number
-BankAccountNumberKey=Checksum
+BankDetails=Datos bancarios
+BankCode=Código banco
+DeskCode=Código oficina
+BankAccountNumber=Número conta
+BankAccountNumberKey=DC
 Residence=Enderezo
-IBANNumber=IBAN account number
+IBANNumber=Número de conta IBAN completo
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN do cliente
+SupplierIBAN=IBAN do provedor
 BIC=BIC/SWIFT
 BICNumber=Código BIC/SWIFT
-ExtraInfos=Extra infos
-RegulatedOn=Regulated on
-ChequeNumber=Check N°
-ChequeOrTransferNumber=Check/Transfer N°
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer transmitter
-ChequeBank=Bank of Check
+ExtraInfos=Información complementaria
+RegulatedOn=Pagar o
+ChequeNumber=Talón nº
+ChequeOrTransferNumber=Talón/Transferencia nº
+ChequeBordereau=Comprobar axenda
+ChequeMaker=Transmisor Talón/Transferencia
+ChequeBank=Banco do talón
 CheckBank=Verificar
-NetToBePaid=Net to be paid
-PhoneNumber=Tel
-FullPhoneNumber=Telephone
+NetToBePaid=Neto a pagar
+PhoneNumber=Tel.
+FullPhoneNumber=Teléfono
 TeleFax=Fax
-PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
-IntracommunityVATNumber=Intra-Community VAT ID
-PaymentByChequeOrderedTo=Check payments (including tax) are payable to %s, send to
-PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
-SendTo=sent to
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
-VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
-LawApplicationPart1=By application of the law 80.335 of 12/05/80
-LawApplicationPart2=the goods remain the property of
-LawApplicationPart3=the seller until full payment of
-LawApplicationPart4=their price.
-LimitedLiabilityCompanyCapital=SARL with Capital of
+PrettyLittleSentence=Acepto o pagamento mediante talóns ao meu nome das sumas debidas, na miña calidade de membro dunha empresa autorizada pola Administración Fiscal.
+IntracommunityVATNumber=Número de IVE intracomunitario
+PaymentByChequeOrderedTo=Pagamento mediante talón nominativo a %s enviado a
+PaymentByChequeOrderedToShort=Pagamento mediante talón nominativo a
+SendTo=enviado a
+PaymentByTransferOnThisBankAccount=Pagamento mediante transferencia á conta bancaria seguinte
+VATIsNotUsedForInvoice=* IVE non aplicable  art-293B del CGI
+LawApplicationPart1=Pola aplicación da lei 80.335 de 12/05/80
+LawApplicationPart2=as mercancías permanecen en propiedade de
+LawApplicationPart3=vendedor ata o completo cobro de
+LawApplicationPart4=seus prezos
+LimitedLiabilityCompanyCapital=SRL con capital de
 UseLine=Aplicar
-UseDiscount=Use discount
-UseCredit=Use credit
-UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
-MenuChequeDeposits=Check Deposits
-MenuCheques=Checks
-MenuChequesReceipts=Check receipts
-NewChequeDeposit=New deposit
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
-Cheques=Checks
-DepositId=Id deposit
-NbCheque=Number of checks
-CreditNoteConvertedIntoDiscount=This %s has been converted into %s
-UsBillingContactAsIncoiveRecipientIfExist=Use contact/address with type 'billing contact' instead of third-party address as recipient for invoices
-ShowUnpaidAll=Show all unpaid invoices
-ShowUnpaidLateOnly=Show late unpaid invoices only
-PaymentInvoiceRef=Payment invoice %s
-ValidateInvoice=Validate invoice
-ValidateInvoices=Validate invoices
-Cash=Cash
-Reported=Delayed
-DisabledBecausePayments=Not possible since there are some payments
-CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
-ExpectedToPay=Expected payment
-CantRemoveConciliatedPayment=Can't remove reconciled payment
-PayedByThisPayment=Paid by this payment
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
-ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
-AllCompletelyPayedInvoiceWillBeClosed=All invoices with no remainder to pay will be automatically closed with status "Paid".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Tax stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating an invoice from tab "Customer" of third party
+UseDiscount=Aplicar desconto
+UseCredit=Usar crédito
+UseCreditNoteInInvoicePayment=Reducir o pagamento con este crédito
+MenuChequeDeposits=Remesas
+MenuCheques=Xestión talóns
+MenuChequesReceipts=Listaxe
+NewChequeDeposit=Novo depósito
+ChequesReceipts=Listaxe remesas
+ChequesArea=Área remesas
+ChequeDeposits=Depósito de talóns
+Cheques=Talóns
+DepositId=Id. depósito
+NbCheque=Número de talóns
+CreditNoteConvertedIntoDiscount=Este %s foi convertido en %s
+UsBillingContactAsIncoiveRecipientIfExist=Usar contacto/enderezo de tipo 'contacto facturación' no lugar do enderezo do terceiro como destinatario das facturas
+ShowUnpaidAll=Amosar todos os pendentes
+ShowUnpaidLateOnly=Amosar so os pendentes en retraso
+PaymentInvoiceRef=Pagamento factura %s
+ValidateInvoice=Validar factura
+ValidateInvoices=Facturas validadas
+Cash=Efectivo
+Reported=Aprazado
+DisabledBecausePayments=Non dispoñible xa que existen pagamentos
+CantRemovePaymentWithOneInvoicePaid=Eliminación imposible cando existe alo menos unha factura clasificada como pagada.
+ExpectedToPay=Agardando o pagamento
+CantRemoveConciliatedPayment=Non pódese eliminar un pagamento conciliado
+PayedByThisPayment=Pagada por este pagamento
+ClosePaidInvoicesAutomatically=Clasificar como "Pagadas" as facturas, anticipos e facturas rectificativas completamente pagadas.
+ClosePaidCreditNotesAutomatically=Clasificar automáticamente como "Pagados" os abonos completamente reembolsados
+ClosePaidContributionsAutomatically=Clasificar como "Pagadas" todas as taxas fiscais ou sociais completamente pagadas
+AllCompletelyPayedInvoiceWillBeClosed=Todas as facturas cun resto a pagar 0 serán automáticamente pechadas ao estado "Pagada".
+ToMakePayment=Pagar
+ToMakePaymentBack=Reembolsar
+ListOfYourUnpaidInvoices=Listaxe de facturas impagadas
+NoteListOfYourUnpaidInvoices=Nota: Este listaxe só inclue os terceiros ds que vostede é comercial.
+RevenueStamp=Timbre fiscal
+YouMustCreateInvoiceFromThird=Esta opción só está dispoñible ao crear unha factura dende a lapela 'cliente' en terceiros
 YouMustCreateInvoiceFromSupplierThird=This option is only available when creating an invoice from tab "Vendor" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
@@ -519,14 +519,14 @@ CactusNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoic
 EarlyClosingReason=Early closing reason
 EarlyClosingComment=Early closing note
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Contacto cliente facturación pedido
-TypeContact_facture_external_SHIPPING=Contacto cliente entrega pedido
-TypeContact_facture_external_SERVICE=Customer service contact
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Contacto provedor factura
-TypeContact_invoice_supplier_external_SHIPPING=Contacto seguemento envío a provedor
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_facture_internal_SALESREPFOLL=Responsable seguimiento factura a cliente
+TypeContact_facture_external_BILLING=Contacto cliente facturación
+TypeContact_facture_external_SHIPPING=Contacto cliente entregas
+TypeContact_facture_external_SERVICE=Contacto cliente servizos
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Responsable seguemento facturas de provedor
+TypeContact_invoice_supplier_external_BILLING=Contacto provedor facturación
+TypeContact_invoice_supplier_external_SHIPPING=Contacto provedor entregas
+TypeContact_invoice_supplier_external_SERVICE=Contacto provedor servizos
 # Situation invoices
 InvoiceFirstSituationAsk=First situation invoice
 InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index b2acfbb98a0..1ae5652b2a9 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContacts=Últimos contactos/enderezos
 BoxLastMembers=Últimos membros
 BoxFicheInter=Últimas intervencións
 BoxCurrentAccounts=Balance de contas abertas
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMemberNextBirthdays=Cumpreanos neste mes (Membros)
 BoxTitleLastRssInfos=Últimas %s novas de %s
 BoxTitleLastProducts=Produtos/Servizos: Últimos %s modificados
 BoxTitleProductsAlertStock=Produtos: alerta de stock
@@ -27,22 +27,22 @@ BoxTitleLastSuppliers=Últimos %s provedores rexistrados
 BoxTitleLastModifiedSuppliers=Provedores: últimos %s modificados
 BoxTitleLastModifiedCustomers=Clientes: últimos %s modificados
 BoxTitleLastCustomersOrProspects=Últimos %s clientes ou clientes potenciais
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
+BoxTitleLastCustomerBills=Últimas %s facturas a clientes
+BoxTitleLastSupplierBills=Últimas %s facturas de provedores
 BoxTitleLastModifiedProspects=Orzamentos: Últimos %s modificados
 BoxTitleLastModifiedMembers=Últimos %s membros
 BoxTitleLastFicheInter=Últimas %s intervencións modificadas
-BoxTitleOldestUnpaidCustomerBills=Facturas Clientes: mais antigas %s pendentes de cobro
-BoxTitleOldestUnpaidSupplierBills=Facturas Provedores: mais antigas %s pendentes de pago
+BoxTitleOldestUnpaidCustomerBills=Facturas Clientes: últimas %s pendentes de cobro
+BoxTitleOldestUnpaidSupplierBills=Facturas Provedores: últimas %s pendentes de pago
 BoxTitleCurrentAccounts=Contas abertas: balance
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleSupplierOrdersAwaitingReception=Pedimentos de provedores agardando recepción
 BoxTitleLastModifiedContacts=Contactos/Enderezos: Últimos %s modificados
 BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Servizos antigos expirados
 BoxLastExpiredServices=Últimos %s contratos mais antigos con servizos expirados
 BoxTitleLastActionsToDo=Últimas %s accións a realizar
 BoxTitleLastContracts=Últimos %s contratos modificados
-BoxTitleLastModifiedDonations=Últimas %s donacións modificadas
+BoxTitleLastModifiedDonations=Últimas %s doacións/subvencións modificadas
 BoxTitleLastModifiedExpenses=Últimos %s informes de gastos modificados
 BoxTitleLatestModifiedBoms=Latest %s modified BOMs
 BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
@@ -56,7 +56,7 @@ ClickToAdd=Faga clic aquí para engadir.
 NoRecordedCustomers=Ningún cliente rexistrado
 NoRecordedContacts=Ningún contacto regxistrado
 NoActionsToDo=Sen eventos a realizar
-NoRecordedOrders=Sen pedidos de clientes rexistrados
+NoRecordedOrders=Sen pedimentos de clientes rexistrados
 NoRecordedProposals=Sen orzamentos rexistrados
 NoRecordedInvoices=Sen facturas a clientes rexistradas
 NoUnpaidCustomerBills=Non hai facturas a clientes pendentes de cobro
@@ -67,36 +67,40 @@ NoRecordedProspects=Sen clientes potenciais rexistrados
 NoContractedProducts=Sen produtos/servizos contratados
 NoRecordedContracts=Sen contratos rexistrados
 NoRecordedInterventions=Sen intervencións gardadas
-BoxLatestSupplierOrders=Últimos pedidos a provedores
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
-NoSupplierOrder=Sen pedidos a provedores
+BoxLatestSupplierOrders=Últimos pedimentos a provedores
+BoxLatestSupplierOrdersAwaitingReception=Últimos pedimentos a provedores (agardando recepción)
+NoSupplierOrder=Sen pedimentos a provedores
 BoxCustomersInvoicesPerMonth=Facturas a clientes por mes
 BoxSuppliersInvoicesPerMonth=Facturas de provedores por mes
-BoxCustomersOrdersPerMonth=Pedidos de clientes por mes
-BoxSuppliersOrdersPerMonth=Pedidos a provedores por mes
+BoxCustomersOrdersPerMonth=Pedimentos de clientes por mes
+BoxSuppliersOrdersPerMonth=Pedimentos a provedores por mes
 BoxProposalsPerMonth=Orzamentos por mes
 NoTooLowStockProducts=Sen produtos por debaixo do stock mínimo
 BoxProductDistribution=Distribución de produtos/servizos
-ForObject=On %s
+ForObject=En %s
 BoxTitleLastModifiedSupplierBills=Facturas Provedor: útimas %s modificadas
-BoxTitleLatestModifiedSupplierOrders=Pedidos Provedor: últimos %s modificados
+BoxTitleLatestModifiedSupplierOrders=Pedimentos Provedor: últimos %s modificados
 BoxTitleLastModifiedCustomerBills=Facturas Clientes: últimas %s modificadas
-BoxTitleLastModifiedCustomerOrders=Pedidos Clientes: últimos %s pedidos modificados
+BoxTitleLastModifiedCustomerOrders=Pedimentos Clientes: últimos %s pedimentos modificados
 BoxTitleLastModifiedPropals=Últimos %s orzamentos modificados
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Facturas a clientes
-ForCustomersOrders=Pedidos de clientes
+ForCustomersOrders=Pedimentos de clientes
 ForProposals=Orzamentos
 LastXMonthRolling=Os últimos %s meses consecutivos
 ChooseBoxToAdd=Engadir panel ao seu taboleiro
 BoxAdded=O panel foi agregado ao seu taboleiro
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
-NoRecordedManualEntries=No manual entries record in accountancy
-BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
-NumberOfLinesInSuspenseAccount=Number of line in suspense account
-SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
+BoxTitleUserBirthdaysOfMonth=Cumpreanos deste mes (Usuarios)
+BoxLastManualEntries=Últimas entradas manuais en contabilidade
+BoxTitleLastManualEntries=%s últimas entradas manuais
+NoRecordedManualEntries=Sen entradas manuais gravadas en contabilidade
+BoxSuspenseAccount=Operaciónen conta contable con conta en suspenso
+BoxTitleSuspenseAccount=Número de liñas non asignadas
+NumberOfLinesInSuspenseAccount=Número de liña en conta en suspenso
+SuspenseAccountNotDefined=Conta en suspenso non está definida
+BoxLastCustomerShipments=Últimos envios a clientes
+BoxTitleLastCustomerShipments=Últimos %s envíos a clientes
+NoRecordedShipments=Ningún envío a cliente rexistrado
+# Pages
+AccountancyHome=Contabilidade
diff --git a/htdocs/langs/gl_ES/cashdesk.lang b/htdocs/langs/gl_ES/cashdesk.lang
index 598db17a32f..0926360b26f 100644
--- a/htdocs/langs/gl_ES/cashdesk.lang
+++ b/htdocs/langs/gl_ES/cashdesk.lang
@@ -1,85 +1,85 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Point of sale
-CashDesk=Point of sale
-CashDeskBankCash=Bank account (cash)
-CashDeskBankCB=Bank account (card)
-CashDeskBankCheque=Bank account (cheque)
-CashDeskWarehouse=Warehouse
-CashdeskShowServices=Selling services
+CashDeskMenu=TPV
+CashDesk=Terminal Punto de Venda
+CashDeskBankCash=Conta bancaria (efectivo)
+CashDeskBankCB=Conta bancaria (tarxetas)
+CashDeskBankCheque=Conta bancaria (talóns)
+CashDeskWarehouse=Almacén
+CashdeskShowServices=Vender servizos
 CashDeskProducts=Produtos
 CashDeskStock=Stock
-CashDeskOn=on
-CashDeskThirdParty=Third party
-ShoppingCart=Shopping cart
-NewSell=New sell
-AddThisArticle=Add this article
-RestartSelling=Go back on sell
-SellFinished=Sale complete
-PrintTicket=Print ticket
-SendTicket=Send ticket
-NoProductFound=No article found
-ProductFound=product found
-NoArticle=No article
-Identification=Identification
-Article=Article
-Difference=Difference
-TotalTicket=Total ticket
-NoVAT=No VAT for this sale
-Change=Excess received
-BankToPay=Account for payment
-ShowCompany=Show company
-ShowStock=Show warehouse
-DeleteArticle=Click to remove this article
-FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
-PointOfSale=Point of Sale
-PointOfSaleShort=POS
-CloseBill=Close Bill
-Floors=Floors
-Floor=Floor
-AddTable=Add table
-Place=Place
-TakeposConnectorNecesary='TakePOS Connector' required
-OrderPrinters=Order printers
-SearchProduct=Search product
-Receipt=Receipt
-Header=Header
-Footer=Footer
-AmountAtEndOfPeriod=Amount at end of period (day, month or year)
-TheoricalAmount=Theorical amount
-RealAmount=Real amount
-CashFence=Cash fence
-CashFenceDone=Cash fence done for the period
-NbOfInvoices=Nb of invoices
-Paymentnumpad=Type of Pad to enter payment
-Numberspad=Numbers Pad
-BillsCoinsPad=Coins and banknotes Pad
-DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
-TakeposNeedsCategories=TakePOS needs product categories to work
-OrderNotes=Order Notes
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
+CashDeskOn=de
+CashDeskThirdParty=Terceiro
+ShoppingCart=Cesta
+NewSell=Nova venda
+AddThisArticle=Engadir este artigo
+RestartSelling=Retomar a venda
+SellFinished=Venda completada
+PrintTicket=Imprimir
+SendTicket=Enviar ticket
+NoProductFound=Ningún artigo atopado
+ProductFound=Produto atopado
+NoArticle=Ningún artigo
+Identification=Identificación
+Article=Artigo
+Difference=Diferencia
+TotalTicket=Total
+NoVAT=Sen IVE nesta venda
+Change=Cambio
+BankToPay=Conta de pago
+ShowCompany=Ver empresa
+ShowStock=Ver almacén
+DeleteArticle=Faga clic para borrar este artigo
+FilterRefOrLabelOrBC=Búsqueda (Ref/Etiq.)
+UserNeedPermissionToEditStockToUsePos=Configurada a disminución de stock na creación de facturas, polo que o usuario que utilice a TPV deberá ter permiso para editar stock.
+DolibarrReceiptPrinter=Impresora de tickets Dolibarr
+PointOfSale=Terminales Punto de Venda
+PointOfSaleShort=TPV
+CloseBill=Pechar factura
+Floors=Pisos
+Floor=Piso
+AddTable=Agregar tabla
+Place=Lugar
+TakeposConnectorNecesary='Conector TakePOS' requerido
+OrderPrinters=Impresoras de pedimentos
+SearchProduct=Procurar producto
+Receipt=Orde
+Header=Cabeceira
+Footer=Pé de páxina
+AmountAtEndOfPeriod=Importe ao final do período (día, mes ou ano)
+TheoricalAmount=Importe teórico
+RealAmount=Importe real
+CashFence=Peche de caixa
+CashFenceDone=Peche de caixa realizado para o período.
+NbOfInvoices=Nº de facturas
+Paymentnumpad=Tipo de Pad para introducir o pago.
+Numberspad=Teclado numérico
+BillsCoinsPad=Moedas e billetes de banco
+DolistorePosCategory=Módulos TakePOS e outras solucións POS para Dolibarr
+TakeposNeedsCategories=TakePOS precisa categorías de produtos para traballar
+OrderNotes=Pedimentos
+CashDeskBankAccountFor=Conta por defecto a usar para cobros en
+NoPaimementModesDefined=Non existe modo de pago definido na configuración de TakePOS
+TicketVatGrouped=Agrupar por tipo de IVE nos tickets
+AutoPrintTickets=Imprimir tickets automáticamente
 PrintCustomerOnReceipts=Print customer on tickets|receipts
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
-ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
-ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+EnableBarOrRestaurantFeatures=Habilitar características para Bar ou Restaurante
+ConfirmDeletionOfThisPOSSale=¿Está certo de querer eliminar a venda actual?
+ConfirmDiscardOfThisPOSSale=¿Queres descartar a venda actual??
 History=Histórico
-ValidateAndClose=Validate and close
+ValidateAndClose=Validar e pechar
 Terminal=Terminal
-NumberOfTerminals=Number of Terminals
-TerminalSelect=Select terminal you want to use:
-POSTicket=POS Ticket
+NumberOfTerminals=Número de terminais
+TerminalSelect=Seleccione o terminal que desexa usar:
+POSTicket=Ticket POS
 POSTerminal=POS Terminal
-POSModule=POS Module
-BasicPhoneLayout=Use basic layout for phones
-SetupOfTerminalNotComplete=Setup of terminal %s is not complete
-DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
+POSModule=POS Modulo
+BasicPhoneLayout=Utilizar deseño básico para teléfonos.
+SetupOfTerminalNotComplete=Configuración da terminal %s non está finalizada
+DirectPayment=Pago directo
+DirectPaymentButton=Add a "Direct cash payment" button
+InvoiceIsAlreadyValidated=A factura xa foi validada
+NoLinesToBill=Sen liñas a facturar
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
 ProductSupplements=Product Supplements
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/gl_ES/commercial.lang b/htdocs/langs/gl_ES/commercial.lang
index 8595a1b48fc..d3d132e83b5 100644
--- a/htdocs/langs/gl_ES/commercial.lang
+++ b/htdocs/langs/gl_ES/commercial.lang
@@ -19,7 +19,7 @@ ShowTask=Ver tarefa
 ShowAction=Ver evento
 ActionsReport=Informe de eventos
 ThirdPartiesOfSaleRepresentative=Terceiros cuxo representante de vendas é
-SaleRepresentativesOfThirdParty=Comerciais do terceiro
+SaleRepresentativesOfThirdParty=comerciais do terceiro
 SalesRepresentative=Comercial
 SalesRepresentatives=Comerciais
 SalesRepresentativeFollowUp=Comercial (seguemento)
@@ -73,8 +73,8 @@ StatusProsp=Estado prospección
 DraftPropals=Orzamentos borrador
 NoLimit=Sen límite
 ToOfferALinkForOnlineSignature=Enlace para a sinatura en liña
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commercial proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+WelcomeOnOnlineSignaturePage=Benvenido á paxina para aceptar orzamentos de %s
+ThisScreenAllowsYouToSignDocFrom=Esta pantalla permítelle aceptar e asinar, ou rexeitar, un orzamentos/proposta comercial
+ThisIsInformationOnDocumentToSign=Esta é a información do documento para aceptar ou rexeitar
+SignatureProposalRef=Sinatura do orzamento/proposta comercial %s
+FeatureOnlineSignDisabled=Característica para a sinatura en liña inhabilitada ou documento xerado antes de que fora habilitada a característica
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index 6a038562da7..872ffd25c6e 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -13,206 +13,207 @@ LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using r
 Param=Config.
 RemainingAmountPayment=Amount payment remaining:
 Account=Conta
-Accountparent=Parent account
-Accountsparent=Parent accounts
-Income=Income
-Outcome=Expense
-MenuReportInOut=Income / Expense
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
-PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
-PaymentsNotLinkedToUser=Payments not linked to any user
-Profit=Profit
-AccountingResult=Accounting result
-BalanceBefore=Balance (before)
+Accountparent=Conta pai
+Accountsparent=Contas pai
+Income=Ingresos
+Outcome=Gastos
+MenuReportInOut=Ingresos / Gastos
+ReportInOut=Balance de ingresos e gastos. Resultado
+ReportTurnover=Volume de vendas emitidas
+ReportTurnoverCollected=Volume de vendas cobradas
+PaymentsNotLinkedToInvoice=Pagamentos non ligados a algunha factura, polo que non están ligados a un terceiro
+PaymentsNotLinkedToUser=Pagamentos non ligados a un usuario
+Profit=Beneficio
+AccountingResult=Resultado contable
+BalanceBefore=Balance (antes)
 Balance=Saldo
-Debit=Debit
-Credit=Credit
-Piece=Accounting Doc.
-AmountHTVATRealReceived=Net collected
-AmountHTVATRealPaid=Net paid
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Tax monthly
-VATBalance=Tax Balance
-VATPaid=Tax paid
-LT1Summary=Tax 2 summary
-LT2Summary=Tax 3 summary
-LT1SummaryES=RE Balance
-LT2SummaryES=IRPF Balance
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
-LT1PaidES=RE Paid
-LT2PaidES=IRPF Paid
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
-LT2CustomerES=IRPF sales
-LT2SupplierES=IRPF purchases
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
-VATCollected=VAT collected
+Debit=Debe
+Credit=Haber
+Piece=Doc. contabilidade
+AmountHTVATRealReceived=Total repercutido
+AmountHTVATRealPaid=Total xa pago
+VATToPay=Vendas IVE
+VATReceived=IVE repercutido
+VATToCollect=IVE compras
+VATSummary=Balance de IVE mensual
+VATBalance=Balance de IVE
+VATPaid=Pagamento de IVE
+LT1Summary=Resumo RE
+LT2Summary=Resumo de IRPF
+LT1SummaryES=Balance de RE
+LT2SummaryES=Balance de IRPF
+LT1SummaryIN=Balance CGST
+LT2SummaryIN=Balance SGST
+LT1Paid=Pagamentos de IRPF
+LT2Paid=Pagamentos de IRPF
+LT1PaidES=RE xa pago
+LT2PaidES=IRPF xa pago
+LT1PaidIN=xa pago CGST
+LT2PaidIN=xa pago SGST
+LT1Customer=Vendas RE
+LT1Supplier=Compras RE
+LT1CustomerES=Vendas RE
+LT1SupplierES=Compras RE
+LT1CustomerIN=Vendas CGST
+LT1SupplierIN=Compras CGST
+LT2Customer=Vendas IRPF
+LT2Supplier=Compras IRPF
+LT2CustomerES=IRPF vendas
+LT2SupplierES=IRPF compras
+LT2CustomerIN=Vendas SGST
+LT2SupplierIN=Compras SGST
+VATCollected=IVE recuperado
 StatusToPay=A pagar
-SpecialExpensesArea=Area for all special payments
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-LabelContrib=Label contribution
-TypeContrib=Type contribution
-MenuSpecialExpenses=Special expenses
-MenuTaxAndDividends=Taxes and dividends
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-AddSocialContribution=Add social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Billing and payment area
-NewPayment=New payment
-PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=vendor invoice payment
-PaymentSocialContribution=Pago de imposto social/fiscal
-PaymentVat=VAT payment
-ListPayment=List of payments
-ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of vendor payments
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
-newLT1PaymentES=New RE payment
-newLT2PaymentES=New IRPF payment
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
-LT2PaymentES=IRPF Payment
-LT2PaymentsES=IRPF Payments
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
-ShowVatPayment=Show VAT payment
-TotalToPay=Total to pay
+SpecialExpensesArea=Área de pagamentos especiais
+SocialContribution=Impostos sociais ou fiscais
+SocialContributions=Impostos sociais ou fiscais
+SocialContributionsDeductibles=Impostos sociais ou fiscais deducibles
+SocialContributionsNondeductibles=Impostos sociais ou fiscais non deducibles
+DateOfSocialContribution=Date of social or fiscal tax
+LabelContrib=Etiqueta de contribución
+TypeContrib=Tipo de contribución
+MenuSpecialExpenses=Pagamentos especiais
+MenuTaxAndDividends=Impostos e dividendos
+MenuSocialContributions=Impostos sociais/fiscais
+MenuNewSocialContribution=Nova taxa social/fiscal
+NewSocialContribution=Nova taxa social/fiscal
+AddSocialContribution=Engadir taxa social/fiscal
+ContributionsToPay=Taxas sociais/fiscais a pagar
+AccountancyTreasuryArea=Área de facturación e pagamentos
+NewPayment=Novo pagamento
+PaymentCustomerInvoice=Cobro factura ao cliente
+PaymentSupplierInvoice=Pagamento factura de provedor
+PaymentSocialContribution=Pagamentos taxas sociais/fiscais
+PaymentVat=Pagamento IVE
+ListPayment=Listaxe de pagamentos
+ListOfCustomerPayments=Listaxe de pagamentos de clientes
+ListOfSupplierPayments=Listaxe de pagamentos a provedores
+DateStartPeriod=Data inicio período
+DateEndPeriod=Data final período
+newLT1Payment=Novo pagamento de RE
+newLT2Payment=Novo pagamento de IRPF
+LT1Payment=Pagamento de RE
+LT1Payments=Pagamentos RE
+LT2Payment=Pagamento de IRPF
+LT2Payments=Pagamentos IRPF
+newLT1PaymentES=Novo pagamento de RE
+newLT2PaymentES=Novo pagamento de IRPF
+LT1PaymentES=Pagamento de RE
+LT1PaymentsES=Pagamentos de RE
+LT2PaymentES=Pagamento de IRPF
+LT2PaymentsES=Pagamentos de IRPF
+VATPayment=Pagamento de IVE
+VATPayments=Pagamentos de IVE
+VATRefund=Devolución IVE
+NewVATPayment=Novo pagamento IVE
+NewLocalTaxPayment=Novo pagamento de %s
+Refund=Reembolso
+SocialContributionsPayments=Pagamentos de taxas sociais/fiscais
+ShowVatPayment=Consultar pagamentos de IVE
+TotalToPay=Total a pagar
 BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account
-CustomerAccountancyCode=Customer accounting code
-SupplierAccountancyCode=Vendor accounting code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
-AccountNumber=Account number
+CustomerAccountancyCode=Código contable cliente
+SupplierAccountancyCode=Código contable provedor
+CustomerAccountancyCodeShort=Cód. conta cliente
+SupplierAccountancyCodeShort=Cód. conta provedor
+AccountNumber=Número de conta
 NewAccountingAccount=Nova conta
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
-SalesTurnoverMinimum=Minimum turnover
-ByExpenseIncome=By expenses & incomes
+Turnover=Volume de vendas emitidas
+TurnoverCollected=Volume de vendas cobradas
+SalesTurnoverMinimum=Volume de vendas mínimo
+ByExpenseIncome=Por gastos e ingresos
 ByThirdParties=Por terceiros
-ByUserAuthorOfInvoice=By invoice author
-CheckReceipt=Check deposit
-CheckReceiptShort=Check deposit
-LastCheckReceiptShort=Latest %s check receipts
-NewCheckReceipt=New discount
-NewCheckDeposit=New check deposit
-NewCheckDepositOn=Create receipt for deposit on account: %s
-NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Analysis of known recorded invoices even if they are not yet accounted in ledger.
-CalcModeEngagement=Analysis of known recorded payments, even if they are not yet accounted in Ledger.
-CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
-AnnualByCompanies=Balance of income and expenses, by predefined groups of account
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See %sanalysis of payments%s for a calculation on actual payments made even if they are not yet accounted in Ledger.
-SeeReportInDueDebtMode=See %sanalysis of invoices%s for a calculation based on known recorded invoices even if they are not yet accounted in Ledger.
-SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from customers.<br>- It is based on the payment date of these invoices<br>
-RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
-RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts <b>grouped by personalized groups</b>
-SeePageForSetup=See menu <a href="%s">%s</a> for setup
-DepositsAreNotIncluded=- Down payment invoices are not included
-DepositsAreIncluded=- Down payment invoices are included
-LT1ReportByCustomers=Report tax 2 by third party
-LT2ReportByCustomers=Report tax 3 by third party
-LT1ReportByCustomersES=Report by third party RE
-LT2ReportByCustomersES=Report by third party IRPF
-VATReport=Sale tax report
-VATReportByPeriods=Sale tax report by period
-VATReportByRates=Sale tax report by rates
-VATReportByThirdParties=Sale tax report by third parties
-VATReportByCustomers=Sale tax report by customer
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by Sale tax rate of the tax collected and paid
-LT1ReportByQuarters=Report tax 2 by rate
-LT2ReportByQuarters=Report tax 3 by rate
-LT1ReportByQuartersES=Report by RE rate
-LT2ReportByQuartersES=Report by IRPF rate
-SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
+ByUserAuthorOfInvoice=Por autor da factura
+CheckReceipt=Listaxe de remesas
+CheckReceiptShort=Remesas
+LastCheckReceiptShort=Últimas %s remesas de talóns
+NewCheckReceipt=Nova remesa
+NewCheckDeposit=Novo ingreso
+NewCheckDepositOn=Crear nova remesa na conta: %s
+NoWaitingChecks=Sen talóns agardando depósito
+DateChequeReceived=Data recepción do talón
+NbOfCheques=Nº de talóns
+PaySocialContribution=Pagar unha taxa social/fiscal
+ConfirmPaySocialContribution=¿Está certo de querer clasificar esta taxa social ou fiscal como pagada?
+DeleteSocialContribution=Eliminar un pagamento de taxa social ou fiscal
+ConfirmDeleteSocialContribution=¿Está certo de querer eliminar este pagamento de taxa social/fiscal?
+ExportDataset_tax_1=taxas sociais e fiscais e pagamentos
+CalcModeVATDebt=Modo <b>%sIVE sobre facturas emitidas%s</b>.
+CalcModeVATEngagement=Modo <b>%sIVE sobre facturas cobradas%s</b>.
+CalcModeDebt=Análise de facturas rexistradas incluidas as aínda non contabilizadas no Libro Maior.
+CalcModeEngagement=Análise dos pagamentos rexistrados, incluidos os aínda non contabilizados no Libro Maior.
+CalcModeBookkeeping=Análise dos datos rexistrados no Libro Maior
+CalcModeLT1= Modo <b>%sRE facturas a clientes - facturas de provedores%s</b>
+CalcModeLT1Debt=Modo <b>%sRE en facturas a clientes%s</b>
+CalcModeLT1Rec= Modo <b>%sRE en facturas de provedores%s</b>
+CalcModeLT2= Modo <b>%sIRPF en facturas a clientes - facturas de provedores%s</b>
+CalcModeLT2Debt=Modo <b>%sIRPF en facturas a clientes%s</b>
+CalcModeLT2Rec= Modo <b>%sIRPF en facturas de provedores%s</b>
+AnnualSummaryDueDebtMode=Resumo anual do balance de ingresos e gastos
+AnnualSummaryInputOutputMode=Resumo anual do balance de ingresos e gastos
+AnnualByCompanies=Balance de ingresos e gastos, por grupos de conta predefinidos
+AnnualByCompaniesDueDebtMode=Balance de ingresos e gastos, desglosado por terceiros, en modo<b>%sCréditos-Débedas%s</b> coñecida como <b>contabilidade de compromiso</b>.
+AnnualByCompaniesInputOutputMode=Balance de ingresos e gastos, desglosado por terceiros, en modo <b>%sIngresos-Gastos%s</b> coñecido como <b>contabilidad de caixa</b>.
+SeeReportInInputOutputMode=Consulte %sanálise de pagamentos%s para obter un cálculo dos pagamentos efectuados, incluso se non foron contabilizados no Libro Maior.
+SeeReportInDueDebtMode=Consulte %sanálise de facturas %s para un cálculo baseado en facturas rexistradas coñecidas, incluso se aínda non foron contabilizadas no Libro Maior.
+SeeReportInBookkeepingMode=Consulte el <b>%sInforme de facturación%s</b> para realizar un cálculo na <b>Taboa Libro maior</b>
+RulesAmountWithTaxIncluded=- Os importes amosados son con todos os impostos incluidos.
+RulesResultDue=- Incluidas as facturas pendentes, os gastos, o IVE,  as doacións pagadas ou non. También inclúe os salarios xa pagos.<br>- Baseado na data da validación das facturas e IVE e na data de vencemento ds gastos. Para os salarios definidos co módulo de Salarios, é usada a data de valor do pagamento.
+RulesResultInOut=- Inclúe os pagamentos realizados sobre as facturas, os gastos e o IVE. <br>- Basado nas datas de pagamento das facturas, gastos e IVE. A data de doación para as doacións
+RulesCADue=- Inclúe as facturas a clientes, estexan xa pagas ou non.<br>- Baseado na data de validación das mesmas.<br>
+RulesCAIn=- Inclúe os pagamentos efectuados das facturas a clientes.<br>- Baseado na data de pagamento das mesmas<br>
+RulesCATotalSaleJournal=Inclúe todas as líñas de crédito do diario de vendas.
+RulesAmountOnInOutBookkeepingRecord=Inclúe rexistro no Libro Maior con contas contables que teñen o grupo "GASTOS" ou "INGRESOS"
+RulesResultBookkeepingPredefined=Inclúe rexistro no Libro Maior con contas contables que teñen o grupo "GASTOS" ou "INGRESOS"
+RulesResultBookkeepingPersonalized=Amosa un rexistro no Libro Maior con contas contables <b>agrupadas por grupos persoalizados</b>
+SeePageForSetup=Vexa o menú <a href="%s">%s</a> para configuralo
+DepositsAreNotIncluded=- As facturas de anticipo non están incluidas
+DepositsAreIncluded=- As facturas de anticipo están incluidas
+LT1ReportByCustomers=Informe por terceiro do RE
+LT2ReportByCustomers=Informe por terceiro do IRPF
+LT1ReportByCustomersES=Informe de RE por terceiro
+LT2ReportByCustomersES=Informe de IRPF por terceiro
+VATReport=Informe IVE
+VATReportByPeriods=Informe de IVE por período
+VATReportByRates=Informe de impostos por taxa
+VATReportByThirdParties=Informe de impostos por terceiros
+VATReportByCustomers=Informe IVE por cliente
+VATReportByCustomersInInputOutputMode=Informe por cliente do IVE repercutido e soportado
+VATReportByQuartersInInputOutputMode=Informe por taxa do IVE repercutido e soportado
+LT1ReportByQuarters=Informe de IRPF por taxa
+LT2ReportByQuarters=Informe de IRPF por taxa
+LT1ReportByQuartersES=Informe de RE por taxa
+LT2ReportByQuartersES=Informe de IRPF por taxa
+SeeVATReportInInputOutputMode=Ver o informe <b>%sIVA pagado%s</b> para un modo de cálculo estandard
+SeeVATReportInDueDebtMode=Ver o informe <b>%sIVA debido%s</b> para un modo de cálculo coa opción sobre o debido
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
 RulesVATInProducts=- For material assets, the report includes the VAT received or issued on the basis of the date of payment.
 RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
 RulesVATDueProducts=- For material assets, the report includes the VAT invoices, based on the invoice date.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
-ThisIsAnEstimatedValue=This is a preview, based on business events and not from the final ledger table, so final results may differ from this preview values
-PercentOfInvoice=%%/invoice
-NotUsedForGoods=Not used on goods
-ProposalStats=Statistics on proposals
-OrderStats=Statistics on orders
-InvoiceStats=Statistics on bills
-Dispatch=Dispatching
-Dispatched=Dispatched
-ToDispatch=To dispatch
-ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
-SellsJournal=Sales Journal
-PurchasesJournal=Purchases Journal
-DescSellsJournal=Sales Journal
-DescPurchasesJournal=Purchases Journal
+ThisIsAnEstimatedValue=Esta é unha vista previa, basaeda en eventos de negocios e non na taboa de contabilidade final, polo que os resultados finais poden diferir destos valores de vista previa
+PercentOfInvoice=%%/factura
+NotUsedForGoods=Non utilizado para os bens
+ProposalStats=Estatísticas de orzamentos
+OrderStats=Estatísticas de pedidos
+InvoiceStats=Estatísticas de facturas
+Dispatch=Desglose
+Dispatched=Contabilizadas
+ToDispatch=A contabilizar
+ThirdPartyMustBeEditAsCustomer=O terceiro debe estar definido como cliente
+SellsJournal=Diario de vendas
+PurchasesJournal=Diario de compras
+DescSellsJournal=Diario de vendas
+DescPurchasesJournal=Diario de compras
 CodeNotDef=Non definido
-WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Chart of accounts models
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By product and service
-RefExt=External ref
+WarningDepositsNotIncluded=As facturas de anticipo non están incluidas nesta versión con este módulo de contabilidade
+DatePaymentTermCantBeLowerThanObjectDate=A data límite de pagamento non pode ser inferior á data do obxecto
+Pcg_version=Modelos de pláns contables
+Pcg_type=Tipo de conta
+Pcg_subtype=Subtipo de conta
+InvoiceLinesToDispatch=Líñas de facturas a contabilizar
+ByProductsAndServices=Por produtos e servizos
+RefExt=Ref. externa
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Vincular a pedido
 Mode1=Method 1
@@ -221,39 +222,39 @@ CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is
 CalculationRuleDescSupplier=According to vendor, choose appropriate method to apply same calculation rule and get same result expected by your vendor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=The report of Turnover collected per product is not available. This report is only available for turnover invoiced.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=The report of Turnover collected per sale tax rate is not available. This report is only available for turnover invoiced.
-CalculationMode=Calculation mode
-AccountancyJournal=Accounting code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Accounting account by default for VAT on sales (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_BUY_ACCOUNT=Accounting account by default for VAT on purchases (used if not defined on VAT dictionary setup)
-ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
+CalculationMode=Modo de cálculo
+AccountancyJournal=Código contable diario
+ACCOUNTING_VAT_SOLD_ACCOUNT=Conta contable por defecto para o IVE de vendas (usado se non é definido no diccionario de IVE)
+ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta contable por defecto para o IVE de compras (usado se non é definido no diccionario de IVE)
+ACCOUNTING_VAT_PAY_ACCOUNT=Código contable por defecto para o pagamento de IVE
 ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accounting account on third party is not defined.
 ACCOUNTING_ACCOUNT_SUPPLIER=Accounting account used for vendor third parties
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated vendor accounting account on third party is not defined.
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax
-CloneTaxForNextMonth=Clone it for next month
-SimpleReport=Simple report
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Foreign customers report
+ConfirmCloneTax=Confirmar a clonación dunha taxa social/fiscal
+CloneTaxForNextMonth=Clonarla para o próximo mes
+SimpleReport=informe simple
+AddExtraReport=Informes adicionais (engade informe de clientes extranxeiros e locais)
+OtherCountriesCustomersReport=Informe de clientes extranxeiros
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
 SameCountryCustomersWithVAT=National customers report
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Social/fiscal taxes
-ImportDataset_tax_vat=Vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
+LinkedFichinter=Ligar a unha intervención
+ImportDataset_tax_contrib=Impostos sociais/fiscais
+ImportDataset_tax_vat=Pagamentos IVE
+ErrorBankAccountNotFound=Error: Conta bancaria non atopada
 FiscalPeriod=Período contable
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
-DeleteFromCat=Remove from accounting group
-AccountingAffectation=Accounting assignment
-LastDayTaxIsRelatedTo=Last day of period the tax is related to
-VATDue=Sale tax claimed
-ClaimedForThisPeriod=Claimed for the period
-PaidDuringThisPeriod=Paid during this period
-ByVatRate=By sale tax rate
-TurnoverbyVatrate=Turnover invoiced by sale tax rate
-TurnoverCollectedbyVatrate=Turnover collected by sale tax rate
-PurchasebyVatrate=Purchase by sale tax rate
+ListSocialContributionAssociatedProject=Listaxe de contribucións sociais asociadas ao proxecto
+DeleteFromCat=Eliminar do grupo de contabilidade
+AccountingAffectation=Asignación de conta contable
+LastDayTaxIsRelatedTo=Último día do período do imposto
+VATDue=Imposto reclamado
+ClaimedForThisPeriod=Reclamado para o período
+PaidDuringThisPeriod=Pagado durante este período
+ByVatRate=Por taxa de imposto
+TurnoverbyVatrate=Volume de vendas emitidas por tipo de imposto
+TurnoverCollectedbyVatrate=Volume de vendas cobradas por tipo de imposto
+PurchasebyVatrate=Compra por taxa de impostos
 LabelToShow=Etiqueta curta
 PurchaseTurnover=Purchase turnover
 PurchaseTurnoverCollected=Purchase turnover collected
diff --git a/htdocs/langs/gl_ES/contracts.lang b/htdocs/langs/gl_ES/contracts.lang
index 859cb0739fb..698aa2ad63f 100644
--- a/htdocs/langs/gl_ES/contracts.lang
+++ b/htdocs/langs/gl_ES/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Servizos activos
 MenuExpiredServices=Servizos expirados
 MenuClosedServices=Servizos pechados
 NewContract=Novo contrato
-NewContractSubscription=Novo contrato/suscrición
+NewContractSubscription=New contract or subscription
 AddContract=Crear contrato
 DeleteAContract=Eliminar un contrato
 ActivateAllOnContract=Activar todos os servizos
diff --git a/htdocs/langs/gl_ES/deliveries.lang b/htdocs/langs/gl_ES/deliveries.lang
index f97f863389b..b7e846dd4c6 100644
--- a/htdocs/langs/gl_ES/deliveries.lang
+++ b/htdocs/langs/gl_ES/deliveries.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - deliveries
-Delivery=Delivery
-DeliveryRef=Ref Delivery
-DeliveryCard=Receipt card
-DeliveryOrder=Delivery receipt
-DeliveryDate=Delivery date
-CreateDeliveryOrder=Generate delivery receipt
-DeliveryStateSaved=Delivery state saved
-SetDeliveryDate=Set shipping date
-ValidateDeliveryReceipt=Validate delivery receipt
-ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
-DeleteDeliveryReceipt=Delete delivery receipt
-DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt <b>%s</b>?
-DeliveryMethod=Delivery method
-TrackingNumber=Tracking number
-DeliveryNotValidated=Delivery not validated
+Delivery=Envío
+DeliveryRef=Ref. envío
+DeliveryCard=Ficha nota de recepción
+DeliveryOrder=Nota de recepción
+DeliveryDate=Data de entrega
+CreateDeliveryOrder=Xerar nota de entrega
+DeliveryStateSaved=Estado de entrega gardado
+SetDeliveryDate=Indicar a data de entrega
+ValidateDeliveryReceipt=Validar a nota de entrega
+ValidateDeliveryReceiptConfirm=¿Está certo de querer validar esta entrega?
+DeleteDeliveryReceipt=Eliminar a nota de entrega
+DeleteDeliveryReceiptConfirm=¿Está certo de querer eliminar a nota de entrega <b>%s</b>?
+DeliveryMethod=Método de envío
+TrackingNumber=Nº de seguemento
+DeliveryNotValidated=Nota de recepción non validada
 StatusDeliveryCanceled=Anulado
 StatusDeliveryDraft=Borrador
 StatusDeliveryValidated=Recibido
 # merou PDF model
-NameAndSignature=Name and Signature:
-ToAndDate=To___________________________________ on ____/_____/__________
-GoodStatusDeclaration=Have received the goods above in good condition,
-Deliverer=Deliverer:
-Sender=Remitente
-Recipient=Recipient
-ErrorStockIsNotEnough=There's not enough stock
-Shippable=Shippable
-NonShippable=Not Shippable
-ShowReceiving=Show delivery receipt
-NonExistentOrder=Nonexistent order
+NameAndSignature=Nome e sinatura :
+ToAndDate=En___________________________________ a ____/_____/__________
+GoodStatusDeclaration=Teño recibido a mercancía en bo estado,
+Deliverer=Destinatario :
+Sender=Orixe
+Recipient=Destinatario
+ErrorStockIsNotEnough=Non hai suficiente stock
+Shippable=Enviable
+NonShippable=Non enviable
+ShowReceiving=Mostrar nota de recepción
+NonExistentOrder=Pedido inexistente
diff --git a/htdocs/langs/gl_ES/dict.lang b/htdocs/langs/gl_ES/dict.lang
index ec315d97142..394dc02d94d 100644
--- a/htdocs/langs/gl_ES/dict.lang
+++ b/htdocs/langs/gl_ES/dict.lang
@@ -1,337 +1,337 @@
 # Dolibarr language file - Source file is en_US - dict
-CountryFR=France
-CountryBE=Belgium
-CountryIT=Italy
-CountryES=Spain
-CountryDE=Germany
-CountryCH=Switzerland
+CountryFR=Franza
+CountryBE=Bélxica
+CountryIT=Italia
+CountryES=España
+CountryDE=Alemaña
+CountryCH=Suiza
 # Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
-CountryGB=United Kingdom
-CountryUK=United Kingdom
-CountryIE=Ireland
+CountryGB=Reino Unido
+CountryUK=Reino Unido
+CountryIE=Irlanda
 CountryCN=China
-CountryTN=Tunisia
-CountryUS=United States
-CountryMA=Morocco
-CountryDZ=Algeria
-CountryCA=Canada
+CountryTN=Túnez
+CountryUS=Estados Unidos
+CountryMA=Marrocos
+CountryDZ=Arxelia
+CountryCA=Canadá
 CountryTG=Togo
-CountryGA=Gabon
-CountryNL=Netherlands
-CountryHU=Hungary
-CountryRU=Russia
-CountrySE=Sweden
-CountryCI=Ivoiry Coast
+CountryGA=Gabón
+CountryNL=Países Baixos
+CountryHU=Hungría
+CountryRU=Rusia
+CountrySE=Suecia
+CountryCI=Costa de Marfil
 CountrySN=Senegal
-CountryAR=Argentina
-CountryCM=Cameroon
+CountryAR=Arxentina
+CountryCM=Camerún
 CountryPT=Portugal
-CountrySA=Saudi Arabia
-CountryMC=Monaco
+CountrySA=Arabia Saudita
+CountryMC=Mónaco
 CountryAU=Australia
-CountrySG=Singapore
-CountryAF=Afghanistan
-CountryAX=Åland Islands
+CountrySG=Singapur
+CountryAF=Afganistán
+CountryAX=Illas Aland
 CountryAL=Albania
-CountryAS=American Samoa
+CountryAS=Samoa Americana
 CountryAD=Andorra
 CountryAO=Angola
-CountryAI=Anguilla
-CountryAQ=Antarctica
-CountryAG=Antigua and Barbuda
+CountryAI=Anguila
+CountryAQ=Antártida
+CountryAG=Antigua e Barbuda
 CountryAM=Armenia
 CountryAW=Aruba
 CountryAT=Austria
-CountryAZ=Azerbaijan
+CountryAZ=Azerbaián
 CountryBS=Bahamas
-CountryBH=Bahrain
-CountryBD=Bangladesh
+CountryBH=Bahréin
+CountryBD=Bangladés
 CountryBB=Barbados
-CountryBY=Belarus
-CountryBZ=Belize
-CountryBJ=Benin
-CountryBM=Bermuda
-CountryBT=Bhutan
+CountryBY=Bielorrusia
+CountryBZ=Belice
+CountryBJ=Benín
+CountryBM=Bermudas
+CountryBT=Bután
 CountryBO=Bolivia
-CountryBA=Bosnia and Herzegovina
-CountryBW=Botswana
-CountryBV=Bouvet Island
-CountryBR=Brazil
-CountryIO=British Indian Ocean Territory
-CountryBN=Brunei Darussalam
+CountryBA=Bosnia Herzegovina
+CountryBW=Botsuana
+CountryBV=Illa Bouvet
+CountryBR=Brasil
+CountryIO=Territorio Británico do Océano Índico
+CountryBN=Brunéi
 CountryBG=Bulgaria
 CountryBF=Burkina Faso
 CountryBI=Burundi
-CountryKH=Cambodia
-CountryCV=Cape Verde
-CountryKY=Cayman Islands
-CountryCF=Central African Republic
+CountryKH=Camboia
+CountryCV=Cabo Verde
+CountryKY=Illas Caimán
+CountryCF=República Centroafricana
 CountryTD=Chad
 CountryCL=Chile
-CountryCX=Christmas Island
-CountryCC=Cocos (Keeling) Islands
+CountryCX=Illa Christmas
+CountryCC=Illas Cocos (Keeling)
 CountryCO=Colombia
-CountryKM=Comoros
+CountryKM=Comoras
 CountryCG=Congo
-CountryCD=Congo, The Democratic Republic of the
-CountryCK=Cook Islands
+CountryCD=República Democrática do Congo
+CountryCK=Illas Cook
 CountryCR=Costa Rica
-CountryHR=Croatia
+CountryHR=Croacia
 CountryCU=Cuba
-CountryCY=Cyprus
-CountryCZ=Czech Republic
-CountryDK=Denmark
-CountryDJ=Djibouti
+CountryCY=Chipre
+CountryCZ=República Checa
+CountryDK=Dinamarca
+CountryDJ=Djibuti
 CountryDM=Dominica
-CountryDO=Dominican Republic
+CountryDO=República Dominicana
 CountryEC=Ecuador
-CountryEG=Egypt
-CountrySV=El Salvador
-CountryGQ=Equatorial Guinea
+CountryEG=Exipto
+CountrySV=O Salvador
+CountryGQ=Guinea Ecuatorial
 CountryER=Eritrea
 CountryEE=Estonia
-CountryET=Ethiopia
-CountryFK=Falkland Islands
-CountryFO=Faroe Islands
-CountryFJ=Fiji Islands
-CountryFI=Finland
-CountryGF=French Guiana
-CountryPF=French Polynesia
-CountryTF=French Southern Territories
+CountryET=Etiopía
+CountryFK=Illas Malvinas
+CountryFO=Illas Feroe
+CountryFJ=Illas Fiji
+CountryFI=Finlandia
+CountryGF=Guaiana francesa
+CountryPF=Polinesia francesa
+CountryTF=Territorios australes franceses
 CountryGM=Gambia
-CountryGE=Georgia
+CountryGE=Xeorxia
 CountryGH=Ghana
-CountryGI=Gibraltar
-CountryGR=Greece
-CountryGL=Greenland
-CountryGD=Grenada
-CountryGP=Guadeloupe
+CountryGI=Xibraltar
+CountryGR=Grecia
+CountryGL=Groenlandia
+CountryGD=Granada
+CountryGP=Guadalupe
 CountryGU=Guam
 CountryGT=Guatemala
 CountryGN=Guinea
 CountryGW=Guinea-Bissau
-CountryGY=Guyana
-CountryHT=Haïti
-CountryHM=Heard Island and McDonald
-CountryVA=Holy See (Vatican City State)
+CountryGY=Güiana
+CountryHT=Haití
+CountryHM=Illas Heard e McDonald
+CountryVA=Santa Sede (Vaticano)
 CountryHN=Honduras
 CountryHK=Hong Kong
-CountryIS=Iceland
+CountryIS=Islandia
 CountryIN=India
 CountryID=Indonesia
-CountryIR=Iran
+CountryIR=Irán
 CountryIQ=Iraq
 CountryIL=Israel
-CountryJM=Jamaica
-CountryJP=Japan
-CountryJO=Jordan
-CountryKZ=Kazakhstan
-CountryKE=Kenya
+CountryJM=Xamaica
+CountryJP=Xapón
+CountryJO=Xordania
+CountryKZ=Kazajstán
+CountryKE=Kenia
 CountryKI=Kiribati
-CountryKP=North Korea
-CountryKR=South Korea
+CountryKP=Corea do Norte
+CountryKR=Corea do Sur
 CountryKW=Kuwait
-CountryKG=Kyrgyzstan
-CountryLA=Lao
-CountryLV=Latvia
-CountryLB=Lebanon
-CountryLS=Lesotho
+CountryKG=Kirguizstán
+CountryLA=Laos
+CountryLV=Letonia
+CountryLB=Líbano
+CountryLS=Lesoto
 CountryLR=Liberia
-CountryLY=Libyan
+CountryLY=Libia
 CountryLI=Liechtenstein
-CountryLT=Lithuania
-CountryLU=Luxembourg
-CountryMO=Macao
-CountryMK=Macedonia, the former Yugoslav of
+CountryLT=Lituania
+CountryLU=Luxemburgo
+CountryMO=Macau
+CountryMK=Antiga República Iugoslava de Macedonia
 CountryMG=Madagascar
-CountryMW=Malawi
-CountryMY=Malaysia
-CountryMV=Maldives
-CountryML=Mali
+CountryMW=Malaui
+CountryMY=Malaisia
+CountryMV=Maldivas
+CountryML=Malí
 CountryMT=Malta
-CountryMH=Marshall Islands
-CountryMQ=Martinique
+CountryMH=Illas Marshall
+CountryMQ=Martinica
 CountryMR=Mauritania
-CountryMU=Mauritius
-CountryYT=Mayotte
+CountryMU=Mauricio
+CountryYT=Maiotte
 CountryMX=Mexico
 CountryFM=Micronesia
-CountryMD=Moldova
+CountryMD=Moldavia
 CountryMN=Mongolia
 CountryMS=Monserrat
 CountryMZ=Mozambique
-CountryMM=Myanmar (Burma)
+CountryMM=Myanmar (Birmania)
 CountryNA=Namibia
 CountryNR=Nauru
 CountryNP=Nepal
-CountryAN=Netherlands Antilles
-CountryNC=New Caledonia
-CountryNZ=New Zealand
+CountryAN=Antillas Holandesas
+CountryNC=Nova Caledonia
+CountryNZ=Nova Zelanda
 CountryNI=Nicaragua
-CountryNE=Niger
-CountryNG=Nigeria
+CountryNE=Níxer
+CountryNG=Nixeria
 CountryNU=Niue
-CountryNF=Norfolk Island
-CountryMP=Northern Mariana Islands
-CountryNO=Norway
-CountryOM=Oman
-CountryPK=Pakistan
+CountryNF=Illa Norfolk
+CountryMP=Illas Marianas do Norte
+CountryNO=Noruega
+CountryOM=Omán
+CountryPK=Pakistán
 CountryPW=Palau
-CountryPS=Palestinian Territory, Occupied
-CountryPA=Panama
-CountryPG=Papua New Guinea
-CountryPY=Paraguay
-CountryPE=Peru
-CountryPH=Philippines
-CountryPN=Pitcairn Islands
-CountryPL=Poland
+CountryPS=Territorio Ocupado Palestino
+CountryPA=Panamá
+CountryPG=Papua Nueva Guinea
+CountryPY=Paraguai
+CountryPE=Perú
+CountryPH=Filipinas
+CountryPN=Illas Pitcairn
+CountryPL=Polonia
 CountryPR=Puerto Rico
 CountryQA=Qatar
-CountryRE=Reunion
-CountryRO=Romania
-CountryRW=Rwanda
-CountrySH=Saint Helena
-CountryKN=Saint Kitts and Nevis
-CountryLC=Saint Lucia
-CountryPM=Saint Pierre and Miquelon
-CountryVC=Saint Vincent and Grenadines
+CountryRE=Reunión
+CountryRO=Rumania
+CountryRW=Ruanda
+CountrySH=Santa Elena
+CountryKN=San Cristóbal e Nieves
+CountryLC=Santa Lucía
+CountryPM=San Pedro e Miquelón
+CountryVC=San Vicente e as Granadinas
 CountryWS=Samoa
 CountrySM=San Marino
-CountryST=Sao Tome and Principe
+CountryST=Santo Tomé e Príncipe
 CountryRS=Serbia
 CountrySC=Seychelles
-CountrySL=Sierra Leone
-CountrySK=Slovakia
-CountrySI=Slovenia
-CountrySB=Solomon Islands
+CountrySL=Serra Leona
+CountrySK=Eslovaquia
+CountrySI=Eslovenia
+CountrySB=Illas Salomón
 CountrySO=Somalia
-CountryZA=South Africa
-CountryGS=South Georgia and the South Sandwich Islands
+CountryZA=Sur África
+CountryGS=Illas Georgia do Sur e Sandwich do Sur
 CountryLK=Sri Lanka
-CountrySD=Sudan
-CountrySR=Suriname
-CountrySJ=Svalbard and Jan Mayen
-CountrySZ=Swaziland
-CountrySY=Syrian
-CountryTW=Taiwan
-CountryTJ=Tajikistan
+CountrySD=Sudán
+CountrySR=Surinam
+CountrySJ=Illas Svalbard e Jan Mayen
+CountrySZ=Suazilandia
+CountrySY=Siria
+CountryTW=Taiwán
+CountryTJ=Taxiquistán
 CountryTZ=Tanzania
-CountryTH=Thailand
-CountryTL=Timor-Leste
+CountryTH=Tailandia
+CountryTL=Timor Oriental
 CountryTK=Tokelau
 CountryTO=Tonga
-CountryTT=Trinidad and Tobago
-CountryTR=Turkey
-CountryTM=Turkmenistan
-CountryTC=Turks and Caicos Islands
+CountryTT=Trinidad e Tobago
+CountryTR=Turquía
+CountryTM=Turkmenistán
+CountryTC=Illas Turcas e Caicos
 CountryTV=Tuvalu
 CountryUG=Uganda
-CountryUA=Ukraine
-CountryAE=United Arab Emirates
-CountryUM=United States Minor Outlying Islands
-CountryUY=Uruguay
-CountryUZ=Uzbekistan
+CountryUA=Ucrania
+CountryAE=Emiratos Árabes Unidos
+CountryUM=Illas menores alonxadas de Estados Unidos
+CountryUY=Uruguai
+CountryUZ=Uzbekistán
 CountryVU=Vanuatu
 CountryVE=Venezuela
-CountryVN=Viet Nam
-CountryVG=Virgin Islands, British
-CountryVI=Virgin Islands, U.S.
-CountryWF=Wallis and Futuna
-CountryEH=Western Sahara
-CountryYE=Yemen
+CountryVN=Vietnam
+CountryVG=Illas Vírxenes Británicas
+CountryVI=Illas Vírxenes
+CountryWF=Wallis e Futuna
+CountryEH=Sáhara Occidental
+CountryYE=Iemen
 CountryZM=Zambia
-CountryZW=Zimbabwe
+CountryZW=Zimbabue
 CountryGG=Guernsey
-CountryIM=Isle of Man
+CountryIM=Illa de Man
 CountryJE=Jersey
 CountryME=Montenegro
-CountryBL=Saint Barthelemy
-CountryMF=Saint Martin
+CountryBL=Saint-Barthélemy
+CountryMF=Saint-Martin
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
-CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityMME=Señora
+CivilityMR=Señor
+CivilityMLE=Señorita
+CivilityMTRE=Don
+CivilityDR=Doutor
 ##### Currencies #####
 Currencyeuros=Euros
-CurrencyAUD=AU Dollars
-CurrencySingAUD=AU Dollar
-CurrencyCAD=CAN Dollars
-CurrencySingCAD=CAN Dollar
-CurrencyCHF=Swiss Francs
-CurrencySingCHF=Swiss Franc
+CurrencyAUD=Dólares Aus.
+CurrencySingAUD=Dólar Aus.
+CurrencyCAD=Dólares Can.
+CurrencySingCAD=Dólar Can.
+CurrencyCHF=Francos suizos
+CurrencySingCHF=Franco suizo
 CurrencyEUR=Euros
 CurrencySingEUR=Euro
-CurrencyFRF=French Francs
-CurrencySingFRF=French Franc
-CurrencyGBP=GB Pounds
-CurrencySingGBP=GB Pound
-CurrencyINR=Indian rupees
-CurrencySingINR=Indian rupee
+CurrencyFRF=Francos franceses
+CurrencySingFRF=Franco francés
+CurrencyGBP=Libras esterlinas
+CurrencySingGBP=Libra esterlina
+CurrencyINR=Rupias indias
+CurrencySingINR=Rupia india
 CurrencyMAD=Dirham
 CurrencySingMAD=Dirham
 CurrencyMGA=Ariary
 CurrencySingMGA=Ariary
-CurrencyMUR=Mauritius rupees
-CurrencySingMUR=Mauritius rupee
-CurrencyNOK=Norwegian krones
-CurrencySingNOK=Norwegian kronas
-CurrencyTND=Tunisian dinars
-CurrencySingTND=Tunisian dinar
-CurrencyUSD=US Dollars
-CurrencySingUSD=US Dollar
+CurrencyMUR=Rupias mauritanas
+CurrencySingMUR=Rupia mauritana
+CurrencyNOK=Coroas noruegas
+CurrencySingNOK=Coroas noruegas
+CurrencyTND=Dinares tunecinos
+CurrencySingTND=Dinar tunecino
+CurrencyUSD=Dólares USA
+CurrencySingUSD=Dólar USA
 CurrencyUAH=Hryvnia
 CurrencySingUAH=Hryvnia
-CurrencyXAF=CFA Francs BEAC
-CurrencySingXAF=CFA Franc BEAC
-CurrencyXOF=CFA Francs BCEAO
-CurrencySingXOF=CFA Franc BCEAO
-CurrencyXPF=CFP Francs
-CurrencySingXPF=CFP Franc
-CurrencyCentEUR=cents
-CurrencyCentSingEUR=cent
+CurrencyXAF=Francos CFA BEAC
+CurrencySingXAF=Franco CFA BEAC
+CurrencyXOF=Francos CFA BCEAO
+CurrencySingXOF=Franco CFA BCEAO
+CurrencyXPF=Francos CFP
+CurrencySingXPF=Franco CFP
+CurrencyCentEUR=céntimos
+CurrencyCentSingEUR=céntimo
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
-CurrencyThousandthSingTND=thousandth
+CurrencyThousandthSingTND=milésimo
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
-DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-DemandReasonTypeSRC_COMM=Commercial contact
-DemandReasonTypeSRC_SHOP=Shop contact
-DemandReasonTypeSRC_WOM=Word of mouth
-DemandReasonTypeSRC_PARTNER=Partner
-DemandReasonTypeSRC_EMPLOYEE=Employee
-DemandReasonTypeSRC_SPONSORING=Sponsorship
-DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+DemandReasonTypeSRC_CAMP_MAIL=Campaña correo
+DemandReasonTypeSRC_CAMP_EMAIL=Campaña E-Mailing
+DemandReasonTypeSRC_CAMP_PHO=Campaña telefónica
+DemandReasonTypeSRC_CAMP_FAX=Campaña fax
+DemandReasonTypeSRC_COMM=Contacto comercial
+DemandReasonTypeSRC_SHOP=Contacto tenda
+DemandReasonTypeSRC_WOM=Boca a boca
+DemandReasonTypeSRC_PARTNER=Socio
+DemandReasonTypeSRC_EMPLOYEE=Empregado
+DemandReasonTypeSRC_SPONSORING=Patrocinador
+DemandReasonTypeSRC_SRC_CUSTOMER=Contacto entrante dun cliente
 #### Paper formats ####
-PaperFormatEU4A0=Format 4A0
-PaperFormatEU2A0=Format 2A0
-PaperFormatEUA0=Format A0
-PaperFormatEUA1=Format A1
-PaperFormatEUA2=Format A2
-PaperFormatEUA3=Format A3
-PaperFormatEUA4=Format A4
-PaperFormatEUA5=Format A5
-PaperFormatEUA6=Format A6
-PaperFormatUSLETTER=Format Letter US
-PaperFormatUSLEGAL=Format Legal US
-PaperFormatUSEXECUTIVE=Format Executive US
-PaperFormatUSLEDGER=Format Ledger/Tabloid
-PaperFormatCAP1=Format P1 Canada
-PaperFormatCAP2=Format P2 Canada
-PaperFormatCAP3=Format P3 Canada
-PaperFormatCAP4=Format P4 Canada
-PaperFormatCAP5=Format P5 Canada
-PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Formato 4A0
+PaperFormatEU2A0=Formato 2A0
+PaperFormatEUA0=Formato A0
+PaperFormatEUA1=Formato A1
+PaperFormatEUA2=Formato A2
+PaperFormatEUA3=Formato A3
+PaperFormatEUA4=Formato A4
+PaperFormatEUA5=Formato A5
+PaperFormatEUA6=Formato A6
+PaperFormatUSLETTER=Formato carta EE. UU.
+PaperFormatUSLEGAL=Formato legal EE. UU.
+PaperFormatUSEXECUTIVE=Formato executivo EE. UU.
+PaperFormatUSLEDGER=Formato tabloide
+PaperFormatCAP1=Formato canadiense P1
+PaperFormatCAP2=Formato canadiense P2
+PaperFormatCAP3=Formato canadiense P3
+PaperFormatCAP4=Formato canadiense P4
+PaperFormatCAP5=Formato canadiense P5
+PaperFormatCAP6=Formato canadiense P6
 #### Expense report categories ####
-ExpAutoCat=Car
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpAutoCat=Coche
+ExpCycloCat=Ciclomotor
+ExpMotoCat=Moto
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -342,18 +342,18 @@ ExpAuto9CV=9 CV
 ExpAuto10CV=10 CV
 ExpAuto11CV=11 CV
 ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpAuto3PCV=3 CV e ​​mais
+ExpAuto4PCV=4 CV e mais
+ExpAuto5PCV=5 CV e mais
+ExpAuto6PCV=6 CV e mais
+ExpAuto7PCV=7 CV e mais
+ExpAuto8PCV=8 CV e mais
+ExpAuto9PCV=9 CV e mais
+ExpAuto10PCV=10 CV e mais
+ExpAuto11PCV=11 CV e mais
+ExpAuto12PCV=12 CV e mais
+ExpAuto13PCV=13 CV e mais
+ExpCyclo=Capacidade inferior a 50cm3
+ExpMoto12CV=Motocicleta 1 ou 2 CV
+ExpMoto345CV=Motos 3, 4 ou 5 CV
+ExpMoto5PCV=Motos 5 CV e mais
diff --git a/htdocs/langs/gl_ES/donations.lang b/htdocs/langs/gl_ES/donations.lang
index bbd6c5304e4..c6aedceba3e 100644
--- a/htdocs/langs/gl_ES/donations.lang
+++ b/htdocs/langs/gl_ES/donations.lang
@@ -28,7 +28,7 @@ MinimumAmount=O importe mínimo é %s
 FreeTextOnDonations=Texto libre a amosar ao pé de páxina
 FrenchOptions=Opcións para Franza
 DONATION_ART200=Amosar artigo 200 do CGI se está interesado
-DONATION_ART238=Amosar artigo 238 do CGI sse está interesado
+DONATION_ART238=Amosar artigo 238 do CGI se está interesado
 DONATION_ART885=Amosar artigo 885 do CGI se está interesado
 DonationPayment=Pago de doación/subvención
 DonationValidated=Doación/Subvención %s validada
diff --git a/htdocs/langs/gl_ES/ecm.lang b/htdocs/langs/gl_ES/ecm.lang
index 2e15d51902e..348394f591b 100644
--- a/htdocs/langs/gl_ES/ecm.lang
+++ b/htdocs/langs/gl_ES/ecm.lang
@@ -1,52 +1,52 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=No. of documents in directory
+ECMNbOfDocs=Nº de documentos no directorio
 ECMSection=Directorio
-ECMSectionManual=Manual directory
-ECMSectionAuto=Automatic directory
-ECMSectionsManual=Manual tree
-ECMSectionsAuto=Automatic tree
-ECMSections=Directories
-ECMRoot=ECM Root
-ECMNewSection=New directory
-ECMAddSection=Add directory
+ECMSectionManual=Directorio manual
+ECMSectionAuto=Directorio automático
+ECMSectionsManual=Árbore manual
+ECMSectionsAuto=Árbore automática
+ECMSections=Directorios
+ECMRoot=ECM Raiz
+ECMNewSection=Novo directorio
+ECMAddSection=Engadir directorio
 ECMCreationDate=Data de creación
-ECMNbOfFilesInDir=Number of files in directory
-ECMNbOfSubDir=Number of sub-directories
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=DMS/ECM area
+ECMNbOfFilesInDir=Número de ficheiros no directorio
+ECMNbOfSubDir=Número de sub-directories
+ECMNbOfFilesInSubDir=Número de ficheiros en sub-directories
+ECMCreationUser=Creador
+ECMArea=Área MS/ECM
 ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
-ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
-ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
-ECMSectionWasCreated=Directory <b>%s</b> has been created.
-ECMSearchByKeywords=Search by keywords
-ECMSearchByEntity=Search by object
-ECMSectionOfDocuments=Directories of documents
-ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMDocsByExpenseReports=Documents linked to expense reports
-ECMDocsByHolidays=Documents linked to holidays
-ECMDocsBySupplierProposals=Documents linked to vendor proposals
-ECMNoDirectoryYet=No directory created
-ShowECMSection=Show directory
-DeleteSection=Remove directory
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b>?
-ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFilesOrDirs=Removal not possible because it contains some files or sub-directories
-CannotRemoveDirectoryContainsFiles=Removal not possible because it contains some files
-ECMFileManager=File manager
-ECMSelectASection=Select a directory in the tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
-ReSyncListOfDir=Resync list of directories
-HashOfFileContent=Hash of file content
-NoDirectoriesFound=No directories found
-FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it)
+ECMAreaDesc2=Pode crear directorios manuais e axuntar os documentos<br>Os directorios automáticos son cobertos automáticamente ao engadir un documento nunha ficha.
+ECMSectionWasRemoved=O directorio <b>%s</b> foi eliminado
+ECMSectionWasCreated=O directorio <b> %s </b> foi creado.
+ECMSearchByKeywords=Buscar por palabras clave
+ECMSearchByEntity=Buscar por obxecto
+ECMSectionOfDocuments=Directorios de documentos
+ECMTypeAuto=Automático
+ECMDocsBySocialContributions=Documentos ligados a taxas sociais ou fiscais
+ECMDocsByThirdParties=Documentos ligados a terceiros
+ECMDocsByProposals=Documentos ligados a orzamentos
+ECMDocsByOrders=Documentos ligados a pedimentos
+ECMDocsByContracts=Documentos ligados a contratos
+ECMDocsByInvoices=Documentos ligados a facturas
+ECMDocsByProducts=Documentos ligados a produtos
+ECMDocsByProjects=Documentos ligados a proxectos
+ECMDocsByUsers=Documentos ligados a usuarios
+ECMDocsByInterventions=Documentos ligados a intervencións
+ECMDocsByExpenseReports=Documentos ligados a informes de gastos
+ECMDocsByHolidays=Documentos ligados a días libres
+ECMDocsBySupplierProposals=Documentos ligados a orzamentos de provedores.
+ECMNoDirectoryYet=Non foi creado o directorio
+ShowECMSection=Amosar directorio
+DeleteSection=Eliminación directorio
+ConfirmDeleteSection=¿Está certo de querer eliminar o directorio <b>%s</b>?
+ECMDirectoryForFiles=Directorio relativo para ficheiros
+CannotRemoveDirectoryContainsFilesOrDirs=Non pode ser eliminado porque contén ficheiros o subdirectorios
+CannotRemoveDirectoryContainsFiles=Non pode ser eliminado porque contén ficheiros
+ECMFileManager=Explorador de ficheiros
+ECMSelectASection=Seleccione un directorio na árbore da esquerda
+DirNotSynchronizedSyncFirst=Este directorio foi creado ou modificado fora do módulo GED. Faga clic no botón "Actualizar" para resincronizar a información do disco e a base  de datos para ver o contido dese directorio.
+ReSyncListOfDir=Resincronizar a listaxe de directorios
+HashOfFileContent=Hash do contido do ficheiro
+NoDirectoriesFound=Non foron atopados directorios
+FileNotYetIndexedInDatabase=Ficheiro aínda non indexado na base de datos (tente voltar cargalo)
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/gl_ES/exports.lang b/htdocs/langs/gl_ES/exports.lang
index daade90a704..52343e63453 100644
--- a/htdocs/langs/gl_ES/exports.lang
+++ b/htdocs/langs/gl_ES/exports.lang
@@ -1,135 +1,135 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Exportacións
-ImportArea=Import
-NewExport=New Export
-NewImport=New Import
-ExportableDatas=Exportable dataset
-ImportableDatas=Importable dataset
-SelectExportDataSet=Choose dataset you want to export...
-SelectImportDataSet=Choose dataset you want to import...
-SelectExportFields=Choose the fields you want to export, or select a predefined export profile
-SelectImportFields=Choose the source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
-NotImportedFields=Fields of source file not imported
-SaveExportModel=Save your selections as an export profile/template (for reuse).
-SaveImportModel=Save this import profile (for reuse) ...
-ExportModelName=Export profile name
-ExportModelSaved=Export profile saved as <b>%s</b>.
-ExportableFields=Exportable fields
-ExportedFields=Exported fields
-ImportModelName=Import profile name
-ImportModelSaved=Import profile saved as <b>%s</b>.
-DatasetToExport=Dataset to export
-DatasetToImport=Import file into dataset
-ChooseFieldsOrdersAndTitle=Choose fields order...
-FieldsTitle=Fields title
-FieldTitle=Field title
-NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
-AvailableFormats=Available Formats
+ExportsArea=Área exportación
+ImportArea=Área importación
+NewExport=Nova exportación
+NewImport=Nova importación
+ExportableDatas=Conxunto de datos exportables
+ImportableDatas=Conxunto de datos importables
+SelectExportDataSet=Escolla un conxunto predefinido de datos que desexe exportar...
+SelectImportDataSet=Escolla un lote de datos predefinidos que desexe importar...
+SelectExportFields=Escolla os campos que deben exportarse, ou escolla un perfil de exportación predefinido
+SelectImportFields=Escolla os campos do ficheiro que desexa importar e os seus campos de destino na base de datos movendoos enriba e abaixo co ancla %s, ou seleccione un perfil de importación predefinido.
+NotImportedFields=Campos do ficheiro orixe non importados
+SaveExportModel=Gardar este perfil de exportación se desexa reutilizalo posteriormente...
+SaveImportModel=Garde este perfil de importación se desexa reutilizalo de novo posteriormente...
+ExportModelName=Nome do perfil de exportación
+ExportModelSaved=Perfil de exportación gardado co nome de <b>%s</b>.
+ExportableFields=Campos exportables
+ExportedFields=Campos a exportar
+ImportModelName=Nome do perfil de importación
+ImportModelSaved=Perfil de importación gardado baixo o nome <b>%s</b>.
+DatasetToExport=Conxunto de datos a exportar
+DatasetToImport=Lote de datos a importar
+ChooseFieldsOrdersAndTitle=Escolla a orde dos campos...
+FieldsTitle=Título campos
+FieldTitle=Título campo
+NowClickToGenerateToBuildExportFile=Agora, seleccione o formato de exportación da lista despregable e faga clic en "Xerar" para xerar o ficheiro de exportación...
+AvailableFormats=Formatos dispoñibles
 LibraryShort=Librería
 ExportCsvSeparator=Csv caracter separator
 ImportCsvSeparator=Csv caracter separator
-Step=Step
-FormatedImport=Import Assistant
-FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
-FormatedImportDesc2=First step is to choose the kind of data you want to import, then the format of the source file, then the fields you want to import.
-FormatedExport=Export Assistant
-FormatedExportDesc1=These tools allow the export of personalized data using an assistant, to help you in the process without requiring technical knowledge.
-FormatedExportDesc2=First step is to choose a predefined dataset, then which fields you want to export, and in which order.
-FormatedExportDesc3=When data to export are selected, you can choose the format of the output file.
-Sheet=Sheet
-NoImportableData=No importable data (no module with definitions to allow data imports)
-FileSuccessfullyBuilt=File generated
-SQLUsedForExport=SQL Request used to extract data
-LineId=Id of line
-LineLabel=Label of line
+Step=Paso
+FormatedImport=Asistente de importación
+FormatedImportDesc1=Esta área permitelle realizar importacións persoalizadas de datos mediante un axudante que evita ter coñecementos técnicos de Dolibarr.
+FormatedImportDesc2=O primeiro paso consiste na escolla do tipo de dato que debe importarse, despois o ficheiro e a continuación escoller os campos que desexa importar.
+FormatedExport=Asistente de exportación
+FormatedExportDesc1=Esta área permitell realizar exportacións persoalizadas dos datos mediante un axudante que evita ter coñecementos técnicos de Dolibarr.
+FormatedExportDesc2=O primeiro paso consiste na escolla dun dos conxuntos de datos predefinidos, despois escoller os campos que quere exportar ao ficheiro e en que orde.
+FormatedExportDesc3=Unha vez seleccionados os datos, é posible escoller o formato do ficheiro de exportación xerado.
+Sheet=Folla
+NoImportableData=Sen taboas de datos importables (ningún módulo coas definicións dos perfiles de importación está activo)
+FileSuccessfullyBuilt=Ficheiro xerado
+SQLUsedForExport=Consulta SQL utilizada para construir o ficheiro de exportación
+LineId=ID de liña
+LineLabel=Etiqueta de liña
 LineDescription=Descrición de liña
-LineUnitPrice=Unit price of line
-LineVATRate=VAT Rate of line
-LineQty=Quantity for line
-LineTotalHT=Amount excl. tax for line
-LineTotalTTC=Amount with tax for line
-LineTotalVAT=Amount of VAT for line
-TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
-FileWithDataToImport=File with data to import
-FileToImport=Source file to import
-FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information (* are mandatory fields)
-ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
-ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
-SourceFileFormat=Source file format
-FieldsInSourceFile=Fields in source file
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+LineUnitPrice=Prezo unitario da liña
+LineVATRate=Tipo de IVE da liña
+LineQty=Cantidade da liña
+LineTotalHT=Importe sen IVE da liña
+LineTotalTTC=Importe total da liña
+LineTotalVAT=Importe IVE da liña
+TypeOfLineServiceOrProduct=Tipo de liña (0=producto, 1=servizo)
+FileWithDataToImport=Ficheiro cos datos a importar
+FileToImport=Ficheiro orixe a importar
+FileMustHaveOneOfFollowingFormat=O ficheiro de importación debe conter un dos seguintes formatos
+DownloadEmptyExample=Descargar ficheiro de exemplo baleiro
+ChooseFormatOfFileToImport=Escolla o formato de ficheiro que desexa importar facendo click na imaxe %s para seleccionalo...
+ChooseFileToImport=Escolla o ficheiro de importación e faga clic na imaxe %s para seleccionalo como ficheiro orixe de importación...
+SourceFileFormat=Formato do ficheiro orixe
+FieldsInSourceFile=Campos no ficheiro orixe
+FieldsInTargetDatabase=Campos destino na base de datos Dolibarr (*=obrigatorio)
 Field=Campo
-NoFields=No fields
-MoveField=Move field column number %s
-ExampleOfImportFile=Example_of_import_file
-SaveImportProfile=Save this import profile
-ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
-TablesTarget=Targeted tables
-FieldsTarget=Targeted fields
-FieldTarget=Targeted field
-FieldSource=Source field
-NbOfSourceLines=Number of lines in source file
-NowClickToTestTheImport=Check that the file format (field and string delimiters) of your file matches the options shown and that you have omitted the header line, or these will be flagged as errors in the following simulation.<br>Click on the "<b>%s</b>" button to run a check of the file structure/contents and simulate the import process.<br><b>No data will be changed in your database</b>.
-RunSimulateImportFile=Run Import Simulation
-FieldNeedSource=This field requires data from the source file
-SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file
-InformationOnSourceFile=Information on source file
-InformationOnTargetTables=Information on target fields
-SelectAtLeastOneField=Switch at least one source field in the column of fields to export
-SelectFormat=Choose this import file format
-RunImportFile=Import Data
-NowClickToRunTheImport=Check the results of the import simulation. Correct any errors and re-test.<br>When the simulation reports no errors you may proceed to import the data into the database.
-DataLoadedWithId=The imported data will have an additional field in each database table with this import id: <b>%s</b>, to allow it to be searchable in the case of investigating a problem related to this import.
-ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
-TooMuchErrors=There are still <b>%s</b> other source lines with errors but output has been limited.
-TooMuchWarnings=There are still <b>%s</b> other source lines with warnings but output has been limited.
-EmptyLine=Empty line (will be discarded)
-CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
-FileWasImported=File was imported with number <b>%s</b>.
-YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
-NbOfLinesOK=Number of lines with no errors and no warnings: <b>%s</b>.
-NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
-DataComeFromNoWhere=Value to insert comes from nowhere in source file.
-DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
+NoFields=Ningún campo
+MoveField=Mover campo columna número %s
+ExampleOfImportFile=Exemplo_de_ficheiro_importación
+SaveImportProfile=Gardar este perfil de importación
+ErrorImportDuplicateProfil=Non pódese gardar o perfil de importación baixo este nome. Xa existe un perfil con ese nome.
+TablesTarget=Táboas de destino
+FieldsTarget=Campos de destino
+FieldTarget=Campo destino
+FieldSource=Campo orixe
+NbOfSourceLines=Número de liñas do ficheiro fonte
+NowClickToTestTheImport=Compruebe los parámetros de importación establecidos. Si está de acuerdo, haga clic en el botón "<b>%s</b>" para ejecutar una simulación de importación (ningún dato será modificado, inicialmente sólo será una simulación)...
+RunSimulateImportFile=Executar a simulación de importación
+FieldNeedSource=Este campo require datos dende o ficheiro orixe
+SomeMandatoryFieldHaveNoSource=Algúns campos obrigatorios non teñen campo fonte no ficheiro de orixe
+InformationOnSourceFile=Información do ficheiro orixe
+InformationOnTargetTables=Información sobre os campos de destino
+SelectAtLeastOneField=Bascular alo menos un campo orixe na columna de campos a exportar
+SelectFormat=Seleccione este formato de ficheiro de importación
+RunImportFile=Lanzar a importación
+NowClickToRunTheImport=Comprobe os resultados da simulación. Se todo foi bien, inicie a importación definitiva.
+DataLoadedWithId=Todos os datos foron cargados co seguinte id de importación: <b>%s</b>
+ErrorMissingMandatoryValue=Dato obrigatorio no indicado no ficheiro fonte, campo número <b>%s</b>.
+TooMuchErrors=Ainda existen <b>%s</b> liñas con erro, pero sa súa visualización foi limitada.
+TooMuchWarnings=Aínda existen <b>%s</b> liñas con warnings, pero a súa visualización foi limitada.
+EmptyLine=Liña en branco
+CorrectErrorBeforeRunningImport=Debe corrixir todos os erros antes de iniciar a importación definitiva.
+FileWasImported=O ficheiro foi importado co número de importación <b>%s</b>.
+YouCanUseImportIdToFindRecord=Pode atopar os rexistros desta importación na súa base de datos filtrando o campo <b>import_key='%s'</b>.
+NbOfLinesOK=Número de liñas sen erros nin warnings: <b>%s</b>.
+NbOfLinesImported=Número de liñas correctamente importadas: <b>%s</b>.
+DataComeFromNoWhere=O valor a insertar non corresponde a ningún campo do ficheiro orixe.
+DataComeFromFileFieldNb=O valor a insertar correspondese ao campo número <b>%s</b> do ficheiro orixe.
 DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the object <b>%s</b> that has the ref. from source file must exist in the database).
 DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find the id of the parent object to use (so the code from source file must exist in the dictionary <b>%s</b>). Note that if you know the id, you can also use it in the source file instead of the code. Import should work in both cases.
 DataIsInsertedInto=Data coming from source file will be inserted into the following field:
 DataIDSourceIsInsertedInto=The id of parent object was found using the data in the source file, will be inserted into the following field:
 DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field:
-SourceRequired=Data value is mandatory
-SourceExample=Example of possible data value
-ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
-CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by a separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
-Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95 format (BIFF5).
-Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is the native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate record (with this field added, all lines will own their own id and will differ).
-CsvOptions=CSV format options
-Separator=Field Separator
-Enclosure=String Delimiter
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD: filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD: filters on all previous years/months/days
-ExportNumericFilter=NNNNN filters by one value<br>NNNNN+NNNNN filters over a range of values<br>< NNNNN filters by lower values<br>> NNNNN filters by higher values
-ImportFromLine=Import starting from line number
-EndAtLineNb=End at line number
-ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines.<br>If the header lines are NOT omitted, this will result in multiple errors in the Import Simulation.
-KeepEmptyToGoToEndOfFile=Keep this field empty to process all lines to the end of the file.
-SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for an UPDATE import
-UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
-NoUpdateAttempt=No update attempt was performed, only insert
-ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+SourceRequired=Datos de orixe obligatorios
+SourceExample=Ejemplo de datos de orixe posibles
+ExampleAnyRefFoundIntoElement=Todas as referencias atopadas para os elementos <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Calquera código (ou identificador) atopado no diccionario <b>%s</b>
+CSVFormatDesc=Ficheiro con formato <b>Valores separados por coma</b> (.csv).<br>Es un fichero con formato de texto en el que los campos son separados por el carácter [ %s ]. Si el separador se encuentra en el contenido de un campo, El campo debe de estar acotado por el carácter [ %s ]. El carácter de escape para incluir un carácter de entorno en un dato es [ %s ].
+Excel95FormatDesc=Ficheiro con formato <b>Excel</b> (.xls)<br>Este é o formato nativo de Excel 95 (BIFF5).
+Excel2007FormatDesc=Ficheiro con formato <b>Excel</b> (.xlsx)<br>Este é o formato nativo de Excel 2007 (SpreadsheetML).
+TsvFormatDesc=Ficheiro con formato <b>Valores separados por tabulador</b> (.tsv)<br>Este é un formato de ficheiro de texto no que os campos son separados por un tabulador [tab].
+ExportFieldAutomaticallyAdded=Engadido automáticamente o campo <b>%s</b>, xa que evitará que liñas idénticas sexan consideradas como duplicadas (con este campo, cada liña terá un id propio).
+CsvOptions=Opcións do ficheiro CSV
+Separator=Separador
+Enclosure=Delimitador de campos
+SpecialCode=Código especial
+ExportStringFilter=%% permite reemplazar un ou mais carácteres no texto
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtros por un ano/mes/día<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtros entre un rango de anos/meses/días<br> > YYYY, > YYYYMM, > YYYYMMDD : filtros en todos os anos/meses/días seguintes <br> < YYYY, < YYYYMM, < YYYYMMDD : filtros en todos os anos/meses/días previos
+ExportNumericFilter=NNNNN filtros por un valor<br>NNNNN+NNNNN filtros por un rango de valores<br>< NNNNN filtros por valores baixos<br>> NNNNN filtros por valores altos
+ImportFromLine=Comezar a importación dende a liña nº
+EndAtLineNb=Terminar na liña nº
+ImportFromToLine=Importar números de liña (de - a)
+SetThisValueTo2ToExcludeFirstLine=Por exemplo, indicar 3 para excluir as dúas primeras liñas
+KeepEmptyToGoToEndOfFile=Deixar este campo baleiro para chegar ao final do ficheiro
+SelectPrimaryColumnsForUpdateAttempt=Seleccionar columna(s) para usar como clave principal no intento de actualización
+UpdateNotYetSupportedForThisImport=A actualización non é compatible con este tipo de importación (só inserciones)
+NoUpdateAttempt=Non foi realizado ningún intento de actualización, só insercións
+ImportDataset_user_1=Usuarios (empregados ou non) e as súas propiedades
+ComputedField=Campo combinado
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
-FormatControlRule=Format control rule
+SelectFilterFields=Se quere aplicar un filtro sobre algúns valores, introdúzaos aquí.
+FilteredFields=Campos filtrados
+FilteredFieldsValues=Valores de filtros
+FormatControlRule=Regra formato de control
 ## imports updates
-KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
-NbInsert=Number of inserted lines: %s
-NbUpdate=Number of updated lines: %s
-MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
+KeysToUseForUpdates=Clave a usar para actualizar datos
+NbInsert=Número de liñas engadidas: %s
+NbUpdate=Número de liñas actualizadas: %s
+MultipleRecordFoundWithTheseFilters=Atopáronse varios rexistros con estes filtros: %s
diff --git a/htdocs/langs/gl_ES/externalsite.lang b/htdocs/langs/gl_ES/externalsite.lang
index 38e8a11823b..2f4b06c67ed 100644
--- a/htdocs/langs/gl_ES/externalsite.lang
+++ b/htdocs/langs/gl_ES/externalsite.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configuración do enlace ao sitio web externo
+ExternalSiteSetup=Configuración da ligazón ao sitio web externo
 ExternalSiteURL=URL do sitio web externo
 ExternalSiteModuleNotComplete=O módulo do sitio externo non foi configurado correctamente.
 ExampleMyMenuEntry=O meu menú de entrada
diff --git a/htdocs/langs/gl_ES/ftp.lang b/htdocs/langs/gl_ES/ftp.lang
index d80b87c2715..a31e113a6bb 100644
--- a/htdocs/langs/gl_ES/ftp.lang
+++ b/htdocs/langs/gl_ES/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen shows a view of an FTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
-FailedToGetFile=Failed to get files %s
+FTPClientSetup=Configuración do módulo cliente FTP
+NewFTPClient=Nova configuracións cliente FTP
+FTPArea=Área FTP
+FTPAreaDesc=Esta pantalla amosa unha vista de servidor FTP
+SetupOfFTPClientModuleNotComplete=A configuración do módulo de cliente FTP parece incompleta
+FTPFeatureNotSupportedByYourPHP=O seu PHP no soporta as funcións FTP
+FailedToConnectToFTPServer=Non foi posible conectar co servidor FTP  (servidor: %s, porto %s)
+FailedToConnectToFTPServerWithCredentials=Non foi posible entrar co usuario/contrasinal FTP configurados
+FTPFailedToRemoveFile=Non foi posible eliminar o ficheiro <b>%s</b>.
+FTPFailedToRemoveDir=Non foi posible eliminar o directorio <b>%s</b> (Comprobe os permisos e que o directorio está baleiro).
+FTPPassiveMode=Modo pasivo
+ChooseAFTPEntryIntoMenu=Escolla un sitio FTP no menú ...
+FailedToGetFile=Non foi posible acadar os ficheiros %s
diff --git a/htdocs/langs/gl_ES/help.lang b/htdocs/langs/gl_ES/help.lang
index 7b6c242b896..cc0ba0fd7df 100644
--- a/htdocs/langs/gl_ES/help.lang
+++ b/htdocs/langs/gl_ES/help.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki support
-EMailSupport=Emails support
-RemoteControlSupport=Online real-time / remote support
-OtherSupport=Other support
-ToSeeListOfAvailableRessources=To contact/see available resources:
-HelpCenter=Help Center
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
-TypeSupportCommunauty=Community (free)
+CommunitySupport=Asistencia Forums e Wiki
+EMailSupport=Asistencia E-Mail
+RemoteControlSupport=Asistencia por soporte externo
+OtherSupport=Outros tipos de asistencia
+ToSeeListOfAvailableRessources=Contactar/ver recursos dispoñibles:
+HelpCenter=Centro de soporte
+DolibarrHelpCenter=Centro de soporte e axuda Dolibarr
+ToGoBackToDolibarr=Do contrario, <a href="%s">faga clic aquí para continuar usando Dolibarr</a>.
+TypeOfSupport=Tipo de soporte
+TypeSupportCommunauty=Comunitario (gratuito)
 TypeSupportCommercial=Comercial
 TypeOfHelp=Tipo
-NeedHelpCenter=Need help or support?
-Efficiency=Efficiency
-TypeHelpOnly=Help only
-TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+NeedHelpCenter=¿Precisa axuda ou soporte?
+Efficiency=Eficacia
+TypeHelpOnly=Só axuda
+TypeHelpDev=Axuda+Desenvolvemento
+TypeHelpDevForm=Axuda+Desenvolvemento+Formación
+BackToHelpCenter=Do contrario, <a href="%s">volte á páxina de inicio do Centro de axuda</a>.
+LinkToGoldMember=Pode chamar a un dos formadores preseleccionados por Dolibarr para o seu idioma (%s) facendo clic no seu Widget (o estado e o prezo máximo actualízanse automáticamente):
+PossibleLanguages=Idiomas dispoñibles
+SubscribeToFoundation=Axude ao proxecto Dolibarr, subscríbase á asociación Dolibarr
+SeeOfficalSupport=Para obter soporte oficial Dolibarr no seu idioma: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/gl_ES/hrm.lang b/htdocs/langs/gl_ES/hrm.lang
index 2ea2d9367d8..cb095d64e0d 100644
--- a/htdocs/langs/gl_ES/hrm.lang
+++ b/htdocs/langs/gl_ES/hrm.lang
@@ -14,5 +14,5 @@ DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Empregados
-Employee=Employee
+Employee=Empregado
 NewEmployee=New employee
diff --git a/htdocs/langs/gl_ES/languages.lang b/htdocs/langs/gl_ES/languages.lang
index 2bee3acad18..762cecb554f 100644
--- a/htdocs/langs/gl_ES/languages.lang
+++ b/htdocs/langs/gl_ES/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Árabe
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Árabe
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Búlgaro
 Language_bs_BA=Bosnio
 Language_ca_ES=Catalán
@@ -20,6 +23,7 @@ Language_en_GB=Inglés (Reino Unido)
 Language_en_IN=Inglés (India)
 Language_en_NZ=Inglés (Nova Celandia)
 Language_en_SA=Inglés (Arabia Saudita)
+Language_en_SG=English (Singapore)
 Language_en_US=Inglés (Estados Unidos)
 Language_en_ZA=Inglés (Sudáfrica)
 Language_es_ES=Español
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Español (Honduras)
 Language_es_MX=Español (México)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Español (Paraguay)
 Language_es_PE=Español (Perú)
 Language_es_PR=Español (Porto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estoniano
 Language_eu_ES=Éuscaro
@@ -44,26 +50,34 @@ Language_fi_FI=Finnish
 Language_fr_BE=Francés (Bélxica)
 Language_fr_CA=Francés (Canadá)
 Language_fr_CH=Francés (Suíza)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Francés
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Francés (Nova Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebreo
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croata
 Language_hu_HU=Húngaro
 Language_id_ID=Indonesian
 Language_is_IS=Islandés
 Language_it_IT=Italiano
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Xaponés
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
 Language_kn_IN=Kannada
 Language_ko_KR=Coreano
-Language_lo_LA=Lao
+Language_lo_LA=Laos
 Language_lt_LT=Lituano
 Language_lv_LV=Letón
 Language_mk_MK=Macedonio
 Language_mn_MN=Mongolian
 Language_nb_NO=Noruegués (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Holandés (Bélxica)
 Language_nl_NL=Dutch
 Language_pl_PL=Polaco
@@ -86,4 +100,5 @@ Language_uz_UZ=Usbeco
 Language_vi_VN=Vietnamita
 Language_zh_CN=Chinés
 Language_zh_TW=Chinés (tradicional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/gl_ES/ldap.lang b/htdocs/langs/gl_ES/ldap.lang
index 2afb9618134..7957050d002 100644
--- a/htdocs/langs/gl_ES/ldap.lang
+++ b/htdocs/langs/gl_ES/ldap.lang
@@ -13,7 +13,7 @@ LDAPUsers=Users in LDAP database
 LDAPFieldStatus=Estado
 LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Latest subscription date
+LDAPFieldLastSubscriptionDate=Data da última cotización
 LDAPFieldLastSubscriptionAmount=Latest subscription amount
 LDAPFieldSkype=Skype id
 LDAPFieldSkypeExample=Example: skypeName
diff --git a/htdocs/langs/gl_ES/loan.lang b/htdocs/langs/gl_ES/loan.lang
index 36410b17bc2..5f3de7a9ab7 100644
--- a/htdocs/langs/gl_ES/loan.lang
+++ b/htdocs/langs/gl_ES/loan.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Crédito
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-LoanPayment=Loan payment
-ShowLoanPayment=Show Loan Payment
+Loan=Empréstito
+Loans=Empréstitos
+NewLoan=Novo empréstito
+ShowLoan=Ver empréstito
+PaymentLoan=Pago de empréstito
+LoanPayment=Pago do empréstito
+ShowLoanPayment=Consultar pago de empréstito
 LoanCapital=Capital
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
-Term=Term
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
-ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
-FinancialCommitment=Financial commitment
-InterestAmount=Interest
-CapitalRemain=Capital remain
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+Insurance=Seguro
+Interest=Interese
+Nbterms=Número de prazos
+Term=Prazo
+LoanAccountancyCapitalCode=Conta contable capital
+LoanAccountancyInsuranceCode=Conta contable seguro
+LoanAccountancyInterestCode=Conta contable interese
+ConfirmDeleteLoan=¿Está certo de querer eliminar este empréstito?
+LoanDeleted=Empréstito eliminado correctamente
+ConfirmPayLoan=¿Esta certo de querer clasificar como pagado este empréstito?
+LoanPaid=Empréstito pagado
+ListLoanAssociatedProject=Listaxe de empréstitos asociados ao proxecto
+AddLoan=Crear empréstito
+FinancialCommitment=Compromiso financieiro
+InterestAmount=Interese
+CapitalRemain=Capital restante
+TermPaidAllreadyPaid = Este prazo xa está pago
+CantUseScheduleWithLoanStartedToPaid = Non pode usar o planificador para un emprétito con pago iniciado
+CantModifyInterestIfScheduleIsUsed = Non pode modificar os intereses se xa está planificado
 # Admin
-ConfigLoan=Configuration of the module loan
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accounting account interest by default
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accounting account insurance by default
-CreateCalcSchedule=Edit financial commitment
+ConfigLoan=Configuración do módulo empréstitos
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Conta contable por defecto para o capital
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Conta contable por defecto para o interese
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Conta contable por defecto para o seguro
+CreateCalcSchedule=Editar o compromiso financieiro
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
index d05826326fc..f3c5ab840b9 100644
--- a/htdocs/langs/gl_ES/mails.lang
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -1,37 +1,37 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=EMailing
-EMailing=EMailing
-EMailings=EMailings
-AllEMailings=All eMailings
-MailCard=EMailing card
-MailRecipients=Recipients
-MailRecipient=Recipient
+Mailing=Mailing
+EMailing=Mailing
+EMailings=Mailings
+AllEMailings=Todos os Mailings
+MailCard=Ficha Mailing
+MailRecipients=Destinatarios
+MailRecipient=Destinatario
 MailTitle=Descrición
 MailFrom=Remitente
-MailErrorsTo=Errors to
-MailReply=Reply to
-MailTo=Receiver(s)
-MailToUsers=To user(s)
-MailCC=Copy to
-MailToCCUsers=Copy to users(s)
-MailCCC=Cached copy to
-MailTopic=Email topic
+MailErrorsTo=Erros a
+MailReply=Respostar a
+MailTo=Destinatario(s)
+MailToUsers=A usuario(s)
+MailCC=Copia a
+MailToCCUsers=Copia a usuario(s)
+MailCCC=Axuntar copia a
+MailTopic=Asunto do correo
 MailText=Mensaxe
-MailFile=Attached files
-MailMessage=Texto no corpo da mensaxe
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
-ShowEMailing=Show emailing
-ListOfEMailings=List of emailings
-NewMailing=New emailing
-EditMailing=Edit emailing
-ResetMailing=Resend emailing
-DeleteMailing=Delete emailing
-DeleteAMailing=Delete an emailing
-PreviewMailing=Preview emailing
-CreateMailing=Create emailing
-TestMailing=Test email
-ValidMailing=Valid emailing
+MailFile=Ficheiro
+MailMessage=Texto utilizado no corpo da mensaxe
+SubjectNotIn=Non no asunto
+BodyNotIn=Non no corpo
+ShowEMailing=Amosar Mailing
+ListOfEMailings=Listaxe de Mailings
+NewMailing=Novo Mailing
+EditMailing=Editar Mailing
+ResetMailing=Novo envío
+DeleteMailing=Eliminar Mailing
+DeleteAMailing=Eliminar un Mailing
+PreviewMailing=Previsualizar un Mailing
+CreateMailing=Crear Mailing
+TestMailing=Probar Mailing
+ValidMailing=Validar Mailing
 MailingStatusDraft=Borrador
 MailingStatusValidated=Validado
 MailingStatusSent=Enviado
@@ -39,100 +39,100 @@ MailingStatusSentPartialy=Enviado parcialmente
 MailingStatusSentCompletely=Envío completado
 MailingStatusError=Erro
 MailingStatusNotSent=Non enviado
-MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
-ErrorMailRecipientIsEmpty=Email recipient is empty
-WarningNoEMailsAdded=No new Email to add to recipient's list.
-ConfirmValidMailing=Are you sure you want to validate this emailing?
-ConfirmResetMailing=Warning, by re-initializing emailing <b>%s</b>, you will allow the re-sending this email in a bulk mailing. Are you sure you want to do this?
-ConfirmDeleteMailing=Are you sure you want to delete this emailing?
-NbOfUniqueEMails=No. of unique emails
-NbOfEMails=No. of EMails
-TotalNbOfDistinctRecipients=Number of distinct recipients
-NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
-NoRecipientEmail=No recipient email for %s
-RemoveRecipient=Remove recipient
-YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README.
-EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values
-MailingAddFile=Attach this file
-NoAttachedFiles=No attached files
-BadEMail=Bad value for Email
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
-CloneContent=Clone message
-CloneReceivers=Cloner recipients
-DateLastSend=Date of latest sending
-DateSending=Date sending
-SentTo=Sent to <b>%s</b>
-MailingStatusRead=Read
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
-EMailSentToNRecipients=Email sent to %s recipients.
-EMailSentForNElements=Email sent for %s elements.
-XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
-OneEmailPerRecipient=One email per recipient (by default, one email per record selected)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
-ResultOfMailSending=Result of mass Email sending
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
-SentXXXmessages=%s message(s) sent.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
-MailingModuleDescEmailsFromFile=Emails from file
-MailingModuleDescEmailsFromUser=Emails input by user
-MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
-SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
+MailSuccessfulySent=E-Mail aceptado para a entrega (de %s a %s)
+MailingSuccessfullyValidated=Mailing validado correctamente
+MailUnsubcribe=Eliminar suscrición
+MailingStatusNotContact=Non contactar
+MailingStatusReadAndUnsubscribe=Lido e eliminada suscrición
+ErrorMailRecipientIsEmpty=O enderezo do destinatario está baleiro
+WarningNoEMailsAdded=Ningún novo Mailing a engadir á listaxe destinatarios.
+ConfirmValidMailing=¿Confirma a validación do Mailing?
+ConfirmResetMailing=Atención, no reinicio do Mailing <b>%s</b>, autoriza novamente a súa emisión en masa. ¿É isto o que quere facer?
+ConfirmDeleteMailing=¿Confirma a eliminación do Mailing?
+NbOfUniqueEMails=Nº de mails únicos
+NbOfEMails=Nº de mails
+TotalNbOfDistinctRecipients=Número de destinatarios únicos
+NoTargetYet=Ningún destinatario definido
+NoRecipientEmail=Sen mail para %s
+RemoveRecipient=Eliminar destinatario
+YouCanAddYourOwnPredefindedListHere=Para crear o seu módulo de selección de mails, vexa htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=En modo proba, as variables de sustitución son cambiadas por valores xenéricos
+MailingAddFile=Axuntar este ficheiro
+NoAttachedFiles=Sen ficheiros
+BadEMail=Mail incorrecto
+ConfirmCloneEMailing=¿Está certo de querer clonar este mailing?
+CloneContent=Clonar mensaxe
+CloneReceivers=Clonar destinatarios
+DateLastSend=Data do último envío
+DateSending=Data envío
+SentTo=Enviado a <b>%s</b>
+MailingStatusRead=Lido
+YourMailUnsubcribeOK=O mail <b>%s</b> foi dado de baixa correctamente da listaxe de correo
+ActivateCheckReadKey=Clave usada para cifrar a URL utilizada para a función "Darse de baixa"
+EMailSentToNRecipients=Mail enviado a %s destinatarios.
+EMailSentForNElements=Mail enviado a %s elementos.
+XTargetsAdded=<b>%s</b> destinatarios agregados á listaxe
+OnlyPDFattachmentSupported=Se o documento PDF foi xerado polo obxecto a enviar, será axuntado ao mail, na contra non será enviado o mail. (teña conta que nesta versión só admintense documentos PDF como ficheiros axuntos  para mails en masa).
+AllRecipientSelected=Os destinatarios do rexistro %s seleccionado (se coñece o seu mail).
+GroupEmails=E-mail grupais
+OneEmailPerRecipient=Un mail por destinatario (de forma predeterminada, un mail por rexistro seleccionado)
+WarningIfYouCheckOneRecipientPerEmail=Atención: Se marca esta casilla, significa que só será enviado un mail para varios rexistros diferentes seleccionados, polo tanto, se a súa mensaxe contén variables de sustitución que fan referencia aos datos dun rexistro, non será posible reemplazalos.
+ResultOfMailSending=Resultado do envío masivo de mails
+NbSelected=Nº seleccionados
+NbIgnored=Nº ignorados
+NbSent=Nº enviados
+SentXXXmessages=%s mensaxe(s) enviado(s)
+ConfirmUnvalidateEmailing=¿Está certo de querer cambiar o estado do mailing <b>%s</b> a borrador?
+MailingModuleDescContactsWithThirdpartyFilter=Filtro de contactos con terceiro
+MailingModuleDescContactsByCompanyCategory=Contactos de terceiros por categoría
+MailingModuleDescContactsByCategory=Contactos por categoría
+MailingModuleDescContactsByFunction=Contactos por posición
+MailingModuleDescEmailsFromFile=Mails de ficheiros
+MailingModuleDescEmailsFromUser=Mails enviados por usuario
+MailingModuleDescDolibarrUsers=Usuarios con mails
+MailingModuleDescThirdPartiesByCategories=Terceiros (por categoría)
+SendingFromWebInterfaceIsNotAllowed=O envío dende a interfaz web non está permitido.
 
 # Libelle des modules de liste de destinataires mailing
-LineInFile=Line %s in file
-RecipientSelectionModules=Defined requests for recipient's selection
-MailSelectedRecipients=Selected recipients
-MailingArea=EMailings area
-LastMailings=Latest %s emailings
-TargetsStatistics=Targets statistics
-NbOfCompaniesContacts=Unique contacts/addresses
-MailNoChangePossible=Recipients for validated emailing can't be changed
-SearchAMailing=Search mailing
-SendMailing=Send emailing
-SentBy=Sent by
-MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients:
+LineInFile=Liña %s en ficheiro
+RecipientSelectionModules=Módulos de selección dos destinatarios
+MailSelectedRecipients=Destinatarios seleccionados
+MailingArea=Área Mailings
+LastMailings=Últimos %s mailings
+TargetsStatistics=Estatísticas destinatarios
+NbOfCompaniesContacts=Contactos/enderezos únicos
+MailNoChangePossible=Destinatarios dun mailing validado non modificables
+SearchAMailing=Buscar un Mailing
+SendMailing=Enviar Mailing
+SentBy=Enviado por
+MailingNeedCommand=O envío dun mailing pode realizarse dende a liña de comandos. Solicite ao administrador do servidor que execute o siguiente comando para enviar o mailling a todos os destinatarios:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
 ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ?
 LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
-TargetsReset=Clear list
-ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
-ToAddRecipientsChooseHere=Add recipients by choosing from the lists
-NbOfEMailingsReceived=Mass emailings received
-NbOfEMailingsSend=Mass emailings sent
-IdRecord=ID record
-DeliveryReceipt=Delivery Ack.
-YouCanUseCommaSeparatorForSeveralRecipients=You can use the <b>comma</b> separator to specify several recipients.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature of sending user
-EMailRecipient=Recipient Email
-TagMailtoEmail=Recipient Email (including html "mailto:" link)
-NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+TargetsReset=Vaciar listaxe
+ToClearAllRecipientsClickHere=Para vaciar a listaxe dos destinatarios deste mailing, faga click no botón
+ToAddRecipientsChooseHere=Para engadir destinatarios, escolla os que figuran nas listaxes a continuación
+NbOfEMailingsReceived=ailings en masa recibidos
+NbOfEMailingsSend=Milings masivos enviados
+IdRecord=ID rexistro
+DeliveryReceipt=Acuse de recibo.
+YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o carácter de separación <b>coma </b> para especificar múltiples destinatarios.
+TagCheckMail=Seguemento da apertura do email
+TagUnsubscribe=Ligazón de baixa na suscrición
+TagSignature=Sinatura do usuario que envía
+EMailRecipient=Mail do destinatario
+TagMailtoEmail=Mail do destinatario (incluindo a ligazón html "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=Non foi enviado o mail. O remitente ou destinatario é incorrecto. Comprobe os datos do usuario.
 # Module Notifications
 Notifications=Notificacións
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
-ANotificationsWillBeSent=1 notification will be sent by email
-SomeNotificationsWillBeSent=%s notifications will be sent by email
-AddNewNotification=Activate a new email notification target/event
-ListOfActiveNotifications=List all active targets/events for email notification
-ListOfNotificationsDone=List all email notifications sent
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter <strong>'%s'</strong> to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
+NoNotificationsWillBeSent=Ningunha notificación por mail está prevista para este evento e empresa
+ANotificationsWillBeSent=Unha notificación vai ser enviada por mail
+SomeNotificationsWillBeSent=%s notificaciones van ser enviadas por mail
+AddNewNotification=Activar un novo destinatario de notificacións
+ListOfActiveNotifications=Listaxe de destinatarios activos para notifiacións por mail
+ListOfNotificationsDone=Listaxe de notificacións enviadas
+MailSendSetupIs=A configuración de mailings está a '%s'. Este modo non pode ser usado para enviar mails masivos.
+MailSendSetupIs2=Antes debe, cunha conta de administrador, no menú %sInicio - Configuración - E-Mails%s, cambiar o parámetro <strong>'%s'</strong> para usar o modo '%s'. Con este modo pode configurar un servidor SMTP do seu provedor de servizos de internet.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
 YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
 NbOfTargetedContacts=Current number of targeted contact emails
@@ -141,30 +141,34 @@ UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstn
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
-AdvTgtSearchIntHelp=Use interval to select int or float value
-AdvTgtMinVal=Minimum value
-AdvTgtMaxVal=Maximum value
-AdvTgtSearchDtHelp=Use interval to select date value
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third-party email or just contact email
-AdvTgtTypeOfIncude=Type of targeted email
-AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
-AddAll=Add all
-RemoveAll=Remove all
-ItemsCount=Item(s)
-AdvTgtNameTemplate=Filter name
-AdvTgtAddContact=Add emails according to criteria
-AdvTgtLoadFilter=Load filter
-AdvTgtDeleteFilter=Delete filter
-AdvTgtSaveFilter=Save filter
-AdvTgtCreateFilter=Create filter
-AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
-DefaultOutgoingEmailSetup=Default outgoing email setup
+AdvTgtSearchIntHelp=Use un intervaldo para seleccionar valor int o float
+AdvTgtMinVal=Valor mínimo
+AdvTgtMaxVal=Valor máximo
+AdvTgtSearchDtHelp=Use un intervalo para seleccionar unha data
+AdvTgtStartDt=Data inicio
+AdvTgtEndDt=Data fin
+AdvTgtTypeOfIncudeHelp=Destinatario ou mail do terceiro e o mail do contacto do terceiro, ou só o e-mail do terceiro ou o mail do contacto
+AdvTgtTypeOfIncude=Tipo de mail destinatario
+AdvTgtContactHelp=Usar se escolleu contacto en "Tipo de mail destinatario"
+AddAll=Engadir todo
+RemoveAll=Eliminar todo
+ItemsCount=Ítem(s)
+AdvTgtNameTemplate=Nome do filtro
+AdvTgtAddContact=Engadir os e-mails acordes aos criterios
+AdvTgtLoadFilter=Cargar filtro
+AdvTgtDeleteFilter=Eliminar filtro
+AdvTgtSaveFilter=Gardar filtro
+AdvTgtCreateFilter=Crear filtro
+AdvTgtOrCreateNewFilter=Nome do novo filtro
+NoContactWithCategoryFound=Non atopáronse contactos/enderezos con algunha categoría
+NoContactLinkedToThirdpartieWithCategoryFound=Non atopáronse contactos/enderezos con algunha categoría
+OutGoingEmailSetup=Configuración do correo saínte
+InGoingEmailSetup=Configuración do correo entrante
+OutGoingEmailSetupForEmailing=Configuración do correo saínte (para correo masivo)
+DefaultOutgoingEmailSetup=Configuración do correo saínte predeterminada
 Information=Información
-ContactsWithThirdpartyFilter=Contacts with third-party filter
+ContactsWithThirdpartyFilter=Contactos con filtro de terceiros.
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index cfc86017137..a442449ba51 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=P.U.(+IVE)
 Amount=Importe
 AmountInvoice=Importe factura
 AmountInvoiced=Importe facturado
-AmountInvoicedHT=Importe facturado (incl. tax)
-AmountInvoicedTTC=Importe facturado (excl. tax)
+AmountInvoicedHT=Importe facturado (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Importe pagamento
 AmountHTShort=Base imp.
 AmountTTCShort=Importe
@@ -485,6 +485,7 @@ Categories=Etiquetas/categorías
 Category=Etiqueta/categoría
 By=Por
 From=De
+FromDate=De
 FromLocation=De
 to=a
 To=a
@@ -687,6 +688,7 @@ Method=Método
 Receive=Recepción
 CompleteOrNoMoreReceptionExpected=Completado ou no agárdase mais
 ExpectedValue=Valor agardado
+ExpectedQty=Expected Qty
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca recibido
@@ -703,6 +705,7 @@ MenuECM=Documentos
 MenuAWStats=AWStats
 MenuMembers=Membros
 MenuAgendaGoogle=Axenda Google
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menú Inicio-configuración-seguridade): %s Kb, PHP limit: %s Kb
 NoFileFound=Non hai documentos gardados neste directorio
 CurrentUserLanguage=Idioma actual
@@ -725,7 +728,7 @@ Page=Páxina
 Notes=Notas
 AddNewLine=Engadir nova liña
 AddFile=Engadir arquivo
-FreeZone=Sen produtos/servizos predefinidos
+FreeZone=Free-text product
 FreeLineOfType=Entrada libre, tipo:
 CloneMainAttributes=Clonar o obxecto con estes atributos principais
 ReGeneratePDF=Xerar de novo o PDF
@@ -942,6 +945,39 @@ ShortThursday=X
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Seleccione unha prantilla de correo
 SetRef=Establecer ref
 Select2ResultFoundUseArrows=Algúns resultados atopados. Use as frechas para seleccionar.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Cambiar a modo edición para axuntar tradución
 NotUsedForThisCustomer=Non usado para este cliente
 AmountMustBePositive=Importe ten que ser positivo
 ByStatus=By status
+InformationMessage=Información
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/gl_ES/margins.lang b/htdocs/langs/gl_ES/margins.lang
index c3d8952c836..0e2749a1157 100644
--- a/htdocs/langs/gl_ES/margins.lang
+++ b/htdocs/langs/gl_ES/margins.lang
@@ -1,45 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
+Margin=Marxe
 Margins=Marxes
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-ContactOfInvoice=Contact of invoice
-UserMargins=User margins
+TotalMargin=Marxe total
+MarginOnProducts=Marxe / Produtos
+MarginOnServices=Marxe / Servizos
+MarginRate=Marxe sobre coste
+MarkRate=Marxe sobre venda
+DisplayMarginRates=Amosar a marxe sobre costes
+DisplayMarkRates=Amosar a marxe sobre ventas
+InputPrice=Introducir un prezo
+margin=Xestión de marxes
+margesSetup=Configuración da xestión de marxes
+MarginDetails=Detalles de marxes realizados
+ProductMargins=Marxes por produto
+CustomerMargins=Marxes por cliente
+SalesRepresentativeMargins=Marxes por comercial
+ContactOfInvoice=Contacto da factura
+UserMargins=Marxes do usuario
 ProductService=Produto ou servizo
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best vendor price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best vendor price if WAP not yet defined
-CostPrice=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per contact/address. Note that reading statistics on a contact is not reliable since in most cases the contact may not be defined explicitely on the invoices.
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any dedicated sale representative and some third parties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+AllProducts=Todos os produtos e servizos
+ChooseProduct/Service=Eescolla o produto ou servizo
+ForceBuyingPriceIfNull=Forzar prezo de compra/custo ao prezo de venda se non se define
+ForceBuyingPriceIfNullDetails=Se o prezo de compra/custo non foi definido, e esta opción está activada, a marxe será cero na liña (prezo de compra/custo = prezo de venda), do contrario a marxe será igual ao suxerido por defecto.
+MARGIN_METHODE_FOR_DISCOUNT=Método de xestión de descontos globais
+UseDiscountAsProduct=Como un produto
+UseDiscountAsService=Como un servizo
+UseDiscountOnTotal=Sobre o total
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica se un desconto global toma en conta como un produto, servizo ou so no total a hora de calcular os marxes.
+MARGIN_TYPE=Prezo compra/custo suxerido por defecto polo cálculo de marxes
+MargeType1=Marxe en Mellor Prezo Proveedor
+MargeType2=Marxe en Prezo Medio Ponderado (PMP)
+MargeType3=Marxe en Prezo de custo
+MarginTypeDesc=* Marxe en mellor prezo de compra = Prezo de venda - Mellor prezo de provedor definido na ficha do produto<br>* Marxe en Prezo promedio ponderado (PMP) = Prezo de venda - Prezo Medio Ponderado do produto (PMP), ou mellor prezo de provedor se PMP aínda non está definido <br > * Marxe en prezo de custo = Prezo de venda - prezo de custo definido na ficha do produto ou PMP se o prezo de custo non está definido, ou mellor prezo de provedor se PMP aínda non está definido
+CostPrice=Prezo de compra
+UnitCharges=Carga unitaria
+Charges=Cargas
+AgentContactType=Tipo de contacto comisionado
+AgentContactTypeDetails=Indique qué tipo de contacto (ligado ás facturas) será o utilizado para o informe de marxes de axentes comerciais
+rateMustBeNumeric=O marxe debe ser un valor numérico
+markRateShouldBeLesserThan100=O marxe ten que ser menor que 100
+ShowMarginInfos=Amosar info de marxes
+CheckMargins=Detalles de marxes
+MarginPerSaleRepresentativeWarning=O informe de marxe por usuario usa o ligazón entre terceiros e comerciais para calcular a marxe de cada usuario. Debido a que algúns terceiros poden non estar ligados a un comercial e algúns terceiros poden estar relacionados con varios usuarios, algunhas marxes poden noo aparecer neste informe ou poderá aparecer en varias liñas diferentes.
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index 1a7a10615e8..e1a665a28de 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -1,129 +1,129 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Members area
-MemberCard=Member card
-SubscriptionCard=Subscription card
-Member=Member
+MembersArea=Área membros
+MemberCard=Ficha membro
+SubscriptionCard=Ficha cotización
+Member=Membro
 Members=Membros
-ShowMember=Show member card
-UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Members Tickets
-FundationMembers=Foundation members
-ListOfValidatedPublicMembers=List of validated public members
-ErrorThisMemberIsNotPublic=This member is not public
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-SetLinkToUser=Link to a Dolibarr user
-SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
-MembersList=List of members
-MembersListToValid=List of draft members (to be validated)
-MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
-MembersListResiliated=List of terminated members
-MembersListQualified=List of qualified members
-MenuMembersToValidate=Draft members
-MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
-MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=Members with subscription to receive
-MembersWithSubscriptionToReceiveShort=Subscription to receive
-DateSubscription=Subscription date
-DateEndSubscription=Subscription end date
-EndSubscription=End subscription
-SubscriptionId=Subscription id
-MemberId=Member id
-NewMember=New member
-MemberType=Member type
-MemberTypeId=Member type id
-MemberTypeLabel=Member type label
+ShowMember=Amosar ficha membro
+UserNotLinkedToMember=Usuario non ligado a un membro
+ThirdpartyNotLinkedToMember=Terceiro non ligado a ningún membro
+MembersTickets=Etiquetas membros
+FundationMembers=Membros da asociación
+ListOfValidatedPublicMembers=Listaxe de membros públicos validados
+ErrorThisMemberIsNotPublic=Este membro non é público
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro (nombre: <b>%s</b>, login: <b>%s</b>) está ligado ao terceiro <b>%s</b>. Elimine a ligazón existente xa que un terceiro só pode estar ligado a un só membro (e viceversa).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Por razóns de seguridade, debe posuir os dereitos de modificación de todos os usuarios para poder ligar un membro a un usuario que non sexa vostede mesmo mesmo.
+SetLinkToUser=Ligar a un usuario Dolibarr
+SetLinkToThirdParty=Ligar a un terceiro Dolibarr
+MembersCards=Carnés de membros
+MembersList=Listaxe de membros
+MembersListToValid=Listaxe de membros borrador (a validar)
+MembersListValid=Listaxe de membros validados
+MembersListUpToDate=Listaxe dos membros válidos ao día de adhesión
+MembersListNotUpToDate=Listaxe dos membros válidos non ao día de adhesión
+MembersListResiliated=Listaxe dos membros dados de baixa
+MembersListQualified=Listaxe dos membros cualificados
+MenuMembersToValidate=Membros borrador
+MenuMembersValidated=Membros validados
+MenuMembersUpToDate=Membros ao día
+MenuMembersNotUpToDate=Membros non ao día
+MenuMembersResiliated=Membros de baixa
+MembersWithSubscriptionToReceive=Membros agardando recibir afiliación
+MembersWithSubscriptionToReceiveShort=Agardando afiliación
+DateSubscription=Data afiliación
+DateEndSubscription=Data fin afiliación
+EndSubscription=Fin afiliación
+SubscriptionId=ID afiliación
+MemberId=ID membro
+NewMember=Novo membro
+MemberType=Tipo de membro
+MemberTypeId=ID tipo de membro
+MemberTypeLabel=Etiqueta tipo de membro
 MembersTypes=Tipos de membros
-MemberStatusDraft=Borrador (é preciso validar)
+MemberStatusDraft=Borrador (a validar)
 MemberStatusDraftShort=Borrador
-MemberStatusActive=Validated (waiting subscription)
+MemberStatusActive=Validado (agardando afiliación)
 MemberStatusActiveShort=Validado
-MemberStatusActiveLate=Subscription expired
+MemberStatusActiveLate=Afiliación expirada
 MemberStatusActiveLateShort=Expirado
-MemberStatusPaid=Subscription up to date
-MemberStatusPaidShort=Up to date
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
-MembersStatusToValid=Draft members
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusPaid=Afiliacións ao día
+MemberStatusPaidShort=Ao día
+MemberStatusResiliated=Membro de baixa
+MemberStatusResiliatedShort=De baixa
+MembersStatusToValid=Membros en borrador
+MembersStatusResiliated=Membros de baixa
+MemberStatusNoSubscription=Validado (non precisa afiliación)
 MemberStatusNoSubscriptionShort=Validado
-SubscriptionNotNeeded=No subscription needed
-NewCotisation=New contribution
-PaymentSubscription=New contribution payment
-SubscriptionEndDate=Subscription's end date
-MembersTypeSetup=Members type setup
-MemberTypeModified=Member type modified
-DeleteAMemberType=Delete a member type
-ConfirmDeleteMemberType=Are you sure you want to delete this member type?
-MemberTypeDeleted=Member type deleted
-MemberTypeCanNotBeDeleted=Member type can not be deleted
-NewSubscription=New subscription
-NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-Subscription=Subscription
-Subscriptions=Subscriptions
-SubscriptionLate=Atraso
-SubscriptionNotReceived=Subscription never received
-ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by email
-AddMember=Create member
-NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-NewMemberType=New member type
-WelcomeEMail=Welcome email
-SubscriptionRequired=Subscription required
+SubscriptionNotNeeded=Non precisa afiliación
+NewCotisation=Nova afiliación
+PaymentSubscription=Pagamento de cotas
+SubscriptionEndDate=Data fin afiliación
+MembersTypeSetup=Configuración dos tipos de membros
+MemberTypeModified=Tipo de membro modificado
+DeleteAMemberType=Eliminar un tipo de membro
+ConfirmDeleteMemberType=¿Está certo de querer eliminar este tipo de membro?
+MemberTypeDeleted=Tipo de membro eliminado
+MemberTypeCanNotBeDeleted=O tipo de membro non pode ser eliminado
+NewSubscription=Nova afiliación
+NewSubscriptionDesc=Utilice este formulario para rexistrarse como un novo membro daa asociación. Para unha renovación, se xa é membro, póñase en contacto coa asociación ao través do mail %s.
+Subscription=Afiliación
+Subscriptions=Afiliacións
+SubscriptionLate=En atraso
+SubscriptionNotReceived=Afiliación non recibida
+ListOfSubscriptions=Listaxe de afiliacións
+SendCardByMail=Enviar ficha por mail
+AddMember=Crear membro
+NoTypeDefinedGoToSetup=Ningún tipo de membro definido. Vaia a Configuración -> Tipos de membros
+NewMemberType=Novo tipo de membro
+WelcomeEMail=E-mail
+SubscriptionRequired=Precisa afilición
 DeleteType=Eliminar
-VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorPhy=Moral/Physical
-Reenable=Reenable
-ResiliateMember=Terminate a member
-ConfirmResiliateMember=Are you sure you want to terminate this member?
-DeleteMember=Delete a member
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions)?
-DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription?
-Filehtpasswd=htpasswd file
-ValidateMember=Validate a member
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
-PublicMemberList=Public member list
-BlankSubscriptionForm=Public self-subscription form
-BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public website with self-subscription form
-ForceMemberType=Force the member type
-ExportDataset_member_1=Members and subscriptions
+VoteAllowed=Voto autorizado
+Physical=Físico
+Moral=Xurídico
+MorPhy=Nature
+Reenable=Reactivar
+ResiliateMember=Dar de baixa a un membro
+ConfirmResiliateMember=¿Está certo de querer dar de baixa a este membro?
+DeleteMember=Eliminar un membro
+ConfirmDeleteMember=¿Está certo de querer eliminar este membro (Eliminar un membro elimina tamén todas as súas afiliacións)?
+DeleteSubscription=Eliminar unha afiliación
+ConfirmDeleteSubscription=¿Está certo de querer eliminar esta afiliación?
+Filehtpasswd=Archivo htpasswd
+ValidateMember=Validar un membro
+ConfirmValidateMember=¿Está certo de querer validar a este membro?
+FollowingLinksArePublic=As seguintes ligazóns son páxinas abertas que non están protexidas por ningún permiso de Dolibarr. Non son páxinas con formato, proporcionanse como exemplo para amosar cómo enumerar a base de datos de membros.
+PublicMemberList=Listaxe público de membros
+BlankSubscriptionForm=Formulario público de auto afiliación
+BlankSubscriptionFormDesc=Dolibarr pode proporcionar unha páxina pública para que os visitantes externos podan solicitar afiliarse. Se atópase activo un módulo de pagamento en líña, proporá automáticamente un formulario de pagamento.
+EnablePublicSubscriptionForm=Activar 0 formulario público de auto afiliación
+ForceMemberType=Forzar o tipo de membro
+ExportDataset_member_1=Membros e afiliacións
 ImportDataset_member_1=Membros
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+LastMembersModified=Últimos %s membros modificados
+LastSubscriptionsModified=Últimas %s afiliacións modificadas
 String=Cadea de texto
-Text=Text
-Int=Int
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
-ShowSubscription=Show subscription
+Text=Texto
+Int=Numérico
+DateAndTime=Data e hora
+PublicMemberCard=Ficha pública do membro
+SubscriptionNotRecorded=Afiliación non gardada
+AddSubscription=Crear afiliación
+ShowSubscription=Amosar afiliación
 # Label of email templates
-SendingAnEMailToMember=Sending information email to member
-SendingEmailOnAutoSubscription=Sending email on auto registration
-SendingEmailOnMemberValidation=Sending email on new member validation
-SendingEmailOnNewSubscription=Sending email on new subscription
-SendingReminderForExpiredSubscription=Sending reminder for expired subscriptions
-SendingEmailOnCancelation=Sending email on cancelation
+SendingAnEMailToMember=Enviar mail de información ao membro
+SendingEmailOnAutoSubscription=Enviar mail nunha auto afiliación
+SendingEmailOnMemberValidation=Enviar mail na validación dun novo membro
+SendingEmailOnNewSubscription=Enviar mail nunha nova afiliación
+SendingReminderForExpiredSubscription=Enviar un recordatorio para afiliación caducada
+SendingEmailOnCancelation=Enviar mail nunha cancelación
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new subscription was recorded
-SubscriptionReminderEmail=Subscription reminder
-YourMembershipWasCanceled=Your membership was canceled
-CardContent=Content of your member card
+YourMembershipRequestWasReceived=A súa membresía foi recibida.
+YourMembershipWasValidated=A súa membresía foi validada.
+YourSubscriptionWasRecorded=A súa afiliación foi gardada
+SubscriptionReminderEmail=Recordatorio de afiliación
+YourMembershipWasCanceled=A súa membresía foi cancelada.
+CardContent=Contido da súa ficha de membro
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=We want to let you know that your membership request was received.<br><br>
 ThisIsContentOfYourMembershipWasValidated=We want to let you know that your membership was validated with the following information:<br><br>
@@ -145,60 +145,60 @@ DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
 DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
 DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
 DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-ShowTypeCard=Show type '%s'
-HTPasswordExport=htpassword file generation
-NoThirdPartyAssociatedToMember=No third party associated to this member
-MembersAndSubscriptions= Members and Subscriptions
-MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-MoreActionBankDirect=Create a direct entry on bank account
-MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
-MoreActionInvoiceOnly=Create an invoice with no payment
-LinkToGeneratedPages=Generate visit cards
-LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-DocForAllMembersCards=Generate business cards for all members
-DocForOneMemberCards=Generate business cards for a particular member
-DocForLabels=Generate address sheets
-SubscriptionPayment=Pago cota
-LastSubscriptionDate=Date of latest subscription payment
-LastSubscriptionAmount=Amount of latest subscription
-MembersStatisticsByCountries=Members statistics by country
-MembersStatisticsByState=Members statistics by state/province
-MembersStatisticsByTown=Members statistics by town
-MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NoValidatedMemberYet=No validated members found
-MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
-MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
-MembersByTownDesc=This screen show you statistics on members by town.
-MembersStatisticsDesc=Choose statistics you want to read...
+ShowTypeCard=Ver tipo '%s'
+HTPasswordExport=Xeración archivo htpassword
+NoThirdPartyAssociatedToMember=Ningún terceiro asociado a este membro
+MembersAndSubscriptions= Membros e afiliacións
+MoreActions=Acción complementaria ao rexistro
+MoreActionsOnSubscription=Accións complementarias propostas por defecto na afiliación dun membro
+MoreActionBankDirect=Crear un rexistro directo na conta bancaria
+MoreActionBankViaInvoice=Crear unha factura e un pagamento na conta bancaria
+MoreActionInvoiceOnly=Creación factura sen pagamento
+LinkToGeneratedPages=Xeración de tarxetas de presentación
+LinkToGeneratedPagesDesc=Esta pantalla permitelle crear prantillas de tarxetas de presentación para os membros o para cada membro en particular.
+DocForAllMembersCards=Xeración de tarxetas para todos os membros
+DocForOneMemberCards=Xeración de tarxetas para un membro en particular
+DocForLabels=Xeración de etiquetas de enderezos
+SubscriptionPayment=Pagamento cota
+LastSubscriptionDate=Data da última cotización
+LastSubscriptionAmount=Importe da última cotización
+MembersStatisticsByCountries=Estatísticas de membros por país
+MembersStatisticsByState=Estatísticas de membros por provincia/pais
+MembersStatisticsByTown=Estatísticas de membros por poboación
+MembersStatisticsByRegion=Estatísticas de membros por rexión
+NbOfMembers=Número de membros
+NoValidatedMemberYet=Ningún membro validado atopado
+MembersByCountryDesc=Esta pantalla presenta unha estatística do número de membros por países. Porén, a gráfica utiliza o servizo en líña  de gráficas de Google e só é operativo cando ten operativa unha conexión a Internet.
+MembersByStateDesc=Esta pantalla presenta unha estatística do número de membros por paises/provincias/comunidades
+MembersByTownDesc=Esta pantalla presenta unha estatística do número de membros por poboación.
+MembersStatisticsDesc=Escolla as estatísticas que desexa consultar...
 MenuMembersStats=Estatísticas
-LastMemberDate=Latest member date
-LatestSubscriptionDate=Latest subscription date
-MemberNature=Nature of member
-Public=Information are public
-NewMemberbyWeb=New member added. Awaiting approval
-NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
-NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
-TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-DefaultAmount=Default amount of subscription
-CanEditAmount=Visitor can choose/edit amount of its subscription
-MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No VAT for subscriptions
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
-NameOrCompany=Name or company
-SubscriptionRecorded=Subscription recorded
-NoEmailSentToMember=No email sent to member
-EmailSentToMember=Email sent to member at %s
-SendReminderForExpiredSubscriptionTitle=Send reminder by email for expired subscription
-SendReminderForExpiredSubscription=Send reminder by email to members when subscription is about to expire (parameter is number of days before end of subscription to send the remind. It can be a list of days separated by a semicolon, for example '10;5;0;-5')
-MembershipPaid=Membership paid for current period (until %s)
-YouMayFindYourInvoiceInThisEmail=You may find your invoice attached to this email
-XMembersClosed=%s member(s) closed
+LastMemberDate=Última data de membro
+LatestSubscriptionDate=Data da última cotización
+MemberNature=Natureza do membro
+Public=Información pública
+NewMemberbyWeb=Novo membro engadido. Agardando validación
+NewMemberForm=Novo formulario de membro
+SubscriptionsStatistics=Estatísticas de cotizacións
+NbOfSubscriptions=Número de cotizacións
+AmountOfSubscriptions=Importe de cotizacións
+TurnoverOrBudget=Volumen de vendas (para empresa) ou Orzamento (para Fundación)
+DefaultAmount=Importe por defecto da afiliación
+CanEditAmount=O visitante pode escoller/modificar o importe da súa cotización
+MEMBER_NEWFORM_PAYONLINE=Ir á páxina integrada de pagamento en liña
+ByProperties=Por natureza
+MembersStatisticsByProperties=Estatísticas dos membros por natureza
+MembersByNature=Esta pantalla presenta unha estatística do número de membros por natureza.
+MembersByRegion=Esta pantalla presenta unha estatística do número de membros por rexión
+VATToUseForSubscriptions=Tasa de IVE para as afiliacións
+NoVatOnSubscription=Sen IVE para nas afiliacións
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto usado para as afiliacións en liña nas facturas: %s
+NameOrCompany=Nome ou empresa
+SubscriptionRecorded=Afiliación gardada
+NoEmailSentToMember=Non enviado ningún mail ao membro
+EmailSentToMember=Mail enviado ao membro a %s
+SendReminderForExpiredSubscriptionTitle=Enviar unha lembranza por mail para a afiliación expirada
+SendReminderForExpiredSubscription=Enviar lembranza por mail aos membros cando a afiliación esté a piques de caducar (o parámetro é o número de días antes do final da afiliación para enviar a lembranza. Pode ser unha listaxe de días separados por un punto e coma, por exemplo, '10; 5; 0; -5 ')
+MembershipPaid=Membresía pagada polo período actual (ata %s)
+YouMayFindYourInvoiceInThisEmail=Pode atopar a súa factura axuntada a este mail
+XMembersClosed=%s membro(s) pechado(s)
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index b2f6f187500..14eee8d483e 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Ordes de fabricación
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/gl_ES/multicurrency.lang b/htdocs/langs/gl_ES/multicurrency.lang
index 4e50a29d774..c9ec381e5b6 100644
--- a/htdocs/langs/gl_ES/multicurrency.lang
+++ b/htdocs/langs/gl_ES/multicurrency.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - multicurrency
-MultiCurrency=Multi currency
-ErrorAddRateFail=Error in added rate
-ErrorAddCurrencyFail=Error in added currency
-ErrorDeleteCurrencyFail=Error delete fail
-multicurrency_syncronize_error=Synchronization error: %s
-MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use the date of the document to find the currency rate, instead of using the latest known rate
-multicurrency_useOriginTx=When an object is created from another, keep the original rate from the source object (otherwise use the latest known rate)
-CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
-multicurrency_appId=API key
-multicurrency_appCurrencySource=Source currency
-multicurrency_alternateCurrencySource=Alternate source currency
-CurrenciesUsed=Currencies used
-CurrenciesUsed_help_to_add=Add the different currencies and rates you need to use on your <b>proposals</b>, <b>orders</b> etc.
-rate=rate
-MulticurrencyReceived=Received, original currency
-MulticurrencyRemainderToTake=Remaining amount, original currency
-MulticurrencyPaymentAmount=Importe total na divisa orixinal
-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
+MultiCurrency=Multi moeda
+ErrorAddRateFail=Erro ao engadir a taxa
+ErrorAddCurrencyFail=Erro ao engadir a moeda
+ErrorDeleteCurrencyFail=Error ao eliminar
+multicurrency_syncronize_error=Erro de sincronización: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Usar data do documento para atopar a taxa da moeda, no lugar de usar a derradeira taxa coñecida
+multicurrency_useOriginTx=Cando un obxecto é creado dende outro, manteña a conversión orixinal do obxecto de orixe (na contra, utilice a taxa de conversión mais reciente coñecida)
+CurrencyLayerAccount=API Capa da moeda
+CurrencyLayerAccount_help_to_synchronize=Debe crear unha cota no sitio web para usar esta funcionalidade<br>Acade a súa <b>chave API</b><br>Se usa unha conta gratuita non pode cambiar a <b>moeda orixe</b> (por defecto USD)<br>Pero se a súa moeda principal non é USD pode usar a <b>moeda orixe alternativa</b> para forzar a súa moeda principal<br><br>Estará limitado a 1000 sincronizacións por mes
+multicurrency_appId=Clave API
+multicurrency_appCurrencySource=DMoeda orixe
+multicurrency_alternateCurrencySource=Divisa orixe alternativa
+CurrenciesUsed=Divisas usadas
+CurrenciesUsed_help_to_add=Engada as diferentes moedas e as taxas que precise usar nos seus <b>orzamentos</b>, <b>pedimentos</b>, etc.
+rate=taxa
+MulticurrencyReceived=Recibido, na divisa orixe
+MulticurrencyRemainderToTake=Cantidade restante, moeda orixe
+MulticurrencyPaymentAmount=Importe total, moeda orixe
+AmountToOthercurrency=Cantidade a (en moeda da conta receptora)
+CurrencyRateSyncSucceed=Taxa da moeda sincronizada correctamente
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use a moeda do documento para pagos online
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index 78f64e9d891..c476990f905 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/gl_ES/productbatch.lang b/htdocs/langs/gl_ES/productbatch.lang
index 1c19e4fb96f..a2cd4187edb 100644
--- a/htdocs/langs/gl_ES/productbatch.lang
+++ b/htdocs/langs/gl_ES/productbatch.lang
@@ -1,24 +1,24 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
+ManageLotSerial=Usar numeración por lote/serie
+ProductStatusOnBatch=Se (é preciso lote/serie)
+ProductStatusNotOnBatch=Non (non é preciso lote/serie)
 ProductStatusOnBatchShort=Sí
 ProductStatusNotOnBatchShort=Non
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-EatByDate=Eat-by date
-SellByDate=Sell-by date
-DetailBatchNumber=Lot/Serial details
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic stock decrease  is forced to 'Decrease real stocks on shipping validation' and automatic increase mode is forced to 'Increase real stocks on manual dispatching into warehouses' and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
-ProductLotSetup=Setup of module lot/serial
-ShowCurrentStockOfLot=Show current stock for couple product/lot
-ShowLogOfMovementIfLot=Show log of movements for couple product/lot
-StockDetailPerBatch=Stock detail per lot
+Batch=Lote/Serie
+atleast1batchfield=Data de caducidade ou data de venda ou número de Lote/Serie
+batch_number=Número Lote/Serie
+BatchNumberShort=Lote/Serie
+EatByDate=Data de caducidade
+SellByDate=Data de venda
+DetailBatchNumber=Detalles do Lote/Serie
+printBatch=Lote/Serie %s
+printEatby=Caducidade: %s
+printSellby=Vendido por: %s
+printQty=Cant.: %d
+AddDispatchBatchLine=Engada unha liña para despacho por caducidade
+WhenProductBatchModuleOnOptionAreForced=Cando o módulo Lote/Serie está activado, a diminución automática de stoc está forzada a "Diminuír as existencias reais na validación do envío" e o modo de aumento automático é forzado a "Aumentar as existencias reais no envío manual nos almacéns" e non pode ser editado. Pode definir outras opcións como queira.
+ProductDoesNotUseBatchSerial=Este produto non usa números de lote/serie
+ProductLotSetup=Configuración do módulo lote/serie
+ShowCurrentStockOfLot=Amosar o stock actual deste produto/lote
+ShowLogOfMovementIfLot=Consultar os movemeentos de stock deste produto/lote
+StockDetailPerBatch=Detalle de stock por lote
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index c8b10dcf490..fb884d5d1bc 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Defina o tipo de código de barras
 BarcodeValue=Valor do código de barras
 NoteNotVisibleOnBill=Nota (non visible nas facturas, orzamentos...)
 ServiceLimitedDuration=Se o produto é un servizo con duración limitada :
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Prezos de provedores (de produtos ou servizo
 CustomCode=Código aduaneiro / Mercancía /
 CountryOrigin=País de orixe
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Etiqueta curta
 Unit=Unidade
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Seleccione combinación
 ProductCombinationGenerator=Xerador de variantes
 Features=Funcións
 PriceImpact=Impacto no prezo
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Impacto no peso
 NewProductAttribute=Novo atributo
 NewProductAttributeValue=Novo valor de atributo
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index ef83730122a..58766a79bc1 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Participante
 TypeContact_project_task_external_TASKCONTRIBUTOR=Participante
 SelectElement=Escolla elemento
 AddElement=Ligar ao elemento
+LinkToElementShort=Vincular a
 # Documents models
 DocumentModelBeluga=Prantilla de documento para a descrición dos obxectos ligados
 DocumentModelBaleine=Prantilla de documendo do proxecto para tarefas
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Nº de proxectos creados por mes
 ProjectNbTaskByMonth=Nº de tarefas creadas por mes
 ProjectOppAmountOfProjectsByMonth=Importe de oportunidades por mes
 ProjectWeightedOppAmountOfProjectsByMonth=Importe medio oportunidades por mes
-ProjectOpenedProjectByOppStatus=Proxectos/oportunidades abertas por estado da oportunidade
-ProjectsStatistics=Estatísticas sobre proxectos/oportunidades
-TasksStatistics=Estatísticas sobre tarefas en proxectos/oportunidade
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Tarefa asignada. Debería poder introducir tempos nesta tarefa.
 IdTaskTime=Id tempo da tarefa
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/gl_ES/receiptprinter.lang b/htdocs/langs/gl_ES/receiptprinter.lang
index b9144b9a861..e8a421ecd45 100644
--- a/htdocs/langs/gl_ES/receiptprinter.lang
+++ b/htdocs/langs/gl_ES/receiptprinter.lang
@@ -64,7 +64,7 @@ DOL_VALUE_DAY=Invoice day
 DOL_VALUE_DAY_LETTERS=Inovice day in letters
 DOL_LINE_FEED_REVERSE=Line feed reverse
 InvoiceID=Invoice ID
-InvoiceRef=Invoice ref
+InvoiceRef=Ref. factura
 DOL_PRINT_OBJECT_LINES=Invoice lines
 DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
 DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
diff --git a/htdocs/langs/gl_ES/recruitment.lang b/htdocs/langs/gl_ES/recruitment.lang
new file mode 100644
index 00000000000..4b42eda77ec
--- /dev/null
+++ b/htdocs/langs/gl_ES/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Configuracións
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Acerca de
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/gl_ES/salaries.lang b/htdocs/langs/gl_ES/salaries.lang
index 3054758f469..53100c1c694 100644
--- a/htdocs/langs/gl_ES/salaries.lang
+++ b/htdocs/langs/gl_ES/salaries.lang
@@ -1,21 +1,21 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for wage payments
-Salary=Salary
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contable usada para os terceiros
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Utilízase unha conta contable adicada definida na ficha de usuario para encher o Libro Maior, ou como valor predeterminado da contabilidade do Libro Maior se non é definida unha conta contable na ficha do usuario
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta contable por defecto para pagamentos de salarios
+Salary=Salario
 Salaries=Salarios
-NewSalaryPayment=New salary payment
-AddSalaryPayment=Add salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
-THM=Average hourly rate
-TJM=Average daily rate
-CurrentSalary=Current salary
-THMDescription=This value may be used to calculate the cost of time consumed on a project entered by users if module project is used
-TJMDescription=This value is currently for information only and is not used for any calculation
-LastSalaries=Latest %s salary payments
-AllSalaries=All salary payments
-SalariesStatistics=Salary statistics
+NewSalaryPayment=Novo pagamento de salario
+AddSalaryPayment=Engadir pagamento de salario
+SalaryPayment=Pagamento de salario
+SalariesPayments=Pagamentos de salarios
+ShowSalaryPayment=Ver pagamento de salario
+THM=Taxa media por hora
+TJM=Taxa media por día
+CurrentSalary=Salario actual
+THMDescription=Este valor pode ser utilizado para calcular os custos de tempo consumido nun proxecto indicados polos usuarios se utiliza o módulo proxectos
+TJMDescription=Este valor actualmente é informativo e non é utilizado para realizar calquera tipo de cálculo
+LastSalaries=Últimos %s pagamentos salariais
+AllSalaries=Todos os pagamentos salariais
+SalariesStatistics=Estatísticas salariais
 # Export
-SalariesAndPayments=Salaries and payments
+SalariesAndPayments=Salarios e pagamentos
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index 64338d16913..7f43c3ed9de 100644
--- a/htdocs/langs/gl_ES/stocks.lang
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stocks
 WarehouseCard=Warehouse card
-Warehouse=Warehouse
+Warehouse=Almacén
 Warehouses=Warehouses
 ParentWarehouse=Parent warehouse
 NewWarehouse=New warehouse / Stock Location
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -157,7 +159,7 @@ IsInPackage=Contained into package
 WarehouseAllowNegativeTransfer=Stock can be negative
 qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
 qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
-ShowWarehouse=Show warehouse
+ShowWarehouse=Ver almacén
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 InventoryCodeShort=Inv./Mov. code
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/gl_ES/supplier_proposal.lang b/htdocs/langs/gl_ES/supplier_proposal.lang
index 41ee3f3fc21..1446d11794a 100644
--- a/htdocs/langs/gl_ES/supplier_proposal.lang
+++ b/htdocs/langs/gl_ES/supplier_proposal.lang
@@ -17,7 +17,7 @@ NewAskPrice=New price request
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
 SupplierProposalRefFourn=Vendor ref
-SupplierProposalDate=Delivery date
+SupplierProposalDate=Data de entrega
 SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
 ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b>?
 DeleteAsk=Delete request
diff --git a/htdocs/langs/gl_ES/suppliers.lang b/htdocs/langs/gl_ES/suppliers.lang
index 24eb367df3a..eec158d1ff6 100644
--- a/htdocs/langs/gl_ES/suppliers.lang
+++ b/htdocs/langs/gl_ES/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Mala calidade
 ReputationForThisProduct=Reputación
 BuyerName=Nome do comprador
 AllProductServicePrices=Todos os prezos de produto / servizo
-AllProductReferencesOfSupplier=Todas as referencias de provedores de produto / servizo
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Prezos provedor
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index 868e8de0b6d..e99c740d69d 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -61,7 +61,7 @@ Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 NotRead=Non lido
-Read=Read
+Read=Lido
 Assigned=Assigned
 InProgress=En progreso
 NeedMoreInformation=Waiting for information
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Tipo
-Category=Código analítico
 Severity=Severity
 
 # Email templates
@@ -82,7 +81,7 @@ MailToSendTicketMessage=To send email from ticket message
 # Admin page
 #
 TicketSetup=Ticket module setup
-TicketSettings=Settings
+TicketSettings=Configuracións
 TicketSetupPage=
 TicketPublicAccess=A public interface requiring no identification is available at the following url
 TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Grupo
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Código analítico
+TicketCategory=Grupo
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/gl_ES/trips.lang b/htdocs/langs/gl_ES/trips.lang
index 46a37a208d0..639e621d831 100644
--- a/htdocs/langs/gl_ES/trips.lang
+++ b/htdocs/langs/gl_ES/trips.lang
@@ -44,7 +44,7 @@ TF_LUNCH=Lunch
 TF_METRO=Metro
 TF_TRAIN=Train
 TF_BUS=Bus
-TF_CAR=Car
+TF_CAR=Coche
 TF_PEAGE=Toll
 TF_ESSENCE=Fuel
 TF_HOTEL=Hotel
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
index 0c1b2dda210..e6bcfc93d77 100644
--- a/htdocs/langs/gl_ES/users.lang
+++ b/htdocs/langs/gl_ES/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Desactivado en modo mantemento
 UserAccountancyCode=Código contable usuario
 UserLogoff=Usuario desconectado
 UserLogged=Usuario conectado
+DateOfEmployment=Employment date
 DateEmployment=Data de contratación do empregado
 DateEmploymentEnd=Data de baixa do empregado
 CantDisableYourself=Pode desactivar o seu propio rexistro de usuario
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Forzar validación do rexeitamento do gasto
 ValidatorIsSupervisorByDefault=Por defecto, o responsable da validación é o supervisor do usuario. Manter baleiro para manter este comportamento.
 UserPersonalEmail=Email persoal
 UserPersonalMobile=Teléfono móbil persoal
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index 4ffd6319e6d..0e491ee17b6 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -48,7 +48,7 @@ ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setu
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
-ReadPerm=Read
+ReadPerm=Lido
 WritePerm=Write
 TestDeployOnWeb=Test/deploy on web
 PreviewSiteServedByWebServer=<u>Preview %s in a new tab.</u><br><br>The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:<br><strong>%s</strong><br>URL served by external server:<br><strong>%s</strong>
diff --git a/htdocs/langs/gl_ES/withdrawals.lang b/htdocs/langs/gl_ES/withdrawals.lang
index ee27089a61d..396c348cb5f 100644
--- a/htdocs/langs/gl_ES/withdrawals.lang
+++ b/htdocs/langs/gl_ES/withdrawals.lang
@@ -2,15 +2,15 @@
 CustomersStandingOrdersArea=Payments by Direct debit orders
 SuppliersStandingOrdersArea=Payments by Credit transfer
 StandingOrdersPayment=Direct debit payment orders
-StandingOrderPayment=Direct debit payment order
+StandingOrderPayment=Domiciliación
 NewStandingOrder=New direct debit order
 NewPaymentByBankTransfer=New payment by credit transfer
 StandingOrderToProcess=A procesar
 PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
+WithdrawalsReceipts=Domiciliacións
 WithdrawalReceipt=Domiciliación
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Enviado
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Pagada
 StatusRefused=Rexeitado
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/gl_ES/workflow.lang b/htdocs/langs/gl_ES/workflow.lang
index be126eef0f4..299be277e1d 100644
--- a/htdocs/langs/gl_ES/workflow.lang
+++ b/htdocs/langs/gl_ES/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/gl_ES/zapier.lang b/htdocs/langs/gl_ES/zapier.lang
index fdaaf449595..a92ff38f3ce 100644
--- a/htdocs/langs/gl_ES/zapier.lang
+++ b/htdocs/langs/gl_ES/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier para modulo de Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Configuración de Zapier para Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 1d522af126f..c79cf4ab028 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=תכונה לא זמינה כמו מערכות יוניקס. בדיקת תוכנית sendmail שלך באופן מקומי.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=מודול ההתקנה
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=מערכת
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=המפתח כתובות מאובטח
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=ברקודים
 Module55Desc=ברקוד של ההנהלה
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=שילוב של מערכת ClickToDial (כוכבית, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=יצירה / שינוי שירותים
 Permission534=מחק את השירותים
 Permission536=ראה / ניהול שירותים נסתרים
 Permission538=יצוא שירותים
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=לקרוא תרומות
 Permission702=צור / לשנות תרומות
 Permission703=מחק תרומות
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=לקרוא מניות
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=מסמכים הגדרת ספריות
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=אזורים
 DictionaryCountry=מדינות
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=חפש בצורה קבועה בתפריט השמאלי
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=חוזים
+MailToSendReception=Receptions
 MailToThirdparty=צדדים שלישיים
 MailToMember=משתמשים
 MailToUser=משתמשים
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=רוכסן
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index 6375138cf97..6f55525881b 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index 4e0ba839d59..5fe5dc964a7 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=הצעות
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index 03a3031abe4..0e214defc7a 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index bea3663aff1..3dd45972e01 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang
index 9d9466a0d55..616aaae97e6 100644
--- a/htdocs/langs/he_IL/contracts.lang
+++ b/htdocs/langs/he_IL/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/he_IL/languages.lang b/htdocs/langs/he_IL/languages.lang
index 68a16123f4d..0289bdfbc68 100644
--- a/htdocs/langs/he_IL/languages.lang
+++ b/htdocs/langs/he_IL/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=ערבית
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=ערבית
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=בולגרי
 Language_bs_BA=בוסני
 Language_ca_ES=קטלוני
@@ -20,6 +23,7 @@ Language_en_GB=אנגלית (בריטניה)
 Language_en_IN=אנגלית (הודו)
 Language_en_NZ=אנגלית (ניו זילנד)
 Language_en_SA=אנגלית (ערב הסעודית)
+Language_en_SG=English (Singapore)
 Language_en_US=אנגלית (ארצות הברית)
 Language_en_ZA=אנגלית (דרום אפריקה)
 Language_es_ES=ספרדית
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=ספרדית (הונדורס)
 Language_es_MX=ספרדית (מקסיקו)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=ספרדית (פרגוואי)
 Language_es_PE=ספרדית (פרו)
 Language_es_PR=ספרדית (פורטו ריקו)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=אסטונית
 Language_eu_ES=הבסקים
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=צרפתית (בלגיה)
 Language_fr_CA=צרפתית (קנדה)
 Language_fr_CH=צרפתית (שוויץ)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=צרפתי
+Language_fr_GA=French (Gabon)
 Language_fr_NC=צרפתית (קלדוניה החדשה)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=עברית
+Language_hi_IN=Hindi (India)
 Language_hr_HR=קרואטי
 Language_hu_HU=הונגרי
 Language_id_ID=Indonesian
 Language_is_IS=איסלנדי
 Language_it_IT=איטלקי
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=יפני
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=לטבי
 Language_mk_MK=מקדונית
 Language_mn_MN=Mongolian
 Language_nb_NO=נורבגי (ספרותית)
+Language_ne_NP=Nepali
 Language_nl_BE=הולנדי (בלגיה)
 Language_nl_NL=Dutch
 Language_pl_PL=פולני
@@ -86,4 +100,5 @@ Language_uz_UZ=אוזבקי
 Language_vi_VN=וייטנאמי
 Language_zh_CN=סיני
 Language_zh_TW=סיני (מסורתי)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 6da35178dd2..041207e7c48 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 1f4a2f5ddfd..1b6a09d3b5c 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=משתמשים
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/he_IL/members.lang b/htdocs/langs/he_IL/members.lang
index b1010fcd8ac..ca47f3c55c7 100644
--- a/htdocs/langs/he_IL/members.lang
+++ b/htdocs/langs/he_IL/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/he_IL/mrp.lang b/htdocs/langs/he_IL/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/he_IL/mrp.lang
+++ b/htdocs/langs/he_IL/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index a0cd937e01d..374c864f7dc 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index be647aaf507..b8d4bc7a2d5 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 0a7018ffaa4..c69aa3209c0 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/he_IL/recruitment.lang b/htdocs/langs/he_IL/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/he_IL/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 58040228bf3..d91da3900ff 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=מניות
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index d0cf540d3eb..51562b8bb7a 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/he_IL/ticket.lang b/htdocs/langs/he_IL/ticket.lang
index dde307a6323..a8353b66744 100644
--- a/htdocs/langs/he_IL/ticket.lang
+++ b/htdocs/langs/he_IL/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index 107e604ded1..afbb1e993be 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/he_IL/workflow.lang b/htdocs/langs/he_IL/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/he_IL/workflow.lang
+++ b/htdocs/langs/he_IL/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/he_IL/zapier.lang b/htdocs/langs/he_IL/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/he_IL/zapier.lang
+++ b/htdocs/langs/he_IL/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang
index cc6321f405b..9d20e82a9a3 100644
--- a/htdocs/langs/hi_IN/accountancy.lang
+++ b/htdocs/langs/hi_IN/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 1fe183dc578..24ca75589d3 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/hi_IN/agenda.lang b/htdocs/langs/hi_IN/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/hi_IN/agenda.lang
+++ b/htdocs/langs/hi_IN/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/hi_IN/boxes.lang b/htdocs/langs/hi_IN/boxes.lang
index bd62684421a..d6fd298a3a7 100644
--- a/htdocs/langs/hi_IN/boxes.lang
+++ b/htdocs/langs/hi_IN/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/hi_IN/cashdesk.lang b/htdocs/langs/hi_IN/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/hi_IN/cashdesk.lang
+++ b/htdocs/langs/hi_IN/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/hi_IN/compta.lang b/htdocs/langs/hi_IN/compta.lang
index 8a8c837ac87..8f4f058bb87 100644
--- a/htdocs/langs/hi_IN/compta.lang
+++ b/htdocs/langs/hi_IN/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
diff --git a/htdocs/langs/hi_IN/contracts.lang b/htdocs/langs/hi_IN/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/hi_IN/contracts.lang
+++ b/htdocs/langs/hi_IN/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/hi_IN/errors.lang
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/hi_IN/languages.lang b/htdocs/langs/hi_IN/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/hi_IN/languages.lang
+++ b/htdocs/langs/hi_IN/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/hi_IN/mails.lang b/htdocs/langs/hi_IN/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/hi_IN/mails.lang
+++ b/htdocs/langs/hi_IN/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang
index 8a816f7f671..429e07287e1 100644
--- a/htdocs/langs/hi_IN/main.lang
+++ b/htdocs/langs/hi_IN/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/hi_IN/members.lang b/htdocs/langs/hi_IN/members.lang
index dd0a5bf49e2..5ef946ddf67 100644
--- a/htdocs/langs/hi_IN/members.lang
+++ b/htdocs/langs/hi_IN/members.lang
@@ -81,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/hi_IN/mrp.lang b/htdocs/langs/hi_IN/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/hi_IN/mrp.lang
+++ b/htdocs/langs/hi_IN/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/hi_IN/other.lang b/htdocs/langs/hi_IN/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/hi_IN/other.lang
+++ b/htdocs/langs/hi_IN/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/hi_IN/projects.lang b/htdocs/langs/hi_IN/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/hi_IN/projects.lang
+++ b/htdocs/langs/hi_IN/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/hi_IN/recruitment.lang b/htdocs/langs/hi_IN/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/hi_IN/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/hi_IN/stocks.lang b/htdocs/langs/hi_IN/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/hi_IN/stocks.lang
+++ b/htdocs/langs/hi_IN/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/hi_IN/suppliers.lang b/htdocs/langs/hi_IN/suppliers.lang
index b69b11272b4..51562b8bb7a 100644
--- a/htdocs/langs/hi_IN/suppliers.lang
+++ b/htdocs/langs/hi_IN/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/hi_IN/ticket.lang b/htdocs/langs/hi_IN/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/hi_IN/ticket.lang
+++ b/htdocs/langs/hi_IN/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/hi_IN/users.lang b/htdocs/langs/hi_IN/users.lang
index 41a5ebd0981..25d9205457b 100644
--- a/htdocs/langs/hi_IN/users.lang
+++ b/htdocs/langs/hi_IN/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/hi_IN/withdrawals.lang b/htdocs/langs/hi_IN/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/hi_IN/withdrawals.lang
+++ b/htdocs/langs/hi_IN/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/hi_IN/workflow.lang b/htdocs/langs/hi_IN/workflow.lang
index be126eef0f4..299be277e1d 100644
--- a/htdocs/langs/hi_IN/workflow.lang
+++ b/htdocs/langs/hi_IN/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/hi_IN/zapier.lang b/htdocs/langs/hi_IN/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/hi_IN/zapier.lang
+++ b/htdocs/langs/hi_IN/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index f0a83905f13..ef969d9eba3 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Primjeni masovne kategorije
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index f1a643e13e0..7fc2fc655ff 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Mogućnost nije dostupna na UNIX-u. Testirajte sendmail program lokalno.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Podešavanje modula
 ModulesSetup=Podešavanje modula/aplikacija
 ModuleFamilyBase=Sistem
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modul <b>%s</b> mora biti omogućen ako želite koristi
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Promjeni cijene sa baznom referentnom vrijednosti definira
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -522,7 +525,7 @@ Module23Name=Energija
 Module23Desc=Praćenje potrošnje energije
 Module25Name=Narudžbe kupaca
 Module25Desc=Sales order management
-Module30Name=Računi
+Module30Name=Izlazni računi
 Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
 Module40Name=Dobavljači
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barkodovi
 Module55Desc=Upravljanje barkodovima
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integracija ClickToDial sistema (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Izradi/izmjeni usluge
 Permission534=Obriši usluge
 Permission536=Vidi/upravljaj skrivenim uslugama
 Permission538=Izvezi usluge
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Čitaj donacije
 Permission702=Izradi/izmjeni donacije
 Permission703=Obriši donacije
@@ -848,6 +858,8 @@ Permission773=Obriši izvještaje troškova
 Permission774=Čitaj sve izvještaje troškova (čak i svoje i podređenih)
 Permission775=Odobri izvještaje trška
 Permission776=Isplati izvještaje troškova
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Izvezi izvještaje troškova
 Permission1001=Čitaj zalihe
 Permission1002=Izradi/izmjeni skladišta
@@ -900,6 +912,7 @@ Permission2515=Postavi mape dokumenata
 Permission2801=Koristi FTP klijent u načinu čitanja (samo pregled i download)
 Permission2802=Koristi FTP klijent u načinu pisanja (brisanje ili upload)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Obriši sredstva
 Permission63004=Poveži sredstava sa događajima agende
 DictionaryCompanyType=Vrste trećih osoba
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Potencijalni kupac
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regije
 DictionaryCountry=Zemlje
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Jedinice
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Status potencijalnog kupca
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Stalni obrazac za pretraživanje na ljevom izborniku
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Tvrtka/Organizacija
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=Novi prevedeni tekst za prikaz
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Morate omogućiti barem 1 modul
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Da u ljeto
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Koji tab želite da se otvori kod odabira izbornika Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Podešavanje modula ClickToDial
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Koristi samo "tel:" kod telefona
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Stopa prodajnog poreza
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Narudžbe dobavljačima
 MailToSendSupplierInvoice=Ulazni računi
 MailToSendContract=Ugovori
+MailToSendReception=Receptions
 MailToThirdparty=Treće osobe
 MailToMember=Članovi
 MailToUser=Korisnici
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Predlošci za dokumente proizvoda
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=Vidi * napomenu za popis mogućih zamjenskih varijabli
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=PBR
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index f7eb9f66d1b..493975cae73 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Broj događaja
 ListOfActions=Lista događaja
 EventReports=Event reports
 Location=Lokacija
-ToUserOfGroup=Bilo kojem korisniku u grupi
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Događaji za cijeli dan(e)
 MenuToDoActions=Svi nepotpuni događaji
 MenuDoneActions=Svi prekinuti događaji
@@ -86,6 +86,8 @@ ProposalDeleted=Ponuda obrisana
 OrderDeleted=Narudžba obrisana
 InvoiceDeleted=Račun obrisan
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Datum početka + 1 sat
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index e0e415e107d..7e46e523ab2 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Račun
-Bills=Računi
+Bills=Izlazni računi
 BillsCustomers=Izlazni računi
 BillsCustomer=Račun kupca
 BillsSuppliers=Ulazni računi
@@ -26,8 +26,8 @@ InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but ha
 InvoiceReplacement=Zamjenski račun
 InvoiceReplacementAsk=Zamjenski račun za račun
 InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
-InvoiceAvoir=Storno računa/knjižno odobrenje
-InvoiceAvoirAsk=Storno računa/knjižno odobrenje za ispravak računa
+InvoiceAvoir=Storno računa
+InvoiceAvoirAsk=Storno računa za ispravak računa
 InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
 invoiceAvoirWithLines=Izradi storno računa sa stavkama iz izvornog računa
 invoiceAvoirWithPaymentRestAmount=Izradi knjižno odobrenje s preostalim neplaćenim iznosom iz izvornog računa
@@ -101,8 +101,8 @@ ClassifyCanceled=Označi kao napušteno
 ClassifyClosed=Označi kao zatvoreno
 ClassifyUnBilled=Označi kao "nezaračunato"
 CreateBill=Izradi račun
-CreateCreditNote=Izradi storno računa/knjižno odobrenje
-AddBill=Izradi račun ili storno računa/knjižno odobrenje
+CreateCreditNote=Izradi storno računa
+AddBill=Izradi račun ili storno računa
 AddToDraftInvoices=Dodati u predložak računa
 DeleteBill=Izbriši račun
 SearchACustomerInvoice=Traži izlazni račun
@@ -287,18 +287,18 @@ AddRelativeDiscount=Izradi relativan popust
 EditRelativeDiscount=Izmjeni relativan popust
 AddGlobalDiscount=Izradi apsolutni popust
 EditGlobalDiscounts=Izmjeni apsolutni popust
-AddCreditNote=Izradi storno računa/knjižno odobrenje
+AddCreditNote=Izradi storno računa
 ShowDiscount=Prikaži popust
 ShowReduc=Show the discount
 ShowSourceInvoice=Show the source invoice
 RelativeDiscount=Relativni popust
 GlobalDiscount=Opći popust
-CreditNote=Storno računa/knjižno odobrenje
-CreditNotes=Storno računa/knjižno odobrenje
-CreditNotesOrExcessReceived=Storno računa/knjižno odobrenje
+CreditNote=Storno računa
+CreditNotes=Storno računa
+CreditNotesOrExcessReceived=Storno računa
 Deposit=Predujam
 Deposits=Predujam
-DiscountFromCreditNote=Popust od storno računa/knjižnog odobrenja %s
+DiscountFromCreditNote=Popust od storno računa %s
 DiscountFromDeposit=Predujmovi iz računa %s
 DiscountFromExcessReceived=Payments in excess of invoice %s
 DiscountFromExcessPaid=Payments in excess of invoice %s
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 5aa8b6b2253..91564430c76 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Zadnjih %s zabilježenih dobavljača
 BoxTitleLastModifiedSuppliers=Dobavljači: zadnjih %s izmjena
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Zadnja %s kupca ili potencijalna kupca
-BoxTitleLastCustomerBills=Zadnja %s izlazna računa
-BoxTitleLastSupplierBills=Zadnja %s ulazna računa
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Zadnja %s člana
 BoxTitleLastFicheInter=Zadnje %s izmijenjene intervencije
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Narudžbenice: zadnje %s izmjene
 BoxTitleLastModifiedPropals=Zadnje %s izmijenjene ponude
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Izlazni računi
 ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Računovodstvo
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index d0ed3acb66e..f03eb1340b0 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 008591bfa3f..b376da108d4 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -86,7 +86,7 @@ ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor,
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
 PaymentBankAccount=Payment bank account
 OverAllProposals=Ponude kupcima
-OverAllOrders=Narudžbe
+OverAllOrders=Narudžbe kupaca
 OverAllInvoices=Računi
 OverAllSupplierProposals=Tražene cijene
 ##### Local Taxes #####
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index ba2536a8dba..35de89eb445 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Društveni ili fisklani porez
 SocialContributions=Društveni ili fiskanlni porezi
 SocialContributionsDeductibles=Odbitak društveni ili fiskalni porezi
 SocialContributionsNondeductibles=Neodbijajući društveni ili fiskalni porezi
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Oznaka doprinosa
 TypeContrib=Vrsta doprinosa
 MenuSpecialExpenses=Posebni troškovi
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang
index 83110d2c034..3b5662d1928 100644
--- a/htdocs/langs/hr_HR/contracts.lang
+++ b/htdocs/langs/hr_HR/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Pokrenute usluge
 MenuExpiredServices=Usluge koje su istekle
 MenuClosedServices=Završene usluge
 NewContract=Novi ugovor
-NewContractSubscription=Novi ugovor/pretplata
+NewContractSubscription=New contract or subscription
 AddContract=Izradi ugovor
 DeleteAContract=Izbriši ugovor
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/hr_HR/deliveries.lang b/htdocs/langs/hr_HR/deliveries.lang
index 8b6f48dac9b..b74558fbdd7 100644
--- a/htdocs/langs/hr_HR/deliveries.lang
+++ b/htdocs/langs/hr_HR/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=Dostava
 DeliveryRef=Ref. dostave
 DeliveryCard=Otpremnica
-DeliveryOrder=Delivery receipt
+DeliveryOrder=Otpremnica
 DeliveryDate=Datum dostave
 CreateDeliveryOrder=Izradi otpremnicu
 DeliveryStateSaved=Status dostave pohranjen
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 76fbb20d1b3..8b017fff9cf 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
index 87cfd9916a2..eb963a3ad39 100644
--- a/htdocs/langs/hr_HR/languages.lang
+++ b/htdocs/langs/hr_HR/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arapski
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arapski
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengalski
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bugarski
 Language_bs_BA=Bosanski
 Language_ca_ES=Katalonski
@@ -20,6 +23,7 @@ Language_en_GB=Engleski (United Kingdom)
 Language_en_IN=Engleski (Indija)
 Language_en_NZ=Engleski (Novi Zeland)
 Language_en_SA=Engleski (Saudijska Arabija)
+Language_en_SG=English (Singapore)
 Language_en_US=Engleski (United States)
 Language_en_ZA=Engleski (Južna Afrika)
 Language_es_ES=Španjolski
@@ -29,6 +33,7 @@ Language_es_CL=Španjolski (Čile)
 Language_es_CO=Španjolski (Kolumbija)
 Language_es_DO=Španjolski (Dominikanska Republika)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Španjolski (Honduras)
 Language_es_MX=Španjolski (Meksiko)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Španjolski (Paragvaj)
 Language_es_PE=Španjolski (Peru)
 Language_es_PR=Španjolski (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Španjolski (Venezuela)
 Language_et_EE=Estonski
 Language_eu_ES=Baskijski
@@ -44,15 +50,22 @@ Language_fi_FI=Finski
 Language_fr_BE=Francuski (Belgija)
 Language_fr_CA=Francuski (Kanada)
 Language_fr_CH=Francuski (Švicarska)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Francuzi
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Francuski (Nova Kaledonija)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frizijski
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Hrvatski
 Language_hu_HU=Mađarski
 Language_id_ID=Indonezijski
 Language_is_IS=Islandski
 Language_it_IT=Talijanski
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanski
 Language_ka_GE=Gruzijski
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Letonski
 Language_mk_MK=Makedonski
 Language_mn_MN=Mongolian
 Language_nb_NO=Norveški (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Nizozemski (Belgija)
 Language_nl_NL=Dutch
 Language_pl_PL=Politura
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vijetnamski
 Language_zh_CN=Kineski
 Language_zh_TW=Kineski (tradicionalni)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 6595e1154c2..80155474705 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Podatak
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index c0a9220e952..f7d01d6567f 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=J.C. (s porezom)
 Amount=Iznos
 AmountInvoice=Iznos računa
 AmountInvoiced=Zaračunati iznos
-AmountInvoicedHT=Zaračunati iznos (s porezom)
-AmountInvoicedTTC=Zaračunati iznos (bez poreza)
+AmountInvoicedHT=Zaračunati iznos (bez poreza)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Iznos plaćanja
 AmountHTShort=Iznos (bez PDV-a)
 AmountTTCShort=Iznos (s porezom)
@@ -485,6 +485,7 @@ Categories=Oznake/skupine
 Category=Oznaka/skupina
 By=Od
 From=Od
+FromDate=Od
 FromLocation=Od
 to=za
 To=za
@@ -687,6 +688,7 @@ Method=Način
 Receive=Primi
 CompleteOrNoMoreReceptionExpected=Završeno ili bez drugih očekivanja
 ExpectedValue=Očekivana vrijednost
+ExpectedQty=Expected Qty
 PartialWoman=Djelomično
 TotalWoman=Ukupno
 NeverReceived=Nikad primljeno
@@ -703,6 +705,7 @@ MenuECM=Dokumenti
 MenuAWStats=AWStats
 MenuMembers=Članovi
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Granična vrijednost Dolibarra (Mapa početna->postavke->sigurnost): %s Kb, PHP granična vrijednost: %s Kb
 NoFileFound=U ovoj mapi nema spremljenih datoteka
 CurrentUserLanguage=Trenutni jezik
@@ -725,7 +728,7 @@ Page=Strana
 Notes=Bilješke
 AddNewLine=Dodaj novu stavku
 AddFile=Dodaj datoteku
-FreeZone=Ovaj proizvod/usluga nije predhodno upisan
+FreeZone=Free-text product
 FreeLineOfType=Slobodan upis, vrsta:
 CloneMainAttributes=Kloniraj predmet sa svim glavnim svojstvima
 ReGeneratePDF=Ponovo izradi PDF
@@ -942,6 +945,39 @@ ShortThursday=Č
 ShortFriday=P
 ShortSaturday=S
 ShortSunday=N
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Odaberi predložak elektroničke pošte
 SetRef=Odredi oznaku
 Select2ResultFoundUseArrows=Pronađeni neki rezultati. Koristi strelice za izbor.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Podatak
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index eed105f7c1f..970c99a251f 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Skice članova
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Ovjereno
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Novi doprinos
 PaymentSubscription=Novo plačanje doprinosa
 SubscriptionEndDate=Datum kraja pretplate
@@ -78,7 +81,7 @@ DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
 Physical=Fizički
 Moral=Moralno
-MorPhy=Moralno/Fizički
+MorPhy=Vrsta
 Reenable=Ponovo omogući
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -97,8 +100,8 @@ EnablePublicSubscriptionForm=Enable the public website with self-subscription fo
 ForceMemberType=Force the member type
 ExportDataset_member_1=Članovi i pretplate
 ImportDataset_member_1=Članovi
-LastMembersModified=Zadnjih %s izmenjenih članova
-LastSubscriptionsModified=Zadnjih %s izmjenjenih pretplata
+LastMembersModified=Zadnja %s izmijenjena člana
+LastSubscriptionsModified=Zadnje %s izmijenjene pretplate
 String=String
 Text=Tekst
 Int=Int
diff --git a/htdocs/langs/hr_HR/mrp.lang b/htdocs/langs/hr_HR/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/hr_HR/mrp.lang
+++ b/htdocs/langs/hr_HR/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index 3c704a81c68..aaf54f0eb6c 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -5,7 +5,7 @@ OrderCard=Narudžbenica
 OrderId=Broj narudžbe
 Order=Narudžbenica
 PdfOrderTitle=Narudžba kupca
-Orders=Narudžbe
+Orders=Narudžbe kupaca
 OrderLine=Stavka narudžbe
 OrderDate=Datum narudžbe
 OrderDateShort=Datum narudžbe
@@ -141,11 +141,12 @@ OrderByEMail=E-pošta
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=Jednostavan model narudžbe
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Naplata narudžbi
+CreateInvoiceForThisSupplier=Naplata narudžbi
 NoOrdersToInvoice=Nema narudžbi za naplatu
 CloseProcessedOrdersAutomatically=Odredi "Procesuirano" sve odabrane narudžbe.
 OrderCreation=Izrada narudžbe
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 619abd2a8d4..f2b9c16f0f7 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=Poštovana/ni,\nposlali smo vam robu prema dostavnici __REF__ u privitku.\n\nUkoliko je dostupna, na dostavnicu upisana je poveznica na stranice prijevoznika i broj pošiljke. Upišite broj na odredišnoj stranici i pratite vašu pošiljku.\n\nSrdačan pozdrav!\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 09e94e85e8e..e9b0791dbee 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Odredi vrstu barkoda
 BarcodeValue=Vrijednost barkoda
 NoteNotVisibleOnBill=Bilješka (ne vidi se na računima, ponudama...)
 ServiceLimitedDuration=Ako je proizvod usluga ograničenog trajanja:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Broj cijena
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Zemlja porijekla
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Kratka oznaka
 Unit=Jedinica
 p=j.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Novi atribut
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 7a521fa10e1..0b381082a17 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Suradnik
 TypeContact_project_task_external_TASKCONTRIBUTOR=Suradnik
 SelectElement=Odaberi element
 AddElement=Poveži s elementom
+LinkToElementShort=Poveži s
 # Documents models
 DocumentModelBeluga=Predložak projektnog dokumenta za pregled povezanih objekata
 DocumentModelBaleine=Predložak projektnog dokumenta za zadatke
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Broj izrađenih projekata po mjesecima
 ProjectNbTaskByMonth=Broj izrađenih zadataka po mjesecima
 ProjectOppAmountOfProjectsByMonth=Iznos potencijalnih zahtjeva po mjesecima
 ProjectWeightedOppAmountOfProjectsByMonth=Ponderirani iznos potencijalnih zahtjeva po mjesecima
-ProjectOpenedProjectByOppStatus=Otvoreni projekt / potencijalni projekt po statusu
-ProjectsStatistics=Statistika po projektima/prednostima
-TasksStatistics=Statistički podaci o projektnim / vodećim zadacima
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Zadatak dodjeljen. Unos vremena za zadatak je moguće.
 IdTaskTime=ID vre. zad.
 YouCanCompleteRef=Ako referencu želite dovršiti nekim sufiksom, preporučuje se dodavanje znaka "-" kako biste ga odvojili, tako će automatsko brojanje i dalje raditi ispravno za sljedeće projekte. Na primjer %s-MOJSUFIKS
diff --git a/htdocs/langs/hr_HR/recruitment.lang b/htdocs/langs/hr_HR/recruitment.lang
new file mode 100644
index 00000000000..974eaa66714
--- /dev/null
+++ b/htdocs/langs/hr_HR/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Postavke
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = O programu
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 4a018dba294..ca6b7fe7231 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Brisanje isporuke
 Stock=Zaliha
 Stocks=Zalihe
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Zaliha po lot/serijskom
@@ -95,14 +95,16 @@ RealStock=Stvarna zaliha
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Umjetna zaliha
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
 WarehousesAndProducts=Skladišta i proizvodi
 WarehousesAndProductsBatchDetail=Skladišta i proizvodi (s detaljima po lot/serijskom)
-AverageUnitPricePMPShort=Procjenjena prosječna ulazna cijena
-AverageUnitPricePMP=Procjenjena prosječna ulazna cijena
+AverageUnitPricePMPShort=Procjenjena prosječna cijena
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Jed. prodajna cijena 
 EstimatedStockValueSellShort=Vrijednost za prodaju
 EstimatedStockValueSell=Vrijednost za prodaju
@@ -141,7 +143,7 @@ Replenishments=Popunjavanje
 NbOfProductBeforePeriod=Količina proizvoda %s na zalihi prije odabranog perioda (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s na zalihi nakon odabranog perioda (> %s)
 MassMovement=Masovno kretanje
-SelectProductInAndOutWareHouse=Odaberite proizvod, količinu, izvorno skladište i odredišno skladište, onda kliknite "%s". Kada završite za sva potrebna kretanja, kliknite na "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Primke za narudžbu
 StockMovementRecorded=Kretanja zaliha zabilježeno
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index 1d5e095592d..e122d0fcd3c 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputacija
 BuyerName=Naziv kupca
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index 8cb93be17d5..70e17eef676 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Vrsta
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Grupa
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Izradio
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Grupa
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index cf47e5c7710..d1f3b04be64 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Kreirani korisnik će biti vanjski korisnik (jer je vezan
 IdPhoneCaller=Pozivatelj ID
 NewUserCreated=Korisnik %s kreiran
 NewUserPassword=Lozinka promjenjena za %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Korisnik %s promjenjen
 UserDisabled=Korisnik %s onemogućen
 UserEnabled=Korisnik %s aktiviran
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Onemogućeno u načinu održavanja
 UserAccountancyCode=User accounting code
 UserLogoff=Odjava korisnika
 UserLogged=Korisnik prijavljen
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index d8e2de04eaa..9d80e1ba9bd 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Račun odbijen (Naplati odbijanje kupcu)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Čeka
 StatusTrans=Poslano
+StatusDebited=Debited
 StatusCredited=Kreditirano
+StatusPaid=Plaćeno
 StatusRefused=Odbijeno
 StatusMotif0=Nedefinirano
 StatusMotif1=Nedovoljno sredstva
@@ -77,13 +79,13 @@ StatusMotif8=Ostali razlog
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Samo ured
 CreateBanque=Samo banka
 OrderWaiting=Čeka tretman
-NotifyTransmision=Prijenos isplate
-NotifyCredit=Kredit isplate
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Nacionalni broj pošiljatelja
 WithBankUsingRIB=Za bankovne račune koji koriste RIB
 WithBankUsingBANBIC=Za bankovne račune koji koriste IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Kreditiraj
 WithdrawalFileNotCapable=Nemoguće generirati isplatnu potvrdu za vašu zemlju %s ( Vaša zemlja nije podržana)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Isplatna datoteka
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Postavi status "Datoteka poslana"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistika statusa stavki
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Iznos: %s<br>Način: %s<br>Datum: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija za stvarni način nije postavljena, zaustavljamo nakon ove simulacije
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/hr_HR/workflow.lang b/htdocs/langs/hr_HR/workflow.lang
index 191dcc9867e..8fc3bf1c296 100644
--- a/htdocs/langs/hr_HR/workflow.lang
+++ b/htdocs/langs/hr_HR/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/hr_HR/zapier.lang b/htdocs/langs/hr_HR/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/hr_HR/zapier.lang
+++ b/htdocs/langs/hr_HR/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index a1c3790e6a8..a30f5942c73 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 0ce4f736d4d..6f0491d80dd 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -13,7 +13,7 @@ FileCheck=A fájlkészlet integritásának ellenőrzése
 FileCheckDesc=Ez az eszköz lehetővé teszi a fájlok integritásának és az alkalmazás beállításainak ellenőrzését, összehasonlítva az egyes fájlokat a hivatalos fájlokkal. Bizonyos beállítási állandók értékét szintén ellenőrizni lehet. Ezzel az eszközzel meghatározhatja, hogy valamelyik fájlt módosították-e (például egy hacker).
 FileIntegrityIsStrictlyConformedWithReference=A fájlok integritása szigorúan megfelel a referenciának.
 FileIntegrityIsOkButFilesWereAdded=A fájlok integritásának ellenőrzése sikeres volt, azonban néhány új fájl hozzá lett adva.
-FileIntegritySomeFilesWereRemovedOrModified=A fájlok integritásának ellenőrzése nem járt sikerrel. Néhány fájl módosítva lett, el lett távolítva vagy hozzá lett adva.
+FileIntegritySomeFilesWereRemovedOrModified=A fájlok integritásának ellenőrzése sikertelen. Néhány fájl módosítottak, eltávolítottak, vagy hozzáadtak.
 GlobalChecksum=Globális ellenőrző összeg
 MakeIntegrityAnalysisFrom=Alkalmazásfájlok integritásának elemzése
 LocalSignature=Beágyazott helyi aláírás (kevésbé megbízható)
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Alapértelmezett feladó e-mail cím manuális küld
 UserEmail=Felhasználó email címe
 CompanyEmail=Vállalati e-mail
 FeatureNotAvailableOnLinux=A szolgáltatás nem elérhető Unix szerű rendszereken. Teszteld a sendmail programot helyben.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Ha a nyelv fordítása nem teljes, vagy hibákat talál, akkor javítsa ki az <b> langs / %s </b> könyvtárban található fájlok szerkesztésével, és küldje be a változást a www.transifex.com/dolibarr-association/dolibarr/ webhelyre.
-SubmitTranslationENUS=Ha a nyelvre történő fordítás nem teljes, vagy hibákat talál, akkor javíthatja a fájlokat az <b> langs / %s </b> könyvtárban történő szerkesztéssel, és módosított fájlokat küldhet el a dolibarr.org/forum weboldalon, vagy a fejlesztők számára a github.com/Dolibarr/d webhelyen.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Modul beállítása
 ModulesSetup=Modulok / Alkalmazás beállításai
 ModuleFamilyBase=Rendszer
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=A funkció használatához a(z) <b>%s</b> modul bekapcs
 SecurityToken=Kulcs a biztonságos URL-ek
 NoSmsEngine=Nincs elérhető SMS küldő kezelő. Az SMS-küldő kezelőt nem telepíti az alapértelmezett disztribúcióval, mivel azok külső gyártótól függenek, de néhányat találhat az %s-on
 PDF=PDF
-PDFDesc=Globális beállítások a PDF generáláshoz.
-PDFAddressForging=A címsorok szabályai
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=A forgalmi adóval / ÁFA-val kapcsolatos összes információ elrejtése
 PDFRulesForSalesTax=A forgalmi adó / ÁFA szabályai
 PDFLocaltax=A(z) %s szabályai
-HideLocalTaxOnPDF=A(z) %s arány elrejtése az adó oszlopban
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=A termékleírás elrejtése
 HideRefOnPDF=Termékek hivatkozásainak elrejtése
 HideDetailsOnPDF=A termékcsalád részleteinek elrejtése
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Módosítsa az árakat a meghatározott alap referenciaér
 MassConvert=Tömeges konverzió indítása
 PriceFormatInCurrentLanguage=Árformátum az aktuális nyelven
 String=Szöveg
+String1Line=String (1 line)
 TextLong=Hosszú szöveg
+TextLongNLines=Long text (n lines)
 HtmlText=HTML szöveg
 Int=Egész
 Float=Lebegőpontos
@@ -543,9 +546,9 @@ Module54Desc=Szerződések kezelése (szolgáltatások vagy ismétlődő előfiz
 Module55Name=Vonalkódok
 Module55Desc=Vonalkód kezelés
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Banki közvetlen terhelés
-Module57Desc=Közvetlen terhelésű fizetési megbízások kezelése. Ez magában foglalja a SEPA fájl létrehozását az európai országok számára.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=Kattintson a híváshoz
 Module58Desc=Integrációja ClickToDial rendszer (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Létrehozza / módosítja szolgáltatások
 Permission534=Törlés szolgáltatások
 Permission536=Lásd még: / szolgáltatások kezelésére rejtett
 Permission538=Export szolgáltatások
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Darabjegyzékek megtekintése
 Permission651=Darabjegyzék létrehozása / frissítése
 Permission652=Darabjegyzék törlése
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Olvassa el adományokat
 Permission702=Létrehozza / módosítja adományok
 Permission703=Törlés adományok
@@ -848,6 +858,8 @@ Permission773=Költségjelentések törlése
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Olvassa készletek
 Permission1002=Raktárak létrehozása / módosítása
@@ -900,6 +912,7 @@ Permission2515=Beállítás dokumentumok könyvtárak
 Permission2801=FTP kliens olvasás módban való használata (csak böngészés és letöltés)
 Permission2802=FTP kliens írási módban való használata (fájlok törlése vagy feltöltése)
 Permission3200=Archivált események és ujjlenyomatok megtekintése
+Permission3301=Generate new modules
 Permission4001=Alkalmazottak megtekintése
 Permission4002=Alkalmazottak létrehozása
 Permission4003=Alkalmazottak törlése
@@ -947,7 +960,8 @@ Permission63003=Erőforrások törlése
 Permission63004=Erőforrások összekapcsolása a napirend eseményeivel
 DictionaryCompanyType=Partnerek típusai
 DictionaryCompanyJuridicalType=Partner jogi képviselői
-DictionaryProspectLevel=Jelentkezői potenciál
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Államok / Tartományok
 DictionaryRegion=Régiók
 DictionaryCountry=Országok
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=E-mail sablonok
 DictionaryUnits=Egységek
 DictionaryMeasuringUnits=Mértékegységek
 DictionarySocialNetworks=Közösségi hálózatok
-DictionaryProspectStatus=Jelentkező állapota
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Bejelentkezési oldal
 BackgroundImageLogin=Háttérkép
 PermanentLeftSearchForm=Állandó keresési űrlapot baloldali menüben
 DefaultLanguage=Alapértelmezett nyelv
-EnableMultilangInterface=Többnyelvű támogatás engedélyezése
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Mutassa meg a vállalati logót a menüben
 CompanyInfo=Cég / Szervezet
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=Az eredeti fordítás felülírva. Az eredeti érték: <br><br>%s
 TransKeyWithoutOriginalValue=Új fordítást adott meg a(z) '<strong>%s</strong>' fordítási kulcsra, amely egyetlen nyelvi fájlban sem létezik.
-TotalNumberOfActivatedModules=Aktivált alkalmazás/modulok: <b>%s</b>/<b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Legalább egy modult engedélyezni kell
 ClassNotFoundIntoPathWarning=A(z) %s osztály nem található a PHP elérési útján
 YesInSummer=Nyáron
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Megrendelések
 MailToSendSupplierInvoice=Szállítói számlák
 MailToSendContract=Szerződések
+MailToSendReception=Receptions
 MailToThirdparty=Partner
 MailToMember=Tagok
 MailToUser=Felhasználók
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index dc14200812b..09e7e836d73 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Események száma
 ListOfActions=Események listája
 EventReports=Event reports
 Location=Helyszín
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Egész napos esemény
 MenuToDoActions=Minden nem teljesített cselekvés
 MenuDoneActions=Minden megszüntetett cselekvés
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index 6713063aa03..93ca573083a 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Ügyfél számlák
 ForCustomersOrders=Ügyfél megrendelések
 ForProposals=Javaslatok
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index 7fefd536c7a..f562064c20c 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 13bede89067..3e3bc1f36a6 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -297,7 +297,7 @@ AddContact=Kapcsolat létrehozása
 AddContactAddress=Kapcsolat/cím létrehozása
 EditContact=Kapcsoalt szerkesztése
 EditContactAddress=Kapcsolat/cím szerkesztése
-Contact=Contact/Address
+Contact=Kapcsolat/Cím
 Contacts=Kapcsolatok/Elérhetőségek
 ContactId=Kapcsolat id azonosító
 ContactsAddresses=Kapcsolatok / címek
@@ -325,8 +325,8 @@ CompanyDeleted="%s" cég törölve az adatbázisból.
 ListOfContacts=Névjegyek / címek
 ListOfContactsAddresses=Névjegyek / címek
 ListOfThirdParties=Partnerek listája
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ShowCompany=Harmadik fél
+ShowContact=Kapcsolat-Cím
 ContactsAllShort=Minden (nincs szűrő)
 ContactType=Kapcsolat típusa
 ContactForOrders=Megrendelés kapcsolattartó
@@ -425,7 +425,7 @@ ListSuppliersShort=Eladók listája
 ListProspectsShort=A lehetséges partnerek listája
 ListCustomersShort=Ügyfelek listája
 ThirdPartiesArea=Partnerek / kapcsolattartók
-LastModifiedThirdParties=Latest %s modified Third Parties
+LastModifiedThirdParties=Az utolojára módosított %s Harmadik Felek
 UniqueThirdParties=Partnerek összesen
 InActivity=Nyitott
 ActivityCeased=Lezárt
@@ -447,7 +447,7 @@ SaleRepresentativeFirstname=Az értékesítési képviselő vezetékneve
 SaleRepresentativeLastname=Az értékesítési képviselő vezetékneve
 ErrorThirdpartiesMerge=Hiba történt a partner(ek) törlésekor. Kérjük, ellenőrizze a naplót. A változtatások visszavonva.
 NewCustomerSupplierCodeProposed=A vevő vagy az eladó kódja már használatban van, egy új kód javasolt
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+KeepEmptyIfGenericAddress=Hagyja üresen ezt a mezőt, ha a cím általános cím
 #Imports
 PaymentTypeCustomer=Fizetés típusa - Ügyfél
 PaymentTermsCustomer=Fizetési feltételek - Ügyfél
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 1843b1372a1..e750d016947 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Különleges költségek
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang
index a71cfd1d107..5c05134c23f 100644
--- a/htdocs/langs/hu_HU/contracts.lang
+++ b/htdocs/langs/hu_HU/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Futó szolgáltatások
 MenuExpiredServices=Lejárt szolgáltatások
 MenuClosedServices=Lezárt szolgáltatások
 NewContract=Új szerződés
-NewContractSubscription=Új szerződés / előfizetés
+NewContractSubscription=Új szerződés vagy előfizetés
 AddContract=Szerződés hozzáadása
 DeleteAContract=Szerződés törlése
 ActivateAllOnContract=Aktiválja az összes szolgáltatást
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Értékesítési képviselő a szerző
 TypeContact_contrat_external_BILLING=Számlázandó ügyfél
 TypeContact_contrat_external_CUSTOMER=Ügyfél kapcsolat tartó
 TypeContact_contrat_external_SALESREPSIGN=A szerződést aláíró személy
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Alapértelmezés szerint elrejti a zárt szolgáltatásokat
+ShowClosedServices=Zárt szolgáltatások megjelenítése
+HideClosedServices=Zárt szolgáltatások elrejtése
diff --git a/htdocs/langs/hu_HU/dict.lang b/htdocs/langs/hu_HU/dict.lang
index c62097d1884..9b900be987b 100644
--- a/htdocs/langs/hu_HU/dict.lang
+++ b/htdocs/langs/hu_HU/dict.lang
@@ -354,6 +354,6 @@ ExpAuto11PCV=11 vagy több önéletrajz
 ExpAuto12PCV=12 vagy több önéletrajz
 ExpAuto13PCV=13 vagy több önéletrajz
 ExpCyclo=Kapacitás 50cm3-ig
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpMoto12CV=1. vagy 2. motorkerékpár CV
+ExpMoto345CV=Motorkerékpár 3, 4 vagy 5 CV
+ExpMoto5PCV=Motorkerékpár 5 CV és így tovább
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index db31eb728a9..2fcfb92b003 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/hu_HU/hrm.lang b/htdocs/langs/hu_HU/hrm.lang
index 2bbe0c97663..c671aaf7500 100644
--- a/htdocs/langs/hu_HU/hrm.lang
+++ b/htdocs/langs/hu_HU/hrm.lang
@@ -11,7 +11,7 @@ CloseEtablishment=Létesítmény lezárása
 # Dictionary
 DictionaryPublicHolidays=HRM - ünnepnapok
 DictionaryDepartment=HRM - Osztálylista
-DictionaryFunction=HRM - Job positions
+DictionaryFunction=HRM - Munkahelyek
 # Module
 Employees=Alkalmazottak
 Employee=Foglalkoztató
diff --git a/htdocs/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang
index 3b1841da71d..31fa1647481 100644
--- a/htdocs/langs/hu_HU/languages.lang
+++ b/htdocs/langs/hu_HU/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arab
 Language_ar_EG=Arab (Egyiptom)
 Language_ar_SA=Arab
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengáli
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bolgár
 Language_bs_BA=Bosnyák
 Language_ca_ES=Katalán
@@ -20,6 +23,7 @@ Language_en_GB=Angol (Egyesült Királyság)
 Language_en_IN=Angol (India)
 Language_en_NZ=Angol (Új Zéland)
 Language_en_SA=English (Szaúd-Arábia)
+Language_en_SG=English (Singapore)
 Language_en_US=Angol (Egyesült Államok)
 Language_en_ZA=English (Dél-Afrika)
 Language_es_ES=Spanyol
@@ -29,6 +33,7 @@ Language_es_CL=Spanyol (Chile)
 Language_es_CO=Spanyol (Kolumbia)
 Language_es_DO=Spanyol (Dominikai Köztársaság)
 Language_es_EC=Spanyol (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanyol (Honduras)
 Language_es_MX=Spanyol (Mexikó)
 Language_es_PA=Spanyol (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanyol (Paraguay)
 Language_es_PE=Spanyol (Peru)
 Language_es_PR=Spanyol (Puerto Rico)
 Language_es_UY=Spanyol (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanyol (Venezuela)
 Language_et_EE=Észt
 Language_eu_ES=Baszk
@@ -44,15 +50,22 @@ Language_fi_FI=Finn
 Language_fr_BE=Francia (Belgium)
 Language_fr_CA=Francia (Kanada)
 Language_fr_CH=Francia (Svájc)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Francia
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Francia (Új-Kaledónia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Fríz
+Language_gl_ES=Galician
 Language_he_IL=Héber
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Horvát
 Language_hu_HU=Magyar
 Language_id_ID=Indonéz
 Language_is_IS=Grönlandi
 Language_it_IT=Olasz
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japán
 Language_ka_GE=Grúz
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Lett
 Language_mk_MK=Macedóniai
 Language_mn_MN=Mongol
 Language_nb_NO=Norvég (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Holland (Belgium)
 Language_nl_NL=Holland
 Language_pl_PL=Lengyel
@@ -86,4 +100,5 @@ Language_uz_UZ=Üzbég
 Language_vi_VN=Vietnami
 Language_zh_CN=Kínai
 Language_zh_TW=Kínai (hagyományos)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Maláj
diff --git a/htdocs/langs/hu_HU/link.lang b/htdocs/langs/hu_HU/link.lang
index 4a300402b46..05653373fbd 100644
--- a/htdocs/langs/hu_HU/link.lang
+++ b/htdocs/langs/hu_HU/link.lang
@@ -8,4 +8,4 @@ LinkRemoved=A %s hivatkozás törölve
 ErrorFailedToDeleteLink= A '<b>%s</b>' hivakozás törlése sikertelen
 ErrorFailedToUpdateLink= A '<b>%s</b>' hivakozás frissítése sikertelen
 URLToLink=A hivatkozás címe
-OverwriteIfExists=Overwrite file if exists
+OverwriteIfExists=Fájl felülírása, ha létezik
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 748b00764b6..a00af6c7a1f 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Információ
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 3a23eb6e7e7..ff000eb7c96 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=E.Á. (adóval)
 Amount=Mennyiség
 AmountInvoice=Számla mennyiség
 AmountInvoiced=Számlázott összeg
-AmountInvoicedHT=Számlázott összeg (ÁFA-val)
-AmountInvoicedTTC=Számlázott összeg (ÁFA nélkül)
+AmountInvoicedHT=Számlázott összeg (ÁFA nélkül)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Fizetés mennyiség
 AmountHTShort=Összeg (ÁFA nélkül)
 AmountTTCShort=Mennyiség (bruttó)
@@ -485,6 +485,7 @@ Categories=Címkék/kategóriák
 Category=Címke/kategória
 By=által
 From=Kitől?
+FromDate=Feladó
 FromLocation=Feladó
 to=kinek
 To=kinek
@@ -687,6 +688,7 @@ Method=Módszer
 Receive=Kap
 CompleteOrNoMoreReceptionExpected=Teljes, vagy semmi több várható
 ExpectedValue=Várt érték
+ExpectedQty=Expected Qty
 PartialWoman=Részleges
 TotalWoman=Összes
 NeverReceived=Soha nem került átvételre
@@ -703,6 +705,7 @@ MenuECM=Dokumentumok
 MenuAWStats=AWStats
 MenuMembers=Tagok
 MenuAgendaGoogle=Google naptár
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=Nincs mentett dokumentum ebben a könyvtárban
 CurrentUserLanguage=Jelenlegi nyelv
@@ -725,7 +728,7 @@ Page=Oldal
 Notes=Megjegyzés
 AddNewLine=Új sor hozzáadása
 AddFile=Fájl hozzáadása
-FreeZone=Nem előre definiált termék/szolgáltatás
+FreeZone=Free-text product
 FreeLineOfType=Szabad szöveges leírás, válassz típust:
 CloneMainAttributes=Objektum klónozása a főbb jellemzőivel
 ReGeneratePDF=PDF újragenerálása
@@ -942,6 +945,39 @@ ShortThursday=Cs
 ShortFriday=P
 ShortSaturday=Szo
 ShortSunday=V
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Válasszon egy e-mail sablont
 SetRef=Set ref
 Select2ResultFoundUseArrows=Találati lista. Használja a nyilakat a kiválasztáshoz.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Információ
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index f8b8f5e69ed..a0dc2f9a2df 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -81,7 +81,7 @@ DeleteType=Törlés
 VoteAllowed=Szavazz megengedett
 Physical=Fizikai
 Moral=Erkölcsi
-MorPhy=Erkölcsi / Fizikai
+MorPhy=Természet
 Reenable=Újra bekapcsolja
 ResiliateMember=Tag kiléptetése
 ConfirmResiliateMember=Valóban ki szeretné léptetni az adott tagot?
diff --git a/htdocs/langs/hu_HU/mrp.lang b/htdocs/langs/hu_HU/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/hu_HU/mrp.lang
+++ b/htdocs/langs/hu_HU/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/hu_HU/multicurrency.lang b/htdocs/langs/hu_HU/multicurrency.lang
index 0f31a6a59c5..5f6b698d72c 100644
--- a/htdocs/langs/hu_HU/multicurrency.lang
+++ b/htdocs/langs/hu_HU/multicurrency.lang
@@ -8,7 +8,7 @@ MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=A legfrissebb ismert árfolyam helyett h
 multicurrency_useOriginTx=Ha egy objektum egy másikból készül, tartsa meg az eredeti arányt a forrásobjektumból (egyébként használja a legfrissebb ismert arányt)
 CurrencyLayerAccount=CurrencyLayer API
 CurrencyLayerAccount_help_to_synchronize=Ennek a funkciónak a használatához létre kell hoznia egy fiókot a %s webhelyen. <br> Szerezze be <b>API kulcsát</b>. <br>Ha ingyenes fiókot használ, nem tudja megváltoztatni az <b>forrás pénznemét</b> (alapértelmezés: USD). <br>Ha a fő pénznem nem USD, az alkalmazás automatikusan kiszámítja azt. <br> <br>Havonta 1000 szinkronizálást végezhet.
-multicurrency_appId=API key
+multicurrency_appId=API kulcs
 multicurrency_appCurrencySource=Forrás deviza
 multicurrency_alternateCurrencySource=Alternatív forrás deviza
 CurrenciesUsed=Használt pénznemek
@@ -18,3 +18,5 @@ MulticurrencyReceived=Fogadott, eredeti pénznem
 MulticurrencyRemainderToTake=Fennmaradó összeg, eredeti pénznem
 MulticurrencyPaymentAmount=Fizetendő összeg, eredeti pénznem
 AmountToOthercurrency=Összeg: (a fogadó számla pénznemében)
+CurrencyRateSyncSucceed=Az árfolyam-szinkronizálás sikeresen befejeződött
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Használja a dokumentum pénznemét online fizetésekhez
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 5a237102474..934ae54ceb1 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Helló)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=A kifizetéshez kattintson az alábbi linkre, ha még nem történt meg.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Helló)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=A Dolibarr egy kompakt ERP/CRM, amely számos üzleti modult támogat. Az összes modult bemutató demonstrációnak nincs értelme, mivel ez a forgatókönyv soha nem fordul elő (több száz elérhető). Azonban számos demo profil elérhető.
 ChooseYourDemoProfil=Válassza ki az igényeinek leginkább megfelelő bemutató profilt ...
 ChooseYourDemoProfilMore=... vagy készítsen saját profilt <br>(manuális modulválasztás)
@@ -280,7 +278,9 @@ LinesToImport=Importálandó sorok
 
 MemoryUsage=Memóriahasználat
 RequestDuration=A kérelem időtartama
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Termékek/szolgáltatások népszerűsége a javaslatokban
 PopuCom=Termékek/szolgáltatások népszerűsége a megrendelésekben
 ProductStatistics=Termékek/szolgáltatások statisztikája
 NbOfQtyInOrders=Mennyiség a megrendelésekben
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 15f05e7d141..43667cffc4f 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Vonalkód típusának beállítása
 BarcodeValue=Vonalkód érték
 NoteNotVisibleOnBill=Megjegyzés (nem látszik a számlákon, ajánlatokon...)
 ServiceLimitedDuration=Ha a termék vagy szolgáltatás időkorlátos:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Több árszegmens termékenként / szolgáltatásonként (minden ügyfél egy árszegmensben van)
 MultiPricesNumPrices=Árak száma
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Eladási árak (termékek vagy szolgáltatá
 CustomCode=Vám / Áru / HS kód
 CountryOrigin=Származási ország
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Rövid címke
 Unit=Egység
 p=db.
@@ -359,6 +362,9 @@ SelectCombination=Kombináció kiválasztása
 ProductCombinationGenerator=Változatgenerátor
 Features=Jellemzők
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Új attribútum
 NewProductAttributeValue=Új attribútumérték
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 1725b88e56a..6dec0368501 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Hozzájáruló
 TypeContact_project_task_external_TASKCONTRIBUTOR=Hozzájáruló
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Hivatkozás erre:
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/hu_HU/recruitment.lang b/htdocs/langs/hu_HU/recruitment.lang
new file mode 100644
index 00000000000..d886dbe3d61
--- /dev/null
+++ b/htdocs/langs/hu_HU/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Toborzás
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Az új állásokra vonatkozó toborzási kampányok kezelése és követése
+
+#
+# Admin page
+#
+RecruitmentSetup = Toborzási beállítások
+Settings = Beállítások
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Toborzási terület
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Névjegy
+RecruitmentAbout = Toborzási névjegy
+RecruitmentAboutPage = Toborzás névjegy oldala
+NbOfEmployeesExpected=A munkavállalók várható száma
+JobLabel=A munkakör megnevezése
+WorkPlace=Munkavégzés helye
+DateExpected=Várható dátum
+FutureManager=Jövőbeli vezető
+ResponsibleOfRecruitement=A toborzásért felelős
+IfJobIsLocatedAtAPartner=Amennyiben a munkapozíció partnernél található
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index ec351ff5e74..8281f86d75e 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Küldés törlése
 Stock=Készlet
 Stocks=Készletek
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Készletek tétel/cikkszám alapján
@@ -95,14 +95,16 @@ RealStock=Igazi készlet
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuális készlet
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Raktár azon.
 DescWareHouse=Raktár leírás
 LieuWareHouse=Raktár helye
 WarehousesAndProducts=Raktárak és termékek
 WarehousesAndProductsBatchDetail=Raktárak és termékek (tétel/cikkszám szerint részletezve)
-AverageUnitPricePMPShort=Súlyozott átlag beviteli ár
-AverageUnitPricePMP=Súlyozott átlag beviteli ár
+AverageUnitPricePMPShort=Súlyozott átlagár
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Értékesítés Egységár
 EstimatedStockValueSellShort=Eladási érték
 EstimatedStockValueSell=Eladási érték
@@ -141,7 +143,7 @@ Replenishments=Készletek pótlása
 NbOfProductBeforePeriod=A %s termékből rendelkezésre álló mennyiség a kiválasztott periódusban (%s előtt)
 NbOfProductAfterPeriod=A %s termékből rendelkezésre álló mennyiség a kiválasztott periódusban (%s után)
 MassMovement=Tömeges mozgatás
-SelectProductInAndOutWareHouse=Válasszon egy terméket, a mennyiségét, egy származási raktárat valamint egy cél raktárat, majd kattintson az "%s"-ra. Amint minden szükséges mozgatással elkészült, kattintson a "%s"-ra.
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Mozgatás rögzítése
 ReceivingForSameOrder=Megrendelés nyugtái
 StockMovementRecorded=Rögzített készletmozgások
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index 091cba05a30..9c42f779316 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Eladási árak
diff --git a/htdocs/langs/hu_HU/ticket.lang b/htdocs/langs/hu_HU/ticket.lang
index 7ab0337b819..79cde86ee8b 100644
--- a/htdocs/langs/hu_HU/ticket.lang
+++ b/htdocs/langs/hu_HU/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Típus
-Category=Analitikai kód
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Csoport
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analitikai kód
+TicketCategory=Csoport
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 084d20b5834..45af45e609f 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Létrehozott felhasználó lesz egy külső felhasználó
 IdPhoneCaller=Telfon hívó azonosító
 NewUserCreated=Felhasználó %s létrehozva
 NewUserPassword=Jelszó megváltoztatása %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Felhasználó %s módosítva
 UserDisabled=Felhasználó %s kikapcsolva
 UserEnabled=Felhasználó %s aktiválva
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Karbantartási módban kikapcsolt
 UserAccountancyCode=Felhasználói számviteli kód
 UserLogoff=Felhasználó kilépés
 UserLogged=Felhasználó naplózva
+DateOfEmployment=Employment date
 DateEmployment=A foglalkoztatás kezdő dátuma
 DateEmploymentEnd=A foglalkoztatás befejezési dátuma
 CantDisableYourself=Saját felhasználói rekordját nem tilthatja le
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=A szabadságkérelem érvényesítése
 ValidatorIsSupervisorByDefault=Alapértelmezés szerint az érvényesítő a felhasználó vezetője. Hagyja üresen ha ez így van.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 740e3663f97..7522b6d2bd1 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Várakozás
 StatusTrans=Küldött
+StatusDebited=Debited
 StatusCredited=Jóváírt
+StatusPaid=Fizetett
 StatusRefused=Megtagadta
 StatusMotif0=Meghatározatlan
 StatusMotif1=Rendelkezni insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=Egyéb ok
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Csak az Office
 CreateBanque=Csak a bank
 OrderWaiting=Várakozás kezelés
-NotifyTransmision=Felmondás Átviteli
-NotifyCredit=Felmondás Hitel
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Nemzeti Adó száma
 WithBankUsingRIB=A bankszámlák segítségével RIB
 WithBankUsingBANBIC=A bankszámlák segítségével IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Hitelt
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Összeg: %s <br> Metode: %s <br> Dátum: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opció a valós módban nem volt beállítva, akkor hagyja abba ezt követően szimuláció
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/hu_HU/workflow.lang b/htdocs/langs/hu_HU/workflow.lang
index 4966b07753d..569e1e15dc3 100644
--- a/htdocs/langs/hu_HU/workflow.lang
+++ b/htdocs/langs/hu_HU/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=A kapcsolt forrásból származó 
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=A kapcsolt forrásból származó szállítói javaslatot számlázottként minősíti, ha a szállítói számla érvényesítve lesz (és ha a számla összege megegyezik a kapcsolódó ajánlat teljes összegével)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=A kapcsolt forrásból származó megrendelést számlázottra minősíti, ha a szállítói számla érvényesítve lesz (és ha a számla összege megegyezik a kapcsolódó rendelés teljes összegével)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatikus létrehozás
 AutomaticClassification=Automatikus minősítés
diff --git a/htdocs/langs/hu_HU/zapier.lang b/htdocs/langs/hu_HU/zapier.lang
index 3b4fd59132c..24de04023f3 100644
--- a/htdocs/langs/hu_HU/zapier.lang
+++ b/htdocs/langs/hu_HU/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr modul
 # Admin page
 #
 ZapierForDolibarrSetup = Zapier for Dolibarr beállítása
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 39711e7ed81..ddaca2284f1 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Izinkan untuk mengelola jumlah nol yang berbeda di akhir
 BANK_DISABLE_DIRECT_INPUT=Nonaktifkan pencatatan langsung transaksi di rekening bank
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktifkan konsep ekspor di jurnal
 ACCOUNTANCY_COMBO_FOR_AUX=Aktifkan daftar kombo untuk akun anak perusahaan (mungkin lambat jika Anda memiliki banyak pihak ketiga)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian
@@ -284,6 +285,7 @@ ShowTutorial=Perlihatkan Tutorial
 NotReconciled=Tidak didamaikan
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Terapkan kategori secara massal
 AddAccountFromBookKeepingWithNoCategories=Akun yang tersedia belum dalam grup yang dipersonalisasi
 CategoryDeleted=Kategori untuk akun akuntansi telah dihapus
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 79028ae89ed..6878f83da5e 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Landasan
+Foundation=Yayasan
 Version=Versi
 Publisher=Penerbit
 VersionProgram=Versi Program
@@ -87,7 +87,7 @@ MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Tanggal disimpan dan dikembalikan oleh server database seolah-olah disimpan sebagai string yang dikirimkan. Zona waktu hanya berpengaruh bila menggunakan fungsi UNIX_TIMESTAMP (yang seharusnya tidak digunakan oleh Dolibarr, jadi basis data TZ seharusnya tidak berpengaruh, bahkan jika diubah setelah data dimasukkan).
 Space=Ruang
 Table=Tabel
-Fields=Fields
+Fields=Baris
 Index=Indeks
 Mask=Topeng
 NextValue=Nilai berikutnya
@@ -279,7 +279,7 @@ MAIN_MAIL_SMTP_SERVER=Host SMTP / SMTPS (nilai default di php.ini:<b>%s </b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP / SMTPS (Tidak didefinisikan ke dalam PHP pada sistem mirip Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Tidak didefinisikan ke dalam PHP pada sistem mirip Unix)
 MAIN_MAIL_EMAIL_FROM=Email pengirim untuk email otomatis (nilai default di php.ini:<b>%s </b>)
-MAIN_MAIL_ERRORS_TO=Email yang digunakan untuk email kesalahan mengembalikan (bidang 'Kesalahan-To' dalam email yang dikirim)
+MAIN_MAIL_ERRORS_TO=Email yang digunakan untuk email pengembalian kesalahan (baris 'Kesalahan-Ke' dalam email terkirim)
 MAIN_MAIL_AUTOCOPY_TO= Salin (Bcc) semua email yang dikirim ke
 MAIN_DISABLE_ALL_MAILS=Nonaktifkan semua pengiriman email (untuk tujuan pengujian atau demo)
 MAIN_MAIL_FORCE_SENDTO=Kirim semua email ke (bukan penerima sebenarnya, untuk tujuan pengujian)
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Email pengirim default untuk pengiriman manual (Email
 UserEmail=Email pengguna
 CompanyEmail=Email Perusahaan
 FeatureNotAvailableOnLinux=Fitur tidak tersedia di sistem seperti Unix. Uji program sendmail Anda secara lokal.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Jika terjemahan untuk bahasa ini tidak lengkap atau Anda menemukan kesalahan, Anda dapat memperbaikinya dengan mengedit file dalam direktori<b>langs / %s</b>dan kirimkan perubahan Anda ke www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Jika terjemahan untuk bahasa ini tidak lengkap atau Anda menemukan kesalahan, Anda dapat memperbaikinya dengan mengedit file ke direktori<b>langs / %s</b>dan kirimkan file yang dimodifikasi pada dolibarr.org/forum atau untuk pengembang di github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Setup Modul
 ModulesSetup=Modul / Pengaturan aplikasi
 ModuleFamilyBase=Sistem
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modul<b>%s</b>harus diaktifkan terlebih dahulu jika And
 SecurityToken=Kunci untuk mengamankan URL
 NoSmsEngine=Tidak ada manajer pengirim SMS yang tersedia. Manajer pengirim SMS tidak diinstal dengan distribusi default karena tergantung pada vendor eksternal, tetapi Anda dapat menemukannya di %s
 PDF=PDF
-PDFDesc=Opsi global untuk pembuatan PDF.
-PDFAddressForging=Aturan untuk kotak alamat
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Sembunyikan semua informasi yang terkait dengan Pajak Penjualan / PPN
 PDFRulesForSalesTax=Aturan untuk Pajak Penjualan / PPN
 PDFLocaltax=Aturan untuk %s
-HideLocalTaxOnPDF=Sembunyikan tingkat %s dalam kolom Pajak Penjualan
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Sembunyikan deskripsi produk
 HideRefOnPDF=Sembunyikan produk ref.
 HideDetailsOnPDF=Sembunyikan detail lini produk
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Ubah harga dengan nilai referensi dasar ditentukan pada
 MassConvert=Luncurkan konversi massal
 PriceFormatInCurrentLanguage=Format Harga Dalam Bahasa Saat Ini
 String=Tali
+String1Line=String (1 line)
 TextLong=Teks panjang
+TextLongNLines=Long text (n lines)
 HtmlText=Teks html
 Int=Bilangan bulat
 Float=Mengapung
@@ -421,22 +424,22 @@ ExtrafieldMail = Email
 ExtrafieldUrl = Url
 ExtrafieldSelect = Daftar Pilihan
 ExtrafieldSelectList = Pilih dari tabel
-ExtrafieldSeparator=Pemisah (bukan bidang)
+ExtrafieldSeparator=Pemisah (bukan baris)
 ExtrafieldPassword=Kata kunci
 ExtrafieldRadio=Tombol radio (hanya satu pilihan)
 ExtrafieldCheckBox=Kotak centang
 ExtrafieldCheckBoxFromList=Kotak centang dari tabel
 ExtrafieldLink=Tautan ke suatu objek
-ComputedFormula=Bidang yang dihitung
-ComputedFormulaDesc=Anda dapat memasukkan rumus di sini menggunakan properti objek lain atau kode PHP apa pun untuk mendapatkan nilai komputasi dinamis. Anda dapat menggunakan rumus PHP yang kompatibel termasuk "?" kondisi operator, dan objek global berikut:<strong>$ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br><strong>PERINGATAN </strong>: Hanya beberapa properti $ objek yang mungkin tersedia. Jika Anda membutuhkan properti yang tidak dimuat, ambil sendiri objek ke rumus Anda seperti pada contoh kedua. <br> Menggunakan bidang yang dihitung berarti Anda tidak dapat memasukkan nilai apa pun dari antarmuka. Juga, jika ada kesalahan sintaks, rumus mungkin tidak menghasilkan apa-apa. <br> <br> Contoh rumus: <br> $ objek-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int), substr ($, 2,> ) <br> <br> Contoh untuk memuat ulang objek <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ object? $ obj? $ obj> $ obj> $ obj> $ object? > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Contoh rumus lain untuk memaksa memuat objek dan objek induknya: a0342fccfda19bb $ tugas ($ rel ulang ($ rel) )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = Proyek baru ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Proyek induk tidak ditemukan'
-Computedpersistent=Simpan bidang yang dihitung
-ComputedpersistentDesc=Bidang ekstra yang dikomputasi akan disimpan dalam basis data, namun nilainya hanya akan dihitung ulang ketika objek bidang ini diubah. Jika bidang yang dihitung bergantung pada objek lain atau data global, nilai ini mungkin salah !!
-ExtrafieldParamHelpPassword=Membiarkan bidang ini kosong berarti nilai ini akan disimpan tanpa enkripsi (bidang harus disembunyikan hanya dengan bintang di layar). <br> Setel 'otomatis' untuk menggunakan aturan enkripsi default untuk menyimpan kata sandi ke dalam basis data (kemudian nilai baca akan menjadi hash saja, tidak ada cara untuk mengambil nilai asli)
+ComputedFormula=Baris yang dihitung
+ComputedFormulaDesc=Anda dapat memasukkan rumus di sini menggunakan properti objek lain atau kode PHP apa pun untuk mendapatkan nilai komputasi dinamis. Anda dapat menggunakan rumus PHP yang kompatibel termasuk "?" kondisi operator, dan objek global berikut:<strong>$ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br><strong>PERINGATAN </strong>: Hanya beberapa properti $ objek yang mungkin tersedia. Jika Anda membutuhkan properti yang tidak dimuat, ambil sendiri objek ke rumus Anda seperti pada contoh kedua. <br> Menggunakan baris yang dihitung berarti Anda tidak dapat memasukkan nilai apa pun dari antarmuka. Juga, jika ada kesalahan sintaks, rumus mungkin tidak menghasilkan apa-apa. <br> <br> Contoh rumus: <br> $ objek-> id < 10 ? round($object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int), substr ($, 2,> ) <br> <br> Contoh untuk memuat ulang objek <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ object? $ obj? $ obj> $ obj> $ obj> $ object? > rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Contoh rumus lain untuk memaksa memuat objek dan objek induknya: a0342fccfda19bb $ tugas ($ rel ulang ($ rel) )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = Proyek baru ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Proyek induk tidak ditemukan'
+Computedpersistent=Simpan baris yang dihitung
+ComputedpersistentDesc=Baris ekstra yang dikomputasi akan disimpan dalam basisdata, namun nilainya hanya akan dikalkulasi ulang ketika objek baris ini diubah. Jika baris yang dihitung bergantung pada objek lain atau data global, nilai ini mungkin salah!!
+ExtrafieldParamHelpPassword=Membiarkan baris ini kosong berarti nilai ini akan disimpan tanpa enkripsi (baris harus disembunyikan hanya dengan bintang di layar).<br>Atur 'otomatis' untuk menggunakan aturan enkripsi secara default untuk menyimpan kata sandi ke dalam basisdata (kemudian nilai baca akan menjadi hash saja, tidak ada cara untuk mengambil nilai asli)
 ExtrafieldParamHelpselect=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, nilai1<br>2, nilai2 a0342fccfda0b3f0f0f0fb0f0f0fb03 daftar tergantung pada daftar atribut pelengkap lain: <br> 1, nilai1 | options_ <i> parent_list_code </i>: parent_key<br>2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: <br> 1, nilai1 | <i> parent_list_code </i>: parent_key<br>2, value2 | <i> parent_list_code </i>: parent_key
 ExtrafieldParamHelpcheckbox=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, value1<br>2, value2 a0342fccfda2b3f0f3f0f3f
 ExtrafieldParamHelpradio=Daftar nilai harus berupa garis dengan kunci format, nilai (di mana kunci tidak boleh '0') <br> <br> misalnya: <br> 1, value1<br>2, value2 a0342fccfda2b3f0f3f0f3f
-ExtrafieldParamHelpsellist=Daftar nilai berasal dari tabel<br>Sintaks: table_name: label_field: id_field :: filter<br>Contoh: c_typent: libelle: id :: filter <br> <br> a = 1) untuk hanya menampilkan nilai aktif<br>Anda juga dapat menggunakan $ ID $ dalam penyihir filter adalah id saat ini dari objek saat ini<br>Untuk melakukan SELECT dalam menggunakan filter $ SEL $ <br> jika Anda ingin memfilter pada extrafields gunakan sintaks ekstra.fieldcode. = ... (di mana kode bidang adalah kode extrafield) <br> <br> Untuk memiliki daftar tergantung pada daftar atribut pelengkap lain: <br> c_typent: libelle: id: options_ a049271e8641c0b0e_03_03_03_03_03_03_03_03_03_03_03_03_03_03_03_03_0_03 daftar tergantung pada daftar lain: <br> c_typent: libelle: id: <i> parent_list_code a0ae64758bac3 3z0 | parent_column: filter
-ExtrafieldParamHelpchkbxlst=Daftar nilai berasal dari tabel<br>Sintaks: table_name: label_field: id_field :: filter<br>Contoh: c_typent: libelle: id :: filter <br> <br> filter a hanya dapat ditampilkan sebagai contoh a juga dapat menggunakan $ ID $ dalam penyihir filter adalah id saat ini dari objek saat ini<br>Untuk melakukan SELECT dalam menggunakan $ SEL $ <br> jika Anda ingin memfilter pada extrafields gunakan sintaks extra.fieldcode = ... (di mana kode bidang adalah kode extrafield) <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar atribut pelengkap lain: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: c_typent <br>: libelle: id: <i> parent_list_code </i> | parent_column: filter
+ExtrafieldParamHelpsellist=Daftar nilai berasal dari tabel<br>Sintaks: table_name: label_field: id_field :: filter<br>Contoh: c_typent: libelle: id :: filter <br> <br> a = 1) untuk hanya menampilkan nilai aktif<br>Anda juga dapat menggunakan $ ID $ dalam penyihir filter adalah id saat ini dari objek saat ini<br>Untuk melakukan SELECT dalam menggunakan filter $ SEL $ <br> jika Anda ingin memfilter pada extrafields gunakan sintaks ekstra.fieldcode. = ... (di mana kode baris adalah kode extrafield) <br> <br> Untuk memiliki daftar tergantung pada daftar atribut pelengkap lain: <br> c_typent: libelle: id: options_ a049271e8641c0b0e_03_03_03_03_03_03_03_03_03_03_03_03_03_03_03_03_0_03 daftar tergantung pada daftar lain: <br> c_typent: libelle: id: <i> parent_list_code a0ae64758bac3 3z0 | parent_column: filter
+ExtrafieldParamHelpchkbxlst=Daftar nilai berasal dari tabel<br>Sintaks: table_name: label_field: id_field :: filter<br>Contoh: c_typent: libelle: id :: filter <br> <br> filter a hanya dapat ditampilkan sebagai contoh a juga dapat menggunakan $ ID $ dalam penyihir filter adalah id saat ini dari objek saat ini<br>Untuk melakukan SELECT dalam menggunakan $ SEL $ <br> jika Anda ingin memfilter pada extrafields gunakan sintaks extra.fieldcode = ... (di mana kode baris adalah kode extrafield) <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar atribut pelengkap lain: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> dalam rangka untuk memiliki daftar tergantung pada daftar lain: c_typent <br>: libelle: id: <i> parent_list_code </i> | parent_column: filter
 ExtrafieldParamHelplink=Parameter harus ObjectName: Classpath<br>Sintaks: ObjectName: Classpath<br>Contoh: <br> Societe: societe / class / societe.class.php a0342fccfda19bpp kontak: kontak / kontak dengan kontak kelas
 ExtrafieldParamHelpSeparator=Biarkan kosong untuk pemisah sederhana<br>Setel ini menjadi 1 untuk pemisah runtuh (buka secara default untuk sesi baru, kemudian status disimpan untuk setiap sesi pengguna) status disimpan sebelum setiap sesi pengguna)
 LibraryToBuildPDF=Perpustakaan digunakan untuk pembuatan PDF
@@ -446,7 +449,7 @@ LinkToTestClickToDial=Masukkan nomor telepon untuk menelepon untuk menunjukkan t
 RefreshPhoneLink=Segarkan tautan
 LinkToTest=Tautan yang dapat diklik yang dihasilkan untuk pengguna<strong>%s </strong> (klik nomor telepon untuk menguji)
 KeepEmptyToUseDefault=Biarkan kosong untuk menggunakan nilai default
-KeepThisEmptyInMostCases=Dalam kebanyakan kasus, Anda dapat membiarkan bidang ini kosong.
+KeepThisEmptyInMostCases=Dalam kebanyakan kasus, Anda dapat membiarkan baris ini kosong.
 DefaultLink=Link Standar
 SetAsDefault=Ditetapkan sebagai default
 ValueOverwrittenByUserSetup=Peringatan, nilai ini dapat ditimpa oleh pengaturan khusus pengguna (setiap pengguna dapat mengatur url clicktodialnya sendiri)
@@ -481,7 +484,7 @@ WarningPHPMailSPF=Jika nama domain di alamat email pengirim Anda dilindungi oleh
 ClickToShowDescription=Klik untuk menampilkan deskripsi
 DependsOn=Modul ini membutuhkan modul
 RequiredBy=Modul ini diperlukan oleh modul
-TheKeyIsTheNameOfHtmlField=Ini adalah nama bidang HTML. Pengetahuan teknis diperlukan untuk membaca konten halaman HTML untuk mendapatkan nama kunci bidang.
+TheKeyIsTheNameOfHtmlField=Ini adalah nama baris HTML. Pengetahuan teknis diperlukan untuk membaca konten halaman HTML untuk mendapatkan nama kunci baris.
 PageUrlForDefaultValues=Anda harus memasukkan jalur relatif URL halaman. Jika Anda memasukkan parameter dalam URL, nilai default akan efektif jika semua parameter ditetapkan ke nilai yang sama.
 PageUrlForDefaultValuesCreate= <br> Contoh: <br> Untuk formulir untuk membuat pihak ketiga baru, itu<strong>%s </strong>. <br> Untuk URL modul eksternal yang diinstal ke direktori kustom, jangan sertakan "custom /", jadi gunakan path seperti<strong>mymodule / mypage.php </strong> dan bukan custom / mymodule / mypage.php. <br> Jika Anda ingin nilai default hanya jika url memiliki beberapa parameter, Anda dapat menggunakan<strong>%s </strong>
 PageUrlForDefaultValuesList= <br> Contoh: <br> Untuk halaman yang berisi daftar pihak ketiga, itu adalah<strong>%s </strong>. <br> Untuk URL modul eksternal yang diinstal ke direktori custom, jangan sertakan "custom /" jadi gunakan path seperti<strong>mymodule / mypagelist.php </strong> dan bukan custom / mymodule / mypagelist.php. <br> Jika Anda ingin nilai default hanya jika url memiliki beberapa parameter, Anda dapat menggunakan<strong>%s </strong>
@@ -489,8 +492,8 @@ AlsoDefaultValuesAreEffectiveForActionCreate=Perhatikan juga bahwa menimpa nilai
 EnableDefaultValues=Aktifkan penyesuaian nilai default
 EnableOverwriteTranslation=Aktifkan penggunaan terjemahan yang ditimpa
 GoIntoTranslationMenuToChangeThis=Terjemahan telah ditemukan untuk kunci dengan kode ini. Untuk mengubah nilai ini, Anda harus mengeditnya dari Home-Setup-translation.
-WarningSettingSortOrder=Peringatan, pengaturan urutan penyortiran default dapat menyebabkan kesalahan teknis saat membuka halaman daftar jika bidang adalah bidang yang tidak dikenal. Jika Anda mengalami kesalahan seperti itu, kembali ke halaman ini untuk menghapus urutan penyortiran default dan mengembalikan perilaku default.
-Field=Bidang
+WarningSettingSortOrder=Peringatan, pengaturan urutan penyortiran default dapat menyebabkan kesalahan teknis saat membuka halaman daftar jika baris adalah baris yang tidak dikenal. Jika Anda mengalami kesalahan seperti itu, kembali ke halaman ini untuk menghapus urutan penyortiran default dan mengembalikan perilaku default.
+Field=Baris
 ProductDocumentTemplates=Templat dokumen untuk menghasilkan dokumen produk
 FreeLegalTextOnExpenseReports=Teks hukum gratis tentang laporan pengeluaran
 WatermarkOnDraftExpenseReports=Tanda air pada draft laporan pengeluaran
@@ -543,9 +546,9 @@ Module54Desc=Manajemen kontrak (layanan atau langganan berulang)
 Module55Name=Barcode
 Module55Desc=Manajemen barcode
 Module56Name=Pembayaran dengan transfer kredit
-Module56Desc=Manajemen pembayaran pemasok dengan perintah transfer kredit. Ini termasuk pembuatan file SEPA untuk negara-negara Eropa.
-Module57Name=Pembayaran Debit Bank Langsung
-Module57Desc=Manajemen pesanan pembayaran Debit Langsung. Ini termasuk pembuatan file SEPA untuk negara-negara Eropa.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrasi sistem ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -606,7 +609,7 @@ Module1520Desc=Pembuatan dokumen email massal
 Module1780Name=Kategori-Kategori
 Module1780Desc=Buat tag / kategori (produk, pelanggan, pemasok, kontak, atau anggota)
 Module2000Name=Editor WYSIWYG
-Module2000Desc=Izinkan bidang teks diedit / diformat menggunakan CKEditor (html)
+Module2000Desc=Izinkan baris teks diedit / diformat menggunakan CKEditor (html)
 Module2200Name=Harga Dinamis
 Module2200Desc=Gunakan ekspresi matematika untuk menghasilkan harga secara otomatis
 Module2300Name=Pekerjaan terjadwal
@@ -836,9 +839,16 @@ Permission532=Membuat/Merubah Jasa
 Permission534=Menghapus Jasa
 Permission536=Lihat / kelola layanan tersembunyi
 Permission538=Layanan ekspor
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Baca Bills of Material
 Permission651=Buat / Perbarui Bills of Material
 Permission652=Hapus Bills of Material
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Membaca Sumbangan
 Permission702=Membuat/Merubah Sumbangan
 Permission703=Menghapus Sumbangan
@@ -848,6 +858,8 @@ Permission773=Hapus laporan pengeluaran
 Permission774=Baca semua laporan pengeluaran (bahkan untuk pengguna bukan bawahan)
 Permission775=Menyetujui laporan pengeluaran
 Permission776=Membayar laporan pengeluaran
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Laporan pengeluaran ekspor
 Permission1001=Membaca Stok
 Permission1002=Membuat/Merubah Gudang
@@ -900,6 +912,7 @@ Permission2515=Siapkan direktori dokumen
 Permission2801=Gunakan klien FTP dalam mode baca (hanya menjelajah dan mengunduh)
 Permission2802=Gunakan klien FTP dalam mode tulis (hapus atau unggah file)
 Permission3200=Baca agenda yang diarsipkan dan sidik jari
+Permission3301=Generate new modules
 Permission4001=Lihat karyawan
 Permission4002=Buat karyawan
 Permission4003=Hapus karyawan
@@ -947,7 +960,8 @@ Permission63003=Hapus sumber daya
 Permission63004=Tautkan sumber daya ke agenda agenda
 DictionaryCompanyType=Jenis pihak ketiga
 DictionaryCompanyJuridicalType=Badan hukum pihak ketiga
-DictionaryProspectLevel=Potensi prospek
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Negara Bagian / Provinsi
 DictionaryRegion=Daerah
 DictionaryCountry=Negara
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Template Email
 DictionaryUnits=Unit
 DictionaryMeasuringUnits=Unit Pengukur
 DictionarySocialNetworks=Jaringan sosial
-DictionaryProspectStatus=Status prospek
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Jenis cuti
 DictionaryOpportunityStatus=Status memimpin untuk proyek / prospek
 DictionaryExpenseTaxCat=Laporan biaya - Kategori transportasi
@@ -1076,7 +1091,7 @@ LoginPage=Halaman masuk
 BackgroundImageLogin=Gambar latar belakang
 PermanentLeftSearchForm=Formulir pencarian permanen di menu sebelah kiri
 DefaultLanguage=Bahasa default
-EnableMultilangInterface=Aktifkan dukungan multi bahasa
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Tampilkan logo perusahaan di menu
 CompanyInfo=Perusahaan/Organisasi
 CompanyIds=Identitas Perusahaan / Organisasi
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Kriteria pencarian diperlukan setidaknya
 NewTranslationStringToShow=String terjemahan baru untuk ditampilkan
 OriginalValueWas=Terjemahan aslinya ditimpa. Nilai asli adalah: <br> <br> %s
 TransKeyWithoutOriginalValue=Anda memaksa terjemahan baru untuk kunci terjemahan '<strong> %s </strong>' yang tidak ada dalam file bahasa apa pun
-TotalNumberOfActivatedModules=Aplikasi / modul yang diaktifkan:<b>%s</b>/<b>%s </b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Anda setidaknya harus mengaktifkan 1 modul
 ClassNotFoundIntoPathWarning=Kelas %s tidak ditemukan di jalur PHP
 YesInSummer=Ya di musim panas
@@ -1260,7 +1276,7 @@ PreloadOPCode=OPCode preloaded digunakan
 AddRefInList=Tampilkan Pelanggan / Vendor ref. daftar info (daftar pilih atau kotak kombo) dan sebagian besar hyperlink. <br> Pihak Ketiga akan muncul dengan format nama "CC12345 - SC45678 - The Big Company corp." alih-alih "Perusahaan Besar Perusahaan".
 AddAdressInList=Tampilkan daftar info alamat Pelanggan / Vendor (daftar pilih atau kotak kombo) <br> Pihak Ketiga akan muncul dengan format nama "Korporasi Perusahaan Besar - 21 lompat jalan 123456 Kota besar - AS" alih-alih "Korps Perusahaan Besar".
 AskForPreferredShippingMethod=Mintalah metode pengiriman pilihan untuk Pihak Ketiga.
-FieldEdition=Edisi bidang %s
+FieldEdition=Edisi baris %s
 FillThisOnlyIfRequired=Contoh: +2 (isi hanya jika masalah offset zona waktu dialami)
 GetBarCode=Dapatkan barcode
 NumberingModules=Model penomoran
@@ -1529,8 +1545,8 @@ DefaultValuesDesc=Di sini Anda dapat menentukan nilai default yang ingin Anda gu
 DefaultCreateForm=Nilai default (untuk digunakan pada formulir)
 DefaultSearchFilters=Filter pencarian default
 DefaultSortOrder=Sortir pesanan default
-DefaultFocus=Bidang fokus default
-DefaultMandatory=Bidang formulir wajib
+DefaultFocus=Baris fokus default
+DefaultMandatory=Baris formulir wajib
 ##### Products #####
 ProductSetup=Pengaturan modul produk
 ServiceSetup=Pengaturan modul layanan
@@ -1646,7 +1662,7 @@ DetailTarget=Target untuk tautan (_blank atas membuka jendela baru)
 DetailLevel=Level (-1: menu atas, 0: menu header,> 0 menu dan sub menu)
 ModifMenu=Perubahan menu
 DeleteMenu=Hapus entri menu
-ConfirmDeleteMenu=Apakah Anda yakin ingin menghapus entri menu<b>%s </b>?
+ConfirmDeleteMenu=Apakah Anda yakin ingin menghapus entri menu<b>%s</b>?
 FailedToInitializeMenu=Gagal menginisialisasi menu
 ##### Tax #####
 TaxSetup=Pajak, pajak sosial atau fiskal dan pengaturan modul dividen
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Gunakan jenis agenda (dikelola dalam Pengaturan menu -> Ka
 AGENDA_USE_EVENT_TYPE_DEFAULT=Secara otomatis mengatur nilai default ini untuk jenis agenda di agenda buat formulir
 AGENDA_DEFAULT_FILTER_TYPE=Secara otomatis mengatur jenis agenda ini di filter pencarian tampilan agenda
 AGENDA_DEFAULT_FILTER_STATUS=Secara otomatis mengatur status ini untuk agenda di filter pencarian tampilan agenda
-AGENDA_DEFAULT_VIEW=Tab mana yang ingin Anda buka secara default saat memilih menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Aktifkan pengingat agenda<b>melalui email</b>(opsi pengingat / penundaan dapat ditentukan pada setiap agenda). Catatan: Modul<strong>%s </strong> harus diaktifkan dan diatur dengan benar agar pengingat dikirim pada frekuensi yang benar.
 AGENDA_REMINDER_BROWSER=Aktifkan pengingat agenda<b>di browser pengguna</b>(ketika tanggal agenda tercapai, setiap pengguna dapat menolak ini dari pertanyaan konfirmasi browser)
 AGENDA_REMINDER_BROWSER_SOUND=Aktifkan pemberitahuan suara
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Tampilkan objek yang ditautkan ke tampilan agenda
 ##### Clicktodial #####
 ClickToDialSetup=Klik Untuk Memanggil pengaturan modul
 ClickToDialUrlDesc=Url dipanggil ketika klik pada telepon picto dilakukan. Di URL, Anda dapat menggunakan tag <br><b>__PHONETO__</b>yang akan diganti dengan nomor telepon orang untuk memanggil <br><b>__PHONEFROM__</b>yang akan diganti dengan nomor telepon memanggil orang (Anda) <br><b>__LOGIN__</b>yang akan diganti dengan clicktodial login (didefinisikan pada kartu pengguna) <br><b>__PASS__</b>yang akan diganti dengan password clicktodial (didefinisikan pada kartu pengguna).
-ClickToDialDesc=Modul ini membuat nomor telepon tautan yang dapat diklik. Klik ikon akan membuat ponsel Anda memanggil nomor tersebut. Ini dapat digunakan untuk memanggil sistem call-center dari Dolibarr yang dapat memanggil nomor telepon pada sistem SIP misalnya.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Gunakan hanya tautan "tel:" pada nomor telepon
 ClickToDialUseTelLinkDesc=Gunakan metode ini jika pengguna Anda memiliki softphone atau antarmuka perangkat lunak yang diinstal pada komputer yang sama dengan browser, dan dipanggil ketika Anda mengklik tautan di browser Anda yang dimulai dengan "tel:". Jika Anda memerlukan solusi server lengkap (tidak perlu instalasi perangkat lunak lokal), Anda harus mengatur ini ke "Tidak" dan isi kolom selanjutnya.
 ##### Point Of Sale (CashDesk) #####
@@ -1813,10 +1829,11 @@ BackgroundTableLineOddColor=Warna latar untuk garis tabel ganjil
 BackgroundTableLineEvenColor=Warna latar belakang untuk garis tabel genap
 MinimumNoticePeriod=Periode pemberitahuan minimum (Permintaan cuti Anda harus dilakukan sebelum penundaan ini)
 NbAddedAutomatically=Jumlah hari yang ditambahkan ke penghitung pengguna (secara otomatis) setiap bulan
-EnterAnyCode=Bidang ini berisi referensi untuk mengidentifikasi baris. Masukkan nilai apa pun pilihan Anda, tetapi tanpa karakter khusus.
+EnterAnyCode=Baris ini berisi referensi untuk mengidentifikasi baris. Masukkan nilai apa pun pilihan Anda, tetapi tanpa karakter khusus.
 Enter0or1=Masukkan 0 atau 1
 UnicodeCurrency=Masukkan di sini di antara kurung kurawal, daftar nomor byte yang mewakili simbol mata uang. Misalnya: untuk $, masukkan [36] - untuk brazil real R $ [82,36] - untuk €, masukkan [8364]
 ColorFormat=Warna RGB dalam format HEX, mis .: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Posisi baris ke dalam daftar kombo
 SellTaxRate=Tarif pajak penjualan
 RecuperableOnly=Ya untuk PPN "Tidak Ditanggapi tetapi Dapat Dipulihkan" yang didedikasikan untuk beberapa negara bagian di Prancis. Simpan nilai "Tidak" dalam semua kasus lainnya.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Permintaan kutipan
 MailToSendSupplierOrder=Order pembelian
 MailToSendSupplierInvoice=Faktur vendor
 MailToSendContract=Kontrak
+MailToSendReception=Penerimaan
 MailToThirdparty=Pihak Ketiga
 MailToMember=Anggota
 MailToUser=Pengguna
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s tersedia. Versi %s ada
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s tersedia. Versi %s adalah versi pemeliharaan, jadi hanya berisi perbaikan bug. Kami menyarankan semua pengguna untuk meningkatkan ke versi ini. Rilis pemeliharaan tidak memperkenalkan fitur baru atau perubahan pada database. Anda dapat mengunduhnya dari area unduhan https://www.dolibarr.org portal (subdirektori versi Stabil). Anda dapat membaca <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> untuk daftar lengkap perubahan.
 MultiPriceRuleDesc=Ketika opsi "Beberapa tingkat harga per produk / layanan" diaktifkan, Anda dapat menentukan harga yang berbeda (satu per tingkat harga) untuk setiap produk. Untuk menghemat waktu Anda, di sini Anda dapat memasukkan aturan untuk secara otomatis menghitung ulang harga untuk setiap level berdasarkan harga level pertama, jadi Anda hanya perlu memasukkan harga untuk level pertama untuk setiap produk. Halaman ini dirancang untuk menghemat waktu Anda tetapi hanya berguna jika harga Anda untuk setiap level relatif terhadap level pertama. Anda dapat mengabaikan halaman ini dalam banyak kasus.
 ModelModulesProduct=Template untuk dokumen produk
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=Agar dapat menghasilkan kode secara otomatis, Anda harus terlebih dahulu menetapkan manajer untuk secara otomatis menentukan nomor kode batang.
 SeeSubstitutionVars=Lihat * catatan untuk daftar kemungkinan variabel substitusi
 SeeChangeLog=Lihat file ChangeLog (hanya bahasa Inggris)
@@ -1894,9 +1913,10 @@ MAIN_PDF_MARGIN_LEFT=Margin kiri pada PDF
 MAIN_PDF_MARGIN_RIGHT=Margin kanan pada PDF
 MAIN_PDF_MARGIN_TOP=Margin teratas pada PDF
 MAIN_PDF_MARGIN_BOTTOM=Margin bawah pada PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Tidak diperlukan pengaturan khusus untuk modul ini.
 SetToYesIfGroupIsComputationOfOtherGroups=Setel ini menjadi ya jika grup ini merupakan perhitungan grup lain
-EnterCalculationRuleIfPreviousFieldIsYes=Masukkan aturan kalkulasi jika bidang sebelumnya disetel ke Ya (Misalnya 'CODEGRP1 + CODEGRP2')
+EnterCalculationRuleIfPreviousFieldIsYes=Masukkan aturan kalkulasi jika baris sebelumnya disetel ke Ya (Misalnya 'CODEGRP1 + CODEGRP2')
 SeveralLangugeVariatFound=Beberapa varian bahasa ditemukan
 RemoveSpecialChars=Hapus karakter khusus
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter untuk membersihkan nilai (COMPANY_AQUARIUM_CLEAN_REGEX)
@@ -1905,14 +1925,14 @@ COMPANY_DIGITARIA_UNIQUE_CODE=Duplikat tidak diizinkan
 GDPRContact=Petugas Perlindungan Data (DPO, Privasi Data, atau kontak GDPR)
 GDPRContactDesc=Jika Anda menyimpan data tentang perusahaan / warga negara Eropa, Anda dapat menyebutkan kontak yang bertanggung jawab atas Peraturan Perlindungan Data Umum di sini
 HelpOnTooltip=Bantu teks untuk ditampilkan di tooltip
-HelpOnTooltipDesc=Letakkan teks atau kunci terjemahan di sini agar teks ditampilkan di tooltip saat bidang ini muncul dalam formulir
+HelpOnTooltipDesc=Letakkan teks atau kunci terjemahan di sini agar teks ditampilkan di tooltip saat baris ini muncul dalam formulir
 YouCanDeleteFileOnServerWith=Anda dapat menghapus file ini di server dengan Command Line: <br> %s
 ChartLoaded=Bagan akun dimuat
 SocialNetworkSetup=Pengaturan modul Jejaring Sosial
 EnableFeatureFor=Aktifkan fitur untuk<strong>%s </strong>
 VATIsUsedIsOff=Catatan: Opsi untuk menggunakan Pajak Penjualan atau PPN telah ditetapkan ke<strong>Off </strong> dalam menu %s - %s, jadi pajak penjualan atau PPN yang digunakan akan selalu 0 untuk penjualan.
 SwapSenderAndRecipientOnPDF=Tukar posisi pengirim dan alamat penerima pada dokumen PDF
-FeatureSupportedOnTextFieldsOnly=Peringatan, fitur yang didukung hanya pada bidang teks. Juga parameter URL action = buat atau action = edit harus diatur ATAU nama halaman harus diakhiri dengan 'new.php' untuk memicu fitur ini.
+FeatureSupportedOnTextFieldsOnly=Peringatan, fitur yang didukung hanya pada baris teks. Juga parameter URL action = buat atau action = edit harus diatur ATAU nama halaman harus diakhiri dengan 'new.php' untuk memicu fitur ini.
 EmailCollector=Kolektor email
 EmailCollectorDescription=Tambahkan pekerjaan terjadwal dan halaman pengaturan untuk memindai secara teratur kotak email (menggunakan protokol IMAP) dan merekam email yang diterima ke dalam aplikasi Anda, di tempat yang tepat dan / atau membuat beberapa catatan secara otomatis (seperti lead).
 NewEmailCollector=Kolektor Email Baru
@@ -1933,13 +1953,14 @@ NothingProcessed=Tidak ada yang dilakukan
 XEmailsDoneYActionsDone=email %s memenuhi syarat, email %s berhasil diproses (untuk catatan / tindakan %s dilakukan)
 RecordEvent=Rekam agenda email
 CreateLeadAndThirdParty=Buat timbal (dan pihak ketiga jika perlu)
-CreateTicketAndThirdParty=Buat tiket (dan pihak ketiga jika perlu)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Kode hasil terbaru
 NbOfEmailsInInbox=Jumlah email dalam direktori sumber
 LoadThirdPartyFromName=Muat pihak ketiga yang mencari di %s (hanya memuat)
 LoadThirdPartyFromNameOrCreate=Muat pencarian pihak ketiga di %s (buat jika tidak ditemukan)
-WithDolTrackingID=Referensi Dolibarr ditemukan di ID Pesan
-WithoutDolTrackingID=Referensi Dolibarr tidak ditemukan di ID Pesan
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Kode Pos
 MainMenuCode=Kode entri menu (mainmenu)
 ECMAutoTree=Tampilkan pohon ECM otomatis
@@ -1981,10 +2002,10 @@ ImportSetup=Pengaturan impor modul
 InstanceUniqueID=ID unik dari instance
 SmallerThan=Lebih kecil dari
 LargerThan=lebih besar dari
-IfTrackingIDFoundEventWillBeLinked=Perhatikan bahwa Jika ID pelacakan ditemukan dalam email yang masuk, agenda tersebut akan secara otomatis ditautkan ke objek terkait.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Dengan akun GMail, jika Anda mengaktifkan validasi 2 langkah, disarankan untuk membuat kata sandi khusus kedua untuk aplikasi alih-alih menggunakan kata sandi akun Anda sendiri dari https://myaccount.google.com/.
 EmailCollectorTargetDir=Ini mungkin merupakan perilaku yang diinginkan untuk memindahkan email ke tag / direktori lain ketika berhasil diproses. Cukup atur nama direktori di sini untuk menggunakan fitur ini (JANGAN menggunakan karakter khusus dalam nama). Perhatikan bahwa Anda juga harus menggunakan akun login baca / tulis.
-EmailCollectorLoadThirdPartyHelp=Anda dapat menggunakan tindakan ini untuk menggunakan konten email untuk menemukan dan memuat pihak ketiga yang ada di database Anda. Pihak ketiga yang ditemukan (atau dibuat) akan digunakan untuk mengikuti tindakan yang membutuhkannya. Di bidang parameter Anda dapat menggunakan misalnya 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' jika Anda ingin mengekstrak nama pihak ketiga dari string 'Nama: nama untuk menemukan' ditemukan di dalam tubuh.
+EmailCollectorLoadThirdPartyHelp=Anda dapat menggunakan tindakan ini untuk menggunakan konten email untuk menemukan dan memuat pihak ketiga yang ada di database Anda. Pihak ketiga yang ditemukan (atau dibuat) akan digunakan untuk mengikuti tindakan yang membutuhkannya. Di baris parameter Anda dapat menggunakan misalnya 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' jika Anda ingin mengekstrak nama pihak ketiga dari string 'Nama: nama untuk menemukan' ditemukan di dalam tubuh.
 EndPointFor=Titik akhir untuk %s: %s
 DeleteEmailCollector=Hapus pengumpul email
 ConfirmDeleteEmailCollector=Anda yakin ingin menghapus pengumpul email ini?
@@ -2005,3 +2026,7 @@ RssNote=Catatan: Setiap definisi umpan RSS menyediakan widget yang harus Anda ak
 JumpToBoxes=Langsung ke Pengaturan -> Widget
 MeasuringUnitTypeDesc=Gunakan di sini nilai seperti "ukuran", "permukaan", "volume", "berat", "waktu"
 MeasuringScaleDesc=Skala adalah jumlah tempat Anda harus memindahkan bagian desimal untuk mencocokkan unit referensi default. Untuk tipe unit "waktu", itu adalah jumlah detik. Nilai antara 80 dan 99 adalah nilai yang dicadangkan.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 800cf53c3bf..e3bcae405c6 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Jumlah kejadian
 ListOfActions=Daftar kejadian
 EventReports=Laporan agenda
 Location=Tempat
-ToUserOfGroup=Pada setiap pengguna dalam grup
+ToUserOfGroup=Agenda yang ditugaskan untuk setiap pengguna dalam grup
 EventOnFullDay=Perihal di sepanjang hari (s)
 MenuToDoActions=Semua peristiwa yang tidak lengkap
 MenuDoneActions=Semua agenda dihentikan
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal dihapus
 OrderDeleted=Pesanan dihapus
 InvoiceDeleted=Faktur dihapus
 DraftInvoiceDeleted=Faktur konsep dihapus
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Produk %s dibuat
 PRODUCT_MODIFYInDolibarr=Produk %s dimodifikasi
 PRODUCT_DELETEInDolibarr=Produk %s dihapus
@@ -158,3 +160,9 @@ DateStartPlusOne=Tanggal mulai + 1 jam
 SetAllEventsToTodo=Atur semua agenda untuk dikerjakan
 SetAllEventsToInProgress=Setel semua agenda sedang berlangsung
 SetAllEventsToFinished=Setel semua agenda hingga selesai
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 40a7fcab285..0b560405473 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -37,7 +37,7 @@ IbanValid=BAN valid
 IbanNotValid=BAN tidak valid
 StandingOrders=Pesanan debit langsung
 StandingOrder=Pesanan debit langsung
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=Pembayaran dengan debit langsung
 PaymentByBankTransfers=Pembayaran dengan transfer kredit
 PaymentByBankTransfer=Pembayaran dengan transfer kredit
 AccountStatement=Rekening
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index 44f5cc1992f..d4ae8002577 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Pesanan Vendor: %s terakhir dimodifikasi
 BoxTitleLastModifiedCustomerBills=Faktur Pelanggan: %s terakhir dimodifikasi
 BoxTitleLastModifiedCustomerOrders=Pesanan Penjualan: %s terakhir dimodifikasi
 BoxTitleLastModifiedPropals=Proposal dimodifikasi %s terbaru
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Tagihan pelanggan
 ForCustomersOrders=Pesanan pelanggan
 ForProposals=Proposal
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Akun penangguhan tidak ditentukan
 BoxLastCustomerShipments=Pengiriman pelanggan terakhir
 BoxTitleLastCustomerShipments=Pengiriman pelanggan %s terbaru
 NoRecordedShipments=Tidak ada pengiriman pelanggan yang direkam
+# Pages
+AccountancyHome=Akuntansi
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index 24bb046b5f9..bc39b8bf56b 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=Modul POS
 BasicPhoneLayout=Gunakan tata letak dasar untuk ponsel
 SetupOfTerminalNotComplete=Pengaturan terminal %s tidak lengkap
 DirectPayment=Pembayaran langsung
-DirectPaymentButton=Tombol pembayaran tunai langsung
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Faktur sudah divalidasi
 NoLinesToBill=Tidak ada garis untuk ditagih
 CustomReceipt=Tanda Terima Kustom
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Modul eksternal dengan fitur tambahan. Dapat m
 PrintMethod=Metode cetak
 ReceiptPrinterMethodDescription=Metode yang kuat dengan banyak parameter. Penuh dapat disesuaikan dengan templat. Tidak dapat mencetak dari cloud.
 ByTerminal=Dengan terminal
-TakeposNumpadUsePaymentIcon=Gunakan ikon pembayaran di numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Modul penomoran untuk penjualan POS
 CashDeskGenericMaskCodes6 =  tag <br><b>{TN}</b>digunakan untuk menambahkan nomor terminal
 TakeposGroupSameProduct=Kelompokkan lini produk yang sama
 StartAParallelSale=Mulai penjualan paralel baru
-ControlCashOpening=Kontrol kotak uang di pos pembukaan
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Tutup pagar uang
 CashReport=Laporan tunai
 MainPrinterToUse=Printer utama untuk digunakan
@@ -112,8 +112,13 @@ RestaurantMenu=Tidak bisa
 CustomerMenu=Menu pelanggan
 ScanToMenu=Pindai kode QR untuk melihat menu
 ScanToOrder=Pindai kode QR untuk memesan
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+Appearance=Penampilan
+HideCategoryImages=Sembunyikan Kategori Gambar
+HideProductImages=Sembunyikan Gambar Produk
+NumberOfLinesToShow=Jumlah baris gambar untuk ditampilkan
+DefineTablePlan=Definisikan rencana tabel
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 8f26144e6ee..5b49606be63 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Pajak sosial atau fiskal
 SocialContributions=Pajak sosial atau fiskal
 SocialContributionsDeductibles=Pajak sosial atau fiskal yang dapat dikurangkan
 SocialContributionsNondeductibles=Pajak sosial atau fiskal yang tidak dapat dikurangi
+DateOfSocialContribution=Tanggal untuk pajak sosial atau fiskal
 LabelContrib=Kontribusi label
 TypeContrib=Ketik kontribusi
 MenuSpecialExpenses=Pengeluaran khusus
diff --git a/htdocs/langs/id_ID/contracts.lang b/htdocs/langs/id_ID/contracts.lang
index 956889624f2..d4c44c66371 100644
--- a/htdocs/langs/id_ID/contracts.lang
+++ b/htdocs/langs/id_ID/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Menjalankan layanan
 MenuExpiredServices=Layanan kedaluwarsa
 MenuClosedServices=Layanan tertutup
 NewContract=Kontrak baru
-NewContractSubscription=Kontrak / langganan baru
+NewContractSubscription=Kontrak baru atau langganan baru
 AddContract=Buat kontrak
 DeleteAContract=Hapus kontrak
 ActivateAllOnContract=Aktifkan semua layanan
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 01e1b2bd8fb..0d776c69a27 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Sintaks buruk untuk kode vendor
 ErrorSupplierCodeRequired=Diperlukan kode vendor
 ErrorSupplierCodeAlreadyUsed=Kode vendor sudah digunakan
 ErrorBadParameters=Parameter buruk
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Parameter salah atau hilang
 ErrorBadValueForParameter=Nilai salah '%s' untuk parameter '%s'
 ErrorBadImageFormat=File gambar tidak memiliki format yang didukung (PHP Anda tidak mendukung fungsi untuk mengonversi gambar dari format ini)
 ErrorBadDateFormat=Nilai '%s' memiliki format tanggal yang salah
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Nilai baru tidak bisa sama dengan nilai lama
 ErrorFailedToValidatePasswordReset=Gagal menginstal ulang kata sandi. Mungkin pengulangan sudah dilakukan (tautan ini hanya dapat digunakan satu kali). Jika tidak, coba restart proses reinit.
 ErrorToConnectToMysqlCheckInstance=Koneksi ke basis data gagal. Periksa server database sedang berjalan (misalnya, dengan mysql / mariadb, Anda dapat meluncurkannya dari baris perintah dengan 'sudo service mysql start').
 ErrorFailedToAddContact=Gagal menambahkan kontak
-ErrorDateMustBeBeforeToday=Tanggal tidak boleh lebih besar dari hari ini
+ErrorDateMustBeBeforeToday=Tanggal harus lebih rendah dari hari ini
+ErrorDateMustBeInFuture=Tanggal harus lebih besar dari hari ini
 ErrorPaymentModeDefinedToWithoutSetup=Mode pembayaran ditetapkan untuk mengetik %s tetapi pengaturan modul Faktur tidak selesai untuk menentukan informasi yang akan ditampilkan untuk mode pembayaran ini.
 ErrorPHPNeedModule=Kesalahan, PHP Anda harus memiliki modul<b>%s</b>diinstal untuk menggunakan fitur ini.
 ErrorOpenIDSetupNotComplete=Anda menyiapkan file konfigurasi Dolibarr untuk mengizinkan otentikasi OpenID, tetapi URL layanan OpenID tidak didefinisikan ke dalam konstanta %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Tidak ada jumlah yang cukup
 ErrorOnlyOneFieldForGroupByIsPossible=Hanya 1 bidang untuk 'Kelompokkan menurut' yang dimungkinkan (yang lain dibuang)
 ErrorTooManyDifferentValueForSelectedGroupBy=Ditemukan terlalu banyak nilai yang berbeda (lebih dari<b>%s </b>) untuk bidang '<b> %s </b>', jadi kami tidak dapat menggunakan grafik ', jadi kami tidak dapat menggunakan grafik', jadi kami tidak dapat menggunakan grafik ', jadi kami tidak dapat menggunakan grafik', jadi kami tidak dapat menggunakan grafik ', jadi kami tidak dapat menggunakan grafik', jadi kami tidak dapat menggunakan grafik ', jadi kami tidak dapat menggunakan grafik', jadi kami tidak dapat menggunakannya sebagai grafik ' Bidang 'Grup Menurut' telah dihapus. Mungkin Anda ingin menggunakannya sebagai X-Axis?
 ErrorReplaceStringEmpty=Kesalahan, string untuk diganti menjadi kosong
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parameter PHP Anda upload_max_filesize (%s) lebih tinggi dari parameter PHP post_max_size (%s). Ini bukan pengaturan yang konsisten.
 WarningPasswordSetWithNoAccount=Kata sandi ditetapkan untuk anggota ini. Namun, tidak ada akun pengguna yang dibuat. Jadi kata sandi ini disimpan tetapi tidak dapat digunakan untuk masuk ke Dolibarr. Ini dapat digunakan oleh modul / antarmuka eksternal tetapi jika Anda tidak perlu mendefinisikan login atau kata sandi untuk anggota, Anda dapat menonaktifkan opsi "Kelola login untuk setiap anggota" dari pengaturan modul Anggota. Jika Anda perlu mengelola login tetapi tidak memerlukan kata sandi, Anda dapat mengosongkan isian ini untuk menghindari peringatan ini. Catatan: Email juga dapat digunakan sebagai login jika anggota tersebut tertaut ke pengguna.
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index 283a6e10913..8d92bbbc9c4 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -15,7 +15,7 @@ CancelCP=Dibatalkan
 RefuseCP=Ditolak
 ValidatorCP=Penyetuju
 ListeCP=Daftar cuti
-Leave=Leave request
+Leave=Permintaan cuti pergi
 LeaveId=Tinggalkan ID
 ReviewedByCP=Akan disetujui oleh
 UserID=identitas pengguna
diff --git a/htdocs/langs/id_ID/languages.lang b/htdocs/langs/id_ID/languages.lang
index ce0c67973e3..e8207abbf96 100644
--- a/htdocs/langs/id_ID/languages.lang
+++ b/htdocs/langs/id_ID/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Etiopia
 Language_ar_AR=Arab
 Language_ar_EG=Arab (Mesir)
 Language_ar_SA=Arab
+Language_az_AZ=Azerbaijan
 Language_bn_BD=Bengal
+Language_bn_IN=Bengal (India)
 Language_bg_BG=Bulgaria
 Language_bs_BA=Bosnia
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=Inggris (United Kingdom)
 Language_en_IN=Inggris (India)
 Language_en_NZ=Inggris (Selandia Baru)
 Language_en_SA=Inggris (Saudi Arabia)
+Language_en_SG=Inggris (Singapura)
 Language_en_US=Inggris (Amerika Serikat)
 Language_en_ZA=Inggris (Afrika Selatan)
 Language_es_ES=Spanyol
@@ -29,6 +33,7 @@ Language_es_CL=Spanyol (Cili)
 Language_es_CO=Spanyol (Colombia)
 Language_es_DO=Spanyol (Republik Dominika)
 Language_es_EC=Spanyol (Ecuador)
+Language_es_GT=Spanyol (Guatemala)
 Language_es_HN=Spanyol (Honduras)
 Language_es_MX=Spanyol (Mexico)
 Language_es_PA=Spanyol (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanyol (Paraguay)
 Language_es_PE=Spanyol (Peru)
 Language_es_PR=Spanyol (Puerto Rico)
 Language_es_UY=Spanyol (Uruguay)
+Language_es_GT=Spanyol (Guatemala)
 Language_es_VE=Spanyol (Venezuela)
 Language_et_EE=Estonia
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finlandia
 Language_fr_BE=Perancis (Belgia)
 Language_fr_CA=Perancis (Kanada)
 Language_fr_CH=Perancis (Swiss)
+Language_fr_CI=Perancis (Pantai Gading)
+Language_fr_CM=Prancis (Kamerun)
 Language_fr_FR=Perancis
+Language_fr_GA=Perancis (Gabon)
 Language_fr_NC=Perancis (Kaledonia Baru)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisia
+Language_gl_ES=Galicia
 Language_he_IL=Ibrani
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Kroasia
 Language_hu_HU=Hongaria
 Language_id_ID=Indonesia
 Language_is_IS=Icelandic
 Language_it_IT=Italia
+Language_it_CH=Italia (Swiss)
 Language_ja_JP=Jepang
 Language_ka_GE=Georgia
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvia
 Language_mk_MK=Macedonia
 Language_mn_MN=Mongolia
 Language_nb_NO=Norwegia (Bokmål)
+Language_ne_NP=Nepal
 Language_nl_BE=Belanda (Belgia)
 Language_nl_NL=Belanda
 Language_pl_PL=Polandia
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnam
 Language_zh_CN=Cina
 Language_zh_TW=Cina (Tradisional)
+Language_zh_HK=China (Hong Kong)
 Language_bh_MY=Malaysia
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 4c387f53313..60dae133949 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Pengaturan Email Keluar (untuk modul %s)
 DefaultOutgoingEmailSetup=Pengaturan email keluar standar
 Information=Informasi
 ContactsWithThirdpartyFilter=Kontak dengan filter pihak ketiga
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 08a09b9fb3c..04dbbf3fcba 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=NAIK. (termasuk pajak)
 Amount=Jumlah
 AmountInvoice=Jumlah tagihan
 AmountInvoiced=Jumlah yang ditagih
-AmountInvoicedHT=Jumlah yang ditagih (termasuk pajak)
-AmountInvoicedTTC=Jumlah yang ditagih (tidak termasuk pajak)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Jumlah pembayaran
 AmountHTShort=Jumlah (tidak termasuk)
 AmountTTCShort=Jumlah (termasuk pajak)
@@ -485,6 +485,7 @@ Categories=Tag / kategori
 Category=Tag / kategori
 By=Oleh
 From=Dari
+FromDate=Dari
 FromLocation=Dari
 to=untuk
 To=untuk
@@ -687,6 +688,7 @@ Method=metode
 Receive=Menerima
 CompleteOrNoMoreReceptionExpected=Lengkap atau tidak ada yang lebih diharapkan
 ExpectedValue=Nilai yang diharapkan
+ExpectedQty=Expected Qty
 PartialWoman=Sebagian
 TotalWoman=Total
 NeverReceived=Tidak pernah menerima
@@ -703,6 +705,7 @@ MenuECM=Dokumen
 MenuAWStats=AWStats
 MenuMembers=Anggota
 MenuAgendaGoogle=Agenda Google
+MenuTaxesAndSpecialExpenses=Pajak | Pengeluaran khusus
 ThisLimitIsDefinedInSetup=Batas Dolibarr (Menu home-setup-security): %s Kb, batas PHP: %s Kb
 NoFileFound=Tidak ada dokumen yang disimpan dalam direktori ini
 CurrentUserLanguage=Bahasa saat ini
@@ -725,7 +728,7 @@ Page=Halaman
 Notes=Catatan
 AddNewLine=Tambahkan baris baru
 AddFile=Tambah berkas
-FreeZone=Bukan produk / layanan yang telah ditentukan
+FreeZone=Produk teks-bebas
 FreeLineOfType=Item teks bebas, ketik:
 CloneMainAttributes=Mengkloning objek dengan atribut utamanya
 ReGeneratePDF=Menghasilkan kembali PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Pilih templat email
 SetRef=Tetapkan ref
 Select2ResultFoundUseArrows=Beberapa hasil ditemukan. Gunakan panah untuk memilih.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Alihkan dalam mode edit untuk menambahkan terje
 NotUsedForThisCustomer=Tidak digunakan untuk pelanggan ini
 AmountMustBePositive=Jumlahnya harus positif
 ByStatus=Menurut status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index f4e764d5f61..81d24556342 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -81,7 +81,7 @@ DeleteType=Hapus
 VoteAllowed=Vote diizinkan
 Physical=Fisik
 Moral=Moral
-MorPhy=Moral / Fisik
+MorPhy=Nature
 Reenable=Diaktifkan kembali
 ResiliateMember=Hentikan anggota
 ConfirmResiliateMember=Anda yakin ingin memberhentikan anggota ini?
diff --git a/htdocs/langs/id_ID/mrp.lang b/htdocs/langs/id_ID/mrp.lang
index 21cb567fd68..5d0342b3136 100644
--- a/htdocs/langs/id_ID/mrp.lang
+++ b/htdocs/langs/id_ID/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Pesanan Manufaktur
 MO=Pesanan manufaktur
+MOs=Manufacturing orders
 MRPDescription=Modul untuk mengelola produksi dan Pesanan Manufaktur (MO).
 MRPArea=Area MRP
 MrpSetupPage=Pengaturan MRP modul
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index a4fc421b365..67d6dae2501 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Halo)__\n\nSilakan temukan pesanan kam
 PredefinedMailContentSendSupplierInvoice=__(Halo)__\n\nHarap temukan faktur __REF__ terlampir\n\n\n__ (Hormat) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Halo)__\n\nSilakan temukan pengiriman __REF__ terlampir\n\n\n__ (Hormat) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Halo)__\n\nSilakan temukan intervensi __REF__ terlampir\n\n\n__ (Hormat) __\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Halo)__\n\n\n__ (Hormat) __\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Halo)__\n\n\n__ (Hormat) __\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Halo)__\n\n\n__ (Hormat) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Anda dapat mengklik tautan di bawah untuk melakukan pembayaran jika belum dilakukan.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr adalah ERP / CRM ringkas yang mendukung beberapa modul bisnis. Demo yang menampilkan semua modul tidak masuk akal karena skenario ini tidak pernah terjadi (beberapa ratus tersedia). Jadi, beberapa profil demo tersedia.
 ChooseYourDemoProfil=Pilih profil demo yang paling sesuai dengan kebutuhan Anda ...
 ChooseYourDemoProfilMore=... atau buat profil Anda sendiri <br> (pemilihan modul manual)
@@ -280,7 +278,9 @@ LinesToImport=Baris untuk diimpor
 
 MemoryUsage=Penggunaan memori
 RequestDuration=Durasi permintaan
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Produk / Layanan berdasarkan popularitas dalam Proposal
 PopuCom=Produk / Layanan berdasarkan popularitas dalam Pesanan
 ProductStatistics=Statistik Produk / Layanan
 NbOfQtyInOrders=Jumlah pesanan
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 19e3cf56893..651f6e9750e 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Setel jenis barcode
 BarcodeValue=Nilai barcode
 NoteNotVisibleOnBill=Catatan (tidak terlihat pada faktur, proposal ...)
 ServiceLimitedDuration=Jika produk adalah layanan dengan durasi terbatas:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Beberapa segmen harga per produk / layanan (setiap pelanggan berada dalam satu segmen harga)
 MultiPricesNumPrices=Jumlah harga
 DefaultPriceType=Basis harga per default (dengan versus tanpa pajak) saat menambahkan harga jual baru
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Harga vendor (produk atau layanan)
 CustomCode=Bea Cukai / Komoditas / kode HS
 CountryOrigin=Negara Asal
 Nature=Sifat produk (bahan / selesai)
+NatureOfProductShort=Sifat produk
+NatureOfProductDesc=Bahan baku mentah atau produk jadi
 ShortLabel=Label pendek
 Unit=Satuan
 p=kamu
@@ -359,6 +362,9 @@ SelectCombination=Pilih kombinasi
 ProductCombinationGenerator=Generator varian
 Features=fitur
 PriceImpact=Dampak harga
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Dampak berat
 NewProductAttribute=Atribut baru
 NewProductAttributeValue=Nilai atribut baru
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index a36b442b9f8..51c8fa22f38 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Penyumbang
 TypeContact_project_task_external_TASKCONTRIBUTOR=Penyumbang
 SelectElement=Pilih elemen
 AddElement=Tautan ke elemen
+LinkToElementShort=Tautan ke
 # Documents models
 DocumentModelBeluga=Templat dokumen proyek untuk ikhtisar objek yang ditautkan
 DocumentModelBaleine=Templat dokumen proyek untuk tugas-tugas
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Jumlah proyek yang dibuat berdasarkan bulan
 ProjectNbTaskByMonth=Jumlah tugas yang dibuat berdasarkan bulan
 ProjectOppAmountOfProjectsByMonth=Jumlah lead menurut bulan
 ProjectWeightedOppAmountOfProjectsByMonth=Jumlah timah tertimbang menurut bulan
-ProjectOpenedProjectByOppStatus=Buka proyek / pimpin dengan status pimpin
-ProjectsStatistics=Statistik proyek / prospek
-TasksStatistics=Statistik proyek / tugas utama
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Tugas yang diberikan. Memasukkan waktu pada tugas ini harus dimungkinkan.
 IdTaskTime=Waktu tugas id
 YouCanCompleteRef=Jika Anda ingin melengkapi ref dengan suffix, disarankan untuk menambahkan karakter untuk memisahkannya, sehingga penomoran otomatis akan tetap berfungsi dengan benar untuk proyek selanjutnya. Misalnya %s-MYSUFFIX
diff --git a/htdocs/langs/id_ID/recruitment.lang b/htdocs/langs/id_ID/recruitment.lang
new file mode 100644
index 00000000000..c0e50f5ddcf
--- /dev/null
+++ b/htdocs/langs/id_ID/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Pengaturan
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 50602be7c9d..51b9473c02a 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Batalkan pengiriman
 DeleteSending=Hapus pengiriman
 Stock=Persediaan
 Stocks=Stok
-MissingStocks=Missing stocks
-StockAtDate=Tanggal Pengadaan 
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Stok yang hilang
+StockAtDate=Stok pada tanggal
+StockAtDateInPast=Tanggal di saat lalu
+StockAtDateInFuture=Tanggal di saat mendatang
 StocksByLotSerial=Stok berdasarkan lot/serial
 LotSerial=Lot/Serial
 LotSerialList=Daftar lot/serial
@@ -34,7 +34,7 @@ StockMovementForId=ID Gerakan %d
 ListMouvementStockProject=Daftar pergerakan stok yang terkait dengan proyek
 StocksArea=Area gudang
 AllWarehouses=Semua gudang
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Termasuk juga stok yang tidak ditentukan
 IncludeAlsoDraftOrders=Sertakan juga konsep pesanan
 Location=Tempat
 LocationSummary=Lokasi nama pendek
@@ -95,14 +95,16 @@ RealStock=Stok nyata
 RealStockDesc=Stok fisik/nyata adalah stok saat ini di gudang.
 RealStockWillAutomaticallyWhen=Stok nyata akan dimodifikasi sesuai dengan aturan ini (sebagaimana didefinisikan dalam modul Stok):
 VirtualStock=Stok virtual
-VirtualStockDesc=Stok virtual adalah stok terhitung yang tersedia setelah semua tindakan terbuka/tertunda (yang memengaruhi stok) ditutup (pesanan pembelian diterima, pesanan penjualan dikirim, dll.)
+VirtualStockAtDate=Stok virtual pda tanggal
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Stock virtual adalah stok terhitung yang tersedia setelah semua tindakan yang terbuka/tertunda (yang mempengaruhi stok) ditutup (pesanan pembelian diterima, pesanan penjualan dikirim, pesanan manufaktur diproduksi, dll)
 IdWarehouse=Gudang id
 DescWareHouse=Deskripsi gudang
 LieuWareHouse=Gudang lokalisasi
 WarehousesAndProducts=Gudang dan produk
 WarehousesAndProductsBatchDetail=Gudang dan produk (dengan detail per lot/serial)
-AverageUnitPricePMPShort=Harga input rata-rata tertimbang
-AverageUnitPricePMP=Harga input rata-rata tertimbang
+AverageUnitPricePMPShort=Harga rata-rata yang ditimbang
+AverageUnitPricePMPDesc=Input harga rata-rata unit yang harus dibayarkan kepada pemasok untuk memasukkan produk ke dalam stok.
 SellPriceMin=Harga Jual Unit
 EstimatedStockValueSellShort=Nilai jual
 EstimatedStockValueSell=Nilai jual
@@ -130,7 +132,7 @@ CurentlyUsingPhysicalStock=Stok fisik
 RuleForStockReplenishment=Aturan untuk pengisian kembali stok
 SelectProductWithNotNullQty=Pilih setidaknya satu produk dengan jumlah bukan nol dan vendor
 AlertOnly= Hanya peringatan
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Sertakan juga stok negatif untuk produk yang jumlah yang diinginkan tidak didefinisikan, untuk mengembalikannya ke 0
 WarehouseForStockDecrease=Gudang<b>%s</b>akan digunakan untuk penurunan stok
 WarehouseForStockIncrease=Gudang<b>%s</b>akan digunakan untuk peningkatan stok
 ForThisWarehouse=Untuk gudang ini
@@ -141,7 +143,7 @@ Replenishments=Pengisian ulang
 NbOfProductBeforePeriod=Jumlah produk %s dalam stok sebelum periode yang dipilih (<%s)
 NbOfProductAfterPeriod=Jumlah produk %s dalam persediaan setelah periode yang dipilih (> %s)
 MassMovement=Gerakan massa
-SelectProductInAndOutWareHouse=Pilih produk, jumlah, gudang sumber dan gudang target, lalu klik "%s". Setelah ini dilakukan untuk semua gerakan yang diperlukan, klik pada "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Rekam transfer
 ReceivingForSameOrder=Tanda terima untuk pesanan ini
 StockMovementRecorded=Pergerakan stok tercatat
@@ -234,4 +236,7 @@ ForceTo=Dipaksa untuk
 AlwaysShowFullArbo=Tampilkan daftar lengkap gudang di sembulan tautan gudang (Peringatan: Ini dapat menurunkan kinerja secara dramatis)
 StockAtDatePastDesc=Disini Anda dapat melihat pengadaan (pengadaan asli) pada waktu di kemudian hari
 StockAtDateFutureDesc=Disini Anda dapat melihat pengadaan (pengadaan virtual) pada waktu di kemudian hari
-CurrentStock=Current stock
+CurrentStock=Stok saat ini
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 7896a6c8610..767dcf77087 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Kualitas rendah
 ReputationForThisProduct=Reputasi
 BuyerName=Nama pembeli
 AllProductServicePrices=Semua harga produk / layanan
-AllProductReferencesOfSupplier=Semua referensi produk / layanan vendor
+AllProductReferencesOfSupplier=Semua referensi untuk vendor
 BuyingPriceNumShort=Harga penjual
diff --git a/htdocs/langs/id_ID/ticket.lang b/htdocs/langs/id_ID/ticket.lang
index 43561ccb0c5..d8bc9fd797a 100644
--- a/htdocs/langs/id_ID/ticket.lang
+++ b/htdocs/langs/id_ID/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Dihapus
 
 # Dict
 Type=Tipe
-Category=Kode analitik
 Severity=Kerasnya
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Secara otomatis menetapkan pengguna yang membuat tiket
 TicketsAutoAssignTicketHelp=Saat membuat tiket, pengguna dapat secara otomatis ditugaskan ke tiket.
 TicketNumberingModules=Modul penomoran tiket
 TicketNotifyTiersAtCreation=Beri tahu pihak ketiga saat membuat
-TicketGroup=Kelompok
 TicketsDisableCustomerEmail=Selalu nonaktifkan email saat tiket dibuat dari antarmuka publik
 TicketsPublicNotificationNewMessage=Kirim email saat pesan baru ditambahkan
 TicketsPublicNotificationNewMessageHelp=Kirim email ketika pesan baru ditambahkan dari antarmuka publik (ke pengguna yang ditetapkan atau email notifikasi ke (pembaruan) dan/atau email notifikasi ke)
@@ -162,7 +160,7 @@ CreatedBy=Dibuat oleh
 NewTicket=Tiket Baru
 SubjectAnswerToTicket=Jawaban tiket
 TicketTypeRequest=Jenis permintaan
-TicketCategory=Kode analitik
+TicketCategory=Group
 SeeTicket=Lihat tiket
 TicketMarkedAsRead=Tiket telah ditandai sebagai sudah dibaca
 TicketReadOn=Baca terus
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index 001508ab4fc..8a5d6ee6cdc 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Dinonaktifkan dalam mode pemeliharaan
 UserAccountancyCode=Kode akuntansi pengguna
 UserLogoff=Logout pengguna
 UserLogged=Pengguna login
+DateOfEmployment=Tanggal masuk kerja
 DateEmployment=Tanggal Mulai Pekerjaan
 DateEmploymentEnd=Tanggal Akhir Pekerjaan
 CantDisableYourself=Anda tidak dapat menonaktifkan catatan pengguna Anda sendiri
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Validator permintaan cuti paksa
 ValidatorIsSupervisorByDefault=Secara default, validator adalah pengawas pengguna. Tetap kosong untuk menjaga perilaku ini.
 UserPersonalEmail=Email pribadi
 UserPersonalMobile=Ponsel pribadi
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index 688e56c7a0f..1ff4c8b5eef 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -10,8 +10,8 @@ PaymentByBankTransferReceipts=Pesanan transfer kredit
 PaymentByBankTransferLines=Jalur pemesanan transfer kredit
 WithdrawalsReceipts=Pesanan debit langsung
 WithdrawalReceipt=Pesanan debit langsung
-BankTransferReceipts=Credit transfer order
-BankTransferReceipt=Credit transfer order
+BankTransferReceipts=Pesanan transfer kredit
+BankTransferReceipt=Pesanan transfer kredit
 LatestBankTransferReceipts=Pesanan transfer kredit %s terbaru
 LastWithdrawalReceipts=File debit langsung %s terbaru
 WithdrawalsLine=Jalur pemesanan debit langsung
@@ -63,7 +63,9 @@ InvoiceRefused=Faktur ditolak (Mengisi daya penolakan untuk pelanggan)
 StatusDebitCredit=Debit status / kredit
 StatusWaiting=Menunggu
 StatusTrans=Terkirim
+StatusDebited=Debited
 StatusCredited=Dikreditkan
+StatusPaid=Dibayar
 StatusRefused=Ditolak
 StatusMotif0=Tidak ditentukan
 StatusMotif1=Dana tidak mencukupi
@@ -77,13 +79,13 @@ StatusMotif8=Alasan lain
 CreateForSepaFRST=Buat file debit langsung (SEPA FRST)
 CreateForSepaRCUR=Buat file debit langsung (SEPA RCUR)
 CreateAll=Buat file debit langsung (semua)
-CreateFileForPaymentByBankTransfer=Buat transfer kredit (semua)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Buat file transfer kredit (SEPA)
 CreateGuichet=Hanya kantor
 CreateBanque=Hanya bank
 OrderWaiting=Menunggu perawatan
-NotifyTransmision=Penarikan Penarikan
-NotifyCredit=Kredit Penarikan
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Nomor Pemancar Nasional
 WithBankUsingRIB=Untuk rekening bank menggunakan RIB
 WithBankUsingBANBIC=Untuk rekening bank menggunakan IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Kredit aktif
 WithdrawalFileNotCapable=Tidak dapat membuat file tanda terima penarikan untuk negara Anda %s (Negara Anda tidak didukung)
 ShowWithdraw=Tampilkan Pesanan Debit Langsung
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Namun, jika faktur memiliki setidaknya satu pesanan pembayaran debit langsung belum diproses, itu tidak akan ditetapkan sebagai dibayar untuk memungkinkan manajemen penarikan sebelumnya.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=File penarikan
+DoStandingOrdersBeforePayments=Tab ini memungkinkan Anda untuk meminta pesanan pembayaran debit langsung. Setelah selesai, masuk ke menu Bank->Pembayaran dengan debit langsung untuk menghasilkan dan mengelola pesanan debit langsung. Ketika pesanan debit langsung ditutup, pembayaran pada faktur akan secara otomatis dicatat, dan faktur ditutup jika sisa untuk membayar adalah nol.
+DoCreditTransferBeforePayments=Tab ini memungkinkan Anda untuk meminta pesanan transfer kredit. Setelah selesai, masuk ke menu Bank->Pembayaran dengan transfer kredit untuk menghasilkan dan mengelola pesanan transfer kredit. Ketika pesanan transfer kredit ditutup, pembayaran pada faktur akan secara otomatis dicatat, dan faktur ditutup jika sisa untuk dibayarkan adalah nol.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Setel ke status "File Terkirim"
 ThisWillAlsoAddPaymentOnInvoice=Ini juga akan mencatat pembayaran pada faktur dan akan mengklasifikasikannya sebagai "Dibayar" jika tetap membayar nol
 StatisticsByLineStatus=Statistik berdasarkan status garis
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Jenis pembayaran
 ModeRECUR=Pembayaran berulang
 ModeFRST=Pembayaran satu kali
 PleaseCheckOne=Silakan periksa satu saja
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Pesanan debit langsung %s dibuat
 AmountRequested=Jumlah yang diminta
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Jumlah: %s <br> Metode: %s <br> Tanggal: %s
 InfoRejectSubject=Pesanan pembayaran debit langsung ditolak
 InfoRejectMessage=Halo, <br> <br>, urutan pembayaran debit langsung dari %s yang terkait dengan perusahaan %s, dengan jumlah %s telah ditolak oleh bank. <br> <br> - <br> %s
 ModeWarning=Opsi untuk mode nyata tidak disetel, kami berhenti setelah simulasi ini
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/id_ID/workflow.lang b/htdocs/langs/id_ID/workflow.lang
index 73e791c1df2..eab46445c72 100644
--- a/htdocs/langs/id_ID/workflow.lang
+++ b/htdocs/langs/id_ID/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klasifikasi sumber pesanan penjuala
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klasifikasi sumber proposal vendor tautan sebagai tertagih ketika faktur vendor divalidasi (dan jika jumlah faktur sama dengan jumlah total proposal tautan)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klasifikasi sumber pesanan pembelian tautan sebagai tertagih saat faktur vendor divalidasi (dan jika jumlah faktur sama dengan jumlah total pesanan tautan)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Pembuatan Otomatis
 AutomaticClassification=Pengklasifikasian Otomatis
diff --git a/htdocs/langs/id_ID/zapier.lang b/htdocs/langs/id_ID/zapier.lang
index 456834e54f3..c0506eac4b9 100644
--- a/htdocs/langs/id_ID/zapier.lang
+++ b/htdocs/langs/id_ID/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier untuk modul Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Pengaturan Zapier untuk Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 550e48b1aa1..43dcc6fc6fe 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 322da7fd011..c9e545315ad 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Lögun er ekki í boði á Unix eins og kerfum. Próf sendmail program staðnum.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module skipulag
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Kerfi
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Lykill að tryggja vefslóðir
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=Skoða sem PDF skjal
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Strikamerki er stjórnun
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sameining
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Búa til / breyta þjónusta
 Permission534=Eyða þjónustu
 Permission536=Sjá / stjórna falinn þjónusta
 Permission538=Útflutningur þjónustu
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Lesa Fjárframlög
 Permission702=Búa til / breyta framlög
 Permission703=Eyða Fjárframlög
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Lesa fiskistofna
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Skipulag skjöl framkvæmdarstjóra
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect möguleiki
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Svæði
 DictionaryCountry=Lönd
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Einingar
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect stöðu
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Varanleg leita mynd til vinstri valmynd
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Smelltu til að hringja mát skipulag
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Samningar
+MailToSendReception=Receptions
 MailToThirdparty=Í þriðja aðila
 MailToMember=Meðlimir
 MailToUser=Notendur
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index 9feadc98a82..88b56616ee0 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=Listi yfir atburði
 EventReports=Event reports
 Location=Staðsetning
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Atburður á fullu dag
 MenuToDoActions=Allar ófullnægjandi aðgerðir
 MenuDoneActions=Allir ljúka aðgerðum
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index 2a559529900..d1b8a7367be 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=reikninga viðskiptavinar
 ForCustomersOrders=Customers orders
 ForProposals=Tillögur
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Bókhalds
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index 929f539b31c..e5ac19f8ff5 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index 82960faedfc..8a3d0831930 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang
index 1a032710f88..5c6e41b7281 100644
--- a/htdocs/langs/is_IS/contracts.lang
+++ b/htdocs/langs/is_IS/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running þjónusta
 MenuExpiredServices=Útrunninn þjónusta
 MenuClosedServices=Lokað þjónusta
 NewContract=Nýr samningur
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Eyða samning
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 114dc9762e2..05a5bca9bb6 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/is_IS/languages.lang b/htdocs/langs/is_IS/languages.lang
index ec6b3a1bc4a..d68088905cb 100644
--- a/htdocs/langs/is_IS/languages.lang
+++ b/htdocs/langs/is_IS/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabíska
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosníska
 Language_ca_ES=Katalónska
@@ -20,6 +23,7 @@ Language_en_GB=Enska (Bretland)
 Language_en_IN=Enska (Indland)
 Language_en_NZ=Enska (Nýja Sjáland)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=Enska (United States)
 Language_en_ZA=English (Suður Afríka)
 Language_es_ES=Spænska
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spænska (Hondúras)
 Language_es_MX=Spænska (Mexíkó)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spænska (Paraguay)
 Language_es_PE=Spænska (Peru)
 Language_es_PR=Spænska (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Eistneska
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Franska (Belgíu)
 Language_fr_CA=Franska (Kanada)
 Language_fr_CH=Franska (Sviss)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Franska
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Franska (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebreska
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Króatíska
 Language_hu_HU=Ungverska
 Language_id_ID=Indonesian
 Language_is_IS=Íslenska
 Language_it_IT=Italien
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanska
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Lettneska
 Language_mk_MK=Makedónska
 Language_mn_MN=Mongolian
 Language_nb_NO=Norska (bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Hollenska (Belgíu)
 Language_nl_NL=Dutch
 Language_pl_PL=Pólska
@@ -86,4 +100,5 @@ Language_uz_UZ=Úsbekska
 Language_vi_VN=Víetnamska
 Language_zh_CN=Kínverska
 Language_zh_TW=Kínversku (hefðbundinni)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index fd2e406a2e5..0c77e81bb81 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 0521eea26e8..278c752c71e 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Upphæð
 AmountInvoice=Invoice upphæð
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Upphæð greiðslu
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Magn (Inc skatt)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=Með því að
 From=Frá
+FromDate=Frá
 FromLocation=Frá
 to=til
 To=til
@@ -687,6 +688,7 @@ Method=Aðferð
 Receive=Fá
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Samtals
 NeverReceived=Aldrei fengið
@@ -703,6 +705,7 @@ MenuECM=Skjöl
 MenuAWStats=Awstats
 MenuMembers=Members
 MenuAgendaGoogle=Google dagskrá
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr takmörk (Valmynd heim-skipulag-öryggi): %s  KB, PHP takmörk: %s  Kb
 NoFileFound=Engin skjöl sem vistuð eru í þessari möppu
 CurrentUserLanguage=Valið tungumál
@@ -725,7 +728,7 @@ Page=Page
 Notes=Skýringar
 AddNewLine=Bæta við nýjum línu
 AddFile=Bæta við skrá
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Klóna mótmæla við helstu eiginleika hennar
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index 464075592a6..1cc3a24b389 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Drög að meðlimir
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Staðfest
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New framlag
 PaymentSubscription=New framlag greiðslu
 SubscriptionEndDate=enda áskrift er dagsetning
@@ -78,7 +81,7 @@ DeleteType=Eyða
 VoteAllowed=Vote leyfðar
 Physical=Líkamleg
 Moral=Moral
-MorPhy=Boðskapur / Líkamleg
+MorPhy=Náttúra
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/is_IS/mrp.lang b/htdocs/langs/is_IS/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/is_IS/mrp.lang
+++ b/htdocs/langs/is_IS/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index b43adbb2145..6eef3ff2036 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 88a288ac601..096639572fb 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Setja barcode tegund
 BarcodeValue=Strikamerki gildi
 NoteNotVisibleOnBill=Ath (ekki sýnilegt á reikningum, tillögur ...)
 ServiceLimitedDuration=Ef varan er þjónusta við takmarkaðan tíma:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Fjöldi verð
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Uppruni land
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Nýtt eiginleiki
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index f7a6ebd6bac..f48818ff1f4 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Framlög
 TypeContact_project_task_external_TASKCONTRIBUTOR=Framlög
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/is_IS/recruitment.lang b/htdocs/langs/is_IS/recruitment.lang
new file mode 100644
index 00000000000..b9e943394df
--- /dev/null
+++ b/htdocs/langs/is_IS/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Um
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 514a94e9cad..b6b8134e906 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Eyða sendingu
 Stock=Stock
 Stocks=Verðbréf
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real lager
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual Stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Auðkenni vörugeymsla
 DescWareHouse=Lýsing vörugeymsla
 LieuWareHouse=Staðsetning lager
 WarehousesAndProducts=Vöruhús og vörur
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Meðaltal inntak verð
-AverageUnitPricePMP=Meðaltal inntak verð
+AverageUnitPricePMPShort=Vegið meðalverð
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selja Unit verð
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 2a7f274f323..48d3a288d16 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Þessi tilvísun birgir er nú þegar tengt með tilvísun: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Framboð
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Samþykkja þessari röð
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/is_IS/ticket.lang b/htdocs/langs/is_IS/ticket.lang
index 007b2aa8c95..956e3b0a629 100644
--- a/htdocs/langs/is_IS/ticket.lang
+++ b/htdocs/langs/is_IS/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Tegund
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index 3d4566f6abf..faca236ce4c 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Búið notandi vilja vera ytri notandi (vegna þess að t
 IdPhoneCaller=Auðkenni sími sem hringir
 NewUserCreated=User %s  búinn til
 NewUserPassword=Lykilorð breyta fyrir %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s  breytt
 UserDisabled=User %s  fatlaðra
 UserEnabled=User %s  virkjaður
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 0fa903b80ae..755bbeb6aee 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Bíð
 StatusTrans=Senda
+StatusDebited=Debited
 StatusCredited=Trúnaður
+StatusPaid=Greiddur
 StatusRefused=Neitaði
 StatusMotif0=Ótilgreint
 StatusMotif1=Kveða insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=Aðrar ástæður
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Aðeins skrifstofa
 CreateBanque=Eini bankinn
 OrderWaiting=Beðið eftir meðferð
-NotifyTransmision=Uppsögn Sending
-NotifyCredit=Uppsögn Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Sendandi Fjöldi
 WithBankUsingRIB=Fyrir bankareikninga með RIB
 WithBankUsingBANBIC=Fyrir bankareikninga með IBAN / BIC / Swift
@@ -93,9 +95,10 @@ CreditDate=Útlán á
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Upphæð: %s <br> Metode: %s <br> Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Valkostur fyrir alvöru ham var ekki sett, að hætta við eftir þessa uppgerð
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/is_IS/workflow.lang b/htdocs/langs/is_IS/workflow.lang
index 47aff549487..8f682447322 100644
--- a/htdocs/langs/is_IS/workflow.lang
+++ b/htdocs/langs/is_IS/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Vinnuflæði mát skipulag
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/is_IS/zapier.lang b/htdocs/langs/is_IS/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/is_IS/zapier.lang
+++ b/htdocs/langs/is_IS/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/it_CH/admin.lang b/htdocs/langs/it_CH/admin.lang
new file mode 100644
index 00000000000..c1d306ec390
--- /dev/null
+++ b/htdocs/langs/it_CH/admin.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - admin
+OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+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.
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 10e9a0d170d..781085f58c4 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -58,8 +58,8 @@ AccountancyAreaDescActionOnceBis=I prossimi passi dovrebbero essere fatti per fa
 AccountancyAreaDescActionFreq=Le seguenti azioni vengono di solito eseguite ogni mese, settimana o giorno per le grandi compagnie...
 
 AccountancyAreaDescJournalSetup=PASSO %s: Crea o controlla il contenuto del tuo elenco del giornale dal menu %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescChartModel=PASSAGGIO %s: verifica l'esistenza di un modello di piano dei conti o creane uno dal menu %s
+AccountancyAreaDescChart=PASSAGGIO %s: selezionare e/o completare il piano dei conti dal menu %s
 
 AccountancyAreaDescVat=STEP %s: Definisci le voci del piano dei conti per ogni IVA/tassa. Per fare ciò usa il menu %s.
 AccountancyAreaDescDefault=STEP %s: Definisci gli account di contabilità di default. Per questo, usa la voce menù %s.
@@ -121,7 +121,7 @@ InvoiceLinesDone=Righe di fatture bloccate
 ExpenseReportLines=Linee di note spese da associare
 ExpenseReportLinesDone=Linee vincolate di note spese
 IntoAccount=Collega linee con il piano dei conti
-TotalForAccount=Total for accounting account
+TotalForAccount=Totale per conto contabile
 
 
 Ventilate=Associa
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Consentire di gestire un diverso numero di zeri alla fine
 BANK_DISABLE_DIRECT_INPUT=Disabilita la registrazione diretta della transazione nel conto bancario
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Abilita la bozza di esportazione sul giornale
 ACCOUNTANCY_COMBO_FOR_AUX=Abilita l'elenco combinato per il conto secondario (potrebbe essere lento se hai un sacco di terze parti)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Giornale Vendite
 ACCOUNTING_PURCHASE_JOURNAL=Giornale Acquisti
@@ -169,15 +170,15 @@ DONATION_ACCOUNTINGACCOUNT=Conto di contabilità per registrare le donazioni
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conto contabile per registrare gli abbonamenti
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conto di contabilità predefinito per i prodotti acquistati (se non definito nella scheda prodotto)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conto contabile predefinito per i prodotti acquistati in CEE (usato se non definito nella scheda prodotto)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Conto contabile predefinito per i prodotti acquistati e importati al di fuori della CEE (usato se non definito nella scheda prodotto)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conto di contabilità predefinito per i prodotti venduti (se non definito nella scheda prodotto)
 ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Conto contabile per impostazione predefinita per i prodotti venduti in CEE (utilizzato se non definito nella scheda prodotto)
 ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Conto contabile per impostazione predefinita per l'esportazione dei prodotti venduti fuori dalla CEE (utilizzato se non definito nella scheda prodotto)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Conto di contabilità per impostazione predefinita per i servizi acquistati (utilizzato se non definito nel foglio di servizio)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Conto contabile per impostazione predefinita per i servizi acquistati in CEE (usato se non definito nel foglio di servizio)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Conto contabile per impostazione predefinita per i servizi acquistati e importati al di fuori della CEE (usato se non definito nel foglio di servizio)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conto di contabilità per impostazione predefinita per i servizi venduti (utilizzato se non definito nel foglio di servizio)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conto contabile predefinito per i servizi venduti nella CEE (solo se non definito nella scheda servizio)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Conto contabile predefinito per i servizi venduti ed esportati fuori dalla CEE (solo se non definito nella scheda servizio)
@@ -230,19 +231,19 @@ ListAccounts=Lista delle voci del piano dei conti
 UnknownAccountForThirdparty=Conto di terze parti sconosciuto. Useremo %s
 UnknownAccountForThirdpartyBlocking=Conto di terze parti sconosciuto. Errore di blocco
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Conto di terzi non definito o sconosciuto. Useremo %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Third-party unknown and subledger not defined on the payment. We will keep the subledger account value empty.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terze parti sconosciuta e sottoconti non definiti nel pagamento. Manterremo vuoto il valore sottoconto dell'account.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Third-party account not defined or third party unknown. Blocking error.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
-OpeningBalance=Opening balance
+OpeningBalance=Saldo di apertura
 ShowOpeningBalance=Mostra bilancio di apertura
 HideOpeningBalance=Nascondi bilancio di apertura
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Mostra totale parziale per gruppo
 
 Pcgtype=Gruppo di conto
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Il gruppo di conti viene utilizzato come criterio 'filtro' e 'raggruppamento' predefiniti per alcuni report contabili. Ad esempio, "REDDITO" o "SPESA" sono utilizzati come gruppi per la contabilità dei prodotti per creare il rapporto spese / entrate.
 
-Reconcilable=Reconcilable
+Reconcilable=riconciliabile
 
 TotalVente=Fatturato totale al lordo delle imposte
 TotalMarge=Margine totale sulle vendite
@@ -284,6 +285,7 @@ ShowTutorial=Mostra tutorial
 NotReconciled=Non conciliata
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Applica categorie di massa
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
@@ -291,7 +293,7 @@ AccountingJournals=Libri contabili
 AccountingJournal=Accounting journal
 NewAccountingJournal=New accounting journal
 ShowAccountingJournal=Mostra diario contabile
-NatureOfJournal=Nature of Journal
+NatureOfJournal=Natura del diario
 AccountingJournalType1=Miscellaneous operations
 AccountingJournalType2=Vendite
 AccountingJournalType3=Acquisti
@@ -317,13 +319,13 @@ Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
 Modelcsv_agiris=Export for Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_LDCompta=Esporta per LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Esporta per LD Compta (v10 e successive)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
 Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
-Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
+Modelcsv_winfic=Esporta Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Id Piano dei Conti
 
 ## Tools - Init accounting account on product / service
@@ -336,14 +338,14 @@ OptionModeProductSell=Modalità vendita
 OptionModeProductSellIntra=Mode sales exported in EEC
 OptionModeProductSellExport=Mode sales exported in other countries
 OptionModeProductBuy=Modalità acquisto
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductBuyIntra=Acquisti in modalità importati in CEE
+OptionModeProductBuyExport=Modalità acquistata importata da altri paesi
 OptionModeProductSellDesc=Show all products with accounting account for sales.
 OptionModeProductSellIntraDesc=Show all products with accounting account for sales in EEC.
 OptionModeProductSellExportDesc=Show all products with accounting account for other foreign sales.
 OptionModeProductBuyDesc=Show all products with accounting account for purchases.
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+OptionModeProductBuyIntraDesc=Mostra tutti i prodotti con conto contabile per gli acquisti in CEE.
+OptionModeProductBuyExportDesc=Mostra tutti i prodotti con conto contabile per altri acquisti esteri.
 CleanFixHistory=Remove accounting code from lines that not exists into charts of account
 CleanHistory=Resetta tutti i collegamenti per l'anno corrente
 PredefinedGroups=Gruppi predefiniti
@@ -354,8 +356,8 @@ AccountRemovedFromGroup=Account removed from group
 SaleLocal=Local sale
 SaleExport=Export sale
 SaleEEC=Sale in EEC
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+SaleEECWithVAT=Vendita in CEE con IVA non nulla, quindi supponiamo che questa NON sia una vendita intracomunitaria e l'account suggerito sia l'account standard del prodotto.
+SaleEECWithoutVATNumber=La vendita nella CEE senza IVA ma la partita IVA di terzi non è definita. Eseguiamo il fallback sull'account del prodotto per le vendite standard. È possibile correggere l'ID IVA di terze parti o l'account del prodotto, se necessario.
 
 ## Dictionary
 Range=Range of accounting account
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index a17250cef75..ba994d63003 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -40,7 +40,7 @@ WebUserGroup=Utente/gruppo del server web (per esempio www-data)
 NoSessionFound=La tua configurazione PHP sembra non permetta di mostrare le sessioni attive. La directory utilizzata per salvare le sessioni (<b>%s</b>) potrebbe non essere protetta (per esempio tramite permessi SO oppure dalla direttiva PHP open_basedir).
 DBStoringCharset=Charset per il salvataggio dei dati nel database
 DBSortingCharset=Set di caratteri del database per ordinare i dati
-HostCharset=Host charset
+HostCharset=Set di caratteri host
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=Il modulo <b> %s </b> deve essere attivato
@@ -219,7 +219,7 @@ Nouveauté=Novità
 AchatTelechargement=Aquista / Scarica
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Elenco delle società che forniscono moduli o funzionalità sviluppati su misura. <br> Nota: poiché Dolibarr è un'applicazione open source, <i> chiunque </i> esperto nella programmazione PHP dovrebbe essere in grado di sviluppare un modulo.
 WebSiteDesc=Siti web esterni per ulteriori moduli add-on (non essenziali)...
 DevelopYourModuleDesc=Spunti per sviluppare il tuo modulo...
 URL=Collegamento
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Email predefinita del mittente per l'invio manuale (e
 UserEmail=Email utente
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Funzione non disponibile sui sistemi Linux. Viene usato il server di posta installato sul server (es. sendmail).
+FixOnTransifex=Correggi la traduzione sulla piattaforma di traduzione online del progetto
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Se la traduzione per questa lingua non è completa o trovi degli errori, puoi correggere i file presenti nella directory <b>langs/%s</b> e pubblicare i file modificati su dolibarr.org/forum oppure, se sei uno sviluppatore, su github.com/Dolibarr/dolibarr
+SubmitTranslationENUS=Se la traduzione per questa lingua non è completa o trovi errori, puoi correggerla modificando i file nella directory <b> langs / %s </b> e inviare i file modificati su dolibarr.org/forum o, se sei uno sviluppatore, con un PR su github.com/Dolibarr/Dolibarr
 ModuleSetup=Impostazioni modulo
 ModulesSetup=Impostazione Modulo/Applicazione
 ModuleFamilyBase=Sistema
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Il modulo <b>%s</b> deve prima essere attivato per pote
 SecurityToken=Token di sicurezza
 NoSmsEngine=Nessun gestore mittente SMS disponibile. Un gestore mittente SMS non è installato con la distribuzione predefinita perché dipendono da un fornitore esterno, ma puoi trovarne alcuni su %s
 PDF=PDF
-PDFDesc=Opzioni globali per la generazione di PDF.
-PDFAddressForging=Regole per i box degli indirizzi sui documenti pdf
+PDFDesc=Opzioni globali per la generazione di PDF
+PDFAddressForging=Regole per la sezione degli indirizzi
 HideAnyVATInformationOnPDF=Nascondi tutte le informazioni relative all'IVA sui pdf generati.
 PDFRulesForSalesTax=Regole per tasse sulla vendita/IVA
 PDFLocaltax=Regole per %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Nascondi la tariffa %s nella colonna Imposta sulle vendite / IVA
 HideDescOnPDF=Nascondi le descrizioni dei prodotti nel pdf generato
 HideRefOnPDF=Nascondi il riferimento dei prodotti nel pdf generato
 HideDetailsOnPDF=Nascondi dettagli linee prodotti sui PDF generati
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Stringa
+String1Line=Stringa (1 riga)
 TextLong=Testo Lungo
+TextLongNLines=Testo lungo (n righe)
 HtmlText=Testo html
 Int=Intero
 Float=Decimale
@@ -428,7 +431,7 @@ ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Collegamento ad un oggetto
 ComputedFormula=Campo calcolato
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Puoi inserire qui una formula usando altre proprietà dell'oggetto o qualsiasi codice PHP per ottenere un valore calcolato dinamico. Puoi utilizzare qualsiasi formula compatibile con PHP incluso l'operatore condizione "?" e i seguenti oggetti globali: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong>. <br> <strong> ATTENZIONE </strong>: Potrebbero essere disponibili solo alcune proprietà di $object. Se hai bisogno di proprietà non caricate, recupera l'oggetto nella tua formula come nel secondo esempio. <br> L'uso di un campo calcolato significa che non è possibile immettere alcun valore dall'interfaccia. Inoltre, se si verifica un errore di sintassi, la formula potrebbe non restituire nulla. <br> <br> Esempio di formula: <br> $object->id < 10 ? round($object-> id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr($mysoc-> zip, 1, 2 ) <br> <br> Esempio per ricaricare l'oggetto <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Altro esempio di formula per forzare il caricamento dell'oggetto e del suo oggetto padre: <br> (($ reloaded = )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = nuovo progetto ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))? $ secondloadedobj-> ref: 'Progetto padre non trovato'
 Computedpersistent=Store computed field
 ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
 ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
@@ -446,7 +449,7 @@ LinkToTestClickToDial=Per testare l'indirizzo ClickToDial dell'utente <strong>%s
 RefreshPhoneLink=Link Aggiorna
 LinkToTest=Collegamento cliccabile generato per l'utente <strong>%s</strong> (clicca numero di telefono per testare)
 KeepEmptyToUseDefault=Lasciare vuoto per utilizzare il valore di default
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=Nella maggior parte dei casi, è possibile mantenere questo campo vuoto.
 DefaultLink=Link predefinito
 SetAsDefault=Imposta come predefinito
 ValueOverwrittenByUserSetup=Attenzione, questo valore potrebbe essere sovrascritto da un impostazione specifica dell'utente (ogni utente può settare il proprio url clicktodial)
@@ -543,9 +546,9 @@ Module54Desc=Gestione contratti (servizi o abbonamenti)
 Module55Name=Codici a barre
 Module55Desc=Gestione codici a barre
 Module56Name=Pagamento con bonifico bancario
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Ordini addebito diretto (SEPA)
-Module57Desc=Gestione degli ordini di pagamento SEPA Direct Debit. Comprende anche la generazione di file SEPA per i paesi europei.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrazione di un sistema ClickToDial (per esempio Asterisk)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Creare/modificare servizi
 Permission534=Eliminare servizi
 Permission536=Vedere/gestire servizi nascosti
 Permission538=Esportare servizi
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Vedere donazioni
 Permission702=Creare/modificare donazioni
 Permission703=Eliminare donazioni
@@ -848,6 +858,8 @@ Permission773=Eliminare le note spese
 Permission774=Vedere tutte le note spese (anche per utenti non subordinati)
 Permission775=Approvare le note spese
 Permission776=Pagare le note spese
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Esporta note spese
 Permission1001=Vedere magazzino
 Permission1002=Crea/modifica magazzini
@@ -900,6 +912,7 @@ Permission2515=Impostare directory documenti
 Permission2801=Client FTP in sola lettura (solo download e navigazione dei file)
 Permission2802=Client FTP in lettura e scrittura (caricamento e eliminazione dei file)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Elimina risorsa
 Permission63004=Collega le risorse agli eventi
 DictionaryCompanyType=Tipo di soggetto terzo
 DictionaryCompanyJuridicalType=Entità legali di terze parti
-DictionaryProspectLevel=Liv. cliente potenziale
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Stati / Province
 DictionaryRegion=Regioni
 DictionaryCountry=Paesi
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Modelli e-mail
 DictionaryUnits=Unità
 DictionaryMeasuringUnits=Unità di misura
 DictionarySocialNetworks=Social networks
-DictionaryProspectStatus=Stato cliente potenziale
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Tipi di ferie/permessi
 DictionaryOpportunityStatus=Stato opportunità per progetto/clienti potenziali
 DictionaryExpenseTaxCat=Note spesa - Categorie di trasporto
@@ -1076,7 +1091,7 @@ LoginPage=Pagina di login
 BackgroundImageLogin=Immagine di sfondo
 PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra
 DefaultLanguage=Lingua predefinita (codice lingua)
-EnableMultilangInterface=Abilita supporto multilingua
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Abilita la visualizzazione del logo
 CompanyInfo=Società/Organizzazione
 CompanyIds=Informazioni società/fondazione
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=È necessario almeno un criterio di ricer
 NewTranslationStringToShow=Nuova stringa di testo da utilizzare
 OriginalValueWas=La traduzione originale è stata sovrascritta. Il testo originale era:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Applicazioni/moduli attivi: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Moduli attivati
+TotalNumberOfActivatedModules=Moduli attivati: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Devi abilitare almeno un modulo
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Si in estate
@@ -1264,7 +1280,7 @@ FieldEdition=Modifica del campo %s
 FillThisOnlyIfRequired=Per esempio: +2 (compilare solo se ci sono problemi di scostamento del fuso orario)
 GetBarCode=Ottieni codice a barre
 NumberingModules=Modelli di numerazione
-DocumentModules=Document models
+DocumentModules=Modelli di documenti
 ##### Module password generation
 PasswordGenerationStandard=Genera una password in base all'algoritmo interno di  Dolibarr: 8 caratteri comprensivi di numeri e lettere minuscole.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Quale scheda si desidera aprire per impostazione predefinita quando si seleziona il menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Attiva i suoni per le notifiche
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic)
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=Questo modulo modifica i numeri di telefono, quando si utilizza un computer desktop, in collegamenti selezionabili. Un clic chiamerà il numero. Questo può essere usato per iniziare la telefonata quando si utilizza un softphone sul desktop o, ad esempio, quando si utilizza un sistema CTI basato sul protocollo SIP. Nota: quando si utilizza uno smartphone, i numeri di telefono sono sempre selezionabili.
 ClickToDialUseTelLink=Peri numeri di telefono basta usare un link di tipo "tel:"
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1703,8 +1719,8 @@ StockDecreaseForPointOfSaleDisabled=Stock decrease from Point of Sale disabled
 StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with module Serial/Lot management (currently active) so stock decrease is disabled.
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sale from Point of Sale. Hence a warehouse is required.
 CashDeskForceDecreaseStockLabel=La riduzione delle scorte per i prodotti batch è stata forzata.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDeskForceDecreaseStockDesc=Diminuisci prima secondo le date più antiche di Eatby e Sellby.
+CashDeskReaderKeyCodeForEnter=Codice chiave per "Inserisci" definito nel lettore di codici a barre (Esempio: 13)
 ##### Bookmark #####
 BookmarkSetup=Impostazioni modulo segnalibri
 BookmarkDesc=Questo modulo consente di gestire i segnalibri web. È possibile aggiungere collegamenti a pagine Dolibarr o a qualsiasi altro sito web esterno al menu di sinistra.
@@ -1808,7 +1824,7 @@ TopMenuDisableImages=Nascondi le icone nel menu superiore
 LeftMenuBackgroundColor=Colore di sfondo menù laterale
 BackgroundTableTitleColor=Colore di sfondo della riga di intestazione
 BackgroundTableTitleTextColor=Colore del testo per la riga del titolo delle tabelle
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Colore del testo per la riga di collegamento del titolo della tabella
 BackgroundTableLineOddColor=Colore di sfondo per le linee dispari delle tabelle
 BackgroundTableLineEvenColor=Colore di sfondo per le linee pari delle tabelle
 MinimumNoticePeriod=Periodo minimo di avviso (le richieste di ferie/permesso dovranno essere effettuate prima di questo periodo)
@@ -1817,6 +1833,7 @@ EnterAnyCode=Questo campo contiene un riferimento per identificare la linea. Ins
 Enter0or1=Inserire 0 o 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=Il colore RGB è nel formato HEX, es:FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Posizione di questo modello nella menu a tendina
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Richiesta di preventivo
 MailToSendSupplierOrder=Ordini d'acquisto
 MailToSendSupplierInvoice=Fatture Fornitore
 MailToSendContract=Contratti
+MailToSendReception=Receptions
 MailToThirdparty=Soggetti terzi
 MailToMember=Membri
 MailToUser=Utenti
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Modelli per documenti prodotto
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=Guarda ChangeLog file (in inglese)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Margine sinistro sul PDF
 MAIN_PDF_MARGIN_RIGHT=Margine destro sul PDF
 MAIN_PDF_MARGIN_TOP=Margine superiore sul PDF
 MAIN_PDF_MARGIN_BOTTOM=Margine inferiore su PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Altezza per logo in PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,17 +1953,18 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Crea Opportunità (e Soggetto terzo se necessario)
-CreateTicketAndThirdParty=Crea Ticket (e Soggetto terzo se necessario)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Ultimo codice risultato
 NbOfEmailsInInbox=Numero di e-mail nella directory di origine
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Tracking ID found
-WithoutDolTrackingID=Dolibarr Tracking ID not found
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
+OperationParamDesc=Definire i valori da utilizzare per l'oggetto dell'azione o come estrarre i valori. Ad esempio: <br> objproperty1=SET: il valore per impostare <br> objproperty2=SET: un valore con la sostituzione di __objproperty1__ <br> objproperty3=SETIFEMPTY: valore usato se objproperty3 non è già pronto <br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY: Il nome della mia azienda è\\s([^\\s]*)Usa il carattere ; come separatore per estrarre o impostare diverse proprietà.
 OpeningHours=Orari di apertura
 OpeningHoursDesc=Inserisci gli orari di apertura regolare della tua azienda.
 ResourceSetup=Configuration of Resource module
@@ -1977,14 +1998,14 @@ WarningValueHigherSlowsDramaticalyOutput=Warning, higher values slows dramatical
 ModuleActivated=Module %s is activated and slows the interface
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
-ImportSetup=Setup of module Import
+ImportSetup=Impostazione del modulo Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
+EmailCollectorTargetDir=Potrebbe essere un comportamento desiderato spostare l'e-mail in un altro tag / directory quando è stata elaborata correttamente. Basta impostare il nome della directory qui per utilizzare questa funzione (NON usare caratteri speciali nel nome). Si noti che è necessario utilizzare anche un account di accesso in lettura / scrittura.
+EmailCollectorLoadThirdPartyHelp=È possibile utilizzare questa azione per utilizzare il contenuto dell'email per trovare e caricare una terza parte esistente nel database. La terza parte trovata (o creata) verrà utilizzata per le seguenti azioni che ne hanno bisogno. Nel campo del parametro è possibile utilizzare ad esempio 'EXTRACT:BODY:Name:\\s([^\\s]*)' se si desidera estrarre il nome della terza parte da una stringa 'Nome: nome da trovare' trovato nel corpo.
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
@@ -1994,7 +2015,7 @@ RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use spac
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
+MakeAnonymousPing=Effettua un ping anonimo '+1' al server della Fondazione Dolibarr (eseguito 1 volta solo dopo l'installazione) per consentire alla fondazione di contare il numero di installazioni Dolibarr.
 FeatureNotAvailableWithReceptionModule=Funzione non disponibile quando la ricezione del modulo è abilitata
 EmailTemplate=Modello per le e-mail
 EMailsWillHaveMessageID=Le e-mail avranno un tag "Riferimenti" corrispondente a questa sintassi
@@ -2005,3 +2026,7 @@ RssNote=Nota: ogni definizione di feed RSS fornisce un widget che è necessario
 JumpToBoxes=Vai a Setup -> Widget
 MeasuringUnitTypeDesc=Usa qui un valore come "dimensione", "superficie", "volume", "peso", "tempo"
 MeasuringScaleDesc=La scala è il numero di posizioni in cui è necessario spostare la parte decimale in modo che corrisponda all'unità di riferimento predefinita. Per il tipo di unità "tempo", è il numero di secondi. I valori tra 80 e 99 sono valori riservati.
+TemplateAdded=Template aggiunto
+TemplateUpdated=Template aggiornato
+TemplateDeleted=Template eliminato
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index a23c7ae7b81..ae83e1cee06 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Numero di eventi
 ListOfActions=Lista degli eventi
 EventReports=Report eventi
 Location=Luogo
-ToUserOfGroup=A qualsiasi utente nel gruppo
+ToUserOfGroup=Evento assegnato a qualsiasi utente nel gruppo
 EventOnFullDay=Dura tutto il giorno
 MenuToDoActions=Tutte le azioni incomplete
 MenuDoneActions=Tutte le azioni passate
@@ -63,7 +63,7 @@ ShipmentClassifyClosedInDolibarr=Spedizione %s classificata come fatturata
 ShipmentUnClassifyCloseddInDolibarr=Spedizione %s classificata come riaperta
 ShipmentBackToDraftInDolibarr=La spedizione %s torna allo stato bozza
 ShipmentDeletedInDolibarr=Spedizione %s eliminata
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Ricezione %s convalidata
 OrderCreatedInDolibarr=Ordine %s creato
 OrderValidatedInDolibarr=Ordine convalidato
 OrderDeliveredInDolibarr=Ordine %s classificato consegnato
@@ -86,13 +86,15 @@ ProposalDeleted=Proposta cancellata
 OrderDeleted=Ordine cancellato
 InvoiceDeleted=Fattura cancellata
 DraftInvoiceDeleted=Bozza di fattura eliminata
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Prodotto %s creato
 PRODUCT_MODIFYInDolibarr=Prodotto %s  modificato
 PRODUCT_DELETEInDolibarr=Prodotto %s cancellato
 HOLIDAY_CREATEInDolibarr=Richiesta di congedo %s creata
 HOLIDAY_MODIFYInDolibarr=Richiesta di congedo %s modificata
 HOLIDAY_APPROVEInDolibarr=Richiesta di ferie %s approvata
-HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
+HOLIDAY_VALIDATEInDolibarr=Richiesta di congedo %s convalidata
 HOLIDAY_DELETEInDolibarr=Richiesta di congedo %s eliminata
 EXPENSE_REPORT_CREATEInDolibarr=Nota spese %s creata
 EXPENSE_REPORT_VALIDATEInDolibarr=Nota spese %s validata
@@ -113,10 +115,10 @@ BOM_CLOSEInDolibarr=DBA disabilitata
 BOM_REOPENInDolibarr=DBA riaperta
 BOM_DELETEInDolibarr=BOM eliminata
 MRP_MO_VALIDATEInDolibarr=MO convalidato
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
+MRP_MO_UNVALIDATEInDolibarr=MO impostato sullo stato bozza
 MRP_MO_PRODUCEDInDolibarr=MO prodotto
 MRP_MO_DELETEInDolibarr=MO eliminato
-MRP_MO_CANCELInDolibarr=MO canceled
+MRP_MO_CANCELInDolibarr=MO annullato
 ##### End agenda events #####
 AgendaModelModule=Modelli di documento per eventi
 DateActionStart=Data di inizio
@@ -127,7 +129,7 @@ AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> per limitare l'output alle azioni non
 AgendaUrlOptions4=<b>logint=%s</b> per limitare l'output alle azioni assegnate all'utente <b>%s</b> (proprietario e altri).
 AgendaUrlOptionsProject=<b>project= __PROJECT_ID__</b> per limitare l'output alle azioni collegate al progetto <b>__PROJECT_ID__ </b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> per escludere gli eventi automatici.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> per includere eventi delle festività.
 AgendaShowBirthdayEvents=Visualizza i compleanni dei contatti
 AgendaHideBirthdayEvents=Nascondi i compleanni dei contatti
 Busy=Occupato
@@ -155,6 +157,12 @@ EveryMonth=Ogni mese
 DayOfMonth=Giorno del mese
 DayOfWeek=Giorno della settimana
 DateStartPlusOne=Data inizio +1 ora
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
+SetAllEventsToTodo=Imposta tutti gli eventi su da fare
+SetAllEventsToInProgress=Imposta tutti gli eventi su in corso
+SetAllEventsToFinished=Imposta tutti gli eventi su conclusi
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index e45c9f36c3d..99e5e05c812 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -37,8 +37,8 @@ IbanValid=Il codice IBAN è valido
 IbanNotValid=Il codice IBAN non è valido
 StandingOrders=Ordini di addebito diretto
 StandingOrder=Ordine di addebito diretto
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
+PaymentByDirectDebit=Pagamento con addebito diretto
+PaymentByBankTransfers=Pagamenti tramite bonifico bancario
 PaymentByBankTransfer=Pagamento con bonifico bancario
 AccountStatement=Estratto conto
 AccountStatementShort=Est. conto
@@ -98,7 +98,7 @@ AddBankRecordLong=Aggiungi operazione manualmente
 Conciliated=Conciliata
 ConciliatedBy=Transazione conciliata da
 DateConciliating=Data di conciliazione
-BankLineConciliated=Entry reconciled with bank receipt
+BankLineConciliated=Voce riconciliata con ricevuta bancaria
 Reconciled=Conciliata
 NotReconciled=Non conciliata
 CustomerInvoicePayment=Pagamento fattura attiva
@@ -106,8 +106,8 @@ SupplierInvoicePayment=Pagamento fornitore
 SubscriptionPayment=Pagamento adesione
 WithdrawalPayment=Domicil. banc.
 SocialContributionPayment=Pagamento delle imposte sociali/fiscali
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Bonifico bancario
+BankTransfers=Bonifici
 MenuBankInternalTransfer=Trasferimento interno
 TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Da
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 2a2e30ab8b1..930f6948a9e 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -212,10 +212,10 @@ AmountOfBillsByMonthHT=Importo delle fatture per mese (al netto delle imposte)
 UseSituationInvoices=Allow situation invoice
 UseSituationInvoicesCreditNote=Allow situation invoice credit note
 Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
+AllowedInvoiceForRetainedWarranty=Garanzia trattenuta utilizzabile sulle seguenti tipologie di fatture
 RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
+RetainedwarrantyOnlyForSituation=Rendere la "garanzia trattenuta" disponibile solo per le fatture della situazione
+RetainedwarrantyOnlyForSituationFinal=Sulle fatture di situazione la detrazione globale "garanzia trattenuta" viene applicata solo sulla situazione finale
 ToPayOn=To pay on %s
 toPayOn=to pay on %s
 RetainedWarranty=Retained Warranty
@@ -328,7 +328,7 @@ InvoiceStatus=Stato Fattura
 InvoiceNote=Nota Fattura
 InvoicePaid=Fattura pagata
 InvoicePaidCompletely=Pagata completamente
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
+InvoicePaidCompletelyHelp=Fattura pagata completamente. Ciò esclude le fatture pagate parzialmente. Per ottenere l'elenco di tutte le fatture "chiuse" o non "chiuse", preferisci utilizzare un filtro sullo stato della fattura.
 OrderBilled=Order billed
 DonationPaid=Donation paid
 PaymentNumber=Numero del pagamento
@@ -383,7 +383,7 @@ GeneratedFromTemplate=Generated from template invoice %s
 WarningInvoiceDateInFuture=Attenzione, la data della fattura è successiva alla data odierna
 WarningInvoiceDateTooFarInFuture=Attenzione, la data della fattura è troppo lontana dalla data odierna
 ViewAvailableGlobalDiscounts=Mostra gli sconti disponibili
-GroupPaymentsByModOnReports=Group payments by mode on reports
+GroupPaymentsByModOnReports=Raggruppa i pagamenti per modalità sui report
 # PaymentConditions
 Statut=Stato
 PaymentConditionShortRECEP=Rimessa diretta
@@ -410,10 +410,10 @@ PaymentConditionShort14D=14 giorni
 PaymentCondition14D=Pagamento a 14 giorni
 PaymentConditionShort14DENDMONTH=14 giorni fine mese
 PaymentCondition14DENDMONTH=Pagamento a 14 giorni fine mese
-FixAmount=Fixed amount - 1 line with label '%s'
+FixAmount=Importo fisso - 1 riga con etichetta "%s"
 VarAmount=Importo variabile (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Importo variabile (%% tot.) - tutte le stesse righe
 # PaymentType
 PaymentTypeVIR=Bonifico bancario
 PaymentTypeShortVIR=Bonifico bancario
@@ -441,8 +441,8 @@ BankAccountNumberKey=Checksum
 Residence=Indirizzo
 IBANNumber=Codice IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN del cliente
+SupplierIBAN=IBAN del venditore
 BIC=BIC/SWIFT
 BICNumber=Codice BIC/SWIFT
 ExtraInfos=Extra info
@@ -516,8 +516,8 @@ TerreNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn per le fattu
 MarsNumRefModelDesc1=restituisce un numero nel formato %saamm-nnnn per fatture standard, %syymm-nnnn per le fatture sostitutive, %syymm-nnnn per le note d'addebito e %syymm-nnnn per le note di credito dove yy sta per anno, mm per mese e nnnn è una sequenza progressiva, senza salti e che non si azzera.
 TerreNumRefModelError=Un altro modello di numerazione con sequenza $ syymm è già esistente e non è compatibile con questo modello. Rimuovere o rinominare per attivare questo modulo.
 CactusNumRefModelDesc1=Restituisce il numero con formato %syymm-nnnn per le fatture standard, %syymm-nnnn per le note di credito e %syymm-nnnn per le fatture di acconto dove yy è l'anno, mm è il mese e nnnn è una sequenza senza interruzioni e senza ritorno a 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+EarlyClosingReason=Motivo di chiusura anticipata
+EarlyClosingComment=Nota di chiusura anticipata
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Responsabile pagamenti clienti
 TypeContact_facture_external_BILLING=Contatto fatturazioni clienti
@@ -571,7 +571,7 @@ AutoFillDateTo=Imposta data di fine per la riga di servizio con la successiva da
 AutoFillDateToShort=Imposta data di fine
 MaxNumberOfGenerationReached=Max number of gen. reached
 BILL_DELETEInDolibarr=Fattura cancellata
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
+BILL_SUPPLIER_DELETEInDolibarr=Fattura fornitore eliminata
+UnitPriceXQtyLessDiscount=Prezzo unitario x Qtà - Sconto
+CustomersInvoicesArea=Area fatturazione clienti
+SupplierInvoicesArea=Area di fatturazione del fornitore
diff --git a/htdocs/langs/it_IT/blockedlog.lang b/htdocs/langs/it_IT/blockedlog.lang
index b0cbfa4cdde..7a37bfa4034 100644
--- a/htdocs/langs/it_IT/blockedlog.lang
+++ b/htdocs/langs/it_IT/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=La voce del registro archiviata non è valida. Significa che qualcuno (un hacker?) Ha modificato alcuni dati di questo record dopo che è stato registrato, o ha cancellato il record archiviato precedentemente (controlla che esista quella riga con # precedente).
 OkCheckFingerprintValidity=Archived log record is valid. The data on this line was not modified and the entry follows the previous one.
 OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
 AddedByAuthority=Stored into remote authority
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 6eb3fbc421d..9c5a07767a4 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Ordini fornitore: ultimi %s modificati
 BoxTitleLastModifiedCustomerBills=Fatture attive: ultime %s modificate
 BoxTitleLastModifiedCustomerOrders=Ordini: ultimi %s modificati
 BoxTitleLastModifiedPropals=Ultime %s proposte modificate
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Fatture attive
 ForCustomersOrders=Ordini cliente
 ForProposals=Proposte
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=L'account Suspense non è definito
 BoxLastCustomerShipments=Ultime spedizioni cliente
 BoxTitleLastCustomerShipments=Ultime %s spedizioni cliente
 NoRecordedShipments=Nessuna spedizione cliente registrata
+# Pages
+AccountancyHome=Contabilità
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index 52a4524cf84..da0aaa59816 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -16,7 +16,7 @@ AddThisArticle=Aggiungi questo articolo
 RestartSelling=Rimetti in vendita
 SellFinished=Vendita completata
 PrintTicket=Stampa biglietto
-SendTicket=Send ticket
+SendTicket=Invia biglietto
 NoProductFound=Nessun articolo trovato
 ProductFound=Prodotto trovato
 NoArticle=Nessun articolo
@@ -49,7 +49,7 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Theorical amount
 RealAmount=Real amount
-CashFence=Cash fence
+CashFence=Cassetta dei contanti
 CashFenceDone=Cash fence done for the period
 NbOfInvoices=Numero di fatture
 Paymentnumpad=Type of Pad to enter payment
@@ -60,9 +60,9 @@ TakeposNeedsCategories=TakePOS needs product categories to work
 OrderNotes=Order Notes
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
-PrintCustomerOnReceipts=Print customer on tickets|receipts
+TicketVatGrouped=Raggruppa l'IVA per aliquota in biglietti / ricevute
+AutoPrintTickets=Stampa automaticamente biglietti / ricevute
+PrintCustomerOnReceipts=Stampa cliente per biglietti / ricevute
 EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
 ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
 ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
@@ -72,48 +72,53 @@ Terminal=Terminal
 NumberOfTerminals=Number of Terminals
 TerminalSelect=Select terminal you want to use:
 POSTicket=POS Ticket
-POSTerminal=POS Terminal
-POSModule=POS Module
+POSTerminal=Terminale POS
+POSModule=Modulo POS
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=La fattura è già stata convalidata
 NoLinesToBill=No lines to bill
 CustomReceipt=Ricevuta personalizzata
 ReceiptName=Nome ricevuta
-ProductSupplements=Product Supplements
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
+ProductSupplements=Prodotti di supplemento
+SupplementCategory=Categorie di supplemento
+ColorTheme=Colore del tema
+Colorful=Colorato
 HeadBar=Head Bar
-SortProductField=Field for sorting products
+SortProductField=Campo per la selezione di prodotti
 Browser=Browser
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
-CloseCashFence=Close cash fence
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+BrowserMethodDescription=Stampa di ricevute semplice e facile. Solo pochi parametri per configurare la ricevuta. Stampa tramite browser.
+TakeposConnectorMethodDescription=Modulo esterno con funzionalità extra. Possibilità di stampare dal cloud.
+PrintMethod=Metodo di stampa
+ReceiptPrinterMethodDescription=Metodo potente con molti parametri. Completamente personalizzabile con modelli. Impossibile stampare dal cloud.
+ByTerminal=Da terminale
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+CashDeskRefNumberingModules=Modulo di numerazione per vendite POS
+CashDeskGenericMaskCodes6 =  <br> Il tag <b> {TN} </b> viene utilizzato per aggiungere il numero del terminale
+TakeposGroupSameProduct=Raggruppa le stesse linee di prodotti
+StartAParallelSale=Inizia una nuova vendita parallela
+ControlCashOpening=Control cash box at opening POS
+CloseCashFence=Chiudi cassetta contanti
+CashReport=Rapporto di cassa
+MainPrinterToUse=Stampante principale da utilizzare
+OrderPrinterToUse=Ordine stampante da utilizzare
+MainTemplateToUse=Modello principale da usare
+OrderTemplateToUse=Ordine modello da utilizzare
+BarRestaurant=Bar ristorante
+AutoOrder=Ordine dal cliente stesso
+RestaurantMenu=Menù
+CustomerMenu=Menù cliente
+ScanToMenu=Scansiona il codice QR per vedere il menù
+ScanToOrder=Scansiona il codice QR per ordinare
+Appearance=Aspetto
+HideCategoryImages=Nascondi immagini di categoria
+HideProductImages=Nascondi immagini del prodotto
+NumberOfLinesToShow=Numero di righe di immagini da mostrare
+DefineTablePlan=Definisci il piano dei tavoli
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 7ea6cadd248..0907cae5aaa 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -63,7 +63,7 @@ AccountsCategoriesShort=Conti di tag/categorie
 ProjectsCategoriesShort=Tag/categoria progetti
 UsersCategoriesShort=Users tags/categories
 StockCategoriesShort=Tag / categorie di magazzino
-ThisCategoryHasNoItems=This category does not contain any items.
+ThisCategoryHasNoItems=Questa categoria non contiene alcun elemento.
 CategId=ID Tag/categoria
 CatSupList=List of vendor tags/categories
 CatCusList=Lista delle tag/categorie clienti
@@ -86,5 +86,5 @@ ByDefaultInList=Default nella lista
 ChooseCategory=Choose category
 StocksCategoriesArea=Area categorie magazzini
 ActionCommCategoriesArea=Area eventi categorie
-WebsitePagesCategoriesArea=Page-Container Categories Area
+WebsitePagesCategoriesArea=Pagina contenitore Area categorie
 UseOrOperatorForCategories=Uso o operatore per le categorie
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 935d821995c..bc8d25726e2 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -71,7 +71,7 @@ Chat=Chat
 PhonePro=Telefono uff.
 PhonePerso=Telefono pers.
 PhoneMobile=Cellulare
-No_Email=Refuse bulk emailings
+No_Email=Rifiuta email di massa
 Fax=Fax
 Zip=CAP
 Town=Città
@@ -246,11 +246,11 @@ ProfId3US=-
 ProfId4US=-
 ProfId5US=-
 ProfId6US=-
-ProfId1RO=Prof Id 1 (CUI)
-ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
-ProfId3RO=Prof Id 3 (CAEN)
+ProfId1RO=Prof ID 1 (CUI)
+ProfId2RO=Prof ID 2 (Nr. Immatricolazione)
+ProfId3RO=Prof ID 3 (CAEN)
 ProfId4RO=-
-ProfId5RO=Prof Id 5 (EUID)
+ProfId5RO=Prof ID 5 (EUID)
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -325,7 +325,7 @@ CompanyDeleted=Società %s cancellata dal database.
 ListOfContacts=Elenco dei contatti
 ListOfContactsAddresses=Elenco dei contatti
 ListOfThirdParties=Elenco dei soggetti terzi
-ShowCompany=Third Party
+ShowCompany=Terze parti
 ShowContact=Contatto-Indirizzo
 ContactsAllShort=Tutti (Nessun filtro)
 ContactType=Tipo di contatto
@@ -447,7 +447,7 @@ SaleRepresentativeFirstname=Nome del commerciale
 SaleRepresentativeLastname=Cognome del commerciale
 ErrorThirdpartiesMerge=Si è verificato un errore durante l'eliminazione di terze parti. Si prega di controllare il registro. Le modifiche sono state ripristinate.
 NewCustomerSupplierCodeProposed=Il codice cliente o fornitore è già in uso, è consigliato usare un codice diverso
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+KeepEmptyIfGenericAddress=Mantieni vuoto questo campo se questo indirizzo è generico
 #Imports
 PaymentTypeCustomer=Payment Type - Customer
 PaymentTermsCustomer=Termini di Pagamento - Cliente
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index c08cfa61481..8243a338ffc 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Tassa o contributo
 SocialContributions=Tasse o contributi
 SocialContributionsDeductibles=Tasse o contributi deducibili
 SocialContributionsNondeductibles=Tasse o contributi non deducibili
+DateOfSocialContribution=Data dell'imposta sociale o fiscale
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Spese straordinarie
@@ -157,9 +158,9 @@ SeeReportInInputOutputMode=Vedi %sanalisi dei pagamenti%s per un calcolo sui pag
 SeeReportInDueDebtMode=Vedi %sanalisi delle fatture %s per un calcolo basato sulle fatture registrate anche se non ancora contabilizzate nel libro mastro.
 SeeReportInBookkeepingMode=See <b>%sBookeeping report%s</b> for a calculation on <b>Bookkeeping Ledger table</b>
 RulesAmountWithTaxIncluded=- Gli importi indicati sono tasse incluse
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultDue=- Include fatture in sospeso, spese, IVA, donazioni, indipendentemente dal fatto che siano pagate o meno. Comprende anche gli stipendi pagati. <br> - Si basa sulla data di fatturazione delle fatture e sulla data di scadenza delle spese o dei pagamenti delle imposte. Per gli stipendi definiti con il modulo Salario, viene utilizzata la data valuta del pagamento.
 RulesResultInOut=- Include i pagamenti reali di fatture, spese e IVA. <br>- Si basa sulle date di pagamento di fatture, spese e IVA.
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCADue=- Include le fatture scadute del cliente indipendentemente dal fatto che siano pagate o meno. <br> - Si basa sulla data di fatturazione di queste fatture. <br>
 RulesCAIn=- Comprende le fatture effettivamente pagate dai clienti.<br/>- Si basa sulla data dei pagamenti.<br/>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
 RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME"
@@ -255,10 +256,12 @@ TurnoverbyVatrate=Fatturato per aliquota iva di vendita
 TurnoverCollectedbyVatrate=Fatturato per aliquota iva di vendita
 PurchasebyVatrate=Acquisti per aliquota iva
 LabelToShow=Etichetta breve
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
+PurchaseTurnover=Fatturato d'acquisto
+PurchaseTurnoverCollected=Fatturato di acquisto raccolto
+RulesPurchaseTurnoverDue=- Include le fatture scadute del fornitore, che siano pagate o meno. <br> - Si basa sulla data di fatturazione di queste fatture. <br>
+RulesPurchaseTurnoverIn=- Comprende tutti i pagamenti effettivi delle fatture effettuate ai fornitori. <br> - Si basa sulla data di pagamento di queste fatture <br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Include tutte le righe di addebito dal giornale di registrazione acquisti.
+ReportPurchaseTurnover=Fatturato di acquisto fatturato
+ReportPurchaseTurnoverCollected=Fatturato di acquisto raccolto
+IncludeVarpaysInResults = Includere vari pagamenti nei rapporti
+IncludeLoansInResults = Includere prestiti nei report
diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
index b2b19bab32b..91fc0fd0bb8 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Servizi in esecuzione
 MenuExpiredServices=Servizi scaduti
 MenuClosedServices=Servizi chiusi
 NewContract=Nuovo contratto
-NewContractSubscription=Nuovo contratto/sottoscrizione
+NewContractSubscription=Nuovo contratto o abbonamento
 AddContract=Crea contratto
 DeleteAContract=Eliminazione di un contratto
 ActivateAllOnContract=Attiva tutti i servizi
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Contatto interno per i rapporti succes
 TypeContact_contrat_external_BILLING=Contatto di fatturazione
 TypeContact_contrat_external_CUSTOMER=Contatto di follow-up
 TypeContact_contrat_external_SALESREPSIGN=Contatto per la firma dei contratti
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Nascondi i servizi chiusi di default
+ShowClosedServices=Mostra servizi chiusi
+HideClosedServices=Nascondi servizi chiusi
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 543b4e73b44..01a4e96f6b8 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
 ErrorSupplierCodeRequired=Il codice fornitore è richiesto
 ErrorSupplierCodeAlreadyUsed=Codice fornitore già utilizzato
 ErrorBadParameters=Parametri errati
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Parametri errati o mancanti
 ErrorBadValueForParameter=Valore '%s' non corretto per il parametro '%s'
 ErrorBadImageFormat=Tipo file immagine non supportato (la tua installazione di PHP non supporta le funzioni per convertire le immagini di questo formato)
 ErrorBadDateFormat=Il valore '%s' ha un formato della data sbagliato
@@ -60,7 +60,7 @@ ErrorPartialFile=File non completamente ricevuto dal server.
 ErrorNoTmpDir=La directory temporanea %s non esiste.
 ErrorUploadBlockedByAddon=Upload bloccato da un plugin di Apache/PHP
 ErrorFileSizeTooLarge=La dimensione del file è troppo grande.
-ErrorFieldTooLong=Field %s is too long.
+ErrorFieldTooLong=Il campo %s è troppo lungo.
 ErrorSizeTooLongForIntType=Numero troppo lungo (massimo %s cifre)
 ErrorSizeTooLongForVarcharType=Stringa troppo lunga (limite di %s caratteri)
 ErrorNoValueForSelectType=Per favore immetti un valore per la lista di selezione
@@ -119,9 +119,9 @@ ErrorLoginDoesNotExists=Utente con accesso <b>%s</b> inesistente
 ErrorLoginHasNoEmail=Questo utente non ha alcun indirizzo email. Processo interrotto.
 ErrorBadValueForCode=Valore del codice errato. Riprova con un nuovo valore...
 ErrorBothFieldCantBeNegative=I campi %s e %s non possono essere entrambi negativi
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorFieldCantBeNegativeOnInvoice=Il campo <strong> %s </strong> non può essere negativo su questo tipo di fattura. Se è necessario aggiungere una riga di sconto, è sufficiente creare prima lo sconto (dal campo "%s" nella scheda di terze parti) e applicarlo alla fattura.
+ErrorLinesCantBeNegativeForOneVATRate=Il totale delle righe (al netto delle imposte) non può essere negativo per un'aliquota IVA non nulla (Trovato un totale negativo per l'aliquota IVA <b> %s </b> %%).
+ErrorLinesCantBeNegativeOnDeposits=Le linee non possono essere negative in un deposito. Dovrai affrontare problemi quando dovrai consumare il deposito nella fattura finale se lo fai.
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantità di ciascuna riga della fattura cliente non può essere negativa
 ErrorWebServerUserHasNotPermission=L'account utente <b>%s</b> utilizzato per eseguire il server web non ha i permessi necessari
 ErrorNoActivatedBarcode=Nessun tipo di codice a barre attivato
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Il nuovo valore non può essere uguale al precede
 ErrorFailedToValidatePasswordReset=Cambio password fallito. Forse è già stato richiesto (questo link può essere usato una volta sola). Se no, prova a rifare la procedura dall'inizio.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Impossibile aggiungere il contatto
-ErrorDateMustBeBeforeToday=La data non può essere successiva ad oggi
+ErrorDateMustBeBeforeToday=La data deve essere inferiore a quella odierna
+ErrorDateMustBeInFuture=La data deve essere maggiore di quella odierna
 ErrorPaymentModeDefinedToWithoutSetup=Un metodo di pagamento è stato impostato come %s ma il setup del modulo Fattura non è stato completato per definire le impostazioni da mostrare per questo metodo di pagamento.
 ErrorPHPNeedModule=Errore, il tuo PHP deve avere il modulo <b>%s</b> installato per usare questa funzionalità.
 ErrorOpenIDSetupNotComplete=Hai impostato il config file di Dolibarr per permettere l'autenticazione tramite OpenID, ma l'URL del service di OpenID non è definita nella costante %s
@@ -184,7 +185,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=An error has occurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=Il file deve essere nel formato %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=Il nome del file non può iniziare con un "."
 ErrorSupplierCountryIsNotDefined=Country for this vendor is not defined. Correct this first.
 ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enough for product %s to add it into a new order.
@@ -228,17 +229,20 @@ ErrorSearchCriteriaTooSmall=Search criteria too small.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Gli oggetti devono avere lo stato 'Attivo' per essere disabilitati
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Gli oggetti devono avere lo stato 'Bozza' o 'Disabilitato' per essere abilitato
 ErrorNoFieldWithAttributeShowoncombobox=Nessun campo ha la proprietà 'mostra nel quadrato combo' nella definizione dell'oggetto '%s'. Non c'è modo di mostrare la lista combo.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
-ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
-ErrorAddAtLeastOneLineFirst=Add at least one line first
-ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
-ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
-ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
-ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorFieldRequiredForProduct=Il campo "%s" è obbligatorio per il prodotto %s
+ProblemIsInSetupOfTerminal=Il problema è nella configurazione del terminale %s.
+ErrorAddAtLeastOneLineFirst=Aggiungi prima almeno una riga
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Errore, il record è già stato trasferito in contabilità, la cancellazione non è possibile.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Errore, la lingua è obbligatoria se imposti la pagina come traduzione di un'altra.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Errore, la lingua della pagina tradotta è la stessa di questa.
+ErrorBatchNoFoundForProductInWarehouse=Nessun lotto / numero di serie trovato per il prodotto "%s" nel magazzino "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Quantità insufficiente per questo lotto / numero di serie per il prodotto "%s" nel magazzino "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=È possibile solo 1 campo per il "Raggruppa per" (gli altri vengono scartati)
+ErrorTooManyDifferentValueForSelectedGroupBy=Sono stati trovati troppi valori diversi (più di <b> %s </b>) per il campo "<b> %s </b>", quindi non possiamo utilizzarlo come grafico "Group by". Il campo "Raggruppa per" è stato rimosso. Forse volevi usarlo come asse X?
+ErrorReplaceStringEmpty=Errore, la stringa da sostituire è vuota
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
@@ -264,5 +268,5 @@ WarningAnEntryAlreadyExistForTransKey=Esiste già una voce tradotta per la chiav
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
 WarningProjectClosed=Il progetto è chiuso. È necessario prima aprirlo nuovamente.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningSomeBankTransactionByChequeWereRemovedAfter=Alcune transazioni bancarie sono state rimosse dopo che è stata generata la ricevuta che le includeva. Quindi il numero di assegni e il totale dello scontrino possono differire dal numero e dal totale nell'elenco.
+WarningFailedToAddFileIntoDatabaseIndex=Avviso, impossibile aggiungere la voce del file nella tabella dell'indice del database ECM
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index c475c13cffe..aa66a29179d 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -26,8 +26,8 @@ FieldTitle=Campi titolo
 NowClickToGenerateToBuildExportFile=Ora, fare clic su "Genera" per generare il file di esportazione ...
 AvailableFormats=Formati disponibili
 LibraryShort=Libreria
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
+ExportCsvSeparator=Separatore di caratteri CSV
+ImportCsvSeparator=Separatore di caratteri CSV
 Step=Passaggio
 FormatedImport=Importazione assistita
 FormatedImportDesc1=Questa sezione consente di importare dati personalizzati, utilizzando un assistente per aiutarti nel processo anche senza conoscenze tecniche.
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index 832225b61ca..ab9092c4d63 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -40,7 +40,7 @@ TypeOfLeaveId=Type of leave ID
 TypeOfLeaveCode=Type of leave code
 TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Numero di giornate di ferie già godute
-NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPHelp=Il calcolo tiene conto dei giorni non lavorativi e delle festività definiti nel dizionario.
 NbUseDaysCPShort=Days consumed
 NbUseDaysCPShortInMonth=Days consumed in month
 DayIsANonWorkingDay=%s non è un giorno lavorativo
@@ -131,4 +131,4 @@ TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Ferie da approvare
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+NobodyHasPermissionToValidateHolidays=Nessuno ha il permesso di convalidare le vacanze
diff --git a/htdocs/langs/it_IT/hrm.lang b/htdocs/langs/it_IT/hrm.lang
index a962d229784..74aac91da31 100644
--- a/htdocs/langs/it_IT/hrm.lang
+++ b/htdocs/langs/it_IT/hrm.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Ma
+HRM_EMAIL_EXTERNAL_SERVICE=Email per prevenire il servizio esterno HRM
 Establishments=Aziende
 Establishment=Azienda
 NewEstablishment=Nuova azienda
@@ -11,7 +11,7 @@ CloseEtablishment=Chiudi azienda
 # Dictionary
 DictionaryPublicHolidays=HRM - Giorni festivi
 DictionaryDepartment=HRM - Lista dipartimenti
-DictionaryFunction=HRM - Job positions
+DictionaryFunction=HRM - Posizioni di lavoro
 # Module
 Employees=Dipendenti
 Employee=Dipendente
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index 1b2017ea9af..465f5ecf63e 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -16,7 +16,7 @@ PHPSupportCurl=This PHP supports Curl.
 PHPSupportCalendar=Questo PHP supporta le estensioni dei calendari.
 PHPSupportUTF8=This PHP supports UTF8 functions.
 PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
+PHPSupportxDebug=Questo PHP supporta funzioni estese di debug.
 PHPSupport=La versione di PHP supporta la funzione %s.
 PHPMemoryOK=La memoria massima per la sessione è fissata dal PHP a <b>%s</b>. Dovrebbe essere sufficiente.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This is too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
@@ -27,7 +27,7 @@ ErrorPHPDoesNotSupportCurl=L'attuale installazione di PHP non supporta cURL.
 ErrorPHPDoesNotSupportCalendar=La tua installazione di PHP non supporta le estensioni del calendario php.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
 ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
+ErrorPHPDoesNotSupportxDebug=La tua installazione di PHP non supporta l'estensione delle funzioni di debug.
 ErrorPHPDoesNotSupport=La tua installazione di PHP non supporta le funzioni %s.
 ErrorDirDoesNotExists=La directory <b>%s</b> non esiste.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -93,7 +93,7 @@ GoToSetupArea=Vai alla pagina impostazioni
 MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
 GoToUpgradePage=Vai alla pagina di aggiornamento
 WithNoSlashAtTheEnd=Senza la barra "/" alla fine
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+DirectoryRecommendation= <span class="warning"> IMPORTANTE </span>: è necessario utilizzare una directory esterna alle pagine Web (quindi non utilizzare una sottodirectory del parametro precedente).
 LoginAlreadyExists=Esiste già
 DolibarrAdminLogin=Login dell'amministratore di Dolibarr
 AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
@@ -134,7 +134,7 @@ IfAlreadyExistsCheckOption=Se il nome è esatto e il database non esiste ancora,
 OpenBaseDir=Parametro <b>openbasedir</b>
 YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
 YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
-NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
+NextStepMightLastALongTime=Il passaggio in corso può richiedere diverso tempo. Attendi il caricamento completo della schermata successiva prima di continuare.
 MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
 MigrationShippingDelivery=Aggiornamento spedizione
 MigrationShippingDelivery2=Aggiornamento spedizione 2
@@ -209,7 +209,7 @@ MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_exce
 MigrationUserRightsEntity=Aggiorna il valore del campo entità di llx_user_rights
 MigrationUserGroupRightsEntity=Aggiorna il valore del campo entità di llx_usergroup_rights
 MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationFieldsSocialNetworks=Migrazione dei social network dei campi utenti (%s)
 MigrationReloadModule=Ricarica modulo %s
 MigrationResetBlockedLog=Reset del modulo BlockedLog per l'algoritmo v7
 ShowNotAvailableOptions=Mostra opzioni non disponibili
@@ -218,6 +218,6 @@ ErrorFoundDuringMigration=Error(s) were reported during the migration process so
 YouTryInstallDisabledByDirLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
 YouTryInstallDisabledByFileLock=The application tried to self-upgrade, but the install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
 ClickHereToGoToApp=Click here to go to your application
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+ClickOnLinkOrRemoveManualy=Se è in corso un aggiornamento, attendere. In caso contrario, fai clic sul seguente link. Se vedi sempre questa stessa pagina, devi rimuovere / rinominare il file install.lock nella directory dei documenti.
+Loaded=Caricato
+FunctionTest=Test di funzionalita
diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang
index 5d0726bfdf2..449510235a8 100644
--- a/htdocs/langs/it_IT/interventions.lang
+++ b/htdocs/langs/it_IT/interventions.lang
@@ -4,7 +4,7 @@ Interventions=Interventi
 InterventionCard=Scheda intervento
 NewIntervention=Nuovo intervento
 AddIntervention=Crea intervento
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
+ChangeIntoRepeatableIntervention=Cambia in intervento ricorrente
 ListOfInterventions=Elenco degli interventi
 ActionsOnFicheInter=Azioni di intervento
 LastInterventions=Ultimi %s interventi
@@ -20,8 +20,8 @@ ConfirmValidateIntervention=Vuoi davvero convalidare questo intervento con il ri
 ConfirmModifyIntervention=Vuoi davvero modificare questo intervento?
 ConfirmDeleteInterventionLine=Vuoi davvero eliminare questa riga di intervento?
 ConfirmCloneIntervention=Vuoi davvero clonare questo intervento?
-NameAndSignatureOfInternalContact=Name and signature of intervening:
-NameAndSignatureOfExternalContact=Name and signature of customer:
+NameAndSignatureOfInternalContact=Nome e firma del partecipante:
+NameAndSignatureOfExternalContact=Nome e firma del cliente:
 DocumentModelStandard=Modello documento standard per gli interventi
 InterventionCardsAndInterventionLines=Interventi e righe degli interventi
 InterventionClassifyBilled=Classifica come "Fatturato"
@@ -41,9 +41,7 @@ InterventionsArea=Zona dell'intervento
 DraftFichinter=Interventi in bozza
 LastModifiedInterventions=Ultimi %s interventi modificati
 FichinterToProcess=Interventions to process
-##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Contatto di follow-up del cliente
-# Modele numérotation
 PrintProductsOnFichinter=Stampa anche i "prodotti" (non solo i servizi) sulla scheda interventi
 PrintProductsOnFichinterDetails=interventi generati da ordini
 UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
@@ -53,7 +51,6 @@ InterventionStatistics=Statistiche degli interventi
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
 AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
-##### Exports #####
 InterId=ID intervento
 InterRef=Rif. intervento
 InterDateCreation=Data di creazione intervento
@@ -65,3 +62,5 @@ InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
 InterLineDesc=Line description intervention
+RepeatableIntervention=Modello di intervento
+ToCreateAPredefinedIntervention=Per creare un intervento predefinito o ricorrente, creare un intervento comune e convertirlo in modello di intervento
diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang
index b6d8428c3b7..3d88ef5f267 100644
--- a/htdocs/langs/it_IT/languages.lang
+++ b/htdocs/langs/it_IT/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Etiope
 Language_ar_AR=Arabo
 Language_ar_EG=Arabo (Egitto)
 Language_ar_SA=Arabo
+Language_az_AZ=Azero
 Language_bn_BD=Bengalese
+Language_bn_IN=Bengalese (India)
 Language_bg_BG=Bulgaro
 Language_bs_BA=Bosniaco
 Language_ca_ES=Catalano
@@ -20,6 +23,7 @@ Language_en_GB=English (Gran Bretagna)
 Language_en_IN=Inglese (India)
 Language_en_NZ=Inglese (Nuova Zelanda)
 Language_en_SA=Inglese (Arabia Saudita)
+Language_en_SG=Inglese (Singapore)
 Language_en_US=Inglese (Stati Uniti)
 Language_en_ZA=Inglese (Sud Africa)
 Language_es_ES=Spagnolo
@@ -29,6 +33,7 @@ Language_es_CL=Spagnolo (Cile)
 Language_es_CO=Spagnolo (Colombia)
 Language_es_DO=Spagnolo ( Repubblica Dominicana)
 Language_es_EC=Spagnolo (Ecuador)
+Language_es_GT=Spagnolo (Guatemala)
 Language_es_HN=Spagnolo (Honduras)
 Language_es_MX=Spagnolo (Messico)
 Language_es_PA=Spagnolo (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spagnolo (Paraguay)
 Language_es_PE=Spagnolo (Perù)
 Language_es_PR=Spagnolo (Portorico)
 Language_es_UY=Spagnolo (Uruguay)
+Language_es_GT=Spagnolo (Guatemala)
 Language_es_VE=Spagnolo (Venezuela)
 Language_et_EE=Estone
 Language_eu_ES=Basco
@@ -44,15 +50,22 @@ Language_fi_FI=finlandese
 Language_fr_BE=Francese (Belgio)
 Language_fr_CA=Francese (Canada)
 Language_fr_CH=Francese (Svizzera)
+Language_fr_CI=Francese (Costa d'Avorio)
+Language_fr_CM=Francese (Camerun)
 Language_fr_FR=Francese
+Language_fr_GA=Francese (Gabon)
 Language_fr_NC=Francese (Nuova Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisone
+Language_gl_ES=Galiziano
 Language_he_IL=Ebraico
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croato
 Language_hu_HU=Ungherese
 Language_id_ID=Indonesiano
 Language_is_IS=Islandese
 Language_it_IT=Italiano
+Language_it_CH=Italiano (Svizzera)
 Language_ja_JP=Giapponese
 Language_ka_GE=Georgiano
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Lettone
 Language_mk_MK=Macedone
 Language_mn_MN=Mongolo
 Language_nb_NO=Norvegese (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Olandese (Belgio)
 Language_nl_NL=Olandese (Paesi Bassi) 
 Language_pl_PL=Polacco
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbeko
 Language_vi_VN=Vietnamita
 Language_zh_CN=Cinese
 Language_zh_TW=Cinese (Tradizionale)
+Language_zh_HK=Cinese (Hong Kong)
 Language_bh_MY=Malese
diff --git a/htdocs/langs/it_IT/link.lang b/htdocs/langs/it_IT/link.lang
index 5448ce32703..551802192d1 100644
--- a/htdocs/langs/it_IT/link.lang
+++ b/htdocs/langs/it_IT/link.lang
@@ -8,4 +8,4 @@ LinkRemoved=Il collegamento %s è stato rimosso
 ErrorFailedToDeleteLink= Impossibile rimuovere il collegamento '<b>%s</b>'
 ErrorFailedToUpdateLink= Impossibile caricare il collegamento '<b>%s</b>'
 URLToLink=Indirizzo del link
-OverwriteIfExists=Overwrite file if exists
+OverwriteIfExists=Sovrascrivi file se esiste
diff --git a/htdocs/langs/it_IT/loan.lang b/htdocs/langs/it_IT/loan.lang
index aab498f7982..8b6f0dae914 100644
--- a/htdocs/langs/it_IT/loan.lang
+++ b/htdocs/langs/it_IT/loan.lang
@@ -23,9 +23,9 @@ AddLoan=Create loan
 FinancialCommitment=Financial commitment
 InterestAmount=Interesse
 CapitalRemain=Capital remain
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Questo termine è già pagato
+CantUseScheduleWithLoanStartedToPaid = Impossibile utilizzare lo scheduler per un prestito con pagamento avviato
+CantModifyInterestIfScheduleIsUsed = Non è possibile modificare l'interesse se si utilizza la pianificazione
 # Admin
 ConfigLoan=Configurazione del modulo prestiti
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accounting account capital by default
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 8c6b1994892..af3f2044542 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -67,8 +67,8 @@ DateLastSend=Data dell'ultimo invio
 DateSending=Data di spedizione
 SentTo=Inviata a <b>%s</b>
 MailingStatusRead=Da leggere
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubscribe" feature
+YourMailUnsubcribeOK=L'indirizzo e-mail <b>%s</b>  è stato cancellato correttamente dalla mailing list
+ActivateCheckReadKey=Chiave utilizzata per crittografare l'URL utilizzato per la funzione "Lettura ricevuta" e "Annulla iscrizione"
 EMailSentToNRecipients=Email sent to %s recipients.
 EMailSentForNElements=Email sent for %s elements.
 XTargetsAdded=<b>%s</b> destinatari aggiunti alla lista di invio
@@ -164,7 +164,11 @@ NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
 OutGoingEmailSetup=Configurazione email in uscita
 InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetupForEmailing=Configurazione della posta elettronica in uscita (per il modulo %s)
 DefaultOutgoingEmailSetup=Impostazione predefinita email in uscita
 Information=Informazioni
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index ac6b8f68408..1b80860c3bc 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -28,7 +28,7 @@ NoTemplateDefined=Nessun tema disponibile per questo tipo di email
 AvailableVariables=Variabili di sostituzione disponibili
 NoTranslation=Nessuna traduzione
 Translation=Traduzioni
-EmptySearchString=Enter non empty search criterias
+EmptySearchString=Inserisci criteri di ricerca non vuoti
 NoRecordFound=Nessun risultato trovato
 NoRecordDeleted=Nessun record eliminato
 NotEnoughDataYet=Dati insufficienti
@@ -174,7 +174,7 @@ SaveAndStay=Salva e rimani
 SaveAndNew=Salva e nuovo
 TestConnection=Test connessione
 ToClone=Clonare
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmCloneAsk=Sei sicuro di voler clonare l'oggetto <b> %s </b>?
 ConfirmClone=Choose data you want to clone:
 NoCloneOptionsSpecified=Dati da clonare non definiti
 Of=di
@@ -187,8 +187,8 @@ ShowCardHere=Visualizza scheda
 Search=Ricerca
 SearchOf=Cerca
 SearchMenuShortCut=Ctrl + Maiusc + f
-QuickAdd=Quick add
-QuickAddMenuShortCut=Ctrl + shift + l
+QuickAdd=Aggiunta rapida
+QuickAddMenuShortCut=CTRL + MAIUSC + L
 Valid=Convalida
 Approve=Approva
 Disapprove=Non approvare
@@ -355,8 +355,8 @@ PriceUTTC=P.U.(lordo)
 Amount=Importo
 AmountInvoice=Importo della fattura
 AmountInvoiced=Importo fatturato
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Importo fatturato (al netto delle imposte)
+AmountInvoicedHT=Importo fatturato (al netto delle imposte)
+AmountInvoicedTTC=Importo fatturato (IVA inclusa)
 AmountPayment=Importo del pagamento
 AmountHTShort=Importo (netto)
 AmountTTCShort=Importo (IVA inc.)
@@ -428,7 +428,7 @@ Modules=Moduli/Applicazioni
 Option=Opzione
 List=Elenco
 FullList=Elenco completo
-FullConversation=Full conversation
+FullConversation=Conversazione completa
 Statistics=Statistiche
 OtherStatistics=Altre statistiche
 Status=Stato
@@ -485,6 +485,7 @@ Categories=Tag/categorie
 Category=Tag/categoria
 By=Per
 From=Da
+FromDate=Da
 FromLocation=A partire dal
 to=a
 To=a
@@ -666,7 +667,7 @@ Owner=Proprietario
 FollowingConstantsWillBeSubstituted=Le seguenti costanti saranno sostitute con i valori corrispondenti
 Refresh=Aggiorna
 BackToList=Torna alla lista
-BackToTree=Back to tree
+BackToTree=Torna all'albero
 GoBack=Torna indietro
 CanBeModifiedIfOk=Può essere modificato se valido
 CanBeModifiedIfKo=Può essere modificato se non valido
@@ -687,6 +688,7 @@ Method=Metodo
 Receive=Ricevi
 CompleteOrNoMoreReceptionExpected=Completa o non attendere altro
 ExpectedValue=Valore atteso
+ExpectedQty=Expected Qty
 PartialWoman=Parziale
 TotalWoman=Totale
 NeverReceived=Mai ricevuto
@@ -703,6 +705,7 @@ MenuECM=Documenti
 MenuAWStats=AWStats
 MenuMembers=Membri
 MenuAgendaGoogle=Agenda Google
+MenuTaxesAndSpecialExpenses=Tasse | Spese speciali
 ThisLimitIsDefinedInSetup=Limite applicazione (Menu home-impostazioni-sicurezza):%s Kb, limite PHP:%s Kb
 NoFileFound=Nessun documento salvato in questa directory
 CurrentUserLanguage=Lingua dell'utente
@@ -725,7 +728,7 @@ Page=Pagina
 Notes=Note
 AddNewLine=Aggiungi una nuova riga
 AddFile=Aggiungi file
-FreeZone=Non è un prodotto/servizio predefinito
+FreeZone=Prodotto a testo libero
 FreeLineOfType=Testo libero, tipologia:
 CloneMainAttributes=Clona oggetto con i suoi principali attributi
 ReGeneratePDF=Rigenera PDF
@@ -834,8 +837,8 @@ Gender=Genere
 Genderman=Uomo
 Genderwoman=Donna
 ViewList=Vista elenco
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=Visualizzazione Gantt
+ViewKanban=Visualizzazione Kanban
 Mandatory=Obbligatorio
 Hello=Ciao
 GoodBye=Addio
@@ -843,7 +846,7 @@ Sincerely=Cordialmente
 ConfirmDeleteObject=Sei sicuro di voler eliminare questo oggetto?
 DeleteLine=Elimina riga
 ConfirmDeleteLine=Vuoi davvero eliminare questa riga?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Errore: il file non è stato generato. Verificare che il comando "pdftk" sia installato in una directory inclusa nella variabile d'ambiente $ PATH (solo linux / unix) o contattare l'amministratore di sistema.
 NoPDFAvailableForDocGenAmongChecked=Non è possibile generare il documento PDF dai record selezionati
 TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
 NoRecordSelected=Nessun record selezionato
@@ -858,7 +861,7 @@ Progress=Avanzamento
 ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Backoffice
-Submit=Submit
+Submit=Invia
 View=Vista
 Export=Esportazione
 Exports=Esportazioni
@@ -942,6 +945,39 @@ ShortThursday=Gio
 ShortFriday=Ven
 ShortSaturday=Sab
 ShortSunday=Dom
+one=one
+two=due
+three=three
+four=four
+five=five
+six=sei
+seven=sette
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sedici
+seventeen=diciassette
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Seleziona un tema email
 SetRef=Imposta rif.
 Select2ResultFoundUseArrows=Alcuni risultati trovati. Usa le frecce per selezionare.
@@ -1023,19 +1059,27 @@ ContactDefault_propal=Preventivo
 ContactDefault_supplier_proposal=Proposta del fornitore
 ContactDefault_ticket=Ticket
 ContactAddedAutomatically=Contatto aggiunto dai ruoli di contatto di terze parti
-More=More
+More=Di Più
 ShowDetails=Mostra dettagli
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
+CustomReports=Report personalizzati
+StatisticsOn=Statistiche su
+SelectYourGraphOptionsFirst=Seleziona le opzioni del grafico per creare un grafico
+Measures=Le misure
 XAxis=Asse X
 YAxis=Asse Y
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+StatusOfRefMustBe=Lo stato di %s deve essere %s
+DeleteFileHeader=Conferma l'eliminazione del file
+DeleteFileText=Vuoi davvero eliminare questo file?
+ShowOtherLanguages=Mostra altre lingue
+SwitchInEditModeToAddTranslation=Passa alla modalità di modifica per aggiungere traduzioni per questa lingua
+NotUsedForThisCustomer=Non utilizzato per questo cliente
+AmountMustBePositive=L'importo deve essere positivo
+ByStatus=Per stato
+InformationMessage=Informazioni
+Used=Used
+ASAP=Il prima possibile
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 070cceee799..a21800a5013 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -81,7 +81,7 @@ DeleteType=Elimina
 VoteAllowed=E' permesso il voto
 Physical=Fisica
 Moral=Giuridica
-MorPhy=Giuridica/fisica
+MorPhy=Natura
 Reenable=Riattivare
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -175,7 +175,7 @@ MembersStatisticsDesc=Scegli quali statistiche visualizzare...
 MenuMembersStats=Statistiche
 LastMemberDate=Latest member date
 LatestSubscriptionDate=Data della sottoscrizione più recente
-MemberNature=Nature of member
+MemberNature=Natura del membro
 Public=Pubblico
 NewMemberbyWeb=Nuovo membro aggiunto. In attesa di approvazione
 NewMemberForm=Nuova modulo membri
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index db7e5ea8b69..d15a6328f84 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -27,7 +27,7 @@ DangerZone=Danger zone
 BuildPackage=Crea pacchetto
 BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Build documentation
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
+ModuleIsNotActive=Questo modulo non è ancora attivato. Vai su %s per renderlo live o fai clic qui
 ModuleIsLive=This module has been activated. Any change may break a current live feature.
 DescriptionLong=Long description
 EditorName=Name of editor
@@ -83,18 +83,18 @@ ListOfDictionariesEntries=Elenco voci dizionari
 ListOfPermissionsDefined=List of defined permissions
 SeeExamples=Vedi esempi qui
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never 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 end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
+VisibleDesc=Il campo è visibile? (Esempi: 0 = Mai visibile, 1 = Visibile su elenco e crea / aggiorna / visualizza moduli, 2 = Visibile solo su elenco, 3 = Visibile solo su crea / aggiorna / visualizza modulo (non elenco), 4 = Visibile su elenco e aggiorna / visualizza solo modulo (non crea), 5 = Visibile solo sul modulo di visualizzazione fine elenco (non crea, non aggiorna). <br> <br> L'uso di un valore negativo significa che il campo non è mostrato per impostazione predefinita nell'elenco ma può essere selezionato per la visualizzazione). <br> <br> Può essere un'espressione, ad esempio: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Visualizza questo campo sui documenti PDF compatibili, puoi gestire la posizione con il campo "Posizione". <br/> Attualmente, noti modelli compatibili PDF sono: Eratostene (ordine), espadon (nave), spugna (fatture), ciano (PROPAL / citazione), cornas (ordine a fornitore) <br/> <br/> <strong> per il documento: </strong> <br/> 0 = non visualizzato <br/> 1 = visualizza <br/> 2 = visualizza solo se non vuota <br/> <br/> <strong> Per linee documenti: </strong> <br/> 0 = non visualizzato <br/> 1 = visualizzati in colonna <br/> 3 = visualizzazione nella descrizione di linea di colonna dopo la descrizione <br/> 4 = visualizzazione nella descrizione di colonna dopo la descrizione solo se non vuota
 DisplayOnPdf=Mostra sul PDF
 IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
 SearchAllDesc=Il campo è utilizzato per effettuare una ricerca dallo strumento di ricerca rapida? (Esempi: 1 o 0)
 SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.
 LanguageDefDesc=Enter in this files, all the key and the translation for each language file.
 MenusDefDesc=Define here the menus provided by your module
-DictionariesDefDesc=Define here the dictionaries provided by your module
+DictionariesDefDesc=Definisci qui i dizionari forniti dal tuo modulo
 PermissionsDefDesc=Define here the new permissions provided by your module
 MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
-DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
+DictionariesDefDescTooltip=I dizionari forniti dal modulo / applicazione sono definiti nell'array <strong> $this->dictionaries </strong> nel file descrittore del modulo. Puoi modificare manualmente questo file o utilizzare l'editor incorporato. <br> <br> Nota: una volta definiti (e riattivato il modulo), i dizionari sono visibili nell'area di configurazione anche agli utenti amministratori su %s.
 PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
 TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed.
@@ -116,8 +116,8 @@ ContentOfREADMECustomized=Nota: il contenuto del file README.md è stato sostitu
 RealPathOfModule=Real path of module
 ContentCantBeEmpty=Content of file can't be empty
 WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
-JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
+CSSDesc=Puoi generare e modificare qui un file con CSS personalizzato incorporato nel tuo modulo.
+JSDesc=Puoi generare e modificare qui un file con Javascript personalizzato incorporato nel tuo modulo.
 CLIDesc=You can generate here some command line scripts you want to provide with your module.
 CLIFile=CLI File
 NoCLIFile=No CLI files
@@ -127,16 +127,16 @@ UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
 ModuleMustBeEnabled=The module/application must be enabled first
-IncludeRefGeneration=The reference of object must be generated automatically
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
+IncludeRefGeneration=Il riferimento dell'oggetto deve essere generato automaticamente
+IncludeRefGenerationHelp=Seleziona questa opzione se desideri includere il codice per gestire la generazione automatica del riferimento
 IncludeDocGeneration=Desidero generare alcuni documenti da questo oggetto
-IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
+IncludeDocGenerationHelp=Se selezioni questa opzione, verrà generato del codice per aggiungere una casella "Genera documento" al record.
 ShowOnCombobox=Mostra il valore dentro il combobox
-KeyForTooltip=Key for tooltip
+KeyForTooltip=Chiave per tooltip
 CSSClass=Classe CSS
 NotEditable=Non modificabile
 ForeignKey=Chiave esterna
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
-AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+TypeOfFieldsHelp=Tipo di campi: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]("1" significa che aggiungiamo un pulsante + dopo la combinazione per creare il record, "filtro" può essere "status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)" per esempio)
+AsciiToHtmlConverter=Convertitore da Ascii a HTML
+AsciiToPdfConverter=Convertitore da Ascii a PDF
+TableNotEmptyDropCanceled=Tabella non vuota. Il rilascio è stato annullato.
diff --git a/htdocs/langs/it_IT/mrp.lang b/htdocs/langs/it_IT/mrp.lang
index 140ab7b5de4..9db0cbe4008 100644
--- a/htdocs/langs/it_IT/mrp.lang
+++ b/htdocs/langs/it_IT/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Ordini di produzione
 MO=Ordine di produzione
+MOs=Manufacturing orders
 MRPDescription=Modulo per la gestione degli ordini di produzione (MO).
 MRPArea=MRP Area
 MrpSetupPage=Configurazione del modulo MRP
@@ -24,9 +25,9 @@ WatermarkOnDraftMOs=Filigrana sulla bozza degli ordini di produzione MO (se pres
 ConfirmCloneBillOfMaterials=Are you sure you want to clone this bill of material ?
 ConfirmCloneMo=Vuoi davvero clonare l'ordine di produzione %s?
 ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
+ConsumptionEfficiency=Efficienza dei consumi
 ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+ValueOfMeansLossForProductProduced=Il valore di 0,95 indica una media di 5%% di perdita del prodotto prodotto
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Elimina Ordine di Produzione
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
@@ -38,40 +39,40 @@ DateStartPlannedMo=Data di inizio prevista
 DateEndPlannedMo=Fine della data prevista
 KeepEmptyForAsap=Vuoto significa &quot;Il più presto possibile&quot;
 EstimatedDuration=Durata stimata
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
+EstimatedDurationDesc=Durata prevista per la fabbricazione di questo prodotto utilizzando questa distinta base
+ConfirmValidateBom=Vuoi convalidare la distinta base con il riferimento <strong> %s </strong> (sarai in grado di usarlo per costruire nuovi ordini di produzione)
 ConfirmCloseBom=Vuoi davvero eliminare questa Distinta Base (non sarà più possibile utilizzarla per creare nuovi ordini di produzione)
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
+ConfirmReopenBom=Sei sicuro di voler riaprire questa BOM (potrai usarla per creare nuovi ordini di produzione)
 StatusMOProduced=Prodotto
 QtyFrozen=Quantità congelata
 QuantityFrozen=Quantità congelata
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
+QuantityConsumedInvariable=Quando questo flag è impostato, la quantità consumata è sempre il valore definito e non è relativa alla quantità prodotta.
+DisableStockChange=Cambio stock disabilitato
+DisableStockChangeHelp=Quando questo flag è impostato, non ci sono variazioni di stock su questo prodotto, qualunque sia la quantità consumata
+BomAndBomLines=Distinte base e righe
+BOMLine=Riga di distinta base
 WarehouseForProduction=Magazzino per la produzione
 CreateMO=Crea Ordine di Produzione
-ToConsume=To consume
+ToConsume=Da consumare
 ToProduce=Da produrre
 QtyAlreadyConsumed=Q.tà già consumate
 QtyAlreadyProduced=Q.tà già prodotte
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
+QtyRequiredIfNoLoss=Qtà richiesta se non ci sono perdite (l'efficienza di produzione è 100%%)
+ConsumeOrProduce=Consumare o produrre
+ConsumeAndProduceAll=Consuma e produci tutto
+Manufactured=Creato
+TheProductXIsAlreadyTheProductToProduce=Il prodotto da aggiungere è già il prodotto da produrre.
+ForAQuantityOf=Per una quantità da produrre di %s
+ConfirmValidateMo=Sei sicuro di voler convalidare questo ordine di produzione?
+ConfirmProductionDesc=Cliccando su '%s' convaliderai il consumo e / o la produzione per le quantità impostate. Ciò aggiornerà anche le azioni e registrerà i movimenti delle scorte.
 ProductionForRef=Produzione di %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+AutoCloseMO=Chiude automaticamente l'ordine di produzione se vengono raggiunte le quantità da consumare e da produrre
+NoStockChangeOnServices=Nessuna variazione di stock sui servizi
+ProductQtyToConsumeByMO=Quantità di prodotto ancora da consumare con MO aperto
+ProductQtyToProduceByMO=Quantità di prodotto ancora da produrre con MO aperto
+AddNewConsumeLines=Aggiungi una nuova riga da consumare
+ProductsToConsume=Prodotti da consumare
+ProductsToProduce=Prodotti da produrre
+UnitCost=Costo unitario
+TotalCost=Costo totale
+BOMTotalCost=Il costo per produrre questa distinta base in base al costo di ciascuna quantità e prodotto da consumare (utilizzare il prezzo di costo se definito, altrimenti il prezzo medio ponderato se definito, altrimenti il miglior prezzo di acquisto)
diff --git a/htdocs/langs/it_IT/multicurrency.lang b/htdocs/langs/it_IT/multicurrency.lang
index 1dafc929e0b..556b727c6d6 100644
--- a/htdocs/langs/it_IT/multicurrency.lang
+++ b/htdocs/langs/it_IT/multicurrency.lang
@@ -18,5 +18,5 @@ MulticurrencyReceived=Received, original currency
 MulticurrencyRemainderToTake=Remaining amout, original currency
 MulticurrencyPaymentAmount=Payment amount, original currency
 AmountToOthercurrency=Amount To (in currency of receiving account)
-CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
-MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
+CurrencyRateSyncSucceed=Sincronizzazione del tasso di cambio eseguita correttamente
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Usa la valuta del documento per i pagamenti online
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 5e6d2494fce..1e1fe945c8f 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -30,11 +30,11 @@ PreviousYearOfInvoice=Previous year of invoice date
 NextYearOfInvoice=Following year of invoice date
 DateNextInvoiceBeforeGen=Date of next invoice (before generation)
 DateNextInvoiceAfterGen=Date of next invoice (after generation)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
+GraphInBarsAreLimitedToNMeasures=Le grafiche sono limitate a misure %s in modalità "Bars". La modalità "Linee" è stata invece selezionata automaticamente.
+OnlyOneFieldForXAxisIsPossible=Al momento è possibile solo 1 campo come asse X. È stato selezionato solo il primo campo selezionato.
+AtLeastOneMeasureIsRequired=È richiesto almeno 1 campo per la misura
+AtLeastOneXAxisIsRequired=È richiesto almeno 1 campo per l'asse X.
+LatestBlogPosts=Ultimi post del blog
 Notify_ORDER_VALIDATE=Sales order validated
 Notify_ORDER_SENTBYMAIL=Sales order sent by mail
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
@@ -85,8 +85,8 @@ MaxSize=La dimensione massima è
 AttachANewFile=Allega un nuovo file/documento
 LinkedObject=Oggetto collegato
 NbOfActiveNotifications=Numero di notifiche (num. di email da ricevere)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailTest=__(Ciao)__\nQuesta è una mail di prova inviata a __EMAIL__.\nLe righe sono separate da un ritorno a capo.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__ (Ciao) __ <br> Questa è una mail di <b> prova </b> inviata a __EMAIL__ (la parola prova deve essere in grassetto). <br> Le righe sono separate da un ritorno a capo. <br> <br> __USER_SIGNATURE__
 PredefinedMailContentContract=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to remind you that the invoice  __REF__ seems to have not been paid. A copy of the invoice is attached as a reminder.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Buongiorno)__\n\n\n__(Cordialmente)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr è un ERP/CRM compatto composto di diversi moduli funzionali. Un demo comprendente tutti i moduli non ha alcun senso, perché un caso simile non esiste nella realtà. Sono dunque disponibili diversi profili demo.
 ChooseYourDemoProfil=Scegli il profilo demo che corrisponde alla tua attività ...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -108,8 +106,8 @@ DemoFundation=Gestisci i membri di una Fondazione
 DemoFundation2=Gestisci i membri e un conto bancario di una Fondazione
 DemoCompanyServiceOnly=Gestire un'attività freelance di vendita di soli servizi
 DemoCompanyShopWithCashDesk=Gestire un negozio con una cassa
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyProductAndStocks=Negozio di vendita di prodotti con punto vendita
+DemoCompanyManufacturing=Azienda produttrice di prodotti
 DemoCompanyAll=Gestire una piccola o media azienda con più attività (tutti i moduli principali)
 CreatedBy=Creato da %s
 ModifiedBy=Modificato da %s
@@ -190,7 +188,7 @@ NumberOfSupplierProposals=Numero di proposte del fornitore
 NumberOfSupplierOrders=Numero ordini d'acquisto
 NumberOfSupplierInvoices=Number of vendor invoices
 NumberOfContracts=Numero di contratti
-NumberOfMos=Number of manufacturing orders
+NumberOfMos=Numero di ordini di produzione
 NumberOfUnitsProposals=Numero di unità nei preventivi
 NumberOfUnitsCustomerOrders=Numero di unità sugli ordini cliente
 NumberOfUnitsCustomerInvoices=Numero di unità nelle fatture cliente
@@ -198,7 +196,7 @@ NumberOfUnitsSupplierProposals=Numero di unità nelle proposte fornitori
 NumberOfUnitsSupplierOrders=Numero di unità negli ordini d'acquisto
 NumberOfUnitsSupplierInvoices=Numero di unità nelle fatture fornitore
 NumberOfUnitsContracts=Numero di unità nei contratti
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
+NumberOfUnitsMos=Numero di unità da produrre negli ordini di produzione
 EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
 EMailTextInterventionValidated=Intervento %s convalidato
 EMailTextInvoiceValidated=La fattura %s è stata convalidata.
@@ -274,13 +272,15 @@ WEBSITE_PAGEURL=Indirizzo URL della pagina
 WEBSITE_TITLE=Titolo
 WEBSITE_DESCRIPTION=Descrizione
 WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_IMAGEDesc=Percorso relativo del supporto immagine. Puoi mantenerlo vuoto poiché è usato raramente (può essere usato dal contenuto dinamico per mostrare una miniatura in un elenco di post del blog). Utilizza __WEBSITE_KEY__ nel percorso se il percorso dipende dal nome del sito web (ad esempio: image / __ WEBSITE_KEY __ / stories / myimage.png).
 WEBSITE_KEYWORDS=Parole chiave
 LinesToImport=Righe da importare
 
 MemoryUsage=Utilizzo della memoria
 RequestDuration=Duration of request
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
+ProductsPerPopularity=Prodotti / servizi per popolarità
+PopuProp=Prodotti / servizi per popolarità nelle proposte
+PopuCom=Prodotti / servizi per popolarità negli ordini
+ProductStatistics=Statistiche sui prodotti / servizi
+NbOfQtyInOrders=Qtà in ordini
+SelectTheTypeOfObjectToAnalyze=Seleziona il tipo di oggetto da analizzare...
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 9feed4c9e3b..6dd038a8389 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -22,8 +22,8 @@ ProductVatMassChangeDesc=Questo strumento aggiorna l'aliquota IVA definita su <b
 MassBarcodeInit=Inizializzazione di massa dei codici a barre
 MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un codice a barre di un oggetto che non ha ancora un codice a barre definito. Controlla prima che il setup del modulo Codici a barre sia completo.
 ProductAccountancyBuyCode=Codice contabile (acquisto)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Codice contabile (acquisto intracomunitario)
+ProductAccountancyBuyExportCode=Codice contabile (importazione acquisti)
 ProductAccountancySellCode=Codice contabile (vendita)
 ProductAccountancySellIntraCode=Codice contabile (vendita intracomunitaria)
 ProductAccountancySellExportCode=Codice contabile (vendita per esportazione)
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Servizi solo vendibili
 ServicesOnPurchaseOnly=Servizi solo acquistabili
 ServicesNotOnSell=Servizi non vendibili nè acquistabili
 ServicesOnSellAndOnBuy=Servizi vendibili ed acquistabili
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Ultimi %s prodotti / servizi modificati 
 LastRecordedProducts=Ultimi %s prodotti registrati
 LastRecordedServices=Ultimi %s servizi registrati
 CardProduct0=Prodotto
@@ -104,9 +104,10 @@ SetDefaultBarcodeType=Imposta tipo di codice a barre
 BarcodeValue=Valore codice a barre
 NoteNotVisibleOnBill=Nota (non visibile su fatture, proposte ...)
 ServiceLimitedDuration=Se il prodotto è un servizio di durata limitata:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Numero di prezzi per il multi-prezzi
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
+DefaultPriceType=Base dei prezzi per impostazione predefinita (con contro senza tasse) quando si aggiungono nuovi prezzi di vendita
 AssociatedProductsAbility=Attiva i prodotti virtuali (kits)
 AssociatedProducts=Prodotti virtuali
 AssociatedProductsNumber=Numero di prodotti associati
@@ -168,7 +169,9 @@ SuppliersPrices=Prezzi fornitore
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Dogana/Merce/Codice SA
 CountryOrigin=Paese di origine
-Nature=Nature of product (material/finished)
+Nature=Natura del prodotto (materiale / finito)
+NatureOfProductShort=Natura del prodotto
+NatureOfProductDesc=Materia prima o prodotto finito
 ShortLabel=Etichetta breve
 Unit=Unità
 p=u.
@@ -213,7 +216,7 @@ unitDM=dm
 unitCM=cm
 unitMM=mm
 unitFT=ft
-unitIN=in
+unitIN=nel
 unitM2=Metro quadro
 unitDM2=dm²
 unitCM2=cm²
@@ -320,9 +323,9 @@ ProductWeight=Peso per 1 prodotto
 ProductVolume=Volume per 1 prodotto
 WeightUnits=Unità di peso
 VolumeUnits=Unità di volume
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
+WidthUnits=Unità di larghezza
+LengthUnits=Unità di lunghezza
+HeightUnits=Unità di altezza
 SurfaceUnits=Unità di superficie
 SizeUnits=Unità di misura
 DeleteProductBuyPrice=Cancella prezzo di acquisto
@@ -334,9 +337,9 @@ PossibleValues=Valori possibili
 GoOnMenuToCreateVairants=Vai sul menu %s - %s per preparare le varianti degli attributi (come colori, dimensioni, ...)
 UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
 ProductSupplierDescription=Vendor description for the product
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+UseProductSupplierPackaging=Utilizzare l'imballaggio sui prezzi del fornitore (ricalcolare le quantità in base all'imballaggio impostato sul prezzo del fornitore quando si aggiunge / aggiorna la riga nei documenti del fornitore)
+PackagingForThisProduct=Confezione
+QtyRecalculatedWithPackaging=La quantità della linea è stata ricalcolata in base all'imballaggio del fornitore
 
 #Attributes
 VariantAttributes=Variante attributi
@@ -359,6 +362,9 @@ SelectCombination=Selezione combinazione
 ProductCombinationGenerator=Generatore di varianti
 Features=Caratteristiche
 PriceImpact=Impatto sui prezzi
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Impatto del peso
 NewProductAttribute=Nuovo attributo
 NewProductAttributeValue=Nuovo valore dell'attributo
@@ -383,4 +389,4 @@ ErrorProductCombinationNotFound=Variante di prodotto non trovata
 ActionAvailableOnVariantProductOnly=Action only available on the variant of product
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Attributi aggiuntivi (prezzi dei fornitori)
-DeleteLinkedProduct=Delete the child product linked to the combination
+DeleteLinkedProduct=Elimina il prodotto figlio collegato alla combinazione
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 0351e47f27e..9d68b1ca8f8 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Sezione progetti
 ProjectStatus=Stato del progetto
 SharedProject=Progetto condiviso
 PrivateProject=Contatti del progetto
-ProjectsImContactFor=Projects for which I am explicitly a contact
+ProjectsImContactFor=Progetti per i quali sono esplicitamente un contatto
 AllAllowedProjects=Tutti i progetti che posso vedere (miei + pubblici)
 AllProjects=Tutti i progetti
 MyProjectsDesc=La vista è limitata ai progetti di cui tu sei un contatto.
@@ -34,7 +34,7 @@ ConfirmDeleteATask=Vuoi davvero eliminare questo compito?
 OpenedProjects=Progetti aperti
 OpenedTasks=Attività aperte
 OpportunitiesStatusForOpenedProjects=Importo delle vendite potenziali per stato nei progetti
-OpportunitiesStatusForProjects=Leads amount of projects by status
+OpportunitiesStatusForProjects=Quantità di Lead per stato progetto
 ShowProject=Visualizza progetto
 ShowTask=Visualizza compito
 SetProject=Imposta progetto
@@ -69,7 +69,7 @@ NewTask=Nuovo compito
 AddTask=Crea attività
 AddTimeSpent=Aggiungi tempo lavorato
 AddHereTimeSpentForDay=Aggiungi qui il tempo impiegato in questo giorno/attività
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddHereTimeSpentForWeek=Aggiungi qui il tempo trascorso per questa settimana / attività
 Activity=Operatività
 Activities=Compiti/operatività
 MyActivities=I miei compiti / operatività
@@ -88,8 +88,8 @@ Time=Tempo
 ListOfTasks=Elenco dei compiti
 GoToListOfTimeConsumed=Vai all'elenco del tempo impiegato
 GanttView=Vista Gantt
-ListProposalsAssociatedProject=List of the commercial proposals related to the project
-ListOrdersAssociatedProject=List of sales orders related to the project
+ListProposalsAssociatedProject=Elenco delle proposte commerciali relative al progetto
+ListOrdersAssociatedProject=Elenco degli ordini cliente relativi al progetto
 ListInvoicesAssociatedProject=Elenco delle fatture cliente associate al progetto
 ListPredefinedInvoicesAssociatedProject=Elenco dei modelli di fattura cliente associati al progetto
 ListSupplierOrdersAssociatedProject=Elenco degli ordini d'acquisto associati al progetto
@@ -99,10 +99,10 @@ ListShippingAssociatedProject=Elenco spedizioni associate al progetto
 ListFichinterAssociatedProject=Elenco interventi associati al progetto
 ListExpenseReportsAssociatedProject=Elenco delle note spese associate al progetto
 ListDonationsAssociatedProject=Elenco delle donazioni associate al progetto
-ListVariousPaymentsAssociatedProject=List of miscellaneous payments related to the project
+ListVariousPaymentsAssociatedProject=Elenco di pagamenti vari relativi al progetto
 ListSalariesAssociatedProject=Elenco pagamenti stipendio associati al progetto
 ListActionsAssociatedProject=Elenco degli eventi associati al progetto
-ListMOAssociatedProject=List of manufacturing orders related to the project
+ListMOAssociatedProject=Elenco degli ordini di produzione relativi al progetto
 ListTaskTimeUserProject=Tempo impiegato in compiti del progetto
 ListTaskTimeForTask=Tempo impiegato per l'attività
 ActivityOnProjectToday=Operatività sul progetto oggi
@@ -115,7 +115,7 @@ ChildOfTask=Figlio dell'attività
 TaskHasChild=L'attività ha un figlio
 NotOwnerOfProject=Non sei proprietario di questo progetto privato
 AffectedTo=Assegnato a
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+CantRemoveProject=Questo progetto non può essere rimosso poiché è referenziato da altri oggetti (fattura, ordini o altro). Vedere la scheda "%s".
 ValidateProject=Convalida progetto
 ConfirmValidateProject=Vuoi davvero convalidare il progetto?
 CloseAProject=Chiudi il progetto
@@ -162,8 +162,8 @@ OpportunityProbability=Probabilità oppotunità
 OpportunityProbabilityShort=Probab. opportunità
 OpportunityAmount=Importo totale opportunità
 OpportunityAmountShort=Importo totale opportunità
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityWeightedAmount=Importo ponderato per le opportunità
+OpportunityWeightedAmountShort=Opp. importo ponderato
 OpportunityAmountAverageShort=Importo medio opportunità
 OpportunityAmountWeigthedShort=Importo pesato opportunità
 WonLostExcluded=Escluse acquisite/perse
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributore
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributore
 SelectElement=Seleziona elemento
 AddElement=Link all'elemento
+LinkToElementShort=Collega a
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -186,7 +187,7 @@ PlannedWorkload=Carico di lavoro previsto
 PlannedWorkloadShort=Carico di lavoro
 ProjectReferers=Elementi correlati
 ProjectMustBeValidatedFirst=I progetti devono prima essere validati
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Assegnare una risorsa utente come contatto del progetto per allocare il tempo
 InputPerDay=Input per giorno
 InputPerWeek=Input per settimana
 InputPerMonth=Input per mese
@@ -196,7 +197,7 @@ ProjectsWithThisUserAsContact=Progetti con questo utente come contatto
 TasksWithThisUserAsContact=Compiti assegnati a questo utente
 ResourceNotAssignedToProject=Non assegnato al progetto
 ResourceNotAssignedToTheTask=Risorsa non assegnata all'attività
-NoUserAssignedToTheProject=No users assigned to this project
+NoUserAssignedToTheProject=Nessun utente assegnato a questo progetto
 TimeSpentBy=Tempo impiegato da
 TasksAssignedTo=Attività assegnata a
 AssignTaskToMe=Assegnare un compito a me
@@ -208,11 +209,11 @@ ManageTasks=Utilizzare i progetti per seguire compiti e/o tempo lavorato
 ManageOpportunitiesStatus=Utilizzare i progetti per seguire clienti interessati/opportunità
 ProjectNbProjectByMonth=Num. di progetti creati per mese
 ProjectNbTaskByMonth=Numero di attività create per mese
-ProjectOppAmountOfProjectsByMonth=Amount of leads by month
+ProjectOppAmountOfProjectsByMonth=Quantità di Lead per mese
 ProjectWeightedOppAmountOfProjectsByMonth=Quantità ponderata di opportunità per mese
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Le statistiche relative a progetti/clienti interessati
-TasksStatistics=Statistiche su attività di progetto/clienti interessati
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Compito assegnato. Inserire i tempi per questo compito dovrebbe esserre possibile.
 IdTaskTime=Tempo compito id
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
@@ -232,13 +233,13 @@ OppStatusPENDING=In attesa
 OppStatusWON=Vinto
 OppStatusLOST=Perso
 Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+AllowToLinkFromOtherCompany=Consenti di collegare progetti di altre società <br> <br><u>Valori supportati:</u><br>- Mantieni vuoto: può collegare qualsiasi progetto dell'azienda (impostazione predefinita)<br>- "tutto": può collegare qualsiasi progetto, anche progetti di altre società<br>- Un elenco di ID di terze parti separati da virgole: può collegare tutti i progetti di queste terze parti (Esempio: 123,4795,53)<br>
 LatestProjects=Ultimi %s progetti
 LatestModifiedProjects=Ultimi %s progetti modificati
 OtherFilteredTasks=Altre attività filtrate
 NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+ChooseANotYetAssignedTask=Scegli un'attività non ancora assegnata a te
 # Comments trans
 AllowCommentOnTask=Permetti agli utenti di commentare queste attività
 AllowCommentOnProject=Permetti agli utenti di commentare questi progetti
@@ -253,9 +254,9 @@ TimeSpentForInvoice=Tempo lavorato
 OneLinePerUser=One line per user
 ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
+ProjectBillTimeDescription=Check se inserisci la scheda attività sulle attività del progetto E prevedi di generare fatture dalla scheda attività per fatturare al cliente il progetto (non verificare se si prevede di creare una fattura che non si basa sulle schede attività inserite). Nota: per generare una fattura, vai sulla scheda "Tempo trascorso" del progetto e seleziona le righe da includere.
 ProjectFollowOpportunity=Opportunità da seguire
-ProjectFollowTasks=Follow tasks or time spent
+ProjectFollowTasks=Segui le attività o il tempo trascorso
 Usage=Utilizzo
 UsageOpportunity=Utilizzo: opportunità
 UsageTasks=Uso: Compiti
@@ -263,6 +264,6 @@ UsageBillTimeShort=Utilizzo: tempo di fatturazione
 InvoiceToUse=Fattura in bozza da usare
 NewInvoice=Nuova fattura
 OneLinePerTask=Una riga per compito
-OneLinePerPeriod=One line per period
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
+OneLinePerPeriod=Una riga per periodo
+RefTaskParent=Ref. Attività genitore
+ProfitIsCalculatedWith=Il profitto viene calcolato utilizzando
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index 6b8fbeb5758..b5b78417e8d 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -84,4 +84,4 @@ DefaultModelPropalClosed=Modello predefinito quando si chiude un preventivo (da
 ProposalCustomerSignature=Accettazione scritta, timbro, data e firma
 ProposalsStatisticsSuppliers=Statistiche preventivi fornitori
 CaseFollowedBy=Caso seguito da
-SignedOnly=Signed only
+SignedOnly=Solo firmato
diff --git a/htdocs/langs/it_IT/receiptprinter.lang b/htdocs/langs/it_IT/receiptprinter.lang
index 816032153c5..a5fbeef5ad6 100644
--- a/htdocs/langs/it_IT/receiptprinter.lang
+++ b/htdocs/langs/it_IT/receiptprinter.lang
@@ -15,12 +15,12 @@ CONNECTOR_DUMMY=Stampante dummy
 CONNECTOR_NETWORK_PRINT=Stampante di rete
 CONNECTOR_FILE_PRINT=Stampante locale
 CONNECTOR_WINDOWS_PRINT=Stampante Windows locale
-CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_CUPS_PRINT=Stampante per tazze
 CONNECTOR_DUMMY_HELP=Stampante di test (non stampa davvero)
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
-CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+CONNECTOR_CUPS_PRINT_HELP=Nome della stampante per tazze, esempio: HPRT_TP805L
 PROFILE_DEFAULT=Profilo predefinito
 PROFILE_SIMPLE=Profilo semplice
 PROFILE_EPOSTEP=Epos Tep Profile
@@ -49,34 +49,34 @@ DOL_PRINT_LOGO=Stampa il logo della mia azienda
 DOL_PRINT_LOGO_OLD=Stampa il logo della mia azienda (vecchie stampe)
 DOL_BOLD=Grassetto
 DOL_BOLD_DISABLED=Disabilita grassetto
-DOL_DOUBLE_HEIGHT=Double height size
-DOL_DOUBLE_WIDTH=Double width size
-DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
-DOL_UNDERLINE=Enable underline
-DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
-DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
-YearInvoice=Invoice year
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
-DOL_VALUE_MONTH=Invoice month
-DOL_VALUE_DAY=Invoice day
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
-InvoiceID=Invoice ID
+DOL_DOUBLE_HEIGHT=Doppia altezza
+DOL_DOUBLE_WIDTH=Doppia larghezza
+DOL_DEFAULT_HEIGHT_WIDTH=Altezza e larghezza predefinite
+DOL_UNDERLINE=Abilita sottolineatura
+DOL_UNDERLINE_DISABLED=Disabilita la sottolineatura
+DOL_BEEP=Suono di Beed
+DOL_PRINT_TEXT=Stampa il testo
+DateInvoiceWithTime=Data e ora della fattura
+YearInvoice=Anno della fattura
+DOL_VALUE_MONTH_LETTERS=Mese della fattura in lettere
+DOL_VALUE_MONTH=Mese della fattura
+DOL_VALUE_DAY=Giorno della fattura
+DOL_VALUE_DAY_LETTERS=Il giorno della fattura in lettere
+DOL_LINE_FEED_REVERSE=Line feed inverso
+InvoiceID=codice di identificazione della fattura
 InvoiceRef=Rif. fattura
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+DOL_PRINT_OBJECT_LINES=Righe fattura
+DOL_VALUE_CUSTOMER_FIRSTNAME=Nome del cliente
+DOL_VALUE_CUSTOMER_LASTNAME=Cognome del cliente
+DOL_VALUE_CUSTOMER_MAIL=Mail del cliente
+DOL_VALUE_CUSTOMER_PHONE=Telefono del cliente
+DOL_VALUE_CUSTOMER_MOBILE=Cellulare del cliente
+DOL_VALUE_CUSTOMER_SKYPE=Skype del cliente
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Codice fiscale del cliente
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Saldo del conto del cliente
+DOL_VALUE_MYSOC_NAME=Il nome della tua azienda
+VendorLastname=Cognome del venditore
+VendorFirstname=Nome del venditore
+VendorEmail=Email del venditore
+DOL_VALUE_CUSTOMER_POINTS=Punti del cliente
+DOL_VALUE_OBJECT_POINTS=Punti oggetto
diff --git a/htdocs/langs/it_IT/receptions.lang b/htdocs/langs/it_IT/receptions.lang
index d38d3833246..001cfb9a3e7 100644
--- a/htdocs/langs/it_IT/receptions.lang
+++ b/htdocs/langs/it_IT/receptions.lang
@@ -43,5 +43,5 @@ ProductQtyInSuppliersReceptionAlreadyRecevied=Quantità prodotto dall'ordine for
 ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
 ReceptionsNumberingModules=Numbering module for receptions
 ReceptionsReceiptModel=Document templates for receptions
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
+NoMorePredefinedProductToDispatch=Non ci sono più prodotti predefiniti da spedire
 
diff --git a/htdocs/langs/it_IT/recruitment.lang b/htdocs/langs/it_IT/recruitment.lang
new file mode 100644
index 00000000000..13d11c2e3ea
--- /dev/null
+++ b/htdocs/langs/it_IT/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Selezione
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Gestire e seguire le campagne di assunzione per le nuove posizioni lavorative
+
+#
+# Admin page
+#
+RecruitmentSetup = Setup Selezione
+Settings = Impostazioni
+RecruitmentSetupPage = Inserisci qui le impostazioni delle opzioni principali per il modulo di selezione
+RecruitmentArea=Area selezioni
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Info
+RecruitmentAbout = Info Selezione
+RecruitmentAboutPage = Sulla pagina Selezioni
+NbOfEmployeesExpected=Numero previsto di dipendenti
+JobLabel=Etichetta della posizione lavorativa
+WorkPlace=Posto di lavoro
+DateExpected=Data prevista
+FutureManager=Manager futuro
+ResponsibleOfRecruitement=Responsabile della selezione
+IfJobIsLocatedAtAPartner=Se il luogo di lavoro è presso partner
+PositionToBeFilled=Offerta di lavoro da compilare
+PositionsToBeFilled=Offerte di lavoro da compilare
+ListOfPositionsToBeFilled=Elenco delle offerte di lavoro da compilare
+NewPositionToBeFilled=Nuove offerte di lavoro da compilare
+
+JobOfferToBeFilled=Offerta di lavoro da compilare
+ThisIsInformationOnJobPosition=Informazioni sulla posizione lavorativa da compilare
+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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 2308806cbda..6e47d0098fa 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Annulla spedizione
 DeleteSending=Elimina spedizione
 Stock=Scorta
 Stocks=Scorte
-MissingStocks=Missing stocks
-StockAtDate=Stock at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Scorte mancanti
+StockAtDate=Scorte alla data
+StockAtDateInPast=Data nel passato
+StockAtDateInFuture=Data in futuro
 StocksByLotSerial=Scorte per lotto / seriale
 LotSerial=Lotti / Seriali
 LotSerialList=Elenco lotti / seriali
@@ -34,7 +34,7 @@ StockMovementForId=ID movimento %d
 ListMouvementStockProject=Elenco dei movimenti delle scorte associati al progetto
 StocksArea=Area magazzino e scorte
 AllWarehouses=Tutti i magazzini
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Includere anche stock desiderati non definiti
 IncludeAlsoDraftOrders=Includi anche bozze di ordini
 Location=Ubicazione
 LocationSummary=Ubicazione abbreviata
@@ -61,12 +61,12 @@ PMPValueShort=MPP
 EnhancedValueOfWarehouses=Valore magazzini
 UserWarehouseAutoCreate=Crea anche un magazzino alla creazione di un utente
 AllowAddLimitStockByWarehouse=Gestisci anche i valori minimo e desiderato della scorta per abbinamento (prodotto - magazzino) oltre ai valori per prodotto
-RuleForWarehouse=Rule for warehouses
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sale orders
-UserDefaultWarehouse=Set a warehouse on Users
+RuleForWarehouse=Regola per i magazzini
+WarehouseAskWarehouseDuringOrder=Imposta un magazzino sugli ordini di vendita
+UserDefaultWarehouse=Imposta un magazzino per gli utenti
 MainDefaultWarehouse=Magazzino predefinito
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
+MainDefaultWarehouseUser=Utilizza un magazzino predefinito per ogni utente
+MainDefaultWarehouseUserDesc=Attivando questa opzione, in fase di creazione di un prodotto, su questo verrà definito il magazzino assegnato al prodotto. Se per l'utente non è definito alcun magazzino, viene definito il magazzino predefinito.
 IndependantSubProductStock=Le scorte di prodotto e di sottoprodotti sono indipendenti
 QtyDispatched=Quantità ricevuta
 QtyDispatchedShort=Q.ta ricevuta
@@ -95,14 +95,16 @@ RealStock=Scorte reali
 RealStockDesc=Scorte fisiche/reali è la giacenza attualmente nei magazzini.\n
 RealStockWillAutomaticallyWhen=Le scorte fisiche saranno modificate secondo le seguenti regole (come definito nel modulo Magazzino):
 VirtualStock=Scorte virtuali
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Stock virtuale alla data
+VirtualStockAtDateDesc=Stock virtuale una volta terminati tutti gli ordini in sospeso che si prevede di eseguire prima della data
+VirtualStockDesc=Lo stock virtuale è lo stock calcolato disponibile una volta che tutte le azioni aperte / in sospeso (che interessano le scorte) sono state chiuse (ordini di acquisto ricevuti, ordini di vendita spediti, ordini di produzione prodotti, ecc.)
 IdWarehouse=Id magazzino
 DescWareHouse=Descrizione magazzino
 LieuWareHouse=Ubicazione magazzino
 WarehousesAndProducts=Magazzini e prodotti
 WarehousesAndProductsBatchDetail=Magazzini e prodotti (con indicazione dei lotti/numeri di serie)
-AverageUnitPricePMPShort=Media prezzi scorte
-AverageUnitPricePMP=Media dei prezzi delle scorte
+AverageUnitPricePMPShort=Media ponderata prezzo
+AverageUnitPricePMPDesc=Il prezzo unitario medio di input che abbiamo dovuto pagare ai fornitori per ottenere il prodotto nel nostro magazzino.
 SellPriceMin=Prezzo di vendita unitario
 EstimatedStockValueSellShort=Valori di vendita
 EstimatedStockValueSell=Valori di vendita
@@ -130,18 +132,18 @@ CurentlyUsingPhysicalStock=Scorte fisiche
 RuleForStockReplenishment=Regola per il rifornimento delle scorte
 SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
 AlertOnly= Solo avvisi
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Includi anche lo stock negativo per i prodotti senza la quantità desiderata definita, per ripristinarli a 0
 WarehouseForStockDecrease=Il magazzino <b>%s</b> sarà usato per la diminuzione delle scorte
 WarehouseForStockIncrease=Il magazzino <b>%s</b> sarà usato per l'aumento delle scorte
 ForThisWarehouse=Per questo magazzino
 ReplenishmentStatusDesc=Questa è una lista di tutti i prodotti con una giacenza inferiore a quella desiderata (o inferiore al valore di allarme se la casella "solo allarme" è selezionata). Utilizzando la casella di controllo, è possibile creare ordini fornitori per colmare la differenza.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
+ReplenishmentStatusDescPerWarehouse=Se si desidera un rifornimento basato sulla quantità desiderata definita per magazzino, è necessario aggiungere un filtro al magazzino.
 ReplenishmentOrdersDesc=This is a list of all open purchase orders including predefined products. Only open orders with predefined products, so orders that may affect stocks, are visible here.
 Replenishments=Rifornimento
 NbOfProductBeforePeriod=Quantità del prodotto %s in magazzino prima del periodo selezionato (< %s)
 NbOfProductAfterPeriod=Quantità del prodotto %s in magazzino dopo il periodo selezionato (< %s)
 MassMovement=Movimentazione di massa
-SelectProductInAndOutWareHouse=Seleziona un prodotto, una quantità, un magazzino di origine ed uno di destinazione, poi clicca "%s". Una volta terminato, per tutte le movimentazioni da effettuare, clicca su "%s".
+SelectProductInAndOutWareHouse=Seleziona un magazzino di origine e un magazzino di destinazione, un prodotto e una quantità, quindi fai clic su "%s". Una volta fatto questo per tutti i movimenti richiesti, clicca su "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Ricevuta per questo ordine
 StockMovementRecorded=Movimentazione di scorte registrata
@@ -156,7 +158,7 @@ InventoryCode=Codice di inventario o di spostamento
 IsInPackage=Contenuto nel pacchetto
 WarehouseAllowNegativeTransfer=Scorte possono essere negative
 qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks.
-qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+qtyToTranferLotIsNotEnough=Non disponi di scorte sufficienti, per questo numero di lotto, dal magazzino di origine e la configurazione non consente scorte negative (la quantità per il prodotto "%s" con il lotto "%s" è %s nel magazzino "%s").
 ShowWarehouse=Mostra magazzino
 MovementCorrectStock=Correzione scorte per il prodotto %s
 MovementTransferStock=Trasferisci scorte del prodotto %s in un altro magazzino
@@ -206,7 +208,7 @@ TheoricalQty=Theorique qty
 TheoricalValue=Theorique qty
 LastPA=Last BP
 CurrentPA=Curent BP
-RecordedQty=Recorded Qty
+RecordedQty=Qtà registrata
 RealQty=Real Qty
 RealValue=Real Value
 RegulatedQty=Regulated Qty
@@ -229,9 +231,12 @@ StockIncrease=Stock increase
 StockDecrease=Stock decrease
 InventoryForASpecificWarehouse=Inventario per un magazzino specifico
 InventoryForASpecificProduct=Inventario per un prodotto specifico
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
-ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
+StockIsRequiredToChooseWhichLotToUse=Le scorte sono necessarie per scegliere quale lotto utilizzare
+ForceTo=Costringere
+AlwaysShowFullArbo=Visualizza l'albero completo del magazzino sul popup dei collegamenti del magazzino (avvertenza: questo potrebbe diminuire drasticamente le prestazioni)
+StockAtDatePastDesc=È possibile visualizzare qui lo stock (stock reale) in una determinata data nel passato
+StockAtDateFutureDesc=È possibile visualizzare qui lo stock (stock virtuale) in una determinata data futura
+CurrentStock=Scorta attuale
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/it_IT/stripe.lang b/htdocs/langs/it_IT/stripe.lang
index 2c4e9efe1fd..63954059a36 100644
--- a/htdocs/langs/it_IT/stripe.lang
+++ b/htdocs/langs/it_IT/stripe.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Impostazione modulo Stripe
 StripeDesc=Offri ai clienti una pagina di pagamento online Stripe per pagamenti con carte di credito / debito tramite <a href="http://www.stripe.com" target="_blank">Stripe</a> . Questo modulo può essere usato per consentire ai tuoi clienti di effettuare pagamenti ad-hoc o per pagamenti relativi a un particolare oggetto Dolibarr (fattura, ordine, ...)
-StripeOrCBDoPayment=Pay with credit card or Stripe
+StripeOrCBDoPayment=Paga con carta di credito o Stripe
 FollowingUrlAreAvailableToMakePayments=Puoi utilizzare i seguenti indirizzi per permettere ai clienti di effettuare pagamenti su Dolibarr
 PaymentForm=Forma di pagamento
-WelcomeOnPaymentPage=Welcome to our online payment service
-ThisScreenAllowsYouToPay=Questa schermata consente di effettuare un pagamento online su %s.
+WelcomeOnPaymentPage=Benvenuto sul nostro sistema di pagamento online
+ThisScreenAllowsYouToPay=Questa schermata consente di effettuare un pagamento online per %s.
 ThisIsInformationOnPayment=Informazioni sul pagamento da effettuare
 ToComplete=Per completare
 YourEMail=Email per la conferma del pagamento
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+STRIPE_PAYONLINE_SENDEMAIL=Email per la notifica dopo un tentativo di pagamento (accettato o fallito)
 Creditor=Creditore
 PaymentCode=Codice pagamento
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+StripeDoPayment=Paga con Stripe
+YouWillBeRedirectedOnStripe=Sarai reindirizzato sulla pagina sicura di Stripe per inserire i dati della tua carta di credito
 Continue=Successivo
 ToOfferALinkForOnlinePayment=URL per il pagamento %s
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
-ToOfferALinkForOnlinePaymentOnInvoice=URL per il pagamento %s di una fattura
+ToOfferALinkForOnlinePaymentOnOrder=URL per il pagamento %s di un ordine di vendita
+ToOfferALinkForOnlinePaymentOnInvoice=URL per il pagamento %s di una fattura di vendita
 ToOfferALinkForOnlinePaymentOnContractLine=URL per il pagamento %s di una riga di contratto
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL per il pagamento %s di un importo
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL per il pagamento %s di un importo senza riferimenti
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL per il pagamento %s dell'adesione di un membro
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
+ToOfferALinkForOnlinePaymentOnDonation=URL per offrire una pagina di pagamento online %s per il pagamento di una donazione
 YouCanAddTagOnUrl=Puoi anche aggiungere a qualunque di questi url il parametro <b>&tag=<i>value</i></b> (richiesto solo per il pagamento gratuito) per aggiungere una tag con un tuo commento.
 SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
 AccountParameter=Dati account
@@ -32,7 +32,7 @@ VendorName=Nome del venditore
 CSSUrlForPaymentForm=URL del foglio di stile CSS per il modulo di pagamento
 NewStripePaymentReceived=Nuovo pagamento Stripe ricevuto
 NewStripePaymentFailed=Nuovo pagamento Stripe provato ma non riuscito
-FailedToChargeCard=Failed to charge card
+FailedToChargeCard=Addebito sulla carta non riuscito
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
@@ -46,27 +46,27 @@ ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => erro
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
 OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
-BankAccountForBankTransfer=Bank account for fund payouts
+BankAccountForBankTransfer=Conto bancario per il pagamento dei fondi
 StripeAccount=Stripe account
-StripeChargeList=List of Stripe charges
-StripeTransactionList=List of Stripe transactions
-StripeCustomerId=Stripe customer id
+StripeChargeList=Lista delle spese Stripe
+StripeTransactionList=Lista delle transazioni Stripe
+StripeCustomerId=ID Cliente Stripe
 StripePaymentModes=Tipo di pagamento Stripe
 LocalID=Local ID
 StripeID=Stripe ID
-NameOnCard=Name on card
-CardNumber=Card Number
-ExpiryDate=Expiry Date
+NameOnCard=Nome sulla Carta
+CardNumber=Numero della Carta
+ExpiryDate=Data di Scadenza
 CVN=CVN
-DeleteACard=Delete Card
-ConfirmDeleteCard=Are you sure you want to delete this Credit or Debit card?
-CreateCustomerOnStripe=Create customer on Stripe
-CreateCardOnStripe=Create card on Stripe
-ShowInStripe=Show in Stripe
-StripeUserAccountForActions=User account to use for email notification of some Stripe events (Stripe payouts)
-StripePayoutList=List of Stripe payouts
+DeleteACard=Elimina Carta
+ConfirmDeleteCard=Sei sicuro che vuoi cancellare questa Carta di Credito/Debito?
+CreateCustomerOnStripe=Crea cliente su Stripe
+CreateCardOnStripe=Crea carta su Stripe
+ShowInStripe=Visualizza su Stripe
+StripeUserAccountForActions=Conto utente da utilizzare per le notifiche e-mail di alcuni eventi Stripe (pagamenti Stripe)
+StripePayoutList=Elenco di pagamenti Stripe
 ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
 ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
 PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+ClickHereToTryAgain=<a href="%s">Clicca qui per riprovare...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=A causa delle forti regole di autenticazione del cliente, la creazione di una carta deve essere effettuata dal backoffice di Stripe. È possibile fare clic qui per attivare il record cliente Stripe: %s
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index deeb5548651..a1654b03fa0 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Bassa qualità
 ReputationForThisProduct=Reputazione
 BuyerName=Nome acquirente
 AllProductServicePrices=Prezzi dei prodotti / servizi
-AllProductReferencesOfSupplier=Referenze dei prodotti / servizi del fornitore
+AllProductReferencesOfSupplier=Tutti i riferimenti del fornitore
 BuyingPriceNumShort=Prezzi fornitore
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index 2cac359e4bc..c51af811cb0 100644
--- a/htdocs/langs/it_IT/ticket.lang
+++ b/htdocs/langs/it_IT/ticket.lang
@@ -30,14 +30,14 @@ Permission56005=See tickets of all third parties (not effective for external use
 TicketDictType=Ticket - Types
 TicketDictCategory=Ticket - Groupes
 TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+TicketDictResolution=Ticket - Risoluzione
 TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
 TicketTypeShortBUGHARD=Dysfonctionnement matériel
 TicketTypeShortCOM=Commercial question
 
-TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortHELP=Richiesta di aiuto funzionale
 TicketTypeShortISSUE=Issue, bug o problemi
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortREQUEST=Richiesta di modifica o miglioramento
 TicketTypeShortPROJET=Progetto
 TicketTypeShortOTHER=Altro
 
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Tipo
-Category=Analytic code
 Severity=Gravità
 
 # Email templates
@@ -128,12 +127,11 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Gruppo
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketsPublicNotificationNewMessage=Invia e-mail quando viene aggiunto un nuovo messaggio
+TicketsPublicNotificationNewMessageHelp=Invia e-mail quando si aggiunge un nuovo messaggio dall'interfaccia pubblica (all'utente assegnato o all'e-mail di notifica a (aggiorna) e / o all'e-mail di notifica a)
+TicketPublicNotificationNewMessageDefaultEmail=Notifiche via email (aggiornamento)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Invia e-mail notifiche di nuovi messaggi a questo indirizzo se al ticket non è stato assegnato un utente o se l'utente non ha un indirizzo e-mail.
 #
 # Index & list page
 #
@@ -162,7 +160,7 @@ CreatedBy=Creato da
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Gruppo
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -258,7 +256,7 @@ TicketPublicDesc=You can create a support ticket or check from an existing ID.
 YourTicketSuccessfullySaved=Ticket has been successfully saved!
 MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s.
 PleaseRememberThisId=Please keep the tracking number that we might ask you later.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubject=Conferma creazione ticket - Rif. %s (ID biglietto pubblico %s)
 TicketNewEmailSubjectCustomer=New support ticket
 TicketNewEmailBody=Questa email automatica conferma che è stato registrato un nuovo ticket
 TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
@@ -277,7 +275,7 @@ Subject=Oggetto
 ViewTicket=Vedi ticket
 ViewMyTicketList=Vedi l'elenco dei miei ticket
 ErrorEmailMustExistToCreateTicket=Error: email address not found in our database
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectAdmin=Nuovo biglietto creato - Rif. %s (ID biglietto pubblico %s)
 TicketNewEmailBodyAdmin=<p>Ticket has just been created with ID #%s, see information:</p>
 SeeThisTicketIntomanagementInterface=See ticket in management interface
 TicketPublicInterfaceForbidden=The public interface for the tickets was not enabled
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index a0dd542b471..f03887e2e65 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -70,7 +70,7 @@ ExportDataset_user_1=Users and their properties
 DomainUser=Utente di dominio %s
 Reactivate=Riattiva
 CreateInternalUserDesc=This form allows you to create an internal user in your company/organization. To create an external user (customer, vendor etc.  ..), use the button 'Create Dolibarr User' from that third-party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=Un utente <b> interno </b> è un utente che fa parte della tua azienda / organizzazione. <br> Un utente <b>  esterno </b> è un cliente, un fornitore o altro (La creazione di un utente esterno per una terza parte può essere effettuata dal record di contatto della terza parte). <br> <br> In entrambi i casi, le autorizzazioni definiscono i diritti su Dolibarr, anche l'utente esterno può avere un gestore di menu diverso rispetto all'utente interno (Vedi Home - Setup - Display)
 PermissionInheritedFromAGroup=Autorizzazioni ereditate dall'appartenenza al gruppo.
 Inherited=Ereditato
 UserWillBeInternalUser=L'utente sarà un utente interno (in quanto non collegato a un soggetto terzo)
@@ -78,6 +78,7 @@ UserWillBeExternalUser=L'utente sarà un utente esterno (perché collegato ad un
 IdPhoneCaller=Id telefonico del chiamante
 NewUserCreated=Utente %s creato
 NewUserPassword=Cambio password per %s
+NewPasswordValidated=La tua nuova password è stata convalidata e deve essere utilizzata ora per accedere.
 EventUserModified=Utente %s modificato
 UserDisabled=Utente %s disattivato
 UserEnabled=Utente %s attivato
@@ -107,11 +108,13 @@ DisabledInMonoUserMode=Disabilitato in modalità manutenzione
 UserAccountancyCode=Codice contabile utente
 UserLogoff=Logout utente
 UserLogged=Utente connesso
+DateOfEmployment=Data di assunzione
 DateEmployment=Data di assunzione
 DateEmploymentEnd=Data di fine rapporto lavorativo
 CantDisableYourself=You can't disable your own user record
 ForceUserExpenseValidator=Forza validatore rapporto spese
 ForceUserHolidayValidator=Convalida richiesta di congedo forzato
 ValidatorIsSupervisorByDefault=Per impostazione predefinita, il validatore è il supervisore dell'utente. Mantieni vuoto per mantenere questo comportamento.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
+UserPersonalEmail=E-mail personale
+UserPersonalMobile=Cellulare personale
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index dacf8fe00ff..44e82e1accc 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -16,7 +16,7 @@ WEBSITE_ROBOT=File Robot (robots.txt)
 WEBSITE_HTACCESS=Website .htaccess file
 WEBSITE_MANIFEST_JSON=Website manifest.json file
 WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
+WEBSITE_KEYWORDSDesc=Usa una virgola per separare i valori
 EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
 HtmlHeaderPage=HTML header (specific to this page only)
 PageNameAliasHelp=Name or alias of the page.<br>This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "<strong>%s</strong>" to edit this alias.
@@ -43,8 +43,8 @@ ViewPageInNewTab=Visualizza pagina in una nuova scheda
 SetAsHomePage=Imposta come homepage
 RealURL=Indirizzo URL vero
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+SetHereVirtualHost= <u> Usa con Apache / NGinx / ... </u> <br> Crea sul tuo server web (Apache, Nginx, ...) un host virtuale dedicato con PHP abilitato e una directory principale su <br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Esempio da utilizzare nella configurazione dell'host virtuale Apache:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Check also that virtual host has permission <strong>%s</strong> on files into<br><strong>%s</strong>
@@ -58,10 +58,10 @@ NoPageYet=No pages yet
 YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
 SyntaxHelp=Help on specific syntax tips
 YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Puoi includere codice PHP in questa sorgente utilizzando i tag <strong> &lt;?php ?&gt; </strong>. Sono disponibili le seguenti variabili globali: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br> <br> <span class="fa fa-bug"> </span> Puoi anche includere il contenuto di un'altra Pagina / Contenitore con la seguente sintassi: <br> <strong> &lt;?php includeContainer('alias_of_container_to_include'); ?&gt; </strong> <br> <br> <span class="fa fa-bug"> </span> È possibile effettuare un redirect ad un'altra pagina / contenitore con la seguente sintassi (Nota: non emettono alcun contenuto prima di un reindirizzamento): <br> <strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt; </strong> <br> <br> <span class="fa fa-link"> </span> Per aggiungere un collegamento a un'altra pagina, utilizzare la sintassi: <br> <strong> &lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span> Per inserire un <strong> link per il download  </strong> un file memorizzato nella cartella <strong>documenti </strong> , utilizzare il <strong> document.php </strong> wrapper: <br> esempio, per un file in documenti / ECM (necessità di effettuare il login), la sintassi è: <br> <strong> &lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt; </strong><br> Per un file in documents / medias (directory aperta per accesso pubblico), la sintassi è: <br> <strong> &lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt; </strong> <br> Per un file condiviso con un collegamento di condivisione (accesso aperto utilizzando la chiave hash di condivisione del file), la sintassi è:  <br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong> <br><br> <span class="fa fa-picture-o"> </span> per includere un<strong> immagine </strong> immagazzinata nella cartella  <strong>documenti </strong>, utilizzare la <strong> viewimage.php </strong> wrapper:  <br>Esempio, per un'immagine in documents/medias (cartella aperta per l'accesso pubblico), la sintassi è: <br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=Per un'immagine condivisa con un link di condivisione (accesso aperto utilizzando la chiave hash di condivisione del file), la sintassi è: <br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSourceMore= <br> Altri esempi di codice HTML o dinamico disponibili su <a href="%s" target="_blank"> la documentazione wiki </a> <br>.
 ClonePage=Clone page/container
 CloneSite=Clone site
 SiteAdded=Website added
@@ -81,7 +81,7 @@ BlogPost=Articoli sul blog
 WebsiteAccount=Website account
 WebsiteAccounts=Website accounts
 AddWebsiteAccount=Create web site account
-BackToListForThirdParty=Back to list for the third-party
+BackToListForThirdParty=Torna all'elenco per le terze parti
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
@@ -89,7 +89,7 @@ SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please
 WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party
 YouMustDefineTheHomePage=You must first define the default Home page
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContentFuture=Avvertenza: la creazione di una pagina Web importando una pagina Web esterna è riservata agli utenti esperti. A seconda della complessità della pagina di origine, il risultato dell'importazione potrebbe differire dall'originale. Inoltre, se la pagina di origine utilizza stili CSS comuni o JavaScript in conflitto, potrebbe interrompere l'aspetto o le funzionalità dell'editor del sito Web quando si lavora su questa pagina. Questo metodo è un modo più rapido per creare una pagina, ma si consiglia di creare la nuova pagina da zero o da un modello di pagina suggerito. <br> Nota anche che l'editor inline potrebbe non funzionare correttamente se utilizzato su una pagina esterna linkata
 OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site
 GrabImagesInto=Grab also images found into css and page.
 ImagesShouldBeSavedInto=Images should be saved into directory
@@ -124,14 +124,14 @@ ShowSubContainersOnOff=La modalità per eseguire il &quot;contenuto dinamico&quo
 GlobalCSSorJS=File CSS / JS / header globale del sito web
 BackToHomePage=Torna alla home page ...
 TranslationLinks=Link alla traduzione
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
+YouTryToAccessToAFileThatIsNotAWebsitePage=Tenti di accedere a una pagina che non è disponibile. <br> (ref = %s, type = %s, status = %s)
+UseTextBetween5And70Chars=Per buone pratiche SEO, utilizza un testo compreso tra 5 e 70 caratteri
 MainLanguage=Lingua principale
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+OtherLanguages=Altre lingue
+UseManifest=Fornisci un file manifest.json
+PublicAuthorAlias=Alias dell'autore pubblico
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Le lingue disponibili sono definite nelle proprietà del sito web
+ReplacementDoneInXPages=Sostituzione eseguite in%spagine o contenitori 
 RSSFeed=Feed RSS
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
+RSSFeedDesc=Puoi ottenere un feed RSS degli articoli più recenti con il tipo "blogpost" utilizzando questo URL
+PagesRegenerated=%s pagina(e)/contenitore(i) rigenerato
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 26371a28c1a..296e0fc1975 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -1,46 +1,46 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+CustomersStandingOrdersArea=Pagamenti tramite ordini di addebito diretto
+SuppliersStandingOrdersArea=Pagamenti tramite bonifico bancario
 StandingOrdersPayment=Direct debit payment orders
 StandingOrderPayment=Domiciliazione bancaria
 NewStandingOrder=Nuovo ordine di addebito diretto
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=Nuovo pagamento tramite bonifico bancario
 StandingOrderToProcess=Da processare
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Ordini di bonifico
+PaymentByBankTransferLines=Righe ordine di bonifico
 WithdrawalsReceipts=Ordini di addebito diretto
 WithdrawalReceipt=Ordine di addebito diretto
-BankTransferReceipts=Credit transfer order
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
+BankTransferReceipts=Ordini di bonifico
+BankTransferReceipt=Ordine di trasferimento del credito
+LatestBankTransferReceipts=Ultimi %s ordini di bonifico 
 LastWithdrawalReceipts=Latest %s direct debit files
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Riga ordine di addebito diretto
+CreditTransferLine=Linea di trasferimento del credito
 WithdrawalsLines=Direct debit order lines
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+CreditTransferLines=Linee di trasferimento del credito
+RequestStandingOrderToTreat=Richieste di ordine di pagamento con addebito diretto da elaborare
+RequestStandingOrderTreated=Richieste di ordine di pagamento con addebito diretto elaborate
+RequestPaymentsByBankTransferToTreat=Richieste di bonifici da processare
+RequestPaymentsByBankTransferTreated=Richieste di bonifici elaborate
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Non ancora possibile. Lo stato dell'ordine deve essere "accreditato" prima di poter dichiarare la singola riga "rifiutata"
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdraw=Numero di fatture cliente qualificate con ordine di addebito diretto in attesa
 NbOfInvoiceToWithdrawWithInfo=No. of customer invoice with direct debit payment orders having defined bank account information
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+NbOfInvoiceToPayByBankTransfer=Numero di fatture fornitore qualificate in attesa di un pagamento tramite bonifico bancario
+SupplierInvoiceWaitingWithdraw=Fattura fornitore in attesa di pagamento tramite bonifico bancario
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Fattura in attesa di bonifico
 AmountToWithdraw=Importo da prelevare
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=Nessuna fattura aperta per '%s' è in attesa. Vai sulla scheda '%s' sulla scheda fattura per effettuare una richiesta.
+NoSupplierInvoiceToWithdraw=Nessuna fattura fornitore con "Richieste di credito diretto" aperte è in attesa. Vai sulla scheda '%s' sulla scheda fattura per effettuare una richiesta.
 ResponsibleUser=User Responsible
 WithdrawalsSetup=Direct debit payment setup
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Impostazione del bonifico
 WithdrawStatistics=Direct debit payment statistics
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Statistiche sul trasferimento di crediti
 Rejects=Respinge
 LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Effettua una richiesta di addebito diretto
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Invia una richiesta di bonifico
 WithdrawRequestsDone=%s direct debit payment requests recorded
 ThirdPartyBankCode=Codice bancario del Soggetto terzo
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
@@ -53,7 +53,7 @@ Lines=Righe
 StandingOrderReject=Invia rifiuto
 WithdrawsRefused=Direct debit refused
 WithdrawalRefused=Bonifici rifiutati
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Bonifici rifiutati
 WithdrawalRefusedConfirm=Vuoi davvero inserire un rifiuto per la società?
 RefusedData=Data del rifiuto
 RefusedReason=Motivo del rifiuto
@@ -63,7 +63,9 @@ InvoiceRefused=Fattura rifiutata (Addebitare il costo al cliente)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=In attesa
 StatusTrans=Trasmesso
+StatusDebited=Debited
 StatusCredited=Accreditato
+StatusPaid=Pagata
 StatusRefused=Rifiutato
 StatusMotif0=Imprecisato
 StatusMotif1=Disponibilità insufficiente
@@ -77,27 +79,28 @@ StatusMotif8=Altri motivi
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateSepaFileForPaymentByBankTransfer=Crea file di bonifico (SEPA)
 CreateGuichet=Solo ufficio
 CreateBanque=Solo banca
 OrderWaiting=In attesa di esecuzione
-NotifyTransmision=Trasmissione domiciliazione
-NotifyCredit=Credito
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Numero nazionale dell'inviante
 WithBankUsingRIB=Per i conti correnti bancari che utilizzano RIB
 WithBankUsingBANBIC=Per conti bancari che utilizzano IBAN/BIC/SWIFT
 BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToPayCreditTransfer=Conto bancario utilizzato come fonte di pagamento
 CreditDate=Data di accredito
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Mostra ordine di addebito diretto
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Ricevuta bancaria
+DoStandingOrdersBeforePayments=Questa scheda consente di richiedere un ordine di pagamento con addebito diretto. Una volta fatto, vai nel menu Banca-> Pagamento con addebito diretto per generare e gestire l'ordine di addebito diretto. Quando l'ordine di addebito diretto viene chiuso, il pagamento sulle fatture verrà automaticamente registrato e le fatture chiuse se il resto da pagare è nullo.
+DoCreditTransferBeforePayments=Questa scheda consente di richiedere un ordine di bonifico. Una volta fatto, vai nel menu Banca-> Pagamento tramite bonifico per generare e gestire l'ordine di trasferimento del credito. Quando l'ordine di trasferimento del credito viene chiuso, il pagamento sulle fatture verrà automaticamente registrato e le fatture chiuse se il resto da pagare è nullo.
+WithdrawalFile=File ordine di addebito
+CreditTransferFile=File di trasferimento di credito
 SetToStatusSent=Imposta stato come "file inviato"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Ciò registrerà anche i pagamenti sulle fatture e li classificherà come "Pagati" se il resto da pagare è nullo
 StatisticsByLineStatus=Statistics by status of lines
 RUM=Unique Mandate Reference (UMR)
 DateRUM=Mandate signature date
@@ -105,7 +108,7 @@ RUMLong=Riferimento Unico Mandato
 RUMWillBeGenerated=If empty, a UMR (Unique Mandate Reference) will be generated once the bank account information is saved.
 WithdrawMode=Tipologia sequenza d'incasso (FRST o RECUR)
 WithdrawRequestAmount=Amount of Direct debit request:
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Importo della richiesta di bonifico:
 WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty amount.
 SepaMandate=Mandato per addebito diretto SEPA
 SepaMandateShort=Mandato SEPA
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Tipo di pagamento
 ModeRECUR=Recurring payment
 ModeFRST=Pagamento una tantum
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Ordine %s di trasferimento del credito  creato
 DirectDebitOrderCreated=Ordine di addebito diretto %s creato
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -131,7 +135,7 @@ ICS=Creditor Identifier CI
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=Nessun IBAN predefinito trovato per questa terza parte
 ### Notifications
 InfoCreditSubject=Payment of direct debit payment order %s by the bank
 InfoCreditMessage=The direct debit payment order %s has been paid by the bank<br>Data of payment: %s
@@ -141,3 +145,4 @@ InfoTransData=Importo: %s <br> Metodo: %s <br> Data: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Non è stata impostata la modalità reale, ci fermiamo dopo questa simulazione
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang
index 0e5736cc06a..98c533ca8d1 100644
--- a/htdocs/langs/it_IT/workflow.lang
+++ b/htdocs/langs/it_IT/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifica "da spedire" l'ordine cl
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Creazione automatica
 AutomaticClassification=Classificazione automatica
diff --git a/htdocs/langs/it_IT/zapier.lang b/htdocs/langs/it_IT/zapier.lang
index cf2795a5fbe..7b9ad04fa29 100644
--- a/htdocs/langs/it_IT/zapier.lang
+++ b/htdocs/langs/it_IT/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier per modulo Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Installazione di Zapier per Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 6692086b782..62e0a2c7bcd 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index e8f908ff2af..8d1a5c7e46a 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=システムと同様にUnix上では使用できませんが備わっています。ローカルでsendmailプログラムをテストします。
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=モジュールのセットアップ
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=システム
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=セキュリティで保護されたURLへの鍵
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=文字列
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=バーコード
 Module55Desc=バーコードの管理
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDialシステムの統合（アスタリスク、...）
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=サービスを作成/変更
 Permission534=サービスを削除する
 Permission536=隠されたサービスを参照してください/管理
 Permission538=輸出サービス
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=寄付を読む
 Permission702=寄付を作成/変更
 Permission703=寄付を削除します。
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=株式を読む
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=セットアップのドキュメントディレクトリ
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=見通しの可能性
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=地域
 DictionaryCountry=国
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=ユニット
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=見通しの状態
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=左側のメニューの恒久的な検索フォーム
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=モジュールのセットアップをダイヤルする]をクリックします
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=契約
+MailToSendReception=Receptions
 MailToThirdparty=サードパーティ
 MailToMember=メンバー
 MailToUser=ユーザー
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=ZIP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 8d1f6ab110f..a918ed85c32 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=イベントのリスト
 EventReports=Event reports
 Location=場所
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=一日のイベント
 MenuToDoActions=すべての不完全なイベント
 MenuDoneActions=すべての終了イベント
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 4464d43f4d9..66e5cfb5bf2 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=顧客の請求書
 ForCustomersOrders=Customers orders
 ForProposals=提案
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=会計学
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index ef717bafb20..aea5aeda5e3 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index b5359c7da1e..26766947802 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index 488def94a3e..faa4060b427 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=実行中のサービス
 MenuExpiredServices=期限切れのサービス
 MenuClosedServices=閉じたサービス
 NewContract=新規契約
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=契約を削除する
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index feb6f99629a..dbe55ff2079 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index edc2230a033..f62137f167c 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=アラビア語
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=アラビア語
+Language_az_AZ=Azerbaijani
 Language_bn_BD=ベンガル語
+Language_bn_IN=Bengali (India)
 Language_bg_BG=ブルガリア語
 Language_bs_BA=ボスニア
 Language_ca_ES=カタルにゃ語
@@ -20,6 +23,7 @@ Language_en_GB=英語 (イギリス)
 Language_en_IN=英語 (インド)
 Language_en_NZ=英語（ニュージーランド）
 Language_en_SA=英語（サウジアラビア）
+Language_en_SG=English (Singapore)
 Language_en_US=英語 (アメリカ)
 Language_en_ZA=英語（南アフリカ）
 Language_es_ES=スペイン語
@@ -29,6 +33,7 @@ Language_es_CL=スペイン語 (チリ)
 Language_es_CO=スペイン語 (コロンビア)
 Language_es_DO=スペイン語 (ドミニカ共和国)
 Language_es_EC=スペイン語 (エクアドル)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=スペイン語（ホンジュラス）
 Language_es_MX=スペイン語（メキシコ）
 Language_es_PA=スペイン語 (パナマ)
@@ -36,6 +41,7 @@ Language_es_PY=スペイン語（パラグアイ）
 Language_es_PE=スペイン語（ペルー）
 Language_es_PR=スペイン語（プエルトリコ）
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=スペイン語 (ベネズエラ)
 Language_et_EE=エストニア語
 Language_eu_ES=バスク
@@ -44,15 +50,22 @@ Language_fi_FI=フィンランド語
 Language_fr_BE=フランス語 (ベルギー)
 Language_fr_CA=フランス語 (カナダ)
 Language_fr_CH=フランス語 (スイス)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=フランス語
+Language_fr_GA=French (Gabon)
 Language_fr_NC=フランス（ニューカレドニア）
+Language_fr_SN=French (Senegal)
 Language_fy_NL=フリジア語
+Language_gl_ES=Galician
 Language_he_IL=ヘブライ語の
+Language_hi_IN=Hindi (India)
 Language_hr_HR=クロアチア語
 Language_hu_HU=ハンガリー語
 Language_id_ID=インドネシア語
 Language_is_IS=アイスランド語
 Language_it_IT=イタリア語
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=日本語
 Language_ka_GE=ジョージア語
 Language_km_KH=クメール語
@@ -64,6 +77,7 @@ Language_lv_LV=ラトビアの
 Language_mk_MK=マケドニア語
 Language_mn_MN=モンゴル語
 Language_nb_NO=ノルウエー語 (ブーケモール)
+Language_ne_NP=Nepali
 Language_nl_BE=オランダ語 (ベルギー)
 Language_nl_NL=Dutch
 Language_pl_PL=ポーランド語
@@ -86,4 +100,5 @@ Language_uz_UZ=ウズベク語
 Language_vi_VN=ベトナムの
 Language_zh_CN=中国語
 Language_zh_TW=（繁体字）中国語
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index cdd1d8e1eeb..c58b186935e 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 678deac09d5..07684b7faab 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -7,7 +7,7 @@ DIRECTION=ltr
 FONTFORPDF=cid0jp
 FONTSIZEFORPDF=9
 SeparatorDecimal=.
-SeparatorThousand=None
+SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=量
 AmountInvoice=請求額
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=支払金額
 AmountHTShort=Amount (excl.)
 AmountTTCShort=金額（税込）
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=によって
 From=から
+FromDate=から
 FromLocation=から
 to=へ
 To=へ
@@ -687,6 +688,7 @@ Method=方法
 Receive=受け取る
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=部分的な
 TotalWoman=合計
 NeverReceived=受信しませんでした
@@ -703,6 +705,7 @@ MenuECM=ドキュメント
 MenuAWStats=AWStatsは
 MenuMembers=メンバー
 MenuAgendaGoogle=Googleの議題
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr制限（メニューホームセットアップ·セキュリティ）：%s KB、PHP制限：%s KB
 NoFileFound=このディレクトリに保存されない文書ません
 CurrentUserLanguage=現在の言語
@@ -725,7 +728,7 @@ Page=ページ
 Notes=注釈
 AddNewLine=新しい行を追加します。
 AddFile=ファイルを追加します。
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=その主な属性を持つオブジェクトのクローンを作成する
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index ab811b3e348..d2fca5cf7d3 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=ドラフトのメンバー
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=検証
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=新しい貢献
 PaymentSubscription=新しい貢献の支払い
 SubscriptionEndDate=サブスクリプションの終了日
@@ -78,7 +81,7 @@ DeleteType=削除する
 VoteAllowed=許可される投票
 Physical=物理的な
 Moral=道徳
-MorPhy=物理的/道徳的な
+MorPhy=自然
 Reenable=再度有効にする
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 0ee2b871636..87098706f4d 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index b0459e1a258..1ed881cc6f4 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=バーコードの種類を設定します。
 BarcodeValue=バーコードの値
 NoteNotVisibleOnBill=注意してください（請求書、提案...上に表示されません）
 ServiceLimitedDuration=製品は、限られた期間を持つサービスの場合：
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=価格数
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=原産国
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=ユニット
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=新しい属性
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 65484866be4..eb84ec5c3c0 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=貢献者
 TypeContact_project_task_external_TASKCONTRIBUTOR=貢献者
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang
index d2065e007a3..373ac4a2ce2 100644
--- a/htdocs/langs/ja_JP/propal.lang
+++ b/htdocs/langs/ja_JP/propal.lang
@@ -85,3 +85,7 @@ ProposalCustomerSignature=承諾書、会社印、日付、署名
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=提案番号
+IdProduct=製品番号
+PrParentLine=提案親ライン
+LineBuyPriceHT=購入価格ラインの税控除後の金額
diff --git a/htdocs/langs/ja_JP/recruitment.lang b/htdocs/langs/ja_JP/recruitment.lang
new file mode 100644
index 00000000000..63690e8b83f
--- /dev/null
+++ b/htdocs/langs/ja_JP/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = 約
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index aa2e160a82e..a16ebdd7c63 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=送信削除
 Stock=株式
 Stocks=ストック
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=実在庫
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=仮想在庫
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=イド倉庫
 DescWareHouse=説明倉庫
 LieuWareHouse=ローカリゼーション倉庫
 WarehousesAndProducts=倉庫と製品
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=加重平均の入力価格
-AverageUnitPricePMP=加重平均の入力価格
+AverageUnitPricePMPShort=加重平均価格
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=販売単価
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 8b9d1e6289b..70a684ddeba 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=このリファレンス·サプライヤーは、すでに参照に関連付けられています。%s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=可用性
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=この注文を承認
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 999ce4aa6e2..2e75a39a4f8 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=タイプ
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=グループ
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=グループ
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index daa3de23f77..f6e45f55480 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=作成したユーザ（特にサードパーティにリ
 IdPhoneCaller=イドの電話発信
 NewUserCreated=ユーザーの%s作成
 NewUserPassword=%s用パスワードの変更
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=ユーザーの%sは変更
 UserDisabled=ユーザーの%sが無効になって
 UserEnabled=ユーザー%sは、アクティブ
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index 3042c363abb..a4f6da68897 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=待っている
 StatusTrans=送信
+StatusDebited=Debited
 StatusCredited=クレジット
+StatusPaid=有料
 StatusRefused=拒否
 StatusMotif0=特定されていない
 StatusMotif1=提供insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=他の理由
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=唯一のオフィス
 CreateBanque=唯一の銀行
 OrderWaiting=治療を待っている
-NotifyTransmision=撤退伝送
-NotifyCredit=撤退クレジット
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=国立トランスミッタ数
 WithBankUsingRIB=RIBを使用した銀行口座
 WithBankUsingBANBIC=IBAN / BIC / SWIFTを使用した銀行口座
@@ -93,9 +95,10 @@ CreditDate=クレジットで
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=金額：%s <br> Metode：%s <br>日付：%s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=リアルモードのオプションが設定されていない、我々は、このシミュレーションの後に停止
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/ja_JP/workflow.lang b/htdocs/langs/ja_JP/workflow.lang
index bc879bb4c0d..ab06c374860 100644
--- a/htdocs/langs/ja_JP/workflow.lang
+++ b/htdocs/langs/ja_JP/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=ワークフローモジュールのセットアップ
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/ja_JP/zapier.lang b/htdocs/langs/ja_JP/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/ja_JP/zapier.lang
+++ b/htdocs/langs/ja_JP/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/ka_GE/agenda.lang b/htdocs/langs/ka_GE/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/ka_GE/agenda.lang
+++ b/htdocs/langs/ka_GE/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index 8fe1f84b149..d6fd298a3a7 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index 6cd046c5607..8f4f058bb87 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/ka_GE/contracts.lang b/htdocs/langs/ka_GE/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/ka_GE/contracts.lang
+++ b/htdocs/langs/ka_GE/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ka_GE/languages.lang b/htdocs/langs/ka_GE/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/ka_GE/languages.lang
+++ b/htdocs/langs/ka_GE/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index adbc443198f..0af5c66f0e0 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/ka_GE/members.lang b/htdocs/langs/ka_GE/members.lang
index 5886c598d52..5ef946ddf67 100644
--- a/htdocs/langs/ka_GE/members.lang
+++ b/htdocs/langs/ka_GE/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/ka_GE/mrp.lang b/htdocs/langs/ka_GE/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/ka_GE/mrp.lang
+++ b/htdocs/langs/ka_GE/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/ka_GE/recruitment.lang b/htdocs/langs/ka_GE/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/ka_GE/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index d0cf540d3eb..51562b8bb7a 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ka_GE/ticket.lang b/htdocs/langs/ka_GE/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/ka_GE/ticket.lang
+++ b/htdocs/langs/ka_GE/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index aea4e7676e4..25d9205457b 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/ka_GE/workflow.lang b/htdocs/langs/ka_GE/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/ka_GE/workflow.lang
+++ b/htdocs/langs/ka_GE/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/ka_GE/zapier.lang b/htdocs/langs/ka_GE/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/ka_GE/zapier.lang
+++ b/htdocs/langs/ka_GE/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/km_KH/accountancy.lang
+++ b/htdocs/langs/km_KH/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/km_KH/agenda.lang b/htdocs/langs/km_KH/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/km_KH/agenda.lang
+++ b/htdocs/langs/km_KH/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/km_KH/boxes.lang b/htdocs/langs/km_KH/boxes.lang
index bd62684421a..d6fd298a3a7 100644
--- a/htdocs/langs/km_KH/boxes.lang
+++ b/htdocs/langs/km_KH/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/km_KH/cashdesk.lang b/htdocs/langs/km_KH/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/km_KH/cashdesk.lang
+++ b/htdocs/langs/km_KH/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/km_KH/compta.lang b/htdocs/langs/km_KH/compta.lang
index 8a8c837ac87..8f4f058bb87 100644
--- a/htdocs/langs/km_KH/compta.lang
+++ b/htdocs/langs/km_KH/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
diff --git a/htdocs/langs/km_KH/contracts.lang b/htdocs/langs/km_KH/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/km_KH/contracts.lang
+++ b/htdocs/langs/km_KH/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/km_KH/languages.lang b/htdocs/langs/km_KH/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/km_KH/languages.lang
+++ b/htdocs/langs/km_KH/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/km_KH/mails.lang
+++ b/htdocs/langs/km_KH/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang
index e5ad284bbb5..7f2168fdea2 100644
--- a/htdocs/langs/km_KH/main.lang
+++ b/htdocs/langs/km_KH/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/km_KH/members.lang b/htdocs/langs/km_KH/members.lang
index dd0a5bf49e2..5ef946ddf67 100644
--- a/htdocs/langs/km_KH/members.lang
+++ b/htdocs/langs/km_KH/members.lang
@@ -81,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/km_KH/mrp.lang b/htdocs/langs/km_KH/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/km_KH/mrp.lang
+++ b/htdocs/langs/km_KH/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/km_KH/recruitment.lang b/htdocs/langs/km_KH/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/km_KH/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/km_KH/stocks.lang b/htdocs/langs/km_KH/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/km_KH/stocks.lang
+++ b/htdocs/langs/km_KH/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/km_KH/suppliers.lang b/htdocs/langs/km_KH/suppliers.lang
index b69b11272b4..51562b8bb7a 100644
--- a/htdocs/langs/km_KH/suppliers.lang
+++ b/htdocs/langs/km_KH/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/km_KH/ticket.lang b/htdocs/langs/km_KH/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/km_KH/ticket.lang
+++ b/htdocs/langs/km_KH/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/km_KH/users.lang b/htdocs/langs/km_KH/users.lang
index 41a5ebd0981..25d9205457b 100644
--- a/htdocs/langs/km_KH/users.lang
+++ b/htdocs/langs/km_KH/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/km_KH/withdrawals.lang b/htdocs/langs/km_KH/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/km_KH/withdrawals.lang
+++ b/htdocs/langs/km_KH/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/km_KH/workflow.lang b/htdocs/langs/km_KH/workflow.lang
index be126eef0f4..299be277e1d 100644
--- a/htdocs/langs/km_KH/workflow.lang
+++ b/htdocs/langs/km_KH/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/km_KH/zapier.lang b/htdocs/langs/km_KH/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/km_KH/zapier.lang
+++ b/htdocs/langs/km_KH/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 1f4687bf75e..1a4b882ff57 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=ಸಂಭಾವ್ಯ ನಿರೀಕ್ಷಿತರು
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=ನಿರೀಕ್ಷಿತರ ಸ್ಥಿತಿ
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=ಮೂರನೇ ಪಕ್ಷಗಳು
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/kn_IN/agenda.lang
+++ b/htdocs/langs/kn_IN/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index 8fe1f84b149..d6fd298a3a7 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index 110bd02427e..caa77612db5 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index 6cd046c5607..8f4f058bb87 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/kn_IN/contracts.lang b/htdocs/langs/kn_IN/contracts.lang
index a9229022d15..2862112a9c5 100644
--- a/htdocs/langs/kn_IN/contracts.lang
+++ b/htdocs/langs/kn_IN/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/kn_IN/languages.lang
+++ b/htdocs/langs/kn_IN/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 47b40caa689..aaf4819a944 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang
index 5886c598d52..5ef946ddf67 100644
--- a/htdocs/langs/kn_IN/members.lang
+++ b/htdocs/langs/kn_IN/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/kn_IN/mrp.lang b/htdocs/langs/kn_IN/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/kn_IN/mrp.lang
+++ b/htdocs/langs/kn_IN/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 6f1c0edfbb3..66bda179f9b 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index ececf240ce1..8900044765c 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/kn_IN/recruitment.lang b/htdocs/langs/kn_IN/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/kn_IN/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
index d0cf540d3eb..51562b8bb7a 100644
--- a/htdocs/langs/kn_IN/suppliers.lang
+++ b/htdocs/langs/kn_IN/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/kn_IN/ticket.lang b/htdocs/langs/kn_IN/ticket.lang
index 8aeaf83456f..1608bcb38d7 100644
--- a/htdocs/langs/kn_IN/ticket.lang
+++ b/htdocs/langs/kn_IN/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index 535d745855e..9a79e68dbc5 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/kn_IN/workflow.lang b/htdocs/langs/kn_IN/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/kn_IN/workflow.lang
+++ b/htdocs/langs/kn_IN/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/kn_IN/zapier.lang b/htdocs/langs/kn_IN/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/kn_IN/zapier.lang
+++ b/htdocs/langs/kn_IN/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 7ce7f73a40e..5f53ebb4389 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=매출분개장
 ACCOUNTING_PURCHASE_JOURNAL=구매분개장
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index a95c41e388d..9a09326a0c5 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=미래 잠재고객
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=잠재 고객 상태
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=계약서
+MailToSendReception=Receptions
 MailToThirdparty=협력업체
 MailToMember=구성원
 MailToUser=사용자
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index 768f95f611a..fbdadd09422 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=이벤트 목록
 EventReports=Event reports
 Location=위치
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index 566b00edc22..f070f401eb4 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=최근 %s 기록 공급자
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=최근 %s 고객 또는 잠재 고객
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=최근 %s 구성원
 BoxTitleLastFicheInter=최근 %s 수정 된 개입
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=고객 송장
 ForCustomersOrders=고객 주문
 ForProposals=제안
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 7381cb11248..266158be744 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index 025d45b7e1e..0761985d4aa 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/ko_KR/contracts.lang b/htdocs/langs/ko_KR/contracts.lang
index 6358c2799ef..0c7979156c3 100644
--- a/htdocs/langs/ko_KR/contracts.lang
+++ b/htdocs/langs/ko_KR/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ko_KR/languages.lang b/htdocs/langs/ko_KR/languages.lang
index 989790a4ef8..5359947a598 100644
--- a/htdocs/langs/ko_KR/languages.lang
+++ b/htdocs/langs/ko_KR/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=아랍어
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=아랍어
+Language_az_AZ=Azerbaijani
 Language_bn_BD=벵골어
+Language_bn_IN=Bengali (India)
 Language_bg_BG=불가리아어
 Language_bs_BA=보스니아어
 Language_ca_ES=카탈로니아어
@@ -20,6 +23,7 @@ Language_en_GB=영어 (영국)
 Language_en_IN=영어 (인도)
 Language_en_NZ=영어 (뉴질랜드)
 Language_en_SA=영어 (사우디 아라비아)
+Language_en_SG=English (Singapore)
 Language_en_US=영어 (미국)
 Language_en_ZA=영어 (남아프리카 공화국)
 Language_es_ES=스페인어
@@ -29,6 +33,7 @@ Language_es_CL=스페인어 (칠레)
 Language_es_CO=스페인어 (콜롬비아)
 Language_es_DO=스페인어 (도미니카 공화국)
 Language_es_EC=스페인어 (에콰도르)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=스페인어 (온두라스)
 Language_es_MX=스페인어 (멕시코)
 Language_es_PA=스페인어 (파나마)
@@ -36,6 +41,7 @@ Language_es_PY=스페인어 (파라과이)
 Language_es_PE=스페인어 (페루)
 Language_es_PR=스페인어 (푸에르토 리코)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=스페인어 (베네수엘라)
 Language_et_EE=에스토니아어
 Language_eu_ES=바스크어
@@ -44,15 +50,22 @@ Language_fi_FI=핀란드어
 Language_fr_BE=프랑스어 (벨기에)
 Language_fr_CA=프랑스어 (캐나다)
 Language_fr_CH=프랑스어 (스위스)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=프랑스어
+Language_fr_GA=French (Gabon)
 Language_fr_NC=프랑스어 (뉴 칼레도니아)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=프리시아어
+Language_gl_ES=Galician
 Language_he_IL=히브리어
+Language_hi_IN=Hindi (India)
 Language_hr_HR=크로아티아어
 Language_hu_HU=헝가리어
 Language_id_ID=인도네시아어
 Language_is_IS=아이슬란드어
 Language_it_IT=이탈리아어
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=일본어
 Language_ka_GE=조르지아어
 Language_km_KH=크메르어
@@ -64,6 +77,7 @@ Language_lv_LV=라트비아어
 Language_mk_MK=마케도니아어
 Language_mn_MN=몽골어
 Language_nb_NO=노르웨이어 (보크 말)
+Language_ne_NP=Nepali
 Language_nl_BE=네덜란드어 (벨기에)
 Language_nl_NL=Dutch
 Language_pl_PL=폴란드어
@@ -86,4 +100,5 @@ Language_uz_UZ=우즈벡어
 Language_vi_VN=베트남어
 Language_zh_CN=중국어
 Language_zh_TW=중국어 (번체)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index fb9f072a3a9..14c7f27948a 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 8480b1274e9..5392faabe13 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (세금 포함)
 Amount=금액
 AmountInvoice=송장 금액
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=결제 금액
 AmountHTShort=Amount (excl.)
 AmountTTCShort=금액 (세금 포함)
@@ -485,6 +485,7 @@ Categories=태그 / 카테고리
 Category=태그 / 카테고리
 By=별
 From=부터
+FromDate=부터
 FromLocation=부터
 to=까지
 To=까지
@@ -687,6 +688,7 @@ Method=방법
 Receive=수령
 CompleteOrNoMoreReceptionExpected=완료되었거나 더 이상 기대되지 않음
 ExpectedValue=예상 값
+ExpectedQty=Expected Qty
 PartialWoman=분할
 TotalWoman=합계
 NeverReceived=수령 못함
@@ -703,6 +705,7 @@ MenuECM=문서
 MenuAWStats=AWStats
 MenuMembers=회원
 MenuAgendaGoogle=구글 의제
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr한계 (메뉴 홈-설정-보안): %s Kb, PHP 한계: %s Kb
 NoFileFound=이 디렉토리에 저장된 문서가 없습니다.
 CurrentUserLanguage=현재 언어
@@ -725,7 +728,7 @@ Page=페이지
 Notes=노트
 AddNewLine=새 줄 추가
 AddFile=파일 추가
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=주요 속성을 가진 객체 복제
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=목
 ShortFriday=금
 ShortSaturday=토
 ShortSunday=일
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=참조 설정
 Select2ResultFoundUseArrows=일부 결과가 발견되었습니다. 화살표를 사용하여 선택하십시오.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index af849a915cc..32c684190be 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=확인 함
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=지우다
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/ko_KR/mrp.lang b/htdocs/langs/ko_KR/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/ko_KR/mrp.lang
+++ b/htdocs/langs/ko_KR/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 84c88766bf0..a39cc328af3 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 40e6d3404c6..acd9124600e 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=새로운 속성
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index b02a87add1e..f9e32599c26 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/ko_KR/propal.lang b/htdocs/langs/ko_KR/propal.lang
index 93708eb0955..26a86464f91 100644
--- a/htdocs/langs/ko_KR/propal.lang
+++ b/htdocs/langs/ko_KR/propal.lang
@@ -85,3 +85,7 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=Proposal ID
+IdProduct=Product ID
+PrParentLine=Proposal Parent Line
+LineBuyPriceHT=Buy Price Amount net of tax for line
diff --git a/htdocs/langs/ko_KR/recruitment.lang b/htdocs/langs/ko_KR/recruitment.lang
new file mode 100644
index 00000000000..d9a6cc70b6d
--- /dev/null
+++ b/htdocs/langs/ko_KR/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = 개략
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index cf05c2c4958..0345634f4bf 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index 7b81f84d024..2a5cfe1d008 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=구매가등록
 ChangeSupplierPrice=구매가변경
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=이용가능여부
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=주문 승인
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=주문 거절
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=배송지체기간
-DescNbDaysToDelivery=최대배송지체기간
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=주문불가
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=평가
 BuyerName=구매자
 AllProductServicePrices=제품목록 및 서비스목록
-AllProductReferencesOfSupplier=공급업체 제품 및 서비스 목록
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ko_KR/ticket.lang b/htdocs/langs/ko_KR/ticket.lang
index c6430580fbd..39194e55eea 100644
--- a/htdocs/langs/ko_KR/ticket.lang
+++ b/htdocs/langs/ko_KR/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=유형
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index 5fdb9913777..ed097818f62 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index 4b9d64470eb..a5301dbdf26 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=유료
 StatusRefused=거절됨
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/ko_KR/workflow.lang b/htdocs/langs/ko_KR/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/ko_KR/workflow.lang
+++ b/htdocs/langs/ko_KR/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/ko_KR/zapier.lang b/htdocs/langs/ko_KR/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/ko_KR/zapier.lang
+++ b/htdocs/langs/ko_KR/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 18767496e2f..f7f3aa2fec7 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 59d91bea20e..511378bb6e3 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/lo_LA/agenda.lang
+++ b/htdocs/langs/lo_LA/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index 8fe1f84b149..d6fd298a3a7 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index b4eb327c94d..29c2f72f5bf 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/lo_LA/contracts.lang b/htdocs/langs/lo_LA/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/lo_LA/contracts.lang
+++ b/htdocs/langs/lo_LA/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/lo_LA/languages.lang
+++ b/htdocs/langs/lo_LA/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 3e3c7ed437f..96d7ae3cb09 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index f3beb23deef..d516088ccf3 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=ລຶບ
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/lo_LA/mrp.lang b/htdocs/langs/lo_LA/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/lo_LA/mrp.lang
+++ b/htdocs/langs/lo_LA/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index f611612ab3f..30dcda87f53 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 2e0cb4da31f..10a26e629e5 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 6caacb54f22..bfe42b3a2d0 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/lo_LA/recruitment.lang b/htdocs/langs/lo_LA/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/lo_LA/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 2e5c5c11748..f00ee3d2f05 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
index d0cf540d3eb..51562b8bb7a 100644
--- a/htdocs/langs/lo_LA/suppliers.lang
+++ b/htdocs/langs/lo_LA/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/lo_LA/ticket.lang b/htdocs/langs/lo_LA/ticket.lang
index 6f4cbb04b94..6c1dc94704a 100644
--- a/htdocs/langs/lo_LA/ticket.lang
+++ b/htdocs/langs/lo_LA/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index b6bd125449d..cb9c22e9c30 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/lo_LA/workflow.lang b/htdocs/langs/lo_LA/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/lo_LA/workflow.lang
+++ b/htdocs/langs/lo_LA/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/lo_LA/zapier.lang b/htdocs/langs/lo_LA/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/lo_LA/zapier.lang
+++ b/htdocs/langs/lo_LA/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index bcc3c614012..ba180500a96 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Išjungti tiesioginį sandorio įrašymą banko sąskaitoje
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Įgalinti eksporto projektą žurnale
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Pardavimų žurnalas
 ACCOUNTING_PURCHASE_JOURNAL=Pirkimų žurnalas
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index e28d8560cd2..4770b9982b6 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Funkcija negalima Unix tipo sistemose. Patikrinti el. pašto siuntimo vietinę programą.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Modulio nuostatos
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistema
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=URL apsaugos raktai
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modifikuoti kainas su apibrėžta bazinės vertės nuoroda
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Serija
+String1Line=String (1 line)
 TextLong=Ilgas tekstas
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Sveikasis skaičius
 Float=Slankus
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Brūkšniniai kodai
 Module55Desc=Brūkšninių kodų valdymas
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sistemos integracija (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Sukurti/keisti paslaugas
 Permission534=Ištrinti paslaugas
 Permission536=Žiūrėti/tvarkyti paslėptas paslaugas
 Permission538=Eksportuoti paslaugas
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Skaityti aukas
 Permission702=Sukurti/keisti aukas
 Permission703=Ištrinti aukas
@@ -848,6 +858,8 @@ Permission773=Ištrinti išlaidų ataskaitas
 Permission774=Skaityti visas išlaidų ataskaitas (net nepalald-iam vartotojui)
 Permission775=Patvirtinti išlaidų ataskaitas
 Permission776=Mokamų išlaidų ataskaitos
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Eksportuoti išlaidų ataskaitas
 Permission1001=Skaityti atsargas
 Permission1002=Sukurti / keisti sandėlius
@@ -900,6 +912,7 @@ Permission2515=Nustatyti dokumentų katalogus
 Permission2801=Naudokite FTP klientą skaitymo režime (tik naršyti ir parsisiųsti)
 Permission2802=Naudokite FTP klientą įrašymo režimu (ištrinti ar įkelti failus)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Numatomų klientų potencialas
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regionai
 DictionaryCountry=Šalys
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Vienetai
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Numatomo kliento būklė
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Nuolatinė paieškos forma kairiajame meniu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Jūs turite įjungti bent 1 modulį
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Taip vasarą
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Kurią kortelę norite atidaryti pagal nutylėjimą renkantis meniu Darbotvarkė
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial modulio nuostatos
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Sutartys
+MailToSendReception=Receptions
 MailToThirdparty=Trečiosios šalys
 MailToMember=Nariai
 MailToUser=Vartotojai
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Pašto kodas
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index e806a19824e..4190286b778 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Įvykių skaičius
 ListOfActions=Įvykių sąrašas
 EventReports=Event reports
 Location=Vieta
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Visos (-ų) dienos (-ų) įvykis
 MenuToDoActions=Visi neužbaigti įvykiai
 MenuDoneActions=Visi užbaigti/nutraukti įvykiai
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index dd70b597e9a..bed53614fc0 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Klientų sąskaitos-faktūros
 ForCustomersOrders=Klientų užsakymai
 ForProposals=Pasiūlymai
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Apskaita
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index 5ea75e3785a..00c067dd151 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index d645b4e329e..ba0519c1662 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Specialios išlaidos
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang
index 0c06a6cec6e..77f62e938ef 100644
--- a/htdocs/langs/lt_LT/contracts.lang
+++ b/htdocs/langs/lt_LT/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Veikiančios paslaugas
 MenuExpiredServices=Pasibaigusios paslaugos
 MenuClosedServices=Uždarytos paslaugos
 NewContract=Nauja sutartis
-NewContractSubscription=Nauji Sutartys / Abonentai
+NewContractSubscription=New contract or subscription
 AddContract=Sukurti sutartį
 DeleteAContract=Ištrinti sutartį
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index f56f900da60..e22aa414772 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Nauja reikšmė negali būti lygi senai reikšmei
 ErrorFailedToValidatePasswordReset=Nepavyko inicijuoti slaptažodžio. Gali būti inicijavimas jau buvo padarytas (ši nuoroda gali būti naudojamas tik vieną kartą). Jei ne, pabandykite iš naujo paleisti inicijavimo procesą.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Nepavyko pridėti kontakto
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Mokėjimo būdo tipas buvo nustatytas %s, bet modulio Sąskaita faktūra nustatymas nebuvo pilnai baigtas mokėjimo būdo informacijos parodymui.
 ErrorPHPNeedModule=Klaida, Jūsų PHP turi turėti modulį <b>%s</b> įdiegtą šios funkcijos naudojimui.
 ErrorOpenIDSetupNotComplete=Nustatyti Dolibarr config failą, kad būtų leidžiama OpenID patvirtinimas, bet OpenID paslaugos URL nėra apibrėžtas kaip konstanta %s.
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lt_LT/languages.lang b/htdocs/langs/lt_LT/languages.lang
index 175f54526f7..77a7c15b777 100644
--- a/htdocs/langs/lt_LT/languages.lang
+++ b/htdocs/langs/lt_LT/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabų
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabų
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarų
 Language_bs_BA=Bosnijos
 Language_ca_ES=Katalonų
@@ -20,6 +23,7 @@ Language_en_GB=Anglų (Jungtinė Karalystė)
 Language_en_IN=Anglų (Indija)
 Language_en_NZ=Anglų (Naujoji Zelandija)
 Language_en_SA=Anglų (Saudo Arabija)
+Language_en_SG=English (Singapore)
 Language_en_US=Anglų (JAV)
 Language_en_ZA=Anglų (Pietų Afrika)
 Language_es_ES=Ispanų
@@ -29,6 +33,7 @@ Language_es_CL=Ispanų (Čilė)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Ispanų (Hondūras)
 Language_es_MX=Ispanų (Meksika)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Ispanų (Paragvajus)
 Language_es_PE=Ispanų (Peru)
 Language_es_PR=Ispanų (Puerto Rikas)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estijos
 Language_eu_ES=Baskų
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Prancūzų (Belgija)
 Language_fr_CA=Prancūzų (Kanada)
 Language_fr_CH=Prancūzų (Šveicarija)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Prancūzų
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Prancūzų (Naujoji Kaledonija)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrajų
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Kroatijos
 Language_hu_HU=Vengrų
 Language_id_ID=Indonesian
 Language_is_IS=Islandų
 Language_it_IT=Italijos
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japonijos
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvijos
 Language_mk_MK=Makedonijos
 Language_mn_MN=Mongolian
 Language_nb_NO=Norvegų (knyginė)
+Language_ne_NP=Nepali
 Language_nl_BE=Olandų (Belgija)
 Language_nl_NL=Dutch
 Language_pl_PL=Lenkijos
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbekų
 Language_vi_VN=Vietnamo
 Language_zh_CN=Kinijos
 Language_zh_TW=Kinų (Tradicinė)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index ac1348c61ed..485609c9c59 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index f4c96047de6..52ee700de75 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=Vnt. kaina (su PVM)
 Amount=Suma
 AmountInvoice=Sąskaitos-faktūros suma
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Mokėjimo suma
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Suma (su PVM)
@@ -485,6 +485,7 @@ Categories=Žymės / kategorijos
 Category=Žymė / Kategorija
 By=Pagal
 From=Nuo
+FromDate=Pardavėjas
 FromLocation=Pardavėjas
 to=į
 To=į
@@ -687,6 +688,7 @@ Method=Metodas
 Receive=Gauti
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Dalinis
 TotalWoman=Visas
 NeverReceived=Niekada negautas
@@ -703,6 +705,7 @@ MenuECM=Dokumentai
 MenuAWStats=AWStats
 MenuMembers=Nariai
 MenuAgendaGoogle=Google operacijos
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr apribojimas (Meniu Pagrindinis-Nustatymai-Saugumas): %s kb, PHP apribojimas: %s kb
 NoFileFound=Šiame kataloge nėra išsaugotų dokumentų
 CurrentUserLanguage=Dabartinė vartojama kalba
@@ -725,7 +728,7 @@ Page=Puslapis
 Notes=Pastabos
 AddNewLine=Pridėti naują eilutę
 AddFile=Pridėti failą
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Klonuoti objektą su savo pagrindiniais atributais
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=Ke
 ShortFriday=Pe
 ShortSaturday=Še
 ShortSunday=Se
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Informacija
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 71838d720d7..ebe886d722e 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Projektiniai nariai
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Galiojantis
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Nauja įmoka
 PaymentSubscription=Naujas įmokos mokėjimas
 SubscriptionEndDate=Pasirašymo pabaigos data
@@ -78,7 +81,7 @@ DeleteType=Ištrinti
 VoteAllowed=Balsuoti leidžiama
 Physical=Fizinis
 Moral=Moralinis
-MorPhy=Moralinis/Fizinis
+MorPhy=Prigimtis
 Reenable=Įjungti vėl
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/lt_LT/mrp.lang b/htdocs/langs/lt_LT/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/lt_LT/mrp.lang
+++ b/htdocs/langs/lt_LT/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index a85a056879d..7e6a654fefa 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 09e164fc556..3bd7e2542f7 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Nustatyti brūkšninio kodo tipą
 BarcodeValue=Brūkšninio kodo reikšmė
 NoteNotVisibleOnBill=Pastaba (nematoma ant sąskaitų-faktūrų, pasiūlymų ...)
 ServiceLimitedDuration=Jei produktas yra paslauga su ribota trukme:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Kainų skaičius
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Kilmės šalis
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Vienetas
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Naujas atributas
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 3cd450c5669..32e8539171e 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Aukotojas
 TypeContact_project_task_external_TASKCONTRIBUTOR=Straipsnio autorius
 SelectElement=Pasirinkti elementą
 AddElement=Susieti su elementu
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/lt_LT/recruitment.lang b/htdocs/langs/lt_LT/recruitment.lang
new file mode 100644
index 00000000000..758281511ed
--- /dev/null
+++ b/htdocs/langs/lt_LT/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Apie
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index e07e54024b4..00b0a4e804d 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Ištrinti siuntimą
 Stock=Atsargos
 Stocks=Atsargos
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Realios atsargos
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtualios atsargos
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Sandėlio ID
 DescWareHouse=Sandėlio aprašymas
 LieuWareHouse=Sandėlio vieta
 WarehousesAndProducts=Sandėliai ir produktai
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Vidutinė svertinė įvedimo kaina
-AverageUnitPricePMP=Vidutinė svertinė įvedimo kaina
+AverageUnitPricePMPShort=Vidutinė svertinė kaina
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Vieneto pardavimo kaina
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Papildymai
 NbOfProductBeforePeriod=Produkto %s kiekis atsargose iki pasirinkto periodo (< %s)
 NbOfProductAfterPeriod=Produkto %s kiekis sandėlyje po pasirinkto periodo (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Pasirinkite produktą, kiekį, sandėlį šaltinį ir galutinį sandėlį, tada spauskite "%s". Kai tai bus padaryta visiems reikiamiems judėjimams, spauskite "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Įplaukos už šį užsakymą
 StockMovementRecorded=Įrašyti atsargų judėjimai
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index acd6057e466..caa879a115a 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Kai kurie subproduktai neturi apibrėžtos kainos
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Šis nuorodytas tiekėjas jau yra susietas su nuoroda: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Prieinamumas
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Patvirtinti šį užsakymą
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Atmesti šį užsakymą
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Pristatymo vėlavimas dienomis
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/lt_LT/ticket.lang b/htdocs/langs/lt_LT/ticket.lang
index dbb65c319d9..7f3e3f99310 100644
--- a/htdocs/langs/lt_LT/ticket.lang
+++ b/htdocs/langs/lt_LT/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Tipas
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Grupė
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Grupė
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index 9bafc72c0b5..b8d26906c5d 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Sukurtas vartotojas bus išorinis vartotojas (nes susieta
 IdPhoneCaller=Skambinančiojo telefonu ID
 NewUserCreated=Vartotojas %s sukurtas
 NewUserPassword=Slaptažodžio keitimas %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Vartotojas %s modifikuotas
 UserDisabled=Vartotojas %s išjungtas
 UserEnabled=Vartotojas %s aktyvuotas
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index e7f4b1e231e..11ebeb3ab99 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Sąskaita-faktūra atmesta (apmokestinti kliento atmetimą)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Laukiama
 StatusTrans=Išsiųsta
+StatusDebited=Debited
 StatusCredited=Kreditas
+StatusPaid=Apmokėtas
 StatusRefused=Atmesta
 StatusMotif0=Nenurodyta
 StatusMotif1=Nepakanka lėšų
@@ -77,13 +79,13 @@ StatusMotif8=Kita priežastis
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Tik ofisas
 CreateBanque=Tik bankas
 OrderWaiting=Laukia apdorojimo
-NotifyTransmision=Išėmimo perdavimas
-NotifyCredit=Išėmimo kreditas
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Nacionalinis siuntėjo numeris
 WithBankUsingRIB=Banko sąskaitoms, naudojančioms RIB
 WithBankUsingBANBIC=Banko sąskaitoms, naudojančioms IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Kreditą
 WithdrawalFileNotCapable=Negalima sugeneruoti pajamų gavimo failo Jūsų šaliai %s (Šalis nepalaikoma programos)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Išėmimo failas
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Nustatyti būklę "Failas išsiųstas"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Eilučių būklės statistika
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Suma:%s<br>Metodas:%s<br>Data:%s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija realiam režimui nebuvo nustatyta, sustabdyta po šios simuliacijos
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/lt_LT/workflow.lang b/htdocs/langs/lt_LT/workflow.lang
index 8f890cc26a4..0f340b1be9a 100644
--- a/htdocs/langs/lt_LT/workflow.lang
+++ b/htdocs/langs/lt_LT/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow modulio nustatymas
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/lt_LT/zapier.lang b/htdocs/langs/lt_LT/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/lt_LT/zapier.lang
+++ b/htdocs/langs/lt_LT/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 6b4ba7ad572..11ee0f767a8 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -111,7 +111,7 @@ CreateMvts=Izveidot jaunu darījumu
 UpdateMvts=Darījuma grozīšana
 ValidTransaction=Apstipriniet darījumu
 WriteBookKeeping=Reģistrēt darījumus Ledger
-Bookkeeping=Ledger
+Bookkeeping=Grāmatvedis
 AccountBalance=Konta bilance
 ObjectsRef=Avota objekta ref
 CAHTF=Kopējais pirkuma pārdevējs pirms nodokļu nomaksas
@@ -149,11 +149,12 @@ ACCOUNTING_MANAGE_ZERO=Atļaujiet pārvaldīt atšķirīgu skaitu nulles grāmat
 BANK_DISABLE_DIRECT_INPUT=Atspējot tiešu darījumu reģistrāciju bankas kontā
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Iespējot eksporta projektu žurnālā
 ACCOUNTANCY_COMBO_FOR_AUX=Iespējot kombinēto sarakstu papildu kontam (var būt lēni, ja jums ir daudz trešo personu)
+ACCOUNTING_DATE_START_BINDING=Definējiet datumu, lai sāktu iesiešanu un pārskaitīšanu grāmatvedībā. Zem šī datuma darījumi netiks pārnesti uz grāmatvedību.
 
 ACCOUNTING_SELL_JOURNAL=Pārdošanas žurnāls
 ACCOUNTING_PURCHASE_JOURNAL=Pirkuma žurnāls
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Dažādi žurnāli
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Izdevumu atskaites žurnāls
 ACCOUNTING_SOCIAL_JOURNAL=Sociālais žurnāls
 ACCOUNTING_HAS_NEW_JOURNAL=Vai jauns Vēstnesis?
 
@@ -284,6 +285,7 @@ ShowTutorial=Rādīt apmācību
 NotReconciled=Nesaskaņots
 
 ## Admin
+BindingOptions=Iesiešanas iespējas
 ApplyMassCategories=Pielietot masu sadaļas
 AddAccountFromBookKeepingWithNoCategories=Pieejamais konts vēl nav personalizētajā grupā
 CategoryDeleted=Grāmatvedības konta kategorija ir noņemta
@@ -307,7 +309,7 @@ NumberOfAccountancyMovements=Pārvietošanas skaits
 ## Export
 ExportDraftJournal=Eksporta žurnāla projekts
 Modelcsv=Eksporta modulis
-Selectmodelcsv=Select a model of export
+Selectmodelcsv=Atlasiet eksporta modeli
 Modelcsv_normal=Klasiskais eksports
 Modelcsv_CEGID=Eksports uz CEGID ekspertu kompāniju
 Modelcsv_COALA=Eksportēt Sage Coala
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index bdb4cca4796..9eb0b87e3e2 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Noklusējuma sūtītāja e-pasta ziņojums manuālai
 UserEmail=Lietotāja e-pasts
 CompanyEmail=Uzņēmuma e-pasts
 FeatureNotAvailableOnLinux=Funkcija nav pieejams Unix tipa sistēmās. Pārbaudi savu sendmail programmu lokāli.
+FixOnTransifex=Fiksējiet tulkojumu projekta tiešsaistes tulkošanas platformā
 SubmitTranslation=Ja šīs valodas tulkojums nav pilnīgs vai Jūs atradīsiet kļūdas, varat to labot, rediģējot failus direktorijā <b>langs/%s</b> un iesniedzot izmaiņas vietnē www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Ja šīs valodas tulkojums nav pilnīgs vai atrodat kļūdas, varat to labot, rediģējot failus direktorijā <b> langs / %s </b> un iesniedziet modificētus failus dolibarr.org/forum vai izstrādātājiem vietnē github.com/ Dolibarr / dolibarr.
+SubmitTranslationENUS=Ja šīs valodas tulkojums nav pabeigts vai atrodat kļūdas, labojiet to, rediģējot failus direktorijā <b> langs / %s </b> un iesniedziet modificētus failus vietnē dolibarr.org/forum vai, ja esat izstrādātājs, ar PR vietni github. .com / Dolibarr / dolibarr
 ModuleSetup=Moduļa iestatīšana
 ModulesSetup=Moduļu/Aplikāciju iestatīšana
 ModuleFamilyBase=Sistēma
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modulim <b>%s</b> jābūt aktivizētam vispirms, ja jū
 SecurityToken=Atslēga uz drošu saiti
 NoSmsEngine=Nav pieejams neviens SMS sūtītāja pārvaldnieks. SMS sūtītāja pārvaldnieks nav instalēts ar noklusējuma izplatīšanu, jo tie ir atkarīgi no ārēja piegādātāja, bet jūs varat atrast kādu no %s
 PDF=PDF
-PDFDesc=Globālās iespējas PDF ģenerēšanai.
-PDFAddressForging=Adreses lodziņu noteikumi
+PDFDesc=Globālās iespējas PDF ģenerēšanai
+PDFAddressForging=Noteikumi par adreses sadaļu
 HideAnyVATInformationOnPDF=Slēpt visu informāciju, kas saistīta ar pārdošanas nodokli / PVN
 PDFRulesForSalesTax=Pārdošanas nodokļa / PVN noteikumi
 PDFLocaltax=Noteikumi par %s
-HideLocalTaxOnPDF=Paslēpt %s likmi slejā Nodokļu pārdošana
+HideLocalTaxOnPDF=Paslēpt %s likmi kolonnā Pārdošanas nodoklis / PVN
 HideDescOnPDF=Paslēpt produktu aprakstu
 HideRefOnPDF=Slēpt produktu ref.
 HideDetailsOnPDF=Slēpt informāciju par produktu līnijām
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Pārveidot par cenām ar bāzes atsauces vērtību, kas de
 MassConvert=Uzsākt lielapjoma reklāmguvumu
 PriceFormatInCurrentLanguage=Cenas formāts pašreizējā valodā
 String=Rinda
+String1Line=Stīga (1 līnija)
 TextLong=Garš teksts
+TextLongNLines=Garš teksts (n rindiņas)
 HtmlText=Html teksts
 Int=Vesels skaitlis
 Float=Peldēt
@@ -544,8 +547,8 @@ Module55Name=Svītrkodi
 Module55Desc=Svītrkodu vadība
 Module56Name=Maksājums ar pārskaitījumu
 Module56Desc=Piegādātāju norēķinu vadīšana ar kredīta pārveduma rīkojumiem. Tas ietver SEPA faila ģenerēšanu Eiropas valstīm.
-Module57Name=Bankas tiešā debeta maksājumi
-Module57Desc=Tiešā debeta maksājuma uzdevumu pārvaldīšana. Tas ietver SEPA datnes izveidi Eiropas valstīm.
+Module57Name=Maksājumi ar tiešo debetu
+Module57Desc=Tiešā debeta rīkojumu vadība. Tas ietver SEPA faila ģenerēšanu Eiropas valstīm.
 Module58Name=NospiedLaiSavienotos
 Module58Desc=Integrācija ar ClickToDial sistēmas (zvaigznīte, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Izveidot/mainīt pakalpojumus
 Permission534=Dzēst pakalpojumus
 Permission536=Skatīt/vadīt slēptos pakalpojumus
 Permission538=Eksportēt pakalpojumus
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Lasīt materiālu rēķinus
 Permission651=Izveidot / atjaunināt materiālu rēķinus
 Permission652=Dzēst materiālu rēķinus
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Lasīt ziedojumus
 Permission702=Izveidot/mainīt ziedojumus
 Permission703=Dzēst ziedojumus
@@ -848,6 +858,8 @@ Permission773=Dzēst izdevumu pārskatus
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Apstiprināt izdevumu pārskatus
 Permission776=Apmaksāt izdevumu pārskatus
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Eksportēt izdevumu atskaites
 Permission1001=Lasīt krājumus
 Permission1002=Izveidot/labot noliktavas
@@ -900,6 +912,7 @@ Permission2515=Iestatīt dokumentu direktorijas
 Permission2801=Lietot FTP klientu lasīšanas režīmā (pārlūko un lejupielādē)
 Permission2802=Lietot FTP klientu rakstīšanas režīmā (dzēst vai augšupielādēt failus)
 Permission3200=Lasīt arhivētos notikumus un pirkstu nospiedumus
+Permission3301=Generate new modules
 Permission4001=Skatīt darbiniekus
 Permission4002=Izveidot darbiniekus
 Permission4003=Dzēst darbiniekus
@@ -947,7 +960,8 @@ Permission63003=Dzēst resursus
 Permission63004=Saistīt resursus ar darba kārtības pasākumiem
 DictionaryCompanyType=Trešās puses veidi
 DictionaryCompanyJuridicalType=Trešo pušu juridiskās personas
-DictionaryProspectLevel=Prospect potenciālu
+DictionaryProspectLevel=Perspektējiet potenciālo līmeni uzņēmumiem
+DictionaryProspectContactLevel=Paredziet potenciālo kontaktu līmeni
 DictionaryCanton=Valstis/provinces
 DictionaryRegion=Reģions
 DictionaryCountry=Valstis
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=E-pasta veidnes
 DictionaryUnits=Vienības
 DictionaryMeasuringUnits=Mērvienības
 DictionarySocialNetworks=Sociālie tīkli
-DictionaryProspectStatus=Prospekta statuss
+DictionaryProspectStatus=Prospekta statuss uzņēmumiem
+DictionaryProspectContactStatus=Prospekta statuss kontaktiem
 DictionaryHolidayTypes=Atvaļinājumu veidi
 DictionaryOpportunityStatus=Vadošais statuss projektu / vadībai
 DictionaryExpenseTaxCat=Izdevumu pārskats - transporta kategorijas
@@ -1076,7 +1091,7 @@ LoginPage=Pieteikšanās lapa
 BackgroundImageLogin=Fona attēls
 PermanentLeftSearchForm=Pastāvīgā meklēšanas forma kreisajā izvēlnē
 DefaultLanguage=Noklusējuma valoda
-EnableMultilangInterface=Iespējot daudzvalodu atbalstu
+EnableMultilangInterface=Iespējojiet daudzvalodu atbalstu klientu vai pārdevēju attiecībām
 EnableShowLogo=Izvēlnē attēlot uzņēmuma logotipu
 CompanyInfo=Uzņēmums / organizācija
 CompanyIds=Uzņēmuma / organizācijas identitāte
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Vismaz atslēgas vai tulkošanas virknei
 NewTranslationStringToShow=Jauna tulkošanas virkne, lai parādītu
 OriginalValueWas=Oriģinālais tulkojums ir pārrakstīts. Sākotnējā vērtība bija: <br><br>%s
 TransKeyWithoutOriginalValue=Jūs piespiedāt jaunu tulkojumu tulkošanas taustiņam "<strong> %s</strong>", kas nav nevienā valodas failā
-TotalNumberOfActivatedModules=Aktivizētā programma/moduļi: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Aktivizētie moduļi
+TotalNumberOfActivatedModules=Aktivizētie moduļi: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Jums ir jābūt ieslēgtam vismaz 1 modulim
 ClassNotFoundIntoPathWarning=Klase %s nav atrodama PHP ceļā
 YesInSummer=Jā vasarā
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Izmantojiet notikumu tipus (tiek pārvaldīti izvēlnē Ie
 AGENDA_USE_EVENT_TYPE_DEFAULT=Veidojot notikuma veidlapu, automātiski iestatiet šo noklusējuma vērtību
 AGENDA_DEFAULT_FILTER_TYPE=Šādu pasākumu automātiski iestatīt darba kārtības skatā meklēšanas filtūrā
 AGENDA_DEFAULT_FILTER_STATUS=Automātiski iestatīt šo statusu notikumu skatīšanai darba filtru meklēšanas filtūrā
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Kuru skatu vēlaties atvērt pēc noklusējuma, izvēloties izvēlni Agenda
 AGENDA_REMINDER_EMAIL=Iespējot notikumu atgādinājumu <b> pa e-pastu </b> (atgādinājums par iespēju / kavēšanos var definēt katrā notikumā). Piezīme: modulis <strong> %s </strong> ir jāaktivizē un pareizi jāiestata, lai atgādinājums tiktu nosūtīts pareizā laikā.
 AGENDA_REMINDER_BROWSER=Iespējot notikuma atgādinājumu <b>lietotāja pārlūkā</b> (kad ir sasniegts notikuma datums, katrs lietotājs to var noraidīt no pārlūka apstiprinājuma jautājuma)
 AGENDA_REMINDER_BROWSER_SOUND=Iespējot skaņas paziņojumu
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Parādīt saistīto objektu darba kārtībā
 ##### Clicktodial #####
 ClickToDialSetup=Klikšķiniet lai  Dial moduļa uzstādīšanas
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=Šis modulis ļauj noklikšķināt uz numuriem, uz kuriem var noklikšķināt. Noklikšķinot uz ikonas, tālrunis zvanīs uz numuru. To var izmantot, lai izsauktu zvanu centra sistēmu no Dolibarr, kas var izsaukt tālruņa numuru, piemēram, SIP sistēmā.
+ClickToDialDesc=Šis modulis maina tālruņu numurus, izmantojot galddatoru, uz noklikšķināmām saitēm. Klikšķis piezvanīs uz numuru. To var izmantot, lai sāktu tālruņa zvanu, kad, izmantojot darbvirsmu, izmantojat mīksto tālruni vai, piemēram, izmantojot CTI sistēmu, kuras pamatā ir SIP protokols. Piezīme. Izmantojot viedtālruni, uz tālruņu numuriem vienmēr var noklikšķināt.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Izmantojiet šo metodi, ja jūsu lietotājiem ir programmatūras tālrunis vai programmatūras interfeiss, kas uzstādīts uz tā paša datora kā pārlūks, un tiek izsaukts, kad jūs noklikšķināt uz savas pārlūkprogrammas saites, kas sākas ar "tel:". Ja jums ir nepieciešams pilnīgs servera risinājums (nav nepieciešama lokālā programmatūras instalēšana), jums tas jādara, lai tas būtu "nē" un aizpildītu nākamo lauku.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Ievadiet 0 vai 1
 UnicodeCurrency=Ievadiet šeit starp aplikācijām, baitu skaitļu sarakstu, kas attēlo valūtas simbolu. Piemēram: attiecībā uz $ ievadiet [36] - Brazīlijas reālajam R $ [82,36] - par € ievadiet [8364]
 ColorFormat=RGB krāsa ir HEX formātā, piemēram: FF0000
+PictoHelp=Ikonas nosaukums dolibarr formātā ('image.png', ja pašreizējā motīvu direktorijā, 'image.png@nom_du_module', ja moduļa direktorijā / img /)
 PositionIntoComboList=Līnijas novietojums kombinētajos sarakstos
 SellTaxRate=Pārdošanas nodokļa likme
 RecuperableOnly=Jā par PVN "Neuztverams, bet atgūstams", kas paredzēts dažai Francijas valstij. Uzturiet vērtību "Nē" visos citos gadījumos.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Cenas pieprasījums
 MailToSendSupplierOrder=Pirkuma pasūtījumi
 MailToSendSupplierInvoice=Piegādātāja rēķini
 MailToSendContract=Līgumi
+MailToSendReception=Pieņemšanas
 MailToThirdparty=Trešās puses
 MailToMember=Dalībnieki
 MailToUser=Lietotāji
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s ir pieejams. Versija %
 ExampleOfNewsMessageForMaintenanceRelease=Ir pieejams Dolibarr ERP & CRM %s. Versija %s ir apkopes versija, tāpēc tajā ir tikai kļūdu labojumi. Mēs iesakām visiem lietotājiem jaunināt uz šo versiju. Tehniskās apkopes izdevums neievieš jaunas funkcijas vai izmaiņas datubāzē. To var lejupielādēt no https://www.dolibarr.org portāla lejupielādes apgabala (apakšdirektorija Stabilas versijas). Lai iegūtu pilnīgu izmaiņu sarakstu, varat izlasīt <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a>.
 MultiPriceRuleDesc=Ja ir iespējota opcija "Vairāki cenu līmeņi uz produktu / pakalpojumu", katram produktam varat noteikt dažādas cenas (vienu cenu līmenī). Lai ietaupītu laiku, šeit jūs varat ievadīt noteikumu, lai automātiski aprēķinātu cenu katram līmenim, pamatojoties uz pirmā līmeņa cenu, tāpēc katram produktam būs jāievada tikai pirmā līmeņa cena. Šī lapa ir izstrādāta, lai ietaupītu jūsu laiku, taču tā ir noderīga tikai tad, ja jūsu cenas katram līmenim ir saistītas ar pirmo līmeni. Vairumā gadījumu šo lapu varat ignorēt.
 ModelModulesProduct=Veidlapas produktu dokumentos
+WarehouseModelModules=Noliktavu dokumentu paraugi
 ToGenerateCodeDefineAutomaticRuleFirst=Lai varētu automātiski ģenerēt kodus, vispirms jādefinē pārvaldnieks, lai automātiski definētu svītrkoda numuru.
 SeeSubstitutionVars=Iespējamo aizvietojošo mainīgo sarakstu skatīt * piezīmē
 SeeChangeLog=Skatīt ChangeLog failu (tikai angļu valodā)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Kreisā puse PDF failā
 MAIN_PDF_MARGIN_RIGHT=Labā puse PDF failā
 MAIN_PDF_MARGIN_TOP=Galvene PDF failā
 MAIN_PDF_MARGIN_BOTTOM=Kājene PDF failā
+MAIN_DOCUMENTS_LOGO_HEIGHT=Logotipa augstums PDF formātā
 NothingToSetup=Šim modulim nav nepieciešama īpaša iestatīšana.
 SetToYesIfGroupIsComputationOfOtherGroups=Iestatiet to uz "jā", ja šī grupa ir citu grupu aprēķins
 EnterCalculationRuleIfPreviousFieldIsYes=Ievadiet aprēķina kārtulu, ja iepriekšējais lauks ir iestatīts uz Jā (Piemēram, 'CODEGRP1 + CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nekas nav paveikts
 XEmailsDoneYActionsDone=%s kvalificēti e-pasta ziņojumi, %s veiksmīgi apstrādāti e-pasta ziņojumi (par %s ierakstu / veiktajām darbībām)
 RecordEvent=Ierakstiet e-pasta notikumu
 CreateLeadAndThirdParty=Izveidot vadību (un, ja nepieciešams, trešo personu)
-CreateTicketAndThirdParty=Izveidot biļeti (un, ja nepieciešams, trešo personu)
+CreateTicketAndThirdParty=Izveidot biļeti (un saiti uz trešo personu, ja tā ir ielādēta iepriekšējās operācijas laikā)
 CodeLastResult=Jaunākais rezultātu kods
 NbOfEmailsInInbox=E-pasta ziņojumu skaits avota direktorijā
 LoadThirdPartyFromName=Ielādējiet trešo personu meklēšanu pakalpojumā %s (tikai ielāde)
 LoadThirdPartyFromNameOrCreate=Ielādējiet trešo personu meklēšanu pakalpojumā %s (izveidojiet, ja nav atrasts)
-WithDolTrackingID=Dolibarr atsauce atrodama ziņojuma ID
-WithoutDolTrackingID=Ziņojuma ID nav atrasta Dolibarr atsauce
+WithDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kas nosūtīts no Dolibarr
+WithoutDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kuru NAV nosūtīts no Dolibarr
+CreateCandidature=Izveidojiet kandidatūru
 FormatZip=Pasta indekss
 MainMenuCode=Izvēlnes ievades kods (mainmenu)
 ECMAutoTree=Rādīt automātisko ECM koku
@@ -1981,7 +2002,7 @@ ImportSetup=Moduļa importēšanas iestatīšana
 InstanceUniqueID=Unikāls gadījuma ID
 SmallerThan=Mazāks nekā
 LargerThan=Lielāks nekā
-IfTrackingIDFoundEventWillBeLinked=Ņemiet vērā, ka, ja ienākošajā e-pastā tiek atrasts izsekošanas ID, notikums tiks automātiski saistīts ar saistītajiem objektiem.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Izmantojot GMail kontu, ja esat iespējojis 2 soļu validāciju, ieteicams izveidot īpašu lietojumprogrammas otro paroli, nevis izmantot sava konta caurlaides paroli no https://myaccount.google.com/.
 EmailCollectorTargetDir=Vēlama rīcība var būt e-pasta pārvietošana citā tagā / direktorijā, kad tas tika veiksmīgi apstrādāts. Vienkārši šeit iestatiet direktorijas nosaukumu, lai izmantotu šo funkciju (nelietojiet nosaukumā īpašās rakstzīmes). Ņemiet vērā, ka jāizmanto arī lasīšanas / rakstīšanas pieteikšanās konts.
 EmailCollectorLoadThirdPartyHelp=Varat izmantot šo darbību, lai izmantotu e-pasta saturu, lai atrastu un ielādētu esošu trešo personu savā datu bāzē. Atrasta (vai izveidota) trešā puse tiks izmantota sekojošām darbībām, kurām tā nepieciešama. Parametru laukā varat izmantot, piemēram, 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)', ja vēlaties iegūt trešās puses vārdu no atrastās virknes 'Name: name to find'. ķermenis.
@@ -2005,3 +2026,7 @@ RssNote=Piezīme. Katra RSS plūsmas definīcija nodrošina logrīku, kas jums j
 JumpToBoxes=Pāriet uz Iestatīšana -> logrīki
 MeasuringUnitTypeDesc=Šeit izmantojiet tādas vērtības kā "lielums", "virsma", "tilpums", "svars", "laiks"
 MeasuringScaleDesc=Skala ir to vietu skaits, kuras jums jāpārvieto aiz komata, lai atbilstu noklusējuma atsauces vienībai. "Laika" vienības tipam tas ir sekunžu skaits. Vērtības no 80 līdz 99 ir rezervētas vērtības.
+TemplateAdded=Pievienota veidne
+TemplateUpdated=Veidne ir atjaunināta
+TemplateDeleted=Veidne ir izdzēsta
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index 56e7da23660..43e497ee2d1 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Notikumu skaits
 ListOfActions=Notikumu saraksts
 EventReports=Pasākumu atskaites
 Location=Atrašanās vieta
-ToUserOfGroup=Jebkuram grupas lietotājam
+ToUserOfGroup=Notikums piešķirts jebkuram grupas lietotājam
 EventOnFullDay=Notikums visu -ām dienu -ām
 MenuToDoActions=Visi nepabeigtie pasākumi
 MenuDoneActions=Visi izbeigtie notikumi
@@ -86,6 +86,8 @@ ProposalDeleted=Piedāvājums dzēsts
 OrderDeleted=Pasūtījums dzēsts
 InvoiceDeleted=Rēķins dzēsts
 DraftInvoiceDeleted=Rēķina melnraksts ir izdzēsts
+CONTACT_CREATEInDolibarr=Kontaktpersona %s ir izveidota
+CONTACT_DELETEInDolibarr=Kontaktpersona %s ir izdzēsta
 PRODUCT_CREATEInDolibarr=Produkts %s ir izveidots
 PRODUCT_MODIFYInDolibarr=Produkts %s ir labots
 PRODUCT_DELETEInDolibarr=Produkts %s dzēsts
@@ -158,3 +160,9 @@ DateStartPlusOne=S'akuma datums + 1 stunda
 SetAllEventsToTodo=Iestatiet, lai visi notikumi tiek uzlikti
 SetAllEventsToInProgress=Iestatiet visus notiekošos pasākumus
 SetAllEventsToFinished=Iestatiet, lai visi notikumi būtu pabeigti
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index ac3fc67c85d..4f61035b651 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -37,7 +37,7 @@ IbanValid=Derīgs BAN
 IbanNotValid=BAN nav derīgs
 StandingOrders=Tiešā debeta pasūtījumi
 StandingOrder=Tiešā debeta rīkojums
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=Maksājums ar tiešo debetu
 PaymentByBankTransfers=Maksājumi ar pārskaitījumu
 PaymentByBankTransfer=Maksājums ar pārskaitījumu
 AccountStatement=Konta izraksts
@@ -130,7 +130,7 @@ BankMovements=Kustība
 PlannedTransactions=Plānotie darījumi
 Graph=Grafiks
 ExportDataset_banque_1=Banku darījumi un konta izraksts
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Depozīta kvīts
 TransactionOnTheOtherAccount=Pārskaitījums uz otru kontu
 PaymentNumberUpdateSucceeded=Maksājuma numurs veiksmīgi atjaunots
 PaymentNumberUpdateFailed=Maksājumu numuru nevar atjaunināt
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 1a3f66be709..8b7fb54ed1a 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -289,7 +289,7 @@ AddGlobalDiscount=Izveidot absolūto atlaidi
 EditGlobalDiscounts=Labot absolūtās atlaides
 AddCreditNote=Izveidot kredīta piezīmi
 ShowDiscount=Rādīt atlaidi
-ShowReduc=Parādiet atlaidi
+ShowReduc=Parādīt atlaidi
 ShowSourceInvoice=Parādiet avota rēķinu
 RelativeDiscount=Relatīva atlaide
 GlobalDiscount=Globālā atlaide
@@ -369,7 +369,7 @@ FrequencyUnit=Frekvences vienība
 toolTipFrequency=Piemēri: <br> <b> Iestatīt 7, Diena </ b>: piešķirt jaunu rēķinu ik pēc 7 dienām <br> <b> Iestatīt 3, mēnesi </ b>: piešķirt jaunu rēķinu reizi 3 mēnešos
 NextDateToExecution=Nākamās rēķina izveidošanas datums
 NextDateToExecutionShort=Datums nākamais gen.
-DateLastGeneration=Date of latest generation
+DateLastGeneration=Jaunākais veidošanas datums
 DateLastGenerationShort=Datuma pēdējais gen.
 MaxPeriodNumber=Maks. rēķinu veidošanas skaits
 NbOfGenerationDone=Rēķina paaudzes skaits jau ir pabeigts
@@ -505,7 +505,7 @@ ToMakePayment=Maksāt
 ToMakePaymentBack=Atmaksāt
 ListOfYourUnpaidInvoices=Saraksts ar neapmaksātiem rēķiniem
 NoteListOfYourUnpaidInvoices=Piezīme: Šis saraksts satur tikai rēķinus par trešo pušu Jums ir saistīti ar kā pārdošanas pārstāvis.
-RevenueStamp=Nodokļa zīmogs
+RevenueStamp=Nodokļu zīmogs
 YouMustCreateInvoiceFromThird=Šī opcija ir pieejama tikai tad, ja izveidojat rēķinu no trešās personas cilnes "Klients"
 YouMustCreateInvoiceFromSupplierThird=Šī opcija ir pieejama tikai tad, ja izveidojat rēķinu no trešās puses cilnes „Pārdevējs”
 YouMustCreateStandardInvoiceFirstDesc=Vispirms vispirms jāizveido standarta rēķins un jāpārveido tas par "veidni", lai izveidotu jaunu veidnes rēķinu
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index 4ad1e26d651..88d7803c340 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Jaunākie %s reģistrēti piegādātāji
 BoxTitleLastModifiedSuppliers=Pārdevēji: pēdējais %s labotais
 BoxTitleLastModifiedCustomers=Klienti: pēdējais %s labotais
 BoxTitleLastCustomersOrProspects=Jaunākie %s klienti vai perspektīvas
-BoxTitleLastCustomerBills=Jaunākie %s klientu rēķini
-BoxTitleLastSupplierBills=Jaunākie %s pārdevēju rēķini
+BoxTitleLastCustomerBills=Jaunākie %s modificētie klientu rēķini
+BoxTitleLastSupplierBills=Jaunākie %s modificētie pārdevēja rēķini
 BoxTitleLastModifiedProspects=Perspektīvas: pēdējais %s modificēts
 BoxTitleLastModifiedMembers=Jaunākie %s dalībnieki
 BoxTitleLastFicheInter=Jaunākās %s izmaiņas iejaukšanās
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Pārdevēja pasūtījumi: pēdējais %s mod
 BoxTitleLastModifiedCustomerBills=Klienta rēķini: pēdējie %s modificēti
 BoxTitleLastModifiedCustomerOrders=Pārdošanas pasūtījumi: pēdējais %s modificēts
 BoxTitleLastModifiedPropals=Pēdējie %s labotie priekšlikumi
+BoxTitleLatestModifiedJobPositions=Jaunākie %s pārveidotie darbi
+BoxTitleLatestModifiedCandidatures=Jaunākās %s modificētās kandidatūras
 ForCustomersInvoices=Klientu rēķini
 ForCustomersOrders=Klientu pasūtījumi
 ForProposals=Priekšlikumi
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Apturēšanas konts nav definēts
 BoxLastCustomerShipments=Pēdējo klientu sūtījumi
 BoxTitleLastCustomerShipments=Jaunākie %s klientu sūtījumi
 NoRecordedShipments=Nav reģistrēts klienta sūtījums
+# Pages
+AccountancyHome=Grāmatvedība
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index a46e6edc72b..773bfdf4601 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS modulis
 BasicPhoneLayout=Izmantojiet telefonu pamata izkārtojumu
 SetupOfTerminalNotComplete=Termināļa %s iestatīšana nav pabeigta
 DirectPayment=Tiešais maksājums
-DirectPaymentButton=Poga Tiešais naudas maksājums
+DirectPaymentButton=Pievienojiet pogu “Tiešais maksājums skaidrā naudā”
 InvoiceIsAlreadyValidated=Rēķins jau ir apstiprināts
 NoLinesToBill=Nav rēķinu
 CustomReceipt=Pielāgota kvīts
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Ārējs modulis ar papildu funkcijām. Iespēj
 PrintMethod=Drukas metode
 ReceiptPrinterMethodDescription=Jaudīga metode ar daudziem parametriem. Pilnībā pielāgojams ar veidnēm. Nevar izdrukāt no mākoņa.
 ByTerminal=Ar termināli
-TakeposNumpadUsePaymentIcon=Izmantojiet maksājuma ikonu uz numpad
+TakeposNumpadUsePaymentIcon=Izmantojiet ikonu, nevis tekstu uz numpad numura maksāšanas pogām
 CashDeskRefNumberingModules=Numerācijas modulis tirdzniecības vietu tirdzniecībai
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> tagu izmanto, lai pievienotu termināļa numuru
 TakeposGroupSameProduct=Grupējiet tās pašas produktu līnijas
 StartAParallelSale=Sāciet jaunu paralēlu izpārdošanu
-ControlCashOpening=Kontrolējiet kasi, atverot poz
+ControlCashOpening=Kontrolējiet kases atvēršanu kasē
 CloseCashFence=Aizveriet naudas žogu
 CashReport=Skaidras naudas pārskats
 MainPrinterToUse=Galvenais izmantojamais printeris
@@ -112,8 +112,13 @@ RestaurantMenu=Izvēlne
 CustomerMenu=Klientu izvēlne
 ScanToMenu=Lai redzētu izvēlni, skenējiet QR kodu
 ScanToOrder=Skenējiet QR kodu, lai pasūtītu
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+Appearance=Izskats
+HideCategoryImages=Slēpt kategorijas attēlus
+HideProductImages=Slēpt produktu attēlus
+NumberOfLinesToShow=Parādāmo attēlu līniju skaits
+DefineTablePlan=Definējiet tabulu plānu
+GiftReceiptButton=Pievienojiet pogu Dāvanu kvīts
+GiftReceipt=Dāvanu kvīts
+ModuleReceiptPrinterMustBeEnabled=Vispirms jābūt iespējotam moduļa saņemšanas printerim
+AllowDelayedPayment=Atļaut kavētu maksājumu
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 824b0faf525..58d83a7fb6a 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -24,7 +24,7 @@ ThirdPartyContact=Trešās puses kontaktpersona/adrese
 Company=Uzņēmums
 CompanyName=Uzņēmuma nosaukums
 AliasNames=Pseidonīms (komerciāls, preču zīme, ...)
-AliasNameShort=Alias ​​vārds
+AliasNameShort=Pseidonīma nosaukums
 Companies=Uzņēmumi
 CountryIsInEEC=Valsts atrodas Eiropas Ekonomikas kopienā
 PriceFormatInCurrentLanguage=Cenu attēlošanas formāts pašreizējā valodā un valūtā
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 2e3ca1e5d05..a4add9768be 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Sociālais vai fiskālais nodoklis
 SocialContributions=Sociālie vai fiskālie nodokļi
 SocialContributionsDeductibles=Atskaitāmi sociālie vai fiskālie nodokļi
 SocialContributionsNondeductibles=Nekonkurējoši sociālie vai fiskālie nodokļi
+DateOfSocialContribution=Sociālā vai fiskālā nodokļa datums
 LabelContrib=Marķējuma ieguldījums
 TypeContrib=Veida iemaksa
 MenuSpecialExpenses=Īpašie izdevumi
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index 2be687c5e7d..df3f4b80956 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Darbojošies pakalpojumi
 MenuExpiredServices=Beigušies pakalpojumi
 MenuClosedServices=Slēgtie pakalpojumi
 NewContract=Jaunu līgumu
-NewContractSubscription=New contract/subscription
+NewContractSubscription=Jauns līgums vai abonements
 AddContract=Izveidot līgmu
 DeleteAContract=Dzēst līgumu
 ActivateAllOnContract=Aktivizēt visus pakalpojumus
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 250a96a3e73..43bb39dad54 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -6,7 +6,7 @@ NoErrorCommitIsDone=Nav kļūda, mēs apstiprinam
 ErrorButCommitIsDone=Kļūdas atrasta, bet mēs apstiprinājām neskatoties uz to
 ErrorBadEMail=E-pasts %s ir nepareizs
 ErrorBadUrl=Url %s ir nepareizs
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
+ErrorBadValueForParamNotAString=Jūsu parametra nepareiza vērtība. Tas parasti parādās, ja trūkst tulkojuma.
 ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
 ErrorGroupAlreadyExists=Grupa %s jau pastāv.
 ErrorRecordNotFound=Ierakstīt nav atrasts.
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Pārdevēja kodu nepareiza sintakse
 ErrorSupplierCodeRequired=Nepieciešams piegādātāja kods
 ErrorSupplierCodeAlreadyUsed=Pārdevēja kods jau ir izmantots
 ErrorBadParameters=Slikts parametrs
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Nepareizi parametri vai to nav
 ErrorBadValueForParameter=Nepareiza vērtība '%s' parametram '%s'
 ErrorBadImageFormat=Attēla failam nav atbalstītais formāts (jūsu PHP neatbalsta šīs formāta attēlu pārveidošanas funkciju)
 ErrorBadDateFormat=Vērtībai '%s' ir nepareizs datuma formāts
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Jaunā vērtība nevar būt vienāds ar veco
 ErrorFailedToValidatePasswordReset=Neizdevās reinit paroli. Var būt reinit tika izdarīts (šī saite var izmantot tikai vienu reizi). Ja tā nav, mēģiniet restartēt reinit procesu.
 ErrorToConnectToMysqlCheckInstance=Izveidot savienojumu ar datubāzi neizdodas. Pārbauda datu bāzes serveri (piemēram, ar mysql / mariadb, jūs varat to palaist no komandrindas ar 'sudo service mysql start').
 ErrorFailedToAddContact=Neizdevās pievienot kontaktu
-ErrorDateMustBeBeforeToday=Datums nevar būt lielāks kā šodien
+ErrorDateMustBeBeforeToday=Datumam jābūt mazākam par šodienu
+ErrorDateMustBeInFuture=Datumam jābūt lielākam nekā šodien
 ErrorPaymentModeDefinedToWithoutSetup=Maksājumu režīms tika noteikts rakstīt %s, bet uzstādīšana moduļa rēķins netika pabeigts, lai noteiktu informāciju, lai parādītu šo maksājumu režīmā.
 ErrorPHPNeedModule=Kļūda, jūsu PHP ir jābūt moduli <b>%s</b> uzstādītas, lai izmantotu šo funkciju.
 ErrorOpenIDSetupNotComplete=Jūs uzstādīšana Dolibarr config failu, lai ļautu OpenID autentifikācijas, bet OpenID pakalpojuma URL nav definēts spēkā salīdzināmajās %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Šai partijai/sērijai nav
 ErrorOnlyOneFieldForGroupByIsPossible=“Grupēt pēc” ir iespējams tikai 1 lauks (citi tiek atmesti)
 ErrorTooManyDifferentValueForSelectedGroupBy=Tika atrasts pārāk daudz dažādu vērtību (vairāk nekā <b> %s </b>) laukam “<b> %s a09a4b739f17f17f8z0”. Lauks 'Grupēt pēc' ir noņemts. Varbūt vēlaties to izmantot kā X asi?
 ErrorReplaceStringEmpty=Kļūda: aizvietojamā virkne ir tukša
+ErrorProductNeedBatchNumber=Kļūda, produktam “<b> %s </b>” ir nepieciešama partija / sērijas numurs
+ErrorProductDoesNotNeedBatchNumber=Kļūda, produkts '<b> %s </b>' nepieņem partiju / sērijas numuru
+ErrorFailedToReadObject=Kļūda, neizdevās nolasīt <b> tipa objektu. %s
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index a2387ca5879..8f3f62628ff 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Lauka nosaukums
 NowClickToGenerateToBuildExportFile=Tagad atlasiet faila formātu kombinētajā lodziņā un noklikšķiniet uz Izveidot, lai izveidotu eksporta failu ...
 AvailableFormats=Pieejamie formāti
 LibraryShort=Bibliotēka
+ExportCsvSeparator=Csv rakstzīmju atdalītājs
+ImportCsvSeparator=Csv rakstzīmju atdalītājs
 Step=Solis
 FormatedImport=Importa palīgs
 FormatedImportDesc1=Šis modulis ļauj atjaunināt esošos datus vai pievienot jaunus objektus datu bāzē no faila bez tehniskām zināšanām, izmantojot palīgu.
@@ -92,11 +94,11 @@ DataComeFromNoWhere=Vērtību, lai ievietotu nāk no nekur avota failā.
 DataComeFromFileFieldNb=Vērtību, lai ievietotu nāk no lauka skaits <b>%s,</b> kas avota failā.
 DataComeFromIdFoundFromRef=Sākotnējā faila lauka skaitļa <b> %s </b> vērtība tiks izmantota, lai atrastu izmantotā vecā objekta ID (tādēļ objekts <b> %s </b>, kuram ir atsauces no avota faila jābūt datu bāzē).
 DataComeFromIdFoundFromCodeId=Avota faila lauka skaitļa kods <b> %s </b> tiks izmantots, lai atrastu izmantojamā vecāka objekta ID (tādēļ vārdnīcas kodam jābūt eksemplāram <b> %s </b> ) Ņemiet vērā, ka, ja jūs zināt id, varat to izmantot arī avota failā, nevis kodu. Importam jādarbojas abos gadījumos.
-DataIsInsertedInto=Dati, kas nāk no avota fails tiks ievietota pēc lauka:
+DataIsInsertedInto=Dati, kas nāk no avota faila tiks ievietota sekojošā laukā:
 DataIDSourceIsInsertedInto=Mātes objekta ID tika atrasts, izmantojot avota faila datus, tiks ievietots šādā laukā:
 DataCodeIDSourceIsInsertedInto=Mātes līnijas atrasts no koda id, tiks ievietota šādā jomā:
 SourceRequired=Datu vērtība ir obligāta
-SourceExample=Piemērs par iespējamo datu vērtības
+SourceExample=Piemērs par iespējamo datu vērtību
 ExampleAnyRefFoundIntoElement=Jebkura atsauce atrasts elementu <b>%s</b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Jebkurš kods (vai id), kas atrasts vārdnīcā <b>%s</b>
 CSVFormatDesc=<b>Komata atdalītas vērtības</b> faila formāts (.csv). <br> Šis ir teksta faila formāts, kurā lauki atdalīti ar [%s]. Ja lauka saturā atrodas atdalītājs, lauku noapaļo līdz apaļam skaitlim [%s]. Lai izvairītos no apaļošanas ir jāizmanto[%s].
diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
index 424ef5518c6..d58806a19e5 100644
--- a/htdocs/langs/lv_LV/interventions.lang
+++ b/htdocs/langs/lv_LV/interventions.lang
@@ -37,8 +37,8 @@ InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
 InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
 InterventionSentByEMail=Intervence %s nosūtīta pa e-pastu
 InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
+InterventionsArea=Intervences zona
+DraftFichinter=Intervences projekts
 LastModifiedInterventions=Jaunākās %s labotās iejaukšanās
 FichinterToProcess=Intervences process
 TypeContact_fichinter_external_CUSTOMER=Šādi-up klientu kontaktu
@@ -51,12 +51,12 @@ InterventionStatistics=Intervences statistika
 NbOfinterventions=Intervences karšu skaits
 NumberOfInterventionsByMonth=Intervences karšu skaits pēc mēneša (validācijas datums)
 AmountOfInteventionNotIncludedByDefault=Ienākuma summa pēc noklusējuma netiek iekļauta peļņā (vairumā gadījumu laika kontrolsaraksts tiek izmantots, lai uzskaitītu pavadīto laiku). Lai tos iekļautu, pievienojiet opciju PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT uz 1 sākuma iestatīšanas pogu.
-InterId=Intervention id
-InterRef=Intervention ref.
+InterId=Intervences id
+InterRef=Intervences atsauce
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
-InterNote=Note intervention
+InterNote=Piezīme intervence
 InterLine=Intervences līnija
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang
index 83adff44eea..513c7c95a56 100644
--- a/htdocs/langs/lv_LV/languages.lang
+++ b/htdocs/langs/lv_LV/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Etiopietis
 Language_ar_AR=Arābu
 Language_ar_EG=Arābu (Ēģipte)
 Language_ar_SA=Arābu
+Language_az_AZ=Azerbaidžāņi
 Language_bn_BD=Bengali
+Language_bn_IN=Bengāļu (Indija)
 Language_bg_BG=Bulgāru
 Language_bs_BA=Bosniešu
 Language_ca_ES=Katalāņu
@@ -20,6 +23,7 @@ Language_en_GB=Angļu (Apvienotā Karaliste)
 Language_en_IN=Angļu (Indija)
 Language_en_NZ=Angļu (Jaunzēlande)
 Language_en_SA=Angļu (Saūda Arābija)
+Language_en_SG=Angļu (Singapūra)
 Language_en_US=Angļu (ASV)
 Language_en_ZA=English (Dienvidāfrika)
 Language_es_ES=Spāņu
@@ -29,6 +33,7 @@ Language_es_CL=Spāņu (Ķīle)
 Language_es_CO=Spāņu (Kolumbija)
 Language_es_DO=Spāņu (Dominikānas Republika)
 Language_es_EC=Spāņu (Ekvadora)
+Language_es_GT=Spāņu (Gvatemala)
 Language_es_HN=Spāņu (Hondurasa)
 Language_es_MX=Spāņu (Meksika)
 Language_es_PA=Spāņu (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spāņu (Paragvaja)
 Language_es_PE=Spāņu (Peru)
 Language_es_PR=Spāņu (Puertoriko)
 Language_es_UY=Spāņu (Urugvaja)
+Language_es_GT=Spāņu (Gvatemala)
 Language_es_VE=Spāņu (Venecuēla)
 Language_et_EE=Igauņu
 Language_eu_ES=Basku
@@ -44,15 +50,22 @@ Language_fi_FI=Pabeigt
 Language_fr_BE=Franču (Beļģija)
 Language_fr_CA=Franču (Kanāda)
 Language_fr_CH=Franču (Šveices)
+Language_fr_CI=Franču valoda (Cost Ivory)
+Language_fr_CM=Franču (Kamerūna)
 Language_fr_FR=Franču
+Language_fr_GA=Franču (Gabona)
 Language_fr_NC=Franču (Jaunkaledonija)
+Language_fr_SN=Franču (Senegāla)
 Language_fy_NL=Frisian
+Language_gl_ES=Galisiešu
 Language_he_IL=Ebreju
+Language_hi_IN=Hindi (Indija)
 Language_hr_HR=Horvātu
 Language_hu_HU=Ungāru
 Language_id_ID=Indonēziešu
 Language_is_IS=Islandiešu
 Language_it_IT=Itāļu
+Language_it_CH=Itāļu (Šveice)
 Language_ja_JP=Japāņu
 Language_ka_GE=Gruzīnu valoda
 Language_km_KH=Khmeru
@@ -64,6 +77,7 @@ Language_lv_LV=Latviešu
 Language_mk_MK=Maķedoniešu
 Language_mn_MN=Mongoļu
 Language_nb_NO=Norvēģu (bukmols)
+Language_ne_NP=Nepālietis
 Language_nl_BE=Holandiešu (Beļģijas)
 Language_nl_NL=Holandiešu
 Language_pl_PL=Poļu
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbeku
 Language_vi_VN=Vjetnamiešu
 Language_zh_CN=Ķīniešu
 Language_zh_TW=Ķīniešu (tradicionālā)
+Language_zh_HK=Ķīniešu (Honkonga)
 Language_bh_MY=Malajiešu valoda
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index f9c3b411857..f8975257031 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -164,7 +164,11 @@ NoContactWithCategoryFound=Nav kontaktpersonas / adreses ar atrastu kategoriju
 NoContactLinkedToThirdpartieWithCategoryFound=Nav kontaktpersonas / adreses ar atrastu kategoriju
 OutGoingEmailSetup=Izejošā e-pasta iestatīšana
 InGoingEmailSetup=Ienākošā e-pasta iestatīšana
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetupForEmailing=Izejošā e-pasta iestatīšana (modulim %s)
 DefaultOutgoingEmailSetup=Noklusējuma izejošā e-pasta iestatīšana
 Information=Informācija
 ContactsWithThirdpartyFilter=Kontakti ar trešās puses filtru
+Unanswered=Neatbildēts
+Answered=Atbildēts
+IsNotAnAnswer=Nav atbildes (sākotnējais e-pasts)
+IsAnAnswer=Vai ir atbilde uz sākotnējo e-pastu
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index f90d0afa56c..93b12e1a730 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -350,13 +350,13 @@ UnitPriceHTCurrency=Vienības cena (izņemot) (valūta)
 UnitPriceTTC=Vienības cena
 PriceU=UP
 PriceUHT=UP (neto)
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=ASV (valūta)
 PriceUTTC=U.P. (inc. tax)
 Amount=Summa
 AmountInvoice=Rēķina summa
 AmountInvoiced=Rēķinā iekļautā summa
-AmountInvoicedHT=Rēķina summa (ar nodokļiem)
-AmountInvoicedTTC=Rēķina summa (bez nodokļiem)
+AmountInvoicedHT=Rēķina summa (bez nodokļiem)
+AmountInvoicedTTC=Rēķina summa (ar nodokļiem)
 AmountPayment=Maksājuma summa
 AmountHTShort=Summa (izņemot)
 AmountTTCShort=Summa (ar PVN)
@@ -464,7 +464,7 @@ NActionsLate=%s vēlu
 ToDo=Jāizdara
 Completed=Pabeigts
 Running=Procesā
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Pieprasījums jau ir ierakstīts
 Filter=Filtrs
 FilterOnInto=Meklēšanas kritēriji '<strong> %s</strong>' laukos %s
 RemoveFilter=Noņemt filtru
@@ -485,6 +485,7 @@ Categories=Atslēgvārdi / sadaļas
 Category=Atslēgvārds / sadaļa
 By=Līdz
 From=No
+FromDate=No
 FromLocation=No
 to=līdz
 To=līdz
@@ -687,6 +688,7 @@ Method=Metode
 Receive=Saņemt
 CompleteOrNoMoreReceptionExpected=Pabeigts vai nekas vairāk nav gaidīts
 ExpectedValue=Paredzamā vērtība
+ExpectedQty=Paredzamais daudzums
 PartialWoman=Daļējs
 TotalWoman=Kopsumma
 NeverReceived=Nekad nav saņemts
@@ -703,6 +705,7 @@ MenuECM=Dokumenti
 MenuAWStats=AWStats
 MenuMembers=Dalībnieki
 MenuAgendaGoogle=Google darba kārtība
+MenuTaxesAndSpecialExpenses=Nodokļi | Īpašie izdevumi
 ThisLimitIsDefinedInSetup=Dolibarr robeža (Menu mājas uzstādīšana-drošība): %s Kb, PHP robeža: %s Kb
 NoFileFound=Neviens dokuments nav saglabāts šajā direktorijā
 CurrentUserLanguage=Pašreizējā valoda
@@ -725,8 +728,8 @@ Page=Lappuse
 Notes=Piezīmes
 AddNewLine=Pievienot jaunu līniju
 AddFile=Pievienot failu
-FreeZone=Nav iepriekš definētu produktu/pakalpojumu
-FreeLineOfType=Brīvā teksta vienums, ierakstiet:
+FreeZone=Brīvā teksta produkts
+FreeLineOfType=Brīvais teksts, ierakstiet:
 CloneMainAttributes=Klonēt objektu ar tā galvenajiem atribūtiem
 ReGeneratePDF=Pārveidojiet PDF failu
 PDFMerge=Apvienot PDF
@@ -833,10 +836,10 @@ ListOfTemplates=Saraksts ar veidnēm
 Gender=Dzimums
 Genderman=Vīrietis
 Genderwoman=Sieviete
-ViewList=List view
+ViewList=Saraksta skats
 ViewGantt=Ganta skats
 ViewKanban=Kanban skats
-Mandatory=Mandatory
+Mandatory=Obligāts
 Hello=Labdien
 GoodBye=Uz redzēšanos
 Sincerely=Ar cieņu
@@ -942,6 +945,39 @@ ShortThursday=Ce
 ShortFriday=P
 ShortSaturday=Se
 ShortSunday=Sv
+one=viens
+two=divi
+three=trīs
+four=četri
+five=pieci
+six=seši
+seven=septiņi
+eight=astoņi
+nine=deviņi
+ten=desmit
+eleven=vienpadsmit
+twelve=divpadsmit
+thirteen=trejpadsmit
+fourteen=četrpadsmit
+fifteen=piecpadsmit
+sixteen=sešpadsmit
+seventeen=septiņpadsmit
+eighteen=astoņpadsmit
+nineteen=deviņpadsmit
+twenty=divdesmit
+thirty=trīsdesmit
+forty=četrdesmit
+fifty=piecdesmit
+sixty=sešdesmit
+seventy=septiņdesmit
+eighty=astoņdesmit
+ninety=deviņdesmit
+hundred=simts
+thousand=tūkstoši
+million=miljons
+billion=miljardu
+trillion=triljons
+quadrillion=kvadriljons
 SelectMailModel=Izvēlieties e-pasta veidni
 SetRef=Set ref
 Select2ResultFoundUseArrows=Daži rezultāti ir atrasti. Izmantojiet bultiņas, lai izvēlētos.
@@ -966,7 +1002,7 @@ SearchIntoCustomerOrders=Pārdošanas pasūtījumi
 SearchIntoSupplierOrders=Pirkuma pasūtījumi
 SearchIntoCustomerProposals=Komerciālie priekšlikumi
 SearchIntoSupplierProposals=Pārdevēja priekšlikumi
-SearchIntoInterventions=Interventions
+SearchIntoInterventions=Iejaukšanās
 SearchIntoContracts=Līgumi
 SearchIntoCustomerShipments=Klientu sūtījumi
 SearchIntoExpenseReports=Izdevumu atskaites
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Pārslēdzieties rediģēšanas režīmā, lai
 NotUsedForThisCustomer=Nav izmantots šim klientam
 AmountMustBePositive=Summai jābūt pozitīvai
 ByStatus=Pēc statusa
+InformationMessage=Informācija
+Used=Used
+ASAP=Tik drīz cik vien iespējams
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 3f7ae46d252..44bee5feaef 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Apturēts dalībnieks
 MemberStatusResiliatedShort=Izbeigta
 MembersStatusToValid=Projektu dalībnieki
 MembersStatusResiliated=Izbeigti dalībnieki
+MemberStatusNoSubscription=Validēts (abonēšana nav nepieciešama)
+MemberStatusNoSubscriptionShort=Apstiprināts
+SubscriptionNotNeeded=Abonēšana nav nepieciešama
 NewCotisation=Jauns ieguldījums
 PaymentSubscription=Jauns ieguldījums, maksājums
 SubscriptionEndDate=Abonēšanas beigu datums
@@ -78,7 +81,7 @@ DeleteType=Dzēst
 VoteAllowed=Balsot atļauts
 Physical=Fizisks
 Moral=Morāls
-MorPhy=Morālā/Fiziskā
+MorPhy=Daba
 Reenable=Atkārtoti ieslēdzams
 ResiliateMember=Izslēgt dalībnieku
 ConfirmResiliateMember=Vai tiešām vēlaties pārtraukt šo dalībnieku?
@@ -124,7 +127,7 @@ CardContent=Saturu jūsu dalības kartes
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Mēs vēlamies jūs informēt, ka jūsu dalības pieprasījums ir saņemts. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Mēs vēlamies jūs informēt, ka jūsu dalība tika apstiprināta ar šādu informāciju: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Mēs vēlamies jūs informēt, ka jūsu jaunais abonements tika reģistrēts. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=Mēs vēlamies Jūs informēt, ka jaunais abonements tika reģistrēts. <br> <br>
 ThisIsContentOfSubscriptionReminderEmail=Vēlamies informēt, ka jūsu abonements beidzas vai ir beidzies (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Mēs ceram, ka jūs to atjaunosit. <br> <br>
 ThisIsContentOfYourCard=Tas ir informācijas kopsavilkums, kas mums ir par jums. Lūdzu, sazinieties ar mums, ja kaut kas nav pareizs. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Paziņojuma e-pasta objekts, kas saņemts viesa automātiskās uzrakstīšanas gadījumā
@@ -136,7 +139,7 @@ DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-pasta veidne, ko izmanto, lai no
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-pasta veidne, kas jāizmanto, lai nosūtītu e-pastu dalībniekam dalībnieka atcelšanas laikā
 DescADHERENT_MAIL_FROM=Sūtītāja e-pasts automātiskajiem e-pastiem
 DescADHERENT_ETIQUETTE_TYPE=Formāts etiķešu lapā
-DescADHERENT_ETIQUETTE_TEXT=Teksts drukāts uz dalībvalstu adrese lapām
+DescADHERENT_ETIQUETTE_TEXT=Teksts drukāts uz dalībnieku adrešu lapām
 DescADHERENT_CARD_TYPE=Formāts kartes lapas
 DescADHERENT_CARD_HEADER_TEXT=Teksts drukāts virsū uz biedru kartes augšpusē
 DescADHERENT_CARD_TEXT=Teksts drukāts uz biedru kartes (izlīdzinājums pa kreisi)
diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang
index 30b84687b15..d55d005dbd0 100644
--- a/htdocs/langs/lv_LV/mrp.lang
+++ b/htdocs/langs/lv_LV/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Ražošanas pasūtījumi
 MO=Ražošanas pasūtījums
+MOs=Manufacturing orders
 MRPDescription=Ražošanas un ražošanas pasūtījumu (MO) pārvaldības modulis.
 MRPArea=MRP apgabals
 MrpSetupPage=MRP moduļa iestatīšana
diff --git a/htdocs/langs/lv_LV/oauth.lang b/htdocs/langs/lv_LV/oauth.lang
index 0a4a336d2df..defd31b4462 100644
--- a/htdocs/langs/lv_LV/oauth.lang
+++ b/htdocs/langs/lv_LV/oauth.lang
@@ -4,7 +4,7 @@ OAuthServices=OAuth pakalpojumi
 ManualTokenGeneration=Manual token generation
 TokenManager=Žetonu pārvaldnieks
 IsTokenGenerated=Vai tiek ģenerēts marķieris?
-NoAccessToken=No access token saved into local database
+NoAccessToken=Lokālajā datu bāzē nav saglabāts piekļuves marķieris
 HasAccessToken=Tika izveidots marķieris un saglabāts lokālajā datu bāzē
 NewTokenStored=Token received and saved
 ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 9c6ca231797..1276c32c910 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -141,11 +141,12 @@ OrderByEMail=E-pasts
 OrderByWWW=Online
 OrderByPhone=Telefons
 # Documents models
-PDFEinsteinDescription=Pilns pasūtījuma modelis 
+PDFEinsteinDescription=Pilns pasūtījuma modelis (Eratosthene veidnes vecā ieviešana)
 PDFEratostheneDescription=Pilns pasūtījuma modelis
 PDFEdisonDescription=Vienkāršs pasūtīt modeli
 PDFProformaDescription=Pilnīga Proforma rēķina veidne
 CreateInvoiceForThisCustomer=Rēķinu pasūtījumi
+CreateInvoiceForThisSupplier=Rēķinu pasūtījumi
 NoOrdersToInvoice=Nav pasūtījumi apmaksājamo
 CloseProcessedOrdersAutomatically=Klasificēt &quot;apstrādā&quot; visus atlasītos pasūtījumus.
 OrderCreation=Pasūtījumu izveide
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index cbebd72fa7b..74075151ce5 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Labdien)__\n\nLūdzu, apskatiet pievie
 PredefinedMailContentSendSupplierInvoice=__(Labdien)__\n\nLūdzu, apskatiet pievienoto rēķinu __REF__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Labdien)__\n\nLūdzu, nosūtiet sūtījumu __REF__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Labdien)__\n\nLūdzu, skatiet interviju __REF__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Labdien)__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Labdien,)__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Labdien,)__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Jūs varat noklikšķināt uz zemāk esošās saites, lai veiktu maksājumu, ja tas vēl nav izdarīts.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Labdien)__\n\n\n__ (Ar cieņu) __\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr ir kompakts ERP / CRM, kas atbalsta vairākus biznesa moduļus. Demonstrācija, kas demonstrē visus moduļus, nav jēga, jo šis scenārijs nekad nenotiek (pieejami vairāki simti). Tātad, ir pieejami vairāki demo profili.
 ChooseYourDemoProfil=Izvēlies demo profilu, kas vislabāk atbilst jūsu vajadzībām ...
 ChooseYourDemoProfilMore=... vai izveidojiet savu profilu <br> (manuālā moduļa izvēle)
@@ -280,7 +278,9 @@ LinesToImport=Importējamās līnijas
 
 MemoryUsage=Atmiņas izmantošana
 RequestDuration=Pieprasījuma ilgums
+ProductsPerPopularity=Produkti / pakalpojumi pēc popularitātes
 PopuProp=Produkti / pakalpojumi pēc popularitātes priekšlikumos
 PopuCom=Produkti / pakalpojumi pēc popularitātes pasūtījumos
 ProductStatistics=Produktu/pakalpojumu statistika
 NbOfQtyInOrders=Daudzums pasūtījumos
+SelectTheTypeOfObjectToAnalyze=Atlasiet analizējamā objekta veidu ...
diff --git a/htdocs/langs/lv_LV/printing.lang b/htdocs/langs/lv_LV/printing.lang
index 55628ecdd0f..ca4b5a4eda7 100644
--- a/htdocs/langs/lv_LV/printing.lang
+++ b/htdocs/langs/lv_LV/printing.lang
@@ -16,7 +16,7 @@ PleaseConfigureDriverfromList=Please configure the selected driver from list.
 SetupDriver=Draivera iestatījumi
 TargetedPrinter=Noklusējuma printeris
 UserConf=Iestatījumi katram lietotājam
-PRINTGCP_INFO=Google OAuth API setup
+PRINTGCP_INFO=Google OAuth API iestatīšana
 PRINTGCP_AUTHLINK=Autentifikācija
 PRINTGCP_TOKEN_ACCESS=Google mākoņdrukas OAuth marķieris
 PrintGCPDesc=Šis draiveris ļauj sūtīt dokumentus tieši printerim, izmantojot Google mākoņdruku.
@@ -46,9 +46,9 @@ IPP_Device=Ierīce
 IPP_Media=Printera multivide
 IPP_Supported=Mediju veids
 DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
-GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthNotConfigured=Google OAuth nav iestatīts. Iespējot moduli OAuth un iestatiet Google ID / noslēpumu.
 GoogleAuthConfigured=Google OAuth akreditācijas dati tika atrasti moduļa OAuth iestatījumos.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
 PrintingDriverDescprintipp=Konfigurācijas mainīgie drukāšanas vadītāja krūzes.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintgcp=Google mākoņdrukas printeru saraksts.
 PrintTestDescprintipp=CUPS printeru saraksts.
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index d673531b84e..9292cb3f9c2 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -78,7 +78,7 @@ CostPriceUsage=Šo vērtību var izmantot, lai aprēķinātu peļņu.
 SoldAmount=Pārdošanas apjoms
 PurchasedAmount=Iegādātā summa
 NewPrice=Jaunā cena
-MinPrice=Min. pārdot cenu
+MinPrice=Min. pārdošanas cena
 EditSellingPriceLabel=Labot pārdošanas cenas nosaukumu
 CantBeLessThanMinPrice=Pārdošanas cena nevar būt zemāka par minimālo pieļaujamo šī produkta (%s bez PVN). Šis ziņojums var būt arī parādās, ja esat ievadījis pārāk lielu atlaidi.
 ContractStatusClosed=Slēgts
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Uzstādīt svītrkoda veidu
 BarcodeValue=Svītrkoda vērtība
 NoteNotVisibleOnBill=Piezīme (nav redzama rēķinos, priekšlikumos ...)
 ServiceLimitedDuration=Ja produkts ir pakalpojums ir ierobežots darbības laiks:
+FillWithLastServiceDates=Aizpildiet pēdējos pakalpojumu līnijas datumus
 MultiPricesAbility=Vairāki cenu segmenti katram produktam / pakalpojumam (katrs klients atrodas vienā cenu segmentā)
 MultiPricesNumPrices=Cenu skaits
 DefaultPriceType=Cenu bāze par saistību neizpildi (ar nodokli bez nodokļa), pievienojot jaunas pārdošanas cenas
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Pārdevēja cenas (produktiem vai pakalpojum
 CustomCode=Muita / Prece / HS kods
 CountryOrigin=Izcelsmes valsts
 Nature=Produkta veids (materiāls / gatavs)
+NatureOfProductShort=Produkta veids
+NatureOfProductDesc=Izejviela vai gatavais produkts
 ShortLabel=Īsais nosaukums
 Unit=Vienība
 p=u.
@@ -285,14 +288,14 @@ PriceMode=Cenas veids
 PriceNumeric=Numurs
 DefaultPrice=Noklusējuma cena
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Bērnu produkti
+ComposedProduct=Apakš produkti
 MinSupplierPrice=Minimālā iepirkuma cena
 MinCustomerPrice=Minimālā pārdošanas cena
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=Jūs varat noteikt matemātiskās formulas, lai aprēķinātu Klienta vai pārdevēja cenas. Šādas formulas var izmantot visus matemātiskos operatorus, dažas konstantes un mainīgos. Šeit varat definēt mainīgos, kurus vēlaties izmantot. Ja mainīgajam nepieciešams automātisks atjauninājums, varat definēt ārējo URL, lai Dolibarr varētu automātiski atjaunināt vērtību.
 AddVariable=Pievienot mainīgo
 AddUpdater=Pievienot Atjaunotāju
-GlobalVariables=Global variables
+GlobalVariables=Globālie mainīgie
 VariableToUpdate=Mainīgais kas jāatjauno
 GlobalVariableUpdaters=Mainīgo lielumu ārējie atjauninājumi
 GlobalVariableUpdaterType0=JSON dati
@@ -359,6 +362,9 @@ SelectCombination=Izvēlieties kombināciju
 ProductCombinationGenerator=Variantu ģenerators
 Features=Iespējas
 PriceImpact=Cenu ietekme
+ImpactOnPriceLevel=Ietekme uz cenu līmeni %s
+ApplyToAllPriceImpactLevel= Piesakies visiem līmeņiem
+ApplyToAllPriceImpactLevelHelp=Noklikšķinot šeit, jūs iestatāt vienādu cenu ietekmi uz visiem līmeņiem
 WeightImpact=Svara ietekme
 NewProductAttribute=Jauns atribūts
 NewProductAttributeValue=Jauna atribūta vērtība
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index cd16f005da0..28e163375b4 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Ieguldītājs
 TypeContact_project_task_external_TASKCONTRIBUTOR=Ieguldītājs
 SelectElement=Izvēlieties elementu
 AddElement=Saite uz elementu
+LinkToElementShort=Saite uz
 # Documents models
 DocumentModelBeluga=Saistīto objektu kopsavilkuma projekta dokumenta veidne
 DocumentModelBaleine=Projekta dokumenta veidne uzdevumiem
@@ -210,11 +211,11 @@ ProjectNbProjectByMonth=Izveidoto projektu skaits pēc mēneša
 ProjectNbTaskByMonth=Izveidoto darbu skaits pa mēnešiem
 ProjectOppAmountOfProjectsByMonth=Izložu skaits pēc mēnešiem
 ProjectWeightedOppAmountOfProjectsByMonth=Vidējā svērto klientu skaits pēc mēneša
-ProjectOpenedProjectByOppStatus=Atklāts projekts / vadošais statuss
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistika par projektu / vadošajiem uzdevumiem
+ProjectOpenedProjectByOppStatus=Atvērts projekts | svina statuss
+ProjectsStatistics=Statistika par projektiem vai potenciālajiem klientiem
+TasksStatistics=Statistika par projektu vai potenciālo klientu uzdevumiem
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
+IdTaskTime=Id uzdevuma laiks
 YouCanCompleteRef=Ja vēlaties aizpildīt ref ar kādu sufiksu, ieteicams pievienot a-rakstzīmi, lai to atdalītu, tāpēc automātiskā numerācija joprojām darbosies pareizi nākamajiem projektiem. Piemēram, %s-MYSUFFIX
 OpenedProjectsByThirdparties=Atvērt trešo pušu projektus
 OnlyOpportunitiesShort=Tikai ved
diff --git a/htdocs/langs/lv_LV/recruitment.lang b/htdocs/langs/lv_LV/recruitment.lang
new file mode 100644
index 00000000000..5529a282136
--- /dev/null
+++ b/htdocs/langs/lv_LV/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Darbā pieņemšana
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Pārvaldiet un sekojiet personāla atlases kampaņām jaunām darba vietām
+
+#
+# Admin page
+#
+RecruitmentSetup = Personāla atlases iestatīšana
+Settings = Iestatījumi
+RecruitmentSetupPage = Šeit ievadiet personāla atlases moduļa galveno opciju iestatīšanu
+RecruitmentArea=Darbā pieņemšanas sadaļa
+PublicInterfaceRecruitmentDesc=Darba publiskās lapas ir publiski vietrāži URL, lai parādītu atvērtās darba vietas un atbildētu uz tām. Katram atklātajam darbam ir viena atšķirīga saite, kas atrodama katrā darba ierakstā.
+EnablePublicRecruitmentPages=Iespējojiet atvērto darbu publiskās lapas
+
+#
+# About page
+#
+About = Par
+RecruitmentAbout = Par darbā pieņemšanu
+RecruitmentAboutPage = Darbā pieņemšana par lapu
+NbOfEmployeesExpected=Paredzamais darbinieku skaits
+JobLabel=Amats
+WorkPlace=Darba vieta
+DateExpected=Paredzamais datums
+FutureManager=Topošais vadītājs
+ResponsibleOfRecruitement=Atbildīgais par darbā pieņemšanu
+IfJobIsLocatedAtAPartner=Ja darbs atrodas partnera vietā
+PositionToBeFilled=Aizpildāms darba piedāvājums
+PositionsToBeFilled=Darba piedāvājumi jāaizpilda
+ListOfPositionsToBeFilled=Aizpildāmo darba piedāvājumu saraksts
+NewPositionToBeFilled=Jāaizpilda jauni darba piedāvājumi
+
+JobOfferToBeFilled=Aizpildāms darba piedāvājums
+ThisIsInformationOnJobPosition=Informācija par aizpildāmo darba vietu
+ContactForRecruitment=Kontaktpersona personāla atlasei
+EmailRecruiter=E-pasta vervētājs
+ToUseAGenericEmail=Lai izmantotu vispārīgu e-pastu. Ja tas nav noteikts, tiks izmantots e-pasts, kas atbildīgs par personāla atlasi
+NewCandidature=Jauna kandidatūra
+ListOfCandidatures=Kandidātu saraksts
+RequestedRemuneration=Pieprasītā atlīdzība
+ProposedRemuneration=Piedāvātā atlīdzība
+ContractProposed=Piedāvātais līgums
+ContractSigned=Parakstīts līgums
+RecruitmentCandidature=Kandidāts
+JobPositions=Darba pozīcijas
+RecruitmentCandidatures=Kandidāti
+InterviewToDo=Intervija, kas jādara
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 2d8aec93100..ed7cf7b7f30 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Atcelt sūtīšanu
 DeleteSending=Dzēst nosūtot
 Stock=Krājums
 Stocks=Krājumi
-MissingStocks=Missing stocks
+MissingStocks=Trūkst krājumu
 StockAtDate=Krājumi datumā
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+StockAtDateInPast=Datums pagātnē
+StockAtDateInFuture=Datums nākotnē
 StocksByLotSerial=Krājumi pēc partijas/sērijas
 LotSerial=Daudz / sērijas nr
 LotSerialList=Partijas saraksts / sērijas nr
@@ -34,7 +34,7 @@ StockMovementForId=Pārvietošanas ID %d
 ListMouvementStockProject=Ar projektu saistīto krājumu kustību saraksts
 StocksArea=Noliktavas platība
 AllWarehouses=Visas noliktavas
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock=Iekļaujiet arī nenosakāmus vēlamos krājumus
 IncludeAlsoDraftOrders=Iekļaujiet arī pasūtījumu projektus
 Location=Vieta
 LocationSummary=Īsais atrašanās vietas nosaukums
@@ -95,14 +95,16 @@ RealStock=Rālie krājumi
 RealStockDesc=Fiziskā / reālā krājumi ir krājumi, kas pašlaik atrodas noliktavās.
 RealStockWillAutomaticallyWhen=Reālais krājums tiks mainīts saskaņā ar šo noteikumu (kā noteikts Stock modulī):
 VirtualStock=Virtuālie krājumi
-VirtualStockDesc=Virtuālais krājums ir aprēķinātais krājums, kas pieejams, kad visas atvērtās / nepabeigtās darbības (kas ietekmē krājumus) ir slēgtas (saņemtie pasūtījumi, nosūtītie pasūtījumi utt.)
+VirtualStockAtDate=Virtuālais krājums datumā
+VirtualStockAtDateDesc=Virtuālais krājums, kad būs pabeigti visi neapstiprinātie pasūtījumi, kurus plānots veikt pirms datuma
+VirtualStockDesc=Virtuālais krājums ir aprēķinātais krājums, kas pieejams, kad visas atvērtās / neapstiprinātās darbības (kas ietekmē krājumus) ir aizvērtas (saņemti pirkumu pasūtījumi, nosūtīti pārdošanas pasūtījumi, saražoti ražošanas pasūtījumi utt.)
 IdWarehouse=Id noliktava
 DescWareHouse=Apraksts noliktava
 LieuWareHouse=Lokālā noliktava
 WarehousesAndProducts=Noliktavas un produkti
 WarehousesAndProductsBatchDetail=Noliktavas un produkti (ar informāciju par partiju/sēriju)
-AverageUnitPricePMPShort=Vidējais svērtais ieejas cena
-AverageUnitPricePMP=Vidējais svērtais ieejas cena
+AverageUnitPricePMPShort=Vidējā svērtā cena
+AverageUnitPricePMPDesc=Vidējā vienības cena, kas mums bija jāmaksā piegādātājiem, lai produkts nonāktu mūsu noliktavā.
 SellPriceMin=Pārdošanas Vienības cena
 EstimatedStockValueSellShort=Pārdošanas cena
 EstimatedStockValueSell=Pārdošanas cena
@@ -130,7 +132,7 @@ CurentlyUsingPhysicalStock=Reāla noliktava
 RuleForStockReplenishment=Noteikums par krājumu papildināšanu
 SelectProductWithNotNullQty=Atlasiet vismaz vienu produktu, kura daudzums nav null un pārdevējs
 AlertOnly= Brīdinājumi tikai
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Iekļaujiet arī negatīvos krājumus izstrādājumiem, kuriem nav noteikts vēlamais daudzums, lai tos atjaunotu 0
 WarehouseForStockDecrease=Noliktava <b>%s</b> tiks izmantota krājumu samazināšanai
 WarehouseForStockIncrease=Noliktava <b>%s</b> tiks izmantota krājumu palielināšanai
 ForThisWarehouse=Šai noliktavai
@@ -141,7 +143,7 @@ Replenishments=Papildinājumus
 NbOfProductBeforePeriod=Produktu daudzums %s noliktavā pirms izvēlētā perioda (< %s)
 NbOfProductAfterPeriod=Produktu daudzums %s krājumā pēc izvēlētā perioda (>%s)
 MassMovement=Masveida pārvietošana
-SelectProductInAndOutWareHouse=Izvēlieties produktu, daudzumu, avota noliktavu un mērķa noliktavu, tad noklikšķiniet uz &quot;%s&quot;. Kad tas ir izdarīts visām nepieciešamajām kustībām, noklikšķiniet uz &quot;%s&quot;.
+SelectProductInAndOutWareHouse=Atlasiet avota noliktavu un mērķa noliktavu, produktu un daudzumu un pēc tam noklikšķiniet uz "%s". Kad tas ir izdarīts visām nepieciešamajām kustībām, noklikšķiniet uz "%s".
 RecordMovement=Ierakstīt pārvietošanu
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Krājumu pārvietošana saglabāta
@@ -234,4 +236,7 @@ ForceTo=Piespiest līdz
 AlwaysShowFullArbo=Parādiet pilnu noliktavas koku uznirstošajās noliktavu saitēs (Brīdinājums: tas var dramatiski samazināt veiktspēju)
 StockAtDatePastDesc=Šeit varat apskatīt krājumus (reālos krājumus) noteiktā datumā pagātnē
 StockAtDateFutureDesc=Šeit varat apskatīt krājumus (virtuālos krājumus) noteiktā datumā nākotnē
-CurrentStock=Current stock
+CurrentStock=Pašreizējais krājums
+InventoryRealQtyHelp=Iestatiet vērtību 0, lai atiestatītu daudzumu <br>. Saglabājiet lauku tukšu vai noņemiet līniju, lai paliktu nemainīgs
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
index 25522229488..a092448a3fc 100644
--- a/htdocs/langs/lv_LV/supplier_proposal.lang
+++ b/htdocs/langs/lv_LV/supplier_proposal.lang
@@ -43,9 +43,9 @@ ConfirmDeleteAsk=Vai tiešām vēlaties dzēst šo cenu pieprasījumu <b> %s</b>
 ActionsOnSupplierProposal=Pasākumi pēc cenas pieprasījuma
 DocModelAuroreDescription=Pilns pieprasījuma modelis (logotips ...)
 CommercialAsk=Cenas pieprasījums
-DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
+DefaultModelSupplierProposalCreate=Noklusējuma modeļa izveidošana
+DefaultModelSupplierProposalToBill=Noklusējuma veidne, aizverot cenu pieprasījumu (pieņemts)
+DefaultModelSupplierProposalClosed=Noklusējuma veidne, aizverot cenu pieprasījumu (noraidīts)
 ListOfSupplierProposals=Pārdevēja piedāvājuma pieprasījumu saraksts
 ListSupplierProposalsAssociatedProject=Ar projektu saistīto projektu iesniedzēju saraksts
 SupplierProposalsToClose=Pārdevēja priekšlikumi slēgt
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 1045e43c00d..50c331400e1 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Zemas kvalitātes
 ReputationForThisProduct=Reputācija
 BuyerName=Pircēja vārds
 AllProductServicePrices=Visas produktu / pakalpojumu cenas
-AllProductReferencesOfSupplier=Visas pārdevēja produktu / pakalpojumu atsauces
+AllProductReferencesOfSupplier=Visas pārdevēja atsauces
 BuyingPriceNumShort=Pārdevēja cenas
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index 8bb9b71b746..b1947dfcce0 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Dzēsts
 
 # Dict
 Type=Veids
-Category=Analītiskais kods
 Severity=Smagums
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automātiski piešķirt lietotāju, kas izveidojis biļe
 TicketsAutoAssignTicketHelp=Veidojot biļeti, lietotājs var automātiski piešķirt biļeti.
 TicketNumberingModules=Čeku numerācijas modulis
 TicketNotifyTiersAtCreation=Paziņot trešajai pusei radīšanas laikā
-TicketGroup=Grupa
 TicketsDisableCustomerEmail=Vienmēr atspējojiet e-pasta ziņojumus, ja biļete tiek veidota no publiskās saskarnes
 TicketsPublicNotificationNewMessage=Sūtiet e-pastu (s), kad tiek pievienots jauns ziņojums
 TicketsPublicNotificationNewMessageHelp=Sūtiet e-pastu (s), kad no publiskās saskarnes tiek pievienots jauns ziņojums (piešķirtajam lietotājam vai paziņojumu e-pastu uz (atjaunināt) un / vai paziņojumu e-pastu uz)
@@ -162,7 +160,7 @@ CreatedBy=Izveidojis
 NewTicket=Jauns notikums
 SubjectAnswerToTicket=Pieteikuma atbilde
 TicketTypeRequest=Pieprasījuma veids
-TicketCategory=Analītiskais kods
+TicketCategory=Grupa
 SeeTicket=Apskatīt pieteikumu
 TicketMarkedAsRead=Pieteikums ir atzīmēts kā lasīts
 TicketReadOn=Izlasīts
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index c94221b7171..29e4d5d55ec 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Atspējots uzturēšanas režīmā
 UserAccountancyCode=Lietotāja grāmatvedības kods
 UserLogoff=Lietotājs atslēdzies
 UserLogged=Lietotājs pieteicies
+DateOfEmployment=Nodarbināšanas datums
 DateEmployment=Nodarbinātības sākuma datums
 DateEmploymentEnd=Nodarbinātības beigu datums
 CantDisableYourself=Jūs nevarat atspējot savu lietotāja ierakstu
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Piespiedu atvaļinājuma pieprasījuma validētājs
 ValidatorIsSupervisorByDefault=Pēc noklusējuma validētājs ir lietotāja uzraugs. Lai saglabātu šo uzvedību, atstājiet tukšu.
 UserPersonalEmail=Personīgais e-pasts
 UserPersonalMobile=Personīgais mobilais tālrunis
+WarningNotLangOfInterface=Brīdinājums: šī ir galvenā valoda, kurā runā lietotājs, nevis tā saskarnes valoda, kuru viņš izvēlējās redzēt. Lai mainītu interfeisa valodu, kuru redz šis lietotājs, dodieties uz cilni %s
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index 57c1e042f77..839d6a901d8 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -22,7 +22,7 @@ HtmlHeaderPage=HTML virsraksts (tikai šai lapai)
 PageNameAliasHelp=Lapas nosaukums vai pseidonīms. <br> Šis aizstājvārds tiek izmantots arī, lai izveidotu SEO vietrādi, ja vietne tiek izmantota no Web servera virtuālās saimniekdatora (piemēram, Apacke, Nginx, ...). Izmantojiet pogu "<strong> %s </strong>, lai rediģētu šo aizstājvārdu.
 EditTheWebSiteForACommonHeader=Piezīme: ja vēlaties norādīt personalizētu galveni visām lapām, rediģējiet virsrakstu vietnes līmenī, nevis lapā / konteinerā.
 MediaFiles=Mediju bibliotēka
-EditCss=Rediģēt vietnes rekvizīt
+EditCss=Rediģēt vietnes rekvizītus
 EditMenu=Labot izvēlni
 EditMedias=Rediģēt medijus
 EditPageMeta=Rediģējiet lapas / konteinera īpašības
@@ -32,7 +32,7 @@ Webpage=Web lapa / konteiners
 AddPage=Pievienot lapu / konteineru
 HomePage=Mājas lapa
 PageContainer=Lapa / konteiners
-PreviewOfSiteNotYetAvailable=Jūsu vietnes <strong> %s </ strong> priekšskatījums vēl nav pieejams. Vispirms jums ir jāievieto <strong> Importēt pilnu vietnes veidni </ strong> vai vienkārši <strong> Pievienot lapu / konteineru </ strong> ".
+PreviewOfSiteNotYetAvailable=Jūsu vietnes <strong> %s </strong>priekšskatījums vēl nav pieejams. Vispirms jums ir <strong> Jāimportē pilnu vietnes veidni</strong> vai vienkārši <strong>Pievienot lapu/konteineru</strong>".
 RequestedPageHasNoContentYet=Pieprasītā lapa ar id %s vēl nav ievietota, vai kešatmiņas fails .tpl.php tika noņemts. Rediģējiet lapas saturu, lai to atrisinātu.
 SiteDeleted=Tīmekļa vietne '%s' dzēsta
 PageContent=Lapa / Konteiners
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 5d2e3f69f9d..b041cca3eff 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -10,8 +10,8 @@ PaymentByBankTransferReceipts=Kredīta pārveduma rīkojumi
 PaymentByBankTransferLines=Kredīta pārveduma pasūtījuma līnijas
 WithdrawalsReceipts=Tiešā debeta rīkojumi
 WithdrawalReceipt=Tiešā debeta rīkojums
-BankTransferReceipts=Credit transfer order
-BankTransferReceipt=Credit transfer order
+BankTransferReceipts=Kredīta pārveduma rīkojumi
+BankTransferReceipt=Kredīta pārveduma rīkojums
 LatestBankTransferReceipts=Jaunākie kredīta pārveduma rīkojumi %s
 LastWithdrawalReceipts=Jaunākie %s tiešā debeta faili
 WithdrawalsLine=Tiešā debeta pasūtījuma līnija
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Statuss debets/kredīts
 StatusWaiting=Gaidīšana
 StatusTrans=Sūtīt
+StatusDebited=Debīts
 StatusCredited=Kredīts
+StatusPaid=Apmaksāts
 StatusRefused=Atteikts
 StatusMotif0=Nenoteikts
 StatusMotif1=Nepietiekami līdzekļi
@@ -77,13 +79,13 @@ StatusMotif8=Cits iemesls
 CreateForSepaFRST=Izveidot tiešā debeta failu (SEPA FRST)
 CreateForSepaRCUR=Izveidojiet tiešā debeta failu (SEPA RCUR)
 CreateAll=Izveidot tiešā debeta failu (visu)
-CreateFileForPaymentByBankTransfer=Izveidot kredīta pārvedumu (visu)
+CreateFileForPaymentByBankTransfer=Izveidojiet failu kredīta pārskaitīšanai
 CreateSepaFileForPaymentByBankTransfer=Izveidot kredīta pārveduma failu (SEPA)
 CreateGuichet=Tikai birojs
 CreateBanque=Tikai banka
 OrderWaiting=Gaida ārstēšanai
-NotifyTransmision=Izstāšanās Transmisija
-NotifyCredit=Izstāšanās Kredīts
+NotifyTransmision=Reģistrācijas datnes pasūtījuma pārsūtīšana
+NotifyCredit=Ieraksta pasūtījuma kredīts
 NumeroNationalEmetter=Valsts raidītājs skaits
 WithBankUsingRIB=Attiecībā uz banku kontiem, izmantojot RIB
 WithBankUsingBANBIC=Attiecībā uz banku kontiem, izmantojot IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Kredīts
 WithdrawalFileNotCapable=Nevar ģenerēt izņemšanas kvīts failu jūsu valstij %s (jūsu valsts netiek atbalstīta)
 ShowWithdraw=Rādīt tiešā debeta rīkojumu
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tomēr, ja rēķinam ir vismaz viens tiešā debeta maksājuma rīkojums, kas vēl nav apstrādāts, tas netiks iestatīts kā maksāts, lai varētu veikt iepriekšēju izņemšanas pārvaldību.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Izstāšanās fails
+DoStandingOrdersBeforePayments=Šī cilne ļauj pieprasīt tiešā debeta maksājuma rīkojumu. Kad tas ir izdarīts, dodieties uz izvēlni Banka-> Maksājums ar tiešo debetu, lai ģenerētu un pārvaldītu tiešā debeta rīkojumu. Kad tiešā debeta maksājums tiek aizvērts, rēķinu apmaksa tiks automātiski reģistrēta, un rēķini tiks aizvērti, ja atlikušais maksājuma apjoms nebūs spēkā.
+DoCreditTransferBeforePayments=Šī cilne ļauj pieprasīt kredīta pārveduma rīkojumu. Kad tas ir izdarīts, dodieties uz izvēlni Banka-> Maksājums ar pārskaitījumu, lai ģenerētu un pārvaldītu kredīta pārveduma rīkojumu. Kad kredīta pārveduma pasūtījums tiek aizvērts, rēķinu apmaksa tiks automātiski reģistrēta, un rēķini tiks aizvērti, ja atlikušais maksājuma apjoms nebūs spēkā.
+WithdrawalFile=Debeta pasūtījuma fails
+CreditTransferFile=Kredīta pārveduma fails
 SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts"
 ThisWillAlsoAddPaymentOnInvoice=Tas arī reģistrēs maksājumus rēķinos un klasificēs tos kā “Apmaksāts”, ja atlikušais maksājums būs spēkā neesošs
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Maksājuma veids
 ModeRECUR=Atkārtots maksājums
 ModeFRST=Vienreizējs maksājums
 PleaseCheckOne=Lūdzu izvēlaties tikai vienu
+CreditTransferOrderCreated=Izveidots kredīta pārveduma rīkojums %s
 DirectDebitOrderCreated=Tiešais debeta uzdevums %s izveidots
 AmountRequested=Pieprasītais daudzums
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Daudzums: %s<br>Metode: %s<br>Datums: %s
 InfoRejectSubject=Tiešais debeta maksājuma uzdevums ir noraidīts
 InfoRejectMessage=Labdien, <br> <br> banka noraidījusi rēķina %s tiešā debeta maksājuma uzdevumu saistībā ar uzņēmumu %s ar summu %s. <br> <br> - <br> %s
 ModeWarning=Iespēja reālā režīmā nav noteikts, mēs pārtraucam pēc šīs simulācijas
+ErrorCompanyHasDuplicateDefaultBAN=Uzņēmumam ar ID %s ir vairāk nekā viens noklusējuma bankas konts. Nevar uzzināt, kuru izmantot.
diff --git a/htdocs/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang
index 2cac3b3f650..2e7aff69db9 100644
--- a/htdocs/langs/lv_LV/workflow.lang
+++ b/htdocs/langs/lv_LV/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Darbplūsmu moduļa iestatīšana
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
+WorkflowDesc=Šis modulis nodrošina dažas automātiskas darbības. Pēc noklusējuma darbplūsma ir atvērta (jūs varat darīt lietas vēlamajā secībā), taču šeit jūs varat aktivizēt dažas automātiskas darbības.
+ThereIsNoWorkflowToModify=Nav aktivizētu moduļu darbplūsmas izmaiņām.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automātiski izveidojiet pārdošanas pasūtījumu pēc tam, kad ir parakstīts komerciāls priekšlikums (jaunajam pasūtījumam būs tāds pats apjoms kā piedāvājumam)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automātiski izveidojiet klienta rēķinu pēc komerciāla piedāvājuma parakstīšanas (jaunajā rēķinā būs tāda pati summa kā piedāvājumā)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automātiski izveidot klienta rēķinu pēc līguma apstiprināšanas
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automātiski izveidojiet klienta rēķinu pēc pārdošanas pasūtījuma slēgšanas (jaunajam rēķinam būs tāda pati summa kā pasūtījumam)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klasificējiet saistītā avota priekšlikumu kā rēķinu, kad pārdošanas pasūtījums ir iestatīts uz rēķinu (un ja pasūtījuma summa ir vienāda ar parakstītā saistītā priekšlikuma kopējo summu)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klasificēt saistīto avota priekšlikumu kā rēķinu, kad klienta rēķins ir apstiprināts (un ja rēķina summa ir tāda pati kā parakstītā saistītā piedāvājuma kopējā summa)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasificējiet saistītā avota pārdošanas pasūtījumu kā rēķinu, kad klients rēķins ir apstiprināts (un ja rēķina summa ir vienāda ar kopējo piesaistītā pasūtījuma summu)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasificējiet saistītā avota pārdošanas pasūtījumu kā rēķinu, kad klienta rēķins ir apmaksāts (un ja rēķina summa ir vienāda ar saistītā pasūtījuma kopējo summu)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klasificējiet saistīto avota pārdošanas pasūtījumu, kas nosūtīts, kad sūtījums ir apstiprināts (un ja visu sūtījumu sūtītais daudzums ir tāds pats kā atjaunināšanas rīkojumā)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Saistīto avotu pārdevēju priekšlikuma klasifikācija tiek apmaksāta, kad tiek apstiprināts piegādātāja rēķins (un ja rēķina summa ir tāda pati kā saistītā piedāvājuma kopējā summa)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klasificēt saistīto avotu pirkuma pasūtījumu, par kuru jāmaksā, kad tiek apstiprināts piegādātāja rēķins (un ja rēķina summa ir tāda pati kā saistītā pasūtījuma summa)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automātiska veidošana
 AutomaticClassification=Automātiskā klasifikācija
diff --git a/htdocs/langs/lv_LV/zapier.lang b/htdocs/langs/lv_LV/zapier.lang
index 918fcac049e..01aa75944cb 100644
--- a/htdocs/langs/lv_LV/zapier.lang
+++ b/htdocs/langs/lv_LV/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Par zapier Dolibarr moduli
 # Admin page
 #
 ZapierForDolibarrSetup = Zapier iestatīšana Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 85a60bc34c1..2d3a4148592 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index fcccf8203a1..5f849265afa 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Фактури на добавувачи
 MailToSendContract=Договори
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Корисници
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index d496042c639..30c0db6cc9f 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Број на настани
 ListOfActions=Листа на настани
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index 9ca344b850b..98e75053287 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Добавувачи: најнови %s измени
 BoxTitleLastModifiedCustomers=Клиенти: најнови %s измени
 BoxTitleLastCustomersOrProspects=Најнови %s клиенти или потенцијални клиенти
-BoxTitleLastCustomerBills=Најнови %s фактури за клиенти
-BoxTitleLastSupplierBills=Најнови %s фактури за добавувачи
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Потенцијални клиенти: најнови %s измени
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Нарачки на добавувачи: 
 BoxTitleLastModifiedCustomerBills=Фактури на клиенти: најнови %s измени
 BoxTitleLastModifiedCustomerOrders=Нарачки за продажба: најнови %s изменети
 BoxTitleLastModifiedPropals=Најнови %sизменети понуди
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Фактури на клиенти
 ForCustomersOrders=Нарачки на клиенти
 ForProposals=Понуди
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Сметководство
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index 6cd046c5607..8f4f058bb87 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/mk_MK/contracts.lang b/htdocs/langs/mk_MK/contracts.lang
index 0ef3bd087f5..d9c15d52a07 100644
--- a/htdocs/langs/mk_MK/contracts.lang
+++ b/htdocs/langs/mk_MK/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Активни услуги
 MenuExpiredServices=Истечени услуги
 MenuClosedServices=Склучени услуги
 NewContract=Нов Договор
-NewContractSubscription=Нов Договор / Претплата
+NewContractSubscription=New contract or subscription
 AddContract=Креирај Договор
 DeleteAContract=Избриши Договор
 ActivateAllOnContract=Активирај ги сите услуги
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/mk_MK/languages.lang b/htdocs/langs/mk_MK/languages.lang
index 28aadaa3c41..3e571f0e756 100644
--- a/htdocs/langs/mk_MK/languages.lang
+++ b/htdocs/langs/mk_MK/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Арапски
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Арапски
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Бугарската
 Language_bs_BA=Босанската
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=Англиски (Велика Британија)
 Language_en_IN=Англиски (Индија)
 Language_en_NZ=Англиски (Нов Зеланд)
 Language_en_SA=Англиски (Саудиска Арабија)
+Language_en_SG=English (Singapore)
 Language_en_US=Англиски јазик (САД)
 Language_en_ZA=Англиски (Јужна Африка)
 Language_es_ES=Шпански
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Шпански (Хондурас)
 Language_es_MX=Шпански (Мексико)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Шпански (Парагвај)
 Language_es_PE=Шпански (Перу)
 Language_es_PR=Шпански (Порто Рико)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Естонскиот
 Language_eu_ES=Баскиската
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Француски (Белгија)
 Language_fr_CA=Француски (Канада)
 Language_fr_CH=Француски (Швајцарија)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Француски
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Француски (Нова Каледонија)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Хебрејски
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Хрватската
 Language_hu_HU=Унгарската
 Language_id_ID=Indonesian
 Language_is_IS=Исландски
 Language_it_IT=Италијански
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Јапонски
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Летонски
 Language_mk_MK=Македонски
 Language_mn_MN=Mongolian
 Language_nb_NO=Норвешки (бокмал)
+Language_ne_NP=Nepali
 Language_nl_BE=Холанѓаните (Белгија)
 Language_nl_NL=Dutch
 Language_pl_PL=Полскиот
@@ -86,4 +100,5 @@ Language_uz_UZ=Узбекистански
 Language_vi_VN=Виетнамски
 Language_zh_CN=Кинески
 Language_zh_TW=Кинески (традиционален)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 6708fce5b2c..4d668952b76 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 504172c8a82..5d4bfbd830e 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Корисници
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/mk_MK/members.lang b/htdocs/langs/mk_MK/members.lang
index 87cdf8cbc8b..467272c0dca 100644
--- a/htdocs/langs/mk_MK/members.lang
+++ b/htdocs/langs/mk_MK/members.lang
@@ -81,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/mk_MK/mrp.lang b/htdocs/langs/mk_MK/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/mk_MK/mrp.lang
+++ b/htdocs/langs/mk_MK/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 746acff477a..9dd0aa9f659 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/mk_MK/recruitment.lang b/htdocs/langs/mk_MK/recruitment.lang
new file mode 100644
index 00000000000..79e3e8dfbaf
--- /dev/null
+++ b/htdocs/langs/mk_MK/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Подесувања
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index b54d54f93cc..8c01a131abc 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index def35a334b4..3f3c872195a 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/mk_MK/ticket.lang b/htdocs/langs/mk_MK/ticket.lang
index d1cd608d476..1353f492ef1 100644
--- a/htdocs/langs/mk_MK/ticket.lang
+++ b/htdocs/langs/mk_MK/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index aea4e7676e4..25d9205457b 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/mk_MK/workflow.lang b/htdocs/langs/mk_MK/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/mk_MK/workflow.lang
+++ b/htdocs/langs/mk_MK/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/mk_MK/zapier.lang b/htdocs/langs/mk_MK/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/mk_MK/zapier.lang
+++ b/htdocs/langs/mk_MK/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/mn_MN/agenda.lang b/htdocs/langs/mn_MN/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/mn_MN/agenda.lang
+++ b/htdocs/langs/mn_MN/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/mn_MN/boxes.lang b/htdocs/langs/mn_MN/boxes.lang
index 8fe1f84b149..d6fd298a3a7 100644
--- a/htdocs/langs/mn_MN/boxes.lang
+++ b/htdocs/langs/mn_MN/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index 6cd046c5607..8f4f058bb87 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/mn_MN/contracts.lang b/htdocs/langs/mn_MN/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/mn_MN/contracts.lang
+++ b/htdocs/langs/mn_MN/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/mn_MN/languages.lang b/htdocs/langs/mn_MN/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/mn_MN/languages.lang
+++ b/htdocs/langs/mn_MN/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index 8eb796fa94e..1332148ae67 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/mn_MN/members.lang b/htdocs/langs/mn_MN/members.lang
index 5886c598d52..5ef946ddf67 100644
--- a/htdocs/langs/mn_MN/members.lang
+++ b/htdocs/langs/mn_MN/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/mn_MN/mrp.lang b/htdocs/langs/mn_MN/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/mn_MN/mrp.lang
+++ b/htdocs/langs/mn_MN/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/mn_MN/recruitment.lang b/htdocs/langs/mn_MN/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/mn_MN/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/mn_MN/suppliers.lang b/htdocs/langs/mn_MN/suppliers.lang
index d0cf540d3eb..51562b8bb7a 100644
--- a/htdocs/langs/mn_MN/suppliers.lang
+++ b/htdocs/langs/mn_MN/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/mn_MN/ticket.lang b/htdocs/langs/mn_MN/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/mn_MN/ticket.lang
+++ b/htdocs/langs/mn_MN/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/mn_MN/users.lang b/htdocs/langs/mn_MN/users.lang
index aea4e7676e4..25d9205457b 100644
--- a/htdocs/langs/mn_MN/users.lang
+++ b/htdocs/langs/mn_MN/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/mn_MN/workflow.lang b/htdocs/langs/mn_MN/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/mn_MN/workflow.lang
+++ b/htdocs/langs/mn_MN/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/mn_MN/zapier.lang b/htdocs/langs/mn_MN/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/mn_MN/zapier.lang
+++ b/htdocs/langs/mn_MN/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 245636d5c7e..5bc3643e0f4 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Tillat å administrere forskjellig antall nuller på slut
 BANK_DISABLE_DIRECT_INPUT=Deaktiver direkteregistrering av transaksjoner på bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktiver eksportutkast i journal
 ACCOUNTANCY_COMBO_FOR_AUX=Aktiver kombinasjonsliste for datterkonto (kan være treg hvis du har mange tredjeparter)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
@@ -284,6 +285,7 @@ ShowTutorial=Vis veiledning
 NotReconciled=Ikke sammenslått
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Masseinnlegging av kategorier
 AddAccountFromBookKeepingWithNoCategories=Tilgjengelig konto er ennå ikke i en personlig gruppe
 CategoryDeleted=Kategori for regnskapskontoen er blitt slettet
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 99fec9a8f23..57f0782b96f 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Standard avsender-epost for manuell sending (Bruker-e
 UserEmail=Bruker-epost
 CompanyEmail=Firma epost
 FeatureNotAvailableOnLinux=Funksjonen er ikke tilgjengelig på Unix/Linux. Test sendmail lokalt.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Hvis oversettelsen for dette språket ikke er fullført, eller du finner feil, kan du rette opp dette ved å redigere filer i katalogen <b>langs/%s</b> og sende inn endringen til www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Hvis oversettelse for dette språket ikke er fullstendig eller du finner feil, kan du korrigere dette ved å redigere filer i katalogen <b>langs/%s</b> og sende endrede filer på dolibarr.org/forum eller for utviklere på github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Modulinnstillinger
 ModulesSetup=Moduler/Applikasjonsoppsett
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modulen <b>%s</b> må aktiveres før du kan bruke denne
 SecurityToken=Nøkkel til sikre nettadresser
 NoSmsEngine=Ingen SMS avsender tilgjengelig. SMS-håndterer er ikke installert med standardinstallasjon (fordi de er avhengig av en ekstern leverandør), men du kan finne noen på %s
 PDF=PDF
-PDFDesc=Globale alternativer for PDF-generering
-PDFAddressForging=Regler for adressebokser
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Skjul all informasjon relatert til skatt/MVA på generert PDF
 PDFRulesForSalesTax=Regler for salgsskatt/mva
 PDFLocaltax=Regler for %s
-HideLocalTaxOnPDF=Skjul %s rate i kolonne MVA Salg
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Skjul varebeskrivelse
 HideRefOnPDF=Skjul varereferanse
 HideDetailsOnPDF=Skjul linjer med varedetaljer
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Endre på prisene med base referanseverdi definert på
 MassConvert=Start massekonvertering
 PriceFormatInCurrentLanguage=Prisformat på nåværende språk
 String=Streng
+String1Line=String (1 line)
 TextLong=Lang tekst
+TextLongNLines=Long text (n lines)
 HtmlText=HTML-tekst
 Int=Integer
 Float=Float
@@ -446,7 +449,7 @@ LinkToTestClickToDial=Angi et telefonnummer å ringe for å vise en link for å
 RefreshPhoneLink=Oppdater kobling
 LinkToTest=Klikkbar link generert for <strong>bruker%s</strong> (klikk telefonnummer for å teste)
 KeepEmptyToUseDefault=Hold tomt for å bruke standardverdien
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=I de fleste tilfeller kan du beholde dette feltet tomt.
 DefaultLink=Standard kobling
 SetAsDefault=Sett som standard
 ValueOverwrittenByUserSetup=Advarsel, denne verdien kan bli overskrevet av brukerspesifikke oppsett (hver bruker kan sette sitt eget clicktodial url)
@@ -542,10 +545,10 @@ Module54Name=Kontrakter/abonnement
 Module54Desc=Forvaltning av kontrakter (tjenester eller tilbakevendende abonnementer)
 Module55Name=Strekkoder
 Module55Desc=Behandling av strekkoder
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direkte Debitbetalinger
-Module57Desc=Håndtering av direktedebet betalingsordre. Inkluderer generering av SEPA-fil for europeiske land
+Module56Name=Betaling med kredittoverføring
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrasjon
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Opprett/endre tjenester
 Permission534=Slett tjenester
 Permission536=Administrer skjulte tjenester
 Permission538=Eksporter tjenester
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Les BOM (Bills of Materials)
 Permission651=Opprett/oppdater BOM
 Permission652=Slett BOM
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Vis donasjoner
 Permission702=Opprett/endre donasjoner
 Permission703=Slett donasjoner
@@ -848,6 +858,8 @@ Permission773=Slett utgiftsrapport
 Permission774=Les alle utgiftsrapporter (alle brukere)
 Permission775=Godkjenn utgiftsrapport
 Permission776=Betal utgift
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Eksporter utgiftsrapporter
 Permission1001=Vis beholdning
 Permission1002=Opprett/endre lager
@@ -900,6 +912,7 @@ Permission2515=Oppsett av  dokumentmapper
 Permission2801=Bruk FTP-klient i lesemodus (bla gjennom og laste ned)
 Permission2802=Bruk FTP-klient i skrivemodus (slette eller laste opp filer)
 Permission3200=Les arkiverte hendelser og fingeravtrykk
+Permission3301=Generate new modules
 Permission4001=Se ansatte
 Permission4002=Opprett ansatte
 Permission4003=Slett ansatte
@@ -947,7 +960,8 @@ Permission63003=Slett ressurser
 Permission63004=Koble ressurser til agendahendelser
 DictionaryCompanyType=Tredjepartstyper
 DictionaryCompanyJuridicalType=Tredjeparts juridiske enheter
-DictionaryProspectLevel=Prospektpotensiale
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Stater/provinser
 DictionaryRegion=Region
 DictionaryCountry=Land
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=E-postmaler
 DictionaryUnits=Enheter
 DictionaryMeasuringUnits=Måleenheter
 DictionarySocialNetworks=Sosiale nettverk
-DictionaryProspectStatus=Prospektstatus
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Typer permisjon
 DictionaryOpportunityStatus=Lead status for prosjekt/lead
 DictionaryExpenseTaxCat=Utgiftsrapport - Transportkategorier
@@ -1076,7 +1091,7 @@ LoginPage=Innloggingsside
 BackgroundImageLogin=Bakgrunnsbilde
 PermanentLeftSearchForm=Permanent søkeskjema i venstre meny
 DefaultLanguage=Standardspråk
-EnableMultilangInterface=Aktiver flerspråklig støtte
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Vis firmalogoen i menyen
 CompanyInfo=Firma/organisasjon
 CompanyIds=Firma-/organisasjonsidentiteter
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Et søkekriterie er nødvendig for nøkke
 NewTranslationStringToShow=Ny oversettelsesstreng som skal vises
 OriginalValueWas=Den originale oversettelsen er overskrevet. Original verdi var:<br><br>%s
 TransKeyWithoutOriginalValue=Du tvang en ny oversettelse for oversettelsesnøkkelen '<strong> %s</strong>' som ikke finnes i noen språkfiler
-TotalNumberOfActivatedModules=Aktiverte applikasjoner/moduler: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
 YesInSummer=Ja i sommer
@@ -1264,7 +1280,7 @@ FieldEdition=Endre felt %s
 FillThisOnlyIfRequired=Eksempel: +2 (brukes kun hvis du opplever problemer med tidssone offset)
 GetBarCode=Hent strekkode
 NumberingModules=Nummereringsmodeller
-DocumentModules=Document models
+DocumentModules=Dokumentmodeller
 ##### Module password generation
 PasswordGenerationStandard=Gir et automatisk laget passord med 8 tegn (bokstaver og tall) i små bokstaver.
 PasswordGenerationNone=Ikke foreslå å generere passord. Passord må legges inn manuelt.
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Bruk hendelsestyper (administrert i menyoppsett -> Ordbøk
 AGENDA_USE_EVENT_TYPE_DEFAULT=Angi denne standardverdien automatisk for type hendelse i skjema for hendelsesoppretting
 AGENDA_DEFAULT_FILTER_TYPE=Still inn denne typen hendelse automatisk i søkefilter i agendavisning
 AGENDA_DEFAULT_FILTER_STATUS=Angi denne status automatisk for hendelser i søkefilter i agendavisning
-AGENDA_DEFAULT_VIEW=Hvilken fane vil åpne som standard når du velger Agenda-menyen?
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Aktiver hendelsespåminnelse <b> via e-post </b> (påminnelsesalternativ/forsinkelse kan defineres for hver hendelse). Merk: Modul <strong> %s</strong> må være aktivert og riktig satt opp for å få påminnelse sendt med riktig frekvens.
 AGENDA_REMINDER_BROWSER=Aktiver hendelsespåminnelse <b> i brukerens nettleser </b> (når hendelsesdatoen er nådd, kan hver bruker nekte dette fra spørsmålet om nettleserbekreftelse)
 AGENDA_REMINDER_BROWSER_SOUND=Aktiver lydvarsler
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Vis koblet objekt i agendavisning
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial' modul
 ClickToDialUrlDesc=Url som kalles når man klikker på telefonpiktogrammet. I URL kan du bruke koder <br> <b> __ PHONETO __ </b> som blir erstattet med telefonnummeret til personen som skal ringes <br> <b> __ PHONEFROM __ </b> som blir erstattet med telefonnummeret til den som ringer(din) <br> <b> __ LOGIN __ </b> som vil bli erstattet med clicktodial login (definert på brukerkort) <br> <b> __ PASS __ </b> som vil bli erstattet med clicktodial passord (definert på brukerkort).
-ClickToDialDesc=Denne modulen gjør telefonnumre til klikkbare koblinger. Et klikk på ikonet vil få telefonen til å ringe nummeret. Dette kan brukes til å ringe et call-center-system fra Dolibarr som kan ringe telefonnummeret på et SIP-system.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Bruk kun en lenke "tlf:" for telefonnumre
 ClickToDialUseTelLinkDesc=Bruk denne metoden hvis brukerne har en softphone eller et programvaregrensesnitt installert på samme datamaskin som nettleseren, og kalles når du klikker på en link i nettleseren din som starter med "tel:". Hvis du trenger en full server-løsning (uten behov for lokal installasjon av programvare), må du sette denne på "Nei" og fylle neste felt.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Dette feltet inneholder en referanse til identifikasjon av linje. B
 Enter0or1=Skriv inn 0 eller 1
 UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer et valutasymbol. For eksempel: $ = [36], Brasilsk real R$ = [82,36], € = [8364]
 ColorFormat=RGB-fargen er i HEX-format, for eksempel: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Plassering av linje i kombinasjonslister
 SellTaxRate=Salgs-skattesats
 RecuperableOnly=Ja for MVA"Ikke oppfattet, men gjenopprettelig" dedikert til noen steder i Frankrike. Hold verdien til "Nei" i alle andre tilfeller.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Prisforespørsel
 MailToSendSupplierOrder=Innkjøpsordrer
 MailToSendSupplierInvoice=Leverandørfakturaer
 MailToSendContract=Kontrakter
+MailToSendReception=Mottak
 MailToThirdparty=Tredjeparter
 MailToMember=Medlemmer
 MailToUser=Brukere
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versj
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgjengelig. Versjon %s er en vedlikeholdsversjon, så den inneholder bare feilrettinger. Vi anbefaler alle brukere å oppgradere til denne versjonen. En vedlikeholdsløsning introduserer ikke nye funksjoner eller endringer i databasen. Du kan laste den ned fra nedlastingsområdet på https://www.dolibarr.org portal (underkatalog Stable versions). Du kan lese <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for fullstendig liste over endringer.
 MultiPriceRuleDesc=Når alternativet "Flere prisnivået pr. vare/tjeneste" er på, kan du definere forskjellige priser (ett pr prisnivå) for hvert produkt. For å spare tid, kan du lage en regel som gir pris for hvert nivå autokalkulert i forhold til prisen på første nivå, slik at du bare legger inn en pris for hvert produkt. Denne siden er laget for å spare tid og kan være nyttig hvis prisene for hvert nivå står i forhold til første nivå. Du kan ignorere denne siden i de fleste tilfeller.
 ModelModulesProduct=Maler for produkt-dokumenter
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=For å kunne generere koder automatisk, må du først definere et program for å automatisk definere strekkodenummeret.
 SeeSubstitutionVars=Relaterte gjentakende fakturaer
 SeeChangeLog=Se Endringslogg-fil (kun på engelsk)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Venstremarg på PDF
 MAIN_PDF_MARGIN_RIGHT=Høyremarg på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarg på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Det er ikke noe spesifikt oppsett som kreves for denne modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Sett til ja hvis denne gruppen er en beregning av andre grupper
 EnterCalculationRuleIfPreviousFieldIsYes=Angi kalkuleringsregel hvis tidligere felt ble satt til Ja (for eksempel 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Ingenting gjort
 XEmailsDoneYActionsDone=%s e-postmeldinger kvalifiserte, %s e-postmeldinger som er vellykket behandlet (for %s-post/handlinger utført)
 RecordEvent=Registrer e-posthendelse
 CreateLeadAndThirdParty=Opprett lead (og tredjepart om nødvendig)
-CreateTicketAndThirdParty=Opprett billett (og tredjepart om nødvendig)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Siste resultatkode
 NbOfEmailsInInbox=Antall e-poster i kildemappen
 LoadThirdPartyFromName=Legg inn tredjepartsøk på %s (bare innlasting)
 LoadThirdPartyFromNameOrCreate=Legg inn tredjepartsøk på %s (opprett hvis ikke funnet)
-WithDolTrackingID=Dolibarr referanse funnet i Meldings-ID
-WithoutDolTrackingID=Dolibarr referanse ikke funnet i Meldings-ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Postnummer
 MainMenuCode=Meny-oppføringskode (hovedmeny)
 ECMAutoTree=Vis ECM-tre automatisk 
@@ -1981,7 +2002,7 @@ ImportSetup=Oppsett av importmodul
 InstanceUniqueID=Unik ID for forekomsten
 SmallerThan=Mindre enn
 LargerThan=Større enn
-IfTrackingIDFoundEventWillBeLinked=Merk at hvis en sporings-ID er funnet i innkommende e-post, blir hendelsen automatisk koblet til relaterte objekter.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Med en Gmail-konto, hvis du aktiverte 2-trinns validering, anbefales det å opprette et dedikert annet passord for applikasjonen, i stedet for å bruke ditt eget kontopassord fra 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=Du kan bruke denne handlingen til å bruke e-postinnholdet til å finne og laste inn en eksisterende tredjepart i databasen din. Den funnet (eller opprettede) tredjeparten vil bli brukt til å følge handlinger som trenger det. I parameterfeltet kan du bruke for eksempel 'EXTRACT:BODY:Name:\\s([^\\s]*)' hvis du vil trekke ut navnet på tredjeparten fra en streng 'Name: name to find' funnet i teksten.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Gå til Setup -> Widgets
 MeasuringUnitTypeDesc=Bruk en verdi som "størrelse", "overflate", "volum", "vekt", "tid"
 MeasuringScaleDesc=Skalaen er antall steder du må flytte kommaet for å samsvare med standard referansenhet. For enhetstypen "tid" er det antall sekunder. Verdier mellom 80 og 99 er reserverte verdier.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 9861d576c3d..755d782a5e0 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Antall hendelser
 ListOfActions=Oversikt over hendelser
 EventReports=Hendelsesrapporter
 Location=Lokasjon
-ToUserOfGroup=Til tilfeldig bruker i gruppe
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Hendelse over hele dagen(e)
 MenuToDoActions=Alle åpne handlinger
 MenuDoneActions=Alle avsluttede handlinger
@@ -63,7 +63,7 @@ ShipmentClassifyClosedInDolibarr=Forsendelse %s klassifisert fakturert
 ShipmentUnClassifyCloseddInDolibarr=Forsendelse %s klassifisert gjenåpnet
 ShipmentBackToDraftInDolibarr=Sett levering %s tilbake til utkaststatus
 ShipmentDeletedInDolibarr=Leveranse %s slettet
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Mottak %s validert
 OrderCreatedInDolibarr=Ordre %s opprettet
 OrderValidatedInDolibarr=Ordre %s validert
 OrderDeliveredInDolibarr=Ordre %s klassifisert som levert
@@ -86,6 +86,8 @@ ProposalDeleted=Tilbud slettet
 OrderDeleted=Ordre slettet
 InvoiceDeleted=Faktura slettet
 DraftInvoiceDeleted=Fakturautkast slettet
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Vare%s opprettet
 PRODUCT_MODIFYInDolibarr=Vare %s endret
 PRODUCT_DELETEInDolibarr=Vare %s slettet
@@ -158,3 +160,9 @@ DateStartPlusOne=Startdato + 1 time
 SetAllEventsToTodo=Sett alle hendelser til ToDo
 SetAllEventsToInProgress=Sett alle begivenheter til Pågår
 SetAllEventsToFinished=Sett alle hendelser til Ferdig
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 27d5370144a..dfe2685ab83 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -39,7 +39,7 @@ StandingOrders=Direktedebetsordre
 StandingOrder=Direktedebet-ordre
 PaymentByDirectDebit=Payment by direct debit
 PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByBankTransfer=Betaling med kredittoverføring
 AccountStatement=Kontoutskrift
 AccountStatementShort=Utskrift
 AccountStatements=Kontoutskrifter
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 96ec3ebe05e..0ce361d058e 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -383,7 +383,7 @@ GeneratedFromTemplate=Generert fra fakturamal %s
 WarningInvoiceDateInFuture=Advarsel, fakturadato er høyere enn dagens dato
 WarningInvoiceDateTooFarInFuture=Advarsel, er fakturadato for langt fra dagens dato
 ViewAvailableGlobalDiscounts=Vis tilgjengelige rabatter
-GroupPaymentsByModOnReports=Group payments by mode on reports
+GroupPaymentsByModOnReports=Gruppebetalinger etter modus på rapporter
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Forfall ved mottak
@@ -441,8 +441,8 @@ BankAccountNumberKey=Sjekksum
 Residence=Adresse
 IBANNumber=IBAN kontonummer
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=Kundes IBAN
+SupplierIBAN=Leverandørs IBAN
 BIC=BIC/SWIFT
 BICNumber=BIC/SWIFT-kode
 ExtraInfos=Ekstra informasjon
@@ -572,6 +572,6 @@ AutoFillDateToShort=Angi sluttdato
 MaxNumberOfGenerationReached=Maks ant. genereringer nådd
 BILL_DELETEInDolibarr=Faktura slettet
 BILL_SUPPLIER_DELETEInDolibarr=Leverandørfaktura slettet
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
+UnitPriceXQtyLessDiscount=Enhetspris x Antall - Rabatt
+CustomersInvoicesArea=Kunde-faktureringsområde
+SupplierInvoicesArea=Leverandør faktureringsområde
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 42dfc31daa7..494febc0a2f 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Siste %s registrerte leverandører
 BoxTitleLastModifiedSuppliers=Leverandører: siste %s endret
 BoxTitleLastModifiedCustomers=Kunder: Siste%s endret
 BoxTitleLastCustomersOrProspects=Siste %s endrede kunder eller prospekter
-BoxTitleLastCustomerBills=Siste %s Kundefakturaer
-BoxTitleLastSupplierBills=Siste %s Leverandørfakturaer
+BoxTitleLastCustomerBills=Siste %s endrede kundefakturaer
+BoxTitleLastSupplierBills=Siste %s endrede leverandørfakturaer
 BoxTitleLastModifiedProspects=Prospekter: siste %s endret
 BoxTitleLastModifiedMembers=Siste %s medlemmer
 BoxTitleLastFicheInter=Siste %s endrede intervensjoner
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Leverandørordre: siste %s endret
 BoxTitleLastModifiedCustomerBills=Kundefakturaer: siste %s endret
 BoxTitleLastModifiedCustomerOrders=Salgsordre: siste %s endret
 BoxTitleLastModifiedPropals=Siste %s endrede tilbud
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Kundefakturaer
 ForCustomersOrders=Kundeordrer
 ForProposals=Tilbud
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Spenningskonto er ikke definert
 BoxLastCustomerShipments=Siste kundeforsendelser
 BoxTitleLastCustomerShipments=Siste %s kundeforsendelser
 NoRecordedShipments=Ingen registrert kundesending
+# Pages
+AccountancyHome=Regnskap
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 2db692330d1..de0728f2754 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS-modul
 BasicPhoneLayout=Bruk grunnleggende oppsett for telefoner
 SetupOfTerminalNotComplete=Installasjonen av terminal %s er ikke fullført
 DirectPayment=Direktebetaling
-DirectPaymentButton=Direkte kontantbetalings-knapp
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Faktura er allerede validert
 NoLinesToBill=Ingen linjer å fakturere
 CustomReceipt=Tilpasset kvittering
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Ekstern modul med ekstra funksjoner. Mulighet
 PrintMethod=Utskriftsmetode
 ReceiptPrinterMethodDescription=Metode med mange parametere. Full tilpassbar med maler. Kan ikke skrive ut fra skyen.
 ByTerminal=Med terminal
-TakeposNumpadUsePaymentIcon=Bruk betalingsikonet på numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b>-tag brukes til å legge til terminalnummeret
 TakeposGroupSameProduct=Grupper samme produktlinjer
 StartAParallelSale=Start et nytt parallellsalg
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Kontantrapport
 MainPrinterToUse=Hovedskriver som skal brukes
@@ -108,12 +108,17 @@ MainTemplateToUse=Hovedmal som skal brukes
 OrderTemplateToUse=Ordremal som skal brukes
 BarRestaurant=Bar Restaurant
 AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
+RestaurantMenu=Meny
+CustomerMenu=Kundemeny
+ScanToMenu=Skann QR-koden for å se menyen
+ScanToOrder=Skann QR-koden for å bestille
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 4d55842aec8..3cdb939010a 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Skatt eller avgift
 SocialContributions=Skatter eller avgifter
 SocialContributionsDeductibles=Fradragsberettigede avgifter
 SocialContributionsNondeductibles=Ikke fradragsberettigede avgifter
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Etikett bidrag
 TypeContrib=Type bidrag
 MenuSpecialExpenses=Spesielle utgifter
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index 9a7cf3c6a2d..1a0c7a929c8 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Løpende tjenester
 MenuExpiredServices=Utløpte tjenester
 MenuClosedServices=Lukkede tjenester
 NewContract=Ny kontrakt
-NewContractSubscription=Ny kontrakt/abonnement
+NewContractSubscription=Ny kontrakt eller abonnement
 AddContract=Opprett kontrakt
 DeleteAContract=Slett kontrakt
 ActivateAllOnContract=Aktiver alle tjenester
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Salgsrepresentant som følger opp kont
 TypeContact_contrat_external_BILLING=Kundekontakt faktura
 TypeContact_contrat_external_CUSTOMER=Kundekontakt oppfølging
 TypeContact_contrat_external_SALESREPSIGN=Kundens signaturkontakt
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Skjul lukkede tjenester som standard
+ShowClosedServices=Vis lukkede tjenester
+HideClosedServices=Skjul lukkede tjenester
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 9d8e9ac47fb..7a37155c119 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Feil syntaks for leverandørkode
 ErrorSupplierCodeRequired=Leverandørkode kreves
 ErrorSupplierCodeAlreadyUsed=Leverandørkode allerede brukt
 ErrorBadParameters=Ugyldige parametere
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Feil eller manglende parametre
 ErrorBadValueForParameter=Feil verdi '%s' for parameter '%s'
 ErrorBadImageFormat=Bildeformatet støttes ikke (Din PHP støtter ikke konvertering av dette formatet)
 ErrorBadDateFormat=Verdien '%s' har feil datoformat
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Ny verdi kan ikke være lik den gamle
 ErrorFailedToValidatePasswordReset=Klarte ikke å initialisere passordet på nytt. Initialiseringen kan allerede ha blitt utført (denne lenken kan bare brukes en gang). Hvis ikke, prøv å starte prosessen på nytt
 ErrorToConnectToMysqlCheckInstance=Tilkobling til databasen feiler. Sjekk at databaseserveren kjører (for eksempel med mysql/mariadb, kan du starte den fra kommandolinjen med 'sudo service mysql start').
 ErrorFailedToAddContact=Klarte ikke å legge til kontakt
-ErrorDateMustBeBeforeToday=Datoen kan ikke settes til etter i dag
+ErrorDateMustBeBeforeToday=Datoen må være før i dag
+ErrorDateMustBeInFuture=Datoen må være etter i dag
 ErrorPaymentModeDefinedToWithoutSetup=En betalingsmodus var satt til å skrive %s, men oppsett av modulen Faktura er ikke ferdig definert for å vise for denne betalingsmodusen.
 ErrorPHPNeedModule=Feil! Din PHP må ha modulen <b>%s</b> installert for  å kunne bruke denne funksjonen.
 ErrorOpenIDSetupNotComplete=Du satte opp Dolibarr config-filen til å tillate OpenID-autentisering, men url til OpenID-tjenesten er ikke definert i konstanten %s
@@ -184,7 +185,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In
 ErrorSavingChanges=En feil oppsto under lagring av endringer
 ErrorWarehouseRequiredIntoShipmentLine=Lager er obligatorisk for å kunne levere
 ErrorFileMustHaveFormat=Filen må ha formatet %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=Filnavn kan ikke starte med et '.'
 ErrorSupplierCountryIsNotDefined=Land for denne leverandøren er ikke definert. Rett dette først.
 ErrorsThirdpartyMerge=Klarte ikke å flette de to postene. Forespørsel ble avbrutt.
 ErrorStockIsNotEnoughToAddProductOnOrder=Lagernivå er for lavt for å legge %s til i en ny ordre
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Ikke nok mengde for dette p
 ErrorOnlyOneFieldForGroupByIsPossible=Bare ett felt for 'Grupper etter' er mulig (andre blir forkastet)
 ErrorTooManyDifferentValueForSelectedGroupBy=Fant for mange forskjellige verdier (mer enn <b> %s </b>) for feltet '<b> %s </b>', så vi kan ikke bruke det 'Gruppering' for grafikk. Feltet 'Grupper etter' er fjernet. Kan det være du ønsket å bruke den som en X-akse?
 ErrorReplaceStringEmpty=Feil, strengen du vil erstatte til er tom
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
@@ -265,4 +269,4 @@ WarningNumberOfRecipientIsRestrictedInMassAction=Advarsel, antall forskjellige m
 WarningDateOfLineMustBeInExpenseReportRange=Advarsel, datoen for linjen ligger utenfor tiden til utgiftsrapporten
 WarningProjectClosed=Prosjektet er stengt. Du må gjenåpne det først.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Noen banktransaksjoner ble fjernet etter at kvitteringen deres ble generert. Antall sjekker og total mottak kan avvike fra antall og total på listen.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningFailedToAddFileIntoDatabaseIndex=Advarsel, kunne ikke legge filoppføring i ECM-databasens indekstabell
diff --git a/htdocs/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang
index 413e52273a4..0dbd0e83398 100644
--- a/htdocs/langs/nb_NO/hrm.lang
+++ b/htdocs/langs/nb_NO/hrm.lang
@@ -11,7 +11,7 @@ CloseEtablishment=Lukk firma
 # Dictionary
 DictionaryPublicHolidays=HRM - Helligdager
 DictionaryDepartment=HRM - Departementliste
-DictionaryFunction=HRM - Job positions
+DictionaryFunction=HRM - Jobbstillinger
 # Module
 Employees=Ansatte
 Employee=Ansatt
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index fc8f964bff7..5a1c4ec625f 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Etiopisk
 Language_ar_AR=Arabisk
 Language_ar_EG=Arabisk (Egypt)
 Language_ar_SA=Arabisk
+Language_az_AZ=Aserbajdsjansk
 Language_bn_BD=Bengalsk
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarsk
 Language_bs_BA=Bosnisk
 Language_ca_ES=Katalansk
@@ -20,6 +23,7 @@ Language_en_GB=Engelsk (U.K.)
 Language_en_IN=Engelsk (India)
 Language_en_NZ=Engelsk (New Zealand)
 Language_en_SA=Engelsk (Saudi-Arabia)
+Language_en_SG=Engelsk (Singapore)
 Language_en_US=Engelsk (USA)
 Language_en_ZA=Engelsk (Sør-Afrika)
 Language_es_ES=Spansk
@@ -29,6 +33,7 @@ Language_es_CL=Spansk (Chile)
 Language_es_CO=Spansk (Colombia)
 Language_es_DO=Spansk (Den Dominikanske republikk)
 Language_es_EC=Spansk (Ecuador)
+Language_es_GT=Spansk (Guatemala)
 Language_es_HN=Spansk (Honduras)
 Language_es_MX=Spansk (Mexico)
 Language_es_PA=Spansk (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spansk (Paraguay)
 Language_es_PE=Spansk (Peru)
 Language_es_PR=Spansk (Puerto Rico)
 Language_es_UY=Spansk (Uruguay)
+Language_es_GT=Spansk (Guatemala)
 Language_es_VE=Spansk (Venezuela)
 Language_et_EE=Estonsk
 Language_eu_ES=Baskisk
@@ -44,15 +50,22 @@ Language_fi_FI=Finsk
 Language_fr_BE=Fransk (Belgia)
 Language_fr_CA=Fransk (Canada)
 Language_fr_CH=Fransk (Sveits)
+Language_fr_CI=Fransk (Elfenbenskysten)
+Language_fr_CM=Fransk (Kamerun)
 Language_fr_FR=Fransk
+Language_fr_GA=Fransk (Gabon)
 Language_fr_NC=Fransk (Ny Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisisk
+Language_gl_ES=Gælisk
 Language_he_IL=Hebraisk
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Kroatisk
 Language_hu_HU=Ungarsk
 Language_id_ID=Indonesisk
 Language_is_IS=Islandsk
 Language_it_IT=Italiensk
+Language_it_CH=Italiensk (Sveits)
 Language_ja_JP=Japansk
 Language_ka_GE=Georgisk
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvisk
 Language_mk_MK=Makedonsk
 Language_mn_MN=Mongolsk
 Language_nb_NO=Norsk (bokmål)
+Language_ne_NP=Nepalsk
 Language_nl_BE=Nederlandsk (Belgia)
 Language_nl_NL=Nederlandsk
 Language_pl_PL=Polsk
@@ -86,4 +100,5 @@ Language_uz_UZ=Usbekisk
 Language_vi_VN=Vietnamesisk
 Language_zh_CN=Kinesisk
 Language_zh_TW=Kinesisk (tradisjonell)
+Language_zh_HK=Kinesisk (Hong Kong)
 Language_bh_MY=Malayisisk
diff --git a/htdocs/langs/nb_NO/loan.lang b/htdocs/langs/nb_NO/loan.lang
index 06230a91d3c..3950d015409 100644
--- a/htdocs/langs/nb_NO/loan.lang
+++ b/htdocs/langs/nb_NO/loan.lang
@@ -23,9 +23,9 @@ AddLoan=Opprett lån
 FinancialCommitment=Finansiell forpliktelse
 InterestAmount=Rente
 CapitalRemain=Gjenstående kapital
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Denne terminen er allerede betalt
+CantUseScheduleWithLoanStartedToPaid = Kan ikke bruke planlegger for et lån med startet betaling 
+CantModifyInterestIfScheduleIsUsed = Du kan ikke endre rente hvis du bruker tidsplan
 # Admin
 ConfigLoan=Oppset av lån-modulen
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard regnskapskonto kapital
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 415ecec5f1a..42c280be51f 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -164,7 +164,11 @@ NoContactWithCategoryFound=Ingen kontakter/adresser med kategori funnet
 NoContactLinkedToThirdpartieWithCategoryFound=Ingen kontakter/adresser med kategori funnet
 OutGoingEmailSetup=Oppsett for utgående epost
 InGoingEmailSetup=Oppsett for innkommende epost
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetupForEmailing=Oppsett for utgående e-post (for modul %s)
 DefaultOutgoingEmailSetup=Standard utgående e-postoppsett
 Information=Informasjon
 ContactsWithThirdpartyFilter=Kontakter med tredjepartsfilter
+Unanswered=Unanswered
+Answered=Besvarte
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index c69c8556b27..b8fcb183568 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inkl. avgift)
 Amount=Beløp
 AmountInvoice=Fakturabeløp
 AmountInvoiced=Beløp fakturert
-AmountInvoicedHT=Fakturert beløp (inkl. MVA)
-AmountInvoicedTTC=Fakturert beløp (ekskl. MVA)
+AmountInvoicedHT=Fakturert beløp (ekskl. MVA)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Betalingsbeløp
 AmountHTShort=Beløp (ekskl.)
 AmountTTCShort=Beløp (inkl. MVA)
@@ -485,6 +485,7 @@ Categories=Merker/kategorier
 Category=Merke/Kategori
 By=Av
 From=Fra
+FromDate=Fra
 FromLocation=Fra
 to=til
 To=til
@@ -687,6 +688,7 @@ Method=Metode
 Receive=Motta
 CompleteOrNoMoreReceptionExpected=Komplett eller ingenting mer forventet
 ExpectedValue=Forventet verdi
+ExpectedQty=Expected Qty
 PartialWoman=Delvis
 TotalWoman=Total
 NeverReceived=Aldri mottatt
@@ -703,6 +705,7 @@ MenuECM=Dokumenter
 MenuAWStats=AWStats
 MenuMembers=Medlemmer
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr grense (Menu home-setup-security): %s Kb, PHP grense: %s Kb
 NoFileFound=Ingen dokumenter er lagret i denne mappen
 CurrentUserLanguage=Gjeldende språk
@@ -725,7 +728,7 @@ Page=Side
 Notes=Merknader
 AddNewLine=Legg til ny linje
 AddFile=Legg til fil
-FreeZone=Ikke et forhåndsdefinert vare/tjeneste
+FreeZone=Free-text product
 FreeLineOfType=Fritekst element, type:
 CloneMainAttributes=Klon objektet med de viktigste attributtene
 ReGeneratePDF=Regenerere PDF
@@ -942,6 +945,39 @@ ShortThursday=To
 ShortFriday=F
 ShortSaturday=L
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Velg en e-postmal
 SetRef=Sett ref
 Select2ResultFoundUseArrows=Noen resultater funnet. Bruk pilene for å velge
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Bytt i redigeringsmodus for å legge til overse
 NotUsedForThisCustomer=Ikke brukt for denne kunden
 AmountMustBePositive=Beløpet må være positivt
 ByStatus=Etter status
+InformationMessage=Informasjon
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 2c81e953545..699fcd4aa2c 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -29,7 +29,7 @@ MenuMembersUpToDate=Oppdaterte medlemmer
 MenuMembersNotUpToDate=Utdaterte medlemmer
 MenuMembersResiliated=Terminerte medlemmer
 MembersWithSubscriptionToReceive=Medlemmer som venter på abonnement
-MembersWithSubscriptionToReceiveShort=Subscription to receive
+MembersWithSubscriptionToReceiveShort=Abonnement på å motta
 DateSubscription=Abonnement dato
 DateEndSubscription=Abonnement sluttdato
 EndSubscription=Avslutt abonnement
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminert medlem
 MemberStatusResiliatedShort=Terminert
 MembersStatusToValid=Utkast medlemmer
 MembersStatusResiliated=Terminerte medlemmer
+MemberStatusNoSubscription=Validert (ingen abonnement nødvendig)
+MemberStatusNoSubscriptionShort=Validert
+SubscriptionNotNeeded=Ingen abonnement nødvendig
 NewCotisation=Nytt bidrag
 PaymentSubscription=Ny bidragsinnbetaling
 SubscriptionEndDate=Abonnementets sluttdato
@@ -78,7 +81,7 @@ DeleteType=Slett
 VoteAllowed=Stemming tillatt
 Physical=Fysisk
 Moral=Moralsk
-MorPhy=Moralsk/Fysisk
+MorPhy=Natur
 Reenable=Reaktiverer
 ResiliateMember=Terminer et medlem
 ConfirmResiliateMember=Er du sikker på at du vil terminere dette medlemmet?
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index 264c272dc05..7d1aa17dc38 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -139,4 +139,4 @@ ForeignKey=Fremmed nøkkel
 TypeOfFieldsHelp=Type felt: <br> varchar (99), dobbel (24,8), ekte, tekst, html, datetime, tidstempel, heltall, heltall:ClassName:relativepath/to/classfile.class.php [:1[:filter]] ('1' betyr at vi legger til en + -knapp etter kombinasjonsboksen for å opprette posten, 'filter' kan være 'status=1 OG fk_user=__USER_ID OG enhet IN (__SHARED_ENTITIES__)' for eksempel)
 AsciiToHtmlConverter=Ascii til HTML konverter
 AsciiToPdfConverter=Ascii til PDF konverter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+TableNotEmptyDropCanceled=Tabellen er ikke tom. Drop har blitt kansellert.
diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang
index 5d307d14280..e6ea08e39d7 100644
--- a/htdocs/langs/nb_NO/mrp.lang
+++ b/htdocs/langs/nb_NO/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Produksjonsordrer
 MO=Produksjonsordre
+MOs=Manufacturing orders
 MRPDescription=Modul for å administrere produksjons- og produksjonsordrer (PO).
 MRPArea=MRP-område
 MrpSetupPage=Oppsett av MRP-modul 
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index fd68664e5c8..e39eb70042d 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hei)__\n\nBestilling __REF__ vedlagt\n
 PredefinedMailContentSendSupplierInvoice=__(Hei)__\n\nFaktura __REF__ vedlagt\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hei)__\n\nFraktbrev __REF__ vedlagt\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hei)__\n\nIntervensjon __REF__ vedlagt\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hei)__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hei)__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hei)__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Du kan klikke på linken under for å utføre betalingen din, hvis det ikke allerede er gjort.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hei)__\n\n\n__(Vennlig hilsen)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr er en kompakt ERP/CRM med støtte for flere forretningsmoduler. En demo som viser alle moduler gir ingen mening da dette scenariet aldri skjer (flere hundre tilgjengelig). Derforer flere demoprofiler er tilgjengelig.
 ChooseYourDemoProfil=Velg en demoprofil som passer best til dine krav
 ChooseYourDemoProfilMore=... eller bygg din egen profil<br>(manuell utvelgelse av moduler)
@@ -280,7 +278,9 @@ LinesToImport=Linjer å importere
 
 MemoryUsage=Minnebruk
 RequestDuration=Varighet av forespørsel
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Varer/tjenester etter popularitet i tilbud
 PopuCom=Varer/tjenester etter popularitet i ordre
 ProductStatistics=Varer/Tjenestestatistikk
 NbOfQtyInOrders=Antall i ordre
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 705a565ec58..72204d17cac 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Angi strekkodetype
 BarcodeValue=Strekkodeverdi
 NoteNotVisibleOnBill=Notat (vises ikke på fakturaer, tilbud...)
 ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Flere prissegmenter for hver vare/tjeneste (hver kunde er i et segment)
 MultiPricesNumPrices=Pris antall
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
 CustomCode=Toll / vare / HS-kode
 CountryOrigin=Opprinnelsesland
 Nature=Produktets art (materiale/ferdig)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Kort etikett
 Unit=Enhet
 p= stk
@@ -359,6 +362,9 @@ SelectCombination=Velg kombinasjon
 ProductCombinationGenerator=Variantgenerator
 Features=Egenskaper
 PriceImpact=Prisinnvirkning
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Vektinnvirkning
 NewProductAttribute=Ny attributt
 NewProductAttributeValue=Ny attributtverdi
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 2afc5c84ce9..5ab97f6c58a 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Prosjektområde
 ProjectStatus=Prosjektstatus
 SharedProject=Alle
 PrivateProject=Prosjektkontakter
-ProjectsImContactFor=Projects for which I am explicitly a contact
+ProjectsImContactFor=Prosjekter som jeg eksplisitt er en kontakt for
 AllAllowedProjects=Alt prosjekter jeg kan lese (min + offentlig)
 AllProjects=Alle prosjekter
 MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Bidragsyter
 TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragsyter
 SelectElement=Velg element
 AddElement=Lenke til element
+LinkToElementShort=Lenke til
 # Documents models
 DocumentModelBeluga=Prosjekt-dokumentmal for oversikt over koblede objekter
 DocumentModelBaleine=Prosjektdokumentmal for oppgaver
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Antall opprettede prosjekter etter måned
 ProjectNbTaskByMonth=Antall opprettede oppgaver etter måned
 ProjectOppAmountOfProjectsByMonth=Beløp i leads pr. måned
 ProjectWeightedOppAmountOfProjectsByMonth=Vektet beløp i leads pr. måned
-ProjectOpenedProjectByOppStatus=Åpne prosjekt/lead etter lead-status
-ProjectsStatistics=Statistikk over muligheter
-TasksStatistics=Statistikk over prosjekter/hovedoppgaver
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
 YouCanCompleteRef=Hvis du vil fullføre referansen med en suffiks, anbefales det å legge til et tegn for å skille det, slik at den automatiske nummereringen fortsatt fungerer riktig for neste prosjekt. For eksempel %s-MYSUFFIX
@@ -265,4 +266,4 @@ NewInvoice=Ny faktura
 OneLinePerTask=Én linje per oppgave
 OneLinePerPeriod=Én linje per periode
 RefTaskParent=Ref. forelderoppgave
-ProfitIsCalculatedWith=Profit is calculated using
+ProfitIsCalculatedWith=Fortjenesten beregnes ved å bruke
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index d3ea17c2baa..548c9260382 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -84,4 +84,4 @@ DefaultModelPropalClosed=Standardmal når du lukker et tilbud (ufakturert)
 ProposalCustomerSignature=Skriftlig aksept, firmastempel, dato og signatur
 ProposalsStatisticsSuppliers=Leverandørs tilbudsstatistikk
 CaseFollowedBy=Sak fulgt av
-SignedOnly=Signed only
+SignedOnly=Kun signert
diff --git a/htdocs/langs/nb_NO/receiptprinter.lang b/htdocs/langs/nb_NO/receiptprinter.lang
index 08eb4272132..67c8c29c91b 100644
--- a/htdocs/langs/nb_NO/receiptprinter.lang
+++ b/htdocs/langs/nb_NO/receiptprinter.lang
@@ -77,6 +77,6 @@ DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Kundes saldo
 DOL_VALUE_MYSOC_NAME=Ditt firmanavn
 VendorLastname=Leverandørs etternavn
 VendorFirstname=Leverandørs fornavn
-VendorEmail=Vendor email
+VendorEmail=Leverandørens e-post
 DOL_VALUE_CUSTOMER_POINTS=Kundepoeng
 DOL_VALUE_OBJECT_POINTS=Objektpoeng
diff --git a/htdocs/langs/nb_NO/recruitment.lang b/htdocs/langs/nb_NO/recruitment.lang
new file mode 100644
index 00000000000..e131268a03f
--- /dev/null
+++ b/htdocs/langs/nb_NO/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = innstillinger
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Om
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index fdd1b46caec..9db136a8d9a 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Slett levering
 Stock=Lagerbeholdning
 Stocks=Lagerbeholdning
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Lager etter LOT/serienummer
@@ -95,14 +95,16 @@ RealStock=Virkelig beholdning
 RealStockDesc=Fysisk/reelt lager er beholdningen du for øyeblikket har i dine interne lagre.
 RealStockWillAutomaticallyWhen=Virkelig beholdning vil bli endret i henhold til denne regelen (som definert i Lager-modulen):
 VirtualStock=Virtuell beholdning
-VirtualStockDesc=Virtuelt lager er beregnet beholdning tilgjengelig når alle åpne/ventende handlinger (som påvirker beholdning) er lukket (innkjøpsordre mottatt, salgsordre sendt osv.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Lager-ID
 DescWareHouse=Beskrivelse av lager
 LieuWareHouse=Lagerlokasjon
 WarehousesAndProducts=Lager og varer
 WarehousesAndProductsBatchDetail=Lager og varer (med detaljer pr. lot/serienummer)
-AverageUnitPricePMPShort=Vektet gjennomsnittlig innkjøpspris
-AverageUnitPricePMP=Vektet gjennomsnittlig innkjøpspris
+AverageUnitPricePMPShort=Vektet gjennomsnittspris
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Utsalgspris
 EstimatedStockValueSellShort=Verdi å selge
 EstimatedStockValueSell=Verdi å selge
@@ -141,7 +143,7 @@ Replenishments=Lagerpåfyllinger
 NbOfProductBeforePeriod=Beholdning av varen %s før valgte periode (< %s)
 NbOfProductAfterPeriod=Beholdning av varen %s før etter periode (< %s)
 MassMovement=Massebevegelse
-SelectProductInAndOutWareHouse=Velg en vare, etnkvantum, et kildelager og et mållager, og klikk deretter på "%s". Når dette er gjort for alle nødvendige bevegelser, klikk på "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Postoverføring
 ReceivingForSameOrder=Kvitteringer for denne ordren
 StockMovementRecorded=Registrerte varebevegelser
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Vis hele lagertreet med popup av lagerkoblinger (Advarsel: De
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index e9d6fa251ab..02803b3f7e7 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Leverandører
 SuppliersInvoice=Leverandørfaktura
 ShowSupplierInvoice=Vis leverandørfaktura
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Noen sub-varer har ingen pris definert
 AddSupplierPrice=Legg til innkjøpspris
 ChangeSupplierPrice=Endre innkjøpspris
 SupplierPrices=Leverandørpriser
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denne leverandørreferansen er allerede tilknyttet en referanse: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denne leverandørreferansen er allerede knyttet til et produkt: %s
 NoRecordedSuppliers=Ingen leverandør registrert
 SupplierPayment=Leverandørbetaling
 SuppliersArea=Leverandørområde
 RefSupplierShort=Ref. leverandør
 Availability=Tilgjengelighet
-ExportDataset_fournisseur_1=Leverandørfaktura-liste og faktura linjer
+ExportDataset_fournisseur_1=Leverandørfakturaer og faktura detaljer
 ExportDataset_fournisseur_2=Leverandørfakturaer og betalinger
-ExportDataset_fournisseur_3=Innkjøpsordrer og ordrelinjer
+ExportDataset_fournisseur_3=Innkjøpsordrer og bestillingsdetaljer
 ApproveThisOrder=Godkjenn denne innkjøpsordren
 ConfirmApproveThisOrder=Er du sikker på at du vil godkjenne ordre <b>%s</b>?
 DenyingThisOrder=Avvis denne ordren
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=Liste over produkter og priser for leverandør
 SentToSuppliers=Sendt til leverandører
 ListOfSupplierOrders=Liste over innkjøpsordrer
 MenuOrdersSupplierToBill=Innkjøpsordre til faktura
-NbDaysToDelivery=Leveringsforsinkelse i dager
-DescNbDaysToDelivery=Største leveringsforsinkelse av varer fra denne ordren
+NbDaysToDelivery=Leveringsforsinkelse (dager)
+DescNbDaysToDelivery=Den lengste leveringsforsinkelsen til produktene i denne ordre
 SupplierReputation=Leverandørens rykte
 DoNotOrderThisProductToThisSupplier=Ikke bestill
-NotTheGoodQualitySupplier=Feil kvalitet
+NotTheGoodQualitySupplier=Lav kvalitet
 ReputationForThisProduct=Rykte
 BuyerName=Kjøpernavn
 AllProductServicePrices=Alle vare-/tjenestepriser
-AllProductReferencesOfSupplier=Alle vare-/tjenestereferanser til leverandør
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Leverandørpriser
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index 64d36bf48d1..db72750d860 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Slettede
 
 # Dict
 Type=Type
-Category=Analytisk kode
 Severity=Alvorlighetsgrad
 
 # Email templates
@@ -128,11 +127,10 @@ TicketsAutoAssignTicket=Tilordne automatisk brukeren som opprettet supportseddel
 TicketsAutoAssignTicketHelp=Når du lager en supportseddel, kan brukeren automatisk tildeles billetten.
 TicketNumberingModules=Supportseddel nummereringsmodul
 TicketNotifyTiersAtCreation=Varsle tredjepart ved opprettelse
-TicketGroup=Gruppe
 TicketsDisableCustomerEmail=Slå alltid av e-post når en billett er opprettet fra det offentlige grensesnittet
 TicketsPublicNotificationNewMessage=Send e-post(er) når en ny melding legges til
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
+TicketPublicNotificationNewMessageDefaultEmail=E-postvarsler til (oppdatere)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
 #
 # Index & list page
@@ -162,7 +160,7 @@ CreatedBy=Laget av
 NewTicket=Ny supportseddel
 SubjectAnswerToTicket=Supportseddel-svar
 TicketTypeRequest=Forespørselstype
-TicketCategory=Analytisk kode
+TicketCategory=Gruppe
 SeeTicket=Se supportseddel
 TicketMarkedAsRead=Supportseddel merket som lest
 TicketReadOn=Les videre
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 51aab186f73..d3559aaf104 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Deaktivert i vedlikeholds-modus
 UserAccountancyCode=Bruker regnskapskode
 UserLogoff=Brukerutlogging
 UserLogged=Bruker innlogget
+DateOfEmployment=Ansettelsesdato
 DateEmployment=Ansettelse startdato
 DateEmploymentEnd=Ansettelse sluttdato
 CantDisableYourself=Du kan ikke deaktivere din egen brukeroppføring
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Tvunget friforespørsel-validator
 ValidatorIsSupervisorByDefault=Som standard er validatoren veileder for brukeren. Hold tom for å beholde denne oppførselen.
 UserPersonalEmail=Privat e-post
 UserPersonalMobile=Privat mobil
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 8f6644ef909..bb30c3c4339 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -16,7 +16,7 @@ WEBSITE_ROBOT=Robotfil (robots.txt)
 WEBSITE_HTACCESS=Nettstedets .htaccess-fil
 WEBSITE_MANIFEST_JSON=Nettstedets manifest.json-fil
 WEBSITE_README=README.md-fil
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
+WEBSITE_KEYWORDSDesc=Bruk et komma for å skille verdier
 EnterHereLicenseInformation=Skriv inn metadata eller lisensinformasjon for å arkivere en README.md-fil. Hvis du distribuerer nettstedet ditt som en mal, vil filen bli inkludert i mal-pakken.
 HtmlHeaderPage=HTML-header (kun for denne siden)
 PageNameAliasHelp=Navn eller alias på siden. <br> Dette aliaset brukes også til å lage en SEO-URL når nettsiden blir kjørt fra en virtuell vert til en webserver (som Apacke, Nginx, ...). Bruk knappen "<strong>%s</strong>" for å redigere dette aliaset.
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index d2efabf96c2..50f65e74855 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+SuppliersStandingOrdersArea=Betalinger med kredittoverføring
 StandingOrdersPayment=Direktedebet betalingsordre
 StandingOrderPayment=Direktedebet betalingsordre
 NewStandingOrder=Ny direktedebetsordre
@@ -10,8 +10,8 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direktedebetsordre
 WithdrawalReceipt=Direktedebiter ordre
-BankTransferReceipts=Credit transfer order
-BankTransferReceipt=Credit transfer order
+BankTransferReceipts=Credit transfer orders
+BankTransferReceipt=Kredittoverføringsordre
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Siste %s direktedebetslinjer
 WithdrawalsLine=Direct debit order line
@@ -21,11 +21,11 @@ CreditTransferLines=Credit transfer lines
 RequestStandingOrderToTreat=Requests for direct debit payment order to process
 RequestStandingOrderTreated=Requests for direct debit payment order processed
 RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+RequestPaymentsByBankTransferTreated=Forespørsler om kredittoverføring behandlet
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ennå ikke mulig. Tilbaketrekkings-status må være satt til 'kreditert' før fjerning fra spesifikke linjer.
 NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
 NbOfInvoiceToWithdrawWithInfo=Antall kundefakturaer med direktedebetsordre som har definert bankkontoinformasjon
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
+NbOfInvoiceToPayByBankTransfer=Antall kvalifiserte leverandørfakturaer som venter på betaling med kredittoverføring
 SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
 InvoiceWaitingWithdraw=Faktura som venter på direktedebet
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
@@ -34,9 +34,9 @@ NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoi
 NoSupplierInvoiceToWithdraw=Ingen leverandørfaktura med åpne 'Direkte kredittforespørsler' venter. Gå til fanen '%s' på fakturakortet for å sende en forespørsel.
 ResponsibleUser=Brukeransvarlig
 WithdrawalsSetup=Oppsett av direktedebetsbetalinger
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Oppsett av kredittoverføring
 WithdrawStatistics=Statistikk over direktedebetsbetalinger
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Kredittoverføringsstatistikk
 Rejects=Avvisninger
 LastWithdrawalReceipt=Siste %s direktedebetskvitteringer
 MakeWithdrawRequest=Foreta en direktedebet betalingsforespørsel
@@ -63,7 +63,9 @@ InvoiceRefused=Faktura avvist (Kunden skal belastes for avvisningen)
 StatusDebitCredit=Status debet/kreditt
 StatusWaiting=Venter
 StatusTrans=Sendt
+StatusDebited=Debited
 StatusCredited=Kreditert
+StatusPaid=Betalt
 StatusRefused=Nektet
 StatusMotif0=Uspesifisert
 StatusMotif1=Ikke nok midler
@@ -77,25 +79,26 @@ StatusMotif8=Annen grunn
 CreateForSepaFRST=Opprett direktedebetsfil (SEPA FRST)
 CreateForSepaRCUR=Opprett direktedebitfil (SEPA RCUR)
 CreateAll=Opprett direktedebetfil (alle)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
+CreateSepaFileForPaymentByBankTransfer=Opprett kreditoverføringsfil (SEPA)
 CreateGuichet=Bare kontor
 CreateBanque=Bare bank
 OrderWaiting=Venter på behandling
-NotifyTransmision=Overføring av tilbakekalling
-NotifyCredit=Kreditt tilbakekalling
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bankkontoer som bruker RIB
 WithBankUsingBANBIC=For bankkontoer som bruker IBAN/BIC/SWIFT
 BankToReceiveWithdraw=Mottakende bankkonto
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToPayCreditTransfer=Bankkonto brukt som betalingskilde
 CreditDate=Kreditt på
 WithdrawalFileNotCapable=Kan ikke ikke generere kvitteringsfil for tilbaketrekking for landet ditt %s (Landet er ikke støttet)
 ShowWithdraw=Vis direkte debitordre
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Men, hvis fakturaen har minst én avbestillingsordre som ikke er behandlet ennå, blir den ikke satt som betalt for å tillate tidligere håndtering av tilbaketrekninger.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Tilbaketrekkingsfil
+DoStandingOrdersBeforePayments=Denne fanen lar deg be om en betalingsordre med direkte belastning. Når du er ferdig, kan du gå til menyen Bank-> Betaling med direkte belastning for å generere og administrere direkte belastning. Når ordre med direkte belastning blir stengt, blir betaling på fakturaer automatisk registrert, og fakturaer stengt hvis resten til betaling er null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Sett status til "Fil Sendt"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistikk etter linjestatus
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Betalingstype
 ModeRECUR=Gjentakende betaling
 ModeFRST=Engangsbetaling
 PleaseCheckOne=Vennligs kryss av kun en
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direktedebet-ordre %s opprettet
 AmountRequested=Beløp forespurt
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Beløp: %s <br> Metode: %s <br> Dato: %s
 InfoRejectSubject=Direktedebet betalingsordre avvist
 InfoRejectMessage=Hei,<br><br>direktedebet betalingsordre av faktura %s tilhørende firma %s, med beløpet %s er blitt avvist av banken.<br><br>--<br>%s
 ModeWarning=Opsjon for reell-modus ble ikke satt, så vi stopper etter denne simuleringen
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/nb_NO/workflow.lang b/htdocs/langs/nb_NO/workflow.lang
index f171459979d..1c08b5b0b78 100644
--- a/htdocs/langs/nb_NO/workflow.lang
+++ b/htdocs/langs/nb_NO/workflow.lang
@@ -9,12 +9,15 @@ descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Opprett automatisk en kundefaktura når
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Opprett en kundefaktura automatisk etter at en kundeordre er stengt (ny faktura vil ha samme beløp som ordre)
 # Autoclassify customer proposal or order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassifiser tilknyttede kildetilbud til fakturert(e) når kundeordren er satt til fakturert (og hvis beløpet av bestillingen er det samme som totalbeløpet av signerte koblede tilbud)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klassifiser koblede kilde-tilbud som fakturert(t) når faktura er validert (og hvis fakturabeløpet er det samme som totalbeløpet av signerte tilbud)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klassifiser koblede kilde-tilbud som fakturert(e) når faktura er validert (og hvis fakturabeløpet er det samme som totalbeløpet av signerte tilbud)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassifiser koblede kilde-kundeordre som fakturert(t) når faktura er validert (og hvis fakturabeløpet er det samme som totalbeløpet av koblede ordrer)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassifiser koblede kilde-kundeordre som fakturert(t) når faktura er satt til betalt (og hvis fakturabeløpet er det samme som totalbeløpet av koblede ordrer)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassifiser koblet kilde-kundeordre til sendt når en forsendelse er validert (og hvis kvantitet som sendes av alle forsendelser, er det samme som i bestillingen som skal oppdateres)
-# Autoclassify supplier order
+# Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klassifiser tilsluttede kildeleverandørtilbud som fakturert når leverandørfaktura er validert (og hvis fakturabeløp er det samme som totalbeløp på koblede tilbud)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klassifiser kildekjøpsordre (kjøpsordre) som fakturert når leverandørfakturaen er validert (og hvis fakturabeløp er det samme som totalbeløp på koblede ordre)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatisk opprettelse
 AutomaticClassification=Automatisk klassifisering
diff --git a/htdocs/langs/nb_NO/zapier.lang b/htdocs/langs/nb_NO/zapier.lang
index 7793dff866f..5ab1b99ecf3 100644
--- a/htdocs/langs/nb_NO/zapier.lang
+++ b/htdocs/langs/nb_NO/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr-modul
 # Admin page
 #
 ZapierForDolibarrSetup = Oppsett av Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/ne_NP/accountancy.lang
+++ b/htdocs/langs/ne_NP/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/ne_NP/agenda.lang b/htdocs/langs/ne_NP/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/ne_NP/agenda.lang
+++ b/htdocs/langs/ne_NP/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/ne_NP/boxes.lang b/htdocs/langs/ne_NP/boxes.lang
index bd62684421a..d6fd298a3a7 100644
--- a/htdocs/langs/ne_NP/boxes.lang
+++ b/htdocs/langs/ne_NP/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/ne_NP/cashdesk.lang b/htdocs/langs/ne_NP/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/ne_NP/cashdesk.lang
+++ b/htdocs/langs/ne_NP/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/ne_NP/compta.lang b/htdocs/langs/ne_NP/compta.lang
index 8a8c837ac87..8f4f058bb87 100644
--- a/htdocs/langs/ne_NP/compta.lang
+++ b/htdocs/langs/ne_NP/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
diff --git a/htdocs/langs/ne_NP/contracts.lang b/htdocs/langs/ne_NP/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/ne_NP/contracts.lang
+++ b/htdocs/langs/ne_NP/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/ne_NP/errors.lang
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ne_NP/languages.lang b/htdocs/langs/ne_NP/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/ne_NP/languages.lang
+++ b/htdocs/langs/ne_NP/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/ne_NP/mails.lang b/htdocs/langs/ne_NP/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/ne_NP/mails.lang
+++ b/htdocs/langs/ne_NP/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang
index adbc443198f..0af5c66f0e0 100644
--- a/htdocs/langs/ne_NP/main.lang
+++ b/htdocs/langs/ne_NP/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/ne_NP/members.lang b/htdocs/langs/ne_NP/members.lang
index dd0a5bf49e2..5ef946ddf67 100644
--- a/htdocs/langs/ne_NP/members.lang
+++ b/htdocs/langs/ne_NP/members.lang
@@ -81,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/ne_NP/mrp.lang b/htdocs/langs/ne_NP/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/ne_NP/mrp.lang
+++ b/htdocs/langs/ne_NP/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/ne_NP/other.lang b/htdocs/langs/ne_NP/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/ne_NP/other.lang
+++ b/htdocs/langs/ne_NP/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/ne_NP/projects.lang b/htdocs/langs/ne_NP/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/ne_NP/projects.lang
+++ b/htdocs/langs/ne_NP/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/ne_NP/recruitment.lang b/htdocs/langs/ne_NP/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/ne_NP/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/ne_NP/stocks.lang b/htdocs/langs/ne_NP/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/ne_NP/stocks.lang
+++ b/htdocs/langs/ne_NP/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/ne_NP/suppliers.lang b/htdocs/langs/ne_NP/suppliers.lang
index b69b11272b4..51562b8bb7a 100644
--- a/htdocs/langs/ne_NP/suppliers.lang
+++ b/htdocs/langs/ne_NP/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ne_NP/ticket.lang b/htdocs/langs/ne_NP/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/ne_NP/ticket.lang
+++ b/htdocs/langs/ne_NP/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/ne_NP/users.lang b/htdocs/langs/ne_NP/users.lang
index 41a5ebd0981..25d9205457b 100644
--- a/htdocs/langs/ne_NP/users.lang
+++ b/htdocs/langs/ne_NP/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/ne_NP/withdrawals.lang b/htdocs/langs/ne_NP/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/ne_NP/withdrawals.lang
+++ b/htdocs/langs/ne_NP/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/ne_NP/workflow.lang b/htdocs/langs/ne_NP/workflow.lang
index be126eef0f4..299be277e1d 100644
--- a/htdocs/langs/ne_NP/workflow.lang
+++ b/htdocs/langs/ne_NP/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/ne_NP/zapier.lang b/htdocs/langs/ne_NP/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/ne_NP/zapier.lang
+++ b/htdocs/langs/ne_NP/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index 009d9292997..b9fa95882a3 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -1,12 +1,13 @@
 # Dolibarr language file - Source file is en_US - admin
+Publisher=Uitgever
 VersionLastInstall=Versie van eerste installatie
 FileCheck=Fileset Integriteitscontrole
 FileCheckDesc=Met deze tool kunt u de integriteit van bestanden en de instellingen van uw toepassing controleren door elk bestand te vergelijken met het officiële bestand. De waarde van sommige setup-constanten kan ook worden gecontroleerd. U kunt dit hulpprogramma gebruiken om te bepalen of bestanden zijn gewijzigd (bijvoorbeeld door een hacker).
+FileIntegrityIsStrictlyConformedWithReference=Bestandsintegriteit is strikt conform de referentie.
 FileIntegrityIsOkButFilesWereAdded=Controle van de integriteit van bestanden is verstreken, maar er zijn enkele nieuwe bestanden toegevoegd.
 FileIntegritySomeFilesWereRemovedOrModified=Controle van de integriteit van bestanden is mislukt. Sommige bestanden zijn gewijzigd, verwijderd of toegevoegd.
 GlobalChecksum=Globale checksum
 RemoteSignature=Remote distant handtekening (betrouwbaarder)
-FilesModified=Gewijzigde bestanden
 FilesAdded=Bestanden toegevoegd
 AvailableOnlyOnPackagedVersions=Het lokale bestand voor integriteitscontrole is alleen beschikbaar als de toepassing is geïnstalleerd vanuit een officieel pakket
 XmlNotFound=Xml-integriteitsbestand van toepassing niet gevonden
@@ -20,21 +21,32 @@ DBStoringCharset=Databasekarakterset voor het opslaan van gegevens
 DBSortingCharset=Databasekarakterset voor het sorteren van gegevens
 ClientCharset=Client-tekenset
 ClientSortingCharset=Klantverzameling
+WarningOnlyPermissionOfActivatedModules=Hier worden alleen de rechten van geactiveerde modules weergegeven. U kunt andere modules in het menu Home->Instellingen->Modules activeren.
+DolibarrSetup=Installatie of upgrade van Dolibarr
+GUISetup=Scherm
 UploadNewTemplate=Upload nieuwe template(s)
 RestoreLock=Herstel het bestand <b>%s</b> , met enkel leesrechten, om verder gebruik van de Update / Install-tool uit te schakelen.
 SecurityFilesDesc=Definieer opties met betrekking tot beveiliging voor het uploaden van bestanden.
+DictionarySetup=Woordenboek setup
+Dictionary=Woordenboeken
 DisableJavascript=Schakel JavaScript en Ajax-functies uit.
 DelaiedFullListToSelectCompany=Wacht tot een toets wordt ingedrukt voordat u de inhoud van de combinatielijst van derden laadt. <br> Dit kan de prestaties verbeteren als u een groot aantal derden hebt, maar het is minder handig.
 DelaiedFullListToSelectContact=Wacht tot een toets wordt ingedrukt voordat u de inhoud van de contact combinatie-lijst laadt. <br> Dit kan de prestaties verbeteren als u een groot aantal contacten hebt, maar het is minder handig)
 SearchString=Zoekopdracht
 AllowToSelectProjectFromOtherCompany=Op een document van een derde partij, kunt u een project kiezen dat is gekoppeld aan een andere derde partij
+UsePreviewTabs=Gebruik voorbeelweergavetabbladen
+ShowPreview=Toon voorbeelweergave
+CurrentTimeZone=Huidige Tijdszone
 TZHasNoEffect=Datums worden opgeslagen en geretourneerd door de databaseserver alsof ze worden bewaard als verzonden string. De tijdzone heeft alleen effect bij het gebruik van de UNIX_TIMESTAMP-functie (die niet door Dolibarr mag worden gebruikt, dus database TZ zou geen effect mogen hebben, zelfs als deze wordt gewijzigd nadat gegevens zijn ingevoerd).
 NextValueForDeposit=Volgende waarde (aanbetaling)
 UserSetup=Gebruikersbeheerinstellingen
 MultiCurrencySetup=Instellingen voor meerdere valuta
+AllMenus=Alle
 NotConfigured=Module/Applicatie is niet geconfigureerd
 OtherSetup=Overige instellingen
 LocalisationDolibarrParameters=Lokalisatieparameters
+PHPTZ=Tijdzone binnen de PHP server
+CurrentHour=Huidige tijd op server
 CurrentSessionTimeOut=Huidige sessietimeout
 YouCanEditPHPTZ=Om een andere PHP-tijdzone in te stellen (niet vereist), kunt u proberen een .htaccess-bestand toe te voegen met een regel als deze "SetEnv TZ Europe/Paris"
 HoursOnThisPageAreOnServerTZ=Waarschuwing, in tegenstelling tot andere schermen, zijn de uren op deze pagina niet in uw lokale tijdzone, maar in de tijdzone van de server.
@@ -56,6 +68,7 @@ NoBackupFileAvailable=Geen backupbestanden beschikbaar.
 ToBuildBackupFileClickHere=Om een backupbestand te maken, klik <a href="%s">hier</a>.
 CommandsToDisableForeignKeysForImportWarning=Verplicht als je je sql neerslag later wil gebruiken
 ExportUseMySQLQuickParameterHelp=De parameter '--quick' helpt het RAM-verbruik voor grote tabellen te beperken.
+MySqlExportParameters=MySQL exporteer instellingen
 ExportStructure=Struktuur
 NameColumn=Kollomennaam
 FeatureAvailableOnlyOnStable=Functie alleen beschikbaar op officiële stabiele versies
@@ -64,10 +77,9 @@ ModulesMarketPlaceDesc=Je kan meer modules vinden door te zoeken op andere exter
 ModulesMarketPlaces=Zoek externe app / modules
 ModulesDevelopYourModule=Ontwikkel je eigen app / modules
 SeeInMarkerPlace=Zie Marktplaats
-AchatTelechargement=Kopen / Downloaden
+Nouveauté=Nieuwigheid
 GoModuleSetupArea=Ga naar het gedeelte Module-instellingen om een nieuwe module te implementeren / installeren: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
 WebSiteDesc=Externe websites voor meer add-on (niet-basis) modules ...
 BoxesActivated=Geactiveerde widgets
 DoNotStoreClearPassword=Versleutel wachtwoorden opgeslagen in database (NIET als platte tekst). Het wordt sterk aanbevolen om deze optie te activeren.
@@ -96,6 +108,7 @@ MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS-poort (niet gedefinieer
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS-host (niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_EMAIL_FROM=E-mail afzender voor automatische e-mails (standaardwaarde in php.ini: <b>%s</b> )
 MAIN_MAIL_ERRORS_TO=E-mail gebruikt voor foutmeldingen retourneert e-mails (velden 'Errors-To' in verzonden e-mails)
+MAIN_MAIL_AUTOCOPY_TO=Kopieer (Bcc) alle verzonden e-mails naar
 MAIN_MAIL_SMTPS_ID=SMTP ID (als verzendende server authenticatie vereist)
 MAIN_MAIL_SMTPS_PW=SMTP-wachtwoord (als verzendende server verificatie vereist)
 MAIN_MAIL_EMAIL_TLS=Gebruik TLS (SSL) -versleuteling
@@ -107,7 +120,6 @@ MAIN_MAIL_SMS_FROM=Standaard telefoonnummer van afzender voor sms-verzending
 MAIN_MAIL_DEFAULT_FROMTYPE=Standaard afzender-e-mailadres voor handmatig verzenden (e-mailadres gebruiker of professionele e-mail)
 UserEmail=Email gebruiker
 CompanyEmail=Professionele e-mail
-SubmitTranslationENUS=Als de vertaling voor deze taal niet volledig is of een fout bevat, dan kunt u dit corrigeren door het bewuste taalbestand in de map <b>Langs/%s</b> te wijzigen en de wijzigingen op het Dolibarr forum te delen met anderen: www.dolibarr.org.
 ModulesSetup=Instellingen voor Modules / Applicaties
 ModuleFamilyProducts=Productbeheer (PM)
 ModuleFamilyHr=Personeelszaken (HR)
@@ -132,15 +144,13 @@ DescWeather=De volgende afbeeldingen worden op het dashboard weergegeven wanneer
 ConnectionTimeout=Time-out verbinding
 ModuleMustBeEnabledFirst=Module <b>%s</b> moet eerst worden ingeschakeld als u deze functie nodig hebt.
 NoSmsEngine=Geen SMS-afzenderbeheerder beschikbaar. Een SMS-afzenderbeheer is niet geïnstalleerd met de standaarddistributie omdat deze afhankelijk zijn van een externe leverancier, maar u kunt er enkele vinden op %s
-PDFDesc=Wereldwijde opties voor het genereren van PDF's.
-PDFAddressForging=Regels voor adresvakken
 HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot omzetbelasting / btw
 PDFRulesForSalesTax=Regels voor omzetbelasting / btw
-HideLocalTaxOnPDF=Tarief %s verbergen in de kolom Belastinguitverkoop
 HideDescOnPDF=Productbeschrijving verbergen
 HideRefOnPDF=Verberg ref. producten
 HideDetailsOnPDF=Verberg details van productlijnen
 PlaceCustomerAddressToIsoLocation=Gebruik de Franse standaardpositie (La Poste) voor de positie van het klantadres
+GetSecuredUrl=Get berekend URL
 ButtonHideUnauthorized=Knoppen verbergen voor niet-beheerders voor ongeautoriseerde acties in plaats van grijze uitgeschakelde knoppen te tonen
 MassConvert=Start bulkconversie
 Boolean=Boolean (één selectievakje)
@@ -151,7 +161,9 @@ ExtrafieldRadio=Radioknoppen (slechts één keuze)
 ExtrafieldCheckBox=checkboxes
 ExtrafieldCheckBoxFromList=Selectievakjes uit tabel
 LibraryToBuildPDF=Bibliotheek om PDF bestanden te genereren.
+RefreshPhoneLink=Herladen link
 SetAsDefault=Instellen als standaard
+BarcodeInitForProductsOrServices=Mass barcode init of reset voor producten of diensten
 NoDetails=Geen aanvullende details in voettekst
 DisplayCompanyInfo=Bedrijfsadres weergeven
 DisplayCompanyManagers=Namen van beheerders weergeven
@@ -160,16 +172,44 @@ ModuleCompanyCodePanicum=Retourneer een lege boekhoudcode.
 Module40Name=Verkoper
 Module1780Name=Labels/Categorien
 Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden)
+Permission22=Creëer / wijzig offertes
+Permission24=Valideer offertes
+Permission32=Creëer / wijzig producten / diensten
+Permission95=Bekijk de verslagen
+Permission161=Lees contracten/abonnementen
+Permission193=Regels beëindigen
+Permission204=Creëer links
 Permission221=Bekijk EMailings
+PermissionAdvanced251=Lees andere gebruikers
+Permission252=Creëren / wijzigen van andere gebruikers, groepen en rechten
+Permission255=Creëren / wijzigen eigen gebruikersgegevens
+Permission256=Wijzigen eigen wachtwoord
+Permission286=Contactpersonen Exporteren
 Permission1004=Bekijk voorraadmutaties
 Permission1005=Creëren / wijzigen voorraadmutaties
+Permission2502=Uploaden of verwijderen van documenten
+Permission2503=In te dienen of te verwijderen documenten
+Permission2515=Instellen documentabonneelijsten
+Permission50202=Import transacties
+DatabaseUser=Databasegebruikersnaam
+DatabasePassword=Databasewachwoord
+Skin=Uiterlijksthema
+DefaultSkin=Standaard uiterlijksthema
+CompanyCurrency=Belangrijkste valuta
 InfoWebServer=Over webserver
 InfoDatabase=Over de database
 AccountantFileNumber=Code voor boekhouder
 AvailableModules=Beschikbare app / modules
+ParameterActiveForNextInputOnly=De instelling word pas actief voor de volgende invoer
+YouMustEnableOneModule=Je moet minstens 1 module aktiveren
+BillsPDFModules=Factuur documentsjablonen
+LDAPGlobalParameters=Globale instellingen
+LDAPPassword=Beheerderswachtwoord
 SalariesSetup=Setup van module salarissen
 MailToSendProposal=Klant voorstellen
 MailToSendInvoice=Klantfacturen
+MailToSendReception=Ontvangen
+MailToThirdparty=Klant
 AddBoxes=Widgets toevoegen
 OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
 GeneralOptions=Algemene opties
diff --git a/htdocs/langs/nl_BE/agenda.lang b/htdocs/langs/nl_BE/agenda.lang
index fc56ebd9bba..264f28e932a 100644
--- a/htdocs/langs/nl_BE/agenda.lang
+++ b/htdocs/langs/nl_BE/agenda.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - agenda
 EventReports=Gebeurtenisrapporten
-ToUserOfGroup=Aan elke gebruiker in groep
 ViewPerType=Overzicht per type
 AgendaAutoActionDesc=Hier kunt u gebeurtenissen definiëren die u Dolibarr automatisch in Agenda wilt laten maken. Als er niets wordt gecontroleerd, worden alleen handmatige acties opgenomen in logboeken en weergegeven in Agenda. Automatisch bijhouden van zakelijke acties die worden uitgevoerd op objecten (validatie, statuswijziging), wordt niet opgeslagen.
 AgendaSetupOtherDesc=Deze pagina biedt opties voor het exporteren van uw Dolibarr-evenementen naar een externe agenda (Thunderbird, Google Agenda, enz.)
diff --git a/htdocs/langs/nl_BE/boxes.lang b/htdocs/langs/nl_BE/boxes.lang
index ec54c5aa572..030c0a528c9 100644
--- a/htdocs/langs/nl_BE/boxes.lang
+++ b/htdocs/langs/nl_BE/boxes.lang
@@ -24,3 +24,4 @@ BoxTitleLastModifiedPropals=Laatste %s gewijzigde offertes
 LastXMonthRolling=De laatste %s maand rollen
 ChooseBoxToAdd=Widget toevoegen aan uw dashbord
 BoxAdded=Widget is toegevoegd in je dashbord
+AccountancyHome=Boekhouding
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 34b534324fb..d99036d1bdf 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -19,7 +19,6 @@ FormatDateHourShort=%d-%m-%Y %H:%M
 FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-EmptySearchString=Enter non empty search criterias
 NoRecordFound=Geen record gevonden
 ErrorCanNotCreateDir=Kan dir %s niet maken
 ErrorCanNotReadDir=Kan dir %s niet lezen
@@ -72,9 +71,11 @@ PriceQtyMinHTCurrency=Prijs hoeveelheid min. (excl. BTW) (valuta)
 ActionRunningShort=Bezig
 Running=Bezig
 Categories=Tags / categorieën
+Category=Tag / categorie
 to=aan
 To=aan
 ApprovedBy2=Goedgekeurd door (tweede goedkeuring)
+Offered=Beschikbaar
 SetLinkToAnotherThirdParty=Link naar een derde partij
 SelectAction=Selecteer actie
 Deny=Weigeren
diff --git a/htdocs/langs/nl_BE/stocks.lang b/htdocs/langs/nl_BE/stocks.lang
index 4a966b06687..2606eb29f32 100644
--- a/htdocs/langs/nl_BE/stocks.lang
+++ b/htdocs/langs/nl_BE/stocks.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - stocks
-SelectProductInAndOutWareHouse=Kies een product, een aantal, een van-magazijn, een naar-magazijn, en klik "%s".  Als alle nodige bewegingen zijn aangeduid, klik op "%s".
 inventoryDraft=Actief
 inventoryConfirmCreate=Aanmaken
 inventoryDeleteLine=Verwijder lijn
diff --git a/htdocs/langs/nl_BE/ticket.lang b/htdocs/langs/nl_BE/ticket.lang
index d5d1f09c883..52a0a417fb8 100644
--- a/htdocs/langs/nl_BE/ticket.lang
+++ b/htdocs/langs/nl_BE/ticket.lang
@@ -19,7 +19,6 @@ Read=Lezen
 Assigned=Toegewezen
 InProgress=Bezig
 Closed=Afgesloten
-Category=Analytische code
 Severity=Strengheid
 TicketSetup=Installatie van ticketmodule
 TicketPublicAccess=Een openbare interface die geen identificatie vereist, is beschikbaar op de volgende URL
diff --git a/htdocs/langs/nl_BE/website.lang b/htdocs/langs/nl_BE/website.lang
index 05a97bd129a..e8f0a2d4af0 100644
--- a/htdocs/langs/nl_BE/website.lang
+++ b/htdocs/langs/nl_BE/website.lang
@@ -7,4 +7,3 @@ ViewSiteInNewTab=Bekijk de site in een nieuwe tab
 ViewPageInNewTab=Bekijk de pagina in een nieuwe tab
 SetAsHomePage=Zet als Homepagina
 ViewWebsiteInProduction=Bekijk website via de home URL's
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 81e55b3c1de..9d842f37068 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Sta toe om een verschillend aantal nullen aan het einde v
 BANK_DISABLE_DIRECT_INPUT=Rechtstreeks boeken van transactie in bankboek uitzetten
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Schakel concept export van het journaal in
 ACCOUNTANCY_COMBO_FOR_AUX=Combo-lijst inschakelen voor dochteronderneming-account (kan traag zijn als u veel externe partijen hebt)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Verkoopboek
 ACCOUNTING_PURCHASE_JOURNAL=Inkoopboek
@@ -188,7 +189,7 @@ Docref=Reference
 LabelAccount=Label account
 LabelOperation=Werking label
 Sens=D/C
-LetteringCode=Belettering code
+LetteringCode=Aflettercode
 Lettering=Afletteren
 Codejournal=Journaal
 JournalLabel=Journaal label
@@ -263,7 +264,7 @@ DescVentilDoneExpenseReport=Hier kunt u de lijst raadplegen van kostenregels met
 DescClosure=Raadpleeg hier het aantal bewegingen per maand die niet zijn gevalideerd en fiscale jaren die al open zijn
 OverviewOfMovementsNotValidated=Stap 1 / Overzicht van bewegingen niet gevalideerd. (Noodzakelijk om een boekjaar af te sluiten)
 ValidateMovements=Valideer wijzigingen
-DescValidateMovements=Elke wijziging of verwijdering van schrijven, belettering en verwijderingen is verboden. Alle inzendingen voor een oefening moeten worden gevalideerd, anders is afsluiten niet mogelijk
+DescValidateMovements=Elke wijziging of verwijdering van inboeken, afletteren en verwijderingen is verboden. Alle boekingen moeten worden gevalideerd, anders is afsluiten niet mogelijk
 SelectMonthAndValidate=Selecteer een maand en valideer bewerkingen
 
 ValidateHistory=Automatisch boeken
@@ -271,7 +272,7 @@ AutomaticBindingDone=Automatisch koppelen voltooid
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Boeking is niet in balans. Debet = %s | Credit = %s
-Balancing=Balancen
+Balancing=Balansen
 FicheVentilation=Koppelen card
 GeneralLedgerIsWritten=Grootboek transacties
 GeneralLedgerSomeRecordWasNotRecorded=Sommige transacties konden niet worden doorgeboekt. Als er geen andere foutmelding is, komt dit waarschijnlijk omdat ze reeds zijn doorgeboekt.
@@ -284,6 +285,7 @@ ShowTutorial=Handleiding weergeven
 NotReconciled=Niet afgestemd
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Categorieën  a-mass toepassen
 AddAccountFromBookKeepingWithNoCategories=Beschikbare rekening nog niet in de gepersonaliseerde groep
 CategoryDeleted=Categorie van deze grootboekrekening is verwijderd
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 3d21b2b8e17..ed10bfd1ad4 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Foundation=Stichting
 Version=Versie
-Publisher=Uitgever
+Publisher=Auteur
 VersionProgram=Programmaversie
 VersionLastInstall=Initiële installatie versie
 VersionLastUpgrade=Laatste versie upgrade
@@ -11,8 +11,8 @@ VersionUnknown=Onbekend
 VersionRecommanded=Aanbevolen
 FileCheck=Bestands integriteit controles
 FileCheckDesc=Met deze tool kunt u de integriteit van bestanden en de installatie van uw applicatie controleren door elk bestand met het officiële bestand te vergelijken. De waarde van sommige setup-constanten kan ook worden gecontroleerd. U kunt deze tool gebruiken om te bepalen of bestanden zijn gewijzigd (bijvoorbeeld door een hacker).
-FileIntegrityIsStrictlyConformedWithReference=Bestandsintegriteit is strikt conform de referentie.
-FileIntegrityIsOkButFilesWereAdded=Er heeft controle plaatsgevonden van de bestandsintegriteit, maar er zijn enkele nieuwe bestanden toegevoegd.
+FileIntegrityIsStrictlyConformedWithReference=Bestandsintegriteit is sterk conform de referentiebestanden.
+FileIntegrityIsOkButFilesWereAdded=Integriteitscontrole is geslaagd, echter zijn er nieuwe bestanden toegevoegd.
 FileIntegritySomeFilesWereRemovedOrModified=Controle op integriteit van de bestanden is mislukt. Sommige bestanden zijn gewijzigd, verwijderd of toegevoegd.
 GlobalChecksum=Globaal controlegetal
 MakeIntegrityAnalysisFrom=Maak integriteitsanalyse van toepassingsbestanden van
@@ -20,14 +20,14 @@ LocalSignature=Ingebedde lokale handtekening (minder betrouwbaar)
 RemoteSignature=Remote handtekening (betrouwbaarder)
 FilesMissing=Ontbrekende bestanden
 FilesUpdated=Bijgewerkte bestanden
-FilesModified=Bijgewerkte bestanden
+FilesModified=Gewijzigde bestanden
 FilesAdded=Toegevoegde bestanden
 FileCheckDolibarr=Controleer de integriteit van applicatiebestanden
 AvailableOnlyOnPackagedVersions=Het lokale bestand voor integriteitscontrole is alleen beschikbaar wanneer de toepassing wordt geïnstalleerd vanuit een officieel pakket
 XmlNotFound=Xml-integriteitsbestand van de toepassing is niet gevonden
 SessionId=Sessie-ID
 SessionSaveHandler=Wijze van sessieopslag
-SessionSavePath=sessie opslag location
+SessionSavePath=Sessie opslag locatie
 PurgeSessions=Verwijderen van sessies
 ConfirmPurgeSessions=Wilt u werkelijk alle sessies sluiten? Dit zal elke gebruikerssessie afbreken (behalve die van uzelf).
 NoSessionListWithThisHandler=Save session handler geconfigureerd in uw PHP staat niet toe dat alle lopende sessies worden vermeld.
@@ -35,7 +35,7 @@ LockNewSessions=Blokkeer nieuwe sessies
 ConfirmLockNewSessions=Weet je zeker dat je elke nieuwe Dolibarr-verbinding wilt beperken tot jezelf? Alleen gebruiker <b>%s</b> kan daarna verbinding maken.
 UnlockNewSessions=Verwijder sessieblokkering
 YourSession=Uw sessie
-Sessions=gebruikers sessie
+Sessions=Gebruikersessies
 WebUserGroup=Webserver gebruiker / groep
 NoSessionFound=Uw PHP-configuratie lijkt geen lijst van actieve sessies toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beschermd (bijvoorbeeld door OS-machtigingen of door PHP-richtlijn open_basedir).
 DBStoringCharset=Database karakterset voor het opslaan van gegevens
@@ -44,13 +44,13 @@ HostCharset=Host-tekenset
 ClientCharset=Cliënt tekenset
 ClientSortingCharset=Cliënt vergelijking
 WarningModuleNotActive=<b>Module %s</b> dient te worden ingeschakeld
-WarningOnlyPermissionOfActivatedModules=Hier worden alleen de rechten van geactiveerde modules weergegeven. U kunt andere modules in het menu Home->Instellingen->Modules activeren.
-DolibarrSetup=Installatie of upgrade van Dolibarr
+WarningOnlyPermissionOfActivatedModules=Hier worden alleen de rechten van geactiveerde modules weergegeven. U kunt andere modules activeren  in het menu Home > Instellingen > Modules
+DolibarrSetup=Installatie of update van Dolibarr
 InternalUser=Interne gebruiker
 ExternalUser=Externe gebruiker
 InternalUsers=Interne gebruikers
 ExternalUsers=Externe gebruikers
-GUISetup=Scherm
+GUISetup=Weergave
 SetupArea=Instellingen
 UploadNewTemplate=Nieuwe template(s) uploaden
 FormToTestFileUploadForm=Formulier waarmee bestandsupload kan worden getest (afhankelijk van de gekozen opties)
@@ -62,8 +62,8 @@ SecurityFilesDesc=Definieer hier de opties met betrekking tot beveiliging bij he
 ErrorModuleRequirePHPVersion=Fout, deze module vereist PHP versie %s of hoger.
 ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s of hoger.
 ErrorDecimalLargerThanAreForbidden=Fout, een nauwkeurigheid van meer dan <b>%s</b> wordt niet ondersteund.
-DictionarySetup=Woordenboek setup
-Dictionary=Woordenboeken
+DictionarySetup=Veldwaarde instellingen
+Dictionary=Veld waarden
 ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem.  Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen.
 ErrorCodeCantContainZero=Code mag geen 0 bevatten
 DisableJavascript=Schakel JavaScript en AJAX-functionaliteit uit
@@ -78,12 +78,12 @@ SearchString=Zoekstring
 NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit uitgeschakeld is
 AllowToSelectProjectFromOtherCompany=Bij een document van een relatiej, kan een project worden gekozen dat is gekoppeld aan een relatie
 JavascriptDisabled=JavaScript uitgeschakeld
-UsePreviewTabs=Gebruik voorbeelweergavetabbladen
-ShowPreview=Toon voorbeelweergave
+UsePreviewTabs=Gebruik voorbeeld tabbladen
+ShowPreview=Toon voorbeeldweergave
 PreviewNotAvailable=Voorbeeldweergave niet beschikbaar
 ThemeCurrentlyActive=Huidige thema
-CurrentTimeZone=Huidige Tijdszone
-MySQLTimeZone=Tijdzone(database)
+CurrentTimeZone=Huidige tijdzone (server)
+MySQLTimeZone=Huidige tijdzone (database)
 TZHasNoEffect=Datums worden opgeslagen en geretourneerd door de databaseserver alsof ze werden bewaard als ingeleverde reeks. De tijdzone heeft alleen effect wanneer de UNIX_TIMESTAMP-functie wordt gebruikt (die niet door Dolibarr zou moeten worden gebruikt, dus database-TZ zou geen effect moeten hebben, zelfs als deze werd gewijzigd nadat gegevens waren ingevoerd).
 Space=Ruimte
 Table=Tabel
@@ -110,7 +110,7 @@ MenuLimits=Limieten en nauwkeurigheid
 MenuIdParent=ID van het bovenliggende menu
 DetailMenuIdParent=ID van het bovenliggend menu (0 voor een hoogste menu)
 DetailPosition=Sorteren aantal te definiëren menupositie
-AllMenus=Alle
+AllMenus=Alles
 NotConfigured=Module/applicatie niet geconfigureerd
 Active=Actief
 SetupShort=Instellingen
@@ -120,15 +120,15 @@ CurrentValueSeparatorDecimal=Decimaal scheidingsteken
 CurrentValueSeparatorThousand=Duizend scheidingsteken
 Destination=Bestemming
 IdModule=Module ID
-IdPermissions=Permissions ID
+IdPermissions=Rechten ID
 LanguageBrowserParameter=Instelling %s
 LocalisationDolibarrParameters=Localisatie-instellingen
 ClientTZ=Tijdzone van de klant (gebruiker)
 ClientHour=Tijd bij de klant (gebruiker)
-OSTZ=Server OS Time Zone
-PHPTZ=Tijdzone binnen de PHP server
+OSTZ=Server OS tijdzone
+PHPTZ=Tijdzone PHP server
 DaylingSavingTime=Zomertijd (gebruiker)
-CurrentHour=Huidige tijd op server
+CurrentHour=Huidige tijd (server)
 CurrentSessionTimeOut=Huidige sessie timeout
 YouCanEditPHPTZ=Om een ​​andere PHP-tijdzone in te stellen (niet verplicht), kunt u proberen een .htaccess-bestand toe te voegen met de volgende regel: "SetEnv TZ Europe / Paris"
 HoursOnThisPageAreOnServerTZ=Waarschuwing, in tegenstelling tot andere schermen, bevinden de uren op deze pagina zich niet in uw lokale tijdzone, maar in de tijdzone van de server.
@@ -181,7 +181,7 @@ CommandsToDisableForeignKeysForImportWarning=Verplicht als je je SQL dump later
 ExportCompatibility=Uitwisselbaarheid (compatibiliteit) van het gegenereerde exportbestand
 ExportUseMySQLQuickParameter=Gebruik de parameter --quick
 ExportUseMySQLQuickParameterHelp=De parameter "--quick" helpt het RAM-verbruik voor grote tabellen te beperken.
-MySqlExportParameters=MySQL exporteer instellingen
+MySqlExportParameters=MySQL export instellingen
 PostgreSqlExportParameters= PostgreSQL uitvoer parameters
 UseTransactionnalMode=Gebruik transactionele modus
 FullPathToMysqldumpCommand=Het volledige pad naar het 'MySQL dump' commando
@@ -212,11 +212,11 @@ FreeModule=Gratis
 CompatibleUpTo=Compatibel met versie %s
 NotCompatible=Deze module lijkt niet compatibel met uw Dolibarr %s (Min %s - Max %s).
 CompatibleAfterUpdate=Deze module vereist een update van uw Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=Zie op de Marktplaats
+SeeInMarkerPlace=Bekijk in winkel
 SeeSetupOfModule=Zie setup van module%s
 Updated=Bijgewerkt
-Nouveauté=Nieuwigheid
-AchatTelechargement=Kopen/Downloaden
+Nouveauté=Nieuwsitems
+AchatTelechargement=Kopen / Downloaden
 GoModuleSetupArea=Ga naar het gedeelte Module-instellingen om een nieuwe module te implementeren/installeren: <a href="%s">%s</a> .
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules.
 DoliPartnersDesc=Lijst met bedrijven die op maat ontwikkelde modules of functies leveren. <br>Opmerking: aangezien Dolibarr een open source-applicatie is, moet <i>iedereen</i> die ervaring heeft met PHP-programmering een module moeten kunnen ontwikkelen.
@@ -280,7 +280,7 @@ MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS-poort (niet gedefinieerd
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (niet gedefinieerd in PHP op Unix-achtige systemen)
 MAIN_MAIL_EMAIL_FROM=E-mail afzender voor automatische e-mails (standaardwaarde in php.ini: <b>%s</b>)
 MAIN_MAIL_ERRORS_TO=E-mailadres voor gebruikt foute e-mails (velden 'Fout-Aan' in verzonden e-mails)
-MAIN_MAIL_AUTOCOPY_TO= Kopieer (Bcc) alle verzonden e-mails naar
+MAIN_MAIL_AUTOCOPY_TO= Kopieer (BCC) alle verzonden e-mails naar
 MAIN_DISABLE_ALL_MAILS=Schakel alle e-mailverzending uit (voor testdoeleinden of demo's)
 MAIN_MAIL_FORCE_SENDTO=Stuur alle e-mails naar (in plaats van echte ontvangers, voor testdoeleinden)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=Stel e-mails van werknemers (indien gedefinieerd) voor in de lijst met vooraf gedefinieerde ontvangers bij het schrijven van een nieuwe e-mail
@@ -296,12 +296,13 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Persoonlijke sleutel voor dkim-ondertekening
 MAIN_DISABLE_ALL_SMS=Schakel alle sms-verzending uit (voor testdoeleinden of demo's)
 MAIN_SMS_SENDMODE=Methode te gebruiken om SMS te verzenden
 MAIN_MAIL_SMS_FROM=Standaard afzender telefoonnummer voor SMS-verzending
-MAIN_MAIL_DEFAULT_FROMTYPE=Standaard afzender e-mail voor handmatig verzenden (e-mailadres gebruiker of bedrijfs e-mail)
+MAIN_MAIL_DEFAULT_FROMTYPE=Standaard afzender e-mail voor handmatig verzenden (gebruikers e-mail of bedrijf e-mail)
 UserEmail=E-mailadres gebruiker
 CompanyEmail=E-mailadres bedrijf
 FeatureNotAvailableOnLinux=Functionaliteit niet beschikbaar op Unix-achtige systemen. Test uw lokale 'sendmail' programma.
+FixOnTransifex=Verbeter de vertaling op het online vertaalplatform van het project
 SubmitTranslation=Als de vertaling voor deze taal niet compleet is of als u fouten vindt, kunt u dit corrigeren door bestanden in directory <b>langs / %s te bewerken</b> en uw wijziging in te dienen op www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Als vertaling voor deze taal niet compleet is of als u fouten aantreft, kunt u dit corrigeren door bestanden in map <b>langs / %s</b> te bewerken en gewijzigde bestanden in te dienen op dolibarr.org/forum of voor ontwikkelaars op github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=Als de vertaling voor deze taal niet compleet is of als je fouten tegenkomt, kun je dit corrigeren door bestanden te bewerken in de directory <b> langs / %s </b> en aangepaste bestanden in te dienen op dolibarr.org/forum of, als je een ontwikkelaar bent, met een PR op github .com / Dolibarr / dolibarr
 ModuleSetup=Module-instellingen
 ModulesSetup=Instellingen van modules & applicatie
 ModuleFamilyBase=Systeem
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> moet eerst worden ingeschakeld als je
 SecurityToken=Sleutel tot URL beveiligen
 NoSmsEngine=Geen SMS-afzende-rbeheerder beschikbaar. Een SMS-afzenderbeheer is niet geïnstalleerd met de standaarddistributie omdat deze afhankelijk zijn van een externe leverancier, maar u kunt er enkele vinden op %s
 PDF=PDF
-PDFDesc=Globale opties voor het genereren van een PDF
-PDFAddressForging=Regels voor adresbox
+PDFDesc=Algemene opties voor het genereren van PDF's
+PDFAddressForging=Regels voor adres sectie
 HideAnyVATInformationOnPDF=Verberg alle informatie met betrekking tot omzetbelasting / BTW
 PDFRulesForSalesTax=Regels voor omzet-belasting/btw
 PDFLocaltax=Regels voor %s
-HideLocalTaxOnPDF=Tarief %s verbergen in de BTW-kolom
+HideLocalTaxOnPDF=Verberg het %s-tarief in de kolom Verkoopbelasting / btw
 HideDescOnPDF=Verberg productomschrijving
 HideRefOnPDF=Verberg productreferentie
 HideDetailsOnPDF=Verberg productdetails
@@ -400,7 +401,7 @@ Library=Bibliotheek
 UrlGenerationParameters=Parameters om URL beveiligen
 SecurityTokenIsUnique=Gebruik een unieke securekey parameter voor elke URL
 EnterRefToBuildUrl=Geef referentie voor object %s
-GetSecuredUrl=Get berekend URL
+GetSecuredUrl=Get berekende URL
 ButtonHideUnauthorized=Verberg de knoppen voor niet-beheerders bij ongeoorloofde acties in plaats van grijs gekleurde, uitgeschakelde knoppen
 OldVATRates=Oud BTW tarief
 NewVATRates=Nieuw BTW tarief
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefin
 MassConvert=Start conversie
 PriceFormatInCurrentLanguage=Prijsindeling in huidige taal
 String=String
+String1Line=String (1 regel)
 TextLong=Lange tekst
+TextLongNLines=Lange tekst (n regels)
 HtmlText=HTML-tekst
 Int=Integer
 Float=Float
@@ -443,7 +446,7 @@ LibraryToBuildPDF=Gebruikte library voor generen PDF
 LocalTaxDesc=Sommige landen kunnen twee of drie belastingen toepassen op elke factuurregel. Als dit het geval is, kiest u het type voor de tweede en derde belasting en het tarief. Mogelijk type zijn: <br> 1: lokale belasting van toepassing op producten en diensten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 2: lokale belasting van toepassing op producten en diensten inclusief btw (lokale belasting wordt berekend op bedrag + hoofdbelasting) <br> 3: lokale belasting van toepassing op producten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 4: lokale belasting van toepassing op producten inclusief btw (lokale belasting wordt berekend op bedrag + hoofd btw) <br> 5: lokale belasting van toepassing op diensten zonder btw (lokale belasting wordt berekend op bedrag zonder btw) <br> 6: lokale belasting van toepassing op diensten inclusief btw (lokale belasting wordt berekend op bedrag + belasting)
 SMS=SMS
 LinkToTestClickToDial=Geef een telefoonnummer om de ClickToDial link te testen voor gebruiker <strong>%s</strong>
-RefreshPhoneLink=Herladen link
+RefreshPhoneLink=Refresh link
 LinkToTest=Klikbare link gegenereerd voor <strong>gebruiker% s</strong> (klik telefoonnummer om te testen)
 KeepEmptyToUseDefault=Laat leeg om standaardwaarde te gebruiken
 KeepThisEmptyInMostCases=In de meeste gevallen kunt u dit veld leeglaten.
@@ -452,8 +455,8 @@ SetAsDefault=Gebruik standaard
 ValueOverwrittenByUserSetup=Waarschuwing, deze waarde kan worden overschreven door de gebruiker specifieke setup (elke gebruiker kan zijn eigen ClickToDial url ingestellen)
 ExternalModule=Externe module
 InstalledInto=Geïnstalleerd in directory %s
-BarcodeInitForThirdparties=Massa streepjescode initialisatie relaties
-BarcodeInitForProductsOrServices=Mass barcode init of reset voor producten of diensten
+BarcodeInitForThirdparties=Massa streepjescode init voor derde partijen
+BarcodeInitForProductsOrServices=Massa barcode init of reset voor producten of diensten
 CurrentlyNWithoutBarCode=Momenteel hebt u een <strong>%s</strong> record op <strong>%s</strong>%s zonder gedefinieerde streepjescode.
 InitEmptyBarCode=Init waarde voor de volgende %s lege records
 EraseAllCurrentBarCode=Wis alle huidige barcode waarden
@@ -465,7 +468,7 @@ ShowDetailsInPDFPageFoot=Voeg meer details toe in de voettekst, zoals bedrijfsad
 NoDetails=Geen extra details in footer
 DisplayCompanyInfo=Toon adresgegevens van het bedrijf
 DisplayCompanyManagers=Toon namen managers
-DisplayCompanyInfoAndManagers=Geef adresgegevens en namen manager weer
+DisplayCompanyInfoAndManagers=Geef adresgegevens bedrijf en namen manager weer
 EnableAndSetupModuleCron=Als u deze terugkerende factuur automatisch wilt laten genereren, moet module *%s* zijn ingeschakeld en correct zijn ingesteld. Anders moet het genereren van facturen handmatig worden uitgevoerd vanuit deze sjabloon met de knop * Maken *. Merk op dat zelfs als u automatisch genereren hebt ingeschakeld, u nog steeds veilig handmatig genereren kunt starten. Het genereren van duplicaten voor dezelfde periode is niet mogelijk.
 ModuleCompanyCodeCustomerAquarium=%s gevolgd door klantcode voor een klantaccountingcode
 ModuleCompanyCodeSupplierAquarium=%s gevolgd door leverancierscode voor een leveranciers boekhoudcode
@@ -543,9 +546,9 @@ Module54Desc=Beheer van contracten (diensten of terugkerende abonnementen)
 Module55Name=Streepjescodes
 Module55Desc=Streepjescodesbeheer
 Module56Name=Betaling via overschrijving
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
 Module57Name=Betalingen via automatische incasso
-Module57Desc=Beheer van betalingsopdrachten voor automatische incasso. Het omvat het genereren van SEPA-bestanden voor Europese landen.
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc)
 Module59Name=Bookmark4u
@@ -674,14 +677,14 @@ Permission15=Afnemersfacturen verzenden via e-mail
 Permission16=Creëer betalingen voor afnemersfacturen
 Permission19=Verwijder afnemersfacturen
 Permission21=Bekijk offertes
-Permission22=Creëer / wijzig offertes
-Permission24=Valideer offertes
+Permission22=Maak / wijzig offertes
+Permission24=Bevestig offertes
 Permission25=Stuur offertes
 Permission26=Sluit offertes
 Permission27=Verwijder offertes
 Permission28=Exporteer offertes
 Permission31=Bekijk producten / diensten
-Permission32=Creëer / wijzig producten / diensten
+Permission32=Maak / wijzig producten en diensten
 Permission34=Verwijderen producten / diensten
 Permission36=Exporteer producten / diensten
 Permission38=Export producten
@@ -711,7 +714,7 @@ Permission91=Lees sociale of fiscale belastingen en BTW
 Permission92=Aanmaken/wijzigen van sociale of fiscale belastingen en BTW
 Permission93=Verwijderen van sociale of fiscale belastingen en BTW
 Permission94=Exporteer sociale of fiscale belastingen
-Permission95=Bekijk de verslagen
+Permission95=Bekijk de rapporten
 Permission101=Bekijk verzendingen
 Permission102=Creëer / wijzig verzendingen
 Permission104=Valideer verzendingen
@@ -737,7 +740,7 @@ Permission151=Inlezen incasso-opdracht
 Permission152=Aanmaken/aanpassen incasso-opdracht
 Permission153=Versturen/verzenden incasso-opdrachten
 Permission154=Credits / afwijzingen van betalingsopdrachten voor automatische incasso opnemen
-Permission161=Lees contracten/abonnementen
+Permission161=Bekijk contracten/abonnementen
 Permission162=Creëren/aanpassen contracten/abonnementen
 Permission163=Een dienst/abonnement van een contract activeren
 Permission164=Een dienst/abonnement van een contract uitschakelen
@@ -751,18 +754,18 @@ Permission178=Exporteer reis- en onkosten
 Permission180=Bekijk leveranciers
 Permission181=Lees inkooporders
 Permission182=Bestellingen maken/wijzigen
-Permission183=Bestellingen valideren
+Permission183=Bestellingen bevestigen
 Permission184=Bestellingen goedkeuren
 Permission185=Verwerk of annuleer inkooporders
 Permission186=Ontvang inkooporders
 Permission187=Aankooporders sluiten
 Permission188=Annuleer inkooporders
 Permission192=Regels aanmaken
-Permission193=Regels beëindigen
+Permission193=Regels annuleren
 Permission194=Lees de bandbreedtelijnen
 Permission202=Creëer DSL-aansluitingen
 Permission203=links inzien
-Permission204=Creëer links
+Permission204=Order verbindingen
 Permission205=Beheer links
 Permission206=Bladeren links
 Permission211=Consult telefonie
@@ -782,13 +785,13 @@ Permission242=Creëren / wijzigen categorieën
 Permission243=Verwijderen categorieën
 Permission244=Zie de inhoud van de verborgen categorieën
 Permission251=Bekijk de andere gebruikers en groepen
-PermissionAdvanced251=Lees andere gebruikers
-Permission252=Creëren / wijzigen van andere gebruikers, groepen en rechten
+PermissionAdvanced251=Bekijk andere gebruikers
+Permission252=Rechten van andere gebruikers bekijken
 Permission253=Maak / wijzig andere gebruikers, groepen en machtigingen
 PermissionAdvanced253=Creëer / wijzig de rechten van internet / externe gebruikers
 Permission254=Verwijderen of uitschakelen van andere gebruikers
-Permission255=Creëren / wijzigen eigen gebruikersgegevens
-Permission256=Wijzigen eigen wachtwoord
+Permission255=Wachtwoord andere gebruikers wijzigen
+Permission256=Andere gebruikers verwijderen of uitschakelen
 Permission262=Toegang uitbreiden tot alle derde partijen (niet alleen derde partijen waarvoor die gebruiker een verkoopvertegenwoordiger is). <br> Niet effectief voor externe gebruikers (altijd beperkt tot zichzelf voor voorstellen, bestellingen, facturen, contracten, enz.). <br> Niet effectief voor projecten (alleen regels over projectmachtigingen, zichtbaarheid en toewijzingsaangelegenheden).
 Permission271=Lees CA
 Permission272=Facturen inzien
@@ -796,7 +799,7 @@ Permission273=Facturen uitgeven
 Permission281=Bekijk contactpersonen
 Permission282=Creëren / wijzigen contactpersonen
 Permission283=Contactpersonen verwijderen
-Permission286=Contactpersonen Exporteren
+Permission286=Contactpersonen exporteren
 Permission291=Tarieven inzien
 Permission292=Stel rechten voor tarieven in
 Permission293=Wijzig klant-tarieven
@@ -836,9 +839,16 @@ Permission532=Creëren / wijzigen van diensten
 Permission534=Diensten verwijderen
 Permission536=Inzien / beheren van verborgen diensten
 Permission538=Diensten exporteren
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Lees stuklijsten
 Permission651=Materiaalrekeningen maken / bijwerken
 Permission652=Materiaalrekeningen verwijderen
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Bekijk donaties
 Permission702=Creëren / wijzigen donaties
 Permission703=Verwijderen donaties
@@ -848,6 +858,8 @@ Permission773=Verwijderen onkostennota's
 Permission774=Lees alle onkostennota's (ook voor de gebruiker niet ondergeschikten)
 Permission775=Goedkeuren onkostennota's
 Permission776=Betalen onkostennota's
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export onkostennota's
 Permission1001=Bekijk voorraden
 Permission1002=Toevoegen/wijzigen van een magazijn
@@ -861,7 +873,7 @@ Permission1109=Ontvangstbewijzen verwijderen
 Permission1121=Lees leveranciersvoorstellen
 Permission1122=Leveranciersvoorstellen maken / wijzigen
 Permission1123=Valideer leveranciersvoorstellen
-Permission1124=Stuur leveranciersvoorstellen
+Permission1124=Verzend leveranciersvoorstellen
 Permission1125=Verwijder leveranciersvoorstellen
 Permission1126=Prijsaanvragen leverancier sluiten
 Permission1181=Bekijk leveranciers
@@ -894,12 +906,13 @@ Permission2412=Creëer/delete acties (gebeurtenissen of taken) van anderen
 Permission2413=Wijzig acties (gebeurtenissen of taken) van anderen
 Permission2414=Acties / taken van anderen exporteren
 Permission2501=Inzien van documenten
-Permission2502=Uploaden of verwijderen van documenten
-Permission2503=In te dienen of te verwijderen documenten
-Permission2515=Instellen documentabonneelijsten
+Permission2502=Download document
+Permission2503=Indienen of verwijderen van documenten
+Permission2515=Stel document mappen in
 Permission2801=Gebruik FTP-client in lees modus (enkel verkennen en downloaden)
 Permission2802=Gebruik FTP-client in schrijf modus (verwijderen of bestanden uploaden)
 Permission3200=Lees gearchiveerde evenementen en vingerafdrukken
+Permission3301=Generate new modules
 Permission4001=Bekijk medewerkers
 Permission4002=Creëer medewerkers
 Permission4003=Verwijder werknemers
@@ -921,7 +934,7 @@ Permission23003=Verwijder geplande taak
 Permission23004=Voer geplande taak uit
 Permission50101=Gebruik Point Of Sale
 Permission50201=Lees transacties
-Permission50202=Import transacties
+Permission50202=Importeer transacties
 Permission50401=Bind producten en facturen met boekhoudrekeningen
 Permission50411=Bewerkingen lezen in grootboek
 Permission50412=Bewerkingen schrijven / bewerken in het grootboek
@@ -947,13 +960,14 @@ Permission63003=Verwijder resources
 Permission63004=Koppel middelen aan agenda-evenementen
 DictionaryCompanyType=Relatietype
 DictionaryCompanyJuridicalType=Externe rechtspersonen
-DictionaryProspectLevel=Prospectpotentieel
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potentieel niveau voor contacten
 DictionaryCanton=Staten / Provincies
 DictionaryRegion=Regio
 DictionaryCountry=Landen
 DictionaryCurrency=Valuta
-DictionaryCivility=Eervolle titels
-DictionaryActions=Agenda evenementen
+DictionaryCivility=Aanspreekvormen
+DictionaryActions=Agenda items
 DictionarySocialContributions=Soorten sociale of fiscale belastingen
 DictionaryVAT=BTW-tarieven of Verkoop Tax tarieven
 DictionaryRevenueStamp=Aantal belastingzegels
@@ -972,12 +986,13 @@ DictionaryOrderMethods=Bestel methodes
 DictionarySource=Oorsprong van offertes / bestellingen
 DictionaryAccountancyCategory=Gepersonaliseerde groepen voor rapporten
 DictionaryAccountancysystem=Modellen voor rekeningschema
-DictionaryAccountancyJournal=Daboeken
+DictionaryAccountancyJournal=Dagboeken
 DictionaryEMailTemplates=E-mailsjablonen
 DictionaryUnits=Eenheden
 DictionaryMeasuringUnits=Meeteenheden
 DictionarySocialNetworks=Sociale netwerken
-DictionaryProspectStatus=Prospectstatus
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect-status voor contacten
 DictionaryHolidayTypes=Soorten verlof
 DictionaryOpportunityStatus=Leadstatus voor project / lead
 DictionaryExpenseTaxCat=Onkostenoverzicht - Vervoerscategorieën
@@ -1053,8 +1068,8 @@ Database=Database
 DatabaseServer=Databasehost
 DatabaseName=Databasenaam
 DatabasePort=Databasepoort
-DatabaseUser=Databasegebruikersnaam
-DatabasePassword=Databasewachwoord
+DatabaseUser=Database gebruikersnaam
+DatabasePassword=Database wachtwoord
 Tables=Tabellen
 TableName=Tabelnaam
 NbOfRecord=Aantal records
@@ -1065,8 +1080,8 @@ SummaryConst=Lijst van alle Dolibarr-instellingen
 MenuCompanySetup=Bedrijf/Organisatie
 DefaultMenuManager= standaard menuverwerker
 DefaultMenuSmartphoneManager=standaard smartphonemenuverwerker
-Skin=Uiterlijksthema
-DefaultSkin=Standaard uiterlijksthema
+Skin=Thema
+DefaultSkin=Standaard thema
 MaxSizeList=Maximale lijstlengte
 DefaultMaxSizeList=Standaard maximum lengte voor lijsten
 DefaultMaxSizeShortList=Standaard maximale lengte voor korte lijsten (bijv. In klantenkaart)
@@ -1076,7 +1091,7 @@ LoginPage=Inlogpagina
 BackgroundImageLogin=Achtergrond afbeelding
 PermanentLeftSearchForm=Permanent zoekformulier in linker menu
 DefaultLanguage=Standaard taal
-EnableMultilangInterface=Ondersteuning voor meerdere talen inschakelen
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Toon het bedrijfslogo in het menu
 CompanyInfo=Bedrijf/Organisatie
 CompanyIds=Bedrijfs-/organisatie-identiteiten
@@ -1085,7 +1100,7 @@ CompanyAddress=Adres
 CompanyZip=Postcode
 CompanyTown=Plaats
 CompanyCountry=Land
-CompanyCurrency=Belangrijkste valuta
+CompanyCurrency=Hoofdvaluta
 CompanyObject=Soort bedrijf
 IDCountry=ID land
 Logo=Logo
@@ -1165,7 +1180,7 @@ MAIN_MAX_DECIMALS_SHOWN=Max. decimalen voor prijzen <b>op het scherm</b> . Voeg
 MAIN_ROUNDING_RULE_TOT=Stap van afrondingsbereik (voor landen waar het afronden op iets anders dan op basis 10 wordt uitgevoerd. Zet bijvoorbeeld 0,05 als afronden wordt uitgevoerd met 0,05 stappen)
 UnitPriceOfProduct=Prijs per eenheid van een product
 TotalPriceAfterRounding=Totale prijs (excl / btw / incl btw) na afronding
-ParameterActiveForNextInputOnly=De instelling word pas actief voor de volgende invoer
+ParameterActiveForNextInputOnly=De instelling wordt pas actief voor de volgende invoer
 NoEventOrNoAuditSetup=Er is geen beveiligingsgebeurtenis vastgelegd. Dit is normaal als Audit niet is ingeschakeld op de pagina &quot;Setup - Beveiliging - Gebeurtenissen&quot;.
 NoEventFoundWithCriteria=Er zijn geen beveiligingsgebeurtenissen gevonden voor deze zoekcriteria.
 SeeLocalSendMailSetup=Controleer de instellingen van uw lokale "sendmail"-programma
@@ -1240,8 +1255,9 @@ WarningAtLeastKeyOrTranslationRequired=Een zoekcriterium is minimaal vereist voo
 NewTranslationStringToShow=Weergeven nieuwe vertaal string
 OriginalValueWas=De originele vertaling is overschreven. Oorspronkelijke waarde was: <br><br> %s
 TransKeyWithoutOriginalValue=U hebt een nieuwe vertaling geforceerd voor de vertaalsleutel &#39; <strong>%s</strong> &#39; die in geen enkele taalbestand bestaat
-TotalNumberOfActivatedModules=Geactiveerde applicaties/modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=Je moet minstens 1 module aktiveren
+TitleNumberOfActivatedModules=Geactiveerde modules
+TotalNumberOfActivatedModules=Geactiveerde modules: <b> %s </b> / <b> %s </b>
+YouMustEnableOneModule=Je moet minstens 1 module activeren
 ClassNotFoundIntoPathWarning=Klasse %s niet gevonden in PHP-pad
 YesInSummer=Ja in de zomer
 OnlyFollowingModulesAreOpenedToExternalUsers=Merk op dat alleen de volgende modules beschikbaar zijn voor externe gebruikers (ongeacht de machtigingen van dergelijke gebruikers) en alleen als machtigingen worden verleend: <br>
@@ -1296,7 +1312,7 @@ JSOnPaimentBill=Activeert functie om de betalingslijnen op betalingsformulieren
 CompanyIdProfChecker=Regels voor professionele ID&#39;s
 MustBeUnique=Moet het uniek zijn?
 MustBeMandatory=Verplicht om derden te creëren (indien btw-nummer of type onderneming gedefinieerd)?
-MustBeInvoiceMandatory=Verplichting om facturen te valideren?
+MustBeInvoiceMandatory=Facturen bevestigen verplicht?
 TechnicalServicesProvided=Technische diensten verleend
 #####DAV #####
 WebDAVSetupDesc=Dit is de link om toegang te krijgen tot de WebDAV-directory. Het bevat een &quot;openbare&quot; map die open staat voor elke gebruiker die de URL kent (indien toegang tot de openbare map is toegestaan) en een &quot;persoonlijke&quot; map die een bestaand inlogaccount / wachtwoord nodig heeft voor toegang.
@@ -1306,7 +1322,7 @@ WebCalUrlForVCalExport=Een exportlink naar het <b>%s</b> formaat is beschikbaar
 ##### Invoices #####
 BillsSetup=Facturenmodule instellen
 BillsNumberingModule=Nummeringsmodule voor facturen en creditnota's
-BillsPDFModules=Factuur documentsjablonen
+BillsPDFModules=Factuur sjablonen
 BillsPDFModulesAccordindToInvoiceType=Factuur documenteert modellen volgens factuurtype
 PaymentsPDFModules=Modellen betaal documenten
 ForceInvoiceDate=Forceer factuurdatum naar validatiedatum
@@ -1367,7 +1383,7 @@ VisitorCanChooseItsPaymentMode=Bezoeker kan kiezen uit beschikbare betalingsmodi
 MEMBER_REMINDER_EMAIL=Automatische herinnering <b>per e-mail</b> inschakelen voor verlopen abonnementen. Opmerking: Module <strong>%s</strong> moet zijn ingeschakeld en correct zijn ingesteld om herinneringen te verzenden.
 ##### LDAP setup #####
 LDAPSetup=LDAP-instellingen
-LDAPGlobalParameters=Globale instellingen
+LDAPGlobalParameters=Algemene instellingen
 LDAPUsersSynchro=Gebruikers
 LDAPGroupsSynchro=Groepen
 LDAPContactsSynchro=Contacten
@@ -1393,7 +1409,7 @@ LDAPServerUseTLSExample=Uw LDAP-server gebruik TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
 LDAPAdminDnExample=Volledige DN (bijv. Cn = admin, dc = voorbeeld, dc = com of cn = Administrator, cn = Gebruikers, dc = voorbeeld, dc = com voor active directory)
-LDAPPassword=Beheerderswachtwoord
+LDAPPassword=LDAP Administrator wachtwoord
 LDAPUserDn=Gebruikers DN
 LDAPUserDnExample=Complete DN (voorbeeld: ou=users,dc=society,dc=com)
 LDAPGroupDn=Groepen DN
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Gebruik gebeurtenistypen (beheerd in menu Setup -&gt; Woor
 AGENDA_USE_EVENT_TYPE_DEFAULT=Stel deze standaardwaarde automatisch in voor het type evenement in het formulier voor het maken van een evenement
 AGENDA_DEFAULT_FILTER_TYPE=Stel dit type evenement automatisch in het zoekfilter van de agendaweergave in
 AGENDA_DEFAULT_FILTER_STATUS=Stel deze status automatisch in voor evenementen in het zoekfilter van de agendaweergave
-AGENDA_DEFAULT_VIEW=Welk tabblad wilt u standaard openen bij het selecteren van menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Herinnering gebeurtenis inschakelen <b>via e-mail</b> (herinneringsoptie / vertraging kan worden gedefinieerd voor elke gebeurtenis). Opmerking: Module <strong>%s</strong> moet zijn ingeschakeld en correct zijn ingesteld om herinneringen op de juiste frequentie te laten verzenden.
 AGENDA_REMINDER_BROWSER=Herinnering gebeurtenis inschakelen <b>in de browser van de gebruiker</b> (wanneer de datum van de gebeurtenis wordt bereikt, kan elke gebruiker dit weigeren via de bevestigingsvraag van de browser)
 AGENDA_REMINDER_BROWSER_SOUND=Schakel geluidsmelding in
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Gekoppeld object weergeven in agendaweergave
 ##### Clicktodial #####
 ClickToDialSetup='Click-To-Dial' moduleinstellingen
 ClickToDialUrlDesc=URL gebeld wanneer een klik op het telefoonpictogram is voltooid. In URL kunt u tags gebruiken <br> <b>__PHONETO__</b> die wordt vervangen door het telefoonnummer van de persoon die moet worden gebeld <br> <b>__PHONEFROM__</b> die wordt vervangen door het telefoonnummer van de bellende persoon (die van u) <br> <b>__LOGIN__</b> die wordt vervangen door clicktodial login (gedefinieerd op gebruikerskaart) <br> <b>__PASS__</b> die wordt vervangen door clicktodial wachtwoord (gedefinieerd op gebruikerskaart).
-ClickToDialDesc=Deze module maakt telefoonnummers klikbare links. Een klik op het pictogram zal uw nummer bellen. Dit kan worden gebruikt om een callcentersysteem van Dolibarr te bellen dat bijvoorbeeld het telefoonnummer op een SIP-systeem kan bellen.
+ClickToDialDesc=Deze module verandert telefoonnummers bij gebruik van een desktopcomputer in klikbare links. Bij een klik zal het nummer gebeld worden. Dit kan worden gebruikt om het telefoongesprek te starten wanneer u een softphone op uw bureaublad gebruikt of wanneer u bijvoorbeeld een CTI-systeem op basis van het SIP-protocol gebruikt. Let op: Bij het gebruik van een smartphone zijn telefoonnummers altijd klikbaar.
 ClickToDialUseTelLink=Gebruik alleen de link "tel:" bij telefoonnummers
 ClickToDialUseTelLinkDesc=Gebruik deze methode als uw gebruikers een softphone of een software-interface op dezelfde computer als de browser hebben geïnstalleerd en deze oproepen wanneer u op een link in uw browser klikt die begint met "tel:". Als u een volledige serveroplossing nodig hebt (geen lokale software-installatie vereist), moet u dit instellen op "Nee" en het volgende veld invullen.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Dit veld bevat een referentie om de lijn te identificeren. Voer een
 Enter0or1=Voer 0 of 1 in
 UnicodeCurrency=Voer hier tussen accolades in, lijst met byte-nummers die het valutasymbool vertegenwoordigen. Bijvoorbeeld: voer voor $ [36] in - voor Brazilië real R $ [82,36] - voer voor € [8364] in
 ColorFormat=De RGB-kleur heeft het HEX-formaat, bijvoorbeeld: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Positie van regel in combolijst
 SellTaxRate=BTW tarief
 RecuperableOnly=Ja voor BTW  "Niet waargemaakt maar herstelbaar", bestemd voor een deelstaat in Frankrijk. Houd in alle andere gevallen de waarde "Nee" aan.
@@ -1841,9 +1858,10 @@ MailToSendShipment=Verzendingen
 MailToSendIntervention=Interventies
 MailToSendSupplierRequestForQuotation=Offerte aanvraag
 MailToSendSupplierOrder=Inkooporders
-MailToSendSupplierInvoice=Facturen van leveranciers
+MailToSendSupplierInvoice=Inkoopfacturen
 MailToSendContract=Contracten
-MailToThirdparty=Klant
+MailToSendReception=Ontvangsten
+MailToThirdparty=Derde partijen
 MailToMember=Leden
 MailToUser=Gebruikers
 MailToProject=Projecten pagina
@@ -1856,18 +1874,19 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP &amp; CRM %s is beschikbaar. Ve
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP &amp; CRM %s is beschikbaar. Versie %s is een onderhoudsversie, dus bevat alleen bugfixes. We raden alle gebruikers aan om naar deze versie te upgraden. Een onderhoudsrelease introduceert geen nieuwe functies of wijzigingen in de database. U kunt het downloaden van het downloadgedeelte van de https://www.dolibarr.org portal (submap Stabiele versies). U kunt de <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> lezen voor een volledige lijst met wijzigingen.
 MultiPriceRuleDesc=Wanneer de optie &quot;Meerdere prijsniveaus per product / service&quot; is ingeschakeld, kunt u verschillende prijzen (één per prijsniveau) voor elk product definiëren. Om u tijd te besparen, kunt u hier een regel invoeren om een prijs voor elk niveau automatisch te berekenen op basis van de prijs van het eerste niveau, dus u hoeft alleen een prijs voor het eerste niveau voor elk product in te voeren. Deze pagina is ontworpen om u tijd te besparen, maar is alleen nuttig als uw prijzen voor elk niveau relatief zijn aan het eerste niveau. U kunt deze pagina in de meeste gevallen negeren.
 ModelModulesProduct=Sjablonen voor productdocumenten
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=Om codes automatisch te kunnen genereren, moet u eerst een manager definiëren om het barcodenummer automatisch te definiëren.
 SeeSubstitutionVars=Zie * opmerking voor een lijst met mogelijke substitutievariabelen
 SeeChangeLog=Zie ChangeLog bestand (alleen in het Engels)
-AllPublishers=Alle uitgevers
-UnknownPublishers=Onbekende uitgevers
+AllPublishers=Alle auteurs
+UnknownPublishers=Onbekende auteurs
 AddRemoveTabs=Verwijder of voeg tabs toe
 AddDataTables=Objecttabellen toevoegen
 AddDictionaries=Voeg woordenboeken toe
 AddData=Objecten of woordenboekgegevens toevoegen
 AddBoxes=Voeg widgets toe
 AddSheduledJobs=Voeg geplande taken toe
-AddHooks=Voeg haken toe
+AddHooks=Voeg webhooks toe
 AddTriggers=Voeg triggers toe
 AddMenus=Voeg menu's toe
 AddPermissions=Voeg rechten toe
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Linker marge op PDF
 MAIN_PDF_MARGIN_RIGHT=Rechter marge op PDF
 MAIN_PDF_MARGIN_TOP=Bovenmarge op PDF
 MAIN_PDF_MARGIN_BOTTOM=Onder-marge op PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Hoogte voor logo op PDF
 NothingToSetup=Er is geen specifieke installatie vereist voor deze module.
 SetToYesIfGroupIsComputationOfOtherGroups=Stel dit in op Ja als deze groep een berekening van andere groepen is
 EnterCalculationRuleIfPreviousFieldIsYes=Voer de berekeningsregel in als het vorige veld was ingesteld op Ja (bijvoorbeeld &#39;CODEGRP1 + CODEGRP2&#39;)
@@ -1933,13 +1953,14 @@ NothingProcessed=Niets gedaan
 XEmailsDoneYActionsDone=%s e-mails gekwalificeerd, %s e-mails succesvol verwerkt (voor %s record / acties gedaan)
 RecordEvent=E-mail gebeurtenis opnemen
 CreateLeadAndThirdParty=Creëer lead (en relatie indien nodig)
-CreateTicketAndThirdParty=Ticket aanmaken (en eventueel relatie)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Laatste resultaatcode
 NbOfEmailsInInbox=Aantal e-mails in bronmap
 LoadThirdPartyFromName=Zoeken van derden laden op %s (alleen laden)
 LoadThirdPartyFromNameOrCreate=Zoeken van derden laden op %s (maken indien niet gevonden)
-WithDolTrackingID=Dolibarr Reference gevonden in Message ID
-WithoutDolTrackingID=Dolibarr Reference niet gevonden in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu toegangscode (hoofdmenu)
 ECMAutoTree=Toon automatische ECM-structuur
@@ -1981,9 +2002,9 @@ ImportSetup=Instellen van module Import
 InstanceUniqueID=Uniek ID van de instantie
 SmallerThan=Kleiner dan
 LargerThan=Groter dan
-IfTrackingIDFoundEventWillBeLinked=Houd er rekening mee dat als een tracking-ID wordt gevonden in inkomende e-mail, de gebeurtenis automatisch wordt gekoppeld aan de gerelateerde objecten.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Als u bij een GMail-account de validatie in 2 stappen hebt ingeschakeld, wordt aanbevolen om een speciaal tweede wachtwoord voor de toepassing te maken in plaats van uw eigen wachtwoord van 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.
+EmailCollectorTargetDir=Het kan een gewenst gedrag zijn om de e-mail naar een andere tag / directory te verplaatsen wanneer deze met succes is verwerkt. Stel hier gewoon de naam van de map in om deze functie te gebruiken (gebruik GEEN speciale tekens in de naam). Houd er rekening mee dat u ook een inlogaccount voor lezen / schrijven moet gebruiken.
 EmailCollectorLoadThirdPartyHelp=U kunt deze actie gebruiken om de e-mailinhoud te gebruiken om een bestaande relatie in uw database te zoeken en te laden. De gevonden (of gecreëerde) relatie zal worden gebruikt voor het volgen van acties die het nodig hebben. In het parameterveld kunt u bijvoorbeeld 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' gebruiken als u de naam van de relatie wilt extraheren uit een string 'Name: name to find' gevonden in de bron.
 EndPointFor=Eindpunt voor %s: %s
 DeleteEmailCollector=E-mailverzamelaar verwijderen
@@ -2005,3 +2026,7 @@ RssNote=Opmerking: elke RSS-feeddefinitie biedt een widget die u moet inschakele
 JumpToBoxes=Ga naar Setup -> Widgets
 MeasuringUnitTypeDesc=Gebruik hier een waarde als "grootte", "oppervlakte", "volume", "gewicht", "tijd"
 MeasuringScaleDesc=De schaal is het aantal plaatsen dat u nodig heeft om het decimale gedeelte te verplaatsen zodat het overeenkomt met de standaard referentie-eenheid. Voor het type "tijd" is dit het aantal seconden. Waarden tussen 80 en 99 zijn gereserveerde waarden.
+TemplateAdded=Sjabloon toegevoegd
+TemplateUpdated=Sjabloon bijgewerkt
+TemplateDeleted=Sjabloon verwijderd
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 5f35f56dc18..83cf46b9711 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Aantal gebeurtenissen
 ListOfActions=Gebeurtenissenlijst
 EventReports=Overzicht gebeurtenissen
 Location=Locatie
-ToUserOfGroup=Naar elke gebruiker in deze groep
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Gebeurtenis volledige dag
 MenuToDoActions=Alle openstaande acties
 MenuDoneActions=Alle beëindigde acties
@@ -86,6 +86,8 @@ ProposalDeleted=Voorstel verwijderd
 OrderDeleted=Bestelling verwijderd
 InvoiceDeleted=Factuur verwijderd
 DraftInvoiceDeleted=Conceptfactuur verwijderd
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s aangemaakt
 PRODUCT_MODIFYInDolibarr=Product %s aangepast
 PRODUCT_DELETEInDolibarr=Product %s verwijderd
@@ -158,3 +160,9 @@ DateStartPlusOne=Begindatum + 1 uur
 SetAllEventsToTodo=Zet alle evenementen op te doen
 SetAllEventsToInProgress=Stel alle evenementen in proces
 SetAllEventsToFinished=Stel alle evenementen in op voltooid
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 9b569592ae3..da458aef622 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -37,7 +37,7 @@ IbanValid=IBAN geldig
 IbanNotValid=IBAN is niet geldig
 StandingOrders=Incasso-opdrachten
 StandingOrder=Incasso-opdracht
-PaymentByDirectDebit=Payment by direct debit
+PaymentByDirectDebit=Betaling via automatische incasso
 PaymentByBankTransfers=Betalingen via overschrijving
 PaymentByBankTransfer=Betaling via overschrijving
 AccountStatement=Rekeningafschrift
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index a2134a6df91..71c851c2c3b 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Orders van leveranciers: laatste %s gewijzi
 BoxTitleLastModifiedCustomerBills=Klantfacturen: laatste %s gewijzigd
 BoxTitleLastModifiedCustomerOrders=Klantorders: laatste %s gewijzigd
 BoxTitleLastModifiedPropals=Laatste %s aangepaste offertes
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Afnemersfacturen
 ForCustomersOrders=Klantenbestellingen
 ForProposals=Zakelijke voorstellen / Offertes
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense-account is niet gedefinieerd
 BoxLastCustomerShipments=Laatste klantzendingen
 BoxTitleLastCustomerShipments=Laatste %s klantverzendingen
 NoRecordedShipments=Geen geregistreerde klantverzending
+# Pages
+AccountancyHome=Boekhouden
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index 83941d186f7..78734e4b981 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS-module
 BasicPhoneLayout=Gebruik basislay-out voor telefoons
 SetupOfTerminalNotComplete=Het instellen van terminal %s is niet voltooid
 DirectPayment=Directe betaling
-DirectPaymentButton=Directe contante betaalknop
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Factuur is al gevalideerd
 NoLinesToBill=Geen regels om te factureren
 CustomReceipt=Aangepaste kwitantie
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Externe module met extra functies. Mogelijkhei
 PrintMethod=Afdrukmethode
 ReceiptPrinterMethodDescription=Krachtige methode met veel parameters. Volledig aanpasbaar met sjablonen. Kan niet afdrukken vanuit de cloud.
 ByTerminal=Per terminal
-TakeposNumpadUsePaymentIcon=Gebruik betalingspictogram op numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Nummeringsmodule voor POS-verkoop
 CashDeskGenericMaskCodes6 =  <br><b>{TN}</b> tag wordt gebruikt om het terminalnummer toe te voegen
 TakeposGroupSameProduct=Groepeer dezelfde productlijnen
 StartAParallelSale=Start een nieuwe parallelle verkoop
-ControlCashOpening=Controle kassa bij opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Sluit de kassa
 CashReport=Kassa verslag
 MainPrinterToUse=Hoofdprinter om te gebruiken
@@ -107,13 +107,18 @@ OrderPrinterToUse=Bestel printer om te gebruiken
 MainTemplateToUse=Hoofdsjabloon om te gebruiken
 OrderTemplateToUse=Bestelsjabloon te gebruiken
 BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
+AutoOrder=Eigen bestelling door klant
 RestaurantMenu=Menu
 CustomerMenu=Klantmenu
 ScanToMenu=Scan QR code to see the menu
 ScanToOrder=Scan QR code to order
-Appearance=Appearance
+Appearance=Weergave
 HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+HideProductImages=Verberg productafbeeldingen
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index 549f9fa3400..c811965f35d 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Sociale of fiscale heffingen/belasting
 SocialContributions=Sociale of fiscale heffingen/belastingen
 SocialContributionsDeductibles=Aftrekbare sociale/fiscale lasten/belastingen
 SocialContributionsNondeductibles=Niet aftrekbare sociale/fiscale lasten/belastingen
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Labelbijdrage
 TypeContrib=Type bijdrage
 MenuSpecialExpenses=Speciale uitgaven
diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang
index 77e28620636..9cbf6c3b23e 100644
--- a/htdocs/langs/nl_NL/contracts.lang
+++ b/htdocs/langs/nl_NL/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Actieve diensten
 MenuExpiredServices=Verlopen diensten
 MenuClosedServices=Gesloten diensten
 NewContract=Nieuw contract
-NewContractSubscription=Nieuw contract/abonnement
+NewContractSubscription=New contract or subscription
 AddContract=Nieuw contract
 DeleteAContract=Verwijder een contract
 ActivateAllOnContract=Activeer alle services
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index d401126c69e..d9b7214e8d9 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Slechte syntaxis voor leverancierscode
 ErrorSupplierCodeRequired=Vendor code vereist
 ErrorSupplierCodeAlreadyUsed=Leverancierscode al gebruikt
 ErrorBadParameters=Verkeerde parameters
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Foutieve of ontbrekende parameters
 ErrorBadValueForParameter=Verkeerde waarde '%s' voor parameter '%s'
 ErrorBadImageFormat=Afbeeldingsbestand heeft geen ondersteunde indeling (uw PHP ondersteunt geen functies om afbeeldingen van dit formaat te converteren)
 ErrorBadDateFormat=Waarde %s heeft verkeerde datum formaat
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Nieuwe waarde kan niet gelijk is aan de oude
 ErrorFailedToValidatePasswordReset=Mislukt om wachtwoord opnieuw te initialiseren. Misschien werd de her-init al gedaan (deze link kan slechts een keer worden). Zo niet, probeer dan het her-init proces opnieuw te starten.
 ErrorToConnectToMysqlCheckInstance=Verbinding maken met database mislukt. Controleer of de databaseserver actief is (bijvoorbeeld, met mysql / mariadb, kunt u het starten vanaf de opdrachtregel met 'sudo service mysql start').
 ErrorFailedToAddContact=Mislukt om contact toe te voegen
-ErrorDateMustBeBeforeToday=De datum kan niet hoger zijn dan vandaag
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Er is een betalingsmodus ingesteld om %s te typen, maar het instellen van de module Factuur is niet voltooid om te definiëren welke informatie moet worden weergegeven voor deze betalingsmodus.
 ErrorPHPNeedModule=Fout, op uw PHP moet module <b>%s zijn</b> geïnstalleerd om deze functie te gebruiken.
 ErrorOpenIDSetupNotComplete=U stelt het Dolibarr-configuratiebestand in om OpenID-authenticatie toe te staan, maar de URL van de OpenID-service is niet gedefinieerd als een constante %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Geen voorraad voor dit lot
 ErrorOnlyOneFieldForGroupByIsPossible=Slechts 1 veld voor de 'Groepeer op' is mogelijk (andere worden weggegooid)
 ErrorTooManyDifferentValueForSelectedGroupBy=Te veel verschillende waarden gevonden (meer dan <b> %s </b>) voor het veld '<b> %s </b>', dus we kunnen het niet gebruiken voor afbeeldingen als '. Het veld 'Goepeer op' is verwijderd. Misschien wil je het gebruiken als een X-as?
 ErrorReplaceStringEmpty=Fout, de tekenreeks waarin moet worden vervangen, is leeg
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
 WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
index ba209897d36..186ee537182 100644
--- a/htdocs/langs/nl_NL/languages.lang
+++ b/htdocs/langs/nl_NL/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabisch
 Language_ar_EG=Arabisch (Egyptisch)
 Language_ar_SA=Arabisch
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengaals
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgaarse
 Language_bs_BA=Bosnisch
 Language_ca_ES=Catalaans
@@ -20,6 +23,7 @@ Language_en_GB=Engels (Groot Brittannië)
 Language_en_IN=Engels (India)
 Language_en_NZ=Engels (Nieuw Zeeland)
 Language_en_SA=Engels (Saoedi-Arabië)
+Language_en_SG=English (Singapore)
 Language_en_US=Engels (Verenigde Staten)
 Language_en_ZA=Engels (Zuid-Afrika)
 Language_es_ES=Spaans
@@ -29,6 +33,7 @@ Language_es_CL=Spaans (Chili)
 Language_es_CO=Spaans (Colombia)
 Language_es_DO=Spaans (Dominicaanse Republiek)
 Language_es_EC=Spaans (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spaans (Honduras)
 Language_es_MX=Spaans (Mexico)
 Language_es_PA=Spaans (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spaans (Paraguay)
 Language_es_PE=Spaans (Peru)
 Language_es_PR=Spaans (Puerto Rico)
 Language_es_UY=Spaans (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spaans (Venezuela)
 Language_et_EE=Estlands
 Language_eu_ES=Bask
@@ -44,15 +50,22 @@ Language_fi_FI=Voltooi
 Language_fr_BE=Frans (België)
 Language_fr_CA=Frans (Canada)
 Language_fr_CH=Frans (Zwitserland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Frans (Frankrijk)
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Frans (Nieuw-Caledonië)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebreeuws
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Kroatisch
 Language_hu_HU=Hongaars
 Language_id_ID=Indonesisch
 Language_is_IS=IJslands
 Language_it_IT=Italiaans
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japans
 Language_ka_GE=Georgisch
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Lets
 Language_mk_MK=Macedonisch
 Language_mn_MN=Mongools
 Language_nb_NO=Noors (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Nederlands (België)
 Language_nl_NL=Nederlands
 Language_pl_PL=Pools
@@ -86,4 +100,5 @@ Language_uz_UZ=Oezbeeks
 Language_vi_VN=Vietnamees
 Language_zh_CN=Chinees
 Language_zh_TW=Chinees (traditioneel)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Maleis-
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 78ae4fd91dc..f5438b0a507 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Uitgaande e-mailinstellingen (voor module %s)
 DefaultOutgoingEmailSetup=Standaard uitgaande e-mail instellen
 Information=Informatie
 ContactsWithThirdpartyFilter=Contacten met filter van derden
+Unanswered=Unanswered
+Answered=Beantwoord
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 1390f6bf0ab..3356b74ed78 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. belasting)
 Amount=Hoeveelheid
 AmountInvoice=Factuurbedrag
 AmountInvoiced=Gefactureerd bedrag
-AmountInvoicedHT=Gefactureerd bedrag (incl. BTW)
-AmountInvoicedTTC=Gefactureerd bedrag (excl. BTW)
+AmountInvoicedHT=Gefactureerd bedrag (excl. BTW)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Betalingsbedrag
 AmountHTShort=Bedrag (excl.)
 AmountTTCShort=Bedrag met BTW
@@ -485,6 +485,7 @@ Categories=Labels/categorieën
 Category=Label/categorie
 By=Door
 From=Van
+FromDate=Van
 FromLocation=Van
 to=t/m
 To=t/m
@@ -680,13 +681,14 @@ RecordsGenerated=%s record (s) gegenereerd
 AutomaticCode=Automatische code
 FeatureDisabled=Functie uitgeschakeld
 MoveBox=Verplaats widget
-Offered=Beschikbaar
+Offered=Aanbod
 NotEnoughPermissions=U heeft geen toestemming voor deze actie
 SessionName=Sessienaam
 Method=Methode
 Receive=Ontvangen
 CompleteOrNoMoreReceptionExpected=Voltooid of niets meer verwacht
 ExpectedValue=Verwachte waarde
+ExpectedQty=Expected Qty
 PartialWoman=Gedeeltelijke
 TotalWoman=Totaal
 NeverReceived=Nooit ontvangen
@@ -703,6 +705,7 @@ MenuECM=Documenten
 MenuAWStats=AWStats
 MenuMembers=Leden
 MenuAgendaGoogle=Google-agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limiet (Menu Home-Instellingen-Beveiliging): %s Kb, PHP grens: %s Kb
 NoFileFound=Geen documenten die zijn opgeslagen in deze map
 CurrentUserLanguage=Huidige taal
@@ -725,7 +728,7 @@ Page=Pagina
 Notes=Notitie
 AddNewLine=Voeg nieuwe regel toe
 AddFile=Voeg bestand toe
-FreeZone=Geen vooraf gedefinieerde product/dienst
+FreeZone=Free-text product
 FreeLineOfType=Vrije omschrijving, type:
 CloneMainAttributes=Kloon het object met de belangrijkste kenmerken
 ReGeneratePDF=PDF opnieuw genereren
@@ -942,6 +945,39 @@ ShortThursday=Do
 ShortFriday=Vr
 ShortSaturday=Za
 ShortSunday=Zo
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Selecteer een e-mail template
 SetRef=Stel ref in
 Select2ResultFoundUseArrows=Resultaten gevonden. Gebruik de pijlen om te selecteren.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Schakel in de bewerkingsmodus om vertalingen vo
 NotUsedForThisCustomer=Niet gebruikt voor deze klant
 AmountMustBePositive=Bedrag moet positief zijn
 ByStatus=Op status
+InformationMessage=Informatie
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index bfd2f2983be..c0a91e8b1ca 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -81,7 +81,7 @@ DeleteType=Verwijderen
 VoteAllowed=Stemming toegestaan
 Physical=Fysiek
 Moral=Moreel
-MorPhy=Moreel / Fysiek
+MorPhy=Natuur
 Reenable=Opnieuw inschakelen
 ResiliateMember=Verwijder een lid
 ConfirmResiliateMember=Weet je zeker dat je dit lidmaatschap wilt beëindigen?
diff --git a/htdocs/langs/nl_NL/mrp.lang b/htdocs/langs/nl_NL/mrp.lang
index e8efd2673df..eaaa9d827a5 100644
--- a/htdocs/langs/nl_NL/mrp.lang
+++ b/htdocs/langs/nl_NL/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Productieorders
 MO=Productieorder
+MOs=Manufacturing orders
 MRPDescription=Module om productie- en productieorders (PO) te beheren.
 MRPArea=MRP-gebied
 MrpSetupPage=Installatie van module MRP
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 6f6ff18ad10..d6bbceb831c 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__ (Hallo) __ Vind onze bestelling __REF_
 PredefinedMailContentSendSupplierInvoice=__ (Hallo) __ Vind factuur __REF__ bijgevoegd __ (Met vriendelijke groet) __ __USER_SIGNATURE__
 PredefinedMailContentSendShipping=__ (Hallo) __ Vind verzending __REF__ bijgevoegd __ (Met vriendelijke groet) __ __USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__ (Hallo) __ Zoek interventie __REF__ bijgevoegd __ (Met vriendelijke groet) __ __USER_SIGNATURE__
-PredefinedMailContentThirdparty=__ (Hallo) __ __ (Met vriendelijke groet) __ __USER_SIGNATURE__
-PredefinedMailContentContact=__ (Hallo) __ __ (Met vriendelijke groet) __ __USER_SIGNATURE__
-PredefinedMailContentUser=__ (Hallo) __ __ (Met vriendelijke groet) __ __USER_SIGNATURE__
 PredefinedMailContentLink=Indien u nog niet heeft betaald kunt u op de onderstaande link klikken. %s
+PredefinedMailContentGeneric=__ (Hallo) __ __ (Met vriendelijke groet) __ __USER_SIGNATURE__
 DemoDesc=Dolibarr is een compacte ERP / CRM die verschillende bedrijfsmodules ondersteunt. Een demo met alle modules heeft geen zin omdat dit scenario zich nooit voordoet (enkele honderden beschikbaar). Er zijn dus verschillende demoprofielen beschikbaar.
 ChooseYourDemoProfil=Kies het demoprofiel dat het beste bij u past ...
 ChooseYourDemoProfilMore=... of bouw je eigen profiel <br> (handmatige moduleselectie)
@@ -280,7 +278,9 @@ LinesToImport=Regels om te importeren
 
 MemoryUsage=Geheugengebruik
 RequestDuration=Duur van het verzoek
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Producten / diensten op populariteit in voorstellen
 PopuCom=Producten / services op populariteit in Orders
 ProductStatistics=Producten / diensten Statistieken
 NbOfQtyInOrders=Aantal in bestellingen
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index dd6c386ddd6..9b29ea2e06a 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -55,7 +55,7 @@ Movements=Verplaatsingen
 Sell=Verkopen
 Buy=Inkoop
 OnSell=Voor verkoop
-OnBuy=Gekocht
+OnBuy=Voor inkoop
 NotOnSell=Vervallen
 ProductStatusOnSell=Beschikbaar
 ProductStatusNotOnSell=Vervallen
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Stel type streepjescode in
 BarcodeValue=Waarde streepjescode
 NoteNotVisibleOnBill=Notitie (niet zichtbaar op facturen, offertes, etc)
 ServiceLimitedDuration=Als product een dienst is met een beperkte houdbaarheid:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Meerdere prijssegmenten per product / dienst (elke klant bevindt zich in één prijssegment)
 MultiPricesNumPrices=Aantal prijzen
 DefaultPriceType=Basisprijzen per standaard (met versus zonder belasting) bij het toevoegen van nieuwe verkoopprijzen
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Leverancierprijzen (van producten of service
 CustomCode=Douane / Commodity / HS-code
 CountryOrigin=Land van herkomst
 Nature=Aard van het product (materiaal / afgewerkt)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Kort label
 Unit=Eenheid
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Selecteer combinatie
 ProductCombinationGenerator=Variatie generator
 Features=Kenmerken
 PriceImpact=Gevolgen voor prijs
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Gevolgen voor gewicht
 NewProductAttribute=Nieuwe attribuut
 NewProductAttributeValue=Waarde nieuw attribuut
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 361f3da9e51..42a2ddefac7 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Inzender
 TypeContact_project_task_external_TASKCONTRIBUTOR=Inzender
 SelectElement=Kies een element
 AddElement=Koppeling naar element
+LinkToElementShort=Link naar
 # Documents models
 DocumentModelBeluga=Projectdocumentsjabloon voor overzicht gekoppelde objecten
 DocumentModelBaleine=Projectdocumentsjabloon voor taken
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Aantal gemaakte projecten per maand
 ProjectNbTaskByMonth=Aantal gemaakte taken per maand
 ProjectOppAmountOfProjectsByMonth=Aantal leads per maand
 ProjectWeightedOppAmountOfProjectsByMonth=Gewogen aantal leads per maand
-ProjectOpenedProjectByOppStatus=Open project / lead per leadstatus
-ProjectsStatistics=Projecten/leads statistieken
-TasksStatistics=Statistieken over project- / leadtaken
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Taak toegewezen. Tijd invoeren voor deze taak moet mogelijk zijn.
 IdTaskTime=Id taak tijd
 YouCanCompleteRef=Als je de ref met een achtervoegsel wilt voltooien, wordt aanbevolen om een - -teken toe te voegen om het te scheiden, zodat de automatische nummering nog steeds correct werkt voor volgende projecten. Bijvoorbeeld %s-MYSUFFIX
diff --git a/htdocs/langs/nl_NL/recruitment.lang b/htdocs/langs/nl_NL/recruitment.lang
new file mode 100644
index 00000000000..f1678cf9f58
--- /dev/null
+++ b/htdocs/langs/nl_NL/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Werving
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Beheer en volg wervingscampagnes voor nieuwe vacatures
+
+#
+# Admin page
+#
+RecruitmentSetup = Werving instellingen
+Settings = Instellingen
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Werving gebied
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Over
+RecruitmentAbout = Over werving
+RecruitmentAboutPage = Over Werving pagina
+NbOfEmployeesExpected=Verwacht aantal werknemers
+JobLabel=Label van de vacature
+WorkPlace=Werkplek
+DateExpected=Verwachte datum
+FutureManager=Toekomstige manager
+ResponsibleOfRecruitement=Verantwoordelijk voor werving
+IfJobIsLocatedAtAPartner=Als baan zich op een partnerlocatie bevindt
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index 8bd92402653..2c3d237a2db 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -20,7 +20,7 @@ CreateShipment=Creëer verzending
 QtyShipped=Aantal verzonden
 QtyShippedShort=Stk verz.
 QtyPreparedOrShipped=Aantal bereid of verzonden
-QtyToShip=Aantal te verzenden
+QtyToShip=Geleverd
 QtyToReceive=Te ontvangen hoeveelheid
 QtyReceived=Aantal ontvangen
 QtyInOtherShipments=Aantal in andere zendingen
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index a03e6c2a3e0..ebb500d6f7b 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Annuleer verzending
 DeleteSending=Verwijder verzending
 Stock=Voorraad
 Stocks=Voorraden
-MissingStocks=Missing stocks
-StockAtDate=Stock at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Ontbrekende voorraad
+StockAtDate=Stocks at date
+StockAtDateInPast=Datum uit het verleden
+StockAtDateInFuture=Toekomstige datum
 StocksByLotSerial=Voorraad volgorde op lot/serienummer
 LotSerial=Partij/Serienummer
 LotSerialList=Overzicht van partij/serienummers
@@ -65,7 +65,7 @@ RuleForWarehouse=Voorwaarden magazijnen
 WarehouseAskWarehouseDuringOrder=Stel een magazijn in op Verkooporders
 UserDefaultWarehouse=Stel een magazijn in op gebruikers
 MainDefaultWarehouse=Standaardmagazijn
-MainDefaultWarehouseUser=Use a default warehouse for each user
+MainDefaultWarehouseUser=Gebruik standaard magazijn voor elke gebruiker
 MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
 IndependantSubProductStock=Product voorraad en subproduct voorraad zijn onafhankelijk
 QtyDispatched=Hoeveelheid verzonden
@@ -95,14 +95,16 @@ RealStock=Werkelijke voorraad
 RealStockDesc=Fysieke/echte voorraad is de voorraad die momenteel in de magazijnen aanwezig is.
 RealStockWillAutomaticallyWhen=De werkelijke voorraad wordt aangepast volgens deze regel (zoals gedefinieerd in de module Voorraad):
 VirtualStock=Virtuele voorraad
-VirtualStockDesc=Virtuele voorraad is de berekende voorraad die beschikbaar is zodra alle open/in behandeling zijnde acties (die van invloed zijn op voorraden) zijn verwerkt (ontvangen inkooporders, verzonden verkooporders etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Magazijn-ID
 DescWareHouse=Beschrijving magazijn
 LieuWareHouse=Localisatie magazijn
 WarehousesAndProducts=Magazijn en producten
 WarehousesAndProductsBatchDetail=Magazijnen en producten (met detail per lot/serieenummer)
-AverageUnitPricePMPShort=Gewogen gemiddelde inkoopprijs
-AverageUnitPricePMP=Gewogen gemiddelde inkoopprijs
+AverageUnitPricePMPShort=Waardering (PMP)
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Verkopen Prijs per Eenheid
 EstimatedStockValueSellShort=Verkoopwaarde
 EstimatedStockValueSell=Verkoopwaarde
@@ -141,7 +143,7 @@ Replenishments=Bevoorradingen
 NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s)
 NbOfProductAfterPeriod=Aantal op voorraad van product %s na de gekozen periode (<%s)
 MassMovement=Volledige verplaatsing
-SelectProductInAndOutWareHouse=Kies een product, een aantal, een van-magazijn, een naar-magazijn, en klik "%s".  Als alle nodige bewegingen zijn gemaakt, klik op "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Vastleggen verplaatsing
 ReceivingForSameOrder=Ontvangsten voor deze bestelling
 StockMovementRecorded=Geregistreerde voorraadbewegingen
@@ -234,4 +236,7 @@ ForceTo=Dwingen tot
 AlwaysShowFullArbo=Volledige boomstructuur van magazijn weergeven op pop-up van magazijnkoppelingen (Waarschuwing: dit kan de prestaties drastisch verminderen)
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
+CurrentStock=Huidige voorraad
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index bed0c1c5b49..041aa6ba0ec 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Lage kwaliteit
 ReputationForThisProduct=Reputatie
 BuyerName=Afnemer
 AllProductServicePrices=Prijzen alle producten/diensten
-AllProductReferencesOfSupplier=Alle product- / service-referenties van leverancier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Prijzen van leveranciers
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index 577c2fa1dfd..9af5045058e 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Verwijderd
 
 # Dict
 Type=Type
-Category=Analisten code
 Severity=Prioriteit
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Wijs automatisch de gebruiker toe die het ticket heeft a
 TicketsAutoAssignTicketHelp=Bij het maken van een ticket kan de gebruiker automatisch aan het ticket worden toegewezen.
 TicketNumberingModules=Nummering module voor tickets
 TicketNotifyTiersAtCreation=Breng relatie op de hoogte bij het aanmaken
-TicketGroup=Groep
 TicketsDisableCustomerEmail=Schakel e-mails altijd uit wanneer een ticket wordt gemaakt vanuit de openbare interface
 TicketsPublicNotificationNewMessage=Stuur e-mail (s) wanneer een nieuw bericht is toegevoegd
 TicketsPublicNotificationNewMessageHelp=Stuur e-mail (s) wanneer een nieuw bericht is toegevoegd vanuit de openbare interface (naar de toegewezen gebruiker of de e-mail met meldingen naar (update) en / of de e-mail met meldingen naar)
@@ -162,7 +160,7 @@ CreatedBy=Aangemaakt door
 NewTicket=Nieuw Ticket
 SubjectAnswerToTicket=Ticket antwoord
 TicketTypeRequest=Aanvraag type
-TicketCategory=Analisten code
+TicketCategory=Groep
 SeeTicket=Bekijk ticket
 TicketMarkedAsRead=Ticket is gemarkeerd als gelezen
 TicketReadOn=Lees verder
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index f0092998867..20ea6e8fba2 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Uitgeschakeld in onderhoudsmodus
 UserAccountancyCode=Gebruiker accounting code
 UserLogoff=Gebruiker uitgelogd
 UserLogged=Gebruiker gelogd
+DateOfEmployment=Employment date
 DateEmployment=Startdatum dienstverband
 DateEmploymentEnd=Einddatum dienstverband
 CantDisableYourself=U kunt uw eigen gebruikersrecord niet uitschakelen
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Forceer verlofaanvraag validator
 ValidatorIsSupervisorByDefault=Standaard is de validator de supervisor van de gebruiker. Blijf leeg om dit gedrag te behouden.
 UserPersonalEmail=Persoonlijke e-mail
 UserPersonalMobile=Persoonlijke mobiele telefoon
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 64812b62a35..fe5dc16fe25 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Overboekingsopdrachten
 PaymentByBankTransferLines=Overschrijvingsorderregels
 WithdrawalsReceipts=Incasso-opdrachten
 WithdrawalReceipt=Incasso-opdracht
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Overboekingsopdrachten
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Laatste %s overboekingsopdrachten
 LastWithdrawalReceipts=Laatste %s incassobestanden
@@ -34,7 +34,7 @@ NoInvoiceToWithdraw=Er staat geen factuur open voor '%s'. Ga op tabblad '%s' op
 NoSupplierInvoiceToWithdraw=Geen leveranciersfactuur met open 'betalingsverzoek'. Ga op tabblad '%s' op factuurkaart om een verzoek in te dienen.
 ResponsibleUser=Verantwoordelijke gebruiker
 WithdrawalsSetup=Instelling voor automatische incasso
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Instelling voor overboeking
 WithdrawStatistics=Automatische incasso statistieken
 CreditTransferStatistics=Overboeking statistieken
 Rejects=Verworpen
@@ -63,7 +63,9 @@ InvoiceRefused=Factuur geweigerd (de afwijzing door belasten aan de klant)
 StatusDebitCredit=Status debet / credit
 StatusWaiting=Wachtend
 StatusTrans=Verzonden
+StatusDebited=Debited
 StatusCredited=Gecrediteerd
+StatusPaid=Betaald
 StatusRefused=Geweigerd
 StatusMotif0=Niet gespecificeerd
 StatusMotif1=Ontoereikende voorziening
@@ -77,13 +79,13 @@ StatusMotif8=Andere reden
 CreateForSepaFRST=Maak een domiciliëringsbestand (SEPA FRST)
 CreateForSepaRCUR=Maak een domiciliëringsbestand (SEPA RCUR)
 CreateAll=Maak een domiciliëringsbestand (alles)
-CreateFileForPaymentByBankTransfer=Maak een overboeking (alles)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Maak een overboekingsbestand (SEPA) aan
 CreateGuichet=Alleen kantoor
 CreateBanque=Alleen de bank
 OrderWaiting=Wachtend op behandeling
-NotifyTransmision=Intrekking transmissie
-NotifyCredit=Intrekking Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Nationale zender nummer
 WithBankUsingRIB=Voor bankrekeningen die gebruik maken van RIB
 WithBankUsingBANBIC=Voor bankrekeningen die gebruik maken van IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Crediteer op
 WithdrawalFileNotCapable=Kan geen ontvangstbewijsbestand voor uw land genereren %s (uw land wordt niet ondersteund)
 ShowWithdraw=Incasso-opdracht weergeven
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Als de factuur echter ten minste één betalingsopdracht voor automatische incasso bevat die nog niet is verwerkt, wordt deze niet ingesteld als betaald om voorafgaand opnamebeheer mogelijk te maken.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Intrekkingsbestand
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Stel de status in &quot;Bestand verzonden&quot;
 ThisWillAlsoAddPaymentOnInvoice=Dit registreert ook betalingen op facturen en classificeert ze als "Betaald" als het resterende bedrag niet is betaald
 StatisticsByLineStatus=Statistieken per status van lijnen
@@ -105,7 +108,7 @@ RUMLong=Unieke machtigingsreferentie
 RUMWillBeGenerated=Indien leeg, wordt een UMR (Unique Mandate Reference) gegenereerd zodra de bankrekeninginformatie is opgeslagen.
 WithdrawMode=Incassomodus (FRST of RECUR)
 WithdrawRequestAmount=Bedrag van automatische incasso:
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Over te maken bedrag:
 WithdrawRequestErrorNilAmount=Kan geen automatische incasso-aanvraag maken voor een leeg bedrag.
 SepaMandate=Machtiging doorlopende SEPA incasso
 SepaMandateShort=SEPA-mandaat
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Soort betaling
 ModeRECUR=Terugkomende betaling
 ModeFRST=Eenmalige incasso
 PleaseCheckOne=Alleen één controleren
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Incasso-opdracht %s gemaakt
 AmountRequested=Aangevraagde hoeveelheid
 SEPARCUR=SEPA CUR
@@ -131,7 +135,7 @@ ICS=Creditor Identifier CI
 END_TO_END=&quot;EndToEndId&quot; SEPA XML-tag - Uniek ID toegewezen per transactie
 USTRD=&quot;Ongestructureerde&quot; SEPA XML-tag
 ADDDAYS=Dagen toevoegen aan uitvoeringsdatum
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=Geen standaard IBAN gevonden bij deze relatie
 ### Notifications
 InfoCreditSubject=Betaling van een domiciliëringsopdracht %s door de bank
 InfoCreditMessage=De betaalopdracht %s is door de bank betaald <br> Betalingsgegevens: %s
@@ -141,3 +145,4 @@ InfoTransData=Bedrag: %s<br>Wijze: %s<br>Datum: %s
 InfoRejectSubject=Betalingsopdracht voor automatische incasso geweigerd
 InfoRejectMessage=M,<br><br>de incasso van factuur %s voor bedrijf %s, met een bedrag van %s is geweigerd door de bank.<br><br>--<br>%s
 ModeWarning=Optie voor echte modus was niet ingesteld, we stoppen na deze simulatie
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
index f305f856b66..9d4ed65e55b 100644
--- a/htdocs/langs/nl_NL/workflow.lang
+++ b/htdocs/langs/nl_NL/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificeer gekoppelde bronverkoop
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificeer het gekoppelde bronvoorstel als gefactureerd wanneer de leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van het gekoppelde voorstel)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classificeer gekoppelde inkooporder als gefactureerd wanneer leveranciersfactuur is gevalideerd (en als het factuurbedrag gelijk is aan het totale bedrag van de gekoppelde order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatisch aanmaken
 AutomaticClassification=Automatisch classificeren
diff --git a/htdocs/langs/nl_NL/zapier.lang b/htdocs/langs/nl_NL/zapier.lang
index 41961119393..770a821038b 100644
--- a/htdocs/langs/nl_NL/zapier.lang
+++ b/htdocs/langs/nl_NL/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier voor Dolibarr-module
 # Admin page
 #
 ZapierForDolibarrSetup = Installatie van Zapier voor Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 5e8bbad5609..2bb1cd7da36 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Wyłącz bezpośrednią rejestrację transakcji na koncie bankowym
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Dziennik sprzedaży
 ACCOUNTING_PURCHASE_JOURNAL=Dziennik zakupów
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Dodaj masowo kategorie
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Kategoria dla konta księgowego została usunięta
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 9a19685c5d5..2b31e9f5042 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Domyślny adres konta e-mail (użytkownika lub firmow
 UserEmail=Adres email użytkownika
 CompanyEmail=Adres firmowego konta e-mail
 FeatureNotAvailableOnLinux=Cechy te nie są dostępne w systemach Unix, takich jak. Przetestuj swój program sendmail lokalnie.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Jeśli tłumaczenie dla tego języka nie jest kompletne lub znajdziesz błędy, możesz to poprawić, edytując pliki w katalogu <b>langs/%s</b>. Prześlij potem swoją zmianę na www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Moduł konfiguracji
 ModulesSetup=Ustawienia Modułów/Aplikacji
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=<b>%s</b> moduł musi być włączony przed użyciem te
 SecurityToken=Klucz do bezpiecznego URL
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Zasady dla %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalon
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Ciąg znaków
+String1Line=String (1 line)
 TextLong=Długi tekst
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Liczba całkowita
 Float=Liczba zmiennoprzecinkowa
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Kody kreskowe
 Module55Desc=Kody kreskowe zarządzania
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integracja systemu ClickToDial (Asterisk,...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Tworzenie / modyfikacja usług
 Permission534=Usuwanie usług
 Permission536=Zobacz / zarządzaj ukrytymi usługami
 Permission538=Eksport usług
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Zobacz darowizny
 Permission702=Tworzenie / modyfikacja darowizn
 Permission703=Usuń darowizny
@@ -848,6 +858,8 @@ Permission773=Usuń raporty wydatków
 Permission774=Przeczytaj wszystkie raporty wydatków (nawet dla użytkowników nie podwładni)
 Permission775=Zatwierdzanie raportów wydatków
 Permission776=Zapłać raporty wydatków
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Eksport raportów kosztów
 Permission1001=Zobacz zasoby
 Permission1002=Tworzenie / modyfikacja magazynów
@@ -900,6 +912,7 @@ Permission2515=Konfiguracja katalogów dokumentów
 Permission2801=Użyj klienta FTP w trybie odczytu (tylko przeglądanie i pobieranie)
 Permission2802=Użyj klienta FTP w trybie zapisu (usuwanie lub przesyłanie plików)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Usuń zasoby
 Permission63004=Dołącz zasoby do zdarzeń w agendzie
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Potencjał potencjalnego klienta
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regiony
 DictionaryCountry=Kraje
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Szablony wiadomości e-mail
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Jednostki pomiarowe
 DictionarySocialNetworks=Sieci społecznościowe
-DictionaryProspectStatus=Stan oferty
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Strona logowania
 BackgroundImageLogin=Obrazek tła
 PermanentLeftSearchForm=Stały formularz wyszukiwania w lewym menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Firma/Organizacja
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Aktywowane aplikacje/moduły: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musisz przynajmniej umożliwić 1 moduł
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Tak w lecie
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Która karta chcesz otworzyć domyślnie po wybraniu menu Agendę
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Używaj tylko łącza "tel:" na numery telefonów
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Wpisz 0 lub 1
 UnicodeCurrency=Wpisz między nawiasami kwadratowymi wielkość dziesiętną Unicode reprezentującą symbol waluty. Na przykład: dla $ [36] - dla zł [122,322] - dla € wpisz [8364]
 ColorFormat=Kolor RGB jest w formacie HEX, np .: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly="Tak" dla podatku VAT „Not Perceived but Recoverable” stosowanego w niektórych stanach Francji. Ustaw „Nie” dla wszelkich innych lokalizacji.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Zapytanie ofertowe
 MailToSendSupplierOrder=Zamówienia zakupowe
 MailToSendSupplierInvoice=Faktury dostawcy
 MailToSendContract=Kontrakty
+MailToSendReception=Receptions
 MailToThirdparty=Kontrahenci
 MailToMember=Członkowie
 MailToUser=Użytkownicy
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s jest dostępny. Wersja
 ExampleOfNewsMessageForMaintenanceRelease=System ERP i CRM Dolibarr %s jest dostępny. Wersja %s jest wersją serwisową. Wersja serwisowa nie wprowadza nowych funkcji ani zmian w bazie danych. Zawiera jedynie poprawki błędów. Wszystkim użytkownikom zalecamy uaktualnienie do tej wersji.  Możesz pobrać ją z obszaru pobierania portalu https://www.dolibarr.org (Downloads > Stable versions). Możesz przeczytać <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>, aby uzyskać pełną listę zmian.
 MultiPriceRuleDesc=Przy włączonej opcji „Kilka poziomów cen za produkt/usługę”, możesz zdefiniować różne ceny (jeden na poziom cen) dla każdego produktu. Aby zaoszczędzić swój czas, możesz wprowadzić regułę automatycznego obliczania ceny dla każdego poziomu w oparciu o cenę pierwszego poziomu, więc będziesz musiał wprowadzić cenę tylko dla pierwszego poziomu dla każdego produktu. Ta strona została zaprojektowana w celu zaoszczędzenia czasu, ale jest przydatna tylko wtedy, gdy ceny dla każdego poziomu są w stosunku do pierwszego poziomu. W większości przypadków możesz zignorować tę stronę.
 ModelModulesProduct=Szablon dokumentu produktu
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=Aby móc automatycznie generować kody, musisz najpierw zdefiniować menedżera, aby automatycznie zdefiniował numer kodu kreskowego.
 SeeSubstitutionVars=Spójrz na *, aby uzyskać listę możliwych zmiennych podstawienia
 SeeChangeLog=Zobacz plik ChangeLog (tylko w języku angielskim)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Lewy margines w pliku PDF
 MAIN_PDF_MARGIN_RIGHT=Prawy margines w pliku PDF
 MAIN_PDF_MARGIN_TOP=Górny margines w pliku PDF
 MAIN_PDF_MARGIN_BOTTOM=Dolny margines w pliku PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Dla tego modułu nie jest wymagana żadna konkretna konfiguracja.
 SetToYesIfGroupIsComputationOfOtherGroups=Ustaw na Tak, jeśli grupa ta pochodzi z przetworzenia innych grup
 EnterCalculationRuleIfPreviousFieldIsYes=Wprowadź regułę obliczania, jeśli poprzednie pole było ustawione na Tak (na przykład „CODEGRP1 + CODEGRP2”)
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Kod pocztowy
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Przejdź do Konfiguracja -> Widżety
 MeasuringUnitTypeDesc=Użyj tu wartości takich jak „rozmiar”, „powierzchnia”, „objętość”, „waga”, „czas”
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index f5f09290275..308e26c0b51 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Ilość zdarzeń
 ListOfActions=Lista zdarzeń
 EventReports=Raport zdarzeń
 Location=Lokalizacja
-ToUserOfGroup=Dla każdego użytkownika w grupie
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Wydarzenia całodniowe
 MenuToDoActions=Wszystkie zdarzenia niekompletne
 MenuDoneActions=Wszystkie zdarzenia zakończone
@@ -86,6 +86,8 @@ ProposalDeleted=Oferta usunięta
 OrderDeleted=Zamówienie usunięte
 InvoiceDeleted=Faktura usunięta
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Produkt %s utworzony
 PRODUCT_MODIFYInDolibarr=Produkt %s zmodyfikowany
 PRODUCT_DELETEInDolibarr=Produkt %s usunięty
@@ -158,3 +160,9 @@ DateStartPlusOne=Data rozpoczęcia + 1 godzina
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index ba51f9a09fa..3c3730b9e9c 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Ostani %s zapisani dostawcy
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Ostatnich %s klientów lub potencjalnych klientów
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Ostatnich %s członków
 BoxTitleLastFicheInter=Ostatnie %s zmodyfikowane interwencje
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Ostatnie %s zmodyfikowane oferty
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Faktury Klientów
 ForCustomersOrders=Zamówienia klientów
 ForProposals=Oferty
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Księgowość
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index bd6dd47d637..337d7d5708e 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 87f0a968943..1596c31aaa7 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Opłata ZUS lub podatek
 SocialContributions=Opłaty ZUS lub podatki
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Koszty specjalne
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index d3d46588c71..1e6393b597f 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Uruchomione usługi
 MenuExpiredServices=Wygasłe usługi
 MenuClosedServices=Zamknięte usługi
 NewContract=Nowy kontrakt
-NewContractSubscription=Nowa umowa/subskrypcja
+NewContractSubscription=New contract or subscription
 AddContract=Stwórz kontrakt
 DeleteAContract=Usuń kontrakt
 ActivateAllOnContract=Aktywuj wszystkie usługi
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index d38e189dbff..13d89600986 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Nowa wartość nie może być równa starego
 ErrorFailedToValidatePasswordReset=Nie udało się REINIT hasło. Mogą być wykonywane już reinit (ten link może być używany tylko jeden raz). Jeśli nie, spróbuj ponownie uruchomić proces reinit.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Nie udało się dodać kontaktu
-ErrorDateMustBeBeforeToday=Data nie może być nowsza od dzisiejszej
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Tryb płatność została ustawiona na typ% s, ale konfiguracja modułu faktury nie została zakończona do określenia informacji, aby pokazać tym trybie płatności.
 ErrorPHPNeedModule=Błąd, PHP musi mieć zainstalowany moduł <b>%s</b>, aby korzystać z tej funkcji.
 ErrorOpenIDSetupNotComplete=Ty konfiguracji Dolibarr plik konfiguracyjny, aby umożliwić uwierzytelnianie OpenID, ale adres URL usługi OpenID nie jest zdefiniowany w stałej% s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index 6fc11d89c58..8448976c9dd 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabski
 Language_ar_EG=Arabski (Egipt)
 Language_ar_SA=Arabski
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengalski
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bułgarski
 Language_bs_BA=Bośniacki
 Language_ca_ES=Kataloński
@@ -20,6 +23,7 @@ Language_en_GB=Angielski (Zjednoczone Królestwo)
 Language_en_IN=Angielski (Indie)
 Language_en_NZ=Angielski (Nowa Zelandia)
 Language_en_SA=Angielski (Arabia Saudyjska)
+Language_en_SG=English (Singapore)
 Language_en_US=Angielski (Stany Zjednoczone)
 Language_en_ZA=Angielski (Republika Południowej Afryki)
 Language_es_ES=Hiszpański
@@ -29,6 +33,7 @@ Language_es_CL=Hiszpański (Chile)
 Language_es_CO=Hiszpański (Kolumbia)
 Language_es_DO=Hiszpański (Dominikana)
 Language_es_EC=Hiszpański (Ewkador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Hiszpański (Honduras)
 Language_es_MX=Hiszpański (Meksyk)
 Language_es_PA=Hiszpański (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Hiszpański (Paragwaj)
 Language_es_PE=Hiszpański (Peru)
 Language_es_PR=Hiszpański (Portoryko)
 Language_es_UY=Hiszpański (Urugwaj)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Hiszpański (Wenezuela)
 Language_et_EE=Estoński
 Language_eu_ES=Baskijski
@@ -44,15 +50,22 @@ Language_fi_FI=Fiński
 Language_fr_BE=Francuski (Belgia)
 Language_fr_CA=Francuski (Kanada)
 Language_fr_CH=Francuski (Szwajcaria)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Francuski
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Francuski (Nowa Kaledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Fryzyjski
+Language_gl_ES=Galician
 Language_he_IL=Hebrajski
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Chorwacki
 Language_hu_HU=Węgierski
 Language_id_ID=Indonezyjski
 Language_is_IS=Islandzki
 Language_it_IT=Włoski
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japoński
 Language_ka_GE=Gruziński
 Language_km_KH=Khmerski
@@ -64,6 +77,7 @@ Language_lv_LV=Łotewski
 Language_mk_MK=Macedoński
 Language_mn_MN=Mongolski
 Language_nb_NO=Norweski (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Holenderski (Belgia)
 Language_nl_NL=Dutch
 Language_pl_PL=Polski
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Wietnamski
 Language_zh_CN=Chiński
 Language_zh_TW=Chiński (tradycyjny)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malajski
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 70e3426dcdb..10ef6063468 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacja
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index fbcd7ee2879..3a69a3bf91d 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=Podatek należny/naliczony
 Amount=Ilość
 AmountInvoice=Kwota faktury
 AmountInvoiced=Kwota zafakturowana
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Kwota płatności
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Kwota (zawierająca VAT)
@@ -485,6 +485,7 @@ Categories=Tagi / kategorie
 Category=Tag / kategoria
 By=Przez
 From=Od
+FromDate=Z
 FromLocation=Z
 to=do
 To=do
@@ -687,6 +688,7 @@ Method=Metoda
 Receive=Odbiór
 CompleteOrNoMoreReceptionExpected=Pełna lub niczego więcej nie oczekiwano
 ExpectedValue=Oczekiwana wartość
+ExpectedQty=Expected Qty
 PartialWoman=Część
 TotalWoman=Razem
 NeverReceived=Nigdy nie otrzymała
@@ -703,6 +705,7 @@ MenuECM=Dokumenty
 MenuAWStats=AWStats
 MenuMembers=Członkowie
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Limit Dollibara (Menu główne-setup-bezpieczeństwo): %s KB, PHP, limit: %s KB
 NoFileFound=Brak dokumentów zapisanych w tym katalogu
 CurrentUserLanguage=Język bieżący
@@ -725,7 +728,7 @@ Page=Strona
 Notes=Uwagi
 AddNewLine=Dodaj nowy wiersz
 AddFile=Dodaj plik
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Skopiuj obiekt z jego głównymi atrybutami
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=Cz
 ShortFriday=Pi
 ShortSaturday=So
 ShortSunday=Ni
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Wybierz szablon wiadomości email
 SetRef=Ustaw referencję
 Select2ResultFoundUseArrows=Znaleziono pewne wyniki. Użyj strzałek, aby wybrać.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Informacja
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 99c90443f4d..3c5e9fca126 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Projekt członków
 MembersStatusResiliated=członkowie zakończone
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Zatwierdzony
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Nowe Wkład
 PaymentSubscription=Nowy wkład płatności
 SubscriptionEndDate=Data zakończenia subskrypcji
@@ -78,7 +81,7 @@ DeleteType=Usuń
 VoteAllowed=Głosowanie dozwolone
 Physical=Fizyczne
 Moral=Moralny
-MorPhy=Moralnej i fizycznej
+MorPhy=Natura
 Reenable=Ponownym włączeniu
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/pl_PL/mrp.lang b/htdocs/langs/pl_PL/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/pl_PL/mrp.lang
+++ b/htdocs/langs/pl_PL/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index b8854d61787..42937a4dc0d 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Wybierz profil demo najlepiej odzwierciedlający twoje potrzeby...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 1f7215d547e..34f265a9867 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Ustaw typ kodu kreskowego
 BarcodeValue=Wartość kodu kreskowego
 NoteNotVisibleOnBill=Notatka (nie widoczna na fakturach, ofertach...)
 ServiceLimitedDuration=Jeśli produkt jest usługą z ograniczonym czasem trwania:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Ilość cen
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Kraj pochodzenia
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Krótka etykieta
 Unit=Jednostka
 p=jedn.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Generator wariantów
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Nowy atrybut
 NewProductAttributeValue=Nowa wartość atrybutu
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index bb75befb4e0..05a7af17809 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Współpracownik
 TypeContact_project_task_external_TASKCONTRIBUTOR=Współpracownik
 SelectElement=Wybierz element
 AddElement=Link do elementu
+LinkToElementShort=Link do
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statystyki dotyczące projektów / przewodów
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Zadanie przypisanie. Wprowadzenie czasu na zadanie powinno być możliwe.
 IdTaskTime=Id razem zadaniem
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/pl_PL/recruitment.lang b/htdocs/langs/pl_PL/recruitment.lang
new file mode 100644
index 00000000000..f55547daa9d
--- /dev/null
+++ b/htdocs/langs/pl_PL/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Ustawienia
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = O
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 3dfabc4c372..bb473086ac7 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Usuń wysyłanie
 Stock=Stan
 Stocks=Stany
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Zapasy według lotu/nr seryjnego
@@ -95,14 +95,16 @@ RealStock=Realny magazyn
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Wirtualny zapas
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Identyfikator magazynu
 DescWareHouse=Opis magazynu
 LieuWareHouse=Lokalizacja magazynu
 WarehousesAndProducts=Magazyny i produkty
 WarehousesAndProductsBatchDetail=Magazyny i produkty (z detalami na lot / serial)
-AverageUnitPricePMPShort=Średnia ważona ceny wejściowej
-AverageUnitPricePMP=Średnia ważona ceny wejściowej
+AverageUnitPricePMPShort=Średnia ważona ceny
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Cena sprzedaży jednostki
 EstimatedStockValueSellShort=Wartość sprzedaży
 EstimatedStockValueSell=Wartość sprzedaży
@@ -141,7 +143,7 @@ Replenishments=Uzupełnienie
 NbOfProductBeforePeriod=Ilość produktów w magazynie% s przed wybrany okres (<% s)
 NbOfProductAfterPeriod=Ilość produktów w magazynie% s po wybraniu okres (>% s)
 MassMovement=Masowe przesunięcie
-SelectProductInAndOutWareHouse=Wybierz produkt, ilość, magazyn źródłowy i docelowy magazyn, a następnie kliknij przycisk "% s". Po wykonaniu tych wszystkich wymaganych ruchów, kliknij na "% s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Wpływy do tego celu
 StockMovementRecorded=Przesunięcia zapasu zarejestrowane
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index e6b7942c0fb..f9cfa1e9546 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Dostawcy
 SuppliersInvoice=Faktura dostawcy
 ShowSupplierInvoice=Pokaż fakturę dostawcy
@@ -15,33 +15,33 @@ SomeSubProductHaveNoPrices=Niektóre podprodukty nie mają zdefiniowanych cen
 AddSupplierPrice=Dodaj cenę zakupu
 ChangeSupplierPrice=Zmień cenę zakupu
 SupplierPrices=Ceny dostawców
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ten dostawca jest już powiązany z referencją: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Płatność dostawcy
 SuppliersArea=Obszar dostawcy
-RefSupplierShort=Ref. vendor
+RefSupplierShort=Symbol dostawcy
 Availability=Dostępność
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Faktury i płatności dostawcy
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Zatwierdź to zamówienie
 ConfirmApproveThisOrder=Czy zaakceptować zamówienie <b>%s</b>?
 DenyingThisOrder=Odrzuć to zamówienie
 ConfirmDenyingThisOrder=Czy odrzucić zamówienie <b>%s</b>?
 ConfirmCancelThisOrder=Czy anulować zamówienie <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
+AddSupplierOrder=Utwórz zamówienie
+AddSupplierInvoice=Utwórz fakturę dostawcy
 ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Opóźnienie dostawy w dniach
-DescNbDaysToDelivery=Największe opóźnienie dostawy wśród produktów z tego zamówienia
-SupplierReputation=Vendor reputation
+SentToSuppliers=Wyślij do dostawców
+ListOfSupplierOrders=Lista zamówień
+MenuOrdersSupplierToBill=Zamówienia do zafakturowania
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=Reputacja dostawcy
 DoNotOrderThisProductToThisSupplier=Nie zamawiaj
-NotTheGoodQualitySupplier=Zła jakość
-ReputationForThisProduct=Reputation
+NotTheGoodQualitySupplier=Low quality
+ReputationForThisProduct=Reputacja
 BuyerName=Nazwa kupującego
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductServicePrices=Ceny wszystkich produktów/usług 
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Ceny dostawców
diff --git a/htdocs/langs/pl_PL/ticket.lang b/htdocs/langs/pl_PL/ticket.lang
index ed3cb9d87df..e33e54c62e2 100644
--- a/htdocs/langs/pl_PL/ticket.lang
+++ b/htdocs/langs/pl_PL/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Typ
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Grupa
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Grupa
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 19dd2de7727..e6d255dfee3 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Utworzony użytkownik będzie zewnętrzny użytkownik (po
 IdPhoneCaller=ID dzwoniącego
 NewUserCreated=Użytkownik %s utworzony
 NewUserPassword=Zmiana hasła dla %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Użytkownik %s zmodyfikowany
 UserDisabled=Użytkownik %s wyłączony
 UserEnabled=Użytkownik %s aktywowany
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Wyłączone w trybie konserwacji
 UserAccountancyCode=Kod księgowy użytkownika
 UserLogoff=Użytkownik wylogowany
 UserLogged=Użytkownik zalogowany
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index ab3cdc6ec52..a9750a149e1 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Zamówienie polecenia zapłaty
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Faktura odmówił (Naładuj odrzucenie do klienta)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Czekanie
 StatusTrans=Przekazywane
+StatusDebited=Debited
 StatusCredited=Dobro
+StatusPaid=Płatność
 StatusRefused=Odmówił
 StatusMotif0=Nieokreślone
 StatusMotif1=Przepis insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=Inny powód
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Tylko biuro
 CreateBanque=Tylko bank
 OrderWaiting=Oczekiwania na leczenie
-NotifyTransmision=Wycofanie Przekazanie
-NotifyCredit=Odstąpienia od umowy kredytowej
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Krajowy numer nadajnika
 WithBankUsingRIB=Na rachunkach bankowych z wykorzystaniem RIB
 WithBankUsingBANBIC=Na rachunkach bankowych z wykorzystaniem IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Kredyt na
 WithdrawalFileNotCapable=Nie można wygenerować plik paragon wycofania dla danego kraju:% s (Twój kraj nie jest obsługiwany)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Plik Wycofanie
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Ustaw status "Plik Wysłane"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statystyki według stanu linii
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Rodzaj płatności
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Proszę wybierz tylko jedną
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Żądana kwota
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Kwota: %s <br> Metode: %s <br> Data: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcja dla trybu rzeczywistego nie był ustawiony, zatrzymujemy po tej symulacji
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/pl_PL/workflow.lang b/htdocs/langs/pl_PL/workflow.lang
index f33d455c02a..384e999ce1e 100644
--- a/htdocs/langs/pl_PL/workflow.lang
+++ b/htdocs/langs/pl_PL/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Konfiguracja modułu przepływu pracy
-WorkflowDesc=Moduł ten jest przeznaczony do zmiany zachowania automatycznych działań na język aplikacji. Domyślnie pracy jest otwarty (można robić rzeczy w określonej kolejności). Możesz włączyć automatyczne czynności, które są zainteresowane.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=Nie ma zmiany workflow dostępne z aktywnych modułów.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatycznie stwórz zamówienie klienta po podpisaniu propozycji handlowej (nowe zamówienie będzie miało taką samą kwotę jak oferta)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatycznie stwórz fakturę dla klienta po zatwierdzeniu kontraktu
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Sklasyfikuj powiązaną(e) propozycje handlowe jako zafakturowane, gdy zamówienie klienta jest ustawione jako zafakturowane (i jeśli kwota zamówienia jest taka sama, jak całkowita kwota podpisanych powiązanych propozycji)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatyczne utworzenie
 AutomaticClassification=Automatyczne zaklasyfikowanie
diff --git a/htdocs/langs/pl_PL/zapier.lang b/htdocs/langs/pl_PL/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/pl_PL/zapier.lang
+++ b/htdocs/langs/pl_PL/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 0256ca74930..b515e57a41a 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -163,6 +163,7 @@ UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiro
 OpeningBalance=Saldo inicial
 ShowOpeningBalance=Mostrar saldo inicial
 HideOpeningBalance=Ocultar saldo inicial
+ShowSubtotalByGroup=Mostrar subtotal por grupo
 Pcgtype=Plano de Contas
 PcgtypeDesc=O grupo de contas é usado como critério predefinido de 'filtro' e 'agrupamento' para alguns relatórios contábeis. Por exemplo, 'RENDA' ou 'DESPESA' são usados ​​como grupos para contas contábeis de produtos para criar o relatório de despesas / receitas.
 Reconcilable=Reconciliável
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 0eecbdb7b51..cda7582a8f9 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -225,8 +225,8 @@ MAIN_SMS_SENDMODE=Método usado para enviar SMS
 UserEmail=E-mail do usuário
 CompanyEmail=E-mail da empresa
 FeatureNotAvailableOnLinux=Função não disponível para sistemas tipo Unix. Teste de envio local.
+FixOnTransifex=Corrija a tradução na plataforma de tradução on-line do projeto
 SubmitTranslation=Se a tradução para este idioma não estiver completa ou você encontrar erros, você pode corrigir isso editando os arquivos no diretório <b>langs / %s</b> e enviar sua alteração para www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Se a tradução para este idioma não está completa ou você encontrar erros, você pode corrigir pela edição dos arquivos no diretório <b>langs/%s</b> e enviar os arquivos modificados para dolibarr.org/forum ou para os desenvolvedores em github.com/Dolibarr/dolibarr.
 ModuleSetup=Conf. do módulo
 ModulesSetup=Configuração de Módulos/Aplicativos
 ModuleFamilyCrm=Gestão de Relacionamento com o Cliente (CRM)
@@ -293,11 +293,11 @@ SmsTestMessage=Mensagem Teste de __PHONEFROM__ para __PHONETO__
 ModuleMustBeEnabledFirst=O módulo <b>%s</b> deve estar primeiramente habilitado se você precisa desta funcionalidade.
 SecurityToken=Chave para proteção das URLs
 NoSmsEngine=Nenhum gerenciador de remetente de SMS disponível. Um gerenciador de remetentes SMS não é instalado com a distribuição padrão porque eles dependem de um fornecedor externo, mas você pode encontrar alguns em %s
-PDFDesc=Opções globais para geração de PDF.
-PDFAddressForging=Regras para caixas de endereço
+PDFDesc=Opções globais para geração de PDF
+PDFAddressForging=Regras para seção de endereço
 HideAnyVATInformationOnPDF=Ocultar todas as informações relacionadas a imposto sobre vendas/IVA
 PDFRulesForSalesTax=Regras para ICMS
-HideLocalTaxOnPDF=Ocultar taxa %s na coluna Venda de imposto
+HideLocalTaxOnPDF=Ocultar %s taxa na coluna Imposto sobre vendas / IVA
 HideDescOnPDF=Ocultar descrição dos produtos
 HideRefOnPDF=Ocultar ref. dos produtos.
 HideDetailsOnPDF=Ocultar detalhes das linhas de produtos
@@ -311,6 +311,8 @@ NewVATRates=Taxa de ICMS nova
 PriceBaseTypeToChange=Modificar os preços com base no valor de referência defino em
 MassConvert=Iniciar a conversão em massa
 String=Variável
+String1Line=String (1 linha)
+TextLongNLines=Texto longo (n linhas)
 Int=Inteiro
 Float=Flutuante
 DateAndTime=Data e Hora
@@ -338,11 +340,13 @@ LinkToTestClickToDial=Entre com um número telefônico para chamar e mostrar um
 RefreshPhoneLink=Atualizar link
 LinkToTest=Clique no link gerado pelo usuário <strong>%s</strong> (clique no número telefônico para testar)
 KeepEmptyToUseDefault=Deixe em branco para usar o valor padrão
+KeepThisEmptyInMostCases=Na maioria dos casos, você pode manter esse campo vazio.
 DefaultLink=Link padrão
 SetAsDefault=Definir como padrão
 ValueOverwrittenByUserSetup=Aviso, esse valor pode ser substituido pela configuração especifícada pelo usuário (cada usuário pode ter seu propria URL CliqueParaDiscar)
 ExternalModule=Módulo externo
 InstalledInto=Instalado no diretório %s
+BarcodeInitForThirdparties=Inicialização de código de barras em massa para terceiros
 BarcodeInitForProductsOrServices=Inicialização de código de barras em massa ou redefinir de produtos ou serviços
 CurrentlyNWithoutBarCode=Atualmente, você tem <strong>%s</strong> registro(s) no <strong>%s</strong> %s sem um código de barras definido.
 InitEmptyBarCode=Valor Init para o próximo registros vazios
@@ -410,7 +414,10 @@ Module53Desc=Gestão de Serviços
 Module54Name=Contratos/Assinaturas
 Module55Name=Códigos de Barra
 Module55Desc=Gestor de Códigos de Barra
-Module57Name=Pagamentos por débito direto bancário
+Module56Name=Pagamento por transferência de crédito
+Module56Desc=Gestão do pagamento de fornecedores por ordens de Transferência a Crédito. Inclui a geração de arquivo SEPA para países europeus.
+Module57Name=Pagamentos por Débito Direto
+Module57Desc=Gerenciamento de pedidos de Débito Direto. Inclui a geração de arquivo SEPA para países europeus.
 Module58Name=CliqueParaDiscarl
 Module58Desc=Integração do Sistema CliqueParaDiscar (Asterisk, etc.)
 Module59Desc=Adicione uma função para gerar uma conta Bookmark4u de uma conta Dolibarr
@@ -757,7 +764,8 @@ Permission63003=Excluir recursos
 Permission63004=Conectar os recursos aos eventos da agenda
 DictionaryCompanyType=Tipos de terceiros
 DictionaryCompanyJuridicalType=Entidades jurídicas de terceiros
-DictionaryProspectLevel=Possível cliente
+DictionaryProspectLevel=Nível potencial de prospecção para empresas
+DictionaryProspectContactLevel=Nível potencial de prospecção para contatos
 DictionaryCanton=Estados / Cidades
 DictionaryRegion=Regiões
 DictionaryCivility=Títulos honorários
@@ -782,7 +790,8 @@ DictionaryAccountancyJournal=Relatórios da contabilidade
 DictionaryEMailTemplates=Templates de e-mail
 DictionaryMeasuringUnits=Unidades de Medição
 DictionarySocialNetworks=Redes Sociais
-DictionaryProspectStatus=Status de prospecto de cliente
+DictionaryProspectStatus=Status em potencial para empresas
+DictionaryProspectContactStatus=Status do cliente potencial para contatos
 SetupSaved=Configurações Salvas
 SetupNotSaved=Configuração não salva
 BackToModuleList=Voltar à lista do módulo
@@ -846,7 +855,6 @@ MessageLogin=Mensagem da página de login
 LoginPage=Página de login
 PermanentLeftSearchForm=Formulário permanente de pesquisa no menu esquerdo
 DefaultLanguage=Idioma padrão
-EnableMultilangInterface=Ativar suporte multilíngue
 EnableShowLogo=Mostrar o logotipo da empresa no menu
 CompanyInfo=Empresa / Organização
 CompanyIds=Identidades da empresa / organização
@@ -971,7 +979,7 @@ WarningAtLeastKeyOrTranslationRequired=Pelo menos um critério de busca é exigi
 NewTranslationStringToShow=Nova variável de tradução a ser exibida
 OriginalValueWas=A tradução original foi sobrescrita. O valor original era:<br><br>%s
 TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de tradução ' <strong>%s</strong> ' que não existe em nenhum arquivo de idioma
-TotalNumberOfActivatedModules=Aplicação / módulos ativados: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Módulos ativados
 YouMustEnableOneModule=Você pelo menos deve ativar 1 módulo
 YesInSummer=Sim em verão
 OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os módulos a seguir estão disponíveis para usuários externos (independentemente das permissões de tais usuários) e somente se as permissões forem concedidas: <br>
@@ -987,6 +995,7 @@ AddRefInList=Mostrar ref. Cliente / fornecedor lista de informações (lista de
 AddAdressInList=Exibir lista de informações de endereço do cliente / fornecedor (lista de seleção ou caixa de combinação) <br> Terceiros aparecerão com um formato de nome de "Empresa X. -  Rua tal, n°:21, sala: 123456, Cidade/Estado - Brasil" em vez de "Empresa X".
 FillThisOnlyIfRequired=Exemplo: +2 (Preencha somente se compensar o problema do timezone é experiente)
 NumberingModules=Modelos de numeração
+DocumentModules=Modelos de documentos
 PasswordGenerationStandard=Retorna uma senha gerara de acordo com o algorítimo interno do Dolibarr: 8 caracteres contendo números e letras em letras minusculas.
 PasswordGenerationPerso=Retornar uma senha de acordo com a configuração definida para a sua personalidade.
 PasswordPatternDesc=Descrição do padrão de senha
@@ -1286,14 +1295,12 @@ AccountancyCodeBuy=Código de contas de compras
 AgendaSetup=Configurações do módulo de eventos e agenda
 PasswordTogetVCalExport=Chave para autorizar exportação do link
 PastDelayVCalExport=Não exportar eventos antigos de
-AGENDA_DEFAULT_VIEW=Qual aba voçê quer abrir por padrão quando o menu Agenda e selecionado
 AGENDA_REMINDER_EMAIL=Ativar lembrete de evento <b> por e-mails </b> (A opção de lembrar / atraso pode ser definida em cada evento). Nota: Módulo <strong> 1 %s </strong> deve ser habilitado e configurado corretamente para que o lembrete seja enviado na freqüência correta.
 AGENDA_REMINDER_BROWSER=Ativar lembrete de evento <b>no navegador do usuário</b> (quando a data do evento é atingida, cada usuário pode recusar isso da pergunta de confirmação do navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Habilitar a notificação sonora
 AGENDA_SHOW_LINKED_OBJECT=Exibir objeto conectado na visualização da agenda
 ClickToDialSetup=Configurações do módulo clique para discar
 ClickToDialUrlDesc=URL chamada quando clica-se no ícone do telefone.  Na URL, você pode usar as tags<br><b>__PHONETO__</b> que será substituída pelo número do telefone da pessoa a chamar<br><b>__PHONEFROM__</b> que será substituída pelo telefone da pessoa que está chamando (o seu)<br><b>__LOGIN__</b> que será substituída pelo login clicktodial (definido no cartão do usuário)<br><b>__PASS__</b> que será substituída pela senha clicktodial (definida no cartão do usuário).
-ClickToDialDesc=Este módulo faz um número de telefone links clicáveis. Um clique no ícone fará com que seu telefone ligue para o número. Isso pode ser usado para chamar um sistema de call center da Dolibarr que pode ligar para o número de telefone em um sistema SIP, por exemplo.
 ClickToDialUseTelLink=Use apenas o link "tel." para os números de telefone
 CashDeskSetup=Configuração do módulo de ponto de vendas
 CashDeskBankAccountForSell=Conta default para usar nos pagamentos em dinheiro
@@ -1409,6 +1416,7 @@ ForcedConstants=Valores constantes exigidos
 MailToSendProposal=Propostas de cliente
 MailToSendOrder=Pedido de Venda
 MailToSendShipment=Fretes
+MailToSendReception=Recebimentos
 MailToUser=Usuários
 ByDefaultInList=Exibir como padrão na visualização em lista
 YouUseLastStableVersion=Você utiliza a última versão estável
@@ -1440,6 +1448,7 @@ MAIN_PDF_MARGIN_LEFT=Margem esquerda no PDF
 MAIN_PDF_MARGIN_RIGHT=Margem direita no PDF
 MAIN_PDF_MARGIN_TOP=Margem superior no PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior no PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para o logotipo em PDF
 NothingToSetup=Não há configuração específica necessária para este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como yes se este grupo for um cálculo de outros grupos
 SeveralLangugeVariatFound=Várias variantes de idioma encontradas
@@ -1466,13 +1475,10 @@ NoNewEmailToProcess=Nenhum novo e-mail (filtros correspondentes) para processar
 XEmailsDoneYActionsDone=%s e-mails qualificados, %s e-mails processados com sucesso (para registro %s/ações executadas)
 RecordEvent=Registrar evento de e-mail
 CreateLeadAndThirdParty=Criar lead (e terceiro, se necessário)
-CreateTicketAndThirdParty=Criar ticket (e terceiros, se necessário)
 CodeLastResult=Código do último resultado
 NbOfEmailsInInbox=Número de e-mails no diretório de origem
 LoadThirdPartyFromName=Carregar pesquisa de terceiros em %s (carregar somente)
 LoadThirdPartyFromNameOrCreate=Carregar pesquisa de terceiros em %s (criar se não for encontrado)
-WithDolTrackingID=Referência Dolibarr encontrada no ID da mensagem
-WithoutDolTrackingID=Referência Dolibarr não encontrada no ID da mensagem
 FormatZip=CEP
 MainMenuCode=Código de entrada do menu (mainmenu)
 ECMAutoTree=Mostrar árvore de ECM automática
@@ -1507,8 +1513,8 @@ ImportSetup=Configuração do módulo Importar
 InstanceUniqueID=ID exclusivo da instância
 SmallerThan=Menor que
 LargerThan=Maior que
-IfTrackingIDFoundEventWillBeLinked=Observe que, se um ID de rastreamento for encontrado no e-mail recebido, o evento será automaticamente vinculado aos objetos relacionados.
 WithGMailYouCanCreateADedicatedPassword=Com uma conta do GMail, se você ativou a validação de 2 etapas, é recomendável criar uma segunda senha dedicada para o aplicativo, em vez de usar sua própria senha da conta em https://myaccount.google.com/.
+EmailCollectorTargetDir=Pode ser um comportamento desejado mover o email para outra tag / diretório quando ele foi processado com êxito. Basta definir o nome do diretório aqui para usar este recurso (NÃO use caracteres especiais no nome). Observe que você também deve usar uma conta de logon de leitura / gravação.
 EmailCollectorLoadThirdPartyHelp=Você pode usar esta ação para usar o conteúdo de email para localizar e carregar uma terceira parte existente em seu banco de dados. A terceira parte encontrada (ou criada) será usada para seguir as ações que precisam dela. No campo de parâmetro, você pode usar, por exemplo, 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' se desejar extrair o nome da terceira parte de uma cadeia de caracteres 'Name: name to find' encontrada na corpo.
 EndPointFor=Ponto final para %s : %s
 DeleteEmailCollector=Excluir coletor de e-mail
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index bf6409fc199..3a43dd851ea 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -4,7 +4,7 @@ LocalAgenda=Calendário local
 ActionsOwnedBy=Evento de propriedade do
 ListOfActions=Lista de eventos
 EventReports=Relatório de eventos
-ToUserOfGroup=Para qualquer usuário no grupo
+ToUserOfGroup=Evento atribuído a qualquer usuário no grupo
 EventOnFullDay=Evento no(s) dia(s) todo
 MenuToDoMyActions=Meus eventos incompletos
 MenuDoneMyActions=Meus eventos terminados
@@ -44,6 +44,7 @@ ShipmentClassifyClosedInDolibarr=Expedição%s classificado(s) e faturado(s)
 ShipmentUnClassifyCloseddInDolibarr=Remessa %s classificada como reaberta
 ShipmentBackToDraftInDolibarr=Embarque %s voltou à situação rascunho
 ShipmentDeletedInDolibarr=Envio %s cancelado
+ReceptionValidatedInDolibarr=Recepção %s validada
 OrderCreatedInDolibarr=Pedido %s criado
 OrderValidatedInDolibarr=Pedido %s validado
 OrderDeliveredInDolibarr=Ordem %s classificadas entregues
@@ -119,3 +120,6 @@ RepeatEvent=Repita evento
 EveryWeek=Toda semana
 EveryMonth=Todo mês
 DateStartPlusOne=Data de início + 1 hora
+SetAllEventsToTodo=Defina todos os eventos para todo
+SetAllEventsToInProgress=Defina todos os eventos como em andamento
+SetAllEventsToFinished=Definir todos os eventos como concluídos
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 2c24ee6c107..34fb1404b65 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -177,6 +177,7 @@ setPaymentConditionsShortRetainedWarranty=Definir condições de pagamento da ga
 setretainedwarranty=Definir garantia estendida
 setretainedwarrantyDateLimit=Definir limite de data de garantia estendida
 RetainedWarrantyDateLimit=Limite de data de garantia estendida
+RetainedWarrantyNeed100Percent=O progresso da fatura precisa estar em 100%% para que possa ser exibida em PDF
 AlreadyPaid=Já está pago
 AlreadyPaidBack=Já está estornado
 RemainderToPay=Restante para pagar
@@ -272,6 +273,7 @@ DateIsNotEnough=Data ainda não alcançada
 InvoiceGeneratedFromTemplate=Fatura %s gerada a partir do tema de fatura recorrente %s
 GeneratedFromTemplate=Gerado a partir da fatura do modelo %s
 WarningInvoiceDateInFuture=Atenção, a data da fatura é superior à data atual
+GroupPaymentsByModOnReports=Agrupar pagamentos por modo nos relatórios
 PaymentConditionShortRECEP=Após o recebimento
 PaymentConditionRECEP=Após o recebimento
 PaymentConditionShort30DENDMONTH=30 dias do fim do mês
@@ -300,6 +302,8 @@ BankAccountNumberKey=Soma de verificação
 Residence=Endereço
 IBANNumber=Número da conta IBAN
 IBAN=Agencia
+CustomerIBAN=IBAN do cliente
+SupplierIBAN=IBAN do fornecedor
 BICNumber=Código BIC/SWIFT
 ExtraInfos=Informações extras
 RegulatedOn=Regulamentado em
@@ -398,3 +402,5 @@ DoNotGenerateDoc=Não gere arquivo de documento
 BILL_DELETEInDolibarr=Fatura excluída
 BILL_SUPPLIER_DELETEInDolibarr=Fatura de fornecedor excluída
 UnitPriceXQtyLessDiscount=Preço unitário x Qtd. - Desconto
+CustomersInvoicesArea=Área de cobrança do cliente
+SupplierInvoicesArea=Área de cobrança do cliente
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index 6d8c6cb4ea8..77eb32557aa 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -20,8 +20,8 @@ BoxTitleLastSuppliers=Últimos %s fornecedores registrados
 BoxTitleLastModifiedSuppliers=Fornecedores: último %s modificado
 BoxTitleLastModifiedCustomers=Clientes: último %s modificado
 BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospectos de cliente
-BoxTitleLastCustomerBills=Últimas faturas do cliente %s
-BoxTitleLastSupplierBills=Últimas %s faturas do fornecedor
+BoxTitleLastCustomerBills=Últimas %s faturas de cliente modificadas mais recentes
+BoxTitleLastSupplierBills=Últimas %s  faturas de fornecedor modificadas mais recentes
 BoxTitleLastModifiedProspects=Perspectivas: último %s modificado
 BoxTitleOldestUnpaidCustomerBills=Faturas do cliente: o mais antigo %s não pago
 BoxTitleOldestUnpaidSupplierBills=Faturas do fornecedor: o mais antigo %s não remunerado
@@ -66,6 +66,7 @@ BoxTitleLatestModifiedSupplierOrders=Ordens do Vendedor: último %s modificado
 BoxTitleLastModifiedCustomerBills=Faturas do cliente: último %s modificado
 BoxTitleLastModifiedCustomerOrders=Pedidos de Vendas: último %s modificado
 BoxTitleLastModifiedPropals=Últimas %s propostas modificadas
+BoxTitleLatestModifiedJobPositions=Últimos %s trabalhos alterados
 ForCustomersInvoices=Faturas de clientes
 ForCustomersOrders=Pedidos de clientes
 LastXMonthRolling=Ultima %s mensal
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index f75ae1d2536..ff2e4bbd438 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -51,7 +51,6 @@ POSModule=Módulo PDV
 BasicPhoneLayout=Usar layout básico para telefones
 SetupOfTerminalNotComplete=A configuração do terminal 1%s não está concluída
 DirectPayment=Pagamento direto
-DirectPaymentButton=Botão de pagamento direto em dinheiro
 InvoiceIsAlreadyValidated=A fatura já está validada
 NoLinesToBill=Nenhuma linha para cobrança
 CustomReceipt=Recibo personalizado
@@ -67,12 +66,10 @@ TakeposConnectorMethodDescription=Módulo externo com recursos extras. Possibili
 PrintMethod=Método de impressão
 ReceiptPrinterMethodDescription=Método poderoso com muitos parâmetros. Completamente personalizável com modelos. Não é possível imprimir a partir da nuvem.
 ByTerminal=Pelo terminal
-TakeposNumpadUsePaymentIcon=Use o ícone de pagamento no numpad
 CashDeskRefNumberingModules=Módulo de numeração para vendas PDV
 CashDeskGenericMaskCodes6 =<br>A tag {TN} é usada para adicionar o número do terminal
 TakeposGroupSameProduct=Agrupe as mesmas linhas de produtos
 StartAParallelSale=Iniciar uma nova venda paralela
-ControlCashOpening=Caixa de controle na posição de abertura
 CloseCashFence=Fechar cerca de dinheiro
 CashReport=Relatório de caixa
 MainPrinterToUse=Impressora principal a ser usada
@@ -80,3 +77,14 @@ OrderPrinterToUse=Solicite impressora a ser usada
 MainTemplateToUse=Modelo principal a ser usado
 OrderTemplateToUse=Modelo de pedido a ser usado
 BarRestaurant=Bar Restaurante
+AutoOrder=Encomendado pelo próprio cliente
+CustomerMenu=Menu do cliente
+ScanToMenu=Digitalize o código QR para ver o menu
+ScanToOrder=Digitalize o código QR para fazer o pedido
+Appearance=Aparência
+HideCategoryImages=Ocultar imagens da categoria
+HideProductImages=Ocultar imagens do produto
+NumberOfLinesToShow=Número de linhas de imagens a mostrar
+DefineTablePlan=Definir plano de tabelas
+GiftReceipt=Recibo de presente
+ModuleReceiptPrinterMustBeEnabled=A impressora de recibos do módulo deve ter sido habilitada primeiro
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 5ac8584e46f..afe2c1ac0b2 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -26,6 +26,7 @@ ErrorBarCodeAlreadyUsed=Código de barras já usado
 ErrorSupplierCodeRequired=Código de fornecedor necessário
 ErrorSupplierCodeAlreadyUsed=Código do fornecedor já usado
 ErrorBadParameters=Parâmetros inadequados
+ErrorWrongParameters=Parâmetros errados ou ausentes
 ErrorBadValueForParameter=Valor incorreto '%s' para o parâmetro '%s'
 ErrorBadImageFormat=Arquivo imagem de formato não suportado (Seu PHP não suporta funções para converter neste formato)
 ErrorBadDateFormat=O valor '%s' tem o formato de data errada
@@ -108,7 +109,8 @@ ErrorFailedToRemoveToMailmanList=Falha ao remover registro% s para% s Mailman li
 ErrorNewValueCantMatchOldValue=O novo valor não pode ser igual ao anterior
 ErrorFailedToValidatePasswordReset=Falha ao reinicializar senha. Pode ser o reinit já foi feito (este link pode ser usado apenas uma vez). Se não, tente reiniciar o processo reinit.
 ErrorFailedToAddContact=Houve uma falha ao adicionar o contato
-ErrorDateMustBeBeforeToday=A data não pode ser posterior ao dia de hoje
+ErrorDateMustBeBeforeToday=A data deve ser menor que hoje
+ErrorDateMustBeInFuture=A data deve ser maior que hoje
 ErrorPaymentModeDefinedToWithoutSetup=A modalidade de pagamento foi definido para tipo% s mas a configuração do módulo de fatura não foi concluída para definir as informações para mostrar para esta modalidade de pagamento.
 ErrorPHPNeedModule=Erro, o PHP deve ter <b>módulo% s</b> instalado para usar este recurso.
 ErrorOpenIDSetupNotComplete=Você arquivo de configuração Dolibarr configuração para permitir a autenticação OpenID, mas a URL de serviço OpenID não está definido em constante% s
@@ -134,6 +136,7 @@ ErrorMandatoryParametersNotProvided=Parâmetro (s) de preenchimento obrigatório
 ErrorOppStatusRequiredIfAmount=Você define um valor estimado para esse lead. Então você também deve inserir seu status.
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Má definição da matriz Menu No Módulo Descritor (mau valor para fk_menu chave)
 ErrorWarehouseRequiredIntoShipmentLine=É exigido um armazém na linha para a remessa
+ErrorFilenameCantStartWithDot=O nome do arquivo não pode começar com com caracteres especiais
 ErrorSupplierCountryIsNotDefined=País para este fornecedor não está definido. Corrija isso primeiro.
 ErrorsThirdpartyMerge=Falha em mesclar os dois registros. Solicitação cancelada.
 ErrorModuleNotFound=O arquivo do módulo não foi encontrado.
@@ -180,3 +183,4 @@ WarningSomeLinesWithNullHourlyRate=Algumas vezes foram registrados por alguns us
 WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por questões de segurança, você terá de autenticar-se com o seu novo login antes da próxima ação.
 WarningProjectClosed=O projeto está fechado. Você deve reabri-lo primeiro.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Algumas transações bancárias foram removidas após geração do recebimento, incluindo elas. Portanto, o número de cheques e o total de recebimento podem diferir do número e do total na lista.
+WarningFailedToAddFileIntoDatabaseIndex=Aviso, falha ao adicionar entrada de arquivo na tabela de índice do banco de dados ECM
diff --git a/htdocs/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang
index 6f7ded306ea..b266a10b972 100644
--- a/htdocs/langs/pt_BR/languages.lang
+++ b/htdocs/langs/pt_BR/languages.lang
@@ -9,6 +9,5 @@ Language_ka_GE=Georgiano
 Language_lo_LA=Laosiano
 Language_mk_MK=Macedônio
 Language_mn_MN=mongol
-Language_nl_NL=Holandês
 Language_pl_PL=Polonês
 Language_bh_MY=malaio
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index 773a06e5e08..e0efe3c7f34 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -96,5 +96,6 @@ NoContactWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com um
 NoContactLinkedToThirdpartieWithCategoryFound=Nenhum foi encontrado nenhum contato/endereço com uma categoria
 OutGoingEmailSetup=Configuração de e-mail de saída
 InGoingEmailSetup=Configuração de e-mail de entrada
+OutGoingEmailSetupForEmailing=Configuração de email de saída (para o módulo %s)
 DefaultOutgoingEmailSetup=Configuração de e-mail de saída padrão
 ContactsWithThirdpartyFilter=Contatos com filtro de terceiros
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index b1f7b0dbc05..16df49a3432 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -21,6 +21,7 @@ FormatDateHourTextShort=%d %b, %Y, %I:%M %p
 FormatDateHourText=%d %B, %Y, %I:%M %p
 DatabaseConnection=Login à Base de Dados
 NoTemplateDefined=Nenhum modelo disponível para este tipo de email
+EmptySearchString=Digite critérios na pesquisa
 NoRecordFound=Nenhum registro encontrado
 NoRecordDeleted=Nenhum registro foi deletado
 NotEnoughDataYet=Sem dados suficientes
@@ -121,6 +122,7 @@ Show=Ver
 Hide=ocultar
 ShowCardHere=Mostrar cartão
 SearchMenuShortCut=Ctrl + Shift + F
+QuickAdd=Adição rápida
 Upload=Carregar
 Resize=Modificar tamanho
 ResizeOrCrop=Redimensionar ou cortar
@@ -193,8 +195,7 @@ PriceUTTC=U.P. (inc. Impostos)
 Amount=Valor
 AmountInvoice=Valor Fatura
 AmountInvoiced=Valor faturado
-AmountInvoicedHT=Valor faturado (incl. impostos)
-AmountInvoicedTTC=Valor faturado (sem imposto)
+AmountInvoicedHT=Valor faturado (sem imposto)
 AmountPayment=Valor Pagamento
 AmountHTShort=Quantidade (liq.)
 AmountTTCShort=Valor (incl. taxas)
@@ -277,6 +278,7 @@ Available=Disponivel
 NotYetAvailable=Ainda não disponível
 NotAvailable=Não disponível
 Categories=Tags / categorias
+Category=Tag / categoria
 to=para
 To=para
 OtherInformations=Outra informação
@@ -322,6 +324,7 @@ AlreadyRead=Já lido
 NoMobilePhone=Sem celular
 Refresh=Atualizar
 BackToList=Mostar Lista
+BackToTree=Voltar à árvore
 CanBeModifiedIfOk=Pode modificarse se é valido
 CanBeModifiedIfKo=Pode modificarse senão é valido
 ValueIsValid=Valor é válido
@@ -339,6 +342,7 @@ YouCanChangeValuesForThisListFromDictionarySetup=Você pode alterar valores para
 YouCanChangeValuesForThisListFrom=Você pode alterar valores para esta lista no menu %s
 YouCanSetDefaultValueInModuleSetup=Você pode definir o valor padrão usado ao criar um novo registro na configuração do módulo
 UploadDisabled=Carregamento Desativada
+MenuTaxesAndSpecialExpenses=Impostos | Despesas especiais
 ThisLimitIsDefinedInSetup=Límite Dolibarr (menu inicio-configuração-segurança): %s Kb, PHP limit: %s Kb
 CurrentTheme=Tema atual
 CurrentMenuManager=Administração do menu atual
@@ -348,7 +352,7 @@ HidePassword=Mostrar comando com senha oculta
 UnHidePassword=Mostrar comando real com a senha visivel
 RootOfMedias=Raiz das mídias públicas (/ media)
 AddFile=Adicionar arquivo
-FreeZone=Não é um produto / serviço predefinido
+FreeZone=Produto de texto livre
 FreeLineOfType=Item de texto livre, digite:
 CloneMainAttributes=Clonar o objeto com estes atributos
 ReGeneratePDF=Re-gerar PDF
@@ -433,6 +437,7 @@ Sincerely=Sinceramente
 ConfirmDeleteObject=Tem certeza de que deseja excluir este objeto?
 DeleteLine=Apagar linha
 ConfirmDeleteLine=Você tem certeza que deseja excluir esta linha?
+ErrorPDFTkOutputFileNotFound=Erro: o arquivo não foi gerado. Verifique se o comando 'pdftk' está instalado em um diretório incluído na variável de ambiente $ PATH (somente linux / unix) ou entre em contato com o administrador do sistema.
 NoPDFAvailableForDocGenAmongChecked=Nenhum PDF estava disponível para a geração de documentos entre os registros verificados
 TooManyRecordForMassAction=Registros demais selecionados para ação em massa. A ação é restrita a uma lista de registros %s.
 NoRecordSelected=Nenhum registro selecionado
@@ -544,3 +549,5 @@ DeleteFileText=Deseja realmente excluir este arquivo?
 ShowOtherLanguages=Mostrar outros idiomas
 SwitchInEditModeToAddTranslation=Alterne modo de edição para adicionar traduções para este idioma
 NotUsedForThisCustomer=Não usado para este cliente
+AmountMustBePositive=O valor deve ser positivo
+ByStatus=Por status
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index 75beb2d23b6..f78ff76914b 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -33,6 +33,8 @@ MemberStatusPaidShort=Até à data
 MemberStatusResiliated=Membro encerrado
 MemberStatusResiliatedShort=Encerrado
 MembersStatusResiliated=Membros encerrados
+MemberStatusNoSubscription=Validado (nenhuma assinatura é necessária)
+SubscriptionNotNeeded=Nenhuma assinatura necessária
 PaymentSubscription=Subscrição de Pagamento
 SubscriptionEndDate=data final filiação
 NewSubscriptionDesc=Este formulário permite que você grave a sua assinatura como um novo membro da fundação. Se você quiser renovar a sua assinatura (se já for membro), por favor, entre em contato com Conselho de Fundadores não por e-mail.
@@ -44,7 +46,7 @@ SendCardByMail=Enviar cartão por e-mail
 NoTypeDefinedGoToSetup=nenhum tipo de membro definido. ir a configuração -> Tipos de Membros
 WelcomeEMail=Bem-vindo e-mail
 Physical=Físico
-MorPhy=Moral/Físico
+MorPhy=Tipo de produto
 Reenable=Reativar
 ResiliateMember=Encerrar um membro
 ConfirmResiliateMember=Você tem certeza que deseja encerrar este membro?
diff --git a/htdocs/langs/pt_BR/mrp.lang b/htdocs/langs/pt_BR/mrp.lang
index bfb2005baea..ee398122b08 100644
--- a/htdocs/langs/pt_BR/mrp.lang
+++ b/htdocs/langs/pt_BR/mrp.lang
@@ -3,7 +3,6 @@ Mrp=Ordens de fabricação
 MO=Ordem de fabricação
 MRPDescription=Módulo para gerenciar ordens de produção e manufatura (MO).
 MRPArea=Area MRP
-MrpSetupPage=Configuração do módulo MRP
 MenuBOM=Lista de materiais
 LatestBOMModified=Última BOM modificada %s
 LatestMOModified=%s pedidos de manufatura mais recentes modificados
@@ -25,7 +24,6 @@ WatermarkOnDraftMOs=Marca d'água no rascunho MO
 ConfirmCloneBillOfMaterials=Tem certeza de que deseja clonar a lista de materiais %s?
 ConfirmCloneMo=Tem certeza de que deseja clonar a ordem de fabricação %s?
 ManufacturingEfficiency=Eficiência de fabricação
-ConsumptionEfficiency=Eficiência de consumo
 ValueOfMeansLoss=Valor de 0,95 significa uma média de 5 %% de perda durante a produção
 ValueOfMeansLossForProductProduced=Valor de 0,95 significa uma média de 5 %% de perda na produção do produto
 DeleteBillOfMaterials=Excluir lista de materiais
@@ -38,12 +36,10 @@ QtyToProduce=Qtd. para produzir
 DateStartPlannedMo=Data início planejada
 DateEndPlannedMo=Data final planejada
 KeepEmptyForAsap=Vazio significa "o mais breve possível"
-EstimatedDuration=Duração estimada
 EstimatedDurationDesc=Duração estimada para fabricar este produto usando esta lista técnica
 ConfirmValidateBom=Tem certeza que deseja validar a lista técnica com a referência <strong>%s</strong> (você poderá usá-la para criar novas ordens de fabricação)
 ConfirmCloseBom=Tem certeza de que deseja cancelar esta lista técnica (você não poderá mais usá-la para criar novas ordens de fabricação)?
 ConfirmReopenBom=Tem certeza de que deseja reabrir esta lista técnica (você poderá usá-la para criar novas ordens de fabricação)
-StatusMOProduced=Produzido
 QtyFrozen=Qtd. congelada
 QuantityFrozen=Quantidade congelada
 QuantityConsumedInvariable=Quando esse sinalizador é definido, a quantidade consumida é sempre o valor definido e não é relativa à quantidade produzida.
@@ -58,7 +54,6 @@ ToProduce=Produzir
 QtyAlreadyConsumed=Quant. consumida
 QtyAlreadyProduced=Quant. produzida
 QtyRequiredIfNoLoss=Quantidade necessária se não houver perda (a eficiência de fabricação é 100 %%)
-ConsumeOrProduce=Consumir ou Produzir
 ConsumeAndProduceAll=Consumir e produzir todos
 Manufactured=Fabricado
 TheProductXIsAlreadyTheProductToProduce=O produto a ser adicionado já é o produto a ser produzido.
@@ -72,7 +67,4 @@ ProductQtyToConsumeByMO=Quantidade do produto a ser consumida por MO aberto
 ProductQtyToProduceByMO=Quantidade do produto ser produzida por MO aberto
 AddNewConsumeLines=Adicione nova linha para consumir
 ProductsToConsume=Produtos para consumir
-ProductsToProduce=Produtos para produzir
-UnitCost=Custo unitário
-TotalCost=Custo total
 BOMTotalCost=O custo para produzir essa lista técnica com base no custo de cada quantidade e produto a consumir (use o preço de custo, se definido, ou o preço médio ponderado, se definido, ou o melhor preço de compra)
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index e3dcffe327a..c529c093c03 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -28,6 +28,7 @@ ServicesOnPurchase=Serviços para compra
 ServicesOnPurchaseOnly=Serviços somente para compra
 ServicesNotOnSell=Serviços não para venda e não para compra
 ServicesOnSellAndOnBuy=Serviços para venda e compra
+LastModifiedProductsAndServices=Últimos %s produtos | serviços alterados recentemente
 LastRecordedProducts=Últimos %s produtos gravados
 LastRecordedServices=Últimos %s serviços gravados
 Stock=Estoque
@@ -61,6 +62,7 @@ SupplierCard=Cartão do fornecedor
 NoteNotVisibleOnBill=Nota (não visivel em faturas, orçamentos etc.)
 MultiPricesAbility=Vários segmentos de preço por produto/serviço (cada cliente está em um segmento de preço)
 MultiPricesNumPrices=Número de preços
+DefaultPriceType=Base de preços por padrão (com ou sem impostos) ao adicionar novos preços de venda
 AssociatedProductsNumber=N� de produtos associados
 ParentProductsNumber=Numero de pacotes pais do produto
 ParentProducts=Produtos pai
@@ -105,6 +107,8 @@ SuppliersPrices=Preços de fornecedores
 SuppliersPricesOfProductsOrServices=Preços do fornecedor (produtos ou serviços)
 CountryOrigin=Pais de origem
 Nature=Natureza do produto (material / finalizado)
+NatureOfProductShort=Natureza do produto
+NatureOfProductDesc=Matéria-prima ou produto acabado
 ShortLabel=Etiqueta curta
 set=conjunto
 se=conjunto
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 14be8f16e1d..716fa43b767 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -113,6 +113,7 @@ TypeContact_project_task_internal_TASKEXECUTIVE=Tarefa executada
 TypeContact_project_task_external_TASKEXECUTIVE=Tarefa executada
 SelectElement=Selecionar componente
 AddElement=Link para componente
+LinkToElementShort=Link para
 PlannedWorkload=carga horária planejada
 ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado
 FirstAddRessourceToAllocateTime=Atribuir um recurso do usuário como contato do projeto para alocar tempo
@@ -123,7 +124,6 @@ ProjectOverview=Visão geral
 ManageOpportunitiesStatus=Use projetos para acompanhar leads / opportinuties
 ProjectNbProjectByMonth=Nº. de projetos criados por mês
 ProjectNbTaskByMonth=Nº. de tarefas criadas por mês
-ProjectsStatistics=As estatísticas sobre projetos / leads
 TaskAssignedToEnterTime=Tarefa atribuída. Entrando tempo nesta tarefa deve ser possível.
 IdTaskTime=Horário do ID da tarefa
 YouCanCompleteRef=Se vc quiser completar o num.ref com algum sufixo, é recomendado adicionar um caractere separador, dessa forma a numeração automática irá funcionar corretamente para os prox. projetos. Ex. 1%s-meusufix
diff --git a/htdocs/langs/pt_BR/receiptprinter.lang b/htdocs/langs/pt_BR/receiptprinter.lang
index b9a7da6e026..fcf16791aac 100644
--- a/htdocs/langs/pt_BR/receiptprinter.lang
+++ b/htdocs/langs/pt_BR/receiptprinter.lang
@@ -37,7 +37,6 @@ DOL_ACTIVATE_BUZZER=Ative buzzer
 DOL_PRINT_QRCODE=Imprimir QR Code
 DOL_PRINT_LOGO=Imprimir logotipo da minha empresa
 DOL_PRINT_LOGO_OLD=Imprimir logotipo da minha empresa (impressoras antigas)
-DOL_BOLD=Negrito
 DOL_BOLD_DISABLED=Desabilitar negrito
 DOL_DOUBLE_HEIGHT=Tamanho duplo para altura
 DOL_DOUBLE_WIDTH=Tamanho duplo para largura
@@ -45,26 +44,14 @@ DOL_DEFAULT_HEIGHT_WIDTH=Tamanho padrão para altura e largura
 DOL_UNDERLINE=Habilitar sublinhado
 DOL_UNDERLINE_DISABLED=Desabilitar sublinhado
 DOL_BEEP=Som Beep
-DOL_PRINT_TEXT=Imprimir texto
-DateInvoiceWithTime=Data e hora da fatura
-YearInvoice=Ano da fatura
 DOL_VALUE_MONTH_LETTERS=Ano da fatura
 DOL_VALUE_MONTH=Ano da fatura
-DOL_VALUE_DAY=Dia da fatura
 DOL_VALUE_DAY_LETTERS=Data da fatura em letras
-DOL_LINE_FEED_REVERSE=Alimentação de linha reversa
 InvoiceID=ID da fatura
-DOL_PRINT_OBJECT_LINES=Linhas da fatura
 DOL_VALUE_CUSTOMER_FIRSTNAME=Nome do cliente
 DOL_VALUE_CUSTOMER_LASTNAME=Sobrenome do cliente
 DOL_VALUE_CUSTOMER_MAIL=E-mail do cliente
-DOL_VALUE_CUSTOMER_PHONE=Telefone do cliente
 DOL_VALUE_CUSTOMER_MOBILE=Celular do cliente
-DOL_VALUE_CUSTOMER_SKYPE=Skype do cliente
 DOL_VALUE_CUSTOMER_TAX_NUMBER=Número fiscal do cliente
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Saldo da conta do cliente
-DOL_VALUE_MYSOC_NAME=O nome da sua empresa
 VendorLastname=Sobrenome do fornecedor
 VendorFirstname=Nome do fornecedor
-DOL_VALUE_CUSTOMER_POINTS=Pontos do cliente
-DOL_VALUE_OBJECT_POINTS=Pontos de objeto
diff --git a/htdocs/langs/pt_BR/recruitment.lang b/htdocs/langs/pt_BR/recruitment.lang
new file mode 100644
index 00000000000..15059d4cc8d
--- /dev/null
+++ b/htdocs/langs/pt_BR/recruitment.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - recruitment
+ModuleRecruitmentDesc =Gerenciar e acompanhar campanhas de recrutamento para novos cargos
+RecruitmentSetup =Configuração de recrutamento
+RecruitmentAbout =Sobre o recrutamento
+RecruitmentAboutPage =Recrutamento sobre a página
+NbOfEmployeesExpected=Número esperado de funcionários
+JobLabel=Etiqueta do cargo
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index a04e49809f8..b99798f63a0 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -8,6 +8,10 @@ WarehouseTarget=Armazém de destino
 ValidateSending=Apagar envio
 CancelSending=Cancelar envio
 DeleteSending=Apagar envio
+MissingStocks=Estoques ausentes
+StockAtDate=Estoques por data
+StockAtDateInPast=Data anterior
+StockAtDateInFuture=Próxima futura
 StocksByLotSerial=Estoques por lote/nº de série
 LotSerial=Lotes/Series
 LotSerialList=Listagem de lotes/series
@@ -17,6 +21,7 @@ MovementId=ID de movimento
 StockMovementForId=ID de movimento %d
 StocksArea=Setor de armazenagem
 AllWarehouses=Todos os armazéns
+IncludeEmptyDesiredStock=Incluir também o estoque indefinido desejado
 IncludeAlsoDraftOrders=Incluir também projetos de pedidos
 NumberOfProducts=Número total de produtos
 LastMovement=Último movimento
@@ -29,6 +34,11 @@ UnitPurchaseValue=Preço unitário de compra
 StockTooLow=Estoque muito baixo
 EnhancedValueOfWarehouses=Valor de estoques
 AllowAddLimitStockByWarehouse=Gerenciar também o valor do estoque mínimo e desejado por emparelhamento (armazém de produtos), além do valor do estoque mínimo e desejado por produto
+RuleForWarehouse=Regra para armazéns
+WarehouseAskWarehouseDuringOrder=Definir um armazém em Pedidos de venda
+UserDefaultWarehouse=Definir um armazém em Usuários
+MainDefaultWarehouse=Armazém padrão
+MainDefaultWarehouseUser=Use um armazém padrão para cada usuário
 QtyDispatched=Quantidade despachada
 QtyDispatchedShort=Qtde despachada
 QtyToDispatchShort=Qtde a despachar
@@ -48,13 +58,10 @@ RealStock=Estoque real
 RealStockDesc=Estoque físico/real é o estoque atualmente nos depósitos.
 RealStockWillAutomaticallyWhen=O estoque real será modificado de acordo com esta regra (conforme definido no módulo Stock):
 VirtualStock=Estoque virtual
-VirtualStockDesc=O estoque virtual é o estoque calculado disponível uma vez que todas as ações abertas/pendentes (que afetam os estoques) sejam fechadas (pedidos de compra recebidos, pedidos de vendas enviados etc.)
 IdWarehouse=Id. armazenamento
 DescWareHouse=Descrição do armazém
 LieuWareHouse=Localização do armazenamento
 WarehousesAndProducts=Armazenamento de produtos
-AverageUnitPricePMPShort=Preço médio de entrada
-AverageUnitPricePMP=Preço médio de entrada
 SellPriceMin=Venda Preço unitário
 EstimatedStockValueSellShort=Valor para venda
 EstimatedStockValueSell=Valor para venda
@@ -88,7 +95,6 @@ ReplenishmentOrdersDesc=Esta é uma lista de todos os pedidos de compra em abert
 NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado
 NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois
 MassMovement=Movimentações em massa
-SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um armazém de origem e um armazém de destino e clique em "% s". Uma vez feito isso para todos os movimentos necessários, clique em "% s".
 ReceivingForSameOrder=Recibos para este fim
 StockMovementRecorded=Movimentações de estoque registradas
 RuleForStockAvailability=Regras sobre os requisitos de ações
@@ -122,3 +128,4 @@ InventoryForASpecificWarehouse=Inventário para um armazém específico
 InventoryForASpecificProduct=Inventário para um produto específico
 StockIsRequiredToChooseWhichLotToUse=É necessário estoque para escolher qual lote usar
 ForceTo=Forçar a
+AlwaysShowFullArbo=Exibir a árvore completa do armazém no pop-up dos links do armazém (Aviso: isso pode diminuir drasticamente o desempenho)
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
index 85614b809bb..e3155bfae84 100644
--- a/htdocs/langs/pt_BR/suppliers.lang
+++ b/htdocs/langs/pt_BR/suppliers.lang
@@ -1,18 +1,15 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Vendedores
-SuppliersInvoice=Fatura do fornecedores
-ShowSupplierInvoice=Mostrar fatura do fornecedores
-NewSupplier=Novo fornecedores
-ShowSupplier=Mostrar fornecedores
+SuppliersInvoice=Fatura do fornecedor
+ShowSupplierInvoice=Mostrar fatura do fornecedor
 TotalBuyingPriceMinShort=Total de precos de compra dos subprodutos
 TotalSellingPriceMinShort=Total de preços de venda de sub-produtos
 SomeSubProductHaveNoPrices=Algums dos sub-produtos nao tem um preco definido
 ChangeSupplierPrice=Modificar preço de compra
 SupplierPrices=Preços de fornecedores
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Este código de fornec. já está associado com um produto %s
-NoRecordedSuppliers=Nenhum fornecedores gravado
-SupplierPayment=Pagamento do fornecedores
-SuppliersArea=Área do fornecedores
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Este código de fornec. já está associado a um produto %s
+NoRecordedSuppliers=Nenhum fornecedor registrado
+SupplierPayment=Pagamento de fornecedores
+SuppliersArea=Área de fornecedores
 RefSupplierShort=Ref. fornecedor
 Availability=Entrega
 ExportDataset_fournisseur_1=Faturas do fornecedores e detalhes da fatura
@@ -34,5 +31,5 @@ SupplierReputation=Reputação do fornecedores
 DoNotOrderThisProductToThisSupplier=Não pedir
 NotTheGoodQualitySupplier=Baixa qualidade
 AllProductServicePrices=Todos os preços dos produtos / serviços
-AllProductReferencesOfSupplier=Todos os produtos / Referencias de serviço do vendedor
+AllProductReferencesOfSupplier=Todas as referências do fornecedor
 BuyingPriceNumShort=Preços de fornecedores
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index dfc5a295944..24ce002657a 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -21,7 +21,6 @@ TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 Notify_TICKET_SENTBYMAIL=Envio do ticket por e-mail
 NeedMoreInformation=Aguardando informação
 Waiting=Aguardando
-Category=Código analitico
 Severity=Gravidade
 MailToSendTicketMessage=Para enviar e-mail da mensagem do ticket
 TicketSetup=Configuração do módulo de ticket
@@ -46,6 +45,10 @@ TicketsActivatePublicInterfaceHelp=A interface pública permite que qualquer vis
 TicketNumberingModules=Módulo de numeração de bilhetes
 TicketNotifyTiersAtCreation=Notificar o terceiro no momento do terceiro
 TicketsDisableCustomerEmail=Sempre disabilitar e-mail quando um ticket é criado de uma interface pública
+TicketsPublicNotificationNewMessage=Enviar e-mail (s) quando uma nova mensagem for adicionada
+TicketsPublicNotificationNewMessageHelp=Enviar e-mail (s) quando uma nova mensagem for adicionada da interface pública (para o usuário atribuído ou o e-mail de notificações para (atualizar) e / ou o e-mail de notificações para)
+TicketPublicNotificationNewMessageDefaultEmail=Email de notificações para (atualização)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Envie notificações de novas mensagens por e-mail para este endereço se o tíquete não tiver um usuário atribuído ou se o usuário não tiver um e-mail.
 TicketsIndex=Área de Tickets
 TicketList=Lista de bilhetes
 TicketAssignedToMeInfos=Esta página mostra os tíquetes criado pelo ou assinalados para o usuário corrente
@@ -59,7 +62,6 @@ MessageListViewType=Mostrar como lista de tabelas
 TicketCard=Bilhete de cartão
 TicketsManagement=Gestão de bilhetes
 NewTicket=Novo Bilhete
-TicketCategory=Código analitico
 SeeTicket=Veja o ingresso
 TicketReadOn=Leia
 MarkAsRead=Marcar ingresso como lido
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index 4aad9c9d6d1..07fd926c913 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -67,6 +67,7 @@ UserWillBeExternalUser=Usuario criado sera um usuario externo (porque esta conec
 IdPhoneCaller=ID chamador (telefone)
 NewUserCreated=Usuário %s  Criado
 NewUserPassword=Senha alterada para %s
+NewPasswordValidated=Sua nova senha foi validada e deve ser usada agora para fazer login.
 EventUserModified=Usuário %s Modificado
 UserDisabled=Usuário %s Desativado
 UserEnabled=Usuário %s Ativado
@@ -93,6 +94,7 @@ ColorUser=Cor do usuario
 UserAccountancyCode=Código de contabilidade do usuário
 UserLogoff=Usuário desconetado
 UserLogged=Usuário Conectado
+DateOfEmployment=Data de emprego
 DateEmployment=Data de Início do Emprego
 DateEmploymentEnd=Data de término do emprego
 CantDisableYourself=Você não pode desativar seu próprio registro de usuário
@@ -101,3 +103,4 @@ ForceUserHolidayValidator=Forçar validação da solicitação de licença
 ValidatorIsSupervisorByDefault=Por padrão, a validação é feita pelo supervisor do usuário. Mantenha vazio para continuar desta maneira.
 UserPersonalEmail=E-mail pessoal
 UserPersonalMobile=Celular pessoal
+WarningNotLangOfInterface=Atenção, este é o idioma principal do usuário, não o idioma da interface que ele escolheu ver. Para alterar o idioma da interface visível por este usuário, vá na guia %s
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index 5b7bccd9473..5d560f9548b 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -30,6 +30,7 @@ NoInvoiceRefused=Não carregue a rejeição
 InvoiceRefused=Fatura recusada (Verificar a rejeição junto ao cliente)
 StatusDebitCredit=Status débito / crédito
 StatusWaiting=Aguardando
+StatusPaid=Pago
 StatusRefused=Negado
 StatusMotif1=Saldo insuficiente
 StatusMotif2=Solicitação contestada
@@ -38,15 +39,12 @@ StatusMotif4=Pedido de venda
 StatusMotif8=Outras razões
 CreateGuichet=Apenas do escritório
 OrderWaiting=Aguardando resolução
-NotifyTransmision=Retirada de Transmissão
-NotifyCredit=Revogação de crédito
 NumeroNationalEmetter=Nacional Número Transmissor
 BankToReceiveWithdraw=Conta bancária de recebimento
 CreditDate=A crédito
 WithdrawalFileNotCapable=Não foi possível gerar arquivos recibo retirada para o seu país %s (O seu país não é suportado)
 ShowWithdraw=Mostrar ordem de débito direto
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se a fatura tiver pelo menos uma ordem de pagamento por débito direto ainda não processada, ela não será definida como paga para permitir o gerenciamento prévio da retirada.
-WithdrawalFile=Arquivo Retirada
 SetToStatusSent=Defina o status "arquivo enviado"
 StatisticsByLineStatus=Estatísticas por situação de linhas
 DateRUM=Data da assinatura
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 1f809ec4e87..8037ba7cc8c 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Desactivar a gravação direta de transação na conta bancária
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ativar exportação de rascunho em diário
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Diário de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diário de compras
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Aplicar categorias em massa
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Categoria para a conta contabilística foi removida
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index da5bb5690eb..185304a51ae 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=E-mail do remetente padrão para envio manual (e-mail
 UserEmail=Email do utilizador
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas  Unix. Teste parâmetros sendmail localmente.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Se a tradução para este idioma não estiver completa ou se encontrar erros, pode corrigi-los editando os ficheiros na diretoria <b>langs/ %s</b> e submeta os ficheiros modificados em dolibarr.org/forum ou para os programadores em github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Configuração do módulo
 ModulesSetup=Módulos/Aplicação - Configuração
 ModuleFamilyBase=Sistema
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Se precisa desta função, o módulo <b>%s</b> deve ser
 SecurityToken=A chave para URLs seguras
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Regras para Imposto sobre Vendas / IVA
 PDFLocaltax=Regras para %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modificar nos preços com valor de referência base defini
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Sequencia de caracteres
+String1Line=String (1 line)
 TextLong=Texto longo
+TextLongNLines=Long text (n lines)
 HtmlText=Texto HTML
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Gestão de contratos (serviços ou assinaturas recorrentes)
 Module55Name=Códigos de barras
 Module55Desc=Gestão dos códigos de barras
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Gerenciamento de ordens de pagamento de débito direto. Inclui a geração de arquivos SEPA para os países europeus.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integração com um sistema ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Criar/modificar serviços
 Permission534=Eliminar serviços
 Permission536=Ver/gerir serviços ocultos
 Permission538=Exportar serviços
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Consultar donativos
 Permission702=Criar/modificar donativos
 Permission703=Eliminar donativos
@@ -848,6 +858,8 @@ Permission773=Eliminar relatórios de despesas
 Permission774=Consultar todos os relatórios de despesa (mesmo para utilizadores que não são subordinados)
 Permission775=Aprovar relatórios de despesas
 Permission776=Pagar relatórios de despesas
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Exportar relatórios de despesas
 Permission1001=Consultar stocks
 Permission1002=Criar/modificar armazéns
@@ -900,6 +912,7 @@ Permission2515=Configuração de diretórios de documentos
 Permission2801=Usar cliente FTP em modo de leitura (listar e descarregar apenas)
 Permission2802=Usar o cliente FTP em modo de escrita (eliminar ou carregar ficheiros)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Eliminar recursos
 Permission63004=Associar recursos a eventos da agenda
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Cliente Potencial
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Distritos
 DictionaryCountry=Países
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Templates de Email
 DictionaryUnits=Unidades
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Redes sociais
-DictionaryProspectStatus=Estado da prospeção
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Tipos de licença
 DictionaryOpportunityStatus=Status de lead para projeto / lead
 DictionaryExpenseTaxCat=Relatório de despesas - categorias de transporte
@@ -1076,7 +1091,7 @@ LoginPage=Página de inicio de sessão
 BackgroundImageLogin=Imagem de fundo
 PermanentLeftSearchForm=Zona de pesquisa permanente no menu esquerdo
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Empresa/Organização
 CompanyIds=Identidades da Empresa/Organização
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=É necessário pelo menos um critério de
 NewTranslationStringToShow=Novo texto de tradução a exibir
 OriginalValueWas=A tradução original foi alterada. O valor original era: <br><br>%s
 TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de tradução '<strong> %s </ strong>' que não existe em nenhum arquivo de idioma
-TotalNumberOfActivatedModules=Aplicação/módulos ativados: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo
 ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho do PHP
 YesInSummer=Sim no verão
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use tipos de eventos (gerenciados no menu Setup -> Diction
 AGENDA_USE_EVENT_TYPE_DEFAULT=Definir automaticamente este valor padrão para o tipo de evento no formulário de criação de evento
 AGENDA_DEFAULT_FILTER_TYPE=Definir automaticamente esse tipo de evento no filtro de pesquisa da visualização da agenda
 AGENDA_DEFAULT_FILTER_STATUS=Definir automaticamente este status para eventos no filtro de pesquisa da visualização da agenda
-AGENDA_DEFAULT_VIEW=Qual é o separador que você deseja abrir por defeito quando seleciona o menu "Agenda"
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Ativar lembrete de eventos <b>por e-mails</b> (lembrar opção / atraso pode ser definido em cada evento). Nota: O módulo <strong>%s</strong>deve estar habilitado e configurado corretamente para que o lembrete seja enviado na freqüência correta.
 AGENDA_REMINDER_BROWSER=Ativar lembrete de evento <b> no navegador do usuário </ b> (quando a data do evento é atingida, cada usuário pode recusar isso da pergunta de confirmação do navegador)
 AGENDA_REMINDER_BROWSER_SOUND=Ativar notificação sonora
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Mostrar o objeto associado na vista de agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuração do módulo "Click To Dial"
 ClickToDialUrlDesc=Uma chamada é efetuada quando o icon é clicado. No URL pode usar as tags:<br><b>__PHONETO__</b> que será substituída pelo número do destinatário<br><b>__PHONEFROM__</b> que será substituída pelo número do remetente<br><b>__LOGIN__</b> que será substituída pelo nome de utilizador da sua conta ClickToDial (definido no seu cartão de utilizador)<br><b>__PASS__</b>  que será substituída pela palavra-passe da sua conta ClickToDial (definida no seu cartão de utilizador).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Usar apenas um link "tel:" em números de telefone
 ClickToDialUseTelLinkDesc=Use esse método se os usuários tiverem um softphone ou uma interface de software instalada no mesmo computador que o navegador e chamados quando você clicar em um link em seu navegador que comece com "tel:". Se você precisar de uma solução de servidor completa (sem necessidade de instalação de software local), deverá definir isso como "Não" e preencher o próximo campo.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Este campo contém uma referência para identificar a linha. Digite
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Entre aqui entre chaves, lista de números de bytes que representam o símbolo da moeda. Por exemplo: para $, insira [36] - para o brasil real R $ [82,36] - para €, insira [8364]
 ColorFormat=As cores RGB está no formato HEX, por exemplo: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Posição da linha nas listas de seleção
 SellTaxRate=Taxa de imposto de venda
 RecuperableOnly=Sim para IVA "Não Percebido, mas Recuperável" dedicado a algum regiões ultramarinas da França. Mantenha o valor de "Não" em todos os outros casos.\n\n
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Solicitação de cotação
 MailToSendSupplierOrder=Ordens de compra
 MailToSendSupplierInvoice=Faturas do fornecedor
 MailToSendContract=Contratos
+MailToSendReception=Receptions
 MailToThirdparty=Terceiros
 MailToMember=Membros
 MailToUser=Utilizadores
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=O Dolibarr ERP e CRM %s está disponível. A
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Modelos para documentos de produto
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=Veja a nota * para uma lista de possíveis variáveis ​​de substituição
 SeeChangeLog=Consulte o arquivo ChangeLog (somente em inglês)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Margem esquerda do PDF
 MAIN_PDF_MARGIN_RIGHT=Margem direita do PDF
 MAIN_PDF_MARGIN_TOP=Margem superior do PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior do PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como "sim" se este grupo for uma computação de outros grupos
 EnterCalculationRuleIfPreviousFieldIsYes=Insira a regra de cálculo se o campo anterior foi definido como Sim (por exemplo, 'CODEGRP1 + CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nada feito
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Registrar evento de email
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Código postal
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 00ee90a391e..de774f7acff 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Número de eventos
 ListOfActions=Lista de Eventos
 EventReports=Relatórios de eventos
 Location=Localização
-ToUserOfGroup=Para qualquer utilizador no grupo
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Evento para todo(s) o(s) dia(s)
 MenuToDoActions=Todos os eventos incompletos
 MenuDoneActions=Todos os eventos terminados
@@ -86,6 +86,8 @@ ProposalDeleted=Orçamento eliminado
 OrderDeleted=Encomenda eliminada
 InvoiceDeleted=Fatura eliminada
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=O produto %s foi criado
 PRODUCT_MODIFYInDolibarr=O produto %s foi modificado
 PRODUCT_DELETEInDolibarr=O produto %s foi eliminado
@@ -158,3 +160,9 @@ DateStartPlusOne=Data de início +1 hora
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 26854f5e663..bfe70c39c7e 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Últimos %s fornecedores registados
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospeções
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Últimos %s membros
 BoxTitleLastFicheInter=Últimas %s intervenções modificadas 
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Últimos %s orçamentos modificados
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Faturas a clientes
 ForCustomersOrders=Encomendas de clientes
 ForProposals=Orçamentos
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Contabilidade
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index 3fbde99a2a1..d1dba40375b 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index c19fc1ec380..429e6922009 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Imposto social ou fiscal
 SocialContributions=Impostos sociais ou fiscais
 SocialContributionsDeductibles=Impostos sociais ou fiscais dedutíveis
 SocialContributionsNondeductibles=Impostos sociais ou fiscais não dedutíveis
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Contribuição de etiqueta
 TypeContrib=Digite contribuição
 MenuSpecialExpenses=Despesas Especiais
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
index 66974e4e029..2725756cce3 100644
--- a/htdocs/langs/pt_PT/contracts.lang
+++ b/htdocs/langs/pt_PT/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Serviços ativos
 MenuExpiredServices=Serviços expirados
 MenuClosedServices=Serviços fechados
 NewContract=Novo contrato
-NewContractSubscription=Novo contrato/subscrição
+NewContractSubscription=New contract or subscription
 AddContract=Criar contrato
 DeleteAContract=Eliminar um contrato
 ActivateAllOnContract=Ativar todos os serviços
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index b04e564f058..1750e06b3f6 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=O novo valor não pode ser igual ao antigo
 ErrorFailedToValidatePasswordReset=Não foi possível reinicializar a senha. Pode ser que a reinicialização já tenha sido feita (esse link pode ser usado apenas uma vez). Caso contrário, tente reiniciar o processo de reinicialização.
 ErrorToConnectToMysqlCheckInstance=Conectar-se ao banco de dados falha. Verifique se o servidor de banco de dados está em execução (por exemplo, com mysql / mariadb, você pode iniciá-lo a partir da linha de comando com 'sudo service mysql start').
 ErrorFailedToAddContact=Falha ao adicionar contato
-ErrorDateMustBeBeforeToday=A data não pode ser maior que hoje
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Um modo de pagamento foi definido para digitar %s, mas a configuração do módulo Fatura não foi concluída para definir informações a serem exibidas para esse modo de pagamento.
 ErrorPHPNeedModule=Erro, o php deve ter o módulo <b>%s</b> instalado para utilizar esta funcionalidade
 ErrorOpenIDSetupNotComplete=Você configura o arquivo de configuração Dolibarr para permitir a autenticação OpenID, mas o URL do serviço OpenID não está definido em %s constante
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Uma senha foi definida para este membro. No entanto, nenhuma conta de usuário foi criada. Portanto, essa senha é armazenada, mas não pode ser usada para fazer login no Dolibarr. Pode ser usado por um módulo externo / interface, mas se você não precisa definir nenhum login nem senha para um membro, você pode desativar a opção "Gerenciar um login para cada membro" da configuração do módulo de membro. Se você precisar gerenciar um login, mas não precisar de nenhuma senha, poderá manter esse campo vazio para evitar esse aviso. Nota: O email também pode ser usado como um login se o membro estiver vinculado a um usuário.
diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang
index c97fe5a83ae..31689948085 100644
--- a/htdocs/langs/pt_PT/languages.lang
+++ b/htdocs/langs/pt_PT/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Amárico (Etiópia)
 Language_ar_AR=Árabe
 Language_ar_EG=Árabe (Egito)
 Language_ar_SA=Árabe
+Language_az_AZ=Azerbaijão
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (Índia)
 Language_bg_BG=Búlgaro
 Language_bs_BA=Bósnio
 Language_ca_ES=Catalão
@@ -20,6 +23,7 @@ Language_en_GB=Inglês (Reino Unido)
 Language_en_IN=Inglês (Índia)
 Language_en_NZ=Inglês (Nova Zelândia)
 Language_en_SA=Inglês (Arábia Saudita)
+Language_en_SG=Inglês (Singapura)
 Language_en_US=Inglês (Estados Unidos)
 Language_en_ZA=Inglês (África do Sul)
 Language_es_ES=Espanhol
@@ -29,6 +33,7 @@ Language_es_CL=Espanhol (Chile)
 Language_es_CO=Espanhol (Colombia)
 Language_es_DO=Espanhol (República Dominicana)
 Language_es_EC=Espanhol (Equador)
+Language_es_GT=Espanhol (Guatemala)
 Language_es_HN=Espanhol (Honduras)
 Language_es_MX=Espanhol (México)
 Language_es_PA=Espanhol (Panamá)
@@ -36,6 +41,7 @@ Language_es_PY=Espanhol (Paraguai)
 Language_es_PE=Espanhol (Peru)
 Language_es_PR=Espanhol (Porto Rico)
 Language_es_UY=Espanhol (Uruguai)
+Language_es_GT=Espanhol (Guatemala)
 Language_es_VE=Espanhol (Venezuela)
 Language_et_EE=Estónio
 Language_eu_ES=Basco
@@ -44,15 +50,22 @@ Language_fi_FI=Finlandês
 Language_fr_BE=Francês (Bélgica)
 Language_fr_CA=Francês (Canadá)
 Language_fr_CH=Francês (Suíça)
+Language_fr_CI=Francês (Costa de Marfim)
+Language_fr_CM=Francês (Camarões)
 Language_fr_FR=Francês
+Language_fr_GA=Francês (Gabão)
 Language_fr_NC=Francês (Nova Caledónia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frísio
+Language_gl_ES=Galego
 Language_he_IL=Hebreu
+Language_hi_IN=Hindi (Índia)
 Language_hr_HR=Croata
 Language_hu_HU=Húngaro
 Language_id_ID=Indonésio 
 Language_is_IS=Islandês
 Language_it_IT=Italiano
+Language_it_CH=Italiano (Suiça)
 Language_ja_JP=Japonês
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,8 +77,9 @@ Language_lv_LV=Letão
 Language_mk_MK=Macedónio
 Language_mn_MN=Mongol
 Language_nb_NO=Norueguês (Bokmål)
+Language_ne_NP=Nepalês
 Language_nl_BE=Holandês (Bélgica)
-Language_nl_NL=Dutch
+Language_nl_NL=Holandês
 Language_pl_PL=Polaco
 Language_pt_BR=Português (Brasil)
 Language_pt_PT=Português
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbeque
 Language_vi_VN=Vietnamita
 Language_zh_CN=Chinês
 Language_zh_TW=Chinês (Tradicional)
-Language_bh_MY=Malay
+Language_zh_HK=Chinês (Hong Kong)
+Language_bh_MY=Malaio
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index e742b00fd45..4711f17de75 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Configuração de email de saída padrão
 Information=Informação
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 0e4bce5b52b..6ec47dcf6fc 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=P.U. (inc. impostos)
 Amount=Montante
 AmountInvoice=Montante da Fatura
 AmountInvoiced=Montante faturado
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Montatne do pagamento
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Montante (IVA inc.)
@@ -485,6 +485,7 @@ Categories=Etiquetas/Categorias
 Category=Etiqueta/Categoria
 By=Por
 From=De
+FromDate=De
 FromLocation=De
 to=Para
 To=Para
@@ -687,6 +688,7 @@ Method=Método
 Receive=Receção
 CompleteOrNoMoreReceptionExpected=Complete ou nada mais é esperado
 ExpectedValue=Valor esperado
+ExpectedQty=Expected Qty
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca Recebido
@@ -703,6 +705,7 @@ MenuECM=Documentos
 MenuAWStats=Estatisticas
 MenuMembers=Membros
 MenuAgendaGoogle=Agenda Google
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menu inicio->configuração->segurança): %s Kb, PHP limit: %s Kb
 NoFileFound=Não existem documentos guardados nesta pasta
 CurrentUserLanguage=Idioma atual
@@ -725,7 +728,7 @@ Page=Página
 Notes=Notas
 AddNewLine=Adicionar nova linha
 AddFile=Adicionar ficheiro
-FreeZone=Não é um produto/serviço predefinido
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Copiar objeto com os seus atributos principais
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=Qui
 ShortFriday=Sex
 ShortSaturday=Sab
 ShortSunday=Dom
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Selecione um modelo de e-mail
 SetRef=Definir referência
 Select2ResultFoundUseArrows=Foram encontrados alguns resultados. Utilize as setas para selecionar o desejado.
@@ -958,7 +994,7 @@ SearchIntoMembers=Membros
 SearchIntoUsers=Utilizadores
 SearchIntoProductsOrServices=Produtos ou serviços
 SearchIntoProjects=Projetos
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Ordens de Fabrico
 SearchIntoTasks=Tarefas
 SearchIntoCustomerInvoices=Faturas a clientes
 SearchIntoSupplierInvoices=Faturas do fornecedor
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Informação
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index fcf41de278b..882250687bc 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Membro inativo
 MemberStatusResiliatedShort=Inativo
 MembersStatusToValid=Membros rascunho
 MembersStatusResiliated=Membros inativos
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validado
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Nova filiação
 PaymentSubscription=Nova contribuição pagamento
 SubscriptionEndDate=Data fim filiação
@@ -78,7 +81,7 @@ DeleteType=Apagar
 VoteAllowed=Voto autorizado
 Physical=Pessoa Singular
 Moral=Pessoa Coletiva
-MorPhy=Pessoa Singular/Pessoa Coletiva
+MorPhy=Natureza
 Reenable=Reactivar
 ResiliateMember=Terminar um membro
 ConfirmResiliateMember=Tem certeza de que deseja encerrar este membro?
diff --git a/htdocs/langs/pt_PT/mrp.lang b/htdocs/langs/pt_PT/mrp.lang
index ab5f6d81fad..5128c7a5d91 100644
--- a/htdocs/langs/pt_PT/mrp.lang
+++ b/htdocs/langs/pt_PT/mrp.lang
@@ -1,77 +1,78 @@
-Mrp=Manufacturing Orders
-MO=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Material
-BOMsSetup=Setup of module BOM
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
+Mrp=Encomendas de Manufatura
+MO=Encomenda de Manufatura
+MOs=Manufacturing orders
+MRPDescription=Módulo para gerir a produção e as «Encomendas de Manufatura» (EM).
+MRPArea=Área de MRP
+MrpSetupPage=Configuração do módulo MRP
+MenuBOM=Faturas do material
+LatestBOMModified=Últimas %s Faturas do material modificadas
+LatestMOModified=Últimas %s Encomendas de Manufatura modificadas
+Bom=Faturas do Material
+BillOfMaterials=Fatura do Material
+BOMsSetup=Configuração do módulo de FM
+ListOfBOMs=Lista das faturas do material - FM
+ListOfManufacturingOrders=Lista das Encomendas de Manufaturação
+NewBOM=Nova fatura de material
 ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
-BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
+BOMsNumberingModules=Modelos de numeração de FM
+BOMsModelModule=Modelos de documento de FM
+MOsNumberingModules=Modelos de numeração de EM
+MOsModelModule=Modelos de documento de EM
+FreeLegalTextOnBOMs=Texto livre no documento de FM
+WatermarkOnDraftBOMs=Marca de água no rascunho de FM
+FreeLegalTextOnMOs=Texto livre no documento de EM
+WatermarkOnDraftMOs=Marca de água no rascunho de EM
 ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
+ManufacturingEfficiency=Eficiência de manufaturação
+ConsumptionEfficiency=Eficiência de consumo
 ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
 ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
+DeleteBillOfMaterials=Eliminar Faturas de Materiais
+DeleteMo=Eliminar Encomenda de Manufaturação
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
 ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
+MenuMRP=Encomendas de Manufatura
+NewMO=Nova Encomenda de Manufatura
+QtyToProduce=Qt. a produzir
 DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
+EstimatedDuration=Duração estimada
 EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
+StatusMOProduced=Produzido
+QtyFrozen=Qt. Congelada
+QuantityFrozen=Quantidade Congelada
 QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
 DisableStockChange=Stock change disabled
 DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
+BomAndBomLines=Faturas do Material e linhas
+BOMLine=Linhas de FM
+WarehouseForProduction=Armazém para produção
+CreateMO=Criar EM
+ToConsume=Para consumir
+ToProduce=Para produzir
+QtyAlreadyConsumed=Qt. já consumida
+QtyAlreadyProduced=Qt. já produzida
 QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
+ConsumeOrProduce=Consumir ou Produzir
+ConsumeAndProduceAll=Consumir e Produzir Tudo
+Manufactured=Manufaturado
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
 AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
+NoStockChangeOnServices=Nenhuma alteração de ''stock'' nos serviços
 ProductQtyToConsumeByMO=Product quantity still to consume by open MO
 ProductQtyToProduceByMO=Product quentity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
+AddNewConsumeLines=Adicionar nova linha para consumir
+ProductsToConsume=Produtos para produzir
+ProductsToProduce=Produtos para produzir
+UnitCost=Custo unitário
+TotalCost=Custo total
 BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index adecd38170f..ce2b87ce1ac 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Olá)__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Olá)__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Olá)__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Você pode clicar no link abaixo para fazer seu pagamento, se ainda não estiver pronto.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Olá)__\n\n\n__(Atenciosamente)__\n\n__USER_SIGNATURE__
 DemoDesc=O Dolibarr é um ERP/CRM compacto que suporta vários módulos de negócios. Uma demonstração mostrando todos os módulos não faz sentido porque esse cenário nunca ocorre (várias centenas disponíveis). Assim, vários perfis de demonstração estão disponíveis.
 ChooseYourDemoProfil=Escolha o perfil de demonstração que melhor se adequa às suas necessidades ...
 ChooseYourDemoProfilMore=...ou crie o seu próprio perfil <br> (seleção manual de módulo)
@@ -280,7 +278,9 @@ LinesToImport=Linhas a importar
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 0ca4ef598b4..95a866d3006 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Defina o tipo de código de barras
 BarcodeValue=Valor do código de barras
 NoteNotVisibleOnBill=Nota (não visível nas faturas, orçamentos, ...)
 ServiceLimitedDuration=Sim o serviço é de Duração limitada :
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Nº de preços
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Código Aduaneiro / Commodity / HS
 CountryOrigin=País de origem
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Rótulo curto
 Unit=Unidade
 p=você.
@@ -359,6 +362,9 @@ SelectCombination=Selecione a combinação
 ProductCombinationGenerator=Gerador de variantes
 Features=Características
 PriceImpact=Impacto no preço
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Impacto no peso
 NewProductAttribute=Novo atributo
 NewProductAttributeValue=Novo valor de atributo
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index dd6269cc07c..bc1713523d8 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Colaborador
 TypeContact_project_task_external_TASKCONTRIBUTOR=Colaborador
 SelectElement=Selecionar elemento
 AddElement=Ligar ao elemento
+LinkToElementShort=Associar a
 # Documents models
 DocumentModelBeluga=Modelo de documento de projeto para visão geral de objetos vinculados
 DocumentModelBaleine=Modelo de documento de projeto para tarefas
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Nº de projetos criados por mês
 ProjectNbTaskByMonth=Nº de tarefas criadas por mês
 ProjectOppAmountOfProjectsByMonth=Quantidade de leads por mês
 ProjectWeightedOppAmountOfProjectsByMonth=Quantidade ponderada de leads por mês
-ProjectOpenedProjectByOppStatus=Abrir projeto / liderar por status de lead
-ProjectsStatistics=Estatísticas sobre projetos / leads
-TasksStatistics=Estatísticas sobre tarefas de projeto / lead
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Tarefa atribuída. A inserção de tempo nesta tarefa deve ser possível.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/pt_PT/receiptprinter.lang b/htdocs/langs/pt_PT/receiptprinter.lang
index 259efad08fe..382fa2fd17f 100644
--- a/htdocs/langs/pt_PT/receiptprinter.lang
+++ b/htdocs/langs/pt_PT/receiptprinter.lang
@@ -15,12 +15,12 @@ CONNECTOR_DUMMY=Impressora de Teste
 CONNECTOR_NETWORK_PRINT=Impressora de Rede
 CONNECTOR_FILE_PRINT=Impressora Local
 CONNECTOR_WINDOWS_PRINT=Impressora do Windows Local
-CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_CUPS_PRINT=Impressora Cups
 CONNECTOR_DUMMY_HELP=Impressora de Teste para testar, não faz nada
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
-CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+CONNECTOR_CUPS_PRINT_HELP=Nome da impressora CUPS, exemplo: HPRT_TP805L
 PROFILE_DEFAULT=Perfil Predefinido
 PROFILE_SIMPLE=Perfil Simples
 PROFILE_EPOSTEP=Epos Tep Profile
@@ -28,10 +28,10 @@ PROFILE_P822D=Perfil P822D
 PROFILE_STAR=Perfil da Estrela
 PROFILE_DEFAULT_HELP=Perfil predefinido adequado para as impressoras Epson
 PROFILE_SIMPLE_HELP=Perfil simples sem gráficos
-PROFILE_EPOSTEP_HELP=Epos Tep Profile
+PROFILE_EPOSTEP_HELP=Perfil de Tep Epos
 PROFILE_P822D_HELP=Perfil do P822D sem gráficos
 PROFILE_STAR_HELP=Perfil da Estrela
-DOL_LINE_FEED=Skip line
+DOL_LINE_FEED=Ignorar linha
 DOL_ALIGN_LEFT=Texto alinhado à esquerda
 DOL_ALIGN_CENTER=Texto centrado
 DOL_ALIGN_RIGHT=Texto alinhado à direita
@@ -45,38 +45,38 @@ DOL_CUT_PAPER_PARTIAL=Cortar ticket parcialmente
 DOL_OPEN_DRAWER=Abrir gaveta do dinheiro
 DOL_ACTIVATE_BUZZER=Ativar campainha
 DOL_PRINT_QRCODE=Imprimir Código QR
-DOL_PRINT_LOGO=Print logo of my company
-DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
-DOL_BOLD=Bold
-DOL_BOLD_DISABLED=Disable bold
+DOL_PRINT_LOGO=Imprimir logótipo da minha empresa
+DOL_PRINT_LOGO_OLD=Imprimir logótipo da minha empresa (impressora antigas)
+DOL_BOLD=Negrito
+DOL_BOLD_DISABLED=Desativar negrito
 DOL_DOUBLE_HEIGHT=Double height size
 DOL_DOUBLE_WIDTH=Double width size
 DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
-DOL_UNDERLINE=Enable underline
-DOL_UNDERLINE_DISABLED=Disable underline
+DOL_UNDERLINE=Ativar sublinhado
+DOL_UNDERLINE_DISABLED=Desativar sublinhado
 DOL_BEEP=Beed sound
-DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
-YearInvoice=Invoice year
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
-DOL_VALUE_MONTH=Invoice month
-DOL_VALUE_DAY=Invoice day
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
-InvoiceID=Invoice ID
+DOL_PRINT_TEXT=Imprimir texto
+DateInvoiceWithTime=Data e hora da fatura
+YearInvoice=Ano da fatura
+DOL_VALUE_MONTH_LETTERS=Mês da fatura em letras
+DOL_VALUE_MONTH=Mês da fatura
+DOL_VALUE_DAY=Dia da fatura
+DOL_VALUE_DAY_LETTERS=Dia da fatura em letras
+DOL_LINE_FEED_REVERSE=Alimentação de linha reversa
+InvoiceID=Id. da Fatura
 InvoiceRef=Ref. fatura
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+DOL_PRINT_OBJECT_LINES=Linhas da fatura
+DOL_VALUE_CUSTOMER_FIRSTNAME=Primeiro nome do cliente
+DOL_VALUE_CUSTOMER_LASTNAME=Último nome do cliente
+DOL_VALUE_CUSTOMER_MAIL=Correio do cliente
+DOL_VALUE_CUSTOMER_PHONE=Telefone do cliente
+DOL_VALUE_CUSTOMER_MOBILE=Telemóvel do cliente
+DOL_VALUE_CUSTOMER_SKYPE=Skype do cliente
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Número de contribuinte do cliente
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Saldo da conta do cliente
+DOL_VALUE_MYSOC_NAME=O nome da sua empresa
+VendorLastname=Último nome do fornecedor
+VendorFirstname=Primeiro nome do fornecedor
+VendorEmail=E-mail do fornecedor
+DOL_VALUE_CUSTOMER_POINTS=Pontos do cliente
+DOL_VALUE_OBJECT_POINTS=Pontos de objeto
diff --git a/htdocs/langs/pt_PT/recruitment.lang b/htdocs/langs/pt_PT/recruitment.lang
new file mode 100644
index 00000000000..dc0d79996e3
--- /dev/null
+++ b/htdocs/langs/pt_PT/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recrutamento
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Gerir e acompanhar as campanhas de recrutamento para os novos cargos
+
+#
+# Admin page
+#
+RecruitmentSetup = Configuração do recrutamento
+Settings = Definições
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Área de recrutamento
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Sobre
+RecruitmentAbout = Sobre Recrutamento
+RecruitmentAboutPage = Página sobre Recrutamento
+NbOfEmployeesExpected=Esperado nb de funcionários
+JobLabel=Nome do cargo
+WorkPlace=Local de trabalho
+DateExpected=Data esperada
+FutureManager=Futuro gerente
+ResponsibleOfRecruitement=Responsável pelo recrutamento
+IfJobIsLocatedAtAPartner=Se o trabalho estiver localizado num local de parceiro
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 5a651407cb5..0ed339d10ed 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Eliminar Envío
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks por lote/número de série
@@ -95,14 +95,16 @@ RealStock=Stock real
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Stock virtual
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id. armazem
 DescWareHouse=Descrição armazem
 LieuWareHouse=Localização armazem
 WarehousesAndProducts=Armazens e produtos
 WarehousesAndProductsBatchDetail=Armazéns e produtos (com detalhe por lote / série)
-AverageUnitPricePMPShort=Média dos preços de entrada
-AverageUnitPricePMP=Média dos preços de entrada
+AverageUnitPricePMPShort=Valor (PMP)
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Vendendo Preço unitário
 EstimatedStockValueSellShort=Valor para vender
 EstimatedStockValueSell=Valor para vender
@@ -141,7 +143,7 @@ Replenishments=Reabastecimentos
 NbOfProductBeforePeriod=Quantidade de produto %s em estoque antes do período selecionado (<%s)
 NbOfProductAfterPeriod=Quantidade de produto %s em estoque após o período selecionado (> %s)
 MassMovement=Movimento de massa
-SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um warehouse de origem e um warehouse de destino e clique em "%s". Assim que isso for feito para todos os movimentos necessários, clique em "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Transferência de registro
 ReceivingForSameOrder=Receções para esta encomenda
 StockMovementRecorded=Movimentos de estoque registrados
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index f9ceed462c7..8dcadcefa7e 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Fornecedores
 SuppliersInvoice=Fatura de fornecedor
 ShowSupplierInvoice=Mostrar Fatura do Fornecedor
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Alguns sub-produtos não têm preço definido
 AddSupplierPrice=Adicionar preço de compra
 ChangeSupplierPrice=Alterar o preço de compra
 SupplierPrices=Preços de fornecedor
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Este fornecedor de referência já está associado com uma referência: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=Nenhum fornecedor registado
 SupplierPayment=Pagamento de fornecedor
 SuppliersArea=Área de forncedores
 RefSupplierShort=Ref. do fornecedor
 Availability=Disponibilidade
-ExportDataset_fournisseur_1=Lista de faturas de fornecedor e linhas de fatura
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Faturas e pagamentos de fornecedor
-ExportDataset_fournisseur_3=Encomendas a fornecedores e linhas de encomenda
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Aprovar este Pedido
 ConfirmApproveThisOrder=Tem certeza de que deseja aprovar a encomenda <b> %s </b>?
 DenyingThisOrder=Negar esta encomenda
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=Lista de produtos e preços do fornecedor <b>%s
 SentToSuppliers=Enviado para os fornecedores
 ListOfSupplierOrders=Lista de ordens de compra
 MenuOrdersSupplierToBill=Encomendas a fornecedor por faturar
-NbDaysToDelivery=Atraso da entrega em dias
-DescNbDaysToDelivery=O maior atraso na entrega dos produtos desta encomenda
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Reputação do fornecedor
 DoNotOrderThisProductToThisSupplier=Não encomendar
-NotTheGoodQualitySupplier=Qualidade errada
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputação
 BuyerName=Nome do comprador
 AllProductServicePrices=Todos os preços de produtos/serviços
-AllProductReferencesOfSupplier=Todas as referências de produtos/serviços do fornecedor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Preços de fornecedor
diff --git a/htdocs/langs/pt_PT/ticket.lang b/htdocs/langs/pt_PT/ticket.lang
index 656bd0469ca..4ef4dab738e 100644
--- a/htdocs/langs/pt_PT/ticket.lang
+++ b/htdocs/langs/pt_PT/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Excluído
 
 # Dict
 Type=Tipo
-Category=Analytic code
 Severity=Severidade
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Atribuir automaticamente o usuário que criou o ticket
 TicketsAutoAssignTicketHelp=Ao criar um ticket, o usuário pode ser atribuído automaticamente ao ticket.
 TicketNumberingModules=Módulo de numeração de ingressos
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Grupo
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Criado por
 NewTicket=Novo ticket
 SubjectAnswerToTicket=Bilhete de resposta
 TicketTypeRequest=Tipo de solicitação
-TicketCategory=Analytic code
+TicketCategory=Grupo
 SeeTicket=Ver ticket
 TicketMarkedAsRead=O ticket foi marcado como lido
 TicketReadOn=Lido a
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index a5e87314b36..ddeade51c09 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=O utilizador criado irá ser um utilizador externo (porqu
 IdPhoneCaller=Id. do Chamador (telefone)
 NewUserCreated=Utilizador %s  Criado
 NewUserPassword=Palavra-passe alterada para %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Utilizador %s Modificado
 UserDisabled=Utilizador %s Desativado
 UserEnabled=Utilizador %s Ativado
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Desativado no modo de manutenção
 UserAccountancyCode=Código de contabilidade do utilizador
 UserLogoff=Terminar sessão do utilizador
 UserLogged=Utilizador conectado
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 6e8942fb2cf..56a6745c1c0 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Encomenda de débito direto
 WithdrawalReceipt=Encomenda de Débito Direto
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Últimos arquivos de débito direto %s
@@ -63,7 +63,9 @@ InvoiceRefused=Fatura recusada (cobrar a rejeição ao cliente)
 StatusDebitCredit=Estado do débito/crédito
 StatusWaiting=Em espera
 StatusTrans=Enviado
+StatusDebited=Debited
 StatusCredited=Creditado
+StatusPaid=Paga
 StatusRefused=Rejeitado
 StatusMotif0=Não especificado
 StatusMotif1=Fundos insuficientes
@@ -77,13 +79,13 @@ StatusMotif8=Outro motivo
 CreateForSepaFRST=Criar arquivo de débito direto (SEPA FRST)
 CreateForSepaRCUR=Criar arquivo de débito direto (SEPA RCUR)
 CreateAll=Criar arquivo de débito direto (todos)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Apenas escritório
 CreateBanque=Apenas banco
 OrderWaiting=À espera de tratamento
-NotifyTransmision=levantamento Envio
-NotifyCredit=levantamento de crédito
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Número Nacional de Transmissor
 WithBankUsingRIB=Para contas bancárias usando RIB
 WithBankUsingBANBIC=Para contas bancárias usando IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Crédito em
 WithdrawalFileNotCapable=Não é possível gerar o arquivo de recibo de retirada para o seu país %s (Seu país não é suportado)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=arquivo retirado
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Definir o estado como "Ficheiro Enviado"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Estatísticas por status de linhas
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Tipo de pagamento
 ModeRECUR=Recurring payment
 ModeFRST=Pagamento único
 PleaseCheckOne=Por favor, marque apenas um
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Ordem de débito direto %s criada
 AmountRequested=Quantidade solicitada
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Valor: %s <br> Metode: %s <br> Data: %s
 InfoRejectSubject=Pedido de pagamento por débito direto recusado
 InfoRejectMessage=Olá, <br> <br> a ordem de pagamento de débito directo da factura  %s relacionada com a empresa %s, com uma quantidade de %s foi recusada pelo banco. <br> <br> <br> <br>%s
 ModeWarning=Opção para o modo real não foi definido, nós paramos depois desta simulação
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang
index e2fe241392b..c657d1eb8c2 100644
--- a/htdocs/langs/pt_PT/workflow.lang
+++ b/htdocs/langs/pt_PT/workflow.lang
@@ -3,18 +3,21 @@ WorkflowSetup=Configurar módulo de fluxo de frabalho
 WorkflowDesc=Este módulo fornece algumas ações automáticas. Por padrão, o fluxo de trabalho é aberto (você pode fazer as coisas na ordem desejada), mas aqui você pode ativar algumas ações automáticas.
 ThereIsNoWorkflowToModify=Não há modificações de fluxo de trabalho disponíveis para os módulos ativados.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar automaticamente um pedido do cliente após a assinatura de uma proposta comercial (o novo pedido terá o mesmo valor da proposta)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Criar automaticamente uma fatura do cliente depois que uma proposta comercial for assinada (a nova fatura terá o mesmo valor da proposta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar automaticamente uma fatura a cliente após a validação de um contrato
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar automaticamente uma fatura do cliente após o fechamento do pedido do cliente (a nova fatura terá o mesmo valor do pedido)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificar proposta de origem vinculada como faturada quando o pedido do cliente é definido como faturado (e se o valor do pedido é o mesmo que o valor total da proposta vinculada assinada)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificar a proposta de origem vinculada como faturada quando a fatura do cliente é validada (e se o valor da fatura é o mesmo que o valor total da proposta vinculada assinada)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificar o pedido do cliente de origem vinculada como faturado quando a fatura do cliente é validada (e se o valor da fatura é o mesmo que o valor total do pedido vinculado)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificar o pedido do cliente de origem vinculada como faturado quando a fatura do cliente é definida como paga (e se o valor da fatura é o mesmo que o valor total do pedido vinculado)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classificar o pedido do cliente de origem vinculada como enviado quando uma remessa é validada (e se a quantidade enviada por todas as remessas é a mesma que na ordem de atualização)
-# Autoclassify supplier order
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classificar a proposta do fornecedor de origem vinculada como faturada quando a fatura do fornecedor é validada (e se o valor da fatura é o mesmo que o valor total da proposta vinculada)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classificar o pedido de compra de origem vinculado como faturado quando a fatura do fornecedor é validada (e se o valor da fatura é o mesmo que o valor total do pedido vinculado)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Criação automática
 AutomaticClassification=Classificação automática
diff --git a/htdocs/langs/pt_PT/zapier.lang b/htdocs/langs/pt_PT/zapier.lang
index db32d03ccc0..b5fe0501b73 100644
--- a/htdocs/langs/pt_PT/zapier.lang
+++ b/htdocs/langs/pt_PT/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier para o módulo Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Configuração do Zapier para Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index ce99797f0d1..9d39b675134 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -58,8 +58,8 @@ AccountancyAreaDescActionOnceBis=Următorii pași trebuie făcuți pentru a vă
 AccountancyAreaDescActionFreq=Următoarele acțiuni sunt executate de obicei în fiecare lună, săptămână sau zi pentru companii foarte mari ...
 
 AccountancyAreaDescJournalSetup=PASUL %s: Creați sau verificați conținutul jurnalului din meniu %s
-AccountancyAreaDescChartModel=STEP %s: Check that a model of chart of account exists or create one from menu %s
-AccountancyAreaDescChart=STEP %s: Select and|or complete your chart of account from menu %s
+AccountancyAreaDescChartModel=PASUL %s: Verificați dacă există un plan de conturi sau creați unul din meniul %s
+AccountancyAreaDescChart=PASUL %s: Selectaţi şi|sau completaţi planul de conturi din meniul %s
 
 AccountancyAreaDescVat=PASUL %s: Definirea conturilor contabile pentru fiecare TVA. Pentru aceasta, utilizați intrarea din meniu %s.
 AccountancyAreaDescDefault=PAS %s: Definiți conturile implicite de contabilitate. Pentru aceasta, utilizați intrarea în meniu %s.
@@ -98,7 +98,7 @@ MenuExpenseReportAccounts=Conturi de rapoarte de cheltuieli
 MenuLoanAccounts=Conturi de împrumut
 MenuProductsAccounts=Conturi de produs
 MenuClosureAccounts=Conturi de închidere
-MenuAccountancyClosure=Closure
+MenuAccountancyClosure=Închidere
 MenuAccountancyValidationMovements=Validare trasferuri
 ProductsBinding=Conturi de produse
 TransferInAccounting=Transfer în contabilitate
@@ -121,7 +121,7 @@ InvoiceLinesDone=Asociaza liniile facturii
 ExpenseReportLines=Linii de rapoarte de cheltuieli de asociat
 ExpenseReportLinesDone=Linii asociate de rapoarte de cheltuieli
 IntoAccount=Asociaza linia cu contul contabil
-TotalForAccount=Total for accounting account
+TotalForAccount=Total pentru contabilitate
 
 
 Ventilate=Asociaza
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Permite gestionarea unui număr diferit de zerouri la sf
 BANK_DISABLE_DIRECT_INPUT=Dezactivați înregistrarea directă a tranzacției în contul bancar
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Activați schița de export în jurnal
 ACCOUNTANCY_COMBO_FOR_AUX=Activați lista combo pentru cont auxiliar (poate fi lentă dacă aveți o mulțime de terți)
+ACCOUNTING_DATE_START_BINDING=Definiți o dată pentru a începe legarea și transferul în contabilitate. Înainte de această dată, tranzacțiile nu vor fi transferate în contabilitate.
 
 ACCOUNTING_SELL_JOURNAL=Jurnal vânzări
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal cumpărări
@@ -162,25 +163,25 @@ ACCOUNTING_RESULT_LOSS=Contul contabil rezultat (pierdere)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Jurnal de închidere
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Contul contabil al transferului bancar în tranziție
-TransitionalAccount=Transitional bank transfer account
+TransitionalAccount=Cont tranzitoriu de transfer bancar 
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Contul contabil de așteptare
 DONATION_ACCOUNTINGACCOUNT=Contul contabil pentru a înregistra donații
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Contul Contabilitate pentru a înregistra abonamente
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Contul contabil implicit pentru produsele cumpărate (se foloseşte dacă nu este definit în fișa de produs)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT= Contul contabil implicit pentru produsele cumpărate din CEE (utilizat dacă nu este definit în fișa de produs)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT= Contul contabil implicit pentru produsele cumpărate și importate din CEE (utilizate dacă nu sunt definite în fișa de produs)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cont contabil implicit pentru produsele vândute (utilizate dacă nu este definit în fișa produsului)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Accounting account by default for the products sold in EEC (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Accounting account by default for the products sold and exported out of EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cont contabil implicit pentru produsele vândute în CEE (se utilizează dacă nu este definit în fișa de produs)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cont contabil implicit pentru produsele vândute și exportate din CEE (se utilizează dacă nu este definit în fișa de produs)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Contul contabil implicit pentru serviciile cumpărate (utilizat dacă nu este definit în fișa serviciului)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Accounting account by default for the bought services in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought services and imported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Cont contabil implicit pentru serviciile cumpărate din CEE (se utilizează dacă nu este definit în fișa de servicii)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Cont contabil implicit pentru serviciile cumpărate și importate din CEE (utilizat dacă nu este definit în fișa de servicii)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Contul contabil implicit pentru serviciile vândute (utilizat dacă nu este definit în fișa de servicii)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Accounting account by default for the services sold in EEC (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Accounting account by default for the services sold and exported out of EEC (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Contul contabil implicit pentru serviciile vândute în CEE (folosit dacă nu este definit în fișa de servicii)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Contul contabil implicit pentru serviciile vândute și exportate din CEE (utilizat dacă nu este definit în fișa de servicii)
 
 Doctype=Tipul documentului
 Docdate=Data
@@ -189,7 +190,7 @@ LabelAccount=Etichetă cont
 LabelOperation=Etichetarea operaţiei
 Sens=Sens
 LetteringCode=Codul de scriere
-Lettering=Lettering
+Lettering=Numerotare
 Codejournal=Journal
 JournalLabel=Eticheta jurnalului
 NumPiece=Număr nota contabila
@@ -206,7 +207,7 @@ DeleteMvt=Ștergeți liniile din Cartea Mare
 DelMonth=Luna care se şterge
 DelYear=Anul pentru ștergere
 DelJournal=Jurnalul de șters
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
+ConfirmDeleteMvt= Aceasta va șterge toate liniile din Jurnal pentru anul/luna și/sau dintr-un jurnal specific (este necesar cel puțin un criteriu). Va trebui să reutilizați funcția „Înregistrare în contabilitate” pentru a înregistra din nou tranzacţiile şterse.
 ConfirmDeleteMvtPartial=Aceasta va șterge toate liniile Cărţii Mari  (toate liniile legate de aceeași tranzacție vor fi șterse)
 FinanceJournal=Jurnal Bancă
 ExpenseReportsJournal=Jurnalul rapoartelor de cheltuieli
@@ -234,15 +235,15 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terț necunoscut
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Contul terț nu este definit sau este necunoscut. Eroare de blocare.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conturile terț și de așteptare necunoscute nu sunt definite. Eroare de blocare
 PaymentsNotLinkedToProduct=Plata nu legată de vreun produs/serviciu
-OpeningBalance=Opening balance
+OpeningBalance=Sold iniţial de deschidere
 ShowOpeningBalance=Afişează  soldurile de deschidere
 HideOpeningBalance=Ascunde soldurile de deschidere
-ShowSubtotalByGroup=Show subtotal by group
+ShowSubtotalByGroup=Afişare subtotal după grupă
 
 Pcgtype=Grup de conturi
-PcgtypeDesc=Group of account are used as predefined 'filter' and 'grouping' criteria for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report.
+PcgtypeDesc=Grupele de conturi sunt utilizate ca criterii predefinite de 'filtrare' și 'grupare' pentru unele rapoarte contabile. De exemplu, 'VENITURI' sau 'CHELTUIELI' sunt utilizate ca grupe pentru conturile contabile ale produselor pentru a construi raportul de cheltuieli/venituri.
 
-Reconcilable=Reconcilable
+Reconcilable=Compensabil
 
 TotalVente=Cifra de afaceri totală înainte de impozitare
 TotalMarge=Total Marje vânzări
@@ -253,15 +254,15 @@ DescVentilDoneCustomer=Consultați aici lista liniilor de facturare pentru clien
 DescVentilTodoCustomer=Ascoiază linii de facturare care nu sunt deja legate de contul contabil al produsului
 ChangeAccount=Modificați contul contabil al produsului / serviciului pentru liniile selectate cu următorul cont contabil:
 Vide=-
-DescVentilSupplier=Consult here the list of vendor invoice lines bound or not yet bound to a product accounting account (only record not already transfered in accountancy are visible)
+DescVentilSupplier=Consultați aici lista liniilor de pe factura de achiziţie asociate sau nu la un cont de produs (doar înregistrările care nu au fost deja transferate în contabilitate sunt vizibile)
 DescVentilDoneSupplier=Consultați aici lista liniilor facturilor furnizorilor și contul lor contabil
 DescVentilTodoExpenseReport=Linii de raportare a cheltuielilor care nu sunt deja asociate unui cont contabile de taxe
 DescVentilExpenseReport=Consultați aici lista liniilor de raportare a cheltuielilor asociate (sau nu) unui cont contabile de taxe
 DescVentilExpenseReportMore=Dacă configurați contul de contabilitate pe linii de raportare a tipurilor de cheltuieli, aplicația va putea face toate legătura între liniile dvs. de raportare a cheltuielilor și contul contabil al planului dvs. de conturi, într-un singur clic <strong> „%s“ </strong>. În cazul în care contul nu a fost stabilit în dicționar de taxe sau dacă aveți încă anumite linii care nu sunt legate de niciun cont, va trebui să faceți o legare manuală din meniu<strong> %s </strong>".
 DescVentilDoneExpenseReport=Consultați aici lista liniilor rapoartelor privind cheltuielile și contul contabil a taxelor lor
 
-DescClosure=Consult here the number of movements by month who are not validated & fiscal years already open
-OverviewOfMovementsNotValidated=Step 1/ Overview of movements not validated. (Necessary to close a fiscal year)
+DescClosure=Consultați aici numărul de tranzacţii lunare care nu sunt validate și se află în anii fiscali deschişi
+OverviewOfMovementsNotValidated=Pasul 1 / Prezentarea generală a tranzacţiilor nevalidate. (Necesar pentru a închide un an fiscal)
 ValidateMovements=Vallidare trasferuri
 DescValidateMovements= Orice modificare sau ștergere a înregistrărilor va fi interzisă. Toate intrările pentru un exercițiu financiar trebuie validate, altfel închiderea nu va fi posibilă
 SelectMonthAndValidate=Selectează luna şi validează trasferurile
@@ -284,6 +285,7 @@ ShowTutorial=Arată tutorial
 NotReconciled=Nu este conciliat
 
 ## Admin
+BindingOptions=Opțiuni de legare
 ApplyMassCategories=Aplica categorii bulk
 AddAccountFromBookKeepingWithNoCategories=Contul contabil disponibil nu este încă într-o grupă personalizată
 CategoryDeleted=Categoria pentru contul contabil a fost eliminată
@@ -317,12 +319,12 @@ Modelcsv_quadratus=Export pentru Quadratus QuadraCompta
 Modelcsv_ebp=Export pentru EBP
 Modelcsv_cogilog=Export pentru Cogilog
 Modelcsv_agiris=Export pentru Agiris
-Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
-Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
+Modelcsv_LDCompta=Export pentru LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Export pentru LD Compta (v10 & mai nou)
 Modelcsv_openconcerto=Export pentru OpenConcerto (Test)
 Modelcsv_configurable=Exportați CSV configurabil
 Modelcsv_FEC=Exportă fişier FEC
-Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland
+Modelcsv_Sage50_Swiss=Export pentru Sage 50 Switzerland
 Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta
 ChartofaccountsId=Id-ul listei de conturi
 
@@ -330,20 +332,20 @@ ChartofaccountsId=Id-ul listei de conturi
 InitAccountancy=Init contabilitate
 InitAccountancyDesc=Această pagină poate fi utilizată pentru a inițializa un cont contabil pentru produse și servicii care nu au cont contabil definit pentru vânzări și achiziții.
 DefaultBindingDesc=Această pagină poate fi utilizată pentru a seta un cont implicit care să fie folosit pentru a lega înregistrarea tranzacțiilor cu privire la salariile de plată, donațiile, impozitele și taxe atunci când nu a fost deja stabilit niciun cont contabil.
-DefaultClosureDesc=This page can be used to set parameters used for accounting closures.
+DefaultClosureDesc= Această pagină poate fi utilizată pentru a seta parametrii folosiți pentru închiderile contabile. 
 Options=Opţiuni
 OptionModeProductSell=Mod vanzari
 OptionModeProductSellIntra=Mod  vânzări export în CEE
 OptionModeProductSellExport=Mod vânzări export în alte ţări
 OptionModeProductBuy=Mod cumparari
-OptionModeProductBuyIntra=Mode purchases imported in EEC
-OptionModeProductBuyExport=Mode purchased imported from other countries
+OptionModeProductBuyIntra=Modul achiziţii import din CEE
+OptionModeProductBuyExport=Modul achiziţii import din alte ţări
 OptionModeProductSellDesc=Afișați toate produsele ce au cont contabil pentru vânzări.
 OptionModeProductSellIntraDesc=Afișează toate produsele cu cont contabil pentru vânzările în CEE.
 OptionModeProductSellExportDesc=Afișează toate produsele cu cont contabil pentru vânzările în alte ţări.
 OptionModeProductBuyDesc=Afișați toate produsele ce au cont contabil pentru achiziții.
-OptionModeProductBuyIntraDesc=Show all products with accounting account for purchases in EEC.
-OptionModeProductBuyExportDesc=Show all products with accounting account for other foreign purchases.
+OptionModeProductBuyIntraDesc=Afişează toate produsele achiziţionate din CEE.
+OptionModeProductBuyExportDesc=Afişează toate produsele achiziţionate din alte ţări.
 CleanFixHistory=Eliminați codul contabil din linii care nu există în diagramele de cont
 CleanHistory=Resetați toate asocierile pentru anul selectat
 PredefinedGroups=Grupuri predefinite
@@ -354,8 +356,8 @@ AccountRemovedFromGroup=Cont contabil eliminat din grupă
 SaleLocal=Vânzare locală
 SaleExport=Vânzare la export
 SaleEEC=Vânzări în CEE
-SaleEECWithVAT=Sale in EEC with a VAT not null, so we suppose this is NOT an intracommunautary sale and the suggested account is the standard product account.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fallback on the product account for standard sales. You can fix the VAT ID of thirdparty or the product account if needed.
+SaleEECWithVAT=Vânzarea în CEE cu cota TVA diferită de zero, deci presupunem că aceasta NU este o vânzare intracomunitară, iar contul contabil este cel standard al produsului. 
+SaleEECWithoutVATNumber=Vânzare în CEE fără TVA, dar codul TVA al terțului nu este definit. Se va utiliza contul contabil de produs pentru vânzările standard. Completaţi codul de TVA al terțului sau contul contabil aferent produsului.
 
 ## Dictionary
 Range=Rang cont contabil
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index e78c72784c6..fa9ced9b194 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -18,29 +18,29 @@ GlobalChecksum=Sumă de control globală
 MakeIntegrityAnalysisFrom=Analizați integritatea fișierelor de aplicații de la
 LocalSignature=Semnătura locală încorporată (mai puțin fiabilă)
 RemoteSignature=Semnătura remote (mai fiabilă)
-FilesMissing= Fișiere Lipsa
-FilesUpdated= Fișiere Actualizate
+FilesMissing=Fișiere lipsă
+FilesUpdated=Fișiere actualizate
 FilesModified=Fișiere modificate
 FilesAdded=Fișiere adăugate
 FileCheckDolibarr=Verificați integritatea fișierelor de aplicații
 AvailableOnlyOnPackagedVersions=Fișierul local pentru verificarea integrității este disponibil numai când aplicația este instalată dintr-un pachet oficial
 XmlNotFound=Integritatea fișierului de aplicație Xml nu a fost găsit
-SessionId=ID Sesiune
+SessionId=ID sesiune
 SessionSaveHandler=Handler pentru a salva sesiunile
 SessionSavePath=Locația sesiunii salvate
 PurgeSessions=Goleşte sesiunile
 ConfirmPurgeSessions=Chiar vrei să ștergi toate sesiunile? Acest lucru va deconecta fiecare utilizator (cu excepția dvs.).
 NoSessionListWithThisHandler=Handlerul sesiunii salvate configurat la dvs. în PHP nu permite afișarea tuturor sesiunilor in derulare.
-LockNewSessions=Blocare  conexiuni noi
+LockNewSessions=Blocare conexiuni noi
 ConfirmLockNewSessions=Sigur doriți să restricționați orice nouă conexiune Dolibarr către dvs.? Numai utilizatorul <b> %s </b> se va putea conecta după aceea.
-UnlockNewSessions=Înlăturaţi blocarea  conexiunii
-YourSession=Sesiuniea dvs
+UnlockNewSessions=Înlăturaţi blocarea conexiunilor
+YourSession=Sesiunea dvs
 Sessions=Sesiuni utilizatori
-WebUserGroup=Web Server utilizator / grup
+WebUserGroup=Utilizator/grup Web Server
 NoSessionFound=Configurația dvs. PHP pare să nu permită listarea sesiunilor active. Directorul utilizat pentru salvarea sesiunilor (<b> %s </b>) ar putea fi protejat (de exemplu prin permisiuni ale sistemului de operare sau prin directiva PHP open_basedir).
 DBStoringCharset=Set caractere  al bazei de date pentru  stocarea datelor
 DBSortingCharset=Set caractereal bazei de date pentru sortarea datelor
-HostCharset=Host charset
+HostCharset=Charset gazdă
 ClientCharset=Set de caractere client
 ClientSortingCharset=Compararea clienților
 WarningModuleNotActive=<b>Modulul %s</b> trebuie să fie activat
@@ -95,14 +95,14 @@ NextValueForInvoices=Urmatoarea valoare (facturi)
 NextValueForCreditNotes=Urmatoarea valoare (credit note)
 NextValueForDeposit=Valoarea următoare (plata în avans)
 NextValueForReplacements=Urmatoarea valoare(înlocuiri)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
+MustBeLowerThanPHPLimit=Notă: Configuraţia ta PHP permite încărcarea de fişiere cu dimensiuni de până la <b>%s</b>%s, indiferent de valoarea acestui parametru
 NoMaxSizeByPHPLimit=Notă: Nicio limită setată în configuraţia dvs. PHP
 MaxSizeForUploadedFiles=Mărimea maximă pentru fişierele încărcate (0 pentru a interzice orice încărcare)
 UseCaptchaCode=Utilizaţi codul grafic  (CAPTCHA)  pe pagina de login
 AntiVirusCommand=Calea completă la comanda antivirus
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Exemplu pentru ClamAv Daemon (necesită clamav-daemon): /usr/bin/clamdscan<br>Exemplu pentru ClamWin (foarte foarte lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe 
 AntiVirusParam= Mai multe despre parametrii în linia de comandă
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Exemplu pentru ClamAv Daemon: --fdpass<br>Exemplu pentru ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Setări Modul Contabilitate
 UserSetup=Setări Modul Utilizatori
 MultiCurrencySetup=Setarea în mai multe valute
@@ -179,8 +179,8 @@ Compression=Compresie
 CommandsToDisableForeignKeysForImport=Comandă pentru a dezactiva cheile străine la import
 CommandsToDisableForeignKeysForImportWarning=Necesar dacă doriți să puteţi restaura sql dump -ul dvs  mai târziu
 ExportCompatibility=Compatibilitatea  fişierului de export generat
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=Foloseşte parametrul --quick
+ExportUseMySQLQuickParameterHelp=Parametrul '--quick' ajută la limitarea consumului de memorie RAM pentru tabelele mari.
 MySqlExportParameters=Parametrii export MySQL 
 PostgreSqlExportParameters= Parametrii export PostgreSQL
 UseTransactionnalMode=Utilizaţi mod tranzacţional
@@ -200,7 +200,7 @@ FeatureDisabledInDemo=Funcţonalitate dezactivată în demo
 FeatureAvailableOnlyOnStable=Funcție disponibilă numai pe versiuni oficiale stabile
 BoxesDesc=Widgeturile sunt componente care prezintă unele informații pe care le puteți adăuga pentru a personaliza unele pagini. Puteți alege între afișarea sau neafișarea widget-ului , selectând pagina țintă și dând clic pe "Activați" sau făcând clic pe coșul de gunoi pentru a o dezactiva.
 OnlyActiveElementsAreShown=Numai elementele din <a href="%s"> module activate </a> sunt afişate.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
+ModulesDesc=Modulele/aplicațiile determină ce caracteristici sunt disponibile în software. Unele module necesită acordarea de permisiuni utilizatorilor după activare. Faceți clic pe butonul on/off<span class="small valignmiddle">%s</span> din fiecare modul pentru a activa sau dezactiva un modulul/aplicația.
 ModulesMarketPlaceDesc=Puteți descărca mai multe module de pe site-uri externe de pe Internet ...
 ModulesDeployDesc=Dacă permisiunile sistemului dvs. de fișiere permit acest lucru, puteți utiliza acest instrument pentru a implementa un modul extern. Modulul va fi apoi vizibil în tab <strong> %s </strong>.
 ModulesMarketPlaces=Găsiți aplicația / modulele externe
@@ -219,11 +219,11 @@ Nouveauté=Noutate
 AchatTelechargement=Cumpărați / Descărcați
 GoModuleSetupArea=Pentru a implementa / instala un nou modul, accesați zona de configurare a modulelor: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore, market place oficial  pentru  module externe Dolibarr ERP / CRM
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=Lista companiilor care furnizează module sau funcții dezvoltate personalizat.<br>Notă: Având în vedere că Dolibarr este o aplicație open source, <i>orice</i> utilizator experimentat în programarea PHP ar trebui să poată dezvolta un modul
 WebSiteDesc=Site-uri externe pentru module suplimentare (non-core) ...
 DevelopYourModuleDesc=Unele soluții pentru a vă dezvolta propriul modul ...
 URL=URL
-RelativeURL=Relative URL
+RelativeURL=URL relativ
 BoxesAvailable=Widgeturi disponibile
 BoxesActivated=Widgeturile activate
 ActivateOn=Activaţi pe
@@ -273,7 +273,7 @@ Emails=E-mailuri
 EMailsSetup=Setarea e-mailurilor
 EMailsDesc=Această pagină vă permite să înlocuiți parametrii impliciți PHP pentru trimiterea e-mailurilor. În majoritatea cazurilor pe sistemul de operare Unix / Linux, configurarea PHP este corectă și acești parametri nu sunt necesari.
 EmailSenderProfiles=Profilurile expeditorului mailurilor
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
+EMailsSenderProfileDesc=Puteți lăsa această secțiune goală. Dacă introduceți câteva e-mailuri aici, acestea vor fi adăugate la lista posibililor expeditori în combobox atunci când scrieți un nou e-mail.
 MAIN_MAIL_SMTP_PORT=Portul SMTP / SMTPS (valoarea implicită în php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_SERVER=Gazdă SMTP / SMTPS (valoarea implicită în php.ini: <b> %s </b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Portul SMTP / SMTPS (nu este definit în PHP pe sistemele de tip Unix)
@@ -283,7 +283,7 @@ MAIN_MAIL_ERRORS_TO=E-mailul utilizat pentru e-mailurile care se întorc cu eror
 MAIN_MAIL_AUTOCOPY_TO= Copiați (Bcc) toate e-mailurile trimise către
 MAIN_DISABLE_ALL_MAILS=Dezactivați trimiterea tuturor e-mailurilor (în scopuri de testare sau demonstrații)
 MAIN_MAIL_FORCE_SENDTO=Trimiteți toate e-mailurile către (în loc de destinatari reali, în scopuri de testare)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugerați e-mailuri ale angajaților (dacă sunt definiți) în lista destinatarului predefinit atunci când scrieți un nou e-mail
 MAIN_MAIL_SENDMODE=Metoda de trimitere prin e-mail
 MAIN_MAIL_SMTPS_ID=ID SMTP (dacă serverul de expediere necesită autentificare)
 MAIN_MAIL_SMTPS_PW=Parola SMTP (dacă serverul de trimitere necesită autentificare)
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=E-mailul implicit al expeditorului pentru trimiterea
 UserEmail=E-mailul utilizatorului
 CompanyEmail=E-mailul companiei
 FeatureNotAvailableOnLinux=Caracteristicã nu sunt disponibile pe Unix, cum ar fi sisteme. Testaţi-vă sendmail program la nivel local.
+FixOnTransifex=Remediază traducerea pe platforma de traducere online a proiectului 
 SubmitTranslation=Dacă traducerea pentru această limbă nu este completă sau dacă găsiți erori, puteți corecta aceasta prin editarea fișierelor din directorul <b> langs / %s </b> și trimiteți modificarea la www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Dacă traducerea pentru această limbă nu este completă sau dacă găsiți erori, puteți corecta aceasta prin editarea fișierelor în directorul <b> langs / %s </b> și trimiteți fișiere modificate pe dolibarr.org/forum sau pentru dezvoltatori pe github.com/ Dolibarr / Dolibarr.
+SubmitTranslationENUS=Dacă traducerea pentru această limbă nu este completă sau găsiți erori, puteți corecta aceasta modificând fișierele din directorul <b>langs/%s</b> şi trimiţând fişierele modificate la dolibarr.org/forum sau, dacă eşti developer cu un PR la github.com/Dolibarr/dolibarr
 ModuleSetup=Configurare Modul
 ModulesSetup=Configurare Module / Aplicație
 ModuleFamilyBase=Sistem
@@ -331,7 +332,7 @@ SetupIsReadyForUse=Implementarea modulului a fost terminată. Cu toate acestea,
 NotExistsDirect=Directorul rădăcină alternativ nu este atribuit unui director existent. <br>
 InfDirAlt=De la versiunea 3, este posibil să se definească un director rădăcină alternativ. Acest lucru vă permite să stocați, într-un director dedicat, plug-in-uri și șabloane personalizate. <br> Doar creați un director in rădăcina Dolibarr (de exemplu: personalizat).<br>
 InfDirExample=<br> Atunci declarați în fișierul <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ custom' <br> $ dolibarr_main_document_root_alt = '/ calea / din / dolibarr / htdocs / personalizat' <br> Dacă aceste linii sunt comentate cu "#", pentru a le activa, doar anulaţi comentarea prin eliminarea caracterului "#".
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+YouCanSubmitFile=Poţi încărca un fişier .zip al pachetului de modul de aici:
 CurrentVersion=Dolibarr versiunea curentă
 CallUpdatePage=Navigați la pagina care actualizează structura și datele bazei de date: %s.
 LastStableVersion=Ultima versiune stabilă
@@ -340,7 +341,7 @@ LastActivationAuthor=Ultimul autor de activare
 LastActivationIP=Ultimul IP de activare
 UpdateServerOffline=Update server offline
 WithCounter=Gestionați un contor
-GenericMaskCodes=Puteți introduce orice mască de numerotare. În această mască, ar putea fi folosit următoarele etichete: <br> <b>{000000}</b> corespunde unui număr care va fi incrementat pe fiecare% s. Introduceți cât mai multe zerouri ca lungimea dorită a contra. Contorul va fi completat cu zerouri la stânga, în scopul de a avea cât mai multe zerouri ca masca. <br> <b>{000000} +000</b> fel ca și anterior, dar o compensare corespunzător cu numărul din dreapta semnului + se aplică începând cu prima% s. <br> <b>{000000 @ x}</b> fel ca și anterior, dar contorul este resetat la zero atunci când se ajunge la o lună x (x între 1 și 12, sau 0 pentru a folosi primele luni ale anului fiscal definite în configurația dvs., sau 99 pentru a reseta la zero în fiecare lună ). Dacă această opțiune este folosită și x este 2 sau mai mare, atunci secvența {aa} {mm} sau {AAAA} {mm} este de asemenea necesară. <br> <b>{Dd}</b> zi (01 la 31). <br> <b>{Mm}</b> luni (01 la 12). <br> <b>{AA}, {AAAA}</b> sau <b>{y}</b> an peste 2, 4 sau 1 numere. <br>
+GenericMaskCodes=Puteți introduce orice mască de numerotare. În această mască, ar putea fi folosit următoarele etichete: <br> <b>{000000}</b> corespunde unui număr care va fi incrementat pe fiecare %s. Introduceți cât mai multe zerouri ca lungimea dorită a contra. Contorul va fi completat cu zerouri la stânga, în scopul de a avea cât mai multe zerouri ca masca. <br> <b>{000000} +000</b> fel ca și anterior, dar o compensare corespunzător cu numărul din dreapta semnului + se aplică începând cu prima %s. <br> <b>{000000 @ x}</b> fel ca și anterior, dar contorul este resetat la zero atunci când se ajunge la o lună x (x între 1 și 12, sau 0 pentru a folosi primele luni ale anului fiscal definite în configurația dvs., sau 99 pentru a reseta la zero în fiecare lună ). Dacă această opțiune este folosită și x este 2 sau mai mare, atunci secvența {aa} {mm} sau {AAAA} {mm} este de asemenea necesară. <br> <b>{Dd}</b> zi (01 la 31). <br> <b>{Mm}</b> luni (01 la 12). <br> <b>{AA}, {AAAA}</b> sau <b>{y}</b> an peste 2, 4 sau 1 numere. <br>
 GenericMaskCodes2=<b> {cccc} </b> codul clientului pe n caractere <br><b> {cccc000} </b> codul clientului pe n caractere este urmat de un contor dedicat clientului. Acest contor dedicat clientului este resetat în același timp cu contorul global. <br> <b> {tttt} </b> Codul tipului de terță parte pe n caractere (vedeți meniul Acasă - Configurare - Dicționar - Tipuri de terțe părți) . Dacă adăugați această etichetă, contorul va fi diferit pentru fiecare tip de terță parte<br>\n
 GenericMaskCodes3=Toate celelalte caractere în masca va rămâne intactă. <br> Spaţiile nu sunt permise. <br>
 GenericMaskCodes4a=<u> Exemplu privind al 99-lea %s  terț TheCompany, cu data 2007-01-31: </u> <br>
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modulul <b> %s</b> trebuie să fie activat daca aveti n
 SecurityToken=Cheia pentru URL-uri sigure
 NoSmsEngine=Nu este disponibil niciun manager de expediere SMS-uri. Un manager de expediere SMS-uri nu este instalat cu distribuția implicită deoarece acesta depinde de un furnizor extern, dar puteți găsi pe %s
 PDF=PDF
-PDFDesc=Opțiuni globale pentru generare PDF.
-PDFAddressForging=Reguli pentru casetele de adrese
+PDFDesc=Opţiuni globale pentru generarea PDF
+PDFAddressForging=Reguli pentru secţiunea adresă
 HideAnyVATInformationOnPDF=Ascundeți toate informațiile referitoare la taxa pe vânzări / TVA
 PDFRulesForSalesTax=Reguli pentru taxa pe vânzări / TVA
 PDFLocaltax=Reguli pentru %s
-HideLocalTaxOnPDF=Ascundeți %s rata în coloana Vânzare fiscală
+HideLocalTaxOnPDF=Ascunde cota %s în coloana Taxă vânzări / TVA
 HideDescOnPDF=Ascunde descrierea produselor
 HideRefOnPDF=Ascundeți referinţele produselor
 HideDetailsOnPDF=Ascundeți detaliile liniei de produs
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modifică la prețuri cu valoarea de referință de bază
 MassConvert=Lansați conversia în bloc
 PriceFormatInCurrentLanguage=Formatul prețului în format de valută
 String=String
+String1Line=String (1 linie)
 TextLong=Long text
+TextLongNLines=Text lung (n linii)
 HtmlText=Text HTML
 Int=Întreg
 Float=Float
@@ -428,7 +431,7 @@ ExtrafieldCheckBox=Casetele de selectare
 ExtrafieldCheckBoxFromList=Căsuțele de selectare din tabel
 ExtrafieldLink=Link către un obiect
 ComputedFormula=Câmp calculat
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Puteți introduce aici o formulă folosind alte proprietăți ale obiectului sau orice cod PHP pentru a obține o valoare calculată dinamic. Puteți utiliza orice formule compatibile PHP, inclusiv "?" operator de condiții și următorul obiect global: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENŢIE</strong>: Doar unele proprietăți $object pot fi disponibile. Dacă aveți nevoie de o proprietate care nu este încărcată, introduceți singur obiectul în formula dvs. ca în cel de-al doilea exemplu.<br> Utilizarea unui câmp calculat înseamnă că nu puteți introduce nici o valoare din interfață. De asemenea, dacă există o eroare de sintaxă, formula nu poate returna nimic.\n <br><br>Exemplu de formulă<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemplu cu reîncărcarea obiectului<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Un alt exemplu de formulă pentru a forța încărcarea obiectului și a obiectului său părinte:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Proiectul părinte nu a fost găsit'
 Computedpersistent=Stocați câmpul calculat
 ComputedpersistentDesc=Câmpurile suplimentare computerizate vor fi stocate în baza de date, cu toate acestea, valoarea va fi recalculată numai atunci când obiectul acestui câmp este modificat. Dacă câmpul calculat depinde de alte obiecte sau date globale, această valoare ar putea fi greșită !!
 ExtrafieldParamHelpPassword=Lăsând acest câmp necompletat înseamnă că această valoare va fi stocată fără criptare (câmpul trebuie ascuns numai cu stea pe ecran). <br> Setarea "auto" pentru utilizarea regulii de criptare implicită pentru a salva parola în baza de date (atunci valoarea citită va fi hash numai, nici o şansă de a recupera valoarea inițială)
@@ -444,14 +447,14 @@ LocalTaxDesc=Unele țări pot aplica două sau trei taxe pe fiecare linie de fac
 SMS=SMS
 LinkToTestClickToDial=Introduceți un număr de telefon pentru a afișa un link de test ClickToDial  Url pentru utilizatorul<strong>%s</strong>
 RefreshPhoneLink=Refresh link
-LinkToTest=Link accesibil generat pentru utilizatorul <strong>% s</strong> (faceți clic pe numărul de telefon pentru a testa)
+LinkToTest=Link accesibil generat pentru utilizatorul <strong>%s</strong> (faceți clic pe numărul de telefon pentru a testa)
 KeepEmptyToUseDefault=Lasă gol pentru utilizarea valorii implicite
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=În majoritatea cazurilor, poţi lăsa acest câmp necompletat.
 DefaultLink=Link implicit
 SetAsDefault=Setați ca implicit
 ValueOverwrittenByUserSetup=Atenție, această valoare poate fi suprascrisă de setările specifice utilizatorului (fiecare utilizator poate seta propriul url clicktodial)
-ExternalModule=External module
-InstalledInto=Installed into directory %s
+ExternalModule=Modul extern
+InstalledInto=Instalat în director %s
 BarcodeInitForThirdparties=Cod de bare de masă pentru terți
 BarcodeInitForProductsOrServices=Init sau reset cod de bare în  masă pentru produse şi servicii
 CurrentlyNWithoutBarCode=În prezent, aveti <strong> %s </strong>inregistrari pe <strong> %s</strong> %s fără cod de bare definit.
@@ -477,7 +480,7 @@ Use3StepsApproval=În mod implicit, comenzile de cumpărare trebuie să fie crea
 UseDoubleApproval=Utilizați o aprobare de 3 pași atunci când suma (fără taxă) este mai mare decât ...
 WarningPHPMail=AVERTISMENT: Este adesea mai bine să configurați e-mailurile de trimis pentru a utiliza serverul de e-mail al furnizorului dvs. în loc de setarea implicită. Unii furnizori de e-mail (cum ar fi Yahoo) nu vă permit să trimiteți un e-mail de la un alt server decât propriul lor server. Setarea dvs. curentă utilizează serverul aplicației pentru a trimite e-mailuri și nu serverul furnizorului de servicii de e-mail, astfel încât unii destinatari (cel compatibil cu protocolul DMARC restrictiv) vor întreba furnizorul dvs. de e-mail dacă pot accepta e-mailul dvs. și anumiți furnizori de e-mail (cum ar fi Yahoo) pot răspunde "nu" deoarece serverul nu este al lor, astfel încât puține dintre e-mailurile trimise nu pot fi acceptate (aveți grijă și de cota de trimitere a furnizorului de servicii de e-mail). această restricție trebuie să schimbați configurarea e-mailului pentru a alege cealaltă metodă "server SMTP" și introduceți serverul SMTP și acreditările furnizate de furnizorul dvs. de e-mail.
 WarningPHPMail2=Dacă furnizorul dvs. de e-mail SMTP trebuie să restricționeze clientul de e-mail la unele adrese IP (foarte rar), aceasta este adresa IP a agentului utilizator de e-mail (MUA) pentru aplicația ERP CRM: <strong> %s </strong>.
-WarningPHPMailSPF=If the domain name in your sender email address is protected by SPF (ask you email provider), you must include the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
+WarningPHPMailSPF=Dacă numele de domeniu din adresa de e-mail a expeditorului este protejat de SPF (solicitat de furnizorul de e-mail), trebuie să includeți următoarele IP-uri în înregistrarea SPF DNS a domeniului dvs.:<strong>%s</strong>.
 ClickToShowDescription=Faceți clic pentru a afișa descrierea
 DependsOn=Acest modul are nevoie de modulul (modulele)
 RequiredBy=Acest modul este solicitat de modulul (modulele)
@@ -506,10 +509,10 @@ DAV_ALLOW_PUBLIC_DIRTooltip=Directorul public generic este un director WebDAV pe
 DAV_ALLOW_ECM_DIR=Activați directorul privat DMS / ECM (directorul rădăcină al modulului DMS / ECM - este necesară autentificarea)
 DAV_ALLOW_ECM_DIRTooltip=Directorul rădăcină în care toate fișierele sunt încărcate manual când se utilizează modulul DMS / ECM. Similar accesului din interfața web, veți avea nevoie de autentificare/parolă valabilă, cu permisiuni adecvate de accesare a acestuia.
 # Modules
-Module0Name=Utilizatorii & Grupuri
-Module0Desc=Managementul Utilizatorilor/Angajaților și Grupurilor
-Module1Name=Terțe părți
-Module1Desc=Gestionarea companiilor și a contactelor (clienți, perspective ...)
+Module0Name=Utilizatori & Grupuri
+Module0Desc=Managementul Utilizatorilor/Angajaților și al Grupurilor
+Module1Name=Terți
+Module1Desc=Gestionarea companiilor și a contactelor (clienți, prospecţi...)
 Module2Name=Comercial
 Module2Desc=Management Comercial
 Module10Name=Contabilitate (simplificată)
@@ -525,7 +528,7 @@ Module25Desc=Gestionarea comenzilor de vânzări
 Module30Name=Facturi
 Module30Desc=Gestionarea facturilor și a bonurilor de credit pentru clienți. Gestionarea facturilor și a bonurilor de credit pentru furnizori
 Module40Name=Furnizori
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
+Module40Desc=Managementul furnizorilor și achizițiilor (comenzi de achiziţie  și facturi furnizor)
 Module42Name=Depanați jurnalele
 Module42Desc=Facilități de înregistrare (fișier, syslog, ...). Aceste jurnale sunt pentru scopuri tehnice / de depanare.
 Module49Name=Editori
@@ -542,16 +545,16 @@ Module54Name=Contracte / Abonamente
 Module54Desc=Gestionarea contractelor (servicii sau abonamente periodice)
 Module55Name=Coduri de bare
 Module55Desc=Coduri de bare "de gestionare a
-Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Plăți debitoare bancare directe
-Module57Desc=Gestionarea ordinelor de plată directă. Aceasta include generarea dosarului SEPA pentru țările europene.
+Module56Name=Plată prin transfer credit
+Module56Desc=Gestionarea plății furnizorilor efectuate prin ordine de transfer de credit. Acesta include generarea de fișiere SEPA pentru țările europene. 
+Module57Name=Plăţi prin direct debit
+Module57Desc=Gestionarea ordinelor de direct debit. Acesta include generarea de fișiere SEPA pentru țările europene. 
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrare
 Module59Name=Bookmark4u
 Module59Desc=Adauga funcţia de a genera Bookmark4u de cont de la un cont Dolibarr
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Name=Stickere
+Module60Desc=Management stickere
 Module70Name=Intervenţii
 Module70Desc=Managementul Intervenţiilor
 Module75Name=Ordine de deplasare şi Note de Cheltuieli
@@ -569,9 +572,9 @@ Module200Desc=Sincronizarea directorului LDAP
 Module210Name=PostNuke
 Module210Desc=PostNuke integrare
 Module240Name=Exportul de date
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Instrument pentru export date din Dolibarr (asistat) 
 Module250Name=Date importurile
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Instrument pentru import date în Dolibarr (asistat) 
 Module310Name=Membri
 Module310Desc=Fundatia membri de management
 Module320Name=Feed RSS
@@ -635,7 +638,7 @@ Module5000Desc=Vă permite să administraţi mai multe companii
 Module6000Name=Flux de lucru
 Module6000Desc=Gestionarea fluxului de lucru (crearea automată a modificării obiectului și / sau a stării automate)
 Module10000Name=Site-uri
-Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the internet with your own domain name.
+Module10000Desc=Creați site-uri web (publice) cu un editor WYSIWYG. Acesta este un CMS  pentru webmasteri sau dezvoltatori (este recomandat  să cunoașteți limbajul HTML și CSS). Trebuie doar să configurați serverul web (Apache, Nginx, ...) pentru a indica directorul Dolibarr dedicat pentru a-l avea online pe internet cu propriul nume de domeniu. 
 Module20000Name=Managementul cererilor de concediu
 Module20000Desc=Definiți și urmăriți cererile de concediu pentru angajați
 Module39000Name=Loturi de producţie
@@ -647,7 +650,7 @@ Module50000Desc=Oferiți clienților o pagină pentru plata online PayBox (cardu
 Module50100Name=POS SimplePOS
 Module50100Desc=Punct de vânzare modul SimplePOS (POS simplu).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Modulul Punct de Vânzare TakePOS (POS cu ecran tactil, pentru magazine, baruri sau restaurante).
 Module50200Name=PayPal
 Module50200Desc=Oferiți clienților o pagină de plată online PayPal (cont PayPal sau carduri de credit / debit). Aceasta poate fi utilizată pentru a permite clienților dvs. să efectueze plăți ad-hoc sau plăți legate de un anumit obiect Dolibarr (factură, comandă etc.)
 Module50300Name=Dunga
@@ -781,9 +784,9 @@ Permission241=Citeşte categorii
 Permission242=Creare / Modificare categorii
 Permission243=Ştergere categorii
 Permission244=A se vedea conţinutul ascunse categorii
-Permission251=Citiţi cu alţi utilizatori şi grupuri
+Permission251=Citeşte alţi utilizatori şi grupuri
 PermissionAdvanced251=Citeste alţi utilizatori
-Permission252=Creare / Modificare altor utilizatori, grupuri şi a ta permisssions
+Permission252=Citire permisiunile altor utilizatori
 Permission253=Creați / modificați alți utilizatori, grupuri și permisiuni
 PermissionAdvanced253=Crearea / modificarea utilizatorii interni / externi şi permisiuni
 Permission254=Ştergere sau dezactiva alţi utilizatori
@@ -836,9 +839,16 @@ Permission532=Creare / Modificare servicii
 Permission534=Ştergere servicii
 Permission536=A se vedea / administra serviciile ascunse
 Permission538=Exportul de servicii
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Citiți facturile de materiale
 Permission651=Creați / actualizați facturile de materiale
 Permission652=Ștergeți facturile de materiale
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Citiţi donaţii
 Permission702=Creare / Modificare donaţii
 Permission703=Ştergere donaţii
@@ -848,16 +858,18 @@ Permission773=Șterge rapoarte de cheltuieli
 Permission774=Citiți toate rapoartele de cheltuieli (chiar și pentru utilizatorii care nu sunt subordonații dvs.)
 Permission775=Aproba rapoarte de cheltuieli
 Permission776=Plăste  rapoarte de cheltuieli
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export Rapoarte Cheltuieli
 Permission1001=Citeşte stocuri
 Permission1002=Creare / modificare depozite
 Permission1003=Ștergere depozite
 Permission1004=Citeşte stoc deplasările
 Permission1005=Creare / Modificare stoc deplasările
-Permission1101=Read delivery receipts
-Permission1102=Create/modify delivery receipts
-Permission1104=Validate delivery receipts
-Permission1109=Delete delivery receipts
+Permission1101=Citeşte confirmările de livrare
+Permission1102=Creare/modificare confirmări de livrare
+Permission1104=Validează confirmările de livrare
+Permission1109=Şterge confirmările de livrare
 Permission1121=Citiți propunerile furnizorilor
 Permission1122=Creați / modificați propunerile furnizorilor
 Permission1123=Validați propunerile furnizorilor
@@ -886,9 +898,9 @@ Permission1251=Run masa importurile de date externe în baza de date (date de sa
 Permission1321=Export client facturi, atribute şi plăţile
 Permission1322=Redeschide o factură plătită
 Permission1421=Exportaţi comenzi de vânzări și atribute
-Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to)
-Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event)
-Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event)
+Permission2401=Citeşte acțiuni (evenimente sau sarcini) legate de contul său de utilizator (dacă este proprietar al unui eveniment sau doar i s-a atribuit)
+Permission2402= \n \nCreare/modificare acțiuni (evenimente sau sarcini) legate de contul său de utilizator (dacă este proprietar al evenimentului)
+Permission2403=Șterge acțiuni (evenimente sau sarcini) legate de contul său de utilizator (dacă este proprietar al evenimentului) 
 Permission2411=Citeşte acţiuni (evenimente sau sarcini) ale altor persoane
 Permission2412=Crearea / modificarea acţiuni (evenimente sau sarcini) ale altor persoane
 Permission2413=Ştergeţi acţiuni (evenimente sau sarcini) ale altor persoane
@@ -900,6 +912,7 @@ Permission2515=Setup documente directoare
 Permission2801=Folosiți client FTP în modul de citire (numai navigare și descărcare )
 Permission2802=Folosiți client FTP în modul de scriere (ştergere şi încărcare fişiere )
 Permission3200=Citiți evenimente arhivate și amprente digitale
+Permission3301=Generate new modules
 Permission4001=Vezi angajații
 Permission4002=Creați angajați
 Permission4003=Ștergeți angajații
@@ -914,7 +927,7 @@ Permission20003=Şterge cererile de concediu
 Permission20004=Citiți toate solicitările de concediu (chiar și pentru utilizatori care nu sunt subordonați)
 Permission20005=Creați/modificați solicitările de concediu pentru toată lumea (chiar și pentru utilizatorii care nu sunt subordonați)
 Permission20006=Solicitări de concediu ale administrării (gestionare si actualizare balanţă)
-Permission20007=Approve leave requests
+Permission20007=Aprobare cereri de concediu
 Permission23001=Citeste Joburi programate
 Permission23002=Creare/Modificare job programat
 Permission23003=Şterge Joburi programate
@@ -929,12 +942,12 @@ Permission50414=Ștergeți operațiunile în cartea mare
 Permission50415=Ștergeți toate operațiunile pe an și jurnal în cartea mare
 Permission50418=Exportați operațiunile din cartea mare
 Permission50420=Rapoarte și exporturi (cifră de afaceri, balante, jurnale, carte mare)
-Permission50430=Define fiscal periods. Validate transactions and close fiscal periods.
-Permission50440=Manage chart of accounts, setup of accountancy
-Permission51001=Read assets
-Permission51002=Create/Update assets
-Permission51003=Delete assets
-Permission51005=Setup types of asset
+Permission50430=Defineşte perioadele fiscale. Validează tranzacţiile şi perioadele fiscale.
+Permission50440=Administrează schema de conturi, configurează contabilitatea
+Permission51001=Citeşte active
+Permission51002=Creare/Modificare active 
+Permission51003=Ştergere active
+Permission51005=Setare tipuri de active
 Permission54001=Printare
 Permission55001=Cieşte sondaje
 Permission55002=Creare / Modificare sondaje
@@ -947,12 +960,13 @@ Permission63003=Ștergeți resursele
 Permission63004=Asociaţi resursele la agenda de evenimentele
 DictionaryCompanyType=Tipuri de terţi
 DictionaryCompanyJuridicalType=Entități juridice terțe
-DictionaryProspectLevel=Prospect potenţial
+DictionaryProspectLevel=Nivel potenţial prospect pentru companii
+DictionaryProspectContactLevel=Nivel potenţial prospect pentru contacte
 DictionaryCanton=State/Provincii
 DictionaryRegion=Regiuni
 DictionaryCountry=Ţări
 DictionaryCurrency=Monede
-DictionaryCivility=Honorific titles
+DictionaryCivility=Titluri onorifice
 DictionaryActions=Tipuri evenimente agenda
 DictionarySocialContributions=Tipuri  de taxe sociale si fiscale
 DictionaryVAT=Cote TVA sau Cote Taxe Vanzări
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Șabloane de e-mail
 DictionaryUnits=Unităţi
 DictionaryMeasuringUnits=Unități de măsură
 DictionarySocialNetworks=Retele sociale
-DictionaryProspectStatus=Statut Prospect
+DictionaryProspectStatus=Status prospect pentru companii
+DictionaryProspectContactStatus=Status prospect pentru contacte
 DictionaryHolidayTypes=Tipuri de concediu
 DictionaryOpportunityStatus=Stare de conducere pentru proiect/conducere
 DictionaryExpenseTaxCat=Raport de cheltuieli - Categorii de transport
@@ -993,7 +1008,7 @@ VATIsNotUsedDesc=Implicit, taxa de vânzare propusă este 0, ea poate fi utiliza
 VATIsUsedExampleFR=În Franța, înseamnă companii sau organizații care au un sistem fiscal real (Simplificat real sau normal real). Un sistem în care TVA este declarată .
 VATIsNotUsedExampleFR=În Franța, înseamnă că sunt declarate asociații care nu sunt plătitoare de taxe sau societăți, organizații sau profesii liberale care au ales sistemul fiscal micro intreprindere (taxe de vânzări în franciză) şi plătesc taxe de vânzare de franciză fără nicio declarație de taxe de vânzare. Această opțiune va afișa referinţa "Vânzări  cu taxe neaplicabile - art-293B de CGI" pe facturi.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Tipuri taxe vânzări
 LTRate=Rată
 LocalTax1IsNotUsed=Nu utilizează taxa secundă
 LocalTax1IsUsedDesc=Utilizați un al doilea tip de taxă (alta decât prima)
@@ -1008,7 +1023,7 @@ LocalTax2Management=Tipul trei al taxei
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE Management
-LocalTax1IsUsedDescES=Rata RE în mod implicit la crearea perspectivelor, facturilor, comenzilor etc. respectă regula standard activă: <br> Dacă cumpărătorul nu este supus ratei RE, RE impliciy va fi 0. Sfârșitul regulii. <br> Dacă cumpărătorul este supus ratei RE, este RE implicit. Sfârșitul regulii. <br>
+LocalTax1IsUsedDescES=Rata RE în mod implicit la crearea propecţilor, facturilor, comenzilor etc. respectă regula standard activă: <br> Dacă cumpărătorul nu este supus ratei RE, RE impliciy va fi 0. Sfârșitul regulii. <br> Dacă cumpărătorul este supus ratei RE, este RE implicit. Sfârșitul regulii. <br>
 LocalTax1IsNotUsedDescES=În mod implicit RE propus este 0. Sfârşitul regulă.
 LocalTax1IsUsedExampleES=În Spania sunt profesionisti supuse unor secţiuni specifice ale IAE spaniole.
 LocalTax1IsNotUsedExampleES=În Spania sunt profesionişti şi societăţile şi sub rezerva la anumite secţiuni ale IAE spaniole.
@@ -1017,9 +1032,9 @@ LocalTax2IsUsedDescES=Rata IRPF în mod implicit când se creează perspective,
 LocalTax2IsNotUsedDescES=În mod implicit propus IRPF este 0. Sfârşitul regulă.
 LocalTax2IsUsedExampleES=În Spania, liber profesionişti şi specialişti independenţi, care presta servicii şi companiile care au ales sistemul de impozitare de module.
 LocalTax2IsNotUsedExampleES=În Spania, sunt întreprinderi care nu sunt supuse sistemului de taxare pe module.
-RevenueStampDesc=The "tax stamp" or "revenue stamp" is a fixed tax you per invoice (It does not depend on amount of invoice). It can also be a percent tax but using the second or third type of tax is better for percent taxes as tax stamps does not provide any reporting. Only few countries uses this type of tax.
-UseRevenueStamp=Use a tax stamp
-UseRevenueStampExample=The value of tax stamp is defined by default into the setup of dictionaries (%s - %s - %s)
+RevenueStampDesc="Taxa fiscală" sau "taxa de venituri" este un impozit fix pe care îl facturați (nu depinde de valoarea facturii). Poate fi de asemenea un procent de impozit, dar utilizarea celui de-al doilea sau al treilea tip de impozit este mai bună pentru impozitele procentuale, deoarece taxele fiscale nu oferă nicio raportare. Doar puține țări folosesc acest tip de impozit.
+UseRevenueStamp= Folosiți un timbru fiscal
+UseRevenueStampExample=Valoarea implicită a timbrelor fiscale este definită în configurarea dicționarelor (%s - %s - %s)
 CalcLocaltax=Rapoarte pe taxe locale
 CalcLocaltax1=Vânzări - Cumpârări
 CalcLocaltax1Desc=Rapoarte Taxe Locale este calcult ca diferenţă dintre taxele locale de vanzare şi taxele locale de cumparare
@@ -1027,11 +1042,11 @@ CalcLocaltax2=Achiziţii
 CalcLocaltax2Desc=Rapoarte Taxe Locale este totalul taxelor locale de cumpărare
 CalcLocaltax3=Vânzări
 CalcLocaltax3Desc=Rapoarte Taxe Locale este totalul taxelor locale de vanzare
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry= Conform configurării de impozite şi taxe (Vezi %s-%s-%s), ţara ta nu foloseşte aceste tipuri de taxe
 LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poate fi găsit de traducere pentru codul
 LabelOnDocuments=Eticheta de pe documente
 LabelOrTranslationKey=Etichetă sau cheie de traducere
-ValueOfConstantKey=Value of a configuration constant
+ValueOfConstantKey=Valoarea unei constante de configurare
 NbOfDays=Nr. de zile
 AtEndOfMonth=La sfârşitul lunii
 CurrentNext=Curent / Urmatoarea
@@ -1076,8 +1091,8 @@ LoginPage=Pagină de autentificare
 BackgroundImageLogin=Imagine de fundal
 PermanentLeftSearchForm=Formular de căutare permanent in meniu din  stânga
 DefaultLanguage=Limba implicită
-EnableMultilangInterface=Activați suportul multilingv
-EnableShowLogo=Show the company logo in the menu
+EnableMultilangInterface=Activați asistența în mai multe limbi pentru relațiile cu clienții sau furnizorii
+EnableShowLogo=Afişează logo-ul companiei în meniu
 CompanyInfo=Compania/Instituția
 CompanyIds=Identități ale companiei/organizației
 CompanyName=Nume
@@ -1085,13 +1100,13 @@ CompanyAddress=Adresă
 CompanyZip=Zip
 CompanyTown=Oraş
 CompanyCountry=Ţară
-CompanyCurrency=Deviza principală
+CompanyCurrency=Moneda principală
 CompanyObject=Obiectul companiei
-IDCountry=ID country
+IDCountry=ID ţară
 Logo=Logo
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+LogoDesc=Logo-ul principal al companiei. Va fi utilizat în documentele generate(PDF, ...)
+LogoSquarred=Logo(pătrat)
+LogoSquarredDesc=Trebuie să fie o pictogramă pătrată (lățime = înălțime). Acest logo va fi utilizat ca pictogramă favorită sau pentru alte necesităţi, cum ar fi bara de meniu de sus (dacă nu este dezactivată în configurarea afișajului).
 DoNotSuggestPaymentMode=Nu sugerează
 NoActiveBankAccountDefined=Niciun cont bancar activ definit
 OwnerOfBankAccount=Titular de cont bancar %s
@@ -1115,11 +1130,11 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=În așteptarea reconcilierii banca
 Delays_MAIN_DELAY_MEMBERS=Taxă de membru întârziată
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Cecul nu a fost creat
 Delays_MAIN_DELAY_EXPENSEREPORTS=Raportul de cheltuieli pentru aprobare
-Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
+Delays_MAIN_DELAY_HOLIDAYS=Cereri de concediu de aprobat
 SetupDescription1=Înainte de a începe să utilizați Dolibarr, unii parametri inițiali trebuie să fie definiți and modulele activate/configurate.
 SetupDescription2=Următoarele două secțiuni sunt obligatorii (primele două intrări din meniul de configurare)
-SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
+SetupDescription3=<a href="%s">%s->%s</a><br><br>Parametri de bază folosiți pentru a personaliza comportamentul implicit al aplicației (de exemplu, pentru funcțiile legate de țară). 
+SetupDescription4=<a href="%s">%s->%s</a><br><br>Acest software este o suită de mai multe module/aplicații. Modulele necesare trebuie să fie activate și configurate. Intrările din meniu vor apărea odată cu activarea acestor module. 
 SetupDescription5=Alte intrări în meniul de configurare gestionează parametrii opționali.
 LogEvents=Audit de securitate evenimente
 Audit=Audit
@@ -1138,15 +1153,15 @@ LogEventDesc=Activați autentificarea pentru anumite evenimente de securitate. A
 AreaForAdminOnly=Parametrii de configurare pot fi setați numai de <b> utilizatorii administratori </b>.
 SystemInfoDesc=Sistemul de informare este diverse informaţii tehnice ai citit doar în modul şi vizibil doar pentru administratori.
 SystemAreaForAdminOnly=Acest zonă este disponibilă numai administratori. Permisiunile utilizatorilor Dolibarr nu pot modifica această restricție
-CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
-AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
-AccountantFileNumber=Accountant code
+CompanyFundationDesc=Editează informaţiile despre compania/organizaţia ta. Dă click pe butonul "%s" din josul paginii când ai terminat.
+AccountantDesc= Dacă aveți un contabil/firmă de contabilitate externă, puteți modifica aici informațiile aferente.
+AccountantFileNumber=Cod contabil
 DisplayDesc=Parametrii care afectează aspectul şi comportamentul  Dolibarr pot fi modificaţi aici.
 AvailableModules=Aplicații/module disponibile 
 ToActivateModule=Pentru a activa modulele, du-te la zona de configurare.
 SessionTimeOut=Time out pentru sesiune
 SessionExplanation=Acest număr garantează că sesiunea nu va expira niciodată înainte de această întârziere, în cazul în care curățarea sesiunii este efectuată de Cleaner intern pentru sesiuni PHP (și nimic altceva). Interfața de curățare internă a sesiunii PHP nu garantează că sesiunea va expira după această întârziere. Va expira, după această întârziere și atunci când curățătorul sesiunii va fi rulat, astfel încât fiecare <b> %s / %s </b>, acces dar numai în timpul accesului realizat de alte sesiuni (dacă valoarea este 0, înseamnă că ștergerea sesiunii se face numai printr-un proces extern). <br> Notă: pe unele servere cu mecanism extern de curățare a sesiunilor (cron sub debian, ubuntu ...) sesiunile pot fi distruse după o perioadă definită de o configurație externă, indiferent de valoarea introdusă aici.
-SessionsPurgedByExternalSystem=Sessions on this server seems to be cleaned by an external mechanism (cron under debian, ubuntu ...), probably every <b>%s</b> seconds (= value of parameter <b>session.gc_maxlifetime</b>), so changing the value here has no effect. You must ask the server administrator to change session delay.
+SessionsPurgedByExternalSystem=Sesiunile de pe acest server par a fi şterse, curățate de un mecanism extern (cron sub debian, ubuntu ...), probabil fiecare la fiecare <b>%s</b> secunde (=valoarea parametrului <b>session.gc_maxlifetime</b>),  \ndeci schimbarea valorii aici nu are efect. Trebuie să ceri administratorului serverului să modifice durata de păstrare a sesiunii.
 TriggersAvailable=Disponibil declanşează
 TriggersDesc=Triggerele sunt fișiere care vor modifica comportamentul fluxului de lucru Dolibarr după copierea în director <b> htdocs / core / triggers </b>. Ei realizează acțiuni noi, activate la evenimentele Dolibarr (creare de noi companii, validare facturi ...).
 TriggerDisabledByName=Declanşările în acest dosar sunt dezactivate <b>de-NoRun</b> sufix în numele lor.
@@ -1155,7 +1170,7 @@ TriggerAlwaysActive=Declanşările în acest dosar sunt întotdeauna activ, ce s
 TriggerActiveAsModuleActive=Declanşările în acest dosar sunt active ca <b>modul %s</b> este activată.
 GeneratedPasswordDesc=Alegeți metoda care va fi utilizată pentru parolele auto-generate.
 DictionaryDesc=Introduceți toate datele de referință. Puteți adăuga valorile dvs. la valorile implicite.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+ConstDesc=Această pagină vă permite să editați (să suprascrieţi) parametrii care nu sunt disponibili în alte pagini. Aceștia sunt în mare parte parametri rezervați doar pentru dezvoltatori/soluționare avansată a problemelor.
 MiscellaneousDesc=Toți ceilalți parametri legați de securitate sunt definiți aici.
 LimitsSetup=Limitele / Precizie
 LimitsDesc=Puteți defini limite, precizări şi optimizări utilizate de Dolibarr aici
@@ -1170,7 +1185,7 @@ NoEventOrNoAuditSetup=Nu a fost înregistrat niciun eveniment de securitate. Ace
 NoEventFoundWithCriteria=Nu a fost găsit niciun eveniment de securitate pentru aceste criterii de căutare.
 SeeLocalSendMailSetup=Vedeţi-vă locale sendmail setup
 BackupDesc=O <b> completă </b> copie de rezervă a unei instalări Dolibarr necesită doi pași.
-BackupDesc2=Backup the contents of the "documents" directory (<b>%s</b>) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes.
+BackupDesc2=Copia de rezervă a conținutului directorului „documente” (<b>%s</b>) care conține toate fișierele încărcate și generate. Aceasta va include, de asemenea, toate fișierele dump generate în Pasul 1. Această operație poate dura câteva minute.
 BackupDesc3=Faceţi o copie de rezervă la structura și conținutul bazei de date (<b> %s </b>) într-un cos de gunoi. Pentru aceasta, puteți utiliza următorul asistent
 BackupDescX=Directorul arhivat trebuie să fie stocat într-un loc sigur.
 BackupDescY=Generate de fişier de imagine memorie trebuie să fie depozitate într-un loc sigur.
@@ -1181,7 +1196,7 @@ RestoreDesc3=Restaurați structura bazei de date și datele dintr-un fișier de
 RestoreMySQL=MySQL import
 ForcedToByAModule= Această regulă este obligat <b>la %s</b> către un activat modulul
 PreviousDumpFiles=Fișiere de rezervă existente
-PreviousArchiveFiles=Existing archive files
+PreviousArchiveFiles=Fişiere arhivă existente
 WeekStartOnDay=Prima zi a săptămânii
 RunningUpdateProcessMayBeRequired=Rularea procesului de actualizare pare a fi necesară (versiunea programului %s diferă de versiunea bazei de date %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=Trebuie să rulaţi această comandă de la linia de comandă, după login la un raft cu <b>%s</b> utilizator.
@@ -1221,7 +1236,7 @@ ExtraFieldsSupplierOrders=Atribute complementare (comenzi)
 ExtraFieldsSupplierInvoices=Atribute complementare (facturi)
 ExtraFieldsProject=Atribute complementare (proiecte)
 ExtraFieldsProjectTask=Atribute complementare (sarcini)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Atribute complementare (salarii)
 ExtraFieldHasWrongValue=Atributul %s are o valoare greşită.
 AlphaNumOnlyLowerCharsAndNoSpace=numai caractere minuscule,  alfanumerice fără spaţiu
 SendmailOptionNotComplete=Atenţie, pe unele sisteme Linux, pentru a trimite e-mail de la e-mail, sendmail configurare execuţie trebuie să conatins optiunea-ba (mail.force_extra_parameters parametri în fişierul php.ini). Dacă nu unor destinatari a primi e-mailuri, încercaţi să editaţi acest parametru PHP cu mail.force_extra_parameters =-BA).
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Un criteriu de căutare este necesar cel
 NewTranslationStringToShow=Noul șir de traducere de afișat
 OriginalValueWas=Traducerea originală este suprascrisă. Valoarea originală a fost: <br> <br> %s
 TransKeyWithoutOriginalValue=Ați forțat o traducere nouă pentru cheia de traducere '<strong> %s </strong>' care nu există în niciun fişier de limbă
-TotalNumberOfActivatedModules=Aplicație / module activate: <b> %s </b> / <b> %s </b>
+TitleNumberOfActivatedModules=Module activate
+TotalNumberOfActivatedModules=Module activate: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Trebuie activat cel puţin 1 modul
 ClassNotFoundIntoPathWarning=Clasa %s nu a fost găsită în calea PHP
 YesInSummer=Da în vară
@@ -1249,22 +1265,22 @@ SuhosinSessionEncrypt=Stocarea sesiune criptată prin Suhosin
 ConditionIsCurrently=Condiția este momentan %s
 YouUseBestDriver=Utilizați driverul %s, care este cel mai bun driver disponibil în prezent.
 YouDoNotUseBestDriver=Utilizați driverul %s dar  driverul %s este recomandat.
-NbOfObjectIsLowerThanNoPb=You have only %s %s in the database. This does not require any particular optimization.
+NbOfObjectIsLowerThanNoPb=Aveţi doar %s%s în baza de date. Aceasta nu necesită nicio optimizare specială.
 SearchOptim=Optimizare căutare
-YouHaveXObjectUseSearchOptim=You have %s %s in the database. You should add the constant %s to 1 in Home-Setup-Other. Limit the search to the beginning of strings which makes it possible for the database to use indexes and you should get an immediate response.
-YouHaveXObjectAndSearchOptimOn=You have %s %s in the database and constant %s is set to 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptim=Aveţi %s%s în baza de date. Ar trebui să adăgaţi constanta %scu valoarea 1 în  Acasă-Setup-Altele. Limitați căutarea la începutul șirurilor, ceea ce face posibilă utilizarea bazei de date cu indecşi și ar trebui să obțineți un răspuns imediat.
+YouHaveXObjectAndSearchOptimOn=Aveţi %s%s în baza de date şi constanta %s este setată la valoarea 1 în Acasă-Setup-Altele.
 BrowserIsOK=Utilizați browserul web %s. Acest browser este ok pentru securitate și performanţă.
 BrowserIsKO=Utilizați browserul web %s. Acest browser este cunoscut ca fiind o alegere proastă pentru securitate, fiabilitate și performanță. Vă recomandăm să utilizați Firefox, Chrome, Opera sau Safari.
-PHPModuleLoaded=PHP component %s is loaded
-PreloadOPCode=Preloaded OPCode is used
+PHPModuleLoaded=Componenta PHP %seste încărcată
+PreloadOPCode=Componenta OPCode preîncărcată este utilizată
 AddRefInList=Afișați Lista de  informatii a clientului/Furnizorului  (selectați lista sau combobox)  și cea mai mare parte a hiperlinkului.<br> Terții vor apărea cu un format de nume "CC12345 - SC45678 - The Big Company corp". în loc de "The Big Company corp".
 AddAdressInList=Afișați Lista de informatii a clientului/Furnizorului (selectați lista sau combobox).<br> Terții i vor apărea cu numele format din "Big Company corp - 21 jump street 123456 Big city - USA" în loc de "Big Company corp".
 AskForPreferredShippingMethod=Solicitați o metodă de transport preferată pentru terți.
 FieldEdition=Editarea  campului %s
 FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă problemele decalajjului fusului orar sunt cunoscute)
 GetBarCode=Dă codbare
-NumberingModules=Numbering models
-DocumentModules=Document models
+NumberingModules=Modele de numerotare
+DocumentModules=Şabloane documente
 ##### Module password generation
 PasswordGenerationStandard=Întoarceţi-vă o parolă generate în funcţie de interne Dolibarr algoritmul: 8 caractere care conţin numere în comun şi în caractere minuscule.
 PasswordGenerationNone=Nu sugerați o parolă generată. Parola trebuie introdusă manual.
@@ -1276,9 +1292,9 @@ RuleForGeneratedPasswords=Reguli pentru generarea și validarea parolelor
 DisableForgetPasswordLinkOnLogonPage=Nu afișați link-ul "Parola uitată" pe pagina de autentificare
 UsersSetup=Utilizatorii modul de configurare
 UserMailRequired=E-mailul necesar pentru a crea un utilizator nou
-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
+UserHideInactive=Ascundeți utilizatorii inactivi în toate listele combinate de utilizatori (Nu este recomandat: acest lucru înseamnă că nu veți putea filtra sau căuta pe utilizatori vechi pe unele pagini)
+UsersDocModules= Șabloane de documente pentru documentele generate din înregistrarea utilizatorului
+GroupsDocModules=Șabloane de documente generate dintr-o înregistrare de grup
 ##### HRM setup #####
 HRMSetup=Configurare Modul HRM
 ##### Company setup #####
@@ -1310,7 +1326,7 @@ BillsPDFModules=Factura modele de documente
 BillsPDFModulesAccordindToInvoiceType=Modele de documente de facturare în funcție de tipul de factură
 PaymentsPDFModules=Modele de documente de plată
 ForceInvoiceDate=Vigoare la data facturii de validare data
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice
+SuggestedPaymentModesIfNotDefinedInInvoice=Modalitatea de plată sugerată pe factură în mod implicit, dacă nu este definită pe factură
 SuggestPaymentByRIBOnAccount=Sugerați plata prin retragere din cont
 SuggestPaymentByChequeToAddress=Sugerați plata de prin cec către
 FreeLegalTextOnInvoices=Free text pe facturi
@@ -1322,7 +1338,7 @@ SupplierPaymentSetup=Configurarea plăților furnizorului
 PropalSetup=Modul configurare Oferte Comerciale 
 ProposalsNumberingModules=Modele numerotare  Oferte Comerciale 
 ProposalsPDFModules=Modele documente Oferte Comerciale 
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Modalitatea de plată sugerată pe ofertă în mod implicit, dacă nu este definită pe oferta comercială
 FreeLegalTextOnProposal=Text liber pe ofertele comerciale
 WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al ofertei
@@ -1337,7 +1353,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Cereţi sursa depozitului pentru comandă
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Cereţi contul bancar al beneficiarului unei comenzi de achiziție
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Modalitatea de plată sugerată pe comanda de vânzare în mod implicit, dacă nu este definită pe comandă 
 OrdersSetup=Setări pentru gestionarea comenzilor de vânzări
 OrdersNumberingModules=Ordinele de numerotare module
 OrdersModelModule=Ordinul modele de documente
@@ -1368,7 +1384,7 @@ MEMBER_REMINDER_EMAIL=Activați memento automat <b> prin email </b> de abonament
 ##### LDAP setup #####
 LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parametrii
-LDAPUsersSynchro=Utilizatorii
+LDAPUsersSynchro=Utilizatori
 LDAPGroupsSynchro=Grupuri
 LDAPContactsSynchro=Contacte
 LDAPMembersSynchro=Membri
@@ -1489,13 +1505,13 @@ LDAPFieldSidExample=Examplu: objectsid
 LDAPFieldEndLastSubscription=Data de sfârşit de abonament
 LDAPFieldTitle=Funcţie
 LDAPFieldTitleExample=Examplu: titlu
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPFieldGroupid=Id grup
+LDAPFieldGroupidExample=Exemplu : gidnumber
+LDAPFieldUserid=Id utilizator
+LDAPFieldUseridExample=Exemplu : uidnumber
+LDAPFieldHomedirectory=Director home
+LDAPFieldHomedirectoryExample=Exemplu : homedirectory
+LDAPFieldHomedirectoryprefix=Prefix director home
 LDAPSetupNotComplete=LDAP setup nu complet (merg pe alţii file)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr administrator sau parola furnizate. LDAP de acces vor fi anonime şi modul doar în citire.
 LDAPDescContact=Această pagină vă permite să definiţi numele atribute LDAP LDAP în copac pentru fiecare date găsite pe Dolibarr contact.
@@ -1617,7 +1633,7 @@ FCKeditorForProductDetails=WYSIWIG creare / editare de linii cu detalii ale prod
 FCKeditorForMailing= WYSIWIG crearea / ediţie de mailing
 FCKeditorForUserSignature=Creare/editare WYSIWIG  a semnăturii utilizatorilor
 FCKeditorForMail=Crearea / editarea WYSIWIG pentru toate e-mailurile (cu excepția Tools-> eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForTicket=Creare/editare de tip WYSIWIG pentru tichete
 ##### Stock #####
 StockSetup=Gestionarea modulelor de stoc
 IfYouUsePointOfSaleCheckModule=Dacă utilizați modulul Punct de vânzare (POS) furnizat în mod implicit sau un modul extern, această configurare poate fi ignorată de modulul POS. Cele mai multe module POS sunt proiectate în mod implicit pentru a crea o factură imediat și pentru a scădea din stoc, indiferent de opțiunile de aici. Deci, dacă aveți nevoie sau nu să aveți o scădere din stoc la înregistrarea unei vânzări de pe POS, verificați și configurarea modulului POS.
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Utilizați tipuri de evenimente (gestionate în menu Confi
 AGENDA_USE_EVENT_TYPE_DEFAULT=Puneți automat această valoare implicită pentru tipul de eveniment în formularul de creare a evenimentului
 AGENDA_DEFAULT_FILTER_TYPE=Puneți automat acest tip de eveniment în filtrul de căutare al vizualizării agendei
 AGENDA_DEFAULT_FILTER_STATUS=Puneți automat această stare pentru evenimentele din filtrul de căutare din vizualizarea agendei
-AGENDA_DEFAULT_VIEW=Care tab doriţi să deschideţi când selectaţi meniul Agenda
+AGENDA_DEFAULT_VIEW=Ce vizualizare doriți să deschideți implicit atunci când selectați meniul Agenda
 AGENDA_REMINDER_EMAIL=Activați memento-ul evenimentului <b> de emailuri </b> (opțiunea de reamintire / întârziere poate fi definită pe fiecare event). Nota: Modulul <strong> %s </strong> trebuie să fie activat and gestionat corect pentru a avea memento trimis la frecvența corectă.
 AGENDA_REMINDER_BROWSER=Activați memento-ul evenimentului <b> pe browser-ul utlizatorului </b> (când se ajunge la data evenimentului, fiecare utilizator poate să refuze întrebarea de confirmare a browserului)
 AGENDA_REMINDER_BROWSER_SOUND=Activați notificarea sonoră
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Afișați un obiect asociat în vizualizarea agendei
 ##### Clicktodial #####
 ClickToDialSetup=Click pentru a Dial modul setup
 ClickToDialUrlDesc=URL-ul se apelează când se face clic pe pictograma telefonului. În URL-ul, puteți utiliza etichete <br> <b> __PHONETO__ </b> care va fi înlocuit cu numărul de telefon al persoanei de apelat <br> <b> __PHONEFROM__ </b> care va fi înlocuit cu numărul de telefon al apelantului (al tău) <br> <b> __LOGIN__ </b>, care va fi înlocuit cu autentificare clicktodial (definită pe cartela de utilizator) <br> <b> __PASS__ </b> care va fi înlocuit cu parola clicktodial (definită pe cartela de utilizator).
-ClickToDialDesc=Acest modul face ca numerele de telefon să facă clic pe link-uri. Un clic pe pictogramă va face telefonul să apeleze numărul. Acesta poate fi utilizat pentru a apela un sistem de call-center de la Dolibarr care poate apela numărul de telefon dintr-un sistem SIP, de exemplu
+ClickToDialDesc=Acest modul schimbă numerele de telefon, atunci când utilizați un computer desktop, în linkuri cu clic. Un clic va apela numărul. Acest lucru poate fi folosit pentru a porni apelul telefonic atunci când utilizați un telefon smart sau când utilizați un sistem CTI bazat pe protocolul SIP, de exemplu. Notă: Când utilizați un smartphone, numerele de telefon sunt întotdeauna făcute clic.
 ClickToDialUseTelLink=Utilizați doar link "tel:" pe numerele de telefon
 ClickToDialUseTelLinkDesc=Utilizați această metodă dacă utilizatorii dvs. au un softphone sau o interfață software instalată pe același computer ca browserul și sună când faceți clic pe un link din browser care începe cu "tel:". Dacă aveți nevoie de o soluție completă de server (nu este nevoie de instalarea software-ului local), trebuie să setați această opțiune la "Nu" și să completați câmpul următor
 ##### Point Of Sale (CashDesk) #####
@@ -1696,15 +1712,15 @@ CashDeskThirdPartyForSell=Terț generic implicit de utilizat pentru vânzări
 CashDeskBankAccountForSell=Case de cont pentru a utiliza pentru vinde
 CashDeskBankAccountForCheque=Contul implicit de folosit pentru a primi plata cu cec
 CashDeskBankAccountForCB=Cont pentru a folosi pentru a primi plăţi în numerar de carduri de credit
-CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp
+CashDeskBankAccountForSumup=Contul bancar implicit utilizat pentru a primi plăţi de la SumUp
 CashDeskDoNotDecreaseStock=Dezactivați scăderea stocului atunci când o vânzare se face prin POS (dacă "nu", scaderea stocului se face pentru fiecare vânzare făcută prin POS, indiferent de opțiunea stabilită în modulul Stoc).
 CashDeskIdWareHouse=Forţează și limitează depozitul să folosească scăderea stocului
 StockDecreaseForPointOfSaleDisabled=Scăderea stocului la vânzarea făcută prin POS dezactivată
 StockDecreaseForPointOfSaleDisabledbyBatch=Scăderea stocului la plata prin POS nu este compatibilă cu gestionarea modulului Serial/Lot (activă în prezent), astfel că scăderea stocului este dezactivată.
 CashDeskYouDidNotDisableStockDecease=Nu ați dezactivat scăderea stocului la efectuarea unei vânzări de la POS. Prin urmare, este necesar un depozit.
-CashDeskForceDecreaseStockLabel=Stock decrease for batch products was forced.
-CashDeskForceDecreaseStockDesc=Decrease first by the oldest eatby and sellby dates.
-CashDeskReaderKeyCodeForEnter=Key code for "Enter" defined in barcode reader (Example: 13)
+CashDeskForceDecreaseStockLabel=Scăderea stocului pentru produsele din lot a fost forțată.
+CashDeskForceDecreaseStockDesc=Scădere mai întâi după cea mai vechi date de consum şi de vânzare.
+CashDeskReaderKeyCodeForEnter=Cod tastă pentru "Enter" definit în cititorul de coduri de bare(Exemplu: 13)
 ##### Bookmark #####
 BookmarkSetup=Bookmark modul de configurare
 BookmarkDesc=Acest modul vă permite să gestionați marcajele. De asemenea, puteți adăuga comenzi rapide la orice pagini Dolibarr sau site-uri externe din meniul din stânga.
@@ -1735,14 +1751,14 @@ ChequeReceiptsNumberingModule=Modul de verificare a numerotării chitanţelor
 MultiCompanySetup=Multi-societate modul setup
 ##### Suppliers #####
 SuppliersSetup=Configurarea modulului furnizor
-SuppliersCommandModel=Complete template of Purchase Order
-SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template)
-SuppliersInvoiceModel=Complete template of Vendor Invoice
+SuppliersCommandModel=Şablon complet pentru comanda de achiziţie
+SuppliersCommandModelMuscadet=Şablon complet pentru Comandă de achiziţie (vechea implementare a şablonului cornas)
+SuppliersInvoiceModel=Şablon complet de factură furnizor
 SuppliersInvoiceNumberingModel=Modele de numerotare a facturilor furnizorilor
-IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
+IfSetToYesDontForgetPermission=Dacă este setată o valoare nulă, nu uitați să furnizați permisiuni grupurilor sau utilizatorilor autorizați pentru a doua aprobare 
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul de configurare
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+PathToGeoIPMaxmindCountryDataFile=Calea spre fişierul Maxmind care conţine translatarea IP la ţară.<br>Exemple:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Reţineţi că dvs. de IP la datele din ţara Dosarul trebuie să fie într-un director PHP poate citi (Verificaţi configurarea PHP open_basedir şi permisiunile de fişiere).
 YouCanDownloadFreeDatFileTo=Puteţi descărca o <b>versiune demo gratuită</b> a ţării dosar GeoIP Maxmind la %s.
 YouCanDownloadAdvancedDatFileTo=Puteţi descărca de asemenea, o <b>versiune</b> mai <b>completă, cu actualizari ale</b> ţării dosar GeoIP Maxmind la %s.
@@ -1783,21 +1799,21 @@ ExpenseReportsRulesSetup=Configurare din module Rapoarte de cheltuieli - Reguli
 ExpenseReportNumberingModules=Modul de numerotare a rapoartelor de cheltuieli
 NoModueToManageStockIncrease=Nu a fost activat niciun modul capabil să gestioneze creșterea stocului automat. Creșterea stocurilor se va face doar prin introducere manuală.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Puteți găsi opțiuni pentru notificările prin e-mail prin activarea și configurarea modulului "Notificare".
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
+ListOfNotificationsPerUser=Lista notificărilor automate pentru utilizator*
+ListOfNotificationsPerUserOrContact=Lista posibilelor notificări automate (în cadrul evenimentului comercial) disponibile pentru utilizator* sau pentru contact** 
+ListOfFixedNotifications=Listă notificări automate
 GoOntoUserCardToAddMore=Accesați fila "Notificări" a unui mesaj de utilizator pentru a adăuga sau elimina notificările pentru utilizatori
-GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Accesați fila "Notificări" a terțului pentru a adăuga sau elimina notificări pentru contacte/adrese 
 Threshold=Prag
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
+BackupDumpWizard=Wizard pentru generarea fişierului dump al bazei de date
+BackupZipWizard=Wizard pentru generarea arhivei cu directul de documente
 SomethingMakeInstallFromWebNotPossible=Instalarea modulului extern nu este posibilă din interfața web din următorul motiv:
 SomethingMakeInstallFromWebNotPossible2=Din acest motiv, procesul de actualizare descris aici este un proces manual pe care numai un utilizator privilegiat poate face.
 InstallModuleFromWebHasBeenDisabledByFile=Instalarea modulului extern din aplicație a fost dezactivată de administratorul dvs. Trebuie să-l rogi să-l elimine fişierul <strong> %s </strong> pentru a permite această caracteristică
 ConfFileMustContainCustom=Instalarea sau construirea unui modul extern din aplicație trebuie să salveze fişierele modulului în directorul <strong> %s </strong>. Pentru a avea acest director procesat de Dolibarr, trebuie să vă configuraţi<strong> conf / conf.php </strong> pentru a adăuga 2 linii directoare: <br> <strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s / personalizat'; </strong>
 HighlightLinesOnMouseHover=Evidențiați liniile tabelului când mișcarea mouse-ului trece peste ele
-HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
-HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
+HighlightLinesColor=Evidențiere culoare linie la trecerea cu mouse-ul (foloseşte „ffffff” pentru dezactivare)
+HighlightLinesChecked=Evidențiere culoare linie atunci când este bifată (foloseşte „ffffff” pentru dezactivare)
 TextTitleColor=Culoarea textului paginii de titlu
 LinkColor=Culoare link-uri
 PressF5AfterChangingThis=Apăsați CTRL + F5 pe tastatură sau ștergeți memoria cache a browserului după ce ați modificat această valoare pentru a o avea eficientă
@@ -1808,15 +1824,16 @@ TopMenuDisableImages=Ascundeți imaginile în meniul de deasupra
 LeftMenuBackgroundColor=Culoare Background pentru Left menu
 BackgroundTableTitleColor=Culoarea de fundal pentru linia de titlul a tabelului
 BackgroundTableTitleTextColor=Culoarea textului pentru linia de titlul a tabelului
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Culoarea textului pentru link-urile din titlul tabelelor
 BackgroundTableLineOddColor=Culoarea de fundal pentru liniile impare ale tabelului
 BackgroundTableLineEvenColor=Culoarea de fundal pentru liniile pare ale tabelului
 MinimumNoticePeriod=Perioada minimă de preaviz (cererea dvs. de concediu trebuie făcută înainte de această întârziere)
 NbAddedAutomatically=Număr de zile adăugate la contoarele utilizatorilor (automat) în fiecare lună
 EnterAnyCode=Acest câmp conține o referinţă pentru a identifica linia. Introduceţi o valoare aleatoare, dar fără caractere speciale.
-Enter0or1=Enter 0 or 1
+Enter0or1=Introdu 0 sau 1
 UnicodeCurrency=Enter aici între paranteze, lista de octeți care reprezintă simbolul monedei. De exemplu: pentru $, enter [36] - pentru Brazilia real R$ [82,36] - pentru €, enter [8364]
 ColorFormat=Culoarea RGB este în format HEX , de exemplu: FF0000
+PictoHelp=Numele pictogramei în format dolibarr ('image.png' dacă se află în directorul temei actuale, 'image.png@nume_modul' dacă se află în directorul /img/ al unui modul)
 PositionIntoComboList=Poziția linei în listele combo
 SellTaxRate=Rata taxei de vânzare
 RecuperableOnly=Da pentru TVA "neperceput, dar recuperabil" dedicat pentru unele state din Franța. Mențineți valoarea "Nu" în toate celelalte cazuri.
@@ -1831,8 +1848,8 @@ FixTZ=Fixează TimeZone
 FillFixTZOnlyIfRequired=Examplu: +2 (completați numai dacă se întâlnește o problemă)
 ExpectedChecksum=Checksum așteptat
 CurrentChecksum=Checksum curent
-ExpectedSize=Expected size
-CurrentSize=Current size
+ExpectedSize=Dimensiune aşteptată
+CurrentSize=Dimensiune curentă
 ForcedConstants=Valori constante necesare
 MailToSendProposal=Oferte Clienti
 MailToSendOrder=Ordine de vânzări 
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Cerere de cotaţie
 MailToSendSupplierOrder=Comenzile de achiziție
 MailToSendSupplierInvoice=Facturi Furnizori
 MailToSendContract=Contracte
+MailToSendReception=Receptii
 MailToThirdparty=Terţi
 MailToMember=Membri
 MailToUser=Utilizatori
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s este disponibil. Versi
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s este disponibil. Versiunea %s este o versiune de întreținere, deci conține doar corecții de erori. Recomandăm tuturor utilizatoriilor să faceți upgrade la această versiune. O versiune de întreținere nu introduce noi caracteristici sau modificări la baza de date. Puteți să o descărcați din https://www.dolibarr.org (versiuni stabile subdirector). Puteți să citiţi<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> pentru lista completă a modificărilor.
 MultiPriceRuleDesc=Când opțiunea "Mai multe niveluri de prețuri pe produs / serviciu" este activată, puteți defini diferite prețuri (câte unul pentru fiecare nivel de preț) pentru fiecare produs. Pentru a vă economisi timp, aici puteți introduce o regulă pentru a calcula automat un preț pentru fiecare nivel, pe baza prețului primului nivel, astfel încât va trebui să introduceți un preț pentru primul nivel pentru fiecare produs. Această pagină are rolul de a economisi timp, dar este utilă numai dacă prețurile pentru fiecare nivel sunt relative la primul nivel. În majoritatea cazurilor, puteți ignora această pagină.
 ModelModulesProduct=Șabloane pentru documente de produs
+WarehouseModelModules=Şabloane pentru documentele de depozit
 ToGenerateCodeDefineAutomaticRuleFirst=Pentru a putea genera automat coduri, trebuie mai întâi să definiți un manager pentru a defini automat numărul de cod de bare.
 SeeSubstitutionVars=Consultați * notă pentru lista variabilelor de înlocuire posibile
 SeeChangeLog=Vedeți fişierul ChangeLog (numai în engleză)
@@ -1894,14 +1913,15 @@ MAIN_PDF_MARGIN_LEFT=Marginea stângă a PDF-ului
 MAIN_PDF_MARGIN_RIGHT=Marginea dreaptă a PDF-ului 
 MAIN_PDF_MARGIN_TOP=Marginea superioară a PDF-ului 
 MAIN_PDF_MARGIN_BOTTOM=Marginea inferioară a PDF-ului 
+MAIN_DOCUMENTS_LOGO_HEIGHT=Înălţime logo în PDF
 NothingToSetup=Nu există o configurație specifică necesară pentru acest modul.
 SetToYesIfGroupIsComputationOfOtherGroups=Setați acest lucru la da dacă acest grup este un calcul al altor grupuri
 EnterCalculationRuleIfPreviousFieldIsYes=Introduceți regula de calcul în cazul în care câmpul anterior a fost setat la Da (de exemplu "CODEGRP1 + CODEGRP2")
 SeveralLangugeVariatFound=Mai multe variante de limbă au fost găsite
 RemoveSpecialChars=Eliminați caracterele speciale
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtrul Regex pentru a curăța valoarea (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
+COMPANY_DIGITARIA_CLEAN_REGEX=Flitru Regex pentru curăţarea valorii (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Nu sunt permise duplicate
 GDPRContact=Responsabilul cu protecția datelor (DPO, confidențialitatea datelor sau contact GDPR )
 GDPRContactDesc=Dacă stocați date despre companii/cetățeni europeni, puteți numi persoana de contact care este responsabilă cu Regulamentul general privind protecția datelor aici
 HelpOnTooltip=Text de ajutor care să apară pe butonul de sugestii
@@ -1911,7 +1931,7 @@ ChartLoaded=Schema de cont încărcată
 SocialNetworkSetup=Configurarea modulelor Rețele sociale
 EnableFeatureFor=Activați caracteristici pentru <strong> %s </strong>
 VATIsUsedIsOff=Nota: Opțiunea de a utiliza impozitul pe vânzări sau TVA a fost setată la <strong>Oprit</strong> în meniu %s - %s, astfel încât impozitul pe vânzări sau TVA utilizate vor fi întotdeauna 0 pentru vânzări.
-SwapSenderAndRecipientOnPDF=Swap sender and recipient address position on PDF documents
+SwapSenderAndRecipientOnPDF=Interschimbă poziţia adreselor expeditorului şi destinatarului în documentele PDF generate 
 FeatureSupportedOnTextFieldsOnly=Avertizare, caracteristică acceptată numai pe câmpurile de text. De asemenea, trebuie să fie setat un parametru URL = create sau action = editare SAU numele paginii trebuie să se termine cu "new.php" pentru a declanșa această caracteristică.
 EmailCollector=Colector de e-mailuri
 EmailCollectorDescription=Adăugați o lucrare programată și o pagină de configurare pentru a scana în mod regulat căsuţele de e-mail (utilizând protocolul IMAP) și pentru a înregistra e-mailurile primite în aplicația dvs., la locul potrivit și/sau pentru a crea automat înregistrări (cum ar fi clienții).
@@ -1920,88 +1940,93 @@ EMailHost=Gazdă a serverului de email IMAP
 MailboxSourceDirectory=Directorul sursă al cutiei poștale
 MailboxTargetDirectory=Directorul ţintă al cutiei poștale 
 EmailcollectorOperations=Operațiuni de făcut de către colector
-MaxEmailCollectPerCollect=Max number of emails collected per collect
+MaxEmailCollectPerCollect=Număr maxim de email-uri colectae per operaţiune
 CollectNow=Colectați acum
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
-DateLastCollectResult=Date latest collect tried
-DateLastcollectResultOk=Date latest collect successfull
-LastResult=Latest result
+ConfirmCloneEmailCollector=Eşti sigur că vrei să clonezi colectorul de email %s?
+DateLastCollectResult=Data ultimei încercări de colectare 
+DateLastcollectResultOk=Data ultimei colectări efectuate cu succes
+LastResult=Ultimul rezultat
 EmailCollectorConfirmCollectTitle=Confirmarea colectării de emailuri
 EmailCollectorConfirmCollect=Doriți să rulați acum colecția pentru acest colector?
 NoNewEmailToProcess=Niciun email de procesat (care sa se potriveasca cu filtrele)
 NothingProcessed=Nimic nu s-a făcut
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%semail-uri calificate, %semail-uri procesate cu succes (pentru %s înregistrări/acţiuni efectuate)
 RecordEvent=Înregistrați evenimentul de e-mail
 CreateLeadAndThirdParty=Creați iniţiativă (și terț, dacă este necesar)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Creați tichet (și faceți legătura cu un terț dacă a fost încărcat de o operațiune anterioară)
 CodeLastResult=Ultimul cod rezultat
-NbOfEmailsInInbox=Number of emails in source directory
-LoadThirdPartyFromName=Load third party searching on %s (load only)
-LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+NbOfEmailsInInbox=Numărul de email-uri în directorul sursă
+LoadThirdPartyFromName=Încărcați un terţ căutând în %s (doar încărcare)
+LoadThirdPartyFromNameOrCreate=Încărcați un terţ căutând în %s (creare dacă nu este găsit)
+WithDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail trimis de la Dolibarr
+WithoutDolTrackingID=Mesaj dintr-o conversație inițiată de un prim e-mail NU trimis de la Dolibarr
+CreateCandidature=Creare candidatură
 FormatZip=Zip
 MainMenuCode=Codul de introducere a meniului (meniu principal)
 ECMAutoTree=Afișați arborele ECM automat
-OperationParamDesc=Define the values to use for the object of the action, or how to extract values. For example:<br>objproperty1=SET:the value to set<br>objproperty2=SET:a value with replacement of __objproperty1__<br>objproperty3=SETIFEMPTY:value used if objproperty3 is not already defined<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)<br><br>Use a ; char as separator to extract or set several properties.
-OpeningHours=Ore de program
-OpeningHoursDesc=Introduceți aici orele de program normale ale companiei dvs.
+OperationParamDesc=Definiți valorile de utilizat pentru obiectul acțiunii sau modul de extragere a valorilor. De exemplu: <br>objproperty1=SET:valoarea de setat<br>objproperty2=SET:o valoare de înlocuire a __objproperty1__<br>objproperty3=SETIFEMPTY:valoare folosită dacă objproperty3 nu este încă definită<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Denumirea companiei mele este\\s([^\\s]*)<br><br>Folosește caracterul ; ca separator pentru a extrage sau seta mai multe proprietăți.
+OpeningHours=Program de lucru
+OpeningHoursDesc=Introduceți aici programul de lucru normal ale companiei dvs.
 ResourceSetup=Configurarea modulului Resurse 
 UseSearchToSelectResource=Utilizați un formular de căutare pentru a alege o resursă (mai degrabă decât o listă derulantă).
 DisabledResourceLinkUser=Dezactivați caracteristica care conectează o resursă la utilizatori
 DisabledResourceLinkContact=Dezactivați caracteristica care conectează o resursă la contacte
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Activează funcţionalitatea de verificare a resurselor în uz pe un eveniment
 ConfirmUnactivation=Confirmați resetarea modulului
 OnMobileOnly=Numai pe ecranul mic (smartphone)
 DisableProspectCustomerType=Dezactivați tipul de terţ "Prospect + Client" (deci terţul trebuie să fie Prospect sau Client, dar nu poate fi ambele)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplificați interfața pentru o persoană nevăzătoare
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activați această opțiune dacă sunteți o persoană nevăzătoare sau dacă utilizați aplicația dintr-un browser de text precum Lynx sau Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Enable this option if you are a color blind person, in some case interface will change color setup to increase contrast.
-Protanopia=Protanopia
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
+MAIN_OPTIMIZEFORCOLORBLIND=Schimbă culorile interfeţei pentru persoanele cu disabilităţi vizuale
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Activează această opţiune dacă eşti o persoană cu probleme vizuale, în anumite cazuri interfaţa îşi va schimba paleta de culori pentru a mări contrastul. 
+Protanopia=Protanopie
+Deuteranopes=Deuteranopie
+Tritanopes=Tritanopie
 ThisValueCanOverwrittenOnUserLevel=Această valoare poate fi suprascrisă de fiecare utilizator de pe pagina sa de utilizator- tab '%s'
 DefaultCustomerType=Tipul terțului implicit pentru formularul de creare "Client nou" 
-ABankAccountMustBeDefinedOnPaymentModeSetup=Note: The bank account must be defined on the module of each payment mode (Paypal, Stripe, ...) to have this feature working.
-RootCategoryForProductsToSell=Root category of products to sell
-RootCategoryForProductsToSellDesc=If defined, only products inside this category or childs of this category will be available in the Point Of Sale
-DebugBar=Debug Bar
-DebugBarDesc=Toolbar that comes with a plenty of tools to simplify debugging
-DebugBarSetup=DebugBar Setup
-GeneralOptions=General Options
-LogsLinesNumber=Number of lines to show on logs tab
-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
-EXPORTS_SHARE_MODELS=Export models are share with everybody
-ExportSetup=Setup of module Export
-ImportSetup=Setup of module Import
-InstanceUniqueID=Unique ID of the instance
-SmallerThan=Smaller than
-LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
-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.
-EndPointFor=End point for %s : %s
-DeleteEmailCollector=Delete email collector
-ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
-RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
-AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+ABankAccountMustBeDefinedOnPaymentModeSetup=Notă: Contul bancar trebuie definit în modul pentru fiecare metodă de plată (Paypal, Stripe, ...) pentru a funcţiona.
+RootCategoryForProductsToSell=Categoria rădăcină pentru toate produsele de vânzare
+RootCategoryForProductsToSellDesc=Dacă este definit, numai produsele din această categorie sau din subcategoriile acesteia vor fi disponibile în Punctul de vânzare
+DebugBar=Debug bar
+DebugBarDesc=Bara de instrumente pentru simplificarea depanării
+DebugBarSetup=Configurare DebugBar
+GeneralOptions=Opţiuni generale
+LogsLinesNumber=Numărul de linii care se vor afişa în tab-ul Jurnal
+UseDebugBar=Utilizează bara de debug
+DEBUGBAR_LOGS_LINES_NUMBER=Numărul celor mai recente linii din jurnal care se vor păstra în consolă
+WarningValueHigherSlowsDramaticalyOutput=Avertizare, valorile foarte mari încetinesc dramatic viteza de afişare
+ModuleActivated=Modulul %s este activat şi încetineşte interfaţa
+EXPORTS_SHARE_MODELS=Modele de export date sunt partajate cu toată lumea
+ExportSetup=Configurare modul Export
+ImportSetup=Configurare modul Import
+InstanceUniqueID=ID unic al instanţei
+SmallerThan=Mai mic decât
+LargerThan=Mai mare decât
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
+WithGMailYouCanCreateADedicatedPassword=Cu un cont GMail, dacă ați activat validarea cu 2 factori, este recomandat să creați o a doua parolă dedicată pentru aplicație, în loc să utilizați propria parolă de la https://myaccount.google.com/.
+EmailCollectorTargetDir=Poate fi de dorit să mutați email-ul într-o altă etichetă/director atunci când a fost procesat cu succes. Trebuie doar să setați numele directorului aici pentru a utiliza această caracteristică (NU folosiți caractere speciale în nume). Rețineți că, de asemenea, trebuie să utilizați un cont de autentificare pentru citire/scriere.
+EmailCollectorLoadThirdPartyHelp=Puteți utiliza această acțiune pentru a folosi conținutul de e-mail la căutarea  și încărcarea unui terț existent în baza de date. Terţul găsit (sau creat) va fi folosit pentru acțiunile în care este necesar. În câmpul parametru puteți folosi, de exemplu, 'EXTRACT: BODY: Name:\\s([^\\s]*)' dacă doriți să extrageți numele terțului dintr-un șir 'Nume: nume căutat' găsit în corpul email-ului.
+EndPointFor=End point pentru %s:%s
+DeleteEmailCollector=Şterge colectorul de email-uri
+ConfirmDeleteEmailCollector=Eşti sigur că vrei să ştergi acest colector de email-uri?
+RecipientEmailsWillBeReplacedWithThisValue= E-mailurile destinatarilor vor fi întotdeauna înlocuite cu această valoare
+AtLeastOneDefaultBankAccountMandatory=Trebuie definit cel puțin 1 cont bancar implicit
+RESTRICT_ON_IP=Permiteți accesul doar la un anumit IP gazdă (caracterul wildcard nu este permis, folosiți spațiu între valori). Gol înseamnă că fiecare gazdă poate avea acces.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Based on the library SabreDAV version
-NotAPublicIp=Not a public IP
-MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server (done 1 time only after installation) to allow the foundation to count the number of Dolibarr installation.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-EmailTemplate=Template for email
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
-FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
-FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
-RssNote=Note: Each RSS feed definition provides a widget that you must enable to have it available in dashboard
-JumpToBoxes=Jump to Setup -> Widgets
-MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
-MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+BaseOnSabeDavVersion=Bazat pe o versiune a librăriei SabreDAV
+NotAPublicIp=IP non-public
+MakeAnonymousPing=Trimiteţi un Ping anonim '+1' către serverul fundației Dolibarr ( 1 dată numai după instalare) pentru a permite fundației să numere numărul de instalări Dolibarr.
+FeatureNotAvailableWithReceptionModule=Funcţionalitatea nu este disponibilă când modulul Recepţie este activat
+EmailTemplate=Şablon pentru email
+EMailsWillHaveMessageID=E-mailuri care conţin eticheta „Referințe” care se potrivesc cu această expresie
+PDF_USE_ALSO_LANGUAGE_CODE=Dacă doriți să aveți unele texte duplicate în PDF-ul în 2 limbi diferite în același PDF generat, trebuie să setați aici această a doua limbă, astfel încât PDF-ul generat va conține 2 limbi diferite în aceeași pagină, cea aleasă la generarea PDF-ului și aceasta ( doar câteva șabloane PDF acceptă acest lucru). Păstrați gol pentru 1 limbă pentru fiecare PDF.
+FafaIconSocialNetworksDesc=Introduceți aici codul unei pictograme FontAwesome. Dacă nu știți ce este FontAwesome, puteți utiliza valoarea generică fa-address-book.
+FeatureNotAvailableWithReceptionModule=Funcţionalitatea nu este disponibilă când modulul Recepţie este activat
+RssNote=Notă: Fiecare definiție de flux RSS oferă un widget pe care trebuie să îl activați pentru a-l avea disponibil în tabloul de bord
+JumpToBoxes=Mergi la Setări -> Widget-uri
+MeasuringUnitTypeDesc=Foloseşte aici valori ca "mărime", "suprafaţă", "volum", "greutate", "durată"
+MeasuringScaleDesc=Scala este numărul de zecimale pe care trebuie să le mutați pentru a se potrivi cu unitatea de referință implicită. Pentru tipul unitate "timp", acesta este numărul de secunde. Valorile cuprinse între 80 și 99 sunt valori rezervate.
+TemplateAdded=Şablon adăugat
+TemplateUpdated=Şablon actualizat
+TemplateDeleted=Şablon şters
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index e6a335c513d..98ea4c798e3 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -14,31 +14,31 @@ EventsNb=Număr evenimente
 ListOfActions=Lista  evenimente
 EventReports=Rapoarte Eveniment
 Location=Locație
-ToUserOfGroup=Oricărui utilizator din grup
-EventOnFullDay=Eveniment toat(ă)e zi(ua)lele
-MenuToDoActions=Toate Ev. neterminate
-MenuDoneActions=Toate Ev.  terminate
+ToUserOfGroup=Eveniment atribuit unui utilizator din grup
+EventOnFullDay=Eveniment pe toat(ă)e zilele
+MenuToDoActions=Toate ev. neterminate
+MenuDoneActions=Toate ev. terminate
 MenuToDoMyActions=Ev. mele neterminate
-MenuDoneMyActions=Ev. mele   terminate
-ListOfEvents=Lista Evenimente (calendar intern)
+MenuDoneMyActions=Ev. mele terminate
+ListOfEvents=Listă evenimente (calendar intern)
 ActionsAskedBy=Ev. înregistrate de
 ActionsToDoBy=Ev. atribuite lui
 ActionsDoneBy=Ev. efectuate de
 ActionAssignedTo=Eveniment atribuit lui
-ViewCal=Vedere  lunara
-ViewDay=Vedere  zilnica
-ViewWeek=Vedere  săptămânala
+ViewCal=Vedere lunară
+ViewDay=Vedere zilnică
+ViewWeek=Vedere săptămânală
 ViewPerUser=Vedere pe utilizator
 ViewPerType=Vizualizare pe tip
-AutoActions= Completarea automată
+AutoActions= Completare automată
 AgendaAutoActionDesc= Aici puteți defini evenimentele pe care doriți ca Dolibarr să le creeze automat în Agendă. Dacă nu este bifat nimic, numai acțiunile manuale vor fi incluse în jurnale și afișate în Agendă. Urmărirea automată a acțiunilor de afaceri efectuate pe obiecte (validare, schimbare de stare) nu va fi salvată.
 AgendaSetupOtherDesc= Această pagină oferă opțiuni pentru a permite exportul evenimentelor Dolibarr într-un calendar extern (Thunderbird, Google Calendar etc.)
 AgendaExtSitesDesc=Această pagină vă permite să declaraţi sursele externe de calendare pentru a vedea evenimentele lor în agenda Dolibarr.
 ActionsEvents=Evenimente pentru care Dolibarr va crea o acţiune în agendă în mod automat
 EventRemindersByEmailNotEnabled=Evenimentul pentru mementouri prin e-mail nu a fost activat în configurarea modulului %s.
 ##### Agenda event labels #####
-NewCompanyToDolibarr=Terța parte %s a fost creată
-COMPANY_DELETEInDolibarr=Third party %s deleted
+NewCompanyToDolibarr=Terțul %s a fost creat
+COMPANY_DELETEInDolibarr=Terţ %s şters
 ContractValidatedInDolibarr=Contract %s validat
 CONTRACT_DELETEInDolibarr=Contractul %s a fost șters
 PropalClosedSignedInDolibarr=Oferta  %s semnată
@@ -58,12 +58,12 @@ MemberDeletedInDolibarr=Membru %s şters
 MemberSubscriptionAddedInDolibarr=Abonament %s pentru membru %s a fost adăugat
 MemberSubscriptionModifiedInDolibarr=Abonamentul %s pentru membrul %s a fost modificat
 MemberSubscriptionDeletedInDolibarr=Abonamentul %s pentru membrul %s a fost eliminat
-ShipmentValidatedInDolibarr=Livrarea %s validata
-ShipmentClassifyClosedInDolibarr=Expediere %s clasificată facturată
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
+ShipmentValidatedInDolibarr=Livrarea %s validată
+ShipmentClassifyClosedInDolibarr=Expediere %s clasificată ca facturată
+ShipmentUnClassifyCloseddInDolibarr=Livrarea%s clasificată ca re-deschisă
 ShipmentBackToDraftInDolibarr=Expedierea %s revine la starea de proiect
 ShipmentDeletedInDolibarr=Livrare %s ştearsă
-ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionValidatedInDolibarr=Recepţie %s validată
 OrderCreatedInDolibarr=Comanda %s a fost creată
 OrderValidatedInDolibarr=Comanda %s validată
 OrderDeliveredInDolibarr=Comanda livrată %s  clasificată
@@ -71,52 +71,54 @@ OrderCanceledInDolibarr=Comanda  %s anulată
 OrderBilledInDolibarr=Comanda livrată %s  facturată
 OrderApprovedInDolibarr=Comanda %s aprobată
 OrderRefusedInDolibarr=Comanda %s refuzată
-OrderBackToDraftInDolibarr=Comanda %s revenită de statutul schiţă
+OrderBackToDraftInDolibarr=Comanda %s revenită la starea de schiţă
 ProposalSentByEMail=Propunerea comercială %s a fost trimisă prin e-mail
 ContractSentByEMail=Contractul %s a fost trimis prin e-mail
 OrderSentByEMail=Comanda vânzări %s a fost trimisă prin e-mail
 InvoiceSentByEMail=Factura clientului %s a fost trimisă prin e-mail
 SupplierOrderSentByEMail=Comanda de aprovizionare %s a fost trimisă prin e-mail
-ORDER_SUPPLIER_DELETEInDolibarr=Purchase order %s deleted
+ORDER_SUPPLIER_DELETEInDolibarr=Comanda de achiziţie%s ştearsă
 SupplierInvoiceSentByEMail=Factura furnizorului%s a fost trimisă prin e-mail
 ShippingSentByEMail=Expedierea %s trimisă prin e-mail
-ShippingValidated= Livrarea %s validata
+ShippingValidated= Livrarea %s validată
 InterventionSentByEMail=Intervenția %s trimisă prin e-mail
 ProposalDeleted=Ofertă ştearsă
 OrderDeleted=Comandă ştearsă
 InvoiceDeleted=Factură ştearsă
-DraftInvoiceDeleted=Draft invoice deleted
+DraftInvoiceDeleted=Factura schiţă a fost ştearsă
+CONTACT_CREATEInDolibarr=Contactul %s a fost creat
+CONTACT_DELETEInDolibarr=Contactul %s a fost şters
 PRODUCT_CREATEInDolibarr=Produs%s creat
 PRODUCT_MODIFYInDolibarr=Produs %s modificat
-PRODUCT_DELETEInDolibarr=Produs %s sters
-HOLIDAY_CREATEInDolibarr=Request for leave %s created
-HOLIDAY_MODIFYInDolibarr=Request for leave %s modified
-HOLIDAY_APPROVEInDolibarr=Request for leave %s approved
-HOLIDAY_VALIDATEInDolibarr=Request for leave %s validated
-HOLIDAY_DELETEInDolibarr=Request for leave %s deleted
+PRODUCT_DELETEInDolibarr=Produs %s şters
+HOLIDAY_CREATEInDolibarr=Cererea de concediu %screată
+HOLIDAY_MODIFYInDolibarr=Cererea de concediu %smodificată
+HOLIDAY_APPROVEInDolibarr=Cererea de concediu %saprobată
+HOLIDAY_VALIDATEInDolibarr=Cererea de concediu %s validată
+HOLIDAY_DELETEInDolibarr=Cererea de concediu %sştearsă
 EXPENSE_REPORT_CREATEInDolibarr=Raport cheltuieli %s creat
 EXPENSE_REPORT_VALIDATEInDolibarr=Raport cheltuieli  %s validat
 EXPENSE_REPORT_APPROVEInDolibarr=Raport cheltuieli %s aprobat
-EXPENSE_REPORT_DELETEInDolibarr=Raport cheltuieli %ssters
+EXPENSE_REPORT_DELETEInDolibarr=Raport cheltuieli %s şters
 EXPENSE_REPORT_REFUSEDInDolibarr=Raport cheltuieli %s refuzat
 PROJECT_CREATEInDolibarr=Proiect %s creat
 PROJECT_MODIFYInDolibarr=Proiect %s modificat
-PROJECT_DELETEInDolibarr=Proiect %s sters
-TICKET_CREATEInDolibarr=Tichetul%s a fost creat
+PROJECT_DELETEInDolibarr=Proiect %s şters
+TICKET_CREATEInDolibarr=Tichetul %s a fost creat
 TICKET_MODIFYInDolibarr=Tichetul %s a fost modificat
-TICKET_ASSIGNEDInDolibarr=Ticket %s assigned
-TICKET_CLOSEInDolibarr=Ticket %s closed
+TICKET_ASSIGNEDInDolibarr=Tichetul %s a fost atribuit
+TICKET_CLOSEInDolibarr=Tichetul%s a fost închis
 TICKET_DELETEInDolibarr=Tichetul %s a fost șters
-BOM_VALIDATEInDolibarr=BOM validated
-BOM_UNVALIDATEInDolibarr=BOM unvalidated
-BOM_CLOSEInDolibarr=BOM disabled
-BOM_REOPENInDolibarr=BOM reopen
-BOM_DELETEInDolibarr=BOM deleted
-MRP_MO_VALIDATEInDolibarr=MO validated
-MRP_MO_UNVALIDATEInDolibarr=MO set to draft status
-MRP_MO_PRODUCEDInDolibarr=MO produced
-MRP_MO_DELETEInDolibarr=MO deleted
-MRP_MO_CANCELInDolibarr=MO canceled
+BOM_VALIDATEInDolibarr=Bon de consum validat
+BOM_UNVALIDATEInDolibarr=Bon de consum invalidat
+BOM_CLOSEInDolibarr=Bon de consum dezactivat
+BOM_REOPENInDolibarr=Bon de consum redeschis
+BOM_DELETEInDolibarr=Bon de consum şters
+MRP_MO_VALIDATEInDolibarr=Comanda de fabricaţie validată
+MRP_MO_UNVALIDATEInDolibarr=Comanda de fabricaţie setată la schiţă
+MRP_MO_PRODUCEDInDolibarr=Comanda de fabricaţie executată
+MRP_MO_DELETEInDolibarr=Comanda de fabricaţie ştearsă
+MRP_MO_CANCELInDolibarr=Comanda de fabricaţie anulată 
 ##### End agenda events #####
 AgendaModelModule=Șabloane de documente pentru eveniment
 DateActionStart=Data începerii
@@ -127,12 +129,12 @@ AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> ​​pentru a limita exportul de ac
 AgendaUrlOptions4=<b>logint=%s</b> ​​pentru a limita exportul de acțiuni atribuite utilizatorului <b>%s</b>( proprietari sau altii).
 AgendaUrlOptionsProject=<b> project = __ PROJECT_ID __ </b> pentru a restricționa ieșirea la acțiunile legate de proiectul <b> __ PROJECT_ID __ </b>.
 AgendaUrlOptionsNotAutoEvent=<b> notactiontype = systemauto </b> pentru a exclude evenimentele automate.
-AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> pentru a include evenimentele din zilele libere.
 AgendaShowBirthdayEvents=Afişează ziua de naştere a contactelor
 AgendaHideBirthdayEvents=Ascunde ziua de naştere a contactelor
 Busy=Ocupat
-ExportDataset_event1=Lista Ev. din agenda
-DefaultWorkingDays=Rangul zilelor  lucrătoare predefinite in săptămână  (Examplu:1-5, 1-6)
+ExportDataset_event1=Lista ev. din agendă
+DefaultWorkingDays=Rangul zilelor lucrătoare predefinite in săptămână  (Exemplu:1-5, 1-6)
 DefaultWorkingHours=Orele lucrătoare predefinite ale zilei (Examplu: 9-18)
 # External Sites ical
 ExportCal=Export calendar
@@ -140,13 +142,13 @@ ExtSites=Import calendare externe
 ExtSitesEnableThisTool=Afișați calendarele externe (definite în configurația globală) din Agendă. Nu afectează calendarele externe definite de utilizatori.
 ExtSitesNbOfAgenda=Număr calendare
 AgendaExtNb=Calendar nr. %s
-ExtSiteUrlAgenda=URL-ul pentru a accesa  fişierul . ical
+ExtSiteUrlAgenda=URL-ul pentru a accesa fişierul . ical
 ExtSiteNoLabel=Nicio descriere
 VisibleTimeRange=Interval de timp vizibil
 VisibleDaysRange=Interval zile vizibil
 AddEvent=Creare eveniment
 MyAvailability=Disponibilitatea mea
-ActionType=Tip Eveniment
+ActionType=Tip eveniment
 DateActionBegin=Dată începere eveniment
 ConfirmCloneEvent=Sigur doriți să clonați evenimentul <b> %s</b>?
 RepeatEvent=Repeta eveniment
@@ -155,6 +157,12 @@ EveryMonth=Fiecare lună
 DayOfMonth=Zi a lunii
 DayOfWeek=Zi a saptamanii
 DateStartPlusOne=Dată început + 1 ora
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
+SetAllEventsToTodo=Setează toate evenimentele la De făcut
+SetAllEventsToInProgress=Setează toate evenimentele la În desfăşurare
+SetAllEventsToFinished=Setează toate evenimentele la Finalizat
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index d9a7ca0584a..fc8de4eca78 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -37,9 +37,9 @@ IbanValid=BAN valabil
 IbanNotValid=BAN invalid
 StandingOrders=Comenzi debit direct
 StandingOrder=Ordin de plată direct
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByDirectDebit=Plată prin direct debit
+PaymentByBankTransfers=Plăţi prin transfer de credit
+PaymentByBankTransfer=Plată prin transfer credit
 AccountStatement=Extras Cont
 AccountStatementShort=Extras
 AccountStatements=Extrase Cont
@@ -76,7 +76,7 @@ BankTransaction=Intrare bancară
 ListTransactions=Lista înregistrări
 ListTransactionsByCategory=Lista înregistrări/categorii
 TransactionsToConciliate=Intrări pentru reconciliere
-TransactionsToConciliateShort=To reconcile
+TransactionsToConciliateShort=De compensat
 Conciliable=Decontabil
 Conciliate=Deconteaza
 Conciliation=Conciliere
@@ -98,7 +98,7 @@ AddBankRecordLong=Adăugați intrarea manual
 Conciliated=Reconciliat
 ConciliatedBy=Decontat de
 DateConciliating=Data Decontare
-BankLineConciliated=Entry reconciled with bank receipt
+BankLineConciliated=Intrare compensată cu extras bancar
 Reconciled=Reconciliat
 NotReconciled=Nu este conciliat
 CustomerInvoicePayment=Plată Client
@@ -106,8 +106,8 @@ SupplierInvoicePayment=Plata furnizorului
 SubscriptionPayment=Plată cotizaţie
 WithdrawalPayment=Ordin de plată de debit
 SocialContributionPayment=Plata taxe sociale sau fiscale și tva
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Transfer credit
+BankTransfers=Transferuri credit
 MenuBankInternalTransfer=Transfer intern
 TransferDesc=La un transfer de la un cont la altul, Dolibarr va scrie două înregistrări (un debit în contul sursă și un credit în contul țintă). Aceeași sumă (cu excepția semnului), eticheta și data va fi utilizată pentru această tranzacție)
 TransferFrom=De la
@@ -157,22 +157,22 @@ RejectCheck=Cec returnat
 ConfirmRejectCheck=Sigur doriți să marcați acest cec ca respins?
 RejectCheckDate=data cecului ce a fost returnat
 CheckRejected=Cec returnat
-CheckRejectedAndInvoicesReopened=Check returned and invoices re-open
+CheckRejectedAndInvoicesReopened=Verificare facturi storno şi facturi re-deschise
 BankAccountModelModule=Șabloane de documente pentru conturi bancare
 DocumentModelSepaMandate=Modelul mandatului SEPA. Utile pentru țările europene numai în CEE.
 DocumentModelBan=Șablon pentru a imprima o pagină cu informații despre BAN.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
+NewVariousPayment=Plată diversă nouă
+VariousPayment=Plată diversă
 VariousPayments=Diverse plăţi
-ShowVariousPayment=Show miscellaneous payment
-AddVariousPayment=Add miscellaneous payment
+ShowVariousPayment=Afişare plăţi diverse
+AddVariousPayment=Adaugă plată diversă
 SEPAMandate=Mandat SEPA 
 YourSEPAMandate=Mandatul dvs. SEPA  
 FindYourSEPAMandate=Acesta este mandatul dvs. SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca dvs. Reveniți semnat (scanarea documentului semnat) sau trimiteți-l prin poștă la
 AutoReportLastAccountStatement=Completați automat câmpul "numărul extrasului de cont" cu ultimul număr al declarației atunci când efectuați reconcilierea
 CashControl= Limită de numerar POS
 NewCashFence= Limită nouă de numerar
-BankColorizeMovement=Colorize movements
-BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
-BankColorizeMovementName1=Background color for debit movement
-BankColorizeMovementName2=Background color for credit movement
+BankColorizeMovement=Colorează tranzacţiile
+BankColorizeMovementDesc=Dacă această funcţie este activată, poţi alege o culoare de fundal personalizată pentru tranzacţiile de debit sau de credit
+BankColorizeMovementName1=Culoarea de fundal pentru tranzacţiile de debit
+BankColorizeMovementName2=Culoarea de fundal pentru tranzacţiile de credit
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 64d877f3d13..8229964e9d0 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -11,7 +11,7 @@ BillsSuppliersUnpaidForCompany=Facturi furnizor neplătite pentru %s
 BillsLate=Plăţi întârziate
 BillsStatistics=Statistici Facturi Clienţi
 BillsStatisticsSuppliers=Statistici facturi furnizor
-DisabledBecauseDispatchedInBookkeeping=Dezactivat deoarece factura a fost expediată în evidența contabilă
+DisabledBecauseDispatchedInBookkeeping=Dezactivat deoarece factura a fost expediată în contabilitate
 DisabledBecauseNotLastInvoice=Dezactivat deoarece factura nu poate fi ștearsă. Unele facturi au fost înregistrate după aceasta și vor crea lipsuri în incrementare.
 DisabledBecauseNotErasable=Dezactivat pentru ca nu poate fi sters
 InvoiceStandard=Factură Standard
@@ -25,7 +25,7 @@ InvoiceProFormaAsk=Factură Proformă
 InvoiceProFormaDesc=<b>Factura Proformă </b> este o imagine a adevăratei facturi, dar nu are nici o valoare contabilă.
 InvoiceReplacement=Factură  de Înlocuire
 InvoiceReplacementAsk=Factură  de Înlocuire  a altei  facturi
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=<b>Factura de înlocuire</b> este folosită pentru a înlocui o factură care nu a fost achitată.<br><br>Notă: Se pot înlocui numai facturile neachitate. Dacă factura pe care o înlocuiți nu este încă închisă, aceasta va fi închisă automat la "Abandonată". 
 InvoiceAvoir=Nota de credit
 InvoiceAvoirAsk=Nota de credit pentru a corecta factura
 InvoiceAvoirDesc=<b> Nota de credit </b> este o factură negativă utilizată pentru a corecta faptul că o factură arată o sumă care diferă de suma plătită efectiv (de exemplu, clientul a plătit prea mult din greșeală sau nu va plăti suma completă din momentul returnării unor produse).
@@ -53,23 +53,23 @@ InvoiceLine=Linie Factură
 InvoiceCustomer=Factură Client
 CustomerInvoice=Factură Client
 CustomersInvoices=Facturi Clienţi
-SupplierInvoice=Factura furnizorului
+SupplierInvoice=Factura furnizor
 SuppliersInvoices=Facturi Furnizori
-SupplierBill=Factura furnizorului
+SupplierBill=Factura furnizor
 SupplierBills=Facturi Furnizori
 Payment=Plată
 PaymentBack=Rambursare
 CustomerInvoicePaymentBack=Rambursare
 Payments=Plăţi
-PaymentsBack=Refunds
+PaymentsBack=Rambursări
 paymentInInvoiceCurrency=in moneda facturii
 PaidBack=Restituit
 DeletePayment=Ştergere plată
 ConfirmDeletePayment=Sunteţi sigur că doriţi să ştergeţi această plată?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
+ConfirmConvertToReduc=Vrei să converteşti această %s într-un credit disponibil?
+ConfirmConvertToReduc2=Suma care va fi economisită cumulând toate reducerile poate fi utilizată ca reducere pentru o factură curentă sau viitoare pentru acest client.
+ConfirmConvertToReducSupplier=Vrei să converteşti această %s într-un credit disponibil?
+ConfirmConvertToReducSupplier2=Suma care va fi economisită cumulând toate reducerile și care poate fi folosită ca reducere pentru o factură curentă sau viitoare pentru acest furnizor.
 SupplierPayments=Plățile furnizorului
 ReceivedPayments=Încasări primite
 ReceivedCustomersPayments=Încasări  Clienţi
@@ -78,7 +78,7 @@ ReceivedCustomersPaymentsToValid=Încasări  Clienţi  de validat
 PaymentsReportsForYear=Rapoarte Plăţi pentru %s
 PaymentsReports=Rapoarte Plăţi
 PaymentsAlreadyDone=Plăţi deja efectuate
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=Rambursări efectuate deja
 PaymentRule=Mod de Plată
 PaymentMode=Tipul plăţii
 PaymentTypeDC=Card de debit/de credit
@@ -151,7 +151,7 @@ ErrorBillNotFound=Factura %s nu există
 ErrorInvoiceAlreadyReplaced=Eroare, ați încercat să validați o factură pentru a înlocui factura %s. Dar aceasta a fost deja înlocuită de factură %s.
 ErrorDiscountAlreadyUsed=Eroare, reducerea a fost deja utilizată
 ErrorInvoiceAvoirMustBeNegative=Eroare, factura de corecţie trebuie să aibă o valoare negativă
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorInvoiceOfThisTypeMustBePositive=Eroare, acets tip de factură trebuie să aibă valori pozitive(sau nule) fară TVA
 ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o factură care a fost înlocuită cu o altă factură, şi care este încă schiţă
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Această parte sau alta estedeja utilizată, astfel încât seria de reduceri nu poate fi eliminată.
 BillFrom=De la
@@ -163,19 +163,19 @@ FoundXQualifiedRecurringInvoiceTemplate=Au fost găsite %s modele de facturi rec
 NotARecurringInvoiceTemplate=Nu este un model de factură recurentă.
 NewBill=Factură nouă
 LastBills=Ultimele%s facturi
-LatestTemplateInvoices=Ultimele%s șabloane ale facturilor
-LatestCustomerTemplateInvoices=Ultimele%s șabloane ale facturilor clientilor
-LatestSupplierTemplateInvoices=Ultimele%s șabloane ale facturilor furnizorilor
-LastCustomersBills=Ultimele%s facturi ale clientilor
-LastSuppliersBills=Ultimele%s facturi ale furnizorilor
+LatestTemplateInvoices=Ultimele%s șabloane factură
+LatestCustomerTemplateInvoices=Ultimele%s șabloane factură client
+LatestSupplierTemplateInvoices=Ultimele%s șabloane factură furnizor
+LastCustomersBills=Ultimele%s facturi client
+LastSuppliersBills=Ultimele%s facturi furnizor
 AllBills=Toate facturile
 AllCustomerTemplateInvoices=Toate șabloanele facturilor
 OtherBills=Alte facturi
 DraftBills=Facturi schiţă
-CustomersDraftInvoices=Proiectarea facturilor clientului 
-SuppliersDraftInvoices=Proiectarea facturilor furnizorului
+CustomersDraftInvoices=Facturi client schiţă
+SuppliersDraftInvoices=Facturi furnizor schiţă
 Unpaid=Neachitate
-ErrorNoPaymentDefined=Error No payment defined
+ErrorNoPaymentDefined=Eroare Nu este definită plata 
 ConfirmDeleteBill=Sunteţi sigur că doriţi să ştergeţi această factură?
 ConfirmValidateBill=Sigur doriţi să validaţi această factură cu referinţa<b>%s</b>?
 ConfirmUnvalidateBill=Sigur doriţi să schimbaţi  factura  <b>%s</b>la statusul de schiţă ?
@@ -209,23 +209,23 @@ NumberOfBillsByMonth=Nr. de facturi pe lună
 AmountOfBills=Valoare facturi
 AmountOfBillsHT=Suma facturilor (fără impozit)
 AmountOfBillsByMonthHT=Valoarea facturilor pe luni (fără tva)
-UseSituationInvoices=Allow situation invoice
-UseSituationInvoicesCreditNote=Allow situation invoice credit note
-Retainedwarranty=Retained warranty
-AllowedInvoiceForRetainedWarranty=Retained warranty usable on the following types of invoices
-RetainedwarrantyDefaultPercent=Retained warranty default percent
-RetainedwarrantyOnlyForSituation=Make "retained warranty" available only for situation invoices
-RetainedwarrantyOnlyForSituationFinal=On situation invoices the global "retained warranty" deduction is applied only on the final situation
-ToPayOn=To pay on %s
-toPayOn=to pay on %s
-RetainedWarranty=Retained Warranty
-PaymentConditionsShortRetainedWarranty=Retained warranty payment terms
-DefaultPaymentConditionsRetainedWarranty=Default retained warranty payment terms
-setPaymentConditionsShortRetainedWarranty=Set retained warranty payment terms
-setretainedwarranty=Set retained warranty
-setretainedwarrantyDateLimit=Set retained warranty date limit
-RetainedWarrantyDateLimit=Retained warranty date limit
-RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
+UseSituationInvoices=Permite utilizare factură centralizatoare
+UseSituationInvoicesCreditNote=Permite utilizare factură centralizatoare
+Retainedwarranty=Garanţie reţinută
+AllowedInvoiceForRetainedWarranty=Garanţia reţinută poate fi utilizată pentru urmatoarele tipuri de facturi 
+RetainedwarrantyDefaultPercent=Procent implicit pentru garanţia reţinută
+RetainedwarrantyOnlyForSituation=Faceţi disponibilă "garanția reținută" numai pentru facturile centralizatoare
+RetainedwarrantyOnlyForSituationFinal=La facturile centralizatoare, deducerea globală "garanție reținută" se aplică numai în situația finală
+ToPayOn=De plătit la %s
+toPayOn=de plătit la %s
+RetainedWarranty=Garanţie reţinută
+PaymentConditionsShortRetainedWarranty=Termeni de plată pentru garanţia reţinută
+DefaultPaymentConditionsRetainedWarranty=Termeni de plată impliciţi pentru garanţia reţinută
+setPaymentConditionsShortRetainedWarranty=Setare termeni de plată pentru garanţia reţinută
+setretainedwarranty=Setare garanţie reţinută
+setretainedwarrantyDateLimit=Setare dată limită garanţie reţinută 
+RetainedWarrantyDateLimit=Dată limită garanţie reţinută
+RetainedWarrantyNeed100Percent=Factura centralizatoare trebuie să fie 100 %%finalizată pentru a fi afişată în PDF 
 AlreadyPaid=Deja platite
 AlreadyPaidBack=Deja rambursată
 AlreadyPaidNoCreditNotesNoDeposits=Plătit deja (fără note de credit și plăți în avans)
@@ -289,8 +289,8 @@ AddGlobalDiscount=Crează discount absolut
 EditGlobalDiscounts=Editează discounturile absolute
 AddCreditNote=Creză Note de credit
 ShowDiscount=Afişează discountul
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+ShowReduc=Afişează discount-ul 
+ShowSourceInvoice=Afişare factura sursă
 RelativeDiscount=Discount relativ
 GlobalDiscount=Discount Global
 CreditNote=Nota de credit
@@ -327,9 +327,9 @@ InvoiceDateCreation=Data crearea factură
 InvoiceStatus=Status Factură
 InvoiceNote=Notă Factură
 InvoicePaid=Facturiă plătită
-InvoicePaidCompletely=Paid completely
-InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status.
-OrderBilled=Comanda facturată
+InvoicePaidCompletely=Plătit integral
+InvoicePaidCompletelyHelp=Facturi care sunt achitate integral. Aceasta exclude facturile achitate parțial. Pentru a obține lista tuturor facturilor „Închis” sau „Deschis”, utilizați un filtru pe starea facturii.
+OrderBilled=Comandă facturată
 DonationPaid=Donația a fost plătită
 PaymentNumber=Număr plata
 RemoveDiscount=Înlăturaţi discountul
@@ -379,11 +379,11 @@ InvoiceAutoValidate=Validare automată facturi
 GeneratedFromRecurringInvoice=Generate din model factura recurentă %s
 DateIsNotEnough=Incă nu este data setată
 InvoiceGeneratedFromTemplate=Factură %s generată din model factură recurentă %s
-GeneratedFromTemplate=Generated from template invoice %s
+GeneratedFromTemplate=Generată din şablonul de factură %s
 WarningInvoiceDateInFuture=Avertisment, data facturii este mai mare decât data curentă
 WarningInvoiceDateTooFarInFuture=Avertisment, data facturii este prea departe de data curentă
 ViewAvailableGlobalDiscounts=Vedeți reducerile disponibile
-GroupPaymentsByModOnReports=Group payments by mode on reports
+GroupPaymentsByModOnReports=Grupare plăţi după tip în rapoarte
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Scadentă la primire
@@ -410,10 +410,10 @@ PaymentConditionShort14D=14 zile
 PaymentCondition14D=14 zile
 PaymentConditionShort14DENDMONTH=14 zile de la sfârșitul lunii
 PaymentCondition14DENDMONTH=În termen de 14 zile de la sfârșitul lunii
-FixAmount=Fixed amount - 1 line with label '%s'
+FixAmount=Sumă fixă  - 1 linie cu eticheta '%s'
 VarAmount=Valoare variabilă (%% tot.)
 VarAmountOneLine=Cantitate variabilă (%% tot.) - 1 rând cu eticheta "%s"
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Sumă variabilă (%% tot.) - aceiaşi pe toate liniile
 # PaymentType
 PaymentTypeVIR=Transfer bancar
 PaymentTypeShortVIR=Transfer bancar
@@ -441,8 +441,8 @@ BankAccountNumberKey=checksum
 Residence=Adresă
 IBANNumber=Numărul contului IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN client
+SupplierIBAN=IBAN furnizor
 BIC=BIC / SWIFT
 BICNumber=cod BIC/SWIFT 
 ExtraInfos=Informaţii suplimentare
@@ -497,27 +497,27 @@ CantRemovePaymentWithOneInvoicePaid=Nu se poate elimina plata deoarece există c
 ExpectedToPay=Plată prevăzută
 CantRemoveConciliatedPayment=Nu se poate elimina plata reconciliată
 PayedByThisPayment=Achitat cu aceasta plată
-ClosePaidInvoicesAutomatically=Classify automatically all standard, down payment or replacement invoices as "Paid" when payment is done entirely.
-ClosePaidCreditNotesAutomatically=Classify automatically all credit notes as "Paid" when refund is done entirely.
-ClosePaidContributionsAutomatically=Classify automatically all social or fiscal contributions as "Paid" when payment is done entirely.
+ClosePaidInvoicesAutomatically=Clasificați automat toate facturile standard, de plată sau de înlocuire drept "Plătite" atunci când plata se face în întregime
+ClosePaidCreditNotesAutomatically=Clasificați automat toate notele de credit drept "Plătite" atunci când rambursarea se face în întregime.
+ClosePaidContributionsAutomatically=Clasificați automat toate contribuțiile sociale sau fiscale drept "Plătite" atunci când plata se face în întregime.
 AllCompletelyPayedInvoiceWillBeClosed=Toate facturile fără niciun avertisment de plată vor fi închise automat cu starea "Plătit".
 ToMakePayment=Plăteşte
 ToMakePaymentBack=Rambursează
 ListOfYourUnpaidInvoices=Lista facturilor neplătite
 NoteListOfYourUnpaidInvoices=Notă: Această listă conține numai facturile pentru partenerii la care sunteţi reprezentant de vânzării.
-RevenueStamp=Tax stamp
+RevenueStamp=Taxă fiscală
 YouMustCreateInvoiceFromThird=Această opțiune este disponibilă numai când creați o factură din fila "Client" al unui terț
 YouMustCreateInvoiceFromSupplierThird=Această opțiune este disponibilă numai când creați o factură din fila "Furnizor" al unui terț
 YouMustCreateStandardInvoiceFirstDesc=Intai se poate crea o factură standard si se transforma in model pentru a avea un nou model de factura.
-PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
+PDFCrabeDescription= Şablon PDF de factură Crabe. Un șablon de factură complet (vechea implementare a șablonului Sponge)
 PDFSpongeDescription=Factura PDF șablon Burete. Un șablon complet de factură
 PDFCrevetteDescription=Model factură PDF Crevette. Un model complet pentru factura de situaţie
 TerreNumRefModelDesc1=Returnează numărul sub forma %syymm-nnnn pentru facturile standard și %syymm-nnnn pentru notele de credit unde yy este anul, mm este luna și nnnn este o secvenţă fără nici o pauză și fără revenire la 0
 MarsNumRefModelDesc1=Returnați numărul cu formatul %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru facturile de înlocuire, %syymm-nnnn pentru facturile de plată în avans și %syymm-nnnn pentru notele de credit unde yy este anul, mm este luna și nnnn este o secvență fără nicio pauză și nu reveniți la 0
 TerreNumRefModelError=O factură începând cu $syymm există deja și nu este compatibilă cu acest model de numerotaţie. Ştergeţi sau redenumiți pentru a activa acest modul.
 CactusNumRefModelDesc1=Returnați numărul cu formatul %syymm-nnnn pentru facturile standard, %syymm-nnnn pentru notele de credit și %syymm-nnnn pentru facturile de plată în care yy este anul, mm este luna și nnnn este o secvență fără pauză și nici o întoarcere la 0
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+EarlyClosingReason= Motiv de închidere timpurie
+EarlyClosingComment=Notă de închidere timpurie
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Responsabil urmarire factură client
 TypeContact_facture_external_BILLING=Contact facturare  client
@@ -571,7 +571,7 @@ AutoFillDateTo=Setați data de încheiere pentru linia de servicii cu data urmă
 AutoFillDateToShort=Setați data de încheiere
 MaxNumberOfGenerationReached=Numărul maxim de gen. atins
 BILL_DELETEInDolibarr=Factură ştearsă
-BILL_SUPPLIER_DELETEInDolibarr=Supplier invoice deleted
-UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
-CustomersInvoicesArea=Customer billing area
-SupplierInvoicesArea=Supplier billing area
+BILL_SUPPLIER_DELETEInDolibarr=Factură furnizor ştearsă
+UnitPriceXQtyLessDiscount=Preţ unitar  x Cantitate - Discount
+CustomersInvoicesArea=Facturare clienţi
+SupplierInvoicesArea=Facturare furnizori
diff --git a/htdocs/langs/ro_RO/blockedlog.lang b/htdocs/langs/ro_RO/blockedlog.lang
index 854459a81da..fb1ab84c5eb 100644
--- a/htdocs/langs/ro_RO/blockedlog.lang
+++ b/htdocs/langs/ro_RO/blockedlog.lang
@@ -8,15 +8,15 @@ BrowseBlockedLog=Înregistrări nemodificate
 ShowAllFingerPrintsMightBeTooLong=Arată toate jurnalele arhivate (ar putea fi lungi)
 ShowAllFingerPrintsErrorsMightBeTooLong=Arată toate jurnalele de arhivă nevalide (ar putea fi lungi)
 DownloadBlockChain=Descărcați amprentele digitale
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=Înregistrarea din jurnalul arhivat nu este validă. Înseamnă că cineva (un hacker?) A modificat unele date din această înregistrare după ce a fost înregistrată sau a șters înregistrarea anterioară arhivată (verificați că această linie cu # anterior există).
 OkCheckFingerprintValidity=Intrarea în jurnal arhivată este validă. Datele de pe această linie nu au fost modificate şi intrarea urmează cele precedente.
 OkCheckFingerprintValidityButChainIsKo=Jurnalul arhivat pare valabil în comparație cu cel precedent, dar lanțul a fost corupt anterior.
 AddedByAuthority=Stocată în autoritate la distanţă
 NotAddedByAuthorityYet=Nu este încă stocată în autoritate la distanță
 ShowDetails=Afișați detaliile stocate
-logPAYMENT_VARIOUS_CREATE=Payment (not assigned to an invoice) created
-logPAYMENT_VARIOUS_MODIFY=Payment (not assigned to an invoice) modified
-logPAYMENT_VARIOUS_DELETE=Payment (not assigned to an invoice) logical deletion
+logPAYMENT_VARIOUS_CREATE=Plată (ne-asignată unei facturi) creată
+logPAYMENT_VARIOUS_MODIFY=Plată ( ne-asignată unei facturi) modificată
+logPAYMENT_VARIOUS_DELETE=Ştergere logică plată (ne-asignată unei facturi) 
 logPAYMENT_ADD_TO_BANK=Plată adăugată la bancă
 logPAYMENT_CUSTOMER_CREATE=Plata clientului a fost creată
 logPAYMENT_CUSTOMER_DELETE=Ștergerea logică a plăţii clientului
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index 74d22e55b2c..c258d9aee69 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -19,7 +19,7 @@ BoxLastContacts=Ultimele contacte/ adrese
 BoxLastMembers=Ultimii membri
 BoxFicheInter=Ultimele intervenţii
 BoxCurrentAccounts=Sold conturi deschise
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
+BoxTitleMemberNextBirthdays=Aniversări în acreastă lună (membri)
 BoxTitleLastRssInfos=Ultimele %s noutăţi de la %s 
 BoxTitleLastProducts=Produse / Servicii: ultima %s modificată
 BoxTitleProductsAlertStock=Produse: avertizare stoc
@@ -27,25 +27,25 @@ BoxTitleLastSuppliers=Ultimii %s furnizori înregistraţi
 BoxTitleLastModifiedSuppliers=Furnizori: ultima %s modificată
 BoxTitleLastModifiedCustomers=Clienții: ultima %s modificată
 BoxTitleLastCustomersOrProspects=Ultimii %s clienti sau prospecţi
-BoxTitleLastCustomerBills=Ultimele %s facturi ale clientului
-BoxTitleLastSupplierBills=Ultimele %s facturi ale furnizorilor
-BoxTitleLastModifiedProspects=Perspective: ultima %s modificată
+BoxTitleLastCustomerBills=Ultimile %s facturi client modificate
+BoxTitleLastSupplierBills=Ultimile %s facturi furnizor modificate
+BoxTitleLastModifiedProspects=Prospecţi: ultimii %s modificaţi
 BoxTitleLastModifiedMembers=Ultimii %s membri
 BoxTitleLastFicheInter=Ultimele %s intervenţii modificate
 BoxTitleOldestUnpaidCustomerBills=Facturile cel mai vechi ale clientului:  %s neplătite
 BoxTitleOldestUnpaidSupplierBills=Facturie cele mai vechi ale furnizorilor: %s neplătite
 BoxTitleCurrentAccounts=Conturi deschise: balanțe
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
+BoxTitleSupplierOrdersAwaitingReception=Comenzi de achiziţie în aşteptare
 BoxTitleLastModifiedContacts=Contacte / Adrese: ultima %s modificată
-BoxMyLastBookmarks=Bookmarks: latest %s
+BoxMyLastBookmarks=Bookmark-uri : ultimile %s
 BoxOldestExpiredServices=Cele mai vechi servicii active expirate
 BoxLastExpiredServices=Cele mai vechi %s contacte cu servicii active expirate
 BoxTitleLastActionsToDo=Ultimele %s acţiuni de realizat
 BoxTitleLastContracts=Ultimele contracte modificate %s
 BoxTitleLastModifiedDonations=Ultimele %s donaţii modificate 
 BoxTitleLastModifiedExpenses=Ultimele %s deconturi modificare 
-BoxTitleLatestModifiedBoms=Latest %s modified BOMs
-BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
+BoxTitleLatestModifiedBoms=Ultimile %sbonuri de consum modificate 
+BoxTitleLatestModifiedMos=Ultimile %s comenzi de producţie modificate
 BoxGlobalActivity=Activitate globală ( facturi, oferte, comenzi)
 BoxGoodCustomers=Clienţi buni
 BoxTitleGoodCustomers=%s Clienţi buni
@@ -68,7 +68,7 @@ NoContractedProducts=Niciun  produs / serviciu contractat
 NoRecordedContracts=Niciun contract înregistrat
 NoRecordedInterventions=Nicio intervenție înregistrată
 BoxLatestSupplierOrders=Ultimele comenzi de cumpărături
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+BoxLatestSupplierOrdersAwaitingReception=Ultimile comenzi de achiziţie (în aşteptarea recepţiei)
 NoSupplierOrder=Nu sunt înregistrate comenzi de cumpărături
 BoxCustomersInvoicesPerMonth=Facturi clienți pe lună
 BoxSuppliersInvoicesPerMonth=Facturi furnizori pe lună
@@ -77,26 +77,30 @@ BoxSuppliersOrdersPerMonth=Comenzi furnizori pe lună
 BoxProposalsPerMonth=Oferte pe luni
 NoTooLowStockProducts=Niciun produs sub limita minimă de stoc
 BoxProductDistribution= Distribuție de produse/servicii
-ForObject=On %s
+ForObject=Pe %s
 BoxTitleLastModifiedSupplierBills= Facturi furnizor: ultimul %s modificat
 BoxTitleLatestModifiedSupplierOrders=Comenzi furnizor: ultimul %s modificat
 BoxTitleLastModifiedCustomerBills=Facturi clienți: ultimul %s modificat
 BoxTitleLastModifiedCustomerOrders=Comenzi de vânzări: ultimul %s modificat
 BoxTitleLastModifiedPropals=Ultimele %s oferte modificate
+BoxTitleLatestModifiedJobPositions=Ultimile %s joburi modificate
+BoxTitleLatestModifiedCandidatures=Ultimile %scandidaturi modificate
 ForCustomersInvoices=Facturi clienţi
 ForCustomersOrders=Comenzi clienți
 ForProposals=Oferte
 LastXMonthRolling=Rulaj ultimele %s luni
 ChooseBoxToAdd=Adăugați widget în tabloul dvs. de bord
 BoxAdded=Widget a fost adăugat în tabloul dvs. de bord
-BoxTitleUserBirthdaysOfMonth=Birthdays of this month (users)
-BoxLastManualEntries=Last manual entries in accountancy
-BoxTitleLastManualEntries=%s latest manual entries
-NoRecordedManualEntries=No manual entries record in accountancy
-BoxSuspenseAccount=Count accountancy operation with suspense account
-BoxTitleSuspenseAccount=Number of unallocated lines
-NumberOfLinesInSuspenseAccount=Number of line in suspense account
-SuspenseAccountNotDefined=Suspense account isn't defined
-BoxLastCustomerShipments=Last customer shipments
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=No recorded customer shipment
+BoxTitleUserBirthdaysOfMonth=Aniversări în această lună (utilizatori)
+BoxLastManualEntries=Ultimele înregistrări manuale în contabilitate
+BoxTitleLastManualEntries=Ultimile %s înregistrări contabile manule
+NoRecordedManualEntries=Nici o înregistrare manuală în contabilitate
+BoxSuspenseAccount=Contorizează operaţiunea contabilă cu contul suspendat 
+BoxTitleSuspenseAccount=Număr linii nealocate
+NumberOfLinesInSuspenseAccount=Număr linie în cont suspendat
+SuspenseAccountNotDefined=Contul suspendat nu este definit
+BoxLastCustomerShipments=Ultimile livrări către clienţi 
+BoxTitleLastCustomerShipments=Ultimile %s livrări către clienţi
+NoRecordedShipments=Nici o livrare către clienţi
+# Pages
+AccountancyHome=Contabilitate
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index 4a5919ad2b4..a1d61daa35e 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -1,6 +1,6 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Punctul de vânzare
-CashDesk=Punctul de vânzare
+CashDeskMenu=Punct de vânzare
+CashDesk=Punct de vânzare
 CashDeskBankCash=Cont bancar (cash)
 CashDeskBankCB=Cont bancar (card)
 CashDeskBankCheque=Cont bancar (cec)
@@ -16,7 +16,7 @@ AddThisArticle=Adauga acest articol
 RestartSelling=Du-te inapoi la vânzare
 SellFinished=Vanzare completa
 PrintTicket=Print bon
-SendTicket=Send ticket
+SendTicket=Trimite tichet
 NoProductFound=Niciun articol gasit
 ProductFound=produs găsit
 NoArticle=Niciun articol
@@ -49,71 +49,76 @@ Footer=Subsol
 AmountAtEndOfPeriod=Valoare la sfârșitul perioadei (zi, lună sau an)
 TheoricalAmount=Valoare teoretică
 RealAmount=Sumă reală
-CashFence=Cash fence
+CashFence=Limită cash
 CashFenceDone=Limita de bani realizată pentru perioada
 NbOfInvoices=Nr  facturi
-Paymentnumpad=Type of Pad to enter payment
+Paymentnumpad=Tipul de pad utilizat pentru introducerea plăţii
 Numberspad=Suport de numere
-BillsCoinsPad=Coins and banknotes Pad
+BillsCoinsPad=Pad Monede şi bancnote
 DolistorePosCategory=Modulele TakePOS și alte soluții POS pentru Dolibarr
 TakeposNeedsCategories=TakePOS are nevoie de categorii de produse pentru a lucra
 OrderNotes=Note de comandă
-CashDeskBankAccountFor=Default account to use for payments in
-NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
-TicketVatGrouped=Group VAT by rate in tickets|receipts
-AutoPrintTickets=Automatically print tickets|receipts
-PrintCustomerOnReceipts=Print customer on tickets|receipts
-EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant
-ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ?
-ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ?
+CashDeskBankAccountFor=Cont implicit utilizat pentru plăți
+NoPaimementModesDefined=Nici un mod de plată definit în configurația TakePOS
+TicketVatGrouped=Grupează TVA după cotă pe tichete|bonuri
+AutoPrintTickets=Tipăreşte automat tichete|bonuri
+PrintCustomerOnReceipts=Tipăreşte clientul pe tichete|bonuri
+EnableBarOrRestaurantFeatures=Activați funcțiile pentru Bar sau Restaurant
+ConfirmDeletionOfThisPOSSale=Confirmă ștergerea acestei vânzări curente?
+ConfirmDiscardOfThisPOSSale=Vrei să elimini această vânzare curentă?
 History=Istoric
-ValidateAndClose=Validate and close
+ValidateAndClose=Validați și închideți
 Terminal=Terminal
-NumberOfTerminals=Number of Terminals
-TerminalSelect=Select terminal you want to use:
-POSTicket=POS Ticket
-POSTerminal=POS Terminal
-POSModule=POS Module
-BasicPhoneLayout=Use basic layout for phones
-SetupOfTerminalNotComplete=Setup of terminal %s is not complete
-DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
-InvoiceIsAlreadyValidated=Invoice is already validated
-NoLinesToBill=No lines to bill
-CustomReceipt=Custom Receipt
-ReceiptName=Receipt Name
-ProductSupplements=Product Supplements
-SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
-HeadBar=Head Bar
-SortProductField=Field for sorting products
+NumberOfTerminals=Număr terminale
+TerminalSelect=Selectați terminalul pe care doriți să-l utilizați:
+POSTicket=Tichet POS
+POSTerminal=Terminal POS
+POSModule=Modul POS
+BasicPhoneLayout=Utilizați aspectul de bază pentru telefoane
+SetupOfTerminalNotComplete=Configurarea terminalului %s nu este completă
+DirectPayment=Plată directă
+DirectPaymentButton=Adaugă un buton "Plată directă în numerar"
+InvoiceIsAlreadyValidated=Factura este deja validată
+NoLinesToBill=Nici o linie de facturat
+CustomReceipt=Bon personalizat
+ReceiptName=Denumire bon
+ProductSupplements=Suplimente produs
+SupplementCategory=Categorie suplimente
+ColorTheme=Tema de culoare
+Colorful=Colorat
+HeadBar=Head bar
+SortProductField=Câmp utilizat pentru sortarea produselor
 Browser=Browser
-BrowserMethodDescription=Simple and easy receipt printing. Only a few parameters to configure the receipt. Print via browser.
-TakeposConnectorMethodDescription=External module with extra features. Posibility to print from the cloud.
-PrintMethod=Print method
-ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
-ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
-TakeposGroupSameProduct=Group same products lines
-StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
-CloseCashFence=Close cash fence
-CashReport=Cash report
-MainPrinterToUse=Main printer to use
-OrderPrinterToUse=Order printer to use
-MainTemplateToUse=Main template to use
-OrderTemplateToUse=Order template to use
+BrowserMethodDescription=Tipărirea simplă și ușoară a chitanței. Doar câțiva parametri pentru a configura chitanța. Tipăriți prin browser.
+TakeposConnectorMethodDescription=Modul extern cu funcții suplimentare. Posibilitatea de a imprima din cloud.
+PrintMethod=Metoda de tipărire
+ReceiptPrinterMethodDescription=Metodă eficientă cu o mulțime de parametri. Personalizabilă cu șabloane. Nu se poate imprima din cloud.
+ByTerminal=După terminal
+TakeposNumpadUsePaymentIcon=Utilizați pictograme în loc de text pe butoanele de plată de pe numpad
+CashDeskRefNumberingModules=Modul de numerotare pentru vânzările POS
+CashDeskGenericMaskCodes6 = Tag-ul <br><b>{TN}</b> este utilizat pentru adăugarea numărului de terminal
+TakeposGroupSameProduct=Grupează liniile cu produse identice
+StartAParallelSale=Iniţiază o vânzare paralelă
+ControlCashOpening=Controlează sertarul de bani la deschiderea POS
+CloseCashFence=Închidere plafon de numerar
+CashReport=Raport numerar
+MainPrinterToUse=Imprimantă principală de utilizat
+OrderPrinterToUse=Imprimantă utilizată pentru comenzi
+MainTemplateToUse=Şablon principal de utilizat
+OrderTemplateToUse=Şablon comandă utilizat
 BarRestaurant=Bar Restaurant
-AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
-ScanToMenu=Scan QR code to see the menu
-ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+AutoOrder=Comandă făcută de client
+RestaurantMenu=Meniu
+CustomerMenu=Meniu client
+ScanToMenu=Scanează codul QR pentru a vedea meniul
+ScanToOrder=Scanează codul QR pentru a comanda
+Appearance=Aspect
+HideCategoryImages=Ascunde imaginile de categorie 
+HideProductImages=Ascunde imaginile de produs
+NumberOfLinesToShow= Numărul de linii de imagini de afișat
+DefineTablePlan=Definire plan de mese
+GiftReceiptButton=Adaugă un buton "Bon cadou"
+GiftReceipt=Bon cadou 
+ModuleReceiptPrinterMustBeEnabled= \nModulul Imprimanta bonuri trebuie să fi fost activat mai întâi
+AllowDelayedPayment= Permite plata cu întârziere
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 1f4f06fac43..9f3fd179ccf 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -1,90 +1,90 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag / Categorie
-Rubriques=Tag-uri / Categorii
-RubriquesTransactions=Etichete / Categorii de tranzacții
-categories=tag-uri / categorii
+Rubrique=Tag/Categorie
+Rubriques=Tag-uri/Categorii
+RubriquesTransactions=Tag-uri/Categorii de tranzacții
+categories=tag-uri/categorii
 NoCategoryYet=Niciun tag/categorie de acest tip creată
 In=În
 AddIn=Adăugă în
 modify=modifică
 Classify=Clasează
-CategoriesArea=Tag-uri / Categorii
-ProductsCategoriesArea=Taguri/ Categorii Produse / Servicii
-SuppliersCategoriesArea=Zona etichetelor/categoriilor furnizorilor
-CustomersCategoriesArea=Tag-uri / categorii Clienții
-MembersCategoriesArea=Tag-uri  / categorii Membri
-ContactsCategoriesArea=Tag-uri / Categorii Contacte
-AccountsCategoriesArea=Tag-uri / Categorii Contabilitate
-ProjectsCategoriesArea=Zona etichetelor / categoriilor de proiecte
-UsersCategoriesArea=Zona etichetelor / categoriilor utilizatorilor
+CategoriesArea=Tag-uri/Categorii
+ProductsCategoriesArea=Taguri/Categorii Produse/Servicii
+SuppliersCategoriesArea=Tag-uri/categorii furnizori
+CustomersCategoriesArea=Tag-uri/categorii clienți
+MembersCategoriesArea=Tag-uri/categorii membri
+ContactsCategoriesArea=Tag-uri/categorii contacte
+AccountsCategoriesArea=Tag-uri/categorii conturi contabile
+ProjectsCategoriesArea=Tag-uri/categorii proiecte
+UsersCategoriesArea=Tag-uri/categorii utilizatori
 SubCats=Subcategorii
-CatList=Lista Tag-uri / Categorii
-NewCategory=Tag / categorie noua
-ModifCat=Modifica Tag / categoria
-CatCreated=Tag / categorie creată
-CreateCat=Creați tag / categorie
-CreateThisCat=Creați acest tag/ categorie
+CatList=Lista tag-uri/categorii
+NewCategory=Tag/categorie nouă
+ModifCat=Modifică tag/categorie
+CatCreated=Tag/categorie creată
+CreateCat=Creare tag/categorie
+CreateThisCat=Creați acest tag/categorie
 NoSubCat=Nicio subcategorie.
 SubCatOf=Subcategorie
-FoundCats=Tag-uri  / categorii gasite
+FoundCats=Tag-uri/categorii găsite
 ImpossibleAddCat=Imposibil de adăugat tag-ul/ categoria %s
-WasAddedSuccessfully=<b> %s</b> a fost adaugat cu succes.
+WasAddedSuccessfully=<b> %s</b> a fost adăugat cu succes.
 ObjectAlreadyLinkedToCategory=Elementul este deja asociat cu acest tag/ categorie.
 ProductIsInCategories=Produsul/ serviciul este asociat cu următoarele tag-uri/ categorii
 CompanyIsInCustomersCategories=Acest partener este asociat cu următoarele tag-uri/ categorii clienţi/ prospecţi
-CompanyIsInSuppliersCategories=Acest terț este legată de următoarele etichete/categorii de furnizori
+CompanyIsInSuppliersCategories=Acest terț este legat de următoarele tag-uri/categorii de furnizori
 MemberIsInCategories=Acest menbru este asociat cu următoarele tag-uri/ categorii membri
-ContactIsInCategories=Acest contact este asociat cu următoarele tag-uri/ categorii contacte
-ProductHasNoCategory=Acest produs / serviciu nu este în niciun tag/ categorie
-CompanyHasNoCategory=Această terță parte nu se află în nicio etichetă / categorie
+ContactIsInCategories=Acest contact este asociat cu următoarele tag-uri/categorii contacte
+ProductHasNoCategory=Acest produs/serviciu nu are asociat niciun tag/categorie
+CompanyHasNoCategory=Acest terț nu are asociate tag-uri/categorii
 MemberHasNoCategory=Acest membru nu este asociat cu tag-uri/ categorii
-ContactHasNoCategory=Acest contact nu este în niciun tag/ categorie
-ProjectHasNoCategory=Acest proiect nu se află în nicio etichetă / categorie
-ClassifyInCategory=Adauga la  tag / categorie
-NotCategorized=Fără tag / categorie
-CategoryExistsAtSameLevel=Această categorie  există deja cu această referinţă
+ContactHasNoCategory=Acest contact nu are asociat niciun tag/categorie
+ProjectHasNoCategory=Acest proiect nu are asociat niciun tag/categorie
+ClassifyInCategory=Adaugă la tag/categorie
+NotCategorized=Fără tag/categorie
+CategoryExistsAtSameLevel=Această categorie există deja cu această referinţă
 ContentsVisibleByAllShort=Conţinut vizibil de către toţi
 ContentsNotVisibleByAllShort=Conţinutul nu va fi vizibil pentru toţi
-DeleteCategory=Ştergere tag / categorie
-ConfirmDeleteCategory=Sigur doriți să ștergeți această etichetă / categorie?
-NoCategoriesDefined=Niciun tag / categorie definită
-SuppliersCategoryShort=Eticheta/categoria furnizorilor
-CustomersCategoryShort=Tag  / categorie Clienții
-ProductsCategoryShort= Tag / categorie Produse
-MembersCategoryShort=Tag  / categorie Membri
-SuppliersCategoriesShort=Etichetele/categoriile furnizorilor
-CustomersCategoriesShort=Tag-uri / categorii Clienții
-ProspectsCategoriesShort=Tag-uri / categorii prospecte
-CustomersProspectsCategoriesShort=Etichetele/categoriile client/proiecte
-ProductsCategoriesShort=Tag-uri / categorii Produse 
-MembersCategoriesShort=Tag-uri  / categorii Membri
-ContactCategoriesShort=Tag-uri / Categorii Contacte
-AccountsCategoriesShort=Tag-uri / Categorii Contabilitate
-ProjectsCategoriesShort=Etichete / categorii de proiecte
-UsersCategoriesShort=Etichetele/categoriile utilizatorilor
-StockCategoriesShort=Warehouse tags/categories
-ThisCategoryHasNoItems=This category does not contain any items.
-CategId=Id Tag / Categorie
-CatSupList=Lista de etichete/categorii furnizori
-CatCusList=Lista Categorii/ taguri  clienţi / prospecte
-CatProdList=Lista Tag-uri / categorii Produse 
-CatMemberList=Lista Tag-uri  / categorii Membri
-CatContactList=Lista Tag-uri / Categorii Contacte
-CatSupLinks=Legături dintre furnizori si taguri/categorii
-CatCusLinks=Legături dintre clienti/prospecti si  taguri/categorii
-CatContactsLinks=Links between contacts/addresses and tags/categories
-CatProdLinks=Legături dintre  produse/servicii si ftaguri/categorii
-CatProJectLinks=Legături între proiecte și etichete / categorii
-DeleteFromCat=Elimina din tag-uri / categoriii
+DeleteCategory=Ştergere tag/categorie
+ConfirmDeleteCategory=Sigur doriți să ștergeți acest tag/categorie?
+NoCategoriesDefined=Niciun tag/categorie definită
+SuppliersCategoryShort=Tag/categorie furnizori
+CustomersCategoryShort=Tag/categorie clienți
+ProductsCategoryShort=Tag/categorie produse
+MembersCategoryShort=Tag/categorie membri
+SuppliersCategoriesShort=Tag-uri/categorii furnizori
+CustomersCategoriesShort=Tag-uri/categorii clienți
+ProspectsCategoriesShort=Tag-uri/categorii prospecţi
+CustomersProspectsCategoriesShort=Tag-uri/categorii clienţi/prospecţi
+ProductsCategoriesShort=Tag-uri/categorii produse
+MembersCategoriesShort=Tag-uri/categorii membri
+ContactCategoriesShort=Tag-uri/categorii contacte
+AccountsCategoriesShort=Tag-uri/categorii conturi contabile
+ProjectsCategoriesShort=Tag-uri/categorii proiecte
+UsersCategoriesShort=Tag-uri/categorii utilizatori
+StockCategoriesShort=Tag-uri/categorii depozite
+ThisCategoryHasNoItems=Această categorie nu conţine nici un element.
+CategId=ID tag/categorie
+CatSupList=Listă tag-uri/categorii furnizori
+CatCusList=Listă taguri/categorii clienţi/prospecţi
+CatProdList=Listă tag-uri/categorii produse 
+CatMemberList=Listă tag-uri/categorii membri
+CatContactList=Listă tag-uri/categorii contacte
+CatSupLinks=Asocieri între furnizori şi tag-uri/categorii
+CatCusLinks=Asocieri între clienţi/prospecţi şi tag-uri/categorii
+CatContactsLinks=Asocieri între contacte/adrese şi tag-uri/categorii 
+CatProdLinks=Asocieri între produse/servicii şi tag-uri/categorii
+CatProJectLinks=Asocieri între proiecte și tag-uri/categorii
+DeleteFromCat=Elimină din tag-uri/categoriii
 ExtraFieldsCategories=Atribute complementare
-CategoriesSetup=Configurare Tag-uri / categorii
-CategorieRecursiv=Link automat către  tag /categoria părinte
+CategoriesSetup=Configurare tag-uri/categorii
+CategorieRecursiv=Asociere automată către tag/categorie părinte
 CategorieRecursivHelp=Dacă opțiunea este activă, când adăugați un produs într-o subcategorie, produsul va fi adăugat și în categoria părinte
-AddProductServiceIntoCategory=Add  următoarele produseservicii
-ShowCategory=Arată tag / categorie
+AddProductServiceIntoCategory=Adaugă următoarele produse/servicii
+ShowCategory=Arată tag/categorie
 ByDefaultInList=Implicit în listă
 ChooseCategory=Alegeți categoria
-StocksCategoriesArea=Warehouses Categories Area
-ActionCommCategoriesArea=Events Categories Area
-WebsitePagesCategoriesArea=Page-Container Categories Area
-UseOrOperatorForCategories=Use or operator for categories
+StocksCategoriesArea=Categorii depozite
+ActionCommCategoriesArea=Categorii evenimente
+WebsitePagesCategoriesArea=Categorii pagină-container
+UseOrOperatorForCategories=Utilizează operatorul SAU pentru categorii
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index 836c658f5c4..7f69341f5f6 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=Comercial
+CommercialArea=Zona comercială
 Customer=Client
 Customers=Clienţi
 Prospect=Prospect
@@ -18,7 +18,7 @@ TaskRDVWith=Întâlnire cu %s
 ShowTask=Arată sarcină
 ShowAction=Arată acţiune
 ActionsReport=Raport Evenimente
-ThirdPartiesOfSaleRepresentative=Terțe părți cu reprezentant de vânzări
+ThirdPartiesOfSaleRepresentative=Terți cu reprezentant de vânzări
 SaleRepresentativesOfThirdParty=Reprezentanți de vânzări ai unei terțe părți
 SalesRepresentative=Reprezentant vînzări
 SalesRepresentatives=Reprezentanţi vânzări
@@ -67,14 +67,14 @@ ActionAC_OTH=Altele
 ActionAC_OTH_AUTO=Evenimente inserate automat
 ActionAC_MANUAL=Evenimente inserate manual
 ActionAC_AUTO=Evenimente inserate automat
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Automat
 Stats=Statistici vânzări
 StatusProsp=Statut Prospect
 DraftPropals=Oferte Comerciale Schiţă
 NoLimit=Nelimitat 
 ToOfferALinkForOnlineSignature=Link pentru semnatura online
 WelcomeOnOnlineSignaturePage=Bun venit pe pagina pentru a accepta propunerile comerciale de la %s
-ThisScreenAllowsYouToSignDocFrom=Acest ecran vă permite  sa acceptati sisemnati , sau refuzati o oferta /propunere comerciala
-ThisIsInformationOnDocumentToSign=Aceasta este informatia pe document de accetat sau refuzat
-SignatureProposalRef=Semnarea citării / propunerii comercialel %s
-FeatureOnlineSignDisabled=Functionalitate pentru semnare online dezactivata sau documentul generat inainte de functionalitae a fost activat
+ThisScreenAllowsYouToSignDocFrom=Acest ecran vă permite să acceptaţi şi să semnaţi sau refuzaţi o ofertă/propunere comercială
+ThisIsInformationOnDocumentToSign=Acestea sunt informaţiile din document de acceptat sau refuzat
+SignatureProposalRef=Semnarea ofertei/propunerii comerciale %s
+FeatureOnlineSignDisabled=Funcţionalitatea pentru semnare online dezactivata sau documentul a fost generat înainte activarea acestei funcţionalităţi
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 0fa8aa59667..ff66f92a9e1 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -10,36 +10,36 @@ MenuNewCustomer=Client nou
 MenuNewProspect=Prospect nou
 MenuNewSupplier=Furnizor nou
 MenuNewPrivateIndividual=Particular nou
-NewCompany=Compania nouă (prospect, client, furnizor)
+NewCompany=Companie nouă (prospect, client, furnizor)
 NewThirdParty=Terț nou (prospect, client, furnizor)
 CreateDolibarrThirdPartySupplier=Creează un terț (furnizor)
 CreateThirdPartyOnly=Creare terţ
 CreateThirdPartyAndContact=Creați un terț + un contact pentru copil
-ProspectionArea=Prospecte
+ProspectionArea=Prospecţi
 IdThirdParty=ID Terţ
 IdCompany=ID Societate
 IdContact=Id Contact
-ThirdPartyContacts=Contactele terți
-ThirdPartyContact=Contact / adresă terț
+ThirdPartyContacts=Contacte terți
+ThirdPartyContact=Contact/adresă terț
 Company=Societate
-CompanyName=Nume  societate
-AliasNames=Alias nume (comercial, marca inregistrata, ...)
-AliasNameShort=Porecla
+CompanyName=Nume societate
+AliasNames=Alias (comercial, marca inregistrata, ...)
+AliasNameShort=Alias
 Companies=Societăţi
 CountryIsInEEC=Țara se află în interiorul Comunității Economice Europene
-PriceFormatInCurrentLanguage=Formatul preţului în limba curentă si moneda
-ThirdPartyName=Numele terț
-ThirdPartyEmail=E-mail terț
+PriceFormatInCurrentLanguage=Afişează formatul preţului în limba şi moneda curentă
+ThirdPartyName=Nume terț
+ThirdPartyEmail=Email terț
 ThirdParty=Terț
 ThirdParties=Terți
-ThirdPartyProspects=Prospecte
-ThirdPartyProspectsStats=Prospecte
+ThirdPartyProspects=Prospecţi
+ThirdPartyProspectsStats=Prospecţi
 ThirdPartyCustomers=Clienţi
 ThirdPartyCustomersStats=Clienţi
 ThirdPartyCustomersWithIdProf12=Clienţii cu %s sau %s
 ThirdPartySuppliers=Furnizori
 ThirdPartyType=Tip de terț
-Individual=Persoană privată
+Individual=Persoană fizică
 ToCreateContactWithSameName=Va crea automat o persoană de contact / o adresă cu aceleași informații ca și terțul terțului. În cele mai multe cazuri, chiar dacă partea terță este o persoană fizică, este suficientă crearea unei terțe părți singură.
 ParentCompany=Societatea-mamă
 Subsidiaries=Filiale
@@ -52,54 +52,54 @@ Lastname=Nume
 Firstname=Prenume
 PostOrFunction=Funcţie
 UserTitle=Titlu
-NatureOfThirdParty=Natura terților
-NatureOfContact=Nature of Contact
+NatureOfThirdParty=Natură terț
+NatureOfContact=Natură contact
 Address=Adresă
-State=Regiune / Judeţ
-StateCode=State/Province code
+State=Regiune/Judeţ
+StateCode=Cod judeţ/provincie
 StateShort=Stare
 Region=Regiune
 Region-State=Region - Țară
 Country=Ţară
 CountryCode=Cod ţară
-CountryId=ID Ţara
+CountryId=ID Ţară
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
 Call=Apel
 Chat=Chat
-PhonePro=Telefon Prof.
-PhonePerso=Telefon Pers.
-PhoneMobile=Telefon Mobil
-No_Email=Refuzați e-mailurile în vrac
+PhonePro=Telefon prof.
+PhonePerso=Telefon pers.
+PhoneMobile=Telefon mobil
+No_Email=Refuză email-urile bulk
 Fax=Fax
 Zip=Cod postal
 Town=Oraş
 Web=Web
-Poste= Poziţie
+Poste= Funcţie
 DefaultLang=Limba implicită
-VATIsUsed=Impozitul pe vânzări utilizat
+VATIsUsed=Utilizează TVA
 VATIsUsedWhenSelling=Aceasta definește dacă acest terț include sau nu o taxă de vânzare atunci când efectuează o factură către clienții săi
 VATIsNotUsed=Impozitul pe vânzări nu este utilizat
 CopyAddressFromSoc=Copiați adresa de la detaliile terților
-ThirdpartyNotCustomerNotSupplierSoNoRef=Partea terță nici client, nici vânzător, nu există obiecte care se face referință
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Partea terță nici client, nici vânzător, reduceri nu sunt disponibile
+ThirdpartyNotCustomerNotSupplierSoNoRef=Terț nu este nici client, nici vânzător, nu există obiecte la care se pot face referință
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Terțul nu este nici client, nici vânzător, reducerile nu sunt disponibile
 PaymentBankAccount=Cont bancar de plată
 OverAllProposals=Oferte
 OverAllOrders=Comenzi
 OverAllInvoices=Facturi
-OverAllSupplierProposals=Cereri Preţ 
+OverAllSupplierProposals=Cereri preţ 
 ##### Local Taxes #####
-LocalTax1IsUsed=Utilizează taxa secundă
+LocalTax1IsUsed=Utilizează taxa secundară
 LocalTax1IsUsedES= RE este utilizat
 LocalTax1IsNotUsedES= RE nu este utilizat
-LocalTax2IsUsed=Utilizează taxa treia
+LocalTax2IsUsed=Utilizează taxa a treia
 LocalTax2IsUsedES= IRPF este utilizat
 LocalTax2IsNotUsedES= IRPF nu este utilizat
-WrongCustomerCode=Cod  Client invalid
-WrongSupplierCode=Codul furnizorului este invalid
+WrongCustomerCode=Cod client invalid
+WrongSupplierCode=Cod furnizor invalid
 CustomerCodeModel=Model cod client
-SupplierCodeModel=Modelul codului furnizorului
+SupplierCodeModel=Model cod furnizor
 Gencod=Coduri de bare
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
@@ -168,8 +168,8 @@ ProfId3DE=Prof Id-ul 3 (Handelsregister-Nr.)
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
-ProfId1ES=Id-ul prof. 1 (CIF / CUI)
-ProfId2ES=Prof. ID 2 (Număr deasigurare socială)
+ProfId1ES=Id-ul prof. 1 (CIF/CNP)
+ProfId2ES=Prof. ID 2 (SSN)
 ProfId3ES=Id-ul prof. 3 (CNAE)
 ProfId4ES=Id-ul prof. 4 (Collegiate număr)
 ProfId5ES=-
@@ -247,7 +247,7 @@ ProfId4US=-
 ProfId5US=-
 ProfId6US=-
 ProfId1RO=Prof Id 1 (CUI)
-ProfId2RO=Prof Id 2 (Nr. Înmatriculare)
+ProfId2RO=Prof Id 2 (Nr. Reg Com)
 ProfId3RO=Prof Id 3 (CAEN)
 ProfId4RO=-
 ProfId5RO=Prof Id 5 (EUID)
@@ -270,42 +270,42 @@ ProspectCustomer=Prospect / Client
 Prospect=Prospect
 CustomerCard=Fişa Client
 Customer=Client
-CustomerRelativeDiscount=Discount Relativ client
-SupplierRelativeDiscount=Reducere relativă a furnizorului
-CustomerRelativeDiscountShort=Discount Relativ
-CustomerAbsoluteDiscountShort=Discount Absolut
+CustomerRelativeDiscount=Discount relativ client
+SupplierRelativeDiscount=Discount relativ furnizor
+CustomerRelativeDiscountShort=Discount relativ
+CustomerAbsoluteDiscountShort=Discount absolut
 CompanyHasRelativeDiscount=Acest client are un discount <b>de %s%%</b>
 CompanyHasNoRelativeDiscount=Acest client nu are nici un discount în mod implicit
-HasRelativeDiscountFromSupplier=Aveți o reducere implicită de <b> %s%% </b> de la acest furnizor
-HasNoRelativeDiscountFromSupplier=Nu aveți nici o reducere relativă implicită de la acest furnizor
-CompanyHasAbsoluteDiscount=Acest client are reduceri disponibile (note de credit sau plăți în avans) pentru <b> %s </b> %s
-CompanyHasDownPaymentOrCommercialDiscount=Acest client are reduceri disponibile (comerciale, plăți în avans) pentru <b> %s </b> %s
+HasRelativeDiscountFromSupplier=Aveți un discount implicit de <b> %s%% </b> de la acest furnizor
+HasNoRelativeDiscountFromSupplier=Nu aveți nici un discount relativ implicit de la acest furnizor
+CompanyHasAbsoluteDiscount=Acest client are dicount-uri disponibile (note de credit sau plăți în avans) pentru <b> %s </b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Acest client are discount-uri disponibile (comerciale, plăți în avans) pentru <b> %s </b> %s
 CompanyHasCreditNote=Acest client are încă note de credit pentru <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=Nu aveți credit de reducere disponibil de la acest furnizor
-HasAbsoluteDiscountFromSupplier=Aveți reduceri disponibile (note de credit sau plăți în avans) pentru <b> %s </b> %s de la acest furnizor
-HasDownPaymentOrCommercialDiscountFromSupplier=Aveți reduceri disponibile (comerciale, plăți în avans) pentru <b> %s </b> %s de la acest furnizor
+HasNoAbsoluteDiscountFromSupplier=Nu aveți credit disponibil de discount de la acest furnizor
+HasAbsoluteDiscountFromSupplier=Aveți discount-uri disponibile (note de credit sau plăți în avans) pentru <b> %s </b> %s de la acest furnizor
+HasDownPaymentOrCommercialDiscountFromSupplier=Aveți discount-uri disponibile (comerciale, plăți în avans) pentru <b> %s </b> %s de la acest furnizor
 HasCreditNoteFromSupplier=Aveți note de credit pentru <b> %s </b> %s de la acest furnizor
-CompanyHasNoAbsoluteDiscount=Acest client nu are nici o reducere de credit disponibil
-CustomerAbsoluteDiscountAllUsers=Reduceri absolute ale clienților (acordate de toți utilizatorii)
+CompanyHasNoAbsoluteDiscount=Acest client nu are nici discount de credit disponibil
+CustomerAbsoluteDiscountAllUsers=Discount-uri absolute ale clienților (acordate de toți utilizatorii)
 CustomerAbsoluteDiscountMy=Reduceri absolute ale clienților (acordate de dvs.)
-SupplierAbsoluteDiscountAllUsers=Reduceri absolute ale furnizorului (introduse de toți utilizatorii)
-SupplierAbsoluteDiscountMy=Reduceri absolute ale furnizorilor  (introduse de dvs.)
+SupplierAbsoluteDiscountAllUsers=Discount-uri absolute ale furnizorului (introduse de toți utilizatorii)
+SupplierAbsoluteDiscountMy=Discount-uri absolute ale furnizorilor (introduse de dvs.)
 DiscountNone=Niciunul
 Vendor=Furnizor
 Supplier=Furnizor
 AddContact=Creare contact
 AddContactAddress=Creare contact/adresă
 EditContact=Editare contact
-EditContactAddress=Editează contact
-Contact=Contact/Address
+EditContactAddress=Editare contact/adresă
+Contact=Contact/Adresă
 Contacts=Contacte
 ContactId=Id contact
-ContactsAddresses=Contacte
+ContactsAddresses=Contacte/Adrese
 FromContactName=Nume:
 NoContactDefinedForThirdParty=Niciun contact definit pentru acest terţ
 NoContactDefined=Niciun contact definit
-DefaultContact=Contact Implicit
-ContactByDefaultFor=Default contact/address for
+DefaultContact=Contact/adresă implicită
+ContactByDefaultFor=Contact/adresă implicită pentru
 AddThirdParty=Creare terţ
 DeleteACompany=Şterge o societate
 PersonalInformations=Informaţii personale
@@ -315,54 +315,54 @@ SupplierCode=Cod furnizor
 CustomerCodeShort=Cod client
 SupplierCodeShort=Cod furnizor
 CustomerCodeDesc=Cod client, unic pentru toți clienți
-SupplierCodeDesc=Cod furnizor, unic pentru toți furnizori
+SupplierCodeDesc=Cod furnizor, unic pentru toți furnizorii
 RequiredIfCustomer=Obligatoriu, dacă un terţ este un client sau prospect
-RequiredIfSupplier=Obligatoriu dacă un terț este un furnizor
+RequiredIfSupplier=Obligatoriu dacă terțul este un furnizor
 ValidityControledByModule=Valabilitate controlată de modul
 ThisIsModuleRules=Reguli pentru acest modul
-ProspectToContact=Prospect de contact
+ProspectToContact=Prospect de contactat
 CompanyDeleted=Societatea " %s" a fost ştearsă din baza de date.
-ListOfContacts=Lista Contacte
-ListOfContactsAddresses=Lista Contacte
-ListOfThirdParties=Lista terților
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ListOfContacts=Listă contacte/adrese
+ListOfContactsAddresses=Lista contacte/adrese
+ListOfThirdParties=Listă terți
+ShowCompany=Terţ
+ShowContact=Contact-Adresă
 ContactsAllShort=Toate (fără filtru)
-ContactType=Tip Contact
-ContactForOrders=Contact Comenzi
-ContactForOrdersOrShipments=Contact Comenzi sau Livrari
-ContactForProposals=Contact  Ofertă
-ContactForContracts=Contact  Contracte
-ContactForInvoices=Contact  Facturi
+ContactType=Tip contact
+ContactForOrders=Contact comenzi
+ContactForOrdersOrShipments=Contact comenzi sau livrări
+ContactForProposals=Contact ofertă
+ContactForContracts=Contact contracte
+ContactForInvoices=Contact facturi
 NoContactForAnyOrder=Acest contact nu este  contact pentru nici o comanda
 NoContactForAnyOrderOrShipments=Acest contact nu este  contact pentru nicio comanda sau livrare
 NoContactForAnyProposal=Acest contact nu este contact pentru nicio ofertă comercială
 NoContactForAnyContract=Acest contact nu este  contact pentru nici un contract
 NoContactForAnyInvoice=Acest contact nu este  contact pentru nici o factură
 NewContact=Contact nou
-NewContactAddress=Contact nou
+NewContactAddress=Contact/adresă nouă
 MyContacts=Contactele mele
 Capital=Capital
-CapitalOf=Capital de % s
-EditCompany=Modifică societate
-ThisUserIsNot=This user is not a prospect, customer or vendor
-VATIntraCheck=Verifică
-VATIntraCheckDesc=ID-ul de TVA trebuie să includă prefixul țării. Linkul <b> %s </b> utilizează serviciul european de verificare a TVA-ului (VIES), care necesită acces la internet de pe serverul Dolibarr.
+CapitalOf=Capital de %s
+EditCompany=Modificare societate
+ThisUserIsNot=Acest utilizator nu este prospect, client sau furnizor  
+VATIntraCheck=Verificare
+VATIntraCheckDesc=Codul TVA trebuie să includă prefixul țării. Linkul <b> %s </b> utilizează serviciul european de verificare TVA (VIES), care necesită acces la internet de pe serverul Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verificați codul TV intracomunitar pe site-ul web al Comisiei Europene
-VATIntraManualCheck=De asemenea, puteți verifica manual pe site-ul web al Comisiei Europene <a href="%s" target="_blank"> %s </a>
-ErrorVATCheckMS_UNAVAILABLE=Verificare imposibilă. Verificaţi dacă serviciu nu este furnizat de către statul membru ( %s).
-NorProspectNorCustomer=Fără perspectivă, fără client
-JuridicalStatus=Tipul entității juridice
+VATIntraManualCheck=De asemenea, puteți verifica manual pe site-ul web al UE <a href="%s" target="_blank"> %s </a>
+ErrorVATCheckMS_UNAVAILABLE=Verificare imposibilă. Verificaţi dacă serviciul este furnizat de către statul membru ( %s).
+NorProspectNorCustomer=Nici prospect, nici client
+JuridicalStatus=Tip entitate juridică
 Staff=Angajati
-ProspectLevelShort=Potential
-ProspectLevel=Prospect potenţial
+ProspectLevelShort=Potenţial
+ProspectLevel=Potenţial prospect
 ContactPrivate=Privat
 ContactPublic=Partajat
 ContactVisibility=Vizibilitate
 ContactOthers=Altele
-OthersNotLinkedToThirdParty=Alţii, nelegate la un terţ
-ProspectStatus=Statut Prospect
+OthersNotLinkedToThirdParty=Alţii, nelegaţi la un terţ
+ProspectStatus=Status prospect
 PL_NONE=Niciunul
 PL_UNKNOWN=Necunoscut
 PL_LOW=Scăzut
@@ -372,87 +372,87 @@ TE_UNKNOWN=-
 TE_STARTUP=Startup
 TE_GROUP=Companie mare
 TE_MEDIUM=Companie medie
-TE_ADMIN=Guvernamental
+TE_ADMIN=Instituţie publică
 TE_SMALL=Companie mică
 TE_RETAIL=Vânzător cu amănuntul
 TE_WHOLE=Angrosist
 TE_PRIVATE=Persoană fizică
 TE_OTHER=Alt
-StatusProspect-1=De necontactat
-StatusProspect0=Niciodată contactat
+StatusProspect-1=Nu contacta
+StatusProspect0=Necontactat
 StatusProspect1=De contactat
 StatusProspect2=Contact în curs
-StatusProspect3=Contact realizat
-ChangeDoNotContact=Schimbă statutul la "De necontactat"
-ChangeNeverContacted=Schimbă statutul la "Niciodată  contactat"
+StatusProspect3=Contactat
+ChangeDoNotContact=Schimbă statusul la 'NU contacta'
+ChangeNeverContacted=Schimbă statusul la 'Necontactat'
 ChangeToContact=Schimbare stare în "De contactat"
-ChangeContactInProcess=Schimbă statutul la  "Contact în curs"
-ChangeContactDone=Schimbă statutul la  'Contact realizat'
-ProspectsByStatus=Prospectele pe status
+ChangeContactInProcess=Schimbă statusul la 'Contact în curs'
+ChangeContactDone=Schimbă statusul la 'Contactat'
+ProspectsByStatus=Prospecţi după status
 NoParentCompany=Niciunul
 ExportCardToFormat=Export fişă în format
 ContactNotLinkedToCompany=Contact nelegat la un terţ
 DolibarrLogin=Identificator utilizator
-NoDolibarrAccess=Niciun acces utilizator
+NoDolibarrAccess=Utilizator fără acces la Dolibarr
 ExportDataset_company_1=Terți (companii / fundații / persoane fizice) și proprietățile acestora
 ExportDataset_company_2=Persoanele de contact și proprietățile acestora
 ImportDataset_company_1=Terți și proprietățile acestora
-ImportDataset_company_2=Contacte / adrese și atribute suplimentare pentru terţi
-ImportDataset_company_3=Conturi bancare ale terților
-ImportDataset_company_4=Reprezentanți de vânzări terți (desemnați reprezentanți de vânzări / utilizatori în companii)
-PriceLevel=Nivelul prețului
-PriceLevelLabels=Etichete de nivel de preț
+ImportDataset_company_2=Contacte/adrese și atribute suplimentare pentru terţi
+ImportDataset_company_3=Conturi bancare Terți
+ImportDataset_company_4=Reprezentanți de vânzări ai terților (asociere reprezentanți vânzări/utilizatori la companii)
+PriceLevel=Nivel de preț
+PriceLevelLabels=Etichete nivel de preț
 DeliveryAddress=Adresă de livrare
 AddAddress=Adaugă adresă
-SupplierCategory=Categoria furnizorului
+SupplierCategory=Categorie furnizor
 JuridicalStatus200=Freelancer
 DeleteFile=Şterge fişier
-ConfirmDeleteFile=Sigur  doriţi să ştergeţi acest fişier?
+ConfirmDeleteFile=Sigur doriţi să ştergeţi acest fişier?
 AllocateCommercial=Asociat la reprezentant vânzări
-Organization=Instituția
+Organization=Organizaţie
 FiscalYearInformation=An fiscal
 FiscalMonthStart=Luna de început a anului fiscal
-SocialNetworksInformation=Social networks
-SocialNetworksFacebookURL=Facebook URL
-SocialNetworksTwitterURL=Twitter URL
-SocialNetworksLinkedinURL=Linkedin URL
-SocialNetworksInstagramURL=Instagram URL
-SocialNetworksYoutubeURL=Youtube URL
-SocialNetworksGithubURL=Github URL
+SocialNetworksInformation=Reţele sociale
+SocialNetworksFacebookURL=URL Facebook
+SocialNetworksTwitterURL=URL Twitter
+SocialNetworksLinkedinURL=URL Linkedin
+SocialNetworksInstagramURL=URL Instagram
+SocialNetworksYoutubeURL=URL Youtube
+SocialNetworksGithubURL=URL Github
 YouMustAssignUserMailFirst=Trebuie să creați un e-mail pentru acest utilizator înainte de a putea adăuga o notificare prin e-mail.
 YouMustCreateContactFirst=Pentru a putea adaugă notificări pe email, este necesară definirea unor contacte pentru terţi cu adresa de email validă
 ListSuppliersShort=Lista furnizori
-ListProspectsShort=Lista prospecte
-ListCustomersShort=Lista clienți
-ThirdPartiesArea=Terțe/Contacte
-LastModifiedThirdParties=Latest %s modified Third Parties
-UniqueThirdParties=Totalul terţilor
+ListProspectsShort=Listă prospecţi
+ListCustomersShort=Listă clienți
+ThirdPartiesArea=Terți/Contacte
+LastModifiedThirdParties=Ultimii %sTerţi modificaţi
+UniqueThirdParties=Total terţi
 InActivity=Deschis
 ActivityCeased=Închis
 ThirdPartyIsClosed=Terțul este închis
-ProductsIntoElements=Ultimele produse / servicii in %s
-CurrentOutstandingBill=Facturi in suspensie curente
+ProductsIntoElements=Ultimele produse/servicii în %s
+CurrentOutstandingBill=Facturi neachitate curente
 OutstandingBill=Max. limită credit
 OutstandingBillReached=Limită credit depăsită 
-OrderMinAmount=Suma minim a comenzii
-MonkeyNumRefModelDesc=Returnați un număr cu formatul %syymm-nnnn pentru codul clientului și %syymm-nnnn pentru codul furnizorului unde yy este anul, mm este luna și nnnn este o secvență fără pauză și nici o revenire la 0.
-LeopardNumRefModelDesc=Codul este liber fîrî verificare. Acest cod poate fi modificat în orice moment.
-ManagingDirectors=Nume Manager(i) nume (CEO, director, preşedinte...)
-MergeOriginThirdparty=Duplica terț (terț dorit să-l ștergeți)
-MergeThirdparties=Imbina terti
+OrderMinAmount=Suma minimă a comenzii
+MonkeyNumRefModelDesc=Returnați un număr cu formatul %syymm-nnnn pentru codul client și %syymm-nnnn pentru codul furnizor unde yy este anul, mm este luna și nnnn este o secvență fără pauză și nici o revenire la 0.
+LeopardNumRefModelDesc=Codul este liber fără verificare. Acest cod poate fi modificat în orice moment.
+ManagingDirectors=Nume manager(i) (CEO, director, preşedinte...)
+MergeOriginThirdparty=Terț duplicat (terțul dorit a fi șters)
+MergeThirdparties=Îmbină terţi
 ConfirmMergeThirdparties=Sunteți sigur că doriți să fuzionați aceast terț cu cel curent? Toate obiectele legate (facturi, comenzi, ...) vor fi mutate la un terț curent, iar terțul va fi șters.
-ThirdpartiesMergeSuccess=Părțile terțe au fost fuzionate
+ThirdpartiesMergeSuccess=Terții au fost unificaţi
 SaleRepresentativeLogin=Autentificare reprezentant vânzări
 SaleRepresentativeFirstname=Numele reprezentantului vânzări
 SaleRepresentativeLastname=Prenumele reprezentantului vânzări
 ErrorThirdpartiesMerge=A apărut o eroare la ștergerea terților Verificați jurnalul. S-a revenit la setarile anterioare.
-NewCustomerSupplierCodeProposed=Codul clientului sau furnizorului utilizat deja, este sugerat un nou cod
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+NewCustomerSupplierCodeProposed=Codul clientului sau furnizorului utilizat deja, introduceţi un alt cod
+KeepEmptyIfGenericAddress=Lasă acest câmp gol dacă această adresă este generică
 #Imports
 PaymentTypeCustomer=Tip de plată - Client
-PaymentTermsCustomer=Conditii de plata - Client
+PaymentTermsCustomer=Condiţii de plată - Client
 PaymentTypeSupplier=Tip de plată - Furnizor
-PaymentTermsSupplier=Termen de plată - furnizor
-PaymentTypeBoth=Payment Type - Customer and Vendor
+PaymentTermsSupplier=Termen de plată - Furnizor
+PaymentTypeBoth=Tip plată - Client şi Furnizor
 MulticurrencyUsed=Utilizați mai multe monede
 MulticurrencyCurrency=Moneda
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 5a9926309ff..ea0496677f0 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Taxa sociala / fiscala
 SocialContributions=Taxe sociale sau fiscale
 SocialContributionsDeductibles=Taxe deductibile
 SocialContributionsNondeductibles=Taxe nedeductibile
+DateOfSocialContribution=Data taxei fiscale sau sociale
 LabelContrib=Eticheta contribuție
 TypeContrib=Tip de contribuție
 MenuSpecialExpenses=Cheltuieli speciale
@@ -121,7 +122,7 @@ Turnover=Cifra de afaceri facturată
 TurnoverCollected=Cifra de afaceri colectată
 SalesTurnoverMinimum=Cifra de afaceri minimă
 ByExpenseIncome= După cheltuieli & venituri
-ByThirdParties=Pe terţi
+ByThirdParties=După terţi
 ByUserAuthorOfInvoice=După autorul facturii
 CheckReceipt=Borderou de cecuri remise
 CheckReceiptShort=Borderou cecuri
@@ -157,9 +158,9 @@ SeeReportInInputOutputMode=Vedeți %sanaliza plăților%s pentru un calcul al pl
 SeeReportInDueDebtMode=Vedeți %sanaliza facturilor%s pentru un calcul bazat pe facturi înregistrate cunoscute, chiar dacă acestea nu sunt încă înregistrate în registru.
 SeeReportInBookkeepingMode=Vedeți <b> %sraportul contabil%s </b> pentru un calcul la <b> Tabelul registrului contabil </b>
 RulesAmountWithTaxIncluded=- Valoarea afişată este cu toate taxele incluse
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the billing date of invoices and on the due date for expenses or tax payments. For salaries defined with Salary module, the value date of payment is used.
+RulesResultDue=- Include facturi restante, cheltuieli, TVA, donații indiferent dacă sunt plătite sau nu. Include și salariile plătite. <br>- se bazează pe data de emitere a facturilor și data scadenței pentru cheltuieli sau plăți fiscale. Pentru salariile definite cu modulul Salarii, se utilizează data plăţii. 
 RulesResultInOut=- Include plățile efective pe facturi, cheltuieli,TVA și salarii. <br> - Se ia  în calcul data plăţii facturilor, cheltuielilor, TVA-ului  și salariilor .
-RulesCADue=- It includes the customer's due invoices whether they are paid or not. <br>- It is based on the billing date of these invoices.<br>
+RulesCADue=- Include facturile client scadente indiferent dacă sunt încasate sau nu. <br>- Se bazează pe data emiterii acestor facturi.<br> 
 RulesCAIn=- include toate plățile efective ale facturilor primite de la clienți. <br> - se bazează pe data de plată a acestor facturi <br>
 RulesCATotalSaleJournal=Acesta include toate liniile de credit din jurnalul de vânzare.
 RulesAmountOnInOutBookkeepingRecord=Acesta include înregistrarea în registrul dvs. cu conturi contabile care are grupul "CHELTUIELI" sau "VENIT"
@@ -255,10 +256,12 @@ TurnoverbyVatrate=Cifra de afaceri facturată prin rata impozitului pe vânzare
 TurnoverCollectedbyVatrate=Cifra de afaceri colectată prin rata impozitului pe vânzare
 PurchasebyVatrate=Cumpărare prin rata de impozitare a vânzării
 LabelToShow=Etichetă scurta
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
-RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
-RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
+PurchaseTurnover=Cifră de afaceri achiziţii
+PurchaseTurnoverCollected=Cifra de afaceri colectată achiziţii
+RulesPurchaseTurnoverDue=- Include facturile restante la furnizori indiferent dacă sunt achitate sau nu. - <br>Se bazează pe data de emitere a acestor facturi.<br>
+RulesPurchaseTurnoverIn=- Include toate plățile efectuate ale facturilor de la furnizori. <br>- Se bazează pe data la care s-au plătit aceste facturi<br> 
+RulesPurchaseTurnoverTotalPurchaseJournal=Include toate liniile debitoare din jurnalul de cumpărări
+ReportPurchaseTurnover=Cifra de afaceri achiziţii facturate
+ReportPurchaseTurnoverCollected=Cifra de afaceri colectată achiziţii
+IncludeVarpaysInResults = Include plăţile diverse în rapoarte
+IncludeLoansInResults =  Includeți creditele - împrumuturile în rapoarte
diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
index eaf5803e17c..cd470129815 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Servicii active
 MenuExpiredServices=Servicii expirate
 MenuClosedServices=Servicii închise
 NewContract=Contract nou
-NewContractSubscription=Contract / Abonament nou
+NewContractSubscription=Contract sau abonament nou 
 AddContract=Crează contract
 DeleteAContract=Şterge contract
 ActivateAllOnContract=Activați toate serviciile
@@ -99,6 +99,6 @@ TypeContact_contrat_internal_SALESREPFOLL=Sales reprezentative următoarele-up c
 TypeContact_contrat_external_BILLING=Contact client facturare contract
 TypeContact_contrat_external_CUSTOMER=Contact client urmărire contract
 TypeContact_contrat_external_SALESREPSIGN=Contact client semnarecontract
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Ascunde serviciile închise în mod implicit
+ShowClosedServices=Afişare Servicii închise
+HideClosedServices=Ascundere Servicii închise 
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 677540e3313..352feb51e3e 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -6,28 +6,28 @@ Permission23102 = Creare/Modificare job programat
 Permission23103 = Şterge Job programat
 Permission23104 = Execută Job programat
 # Admin
-CronSetup= Setare Managementul joburilor programate
-URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+CronSetup=Setare Managementul joburilor programate
+URLToLaunchCronJobs=URL pentru a verifica și a lansa sarcini cron calificate 
 OrToLaunchASpecificJob=Sau pentru a verifica și  a lansa un anumit job
 KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Linie de comanda pentru a verifica și a lansa sarcini cron calificate
 CronExplainHowToRunUnix=Pe mediul Unix veţi  utiliza instrumentul crontab pentru a  rula urmatoarea  linia de comanda la fiecare 5 minute
-CronExplainHowToRunWin=Pe mediul Microsoft(tm) Windows puteţi utiliza instrumentul Scheduled task pentru a rula linia de comanda la fiecare 5 minute
+CronExplainHowToRunWin=În mediul Microsoft (tm) Windows, puteți utiliza instrumentele programate pentru a executa linia de comandă la fiecare 5 minute
 CronMethodDoesNotExists= Clasa %s nu conține metoda %s
-CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s.
-CronJobProfiles=List of predefined cron job profiles
+CronJobDefDesc=Profilele sarcinilor Cron sunt definite în fișierul descriptor de module. Când modulul este activat, acestea sunt încărcate și disponibile, astfel încât să puteți administra lucrările din meniul instrumentelor de administrare%s.
+CronJobProfiles=Lista profilurilor sarcinilor cron predefinite
 # Menu
 EnabledAndDisabled=Activat și dezactivat
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Ultimul rezultat
+CronLastResult=Ultimul cod rezultat
 CronCommand=Comandă
 CronList=Joburi programate
 CronDelete=Şterge Joburi programate
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
-CronExecute=Launch scheduled job
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now?
-CronInfo=Scheduled job module allows to schedule jobs to execute them automatically. Jobs can also be started manually.
+CronConfirmDelete=Sigur doriți să ștergeți aceste lucrări programate?
+CronExecute=Lansați lucrările programate? 
+CronConfirmExecute=Sunteți sigur că doriți să executați aceste lucrări programate acum?
+CronInfo=Modulul de lucrări programate permite programarea lucrărilor pentru a le executa automat. Lucrările pot fi pornite și manual.
 CronTask=Job
 CronNone=Niciunul
 CronDtStart=Dată începere
@@ -42,8 +42,8 @@ CronModule=Modulul
 CronNoJobs=Niciun job înregistrat
 CronPriority=Prioritate
 CronLabel=Etichetă
-CronNbRun=Nr. lansări
-CronMaxRun=Max number launch
+CronNbRun=Numărul de lansări 
+CronMaxRun=Număr maxim de lansări
 CronEach=Fiecare
 JobFinished=Job lansat şi terminat
 #Page card
@@ -55,29 +55,30 @@ CronSaveSucess=Salvare cu succes
 CronNote=Comenteaza
 CronFieldMandatory=Câmpurile %s sunt obligatorii
 CronErrEndDateStartDt=Data de sfârşit nu poate fi înaintea datei de început
-StatusAtInstall=Status at module installation
+StatusAtInstall=Stare la instalarea modulului
 CronStatusActiveBtn=Activare
 CronStatusInactiveBtn=Dezactivare
 CronTaskInactive=Acest post este dezactivat
 CronId=Id
-CronClassFile=Filename with class
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value for module is<br><i>product</i>
-CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory). <BR> For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/<u>product.class.php</u>, the value for class file name is<br><i>product/class/product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is<br><i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is<br><i>fetch</i>
-CronArgsHelp=The method arguments. <BR> For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be<br><i>0, ProductRef</i>
+CronClassFile=Nume fișier cu clasă
+CronModuleHelp=Numele directorului modulului Dolibarr (lucrați și cu modul Dolibarr extern). <BR> De exemplu, pentru a apela metoda de fetch Dolibarr Produs obiect/htdocs / <u> produs </u> /class/product.class.php, valoarea pentru modul este <br> <i> produs </i>
+CronClassFileHelp=Calea relativă și numele fișierului de încărcat (calea este relativă la directorul rădăcină web). <BR> De exemplu, pentru a apela metoda fetch a obiectului produsului Dolibarr htdocs / produs / clasa / <u> product.class.php </u>, valoarea pentru numele fişierului clasei este <br> <i> produs/ clasa / product.class.php </i>
+CronObjectHelp=Numele obiectului de încărcat . <BR> De exemplu, pentru a apela metoda fetch a produsului Dolibarr obiect/htdocs / produs / clasa / product.class.php, valoarea pentru numele fişierului clasei este<br> <i> Produs </i>
+CronMethodHelp=Metoda obiect pentru lansare.<BR> De exemplu, pentru a apela metoda fetch a produsului Dolibarr obiect/htdocs/product/class/product.class.php, valoarea metodei este <br> <i> preluare </i>
+CronArgsHelp=Argumentele metodei. <BR> De exemplu, pentru a apela metoda de preluare a produsului Dolibarr  object /htdocs/product/class/product.class.php, valoarea parametrilor poate fi <br> <i> 0, ProductRef </i>
 CronCommandHelp=Linia de comandă de sistem pentru a executa.
 CronCreateJob=Creare job programat
 CronFrom=De la
 # Info
 # Common
 CronType=Tip job
-CronType_method=Call method of a PHP Class
+CronType_method=Metoda de apel a unei clase PHP
 CronType_command=Comandă shell
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
-CronCannotLoadObject=Class file %s was loaded, but object %s was not found into it
-UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Module Instrumente - Joburi programate'' pentru a vedea și edita job-urile programate.
+CronCannotLoadClass=Nu se poate încărca fișierul de clasă %s (pentru a folosi clasa %s)
+CronCannotLoadObject=Fișier de clasă %s a fost încărcat, dar obiectul %s nu a fost găsit în el
+UseMenuModuleToolsToAddCronJobs=Mergi în meniu "<a href="%s">Acasă - Instrumente administrare - Joburi programate</a>" pentru a vedea şi edita joburile programate.
 JobDisabled=Job dezactivat
 MakeLocalDatabaseDumpShort=Backup local baza de date
-MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, number of backup files to keep
-WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run.
+MakeLocalDatabaseDump=Creați o bază de date locală. Parametrii sunt: ​​compresie ("gz" sau "bz" sau "none"), tipul de backup (mysql, pgsql, auto) 1, "auto" sau nume de fișier de construit, număr de fișiere de rezervă de păstrat
+WarningCronDelayed=Atenție, în scopul performanței, indiferent de data următoare a executării activităţilor activate, este posibil ca activităţile dvs. să fie întârziate la maximum %s ore înainte de a rula
+DATAPOLICYJob=Curățător de date și anonimizator
diff --git a/htdocs/langs/ro_RO/deliveries.lang b/htdocs/langs/ro_RO/deliveries.lang
index e0e52b5ecf7..53e4e7d825b 100644
--- a/htdocs/langs/ro_RO/deliveries.lang
+++ b/htdocs/langs/ro_RO/deliveries.lang
@@ -2,7 +2,7 @@
 Delivery=Livrare
 DeliveryRef=Ref Livrare
 DeliveryCard=Chitanta card
-DeliveryOrder=Delivery receipt
+DeliveryOrder=Bon de livrare
 DeliveryDate=Data de livrare
 CreateDeliveryOrder=Generați chitanța de livrare
 DeliveryStateSaved=Stare livrare salvata
diff --git a/htdocs/langs/ro_RO/dict.lang b/htdocs/langs/ro_RO/dict.lang
index f52f8c045af..4454b749764 100644
--- a/htdocs/langs/ro_RO/dict.lang
+++ b/htdocs/langs/ro_RO/dict.lang
@@ -290,7 +290,7 @@ CurrencyXOF=CFA BCEAO Franci
 CurrencySingXOF=CFA franc BCEAO
 CurrencyXPF=PCP franci
 CurrencySingXPF=PCP franc
-CurrencyCentEUR=cents
+CurrencyCentEUR=procente
 CurrencyCentSingEUR=cent
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
index 61a0548379c..e3b5182b9c8 100644
--- a/htdocs/langs/ro_RO/donations.lang
+++ b/htdocs/langs/ro_RO/donations.lang
@@ -16,7 +16,7 @@ DonationStatusPromiseNotValidatedShort=Schiţă
 DonationStatusPromiseValidatedShort=Validată
 DonationStatusPaidShort=Plătită
 DonationTitle=Chitanţă donaţie
-DonationDate=Donation date
+DonationDate=Data donaţiei
 DonationDatePayment=Data Plata 
 ValidPromess=Validează promisiune
 DonationReceipt=Chitanţă donaţie
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 9741c368f4d..2a7f2df8659 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -23,7 +23,7 @@ ErrorFailToGenerateFile=Nu a reușit să genereze fișierul"<b> %s </b>".
 ErrorThisContactIsAlreadyDefinedAsThisType=Acest contact este deja definit ca persoană de contact pentru acest tip.
 ErrorCashAccountAcceptsOnlyCashMoney=Acest cont bancar este un cont de bani, aşa că acceptă plăţi de tip cash numai.
 ErrorFromToAccountsMustDiffers=Sursa obiective şi conturi bancare trebuie să fie diferite.
-ErrorBadThirdPartyName=Valoare gresită pentru numele terțului
+ErrorBadThirdPartyName=Valoare greşită pentru numele terțului
 ErrorProdIdIsMandatory=%s este obligatoriu
 ErrorBadCustomerCodeSyntax=Bad sintaxă pentru codul de client
 ErrorBadBarCodeSyntax=Sintaxă greșită pentru codul de bare. Poate s-a setat un tip de cod de bare greșit sau ați definit o mască de cod de bare pentru numerotare care nu se potrivește cu valoarea scanată.
@@ -36,7 +36,7 @@ ErrorBadSupplierCodeSyntax=Sintaxă greșită pentru codul furnizorului
 ErrorSupplierCodeRequired=Codul furnizorului este necesar
 ErrorSupplierCodeAlreadyUsed=Codul furnizorului deja folosit
 ErrorBadParameters=Bad parametrii
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=Parametri eronaţi sau parametri lipsă
 ErrorBadValueForParameter=Valoarea  incorectă  '%s'  pentru parametrul '%s'
 ErrorBadImageFormat=Fișier de imagine nu are un format acceptat (PHP dvs. nu acceptă funcții pentru a converti imagini de acest format)
 ErrorBadDateFormat=&quot;%s&quot; Valoarea are formatul de dată greşit
@@ -60,7 +60,7 @@ ErrorPartialFile=Fişierul nu a primit complet de server.
 ErrorNoTmpDir=Temporare directy %s nu există.
 ErrorUploadBlockedByAddon=Încărcaţi blocat de un PHP / Apache plug-in.
 ErrorFileSizeTooLarge=Dimensiunea fişierului este prea mare.
-ErrorFieldTooLong=Field %s is too long.
+ErrorFieldTooLong=Câmpul %s este prea lung.
 ErrorSizeTooLongForIntType=Prea mult timp pentru tipul int (%s cifre maxim) Dimensiune
 ErrorSizeTooLongForVarcharType=Prea mult timp pentru tipul de coarde (%s de caractere maxim) Dimensiune
 ErrorNoValueForSelectType=Completaţi valorile pentru lista de selecţie
@@ -92,13 +92,13 @@ ErrorSpecialCharNotAllowedForField=Caractere speciale nu sunt permise pentru dom
 ErrorNumRefModel=O referire există în baza de date (%s) şi nu este compatibilă cu această regulă de numerotare. înregistra Remove sau redenumite de referinţă pentru a activa acest modul.
 ErrorQtyTooLowForThisSupplier=Cantitate prea mică pentru acest furnizor sau niciun preț definit pentru acest produs pentru acest furnizor
 ErrorOrdersNotCreatedQtyTooLow=Unele comenzi nu au fost create datorită cantităților prea mici
-ErrorModuleSetupNotComplete=Setup of module %s looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=Configurarea modulului %s pare incompletă. Mergi în Acasă - Setup - Module şi finalizează configurarea.
 ErrorBadMask=Eroare pe masca
 ErrorBadMaskFailedToLocatePosOfSequence=Eroare, fără a masca numărul de ordine
 ErrorBadMaskBadRazMonth=Eroare, Bad resetare valoarea
 ErrorMaxNumberReachForThisMask=Numărul maxim atins pentru această mască
 ErrorCounterMustHaveMoreThan3Digits=Contorul trebuie sa aiba mai mult de 3 cifre
-ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorSelectAtLeastOne=Eroare, selectează cel puţin o înregistrare.
 ErrorDeleteNotPossibleLineIsConsolidated=Ștergerea nu este posibilă deoarece înregistrarea este legată de o tranzacție bancară care este conciliată
 ErrorProdIdAlreadyExist=%s se atribuie o altă treime
 ErrorFailedToSendPassword=Nu a reuşit să trimită parola
@@ -119,9 +119,9 @@ ErrorLoginDoesNotExists=User login <b>cu %s</b> nu a putut fi găsit.
 ErrorLoginHasNoEmail=Acest utilizator nu are nici o adresa de e-mail. Procesul de anulată.
 ErrorBadValueForCode=Bad valoare tipuri de cod. Încercaţi din nou cu o nouă valoare ...
 ErrorBothFieldCantBeNegative=%s Domenii şi %s nu poate fi atât negativ
-ErrorFieldCantBeNegativeOnInvoice=Field <strong>%s</strong> cannot be negative on this type of invoice. If you need to add a discount line, just create the discount first (from field '%s' in thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorFieldCantBeNegativeOnInvoice=Câmpul <strong>%s</strong> nu poate fi negativ pe acest tip de factură. Dacă vrei să adaugi o linie de discount, creează mai discountul (în câmpul '%s' din fişa terţului) şi aplică-l pe factură.  
+ErrorLinesCantBeNegativeForOneVATRate=Totalul liniilor (fără taxe) nu poate fi negativ pentru o cotă TVA diferită de zero  (S-a găsit un total negativ cota TVA <b>%s</b>%%).
+ErrorLinesCantBeNegativeOnDeposits=Liniile nu pot fi negative într-un depozit. Dacă faceți acest lucru, vă veţi confrunta cu probleme atunci când veți consuma din stoc. 
 ErrorQtyForCustomerInvoiceCantBeNegative=Cantitatea pentru linia unei facturi client nu poate fi negativa.
 ErrorWebServerUserHasNotPermission=Contul de utilizator <b>%s</b> folosite pentru a executa serverul de web nu are permisiunea, pentru că
 ErrorNoActivatedBarcode=Niciun tip de coduri de bare activat
@@ -130,14 +130,15 @@ ErrNoZipEngine=Nu există niciun motor pentru a arhiva/dezarhiva fișierul %s î
 ErrorFileMustBeADolibarrPackage=Fșierul %s  trebuie să fie un pachet zip Dolibarr
 ErrorModuleFileRequired=Trebuie să selectați un fișier pachet al modulului Dolibarr
 ErrorPhpCurlNotInstalled=PHP CURLnu este instalat, acest lucru este esențial pentru comunicarea cu Paypal
-ErrorFailedToAddToMailmanList=Eşec la adăugarea  %s la lista de Mailman % s sau la baza SPIP
-ErrorFailedToRemoveToMailmanList=Eşec la înlăturarea  %s din lista de Mailman % s sau din baza SPIP
+ErrorFailedToAddToMailmanList=Eşec la adăugarea %s la lista de Mailman %s sau la baza SPIP
+ErrorFailedToRemoveToMailmanList=Eşec la înlăturarea %s din lista de Mailman %s sau din baza SPIP
 ErrorNewValueCantMatchOldValue=Noua valoare nu poate fi egală cu cea veche
 ErrorFailedToValidatePasswordReset=Eşec la resetarea parolei. Este posibil săfi fost deja folosit acest link ( acest link poate fi folosit doar o dată). Dacă nu, încercați să reporniți şi reiniţializaţi procesul.
 ErrorToConnectToMysqlCheckInstance=Conectarea la baza de date eșuată. Verificați serverul de bază de date că functionează (de exemplu, cu mysql/mariadb, îl puteți lansa din linia de comandă cu 'sudo service mysql start').
 ErrorFailedToAddContact=Eşuare la adaugare contact
-ErrorDateMustBeBeforeToday=Data nu poate fi mai mare decât azi
-ErrorPaymentModeDefinedToWithoutSetup=Un modul de plată a fost setat la tipul% s, dar setarea modulului Facturi nu a fost finalizată  a arăta pentru acest mod de plată.
+ErrorDateMustBeBeforeToday=Data trebuie să fie mai mică decât azi
+ErrorDateMustBeInFuture=Data trebuie să fie mai mare decât azi
+ErrorPaymentModeDefinedToWithoutSetup=Un modul de plată a fost setat la tipul %s, dar setarea modulului Facturi nu a fost finalizată  a arăta pentru acest mod de plată.
 ErrorPHPNeedModule=Eroare, PHP trebuie să aibă modul <b>%s</b> instalat pentru a utiliza această funcţionalitate.
 ErrorOpenIDSetupNotComplete=Trebuie setat fișier de configurare Dolibarr pentru a permite autentificarea OpenID, dar URL-ul serviciului OpenID nu este definit în constanta %s
 ErrorWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere
@@ -184,7 +185,7 @@ ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Definire greșită pentru Menu A
 ErrorSavingChanges=A apărut o eroare la salvarea modificărilor
 ErrorWarehouseRequiredIntoShipmentLine=Depozitul este obligatoriu pe linie pentru livrare
 ErrorFileMustHaveFormat=Fisierul trebuie sa aiba format '%s'
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
+ErrorFilenameCantStartWithDot=Numele fişierului nu poate începe cu un '.'
 ErrorSupplierCountryIsNotDefined=Țara pentru acest furnizor nu este definită. Corectați mai întâi acest lucru.
 ErrorsThirdpartyMerge=Nu s-au putut îmbina cele două înregistrări. Cererea a fost anulată.
 ErrorStockIsNotEnoughToAddProductOnOrder=Stocul nu este suficient pentru produsul %s pentru a-l adăuga într-o comandă nouă.
@@ -201,7 +202,7 @@ ErrorPhpMailDelivery=Verificați dacă nu utilizați un număr prea mare de dest
 ErrorUserNotAssignedToTask=Utilizatorul trebuie să fie atribuit sarcinii pentru a putea introduce timpul consumat.
 ErrorTaskAlreadyAssigned=Sarcină deja atribuită utilizatorului
 ErrorModuleFileSeemsToHaveAWrongFormat=Pachetul de module pare să aibă un format greșit.
-ErrorModuleFileSeemsToHaveAWrongFormat2=At least one mandatory directory must exists into zip of module: <strong>%s</strong> or <strong>%s</strong>
+ErrorModuleFileSeemsToHaveAWrongFormat2=Cel puțin un director trebuie să existe obligatoriu în arhiva zip a modulului: <strong>%s</strong> sau <strong>%s</strong> 
 ErrorFilenameDosNotMatchDolibarrPackageRules=Numele pachetului de module (<strong> %s </strong>) nu se potrivește cu sintaxa numelui așteptat: <strong> %s </strong>
 ErrorDuplicateTrigger=Eroare, numele de declanșare duplicat  %s. Deja încărcat de la %s.
 ErrorNoWarehouseDefined=Eroare, nu au fost definite depozite.
@@ -222,28 +223,31 @@ ErrorDuringChartLoad=Eroare la încărcarea schemei de conturi. În cazul în ca
 ErrorBadSyntaxForParamKeyForContent=Sintaxă greşită pentru parametru keyforcontent. Trebuie să aibă o valoare începând cu %s sau %s
 ErrorVariableKeyForContentMustBeSet=Eroare, trebuie să fie setată constanta cu numele %s (cu conținut de text care trebuie afișat) sau %s (cu adresa URL externă de afișat).
 ErrorURLMustStartWithHttp=URL-ul %s trebuie să înceapă cu http:// sau https://
-ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Error, delete payment linked to a closed invoice is not possible.
-ErrorSearchCriteriaTooSmall=Search criteria too small.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Objects must have status 'Active' to be disabled
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status 'Draft' or 'Disabled' to be enabled
-ErrorNoFieldWithAttributeShowoncombobox=No fields has property 'showoncombobox' into definition of object '%s'. No way to show the combolist.
-ErrorFieldRequiredForProduct=Field '%s' is required for product %s
-ProblemIsInSetupOfTerminal=Problem is in setup of terminal %s.
-ErrorAddAtLeastOneLineFirst=Add at least one line first
-ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, record is already transferred in accounting, deletion is not possible.
-ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Error, language is mandatory if you set the page as a translation of another one.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Error, language of translated page is same than this one.
-ErrorBatchNoFoundForProductInWarehouse=No lot/serial found for product "%s" in warehouse "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this lot/serial for product "%s" in warehouse "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
-ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
-ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorNewRefIsAlreadyUsed=Eroare, noua referintă este deja utilizată
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Eroare, ştergerea unei plăţi asociate la o factură închisă nu este posibilă.
+ErrorSearchCriteriaTooSmall=Criteriul de căutare este prea scurt.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Obiectele trebuie să aibă statusul 'Activ' pentru a putea fi dezactivate
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Obiectele trebuie să aibă statusul 'Schiţă' sau 'Dezactivat' pentru a fi activate 
+ErrorNoFieldWithAttributeShowoncombobox=Nici un câmp nu are proprietatea 'showoncombobox' în definiţia obiectului '%s'. Nu se poate afişa lista combo.
+ErrorFieldRequiredForProduct=Câmpul '%s' este obligatoriu de completat pentru produsul %s
+ProblemIsInSetupOfTerminal=Problema este la configurarea terminalului %s.
+ErrorAddAtLeastOneLineFirst=Adaugă cel puţin o linie mai întâi
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Eroare, tranzacţia este deja transferată în contabilitate, ştergerea nu este posibilă.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Eroare, setarea limbii este obligatorie dacă setați pagina ca o traducere a alteia.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Eroare, limba paginii traduse este aceeași cu cea iniţială.
+ErrorBatchNoFoundForProductInWarehouse=Nici un lot/serie găsită pentru produsul "%s" din depozitul "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Cantitate insuficientă de produs "%s" din lot/serie în depozitulul "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Doar 1 câmp din 'Grupare după' este posibil (celelalte sunt ignorate)
+ErrorTooManyDifferentValueForSelectedGroupBy=S-au găsit prea multe valori diferite (mai multe de <b>%s</b>) pentru câmpul '<b>%s</b>', de aceea nu se poate folosi pentru 'Grupare după' în grafice. Câmpul 'Grupare după' a fost eliminat. Poate ai vrut să-l foloseşti ca axa-X ? 
+ErrorReplaceStringEmpty=Eroare, şirul înlocuitor este gol
+ErrorProductNeedBatchNumber=Eroare, produsul '<b>%s</b>' necesită un număr de lot/serie
+ErrorProductDoesNotNeedBatchNumber=Eroare, produsul '<b>%s</b>' nu acceptă un număr de lot/serie
+ErrorFailedToReadObject=Eroare, nu am putut citi tipul obiectului <b>%s</b>
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parametrul tău PHP upload_max_filesize (%s) este mai mare decât paramentrul PHP post_max_size (%s). Aceasta nu este o configuraţie consistentă.
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningMandatorySetupNotComplete=Click aici pentru a seta parametrii obligatorii
+WarningEnableYourModulesApplications=Click aici pentru a activa modulele şi aplicaţiile tale
 WarningSafeModeOnCheckExecDir=Atenţie, PHP <b>safe_mode</b> opţiune este pe atât de comandă trebuie să fie depozitate într-un director declarate de <b>safe_mode_exec_dir</b> parametru PHP.
 WarningBookmarkAlreadyExists=Un marcaj cu acest titlu sau acest obiectiv (URL) există deja.
 WarningPassIsEmpty=Atenţie, parola baza de date este gol. Aceasta este o gaura de securitate. Ar trebui să adăugaţi o parolă pentru a vă baza de date şi să vă schimbaţi conf.php fişier, pentru a reflecta acest lucru.
@@ -264,5 +268,5 @@ WarningAnEntryAlreadyExistForTransKey=Există deja o intrare pentru cheia de tra
 WarningNumberOfRecipientIsRestrictedInMassAction=Avertisment, numărul destinatarului diferit este limitat la <b> %s </b> când se utilizează acțiunile de masă din liste
 WarningDateOfLineMustBeInExpenseReportRange=Avertisment, data liniei nu este în intervalul raportului de cheltuieli
 WarningProjectClosed=Proiectul este închis. Trebuie să-l redeschideți mai întâi.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
-WarningFailedToAddFileIntoDatabaseIndex=Warnin, failed to add file entry into ECM database index table
+WarningSomeBankTransactionByChequeWereRemovedAfter=Anumite tranzacţii bancare au fost eliminate după ce a fost generat extrasul care le includea. Aşa că numărul de cecuri şi totalul extrasului pot diferi de cele din listă.
+WarningFailedToAddFileIntoDatabaseIndex=Avertizare, nu am putut adăuga fişierul în tabela index a ECM
diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
index b77635e9c98..34a37b99469 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -26,6 +26,8 @@ FieldTitle=Domeniul titlu
 NowClickToGenerateToBuildExportFile=Acum, selectați formatul de fișier în caseta combo și faceți clic pe "Generare" pentru a construi fișierul de export ...
 AvailableFormats=Formate disponibile
 LibraryShort=Biblioteca
+ExportCsvSeparator=Separator caractere CSV 
+ImportCsvSeparator=Separator caractere CSV 
 Step=Pasul
 FormatedImport=Asistent import
 FormatedImportDesc1=Acest modul vă permite să actualizați datele existente sau să adăugați obiecte noi în baza de date dintr-un fișier fără cunoștințe tehnice, utilizând un asistent.
@@ -37,7 +39,7 @@ FormatedExportDesc3=Când sunt selectate datele de export, puteți alege formatu
 Sheet=Foaie
 NoImportableData=Nu importable de date (nu cu modul de definiţii, pentru a permite importul de date)
 FileSuccessfullyBuilt=Fișierul generat
-SQLUsedForExport=SQL Request used to extract data
+SQLUsedForExport=Interogare SQL utilizată pentru extragerea datelor
 LineId=Id-ul de linie
 LineLabel=Eticheta linie
 LineDescription=Descriere de linie
@@ -113,7 +115,7 @@ ExportDateFilter=AAAA, AAAALL, AAAALLZZ: filtre pe un an / lună / zi <br> AAAA
 ExportNumericFilter=Filtrele NNNNN cu o valoare <br> NNNNN + NNNNN filtrează peste un interval de valori <br> Filtre NNNNN prin valori mai mici <br>> Filtre NNNNN prin valori mai mari
 ImportFromLine=Importul pornind de la linia numărul 
 EndAtLineNb=Sfârșit la linia numărul 
-ImportFromToLine=Limit range (From - To). Eg. to omit header line(s).
+ImportFromToLine=Interval limită (De la - Până la). Ex. pentru a omite linia(ile) de cap de tabel.  
 SetThisValueTo2ToExcludeFirstLine=De exemplu, setați această valoare la 3 pentru a exclude primele 2 linii. <br> Dacă liniile de antet NU sunt omise, aceasta va duce la mai multe erori în simularea importului.
 KeepEmptyToGoToEndOfFile=Păstrați acest câmp gol pentru a procesa toate liniile până la sfârșitul fișierului.
 SelectPrimaryColumnsForUpdateAttempt=Selectați coloana (coloanele) de utilizat ca cheie primară pentru o importare UPDATE
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index 7ffba8bf834..cbbb43ab7c1 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -18,7 +18,7 @@ ListeCP=Lista concediilor
 Leave=Cereri de concedii
 LeaveId=Lăsați ID-ul
 ReviewedByCP=Va fi aprobat de către
-UserID=User ID
+UserID=ID utilizator
 UserForApprovalID=Utilizator pentru ID de aprobare
 UserForApprovalFirstname=Prenumele utilizatorului de aprobare
 UserForApprovalLastname=Numele utilizatorului de aprobare
@@ -40,10 +40,10 @@ TypeOfLeaveId=Tipul de ID de concediu
 TypeOfLeaveCode=Tipul codului de concediu
 TypeOfLeaveLabel=Tipul tabelului de concediu
 NbUseDaysCP=Numărul de zile de concediu consumate
-NbUseDaysCPHelp=The calculation takes into account the non working days and the holidays defined in the dictionary.
+NbUseDaysCPHelp= Calculul ține cont de zilele nelucrătoare și de sărbătorile definite în dicționar.
 NbUseDaysCPShort=Zile consumate
 NbUseDaysCPShortInMonth=Zilele consumate în lună
-DayIsANonWorkingDay=%s is a non working day
+DayIsANonWorkingDay=%s este o zi nelucrătoare
 DateStartInMonth=Data de începere în lună
 DateEndInMonth=Data de încheiere în lună
 EditCP=Editare
@@ -130,5 +130,5 @@ HolidaysNumberingModules=Modelele de numerotare a cererilor de concediu
 TemplatePDFHolidays=Șablon pentru cererile de concediu PDF
 FreeLegalTextOnHolidays=Text gratuit pe PDF
 WatermarkOnDraftHolidayCards=Bază de fundal privind cererile de permis de concediu
-HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
+HolidaysToApprove=Concedii de aprobat
+NobodyHasPermissionToValidateHolidays=Nimeni nu are permisiunea de a valida concedii
diff --git a/htdocs/langs/ro_RO/hrm.lang b/htdocs/langs/ro_RO/hrm.lang
index d7ec912e84f..985e1d3c558 100644
--- a/htdocs/langs/ro_RO/hrm.lang
+++ b/htdocs/langs/ro_RO/hrm.lang
@@ -11,7 +11,7 @@ CloseEtablishment=Inchide Sediu
 # Dictionary
 DictionaryPublicHolidays=Managementul resurselor umane - Sarbatori oficiale
 DictionaryDepartment=HRM - Lista Departamente
-DictionaryFunction=HRM - Job positions
+DictionaryFunction=HRM - Joburi disponibile
 # Module
 Employees=Angajati
 Employee=Angajat
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 3326458dfa7..1cda37b563f 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -13,22 +13,22 @@ PHPSupportPOSTGETOk=Acest PHP suportă variabile POST si GET.
 PHPSupportPOSTGETKo=Este posibil ca configurarea dvs. PHP să nu accepte variabilele POST și/sau GET. Verificați parametrul <b> variables_order </b> în php.ini.
 PHPSupportGD=Acest PHP suportă funcții grafice GD.
 PHPSupportCurl=Acest PHP suportă Curl.
-PHPSupportCalendar=This PHP supports calendars extensions.
+PHPSupportCalendar=Acest PHP suportă extensii calendar.
 PHPSupportUTF8=Acest PHP suportă functiile UTF8.
-PHPSupportIntl=This PHP supports Intl functions.
-PHPSupportxDebug=This PHP supports extended debug functions.
-PHPSupport=This PHP supports %s functions.
+PHPSupportIntl=Aceasta versiune de PHP suportă funcţii Intl.
+PHPSupportxDebug=Această versiune de PHP suportă funcţii de depanare extinse.
+PHPSupport=Această versiune de PHP suportă funcţii %s.
 PHPMemoryOK=PHP max memorie sesiune este setată la <b>%s.</b> Acest lucru ar trebui să fie suficient.
 PHPMemoryTooLow=Memoria sesiunii PHP max este setată la <b> %s </b> octeți. Această valoare este prea mică. Schimbați-vă <b> php.ini </b> pentru a seta parametrul <b> memory_limit </b> la cel puțin <b> %s </b> octeți.
 Recheck=Faceți clic aici pentru un test mai detaliat
 ErrorPHPDoesNotSupportSessions=Instalarea dvs. de PHP nu acceptă sesiuni. Această caracteristică este necesară pentru a permite Dolibarr să funcționeze. Verificați configurarea PHP și permisiunile directorului sesiunilor.
 ErrorPHPDoesNotSupportGD=Instalarea dvs. PHP nu suportă funcții grafice GD. Nu vor fi disponibile grafice.
 ErrorPHPDoesNotSupportCurl=Instalarea dvs. PHP nu suportă Curl.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
+ErrorPHPDoesNotSupportCalendar=Versiunea ta de PHP nu suportă extensii calendar.
 ErrorPHPDoesNotSupportUTF8=Instalarea dvs. de PHP nu suportă funcții UTF8. Dolibarr nu poate funcționa corect. Rezolvați acest lucru înainte de a instala Dolibarr.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=Your PHP installation does not support %s functions.
+ErrorPHPDoesNotSupportIntl=Versiunea ta de PHP nu suportă funcţii Intl.
+ErrorPHPDoesNotSupportxDebug=Versiunea ta de PHP nu suportă funcţii de depanare extinse.
+ErrorPHPDoesNotSupport=Versiunea ta de PHP nu suportă funcţii %s.
 ErrorDirDoesNotExists=Directorul  %s  nu există.
 ErrorGoBackAndCorrectParameters=Întoarceți-vă și verificați/corectați parametrii.
 ErrorWrongValueForParameter=Este posibil să fi tastat greşit o valoare pentru parametrul &quot;%s&quot;.
@@ -93,7 +93,7 @@ GoToSetupArea=Du-te la Dolibarr (zona de configurare)
 MigrationNotFinished=Versiunea bazei de date nu este complet actualizată: executați din nou procesul de actualizare.
 GoToUpgradePage=Du-te la pagina din nou upgrade
 WithNoSlashAtTheEnd=Fără a slash &quot;/&quot; de la sfârşitul
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+DirectoryRecommendation=<span class="warning">IMPORTANT</span>:Trebuie să utilizați un director care se află în afara paginilor web (deci nu folosiți un subdirector al parametrului anterior).
 LoginAlreadyExists=Există deja
 DolibarrAdminLogin=Dolibarr admin autentificare
 AdminLoginAlreadyExists=Contul de administrator Dolibarr "<b> %s </b>" există deja. Întoarce-te dacă vrei să creezi altul.
@@ -209,7 +209,7 @@ MigrationRemiseExceptEntity=Actualizați valoarea câmpului entității din llx_
 MigrationUserRightsEntity=Actualizați valoarea câmpului entității pentru llx_user_rights
 MigrationUserGroupRightsEntity=Actualizați valoarea câmpului entității din llx_usergroup_rights
 MigrationUserPhotoPath=Migrarea căilor foto pentru utilizatori
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
+MigrationFieldsSocialNetworks=Migrarea câmpurilor de reţele sociale ale utilizatorilor(%s)
 MigrationReloadModule=Reîncarcă modul %s
 MigrationResetBlockedLog=Resetați modulul BlockedLog pentru algoritmul v7
 ShowNotAvailableOptions=Afișați opțiunile nedisponibile
@@ -218,6 +218,6 @@ ErrorFoundDuringMigration=Eroarea (erorile) au fost raportate în timpul procesu
 YouTryInstallDisabledByDirLock=Aplicația a încercat să se autoactualizeze, însă paginile de instalare/upgrade au fost dezactivate pentru securitate (directorul redenumit cu sufixul .lock). <br>
 YouTryInstallDisabledByFileLock=Aplicația a încercat să se autoactualizeze, însă paginile de instalare / upgrade au fost dezactivate pentru securitate (prin existența unui fișier de blocare <strong> install.lock </strong> în directorul de documente Dolibarr). <br>
 ClickHereToGoToApp=Faceți clic aici pentru a merge la aplicația dvs.
-ClickOnLinkOrRemoveManualy=If an upgrade is in progress, please wait. If not, click on the following link. If you always see this same page, you must remove/rename the file install.lock in the documents directory.
-Loaded=Loaded
-FunctionTest=Function test
+ClickOnLinkOrRemoveManualy=Dacă o actualizare este în curs, așteptați. Dacă nu, faceți clic pe următorul link. Dacă vedeți întotdeauna aceeași pagină, trebuie să eliminați/să redenumiți fișierul install.lock din directorul documentelor.
+Loaded=Incărcat
+FunctionTest=Test de funcţionare
diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang
index 7e5c62016e6..60dec3c350e 100644
--- a/htdocs/langs/ro_RO/interventions.lang
+++ b/htdocs/langs/ro_RO/interventions.lang
@@ -57,10 +57,10 @@ InterDateCreation=Data crearea Intervenție
 InterDuration=Durată Intervenție
 InterStatus=Status Intervenție 
 InterNote=Nota interventie
-InterLine=Line of intervention
+InterLine=Linie intervenţie
 InterLineId=Id linie Intervenţie
 InterLineDate=Data linie interventie
 InterLineDuration=Durată linie  Intervenție
 InterLineDesc=Descriere linie Intervenţie
-RepeatableIntervention=Template of intervention
-ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
+RepeatableIntervention=Şablon intervenţie
+ToCreateAPredefinedIntervention=Pentru a crea o intervenţie predefinită sau recurentă, creează o intervenţie obişnuită şi converteşte-o într-un şablon
diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
index 607e824aa26..e2f800a3c76 100644
--- a/htdocs/langs/ro_RO/languages.lang
+++ b/htdocs/langs/ro_RO/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Etiopiană
 Language_ar_AR=Arabă
 Language_ar_EG=Arabă (Egipt)
 Language_ar_SA=Arabă (Arabia Saudită)
+Language_az_AZ=Azerbaijană
 Language_bn_BD=Bengaleza
+Language_bn_IN=Bengală (India)
 Language_bg_BG=Bulgară
 Language_bs_BA=Bosniac
 Language_ca_ES=Catalană
@@ -20,6 +23,7 @@ Language_en_GB=Engleză (Marea Britanie)
 Language_en_IN=Engleză (India)
 Language_en_NZ=Engleză (Noua Zeelandă)
 Language_en_SA=Engleză (Arabia Saudită)
+Language_en_SG=Engleză (Singapore)
 Language_en_US=Engleză (Statele Unite)
 Language_en_ZA=Engleză (Africa de Sud)
 Language_es_ES=Spaniolă
@@ -29,6 +33,7 @@ Language_es_CL=Spaniolă (Chile)
 Language_es_CO=Spaniolă (Columbia)
 Language_es_DO=Spaniolă (Republica Dominicană)
 Language_es_EC=Spaniolă (Ecuador)
+Language_es_GT=Spaniolă (Guatemala)
 Language_es_HN=Spaniolă (Honduras)
 Language_es_MX=Spaniolă (Mexic)
 Language_es_PA=Spaniolă (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spaniolă (Paraguay)
 Language_es_PE=Spaniolă (Peru)
 Language_es_PR=Spaniolă (Puerto Rico)
 Language_es_UY=Spaniolă (Uruguay)
+Language_es_GT=Spaniolă (Guatemala)
 Language_es_VE=Spaniolă (Venezuela)
 Language_et_EE=Estoniană
 Language_eu_ES=Basc
@@ -44,15 +50,22 @@ Language_fi_FI=Finlandeză
 Language_fr_BE=Franceză (Belgia)
 Language_fr_CA=Franceză (Canada)
 Language_fr_CH=Franceză (Elveţia)
+Language_fr_CI=Franceză (Coasta de Azur)
+Language_fr_CM=Franceză (Camerun)
 Language_fr_FR=Franceză
+Language_fr_GA=Franceză (Gabon)
 Language_fr_NC=Franceză (Noua Caledonie)
+Language_fr_SN=Franceză (Senegal)
 Language_fy_NL=Finlandeza
+Language_gl_ES=Galeză
 Language_he_IL=Ebraică
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croat
 Language_hu_HU=Maghiară
 Language_id_ID=Indoneziană
 Language_is_IS=Islandeză
 Language_it_IT=Italiană
+Language_it_CH=Italiană (Elveţia)
 Language_ja_JP=Japoneză
 Language_ka_GE=Georgiana
 Language_km_KH=khmeră
@@ -64,8 +77,9 @@ Language_lv_LV=Letonă
 Language_mk_MK=Macedonean
 Language_mn_MN=mongoleză
 Language_nb_NO=Norvegiană (Bokmål)
+Language_ne_NP=Nepaleză
 Language_nl_BE=Olandeză (Belgia)
-Language_nl_NL=Dutch
+Language_nl_NL=Olandeză
 Language_pl_PL=Poloneză
 Language_pt_BR=Portugheză (Brazilia)
 Language_pt_PT=Portugheză
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbecă
 Language_vi_VN=Vietnameză
 Language_zh_CN=Chineză
 Language_zh_TW=Chineză (Tradiţională)
+Language_zh_HK=Chineză (Hong Kong)
 Language_bh_MY=Malaeziană
diff --git a/htdocs/langs/ro_RO/link.lang b/htdocs/langs/ro_RO/link.lang
index 9087a2eec65..12147377aea 100644
--- a/htdocs/langs/ro_RO/link.lang
+++ b/htdocs/langs/ro_RO/link.lang
@@ -8,4 +8,4 @@ LinkRemoved=Linkul %s a fost înlăturat
 ErrorFailedToDeleteLink= Eşec la înlăturarea  linkului '<b>%s</b>'
 ErrorFailedToUpdateLink= Eşec la modificarea linkului '<b>%s</b>'
 URLToLink=URL la link
-OverwriteIfExists=Overwrite file if exists
+OverwriteIfExists=Suprascrie dacă fişierul există
diff --git a/htdocs/langs/ro_RO/loan.lang b/htdocs/langs/ro_RO/loan.lang
index 25878774961..ecd77415a51 100644
--- a/htdocs/langs/ro_RO/loan.lang
+++ b/htdocs/langs/ro_RO/loan.lang
@@ -23,9 +23,9 @@ AddLoan=Creați împrumut
 FinancialCommitment=Angajament financiar
 InterestAmount=Dobândă
 CapitalRemain=Capitalul rămâne
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Acest element este plătit deja
+CantUseScheduleWithLoanStartedToPaid = Nu poţi folosi programatorul pentru un credit pentru care au început plăţile
+CantModifyInterestIfScheduleIsUsed = Nu poţi modifica dobânda dacă foloseşti programatorul
 # Admin
 ConfigLoan=Configurarea împrumutului modulului
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Contabilitatea contului de capital în mod implicit
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index e660aa77eb3..c021a5391ca 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -19,8 +19,8 @@ MailTopic=Temă pentru e-mail
 MailText=Mesaj
 MailFile=Fişiere ataşate
 MailMessage=Continut Email
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
+SubjectNotIn=Nu în subiect
+BodyNotIn=Nu în corpul email-ului
 ShowEMailing=Arata email-uri
 ListOfEMailings=Lista de emailings
 NewMailing=Nou email-uri
@@ -78,13 +78,13 @@ GroupEmails=Grup de emailuri
 OneEmailPerRecipient=Un email pentru fiecare destinatar (în mod implicit, un email selectat pentru fiecare înregistrare )
 WarningIfYouCheckOneRecipientPerEmail=Atenție, dacă bifați această casetă, înseamnă că va fi trimis un singur email pentru mai multe înregistrări sectate, deci dacă mesajul dvs. conține variabile de substituție care se referă la datele unei înregistrări, nu este posibil să le înlocuiți.
 ResultOfMailSending=Rezultatul trimiterii de email în masă
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
+NbSelected=Număr selectate
+NbIgnored=Număr ignorate
+NbSent=Număr trimise
 SentXXXmessages= %s Mesaj(e) trimise.
 ConfirmUnvalidateEmailing=Sigur doriți să schimbați emailul <b> %s </b> la starea de schiţă?
 MailingModuleDescContactsWithThirdpartyFilter=Contactați filtrele clienților
-MailingModuleDescContactsByCompanyCategory=Contacte pe categorii terțe
+MailingModuleDescContactsByCompanyCategory=Contacte după categorii terți
 MailingModuleDescContactsByCategory=Contacte pe categorii
 MailingModuleDescContactsByFunction=Contacte după poziție
 MailingModuleDescEmailsFromFile=Emailuri din fișier
@@ -164,7 +164,11 @@ NoContactWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie
 NoContactLinkedToThirdpartieWithCategoryFound=Nu s-a găsit niciun contact / adresă cu o categorie 
 OutGoingEmailSetup=Setarea emailului de ieșire
 InGoingEmailSetup=Configurarea emailului de primire
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetupForEmailing=Setup email de ieşire( pentru modulul %s)
 DefaultOutgoingEmailSetup=Configurarea implicită a emailurilor de ieșire
 Information=Informatie
 ContactsWithThirdpartyFilter=Contacte cu filtrul terț
+Unanswered=Fără răspuns
+Answered=Răspuns
+IsNotAnAnswer=Nu răspunde (e-mail inițial)
+IsAnAnswer= Este un răspuns al unui email inițial
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index f2c6a10c15b..d8db4149020 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -25,13 +25,13 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Conexiunea la baza de date
 NoTemplateDefined=Nu există șablon disponibil pentru acest tip de email
-AvailableVariables=Variabile  substitutie disponibil
+AvailableVariables=Variabile de substituţie disponibile
 NoTranslation=Fără traducere
 Translation=Traduceri
-EmptySearchString=Enter non empty search criterias
+EmptySearchString=Introdu criterii de căutare valide
 NoRecordFound=Nicio înregistrare  gasită
 NoRecordDeleted=Nu s-au șters înregistrări
-NotEnoughDataYet=Nu sunt date 
+NotEnoughDataYet=Nu sunt date
 NoError=Nicio eroare
 Error=Eroare
 Errors=Erori
@@ -39,36 +39,36 @@ ErrorFieldRequired=Câmpul " %s" este obligatoriu
 ErrorFieldFormat=Câmpul  " %s" are o valoare incorectă
 ErrorFileDoesNotExists=Fișierul % s nu există
 ErrorFailedToOpenFile=Nu se poate deschide fișierul % s
-ErrorCanNotCreateDir=Nu se poate crea dir %s
-ErrorCanNotReadDir=Nu se poate citi dir %s
+ErrorCanNotCreateDir=Nu se poate crea directorul %s
+ErrorCanNotReadDir=Nu se poate citi directorul %s
 ErrorConstantNotDefined=Parametrul %s nedefinit
 ErrorUnknown=Eroare Necunoscută
 ErrorSQL=Eroare SQL
 ErrorLogoFileNotFound=Fișierul logo '% s' nu a fost găsit
-ErrorGoToGlobalSetup=Accesați setarea "Companie/Organizație" pentru a remedia această problemă
+ErrorGoToGlobalSetup=Accesați setările 'Companie/Organizație' pentru a remedia această problemă
 ErrorGoToModuleSetup=Mergeţi la configurarea modulului pentru rezolvare
-ErrorFailedToSendMail=Nu se poate  trimite e-mail (expeditor=% s,  destinatar =%s)
-ErrorFileNotUploaded=Fișierul nu a fost încărcat. Verificați ca dimensiunea să nu depășească maximul permis, că spațiu pe disc este disponibil  și că nu există deja un fișier cu același nume, în acest director.
+ErrorFailedToSendMail=Nu se poate trimite e-mail (expeditor=%s, destinatar =%s)
+ErrorFileNotUploaded=Fișierul nu a fost încărcat. Verificați ca dimensiunea să nu depășească maximul permis, că spațiu pe disc este disponibil și că nu există deja un fișier cu același nume, în acest director.
 ErrorInternalErrorDetected=Eroare detectată
 ErrorWrongHostParameter=Parametru Server greșit
 ErrorYourCountryIsNotDefined=Țara dvs. nu este definită. Mergeți la Home-Setup-Edit și postați din nou formularul.
 ErrorRecordIsUsedByChild=Nu s-a reușit ștergerea acestei înregistrări. Această înregistrare este utilizată de cel puțin o copie a înregistrării
-ErrorWrongValue=Valoarea  incorectă
-ErrorWrongValueForParameterX=Valoarea  incorectă pentru parametrul% s
-ErrorNoRequestInError=Nicio cerere în eroare
+ErrorWrongValue=Valoare incorectă
+ErrorWrongValueForParameterX=Valoare incorectă pentru parametrul %s
+ErrorNoRequestInError=Nicio cerere cu eroare
 ErrorServiceUnavailableTryLater=Serviciul nu este disponibil momentan. Încercați mai târziu.
 ErrorDuplicateField=Valoare duplicat într-un câmp unic
-ErrorSomeErrorWereFoundRollbackIsDone=Au fost găsite unele erori. Modificările au fost reluate.
+ErrorSomeErrorWereFoundRollbackIsDone=Au fost găsite unele erori. Modificările nu au fost salvate.
 ErrorConfigParameterNotDefined=Parametrul <b> %s </b> nu este definit în fișierul de configurare Dolibarr <b> conf.php </b>.
-ErrorCantLoadUserFromDolibarrDatabase=Utilizatorul<b>%s</b>  negăsit  în baza de date Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Eroare,  nici o cota de TVA definită pentru  ţara '% s'.
-ErrorNoSocialContributionForSellerCountry=Eroare, niciun tip taxa sociala /fiscala definit pentru ţara '%s'.
-ErrorFailedToSaveFile=Eroare,  salvarea fişierului eşuată.
+ErrorCantLoadUserFromDolibarrDatabase=Utilizatorul<b>%s</b> negăsit în baza de date Dolibarr.
+ErrorNoVATRateDefinedForSellerCountry=Eroare, nici o cotă de TVA nu este definită pentru ţara '%s'.
+ErrorNoSocialContributionForSellerCountry=Eroare, niciun tip de taxă socială/fiscală nu este definită pentru ţara '%s'.
+ErrorFailedToSaveFile=Eroare, salvarea fişierului a eşuat.
 ErrorCannotAddThisParentWarehouse=Încercați să adăugați un depozit părinte care este deja o copie a unui depozit existent
 MaxNbOfRecordPerPage=Numărul maxim de înregistrări pe pagină
-NotAuthorized=Dvs nu aveti dreptusa faceti aceasta.
-SetDate=setează data
-SelectDate=selectează data
+NotAuthorized=Nu aveţi dreptul să faceţi asta.
+SetDate=Setează data
+SelectDate=Selectează data
 SeeAlso=Vezi şi %s
 SeeHere=Vezi aici
 ClickHere=Click aici
@@ -79,12 +79,12 @@ FileRenamed=Fișierul a fost redenumit cu succes
 FileGenerated=Fișierul a fost generat cu succes
 FileSaved=Fișierul a fost salvat cu succes
 FileUploaded=Fişierul a fost încărcat cu succes
-FileTransferComplete=Fișierul (fișierele) a fost încărcat cu succes
-FilesDeleted=Fișierul (fișierele) a fost șters cu succes
-FileWasNotUploaded=Un fișier este selectat pentru atașament, dar nu a fost încă încărcat. Clic pe "Ataşează fișier" pentru aceasta.
+FileTransferComplete=Fișierul(fișierele) a fost încărcat cu succes
+FilesDeleted=Fișierul(fișierele) a fost șters cu succes
+FileWasNotUploaded=Un fișier este selectat pentru atașament, dar nu a fost încă încărcat. Clic pe "Ataşează fișier".
 NbOfEntries=Numărul de intrări
 GoToWikiHelpPage=Citeşte ajutorul online (Acces la Internet necesar)
-GoToHelpPage=Citeşte  Ajutorul
+GoToHelpPage=Citeşte Ajutorul
 RecordSaved=Înregistrare salvată
 RecordDeleted=Înregistrare ştearsă
 RecordGenerated=Înregistrată generată
@@ -93,34 +93,34 @@ NotDefined=Nedefinit
 DolibarrInHttpAuthenticationSoPasswordUseless=Modul de autentificare Dolibarr este setat la <b> %s </b> în fișierul de configurare <b> conf.php </b>. <br> Aceasta înseamnă că baza de date pentru parole este externă pentru Dolibarr, deci schimbarea acestui câmp poate să nu aibă efect.
 Administrator=Administrator
 Undefined=Nedefinit
-PasswordForgotten=Parola uitata ?
-NoAccount=Fără cont?
+PasswordForgotten=Ai uitat parola?
+NoAccount=Nu ai cont?
 SeeAbove=Vezi mai sus
 HomeArea=Acasă
 LastConnexion=Ultima autentificare
 PreviousConnexion=Autentificarea anterioară
-PreviousValue=Valoarea anterioară
+PreviousValue=Valoare anterioară
 ConnectedOnMultiCompany=Conectat la entitatea
 ConnectedSince=Conectat de
-AuthenticationMode=Mod Autentificare
-RequestedUrl=URL Solicitare
-DatabaseTypeManager=Tip gestiune Baza de date
-RequestLastAccessInError=Ultima eroare de solicitare acces baza de date
+AuthenticationMode=Mod autentificare
+RequestedUrl=URL solicitat
+DatabaseTypeManager=Tip manager bază de date
+RequestLastAccessInError=Ultima eroare de solicitare acces la baza de date
 ReturnCodeLastAccessInError=Cod returnat pentru ultima eroare de acces la baza de date
 InformationLastAccessInError=Info pentru ultima eroare de acces la baza de date
 DolibarrHasDetectedError=Dolibarr a detectat o eroare tehnică
-YouCanSetOptionDolibarrMainProdToZero=Puteți citi fișierul jurnal sau setați opțiunea $ dolibarr_main_prod la "0" din fișierul config pentru a obține mai multe informații.
-InformationToHelpDiagnose=Aceste informații pot fi utile în scopuri de diagnoză (puteți seta opțiunea $ dolibarr_main_prod la "1" pentru a elimina aceste anunțuri)
+YouCanSetOptionDolibarrMainProdToZero=Puteți citi fișierul jurnal sau setați opțiunea $dolibarr_main_prod la "0" din fișierul config pentru a obține mai multe informații.
+InformationToHelpDiagnose=Aceste informații pot fi utile în scopuri de diagnoză (puteți seta opțiunea $dolibarr_main_prod la '1' pentru a elimina aceste notificări)
 MoreInformation=Mai multe informaţii
-TechnicalInformation=Informații Tehnice
-TechnicalID= ID Technic
-LineID=Line ID
-NotePublic=Notă (publică)
-NotePrivate=Notă (privată)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr a fost de configurat  pentru o limita de precizie pentru prețuri unitare  la<b>% s</b> zecimale.
+TechnicalInformation=Informații tehnice
+TechnicalID=ID tehnic
+LineID=ID linie
+NotePublic=Notă(publică)
+NotePrivate=Notă(privată)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr a fost de configurat cu o limită de precizie pentru prețuri unitare de <b>%s</b> zecimale.
 DoTest=Test
 ToFilter=Filtru
-NoFilter=Fara filtru
+NoFilter=Fără filtru
 WarningYouHaveAtLeastOneTaskLate=Atenție, aveți cel puțin un element care a depășit timpul de toleranță.
 yes=da
 Yes=Da
@@ -135,12 +135,12 @@ MediaBrowser=Media browser
 Always=Întotdeauna
 Never=Niciodată
 Under=sub
-Period=Perioada
-PeriodEndDate=Data sfârșitului perioadei
+Period=Perioadă
+PeriodEndDate=Data sfârșit perioadă
 SelectedPeriod=Perioada selectată
 PreviousPeriod=Perioada anterioară
-Activate=Activează
-Activated=Activ
+Activate=Activare
+Activated=Activat
 Closed=Închide
 Closed2=Închis
 NotClosed=Nu este închisă
@@ -152,10 +152,10 @@ Disabled=Dezactivat
 Add=Adaugă
 AddLink=Adaugă link
 RemoveLink=Eliminaţi link
-AddToDraft=Adauga la draft
+AddToDraft=Adaugă la schiţă
 Update=Modifică
 Close=Închide
-CloseBox=Eliminați widgetul din tabloul de bord
+CloseBox=Elimină widget-ul din tabloul de bord
 Confirm=Confirmă
 ConfirmSendCardByMail=Chiar doriți să trimiteți conținutul acestui card prin poștă la <b> %s </b>?
 Delete=Şterge
@@ -165,29 +165,29 @@ Cancel=Anulează
 Modify=Modifică
 Edit=Editează
 Validate=Validează
-ValidateAndApprove=Validareaza si aproba
+ValidateAndApprove=Validează şi aprobă
 ToValidate=De validat
-NotValidated=Nu este validată
+NotValidated=Nevalidată
 Save=Salvează
 SaveAs=Salvează ca
-SaveAndStay=Save and stay
-SaveAndNew=Save and new
+SaveAndStay=Salvează şi rămâi aici
+SaveAndNew=Salvează şi mergi la pagină nouă
 TestConnection=Test conexiune
 ToClone=Clonează
-ConfirmCloneAsk=Are you sure you want to clone the object <b>%s</b>?
+ConfirmCloneAsk=Eşti sigur că vrei să clonezi obiectul <b>%s</b>?
 ConfirmClone=Alegeți datele pe care doriți să le clonați:
 NoCloneOptionsSpecified=Nu există date definite pentru a clona .
 Of=de
 Go=Go
 Run=Lansează
-CopyOf=Copie de
-Show=Arăta
+CopyOf=Copie la
+Show=Afişează
 Hide=Ascunde
 ShowCardHere=Arăta fişa aici
 Search=Caută
 SearchOf=Căutare
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=Adăugare rapidă
 QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Validează
 Approve=Aprobaţi
@@ -210,12 +210,12 @@ Password=Parola
 PasswordRetype=Repetă parola
 NoteSomeFeaturesAreDisabled=Atenţie, o mulţime de funcţionalităţi / module sunt dezactivate în această demonstraţie.
 Name=Nume
-NameSlashCompany=Numele/Compania
-Person=Persoana
+NameSlashCompany=Nume/Companie
+Person=Persoană
 Parameter=Parametru
 Parameters=Parametri
 Value=Valoare
-PersonalValue=Valoare Personală
+PersonalValue=Valoare personalizată
 NewObject=Nou %s
 NewValue=Valoare nouă
 CurrentValue=Valoarea curentă
@@ -226,7 +226,7 @@ MultiLanguage=Multilimbă
 Note=Notă
 Title=Titlu
 Label=Etichetă
-RefOrLabel=Ref. sau eticheta
+RefOrLabel=Ref. sau etichetă
 Info=Loguri
 Family=Familie
 Description=Descriere
@@ -239,32 +239,32 @@ DefaultModel=Șablonul documentului implicit
 Action=Eveniment
 About=Despre
 Number=Număr
-NumberByMonth=Numărul pe luni
-AmountByMonth=Valoarea pe luni
+NumberByMonth=Număr pe luni
+AmountByMonth=Valoare pe luni
 Numero=Număr
-Limit=Limita
+Limit=Limită
 Limits=Limite
 Logout=Deconectare
 NoLogoutProcessWithAuthMode=Nu există funcție de deconectare ce poate fi aplicată cu modul de autentificare <b>%s</b>
-Connection=Login
+Connection=Autentificare
 Setup=Setări
-Alert=Alerta
+Alert=Alertă
 MenuWarnings=Alerte
 Previous=Precedent
 Next=Următor
 Cards=Fişe
 Card=Fişă
 Now=Acum
-HourStart=Ora Start 
+HourStart=Oră start
 Date=Dată
-DateAndHour=Data şi ora
+DateAndHour=Dată şi oră
 DateToday=Astazi
-DateReference=Data Referinţă
+DateReference=Data referinţă
 DateStart=Dată începere
 DateEnd=Dată sfîrşit
 DateCreation=Dată creare
-DateCreationShort=Data Creare
-DateModification=Dată modificarea
+DateCreationShort=Dată creare
+DateModification=Dată modificare
 DateModificationShort=Dată modif.
 DateLastModification=Data ultimei modificări
 DateValidation=Dată validare
@@ -272,22 +272,22 @@ DateClosing=Dată închidere
 DateDue=Dată scadenţă
 DateValue=Dată decontare
 DateValueShort=Dată decontare
-DateOperation=Dată operaţie
+DateOperation=Dată operare
 DateOperationShort=Dată ope.
 DateLimit=Dată limită
-DateRequest=Dată cerere
-DateProcess=Dată Procesare
+DateRequest=Data solicitării
+DateProcess=Data procesării
 DateBuild=Dată generare raport
 DatePayment=Data plății
-DateApprove=Data Aprobare
-DateApprove2=Data aprobare (a doua aprobare)
-RegistrationDate=Data Înregistrării
-UserCreation=Utilizator de creare
-UserModification=Utilizator de modificare
-UserValidation=Utilizator de validare
-UserCreationShort=Utilizator de creare
-UserModificationShort=Utilizator de modificare
-UserValidationShort=Utilizator de validare
+DateApprove=Data aprobare
+DateApprove2=Data aprobare(a doua aprobare)
+RegistrationDate=Data înregistrării
+UserCreation=Utilizatorul care a creat
+UserModification=Utilizatorul care a modificat
+UserValidation=Utilizatorul care a validat
+UserCreationShort=Utilizatorul creator
+UserModificationShort=Utilizatorul modificator
+UserValidationShort=Utilizatorul valitator
 DurationYear=an
 DurationMonth=lună
 DurationWeek=săptămână
@@ -323,13 +323,13 @@ HourShort=H
 MinuteShort=mn
 Rate=Rată
 CurrencyRate=Rata de conversie valutară
-UseLocalTax=Include taxa
-Bytes=Bytes
-KiloBytes=Kilobytes
-MegaBytes=Megabytes
+UseLocalTax=Include taxe
+Bytes=Octeţi
+KiloBytes=Kiloocteţi
+MegaBytes=Megaocteţi
 GigaBytes=Gigaocteţi
-TeraBytes=Terabytes
-UserAuthor=Utilizator al creației
+TeraBytes=Teraocteţi
+UserAuthor=Utilizatorul creator
 UserModif=Utilizatorul ultimei actualizări
 b=b.
 Kb=Kb
@@ -341,54 +341,54 @@ Copy=Copiază
 Paste=Lipeşte
 Default=Implicit
 DefaultValue=Valoare implicită
-DefaultValues=Valori/filtre/sortare implicite 
+DefaultValues=Valori/filtre/sortare implicite
 Price=Preţ
-PriceCurrency=Preț (valută)
+PriceCurrency=Preț(valută)
 UnitPrice=Preţ unitar
-UnitPriceHT=Prețul unitar (exclusiv)
-UnitPriceHTCurrency=Prețul unitar (exclusiv) (fără valută)
+UnitPriceHT=Prețul unitar(fără taxe)
+UnitPriceHTCurrency=Prețul unitar(fără taxe)(fără valută)
 UnitPriceTTC=Preț unitar
-PriceU=UP
-PriceUHT=UP (net)
-PriceUHTCurrency=U.P (moneda)
-PriceUTTC=U.P. (inc. tax)
+PriceU=P.U.
+PriceUHT=PU(net)
+PriceUHTCurrency=P.U (monedă)
+PriceUTTC=P.U.(incl. taxe)
 Amount=Valoare
-AmountInvoice=Valoare Factură
+AmountInvoice=Valoare factură
 AmountInvoiced=Suma facturată
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Sumă facturată (fără TVA)
+AmountInvoicedTTC=Valoare facturată (incl. taxe)
 AmountPayment=Valoare de plată
-AmountHTShort=Sumă (exclusiv)
-AmountTTCShort=Valoare (inc. taxe)
-AmountHT=Sumă (fără taxă)
-AmountTTC=Valoare (inc. taxe)
-AmountVAT=Valoare  TVA
-MulticurrencyAlreadyPaid=Plătit deja, moneda inițială
-MulticurrencyRemainderToPay=Rămas de plată, moneda inițială
-MulticurrencyPaymentAmount=Suma plății, moneda inițială
-MulticurrencyAmountHT=Sumă (fără taxă), moneda inițială
-MulticurrencyAmountTTC=Valoare (inc. tax), moneda originala
-MulticurrencyAmountVAT=Valoare tax, moneda originala
+AmountHTShort=Sumă (fără taxe)
+AmountTTCShort=Valoare (cu taxe)
+AmountHT=Sumă (fără taxe)
+AmountTTC=Valoare (cu taxe)
+AmountVAT=Valoare TVA
+MulticurrencyAlreadyPaid=Plătit deja, în moneda inițială
+MulticurrencyRemainderToPay=Rămas de plată, în moneda inițială
+MulticurrencyPaymentAmount=Suma de plată, în moneda inițială
+MulticurrencyAmountHT=Sumă (fără taxe), în moneda inițială
+MulticurrencyAmountTTC=Valoare (cu taxe), în moneda originală
+MulticurrencyAmountVAT=Valoare taxe, în moneda originală
 AmountLT1=Valoare taxă 2
 AmountLT2=Valoare taxă 3
-AmountLT1ES=Valoare  RE
-AmountLT2ES=Valoare  IRPF
-AmountTotal=Valoare  totală
+AmountLT1ES=Valoare RE
+AmountLT2ES=Valoare IRPF
+AmountTotal=Valoare totală
 AmountAverage=Valoare medie
-PriceQtyMinHT=Preţ cantitate min. (fără taxă)
-PriceQtyMinHTCurrency=Preţ cantitate min. (fără taxă) (valută)
+PriceQtyMinHT=Preţ cantitate min. (fără taxe)
+PriceQtyMinHTCurrency=Preţ cantitate min. (fără taxe) (valută)
 Percentage=Procentaj
 Total=Total
 SubTotal=Subtotal
-TotalHTShort=Total (exclusiv)
-TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (exclusiv în valută)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (fără taxă)
+TotalHTShort=Total (fără taxe)
+TotalHT100Short=Total 100%% (fără taxe)
+TotalHTShortCurrency=Total (fără taxe în valută)
+TotalTTCShort=Total (cu taxe)
+TotalHT=Total (fără taxe)
 TotalHTforthispage=Total (fără taxă) pentru această pagină
 Totalforthispage=Total pentru această pagină
 TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (taxa Inc)  în creditul dvs
+TotalTTCToYourCredit=Total (taxa Inc) în creditul dvs
 TotalVAT=Total TVA
 TotalVATIN=Total IGST
 TotalLT1=Total tax 2
@@ -403,8 +403,8 @@ INCVATONLY=Include TVA
 INCT=Include toate taxele
 VAT=TVA
 VATIN=IGST
-VATs=Taxe Vanzari
-VATINs=Taxele IGST
+VATs=Taxe vânzări
+VATINs=Taxe IGST
 LT1=Impozitul pe vânzări 2
 LT1Type=Tip impozit pe vânzări 2
 LT2=Impozitul pe vânzări 3
@@ -413,11 +413,11 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=Procente adiţionale
 VATRate=Taxa TVA
-VATCode=Codul ratei de impozitare
+VATCode=Cod cotă TVA
 VATNPR=Rata impozitului NPR
-DefaultTaxRate=Impozitul implicit
+DefaultTaxRate=Cotă taxă implicită
 Average=Medie
 Sum=Suma
 Delta=Delta
@@ -425,66 +425,67 @@ StatusToPay=De plată
 RemainToPay=Rămas de plată
 Module=Modul/Aplicaţie
 Modules=Module/Aplicații
-Option=Opţiunea
-List=Lista
-FullList=Lista completă
-FullConversation=Full conversation
+Option=Opţiune
+List=Listă
+FullList=Listă completă
+FullConversation=Conversaţie integrală
 Statistics=Statistici
 OtherStatistics=Alte statistici
 Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
-ExternalRef=Ref. externa
+ExternalRef=Ref. externă
 RefSupplier=Ref. furnizor
 RefPayment=Ref. plată
-CommercialProposalsShort=Oferte Comerciale
+CommercialProposalsShort=Oferte comerciale
 Comment=Comentează
 Comments=Comentarii
 ActionsToDo=Evenimente de făcut
-ActionsToDoShort=De facut
+ActionsToDoShort=De făcut
 ActionsDoneShort=Făcut
 ActionNotApplicable=Nu se aplică
-ActionRunningNotStarted=De realizat
-ActionRunningShort=In progres
+ActionRunningNotStarted=De început
+ActionRunningShort=În progres
 ActionDoneShort=Terminat
 ActionUncomplete=Incomplet
-LatestLinkedEvents=Ultimele %sevenimente legate
-CompanyFoundation=Compania / Organizația
+LatestLinkedEvents=Ultimele %s evenimente asociate
+CompanyFoundation=Companie/Organizație
 Accountant=Contabil
 ContactsForCompany=Contacte pentru aceast terţ
 ContactsAddressesForCompany=Contacte pentru aceast terţ
 AddressesForCompany=Adrese pentru acest terţ
 ActionsOnCompany=Evenimente pentru acest terț
-ActionsOnContact=Evenimente pentru acest contact/adresa
-ActionsOnContract=Events for this contract
-ActionsOnMember=Evenimente  privind  acest membru
+ActionsOnContact=Evenimente pentru acest contact/adresă
+ActionsOnContract=Evenimente pentru acest contract
+ActionsOnMember=Evenimente privind acest membru
 ActionsOnProduct=Evenimente despre acest produs
-NActionsLate=%s  întârziat
-ToDo=De facut
+NActionsLate=%s întârziat
+ToDo=De făcut
 Completed=Complet
-Running=In progres
-RequestAlreadyDone=Cerere  deja înregistrată
+Running=În progres
+RequestAlreadyDone=Cerere deja înregistrată
 Filter=Filtru
-FilterOnInto=Criteriu Cautare '<strong>%s</strong>' in campurile %s
+FilterOnInto=Criteriu Cautare '<strong>%s</strong>' in câmpurile %s
 RemoveFilter=Îndepărtați filtrul
-ChartGenerated=Grafice  generate
+ChartGenerated=Grafice generate
 ChartNotGenerated=Grafic negenerat
-GeneratedOn=Generat pe % s
+GeneratedOn=Generat pe %s
 Generate=Generează
-Duration=Durata
+Duration=Durată
 TotalDuration=Durată totală
 Summary=Sumar
-DolibarrStateBoard=Statisticile bazei de date
-DolibarrWorkBoard=Deschideți Elementele
-NoOpenedElementToProcess=No open element to process
+DolibarrStateBoard=Statistici bază de date
+DolibarrWorkBoard=Deschideți elementele
+NoOpenedElementToProcess=Nici un element deschis care trebuie procesat
 Available=Disponibil
 NotYetAvailable=Nedisponibil încă
-NotAvailable=Nedisponibil
-Categories=Tag-uri / categorii
-Category=Tag / categorie
+NotAvailable=Indisponibil
+Categories=Tag-uri/categorii
+Category=Tag/categorie
 By=Pe
 From=De la
+FromDate=De la
 FromLocation=De la
 to=la
 To=la
@@ -500,7 +501,7 @@ ApprovedBy=Aprobat de
 ApprovedBy2=Aprobat de (a doua aprobare)
 Approved=Aprobat
 Refused=Refuzat
-ReCalculate=Recalculează
+ReCalculate=Recalculare
 ResultKo=Eşec
 Reporting=Raportare
 Reportings=Rapoarte
@@ -510,7 +511,7 @@ StatusInterInvoiced=Facturată
 Validated=Validat
 Opened=Deschis
 OpenAll=Deschise (Toate)
-ClosedAll=Închise (toate)
+ClosedAll=Închise (Toate)
 New=Nou
 Discount=Discount
 Unknown=Necunoscut
@@ -518,13 +519,13 @@ General=General
 Size=Dimensiune
 OriginalSize=Dimensiunea originală
 Received=Primit
-Paid=Platit
+Paid=Plătit
 Topic=Subiect
-ByCompanies=Pe terți
+ByCompanies=După terți
 ByUsers=De către utilizator
 Links=Link-uri
 Link=Link
-Rejects=Respinge
+Rejects=Respingeri
 Preview=Previzualizare
 NextStep=Etapa următoare
 Datas=Date
@@ -533,17 +534,17 @@ NoneF=Niciunul
 NoneOrSeveral=Niciunul sau mai multe
 Late=Întârziat
 LateDesc=Un element este definit ca Întârziat conform configurației sistemului din meniul Acasă - Configurare - Alerte.
-NoItemLate=Nici un articol târziu
+NoItemLate=Nimic întârziat
 Photo=Foto
 Photos=Fotografii
-AddPhoto=Adauga Foto
-DeletePicture=Şterge Foto
+AddPhoto=Adaugă foto
+DeletePicture=Şterge foto
 ConfirmDeletePicture=Confirmaţi ştergere foto ?
-Login=Login
+Login=Autentificare
 LoginEmail=Autentificare (email)
 LoginOrEmail=Autentificare sau Email
 CurrentLogin=Login curent
-EnterLoginDetail=Introduceți datele de autentificare 
+EnterLoginDetail=Introduceți datele de autentificare
 January=Ianuarie
 February=Februarie
 March=Martie
@@ -610,7 +611,7 @@ File=Fișier
 Files=Fişiere
 NotAllowed=Nepermis
 ReadPermissionNotAllowed=Citirea nu este permisă
-AmountInCurrency=Valoare în  moneda %s
+AmountInCurrency=Valoare în moneda %s
 Example=Exemplu
 Examples=Exemple
 NoExample=Nu exemplu
@@ -632,7 +633,7 @@ Internals=Interne
 Externals=Extern
 Warning=Atenţie
 Warnings=Avertismente
-BuildDoc=Generează  Doc
+BuildDoc=Generează Doc
 Entity=Mediu
 Entities=Entităţile
 CustomerPreview=Preview Client
@@ -666,7 +667,7 @@ Owner=Proprietar
 FollowingConstantsWillBeSubstituted=Următoarele constante vor fi înlocuite cu valoarea corespunzătoare.
 Refresh=Refresh
 BackToList=Inapoi la lista
-BackToTree=Back to tree
+BackToTree=Înapoi la arbore
 GoBack=Du-te înapoi
 CanBeModifiedIfOk=Poate fi modificat, dacă e valid
 CanBeModifiedIfKo=Poate fi modificat, dacă nu e valid
@@ -674,7 +675,7 @@ ValueIsValid=Valoarea este validă
 ValueIsNotValid=Valoarea nu este validă
 RecordCreatedSuccessfully=Înregistrarea creată cu succes
 RecordModifiedSuccessfully=Înregistrare modificată cu succes
-RecordsModified=Înregistrările (Înregistrarea)  %s au fost modificate
+RecordsModified=Înregistrările (Înregistrarea) %s au fost modificate
 RecordsDeleted=Înregistrările (Înregistrarea) %s au fost șterse
 RecordsGenerated=Înregistrările (Înregistrarea) generate de %s
 AutomaticCode=Cod automat
@@ -687,6 +688,7 @@ Method=Metoda
 Receive=Recepţionează
 CompleteOrNoMoreReceptionExpected=Completă sau nimic de așteptat
 ExpectedValue=Valoarea estimată
+ExpectedQty=Cantitate aşteptată
 PartialWoman=Parţial
 TotalWoman=Total
 NeverReceived=Niciodată primit
@@ -703,8 +705,9 @@ MenuECM=Documente
 MenuAWStats=AWStats
 MenuMembers=Membri
 MenuAgendaGoogle=Agenda Google
-ThisLimitIsDefinedInSetup=Limită Dolibarr  (Menu Home-setup-securitate): %s Kb, PHP limita: %s Kb
-NoFileFound=Niciun document salvat  în acest director,
+MenuTaxesAndSpecialExpenses=Taxe | Cheltuieli speciale
+ThisLimitIsDefinedInSetup=Limită Dolibarr (Menu Home-setup-securitate): %s Kb, PHP limita: %s Kb
+NoFileFound=Niciun document salvat în acest director,
 CurrentUserLanguage=Limba curentă
 CurrentTheme=Tema curentă
 CurrentMenuManager=Manager meniu curent
@@ -719,13 +722,13 @@ DateOfSignature=Data semnării
 HidePassword=Afișare comanda cu parola ascunsă
 UnHidePassword=Afișare comanda reală cu parola în clar
 Root=Rădăcină
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Director rădăcină pentru media public (/medias)
 Informations=Informatie
 Page=Pagină
 Notes=Note
 AddNewLine=Adaugă linie nouă
 AddFile=Adaugă fişier
-FreeZone=Nu este un produs/serviciu predefinit
+FreeZone=Text liber pentru produs
 FreeLineOfType=Element text gratuit, tip:
 CloneMainAttributes=Clonează obiect cu atributele sale principale
 ReGeneratePDF=Regenerați PDF
@@ -736,7 +739,7 @@ PrintContentArea=Afişaţi pagina pentru imprimat în zona conţinutului princip
 MenuManager=Manager Meniu
 WarningYouAreInMaintenanceMode=Atenție, sunteți în modul de întreținere: este permisă numai utilizarea sistemului de conectare <b> %s </b> în acest mod.
 CoreErrorTitle=Eroare de sistem
-CoreErrorMessage=Scuze, a aparut o eroare. Contactați administratorul de sistem pentru a verifica jurnalele sau  dezactivați $ dolibarr_main_prod = 1 pentru a obține mai multe informații.
+CoreErrorMessage=Scuze, a aparut o eroare. Contactați administratorul de sistem pentru a verifica jurnalele sau dezactivați $ dolibarr_main_prod = 1 pentru a obține mai multe informații.
 CreditCard=Card de credit
 ValidatePayment=Validează plata
 CreditOrDebitCard=Card de credit sau debit
@@ -748,7 +751,7 @@ NotSupported=Nesuportat
 RequiredField=Câmp obligatoriu
 Result=Rezultat
 ToTest=Testează
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=Elementul trebuie validat înainte de a utiliza această caracteristică
 Visibility=Vizibilitate
 Totalizable=Totalizabil
 TotalizableDesc=Acest câmp este totalizat în listă
@@ -776,7 +779,7 @@ LinkToSupplierProposal=Link la propunerea vânzătorului
 LinkToSupplierInvoice=Link la factura furnizorului
 LinkToContract=Link la contract
 LinkToIntervention=Link la intervenție
-LinkToTicket=Link to ticket
+LinkToTicket=Link la tichet
 CreateDraft=Creareză schiţă
 SetToDraft=Inapoi la schiţă
 ClickToEdit=Clic pentru a edita
@@ -792,7 +795,7 @@ ByMonthYear=Pe luna / an
 ByYear=Pe ani
 ByMonth=Pe luni
 ByDay=Pe zi
-BySalesRepresentative=Pe  reprezentant de vânzări
+BySalesRepresentative=Pe reprezentant de vânzări
 LinkedToSpecificUsers=Link către un contact utilizator particular
 NoResults=Niciun Rezultat
 AdminTools=Instrumente de administrare
@@ -823,27 +826,27 @@ AddBox=Adauga box
 SelectElementAndClick=Selectați un element și faceți clic pe %s
 PrintFile=Printeaza Fisierul %s
 ShowTransaction=Afișați intrarea în contul bancar
-ShowIntervention=Afişează  intervenţie
+ShowIntervention=Afişează intervenţie
 ShowContract=Afişează contract
 GoIntoSetupToChangeLogo=Accesați Acasă - Configurare - Companie pentru a schimba logo-ul sau Accesați Acasă - Configurare - Afișare pentru ascundere.
 Deny=Respinge
 Denied=Respins
 ListOf=Listă de %s
-ListOfTemplates=Listă  template-uri
+ListOfTemplates=Listă template-uri
 Gender=Gen
 Genderman=Barbat
 Genderwoman=Femeie
 ViewList=Vedere listă
-ViewGantt=Gantt view
-ViewKanban=Kanban view
+ViewGantt=Vedere Gantt
+ViewKanban=Vedere Kanban
 Mandatory=Obligatoriu
 Hello=Salut
 GoodBye=La revedere
 Sincerely=Cu sinceritate
-ConfirmDeleteObject=Are you sure you want to delete this object?
+ConfirmDeleteObject=Eşti sigur că vrei să ştergi acest obiect?
 DeleteLine=Şterge linie
 ConfirmDeleteLine=Sigur doriți să ștergeți această linie?
-ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator.
+ErrorPDFTkOutputFileNotFound=Eroare: fişierul nu a fost generat. Verifică dacă comanda 'pdftk' este instalată într-un director inclus în variabila de sistem $PATH (doar în linux/unix) sau contactează administratorul sistemului.
 NoPDFAvailableForDocGenAmongChecked=Nu au fost disponibile PDF-uri pentru generarea de documente printre înregistrările înregistrate
 TooManyRecordForMassAction=Prea multe înregistrări selectate pentru acțiuni în masă. Acțiunea este limitată la o listă de %s înregistrări.
 NoRecordSelected=Nu a fost selectată nicio înregistrare
@@ -858,18 +861,18 @@ Progress=Progres
 ProgressShort=Progr.
 FrontOffice=Front office
 BackOffice=Back office
-Submit=Submit
+Submit=Trimite
 View=Vizualizare
 Export=Export
 Exports=Exporturi
 ExportFilteredList=Exportați lista filtrată
 ExportList=Exportați lista
 ExportOptions=Opţiuni Export
-IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
-AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
-NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+IncludeDocsAlreadyExported=Include documentele deja exportate
+ExportOfPiecesAlreadyExportedIsEnable=Exportul elementelor deja exportate este activat
+ExportOfPiecesAlreadyExportedIsDisable=Exportul elementelor deja exportate este dezactivat
+AllExportedMovementsWereRecordedAsExported=Toate mişcările exportate au fost înegistrate ca exportate
+NotAllExportedMovementsCouldBeRecordedAsExported=Nu toate mişcările exportate au putut fi înregistrate ca exportate
 Miscellaneous=Diverse
 Calendar=Calendar
 GroupBy=A se grupa cu...
@@ -882,7 +885,7 @@ Download=Descarcă
 DownloadDocument=Descărcați documentul
 ActualizeCurrency=Actualizați cursul valutar
 Fiscalyear=An fiscal
-ModuleBuilder=Module and Application Builder
+ModuleBuilder=Dezvoltator de module şi aplicaţii
 SetMultiCurrencyCode=Setați moneda
 BulkActions=Acțiunile în masă
 ClickToShowHelp=Faceți clic pentru a afișa instrumente pentru ajutor
@@ -942,6 +945,39 @@ ShortThursday=J
 ShortFriday=V
 ShortSaturday=S
 ShortSunday=D
+one=unu
+two=doi
+three=trei
+four=patru
+five=cinci
+six=şase
+seven=şapte
+eight=opt
+nine=nouă
+ten=zece
+eleven=unsprezece
+twelve=doisprezece
+thirteen=treisprezece
+fourteen=paisprezece
+fifteen=cincisprezece
+sixteen=şaisprezece
+seventeen=şaptesprezece
+eighteen=optsprezece
+nineteen=nouăsprezece
+twenty=douăzeci
+thirty=treizeci
+forty=patruzeci
+fifty=cincizeci
+sixty=şaizeci
+seventy=şaptezeci
+eighty=optzeci
+ninety=nouăzeci
+hundred=sută
+thousand=mie
+million=milion
+billion=miliard
+trillion=trilion
+quadrillion=cvadrilion
 SelectMailModel=Selectați un șablon de email
 SetRef=Set ref
 Select2ResultFoundUseArrows=S-au găsit câteva rezultate. Utilizați săgețile pentru a selecta.
@@ -958,11 +994,11 @@ SearchIntoMembers=Membri
 SearchIntoUsers=Utilizatori
 SearchIntoProductsOrServices=Produse sau servicii
 SearchIntoProjects=Proiecte
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Comenzi de producţie
 SearchIntoTasks=Taskuri
 SearchIntoCustomerInvoices=Facturi Clienţi
 SearchIntoSupplierInvoices=Facturi Furnizori
-SearchIntoCustomerOrders=Ordine de vânzări 
+SearchIntoCustomerOrders=Ordine de vânzări
 SearchIntoSupplierOrders=Comenzile de achiziție
 SearchIntoCustomerProposals=Oferte Comerciale
 SearchIntoSupplierProposals=Propunerile furnizorilor
@@ -974,11 +1010,11 @@ SearchIntoLeaves=Concediu
 SearchIntoTickets=Tichete
 CommentLink=Comentarii
 NbComments=Număr de comentarii
-CommentPage=Spațiu de comentarii 
+CommentPage=Spațiu de comentarii
 CommentAdded=Comentariu adăugat
 CommentDeleted=Comentariul șters
 Everybody=Toată lumea
-PayedBy=Plătite de 
+PayedBy=Plătite de
 PayedTo=Plătit lui
 Monthly=Lunar
 Quarterly=Trimestrial
@@ -996,46 +1032,54 @@ YouAreCurrentlyInSandboxMode=În prezent, sunteți în %s modul "sandbox"
 Inventory=Inventar
 AnalyticCode=Codul analitic
 TMenuMRP=MRP
-ShowMoreInfos=Show More Infos
-NoFilesUploadedYet=Please upload a document first
-SeePrivateNote=See private note
-PaymentInformation=Payment information
-ValidFrom=Valid from
-ValidUntil=Valid until
-NoRecordedUsers=No users
-ToClose=To close
+ShowMoreInfos=Arată mai multe informaţii
+NoFilesUploadedYet=Încarcă un document mai întâi
+SeePrivateNote=Afişare notă privată
+PaymentInformation=Informaţii plată
+ValidFrom=Valid de la
+ValidUntil=Valid până la
+NoRecordedUsers=Nici un utilizator
+ToClose=De închis
 ToProcess=De procesat
-ToApprove=To approve
-GlobalOpenedElemView=Global view
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
-ToAcceptRefuse=To accept | refuse
+ToApprove=De aprobat
+GlobalOpenedElemView=Vedere globală
+NoArticlesFoundForTheKeyword=Nici un articol găsit pentru expresia '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=Nici un articol în această categorie
+ToAcceptRefuse=De acceptat | refuzat
 ContactDefault_agenda=Eveniment
 ContactDefault_commande=Comanda
 ContactDefault_contrat=Contract
 ContactDefault_facture=Factură
 ContactDefault_fichinter=Intervenţie
-ContactDefault_invoice_supplier=Supplier Invoice
-ContactDefault_order_supplier=Purchase Order
+ContactDefault_invoice_supplier=Factură furnizor
+ContactDefault_order_supplier=Comandă de achiziţie
 ContactDefault_project=Proiect
 ContactDefault_project_task=Task
-ContactDefault_propal=Ofertă 
-ContactDefault_supplier_proposal=Supplier Proposal
+ContactDefault_propal=Ofertă
+ContactDefault_supplier_proposal=Ofertă furnizor
 ContactDefault_ticket=Tichet
-ContactAddedAutomatically=Contact added from contact thirdparty roles
-More=More
-ShowDetails=Show details
-CustomReports=Custom reports
-StatisticsOn=Statistics on
-SelectYourGraphOptionsFirst=Select your graph options to build a graph
-Measures=Measures
-XAxis=X-Axis
-YAxis=Y-Axis
-StatusOfRefMustBe=Status of %s must be %s
-DeleteFileHeader=Confirm file delete
-DeleteFileText=Do you really want delete this file?
-ShowOtherLanguages=Show other languages
-SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language
-NotUsedForThisCustomer=Not used for this customer
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
+ContactAddedAutomatically=Contact adăugat din rolurile de contact al terţului
+More=Mai mult
+ShowDetails=Arată detalii
+CustomReports=Rapoarte personalizate
+StatisticsOn=Statistici pentru
+SelectYourGraphOptionsFirst=Selectează opţiunile pentru a construi un grafic
+Measures=Dimensiuni
+XAxis=Axa X
+YAxis=Axa Y
+StatusOfRefMustBe=Status-ul %s trebuie să fie %s
+DeleteFileHeader=Confirmare ştergere fişier
+DeleteFileText=Eşti sigur că vrei să ştergi acest fişier?
+ShowOtherLanguages=Afişare alte limbi
+SwitchInEditModeToAddTranslation=Comută în modul editare pentru a adăuga traduceri pentru această limbă
+NotUsedForThisCustomer=Neutilizat pentru acest client
+AmountMustBePositive=Suma trebuie să fie pozitivă
+ByStatus=După status
+InformationMessage=Informaţie
+Used=Used
+ASAP=Cât Mai Repede Posibil
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/ro_RO/margins.lang b/htdocs/langs/ro_RO/margins.lang
index f5fd2b7a1e8..38a23322f9f 100644
--- a/htdocs/langs/ro_RO/margins.lang
+++ b/htdocs/langs/ro_RO/margins.lang
@@ -16,29 +16,30 @@ MarginDetails=Detalii Marjă
 ProductMargins=Marjă Produs
 CustomerMargins=Marje Client
 SalesRepresentativeMargins=Marje Reprezentanţi vănzări
+ContactOfInvoice=Contact pentru factură
 UserMargins=Marje Utilizator
 ProductService=Produs sau serviciu
 AllProducts=Toate produsele şi serviciile
 ChooseProduct/Service=Alege produs sau serviciu
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNull=Forțaţi prețul de cumpărare / de cost la prețul de vânzare, dacă nu este definit
+ForceBuyingPriceIfNullDetails=Dacă prețul de cumpărare / cost nu este definit și această opțiune este "ON", marja va fi zero pe linie (cumpărarea / prețul de cost = prețul de vânzare), în caz contrar ("OFF"), marginea va fi egală cu cea indicată.
 MARGIN_METHODE_FOR_DISCOUNT=Metoda marje pentru discounturi globale
 UseDiscountAsProduct=Ca produs
 UseDiscountAsService=Ca serviciu
 UseDiscountOnTotal=Pe subtotal
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiti daca discontul global e tratat ca un produs, serviciu, sau numai pe total la calcularea marjei.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best vendor price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best vendor price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MARGIN_TYPE=Prețul de cumpărare / cost sugerat implicit pentru calcularea marjei
+MargeType1=Marja la prețul cel mai bun al furnizororului
+MargeType2=Marja privind prețul mediu ponderat (WAP)
+MargeType3=Marja pe prețul de cost
+MarginTypeDesc=* Marja la prețul cel mai bun de cumpărare = Prețul de vânzare - Cel mai bun preț al furnizorului definit pe cardul de produs <br> * Marja pe prețul mediu ponderat (WAP) = Prețul de vânzare - prețul mediu ponderat al produsului(WAP)sau cel mai bun preț al furnizorului dacă WAP nu este definit încă <br> Marja pe prețul de preț = prețul de vânzare - prețul de cost definit pe cardul de produs sau WAP dacă prețul de cost nu este definit sau cel mai bun preț al vânzătorului dacă WAP nu este încă definit
 CostPrice=Preţ de cost
 UnitCharges=Cheluieli unitare
 Charges=Cheltuieli
 AgentContactType=Tip contact agent comercial
-AgentContactTypeDetails=Defineşte ce tip de contact ( legat pe factură) va fi utilizat pentru raportul marjei pe reprezentanti de vânzări
+AgentContactTypeDetails= Definiți ce tip de contact (legat pe facturi) va fi utilizat pentru raportarea marjei pentru fiecare persoană de contact / adresă. Rețineți că citirea statisticilor referitoare la un contact nu este fiabilă, deoarece în cele mai multe cazuri, contactul nu poate fi definit explicit pe facturi.
 rateMustBeNumeric=Rata trebuie să fie numerică
 markRateShouldBeLesserThan100=Rata mîrcii trebuie să fie mai mica de 100
 ShowMarginInfos=Arată informaţii marjă
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=The report of margin per user use the link between third parties and sale representatives to calculate the margin of each sale representative. Because some thirdparties may not have any ddiated sale representative and some thirdparties may be linked to several, some amounts may not be included into this report (if there is no sale representative) and some may appear on different lines (for each sale representative).
+CheckMargins=Detaliu marjă
+MarginPerSaleRepresentativeWarning=Raportul privind marja per utilizator utilizează legătura dintre terți și reprezentanții de vânzare pentru a calcula marja fiecărui reprezentant de vânzare. Deoarece unii terți nu pot avea un reprezentant dedicat vânzării și unii terți pot fi legate de mai mulți, este posibil ca anumite sume să nu fie incluse în acest raport (dacă nu există reprezentant de vânzare) și unele pot apărea pe diferite linii (pentru fiecare reprezentant de vânzare) .
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index e309826e690..973f720f105 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -7,7 +7,7 @@ Members=Membri
 ShowMember=Arată fişa Membru
 UserNotLinkedToMember=Utilizator nelegat  la un Membru
 ThirdpartyNotLinkedToMember=Terț care nu este legat de un membru
-MembersTickets=Etichete Membri
+MembersTickets=Tichete Membri
 FundationMembers=Membri Asociaţiei
 ListOfValidatedPublicMembers=Listă Membri publici validaţi
 ErrorThisMemberIsNotPublic=Acest membru nu este public
@@ -29,7 +29,7 @@ MenuMembersUpToDate=Membri cu cotizaţia la zi
 MenuMembersNotUpToDate=Membri fără  cotizaţia la zi
 MenuMembersResiliated=Membrii desființați
 MembersWithSubscriptionToReceive=Membri cu cotizaţia de încasat
-MembersWithSubscriptionToReceiveShort=Subscription to receive
+MembersWithSubscriptionToReceiveShort=Cotizaţie de încasat
 DateSubscription=Data Adeziune
 DateEndSubscription=Dată Sfârşit Adeziune
 EndSubscription=Sfârşit Adeziune
@@ -52,6 +52,9 @@ MemberStatusResiliated=Membru desființat
 MemberStatusResiliatedShort=Desființat
 MembersStatusToValid=Membri schiţă
 MembersStatusResiliated=Membrii desființați
+MemberStatusNoSubscription=Validată(nu este necesară cotizarea)
+MemberStatusNoSubscriptionShort=Validată
+SubscriptionNotNeeded=Nu este necesară cotizarea
 NewCotisation=Cotizaţie nouă
 PaymentSubscription=Plată cotizaţie nouă
 SubscriptionEndDate=Data de final a adeziunii
@@ -78,7 +81,7 @@ DeleteType=Şterge
 VoteAllowed=Drept de vot
 Physical=Fizică
 Moral=Morală
-MorPhy=Morală / fizică
+MorPhy=Personalitate juridică
 Reenable=Reactivaţi
 ResiliateMember=Desfiinţaţi un membru
 ConfirmResiliateMember=Sigur doriți să desfiinţaţi acest membru?
@@ -172,7 +175,7 @@ MembersStatisticsDesc=Alege statisticile pe care doriţi să le citiţi ...
 MenuMembersStats=Statistici
 LastMemberDate=Ultima dată de membru
 LatestSubscriptionDate=Ultima dată de abonament
-MemberNature=Nature of member
+MemberNature=Natură membru
 Public=Profil public
 NewMemberbyWeb=Membru nou adăugat. În aşteptarea validării
 NewMemberForm=Formular Membru nou
@@ -198,4 +201,4 @@ SendReminderForExpiredSubscriptionTitle=Trimiteți un memento prin email pentru
 SendReminderForExpiredSubscription=Trimiteți un memento prin email membrilor când abonamentul este pe cale să expire (parametrul este numărul de zile înainte de încheierea abonamentului pentru a trimite o reamintire. Poate fi o listă de zile separate prin punct și virgulă, de exemplu '10; 5; 0; -5 „)
 MembershipPaid=Abonament plătit pentru perioada curentă (până la %s)
 YouMayFindYourInvoiceInThisEmail=Găsiți factura dvs. atașată acestui email
-XMembersClosed=%s member(s) closed
+XMembersClosed=%s membru(i) închis
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index b7d02b6dd7b..090269ab52f 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - loan
-ModuleBuilderDesc=This tool must be used only by experienced users or developers. It provides utilities to build or edit your own module. Documentation for alternative <a href="%s" target="_blank">manual development is here</a>.
+ModuleBuilderDesc=Acest instrument poate fi folosit doar de utilizatori cu experiență sau dezvoltatori de software. Oferă facilităţi pentru a vă construi sau edita propriul modul. Documentația pentru <a href="%s" target="_blank">dezvoltare software alternativă se găsește aici</a>. 
 EnterNameOfModuleDesc=Introduceți numele modulului/aplicației pentru a crea fără spații. Utilizați majusculă pentru a separa cuvintele (De exemplu: MyModule, EcommerceForShop, SyncWithMySystem ...)
 EnterNameOfObjectDesc=Introduceți numele obiectului de creat fără spații. Utilizați majusculă pentru a separa cuvintele (De exemplu: MyObject, Student, Profesor ...). Se va genera și fișierul clasa CRUD, dar și fișierul API, paginile care vor lista/adăuga/edita/șterge obiectul și fișierele SQL.
-ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
+ModuleBuilderDesc2=Calea unde sunt generate/editate modulele (primul director pentru module externe definite în %s): <strong>%s</strong>
 ModuleBuilderDesc3=Module generate sau editabile găsite: <strong> %s </strong>
 ModuleBuilderDesc4=Un modul este detectat ca "editabil" atunci când fișierul <strong> %s </strong> există în rădăcina directorului modulului
 NewModule=Modul nou
@@ -21,14 +21,14 @@ ModuleBuilderDesctriggers=Aceasta este vizualizarea declanșatorilor furnizați
 ModuleBuilderDeschooks=Această filă este dedicată cârligelor.
 ModuleBuilderDescwidgets=Această filă este dedicată administrării/construirii widgeturilor.
 ModuleBuilderDescbuildpackage=Puteți genera aici un fișier pachet "pregătit pentru distribuire" (un fișier .zip normalizat) al modulului dvs. și un fișier de documentație "gata de distribuire". Doar faceți clic pe butonul pentru a construi pachetul sau documentația.
-EnterNameOfModuleToDeleteDesc=You can delete your module. WARNING: All coding files of module (generated or created manually) AND structured data and documentation will be deleted!
-EnterNameOfObjectToDeleteDesc=You can delete an object. WARNING: All coding files (generated or created manually) related to object will be deleted!
+EnterNameOfModuleToDeleteDesc= Puteți șterge modulul pe care l-aţi creat. ATENŢIE: Toate fișierele de cod ale modulului (generate sau create manual) ȘI datele și documentația de structură vor fi șterse!
+EnterNameOfObjectToDeleteDesc=Puteți șterge un obiect. ATENŢIE: Toate fișierele de cod (generate sau create manual) legate de obiect vor fi șterse!
 DangerZone=Zona periculoasă
 BuildPackage=Construiți pachetul
-BuildPackageDesc=You can generate a zip package of your application so your are ready to distribute it on any Dolibarr. You can also distribute it or sell it on marketplace like <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildPackageDesc=Puteți genera un pachet zip al aplicației dvs., pentru a-l putea distribui in orice implementare de Dolibarr. Puteți, de asemenea, să-l distribuiți sau să-l vindeţi în marketplace, de exemplu pe <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Construiți documentația
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
-ModuleIsLive=This module has been activated. Any change may break a current live feature.
+ModuleIsNotActive=Acest modul nu este activat încă. Mergi la %s a-l activa sau dă click aici 
+ModuleIsLive=Acest modul a fost activat. Orice modificare poate duce la disfuncţionalităţi ale versiuni curente activate.  
 DescriptionLong=Descriere lungă
 EditorName=Numele editorului
 EditorUrl=Adresa URL a editorului
@@ -41,14 +41,14 @@ PageForAgendaTab=Pagina PHP pentru fila eveniment
 PageForDocumentTab=Pagina PHP pentru fila document
 PageForNoteTab=Pagina PHP pentru fila note
 PathToModulePackage=Calea pentru zipul pachetului de module/aplicații
-PathToModuleDocumentation=Path to file of module/application documentation (%s)
+PathToModuleDocumentation=Calea către fişierul documentaţie al modulului/aplicaţiei (%s)
 SpaceOrSpecialCharAreNotAllowed=Spațiile sau caracterele speciale nu sunt permise.
 FileNotYetGenerated=Fișierul nu a fost încă generat
-RegenerateClassAndSql=Force update of .class and .sql files
+RegenerateClassAndSql=Forţează actualizarea fişierelor .class şi .sql
 RegenerateMissingFiles=Generați fișierele lipsă
-SpecificationFile=File of documentation
+SpecificationFile=Fişier de documentaţie
 LanguageFile=Fișier pentru limbă
-ObjectProperties=Object Properties
+ObjectProperties=Proprietăţi obiect
 ConfirmDeleteProperty=Sigur doriți să ștergeți proprietatea <strong> %s </strong>? Acest lucru va schimba codul în clasa PHP, dar va elimina și coloana din definiția tabelului de obiect.
 NotNull=Nu NUL
 NotNullDesc=1 = Setați baza de date la NOT NULL. -1 = Permite valorile null și valoarea forței la NULL dacă este goală ('' sau 0).
@@ -60,17 +60,17 @@ HooksFile=Fișier pentru codul cârligelor
 ArrayOfKeyValues=Mulțimea de valori cheie
 ArrayOfKeyValuesDesc=Mulțimea de chei și valori dacă câmpul este o listă combo cu valori fixe
 WidgetFile=Fișier widget
-CSSFile=CSS file
-JSFile=Javascript file
+CSSFile=Fişier CSS
+JSFile=Fişier Javascript
 ReadmeFile=Fișierul Readme
 ChangeLog=Fișierul ChangeLog
 TestClassFile=Fișier pentru unitatea PHP Unitate de testare
 SqlFile=Dosar SQL
-PageForLib=File for the common PHP library
-PageForObjLib=File for the PHP library dedicated to object
+PageForLib=Fişier pentru librăria common PHP 
+PageForObjLib=Fişier pentru librăria PHP dedicată obiectului
 SqlFileExtraFields=Dosar SQL pentru atributele complementare
 SqlFileKey=Dosar SQL pentru chei
-SqlFileKeyExtraFields=Sql file for keys of complementary attributes
+SqlFileKeyExtraFields=Fişier SQL pentru cheile atributelor complementare
 AnObjectAlreadyExistWithThisNameAndDiffCase=Un obiect există deja cu acest nume și cu un alt caz
 UseAsciiDocFormat=Puteți utiliza formatul Markdown, dar este recomandat să utilizați formatul Asciidoc (omparison între .md și .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Este o măsură
@@ -79,23 +79,23 @@ NoTrigger=Niciun declanșator
 NoWidget=Nu există widget
 GoToApiExplorer=Mergeți la exploratorul API
 ListOfMenusEntries=Lista intrărilor din meniu
-ListOfDictionariesEntries=List of dictionaries entries
+ListOfDictionariesEntries=Listă înregistrări dicţionare
 ListOfPermissionsDefined=Lista permisiunilor definite
 SeeExamples=Vedeți aici exemple
 EnabledDesc=Condiție de activare a acestui câmp (Exemple: 1 sau $ conf-> global-> MYMODULE_MYOPTION)
-VisibleDesc=Is the field visible ? (Examples: 0=Never 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 end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).<br><br>It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br/>Currently, known compatibles PDF models are : eratosthene (order), espadon (ship), sponge (invoices), cyan (propal/quotation), cornas (supplier order)<br/><br/><strong>For document :</strong><br/>0 = not displayed <br/>1 = display<br/>2 = display only if not empty<br/><br/><strong>For document lines :</strong><br/>0 = not displayed <br/>1 = displayed in a column<br/>3 = display in line description column after the description<br/>4 = display in description column after the description only if not empty
-DisplayOnPdf=Display on PDF
+VisibleDesc=Este vizibil câmpul? (Exemple: 0 = Invizibil întotdeauna, 1 = Vizibil în liste și în formularele de creare/actualizare/vizualizare, 2 = Vizibil doar în liste, 3 = Vizibil numai în formularele de creare/actualizare/vizualizare (nu în liste), 4 = Vizibil în liste și în formularele de actualizare/vizualizare (nu în cele de creare), 5 = Vizibil numai pe formularul de vizualizare finală a listei (nu pe cele de creare sau actualizare).<br><br> Utilizarea unei valori negative înseamnă că  câmp nu este afișat implicit în listă, dar poate fi selectat pentru vizualizare).<br><br>Poate  fi o expresie, de exemplu: <br>preg_match ('/ public /', $ _SERVER ['PHP_SELF'])? 0: 1 <br>($ user-> rights-> holiday-> define_holiday? 1: 0)
+DisplayOnPdfDesc=Afișați acest câmp pe documente PDF compatibile, puteți gestiona poziția cu câmpul „Poziție”.<br/> În prezent, modelele PDF compatibile cunoscute sunt: ​​eratosten (comandă), espadon (livrare), sponge (facturi), cyan (propunere/ofertă), cornas (comandă achiziţie)<br/><br/><strong> Pentru documente: </strong><br/>0 = nu se afișează <br/>1 = se afișează <br/>2 = se afișează dacă este completat <br/><br/><strong>Pentru linii de document: </strong><br/>0 = nu se afişează <br/>1 = se afișează într-o coloană <br/>3 = se afișează în coloana descriere după descriere <br/>4 = se afișează în coloana descriere după descriere dacă este completat 
+DisplayOnPdf=Afişare în PDF
 IsAMeasureDesc=Poate fi cumulata valoarea câmpului pentru a obține un total în listă? (Exemple: 1 sau 0)
 SearchAllDesc=Este câmpul folosit pentru a face o căutare din instrumentul de căutare rapidă? (Exemple: 1 sau 0)
 SpecDefDesc=Introduceți aici toată documentația pe care doriți să o furnizați împreună cu modulul, care nu este deja definită de alte file. Puteți utiliza .md sau mai bine, sintaxa bogată .asciidoc.
 LanguageDefDesc=Introduceți în aceste fișiere toate cheile și traducerea pentru fiecare fișier lingvistic.
-MenusDefDesc=Define here the menus provided by your module
-DictionariesDefDesc=Define here the dictionaries provided by your module
-PermissionsDefDesc=Define here the new permissions provided by your module
-MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
-DictionariesDefDescTooltip=The dictionaries provided by your module/application are defined into the array <strong>$this->dictionaries</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), dictionaries are also visible into the setup area to administrator users on %s.
-PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
+MenusDefDesc=Defineşte aici meniurile generate de modulul tău
+DictionariesDefDesc=Defineşte aici dicţionarele furnizate de modulul tău
+PermissionsDefDesc=Defineşte aici noile permisiuni furnizate de modulul tău
+MenusDefDescTooltip=Meniurile furnizate de modulul/aplicația dvs. sunt definite în tabloul <strong>$this->menus</strong> în fișierul de descriere al modulului. Puteți edita manual acest fișier sau puteți utiliza editorul încorporat.<br><br> Notă: odată definit (și reactivat modulul), meniurile sunt vizibile și în editorul de meniu disponibil pentru administratori la %s.
+DictionariesDefDescTooltip=Dicționarele furnizate de modulul/aplicația dvs. sunt definite în tabloul <strong>$ this->dictionaries</strong> în fișierul de descriere al modulului. Puteți edita manual acest fișier sau puteți utiliza editorul încorporat.<br><br> Notă: Modulul o dată definit (și reactivat), dicționarele lui sunt vizibile și în zona de configurare pentru administratori la %s.
+PermissionsDefDescTooltip= Permisiunile furnizate de modulul/aplicația dvs. sunt definite în matricea <strong>$ this->rights</strong> în fișierul de descriere al modulului. Puteți edita manual acest fișier sau puteți utiliza editorul încorporat. <br><br>Notă: Modulul o dată definit (și reactivat), permisiunile sunt vizibile în configurarea de bază a permisiunilor %s.
 HooksDefDesc=Definiți în proprietatea <b> module_parts ['hooks'] </b>, în descriptorul modulului, contextul de cârlige pe care doriți să îl gestionați (lista de contexte poate fi găsită printr-o căutare pe '<b> initHooks (</b>' din codul principal) <br> Edit fișierul cu cârlig pentru a adăuga codul funcțiilor dvs. înclinate (funcțiile legate pot fi găsite printr-o căutare pe '<b> executeHooks </b>' în codul principal).
 TriggerDefDesc=Definiți în fișierul declanșator codul pe care doriți să-l executați pentru fiecare eveniment de afaceri executat.
 SeeIDsInUse=Vedeți ID-urile utilizate în instalarea dvs.
@@ -112,31 +112,31 @@ InitStructureFromExistingTable=Construiți șirul de structură al unui tabel ex
 UseAboutPage=Dezactivați pagina 
 UseDocFolder=Dezactivați dosarul de documentare
 UseSpecificReadme=Utilizați un anumit ReadMe
-ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
+ContentOfREADMECustomized=Notă: Conținutul fișierului README.md a fost înlocuit cu valoarea specifică definită la configurarea ModuleBuilder. 
 RealPathOfModule=Calea reală a modulului
 ContentCantBeEmpty=Conținutul fișierului nu poate fi gol
-WidgetDesc=You can generate and edit here the widgets that will be embedded with your module.
-CSSDesc=You can generate and edit here a file with personalized CSS embedded with your module.
-JSDesc=You can generate and edit here a file with personalized Javascript embedded with your module.
-CLIDesc=You can generate here some command line scripts you want to provide with your module.
-CLIFile=CLI File
-NoCLIFile=No CLI files
-UseSpecificEditorName = Use a specific editor name
-UseSpecificEditorURL = Use a specific editor URL
-UseSpecificFamily = Use a specific family
-UseSpecificAuthor = Use a specific author
-UseSpecificVersion = Use a specific initial version
-ModuleMustBeEnabled=The module/application must be enabled first
-IncludeRefGeneration=The reference of object must be generated automatically
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
-IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
-ShowOnCombobox=Show value into combobox
-KeyForTooltip=Key for tooltip
-CSSClass=CSS Class
-NotEditable=Not editable
-ForeignKey=Foreign key
-TypeOfFieldsHelp=Type of fields:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' means we add a + button after the combo to create the record, 'filter' can be 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' for example)
-AsciiToHtmlConverter=Ascii to HTML converter
-AsciiToPdfConverter=Ascii to PDF converter
-TableNotEmptyDropCanceled=Table not empty. Drop has been canceled.
+WidgetDesc=Puteți genera și edita aici widgeturile care vor fi încorporate în modulul dvs.
+CSSDesc=Poţi genera şi edita aici un fişier personalizat CSS care va fi încorporat în modulul tău. 
+JSDesc=Puteți genera și edita aici un fișier Javascript personalizat care va fi încorporat în modulul dvs.
+CLIDesc=Poţi genera aici spript-uri în linie comandă pe care să le furnizezi cu modulul tău.
+CLIFile=Fişier CLI
+NoCLIFile=Nici un fişier CLI
+UseSpecificEditorName = Utilizează un nume specificat de editor
+UseSpecificEditorURL = Utilizează un URL specificat de editor
+UseSpecificFamily = Utilizează o familie specifică
+UseSpecificAuthor = Utilizează un autor specific
+UseSpecificVersion = Utilizează o versiune iniţială specifică
+ModuleMustBeEnabled=Modulul/aplicaţia trebuie activată mai întâi
+IncludeRefGeneration=Referinţa obiectului trebuie să fie generată automat
+IncludeRefGenerationHelp=Bifează aceasta dacă vrei să incluzi cod de management pentru generarea automată a referinţei
+IncludeDocGeneration=Vreau să generez documente din obiect
+IncludeDocGenerationHelp=Dacă bifaţi, va fi generat cod pentru a adăuga o casetă "Generare document" în înregistrarea respectivă. 
+ShowOnCombobox=Afişează valoare în combox
+KeyForTooltip=Cheie pentru tooltip
+CSSClass=Clasă CSS
+NotEditable=Needitabil
+ForeignKey=Cheie străină
+TypeOfFieldsHelp=Tip de câmpuri: <br>varchar (99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php [: 1 [: filter]] ( '1' înseamnă că adăugăm un buton + după combo pentru a crea înregistrarea, 'filtru' poate fi 'status = 1 ȘI fk_user = __USER_ID ȘI entity IN (__SHARED_ENTITIES__)', de exemplu) 
+AsciiToHtmlConverter=Convertor ASCII la HTML
+AsciiToPdfConverter=Convertor ASCII la PDF
+TableNotEmptyDropCanceled=Tabelul nu este gol. Operaţiunea de drop a fost anulată. 
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index 1c7d38c59a0..7e50b46154f 100644
--- a/htdocs/langs/ro_RO/mrp.lang
+++ b/htdocs/langs/ro_RO/mrp.lang
@@ -1,77 +1,78 @@
-Mrp=Manufacturing Orders
-MO=Manufacturing Order
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
-MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
-MenuBOM=Bills of material
-LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Bills of Material
-BillOfMaterials=Bill of Material
+Mrp=Comenzi de producţie
+MO=Comandă de producţie 
+MOs=Manufacturing orders
+MRPDescription=Modulul de gestionare a comenzilor de producție și fabricare (MO).
+MRPArea=Producţie
+MrpSetupPage=Configurare modul MRP
+MenuBOM=Bonuri de consum
+LatestBOMModified=Ultimele %s bonuri de consum modificate
+LatestMOModified=Ultimele %s Comenzi de producţie modificate
+Bom=Bonuri de consum
+BillOfMaterials=Bon de consum
 BOMsSetup=Configurarea modulului BOM 
-ListOfBOMs=List of bills of material - BOM
-ListOfManufacturingOrders=List of Manufacturing Orders
-NewBOM=New bill of material
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
-BOMsNumberingModules=BOM numbering templates
-BOMsModelModule=BOM document templates
-MOsNumberingModules=MO numbering templates
-MOsModelModule=MO document templates
-FreeLegalTextOnBOMs=Free text on document of BOM
-WatermarkOnDraftBOMs=Watermark on draft BOM
-FreeLegalTextOnMOs=Free text on document of MO
-WatermarkOnDraftMOs=Watermark on draft MO
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of material %s ?
-ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
-ManufacturingEfficiency=Manufacturing efficiency
-ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Material?
-ConfirmDeleteMo=Are you sure you want to delete this Bill Of Material?
-MenuMRP=Manufacturing Orders
-NewMO=New Manufacturing Order
-QtyToProduce=Qty to produce
-DateStartPlannedMo=Date start planned
-DateEndPlannedMo=Date end planned
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
-EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
-ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
-ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
-ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)
-StatusMOProduced=Produced
-QtyFrozen=Frozen Qty
-QuantityFrozen=Frozen Quantity
-QuantityConsumedInvariable=When this flag is set, the quantity consumed is always the value defined and is not relative to the quantity produced.
-DisableStockChange=Stock change disabled
-DisableStockChangeHelp=When this flag is set, there is no stock change on this product, whatever is the quantity consumed
-BomAndBomLines=Bills Of Material and lines
-BOMLine=Line of BOM
-WarehouseForProduction=Warehouse for production
-CreateMO=Create MO
-ToConsume=To consume
-ToProduce=To produce
-QtyAlreadyConsumed=Qty already consumed
-QtyAlreadyProduced=Qty already produced
-QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
-TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
-ForAQuantityOf=For a quantity to produce of %s
-ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
-ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
-ProductionForRef=Production of %s
-AutoCloseMO=Close automatically the Manufacturing Order if quantities to consume and to produce are reached
-NoStockChangeOnServices=No stock change on services
-ProductQtyToConsumeByMO=Product quantity still to consume by open MO
-ProductQtyToProduceByMO=Product quentity still to produce by open MO
-AddNewConsumeLines=Add new line to consume
-ProductsToConsume=Products to consume
-ProductsToProduce=Products to produce
-UnitCost=Unit cost
-TotalCost=Total cost
-BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price)
+ListOfBOMs=Listă bonuri de consum - BOM
+ListOfManufacturingOrders=Listă comenzi de producţie
+NewBOM=Bon de consum nou
+ProductBOMHelp=Produs de fabricat cu acest bon de consum.<br>Notă: Produsele cu proprietatea 'Natură produs' = 'Materie primă' nu sunt vizibile în această listă.
+BOMsNumberingModules=Şabloane numerotare BOM
+BOMsModelModule=Şabloane documente BOM
+MOsNumberingModules=Şabloane numerotare Comenzi de producţie
+MOsModelModule=Şabloane document Comandă de producţie
+FreeLegalTextOnBOMs=Text liber pe documentul Bon de consum
+WatermarkOnDraftBOMs=Marcare schiţă Bon de consum BOM
+FreeLegalTextOnMOs=Text liber pe documentul Comandă de producţie
+WatermarkOnDraftMOs=Macaj pe schiţă Comandă de producţie
+ConfirmCloneBillOfMaterials=Eşti sigur că vrei să clonezi bonul de consum %s ?
+ConfirmCloneMo=Eşti sigur că vrei să clonezi Comanda de producţie %s ?
+ManufacturingEfficiency=Eficienţa producţiei
+ConsumptionEfficiency=Eficienţa consumului
+ValueOfMeansLoss=Valoarea de 0,95 înseamnă o medie de 5 %% pierderi în timpul producției 
+ValueOfMeansLossForProductProduced= Valoarea de 0,95 înseamnă o medie de 5 %% pierdere din produsul fabricat
+DeleteBillOfMaterials=Şterge Bonuri de consum
+DeleteMo=Şterge comanda de producţie
+ConfirmDeleteBillOfMaterials=Eşti sigur că vrei să ştergi acest Bon de consum?
+ConfirmDeleteMo=Eşti sigur că vrei să ştergi acest Bon de consum?
+MenuMRP=Comenzi de producţie
+NewMO=Comandă de producţie nouă
+QtyToProduce=Cantitate de fabricat
+DateStartPlannedMo=Data de începere planificată
+DateEndPlannedMo=Dată de finalizare planificată
+KeepEmptyForAsap=Necompletat înseamnă 'Cât mai repede posibil' 
+EstimatedDuration=Durată estimată
+EstimatedDurationDesc=Durata estimată de fabricație a acestui produs pe baza acestui Bon de consum 
+ConfirmValidateBom=Sunteți sigur că doriți să validați Bonul de consum cu referința <strong>%s</strong> (îl veți putea folosi pentru a genera noi Comenzi de fabricație)
+ConfirmCloseBom=Sunteți sigur că doriți să anulați acest Bon de consum (nu îl veți mai putea folosi pentru a genera noi Comenzi de fabricație) ? 
+ConfirmReopenBom=Sunteți sigur că doriți să redeschideți acest Bon de consum (îl veți putea folosi pentru a genera noi Comenzi de fabricație)
+StatusMOProduced=Fabricat
+QtyFrozen=Cantitate ingheţată
+QuantityFrozen=Cantitate îngheţată
+QuantityConsumedInvariable=Când acest semnalizator este setat, cantitatea consumată este întotdeauna valoarea definită și nu este relativă la cantitatea produsă.
+DisableStockChange=Modificarea de stoc este dezactivată
+DisableStockChangeHelp=Când acest semnalizator este setat, nu va exista nici o modificare a stocului pentru acest produs, indiferent de cantitatea consumată
+BomAndBomLines=Bonuri de consum şi linii
+BOMLine=Linie comandă de producţie
+WarehouseForProduction=Depozit pentru producţie
+CreateMO=Creare Comandă de producţie
+ToConsume=De consumat
+ToProduce=De fabricat
+QtyAlreadyConsumed=Cantitate deja consumată
+QtyAlreadyProduced=Cantitate deja fabricată
+QtyRequiredIfNoLoss=Cantitate necesară dacă nu există pierderi (eficiența de fabricație este 100%%) 
+ConsumeOrProduce=Consumă sau Produce
+ConsumeAndProduceAll=Consumă sau Produce tot
+Manufactured=Fabricat
+TheProductXIsAlreadyTheProductToProduce= Produsul de adăugat este deja produsul de fabricat.
+ForAQuantityOf=Pentru o cantitate de fabricat din %s
+ConfirmValidateMo=Eşti sigur că vrei să validezi această Comandă de producţie?
+ConfirmProductionDesc=Făcând clic pe '%s', veți valida consumul și/sau producția pentru cantitățile stabilite. Acest lucru va actualiza, de asemenea, stocurile și vor înregistra mișcările de stoc. 
+ProductionForRef=Producţia a %s
+AutoCloseMO=Închidere automată Comandă de fabricație dacă se ating cantitățile de consumat și de fabricat
+NoStockChangeOnServices=Fără modificări de stoc pentru servicii
+ProductQtyToConsumeByMO=Cantitatea de produs rămasă de consumat pe Comanda de fabricaţie deschisă
+ProductQtyToProduceByMO=cantitatea de produs rămasă de fabricat pe Comanda de fabricaţie
+AddNewConsumeLines=Adaugă o linie de consum
+ProductsToConsume=Produse de consumat
+ProductsToProduce=Produse de fabricat
+UnitCost=Cost unitar
+TotalCost=Cost total
+BOMTotalCost=Costul pentru fabricaţia acestui Bon de consum în funcție de costul fiecărei cantități și produs de consumat (utilizați Prețul de cost, dacă este definit, altfel Prețul mediu ponderat, dacă este definit, altfel cel mai bun preț de achiziție)
diff --git a/htdocs/langs/ro_RO/multicurrency.lang b/htdocs/langs/ro_RO/multicurrency.lang
index 9e55663db90..cc0dc65ad0d 100644
--- a/htdocs/langs/ro_RO/multicurrency.lang
+++ b/htdocs/langs/ro_RO/multicurrency.lang
@@ -7,10 +7,10 @@ multicurrency_syncronize_error=Eroare de sincronizare: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilizați data documentului pentru a găsi rata valutei, în loc să utilizați cea mai recentă rată cunoscută
 multicurrency_useOriginTx=Când un obiect este creat din altul, păstrați rata inițială din obiectul sursă (altfel utilizați ultima rată cunoscută)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=You must create an account on website %s to use this functionality.<br>Get your <b>API key</b>.<br>If you use a free account, you can't change the <b>source currency</b> (USD by default).<br>If your main currency is not USD, the application will automatically recalculate it.<br><br>You are limited to 1000 synchronizations per month.
+CurrencyLayerAccount_help_to_synchronize=Pentru a utiliza această funcţionalitate trebuie să creaţi un cont pe site-ul  %s .<br>Obţineţi  <b>cheia API</b>.<br>dacă utilizaţi un cont gratuit, nu puteţi schimba <b>moneda principală</b> (USD in mod implicit).<br>Dacă moneda ta principală nu este USD - dolar american, aplicaţia va recalcula automat valorile.<br><br>Eşti limitat la  1000 sincronizări pe lună.
 multicurrency_appId=Cheia API
-multicurrency_appCurrencySource=Source currency
-multicurrency_alternateCurrencySource=Alternate source currency
+multicurrency_appCurrencySource=Monedă principală
+multicurrency_alternateCurrencySource=Monedă principală alternativă
 CurrenciesUsed=Valute utilizate
 CurrenciesUsed_help_to_add=Adăugați diferitele valute și ratele pe care trebuie să le utilizați pentru <b> propunerile dvs.  </b>, <b> ordine </b> etc.
 rate=rată
@@ -18,5 +18,5 @@ MulticurrencyReceived=Primite, valuta inițială
 MulticurrencyRemainderToTake=Valoarea rămasă, moneda inițială
 MulticurrencyPaymentAmount=Suma plății, moneda inițială
 AmountToOthercurrency=Suma pentru (în moneda contului de primire)
-CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
-MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
+CurrencyRateSyncSucceed=Sincronizarea cursului valutar a fost efectuată cu succes
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Utilizează moneda documentului pentru plățile online
diff --git a/htdocs/langs/ro_RO/oauth.lang b/htdocs/langs/ro_RO/oauth.lang
index 4d58dbce5e5..6bb293ad935 100644
--- a/htdocs/langs/ro_RO/oauth.lang
+++ b/htdocs/langs/ro_RO/oauth.lang
@@ -28,5 +28,5 @@ OAUTH_GITHUB_NAME=Serviciul OAuth GitHub
 OAUTH_GITHUB_ID=ID-ul OAuth GitHub
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
 OAUTH_GITHUB_DESC=Mergeți la <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> această pagină </a> apoi "Înregistrați o nouă aplicație" pentru a crea acreditările OAuth
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_TEST_NAME=Testare OAuth Stripe
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
diff --git a/htdocs/langs/ro_RO/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang
index 32701008c68..25a9479092e 100644
--- a/htdocs/langs/ro_RO/opensurvey.lang
+++ b/htdocs/langs/ro_RO/opensurvey.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - opensurvey
 Survey=Sondaj
 Surveys=Sondaje
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+OrganizeYourMeetingEasily=Organizați-vă ușor întâlnirile și chestionarele. Mai întâi selectați tipul de sondaj...
 NewSurvey=Sondaj nou
 OpenSurveyArea=Sondaje
 AddACommentForPoll=Puteţi adăuga un comentariu în sondaj...
@@ -37,7 +37,7 @@ ExpireDate=Data limită
 NbOfSurveys=Numărul sondajelor
 NbOfVoters=Numărul de alegători
 SurveyResults=Rezultate
-PollAdminDesc=Vi se permite să schimbaţi toate liniile de vot ale acestui sondaj cu butonul "Editează". Puteți, de asemenea, elimina o coloană sau o linie cu % s. Puteți adăuga, de asemenea, o nouă coloană cu % s.
+PollAdminDesc=Vi se permite să schimbaţi toate liniile de vot ale acestui sondaj cu butonul "Editează". Puteți, de asemenea, elimina o coloană sau o linie cu %s. Puteți adăuga, de asemenea, o nouă coloană cu %s.
 5MoreChoices=Mai mult de 5 alegeri
 Against=Împotrivă
 YouAreInivitedToVote=Sunteţi invitaţi să votaţi acest sondaj
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 0ae0c5eba4d..9bbc1d3ffed 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -11,7 +11,7 @@ OrderDate=Dată Comandă
 OrderDateShort=Data comandă
 OrderToProcess=Comandă de procesat
 NewOrder=Comandă nouă
-NewOrderSupplier=New Purchase Order
+NewOrderSupplier=Comandă achiziţie nouă
 ToOrder=Plasează comanda
 MakeOrder=Plasează comanda
 SupplierOrder=Comandă de achiziție
@@ -26,8 +26,8 @@ OrdersToBill=Comenzi de vânzări livrate
 OrdersInProcess=Comenzi de vânzări în curs
 OrdersToProcess=Comenzile de vânzări pentru procesare
 SuppliersOrdersToProcess=Comenzile de cumpărare pentru procesare
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
+SuppliersOrdersAwaitingReception=Comenzi de achiziţie în aşteptarea recepţiei
+AwaitingReception=În aşteptarea recepţiei
 StatusOrderCanceledShort=Anulata
 StatusOrderDraftShort=Schiţă
 StatusOrderValidatedShort=Validat
@@ -47,7 +47,7 @@ StatusOrderCanceled=Anulată
 StatusOrderDraft=Schiţă (de validat)
 StatusOrderValidated=Validată
 StatusOrderOnProcess=Comandate - receptie standby
-StatusOrderOnProcessWithValidation=Comandat - recepție în așteptare sau validare
+StatusOrderOnProcessWithValidation=Comandat - În așteptarea recepţiei sau validării
 StatusOrderProcessed=Procesată
 StatusOrderToBill=Livrată
 StatusOrderApproved=Aprobată
@@ -69,9 +69,9 @@ ValidateOrder=Validează comanda
 UnvalidateOrder=Devalidează comandă
 DeleteOrder=Şterge comada
 CancelOrder=Anulează comanda
-OrderReopened= Order %s re-open
+OrderReopened= Comanda %sredeschisă
 AddOrder=Crează comanda
-AddPurchaseOrder=Create purchase order
+AddPurchaseOrder=Creare comandă de achiziţie
 AddToDraftOrders=Adaugă la comanda schiţă
 ShowOrder=Afişează comanda
 OrdersOpened=Comenzi de procesat
@@ -101,7 +101,7 @@ ClassifyShipped=Clasează livrată
 DraftOrders=Comenzi schiţă
 DraftSuppliersOrders=Schiţă de ordine de cumpărare
 OnProcessOrders=Comenzi în curs de tratare
-RefOrder=Ref. comanda
+RefOrder=Ref. comandă
 RefCustomerOrder=Ref. comenzii pentru client
 RefOrderSupplier=Ref. comanzii pentru furnizor
 RefOrderSupplierShort=Ref. furnizorului comenzii 
@@ -141,11 +141,12 @@ OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model 
-PDFEratostheneDescription=A complete order model
+PDFEinsteinDescription=Un şablon de comandă (implementare veche a şablonului Eratosthene)
+PDFEratostheneDescription=Un şablon complet de comadă
 PDFEdisonDescription=Un simplu pentru model
-PDFProformaDescription=A complete Proforma invoice template
+PDFProformaDescription=Un şablon complet de factură Proforma
 CreateInvoiceForThisCustomer=Comenzi facturate
+CreateInvoiceForThisSupplier=Comenzi facturate
 NoOrdersToInvoice=Nicio comandă facturabilă
 CloseProcessedOrdersAutomatically=Clasează automat "Procesat" toate comenzile selectate.
 OrderCreation=Creare comandă
@@ -154,11 +155,11 @@ OrderCreated=Comenzile dvs au fost generate
 OrderFail=O eroare întâlnită în timpul creării comezilor dvs
 CreateOrders=Crează Comenzi
 ToBillSeveralOrderSelectCustomer=Pentru crearea unei facturi pentru câteva comenzi, click mai întâi pe client apoi alege "%s".
-OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
+OptionToSetOrderBilledNotEnabled=Opțiune pentru modulul Workflow, pentru setarea automată a comenzii ca „Facturată” când factura este validată, dacă  nu este activată, va trebui să setați manual starea comenzilor la „Facturată” după ce factura a fost generată şi validată.
 IfValidateInvoiceIsNoOrderStayUnbilled=Dacă validarea facturilor este "Nu", comanda va rămâne în starea "Nefacturată" până când factura va fi validată.
-CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
+CloseReceivedSupplierOrdersAutomatically=Închide automat comanda cu statusul "%s" dacă toatele produsele au fost recepţionate. 
 SetShippingMode=Setați modul de expediere
-WithReceptionFinished=With reception finished
+WithReceptionFinished=Recepţionat integral
 #### supplier orders status
 StatusSupplierOrderCanceledShort=Anulata
 StatusSupplierOrderDraftShort=Draft
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index b40fbeccf54..545383cb7a3 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -6,7 +6,7 @@ TMenuTools=Instrumente
 ToolsDesc=Toate instrumentele care nu sunt incluse în alte intrări în meniu sunt grupate aici. <br> Toate instrumentele pot fi accesate prin meniul din stânga.
 Birthday=Zi de naştere
 BirthdayDate=Data naştere
-DateToBirth=Birth date
+DateToBirth=Data naşterii
 BirthdayAlertOn=ziua de nastere de alertă activă
 BirthdayAlertOff=ziua de nastere de alertă inactiv
 TransKey=Traducerea cheii TransKey
@@ -24,17 +24,17 @@ MessageOK=Mesaj pe pagina de returnare pentru o plată validată
 MessageKO=Mesaj de pe pagina de returnare pentru o plată anulată
 ContentOfDirectoryIsNotEmpty=Conținutul acestui director nu este gol.
 DeleteAlsoContentRecursively=Verificați pentru a șterge tot conținutul recursiv
-PoweredBy=Powered by
+PoweredBy=Dezvoltat de
 YearOfInvoice=Anul datei facturii
 PreviousYearOfInvoice=Anul anterior datei facturii
 NextYearOfInvoice=Anul următor datei facturii
 DateNextInvoiceBeforeGen=Data următoarei facturi (înainte de generare)
 DateNextInvoiceAfterGen=Data următoarei facturi (după generare)
-GraphInBarsAreLimitedToNMeasures=Grapics are limited to %s measures in 'Bars' mode. The mode 'Lines' was automatically selected instead.
-OnlyOneFieldForXAxisIsPossible=Only 1 field is currently possible as X-Axis. Only the first selected field has been selected.
-AtLeastOneMeasureIsRequired=At least 1 field for measure is required
-AtLeastOneXAxisIsRequired=At least 1 field for X-Axis is required
-LatestBlogPosts=Latest Blog Posts
+GraphInBarsAreLimitedToNMeasures=Graficele sunt limitate la %s metrici în modul 'Bare'. Modul 'Linii' a fost selectat automat din acest motiv. 
+OnlyOneFieldForXAxisIsPossible=Doar 1 câmp este posibil pentru axa X. Doar primul câmp a fost selectat. 
+AtLeastOneMeasureIsRequired=Cel puţin 1 câmp pentru metrică este necesar
+AtLeastOneXAxisIsRequired=Cel puţin 1 câmp pentru axa X este necesar
+LatestBlogPosts=Ultimile postări din blog
 Notify_ORDER_VALIDATE=Comanda vânzărilor validată
 Notify_ORDER_SENTBYMAIL=Comanda vânzărilor a fost trimisă prin poștă
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Comanda de cumparare trimisa prin e-mail
@@ -85,8 +85,8 @@ MaxSize=Mărimea maximă a
 AttachANewFile=Ataşaţi un fişier nou / document
 LinkedObject=Legate de obiectul
 NbOfActiveNotifications=Numărul de notificări (numărul e-mailurilor destinatarilor)
-PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe lines are separated by a carriage return.\n\n__USER_SIGNATURE__
-PredefinedMailTestHtml=__(Hello)__<br>This is a <b>test</b> mail sent to __EMAIL__ (the word test must be in bold).<br>The lines are separated by a carriage return.<br><br>__USER_SIGNATURE__
+PredefinedMailTest=__(Hello)__\nAcesta este un email de test trimis către  __EMAIL__.\nAceste rânduri sunt separate prin carriage return.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__<br>Acesta este un email de <b>test</b> trimis către __EMAIL__ (cuvântul test ar trebui să fie scris îngroşat).<br>Aceste rânduri sunt separate prin carriage return.<br><br>__USER_SIGNATURE__
 PredefinedMailContentContract=__(Salut)__\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoice=__(Salut)__\n\nGăsiţi factura __REF__ atașată\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__(Salut)__\n\nAș dori să vă reamintim că factura __REF__ pare să nu fi fost plătită. O copie a facturii este atașată ca un memento.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Salut)__\n\nConsultați comanda __REF_
 PredefinedMailContentSendSupplierInvoice=__(Salut)__\n\nConsultați factura __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Salut)__\n\nVeți găsi transportul __REF__ atașat\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Salut)__\n\nConsultați intervenția __REF__ atașată\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Salut)__\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Salut)__\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Salut)__\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Puteți face clic pe linkul de mai jos pentru a efectua plata dacă nu este deja făcută.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Salut)__\n\n\n__(Cu sinceritate)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr este un sistem ERP/CRM compact care suportă mai multe module de afaceri. O prezentare Demo pentru toate modulele nu are sens deoarece acest scenariu nu se produce niciodată (câteva sute disponibile). Deci, sunt disponibile mai multe profiluri demo.
 ChooseYourDemoProfil=Alegeți profilul demo care se potrivește cel mai bine nevoilor dvs. ...
 ChooseYourDemoProfilMore=... sau construiți propriul profil <br> (selectarea manuală a modulelor)
@@ -108,8 +106,8 @@ DemoFundation=Gestionare membrii unui Fundaţia
 DemoFundation2=Gestionaţi membri şi un cont bancar de Fundaţia
 DemoCompanyServiceOnly=Companie sau independent cu vânzare de servicii
 DemoCompanyShopWithCashDesk=Gestionaţi-un magazin cu o casă de marcat
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
+DemoCompanyProductAndStocks=Comercializare produse cu POS
+DemoCompanyManufacturing=Produse fabricate de companie
 DemoCompanyAll=Companie cu activități multiple (toate modulele principale)
 CreatedBy=Creat de %s
 ModifiedBy=Modificat de %s
@@ -189,16 +187,16 @@ NumberOfCustomerInvoices=Numărul de facturi pentru clienți
 NumberOfSupplierProposals=Numărul de propuneri de furnizori
 NumberOfSupplierOrders=Numărul de ordine de cumpărare
 NumberOfSupplierInvoices=Numărul facturilor furnizorilor
-NumberOfContracts=Number of contracts
-NumberOfMos=Number of manufacturing orders
+NumberOfContracts=Număr contracte
+NumberOfMos=Număr comenzi de producţie
 NumberOfUnitsProposals=Numărul de unități pe propuneri
 NumberOfUnitsCustomerOrders=Numărul de unități din comenzile de vânzări
 NumberOfUnitsCustomerInvoices=Numărul de unități pe facturile clienților
 NumberOfUnitsSupplierProposals=Numărul de unități pe propunerile furnizorilor
 NumberOfUnitsSupplierOrders=Numărul de unități din comenzile de achiziție
 NumberOfUnitsSupplierInvoices=Numărul de unități pe facturile furnizorului
-NumberOfUnitsContracts=Number of units on contracts
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
+NumberOfUnitsContracts=Număr de unităţi pe contracte
+NumberOfUnitsMos=Număr unităţi de fabricatpe comenzile de producţie
 EMailTextInterventionAddedContact=A fost atribuită o nouă intervenție %s.
 EMailTextInterventionValidated=Intervenţia %s validată
 EMailTextInvoiceValidated=Factura %s a fost validată.
@@ -255,11 +253,11 @@ YourPasswordHasBeenReset=Parola dvs. a fost resetată cu succes
 ApplicantIpAddress=Adresa IP a solicitantului
 SMSSentTo=SMS trimis la %s
 MissingIds=ID-uri lipsă
-ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
-ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
-TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
-OpeningHoursFormatDesc=Use a - to separate opening and closing hours.<br>Use a space to enter different ranges.<br>Example: 8-12 14-18
+ThirdPartyCreatedByEmailCollector=Terţ creat de colectorul de email-uri din email-ul cu MSGID %s
+ContactCreatedByEmailCollector=Contact/adresă creată de colectorul de email-uri din email-ul cu MSGID %s
+ProjectCreatedByEmailCollector=Proiect creat de colectorul de email-uri din email-ul cu MSGID %s
+TicketCreatedByEmailCollector=Tichet creat de colectorul de email-uri din email-ul cu MSGID %s
+OpeningHoursFormatDesc=Foloseşte un - pentru a separa orele de lucru.<br>Foloseşte un spaţiu pentru a introduce intervale oarare diferite.<br>Exemplu: 8-12 14-18
 
 ##### Export #####
 ExportsArea=Export
@@ -274,13 +272,15 @@ WEBSITE_PAGEURL=URL pagina
 WEBSITE_TITLE=Titlu
 WEBSITE_DESCRIPTION=Descriere
 WEBSITE_IMAGE=Imagine
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_IMAGEDesc=Calea relativă către imagini media. Puteți lăsa necompletat, deoarece este foarte rar utilizată (poate fi folosită de conţinutul dinamic pentru a afișa o miniatură într-o listă de postări pe blog). Foloseşte __WEBSITE_KEY__ în cale dacă aceasta depinde de numele site-ului ( de exemplu: image/__WEBSITE_KEY__/stories/myimage.png).
 WEBSITE_KEYWORDS=Cuvânt cheie
 LinesToImport=Linii de import
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-PopuProp=Products/Services by popularity in Proposals
-PopuCom=Products/Services by popularity in Orders
-ProductStatistics=Products/Services Statistics
-NbOfQtyInOrders=Qty in orders
+MemoryUsage=Memorie utilizată
+RequestDuration=Durată request
+ProductsPerPopularity=Produse/Servicii după popularitate
+PopuProp=Produse/servicii după popularitate pe Oferte
+PopuCom=Produse/servicii după popularitate pe Comenzi de vânzare
+ProductStatistics=Statistici produse/servicii
+NbOfQtyInOrders=Cantitate în comenzi 
+SelectTheTypeOfObjectToAnalyze=Selectează tipul obiectului de analizat...
diff --git a/htdocs/langs/ro_RO/paybox.lang b/htdocs/langs/ro_RO/paybox.lang
index b9baadf9ae7..e1161cf8b07 100644
--- a/htdocs/langs/ro_RO/paybox.lang
+++ b/htdocs/langs/ro_RO/paybox.lang
@@ -10,7 +10,7 @@ ToComplete=Pentru a completa
 YourEMail=E-mail de confirmare de plată
 Creditor=Creditor
 PaymentCode=Cod Plata
-PayBoxDoPayment=Pay with Paybox
+PayBoxDoPayment=Plăteşte cu Paybox
 YouWillBeRedirectedOnPayBox=Veţi fi redirecţionat pe pagina Paybox securizat la intrare ai card de credit Informatii
 Continue=Următorul
 SetupPayBoxToHavePaymentCreatedAutomatically=Configurați-vă caseta de plată cu url <b> %s </b> pentru a avea o plată creată automat când este validată de Paybox.
@@ -28,4 +28,4 @@ PAYBOX_PAYONLINE_SENDEMAIL=E-mail notificare după încercarea de plată (succes
 PAYBOX_PBX_SITE=Valoare pentru PBX SITE
 PAYBOX_PBX_RANG=Valoare pentru PBX Rang
 PAYBOX_PBX_IDENTIFIANT=Valoare pentru PBX ID
-PAYBOX_HMAC_KEY=HMAC key
+PAYBOX_HMAC_KEY=Cheie HMAC
diff --git a/htdocs/langs/ro_RO/paypal.lang b/htdocs/langs/ro_RO/paypal.lang
index 91f38d16710..6533bfc0210 100644
--- a/htdocs/langs/ro_RO/paypal.lang
+++ b/htdocs/langs/ro_RO/paypal.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal modul de configurare
 PaypalDesc=Acest modul permite plata de către clienți prin intermediul  <a href="http://www.paypal.com" target="_blank">PayPal </a> . Aceasta poate fi utilizată pentru o plată ad-hoc sau pentru o plată aferentă unui obiect Dolibarr (factură, comandă, ...)
-PaypalOrCBDoPayment=Pay with PayPal (Card or PayPal)
+PaypalOrCBDoPayment=Plăteşte cu PayPal (Card sau PayPal)
 PaypalDoPayment=Plătiți cu PayPal
 PAYPAL_API_SANDBOX=Mod de încercare / sandbox
 PAYPAL_API_USER=API numele de utilizator
@@ -32,5 +32,5 @@ PaypalImportPayment=Importați plăți PayPal
 PostActionAfterPayment=Acțiuni postate după plăți
 ARollbackWasPerformedOnPostActions=A fost efectuată o revocare a tuturor acțiunilor Post. Trebuie să finalizați manual acțiunile postate dacă acestea sunt necesare.
 ValidationOfPaymentFailed=Validarea plății a eșuat
-CardOwner=Card holder
-PayPalBalance=Paypal credit
+CardOwner=Deţinătorul cardului
+PayPalBalance=Credit Paypal
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 414008feb43..76b5f94a930 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Ref. Produs
 ProductLabel=Etichetă produs
 ProductLabelTranslated=Etichetă de produs tradusă
-ProductDescription=Product description
+ProductDescription=Descriere produs
 ProductDescriptionTranslated=Descrierea produsului tradus
 ProductNoteTranslated=Nota de produs tradusă
 ProductServiceCard=Fişe Produse / Servicii
@@ -22,28 +22,28 @@ ProductVatMassChangeDesc=Acest instrument actualizează rata TVA definită pe  <
 MassBarcodeInit=Init cod de bare în  masă
 MassBarcodeInitDesc=Această pagină poate fi utilizată pentru a inițializa un cod de bare pe obiectele care nu au coduri de bare definit. Verificați înainte dacă  modulul cod de bare este complet configurat.
 ProductAccountancyBuyCode=Codul contabil (achiziție)
-ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
-ProductAccountancyBuyExportCode=Accounting code (purchase import)
+ProductAccountancyBuyIntraCode=Cod contabil (achiziţie intra-comunitară)
+ProductAccountancyBuyExportCode=Cont contabil (achiziţie import)
 ProductAccountancySellCode=Codul contabil (vânzare)
 ProductAccountancySellIntraCode=Codul contabil (vânzarea intracomunitară)
 ProductAccountancySellExportCode=Codul contabil (export de vânzare)
 ProductOrService=Produs sau serviciu
 ProductsAndServices=Produse si Servicii
 ProductsOrServices=Produse sau servicii
-ProductsPipeServices=Produse | Servicii
-ProductsOnSale=Products for sale
-ProductsOnPurchase=Products for purchase
+ProductsPipeServices=Produse|Servicii
+ProductsOnSale=Produse de vânzare
+ProductsOnPurchase=Produse de achiziţionat
 ProductsOnSaleOnly=Produsele doar de vânzare 
 ProductsOnPurchaseOnly=Produsele doar pentru cumpărare
 ProductsNotOnSell=Produse care nu sunt de vânzare și cumpărare
 ProductsOnSellAndOnBuy=Produse supuse vânzării sau cumpărării
-ServicesOnSale=Services for sale
-ServicesOnPurchase=Services for purchase
+ServicesOnSale=Servicii de vânzare
+ServicesOnPurchase=Servicii de achiziţionat
 ServicesOnSaleOnly=Servicii doar de vânzare
 ServicesOnPurchaseOnly=Numai servicii de cumpărare
 ServicesNotOnSell=Servicii care nu sunt de vânzare și de cumpărare
 ServicesOnSellAndOnBuy=Servicii supuse vânzării sau cumpărării
-LastModifiedProductsAndServices=Latest %s modified products/services
+LastModifiedProductsAndServices=Ultimile %s produse/servicii modificate
 LastRecordedProducts=Ultimele %s produse înregistrate
 LastRecordedServices=Ultimele %s servicii înregistrate 
 CardProduct0=Produs
@@ -104,9 +104,10 @@ SetDefaultBarcodeType=Setări tip cod de bare
 BarcodeValue=Valoarea coduri de bare
 NoteNotVisibleOnBill=Notă (nevizibilă pe facturi, oferte ...)
 ServiceLimitedDuration=Dacă produsul este un serviciu cu durată limitată:
+FillWithLastServiceDates=Completează cu data ultimelor linii de servicii
 MultiPricesAbility=Segmente multiple de preț pentru fiecare produs / serviciu (fiecare client se află într-un singur segment de preț)
 MultiPricesNumPrices=Numărul de preţ
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
+DefaultPriceType=Baza prețurilor în mod implicit (cu sau fără taxe) la adăugarea noilor prețuri de vânzare
 AssociatedProductsAbility=Activați produsele virtuale (kituri)
 AssociatedProducts=Produse virtuale
 AssociatedProductsNumber=Număr produse  ce compun produsul virtual
@@ -156,7 +157,7 @@ RowMaterial=Materie primă
 ConfirmCloneProduct=Sunteți sigur că doriți să clonați produsul sau serviciul <b> %s </b>?
 CloneContentProduct=Clonați toate informațiile principale ale produsului/serviciului
 ClonePricesProduct=Clonează preţurile
-CloneCategoriesProduct=Clone tags/categories linked
+CloneCategoriesProduct=Clonare tag-uri/categorii asociate
 CloneCompositionProduct=Clonează produsul / serviciul virtual
 CloneCombinationsProduct=Clonați variantele de produs
 ProductIsUsed=Acest produs este utilizat
@@ -166,9 +167,11 @@ BuyingPrices=Prețuri de achiziționare
 CustomerPrices=Preţuri Client
 SuppliersPrices=Prețurile furnizorului
 SuppliersPricesOfProductsOrServices=Prețurile furnizorilor (de produse sau servicii)
-CustomCode=Cod Vamal / Marfă / SA
+CustomCode=Cod vamal/Marfă/Cod HS
 CountryOrigin=Ţara de origine
-Nature=Nature of product (material/finished)
+Nature=Natură produs(materie primă/produs finit)
+NatureOfProductShort=Natură produs
+NatureOfProductDesc=Materie primă sau produs finit
 ShortLabel=Etichetă scurta
 Unit=Unit
 p=u.
@@ -202,7 +205,7 @@ unitLM=Metru liniar
 unitM2=Metru patrat
 unitM3=Metru cub
 unitL=Litru
-unitT=ton
+unitT=tonă
 unitKG=kg
 unitG=Gram
 unitMG=mg
@@ -213,7 +216,7 @@ unitDM=dm
 unitCM=cm
 unitMM=mm
 unitFT=ft
-unitIN=in
+unitIN=inch
 unitM2=Metru patrat
 unitDM2=dm²
 unitCM2=cm²
@@ -241,8 +244,8 @@ UseMultipriceRules=Utilizați regulile segmentului de preț (definite în config
 PercentVariationOver=Variația %% peste %s
 PercentDiscountOver=%% reducere peste %s
 KeepEmptyForAutoCalculation=Păstrați gol pentru a calcula acest lucru automat din greutate sau din volumul de produse
-VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+VariantRefExample=Exemple: COL, SIZE
+VariantLabelExample=Exemple: Culoare, Dimensiune
 ### composition fabrication
 Build=Produce
 ProductsMultiPrice=Produsele și prețurile pentru fiecare segment de preț
@@ -294,7 +297,7 @@ AddVariable=Adăugați variabilă
 AddUpdater=Adăugați Updater
 GlobalVariables=Variabile globale
 VariableToUpdate=Variabilă de actualizat
-GlobalVariableUpdaters=External updaters for variables
+GlobalVariableUpdaters= Actualizatoare externe pentru variabile
 GlobalVariableUpdaterType0=Date JSON
 GlobalVariableUpdaterHelp0=Analizează datele JSON din adresa URL specificată, VALUE specifică locația valorii relevante,
 GlobalVariableUpdaterHelpFormat0=Format pentru solicitare {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, targetvalue"}
@@ -320,10 +323,10 @@ ProductWeight=Greutate pentru 1 produs
 ProductVolume=Volum pentru 1 produs
 WeightUnits=Unitate de greutate
 VolumeUnits=Unitate de volum
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
+WidthUnits=Unitate lățime 
+LengthUnits=Unitate lungime
+HeightUnits=Unitate înălţime
+SurfaceUnits=Unitate suprafaţă
 SizeUnits=Unitate de măsură
 DeleteProductBuyPrice=Ștergeți prețul de achiziție
 ConfirmDeleteProductBuyPrice=Sigur doriți să ștergeți acest preț de cumpărare?
@@ -332,11 +335,11 @@ ProductSheet=Fișa produsului
 ServiceSheet=Foaia de service
 PossibleValues=Valori posibile
 GoOnMenuToCreateVairants=Mergeți în meniul %s - %s pentru a pregăti variantele atributelor (cum ar fi culorile, mărimea, ...)
-UseProductFournDesc=Add a feature to define the descriptions of products defined by the vendors in addition to descriptions for customers
+UseProductFournDesc=Adăugați o caracteristică pentru a defini descrierile produselor definite de furnizori, pe lângă descrierile pentru clienți
 ProductSupplierDescription=Descrierea furnizorului pentru produs
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
-PackagingForThisProduct=Packaging
-QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+UseProductSupplierPackaging=Utilizați unităţile de ambalare la prețurile furnizorului (recalculați cantitățile în funcție de unităţile de ambalare stabilite la prețul furnizorului atunci când adăugați/actualizați linia în documentele furnizorului)
+PackagingForThisProduct=Ambalare
+QtyRecalculatedWithPackaging=Cantitatea liniei a fost recalculată conform unităţii de ambalare a furnizorului
 
 #Attributes
 VariantAttributes=Atribute variabile
@@ -359,6 +362,9 @@ SelectCombination=Selectați combinația
 ProductCombinationGenerator=Generator de variante
 Features=Caracteristici
 PriceImpact=Impactul prețului
+ImpactOnPriceLevel=Impact pe nivelul de preţ %s
+ApplyToAllPriceImpactLevel= Aplică la toate nivelele
+ApplyToAllPriceImpactLevelHelp=Făcând clic aici setați același impact asupra prețurilor pe toate nivelurile
 WeightImpact=Impactul greutăţii
 NewProductAttribute=Atribut nou
 NewProductAttributeValue=Valoare nouă a atributului
@@ -367,10 +373,10 @@ ProductCombinationGeneratorWarning=Dacă veți continua, înainte de a genera no
 TooMuchCombinationsWarning=Generarea de numeroase variante poate avea ca rezultat un procesor ridicat, utilizarea memoriei și Dolibarr care nu le poate crea. Activarea opțiunii "%s" poate ajuta la reducerea utilizării memoriei.
 DoNotRemovePreviousCombinations=Nu eliminați variantele anterioare
 UsePercentageVariations=Utilizați variații procentuale
-PercentageVariation=Procentaj variație
+PercentageVariation=Variație procentuală
 ErrorDeletingGeneratedProducts=A apărut o eroare în timp ce încercați să ștergeți variantele de produs existente
 NbOfDifferentValues=Nr. de valori diferite
-NbProducts=Number of products
+NbProducts=Număr de produse
 ParentProduct=Produsul Părinte
 HideChildProducts=Ascundeți variantele produselor
 ShowChildProducts=Afișați variantele produselor
@@ -380,7 +386,7 @@ CloneDestinationReference=Destinație referință produs
 ErrorCopyProductCombinations=A apărut o eroare la copierea variantelor de produs
 ErrorDestinationProductNotFound=Destinația produsului nu a fost găsita
 ErrorProductCombinationNotFound=Varianta de produs nu a fost găsită
-ActionAvailableOnVariantProductOnly=Action only available on the variant of product
-ProductsPricePerCustomer=Product prices per customers
-ProductSupplierExtraFields=Additional Attributes (Supplier Prices)
-DeleteLinkedProduct=Delete the child product linked to the combination
+ActionAvailableOnVariantProductOnly=Acțiune disponibilă numai pentru varianta de produs
+ProductsPricePerCustomer=Preţuri produs per clienţi
+ProductSupplierExtraFields=Atribute suplimentare (Preţuri furnizor)
+DeleteLinkedProduct=Ștergeți produsul copil asociat la combinație
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 449a9d81e4d..25a12b3f4cd 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -7,7 +7,7 @@ ProjectsArea=Proiecte
 ProjectStatus=Statut Proiect
 SharedProject=Toată lumea
 PrivateProject=Contacte Proiect
-ProjectsImContactFor=Projects for which I am explicitly a contact
+ProjectsImContactFor=Proiecte pentru care sunt persoană de contact în mod explicit 
 AllAllowedProjects=Toate proiectele pe care le pot citi (mie + public)
 AllProjects=Toate proiectele
 MyProjectsDesc=Această vizualizare este limitată la proiectele pentru care sunteți de contactat
@@ -39,15 +39,15 @@ ShowProject=Afişează proiect
 ShowTask=Arată sarcină
 SetProject=Setare proiect
 NoProject=Niciun proiect definit sau responsabil
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=Număr proiecte
+NbOfTasks=Număr task-uri
 TimeSpent=Timp comsumat
 TimeSpentByYou=Timpul consumat  da tine
 TimeSpentByUser=Timp consumat pe utilizator
 TimesSpent=Timpi consumaţi
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
+TaskId=ID task
+RefTask=Ref. task
+LabelTask=Denumire task
 TaskTimeSpent=Timp consumat pe task
 TaskTimeUser=Utilizator
 TaskTimeNote=Nota
@@ -58,8 +58,8 @@ NewTimeSpent=Timpi consumaţi
 MyTimeSpent=Timpul meu consumat
 BillTime=Facturează timpul petrecut
 BillTimeShort=Timp facturat
-TimeToBill=Time not billed
-TimeBilled=Time billed
+TimeToBill=Timp nefacturat
+TimeBilled=Timp facturat
 Tasks=Taskuri
 Task=Task
 TaskDateStart=Data start task
@@ -69,7 +69,7 @@ NewTask=Task nou
 AddTask=Creare sarcină 
 AddTimeSpent=Creați timp petrecut
 AddHereTimeSpentForDay=Adăugați aici timpul petrecut pentru această zi / sarcină
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddHereTimeSpentForWeek=Adaugă aici timpul consumat pe săptămână/task
 Activity=Activitate
 Activities=Activităţi / Taskuri
 MyActivities=Activităţile / Taskurile mele
@@ -77,13 +77,13 @@ MyProjects=Proiectele mele
 MyProjectsArea=Zona proiectelor mele
 DurationEffective=Durata efectivă
 ProgressDeclared=Progres calculat
-TaskProgressSummary=Task progress
-CurentlyOpenedTasks=Curently open tasks
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared progress is less %s than the calculated progression
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=The declared progress is more %s than the calculated progression
+TaskProgressSummary=Progres task
+CurentlyOpenedTasks=Taskuri deschise recent
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Progresul declarat este mai mic cu %s decât cel calculat
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Progresul declarat este mai mare cu %s decât cel calculat
 ProgressCalculated=Progres calculat
-WhichIamLinkedTo=which I'm linked to
-WhichIamLinkedToProject=which I'm linked to project
+WhichIamLinkedTo=la care sunt atribuit
+WhichIamLinkedToProject=pentru care sunt atribuit la proiect
 Time=Timp
 ListOfTasks=Lista de sarcini
 GoToListOfTimeConsumed=Accesați lista de timp consumată
@@ -102,7 +102,7 @@ ListDonationsAssociatedProject=Lista donațiilor aferente proiectului
 ListVariousPaymentsAssociatedProject=Lista diverselor plăți aferente proiectului
 ListSalariesAssociatedProject=Lista plăților salariale aferente proiectului
 ListActionsAssociatedProject=Lista evenimentelor aferente proiectului
-ListMOAssociatedProject=List of manufacturing orders related to the project
+ListMOAssociatedProject=Lista comenzilor de producţie aferente proiectului
 ListTaskTimeUserProject=Lista timpului consumat pe sarcinile proiectului
 ListTaskTimeForTask=Listă de timp consumat pe sarcină
 ActivityOnProjectToday=Activitatea pe proiect astăzi
@@ -115,7 +115,7 @@ ChildOfTask=Copil de sarcină
 TaskHasChild=Sarcina are copil
 NotOwnerOfProject=Nu este proprietar al acestui proiect privat
 AffectedTo=Alocat  la
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+CantRemoveProject=Acest proiect nu poate fi şters pentru că este referenţiat de alte obiecte(facturi, comenzi sau altele) Vezi tab-ul '%s'.
 ValidateProject=Validează proiect
 ConfirmValidateProject=Sigur doriți să validați acest proiect?
 CloseAProject=Inchide proiect
@@ -132,10 +132,10 @@ DeleteATimeSpent=Ştergeţi timpul  consumat
 ConfirmDeleteATimeSpent=Sigur doriți să ștergeți acest timp petrecut?
 DoNotShowMyTasksOnly=Afişează, de asemenea, şi taskurile ce nu sunt atribuite mie
 ShowMyTasksOnly=Vezi numai taskurile atribuite mie
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=Contacte task
 ProjectsDedicatedToThisThirdParty=Proiecte dedicate acestui terţ
 NoTasks=Nr sarcini pentru acest proiect
-LinkedToAnotherCompany=Legat de terţe părţi, alta
+LinkedToAnotherCompany=Legat de terţi, alta
 TaskIsNotAssignedToUser=Activitate nealocată utilizatorului. Utilizați butonul "<strong> %s </strong>" pentru a atribui sarcina acum.
 ErrorTimeSpentIsEmpty=Timpul consumat nu este completat
 ThisWillAlsoRemoveTasks=Această acţiune va şterge, de asemenea, toate taskurile proiectului (<b>%s</b> ) la acest moment şitoţi timpii petrecuţi.
@@ -162,8 +162,8 @@ OpportunityProbability=Probabilitatea oportunităţii
 OpportunityProbabilityShort=Probabilitatea oportunităţii
 OpportunityAmount=Valoarea oportunităţii
 OpportunityAmountShort=Valoarea oportunităţii
-OpportunityWeightedAmount=Opportunity weighted amount
-OpportunityWeightedAmountShort=Opp. weighted amount
+OpportunityWeightedAmount=Suma ponderată a oportunității
+OpportunityWeightedAmountShort=Suma ponderată a oportunității
 OpportunityAmountAverageShort=Valoarea medie a oportunităţii
 OpportunityAmountWeigthedShort=Valoarea oportunităţii ponderată
 WonLostExcluded=Câștigat / pierdut eliminat
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Selectați elementul
 AddElement=Link către element
+LinkToElementShort=Link la
 # Documents models
 DocumentModelBeluga=Șablon de document de proiect pentru prezentarea obiectelor legate
 DocumentModelBaleine=Șablon de document de proiect pentru sarcini
@@ -186,10 +187,10 @@ PlannedWorkload=Volum de lucru Planificat
 PlannedWorkloadShort=Volum de muncă
 ProjectReferers=Obiecte asociate
 ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+FirstAddRessourceToAllocateTime=Atribuie o resursă utilizator ca şi contact al proiectului pentru a aloca timp
 InputPerDay=Intrare pe zi
 InputPerWeek=Intrare pe saptamana
-InputPerMonth=Input per month
+InputPerMonth=Intrări pe lună
 InputDetail=Detaliile de intrare
 TimeAlreadyRecorded=Acesta este timpul petrecut deja înregistrat pentru această sarcină/zi și utilizator%s
 ProjectsWithThisUserAsContact=Proiecte cu acest utilizator ca contact
@@ -210,21 +211,21 @@ ProjectNbProjectByMonth=Numărul de proiecte create pe lună
 ProjectNbTaskByMonth=Numărul de sarcini create pe lună
 ProjectOppAmountOfProjectsByMonth=Suma de instrucţiuni pe lună
 ProjectWeightedOppAmountOfProjectsByMonth=Suma ponderată a instrucţiunilor pe lună
-ProjectOpenedProjectByOppStatus=Deschideți proiectul / instrucţiuni după stadiul de conducere
-ProjectsStatistics=Statistici privind proiectele / conducerea
-TasksStatistics=Statistici privind sarcinile de proiect / de conducere
+ProjectOpenedProjectByOppStatus=Deschide proiect|lead după statusul lead-ului
+ProjectsStatistics=Statistici pentru proiecte sau lead-uri
+TasksStatistics=Statisticile cu privire la task-urile proiectelor sau lead-uri
 TaskAssignedToEnterTime=Sarcină atribuită. Introducerea timpului în această sarcină ar trebui să fie posibilă.
 IdTaskTime=Id timp sarcină
 YouCanCompleteRef=Dacă doriți să completați referinta cu un sufix, este recomandat să adăugați un caracter - pentru al separa, astfel încât numerotarea automată va funcționa corect pentru proiectele următoare. De exemplu, %s-MYSUFFIX
 OpenedProjectsByThirdparties=Proiecte deschise de terți
 OnlyOpportunitiesShort=Numai conducerea
 OpenedOpportunitiesShort=Oportunităţi deschise
-NotOpenedOpportunitiesShort=Not an open lead
+NotOpenedOpportunitiesShort=Nu este un lead deschis
 NotAnOpportunityShort=Nu este o oportunitate
 OpportunityTotalAmount=Valoarea totala a oportunităţilor
 OpportunityPonderatedAmount=Greutatea valorii oportunităţilor
 OpportunityPonderatedAmountDesc=Suma ponderată a oportunităţilor cu probabilitate
-OppStatusPROSP=Prospect
+OppStatusPROSP=Prospectare
 OppStatusQUAL=Calificare
 OppStatusPROPO=Ofertă 
 OppStatusNEGO=Negociere
@@ -238,7 +239,7 @@ LatestModifiedProjects=Ultimele %s proiecte modificate
 OtherFilteredTasks=Alte sarcini filtrate
 NoAssignedTasks=Nu au fost găsite sarcini atribuite (atribuiți proiectul / sarcinile utilizatorului curent din caseta de selectare superioară pentru a introduce ora pe acesta)
 ThirdPartyRequiredToGenerateInvoice=Un terț trebuie definit pe proiect pentru a putea să fie facturat.
-ChooseANotYetAssignedTask=Choose a task not yet assigned to you
+ChooseANotYetAssignedTask=Alege un task care nu îţi este atribuit
 # Comments trans
 AllowCommentOnTask=Permiteți comentariile utilizatorilor pe sarcini
 AllowCommentOnProject=Permiteți comentariile utilizatorilor pe proiecte
@@ -253,16 +254,16 @@ TimeSpentForInvoice=Timpi consumaţi
 OneLinePerUser=O linie pe utilizator
 ServiceToUseOnLines=Serviciu de utilizare pe linii
 InvoiceGeneratedFromTimeSpent=Factura %s a fost generată din timpul petrecut pe proiect
-ProjectBillTimeDescription=Check if you enter timesheet on tasks of project AND you plan to generate invoice(s) from the timesheet to bill the customer of the project (do not check if you plan to create invoice that is not based on entered timesheets). Note: To generate invoice, go on tab 'Time spent' of the project and select lines to include.
-ProjectFollowOpportunity=Follow opportunity
-ProjectFollowTasks=Follow tasks or time spent
-Usage=Usage
-UsageOpportunity=Usage: Opportunity
-UsageTasks=Usage: Tasks
-UsageBillTimeShort=Usage: Bill time
-InvoiceToUse=Draft invoice to use
+ProjectBillTimeDescription=Bifați dacă introduceți un timeline în task-urile proiectului ȘI intenționați să generați factură(i) din foaia de timp pentru a factura proiectul clientului (nu bifați dacă intenționați să creați o factură care nu se bazează pe foile de timp introduse). Notă: Pentru a genera factură, accesați fila "Timpul petrecut" al proiectului și selectați liniile pe care să le includeți. 
+ProjectFollowOpportunity=Urmăreşte oportunitatea
+ProjectFollowTasks=Task-uri urmărite sau timp consumat
+Usage=Utilizare
+UsageOpportunity=Utilizare: Oportunitate
+UsageTasks=Utilizare: Task-uri
+UsageBillTimeShort=Utilizare: Timp facturat
+InvoiceToUse=Şablon factură de utilizat
 NewInvoice=Factură nouă
-OneLinePerTask=One line per task
-OneLinePerPeriod=One line per period
-RefTaskParent=Ref. Parent Task
-ProfitIsCalculatedWith=Profit is calculated using
+OneLinePerTask=O linie per task
+OneLinePerPeriod=O linie per perioadă
+RefTaskParent=Ref. task părinte
+ProfitIsCalculatedWith=Profitul este calculat utilizând
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index b9844777bd4..9cc3450abe0 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -57,7 +57,7 @@ CreateEmptyPropal=Creați o propunere comercială goală sau dintr-o listă de p
 DefaultProposalDurationValidity=Durata validării implicite  a ofertei (în zile)
 UseCustomerContactAsPropalRecipientIfExist=Utilizați contactul/adresa cu tipul de "propunere de urmărire a contactului" dacă este definită în locul adresei terțului ca adresă destinatar a propunerii
 ConfirmClonePropal=Sigur doriți să clonați propunerea comercială <b> %s </b>?
-ConfirmReOpenProp=Sigur doriți să redeschideți propunerea comercială <b> %s </b>?
+ConfirmReOpenProp=Sigur doriți să redeschideți oferta comercială <b> %s </b>?
 ProposalsAndProposalsLines=Oferte Comerciale  si linii
 ProposalLine=Linie Ofertă
 AvailabilityPeriod=Disponibilitate Livrare
@@ -84,4 +84,4 @@ DefaultModelPropalClosed=Model implicit la închiderea unei oferte comerciale (n
 ProposalCustomerSignature=Acceptarea scrisă, ștampila companiei, data și semnătura
 ProposalsStatisticsSuppliers=Statistici privind propunerile furnizorilor
 CaseFollowedBy=Caz urmat de
-SignedOnly=Signed only
+SignedOnly=Doar semnată
diff --git a/htdocs/langs/ro_RO/receiptprinter.lang b/htdocs/langs/ro_RO/receiptprinter.lang
index b53e3bb6a5c..195342d6108 100644
--- a/htdocs/langs/ro_RO/receiptprinter.lang
+++ b/htdocs/langs/ro_RO/receiptprinter.lang
@@ -15,12 +15,12 @@ CONNECTOR_DUMMY=Dummy Printer
 CONNECTOR_NETWORK_PRINT=Imprimanta Retea
 CONNECTOR_FILE_PRINT=Imprimanta locala
 CONNECTOR_WINDOWS_PRINT=Imprimanta locala Windows
-CONNECTOR_CUPS_PRINT=Cups Printer
+CONNECTOR_CUPS_PRINT=Imprimantă CUPS
 CONNECTOR_DUMMY_HELP=Imprimantă falsă de test, nu face nimic
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb: // FooUser: secret @ computername / workgroup / Printer Receipt
-CONNECTOR_CUPS_PRINT_HELP=CUPS printer name, example: HPRT_TP805L
+CONNECTOR_CUPS_PRINT_HELP=nume imprimantă CUPS, exemplu: HPRT_TP805L
 PROFILE_DEFAULT=Default Profil
 PROFILE_SIMPLE=Simplu Profil
 PROFILE_EPOSTEP=Epos Tep Profil
@@ -31,7 +31,7 @@ PROFILE_SIMPLE_HELP=Profil simplu nu există grafică
 PROFILE_EPOSTEP_HELP=Epos Tep Profil
 PROFILE_P822D_HELP=P822D Profil No Graphics
 PROFILE_STAR_HELP=Star Profil
-DOL_LINE_FEED=Skip line
+DOL_LINE_FEED=Sări linia
 DOL_ALIGN_LEFT=Aliniaza stanga text
 DOL_ALIGN_CENTER=Centreaza text
 DOL_ALIGN_RIGHT=Aliniaza dreapta text
@@ -45,38 +45,38 @@ DOL_CUT_PAPER_PARTIAL=Taie tichet partial
 DOL_OPEN_DRAWER=Deschide sertarul de bani
 DOL_ACTIVATE_BUZZER=Activează buzzer
 DOL_PRINT_QRCODE=Printeaza cod QR 
-DOL_PRINT_LOGO=Print logo of my company
-DOL_PRINT_LOGO_OLD=Print logo of my company (old printers)
-DOL_BOLD=Bold
-DOL_BOLD_DISABLED=Disable bold
-DOL_DOUBLE_HEIGHT=Double height size
-DOL_DOUBLE_WIDTH=Double width size
-DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
-DOL_UNDERLINE=Enable underline
-DOL_UNDERLINE_DISABLED=Disable underline
-DOL_BEEP=Beed sound
-DOL_PRINT_TEXT=Print text
-DateInvoiceWithTime=Invoice date and time
-YearInvoice=Invoice year
-DOL_VALUE_MONTH_LETTERS=Invoice month in letters
-DOL_VALUE_MONTH=Invoice month
-DOL_VALUE_DAY=Invoice day
-DOL_VALUE_DAY_LETTERS=Inovice day in letters
-DOL_LINE_FEED_REVERSE=Line feed reverse
-InvoiceID=Invoice ID
+DOL_PRINT_LOGO=Tipăreşte logo-ul companiei
+DOL_PRINT_LOGO_OLD=Printați logo-ul companiei mele (imprimante vechi)
+DOL_BOLD=Îngroşare
+DOL_BOLD_DISABLED=Dezactivează îngroşare
+DOL_DOUBLE_HEIGHT=Înălţime dublă
+DOL_DOUBLE_WIDTH=Lăţime dublă
+DOL_DEFAULT_HEIGHT_WIDTH=Înălțimea și lățimea implicită
+DOL_UNDERLINE=Activare subliniere
+DOL_UNDERLINE_DISABLED= Dezactivare subliniere
+DOL_BEEP=Beep
+DOL_PRINT_TEXT=Tipăreşte text
+DateInvoiceWithTime=Data şi ora facturii
+YearInvoice=Anul facturii
+DOL_VALUE_MONTH_LETTERS=Luna facturii literal
+DOL_VALUE_MONTH=Luna facturii
+DOL_VALUE_DAY=Ziua facturii
+DOL_VALUE_DAY_LETTERS=Ziua facturii literal
+DOL_LINE_FEED_REVERSE=Retur de linie
+InvoiceID=ID Factură
 InvoiceRef=Ref Factură
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+DOL_PRINT_OBJECT_LINES=Linii de factură
+DOL_VALUE_CUSTOMER_FIRSTNAME=Prenume client
+DOL_VALUE_CUSTOMER_LASTNAME=Nume client
+DOL_VALUE_CUSTOMER_MAIL=Email client
+DOL_VALUE_CUSTOMER_PHONE=Telefon client
+DOL_VALUE_CUSTOMER_MOBILE=Mobil client
+DOL_VALUE_CUSTOMER_SKYPE=Skype client
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Cod TVA client
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Soldul cont client
+DOL_VALUE_MYSOC_NAME=Denumirea companiei tale
+VendorLastname=Nume furnizor
+VendorFirstname=Prenume furnizor
+VendorEmail=Email furnizor
+DOL_VALUE_CUSTOMER_POINTS=Puncte client
+DOL_VALUE_OBJECT_POINTS=Puncte obiect
diff --git a/htdocs/langs/ro_RO/receptions.lang b/htdocs/langs/ro_RO/receptions.lang
index 604dedd7d65..0f3ec29be18 100644
--- a/htdocs/langs/ro_RO/receptions.lang
+++ b/htdocs/langs/ro_RO/receptions.lang
@@ -43,5 +43,5 @@ ProductQtyInSuppliersReceptionAlreadyRecevied=Cantitatea de produse din comanda
 ValidateOrderFirstBeforeReception=Mai întâi trebuie să validezi comanda înainte de a putea face recepții.
 ReceptionsNumberingModules=Mod de numerotare pentru recepţii 
 ReceptionsReceiptModel=Şabloane documente pentru recepţii
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
+NoMorePredefinedProductToDispatch=Nu mai sunt produse predefinite pentru expediere
 
diff --git a/htdocs/langs/ro_RO/recruitment.lang b/htdocs/langs/ro_RO/recruitment.lang
new file mode 100644
index 00000000000..cc01cf12885
--- /dev/null
+++ b/htdocs/langs/ro_RO/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recrutare personal
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc =  Gestionează și urmărește campaniile de recrutare pentru joburile noi 
+
+#
+# Admin page
+#
+RecruitmentSetup = Configurare modul Recrutare
+Settings = Configurări
+RecruitmentSetupPage = Introdu aici setările pentru opţiunile principale ale modulului Recrutare personal
+RecruitmentArea=Recrutare personal
+PublicInterfaceRecruitmentDesc=Paginile publice de locuri de muncă sunt adrese URL publice pentru a afișa și răspunde la joburile deschise. Există o legătură diferită pentru fiecare job deschis, găsit pe fiecare fișă de job.
+EnablePublicRecruitmentPages=Activați paginile publice cu joburile disponibile
+
+#
+# About page
+#
+About = Despre
+RecruitmentAbout = Despre modulul Recrutare personal
+RecruitmentAboutPage = Despre modulul Recrutări personal
+NbOfEmployeesExpected=Necesar număr angajaţi
+JobLabel=Denumire job
+WorkPlace=Loc de muncă
+DateExpected=Data aşteptată
+FutureManager=Manager alocat
+ResponsibleOfRecruitement=Responsabil cu recrutarea
+IfJobIsLocatedAtAPartner=Dacă jobul este în locaţia unui partener
+PositionToBeFilled=Ofertă job
+PositionsToBeFilled=Oferte joburi
+ListOfPositionsToBeFilled=Liste oferte joburi
+NewPositionToBeFilled=Oferte job
+
+JobOfferToBeFilled=Ofertă job
+ThisIsInformationOnJobPosition=Informaţii despre oferta job
+ContactForRecruitment=Contact pentru recrutare
+EmailRecruiter=Email recrutor
+ToUseAGenericEmail=Utilizare email generic. Dacă nu este definit, se va utiliza emailul responsabilului de recrutare
+NewCandidature=Candidatură nouă
+ListOfCandidatures=Listă candidaturi
+RequestedRemuneration=Remunerație solicitată
+ProposedRemuneration=Remuneraţie propusă
+ContractProposed=Contract propus
+ContractSigned=Contract semnat
+RecruitmentCandidature=Candidatură
+JobPositions=Joburi disponibile
+RecruitmentCandidatures=Candidaturi
+InterviewToDo=Interviu de făcut
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index fc03258ac40..04b32acb280 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -17,10 +17,10 @@ CancelSending=Anulează expediere
 DeleteSending=Şterge expediere
 Stock=Stoc
 Stocks=Stocuri
-MissingStocks=Missing stocks
-StockAtDate=Stock at date
-StockAtDateInPast=Date in past
-StockAtDateInFuture=Date in future
+MissingStocks=Stocuri lipsă
+StockAtDate=Stocuri la data
+StockAtDateInPast=Dată în trecut
+StockAtDateInFuture=Dată în viitor
 StocksByLotSerial=Stocuri după lot/serie
 LotSerial=Loturi/Serii
 LotSerialList=Listă lot/serii
@@ -34,7 +34,7 @@ StockMovementForId=ID-ul de mișcare %d
 ListMouvementStockProject=Lista miscărilor de stoc asociate proiectului
 StocksArea=Depozite
 AllWarehouses=Toate depozitele
-IncludeEmptyDesiredStock=Include also undefined desired stock
+IncludeEmptyDesiredStock= Includeți și stocul dorit nedefinit
 IncludeAlsoDraftOrders=Includeți, de asemenea, schiţele de proiecte
 Location=Locație
 LocationSummary=Nume scurt locaţie
@@ -60,13 +60,13 @@ PMPValue=Valoric PMP
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Stoc valoric
 UserWarehouseAutoCreate=Creați automat un depozit utilizator atunci când creați un utilizator
-AllowAddLimitStockByWarehouse=Manage also value for minimum and desired stock per pairing (product-warehouse) in addition to the value for minimum and desired stock per product
+AllowAddLimitStockByWarehouse=Gestionează, de asemenea, valoarea pentru stocul minim și cel dorit pe perechi (produs-depozit), pe lângă valoarea pentru stocul minim și dorit pe produs
 RuleForWarehouse=Reguli pentru depozite
 WarehouseAskWarehouseDuringOrder=Setează un depozit pe comenzile de vânzare
 UserDefaultWarehouse=Setează un depozit pe utilizatori
 MainDefaultWarehouse=Depozit implicit
-MainDefaultWarehouseUser=Use a default warehouse for each user
-MainDefaultWarehouseUserDesc=By activating this option, during creation of a product, the warehouse assigned to the product will be defined on this one. If no warehouse is defined on the user, the default warehouse is defined.
+MainDefaultWarehouseUser=Folosiți un depozit implicit pentru fiecare utilizator
+MainDefaultWarehouseUserDesc=Prin activarea acestei opțiuni, în timpul creării unui produs, depozitul alocat produsului va fi definit pe acesta. Dacă nu este definit niciun depozit la utilizator, este definit depozitul implicit.
 IndependantSubProductStock=Stocul de produse și stocul de subproduse sunt independente
 QtyDispatched=Cantitate dipecerizată
 QtyDispatchedShort=Cant Expediate
@@ -77,12 +77,12 @@ RuleForStockManagementIncrease=Alegeți regula pentru creșterea automată a sto
 DeStockOnBill=Reduceți stocurile reale la validarea facturii client / notei de credit
 DeStockOnValidateOrder=Reduceți stocurile reale la validarea ordinului de vânzări
 DeStockOnShipment=Descreşte stocul fizic bazat pe validarea livrarilor
-DeStockOnShipmentOnClosing=Decrease real stocks when shipping is set to closed
+DeStockOnShipmentOnClosing=Reduceți stocurile reale atunci când transportul este închis
 ReStockOnBill=Creșteți stocurile reale la validarea facturii vânzătorului / notei de credit
 ReStockOnValidateOrder=Creșterea stocurilor reale la aprobarea comenzii de achiziție
 ReStockOnDispatchOrder=Creșterea stocurilor reale la expedierea manuală în depozit, după primirea comenzii de cumpărare a bunurilor
-StockOnReception=Increase real stocks on validation of reception
-StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
+StockOnReception=Creșterea stocurilor reale la validarea recepției
+StockOnReceptionOnClosing=Măriți stocurile reale atunci când recepția este închisă finalizată
 OrderStatusNotReadyToDispatch=Comanda nu mai este sau nu mai are  un statut care să permită dipecerizarea produselor în depozit
 StockDiffPhysicTeoric=Explicație pentru diferența dintre stocul fizic și virtual
 NoPredefinedProductToDispatch=Nu sunt produse predefinite pentru acest obiect. Deci, nici o dispecerizare  în stoc necesară.
@@ -95,14 +95,16 @@ RealStock=Stoc Real
 RealStockDesc=Stocul fizic / real este stocul aflat în prezent în depozite.
 RealStockWillAutomaticallyWhen=Stocul real va fi modificat în conformitate cu această regulă (așa cum este definită în modulul Stoc):
 VirtualStock=Stoc Virtual
-VirtualStockDesc=Stocul virtual este stocul calculat disponibil imediat ce toate acțiunile deschise / în așteptare (care afectează stocurile) sunt închise (comenzile de achiziție primite, comenzile de vânzări expediate etc.)
+VirtualStockAtDate=Stoc virtual la data
+VirtualStockAtDateDesc=Stoc virtual până când toate comenzile în așteptarea livrării care sunt planificate să fie efectuate înainte de termen vor fi finalizate 
+VirtualStockDesc=Stocul virtual este stocul calculat disponibil odată ce toate acțiunile deschise/în așteptare (care afectează stocurile) sunt închise (comenzi de achiziție primite, comenzi de vânzare expediate, comenzi de fabricație produse etc.) 
 IdWarehouse=ID depozit
 DescWareHouse=Descriere depozit
 LieuWareHouse=Localizare depozit
 WarehousesAndProducts=Depozite şi produse
 WarehousesAndProductsBatchDetail=Depozite și produse (cu detalii pe lot / serie)
-AverageUnitPricePMPShort=Preţul mediu ponderat de intrare
-AverageUnitPricePMP=Preţul mediu ponderat de intrare
+AverageUnitPricePMPShort=Valoric PMP
+AverageUnitPricePMPDesc=Prețul unitar mediu de intrare pe care a trebuit să-l plătim furnizorilor pentru a intra în stocul nostru - PUMP. 
 SellPriceMin=Preţ vânzare unitar
 EstimatedStockValueSellShort=Valoarea ieşire
 EstimatedStockValueSell=Valoarea ieşire
@@ -130,18 +132,18 @@ CurentlyUsingPhysicalStock=Stoc  Fizic
 RuleForStockReplenishment=Reguli pentru reaprovizionarea stocului
 SelectProductWithNotNullQty=Selectați cel puțin un produs cu cantitate nenulă și un furnizor
 AlertOnly= Numai Alerte
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Includeți și stocuri negative pentru produsele fără cantitatea dorită definită, pentru a le restabili la 0
 WarehouseForStockDecrease=Depozitul <b>%s</b> va fi utilizat pentru scăderea stocului
 WarehouseForStockIncrease=Depozitul <b>%s</b> va fi utilizat pentru creşterea stocului
 ForThisWarehouse=Pentru acest depozit
 ReplenishmentStatusDesc=Aceasta este o listă a tuturor produselor cu un stoc mai mic decât cel dorit (sau mai mic decât valoarea de alertă dacă este bifat checkbox-ul "numai alertă"). Dacă utilizați checkbox-ul, puteți crea comenzi de achiziție pentru a umple diferența.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
+ReplenishmentStatusDescPerWarehouse=Dacă doriți o reaprovizionare bazată pe cantitatea dorită definită pe depozit, trebuie să adăugați un filtru pe depozit.
 ReplenishmentOrdersDesc=Aceasta este o listă a tuturor comenzilor de cumpărare deschise, inclusiv a produselor predefinite. Numai comenzile deschise cu produse predefinite, deci comenzile care pot afecta stocurile, sunt vizibile aici.
 Replenishments=Reaprovizionări
 NbOfProductBeforePeriod=Cantitatea de produs %s în stoc înainte de perioada selectată  (< %s)
 NbOfProductAfterPeriod=Cantitatea de produs %s în stoc după perioada selectată (> %s)
 MassMovement=Mişcare în masă
-SelectProductInAndOutWareHouse=Selectați un produs, o cantitate, un depozit sursă și un depozit țintă, apoi faceți clic pe"%s". Odată făcut acest lucru pentru toate transferurile cerute, faceți clic pe "%s".
+SelectProductInAndOutWareHouse=Selectați un depozit sursă și un depozit destinaţie, un produs și o cantitate, apoi faceți clic pe "%s". Odată făcut acest lucru pentru toate mișcările necesare, faceți clic pe "%s".
 RecordMovement=Transferul înregistrărilor
 ReceivingForSameOrder=Recepţii pentru această comandă
 StockMovementRecorded=Mişcări stoc înregistrate
@@ -156,7 +158,7 @@ InventoryCode=Codul de inventar sau transfer
 IsInPackage=Continute in pachet
 WarehouseAllowNegativeTransfer=Stocul poate fi negativ
 qtyToTranferIsNotEnough=Nu aveți suficiente stocuri din depozitul sursă și configurația dvs. nu permite stocuri negative.
-qtyToTranferLotIsNotEnough=You don't have enough stock, for this lot number, from your source warehouse and your setup does not allow negative stocks (Qty for product '%s' with lot '%s' is %s in warehouse '%s').
+qtyToTranferLotIsNotEnough=Nu aveți suficient stoc, pentru acest număr de lot, din depozitul sursă, iar sistemul este configurat să nu permită stocuri negative (cantitatea de produs '%s' din lotul '%s' este %s în depozitul '%s').
 ShowWarehouse=Arată depozit
 MovementCorrectStock=Corecția stocului pentru produsul%s
 MovementTransferStock=Transfer stoc al produsului %s in alt depozit
@@ -198,7 +200,7 @@ SelectFournisseur=Filtru furnizor
 inventoryOnDate=Inventar
 INVENTORY_DISABLE_VIRTUAL=Produs virtual (kit): nu reduceți stocul de subprodus
 INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilizați prețul de cumpărare dacă nu puteți găsi ultimul preț de cumpărare
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Stock movements will have the date of inventory (instead of the date of inventory validation)
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT= Mișcările de stoc vor avea data inventarului (în loc de data validării inventarului)
 inventoryChangePMPPermission=Permiteți modificarea valorii PMP pentru un produs
 ColumnNewPMP=Nouă unitate PMP
 OnlyProdsInStock=Nu adăugați produsul fără stoc
@@ -206,7 +208,7 @@ TheoricalQty=Cantitate teoretică
 TheoricalValue=Cantitate teoretică
 LastPA=Ultimul BP
 CurrentPA=BP Curent
-RecordedQty=Recorded Qty
+RecordedQty=Cantitate înregistrată
 RealQty=Cantitate reală
 RealValue=Valoare reală
 RegulatedQty=Cantitate reglementată
@@ -227,11 +229,14 @@ StockIncreaseAfterCorrectTransfer=Măriți prin corecție/transfer
 StockDecreaseAfterCorrectTransfer=Scădeți prin corecție/transfer
 StockIncrease=Creșterea stocului
 StockDecrease=Scăderea stocului
-InventoryForASpecificWarehouse=Inventory for a specific warehouse
-InventoryForASpecificProduct=Inventory for a specific product
-StockIsRequiredToChooseWhichLotToUse=Stock is required to choose which lot to use
-ForceTo=Force to
-AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (Warning: This may decrease dramatically performances)
-StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
-CurrentStock=Current stock
+InventoryForASpecificWarehouse=Inventar pentru un depozit specific
+InventoryForASpecificProduct=Inventar pentru un produs specific
+StockIsRequiredToChooseWhichLotToUse=Stocul trebuie specificat pentru a putea alege lotul care va fi folosit
+ForceTo=Forţează la
+AlwaysShowFullArbo=Afișează arborele complet al depozitului pe fereastra popup a legăturilor de depozit (Avertisment: Aceasta poate scădea dramatic performanțele sistemului)
+StockAtDatePastDesc=Poți vedea aici stocul (stoc real) la o dată prestabilită în trecut 
+StockAtDateFutureDesc=Puteți vizualiza aici stocul (stoc virtual) la o dată dată în viitor
+CurrentStock=Stoc curent
+InventoryRealQtyHelp=Setați valoarea la 0 pentru a reseta câmpul cantitate<br> Lăsaţi necompletat, sau eliminaţi linia, pentru a păstra neschimbat 
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index 9646bb98cf7..290f8809f09 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -12,17 +12,17 @@ YourEMail=E-mail de confirmare de plată
 STRIPE_PAYONLINE_SENDEMAIL=Email de notificare după o încercare de plată (succes sau eșec)
 Creditor=Creditor
 PaymentCode=Cod Plata
-StripeDoPayment=Pay with Stripe
+StripeDoPayment=Plăteşte cu Stripe
 YouWillBeRedirectedOnStripe=Veți fi redirecționat pe pagina Stripe securizată pentru a vă introduce informațiile despre cardul de credit
 Continue=Următor
 ToOfferALinkForOnlinePayment=URL-ul pentru plata %s
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
-ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
-ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
+ToOfferALinkForOnlinePaymentOnOrder=URL oferit pentru %s plată online pentru o comandă de vânzare
+ToOfferALinkForOnlinePaymentOnInvoice= URL oferit pentru %s plată online pentru factură client
+ToOfferALinkForOnlinePaymentOnContractLine= URL oferit pentru %s plată online pentru o linie de contract
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL oferit pentru %s plată online pentru orice sumă fără un produs/serviciu existent
+ToOfferALinkForOnlinePaymentOnMemberSubscription= URL oferit pentru %s plată online pentru o cotizaţie de membru
+ToOfferALinkForOnlinePaymentOnDonation= URL oferit pentru %s plată online pentru o achitare sau donaţie
+YouCanAddTagOnUrl=Puteți adăuga, de asemenea, parametrul url <b>& tag<i> = valoare</i></b> la oricare dintre respectivele URL (obligatoriu numai pentru plata care nu este legată de un obiect) pentru a adăuga motivul efectuării.<br> Pentru adresa URL a plăților fără obiect existent, puteți adăuga și parametrul <strong>& noidempotency = 1</strong> pentru ca aceeași legătură cu aceeași etichetă să poată fi folosită de mai multe ori (anumite moduri de plată pot plafona plata la 1 pentru fiecare link diferit fără acest parametru) 
 SetupStripeToHavePaymentCreatedAutomatically=Configurați-vă Stripe cu URL <b> %s </b> pentru a avea o plată creată automat când este validată de Stripe.
 AccountParameter=Parametri Cont
 UsageParameter=Utilizarea parametrilor
@@ -32,7 +32,7 @@ VendorName=Numele vânzătorului
 CSSUrlForPaymentForm=CSS foaie de URL-ul de stil pentru forma de plată
 NewStripePaymentReceived=Plata noua Stripe incasata
 NewStripePaymentFailed=Plata noua Stripe incercata dar esuata
-FailedToChargeCard=Failed to charge card
+FailedToChargeCard=Nu s-a putut încasa de pe card
 STRIPE_TEST_SECRET_KEY=Cheie de testare secreta
 STRIPE_TEST_PUBLISHABLE_KEY=Cheia de test publicabilă
 STRIPE_TEST_WEBHOOK_KEY=Cheia de test Webhook
@@ -42,7 +42,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Cheie in direct Webhook
 ONLINE_PAYMENT_WAREHOUSE=Stoc de utilizat pentru scăderea stocului atunci când se efectuează plata online <br> (TODO Când opțiunea de a reduce stocul se face printr-o acțiune pe factură, iar plata online generează factura?)
 StripeLiveEnabled=Stripe live activat (altfel test / modul sandbox)
 StripeImportPayment=Plățile pentru importul Stripe
-ExampleOfTestCreditCard=Example of credit card for test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestCreditCard=Exemplu de card de credit pentru test: %s=> valid,%s => eroare CVC, %s=> expirat, %s=> retragere eşuată
 StripeGateways=Iesiri Stripe
 OAUTH_STRIPE_TEST_ID=ID-ul de conectare Stripe a clientului (ca _...)
 OAUTH_STRIPE_LIVE_ID=ID-ul de conectare Stripe a clientului (ca _...)
@@ -65,8 +65,8 @@ CreateCardOnStripe=Creați un card pe Stripe
 ShowInStripe=Arată în Stripe
 StripeUserAccountForActions=Cont utilizator pe care să îl utilizați pentru notificarea prin email a anumitor evenimente Stripe (plăți Stripe)
 StripePayoutList=Listă de plăți Stripe
-ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mode)
-ToOfferALinkForLiveWebhook=Link to setup Stripe WebHook to call the IPN (live mode)
-PaymentWillBeRecordedForNextPeriod=Payment will be recorded for the next period.
-ClickHereToTryAgain=<a href="%s">Click here to try again...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Due to Strong Customer Authentication rules, creation of a card must be done from Stripe backoffice. You can click here to switch on Stripe customer record: %s
+ToOfferALinkForTestWebhook=Link de configurare Stripe WebHook pentru a apel IPN (mod de test) 
+ToOfferALinkForLiveWebhook=Link de configurare Stripe WebHook pentru a apel IPN (mod live)
+PaymentWillBeRecordedForNextPeriod=Plata va fi înregistrată pentru perioada următoare.
+ClickHereToTryAgain=<a href="%s">Clic aici pentru a încerca din nou...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Datorită regulilor de autentificare securizată a clienților, crearea unui card trebuie făcută din backoffice-ul Stripe. Puteți face clic aici pentru a activa înregistrarea clienților Stripe: %s 
diff --git a/htdocs/langs/ro_RO/supplier_proposal.lang b/htdocs/langs/ro_RO/supplier_proposal.lang
index 1a50b477754..756cd3f1ab6 100644
--- a/htdocs/langs/ro_RO/supplier_proposal.lang
+++ b/htdocs/langs/ro_RO/supplier_proposal.lang
@@ -6,7 +6,7 @@ CommRequest=Cerere Preţ
 CommRequests=Cereri Preţ 
 SearchRequest=Cauta o cerere
 DraftRequests=Cereri schiţă
-SupplierProposalsDraft=Proiectarea propunerior furnizorului
+SupplierProposalsDraft=Propuneri furnizor schiţă
 LastModifiedRequests=Ultimele %scereri de prețuri modificate 
 RequestsOpened=Deschide Cereri Preţ 
 SupplierProposalArea=Domeniul propunerilor furnizorilor
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 1acfe2d1fdd..c6828bbbeed 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -1,47 +1,47 @@
-# Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Furnizori
+SuppliersInvoice=Factura furnizorului
+ShowSupplierInvoice=Afișați factura furnizorului
+NewSupplier=Furnizor nou
 History=Istoric
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
-OrderDate=Data comandă
-BuyingPriceMin=Best buying price
-BuyingPriceMinShort=Best buying price
+ListOfSuppliers=Lista furnizori
+ShowSupplier=Afișează furnizorul
+OrderDate=Data comenzii
+BuyingPriceMin=Cel mai bun preț de cumpărare
+BuyingPriceMinShort=Cel mai bun preț de cumpărare
 TotalBuyingPriceMinShort=Total prețuri de cumpărare  subproduse
-TotalSellingPriceMinShort=Total of subproducts selling prices
+TotalSellingPriceMinShort=Totalul prețurilor de vânzare ale subproduselor
 SomeSubProductHaveNoPrices=Unele sub-produse nu au un preț definit
-AddSupplierPrice=Add buying price
-ChangeSupplierPrice=Change buying price
-SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Acest furnizor este deja asociat cu referinta: % s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
-SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
+AddSupplierPrice=Adăugați prețul de cumpărare
+ChangeSupplierPrice=Modificați prețul de achiziție
+SupplierPrices=Prețurile furnizorului
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Această referință de furnizor este asociată deja cu un produs: %s
+NoRecordedSuppliers=Nu a fost înregistrat niciun furnizor
+SupplierPayment=Plata furnizorului
+SuppliersArea=Suprafața vânzătorului
+RefSupplierShort=Ref. furnizor
 Availability=Disponibilitate
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_1=Facturi furnizor și detalii factură
+ExportDataset_fournisseur_2=Facturi și plăți furnizorilor
+ExportDataset_fournisseur_3=Comenzile de cumpărare și detaliile comenzii
 ApproveThisOrder=Aprobă  această comandă
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+ConfirmApproveThisOrder=Sigur doriți să aprobați comanda <b> %s </b>?
 DenyingThisOrder=Refuză aceasta comanda
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b>?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b>?
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery= Intârziere Livrare in zile
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-SupplierReputation=Vendor reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
-BuyingPriceNumShort=Vendor prices
+ConfirmDenyingThisOrder=Sigur doriți să refuzați această comandă <b> %s </b>?
+ConfirmCancelThisOrder=Sigur doriți să anulați această comandă <b> %s </b>?
+AddSupplierOrder=Creați comanda de aprovizionare
+AddSupplierInvoice=Creați factura furnizorilor
+ListOfSupplierProductForSupplier=Lista de produse și prețuri pentru vânzător <b> %s </b>
+SentToSuppliers=Trimite furnizorilor
+ListOfSupplierOrders=Lista comenzilor de achiziție
+MenuOrdersSupplierToBill=Comenzi de achiziție pentru facturare
+NbDaysToDelivery=întârziere de livrare (zile)
+DescNbDaysToDelivery=Cea mai lungă întârziere de livrare a produselor din această comandă
+SupplierReputation=Reputația furnizorului
+DoNotOrderThisProductToThisSupplier=Nu comanda
+NotTheGoodQualitySupplier=Calitate scăzută
+ReputationForThisProduct=Reputatie
+BuyerName=Numele cumpărătorului
+AllProductServicePrices=Toate preturile produselor / serviciilor
+AllProductReferencesOfSupplier=Toate referinţele furnizorului
+BuyingPriceNumShort=Prețurile furnizorului
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index 4c44a686e55..6c582307da8 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -30,14 +30,14 @@ Permission56005=Vedeți tichetele tuturor terților (nu sunt eficiente pentru ut
 TicketDictType=Tipuri de tichete
 TicketDictCategory=Tichet - Grupuri
 TicketDictSeverity=Tichet - Severități
-TicketDictResolution=Ticket - Resolution
+TicketDictResolution=Tichet - Rezoluție
 TicketTypeShortBUGSOFT=Logică disfuncţională
 TicketTypeShortBUGHARD=Material disfuncţional
 TicketTypeShortCOM=Întrebare comercială
 
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue, bug or problem
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortHELP=Solicitare funcţionalitate
+TicketTypeShortISSUE=Solicitare, eroare sau problemă
+TicketTypeShortREQUEST=Solicitare de modificare sau îmbunătăţire
 TicketTypeShortPROJET=Proiect
 TicketTypeShortOTHER=Altele
 
@@ -57,14 +57,14 @@ TypeContact_ticket_external_SUPPORTCLI=Urmărirea contactului/incidentului cu cl
 TypeContact_ticket_external_CONTRIBUTOR=Contribuitor extern
 
 OriginEmail=Sursa emailului
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+Notify_TICKET_SENTBYMAIL=Trimite mesaj tichet pe email
 
 # Status
 NotRead=Necitit
 Read=Citit
 Assigned=Atribuit
 InProgress=In progres
-NeedMoreInformation=Waiting for information
+NeedMoreInformation=În aşteptarea de informaţii
 Answered=Răspuns
 Waiting=Aşteptare
 Closed=Închis
@@ -72,7 +72,6 @@ Deleted=Șters
 
 # Dict
 Type=Tip
-Category=Codul analitic
 Severity=Gravitate
 
 # Email templates
@@ -128,27 +127,26 @@ TicketsAutoAssignTicket=Desemnați automat utilizatorul care a creat tichetul
 TicketsAutoAssignTicketHelp=La crearea unui tichet, utilizatorul poate fi automat alocat tichetului.
 TicketNumberingModules=Modul de numerotare a tichetelor
 TicketNotifyTiersAtCreation=Notificați terțul la creare
-TicketGroup=Grup
-TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
-TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
-TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
-TicketPublicNotificationNewMessageDefaultEmail=Notifications email to (update)
-TicketPublicNotificationNewMessageDefaultEmailHelp=Send email new message notifications to this address if the ticket don't have a user assigned or the user don't have a email.
+TicketsDisableCustomerEmail=Dezactivați întotdeauna email-urile atunci când un tichet este creat din interfața publică 
+TicketsPublicNotificationNewMessage=Trimite email(uri) când un mesaj nou este adăugat
+TicketsPublicNotificationNewMessageHelp=Trimiteți email(uri) când un nou mesaj este adăugat din interfața publică (utilizatorului atribuit sau adreselor de notificări la (actualizare) și/sau email-ului de notificări către)
+TicketPublicNotificationNewMessageDefaultEmail=Notificări email  către (actualizare)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Trimiteți email-urile referitoare la noile notificări la această adresă dacă tichetul nu are un utilizator alocat sau dacă utilizatorul nu are e-mail.
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
+TicketsIndex=Tichete
 TicketList=Lista de tichete
 TicketAssignedToMeInfos=Această pagină afișează lista de tichete creată de utilizatorul curent sau atribuită acestuia
 NoTicketsFound=Nu a fost găsit un tichet
-NoUnreadTicketsFound=No unread ticket found
+NoUnreadTicketsFound=Nici un tichet necitit
 TicketViewAllTickets=Vezi toate tichetele
 TicketViewNonClosedOnly=Vedeți numai tichetele deschise
 TicketStatByStatus=Tichete după statut
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+OrderByDateAsc=Sortare după dată ascendent
+OrderByDateDesc=Sortare după dată descendent
+ShowAsConversation=Afişare ca listă de conversaţie
+MessageListViewType=Afişare listă ca tabel
 
 #
 # Ticket card
@@ -162,7 +160,7 @@ CreatedBy=Creat de
 NewTicket=Tichet nou
 SubjectAnswerToTicket=Tichet de răspuns
 TicketTypeRequest=Tip de solicitare
-TicketCategory=Codul analitic
+TicketCategory=Grup
 SeeTicket=Vedeți tichetul
 TicketMarkedAsRead=Tichetul a fost marcat ca citit
 TicketReadOn=Citește mai departe
@@ -234,9 +232,9 @@ TicketConfirmChangeStatus=Confirmați modificarea stării: %s?
 TicketLogStatusChanged=Starea modificată: %s la %s
 TicketNotNotifyTiersAtCreate=Nu notificați compania la crearea
 Unread=Necitită
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-PublicInterfaceNotEnabled=Public interface was not enabled
-ErrorTicketRefRequired=Ticket reference name is required
+TicketNotCreatedFromPublicInterface=Indisponibil. Tichetul nu a fost creat din interfaţa publică.
+PublicInterfaceNotEnabled=Interfaţa publică nu a fost activată
+ErrorTicketRefRequired=Denumirea de referință al tichetului este necesară
 
 #
 # Logs
@@ -246,7 +244,7 @@ NoLogForThisTicket=Nu există jurnal pentru acest bilet încă
 TicketLogAssignedTo=Tichet %s alocat la %s
 TicketLogPropertyChanged=Tichet %s modificat: clasificarea de la %s la %s
 TicketLogClosedBy=Tichet %s închis de %s
-TicketLogReopen=Ticket %s re-open
+TicketLogReopen=Tichetul %s re-deschis 
 
 #
 # Public pages
@@ -256,9 +254,9 @@ ShowListTicketWithTrackId=Afișați lista de tichete din ID-ul piesei
 ShowTicketWithTrackId=Afișați tichetul din ID-ul piesei
 TicketPublicDesc=Puteți crea un tichet de asistență sau un cec de la un ID existent.
 YourTicketSuccessfullySaved=Tichetul a fost salvat cu succes!
-MesgInfosPublicTicketCreatedWithTrackId=A new ticket has been created with ID %s and Ref %s.
+MesgInfosPublicTicketCreatedWithTrackId=Un nou tichet a fost creat cu ID %s şi Ref %s.
 PleaseRememberThisId=Păstrați numărul de urmărire pe care l-am putea întreba mai târziu.
-TicketNewEmailSubject=Ticket creation confirmation - Ref %s (public ticket ID %s)
+TicketNewEmailSubject=Confirmare creare tichet - Ref %s (ID tichet public %s) 
 TicketNewEmailSubjectCustomer=Tichet de asistență nou
 TicketNewEmailBody=Acesta este un email automat pentru a confirma că ați înregistrat un nou tichet.
 TicketNewEmailBodyCustomer=Acesta este un email automat pentru a confirma că un nou tichet a fost creat în contul dvs.
@@ -270,22 +268,22 @@ TicketEmailPleaseDoNotReplyToThisEmail=Nu răspundeți direct la acest email! Ut
 TicketPublicInfoCreateTicket=Acest formular vă permite să înregistrați un tichet de asistență în sistemul nostru de management.
 TicketPublicPleaseBeAccuratelyDescribe=Descrieți cu precizie problema. Furnizați cât mai multe informații posibile pentru a ne permite să identificăm corect solicitarea dvs.
 TicketPublicMsgViewLogIn=Introduceți codul de urmărire a tichetului
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
+TicketTrackId=ID tracking public
+OneOfTicketTrackId=Unul dintre ID-urile tale de tracking
 ErrorTicketNotFound=Tichetul cu codul de urmărire %s nu a fost găsit!
 Subject=Subiect
 ViewTicket=Vedeți tichetul
 ViewMyTicketList=Vedeți lista mea de tichete
 ErrorEmailMustExistToCreateTicket=Eroare: adresa de email nu a fost găsită în baza noastră de date
-TicketNewEmailSubjectAdmin=New ticket created - Ref %s (public ticket ID %s)
+TicketNewEmailSubjectAdmin=Un nou tichet creat - Ref %s(ID tichet public %s) 
 TicketNewEmailBodyAdmin=<p> Tichetul tocmai a fost creat cu ID # %s, vezi informațiile: </p>
 SeeThisTicketIntomanagementInterface=Vedeți tichetul în interfața de gestionare
 TicketPublicInterfaceForbidden=Interfața publică pentru tichete nu a fost activată
-ErrorEmailOrTrackingInvalid=Bad value for tracking ID or email
-OldUser=Old user
+ErrorEmailOrTrackingInvalid=Valoare incorectă pentru ID tracking sau email
+OldUser=Utilizator anterior
 NewUser=Utilizator nou
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+NumberOfTicketsByMonth=Număr de tichete pe lună
+NbOfTickets=Număr de tichete
 # notifications
 TicketNotificationEmailSubject=Tichet %s actualizat
 TicketNotificationEmailBody=Acesta este un mesaj automat care vă anunță că tichetul%s tocmai a fost actualizat
diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
index a563340a042..92727210426 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -3,26 +3,26 @@ ShowExpenseReport=Arată raportul cheltuielilor
 Trips=Rapoarte Cheltuieli
 TripsAndExpenses=Rapoarte Cheltuieli
 TripsAndExpensesStatistics=Statistici Rapoarte Cheltuieli
-TripCard=Fisa Raport Cheltuieli
-AddTrip=Creare Raport Cheltuieli
+TripCard=Fişa Raport cheltuieli
+AddTrip=Creare Raport cheltuieli
 ListOfTrips=Listă rapoarte de cheltuieli
 ListOfFees=Lista note cheltuieli
 TypeFees=Tipuri taxe
 ShowTrip=Arată raportul cheltuielilor
-NewTrip= Raport de cheltuieli nou
+NewTrip=Raport de cheltuieli nou
 LastExpenseReports=Ultimele%s rapoarte de cheltuieli 
-AllExpenseReports=Toate rapoarte cheltuielilor
+AllExpenseReports=Toate rapoartele de cheltuieli
 CompanyVisited=Compania/instituția vizitată
-FeesKilometersOrAmout=Valoarea  sau km
+FeesKilometersOrAmout=Valoarea sau kilometri
 DeleteTrip=Șterge raport de cheltuieli
 ConfirmDeleteTrip=Sigur doriți să ștergeți acest raport de cheltuieli?
 ListTripsAndExpenses=Listă rapoarte de cheltuieli
 ListToApprove=În așteptare pentru aprobare
-ExpensesArea=Rapoarte de cheltuieli
-ClassifyRefunded=Clasează "Rambursată"
-ExpenseReportWaitingForApproval=Un nou raport de cheltuieli a fost prezentat spre aprobare
-ExpenseReportWaitingForApprovalMessage=Un nou raport de cheltuieli a fost depus și așteaptă aprobarea. <br> - Utilizator: %s <br> - Perioada: %s <br> Faceți clic aici pentru a valida: %s
-ExpenseReportWaitingForReApproval=Un raport de cheltuieli a fost prezentat pentru reaprobare
+ExpensesArea=Rapoarte cheltuieli
+ClassifyRefunded=Clasează 'Rambursată'
+ExpenseReportWaitingForApproval=Un nou raport de cheltuieli a fost trimis spre aprobare
+ExpenseReportWaitingForApprovalMessage=Un nou raport de cheltuieli a fost trimis și așteaptă aprobarea. <br> - Utilizator: %s <br> - Perioada: %s <br> Faceți clic aici pentru a valida: %s
+ExpenseReportWaitingForReApproval=Un raport de cheltuieli a fost trimis pentru reaprobare
 ExpenseReportWaitingForReApprovalMessage=Un raport de cheltuieli a fost depus și așteaptă o nouă aprobare. <br> %s, ați refuzat să aprobați raportul de cheltuieli din acest motiv: %s. <br> A fost propusă o nouă versiune și vă așteaptă aprobarea. <br> - Utilizator: %s <br> - Perioada: %s <br> Faceți clic aici pentru validare: %s
 ExpenseReportApproved=A fost aprobat un raport de cheltuieli
 ExpenseReportApprovedMessage=Raportul de cheltuieli %s a fost aprobat. <br> - Utilizator: %s <br> - Aprobat de: %s <br> Faceți clic aici pentru a afișa raportul de cheltuieli: %s
@@ -33,8 +33,8 @@ ExpenseReportCanceledMessage=Raportul de cheltuieli %s a fost anulat. <br> - Uti
 ExpenseReportPaid=Un raport de cheltuieli a fost plătit
 ExpenseReportPaidMessage=Raportul de cheltuieli %s a fost plătit. <br> - Utilizator: %s <br> - Plătit de: %s <br> Faceți clic aici pentru a afișa raportul de cheltuieli: %s
 TripId=ID Raport de cheltuieli 
-AnyOtherInThisListCanValidate=Persoana de informare pentru validare.
-TripSociete=Informații   companie
+AnyOtherInThisListCanValidate=Persoana care trebuie informată pentru validare.
+TripSociete=Informații companie
 TripNDF=Raport de cheltuieli privind informațiile
 PDFStandardExpenseReports=Șablon standard pentru generarea unui document PDF pentru raportul de cheltuieli
 ExpenseReportLine=Line raport de cheltuieli
@@ -55,16 +55,16 @@ EX_HOT=Hotel
 EX_PAR=Variaţia costurilor cu parcarea
 EX_TOL=Variaţia costurilor cu vama
 EX_TAX=Diverse taxe
-EX_IND=Abonament la despăgubire pentru transporturi 
+EX_IND=Decontare abonament transport
 EX_SUM=Întreținere
-EX_SUO=Papetărie
+EX_SUO=Papetărie - rechizite
 EX_CAR=Închirieri mașini
 EX_DOC=Documentație
-EX_CUR=Primirea clienților
-EX_OTR=Alte primiri
-EX_POS=Timbre
+EX_CUR=Protocol primire clienți
+EX_OTR=Alte cheltuieli de protocol
+EX_POS=Timbre şi taxe poştale
 EX_CAM=Variaţia costurilor cu întreţinerea şi reparaţiile
-EX_EMM=Masa angajați 
+EX_EMM=Masă angajați 
 EX_GUM=Masă oaspeți
 EX_BRE=Mic dejun
 EX_FUE_VP=Valoarea actuală a combustibilului
@@ -73,12 +73,12 @@ EX_PAR_VP=Valoarea actuală a parcării
 EX_CAM_VP=Valoarea actuală a întreţinerii şi reparaţiilor
 DefaultCategoryCar=Modul implicit de transport
 DefaultRangeNumber=Numărul intervalului implicit
-UploadANewFileNow=Upload a new document now
+UploadANewFileNow=Încarcă un document nou acum
 Error_EXPENSEREPORT_ADDON_NotDefined=Eroare, regula de numerotare a rapoartelor de cheltuieli nu a fost definită în configurarea modulului "Raport de cheltuieli"
 ErrorDoubleDeclaration=Ați declarat un alt raport de cheltuieli într-un interval de timp similar.
 AucuneLigne=Nu există încă nici un raport de cheltuieli declarate 
-ModePaiement=Mod plata
-VALIDATOR=Utilizator responsabil pentru aprobare
+ModePaiement=Mod plată
+VALIDATOR=Utilizator responsabil cu aprobarea
 VALIDOR=Aprobat de
 AUTHOR=Înregistrat de
 AUTHORPAIEMENT=Plătite de 
@@ -89,24 +89,24 @@ MOTIF_CANCEL=Motiv
 DATE_REFUS=Dată respingere
 DATE_SAVE=Dată validare
 DATE_CANCEL=Data anulare
-DATE_PAIEMENT=Data Plata 
+DATE_PAIEMENT=Data plăţii
 BROUILLONNER=Redeschide
 ExpenseReportRef=Ref. raport de cheltuieli
 ValidateAndSubmit=Validareaza și trimite pentru aprobare
-ValidatedWaitingApproval=Validat (așteaptă aprobarea)
+ValidatedWaitingApproval=Validat(așteaptă aprobarea)
 NOT_AUTHOR=Tu nu esti autorul acestui raport de cheltuieli. Operatiune anulata.
 ConfirmRefuseTrip=Sigur doriți să refuzați acest raport de cheltuieli?
-ValideTrip=Aproba raport de cheltuieli
+ValideTrip=Aprobă raport de cheltuieli
 ConfirmValideTrip=Sunteți sigur că doriți să aprobaţi acest raport de cheltuieli?
-PaidTrip=Plăste un raport de cheltuieli
+PaidTrip=Plăteşte un raport de cheltuieli
 ConfirmPaidTrip=Sigur doriți să schimbați statusul acestui raport de cheltuieli la "Plătit"?
 ConfirmCancelTrip=Sunteți sigur că doriți să anulaţi acest raport de cheltuieli?
 BrouillonnerTrip=Mutați raportul de cheltuieli înapoi la starea "Draft"
 ConfirmBrouillonnerTrip=Sigur doriți să mutați raportul de cheltuieli la starea "Draft"?
-SaveTrip=Valideaza raport de cheltuieli
+SaveTrip=Validează raport de cheltuieli
 ConfirmSaveTrip=Sunteți sigur că doriți să validaţi acest raport de cheltuieli?
 NoTripsToExportCSV=Nu există un raport de cheltuieli de exportat pentru această perioadă.
-ExpenseReportPayment=Plata Raport cheltuieli
+ExpenseReportPayment=Plată Raport cheltuieli
 ExpenseReportsToApprove=Rapoartele de cheltuieli pentru aprobare
 ExpenseReportsToPay=Rapoartele de cheltuieli pentru plată
 ConfirmCloneExpenseReport=Sigur doriți să clonați acest raport de cheltuieli?
@@ -114,7 +114,7 @@ ExpenseReportsIk=Indicele pretului /km din raportul de cheltuieli
 ExpenseReportsRules=Regulile rapoartelor de cheltuieli
 ExpenseReportIkDesc=Puteți modifica calculul cheltuielilor/km pe categorii și pe gama care au fost definite anterior. <b> d </b> este distanța în kilometri
 ExpenseReportRulesDesc=Puteți crea sau actualiza orice reguli de calcul. Această parte va fi utilizată atunci când utilizatorul va crea un nou raport de cheltuieli
-expenseReportOffset=Decalaj
+expenseReportOffset=Diferenţă
 expenseReportCoef=Coeficient
 expenseReportTotalForFive=Exemplu cu <u> d </u> = 5
 expenseReportRangeFromTo=de la %d până la %d
@@ -134,7 +134,7 @@ AllExpenseReport=Toate tipurile de rapoarte de cheltuieli
 OnExpense=Linie de cheltuieli
 ExpenseReportRuleSave=Regula raportului de cheltuieli a fost salvată
 ExpenseReportRuleErrorOnSave=Eroare: %s
-RangeNum=Intervalul %d
+RangeNum=Interval %d
 ExpenseReportConstraintViolationError=Constrângere violare id [%s]: %s este superior lui %s %s
 byEX_DAY=pe zi (limitare la %s)
 byEX_MON=pe lună (limitare la %s)
@@ -148,4 +148,4 @@ nolimitbyEX_EXP=prin linie (fără limitare)
 CarCategory=Categorie de autovehicule
 ExpenseRangeOffset=Suma compensării: %s
 RangeIk=Interval de kilometri
-AttachTheNewLineToTheDocument=Attach the new line to an existing document
+AttachTheNewLineToTheDocument=Atașați reperul la un document încărcat
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index efe38577914..a2e0627163f 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - users
 HRMArea=HRM 
-UserCard=Fişă Utilizator 
-GroupCard=Fişă Grup
-Permission=Permission
+UserCard=Fişă utilizator 
+GroupCard=Fişă grup
+Permission=Permisiune
 Permissions=Permisiuni
-EditPassword=Modificarea parolei
+EditPassword=Modificare parolă
 SendNewPassword=Trimite o parolă nouă
 SendNewPasswordLink=Trimiteți link de resetare parolă
-ReinitPassword=Genera o parolă nouă
-PasswordChangedTo=Parola schimbat la: %s
+ReinitPassword=Generează o parolă nouă
+PasswordChangedTo=Parola schimbată la: %s
 SubjectNewPassword=Noua dvs. parolă pentru %s
-GroupRights=Grupul de permisiuni
-UserRights=Permisiunile de utilizator
+GroupRights=Grup de permisiuni
+UserRights=Permisiuni utilizator
 UserGUISetup=Configurare afișare utilizator
-DisableUser=Dezactiva
+DisableUser=Dezactivare
 DisableAUser=Dezactivaţi un utilizator
 DeleteUser=Şterge
-DeleteAUser=A şterge un utilizator
-EnableAUser=Permite unui utilizator
+DeleteAUser=Şterge un utilizator
+EnableAUser=Activează un utilizator
 DeleteGroup=Şterge
 DeleteAGroup=Ştergeţi un grup
 ConfirmDisableUser=Sigur doriți să dezactivați utilizatorul <b> %s </b>?
@@ -27,91 +27,94 @@ ConfirmEnableUser=Sigur doriți să activați utilizatorul <b> %s </b>?
 ConfirmReinitPassword=Sigur doriți să generați o nouă parolă pentru utilizatorul <b> %s </b>?
 ConfirmSendNewPassword=Sigur doriți să generați și să trimiteți o nouă parolă pentru utilizatorul <b> %s </b>?
 NewUser=Utilizator nou
-CreateUser=Creaţi utilizator
-LoginNotDefined=Login nu este definit.
+CreateUser=Creare utilizator
+LoginNotDefined=Numele de login nu este definit.
 NameNotDefined=Numele nu este definit.
-ListOfUsers=Lista de utilizatori
+ListOfUsers=Listă utilizatori
 SuperAdministrator=Super Administrator
-SuperAdministratorDesc=Administrator, cu toate drepturile
+SuperAdministratorDesc=Administrator global, cu toate drepturile
 AdministratorDesc=Administrator
 DefaultRights=Permisiuni implicite
 DefaultRightsDesc=Definiți aici permisiunile <u> implicite </u> care sunt acordate automat unui utilizator <u> nou </u> (pentru a modifica permisiunile pentru utilizatorii existenți, accesați cardul de utilizator).
-DolibarrUsers=Dolibarr utilizatori
+DolibarrUsers=Utilizatori Dolibarr
 LastName=Nume
 FirstName=Prenume
-ListOfGroups=Lista de grupuri
+ListOfGroups=Listă grupuri
 NewGroup=Grup nou
-CreateGroup=Creaţi grup
-RemoveFromGroup=Înlăturaţi din grup
-PasswordChangedAndSentTo=Parola schimbat şi a trimis <b>la %s.</b>
+CreateGroup=Creare grup
+RemoveFromGroup=Înlăturare din grup
+PasswordChangedAndSentTo=Parola a fost schimbată şi trimisă <b>la %s.</b>
 PasswordChangeRequest=Solicitare de modificarea parolei pentru <b> %s </b>
 PasswordChangeRequestSent=Cerere pentru a schimba parola <b>pentru %s %s</b> la trimis.
 ConfirmPasswordReset=Confirmați resetarea parolei
-MenuUsersAndGroups=Utilizatorii & Grupuri
+MenuUsersAndGroups=Utilizatori & Grupuri
 LastGroupsCreated=Ultimele %s grupuri create de 
 LastUsersCreated=Ultimii %s utilizatori creaţi
-ShowGroup=Arata grup
-ShowUser=Arata utilizator
-NonAffectedUsers=Non afectate utilizatori
-UserModified=Utilizator modificate cu succes
-PhotoFile=Foto fişier
+ShowGroup=Arată grup
+ShowUser=Arată utilizator
+NonAffectedUsers=Utilizatori nealocaţi
+UserModified=Utilizator modificat cu succes
+PhotoFile=Fişier foto
 ListOfUsersInGroup=Lista de utilizatori în acest grup
 ListOfGroupsForUser=Lista de grupuri pentru acest utilizator
 LinkToCompanyContact=Link către o terţă parte / de contact
-LinkedToDolibarrMember=Link către statele
-LinkedToDolibarrUser=Link la Dolibarr utilizator
-LinkedToDolibarrThirdParty=Link către o terţă parte Dolibarr
-CreateDolibarrLogin=Creare cont Dolibarr
-CreateDolibarrThirdParty=Creaţi o terţă parte
+LinkedToDolibarrMember=Asociază la membru
+LinkedToDolibarrUser=Asociază la utilizator Dolibarr
+LinkedToDolibarrThirdParty=Asociază la terţ din sistem
+CreateDolibarrLogin=Creare utilizator Dolibarr
+CreateDolibarrThirdParty=Creaţi un terţ
 LoginAccountDisableInDolibarr=Cont dezactivat în Dolibarr.
 UsePersonalValue=Utilizaţi valoarea personale
 InternalUser=Interne de utilizator
 ExportDataset_user_1=Utilizatorii și proprietățile acestora
 DomainUser=Domeniu utilizatorul %s
-Reactivate=Reactivaţi
+Reactivate=Reactivare
 CreateInternalUserDesc=Acest formular vă permite să creați un utilizator intern în compania / organizația dvs. Pentru a crea un utilizator extern (client, furnizor etc.), utilizați butonul "Creare utilizator Dolibarr" de pe cartela de contact a terțului.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
+InternalExternalDesc=Un utilizator <b>intern</b> este un utilizator care face parte din compania / organizația dvs.<br> Un utilizator <b>extern</b> este un client, un furnizor sau altul (Crearea unui utilizator extern pentru un terț se poate face din înregistrarea de contact a unui terț).<br> <br>În ambele cazuri, permisiunile definesc drepturile în Dolibarr, de asemenea, utilizatorul extern poate avea un manager de meniuri diferit de cel intern (a se vedea Acasă - Configurare - Afișare)
 PermissionInheritedFromAGroup=Permisiunea acordată deoarece moştenită de la un utilizator al unui grup.
 Inherited=Moştenit
 UserWillBeInternalUser=De utilizator creat va fi un utilizator intern (pentru că nu este legată de o parte terţă)
 UserWillBeExternalUser=De utilizator creat va fi un utilizator extern (deoarece legat de un terţ special)
 IdPhoneCaller=Id-ul telefonului apelantului
-NewUserCreated=User %s create
+NewUserCreated=Utilizatorul %s a fost creat
 NewUserPassword=Schimba parola pentru %s
-EventUserModified=User %s modificate
-UserDisabled=User %s cu handicap
-UserEnabled=User %s activat
-UserDeleted=User %s eliminat
-NewGroupCreated=Grupul creat %s
-GroupModified=Grup %s modificat
-GroupDeleted=Grupul %s eliminat
+NewPasswordValidated=Noua ta parolă a fost validată şi trebuie folosită de acum pentru a te loga.  
+EventUserModified=Utilizatorul %s a fost modificat
+UserDisabled=Utilizatorul %s a fost dezactivat
+UserEnabled=Utilizatorul %s a fost activat
+UserDeleted=Utilizatorul %s a fost şters
+NewGroupCreated=Grupul %s a fost creat
+GroupModified=Grupul %s a fost modificat
+GroupDeleted=Grupul %s a fost şters
 ConfirmCreateContact=Sigur doriți să creați un cont Dolibarr pentru această persoană de contact?
 ConfirmCreateLogin=Sigur doriți să creați un cont Dolibarr pentru acest membru?
 ConfirmCreateThirdParty=Sigur doriți să creați un terţ pentru acest membru?
-LoginToCreate=Login pentru a crea
-NameToCreate=Nume de terţă parte pentru a crea
-YourRole=Dvs. de roluri
-YourQuotaOfUsersIsReached=Cota dvs. de utilizatori activi este atins!
-NbOfUsers=Numar de utilizatori
+LoginToCreate=Nume login de creat
+NameToCreate=Nume terţ de creat
+YourRole=Rolurile tale
+YourQuotaOfUsersIsReached=Cota ta de utilizatori activi a fost atinsă !
+NbOfUsers=Număr de utilizatori
 NbOfPermissions=Număr de permisiuni
 DontDowngradeSuperAdmin=Numai un superadmin poate declasa un superadmin
-HierarchicalResponsible=Supervisor
+HierarchicalResponsible=Supervizor
 HierarchicView=Vedere ierarhică
 UseTypeFieldToChange=Foloseşte câmpul Tip pentru schimbare
 OpenIDURL=URL OpenID
 LoginUsingOpenID=Utilizați OpenID pentru login
-WeeklyHours=Ore lucrate (pe săptămână)
-ExpectedWorkedHours=Numărul de ore lucrate săptămânal preconizat
-ColorUser=Culoarea utilizatorului
-DisabledInMonoUserMode=Dezactivat in modul mentenanţă
-UserAccountancyCode=Codul de contabilitate al utilizatorului
-UserLogoff=Logoff utilizator
+WeeklyHours=Ore lucrate(pe săptămână)
+ExpectedWorkedHours=Numărul estimat de ore lucrate săptămânal
+ColorUser=Culoare utilizator
+DisabledInMonoUserMode=Dezactivat în modulul mentenanţă
+UserAccountancyCode=Cod contabil utilizator
+UserLogoff=Deconectare utilizator
 UserLogged=Utilizator autentificat
+DateOfEmployment=Data angajării
 DateEmployment=Data începerii angajării
 DateEmploymentEnd=Data încetării angajării
 CantDisableYourself=Nu vă puteți dezactiva propria înregistrare de utilizator 
 ForceUserExpenseValidator=Forţează validarea raportului de cheltuieli
 ForceUserHolidayValidator=Forţează validarea cererii de concediu
-ValidatorIsSupervisorByDefault= În mod implicit, validatorul este superviser-rul utilizatorului. Nu completaţi pentru a păstra acest comportament.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
+ValidatorIsSupervisorByDefault=În mod implicit, validatorul este supervizorul utilizatorului. Nu completaţi pentru a păstra acest comportament.
+UserPersonalEmail=Email personal
+UserPersonalMobile=Telefon mobil personal
+WarningNotLangOfInterface=Atenţie, aceasta este limba principală pe care o vorbește utilizatorul, nu limba interfeței pe care a ales să o vadă. Pentru a schimba limba interfeței pentru acest utilizator, accesați fila %s 
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index b0cce8bf277..e1bf4f55213 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -2,7 +2,7 @@
 Shortname=Cod
 WebsiteSetupDesc=Creați aici site-urile pe care doriți să le utilizați. Apoi intrați în meniul Websites pentru a le edita.
 DeleteWebsite=Şterge website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+ConfirmDeleteWebsite=Sigur doriți să ștergeți acest site web? Toate paginile și conținutul său vor fi, de asemenea, şterse. Fișierele încărcate (cele din directorul media sau din modulul ECM, ...) vor rămâne.
 WEBSITE_TYPE_CONTAINER=Tipul paginii/recipientului
 WEBSITE_PAGE_EXAMPLE=Pagină web pentru utilizare ca exemplu
 WEBSITE_PAGENAME=Pagina nume/alias
@@ -14,18 +14,18 @@ WEBSITE_JS_INLINE=Conținutul fișierului Javascript (comun tuturor paginilor)
 WEBSITE_HTML_HEADER=Adăugarea în partea de jos a antetului HTML (comun pentru toate paginile)
 WEBSITE_ROBOT=Fișier robot (robots.txt)
 WEBSITE_HTACCESS=Fișier .htaccess de pe site
-WEBSITE_MANIFEST_JSON=Website manifest.json file
-WEBSITE_README=README.md file
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package.
+WEBSITE_MANIFEST_JSON=Fişier manifest.json website
+WEBSITE_README=Fişier README.md
+WEBSITE_KEYWORDSDesc=Foloseşte virgula pentru a separa valorile
+EnterHereLicenseInformation=Introduceți aici metadate sau informații despre licență pentru a completa fișierul README.md. dacă distribuiți site-ul dvs. ca un șablon, fișierul va fi inclus în pachet.
 HtmlHeaderPage=Antet HTML (specific numai pentru această pagină)
 PageNameAliasHelp=Numele sau aliasul paginii. <br> Acest alias este, de asemenea, folosit pentru a crea un URL SEO când site-ul web este rulat de o gazdă virtuală a unui server Web (cum ar fi Apacke, Nginx, ...). Utilizați butonul "<strong> %s </strong>" pentru a edita acest alias.
 EditTheWebSiteForACommonHeader=Notă: dacă doriți să definiți un antet personalizat pentru toate paginile, modificați antetul la nivelul site-ului în locul paginii / containerului.
 MediaFiles=Media library
-EditCss=Edit website properties
+EditCss=Editare proprietăţi website
 EditMenu=Edit meniu
 EditMedias=Editați mediile
-EditPageMeta=Edit page/container properties
+EditPageMeta=Editare proprietăţi pagină/container
 EditInLine=Editați inline
 AddWebsite=Adaugă pagina web
 Webpage=Pagina web / container
@@ -43,10 +43,10 @@ ViewPageInNewTab=Afișați pagina în fila nouă
 SetAsHomePage=Seteaza ca  pagina Home 
 RealURL=Real URL
 ViewWebsiteInProduction=Vizualizați site-ul web utilizând URL-urile de home
-SetHereVirtualHost=<u>Use with Apache/NGinx/...</u><br>Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on<br><strong>%s</strong>
-ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup:
+SetHereVirtualHost=<u>Utilizați cu Apache/NGinx/...</u><br> Creați pe serverul dvs. web (Apache, Nginx, ...) un vhost dedicat cu PHP activat și un director Root activat pentru<br><strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Exemplu configuraţie utilizabilă vhost Apache:
 YouCanAlsoTestWithPHPS=<u> Utilizarea cu serverul încorporat PHP </u> <br> În mediul de dezvoltare, puteți prefera să testați site-ul cu serverul web încorporat PHP (PHP 5.5 necesar) executând <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP=<u>Rulaţi website-ul dvs. la un alt furnizor de găzduire Dolibarr</u><br> Dacă nu aveți un server web precum Apache sau NGinx disponibil public pe internet, puteți exporta și importa site-ul dvs. web pe o altă instanță Dolibarr furnizată de un alt furnizor de găzduire Dolibarr care asigură o integrare completă cu modulul Website. Puteți găsi o listă a unor furnizori de găzduire Dolibarr pe <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a> 
 CheckVirtualHostPerms=Verificați, de asemenea, că gazda virtuală are permisiunea <strong> %s </strong> pe fișiere în <br> <strong> %s </strong>
 ReadPerm=Citit
 WritePerm=Scrie
@@ -58,10 +58,10 @@ NoPageYet=Nici o pagină
 YouCanCreatePageOrImportTemplate=Puteți să creați o pagină nouă sau să importați un șablon de site complet
 SyntaxHelp=Ajutor pe sfaturile de sintaxă specifice
 YouCanEditHtmlSourceckeditor=Puteți edita codul sursă HTML folosind butonul "Sursă" din editor.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span>Puteți include codul PHP în această sursă folosind etichete<strong>&lt;?php?&gt;</strong>. Sunt disponibile următoarele variabile globale: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br><br><span class="fa fa-bug"></span>Puteți include, de asemenea, conținutul unei alte Pagini/Container cu următoarea sintaxă: <br><strong>&lt;?php includeContainer ('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> Puteți face o redirecționare către o altă Pagină/Container cu următoarea sintaxă (Notă: nu emiteți conținut înainte de o redirecționare): <br><strong>&lt;?php redirectToContainer ('alias_of_container_to_redirect_to'); ?&gt; </strong><br><br><span class="fa fa-link"></span>Pentru a adăuga o legătură la o altă pagină, utilizați sintaxa: <br><strong>&lt;a href ="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt; </strong><br><br><span class="fa fa-download"></span>Pentru a include un <strong>link de descărcare</strong> fișier stocat în <strong>directorul documentelor</strong>, utilizați wrapper-ul <strong>document.php</strong>: <br>Exemplu, pentru un fișier din documente/ECM (trebuie să fie înregistrat), sintaxa este:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br> Pentru un fișier din documente/media (director deschis pentru acces public), sintaxa este:<br><strong>&lt;a href ="/document.php?modulepart= medias&file=[relative_dir/]indicafilename.ext"&gt;</strong><br> Pentru un fișier partajat cu o legătură de partajare (acces deschis folosind cheia hash de partajare a fișierului), sintaxa este: <br><strong>&lt;a href="/ document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> Pentru a include o <strong>imagine</strong> stocată în <strong>directorul de documente</strong>, utilizați wrapper-ul <strong>viewimage.php</strong>: <br>Exemplu, pentru o imagine din documente/media (director deschis pentru acces public), sintaxa este: <br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br> 
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=Pentru o imagine partajată cu un link de partajare (acces deschis folosind cheia de distribuire a fișierului), sintaxa este:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
+YouCanEditHtmlSourceMore=<br>Mai multe exemple de cod HTML sau dinamic sunt disponibile în<a href="%s" target="_blank"> documentația wiki</a><br>.
 ClonePage=Clona pagina/container
 CloneSite=Clonează site-ul
 SiteAdded=Site adăugat
@@ -81,15 +81,15 @@ BlogPost=Postare pe blog
 WebsiteAccount=Contul site-ului
 WebsiteAccounts=Conturi de site
 AddWebsiteAccount=Creați un cont de site web
-BackToListForThirdParty=Back to list for the third-party
+BackToListForThirdParty=Înapoi la lista terţilor
 DisableSiteFirst=Dezactivați mai întâi site-ul web
 MyContainerTitle=Titlul site-ului meu web
-AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists)
-SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later...
+AnotherContainer=Așa se include conținutul altei pagini/container (este posibil să aveți o eroare aici dacă activați codul dinamic, deoarece subcontainerul încorporat poate să nu existe) 
+SorryWebsiteIsCurrentlyOffLine=Ne pare rău, acest site este în prezent offline. Reveniţi mai târziu ...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Activați tabelul contului site-ului web
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activați tabelul pentru a stoca conturile site-urilor web (Autentificare/parola) pentru fiecare site / terț
 YouMustDefineTheHomePage=Mai întâi trebuie să definiți pagina de Home implicită
-OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.<br>Note also that the inline editor may not works correclty when used on a grabbed external page.
+OnlyEditionOfSourceForGrabbedContentFuture=Atenţie: Crearea unei pagini web prin importarea unei pagini web externe este rezervată utilizatorilor cu experiență. În funcție de complexitatea paginii sursă, rezultatul importului poate diferi de original. De asemenea, dacă pagina sursă folosește stiluri CSS obișnuite sau cod Javascript conflictual, acesta poate altera aspectul sau caracteristicile editorului site-ului Web atunci când lucrați pe această pagină. Această metodă este o modalitate mai rapidă de a crea o pagină, dar este recomandat să creezi pagina ta de la zero sau de la un șablon de pagină sugerat. <br>De asemenea, reţineţi că editorul inline nu funcționează corect atunci când este utilizat pe o pagină externă capturată.
 OnlyEditionOfSourceForGrabbedContent=Numai ediția sursei HTML este posibilă atunci când conținutul a fost preluat de pe un site extern
 GrabImagesInto=Luați și imaginile găsite în CSS și pagină.
 ImagesShouldBeSavedInto=Imaginile trebuie salvate în director
@@ -99,39 +99,39 @@ AliasPageAlreadyExists=Pagina Alias <strong> %s </strong> există deja
 CorporateHomePage=Pagina de Home a companiei
 EmptyPage=Pagina goală
 ExternalURLMustStartWithHttp=Adresa URL externă trebuie să înceapă cu http:// sau https://
-ZipOfWebsitePackageToImport=Upload the Zip file of the website template package
-ZipOfWebsitePackageToLoad=or Choose an available embedded website template package
+ZipOfWebsitePackageToImport=Încărcați fișierul Zip cu pachetul șablon website
+ZipOfWebsitePackageToLoad=sau Alegeți un pachet șablon website încorporat disponibil
 ShowSubcontainers=Includeți conținut dinamic
 InternalURLOfPage=Adresa URL internă a paginii
 ThisPageIsTranslationOf=Această pagină/recipient este o traducere a
 ThisPageHasTranslationPages=Această pagină / recipient are traducere
 NoWebSiteCreateOneFirst=Niciun site nu a fost creat încă. Creați primul.
-GoTo=Go to
-DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '<strong>%s</strong>' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands).
-NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified.
-ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
-DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
-SearchReplaceInto=Search | Replace into
-ReplaceString=New string
-CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:<br><br>#mycssselector, input.myclass:hover { ... }<br>must be<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere.
-LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page.
-Dynamiccontent=Sample of a page with dynamic content
+GoTo=Mergi la
+DynamicPHPCodeContainsAForbiddenInstruction=Adăugați cod PHP dinamic care conține instrucțiunea PHP '<strong>%s</strong>' care este interzisă în mod implicit ca şi conținut dinamic (consultați opțiunile ascunse WEBSITE_PHP_ALLOW_xxx pentru a extinde lista comenzilor permise). 
+NotAllowedToAddDynamicContent=Nu aveți permisiunea să adăugați sau să editați conținut dinamic PHP în site-uri web. Cereți permisiunea sau păstrați codul nemodificat în etichetele php.
+ReplaceWebsiteContent=Căutare sau înlocuire conținut website
+DeleteAlsoJs= Ștergeți, de asemenea, toate fișierele javascript specifice acestui site web?
+DeleteAlsoMedias=Ștergeți, de asemenea, toate fișierele media specifice acestui site web?
+MyWebsitePages=Paginile site-ului meu
+SearchReplaceInto=Căutare | Înlocuire
+ReplaceString=String nou
+CSSContentTooltipHelp=Introduceți aici conținut CSS. Pentru a evita orice conflict cu CSS-ul aplicației, asigurați-vă că adaugaţi cu prepend toate declarațiile la clasa .bodywebsite. De exemplu: <br><br>#mycssselector, input.myclass: hover {...}<br>trebuie să fie <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br>Notă: Dacă aveți un fișier mare fără acest prefix, puteți utiliza 'lessc' pentru a-l converti şi adăuga prefixul .bodywebsite peste tot.
+LinkAndScriptsHereAreNotLoadedInEditor=Atenţie: Acest conținut este emis numai când site-ul este accesat de pe un server. Nu este utilizat în modul Edit, deci dacă trebuie să încărcați fișiere javascript și în modul de editare, trebuie doar să adăugați eticheta 'script src=...' în pagină.
+Dynamiccontent= Exemplu de pagină cu conținut dinamic
 ImportSite=Importați șablonul de site web
-EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
-GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters
-MainLanguage=Main language
-OtherLanguages=Other languages
-UseManifest=Provide a manifest.json file
-PublicAuthorAlias=Public author alias
-AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties
-ReplacementDoneInXPages=Replacement done in %s pages or containers
+EditInLineOnOff=Modul 'Editare inline' este %s
+ShowSubContainersOnOff=Modul de executare 'conţinut dinamic' este %s
+GlobalCSSorJS=Fișierul CSS/JS/Header global al website-ului
+BackToHomePage=Înapoi la pagina principală...
+TranslationLinks=Linkuri traducere
+YouTryToAccessToAFileThatIsNotAWebsitePage=Încercați să accesați o pagină care nu este disponibilă <br>(ref =%s, type =%s, status =%s)
+UseTextBetween5And70Chars=Pentru optimizare SEO, utilizați un text între 5 și 70 de caractere 
+MainLanguage=Limba principală
+OtherLanguages=Alte limbi
+UseManifest=Furnizați un fișier manifest.json
+PublicAuthorAlias=Alias public autor
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Limbile disponibile sunt definite în proprietățile website-ului
+ReplacementDoneInXPages=Înlocuirea s-a făcut în %s pagini sau containere
 RSSFeed=Feed RSS
-RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL
-PagesRegenerated=%s page(s)/container(s) regenerated
+RSSFeedDesc=Puteți obține un flux RSS al celor mai recente articole cu tipul 'blogpost' folosind această adresă URL
+PagesRegenerated=%s pagină(i) /container(e) regenerate
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index e40cfebcb30..d0c4e6162c6 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -1,46 +1,46 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
+CustomersStandingOrdersArea= Plăți prin Ordine de debit direct 
+SuppliersStandingOrdersArea=Plăți prin Transfer de credit
 StandingOrdersPayment=Ordine de plată prin debitare directă
 StandingOrderPayment=Ordin de plata prin debit direct
 NewStandingOrder=Ordin nou de debitare directă
-NewPaymentByBankTransfer=New payment by credit transfer
+NewPaymentByBankTransfer=Plată nouă prin Transfer de credit
 StandingOrderToProcess=De procesat
-PaymentByBankTransferReceipts=Credit transfer orders
-PaymentByBankTransferLines=Credit transfer order lines
+PaymentByBankTransferReceipts=Ordine de transfer de credit
+PaymentByBankTransferLines=Linii ordine transfer de credit
 WithdrawalsReceipts=Comenzi debit direct
 WithdrawalReceipt=Ordin de plată direct
-BankTransferReceipts=Credit transfer order
-BankTransferReceipt=Credit transfer order
-LatestBankTransferReceipts=Latest %s credit transfer orders
+BankTransferReceipts=Ordine de transfer de credit
+BankTransferReceipt=Ordin de transfer de credit
+LatestBankTransferReceipts=Ultimile %s ordine de transfer de credit
 LastWithdrawalReceipts=Ultimele fișiere de debit direct %s
-WithdrawalsLine=Direct debit order line
-CreditTransferLine=Credit transfer line
+WithdrawalsLine=Linie ordin de Direct debit
+CreditTransferLine=Linie transfer de credit
 WithdrawalsLines=Linii de ordine de debitare directă
-CreditTransferLines=Credit transfer lines
-RequestStandingOrderToTreat=Requests for direct debit payment order to process
-RequestStandingOrderTreated=Requests for direct debit payment order processed
-RequestPaymentsByBankTransferToTreat=Requests for credit transfer to process
-RequestPaymentsByBankTransferTreated=Requests for credit transfer processed
+CreditTransferLines=Linii transfer de credit
+RequestStandingOrderToTreat= Solicitări de plată prin debitare directă de procesat 
+RequestStandingOrderTreated= Solicitări de plată prin debitare directă procesate 
+RequestPaymentsByBankTransferToTreat=Solicitări de transfer de credit de procesat
+RequestPaymentsByBankTransferTreated=Solicitări de transfer de credit procesate
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Nu a fost încă posibil. Statutul Withdraw  trebuie să fie setat la "creditat" înaintea declarării respinge pe liniile specifice.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+NbOfInvoiceToWithdraw=Număr de facturi calificate ale clienților cu comandă de debit direct în așteptare 
 NbOfInvoiceToWithdrawWithInfo=Nr. de factură client cu ordin de plată prin debit direct având informații despre contul bancar
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
+NbOfInvoiceToPayByBankTransfer=Număr facturi de achiziţie calificate cu transfer de credit în așteptare 
+SupplierInvoiceWaitingWithdraw=Factura de achiziţie cu plata prin transfer de credit în aşteptare 
 InvoiceWaitingWithdraw=Factura în așteptare pentru debitul direct
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
+InvoiceWaitingPaymentByBankTransfer=Factură cu transfer de credit în aşteptare 
 AmountToWithdraw=Suma de a se retrage
-NoInvoiceToWithdraw=No invoice open for '%s' is waiting. Go on tab '%s' on invoice card to make a request.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open 'Direct credit requests' is waiting. Go on tab '%s' on invoice card to make a request.
+NoInvoiceToWithdraw=Nici o factură deschisă pentru '%s' în aşteptare. Accesați fila '%s' de pe fişa de factură pentru a face o solicitare.
+NoSupplierInvoiceToWithdraw=Nu este în așteptare nici o factură de de achiziţie cu 'Solicitare de direct credit'. Accesați fila '%s' de pe cardul de factură pentru a face o solicitare. 
 ResponsibleUser=Utilizator responsabil
 WithdrawalsSetup=Setarea plății prin debit direct
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Configurare Transfer de credit
 WithdrawStatistics=Rapoarte de plată prin debit direct
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Statistici transferuri de credit
 Rejects=Respinge
 LastWithdrawalReceipt=Ultimele încasări de debit direct %s
 MakeWithdrawRequest=Efectuați o solicitare de plată cu debit direct
-MakeBankTransferOrder=Make a credit transfer request
+MakeBankTransferOrder=Solicitare transfer de credit
 WithdrawRequestsDone=%s au fost înregistrate cererile de debitare directă
 ThirdPartyBankCode=Codul bancar al terțului
 NoInvoiceCouldBeWithdrawed=Nici o factură nu a fost debitată cu succes. Verificați dacă facturile sunt pe companiile cu un IBAN valabil și că IBAN are un UMR (referință unică de mandat) cu modul <strong> %s </strong>.
@@ -53,7 +53,7 @@ Lines=Linii
 StandingOrderReject=Emite o respinge
 WithdrawsRefused=Debitul direct a fost refuzat
 WithdrawalRefused=Retragere refuzată
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Transferuri de credit refuzate
 WithdrawalRefusedConfirm=Sunteţi sigur că doriţi să introduceţi un respingere de retragere pentru societate
 RefusedData=Data respingerii
 RefusedReason=Motivul respingerii
@@ -63,7 +63,9 @@ InvoiceRefused=Factura refuzată (Încărcați  refuzul la client)
 StatusDebitCredit=Stare debit/credit
 StatusWaiting=Aşteptare
 StatusTrans=Trimis
+StatusDebited=Debitat
 StatusCredited=Creditate
+StatusPaid=Plătite
 StatusRefused=Refuzat
 StatusMotif0=Nespecificat
 StatusMotif1=Fonduri insuficiente
@@ -77,35 +79,36 @@ StatusMotif8=Alte motive
 CreateForSepaFRST=Crearea unui fișier de debit direct (SEPA FRST)
 CreateForSepaRCUR=Creați un fișier de debit direct (SEPA RCUR)
 CreateAll=Creați un fișier de debit direct (toate)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
+CreateFileForPaymentByBankTransfer=Creați fișier pentru transfer de credit
+CreateSepaFileForPaymentByBankTransfer=Creați fișier de transfer de credit (SEPA)
 CreateGuichet=Numai de birou
 CreateBanque=Numai banca
 OrderWaiting=De aşteptare pentru tratament
-NotifyTransmision=Retragerea Transmitere
-NotifyCredit=Retragerea de credit
+NotifyTransmision=Înregistrați transmiterea fișierului de comandă
+NotifyCredit= Înregistrați creditul comenzii
 NumeroNationalEmetter=Numărul naţional transmiţător
 WithBankUsingRIB=Pentru conturile bancare folosind RIB
 WithBankUsingBANBIC=Pentru conturile bancare folosind codul IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Primirea contului bancar
-BankToPayCreditTransfer=Bank Account used as source of payments
+BankToPayCreditTransfer=Cont bancar utilizat ca sursă de plăți
 CreditDate=Credit pe
 WithdrawalFileNotCapable=Imposibil de a genera fișierul chitanţă de retragere pentru țara dvs %s (Țara dvs. nu este acceptată)
-ShowWithdraw=Show Direct Debit Order
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Fişier Retragere
+ShowWithdraw=Afișează Comanda de debit direct
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Cu toate acestea, dacă factura are cel puțin o comandă de plată prin debit direct, care încă nu a fost procesată, aceasta nu va fi setată ca plătită pentru a permite gestionarea prealabilă a retragerii.
+DoStandingOrdersBeforePayments=Această filă vă permite să solicitați o comandă de plată cu debit direct. Odată terminat, accesați meniul Bancă-> Plată prin debit direct pentru a genera și gestiona comanda de debit direct. La închiderea ordinului de debit direct, plata facturii va fi înregistrată automat, iar facturile vor fi închise dacă restul de plată este nul. 
+DoCreditTransferBeforePayments=Această filă vă permite să solicitați o comandă de transfer de credit. Odată finalizată, accesați meniul Bancă-> Plată prin transfer de credit pentru a genera și gestiona comanda de transfer de credit. Atunci când comanda de transfer de credit este închisă, plata facturii va fi înregistrată automat, iar facturile vor fi închise dacă restul de plată este nul.
+WithdrawalFile=Fişier debit order
+CreditTransferFile=Fişier transfer credit
 SetToStatusSent=Setează statusul "Fişier Trimis"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Acest lucru va înregistra, de asemenea, plățile pe facturi și le va clasifica drept „Plătit” dacă suma rămasă de plată este nulă
 StatisticsByLineStatus=Statistici după starea  liniilor
 RUM=RMU
-DateRUM=Mandate signature date
+DateRUM=Data semnării mandatului
 RUMLong=Referință de mandat unic
 RUMWillBeGenerated=Dacă este gol, se va genera un RMU (referință unică de mandat) odată ce informațiile despre contul bancar vor fi salvate.
 WithdrawMode=Modul debit direct (FRST sau RECUR)
 WithdrawRequestAmount=Suma solicitării de debitare directă:
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Valoarea cererii de transfer de credit:
 WithdrawRequestErrorNilAmount=Nu se poate crea o solicitare de debitare directă pentru suma goală.
 SepaMandate=Mandatul SEPA Direct Debit
 SepaMandateShort=Mandat SEPA
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Tip de plata
 ModeRECUR=Plată recurentă
 ModeFRST=Plata unică
 PleaseCheckOne=Verificați doar una
+CreditTransferOrderCreated=Ordin transfer credit %s creat
 DirectDebitOrderCreated=Comanda de debit direct %s a fost creată
 AmountRequested=Cantitatea cerută
 SEPARCUR=SEPA CUR
@@ -131,7 +135,7 @@ ICS=Identificatorul creditorului CI
 END_TO_END=Eticheta "EndToEndId" SEPA XML - Id unic atribuit pentru fiecare tranzacție
 USTRD=Eticheta XML "nestructurată" SEPA
 ADDDAYS=Adăugați zile la data de executare
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=Nu a fost găsit un IBAN implicit pentru acest terț 
 ### Notifications
 InfoCreditSubject=Plata ordinului de plată prin debit direct %s de către bancă
 InfoCreditMessage=Ordinul de plată prin debit direct %s a fost plătit de către bancă <br> Datele de plată: %s
@@ -141,3 +145,4 @@ InfoTransData=Suma: %s <br> Metoda: %s <br> Data: %s
 InfoRejectSubject=Comanda de debitare directă a fost refuzată
 InfoRejectMessage=Bună ziua, <br> <br> ordinul de plată prin debit direct al facturii %s aferente companiei %s, cu o sumă de %s a fost refuzată de bancă. <br> <br> - <br> %s
 ModeWarning=Opţiunea pentru modul real, nu a fost stabilit, ne oprim după această simulare
+ErrorCompanyHasDuplicateDefaultBAN=Compania cu id %s are mai multe conturi bancare implicite. Nu se poate determina cel care se doreşte a fi utilizat.
diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
index 5e4f0a4fb88..d463b4a8433 100644
--- a/htdocs/langs/ro_RO/workflow.lang
+++ b/htdocs/langs/ro_RO/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Configurare Modul Flux de Lucru
-WorkflowDesc=Acest modul este proiectat pentru modificarea comportamentului acțiunilor automate în aplicaţie. În mod implicit, fluxul de lucru este deschis (puteţi face ce doriţi în ordinea dorită). Puteți activa acțiunile automate de care sunteti interesat
+WorkflowDesc=Acest module oferă câteva acțiuni automate. Implicit, fluxul de lucru este deschis (puteți face lucrurile în ordinea pe care o doriți), dar aici puteți activa unele acțiuni automate.
 ThereIsNoWorkflowToModify=Nu există nicio modificare workflow  diponibila pentru modulele activate.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=În mod automat se crează o comandă de vânzări după ce se semnează o propunere comercială (noua comandă va avea aceeași valoare ca propunerea)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=În mod automat se crează o factură pentru client după ce se semnează o propunere comercială (noua factură va avea aceeași valoare ca propunerea)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crează o factură client automat, după ce un contract este validat
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=În mod automat se crează o factură client după ce se închide o comandă de vânzări (noua factură va avea aceeași valoare ca comanda)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-AutomaticCreation=Automatic creation
-AutomaticClassification=Automatic classification
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificați propunerea sursă asociată ca facturată atunci când comanda de vânzări este setată la facturare (și dacă valoarea comenzii este aceeași cu valoarea totală a propunerii asociate semnate)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificați propunerea sursă asociată ca facturată atunci când factura clientului este validată (și dacă valoarea facturii este aceeași cu valoarea totală a propunerii asociate semnate)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificați comanda de vânzări sursă asociată ca facturată atunci când factura clientului este validată (și dacă valoarea facturii este aceeași cu valoarea totală a ordinii de vânzări asociate)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificați comanda de vânzări sursă asociată ca fiind facturată atunci când factura clientului este setată la plată (și dacă valoarea facturii este aceeași cu suma totală a comenzii asociate)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificați comanda de vânzări sursă asociată ca livrată atunci când o livrare este validată (și dacă cantitatea livrată de toate expedițiile este aceeași ca în ordinea de actualizare)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificați propunerea furnizorului sursă asociată ca fiind facturată atunci când factura furnizorului este validată (și dacă valoarea facturii este aceeași cu valoarea totală a propunerii asociate)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificați comanda de vânzări sursă asociată ca fiind facturată atunci când factura furnizorului este validată (și dacă valoarea facturii este aceeași cu valoarea totală a comenzii asociate)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+AutomaticCreation=Creare automată
+AutomaticClassification=Clasificare automată
diff --git a/htdocs/langs/ro_RO/zapier.lang b/htdocs/langs/ro_RO/zapier.lang
index 6d6eda71313..b57810cb893 100644
--- a/htdocs/langs/ro_RO/zapier.lang
+++ b/htdocs/langs/ro_RO/zapier.lang
@@ -18,11 +18,12 @@
 #
 
 # Module label 'ModuleZapierForDolibarrName'
-ModuleZapierForDolibarrName = Zapier for Dolibarr
+ModuleZapierForDolibarrName = Zapier pentru Dolibarr
 # Module description 'ModuleZapierForDolibarrDesc'
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
+ModuleZapierForDolibarrDesc = Modul Zapier pentru Dolibarr
 
 #
 # Admin page
 #
-ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierForDolibarrSetup = Configurare modul Zapier pentru Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 7f8974191fd..571f0a4e238 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Журнал продаж
 ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Не согласовано
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 9003bdca1a4..a5bf50e855a 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Электронная почта отправите
 UserEmail=Электронная почта пользователя
 CompanyEmail=Электронная почта компании
 FeatureNotAvailableOnLinux=Функция недоступна на Unix подобных систем. Проверьте вашу программу для отправки почты локально.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Если перевод для этого языка не завершен или вы обнаружили ошибки, вы можете исправить это, отредактировав файлы в каталоге <b>langs / %s</b> и отправив свое изменение по адресу www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Если перевод для этого языка не завершен или вы обнаружите ошибки, вы можете исправить это, отредактировав файлы в каталог <b>langs/%s</b> и отправив измененные файлы на dolibarr.org/forum или для разработчиков на github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Настройка модуля
 ModulesSetup=Настройка Модулей/Приложений
 ModuleFamilyBase=Система
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Для использования этой функци
 SecurityToken=Ключ для шифрования URL-адресов
 NoSmsEngine=Менеджер отправления SMS недоступен. Диспетчер отправления SMS не устанавливается вместе с дистрибутивом по умолчанию, поскольку он зависит от внешнего поставщика, но некоторые из них можно найти на %s.
 PDF=PDF
-PDFDesc=Общие опции для генерации PDF.
-PDFAddressForging=Правила для зоны адреса
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Скрыть всю информацию, связанную с налогом с продаж / НДС
 PDFRulesForSalesTax=Правила для налога с продаж/НДС
 PDFLocaltax=Правила для %s
-HideLocalTaxOnPDF=Скрыть ставку %s в колонке Налог
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Скрыть описание товара
 HideRefOnPDF=Скрыть ссылки на продукты.
 HideDetailsOnPDF=Скрыть детали о линейки продуктов
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Изменять базовые цены на опреде
 MassConvert=Запустить пакетное преобразование
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Строка
+String1Line=String (1 line)
 TextLong=Длинный текст
+TextLongNLines=Long text (n lines)
 HtmlText=Html текст
 Int=Целое
 Float=С плавающей запятой
@@ -543,9 +546,9 @@ Module54Desc=Управление контрактами (услуги или п
 Module55Name=Штрих-коды
 Module55Desc=Управление штрих-кодами
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Прямые банковские платежи
-Module57Desc=Управление платежными поручениями с прямым дебитом. Включает создание файла SEPA для европейских стран.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Интеграция с системами НажатьДляЗвонка (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Создать / изменить услуги
 Permission534=Удаление услуг
 Permission536=Смотреть / Управлять скрытыми услугами
 Permission538=Экспорт услуг
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Просмотр ведомости материалов
 Permission651=Создание/обновление ведомостей материалов
 Permission652=Удалить списки материалов
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Просмотр пожертвований
 Permission702=Создание / изменение пожертвований
 Permission703=Удаление пожертвований
@@ -848,6 +858,8 @@ Permission773=Удаление отчётов о затратах
 Permission774=Просмотр всех отчётов о затратах (даже для неподчинённых пользователей)
 Permission775=Утвердить отчёты о расходах
 Permission776=Оплата отчётов о затратах
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Экспорт отчётов о затратах
 Permission1001=Просмотр запасов
 Permission1002=Создать/изменить склады
@@ -900,6 +912,7 @@ Permission2515=Настройка директорий документов
 Permission2801=Использовать FTP  клиент в режиме только чтения (только просмотр и загрузка файлов)
 Permission2802=Использовать FTP клиент в режиме записи (удаление или выгрузка файлов)
 Permission3200=Просмотреть архивированные события
+Permission3301=Generate new modules
 Permission4001=Смотреть сотрудников
 Permission4002=Создать сотрудников
 Permission4003=Удалить сотрудников
@@ -947,7 +960,8 @@ Permission63003=Удалить ресурсы
 Permission63004=Свяжите ресурсы с повесткой дня
 DictionaryCompanyType=Типы контрагента
 DictionaryCompanyJuridicalType=Правовая форма контрагента
-DictionaryProspectLevel=Потенциальный клиент
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Штат/Провинция
 DictionaryRegion=Регионы
 DictionaryCountry=Страны
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Шаблоны электронной почты
 DictionaryUnits=Единицы
 DictionaryMeasuringUnits=Единицы измерения
 DictionarySocialNetworks=Социальные сети
-DictionaryProspectStatus=Статус потенциального клиента
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Типы отпуска
 DictionaryOpportunityStatus=Правовой статус  проекта/сделки
 DictionaryExpenseTaxCat=Отчет о расходах - Категории транспорта
@@ -1076,7 +1091,7 @@ LoginPage=Страница авторизации
 BackgroundImageLogin=Фоновое изображение
 PermanentLeftSearchForm=Постоянный поиск формы на левом меню
 DefaultLanguage=Язык по умолчанию
-EnableMultilangInterface=Включить поддержку мультиязычности
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Компания/Организация
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Критерии поиска требу
 NewTranslationStringToShow=Новая строка перевода для показа
 OriginalValueWas=Исходный перевод перезаписан. Исходное значение: <br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Активированное приложение/модули: <b>%s</b>/<b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Вы должны включить минимум 1 модуль
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Да летом
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Какую вкладку вы хотите открывать по умолчанию, когда выбираете из меню Повестку дня
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Включить напоминание о событиях <b>по электронной почте</b> (напоминание опции/задержки можно определить для каждого события). Примечание. Модуль <strong>%s</strong> должен быть включен и правильно настроен для отправки напоминания с правильной частотой.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Включить звуковое оповещение
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Показывать связанный объект 
 ##### Clicktodial #####
 ClickToDialSetup=Настройка модуля Click To Dial
 ClickToDialUrlDesc=Url звонившего, когда клик по пиктограмме телефона сделан. В URL-адресе вы можете использовать теги<br><b>__PHONETO__</b>, которые будут заменены на номер телефона человека для вызова<br><b>__PHONEFROM__</b>, который будет заменен номером телефона вызывающего абонента (вашего) <br><b>__LOGIN__</b>, который будет заменен на clicktodial login (определенном на карточке пользователя) <br><b>__PASS__</b>, который будет заменен кликтодиальным паролем (определяется на карточке пользователя).
-ClickToDialDesc=Этот модуль делает номера телефонов кликабельными ссылками. Нажатие на значок заставит ваш телефонный номер позвонить. Это можно использовать для вызова системы call-центра из Dolibarr, которая может, например, позвонить по номеру телефона в системе SIP.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Используйте только ссылку «tel:» на номера телефонов
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Это поле содержит ссылку для идентиф
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=Цвет RGB находится в формате HEX, например: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Позиция строки в комбинированных списках
 SellTaxRate=Ставка налога на продажу
 RecuperableOnly=Да для НДС «Не воспринимается, а восстанавливается», предназначенный для некоторых государств во Франции. Сохраняйте значение «Нет» во всех других случаях.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Запрос коммерческого п
 MailToSendSupplierOrder=Заказы
 MailToSendSupplierInvoice=Счета-фактуры поставщика
 MailToSendContract=Договоры
+MailToSendReception=Receptions
 MailToThirdparty=Контрагенты
 MailToMember=Участники
 MailToUser=Пользователи
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Доступен Dolibarr ERP & CRM %s. Ве
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Шаблоны для документов продуктов
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=См. * Примечание для списка возможных переменных замещения
 SeeChangeLog=См. Файл ChangeLog (только на английском языке)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Левый отступ в PDF
 MAIN_PDF_MARGIN_RIGHT=Правый отступ PDF
 MAIN_PDF_MARGIN_TOP=Верхний отступ PDF
 MAIN_PDF_MARGIN_BOTTOM=Нижний отступ PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Для этого модуля не требуется никаких специальных настроек.
 SetToYesIfGroupIsComputationOfOtherGroups=Установите для этого значение yes, если эта группа является вычислением других групп
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Индекс
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index 3f3db99cf32..f63694850d1 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Количество событий
 ListOfActions=Список событий
 EventReports=События
 Location=Местонахождение
-ToUserOfGroup= пользователем из группы
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Событие на весь день (все дни)
 MenuToDoActions=Все незавершенные события
 MenuDoneActions=Все прекращенные события
@@ -86,6 +86,8 @@ ProposalDeleted=Предложение удалено
 OrderDeleted=Заказ удалён
 InvoiceDeleted=Счёт удалён
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Товар %sсоздан
 PRODUCT_MODIFYInDolibarr=Товар %sизменён
 PRODUCT_DELETEInDolibarr=Товар %sудалён
@@ -158,3 +160,9 @@ DateStartPlusOne=Дата начала + 1 час
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index d6efc00bac7..b8e47954693 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Последние %s зарегистрированные
 BoxTitleLastModifiedSuppliers=Продавцы: последнее %s изменений
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Заказы поставщиков: пос
 BoxTitleLastModifiedCustomerBills=Счета клиентов: последнее %s изменений
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Счета-фактуры Покупателей
 ForCustomersOrders=Заказы клиентов
 ForProposals=Предложения
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Бухгалтерия
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 2af537014ab..9b2073aed88 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 393e05bc995..f9002c431a6 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Специальные расходы
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index 17d4815fd87..91829bc7048 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Запуск служб
 MenuExpiredServices=Истекшим сроком службы
 MenuClosedServices=Закрытые услуги
 NewContract=Новый договор
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Создать контракт
 DeleteAContract=Удалить договор
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 6fe63dd63d6..d9a8f880d67 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Новое значение не может бы
 ErrorFailedToValidatePasswordReset=Невозможно обновить пароль. Может быть, обновление пароля уже выполнено (так как вы использовали одноразовую ссылку). Если это не так, попробуйте обновить пароль ещё раз. 
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Ошибка при добавлении контакта
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Ошибка. Ваш PHP  должен иметь модуль <b>%s</b> для использования этой функции. 
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index 1f3c3028ccc..6a544983929 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Арабский
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Арабский
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Болгарский
 Language_bs_BA=Боснийский
 Language_ca_ES=Каталанский
@@ -20,6 +23,7 @@ Language_en_GB=Английский (Великобритания)
 Language_en_IN=Английский (Индия)
 Language_en_NZ=Английский (Новая Зеландия)
 Language_en_SA=Английский (Саудовская Аравия)
+Language_en_SG=English (Singapore)
 Language_en_US=Английский (США)
 Language_en_ZA=Английский (Южная Африка)
 Language_es_ES=Испанский
@@ -29,6 +33,7 @@ Language_es_CL=Испанский (Чили)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Испанский (Доминиканская Республика)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Испанский (Гондурас)
 Language_es_MX=Испанский (Мексика)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Испанский (Парагвай)
 Language_es_PE=Испанский (Перу)
 Language_es_PR=Испанский (Пуэрто-Рико)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Эстонский
 Language_eu_ES=Баскский
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Французский (Бельгия)
 Language_fr_CA=Французский (Канада)
 Language_fr_CH=Французский (Швейцария)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Французский
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Французский (Новая Каледония)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Иврит
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Хорватский
 Language_hu_HU=Венгерский
 Language_id_ID=Индонезийский
 Language_is_IS=Исландский
 Language_it_IT=Итальянский
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Японский
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Латышский
 Language_mk_MK=Македонский
 Language_mn_MN=Mongolian
 Language_nb_NO=Норвежский (Букмол)
+Language_ne_NP=Nepali
 Language_nl_BE=Голландский (Бельгия)
 Language_nl_NL=Dutch
 Language_pl_PL=Польский
@@ -86,4 +100,5 @@ Language_uz_UZ=Узбекский
 Language_vi_VN=Вьетнамский
 Language_zh_CN=Китайский
 Language_zh_TW=Китайский (традиционный)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 938569bc947..1da962648ec 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Информация
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index b663d6f4b5d..a5a59a9782a 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=Цена ед. (с налогом)
 Amount=Сумма
 AmountInvoice=Сумма счета-фактуры
 AmountInvoiced=Сумма выставленного счета
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Сумма платежа
 AmountHTShort=Сумма (без налога)
 AmountTTCShort=Сумма (вкл-я налог)
@@ -485,6 +485,7 @@ Categories=Теги/категории
 Category=Тег/категория
 By=Автор
 From=От
+FromDate=От
 FromLocation=От
 to=к
 To=к
@@ -687,6 +688,7 @@ Method=Метод
 Receive=Получить
 CompleteOrNoMoreReceptionExpected=Завершено или ничего больше не ожидается
 ExpectedValue=Ожидаемое значение
+ExpectedQty=Expected Qty
 PartialWoman=Частичное
 TotalWoman=Всего
 NeverReceived=Не было получено
@@ -703,6 +705,7 @@ MenuECM=Документы
 MenuAWStats=AWStats
 MenuMembers=Участники
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Лимит Dolibarr (Меню Главная-Настройки-Безопасность): %s Кб, лимит PHP: %s Кб
 NoFileFound=Нет документов, сохраненных в этом каталоге
 CurrentUserLanguage=Текущий язык
@@ -725,7 +728,7 @@ Page=Страница
 Notes=Примечания
 AddNewLine=Добавить новую строку
 AddFile=Добавить файл
-FreeZone=Не предопределенный продукт/услуга
+FreeZone=Free-text product
 FreeLineOfType=Элемент произвольного текста, набрать:
 CloneMainAttributes=Клонирование объекта с его основными атрибутами
 ReGeneratePDF=Повторно сгенерировать PDF
@@ -942,6 +945,39 @@ ShortThursday=Чт
 ShortFriday=Пт
 ShortSaturday=Сб
 ShortSunday=Вс
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Выберите шаблон электронной почты
 SetRef=Настроить источник
 Select2ResultFoundUseArrows=Найдено несколько результатов. Используйте стрелки для выбора.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Информация
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index a43ce93ccef..7d3ed2063c4 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Проект участники
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Утверждена
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Новый вклад
 PaymentSubscription=Новый вклад оплаты
 SubscriptionEndDate=Подписка на конец даты
@@ -78,7 +81,7 @@ DeleteType=Удалить
 VoteAllowed=Голосовать разрешается
 Physical=Физическая
 Moral=Моральные
-MorPhy=Морально / Физическая
+MorPhy=Природа
 Reenable=Снова
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang
index d56a9365a62..14f9b820743 100644
--- a/htdocs/langs/ru_RU/mrp.lang
+++ b/htdocs/langs/ru_RU/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index ac1a05e4432..390b2716c41 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 86a8255d39c..e664a576813 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Установить тип штрих-кода
 BarcodeValue=Значение штрих-кода
 NoteNotVisibleOnBill=Примечание (не видимые на счетах-фактурах, предложениях ...)
 ServiceLimitedDuration=Если продукт является услугой с ограниченной длительности:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Кол-во цен
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Таможенный / Товарный / HS код
 CountryOrigin=Страна происхождения
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Короткая метка
 Unit=Единица
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Выберите комбинацию
 ProductCombinationGenerator=Генератор вариантов
 Features=Особенности
 PriceImpact=Влияние цены
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Влияние веса
 NewProductAttribute=Новый атрибут
 NewProductAttributeValue=Новое значение атрибута
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index d39a576de13..c1f34e89f14 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Содействующий
 TypeContact_project_task_external_TASKCONTRIBUTOR=Содействующий
 SelectElement=Выберите элемент
 AddElement=Ссылка на элемент
+LinkToElementShort=Ссылка к
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/ru_RU/recruitment.lang b/htdocs/langs/ru_RU/recruitment.lang
new file mode 100644
index 00000000000..fe67a4ea03e
--- /dev/null
+++ b/htdocs/langs/ru_RU/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Настройки
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = О
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 098b5993bf6..84c38e3ba22 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Удалить отправку
 Stock=Фондовый
 Stocks=Акции
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real фондовая
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Виртуальный запас
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Идентификатор склад
 DescWareHouse=Описание склада
 LieuWareHouse=Локализация склад
 WarehousesAndProducts=Склады и продукты
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Средняя цена входного
-AverageUnitPricePMP=Средняя цена входного
+AverageUnitPricePMPShort=Значение
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Продажа Цена за штуку
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Пополнения
 NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s)
 NbOfProductAfterPeriod=Количество продукта %s в остатке на конец выбранного периода (< %s)
 MassMovement=Массовое перемещение
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Получатели заказа
 StockMovementRecorded=Перемещения остатков записаны
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index d3fb1c16512..7ed1db76921 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/ru_RU/ticket.lang b/htdocs/langs/ru_RU/ticket.lang
index 4fe3fe15802..99c9e52ce56 100644
--- a/htdocs/langs/ru_RU/ticket.lang
+++ b/htdocs/langs/ru_RU/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Тип
-Category=Аналитический код
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Группа
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Аналитический код
+TicketCategory=Группа
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 888fc7191ae..d2a34f41a12 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Созданный пользователь будет в
 IdPhoneCaller=Идентификатор телефона абонента
 NewUserCreated=Пользователь %s создан
 NewUserPassword=Смена пароля для %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Пользователь %s изменен
 UserDisabled=Пользователь %s отключен
 UserEnabled=Пользователь %s активирован
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Отключено в режиме обслуживани
 UserAccountancyCode=Код учета пользователя
 UserLogoff=Выход пользователя
 UserLogged=Пользователь вошел
+DateOfEmployment=Employment date
 DateEmployment=Дата начала трудоустройства
 DateEmploymentEnd=Дата окончания занятости
 CantDisableYourself=Вы не можете отключить свою собственную запись пользователя
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 97300952777..e7d2417a55d 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Прямой дебетовый заказ
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Счёт отклонён (отказ платежа клиент
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Ожидание
 StatusTrans=Передающиеся
+StatusDebited=Debited
 StatusCredited=Кредитоваться
+StatusPaid=Оплачено
 StatusRefused=Отказавшийся
 StatusMotif0=Не указано
 StatusMotif1=Предоставление insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=Другая причина
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Только служба
 CreateBanque=Только банк
 OrderWaiting=Ожидание для лечения
-NotifyTransmision=Снятие передачи
-NotifyCredit=Снятие кредитную
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Национальный передатчик Количество
 WithBankUsingRIB=Для банковских счетов с использованием RIB
 WithBankUsingBANBIC=Для банковских счетов с использованием IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Кредит на
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Файл изъятия средств
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Установить статус "Файл отправлен"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Статистика статуса по строкам
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Сумма: %s <br> Metode: %s <br> Дата: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Вариант для реального режима не был установлен, мы останавливаемся после этого моделирования
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index bfacde3683f..3d5e478c0ba 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Автоматическое создание
 AutomaticClassification=Автоматическая классификация
diff --git a/htdocs/langs/ru_RU/zapier.lang b/htdocs/langs/ru_RU/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/ru_RU/zapier.lang
+++ b/htdocs/langs/ru_RU/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index b5e3002812a..bac28ccc142 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Zakázať priame zaznamenávanie transakcie na bankový účet
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Predaj denníka
 ACCOUNTING_PURCHASE_JOURNAL=Zakúpte denník
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Nezlúčené
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Použiť hromadne kategórie
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index e70abb77976..2509e6a075d 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Funkcia nie je k dispozícii pre Unix, ako napr systémy. Otestujte si svoje sendmail programu na mieste.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Nastavenie modulu
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Systém
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modul  <b>%s</b> musí byť aktívny ak potrebujete tú
 SecurityToken=Kľúč k zabezpečenej URL
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Zmeniť na cenách s hodnotou základného odkazu uvedené
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Reťaz
+String1Line=String (1 line)
 TextLong=Dlhý text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Celé číslo
 Float=Vznášať sa
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Čiarové kódy
 Module55Desc=Barcode riadenie
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrácia ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Vytvoriť / upraviť služby
 Permission534=Odstrániť služby
 Permission536=Pozri / správa skryté služby
 Permission538=Export služieb
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Prečítajte si dary
 Permission702=Vytvoriť / upraviť dary
 Permission703=Odstrániť dary
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Prečítajte si zásoby
 Permission1002=Vytvoriť / upraviť sklady
@@ -900,6 +912,7 @@ Permission2515=Nastavenie adresára dokumenty
 Permission2801=Pomocou FTP klienta v režime čítania (prezerať a sťahovať iba)
 Permission2802=Pomocou FTP klienta v režime zápisu (odstrániť alebo vkladať)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Zmazať zdroje
 Permission63004=Pripnúť zdroje k udalosti agendy
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potenciál
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Okres
 DictionaryCountry=Štáty
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Jednotky
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect stav
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanentný vyhľadávací formulár na ľavom menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=Novy prekladový reťazec na zobrzenie
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povoliť aspoň jeden modul
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Áno v lete
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Kliknite pre Dial Nastavenie modulu
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Hodnota dane z predaja
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Zmluvy
+MailToSendReception=Receptions
 MailToThirdparty=Tretie strany
 MailToMember=Členovia
 MailToUser=Užívatelia
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zips
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 6012ba11bd1..b326ed7fc23 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Počet udalostí
 ListOfActions=Zoznam udalostí
 EventReports=Event reports
 Location=Umiestnenie
-ToUserOfGroup=Každému užívateľovy v skupine
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Akcie po celý deň (y)
 MenuToDoActions=Všetky neúplné udalosti
 MenuDoneActions=Všetky ukončené akcie
@@ -86,6 +86,8 @@ ProposalDeleted=Ponuka zmazaná
 OrderDeleted=Objednávka zmazaná
 InvoiceDeleted=Faktúra zmazaná
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Čas začatia + 1 hodina
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index 89f709081b0..dea1fdff8da 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Najnovšie %s pridaný dodávatelia
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Najnovší %s zákazníci alebo prospekty
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Najnovší %s užívatelia
 BoxTitleLastFicheInter=Najnovšie %s upravené zásahy
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Nedávno %s upravené ponuky
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Zákazníci faktúry
 ForCustomersOrders=Zákazníci objednávky
 ForProposals=Návrhy
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Účtovníctvo
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index b629f24a80b..849dfa5d97a 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 49dc4cebc1c..86356ba2d4a 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=špeciálne rozšírenia
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang
index 434e321d538..12ec7931181 100644
--- a/htdocs/langs/sk_SK/contracts.lang
+++ b/htdocs/langs/sk_SK/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Spustené služby
 MenuExpiredServices=Prepadnuté služby
 MenuClosedServices=Uzavreté služby
 NewContract=Nová zmluva
-NewContractSubscription=Nová zmluva/predplatné
+NewContractSubscription=New contract or subscription
 AddContract=Vytvoriť zmluvu
 DeleteAContract=Odstránenie zmluvu
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 9b0b4d25237..2b0b88987e9 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Nová hodnota nemôže byť presne staré
 ErrorFailedToValidatePasswordReset=Nepodarilo sa Reinita heslo. Môže byť REINIT už bola vykonaná (tento odkaz možno použiť iba raz). Ak nie, skúste reštartovať REINIT procesu.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Nepodarilo sa pridať kontakt
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Platobný režim bol nastavený na typ %s ale nastavenie modulu Faktúry nebola dokončená definovať informácie, ktoré sa pre tento platobný režim.
 ErrorPHPNeedModule=Chyba, musí mať PHP modul <b>%s</b> nainštalovať túto funkciu používať.
 ErrorOpenIDSetupNotComplete=Môžete nastavenie Dolibarr konfiguračný súbor, aby OpenID overovania, ale URL OpenID služby nie je definovaný do stálych %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang
index 6c632a39b8b..bc7dec6ceb7 100644
--- a/htdocs/langs/sk_SK/languages.lang
+++ b/htdocs/langs/sk_SK/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabčina
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabčina
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengálština
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulharčina
 Language_bs_BA=Bosniansky
 Language_ca_ES=Katalánčina
@@ -20,6 +23,7 @@ Language_en_GB=Angličtina (Veľká Británia)
 Language_en_IN=Angličtina (India)
 Language_en_NZ=Angličtina (Nový Zéland)
 Language_en_SA=Angličtina (Saudská Arábia)
+Language_en_SG=English (Singapore)
 Language_en_US=Angličtina (Spojené štáty)
 Language_en_ZA=Angličtina (Južná Afrika)
 Language_es_ES=Španielčina
@@ -29,6 +33,7 @@ Language_es_CL=Španielčina (Chile)
 Language_es_CO=Španielčina (Kolumbia)
 Language_es_DO=Španielčina (Dominikánska Republika)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Španielčina (Honduras)
 Language_es_MX=Španielčina (Mexiko)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Španielčina (Paraguaj)
 Language_es_PE=Španielčina (Peru)
 Language_es_PR=Španielčina (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Španielčina (Venezuela)
 Language_et_EE=Estónčina
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finština
 Language_fr_BE=Francúzština (Belgicko)
 Language_fr_CA=Francúzština (Kanada)
 Language_fr_CH=Francúzština (Švajčiarsko)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Francúzština
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Francúzština (Nová Kaledónia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frízština
+Language_gl_ES=Galician
 Language_he_IL=Hebrejčina
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Chorvátsky
 Language_hu_HU=Maďarčina
 Language_id_ID=Indonézština
 Language_is_IS=Islandský
 Language_it_IT=Taliančina
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japonština
 Language_ka_GE=Gruzínčina
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Lotyština
 Language_mk_MK=Macedónsky
 Language_mn_MN=Mongolian
 Language_nb_NO=Nórčina (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Holanďština (Belgicko)
 Language_nl_NL=Dutch
 Language_pl_PL=Poľština
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamčina
 Language_zh_CN=Čínština
 Language_zh_TW=Čínština (tradičná)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index fc8cb12b03f..d8f41131b19 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informácie
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index aa3cbd552cb..eaa10c84a42 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Množstvo
 AmountInvoice=Fakturovaná čiastka
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Suma platby
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Čiastka (s DPH)
@@ -485,6 +485,7 @@ Categories=Štítky/kategórie
 Category=Štítok/kategória
 By=Podľa
 From=Z
+FromDate=Z
 FromLocation=Z
 to=na
 To=na
@@ -687,6 +688,7 @@ Method=Metóda
 Receive=Prijať
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Čiastočný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
@@ -703,6 +705,7 @@ MenuECM=Dokumenty
 MenuAWStats=AWStats
 MenuMembers=Členovia
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu domáce bezpečnostné nastavenia): %s Kb, PHP limit: %s Kb
 NoFileFound=Žiadne dokumenty uložené v tomto adresári
 CurrentUserLanguage=Aktuálny jazyk
@@ -725,7 +728,7 @@ Page=Strana
 Notes=Poznámky
 AddNewLine=Pridať nový riadok
 AddFile=Pridať súbor
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone objekt s jeho hlavnými atribútmi
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Informácie
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index 26a80b0c1db..3a419e0d32c 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Návrhy členov
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Overené
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Nový príspevok
 PaymentSubscription=Nový príspevok platba
 SubscriptionEndDate=Predplatné je dátum ukončenia
@@ -78,7 +81,7 @@ DeleteType=Odstrániť
 VoteAllowed=Hlasovať povolená
 Physical=Fyzikálne
 Moral=Morálna
-MorPhy=Morálna / Fyzikálne
+MorPhy=Príroda
 Reenable=Znovu povoliť
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/sk_SK/mrp.lang b/htdocs/langs/sk_SK/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/sk_SK/mrp.lang
+++ b/htdocs/langs/sk_SK/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index 3a6e0c4b6d5..d758a30e814 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 6ee85cce9d9..90f384e7f2e 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Nastavte typ čiarového kódu
 BarcodeValue=Barcode hodnota
 NoteNotVisibleOnBill=Poznámka (nie je vidieť na návrhoch faktúry, ...)
 ServiceLimitedDuration=Je-li výrobok je služba s obmedzeným trvaním:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Počet cien
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Krajina pôvodu
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Krátky názov
 Unit=Jednotka
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Nový atribút
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index ad5c2535ed4..e66dcd1adf2 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Prispievateľ
 TypeContact_project_task_external_TASKCONTRIBUTOR=Prispievateľ
 SelectElement=Vyberte prvok
 AddElement=Odkaz na elementu
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/sk_SK/recruitment.lang b/htdocs/langs/sk_SK/recruitment.lang
new file mode 100644
index 00000000000..759257ea80c
--- /dev/null
+++ b/htdocs/langs/sk_SK/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = O
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 21dce5eae16..b15427261ce 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Zmazať odoslanie
 Stock=Zásoba
 Stocks=Zásoby
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Zásoby podľa LOT/Serial
@@ -95,14 +95,16 @@ RealStock=Skutočné Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtuálny sklad
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id sklad
 DescWareHouse=Popis sklad
 LieuWareHouse=Lokalizácia sklad
 WarehousesAndProducts=Sklady a produkty
 WarehousesAndProductsBatchDetail=Sklady a produkty ( podľa LOT/Serial )
-AverageUnitPricePMPShort=Vážený priemer cien vstupov
-AverageUnitPricePMP=Vážený priemer cien vstupov
+AverageUnitPricePMPShort=Vážená priemerná cena
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Predajná jednotka Cena
 EstimatedStockValueSellShort=Počet na predaj
 EstimatedStockValueSell=Počet na predaj
@@ -141,7 +143,7 @@ Replenishments=Splátky
 NbOfProductBeforePeriod=Množstvo produktov %s na sklade, než zvolené obdobie (&lt;%s)
 NbOfProductAfterPeriod=Množstvo produktov %s na sklade po zvolené obdobie (&gt; %s)
 MassMovement=Hromadný pohyb
-SelectProductInAndOutWareHouse=Vyberte si produkt, množstvo, zdrojový sklad a cieľový sklad, potom kliknite na &quot;%s&quot;. Akonáhle sa tak stane pre všetky požadované pohyby, kliknite na &quot;%s&quot;.
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Bločky tejto objednávky
 StockMovementRecorded=Zaznamenané pohyby zásob
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 526a84108a2..1d932bc8462 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Niektoré podradené výrobky nemajú určenú cenu.
 AddSupplierPrice=Pridať nákupnú cenu
 ChangeSupplierPrice=Zmeniť nákupnú cenu
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tento odkaz Dodávateľ je už spojená s odkazom: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Dostupnosť
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Schváliť túto objednávku
 ConfirmApproveThisOrder=Určite chcete potvrdiť objednávku <b>%s</b>?
 DenyingThisOrder=Odmietnuť objednávku
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Zdržanie dodávky v dňoch
-DescNbDaysToDelivery=Nejväčšie oneskorenie doručenia produktu z tejto objednávky
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Neobjednávať
-NotTheGoodQualitySupplier=Zlý počet
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputácia
 BuyerName=Meno kupcu
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sk_SK/ticket.lang b/htdocs/langs/sk_SK/ticket.lang
index 6ba73da7cd6..b0914c5f748 100644
--- a/htdocs/langs/sk_SK/ticket.lang
+++ b/htdocs/langs/sk_SK/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Typ
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Skupina
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Skupina
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index a5c18482b77..3c707abb9c5 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Vytvorený užívateľ bude externý užívateľ (pretož
 IdPhoneCaller=Id telefón volajúceho
 NewUserCreated=Užívateľ %s vytvorený
 NewUserPassword=Zmena hesla pre %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Užívateľ %s zmenený
 UserDisabled=Užívateľ %s zakázaný
 UserEnabled=Užívateľ %s aktivovaný
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Vypnuté v údržbovom móde
 UserAccountancyCode=User accounting code
 UserLogoff=Odhlásiť užívateľa
 UserLogged=Užívateľ prihlásený
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index b7127296289..a13acf88e77 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Inkaso objednávky
 WithdrawalReceipt=Inkaso objednávka
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Najnovšie %s dokumenty bezhotovostných platieb
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Čakanie
 StatusTrans=Odoslané
+StatusDebited=Debited
 StatusCredited=Pripísania
+StatusPaid=Platený
 StatusRefused=Odmietol
 StatusMotif0=Nešpecifikovaný
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Iný dôvod
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Iba kancelária
 CreateBanque=Iba banky
 OrderWaiting=Čakanie na liečbu
-NotifyTransmision=Odstúpenie Prevodovka
-NotifyCredit=Odstúpenie Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Národná Vysielač číslo
 WithBankUsingRIB=U bankových účtov pomocou RIB
 WithBankUsingBANBIC=U bankových účtov pomocou IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Kredit na
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Odstúpenie súbor
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Nastavte na stav &quot;odoslaný súbor&quot;
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Voľba pre reálny režim nebol nastavený, môžeme zastaviť po tomto simuláciu
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/sk_SK/workflow.lang b/htdocs/langs/sk_SK/workflow.lang
index 4944888de58..2a3db6f62aa 100644
--- a/htdocs/langs/sk_SK/workflow.lang
+++ b/htdocs/langs/sk_SK/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow modul nastavenia
-WorkflowDesc=Tento modul vám pomôže nastaviť fingovanie automatických akcií v aplikácií. V základe je postup otvorený ( možete robiť úlohy v poradí v akom chcete) Môžete aktivovať automatické akcie aké chcete.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=Úprava postupu nie je možná pri aktivovanom module.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automaticky vytvoriť zákaznícku faktúru po overení zmluvy
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/sk_SK/zapier.lang b/htdocs/langs/sk_SK/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/sk_SK/zapier.lang
+++ b/htdocs/langs/sk_SK/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 327c2a57565..ed2ba10774e 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Prodam revija
 ACCOUNTING_PURCHASE_JOURNAL=Nakup revij
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 158ff10864c..d6419d53bef 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Funkcija ni na voljo pri Unix sistemih. Preverite program za pošiljanje pošte lokalno.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Nastavitve modula
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistem
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Če potrebujete to funkcijo, morate najprej omogočiti
 SecurityToken=Ključ za šifriranje url
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Sprememba cen z definirano osnovno referenčno vrednostjo
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=Niz
+String1Line=String (1 line)
 TextLong=Dolgo besedilo
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Celo število
 Float=Plavajoče
@@ -520,7 +523,7 @@ Module22Name=Mass Emailings
 Module22Desc=Manage bulk emailing
 Module23Name=Energija
 Module23Desc=Nadzor porabe energije
-Module25Name=Sales Orders
+Module25Name=Naročila
 Module25Desc=Sales order management
 Module30Name=Računi
 Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Črtne kode
 Module55Desc=Upravljanje črtnih kod
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=Klic s klikom
 Module58Desc=Integracija klica s klikom
 Module59Name=Vaš zaznamek
@@ -836,9 +839,16 @@ Permission532=Kreiranje/spreminjanje storitev
 Permission534=Brisanje storitev
 Permission536=Pregled/upravljanje skritih storitev
 Permission538=Izvoz storitev
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Branje donacij
 Permission702=Kreiranje/spreminjanje donacij
 Permission703=Delete donacij
@@ -848,6 +858,8 @@ Permission773=Brisanje stroškovnih poročil
 Permission774=Branje vseh stroškovnih poročil (tudi za nepodrejene)
 Permission775=Odobritev stroškovnih poročil
 Permission776=Plačilo stroškovnih poročil
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Izvoz stroškovnih poročil
 Permission1001=Branje zalog
 Permission1002=Kreiranje/spreminjanje skladišč
@@ -900,6 +912,7 @@ Permission2515=Nastavitve map dokumentov
 Permission2801=Uporaba FTP klienta samo za branje (samo brskanje in prenašanje)
 Permission2802=Uporaba FTP klienta za pisanje (brisanje ali nalaganje datotek)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Potencial možne stranke
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regije
 DictionaryCountry=Države
@@ -957,7 +971,7 @@ DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=Stopnje DDV ali davkov
 DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
+DictionaryPaymentConditions=Plačilni pogoji
 DictionaryPaymentModes=Payment Modes
 DictionaryTypeContact=Tipi kontaktov/naslovov
 DictionaryTypeOfContainer=Website - Type of website pages/containers
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Enote
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Status možne stranke
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Stalno polje za iskanje na levem meniju
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Omogočiti morate vsaj 1 modul
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Da poleti
@@ -1316,7 +1332,7 @@ SuggestPaymentByChequeToAddress=Suggest payment by check to
 FreeLegalTextOnInvoices=Poljubno besedilo na računu
 WatermarkOnDraftInvoices=Vodni žig na osnutku računa (nič, če je prazno)
 PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Vendor payments
+SuppliersPayment=Plačila dobaviteljem
 SupplierPaymentSetup=Vendor payments setup
 ##### Proposals #####
 PropalSetup=Nastavitve modula za komercialne ponudbe
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Kateri zavihek naj se privzeto odpre ko izberete meni Dnevni red
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Nastavitve modula za klicanje s klikom
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=To polje vsebuje referenco identifikacijske vrstice. Vnesite poljub
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Položaj vrstice v kombiniranih seznamih
 SellTaxRate=Stopnja prodajnega davka
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1840,9 +1857,10 @@ MailToSendInvoice=Računi za kupca
 MailToSendShipment=Odpreme
 MailToSendIntervention=Intervencije
 MailToSendSupplierRequestForQuotation=Quotation request
-MailToSendSupplierOrder=Purchase orders
-MailToSendSupplierInvoice=Vendor invoices
+MailToSendSupplierOrder=Nabavni nalogi
+MailToSendSupplierInvoice=Fakture dobaviteljev
 MailToSendContract=Pogodbe
+MailToSendReception=Receptions
 MailToThirdparty=Partnerji
 MailToMember=Člani
 MailToUser=Uporabniki
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index 8f5c44b6e42..85d7db4f84a 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Število dogodkov
 ListOfActions=Seznam dogodkov
 EventReports=Event reports
 Location=Lokacija
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Dogodek na celoten dan(ni)
 MenuToDoActions=Vsi nedokončani dogodki
 MenuDoneActions=Vsi prekinjeni dogodki
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Začetni datum + 1 ura
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index edf62e53f54..2070ff6f437 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Račun
-Bills=Računi
-BillsCustomers=Računi za kupca
-BillsCustomer=Račun za kupca
-BillsSuppliers=Vendor invoices
-BillsCustomersUnpaid=Neplačani računi stranke
-BillsCustomersUnpaidForCompany=Unpaid customer invoices for %s
-BillsSuppliersUnpaid=Unpaid vendor invoices
-BillsSuppliersUnpaidForCompany=Unpaid vendors invoices for %s
+Bill=Faktura
+Bills=Fakture
+BillsCustomers=Fakture za kupce
+BillsCustomer=Faktura za kupca
+BillsSuppliers=Fakture dobaviteljev
+BillsCustomersUnpaid=Neplačane fakture kupcev
+BillsCustomersUnpaidForCompany=%s neplačanih faktur kupcev
+BillsSuppliersUnpaid=Neplačane fakture dobaviteljev
+BillsSuppliersUnpaidForCompany=%s neplačnih faktur dobaviteljev
 BillsLate=Zamujena plačila
-BillsStatistics=Statistika računov za kupce
-BillsStatisticsSuppliers=Vendors invoices statistics
-DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping
-DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter.
-DisabledBecauseNotErasable=Disabled because cannot be erased
-InvoiceStandard=Standardni račun
-InvoiceStandardAsk=Standardni račun
-InvoiceStandardDesc=Ta vrsta računa je običajni račun.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+BillsStatistics=Statistika faktur za kupce
+BillsStatisticsSuppliers=Statisika faktur dobaviteljev
+DisabledBecauseDispatchedInBookkeeping=Onemogočeno, ker je bila faktura poslana v knjiženje
+DisabledBecauseNotLastInvoice=Onemogočeno, ker brisanje fakture ni dovoljeno. Fakture so bile ustvarjene po tej fakturi, zato bi brisanje povzročilo škrbine v števcu.
+DisabledBecauseNotErasable=Onemogočeno, ker brisanje ni dovoljeno
+InvoiceStandard=Standardna faktura
+InvoiceStandardAsk=Standardna faktura
+InvoiceStandardDesc=Ta vrsta fakture je običajna faktura.
+InvoiceDeposit=Avansni račun
+InvoiceDepositAsk=Avansni račun
+InvoiceDepositDesc=Ta vrsta fakture se naredi po prejemu avansa.
 InvoiceProForma=Predračun
 InvoiceProFormaAsk=Predračun
 InvoiceProFormaDesc=<b>Predračun</b> izgleda enako kot račun, vendar nima računovodske vrednosti.
 InvoiceReplacement=Nadomestni račun
 InvoiceReplacementAsk=Nadomestni račun za račun
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=Namen <b>nadomestne fakture </b> je v celoti nadomestiti fakturo, za katero ni bilo prejetega plačila. <br><br> Opomba: Samo neplačane fakture je mogoče nadomestiti z nadomestno fakturo. Če faktura, za katero delate nadomestno fakturo, še ni zaključena, bo tista faktura avtomatsko dobila stanje 'opuščena'.
 InvoiceAvoir=Dobropis
-InvoiceAvoirAsk=Dobropis za korekcijo računa
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+InvoiceAvoirAsk=Dobropis za korekcijo fakture
+InvoiceAvoirDesc=Dobropis <b> je negativna faktura, namenjena korekciji zneskov na fakturi, ki se razlikujejo od zneskov prejetih plačil iz naslova fakture (npr. kupec je plačal previsok znesek, ali pa ni plačal celotnega zneska in vrnil del artiklov).
 invoiceAvoirWithLines=Ustvari dobropis z vrsticami iz originalnega računa
 invoiceAvoirWithPaymentRestAmount=Ustvari dobropis iz neplačanega preostanka osnovnega računa
 invoiceAvoirLineWithPaymentRestAmount=Dobropis za preostali neplačan znesek
@@ -41,9 +41,9 @@ CorrectionInvoice=Račun za popravek
 UsedByInvoice=Uporabljen za plačilo računa %s
 ConsumedBy=Porabil
 NotConsumed=Ni porabljen
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=Ni nadomestnih faktur
 NoInvoiceToCorrect=Ni računa za korekcijo
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Je bila vir enemu ali več dobropisom
 CardBill=Kartica računa
 PredefinedInvoices=Vnaprej določeni računi
 Invoice=Račun
@@ -53,118 +53,118 @@ InvoiceLine=Vrstica računa
 InvoiceCustomer=Račun za kupca
 CustomerInvoice=Račun za kupca
 CustomersInvoices=Računi za kupce
-SupplierInvoice=Vendor invoice
-SuppliersInvoices=Vendors invoices
-SupplierBill=Vendor invoice
-SupplierBills=Računi dobaviteljev
+SupplierInvoice=Faktura dobavitelja
+SuppliersInvoices=Fakture dobaviteljev
+SupplierBill=Faktura dobavitelja
+SupplierBills=Fakture dobaviteljev
 Payment=Plačilo
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
+PaymentBack=Vračilo
+CustomerInvoicePaymentBack=Vračilo
 Payments=Plačila
-PaymentsBack=Refunds
-paymentInInvoiceCurrency=in invoices currency
+PaymentsBack=Vračila
+paymentInInvoiceCurrency=V valuti faktur
 PaidBack=Vrnjeno plačilo
 DeletePayment=Brisanje plačila
-ConfirmDeletePayment=Are you sure you want to delete this payment?
-ConfirmConvertToReduc=Do you want to convert this %s into an available credit?
-ConfirmConvertToReduc2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
-ConfirmConvertToReducSupplier=Do you want to convert this %s into an available credit?
-ConfirmConvertToReducSupplier2=The amount will be saved among all discounts and could be used as a discount for a current or a future invoice for this vendor.
-SupplierPayments=Vendor payments
+ConfirmDeletePayment=Ali želite brisati plačilo?
+ConfirmConvertToReduc=Ali želite to %s pretvoriti v razpoložljivo dobroimetje?
+ConfirmConvertToReduc2=Znesek bo shranjen med popuste in je lahko uporabljen kot popust na prihodnjih fakturah temu kupcu.
+ConfirmConvertToReducSupplier=Ali želite to %s pretvoriti v razpoložljivo dobroimetje?
+ConfirmConvertToReducSupplier2=Znesek bo shranjen med popuste in je lahko uporabljen kot popust na prihodnjih fakturah tega dobavitelja.
+SupplierPayments=Plačila dobaviteljem
 ReceivedPayments=Prejeta plačila
-ReceivedCustomersPayments=Prejeta plačila od kupcev
-PayedSuppliersPayments=Payments paid to vendors
+ReceivedCustomersPayments=Prejeta plačila kupcev
+PayedSuppliersPayments=Izvedena plačila dobaviteljem
 ReceivedCustomersPaymentsToValid=Prejeta plačila od kupcev za potrditev
 PaymentsReportsForYear=Poročilo o plačilih za %s
 PaymentsReports=Poročila o plačilih
 PaymentsAlreadyDone=Izvršena plačila
-PaymentsBackAlreadyDone=Refunds already done
+PaymentsBackAlreadyDone=Izvedena vračila
 PaymentRule=Pravilo plačila
-PaymentMode=Payment Type
-PaymentTypeDC=Debit/Credit Card
+PaymentMode=Tip plačila
+PaymentTypeDC=Debetna/Kreditna kartica
 PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+IdPaymentMode=Tip plačila (id)
+CodePaymentMode=Tip plačila (šifra)
+LabelPaymentMode=Tip plačila (oznaka)
+PaymentModeShort=Tip plačila
+PaymentTerm=Plačilni pogoj
+PaymentConditions=Plačilni pogoji
+PaymentConditionsShort=Plačilni pogoji
 PaymentAmount=Znesek plačila
 PaymentHigherThanReminderToPay=Plačilo višje od opomina
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess received for each overpaid invoice.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the outstanding amount to pay. <br> Edit your entry, otherwise confirm and consider creating a credit note for the excess paid for each overpaid invoice.
-ClassifyPaid=Označeno kot 'Plačano'
-ClassifyUnPaid=Classify 'Unpaid'
-ClassifyPaidPartially=Označeno kot 'Delno plačano'
-ClassifyCanceled=Označeno kot 'Opuščeno'
-ClassifyClosed=Označeno kot 'Zaključeno'
+HelpPaymentHigherThanReminderToPay=Pozor, znesek plačila enega od faktur je večji od odprtega zneska za plačilo. <br>Popravite vnos, ali pa potrdite in po potrebi izdelajte dobropis v presežnem znesku za vsako preplačano fakturo.
+HelpPaymentHigherThanReminderToPaySupplier=Pozor, znesek plačila enega od faktur je večji od odprtega zneska za plačilo. <br>Popravite vnos, ali pa potrdite in po potrebi izdelajte dobropis v presežnem znesku za vsako preplačano fakturo.
+ClassifyPaid=Označi kot 'Plačano'
+ClassifyUnPaid=Označi kot 'Neplačano'
+ClassifyPaidPartially=Označi kot 'Delno plačano'
+ClassifyCanceled=Označi kot 'Opuščeno'
+ClassifyClosed=Označi kot 'Zaključeno'
 ClassifyUnBilled=Označi kot "Nezaračunano"
-CreateBill=Kreiraj račun
+CreateBill=Ustvari fakturo
 CreateCreditNote=Ustvari dobropis
-AddBill=Ustvariti računa ali dobropis
-AddToDraftInvoices=Dodaj osnutku računa
-DeleteBill=Izbriši račun
-SearchACustomerInvoice=Iskanje računa za kupca
-SearchASupplierInvoice=Search for a vendor invoice
-CancelBill=Preklic računa
-SendRemindByMail=Pošlji opomin po e-mailu
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
-EnterPaymentReceivedFromCustomer=Vnesi prejeto plačilo od kupca
+AddBill=Ustvari fakturo ali dobropis
+AddToDraftInvoices=Dodaj osnutku fakture
+DeleteBill=Izbriši fakturo
+SearchACustomerInvoice=Iskanje fakture za kupca
+SearchASupplierInvoice=Iskanje fakture dobavitelja
+CancelBill=Preklic fakture
+SendRemindByMail=Pošlji opomin po e-pošti
+DoPayment=Vnos plačila
+DoPaymentBack=Vnos vračila
+ConvertToReduc=Označi nerazpoložljivo dobroimetje
+ConvertExcessReceivedToReduc=Pretvori presežek plačila v dobroimetje
+ConvertExcessPaidToReduc=Pretvori presežek plačila v razpoložljiv popust
+EnterPaymentReceivedFromCustomer=Vnesi prejem plačila kupca
 EnterPaymentDueToCustomer=Vnesi rok plačila za kupca
-DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je neplačan opomin enako nič
+DisabledBecauseRemainderToPayIsZero=Onemogočeno, ker je neplačan znesek enak nič
 PriceBase=Osnova cene
-BillStatus=Status računa
-StatusOfGeneratedInvoices=Status of generated invoices
+BillStatus=Stanje fakture
+StatusOfGeneratedInvoices=Stanja ustvarjenih faktur
 BillStatusDraft=Osnutek (potrebna potrditev)
 BillStatusPaid=Plačano
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Vračilo dobropisa ali označeno kot nerazpoložljivo dobroimetje
+BillStatusConverted=Plačano (pripravljeno za fakturiranje)
 BillStatusCanceled=Opuščeno
 BillStatusValidated=Potrjeno (potrebno plačilo)
 BillStatusStarted=Začeto
 BillStatusNotPaid=Ni plačano
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Ni vrnjeno
 BillStatusClosedUnpaid=Zaključeno (neplačano)
-BillStatusClosedPaidPartially=Plačano (delno)
+BillStatusClosedPaidPartially=Delno plačano
 BillShortStatusDraft=Osnutek
 BillShortStatusPaid=Plačano
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
-BillShortStatusConverted=Plačan
+BillShortStatusPaidBackOrConverted=Vrnjeno ali pretvorjeno
+Refunded=Vrnjeno
+BillShortStatusConverted=Plačano
 BillShortStatusCanceled=Opuščeno
 BillShortStatusValidated=Potrjeno
 BillShortStatusStarted=Začeto
 BillShortStatusNotPaid=Neplačano
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Ni vrnjeno
 BillShortStatusClosedUnpaid=Zaključeno
-BillShortStatusClosedPaidPartially=Plačano (delno)
+BillShortStatusClosedPaidPartially=Delno plačano
 PaymentStatusToValidShort=Za potrditev
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
-ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment types
-ErrorBillNotFound=Račun s številko %s ne obstaja
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorVATIntraNotConfigured=Med-podjetna DDV številka še ni določena
+ErrorNoPaiementModeConfigured=Privzet tip plačila ni določen. Določite ga v modulu za fakturiranje.
+ErrorCreateBankAccount=Ustvari bančni račun in potem v Nastavitvah, v modulu za fakturiranje, definiraj tipe plačil.
+ErrorBillNotFound=Faktura s številko %s ne obstaja
+ErrorInvoiceAlreadyReplaced=Napaka, potrditi skušate fakturo, ki bi nadomestila fakturo %s, ampak ta faktura je že bila nadomeščena s fakturo %s.
 ErrorDiscountAlreadyUsed=Napaka, popust je bil že uporabljen
-ErrorInvoiceAvoirMustBeNegative=Napaka, na popravljenem računu mora biti negativni znesek
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=Napaka, ne morete preklicati računa, ki je bil zamenjan z drugim računom, ki je še v statusu osnutka
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+ErrorInvoiceAvoirMustBeNegative=Napaka, na popravljeni fakturi mora biti negativni znesek
+ErrorInvoiceOfThisTypeMustBePositive=Napaka, ta tip fakture mora imeti znesek brez davka (ali nič).
+ErrorCantCancelIfReplacementInvoiceNotValidated=Napaka, ne morete preklicati fakture, ki je bil nadomeščena z drugo fakturo, ki je še v statusu osnutka
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ta ali drug del je že uporabljen, zato serije popustov ni dovoljeno odstraniti.
 BillFrom=Izdajatelj
 BillTo=Prejemnik
 ActionsOnBill=Aktivnosti na računu
-RecurringInvoiceTemplate=Template / Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
-NewBill=Nov račun
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
+RecurringInvoiceTemplate=Predloga / Ponavljajoča se faktura
+NoQualifiedRecurringInvoiceTemplateFound=Ni primernega osnutka ponavljajoče se fakture
+FoundXQualifiedRecurringInvoiceTemplate=Najdenih %s primernih osnutkov ponavljajočih se faktur.
+NotARecurringInvoiceTemplate=Ni predloga ponavljajoče se fakture
+NewBill=Nova faktura
+LastBills=Zadnjih %s faktur
+LatestTemplateInvoices=Zadnjih %s predlog faktur
+LatestCustomerTemplateInvoices=Zadnjih %s predlog faktur za kupce
 LatestSupplierTemplateInvoices=Latest %s vendor template invoices
 LastCustomersBills=Latest %s customer invoices
 LastSuppliersBills=Latest %s vendor invoices
@@ -257,7 +257,7 @@ DateInvoice=Datum izdaje
 DatePointOfTax=Point of tax
 NoInvoice=Ni računa
 ClassifyBill=Klacificiraj račun
-SupplierBillsToPay=Unpaid vendor invoices
+SupplierBillsToPay=Neplačane fakture dobaviteljem
 CustomerBillsUnpaid=Neplačani računi stranke
 NonPercuRecuperable=Nepovratno
 SetConditions=Set Payment Terms
@@ -524,8 +524,8 @@ TypeContact_facture_external_BILLING=Kontakt za račun kupcu
 TypeContact_facture_external_SHIPPING=Kontakt za pošiljanje kupcu
 TypeContact_facture_external_SERVICE=Kontakt za servis pri kupcu
 TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Vendor invoice contact
-TypeContact_invoice_supplier_external_SHIPPING=Vendor shipping contact
+TypeContact_invoice_supplier_external_BILLING=Dobaviteljeva kontaktna oseba za fakture
+TypeContact_invoice_supplier_external_SHIPPING=Dobaviteljeva kontaktna oseba za dobave
 TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
 # Situation invoices
 InvoiceFirstSituationAsk=Račun za prvo situacijo
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index 8e2cde7fc9b..92f815a1a33 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Zadnji %s zabeleženi dobavitelji
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Najnovejše %s stranke in možne stranke
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Zadnji %s člani
 BoxTitleLastFicheInter=Zadnje %s spremenjene intervencije
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Računi za kupce
 ForCustomersOrders=Naročila kupcev
 ForProposals=Ponudbe
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Računovodstvo
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index 95e60738514..a103bd51275 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/sl_SI/commercial.lang b/htdocs/langs/sl_SI/commercial.lang
index f59a8da7705..e13f6551d2a 100644
--- a/htdocs/langs/sl_SI/commercial.lang
+++ b/htdocs/langs/sl_SI/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=Prodaja
+CommercialArea=Področje prodaje
 Customer=Kupec
 Customers=Kupci
 Prospect=Možna stranka
@@ -12,14 +12,14 @@ AddAnAction=Ustvari dogodek
 AddActionRendezVous=Ustvari srečanje
 ConfirmDeleteAction=Ali zares želite izbrisati ta dogodek ?
 CardAction=Kartica aktivnosti
-ActionOnCompany=Related company
-ActionOnContact=Related contact
+ActionOnCompany=Povezano podjetje
+ActionOnContact=Povezan stik
 TaskRDVWith=Sestanek z %s
 ShowTask=Prikaži naloge
 ShowAction=Prikaži aktivnosti
 ActionsReport=Poročilo o aktivnostih
 ThirdPartiesOfSaleRepresentative=Partnerji s prodajnimi predstavniki
-SaleRepresentativesOfThirdParty=Sales representatives of third party
+SaleRepresentativesOfThirdParty=Prodajni predstavniki tretje osebe
 SalesRepresentative=Prodajni predstavnik
 SalesRepresentatives=Prodajni predstavniki
 SalesRepresentativeFollowUp=Prodajni predstavnik (nadaljevanje)
@@ -29,8 +29,8 @@ ShowCustomer=Prikaži kupca
 ShowProspect=Prikaži možno stranko
 ListOfProspects=Seznam možnih strank
 ListOfCustomers=Seznam kupcev
-LastDoneTasks=Latest %s completed actions
-LastActionsToDo=Oldest %s not completed actions
+LastDoneTasks=Zadnjih %s zaključenih aktivnosti
+LastActionsToDo=Nastarejših %s odprtih aktivnosti
 DoneAndToDoActions=Dokončane in odprte naloge
 DoneActions=Dokončane aktivnosti
 ToDoActions=Nedokončane aktivnosti
@@ -52,17 +52,17 @@ ActionAC_TEL=Telefonski klic
 ActionAC_FAX=Poslati faks
 ActionAC_PROP=Poslati ponudbo
 ActionAC_EMAIL=Poslati e-mail
-ActionAC_EMAIL_IN=Reception of Email
+ActionAC_EMAIL_IN=Prejem e-maila
 ActionAC_RDV=Sestanek
 ActionAC_INT=Intervencija na lokaciji
-ActionAC_FAC=Poslati račun kupcu po pošti
-ActionAC_REL=Poslati račun kupcu po pošti (opomin)
-ActionAC_CLO=Zapreti
-ActionAC_EMAILING=Poslati skupinski e-mail
-ActionAC_COM=Send sales order by mail
+ActionAC_FAC=Račun bo poslan po pošti
+ActionAC_REL=Račun bo poslan po pošti (opomnik)
+ActionAC_CLO=Zapri
+ActionAC_EMAILING=Pošlji skupinski e-mail
+ActionAC_COM=Pošlji prodajno poročilo po e-pošti
 ActionAC_SHIP=Pošlji pošiljko po pošti
-ActionAC_SUP_ORD=Send purchase order by mail
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_ORD=Pošlji nabavno naročilo po e-pošti
+ActionAC_SUP_INV=Prejeto fakturo poslati po pošti
 ActionAC_OTH=Ostalo
 ActionAC_OTH_AUTO=Avtomatsko vnešeni dogodki
 ActionAC_MANUAL=Ročno vnešeni dogodki
@@ -72,9 +72,9 @@ Stats=Statistika prodaje
 StatusProsp=Status možne stranke
 DraftPropals=Osnutek komercialne ponudbe
 NoLimit=Brez omejitev
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commercial proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=Povezava do online podpisa
+WelcomeOnOnlineSignaturePage=Dobrodošli na strani za prejem ponudb od %s
+ThisScreenAllowsYouToSignDocFrom=Na tem ekranu lahko sprejemate, podpisujete ali zavračate ponudbe
+ThisIsInformationOnDocumentToSign=Informacije na dokumentu, ki jih je potrebno potrditi ali zavrniti
+SignatureProposalRef=Podpis ponudbe %s
+FeatureOnlineSignDisabled=Funkcionalnost elektronskega podpisovanja je onemogočena, oziroma je dokument nastal, preden je bilo omogočeno elektronsko podpisovanje
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 4af0e6f6512..a3a4ec4adde 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Posebni stroški
@@ -106,7 +107,7 @@ VATPayments=Sales tax payments
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
-Refund=Refund
+Refund=Vračilo
 SocialContributionsPayments=Social/fiscal taxes payments
 ShowVatPayment=Prikaži plačilo DDV
 TotalToPay=Skupaj za plačilo
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang
index 2490c7978ef..847944c7047 100644
--- a/htdocs/langs/sl_SI/contracts.lang
+++ b/htdocs/langs/sl_SI/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Aktivne storitve
 MenuExpiredServices=Pretečene storitve
 MenuClosedServices=Zaključene storitve
 NewContract=Nova pogodba
-NewContractSubscription=Nova pogodba/naročnina
+NewContractSubscription=New contract or subscription
 AddContract=Ustvari pogodbo
 DeleteAContract=Izbriši pogodbo
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index d4e675c7825..c9142ec4843 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sl_SI/languages.lang b/htdocs/langs/sl_SI/languages.lang
index 07280d58025..f449281f141 100644
--- a/htdocs/langs/sl_SI/languages.lang
+++ b/htdocs/langs/sl_SI/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabščina
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabščina
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengalščina
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bolgarski
 Language_bs_BA=Bosanski
 Language_ca_ES=Katalonščina
@@ -20,6 +23,7 @@ Language_en_GB=Angleščina (Združeno kraljestvo)
 Language_en_IN=Angleščina (Indija)
 Language_en_NZ=Angleščina (Nova Zelandija)
 Language_en_SA=Angleški (Savdska Arabija)
+Language_en_SG=English (Singapore)
 Language_en_US=Angleščina (ZDA)
 Language_en_ZA=Angleščina (Južna Afrika)
 Language_es_ES=Španščina
@@ -29,6 +33,7 @@ Language_es_CL=Španščina (Čile)
 Language_es_CO=Španščina (Kolumbija)
 Language_es_DO=Španščina (Dominikanska republika)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Španščina (Honduras)
 Language_es_MX=Španščina (Mehika)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Španski (Paragvaj)
 Language_es_PE=Španski (Peru)
 Language_es_PR=Španščina (Portoriko)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonski
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finščina
 Language_fr_BE=Francoščina (Belgija)
 Language_fr_CA=Francoščina (Kanada)
 Language_fr_CH=Francoščina (Švica)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Francoščina
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Francoski (Nova Kaledonija)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frizijščina
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Hrvaški
 Language_hu_HU=Madžarščina
 Language_id_ID=Indonezijščina
 Language_is_IS=Islandščina
 Language_it_IT=Italijanščina
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japonščina
 Language_ka_GE=Gruzijščina
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvijski
 Language_mk_MK=Makedonski
 Language_mn_MN=Mongolian
 Language_nb_NO=Norveščina (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Nizozemščina (Belgija)
 Language_nl_NL=Dutch
 Language_pl_PL=Poljščina
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamski
 Language_zh_CN=Kitajščina
 Language_zh_TW=Kitajščina (tradicionalna)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index aa37bd15448..8c93e61eedc 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 14587e0dbf0..71d8cbb4ee9 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=C.E. (z davkom)
 Amount=Znesek
 AmountInvoice=Znesek računa
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Znesek za plačilo
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Znesek (z DDV)
@@ -485,6 +485,7 @@ Categories=Značke/kategorije
 Category=Značka/kategorija
 By=Z
 From=Od
+FromDate=Izdajatelj
 FromLocation=Izdajatelj
 to=do
 To=do
@@ -687,6 +688,7 @@ Method=Metoda
 Receive=Prejeto
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Delni
 TotalWoman=Skupna
 NeverReceived=Nikoli prejeto
@@ -703,6 +705,7 @@ MenuECM=Dokumenti
 MenuAWStats=AWStatistika
 MenuMembers=Člani
 MenuAgendaGoogle=Google dnevni red
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr omejitve (Meni domov-nastavitve-varnost): %s Kb, PHP omejitev: %s Kb
 NoFileFound=V tej mapi ni shranjenih dokumentov
 CurrentUserLanguage=Trenutni jezik
@@ -725,7 +728,7 @@ Page=Stran
 Notes=Opombe
 AddNewLine=Dodaj novo vrstico
 AddFile=Dodaj datoteko
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Kloniraj objekt z osnovnimi atributi
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=Č
 ShortFriday=P
 ShortSaturday=S
 ShortSunday=N
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Nastavi referenco
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -961,9 +997,9 @@ SearchIntoProjects=Projekti
 SearchIntoMO=Manufacturing Orders
 SearchIntoTasks=Naloge
 SearchIntoCustomerInvoices=Računi za kupca
-SearchIntoSupplierInvoices=Vendor invoices
+SearchIntoSupplierInvoices=Fakture dobaviteljev
 SearchIntoCustomerOrders=Sales orders
-SearchIntoSupplierOrders=Purchase orders
+SearchIntoSupplierOrders=Nabavni nalogi
 SearchIntoCustomerProposals=Komercialne ponudbe
 SearchIntoSupplierProposals=Vendor proposals
 SearchIntoInterventions=Intervencije
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Informacija
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index 345902d0348..1dbada441d8 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Predlagani člani
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Potrjen
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Nov prispevek
 PaymentSubscription=Plačilo novega prispevka
 SubscriptionEndDate=Končni datum članstva
@@ -78,7 +81,7 @@ DeleteType=Izbriši
 VoteAllowed=Dovoljeno glasovanje
 Physical=Fizično
 Moral=Moralno
-MorPhy=Moralno/fizično
+MorPhy=Narava
 Reenable=Ponovno omogoči
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/sl_SI/mrp.lang b/htdocs/langs/sl_SI/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/sl_SI/mrp.lang
+++ b/htdocs/langs/sl_SI/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index 6ac81edd908..637417dddd2 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Področje naročil kupcev
-SuppliersOrdersArea=Purchase orders area
+SuppliersOrdersArea=Področje naročil dobaviteljem
 OrderCard=Kartica naročila
 OrderId=ID naročila
 Order=Naročilo
@@ -11,23 +11,23 @@ OrderDate=Datum naročila
 OrderDateShort=Datum naročila
 OrderToProcess=Naročilo za obdelavo
 NewOrder=Novo naročilo
-NewOrderSupplier=New Purchase Order
+NewOrderSupplier=Nov nabavni nalog
 ToOrder=Potrebno naročiti
 MakeOrder=Izdelaj naročilo
-SupplierOrder=Purchase order
-SuppliersOrders=Purchase orders
-SuppliersOrdersRunning=Current purchase orders
-CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
-CustomersOrdersRunning=Current sales orders
-CustomersOrdersAndOrdersLines=Sales orders and order details
-OrdersDeliveredToBill=Sales orders delivered to bill
-OrdersToBill=Sales orders delivered
-OrdersInProcess=Sales orders in process
-OrdersToProcess=Sales orders to process
-SuppliersOrdersToProcess=Purchase orders to process
-SuppliersOrdersAwaitingReception=Purchase orders awaiting reception
-AwaitingReception=Awaiting reception
+SupplierOrder=Nabavni nalog
+SuppliersOrders=Nabavni nalogi
+SuppliersOrdersRunning=Trenutni nabavni nalogi
+CustomerOrder=Naročilo
+CustomersOrders=Naročila
+CustomersOrdersRunning=Trenutna naročila
+CustomersOrdersAndOrdersLines=Naročila s podrobnostmi
+OrdersDeliveredToBill=Naročilo dostavljeno, za fakturiranje
+OrdersToBill=Naročilo dostavljeno
+OrdersInProcess=Naročila v obdelavi
+OrdersToProcess=Naročila za obdelavo
+SuppliersOrdersToProcess=Nabavni nalogi za obdelavo
+SuppliersOrdersAwaitingReception=Naročila v čakanju na prejem
+AwaitingReception=V čakanju na prejem
 StatusOrderCanceledShort=Preklicano
 StatusOrderDraftShort=Osnutek
 StatusOrderValidatedShort=Potrjeno
@@ -42,7 +42,7 @@ StatusOrderApprovedShort=Odobreno
 StatusOrderRefusedShort=Zavrnjeno
 StatusOrderToProcessShort=Za obdelavo
 StatusOrderReceivedPartiallyShort=Delno prejeto
-StatusOrderReceivedAllShort=Products received
+StatusOrderReceivedAllShort=Prevzeti artikli
 StatusOrderCanceled=Preklicano
 StatusOrderDraft=Osnutek (potrebno potrditi)
 StatusOrderValidated=Potrjeno
@@ -53,7 +53,7 @@ StatusOrderToBill=Za fakturiranje
 StatusOrderApproved=Odobreno
 StatusOrderRefused=Zavrnjeno
 StatusOrderReceivedPartially=Delno prejeto
-StatusOrderReceivedAll=All products received
+StatusOrderReceivedAll=Vsi artikli prevzeti
 ShippingExist=Pošiljka ne obstaja
 QtyOrdered=Naročena količina
 ProductQtyInDraft=Količina proizvoda v osnutkih naročil
@@ -66,45 +66,45 @@ RefuseOrder=Zavrni naročilo
 ApproveOrder=Odobri naročilo
 Approve2Order=Odobri naročilo (drugi nivo)
 ValidateOrder=Potrdi naročilo
-UnvalidateOrder=Unvalidate red
+UnvalidateOrder=Razveljavi potrditev naročila
 DeleteOrder=Briši naročilo
 CancelOrder=Prekliči naročilo
-OrderReopened= Order %s re-open
+OrderReopened= Ponovno odpri naročilo %s
 AddOrder=Ustvari naročilo
-AddPurchaseOrder=Create purchase order
+AddPurchaseOrder=Ustvari nov nabavni nalog
 AddToDraftOrders=Dodaj osnutku naročila
 ShowOrder=Prikaži naročilo
 OrdersOpened=Naročila za procesiranje
 NoDraftOrders=Ni osnutkov naročil
-NoOrder=No order
-NoSupplierOrder=No purchase order
-LastOrders=Latest %s sales orders
-LastCustomerOrders=Latest %s sales orders
-LastSupplierOrders=Latest %s purchase orders
-LastModifiedOrders=Latest %s modified orders
+NoOrder=Ni naročil
+NoSupplierOrder=Ni nabavnih nalogov
+LastOrders=Zadnjih %s naročil
+LastCustomerOrders=Zadnjih %s naročil
+LastSupplierOrders=Zadnjih %s nabavnih nalogov
+LastModifiedOrders=Zadnjih %s spremenjenih naročil
 AllOrders=Vsa naročila
 NbOfOrders=Število naročil
 OrdersStatistics=Statistika naročil
-OrdersStatisticsSuppliers=Purchase order statistics
+OrdersStatisticsSuppliers=Statistika nabavnih nalogov
 NumberOfOrdersByMonth=Število naročil po mesecih
-AmountOfOrdersByMonthHT=Amount of orders by month (excl. tax)
+AmountOfOrdersByMonthHT=Vrednost naročil po mesecih (brez DDV)
 ListOfOrders=Seznam naročil
 CloseOrder=Zaključi naročilo
-ConfirmCloseOrder=Are you sure you want to set this order to delivered? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b>?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status?
-ConfirmCancelOrder=Are you sure you want to cancel this order?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b>?
+ConfirmCloseOrder=Ali želite označiti naročilo kot prevzeto? Ko je naročilo prevzeto, ga je mogoče označiti kot fakturirano.
+ConfirmDeleteOrder=Ali želite brisati naročilo?
+ConfirmValidateOrder=Ali želite potrditi naročilo pod imenom <b>%s</b>?
+ConfirmUnvalidateOrder=Ali želiti vrniti stanje naročila <b>%s</b> v osnutek?
+ConfirmCancelOrder=Ali želite preklicati naročilo?
+ConfirmMakeOrder=Potrdite, da ste ustvarili naročilo dne <b>%s</b>.
 GenerateBill=Kreiraj račun
 ClassifyShipped=Označi kot dobavljeno
 DraftOrders=Osnutki naročil
-DraftSuppliersOrders=Draft purchase orders
+DraftSuppliersOrders=Nabavni nalogi v osnutku
 OnProcessOrders=Naročila v obdelavi
-RefOrder=Ref. naročilo
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for vendor
-RefOrderSupplierShort=Ref. order vendor
+RefOrder=Šifra naročila
+RefCustomerOrder=Naročnikova oznaka naročila
+RefOrderSupplier=Dobaviteljeva šifra nabavnega naloga
+RefOrderSupplierShort=Šifra nabavnega naloga
 SendOrderByMail=Pošlji naročilo po pošti
 ActionsOnOrder=Aktivnosti ob naročilu
 NoArticleOfTypeProduct=Na tem naročilu ni artiklov tipa 'proizvod', zato ni potrebna odprema
@@ -112,25 +112,25 @@ OrderMode=Način oddaje naročila
 AuthorRequest=Zahteva avtorja
 UserWithApproveOrderGrant=Uporabniki z dovoljenjem za "odobritev naročil".
 PaymentOrderRef=Plačilo naročila %s
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b>?
-DispatchSupplierOrder=Receiving purchase order %s
+ConfirmCloneOrder=Ali želite klonirati naročilo <b>%s</b>?
+DispatchSupplierOrder=Prejemanje po nabavnem nalogu %s
 FirstApprovalAlreadyDone=Prva odobritev je že narejena
 SecondApprovalAlreadyDone=Druga odobritev je že narejena
-SupplierOrderReceivedInDolibarr=Purchase Order %s received %s
-SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
-SupplierOrderClassifiedBilled=Purchase Order %s set billed
+SupplierOrderReceivedInDolibarr=Nabavni nalog %s prejet %s
+SupplierOrderSubmitedInDolibarr=Nabavni nalog oddan %s
+SupplierOrderClassifiedBilled=Nabavni nalog %s zaračunan
 OtherOrders=Ostala naročila
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
+TypeContact_commande_internal_SALESREPFOLL=Predstavnik, ki sledi naročilu
 TypeContact_commande_internal_SHIPPING=Referent za sledenje odpreme
 TypeContact_commande_external_BILLING=Kontakt za račune pri kupcu
 TypeContact_commande_external_SHIPPING=Kontakt za dobave pri kupcu
 TypeContact_commande_external_CUSTOMER=Kontakt za sledenje naročila pri kupcu
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up purchase order
+TypeContact_order_supplier_internal_SALESREPFOLL=Predstavnik, ki sledi nabavnemu nalogu
 TypeContact_order_supplier_internal_SHIPPING=Referent za sledenje odpreme od dobavitelja
-TypeContact_order_supplier_external_BILLING=Vendor invoice contact
-TypeContact_order_supplier_external_SHIPPING=Vendor shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Vendor contact following-up order
+TypeContact_order_supplier_external_BILLING=Dobaviteljeva kontaktna oseba za fakture
+TypeContact_order_supplier_external_SHIPPING=Dobaviteljeva kontaktna oseba za dobave
+TypeContact_order_supplier_external_CUSTOMER=Dobaviteljeva kontaktna oseba za sledenje naročila
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstanta COMMANDE_SUPPLIER_ADDON ni definirana
 Error_COMMANDE_ADDON_NotDefined=Konstanta COMMANDE_ADDON ni definirana
 Error_OrderNotChecked=Ni izbranih naročil za račun
@@ -141,11 +141,12 @@ OrderByEMail=E-pošta
 OrderByWWW=Internet
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=A complete order model 
-PDFEratostheneDescription=A complete order model
+PDFEinsteinDescription=Popoln vzorec naročanja (stara implementacija predloge Eratosthene)
+PDFEratostheneDescription=Popoln vzorec naročanja
 PDFEdisonDescription=Vzorec enostavnega naročila
-PDFProformaDescription=A complete Proforma invoice template
+PDFProformaDescription=Popoln vzorec predloge predračuna
 CreateInvoiceForThisCustomer=Zaračunaj naročila
+CreateInvoiceForThisSupplier=Zaračunaj naročila
 NoOrdersToInvoice=Ni naročil, ki bi jih lahko zaračunali
 CloseProcessedOrdersAutomatically=Označi vsa izbrana naročila kot "Procesirano"
 OrderCreation=Ustvarjanje naročila
@@ -154,10 +155,10 @@ OrderCreated=Vaša naročila so bila ustvarjena
 OrderFail=Pri ustvarjanju naročil je prišlo do napake
 CreateOrders=Ustvari naročila
 ToBillSeveralOrderSelectCustomer=Za ustvarjanje računa za več naročil najprej kliknite na kupca, nato izberite "%s".
-OptionToSetOrderBilledNotEnabled=Option from module Workflow, to set order to 'Billed' automatically when invoice is validated, is not enabled, so you will have to set the status of orders to 'Billed' manually after the invoice has been generated.
-IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated.
-CloseReceivedSupplierOrdersAutomatically=Close order to status "%s" automatically if all products are received.
-SetShippingMode=Set shipping mode
+OptionToSetOrderBilledNotEnabled=V modulu Delovni tokovi (Workflow) ni označeno, da naj se po potrditvi računa naročilu avtomatsko spremeni stanje v 'Zaračunano', zato morate po izdaji računa stanje spremeniti ročno.
+IfValidateInvoiceIsNoOrderStayUnbilled=Dokler račun ni potrjen, naročilo ostane v stanju 'Nezaračunano'.
+CloseReceivedSupplierOrdersAutomatically=Avtomatsko zapri naročilo v status "%s", če so vsi artikli prevzeti.
+SetShippingMode=Izberi način pošiljanja
 WithReceptionFinished=With reception finished
 #### supplier orders status
 StatusSupplierOrderCanceledShort=Preklicano
@@ -174,7 +175,7 @@ StatusSupplierOrderApprovedShort=Odobreno
 StatusSupplierOrderRefusedShort=Zavrnjeno
 StatusSupplierOrderToProcessShort=Za obdelavo
 StatusSupplierOrderReceivedPartiallyShort=Delno prejeto
-StatusSupplierOrderReceivedAllShort=Products received
+StatusSupplierOrderReceivedAllShort=Prejeti artikli
 StatusSupplierOrderCanceled=Preklicano
 StatusSupplierOrderDraft=Osnutek (potrebno potrditi)
 StatusSupplierOrderValidated=Potrjen
@@ -185,4 +186,4 @@ StatusSupplierOrderToBill=Za fakturiranje
 StatusSupplierOrderApproved=Odobreno
 StatusSupplierOrderRefused=Zavrnjeno
 StatusSupplierOrderReceivedPartially=Delno prejeto
-StatusSupplierOrderReceivedAll=All products received
+StatusSupplierOrderReceivedAll=Vsi artikli prevzeti
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index bc9ade2dcb0..3cc9bcea61e 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 91f59823d0a..dd6d7012188 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Nastavi tip črtne kode
 BarcodeValue=Vrednost črtne kode
 NoteNotVisibleOnBill=Opomba (ni vidna na računih, ponudbah...)
 ServiceLimitedDuration=Če ima proizvod storitev z omejenim trajanjem:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Število cen
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Država porekla
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Kratek naziv
 Unit=Enota
 p=e.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Nov atribut
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 827c1bb71b8..9edb7c2fcaa 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Sodelavec
 TypeContact_project_task_external_TASKCONTRIBUTOR=Sodelavec
 SelectElement=Izberi element
 AddElement=Povezava do elementa
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/sl_SI/recruitment.lang b/htdocs/langs/sl_SI/recruitment.lang
new file mode 100644
index 00000000000..babb96232f7
--- /dev/null
+++ b/htdocs/langs/sl_SI/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = O programu
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 7bb4dad06b0..b4c3a42fa2a 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Izbriši pošiljko
 Stock=Zaloga
 Stocks=Zaloge
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Zaloga po lotu/serijski številki
@@ -95,14 +95,16 @@ RealStock=Dejanska zaloga
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtualna zaloga
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=ID skladišča
 DescWareHouse=Opis skladišča
 LieuWareHouse=Lokalizacija skladišča
 WarehousesAndProducts=Skladišča in proizvodi
 WarehousesAndProductsBatchDetail=Skladišča in proizvodi (s podrobnostmi o lotu/serijski številki)
-AverageUnitPricePMPShort=Uravnotežena povprečna vhodna cena
-AverageUnitPricePMP=Uravnotežena povprečna vhodna cena
+AverageUnitPricePMPShort=Uravnotežena povprečna cena
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Prodajna cena za enoto
 EstimatedStockValueSellShort=Prodajna vrednost
 EstimatedStockValueSell=Prodajna vrednost
@@ -141,7 +143,7 @@ Replenishments=Obnovitve
 NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s na zalogi po izbranem obdobju (> %s)
 MassMovement=Masovni premik
-SelectProductInAndOutWareHouse=Izberi proizvod, količino, izvorno skladišče in ciljno skladišče, nato klikni "%s". Ko je to narejeno za vse zahtevane premike, klikni na "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Prevzem tega naročila
 StockMovementRecorded=Zapisan premik zaloge
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index e236893244a..0ae910ef9b8 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -1,6 +1,6 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
+SuppliersInvoice=Fakture dobaviteljev
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
 History=Zgodovina
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Nekateri pod-proizvodi nimajo določenih cen
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ta referenčni dobavitelj je že povezan z referenco: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Razpoložljivost
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Odobri to naročilo
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Zavrni to naročilo
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Zakasnitev dobave v dnevih
-DescNbDaysToDelivery=Največja zamuda pri dobavi proizvodov iz tega naročila
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sl_SI/ticket.lang b/htdocs/langs/sl_SI/ticket.lang
index 22b2071bcaf..4fce4674b17 100644
--- a/htdocs/langs/sl_SI/ticket.lang
+++ b/htdocs/langs/sl_SI/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Tip
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Skupina
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Skupina
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index 2851c76fc90..dc70d4adfde 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Kreiran uporabnik bo zunanji uporabnik (ker je povezan z
 IdPhoneCaller=ID klicatelja po telefonu
 NewUserCreated=Uporabik %s je kreiran
 NewUserPassword=Sprememba gesla za %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Uporabnik %s je spremenjen
 UserDisabled=Uporabnik %s je onemogočen
 UserEnabled=Uporabnik %s je aktiviran
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Izklopljeno v načinu vzdrževanja
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index 8f2160ac479..98b270589d9 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,13 +63,15 @@ InvoiceRefused=Zavrnjen račun (zaračunati zavrnitev stranki)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Na čakanju
 StatusTrans=Prenešeno
+StatusDebited=Debited
 StatusCredited=Odobreno
+StatusPaid=Plačano
 StatusRefused=Zavrnjeno
 StatusMotif0=Nedoločeno
 StatusMotif1=Nezadostno stanje
 StatusMotif2=Sporna izdaja
 StatusMotif3=No direct debit payment order
-StatusMotif4=Sales Order
+StatusMotif4=Naročilo
 StatusMotif5=RIB ni možno izkoristiti
 StatusMotif6=Račun brez bilance
 StatusMotif7=Sodne odločbe
@@ -77,13 +79,13 @@ StatusMotif8=Drugih razlogi
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Samo urad
 CreateBanque=Samo banka
 OrderWaiting=Čakanje na postopek
-NotifyTransmision=Nakazilo prenešeno
-NotifyCredit=Nakazilo odobreno
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Nacionalna številka prenosa
 WithBankUsingRIB=Za bančne račune, ki uporabljajo RIB
 WithBankUsingBANBIC=Za bančne račune, ki uporabljajo IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Datum kredita
 WithdrawalFileNotCapable=Ni možno generirati datoteke za prejem nakazil za vašo državo %s (vaša država ni podprta)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Datoteka nakazila
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Nastavi status na "Datoteka poslana"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistika po statusu vrstic
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Znesek: %s<br>Način: %s<br>Datum: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija za delo v živo ni bila nastavljena, zato se bo sistem ustavil po simulaciji
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/sl_SI/workflow.lang b/htdocs/langs/sl_SI/workflow.lang
index 14d4f94791e..2fdcedce378 100644
--- a/htdocs/langs/sl_SI/workflow.lang
+++ b/htdocs/langs/sl_SI/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Nastavitev modula poteka dela
-WorkflowDesc=Ta modul je namenjen prilagajanju nastavitev samodejnih akcij. Privzeto je, da je modul odprt, kar pomeni, da lahko izvajate akcije v poljubnem vrstnem redu. Z nastavitvami delovnih tokov lahko določate zaporedje aktivnosti.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=Prilagajanje poteka dela za aktivirane module ni na voljo.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Samodejno ustvari račun za kupca, po validaciji pogodbe.
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Samodejno generiranje
 AutomaticClassification=Samodejno spreminjanje statusa
diff --git a/htdocs/langs/sl_SI/zapier.lang b/htdocs/langs/sl_SI/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/sl_SI/zapier.lang
+++ b/htdocs/langs/sl_SI/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 95a82239eda..cd2bc3b934d 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 7fc32b14fa1..64235347ad4 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Konfigurimi i modulit
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=Sistemi
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barkod
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index e004fbe6804..8fa8da028f0 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Vendndodhja
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index 08216cdcdbb..1468b3a7864 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index 09b28e8d6bf..489e2191fa6 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index 6d530dd3923..7a237dbc407 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang
index a17246a39ba..7006cb57cad 100644
--- a/htdocs/langs/sq_AL/contracts.lang
+++ b/htdocs/langs/sq_AL/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang
index e6dccdc4768..84a95d47582 100644
--- a/htdocs/langs/sq_AL/languages.lang
+++ b/htdocs/langs/sq_AL/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanjisht
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 7d0a2626fb9..16e913977d4 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 4296aabe2b6..f11e7e94095 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Metoda
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/sq_AL/members.lang b/htdocs/langs/sq_AL/members.lang
index 7b185a09616..5fa51ea43a3 100644
--- a/htdocs/langs/sq_AL/members.lang
+++ b/htdocs/langs/sq_AL/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Fshi
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/sq_AL/mrp.lang
+++ b/htdocs/langs/sq_AL/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 645a100df16..fd7a7fb44ea 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index ecb56576969..4e6540adadc 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 36204eb309d..4a272a821a1 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/sq_AL/recruitment.lang b/htdocs/langs/sq_AL/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/sq_AL/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index cfb372fb1c2..6d0ac04ee34 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stok
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index 38fce69b684..236e7c36352 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Emri i blerësit
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sq_AL/ticket.lang b/htdocs/langs/sq_AL/ticket.lang
index a4d76548175..97de9a5b5f9 100644
--- a/htdocs/langs/sq_AL/ticket.lang
+++ b/htdocs/langs/sq_AL/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index de230588802..0c2b2d29677 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index c769199ffbd..68f1a63dbe7 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Dërguar
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refuzuar
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/sq_AL/workflow.lang b/htdocs/langs/sq_AL/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/sq_AL/workflow.lang
+++ b/htdocs/langs/sq_AL/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/sq_AL/zapier.lang b/htdocs/langs/sq_AL/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/sq_AL/zapier.lang
+++ b/htdocs/langs/sq_AL/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 552b67f462e..04b94b6345d 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Izveštaj prodaje
 ACCOUNTING_PURCHASE_JOURNAL=Izveštaj nabavke
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index adb8fdba82d..405b1a234f9 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Ukoliko prevod ovog jezika nije kompletan ili ukoliko pronađete greške, možete ih ispraviti editom fajlova u folderu <b>langs/%s</b> i proslediti izmene na dolibarr.org/forum ili na github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modul <b>%s</b> mora biti aktiviran da biste koristili
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Potencijal kandidata
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Status prospekta
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Samo koristi link "tel:" na telefonskim brojevima
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Ugovori
+MailToSendReception=Receptions
 MailToThirdparty=Subjekti
 MailToMember=Članovi
 MailToUser=Korisnici
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/sr_RS/agenda.lang b/htdocs/langs/sr_RS/agenda.lang
index 1677dab1776..8e034566601 100644
--- a/htdocs/langs/sr_RS/agenda.lang
+++ b/htdocs/langs/sr_RS/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Broj događaja
 ListOfActions=Lista događaja
 EventReports=Event reports
 Location=Lokacija
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Dogadaj svim danima
 MenuToDoActions=Svi nezavršeni događaji
 MenuDoneActions=Svi završeni događaji
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Početak + 1 sat
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index 37a013dffd7..037853abcf2 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Fakture klijenata
 ForCustomersOrders=Narudžbine klijenata
 ForProposals=Ponude
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Računovodstvo
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index 8e43311f794..5074b404df8 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 6e3b7c3777d..edf211abd56 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Socijalni i poreski trošak
 SocialContributions=Socijalni i poreski troškovi
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Posebni troškovi
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/sr_RS/contracts.lang b/htdocs/langs/sr_RS/contracts.lang
index aab703d1c9c..b8dd7c87ab6 100644
--- a/htdocs/langs/sr_RS/contracts.lang
+++ b/htdocs/langs/sr_RS/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Aktivne usluge
 MenuExpiredServices=Istekle usluge
 MenuClosedServices=Zatvorene usluge
 NewContract=Novi ugovor
-NewContractSubscription=Novi ugovor/pretplata
+NewContractSubscription=New contract or subscription
 AddContract=Kreiraj ugovor
 DeleteAContract=Obriši ugovor
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index f812e802993..b257b6a38d4 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Nova vrednost ne može biti jednaka staroj
 ErrorFailedToValidatePasswordReset=Greška prilikom promene lozinke. Možda je promena već izvršena (ovaj link se može iskoristiti samo jednom). Ukoliko nije, pokušajte ponovo.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Greška prilikom dodavanja kontakta
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Način plaćanja je podešen na %s, ali podešavanja modula Fakture nisu završena i ne definišu koje se informacije prikazuju za ovaj način plaćanja.
 ErrorPHPNeedModule=Greška, PHP mora imati modul <b>%s</b> da biste koristili ovu funkcionalnost.
 ErrorOpenIDSetupNotComplete=Podesili ste konfiguracioni fajl da odobrava OpenID autentifikaciju, ali URL OpenID servisa nije definisan u konstanti %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
diff --git a/htdocs/langs/sr_RS/languages.lang b/htdocs/langs/sr_RS/languages.lang
index f7d432d33cb..09da9c8b90a 100644
--- a/htdocs/langs/sr_RS/languages.lang
+++ b/htdocs/langs/sr_RS/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arapski
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arapski
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bugarski
 Language_bs_BA=Bosanski
 Language_ca_ES=Katalonski
@@ -20,6 +23,7 @@ Language_en_GB=Engleski (UK)
 Language_en_IN=Engleski (Indija)
 Language_en_NZ=Engleski (Novi Zeland)
 Language_en_SA=Engleski (Saudijska Arabija)
+Language_en_SG=English (Singapore)
 Language_en_US=Engleski (US)
 Language_en_ZA=Engleski (Južna Afrika)
 Language_es_ES=Španski
@@ -29,6 +33,7 @@ Language_es_CL=Špnski (Čile)
 Language_es_CO=Španski (Kolumbija)
 Language_es_DO=Španski (Dominikanska Republika)
 Language_es_EC=Španski (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Španski (Honduras)
 Language_es_MX=Španski (Meksiko)
 Language_es_PA=Španski  (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Španski (Paragvaj)
 Language_es_PE=Španski (Peru)
 Language_es_PR=Španski (Porto Riko)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Španski (Venecuela)
 Language_et_EE=Estonski
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finski
 Language_fr_BE=Francuski (Belgija)
 Language_fr_CA=Francuski (Kanada)
 Language_fr_CH=Francuski (Švajcarska)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Francuski
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Francuski (Nova Kaledonija)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisijski
+Language_gl_ES=Galician
 Language_he_IL=Hebrejski
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Hrvatski
 Language_hu_HU=Mađarski
 Language_id_ID=Indonežanski
 Language_is_IS=Islanđanski
 Language_it_IT=Italijanski
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanski
 Language_ka_GE=Gruzijski
 Language_km_KH=Kmerski
@@ -64,6 +77,7 @@ Language_lv_LV=Litvanski
 Language_mk_MK=Makedonski
 Language_mn_MN=Mongolski
 Language_nb_NO=Norveški (Bokmal)
+Language_ne_NP=Nepali
 Language_nl_BE=Holandski (Belgija)
 Language_nl_NL=Dutch
 Language_pl_PL=Poljski
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbekistanski
 Language_vi_VN=Vijetnamski
 Language_zh_CN=Kineski
 Language_zh_TW=Kineski (Tradicionalni)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index e5c1eb91c6a..9b2a31bd01f 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Informacija
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index d0b18b8d9f0..b5d9814035c 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=J.C. (bruto)
 Amount=Iznos
 AmountInvoice=Iznos računa
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Plaćeni iznos
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Iznos (bruto)
@@ -485,6 +485,7 @@ Categories=Tagovi/kategorije
 Category=Tag/kategorija
 By=Do
 From=Od
+FromDate=Od
 FromLocation=Od
 to=do
 To=do
@@ -687,6 +688,7 @@ Method=Metoda
 Receive=Primi
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Delimično
 TotalWoman=Celo
 NeverReceived=Nije primljena
@@ -703,6 +705,7 @@ MenuECM=Dokumenti
 MenuAWStats=AWStats
 MenuMembers=Članovi
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Meni home-podešavanja-bezbednost): %s Kb, PHP limit: %s Kb
 NoFileFound=Nema sačuvanih dokumenata u folderu
 CurrentUserLanguage=Aktivni jezik
@@ -725,7 +728,7 @@ Page=Strana
 Notes=Beleške
 AddNewLine=Dodaj liniju
 AddFile=Dodaj fajl
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Dupliraj objekat sa glavnim atributima
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=Č
 ShortFriday=P
 ShortSaturday=S
 ShortSunday=N
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Podesi ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Informacija
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index edf0abd4c69..c00934a4e5e 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft članovi
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Potvrđen
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Novi doprinos
 PaymentSubscription=Nova uplata doprinosa
 SubscriptionEndDate=Kraj pretplate
@@ -78,7 +81,7 @@ DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
 Physical=Fizičko
 Moral=Pravno
-MorPhy=Pravno/Fizičko
+MorPhy=Priroda
 Reenable=Ponovo aktiviraj
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/sr_RS/mrp.lang b/htdocs/langs/sr_RS/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/sr_RS/mrp.lang
+++ b/htdocs/langs/sr_RS/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index cbafcaae166..a314caa0fb6 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 91b369bb9aa..037863591fd 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Postavi bar code
 BarcodeValue=Vrednost bar code
 NoteNotVisibleOnBill=Beleška (nije vidljiva na računima, ponudama...)
 ServiceLimitedDuration=Ako je proizvod usluga sa ograničenim trajanjem:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Broj cena
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Zemlja porekla
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Kratak naziv
 Unit=Jedinica
 p=j.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=Novi atribut
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index a552711d74d..ac565c0140b 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Saradnik
 TypeContact_project_task_external_TASKCONTRIBUTOR=Saradnik
 SelectElement=Selektiraj element
 AddElement=Link ka elementu
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistike na projektima/lead-ovima
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Zadatak je dodeljen. Unos vremena za ovaj zadatak je omogućen.
 IdTaskTime=Id vremena zadatka
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/sr_RS/recruitment.lang b/htdocs/langs/sr_RS/recruitment.lang
new file mode 100644
index 00000000000..759257ea80c
--- /dev/null
+++ b/htdocs/langs/sr_RS/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = O
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 2f4a9a4cc65..0296f1775ce 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Obrii slanje
 Stock=Zaliha
 Stocks=Zalihe
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Zalihe po seriji
@@ -95,14 +95,16 @@ RealStock=Realna zaliha
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Fiktivna zaliha
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id magacina
 DescWareHouse=Opis magacina
 LieuWareHouse=Lokacija magacina
 WarehousesAndProducts=Magacini i proizvodi
 WarehousesAndProductsBatchDetail=Magacini i proizvodi (sa detaljima po seriji)
-AverageUnitPricePMPShort=Prosečna ulazna cena
-AverageUnitPricePMP=Prosečna ulazna cena
+AverageUnitPricePMPShort=Prosecna cena
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Jedinična prodajna cena
 EstimatedStockValueSellShort=Prodajna vrednost
 EstimatedStockValueSell=Prodajna vrednost
@@ -141,7 +143,7 @@ Replenishments=Dopunjavanja
 NbOfProductBeforePeriod=Količina proizvoda %s u zalihama pre selektiranog perioda (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s u zalihama posle selektiranog perioda (> %s)
 MassMovement=Masivni promet
-SelectProductInAndOutWareHouse=Izaberite proizvod, količinu, izvorni magacin, ciljani magacin i kliknite "%s". Kada su sva kretanja izvršena, kliknite "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Prijemnice za ovu narudžbinu
 StockMovementRecorded=Snimljeni prometi zalihe
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/sr_RS/suppliers.lang b/htdocs/langs/sr_RS/suppliers.lang
index 5d6ee042aba..675f9b32f30 100644
--- a/htdocs/langs/sr_RS/suppliers.lang
+++ b/htdocs/langs/sr_RS/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Neki od pod-proizvoda nemaju definisanu cenu
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ovaj dobavljač je već vezan za referencu: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Dostupnost
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Odobri ovu narudžbinu
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Odbij narudžbinu
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Kašnjenje isporuke u danima
-DescNbDaysToDelivery=Najduže kašnjenje isporuke proizvoda iz ove narudžbine
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sr_RS/ticket.lang b/htdocs/langs/sr_RS/ticket.lang
index 77a82454138..88a8ad89046 100644
--- a/htdocs/langs/sr_RS/ticket.lang
+++ b/htdocs/langs/sr_RS/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Tip
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Grupa
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Grupa
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index 29da9e8dd7e..10c117a0372 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Kreirani korisnik će biti eksterni (jer je vezan za odre
 IdPhoneCaller=Id telefonskog poziva
 NewUserCreated=Korisnik %s je kreiran
 NewUserPassword=Izmena lozinke za %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Korisnik %s je izmenjen
 UserDisabled=Korisnik %s je deaktiviran
 UserEnabled=Korisnik %s je aktiviran
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Onemogućeno u modu održavanja
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index 7c406b82972..e207c6d1316 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Račun odbijen (naplati odbijanje klijentu)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Na čekanju
 StatusTrans=Poslat
+StatusDebited=Debited
 StatusCredited=Kreditirano
+StatusPaid=Plaćeno
 StatusRefused=Odbijen
 StatusMotif0=Neodređen
 StatusMotif1=Nedovoljno sredstava
@@ -77,13 +79,13 @@ StatusMotif8=Drugi razlog
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Samo kancelarija
 CreateBanque=Samo banka
 OrderWaiting=Čeka procesuiranje
-NotifyTransmision=Transfer podizanja
-NotifyCredit=Kredit podizanja
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Nacionalni Broj Pošiljaoca
 WithBankUsingRIB=Za bankovne račune koji koriste RIB
 WithBankUsingBANBIC=Za bankovne račune koji koriste IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Kreditiraj na
 WithdrawalFileNotCapable=Nemoguće generisati račun podizanja za Vašu zemlju %s (Vaša zemlja nije podržana)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Fajl podizanja
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Podesi status "Fajl poslat"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistike po statusu linija
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Svota: %s<br>Način: %s<br>Datum: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Opcija za realni mod nije podešena, prekidamo posle ove simulacije.
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/sr_RS/workflow.lang b/htdocs/langs/sr_RS/workflow.lang
index 1c2572bb994..e623a6593c3 100644
--- a/htdocs/langs/sr_RS/workflow.lang
+++ b/htdocs/langs/sr_RS/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Podešavanja modula Workflow
-WorkflowDesc=Ovaj modul je namenjen za izmene automatskih akcija u aplikaciji. Po defaultu, workflow je otvoren (možete vršiti akcije redosledom kojim poželite). Možete aktivirati automatske akcije koje Vas interesuju.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=Nema mogućih izmena workflow-a u aktiviranim modulima.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatski kreiraj fakturu klijenta posle potvrde ugovora
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatsko kriranje
 AutomaticClassification=Automatsko klasifikovanje
diff --git a/htdocs/langs/sr_RS/zapier.lang b/htdocs/langs/sr_RS/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/sr_RS/zapier.lang
+++ b/htdocs/langs/sr_RS/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 99ec491b21c..080f361671d 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Tillåt att hantera olika antal nollor i slutet av ett bo
 BANK_DISABLE_DIRECT_INPUT=Inaktivera direktinspelning av transaktion i bankkonto
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivera utkastexport på loggbok
 ACCOUNTANCY_COMBO_FOR_AUX=Aktivera kombinationslista för dotterkonto (kan vara långsamt om du har många tredje parter)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Försäljningsloggbok
 ACCOUNTING_PURCHASE_JOURNAL=Inköpsloggbok
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Inte avstämd
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Applicera masskategorier
 AddAccountFromBookKeepingWithNoCategories=Tillgängligt konto ännu inte i den personifierade gruppen
 CategoryDeleted=Kategori för bokföringskonto har tagits bort
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 27e2d4eabf7..63e36bd2c59 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Standard avsändarmail för manuell sändning (använ
 UserEmail=Användar-e-post
 CompanyEmail=Företagets Email
 FeatureNotAvailableOnLinux=Funktionen inte finns på Unix-liknande system. Testa din sendmail program lokalt.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Om översättningen för detta språk inte är fullständigt eller du hittar fel kan du korrigera detta genom att redigera filer i katalogen <b> langs / %s </b> och skicka in din ändring till www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Om översättning för detta språk inte är fullständigt eller om du hittar fel kan du korrigera detta genom att redigera filer i katalogen <b> langs / %s </b> och skicka in ändrade filer på dolibarr.org/forum eller för utvecklare på github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Modul inställning
 ModulesSetup=Moduler / Programinställningar
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Modul <b> %s </b> måste aktiveras först om du behöve
 SecurityToken=Nyckeln till säkra webbadresser
 NoSmsEngine=Ingen SMS-avsändare finns tillgänglig. En SMS-avsändarhanterare är inte installerad med standarddistributionen eftersom de är beroende av en extern leverantör, men du kan hitta några på %s
 PDF=PDF
-PDFDesc=Globala alternativ för PDF-generering.
-PDFAddressForging=Regler för adresslådor
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Dölj all information om försäljningsskatt / moms
 PDFRulesForSalesTax=Regler för försäljningsskatt / moms
 PDFLocaltax=Regler för %s
-HideLocalTaxOnPDF=Dölj %s-kurs i kolumnskattförsäljning
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Dölj produktbeskrivning
 HideRefOnPDF=Dölj produkter ref.
 HideDetailsOnPDF=Dölj produktlinjer detaljer
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Ändra om priser med bas referensvärde som definieras på
 MassConvert=Starta masskonvertering
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Lång text
+TextLongNLines=Long text (n lines)
 HtmlText=Html-text
 Int=Heltal
 Float=Flyttal
@@ -543,9 +546,9 @@ Module54Desc=Förvaltning av kontrakt (tjänster eller återkommande abonnemang)
 Module55Name=Streckkoder
 Module55Desc=Barcode ledning
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bankdirektbetalningar
-Module57Desc=Förvaltning av direktbetalningsorder. Det omfattar generering av SEPA-fil för europeiska länder.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integrering av ett ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Skapa / modifiera tjänster
 Permission534=Ta bort tjänster
 Permission536=Se / Hantera dolda tjänster
 Permission538=Exportera tjänster
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Läs donationer
 Permission702=Skapa / ändra donationer
 Permission703=Ta bort donationer
@@ -848,6 +858,8 @@ Permission773=Radera räkningar
 Permission774=Läs alla utgiftsrapporter (även för användare som inte underordnade)
 Permission775=Godkänn räkningar
 Permission776=Betala räkningar
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export räkningar
 Permission1001=Läs lager
 Permission1002=Skapa / ändra lager
@@ -900,6 +912,7 @@ Permission2515=Setup dokument kataloger
 Permission2801=Använd FTP-klient i läsläge (bläddra och ladda endast)
 Permission2802=Använd FTP-klient i skrivläge (radera eller ladda upp filer)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Ta bort resurser
 Permission63004=Länka resurser till agendahändelser
 DictionaryCompanyType=Tredjepartstyper
 DictionaryCompanyJuridicalType=Tredjeparts juridiska personer
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Stater / Provinser
 DictionaryRegion=Regioner
 DictionaryCountry=Länder
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=E-postmallar
 DictionaryUnits=Enheter
 DictionaryMeasuringUnits=Mätningsenheter
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Typer av ledighet
 DictionaryOpportunityStatus=Ledningsstatus för projekt / ledning
 DictionaryExpenseTaxCat=Kostnadsrapport - Transportkategorier
@@ -1076,7 +1091,7 @@ LoginPage=Login sida
 BackgroundImageLogin=Bakgrundsbild
 PermanentLeftSearchForm=Permanent sökformuläret på menyn till vänster
 DefaultLanguage=Standardspråk
-EnableMultilangInterface=Aktivera flerspråkigt stöd
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Företag / Organisation
 CompanyIds=Företag / Organisationsidentiteter
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=En sökkriterium krävs åtminstone för
 NewTranslationStringToShow=Ny översättningssträng att visa
 OriginalValueWas=Den ursprungliga översättningen överskridits. Ursprungligt värde var: <br> <br> %s
 TransKeyWithoutOriginalValue=Du tvingade en ny översättning till översättningsnyckeln '<strong> %s </strong>' som inte finns i några språkfiler
-TotalNumberOfActivatedModules=Aktiverad applikation / moduler: <b> %s </b> / <b> %s </b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Minst 1 modul måste aktiveras
 ClassNotFoundIntoPathWarning=Klass %s hittades inte i PHP-sökvägen
 YesInSummer=Ja, under sommaren
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Använd händelsetyper (hanteras i menyn Inställningar ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Ställ in det här standardvärdet för typ av händelse automatiskt i händelse skapa formulär
 AGENDA_DEFAULT_FILTER_TYPE=Ställ in denna typ av händelse automatiskt i sökfiltret i kalendervy
 AGENDA_DEFAULT_FILTER_STATUS=Ställ in denna status automatiskt för händelser i sökfilter i dagordning
-AGENDA_DEFAULT_VIEW=Vilken flik vill du öppna som standard vid val av meny Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Aktivera händelsepåminnelse <b> via e-postmeddelanden </b> (påminnelse alternativ / fördröjning kan definieras på varje händelse). Obs! Modul <strong> %s </strong> måste vara aktiverad och korrekt inställd för att få påminnelse skickad med rätt frekvens.
 AGENDA_REMINDER_BROWSER=Aktivera händelsepåminnelse <b> på användarens webbläsare </b> (när händelsedatum har uppnåtts kan varje användare neka det från webbläsarbekräftelsespåfrågan)
 AGENDA_REMINDER_BROWSER_SOUND=Aktivera ljudanmälan
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Visa länkat objekt i agendan
 ##### Clicktodial #####
 ClickToDialSetup=Klicka för att Dial modul inställning
 ClickToDialUrlDesc=Url ringde när ett klick på telefon picto är gjort. I URL kan du använda taggar <br> <b> __PHONETO__ </b> som kommer att ersättas med telefonnumret person att ringa <br> <b> __PHONEFROM__ </b> som kommer att ersättas med telefonnummer att ringa person (er) <br> <b> __LOGIN__ </b> som kommer att ersättas med clicktodial inloggning (definierad på användarkort) <br> <b> __PASS__ </b> som kommer att ersättas med clicktodial lösenord (definierat på användarkort).
-ClickToDialDesc=Denna modul gör telefonnummer till klickbara länkar. Ett klick på ikonen kommer att göra ditt telefonsamtal till numret. Detta kan användas för att ringa ett call center-system från Dolibarr som exempelvis kan ringa telefonnumret på ett SIP-system.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Använd bara en länk "tel:" på telefonnummer
 ClickToDialUseTelLinkDesc=Använd den här metoden om användarna har en mjukvara eller ett programgränssnitt installerat på samma dator som webbläsaren och ringde när du klickar på en länk i din webbläsare som börjar med "tel:". Om du behöver en fullständig serverlösning (inget behov av lokal programinstallation) måste du ange detta till "Nej" och fylla i nästa fält.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Detta fält innehåller en hänvisning till identifiera linje. Ange
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Ange här mellan hållare, lista med byte nummer som representerar valutasymbolen. Till exempel: för $, skriv [36] - för brazil real R $ [82,36] - för €, skriv [8364]
 ColorFormat=RGB-färgen är i HEX-format, t.ex.: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line i kombinationslistor
 SellTaxRate=Försäljning skattesats
 RecuperableOnly=Ja för moms "Ej uppfattad men återställbar" tillägnad vissa stater i Frankrike. Håll värdet till "Nej" i alla andra fall.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Offertförfrågan
 MailToSendSupplierOrder=Beställning
 MailToSendSupplierInvoice=Leverantörsfakturor
 MailToSendContract=Kontrakt
+MailToSendReception=Receptions
 MailToThirdparty=Tredje part
 MailToMember=Medlemmar
 MailToUser=Användare
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s är tillgänglig. Vers
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s är tillgänglig. Version %s är en underhållsversion, så innehåller bara buggfixar. Vi rekommenderar alla användare att uppgradera till den här versionen. En underhållsutgivning introducerar inte nya funktioner eller ändringar i databasen. Du kan hämta det från hämtningsområdet på https://www.dolibarr.org portal (underkatalog Stabila versioner). Du kan läsa <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> för fullständig lista över ändringar.
 MultiPriceRuleDesc=När alternativet "Flera prisnivåer per produkt / tjänst" är aktiverat kan du definiera olika priser (en per prisnivå) för varje produkt. För att spara tid kan du här ange en regel för att autokaluta ett pris för varje nivå baserat på priset på första nivån, så du måste bara ange ett pris för första nivån för varje produkt. Den här sidan är utformad för att spara tid, men är endast användbar om dina priser för varje nivå är i förhållande till första nivån. Du kan ignorera den här sidan i de flesta fall.
 ModelModulesProduct=Mallar för produktdokument
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=För att kunna generera koder automatiskt måste du först definiera en chef för att automatiskt definiera streckkodsnumret.
 SeeSubstitutionVars=Se * anteckning för lista över möjliga substitutionsvariabler
 SeeChangeLog=Se ChangeLog-fil (endast på engelska)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Vänster marginal på PDF
 MAIN_PDF_MARGIN_RIGHT=Höger marginal på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarginal på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottenmarginal på PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Det finns ingen specifik inställning som krävs för den här modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Ställ det här på ja om den här gruppen är en beräkning av andra grupper
 EnterCalculationRuleIfPreviousFieldIsYes=Ange beräkningsregel om föregående fält satt till Ja (till exempel "CODEGRP1 + CODEGRP2")
@@ -1933,13 +1953,14 @@ NothingProcessed=Inget gjort
 XEmailsDoneYActionsDone=%s e-postadresser kvalificerade, %s e-postmeddelanden som bearbetats framgångsrikt (för %s-post / åtgärder gjorda)
 RecordEvent=Spela in e-post händelse
 CreateLeadAndThirdParty=Skapa ledning (och tredje part om det behövs)
-CreateTicketAndThirdParty=Skapa biljett (och tredje part om det behövs)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Senaste resultatkoden
 NbOfEmailsInInbox=Antal e-postmeddelanden i källkatalogen
 LoadThirdPartyFromName=Ladda tredjepartsökning på %s (endast belastning)
 LoadThirdPartyFromNameOrCreate=Ladda tredjepartsökning på %s (skapa om ej hittad)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menyinmatningskod (huvudmeny)
 ECMAutoTree=Visa automatiskt ECM-träd
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unikt ID för förekomsten
 SmallerThan=Mindre än
 LargerThan=Större än
-IfTrackingIDFoundEventWillBeLinked=Observera att Om ett spårnings-ID finns i inkommande e-post, kopplas händelsen automatiskt till relaterade objekt.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Med ett GMail-konto, om du aktiverade valet av 2 steg, rekommenderas att du skapar ett dedikerat andra lösenord för programmet istället för att använda ditt eget lösenordsord från 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index cbac9b54ce2..d533547fea8 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Antal händelser
 ListOfActions=Lista över evenemang
 EventReports=Händelsesrapporter
 Location=Läge
-ToUserOfGroup=Till vilken som helst användare i grupp
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Händelse heldag
 MenuToDoActions=Alla ofullständiga handlingar
 MenuDoneActions=Alla avslutade åtgärder
@@ -86,6 +86,8 @@ ProposalDeleted=Förslag raderad
 OrderDeleted=Order raderad
 InvoiceDeleted=Faktura raderad
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Produkt %s skapad
 PRODUCT_MODIFYInDolibarr=Produkt %s modified
 PRODUCT_DELETEInDolibarr=Produkt %s raderad
@@ -158,3 +160,9 @@ DateStartPlusOne=Startdatum +1 timma
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index c907e5b5342..8de035e3c7b 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Senaste %s inspelade leverantörerna
 BoxTitleLastModifiedSuppliers=Leverantörer: senaste %s modifierad
 BoxTitleLastModifiedCustomers=Kunder: senaste %s modifierad
 BoxTitleLastCustomersOrProspects=Senaste %s kunder eller framtidsutsikter
-BoxTitleLastCustomerBills=Senaste %s Kundfakturor
-BoxTitleLastSupplierBills=Senaste %s Leverantörsfakturor
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Utsikter: senaste %s modifierad
 BoxTitleLastModifiedMembers=Senaste %s medlemmarna
 BoxTitleLastFicheInter=Senaste %s modifierade interventioner
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Leverantörsorder: senaste %s modifierad
 BoxTitleLastModifiedCustomerBills=Kundfaktura: senaste %s modifierad
 BoxTitleLastModifiedCustomerOrders=Försäljningsorder: senaste %s modifierad
 BoxTitleLastModifiedPropals=Senaste %s ändrade förslag
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Kundens fakturor
 ForCustomersOrders=Kund beställningar
 ForProposals=Förslag
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Redovisning
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index bebdd7dc8ef..de64394d96b 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index defa9852e23..481d0ead328 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social eller skattemässig skatt
 SocialContributions=Sociala eller skattemässiga skatter
 SocialContributionsDeductibles=Avdragsgilla sociala eller skattemässiga skatter
 SocialContributionsNondeductibles=Avdragsgilla sociala eller skattemässiga skatter
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Etikettbidrag
 TypeContrib=Typbidrag
 MenuSpecialExpenses=Särskilda kostnader
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang
index c78159a876b..eee5cd0c1f1 100644
--- a/htdocs/langs/sv_SE/contracts.lang
+++ b/htdocs/langs/sv_SE/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Löpande tjänster
 MenuExpiredServices=Utlöpta tjänster
 MenuClosedServices=Stängda tjänster
 NewContract=Nytt kontrakt
-NewContractSubscription=Nytt kontrakt / prenumeration
+NewContractSubscription=New contract or subscription
 AddContract=Skapa kontrakt
 DeleteAContract=Ta bort ett kontrakt
 ActivateAllOnContract=Aktivera alla tjänster
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 091e7c707a2..feca0db02b2 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Nytt värde kan inte vara lika med gamla
 ErrorFailedToValidatePasswordReset=Det gick inte att REINIT lösenord. Kan vara reinit var redan gjort (den här länken kan bara användas en gång). Om inte, försök att starta om reinit processen.
 ErrorToConnectToMysqlCheckInstance=Anslut till databasen misslyckas. Kontrollera databaseserveren körs (till exempel med mysql / mariadb kan du starta det från kommandoraden med "sudo service mysql start").
 ErrorFailedToAddContact=Det gick inte att lägga till kontakt
-ErrorDateMustBeBeforeToday=Datumet kan inte vara större än idag
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Ett betalningsläge var inställt för att skriva %s, men installationen av modulens faktura fördes inte att definiera informationen som ska visas för den här betalningsläget.
 ErrorPHPNeedModule=Fel, din PHP måste ha modul <b>%s</b> installerad för att använda den här funktionen.
 ErrorOpenIDSetupNotComplete=Du inställning för Dolibarr konfigurationsfil möjliggör OpenID autentisering, men webbadressen OpenID tjänsten definieras inte i ständig %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Ett lösenord har ställts för den här medlemmen. Men inget användarkonto skapades. Så det här lösenordet är lagrat men kan inte användas för att logga in till Dolibarr. Den kan användas av en extern modul / gränssnitt men om du inte behöver definiera någon inloggning eller ett lösenord för en medlem kan du inaktivera alternativet "Hantera en inloggning för varje medlem" från inställningen av medlemsmodulen. Om du behöver hantera en inloggning men inte behöver något lösenord, kan du hålla fältet tomt för att undvika denna varning. Obs! Email kan också användas som inloggning om medlemmen är länkad till en användare.
diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang
index 9a4ffa4c3ad..8948b5489e8 100644
--- a/htdocs/langs/sv_SE/languages.lang
+++ b/htdocs/langs/sv_SE/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabiska
 Language_ar_EG=Arabiska (egypten)
 Language_ar_SA=Arabiskt
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengaliska
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgariska
 Language_bs_BA=Bosniska
 Language_ca_ES=Katalanska
@@ -20,6 +23,7 @@ Language_en_GB=Engelska (Storbritannien)
 Language_en_IN=Engelska (Indien)
 Language_en_NZ=Engelska (Nya Zeeland)
 Language_en_SA=Engelska (Saudiarabien)
+Language_en_SG=English (Singapore)
 Language_en_US=Engelska (USA)
 Language_en_ZA=Engelska (Sydafrika)
 Language_es_ES=Spanska
@@ -29,6 +33,7 @@ Language_es_CL=Spanska (Chile)
 Language_es_CO=Spanska (Colombia)
 Language_es_DO=Spanska (Dominikanska republiken)
 Language_es_EC=Spanska (ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanska (Honduras)
 Language_es_MX=Spanska (Mexiko)
 Language_es_PA=Spanska (panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanska (Paraguay)
 Language_es_PE=Spanska (Peru)
 Language_es_PR=Spanska (Puerto Rico)
 Language_es_UY=Spanska (uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanska (Venezuela)
 Language_et_EE=Estniska
 Language_eu_ES=Baskiska
@@ -44,15 +50,22 @@ Language_fi_FI=finsk
 Language_fr_BE=Franska (Belgien)
 Language_fr_CA=Franska (Kanada)
 Language_fr_CH=Franska (Schweiz)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Franska
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Franska (Nya Kaledonien)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisiska
+Language_gl_ES=Galician
 Language_he_IL=Hebreiska
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Kroatiska
 Language_hu_HU=Ungerska
 Language_id_ID=Indonesiska
 Language_is_IS=Isländska
 Language_it_IT=Italienska
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanska
 Language_ka_GE=Gregorianska
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Lettländska
 Language_mk_MK=Makedonska
 Language_mn_MN=mongoliska
 Language_nb_NO=Norska (bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Holländska (Belgien)
 Language_nl_NL=Dutch
 Language_pl_PL=Polska
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbekiska
 Language_vi_VN=Vietnamesiska
 Language_zh_CN=Kinesiska
 Language_zh_TW=Kinesiska (traditionell)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 0ba4ba088f7..ae4c2707259 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Standard utgående e-postinstallation
 Information=Information
 ContactsWithThirdpartyFilter=Kontakter med filter från tredje part
+Unanswered=Unanswered
+Answered=Besvarade
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index e24889a2687..a87178c34c9 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=UPP. (inkl. skatt)
 Amount=Belopp
 AmountInvoice=Fakturabelopp
 AmountInvoiced=Belopp fakturerat
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Betalningsbelopp
 AmountHTShort=Belopp (exkl.)
 AmountTTCShort=Belopp (inkl. moms)
@@ -485,6 +485,7 @@ Categories=Taggar / kategorier
 Category=Tag / kategori
 By=Genom att
 From=Från
+FromDate=Från
 FromLocation=Från
 to=till
 To=till
@@ -687,6 +688,7 @@ Method=Metod
 Receive=Ta emot
 CompleteOrNoMoreReceptionExpected=Komplet eller inget mer förväntat
 ExpectedValue=Förväntat värde
+ExpectedQty=Expected Qty
 PartialWoman=Partiell
 TotalWoman=Totalt
 NeverReceived=Aldrig fick
@@ -703,6 +705,7 @@ MenuECM=Dokument
 MenuAWStats=AWStats
 MenuMembers=Medlemmar
 MenuAgendaGoogle=Google dagordning
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr gräns (meny hem-inställning-säkerhet): %s Kb, PHP gräns: %s Kb
 NoFileFound=Inga dokument har sparats i denhär katalogen
 CurrentUserLanguage=Nuvarande språk
@@ -725,7 +728,7 @@ Page=Sida
 Notes=Anteckningar
 AddNewLine=Lägg till ny rad
 AddFile=Lägg till fil
-FreeZone=Inte en fördefinierad produkt / tjänst
+FreeZone=Free-text product
 FreeLineOfType=Fri text text, typ:
 CloneMainAttributes=Klona objekt med dess viktigaste attribut
 ReGeneratePDF=Återskapa PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Välj en e-postmall
 SetRef=Set ref
 Select2ResultFoundUseArrows=Några resultat hittades. Använd pilarna för att välja.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 1c6b81dbaac..e9173cd227d 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Avslutad medlem
 MemberStatusResiliatedShort=Avslutad
 MembersStatusToValid=Förslag medlemmar
 MembersStatusResiliated=Avslutade medlemmar
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Bekräftade
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=Nya bidrag
 PaymentSubscription=Nya bidrag betalning
 SubscriptionEndDate=Prenumeration slutdatum
@@ -78,7 +81,7 @@ DeleteType=Ta bort
 VoteAllowed=Röstning tillåten
 Physical=Fysisk
 Moral=Moral
-MorPhy=Moral / Fysisk
+MorPhy=Naturen
 Reenable=Återaktivera
 ResiliateMember=Avsluta en medlem
 ConfirmResiliateMember=Är du säker på att du vill säga upp den här medlemmen?
diff --git a/htdocs/langs/sv_SE/mrp.lang b/htdocs/langs/sv_SE/mrp.lang
index 2535d0f33b8..c17d2ea60a6 100644
--- a/htdocs/langs/sv_SE/mrp.lang
+++ b/htdocs/langs/sv_SE/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP-område
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 2207add9c61..15add067b10 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hej)__\n\nVänligen hitta vår bestäl
 PredefinedMailContentSendSupplierInvoice=__(Hej)__\n\nVänligen hitta faktura __REF__ bifogad\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hej)__\n\nVänligen hitta frakt __REF__ bifogad\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hej)__\n\nVänligen hitta intervention __REF__ bifogad\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hej)__\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hej)__\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hej)__\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Du kan klicka på länken nedan för att göra din betalning om den inte redan är klar.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hej)__\n\n\n__(Vänliga hälsningar)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr är en kompakt ERP / CRM som stöder flera affärsmoduler. En demo som visar alla moduler ger ingen mening eftersom detta scenario aldrig uppstår (flera hundra tillgängliga). Det finns därför flera demoprofiler tillgängliga.
 ChooseYourDemoProfil=Välj den demoprofil som bäst passar dina behov ...
 ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuellt modulval)
@@ -280,7 +278,9 @@ LinesToImport=Rader att importera
 
 MemoryUsage=Minnesanvändning
 RequestDuration=Varaktighet för förfrågan
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 596c490e151..3ba8d873a03 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Ställ streckkodstypblock
 BarcodeValue=Barcode värde
 NoteNotVisibleOnBill=Obs (ej synlig på fakturor, förslag ...)
 ServiceLimitedDuration=Om produkten är en tjänst med begränsad varaktighet:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Flera prissegment per produkt / tjänst (varje kund är i ett prissegment)
 MultiPricesNumPrices=Antal pris
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Leverantörspriser (av produkter eller tjän
 CustomCode=Tull / Varu / HS-kod
 CountryOrigin=Ursprungsland
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Kort etikett
 Unit=Enhet
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Välj kombination
 ProductCombinationGenerator=Varianter generator
 Features=Funktioner
 PriceImpact=Prispåverkan
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Viktpåverkan
 NewProductAttribute=Nya attribut
 NewProductAttributeValue=Nytt attributvärde
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 10bb95319e2..e07fe348437 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Bidragsgivare
 TypeContact_project_task_external_TASKCONTRIBUTOR=Bidragsgivare
 SelectElement=Välj elementet
 AddElement=Länk till inslag
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Projektdokumentmall för översikt över länkade objekt
 DocumentModelBaleine=Projektdokumentmall för uppgifter
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Antal skapade projekt per månad
 ProjectNbTaskByMonth=Antal skapade uppgifter per månad
 ProjectOppAmountOfProjectsByMonth=Antalet leder per månad
 ProjectWeightedOppAmountOfProjectsByMonth=Viktad mängd ledningar per månad
-ProjectOpenedProjectByOppStatus=Öppna projekt / ledning med blystatus
-ProjectsStatistics=Statistik över projekt / ledningar
-TasksStatistics=Statistik över projekt / ledningsuppgifter
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Uppgift som tilldelats. Det är möjligt att ange tid på denna uppgift.
 IdTaskTime=Id uppgiftstid
 YouCanCompleteRef=Om du vill slutföra referensnumret med något suffix rekommenderas det att lägga till ett - tecken för att skilja det, så den automatiska numreringen fungerar fortfarande korrekt för nästa projekt. Till exempel %s-MYSUFFIX
diff --git a/htdocs/langs/sv_SE/recruitment.lang b/htdocs/langs/sv_SE/recruitment.lang
new file mode 100644
index 00000000000..7e226c674aa
--- /dev/null
+++ b/htdocs/langs/sv_SE/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = inställningar
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Om
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 927d753451b..5a3db05040a 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Radera sändning
 Stock=Lager
 Stocks=Lager
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Lager per lot / seriell
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Fysisk / reell lager är beståndet för närvarande i lagerlokalerna.
 RealStockWillAutomaticallyWhen=Den reala beståndet kommer att ändras enligt denna regel (enligt definitionen i Stock-modulen):
 VirtualStock=Virtuellt lager
-VirtualStockDesc=Virtuellt lager är det beräknade lagret tillgängligt när alla öppna / pågående åtgärder (som påverkar lagerposterna) är stängda (inköpsorder mottagna, beställda leveransorder etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id lager
 DescWareHouse=Beskrivning lager
 LieuWareHouse=Lokalisering lager
 WarehousesAndProducts=Lager och produkter
 WarehousesAndProductsBatchDetail=Lager och produkter (med detaljer per lot / serie)
-AverageUnitPricePMPShort=Vägt genomsnittligt inpris
-AverageUnitPricePMP=Vägt genomsnittligt inpris
+AverageUnitPricePMPShort=Vägda genomsnittliga priset
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Säljpris per styck
 EstimatedStockValueSellShort=Värde för försäljning
 EstimatedStockValueSell=Värde för försäljning
@@ -141,7 +143,7 @@ Replenishments=Påfyllningar
 NbOfProductBeforePeriod=Antal av produkt %s i lager före vald period (< %s)
 NbOfProductAfterPeriod=Antal av produkt %s i lager efter vald period (> %s)
 MassMovement=Massrörelse
-SelectProductInAndOutWareHouse=Välj produkt, antal, ursprungslager och mållager och klicka "%s". När det är gjort för alla lageröverföringar klicka på "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Spela in överföring
 ReceivingForSameOrder=Kvitton för denna beställning
 StockMovementRecorded=Sparade lageröverföringar
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 639be70feed..48307b7ac94 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -24,7 +24,7 @@ Availability=Tillgänglighet
 ExportDataset_fournisseur_1=Leverantörsfaktura och faktura detaljer
 ExportDataset_fournisseur_2=Leverantörsfakturor och betalningar
 ExportDataset_fournisseur_3=Beställningar och beställningsuppgifter
-ApproveThisOrder=Godkänna denna ordning
+ApproveThisOrder=Godkänna denna order
 ConfirmApproveThisOrder=Är du säker på att du vill godkänna beställningen <b> %s </b>?
 DenyingThisOrder=Neka denna order
 ConfirmDenyingThisOrder=Är du säker på att du vill neka denna order <b> %s </b>?
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Låg kvalitet
 ReputationForThisProduct=Rykte
 BuyerName=Köparens namn
 AllProductServicePrices=Alla produkt- / servicepriser
-AllProductReferencesOfSupplier=Alla produkt / service referenser av säljaren
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Leverantörspriser
diff --git a/htdocs/langs/sv_SE/ticket.lang b/htdocs/langs/sv_SE/ticket.lang
index 9b5d532352e..860b4453738 100644
--- a/htdocs/langs/sv_SE/ticket.lang
+++ b/htdocs/langs/sv_SE/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Raderade
 
 # Dict
 Type=Typ
-Category=Analytisk kod
 Severity=Allvarlighet
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Tilldela automatiskt användaren som skapade biljetten
 TicketsAutoAssignTicketHelp=När du skapar en biljett kan användaren automatiskt tilldelas biljetten.
 TicketNumberingModules=Biljettnummermodul
 TicketNotifyTiersAtCreation=Meddela tredje part vid skapandet
-TicketGroup=Grupp
 TicketsDisableCustomerEmail=Avaktivera alltid e-postmeddelanden när en biljett skapas från det offentliga gränssnittet
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Skapad av
 NewTicket=Ny biljett
 SubjectAnswerToTicket=Biljettsvar
 TicketTypeRequest=Förfrågan typ
-TicketCategory=Analytisk kod
+TicketCategory=Grupp
 SeeTicket=Se biljett
 TicketMarkedAsRead=Biljett har markerats som läst
 TicketReadOn=Läs vidare
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 36c4c77529d..40d07f9c39b 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Skapad användare kommer att vara en extern användare (e
 IdPhoneCaller=Id telefonen ringer
 NewUserCreated=Användare %s skapade
 NewUserPassword=Ändring av lösenord för %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Användare %s modifierade
 UserDisabled=Användare %s funktionshindrade
 UserEnabled=Användare %s aktiverad
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Inaktiverad i underhållsläge
 UserAccountancyCode=Användarkonto
 UserLogoff=Användarutloggning
 UserLogged=Användare loggad
+DateOfEmployment=Employment date
 DateEmployment=Anställningens startdatum
 DateEmploymentEnd=Anställningens slutdatum
 CantDisableYourself=Du kan inte inaktivera din egen användarrekord
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 97b505f90ab..4b18e747ab8 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direkt debiteringsorder
 WithdrawalReceipt=Direkt debitering
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Senaste %s direkt debit-filer
@@ -63,7 +63,9 @@ InvoiceRefused=Faktura vägrade (Ladda avslag till kunden)
 StatusDebitCredit=Statusavgift / kredit
 StatusWaiting=Väntar
 StatusTrans=Överförs
+StatusDebited=Debited
 StatusCredited=Krediteras
+StatusPaid=Betald
 StatusRefused=Refused
 StatusMotif0=Ospecificerat
 StatusMotif1=Bestämmelse insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=Annan orsak
 CreateForSepaFRST=Skapa direkt debitfil (SEPA FRST)
 CreateForSepaRCUR=Skapa direkt debitfil (SEPA RCUR)
 CreateAll=Skapa direkt debitfil (alla)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Endast kontor
 CreateBanque=Endast bank
 OrderWaiting=Plats för en ny behandling
-NotifyTransmision=Återkallelse Transmission
-NotifyCredit=Återkallelse Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Nationella sändare Antal
 WithBankUsingRIB=För bankkonton med hjälp av RIB
 WithBankUsingBANBIC=För bankkonton som använder IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Krediter på
 WithdrawalFileNotCapable=Det går inte att skapa uttags kvitto fil för ditt land %s (ditt land stöds inte)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Utträde fil
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Ställ in på status "File Skickat"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistik efter status linjer
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Typ av betalning
 ModeRECUR=Återkommande betalning
 ModeFRST=Engångsbetalning
 PleaseCheckOne=Vänligen kolla en enda
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direkt debitering %s skapad
 AmountRequested=Belopp som begärs
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Belopp: %s <br> Metode: %s <br> Datum: %s
 InfoRejectSubject=Betalningsordern vägrade
 InfoRejectMessage=Hej, <br> <br> Betalningsordern för fakturan %s relaterad till företaget %s, med ett belopp på %s, har vägrats av banken. <br> <br> - <br> %s
 ModeWarning=Alternativ på riktigt läget inte var satt, sluta vi efter denna simulering
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index 2322ac0dbcd..6ae9ed67c3b 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -5,16 +5,19 @@ ThereIsNoWorkflowToModify=Det finns inga arbetsflödesändringar tillgängliga m
 # Autocreate
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Skapa automatiskt en försäljningsorder när ett kommersiellt förslag är undertecknat (den nya ordern kommer att ha samma belopp som förslaget)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Skapa automatiskt en kundfaktura efter att ett kommersiellt förslag har skrivits (den nya fakturan kommer att ha samma belopp som förslaget)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Skapa automatiskt en kundfaktura efter att ett kontrakt är validerat
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Skapa automatiskt en kundfaktura efter att ett kontrakt är bekräftat
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter att en order har stängts (den nya fakturan kommer att ha samma belopp som beställningen)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassificera länkad källans förslag som fakturerad när försäljningsordern är inställd att faktureras (och om orderens storlek är densamma som det totala beloppet för det signerade länkade förslaget)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klassificera länkad källans förslag som fakturerad när kundfakturan är validerad (och om fakturans belopp är samma som det totala beloppet för det signerade länkade förslaget)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificera länkad källsäljorder som fakturerad när kundfaktura är validerad (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassificera länkad källsäljorder som fakturerad när kundfaktura är inställd att betala (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassificera länkad källsäljningsorder som skickas när en försändelse är validerad (och om den mängd som skickas av alla leveranser är densamma som i den ordning som ska uppdateras)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Märk det länkade källoffert som fakturerad när försäljningsordern är märkt fakturerad (och om orderens storlek är densamma som det totala beloppet för det signerade länkade förslaget)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Märk länkad källans förslag som fakturerad när kundfakturan är bekräftat (och om fakturans belopp är samma som det totala beloppet för det signerade länkade förslaget)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Märk länkad källsäljorder som fakturerad när kundfaktura är bekräftat (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Märk länkad källsäljorder som fakturerad när kundfaktura är inställd att betala (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Märk länkad källsäljningsorder som skickas när en försändelse är bekräftat (och om den mängd som skickas av alla leveranser är densamma som i den ordning som ska uppdateras)
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Klassificera länkad källleverantörsförslag som fakturerat när leverantörsfaktura är validerad (och om fakturans storlek är densamma som det totala beloppet för det länkade förslaget)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Klassificera kopplad inköpsorder som fakturerad när leverantörsfaktura är validerad (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Märk länkad källleverantörsförslag som fakturerat när leverantörsfaktura är bekräftat (och om fakturans storlek är densamma som det totala beloppet för det länkade förslaget)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Märk kopplad inköpsorder som fakturerad när leverantörsfaktura är bekräftat (och om fakturans storlek är densamma som totalbeloppet för den länkade ordern)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatisk skapande
-AutomaticClassification=Automatisk klassificering
+AutomaticClassification=Automatisk uppmärkning
diff --git a/htdocs/langs/sv_SE/zapier.lang b/htdocs/langs/sv_SE/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/sv_SE/zapier.lang
+++ b/htdocs/langs/sv_SE/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/sw_SW/agenda.lang
+++ b/htdocs/langs/sw_SW/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index 8fe1f84b149..d6fd298a3a7 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index 6cd046c5607..8f4f058bb87 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/sw_SW/contracts.lang b/htdocs/langs/sw_SW/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/sw_SW/contracts.lang
+++ b/htdocs/langs/sw_SW/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang
index 5caf207f1fa..ee8df25c9ec 100644
--- a/htdocs/langs/sw_SW/languages.lang
+++ b/htdocs/langs/sw_SW/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Kiarabu
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Kiarabu
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Kikatalani
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (Afrika Kusini)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Kihispania (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Kihispania (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Kihispania (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=Kifaransa (Ubelgiji)
 Language_fr_CA=Kifaransa (Canada)
 Language_fr_CH=Kifaransa (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Kifaransa
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Kifaransa (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Kiebrania
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Kiaislandi
 Language_it_IT=Italia
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japan
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norway (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Uholanzi (Ubelgiji)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Kivietinamu
 Language_zh_CN=Kichina
 Language_zh_TW=Kichina (cha Jadi)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index adbc443198f..0af5c66f0e0 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang
index 5886c598d52..5ef946ddf67 100644
--- a/htdocs/langs/sw_SW/members.lang
+++ b/htdocs/langs/sw_SW/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/sw_SW/mrp.lang b/htdocs/langs/sw_SW/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/sw_SW/mrp.lang
+++ b/htdocs/langs/sw_SW/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/sw_SW/recruitment.lang b/htdocs/langs/sw_SW/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/sw_SW/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
index d0cf540d3eb..51562b8bb7a 100644
--- a/htdocs/langs/sw_SW/suppliers.lang
+++ b/htdocs/langs/sw_SW/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/sw_SW/ticket.lang b/htdocs/langs/sw_SW/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/sw_SW/ticket.lang
+++ b/htdocs/langs/sw_SW/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index aea4e7676e4..25d9205457b 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/sw_SW/workflow.lang b/htdocs/langs/sw_SW/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/sw_SW/workflow.lang
+++ b/htdocs/langs/sw_SW/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/sw_SW/zapier.lang b/htdocs/langs/sw_SW/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/sw_SW/zapier.lang
+++ b/htdocs/langs/sw_SW/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index c802c026e5b..bef58b499b2 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=ขายวารสาร
 ACCOUNTING_PURCHASE_JOURNAL=วารสารการสั่งซื้อ
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index de7faa73baf..9aa5baa9218 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=คุณลักษณะที่ไม่สามารถใช้ได้บน Unix เหมือนระบบ ทดสอบโปรแกรม sendmail ในประเทศของคุณ
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=การติดตั้งโมดูล
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=ระบบ
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=กุญแจสำคัญในการรักษาความปลอดภัย URL ที่
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=รูปแบบไฟล์ PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=การปรับเปลี่ยนราคาค
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=เชือก
+String1Line=String (1 line)
 TextLong=ข้อความยาว
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=จำนวนเต็ม
 Float=ลอย
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=บาร์โค้ด
 Module55Desc=การจัดการบาร์โค้ด
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=บูรณาการของระบบ ClickToDial (ดอกจัน, ... )
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=สร้าง / แก้ไขบริการ
 Permission534=ลบบริการ
 Permission536=ดู / จัดการบริการซ่อน
 Permission538=บริการส่งออก
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=อ่านบริจาค
 Permission702=สร้าง / แก้ไขการบริจาค
 Permission703=ลบบริจาค
@@ -848,6 +858,8 @@ Permission773=ลบรายงานค่าใช้จ่าย
 Permission774=อ่านรายงานค่าใช้จ่ายทั้งหมด (แม้จะไม่ได้สำหรับผู้ใช้ผู้ใต้บังคับบัญชา)
 Permission775=อนุมัติรายงานค่าใช้จ่าย
 Permission776=จ่ายรายงานค่าใช้จ่าย
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=รายงานค่าใช้จ่ายส่งออก
 Permission1001=อ่านหุ้น
 Permission1002=สร้าง / แก้ไขคลังสินค้า
@@ -900,6 +912,7 @@ Permission2515=ไดเรกทอรีเอกสารการติด
 Permission2801=ใช้โปรแกรม FTP ในโหมดอ่าน (เรียกดูและดาวน์โหลดเท่านั้น)
 Permission2802=ใช้โปรแกรม FTP ในโหมดเขียน (ลบหรืออัปโหลดไฟล์)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect ที่มีศักยภาพ
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=ภูมิภาค
 DictionaryCountry=ประเทศ
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=หน่วย
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=สถานะ Prospect
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=แบบฟอร์มการค้นหาถาวรบนเมนูด้านซ้าย
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=คุณต้องเปิดการใช้งานอย่างน้อย 1 โมดูล
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=ใช่ในช่วงฤดู​​ร้อน
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=ซึ่งแท็บที่คุณต้องการที่จะเปิดตามค่าเริ่มต้นเมื่อมีการเลือกวาระที่เมนู
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=คลิกเพื่อกดติดตั้งโมดูล
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=ฟิลด์นี้มีการอ้างอิงใน
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=ตำแหน่งของเส้นเป็นรายการคำสั่งผสม
 SellTaxRate=อัตราภาษีการขาย
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=สัญญา
+MailToSendReception=Receptions
 MailToThirdparty=บุคคลที่สาม
 MailToMember=สมาชิก
 MailToUser=ผู้ใช้
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=ไปรษณีย์
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index 6f8754acf1b..f2a93b36d8b 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=จำนวนของเหตุการณ์ที่
 ListOfActions=รายการของเหตุการณ์
 EventReports=Event reports
 Location=สถานที่
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=เหตุการณ์ทุกวัน (s)
 MenuToDoActions=ทุกเหตุการณ์ที่ไม่สมบูรณ์
 MenuDoneActions=เหตุการณ์ยกเลิกทั้งหมด
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=เริ่มต้นวันที่ 1 ชั่วโม
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index 92415f99549..48979414509 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=ใบแจ้งหนี้ลูกค้า
 ForCustomersOrders=คำสั่งซื้อของลูกค้า
 ForProposals=ข้อเสนอ
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=การบัญชี
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index e31525e1d6c..ec6eefe89a4 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index 9b30b80baca..60fe78c8f6f 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=ภาษีทางสังคมหรือทางก
 SocialContributions=ภาษีทางสังคมหรือทางการคลัง
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=ค่าใช้จ่ายพิเศษ
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang
index 37b4eb981f9..d2bacf4f83a 100644
--- a/htdocs/langs/th_TH/contracts.lang
+++ b/htdocs/langs/th_TH/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=วิ่งบริการ
 MenuExpiredServices=บริการหมดอายุ
 MenuClosedServices=ปิดบริการ
 NewContract=สัญญาฉบับใหม่
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=สร้างสัญญา
 DeleteAContract=ลบสัญญา
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 40939e97e25..125ecf6e5b3 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=ค่าใหม่ไม่สามารถ
 ErrorFailedToValidatePasswordReset=ล้มเหลวในการ reinit รหัสผ่าน อาจจะ reinit ถูกทำมาแล้ว (ลิงค์นี้สามารถใช้เพียงครั้งเดียว) ถ้าไม่ได้พยายามที่จะเริ่มต้นกระบวนการ reinit
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=ล้มเหลวในการเพิ่มรายชื่อ
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=โหมดการชำระเงินถูกกำหนดให้พิมพ์% s แต่การตั้งค่าของโมดูลใบแจ้งหนี้ที่ยังไม่เสร็จสมบูรณ์เพื่อกำหนดข้อมูลที่จะแสดงโหมดการชำระเงินนี้
 ErrorPHPNeedModule=ข้อผิดพลาด, PHP <b>ของคุณต้องมีโมดูล% s</b> ที่ติดตั้งเพื่อใช้คุณลักษณะนี้
 ErrorOpenIDSetupNotComplete=คุณติดตั้ง Dolibarr ไฟล์ config ที่จะช่วยให้การตรวจสอบ OpenID แต่ URL ของ OpenID บริการไม่ได้ถูกกำหนดลงไปใน s% คงที่
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/th_TH/languages.lang b/htdocs/langs/th_TH/languages.lang
index bf422d00155..85ebcd69f94 100644
--- a/htdocs/langs/th_TH/languages.lang
+++ b/htdocs/langs/th_TH/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=ภาษาอาหรับ
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=ภาษาอาหรับ
+Language_az_AZ=Azerbaijani
 Language_bn_BD=ประเทศบังคลาเทศ
+Language_bn_IN=Bengali (India)
 Language_bg_BG=บัลแกเรีย
 Language_bs_BA=บอสเนีย
 Language_ca_ES=คาตาลัน
@@ -20,6 +23,7 @@ Language_en_GB=อังกฤษ (สหราชอาณาจักร)
 Language_en_IN=ภาษาอังกฤษ (อินเดีย)
 Language_en_NZ=อังกฤษ (นิวซีแลนด์)
 Language_en_SA=อังกฤษ (ซาอุดีอาระเบีย)
+Language_en_SG=English (Singapore)
 Language_en_US=ภาษาอังกฤษ (สหรัฐอเมริกา)
 Language_en_ZA=ภาษาอังกฤษ (แอฟริกาใต้)
 Language_es_ES=สเปน
@@ -29,6 +33,7 @@ Language_es_CL=สเปน (ชิลี)
 Language_es_CO=สเปน (โคลอมเบีย)
 Language_es_DO=ภาษาสเปน
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=สเปน (ฮอนดูรัส)
 Language_es_MX=สเปน (เม็กซิโก)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=สเปน (ปารากวัย)
 Language_es_PE=เสปน (เปรู)
 Language_es_PR=สเปน (เปอร์โตริโก)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=เอสโตเนีย
 Language_eu_ES=ชาวแบสค์
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=ฝรั่งเศส (เบลเยี่ยม)
 Language_fr_CA=ฝรั่งเศส (แคนาดา)
 Language_fr_CH=ฝรั่งเศส (วิตเซอร์แลนด์)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=ฝรั่งเศส
+Language_fr_GA=French (Gabon)
 Language_fr_NC=ฝรั่งเศส (ใหม่แคลิโดเนีย)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=ชาวอิสราเอล
+Language_hi_IN=Hindi (India)
 Language_hr_HR=โครเอเชีย
 Language_hu_HU=ฮังการี
 Language_id_ID=ภาษาอินโดนีเซีย
 Language_is_IS=ไอซ์แลนด์
 Language_it_IT=อิตาลี
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=ญี่ปุ่น
 Language_ka_GE=จอร์เจีย
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=ลัตเวีย
 Language_mk_MK=มาซิโดเนีย
 Language_mn_MN=Mongolian
 Language_nb_NO=นอร์เวย์ (บ็อกมัล)
+Language_ne_NP=Nepali
 Language_nl_BE=ดัตช์ (เบลเยี่ยม)
 Language_nl_NL=Dutch
 Language_pl_PL=โปแลนด์
@@ -86,4 +100,5 @@ Language_uz_UZ=อุซเบก
 Language_vi_VN=เวียตนาม
 Language_zh_CN=จีน
 Language_zh_TW=จีน (ดั้งเดิม)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index e880ef23289..ea92de0f2ba 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=ข้อมูล
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index e48f7996c48..0ed430072db 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=UP (รวมภาษี).
 Amount=จำนวน
 AmountInvoice=จำนวนใบแจ้งหนี้
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=จำนวนเงินที่ชำระ
 AmountHTShort=Amount (excl.)
 AmountTTCShort=จํานวนเงิน (รวมภาษี).
@@ -485,6 +485,7 @@ Categories=แท็ก / ประเภท
 Category=Tag / หมวดหมู่
 By=โดย
 From=จาก
+FromDate=จาก
 FromLocation=จาก
 to=ไปยัง
 To=ไปยัง
@@ -687,6 +688,7 @@ Method=วิธี
 Receive=ได้รับ
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=เป็นบางส่วน
 TotalWoman=ทั้งหมด
 NeverReceived=ไม่เคยได้รับ
@@ -703,6 +705,7 @@ MenuECM=เอกสาร
 MenuAWStats=AWStats
 MenuMembers=สมาชิก
 MenuAgendaGoogle=วาระการประชุมของ Google
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr ขีด จำกัด (เมนูที่บ้านการตั้งค่าการรักษาความปลอดภัย):% s Kb, PHP ขีด จำกัด :% s Kb
 NoFileFound=ไม่มีเอกสารที่บันทึกไว้ในไดเรกทอรีนี้
 CurrentUserLanguage=ภาษาปัจจุบัน
@@ -725,7 +728,7 @@ Page=หน้า
 Notes=หมายเหตุ
 AddNewLine=เพิ่มบรรทัดใหม่
 AddFile=เพิ่มไฟล์
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=วัตถุโคลนที่มีคุณลักษณะหลัก
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=ข้อมูล
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index c3ceb26c7e0..c736722b2f6 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=สมาชิกร่าง
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=ผ่านการตรวจสอบ
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=ผลงานใหม่
 PaymentSubscription=การชำระเงินผลงานใหม่
 SubscriptionEndDate=วันที่สิ้นสุดการสมัครสมาชิกของ
@@ -78,7 +81,7 @@ DeleteType=ลบ
 VoteAllowed=โหวตที่ได้รับอนุญาต
 Physical=กายภาพ
 Moral=ศีลธรรม
-MorPhy=คุณธรรม / กายภาพบำบัด
+MorPhy=ธรรมชาติ
 Reenable=reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/th_TH/mrp.lang b/htdocs/langs/th_TH/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/th_TH/mrp.lang
+++ b/htdocs/langs/th_TH/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 25611ec91c0..d877cbda594 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index bb78febb11c..23bafa71159 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=ตั้งค่าชนิดบาร์โค้ด
 BarcodeValue=ค่าบาร์โค้ด
 NoteNotVisibleOnBill=หมายเหตุ (ไม่ปรากฏในใบแจ้งหนี้ข้อเสนอ ... )
 ServiceLimitedDuration=หากผลิตภัณฑ์เป็นบริการที่มีระยะเวลา จำกัด :
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=จำนวนของราคา
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=ประเทศแหล่งกำเนิดสินค้า
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=ป้ายสั้น
 Unit=หน่วย
 p=ยู
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=คุณลักษณะใหม่
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index e696787b331..3cdc4c31d90 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=ผู้สนับสนุ
 TypeContact_project_task_external_TASKCONTRIBUTOR=ผู้สนับสนุน
 SelectElement=องค์ประกอบที่เลือก
 AddElement=เชื่อมโยงไปยังองค์ประกอบ
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=สถิติในโครงการ / โอกาสในการขาย
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=งานที่ได้รับมอบหมาย เข้าครั้งในงานนี้จะเป็นไปได้
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/th_TH/recruitment.lang b/htdocs/langs/th_TH/recruitment.lang
new file mode 100644
index 00000000000..e6b0c0ff890
--- /dev/null
+++ b/htdocs/langs/th_TH/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = เกี่ยวกับ
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index f5c660060bf..95ce6f5a07f 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=ลบส่ง
 Stock=สต็อกสินค้า
 Stocks=หุ้น
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=หุ้นจริง
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=หุ้นเสมือนจริง
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=คลังสินค้า Id
 DescWareHouse=คลังสินค้ารายละเอียด
 LieuWareHouse=คลังสินค้าภาษาท้องถิ่น
 WarehousesAndProducts=โกดังและผลิตภัณฑ์
 WarehousesAndProductsBatchDetail=โกดังและผลิตภัณฑ์ (ที่มีรายละเอียดมากต่อ / อนุกรม)
-AverageUnitPricePMPShort=ถ่วงน้ำหนักราคานำเข้าเฉลี่ย
-AverageUnitPricePMP=ถ่วงน้ำหนักราคานำเข้าเฉลี่ย
+AverageUnitPricePMPShort=ราคาเฉลี่ยถ่วงน้ำหนัก
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=ราคาขายต่อหน่วย
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=replenishments
 NbOfProductBeforePeriod=ปริมาณของ% s สินค้าในสต็อกก่อนระยะเวลาที่เลือก (<% s)
 NbOfProductAfterPeriod=จำนวนของผลิตภัณฑ์% s ในสต็อกหลังจากระยะเวลาที่เลือก (>% s)
 MassMovement=การเคลื่อนไหวมวลชน
-SelectProductInAndOutWareHouse=เลือกผลิตภัณฑ์ปริมาณโกดังแหล่งที่มาและคลังสินค้าเป้าหมายจากนั้นคลิก "% s" ครั้งนี้จะทำสำหรับการเคลื่อนไหวที่จำเป็นทั้งหมดคลิกไปยัง "% s"
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=ใบเสร็จรับเงินสำหรับการสั่งซื้อนี้
 StockMovementRecorded=การเคลื่อนไหวของหุ้นที่บันทึกไว้
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index 7fbc2dbbc07..a272100e086 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=บางผลิตภัณฑ์ย่อยไ
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=ผู้จัดจำหน่ายอ้างอิงนี้จะเชื่อมโยงกับการอ้างอิง:% s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=ห้องว่าง
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=อนุมัติคำสั่งนี้
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=ปฏิเสธคำสั่งนี้
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=ความล่าช้าในการจัดส่งสินค้าในวันที่
-DescNbDaysToDelivery=ที่ใหญ่ที่สุดของการส่งมอบล่าช้าของผลิตภัณฑ์ที่ได้จากคำสั่งนี้
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/th_TH/ticket.lang b/htdocs/langs/th_TH/ticket.lang
index acd46c387b3..63e20a956df 100644
--- a/htdocs/langs/th_TH/ticket.lang
+++ b/htdocs/langs/th_TH/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=ชนิด
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=กลุ่ม
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=กลุ่ม
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 8bee6d24478..884f5b91031 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=ผู้ใช้ที่สร้างจะเป็
 IdPhoneCaller=id โทรโทรศัพท์
 NewUserCreated=% s ผู้ใช้สร้างขึ้น
 NewUserPassword=เปลี่ยนรหัสผ่านสำหรับ% s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=% s ผู้ใช้ปรับเปลี่ยน
 UserDisabled=ผู้ใช้% s พิการ
 UserEnabled=% s ผู้ใช้เปิดใช้งาน
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index 6425d7e3790..4cdd1b59e6f 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=ใบแจ้งหนี้ไม่ยอม (ชาร์จ
 StatusDebitCredit=Status debit/credit
 StatusWaiting=ที่รอ
 StatusTrans=ส่ง
+StatusDebited=Debited
 StatusCredited=เครดิต
+StatusPaid=ต้องจ่าย
 StatusRefused=ปฏิเสธ
 StatusMotif0=ยังไม่ระบุ
 StatusMotif1=เงินไม่เพียงพอ
@@ -77,13 +79,13 @@ StatusMotif8=เหตุผลอื่น ๆ
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=สำนักงานเท่านั้น
 CreateBanque=เฉพาะธนาคาร
 OrderWaiting=กำลังรอการรักษา
-NotifyTransmision=การถอนตัวส่ง
-NotifyCredit=การถอนเครดิต
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=จำนวนเครื่องส่งสัญญาณแห่งชาติ
 WithBankUsingRIB=สำหรับบัญชีเงินฝากธนาคารโดยใช้ RIB
 WithBankUsingBANBIC=สำหรับบัญชีเงินฝากธนาคารโดยใช้ IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=เกี่ยวกับบัตรเครดิต
 WithdrawalFileNotCapable=ไม่สามารถสร้างไฟล์ใบเสร็จรับเงินการถอนเงินสำหรับประเทศ% s ของคุณ (ประเทศของคุณไม่ได้รับการสนับสนุน)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=ไฟล์ถอนเงิน
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=ตั้งสถานะ "แฟ้มส่ง"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=สถิติตามสถานะของสาย
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=จำนวนเงิน:% s <br> วิธีการ:% s <br
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=ตัวเลือกสำหรับโหมดจริงไม่ได้ตั้งค่าเราหยุดหลังจากจำลองนี้
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/th_TH/workflow.lang b/htdocs/langs/th_TH/workflow.lang
index 8e634f15103..728e20bacb1 100644
--- a/htdocs/langs/th_TH/workflow.lang
+++ b/htdocs/langs/th_TH/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=เวิร์กโฟลว์การติดตั้งโมดูล
-WorkflowDesc=โมดูลนี้ถูกออกแบบมาเพื่อปรับเปลี่ยนพฤติกรรมของการกระทำโดยอัตโนมัติลงในใบสมัคร โดยค่าเริ่มต้นขั้นตอนการทำงานจะเปิด (คุณสามารถทำสิ่งที่อยู่ในลำดับที่คุณต้องการ) คุณสามารถเปิดใช้การกระทำโดยอัตโนมัติคุณมีความสนใจใน
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=ไม่มีการปรับเปลี่ยนขั้นตอนการทำงานที่มีอยู่กับโมดูลเปิดใช้งานคือ
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/th_TH/zapier.lang b/htdocs/langs/th_TH/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/th_TH/zapier.lang
+++ b/htdocs/langs/th_TH/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 26d8a43bec5..73ebe7cb877 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Satış günlüğü
 ACCOUNTING_PURCHASE_JOURNAL=Alış günlüğü
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Uzlaştırılmadı
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Toplu kategori uygula
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 827f5657db1..b838d2f46ff 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -219,7 +219,7 @@ Nouveauté=Yenilik
 AchatTelechargement=Satın Al / Yükle
 GoModuleSetupArea=Yeni bir modül almak/yüklemek için, <a href="%s">%s</a> Modül ayar alanına gidin.
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
+DoliPartnersDesc=İstek üzerine modüller veya özellikler geliştiren firmaların listesi.<br>Not: Dolibarr açık kaynaklı bir uygulama olduğu için PHP programlamada deneyimli <i>herhangi biri</i> bir modül geliştirebilir.
 WebSiteDesc=Daha fazla eklenti modülleri (ana yazılımda bulunmayan) için harici web siteleri
 DevelopYourModuleDesc=Kendi modülünüzü geliştirmek için bazı çözümler...
 URL=URL
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Manuel gönderim için varsayılan gönderici e-posta
 UserEmail=Kullanıcı e-posta adresi
 CompanyEmail=Firma e-posta adresi
 FeatureNotAvailableOnLinux=Unix gibi sistemlerde bu özellik yoktur.
+FixOnTransifex=Çeviriyi projenin çevrimiçi çeviri platformunda düzeltin
 SubmitTranslation=Bu dilin çevirisi tamamlanmamışsa veya hatalar görüyorsanız, <b>langs/%s</b> dizindeki dosyalarını düzenleyerek bu hataları düzeltebilir ve değişikliklerinizi www.transifex.com/dolibarr-association/dolibarr/ adresine gönderebilirsiniz.
-SubmitTranslationENUS=Bu dil için çeviri tamamlanmamışsa ya da hatalar buluyorsanız, bunları <b>langs/%s</b> dizininde düzeltebilir ve değişikliklerinizi dolibarr.org/forum adresine veya geliştiriciler için github.com/Dolibarr/dolibarr adresine gönderebilirsiniz.
+SubmitTranslationENUS=Bu dil için çeviri tamamlanmamışsa ya da hatalar buluyorsanız, bunları <b>langs/%s</b> dizininde düzeltebilir ve değişikliklerinizi dolibarr.org/forum adresine gönderebilirsiniz veya geliştiriciyseniz github.com/Dolibarr/dolibarr adresinde bir PR ile düzenleyebilirsiniz.
 ModuleSetup=Modül kurulumu
 ModulesSetup=Modül/Uygulama kurulumu
 ModuleFamilyBase=Sistem
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Bu özelliğe gereksinim duyarsanız öne <b>%s</b> mod
 SecurityToken=URL leri güvenli kılmak için anahtar
 NoSmsEngine=Sitemde hiç bir SMS gönderme yöneticisi mevcut değil. Standart Dolibarr sürümü ile bir SMS gönderme yöneticisi yüklü gelmez, çünkü bunlar bir dış sağlayıcıya bağlıdır. Yine de şu adresten birkaç tane bulabilirsiniz: %s
 PDF=PDF
-PDFDesc=PDF oluşturma için global seçenekler.
-PDFAddressForging=Adres kutuları için kurallar
+PDFDesc=PDF oluşturma için global seçenekler
+PDFAddressForging=Adres bölümü kuralları
 HideAnyVATInformationOnPDF=Satış Vergisi / KDV ile ilgili tüm bilgileri gizle
 PDFRulesForSalesTax=Satış Vergisi / KDV için Kurallar
 PDFLocaltax=%siçin kurallar 
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Satış Vergisi / KDV sütununda %s oranını gizle
 HideDescOnPDF=Ürün açıklamasını gizle
 HideRefOnPDF=Ürün Referans No'sunu gizle
 HideDetailsOnPDF=Ürün satır detaylarını gizle
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Buna göre tanımlanan temel referans değerli fiyatları
 MassConvert=Toplu dönüştürmeyi başlat
 PriceFormatInCurrentLanguage=Geçerli Dilde Fiyat Formatı
 String=Dizi
+String1Line=String (1 line)
 TextLong=Uzun metin
+TextLongNLines=Long text (n lines)
 HtmlText=HTML metni
 Int=Tam sayı
 Float=Kayan
@@ -543,9 +546,9 @@ Module54Desc=Sözleşmelerin yönetimi (hizmetler veya yinelenen abonelikler)
 Module55Name=Barkodlar
 Module55Desc=Barkod yönetimi
 Module56Name=Kredi transferiyle ödeme
-Module56Desc=Tedarikçi ödemelerinin kredi transfer emirleri ile yönetimi. Avrupa ülkeleri için SEPA dosyasının oluşturulmasını içerir.
-Module57Name=Banka Otomatik Ödemeleri
-Module57Desc=Otomatik Ödeme talimatlarının yönetimi. Avrupa ülkeleri için SEPA dosyası üretimini içerir.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=TıklaAra
 Module58Desc=TıklaAra entegrasyonu
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Hizmet oluştur/değiştir
 Permission534=Hizmet sil
 Permission536=Gizli hizmetleri gör/yönet
 Permission538=Hizmetleri dışa aktar
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Gereç Cetvelleri Oku
 Permission651=Gereç Cetvelleri Oluştur/Güncelle
 Permission652=Gereç Cetvelleri Sil
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Bağış oluştur/değiştir
 Permission702=Bağış sil
 Permission703=Bağış sil
@@ -848,6 +858,8 @@ Permission773=Gider raporu sil
 Permission774=Bütün gider raporlarını oku (emrinde olmayanlarınkini de)
 Permission775=Gider raporu onayla
 Permission776=Ödeme gider raporu
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Gider raporlarını dışa aktar
 Permission1001=Stok oku
 Permission1002=Depo oluştur/değiştir
@@ -900,6 +912,7 @@ Permission2515=Belge dizinlerini kur
 Permission2801=Okuma modunda FTP istemcisi kullan (yalnızca tara ve indir)
 Permission2802=Yazma modunda FTP istemcisi kullan (sil ya da dosya yükle)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=Çalışanları gör
 Permission4002=Çalışan oluştur
 Permission4003=Çalışan sil
@@ -947,7 +960,8 @@ Permission63003=Kaynak sil
 Permission63004=Gündem etkinliklerine kaynak bağlantıla
 DictionaryCompanyType=Üçüncü parti türleri
 DictionaryCompanyJuridicalType=Üçüncü partilerin yasal formları
-DictionaryProspectLevel=Aday potansiyeli
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=İller Listesi
 DictionaryRegion=Bölgeler
 DictionaryCountry=Ülkeler
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=E-posta Şablonları
 DictionaryUnits=Birimler
 DictionaryMeasuringUnits=Ölçü Birimleri
 DictionarySocialNetworks=Sosyal Ağlar
-DictionaryProspectStatus=Aday durumu
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=İzin türleri
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Gider raporu - Ulaşım kategorileri
@@ -1076,7 +1091,7 @@ LoginPage=Oturum açma sayfası
 BackgroundImageLogin=Arka plan görüntüsü
 PermanentLeftSearchForm=Sol menüdeki sabit arama formu
 DefaultLanguage=Varsayılan dil
-EnableMultilangInterface=Çoklu dil desteğini etkinleştir
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Firma logosunu menüde göster
 CompanyInfo=Firma/Kuruluş
 CompanyIds=Firma/Kuruluş kimlik bilgileri
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=En azından anahtar veya çeviri dizesi i
 NewTranslationStringToShow=Gösterilecek yeni çeviri dizesi
 OriginalValueWas=Orijinal çevirinin üzerine yazılır. Orijinal değerler şu şekildeydi: <br><br>%s
 TransKeyWithoutOriginalValue=Herhangi bir dil dosyasında mevcut olmayan '<strong>%s</strong>' çeviri anahtarı için yeni bir çeviri zorlaması gerçekleştirdiniz.
-TotalNumberOfActivatedModules=Etkinleştirilmiş uygulama/modüller: <b>%s</b>/<b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
 ClassNotFoundIntoPathWarning=Class %s PHP yolunda bulunamadı
 YesInSummer=Yazın evet
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Etkinlik türleri kullanın (Ayarlar -> Sözlükler -> Gü
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Gündem menüsünü seçtiğinizde varsayılan olarak hangi sekmenin açılmasını istiyorsunuz
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Sesli bildirimi etkinleştir
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Bağlantılı nesneyi gündem görünümünde göster
 ##### Clicktodial #####
 ClickToDialSetup=TıklaAra modülü kurulumu
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Telefon numaraları üzerinde yalnızca bir "tel:" linki kullan
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Bu alan satırın tanınması için bir referans içerir. Özel kar
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=RGB rengi HEX formatındadır, örn: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Satırın kombo listesindeki konumu
 SellTaxRate=Satış vergisi oranı
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Teklif talebi
 MailToSendSupplierOrder=Tedarikçi siparişleri
 MailToSendSupplierInvoice=Tedarikçi faturaları
 MailToSendContract=Sözleşmeler
+MailToSendReception=Receptions
 MailToThirdparty=Üçüncü partiler
 MailToMember=Üyeler
 MailToUser=Kullanıcılar
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s kullanıma hazır. Ver
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Ürün belgeleri için şablonlar
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=Olası yedek değişkenlerin lstesi için * notuna bakın
 SeeChangeLog=ChangeLog dosyasına bakın (sadece ingilizce)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=PDF'deki sol boşluk
 MAIN_PDF_MARGIN_RIGHT=PDF'deki sağ boşluk
 MAIN_PDF_MARGIN_TOP=PDF'deki üst boşluk
 MAIN_PDF_MARGIN_BOTTOM=PDF'deki alt kenar boşluğu
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Bu modül için gerekli özel bir kurulum yok.
 SetToYesIfGroupIsComputationOfOtherGroups=Eğer bu grup diğer grupların bir hesaplaması ise bunu evet olarak ayarlayın
 EnterCalculationRuleIfPreviousFieldIsYes=Önceki alan Evet olarak ayarlanmışsa hesaplama kuralı girin (Örneğin 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Hiçbir şey yapılmadı
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Aday oluştur (ve gerekirse üçüncü parti)
-CreateTicketAndThirdParty=Destek bildirimi (ve gerekliyse üçüncü parti) oluştur
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=En son sonuç kodu
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Posta Kodu
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Otomatik ECM ağacını göster
@@ -1981,7 +2002,7 @@ ImportSetup=İçe aktarım modülünün kurulumu
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Şundan daha küçük
 LargerThan=Şundan daha büyük
-IfTrackingIDFoundEventWillBeLinked=Eğer gelen e-posta içerisinde bir takip numarası bulunuyorsa, etkinliğin otomatik olarak ilgili nesnelere bağlanacağını unutmayınız.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 21dabf07d74..82b8160baa5 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Etkinlik sayısı
 ListOfActions=Etkinlik listesi
 EventReports=Etkinlik raporları
 Location=Konum
-ToUserOfGroup=Gruptaki herhangi bir kullanıcıya
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Tam gün(ler)deki etkinlik
 MenuToDoActions=Sonlandırılmamış tüm etkinlikler
 MenuDoneActions=Sonlandırılmış tüm etkinlikler
@@ -86,6 +86,8 @@ ProposalDeleted=Teklif silindi
 OrderDeleted=Sipariş silindi
 InvoiceDeleted=Fatura silindi
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=%s kodlu ürün oluşturuldu
 PRODUCT_MODIFYInDolibarr=%s kodlu ürün değiştirildi
 PRODUCT_DELETEInDolibarr=%s kodlu ürün silindi
@@ -158,3 +160,9 @@ DateStartPlusOne=Başlama tarihi + 1 saat
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index d0174a7cdcf..f374d3c9080 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Tedarikçi Siparişleri: değiştirilen son
 BoxTitleLastModifiedCustomerBills=Müşteri Faturaları: değiştirilen son %s
 BoxTitleLastModifiedCustomerOrders=Müşteri Siparişleri: son değiştirilen %s
 BoxTitleLastModifiedPropals=Değiştirilen son %s teklif
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Müşteri faturaları
 ForCustomersOrders=Müşteri siparişleri
 ForProposals=Teklifler
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Askı hesabı tanımlanmamış
 BoxLastCustomerShipments=Son müşteri gönderileri
 BoxTitleLastCustomerShipments=Son %s müşteri gönderileri
 NoRecordedShipments=Kayıtlı müşteri gönderimi yok
+# Pages
+AccountancyHome=Muhasebe
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index 19f1fdb9bf6..1c52f025daf 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 005e06e5a30..2623f2bdb57 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Sosyal ya da mali vergi
 SocialContributions=Sosyal ya da mali vergiler
 SocialContributionsDeductibles=İndirilecek sosyal ya da mali vergiler
 SocialContributionsNondeductibles=İndirilemeyen sosyal ya da mali vergiler
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Katkı payı etiketi
 TypeContrib=Katkı payı türü
 MenuSpecialExpenses=Özel giderler
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index a6b0da91ad9..223779baa8a 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Yürürlükte olan hizmetler
 MenuExpiredServices=Süresi dolmuş hizmetler
 MenuClosedServices=Kapalı hizmetler
 NewContract=Yeni sözleşme
-NewContractSubscription=Yeni sözleşme/üyelik
+NewContractSubscription=New contract or subscription
 AddContract=Sözleşme oluştur
 DeleteAContract=Bir sözleşme sil
 ActivateAllOnContract=Tüm hizmetleri etkinleştir
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index dc0b2e0b760..8753b1ee175 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Yeni değer eskisine eşit olamaz
 ErrorFailedToValidatePasswordReset=Parola yenilenemiyor. Belki yenileme zaten yapılmış olabilir (bu bağlantı yalnızca bir kez kullanılabilir). Aksi durumda yenileme işlemi tekrar başlatın.
 ErrorToConnectToMysqlCheckInstance=Veri tabanına bağlanılamıyor. Veritabanı sunucusunun çalıştığını kontrol edin (örneğin mysql/mariadb için, 'sudo service mysql start' ile komut satırından başlatabilirsiniz).
 ErrorFailedToAddContact=Kişi eklenmesinde hata
-ErrorDateMustBeBeforeToday=Tarih bugünden büyük olamaz
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Bir ödeme biçimi %s türüne ayarlanmış, ancak fatura modülü kurulumu bu ödeme biçimi için tanımlanan bilgiyi gösterecek tamamlanmamış.
 ErrorPHPNeedModule=Hata, bu özelliği kulanmak için PHP nizde <b>%s</b> modülü kurulu olmalıdır.
 ErrorOpenIDSetupNotComplete=Dolibarr yapılandırma dosyasını OpenID kimlik doğrulamaya izin verecek şekilde ayarladınız, ancak OpenID hizmetine ait URL, %s değişmezine tanımlanmamıştır
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Bu partide/seride "%s" ür
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak e-posta adresi de kullanılabilir.
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index add5c987b2b..9946ec0de27 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arapça
 Language_ar_EG=Arabça (Mısır)
 Language_ar_SA=Arapça
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengalce
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarca
 Language_bs_BA=Boşnakça
 Language_ca_ES=Katalanca
@@ -20,6 +23,7 @@ Language_en_GB=İngilizce (Birleşik Krallık)
 Language_en_IN=İngilizce (Hindistan)
 Language_en_NZ=İngilizce (Yeni Zelanda)
 Language_en_SA=İngilizce (Suudi Arabistan)
+Language_en_SG=English (Singapore)
 Language_en_US=İngilizce (ABD)
 Language_en_ZA=İngilizce (Güney Afrika)
 Language_es_ES=İspanyolca
@@ -29,6 +33,7 @@ Language_es_CL=İspanyolca (Şilil)
 Language_es_CO=İspanyolca (Kolombiya)
 Language_es_DO=İspanyolca (Dominik Cumhuriyeti)
 Language_es_EC=İspanyolca (Ekvador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=İspanyolca (Honduras)
 Language_es_MX=İspanyolca (Meksika)
 Language_es_PA=İspanyolca (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=İspanyolca (Paraguay)
 Language_es_PE=İspanyolca (Peru)
 Language_es_PR=İspanyolca (Porto Riko)
 Language_es_UY=İspanyolca (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=İspanyolca (Venezuela)
 Language_et_EE=Estonyaca
 Language_eu_ES=Baskça
@@ -44,15 +50,22 @@ Language_fi_FI=Fince
 Language_fr_BE=Fransızca (Belçika)
 Language_fr_CA=Fransızca (Kanada)
 Language_fr_CH=Fransızca (İsviçre)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Fransızca
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Fransızca (Yeni Kaledonya)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frizyanca
+Language_gl_ES=Galician
 Language_he_IL=İbranice
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Hırvatça
 Language_hu_HU=Macarca
 Language_id_ID=Endonezya dili
 Language_is_IS=İzlandaca
 Language_it_IT=İtalyanca
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japonca
 Language_ka_GE=Gürcüce
 Language_km_KH=Khmerce
@@ -64,6 +77,7 @@ Language_lv_LV=Letonca
 Language_mk_MK=Makedonca
 Language_mn_MN=Moğolca
 Language_nb_NO=Norveççe (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Flemenkçe (Belçika)
 Language_nl_NL=Flemenkçe
 Language_pl_PL=Lehçe
@@ -86,4 +100,5 @@ Language_uz_UZ=Özbekçe
 Language_vi_VN=Vietnamca
 Language_zh_CN=Çince
 Language_zh_TW=Çince (Geleneksel)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malayca
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 0787f4873f1..85fe5c91d72 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Varsayılan giden e-posta kurulumu
 Information=Bilgi
 ContactsWithThirdpartyFilter=Üçüncü parti filtreli kişiler
+Unanswered=Unanswered
+Answered=Cevaplandı
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index fa29afb06e9..c2b51ead847 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=B.F. (vergi dahil)
 Amount=Tutar
 AmountInvoice=Fatura tutarı
 AmountInvoiced=Faturalandırılmış tutar
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Ödeme tutarı
 AmountHTShort=Tutar (KDV hariç)
 AmountTTCShort=Tutar (KDV dahil)
@@ -485,6 +485,7 @@ Categories=Etiketler/kategoriler
 Category=Etiket/kategori
 By=Tarafından
 From=Başlama
+FromDate=Gönderen
 FromLocation=Gönderen
 to=Bitiş
 To=Bitiş
@@ -687,6 +688,7 @@ Method=Yöntem
 Receive=Al
 CompleteOrNoMoreReceptionExpected=Tamamlandı ya da yapılacak başka şey yok
 ExpectedValue=Beklenen Değer
+ExpectedQty=Expected Qty
 PartialWoman=Kısmi
 TotalWoman=Toplam
 NeverReceived=Hiç alınmadı
@@ -703,6 +705,7 @@ MenuECM=Belgeler
 MenuAWStats=AWStats
 MenuMembers=Üyeler
 MenuAgendaGoogle=Google gündemi
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr sınırı (Giriş-Ayarlar-Güvenlik menüsü):%s Kb, PHP sınırı:%s Kb
 NoFileFound=Hiçbir belge bu dizine kaydedilmedi
 CurrentUserLanguage=Geçerli dil
@@ -725,7 +728,7 @@ Page=Sayfa
 Notes=Notlar
 AddNewLine=Yeni satır ekle
 AddFile=Dosya ekle
-FreeZone=Önceden tanımlanmış bir ürün/hizmet değil
+FreeZone=Free-text product
 FreeLineOfType=Serbest metin öğesi, tür:
 CloneMainAttributes=Ana öznitelikleri ile birlikte nesnenin kopyasını oluştur.
 ReGeneratePDF=PDF'yi yeniden oluştur
@@ -942,6 +945,39 @@ ShortThursday=Pe
 ShortFriday=Cu
 ShortSaturday=Ct
 ShortSunday=Pa
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Bir e-posta şablonu seçin
 SetRef=Ref ayarla
 Select2ResultFoundUseArrows=Bazı sonuçlar bulundu. Ok tuşlarını kullanarak seçin.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Bilgi
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index 8e3928b9848..0b14e8cc388 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -81,7 +81,7 @@ DeleteType=Sil
 VoteAllowed=Oylamaya izin verildi
 Physical=Fiziksel
 Moral=Ahlaki
-MorPhy=Ahlaki / Fiziksel
+MorPhy=Niteliği
 Reenable=Yeniden etkinleştirilebilir
 ResiliateMember=Bir üyeyi sonlandır
 ConfirmResiliateMember=Bu üyeyi feshetmek istediğinizden emin misiniz?
diff --git a/htdocs/langs/tr_TR/mrp.lang b/htdocs/langs/tr_TR/mrp.lang
index 1e19e033ca7..e5a11e3ca43 100644
--- a/htdocs/langs/tr_TR/mrp.lang
+++ b/htdocs/langs/tr_TR/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Üretim Emirleri
 MO=Üretim Emri
+MOs=Manufacturing orders
 MRPDescription=Üretim ve Üretim Siparişlerini (MO) yönetmek için modül.
 MRPArea=MRP Alanı
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 510209b8f36..1ac66fd963c 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\n__REF__ referans numaralı
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\n__REF__ referans numaralı faturayı ekte bulabilirsiniz\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\n__REF__ referans numaralı sevkiyatı ekte bulabilirsiniz\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\n__REF__ referans numaralı müdahaleyi ekte bulabilirsiniz\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Ödemeniz yapılmadıysa ödemenizi yapmak için aşağıdaki bağlantıyı tıklayabilirsiniz.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr, çeşitli iş modüllerini destekleyen kompakt bir ERP/CRM çözümüdür. Tüm modüllerin sergilendiği bir demonun mantığı yoktur, çünkü böyle bir senaryo asla gerçekleşmez (birkaç yüz adet mevcut). Bu nedenle birkaç demo profili vardır.
 ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin...
 ChooseYourDemoProfilMore=...veya kendi profilinizi oluşturun<br>(manuel modül seçimi)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Bellek kullanımı
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index a2ded3bb8d5..37c185abd1b 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Barkod türü oluştur
 BarcodeValue=Barkod değeri
 NoteNotVisibleOnBill=Not (faturalarda, tekliflerde ... görünmez)
 ServiceLimitedDuration=Eğer ürün sınırlı süreli bir hizmetse:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Ürün/hizmet başına çoklu fiyat segmenti (her müşteri bir fiyat segmentinde)
 MultiPricesNumPrices=Fiyat sayısı
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Tedarikçi fiyatları (ürün veya hizmetler
 CustomCode=G.T.İ.P Numarası
 CountryOrigin=Menşei ülke
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Kısa etiket
 Unit=Birim
 p=Adet
@@ -359,6 +362,9 @@ SelectCombination=Kombinasyonu seç
 ProductCombinationGenerator=Öznitelik oluşturucu
 Features=Özellikler
 PriceImpact=Fiyat etkisi
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Ağırlık etkisi
 NewProductAttribute=Yeni bir öznitelik
 NewProductAttributeValue=Yeni nitelik değeri
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index a6b9f1f9b8e..8b8891d2c6b 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Katılımcı
 TypeContact_project_task_external_TASKCONTRIBUTOR=Katılımcı
 SelectElement=Öğe seç
 AddElement=Öğeye bağlan
+LinkToElementShort=Buna bağlantıla
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Projeler/adaylar için istatistikler
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Atanan görevler. Bu göreve süre girmek mümkün olmalı.
 IdTaskTime=Görev zamanı kimliği
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/tr_TR/recruitment.lang b/htdocs/langs/tr_TR/recruitment.lang
new file mode 100644
index 00000000000..9d6eec6b4cd
--- /dev/null
+++ b/htdocs/langs/tr_TR/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = İşe Alım
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Yeni iş pozisyonları için işe alım kampanyalarını yönetin ve takip edin
+
+#
+# Admin page
+#
+RecruitmentSetup = İşe alım ayarları
+Settings = Ayarlar
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Hakkında
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 5bf878266d1..822cf97e5c4 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Gönderim sil
 Stock=Stok
 Stocks=Stoklar
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Partiye/ürüne göre stoklar
@@ -95,14 +95,16 @@ RealStock=Gerçek Stok
 RealStockDesc=Fiziksel/gerçek stok, şu anda depolardaki mevcut olan stoktur.
 RealStockWillAutomaticallyWhen=Gerçek stok bu kurala göre değiştirilecektir (Stok modulünde tanımlandığı gibi):
 VirtualStock=Sanal stok
-VirtualStockDesc=Sanal stok, stokları etkileyen tüm açık/beklemede olan eylemlerin (teslim alınan tedarikçi siparişleri, sevk edilen müşteri siparişleri vb.) kapatılmasıyla hesaplanan mevcut stoktur
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Depo No
 DescWareHouse=Depo açıklaması
 LieuWareHouse=Depo konumlandırma
 WarehousesAndProducts=Depolar ve ürünler
 WarehousesAndProductsBatchDetail=Depolar ve ürünler (her parti/seri için ayrıntılı)
-AverageUnitPricePMPShort=Ağırlıklı ortalama giriş fiyatı
-AverageUnitPricePMP=Ağırlıklı ortalama giriş fiyatı
+AverageUnitPricePMPShort=Ağırlıklı ortalama fiyat
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Satış Birim Fiyatı
 EstimatedStockValueSellShort=Satış değeri
 EstimatedStockValueSell=Satış değeri
@@ -141,7 +143,7 @@ Replenishments=İkmal
 NbOfProductBeforePeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) önceki miktarıdır
 NbOfProductAfterPeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) sonraki miktarıdır
 MassMovement=Toplu hareket
-SelectProductInAndOutWareHouse=Bir ürün, bir miktar, bir kaynak depo ve bir hedef depo seçin, sonra "%s" e tıklayın. Bütün gerekli hareketler için bu işlem yapıldığında "%s" e tıklayın.
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Kayıt transferi
 ReceivingForSameOrder=Bu siparişten yapılan kabuller
 StockMovementRecorded=Stok hareketleri kaydedildi
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index c6f2264cedd..e160e652c96 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Düşük kalite
 ReputationForThisProduct=İtibar
 BuyerName=Alıcı adı
 AllProductServicePrices=Tüm ürün/hizmet fiyatları
-AllProductReferencesOfSupplier=Bu tedarikçinin tüm ürün/hizmet referansları
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Tedarikçi fiyatları
diff --git a/htdocs/langs/tr_TR/ticket.lang b/htdocs/langs/tr_TR/ticket.lang
index 5c79e574895..55746ab9f31 100644
--- a/htdocs/langs/tr_TR/ticket.lang
+++ b/htdocs/langs/tr_TR/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Silindi
 
 # Dict
 Type=Türü
-Category=Analitik kod
 Severity=Önem seviyesi
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Destek bildirimini oluşturan kullanıcıyı otomatik ol
 TicketsAutoAssignTicketHelp=Bir destek bildirimi oluştururken, kullanıcı otomatik olarak destek bildirimine atanabilir.
 TicketNumberingModules=Destek bildirimi numaralandırma modülü
 TicketNotifyTiersAtCreation=Oluşturunca üçüncü tarafa bildir
-TicketGroup=Grup
 TicketsDisableCustomerEmail=Bir destek bildirimi ortak arayüzden oluşturulduğunda e-postaları her zaman devre dışı bırak
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Oluşturan
 NewTicket=Yeni destek bildirimi
 SubjectAnswerToTicket=Destek bildirimi cevabı
 TicketTypeRequest=İstek türü
-TicketCategory=Analitik kod
+TicketCategory=Grup
 SeeTicket=Destek bildirimini gör
 TicketMarkedAsRead=Destek bildirimi okundu olarak işaretlendi
 TicketReadOn=Okumaya devam et
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 867a47400fb..84b68bfc470 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Bakım modunda devre dışıdır
 UserAccountancyCode=Kullanıcı muhasebe kodu
 UserLogoff=Kullanıcı çıkış yaptı
 UserLogged=Kullanıcı giriş yaptı
+DateOfEmployment=Employment date
 DateEmployment=İşe Başlama Tarihi
 DateEmploymentEnd=İşi Bırakma Tarihi
 CantDisableYourself=Kendi kullanıcı kaydınızı devre dışı bırakamazsınız
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=İzin isteği doğrulayıcısını zorla
 ValidatorIsSupervisorByDefault=Varsayılan olarak, doğrulayıcı kullanıcının denetimcisidir. Bu durumu korumak için boş bırakın.
 UserPersonalEmail=Kişisel eposta
 UserPersonalMobile=Kişisel cep telefonu
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index d8456fab5a9..04b9a4a8498 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Otomatik ödeme talimatları
 WithdrawalReceipt=Otomatik ödeme talimatı
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Son %s otomatik ödeme dosyaları
@@ -63,7 +63,9 @@ InvoiceRefused=Fatura reddedildi (Reddedileni müşterinin hesabına yaz)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Bekliyor
 StatusTrans=Gönderildi
+StatusDebited=Debited
 StatusCredited=Kredilendirilmiş
+StatusPaid=Ödenmiş
 StatusRefused=Reddedildi
 StatusMotif0=Belirtilmemiş
 StatusMotif1=Bakiye yetersiz
@@ -77,13 +79,13 @@ StatusMotif8=Başka bir nedenle
 CreateForSepaFRST=Otomatik ödeme dosyası oluşturun (SEPA FRST)
 CreateForSepaRCUR=Otomatik ödeme dosyası oluşturun (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Sadece ofis
 CreateBanque=Sadece banka
 OrderWaiting=İşlem için bekliyor
-NotifyTransmision=Para çekme iletimleri
-NotifyCredit=Kredi çekme
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Ulusal İletim Numarası
 WithBankUsingRIB=RIB kullanan banka hesapları için
 WithBankUsingBANBIC=IBAN/BIC/SWIFT kullanan banka hesapları için
@@ -93,9 +95,10 @@ CreditDate=Alacak tarihi
 WithdrawalFileNotCapable=Ülkeniz %s için para çekme makbuzu oluşturulamıyor (Ülkeniz desteklenmiyor)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Para çekme dosyası
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent="Dosya Gönderildi" durumuna ayarla
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Durum satırlarına göre istatistkler
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Ödeme türü
 ModeRECUR=Yinelenen ödeme
 ModeFRST=Bir kerelik ödeme
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Otomatik ödeme talimatı %s oluşturuldu
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Tutarı: %s<br> Yöntemi: %s<br>Tarihi: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Merhaba, <br> <br> fatura %s, ait olduğu firma %s, tutarı %s olan otomatik ödeme talimatı banka tarafından reddedilmiştir.  <br> - <br> -- <br> %s
 ModeWarning=Gerçek mod için seçenek ayarlanmamış, bu simülasyondan sonra durdururuz
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
index f43c46f51df..d3cc2b2f0b2 100644
--- a/htdocs/langs/tr_TR/workflow.lang
+++ b/htdocs/langs/tr_TR/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=İş Akışı modülü kurulumu
-WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
+WorkflowDesc=Bu modül bazı otomatik işlemler sağlar. Varsayılan olarak, iş akışı açıktır (işleri istediğiniz sırayla yapabilirsiniz) ama burada bazı otomatik eylemleri etkinleştirebilirsiniz.
 ThereIsNoWorkflowToModify=Etkin modüllerde hiç iş akışı değişikliği yok.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Bir teklifin imzalanmasının ardından otomatik olarak müşteri siparişi oluştur (yeni sipariş teklif ile aynı tutara sahip olacaktır)
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Bir teklifin imzalanmasına istinaden otomatik olarak bir müşteri faturası oluştur (yeni fatura teklifle aynı tutara sahip olacaktır)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Bir sözleşme doğrulandıktan sonra kendiliğinden bir müşteri faturası oluştur
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Bir müşteri siparişinin kapatılmasının ardından otomatik olarak müşteri faturası oluştur (yeni fatura sipariş ile aynı tutara sahip olacaktır)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Müşteri siparişi "faturalandı" olarak ayarlandığında (ve siparişin tutarı imzalanmış olan bağlantılı teklifin toplam tutarı ile aynı ise) bağlantılı kaynak teklifi de "faturalandı" olarak sınıflandır
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Müşteri faturası doğrulandığında (ve faturanın tutarı imzalanmış olan bağlantılı teklifin toplam tutarı ile aynı ise) bağlantılı kaynak teklifi "faturalandı" olarak sınıflandır
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Müşteri faturası doğrulandığında (ve faturanın tutarı bağlantılı siparişin toplam tutarı ile aynı ise) bağlantılı kaynak müşteri siparişini "faturalandı" olarak sınıflandır
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Bir sevkiyat doğrulandığında (ve tüm sevkiyatlardan sonra sevk edilen miktar siparişteki miktar ile aynı ise) bağlantılı kaynak müşteri siparişini "sevk edildi" olarak sınıflandır
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Tedarikçi faturası doğrulandığında (ve faturanın tutarı bağlantılı teklifin toplam tutarı ile aynı ise) bağlantılı kaynak tedarikçi teklifini "faturalandı" olarak sınıflandır
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Tedarikçi faturası doğrulandığında (ve faturanın tutarı bağlantılı siparişin toplam tutarı ile aynı ise) bağlantılı kaynak tedarikçi siparişini "faturalandı" olarak sınıflandır
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Otomatik oluşturma
 AutomaticClassification=Otomatik sınıflandırma
diff --git a/htdocs/langs/tr_TR/zapier.lang b/htdocs/langs/tr_TR/zapier.lang
index c1f64887a9a..75c635e864a 100644
--- a/htdocs/langs/tr_TR/zapier.lang
+++ b/htdocs/langs/tr_TR/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Dolibarr modülü için Zapier
 # Admin page
 #
 ZapierForDolibarrSetup = Dolibarr için Zapier ayarları
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 4b2211076c4..af0f2f5295b 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 38363864ea0..dbf81e98723 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -3,438 +3,441 @@ Foundation=Установа
 Version=Версія
 Publisher=Видавець
 VersionProgram=Версія програми
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Початкова встановлена версія
+VersionLastUpgrade=Версія останнього оновлення
 VersionExperimental=Експериментальна
-VersionDevelopment=Розробча
+VersionDevelopment=Розробницька
 VersionUnknown=Невизначена
 VersionRecommanded=Рекомендована
 FileCheck=Перевірка цілісності файлів
-FileCheckDesc=This tool allows you to check the integrity of files and the setup of your application, comparing each file with the official one. The value of some setup constants may also be checked. You can use this tool to determine if any files have been modified (e.g by a hacker).
-FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference.
-FileIntegrityIsOkButFilesWereAdded=Files integrity check has passed, however some new files have been added.
-FileIntegritySomeFilesWereRemovedOrModified=Files integrity check has failed. Some files were modified, removed or added.
-GlobalChecksum=Global checksum
-MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FilesModified=Modified Files
-FilesAdded=Added Files
-FileCheckDolibarr=Check integrity of application files
-AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when the application is installed from an official package
-XmlNotFound=Xml Integrity File of application not found
+FileCheckDesc=Ця утиліта дозволить Вам перевірити цілісність файлів установки Вашої програми, порівнюючи кожен файл на відповідність з офіційними. Деякі з налаштувань інсталятора також перевіряються. Використовуйте цей інструмент щоб скасувати будь-які зміни, внесені у файли програми (наприклад хакером).
+FileIntegrityIsStrictlyConformedWithReference=Файли повність відповідають оригіналам.
+FileIntegrityIsOkButFilesWereAdded=Файли пройшли перевірку, було додано декілька нових файлів.
+FileIntegritySomeFilesWereRemovedOrModified=Перевірка цілісності провалена! Деякі файли було змінено, видалено або додано.
+GlobalChecksum=Загальна контрольна сума
+MakeIntegrityAnalysisFrom=Виконати перевірку цілісності файлів програми з
+LocalSignature=Вбудовані локальні сигнатури (менш надійно)
+RemoteSignature=Віддалені сигнатури (більш надійно)
+FilesMissing=Втрачені файли
+FilesUpdated=Оновлені файли
+FilesModified=Змінені файли
+FilesAdded=Додані файли
+FileCheckDolibarr=Перевірка цілісності файлів програми
+AvailableOnlyOnPackagedVersions=Локальний файл перевірки цілісності доступний лише тоді, коли програму встановлено з офіційного пакету
+XmlNotFound=Xml-файл перевірки цілісності не знайдено
 SessionId=ID Сессії
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Session save location
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself? Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
+SessionSaveHandler=Обробник для зберігання сеансів
+SessionSavePath=Місце зберігання сеансів
+PurgeSessions=Очистка сеансів
+ConfirmPurgeSessions=Ви дійсно бажаєте очистити всі сеанси? Це призведе до відключення всіх користувачів (окрім Вас).
+NoSessionListWithThisHandler=Обробник сеансів, що налаштовано у вашому PHP не дозволяє переглядати активні сеанси.
+LockNewSessions=Заблокувати нові з'єднання
+ConfirmLockNewSessions=Ви впевнені, що хочете обмежити будь-які нові з'єднання Dolibarr? Тільки користувач <b> %s </b> зможе підключитися після цього.
+UnlockNewSessions=Зняти блокування з'єднання
 YourSession=Ваш сеанс
-Sessions=Users Sessions
-WebUserGroup=Web server user/group
-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
-HostCharset=Host charset
-ClientCharset=Client charset
-ClientSortingCharset=Client collation
+Sessions=Сеанси користувачів
+WebUserGroup=Користувач / група веб-сервера
+NoSessionFound=Здається, що ваша конфігурація PHP не дозволяє перелічити активні сеанси. Каталог, який використовується для збереження сеансів (<b> %s </b>), може бути захищений (наприклад, дозволами ОС або директивою PHP open_basedir).
+DBStoringCharset=Кодування бази даних для зберігання інформації
+DBSortingCharset=Кодування бази даних для сортування даних
+HostCharset=Кодування сервера
+ClientCharset=Кодування клієнта
+ClientSortingCharset=Співставлення клієнта
 WarningModuleNotActive=Модуль <b>%s</b> повинен бути активованим
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
+WarningOnlyPermissionOfActivatedModules=Тут відображаються лише дозволи, пов'язані з активованими модулями. Ви можете активувати інші модулі на сторінці Головна-> Налаштування-> Модулі.
+DolibarrSetup=Установка або оновлення Dolibarr
+InternalUser=Внутрішній користувач
+ExternalUser=Зовнішній користувач
+InternalUsers=Внутрішні користувачі
+ExternalUsers=Зовнішні користувачі
 GUISetup=Зовнішній вигляд
-SetupArea=Setup
-UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove/rename file <b>%s</b> if it exists, to allow usage of the Update/Install tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any further use of the Update/Install tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions
-DisableJavascriptNote=Note: For test or debug purpose. For optimization for blind person or text browsers, you may prefer to use the setup on the profile of user
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-DelaiedFullListToSelectCompany=Wait until a key is pressed before loading content of Third Parties combo list.<br>This may increase performance if you have a large number of third parties, but it is less convenient.
-DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.<br>This may increase performance if you have a large number of contacts, but it is less convenient)
-NumberOfKeyToSearch=Number of characters to trigger search: %s
-NumberOfBytes=Number of Bytes
-SearchString=Search string
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
-JavascriptDisabled=JavaScript disabled
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
-CurrentTimeZone=TimeZone PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submitted string. The timezone has effect only when using the UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Table
-Fields=Fields
-Index=Index
-Mask=Mask
-NextValue=Next value
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (down payment)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to <b>%s</b> %s, irrespective of the value of this parameter
-NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
-MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand=Full path to antivirus command
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
-AntiVirusParam= More parameters on command line
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
+SetupArea=Налаштування
+UploadNewTemplate=Завантажити новий шаблон(и)
+FormToTestFileUploadForm=Форма для тестування завантаження файлу (відповідно до налаштування)
+IfModuleEnabled=Примітка: так діє, лише якщо модуль <b> %s </b> увімкнено
+RemoveLock=Видаліть або перейменуйте файл <b> %s </b>, якщо він існує, щоб дозволити використання інструменту "Оновити / Встановити".
+RestoreLock=Відновіть файл <b> %s </b>, лише з дозволом для читання, щоб відключити подальше використання інструменту "Оновити / Встановити".
+SecuritySetup=Налаштування безпеки
+SecurityFilesDesc=Встановлені тут параметри пов’язані з безпекою щодо завантаження файлів.
+ErrorModuleRequirePHPVersion=Помилка, для цього модуля потрібна версія PHP %s або вище
+ErrorModuleRequireDolibarrVersion=Помилка, для цього модуля потрібна версія Dolibarr %s або вище
+ErrorDecimalLargerThanAreForbidden=Помилка, точність вище <b> %s </b> не підтримується.
+DictionarySetup=Налаштування довідників
+Dictionary=Довідники
+ErrorReservedTypeSystemSystemAuto=Значення 'system' і 'systemauto' для типу зарезервовано. Ви можете використовувати 'user' як значення, щоб додати свій власний запис
+ErrorCodeCantContainZero=Код не може містити значення 0
+DisableJavascript=Вимкнення функцій JavaScript та Ajax
+DisableJavascriptNote=Примітка. Для тестування або налагодження. Для оптимізації для незрячих або текстових браузерів ви можете скористатися налаштуваннями у профілі користувача
+UseSearchToSelectCompanyTooltip=Крім того, якщо у вас є велика кількість контрагентів (> 100 000), ви можете збільшити швидкість, встановивши константі COMPANY_DONOTSEARCH_ANYWHERE значення 1 у Налаштування> Інше. Тоді пошук буде обмежений початком рядка.
+UseSearchToSelectContactTooltip=Крім того, якщо у вас є велика кількість контрагентів (> 100 000), ви можете збільшити швидкість, встановивши константі CONTACT_DONOTSEARCH_ANYWHERE значення 1 у Налаштування> Інше. Тоді пошук буде обмежений початком рядка.
+DelaiedFullListToSelectCompany=Чекати натискання клавіші перед завантаженням вмісту списку контрагентів <br> Це може підвищити продуктивність, якщо у вас є велика кількість контрагентів, але це менш зручно.
+DelaiedFullListToSelectContact=Чекати, поки не буде натиснута клавіша перед завантаженням вмісту списку контактів. <br> (Це може підвищити продуктивність, якщо у вас є велика кількість контактів, але це менш зручно)
+NumberOfKeyToSearch=Кількість символів для запуску пошуку: %s
+NumberOfBytes=Кількість байт
+SearchString=Рядок пошуку
+NotAvailableWhenAjaxDisabled=Недоступно, коли Ajax відключений
+AllowToSelectProjectFromOtherCompany=В документі контрагента можна вибрати проект, пов'язаний з іншим контрагентом
+JavascriptDisabled=JavaScript відключений
+UsePreviewTabs=Використовуйте вкладки попереднього перегляду
+ShowPreview=Показати попередній перегляд
+PreviewNotAvailable=Попередній перегляд недоступний
+ThemeCurrentlyActive=Тема наразі активна
+CurrentTimeZone=PHP TimeZone (сервер)
+MySQLTimeZone=TimeZone MySql (база даних)
+TZHasNoEffect=Дати зберігаються та повертаються сервером баз даних так, ніби вони зберігаються як подані рядки. Часовий пояс діє лише при використанні функції UNIX_TIMESTAMP (яку не використовує Dolibarr, тому часовий пояс бази даних не повинен мати ніякого ефекту, навіть якщо він був змінений після введення даних).
+Space=Простір
+Table=Таблиця
+Fields=Поля
+Index=Покажчик
+Mask=Маска
+NextValue=Наступне значення
+NextValueForInvoices=Наступне значення (рахунки-фактури)
+NextValueForCreditNotes=Наступне значення (кредитні нотатки)
+NextValueForDeposit=Наступне значення (початковий внесок)
+NextValueForReplacements=Наступне значення (заміни)
+MustBeLowerThanPHPLimit=Примітка: ваша конфігурація PHP наразі обмежує максимальний розмір файлів для завантаження на <b> %s </b> %s, незалежно від значення цього параметра
+NoMaxSizeByPHPLimit=Примітка: у вашій конфігурації PHP не встановлено обмеження
+MaxSizeForUploadedFiles=Максимальний розмір для завантажених файлів (0 для заборони будь-яких завантажень)
+UseCaptchaCode=Використовувати графічний код (CAPTCHA) на сторінці входу
+AntiVirusCommand=Повний шлях команди антивірусу
+AntiVirusCommandExample=Приклад для ClamAv Daemon (потрібен clamav-daemon): /usr/bin/clamdscan <br> Приклад для ClamWin (дуже-дуже повільно): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= Решта параметрів командного рядка
+AntiVirusParamExample=Приклад для ClamAv Daemon: --fdpass <br> Приклад для ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Налаштування модуля обліку
+UserSetup=Управління користувачами
+MultiCurrencySetup=Налаштування багато-валютних продаж
+MenuLimits=Обмеження та точність
+MenuIdParent=ID батьківського меню
+DetailMenuIdParent=ID батьківського меню (порожній для кореневого меню)
+DetailPosition=впорядкуйте номери, щоб визначити положення меню
 AllMenus=Всі
-NotConfigured=Module/Application not configured
-Active=Active
-SetupShort=Setup
-OtherOptions=Other options
-OtherSetup=Other Setup
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
-LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Localization parameters
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a .htaccess file with a line like this "SetEnv TZ Europe/Paris"
-HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but of the timezone of the server.
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max. number of lines for widgets
-AllWidgetsWereEnabled=All available widgets are enabled
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br>Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
-System=System
-SystemInfo=System information
-SystemToolsArea=System tools area
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
-Purge=Purge
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not normally necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log files, including <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago.
-PurgeDeleteTemporaryFilesShort=Delete temporary files
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: <b>%s</b>.<br>This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
-Backup=Backup
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=The generated file can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.<br>For example:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+NotConfigured=Модуль/додаток не налаштовано
+Active=Активно
+SetupShort=Встановлення
+OtherOptions=Інші опції
+OtherSetup=Інші налаштування
+CurrentValueSeparatorDecimal=Роздільник дробів
+CurrentValueSeparatorThousand=Роздільник тисяч
+Destination=Місце розташування
+IdModule=ID модуля
+IdPermissions=ID дозволів
+LanguageBrowserParameter=Параметр %s
+LocalisationDolibarrParameters=Параметри локалізації
+ClientTZ=Клієнтський часовий пояс (користувач)
+ClientHour=Клієнтський час (користувач)
+OSTZ=Часовий пояс ОС сервера
+PHPTZ=Часовий пояс сервера PHP
+DaylingSavingTime=Літній час
+CurrentHour=Час PHP (сервер)
+CurrentSessionTimeOut=Там-аут поточної сесії
+YouCanEditPHPTZ=Щоб встановити інший часовий пояс PHP (не обов'язково), ви можете спробувати додати в файл .htaccess такий рядок, як "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Попередження, на відміну від інших екранів, час на цій сторінці знаходяться не у вашому локальному часовому поясі, а у часовому поясі сервера.
+Box=Віджет
+Boxes=Віджети
+MaxNbOfLinesForBoxes=Макс. кількість рядків для віджетів
+AllWidgetsWereEnabled=Усі доступні віджети ввімкнено
+PositionByDefault=Порядок за замовчуванням
+Position=Позиція
+MenusDesc=Менеджери меню встановлюють вміст двох рядків меню (горизонтального та вертикального).
+MenusEditorDesc=Редактор меню дозволяє визначити власні записи меню. Використовуйте його обережно, щоб уникнути нестабільності та постійно недоступних записів меню. <br> Деякі модулі додають записи меню (в меню <b> Усі </b> зазвичай). Якщо ви видалите деякі з цих даних помилково, ви можете відновити їх відключивши та повторно увімкнувши модулі.
+MenuForUsers=Меню для користувачів
+LangFile=.lang файл
+Language_en_US_es_MX_etc=Мова (en_US, es_MX, ...)
+System=Система
+SystemInfo=Інформація про систему
+SystemToolsArea=Область системних інструментів
+SystemToolsAreaDesc=Ця область забезпечує функції адміністрування. Використовуйте меню, щоб вибрати необхідну функцію.
+Purge=Чистка
+PurgeAreaDesc=Ця сторінка дозволяє видалити всі файли, що були створені або зберігаються Dolibarr (тимчасові файли або всі файли в каталозі <b> %s </b>). Використовувати цю функцію зазвичай не потрібно. Вона надається як рішення для користувачів, у яких Dolibarr розміщений у провайдера, що не надає дозволу на видалення файлів, створених веб-сервером.
+PurgeDeleteLogFile=Видалення файлів журналів, включаючи <b> %s </b>, визначених для модуля Syslog (немає ризику втрати даних)
+PurgeDeleteTemporaryFiles=Видаліть усі тимчасові файли (без ризику втрати даних). Примітка: Видалення робиться лише в тому випадку, якщо тимчасовий каталог був створений 24 години тому.
+PurgeDeleteTemporaryFilesShort=Видалення тимчасових файлів
+PurgeDeleteAllFilesInDocumentsDir=Видалить усі файли в каталозі: <b> %s </b>. <br> Це видалить усі згенеровані документи, пов'язані з елементами (контрагенти, рахунки тощо), файли, завантажені в модуль ECM, резервні копії бази даних та тимчасові файли.
+PurgeRunNow=Очистити зараз
+PurgeNothingToDelete=Немає каталогів або файлів для видалення.
+PurgeNDirectoriesDeleted=Файли або каталоги <b> %s </b> видалено.
+PurgeNDirectoriesFailed=Не вдалося видалити файли чи каталоги <b> %s </b>.
+PurgeAuditEvents=Очистити усі події безпеки
+ConfirmPurgeAuditEvents=Ви впевнені, що хочете очистити всі події безпеки? Усі журнали безпеки будуть видалені, інші дані не будуть видалені.
+GenerateBackup=Створити резервну копію
+Backup=Резервна копія
+Restore=Відновлення резервної копії
+RunCommandSummary=Резервне копіювання було запущено з використанням наступної команди
+BackupResult=Результат резервного копіювання
+BackupFileSuccessfullyCreated=Файл резервної копії успішно створено
+YouCanDownloadBackupFile=Згенерований файл тепер можна завантажити
+NoBackupFileAvailable=Файлів резервного копіювання немає.
+ExportMethod=Спосіб експорту
+ImportMethod=Спосіб імпорту
+ToBuildBackupFileClickHere=Щоб створити файл резервної копії, натисніть <a href="%s">тут</a>.
+ImportMySqlDesc=Щоб імпортувати файл резервної копії MySQL, ви можете використовувати phpMyAdmin через ваш хостинг або використовувати команду mysql з командного рядка. <br> Наприклад:
+ImportPostgreSqlDesc=Щоб імпортувати файл резервної копії, потрібно використовувати команду pg_restore з командного рядка:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Filename for backup:
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the trashcan to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button <span class="small valignmiddle">%s</span> of each module to enable or disable a module/application.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesDeployDesc=If permissions on your file system allow it, you can use this tool to deploy an external module. The module will then be visible on the tab <strong>%s</strong>.
-ModulesMarketPlaces=Find external app/modules
-ModulesDevelopYourModule=Develop your own app/modules
-ModulesDevelopDesc=You may also develop your own module or find a partner to develop one for you.
-DOLISTOREdescriptionLong=Instead of switching on <a href="https://www.dolistore.com">www.dolistore.com</a> web site to find an external module, you can use this embedded tool that will perform the search on the external market place for you (may be slow, need an internet access)...
-NewModule=New module
-FreeModule=Free
-CompatibleUpTo=Compatible with version %s
-NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s).
-CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=See in Market place
-SeeSetupOfModule=See setup of module %s
-Updated=Updated
-Nouveauté=Novelty
-AchatTelechargement=Buy / Download
-GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
-DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=External websites for more add-on (non-core) modules...
-DevelopYourModuleDesc=Some solutions to develop your own module...
-URL=URL
-RelativeURL=Relative URL
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
+FileNameToGenerate=Назва файлу резервної копії:
+Compression=Стиснення
+CommandsToDisableForeignKeysForImport=Команда для відключення сторонніх ключів при імпорті
+CommandsToDisableForeignKeysForImportWarning=Обов’язково, якщо ви хочете пізніше відновити дамп sql
+ExportCompatibility=Сумісність створеного експортного файлу
+ExportUseMySQLQuickParameter=Використовувати параметр --quick
+ExportUseMySQLQuickParameterHelp=Параметр '--quick' допомагає обмежити споживання оперативної пам’яті при обробці великих таблиць.
+MySqlExportParameters=Параметри експорту MySQL
+PostgreSqlExportParameters= Параметри експорту PostgreSQL
+UseTransactionnalMode=Використовуйте режим транзакцій
+FullPathToMysqldumpCommand=Повний шлях до команди mysqldump
+FullPathToPostgreSQLdumpCommand=Повний шлях до команди pg_dump
+AddDropDatabase=Додати команду DROP DATABASE
+AddDropTable=Додати команду DROP TABLE
+ExportStructure=Структура
+NameColumn=Імена стовпців
+ExtendedInsert=Розширений INSERT
+NoLockBeforeInsert=Не застосовувати блокування перед командою INSERT
+DelayedInsert=Відкладена вставка
+EncodeBinariesInHexa=Кодувати двійкові дані в шістнадцятковий формат
+IgnoreDuplicateRecords=Ігнорувати помилки дублювання запису (INSERT IGNORE)
+AutoDetectLang=Автоматичне виявлення (мова браузера)
+FeatureDisabledInDemo=Функція відключена в демонстрації
+FeatureAvailableOnlyOnStable=Функція доступна лише в офіційних стабільних версіях
+BoxesDesc=Віджети - це компоненти, які показують певну інформацію, яку ви можете додати, щоб персоналізувати деякі сторінки. Ви можете вибрати, показувати віджет чи ні, вибравши цільову сторінку та натиснувши "Активувати", або натиснувши смітник, щоб відключити його.
+OnlyActiveElementsAreShown=Відображаються лише елементи з <a href="%s">включених модулів</a>.
+ModulesDesc=Модулі/додатки визначають, які функції доступні в програмному забезпеченні. Деякі модулі вимагають надання дозволів користувачам після активації модуля. Натисніть кнопку включення/вимкнення <span class="small valignmiddle"> %s </span> кожного модуля, щоб увімкнути або вимкнути модуль/додаток.
+ModulesMarketPlaceDesc=Ви можете знайти більше модулів для завантаження на зовнішніх веб-сайтах в Інтернеті ...
+ModulesDeployDesc=Якщо дозволи у вашій файловій системі це дозволяють, ви можете використовувати цей інструмент для розгортання зовнішнього модуля. Потім модуль буде видно на вкладці <strong> %s </strong>.
+ModulesMarketPlaces=Знайти зовнішні додатки/модулі
+ModulesDevelopYourModule=Розробити власний додаток/модуль
+ModulesDevelopDesc=Ви також можете розробити власний модуль або знайти партнера, який розробить його для вас.
+DOLISTOREdescriptionLong=Замість того, щоб переходити на веб-сайт <a href="https://www.dolistore.com"> www.dolistore.com </a>, щоб знайти зовнішній модуль, ви можете використовувати цей вбудований інструмент, який здійснюватиме пошук на зовнішньому ринку для вас (може бути повільним, потрібен доступ в Інтернет) ...
+NewModule=Новий модуль
+FreeModule=Безкоштовно
+CompatibleUpTo=Сумісний з версією %s
+NotCompatible=Цей модуль не сумісний з вашою версією Dolibarr %s (Мін %s - Макс %s).
+CompatibleAfterUpdate=Цей модуль вимагає оновлення версії Dolibarr до %s (Мін %s - Макс %s).
+SeeInMarkerPlace=Дивіться у магазині 
+SeeSetupOfModule=Див. налаштування модуля %s
+Updated=Оновлено
+Nouveauté=Новинка
+AchatTelechargement=Придбати / завантажити
+GoModuleSetupArea=Щоб розгорнути/встановити новий модуль, перейдіть на сторінку встановлення модулів: <a href="%s"> %s </a>.
+DoliStoreDesc=DoliStore, офіційне місце для зовнішніх модулів Dolibarr ERP / CRM
+DoliPartnersDesc=Список компаній, що надають спеціально розроблені модулі або функції. <br> Примітка: оскільки Dolibarr є програмою з відкритим кодом, <i> будь-хто </i>, досвідчений у програмуванні PHP,  матє можливість розробляти модулі.
+WebSiteDesc=Зовнішні веб-сайти для додаткових (непрофільних) модулів ...
+DevelopYourModuleDesc=Деякі рішення для розробки власного модуля ...
+URL=URL-адреса
+RelativeURL=Відносна URL-адреса
+BoxesAvailable=Доступні віджети
+BoxesActivated=Активні віджети
 ActivateOn=Activate on
 ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option.
-MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option.
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation.
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature makes building of a global merged PDFs not working.
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation / Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Other resources
-ExternalResources=External Resources
-SocialNetworks=Social Networks
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=Here are some resources for getting help and support with Dolibarr.
-HelpCenterDesc2=Some of these resources are only available in <b>english</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-LeftMargin=Left margin
-TopMargin=Top margin
-PaperSize=Paper type
-Orientation=Orientation
+SourceFile=Вихідний файл
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Доступно лише якщо JavaScript не відключений
+Required=обов'язково
+UsedOnlyWithTypeOption=Використовується лише для деяких варіантів порядку денного
+Security=Безпека
+Passwords=Паролі
+DoNotStoreClearPassword=Шифрувати паролі, що зберігаються в базі даних (НЕ як звичайний текст). Наполегливо рекомендується активувати цю опцію.
+MainDbPasswordFileConfEncrypted=Зашифрувати пароль бази даних, що зберігається в conf.php. Наполегливо рекомендується активувати цю опцію.
+InstrucToEncodePass=Щоб пароль був закодований у файл <b> conf.php </b>, замініть рядок <br> <b> $ dolibarr_main_db_pass = "..."; </b> <br> на <br> <b> $ dolibarr_main_db_pass = "crypted: %s"; </b>
+InstrucToClearPass=Щоб пароль у файлі <b> conf.php </b> був декодований (очистився), замініть рядок <br> <b> $ dolibarr_main_db_pass = "crypted: ..."; </b> <br> на <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
+ProtectAndEncryptPdfFiles=Захистіть створені файли PDF. Це НЕ рекомендується, оскільки це порушує масову генерацію PDF.
+ProtectAndEncryptPdfFilesDesc=Захист документа PDF дозволяє зберігати його та читати з будь-якого переглядача PDF. Однак редагування та копіювання вже неможливе. Зауважте, що ця функція робить створення глобальних об'єднаних PDF-файлів неможливим.
+Feature=Особливість
+DolibarrLicense=Ліцензія
+Developpers=Розробники/дописувачі
+OfficialWebSite=Офіційний веб-сайт Dolibarr
+OfficialWebSiteLocal=Місцевий веб-сайт (%s)
+OfficialWiki=Документація Dolibarr / Wiki
+OfficialDemo=Онлайн демонстрація Dolibarr
+OfficialMarketPlace=Офіційний магазин зовнішніх модулів/доповнень
+OfficialWebHostingService=Рекомендовані провайдери послуг веб-хостингу (хмарний хостинг)
+ReferencedPreferredPartners=Партнери
+OtherResources=Інші ресурси
+ExternalResources=Додаткові ресурси
+SocialNetworks=Соціальні мережі
+ForDocumentationSeeWiki=Для перегляду довідки користувача або документації розробника (Doc, FAQ...), <br> перейдіть на Dolibarr Wiki: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+ForAnswersSeeForum=Для будь-яких інших питань/допомоги ви можете скористатися форумом Dolibarr: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+HelpCenterDesc1=Ось деякі ресурси для отримання допомоги та підтримки з Dolibarr.
+HelpCenterDesc2=Деякі з цих ресурсів доступні лише <b>англійською</b> мовою.
+CurrentMenuHandler=Поточний обробник меню
+MeasuringUnit=Вимірювальний пристрій
+LeftMargin=Ліве поле
+TopMargin=Верхнє поле
+PaperSize=Тип паперу
+Orientation=Орієнтація
 SpaceX=Space X
 SpaceY=Space Y
-FontSize=Font size
-Content=Content
-NoticePeriod=Notice period
-NewByMonth=New by month
+FontSize=Розмір шрифту
+Content=Зміст
+NoticePeriod=Період повідомлення
+NewByMonth=Новий за місяць
 Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
-EmailSenderProfiles=Emails sender profiles
-EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix-like systems)
-MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (default value in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Email used for error returns emails (fields 'Errors-To' in emails sent)
-MAIN_MAIL_AUTOCOPY_TO= Copy (Bcc) all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
-MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes)
-MAIN_MAIL_ENABLED_USER_DEST_SELECT=Suggest emails of employees (if defined) into the list of predefined recipient when writing a new email
-MAIN_MAIL_SENDMODE=Email sending method
-MAIN_MAIL_SMTPS_ID=SMTP ID (if sending server requires authentication)
-MAIN_MAIL_SMTPS_PW=SMTP Password (if sending server requires authentication)
-MAIN_MAIL_EMAIL_TLS=Use TLS (SSL) encryption
-MAIN_MAIL_EMAIL_STARTTLS=Use TLS (STARTTLS) encryption
-MAIN_MAIL_EMAIL_DKIM_ENABLED=Use DKIM to generate email signature
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain for use with dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name of dkim selector
-MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Private key for dkim signing
-MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for SMS sending
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company Email
-FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
-ModuleSetup=Module setup
-ModulesSetup=Modules/Application setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
+EMailsSetup=Налаштування Email
+EMailsDesc=Тут Ви можете перевизначити параметри надсилання електронної пошти замість параметрів PHP. У більшості Unix/Linux OS налаштування PHP правильні і тут нічого міняти не потрібно.
+EmailSenderProfiles=Профілі надсилання ел. пошти
+EMailsSenderProfileDesc=Ви можете залишати цей розділ порожнім. Якщо ви введете тут деякі повідомлення електронної пошти, вони будуть додані до списку можливих відправників під час написання нового електронного листа.
+MAIN_MAIL_SMTP_PORT=Порт SMTP/SMTPS (значення за замовчуванням у php.ini: <b> %s </b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS сервер (значення за замовчуванням у php.ini: <b> %s </b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Порт SMTP/SMTPS (Не визначено в PHP для Unix-подібних систем)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS сервер (Не визначено в PHP для Unix-подібних систем)
+MAIN_MAIL_EMAIL_FROM=Відправник електронної пошти для автоматичних електронних листів (значення за замовчуванням у php.ini: <b> %s </b>)
+MAIN_MAIL_ERRORS_TO=Електронний лист, який використовується для повернення повідомлень про помилку (поле "Errors-To" в надісланих електронних листах)
+MAIN_MAIL_AUTOCOPY_TO= Копія (Bcc) усіх листів надсилати до
+MAIN_DISABLE_ALL_MAILS=Вимкнути надсилання всіх електронної пошти (для тестових цілей або демонстрацій)
+MAIN_MAIL_FORCE_SENDTO=Надіслати всі електронні листи до (замість реальних одержувачів, для тестових цілей)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Пропонувати електронні адреси працівників (якщо їх визначено) у списку попередньо визначених одержувачів під час написання нового електронного листа
+MAIN_MAIL_SENDMODE=Спосіб надсилання електронної пошти
+MAIN_MAIL_SMTPS_ID=SMTP-ідентифікатор (якщо для надсилання сервер вимагає автентифікації)
+MAIN_MAIL_SMTPS_PW=Пароль SMTP (якщо для надсилання сервер вимагає автентифікації)
+MAIN_MAIL_EMAIL_TLS=Використовувати шифрування TLS (SSL)
+MAIN_MAIL_EMAIL_STARTTLS=Використовувати шифрування TLS (STARTTLS)
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Використовувати DKIM для створення підпису електронної пошти
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Домен електронної пошти для використання з dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Ім'я селектора dkim
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Приватний ключ для підписання dkim
+MAIN_DISABLE_ALL_SMS=Вимкнути надсилання всіх SMS (для тестових цілей або демонстрацій)
+MAIN_SMS_SENDMODE=Спосіб що використовується для надсилання SMS
+MAIN_MAIL_SMS_FROM=Номер телефону відправника за замовчуванням для надсилання SMS
+MAIN_MAIL_DEFAULT_FROMTYPE=Електронна адреса відправника за замовчуванням для ручного надсилання (Електронна адреса користувача або компанії)
+UserEmail=Електронна пошта користувача
+CompanyEmail=Корпоративна електронна пошта
+FeatureNotAvailableOnLinux=Функція недоступна в Unix-системах. Протестуйте свою програму sendmail локально.
+FixOnTransifex=Виправте переклад на онлайн-платформі перекладу проекту
+SubmitTranslation=Якщо переклад на цю мову не завершений або ви виявили помилки, ви можете виправити це, відредагувавши файли в каталозі <b> langs/ %s </b> та подавши свої зміни на www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Якщо переклад на цю мову не завершений або ви виявили помилки, ви можете виправити це, відредагувавши файли в каталозі <b> langs/ %s </b> та подавши змінені файли на dolibarr.org/forum або, якщо ви розробник, з PR на github .com/Dolibarr/dolibarr
+ModuleSetup=Налаштування модулів
+ModulesSetup=Налаштування модулів та додатків
+ModuleFamilyBase=Система
+ModuleFamilyCrm=Управління відносинами з клієнтами (CRM)
+ModuleFamilySrm=Управління відносинами з постачальниками (VRM)
+ModuleFamilyProducts=Управління продуктами (PM)
+ModuleFamilyHr=Управління людськими ресурсами (HR)
+ModuleFamilyProjects=Проекти/Спільна робота
 ModuleFamilyOther=Інший
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
+ModuleFamilyTechnic=Багатомодульні інструменти
+ModuleFamilyExperimental=Експериментальні модулі
+ModuleFamilyFinancial=Фінансові модулі (бухгалтерський облік / казначейство)
 ModuleFamilyECM=Electronic Content Management (ECM)
-ModuleFamilyPortal=Websites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=Upgrade procedure:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=Step %s
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-LastActivationDate=Latest activation date
-LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
-UpdateServerOffline=Update server offline
-WithCounter=Manage a counter
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see menu Home - Setup - Dictionary - Types of third parties). If you add this tag, the counter will be different for each type of third party.<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> will give <b>IN0701-0099-A</b> if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI'
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
-UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
-AddCRIfTooLong=There is no automatic text wrapping, text that is too long will not display on documents. Please add carriage returns in the text area if needed.
-ConfirmPurge=Are you sure you want to execute this purge?<br>This will permanently delete all your data files with no way to restore them (ECM files, attached files...).
-MinLength=Minimum length
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-LanguageFile=Language file
-ExamplesWithCurrentSetup=Examples with current configuration
-ListOfDirectories=List of OpenDocument templates directories
+ModuleFamilyPortal=Веб-сайти та інші публічні програми
+ModuleFamilyInterface=Інтерфейси із зовнішніми системами
+MenuHandlers=Обробники меню
+MenuAdmin=Редактор меню
+DoNotUseInProduction=Не використовувати у робочій системі
+ThisIsProcessToFollow=Процедура оновлення:
+ThisIsAlternativeProcessToFollow=Це альтернативна установка для обробки вручну:
+StepNb=Крок %s
+FindPackageFromWebSite=Знайдіть пакет, який надає необхідні функції (наприклад, на офіційному веб-сайті %s).
+DownloadPackageFromWebSite=Завантажте пакет (наприклад, з офіційного веб-сайту %s).
+UnpackPackageInDolibarrRoot=Розпакуйте/розархівуйте упаковані файли у каталог на сервері Dolibarr: <b> %s </b>
+UnpackPackageInModulesRoot=Щоб розгорнути/встановити зовнішній модуль, розпакуйте / розархівуйте його файли в каталог сервера, призначений для зовнішніх модулів: <br> <b> %s </b>
+SetupIsReadyForUse=Розгортання модуля закінчено. Однак ви повинні ввімкнути та налаштувати модуль у вашому додатку, перейшовши на сторінку налаштування модулів: <a href="%s"> %s </a>.
+NotExistsDirect=Альтернативний кореневий каталог не визначений для існуючого каталогу. <br>
+InfDirAlt=Починаючи з версії 3, можна визначити альтернативну кореневу директорію. Це дозволяє зберігати у спеціалізованому каталозі, плагіни та спеціальні шаблони. <br> Просто створіть каталог у корені Dolibarr (наприклад: custom). <br>
+InfDirExample= <br> Потім оголосити його в файлі <strong> conf.php </strong> <br> $ $dolibarr_main_url_root_alt='/custom' <br> $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom' <br> Якщо ці рядки закоментовано знаком "#", то просто розкоментуйте їх, видаливши "#", щоб щоб увімкнути це .
+YouCanSubmitFile=Ви можете відвантажити .zip файл пакету модулів звідси:
+CurrentVersion=Поточна версія Dolibarr
+CallUpdatePage=Перейдіть на сторінку, яка оновлює структуру бази даних та дані: %s.
+LastStableVersion=Остання стабільна версія
+LastActivationDate=Дата останньої активації
+LastActivationAuthor=Автор останньої активації
+LastActivationIP=IP останньої активації
+UpdateServerOffline=Оновити сервер офлайн
+WithCounter=Управління лічильником
+GenericMaskCodes=Ви можете ввести будь-яку маску нумерації. У цій масці можуть бути використані такі теги: <br> <b> {000000} </b> відповідає числу, яке буде збільшуватися для кожного %s. Введіть стільки нулів, скільки потрібно для бажаної довжини лічильника. Лічильник буде заповнений нулями зліва, щоб мати стільки нулів, як і маска. <br> <b> {000000+000} </b> аналогічно попередньому, але зміщення, відповідає номеру праворуч від знака +, застосовується починаючи з першого %s. <br> <b> {000000@x} </b> такий же, як і попередній, але лічильник скидається до нуля, коли досягається місяць x (x між 1 та 12, або 0, щоб використовувати перші місяці фінансового року, визначені у вашій конфігурації, або 99 для скидання в нуль щомісяця). Якщо цей параметр використовується і x дорівнює 2 або вище, також потрібно послідовність {yy} {mm} або {yyyy} {mm}. <br> <b> {dd} </b> день (від 01 до 31). <br> <b> {mm} </b> місяць (від 01 до 12). <br> <b> {yy} </b>, <b> {yyyy} </b> або <b> {y} </b>рік 1, 2 або 4 цифри<br>
+GenericMaskCodes2= <b> {cccc} </b> код клієнта на n символів <br> <b> {cccc000}</b>код клієнта на n символів, супроводжується лічильником, призначеним для замовника. Цей лічильник, призначений клієнту, скидається одночасно, з глобальним лічильником. <br> <b> {tttt} </b> Код типу контрагента на n символів (див. меню Домашня сторінка - Налаштування - Словник - Типи контрагентів). Якщо ви додасте цей тег, лічильник буде різним для кожного типу контрагента. <br>
+GenericMaskCodes3=Усі інші символи в масці залишаться незмінними. <br> Пробіли не допускаються. <br>
+GenericMaskCodes4a= <u> Приклад 99-го %s контрагента TheCompany, з датою 2007-01-31: </u> <br>
+GenericMaskCodes4b=<u>Зразок контрагента, створеного 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Зразок товару, створеного 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> дасть <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> дасть <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> дасть <b>IN0701-0099-A</b> якщо тип компанії 'Responsable Inscripto' з кодом типу 'A_RI'
+GenericNumRefModelDesc=Повертає настроюване число відповідно до визначеної маски.
+ServerAvailableOnIPOrPort=Сервер доступний за адресою <b> %s </b> з портом <b> %s </b>
+ServerNotAvailableOnIPOrPort=Сервер недоступний за адресою <b> %s </b> з портом <b> %s </b>
+DoTestServerAvailability=Тест підключення до серверу
+DoTestSend=Тест надсилання
+DoTestSendHTML=Тест надсилання HTML
+ErrorCantUseRazIfNoYearInMask=Помилка, не можна використовувати параметр @ для скидання лічильника щороку, якщо послідовність {yy} або {yyyy} відсутня в масці.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Помилка, не можна використовувати варіант @, якщо послідовність {yy} {mm} або {yyyy} {mm} не в масці.
+UMask=Параметр UMask для нових файлів у файловій системі Unix/Linux/BSD/Mac.
+UMaskExplanation=Цей параметр дозволяє визначити дозволи, встановлені за замовчуванням для файлів, створених Dolibarr на сервері (наприклад, під час завантаження). <br> Це має бути вісімкове значення (наприклад, 0666 означає читання та запис для всіх). <br> Цей параметр не потрібний на сервері Windows.
+SeeWikiForAllTeam=Погляньте на сторінку Wiki, щоб ознайомитись зі списком учасників та їх організацією
+UseACacheDelay= Затримка для кешування відповіді експорту в секундах (0 або порожньо щоб не кешувати)
+DisableLinkToHelpCenter=Сховати посилання "<b> Потрібна допомога або підтримка </b>" на сторінці входу
+DisableLinkToHelp=Сховати посилання на Інтернет-допомогу "<b> %s </b>"
+AddCRIfTooLong=Тут немає автоматичного переносу тексту, занадто довгий текст не відображатиметься в документах. Будь ласка, додайте знаки переносу у текстовій області, якщо потрібно.
+ConfirmPurge=Ви впевнені, що хочете виконати цю чистку? <br> Це назавжди видалить усі ваші файли даних, без можливості їх відновлення (файли ECM, додані файли ...).
+MinLength=Мінімальна довжина
+LanguageFilesCachedIntoShmopSharedMemory=Файли .lang завантажені в спільну пам'ять
+LanguageFile=Мовний файл
+ExamplesWithCurrentSetup=Приклади з поточною конфігурацією
+ListOfDirectories=Список каталогів шаблонів OpenDocument
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS template files found in these directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+NumberOfModelFilesFound=Кількість файлів шаблонів ODT/ODS, знайдених у цих каталогах
+ExampleOfDirectoriesForModelGen=Приклади синтаксису:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed= <br> Щоб дізнатися, як створити шаблони odt-документів, перш ніж зберігати їх у цих каталогах, прочитайте документацію на wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Position of Name/Lastname
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
-KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
-TestSubmitForm=Input test form
-ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours.
-ThemeDir=Skins directory
-ConnectionTimeout=Connection timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
-SecurityToken=Key to secure URLs
-NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
+FirstnameNamePosition=Розміщення імені та прізвища
+DescWeather=Вибрані зображення будуть показані на панелі, коли кількість пізніх дій досягне таких значень:
+KeyForWebServicesAccess=Ключ для використання веб-служб (параметр "dolibarrkey" у веб-сервісах)
+TestSubmitForm=Тест вводу
+ThisForceAlsoTheme=Використання цього менеджера меню також призведе до використання власної тему, незалежно від вибору користувача. Також цей менеджер меню, призначений для смартфонів, працює не на всіх смартфонах. Використовуйте інший менеджер меню, якщо у вас виникли проблеми зі цим.
+ThemeDir=Каталог тем
+ConnectionTimeout=Час очікування з'єднання
+ResponseTimeout=Час очікування відповіді
+SmsTestMessage=Тестове повідомлення від __PHONEFROM__ до __PHONETO__
+ModuleMustBeEnabledFirst=Спершу потрібно увімкнути модуль <b> %s </b> , якщо вам потрібна ця функція.
+SecurityToken=Ключ до захищених URL-адрес
+NoSmsEngine=Не встановлено провайдера послуг для надсилання SMS. Модулі підтримки провайдерів послуг может знайти тут: %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
-HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
-PDFRulesForSalesTax=Rules for Sales Tax / VAT
-PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
-HideDescOnPDF=Hide products description
-HideRefOnPDF=Hide products ref.
+PDFDesc=Глобальні налаштування генерації PDF
+PDFAddressForging=Правила вибору адреси
+HideAnyVATInformationOnPDF=Сховати всю інформацію щодо податків та зборів
+PDFRulesForSalesTax=Правила податків та зборів
+PDFLocaltax=Правило для %s
+HideLocalTaxOnPDF=Сховати значення %sв колонці податків та зборів
+HideDescOnPDF=Сховати опис товарів
+HideRefOnPDF=Сховати характеристики товарів
 HideDetailsOnPDF=Hide product lines details
-PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for non-admin users for unauthorized actions instead of showing greyed disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
+PlaceCustomerAddressToIsoLocation=Використовувати французький стандарт (La Poste) розміщення для адрес контрагентів
+Library=Бібліотека
+UrlGenerationParameters=Параметри безпеки URL
+SecurityTokenIsUnique=Використовувати унікальний ключ безпеки для кожної URL-адреси
+EnterRefToBuildUrl=Введіть характеристику для об'єкта %s
+GetSecuredUrl=Отримати обчислену URL-адресу
+ButtonHideUnauthorized=Заховати для звичайних користувачів кнопки привілейованих функцій, замість того щоб відображати їх затемненими.
+OldVATRates=Старе значення комісії
+NewVATRates=Нове значення комісії
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch bulk conversion
-PriceFormatInCurrentLanguage=Price Format In Current Language
-String=String
-TextLong=Long text
-HtmlText=Html text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (one checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
+MassConvert=Запустити фонову конвертацію
+PriceFormatInCurrentLanguage=Формат ціни в поточній мові
+String=Текст
+String1Line=String (1 line)
+TextLong=Довгий текст
+TextLongNLines=Long text (n lines)
+HtmlText=Форматований (HTML) текст
+Int=Ціле чистло
+Float=Дробове число
+DateAndTime=Дата та час
+Unique=Унікальне
+Boolean=Булеве (один прапорець)
+ExtrafieldPhone = Телефон
+ExtrafieldPrice = іна
 ExtrafieldMail = Email
-ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator (not a field)
-ExtrafieldPassword=Password
-ExtrafieldRadio=Radio buttons (one choice only)
-ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList=Checkboxes from table
-ExtrafieldLink=Link to an object
-ComputedFormula=Computed field
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
-Computedpersistent=Store computed field
-ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!!
-ExtrafieldParamHelpPassword=Leaving this field blank means this value will be stored without encryption (field must be only hidden with star on screen).<br>Set  'auto' to use the default encryption rule to save password into database (then value read will be the hash only, no way to retrieve original value)
-ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
-ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldUrl = Адреса URL
+ExtrafieldSelect = Список вибору
+ExtrafieldSelectList = Вибір з таблиці
+ExtrafieldSeparator=Роздільник (не поле)
+ExtrafieldPassword=Пароль
+ExtrafieldRadio=Перемикач (одиничний вибір)
+ExtrafieldCheckBox=Прапорці
+ExtrafieldCheckBoxFromList=Прапорці з таблиці
+ExtrafieldLink=Посилання на об'єкт 
+ComputedFormula=Обчислюване поле
+ComputedFormulaDesc=Ви можете ввести сюди формулу, що використовує інші значення об'єктів або будь-який PHP код для отримання динамічно обчислюваного поля. Можна використовувати будь-які PHP формули,в тому числі й перевірки з оператором "?", використовувати глобальні об'єкти: <strong> $db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong>УВАГА</strong>: Доступні не всі поля $object. Якщо необхідні Вам поля не завантажені, Просто заберіть об'єкт у формулу, як показано в наступному зразку. <br>Використовуючи обчислювані поля, не вводьте нічого самостійно у інтерфейсі форми. Також, якщо присутні синтаксичні помилки, формула не поверне нічого. <br><br>Зразок формули:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Зразок перевантаження об'єкта: <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Інший зразок формули для прискореного завантаження обєкта та його контейнера: <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Зберегти обчислюване поле
+ComputedpersistentDesc=Обчислювальні поля будуть збережені в базі, тому значення буде перераховане лише тоді, коли об'єкт з цим полем буде змінено. Якщо обчислюване поле залежить від інших об'єктів, або глобальних даних - це значення може бути не правильним!
+ExtrafieldParamHelpPassword=Залишивши це поле порожнім, це значення буде зберігатися без шифрування (поле буде приховане лише зірочками на екрані). <br>Виберіть значення "Авто", щоб використовувати стандартне правило для шифрування паролів у базі даних (в такому випадку буде зчитуватися лише хеш, без можливості відновити оригінальне значення)
+ExtrafieldParamHelpselect=Список значень складається з рядків вигляду ключ,значення (де ключ не повинен бути '0') <br><br>Наприклад: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br> У випадку, коли потрібно щоб список залежав від значень іншого  додаткового списку:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>У випадку, якщо потрібно мати список залежний від іншого: <br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
+ExtrafieldParamHelpcheckbox=Список значень повинен складатися з рядків з форматом ключ,значення (де ключ не може бути "0") <br> <br>, наприклад: <br> 1,значення1 <br> 2,значення2 <br> 3,значення3 <br> ...
+ExtrafieldParamHelpradio=Список значень повинен складатися з рядків з форматом ключ,значення (де ключ не може бути "0") <br> <br>, наприклад: <br> 1,значення1 <br> 2,значення2 <br> 3,значення3 <br> ...
 ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>- idfilter is necessarly a primary int key<br>- filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelpchkbxlst=List of values comes from a table<br>Syntax: table_name:label_field:id_field::filter<br>Example: c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntax  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another complementary attribute list:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>In order to have the list depending on another list:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax: ObjectName:Classpath<br>Examples:<br>Societe:societe/class/societe.class.php<br>Contact:contact/class/contact.class.php
@@ -524,7 +527,7 @@ Module25Name=Sales Orders
 Module25Desc=Sales order management
 Module30Name=Рахунки-фактури
 Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
-Module40Name=Vendors
+Module40Name=Постачальники
 Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
 Module42Name=Debug Logs
 Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -976,8 +990,9 @@ DictionaryAccountancyJournal=Accounting journals
 DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
-DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionarySocialNetworks=Соціальні мережі
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,15 +1091,15 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
 CompanyName=Name
-CompanyAddress=Address
+CompanyAddress=Адреса
 CompanyZip=Zip
 CompanyTown=Town
-CompanyCountry=Country
+CompanyCountry=Країна
 CompanyCurrency=Main currency
 CompanyObject=Object of the company
 IDCountry=ID country
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1456,7 +1472,7 @@ LDAPFieldPasswordExample=Example: userPassword
 LDAPFieldCommonNameExample=Example: cn
 LDAPFieldName=Name
 LDAPFieldNameExample=Example: sn
-LDAPFieldFirstName=First name
+LDAPFieldFirstName=Ім'я
 LDAPFieldFirstNameExample=Example: givenName
 LDAPFieldMail=Email address
 LDAPFieldMailExample=Example: mail
@@ -1474,7 +1490,7 @@ LDAPFieldZip=Zip
 LDAPFieldZipExample=Example: postalcode
 LDAPFieldTown=Town
 LDAPFieldTownExample=Example: l
-LDAPFieldCountry=Country
+LDAPFieldCountry=Країна
 LDAPFieldDescription=Description
 LDAPFieldDescriptionExample=Example: description
 LDAPFieldNotePublic=Public Note
@@ -1482,12 +1498,12 @@ LDAPFieldNotePublicExample=Example: publicnote
 LDAPFieldGroupMembers= Group members
 LDAPFieldGroupMembersExample= Example: uniqueMember
 LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
+LDAPFieldCompany=Компанія
 LDAPFieldCompanyExample=Example: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example: objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Job position
+LDAPFieldTitle=Місце роботи
 LDAPFieldTitleExample=Example: title
 LDAPFieldGroupid=Group id
 LDAPFieldGroupidExample=Exemple : gidnumber
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index 00b90386a7b..6798f1d9d63 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Кількість подій
 ListOfActions=Список подій
 EventReports=Event reports
 Location=Розташування
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Подія на цілий день(дні)
 MenuToDoActions=Усі невиконані події
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index e259f2026d4..2a360131fe2 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -438,7 +438,7 @@ BankCode=Код банку
 DeskCode=Branch code
 BankAccountNumber=Номер рахунка
 BankAccountNumberKey=Checksum
-Residence=Address
+Residence=Адреса
 IBANNumber=IBAN account number
 IBAN=IBAN
 CustomerIBAN=IBAN of customer
diff --git a/htdocs/langs/uk_UA/bookmarks.lang b/htdocs/langs/uk_UA/bookmarks.lang
index 9d2003f34d3..87466cadcfa 100644
--- a/htdocs/langs/uk_UA/bookmarks.lang
+++ b/htdocs/langs/uk_UA/bookmarks.lang
@@ -6,15 +6,16 @@ ListOfBookmarks=List of bookmarks
 EditBookmarks=List/edit bookmarks
 NewBookmark=New bookmark
 ShowBookmark=Show bookmark
-OpenANewWindow=Open a new window
-ReplaceWindow=Replace current window
-BookmarkTargetNewWindowShort=New window
-BookmarkTargetReplaceWindowShort=Current window
-BookmarkTitle=Bookmark title
+OpenANewWindow=Open a new tab
+ReplaceWindow=Replace current tab
+BookmarkTargetNewWindowShort=New tab
+BookmarkTargetReplaceWindowShort=Current tab
+BookmarkTitle=Bookmark name
 UrlOrLink=URL
 BehaviourOnClick=Behaviour when a bookmark URL is selected
 CreateBookmark=Create bookmark
-SetHereATitleForLink=Set a title for the bookmark
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
+SetHereATitleForLink=Set a name for the bookmark
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://URL) or an internal/relative link (/DOLIBARR_ROOT/htdocs/...)
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if the linked page should open in the current tab or a new tab
 BookmarksManagement=Bookmarks management
+BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index 2f4c5c557ab..187fb5abbfe 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Рахунки-фактури покупців
 ForCustomersOrders=Замовлення клієнтів
 ForProposals=Пропозиції
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index 99a7023cc30..a77e6f6893f 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/uk_UA/commercial.lang b/htdocs/langs/uk_UA/commercial.lang
index 283b14f25db..aec96a6ae3d 100644
--- a/htdocs/langs/uk_UA/commercial.lang
+++ b/htdocs/langs/uk_UA/commercial.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - commercial
 Commercial=Commerce
 CommercialArea=Commerce area
-Customer=Customer
-Customers=Customers
+Customer=Покупець
+Customers=Покупці
 Prospect=Prospect
-Prospects=Prospects
+Prospects=Потенційні клієнти
 DeleteAction=Delete an event
 NewAction=New event
 AddAction=Create event
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 7d8fe9f1e9f..cba4ef7dbda 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -1,106 +1,106 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
-ErrorSetACountryFirst=Set the country first
-SelectThirdParty=Select a third party
-ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information?
-DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information?
-MenuNewThirdParty=New Third Party
-MenuNewCustomer=New Customer
-MenuNewProspect=New Prospect
-MenuNewSupplier=New Vendor
-MenuNewPrivateIndividual=New private individual
-NewCompany=New company (prospect, customer, vendor)
-NewThirdParty=New Third Party (prospect, customer, vendor)
-CreateDolibarrThirdPartySupplier=Create a third party (vendor)
-CreateThirdPartyOnly=Create third party
-CreateThirdPartyAndContact=Create a third party + a child contact
-ProspectionArea=Prospection area
-IdThirdParty=Id third party
-IdCompany=Company Id
-IdContact=Contact Id
-ThirdPartyContacts=Third-party contacts
-ThirdPartyContact=Third-party contact/address
-Company=Company
-CompanyName=Company name
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias Name
-Companies=Companies
-CountryIsInEEC=Country is inside the European Economic Community
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
-ThirdPartyName=Third-party name
-ThirdPartyEmail=Third-party email
-ThirdParty=Third-party
-ThirdParties=Third-parties
-ThirdPartyProspects=Prospects
-ThirdPartyProspectsStats=Prospects
-ThirdPartyCustomers=Customers
-ThirdPartyCustomersStats=Customers
-ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Vendors
-ThirdPartyType=Third-party type
-Individual=Private individual
-ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough.
-ParentCompany=Parent company
-Subsidiaries=Subsidiaries
-ReportByMonth=Report by month
-ReportByCustomers=Report by customer
-ReportByQuarter=Report by rate
+ErrorCompanyNameAlreadyExists=Компанія з назвою %s уже існує. Виберіть іншу.
+ErrorSetACountryFirst=Спершу оберіть країну
+SelectThirdParty=Оберіть контрагента
+ConfirmDeleteCompany=Ви впевнені що дійсно хочете видалити цю компанію та всю її інформацію?
+DeleteContact=Видалити контакт/адресу
+ConfirmDeleteContact=Ви впевнені що дійсно хочете видалити цей контакт та всю зв'язану з ним інформацію?
+MenuNewThirdParty=Новий контрагент
+MenuNewCustomer=Новий замовник
+MenuNewProspect=Новий потенційний клієнт
+MenuNewSupplier=Новий постачальник
+MenuNewPrivateIndividual=Нова фізична особа
+NewCompany=Нова компанія (потенційний, покупець, постачальник)
+NewThirdParty=Новий контрагент (потенційний, покупець, постачальник)
+CreateDolibarrThirdPartySupplier=Створити контрагента (постачальника)
+CreateThirdPartyOnly=Створити контрагента
+CreateThirdPartyAndContact=Створити контрагента та прив'язати контакт
+ProspectionArea=Розділ потенційних клієнтів
+IdThirdParty=Id контрагента
+IdCompany=Id компанії
+IdContact=Id контакту
+ThirdPartyContacts=Контакти контрагента
+ThirdPartyContact=Контакти/адреса контрагента
+Company=Компанія
+CompanyName=Назва компанії
+AliasNames=Зв'язана назва (торгова точка, торгова марка)
+AliasNameShort=Зв'язана назва
+Companies=Компанії
+CountryIsInEEC=Держава знаходиться в Європейській Економічній Зоні
+PriceFormatInCurrentLanguage=Формат відображення ціни в поточній мові та поточній валюті
+ThirdPartyName=Назва контрагента
+ThirdPartyEmail=email контрагента
+ThirdParty=Контрагент
+ThirdParties=Контрагенти
+ThirdPartyProspects=Потенційні клієнти
+ThirdPartyProspectsStats=Потенційні клієнти
+ThirdPartyCustomers=Покупці
+ThirdPartyCustomersStats=Покупці
+ThirdPartyCustomersWithIdProf12=Покупці з %s або %s
+ThirdPartySuppliers=Постачальники
+ThirdPartyType=Тип контрагента
+Individual=Фізична особа
+ToCreateContactWithSameName=Автоматично створить контакт / адресу з тією ж інформацією, що і в контрагента. У більшості випадків, якщо ваш контрагент є фізичною особою, достатньо створити контрагента.
+ParentCompany=Батьківська компанія
+Subsidiaries=Дочірні компанії
+ReportByMonth=Звіт за місяць
+ReportByCustomers=Звіт за покупцем
+ReportByQuarter=Звіт за частотою
 CivilityCode=Civility code
 RegisteredOffice=Registered office
-Lastname=Last name
-Firstname=First name
-PostOrFunction=Job position
-UserTitle=Title
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
-Address=Address
-State=State/Province
-StateCode=State/Province code
-StateShort=State
-Region=Region
-Region-State=Region - State
-Country=Country
-CountryCode=Country code
-CountryId=Country id
-Phone=Phone
-PhoneShort=Phone
+Lastname=Прізвище
+Firstname=Ім'я
+PostOrFunction=Місце роботи
+UserTitle=Назва
+NatureOfThirdParty=Характер контрагента
+NatureOfContact=Характер контакту
+Address=Адреса
+State=Штат/провінція/область
+StateCode=Код штату
+StateShort=Штат/область
+Region=Регіон
+Region-State=Регіон - держава
+Country=Країна
+CountryCode=Код країни
+CountryId=id країни
+Phone=Телефон
+PhoneShort=Телефон
 Skype=Skype
 Call=Call
-Chat=Chat
-PhonePro=Prof. phone
-PhonePerso=Pers. phone
-PhoneMobile=Mobile
-No_Email=Refuse bulk emailings
+Chat=Чат
+PhonePro=Робочий телефон
+PhonePerso=Особистий телефон
+PhoneMobile=Мобільний телефон
+No_Email=Скасувати автоматичну розсилку
 Fax=Факс
-Zip=Zip Code
-Town=City
-Web=Web
-Poste= Position
-DefaultLang=Language default
-VATIsUsed=Sales tax used
-VATIsUsedWhenSelling=This defines if this third party includes a sale tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Sales tax is not used
-CopyAddressFromSoc=Copy address from third-party details
-ThirdpartyNotCustomerNotSupplierSoNoRef=Third party neither customer nor vendor, no available referring objects
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available
-PaymentBankAccount=Payment bank account
+Zip=Індекс
+Town=Місто
+Web=Вебсайт
+Poste= Позиція
+DefaultLang=Мова по замовчуванню
+VATIsUsed=Податок з продажу
+VATIsUsedWhenSelling=Визначає, чи включати для цього контрагента податок з продажу чи ні, коли він виставляє рахунок власним клієнтам
+VATIsNotUsed=Податок не використовується
+CopyAddressFromSoc=Копія адреси з деталей контрагента
+ThirdpartyNotCustomerNotSupplierSoNoRef=Контрагент ні покупець, ні постачальник, відсутні доступні об'єкти для посилання
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Контрагент ані покупець, ані постачальник, знижки не доступні
+PaymentBankAccount=Платіжний рахунок у банку
 OverAllProposals=Пропозиції
-OverAllOrders=Orders
+OverAllOrders=Покупки
 OverAllInvoices=Рахунки-фактури
-OverAllSupplierProposals=Price requests
+OverAllSupplierProposals=Запити цін
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
+LocalTax1IsUsed=Використовувати додаткову комісію/податок
 LocalTax1IsUsedES= RE is used
 LocalTax1IsNotUsedES= RE is not used
-LocalTax2IsUsed=Use third tax
+LocalTax2IsUsed=Використовувати третю комісію/податок
 LocalTax2IsUsedES= IRPF is used
 LocalTax2IsNotUsedES= IRPF is not used
-WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Vendor code invalid
+WrongCustomerCode=Індивідуальний код покупця
+WrongSupplierCode=Індивідуальний код постачальника
 CustomerCodeModel=Customer code model
 SupplierCodeModel=Vendor code model
-Gencod=Barcode
+Gencod=Штрихкод
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -268,19 +268,19 @@ VATIntraSyntaxIsValid=Syntax is valid
 VATReturn=VAT return
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
-CustomerCard=Customer Card
-Customer=Customer
-CustomerRelativeDiscount=Relative customer discount
-SupplierRelativeDiscount=Relative vendor discount
+CustomerCard=Картка покупця
+Customer=Покупець
+CustomerRelativeDiscount=Відносна знижка клієнта
+SupplierRelativeDiscount=Відносна знижка постачальника
 CustomerRelativeDiscountShort=Відносна знижка
-CustomerAbsoluteDiscountShort=Absolute discount
-CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
-CompanyHasNoRelativeDiscount=This customer has no relative discount by default
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
-CompanyHasAbsoluteDiscount=This customer has discounts available (credits notes or down payments) for <b>%s</b> %s
+CustomerAbsoluteDiscountShort=Абсолютна знижка
+CompanyHasRelativeDiscount=У цього клієнта знижка за замовчуванням <b> %s%% </b>
+CompanyHasNoRelativeDiscount=Цей клієнт не має відносної знижки за замовчуванням 
+HasRelativeDiscountFromSupplier=У вас є знижка за замовчуванням <b> %s%% </b> у цього постачальника
+HasNoRelativeDiscountFromSupplier=Ви не маєте відносної знижки за замовчуванням у цього постачальника 
+CompanyHasAbsoluteDiscount=У цього клієнта доступні знижки (бонусні бали або знижки) для <b> %s </b> %s
 CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
+CompanyHasCreditNote=Цей клієнт ще має бонусні бали  <b> %s </b> %s
 HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
 HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
 HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
@@ -291,33 +291,33 @@ CustomerAbsoluteDiscountMy=Absolute customer discounts (granted by yourself)
 SupplierAbsoluteDiscountAllUsers=Absolute vendor discounts (entered by all users)
 SupplierAbsoluteDiscountMy=Absolute vendor discounts (entered by yourself)
 DiscountNone=None
-Vendor=Vendor
-Supplier=Vendor
-AddContact=Create contact
-AddContactAddress=Create contact/address
-EditContact=Edit contact
-EditContactAddress=Edit contact/address
-Contact=Contact/Address
-Contacts=Contacts/Addresses
-ContactId=Contact id
-ContactsAddresses=Contacts/Addresses
-FromContactName=Name:
-NoContactDefinedForThirdParty=No contact defined for this third party
-NoContactDefined=No contact defined
-DefaultContact=Default contact/address
-ContactByDefaultFor=Default contact/address for
-AddThirdParty=Create third party
-DeleteACompany=Delete a company
-PersonalInformations=Personal data
+Vendor=Постачальник
+Supplier=Постачальник
+AddContact=Створити контакт
+AddContactAddress=Створити контакт/адресу
+EditContact=Редагувати контакт
+EditContactAddress=Редагувати контакт/адресу
+Contact=Контакт/адреса
+Contacts=онтакти/адреси
+ContactId=id контакту
+ContactsAddresses=Контакти/адреси
+FromContactName=Назва:
+NoContactDefinedForThirdParty=З цим контрагентом не зв'язано жодного контакту
+NoContactDefined=Контакт не призначено
+DefaultContact=Контакт/адреса за промовчанням
+ContactByDefaultFor=Контакт/адреса за промовчанням для
+AddThirdParty=Створити контрагента
+DeleteACompany=Видалити компанію
+PersonalInformations=Особисті дані
 AccountancyCode=Accounting account
-CustomerCode=Customer Code
-SupplierCode=Vendor Code
-CustomerCodeShort=Customer Code
-SupplierCodeShort=Vendor Code
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
-RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a vendor
+CustomerCode=Код клієнта
+SupplierCode=Код постачальника
+CustomerCodeShort=Код клієнта
+SupplierCodeShort=Код постачальника
+CustomerCodeDesc=Код клієнта, унікальний для всіх клієнтів
+SupplierCodeDesc=Код постачальника, унікальний для всіх постачальників
+RequiredIfCustomer=Обов'язково, якщо контрагент є потенційним, або покупцем
+RequiredIfSupplier=Обов'язково, якщо контрагент є постачальником
 ValidityControledByModule=Validity controlled by module
 ThisIsModuleRules=Rules for this module
 ProspectToContact=Prospect to contact
@@ -376,7 +376,7 @@ TE_ADMIN=Governmental
 TE_SMALL=Small company
 TE_RETAIL=Retailer
 TE_WHOLE=Wholesaler
-TE_PRIVATE=Private individual
+TE_PRIVATE=Приватна особа
 TE_OTHER=Інший
 StatusProspect-1=Do not contact
 StatusProspect0=Never contacted
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 25d9f2b34e4..f7643379a98 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -10,7 +10,7 @@ OptionModeVirtualDesc=In this context, the turnover is calculated over invoices
 FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
 VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
 LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
-Param=Setup
+Param=Встановлення
 RemainingAmountPayment=Amount payment remaining:
 Account=Account
 Accountparent=Parent account
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang
index 18e8ab5d426..dfcbc680ca0 100644
--- a/htdocs/langs/uk_UA/contracts.lang
+++ b/htdocs/langs/uk_UA/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
index 2dcf4317e00..50ef674d821 100644
--- a/htdocs/langs/uk_UA/exports.lang
+++ b/htdocs/langs/uk_UA/exports.lang
@@ -25,7 +25,9 @@ FieldsTitle=Fields title
 FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
 AvailableFormats=Available Formats
-LibraryShort=Library
+LibraryShort=Бібліотека
+ExportCsvSeparator=Csv caracter separator
+ImportCsvSeparator=Csv caracter separator
 Step=Step
 FormatedImport=Import Assistant
 FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
@@ -120,7 +122,7 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert
 ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+ComputedField=Обчислюване поле
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilteredFields=Filtered fields
diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index 9f733ae189d..e28139cf3ca 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -110,7 +110,7 @@ UpdateConfCPOK=Updated successfully.
 Module27130Name= Management of leave requests
 Module27130Desc= Management of leave requests
 ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+NoticePeriod=Період повідомлення
 #Messages
 HolidaysToValidate=Validate leave requests
 HolidaysToValidateBody=Below is a leave request to validate
diff --git a/htdocs/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang
index 02058181cf7..79195062114 100644
--- a/htdocs/langs/uk_UA/languages.lang
+++ b/htdocs/langs/uk_UA/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Арабська
 Language_ar_EG=Арабська (Єгипет)
 Language_ar_SA=Арабська
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Бенгальська
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Болгарська
 Language_bs_BA=Боснійська
 Language_ca_ES=Каталонський
@@ -20,6 +23,7 @@ Language_en_GB=Англійська (Великобританія)
 Language_en_IN=Англійська (Індія)
 Language_en_NZ=Англійська (Нова Зеландія)
 Language_en_SA=Англійська (Саудівська Аравія)
+Language_en_SG=English (Singapore)
 Language_en_US=Англійська (США)
 Language_en_ZA=Англійська (Південна Африка)
 Language_es_ES=Іспанська
@@ -29,6 +33,7 @@ Language_es_CL=Іспанська (Чілі)
 Language_es_CO=Іспанська (Колумбія)
 Language_es_DO=Іспанська (Домініканська Республіка)
 Language_es_EC=Іспанська (Еквадор)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Іспанська (Гондурас)
 Language_es_MX=Іспанська (Мексика)
 Language_es_PA=Іспанська (Панама)
@@ -36,6 +41,7 @@ Language_es_PY=Іспанська (Парагвай)
 Language_es_PE=Іспанська (Перу)
 Language_es_PR=Іспанська (Пуерто-Ріко)
 Language_es_UY=Іспанська (Уругвай)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Іспанська (Венесуела)
 Language_et_EE=Естонська
 Language_eu_ES=Баскська
@@ -44,15 +50,22 @@ Language_fi_FI=Фінська
 Language_fr_BE=Французька (Бельгія)
 Language_fr_CA=Французька (Канада)
 Language_fr_CH=Французька (Швейцарія)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Французький
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Французька (Нова Каледонія)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Фризька
+Language_gl_ES=Galician
 Language_he_IL=Іврит
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Хорватська
 Language_hu_HU=Угорська
 Language_id_ID=Індонезійська
 Language_is_IS=Ісландський
 Language_it_IT=Італійський
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Японський
 Language_ka_GE=Грузинська
 Language_km_KH=Кхмерська
@@ -64,6 +77,7 @@ Language_lv_LV=Латвійська
 Language_mk_MK=Македонський
 Language_mn_MN=Монгольська
 Language_nb_NO=Норвезька (букмол)
+Language_ne_NP=Nepali
 Language_nl_BE=Голандська (Бельгія)
 Language_nl_NL=Dutch
 Language_pl_PL=Польський
@@ -86,4 +100,5 @@ Language_uz_UZ=Узбецький
 Language_vi_VN=В'єтнамська
 Language_zh_CN=Китайський
 Language_zh_TW=Китайська (традиційна)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Малайська
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 8b1cb50fe79..754ce0cee4b 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 5409a3b0652..62ebc2ddfd0 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -206,7 +206,7 @@ Users=Users
 Group=Group
 Groups=Groups
 NoUserGroupDefined=No user group defined
-Password=Password
+Password=Пароль
 PasswordRetype=Retype your password
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
 Name=Name
@@ -224,7 +224,7 @@ Type=Тип
 Language=Language
 MultiLanguage=Multi-language
 Note=Note
-Title=Title
+Title=Назва
 Label=Label
 RefOrLabel=Ref. or label
 Info=Log
@@ -247,7 +247,7 @@ Limits=Limits
 Logout=Logout
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
 Connection=Login
-Setup=Setup
+Setup=Встановлення
 Alert=Alert
 MenuWarnings=Alerts
 Previous=Previous
@@ -257,7 +257,7 @@ Card=Card
 Now=Now
 HourStart=Start hour
 Date=Date
-DateAndHour=Date and hour
+DateAndHour=Дата та час
 DateToday=Today's date
 DateReference=Reference date
 DateStart=Start date
@@ -342,7 +342,7 @@ Paste=Paste
 Default=Default
 DefaultValue=Default value
 DefaultValues=Default values/filters/sorting
-Price=Price
+Price=іна
 PriceCurrency=Price (currency)
 UnitPrice=Unit price
 UnitPriceHT=Unit price (excl.)
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Сума
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Сума платежу
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=Продавець
+FromDate=Продавець
 FromLocation=Продавець
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 65411506d6c..fc805a4c210 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Підтверджений
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
@@ -99,7 +102,7 @@ ExportDataset_member_1=Members and subscriptions
 ImportDataset_member_1=Members
 LastMembersModified=Latest %s modified members
 LastSubscriptionsModified=Latest %s modified subscriptions
-String=String
+String=Текст
 Text=Text
 Int=Int
 DateAndTime=Date and time
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index 460aef8103b..2ac06ba7f55 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -5,7 +5,7 @@ EnterNameOfObjectDesc=Enter name of the object to create with no spaces. Use upp
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
-NewModule=New module
+NewModule=Новий модуль
 NewObjectInModulebuilder=New object
 ModuleKey=Module key
 ObjectKey=Object key
diff --git a/htdocs/langs/uk_UA/mrp.lang b/htdocs/langs/uk_UA/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/uk_UA/mrp.lang
+++ b/htdocs/langs/uk_UA/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index 54f235a923e..a784e083458 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -5,7 +5,7 @@ OrderCard=Order card
 OrderId=Order Id
 Order=Order
 PdfOrderTitle=Order
-Orders=Orders
+Orders=Покупки
 OrderLine=Order line
 OrderDate=Order date
 OrderDateShort=Order date
@@ -139,13 +139,14 @@ OrderByMail=Mail
 OrderByFax=Факс
 OrderByEMail=Email
 OrderByWWW=Online
-OrderByPhone=Phone
+OrderByPhone=Телефон
 # Documents models
-PDFEinsteinDescription=A complete order model 
+PDFEinsteinDescription=A complete order model (old implementation of Eratosthene template)
 PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 5dc70fa068f..c6472c143db 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -78,7 +78,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Expense report validated (approval required)
 Notify_EXPENSE_REPORT_APPROVE=Expense report approved
 Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
 Notify_HOLIDAY_APPROVE=Leave request approved
-SeeModuleSetup=See setup of module %s
+SeeModuleSetup=Див. налаштування модуля %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -271,7 +269,7 @@ NoExportableData=No exportable data (no modules with exportable data loaded, or
 ##### External sites #####
 WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
+WEBSITE_TITLE=Назва
 WEBSITE_DESCRIPTION=Description
 WEBSITE_IMAGE=Image
 WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/uk_UA/printing.lang b/htdocs/langs/uk_UA/printing.lang
index cc26879e4f1..099c83d3435 100644
--- a/htdocs/langs/uk_UA/printing.lang
+++ b/htdocs/langs/uk_UA/printing.lang
@@ -2,7 +2,7 @@
 Module64000Name=Direct Printing
 Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
-PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
+PrintingDesc=This module adds a Print button to various modules to allow documents to be printed directly to a printer without needing to open the document in another application.
 MenuDirectPrinting=Direct Printing jobs
 DirectPrint=Direct print
 PrintingDriverDesc=Configuration variables for printing driver.
@@ -19,7 +19,7 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
+PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
 GCP_Id=Printer Id
@@ -27,11 +27,11 @@ GCP_OwnerName=Owner Name
 GCP_State=Printer State
 GCP_connectionStatus=Online State
 GCP_Type=Printer Type
-PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
+PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
 PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
+PRINTIPP_PASSWORD=Пароль
 NoDefaultPrinterDefined=No default printer defined
 DefaultPrinter=Default printer
 Printer=Printer
@@ -46,7 +46,9 @@ IPP_Device=Device
 IPP_Media=Printer media
 IPP_Supported=Type of media
 DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
-GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthNotConfigured=Google OAuth has not been setup. Enable module OAuth and set a Google ID/Secret.
 GoogleAuthConfigured=Google OAuth credentials were found into setup of module OAuth.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
+PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintipp=List of Printers for Cups.
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 858ad2408f4..f032491bdac 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -86,7 +86,7 @@ ErrorProductAlreadyExists=A product with reference %s already exists.
 ErrorProductBadRefOrLabel=Wrong value for reference or label.
 ErrorProductClone=There was a problem while trying to clone the product or service.
 ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
-Suppliers=Vendors
+Suppliers=Постачальники
 SupplierRef=Vendor SKU
 ShowProduct=Show product
 ShowService=Show service
@@ -98,12 +98,13 @@ BuyingPrice=Buying price
 PriceForEachProduct=Products with specific prices
 SupplierCard=Vendor card
 PriceRemoved=Price removed
-BarCode=Barcode
+BarCode=Штрихкод
 BarcodeType=Barcode type
 SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 7a1553b6d47..6218178d78d 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/uk_UA/recruitment.lang b/htdocs/langs/uk_UA/recruitment.lang
new file mode 100644
index 00000000000..0fe9eb85116
--- /dev/null
+++ b/htdocs/langs/uk_UA/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Налаштування
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 0b424c874cc..81cd6394e96 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/uk_UA/supplier_proposal.lang b/htdocs/langs/uk_UA/supplier_proposal.lang
index a9679242750..8b0b708c2c4 100644
--- a/htdocs/langs/uk_UA/supplier_proposal.lang
+++ b/htdocs/langs/uk_UA/supplier_proposal.lang
@@ -3,7 +3,7 @@ SupplierProposal=Vendor commercial proposals
 supplier_proposalDESC=Manage price requests to suppliers
 SupplierProposalNew=New price request
 CommRequest=Price request
-CommRequests=Price requests
+CommRequests=Запити цін
 SearchRequest=Find a request
 DraftRequests=Draft requests
 SupplierProposalsDraft=Draft vendor proposals
@@ -32,7 +32,7 @@ SupplierProposalStatusValidatedShort=Підтверджений
 SupplierProposalStatusClosedShort=Зачинено
 SupplierProposalStatusSignedShort=Accepted
 SupplierProposalStatusNotSignedShort=Refused
-CopyAskFrom=Create price request by copying existing a request
+CopyAskFrom=Create a price request by copying an existing request
 CreateEmptyAsk=Create blank request
 ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b>?
 ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b>?
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index d0cf540d3eb..9b3668c788b 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -1,5 +1,5 @@
-# Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Vendors
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Постачальники
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/uk_UA/ticket.lang b/htdocs/langs/uk_UA/ticket.lang
index 5876f709724..cc7caade32a 100644
--- a/htdocs/langs/uk_UA/ticket.lang
+++ b/htdocs/langs/uk_UA/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Видалено
 
 # Dict
 Type=Тип
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Створено
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index aea4e7676e4..c2cd4a91aa4 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -37,8 +37,8 @@ AdministratorDesc=Administrator
 DefaultRights=Default Permissions
 DefaultRightsDesc=Define here the <u>default</u> permissions that are automatically granted to a <u>new</u> user (to modify permissions for existing users, go to the user card).
 DolibarrUsers=Dolibarr users
-LastName=Last name
-FirstName=First name
+LastName=Прізвище
+FirstName=Ім'я
 ListOfGroups=List of groups
 NewGroup=New group
 CreateGroup=Create group
@@ -65,7 +65,7 @@ CreateDolibarrLogin=Create a user
 CreateDolibarrThirdParty=Create a third party
 LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
 UsePersonalValue=Use personal value
-InternalUser=Internal user
+InternalUser=Внутрішній користувач
 ExportDataset_user_1=Users and their properties
 DomainUser=Domain user %s
 Reactivate=Reactivate
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index cccd8196481..533989bdd30 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Сплачений
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/uk_UA/workflow.lang b/htdocs/langs/uk_UA/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/uk_UA/workflow.lang
+++ b/htdocs/langs/uk_UA/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/uk_UA/zapier.lang b/htdocs/langs/uk_UA/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/uk_UA/zapier.lang
+++ b/htdocs/langs/uk_UA/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index 8fe1f84b149..d6fd298a3a7 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index 6cd046c5607..8f4f058bb87 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/uz_UZ/languages.lang
+++ b/htdocs/langs/uz_UZ/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index f6629fadaf2..127dffb310d 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 5886c598d52..5ef946ddf67 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Draft members
 MembersStatusResiliated=Terminated members
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=Validated
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=New contribution
 PaymentSubscription=New contribution payment
 SubscriptionEndDate=Subscription's end date
@@ -78,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/uz_UZ/mrp.lang
+++ b/htdocs/langs/uz_UZ/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/uz_UZ/recruitment.lang b/htdocs/langs/uz_UZ/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/uz_UZ/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index d0cf540d3eb..51562b8bb7a 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - suppliers
+# Dolibarr language file - Source file is en_US - vendors
 Suppliers=Vendors
 SuppliersInvoice=Vendor invoice
 ShowSupplierInvoice=Show Vendor Invoice
@@ -15,15 +15,15 @@ SomeSubProductHaveNoPrices=Some sub-products have no price defined
 AddSupplierPrice=Add buying price
 ChangeSupplierPrice=Change buying price
 SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
 NoRecordedSuppliers=No vendor recorded
 SupplierPayment=Vendor payment
 SuppliersArea=Vendor area
 RefSupplierShort=Ref. vendor
 Availability=Availability
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
+ExportDataset_fournisseur_1=Vendor invoices and invoice details
 ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_3=Purchase orders and order details
 ApproveThisOrder=Approve this order
 ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
 DenyingThisOrder=Deny this order
@@ -35,13 +35,13 @@ ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b
 SentToSuppliers=Sent to vendors
 ListOfSupplierOrders=List of purchase orders
 MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
 SupplierReputation=Vendor reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of supplier
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/uz_UZ/ticket.lang
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index aea4e7676e4..25d9205457b 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Created user will be an external user (because linked to
 IdPhoneCaller=Id phone caller
 NewUserCreated=User %s created
 NewUserPassword=Password change for %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=User %s modified
 UserDisabled=User %s disabled
 UserEnabled=User %s activated
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index 783373ad66d..299be277e1d 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/uz_UZ/zapier.lang b/htdocs/langs/uz_UZ/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/uz_UZ/zapier.lang
+++ b/htdocs/langs/uz_UZ/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index a90b39de00a..0c59133574f 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Cho phép quản lý các số không khác nhau ở cu
 BANK_DISABLE_DIRECT_INPUT=Vô hiệu hóa ghi trực tiếp giao dịch trong tài khoản ngân hàng
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Cho phép xuất dữ liệu bản nháp trong nhật ký
 ACCOUNTANCY_COMBO_FOR_AUX=Bật danh sách kết hợp cho tài khoản công ty con (có thể chậm nếu bạn có nhiều bên thứ ba)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Nhật ký bán hàng
 ACCOUNTING_PURCHASE_JOURNAL=Nhật ký mua hàng
@@ -284,6 +285,7 @@ ShowTutorial=Chương trình hướng dẫn
 NotReconciled=Chưa đối chiếu
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Áp dụng cho số một lớn các danh mục
 AddAccountFromBookKeepingWithNoCategories=Tài khoản khả dụng chưa có trong nhóm được cá nhân hóa
 CategoryDeleted=Danh mục cho tài khoản kế toán đã bị xóa
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index be5452c38ab..15e6b1140c3 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Email người gửi mặc định để gửi thủ
 UserEmail=Email người dùng
 CompanyEmail=Email công ty
 FeatureNotAvailableOnLinux=Tính năng không có sẵn trên Unix như hệ thống. Kiểm tra chương trình sendmail bản địa của bạn.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=Nếu bản dịch cho ngôn ngữ này chưa hoàn thành hoặc bạn thấy có lỗi, bạn có thể sửa lỗi này bằng cách chỉnh sửa các tệp trong thư mục <b>langs / %s</b> và gửi thay đổi của bạn tới www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Nếu bản dịch cho ngôn ngữ này chưa hoàn tất hoặc bạn tìm thấy lỗi, bạn có thể sửa lỗi này bằng cách chỉnh sửa các tệp vào thư mục <b>langs / %s</b> và gửi các tệp đã sửa đổi trên dolibarr.org/forum hoặc cho các nhà phát triển trên github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Cài đặt module
 ModulesSetup=Thiết lập Mô-đun / Ứng dụng 
 ModuleFamilyBase=Hệ thống
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Mô-đun <b>%s</b> phải được bật trước nếu
 SecurityToken=Key to secure URLs
 NoSmsEngine=Không có trình quản lý gửi SMS có sẵn. Trình quản lý gửi SMS không được cài đặt với phân phối mặc định vì chúng phụ thuộc vào nhà cung cấp bên ngoài, nhưng bạn có thể tìm thấy một số trên %s
 PDF=PDF
-PDFDesc=Tùy chọn toàn cục để tạo PDF.
-PDFAddressForging=Quy tắc cho hộp địa chỉ
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Ẩn tất cả thông tin liên quan đến Thuế bán hàng / VAT
 PDFRulesForSalesTax=Quy tắc thuế bán hàng / VAT
 PDFLocaltax=Quy tắc cho %s
-HideLocalTaxOnPDF=Ẩn tỷ lệ %s trong cột Thuế Bán hàng
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Ẩn mô tả sản phẩm
 HideRefOnPDF=Ẩn tham chiếu sản phẩm
 HideDetailsOnPDF=Ẩn chi tiết dòng sản phẩm
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu cơ s
 MassConvert=Khởi chạy chuyển đổi hàng loạt
 PriceFormatInCurrentLanguage=Định dạng giá trong ngôn ngữ hiện tại
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Quản lý hợp đồng (dịch vụ hoặc đăng ký định k
 Module55Name=Mã vạch
 Module55Desc=Quản lý mã vạch
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Thanh toán ngân hàng ghi nợ trực tiếp
-Module57Desc=Quản lý các lệnh thanh toán ghi nợ trực tiếp. Nó bao gồm việc tạo tệp SEPA cho các nước châu Âu.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Tạo/chỉnh sửa dịch vụ
 Permission534=Xóa dịch vụ
 Permission536=Xem/quản lý dịch vụ ẩn
 Permission538=Xuất dữ liệu Dịch vụ
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Xem hóa đơn vật liệu
 Permission651=Tạo / Sửa đổi nhật hóa đơn vật liệu
 Permission652=Xóa hóa đơn vật liệu
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Đọc thông tin Tài trợ
 Permission702=Tạo/sửa đổi Tài trợ
 Permission703=Xóa tài trợ
@@ -848,6 +858,8 @@ Permission773=Xóa báo cáo chi phí
 Permission774=Đọc tất cả báo cáo chi phí (ngay cả người dùng không phụ thuộc)
 Permission775=Duyệt báo cáo chi phí
 Permission776=Báo cáo thanh toán chi phí
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Xuất dữ liệu báo cáo chi phí
 Permission1001=Xem tồn kho
 Permission1002=Tạo/chỉnh sửa Kho hàng
@@ -900,6 +912,7 @@ Permission2515=Cài đặt thư mục tài liệu
 Permission2801=Sử dụng FTP client trong chế độ đọc (chỉ duyệt và tải về)
 Permission2802=Sử dụng FTP client trong chế độ ghi (xóa hoặc tải lên các tập tin)
 Permission3200=Xem các sự kiện được lưu trữ và dấu vân tay
+Permission3301=Generate new modules
 Permission4001=Xem nhân viên
 Permission4002=Tạo nhân viên
 Permission4003=Xóa nhân viên
@@ -947,7 +960,8 @@ Permission63003=Xóa tài nguyên
 Permission63004=Liên kết tài nguyên với các sự kiện chương trình nghị sự
 DictionaryCompanyType=Các loại bên thứ ba
 DictionaryCompanyJuridicalType=Pháp nhân bên thứ ba
-DictionaryProspectLevel=KH tiềm năng
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=Bang / Tỉnh
 DictionaryRegion=Vùng
 DictionaryCountry=Quốc gia
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Mẫu thư điện tử
 DictionaryUnits=Đơn vị
 DictionaryMeasuringUnits=Đơn vị đo lường
 DictionarySocialNetworks=Mạng xã hội
-DictionaryProspectStatus=Trạng thái KH tiềm năng
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Các loại nghỉ phép
 DictionaryOpportunityStatus=Trạng thái khách hàng tiềm năng cho dự án/ khách hàng tiềm năng
 DictionaryExpenseTaxCat=Báo cáo chi phí - Danh mục vận tải
@@ -1076,7 +1091,7 @@ LoginPage=Trang đăng nhập
 BackgroundImageLogin=Hình nền
 PermanentLeftSearchForm=Forrm tìm kiếm cố định trên menu bên trái
 DefaultLanguage=Ngôn ngữ mặc định
-EnableMultilangInterface=Cho phép hỗ trợ đa ngôn ngữ
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Hiển thị logo công ty trong menu
 CompanyInfo=Thông Tin Công ty/Tổ chức
 CompanyIds=Danh tính công ty / tổ chức
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=Một tiêu chí tìm kiếm được yê
 NewTranslationStringToShow=Chuỗi dịch mới để hiển thị
 OriginalValueWas=Bản dịch gốc được ghi đè. Giá trị ban đầu là: <br><br> %s
 TransKeyWithoutOriginalValue=Bạn đã ép buộc một bản dịch mới cho từ khóa dịch ' <strong>%s</strong> ' không tồn tại trong bất kỳ tệp ngôn ngữ nào
-TotalNumberOfActivatedModules=Khích hoạt Ứng dụng/mô-đun: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép
 ClassNotFoundIntoPathWarning=Không tìm thấy lớp %s trong đường dẫn PHP
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Sử dụng các loại sự kiện (được quản lý t
 AGENDA_USE_EVENT_TYPE_DEFAULT=Tự động đặt giá trị mặc định này cho loại sự kiện trong biểu mẫu tạo sự kiện
 AGENDA_DEFAULT_FILTER_TYPE=Tự động đặt loại sự kiện này trong bộ lọc tìm kiếm của chế độ xem chương trình nghị sự
 AGENDA_DEFAULT_FILTER_STATUS=Tự động đặt trạng thái này cho các sự kiện trong bộ lọc tìm kiếm của chế độ xem chương trình nghị sự
-AGENDA_DEFAULT_VIEW=Tab mà bạn muốn mở mặc định khi lựa chọn menu chương trình nghị sự
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Bật nhắc nhở sự kiện <b>bằng email</b> (tùy chọn nhắc nhở / trì hoãn có thể được xác định trên mỗi sự kiện). Lưu ý: Mô-đun <strong>%s</strong> phải được bật và thiết lập chính xác để có lời nhắc được gửi ở tần số chính xác.
 AGENDA_REMINDER_BROWSER=Bật nhắc nhở sự kiện <b>trên trình duyệt của người dùng</b> (khi đạt đến ngày sự kiện, mỗi người dùng có thể từ chối câu hỏi này từ câu hỏi xác nhận trình duyệt)
 AGENDA_REMINDER_BROWSER_SOUND=Bật thông báo âm thanh
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Hiển thị đối tượng được liên kết vào
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url được gọi khi nhấp chuột vào hình ảnh điện thoại được thực hiện. Trong URL, bạn có thể sử dụng thẻ <br> <b>__PHONETO__</b> sẽ được thay thế bằng số điện thoại của người cần gọi <br> <b>__PHONEFROM__</b> sẽ được thay thế bằng số điện thoại của người gọi (của bạn) <br> <b>__LOGIN__</b> sẽ được thay thế bằng đăng nhập clicktodial (được xác định trên thẻ người dùng) <br> <b>__PASS__</b> sẽ được thay thế bằng mật khẩu clicktodial (được xác định trên thẻ người dùng).
-ClickToDialDesc=Mô-đun này tạo liên kết một số điện thoại có thể nhấp vào. Một cú nhấp chuột vào biểu tượng sẽ làm cho điện thoại của bạn gọi số. Điều này có thể được sử dụng để gọi một hệ thống trung tâm cuộc gọi từ Dolibarr có thể gọi số điện thoại trên hệ thống SIP chẳng hạn.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Chỉ sử dụng một liên kết "tel:" trên các số điện thoại
 ClickToDialUseTelLinkDesc=Sử dụng phương pháp này nếu người dùng của bạn có điện thoại phần mềm hoặc giao diện phần mềm được cài đặt trên cùng một máy tính với trình duyệt và được gọi khi bạn nhấp vào liên kết trong trình duyệt bắt đầu bằng "tel:". Nếu bạn cần một giải pháp máy chủ đầy đủ (không cần cài đặt phần mềm cục bộ), bạn phải đặt giải pháp này thành "Không" và điền vào trường tiếp theo.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=Trường này chứa một tham chiếu để xác định dòng.
 Enter0or1=Lỗi 0 hoặc 1
 UnicodeCurrency=Nhập vào đây giữa các dấu ngoặc nhọn, danh sách số byte đại diện cho ký hiệu tiền tệ. Ví dụ: với $, nhập [36] - đối với brazil real R $ [82,36] - với €, nhập [8364]
 ColorFormat=Màu RGB ở định dạng HEX, ví dụ: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Vị trí của dòng ở trong danh sách kết hợp
 SellTaxRate=Thuế suất bán hàng
 RecuperableOnly="Có" cho VAT "Không được nhận nhưng có thể thu hồi" dành riêng cho một số tiểu bang ở Pháp. Giữ giá trị thành "Không" trong tất cả các trường hợp khác.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Yêu cầu báo giá
 MailToSendSupplierOrder=Đơn đặt hàng mua
 MailToSendSupplierInvoice=Hóa đơn nhà cung cấp
 MailToSendContract=Hợp đồng
+MailToSendReception=Tiếp nhận
 MailToThirdparty=Bên thứ ba
 MailToMember=Thành viên
 MailToUser=Người dùng
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP &amp; CRM %s có sẵn. Phiên
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP &amp; CRM %s có sẵn. Phiên bản %s là phiên bản bảo trì, do đó chỉ chứa các bản sửa lỗi. Chúng tôi khuyên tất cả người dùng nâng cấp lên phiên bản này. Một bản phát hành bảo trì không giới thiệu các tính năng mới hoặc thay đổi cơ sở dữ liệu. Bạn có thể tải xuống từ khu vực tải xuống của https://www.dolibarr.org cổng thông tin (thư mục con Phiên bản ổn định). Bạn có thể đọc <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> để biết danh sách đầy đủ các thay đổi.
 MultiPriceRuleDesc=Khi tùy chọn "Một số mức giá cho mỗi sản phẩm/dịch vụ" được bật, bạn có thể xác định các mức giá khác nhau (một mức cho mỗi mức giá) cho mỗi sản phẩm. Để tiết kiệm thời gian của bạn, ở đây bạn có thể nhập quy tắc để tự động định giá cho từng cấp dựa trên giá của cấp đầu tiên, do đó bạn sẽ chỉ phải nhập giá cho cấp đầu tiên cho mỗi sản phẩm. Trang này được thiết kế để giúp bạn tiết kiệm thời gian nhưng chỉ hữu ích nếu giá của bạn cho mỗi cấp tương đối so với cấp đầu tiên. Bạn có thể bỏ qua trang này trong hầu hết các trường hợp.
 ModelModulesProduct=Mẫu cho tài liệu sản phẩm
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=Để có thể tạo mã tự động, trước tiên bạn phải xác định người quản lý để tự động xác định số mã vạch.
 SeeSubstitutionVars=Xem * lưu ý cho danh sách các biến thay thế có thể
 SeeChangeLog=Xem tệp ChangeLog (chỉ bằng tiếng Anh)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Lề trái trên PDF
 MAIN_PDF_MARGIN_RIGHT=Lề phải trên PDF
 MAIN_PDF_MARGIN_TOP=Lề trên PDF
 MAIN_PDF_MARGIN_BOTTOM=Lề dưới PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=Không có thiết lập cụ thể cần thiết cho mô-đun này.
 SetToYesIfGroupIsComputationOfOtherGroups=Đặt cái này thành Có nếu nhóm này là sự tính toán của các nhóm khác
 EnterCalculationRuleIfPreviousFieldIsYes=Nhập quy tắc tính toán nếu trường trước đó được đặt thành Có (Ví dụ: 'CODEGRP1 + CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Chưa có gì hoàn thành
 XEmailsDoneYActionsDone=%s email đủ điều kiện, %s email được xử lý thành công (đối với bản ghi / hành động %s được thực hiện)
 RecordEvent=Ghi lại sự kiện email
 CreateLeadAndThirdParty=Tạo khách hàng tiềm năng (và bên thứ ba nếu cần thiết)
-CreateTicketAndThirdParty=Tạo vé (và bên thứ ba nếu cần thiết)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Mã kết quả mới nhất
 NbOfEmailsInInbox=Số lượng email trong thư mục nguồn
 LoadThirdPartyFromName=Tải tìm kiếm bên thứ ba trên %s (chỉ tải)
 LoadThirdPartyFromNameOrCreate=Tải tìm kiếm bên thứ ba trên %s (tạo nếu không tìm thấy)
-WithDolTrackingID=Tham chiếu Dolibarr được tìm thấy trong ID tin nhắn
-WithoutDolTrackingID=Tham chiếu Dolibarr không tìm thấy trong ID tin nhắn
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Mã mục nhập menu (mainmenu)
 ECMAutoTree=Hiển thị cây ECM tự động
@@ -1981,7 +2002,7 @@ ImportSetup=Thiết lập module nhập liệu
 InstanceUniqueID=ID duy nhất của đối tượng
 SmallerThan=Nhỏ hơn
 LargerThan=Lớn hơn
-IfTrackingIDFoundEventWillBeLinked=Lưu ý rằng nếu tìm thấy ID theo dõi trong email đến, sự kiện sẽ được tự động liên kết với các đối tượng liên quan.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=Với tài khoản GMail, nếu bạn đã bật xác thực 2 bước, bạn nên tạo mật khẩu thứ hai dành riêng cho ứng dụng thay vì sử dụng mật khẩu tài khoản của riêng bạn từ 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=Bạn có thể sử dụng hành động này để sử dụng nội dung email để tìm và tải một bên thứ ba hiện có trong cơ sở dữ liệu của bạn. Phần thứ ba được tìm thấy (hoặc được tạo) sẽ được sử dụng cho các hành động sau đây cần nó. Trong trường tham số, bạn có thể sử dụng ví dụ 'EXTRACT: BODY: Name: \\ s ([^ \\ s] *)' nếu bạn muốn trích xuất tên của bên thứ ba từ một chuỗi 'Name: name to find' được tìm thấy trong phần nội dung
@@ -2005,3 +2026,7 @@ RssNote=Lưu ý: Mỗi nguồn cấp RSS cung cấp một tiện ích mà bạn
 JumpToBoxes=Chuyển tới  Thiết lập --> Widgets
 MeasuringUnitTypeDesc=Sử dụng ở đây một giá trị như "kích thước", "diện tích", "khối lượng", "trọng lượng", "thời gian"
 MeasuringScaleDesc=Thang đo là số vị trí bạn phải di chuyển phần thập phân để khớp với đơn vị tham chiếu mặc định. Đối với loại đơn vị "thời gian", đó là số giây. Giá trị từ 80 đến 99 là giá trị dành riêng.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index 9e9a1adf3a3..c8e17edbe45 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Số sự kiện
 ListOfActions=Danh sách các sự kiện
 EventReports=Báo cáo sự kiện
 Location=Địa phương
-ToUserOfGroup=Cho bất kỳ người dùng nào trong nhóm
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Tất cả sự kiện
 MenuToDoActions=Tất cả sự kiện chưa xong
 MenuDoneActions=Tất cả sự kiện đã chấm dứt
@@ -86,6 +86,8 @@ ProposalDeleted=Đề xuất đã bị xóa
 OrderDeleted=Đã xóa đơn hàng
 InvoiceDeleted=Hóa đơn đã bị xóa
 DraftInvoiceDeleted=Hoá đơn dự thảo đã được xoá
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Sản phẩm %s được tạo
 PRODUCT_MODIFYInDolibarr=Sản phẩm %s được sửa đổi
 PRODUCT_DELETEInDolibarr=Đã xóa sản phẩm %s
@@ -158,3 +160,9 @@ DateStartPlusOne=Ngày bắt đầu + 1 giờ
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index c2c515e133a..a92b40fb524 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Đơn đặt hàng của nhà cung cấp: %
 BoxTitleLastModifiedCustomerBills=Hóa đơn khách hàng: %s được sửa đổi lần cuối
 BoxTitleLastModifiedCustomerOrders=Đơn đặt hàng bán: %s được sửa đổi lần cuối
 BoxTitleLastModifiedPropals=Đề xuất sửa đổi %s mới nhất
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Khách hàng hoá đơn
 ForCustomersOrders=Khách hàng đặt hàng
 ForProposals=Đề xuất
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Tài khoản bị đình chỉ không được xác đ
 BoxLastCustomerShipments=Lô hàng cuối cùng của khách hàng
 BoxTitleLastCustomerShipments=Lô hàng mới nhất của khách hàng %s
 NoRecordedShipments=Không ghi nhận lô hàng của khách hàng
+# Pages
+AccountancyHome=Kế toán
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index 5caee8d95c7..b71e1adb3c9 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=Mô-đun POS
 BasicPhoneLayout=Sử dụng bố trí cơ bản cho điện thoại
 SetupOfTerminalNotComplete=Thiết lập đầu cuối %s chưa hoàn tất
 DirectPayment=Thanh toán trực tiếp
-DirectPaymentButton=Nút thanh toán tiền mặt trực tiếp
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Hóa đơn đã được xác nhận
 NoLinesToBill=Không có dòng hóa đơn
 CustomReceipt=Biên nhận tùy chỉnh
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=Module ngoài với các tính năng bổ sung
 PrintMethod=Phương pháp in
 ReceiptPrinterMethodDescription=Phương pháp mạnh mẽ với rất nhiều thông số. Hoàn toàn tùy biến với các mẫu. Không thể in từ đám mây.
 ByTerminal=Bởi cổng
-TakeposNumpadUsePaymentIcon=Sử dụng biểu tượng thanh toán trên numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b>được sử dụng để thêm số thiết bị đầu cuối
 TakeposGroupSameProduct=Nhóm sản phẩm cùng dòng
 StartAParallelSale=Bắt đầu bán hàng mới
-ControlCashOpening=Kiểm soát hộp tiền mặt khi mở pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Báo cáo tiền mặt
 MainPrinterToUse=Máy in chính để dùng
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index 7ac83c9969b..f1cc23cf244 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Thuế xã hội hoặc tài chính
 SocialContributions=Thuế xã hội hoặc tài chính
 SocialContributionsDeductibles=Khấu trừ thuế xã hội hoặc tài khóa
 SocialContributionsNondeductibles=Thuế xã hội hoặc tài chính không được khấu trừ
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Nhãn đóng góp
 TypeContrib=Loại đóng góp
 MenuSpecialExpenses=Chi phí đặc biệt
@@ -255,10 +256,12 @@ TurnoverbyVatrate=Doanh thu được lập hóa đơn theo thuế suất bán h
 TurnoverCollectedbyVatrate=Doanh thu được thu thập theo thuế suất bán hàng
 PurchasebyVatrate=Mua theo thuế suất bán hàng
 LabelToShow=Nhãn ngắn
-PurchaseTurnover=Purchase turnover
-PurchaseTurnoverCollected=Purchase turnover collected
+PurchaseTurnover=Doanh số hàng mua
+PurchaseTurnoverCollected=Doanh số hàng mua
 RulesPurchaseTurnoverDue=- It includes the supplier's due invoices whether they are paid or not. <br>- It is based on the invoice date of these invoices.<br>
 RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices done to suppliers.<br>- It is based on the payment date of these invoices<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
-ReportPurchaseTurnover=Purchase turnover invoiced
-ReportPurchaseTurnoverCollected=Purchase turnover collected
+RulesPurchaseTurnoverTotalPurchaseJournal=Nó bao gồm tất cả các dòng ghi nợ từ nhật ký
+ReportPurchaseTurnover=Doanh số hàng mua đã ra hoá đơn
+ReportPurchaseTurnoverCollected=Doanh số hàng mua đã tập hợp
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang
index 7645ca96aec..182bb2d67fc 100644
--- a/htdocs/langs/vi_VN/contracts.lang
+++ b/htdocs/langs/vi_VN/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Dịch vụ đang hoạt động
 MenuExpiredServices=Dịch vụ đã hết hạn
 MenuClosedServices=Dịch vụ đã đóng
 NewContract=Hợp đồng mới
-NewContractSubscription=Hợp đồng/ thuê bao mới
+NewContractSubscription=New contract or subscription
 AddContract=Tạo hợp đồng
 DeleteAContract=Xóa hợp đồng
 ActivateAllOnContract=Kích hoạt toàn bộ dịch vụ
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 0c468dc48e3..5c97da8e340 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=Giá trị mới không thể bằng cũ
 ErrorFailedToValidatePasswordReset=Không thể reinit mật khẩu. Có thể là reinit đã được thực hiện (liên kết này có thể được sử dụng một lần duy nhất). Nếu không, hãy thử khởi động lại quá trình reinit.
 ErrorToConnectToMysqlCheckInstance=Kết nối với cơ sở dữ liệu không thành công. Kiểm tra máy chủ cơ sở dữ liệu đang chạy (ví dụ: với mysql / mariadb, bạn có thể khởi chạy nó từ dòng lệnh với 'sudo service mysql start').
 ErrorFailedToAddContact=Không thể thêm số điện thoại
-ErrorDateMustBeBeforeToday=Ngày không thể lớn hơn ngày hôm nay
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=Một phương thức thanh toán đã được thiết lập để gõ% s nhưng thiết lập các mô-đun hóa đơn không được hoàn thành để xác định thông tin để hiển thị cho phương thức thanh toán này.
 ErrorPHPNeedModule=Lỗi, PHP của bạn phải có <b>mô-đun% s</b> được cài đặt để sử dụng tính năng này.
 ErrorOpenIDSetupNotComplete=Bạn thiết lập Dolibarr tập tin cấu hình để cho phép xác thực OpenID, nhưng URL của dịch vụ OpenID không được xác định vào liên tục% s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Số lượng không đủ
 ErrorOnlyOneFieldForGroupByIsPossible=Chỉ có 1 trường được Nhóm bởi là có thể (các trường khác không phù hợp)
 ErrorTooManyDifferentValueForSelectedGroupBy=Tìm thấy rất nhiều giá trị khác nhau (hơn một <b>%s</b>) cho trường ' <b>%s</b>', nên chúng tôi không thể tạo nó như một 'Nhóm' cho Biểu đồ. Trường 'Nhóm bởi' đã được xóa. Có phải bạn muốn tạo nó cho trục X?
 ErrorReplaceStringEmpty=Lỗi, cụm từ để thay thế đang trống
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Tham số PHP của bạn upload_max_filesize (%s) cao hơn tham số PHP post_max_size (%s). Đây không phải là một thiết lập phù hợp.
 WarningPasswordSetWithNoAccount=Một mật khẩu đã được đặt cho thành viên này. Tuy nhiên, không có tài khoản người dùng nào được tạo. Vì vậy, mật khẩu này được lưu trữ nhưng không thể được sử dụng để đăng nhập vào Dolibarr. Nó có thể được sử dụng bởi một mô-đun / giao diện bên ngoài nhưng nếu bạn không cần xác định bất kỳ thông tin đăng nhập hay mật khẩu nào cho thành viên, bạn có thể tắt tùy chọn "Quản lý đăng nhập cho từng thành viên" từ thiết lập mô-đun Thành viên. Nếu bạn cần quản lý thông tin đăng nhập nhưng không cần bất kỳ mật khẩu nào, bạn có thể để trống trường này để tránh cảnh báo này. Lưu ý: Email cũng có thể được sử dụng làm thông tin đăng nhập nếu thành viên được liên kết với người dùng.
diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang
index f275ef25a2f..78ad1328ac4 100644
--- a/htdocs/langs/vi_VN/languages.lang
+++ b/htdocs/langs/vi_VN/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Ả Rập
 Language_ar_EG=Ả Rập (Ai Cập)
 Language_ar_SA=Ả Rập
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Tiếng Bengal
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bungari
 Language_bs_BA=Bosnia
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=Anh (Vương quốc Anh)
 Language_en_IN=Anh (Ấn Độ)
 Language_en_NZ=Anh (New Zealand)
 Language_en_SA=Anh (Ả rập Saudi)
+Language_en_SG=English (Singapore)
 Language_en_US=Anh (Hoa Kỳ)
 Language_en_ZA=Anh (Nam Phi)
 Language_es_ES=Tây Ban Nha
@@ -29,6 +33,7 @@ Language_es_CL=Tây Ban Nha (Chile)
 Language_es_CO=Tây Ban Nha (Colombia)
 Language_es_DO=Tây Ban Nha (Cộng hòa Dominica)
 Language_es_EC=Tây Ban Nha (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Tây Ban Nha (Honduras)
 Language_es_MX=Tây Ban Nha (Mexico)
 Language_es_PA=Tây Ban Nha (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Tây Ban Nha (Paraguay)
 Language_es_PE=Tây Ban Nha (Peru)
 Language_es_PR=Tây Ban Nha (Puerto Rico)
 Language_es_UY=Tây Ban Nha (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Tây Ban Nha (Venezuela)
 Language_et_EE=Tiếng Estonia
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Phần Lan
 Language_fr_BE=Pháp (Bỉ)
 Language_fr_CA=Pháp (Canada)
 Language_fr_CH=Pháp (Thụy Sĩ)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=Pháp
+Language_fr_GA=French (Gabon)
 Language_fr_NC=Pháp (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Do Thái
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatia
 Language_hu_HU=Hungary
 Language_id_ID=Indonesia
 Language_is_IS=Iceland
 Language_it_IT=Ý
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Nhật Bản
 Language_ka_GE=Gruzia
 Language_km_KH=Tiếng Khmer
@@ -64,8 +77,9 @@ Language_lv_LV=Latvia
 Language_mk_MK=Macedonian
 Language_mn_MN=Mông Cổ
 Language_nb_NO=Na Uy (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Hà Lan (Bỉ)
-Language_nl_NL=Dutch
+Language_nl_NL=Hà Lan
 Language_pl_PL=Ba Lan
 Language_pt_BR=Bồ Đào Nha (Brazil)
 Language_pt_PT=Bồ Đào Nha
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Việt
 Language_zh_CN=Trung Quốc
 Language_zh_TW=Trung Quốc (truyền thống)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Mã Lai
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 2ebdc7e1185..200b7eae30b 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -164,7 +164,11 @@ NoContactWithCategoryFound=Không có liên lạc/địa chỉ với một danh
 NoContactLinkedToThirdpartieWithCategoryFound=Không có liên lạc/địa chỉ với một danh mục được tìm thấy
 OutGoingEmailSetup=Thiết lập email đi
 InGoingEmailSetup=Thiết lập email đến
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetupForEmailing=Thiết lập email gửi đi (cho module %s)
 DefaultOutgoingEmailSetup=Thiết lập email gửi đi mặc định
 Information=Thông tin
 ContactsWithThirdpartyFilter=Danh bạ với bộ lọc của bên thứ ba
+Unanswered=Unanswered
+Answered=Đã trả lời
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index cb51c13d006..00071856294 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=Đơn giá (gồm thuế)
 Amount=Số tiền
 AmountInvoice=Số tiền hóa đơn
 AmountInvoiced=Số tiền đã xuất hóa đơn
-AmountInvoicedHT=Số tiền (gồm thuế)
-AmountInvoicedTTC=Số tiền (chưa gồm thuế)
+AmountInvoicedHT=Số tiền (chưa gồm thuế)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Số tiền thanh toán
 AmountHTShort=Số tiền (không bao gồm)
 AmountTTCShort=Số tiền (gồm thuế)
@@ -485,6 +485,7 @@ Categories=Gán thẻ/phân nhóm
 Category=Gán thẻ/phân nhóm
 By=Theo
 From=Từ
+FromDate=Từ
 FromLocation=Từ
 to=đến
 To=đến
@@ -687,6 +688,7 @@ Method=Phương pháp
 Receive=Nhận
 CompleteOrNoMoreReceptionExpected=Hoàn thành hoặc không mong đợi gì hơn
 ExpectedValue=Gia trị được ki vọng
+ExpectedQty=Expected Qty
 PartialWoman=Một phần
 TotalWoman=Tổng
 NeverReceived=Chưa từng nhận
@@ -703,6 +705,7 @@ MenuECM=Chứng từ
 MenuAWStats=AWStats
 MenuMembers=Thành viên
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Giới hạn của Dolibarr (Thực đơn Nhà-Thiết lập-Bảo mật): %s Kb, giới hạn của PHP: %s Kb
 NoFileFound=Không có chứng từ được lưu trong thư mục này
 CurrentUserLanguage=Ngôn ngữ hiện tại
@@ -725,7 +728,7 @@ Page=Trang
 Notes=Ghi chú
 AddNewLine=Thêm dòng mới
 AddFile=Thêm tập tin
-FreeZone=Một Sản phẩm/ dịch vụ không được xác định trước
+FreeZone=Free-text product
 FreeLineOfType=Văn bản tự do, loại:
 CloneMainAttributes=Nhân bản đối tượng và các thuộc tính chính của nó
 ReGeneratePDF=Tạo lại PDF
@@ -942,6 +945,39 @@ ShortThursday=N
 ShortFriday=S
 ShortSaturday=B
 ShortSunday=C
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Chọn một mẫu email
 SetRef=Đặt tham chiếu
 Select2ResultFoundUseArrows=Một số kết quả được tìm thấy. Sử dụng mũi tên để chọn.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Mở sang chế độ chỉnh sửa và thêm b
 NotUsedForThisCustomer=Không sử dụng cho khách hàng này
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Thông tin
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 4053675831d..6d197a30427 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -81,7 +81,7 @@ DeleteType=Xóa
 VoteAllowed=Bình chọn cho phép
 Physical=Vật lý
 Moral=Đạo đức
-MorPhy=Đạo đức / Vật lý
+MorPhy=Tự nhiên
 Reenable=Bật lại
 ResiliateMember=Chấm dứt thành viên
 ConfirmResiliateMember=Bạn có chắc chắn muốn chấm dứt thành viên này?
diff --git a/htdocs/langs/vi_VN/mrp.lang b/htdocs/langs/vi_VN/mrp.lang
index d7cbd41eb33..5e79c6e8c6e 100644
--- a/htdocs/langs/vi_VN/mrp.lang
+++ b/htdocs/langs/vi_VN/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Đơn đặt hàng sản xuất
 MO=Đơn hàng sản xuất
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=Khu vực MRP
 MrpSetupPage=Thiết lập mô-đun MRP
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index e49834bd3b5..a5a94478621 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__ (Xin chào) __ \nVui lòng tìm đơn
 PredefinedMailContentSendSupplierInvoice=__ (Xin chào) __ \n\nVui lòng tìm hóa đơn __REF__ đính kèm \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__ (Xin chào) __ \n\nVui lòng tìm vận chuyển __REF__ đính kèm \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__ (Xin chào) __ \n\nVui lòng tìm sự can thiệp __REF__ đính kèm \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__ (Xin chào) __ \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__ (Xin chào) __ \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__ (Xin chào) __ \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
 PredefinedMailContentLink=Bạn có thể nhấp vào liên kết bên dưới để thực hiện thanh toán nếu chưa được thực hiện.\n\n %s\n\n
+PredefinedMailContentGeneric=__ (Xin chào) __ \n\n\n__ (Trân trọng) __ \n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr là một ERP / CRM nhỏ gọn hỗ trợ một số mô-đun kinh doanh. Một bản demo giới thiệu tất cả các mô-đun không có ý nghĩa vì kịch bản này không bao giờ xảy ra (có sẵn hàng trăm). Vì vậy, một số hồ sơ demo là có sẵn.
 ChooseYourDemoProfil=Chọn hồ sơ demo phù hợp nhất với nhu cầu của bạn ...
 ChooseYourDemoProfilMore=... hoặc xây dựng hồ sơ của riêng bạn <br> (lựa chọn mô-đun thủ công)
@@ -280,7 +278,9 @@ LinesToImport=Dòng để nhập
 
 MemoryUsage=Sử dụng bộ nhớ
 RequestDuration=Thời hạn yêu cầu
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Sản phẩm/Dịch vụ phổ biến trong Đơn đề xuất
 PopuCom=Sản phẩm/dịch vụ phổ biến trong Đơn hàng
 ProductStatistics=Thống kê sản phẩm/dịch vụ
 NbOfQtyInOrders=Số lượng đã đặt hàng
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 5373ae2f2d1..452477dd2a9 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Đặt loại mã vạch
 BarcodeValue=Giá trị mã vạch
 NoteNotVisibleOnBill=Ghi chú (không hiển thị trên hóa đơn, đơn hàng đề xuất ...)
 ServiceLimitedDuration=Nếu sản phẩm là một dịch vụ có giới hạn thời gian:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Nhiều phân khúc giá cho mỗi sản phẩm/ dịch vụ (mỗi khách hàng một phân khúc giá)
 MultiPricesNumPrices=Số lượng Giá
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Giá nhà cung cấp (của sản phẩm ho
 CustomCode=Hải quan / Hàng hóa / HS code
 CountryOrigin=Nước xuất xứ
 Nature=Loại sản phẩm  (nguyên liệu / thành phẩm)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Nhãn ngắn
 Unit=Đơn vị
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Chọn kết hợp
 ProductCombinationGenerator=Tạo ra biến thể
 Features=Các tính năng
 PriceImpact=Tác động giá
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Tác động trọng số
 NewProductAttribute=Thuộc tính mới
 NewProductAttributeValue=Giá trị thuộc tính mới
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 4d582f1bed6..66a08436bc7 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Cộng sự
 TypeContact_project_task_external_TASKCONTRIBUTOR=Cộng sự
 SelectElement=Chọn yếu tố
 AddElement=Liên kết đến yếu tố
+LinkToElementShort=Liên kết đến
 # Documents models
 DocumentModelBeluga=Mẫu tài liệu dự án cho các đối tượng tổng quát có liên quan
 DocumentModelBaleine=Mẫu tài liệu dự án cho các nhiệm vụ
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=Số  lượng dự án được tạo theo tháng
 ProjectNbTaskByMonth=Số lượng nhiệm vụ được tạo theo tháng
 ProjectOppAmountOfProjectsByMonth=Số lượng khách hàng tiềm năng theo tháng
 ProjectWeightedOppAmountOfProjectsByMonth=Số tiền khách hàng tiềm năng có trọng số theo tháng
-ProjectOpenedProjectByOppStatus=Mở Dự án/ khách hàng tiềm năng theo trạng thái tiềm năng
-ProjectsStatistics=Thống kê dự án/ khách hàng tiềm năng
-TasksStatistics=Thống kê các nhiệm vụ trên dự án/ khách hàng tiềm năng
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Nhiệm vụ được giao. Nhập thời gian vào nhiệm vụ này là có thể.
 IdTaskTime=ID Thời gian nhiệm vụ
 YouCanCompleteRef=Nếu bạn muốn hoàn thành tham chiếu này với một số hậu tố, bạn nên thêm một ký tự để tách nó, vì vậy việc đánh số tự động vẫn sẽ hoạt động chính xác cho các dự án tiếp theo. Ví dụ: %s-MYSUFFIX
diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang
index 2a99f2a5577..a9e808d9f5a 100644
--- a/htdocs/langs/vi_VN/propal.lang
+++ b/htdocs/langs/vi_VN/propal.lang
@@ -85,3 +85,7 @@ ProposalCustomerSignature=Văn bản chấp nhận, dấu công ty, ngày và ch
 ProposalsStatisticsSuppliers=Thống kê đề xuất nhà cung cấp
 CaseFollowedBy=Theo bởi trường hợp
 SignedOnly=Signed only
+IdProposal=ID đề xuất
+IdProduct=ID sản phẩm
+PrParentLine=Dòng mẹ đề xuất
+LineBuyPriceHT=Giá mua Số lượng ròng của thuế cho dòng
diff --git a/htdocs/langs/vi_VN/recruitment.lang b/htdocs/langs/vi_VN/recruitment.lang
new file mode 100644
index 00000000000..463f8e555cb
--- /dev/null
+++ b/htdocs/langs/vi_VN/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Cài đặt
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = Về
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 40d651f7056..4b5a2a57249 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Xóa gửi
 Stock=Tồn kho
 Stocks=Tồn kho
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Tồn kho theo lô / sê-ri
@@ -95,14 +95,16 @@ RealStock=Tồn kho thực
 RealStockDesc=Vật lý/ tồn kho thực là tồn kho hiện tại trong kho.
 RealStockWillAutomaticallyWhen=Tồn kho thực sẽ được sửa đổi theo quy tắc này (như được xác định trong mô-đun Tồn kho):
 VirtualStock=Tồn kho ảo
-VirtualStockDesc=Tồn kho ảo là tồn kho được tính toán khả dụng khi tất cả các hành động mở/đang chờ xử lý (ảnh hưởng đến tồn kho) được đóng (đơn đặt hàng đã nhận, đơn đặt hàng được giao, v.v.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Mã kho
 DescWareHouse=Mô tả kho
 LieuWareHouse=Địa phương hóa kho
 WarehousesAndProducts=Các kho hàng và sản phẩm
 WarehousesAndProductsBatchDetail=Kho và sản phẩm (với chi tiết mỗi lô /sê-ri)
-AverageUnitPricePMPShort=Trọng giá đầu vào trung bình
-AverageUnitPricePMP=Trọng giá đầu vào trung bình
+AverageUnitPricePMPShort=Giá bình quân gia quyền
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Đơn giá bán
 EstimatedStockValueSellShort=Giá trị bán
 EstimatedStockValueSell=Giá trị bán
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s)
 NbOfProductAfterPeriod=Số lượng sản phẩm% s trong kho sau khi được lựa chọn thời gian (>% s)
 MassMovement=Chuyển kho toàn bộ
-SelectProductInAndOutWareHouse=Chọn một sản phẩm, một số lượng lớn, kho nguồn và một kho hàng mục tiêu, sau đó nhấp vào "% s". Một khi điều này được thực hiện với mọi hoạt động cần thiết, kích vào "% s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Chuyển bản ghi
 ReceivingForSameOrder=Biên nhận cho đơn đặt hàng này
 StockMovementRecorded=Chuyển động kho được ghi nhận
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index 832877e7dfd..d9b48630c61 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Chất lượng thấp
 ReputationForThisProduct=Uy tín
 BuyerName=Tên người mua
 AllProductServicePrices=Tất cả giá sản phẩm/ dịch vụ
-AllProductReferencesOfSupplier=Tất cả các tham chiếu sản phẩm/ dịch vụ của nhà cung cấp
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Giá nhà cung cấp
diff --git a/htdocs/langs/vi_VN/ticket.lang b/htdocs/langs/vi_VN/ticket.lang
index fef6c82773c..ea5424e4654 100644
--- a/htdocs/langs/vi_VN/ticket.lang
+++ b/htdocs/langs/vi_VN/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Đã xóa
 
 # Dict
 Type=Loại
-Category=Mã phân tích
 Severity=Mức độ nghiêm trọng
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Tự động chỉ định người dùng đã tạo vé
 TicketsAutoAssignTicketHelp=Khi tạo vé, người dùng có thể được tự động chỉ định cho vé.
 TicketNumberingModules=Mô-đun đánh số vé
 TicketNotifyTiersAtCreation=Thông báo cho bên thứ ba khi tạo
-TicketGroup=Nhóm
 TicketsDisableCustomerEmail=Luôn vô hiệu hóa email khi vé được tạo từ giao diện công cộng
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Được tạo bởi
 NewTicket=Vé mới
 SubjectAnswerToTicket=Trả lời vé
 TicketTypeRequest=Loại yêu cầu
-TicketCategory=Mã phân tích
+TicketCategory=Nhóm
 SeeTicket=Xem vé
 TicketMarkedAsRead=Vé đã được đánh dấu là đã đọc
 TicketReadOn=Đọc tiếp
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 97c911d59d0..9297c08b76f 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=Người dùng tạo ra sẽ là một người dùng bê
 IdPhoneCaller=Id người gọi điện thoại
 NewUserCreated=Người dùng %s được tạo
 NewUserPassword=Thay đổi mật khẩu cho %s
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=Người dùng %s đã chỉnh sửa
 UserDisabled=Người dùng %s đã bị vô hiệu hóa
 UserEnabled=Người dùng %s đã được kích hoạt
@@ -107,11 +108,13 @@ DisabledInMonoUserMode=Vô hiệu hóa trong chế độ bảo trì
 UserAccountancyCode=Mã kế toán của người dùng
 UserLogoff=Người dùng đăng xuất
 UserLogged=Người dùng đăng nhập
+DateOfEmployment=Employment date
 DateEmployment=Ngày bắt đầu làm việc
 DateEmploymentEnd=Ngày kết thúc việc làm
 CantDisableYourself=Bạn không thể vô hiệu hóa hồ sơ người dùng của bạn
 ForceUserExpenseValidator=Thúc phê duyệt báo cáo chi phí
 ForceUserHolidayValidator=Thúc phê duyệt báo cáo chi phí
 ValidatorIsSupervisorByDefault=Theo mặc định, việc xác nhận là người giám sát của người dùng. Giữ trống để giữ hành vi này.
-UserPersonalEmail=Personal email
-UserPersonalMobile=Personal mobile phone
+UserPersonalEmail=Email cá nhân
+UserPersonalMobile=Số di động
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index 1462f35f30d..c3e19547427 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Lệnh ghi nợ trực tiếp
 WithdrawalReceipt=Lệnh ghi nợ trực tiếp
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Tệp ghi nợ trực tiếp mới nhất %s 
@@ -63,7 +63,9 @@ InvoiceRefused=Hóa đơn từ chối (Tính phí từ chối cho khách hàng)
 StatusDebitCredit=Tình trạng ghi nợ / tín dụng
 StatusWaiting=Chờ
 StatusTrans=Gửi
+StatusDebited=Debited
 StatusCredited=Tín dụng
+StatusPaid=Đã trả
 StatusRefused=Từ chối
 StatusMotif0=Không xác định
 StatusMotif1=Không đủ tiền
@@ -77,13 +79,13 @@ StatusMotif8=Lý do khác
 CreateForSepaFRST=Tạo tệp ghi nợ trực tiếp (SEPA FRST)
 CreateForSepaRCUR=Tạo tệp ghi nợ trực tiếp (SEPA RCUR)
 CreateAll=Tạo tệp ghi nợ trực tiếp (tất cả)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Chỉ văn phòng
 CreateBanque=Chỉ ngân hàng
 OrderWaiting=Chờ xử lý
-NotifyTransmision=Rút tiền chuyển
-NotifyCredit=Rút tiền tín dụng
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=Con số chuyển lệnh quốc gia
 WithBankUsingRIB=Đối với tài khoản ngân hàng sử dụng RIB
 WithBankUsingBANBIC=Đối với tài khoản ngân hàng sử dụng IBAN / BIC / SWIFT
@@ -93,9 +95,10 @@ CreditDate=Tín dụng vào
 WithdrawalFileNotCapable=Không thể tạo file biên lai rút tiền cho quốc gia của bạn %s (Quốc gia của bạn không được hỗ trợ)
 ShowWithdraw=Hiển thị lệnh ghi nợ trực tiếp
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuy nhiên, nếu hóa đơn có ít nhất một lệnh thanh toán ghi nợ trực tiếp chưa được xử lý, nó sẽ không được đặt thành thanh toán để cho phép quản lý rút tiền trước đó.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Tệp tin rút tiền
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Đặt thành trạng thái "Đã gửi tệp"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Thống kê theo trạng thái của dòng
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Hình thức thanh toán
 ModeRECUR=Thanh toán định kỳ
 ModeFRST=Thanh toán một lần
 PleaseCheckOne=Vui lòng chỉ một séc
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Lệnh ghi nợ trực tiếp %s đã được tạo
 AmountRequested=Số tiền yêu cầu
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Số tiền: %s <br> Phương pháp: %s <br> Ngày: %s
 InfoRejectSubject=Lệnh thanh toán ghi nợ trực tiếp bị từ chối
 InfoRejectMessage=Xin chào, <br><br> lệnh thanh toán ghi nợ trực tiếp của hóa đơn %s liên quan đến công ty %s, với số tiền %s đã bị ngân hàng từ chối. <br><br> - <br> %s
 ModeWarning=Tùy chọn cho chế độ thực không được đặt, chúng tôi dừng lại sau mô phỏng này
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/vi_VN/workflow.lang b/htdocs/langs/vi_VN/workflow.lang
index b95352d0a54..0084de738c3 100644
--- a/htdocs/langs/vi_VN/workflow.lang
+++ b/htdocs/langs/vi_VN/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Phân loại đơn đặt hàng bá
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Phân loại đề xuất nhà cung cấp nguồn được liên kết là đã xuất hóa đơn khi hóa đơn của nhà cung cấp được xác nhận (và nếu số tiền hóa đơn giống với tổng số tiền của đề xuất được liên kết)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Phân loại đơn đặt hàng mua nguồn được liên kết là đã xuất hóa đơn khi hóa đơn của nhà cung cấp được xác nhận (và nếu số tiền hóa đơn giống với tổng số tiền của đơn hàng được liên kết)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Tạo tự động
 AutomaticClassification=Phân loại tự động
diff --git a/htdocs/langs/vi_VN/zapier.lang b/htdocs/langs/vi_VN/zapier.lang
index 33d5ee1fd5a..bbb899dd004 100644
--- a/htdocs/langs/vi_VN/zapier.lang
+++ b/htdocs/langs/vi_VN/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Mô-đun Zapier cho Dolibarr
 # Admin page
 #
 ZapierForDolibarrSetup = Thiết lập Zapier cho Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index c806a1dfa77..1a235bd6572 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=禁止在银行帐户中直接记录交易
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日记帐上启用草稿导出
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=销售日记帐
 ACCOUNTING_PURCHASE_JOURNAL=采购日记帐
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=未调解
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=应用批量类别
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=会计科目的类别已被删除
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index c6ebf2a27a4..be82a61b831 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=用户邮箱
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=功能在 Unix 类系统下不可用。请在本地测试您的sendmail程序。
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=如果您发现当前语言的翻译不完整或有误，您可以通过编辑 <b>langs/%s</b> 文件更正它，并将修改后的文件提交至  www.transifex.com/dolibarr-association/dolibarr/（或者提交至QQ群：206239089）
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=模块设置
 ModulesSetup=模块设置
 ModuleFamilyBase=系统
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=必须先行激活启用 <b>%s</b> 模块如果你需
 SecurityToken=保护URL链接的密钥
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF格式
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=销售税/增值税规则
 PDFLocaltax=%s的规则
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=设置了基本参考价值的产品的价格
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=字符串
+String1Line=String (1 line)
 TextLong=长文本
+TextLongNLines=Long text (n lines)
 HtmlText=Html文字
 Int=整型
 Float=浮点型
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=条码
 Module55Desc=条码管理
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=网络电话
 Module58Desc=网络电话系统集成(Asterisk ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=创建/变更服务
 Permission534=删除服务
 Permission536=查看/隐藏服务管理
 Permission538=导出服务
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=读取捐款资料
 Permission702=创建/变更捐款资料
 Permission703=删除捐款资料
@@ -848,6 +858,8 @@ Permission773=删除费用报表
 Permission774=读取所有费用报表(即使用户没有下属)
 Permission775=批准费用报表
 Permission776=支付费用报表
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=导出费用报表
 Permission1001=读取库存信息
 Permission1002=创建/变更仓库
@@ -900,6 +912,7 @@ Permission2515=设置文档目录
 Permission2801=允许FTP客户端读取(仅供浏览和下载)
 Permission2802=允许FTP客户端写入(删除和上传文件)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=删除资源
 Permission63004=将资源链接到议程事件
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=潜在的准客户
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=地区
 DictionaryCountry=国家
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=单位
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=社交网络
-DictionaryProspectStatus=准客户状态
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=费用报告 - 运输类别
@@ -1076,7 +1091,7 @@ LoginPage=登录页面
 BackgroundImageLogin=背景图
 PermanentLeftSearchForm=常驻左侧菜单搜寻框
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=公司/组织
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=至少对于密钥或翻译字符串，
 NewTranslationStringToShow=显示新翻译字符串
 OriginalValueWas=原始翻译被覆盖。原值是：<br> <br> %s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=启用的功能模块总共: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=您必须至少启用 1 个模块
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=是(在夏天)
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=选择菜单议程时，您希望在默认情况下打开哪个选项卡
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=<b>通过电子邮件</b>启用事件提醒（可以在每个事件上定义提醒选项/延迟）。注意：必须启用模块<strong> %s </strong>并正确设置才能以正确的频率发送提醒。
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=启用声音通知
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=将链接对象显示在议程视图中
 ##### Clicktodial #####
 ClickToDialSetup=点击拨号模块设置
 ClickToDialUrlDesc=当点击手机图片完成时，网址会被呼叫。在网址中，您可以使用标记为<br> <b> __ PHONETO __ </b>，这些标记将替换为要拨打电话号码的人员的电话号码<br><b> __ PHONEFROM __ </b>将替换为通话电话号码person（你的）<br> <b> __ LOGIN __</b>将替换为clicktodial登录（在用户卡上定义）<br> <b> __ PASS __ </b>将替换为clicktodial密码（在用户上定义）卡）。
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=在电话号码上链接 "tel:"
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=该字段包含标识行的引用。输入您选择的任何值，
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=RGB颜色采用HEX格式，例如：FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=行位置到组合列表中
 SellTaxRate=消费税率
 RecuperableOnly=适用于法国某些州的增值税“Not Perceived but Recoverable”是的。在所有其他情况下，将值保持为“否”。
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=报价请求
 MailToSendSupplierOrder=订单
 MailToSendSupplierInvoice=供应商发票
 MailToSendContract=合同
+MailToSendReception=Receptions
 MailToThirdparty=合作方
 MailToMember=会员
 MailToUser=用户
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP＆CRM %s可用。版本%s是一
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=产品文件模板
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=有关可能的替换变量列表，请参阅* note
 SeeChangeLog=请参阅ChangeLog文件（仅英文）
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=PDF的左边距
 MAIN_PDF_MARGIN_RIGHT=PDF的右边距
 MAIN_PDF_MARGIN_TOP=PDF的上边距
 MAIN_PDF_MARGIN_BOTTOM=PDF的底部边距
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=如果此组是其他组的计算，则将此值设置为yes
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=邮编
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index dc5052e0cb2..0537baf6b02 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=事件数
 ListOfActions=事件列表
 EventReports=活动报告
 Location=位置
-ToUserOfGroup=到组内任何用户
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=全天事件
 MenuToDoActions=所有未完成的事件
 MenuDoneActions=所有终止事件
@@ -86,6 +86,8 @@ ProposalDeleted=报价已删除
 OrderDeleted=订单已删除
 InvoiceDeleted=发票已删除
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=产品%s已创建
 PRODUCT_MODIFYInDolibarr=产品%s改装
 PRODUCT_DELETEInDolibarr=产品%s已删除
@@ -158,3 +160,9 @@ DateStartPlusOne=日期开始+ 1 小时
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index ef7f1c2f95b..99c36d31a7c 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=最近登记的 %s 位供应商
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=最近的 %s 位客户或准客户
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=新进 %s 位会员
 BoxTitleLastFicheInter=最近变更的 %s 条干预
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=最近变更的 %s 份报价
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=客户发票
 ForCustomersOrders=客户订单
 ForProposals=报价
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=会计
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index 93498cb81b1..4ddbad3d082 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index a861221bd87..6372c1186e3 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=社会或财政税
 SocialContributions=社会或财政税
 SocialContributionsDeductibles=免赔额的社会或财政税
 SocialContributionsNondeductibles=不可扣除的社会或财政税
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=标签贡献
 TypeContrib=类型贡献
 MenuSpecialExpenses=其他费用
@@ -262,3 +263,5 @@ RulesPurchaseTurnoverIn=- It includes all the effective payments of invoices don
 RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the purchase journal.
 ReportPurchaseTurnover=Purchase turnover invoiced
 ReportPurchaseTurnoverCollected=Purchase turnover collected
+IncludeVarpaysInResults = Include various payments in reports
+IncludeLoansInResults = Include loans in reports
diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang
index 927f4409a72..3bfdaae8fb7 100644
--- a/htdocs/langs/zh_CN/contracts.lang
+++ b/htdocs/langs/zh_CN/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=正在运行的服务
 MenuExpiredServices=过期服务
 MenuClosedServices=休息服务
 NewContract=新合同
-NewContractSubscription=新建联系人/订阅
+NewContractSubscription=New contract or subscription
 AddContract=创建联系人
 DeleteAContract=删除合同
 ActivateAllOnContract=激活所有服务
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 7fbf8ad3519..33ed9cea573 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=新价值不能等于旧的价值
 ErrorFailedToValidatePasswordReset=重新初始化密码密码失败。重新初始化密码已经完成(该链接可以只用一次)。如果没有，请尝试重新启动初始化过程。
 ErrorToConnectToMysqlCheckInstance=连接数据库失败。检查数据库服务器是否正在运行（例如，使用mysql / mariadb，您可以使用'sudo service mysql start'从命令行启动它）。
 ErrorFailedToAddContact=无法添加联系人
-ErrorDateMustBeBeforeToday=日期不能超过今天
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=付款模式设置为键入%s但未完成模块发票的设置以定义要为此付款模式显示的信息。
 ErrorPHPNeedModule=错误，您的PHP必须安装模块<b> %s </b>才能使用此功能。
 ErrorOpenIDSetupNotComplete=您设置Dolibarr配置文件以允许OpenID身份验证，但OpenID服务的URL未定义为常量%s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=为此成员设置了密码。但是，未创建任何用户帐户。因此，此密码已存储，但无法用于登录Dolibarr。它可以由外部模块/接口使用，但如果您不需要为成员定义任何登录名或密码，则可以从成员模块设置中禁用“管理每个成员的登录名”选项。如果您需要管理登录但不需要任何密码，则可以将此字段保留为空以避免此警告。注意：如果成员链接到用户，则电子邮件也可用作登录。
diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang
index aab6e0b46a7..b70928b0819 100644
--- a/htdocs/langs/zh_CN/languages.lang
+++ b/htdocs/langs/zh_CN/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=阿拉伯语
 Language_ar_EG=阿拉伯语（埃及）
 Language_ar_SA=阿拉伯语
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=保加利亚语
 Language_bs_BA=波斯尼亚
 Language_ca_ES=加泰罗尼亚
@@ -20,6 +23,7 @@ Language_en_GB=英语（英国）
 Language_en_IN=英国（印度）
 Language_en_NZ=英语（新西兰）
 Language_en_SA=英语（沙特阿拉伯）
+Language_en_SG=English (Singapore)
 Language_en_US=英语（美国）
 Language_en_ZA=英语（南非）
 Language_es_ES=西班牙语
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=西班牙语（厄瓜多尔）
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=西班牙语（洪都拉斯）
 Language_es_MX=西班牙语（墨西哥）
 Language_es_PA=Spanish（巴拿马）
@@ -36,6 +41,7 @@ Language_es_PY=西班牙语（巴拉圭）
 Language_es_PE=西班牙语（秘鲁）
 Language_es_PR=西班牙语（波多黎各）
 Language_es_UY=西班牙语（乌拉圭）
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=爱沙尼亚语
 Language_eu_ES=巴斯克
@@ -44,15 +50,22 @@ Language_fi_FI=完成
 Language_fr_BE=法语（比利时）
 Language_fr_CA=法语（加拿大）
 Language_fr_CH=法语（瑞士）
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=法国的
+Language_fr_GA=French (Gabon)
 Language_fr_NC=法语（新喀里多尼亚）
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=希伯来语
+Language_hi_IN=Hindi (India)
 Language_hr_HR=克罗地亚
 Language_hu_HU=匈牙利
 Language_id_ID=Indonesian
 Language_is_IS=冰岛
 Language_it_IT=意大利语
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=日语
 Language_ka_GE=Georgian
 Language_km_KH=高棉
@@ -64,6 +77,7 @@ Language_lv_LV=拉脱维亚
 Language_mk_MK=马其顿
 Language_mn_MN=蒙
 Language_nb_NO=挪威文（巴克摩）
+Language_ne_NP=Nepali
 Language_nl_BE=荷兰语（比利时）
 Language_nl_NL=Dutch
 Language_pl_PL=波兰语
@@ -86,4 +100,5 @@ Language_uz_UZ=乌兹别克
 Language_vi_VN=越南语
 Language_zh_CN=中文
 Language_zh_TW=中文(繁体)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 127a61c350d..c6a2af28558 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=默认外发电子邮件设置
 Information=信息
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index e04cd1732ec..cfa3a26ae4b 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=单价（含税）
 Amount=金额
 AmountInvoice=发票金额
 AmountInvoiced=发票金额
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=付款金额
 AmountHTShort=Amount (excl.)
 AmountTTCShort=金额(含税)
@@ -485,6 +485,7 @@ Categories=标签/分类
 Category=标签/分类
 By=由
 From=从
+FromDate=从
 FromLocation=从
 to=至
 To=至
@@ -687,6 +688,7 @@ Method=方法
 Receive=收到
 CompleteOrNoMoreReceptionExpected=完成或没有更多的预期
 ExpectedValue=期望值
+ExpectedQty=Expected Qty
 PartialWoman=局部的
 TotalWoman=总计
 NeverReceived=从未收到
@@ -703,6 +705,7 @@ MenuECM=文件
 MenuAWStats=AWStats
 MenuMembers=会员
 MenuAgendaGoogle=谷歌议程
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=来自Dolibarr本身的大小限制(菜单：home-setup-security)为：%s Kb，而PHP的限制为: %s Kb
 NoFileFound=这个目录没保存有文档
 CurrentUserLanguage=当前语言
@@ -725,7 +728,7 @@ Page=页面
 Notes=备注
 AddNewLine=添加新行
 AddFile=添加文件
-FreeZone=不是预定义的产品/服务
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=复制项目含主属性
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=四
 ShortFriday=五
 ShortSaturday=六
 ShortSunday=日
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=选择电子邮件模板
 SetRef=套编号
 Select2ResultFoundUseArrows=发现结果。使用箭头选择。
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=信息
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index 76512b6db6f..6c9362fb204 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -52,6 +52,9 @@ MemberStatusResiliated=终止的成员
 MemberStatusResiliatedShort=终止
 MembersStatusToValid=待定会员
 MembersStatusResiliated=解雇会员
+MemberStatusNoSubscription=Validated (no subscription needed)
+MemberStatusNoSubscriptionShort=批准
+SubscriptionNotNeeded=No subscription needed
 NewCotisation=新的捐献
 PaymentSubscription=支付的新贡献
 SubscriptionEndDate=认购的结束日期
@@ -78,7 +81,7 @@ DeleteType=删除
 VoteAllowed=是否允许投票
 Physical=普通会员
 Moral=荣誉会员
-MorPhy=荣誉会员/普通会员
+MorPhy=属性
 Reenable=重新启用
 ResiliateMember=终止会员
 ConfirmResiliateMember=您确定要终止此会员吗？
diff --git a/htdocs/langs/zh_CN/mrp.lang b/htdocs/langs/zh_CN/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/zh_CN/mrp.lang
+++ b/htdocs/langs/zh_CN/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 4b416b2e696..4671a563cb1 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__（你好）__\n\n\n__（此致）__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__（你好）__\n\n\n__（此致）__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__（你好）__\n\n\n__（此致）__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=如果尚未完成，您可以点击下面的链接进行付款。\n\n%s\n\n
+PredefinedMailContentGeneric=__（你好）__\n\n\n__（此致）__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr是一款具有几百种业务模块支撑的紧凑型ERP / CRM系统。如若所有的业务模块统统向您展示演示我们认为这么做没有任何意义，假如真发生了这样的情况：这几百个业务贵公司统统都涉足到了那么请您直接包养我们吧，土豪请直接 (加我们中国社区QQ群206239089)赞助我们吧，让Dolibarr在中国推得更广走得更远！以下您有几个选择。
 ChooseYourDemoProfil=请选择最贴近贵企业需求的演示…
 ChooseYourDemoProfilMore=...自定义配置<br>（手动选择模块）
@@ -280,7 +278,9 @@ LinesToImport=要导入的行
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 7c4ca236f10..010f84186a7 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=设置条码类型
 BarcodeValue=条码值
 NoteNotVisibleOnBill=备注 (账单、报价...中不可见)
 ServiceLimitedDuration=如果产品是有限期的服务：
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=价格个数
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=海关/商品/ HS编码
 CountryOrigin=产地国
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=标签别名
 Unit=单位
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=选择组合
 ProductCombinationGenerator=变种发电机
 Features=特征
 PriceImpact=价格影响
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=重量影响
 NewProductAttribute=新建属性
 NewProductAttributeValue=新属性值
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 866cc0d8bd1..748dc5a455e 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=捐助
 TypeContact_project_task_external_TASKCONTRIBUTOR=捐助
 SelectElement=选择元素
 AddElement=链接到元素
+LinkToElementShort=链接到
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=统计项目/线索
-TasksStatistics=项目/主要任务的统计数据
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=任务已分配。应该可以输入此任务的时间。
 IdTaskTime=Id任务时间
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
index 2c782854e14..79d10f5e2ba 100644
--- a/htdocs/langs/zh_CN/propal.lang
+++ b/htdocs/langs/zh_CN/propal.lang
@@ -85,3 +85,7 @@ ProposalCustomerSignature=书面接受,公司盖章,日期和签名
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+IdProposal=提案编号
+IdProduct=产品编号
+PrParentLine=提案父行
+LineBuyPriceHT=购买价格扣除税额
diff --git a/htdocs/langs/zh_CN/recruitment.lang b/htdocs/langs/zh_CN/recruitment.lang
new file mode 100644
index 00000000000..4ec45432005
--- /dev/null
+++ b/htdocs/langs/zh_CN/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = 设置
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = 关于
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 91e29231f45..3979fe7c0d4 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=删除发送
 Stock=库存
 Stocks=库存
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=按库存批号/序列号
@@ -95,14 +95,16 @@ RealStock=实际库存
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=虚拟库存
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=编号仓库
 DescWareHouse=说明仓库
 LieuWareHouse=本地化仓库
 WarehousesAndProducts=仓库和产品
 WarehousesAndProductsBatchDetail=仓库和产品(各批号/序列号详情)
-AverageUnitPricePMPShort=投入品平均价格
-AverageUnitPricePMP=投入品平均价格
+AverageUnitPricePMPShort=加权平均价格
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=销售单价
 EstimatedStockValueSellShort=销量
 EstimatedStockValueSell=销量
@@ -141,7 +143,7 @@ Replenishments=补充资金
 NbOfProductBeforePeriod=产品数量%s选定期前库存（<%s）
 NbOfProductAfterPeriod=选定期限后产品数量%s（> %s）
 MassMovement=批量库存调拨
-SelectProductInAndOutWareHouse=请选择一个产品，数量值，来源仓和目标仓，然后点击 "%s"。完了之后呢，点击 "%s"。
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=记录转移
 ReceivingForSameOrder=此订单的收据
 StockMovementRecorded=库存调拨已记录
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index 5aa256c3c48..104c84a126f 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -1,11 +1,11 @@
-# Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Vendors
-SuppliersInvoice=Vendor invoice
-ShowSupplierInvoice=Show Vendor Invoice
-NewSupplier=New vendor
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=供应商
+SuppliersInvoice=供应商发票
+ShowSupplierInvoice=显示供应商发票
+NewSupplier=新供应商
 History=历史
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
+ListOfSuppliers=供应商列表
+ShowSupplier=显示供应商
 OrderDate=订购日期
 BuyingPriceMin=最优采购价
 BuyingPriceMinShort=最优采购价
@@ -14,34 +14,34 @@ TotalSellingPriceMinShort=子产品销售价格合计
 SomeSubProductHaveNoPrices=某些副产品没有定义价格
 AddSupplierPrice=添加采购价
 ChangeSupplierPrice=更改采购价
-SupplierPrices=Vendor prices
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=该参考供应商已经与一参考：%s的
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Vendor payment
-SuppliersArea=Vendor area
-RefSupplierShort=Ref. vendor
+SupplierPrices=供应商价格
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
+NoRecordedSuppliers=没有供应商记录
+SupplierPayment=供应商付款
+SuppliersArea=供应商区域
+RefSupplierShort=参考。供应商
 Availability=可用性
-ExportDataset_fournisseur_1=Vendor invoices list and invoice lines
-ExportDataset_fournisseur_2=Vendor invoices and payments
-ExportDataset_fournisseur_3=Purchase orders and order lines
+ExportDataset_fournisseur_1=供应商发票和发票详细信息
+ExportDataset_fournisseur_2=供应商发票和付款
+ExportDataset_fournisseur_3=采购订单和订单详情
 ApproveThisOrder=批准这一命令
 ConfirmApproveThisOrder=是否确定要批准此订单 <b>%s</b> ?
 DenyingThisOrder=否认这笔订单
 ConfirmDenyingThisOrder=是否确定要拒绝此订单 <b>%s</b>？
 ConfirmCancelThisOrder=是否确定要取消此订单 <b>%s</b>？
-AddSupplierOrder=Create Purchase Order
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=List of purchase orders
-MenuOrdersSupplierToBill=Purchase orders to invoice
-NbDaysToDelivery=交货延迟天数
-DescNbDaysToDelivery=此订单产品的最长交货延迟
-SupplierReputation=Vendor reputation
+AddSupplierOrder=创建采购订单
+AddSupplierInvoice=创建供应商发票
+ListOfSupplierProductForSupplier=供应商的产品清单和价格<b> %s </b>
+SentToSuppliers=发送给供应商
+ListOfSupplierOrders=采购订单清单
+MenuOrdersSupplierToBill=采购订单发票
+NbDaysToDelivery=Delivery delay (days)
+DescNbDaysToDelivery=The longest delivery delay of the products from this order
+SupplierReputation=供应商声誉
 DoNotOrderThisProductToThisSupplier=不订购
-NotTheGoodQualitySupplier=劣质
+NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=信誉
 BuyerName=买家名称
 AllProductServicePrices=全部 产品/服务 价格
-AllProductReferencesOfSupplier=供应商的所有 产品/服务 参考
-BuyingPriceNumShort=Vendor prices
+AllProductReferencesOfSupplier=All references of vendor
+BuyingPriceNumShort=供应商价格
diff --git a/htdocs/langs/zh_CN/ticket.lang b/htdocs/langs/zh_CN/ticket.lang
index dd8e9fb79d4..2d2ab96304e 100644
--- a/htdocs/langs/zh_CN/ticket.lang
+++ b/htdocs/langs/zh_CN/ticket.lang
@@ -72,7 +72,6 @@ Deleted=删除
 
 # Dict
 Type=类型
-Category=Analytic code
 Severity=严重
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=自动分配创建故障单的用户
 TicketsAutoAssignTicketHelp=创建故障单时，可以自动将用户分配给故障单。
 TicketNumberingModules=票据编号模块
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=组
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=制作：
 NewTicket=新票据
 SubjectAnswerToTicket=票据应答
 TicketTypeRequest=请求类型
-TicketCategory=Analytic code
+TicketCategory=组
 SeeTicket=查看票据
 TicketMarkedAsRead=票据已标记为已读
 TicketReadOn=请继续阅读
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index d84917431eb..a1b638ec1dd 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -78,6 +78,7 @@ UserWillBeExternalUser=创建的用户将是外部用户(因为链接到一个
 IdPhoneCaller=手机来电者身份
 NewUserCreated=创建用户%s
 NewUserPassword=%s修改了密码
+NewPasswordValidated=Your new password have been validated and must be used now to login.
 EventUserModified=用户 %s 已变更
 UserDisabled=用户%s禁用
 UserEnabled=用户%s启动
@@ -107,6 +108,7 @@ DisabledInMonoUserMode=在维护模式下禁用
 UserAccountancyCode=用户科目代码
 UserLogoff=用户注销
 UserLogged=用户登录
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -115,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index 03b8d966939..952c2388f85 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=提款收据
 WithdrawalReceipt=提款收据
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=最后 %s 取款收据
@@ -63,7 +63,9 @@ InvoiceRefused=订单已被拒绝 (Charge the rejection to customer)
 StatusDebitCredit=状态借记/贷记
 StatusWaiting=等候
 StatusTrans=传播
+StatusDebited=Debited
 StatusCredited=计入
+StatusPaid=已支付
 StatusRefused=拒绝
 StatusMotif0=未指定
 StatusMotif1=提供insuffisante
@@ -77,13 +79,13 @@ StatusMotif8=其他原因
 CreateForSepaFRST=创建直接借记文件（SEPA FRST）
 CreateForSepaRCUR=创建直接借记文件（SEPA RCUR）
 CreateAll=创建直接借记文件（全部）
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=只有办公室
 CreateBanque=只有银行
 OrderWaiting=等待治疗
-NotifyTransmision=提款传输
-NotifyCredit=提款信用
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=国家发射数
 WithBankUsingRIB=有关银行账户，使用肋
 WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的银行帐户
@@ -93,9 +95,10 @@ CreditDate=信贷
 WithdrawalFileNotCapable=无法为您所在的国家/地区生成提款收据文件%s（不支持您所在的国家/地区）
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=撤回文件
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=设置状态“发送的文件”
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=按状态明细统计
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=付款方式
 ModeRECUR=Recurring payment
 ModeFRST=一次性付款
 PleaseCheckOne=请检查一个
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=创建直接借记订单%s
 AmountRequested=要求金额
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=金额：%s <br> metode：%s <br>日期：%s
 InfoRejectSubject=直接付款订单被拒绝
 InfoRejectMessage=您好，<br> <br>与公司%s相关的发票%s的直接借记支付订单，金额已被%s拒绝了。<br> <br> <br> <br> %s
 ModeWarning=实模式下的选项没有设置，这个模拟后，我们停止
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/zh_CN/workflow.lang b/htdocs/langs/zh_CN/workflow.lang
index 2aa7123b2ff..34d49860135 100644
--- a/htdocs/langs/zh_CN/workflow.lang
+++ b/htdocs/langs/zh_CN/workflow.lang
@@ -1,20 +1,23 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=工作流模块设置
-WorkflowDesc=本模块旨在将自动操作的行为修改为应用程序。默认情况下, 工作流处于打开状态 (您可以按所需顺序执行某些动作)。您还可以激活您感兴趣的自动操作。
+WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
 ThereIsNoWorkflowToModify=没有工作流程，您可以修改你已激活的模块。
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=在商业方案签订后自动创建客户订单 (新订单的金额将与方案相同)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=在商业方案签订后自动创建客户账单 (新账单的金额与提案金额相)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=在合同确认后自动创建客户发票
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=在客户订单关闭后自动创建客户账单 (新账单的金额将大于订单)
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
 # Autoclassify customer proposal or order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=将 "客户订单" 设置为 "记帐" 时对关联的源方案进行分类 (如果订单金额与已签名的关联方案总金额相同)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=当客户账单被确认时 ( 如果账单金额与已签订的关联方案总额相同 ) ，将关联源方案分类为账单。
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=当客户账单被确认时，将关联源客户订单分类为账单(如果账单金额与关联订单总额相同)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=当客户账单设定为支付时，将关联源客户订单分类为账单（如果账单金额与关联订单总额相同）
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=将关联源客户订单分类为发货时进行验证 (如果所有装运的货物数量与更新的订单相同)
-# Autoclassify supplier order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked proposals)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order(s) to billed when vendor invoice is validated (and if amount of the invoice is same than total amount of linked orders)
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
+# Autoclassify purchase order
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=自动创建
 AutomaticClassification=自动分类
diff --git a/htdocs/langs/zh_CN/zapier.lang b/htdocs/langs/zh_CN/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/zh_CN/zapier.lang
+++ b/htdocs/langs/zh_CN/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang
index be6ca9e2f19..7b59e33b296 100644
--- a/htdocs/langs/zh_HK/accountancy.lang
+++ b/htdocs/langs/zh_HK/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zeros at the end of a
 BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal
 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties)
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -284,6 +285,7 @@ ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=Apply mass categories
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index 7e9d78f1047..d7c4eb282cd 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email o
 UserEmail=User email
 CompanyEmail=Company Email
 FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=Module setup
 ModulesSetup=Modules/Application setup
 ModuleFamilyBase=System
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s
 PDF=PDF
-PDFDesc=Global options for PDF generation.
-PDFAddressForging=Rules for address boxes
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
-HideLocalTaxOnPDF=Hide %s rate in column Tax Sale
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=Hide products description
 HideRefOnPDF=Hide products ref.
 HideDetailsOnPDF=Hide product lines details
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=Modify on prices with base reference value defined on
 MassConvert=Launch bulk conversion
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
+String1Line=String (1 line)
 TextLong=Long text
+TextLongNLines=Long text (n lines)
 HtmlText=Html text
 Int=Integer
 Float=Float
@@ -543,9 +546,9 @@ Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Payment by credit transfer
-Module56Desc=Management of payment of suppliers by credit transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Bank Direct Debit payments
-Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for European countries.
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=Create/modify services
 Permission534=Delete services
 Permission536=See/manage hidden services
 Permission538=Export services
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=Read donations
 Permission702=Create/modify donations
 Permission703=Delete donations
@@ -848,6 +858,8 @@ Permission773=Delete expense reports
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
 Permission776=Pay expense reports
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=Export expense reports
 Permission1001=Read stocks
 Permission1002=Create/modify warehouses
@@ -900,6 +912,7 @@ Permission2515=Setup documents directories
 Permission2801=Use FTP client in read mode (browse and download only)
 Permission2802=Use FTP client in write mode (delete or upload files)
 Permission3200=Read archived events and fingerprints
+Permission3301=Generate new modules
 Permission4001=See employees
 Permission4002=Create employees
 Permission4003=Delete employees
@@ -947,7 +960,8 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 DictionaryCompanyType=Third-party types
 DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=States/Provinces
 DictionaryRegion=Regions
 DictionaryCountry=Countries
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=Email Templates
 DictionaryUnits=Units
 DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
-DictionaryProspectStatus=Prospect status
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
@@ -1076,7 +1091,7 @@ LoginPage=Login page
 BackgroundImageLogin=Background image
 PermanentLeftSearchForm=Permanent search form on left menu
 DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=Show the company logo in the menu
 CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least fo
 NewTranslationStringToShow=New translation string to show
 OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TotalNumberOfActivatedModules=Activated application/modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=Use events types (managed in menu Setup -> Dictionaries ->
 AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of event in event create form
 AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=Enable event reminder <b>by emails</b> (remind option/delay can be defined on each event). Note: Module <strong>%s</strong> must be enabled and correctly setup to have reminder sent at the correct frequency.
 AGENDA_REMINDER_BROWSER=Enable event reminder <b>on user's browser</b> (when event date is reached, each user is able to refuse this from the browser confirmation question)
 AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Click To Dial module setup
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module makea phone numbers clickable links. A click on the icon will make your phone call the number. This can be used to call a call-center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on the same computer as the browser, and called when you click on a link in your browser that starts with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=This field contains a reference to identify line. Enter any value o
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=The RGB color is in HEX format, eg: FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=Sale tax rate
 RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases.
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=Quotation request
 MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
+MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Templates for product documents
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=See ChangeLog file (english only)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=Left margin on PDF
 MAIN_PDF_MARGIN_RIGHT=Right margin on PDF
 MAIN_PDF_MARGIN_TOP=Top margin on PDF
 MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=There is no specific setup required for this module.
 SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
 EnterCalculationRuleIfPreviousFieldIsYes=Enter calculation rule if previous field was set to Yes (For example 'CODEGRP1+CODEGRP2')
@@ -1933,13 +1953,14 @@ NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=Record email event
 CreateLeadAndThirdParty=Create lead (and third party if necessary)
-CreateTicketAndThirdParty=Create ticket (and third party if necessary)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=Latest result code
 NbOfEmailsInInbox=Number of emails in source directory
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-WithDolTrackingID=Dolibarr Reference found in Message ID
-WithoutDolTrackingID=Dolibarr Reference not found in Message ID
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -1981,7 +2002,7 @@ ImportSetup=Setup of module Import
 InstanceUniqueID=Unique ID of the instance
 SmallerThan=Smaller than
 LargerThan=Larger than
-IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID is found into incoming email, the event will be automatically linked to the related objects.
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 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.
@@ -2005,3 +2026,7 @@ RssNote=Note: Each RSS feed definition provides a widget that you must enable to
 JumpToBoxes=Jump to Setup -> Widgets
 MeasuringUnitTypeDesc=Use here a value like "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=The scale is the number of places you have to move the decimal part to match the default reference unit. For "time" unit type, it is the number of seconds. Values between 80 and 99 are reserved values.
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/zh_HK/agenda.lang b/htdocs/langs/zh_HK/agenda.lang
index 5b81d05db45..09d82139a49 100644
--- a/htdocs/langs/zh_HK/agenda.lang
+++ b/htdocs/langs/zh_HK/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Number of events
 ListOfActions=List of events
 EventReports=Event reports
 Location=Location
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=Event on all day(s)
 MenuToDoActions=All incomplete events
 MenuDoneActions=All terminated events
@@ -86,6 +86,8 @@ ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
 DraftInvoiceDeleted=Draft invoice deleted
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=Product %s created
 PRODUCT_MODIFYInDolibarr=Product %s modified
 PRODUCT_DELETEInDolibarr=Product %s deleted
@@ -158,3 +160,9 @@ DateStartPlusOne=Date start + 1 hour
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
 SetAllEventsToFinished=Set all events to finished
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/zh_HK/boxes.lang b/htdocs/langs/zh_HK/boxes.lang
index bd62684421a..d6fd298a3a7 100644
--- a/htdocs/langs/zh_HK/boxes.lang
+++ b/htdocs/langs/zh_HK/boxes.lang
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
 BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
 BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
 BoxTitleLastModifiedPropals=Latest %s modified proposals
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=Suspense account isn't defined
 BoxLastCustomerShipments=Last customer shipments
 BoxTitleLastCustomerShipments=Latest %s customer shipments
 NoRecordedShipments=No recorded customer shipment
+# Pages
+AccountancyHome=Accountancy
diff --git a/htdocs/langs/zh_HK/cashdesk.lang b/htdocs/langs/zh_HK/cashdesk.lang
index 157c5d93a4c..498baa82200 100644
--- a/htdocs/langs/zh_HK/cashdesk.lang
+++ b/htdocs/langs/zh_HK/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS Module
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Direct cash payment button
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=Invoice is already validated
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=External module with extra features. Posibilit
 PrintMethod=Print method
 ReceiptPrinterMethodDescription=Powerful method with a lot of parameters. Full customizable with templates. Cannot print from the cloud.
 ByTerminal=By terminal
-TakeposNumpadUsePaymentIcon=Use payment icon on numpad
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=Numbering module for POS sales
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
-ControlCashOpening=Control cash box at opening pos
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=Close cash fence
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -115,5 +115,10 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/zh_HK/compta.lang b/htdocs/langs/zh_HK/compta.lang
index 8a8c837ac87..8f4f058bb87 100644
--- a/htdocs/langs/zh_HK/compta.lang
+++ b/htdocs/langs/zh_HK/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=Label contribution
 TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
diff --git a/htdocs/langs/zh_HK/contracts.lang b/htdocs/langs/zh_HK/contracts.lang
index a6877e8385f..a9ac308142a 100644
--- a/htdocs/langs/zh_HK/contracts.lang
+++ b/htdocs/langs/zh_HK/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=Running services
 MenuExpiredServices=Expired services
 MenuClosedServices=Closed services
 NewContract=New contract
-NewContractSubscription=New contract/subscription
+NewContractSubscription=New contract or subscription
 AddContract=Create contract
 DeleteAContract=Delete a contract
 ActivateAllOnContract=Activate all services
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index 7b1ff639ed8..893f4a35b65 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use this feature.
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=No enough quantity for this
 ErrorOnlyOneFieldForGroupByIsPossible=Only 1 field for the 'Group by' is possible (others are discarded)
 ErrorTooManyDifferentValueForSelectedGroupBy=Found too many different value (more than <b>%s</b>) for the field '<b>%s</b>', so we can't use it as a 'Group by' for graphics. The field 'Group By' has been removed. May be you wanted to use it as an X-Axis ?
 ErrorReplaceStringEmpty=Error, the string to replace into is empty
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/zh_HK/languages.lang b/htdocs/langs/zh_HK/languages.lang
index 6185183161b..cc80b9f1719 100644
--- a/htdocs/langs/zh_HK/languages.lang
+++ b/htdocs/langs/zh_HK/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_EG=Arabic (Egypt)
 Language_ar_SA=Arabic
+Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
+Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
@@ -20,6 +23,7 @@ Language_en_GB=English (United Kingdom)
 Language_en_IN=English (India)
 Language_en_NZ=English (New Zealand)
 Language_en_SA=English (Saudi Arabia)
+Language_en_SG=English (Singapore)
 Language_en_US=English (United States)
 Language_en_ZA=English (South Africa)
 Language_es_ES=Spanish
@@ -29,6 +33,7 @@ Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=Spanish (Honduras)
 Language_es_MX=Spanish (Mexico)
 Language_es_PA=Spanish (Panama)
@@ -36,6 +41,7 @@ Language_es_PY=Spanish (Paraguay)
 Language_es_PE=Spanish (Peru)
 Language_es_PR=Spanish (Puerto Rico)
 Language_es_UY=Spanish (Uruguay)
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=Spanish (Venezuela)
 Language_et_EE=Estonian
 Language_eu_ES=Basque
@@ -44,15 +50,22 @@ Language_fi_FI=Finnish
 Language_fr_BE=French (Belgium)
 Language_fr_CA=French (Canada)
 Language_fr_CH=French (Switzerland)
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=French
+Language_fr_GA=French (Gabon)
 Language_fr_NC=French (New Caledonia)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=Frisian
+Language_gl_ES=Galician
 Language_he_IL=Hebrew
+Language_hi_IN=Hindi (India)
 Language_hr_HR=Croatian
 Language_hu_HU=Hungarian
 Language_id_ID=Indonesian
 Language_is_IS=Icelandic
 Language_it_IT=Italian
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=Japanese
 Language_ka_GE=Georgian
 Language_km_KH=Khmer
@@ -64,6 +77,7 @@ Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
 Language_nb_NO=Norwegian (Bokmål)
+Language_ne_NP=Nepali
 Language_nl_BE=Dutch (Belgium)
 Language_nl_NL=Dutch
 Language_pl_PL=Polish
@@ -86,4 +100,5 @@ Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
 Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=Malay
diff --git a/htdocs/langs/zh_HK/mails.lang b/htdocs/langs/zh_HK/mails.lang
index 7b3bfd3852a..1235eef3b27 100644
--- a/htdocs/langs/zh_HK/mails.lang
+++ b/htdocs/langs/zh_HK/mails.lang
@@ -168,3 +168,7 @@ OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
 DefaultOutgoingEmailSetup=Default outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
+Unanswered=Unanswered
+Answered=Answered
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang
index adbc443198f..0af5c66f0e0 100644
--- a/htdocs/langs/zh_HK/main.lang
+++ b/htdocs/langs/zh_HK/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=U.P. (inc. tax)
 Amount=Amount
 AmountInvoice=Invoice amount
 AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (incl. tax)
-AmountInvoicedTTC=Amount invoiced (excl. tax)
+AmountInvoicedHT=Amount invoiced (excl. tax)
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=Payment amount
 AmountHTShort=Amount (excl.)
 AmountTTCShort=Amount (inc. tax)
@@ -485,6 +485,7 @@ Categories=Tags/categories
 Category=Tag/category
 By=By
 From=From
+FromDate=From
 FromLocation=From
 to=to
 To=to
@@ -687,6 +688,7 @@ Method=Method
 Receive=Receive
 CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 ExpectedValue=Expected Value
+ExpectedQty=Expected Qty
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -703,6 +705,7 @@ MenuECM=Documents
 MenuAWStats=AWStats
 MenuMembers=Members
 MenuAgendaGoogle=Google agenda
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
@@ -725,7 +728,7 @@ Page=Page
 Notes=Notes
 AddNewLine=Add new line
 AddFile=Add file
-FreeZone=Not a predefined product/service
+FreeZone=Free-text product
 FreeLineOfType=Free-text item, type:
 CloneMainAttributes=Clone object with its main attributes
 ReGeneratePDF=Re-generate PDF
@@ -942,6 +945,39 @@ ShortThursday=T
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=Select an email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=Some results found. Use arrows to select.
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for thi
 NotUsedForThisCustomer=Not used for this customer
 AmountMustBePositive=Amount must be positive
 ByStatus=By status
+InformationMessage=Information
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/zh_HK/members.lang b/htdocs/langs/zh_HK/members.lang
index dd0a5bf49e2..5ef946ddf67 100644
--- a/htdocs/langs/zh_HK/members.lang
+++ b/htdocs/langs/zh_HK/members.lang
@@ -81,7 +81,7 @@ DeleteType=Delete
 VoteAllowed=Vote allowed
 Physical=Physical
 Moral=Moral
-MorPhy=Moral/Physical
+MorPhy=Nature
 Reenable=Reenable
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
diff --git a/htdocs/langs/zh_HK/mrp.lang b/htdocs/langs/zh_HK/mrp.lang
index ab5f6d81fad..dd830a8e434 100644
--- a/htdocs/langs/zh_HK/mrp.lang
+++ b/htdocs/langs/zh_HK/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=Manufacturing Orders
 MO=Manufacturing Order
+MOs=Manufacturing orders
 MRPDescription=Module to manage production and Manufacturing Orders (MO).
 MRPArea=MRP Area
 MrpSetupPage=Setup of module MRP
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
index 5dc70fa068f..54c0572d453 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nPlease find our order __RE
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nPlease find invoice __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\nPlease find intervention __REF__ attached\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=You can click on the link below to make your payment if it is not already done.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several business modules. A demo showcasing all modules makes no sense as this scenario never occurs (several hundred available). So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
@@ -280,7 +278,9 @@ LinesToImport=Lines to import
 
 MemoryUsage=Memory usage
 RequestDuration=Duration of request
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=Products/Services by popularity in Proposals
 PopuCom=Products/Services by popularity in Orders
 ProductStatistics=Products/Services Statistics
 NbOfQtyInOrders=Qty in orders
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index a1bbc45f970..b59aa2f7080 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=Set barcode type
 BarcodeValue=Barcode value
 NoteNotVisibleOnBill=Note (not visible on invoices, proposals...)
 ServiceLimitedDuration=If product is a service with limited duration:
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=Multiple price segments per product/service (each customer is in one price segment)
 MultiPricesNumPrices=Number of prices
 DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=Customs / Commodity / HS code
 CountryOrigin=Origin country
 Nature=Nature of product (material/finished)
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=Short label
 Unit=Unit
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=Select combination
 ProductCombinationGenerator=Variants generator
 Features=Features
 PriceImpact=Price impact
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=Weight impact
 NewProductAttribute=New attribute
 NewProductAttributeValue=New attribute value
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
index ec37078a1c7..baf0ecde17f 100644
--- a/htdocs/langs/zh_HK/projects.lang
+++ b/htdocs/langs/zh_HK/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
 TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
 SelectElement=Select element
 AddElement=Link to element
+LinkToElementShort=Link to
 # Documents models
 DocumentModelBeluga=Project document template for linked objects overview
 DocumentModelBaleine=Project document template for tasks
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=No. of created projects by month
 ProjectNbTaskByMonth=No. of created tasks by month
 ProjectOppAmountOfProjectsByMonth=Amount of leads by month
 ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of leads by month
-ProjectOpenedProjectByOppStatus=Open project/lead by lead status
-ProjectsStatistics=Statistics on projects/leads
-TasksStatistics=Statistics on project/lead tasks
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
 YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
diff --git a/htdocs/langs/zh_HK/recruitment.lang b/htdocs/langs/zh_HK/recruitment.lang
new file mode 100644
index 00000000000..73e9a7fa07f
--- /dev/null
+++ b/htdocs/langs/zh_HK/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/zh_HK/stocks.lang b/htdocs/langs/zh_HK/stocks.lang
index 05d3d1b4f67..81163e8d4b0 100644
--- a/htdocs/langs/zh_HK/stocks.lang
+++ b/htdocs/langs/zh_HK/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=Stocks by lot/serial
@@ -95,14 +95,16 @@ RealStock=Real Stock
 RealStockDesc=Physical/real stock is the stock currently in the warehouses.
 RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
 VirtualStock=Virtual stock
-VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=Id warehouse
 DescWareHouse=Description warehouse
 LieuWareHouse=Localisation warehouse
 WarehousesAndProducts=Warehouses and products
 WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
+AverageUnitPricePMPShort=Weighted average price
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=Selling Unit Price
 EstimatedStockValueSellShort=Value for sell
 EstimatedStockValueSell=Value for sell
@@ -141,7 +143,7 @@ Replenishments=Replenishments
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
 MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Receipts for this order
 StockMovementRecorded=Stock movements recorded
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=Display full tree of warehouse on popup of warehouse links (W
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/zh_HK/suppliers.lang b/htdocs/langs/zh_HK/suppliers.lang
index b69b11272b4..51562b8bb7a 100644
--- a/htdocs/langs/zh_HK/suppliers.lang
+++ b/htdocs/langs/zh_HK/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Low quality
 ReputationForThisProduct=Reputation
 BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All product / service references of vendor
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
diff --git a/htdocs/langs/zh_HK/ticket.lang b/htdocs/langs/zh_HK/ticket.lang
index a9cff9391d0..59519282c80 100644
--- a/htdocs/langs/zh_HK/ticket.lang
+++ b/htdocs/langs/zh_HK/ticket.lang
@@ -72,7 +72,6 @@ Deleted=Deleted
 
 # Dict
 Type=Type
-Category=Analytic code
 Severity=Severity
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=Automatically assign the user who created the ticket
 TicketsAutoAssignTicketHelp=When creating a ticket, the user can be automatically assigned to the ticket.
 TicketNumberingModules=Tickets numbering module
 TicketNotifyTiersAtCreation=Notify third party at creation
-TicketGroup=Group
 TicketsDisableCustomerEmail=Always disable emails when a ticket is created from public interface
 TicketsPublicNotificationNewMessage=Send email(s) when a new message is added
 TicketsPublicNotificationNewMessageHelp=Send email(s) when a new message is added from public interface (to assigned user or the notifications email to (update) and/or the notifications email to)
@@ -162,7 +160,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Analytic code
+TicketCategory=Group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/zh_HK/users.lang b/htdocs/langs/zh_HK/users.lang
index 41a5ebd0981..25d9205457b 100644
--- a/htdocs/langs/zh_HK/users.lang
+++ b/htdocs/langs/zh_HK/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accounting code
 UserLogoff=User logout
 UserLogged=User logged
+DateOfEmployment=Employment date
 DateEmployment=Employment Start Date
 DateEmploymentEnd=Employment End Date
 CantDisableYourself=You can't disable your own user record
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/zh_HK/withdrawals.lang b/htdocs/langs/zh_HK/withdrawals.lang
index cccd8196481..114a8d9dd6c 100644
--- a/htdocs/langs/zh_HK/withdrawals.lang
+++ b/htdocs/langs/zh_HK/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
 WithdrawalsReceipts=Direct debit orders
 WithdrawalReceipt=Direct debit order
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
 LastWithdrawalReceipts=Latest %s direct debit files
@@ -63,7 +63,9 @@ InvoiceRefused=Invoice refused (Charge the rejection to customer)
 StatusDebitCredit=Status debit/credit
 StatusWaiting=Waiting
 StatusTrans=Sent
+StatusDebited=Debited
 StatusCredited=Credited
+StatusPaid=Paid
 StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
@@ -77,13 +79,13 @@ StatusMotif8=Other reason
 CreateForSepaFRST=Create direct debit file (SEPA FRST)
 CreateForSepaRCUR=Create direct debit file (SEPA RCUR)
 CreateAll=Create direct debit file (all)
-CreateFileForPaymentByBankTransfer=Create credit transfer (all)
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
 CreateGuichet=Only office
 CreateBanque=Only bank
 OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-NotifyCredit=Withdrawal Credit
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bank accounts using RIB
 WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT
@@ -93,9 +95,10 @@ CreditDate=Credit on
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Show Direct Debit Order
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=Set to status "File Sent"
 ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
 StatisticsByLineStatus=Statistics by status of lines
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=Type of payment
 ModeRECUR=Recurring payment
 ModeFRST=One-off payment
 PleaseCheckOne=Please check one only
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=Direct debit order %s created
 AmountRequested=Amount requested
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
 InfoRejectSubject=Direct debit payment order refused
 InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
 ModeWarning=Option for real mode was not set, we stop after this simulation
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/zh_HK/workflow.lang b/htdocs/langs/zh_HK/workflow.lang
index be126eef0f4..299be277e1d 100644
--- a/htdocs/langs/zh_HK/workflow.lang
+++ b/htdocs/langs/zh_HK/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=Automatic creation
 AutomaticClassification=Automatic classification
diff --git a/htdocs/langs/zh_HK/zapier.lang b/htdocs/langs/zh_HK/zapier.lang
index 6d6eda71313..bbad7895588 100644
--- a/htdocs/langs/zh_HK/zapier.lang
+++ b/htdocs/langs/zh_HK/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier for Dolibarr module
 # Admin page
 #
 ZapierForDolibarrSetup = Setup of Zapier for Dolibarr
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 0a695563266..c169b603290 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -149,6 +149,7 @@ ACCOUNTING_MANAGE_ZERO=允許在會計帳戶末尾管理不同數量的零。一
 BANK_DISABLE_DIRECT_INPUT=停用銀行帳戶中直接記錄交易
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日記帳上啟用草稿匯出
 ACCOUNTANCY_COMBO_FOR_AUX=為子公司帳戶啟用組合列表（如果您有很多合作方，可能會很慢）
+ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 
 ACCOUNTING_SELL_JOURNAL=銷售日記帳
 ACCOUNTING_PURCHASE_JOURNAL=採購日記帳
@@ -284,6 +285,7 @@ ShowTutorial=顯示教程
 NotReconciled=未對帳
 
 ## Admin
+BindingOptions=Binding options
 ApplyMassCategories=套用大量分類
 AddAccountFromBookKeepingWithNoCategories=個性化組中尚未有可用帳戶
 CategoryDeleted=會計項目的類別已移除
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index c18ee2b2e46..e3457221e99 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -300,8 +300,9 @@ MAIN_MAIL_DEFAULT_FROMTYPE=手動寄送的預設寄件人電子郵件（用戶
 UserEmail=用戶電子郵件
 CompanyEmail=公司電子郵件
 FeatureNotAvailableOnLinux=在Unix系列系統中不能使用功能。在本地測試您的寄送郵件程式。
+FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=如果此語言的翻譯不完整或發現錯誤，則可以通過編輯<b>langs / %s</b>資料夾中的文件來更正此錯誤，然後將更改提交到www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=若您的語言翻譯尚未完成，或是您發現錯誤，您可以透過編輯在資料夾 <b>langs/%s</b>中的檔案修正它，並把修改後檔案傳送到 dolibarr.org/forum 或是給在  github.com/Dolibarr/dolibarr 的開發者。
+SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
 ModuleSetup=模組設定
 ModulesSetup=模組/程式設定
 ModuleFamilyBase=系統
@@ -386,12 +387,12 @@ ModuleMustBeEnabledFirst=若您需要此功能，您首先要啟用模組<b>%s</
 SecurityToken=安全的網址的金鑰
 NoSmsEngine=沒有可用的簡訊發送管理器.由於依賴於外部供應商,所以預設發布版本未安裝簡訊發送管理器，但是您可以在%s上找到它們。
 PDF=PDF格式
-PDFDesc=產生PDF的全域選項。
-PDFAddressForging=地址欄規則
+PDFDesc=Global options for PDF generation
+PDFAddressForging=Rules for address section
 HideAnyVATInformationOnPDF=隱藏與銷售稅/營業稅相關的所有訊息
 PDFRulesForSalesTax=銷售稅 / 營業稅規則
 PDFLocaltax=%s的規則
-HideLocalTaxOnPDF=在“銷售稅”列中隱藏%s價格
+HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
 HideDescOnPDF=隱藏產品說明
 HideRefOnPDF=隱藏產品參考號碼
 HideDetailsOnPDF=隱藏產品行詳細資訊
@@ -408,7 +409,9 @@ PriceBaseTypeToChange=根據已定義的基礎參考價參修改價格
 MassConvert=啟動批次轉換
 PriceFormatInCurrentLanguage=目前語言的價格格式
 String=字串
+String1Line=String (1 line)
 TextLong=長字串
+TextLongNLines=Long text (n lines)
 HtmlText=Html 文字
 Int=整數
 Float=浮點數
@@ -543,9 +546,9 @@ Module54Desc=合約管理（服務或定期訂閱）
 Module55Name=條碼
 Module55Desc=條碼管理
 Module56Name=信用轉帳付款
-Module56Desc=以信用狀訂單管理供應商的付款。它包括為歐洲國家產生的SEPA文件。
-Module57Name=銀行直接轉帳付款
-Module57Desc=管理直接轉帳付款訂單。它包括為歐洲國家產生的SEPA檔案。
+Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
+Module57Name=Payments by Direct Debit
+Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
 Module58Name=點選撥打
 Module58Desc=點選撥打系統(Asterisk, ...)的整合
 Module59Name=Bookmark4u
@@ -836,9 +839,16 @@ Permission532=建立/修改服務
 Permission534=刪除服務
 Permission536=查看/管理隱藏服務
 Permission538=匯出服務
+Permission561=Read payment orders by credit transfer
+Permission562=Create/modify payment order by credit transfer
+Permission563=Send/Transmit payment order by credit transfer
+Permission564=Record Debits/Rejections of credit transfer
 Permission650=讀取物料清單
 Permission651=新增/更新物料清單
 Permission652=刪除物料清單
+Permission660=Read Manufacturing Order (MO)
+Permission661=Create/Update Manufacturing Order (MO)
+Permission662=Delete Manufacturing Order (MO)
 Permission701=讀取捐款
 Permission702=建立/修改捐款
 Permission703=刪除捐款
@@ -848,6 +858,8 @@ Permission773=刪除費用報告
 Permission774=讀取全部費用報告(甚至非屬於用戶的下屬)
 Permission775=核准費用報告
 Permission776=支付費用報告
+Permission777=Read expense reports of everybody
+Permission778=Create/modify expense reports of everybody
 Permission779=匯出費用報告
 Permission1001=讀取庫存資訊
 Permission1002=建立/修改倉庫
@@ -900,6 +912,7 @@ Permission2515=設定文件資料夾
 Permission2801=在唯讀模式下使用 FTP 客戶端 (僅瀏覽及下載)
 Permission2802=在寫入模式下使用 FTP 客戶端 (可刪除或上傳檔案)
 Permission3200=讀取存檔的事件和指紋
+Permission3301=Generate new modules
 Permission4001=查看員工
 Permission4002=建立員工
 Permission4003=刪除員工
@@ -947,7 +960,8 @@ Permission63003=刪除資源
 Permission63004=連結資源到行程事件
 DictionaryCompanyType=合作方類型
 DictionaryCompanyJuridicalType=法人合作方
-DictionaryProspectLevel=潛在的可能性
+DictionaryProspectLevel=Prospect potential level for companies
+DictionaryProspectContactLevel=Prospect potential level for contacts
 DictionaryCanton=州/省
 DictionaryRegion=地區
 DictionaryCountry=國家
@@ -977,7 +991,8 @@ DictionaryEMailTemplates=電子郵件範本
 DictionaryUnits=單位
 DictionaryMeasuringUnits=計算單位
 DictionarySocialNetworks=社會網路
-DictionaryProspectStatus=潛在方狀態
+DictionaryProspectStatus=Prospect status for companies
+DictionaryProspectContactStatus=Prospect status for contacts
 DictionaryHolidayTypes=休假類型
 DictionaryOpportunityStatus=專案/潛在的潛在狀態
 DictionaryExpenseTaxCat=費用報表 -交通類別
@@ -1076,7 +1091,7 @@ LoginPage=登入頁面
 BackgroundImageLogin=背景圖片
 PermanentLeftSearchForm=左側選單上的永久搜尋表格
 DefaultLanguage=預設語言
-EnableMultilangInterface=啟用多國語言支援
+EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
 EnableShowLogo=在選單中顯示公司logo
 CompanyInfo=公司/組織
 CompanyIds=公司/組織身分
@@ -1240,7 +1255,8 @@ WarningAtLeastKeyOrTranslationRequired=搜索條件至少要有一個值或翻
 NewTranslationStringToShow=顯示新翻譯字串
 OriginalValueWas=已覆蓋原始翻譯。 原始翻譯是：<br><br>%s
 TransKeyWithoutOriginalValue=您為任何語言文件中都不存在的翻譯密鑰'<strong>%s</strong>'強制進行了新翻譯
-TotalNumberOfActivatedModules=已啟動程式/模組: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Activated modules
+TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=您至少要啟用 1 個模組
 ClassNotFoundIntoPathWarning=在PHP路徑中找不到類別%s
 YesInSummer=是的，在夏天
@@ -1678,7 +1694,7 @@ AGENDA_USE_EVENT_TYPE=使用事件類型（在選單設定->分類->應辦事項
 AGENDA_USE_EVENT_TYPE_DEFAULT=在事件建立表單中自動為事件類型設定此預設值
 AGENDA_DEFAULT_FILTER_TYPE=在應辦事項視圖的搜索過濾器中自動設定此類事件
 AGENDA_DEFAULT_FILTER_STATUS=在應辦事項視圖的搜索過濾器中自動為事件設定此狀態
-AGENDA_DEFAULT_VIEW=當選擇應辦事項功能選單時預設要打開的分頁
+AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda
 AGENDA_REMINDER_EMAIL=<b>通過電子郵件</b>啟用事件提醒（可以在每個事件上定義提醒選項/延遲）。注意：必須啟用模組<strong>%s</strong>並正確設定，以正確的頻率發送提醒。
 AGENDA_REMINDER_BROWSER=<b>在用戶的瀏覽器上</b>啟用事件提醒（到達事件日期時，每個用戶都可以從瀏覽器確認問題中拒絕此事件）
 AGENDA_REMINDER_BROWSER_SOUND=啟用音效警告
@@ -1686,7 +1702,7 @@ AGENDA_SHOW_LINKED_OBJECT=顯示已連結項目到行程的檢視中
 ##### Clicktodial #####
 ClickToDialSetup=點擊撥號模組設定
 ClickToDialUrlDesc=當點選電話圖示時則呼叫網址。在網址中，你可使用標籤<br><b>__PHONETO__</b>，他可取代個人撥打的電話號碼<br><b>__PHONEFROM__</b>，他可以取代個人的電話號碼(您自己的)<br><b>__LOGIN__</b>，他可以取代點選撥打登錄(在用戶卡中定義)<br><b>__PASS__</b>，他可以取代點選撥打密碼(在用戶卡中定義)。
-ClickToDialDesc=此模組可以直接點選電話號碼。點選圖示會呼叫您手機進行撥號。這可用於call center 也就是從 Dolibarr 撥號到 SIP 系統。
+ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
 ClickToDialUseTelLink=在電話號碼中使用 "tel:" 連線
 ClickToDialUseTelLinkDesc=若您的用戶有智慧型手機或是在同一台電腦上已有通訊軟體時使用此方法，則當您在瀏覽器上點選時將連線到 "tel:" 進行呼叫。若您需要完整服務的解決方案(不需要安裝軟體到本機中)，您必須設定為 "否" 及填寫下一欄位。
 ##### Point Of Sale (CashDesk) #####
@@ -1817,6 +1833,7 @@ EnterAnyCode=此欄位包含用於識別行的參考。輸入您選擇的任何
 Enter0or1=輸入0或1
 UnicodeCurrency=在括號之間輸入代表貨幣符號的字元數列表。例如：對於$，輸入[36]-對於巴西R $ [82,36]-對於€，輸入[8364]
 ColorFormat=在 HEX 格式中 RGB 顏色，例如： FF0000
+PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
 PositionIntoComboList=行的位置放到組合清單中
 SellTaxRate=銷貨稅率
 RecuperableOnly=在法國某些州營業稅是 “Not Perceived but Recoverable”。 在其他情況下，則將該值保持為“否”。
@@ -1843,6 +1860,7 @@ MailToSendSupplierRequestForQuotation=要求報價
 MailToSendSupplierOrder=採購訂單
 MailToSendSupplierInvoice=供應商發票
 MailToSendContract=合約
+MailToSendReception=收貨(s)
 MailToThirdparty=合作方
 MailToMember= 會員
 MailToUser=用戶
@@ -1856,6 +1874,7 @@ ExampleOfNewsMessageForMajorRelease=已提供Dolibarr ERP和CRM %s。版本%s是
 ExampleOfNewsMessageForMaintenanceRelease=已提供Dolibarr ERP和CRM %s。版本%s是維護版本，因此僅包含錯誤修復。我們建議所有用戶升級到此版本。維護版本不加入新功能或對資料庫進行更改。您可以從https://www.dolibarr.org下載區域（穩定目錄的子目錄）下載此檔案。您可以閱讀<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>以獲得完整的更改列表。
 MultiPriceRuleDesc=啟用選項“產品/服務的多種價格”後，您可以為每種產品定義不同的價格（一種價格水平一個）。為了節省您的時間，您可以在此處輸入一個規則，根據第一級的價格自動計算每個級別的價格，因此您只需要為每種產品輸入第一級的價格。此頁面旨在節省您的時間，但僅在您每個級別的價格都相對於第一級別時才有用。在大多數情況下，您可以忽略此頁面。
 ModelModulesProduct=產品文件的範本
+WarehouseModelModules=Templates for documents of warehouses
 ToGenerateCodeDefineAutomaticRuleFirst=為了能夠自動產生代碼，您首先必須定義一個管理器來自動定義條碼編號。
 SeeSubstitutionVars=請參閱 * 註釋以取得可能的替代變數清單
 SeeChangeLog=查看變更日誌檔案(僅有英文)
@@ -1894,6 +1913,7 @@ MAIN_PDF_MARGIN_LEFT=PDF左邊邊距
 MAIN_PDF_MARGIN_RIGHT=PDF右邊邊距
 MAIN_PDF_MARGIN_TOP=PDF頂部邊距
 MAIN_PDF_MARGIN_BOTTOM=PDF底部邊距
+MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
 NothingToSetup=此模組不需要特別的設定。
 SetToYesIfGroupIsComputationOfOtherGroups=若此群組是其他群組的計算值，則將其設定為 "是"
 EnterCalculationRuleIfPreviousFieldIsYes=如果先前欄位設定為“是”，則輸入計算規則（例如“ CODEGRP1 + CODEGRP2”）
@@ -1933,13 +1953,14 @@ NothingProcessed=什麼都沒做
 XEmailsDoneYActionsDone=%s電子郵件合格，%s電子郵件已成功處理（對於%s記錄/已完成操作）
 RecordEvent=記錄電子郵件事件
 CreateLeadAndThirdParty=建立潛在(必要時建立合作方)
-CreateTicketAndThirdParty=建立服務單(必要時建立合作方)
+CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation)
 CodeLastResult=最新結果代碼
 NbOfEmailsInInbox=來源資料夾中的電子郵件數量
 LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
 LoadThirdPartyFromNameOrCreate= 在%s載入合作方搜尋 (如果找不到就建立)
-WithDolTrackingID=在訊息ID中找到Dolibarr參考
-WithoutDolTrackingID=在訊息ID中找不到Dolibarr參考
+WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr
+WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr
+CreateCandidature=Create candidature
 FormatZip=Zip
 MainMenuCode=選單輸入代碼（主選單）
 ECMAutoTree=顯示自動ECM樹狀圖
@@ -1981,7 +2002,7 @@ ImportSetup=模組匯入設定
 InstanceUniqueID=實例的唯一ID
 SmallerThan=小於
 LargerThan=大於
-IfTrackingIDFoundEventWillBeLinked=請注意，如果在傳入電子郵件中找到跟踪ID，則該事件將自動連結到相關對象。
+IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into incoming email, or if the email is an answer of an email aready collected and linked to an object, the event will be automatically linked to the known related object too.
 WithGMailYouCanCreateADedicatedPassword=對於GMail帳戶，如果啟用了兩步驗證，建議您為應用程序建立專用的第二個密碼，而不要使用來自https://myaccount.google.com/的帳戶密碼。
 EmailCollectorTargetDir=當成功地寄出電子郵件後，您可能想將電子郵件移動到另一個標籤/資料夾。只需在此處設定一個值即可使用此功能。請注意，您還必須使用可讀/寫的登入帳戶。
 EmailCollectorLoadThirdPartyHelp=您可以使用此操作來使用電子郵件內容在資料庫中尋找並載入現有的合作方。找到（或建立）的合作方將用於需要他的後續操作。在參數欄位中您可以使用例如如果您想要從合作方字串'Name: name to find'中將提取的姓名傳送進到內容中您可以使用欄位參數'EXTRACT:BODY:Name:\\s([^\\s]*)'
@@ -2005,3 +2026,7 @@ RssNote=注意：每個RSS feed定義都提供一個小部件，您必須啟用
 JumpToBoxes=跳至設定 -> 小部件
 MeasuringUnitTypeDesc=使用值例如 "size", "surface", "volume", "weight", "time"
 MeasuringScaleDesc=比例尺是您必須移動小數部分以匹配默認參考單位的位數。對於“時間”單位類型，它是秒數。 80到99之間的值是保留值。
+TemplateAdded=Template added
+TemplateUpdated=Template updated
+TemplateDeleted=Template deleted
+MailToSendEventPush=Template for event reminder emails
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index 43923ffc4b7..dbc8cb5e692 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=事件集數量
 ListOfActions=事件清單
 EventReports=事件報表
 Location=位置
-ToUserOfGroup=給群組成員
+ToUserOfGroup=Event assigned to any user in group
 EventOnFullDay=整天事件
 MenuToDoActions=全部未完成事件
 MenuDoneActions=全部已停止事件
@@ -86,6 +86,8 @@ ProposalDeleted=提案/建議書已刪除
 OrderDeleted=訂單已刪除
 InvoiceDeleted=發票已刪除
 DraftInvoiceDeleted=發票草稿已刪除
+CONTACT_CREATEInDolibarr=Contact %s created
+CONTACT_DELETEInDolibarr=Contact %s deleted
 PRODUCT_CREATEInDolibarr=產品 %s 已建立
 PRODUCT_MODIFYInDolibarr=產品 %s 已修改
 PRODUCT_DELETEInDolibarr=產品 %s 已刪除
@@ -158,3 +160,9 @@ DateStartPlusOne=開始日 +1 小時
 SetAllEventsToTodo=將所有事件設定為待辦事項
 SetAllEventsToInProgress=將所有事件設定為進行中
 SetAllEventsToFinished=將所有事件設定為已完成
+ReminderTime=Reminder period before the event
+TimeType=Duration type
+ReminderType=Callback type
+AddReminder=Create an automatic reminder notification for this event
+ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+BrowserPush=Browser Notification
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 1deee20d364..9dcff47deff 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=最新%s位已記錄供應商
 BoxTitleLastModifiedSuppliers=供應商：最新的%s位已修改
 BoxTitleLastModifiedCustomers=客戶：最新%s位已修改
 BoxTitleLastCustomersOrProspects=最新%s位客戶或潛在方
-BoxTitleLastCustomerBills=最新%s張客戶發票
-BoxTitleLastSupplierBills=最新%s張供應商發票
+BoxTitleLastCustomerBills=最近%s修改的客戶發票
+BoxTitleLastSupplierBills=最近%s修改的供應商發票
 BoxTitleLastModifiedProspects=潛在方：最新%s位已修改
 BoxTitleLastModifiedMembers=最新%s位會員
 BoxTitleLastFicheInter=最新%s筆已修改干預措施
@@ -83,6 +83,8 @@ BoxTitleLatestModifiedSupplierOrders=供應商訂單：最後修改的%s筆
 BoxTitleLastModifiedCustomerBills=客戶發票：最後修改的%s張
 BoxTitleLastModifiedCustomerOrders=銷售訂單：最後修改的%s筆
 BoxTitleLastModifiedPropals=最新%s筆修改的提案/建議書
+BoxTitleLatestModifiedJobPositions=Latest %s modified jobs
+BoxTitleLatestModifiedCandidatures=Latest %s modified candidatures
 ForCustomersInvoices=客戶發票
 ForCustomersOrders=客戶訂單
 ForProposals=提案/建議書
@@ -100,3 +102,5 @@ SuspenseAccountNotDefined=未定義暫記帳戶
 BoxLastCustomerShipments=上次客戶發貨
 BoxTitleLastCustomerShipments=最新%s筆客戶發貨
 NoRecordedShipments=沒有已記錄的客戶發貨
+# Pages
+AccountancyHome=會計
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 14dfbbe6749..59713d97ac3 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -77,7 +77,7 @@ POSModule=POS 模組
 BasicPhoneLayout=在手機上使用基本佈局
 SetupOfTerminalNotComplete=終端機%s的設定尚未完成
 DirectPayment=直接付款
-DirectPaymentButton=直接現金付款按鈕
+DirectPaymentButton=Add a "Direct cash payment" button
 InvoiceIsAlreadyValidated=發票已通過驗證
 NoLinesToBill=無計費項目
 CustomReceipt=自訂收據
@@ -94,12 +94,12 @@ TakeposConnectorMethodDescription=具有附加功能的外部模組。可以從
 PrintMethod=列印方式
 ReceiptPrinterMethodDescription=具有很多參數的強大方法。完全可定制的模板。無法從雲端列印。
 ByTerminal=依照站台
-TakeposNumpadUsePaymentIcon=在數字鍵上使用付款圖示
+TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
 CashDeskRefNumberingModules=POS銷售編號模組
 CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站台
 TakeposGroupSameProduct=群組相同產品線
 StartAParallelSale=開啟新的平行銷售
-ControlCashOpening=打開銷售點時控制收銀機
+ControlCashOpening=Control cash box at opening POS
 CloseCashFence=關閉現金圍籬
 CashReport=現金報告
 MainPrinterToUse=要使用的主印表機
@@ -115,5 +115,10 @@ ScanToOrder=掃描QR Code訂購
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines to show in image box
-DefineTablePlan=Define table plan
+NumberOfLinesToShow=Number of lines of images to show
+DefineTablePlan=Define tables plan
+GiftReceiptButton=Add a "Gift receipt" button
+GiftReceipt=Gift receipt
+ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
+AllowDelayedPayment=Allow delayed payment
+PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index c6b1a038bf3..5465526e4ed 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -69,6 +69,7 @@ SocialContribution=社會稅或財政稅
 SocialContributions=社會稅或財政稅
 SocialContributionsDeductibles=可抵扣的社會稅或財政稅
 SocialContributionsNondeductibles=不可抵扣的社會稅或財政稅
+DateOfSocialContribution=Date of social or fiscal tax
 LabelContrib=捐助標籤
 TypeContrib=捐助類型
 MenuSpecialExpenses=特別支出
diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang
index f8189cee724..d3e8619ee8c 100644
--- a/htdocs/langs/zh_TW/contracts.lang
+++ b/htdocs/langs/zh_TW/contracts.lang
@@ -28,7 +28,7 @@ MenuRunningServices=正在執行的服務
 MenuExpiredServices=已過期服務
 MenuClosedServices=已關閉服務
 NewContract=新合約
-NewContractSubscription=新合約/訂閱
+NewContractSubscription=New contract or subscription
 AddContract=建立合約
 DeleteAContract=刪除合約
 ActivateAllOnContract=啟動所有服務
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 4a4a7216895..4eebe27f1aa 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -136,7 +136,8 @@ ErrorNewValueCantMatchOldValue=新值不能等於舊值
 ErrorFailedToValidatePasswordReset=重置密碼失敗。可能是重新初始化已經完成（此連結只能使用一次）。如果不是，請嘗試再重置密碼一次。
 ErrorToConnectToMysqlCheckInstance=連結資料庫失敗。檢查資料庫伺服器是否正在執行（例如mysql / mariadb，您可以使用“ sudo service mysql start”命令行啟動它）。
 ErrorFailedToAddContact=新增聯絡人失敗
-ErrorDateMustBeBeforeToday=日期不能大於今天
+ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorDateMustBeInFuture=The date must be greater than today
 ErrorPaymentModeDefinedToWithoutSetup=付款方式已設定為%s類型，但模組“發票”尚未完整定義要為此付款方式顯示的資訊設定。
 ErrorPHPNeedModule=錯誤，您的PHP必須安裝模組<b>%s</b>才能使用此功能。
 ErrorOpenIDSetupNotComplete=您設定了Dolibarr設定檔案以允許OpenID身份驗證，但未將OpenID的服務網址定義為常數%s
@@ -239,6 +240,9 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=倉庫“ %s”中產品“
 ErrorOnlyOneFieldForGroupByIsPossible=“群組依據”只能使用1個欄位（其他欄位則被丟棄）
 ErrorTooManyDifferentValueForSelectedGroupBy=為欄位“ <b> %s </b>”發現了太多不同的值（多於<b> %s </b>），因此我們不能將其用作“分組依據”。 “分組依據”欄位已刪除。也許您想將其用作X軸？
 ErrorReplaceStringEmpty=錯誤，要替換的字串為空
+ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
+ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
+ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
 WarningPasswordSetWithNoAccount=為此會員設定了密碼。但是，沒有建立用戶帳戶。因此，雖然密碼已儲存，但不能用於登入Dolibarr。外部模組/界面可以使用它，但是如果您不需要為會員定義任何登入名稱或密碼，則可以從會員模組設定中禁用選項“管理每個會員的登入名稱”。如果您需要管理登入名稱但不需要任何密碼，則可以將此欄位保留為空白以避免此警告。注意：如果會員連結到用戶，電子郵件也可以用作登入名稱。
diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index b0d7bf14a42..4019d6bc785 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -1,8 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopian
 Language_ar_AR=阿拉伯語
 Language_ar_EG=阿拉伯語（埃及）
 Language_ar_SA=阿拉伯語
+Language_az_AZ=Azerbaijani
 Language_bn_BD=孟加拉語
+Language_bn_IN=Bengali (India)
 Language_bg_BG=保加利亞語
 Language_bs_BA=波斯尼亞語
 Language_ca_ES=加泰羅尼亞語
@@ -20,6 +23,7 @@ Language_en_GB=英語（英國）
 Language_en_IN=英國（印度）
 Language_en_NZ=英語（紐西蘭）
 Language_en_SA=英语 (沙特阿拉伯)
+Language_en_SG=English (Singapore)
 Language_en_US=英語（美國）
 Language_en_ZA=英語（南非）
 Language_es_ES=西班牙語
@@ -29,6 +33,7 @@ Language_es_CL=西班牙語（智利）
 Language_es_CO=西班牙語（哥倫比亞）
 Language_es_DO=西班牙語（多明尼加共和國）
 Language_es_EC=西班牙語（厄瓜多爾）
+Language_es_GT=Spanish (Guatemala)
 Language_es_HN=西班牙語（洪都拉斯）
 Language_es_MX=西班牙語（墨西哥）
 Language_es_PA=西班牙語（巴拿馬）
@@ -36,6 +41,7 @@ Language_es_PY=西班牙語（巴拉圭）
 Language_es_PE=西班牙語（秘魯）
 Language_es_PR=西班牙語（波多黎各）
 Language_es_UY=西班牙語（烏拉圭）
+Language_es_GT=Spanish (Guatemala)
 Language_es_VE=西班牙語（委內瑞拉）
 Language_et_EE=愛沙尼亞語
 Language_eu_ES=巴斯克語
@@ -44,15 +50,22 @@ Language_fi_FI=芬蘭語
 Language_fr_BE=法語（比利時）
 Language_fr_CA=法語（加拿大）
 Language_fr_CH=法語（瑞士）
+Language_fr_CI=French (Cost Ivory)
+Language_fr_CM=French (Cameroun)
 Language_fr_FR=法語
+Language_fr_GA=French (Gabon)
 Language_fr_NC=法語 (新喀里多尼亞)
+Language_fr_SN=French (Senegal)
 Language_fy_NL=弗里斯蘭語
+Language_gl_ES=Galician
 Language_he_IL=希伯來語
+Language_hi_IN=Hindi (India)
 Language_hr_HR=克羅地亞語
 Language_hu_HU=匈牙利語
 Language_id_ID=印尼語
 Language_is_IS=冰島語
 Language_it_IT=意大利語
+Language_it_CH=Italian (Switzerland)
 Language_ja_JP=日語
 Language_ka_GE=格魯吉亞人語
 Language_km_KH=高棉語
@@ -64,6 +77,7 @@ Language_lv_LV=拉脫維亞語
 Language_mk_MK=馬其頓語
 Language_mn_MN=蒙古語
 Language_nb_NO=挪威語（Bokmål）
+Language_ne_NP=Nepali
 Language_nl_BE=荷蘭語（比利時）
 Language_nl_NL=荷蘭人
 Language_pl_PL=波蘭語
@@ -86,4 +100,5 @@ Language_uz_UZ=烏茲別克語
 Language_vi_VN=越南語
 Language_zh_CN=簡體中文
 Language_zh_TW=繁體中文
+Language_zh_HK=Chinese (Hong Kong)
 Language_bh_MY=馬來語
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index dbcd1715b72..1ca5e5ccdb1 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -106,7 +106,7 @@ SearchAMailing=搜尋郵件
 SendMailing=發送郵件
 SentBy=寄件人
 MailingNeedCommand=可以從命令行發送電子郵件。請您的伺服器管理員啟動以下命令，以將電子郵件發送給所有收件人：
-MailingNeedCommand2=您可以透過增加MAILING_LIMIT_SENDBYWEB參數並設定每次程序中可發送最大電子郵件數量以在線發送。啟動此功能，請前往首頁-設定-其他。
+MailingNeedCommand2=您可以透過增加MAILING_LIMIT_SENDBYWEB參數並設定每次程序中可發送最大電子郵件數量以線上發送。啟動此功能，請前往首頁-設定-其他。
 ConfirmSendingEmailing=如果要直接從此畫面發送電子郵件，請確認您確定要立即從瀏覽器發送電子郵件嗎？
 LimitSendingEmailing=注意：出於安全性和超時的原因，從Web界面多次進行發送電子郵件已完成，每次發送程序皆一個收件人<b>%s</b> 。
 TargetsReset=清除清單
@@ -164,7 +164,11 @@ NoContactWithCategoryFound=找不到具有類別的聯絡人/地址
 NoContactLinkedToThirdpartieWithCategoryFound=找不到具有類別的聯絡人/地址
 OutGoingEmailSetup=發送電子郵件設定
 InGoingEmailSetup=接收電子郵件設定
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetupForEmailing=外送電子郵件設定（用於模組%s）
 DefaultOutgoingEmailSetup=預設發送電子郵件設定
 Information=資訊
 ContactsWithThirdpartyFilter=帶有合作方過濾器的聯絡人
+Unanswered=Unanswered
+Answered=已回覆
+IsNotAnAnswer=Is not answer (initial email)
+IsAnAnswer=Is an answer of an initial email
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 5d313e1fe9d..d07ee319cac 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -355,8 +355,8 @@ PriceUTTC=單價(含稅)
 Amount=金額
 AmountInvoice=發票金額
 AmountInvoiced=已開發票金額
-AmountInvoicedHT=開票金額（含稅）
-AmountInvoicedTTC=開票金額（不含稅）
+AmountInvoicedHT=開票金額（不含稅）
+AmountInvoicedTTC=Amount invoiced (inc. tax)
 AmountPayment=付款金額
 AmountHTShort=金額（不含）
 AmountTTCShort=金額(含稅)
@@ -485,6 +485,7 @@ Categories=標籤/類別
 Category=標籤/類別
 By=由
 From=從
+FromDate=從
 FromLocation=從
 to=至
 To=至
@@ -687,6 +688,7 @@ Method=方法
 Receive=收到
 CompleteOrNoMoreReceptionExpected=完成或沒有更多的預期
 ExpectedValue=期望值
+ExpectedQty=Expected Qty
 PartialWoman=部分
 TotalWoman=全部
 NeverReceived=從未收到
@@ -703,6 +705,7 @@ MenuECM=文件
 MenuAWStats=AWStats 軟體
 MenuMembers=會員
 MenuAgendaGoogle=Google 行事曆
+MenuTaxesAndSpecialExpenses=Taxes | Special expenses
 ThisLimitIsDefinedInSetup=Dolibarr 的限制（選單 首頁 - 設定 - 安全）： %s Kb, PHP的限制：%s Kb
 NoFileFound=此資料夾沒有任何檔案
 CurrentUserLanguage=目前語言
@@ -725,7 +728,7 @@ Page=頁面
 Notes=備註
 AddNewLine=新增一行
 AddFile=新增檔案
-FreeZone=沒有預先定義的產品/服務
+FreeZone=Free-text product
 FreeLineOfType=自由輸入項目，輸入：
 CloneMainAttributes=複製物件時複製主要屬性
 ReGeneratePDF=重新產生PDF
@@ -942,6 +945,39 @@ ShortThursday=Th
 ShortFriday=Fr
 ShortSaturday=Sa
 ShortSunday=Su
+one=one
+two=two
+three=three
+four=four
+five=five
+six=six
+seven=seven
+eight=eight
+nine=nine
+ten=ten
+eleven=eleven
+twelve=twelve
+thirteen=thirdteen
+fourteen=fourteen
+fifteen=fifteen
+sixteen=sixteen
+seventeen=seventeen
+eighteen=eighteen
+nineteen=nineteen
+twenty=twenty
+thirty=thirty
+forty=forty
+fifty=fifty
+sixty=sixty
+seventy=seventy
+eighty=eighty
+ninety=ninety
+hundred=hundred
+thousand=thousand
+million=million
+billion=billion
+trillion=trillion
+quadrillion=quadrillion
 SelectMailModel=選擇一個電子郵件範本
 SetRef=設定參考
 Select2ResultFoundUseArrows=找到某些結果。使用箭頭選擇。
@@ -1039,3 +1075,11 @@ SwitchInEditModeToAddTranslation=切換到編輯模式以添加該語言的翻
 NotUsedForThisCustomer=未用於此客戶
 AmountMustBePositive=金額必須為正
 ByStatus=依狀態
+InformationMessage=資訊
+Used=Used
+ASAP=As Soon As Possible
+CREATEInDolibarr=Record %s create
+MODIFYInDolibarr=Record %s modified
+DELETEInDolibarr=Record %s deleted
+VALIDATEInDolibarr=Record %s validated
+APPROVEDInDolibarr=Record %s approved
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 04c73132f61..35cda77bdee 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -81,7 +81,7 @@ DeleteType=刪除
 VoteAllowed=允許投票
 Physical=自然人
 Moral=法人
-MorPhy=法人/自然人
+MorPhy=性質
 Reenable=重新啟用
 ResiliateMember=終止會員
 ConfirmResiliateMember=您確定要終止此會員嗎？
diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang
index 0d9de31ce83..160aa9091e2 100644
--- a/htdocs/langs/zh_TW/mrp.lang
+++ b/htdocs/langs/zh_TW/mrp.lang
@@ -1,5 +1,6 @@
 Mrp=製造訂單
 MO=製造訂單
+MOs=Manufacturing orders
 MRPDescription=管理生產和製造訂單（MO）的模組。
 MRPArea=MRP區域
 MrpSetupPage=MRP模組設定
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 58993a24263..0e643a6518f 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -97,10 +97,8 @@ PredefinedMailContentSendSupplierOrder=__(Hello)__\n\n請查看已附上之我
 PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\n請查看已附上之發票__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hello)__\n\n請查看已附上之發貨__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hello)__\n\n請查看已附上之干預__REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentContact=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentLink=如果付款尚未完成您可以點擊以下連結.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 DemoDesc=Dolibarr是一個嚴謹的ERP / CRM，支援多個業務模組。展示所有模組的DEMO沒有意義，因為這種情況永遠不會發生（有數百種可用）。因此，有幾個DEMO設定檔案可用。
 ChooseYourDemoProfil=選擇最適合您需求的DEMO設定檔案...
 ChooseYourDemoProfilMore=...或建立您自己的設定檔案<br>（手動選擇模組）
@@ -280,7 +278,9 @@ LinesToImport=要匯入的行
 
 MemoryUsage=記憶體使用率
 RequestDuration=請求期限
+ProductsPerPopularity=Products/Services by popularity
 PopuProp=依照在提案中受歡迎程度列出的產品/服務
 PopuCom=依照在訂單中受歡迎程度列出的產品/服務
 ProductStatistics=產品/服務統計
 NbOfQtyInOrders=訂單數量
+SelectTheTypeOfObjectToAnalyze=Select the type of object to analyze...
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 4e5460f0336..e9bf2515b0e 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -104,6 +104,7 @@ SetDefaultBarcodeType=設定條碼類型
 BarcodeValue=條碼值
 NoteNotVisibleOnBill=註解(不會在發票或提案/建議書上顯示)
 ServiceLimitedDuration=如果產品是一種有期限的服務：
+FillWithLastServiceDates=Fill with last service line dates
 MultiPricesAbility=每個產品/服務有多個價格區段（每個客戶屬於一個價格區段）
 MultiPricesNumPrices=價格數量
 DefaultPriceType=增加新銷售價格時的每個預設價格（含稅和不含稅）基準
@@ -169,6 +170,8 @@ SuppliersPricesOfProductsOrServices=供應商價格（產品或服務）
 CustomCode=海關/商品/ HS編碼
 CountryOrigin=原產地
 Nature=產品性質（材料/成品）
+NatureOfProductShort=Nature of product
+NatureOfProductDesc=Raw material or finished product
 ShortLabel=短標籤
 Unit=單位
 p=u.
@@ -359,6 +362,9 @@ SelectCombination=選擇組合
 ProductCombinationGenerator=變數產生器
 Features=功能
 PriceImpact=價格影響
+ImpactOnPriceLevel=Impact on price level %s
+ApplyToAllPriceImpactLevel= Apply to all levels
+ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
 WeightImpact=重量影響
 NewProductAttribute=新屬性
 NewProductAttributeValue=新屬性值
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 1abddf41e4a..163b487dd3a 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -178,6 +178,7 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=內部提案人
 TypeContact_project_task_external_TASKCONTRIBUTOR=外部提案人
 SelectElement=選擇元件
 AddElement=連結到元件
+LinkToElementShort=連結到
 # Documents models
 DocumentModelBeluga=已連結項目概述的專案文件範本
 DocumentModelBaleine=任務的專案文件範本
@@ -210,9 +211,9 @@ ProjectNbProjectByMonth=每月建立的專案數
 ProjectNbTaskByMonth=每月建立的任務數
 ProjectOppAmountOfProjectsByMonth=每月的潛在客戶數量
 ProjectWeightedOppAmountOfProjectsByMonth=每月加權的潛在客戶數量
-ProjectOpenedProjectByOppStatus=依照潛在狀態打開專案/ 潛在
-ProjectsStatistics=專案/潛在客戶統計
-TasksStatistics=專案/潛在客戶任務的統計
+ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectsStatistics=Statistics on projects or leads
+TasksStatistics=Statistics on tasks of projects or leads
 TaskAssignedToEnterTime=任務已分配。應該可以輸入此任務的時間。
 IdTaskTime=任務時間ID
 YouCanCompleteRef=如果要使用一些後綴來完成引用，則建議增加-字元以將其分隔，因此自動編號仍可正確用於下一個專案。例如%s-MYSUFFIX
diff --git a/htdocs/langs/zh_TW/recruitment.lang b/htdocs/langs/zh_TW/recruitment.lang
new file mode 100644
index 00000000000..4c77d970239
--- /dev/null
+++ b/htdocs/langs/zh_TW/recruitment.lang
@@ -0,0 +1,70 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# 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/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = 設定
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = 關於
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+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
+
+JobOfferToBeFilled=Job offer 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
+RequestedRemuneration=Requested remuneration
+ProposedRemuneration=Proposed remuneration
+ContractProposed=Contract proposed
+ContractSigned=Contract signed
+RecruitmentCandidature=Candidature
+JobPositions=Job positions
+RecruitmentCandidatures=Candidatures
+InterviewToDo=Interview to do
+AnswerCandidature=Candidature answer
+YourCandidature=Your candidature
+YourCandidatureAnswerMessage=Thanks you for your candidature.<br>...
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index da954b31660..025321db910 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -18,7 +18,7 @@ DeleteSending=刪除傳送
 Stock=庫存
 Stocks=庫存
 MissingStocks=Missing stocks
-StockAtDate=Stock at date
+StockAtDate=Stocks at date
 StockAtDateInPast=Date in past
 StockAtDateInFuture=Date in future
 StocksByLotSerial=依批次/序號的庫存
@@ -95,14 +95,16 @@ RealStock=實際庫存
 RealStockDesc=實體/實際庫存是當前倉庫中的庫存。
 RealStockWillAutomaticallyWhen=實際庫存將根據以下規則（在“庫存”模組中定義）進行修改：
 VirtualStock=虛擬庫存
-VirtualStockDesc=虛擬庫存是指所有未完成的/待處理的操作（影響庫存）都已關閉而計算出的庫存（收到的採購訂單，已發貨的銷售訂單等）。
+VirtualStockAtDate=Virtual stock at date
+VirtualStockAtDateDesc=Virtual stock once all pending orders that are planned to be done before the date will be finished
+VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped, manufacturing orders produced, etc)
 IdWarehouse=編號倉庫
 DescWareHouse=說明倉庫
 LieuWareHouse=本地化倉庫
 WarehousesAndProducts=倉庫和產品
 WarehousesAndProductsBatchDetail=倉庫和產品（有批次/序列的詳細信息）
-AverageUnitPricePMPShort=加權平均投入價格
-AverageUnitPricePMP=加權平均投入價格
+AverageUnitPricePMPShort=加權平均價格
+AverageUnitPricePMPDesc=The input average unit price we had to pay to suppliers to get the product into our stock.
 SellPriceMin=銷售單價
 EstimatedStockValueSellShort=銷售價值
 EstimatedStockValueSell=銷售價值
@@ -141,7 +143,7 @@ Replenishments=補貨
 NbOfProductBeforePeriod=選則期間以前產品%s庫存的數量(<%s）
 NbOfProductAfterPeriod=選則期間之後產品%s庫存的數量(> %s)
 MassMovement=全部活動
-SelectProductInAndOutWareHouse=選擇一項產品，數量，來源倉庫和目標倉庫，然後點擊“ %s”。完成所有必需的移動後，點擊“ %s”。
+SelectProductInAndOutWareHouse=Select a source warehouse and a target warehouse, a product and a quantity then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=記錄轉移
 ReceivingForSameOrder=此訂單的收據
 StockMovementRecorded=庫存變動已記錄
@@ -235,3 +237,6 @@ AlwaysShowFullArbo=在倉庫連結的彈出窗口上顯示完整的倉庫樹狀
 StockAtDatePastDesc=You can view here the stock (real stock) at a given date in the past
 StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in future
 CurrentStock=Current stock
+InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
+UpdateByScaningProductBarcode=Update by scan (product barcode)
+UpdateByScaningLot=Update by scan (lot|Serial barcode)
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 4352742be4a..377ad5d1067 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=低品質
 ReputationForThisProduct=信譽
 BuyerName=買家名稱
 AllProductServicePrices=所有產品/服務價格
-AllProductReferencesOfSupplier=供應商的所有產品/服務參考
+AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=供應商價格
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index 1775c6f78f5..d591079e2f6 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -72,7 +72,6 @@ Deleted=已刪除
 
 # Dict
 Type=類型
-Category=分析代碼
 Severity=嚴重程度
 
 # Email templates
@@ -128,7 +127,6 @@ TicketsAutoAssignTicket=自動分配建立服務單的用戶
 TicketsAutoAssignTicketHelp=建立服務單時，可以自動將用戶分配給服務單。
 TicketNumberingModules=服務單編號模組
 TicketNotifyTiersAtCreation=建立時通知合作方
-TicketGroup=群組
 TicketsDisableCustomerEmail=從公共界面建立服務單時，始終禁用電子郵件
 TicketsPublicNotificationNewMessage=當有新訊息時寄送電子郵件
 TicketsPublicNotificationNewMessageHelp=當公共界面有新增訊息時寄送電子郵件(給已分配用戶或寄送通知電子郵件給(更新)與/或通知電子郵件給)
@@ -162,7 +160,7 @@ CreatedBy=建立者
 NewTicket=新服務單
 SubjectAnswerToTicket=服務單回應
 TicketTypeRequest=需求類型
-TicketCategory=分析代碼
+TicketCategory=群組
 SeeTicket=查閱服務單
 TicketMarkedAsRead=服務單已標記為已讀
 TicketReadOn=繼續讀取
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 6bfe776b2e0..0ae2e4c036f 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -108,6 +108,7 @@ DisabledInMonoUserMode=在維護模式下禁用
 UserAccountancyCode=用戶帳號
 UserLogoff=用戶登出
 UserLogged=用戶登入
+DateOfEmployment=Employment date
 DateEmployment=入職日期
 DateEmploymentEnd=離職日期
 CantDisableYourself=您不能禁用自己的用戶記錄
@@ -116,3 +117,4 @@ ForceUserHolidayValidator=強制使用休假請求驗證
 ValidatorIsSupervisorByDefault=預設情況下，驗證者是用戶的主管。保持空白狀態以保持這種行為。
 UserPersonalEmail=私人信箱
 UserPersonalMobile=私人手機
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 9fabb6f302d..b4c32e4de5a 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -10,7 +10,7 @@ PaymentByBankTransferReceipts=信用轉帳訂單行
 PaymentByBankTransferLines=信用轉帳訂單行
 WithdrawalsReceipts=直接轉帳付款訂單
 WithdrawalReceipt=直接轉帳付款訂單
-BankTransferReceipts=Credit transfer order
+BankTransferReceipts=信用轉帳訂單行
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=最新%s筆信用轉帳訂單
 LastWithdrawalReceipts=最新%s個直接轉帳付款檔案
@@ -63,7 +63,9 @@ InvoiceRefused=發票被拒絕（向客戶收取拒絕費用）
 StatusDebitCredit=借項/貸項狀況
 StatusWaiting=等候
 StatusTrans=傳送
+StatusDebited=Debited
 StatusCredited=已記入
+StatusPaid=已付款
 StatusRefused=已拒絕
 StatusMotif0=未指定
 StatusMotif1=不充足的資金
@@ -77,13 +79,13 @@ StatusMotif8=其他原因
 CreateForSepaFRST=建立直接轉帳付款檔案(SEPA FRST)
 CreateForSepaRCUR=建立直接轉帳付款檔案(SEPA RCUR)
 CreateAll=建立直接轉帳付款檔案(全部)
-CreateFileForPaymentByBankTransfer=建立信用轉帳（全部）
+CreateFileForPaymentByBankTransfer=Create file for credit transfer
 CreateSepaFileForPaymentByBankTransfer=建立信用轉帳文件（SEPA）
 CreateGuichet=只有辦公室
 CreateBanque=只有銀行
 OrderWaiting=等待處理
-NotifyTransmision=提款轉帳
-NotifyCredit=提款額度
+NotifyTransmision=Record file transmission of order
+NotifyCredit=Record credit of order
 NumeroNationalEmetter=國際轉帳編號
 WithBankUsingRIB=用於RIB的銀行帳戶
 WithBankUsingBANBIC=用於IBAN / BIC / SWIFT的銀行帳戶
@@ -93,9 +95,10 @@ CreditDate=信貸
 WithdrawalFileNotCapable=無法為您的國家/地區產生提款收據檔案%s（不支援您的國家/地區）
 ShowWithdraw=顯示直接轉帳付款訂單
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=但是，如果發票中至少有一個直接轉帳付款訂單尚未處理，則不會將其設定為已付款以允許事先提款管理。
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Direct Debit orders to generate and manage the direct debit payment order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Credit transfer orders to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=提款檔案
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
+WithdrawalFile=Debit order file
+CreditTransferFile=Credit transfer file
 SetToStatusSent=設定狀態為“檔案已傳送”
 ThisWillAlsoAddPaymentOnInvoice=這還將記錄發票的付款，如果要支付的餘額為空白，則將其分類為“已付款”
 StatisticsByLineStatus=依照行狀態統計
@@ -121,6 +124,7 @@ SEPAFrstOrRecur=付款方式
 ModeRECUR=定期付款
 ModeFRST=一次性付款
 PleaseCheckOne=請只確認一個
+CreditTransferOrderCreated=Credit transfer order %s created
 DirectDebitOrderCreated=已建立直接轉帳付款訂單%s
 AmountRequested=要求的金額
 SEPARCUR=SEPA CUR
@@ -141,3 +145,4 @@ InfoTransData=金額：%s <br> 方式：%s <br>日期：%s
 InfoRejectSubject=直接轉帳付款訂單已被拒絕
 InfoRejectMessage=您好，<br><br>銀行拒絕了與公司%s相關的發票%s的直接轉帳付款訂單 。%s的金額已被銀行拒絕 <br> <br>--<br> %s
 ModeWarning=未設定實際模式選項，我們將在此模擬後停止
+ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
diff --git a/htdocs/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
index e175ad36476..2139dc0f143 100644
--- a/htdocs/langs/zh_TW/workflow.lang
+++ b/htdocs/langs/zh_TW/workflow.lang
@@ -16,5 +16,8 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=當已確認裝運後（並且如
 # Autoclassify purchase order
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=當供應商發票已確認時（如果發票金額與連接提案的總金額相同），將連接供應商提案分類為開票
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=當供應商發票已確認時（如果發票金額與連接訂單的總金額相同），將連接的採購訂單分類為開票
+descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Autoclose intervention
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
 AutomaticCreation=自動建立
 AutomaticClassification=自動分類
diff --git a/htdocs/langs/zh_TW/zapier.lang b/htdocs/langs/zh_TW/zapier.lang
index 7d8e867e42d..0d40930b895 100644
--- a/htdocs/langs/zh_TW/zapier.lang
+++ b/htdocs/langs/zh_TW/zapier.lang
@@ -26,3 +26,4 @@ ModuleZapierForDolibarrDesc = Zapier的Dolibarr模組
 # Admin page
 #
 ZapierForDolibarrSetup = Zapier的設定
+ZapierDescription=Interface with Zapier
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 82c6521e00f..2a1646a5d80 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -50,7 +50,7 @@ $langs->loadLangs(array("sendings", "bills", 'deliveries', 'orders'));
 
 if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -118,18 +118,14 @@ if ($action == 'add')
 		$db->commit();
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 
 		$_GET["commande_id"] = $_POST["commande_id"];
 		$action = 'create';
 	}
-}
-
-elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
     ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison->creer))
     || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison_advance->validate)))
 )
@@ -147,7 +143,7 @@ elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		$model = $object->modelpdf;
+		$model = $object->model_pdf;
 		$ret = $object->fetch($id); // Reload to get new records
 
 		$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -166,9 +162,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
 		if (!empty($backtopage)) header("Location: ".$backtopage);
 		else header("Location: ".DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1');
 		exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
 }
@@ -195,7 +189,7 @@ 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', 'none'));
+	$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 	if ($ret < 0) $error++;
 
 	if (!$error)
@@ -261,8 +255,7 @@ $formfile = new FormFile($db);
 
 if ($action == 'create')    // Create. Seems to no be used
 {
-}
-else	// View
+} else // View
 {
 	if ($object->id > 0)
 	{
@@ -452,9 +445,7 @@ else	// View
 				print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 1);
 				print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 			}
 			print '</td>';
@@ -475,9 +466,7 @@ else	// View
 				if ($action != 'editincoterm')
 				{
 					print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-				}
-				else
-				{
+				} 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>';
@@ -574,9 +563,7 @@ else	// View
 							}
 
 							$label = (!empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $object->lines[$i]->product_label;
-						}
-						else
-						{
+						} else {
 							$label = (!empty($object->lines[$i]->label) ? $object->lines[$i]->label : $object->lines[$i]->product_label);
 						}
 
@@ -596,9 +583,7 @@ else	// View
 						{
 							print (!empty($object->lines[$i]->description) && $object->lines[$i]->description != $object->lines[$i]->product_label) ? '<br>'.dol_htmlentitiesbr($object->lines[$i]->description) : '';
 						}
-					}
-					else
-					{
+					} else {
 						print "<td>";
 						if ($object->lines[$i]->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
 						else $text = img_object($langs->trans('Product'), 'product');
@@ -673,11 +658,9 @@ else	// View
 				{
 					if ($conf->expedition_bon->enabled)
 					{
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;expid='.$object->origin_id.'&amp;action=delete&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
-					}
-					else
-					{
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;expid='.$object->origin_id.'&amp;action=delete&amp;token='.newToken().'&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
+					} else {
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
 					}
 				}
 
@@ -698,7 +681,7 @@ else	// View
 			$genallowed = $user->rights->expedition->livraison->lire;
 			$delallowed = $user->rights->expedition->livraison->creer;
 
-			print $formfile->showdocuments('livraison', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+			print $formfile->showdocuments('livraison', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
 			/*
 		 	 * Linked object block (of linked shipment)
@@ -719,15 +702,11 @@ else	// View
 			// Rien a droite
 
 			print '</td></tr></table>';
-		}
-		else
-		{
+		} else {
 			/* Expedition non trouvee */
 			print "Expedition inexistante ou acces refuse";
 		}
-	}
-	else
-	{
+	} else {
 		/* Expedition non trouvee */
 		print "Expedition inexistante ou acces refuse";
 	}
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 6c5c6e49611..c612dbf6fe2 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -59,6 +59,11 @@ class Livraison extends CommonObject
 	 */
 	public $table_element_line = "livraisondet";
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'sending';
+
 	public $brouillon;
 	public $socid;
 	public $ref_customer;
@@ -215,25 +220,19 @@ class Livraison extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$error++;
 					$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 			$this->db->rollback();
@@ -320,7 +319,8 @@ class Livraison extends CommonObject
 				$this->note                 = $obj->note_private; //TODO deprecated
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
-				$this->modelpdf             = $obj->model_pdf;
+				$this->model_pdf            = $obj->model_pdf;
+				$this->modelpdf             = $obj->model_pdf;	// deprecated
 				$this->origin               = $obj->origin; // May be 'shipping'
 				$this->origin_id            = $obj->origin_id; // May be id of shipping
 
@@ -344,16 +344,12 @@ class Livraison extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = 'Delivery with id '.$id.' not found sql='.$sql;
 				dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -399,9 +395,7 @@ class Livraison extends CommonObject
 					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 		            {
 		                $numref = $objMod->livraison_get_num($soc, $this);
-		            }
-		            else
-					{
+		            } else {
 		                $numref = $this->ref;
 		            }
             		$this->newref = dol_sanitizeFileName($numref);
@@ -500,17 +494,13 @@ class Livraison extends CommonObject
 			        {
 			            $this->db->commit();
 			            return 1;
-			        }
-			        else
-					{
+			        } else {
 			            $this->db->rollback();
 			            return -1;
 			        }
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = "Non autorise";
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -633,9 +623,7 @@ class Livraison extends CommonObject
 				$this->update_price();
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
 		}
@@ -704,23 +692,17 @@ class Livraison extends CommonObject
                     // End call triggers
 
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror()." - sql=$sql";
 			$this->db->rollback();
 			return -1;
@@ -739,9 +721,9 @@ class Livraison extends CommonObject
 		global $langs;
 
 		$result = '';
-		$picto = 'sending';
 
-		$label = $langs->trans("ShowReceiving").': '.$this->ref;
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowReceiving").'</u>:<br>';
+		$label .= '<b>'.$langs->trans("Status").'</b>: '.$this->ref;
 
 		$url = DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
 
@@ -757,7 +739,7 @@ class Livraison extends CommonObject
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
-		if ($withpicto) $result .= ($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto) $result .= ($linkstart.img_object($label, $this->picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result .= ' ';
 		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
@@ -904,6 +886,8 @@ class Livraison extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
 		$sql .= " AND tosell = 1";
+		$sql .= $this->db->plimit(100);
+
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -990,16 +974,13 @@ class Livraison extends CommonObject
 					if ($row[0] == $objSourceLine->rowid)
 					{
 						$array[$i]['qty'] = $objSourceLine->qty - $row[1];
-					}
-					else
-					{
+					} else {
 						$array[$i]['qty'] = $objSourceLine->qty;
 					}
 
 					$array[$i]['ref'] = $objSourceLine->ref;
 					$array[$i]['label'] = $objSourceLine->label ? $objSourceLine->label : $objSourceLine->description;
-				}
-				elseif ($objSourceLine->qty - $row[1] < 0)
+				} elseif ($objSourceLine->qty - $row[1] < 0)
 				{
 					$array[$i]['qty'] = $objSourceLine->qty - $row[1]." Erreur livraison !";
 					$array[$i]['ref'] = $objSourceLine->ref;
@@ -1009,9 +990,7 @@ class Livraison extends CommonObject
 					$i++;
 			}
 			return $array;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error()." - sql=$sqlSourceLine";
 			return -1;
 		}
@@ -1040,15 +1019,11 @@ class Livraison extends CommonObject
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -1073,8 +1048,8 @@ class Livraison extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'typhon';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->LIVRAISON_ADDON_PDF)) {
 				$modele = $conf->global->LIVRAISON_ADDON_PDF;
 			}
diff --git a/htdocs/loan/calcmens.php b/htdocs/loan/calcmens.php
index b65aa41c4d4..d5f9704addc 100644
--- a/htdocs/loan/calcmens.php
+++ b/htdocs/loan/calcmens.php
@@ -1,6 +1,7 @@
 <?php
 /* TVI
  * Copyright (C) 2015	Florian HENRY 		<florian.henry@open-concept.pro>
+ * Copyright (C) 2020   Maxime DEMAREST     <maxime@indelog.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
@@ -28,7 +29,7 @@ if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
 if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
 
 require '../main.inc.php';
-require DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+require DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 
 $mens = GETPOST('mens');
 $capital = GETPOST('capital');
@@ -40,26 +41,6 @@ top_httphead();
 
 $output = array();
 
-$object = new LoanSchedule($db);
-
-$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);
-
-	$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);
-
-	$capital = $cap_rest;
-	$echance++;
-}
+$output = loanCalcMonthlyPayment($mens, $capital, $rate, $echance, $nbterm);
 
 echo json_encode($output);
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 56b12321bb2..1c4116b34c2 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
  * Copyright (C) 2017       Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2020       Maxime DEMAREST      <maxime@indelog.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
@@ -68,9 +69,7 @@ if (empty($reshook))
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans('LoanPaid'), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($loan->error, null, 'errors');
 		}
 	}
@@ -83,11 +82,9 @@ if (empty($reshook))
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans('LoanDeleted'), null, 'mesgs');
-			header("Location: index.php");
+			header("Location: list.php");
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($loan->error, null, 'errors');
 		}
 	}
@@ -132,8 +129,8 @@ if (empty($reshook))
 				$object->dateend				= $dateend;
 				$object->nbterm					= GETPOST('nbterm');
 				$object->rate = $rate;
-				$object->note_private = GETPOST('note_private', 'none');
-				$object->note_public = GETPOST('note_public', 'none');
+				$object->note_private = GETPOST('note_private', 'restricthtml');
+				$object->note_public = GETPOST('note_public', 'restricthtml');
 				$object->fk_project = GETPOST('projectid', 'int');
 				$object->insurance_amount = GETPOST('insurance_amount', 'int');
 
@@ -153,9 +150,7 @@ if (empty($reshook))
 					$action = 'create';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			header("Location: index.php");
 			exit();
 		}
@@ -176,9 +171,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
 				$action = 'edit';
-			}
-			else
-			{
+			} else {
 				$object->datestart = $datestart;
 				$object->dateend	        = $dateend;
 				$object->capital	        = $capital;
@@ -201,15 +194,11 @@ if (empty($reshook))
 			{
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
 		}
@@ -274,9 +263,7 @@ if ($action == 'create')
 		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
 		$form->select_comptes(GETPOST("accountid"), "accountid", 0, "courant=1", 1); // Show list of bank account with courant
 		print '</td></tr>';
-	}
-	else
-	{
+	} else {
 		print '<tr><td>'.$langs->trans("Account").'</td><td>';
 		print $langs->trans("NoBankAccountDefined");
 		print '</td></tr>';
@@ -359,8 +346,7 @@ if ($action == 'create')
 		print '<td>';
 		print $formaccounting->select_account(GETPOST('accountancy_account_interest') ?GETPOST('accountancy_account_interest') : $conf->global->LOAN_ACCOUNTING_ACCOUNT_INTEREST, 'accountancy_account_interest', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		// Accountancy_account_capital
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
@@ -483,9 +469,7 @@ if ($id > 0)
 			print '<tr><td class="fieldrequired titlefield">'.$langs->trans("LoanCapital").'</td><td>';
 			print '<input name="capital" size="10" value="'.$object->capital.'"></td></tr>';
 			print '</td></tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr><td class="titlefield">'.$langs->trans("LoanCapital").'</td><td>'.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -495,9 +479,7 @@ if ($id > 0)
 		    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
-		{
+		} else {
 		    print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
@@ -507,9 +489,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print $form->selectDate($object->datestart, 'start', 0, 0, 0, 'update', 1, 0);
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->datestart, "day");
 		}
 		print "</td></tr>";
@@ -520,9 +500,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print $form->selectDate($object->dateend, 'end', 0, 0, 0, 'update', 1, 0);
-		}
-		else
-		{
+		} else {
 			print dol_print_date($object->dateend, "day");
 		}
 		print "</td></tr>";
@@ -533,9 +511,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print '<input name="nbterm" size="4" value="'.$object->nbterm.'">';
-		}
-		else
-		{
+		} else {
 			print $object->nbterm;
 		}
 		print '</td></tr>';
@@ -546,9 +522,7 @@ if ($id > 0)
 		if ($action == 'edit')
 		{
 			print '<input name="rate" size="4" value="'.$object->rate.'">%';
-		}
-		else
-		{
+		} else {
 			print price($object->rate).'%';
 		}
 		print '</td></tr>';
@@ -564,15 +538,11 @@ if ($id > 0)
 			if (!empty($conf->accounting->enabled))
 			{
 				print $formaccounting->select_account($object->account_capital, 'accountancy_account_capital', 1, '', 1, 1);
-			}
-			else
-			{
+			} else {
 				print '<input name="accountancy_account_capital" size="16" value="'.$object->account_capital.'">';
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyCapitalCode");
 			print '</td><td>';
@@ -602,15 +572,11 @@ if ($id > 0)
 			if (!empty($conf->accounting->enabled))
 			{
 				print $formaccounting->select_account($object->account_insurance, 'accountancy_account_insurance', 1, '', 1, 1);
-			}
-			else
-			{
+			} else {
 				print '<input name="accountancy_account_insurance" size="16" value="'.$object->account_insurance.'">';
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyInsuranceCode");
 			print '</td><td>';
@@ -640,15 +606,11 @@ if ($id > 0)
 			if (!empty($conf->accounting->enabled))
 			{
 				print $formaccounting->select_account($object->account_interest, 'accountancy_account_interest', 1, '', 1, 1);
-			}
-			else
-			{
+			} else {
 				print '<input name="accountancy_account_interest" size="16" value="'.$object->account_interest.'">';
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="nowrap">';
 			print $langs->trans("LoanAccountancyInterestCode");
 			print '</td><td>';
@@ -726,7 +688,7 @@ if ($id > 0)
 
 			$totalpaid = $total_capital;
 
-			if ($object->paid == 0)
+			if ($object->paid == 0 || $object->paid == 2)
 			{
 				print '<tr><td colspan="5" class="right">'.$langs->trans("AlreadyPaid").' :</td><td class="nowrap right">'.price($totalpaid, 0, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
 				print '<tr><td colspan="5" class="right">'.$langs->trans("AmountExpected").' :</td><td class="nowrap right">'.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
@@ -742,9 +704,7 @@ if ($id > 0)
 			print '</div>';
 
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -778,35 +738,33 @@ if ($id > 0)
 				print '<div class="tabsAction">';
 
 				// Edit
-				if ($object->paid == 0 && $user->rights->loan->write)
+				if (($object->paid == 0 || $object->paid == 2) && $user->rights->loan->write)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
 				}
 
 				// Emit payment
-				if ($object->paid == 0 && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write)
+				if (($object->paid == 0 || $object->paid == 2) && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write)
 				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create&last=true">'.$langs->trans("DoPayment").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans("DoPayment").'</a></div>';
 				}
 
 				// Classify 'paid'
-				if ($object->paid == 0 && round($staytopay) <= 0 && $user->rights->loan->write)
+				if (($object->paid == 0 || $object->paid == 2) && round($staytopay) <= 0 && $user->rights->loan->write)
 				{
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=paid">'.$langs->trans("ClassifyPaid").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=paid&amp;token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>';
 				}
 
 				// Delete
-				if ($object->paid == 0 && $user->rights->loan->delete)
+				if (($object->paid == 0 || $object->paid == 2) && $user->rights->loan->delete)
 				{
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 				}
 
 				print "</div>";
 			}
 		}
-	}
-	else
-	{
+	} else {
 		// Loan not found
 		dol_print_error('', $object->error);
 	}
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 1a24eb6be11..33f3d789806 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -107,6 +107,7 @@ class Loan extends CommonObject
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
+    const STATUS_STARTED = 2;
 
 
 	/**
@@ -160,15 +161,11 @@ class Loan extends CommonObject
 
 				$this->db->free($resql);
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->free($resql);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -258,9 +255,7 @@ class Loan extends CommonObject
 			//dol_syslog("Loans::create this->id=".$this->id);
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -329,9 +324,7 @@ class Loan extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -375,9 +368,7 @@ class Loan extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -395,7 +386,51 @@ class Loan extends CommonObject
 	{
         // phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
-		$sql .= " paid = 1";
+		$sql .= " paid = ".$this::STATUS_PAID;
+		$sql .= " WHERE rowid = ".$this->id;
+		$return = $this->db->query($sql);
+		if ($return) {
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Tag loan as payement started
+	 *
+	 *  @param	User	$user	Object user making change
+	 *  @return	int				<0 if KO, >0 if OK
+	 */
+	public function set_started($user)
+	{
+        // phpcs:enable
+		$sql = "UPDATE ".MAIN_DB_PREFIX."loan SET";
+		$sql .= " paid = ".$this::STATUS_STARTED;
+		$sql .= " WHERE rowid = ".$this->id;
+		$return = $this->db->query($sql);
+		if ($return) {
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Tag loan as payement as unpaid
+	 *
+	 *  @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."loan SET";
+		$sql .= " paid = ".$this::STATUS_UNPAID;
 		$sql .= " WHERE rowid = ".$this->id;
 		$return = $this->db->query($sql);
 		if ($return) {
@@ -439,17 +474,18 @@ class Loan extends CommonObject
 		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');
+            $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");
 			if ($status == 0 && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
 		}
 
 		$statusType = 'status1';
-		if ($status == 0 && $alreadypaid > 0) $statusType = 'status3';
+		if (($status == 0 && $alreadypaid > 0) || $status == self::STATUS_STARTED) $statusType = 'status3';
 		if ($status == 1) $statusType = 'status6';
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
@@ -501,8 +537,7 @@ class Loan extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -571,9 +606,7 @@ class Loan extends CommonObject
 
 			$this->db->free($resql);
 			return $amount;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -618,15 +651,11 @@ class Loan extends CommonObject
 
 				$this->db->free($result);
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->db->free($result);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 3299e810991..4fd4b526d25 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -76,6 +76,11 @@ class LoanSchedule extends CommonObject
      */
     public $fk_bank;
 
+    /**
+     * @var int Loan Payment ID
+     */
+    public $fk_payment_loan;
+
     /**
      * @var int Bank ID
      */
@@ -170,9 +175,7 @@ class LoanSchedule extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
-			}
-			else
-			{
+			} else {
                 $this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -183,9 +186,7 @@ class LoanSchedule extends CommonObject
 		    $this->amount_capital = $totalamount;
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->errors[] = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -202,27 +203,28 @@ 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_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);
@@ -245,6 +247,7 @@ class LoanSchedule extends CommonObject
                 $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;
 
@@ -257,9 +260,7 @@ class LoanSchedule extends CommonObject
             $this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -279,13 +280,14 @@ 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
 		// Put here code to add control on parameters values
@@ -305,6 +307,7 @@ class LoanSchedule extends CommonObject
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
 		$sql .= " fk_bank=".(isset($this->fk_bank) ? $this->fk_bank : "null").",";
+		$sql .= " fk_payment_loan=".(isset($this->fk_payment_loan) ? $this->fk_payment_loan : "null").",";
 		$sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").",";
 		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ? $this->fk_user_modif : "null")."";
 
@@ -321,9 +324,7 @@ class LoanSchedule extends CommonObject
 		{
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -363,9 +364,7 @@ class LoanSchedule extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -415,6 +414,7 @@ class LoanSchedule extends CommonObject
 		$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 .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
@@ -443,6 +443,7 @@ class LoanSchedule extends CommonObject
 				$line->note_private = $obj->note_private;
 				$line->note_public = $obj->note_public;
 				$line->fk_bank = $obj->fk_bank;
+				$line->fk_payment_loan = $obj->fk_payment_loan;
 				$line->fk_user_creat = $obj->fk_user_creat;
 				$line->fk_user_modif = $obj->fk_user_modif;
 
@@ -450,9 +451,7 @@ class LoanSchedule extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 0aa5b2dbf62..9c5c1b559ad 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2020  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2018  Frederic France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Maxime DEMAREST      <maxime@indelog.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,63 +41,63 @@ class PaymentLoan extends CommonObject
 	 */
 	public $table_element = 'payment_loan';
 
-    /**
-     * @var string String with name of icon for PaymentLoan
-     */
-    public $picto = 'money-bill-alt';
+	/**
+	 * @var string String with name of icon for PaymentLoan
+	 */
+	public $picto = 'money-bill-alt';
 
-    /**
-     * @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 = '';
+	public $tms = '';
 
-    /**
-     * @var string Payment date
-     */
-    public $datep = '';
+	/**
+	 * @var string Payment date
+	 */
+	public $datep = '';
 
-    public $amounts = array(); // Array of amounts
+	public $amounts = array(); // Array of amounts
 
-    public $amount_capital; // Total amount of payment
+	public $amount_capital; // Total amount of payment
 
-    public $amount_insurance;
+	public $amount_insurance;
 
-    public $amount_interest;
+	public $amount_interest;
 
-    /**
-     * @var int Payment type ID
-     */
-    public $fk_typepayment;
+	/**
+	 * @var int Payment mode 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 User ID
-     */
-    public $fk_user_creat;
+	/**
+	 * @var int User ID
+	 */
+	public $fk_user_creat;
 
-    /**
-     * @var int user ID
-     */
-    public $fk_user_modif;
+	/**
+	 * @var int user ID
+	 */
+	public $fk_user_modif;
 
-    public $type_code;
-    public $type_label;
+	public $type_code;
+	public $type_label;
 
 
 	/**
@@ -170,9 +171,7 @@ class PaymentLoan extends CommonObject
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -183,9 +182,7 @@ class PaymentLoan extends CommonObject
 			$this->amount_capital = $totalamount;
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -259,9 +256,7 @@ class PaymentLoan extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -331,9 +326,7 @@ class PaymentLoan extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -374,6 +367,40 @@ class PaymentLoan extends CommonObject
 			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 		}
 
+		// Set loan unpaid if loan has no other payment
+		if (!$error)
+		{
+			require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+			$loan = new Loan($this->db);
+			$loan->fetch($this->fk_loan);
+			$sum_payment = $loan->getSumPayment();
+			if ($sum_payment == 0)
+			{
+				dol_syslog(get_class($this)."::delete : set loan to unpaid", LOG_DEBUG);
+				if ($loan->set_unpaid($user) < 1)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
+			}
+		}
+
+		//if (! $error)
+		//{
+		//	if (! $notrigger)
+		//	{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action call a trigger.
+
+				//// Call triggers
+				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+				//$interface=new Interfaces($this->db);
+				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				//// End call triggers
+		//	}
+		//}
+
 		// Commit or rollback
 		if ($error)
 		{
@@ -384,9 +411,7 @@ class PaymentLoan extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -410,6 +435,7 @@ class PaymentLoan extends CommonObject
 		global $conf;
 
 		$error = 0;
+		$this->db->begin();
 
 		if (!empty($conf->banque->enabled))
 		{
@@ -422,9 +448,9 @@ class PaymentLoan extends CommonObject
 			if ($mode == 'payment_loan') $total = -$total;
 
 			// Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
+			$bank_line_id = $acc->addline(
 				$this->datep,
-				$this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
+				$this->fk_typepayment, // Payment mode ID or code ("CHQ or VIR for example")
 				$label,
 				$total,
 				$this->num_payment,
@@ -458,32 +484,50 @@ class PaymentLoan extends CommonObject
 					}
 				}
 
+
 				// Add link 'loan' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
 				if ($mode == 'payment_loan')
 				{
 					$result = $acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label ? $this->label : ''), 'loan');
 					if ($result <= 0) dol_print_error($this->db);
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $acc->error;
 				$error++;
 			}
 		}
 
+
+		// Set loan payment started if no set
 		if (!$error)
 		{
+			require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
+			$loan = new Loan($this->db);
+			$loan->fetch($fk_loan);
+			if ($loan->paid == $loan::STATUS_UNPAID)
+			{
+				dol_syslog(get_class($this)."::addPaymentToBank : set loan payment to started", LOG_DEBUG);
+				if ($loan->set_started($user) < 1)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
+			}
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
 			return 1;
 		}
-		else
-		{
+		else {
+			$this->db->rollback();
 			return -1;
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update link between loan's payment and the line generate in llx_bank
 	 *
@@ -492,18 +536,16 @@ class PaymentLoan extends CommonObject
 	 */
 	public function update_fk_bank($id_bank)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_loan SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result)
 		{
-		    $this->fk_bank = $id_bank;
+			$this->fk_bank = $id_bank;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
@@ -514,9 +556,9 @@ class PaymentLoan extends CommonObject
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=No picto
 	 * 	@param	int		$maxlen						Max length label
-     *	@param	int  	$notooltip					1=Disable tooltip
-     *	@param	string	$moretitle					Add more text to title 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	string	$moretitle					Add more text to title 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, $maxlen = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 6ae646a93a1..442f8768390 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -158,9 +158,7 @@ if ($object->id)
     $permtoedit = $user->rights->loan->write;
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
     print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index 3f87f322ccb..79e38dbdeb1 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -36,8 +36,8 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'loan', '', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -55,7 +55,7 @@ $search_ref = GETPOST('search_ref', 'int');
 $search_label = GETPOST('search_label', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'loanlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
 
 
@@ -120,9 +120,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -152,11 +150,9 @@ if ($resql)
 	if ($search_amount) $param .= "&search_amount=".urlencode($search_amount);
 	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 
-	$newcardbutton = '';
-	if ($user->rights->loan->write)
-	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewLoan'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/loan/card.php?action=create');
-	}
+	$url = DOL_URL_ROOT.'/loan/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewLoan'), '', 'fa fa-plus-circle', $url, '', $user->rights->loan->write);
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -261,9 +257,7 @@ if ($resql)
 	print '</form>'."\n";
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index b739b81ca54..51aa3f85a92 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -57,15 +57,15 @@ 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;
+
 	$result = $payment->delete($user);
 	if ($result > 0)
 	{
 		$db->commit();
-		header("Location: ".DOL_URL_ROOT."/loan/list.php");
+		header("Location: ".DOL_URL_ROOT."/loan/card.php?id=".$fk_loan);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($payment->error, $payment->errors, 'errors');
 		$db->rollback();
 	}
@@ -95,15 +95,13 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->wri
 				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
 			}
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->modelpdf, $outputlangs);
+				$fac->generateDocument($fac->model_pdf, $outputlangs);
 			}
 		}
 
 		header('Location: card.php?id='.$payment->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		setEventMessages($payment->error, $payment->errors, 'errors');
 		$db->rollback();
 	}
@@ -254,9 +252,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -285,10 +281,8 @@ if (empty($action) && !empty($user->rights->loan->delete))
 {
 	if (!$disable_delete)
 	{
-		print '<a class="butActionDelete" href="card.php?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-	}
-	else
-	{
+		print '<a class="butActionDelete" href="card.php?id='.$id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
+	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
 	}
 }
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index ea37a298d49..9aaa75b9845 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2014-2018  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015-2018  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Maxime DEMAREST         <maxime@indelog.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
@@ -27,44 +28,49 @@ require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+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');
-$line_id = GETPOST('line_id', 'int');
-$last = GETPOST('last');
+$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
 $socid = 0;
 if ($user->socid > 0)
-{
 	$socid = $user->socid;
-}
+elseif (GETPOSTISSET('socid')) $socid = GETPOST('socid', 'int');
+if (empty($user->rights->loan->write)) accessforbidden();
 
 $loan = new Loan($db);
 $loan->fetch($chid);
 
-if ($last)
+$echance = 0;
+$ls = new LoanSchedule($db);
+// grab all loanschedule
+$res = $ls->fetchAll($chid);
+if ($res > 0)
 {
-    $ls = new LoanSchedule($db);
-    // grab all loanschedule
-    $res = $ls->fetchAll($chid);
-    if ($res > 0)
+    foreach ($ls->lines as $l)
     {
-        foreach ($ls->lines as $l)
+        $echance++; // Count term pos
+        // last unpaid term
+        if (empty($l->fk_bank))
         {
-            // get the last unpaid loanschedule
-            if (empty($l->fk_bank))
-            {
-                $line_id = $l->id;
-                break;
-            }
+            $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);
@@ -73,6 +79,7 @@ if (!empty($line_id))
         $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;
     }
 }
 
@@ -92,9 +99,7 @@ if ($action == 'add_payment')
 		exit;
 	}
 
-	$datepaid = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-
-	if (!GETPOST('paymenttype', 'int') > 0)
+	if (! GETPOST('paymenttype', 'int') > 0)
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
@@ -114,7 +119,27 @@ if ($action == 'add_payment')
 	{
 		$paymentid = 0;
 
-		$amount = GETPOST('amount_capital') + GETPOST('amount_insurance') + GETPOST('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++;
+        }
+
+        if (empty($remaindertopay))
+        {
+			setEventMessages('Empty sumpaid', null, 'errors');
+			$error++;
+        }
+
 		if ($amount == 0)
 		{
 			setEventMessages($langs->trans('ErrorNoPaymentDefined'), null, 'errors');
@@ -127,16 +152,16 @@ if ($action == 'add_payment')
 
 			// Create a line of payments
 			$payment = new PaymentLoan($db);
-			$payment->chid = $chid;
-			$payment->datep = $datepaid;
-			$payment->label = $loan->label;
-			$payment->amount_capital = GETPOST('amount_capital');
-			$payment->amount_insurance = GETPOST('amount_insurance');
-			$payment->amount_interest = GETPOST('amount_interest');
-			$payment->paymenttype = GETPOST('paymenttype', 'int');
-			$payment->num_payment = GETPOST('num_payment');
-			$payment->note_private      = GETPOST('note_private', 'none');
-			$payment->note_public       = GETPOST('note_public', 'none');
+			$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->paymenttype       = GETPOST('paymenttype', 'int');
+			$payment->num_payment		= GETPOST('num_payment');
+			$payment->note_private      = GETPOST('note_private', 'restricthtml');
+			$payment->note_public       = GETPOST('note_public', 'restricthtml');
 
 			if (!$error)
 			{
@@ -156,22 +181,56 @@ if ($action == 'add_payment')
 					setEventMessages($payment->error, $payment->errors, 'errors');
 					$error++;
 				}
-				elseif (isset($line))
-				{
-					$line->fk_bank = $payment->fk_bank;
-					$line->update($user);
-				}
 			}
 
-			if (!$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)
 			{
 				$db->commit();
 				$loc = DOL_URL_ROOT.'/loan/card.php?id='.$chid;
 				header('Location: '.$loc);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -197,11 +256,23 @@ 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;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$obj=$db->fetch_object($resql);
+		$sumpaid = $obj->total;
+		$db->free();
+	}
+
 	print '<form name="add_payment" action="'.$_SERVER['PHP_SELF'].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="id" value="'.$chid.'">';
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="line_id" value="'.$line_id.'">';
+	print '<input type="hidden" name="remaindertopay" value="'.($total-$sumpaid).'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
     dol_fiche_head();
@@ -211,20 +282,14 @@ if ($action == 'create')
 	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Loan").'</td>';
 
 	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/loan/card.php?id='.$chid.'">'.$chid.'</a></td></tr>';
+    if ($echance > 0)
+    {
+        print '<tr><td>'.$langs->trans("Term").'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/loan/schedule.php?loanid='.$chid.'#n'.$echance.'">'.$echance.'</a></td></tr>'."\n";
+    }
 	print '<tr><td>'.$langs->trans("DateStart").'</td><td colspan="2">'.dol_print_date($loan->datestart, 'day')."</td></tr>\n";
 	print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$loan->label."</td></tr>\n";
 	print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">'.price($loan->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 
-	$sql = "SELECT SUM(amount_capital) as total";
-	$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan";
-	$sql .= " WHERE fk_loan = ".$chid;
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$obj = $db->fetch_object($resql);
-		$sumpaid = $obj->total;
-		$db->free();
-	}
 	print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td colspan="2">'.price($sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td colspan="2">'.price($total - $sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 	print '</tr>';
@@ -239,28 +304,31 @@ if ($action == 'create')
 	print '</tr>';
 
 	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 = empty($conf->global->MAIN_AUTOFILL_DATE) ? (empty($_POST["remonth"]) ?-1 : $datepaye) : 0;
+    if (empty($datepaid))
+        if (empty($ts_temppaid)) $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:dol_now();
+	else $datepayment = $ts_temppaid;
+    else $datepayment = $datepaid;
 	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
 	print "</td>";
+
 	print '</tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td colspan="2">';
-	$form->select_types_paiements(isset($_POST["paymenttype"]) ? $_POST["paymenttype"] : $loan->paymenttype, "paymenttype");
+	$form->select_types_paiements(GETPOSTISSET("paymenttype") ? GETPOST("paymenttype", 'alphanohtml') : $loan->fk_typepayment, "paymenttype");
 	print "</td>\n";
 	print '</tr>';
 
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td colspan="2">';
-	$form->select_comptes(isset($_POST["accountid"]) ? $_POST["accountid"] : $loan->accountid, "accountid", 0, '', 1); // Show opend bank account list
+	$form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1);  // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
 	print '<tr><td>'.$langs->trans('Numero');
 	print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 	print '</td>';
-	print '<td colspan="2"><input name="num_payment" type="text" value="'.GETPOST('num_payment').'"></td></tr>'."\n";
+	print '<td colspan="2"><input name="num_payment" type="text" value="'.GETPOST('num_payment', 'alphanohtml').'"></td></tr>'."\n";
 
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
@@ -290,9 +358,7 @@ if ($action == 'create')
 	if ($loan->datestart > 0)
 	{
 		print '<td class="left" valign="center">'.dol_print_date($loan->datestart, 'day').'</td>';
-	}
-	else
-	{
+	} else {
 		print '<td class="center" valign="center"><b>!!!</b></td>';
 	}
 
@@ -305,28 +371,25 @@ if ($action == 'create')
 	print '<td class="right">';
 	if ($sumpaid < $loan->capital)
 	{
-	    print $langs->trans("LoanCapital").': <input type="text" size="8" name="amount_capital" value="'.$amount_capital.'">';
+        print $langs->trans("LoanCapital") .': <input type="text" size="8" name="amount_capital" value="'.(GETPOSTISSET('amount_capital')?GETPOST('amount_capital'):$amount_capital).'">';
 	}
-	else
-	{
+	else {
 		print '-';
 	}
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
-		print $langs->trans("Insurance").': <input type="text" size="8" name="amount_insurance" value="'.$amount_insurance.'">';
+		print $langs->trans("Insurance") .': <input type="text" size="8" name="amount_insurance" value="'.(GETPOSTISSET('amount_insurance')?GETPOST('amount_insurance'):$amount_insurance).'">';
 	}
-	else
-	{
+	else {
 		print '-';
 	}
 	print '<br>';
 	if ($sumpaid < $loan->capital)
 	{
-		print $langs->trans("Interest").': <input type="text" size="8" name="amount_interest" value="'.$amount_interest.'">';
+		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
-	{
+	else {
 		print '-';
 	}
 	print "</td>";
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index fb3cd86ebe3..55f715fb050 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017      Franck Moreau        <franck.moreau@theobald.com>
  * Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2020      Maxime DEMAREST      <maxime@indelog.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
@@ -27,16 +28,102 @@ require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loanschedule.class.php';
+require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
 
 $loanid = GETPOST('loanid', 'int');
 $action = GETPOST('action', 'aZ09');
 
-$object = new Loan($db);
-$object->fetch($loanid);
+// Security check
+$socid = 0;
+if (GETPOSTISSET('socid')) $socid = GETPOST('socid', 'int');
+if ($user->socid) $socid=$user->socid;
+if (empty($user->rights->loan->calc)) accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "bills", "loan"));
 
+$object = new Loan($db);
+$object->fetch($loanid);
+
+$echeances = new LoanSchedule($db);
+$echeances->fetchAll($object->id);
+
+if ($object->paid > 0 && count($echeances->lines) == 0) $pay_without_schedule = 1;
+
+/*
+ * Actions
+ */
+
+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));
+
+        $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();
+}
+
+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));
+
+        $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();
+}
+
+/*
+ * View
+ */
+
 $title = $langs->trans("Loan").' - '.$langs->trans("Card");
 $help_url = 'EN:Module_Loan|FR:Module_Emprunt';
 llxHeader("", $title, $help_url);
@@ -86,73 +173,17 @@ $morehtmlref .= '</div>';
 
 $morehtmlright = '';
 
-dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
-
-if ($action == 'createecheancier') {
-    $i = 1;
-    while ($i < $object->nbterm + 1) {
-        $date = GETPOST('hi_date'.$i, 'int');
-        $mens = GETPOST('mens'.$i);
-        $int = GETPOST('hi_interets'.$i);
-        $insurance = GETPOST('hi_insurance'.$i);
-
-        $echeance = new LoanSchedule($db);
-
-        $echeance->fk_loan = $object->id;
-        $echeance->datec = dol_now();
-        $echeance->tms = dol_now();
-        $echeance->datep = $date;
-        $echeance->amount_capital = $mens - $int;
-        $echeance->amount_insurance = $insurance;
-        $echeance->amount_interest = $int;
-        $echeance->fk_typepayment = 3;
-        $echeance->fk_bank = 0;
-        $echeance->fk_user_creat = $user->id;
-        $echeance->fk_user_modif = $user->id;
-        $result = $echeance->create($user);
-        if ($result < 0) {
-            setEventMessages($echeance->error, $echeance->errors, 'errors');
-        }
-        $i++;
-    }
-}
-
-if ($action == 'updateecheancier') {
-    $i = 1;
-    while ($i < $object->nbterm + 1) {
-        $mens = GETPOST('mens'.$i);
-        $int = GETPOST('hi_interets'.$i);
-        $id = GETPOST('hi_rowid'.$i);
-        $insurance = GETPOST('hi_insurance'.$i);
-
-        $echeance = new LoanSchedule($db);
-        $echeance->fetch($id);
-        $echeance->tms = dol_now();
-        $echeance->amount_capital = $mens - $int;
-        $echeance->amount_insurance = $insurance;
-        $echeance->amount_interest = $int;
-        $echeance->fk_user_modif = $user->id;
-        $result = $echeance->update($user, 0);
-        if ($result < 0) {
-            setEventMessages(null, $echeance->errors, 'errors');
-        }
-        $i++;
-    }
-}
-
-$echeance = new LoanSchedule($db);
-$echeance->fetchAll($object->id);
-
+dol_banner_tab($object, 'loanid', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
 ?>
 <script type="text/javascript" language="javascript">
 $(document).ready(function() {
 	$('[name^="mens"]').focusout(function() {
 		var echeance=$(this).attr('ech');
-		var mens=$(this).val();
+		var mens=price2numjs($(this).val());
 		var idcap=echeance-1;
 		idcap = '#hi_capital'+idcap;
-		var capital=$(idcap).val();
+		var capital=price2numjs($(idcap).val());
 		console.log("Change montly amount echeance="+echeance+" idcap="+idcap+" capital="+capital);
 		$.ajax({
 			  dataType: 'json',
@@ -178,11 +209,13 @@ $(document).ready(function() {
 </script>
 <?php
 
+if ($pay_without_schedule == 1)
+    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().'">';
 print '<input type="hidden" name="loanid" value="'.$loanid.'">';
-if (count($echeance->lines) > 0)
+if (count($echeances->lines) > 0)
 {
 	print '<input type="hidden" name="action" value="updateecheancier">';
 } else {
@@ -193,7 +226,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="border centpercent">';
 print '<tr class="liste_titre">';
 $colspan = 6;
-if (count($echeance->lines) > 0) $colspan++;
+if (count($echeances->lines) > 0) $colspan++;
 print '<th class="center" colspan="'.$colspan.'">';
 print $langs->trans("FinancialCommitment");
 print '</th>';
@@ -209,10 +242,10 @@ print '<th class="center">'.$langs->trans("CapitalRemain");
 print '<br>('.price($object->capital, 0, '', 1, -1, -1, $conf->currency).')';
 print '<input type="hidden" name="hi_capital0" id ="hi_capital0" value="'.$object->capital.'">';
 print '</th>';
-if (count($echeance->lines) > 0) print '<th>'.$langs->trans('DoPayment').'</th>';
+if (count($echeances->lines) > 0) print '<th class="center">'.$langs->trans('DoPayment').'</th>';
 print '</tr>'."\n";
 
-if ($object->nbterm > 0 && count($echeance->lines) == 0)
+if ($object->nbterm > 0 && count($echeances->lines) == 0)
 {
 	$i = 1;
 	$capital = $object->capital;
@@ -221,7 +254,7 @@ if ($object->nbterm > 0 && count($echeance->lines) == 0)
 	$regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
 	while ($i < $object->nbterm + 1)
 	{
-		$mens = price2num($echeance->calcMonthlyPayments($capital, $object->rate / 100, $object->nbterm - $i + 1), 'MT');
+		$mens = price2num($echeances->calcMonthlyPayments($capital, $object->rate / 100, $object->nbterm - $i + 1), 'MT');
 		$int = ($capital * ($object->rate / 12)) / 100;
 		$int = price2num($int, 'MT');
 		$insu = ($insurance + (($i == 1) ? $regulInsurance : 0));
@@ -237,8 +270,7 @@ if ($object->nbterm > 0 && count($echeance->lines) == 0)
 		$i++;
 		$capital = $cap_rest;
 	}
-}
-elseif (count($echeance->lines) > 0)
+} elseif (count($echeances->lines) > 0)
 {
 	$i = 1;
 	$capital = $object->capital;
@@ -246,7 +278,7 @@ elseif (count($echeance->lines) > 0)
 	$insurance = price2num($insurance, 'MT');
 	$regulInsurance = price2num($object->insurance_amount - ($insurance * $object->nbterm));
 	$printed = false;
-	foreach ($echeance->lines as $line) {
+	foreach ($echeances->lines as $line) {
 		$mens = $line->amount_capital + $line->amount_interest;
 		$int = $line->amount_interest;
 		$insu = ($insurance + (($i == 1) ? $regulInsurance : 0));
@@ -257,7 +289,7 @@ elseif (count($echeance->lines) > 0)
 		print '<td class="center" id ="date'.$i.'"><input type="hidden" name="hi_date'.$i.'" id ="hi_date'.$i.'" value="'.$line->datep.'">'.dol_print_date($line->datep, 'day').'</td>';
 		print '<td class="center" id="insurance'.$i.'">'.price($insu, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_insurance'.$i.'" id ="hi_insurance'.$i.'" value="'.$insu.'">';
 		print '<td class="center" id="interets'.$i.'">'.price($int, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_interets'.$i.'" id ="hi_interets'.$i.'" value="'.$int.'">';
-		if ($line->datep > dol_now() && empty($line->fk_bank)) {
+		if (empty($line->fk_bank)) {
 			print '<td class="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"></td>';
 		} else {
 			print '<td class="center">'.price($mens, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="mens'.$i.'" id ="mens'.$i.'" value="'.$mens.'">';
@@ -265,10 +297,15 @@ elseif (count($echeance->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_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>';
+        }
 		elseif (!$printed)
 		{
-		    print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create&line_id='.$line->id.'">'.$langs->trans('DoPayment').'</a>';
+		    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>';
@@ -283,10 +320,9 @@ print '</div>';
 
 print '</br>';
 
-
-if (count($echeance->lines) == 0) $label = $langs->trans("Create");
+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.'"></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 41a221a7e72..46e8d017eca 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -208,14 +208,10 @@ class MailmanSpip
                     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';
+                    } else $this->error = $mydb->lasterror();
+                } else $this->error = 'Failed to connect to SPIP';
+            } else $this->error = 'BadSPIPConfiguration';
+        } else $this->error = 'SPIPNotEnabled';
 
         return 0;
     }
@@ -249,14 +245,10 @@ class MailmanSpip
                     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';
+                    } else $this->error = $mydb->lasterror();
+                } else $this->error = 'Failed to connect to SPIP';
+            } else $this->error = 'BadSPIPConfiguration';
+        } else $this->error = 'SPIPNotEnabled';
 
         return 0;
     }
@@ -290,25 +282,18 @@ class MailmanSpip
                             // nous avons au moins une reponse
                             $mydb->close($result);
                             return 1;
-                        }
-                        else
-                        {
+                        } else {
                             // nous n'avons pas de reponse => n'existe pas
                             $mydb->close($result);
                             return 0;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $this->error = $mydb->lasterror();
                         $mydb->close();
                     }
-                }
-                else $this->error = 'Failed to connect to SPIP';
-            }
-            else $this->error = 'BadSPIPConfiguration';
-        }
-        else $this->error = 'SPIPNotEnabled';
+                } else $this->error = 'Failed to connect to SPIP';
+            } else $this->error = 'BadSPIPConfiguration';
+        } else $this->error = 'SPIPNotEnabled';
 
         return -1;
     }
@@ -373,13 +358,10 @@ class MailmanSpip
 					{
 						$this->mladded_ko[$list] = $object->email;
 					    return -2;
-					}
-					else $this->mladded_ok[$list] = $object->email;
+					} else $this->mladded_ok[$list] = $object->email;
 	            }
 	            return count($lists);
-	        }
-	        else
-	        {
+	        } else {
 	            $this->error = "ADHERENT_MAILMAN_URL not defined";
 	            return -1;
 	        }
@@ -447,13 +429,10 @@ class MailmanSpip
 					{
 						$this->mlremoved_ko[$list] = $object->email;
 					    return -2;
-					}
-					else $this->mlremoved_ok[$list] = $object->email;
+					} else $this->mlremoved_ok[$list] = $object->email;
 	            }
 	            return count($lists);
-	        }
-	        else
-			{
+	        } else {
 	            $this->error = "ADHERENT_MAILMAN_UNSUB_URL not defined";
 	            return -1;
 	        }
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 553b5245939..e2c4b605dcc 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -49,14 +49,21 @@ if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 }
 
 /**
- * Security: SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).
+ * Security: WAF layer for SQL Injection and XSS Injection (scripts) protection (Filters on GET, POST, PHP_SELF).
  *
- * @param		string		$val		Value
+ * @param		string		$val		Value brut found int $_GET, $_POST or PHP_SELF
  * @param		string		$type		1=GET, 0=POST, 2=PHP_SELF, 3=GET without sql reserved keywords (the less tolerant test)
  * @return		int						>0 if there is an injection, 0 if none
  */
 function testSqlAndScriptInject($val, $type)
 {
+	$val = html_entity_decode($val, ENT_QUOTES);	// So <svg o&#110;load='console.log(&quot;123&quot;)' become <svg onload='console.log(&quot;123&quot;)'
+	// TODO loop to decode until no more thing to decode ?
+
+	// We clean string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)
+	$val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val);	// We should use dol_string_nounprintableascii but function is not yet loaded/available
+	//var_dump($val);
+
 	$inj = 0;
 	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)
 	if ($type == 1 || $type == 3)
@@ -68,6 +75,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
 	}
 	if ($type == 3)
 	{
@@ -80,19 +88,22 @@ function testSqlAndScriptInject($val, $type)
 		$inj += preg_match('/union.+select/i', $val);
 		$inj += preg_match('/(\.\.%2f)+/i', $val);
 	}
-	// For XSS Injection done by closing textarea to exucute content into a textarea field
+	// For XSS Injection done by closing textarea to execute content into a textarea field
 	$inj += preg_match('/<\/textarea/i', $val);
 	// For XSS Injection done by adding javascript with script
 	// This is all cases a browser consider text is javascript:
 	// When it found '<script', 'javascript:', '<style', 'onload\s=' on body tag, '="&' on a tag size with old browsers
 	// All examples on page: http://ha.ckers.org/xss.html#XSScalc
 	// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
-	$inj += preg_match('/<script/i', $val);
-	$inj += preg_match('/<iframe/i', $val);
 	$inj += preg_match('/<audio/i', $val);
+	$inj += preg_match('/<embed/i', $val);
+	$inj += preg_match('/<iframe/i', $val);
+	$inj += preg_match('/<object/i', $val);
+	$inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/Set\.constructor/i', $val); // ECMA script 6
 	if (!defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
-	$inj += preg_match('/base[\s]+href/si', $val);
+	$inj += preg_match('/base\s+href/si', $val);
+	$inj += preg_match('/=data:/si', $val);
 	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp
 	$inj += preg_match('/onmouse([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
 	$inj += preg_match('/ondrag([a-z]*)\s*=/i', $val); //
@@ -104,13 +115,13 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting)\s*=/i', $val);
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
 	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
-	//if ($type == 1)
-	//{
-		$inj += preg_match('/javascript:/i', $val);
-		$inj += preg_match('/vbscript:/i', $val);
-	//}
+	$inj += preg_match('/javascript\s*:/i', $val);
+	$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) $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
+	if ($type == 1) {
+		$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.
 	return $inj;
 }
@@ -131,17 +142,21 @@ function analyseVarsForSqlAndScriptsInjection(&$var, $type)
 			if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))
 			{
 				//$var[$key] = $value;	// This is useless
-			}
-			else
-			{
-				print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
+			} else {
+				// Get remote IP: PS: We do not use getRemoteIP(), function is not yet loaded and we need a value that can't be spoofed
+				$ip = (empty($_SERVER['REMOTE_ADDR']) ? 'unknown' : $_SERVER['REMOTE_ADDR']);
+				$errormessage = 'Access refused to '.$ip.' by SQL or Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
+				print $errormessage;
+				// Add entry into error log
+				if (function_exists('error_log')) {
+					error_log($errormessage);
+				}
+				// TODO Add entry into security audit table
 				exit;
 			}
 		}
 		return true;
-	}
-	else
-	{
+	} else {
 		return (testSqlAndScriptInject($var, $type) <= 0);
 	}
 }
@@ -163,7 +178,10 @@ if (!empty($_SERVER["PHP_SELF"]))
 // Sanity check on GET parameters
 if (!defined('NOSCANGETFORINJECTION') && !empty($_SERVER["QUERY_STRING"]))
 {
-	$morevaltochecklikeget = array($_SERVER["QUERY_STRING"]);
+	// Note: QUERY_STRING is url encoded, but $_GET and $_POST are already decoded
+	// Because the analyseVarsForSqlAndScriptsInjection is designed for already url decoded value, we must decode QUERY_STRING
+	// Another solution is to provide $_GET as parameter
+	$morevaltochecklikeget = array(urldecode($_SERVER["QUERY_STRING"]));
 	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget, 1);
 }
 // Sanity check on POST
@@ -203,25 +221,25 @@ if (!empty($_POST["DOL_AUTOSET_COOKIE"]))
 }
 
 
-// Init session. Name of session is specific to Dolibarr instance.
-// Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
-$prefix = dol_getprefix('');
+// Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc
+require_once 'master.inc.php';
 
+// Init session. Name of session is specific to Dolibarr instance.
+// Must be done after the include of master.inc.php so $conf file is loaded and vars like $dolibarr_main_force_https are set.
+// Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
+$prefix = dol_getprefix('');		// This uses the $conf file
 $sessionname = 'DOLSESSID_'.$prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
 if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 session_name($sessionname);
-// This create lock, released when session_write_close() or end of page.
+// This create lock, released by session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
 if (!defined('NOSESSION'))
 {
 	session_start();
 }
 
-// Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc
-require_once 'master.inc.php';
-
 // Activate end of page function
 register_shutdown_function('dol_shutdown');
 
@@ -269,14 +287,11 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
 			{
 				$newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
 			}
-		}
-		else	// Check HTTPS environment variable (Apache/mod_ssl only)
-		{
+		} else {
+			// Check HTTPS environment variable (Apache/mod_ssl only)
 			$newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
 		}
-	}
-	else
-	{
+	} else {
 		// Check HTTPS environment variable (Apache/mod_ssl only)
 		$newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];
 	}
@@ -287,9 +302,7 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
 		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
 		header("Location: ".$newurl);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
 	}
 }
@@ -353,28 +366,48 @@ if (!defined('NOTOKENRENEWAL'))
 	$_SESSION['newtoken'] = $token;
 }
 
-//var_dump(GETPOST('token').' '.$_SESSION['token'].' - '.newToken().' '.$_SERVER['SCRIPT_FILENAME']);
+//dol_syslog("aaaa - ".defined('NOCSRFCHECK')." - ".$dolibarr_nocsrfcheck." - ".$conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN." - ".$_SERVER['REQUEST_METHOD']." - ".GETPOST('token', 'alpha').' '.$_SESSION['token']);
 //$dolibarr_nocsrfcheck=1;
 // Check token
-//var_dump((! defined('NOCSRFCHECK')).' '.empty($dolibarr_nocsrfcheck).' '.(! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)).' '.$_SERVER['REQUEST_METHOD'].' '.(! GETPOSTISSET('token')));
 if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
 	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set
 {
-	if ($_SERVER['REQUEST_METHOD'] == 'POST' && !GETPOSTISSET('token')) // Note: offender can still send request by GET
+	// Check all cases that need a token (all POST actions, all actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set, all sensitive GET actions)
+	if ($_SERVER['REQUEST_METHOD'] == 'POST' ||
+		((GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN')) ||
+		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deleteprof', 'deletepayment')))
 	{
-		dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused by CSRFCHECK_WITH_TOKEN protection. Token not provided.");
-		print "Access by POST method refused by CSRF protection in main.inc.php. Token not provided.\n";
-		print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0 into setup).\n";
-		die;
+		if (!GETPOSTISSET('token')) {
+			if (GETPOST('uploadform', 'int')) {
+				dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused. File size too large.");
+				$langs->loadLangs(array("errors", "install"));
+				print $langs->trans("ErrorFileSizeTooLarge").' ';
+				print $langs->trans("ErrorGoBackAndCorrectParameters");
+				die;
+			} else {
+				dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused by CSRFCHECK_WITH_TOKEN protection. Token not provided.");
+				print "Access to this page this way (POST method or page with CSRFCHECK_WITH_TOKEN on or having a sensible value for action parameter) is refused by CSRF protection in main.inc.php. Token not provided.\n";
+				print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file or MAIN_SECURITY_CSRF_WITH_TOKEN to 0 into setup).\n";
+				die;
+			}
+		}
 	}
 
 	if (GETPOSTISSET('token') && GETPOST('token', 'alpha') != $_SESSION['token'])
 	{
 		dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused due to invalid token, so we disable POST and some GET parameters - referer=".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
 		//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
-		if ($conf->global->MAIN_FEATURES_LEVEL > 1) setEventMessages('Unset POST by CSRF protection in main.inc.php (POST for this token was already done or was done by a not allowed web page with a wrong token).'."<br>\n".'$_SERVER[REQUEST_URI] = '.$_SERVER['REQUEST_URI'].' $_SERVER[REQUEST_METHOD] = '.$_SERVER['REQUEST_METHOD'].' GETPOST(token) = '.GETPOST('token', 'alpha').' $_SESSION[token] = '.$_SESSION['token'], null, 'warnings');
+		setEventMessages('SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry', null, 'warnings');
+		//if ($conf->global->MAIN_FEATURES_LEVEL >= 1) setEventMessages('Unset POST and GET params by CSRF protection in main.inc.php (Token provided was not generated by the previous page).'."<br>\n".'$_SERVER[REQUEST_URI] = '.$_SERVER['REQUEST_URI'].' $_SERVER[REQUEST_METHOD] = '.$_SERVER['REQUEST_METHOD'].' GETPOST(token) = '.GETPOST('token', 'alpha').' $_SESSION[token] = '.$_SESSION['token'], null, 'warnings');
+		$savid = ((int) $_POST['id']);
 		unset($_POST);
+		//unset($_POST['action']); unset($_POST['massaction']);
+		//unset($_POST['confirm']); unset($_POST['confirmmassaction']);
 		unset($_GET['confirm']);
+		unset($_GET['action']);
+		unset($_GET['confirmmassaction']);
+		unset($_GET['massaction']);
+		$_POST['id'] = ((int) $savid);
 	}
 }
 
@@ -430,9 +463,7 @@ if (!defined('NOLOGIN'))
 	if (defined('MAIN_AUTHENTICATION_MODE'))
 	{
 		$dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
-	}
-	else
-	{
+	} else {
 		// Authentication mode
 		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
 		// Authentication mode: forceuser
@@ -526,7 +557,7 @@ if (!defined('NOLOGIN'))
 
 		$allowedmethodtopostusername = 2;
 		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
-		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username", "alpha", $allowedmethodtopostusername));
+		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['login_dolibarr']) : GETPOST("username", "alpha", $allowedmethodtopostusername));
 		$passwordtotest = GETPOST('password', 'none', $allowedmethodtopostusername);
 		$entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
@@ -551,6 +582,10 @@ if (!defined('NOLOGIN'))
 		if ($test && $goontestloop && (GETPOST('actionlogin', 'aZ09') == 'login' || $dolibarr_main_authentication != 'dolibarr'))
 		{
 			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
+			if ($login === '--bad-login-validity--') {
+				$login = '';
+			}
+
 			if ($login)
 			{
 				$dol_authmode = $conf->authmode; // This properties is defined only when logged, to say what mode was successfully used
@@ -607,11 +642,16 @@ if (!defined('NOLOGIN'))
 			// No data to test login, so we show the login page.
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit");
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-			else dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
+			else {
+				if ($_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
+					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));
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));	// login was retreived previously when checking password.
 		if ($resultFetchUser <= 0)
 		{
 			dol_syslog('User not found, connexion refused');
@@ -657,13 +697,11 @@ if (!defined('NOLOGIN'))
 			exit;
 		} else {
 			// User is loaded, we may need to change language for him according to its choice
-			if (! empty($user->conf->MAIN_LANG_DEFAULT)) {
+			if (!empty($user->conf->MAIN_LANG_DEFAULT)) {
 				$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
 			}
 		}
-	}
-	else
-	{
+	} else {
 		// We are already into an authenticated session
 		$login = $_SESSION["dol_login"];
 		$entity = $_SESSION["dol_entity"];
@@ -713,9 +751,7 @@ if (!defined('NOLOGIN'))
 			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
-		}
-		else
-		{
+		} else {
 		    // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 		    $hookmanager->initHooks(array('main'));
 
@@ -817,9 +853,7 @@ if (!defined('NOLOGIN'))
 			session_destroy();
 			dol_print_error($db, 'Error in some triggers USER_LOGIN or in some hooks afterLogin');
 			exit;
-		}
-		else
-		{
+		} else {
 			$db->commit();
 		}
 
@@ -872,13 +906,13 @@ if (GETPOST('theme', 'alpha'))
 }
 
 // Set javascript option
-if (!GETPOST('nojs', 'int'))   // If javascript was not disabled on URL
-{
-	if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
-	{
+if (GETPOST('nojs', 'int')) {  // If javascript was not disabled on URL
+	$conf->use_javascript_ajax = 0;
+} else {
+	if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT)) {
 		$conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
 	}
-} else $conf->use_javascript_ajax = 0;
+}
 
 // Set MAIN_OPTIMIZEFORTEXTBROWSER for user (must be after login part)
 if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
@@ -948,8 +982,7 @@ if (!defined('NOLOGIN'))
 	$user->getrights();
 }
 
-
-dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09'));
+dol_syslog("--- Access to ".$_SERVER["REQUEST_METHOD"].' '.$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09'));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
@@ -983,9 +1016,7 @@ if (empty($conf->browser->firefox))
 	define('ROWS_7', 7);
 	define('ROWS_8', 8);
 	define('ROWS_9', 9);
-}
-else
-{
+} else {
 	define('ROWS_1', 0);
 	define('ROWS_2', 1);
 	define('ROWS_3', 2);
@@ -1005,9 +1036,8 @@ if (!defined('NOREQUIREMENU'))
 	if (empty($user->socid))    // If internal user or not defined
 	{
 		$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
-	}
-	else                        // If external user
-	{
+	} else {
+		// If external user
 		$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
@@ -1150,8 +1180,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
 			header("Content-Security-Policy: ".$contentsecuritypolicy);
 		}
-	}
-	elseif (constant('FORCECSP'))
+	} elseif (constant('FORCECSP'))
 	{
 		header("Content-Security-Policy: ".constant('FORCECSP'));
 	}
@@ -1259,6 +1288,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (GETPOSTISSET('dol_optimize_smallscreen')) { $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
 		if (GETPOSTISSET('dol_no_mouse_hover')) { $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
 		if (GETPOSTISSET('dol_use_jmobile')) { $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); }
+		if (GETPOSTISSET('THEME_DARKMODEENABLED')) { $themeparam .= '&amp;THEME_DARKMODEENABLED='.GETPOST('THEME_DARKMODEENABLED', 'int'); }
 		if (GETPOSTISSET('THEME_SATURATE_RATIO')) { $themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int'); }
 
 		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
@@ -1330,9 +1360,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			    if (preg_match('/^(http|\/\/)/i', $cssfile))
 			    {
 			        $urltofile = $cssfile;
-			    }
-			    else
-			    {
+			    } else {
 			        $urltofile = dol_buildpath($cssfile, 1);
 			    }
 				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.$urltofile;
@@ -1358,49 +1386,16 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			else print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			if (!defined('DISABLE_JQUERY_TABLEDND')) print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			// jQuery jnotify
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY'))
-			{
+			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
-			// Flot
-			if (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'jflot')
-			{
-				if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT'))
-				{
-					if (constant('JS_JQUERY_FLOT'))
-					{
-						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-						print '<script src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-					}
-					else
-					{
-						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-						print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-						/* Test for jflot 4.2 -> not better than current
-						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.canvaswrapper.js"></script>'."\n";
-						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.colorhelpers.js"></script>'."\n";
-						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.js"></script>'."\n";
-						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.js"></script>'."\n";
-						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.js"></script>'."\n";
-						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.saturated.js"></script>'."\n";
-						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.browser.js"></script>'."\n";
-						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.drawSeries.js"></script>'."\n";
-						print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.uiConstants.js"></script>'."\n";
-						*/
-					}
-				}
-			}
 			// Chart
-			if ($conf->global->MAIN_JS_GRAPH == 'chart')
-			{
+			if (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'chart') {
 				print '<script src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/Chart.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 
 			// jQuery jeditable for Edit In Place features
-			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE'))
-			{
+			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE')) {
 				print '<!-- JS to manage editInPlace feature -->'."\n";
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -1419,13 +1414,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				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'))
-            {
+            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", ...
-            {
+            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
             }
@@ -1435,16 +1429,15 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
             }
 		}
 
-        if (!$disablejs && !empty($conf->use_javascript_ajax))
-        {
+        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
-                {
+                if (constant('JS_CKEDITOR')) {
+                    // To use external ckeditor 4 js lib
                 	$pathckeditor = constant('JS_CKEDITOR');
                 }
                 print '<script><!-- enable ckeditor by main.inc.php -->';
@@ -1458,9 +1451,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
                 if (GETPOST('mode', 'aZ09') == 'Full_inline')
                 {
                 	print 'CKEDITOR.disableAutoInline = false;'."\n";
-                }
-                else
-                {
+                } else {
                 	print 'CKEDITOR.disableAutoInline = true;'."\n";
                 }
                 print '</script>'."\n";
@@ -1506,9 +1497,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
                     if (preg_match('/^(http|\/\/)/i', $jsfile))
                     {
                         print '<script src="'.$jsfile.'"></script>'."\n";
-                    }
-                    else
-                    {
+                    } else {
                         print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
                     }
                 }
@@ -1589,10 +1578,8 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			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;
+			} else $appli .= " ".DOL_VERSION;
+		} else $appli .= " ".DOL_VERSION;
 
 		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
@@ -1607,9 +1594,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				$logouttext .= '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
 				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin');
 				$logouttext .= '</a>';
-			}
-			else
-			{
+			} else {
 				$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 				$logouttext .= img_picto($langs->trans('Logout'), 'sign-out', '', false, 0, 0, '', 'atoplogin opacitymedium');
 			}
@@ -1626,11 +1611,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		{
 			if ($result == 0)
 				$toprightmenu .= $hookmanager->resPrint; // add
-			else
+			else {
 				$toprightmenu = $hookmanager->resPrint; // replace
-		}
-		else
-		{
+			}
+		} else {
 			$toprightmenu .= $result; // For backward compatibility
 		}
 
@@ -1725,6 +1709,11 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			$toprightmenu .= top_menu_search();
 		}
 
+		if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) {
+			// Add search dropdown
+			$toprightmenu .= top_menu_quickadd();
+		}
+
 		// Add bookmark dropdown
 		$toprightmenu .= top_menu_bookmark();
 
@@ -1768,8 +1757,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     {
         $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 {
+    } 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';
@@ -1822,8 +1810,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     {
         if ($result == 0) {
             $dropdownBody .= $hookmanager->resPrint; // add
-        }
-        else {
+        } else {
             $dropdownBody = $hookmanager->resPrint; // replace
         }
     }
@@ -1849,10 +1836,8 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     	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;
+    	} else $appli .= " ".DOL_VERSION;
+    } else $appli .= " ".DOL_VERSION;
 
     if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	    $btnUser = '<!-- div for user link -->
@@ -1870,7 +1855,8 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 		if ($user->datepreviouslogin) {
 			$btnUser .= '<small class="classfortooltip" title="'.$langs->trans("PreviousConnexion").'" ><i class="fa fa-user-clock"></i> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser').'</small><br>';
 		}
-		$btnUser .= '<small class="classfortooltip"><i class="fa fa-cog"></i> '.$langs->trans("Version").' '.$appli.'</small>
+		//$btnUser .= '<small class="classfortooltip"><i class="fa fa-cog"></i> '.$langs->trans("Version").' '.$appli.'</small>';
+		$btnUser .= '
 	                </p>
 	            </div>
 
@@ -1937,6 +1923,224 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
     return $btnUser;
 }
 
+/**
+ * Build the tooltip on top menu quick add
+ *
+ * @return  string                  HTML content
+ */
+function top_menu_quickadd()
+{
+	global $langs, $conf, $db, $hookmanager, $user;
+	global $menumanager;
+	$html = '';
+	// Define $dropDownQuickAddHtml
+	$dropDownQuickAddHtml = '<div class="dropdown-header bookmark-header center">';
+	$dropDownQuickAddHtml .= $langs->trans('QuickAdd');
+	$dropDownQuickAddHtml .= '</div>';
+
+	$dropDownQuickAddHtml .= '<div class="quickadd-body dropdown-body">';
+	$dropDownQuickAddHtml .= '<div class="quickadd">';
+	if (!empty($conf->societe->enabled) && $user->rights->societe->creer) {
+		$langs->load("companies");
+		$dropDownQuickAddHtml .= '
+                <!-- Thirdparty link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/societe/card.php?action=create" title="'.$langs->trans("MenuNewThirdParty").'">
+                        <i class="fa fa-building"></i><br>
+                        '.$langs->trans("ThirdParty").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->societe->enabled) && $user->rights->societe->contact->creer) {
+		$langs->load("companies");
+		$dropDownQuickAddHtml .= '
+                <!-- Contact link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/contact/card.php?action=create" title="'.$langs->trans("NewContactAddress").'">
+                        <i class="fa fa-address-book"></i><br>
+                        '.$langs->trans("Contact").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->propal->enabled) && $user->rights->propale->creer) {
+		$langs->load("propal");
+		$dropDownQuickAddHtml .= '
+                <!-- Propal link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create" title="'.$langs->trans("NewPropal").'">
+                        <i class="fa fa-suitcase"></i><br>
+                        '.$langs->trans("Proposal").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->commande->enabled) && $user->rights->commande->creer) {
+		$langs->load("orders");
+		$dropDownQuickAddHtml .= '
+                <!-- Order link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">
+                        <i class="fa fa-file-alt"></i><br>
+                        '.$langs->trans("Order").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->facture->enabled) && $user->rights->facture->creer) {
+		$langs->load("bills");
+		$dropDownQuickAddHtml .= '
+                <!-- Invoice link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">
+                        <i class="fa fa-coins"></i><br>
+                        '.$langs->trans("Bill").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer) {
+		$langs->load("contracts");
+		$dropDownQuickAddHtml .= '
+                <!-- Contract link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewContractSubscription").'">
+                        <i class="fa fa-file-contract"></i><br>
+                        '.$langs->trans("Contract").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) {
+		$langs->load("supplier_proposal");
+		$dropDownQuickAddHtml .= '
+                <!-- Supplier proposal link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create" title="'.$langs->trans("NewAskPrice").'">
+                        <i class="fa fa-suitcase"></i><br>
+                        '.$langs->trans("AskPrice").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->creer) {
+		$langs->load("orders");
+		$dropDownQuickAddHtml .= '
+                <!-- Supplier order link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">
+                        <i class="fa fa-file-alt"></i><br>
+                        '.$langs->trans("SupplierOrder").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->creer) {
+		$langs->load("bills");
+		$dropDownQuickAddHtml .= '
+                <!-- Supplier invoice link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">
+                        <i class="fa fa-coins"></i><br>
+                        '.$langs->trans("SupplierBill").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->product->enabled) && $user->rights->produit->creer) {
+		$langs->load("products");
+		$dropDownQuickAddHtml .= '
+                <!-- Product link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=0" title="'.$langs->trans("NewProduct").'">
+                        <i class="fa fa-cube"></i><br>
+                        '.$langs->trans("Product").'
+                    </a>
+                </div>
+                ';
+	}
+
+	if (!empty($conf->service->enabled) && $user->rights->service->creer) {
+		$langs->load("products");
+		$dropDownQuickAddHtml .= '
+                <!-- Service link -->
+                <div class="quickaddblock center">
+                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=1" title="'.$langs->trans("NewService").'">
+                        <i class="fa fa-concierge-bell"></i><br>
+                        '.$langs->trans("Service").'
+                    </a>
+                </div>
+                ';
+	}
+
+	// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
+	$parameters = array();
+	$result = $hookmanager->executeHooks('printQuickAddBlock', $parameters); // Note that $action and $object may have been modified by some hooks
+	if (is_numeric($result)) {
+		if ($result == 0) {
+			$dropDownQuickAddHtml .= $hookmanager->resPrint; // add
+		} else {
+			$dropDownQuickAddHtml = $hookmanager->resPrint; // replace
+		}
+	} else {
+		$dropDownQuickAddHtml .= $result; // For backward compatibility
+	}
+
+	$dropDownQuickAddHtml .= '</div>';
+	$dropDownQuickAddHtml .= '</div>';
+
+	$html .= '<!-- div for quick add link -->
+    <div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">
+        <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$langs->trans('QuickAddMenuShortCut').')">
+            <i class="fa fa-plus-circle" ></i>
+        </a>
+
+        <div class="dropdown-menu">
+            '.$dropDownQuickAddHtml.'
+        </div>
+    </div>';
+	$html .= '
+        <!-- Code to show/hide the user drop-down -->
+        <script>
+        $( document ).ready(function() {
+            $(document).on("click", function(event) {
+                if (!$(event.target).closest("#topmenu-quickadd-dropdown").length) {
+                    // Hide the menus.
+                    $("#topmenu-quickadd-dropdown").removeClass("open");
+                }
+            });
+            $("#topmenu-quickadd-dropdown .dropdown-toggle").on("click", function(event) {
+                openQuickAddDropDown();
+            });
+            // Key map shortcut
+            $(document).keydown(function(e){
+                  if( e.which === 76 && e.ctrlKey && e.shiftKey ){
+                     console.log(\'control + shift + l : trigger open quick add dropdown\');
+                     openQuickAddDropDown();
+                  }
+            });
+
+
+            var openQuickAddDropDown = function() {
+                event.preventDefault();
+                $("#topmenu-quickadd-dropdown").toggleClass("open");
+                //$("#top-quickadd-search-input").focus();
+            }
+        });
+        </script>
+        ';
+	return $html;
+}
 
 /**
  * Build the tooltip on top menu bookmark
@@ -2243,10 +2447,8 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 				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;
+				} else $appli .= " ".DOL_VERSION;
+			} else $appli .= " ".DOL_VERSION;
 			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
 			if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
 			else print '<span class="help">';
@@ -2300,8 +2502,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			if (empty($reshook))
 			{
 				$bugbaseurl .= $hookmanager->resPrint;
-			}
-			else $bugbaseurl = $hookmanager->resPrint;
+			} else $bugbaseurl = $hookmanager->resPrint;
 
 			$bugbaseurl .= urlencode("\n");
 			$bugbaseurl .= urlencode("## Report\n");
@@ -2365,8 +2566,9 @@ function main_area($title = '')
             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))
+            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";
@@ -2401,9 +2603,7 @@ function getHelpParamFor($helppagename, $langs)
 		$helpbaseurl = '%s';
 		$helppage = $helppagename;
 		$mode = 'local';
-	}
-	else
-	{
+	} else {
 		// If WIKI URL
 		$reg = array();
 		if (preg_match('/^es/i', $langs->defaultlang))
@@ -2541,10 +2741,8 @@ if (!function_exists("llxFooter"))
 			{
 				$title = img_warning().' '.$langs->trans('CoreErrorTitle');
 				print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
-			}
-			// html version
-			else
-			{
+			} else {
+				// html version
 				$msg = img_warning().' '.$langs->trans('CoreErrorMessage');
 				print '<div class="error">'.$msg.'</div>';
 			}
@@ -2624,8 +2822,7 @@ if (!function_exists("llxFooter"))
 				// No ping done if we are into an alpha version
 				if (strpos('alpha', DOL_VERSION) > 0 && !$forceping) {
 					print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. It is an alpha version -->\n";
-				}
-				elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping)	// Cookie is set when we uncheck the checkbox in the installation wizard.
+				} elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping)	// Cookie is set when we uncheck the checkbox in the installation wizard.
 				{
 					// MAIN_LAST_PING_KO_DATE
 					// Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent
@@ -2686,9 +2883,7 @@ if (!function_exists("llxFooter"))
 			    			</script>
 						<?php
 					}
-				}
-				else
-				{
+				} else {
 					$now = dol_now();
 					print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. It was disabled -->\n";
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 5b6cd01ba97..cf2cde3e19d 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array("admin", "bills", "margins", "stocks"));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -47,9 +47,7 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -61,9 +59,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -73,9 +69,7 @@ if ($action == 'remises')
 	if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0)
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -85,9 +79,7 @@ if ($action == 'typemarges')
 	if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -97,9 +89,7 @@ if ($action == 'contact')
 	if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
 	{
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -166,16 +156,12 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
-}
-else
-{
+} else {
 	if (empty($conf->global->DISPLAY_MARGIN_RATES))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -189,15 +175,11 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARK_RATES');
-}
-else
-{
+} else {
 	if (empty($conf->global->DISPLAY_MARK_RATES))
 	{
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
+	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
@@ -212,16 +194,12 @@ print '<td colspan="2">';
 if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('ForceBuyingPriceIfNull');
-}
-else
-{
+} else {
 	if (empty($conf->global->ForceBuyingPriceIfNull))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	}
-	else
-	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+	} else {
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index cf1d70db91a..7e15b94aede 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -36,8 +36,8 @@ $mesg = '';
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -48,8 +48,7 @@ if (!$sortfield)
 {
 	if ($agentid > 0)
 		$sortfield = "s.nom";
-	else
-	    $sortfield = "u.lastname";
+	else $sortfield = "u.lastname";
 }
 
 $startdate = $enddate = '';
@@ -156,16 +155,14 @@ $sql .= " AND sc.fk_soc = f.fk_soc";
 $sql .= " AND (d.product_type = 0 OR d.product_type = 1)";
 if (!empty($conf->global->AGENT_CONTACT_TYPE))
 	$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
-else
-	$sql .= " AND sc.fk_user = u.rowid";
+else $sql .= " AND sc.fk_user = u.rowid";
 $sql .= " AND f.fk_statut NOT IN (".implode(', ', $invoice_status_except_list).")";
 $sql .= ' AND s.entity IN ('.getEntity('societe').')';
 $sql .= " AND d.fk_facture = f.rowid";
 if ($agentid > 0) {
 	if (!empty($conf->global->AGENT_CONTACT_TYPE))
   		$sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
-	else
-	    $sql .= " AND sc.fk_user = ".$agentid;
+	else $sql .= " AND sc.fk_user = ".$agentid;
 }
 if (!empty($startdate))
   $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
@@ -205,7 +202,7 @@ if ($result)
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
@@ -217,8 +214,7 @@ if ($result)
 	print '<tr class="liste_titre">';
 	if ($agentid > 0)
 		print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
-	else
-		print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
+	else print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
 
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", $param, '', $sortfield, $sortorder, 'right ');
@@ -307,9 +303,7 @@ if ($result)
     }
 	print "</table>";
 	print '</div>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/checkMargins.php b/htdocs/margin/checkMargins.php
index 337791238ce..60052294baa 100644
--- a/htdocs/margin/checkMargins.php
+++ b/htdocs/margin/checkMargins.php
@@ -41,8 +41,8 @@ $optioncss  = GETPOST('optioncss', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -222,7 +222,7 @@ if ($result) {
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 3cdd9c3c650..a566c7bd620 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -45,8 +45,8 @@ $mesg = '';
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -108,8 +108,7 @@ if ($socid > 0) {
 		if (!$sortorder) $sortorder = "DESC";
 		if (!$sortfield) $sortfield = "f.datef";
 	}
-}
-else {
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	print $form->select_company(null, 'socid', '(client=1 OR client=3)', 1, 0, 0);
@@ -125,9 +124,7 @@ if (!$sortfield)
 	{
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
-	}
-	else
-	{
+	} else {
 	    $sortfield = "s.nom";
 	    $sortorder = "ASC";
 	}
@@ -255,7 +252,7 @@ if ($result)
 
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
@@ -268,9 +265,7 @@ if ($result)
 	if (!empty($client)) {
   		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
   		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;socid=".$socid, 'align="center"', $sortfield, $sortorder);
-	}
-	else
-  		print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
+	} else print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;socid=".$socid, '', $sortfield, $sortorder);
 	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;socid=".$socid, 'align="right"', $sortfield, $sortorder);
@@ -297,9 +292,7 @@ if ($result)
 			{
 				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
-			}
-			else
-			{
+			} else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
@@ -313,8 +306,7 @@ if ($result)
 				print "</td>\n";
 				print "<td class=\"center\">";
 				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-		  	}
-		  	else {
+		  	} else {
 				$companystatic->id = $objp->socid;
 				$companystatic->name = $objp->name;
 				$companystatic->client = $objp->client;
@@ -353,8 +345,7 @@ if ($result)
 	print '<tr class="liste_total">';
 	if ($client)
 	    print '<td colspan=2>';
-  	else
-    	print '<td>';
+  	else print '<td>';
   	print $langs->trans('TotalMargin')."</td>";
 	print "<td class=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
 	print "<td class=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
@@ -367,9 +358,7 @@ if ($result)
 
 	print "</table>";
 	print '</div>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/lib/margins.lib.php b/htdocs/margin/lib/margins.lib.php
index 1f1d6def849..6161ba2b6e4 100644
--- a/htdocs/margin/lib/margins.lib.php
+++ b/htdocs/margin/lib/margins.lib.php
@@ -42,11 +42,11 @@ function marges_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
-	complete_head_from_modules($conf, $langs, '', $head, $h, 'margesadmin');
+	// $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, 'margesadmin');
 
-	complete_head_from_modules($conf, $langs, '', $head, $h, 'margesadmin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'margesadmin', 'remove');
 
 	return $head;
 }
@@ -127,14 +127,10 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
 		if ($product->fetch_product_fournisseur_price($fk_pa))
 		{
 			$paht_ret = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-		}
-		else
-		{
+		} else {
 			$paht_ret = $paht;
 		}
-	}
-	else
-	{
+	} else {
 		$paht_ret = $paht;
 	}
 
@@ -147,8 +143,7 @@ function getMarginInfos($pvht, $remise_percent, $tva_tx, $localtax1_tx, $localta
 	// calcul marge
 	if ($pu_ht_remise < 0)
 		$marge = -1 * (abs($pu_ht_remise) - $paht_ret);
-	else
-		$marge = $pu_ht_remise - $paht_ret;
+	else $marge = $pu_ht_remise - $paht_ret;
 
 	// calcul taux marge
 	if ($paht_ret != 0)
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index d4df22475d4..e390be68068 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2012-2013	Christophe Battarel	<christophe.battarel@altairis.fr>
  * Copyright (C) 2014		Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2020		Alexandre Spangaro	<aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +34,7 @@ $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $TSelectedCats = GETPOST('categories', 'array');
 
@@ -48,8 +49,8 @@ $mesg = '';
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -61,9 +62,7 @@ if (!$sortfield)
 	{
 		$sortfield = "f.datef";
 		$sortorder = "DESC";
-	}
-	else
-	{
+	} else {
 	    $sortfield = "p.ref";
 	    $sortorder = "ASC";
 	}
@@ -113,8 +112,7 @@ if ($id > 0) {
 
     if (!$sortorder) $sortorder = "DESC";
     if (!$sortfield) $sortfield = "f.datef";
-}
-else {
+} else {
 	print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
 	print '<td class="maxwidthonsmartphone" colspan="4">';
 	$form->select_produits('', 'id', '', 20, 0, 1, 2, '', 1, array(), 0, 'All');
@@ -183,6 +181,7 @@ if ($id > 0) $sql .= " d.fk_product,";
 if ($id > 0) $sql .= " f.rowid as facid, f.ref, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
 $sql .= " SUM(d.total_ht) as selling_price,";
 // Note: qty and buy_price_ht is always positive (if not your database may be corrupted, you can update this)
+$sql .= " SUM(d.qty) as product_qty,";
 $sql .= " SUM(".$db->ifsql('d.total_ht < 0', 'd.qty * d.buy_price_ht * -1 * (d.situation_percent / 100)', 'd.qty * d.buy_price_ht * (d.situation_percent / 100)').") as buying_price,";
 $sql .= " SUM(".$db->ifsql('d.total_ht < 0', '-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty * (d.situation_percent / 100)))', 'd.total_ht - (d.buy_price_ht * d.qty * (d.situation_percent / 100))').") as marge";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -226,7 +225,7 @@ if ($result)
 	//var_dump($conf->global->MARGIN_TYPE);
 	if ($conf->global->MARGIN_TYPE == "1")
 	    $labelcostprice = 'BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
+	else // value is 'costprice' or 'pmp'
 	    $labelcostprice = 'CostPrice';
 
 	$moreforfilter = '';
@@ -238,29 +237,30 @@ if ($result)
 	print '<tr class="liste_titre">';
 	if ($id > 0) {
   		print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
-  		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$id, 'align="center"', $sortfield, $sortorder);
-  	}
-  	else
-  	{
+  		print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datef", "", "&amp;id=".$id, '', $sortfield, $sortorder, 'center ');
+  	} else {
   		print_liste_field_titre("ProductService", $_SERVER["PHP_SELF"], "p.ref", "", "&amp;id=".$id, '', $sortfield, $sortorder);
   	}
-	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "product_qty", "", "&amp;id=".$id, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;id=".$id, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;id=".$id, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;id=".$id, '', $sortfield, $sortorder, 'right ');
 	if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$id, '', $sortfield, $sortorder, 'right ');
 	if (!empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$id, 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$id, '', $sortfield, $sortorder, 'right ');
 	print "</tr>\n";
 
 	$cumul_achat = 0;
 	$cumul_vente = 0;
+	$cumul_qty = 0;
 
 	if ($num > 0)
 	{
 		while ($i < $num /*&& $i < $conf->liste_limit*/)
 		{
 			$objp = $db->fetch_object($result);
+			$qty = $objp->product_qty;
 			$pa = $objp->buying_price;
 			$pv = $objp->selling_price;
 			$marge = $objp->marge;
@@ -269,9 +269,7 @@ if ($result)
 			{
 				$marginRate = ($pa != 0) ?-1 * (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ?-1 * (100 * $marge / $pv) : '';
-			}
-			else
-			{
+			} else {
 				$marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
 				$markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
 			}
@@ -285,8 +283,7 @@ if ($result)
 				print "</td>\n";
 				print "<td class=\"center\">";
 				print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
-			}
-			else {
+			} else {
 				print '<td>';
 				if ($objp->rowid > 0)
 				{
@@ -297,17 +294,16 @@ if ($result)
     				$product_static->entity = $objp->pentity;
     				$text = $product_static->getNomUrl(1);
     				print $text .= ' - '.$objp->label;
-				}
-				else
-				{
+				} else {
 				    print img_object('', 'product').' '.$langs->trans("NotPredefinedProducts");
 				}
 				print "</td>\n";
 				//print "<td>".$product_static->getNomUrl(1)."</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";
+			print "<td class=\"center\">".$qty."</td>\n";
+			print "<td class=\"nowrap right\">".price(price2num($pv, 'MT'))."</td>\n";
+			print "<td class=\"nowrap right\">".price(price2num($pa, 'MT'))."</td>\n";
+			print "<td class=\"nowrap 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))
@@ -317,6 +313,7 @@ if ($result)
 			$i++;
 			$cumul_achat += $objp->buying_price;
 			$cumul_vente += $objp->selling_price;
+			$cumul_qty += $objp->product_qty;
 		}
 	}
 
@@ -330,12 +327,12 @@ if ($result)
 	print '<tr class="liste_total">';
 	if ($id > 0)
 		print '<td colspan=2>';
-	else
-		print '<td>';
+	else print '<td>';
 	print $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";
+	print "<td class=\"center\">".$cumul_qty."</td>";
+	print "<td class=\"nowrap right\">".price(price2num($cumul_vente, 'MT'))."</td>\n";
+	print "<td class=\"nowrap right\">".price(price2num($cumul_achat, 'MT'))."</td>\n";
+	print "<td class=\"nowrap 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))
@@ -344,9 +341,7 @@ if ($result)
 
 	print "</table>";
 	print '</div>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 $db->free($result);
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index e68a042ace2..d5069249cbe 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -30,7 +30,7 @@ $langs->loadLangs(array("companies", "bills", "products", "margins"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -229,9 +229,7 @@ if ($id > 0 || !empty($ref))
                 {
                     $marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
                     $markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-                }
-                else
-                {
+                } else {
                     $marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
                     $markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
                 }
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index ecb8a3ce764..c9711bd99ef 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -235,9 +235,7 @@ if ($socid > 0)
     	{
     		$marginRate = ($cumul_achat != 0) ?-1 * (100 * $totalMargin / $cumul_achat) : '';
     		$markRate = ($cumul_vente != 0) ?-1 * (100 * $totalMargin / $cumul_vente) : '';
-    	}
-    	else
-    	{
+    	} else {
     		$marginRate = ($cumul_achat != 0) ? (100 * $totalMargin / $cumul_achat) : '';
     		$markRate = ($cumul_vente != 0) ? (100 * $totalMargin / $cumul_vente) : '';
     	}
@@ -254,9 +252,7 @@ if ($socid > 0)
     		print "<td class=\"right\">".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")."</td>\n";
     	print '<td class="right">&nbsp;</td>';
     	print "</tr>\n";
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
     print "</table>";
@@ -264,9 +260,7 @@ if ($socid > 0)
 
     print '<br>';
     $db->free($result);
-}
-else
-{
+} else {
 	dol_print_error('', 'Parameter socid not defined');
 }
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 0db06b121fd..4f56652b3da 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -60,14 +60,14 @@ if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type = constant('TEST_DB_FORCE_TYP
 
 // Set properties specific to conf file
 $conf->file->main_limit_users = $dolibarr_main_limit_users;
-$conf->file->mailing_limit_sendbyweb	= $dolibarr_mailing_limit_sendbyweb;
-$conf->file->mailing_limit_sendbycli	= $dolibarr_mailing_limit_sendbycli;
+$conf->file->mailing_limit_sendbyweb = $dolibarr_mailing_limit_sendbyweb;
+$conf->file->mailing_limit_sendbycli = $dolibarr_mailing_limit_sendbycli;
 $conf->file->main_authentication = empty($dolibarr_main_authentication) ? '' : $dolibarr_main_authentication; // Identification mode
 $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https
-$conf->file->strict_mode 				= empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
+$conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
 $conf->file->instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance
 $conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs')
-$conf->file->dol_url_root				= array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr')
+$conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr')
 if (!empty($dolibarr_main_document_root_alt))
 {
 	// dolibarr_main_document_root_alt can contains several directories
@@ -132,9 +132,7 @@ if (!defined('NOREQUIREDB'))
 				$langs->setDefaultLang('auto');
 				$langs->load("website");
 				print $langs->trans("SorryWebsiteIsCurrentlyOffLine");
-			}
-			else
-			{
+			} else {
 				print "SorryWebsiteIsCurrentlyOffLine";
 			}
 			print '</div>';
@@ -162,20 +160,17 @@ if (!defined('NOREQUIREUSER')) {
  */
 
 // By default conf->entity is 1, but we change this if we ask another value.
-if (session_id() && !empty($_SESSION["dol_entity"]))			// Entity inside an opened session
-{
+if (session_id() && !empty($_SESSION["dol_entity"])) {
+	// Entity inside an opened session
 	$conf->entity = $_SESSION["dol_entity"];
-}
-elseif (!empty($_ENV["dol_entity"]))							// Entity inside a CLI script
-{
+} elseif (!empty($_ENV["dol_entity"])) {
+	// Entity inside a CLI script
 	$conf->entity = $_ENV["dol_entity"];
-}
-elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int'))	// Just after a login page
-{
+} elseif (GETPOSTISSET("loginfunction") && GETPOST("entity", 'int')) {
+	// Just after a login page
 	$conf->entity = GETPOST("entity", 'int');
-}
-elseif (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
-{
+} elseif (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+	// For public page with MultiCompany module
 	$conf->entity = DOLENTITY;
 }
 
@@ -225,9 +220,7 @@ if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/user/logout.php';
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		}
-		else
-		{
+		} else {
 			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/';
 			print 'Please try later or <a href="'.$nexturl.'">click here to change login user</a>...'."\n";
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index db30c32607f..b7cadf26341 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -27,9 +27,9 @@ global $conf, $langs, $user, $db;
 $langs->loadLangs(array("admin", "other", "modulebuilder"));
 
 if (!$user->admin || empty($conf->modulebuilder->enabled))
-    accessforbidden();
+	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 /*
@@ -37,47 +37,46 @@ $backtopage = GETPOST('backtopage', 'alpha');
  */
 if ($action == "update")
 {
-    $res1 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_README', GETPOST('MODULEBUILDER_SPECIFIC_README', 'none'), 'chaine', 0, '', $conf->entity);
-    $res2 = dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTOR', GETPOST('MODULEBUILDER_ASCIIDOCTOR', 'nohtml'), 'chaine', 0, '', $conf->entity);
-    $res3 = dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTORPDF', GETPOST('MODULEBUILDER_ASCIIDOCTORPDF', 'nohtml'), 'chaine', 0, '', $conf->entity);
-    $res4 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_NAME', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_NAME', 'nohtml'), 'chaine', 0, '', $conf->entity);
-    $res5 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_URL', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_URL', 'nohtml'), 'chaine', 0, '', $conf->entity);
-    $res6 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_FAMILY', GETPOST('MODULEBUILDER_SPECIFIC_FAMILY', 'nohtml'), 'chaine', 0, '', $conf->entity);
-    $res7 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_AUTHOR', GETPOST('MODULEBUILDER_SPECIFIC_AUTHOR', 'html'), 'chaine', 0, '', $conf->entity);
-    $res8 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_VERSION', GETPOST('MODULEBUILDER_SPECIFIC_VERSION', 'nohtml'), 'chaine', 0, '', $conf->entity);
-    if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0 || $res7 < 0 || $res8 < 0) {
-        setEventMessages('ErrorFailedToSaveDate', null, 'errors');
-        $db->rollback();
-    }
-    else
-    {
-        setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
-        $db->commit();
-    }
+	$res1 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_README', GETPOST('MODULEBUILDER_SPECIFIC_README', 'restricthtml'), 'chaine', 0, '', $conf->entity);
+	$res2 = dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTOR', GETPOST('MODULEBUILDER_ASCIIDOCTOR', 'nohtml'), 'chaine', 0, '', $conf->entity);
+	$res3 = dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTORPDF', GETPOST('MODULEBUILDER_ASCIIDOCTORPDF', 'nohtml'), 'chaine', 0, '', $conf->entity);
+	$res4 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_NAME', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_NAME', 'nohtml'), 'chaine', 0, '', $conf->entity);
+	$res5 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_URL', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_URL', 'nohtml'), 'chaine', 0, '', $conf->entity);
+	$res6 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_FAMILY', GETPOST('MODULEBUILDER_SPECIFIC_FAMILY', 'nohtml'), 'chaine', 0, '', $conf->entity);
+	$res7 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_AUTHOR', GETPOST('MODULEBUILDER_SPECIFIC_AUTHOR', 'html'), 'chaine', 0, '', $conf->entity);
+	$res8 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_VERSION', GETPOST('MODULEBUILDER_SPECIFIC_VERSION', 'nohtml'), 'chaine', 0, '', $conf->entity);
+	if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0 || $res7 < 0 || $res8 < 0) {
+		setEventMessages('ErrorFailedToSaveDate', null, 'errors');
+		$db->rollback();
+	} else {
+		setEventMessages('RecordModifiedSuccessfully', null, 'mesgs');
+		$db->commit();
+	}
 }
 
+$reg = array();
 if (preg_match('/set_(.*)/', $action, $reg)) {
-    $code = $reg[1];
-    $values = GETPOST($code);
-    if (is_array($values))
-        $values = implode(',', $values);
+	$code = $reg[1];
+	$values = GETPOST($code);
+	if (is_array($values))
+		$values = implode(',', $values);
 
-    if (dolibarr_set_const($db, $code, $values, 'chaine', 0, '', $conf->entity) > 0) {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	if (dolibarr_set_const($db, $code, $values, 'chaine', 0, '', $conf->entity) > 0) {
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 
 if (preg_match('/del_(.*)/', $action, $reg)) {
-    $code = $reg[1];
-    if (dolibarr_del_const($db, $code, 0) > 0) {
-        Header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    } else {
-        dol_print_error($db);
-    }
+	$code = $reg[1];
+	if (dolibarr_del_const($db, $code, 0) > 0) {
+		Header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
@@ -98,7 +97,7 @@ print '<input type="hidden" name="action" value="update">';
 print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('Modulebuilder'), $linkback);
 
 if (GETPOST('withtab', 'alpha')) {
-    dol_fiche_head($head, 'modulebuilder', '', -1);
+	dol_fiche_head($head, 'modulebuilder', '', -1);
 }
 
 print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc")."</span><br>\n";
@@ -115,56 +114,56 @@ print "</tr>\n";
 
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
-	// What is use cas of this 2 options ?
+	// What is use case of this 2 options ?
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("UseAboutPage").'</td>';
 	print '<td class="center">';
 	if ($conf->use_javascript_ajax) {
-	    print ajax_constantonoff('MODULEBUILDER_USE_ABOUT');
+		print ajax_constantonoff('MODULEBUILDER_USE_ABOUT');
 	} else {
-	    if (empty($conf->global->MODULEBUILDER_USE_ABOUT)) {
-	        print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_MODULEBUILDER_USE_ABOUT">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-	    } else {
-	        print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_MODULEBUILDER_USE_ABOUT">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
-	    }
+		if (empty($conf->global->MODULEBUILDER_USE_ABOUT)) {
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=set_MODULEBUILDER_USE_ABOUT&amp;token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		} else {
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=del_MODULEBUILDER_USE_ABOUT&amp;token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		}
 	}
 	print '</td></tr>';
 
-    print '<tr class="oddeven">';
-    print '<td class="tdtop">'.$langs->trans("UseSpecificEditorName").'</td>';
-    print '<td>';
-    print '<input type="text" name="MODULEBUILDER_SPECIFIC_EDITOR_NAME" value="'.$conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME.'">';
-    print '</td>';
-    print '</tr>';
+	print '<tr class="oddeven">';
+	print '<td class="tdtop">'.$langs->trans("UseSpecificEditorName").'</td>';
+	print '<td>';
+	print '<input type="text" name="MODULEBUILDER_SPECIFIC_EDITOR_NAME" value="'.$conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME.'">';
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="oddeven">';
-    print '<td class="tdtop">'.$langs->trans("UseSpecificEditorURL").'</td>';
-    print '<td>';
-    print '<input type="text" name="MODULEBUILDER_SPECIFIC_EDITOR_URL" value="'.$conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL.'">';
-    print '</td>';
-    print '</tr>';
+	print '<tr class="oddeven">';
+	print '<td class="tdtop">'.$langs->trans("UseSpecificEditorURL").'</td>';
+	print '<td>';
+	print '<input type="text" name="MODULEBUILDER_SPECIFIC_EDITOR_URL" value="'.$conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL.'">';
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="oddeven">';
-    print '<td class="tdtop">'.$langs->trans("UseSpecificFamily").'</td>';
-    print '<td>';
-    print '<input type="text" name="MODULEBUILDER_SPECIFIC_FAMILY" value="'.$conf->global->MODULEBUILDER_SPECIFIC_FAMILY.'">';
-    print '</td>';
-    print '</tr>';
+	print '<tr class="oddeven">';
+	print '<td class="tdtop">'.$langs->trans("UseSpecificFamily").'</td>';
+	print '<td>';
+	print '<input type="text" name="MODULEBUILDER_SPECIFIC_FAMILY" value="'.$conf->global->MODULEBUILDER_SPECIFIC_FAMILY.'">';
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="oddeven">';
-    print '<td class="tdtop">'.$langs->trans("UseSpecificAuthor").'</td>';
-    print '<td>';
-    print '<input type="text" name="MODULEBUILDER_SPECIFIC_AUTHOR" value="'.$conf->global->MODULEBUILDER_SPECIFIC_AUTHOR.'">';
-    print '</td>';
-    print '</tr>';
+	print '<tr class="oddeven">';
+	print '<td class="tdtop">'.$langs->trans("UseSpecificAuthor").'</td>';
+	print '<td>';
+	print '<input type="text" name="MODULEBUILDER_SPECIFIC_AUTHOR" value="'.$conf->global->MODULEBUILDER_SPECIFIC_AUTHOR.'">';
+	print '</td>';
+	print '</tr>';
 
-    print '<tr class="oddeven">';
-    print '<td class="tdtop">'.$langs->trans("UseSpecificVersion").'</td>';
-    print '<td>';
-    print '<input type="text" name="MODULEBUILDER_SPECIFIC_VERSION" value="'.$conf->global->MODULEBUILDER_SPECIFIC_VERSION.'">';
-    print '</td>';
-    print '</tr>';
+	print '<tr class="oddeven">';
+	print '<td class="tdtop">'.$langs->trans("UseSpecificVersion").'</td>';
+	print '<td>';
+	print '<input type="text" name="MODULEBUILDER_SPECIFIC_VERSION" value="'.$conf->global->MODULEBUILDER_SPECIFIC_VERSION.'">';
+	print '</td>';
+	print '</tr>';
 }
 
 print '<tr class="oddeven">';
@@ -195,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();
+	dol_fiche_end();
 }
 
 print '<br>';
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index ee750447636..49d097ffc8a 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -94,6 +94,90 @@ $result = restrictedArea($user, 'modulebuilder', null);
 
 $error = 0;
 
+$form = new Form($db);
+
+// Define $listofmodules
+$dirsrootforscan = array($dirread);
+// Add also the core modules into the list of modules to show/edit
+if ($dirread != DOL_DOCUMENT_ROOT && ($conf->global->MAIN_FEATURES_LEVEL >= 2 || !empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT))) { $dirsrootforscan[] = DOL_DOCUMENT_ROOT; }
+
+// Search modules to edit
+$textforlistofdirs = '<!-- Directory scanned -->'."\n";
+$listofmodules = array();
+$i = 0;
+foreach ($dirsrootforscan as $dirread)
+{
+	$moduletype = 'external';
+	if ($dirread == DOL_DOCUMENT_ROOT) {
+		$moduletype = 'internal';
+	}
+
+	$dirsincustom = dol_dir_list($dirread, 'directories');
+	if (is_array($dirsincustom) && count($dirsincustom) > 0) {
+		foreach ($dirsincustom as $dircustomcursor) {
+			$fullname = $dircustomcursor['fullname'];
+			if (dol_is_file($fullname.'/'.$FILEFLAG))
+			{
+				// Get real name of module (MyModule instead of mymodule)
+				$dirtoscanrel = basename($fullname).'/core/modules/';
+
+				$descriptorfiles = dol_dir_list(dirname($fullname).'/'.$dirtoscanrel, 'files', 0, 'mod.*\.class\.php$');
+				if (empty($descriptorfiles))	// If descriptor not found into module dir, we look into main module dir.
+				{
+					$dirtoscanrel = 'core/modules/';
+					$descriptorfiles = dol_dir_list($fullname.'/../'.$dirtoscanrel, 'files', 0, 'mod'.strtoupper(basename($fullname)).'\.class\.php$');
+				}
+				$modulenamewithcase = '';
+				$moduledescriptorrelpath = '';
+				$moduledescriptorfullpath = '';
+
+				foreach ($descriptorfiles as $descriptorcursor) {
+					$modulenamewithcase = preg_replace('/^mod/', '', $descriptorcursor['name']);
+					$modulenamewithcase = preg_replace('/\.class\.php$/', '', $modulenamewithcase);
+					$moduledescriptorrelpath = $dirtoscanrel.$descriptorcursor['name'];
+					$moduledescriptorfullpath = $descriptorcursor['fullname'];
+					//var_dump($descriptorcursor);
+				}
+				if ($modulenamewithcase)
+				{
+					$listofmodules[$dircustomcursor['name']] = array(
+						'modulenamewithcase'=>$modulenamewithcase,
+						'moduledescriptorrelpath'=> $moduledescriptorrelpath,
+						'moduledescriptorfullpath'=>$moduledescriptorfullpath,
+						'moduledescriptorrootpath'=>$dirread,
+						'moduletype'=>$moduletype
+					);
+				}
+				//var_dump($listofmodules);
+			}
+		}
+	}
+
+	if ($forceddirread && empty($listofmodules))    // $forceddirread is 1 if we forced dir to read with dirins=... or with module=...@mydir
+	{
+		$listofmodules[strtolower($module)] = array(
+			'modulenamewithcase'=>$module,
+			'moduledescriptorrelpath'=> 'notyetimplemented',
+			'moduledescriptorfullpath'=> 'notyetimplemented',
+			'moduledescriptorrootpath'=> 'notyetimplemented',
+		);
+	}
+
+	// Show description of content
+	$newdircustom = $dirins;
+	if (empty($newdircustom)) $newdircustom = img_warning();
+	// If dirread was forced to somewhere else, by using URL
+	// htdocs/modulebuilder/index.php?module=Inventory@/home/ldestailleur/git/dolibarr/htdocs/product
+	if (empty($i)) $textforlistofdirs .= $langs->trans("DirScanned").' : ';
+	else $textforlistofdirs .= ', ';
+	$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"));
+	}
+	$i++;
+}
+
 
 /*
  * Actions
@@ -128,9 +212,8 @@ if ($dirins && $action == 'initmodule' && $modulename)
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFailToCopyDir", $srcdir, $destdir), null, 'errors');
-			}
-			else	// $result == 0
-			{
+			} else {
+				// $result == 0
 				setEventMessages($langs->trans("AllFilesDidAlreadyExist", $srcdir, $destdir), null, 'warnings');
 			}
 		}
@@ -215,7 +298,6 @@ if ($dirins && $action == 'initmodule' && $modulename)
 			}
 
 			$result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
-
 			//var_dump($result);
 			if ($result < 0)
 			{
@@ -270,9 +352,7 @@ if ($dirins && $action == 'initapi' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -307,15 +387,12 @@ if ($dirins && $action == 'initphpunit' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initsqlextrafields' && !empty($module))
-{
+if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
 
@@ -353,9 +430,7 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module))
 
 		dolReplaceInFile($destfile1, $arrayreplacement);
 		dolReplaceInFile($destfile2, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', ''), null, 'errors');
 	}
@@ -388,9 +463,7 @@ if ($dirins && $action == 'inithook' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -422,9 +495,7 @@ if ($dirins && $action == 'inittrigger' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -438,8 +509,7 @@ if ($dirins && $action == 'initwidget' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 
 		//var_dump($phpfileval['fullname']);
@@ -456,9 +526,7 @@ if ($dirins && $action == 'initwidget' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -495,13 +563,12 @@ if ($dirins && $action == 'initcss' && !empty($module))
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/css/'.strtolower($module).'.css.php', '/').'\'/' => '\'/'.strtolower($module).'/css/'.strtolower($module).'.css.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
+
 if ($dirins && $action == 'initjs' && !empty($module))
 {
 	dol_mkdir($dirins.'/'.strtolower($module).'/js');
@@ -534,9 +601,7 @@ if ($dirins && $action == 'initjs' && !empty($module))
 		$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
 		$arrayreplacement = array('/\/\/\s*\''.preg_quote('/'.strtolower($module).'/js/'.strtolower($module).'.js.php', '/').'\'/' => '\'/'.strtolower($module).'/js/'.strtolower($module).'.js.php\'');
 		dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -573,15 +638,12 @@ if ($dirins && $action == 'initcli' && !empty($module))
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
 }
-if ($dirins && $action == 'initdoc' && !empty($module))
-{
+if ($dirins && $action == 'initdoc' && !empty($module)) {
 	dol_mkdir($dirins.'/'.strtolower($module).'/doc');
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/doc/Documentation.asciidoc';
@@ -589,8 +651,7 @@ if ($dirins && $action == 'initdoc' && !empty($module))
 	//var_dump($srcfile);var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$modulename = ucfirst($module); // Force first letter in uppercase
 		$modulelowercase = strtolower($module);
 
@@ -624,9 +685,7 @@ if ($dirins && $action == 'initdoc' && !empty($module))
 
 		dol_delete_file($outputfiledoc, 0, 0, 0, null, false, 0);
 		dol_delete_file($outputfiledocpdf, 0, 0, 0, null, false, 0);
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
 	}
@@ -674,9 +733,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 	if (empty($_results))
 	{
 		setEventMessages($langs->trans("ErrorTableNotFound", $tablename), null, 'errors');
-	}
-	else
-	{
+	} else {
 		/**
 		 *  'type' if the field format ('integer', 'integer:Class:pathtoclass', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float')
 		 *  'label' the translation key.
@@ -726,7 +783,9 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			$fieldname = $obj->Field;
 			// type
 			$type = $obj->Type;
-			if ($type == 'int(11)') $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';
@@ -737,7 +796,7 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			$notnull = ($obj->Null == 'YES' ? 0 : 1);
 			if ($fieldname == 'fk_user_modif') $notnull = -1;
 			// label
-			$label = preg_replace('/_/', ' ', ucfirst($fieldname));
+			$label = preg_replace('/_/', '', ucfirst($fieldname));
 			if ($fieldname == 'rowid') $label = 'TechnicalID';
 			if ($fieldname == 'import_key') $label = 'ImportId';
 			if ($fieldname == 'fk_soc') $label = 'ThirdParty';
@@ -793,6 +852,9 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 {
 	$objectname = ucfirst($objectname);
 
+	$dirins = $dirread = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
+	$moduletype = $listofmodules[strtolower($module)]['moduletype'];
+
 	if (preg_match('/[^a-z0-9_]/i', $objectname))
 	{
 		$error++;
@@ -886,9 +948,8 @@ if ($dirins && $action == 'initobject' && $module && $objectname)
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorFailToCopyFile", $srcdir.'/'.$srcfile, $destdir.'/'.$destfile), null, 'errors');
-				}
-				else	// $result == 0
-				{
+				} else {
+					// $result == 0
 					setEventMessages($langs->trans("FileAlreadyExists", $destfile), null, 'warnings');
 				}
 			}
@@ -1075,15 +1136,11 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') &&
 			{
 				$nb = $obj->nb;
 			}
-		}
-		else
-		{
+		} else {
 			if ($db->lasterrno() == 'DB_ERROR_NOSUCHTABLE')
 			{
 				setEventMessages($langs->trans("TableDoesNotExists", $tabletodrop), null, 'warnings');
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -1092,8 +1149,7 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') &&
 			$resql = $db->DDLDropTable($tabletodrop);
 			//var_dump($resql);
 			setEventMessages($langs->trans("TableDropped", $tabletodrop), null, 'mesgs');
-		}
-		elseif ($nb > 0)
+		} elseif ($nb > 0)
 		{
 			setEventMessages($langs->trans("TableNotEmptyDropCanceled", $tabletodrop), null, 'warnings');
 		}
@@ -1106,6 +1162,9 @@ if ($dirins && $action == 'addproperty' && !empty($module) && !empty($tabobj))
 
 	$objectname = $tabobj;
 
+	$dirins = $dirread = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
+	$moduletype = $listofmodules[strtolower($module)]['moduletype'];
+
 	$srcdir = $dirread.'/'.strtolower($module);
 	$destdir = $dirins.'/'.strtolower($module);
 	dol_mkdir($destdir);
@@ -1133,7 +1192,7 @@ if ($dirins && $action == 'addproperty' && !empty($module) && !empty($tabobj))
 		{
 			$addfieldentry = array(
 				'name'=>GETPOST('propname', 'aZ09'), 'label'=>GETPOST('proplabel', 'alpha'), 'type'=>GETPOST('proptype', 'alpha'),
-				'arrayofkeyval'=>GETPOST('proparrayofkeyval', 'none'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
+				'arrayofkeyval'=>GETPOST('proparrayofkeyval', 'restricthtml'), // Example json string '{"0":"Draft","1":"Active","-1":"Cancel"}'
 				'visible'=>GETPOST('propvisible', 'int'), 'enabled'=>GETPOST('propenabled', 'int'),
 				'position'=>GETPOST('propposition', 'int'), 'notnull'=>GETPOST('propnotnull', 'int'), 'index'=>GETPOST('propindex', 'int'), 'searchall'=>GETPOST('propsearchall', 'int'),
 				'isameasure'=>GETPOST('propisameasure', 'int'), 'comment'=>GETPOST('propcomment', 'alpha'), 'help'=>GETPOST('prophelp', 'alpha')
@@ -1155,7 +1214,9 @@ if ($dirins && $action == 'addproperty' && !empty($module) && !empty($tabobj))
 	// Edit the class file to write properties
 	if (!$error)
 	{
-		$object = rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir, $addfieldentry);
+		$moduletype = 'external';
+
+		$object = rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir, $addfieldentry, $moduletype);
 		if (is_numeric($object) && $object <= 0)
 		{
 			$error++;
@@ -1165,7 +1226,9 @@ if ($dirins && $action == 'addproperty' && !empty($module) && !empty($tabobj))
 	// Edit sql with new properties
 	if (!$error)
 	{
-		$result = rebuildObjectSql($destdir, $module, $objectname, $newmask, $srcdir, $object);
+		$moduletype = 'external';
+
+		$result = rebuildObjectSql($destdir, $module, $objectname, $newmask, $srcdir, $object, $moduletype);
 		if ($result <= 0)
 		{
 			$error++;
@@ -1240,9 +1303,7 @@ if ($dirins && $action == 'confirm_deletemodule')
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans("DirWasRemoved", $modulelowercase), null);
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("PurgeNothingToDelete"), null, 'warnings');
 		}
 	}
@@ -1302,9 +1363,7 @@ if ($dirins && $action == 'confirm_deleteobject' && $objectname)
 		if ($resultko == 0)
 		{
 			setEventMessages($langs->trans("FilesDeleted"), null);
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorSomeFilesCouldNotBeDeleted"), null, 'warnings');
 		}
 	}
@@ -1331,15 +1390,12 @@ if ($dirins && $action == 'generatepackage')
 	{
 		try {
 			$moduleobj = new $class($db);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$error++;
 			dol_print_error($e->getMessage());
 		}
-	}
-	else
-	{
+	} else {
 		$error++;
 		$langs->load("errors");
 		dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
@@ -1357,25 +1413,19 @@ if ($dirins && $action == 'generatepackage')
 		{
 			if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
 			$result = dol_compress_dir($dir, $outputfilezip, 'zip', '', $modulelowercase);
-		}
-		else
-		{
+		} else {
 			$result = -1;
 		}
 
 		if ($result > 0)
 		{
 			setEventMessages($langs->trans("ZipFileGeneratedInto", $outputfilezip), null);
-		}
-		else
-		{
+		} else {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFailToGenerateFile", $outputfilezip), null, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorCheckVersionIsDefined"), null, 'errors');
@@ -1393,9 +1443,7 @@ if ($dirins && $action == 'generatedoc')
 	if ($result > 0)
 	{
 		setEventMessages($langs->trans("DocFileGeneratedInto", $dirofmodule), null);
-	}
-	else
-	{
+	} else {
 		setEventMessages($util->error, $util->errors, 'errors');
 	}
 }
@@ -1420,7 +1468,13 @@ if ($action == 'savefile' && empty($cancel))
 			dol_copy($pathoffile, $pathoffilebackup, 0, 1);
 		}
 
-		$content = GETPOST('editfilecontent', 'none');
+		$check = 'restricthtml';
+		$srclang = dol_mimetype($pathoffile, '', 3);
+		if ($srclang == 'md') $check = 'restricthtml';
+		if ($srclang == 'lang') $check = 'restricthtml';
+		if ($srclang == 'php') $check = 'none';
+
+		$content = GETPOST('editfilecontent', $check);
 
 		// Save file on disk
 		if ($content)
@@ -1432,14 +1486,10 @@ if ($action == 'savefile' && empty($cancel))
 				@chmod($pathoffile, octdec($newmask));
 
 				setEventMessages($langs->trans("FileSaved"), null);
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ContentCantBeEmpty"), null, 'errors');
 			//$action='editfile';
 			$error++;
@@ -1458,8 +1508,7 @@ if ($action == 'set' && $user->admin)
 	$value = GETPOST('value', 'alpha');
 	$resarray = activateModule($value);
 	if (!empty($resarray['errors'])) setEventMessages('', $resarray['errors'], 'errors');
-	else
-	{
+	else {
 		//var_dump($resarray);exit;
 		if ($resarray['nbperms'] > 0)
 		{
@@ -1474,8 +1523,7 @@ if ($action == 'set' && $user->admin)
 					$msg = $langs->trans('ModuleEnabledAdminMustCheckRights');
 					setEventMessages($msg, null, 'warnings');
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 	}
 	header("Location: ".$_SERVER["PHP_SELF"]."?".$param);
@@ -1519,7 +1567,7 @@ llxHeader('', $langs->trans("ModuleBuilder"), '', '', 0, 0,
 	'/includes/ace/src/ext-statusbar.js',
 	'/includes/ace/src/ext-language_tools.js',
 	//'/includes/ace/src/ext-chromevox.js'
-	), array());
+	), array(), '', 'classforhorizontalscrolloftabs');
 
 
 $text = $langs->trans("ModuleBuilder");
@@ -1528,87 +1576,17 @@ print load_fiche_titre($text, '', 'title_setup');
 
 print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModuleBuilderDesc", 'https://wiki.dolibarr.org/index.php/Module_development#Create_your_module').'</span><br>';
 
-$dirsrootforscan = array($dirread);
-// Add also the core modules into the list of modules to show/edit
-if ($dirread != DOL_DOCUMENT_ROOT && ($conf->global->MAIN_FEATURES_LEVEL >= 2 || !empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT))) { $dirsrootforscan[] = DOL_DOCUMENT_ROOT; }
-
-// Search modules to edit
-print '<!-- Scanned dir -->'."\n";
-$listofmodules = array();
-$i = 0;
-foreach ($dirsrootforscan as $dirread)
-{
-	$dirsincustom = dol_dir_list($dirread, 'directories');
-	if (is_array($dirsincustom) && count($dirsincustom) > 0) {
-		foreach ($dirsincustom as $dircustomcursor) {
-			$fullname = $dircustomcursor['fullname'];
-			if (dol_is_file($fullname.'/'.$FILEFLAG))
-			{
-				// Get real name of module (MyModule instead of mymodule)
-				$dirtoscanrel = basename($fullname).'/core/modules/';
-
-				$descriptorfiles = dol_dir_list(dirname($fullname).'/'.$dirtoscanrel, 'files', 0, 'mod.*\.class\.php$');
-				if (empty($descriptorfiles))	// If descriptor not found into module dir, we look into main module dir.
-				{
-					$dirtoscanrel = 'core/modules/';
-					$descriptorfiles = dol_dir_list($fullname.'/../'.$dirtoscanrel, 'files', 0, 'mod'.strtoupper(basename($fullname)).'\.class\.php$');
-				}
-				$modulenamewithcase = '';
-				$moduledescriptorrelpath = '';
-				$moduledescriptorfullpath = '';
-
-				foreach ($descriptorfiles as $descriptorcursor) {
-					$modulenamewithcase = preg_replace('/^mod/', '', $descriptorcursor['name']);
-					$modulenamewithcase = preg_replace('/\.class\.php$/', '', $modulenamewithcase);
-					$moduledescriptorrelpath = $dirtoscanrel.$descriptorcursor['name'];
-					$moduledescriptorfullpath = $descriptorcursor['fullname'];
-					//var_dump($descriptorcursor);
-				}
-				if ($modulenamewithcase)
-				{
-					$listofmodules[$dircustomcursor['name']] = array(
-						'modulenamewithcase'=>$modulenamewithcase,
-						'moduledescriptorrelpath'=> $moduledescriptorrelpath,
-						'moduledescriptorfullpath'=>$moduledescriptorfullpath,
-						'moduledescriptorrootpath'=>$dirread
-					);
-				}
-				//var_dump($listofmodules);
-			}
-		}
-	}
-
-	if ($forceddirread && empty($listofmodules))    // $forceddirread is 1 if we forced dir to read with dirins=... or with module=...@mydir
-	{
-		$listofmodules[strtolower($module)] = array(
-			'modulenamewithcase'=>$module,
-			'moduledescriptorrelpath'=> 'notyetimplemented',
-			'moduledescriptorfullpath'=> 'notyetimplemented',
-			'moduledescriptorrootpath'=> 'notyetimplemented',
-		);
-	}
-
-	// Show description of content
-	$newdircustom = $dirins;
-	if (empty($newdircustom)) $newdircustom = img_warning();
-	// If dirread was forced to somewhere else, by using URL
-	// htdocs/modulebuilder/index.php?module=Inventory@/home/ldestailleur/git/dolibarr/htdocs/product
-	if (empty($i)) print $langs->trans("DirScanned").' : ';
-	else print ', ';
-	print '<strong class="wordbreakimp">'.$dirread.'</strong>';
-	$i++;
-}
+print $textforlistofdirs;
 print '<br>';
 //var_dump($listofmodules);
 
+
 $message = '';
 if (!$dirins)
 {
 	$message = info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
 	$allowfromweb = -1;
-}
-else
-{
+} else {
 	if ($dirins_ok)
 	{
 		if (!is_writable(dol_osencode($dirins)))
@@ -1617,9 +1595,7 @@ else
 			$message = info_admin($langs->trans("ErrorFailedToWriteInDir", $dirins));
 			$allowfromweb = 0;
 		}
-	}
-	else
-	{
+	} else {
 		$message = info_admin($langs->trans("NotExistsDirect", $dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
 		$allowfromweb = 0;
 	}
@@ -1637,31 +1613,40 @@ $infomodulesfound = '<div style="padding: 12px 9px 12px">'.$form->textwithpicto(
 $error = 0;
 $moduleobj = null;
 
+
 if (!empty($module) && $module != 'initmodule' && $module != 'deletemodule')
 {
 	$modulelowercase = strtolower($module);
+	$loadclasserrormessage = '';
 
 	// Load module
-	$fullpathdirtodescriptor = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
-	dol_include_once($fullpathdirtodescriptor);
-	$class = 'mod'.$module;
+	try {
+		$fullpathdirtodescriptor = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
+
+		//throw(new Exception());
+		dol_include_once($fullpathdirtodescriptor);
+
+		$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 .= 'File: '.$e->getFile()."<br>\n";
+		$loadclasserrormessage .= 'Line: '.$e->getLine()."<br>\n";
+	}
 
 	if (class_exists($class))
 	{
 		try {
 			$moduleobj = new $class($db);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$error++;
 			print $e->getMessage();
 		}
-	}
-	else
-	{
+	} else {
 		if (empty($forceddirread)) $error++;
 		$langs->load("errors");
 		print img_warning('').' '.$langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
+		print $loadclasserrormessage;
 	}
 }
 
@@ -1693,7 +1678,7 @@ if (is_array($listofmodules) && count($listofmodules) > 0) {
 	$urltomodulesetup = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?search_keyword='.urlencode($module).'">'.$langs->trans('Home').'-'.$langs->trans("Setup").'-'.$langs->trans("Modules").'</a>';
 	if (!empty($conf->global->$const_name))	// If module is already activated
 	{
-		$linktoenabledisable .= '<a class="reposition asetresetmodule" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=reset&value=mod'.$module.$param.'">';
+		$linktoenabledisable .= '<a class="reposition asetresetmodule valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=reset&value=mod'.$module.$param.'">';
 		$linktoenabledisable .= img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', '', 1);
 		$linktoenabledisable .= '</a>';
 
@@ -1714,30 +1699,22 @@ if (is_array($listofmodules) && count($listofmodules) > 0) {
 				{
 					$linktoenabledisable .= ' <a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
 					//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
-				}
-				else
-				{
+				} else {
 					if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
 					{
 						$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
 						$linktoenabledisable .= ' &nbsp; <a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
-					}
-					else
-					{
+					} else {
 						$urltouse = $urlpage;
 						$linktoenabledisable .= ' &nbsp; <a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
 					}
 				}
 			}
-		}
-		elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
-		{
+		} elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs)) {
 			$linktoenabledisable .= ' &nbsp; <a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
 		}
-	}
-	else
-	{
-		$linktoenabledisable .= '<a class="reposition asetresetmodule" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&value=mod'.$module.$param.'">';
+	} else {
+		$linktoenabledisable .= '<a class="reposition asetresetmodule valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$moduleobj->numero.'&action=set&token='.newToken().'&value=mod'.$module.$param.'">';
 		$linktoenabledisable .= img_picto($langs->trans("ModuleIsNotActive", $urltomodulesetup), 'switch_off', '', false, 0, 0, '', 'classfortooltip', 1);
 		$linktoenabledisable .= "</a>\n";
 	}
@@ -1786,9 +1763,7 @@ if ($module == 'initmodule')
 
 	print '<br><input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
-}
-elseif ($module == 'deletemodule')
-{
+} elseif ($module == 'deletemodule') {
 	print '<!-- Form to init a module -->'."\n";
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="delete">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1800,9 +1775,7 @@ elseif ($module == 'deletemodule')
 	print '<input type="text" name="module" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'" value="">';
 	print '<input type="submit" class="buttonDelete" value="'.$langs->trans("Delete").'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
-}
-elseif (!empty($module))
-{
+} elseif (!empty($module)) {
 	// Tabs for module
 	if (!$error)
 	{
@@ -1892,6 +1865,8 @@ elseif (!empty($module))
 
 		print '<br>';
 
+		// Note module is inside $dirread
+
 		if ($tab == 'description')
 		{
 			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
@@ -1900,7 +1875,7 @@ elseif (!empty($module))
 
 			if ($action != 'editfile' || empty($file))
 			{
-				dol_fiche_head($head2, $tab, '', -1, ''); // Description - level 2
+				dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Description - level 2
 
 				print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc".$tab).'</span>';
 				$infoonmodulepath = '';
@@ -1989,9 +1964,7 @@ elseif (!empty($module))
 					print '</td></tr>';
 
 					print '</table>';
-				}
-				else
-				{
+				} else {
 					print $langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module).'<br>';
 				}
 
@@ -2033,7 +2006,7 @@ elseif (!empty($module))
 				print '<input type="hidden" name="tab" value="'.$tab.'">';
 				print '<input type="hidden" name="module" value="'.$module.'">';
 
-				dol_fiche_head($head2, $tab, '', -1, '');
+				dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix');
 
 				$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'));
@@ -2048,10 +2021,8 @@ elseif (!empty($module))
 
 				print '</form>';
 			}
-		}
-		else
-		{
-			dol_fiche_head($head2, $tab, '', -1, ''); // Level 2
+		} else {
+			dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Level 2
 		}
 
 		if ($tab == 'languages')
@@ -2087,9 +2058,7 @@ elseif (!empty($module))
 					print '</td>';
 				}
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				// Edit text language file
 
 				//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -2218,9 +2187,7 @@ elseif (!empty($module))
 						print '</tr>';
 						$i++;
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -2228,9 +2195,7 @@ elseif (!empty($module))
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -2334,9 +2299,7 @@ elseif (!empty($module))
 				print '<br>';
 
 				print '</form>';
-			}
-			elseif ($tabobj == 'deleteobject')
-			{
+			} elseif ($tabobj == 'deleteobject') {
 				// Delete object tab
 				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2349,9 +2312,8 @@ elseif (!empty($module))
 				print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
 				print '<input type="submit" class="buttonDelete" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 				print '</form>';
-			}
-			else
-			{	// tabobj = module
+			} else {
+				// tabobj = module
 				if ($action == 'deleteproperty')
 				{
 					$formconfirm = $form->formconfirm(
@@ -2385,29 +2347,31 @@ elseif (!empty($module))
 						$pathtopicto    = strtolower($module).'/img/object_'.strtolower($tabobj).'.png';
 						$pathtoscript   = strtolower($module).'/scripts/'.strtolower($tabobj).'.php';
 
-						//var_dump($pathtolib);
-						$realpathtoclass    = dol_buildpath($pathtoclass, 0, 2);
-						$realpathtoapi      = dol_buildpath($pathtoapi, 0, 2);
-						$realpathtoagenda   = dol_buildpath($pathtoagenda, 0, 2);
-						$realpathtocard     = dol_buildpath($pathtocard, 0, 2);
-						$realpathtodocument = dol_buildpath($pathtodocument, 0, 2);
-						$realpathtolist     = dol_buildpath($pathtolist, 0, 2);
-						$realpathtonote     = dol_buildpath($pathtonote, 0, 2);
-						$realpathtophpunit  = dol_buildpath($pathtophpunit, 0, 2);
-						$realpathtosql      = dol_buildpath($pathtosql, 0, 2);
-						$realpathtosqlextra = dol_buildpath($pathtosqlextra, 0, 2);
-						$realpathtosqlkey   = dol_buildpath($pathtosqlkey, 0, 2);
-						$realpathtosqlextrakey = dol_buildpath($pathtosqlextrakey, 0, 2);
-						$realpathtolib      = dol_buildpath($pathtolib, 0, 2);
-						$realpathtoobjlib   = dol_buildpath($pathtoobjlib, 0, 2);
-						$realpathtopicto    = dol_buildpath($pathtopicto, 0, 2);
-						$realpathtoscript   = dol_buildpath($pathtoscript, 0, 2);
+						//var_dump($pathtoclass); var_dump($dirread);
+						$realpathtoclass    = $dirread.'/'.$pathtoclass;
+						$realpathtoapi      = $dirread.'/'.$pathtoapi;
+						$realpathtoagenda   = $dirread.'/'.$pathtoagenda;
+						$realpathtocard     = $dirread.'/'.$pathtocard;
+						$realpathtodocument = $dirread.'/'.$pathtodocument;
+						$realpathtolist     = $dirread.'/'.$pathtolist;
+						$realpathtonote     = $dirread.'/'.$pathtonote;
+						$realpathtophpunit  = $dirread.'/'.$pathtophpunit;
+						$realpathtosql      = $dirread.'/'.$pathtosql;
+						$realpathtosqlextra = $dirread.'/'.$pathtosqlextra;
+						$realpathtosqlkey   = $dirread.'/'.$pathtosqlkey;
+						$realpathtosqlextrakey = $dirread.'/'.$pathtosqlextrakey;
+						$realpathtolib      = $dirread.'/'.$pathtolib;
+						$realpathtoobjlib   = $dirread.'/'.$pathtoobjlib;
+						$realpathtopicto    = $dirread.'/'.$pathtopicto;
+						$realpathtoscript   = $dirread.'/'.$pathtoscript;
 
 						if (empty($realpathtoapi)) 	// For compatibility with some old modules
 						{
 							$pathtoapi = strtolower($module).'/class/api_'.strtolower($module).'s.class.php';
-							$realpathtoapi = dol_buildpath($pathtoapi, 0, 2);
+							$realpathtoapi = $dirread.'/'.$pathtoapi;
 						}
+						$urloflist = $dirread.'/'.$pathtolist;
+						$urlofcard = $dirread.'/'.$pathtocard;
 
 						print '<div class="fichehalfleft">';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("ClassFile").' : <strong>'.($realpathtoclass ? '' : '<strike>').$pathtoclass.($realpathtoclass ? '' : '</strike>').'</strong>';
@@ -2423,14 +2387,10 @@ elseif (!empty($module))
 		   					if (empty($conf->global->$const_name))	// If module is not activated
 		   					{
 		   						print '<a href="#" target="apiexplorer" title="'.$langs->trans("ModuleMustBeEnabled").'"><strike>'.$langs->trans("GoToApiExplorer").'</strike></a>';
-		   					}
-		   					else
-		   					{
+		   					} else {
 		   						print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>';
 		   					}
-						}
-						else
-						{
+						} else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&format=php&file='.urlencode($pathtoapi).'"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a>';
 						}
@@ -2443,9 +2403,7 @@ elseif (!empty($module))
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
-						}
-						else
-						{
+						} else {
 							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initphpunit&format=php&file='.urlencode($pathtophpunit).'"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a>';
 						}
@@ -2481,8 +2439,7 @@ elseif (!empty($module))
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 							print ' &nbsp; ';
 							print '<a class="reposition editfielda" href="'.$_SERVER["PHP_SELF"].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=droptableextrafields">'.$langs->trans("DropTableIfEmpty").'</a>';
-						}
-						else {
+						} else {
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initsqlextrafields&format=sql&file='.urlencode($pathtosqlextra).'"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a>';
 						}
 						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
@@ -2500,9 +2457,6 @@ elseif (!empty($module))
 						print '<br>';
 						print '</div>';
 
-						$urloflist = dol_buildpath($pathtolist, 1);
-						$urlofcard = dol_buildpath($pathtocard, 1);
-
 						print '<div class="fichehalfleft">';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForList").' : <strong><a href="'.$urloflist.'" target="_test">'.($realpathtolist ? '' : '<strike>').$pathtolist.($realpathtolist ? '' : '</strike>').'</a></strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtolist).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
@@ -2549,20 +2503,17 @@ elseif (!empty($module))
 
 						if (function_exists('opcache_invalidate')) opcache_invalidate($dirread.'/'.$pathtoclass, true); // remove the include cache hell !
 
-						if (empty($forceddirread))
+						if (empty($forceddirread) && empty($dirread))
 						{
 							$result = dol_include_once($pathtoclass);
-						}
-						else
-						{
+						} else {
 							$result = @include_once $dirread.'/'.$pathtoclass;
 						}
 						if (class_exists($tabobj))
 						{
 							try {
 								$tmpobjet = @new $tabobj($db);
-							}
-							catch (Exception $e)
+							} catch (Exception $e)
 							{
 								dol_syslog('Failed to load Constructor of class: '.$e->getMessage(), LOG_WARNING);
 							}
@@ -2612,6 +2563,7 @@ elseif (!empty($module))
 							print '<th class="center">'.$form->textwithpicto($langs->trans("SearchAll"), $langs->trans("SearchAllDesc")).'</th>';
 							print '<th class="center">'.$form->textwithpicto($langs->trans("IsAMeasure"), $langs->trans("IsAMeasureDesc")).'</th>';
 							print '<th class="center">'.$langs->trans("CSSClass").'</th>';
+							print '<th class="center">'.$langs->trans("CSSViewClass").'</th>';
 							print '<th class="center">'.$langs->trans("KeyForTooltip").'</th>';
 							print '<th class="center">'.$langs->trans("ShowOnCombobox").'</th>';
 							//print '<th class="center">'.$langs->trans("Disabled").'</th>';
@@ -2631,7 +2583,7 @@ elseif (!empty($module))
 								print '<td><input class="text maxwidth75" name="propname" value="'.dol_escape_htmltag(GETPOST('propname', 'alpha')).'"></td>';
 								print '<td><input class="text maxwidth75" name="proplabel" value="'.dol_escape_htmltag(GETPOST('proplabel', 'alpha')).'"></td>';
 								print '<td><input class="text maxwidth75" name="proptype" value="'.dol_escape_htmltag(GETPOST('proptype', 'alpha')).'"></td>';
-								print '<td><input class="text maxwidth75" name="proparrayofkeyval" value="'.dol_escape_htmltag(GETPOST('proparrayofkeyval', 'none')).'"></td>';
+								print '<td><input class="text maxwidth75" name="proparrayofkeyval" value="'.dol_escape_htmltag(GETPOST('proparrayofkeyval', 'restricthtml')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="propnotnull" value="'.dol_escape_htmltag(GETPOST('propnotnull', 'alpha')).'"></td>';
 								print '<td><input class="text maxwidth50" name="propdefault" value="'.dol_escape_htmltag(GETPOST('propdefault', 'alpha')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="propindex" value="'.dol_escape_htmltag(GETPOST('propindex', 'alpha')).'"></td>';
@@ -2643,6 +2595,7 @@ elseif (!empty($module))
 								print '<td class="center"><input class="text" size="2" name="propsearchall" value="'.dol_escape_htmltag(GETPOST('propsearchall', 'alpha')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="propisameasure" value="'.dol_escape_htmltag(GETPOST('propisameasure', 'alpha')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="propcss" value="'.dol_escape_htmltag(GETPOST('propcss', 'alpha')).'"></td>';
+								print '<td class="center"><input class="text" size="2" name="propcssview" value="'.dol_escape_htmltag(GETPOST('propcssview', 'alpha')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="prophelp" value="'.dol_escape_htmltag(GETPOST('prophelp', 'alpha')).'"></td>';
 								print '<td class="center"><input class="text" size="2" name="propshowoncombobox" value="'.dol_escape_htmltag(GETPOST('propshowoncombobox', 'alpha')).'"></td>';
 								//print '<td class="center"><input class="text" size="2" name="propdisabled" value="'.dol_escape_htmltag(GETPOST('propdisabled', 'alpha')).'"></td>';
@@ -2683,6 +2636,7 @@ elseif (!empty($module))
 									$propsearchall = $propval['searchall'];
 									$propisameasure = $propval['isameasure'];
 									$propcss = $propval['css'];
+									$propcssview = $propval['cssview'];
 									$prophelp = $propval['help'];
 									$propshowoncombobox = $propval['showoncombobox'];
 									//$propdisabled=$propval['disabled'];
@@ -2691,76 +2645,81 @@ elseif (!empty($module))
 									print '<tr class="oddeven">';
 
 									print '<td>';
-									print $propname;
+									print dol_escape_htmltag($propname);
 									print '</td>';
 									print '<td>';
-									print $proplabel;
+									print dol_escape_htmltag($proplabel);
 									print '</td>';
-									print '<td class="wordbreak">';
-									print $proptype;
+									print '<td class="tdoverflowmax200">';
+									print '<span title="'.dol_escape_htmltag($proptype).'">'.dol_escape_htmltag($proptype).'</span>';
 									print '</td>';
-									print '<td class="wordbreak">';
+									print '<td class="tdoverflowmax200">';
 									if ($proparrayofkeyval) {
-										print json_encode($proparrayofkeyval);
+										print '<span title="'.dol_escape_htmltag(json_encode($proparrayofkeyval)).'">';
+										print dol_escape_htmltag(json_encode($proparrayofkeyval));
+										print '</span>';
 									}
 									print '</td>';
 									print '<td class="center">';
-									print $propnotnull;
+									print dol_escape_htmltag($propnotnull);
 									print '</td>';
 									print '<td>';
-									print $propdefault;
+									print dol_escape_htmltag($propdefault);
 									print '</td>';
 									print '<td class="center">';
 									print $propindex ? '1' : '';
 									print '</td>';
 									print '<td class="center">';
-									print $propforeignkey ? $propforeignkey : '';
+									print $propforeignkey ? dol_escape_htmltag($propforeignkey) : '';
 									print '</td>';
 									print '<td class="right">';
-									print $propposition;
+									print dol_escape_htmltag($propposition);
 									print '</td>';
 									print '<td class="center">';
-									print $propenabled ? $propenabled : '';
+									print $propenabled ? dol_escape_htmltag($propenabled) : '';
 									print '</td>';
 									print '<td class="center">';
-									print $propvisible ? $propvisible : '0';
+									print $propvisible ? dol_escape_htmltag($propvisible) : '0';
 									print '</td>';
 									print '<td class="center">';
-									print $propnoteditable ? $propnoteditable : '';
+									print $propnoteditable ? dol_escape_htmltag($propnoteditable) : '';
 									print '</td>';
 									print '<td class="center">';
 									print $propsearchall ? '1' : '';
 									print '</td>';
 									print '<td class="center">';
-									print $propisameasure ? $propisameasure : '';
+									print $propisameasure ? dol_escape_htmltag($propisameasure) : '';
 									print '</td>';
 									print '<td class="center">';
-									print $propcss ? $propcss : '';
+									print $propcss ? dol_escape_htmltag($propcss) : '';
 									print '</td>';
 									print '<td class="center">';
-									print $prophelp ? $prophelp : '';
+									print $propcssview ? dol_escape_htmltag($propcssview) : '';
+									print '</td>';
+									print '<td class="tdoverflowmax200">';
+									print $prophelp ? dol_escape_htmltag($prophelp) : '';
 									print '</td>';
 									print '<td class="center">';
-									print $propshowoncombobox ? $propshowoncombobox : '';
+									print $propshowoncombobox ? dol_escape_htmltag($propshowoncombobox) : '';
 									print '</td>';
 									/*print '<td class="center">';
 									print $propdisabled?$propdisabled:'';
 									print '</td>';*/
-									print '<td>';
-									print $propcomment;
+									print '<td class="tdoverflowmax200">';
+									print '<span title="'.dol_escape_htmltag($propcomment).'">';
+									print dol_escape_htmltag($propcomment);
+									print '</span>';
 									print '</td>';
 									print '<td class="center">';
 									if ($propname != 'rowid')
 									{
-										print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteproperty&propertykey='.urlencode($propname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteproperty&token='.newToken().'&propertykey='.urlencode($propname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
 									}
 									print '</td>';
 
 									print '</tr>';
 								}
-							}
-							else
-							{
+							} else {
 								if ($tab == 'specifications')
 								{
 									if ($action != 'editfile' || empty($file))
@@ -2779,9 +2738,7 @@ elseif (!empty($module))
 											print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 											print '<br>';
 										}
-									}
-									else
-									{
+									} else {
 										// Use MD or asciidoc
 
 										//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -2816,25 +2773,18 @@ elseif (!empty($module))
 							print '</div>';
 
 							print '</form>';
-						}
-						else
-						{
+						} else {
 							print '<tr><td><span class="warning">'.$langs->trans('Failed to init the object with the new.').'</warning></td></tr>';
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						print $e->getMessage();
 					}
-				}
-				else
-				{
+				} else {
 					if (empty($forceddirread))
 					{
 						$fullpathoffile = dol_buildpath($file, 0);
-					}
-					else
-					{
+					} else {
 						$fullpathoffile = $dirread.'/'.$file;
 					}
 
@@ -2967,19 +2917,15 @@ elseif (!empty($module))
 
 						print '</tr>';
 					}
-				}
-				else
-				{
-				 	 print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+				} else {
+				 	print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
 				print '</table>';
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3067,19 +3013,15 @@ elseif (!empty($module))
 
 						print '</tr>';
 					}
-				}
-				else
-				{
-					 print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
+				} else {
+					print '<tr><td class="opacitymedium" colspan="4">'.$langs->trans("None").'</td></tr>';
 				}
 
 				print '</table>';
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3130,17 +3072,13 @@ elseif (!empty($module))
 					print '</td>';
 					print '<td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a> ';
 					print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
-				}
-				else
-				{
+				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inithook&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a></td>';
 					print '<td></td>';
 				}
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3199,9 +3137,7 @@ elseif (!empty($module))
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("NoTrigger");
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inittrigger&format=php"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a></td>';
@@ -3210,9 +3146,7 @@ elseif (!empty($module))
 				}
 
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3255,16 +3189,12 @@ elseif (!empty($module))
 					print '<strong>'.$pathtohook.'</strong>';
 					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
-				}
-				else
-				{
+				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcss&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a></td>';
 				}
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3307,16 +3237,12 @@ elseif (!empty($module))
 					print '<strong>'.$pathtohook.'</strong>';
 					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
-				}
-				else
-				{
+				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initjs&format=php&file='.urlencode($pathtohook).'"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a></td>';
 				}
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3365,17 +3291,13 @@ elseif (!empty($module))
 						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoWidget");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initwidget&format=php"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a>';
 					print '</td></tr>';
 				}
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3451,17 +3373,13 @@ elseif (!empty($module))
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("NoCLIFile");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcli&format=php"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a>';
 					print '</td></tr>';
 				}
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3543,8 +3461,7 @@ elseif (!empty($module))
 							$texttoshow .= $langs->trans('CronMethod').': '.$cron['method'];
 							$texttoshow .= '<br>'.$langs->trans('CronArgs').': '.$cron['parameters'];
 							$texttoshow .= '<br>'.$langs->trans('Comment').': '.$langs->trans($cron['comment']);
-						}
-						elseif ($cron['jobtype'] == 'command')
+						} elseif ($cron['jobtype'] == 'command')
 						{
 							$text = $langs->trans('CronCommand');
 							$texttoshow = $langs->trans('CronCommand').': '.dol_trunc($cron['command']);
@@ -3571,9 +3488,7 @@ elseif (!empty($module))
 
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
 				}
 
@@ -3581,9 +3496,7 @@ elseif (!empty($module))
 				print '</div>';
 
 				print '</form>';
-			}
-			else
-			{
+			} else {
 				$fullpathoffile = dol_buildpath($file, 0);
 
 				$content = file_get_contents($fullpathoffile);
@@ -3632,18 +3545,14 @@ elseif (!empty($module))
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td>';
 					print '<span class="fa fa-file-o"></span> '.$langs->trans("FileNotYetGenerated");
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initdoc&format=php"><input type="button" class="button buttongen" value="'.$langs->trans("Generate").'"></a></td>';
 					print '</tr>';
 				}
 				print '</table>';
-			}
-			else
-			{
+			} else {
 				// Use MD or asciidoc
 
 				//print $langs->trans("UseAsciiDocFormat").'<br>';
@@ -3745,15 +3654,11 @@ elseif (!empty($module))
 			{
 				try {
 					$moduleobj = new $class($db);
-				}
-				catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$error++;
 					dol_print_error($e->getMessage());
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$langs->load("errors");
 				dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
diff --git a/htdocs/modulebuilder/template/admin/about.php b/htdocs/modulebuilder/template/admin/about.php
index 2140d679695..ebb392810d1 100644
--- a/htdocs/modulebuilder/template/admin/about.php
+++ b/htdocs/modulebuilder/template/admin/about.php
@@ -48,7 +48,7 @@ $langs->loadLangs(array("errors", "admin", "mymodule@mymodule"));
 if (!$user->admin) accessforbidden();
 
 // Parameters
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 
diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index 065feb6cebe..31bd430d6a3 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'mymodule_myobject'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index d66ede05696..11116fc33f4 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -50,7 +50,7 @@ $langs->loadLangs(array("admin", "mymodule@mymodule"));
 if (!$user->admin) accessforbidden();
 
 // Parameters
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $value = GETPOST('value', 'alpha');
@@ -244,9 +244,7 @@ if ($action == 'edit')
 		print '<div class="tabsAction">';
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
 		print '</div>';
-	}
-	else
-	{
+	} else {
 		print '<br>'.$langs->trans("NothingToSetup");
 	}
 }
@@ -323,7 +321,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								{
 									print img_picto($langs->trans("Activated"), 'switch_on');
 								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&object='.strtolower($myTmpObjectKey).'&value='.$file.'">';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
 									print img_picto($langs->trans("Disabled"), 'switch_off');
 									print '</a>';
 								}
@@ -376,7 +374,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		$def = array();
 		$sql = "SELECT nom";
 		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-		$sql .= " WHERE type = '".$type."'";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
 		if ($resql)
@@ -453,13 +451,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										if (in_array($name, $def))
 										{
 											print '<td class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+											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 class="center">'."\n";
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											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>";
 										}
 
@@ -470,7 +468,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										{
 											print img_picto($langs->trans("Default"), 'on');
 										} else {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+											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>';
 
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 10bca2e8b9a..13a2b8e895c 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -165,6 +165,7 @@ class ActionsMyModule
 		global $conf, $user, $langs;
 
 		$error = 0; // Error counter
+		$disabled = 1;
 
 		/* 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'
@@ -231,8 +232,8 @@ class ActionsMyModule
 		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'
-		{
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2'))) {
+			// do something only for the context 'somecontext1' or 'somecontext2'
 		}
 
 		return $ret;
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index f8699dc7568..32113b71ef0 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -64,7 +64,8 @@ class MyModuleApi extends DolibarrApi
 	 *
 	 * @url	GET myobjects/{id}
 	 *
-	 * @throws 	RestException
+	 * @throws RestException 401 Not allowed
+	 * @throws RestException 404 Not found
 	 */
 	public function get($id)
 	{
@@ -106,7 +107,7 @@ class MyModuleApi extends DolibarrApi
 		global $db, $conf;
 
 		$obj_ret = array();
-		$tmpobject = new MyObject($db);
+		$tmpobject = new MyObject($this->db);
 
 		if (!DolibarrApiAccess::$user->rights->mymodule->myobject->read) {
 			throw new RestException(401);
@@ -148,32 +149,32 @@ class MyModuleApi extends DolibarrApi
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-		$sql .= $db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
 			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
 
-			$sql .= $db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
-		$result = $db->query($sql);
+		$result = $this->db->query($sql);
+		$i = 0;
 		if ($result)
 		{
-			$num = $db->num_rows($result);
+			$num = $this->db->num_rows($result);
 			while ($i < $num)
 			{
-				$obj = $db->fetch_object($result);
-				$tmp_object = new MyObject($db);
+				$obj = $this->db->fetch_object($result);
+				$tmp_object = new MyObject($this->db);
 				if ($tmp_object->fetch($obj->rowid)) {
 					$obj_ret[] = $this->_cleanObjectDatas($tmp_object);
 				}
 				$i++;
 			}
-		}
-		else {
-			throw new RestException(503, 'Error when retrieving myobject list: '.$db->lasterror());
+		} else {
+			throw new RestException(503, 'Error when retrieving myobject list: '.$this->db->lasterror());
 		}
 		if (!count($obj_ret)) {
 			throw new RestException(404, 'No myobject found');
@@ -239,12 +240,10 @@ class MyModuleApi extends DolibarrApi
 			$this->myobject->$field = $value;
 		}
 
-		if ($this->myobject->update($id, DolibarrApiAccess::$user) > 0)
+		if ($this->myobject->update(DolibarrApiAccess::$user, false) > 0)
 		{
 			return $this->get($id);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500, $this->myobject->error);
 		}
 	}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 85d07810f54..18ca9b5ea20 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -32,6 +32,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class MyObject extends CommonObject
 {
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'mymodule';
+
 	/**
 	 * @var string ID to identify managed object.
 	 */
@@ -65,7 +70,7 @@ class MyObject extends CommonObject
 
 
 	/**
-	 *  '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')
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', '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)
@@ -78,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' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  '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'
 	 *  '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.
@@ -94,10 +99,10 @@ class MyObject extends CommonObject
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
 	public $fields = array(
-		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
 		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
 		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20),
-		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth200', 'help'=>'Help text', 'showoncombobox'=>1),
+		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>1),
 		'amount'        => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
 		'qty'           => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
 		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),
@@ -111,6 +116,7 @@ class MyObject extends CommonObject
 		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>510, 'foreignkey'=>'user.rowid'),
 		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
 		//'fk_user_valid' => array('type'=>'integer:User:user/class/user.class.php',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
+		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>0, 'notnull'=>0, 'position'=>600),
 		'import_key'    => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
 		'model_pdf' 	=> array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'notnull'=>-1, 'position'=>1010),
 		'status'        => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=> 1, 'default'=>0, 'index'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 9=>'Canceled')),
@@ -166,6 +172,11 @@ class MyObject extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var string public $last_main_doc
+	 */
+	public $last_main_doc;
+
 	/**
 	 * @var string import_key
 	 */
@@ -416,14 +427,13 @@ class MyObject extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -548,9 +558,7 @@ class MyObject extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef();
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = $num;
@@ -633,9 +641,7 @@ class MyObject extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -735,7 +741,7 @@ class MyObject extends CommonObject
 
 		$result = '';
 
-		$label = '<u>'.$langs->trans("MyObject").'</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("MyObject").'</u>';
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (isset($this->status)) {
@@ -762,8 +768,7 @@ class MyObject extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -787,14 +792,12 @@ class MyObject extends CommonObject
 					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
 					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
 						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
-					}
-					else {
+					} else {
 						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
 					}
 
 					$result .= '</div>';
-				}
-				else {
+				} else {
 					$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);
 				}
 			}
@@ -816,7 +819,7 @@ class MyObject extends CommonObject
 	}
 
 	/**
-	 *  Return label of the status
+	 *  Return the 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
@@ -902,9 +905,7 @@ class MyObject extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -937,9 +938,7 @@ class MyObject extends CommonObject
 			$this->error = $this->error;
 			$this->errors = $this->errors;
 			return $result;
-		}
-		else
-		{
+		} else {
 			$this->lines = $result;
 			return $this->lines;
 		}
@@ -989,9 +988,7 @@ class MyObject extends CommonObject
 				if ($numref != '' && $numref != '-1')
 				{
 					return $numref;
-				}
-				else
-				{
+				} else {
 					$this->error = $obj->error;
 					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 					return "";
@@ -1000,9 +997,7 @@ class MyObject extends CommonObject
 				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
 			return "";
 		}
@@ -1031,8 +1026,8 @@ class MyObject extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'standard_myobject';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->MYOBJECT_ADDON_PDF)) {
 				$modele = $conf->global->MYOBJECT_ADDON_PDF;
 			}
@@ -1078,10 +1073,13 @@ class MyObject extends CommonObject
 	}
 }
 
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+
 /**
  * Class MyObjectLine. You can also remove this and generate a CRUD class for lines objects.
  */
-class MyObjectLine
+class MyObjectLine extends CommonObjectLine
 {
 	// To complete with content of an object MyObjectLine
 	// We should have a field rowid, fk_myobject and position
diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
index 39b325924fc..cb6e15695c1 100644
--- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
@@ -146,9 +146,7 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog($this->db->error());
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 5aecfe915c8..46943c6c9ab 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -297,7 +297,7 @@ class modMyModule extends DolibarrModules
 		$this->menu[$r++]=array(
 			'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=myobject',	    // '' 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
-			'titre'=>'List MyObject',
+			'titre'=>'List_MyObject',
 			'mainmenu'=>'mymodule',
 			'leftmenu'=>'mymodule_myobject_list',
 			'url'=>'/mymodule/myobject_list.php',
@@ -311,7 +311,7 @@ class modMyModule extends DolibarrModules
 		$this->menu[$r++]=array(
 			'fk_menu'=>'fk_mainmenu=mymodule,fk_leftmenu=myobject',	    // '' 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
-			'titre'=>'New MyObject',
+			'titre'=>'New_MyObject',
 			'mainmenu'=>'mymodule',
 			'leftmenu'=>'mymodule_myobject_new',
 			'url'=>'/mymodule/myobject_card.php?action=create',
@@ -323,7 +323,6 @@ class modMyModule extends DolibarrModules
 			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
 		);
 		END MODULEBUILDER LEFTMENU MYOBJECT */
-
 		// Exports profiles provided by this module
 		$r = 1;
 		/* BEGIN MODULEBUILDER EXPORT MYOBJECT */
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 d8b836a6593..d585815e805 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,10 +47,10 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 	public $emetteur;
 
 	/**
-	 * @var array Minimum version of PHP required by module.
-	 * e.g.: PHP ≥ 5.5 = array(5, 5)
-	 */
-	public $phpmin = array(5, 5);
+     * @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
@@ -136,9 +136,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else
-			{
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
 				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
 			}
@@ -274,9 +274,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					$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
-				{
+				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
 				}
 				$file = $dir.'/'.$filename;
@@ -308,19 +306,17 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						// 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
-				{
+				} else {
 					$socobject = $object->thirdparty;
 				}
 
 				// Make substitution
 				$substitutionarray = array(
-				'__FROM_NAME__' => $this->emetteur->name,
-				'__FROM_EMAIL__' => $this->emetteur->email,
-				'__TOTAL_TTC__' => $object->total_ttc,
-				'__TOTAL_HT__' => $object->total_ht,
-				'__TOTAL_VAT__' => $object->total_vat
+					'__FROM_NAME__' => $this->emetteur->name,
+					'__FROM_EMAIL__' => $this->emetteur->email,
+					'__TOTAL_TTC__' => $object->total_ttc,
+					'__TOTAL_HT__' => $object->total_ht,
+					'__TOTAL_VAT__' => $object->total_vat
 				);
 				complete_substitutions_array($substitutionarray, $langs, $object);
 				// Call the ODTSubstitution hook
@@ -347,8 +343,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
@@ -364,8 +359,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
@@ -392,29 +386,25 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
+						if (preg_match('/logo$/', $key)) {
+							// Image
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
 							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
-						}
-						else    // Text
-						{
+						} else {
+							// Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Replace tags of lines
-				try
-				{
+				try {
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
@@ -433,15 +423,12 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 							foreach ($tmparray as $key => $val)
 							{
-								try
-								{
+								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								}
-								catch (OdfException $e)
+								} catch (OdfException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
-								}
-								catch (SegmentException $e)
+								} catch (SegmentException $e)
 								{
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
@@ -450,8 +437,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				}
-				catch (OdfException $e)
+				} catch (OdfException $e)
 				{
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
@@ -464,8 +450,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				{
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					}
-					catch (OdfException $e)
+					} catch (OdfException $e)
 					{
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -485,8 +470,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
-				}
-				else {
+				} else {
 					try {
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
@@ -507,9 +491,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // Success
-			}
-			else
-			{
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 417a3b0c173..ea9eeed797d 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -43,82 +43,82 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_standard_myobject extends ModelePDFMyObject
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
-
-    /**
-     * @var int     Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.5 = array(5, 5)
-     */
-	public $phpmin = array(5, 5);
+	 * @var string document type
+	 */
+	public $type;
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * @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
+	 */
 	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;
 
 	/**
@@ -161,17 +161,6 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Display logo
-		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Display payment mode
-		$this->option_condreg = 1; // Display payment terms
-		$this->option_codeproduitservice = 1; // Display product-service code
-		$this->option_multilang = 1; // Available in several languages
-		$this->option_escompte = 1; // Displays if there has been a discount
-		$this->option_credit_note = 1; // Support credit notes
-		$this->option_freetext = 1; // Support add of a personalised text
-		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
-
 		// Get source company
 		$this->emetteur = $mysoc;
 		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
@@ -193,50 +182,50 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int         	    			1=OK, 0=KO
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-	    // phpcs:enable
-	    global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-	    dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
+		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
-	    if (!is_object($outputlangs)) $outputlangs = $langs;
-	    // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-	    if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
-	    // Load translation files required by the page
-	    $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
 
-	    if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-	    	global $outputlangsbis;
-	    	$outputlangsbis = new Translate('', $conf);
-	    	$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-	    	$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
-	    }
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			global $outputlangsbis;
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		}
 
-	    $nblines = (is_array($object->lines) ? count($object->lines) : 0);
+		$nblines = (is_array($object->lines) ? count($object->lines) : 0);
 
-	    $hidetop = 0;
-	    if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
-	        $hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
-	    }
+		$hidetop = 0;
+		if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
+			$hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
+		}
 
-	    // Loop on each lines to detect if there is at least one image to show
-	    $realpatharray = array();
-	    $this->atleastonephoto = false;
-	    /*
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		$this->atleastonephoto = false;
+		/*
 	    if (!empty($conf->global->MAIN_GENERATE_MYOBJECT_WITH_PICTURE))
 	    {
 	        $objphoto = new Product($this->db);
@@ -289,528 +278,528 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	    }
 		*/
 
-	    //if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
 
-	    if ($conf->mymodule->dir_output.'/myobject')
-	    {
-	        $object->fetch_thirdparty();
+		if ($conf->mymodule->dir_output.'/myobject')
+		{
+			$object->fetch_thirdparty();
 
-	        // Definition of $dir and $file
-	        if ($object->specimen)
-	        {
-	        	$dir = $conf->mymodule->dir_output.'/myobject';
-	            $file = $dir."/SPECIMEN.pdf";
-	        } else {
-	            $objectref = dol_sanitizeFileName($object->ref);
-	            $dir = $conf->mymodule->dir_output.'/myobject/'.$objectref;
-	            $file = $dir."/".$objectref.".pdf";
-	        }
-	        if (!file_exists($dir))
-	        {
-	            if (dol_mkdir($dir) < 0)
-	            {
-	                $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
-	                return 0;
-	            }
-	        }
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->mymodule->dir_output.'/myobject';
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->mymodule->dir_output.'/myobject/'.$objectref;
+				$file = $dir."/".$objectref.".pdf";
+			}
+			if (!file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return 0;
+				}
+			}
 
-	        if (file_exists($dir))
-	        {
-	            // Add pdfgeneration hook
-	            if (!is_object($hookmanager))
-	            {
-	                include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-	                $hookmanager = new HookManager($this->db);
-	            }
-	            $hookmanager->initHooks(array('pdfgeneration'));
-	            $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
-	            global $action;
-	            $reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+			if (file_exists($dir))
+			{
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-	            // Set nblines with the new facture lines content after hook
-	            $nblines = (is_array($object->lines) ? count($object->lines) : 0);
+				// Set nblines with the new facture lines content after hook
+				$nblines = (is_array($object->lines) ? count($object->lines) : 0);
 
-	            // Create pdf instance
-	            $pdf = pdf_getInstance($this->format);
-	            $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1, 0);
+				// Create pdf instance
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-	            $heightforinfotot = 50; // Height reserved to output the info and total part and payment part
-	            $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$heightforinfotot = 50; // Height reserved to output the info and total part and payment part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
-	            if (class_exists('TCPDF'))
-	            {
-	                $pdf->setPrintHeader(false);
-	                $pdf->setPrintFooter(false);
-	            }
-	            $pdf->SetFont(pdf_getPDFFont($outputlangs));
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-	            // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-	            {
-	            	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-	                $tplidx = $pdf->importPage(1);
-	            }
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
-	            $pdf->Open();
-	            $pagenb = 0;
-	            $pdf->SetDrawColor(128, 128, 128);
+				$pdf->Open();
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
-	            $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-	            $pdf->SetSubject($outputlangs->transnoentities("PdfTitle"));
-	            $pdf->SetCreator("Dolibarr ".DOL_VERSION);
-	            $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-	            $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-	            if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("PdfTitle"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-	            // Set certificate
-	            $cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
-	            // If user has no certificate, we try to take the company one
-	            if (!$cert) {
-	            	$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
-	            }
-	            // If a certificate is found
-	            if ($cert) {
-	            	$info = array(
-	            		'Name' => $this->emetteur->name,
-	            		'Location' => getCountry($this->emetteur->country_code, 0),
-	            		'Reason' => 'MYOBJECT',
-	            		'ContactInfo' => $this->emetteur->email
-	            	);
-	            	$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
-	            }
+				// Set certificate
+				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
+				// If user has no certificate, we try to take the company one
+				if (!$cert) {
+					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
+				}
+				// If a certificate is found
+				if ($cert) {
+					$info = array(
+						'Name' => $this->emetteur->name,
+						'Location' => getCountry($this->emetteur->country_code, 0),
+						'Reason' => 'MYOBJECT',
+						'ContactInfo' => $this->emetteur->email
+					);
+					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
+				}
 
-	            $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-	            // New page
-	            $pdf->AddPage();
-	            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	            $pagenb++;
+				// New page
+				$pdf->AddPage();
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
 
-	            $top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
-	            $pdf->SetFont('', '', $default_font_size - 1);
-	            $pdf->MultiCell(0, 3, ''); // Set interline to 3
-	            $pdf->SetTextColor(0, 0, 0);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
-	            $tab_top = 90 + $top_shift;
-	            $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
-	            $tab_height = 130 - $top_shift;
-	            $tab_height_newpage = 150;
-	            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
+				$tab_top = 90 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+				$tab_height = 130 - $top_shift;
+				$tab_height_newpage = 150;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
 
-                $nexY = $tab_top - 1;
+				$nexY = $tab_top - 1;
 
-	            // Display notes
-	            $notetoshow = empty($object->note_public) ? '' : $object->note_public;
-	            // Extrafields in note
-                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-                if (!empty($extranote))
-                {
-                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
-                }
+				// Display notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote))
+				{
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
 
-	            $pagenb = $pdf->getPage();
-	            if ($notetoshow)
-	            {
+				$pagenb = $pdf->getPage();
+				if ($notetoshow)
+				{
 					$tab_top -= 2;
 
-	                $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
-	                $pageposbeforenote = $pagenb;
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
 
-	                $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
-	                complete_substitutions_array($substitutionarray, $outputlangs, $object);
-	                $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-	                $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-	                $pdf->startTransaction();
+					$pdf->startTransaction();
 
-	                $pdf->SetFont('', '', $default_font_size - 1);
-	                $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-	                // Description
-	                $pageposafternote = $pdf->getPage();
-	                $posyafter = $pdf->GetY();
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					// Description
+					$pageposafternote = $pdf->getPage();
+					$posyafter = $pdf->GetY();
 
-	                if ($pageposafternote > $pageposbeforenote)
-	                {
-	                    $pdf->rollbackTransaction(true);
+					if ($pageposafternote > $pageposbeforenote)
+					{
+						$pdf->rollbackTransaction(true);
 
-	                    // prepare pages to receive notes
-	                    while ($pagenb < $pageposafternote) {
-	                        $pdf->AddPage();
-	                        $pagenb++;
-	                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-	                        // $this->_pagefoot($pdf,$object,$outputlangs,1);
-	                        $pdf->setTopMargin($tab_top_newpage);
-	                        // The only function to edit the bottom margin of current page to set it.
-	                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                    }
+						// prepare pages to receive notes
+						while ($pagenb < $pageposafternote) {
+							$pdf->AddPage();
+							$pagenb++;
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							// $this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						}
 
-	                    // back to start
-	                    $pdf->setPage($pageposbeforenote);
-	                    $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                    $pdf->SetFont('', '', $default_font_size - 1);
-	                    $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-	                    $pageposafternote = $pdf->getPage();
+						// back to start
+						$pdf->setPage($pageposbeforenote);
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pageposafternote = $pdf->getPage();
 
-	                    $posyafter = $pdf->GetY();
+						$posyafter = $pdf->GetY();
 
-	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-	                    {
-	                        $pdf->AddPage('', '', true);
-	                        $pagenb++;
-	                        $pageposafternote++;
-	                        $pdf->setPage($pageposafternote);
-	                        $pdf->setTopMargin($tab_top_newpage);
-	                        // The only function to edit the bottom margin of current page to set it.
-	                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                        //$posyafter = $tab_top_newpage;
-	                    }
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
+						{
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							//$posyafter = $tab_top_newpage;
+						}
 
 
-	                    // apply note frame to previous pages
-	                    $i = $pageposbeforenote;
-	                    while ($i < $pageposafternote) {
-	                        $pdf->setPage($i);
+						// apply note frame to previous pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
 
 
-	                        $pdf->SetDrawColor(128, 128, 128);
-	                        // Draw note frame
-	                        if ($i > $pageposbeforenote) {
-	                            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-	                            $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                        } else {
-	                            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-	                            $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
-	                        }
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
 
-	                        // Add footer
-	                        $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-	                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
+							// Add footer
+							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
-	                        $i++;
-	                    }
+							$i++;
+						}
 
-	                    // apply note frame to last page
-	                    $pdf->setPage($pageposafternote);
-	                    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-	                    $height_note = $posyafter - $tab_top_newpage;
-	                    $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                } else // No pagebreak
-	                {
-	                    $pdf->commitTransaction();
-	                    $posyafter = $pdf->GetY();
-	                    $height_note = $posyafter - $tab_top;
-	                    $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+						// apply note frame to last page
+						$pdf->setPage($pageposafternote);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$height_note = $posyafter - $tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-	                    {
-	                        // not enough space, need to add page
-	                        $pdf->AddPage('', '', true);
-	                        $pagenb++;
-	                        $pageposafternote++;
-	                        $pdf->setPage($pageposafternote);
-	                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
+						{
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 
-	                        $posyafter = $tab_top_newpage;
-	                    }
-	                }
+							$posyafter = $tab_top_newpage;
+						}
+					}
 
-	                $tab_height = $tab_height - $height_note;
-	                $tab_top = $posyafter + 6;
-	            } else {
-	                $height_note = 0;
-	            }
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
+				} else {
+					$height_note = 0;
+				}
 
-	            // Use new auto column system
-	            $this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				// Use new auto column system
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
-	            // Table simulation to know the height of the title line
-			    $pdf->startTransaction();
-			    $this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
-			    $pdf->rollbackTransaction(true);
+				// Table simulation to know the height of the title line
+				$pdf->startTransaction();
+				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+				$pdf->rollbackTransaction(true);
 
-			    $nexY = $tab_top + $this->tabTitleHeight;
+				$nexY = $tab_top + $this->tabTitleHeight;
 
-	            // Loop on each lines
-	            $pageposbeforeprintlines = $pdf->getPage();
-	            $pagenb = $pageposbeforeprintlines;
-	            for ($i = 0; $i < $nblines; $i++)
-	            {
-	                $curY = $nexY;
-	                $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
-	                $pdf->SetTextColor(0, 0, 0);
+				// Loop on each lines
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
 
-	                // Define size of image if we need it
-	                $imglinesize = array();
-	                if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					// Define size of image if we need it
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
 
-	                $pdf->setTopMargin($tab_top_newpage);
-	                $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
-	                $pageposbefore = $pdf->getPage();
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
-	                $showpricebeforepagebreak = 1;
-	                $posYAfterImage = 0;
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
 
-	                if ($this->getColumnStatus('photo'))
-	                {
-    	                // We start with Photo of product line
-    	                if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-    	                {
-    	                    $pdf->AddPage('', '', true);
-    	                    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                    $pdf->setPage($pageposbefore + 1);
+					if ($this->getColumnStatus('photo'))
+					{
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
+						{
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->setPage($pageposbefore + 1);
 
-    	                    $curY = $tab_top_newpage;
+							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
-    	                }
+						}
 
-    	                if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-    	                {
-    	                    $pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
-    	                    // $pdf->Image does not increase value return by getY, so we save it manually
-    	                    $posYAfterImage = $curY + $imglinesize['height'];
-    	                }
-	                }
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
+						{
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							// $pdf->Image does not increase value return by getY, so we save it manually
+							$posYAfterImage = $curY + $imglinesize['height'];
+						}
+					}
 
-	                // Description of product line
-	                if ($this->getColumnStatus('desc'))
-	                {
-    	                $pdf->startTransaction();
+					// Description of product line
+					if ($this->getColumnStatus('desc'))
+					{
+						$pdf->startTransaction();
 
-                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
-    	                $pageposafter = $pdf->getPage();
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$pageposafter = $pdf->getPage();
 
-    	                if ($pageposafter > $pageposbefore)	// There is a pagebreak
-    	                {
-    	                    $pdf->rollbackTransaction(true);
-    	                    $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
-                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
-    	                    $pageposafter = $pdf->getPage();
-    	                    $posyafter = $pdf->GetY();
-    	                    //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-    	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-    	                    {
-    	                        if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-    	                        {
-    	                            $pdf->AddPage('', '', true);
-    	                            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                            $pdf->setPage($pageposafter + 1);
-    	                        }
-    	                    } else {
-    	                        // We found a page break
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('', '', true);
+									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									$pdf->setPage($pageposafter + 1);
+								}
+							} else {
+								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
-    	                    }
-    	                } else // No pagebreak
-    	                {
-    	                    $pdf->commitTransaction();
-    	                }
-	                }
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+					}
 
-                    $nexY = $pdf->GetY();
-	                $pageposafter = $pdf->getPage();
-	                $pdf->setPage($pageposbefore);
-	                $pdf->setTopMargin($this->marge_haute);
-	                $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
-	                // We suppose that a too long description or photo were moved completely on next page
-	                if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-	                    $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-	                }
+					// We suppose that a too long description or photo were moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
 
-	                $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
-	                // Quantity
-	                // Enough for 6 chars
-	                if ($this->getColumnStatus('qty'))
-	                {
-	                    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-	                    $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
-	                    $nexY = max($pdf->GetY(), $nexY);
-	                }
+					// Quantity
+					// Enough for 6 chars
+					if ($this->getColumnStatus('qty'))
+					{
+						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
 
-                    // Extrafields
-	                if (!empty($object->lines[$i]->array_options)) {
-	                    foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-                            if ($this->getColumnStatus($extrafieldColKey))
-                            {
-                                $extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
-                                $this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
-                                $nexY = max($pdf->GetY(), $nexY);
-                            }
-                        }
-                    }
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey))
+							{
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
 
 
-	                $parameters = array(
-	                    'object' => $object,
-	                    'i' => $i,
-	                    'pdf' =>& $pdf,
-	                    'curY' =>& $curY,
-	                    'nexY' =>& $nexY,
-	                    'outputlangs' => $outputlangs,
-	                    'hidedetails' => $hidedetails
-	                );
-	                $reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
+					$parameters = array(
+						'object' => $object,
+						'i' => $i,
+						'pdf' =>& $pdf,
+						'curY' =>& $curY,
+						'nexY' =>& $nexY,
+						'outputlangs' => $outputlangs,
+						'hidedetails' => $hidedetails
+					);
+					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
 
 
-	                $sign = 1;
-	                // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-	                $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-	                if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
-	                {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                } else {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva;
-	                }
+					$sign = 1;
+					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
+					{
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+					} else {
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						else $tvaligne = $sign * $object->lines[$i]->total_tva;
+					}
 
-	                $localtax1ligne = $object->lines[$i]->total_localtax1;
-	                $localtax2ligne = $object->lines[$i]->total_localtax2;
-	                $localtax1_rate = $object->lines[$i]->localtax1_tx;
-	                $localtax2_rate = $object->lines[$i]->localtax2_tx;
-	                $localtax1_type = $object->lines[$i]->localtax1_type;
-	                $localtax2_type = $object->lines[$i]->localtax2_type;
+					$localtax1ligne = $object->lines[$i]->total_localtax1;
+					$localtax2ligne = $object->lines[$i]->total_localtax2;
+					$localtax1_rate = $object->lines[$i]->localtax1_tx;
+					$localtax2_rate = $object->lines[$i]->localtax2_tx;
+					$localtax1_type = $object->lines[$i]->localtax1_type;
+					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-	                if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-	                if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-	                if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
 
-	                $vatrate = (string) $object->lines[$i]->tva_tx;
+					$vatrate = (string) $object->lines[$i]->tva_tx;
 
-	                // Retrieve type from database for backward compatibility with old records
-	                if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-	                    && (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-	                {
-	                    $localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-	                    $localtax1_type = $localtaxtmp_array[0];
-	                    $localtax2_type = $localtaxtmp_array[2];
-	                }
+					// Retrieve type from database for backward compatibility with old records
+					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
+						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
+					{
+						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+						$localtax1_type = $localtaxtmp_array[0];
+						$localtax2_type = $localtaxtmp_array[2];
+					}
 
-	                // retrieve global local tax
-                    if ($localtax1_type && $localtax1ligne != 0) {
-                        $this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-                    }
-                    if ($localtax2_type && $localtax2ligne != 0) {
-                        $this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
-                    }
+					// retrieve global local tax
+					if ($localtax1_type && $localtax1ligne != 0) {
+						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
+						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-                    if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-                    if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
-                    $this->tva[$vatrate] += $tvaligne;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
+					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					$this->tva[$vatrate] += $tvaligne;
 
-                    $nexY = max($nexY, $posYAfterImage);
+					$nexY = max($nexY, $posYAfterImage);
 
-                    // Add line
-                    if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
-                        $pdf->setPage($pageposafter);
-                        $pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
-                        //$pdf->SetDrawColor(190,190,200);
-                        $pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-                        $pdf->SetLineStyle(array('dash'=>0));
-                    }
+					// Add line
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
 
-                    // Detect if some page were added automatically and output _tableau for past pages
-                    while ($pagenb < $pageposafter) {
-                        $pdf->setPage($pagenb);
-                        if ($pagenb == $pageposbeforeprintlines) {
-                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        } else {
-                        	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
-                        $pagenb++;
-                        $pdf->setPage($pagenb);
-                        $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-                    }
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter) {
+						$pdf->setPage($pagenb);
+						if ($pagenb == $pageposbeforeprintlines) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
 
-                    if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
-                        if ($pagenb == $pageposafter) {
-                        	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        } else {
-                        	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
-                        // New page
-                        $pdf->AddPage();
-                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-                        $pagenb++;
-                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-                    }
-	            }
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						// New page
+						$pdf->AddPage();
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
 
-	            // Show square
-	            if ($pagenb == $pageposbeforeprintlines)
-	            {
-	            	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
-	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            } else {
-	            	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
-	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
+				// Show square
+				if ($pagenb == $pageposbeforeprintlines)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
 
-	            // Display infos area
-	            //$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+				// Display infos area
+				//$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
-	            // Display total zone
-	            //$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+				// Display total zone
+				//$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
-	            // Display payment area
-	            /*
+				// Display payment area
+				/*
 	            if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
 	            {
 	                $posy = $this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
 	            }
 	            */
 
-	            // Pagefoot
-	            $this->_pagefoot($pdf, $object, $outputlangs);
-	            if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				// Pagefoot
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
-	            $pdf->Close();
+				$pdf->Close();
 
-	            $pdf->Output($file, 'F');
+				$pdf->Output($file, 'F');
 
-	            // Add pdfgeneration hook
-	            $hookmanager->initHooks(array('pdfgeneration'));
-	            $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
-	            global $action;
-	            $reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-	            if ($reshook < 0)
-	            {
-	                $this->error = $hookmanager->error;
-	                $this->errors = $hookmanager->errors;
-	            }
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0)
+				{
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
+				}
 
-	            if (!empty($conf->global->MAIN_UMASK))
-	                @chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-	                $this->result = array('fullpath'=>$file);
+					$this->result = array('fullpath'=>$file);
 
-	                return 1; // No error
-	        } else {
-	            $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
-	            return 0;
-	        }
-	    } else {
-	        $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
-	        return 0;
-	    }
+					return 1; // No error
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
+			return 0;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -883,7 +872,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 
 		if (empty($hidetop)) {
-		    $pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
 		}
 	}
 
@@ -910,10 +899,10 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
-        {
-		      pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
-        }
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
+		{
+			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
+		}
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -921,7 +910,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		$w = 110;
 
 		$posy = $this->marge_haute;
-        $posx = $this->page_largeur - $this->marge_droite - $w;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -940,7 +929,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
+					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
@@ -970,7 +959,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == Facture::STATUS_DRAFT)
+		if ($object->statut == $object::STATUS_DRAFT)
 		{
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
@@ -1033,16 +1022,16 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $usertmp = new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy += 4;
-                $pdf->SetXY($posx, $posy);
-		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 1;
@@ -1149,8 +1138,8 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
-	 *   	@param	PDF			$pdf     			PDF
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
@@ -1168,28 +1157,28 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	 *
 	 *  @param	object			$object    		common object
 	 *  @param	Translate		$outputlangs    langs
-     *  @param	int			   $hidedetails		Do not show line details
-     *  @param	int			   $hidedesc		Do not show desc
-     *  @param	int			   $hideref			Do not show ref
-     *  @return	null
-     */
-    public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-	    global $conf, $hookmanager;
+	 *  @param	int			   $hidedetails		Do not show line details
+	 *  @param	int			   $hidedesc		Do not show desc
+	 *  @param	int			   $hideref			Do not show ref
+	 *  @return	null
+	 */
+	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf, $hookmanager;
 
-	    // Default field style for content
-	    $this->defaultContentsFieldsStyle = array(
-	        'align' => 'R', // R,C,L
-	        'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultContentsFieldsStyle = array(
+			'align' => 'R', // R,C,L
+			'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    // Default field style for content
-	    $this->defaultTitlesFieldsStyle = array(
-	        'align' => 'C', // R,C,L
-	        'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultTitlesFieldsStyle = array(
+			'align' => 'C', // R,C,L
+			'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    /*
+		/*
 	     * For exemple
 	    $this->cols['theColKey'] = array(
 	        'rank' => $rank, // int : use for ordering columns
@@ -1207,162 +1196,162 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	    );
 	    */
 
-	    $rank = 0; // do not use negative rank
-	    $this->cols['desc'] = array(
-	        'rank' => $rank,
-	        'width' => false, // only for desc
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Designation', // use lang key is usefull in somme case with module
-	            'align' => 'L',
-	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'content' => array(
-	            'align' => 'L',
-                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	    );
+		$rank = 0; // do not use negative rank
+		$this->cols['desc'] = array(
+			'rank' => $rank,
+			'width' => false, // only for desc
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'align' => 'L',
+				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				// 'label' => ' ', // the final label
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L',
+				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
 
-	    // PHOTO
-        $rank = $rank + 10;
-        $this->cols['photo'] = array(
-            'rank' => $rank,
-            'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
-            'status' => false,
-            'title' => array(
-                'textkey' => 'Photo',
-                'label' => ' '
-            ),
-            'content' => array(
-                'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-            ),
-            'border-left' => false, // remove left line separator
-        );
+		// PHOTO
+		$rank = $rank + 10;
+		$this->cols['photo'] = array(
+			'rank' => $rank,
+			'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Photo',
+				'label' => ' '
+			),
+			'content' => array(
+				'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'border-left' => false, // remove left line separator
+		);
 
-	    if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
+		{
+			$this->cols['photo']['status'] = true;
+		}
 
 
-	    $rank = $rank + 10;
-	    $this->cols['vat'] = array(
-	        'rank' => $rank,
-	        'status' => false,
-	        'width' => 16, // in mm
-	        'title' => array(
-	            'textkey' => 'VAT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['vat'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 16, // in mm
+			'title' => array(
+				'textkey' => 'VAT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $this->cols['vat']['status'] = true;
-	    }
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$this->cols['vat']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['subprice'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'PriceUHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['subprice'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PriceUHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['qty'] = array(
-	        'rank' => $rank,
-	        'width' => 16, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Qty'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['qty'] = array(
+			'rank' => $rank,
+			'width' => 16, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Qty'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['progress'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Progress'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['progress'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Progress'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if ($this->situationinvoice)
-	    {
-	        $this->cols['progress']['status'] = true;
-	    }
+		if ($this->situationinvoice)
+		{
+			$this->cols['progress']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['unit'] = array(
-	        'rank' => $rank,
-	        'width' => 11, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Unit'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($conf->global->PRODUCT_USE_UNITS) {
-	        $this->cols['unit']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['unit'] = array(
+			'rank' => $rank,
+			'width' => 11, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$this->cols['unit']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['discount'] = array(
-	        'rank' => $rank,
-	        'width' => 13, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'ReductionShort'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($this->atleastonediscount) {
-	        $this->cols['discount']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['discount'] = array(
+			'rank' => $rank,
+			'width' => 13, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'ReductionShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($this->atleastonediscount) {
+			$this->cols['discount']['status'] = true;
+		}
 
-	    $rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
-	    $this->cols['totalexcltax'] = array(
-	        'rank' => $rank,
-	        'width' => 26, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    // Add extrafields cols
-        if (!empty($object->lines)) {
-            $line = reset($object->lines);
-            $this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
-        }
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
 
-	    $parameters = array(
-	        'object' => $object,
-	        'outputlangs' => $outputlangs,
-	        'hidedetails' => $hidedetails,
-	        'hidedesc' => $hidedesc,
-	        'hideref' => $hideref
-	    );
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
 
-	    $reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-	    if ($reshook < 0)
-	    {
-	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    } elseif (empty($reshook))
-	    {
-	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    } else {
-	        $this->cols = $hookmanager->resArray;
-	    }
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0)
+		{
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook))
+		{
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
 	}
 }
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
index 51e50fbf43f..6f1a5da7dd3 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
@@ -91,8 +91,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		if ($object->ismultientitymanaged == 1) {
 			$sql .= " AND entity = ".$conf->entity;
-		}
-		elseif ($object->ismultientitymanaged == 2) {
+		} elseif ($object->ismultientitymanaged == 2) {
 			// TODO
 		}
 
@@ -129,8 +128,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		if ($object->ismultientitymanaged == 1) {
 			$sql .= " AND entity = ".$conf->entity;
-		}
-		elseif ($object->ismultientitymanaged == 2) {
+		} elseif ($object->ismultientitymanaged == 2) {
 			// TODO
 		}
 
@@ -140,9 +138,7 @@ class mod_myobject_standard extends ModeleNumRefMyObject
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
 			else $max = 0;
-		}
-		else
-		{
+		} else {
 			dol_syslog("mod_myobject_standard::getNextValue", LOG_DEBUG);
 			return -1;
 		}
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 4c5951dad70..be6d42047ce 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -102,6 +102,19 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 		// Put here code you want to execute when a Dolibarr business events occurs.
 		// Data and type of action are stored into $object and $action
 
+		// You can isolate code for each action in a separate method: this method should be named like the trigger in camelCase.
+		// For example : COMPANY_CREATE => public function companyCreate($action, $object, User $user, Translate $langs, Conf $conf)
+		$methodName = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', strtolower($action)))));
+		$callback = array($this, $methodName);
+		if (is_callable($callback)){
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			return call_user_func($callback, $action, $object, $user, $langs, $conf);
+		};
+
+		// Or you can execute some code here
 		switch ($action) {
 			// Users
 			//case 'USER_CREATE':
diff --git a/htdocs/modulebuilder/template/modulebuilder.txt b/htdocs/modulebuilder/template/modulebuilder.txt
index 24ea0d6eac5..670a1774929 100644
--- a/htdocs/modulebuilder/template/modulebuilder.txt
+++ b/htdocs/modulebuilder/template/modulebuilder.txt
@@ -1,3 +1,3 @@
 # DO NOT DELETE THIS FILE MANUALLY
 # File to flag module built using official module template.
-# When this file is present into a module directory, you can edit it with the module builder tool. Use ModuleBuilder if you want to delete module. 
\ No newline at end of file
+# When this file is present into a module directory, you can edit it with the module builder tool. 
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/mymoduleindex.php b/htdocs/modulebuilder/template/mymoduleindex.php
index 4a3356f1d7e..3da38a7e02c 100644
--- a/htdocs/modulebuilder/template/mymoduleindex.php
+++ b/htdocs/modulebuilder/template/mymoduleindex.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("mymodule@mymodule"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 // Security check
@@ -106,7 +106,7 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("DraftOrders").($num?'<span class="badge marginleftonlyshort">'.$num.'</span>':'').'</th></tr>';
+		print '<th colspan="3">'.$langs->trans("DraftMyObjects").($num?'<span class="badge marginleftonlyshort">'.$num.'</span>':'').'</th></tr>';
 
 		$var = true;
 		if ($num > 0)
@@ -117,22 +117,17 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven"><td class="nowrap">';
-				$orderstatic->id=$obj->rowid;
-				$orderstatic->ref=$obj->ref;
-				$orderstatic->ref_client=$obj->ref_client;
-				$orderstatic->total_ht = $obj->total_ht;
-				$orderstatic->total_tva = $obj->total_tva;
-				$orderstatic->total_ttc = $obj->total_ttc;
-				print $orderstatic->getNomUrl(1);
+
+				$myobjectstatic->id=$obj->rowid;
+				$myobjectstatic->ref=$obj->ref;
+				$myobjectstatic->ref_client=$obj->ref_client;
+				$myobjectstatic->total_ht = $obj->total_ht;
+				$myobjectstatic->total_tva = $obj->total_tva;
+				$myobjectstatic->total_ttc = $obj->total_ttc;
+
+				print $myobjectstatic->getNomUrl(1);
 				print '</td>';
 				print '<td class="nowrap">';
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->name;
-				$companystatic->client=$obj->client;
-				$companystatic->code_client = $obj->code_client;
-				$companystatic->code_fournisseur = $obj->code_fournisseur;
-				$companystatic->canvas=$obj->canvas;
-				print $companystatic->getNomUrl(1,'customer',16);
 				print '</td>';
 				print '<td class="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
 				$i++;
@@ -164,21 +159,19 @@ END MODULEBUILDER DRAFT MYOBJECT */
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
-$NBMAX = 3;
-$max = 3;
+$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
 if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 {
-	$sql = "SELECT s.rowid, s.nom as name, s.client, s.datec, s.tms, s.canvas";
-	$sql.= ", s.code_client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.client IN (1, 2, 3)";
-	$sql.= " AND s.entity IN (".getEntity($companystatic->element).")";
-	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 = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
+	$sql.= " FROM ".MAIN_DB_PREFIX."mymodule_myobject as s";
+	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.entity IN (".getEntity($myobjectstatic->element).")";
+	//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 s.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -191,9 +184,7 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">';
-		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects",$max);
-		else if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects",$max);
-		else print $langs->trans("BoxTitleLastModifiedCustomers",$max);
+		print $langs->trans("BoxTitleLatestModifiedMyObjects", $max);
 		print '</th>';
 		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
 		print '</tr>';
@@ -202,28 +193,23 @@ if (! empty($conf->mymodule->enabled) && $user->rights->mymodule->read)
 			while ($i < $num)
 			{
 				$objp = $db->fetch_object($resql);
-				$companystatic->id=$objp->rowid;
-				$companystatic->name=$objp->name;
-				$companystatic->client=$objp->client;
-				$companystatic->code_client = $objp->code_client;
-				$companystatic->code_fournisseur = $objp->code_fournisseur;
-				$companystatic->canvas=$objp->canvas;
+
+				$myobjectstatic->id=$objp->rowid;
+				$myobjectstatic->ref=$objp->ref;
+				$myobjectstatic->label=$objp->label;
+				$myobjectstatic->status = $objp->status;
+
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1,'customer',48).'</td>';
+				print '<td class="nowrap">'.$myobjectstatic->getNomUrl(1).'</td>';
 				print '<td class="right nowrap">';
-				print $companystatic->getLibCustProspStatut();
 				print "</td>";
-				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms),'day')."</td>";
+				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
 				print '</tr>';
 				$i++;
-
-
 			}
 
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print "</table><br>";
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 58d64b622d0..b5f6ef7f722 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -19,9 +19,29 @@
 /**
  *  \file       htdocs/modulebuilder/template/myobject_agenda.php
  *  \ingroup    mymodule
- *  \brief      Page of MyObject events
+ *  \brief      Tab of events on MyObject
  */
 
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+
 // Load Dolibarr environment
 $res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
@@ -50,17 +70,14 @@ $langs->loadLangs(array("mymodule@mymodule", "other"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -206,13 +223,15 @@ if ($object->id > 0)
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.$object->element.'&originid='.$object->id;
+	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->rights->agenda->myactions->create;
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
 	{
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&socid='.urlencode($objthirdparty->id);
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
 		//$out.="</a>";
@@ -226,9 +245,7 @@ if ($object->id > 0)
 		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
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
 		}
 	}
@@ -249,7 +266,7 @@ if ($object->id > 0)
 		$filters['search_agenda_label'] = $search_agenda_label;
 
 		// TODO Replace this with same code than into list.php
-		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, 'mymmodule');
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
 	}
 }
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index e00c0a3b618..1dacbcaac87 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -40,7 +40,7 @@
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
 //if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 $res = 0;
@@ -89,7 +89,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -157,7 +157,7 @@ if (empty($reshook))
 
 	if ($action == 'set_thirdparty' && $permissiontoadd)
 	{
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MYOBJECT_MODIFY');
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
 	}
 	if ($action == 'classin' && $permissiontoadd)
 	{
@@ -165,7 +165,7 @@ if (empty($reshook))
 	}
 
 	// Actions to send emails
-	$triggersendname = 'MYOBJECT_SENTBYMAIL';
+	$triggersendname = 'MYMODULE_MYOBJECT_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
 	$trackid = 'myobject'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
@@ -287,13 +287,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$formconfirm = '';
 
 	// Confirmation to delete
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
-	if ($action == 'deleteline')
-	{
+	if ($action == 'deleteline') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
 	// Clone confirmation
@@ -345,19 +343,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 if (! empty($conf->projet->enabled))
 	 {
 	 $langs->load("projects");
-	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 $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> ';
-	 $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.'">';
-	 $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->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);
 	 }
@@ -470,35 +468,26 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Back to draft
-			if ($object->status == $object::STATUS_VALIDATED)
-			{
-				if ($permissiontoadd)
-				{
+			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)
-			{
+			if ($permissiontoadd) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
-			}
-			else
-			{
+			} 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 ($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
-					{
+					} else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 					}
@@ -506,31 +495,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Clone
-			if ($permissiontoadd)
-			{
+			if ($permissiontoadd) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=myobject">'.$langs->trans("ToClone").'</a>'."\n";
 			}
 
 			/*
 			if ($permissiontoadd)
 			{
-				if ($object->status == $object::STATUS_ENABLED)
-				{
+				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
-				{
+				} 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)
-				{
+				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
-				{
+				} else {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans("Re-Open").'</a>'."\n";
 				}
 			}
@@ -539,10 +521,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// 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">'.$langs->trans('Delete').'</a>'."\n";
-			}
-			else
-			{
+				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";
 			}
 		}
@@ -589,7 +569,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element.'@mymodule', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
 
 		print '</div></div></div>';
 	}
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 63b114ffc10..46a8d0c3a10 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -22,6 +22,26 @@
  *  \brief      Tab for documents linked to MyObject
  */
 
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+
 // Load Dolibarr environment
 $res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
@@ -199,9 +219,7 @@ if ($object->id)
 	$relativepathwithnofile = 'myobject/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 809f7ffb107..b1ec021e774 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -22,24 +22,25 @@
  *		\brief      List page for myobject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');					// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');					// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');					// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');			// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');			// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');					// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');					// Do not check style html tag into posted data
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');						// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');					// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');					// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       		  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');						// If this page is public (can be called outside logged session)
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');			// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', '1');		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("XFRAMEOPTIONS_ALLOWALL"))   define('XFRAMEOPTIONS_ALLOWALL', '1');			// Do not add the HTTP header 'X-Frame-Options: SAMEORIGIN' but 'X-Frame-Options: ALLOWALL'
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 $res = 0;
@@ -83,8 +84,8 @@ $id = GETPOST('id', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
@@ -108,7 +109,7 @@ if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default sea
 if (!$sortorder) $sortorder = "ASC";
 
 // Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? trim(GETPOST('search_all', 'alphanohtml')) : trim(GETPOST('sall', 'alphanohtml'));
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -122,12 +123,21 @@ foreach ($object->fields as $key => $val)
 	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
 
-// Definition of fields for list
+// Definition of array of fields for columns
 $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'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+	if (!empty($val['visible'])) {
+		$visible = dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
+	}
 }
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -140,7 +150,8 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 				'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]),
-				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key]
+				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key],
+				'help'=>$extrafields->attributes[$object->table_element]['help'][$key]
 			);
 		}
 	}
@@ -237,6 +248,10 @@ $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $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)";
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 else $sql .= " WHERE 1 = 1";
 foreach ($search as $key => $val)
@@ -270,7 +285,7 @@ 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, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/,\s*$/','', $sql);
 */
@@ -293,9 +308,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -351,6 +364,10 @@ foreach ($search as $key => $val)
 if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -370,7 +387,6 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-//print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/mymodule/myobject_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
@@ -431,8 +447,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
@@ -511,7 +526,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		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($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']))
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index aece1f98f29..1a6fd1a4cc6 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -19,9 +19,29 @@
 /**
  *  \file       htdocs/modulebuilder/template/myobject_note.php
  *  \ingroup    mymodule
- *  \brief      Car with notes on MyObject
+ *  \brief      Tab for notes on MyObject
  */
 
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+
 // Load Dolibarr environment
 $res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
@@ -46,7 +66,7 @@ $langs->loadLangs(array("mymodule@mymodule", "companies"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index 009dcabaafd..0b8d7abfdfe 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -166,9 +166,7 @@ if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
-{
+} else {
 	print '--- end error code='.$error."\n";
 	$db->rollback();
 }
diff --git a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql
index e9a612dca91..fc6b7b0d243 100644
--- a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql
+++ b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.key.sql
@@ -15,7 +15,7 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_mymodule_myobject ADD INDEX idx_fieldobject (fieldobject);
+ALTER TABLE llx_mymodule_myobject ADD INDEX idx_mymodule_myobject_fieldobject (fieldobject);
 -- END MODULEBUILDER INDEXES
 
 --ALTER TABLE llx_mymodule_myobject ADD UNIQUE INDEX uk_mymodule_myobject_fieldxy(fieldx, fieldy);
diff --git a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.key.sql b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.key.sql
index 6cb6bd48ca1..4c005e9d170 100644
--- a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.key.sql
+++ b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject_extrafields.key.sql
@@ -15,5 +15,5 @@
 
 
 -- BEGIN MODULEBUILDER INDEXES
-ALTER TABLE llx_mymodule_myobject_extrafields ADD INDEX idx_fk_object(fk_object);
+ALTER TABLE llx_mymodule_myobject_extrafields ADD INDEX idx_myobject_fk_object(fk_object);
 -- END MODULEBUILDER INDEXES
diff --git a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index d9693402980..169bfeb92f6 100644
--- a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -17,12 +17,26 @@
  */
 
 /**
- * \file    test/unit/MyObjectTest.php
+ * \file    test/phpunit/MyObjectTest.php
  * \ingroup mymodule
  * \brief   PHPUnit test for MyObject class.
  */
 
-namespace test\unit;
+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';
+require_once dirname(__FILE__).'/../../htdocs/mymodule/class/myobject.class.php';
+
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+$langs->load("main");
+
 
 /**
  * Class MyObjectTest
@@ -30,13 +44,43 @@ namespace test\unit;
  */
 class MyObjectTest extends \PHPUnit_Framework_TestCase
 {
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return MyObject
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
 	/**
 	 * Global test setup
 	 * @return void
 	 */
 	public static function setUpBeforeClass()
 	{
-		fwrite(STDOUT, __METHOD__."\n");
+		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";
 	}
 
 	/**
@@ -45,36 +89,13 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	protected function setUp()
 	{
-		fwrite(STDOUT, __METHOD__."\n");
-	}
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
 
-	/**
-	 * Verify pre conditions
-	 * @return void
-	 */
-	protected function assertPreConditions()
-	{
-		fwrite(STDOUT, __METHOD__."\n");
-	}
-
-	/**
-	 * A sample test
-	 * @return bool
-	 */
-	public function testSomething()
-	{
-		fwrite(STDOUT, __METHOD__."\n");
-		// TODO: test something
-		$this->assertTrue(true);
-	}
-
-	/**
-	 * Verify post conditions
-	 * @return void
-	 */
-	protected function assertPostConditions()
-	{
-		fwrite(STDOUT, __METHOD__."\n");
+		print __METHOD__."\n";
 	}
 
 	/**
@@ -83,7 +104,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	protected function tearDown()
 	{
-		fwrite(STDOUT, __METHOD__."\n");
+		print __METHOD__."\n";
 	}
 
 	/**
@@ -92,19 +113,30 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 */
 	public static function tearDownAfterClass()
 	{
-		fwrite(STDOUT, __METHOD__."\n");
+		global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
 	}
 
+
 	/**
-	 * Unsuccessful test
-	 *
-	 * @param  Exception $e    Exception
-	 * @return void
-	 * @throws Exception
+	 * A sample test
+	 * @return bool
 	 */
-	protected function onNotSuccessfulTest(Exception $e)
+	public function testSomething()
 	{
-		fwrite(STDOUT, __METHOD__."\n");
-		throw $e;
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$result = true;
+
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result);
+
+		return $result;
 	}
 }
diff --git a/htdocs/mrp/ajax/ajax_bom.php b/htdocs/mrp/ajax/ajax_bom.php
index 19fea01aa60..adf4a8f4ee7 100644
--- a/htdocs/mrp/ajax/ajax_bom.php
+++ b/htdocs/mrp/ajax/ajax_bom.php
@@ -34,7 +34,7 @@ require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 
 $idbom = GETPOST('idbom', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -49,8 +49,6 @@ if ($result > 0)
 	unset($object->fields);
 	unset($object->db);
 	echo json_encode($object);
-}
-else
-{
+} else {
    	echo 'Failed to load category with id='.$idbom;
 }
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 963da439180..d502e5cc99d 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -99,7 +99,7 @@ class Mos extends DolibarrApi
 		global $db, $conf;
 
 		$obj_ret = array();
-		$tmpobject = new Mo($db);
+		$tmpobject = new Mo($this->db);
 
 		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
@@ -139,7 +139,7 @@ class Mos extends DolibarrApi
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-		$sql .= $db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
 			if ($page < 0)
 			{
@@ -147,18 +147,18 @@ class Mos extends DolibarrApi
 			}
 			$offset = $limit * $page;
 
-			$sql .= $db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
-		$result = $db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$num = $db->num_rows($result);
+			$num = $this->db->num_rows($result);
 			$i = 0;
 			while ($i < $num)
 			{
-				$obj = $db->fetch_object($result);
-				$tmp_object = new Mo($db);
+				$obj = $this->db->fetch_object($result);
+				$tmp_object = new Mo($this->db);
 				if ($tmp_object->fetch($obj->rowid)) {
 					$obj_ret[] = $this->_cleanObjectDatas($tmp_object);
 				}
@@ -225,12 +225,9 @@ class Mos extends DolibarrApi
 			$this->mo->$field = $value;
 		}
 
-		if ($this->mo->update($id, DolibarrApiAccess::$user) > 0)
-		{
+		if ($this->mo->update($id, DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500, $this->mo->error);
 		}
 	}
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 89e9b25abef..c0d6658cab7 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -421,14 +421,11 @@ class Mo extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -582,8 +579,7 @@ class Mo extends CommonObject
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 			$this->db->commit();
 			return 1;
-		}
-		else {
+		} else {
 			setEventMessages($this->error, $this->errors, 'errors');
 			$this->db->rollback();
 			return -1;
@@ -655,8 +651,7 @@ class Mo extends CommonObject
 								$error++;
 								$this->error = "BadValueForquantityToConsume";
 								break;
-							}
-							else {
+							} else {
 								$moline->fk_product = $line->fk_product;
 								$moline->role = 'toconsume';
 								$moline->position = $line->position;
@@ -762,16 +757,12 @@ class Mo extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				$this->error = $obj->error;
 				//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-		}
-		else
-		{
+		} else {
 			print $langs->trans("Error")." ".$langs->trans("Error_MRP_MO_ADDON_NotDefined");
 			return "";
 		}
@@ -816,9 +807,7 @@ class Mo extends CommonObject
 		{
 			$this->fetch_product();
 			$num = $this->getNextNumRef($this->product);
-		}
-		else
-		{
+		} else {
 			$num = $this->ref;
 		}
 		$this->newref = $num;
@@ -899,9 +888,7 @@ class Mo extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1000,7 +987,7 @@ class Mo extends CommonObject
 
         $result = '';
 
-        $label = '<u>'.$langs->trans("MO").'</u>';
+        $label = img_picto('', $this->picto).' <u>'.$langs->trans("MO").'</u>';
         $label .= '<br>';
         $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
         if (isset($this->status)) {
@@ -1028,8 +1015,7 @@ class Mo extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1078,7 +1064,7 @@ class Mo extends CommonObject
 			global $langs;
 			//$langs->load("mrp");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated').' ('.$langs->trans("ToProduce").')';
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('ValidatedToProduce');
 			$this->labelStatus[self::STATUS_INPROGRESS] = $langs->trans('InProgress');
 			$this->labelStatus[self::STATUS_PRODUCED] = $langs->trans('StatusMOProduced');
 			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
@@ -1145,9 +1131,7 @@ class Mo extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -1180,9 +1164,7 @@ class Mo extends CommonObject
 	        $this->error = $this->error;
 	        $this->errors = $this->errors;
 	        return $result;
-	    }
-	    else
-	    {
+	    } else {
 	        $this->lines = $result;
 	        return $this->lines;
 	    }
@@ -1209,8 +1191,8 @@ class Mo extends CommonObject
 			//$modele = 'standard';
 			$modele = ''; // Remove this once a pdf_standard.php exists.
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->MO_ADDON_PDF)) {
 				$modele = $conf->global->MO_ADDON_PDF;
 			}
@@ -1328,9 +1310,7 @@ class Mo extends CommonObject
 			$productstatic->fetch($line->fk_product);
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
 			//$this->tpl['label'].= ' - '.$productstatic->label;
-		}
-		else
-		{
+		} else {
 			// If origin MRP line is not a product, but another MRP
 			// TODO
 		}
@@ -1513,14 +1493,11 @@ class MoLine extends CommonObjectLine
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
diff --git a/htdocs/mrp/index.php b/htdocs/mrp/index.php
index f0bdc8ba62d..d4359dcae90 100644
--- a/htdocs/mrp/index.php
+++ b/htdocs/mrp/index.php
@@ -136,9 +136,7 @@ if ($conf->use_javascript_ajax)
     	print "</div>";
 
     	print "<br>";
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
 }
@@ -195,9 +193,7 @@ if ($resql)
 	}
 	print "</table></div>";
 	print "<br>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -248,9 +244,7 @@ if ($resql)
     }
     print "</table></div>";
     print "<br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index 20c2cbfe290..c2107296b2b 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array("mrp", "other"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -48,9 +48,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -216,9 +214,7 @@ if ($object->id > 0)
     	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
-    	{
+    	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 17799f7cbd1..e20a57a6e4d 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2017-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,26 +21,6 @@
  *		\brief      Page to create/edit/view mo
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-
-
 // Load Dolibarr environment
 require '../main.inc.php';
 
@@ -79,7 +59,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -127,77 +107,75 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    $backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
+	$backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
 
-    if (empty($backtopage) || ($cancel && empty($id))) {
-    	if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
-	    	if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-    		else $backtopage = DOL_URL_ROOT.'/mrp/mo_card.php?id='.($id > 0 ? $id : '__ID__');
-    	}
-    }
-    if ($cancel && !empty($backtopageforcancel)) {
-    	$backtopage = $backtopageforcancel;
-    }
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+			else $backtopage = DOL_URL_ROOT.'/mrp/mo_card.php?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
+	if ($cancel && !empty($backtopageforcancel)) {
+		$backtopage = $backtopageforcancel;
+	}
 
-    $triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
+	$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'MO_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
-    $trackid = 'mo'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'MO_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
+	$trackid = 'mo'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Action to move up and down lines of object
-    //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
-    if ($action == 'set_thirdparty' && $permissiontoadd)
-    {
-    	$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
-    }
-    if ($action == 'classin' && $permissiontoadd)
-    {
-    	$object->setProject(GETPOST('projectid', 'int'));
-    }
+	if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
 
-    // Action close produced
-    if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
-    {
-    	$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
-    	if ($result >= 0)
-    	{
-    		// Define output language
-    		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-    		{
-    			$outputlangs = $langs;
-    			$newlang = '';
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-    			if (!empty($newlang)) {
-    				$outputlangs = new Translate("", $conf);
-    				$outputlangs->setDefaultLang($newlang);
-    			}
-    			$model = $object->modelpdf;
-    			$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');
+		}
+	}
 }
 
 
@@ -339,7 +317,7 @@ if (($id || $ref) && $action == 'edit')
 	print load_fiche_titre($langs->trans("MO"), '', 'mrp');
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
@@ -382,7 +360,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation to delete
 	if ($action == 'delete')
 	{
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
@@ -461,32 +439,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($permissiontoadd)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
-	        }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= ' : '.$proj->getNomUrl();
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ' : '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -523,165 +501,167 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (!empty($object->table_element_line))
 	{
-    	// Show object lines
+		// Show object lines
 		//$result = $object->getLinesArray();
 		$object->fetchLines();
 
-    	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
     	<input type="hidden" name="token" value="' . newToken().'">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
     	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
-    	/*if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+		/*if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
     	    include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
     	}*/
 
-    	if (!empty($object->lines))
-    	{
-    		print '<div class="div-table-responsive-no-min">';
-    		print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		if (!empty($object->lines))
+		{
+			print '<div class="div-table-responsive-no-min">';
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
-    		print '<tr class="liste_titre">';
-    		print '<td class="liste_titre">'.$langs->trans("Summary").'</td>';
-    		print '<td></td>';
-    		print '</tr>';
+			print '<tr class="liste_titre">';
+			print '<td class="liste_titre">'.$langs->trans("Summary").'</td>';
+			print '<td></td>';
+			print '</tr>';
 
-    		print '<tr class="oddeven">';
-    		print '<td>'.$langs->trans("ProductsToConsume").'</td>';
-    		print '<td>';
-    		if (!empty($object->lines))
-    		{
-    			$i = 0;
-    			foreach ($object->lines as $line) {
-    				if ($line->role == 'toconsume') {
-    					if ($i) print ', ';
-    					$tmpproduct = new Product($db);
-    					$tmpproduct->fetch($line->fk_product);
-    					print $tmpproduct->getNomUrl(1);
-    					$i++;
-    				}
-    			}
-    		}
-    		print '</td>';
-    		print '</tr>';
+			print '<tr class="oddeven">';
+			print '<td>'.$langs->trans("ProductsToConsume").'</td>';
+			print '<td>';
+			if (!empty($object->lines))
+			{
+				$i = 0;
+				foreach ($object->lines as $line) {
+					if ($line->role == 'toconsume') {
+						if ($i) print ', ';
+						$tmpproduct = new Product($db);
+						$tmpproduct->fetch($line->fk_product);
+						print $tmpproduct->getNomUrl(1);
+						$i++;
+					}
+				}
+			}
+			print '</td>';
+			print '</tr>';
 
-    		print '<tr class="oddeven">';
-    		print '<td>'.$langs->trans("ProductsToProduce").'</td>';
-    		print '<td>';
-    		if (!empty($object->lines))
-    		{
-    			$i = 0;
-    			foreach ($object->lines as $line) {
-    				if ($line->role == 'toproduce') {
-    					if ($i) print ', ';
-    					$tmpproduct = new Product($db);
-    					$tmpproduct->fetch($line->fk_product);
-    					print $tmpproduct->getNomUrl(1);
-    					$i++;
-    				}
-    			}
-    		}
-    		print '</td>';
-    		print '</tr>';
+			print '<tr class="oddeven">';
+			print '<td>'.$langs->trans("ProductsToProduce").'</td>';
+			print '<td>';
+			if (!empty($object->lines))
+			{
+				$i = 0;
+				foreach ($object->lines as $line) {
+					if ($line->role == 'toproduce') {
+						if ($i) print ', ';
+						$tmpproduct = new Product($db);
+						$tmpproduct->fetch($line->fk_product);
+						print $tmpproduct->getNomUrl(1);
+						$i++;
+					}
+				}
+			}
+			print '</td>';
+			print '</tr>';
 
-    	    print '</table>';
-    	    print '</div>';
-    	}
+			print '</table>';
+			print '</div>';
+		}
 
-    	print "</form>\n";
+		print "</form>\n";
 	}
 
 
 	// Buttons for actions
 
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
-    	    // Send
-    		//if (empty($user->socid)) {
-    		//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
-    		//}
+		if (empty($reshook))
+		{
+			// Send
+			//if (empty($user->socid)) {
+			//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
+			//}
 
-    		// Back to draft
-    		if ($object->status == $object::STATUS_VALIDATED)
-    		{
-	    		if ($permissiontoadd)
-	    		{
-	    			// TODO Add test that production has not started
-	    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
-	    		}
-    		}
+			// Back to draft
+			if ($object->status == $object::STATUS_VALIDATED)
+			{
+				if ($permissiontoadd)
+				{
+					// TODO Add test that production has not started
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
+				}
+			}
 
-            // Modify
-    		if ($object->status == $object::STATUS_DRAFT) {
-	    		if ($permissiontoadd)
-	    		{
-	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-	    		}
-	    		else
-	    		{
-	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-	    		}
-    		}
+			// Modify
+			if ($object->status == $object::STATUS_DRAFT) {
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
+				}
+			}
 
-    		// Validate
-    		if ($object->status == $object::STATUS_DRAFT)
-    		{
-	    		if ($permissiontoadd)
-	    		{
-	    			if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
-	    		    {
-	    		        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-	    		    }
-	    		    else
-	    		    {
-	    		    	$langs->load("errors");
-	    		        print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
-	    		    }
-	    		}
-    		}
+			// Validate
+			if ($object->status == $object::STATUS_DRAFT)
+			{
+				if ($permissiontoadd)
+				{
+					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
+					{
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
+					} else {
+						$langs->load("errors");
+						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+					}
+				}
+			}
 
-    		// Clone
-    		if ($permissiontoadd)
-    		{
-    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->fk_soc.'&action=clone&object=mo">'.$langs->trans("ToClone").'</a>';
-    		}
+			// Clone
+			if ($permissiontoadd)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->fk_soc.'&action=clone&object=mo">'.$langs->trans("ToClone").'</a>';
+			}
 
-    		// Cancel - Reopen
-    		if ($permissiontoadd)
-    		{
-    			if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_INPROGRESS)
-    			{
-    				// TODO If production is already > 1, show only close, else show cancel
-    				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+			// Cancel - Reopen
+			if ($permissiontoadd)
+			{
+				if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_INPROGRESS)
+				{
+					$arrayproduced = $object->fetchLinesLinked('produced', 0);
+					$nbProduced = 0;
+					foreach ($arrayproduced as $lineproduced) {
+						$nbProduced += $lineproduced['qty'];
+					}
+					if ($nbProduced > 0) {	// If production has started, we can close it
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+					} else {
+						print '<a class="butActionRefused" href="#" title="'.$langs->trans("GoOnTabProductionToProduceFirst", $langs->transnoentitiesnoconv("Production")).'">'.$langs->trans("Close").'</a>'."\n";
+					}
 
-    				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
-    			}
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
+				}
 
-    			if ($object->status == $object::STATUS_PRODUCED || $object->status == $object::STATUS_CANCELED)
-    			{
-    				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$langs->trans("ReOpen").'</a>'."\n";
-    			}
-    		}
+				if ($object->status == $object::STATUS_PRODUCED || $object->status == $object::STATUS_CANCELED)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$langs->trans("ReOpen").'</a>'."\n";
+				}
+			}
 
-    		// Delete (need delete permission, or if draft, just need create/modify permission)
-    		if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
-    		{
-    			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else
-    		{
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			// Delete (need delete permission, or if draft, just need create/modify permission)
+			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
@@ -692,37 +672,37 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($action != 'presend')
 	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    // Documents
-	    $objref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $objref.'/'.$objref.'.pdf';
-	    $filedir = $conf->mrp->dir_output.'/'.$objref;
-	    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-	    $genallowed = $user->rights->mrp->read; // If you can read, you can build the PDF to read content
-	    $delallowed = $user->rights->mrp->create; // If you can create/edit, you can remove a file on card
-	    print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang);
+		// Documents
+		$objref = dol_sanitizeFileName($object->ref);
+		$relativepath = $objref.'/'.$objref.'.pdf';
+		$filedir = $conf->mrp->dir_output.'/'.$objref;
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed = $user->rights->mrp->read; // If you can read, you can build the PDF to read content
+		$delallowed = $user->rights->mrp->create; // If you can create/edit, you can remove a file on card
+		print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang);
 
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    $MAXEVENT = 10;
+		$MAXEVENT = 10;
 
-	    $morehtmlright = '<a href="'.dol_buildpath('/mrp/mo_agenda.php', 1).'?id='.$object->id.'">';
-	    $morehtmlright .= $langs->trans("SeeAll");
-	    $morehtmlright .= '</a>';
+		$morehtmlright = '<a href="'.dol_buildpath('/mrp/mo_agenda.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'mo', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'mo', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index afc7ef58819..68e693ca072 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -184,9 +184,7 @@ if ($object->id)
 	$relativepathwithnofile = 'mo/'.dol_sanitizeFileName($object->ref).'/';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 4807c47fb53..b9da34958d4 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -21,25 +21,6 @@
  *		\brief      List page for mo
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session)
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', '1');		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("XFRAMEOPTIONS_ALLOWALL"))   define('XFRAMEOPTIONS_ALLOWALL', '1');			// Do not add the HTTP header 'X-Frame-Options: SAMEORIGIN' but 'X-Frame-Options: ALLOWALL'
-
 // Load Dolibarr environment
 require '../main.inc.php';
 
@@ -70,8 +51,8 @@ $id = GETPOST('id', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -107,7 +88,7 @@ if ($user->socid > 0)	// Protection if external user
 
 
 // Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? trim(GETPOST('search_all', 'alphanohtml')) : trim(GETPOST('sall', 'alphanohtml'));
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -279,9 +260,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -416,8 +395,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 25d78c8c8e1..754a83c4770 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -21,26 +21,6 @@
  *		\brief      Page to show tock movements of a MO
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-
-
 // Load Dolibarr environment
 require '../main.inc.php';
 
@@ -143,6 +123,12 @@ $arrayfields = array(
 	//'m.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	//'m.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
 );
+if (!empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+	unset($arrayfields['pl.eatby']);
+}
+if (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+	unset($arrayfields['pl.sellby']);
+}
 $objectlist->fields = dol_sort_array($objectlist->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -790,8 +776,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			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.
+			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'])) {
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 7d0fe785c58..f25ebc35d0d 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array("mrp", "companies"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 2f8f2ce1d8e..e86fdc8348d 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2019 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2019-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,26 +21,6 @@
  *		\brief      Page to make production on a MO
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-
-
 // Load Dolibarr environment
 require '../main.inc.php';
 
@@ -83,7 +63,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -274,7 +254,7 @@ if (empty($reshook))
 	    						setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
 	    						$error++;
 	    					}
-	    					if ($tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
+	    					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++;
@@ -352,8 +332,7 @@ if (empty($reshook))
 	    				}
 	    			}
 	    		}
-    		}
-    		else {
+    		} else {
     			$consumptioncomplete = false;
     			$productioncomplete = false;
     		}
@@ -401,14 +380,12 @@ if (empty($reshook))
     				$outputlangs = new Translate("", $conf);
     				$outputlangs->setDefaultLang($newlang);
     			}
-    			$model = $object->modelpdf;
+    			$model = $object->model_pdf;
     			$ret = $object->fetch($id); // Reload to get new records
 
     			$object->generateDocument($model, $outputlangs, 0, 0, 0);
     		}
-    	}
-    	else
-    	{
+    	} else {
     		setEventMessages($object->error, $object->errors, 'errors');
     	}
     }
@@ -592,9 +569,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
 					{
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-					}
-					else
-					{
+					} else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
 					}
@@ -628,8 +603,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			{
 				if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_INPROGRESS)
 				{
-					// TODO If production is already > 1, show only close, else show cancel
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+					$arrayproduced = $object->fetchLinesLinked('produced', 0);
+					$nbProduced = 0;
+					foreach ($arrayproduced as $lineproduced) {
+						$nbProduced += $lineproduced['qty'];
+					}
+					if ($nbProduced > 0) {	// If production has started, we can close it
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+					} else {
+						print '<a class="butActionRefused" href="#" title="'.$langs->trans("GoOnTabProductionToProduceFirst", $langs->transnoentitiesnoconv("Production")).'">'.$langs->trans("Close").'</a>'."\n";
+					}
 
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
 				}
@@ -668,8 +651,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			print '<div class="center'.(in_array($action, array('consumeorproduce', 'consumeandproduceall')) ? ' formconsumeproduce' : '').'">';
 			print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ConfirmProductionDesc", $langs->transnoentitiesnoconv("Confirm")).'<br></span>';
-			print $langs->trans("MovementLabel").': <input type="text" class="minwidth300" name="inventorylabel" value="'.$defaultstockmovementlabel.'"> &nbsp; ';
-			print $langs->trans("InventoryCode").': <input type="text" class="maxwidth200" name="inventorycode" value="'.$defaultstockmovementcode.'"><br><br>';
+			print '<span class="fieldrequired">'.$langs->trans("InventoryCode").':</span> <input type="text" class="maxwidth200" name="inventorycode" value="'.$defaultstockmovementcode.'"> &nbsp; ';
+			print '<span class="clearbothonsmartphone"></span>';
+			print $langs->trans("MovementLabel").': <input type="text" class="minwidth300" name="inventorylabel" value="'.$defaultstockmovementlabel.'"><br><br>';
 			print '<input type="checkbox" id="autoclose" name="autoclose" value="1"'.(GETPOSTISSET('inventorylabel') ? (GETPOST('autoclose') ? ' checked="checked"' : '') : ' checked="checked"').'> <label for="autoclose">'.$langs->trans("AutoCloseMO").'</label><br>';
 			print '<input class="button" type="submit" value="'.$langs->trans("Confirm").'" name="confirm">';
 			print ' &nbsp; ';
@@ -697,7 +681,10 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	print '<div class="fichehalfleft">';
     	print '<div class="clearboth"></div>';
 
-    	$newlinetext = '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline">'.$langs->trans("AddNewConsumeLines").'</a>';
+    	$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">';
@@ -828,7 +815,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	    			$i = 1;
     	    			print '<!-- Enter line to consume -->'."\n";
     	    			print '<tr>';
-    	    			print '<td>'.$langs->trans("ToConsume").'</td>';
+    	    			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>';
@@ -976,8 +963,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     				}
 
     				if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
+    					print '<!-- Enter line to produce -->'."\n";
     					print '<tr name="batch_'.$line->id.'_'.$i.'">';
-    					print '<td>'.$langs->trans("ToProduce").'</td>';
+    					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>';
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 2c6a33f3ef9..2ce3277ae89 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -409,9 +409,7 @@ class MultiCurrency extends CommonObject
 		{
 			$this->rate = $currencyRate;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->rate = null;
 			$this->errors = $currencyRate->errors;
 			return -1;
@@ -425,15 +423,15 @@ class MultiCurrency extends CommonObject
 	 * @param	double	$rate	new rate
 	 * @return int -1 if KO, 1 if OK, 2 if label found and OK
 	 */
-    public function addRateFromDolibarr($code, $rate)
-    {
-        global $db, $user;
+	public function addRateFromDolibarr($code, $rate)
+	{
+		global $db, $user;
 
-		$currency = new MultiCurrency($db);
+		$currency = new MultiCurrency($this->db);
 		$currency->code = $code;
 		$currency->name = $code;
 
-	 	$sql = 'SELECT label FROM '.MAIN_DB_PREFIX.'c_currencies WHERE code_iso = \''.$db->escape($code).'\'';
+		$sql = 'SELECT label FROM '.MAIN_DB_PREFIX."c_currencies WHERE code_iso = '".$this->db->escape($code)."'";
 
 	 	dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $db->query($sql);
@@ -451,26 +449,26 @@ class MultiCurrency extends CommonObject
 		}
 
 		return -1;
-    }
+	}
 
 	 /**
-	 * Add new entry into llx_multicurrency_rate
-	 *
-	 * @param double	$rate	rate value
-	 * @return int <0 if KO, >0 if OK
-     */
-    public function updateRate($rate)
-    {
-        return $this->addRate($rate);
-    }
+	  * Add new entry into llx_multicurrency_rate
+	  *
+	  * @param double	$rate	rate value
+	  * @return int <0 if KO, >0 if OK
+	  */
+	public function updateRate($rate)
+	{
+		return $this->addRate($rate);
+	}
 
 	/**
 	 * Fetch CurrencyRate object in $this->rate
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function getRate()
-    {
+	public function getRate()
+	{
 	 	$sql = 'SELECT cr.rowid';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as cr';
 		$sql .= ' WHERE cr.fk_multicurrency = '.$this->id;
@@ -482,40 +480,40 @@ class MultiCurrency extends CommonObject
 			$this->rate = new CurrencyRate($this->db);
 			return $this->rate->fetch($obj->rowid);
 		}
-    }
+	}
 
 	 /**
-	 * Get id of currency from code
-	 *
-	 * @param  DoliDB	$db		    object db
-	 * @param  string	$code	   code value search
-	 *
-	 * @return int                 0 if not found, >0 if OK
-	 */
-    public static function getIdFromCode(&$db, $code)
-    {
+	  * Get id of currency from code
+	  *
+	  * @param  DoliDB	$db		    object db
+	  * @param  string	$code	    code value search
+	  *
+	  * @return int                 0 if not found, >0 if OK
+	  */
+	public static function getIdFromCode($db, $code)
+	{
 	 	global $conf;
 
-	 	$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'multicurrency WHERE code = \''.$db->escape($code).'\' AND entity = '.$conf->entity;
+	 	$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."multicurrency WHERE code = '".$db->escape($code)."' AND entity = ".$conf->entity;
 
 	 	dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql && $obj = $db->fetch_object($resql)) return $obj->rowid;
 		else return 0;
-    }
+	}
 
 	 /**
-	 * Get id and rate of currency from code
-	 *
-	 * @param DoliDB	$db		        Object db
-	 * @param string	$code	        Code value search
-	 * @param integer	$date_document	Date from document (propal, order, invoice, ...)
-	 *
-	 * @return 	array	[0] => id currency
-	 *					[1] => rate
-	 */
-    public static function getIdAndTxFromCode(&$db, $code, $date_document = '')
-    {
+	  * Get id and rate of currency from code
+	  *
+	  * @param DoliDB	$db		        Object db
+	  * @param string	$code	        Code value search
+	  * @param integer	$date_document	Date from document (propal, order, invoice, ...)
+	  *
+	  * @return 	array	[0] => id currency
+	  *					[1] => rate
+	  */
+	public static function getIdAndTxFromCode($db, $code, $date_document = '')
+	{
 		global $conf;
 
 	 	$sql1 = 'SELECT m.rowid, mc.rate FROM '.MAIN_DB_PREFIX.'multicurrency m';
@@ -534,8 +532,7 @@ class MultiCurrency extends CommonObject
 		$resql = $db->query($sql1.$sql2.$sql3);
 
 		if ($resql && $obj = $db->fetch_object($resql)) return array($obj->rowid, $obj->rate);
-		else
-		{
+		else {
 			if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE))
 			{
 				$resql = $db->query($sql1.$sql3);
@@ -544,35 +541,34 @@ class MultiCurrency extends CommonObject
 
 			return array(0, 1);
 		}
-    }
+	}
 
-    /**
-     * Get the conversion of amount with invoice rate
-     *
-     * @param	int		$fk_facture		id of facture
-     * @param	double	$amount			amount to convert
-     * @param	string	$way			dolibarr mean the amount is in dolibarr currency
-     * @param	string	$table			facture or facture_fourn
-     * @return	double					amount converted
-     */
-    public static function getAmountConversionFromInvoiceRate($fk_facture, $amount, $way = 'dolibarr', $table = 'facture')
-    {
-        $multicurrency_tx = self::getInvoiceRate($fk_facture, $table);
+	/**
+	 * Get the conversion of amount with invoice rate
+	 *
+	 * @param	int		$fk_facture		id of facture
+	 * @param	double	$amount			amount to convert
+	 * @param	string	$way			'dolibarr' mean the amount is in dolibarr currency
+	 * @param	string	$table			facture or facture_fourn
+	 * @return	double					amount converted
+	 */
+	public static function getAmountConversionFromInvoiceRate($fk_facture, $amount, $way = 'dolibarr', $table = 'facture')
+	{
+		$multicurrency_tx = self::getInvoiceRate($fk_facture, $table);
 
-        if ($multicurrency_tx)
-        {
-            if ($way == 'dolibarr') return $amount * $multicurrency_tx;
-            else return $amount / $multicurrency_tx;
-        }
-        else return $amount;
-    }
+		if ($multicurrency_tx)
+		{
+			if ($way == 'dolibarr') return price2num($amount * $multicurrency_tx, 'MU');
+			else return price2num($amount / $multicurrency_tx, 'MU');
+		} else return $amount;
+	}
 
 	/**
 	 *  Get current invoite rate
 	 *
 	 *  @param	int 	$fk_facture 	id of facture
 	 *  @param 	string 	$table 			facture or facture_fourn
-     *  @return bool
+	 *  @return bool
 	 */
 	public static function getInvoiceRate($fk_facture, $table = 'facture')
 	{
@@ -603,7 +599,7 @@ class MultiCurrency extends CommonObject
 
 		if ($conf->currency != $conf->global->MULTICURRENCY_APP_SOURCE)
 		{
-		    $alternate_source = 'USD'.$conf->currency;
+			$alternate_source = 'USD'.$conf->currency;
 			if (!empty($TRate->{$alternate_source}))
 			{
 				$coef = $TRate->USDUSD / $TRate->{$alternate_source};
@@ -626,7 +622,7 @@ class MultiCurrency extends CommonObject
 	 *
 	 * @param 	string  $key                Key to use. Come from $conf->global->MULTICURRENCY_APP_ID.
 	 * @param   int     $addifnotfound      Add if not found
-     * @return  int							<0 if KO, >0 if OK
+	 * @return  int							<0 if KO, >0 if OK
 	 */
 	public static function syncRates($key, $addifnotfound = 0)
 	{
@@ -639,14 +635,14 @@ class MultiCurrency extends CommonObject
 		dol_syslog("Call url endpoint ".$urlendpoint);
 
 		// TODO Use getURLContent() function instead.
-        $ch = curl_init($urlendpoint);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        $response = curl_exec($ch);
-        curl_close($ch);
-        $response = json_decode($response);
+		$ch = curl_init($urlendpoint);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		$response = curl_exec($ch);
+		curl_close($ch);
+		$response = json_decode($response);
 
-        if ($response->success)
-        {
+		if ($response->success)
+		{
 			$TRate = $response->quotes;
 			$timestamp = $response->timestamp;
 
@@ -659,8 +655,7 @@ class MultiCurrency extends CommonObject
 					if ($obj->fetch(null, $code) > 0)
 					{
 						$obj->updateRate($rate);
-					}
-					elseif ($addifnotfound)
+					} elseif ($addifnotfound)
 					{
 						self::addRateFromDolibarr($code, $rate);
 					}
@@ -668,10 +663,8 @@ class MultiCurrency extends CommonObject
 			}
 
 			return 1;
-        }
-		else
-		{
-		    dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING);
+		} else {
+			dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING);
 			setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
 
 			return -1;
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 56aabc24721..f5fa5a5ab78 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -49,8 +49,8 @@ $object = new Opensurveysondage($db);
 $result = $object->fetch(0, $numsondage);
 if ($result <= 0)
 {
-    dol_print_error($db, $object->error);
-    exit;
+	dol_print_error($db, $object->error);
+	exit;
 }
 
 $expiredate = dol_mktime(0, 0, 0, GETPOST('expiremonth'), GETPOST('expireday'), GETPOST('expireyear'));
@@ -67,113 +67,112 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel) $action = '';
+	if ($cancel) $action = '';
 
-    // Delete
-    if ($action == 'delete_confirm')
-    {
-    	// Security check
-    	if (!$user->rights->opensurvey->write) accessforbidden();
+	// Delete
+	if ($action == 'delete_confirm')
+	{
+		// Security check
+		if (!$user->rights->opensurvey->write) accessforbidden();
 
-    	$result = $object->delete($user, '', $numsondage);
+		$result = $object->delete($user, '', $numsondage);
 
-    	header('Location: '.dol_buildpath('/opensurvey/list.php', 1));
-    	exit();
-    }
+		header('Location: '.dol_buildpath('/opensurvey/list.php', 1));
+		exit();
+	}
 
-    // Close
-    if ($action == 'close')
-    {
-        $object->status = Opensurveysondage::STATUS_CLOSED;
-        $object->update($user);
-    }
+	// Close
+	if ($action == 'close')
+	{
+		$object->status = Opensurveysondage::STATUS_CLOSED;
+		$object->update($user);
+	}
 
-    // Reopend
-    if ($action == 'reopen')
-    {
-        $object->status = Opensurveysondage::STATUS_VALIDATED;
-        $object->update($user);
-    }
+	// Reopend
+	if ($action == 'reopen')
+	{
+		$object->status = Opensurveysondage::STATUS_VALIDATED;
+		$object->update($user);
+	}
 
-    // Update
-    if ($action == 'update')
-    {
-    	// Security check
-    	if (!$user->rights->opensurvey->write) accessforbidden();
+	// Update
+	if ($action == 'update')
+	{
+		// Security check
+		if (!$user->rights->opensurvey->write) accessforbidden();
 
-    	$error = 0;
+		$error = 0;
 
-    	if (!GETPOST('nouveautitre'))
-    	{
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
-    		$error++;
-    		$action = 'edit';
-    	}
+		if (!GETPOST('nouveautitre'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
+			$error++;
+			$action = 'edit';
+		}
 
-    	if (!$error)
-    	{
-    		$object->titre = GETPOST('nouveautitre', 'nohtml');
-    		$object->commentaires = GETPOST('nouveauxcommentaires', 'restricthtml');
-    		$object->description = GETPOST('nouveauxcommentaires', 'restricthtml');
-    		$object->mail_admin = GETPOST('nouvelleadresse', 'alpha');
-    		$object->date_fin = $expiredate;
-    		$object->allow_comments = GETPOST('cancomment', 'alpha') == 'on' ? true : false;
-    		$object->allow_spy = GETPOST('canseeothersvote', 'alpha') == 'on' ? true : false;
-    		$object->mailsonde = GETPOST('mailsonde', 'alpha') == 'on' ? true : false;
+		if (!$error)
+		{
+			$object->title = GETPOST('nouveautitre', 'nohtml');
+			$object->description = GETPOST('nouveauxcommentaires', 'restricthtml');
+			$object->mail_admin = GETPOST('nouvelleadresse', 'alpha');
+			$object->date_fin = $expiredate;
+			$object->allow_comments = GETPOST('cancomment', 'alpha') == 'on' ? 1 : 0;
+			$object->allow_spy = GETPOST('canseeothersvote', 'alpha') == 'on' ? 1 : 0;
+			$object->mailsonde = GETPOST('mailsonde', 'alpha') == 'on' ? true : false;
 
-    		$res = $object->update($user);
-    		if ($res < 0)
-    		{
-    			setEventMessages($object->error, $object->errors, 'errors');
-    			$action = 'edit';
-    		}
-    	}
-    }
+			$res = $object->update($user);
+			if ($res < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'edit';
+			}
+		}
+	}
 
-    // Add comment
-    if (GETPOST('ajoutcomment'))
-    {
-    	$error = 0;
+	// Add comment
+	if (GETPOST('ajoutcomment'))
+	{
+		$error = 0;
 
-    	if (!GETPOST('comment'))
-    	{
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
-    	}
-    	if (!GETPOST('commentuser'))
-    	{
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
-    	}
+		if (!GETPOST('comment'))
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
+		}
+		if (!GETPOST('commentuser'))
+		{
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
+		}
 
-    	if (!$error)
-    	{
-    		$comment = GETPOST("comment");
-    		$comment_user = GETPOST('commentuser');
+		if (!$error)
+		{
+			$comment = GETPOST("comment");
+			$comment_user = GETPOST('commentuser');
 
-    		$resql = $object->addComment($comment, $comment_user);
+			$resql = $object->addComment($comment, $comment_user);
 
-    		if (!$resql)
-    		{
-    			setEventMessages($langs->trans('ErrorInsertingComment'), null, 'errors');
-    		}
-    	}
-    }
+			if (!$resql)
+			{
+				setEventMessages($langs->trans('ErrorInsertingComment'), null, 'errors');
+			}
+		}
+	}
 
-    // Delete comment
-    $idcomment = GETPOST('deletecomment', 'int');
-    if ($idcomment)
-    {
-    	// Security check
-    	if (!$user->rights->opensurvey->write) accessforbidden();
+	// Delete comment
+	$idcomment = GETPOST('deletecomment', 'int');
+	if ($idcomment)
+	{
+		// Security check
+		if (!$user->rights->opensurvey->write) accessforbidden();
 
-    	$resql = $object->deleteComment($idcomment);
-    }
+		$resql = $object->deleteComment($idcomment);
+	}
 
-    if ($action == 'edit') {
-    	// Security check
-    	if (!$user->rights->opensurvey->write) accessforbidden();
-    }
+	if ($action == 'edit') {
+		// Security check
+		if (!$user->rights->opensurvey->write) accessforbidden();
+	}
 }
 
 
@@ -189,7 +188,7 @@ if ($object->fk_user_creat)
 	$userstatic->fetch($object->fk_user_creat);
 }
 
-$title = $object->titre." - ".$langs->trans('Card');
+$title = $object->title." - ".$langs->trans('Card');
 $helpurl = '';
 $arrayofjs = array();
 $arrayofcss = array('/opensurvey/css/style.css');
@@ -240,9 +239,8 @@ $adresseadmin = $object->mail_admin;
 print $langs->trans("Title").'</td><td colspan="2">';
 if ($action == 'edit')
 {
-	print '<input type="text" name="nouveautitre" style="width: 95%" value="'.dol_escape_htmltag(dol_htmlentities($object->titre)).'">';
-}
-else print dol_htmlentities($object->titre);
+	print '<input type="text" name="nouveautitre" style="width: 95%" value="'.dol_escape_htmltag(dol_htmlentities($object->title)).'">';
+} else print dol_htmlentities($object->title);
 print '</td></tr>';
 
 // Description
@@ -251,9 +249,7 @@ if ($action == 'edit')
 {
 	$doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
 	$doleditor->Create(0, '');
-}
-else
-{
+} else {
 	print (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
 }
 print '</td></tr>';
@@ -265,8 +261,7 @@ if (!$object->fk_user_creat) {
 	if ($action == 'edit')
 	{
 		print '<input type="text" name="nouvelleadresse" class="minwith200" value="'.$object->mail_admin.'">';
-	}
-	else print dol_print_email($object->mail_admin, 0, 0, 1);
+	} else print dol_print_email($object->mail_admin, 0, 0, 1);
 	print '</td></tr>';
 }
 
@@ -275,8 +270,7 @@ print '<tr><td>'.$langs->trans('ToReceiveEMailForEachVote').'</td><td colspan="2
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="mailsonde" '.($object->mailsonde ? 'checked="checked"' : '').'">';
-}
-else {
+} else {
 	print yn($object->mailsonde);
 
 	//If option is active and linked user does not have an email, we show a warning
@@ -293,8 +287,7 @@ print '<tr><td>'.$langs->trans('CanComment').'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="cancomment" '.($object->allow_comments ? 'checked="checked"' : '').'">';
-}
-else print yn($object->allow_comments);
+} else print yn($object->allow_comments);
 print '</td></tr>';
 
 // Users can see others vote
@@ -302,17 +295,15 @@ print '<tr><td>'.$langs->trans('CanSeeOthersVote').'</td><td colspan="2">';
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="canseeothersvote" '.($object->allow_spy ? 'checked="checked"' : '').'">';
-}
-else print yn($object->allow_spy);
+} else print yn($object->allow_spy);
 print '</td></tr>';
 
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
 if ($action == 'edit') print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
-else
-{
-    print dol_print_date($object->date_fin, 'day');
-    if ($object->date_fin && $object->date_fin < dol_now() && $object->status == Opensurveysondage::STATUS_VALIDATED) print img_warning($langs->trans("Expired"));
+else {
+	print dol_print_date($object->date_fin, 'day');
+	if ($object->date_fin && $object->date_fin < dol_now() && $object->status == Opensurveysondage::STATUS_VALIDATED) print img_warning($langs->trans("Expired"));
 }
 print '</td></tr>';
 
@@ -365,22 +356,22 @@ print '</form>'."\n";
 print '<div class="tabsAction">';
 
 if ($action != 'edit' && $user->rights->opensurvey->write) {
-    //Modify button
-    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$numsondage.'">'.$langs->trans("Modify").'</a>';
+	//Modify button
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$numsondage.'">'.$langs->trans("Modify").'</a>';
 
-    if ($object->status == Opensurveysondage::STATUS_VALIDATED)
-    {
-        //Close button
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=close&id='.$numsondage.'">'.$langs->trans("Close").'</a>';
-    }
-    if ($object->status == Opensurveysondage::STATUS_CLOSED)
-    {
-        //Opened button
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=reopen&id='.$numsondage.'">'.$langs->trans("ReOpen").'</a>';
-    }
+	if ($object->status == Opensurveysondage::STATUS_VALIDATED)
+	{
+		//Close button
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=close&id='.$numsondage.'">'.$langs->trans("Close").'</a>';
+	}
+	if ($object->status == Opensurveysondage::STATUS_CLOSED)
+	{
+		//Opened button
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=reopen&id='.$numsondage.'">'.$langs->trans("ReOpen").'</a>';
+	}
 
 	//Delete button
-	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?suppressionsondage=1&id='.$numsondage.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
+	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?suppressionsondage=1&id='.$numsondage.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
 }
 
 print '</div>';
@@ -409,10 +400,8 @@ if ($comments) {
 
 		print dol_htmlentities($comment->usercomment).': '.dol_nl2br(dol_htmlentities($comment->comment))." <br>";
 	}
-}
-else
-{
-	print $langs->trans("NoCommentYet").'<br>';
+} else {
+	print '<span class="opacitymedium">'.$langs->trans("NoCommentYet").'</span><br>';
 }
 
 print '<br>';
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index c971b69b208..f8f6cb0f885 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -34,634 +34,615 @@ require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";
  */
 class Opensurveysondage extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'opensurvey_sondage';
-
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'opensurvey_sondage';
-
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'poll';
-
-
-    /**
-     * @var string	ID survey
-     */
-    public $id_sondage;
-    /**
-     * @deprecated
-     * @see $description
-     */
-    public $commentaires;
-
-    /**
-     * @var string description
-     */
-    public $description;
-
-    public $mail_admin;
-    public $nom_admin;
-
-    /**
-     * Id of user author of the poll
-     * @var int
-     */
-    public $fk_user_creat;
-
-    public $titre;
-    public $date_fin = '';
-    public $status = 1;
-    public $format;
-    public $mailsonde;
-
-    public $sujet;
-
-    /**
-     * @var int		Allow comments on this poll
-     */
-    public $allow_comments;
-
-    /**
-     * @var int		Allow users see others vote
-     */
-    public $allow_spy;
-
-
-    /**
-     * Draft status (not used)
-     */
-    const STATUS_DRAFT = 0;
-    /**
-     * Validated/Opened status
-     */
-    const STATUS_VALIDATED = 1;
-    /**
-     * Closed
-     */
-    const STATUS_CLOSED = 2;
-
-
-
-    /**
-     *  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 $user, $notrigger = 0)
-    {
-        $error = 0;
-
-        // Clean parameters
-        $this->cleanParameters();
-
-        // Check parameters
-        if (!$this->date_fin > 0)
-        {
-            $this->error = 'BadValueForEndDate';
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-            return -1;
-        }
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."opensurvey_sondage(";
-        $sql .= "id_sondage,";
-        $sql .= "commentaires,";
-        $sql .= "fk_user_creat,";
-        $sql .= "titre,";
-        $sql .= "date_fin,";
-        $sql .= "status,";
-        $sql .= "format,";
-        $sql .= "mailsonde,";
-        $sql .= "allow_comments,";
-        $sql .= "allow_spy,";
-        $sql .= "sujet";
-        $sql .= ") VALUES (";
-        $sql .= "'".$this->db->escape($this->id_sondage)."',";
-        $sql .= " ".(empty($this->commentaires) ? 'NULL' : "'".$this->db->escape($this->commentaires)."'").",";
-        $sql .= " ".$user->id.",";
-        $sql .= " '".$this->db->escape($this->titre)."',";
-        $sql .= " '".$this->db->idate($this->date_fin)."',";
-        $sql .= " ".$this->status.",";
-        $sql .= " '".$this->db->escape($this->format)."',";
-        $sql .= " ".$this->db->escape($this->mailsonde).",";
-        $sql .= " ".$this->db->escape($this->allow_comments).",";
-        $sql .= " ".$this->db->escape($this->allow_spy).",";
-        $sql .= " '".$this->db->escape($this->sujet)."'";
-        $sql .= ")";
-
-        $this->db->begin();
-
-           dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-
-        if (!$error)
-        {
-            if (!$notrigger)
-            {
-                global $langs, $conf;
-
-                // Call trigger
-                $result = $this->call_trigger('OPENSURVEY_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;
-        }
-    }
-
-
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id    				Id object
-     *  @param	string	$numsurvey			Ref of survey (admin or not)
-     *  @return int          				<0 if KO, >0 if OK
-     */
-    public function fetch($id, $numsurvey = '')
-    {
-        $sql = "SELECT";
-        $sql .= " t.id_sondage,";
-        $sql .= " t.commentaires as description,";
-        $sql .= " t.mail_admin,";
-        $sql .= " t.nom_admin,";
-        $sql .= " t.fk_user_creat,";
-        $sql .= " t.titre,";
-        $sql .= " t.date_fin,";
-        $sql .= " t.status,";
-        $sql .= " t.format,";
-        $sql .= " t.mailsonde,";
-        $sql .= " t.allow_comments,";
-        $sql .= " t.allow_spy,";
-        $sql .= " t.sujet,";
-        $sql .= " t.tms";
-        $sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_sondage as t";
-        $sql .= " WHERE t.id_sondage = '".$this->db->escape($id ? $id : $numsurvey)."'";
-
-        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_sondage = $obj->id_sondage;
-                $this->ref = $this->id_sondage; //For compatibility
-
-                $this->commentaires = $obj->description; // deprecated
-                $this->description = $obj->description;
-                $this->mail_admin = $obj->mail_admin;
-                $this->nom_admin = $obj->nom_admin;
-                $this->titre = $obj->titre;
-                $this->date_fin = $this->db->jdate($obj->date_fin);
-                $this->status = $obj->status;
-                $this->format = $obj->format;
-                $this->mailsonde = $obj->mailsonde;
-                $this->allow_comments = $obj->allow_comments;
-                $this->allow_spy = $obj->allow_spy;
-                $this->sujet = $obj->sujet;
-                $this->fk_user_creat = $obj->fk_user_creat;
-
-                $this->date_m = $this->db->jdate($obj->tls);
-                $ret = 1;
-            }
-            else
-            {
-                $sondage = ($id ? 'id='.$id : 'sondageid='.$numsurvey);
-                $this->error = 'Fetch no poll found for '.$sondage;
-                dol_syslog($this->error, LOG_ERR);
-                $ret = 0;
-            }
-
-            $this->db->free($resql);
-        }
-        else
-        {
-              $this->error = "Error ".$this->db->lasterror();
-            $ret = -1;
-        }
-
-        return $ret;
-    }
-
-
-    /**
-     *  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 $user, $notrigger = 0)
-    {
-        global $conf, $langs;
-        $error = 0;
-
-        // Clean parameters
-        $this->cleanParameters();
-
-        // Check parameters
-        // Put here code to add a control on parameters values
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."opensurvey_sondage SET";
-
-        $sql .= " id_sondage=".(isset($this->id_sondage) ? "'".$this->db->escape($this->id_sondage)."'" : "null").",";
-        $sql .= " commentaires=".(isset($this->commentaires) ? "'".$this->db->escape($this->commentaires)."'" : "null").",";
-        $sql .= " mail_admin=".(isset($this->mail_admin) ? "'".$this->db->escape($this->mail_admin)."'" : "null").",";
-        $sql .= " nom_admin=".(isset($this->nom_admin) ? "'".$this->db->escape($this->nom_admin)."'" : "null").",";
-        $sql .= " titre=".(isset($this->titre) ? "'".$this->db->escape($this->titre)."'" : "null").",";
-        $sql .= " date_fin=".(dol_strlen($this->date_fin) != 0 ? "'".$this->db->idate($this->date_fin)."'" : 'null').",";
-        $sql .= " status=".(isset($this->status) ? "'".$this->db->escape($this->status)."'" : "null").",";
-        $sql .= " format=".(isset($this->format) ? "'".$this->db->escape($this->format)."'" : "null").",";
-        $sql .= " mailsonde=".(isset($this->mailsonde) ? $this->db->escape($this->mailsonde) : "null").",";
-        $sql .= " allow_comments=".$this->db->escape($this->allow_comments).",";
-        $sql .= " allow_spy=".$this->db->escape($this->allow_spy);
-
-        $sql .= " WHERE id_sondage='".$this->db->escape($this->id_sondage)."'";
-
-        $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(); }
-
-        if (!$error && !$notrigger)
-        {
-        	// Call trigger
-        	$result = $this->call_trigger('OPENSURVEY_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;
-        }
-    }
-
-    /**
-     *  Delete object in database
-     *
-     *	@param  User	$user        		User that deletes
-     *  @param  int		$notrigger	 		0=launch triggers after, 1=disable triggers
-     *  @param	string	$numsondage			Num sondage admin to delete
-     *  @return	int					 		<0 if KO, >0 if OK
-     */
-    public function delete(User $user, $notrigger = 0, $numsondage = '')
-    {
-        global $conf, $langs;
-        $error = 0;
-
-        if (empty($numsondage))
-        {
-            $numsondage = $this->id_sondage;
-        }
-
-        $this->db->begin();
-
-        if (!$error)
-        {
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('OPENSURVEY_DELETE', $user);
-                if ($result < 0) $error++;
-                // End call triggers
-            }
-        }
-
-        if (!$error)
-        {
-            $sql = 'DELETE FROM '.MAIN_DB_PREFIX."opensurvey_comments WHERE id_sondage = '".$this->db->escape($numsondage)."'";
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            $sql = 'DELETE FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage = '".$this->db->escape($numsondage)."'";
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."opensurvey_sondage";
-            $sql .= " WHERE id_sondage = '".$this->db->escape($numsondage)."'";
-
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach ($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-            }
-            $this->db->rollback();
-            return -1 * $error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *  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  	$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, $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
-    {
-        global $db, $conf, $langs;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
-
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
-
-        $result = '';
-        $companylink = '';
-
-        $label = '<u>'.$langs->trans("ShowSurvey").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
-        $label .= '<b>'.$langs->trans('Title').':</b> '.$this->title.'<br>';
-
-        $url = DOL_URL_ROOT.'/opensurvey/card.php?id='.$this->id;
-
-        // 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.'"' : '');
-
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
-
-        $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);
-        if ($withpicto != 2) $result .= $this->ref;
-        $result .= $linkend;
-
-        return $result;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return array of lines
-     *
-     * @return 	int		<0 if KO, >0 if OK
-     */
-    public function fetch_lines()
-    {
-        // phpcs:enable
-        $ret = array();
-
-        $sql = "SELECT id_users, nom as name, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
-        $sql .= " WHERE id_sondage = '".$this->db->escape($this->id_sondage)."'";
-        $resql = $this->db->query($sql);
-
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($resql);
-                $tmp = array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
-
-                $ret[] = $tmp;
-                $i++;
-            }
-        }
-        else dol_print_error($this->db);
-
-        $this->lines = $ret;
-
-        return count($this->lines);
-    }
-
-    /**
-     *	Initialise object with example values
-     *	Id must be 0 if object instance is a specimen
-     *
-     *	@return	void
-     */
-    public function initAsSpecimen()
-    {
-        $this->id = 0;
-
-        $this->id_sondage = '';
-        $this->commentaires = 'Comment of the specimen survey';
-        $this->description = 'Comment of the specimen survey';
-        $this->mail_admin = '';
-        $this->nom_admin = '';
-        $this->titre = 'This is a specimen survey';
-        $this->date_fin = dol_now() + 3600 * 24 * 10;
-        $this->status = 1;
-        $this->format = 'classic';
-        $this->mailsonde = '';
-    }
-
-    /**
-     * Returns all comments for the current opensurvey poll
-     *
-     * @return Object[]
-     */
-    public function getComments()
-    {
-        $comments = array();
-
-        $sql = 'SELECT id_comment, usercomment, comment';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'opensurvey_comments';
-        $sql .= " WHERE id_sondage='".$this->db->escape($this->id_sondage)."'";
-        $sql .= " ORDER BY id_comment";
-        $resql = $this->db->query($sql);
-
-        if ($resql)
-        {
-            $num_rows = $this->db->num_rows($resql);
-
-            if ($num_rows > 0)
-            {
-                while ($obj = $this->db->fetch_object($resql))
-                {
-                    $comments[] = $obj;
-                }
-            }
-        }
-
-        return $comments;
-    }
-
-    /**
-     * Adds a comment to the poll
-     *
-     * @param string $comment Comment content
-     * @param string $comment_user Comment author
-     * @return boolean False in case of the query fails, true if it was successful
-     */
-    public function addComment($comment, $comment_user)
-    {
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."opensurvey_comments (id_sondage, comment, usercomment)";
-        $sql .= " VALUES ('".$this->db->escape($this->id_sondage)."','".$this->db->escape($comment)."','".$this->db->escape($comment_user)."')";
-        $resql = $this->db->query($sql);
-
-        if (!$resql) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Deletes a comment of the poll
-     *
-     * @param int $id_comment Id of the comment
-     * @return boolean False in case of the query fails, true if it was successful
-     */
-    public function deleteComment($id_comment)
-    {
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'opensurvey_comments WHERE id_comment = '.$id_comment.' AND id_sondage = "'.$this->db->escape($this->id_sondage).'"';
-        $resql = $this->db->query($sql);
-
-        if (!$resql) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Cleans all the class variables before doing an update or an insert
-     *
-     * @return void
-     */
-    private function cleanParameters()
-    {
-        $this->id_sondage = trim($this->id_sondage);
-        $this->commentaires = trim($this->commentaires);
-        $this->description = trim($this->description);
-        $this->mail_admin = trim($this->mail_admin);
-        $this->nom_admin = trim($this->nom_admin);
-        $this->titre = trim($this->titre);
-        $this->status = trim($this->status);
-        $this->format = trim($this->format);
-        $this->mailsonde = ($this->mailsonde ? 1 : 0);
-        $this->allow_comments = ($this->allow_comments ? 1 : 0);
-        $this->allow_spy = ($this->allow_spy ? 1 : 0);
-        $this->sujet = trim($this->sujet);
-    }
-
-
-    /**
-     *	Return status label of Order
-     *
-     *	@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)
-    {
-        return $this->LibStatut($this->status, $mode);
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return label of status
-     *
-     *  @param		int		$status      	  Id 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					  Label of status
-     */
-    public function LibStatut($status, $mode)
-    {
-        // phpcs:enable
-        global $langs, $conf;
-
-        if (empty($this->labelStatus) || empty($this->labelStatusShort))
-        {
-            global $langs;
-            //$langs->load("mymodule");
-            $this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-            $this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Opened');
-            $this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed');
-            $this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
-            $this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Opened');
-            $this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('Closed');
-        }
-
-        $statusType = 'status'.$status;
-        if ($status == self::STATUS_VALIDATED) {
-            if (0) $statusType = 'status1';
-            else $statusType = 'status4';
-        }
-        if ($status == self::STATUS_CLOSED) $statusType = 'status6';
-
-        return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
-    }
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'opensurvey_sondage';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'opensurvey_sondage';
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'poll';
+
+
+	/**
+	 * @var string	ID survey
+	 */
+	public $id_sondage;
+
+	/**
+	 * @var string description
+	 */
+	public $description;
+
+	public $mail_admin;
+	public $nom_admin;
+
+	/**
+	 * Id of user author of the poll
+	 * @var int
+	 */
+	public $fk_user_creat;
+
+	/**
+	 * @var string	Title
+	 */
+	public $title;
+
+	public $date_fin = '';
+	public $status = 1;
+	public $format;
+	public $mailsonde;
+
+	public $sujet;
+
+	/**
+	 * @var int		Allow comments on this poll
+	 */
+	public $allow_comments;
+
+	/**
+	 * @var int		Allow users see others vote
+	 */
+	public $allow_spy;
+
+
+	/**
+	 * Draft status (not used)
+	 */
+	const STATUS_DRAFT = 0;
+	/**
+	 * Validated/Opened status
+	 */
+	const STATUS_VALIDATED = 1;
+	/**
+	 * Closed
+	 */
+	const STATUS_CLOSED = 2;
+
+
+
+	/**
+	 *  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 $user, $notrigger = 0)
+	{
+		$error = 0;
+
+		// Clean parameters
+		$this->cleanParameters();
+
+		// Check parameters
+		if (!$this->date_fin > 0)
+		{
+			$this->error = 'BadValueForEndDate';
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -1;
+		}
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."opensurvey_sondage(";
+		$sql .= "id_sondage,";
+		$sql .= "commentaires,";
+		$sql .= "fk_user_creat,";
+		$sql .= "titre,";
+		$sql .= "date_fin,";
+		$sql .= "status,";
+		$sql .= "format,";
+		$sql .= "mailsonde,";
+		$sql .= "allow_comments,";
+		$sql .= "allow_spy,";
+		$sql .= "sujet";
+		$sql .= ") VALUES (";
+		$sql .= "'".$this->db->escape($this->id_sondage)."',";
+		$sql .= " ".(empty($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").",";
+		$sql .= " ".$user->id.",";
+		$sql .= " '".$this->db->escape($this->title)."',";
+		$sql .= " '".$this->db->idate($this->date_fin)."',";
+		$sql .= " ".$this->status.",";
+		$sql .= " '".$this->db->escape($this->format)."',";
+		$sql .= " ".$this->db->escape($this->mailsonde).",";
+		$sql .= " ".$this->db->escape($this->allow_comments).",";
+		$sql .= " ".$this->db->escape($this->allow_spy).",";
+		$sql .= " '".$this->db->escape($this->sujet)."'";
+		$sql .= ")";
+
+		$this->db->begin();
+
+		   dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		if (!$error)
+		{
+			if (!$notrigger)
+			{
+				global $langs, $conf;
+
+				// Call trigger
+				$result = $this->call_trigger('OPENSURVEY_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;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id    				Id object
+	 *  @param	string	$numsurvey			Ref of survey (admin or not)
+	 *  @return int          				<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $numsurvey = '')
+	{
+		$sql = "SELECT";
+		$sql .= " t.id_sondage,";
+		$sql .= " t.titre as title,";
+		$sql .= " t.commentaires as description,";
+		$sql .= " t.mail_admin,";
+		$sql .= " t.nom_admin,";
+		$sql .= " t.fk_user_creat,";
+		$sql .= " t.date_fin,";
+		$sql .= " t.status,";
+		$sql .= " t.format,";
+		$sql .= " t.mailsonde,";
+		$sql .= " t.allow_comments,";
+		$sql .= " t.allow_spy,";
+		$sql .= " t.sujet,";
+		$sql .= " t.tms";
+		$sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_sondage as t";
+		$sql .= " WHERE t.id_sondage = '".$this->db->escape($id ? $id : $numsurvey)."'";
+
+		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_sondage = $obj->id_sondage;
+				$this->ref = $this->id_sondage; //For compatibility
+
+				$this->description = $obj->description;
+				$this->mail_admin = $obj->mail_admin;
+				$this->nom_admin = $obj->nom_admin;
+				$this->title = $obj->title;
+				$this->date_fin = $this->db->jdate($obj->date_fin);
+				$this->status = $obj->status;
+				$this->format = $obj->format;
+				$this->mailsonde = $obj->mailsonde;
+				$this->allow_comments = $obj->allow_comments;
+				$this->allow_spy = $obj->allow_spy;
+				$this->sujet = $obj->sujet;
+				$this->fk_user_creat = $obj->fk_user_creat;
+
+				$this->date_m = $this->db->jdate($obj->tls);
+				$ret = 1;
+			} else {
+				$sondage = ($id ? 'id='.$id : 'sondageid='.$numsurvey);
+				$this->error = 'Fetch no poll found for '.$sondage;
+				dol_syslog($this->error, LOG_ERR);
+				$ret = 0;
+			}
+
+			$this->db->free($resql);
+		} else {
+			  $this->error = "Error ".$this->db->lasterror();
+			$ret = -1;
+		}
+
+		return $ret;
+	}
+
+
+	/**
+	 *  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 $user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+		$this->cleanParameters();
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."opensurvey_sondage SET";
+		$sql .= " id_sondage=".(isset($this->id_sondage) ? "'".$this->db->escape($this->id_sondage)."'" : "null").",";
+		$sql .= " commentaires=".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "null").",";
+		$sql .= " mail_admin=".(isset($this->mail_admin) ? "'".$this->db->escape($this->mail_admin)."'" : "null").",";
+		$sql .= " nom_admin=".(isset($this->nom_admin) ? "'".$this->db->escape($this->nom_admin)."'" : "null").",";
+		$sql .= " titre=".(isset($this->title) ? "'".$this->db->escape($this->title)."'" : "null").",";
+		$sql .= " date_fin=".(dol_strlen($this->date_fin) != 0 ? "'".$this->db->idate($this->date_fin)."'" : 'null').",";
+		$sql .= " status=".(isset($this->status) ? "'".$this->db->escape($this->status)."'" : "null").",";
+		$sql .= " format=".(isset($this->format) ? "'".$this->db->escape($this->format)."'" : "null").",";
+		$sql .= " mailsonde=".(isset($this->mailsonde) ? $this->db->escape($this->mailsonde) : "null").",";
+		$sql .= " allow_comments=".$this->db->escape($this->allow_comments).",";
+		$sql .= " allow_spy=".$this->db->escape($this->allow_spy);
+		$sql .= " WHERE id_sondage='".$this->db->escape($this->id_sondage)."'";
+
+		$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(); }
+
+		if (!$error && !$notrigger)
+		{
+			// Call trigger
+			$result = $this->call_trigger('OPENSURVEY_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;
+		}
+	}
+
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param  User	$user        		User that deletes
+	 *  @param  int		$notrigger	 		0=launch triggers after, 1=disable triggers
+	 *  @param	string	$numsondage			Num sondage admin to delete
+	 *  @return	int					 		<0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = 0, $numsondage = '')
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		if (empty($numsondage))
+		{
+			$numsondage = $this->id_sondage;
+		}
+
+		$this->db->begin();
+
+		if (!$error)
+		{
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('OPENSURVEY_DELETE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
+
+		if (!$error)
+		{
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."opensurvey_comments WHERE id_sondage = '".$this->db->escape($numsondage)."'";
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage = '".$this->db->escape($numsondage)."'";
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."opensurvey_sondage";
+			$sql .= " WHERE id_sondage = '".$this->db->escape($numsondage)."'";
+
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *  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  	$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, $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $db, $conf, $langs;
+		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("ShowSurvey").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
+		$label .= '<b>'.$langs->trans('Title').':</b> '.$this->title.'<br>';
+
+		$url = DOL_URL_ROOT.'/opensurvey/card.php?id='.$this->id;
+
+		// 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.'"' : '');
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
+
+		$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);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
+
+		return $result;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return array of lines
+	 *
+	 * @return 	int		<0 if KO, >0 if OK
+	 */
+	public function fetch_lines()
+	{
+		// phpcs:enable
+		$ret = array();
+
+		$sql = "SELECT id_users, nom as name, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
+		$sql .= " WHERE id_sondage = '".$this->db->escape($this->id_sondage)."'";
+		$resql = $this->db->query($sql);
+
+		if ($resql)
+		{
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
+				$tmp = array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
+
+				$ret[] = $tmp;
+				$i++;
+			}
+		} else dol_print_error($this->db);
+
+		$this->lines = $ret;
+
+		return count($this->lines);
+	}
+
+	/**
+	 *	Initialise object with example values
+	 *	Id must be 0 if object instance is a specimen
+	 *
+	 *	@return	void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+
+		$this->id_sondage = '';
+		$this->description = 'Description of the specimen survey';
+		$this->mail_admin = '';
+		$this->nom_admin = '';
+		$this->title = 'This is a specimen survey';
+		$this->date_fin = dol_now() + 3600 * 24 * 10;
+		$this->status = 1;
+		$this->format = 'classic';
+		$this->mailsonde = '';
+	}
+
+	/**
+	 * Returns all comments for the current opensurvey poll
+	 *
+	 * @return Object[]
+	 */
+	public function getComments()
+	{
+		$comments = array();
+
+		$sql = 'SELECT id_comment, usercomment, comment';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'opensurvey_comments';
+		$sql .= " WHERE id_sondage='".$this->db->escape($this->id_sondage)."'";
+		$sql .= " ORDER BY id_comment";
+		$resql = $this->db->query($sql);
+
+		if ($resql)
+		{
+			$num_rows = $this->db->num_rows($resql);
+
+			if ($num_rows > 0)
+			{
+				while ($obj = $this->db->fetch_object($resql))
+				{
+					$comments[] = $obj;
+				}
+			}
+		}
+
+		return $comments;
+	}
+
+	/**
+	 * Adds a comment to the poll
+	 *
+	 * @param string $comment Comment content
+	 * @param string $comment_user Comment author
+	 * @return boolean False in case of the query fails, true if it was successful
+	 */
+	public function addComment($comment, $comment_user)
+	{
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."opensurvey_comments (id_sondage, comment, usercomment)";
+		$sql .= " VALUES ('".$this->db->escape($this->id_sondage)."','".$this->db->escape($comment)."','".$this->db->escape($comment_user)."')";
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Deletes a comment of the poll
+	 *
+	 * @param int $id_comment Id of the comment
+	 * @return boolean False in case of the query fails, true if it was successful
+	 */
+	public function deleteComment($id_comment)
+	{
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'opensurvey_comments WHERE id_comment = '.$id_comment.' AND id_sondage = "'.$this->db->escape($this->id_sondage).'"';
+		$resql = $this->db->query($sql);
+
+		if (!$resql) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Cleans all the class variables before doing an update or an insert
+	 *
+	 * @return void
+	 */
+	private function cleanParameters()
+	{
+		$this->id_sondage = trim($this->id_sondage);
+		$this->description = trim($this->description);
+		$this->mail_admin = trim($this->mail_admin);
+		$this->nom_admin = trim($this->nom_admin);
+		$this->title = trim($this->title);
+		$this->status = trim($this->status);
+		$this->format = trim($this->format);
+		$this->mailsonde = ($this->mailsonde ? 1 : 0);
+		$this->allow_comments = ($this->allow_comments ? 1 : 0);
+		$this->allow_spy = ($this->allow_spy ? 1 : 0);
+		$this->sujet = trim($this->sujet);
+	}
+
+
+	/**
+	 *	Return status label of Order
+	 *
+	 *	@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)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return label of status
+	 *
+	 *  @param		int		$status      	  Id 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					  Label of status
+	 */
+	public function LibStatut($status, $mode)
+	{
+		// phpcs:enable
+		global $langs, $conf;
+
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Opened');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('Closed');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Opened');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('Closed');
+		}
+
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_VALIDATED) {
+			if (0) $statusType = 'status1';
+			else $statusType = 'status4';
+		}
+		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
 }
diff --git a/htdocs/opensurvey/css/style.css b/htdocs/opensurvey/css/style.css
index d9cf48c72ee..409b64dddf5 100644
--- a/htdocs/opensurvey/css/style.css
+++ b/htdocs/opensurvey/css/style.css
@@ -363,6 +363,7 @@ div.cadre td.non {
 div.cadre td.vide {
 	background-color: #DDDDDD;
 	text-align:center;
+	padding: 4px;
 }
 /*Case de tableau contenant les noms dans affichage de sondage*/
 div.cadre td.nom {
@@ -403,17 +404,6 @@ div.cadre td.mois {
 	padding:1px 5px;
 }
 
-/*affichage du calendrier*/
-div.calendrier {
-	padding:10px;
-	background-color: #AAA;
-	width:490px;
-	font-size:12px;
-	font-family:arial, sans-serif;
-    margin-left: 30%;
-    margin-right: 30%;
-	position:static;
-}
 /*jour de la semaine dans calendrier*/
 div.calendrier td.joursemaine {
 	width:65px;
@@ -432,19 +422,16 @@ div.calendrier td.jourwe {
 	background-color: #C0C0C0;
 }
 /*jour avant le premier jour du mois dans calendrier*/
-div.calendrier td.avant {
+div.calendrier td.avant, div.calendrier td.libre {
 	width:65px;
 	text-align: center;
 	border: 2px;
 	font-family:arial, sans-serif;
-	font-size:13px;
+	font-size: 1.1em;
 	background-color: #DDDDDD;
 }
 /*jour libre dans calendrier*/
 div.calendrier td.libre {
-	width:65px;
-	text-align: center;
-	border: 2px;
 	background-color: #66FF99;
 }
 /*jour deja selectionné dans calendrier*/
@@ -458,7 +445,6 @@ div.calendrier td.choisi {
 p.affichageresultats{
 	text-align: center;
 	font-family:arial, sans-serif;
-	font-size:13px;
 }
 
 div.comment{
@@ -485,13 +471,16 @@ div.titregestionadmin{
 
 
 .bouton {
-	width: 65px;
+	/* width: 65px; */
 	border:0;
 	padding:0 0 0 0;
 	margin:0;
 	cursor:pointer;
 	font-family:arial, sans-serif;
-	font-size:13px;
+	background: transparent !important;
+}
+.choisi .bouton {
+	color: #fff;
 }
 /*les boutons pour choisir un jour non selectionné*/
 .ON {
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index 34e5b666710..6f9a699273b 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -108,14 +108,11 @@ if ($resql)
 			{
 				$input .= 'OK;';
 				$somme[$k]++;
-			}
-			elseif ($car == "2")
+			} elseif ($car == "2")
 			{
 				$input .= 'KO;';
 				$somme[$k]++;
-			}
-			else
-			{
+			} else {
 				$input .= ';';
 			}
 		}
@@ -123,8 +120,7 @@ if ($resql)
 		$input .= "\r\n";
 		$i++;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 $filesize = strlen($input);
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index 2fa067ba9a3..4a3cb591b97 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -90,7 +90,6 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 	print "\n";
 
 	// Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
-	$width = 0;
 	// Define logo and logosmall
 	$logosmall = $mysoc->logo_small;
 	$logo = $mysoc->logo;
@@ -102,13 +101,10 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 	{
 		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
-		$width = 150;
-	}
-	elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+	} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 	{
 		$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 		$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
-		$width = 150;
 	}
 
 	// Output html code for logo
@@ -117,7 +113,6 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<div class="backgreypublicpayment">';
 		print '<div class="logopublicpayment">';
 		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-		if ($width) print ' width="'.$width.'"';
 		print '>';
 		print '</div>';
 		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
@@ -243,11 +238,10 @@ function ajouter_sondage()
 	// Insert survey
 	$opensurveysondage = new Opensurveysondage($db);
 	$opensurveysondage->id_sondage = $sondage;
-	$opensurveysondage->commentaires = $_SESSION['commentaires'];
-	$opensurveysondage->description = $_SESSION['commentaires'];
+	$opensurveysondage->description = $_SESSION['description'];
 	$opensurveysondage->mail_admin = $_SESSION['adresse'];
 	$opensurveysondage->nom_admin = $_SESSION['nom'];
-	$opensurveysondage->titre = $_SESSION['titre'];
+	$opensurveysondage->title = $_SESSION['title'];
 	$opensurveysondage->date_fin = $_SESSION['champdatefin'];
 	$opensurveysondage->format = $_SESSION['formatsondage'];
 	$opensurveysondage->mailsonde = $_SESSION['mailsonde'];
@@ -261,10 +255,10 @@ function ajouter_sondage()
 		dol_print_error($db);
 	}
 
-	unset($_SESSION["titre"]);
+	unset($_SESSION["title"]);
 	unset($_SESSION["nom"]);
 	unset($_SESSION["adresse"]);
-	unset($_SESSION["commentaires"]);
+	unset($_SESSION["description"]);
 	unset($_SESSION["mailsonde"]);
 	unset($_SESSION['allow_comments']);
 	unset($_SESSION['allow_spy']);
diff --git a/htdocs/opensurvey/index.php b/htdocs/opensurvey/index.php
index 20609602ad2..50198e5202f 100644
--- a/htdocs/opensurvey/index.php
+++ b/htdocs/opensurvey/index.php
@@ -52,8 +52,7 @@ if ($resql)
 {
 	$obj = $db->fetch_object($resql);
 	$nbsondages = $obj->nb;
-}
-else dol_print_error($db, '');
+} else dol_print_error($db, '');
 
 
 $title = $langs->trans("OpenSurveyArea");
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 442fc1b539b..77e7feed460 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -36,7 +36,7 @@ $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk
 $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
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'opensurveylist'; // 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')
 
@@ -47,8 +47,8 @@ $search_status = GETPOST('search_status', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -155,7 +155,7 @@ $help_url = '';
 $title = $langs->trans('OpenSurveyArea');
 
 
-$sql = "SELECT p.id_sondage as rowid, p.fk_user_creat, p.format, p.date_fin, p.status, p.titre, p.nom_admin,";
+$sql = "SELECT p.id_sondage as rowid, p.fk_user_creat, p.format, p.date_fin, p.status, p.titre as title, p.nom_admin,";
 $sql .= " u.login, u.firstname, u.lastname";
 $sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_sondage as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON u.rowid = p.fk_user_creat";
@@ -190,9 +190,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
     $sql .= $db->plimit($limit + 1, $offset);
 
     $resql = $db->query($sql);
@@ -357,12 +355,11 @@ while ($i < min($num, $limit))
 	{
 		$obj2 = $db->fetch_object($resql2);
 		$nbuser = $obj2->nb;
-	}
-	else dol_print_error($db);
+	} else dol_print_error($db);
 
 	$opensurvey_static->id = $obj->rowid;
 	$opensurvey_static->ref = $obj->rowid;
-	$opensurvey_static->title = $obj->titre;
+	$opensurvey_static->title = $obj->title;
 	$opensurvey_static->status = $obj->status;
 	$opensurvey_static->date_fin = $db->jdate($obj->date_fin);
 
@@ -376,7 +373,7 @@ while ($i < min($num, $limit))
 	if (!$i) $totalarray['nbfield']++;
 
 	// Title
-	print '<td>'.dol_htmlentities($obj->titre).'</td>';
+	print '<td>'.dol_htmlentities($obj->title).'</td>';
 	if (!$i) $totalarray['nbfield']++;
 
 	// Type
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 181ec830433..3327800527d 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -58,7 +58,7 @@ if (GETPOST('retoursondage')) {
 $nbcolonnes = substr_count($object->sujet, ',') + 1;
 
 // Add vote
-if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// boutonp for chrom, boutonp.x for firefox
+if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// boutonp for chrome, boutonp.x for firefox
 {
 	if (GETPOST('nom'))
 	{
@@ -70,12 +70,10 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 			if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 			{
 				$nouveauchoix .= "1";
-			}
-			elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+			} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 			{
 				$nouveauchoix .= "2";
-			}
-			else { // sinon c'est 0
+			} else { // sinon c'est 0
 				$nouveauchoix .= "0";
 			}
 		}
@@ -93,9 +91,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		{
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
-		}
-		else
-		{
+		} else {
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
 			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
 			$resql = $db->query($sql);
@@ -135,12 +131,10 @@ if ($testmodifier)
 		if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 		{
 			$nouveauchoix .= "1";
-		}
-		elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+		} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 		{
 			$nouveauchoix .= "2";
-		}
-		else { // sinon c'est 0
+		} else { // sinon c'est 0
 			$nouveauchoix .= "0";
 		}
 	}
@@ -164,7 +158,7 @@ if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && $object->format =
 
 	//on rajoute la valeur a la fin de tous les sujets deja entrés
 	$nouveauxsujets .= ',';
-	$nouveauxsujets .= str_replace(array(",", "@"), " ", $_POST["nouvellecolonne"]).(empty($_POST["typecolonne"]) ? '' : '@'.$_POST["typecolonne"]);
+	$nouveauxsujets .= str_replace(array(",", "@"), " ", GETPOST("nouvellecolonne")).(empty($_POST["typecolonne"]) ? '' : '@'.GETPOST("typecolonne"));
 
 	//mise a jour avec les nouveaux sujets dans la base
 	$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
@@ -192,21 +186,21 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
 
 		if (isset($_POST["nouvelleheuredebut"]) && $_POST["nouvelleheuredebut"] != "vide") {
 			$nouvelledate .= "@";
-			$nouvelledate .= $_POST["nouvelleheuredebut"];
+			$nouvelledate .= GETPOST("nouvelleheuredebut");
 			$nouvelledate .= "h";
 
 			if ($_POST["nouvelleminutedebut"] != "vide") {
-				$nouvelledate .= $_POST["nouvelleminutedebut"];
+				$nouvelledate .= GETPOST("nouvelleminutedebut");
 			}
 		}
 
 		if (isset($_POST["nouvelleheurefin"]) && $_POST["nouvelleheurefin"] != "vide") {
 			$nouvelledate .= "-";
-			$nouvelledate .= $_POST["nouvelleheurefin"];
+			$nouvelledate .= GETPOST("nouvelleheurefin");
 			$nouvelledate .= "h";
 
 			if ($_POST["nouvelleminutefin"] != "vide") {
-				$nouvelledate .= $_POST["nouvelleminutefin"];
+				$nouvelledate .= GETPOST("nouvelleminutefin");
 			}
 		}
 
@@ -261,9 +255,7 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
 		}
 
 		$adresseadmin = $object->mail_admin;
-	}
-	else
-	{
+	} else {
 		$erreur_ajout_date = "yes";
 	}
 }
@@ -401,7 +393,7 @@ if ($result <= 0)
 	exit;
 }
 
-$title = $object->titre." - ".$langs->trans('Card');
+$title = $object->title." - ".$langs->trans('Card');
 $helpurl = '';
 $arrayofjs = array();
 $arrayofcss = array('/opensurvey/css/style.css');
@@ -449,17 +441,20 @@ print ' '.$langs->trans($type == 'classic' ? "TypeClassic" : "TypeDate").'</td><
 print '<tr><td>';
 $adresseadmin = $object->mail_admin;
 print $langs->trans("Title").'</td><td colspan="2">';
-if ($action == 'edit')
-{
-	print '<input type="text" name="nouveautitre" size="40" value="'.dol_escape_htmltag(dol_htmlentities($object->titre)).'">';
+if ($action == 'edit') {
+	print '<input type="text" name="nouveautitre" size="40" value="'.dol_escape_htmltag(dol_htmlentities($object->title)).'">';
+} else {
+	print dol_htmlentities($object->title);
 }
-else print dol_htmlentities($object->titre);
 print '</td></tr>';
 
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
 if ($action == 'edit') print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
-else print dol_print_date($object->date_fin, 'day');
+else {
+	print dol_print_date($object->date_fin, 'day');
+	if ($object->date_fin && $object->date_fin < dol_now() && $object->status == Opensurveysondage::STATUS_VALIDATED) print img_warning($langs->trans("Expired"));
+}
 print '</td></tr>';
 
 // Author
@@ -537,9 +532,7 @@ if (GETPOST('ajoutsujet'))
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button" name="retoursondage" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 		print '<br><br>'."\n";
-	}
-	else
-	{
+	} else {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 		$formother = new FormOther($db);
@@ -755,9 +748,7 @@ if ($object->format == "D")
 
 		print '</tr>'."\n";
 	}
-}
-else
-{
+} else {
 	// Show titles
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
@@ -843,9 +834,7 @@ while ($compteur < $num)
 				if (((string) $car) == "0") $sumagainst[$i]++;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
 		if ($compteur == $ligneamodifier)
 		{
@@ -871,9 +860,7 @@ while ($compteur < $num)
 				}
 				print '</td>'."\n";
 			}
-		}
-		else
-		{
+		} else {
 			for ($i = 0; $i < $nbcolonnes; $i++)
 			{
 				$car = substr($ensemblereponses, $i, 1);
@@ -971,7 +958,7 @@ if (empty($testligneamodifier))
 	}
 
 	// Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base
-	print '<td><input type="image" name="boutonp" value="'.$langs->trans("Vote").'" src="'.dol_buildpath('/opensurvey/img/add-24.png', 1).'"></td>'."\n";
+	print '<td><input type="image" name="boutonp" class="borderimp" value="'.$langs->trans("Vote").'" src="'.img_picto('', 'edit_add', '', false, 1).'"></td>'."\n";
 	print '</tr>'."\n";
 }
 
@@ -1031,7 +1018,7 @@ if ($nbofcheckbox >= 2)
 }
 
 // S'il a oublié de remplir un nom
-if (isset($_POST["boutonp"]) && $_POST["nom"] == "") {
+if (GETPOSTISSET("boutonp") && GETPOST("nom") == "") {
 	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors');
 }
 
@@ -1067,9 +1054,7 @@ for ($i = 0; $i < $nbcolonnes; $i++)
 			} else {
 				$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').($toutsujet[$i] ? ' ('.dol_print_date($toutsujet[$i], '%A').')' : '');
 			}
-		}
-		else
-		{
+		} else {
 			$tmps = explode('@', $toutsujet[$i]);
 			$meilleursujet .= dol_htmlentities($tmps[0]);
 		}
diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php
index 7a31e21c843..6b39a70d5e9 100644
--- a/htdocs/opensurvey/wizard/choix_autre.php
+++ b/htdocs/opensurvey/wizard/choix_autre.php
@@ -36,14 +36,17 @@ if (!$user->rights->opensurvey->write) accessforbidden();
  * Action
  */
 
+$arrayofchoices = GETPOST('choix', 'array');
+$arrayoftypecolumn = GETPOST('typecolonne', 'array');
+
 // Set session vars
 if (isset($_SESSION["nbrecases"])) {
 	for ($i = 0; $i < $_SESSION["nbrecases"]; $i++) {
-		if (isset($_POST["choix"][$i])) {
-			$_SESSION["choix$i"] = $_POST["choix"][$i];
+		if (isset($arrayofchoices[$i])) {
+			$_SESSION["choix$i"] = $arrayofchoices[$i];
 		}
-		if (isset($_POST["typecolonne"][$i])) {
-			$_SESSION["typecolonne$i"] = $_POST["typecolonne"][$i];
+		if (isset($arrayoftypecolumn[$i])) {
+			$_SESSION["typecolonne$i"] = $arrayoftypecolumn[$i];
 		}
 	}
 } else { //nombre de cases par défaut
@@ -56,16 +59,16 @@ if (GETPOST("ajoutcases") || GETPOST("ajoutcases_x"))
 }
 
 // Create survey into database
-if (isset($_POST["confirmecreation"]))
+if (GETPOSTISSET("confirmecreation"))
 {
 	//recuperation des données de champs textes
 	$toutchoix = '';
 	for ($i = 0; $i < $_SESSION["nbrecases"] + 1; $i++)
 	{
-		if (!empty($_POST["choix"][$i]))
+		if (!empty($arrayofchoices[$i]))
 		{
 			$toutchoix .= ',';
-			$toutchoix .= str_replace(array(",", "@"), " ", $_POST["choix"][$i]).(empty($_POST["typecolonne"][$i]) ? '' : '@'.$_POST["typecolonne"][$i]);
+			$toutchoix .= str_replace(array(",", "@"), " ", $arrayofchoices[$i]).(empty($arrayoftypecolumn[$i]) ? '' : '@'.$arrayoftypecolumn[$i]);
 		}
 	}
 
@@ -76,7 +79,7 @@ if (isset($_POST["confirmecreation"]))
 	$testremplissage = '';
 	for ($i = 0; $i < $_SESSION["nbrecases"]; $i++)
 	{
-		if (isset($_POST["choix"][$i]))
+		if (isset($arrayofchoices[$i]))
 		{
 			$testremplissage = "ok";
 		}
@@ -94,7 +97,7 @@ if (isset($_POST["confirmecreation"]))
 	}
 }
 
-
+var_dump($_SESSION);exit;
 
 
 /*
@@ -107,7 +110,7 @@ $arrayofjs = array();
 $arrayofcss = array('/opensurvey/css/style.css');
 llxHeader('', $langs->trans("OpenSurvey"), "", '', 0, 0, $arrayofjs, $arrayofcss);
 
-if (empty($_SESSION['titre']))
+if (empty($_SESSION['title']))
 {
 	dol_print_error('', $langs->trans('ErrorOpenSurveyFillFirstSection'));
 	llxFooter();
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 17c5bdea251..9ed44ae55c3 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -195,7 +195,7 @@ if (GETPOST('reset'))
  * View
  */
 
-if (!isset($_SESSION['commentaires']) && !isset($_SESSION['mail']))
+if (!isset($_SESSION['description']) && !isset($_SESSION['mail']))
 {
 	dol_print_error('', $langs->trans('ErrorOpenSurveyFillFirstSection'));
 	exit;
@@ -209,8 +209,7 @@ llxHeader('', $langs->trans("OpenSurvey"), "", '', 0, 0, $arrayofjs, $arrayofcss
 if (!isset($_SESSION["nbrecaseshoraires"]))
 {
 	$_SESSION["nbrecaseshoraires"] = 5;
-}
-elseif (GETPOST('ajoutcases') && $_SESSION["nbrecaseshoraires"] == 5)
+} elseif (GETPOST('ajoutcases') && $_SESSION["nbrecaseshoraires"] == 5)
 {
 	$_SESSION["nbrecaseshoraires"] = 10;
 }
@@ -319,9 +318,7 @@ $premierjourmois = date("N", mktime(0, 0, 0, $_SESSION["mois"], 1, $_SESSION["an
 if (is_integer($_SESSION["mois"]) && $_SESSION["mois"] > 0 && $_SESSION["mois"] < 13)
 {
 	$motmois = dol_print_date(mktime(0, 0, 0, $_SESSION["mois"], 10), '%B');
-}
-else
-{
+} else {
 	$motmois = dol_print_date(dol_now(), '%B');
 }
 
@@ -350,7 +347,7 @@ print '</td></tr>'."\n";
 print '</table>'."\n";
 print '</div>'."\n";
 
-print '<div class="center">'."\n";
+print '<div class="center calendrier">'."\n";
 print '<table align="center">'."\n"; // The div class=center has no effect on table, so we must keep the align=center for table
 print '<tr>'."\n";
 
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 7bb7861edbe..e6b3cb3b97e 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -37,14 +37,14 @@ $langs->load("opensurvey");
 
 // On teste toutes les variables pour supprimer l'ensemble des warnings PHP
 // On transforme en entites html les données afin éviter les failles XSS
-$post_var = array('titre', 'commentaires', 'mailsonde', 'creation_sondage_date', 'creation_sondage_autre');
+$post_var = array('title', 'description', 'mailsonde', 'creation_sondage_date', 'creation_sondage_autre');
 foreach ($post_var as $var)
 {
 	$$var = GETPOST($var);
 }
 
 // On initialise egalement la session car sinon bonjour les warning :-)
-$session_var = array('titre', 'commentaires', 'mailsonde');
+$session_var = array('title', 'description', 'mailsonde');
 foreach ($session_var as $var)
 {
 	if (isset($_SESSION[$var])) $_SESSION[$var] = null;
@@ -57,8 +57,8 @@ $cochemail = '';
 // Jump to correct page
 if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 {
-	$_SESSION["titre"] = $titre;
-	$_SESSION["commentaires"] = $commentaires;
+	$_SESSION["title"] = $title;
+	$_SESSION["description"] = $description;
 
 	if (GETPOST('mailsonde') == 'on') {
 		$_SESSION["mailsonde"] = true;
@@ -88,9 +88,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 		{
 			$testdate = true;
 			$_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc');
-		}
-		else
-		{
+		} else {
 			$testdate = true;
 			$_SESSION['champdatefin'] = dol_print_date($champdatefin, 'dayrfc');
 			//$testdate = false;
@@ -103,7 +101,7 @@ if (GETPOST("creation_sondage_date") || GETPOST("creation_sondage_autre"))
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("ExpireDate")), null, 'errors');
 	}
 
-	if ($titre && $testdate)
+	if ($title && $testdate)
 	{
 		if (!empty($creation_sondage_date))
 		{
@@ -143,15 +141,15 @@ dol_fiche_head();
 // Affichage des différents champs textes a remplir
 print '<table class="border centpercent">'."\n";
 
-print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("PollTitle").'</td><td><input type="text" name="titre" size="40" maxlength="80" value="'.$_SESSION["titre"].'"></td>'."\n";
-if (!$_SESSION["titre"] && (GETPOST('creation_sondage_date') || GETPOST('creation_sondage_autre')))
+print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("PollTitle").'</td><td><input type="text" name="title" class="minwidth300" maxlength="80" value="'.$_SESSION["title"].'"></td>'."\n";
+if (!$_SESSION["title"] && (GETPOST('creation_sondage_date') || GETPOST('creation_sondage_autre')))
 {
 	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PollTitle")), null, 'errors');
 }
 
 print '</tr>'."\n";
 print '<tr><td>'.$langs->trans("Description").'</td><td>';
-$doleditor = new DolEditor('commentaires', $_SESSION["commentaires"], '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
+$doleditor = new DolEditor('description', $_SESSION["description"], '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
 $doleditor->Create(0, '');
 print '</td>'."\n";
 print '</tr>'."\n";
@@ -192,9 +190,7 @@ if (GETPOST('choix_sondage'))
 	else print '<input type="hidden" name="creation_sondage_autre" value="autre">';
 	print '<input type="hidden" name="choix_sondage" value="'.GETPOST('choix_sondage').'">';
 	print '<br><input type="submit" class="button" name="submit" value="'.$langs->trans("CreatePoll").' ('.(GETPOST('choix_sondage') == 'date' ? $langs->trans("TypeDate") : $langs->trans("TypeClassic")).')">';
-}
-else
-{
+} else {
 	// Show image to selecte between date survey or other survey
 	print '<br><table>'."\n";
 	print '<tr><td>'.$langs->trans("CreateSurveyDate").'</td><td></td> '."\n";
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 13306deea32..a1ceb3e4810 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('admin', 'other', 'paybox', 'paypal'));
 if (!$user->admin)
   accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 if ($action == 'setvalue' && $user->admin)
@@ -79,9 +79,7 @@ if ($action == 'setvalue' && $user->admin)
   	{
   		$db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-  	}
-  	else
-  	{
+  	} else {
   		$db->rollback();
 		dol_print_error($db);
     }
@@ -112,7 +110,7 @@ $head[$h][1] = $langs->trans("PayBox");
 $head[$h][2] = 'payboxaccount';
 $h++;
 
-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 '<input type="hidden" name="action" value="setvalue">';
 
@@ -131,27 +129,27 @@ print "</tr>\n";
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_SITE").'</span></td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_SITE" value="'.$conf->global->PAYBOX_IBS_SITE.'">';
-print '<br>'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')';
+print '<span class="opacitymedium"><br>'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')</span>';
 print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_RANG").'</span></td><td>';
 print '<input size="32" type="text" name="PAYBOX_IBS_RANG" value="'.$conf->global->PAYBOX_IBS_RANG.'">';
-print '<br>'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')';
+print '<span class="opacitymedium"><br>'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')</span>';
 print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_PBX_IDENTIFIANT").'</span></td><td>';
 print '<input size="32" type="text" name="PAYBOX_PBX_IDENTIFIANT" value="'.$conf->global->PAYBOX_PBX_IDENTIFIANT.'">';
-print '<br>'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')';
+print '<span class="opacitymedium"><br>'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')</span>';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_HMAC_KEY").'</span></td><td>';
 print '<input size="100" type="text" name="PAYBOX_HMAC_KEY" value="'.dol_decode($conf->global->PAYBOX_HMAC_KEY).'">';
-print '<br>'.$langs->trans("Example").': 1A2B3C4D5E6F';
+print '<span class="opacitymedium"><br>'.$langs->trans("Example").': 1A2B3C4D5E6F</span>';
 print '</td></tr>';
 
 print '<tr class="liste_titre">';
@@ -181,15 +179,15 @@ print '</td></tr>';
 print '<tr class="oddeven"><td>';
 print '<span class="fieldrequired">'.$langs->trans("PAYBOX_CGI_URL_V2").'</span></td><td>';
 print '<input size="64" type="text" name="PAYBOX_CGI_URL_V2" value="'.$conf->global->PAYBOX_CGI_URL_V2.'">';
-print '<br>'.$langs->trans("Example").' (preprod): https://preprod-tpeweb.paybox.com/php/';
-print '<br>'.$langs->trans("Example").' (prod): https://tpeweb.paybox.com/php/';
+print '<span class="opacitymedium"><br>'.$langs->trans("Example").' (preprod): https://preprod-tpeweb.paybox.com/php/';
+print '<br>'.$langs->trans("Example").' (prod): https://tpeweb.paybox.com/php/</span>';
 print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>';
-print $langs->trans("VendorName").'</td><td>';
-print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$conf->global->ONLINE_PAYMENT_CREDITOR.'">';
-print '<br>'.$langs->trans("Example").': '.$mysoc->name;
+print $langs->trans("PublicVendorName").'</td><td>';
+print '<input type="text" class="minwidth300" name="ONLINE_PAYMENT_CREDITOR" value="'.$conf->global->ONLINE_PAYMENT_CREDITOR.'">';
+print '<br><span class="opacitymedium">'.$langs->trans("Example").': '.$mysoc->name.'</span>';
 print '</td></tr>';
 
 
@@ -205,7 +203,7 @@ if (!empty($conf->banque->enabled))
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">';
-print '<br>'.$langs->trans("Example").': http://mysite/mycss.css';
+print '<span class="opacitymedium"><br>'.$langs->trans("Example").': http://mysite/mycss.css</span>';
 print '</td></tr>';
 
 
@@ -232,7 +230,7 @@ print '</td></tr>';
 print '<tr class="oddeven"><td>';
 print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").'</td><td>';
 print '<input size="32" type="text" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'">';
-print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;';
+print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;</span>';
 print '</td></tr>';
 
 // Payment token for URL
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index 0af8262c54a..3cf751f7391 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('admin', 'other', 'paypal', 'paybox'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if ($action == 'setvalue' && $user->admin)
 {
@@ -72,16 +72,17 @@ if ($action == 'setvalue' && $user->admin)
 	// Payment token for URL
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
 	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++;
+	if (empty($conf->use_javascript_ajax)) {
+		$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
+		if (!$result > 0) {
+			$error++;
+		}
+	}
 
-	if (!$error)
-  	{
+	if (!$error) {
   		$db->commit();
   		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-  	}
-  	else
-  	{
+  	} else {
   		$db->rollback();
 		dol_print_error($db);
     }
@@ -95,9 +96,7 @@ if ($action == "setlive")
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -124,7 +123,7 @@ print '<input type="hidden" name="action" value="setvalue">';
 
 dol_fiche_head($head, 'paypalaccount', '', -1);
 
-print $langs->trans("PaypalDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("PaypalDesc")."</span><br>\n";
 
 // Test if php curl exist
 if (!function_exists('curl_version'))
@@ -149,12 +148,10 @@ 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&value=0">';
+    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&value=1">';
+} else {
+    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>';
@@ -162,7 +159,7 @@ print '</td></tr>';
 print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_USER").'</td><td>';
 print '<input size="32" type="text" name="PAYPAL_API_USER" value="'.$conf->global->PAYPAL_API_USER.'">';
-print ' &nbsp; '.$langs->trans("Example").': admin-facilitator_api1.example.com, paypal_api1.mywebsite.com';
+print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': admin-facilitator_api1.example.com, paypal_api1.mywebsite.com</span>';
 print '</td></tr>';
 
 
@@ -175,7 +172,7 @@ print '</td></tr>';
 print '<tr class="oddeven"><td class="fieldrequired">';
 print $langs->trans("PAYPAL_API_SIGNATURE").'</td><td>';
 print '<input size="64" type="text" name="PAYPAL_API_SIGNATURE" value="'.$conf->global->PAYPAL_API_SIGNATURE.'">';
-print '<br>'.$langs->trans("Example").': ASsqXEmw4KzmX-CPChWSVDNCNfd.A3YNR7uz-VncXXAERFDFDFDF';
+print '<br><span class="opacitymedium">'.$langs->trans("Example").': ASsqXEmw4KzmX-CPChWSVDNCNfd.A3YNR7uz-VncXXAERFDFDFDF</span>';
 print '</td></tr>';
 
 
@@ -205,9 +202,9 @@ print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>';
-print $langs->trans("VendorName").'</td><td>';
+print $langs->trans("PublicVendorName").'</td><td>';
 print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$conf->global->ONLINE_PAYMENT_CREDITOR.'">';
-print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
+print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': '.$mysoc->name.'</span>';
 print '</td></tr>';
 
 if (!empty($conf->banque->enabled))
@@ -221,7 +218,7 @@ if (!empty($conf->banque->enabled))
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">';
-print ' &nbsp; '.$langs->trans("Example").': http://mysite/mycss.css';
+print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': http://mysite/mycss.css</span>';
 print '</td></tr>';
 
 
@@ -254,8 +251,8 @@ print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").'</td><td>';
-print '<input size="32" type="text" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'">';
-print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;';
+print '<input class="minwidth200" type="text" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'">';
+print ' &nbsp;  <span class="opacitymedium">'.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;</span>';
 print '</td></tr>';
 
 print '<tr class="liste_titre">';
@@ -266,15 +263,25 @@ print "</tr>\n";
 // Payment token for URL
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
-print '<input size="48" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
-if (!empty($conf->use_javascript_ajax))
+print '<input class="minwidth300" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
+if (!empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
-	print '</td></tr>';
+}
+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');
+}
+print '</td></tr>';
 
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("SecurityTokenIsUnique").'</td><td>';
-	print $form->selectyesno("PAYMENT_SECURITY_TOKEN_UNIQUE", (empty($conf->global->PAYMENT_SECURITY_TOKEN) ? 0 : $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE), 1);
-	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');
+} 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);
+}
+print '</td></tr>';
 
 print '</table>';
 
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index ab9ba921e16..18ebce49479 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -112,8 +112,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            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);
@@ -130,8 +129,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            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);
@@ -148,8 +146,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            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);
@@ -166,8 +163,7 @@ function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
         if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
     	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-            else
-            {
+            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);
@@ -263,9 +259,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
         $payPalURL = $API_Url.$token;
         header("Location: ".$payPalURL);
         exit;
-    }
-    else
-    {
+    } 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"]);
@@ -275,9 +269,7 @@ function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType,
         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
-        {
+        } else {
         	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."<br>\n";
         	$mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
         	$mesg .= $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
@@ -351,9 +343,7 @@ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType,
     if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
     {
     	$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
-    }
-    else
-    {
+    } else {
     	$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
     }
     $nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
@@ -596,9 +586,7 @@ function hash_call($methodName, $nvpStr)
 	{
 	    $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
-	}
-	else
-	{
+	} else {
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 	}
@@ -676,9 +664,7 @@ function hash_call($methodName, $nvpStr)
         $_SESSION['curl_error_msg'] = curl_error($ch);
 
         //Execute the Error handling module to display errors.
-    }
-    else
-    {
+    } else {
         //closing the curl
         curl_close($ch);
     }
diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
index 8b30e33704d..5fbe0f6e9cd 100644
--- a/htdocs/paypal/lib/paypalfunctions.lib.php
+++ b/htdocs/paypal/lib/paypalfunctions.lib.php
@@ -52,9 +52,7 @@ if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'
 {
 	$API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	$API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
-}
-else
-{
+} else {
 	$API_Endpoint = "https://api-3t.paypal.com/nvp";
 	$API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 }
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index ab655d790f6..2f906c68382 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('admin', 'printing', 'oauth'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
 $value = GETPOST('value', 'alpha', 0, null, null, 1); // The value may be __google__docs so we force disable of replace
 $varname = GETPOST('varname', 'alpha');
@@ -73,9 +73,7 @@ if ($action == 'setconst' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else
-    {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -93,9 +91,7 @@ if ($action == 'setvalue' && $user->admin)
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null);
-    }
-    else
-    {
+    } else {
         $db->rollback();
         dol_print_error($db);
     }
@@ -161,9 +157,7 @@ if ($mode == 'setup' && $user->admin)
                     if ($key['varname'] == 'PRINTGCP_TOKEN_ACCESS')
                     {
                         print $langs->trans("IsTokenGenerated");
-                    }
-                    else
-                    {
+                    } else {
                         print $langs->trans($key['varname']);
                     }
                     print '</td>';
@@ -197,11 +191,9 @@ if ($mode == 'setup' && $user->admin)
                 $tokenobj = null;
                 // Dolibarr storage
                 $storage = new DoliStorage($db, $conf);
-                try
-                {
+                try {
                     $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME_GOOGLE);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     // Return an error if token not found
                 }
@@ -267,16 +259,12 @@ if ($mode == 'config' && $user->admin)
         if (!empty($conf->use_javascript_ajax))
         {
             print ajax_constantonoff($printer->active);
-        }
-        else
-        {
+        } else {
             if (empty($conf->global->{$printer->conf}))
             {
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;varname='.$printer->active.'&amp;value=1">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            }
-            else
-            {
-                print '<a href="'.$_SERVER['PHP_SELF'].'?action=setvalue&amp;varname='.$printer->active.'&amp;value=0">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+                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>';
@@ -309,8 +297,7 @@ if ($mode == 'test' && $user->admin)
             } else {
                 setEventMessages($printer->error, $printer->errors, 'errors');
             }
-        }
-        else {
+        } else {
             print $langs->trans('PleaseConfigureDriverfromList');
         }
     } else {
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index a50e22315d5..bdd86169466 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_global_variab
 $langs->load("products");
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $save = GETPOST('save', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $selection = GETPOST('selection', 'int');
@@ -42,17 +42,17 @@ if (!$user->admin) accessforbidden();
 //Objects
 $price_globals = new PriceGlobalVariable($db);
 if ($action == 'edit_variable') {
-    $res = $price_globals->fetch($selection);
-    if ($res < 1) {
-        setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-    }
+	$res = $price_globals->fetch($selection);
+	if ($res < 1) {
+		setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+	}
 }
 $price_updaters = new PriceGlobalVariableUpdater($db);
 if ($action == 'edit_updater') {
-    $res = $price_updaters->fetch($selection);
-    if ($res < 1) {
-        setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-    }
+	$res = $price_updaters->fetch($selection);
+	if ($res < 1) {
+		setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+	}
 }
 
 
@@ -61,84 +61,84 @@ if ($action == 'edit_updater') {
  */
 
 if (!empty($action) && empty($cancel)) {
-    //Global variable actions
-    if ($action == 'create_variable' || $action == 'edit_variable') {
-        $price_globals->code = GETPOSTISSET('code') ?GETPOST('code', 'alpha') : $price_globals->code;
-        $price_globals->description = GETPOSTISSET('description') ?GETPOST('description', 'alpha') : $price_globals->description;
-        $price_globals->value = GETPOSTISSET('value') ?GETPOST('value', 'int') : $price_globals->value;
-        //Check if record already exists only when saving
-        if (!empty($save)) {
-            foreach ($price_globals->listGlobalVariables() as $entry) {
-                if ($price_globals->id != $entry->id && dol_strtolower($price_globals->code) == dol_strtolower($entry->code)) {
-                    setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
-                    $save = null;
-                }
-            }
-        }
-    }
-    if ($action == 'create_variable' && !empty($save)) {
-        $res = $price_globals->create($user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-        }
-    } elseif ($action == 'edit_variable' && !empty($save)) {
-        $res = $price_globals->update($user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-        }
-    } elseif ($action == 'delete_variable') {
-        $res = $price_globals->delete($selection, $user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-        }
-    }
+	//Global variable actions
+	if ($action == 'create_variable' || $action == 'edit_variable') {
+		$price_globals->code = GETPOSTISSET('code') ?GETPOST('code', 'alpha') : $price_globals->code;
+		$price_globals->description = GETPOSTISSET('description') ?GETPOST('description', 'restricthtml') : $price_globals->description;
+		$price_globals->value = GETPOSTISSET('value') ?GETPOST('value', 'int') : $price_globals->value;
+		//Check if record already exists only when saving
+		if (!empty($save)) {
+			foreach ($price_globals->listGlobalVariables() as $entry) {
+				if ($price_globals->id != $entry->id && dol_strtolower($price_globals->code) == dol_strtolower($entry->code)) {
+					setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
+					$save = null;
+				}
+			}
+		}
+	}
+	if ($action == 'create_variable' && !empty($save)) {
+		$res = $price_globals->create($user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+		}
+	} elseif ($action == 'edit_variable' && !empty($save)) {
+		$res = $price_globals->update($user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+		}
+	} elseif ($action == 'delete_variable') {
+		$res = $price_globals->delete($selection, $user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+		}
+	}
 
-    //Updaters actions
-    if ($action == 'create_updater' || $action == 'edit_updater') {
-        $price_updaters->type = GETPOSTISSET('type') ?GETPOST('type', 'int') : $price_updaters->type;
-        $price_updaters->description = GETPOSTISSET('description') ?GETPOST('description', 'alpha') : $price_updaters->description;
-        $price_updaters->parameters = GETPOSTISSET('parameters') ?GETPOST('parameters') : $price_updaters->parameters;
-        $price_updaters->fk_variable = GETPOSTISSET('fk_variable') ?GETPOST('fk_variable', 'int') : $price_updaters->fk_variable;
-        $price_updaters->update_interval = GETPOSTISSET('update_interval') ?GETPOST('update_interval', 'int') : $price_updaters->update_interval;
-    }
-    if ($action == 'create_updater' && !empty($save)) {
-        //Verify if process() works
-        $res = $price_updaters->process();
-        if ($res > 0) {
-            $res = $price_updaters->create($user);
-        }
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-        }
-    } elseif ($action == 'edit_updater' && !empty($save)) {
-        //Verify if process() works
-        $res = $price_updaters->process();
-        if ($res > 0) {
-            $res = $price_updaters->update($user);
-        }
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-        }
-    } elseif ($action == 'delete_updater') {
-        $res = $price_updaters->delete($selection, $user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-        }
-    }
+	//Updaters actions
+	if ($action == 'create_updater' || $action == 'edit_updater') {
+		$price_updaters->type = GETPOSTISSET('type') ? GETPOST('type', 'int') : $price_updaters->type;
+		$price_updaters->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_updaters->description;
+		$price_updaters->parameters = GETPOSTISSET('parameters') ? GETPOST('parameters', 'alphanohtml') : $price_updaters->parameters;
+		$price_updaters->fk_variable = GETPOSTISSET('fk_variable') ? GETPOST('fk_variable', 'int') : $price_updaters->fk_variable;
+		$price_updaters->update_interval = GETPOSTISSET('update_interval') ? GETPOST('update_interval', 'int') : $price_updaters->update_interval;
+	}
+	if ($action == 'create_updater' && !empty($save)) {
+		//Verify if process() works
+		$res = $price_updaters->process();
+		if ($res > 0) {
+			$res = $price_updaters->create($user);
+		}
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+		}
+	} elseif ($action == 'edit_updater' && !empty($save)) {
+		//Verify if process() works
+		$res = $price_updaters->process();
+		if ($res > 0) {
+			$res = $price_updaters->update($user);
+		}
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+		}
+	} elseif ($action == 'delete_updater') {
+		$res = $price_updaters->delete($selection, $user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+		}
+	}
 } elseif (!empty($cancel)) {
-    $action = '';
+	$action = '';
 }
 
 
@@ -159,175 +159,171 @@ print '<br>';
 //Global variables table
 if ($action != 'create_updater' && $action != 'edit_updater')
 {
-    print load_fiche_titre($langs->trans("GlobalVariables"), '', '');
+	print load_fiche_titre($langs->trans("GlobalVariables"), '', '');
 
-    print '<table summary="listofattributes" class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Variable").'</td>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td>'.$langs->trans("Value").'</td>';
-    print '<td width="80">&nbsp;</td>'; //Space for buttons
-    print '</tr>';
+	print '<table summary="listofattributes" class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Variable").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td>'.$langs->trans("Value").'</td>';
+	print '<td width="80">&nbsp;</td>'; //Space for buttons
+	print '</tr>';
 
-    $arrayglobalvars = $price_globals->listGlobalVariables();
-    if (!empty($arrayglobalvars))
-    {
-	    foreach ($arrayglobalvars as $i=>$entry) {
-	        $var = !$var;
-	        print '<tr class="oddeven">';
-	        print '<td>'.$entry->code.'</td>';
-	        print '<td>'.$entry->description.'</td>';
-	        print '<td>'.price($entry->value).'</td>';
-	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
-	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&selection='.$entry->id.'">'.img_delete().'</a></td>';
-	        print '</tr>';
-	    }
-    }
-    else
-    {
-    	print '<tr colspan="7"><td class="opacitymedium">';
-    	print $langs->trans("None");
-    	print '</td></tr>';
-    }
-    print '</table>';
+	$arrayglobalvars = $price_globals->listGlobalVariables();
+	if (!empty($arrayglobalvars))
+	{
+		foreach ($arrayglobalvars as $i=>$entry) {
+			$var = !$var;
+			print '<tr class="oddeven">';
+			print '<td>'.$entry->code.'</td>';
+			print '<td>'.$entry->description.'</td>';
+			print '<td>'.price($entry->value).'</td>';
+			print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&token='.newToken().'&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
+			print '</tr>';
+		}
+	} else {
+		print '<tr colspan="7"><td class="opacitymedium">';
+		print $langs->trans("None");
+		print '</td></tr>';
+	}
+	print '</table>';
 
-    if (empty($action))
-    {
-        //Action Buttons
-        print '<div class="tabsAction">';
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("AddVariable").'</a>';
-        print '</div>';
-        //Separator is only need for updaters table is showed after buttons
-        print '<br><br>';
-    }
+	if (empty($action))
+	{
+		//Action Buttons
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("AddVariable").'</a>';
+		print '</div>';
+		//Separator is only need for updaters table is showed after buttons
+		print '<br><br>';
+	}
 }
 
 //Global variable editor
 if ($action == 'create_variable' || $action == 'edit_variable') {
-    //Form
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="'.$action.'">';
-    print '<input type="hidden" name="selection" value="'.$selection.'">';
+	//Form
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="'.$action.'">';
+	print '<input type="hidden" name="selection" value="'.$selection.'">';
 
-    //Table
-    print '<br><table summary="listofattributes" class="border centpercent">';
-    //Code
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Variable").'</td>';
-    print '<td class="valeur"><input type="text" name="code" size="20" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';
-    print '</tr>';
-    //Description
-    print '<tr>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';
-    print '</tr>';
-    //Value
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Value").'</td>';
-    print '<td class="valeur"><input type="text" name="value" size="10" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';
-    print '</tr>';
-    print '</table>';
+	//Table
+	print '<br><table summary="listofattributes" class="border centpercent">';
+	//Code
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Variable").'</td>';
+	print '<td class="valeur"><input type="text" name="code" size="20" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';
+	print '</tr>';
+	//Description
+	print '<tr>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';
+	print '</tr>';
+	//Value
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Value").'</td>';
+	print '<td class="valeur"><input type="text" name="value" size="10" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';
+	print '</tr>';
+	print '</table>';
 
-    //Form Buttons
-    print '<br><div class="center">';
-    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
-    print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
-    print '</form>';
+	//Form Buttons
+	print '<br><div class="center">';
+	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
+	print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+	print '</form>';
 }
 
 // Updaters table
 if ($action != 'create_variable' && $action != 'edit_variable')
 {
-    print load_fiche_titre($langs->trans("GlobalVariableUpdaters"), '', '');
+	print load_fiche_titre($langs->trans("GlobalVariableUpdaters"), '', '');
 
-    print '<table summary="listofattributes" class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("VariableToUpdate").'</td>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td>'.$langs->trans("Type").'</td>';
-    print '<td>'.$langs->trans("Parameters").'</td>';
-    print '<td>'.$langs->trans("UpdateInterval").'</td>';
-    print '<td>'.$langs->trans("LastUpdated").'</td>';
-    print '<td width="80">&nbsp;</td>'; //Space for buttons
-    print '</tr>';
+	print '<table summary="listofattributes" class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("VariableToUpdate").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td>'.$langs->trans("Type").'</td>';
+	print '<td>'.$langs->trans("Parameters").'</td>';
+	print '<td>'.$langs->trans("UpdateInterval").'</td>';
+	print '<td>'.$langs->trans("LastUpdated").'</td>';
+	print '<td width="80">&nbsp;</td>'; //Space for buttons
+	print '</tr>';
 
-    $arraypriceupdaters = $price_updaters->listUpdaters();
-    if (!empty($arraypriceupdaters))
-    {
-	    foreach ($arraypriceupdaters as $i=>$entry) {
-	        $code = "";
-	        if ($entry->fk_variable > 0) {
-	            $res = $price_globals->fetch($entry->fk_variable);
-	            if ($res > 0) {
-	                $code = $price_globals->code;
-	            }
-	        }
-	        print '<tr>';
-	        print '<td>'.$code.'</td>';
-	        print '<td>'.$entry->description.'</td>';
-	        print '<td>'.$langs->trans("GlobalVariableUpdaterType".$entry->type).'</td>';
-	        print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';
-	        print '<td>'.$entry->update_interval.'</td>';
-	        print '<td>'.$entry->getLastUpdated().'</td>';
-	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
-	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&selection='.$entry->id.'">'.img_delete().'</a></td>';
-	        print '</tr>';
-	    }
-    }
-    else
-    {
-    	print '<tr><td colspan="7" class="opacitymedium">';
-    	print $langs->trans("None");
-    	print '</td></tr>';
-    }
-    print '</table>';
+	$arraypriceupdaters = $price_updaters->listUpdaters();
+	if (!empty($arraypriceupdaters))
+	{
+		foreach ($arraypriceupdaters as $i=>$entry) {
+			$code = "";
+			if ($entry->fk_variable > 0) {
+				$res = $price_globals->fetch($entry->fk_variable);
+				if ($res > 0) {
+					$code = $price_globals->code;
+				}
+			}
+			print '<tr>';
+			print '<td>'.$code.'</td>';
+			print '<td>'.$entry->description.'</td>';
+			print '<td>'.$langs->trans("GlobalVariableUpdaterType".$entry->type).'</td>';
+			print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';
+			print '<td>'.$entry->update_interval.'</td>';
+			print '<td>'.$entry->getLastUpdated().'</td>';
+			print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
+			print '</tr>';
+		}
+	} else {
+		print '<tr><td colspan="7" class="opacitymedium">';
+		print $langs->trans("None");
+		print '</td></tr>';
+	}
+	print '</table>';
 
-    if (empty($action))
-    {
-        //Action Buttons
-        print '<div class="tabsAction">';
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater">'.$langs->trans("AddUpdater").'</a>';
-        print '</div>';
-    }
+	if (empty($action))
+	{
+		//Action Buttons
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater&token='.newToken().'">'.$langs->trans("AddUpdater").'</a>';
+		print '</div>';
+	}
 }
 
 //Updater editor
 if ($action == 'create_updater' || $action == 'edit_updater') {
-    //Form
-    print '<form id="updaterform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="'.$action.'">';
-    print '<input type="hidden" name="selection" value="'.$selection.'">';
+	//Form
+	print '<form id="updaterform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="'.$action.'">';
+	print '<input type="hidden" name="selection" value="'.$selection.'">';
 
-    //Table
-    print '<br><table summary="listofattributes" class="border centpercent">';
-    //Code
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("VariableToUpdate").'</td><td>';
-    $globals_list = array();
-    foreach ($price_globals->listGlobalVariables() as $entry) {
-        $globals_list[$entry->id] = $entry->code;
-    }
-    print $form->selectarray('fk_variable', $globals_list, (empty($price_updaters->fk_variable) ? 0 : $price_updaters->fk_variable));
-    print '</td></tr>';
-    //Description
-    print '<tr>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';
-    print '</tr>';
-    //Type
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-    $type = empty($price_updaters->type) ? 0 : $price_updaters->type;
-    $type_list = array();
-    foreach ($price_updaters->types as $val) {
-        $type_list[$val] = $langs->trans("GlobalVariableUpdaterType".$val);
-    }
-    print $form->selectarray('type', $type_list, $type);
-    // This code submits form when type is changed
-    print '<script type="text/javascript">
+	//Table
+	print '<br><table summary="listofattributes" class="border centpercent">';
+	//Code
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("VariableToUpdate").'</td><td>';
+	$globals_list = array();
+	foreach ($price_globals->listGlobalVariables() as $entry) {
+		$globals_list[$entry->id] = $entry->code;
+	}
+	print $form->selectarray('fk_variable', $globals_list, (empty($price_updaters->fk_variable) ? 0 : $price_updaters->fk_variable));
+	print '</td></tr>';
+	//Description
+	print '<tr>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';
+	print '</tr>';
+	//Type
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+	$type = empty($price_updaters->type) ? 0 : $price_updaters->type;
+	$type_list = array();
+	foreach ($price_updaters->types as $val) {
+		$type_list[$val] = $langs->trans("GlobalVariableUpdaterType".$val);
+	}
+	print $form->selectarray('type', $type_list, $type);
+	// This code submits form when type is changed
+	print '<script type="text/javascript">
         jQuery(document).ready(run);
         function run() {
             jQuery("#type").change(on_change);
@@ -336,29 +332,29 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
             jQuery("#updaterform").submit();
         }
     </script>';
-    print '</td></tr>';
-    //Parameters
-    print '<tr>';
-    $help = $langs->trans("GlobalVariableUpdaterHelp".$type).'<br><b>'.$langs->trans("GlobalVariableUpdaterHelpFormat".$type).'</b>';
-    print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("Parameters"), $help, 1).'</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('parameters', empty($price_updaters->parameters) ? '' : $price_updaters->parameters, '', 300, '', '', false, false, false, ROWS_8, '90%');
-    $doleditor->Create();
-    print '</td></tr>';
-    print '</tr>';
-    //Interval
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("UpdateInterval").'</td>';
-    print '<td class="valeur"><input type="text" name="update_interval" size="10" value="'.(empty($price_updaters->update_interval) ? '' : $price_updaters->update_interval).'"></td>';
-    print '</tr>';
-    print '</table>';
+	print '</td></tr>';
+	//Parameters
+	print '<tr>';
+	$help = $langs->trans("GlobalVariableUpdaterHelp".$type).'<br><b>'.$langs->trans("GlobalVariableUpdaterHelpFormat".$type).'</b>';
+	print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("Parameters"), $help, 1).'</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('parameters', empty($price_updaters->parameters) ? '' : $price_updaters->parameters, '', 300, '', '', false, false, false, ROWS_8, '90%');
+	$doleditor->Create();
+	print '</td></tr>';
+	print '</tr>';
+	//Interval
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("UpdateInterval").'</td>';
+	print '<td class="valeur"><input type="text" name="update_interval" size="10" value="'.(empty($price_updaters->update_interval) ? '' : $price_updaters->update_interval).'"></td>';
+	print '</tr>';
+	print '</table>';
 
-    //Form Buttons
-    print '<br><div class="center">';
-    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
-    print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
-    print '</form>';
+	//Form Buttons
+	print '<br><div class="center">';
+	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
+	print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index 4ef011b28fc..09418b5e896 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -43,7 +43,7 @@ $langs->loadLangs(array("admin", "products"));
 if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled)))
 	accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -81,9 +81,7 @@ if ($action == 'setcodeproduct')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -101,7 +99,7 @@ if ($action == 'other' && GETPOST('value_PRODUIT_MULTIPRICES_LIMIT') > 0)
 if ($action == 'other')
 {
 	$princingrules = GETPOST('princingrule', 'alpha');
-	foreach ($select_pricing_rules as $rule=>$label) // Loop on each possible mode
+	foreach ($select_pricing_rules as $rule => $label) // Loop on each possible mode
 	{
 		if ($rule == $princingrules) // We are on selected rule, we enable it
 		{
@@ -111,17 +109,14 @@ if ($action == 'other')
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES_BY_QTY', 0, 'chaine', 0, '', $conf->entity);
 				$res = dolibarr_set_const($db, 'PRODUIT_CUSTOMER_PRICES', 0, 'chaine', 0, '', $conf->entity);
 				dolibarr_set_const($db, 'PRODUCT_PRICE_UNIQ', 1, 'chaine', 0, '', $conf->entity);
-			}
-			else
-			{
+			} else {
 				$multirule = explode('&', $princingrules);
 				foreach ($multirule as $rulesselected)
 				{
 					$res = dolibarr_set_const($db, $rulesselected, 1, 'chaine', 0, '', $conf->entity);
 				}
 			}
-		}
-		else	// We clear this mode
+		} else // We clear this mode
 		{
 			if (strpos($rule, '&') === false) {
 				$res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity);
@@ -129,6 +124,9 @@ if ($action == 'other')
 		}
 	}
 
+	$value = GETPOST('price_base_type', 'alpha');
+	$res = dolibarr_set_const($db, "PRODUCT_PRICE_BASE_TYPE", $value, 'chaine', 0, '', $conf->entity);
+
 	$value = GETPOST('PRODUIT_SOUSPRODUITS', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_SOUSPRODUITS", $value, 'chaine', 0, '', $conf->entity);
 
@@ -201,15 +199,11 @@ if ($action == 'specimen') // For products
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=product&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -270,9 +264,7 @@ if ($action)
     if (!$error)
     {
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
 	    setEventMessages($langs->trans("SetupNotError"), null, 'errors');
     }
 }
@@ -289,8 +281,7 @@ if (empty($conf->product->enabled))
 {
 	$title = $langs->trans('ServiceSetup');
 	$tab = $langs->trans('Services');
-}
-elseif (empty($conf->service->enabled))
+} elseif (empty($conf->service->enabled))
 {
 	$title = $langs->trans('ProductSetup');
 	$tab = $langs->trans('Products');
@@ -338,8 +329,7 @@ foreach ($dirproduct as $dirroot)
 
     			try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -361,13 +351,11 @@ foreach ($dirproduct as $dirroot)
     				print '<td class="center">'."\n";
     				print img_picto($langs->trans("Activated"), 'switch_on');
     				print "</td>\n";
-    			}
-    			else
-    			{
+    			} 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&value='.$file.'">';
+    				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>';
@@ -390,7 +378,7 @@ print '</table>';
 $def = array();
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 $resql = $db->query($sql);
 if ($resql)
@@ -403,9 +391,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -475,11 +461,9 @@ foreach ($dirmodels as $reldir)
 	                            	print img_picto($langs->trans("Enabled"), 'switch_on');
 	                            	print '</a>';
 	                            	print '</td>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print '<td class="center">'."\n";
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	                                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>";
 	                            }
 
@@ -488,10 +472,8 @@ foreach ($dirmodels as $reldir)
 	                            if ($conf->global->PRODUCT_ADDON_PDF == $name)
 	                            {
 	                                print img_picto($langs->trans("Default"), 'on');
-	                            }
-	                            else
-	                            {
-	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</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).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	                            }
 	                            print '</td>';
 
@@ -516,9 +498,7 @@ foreach ($dirmodels as $reldir)
 	                            if ($module->type == 'pdf')
 	                            {
 	                                print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'contract').'</a>';
-	                            }
-	                            else
-	                            {
+	                            } else {
 	                                print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 	                            }
 	                            print '</td>';
@@ -572,12 +552,10 @@ print '<tr class="oddeven">';
 if (empty($conf->multicompany->enabled))
 {
 	print '<td>'.$langs->trans("PricingRule").'</td>';
-}
-else
-{
+} else {
 	print '<td>'.$form->textwithpicto($langs->trans("PricingRule"), $langs->trans("SamePriceAlsoForSharedCompanies"), 1).'</td>';
 }
-print '<td width="60" class="right">';
+print '<td class="right">';
 $current_rule = 'PRODUCT_PRICE_UNIQ';
 if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule = 'PRODUIT_MULTIPRICES';
 if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule = 'PRODUIT_CUSTOMER_PRICES_BY_QTY';
@@ -597,11 +575,19 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 	print '</tr>';
 }
 
+//Default product price base type
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("DefaultPriceType").'</td>';
+print '<td width="60" class="right">';
+print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_base_type");
+print '</td>';
+print '</tr>';
+
 // sousproduits activation/desactivation
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("AssociatedProductsAbility").'</td>';
-print '<td width="60" class="right">';
+print '<td class="right">';
 print $form->selectyesno("PRODUIT_SOUSPRODUITS", $conf->global->PRODUIT_SOUSPRODUITS, 1);
 print '</td>';
 print '</tr>';
@@ -612,13 +598,11 @@ print '<tr class="oddeven">';
 print '<td>'.$form->textwithpicto($langs->trans("UseSearchToSelectProduct"), $langs->trans('UseSearchToSelectProductTooltip'), 1).'</td>';
 if (empty($conf->use_javascript_ajax))
 {
-	print '<td class="nowrap right" colspan="2">';
+	print '<td class="nowrap right">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print '</td>';
-}
-else
-{
-	print '<td width="60" class="right">';
+} else {
+	print '<td class="right">';
 	$arrval = array(
 		'0'=>$langs->trans("No"),
 		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
@@ -641,7 +625,7 @@ if (empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
 // Visualiser description produit dans les formulaires activation/desactivation
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ViewProductDescInFormAbility").'</td>';
-print '<td width="60" class="right">';
+print '<td class="right">';
 print $form->selectyesno("activate_viewProdDescInForm", $conf->global->PRODUIT_DESC_IN_FORM, 1);
 print '</td>';
 print '</tr>';
@@ -651,7 +635,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MergePropalProductCard").'</td>';
-print '<td width="60" class="right">';
+print '<td class="right">';
 print $form->selectyesno("activate_mergePropalProductCard",$conf->global->PRODUIT_PDF_MERGE_PROPAL,1);
 print '</td>';
 print '</tr>';
@@ -662,7 +646,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("UseUnits").'</td>';
-print '<td width="60" class="right">';
+print '<td class="right">';
 print $form->selectyesno("activate_units",$conf->global->PRODUCT_USE_UNITS,1);
 print '</td>';
 print '</tr>';
@@ -673,7 +657,7 @@ if (!empty($conf->global->MAIN_MULTILANGS))
 {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("ViewProductDescInThirdpartyLanguageAbility").'</td>';
-	print '<td width="60" class="right">';
+	print '<td class="right">';
 	print $form->selectyesno("activate_viewProdTextsInThirdpartyLanguage", (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) ? $conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE : 0), 1);
 	print '</td>';
 	print '</tr>';
@@ -683,14 +667,14 @@ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUP
 {
     print '<tr class="oddeven">';
     print '<td>'.$langs->trans("UseProductFournDesc").'</td>';
-    print '<td width="60" class="right">';
+    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>';
-	print '<td width="60" align="right">';
+	print '<td align="right">';
 	print $form->selectyesno("activate_useProdSupplierPackaging", (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING) ? $conf->global->PRODUCT_USE_SUPPLIER_PACKAGING : 0), 1);
 	print '</td>';
 	print '</tr>';
@@ -704,8 +688,8 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
 
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("ProductSpecial").'</td>'."\n";
-	print '<td class="right" width="60">'.$langs->trans("Value").'</td>'."\n";
-	print '<td width="80">&nbsp;</td></tr>'."\n";
+	print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
+	print '</tr>'."\n";
 
 	if (is_dir($dir))
 	{
@@ -740,12 +724,10 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
     					{
     						print img_picto($langs->trans("Active"), 'tick');
     						print '</td><td class="right">';
-    						print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;spe='.$file.'&amp;value=0">'.$langs->trans("Disable").'</a>';
-    					}
-    					else
-    					{
+    						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;spe='.$file.'&amp;value=1">'.$langs->trans("Activate").'</a>';
+    						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>';
@@ -754,9 +736,7 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY))
     		}
 		    closedir($handle);
         }
-	}
-	else
-	{
+	} 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 7814c3bcda8..59d6437578c 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -40,7 +40,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'product'; //Must be the $element of the class that manage extrafield
 
@@ -65,8 +65,7 @@ if (empty($conf->product->enabled))
 {
 	$title = $langs->trans('ServiceSetup');
 	$textobject = $langs->trans('Services');
-}
-elseif (empty($conf->service->enabled))
+} elseif (empty($conf->service->enabled))
 {
 	$title = $langs->trans('ProductSetup');
 	$textobject = $langs->trans('Products');
diff --git a/htdocs/product/admin/product_lot_extrafields.php b/htdocs/product/admin/product_lot_extrafields.php
index 625ca8bf1b3..e5e058927a1 100644
--- a/htdocs/product/admin/product_lot_extrafields.php
+++ b/htdocs/product/admin/product_lot_extrafields.php
@@ -40,7 +40,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'product_lot'; //Must be the $element of the class that manage extrafield
 
diff --git a/htdocs/product/admin/product_supplier_extrafields.php b/htdocs/product/admin/product_supplier_extrafields.php
index d35e6012e1f..daaf3a9edfd 100644
--- a/htdocs/product/admin/product_supplier_extrafields.php
+++ b/htdocs/product/admin/product_supplier_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'product_fournisseur_price'; //Must be the $element of the class that manage extrafield
 
@@ -66,8 +66,7 @@ if (empty($conf->product->enabled))
 {
 	$title = $langs->trans('ServiceSetup');
 	$textobject = $langs->trans('Services');
-}
-elseif (empty($conf->service->enabled))
+} elseif (empty($conf->service->enabled))
 {
 	$title = $langs->trans('ProductSetup');
 	$textobject = $langs->trans('Products');
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 4ce4a067e5c..592dd89baaa 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('admin', 'products'));
 // Security check
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $oldvatrate = GETPOST('oldvatrate', 'alpha');
 $newvatrate = GETPOST('newvatrate', 'alpha');
 //$price_base_type=GETPOST('price_base_type');
@@ -90,7 +90,7 @@ if ($action == 'convert')
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'product';
 			$sql .= ' WHERE entity IN ('.getEntity('product').')';
 			$sql .= " AND tva_tx = '".$db->escape($oldvatrateclean)."'";
-			if ($vat_src_code_old) $sql .= " AND default_vat_code = '".$vat_src_code_old."'";
+			if ($vat_src_code_old) $sql .= " AND default_vat_code = '".$db->escape($vat_src_code_old)."'";
 			else " AND default_vat_code = IS NULL";
 
 			$resql = $db->query($sql);
@@ -120,9 +120,7 @@ if ($action == 'convert')
 							{
 								$newprice = price2num($objectstatic->multiprices_ttc[$level], 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 								$newminprice = $objectstatic->multiprices_min_ttc[$level];
-							}
-							else
-							{
+							} else {
 								$newprice = price2num($objectstatic->multiprices[$level], 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 								$newminprice = $objectstatic->multiprices_min[$level];
 							}
@@ -151,9 +149,7 @@ if ($action == 'convert')
 						{
 							$newprice = price2num($objectstatic->price_ttc, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 							$newminprice = $objectstatic->price_min_ttc;
-						}
-						else
-						{
+						} else {
 							$newprice = price2num($objectstatic->price, 'MU'); // Second param must be MU (we want a unit price so 'MU'. If unit price was on 4 decimal, we must keep 4 decimals)
 							$newminprice = $objectstatic->price_min;
 						}
@@ -176,8 +172,7 @@ if ($action == 'convert')
 
 					$i++;
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 
 		$fourn = new Fournisseur($db);
@@ -187,9 +182,9 @@ if ($action == 'convert')
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp, '.MAIN_DB_PREFIX.'societe as s';
 		$sql .= ' WHERE pfp.fk_soc = s.rowid AND pfp.entity IN ('.getEntity('product').')';
 		$sql .= " AND tva_tx = '".$db->escape($oldvatrate)."'";
-		if ($vat_src_code_old) $sql .= " AND default_vat_code = '".$vat_src_code_old."'";
+		if ($vat_src_code_old) $sql .= " AND default_vat_code = '".$db->escape($vat_src_code_old)."'";
 		else " AND default_vat_code = IS NULL";
-		$sql .= " AND s.fk_pays = '".$country_id."'";
+		$sql .= " AND s.fk_pays = ".((int) $country_id);
 		//print $sql;
 		$resql = $db->query($sql);
 		if ($resql)
@@ -245,15 +240,12 @@ if ($action == 'convert')
 
 				$i++;
 			}
-		}
-		else dol_print_error($db);
+		} else dol_print_error($db);
 
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 
@@ -262,9 +254,7 @@ if ($action == 'convert')
 		{
 			if ($nbrecordsmodified > 0) setEventMessages($langs->trans("RecordsModified", $nbrecordsmodified), null, 'mesgs');
 			else setEventMessages($langs->trans("NoRecordFound"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -289,9 +279,7 @@ if (empty($mysoc->country_code))
 	$langs->load("errors");
 	$warnpicto = img_error($langs->trans("WarningMandatorySetupNotComplete"));
 	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
-}
-else
-{
+} else {
 	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'" />';
 	print '<input type="hidden" name="action" value="convert" />';
diff --git a/htdocs/product/admin/stock_extrafields.php b/htdocs/product/admin/stock_extrafields.php
index 22ad53cd0e8..4c9e1435c15 100644
--- a/htdocs/product/admin/stock_extrafields.php
+++ b/htdocs/product/admin/stock_extrafields.php
@@ -39,7 +39,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'entrepot'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 808ba9739ba..acd698d9f37 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -40,9 +40,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 918950179c7..7441d88abc0 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -39,7 +39,7 @@ $mode = GETPOST('mode', 'int');
 $status = ((GETPOST('status', 'int') >= 0) ? GETPOST('status', 'int') : - 1);
 $outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
 $price_level = GETPOST('price_level', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $price_by_qty_rowid = GETPOST('pbq', 'int');
 $finished = GETPOST('finished', 'int');
@@ -162,9 +162,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	}
 
 	echo json_encode($outjson);
-}
-else
-{
+} else {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 	$langs->loadLangs(array("main", "products"));
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index 1612448c1bb..85cd3464c1f 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -287,9 +287,7 @@ class ActionsCardProduct
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db, $sql);
 		}
 	}
@@ -322,7 +320,7 @@ class ActionsCardProduct
 			if ($field['enabled'])
 			{
 				$fieldname = "s".$field['alias'];
-				$$fieldname = trim(GETPOST($fieldname));
+				$$fieldname = GETPOST($fieldname);
 			}
 		}
 
@@ -407,14 +405,12 @@ class ActionsCardProduct
 							$this->type 	= $obj->fk_product_type;
 							$this->entity = $obj->entity;
 							$datas[$alias] = $this->getNomUrl(1, '', 24);
-						}
-						elseif ($alias == 'stock')
+						} elseif ($alias == 'stock')
 						{
 							$this->load_stock();
 							if ($this->stock_reel < $obj->seuil_stock_alerte) $datas[$alias] = $this->stock_reel.' '.img_warning($langs->trans("StockTooLow"));
 							else $datas[$alias] = $this->stock_reel;
-						}
-						elseif ($alias == 'label')	$datas[$alias] = dol_trunc($obj->$alias, 40);
+						} elseif ($alias == 'label')	$datas[$alias] = dol_trunc($obj->$alias, 40);
 						elseif (preg_match('/price/i', $alias))	$datas[$alias] = price($obj->$alias);
 						elseif ($alias == 'datem') $datas[$alias] = dol_print_date($this->db->jdate($obj->$alias), 'day');
 						elseif ($alias == 'status') $datas[$alias] = $this->LibStatut($obj->$alias, 5);
@@ -427,9 +423,7 @@ class ActionsCardProduct
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index 331cecb3071..0518cfed475 100644
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -205,8 +205,7 @@ class ActionsCardService
 			if ($this->object->duration_value > 1)
 			{
 				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-			}
-			elseif ($this->object->duration_value > 0)
+			} elseif ($this->object->duration_value > 0)
 			{
 				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 			}
@@ -267,9 +266,7 @@ class ActionsCardService
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db, $sql);
 		}
 	}
@@ -360,9 +357,7 @@ class ActionsCardService
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			print $sql;
 		}
 	}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 8b4654ba921..e3467e871c8 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -18,6 +18,7 @@
  * Copyright (C) 2017		Josep Lluís Amador	 <joseplluis@lliuretic.cat>
  * Copyright (C) 2019       Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibogxiv.net>
+ * Copyright (C) 2020  		Pierre Ardoin     	 <mapiolca@me.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,6 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
@@ -97,16 +99,16 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 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->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";
+	}
 }
 
 $modulepart = 'product';
@@ -116,9 +118,9 @@ $canvas = !empty($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('product', 'card', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('product', 'card', $canvas);
 }
 
 // Security check
@@ -149,185 +151,183 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    // Type
+	// Type
 	if ($action == 'setfk_product_type' && $usercancreate)
-    {
-    	$result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
-    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-    	exit;
-    }
+	{
+		$result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
 
-    // Actions to build doc
-    $upload_dir = $conf->product->dir_output;
-    $permissiontoadd = $usercancreate;
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	// Actions to build doc
+	$upload_dir = $conf->product->dir_output;
+	$permissiontoadd = $usercancreate;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Barcode type
-    if ($action == 'setfk_barcode_type' && $createbarcode)
-    {
-        $result = $object->setValueFrom('fk_barcode_type', GETPOST('fk_barcode_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
-    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-    	exit;
-    }
+	// Barcode type
+	if ($action == 'setfk_barcode_type' && $createbarcode)
+	{
+		$result = $object->setValueFrom('fk_barcode_type', GETPOST('fk_barcode_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	}
 
-    // Barcode value
-    if ($action == 'setbarcode' && $createbarcode)
-    {
-    	$result = $object->check_barcode(GETPOST('barcode'), GETPOST('barcode_type_code'));
+	// Barcode value
+	if ($action == 'setbarcode' && $createbarcode)
+	{
+		$result = $object->check_barcode(GETPOST('barcode'), GETPOST('barcode_type_code'));
 
 		if ($result >= 0)
 		{
-	    	$result = $object->setValueFrom('barcode', GETPOST('barcode'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
-	    	header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-	    	exit;
-		}
-		else
-		{
+			$result = $object->setValueFrom('barcode', GETPOST('barcode'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
+			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+			exit;
+		} else {
 			$langs->load("errors");
-        	if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
-        	elseif ($result == -2) $errors[] = 'ErrorBarCodeRequired';
-        	elseif ($result == -3) $errors[] = 'ErrorBarCodeAlreadyUsed';
-        	else $errors[] = 'FailedToValidateBarCode';
+			if ($result == -1) $errors[] = 'ErrorBadBarCodeSyntax';
+			elseif ($result == -2) $errors[] = 'ErrorBarCodeRequired';
+			elseif ($result == -3) $errors[] = 'ErrorBarCodeAlreadyUsed';
+			else $errors[] = 'FailedToValidateBarCode';
 
 			$error++;
 			setEventMessages($errors, null, 'errors');
 		}
-    }
+	}
 
-    // Add a product or service
-    if ($action == 'add' && $usercancreate)
-    {
-        $error = 0;
+	// Add a product or service
+	if ($action == 'add' && $usercancreate)
+	{
+		$error = 0;
 
-        if (!GETPOST('label', 'alphanohtml'))
-        {
-            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Label')), null, 'errors');
-            $action = "create";
-            $error++;
-        }
-        if (empty($ref))
-        {
-            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Ref')), null, 'errors');
-            $action = "create";
-            $error++;
-        }
-        if (!empty($duration_value) && empty($duration_unit))
-        {
-            setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Unit')), null, 'errors');
-            $action = "create";
-            $error++;
-        }
+		if (!GETPOST('label', 'alphanohtml'))
+		{
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Label')), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+		if (empty($ref))
+		{
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Ref')), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+		if (!empty($duration_value) && empty($duration_unit))
+		{
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Unit')), null, 'errors');
+			$action = "create";
+			$error++;
+		}
 
-        if (!$error)
-        {
-	        $units = GETPOST('units', 'int');
+		if (!$error)
+		{
+			$units = GETPOST('units', 'int');
 
-            $object->ref                   = $ref;
-            $object->label                 = GETPOST('label', 'alphanohtml');
-            $object->price_base_type       = GETPOST('price_base_type', 'aZ09');
+			$object->ref                   = $ref;
+			$object->label                 = GETPOST('label', 'alphanohtml');
+			$object->price_base_type       = GETPOST('price_base_type', 'aZ09');
 
-            if ($object->price_base_type == 'TTC')
-            	$object->price_ttc = GETPOST('price');
-            else
-            	$object->price = GETPOST('price');
-            if ($object->price_base_type == 'TTC')
-            	$object->price_min_ttc = GETPOST('price_min');
-            else
-            	$object->price_min = GETPOST('price_min');
+			if ($object->price_base_type == 'TTC')
+				$object->price_ttc = GETPOST('price');
+			else $object->price = GETPOST('price');
+			if ($object->price_base_type == 'TTC')
+				$object->price_min_ttc = GETPOST('price_min');
+			else $object->price_min = GETPOST('price_min');
 
-	        $tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+			$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
-	        // We must define tva_tx, npr and local taxes
-	        $vatratecode = '';
-	        $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
-	        $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-	        $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-	        // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
-	        if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	        {
-	            // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
-	            $vatratecode = $reg[1];
-	            // Get record from code
-	            $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	            $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-	            $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-	            $sql .= " AND t.code ='".$vatratecode."'";
-	            $resql = $db->query($sql);
-	            if ($resql)
-	            {
-	                $obj = $db->fetch_object($resql);
-	                $npr = $obj->recuperableonly;
-	                $localtax1 = $obj->localtax1;
-	                $localtax2 = $obj->localtax2;
-	                $localtax1_type = $obj->localtax1_type;
-	                $localtax2_type = $obj->localtax2_type;
-	            }
-	        }
+			// We must define tva_tx, npr and local taxes
+			$vatratecode = '';
+			$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
+			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+			// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+			$reg = array();
+			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+			{
+				// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
+				$vatratecode = $reg[1];
+				// Get record from code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+				$sql .= " AND t.code = '".$db->escape($vatratecode)."'";
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+			}
 
-	        $object->default_vat_code = $vatratecode;
-	        $object->tva_tx = $tva_tx;
-	        $object->tva_npr = $npr;
-	        $object->localtax1_tx = $localtax1;
-	        $object->localtax2_tx = $localtax2;
-	        $object->localtax1_type = $localtax1_type;
-	        $object->localtax2_type = $localtax2_type;
+			$object->default_vat_code = $vatratecode;
+			$object->tva_tx = $tva_tx;
+			$object->tva_npr = $npr;
+			$object->localtax1_tx = $localtax1;
+			$object->localtax2_tx = $localtax2;
+			$object->localtax1_type = $localtax1_type;
+			$object->localtax2_type = $localtax2_type;
 
-            $object->type               	 = $type;
-            $object->status             	 = GETPOST('statut');
-            $object->status_buy            = GETPOST('statut_buy');
+			$object->type               	 = $type;
+			$object->status             	 = GETPOST('statut');
+			$object->status_buy            = GETPOST('statut_buy');
 			$object->status_batch = GETPOST('status_batch');
 
-            $object->barcode_type          = GETPOST('fk_barcode_type');
-            $object->barcode = GETPOST('barcode');
-            // Set barcode_type_xxx from barcode_type id
-            $stdobject = new GenericObject($db);
-    	    $stdobject->element = 'product';
-            $stdobject->barcode_type = GETPOST('fk_barcode_type');
-            $result = $stdobject->fetch_barcode();
-            if ($result < 0)
-            {
-            	$error++;
-            	$mesg = 'Failed to get bar code type information ';
-            	setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
-            }
-            $object->barcode_type_code      = $stdobject->barcode_type_code;
-            $object->barcode_type_coder     = $stdobject->barcode_type_coder;
-            $object->barcode_type_label     = $stdobject->barcode_type_label;
+			$object->barcode_type          = GETPOST('fk_barcode_type');
+			$object->barcode = GETPOST('barcode');
+			// Set barcode_type_xxx from barcode_type id
+			$stdobject = new GenericObject($db);
+			$stdobject->element = 'product';
+			$stdobject->barcode_type = GETPOST('fk_barcode_type');
+			$result = $stdobject->fetch_barcode();
+			if ($result < 0)
+			{
+				$error++;
+				$mesg = 'Failed to get bar code type information ';
+				setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
+			}
+			$object->barcode_type_code      = $stdobject->barcode_type_code;
+			$object->barcode_type_coder     = $stdobject->barcode_type_coder;
+			$object->barcode_type_label     = $stdobject->barcode_type_label;
 
-            $object->description        	 = dol_htmlcleanlastbr(GETPOST('desc', 'none'));
-            $object->url = GETPOST('url');
-            $object->note_private          	 = dol_htmlcleanlastbr(GETPOST('note_private', 'none'));
-            $object->note               	 = $object->note_private; // deprecated
-            $object->customcode              = GETPOST('customcode', 'alphanohtml');
-            $object->country_id              = GETPOST('country_id', 'int');
-            $object->duration_value     	 = $duration_value;
-            $object->duration_unit      	 = $duration_unit;
-            $object->fk_default_warehouse	 = GETPOST('fk_default_warehouse');
-            $object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte') ?GETPOST('seuil_stock_alerte') : 0;
-            $object->desiredstock          = GETPOST('desiredstock') ?GETPOST('desiredstock') : 0;
-            $object->canvas             	 = GETPOST('canvas');
-            $object->net_measure           = GETPOST('net_measure');
-            $object->net_measure_units     = GETPOST('net_measure_units'); // This is not the fk_unit but the power of unit
-            $object->weight             	 = GETPOST('weight');
-            $object->weight_units       	 = GETPOST('weight_units'); // This is not the fk_unit but the power of unit
-            $object->length             	 = GETPOST('size');
-            $object->length_units       	 = GETPOST('size_units'); // This is not the fk_unit but the power of unit
-            $object->width = GETPOST('sizewidth');
-            $object->height             	 = GETPOST('sizeheight');
-            $object->surface            	 = GETPOST('surface');
-            $object->surface_units      	 = GETPOST('surface_units'); // This is not the fk_unit but the power of unit
-            $object->volume             	 = GETPOST('volume');
-            $object->volume_units       	 = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
-            $object->finished           	 = GETPOST('finished', 'alpha');
-            $object->fk_unit = GETPOST('units', 'alpha'); // This is the fk_unit of sale
+			$object->description        	 = dol_htmlcleanlastbr(GETPOST('desc', 'restricthtml'));
+			$object->url = GETPOST('url');
+			$object->note_private          	 = dol_htmlcleanlastbr(GETPOST('note_private', 'restricthtml'));
+			$object->note               	 = $object->note_private; // deprecated
+			$object->customcode              = GETPOST('customcode', 'alphanohtml');
+			$object->country_id = GETPOST('country_id', 'int');
+			$object->state_id = GETPOST('state_id', 'int');
+			$object->duration_value     	 = $duration_value;
+			$object->duration_unit      	 = $duration_unit;
+			$object->fk_default_warehouse	 = GETPOST('fk_default_warehouse');
+			$object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte') ?GETPOST('seuil_stock_alerte') : 0;
+			$object->desiredstock          = GETPOST('desiredstock') ?GETPOST('desiredstock') : 0;
+			$object->canvas             	 = GETPOST('canvas');
+			$object->net_measure           = GETPOST('net_measure');
+			$object->net_measure_units     = GETPOST('net_measure_units'); // This is not the fk_unit but the power of unit
+			$object->weight             	 = GETPOST('weight');
+			$object->weight_units       	 = GETPOST('weight_units'); // This is not the fk_unit but the power of unit
+			$object->length             	 = GETPOST('size');
+			$object->length_units       	 = GETPOST('size_units'); // This is not the fk_unit but the power of unit
+			$object->width = GETPOST('sizewidth');
+			$object->height             	 = GETPOST('sizeheight');
+			$object->surface            	 = GETPOST('surface');
+			$object->surface_units      	 = GETPOST('surface_units'); // This is not the fk_unit but the power of unit
+			$object->volume             	 = GETPOST('volume');
+			$object->volume_units       	 = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
+			$object->finished           	 = GETPOST('finished', 'alpha');
+			$object->fk_unit = GETPOST('units', 'alpha'); // This is the fk_unit of sale
 
-	        $accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
-	        $accountancy_code_sell_intra = GETPOST('accountancy_code_sell_intra', 'alpha');
-	        $accountancy_code_sell_export = GETPOST('accountancy_code_sell_export', 'alpha');
-	        $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
+			$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
+			$accountancy_code_sell_intra = GETPOST('accountancy_code_sell_intra', 'alpha');
+			$accountancy_code_sell_export = GETPOST('accountancy_code_sell_export', 'alpha');
+			$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
 			$accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
 			$accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 
@@ -338,34 +338,32 @@ if (empty($reshook))
 			if ($accountancy_code_buy_intra <= 0) { $object->accountancy_code_buy_intra = ''; } else { $object->accountancy_code_buy_intra = $accountancy_code_buy_intra; }
 			if ($accountancy_code_buy_export <= 0) { $object->accountancy_code_buy_export = ''; } else { $object->accountancy_code_buy_export = $accountancy_code_buy_export; }
 
-            // MultiPrix
-            if (!empty($conf->global->PRODUIT_MULTIPRICES))
-            {
-                for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
-                {
-                    if (GETPOSTISSET("price_".$i))
-                    {
-                        $object->multiprices["$i"] = price2num($_POST["price_".$i], 'MU');
-                        $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
-                    }
-                    else
-                    {
-                        $object->multiprices["$i"] = "";
-                    }
-                }
-            }
+			// MultiPrix
+			if (!empty($conf->global->PRODUIT_MULTIPRICES))
+			{
+				for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+				{
+					if (GETPOSTISSET("price_".$i))
+					{
+						$object->multiprices["$i"] = price2num($_POST["price_".$i], 'MU');
+						$object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];
+					} else {
+						$object->multiprices["$i"] = "";
+					}
+				}
+			}
 
-            // Fill array 'array_options' with data from add form
-        	$ret = $extrafields->setOptionalsFromPost(null, $object);
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
 			if ($ret < 0) $error++;
 
 			if (!$error)
 			{
-            	$id = $object->create($user);
+				$id = $object->create($user);
 			}
 
-            if ($id > 0)
-            {
+			if ($id > 0)
+			{
 				// Category association
 				$categories = GETPOST('categories', 'array');
 				$object->setCategories($categories);
@@ -376,105 +374,100 @@ if (empty($reshook))
 					if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
 					header("Location: ".$backtopage);
 					exit;
+				} else {
+					header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+					exit;
 				}
-				else
-				{
-                	header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-                	exit;
-				}
-            }
-            else
-			{
-            	if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
 				else setEventMessages($langs->trans($object->error), null, 'errors');
-                $action = "create";
-            }
-        }
-    }
+				$action = "create";
+			}
+		}
+	}
 
-    // Update a product or service
-    if ($action == 'update' && $usercancreate)
-    {
-    	if (GETPOST('cancel', 'alpha'))
-        {
-            $action = '';
-        }
-        else
-        {
-            if ($object->id > 0)
-            {
+	// Update a product or service
+	if ($action == 'update' && $usercancreate)
+	{
+		if (GETPOST('cancel', 'alpha'))
+		{
+			$action = '';
+		} else {
+			if ($object->id > 0)
+			{
 				$object->oldcopy = clone $object;
 
-                $object->ref                    = $ref;
-                $object->label                  = GETPOST('label', 'alphanohtml');
-                $object->description            = dol_htmlcleanlastbr(GETPOST('desc', 'none'));
-            	$object->url = GETPOST('url');
-    			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-    			{
-                	$object->note_private = dol_htmlcleanlastbr(GETPOST('note_private', 'none'));
-                    $object->note = $object->note_private;
-    			}
-                $object->customcode             = GETPOST('customcode', 'alpha');
-                $object->country_id             = GETPOST('country_id', 'int');
-                $object->status                 = GETPOST('statut', 'int');
-                $object->status_buy             = GETPOST('statut_buy', 'int');
-                $object->status_batch = GETPOST('status_batch', 'aZ09');
-                // removed from update view so GETPOST always empty
-                $object->fk_default_warehouse   = GETPOST('fk_default_warehouse');
-                /*
+				$object->ref                    = $ref;
+				$object->label                  = GETPOST('label', 'alphanohtml');
+				$object->description            = dol_htmlcleanlastbr(GETPOST('desc', 'restricthtml'));
+				$object->url = GETPOST('url');
+				if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+				{
+					$object->note_private = dol_htmlcleanlastbr(GETPOST('note_private', 'restricthtml'));
+					$object->note = $object->note_private;
+				}
+				$object->customcode             = GETPOST('customcode', 'alpha');
+				$object->country_id = GETPOST('country_id', 'int');
+				$object->state_id = GETPOST('state_id', 'int');
+				$object->status                 = GETPOST('statut', 'int');
+				$object->status_buy             = GETPOST('statut_buy', 'int');
+				$object->status_batch = GETPOST('status_batch', 'aZ09');
+				// removed from update view so GETPOST always empty
+				$object->fk_default_warehouse   = GETPOST('fk_default_warehouse');
+				/*
                 $object->seuil_stock_alerte     = GETPOST('seuil_stock_alerte');
                 $object->desiredstock           = GETPOST('desiredstock');
                 */
-                $object->duration_value         = GETPOST('duration_value', 'int');
-                $object->duration_unit          = GETPOST('duration_unit', 'alpha');
+				$object->duration_value         = GETPOST('duration_value', 'int');
+				$object->duration_unit          = GETPOST('duration_unit', 'alpha');
 
-                $object->canvas                 = GETPOST('canvas');
-                $object->net_measure            = GETPOST('net_measure');
-                $object->net_measure_units      = GETPOST('net_measure_units'); // This is not the fk_unit but the power of unit
-                $object->weight                 = GETPOST('weight');
-                $object->weight_units           = GETPOST('weight_units'); // This is not the fk_unit but the power of unit
-                $object->length                 = GETPOST('size');
-                $object->length_units           = GETPOST('size_units'); // This is not the fk_unit but the power of unit
-                $object->width = GETPOST('sizewidth');
-                $object->height = GETPOST('sizeheight');
+				$object->canvas                 = GETPOST('canvas');
+				$object->net_measure            = GETPOST('net_measure');
+				$object->net_measure_units      = GETPOST('net_measure_units'); // This is not the fk_unit but the power of unit
+				$object->weight                 = GETPOST('weight');
+				$object->weight_units           = GETPOST('weight_units'); // This is not the fk_unit but the power of unit
+				$object->length                 = GETPOST('size');
+				$object->length_units           = GETPOST('size_units'); // This is not the fk_unit but the power of unit
+				$object->width = GETPOST('sizewidth');
+				$object->height = GETPOST('sizeheight');
 
-                $object->surface                = GETPOST('surface');
-                $object->surface_units          = GETPOST('surface_units'); // This is not the fk_unit but the power of unit
-                $object->volume                 = GETPOST('volume');
-                $object->volume_units           = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
-                $object->finished               = GETPOST('finished', 'alpha');
+				$object->surface                = GETPOST('surface');
+				$object->surface_units          = GETPOST('surface_units'); // This is not the fk_unit but the power of unit
+				$object->volume                 = GETPOST('volume');
+				$object->volume_units           = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
+				$object->finished               = GETPOST('finished', 'alpha');
 
-	            $units = GETPOST('units', 'int');
+				$units = GETPOST('units', 'int');
 
-	            if ($units > 0) {
-		            $object->fk_unit = $units;
-	            } else {
-		            $object->fk_unit = null;
-	            }
+				if ($units > 0) {
+					$object->fk_unit = $units;
+				} else {
+					$object->fk_unit = null;
+				}
 
-	            $object->barcode_type = GETPOST('fk_barcode_type');
-    	        $object->barcode = GETPOST('barcode');
-    	        // Set barcode_type_xxx from barcode_type id
-    	        $stdobject = new GenericObject($db);
-    	        $stdobject->element = 'product';
-    	        $stdobject->barcode_type = GETPOST('fk_barcode_type');
-    	        $result = $stdobject->fetch_barcode();
-    	        if ($result < 0)
-    	        {
-    	        	$error++;
-    	        	$mesg = 'Failed to get bar code type information ';
-            		setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
-    	        }
-    	        $object->barcode_type_code      = $stdobject->barcode_type_code;
-    	        $object->barcode_type_coder     = $stdobject->barcode_type_coder;
-    	        $object->barcode_type_label     = $stdobject->barcode_type_label;
+				$object->barcode_type = GETPOST('fk_barcode_type');
+				$object->barcode = GETPOST('barcode');
+				// Set barcode_type_xxx from barcode_type id
+				$stdobject = new GenericObject($db);
+				$stdobject->element = 'product';
+				$stdobject->barcode_type = GETPOST('fk_barcode_type');
+				$result = $stdobject->fetch_barcode();
+				if ($result < 0)
+				{
+					$error++;
+					$mesg = 'Failed to get bar code type information ';
+					setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');
+				}
+				$object->barcode_type_code      = $stdobject->barcode_type_code;
+				$object->barcode_type_coder     = $stdobject->barcode_type_coder;
+				$object->barcode_type_label     = $stdobject->barcode_type_label;
 
-    	        $accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
-    	        $accountancy_code_sell_intra = GETPOST('accountancy_code_sell_intra', 'alpha');
-    	        $accountancy_code_sell_export = GETPOST('accountancy_code_sell_export', 'alpha');
-    	        $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
-    	        $accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
-    	        $accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
+				$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
+				$accountancy_code_sell_intra = GETPOST('accountancy_code_sell_intra', 'alpha');
+				$accountancy_code_sell_export = GETPOST('accountancy_code_sell_export', 'alpha');
+				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
+				$accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
+				$accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
 
 				if ($accountancy_code_sell <= 0) { $object->accountancy_code_sell = ''; } else { $object->accountancy_code_sell = $accountancy_code_sell; }
 				if ($accountancy_code_sell_intra <= 0) { $object->accountancy_code_sell_intra = ''; } else { $object->accountancy_code_sell_intra = $accountancy_code_sell_intra; }
@@ -483,407 +476,382 @@ if (empty($reshook))
 				if ($accountancy_code_buy_intra <= 0) { $object->accountancy_code_buy_intra = ''; } else { $object->accountancy_code_buy_intra = $accountancy_code_buy_intra; }
 				if ($accountancy_code_buy_export <= 0) { $object->accountancy_code_buy_export = ''; } else { $object->accountancy_code_buy_export = $accountancy_code_buy_export; }
 
-                // Fill array 'array_options' with data from add form
-        		$ret = $extrafields->setOptionalsFromPost(null, $object);
+				// Fill array 'array_options' with data from add form
+				$ret = $extrafields->setOptionalsFromPost(null, $object);
 				if ($ret < 0) $error++;
 
-                if (!$error && $object->check())
-                {
-                    if ($object->update($object->id, $user) > 0)
-                    {
+				if (!$error && $object->check())
+				{
+					if ($object->update($object->id, $user) > 0)
+					{
 						// Category association
 						$categories = GETPOST('categories', 'array');
 						$object->setCategories($categories);
 
-                        $action = 'view';
-                    }
-                    else
-					{
+						$action = 'view';
+					} else {
 						if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
-                    	else setEventMessages($langs->trans($object->error), null, 'errors');
-                        $action = 'edit';
-                    }
-                }
-                else
-				{
+						else setEventMessages($langs->trans($object->error), null, 'errors');
+						$action = 'edit';
+					}
+				} else {
 					if (count($object->errors)) setEventMessages($object->error, $object->errors, 'errors');
-                	else setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
-                    $action = 'edit';
-                }
-            }
-        }
-    }
+					else setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
+					$action = 'edit';
+				}
+			}
+		}
+	}
 
-    // Action clone object
-    if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
-    if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate)
-    {
-        if (!GETPOST('clone_content') && !GETPOST('clone_prices'))
-        {
-        	setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-        }
-        else
-        {
-            $db->begin();
+	// Action clone object
+	if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate)
+	{
+		if (!GETPOST('clone_content') && !GETPOST('clone_prices'))
+		{
+			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+		} else {
+			$db->begin();
 
-            $originalId = $id;
-            if ($object->id > 0)
-            {
-                $object->ref = GETPOST('clone_ref', 'alphanohtml');
-                $object->status = 0;
-                $object->status_buy = 0;
-                $object->id = null;
-                $object->barcode = -1;
+			$originalId = $id;
+			if ($object->id > 0)
+			{
+				$object->ref = GETPOST('clone_ref', 'alphanohtml');
+				$object->status = 0;
+				$object->status_buy = 0;
+				$object->id = null;
+				$object->barcode = -1;
 
-                if ($object->check())
-                {
-                	$object->context['createfromclone'] = 'createfromclone';
-                	$id = $object->create($user);
-                    if ($id > 0)
-                    {
-                        if (GETPOST('clone_composition'))
-                        {
-                            $result = $object->clone_associations($originalId, $id);
+				if ($object->check())
+				{
+					$object->context['createfromclone'] = 'createfromclone';
+					$id = $object->create($user);
+					if ($id > 0)
+					{
+						if (GETPOST('clone_composition'))
+						{
+							$result = $object->clone_associations($originalId, $id);
 
-                            if ($result < 1)
-                            {
-                                $db->rollback();
-                                setEventMessages($langs->trans('ErrorProductClone'), null, 'errors');
-                                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$originalId);
-                                exit;
-                            }
-                        }
+							if ($result < 1)
+							{
+								$db->rollback();
+								setEventMessages($langs->trans('ErrorProductClone'), null, 'errors');
+								header("Location: ".$_SERVER["PHP_SELF"]."?id=".$originalId);
+								exit;
+							}
+						}
 
-                        if (GETPOST('clone_categories'))
-                        {
-                            $result = $object->cloneCategories($originalId, $id);
+						if (GETPOST('clone_categories'))
+						{
+							$result = $object->cloneCategories($originalId, $id);
 
-                            if ($result < 1)
-                            {
-                                $db->rollback();
-                                setEventMessages($langs->trans('ErrorProductClone'), null, 'errors');
-                                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$originalId);
-                                exit;
-                            }
-                        }
+							if ($result < 1)
+							{
+								$db->rollback();
+								setEventMessages($langs->trans('ErrorProductClone'), null, 'errors');
+								header("Location: ".$_SERVER["PHP_SELF"]."?id=".$originalId);
+								exit;
+							}
+						}
 
-                        if (GETPOST('clone_prices')) {
-                            $result = $object->clone_price($originalId, $id);
+						if (GETPOST('clone_prices')) {
+							$result = $object->clone_price($originalId, $id);
 
-                            if ($result < 1) {
-                                $db->rollback();
-                                setEventMessages($langs->trans('ErrorProductClone'), null, 'errors');
-                                header('Location: '.$_SERVER['PHP_SELF'].'?id='.$originalId);
-                                exit();
-                            }
-                        }
+							if ($result < 1) {
+								$db->rollback();
+								setEventMessages($langs->trans('ErrorProductClone'), null, 'errors');
+								header('Location: '.$_SERVER['PHP_SELF'].'?id='.$originalId);
+								exit();
+							}
+						}
 
-                        // $object->clone_fournisseurs($originalId, $id);
+						// $object->clone_fournisseurs($originalId, $id);
 
-                        $db->commit();
-                        $db->close();
+						$db->commit();
+						$db->close();
 
-                        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-                        exit;
-                    }
-                    else
-                    {
-                        $id = $originalId;
+						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+						exit;
+					} else {
+						$id = $originalId;
 
-                        if ($object->error == 'ErrorProductAlreadyExists')
-                        {
-                            $db->rollback();
+						if ($object->error == 'ErrorProductAlreadyExists')
+						{
+							$db->rollback();
 
-                            $refalreadyexists++;
-                            $action = "";
+							$refalreadyexists++;
+							$action = "";
 
-                            $mesg = $langs->trans("ErrorProductAlreadyExists", $object->ref);
-                            $mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
-                            setEventMessages($mesg, null, 'errors');
-                            $object->fetch($id);
-                        }
-                        else
-                     	{
-                            $db->rollback();
-                            if (count($object->errors))
-                            {
-                            	setEventMessages($object->error, $object->errors, 'errors');
-                            	dol_print_error($db, $object->errors);
-                            }
-                            else
-                            {
-                            	setEventMessages($langs->trans($object->error), null, 'errors');
-                            	dol_print_error($db, $object->error);
-                            }
-                        }
-                    }
+							$mesg = $langs->trans("ErrorProductAlreadyExists", $object->ref);
+							$mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
+							setEventMessages($mesg, null, 'errors');
+							$object->fetch($id);
+						} else {
+							$db->rollback();
+							if (count($object->errors))
+							{
+								setEventMessages($object->error, $object->errors, 'errors');
+								dol_print_error($db, $object->errors);
+							} else {
+								setEventMessages($langs->trans($object->error), null, 'errors');
+								dol_print_error($db, $object->error);
+							}
+						}
+					}
 
-                    unset($object->context['createfromclone']);
-                }
-            }
-            else
-            {
-                $db->rollback();
-                dol_print_error($db, $object->error);
-            }
-        }
-    }
+					unset($object->context['createfromclone']);
+				}
+			} else {
+				$db->rollback();
+				dol_print_error($db, $object->error);
+			}
+		}
+	}
 
-    // Delete a product
-    if ($action == 'confirm_delete' && $confirm != 'yes') { $action = ''; }
-    if ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
+	// Delete a product
+	if ($action == 'confirm_delete' && $confirm != 'yes') { $action = ''; }
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
 	{
 		$result = $object->delete($user);
 
-        if ($result > 0)
-        {
-            header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));
-            exit;
-        }
-        else
-        {
-        	setEventMessages($langs->trans($object->error), null, 'errors');
-            $reload = 0;
-            $action = '';
-        }
-    }
+		if ($result > 0)
+		{
+			header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));
+			exit;
+		} else {
+			setEventMessages($langs->trans($object->error), null, 'errors');
+			$reload = 0;
+			$action = '';
+		}
+	}
 
 
-    // Add product into object
-    if ($object->id > 0 && $action == 'addin')
-    {
-        $thirpdartyid = 0;
-        if (GETPOST('propalid') > 0)
-        {
-        	$propal = new Propal($db);
-	        $result = $propal->fetch(GETPOST('propalid'));
-	        if ($result <= 0)
-	        {
-	            dol_print_error($db, $propal->error);
-	            exit;
-	        }
-	        $thirpdartyid = $propal->socid;
-        }
-        elseif (GETPOST('commandeid') > 0)
-        {
-            $commande = new Commande($db);
-	        $result = $commande->fetch(GETPOST('commandeid'));
-	        if ($result <= 0)
-	        {
-	            dol_print_error($db, $commande->error);
-	            exit;
-	        }
-	        $thirpdartyid = $commande->socid;
-        }
-        elseif (GETPOST('factureid') > 0)
-        {
-    	    $facture = new Facture($db);
-	        $result = $facture->fetch(GETPOST('factureid'));
-	        if ($result <= 0)
-	        {
-	            dol_print_error($db, $facture->error);
-	            exit;
-	        }
-	        $thirpdartyid = $facture->socid;
-        }
+	// Add product into object
+	if ($object->id > 0 && $action == 'addin')
+	{
+		$thirpdartyid = 0;
+		if (GETPOST('propalid') > 0)
+		{
+			$propal = new Propal($db);
+			$result = $propal->fetch(GETPOST('propalid'));
+			if ($result <= 0)
+			{
+				dol_print_error($db, $propal->error);
+				exit;
+			}
+			$thirpdartyid = $propal->socid;
+		} elseif (GETPOST('commandeid') > 0)
+		{
+			$commande = new Commande($db);
+			$result = $commande->fetch(GETPOST('commandeid'));
+			if ($result <= 0)
+			{
+				dol_print_error($db, $commande->error);
+				exit;
+			}
+			$thirpdartyid = $commande->socid;
+		} elseif (GETPOST('factureid') > 0)
+		{
+			$facture = new Facture($db);
+			$result = $facture->fetch(GETPOST('factureid'));
+			if ($result <= 0)
+			{
+				dol_print_error($db, $facture->error);
+				exit;
+			}
+			$thirpdartyid = $facture->socid;
+		}
 
-        if ($thirpdartyid > 0) {
-            $soc = new Societe($db);
-            $result = $soc->fetch($thirpdartyid);
-            if ($result <= 0) {
-                dol_print_error($db, $soc->error);
-                exit;
-            }
+		if ($thirpdartyid > 0) {
+			$soc = new Societe($db);
+			$result = $soc->fetch($thirpdartyid);
+			if ($result <= 0) {
+				dol_print_error($db, $soc->error);
+				exit;
+			}
 
-            $desc = $object->description;
+			$desc = $object->description;
 
-            $tva_tx = get_default_tva($mysoc, $soc, $object->id);
-            $tva_npr = get_default_npr($mysoc, $soc, $object->id);
-            if (empty($tva_tx)) $tva_npr = 0;
-            $localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);
-            $localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);
+			$tva_tx = get_default_tva($mysoc, $soc, $object->id);
+			$tva_npr = get_default_npr($mysoc, $soc, $object->id);
+			if (empty($tva_tx)) $tva_npr = 0;
+			$localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);
 
-            $pu_ht = $object->price;
-            $pu_ttc = $object->price_ttc;
-            $price_base_type = $object->price_base_type;
+			$pu_ht = $object->price;
+			$pu_ttc = $object->price_ttc;
+			$price_base_type = $object->price_base_type;
 
-            // If multiprice
-            if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level) {
-                $pu_ht = $object->multiprices[$soc->price_level];
-                $pu_ttc = $object->multiprices_ttc[$soc->price_level];
-                $price_base_type = $object->multiprices_base_type[$soc->price_level];
-            } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-                require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
+			// If multiprice
+			if ($conf->global->PRODUIT_MULTIPRICES && $soc->price_level) {
+				$pu_ht = $object->multiprices[$soc->price_level];
+				$pu_ttc = $object->multiprices_ttc[$soc->price_level];
+				$price_base_type = $object->multiprices_base_type[$soc->price_level];
+			} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+				require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
-                $prodcustprice = new Productcustomerprice($db);
+				$prodcustprice = new Productcustomerprice($db);
 
-                $filter = array('t.fk_product' => $object->id, 't.fk_soc' => $soc->id);
+				$filter = array('t.fk_product' => $object->id, 't.fk_soc' => $soc->id);
 
-                $result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-                if ($result) {
-                    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;
-                    }
-                }
-            }
+				$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+				if ($result) {
+					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;
+					}
+				}
+			}
 
 			$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 			$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
-            // 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).
-            if ($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');
-                }
-            }
+			// 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).
+			if ($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 (GETPOST('propalid') > 0) {
-                // Define cost price for margin calculation
-                $buyprice = 0;
-                if (($result = $propal->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
-                {
-                    dol_syslog($langs->trans('FailedToGetCostPrice'));
-                    setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
-                }
-                else
-                {
-                    $buyprice = $result;
-                }
+			if (GETPOST('propalid') > 0) {
+				// Define cost price for margin calculation
+				$buyprice = 0;
+				if (($result = $propal->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
+				{
+					dol_syslog($langs->trans('FailedToGetCostPrice'));
+					setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
+				} else {
+					$buyprice = $result;
+				}
 
-                $result = $propal->addline(
-                    $desc,
-                    $pu_ht,
-                    GETPOST('qty'),
-                    $tva_tx,
-                    $localtax1_tx, // localtax1
-                    $localtax2_tx, // localtax2
-                    $object->id,
-                    GETPOST('remise_percent'),
-                    $price_base_type,
-                    $pu_ttc,
-                    0,
-                    0,
-                    -1,
-                    0,
-                    0,
-                    0,
-                    $buyprice,
-                    '',
-                    '',
-                    '',
-                    0,
-                    $object->fk_unit
-                );
-                if ($result > 0) {
-                    header("Location: ".DOL_URL_ROOT."/comm/propal/card.php?id=".$propal->id);
-                    return;
-                }
+				$result = $propal->addline(
+					$desc,
+					$pu_ht,
+					GETPOST('qty'),
+					$tva_tx,
+					$localtax1_tx, // localtax1
+					$localtax2_tx, // localtax2
+					$object->id,
+					GETPOST('remise_percent'),
+					$price_base_type,
+					$pu_ttc,
+					0,
+					0,
+					-1,
+					0,
+					0,
+					0,
+					$buyprice,
+					'',
+					'',
+					'',
+					0,
+					$object->fk_unit
+				);
+				if ($result > 0) {
+					header("Location: ".DOL_URL_ROOT."/comm/propal/card.php?id=".$propal->id);
+					return;
+				}
 
-                setEventMessages($langs->trans("ErrorUnknown").": $result", null, 'errors');
-            } elseif (GETPOST('commandeid') > 0) {
-                // Define cost price for margin calculation
-                $buyprice = 0;
-                if (($result = $commande->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
-                {
-                    dol_syslog($langs->trans('FailedToGetCostPrice'));
-                    setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
-                }
-                else
-                {
-                    $buyprice = $result;
-                }
+				setEventMessages($langs->trans("ErrorUnknown").": $result", null, 'errors');
+			} elseif (GETPOST('commandeid') > 0) {
+				// Define cost price for margin calculation
+				$buyprice = 0;
+				if (($result = $commande->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
+				{
+					dol_syslog($langs->trans('FailedToGetCostPrice'));
+					setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
+				} else {
+					$buyprice = $result;
+				}
 
-                $result = $commande->addline(
-                    $desc,
-                    $pu_ht,
-                    GETPOST('qty'),
-                    $tva_tx,
-                    $localtax1_tx, // localtax1
-                    $localtax2_tx, // localtax2
-                    $object->id,
-                    GETPOST('remise_percent'),
-                    '',
-                    '',
-                    $price_base_type,
-                    $pu_ttc,
-                    '',
-                    '',
-                    0,
-                    -1,
-                    0,
-                    0,
-                    null,
-                    $buyprice,
-                    '',
-                    0,
-                    $object->fk_unit
-                );
+				$result = $commande->addline(
+					$desc,
+					$pu_ht,
+					GETPOST('qty'),
+					$tva_tx,
+					$localtax1_tx, // localtax1
+					$localtax2_tx, // localtax2
+					$object->id,
+					GETPOST('remise_percent'),
+					'',
+					'',
+					$price_base_type,
+					$pu_ttc,
+					'',
+					'',
+					0,
+					-1,
+					0,
+					0,
+					null,
+					$buyprice,
+					'',
+					0,
+					$object->fk_unit
+				);
 
-                if ($result > 0) {
-                    header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".$commande->id);
-                    exit;
-                }
-            } elseif (GETPOST('factureid') > 0) {
-                // Define cost price for margin calculation
-                $buyprice = 0;
-                if (($result = $facture->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
-                {
-                    dol_syslog($langs->trans('FailedToGetCostPrice'));
-                    setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
-                }
-                else
-                {
-                    $buyprice = $result;
-                }
+				if ($result > 0) {
+					header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".$commande->id);
+					exit;
+				}
+			} elseif (GETPOST('factureid') > 0) {
+				// Define cost price for margin calculation
+				$buyprice = 0;
+				if (($result = $facture->defineBuyPrice($pu_ht, GETPOST('remise_percent'), $object->id)) < 0)
+				{
+					dol_syslog($langs->trans('FailedToGetCostPrice'));
+					setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
+				} else {
+					$buyprice = $result;
+				}
 
-                $result = $facture->addline(
-                    $desc,
-                    $pu_ht,
-                    GETPOST('qty'),
-                    $tva_tx,
-                    $localtax1_tx,
-                    $localtax2_tx,
-                    $object->id,
-                    GETPOST('remise_percent'),
-                    '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    $price_base_type,
-                    $pu_ttc,
-                    Facture::TYPE_STANDARD,
-                    -1,
-                    0,
-                    '',
-                    0,
-                    0,
-                    null,
-                    $buyprice,
-                    '',
-                    0,
-                    100,
-                    '',
-                    $object->fk_unit
-                );
+				$result = $facture->addline(
+					$desc,
+					$pu_ht,
+					GETPOST('qty'),
+					$tva_tx,
+					$localtax1_tx,
+					$localtax2_tx,
+					$object->id,
+					GETPOST('remise_percent'),
+					'',
+					'',
+					'',
+					'',
+					'',
+					$price_base_type,
+					$pu_ttc,
+					Facture::TYPE_STANDARD,
+					-1,
+					0,
+					'',
+					0,
+					0,
+					null,
+					$buyprice,
+					'',
+					0,
+					100,
+					'',
+					$object->fk_unit
+				);
 
-                if ($result > 0) {
-                    header("Location: ".DOL_URL_ROOT."/compta/facture/card.php?facid=".$facture->id);
-                    exit;
-                }
-            }
-        }
-        else {
-            $action = "";
-            setEventMessages($langs->trans("WarningSelectOneDocument"), null, 'warnings');
-        }
-    }
+				if ($result > 0) {
+					header("Location: ".DOL_URL_ROOT."/compta/facture/card.php?facid=".$facture->id);
+					exit;
+				}
+			}
+		} else {
+			$action = "";
+			setEventMessages($langs->trans("WarningSelectOneDocument"), null, 'warnings');
+		}
+	}
 }
 
 
@@ -911,6 +879,7 @@ llxHeader('', $title, $helpurl);
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
+$formcompany = new FormCompany($db);
 if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 // Load object modBarCodeProduct
@@ -944,35 +913,42 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	}
 	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
 	$objcanvas->display_canvas($action); // Show template
-}
-else
-{
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
+} else {
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
 	if ($action == 'create' && $usercancreate)
-    {
-        //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 '<script type="text/javascript">';
+				print '$(document).ready(function () {
+                        $("#selectcountry_id").change(function() {
+                        	document.formprod.action.value="create";
+                        	document.formprod.submit();
+                        });
+                     });';
+				print '</script>'."\n";
 
 		// Load object modCodeProduct
-        $module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
-        if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module) - 4);
-        }
-        $result = dol_include_once('/core/modules/product/'.$module.'.php');
-        if ($result > 0)
-        {
-        	$modCodeProduct = new $module();
-        }
+		$module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
+		if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module) - 4);
+		}
+		$result = dol_include_once('/core/modules/product/'.$module.'.php');
+		if ($result > 0)
+		{
+			$modCodeProduct = new $module();
+		}
 
-        dol_set_focus('input[name="ref"]');
+		dol_set_focus('input[name="ref"]');
 
-        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="type" value="'.$type.'">'."\n";
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formprod">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="add">';
+		print '<input type="hidden" name="type" value="'.$type.'">'."\n";
 		if (!empty($modCodeProduct->code_auto))
 			print '<input type="hidden" name="code_auto" value="1">';
 		if (!empty($modBarCodeProduct->code_auto))
@@ -982,44 +958,52 @@ else
 		if ($type == 1) {
 			$picto = 'service';
 			$title = $langs->trans("NewService");
-		}
-		else {
+		} else {
 			$picto = 'product';
 			$title = $langs->trans("NewProduct");
 		}
-        $linkback = "";
-        print load_fiche_titre($title, $linkback, $picto);
+		$linkback = "";
+		print load_fiche_titre($title, $linkback, $picto);
 
-        dol_fiche_head('');
+		// We set country_id, country_code and country for the selected country
+		$object->country_id = GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : null;
+		if ($object->country_id > 0)
+		{
+			$tmparray = getCountry($object->country_id, 'all');
+			$object->country_code = $tmparray['code'];
+			$object->country = $tmparray['label'];
+		}
 
-        print '<table class="border centpercent">';
+		dol_fiche_head('');
 
-        print '<tr>';
-        $tmpcode = '';
+		print '<table class="border centpercent">';
+
+		print '<tr>';
+		$tmpcode = '';
 		if (!empty($modCodeProduct->code_auto)) $tmpcode = $modCodeProduct->getNextValue($object, $type);
 		print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOSTISSET('ref') ? GETPOST('ref', 'alphanohtml') : $tmpcode).'">';
-        if ($refalreadyexists)
-        {
-            print $langs->trans("RefAlreadyExists");
-        }
-        print '</td></tr>';
+		if ($refalreadyexists)
+		{
+			print $langs->trans("RefAlreadyExists");
+		}
+		print '</td></tr>';
 
-        // Label
-        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', 'alphanohtml')).'"></td></tr>';
+		// Label
+		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label', 'alphanohtml')).'"></td></tr>';
 
-        // On sell
-        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-        $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
-        print $form->selectarray('statut', $statutarray, GETPOST('statut'));
-        print '</td></tr>';
+		// On sell
+		print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
+		$statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));
+		print $form->selectarray('statut', $statutarray, GETPOST('statut'));
+		print '</td></tr>';
 
-        // To buy
-        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-        $statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
-        print $form->selectarray('statut_buy', $statutarray, GETPOST('statut_buy'));
-        print '</td></tr>';
+		// To buy
+		print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
+		$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
+		print $form->selectarray('statut_buy', $statutarray, GETPOST('statut_buy'));
+		print '</td></tr>';
 
-	    // Batch number management
+		// Batch number management
 		if (!empty($conf->productbatch->enabled))
 		{
 			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';
@@ -1028,174 +1012,187 @@ else
 			print '</td></tr>';
 		}
 
-        $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
-        if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
+		$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+		if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
-        if ($showbarcode)
-        {
- 	        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
- 	        if (isset($_POST['fk_barcode_type']))
-	        {
-	         	$fk_barcode_type = GETPOST('fk_barcode_type');
-	        }
-	        else
-	        {
-	        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-	        }
-	        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
-            $formbarcode = new FormBarCode($db);
-            print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);
-	        print '</td>';
-	        if ($conf->browser->layout == 'phone') print '</tr><tr>';
-	        print '<td>'.$langs->trans("BarcodeValue").'</td><td>';
-	        $tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode;
-	        if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
-	        print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
-	        print '</td></tr>';
-        }
+		if ($showbarcode)
+		{
+ 			print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
+ 			if (isset($_POST['fk_barcode_type']))
+			{
+			 	$fk_barcode_type = GETPOST('fk_barcode_type');
+			} else {
+				if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+			}
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
+			$formbarcode = new FormBarCode($db);
+			print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			print '<td>'.$langs->trans("BarcodeValue").'</td><td>';
+			$tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode;
+			if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+			print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
+			print '</td></tr>';
+		}
 
-        // Description (used in invoice, propal...)
-        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+		// Description (used in invoice, propal...)
+		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
 
-        $doleditor = new DolEditor('desc', GETPOST('desc', 'none'), '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
-        $doleditor->Create();
+		$doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+		$doleditor->Create();
 
-        print "</td></tr>";
+		print "</td></tr>";
 
-        // Public URL
-        print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+		// Public URL
+		print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
 		print '<input type="text" name="url" class="quatrevingtpercent" value="'.GETPOST('url').'">';
-        print '</td></tr>';
+		print '</td></tr>';
 
-        if ($type != 1 && !empty($conf->stock->enabled))
-        {
-            // Default warehouse
-            print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
-            print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse'), 'fk_default_warehouse', 'warehouseopen', 1);
-            print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'">';
-            print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span>';
-            print '</a>';
-            print '</td>';
-            print '</tr>';
+		if ($type != 1 && !empty($conf->stock->enabled))
+		{
+			// Default warehouse
+			print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
+			print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse'), 'fk_default_warehouse', 'warehouseopen', 1);
+			print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'">';
+			print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span>';
+			print '</a>';
+			print '</td>';
+			print '</tr>';
 
-            // Stock min level
-            print '<tr><td>'.$form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1).'</td><td>';
-            print '<input name="seuil_stock_alerte" class="maxwidth50" value="'.GETPOST('seuil_stock_alerte').'">';
-            print '</td>';
-            if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            // Stock desired level
-            print '<td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
-            print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
-            print '</td></tr>';
-        }
-        else
-        {
-            print '<input name="seuil_stock_alerte" type="hidden" value="0">';
-            print '<input name="desiredstock" type="hidden" value="0">';
-        }
+			// Stock min level
+			print '<tr><td>'.$form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1).'</td><td>';
+			print '<input name="seuil_stock_alerte" class="maxwidth50" value="'.GETPOST('seuil_stock_alerte').'">';
+			print '</td>';
+			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			// Stock desired level
+			print '<td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';
+			print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';
+			print '</td></tr>';
+		} else {
+			print '<input name="seuil_stock_alerte" type="hidden" value="0">';
+			print '<input name="desiredstock" type="hidden" value="0">';
+		}
 
-        // Duration
-        if ($type == 1)
-        {
-            print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
-            print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
-            print $formproduct->selectMeasuringUnits("duration_unit", "time", GETPOST('duration_value', 'alpha'), 0, 1);
-            print '</td></tr>';
-        }
+		// Duration
+		if ($type == 1)
+		{
+			print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
+			print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
+			print $formproduct->selectMeasuringUnits("duration_unit", "time", GETPOST('duration_value', 'alpha'), 0, 1);
+			print '</td></tr>';
+		}
 
-        if ($type != 1)	// Nature, Weight and volume only applies to products and not to services
-        {
-            // Nature
-            print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
-            $statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-            print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
-            print '</td></tr>';
+		if ($type != 1)	// Nature, Weight and volume only applies to products and not to services
+		{
+			// Nature
+			print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="3">';
+			$statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+			print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
+			print '</td></tr>';
 
-            // Brut Weight
-            print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
-            print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
-            print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ?GETPOST('weight_units', 'alpha') : (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
-            print '</td></tr>';
+			// Brut Weight
+			print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
+			print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
+			print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ?GETPOST('weight_units', 'alpha') : (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
+			print '</td></tr>';
 
-            // Brut Length
-            if (empty($conf->global->PRODUCT_DISABLE_SIZE))
-            {
-                print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
-                print '<input name="size" class="width50" value="'.GETPOST('size').'"> x ';
-                print '<input name="sizewidth" class="width50" value="'.GETPOST('sizewidth').'"> x ';
-                print '<input name="sizeheight" class="width50" value="'.GETPOST('sizeheight').'">';
-                print $formproduct->selectMeasuringUnits("size_units", "size", GETPOSTISSET('size_units') ?GETPOST('size_units', 'alpha') : '0', 0, 2);
-                print '</td></tr>';
-            }
-            if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
-            {
-                // Brut Surface
-                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
-                print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
-                print $formproduct->selectMeasuringUnits("surface_units", "surface", GETPOSTISSET('surface_units') ?GETPOST('surface_units', 'alpha') : '0', 0, 2);
-                print '</td></tr>';
-            }
-            if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
-            {
-                // Brut Volume
-                print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
-                print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
-                print $formproduct->selectMeasuringUnits("volume_units", "volume", GETPOSTISSET('volume_units') ?GETPOST('volume_units', 'alpha') : '0', 0, 2);
-                print '</td></tr>';
-            }
+			// Brut Length
+			if (empty($conf->global->PRODUCT_DISABLE_SIZE))
+			{
+				print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
+				print '<input name="size" class="width50" value="'.GETPOST('size').'"> x ';
+				print '<input name="sizewidth" class="width50" value="'.GETPOST('sizewidth').'"> x ';
+				print '<input name="sizeheight" class="width50" value="'.GETPOST('sizeheight').'">';
+				print $formproduct->selectMeasuringUnits("size_units", "size", GETPOSTISSET('size_units') ?GETPOST('size_units', 'alpha') : '0', 0, 2);
+				print '</td></tr>';
+			}
+			if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
+			{
+				// Brut Surface
+				print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+				print '<input name="surface" size="4" value="'.GETPOST('surface').'">';
+				print $formproduct->selectMeasuringUnits("surface_units", "surface", GETPOSTISSET('surface_units') ?GETPOST('surface_units', 'alpha') : '0', 0, 2);
+				print '</td></tr>';
+			}
+			if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
+			{
+				// Brut Volume
+				print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
+				print '<input name="volume" size="4" value="'.GETPOST('volume').'">';
+				print $formproduct->selectMeasuringUnits("volume_units", "volume", GETPOSTISSET('volume_units') ?GETPOST('volume_units', 'alpha') : '0', 0, 2);
+				print '</td></tr>';
+			}
 
-            if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE))
-            {
-	            // Net Measure
-	            print '<tr><td>'.$langs->trans("NetMeasure").'</td><td colspan="3">';
-	            print '<input name="net_measure" size="4" value="'.GETPOST('net_measure').'">';
-	            print $formproduct->selectMeasuringUnits("net_measure_units", '', GETPOSTISSET('net_measure_units') ?GETPOST('net_measure_units', 'alpha') : (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 0);
-	            print '</td></tr>';
-            }
-        }
+			if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE))
+			{
+				// Net Measure
+				print '<tr><td>'.$langs->trans("NetMeasure").'</td><td colspan="3">';
+				print '<input name="net_measure" size="4" value="'.GETPOST('net_measure').'">';
+				print $formproduct->selectMeasuringUnits("net_measure_units", '', GETPOSTISSET('net_measure_units') ?GETPOST('net_measure_units', 'alpha') : (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 0);
+				print '</td></tr>';
+			}
+		}
 
-        // Units
-	    if ($conf->global->PRODUCT_USE_UNITS)
-	    {
-		    print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
-		    print '<td colspan="3">';
-		    print $form->selectUnits('', 'units');
-		    print '</td></tr>';
-	    }
+		// Units
+		if ($conf->global->PRODUCT_USE_UNITS)
+		{
+			print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
+			print '<td colspan="3">';
+			print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, 'units');
+			print '</td></tr>';
+		}
 
-        // Custom code
-        if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO) && empty($type))
-        {
-	        print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td>';
-	        if ($conf->browser->layout == 'phone') print '</tr><tr>';
-	        // Origin country
-	        print '<td>'.$langs->trans("CountryOrigin").'</td>';
-	        print '<td>';
-	        print $form->select_country(GETPOST('country_id', 'int'), 'country_id');
-	        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-	        print '</td></tr>';
-        }
+		// Custom code
+		if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO) && empty($type))
+		{
+			print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td></tr>';
 
-        // Other attributes
-        $parameters = array('colspan' => 3, 'cols' => '3');
-        $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);
-        }
+			// Origin country
+			print '<td>'.$langs->trans("CountryOrigin").'</td>';
+			print '<td>';
+			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print '</td>';
 
-        // Note (private, no output on invoices, propales...)
-        //if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
-        //{
-            print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+			// State
+			if (empty($conf->global->PRODUCT_DISABLE_STATE))
+			{
+					if ($conf->browser->layout == 'phone') print '</tr><tr>';
+				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+				{
+					print '<td>'.$form->editfieldkey('Region-StateOrigine', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				} else {
+					print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				}
 
-            // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
-            $doleditor = new DolEditor('note_private', GETPOST('note_private', 'none'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
-    	    $doleditor->Create();
+				print $formcompany->select_state($object->state_id, $object->country_code);
+				print '</tr>';
+			}
+				print '</tr>';
+		}
 
-            print "</td></tr>";
-        //}
+		// Other attributes
+		$parameters = array('colspan' => 3, 'cols' => '3');
+		$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);
+		}
+
+		// Note (private, no output on invoices, propales...)
+		//if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode
+		//{
+			print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+
+			// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
+			$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
+			$doleditor->Create();
+
+			print "</td></tr>";
+		//}
 
 		if ($conf->categorie->enabled) {
 			// Categories
@@ -1205,64 +1202,62 @@ else
 			print "</td></tr>";
 		}
 
-        print '</table>';
+		print '</table>';
 
-        print '<hr>';
+		print '<hr>';
 
-        if (!empty($conf->global->PRODUIT_MULTIPRICES))
-        {
-            // We do no show price array on create when multiprices enabled.
-            // We must set them on prices tab.
-            print '<table class="border centpercent">';
-            // VAT
-            print '<tr><td class="titlefieldcreate">'.$langs->trans("VATRate").'</td><td>';
-            $defaultva = get_default_tva($mysoc, $mysoc);
-            print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
-            print '</td></tr>';
-            print '</table>';
-
-            print '<br>';
-        }
-        else
+		if (!empty($conf->global->PRODUIT_MULTIPRICES))
 		{
-            print '<table class="border centpercent">';
+			// We do no show price array on create when multiprices enabled.
+			// We must set them on prices tab.
+			print '<table class="border centpercent">';
+			// VAT
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("VATRate").'</td><td>';
+			$defaultva = get_default_tva($mysoc, $mysoc);
+			print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
+			print '</td></tr>';
+			print '</table>';
 
-            // Price
-            print '<tr><td class="titlefieldcreate">'.$langs->trans("SellingPrice").'</td>';
-            print '<td><input name="price" class="maxwidth50" value="'.$object->price.'">';
-            print $form->selectPriceBaseType($object->price_base_type, "price_base_type");
-            print '</td></tr>';
+			print '<br>';
+		} else {
+			print '<table class="border centpercent">';
 
-            // Min price
-            print '<tr><td>'.$langs->trans("MinPrice").'</td>';
-            print '<td><input name="price_min" class="maxwidth50" value="'.$object->price_min.'">';
-            print '</td></tr>';
+			// Price
+			print '<tr><td class="titlefieldcreate">'.$langs->trans("SellingPrice").'</td>';
+			print '<td><input name="price" class="maxwidth50" value="'.$object->price.'">';
+			print $form->selectPriceBaseType($conf->global->PRODUCT_PRICE_BASE_TYPE, "price_base_type");
+			print '</td></tr>';
 
-            // VAT
-            print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
-            $defaultva = get_default_tva($mysoc, $mysoc);
-            print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
-            print '</td></tr>';
+			// Min price
+			print '<tr><td>'.$langs->trans("MinPrice").'</td>';
+			print '<td><input name="price_min" class="maxwidth50" value="'.$object->price_min.'">';
+			print '</td></tr>';
 
-            print '</table>';
+			// VAT
+			print '<tr><td>'.$langs->trans("VATRate").'</td><td>';
+			$defaultva = get_default_tva($mysoc, $mysoc);
+			print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
+			print '</td></tr>';
 
-            print '<br>';
-        }
+			print '</table>';
 
-        // Accountancy codes
-        print '<table class="border centpercent">';
+			print '<br>';
+		}
+
+		// Accountancy codes
+		print '<table class="border centpercent">';
 
 		if (!empty($conf->accounting->enabled))
 		{
 			// Accountancy_code_sell
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 			print '<td>';
-            if ($type == 0) {
-                $accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT);
-            } else {
-                $accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT);
-            }
-            print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, '');
+			if ($type == 0) {
+				$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT);
+			} else {
+				$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT);
+			}
+			print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, '');
 			print '</td></tr>';
 
 			// Accountancy_code_sell_intra
@@ -1270,36 +1265,36 @@ else
 			{
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
 				print '<td>';
-                if ($type == 0) {
-                    $accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT);
-                } else {
-                	$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT);
-                }
-                print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, '');
-                print '</td></tr>';
+				if ($type == 0) {
+					$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT);
+				} else {
+					$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT);
+				}
+				print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, '');
+				print '</td></tr>';
 			}
 
 			// Accountancy_code_sell_export
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
 			print '<td>';
-            if ($type == 0)
-            {
-                $accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT);
-            } else {
-            	$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT);
-            }
-            print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, '');
-            print '</td></tr>';
+			if ($type == 0)
+			{
+				$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT);
+			} else {
+				$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT);
+			}
+			print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, '');
+			print '</td></tr>';
 
 			// Accountancy_code_buy
 			print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
 			print '<td>';
-            if ($type == 0)
-            {
-                $accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT);
-            } else {
-                $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
-            }
+			if ($type == 0)
+			{
+				$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT);
+			} else {
+				$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
+			}
 			print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, '');
 			print '</td></tr>';
 
@@ -1328,8 +1323,7 @@ else
 			}
 			print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, '');
 			print '</td></tr>';
-		}
-		else // For external software
+		} else // For external software
 		{
 			if (!empty($accountancy_code_sell)) { $object->accountancy_code_sell = $accountancy_code_sell; }
 			if (!empty($accountancy_code_sell_intra)) { $object->accountancy_code_sell_intra = $accountancy_code_sell_intra; }
@@ -1385,75 +1379,87 @@ else
 		print '</div>';
 
 		print '</form>';
-	}
-
-    /*
-     * Product card
-     */
-
-    elseif ($object->id > 0)
-    {
-        // Fiche en mode edition
+	} elseif ($object->id > 0) {
+		/*
+         * Product card
+         */
+		// Fiche en mode edition
 		if ($action == 'edit' && $usercancreate)
 		{
-            //WYSIWYG Editor
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			//WYSIWYG Editor
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-            $type = $langs->trans('Product');
-            if ($object->isService()) $type = $langs->trans('Service');
-            //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
+			print '<script type="text/javascript">';
+				print '$(document).ready(function () {
+                        $("#selectcountry_id").change(function () {
+                        	document.formprod.action.value="edit";
+                        	document.formprod.submit();
+                        });
+		});';
+				print '</script>'."\n";
 
-            // Main official, simple, and not duplicated code
-            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="id" value="'.$object->id.'">';
-            print '<input type="hidden" name="canvas" value="'.$object->canvas.'">';
+			// We set country_id, country_code and country for the selected country
+			$object->country_id = GETPOST('country_id') ? GETPOST('country_id') : $object->country_id;
+			if ($object->country_id)
+			{
+				$tmparray = getCountry($object->country_id, 'all');
+				$object->country_code = $tmparray['code'];
+				$object->country = $tmparray['label'];
+			}
 
-            $head = product_prepare_head($object);
-            $titre = $langs->trans("CardProduct".$object->type);
-            $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
-            dol_fiche_head($head, 'card', $titre, 0, $picto);
 
-            print '<table class="border allwidth">';
+			$type = $langs->trans('Product');
+			if ($object->isService()) $type = $langs->trans('Service');
+			//print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
 
-            // Ref
-            print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
+			// Main official, simple, and not duplicated code
+			print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="formprod">'."\n";
+			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 '<input type="hidden" name="canvas" value="'.$object->canvas.'">';
 
-            // Label
-            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
+			$head = product_prepare_head($object);
+			$titre = $langs->trans("CardProduct".$object->type);
+			$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+			dol_fiche_head($head, 'card', $titre, 0, $picto);
 
-            // Status To sell
-            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-            print '<select class="flat" name="statut">';
-            if ($object->status)
-            {
-                print '<option value="1" selected>'.$langs->trans("OnSell").'</option>';
-                print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
-            }
-            else
-            {
-                print '<option value="1">'.$langs->trans("OnSell").'</option>';
-                print '<option value="0" selected>'.$langs->trans("NotOnSell").'</option>';
-            }
-            print '</select>';
-            print '</td></tr>';
 
-            // Status To Buy
-            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-            print '<select class="flat" name="statut_buy">';
-            if ($object->status_buy)
-            {
-                print '<option value="1" selected>'.$langs->trans("ProductStatusOnBuy").'</option>';
-                print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
-            }
-            else
-            {
-                print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
-                print '<option value="0" selected>'.$langs->trans("ProductStatusNotOnBuy").'</option>';
-            }
-            print '</select>';
-            print '</td></tr>';
+			print '<table class="border allwidth">';
+
+			// Ref
+			print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';
+
+			// Label
+			print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
+
+			// Status To sell
+			print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
+			print '<select class="flat" name="statut">';
+			if ($object->status)
+			{
+				print '<option value="1" selected>'.$langs->trans("OnSell").'</option>';
+				print '<option value="0">'.$langs->trans("NotOnSell").'</option>';
+			} else {
+				print '<option value="1">'.$langs->trans("OnSell").'</option>';
+				print '<option value="0" selected>'.$langs->trans("NotOnSell").'</option>';
+			}
+			print '</select>';
+			print '</td></tr>';
+
+			// Status To Buy
+			print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
+			print '<select class="flat" name="statut_buy">';
+			if ($object->status_buy)
+			{
+				print '<option value="1" selected>'.$langs->trans("ProductStatusOnBuy").'</option>';
+				print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';
+			} else {
+				print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';
+				print '<option value="0" selected>'.$langs->trans("ProductStatusNotOnBuy").'</option>';
+			}
+			print '</select>';
+			print '</td></tr>';
 
 			// Batch number managment
 			if ($conf->productbatch->enabled)
@@ -1467,56 +1473,54 @@ else
 				}
 			}
 
-            // Barcode
-            $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
-            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
+			// Barcode
+			$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+			if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
-	        if ($showbarcode)
-	        {
-		        print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
-		        if (isset($_POST['fk_barcode_type']))
-		        {
-		         	$fk_barcode_type = GETPOST('fk_barcode_type');
-		        }
-		        else
-		        {
-	        		$fk_barcode_type = $object->barcode_type;
-		        	if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-		        }
-		        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
-	            $formbarcode = new FormBarCode($db);
-                print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);
-		        print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
-		        $tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode;
-		        if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
-		        print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
-		        print '</td></tr>';
-	        }
+			if ($showbarcode)
+			{
+				print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';
+				if (isset($_POST['fk_barcode_type']))
+				{
+				 	$fk_barcode_type = GETPOST('fk_barcode_type');
+				} else {
+					$fk_barcode_type = $object->barcode_type;
+					if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+				}
+				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
+				$formbarcode = new FormBarCode($db);
+				print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);
+				print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';
+				$tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode;
+				if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+				print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
+				print '</td></tr>';
+			}
 
-            // Description (used in invoice, propal...)
-            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
+			// Description (used in invoice, propal...)
+			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
 
-            // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
-            $doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
-            $doleditor->Create();
+			// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
+			$doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+			$doleditor->Create();
 
-            print "</td></tr>";
-            print "\n";
+			print "</td></tr>";
+			print "\n";
 
-            // Public Url
-            print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
-            print '<input type="text" name="url" class="quatrevingtpercent" value="'.$object->url.'">';
-            print '</td></tr>';
+			// Public Url
+			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';
+			print '<input type="text" name="url" class="quatrevingtpercent" value="'.$object->url.'">';
+			print '</td></tr>';
 
-            // Stock
-            if ($object->isProduct() && !empty($conf->stock->enabled))
-            {
-                // Default warehouse
-                print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
-                print $formproduct->selectWarehouses($object->fk_default_warehouse, 'fk_default_warehouse', 'warehouseopen', 1);
-                print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=create&type='.GETPOST('type', 'int')).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
-                print '</td>';
-                /*
+			// Stock
+			if ($object->isProduct() && !empty($conf->stock->enabled))
+			{
+				// Default warehouse
+				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
+				print $formproduct->selectWarehouses($object->fk_default_warehouse, 'fk_default_warehouse', 'warehouseopen', 1);
+				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=create&type='.GETPOST('type', 'int')).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
+				print '</td>';
+				/*
                 print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';
                 print '<input name="seuil_stock_alerte" size="4" value="'.$object->seuil_stock_alerte.'">';
                 print '</td>';
@@ -1525,38 +1529,36 @@ else
                 print '<input name="desiredstock" size="4" value="'.$object->desiredstock.'">';
                 print '</td></tr>';
                 */
-            }
-            /*
+			}
+			/*
             else
             {
                 print '<input name="seuil_stock_alerte" type="hidden" value="'.$object->seuil_stock_alerte.'">';
                 print '<input name="desiredstock" type="hidden" value="'.$object->desiredstock.'">';
             }*/
 
-            if ($object->isService())
-            {
-                // Duration
-                print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
-                print '<input name="duration_value" size="5" value="'.$object->duration_value.'"> ';
-                print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
-                print '</td></tr>';
-            }
-            else
-            {
-                // Nature
-                print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
-                $statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-                print $form->selectarray('finished', $statutarray, $object->finished);
-                print '</td></tr>';
+			if ($object->isService())
+			{
+				// Duration
+				print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
+				print '<input name="duration_value" size="5" value="'.$object->duration_value.'"> ';
+				print $formproduct->selectMeasuringUnits("duration_unit", "time", $object->duration_unit, 0, 1);
+				print '</td></tr>';
+			} else {
+				// Nature
+				print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="3">';
+				$statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
+				print $form->selectarray('finished', $statutarray, $object->finished);
+				print '</td></tr>';
 
-                // Brut Weight
-                print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
-                print '<input name="weight" size="5" value="'.$object->weight.'"> ';
-                print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
-                print '</td></tr>';
+				// Brut Weight
+				print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';
+				print '<input name="weight" size="5" value="'.$object->weight.'"> ';
+				print $formproduct->selectMeasuringUnits("weight_units", "weight", $object->weight_units, 0, 2);
+				print '</td></tr>';
 
-                if (empty($conf->global->PRODUCT_DISABLE_SIZE))
-                {
+				if (empty($conf->global->PRODUCT_DISABLE_SIZE))
+				{
 					// Brut Length
 					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';
 					print '<input name="size" size="5" value="'.$object->length.'">x';
@@ -1564,64 +1566,81 @@ else
 					print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';
 					print $formproduct->selectMeasuringUnits("size_units", "size", $object->length_units, 0, 2);
 					print '</td></tr>';
-                }
-                if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
-                {
-                    // Brut Surface
-                    print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
-                    print '<input name="surface" size="5" value="'.$object->surface.'"> ';
-                    print $formproduct->selectMeasuringUnits("surface_units", "surface", $object->surface_units, 0, 2);
-                    print '</td></tr>';
-                }
-                if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
-                {
-                    // Brut Volume
-                    print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
-                    print '<input name="volume" size="5" value="'.$object->volume.'"> ';
-                    print $formproduct->selectMeasuringUnits("volume_units", "volume", $object->volume_units, 0, 2);
-                    print '</td></tr>';
-                }
+				}
+				if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
+				{
+					// Brut Surface
+					print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';
+					print '<input name="surface" size="5" value="'.$object->surface.'"> ';
+					print $formproduct->selectMeasuringUnits("surface_units", "surface", $object->surface_units, 0, 2);
+					print '</td></tr>';
+				}
+				if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
+				{
+					// Brut Volume
+					print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';
+					print '<input name="volume" size="5" value="'.$object->volume.'"> ';
+					print $formproduct->selectMeasuringUnits("volume_units", "volume", $object->volume_units, 0, 2);
+					print '</td></tr>';
+				}
 
-                if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE))
-                {
-                	// Net Measure
-	                print '<tr><td>'.$langs->trans("NetMeasure").'</td><td colspan="3">';
-	                print '<input name="net_measure" size="5" value="'.$object->net_measure.'"> ';
-	                print $formproduct->selectMeasuringUnits("net_measure_units", "", $object->net_measure_units, 0, 0);
-	                print '</td></tr>';
-                }
-            }
-        	// Units
-	        if ($conf->global->PRODUCT_USE_UNITS)
-	        {
-		        print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
-		        print '<td colspan="3">';
-		        print $form->selectUnits($object->fk_unit, 'units');
-		        print '</td></tr>';
-	        }
+				if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE))
+				{
+					// Net Measure
+					print '<tr><td>'.$langs->trans("NetMeasure").'</td><td colspan="3">';
+					print '<input name="net_measure" size="5" value="'.$object->net_measure.'"> ';
+					print $formproduct->selectMeasuringUnits("net_measure_units", "", $object->net_measure_units, 0, 0);
+					print '</td></tr>';
+				}
+			}
+			// Units
+			if ($conf->global->PRODUCT_USE_UNITS)
+			{
+				print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
+				print '<td colspan="3">';
+				print $form->selectUnits($object->fk_unit, 'units');
+				print '</td></tr>';
+			}
 
-	        // Custom code
-    	    if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
-        	{
-	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.$object->customcode.'"></td>';
-	            // Origin country
-	            print '<td>'.$langs->trans("CountryOrigin").'</td><td>';
-	            print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
-	            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-	            print '</td></tr>';
-        	}
+			// Custom code
+			if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
+			{
+				print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.$object->customcode.'"></td></tr>';
+				// Origin country
+				print '<td>'.$langs->trans("CountryOrigin").'</td>';
+				print '<td>';
+				print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+				print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');
+				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				print '</td>';
+				// State
+				if (empty($conf->global->PRODUCT_DISABLE_STATE))
+				{
+					if ($conf->browser->layout == 'phone') print '</tr><tr>';
+					if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+					{
+						print '<td>'.$form->editfieldkey('Region-StateOrigine', 'state_id', '', $object, 0).'</td><td colspan="3">';
+					} else {
+						print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
+					}
 
-            // Other attributes
-            $parameters = array('colspan' => ' colspan="3"', 'cols' => 3);
-            $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 $formcompany->select_state($object->state_id, $object->country_code);
+					print '</td>';
+				}
+				print '</tr>';
+			}
+
+			// Other attributes
+			$parameters = array('colspan' => ' colspan="3"', 'cols' => 3);
+			$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);
+			}
 
 			// 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_PRODUCT, '', 'parent', 64, 0, 1);
@@ -1637,22 +1656,22 @@ else
 				print "</td></tr>";
 			}
 
-            // Note private
+			// Note private
 			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 			{
-                print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+				print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
 
-                $doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
-                $doleditor->Create();
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+				$doleditor->Create();
 
-                print "</td></tr>";
+				print "</td></tr>";
 			}
 
-            print '</table>';
+			print '</table>';
 
-            print '<br>';
+			print '<br>';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
 			if (!empty($conf->accounting->enabled))
 			{
@@ -1697,9 +1716,8 @@ else
 				print '<td>';
 				print $formaccounting->select_account($object->accountancy_code_buy_export, 'accountancy_code_buy_export', 1, '', 1, 1);
 				print '</td></tr>';
-			}
-			else // For external software
-			{
+			} else {
+				// For external software
 				// Accountancy_code_sell
 				print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';
@@ -1747,33 +1765,31 @@ else
 			print '</div>';
 
 			print '</form>';
-		}
-        // Fiche en mode visu
-        else
-		{
-            $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
-            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
+		} else {
+			// Fiche en mode visu
+			$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+			if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
-		    $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');
 
-            dol_fiche_head($head, 'card', $titre, -1, $picto);
+			dol_fiche_head($head, 'card', $titre, -1, $picto);
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$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&type='.$object->type.'">'.$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="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%">';
 
 			// Type
 			if (!empty($conf->product->enabled) && !empty($conf->service->enabled))
@@ -1787,42 +1803,40 @@ else
 				print '</td></tr>';
 			}
 
-            if ($showbarcode)
-            {
-                // Barcode type
-                print '<tr><td class="nowrap">';
-                print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-                print $langs->trans("BarcodeType");
-                print '</td>';
-                if (($action != 'editbarcodetype') && $usercancreate && $createbarcode) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
-                print '</tr></table>';
-                print '</td><td colspan="2">';
-                if ($action == 'editbarcodetype' || $action == 'editbarcode')
-                {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
-                    $formbarcode = new FormBarCode($db);
+			if ($showbarcode)
+			{
+				// Barcode type
+				print '<tr><td class="nowrap">';
+				print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+				print $langs->trans("BarcodeType");
+				print '</td>';
+				if (($action != 'editbarcodetype') && $usercancreate && $createbarcode) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
+				print '</tr></table>';
+				print '</td><td colspan="2">';
+				if ($action == 'editbarcodetype' || $action == 'editbarcode')
+				{
+					require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';
+					$formbarcode = new FormBarCode($db);
 				}
-                if ($action == 'editbarcodetype')
-                {
-                    print $formbarcode->formBarcodeType($_SERVER['PHP_SELF'].'?id='.$object->id, $object->barcode_type, 'fk_barcode_type');
-                }
-                else
-                {
-                    $object->fetch_barcode();
-                    print $object->barcode_type_label ? $object->barcode_type_label : ($object->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
-                }
-                print '</td></tr>'."\n";
+				if ($action == 'editbarcodetype')
+				{
+					print $formbarcode->formBarcodeType($_SERVER['PHP_SELF'].'?id='.$object->id, $object->barcode_type, 'fk_barcode_type');
+				} else {
+					$object->fetch_barcode();
+					print $object->barcode_type_label ? $object->barcode_type_label : ($object->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');
+				}
+				print '</td></tr>'."\n";
 
-                // Barcode value
-                print '<tr><td class="nowrap">';
-                print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-                print $langs->trans("BarcodeValue");
-                print '</td>';
-                if (($action != 'editbarcode') && $usercancreate && $createbarcode) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
-                print '</tr></table>';
-                print '</td><td colspan="2">';
-                if ($action == 'editbarcode')
-                {
+				// Barcode value
+				print '<tr><td class="nowrap">';
+				print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+				print $langs->trans("BarcodeValue");
+				print '</td>';
+				if (($action != 'editbarcode') && $usercancreate && $createbarcode) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
+				print '</tr></table>';
+				print '</td><td colspan="2">';
+				if ($action == 'editbarcode')
+				{
 					$tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode;
 					if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
 
@@ -1833,13 +1847,11 @@ else
 					print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">';
 					print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
 					print '</form>';
-                }
-                else
-                {
+				} else {
 					print $object->barcode;
-                }
-                print '</td></tr>'."\n";
-            }
+				}
+				print '</td></tr>'."\n";
+			}
 
 			// Accountancy sell code
 			print '<tr><td class="nowrap">';
@@ -1955,157 +1967,144 @@ else
 			}
 			print '</td></tr>';
 
-            // Batch number management (to batch)
-            if (!empty($conf->productbatch->enabled))
-            {
+			// Batch number management (to batch)
+			if (!empty($conf->productbatch->enabled))
+			{
 				if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
 				{
-            		print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
-            	    if (!empty($conf->use_javascript_ajax) && $usercancreate && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-            	        print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');
-            	    } else {
-            	        print $object->getLibStatut(0, 2);
-            	    }
-            	    print '</td></tr>';
+					print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
+					if (!empty($conf->use_javascript_ajax) && $usercancreate && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+						print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');
+					} else {
+						print $object->getLibStatut(0, 2);
+					}
+					print '</td></tr>';
 				}
-            }
+			}
 
-            // Description
-            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';
+			// Description
+			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';
 
-            // Public URL
-            print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="2">';
+			// Public URL
+			print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="2">';
 			print dol_print_url($object->url);
-            print '</td></tr>';
+			print '</td></tr>';
 
-            // Default warehouse
-            if ($object->isProduct() && !empty($conf->stock->enabled))
-            {
-                $warehouse = new Entrepot($db);
-                $warehouse->fetch($object->fk_default_warehouse);
+			// Default warehouse
+			if ($object->isProduct() && !empty($conf->stock->enabled))
+			{
+				$warehouse = new Entrepot($db);
+				$warehouse->fetch($object->fk_default_warehouse);
 
-                print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
-                print (!empty($warehouse->id) ? $warehouse->getNomUrl(1) : '');
-                print '</td>';
-            }
+				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
+				print (!empty($warehouse->id) ? $warehouse->getNomUrl(1) : '');
+				print '</td>';
+			}
 
-            // Parent product.
-            if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
-                $combination = new ProductCombination($db);
+			// Parent product.
+			if (!empty($conf->variants->enabled) && ($object->isProduct() || $object->isService())) {
+				$combination = new ProductCombination($db);
 
-                if ($combination->fetchByFkProductChild($object->id) > 0) {
-                    $prodstatic = new Product($db);
-                    $prodstatic->fetch($combination->fk_product_parent);
+				if ($combination->fetchByFkProductChild($object->id) > 0) {
+					$prodstatic = new Product($db);
+					$prodstatic->fetch($combination->fk_product_parent);
 
-                    // Parent product
-                    print '<tr><td>'.$langs->trans("ParentProduct").'</td><td colspan="2">';
-                    print $prodstatic->getNomUrl(1);
-                    print '</td></tr>';
-                }
-            }
+					// Parent product
+					print '<tr><td>'.$langs->trans("ParentProduct").'</td><td colspan="2">';
+					print $prodstatic->getNomUrl(1);
+					print '</td></tr>';
+				}
+			}
 
-            print '</table>';
-            print '</div>';
-            print '<div class="fichehalfright"><div class="ficheaddleft">';
+			print '</table>';
+			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%">';
 
-            if ($object->isService())
-            {
-                // Duration
-                print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
-                if ($object->duration_value > 1)
-                {
-                    $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-                }
-                elseif ($object->duration_value > 0)
-                {
-                    $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
-                }
-                print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
+			if ($object->isService())
+			{
+				// Duration
+				print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
+				if ($object->duration_value > 1)
+				{
+					$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+				} elseif ($object->duration_value > 0)
+				{
+					$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+				}
+				print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";
 
-                print '</td></tr>';
-            }
-            else
-            {
-                // Nature
-                print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
-                print $object->getLibFinished();
-                print '</td></tr>';
+				print '</td></tr>';
+			} else {
+				// Nature
+				print '<tr><td class="titlefield">'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="2">';
+				print $object->getLibFinished();
+				print '</td></tr>';
 
-                // Brut Weight
-                print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
-                if ($object->weight != '')
-                {
-                	print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
-                }
-                else
-                {
-                    print '&nbsp;';
-                }
-                print "</td></tr>\n";
+				// Brut Weight
+				print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
+				if ($object->weight != '')
+				{
+					print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
+				} else {
+					print '&nbsp;';
+				}
+				print "</td></tr>\n";
 
-                if (empty($conf->global->PRODUCT_DISABLE_SIZE))
-                {
-                    // Brut Length
-                    print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="2">';
-                    if ($object->length != '' || $object->width != '' || $object->height != '')
-                    {
-                        print $object->length;
-                        if ($object->width) print " x ".$object->width;
-                        if ($object->height) print " x ".$object->height;
-                        print ' '.measuringUnitString(0, "size", $object->length_units);
-                    }
-                    else
-                    {
-                        print '&nbsp;';
-                    }
-                    print "</td></tr>\n";
-                }
-                if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
-                {
-                    // Brut Surface
-                    print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
-                    if ($object->surface != '')
-                    {
-                    	print $object->surface." ".measuringUnitString(0, "surface", $object->surface_units);
-                    }
-                    else
-                    {
-                        print '&nbsp;';
-                    }
-                    print "</td></tr>\n";
-                }
-                if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
-                {
-                    // Brut Volume
-                    print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
-                    if ($object->volume != '')
-                    {
-                    	print $object->volume." ".measuringUnitString(0, "volume", $object->volume_units);
-                    }
-                    else
-                    {
-                        print '&nbsp;';
-                    }
-                    print "</td></tr>\n";
-                }
+				if (empty($conf->global->PRODUCT_DISABLE_SIZE))
+				{
+					// Brut Length
+					print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="2">';
+					if ($object->length != '' || $object->width != '' || $object->height != '')
+					{
+						print $object->length;
+						if ($object->width) print " x ".$object->width;
+						if ($object->height) print " x ".$object->height;
+						print ' '.measuringUnitString(0, "size", $object->length_units);
+					} else {
+						print '&nbsp;';
+					}
+					print "</td></tr>\n";
+				}
+				if (empty($conf->global->PRODUCT_DISABLE_SURFACE))
+				{
+					// Brut Surface
+					print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';
+					if ($object->surface != '')
+					{
+						print $object->surface." ".measuringUnitString(0, "surface", $object->surface_units);
+					} else {
+						print '&nbsp;';
+					}
+					print "</td></tr>\n";
+				}
+				if (empty($conf->global->PRODUCT_DISABLE_VOLUME))
+				{
+					// Brut Volume
+					print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';
+					if ($object->volume != '')
+					{
+						print $object->volume." ".measuringUnitString(0, "volume", $object->volume_units);
+					} else {
+						print '&nbsp;';
+					}
+					print "</td></tr>\n";
+				}
 
-                if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE))
-                {
-                	// Net Measure
-                	print '<tr><td class="titlefield">'.$langs->trans("NetMeasure").'</td><td colspan="2">';
-                	if ($object->net_measure != '')
-                	{
-                		print $object->net_measure." ".measuringUnitString($object->net_measure_units);
-                	}
-                	else
-                	{
-                		print '&nbsp;';
-                	}
-                }
-            }
+				if (!empty($conf->global->PRODUCT_ADD_NET_MEASURE))
+				{
+					// Net Measure
+					print '<tr><td class="titlefield">'.$langs->trans("NetMeasure").'</td><td colspan="2">';
+					if ($object->net_measure != '')
+					{
+						print $object->net_measure." ".measuringUnitString($object->net_measure_units);
+					} else {
+						print '&nbsp;';
+					}
+				}
+			}
 
 			// Unit
 			if (!empty($conf->global->PRODUCT_USE_UNITS))
@@ -2119,18 +2118,20 @@ else
 				print '</td></tr>';
 			}
 
-        	// Custom code
-    	    if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
-        	{
-	            print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';
+			// Custom code
+			if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO))
+			{
+				print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';
 
-            	// Origin country code
-            	print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td colspan="2">'.getCountry($object->country_id, 0, $db).'</td>';
-        	}
+				// Origin country code
+				print '<tr><td>'.$langs->trans("Origin").'</td><td colspan="2">'.getCountry($object->country_id, 0, $db);
+				if (!empty($object->state_id)) print ' - '.getState($object->state_id, 0, $db);
+				print '</td>';
+			}
 
-            // Other attributes
-        	$parameters = array('colspan' => ' colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'"', 'cols' => (2 + (($showphoto || $showbarcode) ? 1 : 0)));
-            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$parameters = array('colspan' => ' colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'"', 'cols' => (2 + (($showphoto || $showbarcode) ? 1 : 0)));
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
 			if ($conf->categorie->enabled) {
@@ -2139,34 +2140,33 @@ else
 				print "</td></tr>";
 			}
 
-            // Note private
+			// Note private
 			if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 			{
-    			print '<!-- show Note --> '."\n";
-                print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'">'.(dol_textishtml($object->note_private) ? $object->note_private : dol_nl2br($object->note_private, 1, true)).'</td></tr>'."\n";
-                print '<!-- End show Note --> '."\n";
+				print '<!-- show Note --> '."\n";
+				print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'">'.(dol_textishtml($object->note_private) ? $object->note_private : dol_nl2br($object->note_private, 1, true)).'</td></tr>'."\n";
+				print '<!-- End show Note --> '."\n";
 			}
 
-            print "</table>\n";
-    		print '</div>';
+			print "</table>\n";
+			print '</div>';
 
-            print '</div></div>';
-            print '<div style="clear:both"></div>';
+			print '</div></div>';
+			print '<div style="clear:both"></div>';
 
-            dol_fiche_end();
-        }
-    }
-    elseif ($action != 'create')
-    {
-        exit;
-    }
+			dol_fiche_end();
+		}
+	} elseif ($action != 'create')
+	{
+		exit;
+	}
 }
 
 // Load object modCodeProduct
 $module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
 if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php')
 {
-    $module = substr($module, 0, dol_strlen($module) - 4);
+	$module = substr($module, 0, dol_strlen($module) - 4);
 }
 $result = dol_include_once('/core/modules/product/'.$module.'.php');
 if ($result > 0)
@@ -2177,35 +2177,45 @@ if ($result > 0)
 $tmpcode = '';
 if (!empty($modCodeProduct->code_auto)) $tmpcode = $modCodeProduct->getNextValue($object, $object->type);
 
-// Define confirmation messages
-$formquestionclone = array(
-	'text' => $langs->trans("ConfirmClone"),
-    array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'size'=>24),
-    array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContentProduct"), 'value' => 1),
-    array('type' => 'checkbox', 'name' => 'clone_categories', 'label' => $langs->trans("CloneCategoriesProduct"), 'value' => 1),
-);
-if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-    $formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("CustomerPrices").')', 'value' => 0);
-}
-if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
-{
-    $formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1);
-}
+$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
 	|| (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
 {
-    print $form->formconfirm("card.php?id=".$object->id, $langs->trans("DeleteProduct"), $langs->trans("ConfirmDeleteProduct"), "confirm_delete", '', 0, "action-delete");
+	$formconfirm = $form->formconfirm("card.php?id=".$object->id, $langs->trans("DeleteProduct"), $langs->trans("ConfirmDeleteProduct"), "confirm_delete", '', 0, "action-delete");
 }
 
 // Clone confirmation
 if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile)))		// Output when action = clone if jmobile or no js
 	|| (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)))							// Always output when not jmobile nor js
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneProduct', $object->ref), 'confirm_clone', $formquestionclone, 'yes', 'action-clone', 350, 600);
+	// Define confirmation messages
+	$formquestionclone = array(
+		'text' => $langs->trans("ConfirmClone"),
+		array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'size'=>24),
+		array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContentProduct"), 'value' => 1),
+		array('type' => 'checkbox', 'name' => 'clone_categories', 'label' => $langs->trans("CloneCategoriesProduct"), 'value' => 1),
+	);
+	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		$formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("CustomerPrices").')', 'value' => 0);
+	}
+	if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
+	{
+		$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);
 }
 
+// Call Hook formConfirm
+$parameters = array('formConfirm' => $formconfirm, 'object' => $object);
+$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
+print $formconfirm;
 
 /* ************************************************************************** */
 /*                                                                            */
@@ -2214,55 +2224,47 @@ if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->d
 /* ************************************************************************** */
 if ($action != 'create' && $action != 'edit')
 {
-    print "\n".'<div class="tabsAction">'."\n";
+	print "\n".'<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 (empty($reshook))
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook))
 	{
 		if ($usercancreate)
-        {
-            if (!isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
+		{
+			if (!isset($object->no_button_edit) || $object->no_button_edit <> 1) print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
 
-            if (!isset($object->no_button_copy) || $object->no_button_copy <> 1)
-            {
-                if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
-                {
-                    print '<span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span>'."\n";
-                }
-                else
-    			{
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
-                }
-            }
-        }
-        $object_is_used = $object->isObjectUsed($object->id);
+			if (!isset($object->no_button_copy) || $object->no_button_copy <> 1)
+			{
+				if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+				{
+					print '<span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span>'."\n";
+				} else {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
+				}
+			}
+		}
+		$object_is_used = $object->isObjectUsed($object->id);
 
-        if ($usercandelete)
-        {
-            if (empty($object_is_used) && (!isset($object->no_button_delete) || $object->no_button_delete <> 1))
-            {
-                if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
-                {
-                    print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
-                }
-                else
-    			{
-                    print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a>';
-                }
-            }
-            else
-    		{
-                print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a>';
-            }
-        }
-        else
-    	{
-            print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a>';
-        }
-    }
+		if ($usercandelete)
+		{
+			if (empty($object_is_used) && (!isset($object->no_button_delete) || $object->no_button_delete <> 1))
+			{
+				if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))
+				{
+					print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
+				} else {
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a>';
+				}
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a>';
+			}
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a>';
+		}
+	}
 
-    print "\n</div>\n";
+	print "\n</div>\n";
 }
 
 /*
@@ -2271,112 +2273,106 @@ if ($action != 'create' && $action != 'edit')
 
 if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action == '' || $action == 'view') && $object->status)
 {
-    //Variable used to check if any text is going to be printed
-    $html = '';
+	//Variable used to check if any text is going to be printed
+	$html = '';
 	//print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    // Propals
-    if (!empty($conf->propal->enabled) && $user->rights->propale->creer)
-    {
-        $propal = new Propal($db);
+	// Propals
+	if (!empty($conf->propal->enabled) && $user->rights->propale->creer)
+	{
+		$propal = new Propal($db);
 
-        $langs->load("propal");
+		$langs->load("propal");
 
-        $otherprop = $propal->liste_array(2, 1, 0);
+		$otherprop = $propal->liste_array(2, 1, 0);
 
-        if (is_array($otherprop) && count($otherprop))
-        {
-        	$html .= '<tr><td style="width: 200px;">';
-        	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
-        	$html .= $form->selectarray("propalid", $otherprop, 0, 1);
-        	$html .= '</td></tr>';
-        }
-        else
+		if (is_array($otherprop) && count($otherprop))
 		{
-        	$html .= '<tr><td style="width: 200px;">';
-        	$html .= $langs->trans("AddToDraftProposals").'</td><td>';
-        	$html .= $langs->trans("NoDraftProposals");
-        	$html .= '</td></tr>';
-        }
-    }
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftProposals").'</td><td>';
+			$html .= $form->selectarray("propalid", $otherprop, 0, 1);
+			$html .= '</td></tr>';
+		} else {
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftProposals").'</td><td>';
+			$html .= $langs->trans("NoDraftProposals");
+			$html .= '</td></tr>';
+		}
+	}
 
-    // Commande
-    if (!empty($conf->commande->enabled) && $user->rights->commande->creer)
-    {
-        $commande = new Commande($db);
+	// Commande
+	if (!empty($conf->commande->enabled) && $user->rights->commande->creer)
+	{
+		$commande = new Commande($db);
 
-        $langs->load("orders");
+		$langs->load("orders");
 
-        $othercom = $commande->liste_array(2, 1, null);
-        if (is_array($othercom) && count($othercom))
-        {
-        	$html .= '<tr><td style="width: 200px;">';
-        	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
-        	$html .= $form->selectarray("commandeid", $othercom, 0, 1);
-        	$html .= '</td></tr>';
-        }
-        else
+		$othercom = $commande->liste_array(2, 1, null);
+		if (is_array($othercom) && count($othercom))
 		{
-        	$html .= '<tr><td style="width: 200px;">';
-        	$html .= $langs->trans("AddToDraftOrders").'</td><td>';
-        	$html .= $langs->trans("NoDraftOrders");
-        	$html .= '</td></tr>';
-        }
-    }
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftOrders").'</td><td>';
+			$html .= $form->selectarray("commandeid", $othercom, 0, 1);
+			$html .= '</td></tr>';
+		} else {
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftOrders").'</td><td>';
+			$html .= $langs->trans("NoDraftOrders");
+			$html .= '</td></tr>';
+		}
+	}
 
-    // Factures
-    if (!empty($conf->facture->enabled) && $user->rights->facture->creer)
-    {
-    	$invoice = new Facture($db);
+	// Factures
+	if (!empty($conf->facture->enabled) && $user->rights->facture->creer)
+	{
+		$invoice = new Facture($db);
 
-    	$langs->load("bills");
+		$langs->load("bills");
 
-    	$otherinvoice = $invoice->liste_array(2, 1, null);
-    	if (is_array($otherinvoice) && count($otherinvoice))
-    	{
-    		$html .= '<tr><td style="width: 200px;">';
-    		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
-    		$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
-    		$html .= '</td></tr>';
-    	}
-    	else
-    	{
-    		$html .= '<tr><td style="width: 200px;">';
-    		$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
-    		$html .= $langs->trans("NoDraftInvoices");
-    		$html .= '</td></tr>';
-    	}
-    }
+		$otherinvoice = $invoice->liste_array(2, 1, null);
+		if (is_array($otherinvoice) && count($otherinvoice))
+		{
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
+			$html .= $form->selectarray("factureid", $otherinvoice, 0, 1);
+			$html .= '</td></tr>';
+		} else {
+			$html .= '<tr><td style="width: 200px;">';
+			$html .= $langs->trans("AddToDraftInvoices").'</td><td>';
+			$html .= $langs->trans("NoDraftInvoices");
+			$html .= '</td></tr>';
+		}
+	}
 
-    //If any text is going to be printed, then we show the table
-    if (!empty($html))
-    {
-	    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="addin">';
+	//If any text is going to be printed, then we show the table
+	if (!empty($html))
+	{
+		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="addin">';
 
-	    print load_fiche_titre($langs->trans("AddToDraft"), '', '');
+		print load_fiche_titre($langs->trans("AddToDraft"), '', '');
 
 		dol_fiche_head('');
 
-    	$html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';
-    	$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td>';
-        $html .= '<td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
-    	$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
-    	$html .= '</td></tr>';
+		$html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';
+		$html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td>';
+		$html .= '<td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';
+		$html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';
+		$html .= '</td></tr>';
 
-    	print '<table width="100%" class="border">';
-        print $html;
-        print '</table>';
+		print '<table width="100%" class="border">';
+		print $html;
+		print '</table>';
 
-        print '<div class="center">';
-        print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-        print '</div>';
+		print '<div class="center">';
+		print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+		print '</div>';
 
-        dol_fiche_end();
+		dol_fiche_end();
 
-        print '</form>';
-    }
+		print '</form>';
+	}
 }
 
 
@@ -2386,34 +2382,38 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
 
 if ($action != 'create' && $action != 'edit' && $action != 'delete')
 {
-    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);
-    $relativepath = $comref.'/'.$objectref.'.pdf';
-    $filedir = $conf->product->dir_output.'/'.$objectref;
-    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-    $genallowed = $usercanread;
-    $delallowed = $usercancreate;
+	// Documents
+	$objectref = dol_sanitizeFileName($object->ref);
+	$relativepath = $comref.'/'.$objectref.'.pdf';
+	if (!empty($conf->product->multidir_output[$object->entity])) {
+		$filedir = $conf->product->multidir_output[$object->entity].'/'.$objectref; //Check repertories of current entities
+	} else {
+		$filedir = $conf->product->dir_output.'/'.$objectref;
+	}
+	$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+	$genallowed = $usercanread;
+	$delallowed = $usercancreate;
 
-    print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
-    $somethingshown = $formfile->numoffiles;
+	print $formfile->showdocuments($modulepart, $object->ref, $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, 'product', 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, 'product', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
 
-    print '</div></div></div>';
+	print '</div></div></div>';
 }
 
 // End of page
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 10cb3686752..6c75d96fe89 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -58,6 +58,7 @@ class Products extends DolibarrApi
     public function __construct()
     {
         global $db, $conf;
+
         $this->db = $db;
         $this->product = new Product($this->db);
         $this->productsupplier = new ProductFournisseur($this->db);
@@ -71,15 +72,16 @@ class Products extends DolibarrApi
      * @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)
+    public function get($id, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
     {
-        return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts);
+        return $this->_fetch($id, '', '', '', $includestockdata, $includesubproducts, $includeparentid);
     }
 
     /**
@@ -90,6 +92,7 @@ class Products extends DolibarrApi
      * @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
      *
@@ -99,9 +102,9 @@ class Products extends DolibarrApi
      * @throws RestException 403
      * @throws RestException 404
      */
-    public function getByRef($ref, $includestockdata = 0, $includesubproducts = false)
+    public function getByRef($ref, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
     {
-        return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts);
+        return $this->_fetch('', $ref, '', '', $includestockdata, $includesubproducts, $includeparentid);
     }
 
     /**
@@ -112,6 +115,7 @@ class Products extends DolibarrApi
      * @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
      *
@@ -121,9 +125,9 @@ class Products extends DolibarrApi
      * @throws RestException 403
      * @throws RestException 404
      */
-    public function getByRefExt($ref_ext, $includestockdata = 0, $includesubproducts = false)
+    public function getByRefExt($ref_ext, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
     {
-        return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts);
+        return $this->_fetch('', '', $ref_ext, '', $includestockdata, $includesubproducts, $includeparentid);
     }
 
     /**
@@ -134,6 +138,7 @@ class Products extends DolibarrApi
      * @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
      *
@@ -143,9 +148,9 @@ class Products extends DolibarrApi
      * @throws RestException 403
      * @throws RestException 404
      */
-    public function getByBarcode($barcode, $includestockdata = 0, $includesubproducts = false)
+    public function getByBarcode($barcode, $includestockdata = 0, $includesubproducts = false, $includeparentid = false)
     {
-        return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts);
+        return $this->_fetch('', '', '', $barcode, $includestockdata, $includesubproducts, $includeparentid);
     }
 
     /**
@@ -178,7 +183,7 @@ class Products extends DolibarrApi
         $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
         // Select products of given category
         if ($category > 0) {
-            $sql .= " AND c.fk_categorie = ".$db->escape($category);
+        	$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
             $sql .= " AND c.fk_product = t.rowid ";
         }
         if ($mode == 1) {
@@ -197,33 +202,32 @@ class Products extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
         if ($result) {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             $i = 0;
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $product_static = new Product($db);
+            	$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 : '.$db->lasterror());
+        } else {
+        	throw new RestException(503, 'Error when retrieve product list : '.$this->db->lasterror());
         }
         if (!count($obj_ret)) {
             throw new RestException(404, 'No product found');
@@ -288,6 +292,9 @@ class Products extends DolibarrApi
         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;
         }
 
@@ -303,8 +310,7 @@ class Products extends DolibarrApi
             // We update price only if it was changed
             $pricemodified = false;
             if ($this->product->price_base_type != $oldproduct->price_base_type) { $pricemodified = true;
-            } else
-            {
+            } else {
                 if ($this->product->tva_tx != $oldproduct->tva_tx) { $pricemodified = true;
                 }
                 if ($this->product->tva_npr != $oldproduct->tva_npr) { $pricemodified = true;
@@ -317,9 +323,7 @@ class Products extends DolibarrApi
                     }
                     if ($this->product->price_min_ttc != $oldproduct->price_min_ttc) { $pricemodified = true;
                     }
-                }
-                else
-                {
+                } else {
                     if ($this->product->price != $oldproduct->price) { $pricemodified = true;
                     }
                     if ($this->product->price_min != $oldproduct->price_min) { $pricemodified = true;
@@ -446,8 +450,7 @@ class Products extends DolibarrApi
 
     /**
      * Remove subproduct.
-     *
-     *  Unlink a product/service from a parent product/service
+     * 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
@@ -579,12 +582,12 @@ class Products extends DolibarrApi
         }
 
         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);
+            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)) {
@@ -625,8 +628,8 @@ class Products extends DolibarrApi
         }
 
         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]
+            '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]
         );
     }
 
@@ -642,11 +645,11 @@ class Products extends DolibarrApi
      * @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  	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
@@ -750,78 +753,80 @@ class Products extends DolibarrApi
      */
     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";
+        global $db, $conf;
 
-    	$sql .= ' WHERE t.entity IN ('.getEntity('product').')';
+        $obj_ret = array();
 
-    	if ($supplier > 0) {
-    		$sql .= " AND s.fk_soc = ".$db->escape($supplier);
-    	}
-    	$sql .= " AND s.fk_product = t.rowid";
-    	// Select products of given category
-    	if ($category > 0) {
-    		$sql .= " AND c.fk_categorie = ".$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 .= $db->order($sortfield, $sortorder);
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-    		$sql .= $db->plimit($limit + 1, $offset);
-    	}
-    	$result = $db->query($sql);
-    	if ($result) {
-    		$num = $db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		$i = 0;
-    		while ($i < $min)
-    		{
-    			$obj = $db->fetch_object($result);
+        $socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
 
-    			$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);
-    			}
+        $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";
 
-   				//var_dump($product_fourn_list->db);exit;
-    			$obj_ret[$obj->rowid] = $product_fourn_list;
+        $sql .= ' WHERE t.entity IN ('.getEntity('product').')';
 
-    			$i++;
-    		}
-    	}
-    	else {
-    		throw new RestException(503, 'Error when retrieve product list : '.$db->lasterror());
-    	}
-    	if (!count($obj_ret)) {
-    		throw new RestException(404, 'No product found');
-    	}
-    	return $obj_ret;
+        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;
     }
 
     /**
@@ -871,7 +876,7 @@ class Products extends DolibarrApi
             $product_fourn_list = $product_fourn->list_product_fournisseur_price($this->product->id, '', '', 0, 0);
         }
 
-        foreach($product_fourn_list as $tmpobj) {
+        foreach ($product_fourn_list as $tmpobj) {
             $this->_cleanObjectDatas($tmpobj);
         }
 
@@ -880,21 +885,71 @@ class Products extends DolibarrApi
 
     /**
      * 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()
+    public function getAttributes($sortfield = "t.ref", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
     {
         if (!DolibarrApiAccess::$user->rights->produit->lire) {
             throw new RestException(401);
         }
 
-        $prodattr = new ProductAttribute($this->db);
-        return $prodattr->fetchAll();
+        $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;
     }
 
     /**
@@ -919,9 +974,25 @@ class Products extends DolibarrApi
         $result = $prodattr->fetch((int) $id);
 
         if ($result < 0) {
-            throw new RestException(404, "Attribute not found");
+            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;
+
         return $prodattr;
     }
 
@@ -942,7 +1013,7 @@ class Products extends DolibarrApi
             throw new RestException(401);
         }
 
-        $sql = "SELECT rowid, ref, label, rang 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);
 
@@ -955,8 +1026,65 @@ class Products extends DolibarrApi
         $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').")";
+
+		$resql = $this->db->query($sql);
+        $obj = $this->db->fetch_object($resql);
+
+        $attr["is_used_by_products"] = (int) $obj->nb;
+
+        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);
+        }
+
+        $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);
+
+        if (!$this->db->num_rows($query)) {
+            throw new RestException(404);
+        }
+
+        $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['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').")";
+
+		$resql = $this->db->query($sql);
+        $obj = $this->db->fetch_object($resql);
+        $attr["is_used_by_products"] = (int) $obj->nb;
 
         return $attr;
     }
@@ -966,6 +1094,7 @@ class Products extends DolibarrApi
      *
      * @param  string $ref   Reference of Attribute
      * @param  string $label Label of Attribute
+     * @param  string $ref_ext   Reference of Attribute
      * @return int
      *
      * @throws RestException 500
@@ -973,7 +1102,7 @@ class Products extends DolibarrApi
      *
      * @url POST attributes
      */
-    public function addAttributes($ref, $label)
+    public function addAttributes($ref, $label, $ref_ext = '')
     {
         if (!DolibarrApiAccess::$user->rights->produit->creer) {
             throw new RestException(401);
@@ -982,6 +1111,7 @@ class Products extends DolibarrApi
         $prodattr = new ProductAttribute($this->db);
         $prodattr->label = $label;
         $prodattr->ref = $ref;
+        $prodattr->ref_ext = $ref_ext;
 
         $resid = $prodattr->create(DolibarrApiAccess::$user);
         if ($resid <= 0) {
@@ -1059,7 +1189,7 @@ class Products extends DolibarrApi
         $result = $prodattr->delete(DolibarrApiAccess::$user);
 
         if ($result <= 0) {
-        	throw new RestException(500, "Error deleting attribute");
+            throw new RestException(500, "Error deleting attribute");
         }
 
         return $result;
@@ -1163,9 +1293,23 @@ class Products extends DolibarrApi
             throw new RestException(401);
         }
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE ref LIKE '".trim($ref)."' AND fk_product_attribute = ".(int) $id;
+        $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 ($this->db->query($sql)) {
+        if (!$query) {
+            throw new RestException(401);
+        }
+
+        if (!$this->db->num_rows($query)) {
+            throw new RestException(404, 'Attribute value not found');
+        }
+
+        $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;
         }
 
@@ -1190,7 +1334,18 @@ class Products extends DolibarrApi
         }
 
         $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');
+        }
+
+		foreach ($return as $key => $val) {
+			$return[$key] = $this->_cleanObjectDatas($return[$key]);
+        }
+
+        return $return;
     }
 
     /**
@@ -1212,19 +1367,19 @@ class Products extends DolibarrApi
         $return = array();
 
         $sql = 'SELECT ';
-        $sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value v ';
-        $sql .= "WHERE v.fk_product_attribute = ( SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute WHERE ref LIKE '".strtoupper(trim($ref))."' LIMIT 1)";
+        $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))."')";
 
-        $query = $this->db->query($sql);
+        $resql = $this->db->query($sql);
 
-        while ($result = $this->db->fetch_object($query)) {
+        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[] = $tmp;
+            $return[] = $this->_cleanObjectDatas($tmp);
         }
 
         return $return;
@@ -1330,7 +1485,7 @@ class Products extends DolibarrApi
         $objectval = new ProductAttributeValue($this->db);
         $objectval->id = (int) $id;
 
-        if ($objectval->delete() > 0) {
+        if ($objectval->delete(DolibarrApiAccess::$user) > 0) {
             return 1;
         }
         throw new RestException(500, "Error deleting attribute value");
@@ -1407,7 +1562,8 @@ class Products extends DolibarrApi
      * @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  bool|string $reference Customized reference of variant
+     * @param  string $reference Customized reference of variant
+     * @param  string $ref_ext External reference of variant
      * @return int
      *
      * @throws RestException 500
@@ -1416,7 +1572,7 @@ class Products extends DolibarrApi
      *
      * @url POST {id}/variants
      */
-    public function addVariant($id, $weight_impact, $price_impact, $price_impact_is_percent, $features, $reference = false)
+    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);
@@ -1447,12 +1603,12 @@ class Products extends DolibarrApi
 
         $prodcomb = new ProductCombination($this->db);
 
-        $result = $prodcomb->createProductCombination(DolibarrApiAccess::$user, $this->product, $features, array(), $price_impact_is_percent, $price_impact, $weight_impact, $reference);
+        $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;
+            return $result;
         } else {
-			throw new RestException(500, "Error creating new product variant");
+            throw new RestException(500, "Error creating new product variant");
         }
     }
 
@@ -1575,7 +1731,7 @@ class Products extends DolibarrApi
         $result = $prodcomb->delete(DolibarrApiAccess::$user);
         if ($result <= 0)
         {
-        	throw new RestException(500, "Error deleting variant");
+            throw new RestException(500, "Error deleting variant");
         }
         return $result;
     }
@@ -1638,14 +1794,15 @@ class Products extends DolibarrApi
      * @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
+     * @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)
+    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');
@@ -1667,17 +1824,17 @@ class Products extends DolibarrApi
         }
 
         if ($includestockdata) {
-        	$this->product->load_stock();
+            $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) {
@@ -1692,6 +1849,14 @@ class Products extends DolibarrApi
             $this->product->sousprods = $childs;
         }
 
+		if ($includeparentid) {
+			$prodcomb = new ProductCombination($this->db);
+			$this->product->fk_product_parent = null;
+			if (($fk_product_parent = $prodcomb->fetchByFkProductChild($this->product->id)) > 0) {
+				$this->product->fk_product_parent = $fk_product_parent;
+			}
+		}
+
         return $this->_cleanObjectDatas($this->product);
     }
 }
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index 903eedd3e8a..a0fd2bdb10c 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -101,13 +101,10 @@ class FormProduct
 			if (!empty($batch))
 			{
 				$sql .= ", pb.qty as stock";
-			}
-			else
-			{
+			} else {
 				$sql .= ", ps.reel as stock";
 			}
-		}
-		elseif ($sumStock)
+		} elseif ($sumStock)
 		{
 			$sql .= ", sum(ps.reel) as stock";
 		}
@@ -115,19 +112,17 @@ class FormProduct
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_entrepot = e.rowid";
 		if (!empty($fk_product))
 		{
-			$sql .= " AND ps.fk_product = '".$fk_product."'";
+			$sql .= " AND ps.fk_product = ".((int) $fk_product);
 			if (!empty($batch))
 			{
-				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb on pb.fk_product_stock = ps.rowid AND pb.batch = '".$batch."'";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_batch as pb on pb.fk_product_stock = ps.rowid AND pb.batch = '".$this->db->escape($batch)."'";
 			}
 		}
 		$sql .= " WHERE e.entity IN (".getEntity('stock').")";
 		if (count($warehouseStatus))
 		{
-			$sql .= " AND e.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")";
-		}
-		else
-		{
+			$sql .= " AND e.statut IN (".$this->db->sanitize($this->db->escape(implode(',', $warehouseStatus))).")";
+		} else {
 			$sql .= " AND e.statut = 1";
 		}
 
@@ -178,9 +173,7 @@ class FormProduct
 			}
 
 			return $num;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -256,8 +249,12 @@ class FormProduct
 		}
 
 		if (strpos($htmlname, 'search_') !== 0) {
-			if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
-			if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $selected = $user->fk_warehouse;
+			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 {
+				if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $selected = $user->fk_warehouse;
+			}
 		}
 
 		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled' : '').' id="'.$htmlname.'" name="'.($htmlname.($disabled ? '_disabled' : '')).'">';
@@ -271,9 +268,7 @@ class FormProduct
 			{
 				if ($arraytypes['stock'] <= 0) {
 					$label .= ' <span class= \'text-warning\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
-				}
-				else
-				{
+				} else {
 					$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
 				}
 			}
@@ -459,9 +454,7 @@ class FormProduct
 		if (!is_array($objectLines) || !count($objectLines))
 		{
 			if (!empty($fk_product)) $productIdArray[] = $fk_product;
-		}
-		else
-		{
+		} else {
 			foreach ($objectLines as $line) {
 				if ($line->fk_product) $productIdArray[] = $line->fk_product;
 			}
@@ -481,9 +474,7 @@ class FormProduct
 		if (!empty($fk_product))
 		{
 			$productIdArray = array($fk_product); // only show lot stock for product
-		}
-		else
-		{
+		} else {
 			foreach ($this->cache_lot as $key => $value)
 			{
 				$productIdArray[] = $key;
@@ -500,8 +491,7 @@ class FormProduct
 					$label .= $arraytypes['batch'];
 					if ($arraytypes['qty'] <= 0) {
 						$label .= ' <span class=\'text-warning\'>('.$langs->trans("Stock").' '.$arraytypes['qty'].')</span>';
-					}
-					else {
+					} else {
 						$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").' '.$arraytypes['qty'].')</span>';
 					}
 
@@ -549,9 +539,7 @@ class FormProduct
 		if ($cacheLoaded)
 		{
 			return count($this->cache_lot);
-		}
-		else
-		{
+		} else {
 			// clear cache
 			$this->cache_lot = array();
 			$productIdList = implode(',', $productIdArray);
@@ -583,9 +571,7 @@ class FormProduct
 				}
 
 				return $num;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return -1;
 			}
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 99590e27a36..18565347072 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -44,1603 +44,1559 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
  */
 class Product extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'product';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'product';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'product';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'product';
 
-    /**
-     * @var int Field with ID of parent key if this field has a parent
-     */
-    public $fk_element = 'fk_product';
+	/**
+	 * @var int Field with ID of parent key if this field has a parent
+	 */
+	public $fk_element = 'fk_product';
 
-    /**
-     * @var array	List of child tables. To test if we can delete object.
-     */
-    protected $childtables = array('supplier_proposaldet', 'propaldet', 'commandedet', 'facturedet', 'contratdet', 'facture_fourn_det', 'commande_fournisseurdet');
+	/**
+	 * @var array	List of child tables. To test if we can delete object.
+	 */
+	protected $childtables = array('supplier_proposaldet', 'propaldet', 'commandedet', 'facturedet', 'contratdet', 'facture_fourn_det', 'commande_fournisseurdet');
 
-    /**
-     * 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;
 
 
-    public $picto = 'product';
+	public $picto = 'product';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
-    public $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into images.lib.php
+	public $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into images.lib.php
 
-    /*
+	/*
     * @deprecated
     * @see label
     */
-    public $libelle;
-    /**
-     * Product label
-     *
-     * @var string
-     */
-    public $label;
-
-    /**
-     * Product description
-     *
-     * @var string
-     */
-    public $description;
+	public $libelle;
+	/**
+	 * Product label
+	 *
+	 * @var string
+	 */
+	public $label;
 
 	/**
-     * Product other fields PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION
-     *
-     * @var string
-     */
-    public $other;
+	 * Product description
+	 *
+	 * @var string
+	 */
+	public $description;
 
-    /**
-     * Check TYPE constants
-     *
-     * @var int
-     */
-    public $type = self::TYPE_PRODUCT;
+	/**
+	 * Product other fields PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION
+	 *
+	 * @var string
+	 */
+	public $other;
 
-    /**
-     * Selling price
-     *
-     * @var float
-     */
-    public $price; // Price net
+	/**
+	 * Check TYPE constants
+	 *
+	 * @var int
+	 */
+	public $type = self::TYPE_PRODUCT;
 
-    /**
-     * Price with tax
-     *
-     * @var float
-     */
-    public $price_ttc;
+	/**
+	 * Selling price
+	 *
+	 * @var float
+	 */
+	public $price; // Price net
 
-    /**
-     * Minimum price net
-     *
-     * @var float
-     */
-    public $price_min;
+	/**
+	 * Price with tax
+	 *
+	 * @var float
+	 */
+	public $price_ttc;
 
-    /**
-     * Minimum price with tax
-     *
-     * @var float
-     */
-    public $price_min_ttc;
+	/**
+	 * Minimum price net
+	 *
+	 * @var float
+	 */
+	public $price_min;
 
-    /**
-     * Base price ('TTC' for price including tax or 'HT' for net price)
-     * @var string
-     */
-    public $price_base_type;
+	/**
+	 * Minimum price with tax
+	 *
+	 * @var float
+	 */
+	public $price_min_ttc;
 
-    //! Arrays for multiprices
-    public $multiprices = array();
-    public $multiprices_ttc = array();
-    public $multiprices_base_type = array();
-    public $multiprices_min = array();
-    public $multiprices_min_ttc = array();
-    public $multiprices_tva_tx = array();
-    public $multiprices_recuperableonly = array();
+	/**
+	 * Base price ('TTC' for price including tax or 'HT' for net price)
+	 * @var string
+	 */
+	public $price_base_type;
 
-    //! Price by quantity arrays
-    public $price_by_qty;
-    public $prices_by_qty = array();
-    public $prices_by_qty_id = array();
-    public $prices_by_qty_list = array();
+	//! Arrays for multiprices
+	public $multiprices = array();
+	public $multiprices_ttc = array();
+	public $multiprices_base_type = array();
+	public $multiprices_min = array();
+	public $multiprices_min_ttc = array();
+	public $multiprices_tva_tx = array();
+	public $multiprices_recuperableonly = array();
 
-    //! Default VAT code for product (link to code into llx_c_tva but without foreign keys)
-    public $default_vat_code;
+	//! Price by quantity arrays
+	public $price_by_qty;
+	public $prices_by_qty = array();
+	public $prices_by_qty_id = array();
+	public $prices_by_qty_list = array();
 
-    //! Default VAT rate of product
-    public $tva_tx;
+	//! Default VAT code for product (link to code into llx_c_tva but without foreign keys)
+	public $default_vat_code;
 
-    //! French VAT NPR (0 or 1)
-    public $tva_npr = 0;
+	//! Default VAT rate of product
+	public $tva_tx;
 
-    //! Other local taxes
-    public $localtax1_tx;
-    public $localtax2_tx;
-    public $localtax1_type;
-    public $localtax2_type;
+	//! French VAT NPR (0 or 1)
+	public $tva_npr = 0;
 
-    /**
-     * Stock real
-     *
-     * @var int
-     */
-    public $stock_reel = 0;
+	//! Other local taxes
+	public $localtax1_tx;
+	public $localtax2_tx;
+	public $localtax1_type;
+	public $localtax2_type;
 
-    /**
-     * Stock virtual
-     *
-     * @var int
-     */
-    public $stock_theorique;
+	/**
+	 * Stock real
+	 *
+	 * @var int
+	 */
+	public $stock_reel = 0;
 
-    /**
-     * Cost price
-     *
-     * @var float
-     */
-    public $cost_price;
+	/**
+	 * Stock virtual
+	 *
+	 * @var int
+	 */
+	public $stock_theorique;
 
-    //! Average price value for product entry into stock (PMP)
-    public $pmp;
+	/**
+	 * Cost price
+	 *
+	 * @var float
+	 */
+	public $cost_price;
 
-    /**
-     * Stock alert
-     *
-     * @var int
-     */
-    public $seuil_stock_alerte = 0;
+	//! Average price value for product entry into stock (PMP)
+	public $pmp;
 
-    /**
-     * Ask for replenishment when $desiredstock < $stock_reel
-     */
-    public $desiredstock = 0;
+	/**
+	 * Stock alert
+	 *
+	 * @var float
+	 */
+	public $seuil_stock_alerte = 0;
 
-    /*
+	/**
+	 * Ask for replenishment when $desiredstock < $stock_reel
+	 */
+	public $desiredstock = 0;
+
+	/*
     * Service expiration
     */
-    public $duration_value;
+	public $duration_value;
 
-    /**
-     * Exoiration unit
-     */
-    public $duration_unit;
+	/**
+	 * Exoiration unit
+	 */
+	public $duration_unit;
 
-    /**
-     * Status indicates whether the product is on sale '1' or not '0'
-     *
-     * @var int
-     */
-    public $status = 0;
+	/**
+	 * Status indicates whether the product is on sale '1' or not '0'
+	 *
+	 * @var int
+	 */
+	public $status = 0;
 
-    /**
-     * Status indicate whether the product is available for purchase '1' or not '0'
-     *
-     * @var int
-     */
-    public $status_buy = 0;
+	/**
+	 * Status indicate whether the product is available for purchase '1' or not '0'
+	 *
+	 * @var int
+	 */
+	public $status_buy = 0;
 
-    /**
-     * Status indicates whether the product is a finished product '1' or a raw material '0'
-     *
-     * @var int
-     */
-    public $finished;
+	/**
+	 * Status indicates whether the product is a finished product '1' or a raw material '0'
+	 *
+	 * @var int
+	 */
+	public $finished;
 
-    /**
-     * We must manage lot/batch number, sell-by date and so on : '1':yes '0':no
-     *
-     * @var int
-     */
-    public $status_batch = 0;
+	/**
+	 * We must manage lot/batch number, sell-by date and so on : '1':yes '0':no
+	 *
+	 * @var int
+	 */
+	public $status_batch = 0;
 
-    /**
-     * Customs code
-     *
-     * @var string
-     */
-    public $customcode;
+	/**
+	 * Customs code
+	 *
+	 * @var string
+	 */
+	public $customcode;
 
-    /**
-     * Product URL
-     *
-     * @var string
-     */
-    public $url;
+	/**
+	 * Product URL
+	 *
+	 * @var string
+	 */
+	public $url;
 
-    //! Metric of products
-    public $weight;
-    public $weight_units;
-    public $length;
-    public $length_units;
-    public $width;
-    public $width_units;
-    public $height;
-    public $height_units;
-    public $surface;
-    public $surface_units;
-    public $volume;
-    public $volume_units;
+	//! Metric of products
+	public $weight;
+	public $weight_units;
+	public $length;
+	public $length_units;
+	public $width;
+	public $width_units;
+	public $height;
+	public $height_units;
+	public $surface;
+	public $surface_units;
+	public $volume;
+	public $volume_units;
 
-    public $net_measure;
-    public $net_measure_units;
+	public $net_measure;
+	public $net_measure_units;
 
-    public $accountancy_code_sell;
-    public $accountancy_code_sell_intra;
-    public $accountancy_code_sell_export;
-    public $accountancy_code_buy;
+	public $accountancy_code_sell;
+	public $accountancy_code_sell_intra;
+	public $accountancy_code_sell_export;
+	public $accountancy_code_buy;
 	public $accountancy_code_buy_intra;
 	public $accountancy_code_buy_export;
 
-    /**
-     * Main Barcode value
-     *
-     * @var string
-     */
-    public $barcode;
+	/**
+	 * Main Barcode value
+	 *
+	 * @var string
+	 */
+	public $barcode;
 
-    /**
-     * Main Barcode type ID
-     *
-     * @var int
-     */
-    public $barcode_type;
+	/**
+	 * Main Barcode type ID
+	 *
+	 * @var int
+	 */
+	public $barcode_type;
 
-    /**
-     * Main Barcode type code
-     *
-     * @var string
-     */
-    public $barcode_type_code;
+	/**
+	 * Main Barcode type code
+	 *
+	 * @var string
+	 */
+	public $barcode_type_code;
 
-    /**
-     * Additional barcodes (Some products have different barcodes according to the country of origin of manufacture)
-     *
-     * @var array
-     */
-    public $barcodes_extra = array();
+	/**
+	 * Additional barcodes (Some products have different barcodes according to the country of origin of manufacture)
+	 *
+	 * @var array
+	 */
+	public $barcodes_extra = array();
 
-    public $stats_propale = array();
-    public $stats_commande = array();
-    public $stats_contrat = array();
-    public $stats_facture = array();
-    public $stats_commande_fournisseur = array();
-    public $stats_reception = array();
-    public $stats_mrptoconsume = array();
-    public $stats_mrptoproduce = array();
+	public $stats_propale = array();
+	public $stats_commande = array();
+	public $stats_contrat = array();
+	public $stats_facture = array();
+	public $stats_commande_fournisseur = array();
+	public $stats_reception = array();
+	public $stats_mrptoconsume = array();
+	public $stats_mrptoproduce = array();
 
-    public $multilangs = array();
+	public $multilangs = array();
 
-    //! Size of image
-    public $imgWidth;
-    public $imgHeight;
+	//! Size of image
+	public $imgWidth;
+	public $imgHeight;
 
-    /**
-     * @var integer|string date_creation
-     */
-    public $date_creation;
+	/**
+	 * @var integer|string date_creation
+	 */
+	public $date_creation;
 
-    /**
-     * @var integer|string date_modification
-     */
-    public $date_modification;
+	/**
+	 * @var integer|string date_modification
+	 */
+	public $date_modification;
 
-    //! Id du fournisseur
-    public $product_fourn_id;
+	//! Id du fournisseur
+	public $product_fourn_id;
 
-    //! Product ID already linked to a reference supplier
-    public $product_id_already_linked;
+	//! Product ID already linked to a reference supplier
+	public $product_id_already_linked;
 
-    public $nbphoto = 0;
+	public $nbphoto = 0;
 
-    //! Contains detail of stock of product into each warehouse
-    public $stock_warehouse = array();
+	//! Contains detail of stock of product into each warehouse
+	public $stock_warehouse = array();
 
-    public $oldcopy;
+	public $oldcopy;
 
-    public $fk_default_warehouse;
-    /**
-     * @var int ID
-     */
-    public $fk_price_expression;
+	public $fk_default_warehouse;
+	/**
+	 * @var int ID
+	 */
+	public $fk_price_expression;
 
-    /* To store supplier price found */
-    public $fourn_pu;
-    public $fourn_price_base_type;
-    public $fourn_socid;
+	/* To store supplier price found */
+	public $fourn_pu;
+	public $fourn_price_base_type;
+	public $fourn_socid;
 
-    /**
-     * @deprecated
-     * @see        $ref_supplier
-     */
-    public $ref_fourn;
-    public $ref_supplier;
+	/**
+	 * @deprecated
+	 * @see        $ref_supplier
+	 */
+	public $ref_fourn;
+	public $ref_supplier;
 
-    /**
-     * Unit code ('km', 'm', 'l', 'p', ...)
-     *
-     * @var string
-     */
-    public $fk_unit;
+	/**
+	 * Unit code ('km', 'm', 'l', 'p', ...)
+	 *
+	 * @var string
+	 */
+	public $fk_unit;
 
-    /**
-     * Price is generated using multiprice rules
-     *
-     * @var int
-     */
-    public $price_autogen = 0;
+	/**
+	 * Price is generated using multiprice rules
+	 *
+	 * @var int
+	 */
+	public $price_autogen = 0;
 
 
-    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'),
-        'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
-        'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1),
+	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'),
+		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
+		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1),
 		'note_public'   =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),
-        'note'          =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62),
-        'datec'         =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
-        'tms'           =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
-        //'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
-        'fk_user_author'=>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'),
-        'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
-        //'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
-        'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
-        //'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-        //'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-    );
+		'note'          =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62),
+		'datec'         =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
+		'tms'           =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
+		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
+		'fk_user_author'=>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'),
+		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
+		'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
+		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
+		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
+	);
 
-    /**
-     * Regular product
-     */
-    const TYPE_PRODUCT = 0;
-    /**
-     * Service
-     */
-    const TYPE_SERVICE = 1;
-    /**
-     * Advanced feature: assembly kit
-     */
-    const TYPE_ASSEMBLYKIT = 2;
-    /**
-     * Advanced feature: stock kit
-     */
-    const TYPE_STOCKKIT = 3;
+	/**
+	 * Regular product
+	 */
+	const TYPE_PRODUCT = 0;
+	/**
+	 * Service
+	 */
+	const TYPE_SERVICE = 1;
+	/**
+	 * Advanced feature: assembly kit
+	 */
+	const TYPE_ASSEMBLYKIT = 2;
+	/**
+	 * Advanced feature: stock kit
+	 */
+	const TYPE_STOCKKIT = 3;
 
 
-    /**
-     *  Constructor
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->canvas = '';
-    }
+	/**
+	 *  Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->canvas = '';
+	}
 
-    /**
-     *    Check that ref and label are ok
-     *
-     * @return int         >1 if OK, <=0 if KO
-     */
-    public function check()
-    {
-        $this->ref = dol_sanitizeFileName(stripslashes($this->ref));
+	/**
+	 *    Check that ref and label are ok
+	 *
+	 * @return int         >1 if OK, <=0 if KO
+	 */
+	public function check()
+	{
+		$this->ref = dol_sanitizeFileName(stripslashes($this->ref));
 
-        $err = 0;
-        if (dol_strlen(trim($this->ref)) == 0) {
-            $err++;
-        }
+		$err = 0;
+		if (dol_strlen(trim($this->ref)) == 0) {
+			$err++;
+		}
 
-        if (dol_strlen(trim($this->label)) == 0) {
-            $err++;
-        }
+		if (dol_strlen(trim($this->label)) == 0) {
+			$err++;
+		}
 
-        if ($err > 0) {
-            return 0;
-        }
-        else
-        {
-            return 1;
-        }
-    }
+		if ($err > 0) {
+			return 0;
+		} else {
+			return 1;
+		}
+	}
 
-    /**
-     *    Insert product into database
-     *
-     * @param  User $user      User making insert
-     * @param  int  $notrigger Disable triggers
-     * @return int                         Id of product/service if OK, < 0 if KO
-     */
-    public function create($user, $notrigger = 0)
-    {
-        global $conf, $langs;
+	/**
+	 *    Insert product into database
+	 *
+	 * @param  User $user      User making insert
+	 * @param  int  $notrigger Disable triggers
+	 * @return int                         Id of product/service if OK, < 0 if KO
+	 */
+	public function create($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
-            $error = 0;
+			$error = 0;
 
-        // Clean parameters
-        $this->ref = dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)));
-        $this->label = trim($this->label);
-        $this->price_ttc = price2num($this->price_ttc);
-        $this->price = price2num($this->price);
-        $this->price_min_ttc = price2num($this->price_min_ttc);
-        $this->price_min = price2num($this->price_min);
-        if (empty($this->tva_tx)) {
-            $this->tva_tx = 0;
-        }
-        if (empty($this->tva_npr)) {
-            $this->tva_npr = 0;
-        }
-        //Local taxes
-        if (empty($this->localtax1_tx)) {
-            $this->localtax1_tx = 0;
-        }
-        if (empty($this->localtax2_tx)) {
-            $this->localtax2_tx = 0;
-        }
-        if (empty($this->localtax1_type)) {
-            $this->localtax1_type = '0';
-        }
-        if (empty($this->localtax2_type)) {
-            $this->localtax2_type = '0';
-        }
-        if (empty($this->price)) {
-            $this->price = 0;
-        }
-        if (empty($this->price_min)) {
-            $this->price_min = 0;
-        }
-        // Price by quantity
-        if (empty($this->price_by_qty)) {
-            $this->price_by_qty = 0;
-        }
+		// Clean parameters
+		$this->ref = dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)));
+		$this->label = trim($this->label);
+		$this->price_ttc = price2num($this->price_ttc);
+		$this->price = price2num($this->price);
+		$this->price_min_ttc = price2num($this->price_min_ttc);
+		$this->price_min = price2num($this->price_min);
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->tva_npr)) {
+			$this->tva_npr = 0;
+		}
+		//Local taxes
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = '0';
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = '0';
+		}
+		if (empty($this->price)) {
+			$this->price = 0;
+		}
+		if (empty($this->price_min)) {
+			$this->price_min = 0;
+		}
+		// Price by quantity
+		if (empty($this->price_by_qty)) {
+			$this->price_by_qty = 0;
+		}
 
-        if (empty($this->status)) {
-            $this->status = 0;
-        }
-        if (empty($this->status_buy)) {
-            $this->status_buy = 0;
-        }
+		if (empty($this->status)) {
+			$this->status = 0;
+		}
+		if (empty($this->status_buy)) {
+			$this->status_buy = 0;
+		}
 
-        $price_ht = 0;
-        $price_ttc = 0;
-        $price_min_ht = 0;
-        $price_min_ttc = 0;
+		$price_ht = 0;
+		$price_ttc = 0;
+		$price_min_ht = 0;
+		$price_min_ttc = 0;
 
-        //
-        if ($this->price_base_type == 'TTC' && $this->price_ttc > 0) {
-            $price_ttc = price2num($this->price_ttc, 'MU');
-            $price_ht = price2num($this->price_ttc / (1 + ($this->tva_tx / 100)), 'MU');
-        }
+		//
+		if ($this->price_base_type == 'TTC' && $this->price_ttc > 0) {
+			$price_ttc = price2num($this->price_ttc, 'MU');
+			$price_ht = price2num($this->price_ttc / (1 + ($this->tva_tx / 100)), 'MU');
+		}
 
-        //
-        if ($this->price_base_type != 'TTC' && $this->price > 0) {
-            $price_ht = price2num($this->price, 'MU');
-            $price_ttc = price2num($this->price * (1 + ($this->tva_tx / 100)), 'MU');
-        }
+		//
+		if ($this->price_base_type != 'TTC' && $this->price > 0) {
+			$price_ht = price2num($this->price, 'MU');
+			$price_ttc = price2num($this->price * (1 + ($this->tva_tx / 100)), 'MU');
+		}
 
-        //
-        if (($this->price_min_ttc > 0) && ($this->price_base_type == 'TTC')) {
-            $price_min_ttc = price2num($this->price_min_ttc, 'MU');
-            $price_min_ht = price2num($this->price_min_ttc / (1 + ($this->tva_tx / 100)), 'MU');
-        }
+		//
+		if (($this->price_min_ttc > 0) && ($this->price_base_type == 'TTC')) {
+			$price_min_ttc = price2num($this->price_min_ttc, 'MU');
+			$price_min_ht = price2num($this->price_min_ttc / (1 + ($this->tva_tx / 100)), 'MU');
+		}
 
-        //
-        if (($this->price_min > 0) && ($this->price_base_type != 'TTC')) {
-            $price_min_ht = price2num($this->price_min, 'MU');
-            $price_min_ttc = price2num($this->price_min * (1 + ($this->tva_tx / 100)), 'MU');
-        }
+		//
+		if (($this->price_min > 0) && ($this->price_base_type != 'TTC')) {
+			$price_min_ht = price2num($this->price_min, 'MU');
+			$price_min_ttc = price2num($this->price_min * (1 + ($this->tva_tx / 100)), 'MU');
+		}
 
 		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
 		$this->accountancy_code_buy_intra = trim($this->accountancy_code_buy_intra);
 		$this->accountancy_code_buy_export = trim($this->accountancy_code_buy_export);
-        $this->accountancy_code_sell = trim($this->accountancy_code_sell);
-        $this->accountancy_code_sell_intra = trim($this->accountancy_code_sell_intra);
-        $this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
+		$this->accountancy_code_sell = trim($this->accountancy_code_sell);
+		$this->accountancy_code_sell_intra = trim($this->accountancy_code_sell_intra);
+		$this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
 
-        // Barcode value
-        $this->barcode = trim($this->barcode);
+		// Barcode value
+		$this->barcode = trim($this->barcode);
 
-        // Check parameters
-        if (empty($this->label)) {
-            $this->error = 'ErrorMandatoryParametersNotProvided';
-            return -1;
-        }
+		// Check parameters
+		if (empty($this->label)) {
+			$this->error = 'ErrorMandatoryParametersNotProvided';
+			return -1;
+		}
 
-        if (empty($this->ref) || $this->ref == 'auto') {
-            // Load object modCodeProduct
-            $module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
-            if ($module != 'mod_codeproduct_leopard')    // Do not load module file for leopard
-            {
-                if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php') {
-                    $module = substr($module, 0, dol_strlen($module) - 4);
-                }
-                dol_include_once('/core/modules/product/'.$module.'.php');
-                $modCodeProduct = new $module;
-                if (!empty($modCodeProduct->code_auto)) {
-                    $this->ref = $modCodeProduct->getNextValue($this, $this->type);
-                }
-                unset($modCodeProduct);
-            }
+		if (empty($this->ref) || $this->ref == 'auto') {
+			// Load object modCodeProduct
+			$module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');
+			if ($module != 'mod_codeproduct_leopard')    // Do not load module file for leopard
+			{
+				if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php') {
+					$module = substr($module, 0, dol_strlen($module) - 4);
+				}
+				dol_include_once('/core/modules/product/'.$module.'.php');
+				$modCodeProduct = new $module;
+				if (!empty($modCodeProduct->code_auto)) {
+					$this->ref = $modCodeProduct->getNextValue($this, $this->type);
+				}
+				unset($modCodeProduct);
+			}
 
-            if (empty($this->ref)) {
-                $this->error = 'ProductModuleNotSetupForAutoRef';
-                return -2;
-            }
-        }
+			if (empty($this->ref)) {
+				$this->error = 'ProductModuleNotSetupForAutoRef';
+				return -2;
+			}
+		}
 
-        dol_syslog(get_class($this)."::create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type, LOG_DEBUG);
+		dol_syslog(get_class($this)."::create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type, LOG_DEBUG);
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
-        if ($this->barcode == -1) {
-            $this->barcode = $this->get_barcode($this, $this->barcode_type_code);
-        }
+		// For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts)
+		if ($this->barcode == -1) {
+			$this->barcode = $this->get_barcode($this, $this->barcode_type_code);
+		}
 
-        // Check more parameters
-        // If error, this->errors[] is filled
-        $result = $this->verify();
+		// Check more parameters
+		// If error, this->errors[] is filled
+		$result = $this->verify();
 
-        if ($result >= 0) {
-            $sql = "SELECT count(*) as nb";
-            $sql .= " FROM ".MAIN_DB_PREFIX."product";
-            $sql .= " WHERE entity IN (".getEntity('product').")";
-            $sql .= " AND ref = '".$this->db->escape($this->ref)."'";
+		if ($result >= 0) {
+			$sql = "SELECT count(*) as nb";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product";
+			$sql .= " WHERE entity IN (".getEntity('product').")";
+			$sql .= " AND ref = '".$this->db->escape($this->ref)."'";
 
-            $result = $this->db->query($sql);
-            if ($result) {
-                $obj = $this->db->fetch_object($result);
-                if ($obj->nb == 0) {
-                    // Produit non deja existant
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
-                    $sql .= "datec";
-                    $sql .= ", entity";
-                    $sql .= ", ref";
-                    $sql .= ", ref_ext";
-                    $sql .= ", price_min";
-                    $sql .= ", price_min_ttc";
-                    $sql .= ", label";
-                    $sql .= ", fk_user_author";
-                    $sql .= ", fk_product_type";
-                    $sql .= ", price";
-                    $sql .= ", price_ttc";
-                    $sql .= ", price_base_type";
-                    $sql .= ", tobuy";
-                    $sql .= ", tosell";
-                    $sql .= ", accountancy_code_buy";
-                    $sql .= ", accountancy_code_buy_intra";
-                    $sql .= ", accountancy_code_buy_export";
-                    $sql .= ", accountancy_code_sell";
-                    $sql .= ", accountancy_code_sell_intra";
-                    $sql .= ", accountancy_code_sell_export";
-                    $sql .= ", canvas";
-                    $sql .= ", finished";
-                    $sql .= ", tobatch";
-                    $sql .= ", fk_unit";
-                    $sql .= ") VALUES (";
-                    $sql .= "'".$this->db->idate($now)."'";
-                    $sql .= ", ".$conf->entity;
-                    $sql .= ", '".$this->db->escape($this->ref)."'";
-                    $sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
-                    $sql .= ", ".price2num($price_min_ht);
-                    $sql .= ", ".price2num($price_min_ttc);
-                    $sql .= ", ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
-                    $sql .= ", ".$user->id;
-                    $sql .= ", ".$this->type;
-                    $sql .= ", ".price2num($price_ht);
-                    $sql .= ", ".price2num($price_ttc);
-                    $sql .= ", '".$this->db->escape($this->price_base_type)."'";
-                    $sql .= ", ".$this->status;
-                    $sql .= ", ".$this->status_buy;
-                    $sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
-                    $sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
-                    $sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
-                    $sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
-                    $sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
-                    $sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
-                    $sql .= ", '".$this->db->escape($this->canvas)."'";
-                    $sql .= ", ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'null' : (int) $this->finished);
-                    $sql .= ", ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);
-                    $sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
-                    $sql .= ")";
+			$result = $this->db->query($sql);
+			if ($result) {
+				$obj = $this->db->fetch_object($result);
+				if ($obj->nb == 0) {
+					// Produit non deja existant
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";
+					$sql .= "datec";
+					$sql .= ", entity";
+					$sql .= ", ref";
+					$sql .= ", ref_ext";
+					$sql .= ", price_min";
+					$sql .= ", price_min_ttc";
+					$sql .= ", label";
+					$sql .= ", fk_user_author";
+					$sql .= ", fk_product_type";
+					$sql .= ", price";
+					$sql .= ", price_ttc";
+					$sql .= ", price_base_type";
+					$sql .= ", tobuy";
+					$sql .= ", tosell";
+					$sql .= ", accountancy_code_buy";
+					$sql .= ", accountancy_code_buy_intra";
+					$sql .= ", accountancy_code_buy_export";
+					$sql .= ", accountancy_code_sell";
+					$sql .= ", accountancy_code_sell_intra";
+					$sql .= ", accountancy_code_sell_export";
+					$sql .= ", canvas";
+					$sql .= ", finished";
+					$sql .= ", tobatch";
+					$sql .= ", fk_unit";
+					$sql .= ") VALUES (";
+					$sql .= "'".$this->db->idate($now)."'";
+					$sql .= ", ".$conf->entity;
+					$sql .= ", '".$this->db->escape($this->ref)."'";
+					$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+					$sql .= ", ".price2num($price_min_ht);
+					$sql .= ", ".price2num($price_min_ttc);
+					$sql .= ", ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+					$sql .= ", ".$user->id;
+					$sql .= ", ".$this->type;
+					$sql .= ", ".price2num($price_ht);
+					$sql .= ", ".price2num($price_ttc);
+					$sql .= ", '".$this->db->escape($this->price_base_type)."'";
+					$sql .= ", ".$this->status;
+					$sql .= ", ".$this->status_buy;
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
+					$sql .= ", '".$this->db->escape($this->canvas)."'";
+					$sql .= ", ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'null' : (int) $this->finished);
+					$sql .= ", ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);
+					$sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
+					$sql .= ")";
 
-                    dol_syslog(get_class($this)."::Create", LOG_DEBUG);
-                    $result = $this->db->query($sql);
-                    if ($result) {
-                        $id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
+					dol_syslog(get_class($this)."::Create", LOG_DEBUG);
+					$result = $this->db->query($sql);
+					if ($result) {
+						$id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");
 
-                        if ($id > 0) {
-                            $this->id = $id;
-                            $this->price            = $price_ht;
-                            $this->price_ttc        = $price_ttc;
-                            $this->price_min        = $price_min_ht;
-                            $this->price_min_ttc    = $price_min_ttc;
+						if ($id > 0) {
+							$this->id = $id;
+							$this->price            = $price_ht;
+							$this->price_ttc        = $price_ttc;
+							$this->price_min        = $price_min_ht;
+							$this->price_min_ttc    = $price_min_ttc;
 
-                            $result = $this->_log_price($user);
-                            if ($result > 0) {
-                                if ($this->update($id, $user, true, 'add') <= 0) {
-                                    $error++;
-                                }
-                            }
-                            else
-                            {
-                                $error++;
-                                $this->error = $this->db->lasterror();
-                            }
-                        }
-                        else
-                        {
-                            $error++;
-                            $this->error = 'ErrorFailedToGetInsertedId';
-                        }
-                    }
-                    else
-                    {
-                        $error++;
-                        $this->error = $this->db->lasterror();
-                    }
-                }
-                else
-                {
-                    // Product already exists with this ref
-                    $langs->load("products");
-                    $error++;
-                    $this->error = "ErrorProductAlreadyExists";
-                }
-            }
-            else
-            {
-                $error++;
-                $this->error = $this->db->lasterror();
-            }
+							$result = $this->_log_price($user);
+							if ($result > 0) {
+								if ($this->update($id, $user, true, 'add') <= 0) {
+									$error++;
+								}
+							} else {
+								$error++;
+								$this->error = $this->db->lasterror();
+							}
+						} else {
+							$error++;
+							$this->error = 'ErrorFailedToGetInsertedId';
+						}
+					} else {
+						$error++;
+						$this->error = $this->db->lasterror();
+					}
+				} else {
+					// Product already exists with this ref
+					$langs->load("products");
+					$error++;
+					$this->error = "ErrorProductAlreadyExists";
+				}
+			} else {
+				$error++;
+				$this->error = $this->db->lasterror();
+			}
 
-            if (!$error && !$notrigger) {
-                // Call trigger
-                $result = $this->call_trigger('PRODUCT_CREATE', $user);
-                if ($result < 0) { $error++;
-                }
-                // End call triggers
-            }
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('PRODUCT_CREATE', $user);
+				if ($result < 0) { $error++;
+				}
+				// End call triggers
+			}
 
-            if (!$error) {
-                $this->db->commit();
-                return $this->id;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -$error;
-            }
-        }
-        else
-          {
-            $this->db->rollback();
-            dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
-            return -3;
-        }
-    }
+			if (!$error) {
+				$this->db->commit();
+				return $this->id;
+			} else {
+				$this->db->rollback();
+				return -$error;
+			}
+		} else {
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
+			return -3;
+		}
+	}
 
 
-    /**
-     *    Check properties of product are ok (like name, barcode, ...).
-     *    All properties must be already loaded on object (this->barcode, this->barcode_type_code, ...).
-     *
-     * @return int        0 if OK, <0 if KO
-     */
-    public function verify()
-    {
-        $this->errors = array();
+	/**
+	 *    Check properties of product are ok (like name, barcode, ...).
+	 *    All properties must be already loaded on object (this->barcode, this->barcode_type_code, ...).
+	 *
+	 * @return int        0 if OK, <0 if KO
+	 */
+	public function verify()
+	{
+		$this->errors = array();
 
-        $result = 0;
-        $this->ref = trim($this->ref);
+		$result = 0;
+		$this->ref = trim($this->ref);
 
-        if (!$this->ref) {
-            $this->errors[] = 'ErrorBadRef';
-            $result = -2;
-        }
+		if (!$this->ref) {
+			$this->errors[] = 'ErrorBadRef';
+			$result = -2;
+		}
 
-        $rescode = $this->check_barcode($this->barcode, $this->barcode_type_code);
-        if ($rescode) {
-            if ($rescode == -1) {
-                $this->errors[] = 'ErrorBadBarCodeSyntax';
-            }
-            elseif ($rescode == -2) {
-                $this->errors[] = 'ErrorBarCodeRequired';
-            }
-            elseif ($rescode == -3) {
-                // Note: Common usage is to have barcode unique. For variants, we should have a different barcode.
-                $this->errors[] = 'ErrorBarCodeAlreadyUsed';
-            }
+		$rescode = $this->check_barcode($this->barcode, $this->barcode_type_code);
+		if ($rescode) {
+			if ($rescode == -1) {
+				$this->errors[] = 'ErrorBadBarCodeSyntax';
+			} elseif ($rescode == -2) {
+				$this->errors[] = 'ErrorBarCodeRequired';
+			} elseif ($rescode == -3) {
+				// Note: Common usage is to have barcode unique. For variants, we should have a different barcode.
+				$this->errors[] = 'ErrorBarCodeAlreadyUsed';
+			}
 
-            $result = -3;
-        }
+			$result = -3;
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Check barcode
-     *
-     * @param  string $valuetotest Value to test
-     * @param  string $typefortest Type of barcode (ISBN, EAN, ...)
-     * @return int                        0 if OK
-     *                                     -1 ErrorBadBarCodeSyntax
-     *                                     -2 ErrorBarCodeRequired
-     *                                     -3 ErrorBarCodeAlreadyUsed
-     */
-    public function check_barcode($valuetotest, $typefortest)
-    {
-        // phpcs:enable
-        global $conf;
-        if (!empty($conf->barcode->enabled) && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
-            $module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Check barcode
+	 *
+	 * @param  string $valuetotest Value to test
+	 * @param  string $typefortest Type of barcode (ISBN, EAN, ...)
+	 * @return int                        0 if OK
+	 *                                     -1 ErrorBadBarCodeSyntax
+	 *                                     -2 ErrorBarCodeRequired
+	 *                                     -3 ErrorBarCodeAlreadyUsed
+	 */
+	public function check_barcode($valuetotest, $typefortest)
+	{
+		// phpcs:enable
+		global $conf;
+		if (!empty($conf->barcode->enabled) && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
+			$module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
 
-            $dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res = dol_include_once($dirroot.$module.'.php');
-                if ($res) { break;
-                }
-            }
+			$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res = dol_include_once($dirroot.$module.'.php');
+				if ($res) { break;
+				}
+			}
 
-            $mod = new $module();
+			$mod = new $module();
 
-            dol_syslog(get_class($this)."::check_barcode value=".$valuetotest." type=".$typefortest." module=".$module);
-            $result = $mod->verif($this->db, $valuetotest, $this, 0, $typefortest);
-            return $result;
-        }
-        else
-        {
-            return 0;
-        }
-    }
+			dol_syslog(get_class($this)."::check_barcode value=".$valuetotest." type=".$typefortest." module=".$module);
+			$result = $mod->verif($this->db, $valuetotest, $this, 0, $typefortest);
+			return $result;
+		} else {
+			return 0;
+		}
+	}
 
-    /**
-     *    Update a record into database.
-     *  If batch flag is set to on, we create records into llx_product_batch
-     *
-     * @param  int     $id          Id of product
-     * @param  User    $user        Object user making update
-     * @param  int     $notrigger   Disable triggers
-     * @param  string  $action      Current action for hookmanager ('add' or 'update')
+	/**
+	 *  Update a record into database.
+	 *  If batch flag is set to on, we create records into llx_product_batch
+	 *
+	 * @param  int     $id          Id of product
+	 * @param  User    $user        Object user making update
+	 * @param  int     $notrigger   Disable triggers
+	 * @param  string  $action      Current action for hookmanager ('add' or 'update')
 	 * @param  boolean $updatetype  Update product type
-     * @return int                  1 if OK, -1 if ref already exists, -2 if other error
-     */
-    public function update($id, $user, $notrigger = false, $action = 'update', $updatetype = false)
-    {
-        global $langs, $conf, $hookmanager;
-
-        $error = 0;
-
-        // Check parameters
-        if (!$this->label) { $this->label = 'MISSING LABEL';
-        }
-
-        // Clean parameters
-        $this->ref = dol_string_nospecial(trim($this->ref));
-        $this->label = trim($this->label);
-        $this->description = trim($this->description);
-        $this->note = (isset($this->note) ? trim($this->note) : null);
-        $this->net_measure = price2num($this->net_measure);
-        $this->net_measure_units = trim($this->net_measure_units);
-        $this->weight = price2num($this->weight);
-        $this->weight_units = trim($this->weight_units);
-        $this->length = price2num($this->length);
-        $this->length_units = trim($this->length_units);
-        $this->width = price2num($this->width);
-        $this->width_units = trim($this->width_units);
-        $this->height = price2num($this->height);
-        $this->height_units = trim($this->height_units);
-        // set unit not defined
-        if (is_numeric($this->length_units)) {
-        	$this->width_units = $this->length_units; // Not used yet
-        }
-        if (is_numeric($this->length_units)) {
-        	$this->height_units = $this->length_units; // Not used yet
-        }
-        // Automated compute surface and volume if not filled
-        if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units) {
-            $this->surface = $this->length * $this->width;
-            $this->surface_units = measuring_units_squared($this->length_units);
-        }
-        if (empty($this->volume) && !empty($this->surface_units) && !empty($this->height) && $this->length_units == $this->height_units) {
-            $this->volume = $this->surface * $this->height;
-            $this->volume_units = measuring_units_cubed($this->height_units);
-        }
-
-        $this->surface = price2num($this->surface);
-        $this->surface_units = trim($this->surface_units);
-        $this->volume = price2num($this->volume);
-        $this->volume_units = trim($this->volume_units);
-        if (empty($this->tva_tx)) {
-            $this->tva_tx = 0;
-        }
-        if (empty($this->tva_npr)) {
-            $this->tva_npr = 0;
-        }
-        if (empty($this->localtax1_tx)) {
-            $this->localtax1_tx = 0;
-        }
-        if (empty($this->localtax2_tx)) {
-            $this->localtax2_tx = 0;
-        }
-        if (empty($this->localtax1_type)) {
-            $this->localtax1_type = '0';
-        }
-        if (empty($this->localtax2_type)) {
-            $this->localtax2_type = '0';
-        }
-        if (empty($this->status)) {
-            $this->status = 0;
-        }
-        if (empty($this->status_buy)) {
-            $this->status_buy = 0;
-        }
-
-        if (empty($this->country_id)) {
-            $this->country_id = 0;
-        }
-
-        // Barcode value
-        $this->barcode = trim($this->barcode);
-
-        $this->accountancy_code_buy = trim($this->accountancy_code_buy);
-        $this->accountancy_code_buy_intra = trim($this->accountancy_code_buy_intra);
-        $this->accountancy_code_buy_export = trim($this->accountancy_code_buy_export);
-        $this->accountancy_code_sell = trim($this->accountancy_code_sell);
-        $this->accountancy_code_sell_intra = trim($this->accountancy_code_sell_intra);
-        $this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
-
-
-        $this->db->begin();
-
-        // Check name is required and codes are ok or unique.
-        // If error, this->errors[] is filled
-        if ($action != 'add') {
-            $result = $this->verify(); // We don't check when update called during a create because verify was already done
-        }
-
-        if ($result >= 0) {
-            if (empty($this->oldcopy)) {
-                $org = new self($this->db);
-                $org->fetch($this->id);
-                $this->oldcopy = $org;
-            }
-
-            // Test if batch management is activated on existing product
-            // If yes, we create missing entries into product_batch
-            if ($this->hasbatch() && !$this->oldcopy->hasbatch()) {
-                //$valueforundefinedlot = 'Undefined';  // In previous version, 39 and lower
-                $valueforundefinedlot = '000000';
-
-                dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");
-
-                $this->load_stock();
-                foreach ($this->stock_warehouse as $idW => $ObjW)   // For each warehouse where we have stocks defined for this product (for each lines in product_stock)
-                {
-                    $qty_batch = 0;
-                    foreach ($ObjW->detail_batch as $detail)    // Each lines of detail in product_batch of the current $ObjW = product_stock
-                    {
-                        if ($detail->batch == $valueforundefinedlot || $detail->batch == 'Undefined') {
-                            // We discard this line, we will create it later
-                            $sqlclean = "DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE batch in('Undefined', '".$valueforundefinedlot."') AND fk_product_stock = ".$ObjW->id;
-                            $result = $this->db->query($sqlclean);
-                            if (!$result) {
-                                dol_print_error($this->db);
-                                exit;
-                            }
-                            continue;
-                        }
-
-                        $qty_batch += $detail->qty;
-                    }
-                    // Quantities in batch details are not same as stock quantity,
-                    // so we add a default batch record to complete and get same qty in parent and child table
-                    if ($ObjW->real <> $qty_batch) {
-                        $ObjBatch = new Productbatch($this->db);
-                        $ObjBatch->batch = $valueforundefinedlot;
-                        $ObjBatch->qty = ($ObjW->real - $qty_batch);
-                        $ObjBatch->fk_product_stock = $ObjW->id;
-
-                        if ($ObjBatch->create($user, 1) < 0) {
-                            $error++;
-                            $this->errors = $ObjBatch->errors;
-                        }
-                    }
-                }
-            }
-
-            // For automatic creation
-            if ($this->barcode == -1) { $this->barcode = $this->get_barcode($this, $this->barcode_type_code);
-            }
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."product";
-            $sql .= " SET label = '".$this->db->escape($this->label)."'";
-
-            if ($updatetype && ($this->isProduct() || $this->isService())) {
-                $sql .= ", fk_product_type = ".$this->type;
-            }
-
-            $sql .= ", ref = '".$this->db->escape($this->ref)."'";
-            $sql .= ", ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
-            $sql .= ", default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null");
-            $sql .= ", tva_tx = ".$this->tva_tx;
-            $sql .= ", recuperableonly = ".$this->tva_npr;
-            $sql .= ", localtax1_tx = ".$this->localtax1_tx;
-            $sql .= ", localtax2_tx = ".$this->localtax2_tx;
-            $sql .= ", localtax1_type = ".($this->localtax1_type != '' ? "'".$this->db->escape($this->localtax1_type)."'" : "'0'");
-            $sql .= ", localtax2_type = ".($this->localtax2_type != '' ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'");
-
-            $sql .= ", barcode = ".(empty($this->barcode) ? "null" : "'".$this->db->escape($this->barcode)."'");
-            $sql .= ", fk_barcode_type = ".(empty($this->barcode_type) ? "null" : $this->db->escape($this->barcode_type));
-
-            $sql .= ", tosell = ".(int) $this->status;
-            $sql .= ", tobuy = ".(int) $this->status_buy;
-            $sql .= ", tobatch = ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : (int) $this->status_batch);
-            $sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0) ? "null" : (int) $this->finished);
-            $sql .= ", net_measure = ".($this->net_measure != '' ? "'".$this->db->escape($this->net_measure)."'" : 'null');
-            $sql .= ", net_measure_units = ".($this->net_measure_units != '' ? "'".$this->db->escape($this->net_measure_units)."'" : 'null');
-            $sql .= ", weight = ".($this->weight != '' ? "'".$this->db->escape($this->weight)."'" : 'null');
-            $sql .= ", weight_units = ".($this->weight_units != '' ? "'".$this->db->escape($this->weight_units)."'" : 'null');
-            $sql .= ", length = ".($this->length != '' ? "'".$this->db->escape($this->length)."'" : 'null');
-            $sql .= ", length_units = ".($this->length_units != '' ? "'".$this->db->escape($this->length_units)."'" : 'null');
-            $sql .= ", width= ".($this->width != '' ? "'".$this->db->escape($this->width)."'" : 'null');
-            $sql .= ", width_units = ".($this->width_units != '' ? "'".$this->db->escape($this->width_units)."'" : 'null');
-            $sql .= ", height = ".($this->height != '' ? "'".$this->db->escape($this->height)."'" : 'null');
-            $sql .= ", height_units = ".($this->height_units != '' ? "'".$this->db->escape($this->height_units)."'" : 'null');
-            $sql .= ", surface = ".($this->surface != '' ? "'".$this->db->escape($this->surface)."'" : 'null');
-            $sql .= ", surface_units = ".($this->surface_units != '' ? "'".$this->db->escape($this->surface_units)."'" : 'null');
-            $sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');
-            $sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
-            $sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
-            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && is_numeric($this->seuil_stock_alerte)) ? (int) $this->seuil_stock_alerte : 'null');
-            $sql .= ", description = '".$this->db->escape($this->description)."'";
-            $sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');
-            $sql .= ", customcode = '".$this->db->escape($this->customcode)."'";
-            $sql .= ", fk_country = ".($this->country_id > 0 ? (int) $this->country_id : 'null');
-            $sql .= ", note = ".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : 'null');
-            $sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
-            $sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
-            $sql .= ", accountancy_code_buy_intra = '".$this->db->escape($this->accountancy_code_buy_intra)."'";
-            $sql .= ", accountancy_code_buy_export = '".$this->db->escape($this->accountancy_code_buy_export)."'";
-            $sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
-            $sql .= ", accountancy_code_sell_intra= '".$this->db->escape($this->accountancy_code_sell_intra)."'";
-            $sql .= ", accountancy_code_sell_export= '".$this->db->escape($this->accountancy_code_sell_export)."'";
-            $sql .= ", desiredstock = ".((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? (int) $this->desiredstock : "null");
-            $sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
-            $sql .= ", fk_unit= ".(!$this->fk_unit ? 'NULL' : (int) $this->fk_unit);
-            $sql .= ", price_autogen = ".(!$this->price_autogen ? 0 : 1);
-            $sql .= ", fk_price_expression = ".($this->fk_price_expression != 0 ? (int) $this->fk_price_expression : 'NULL');
-            $sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
-
-            // stock field is not here because it is a denormalized value from product_stock.
-            $sql .= " WHERE rowid = ".$id;
-
-            dol_syslog(get_class($this)."::update", LOG_DEBUG);
-
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $this->id = $id;
-
-                // Multilangs
-                if (!empty($conf->global->MAIN_MULTILANGS)) {
-                    if ($this->setMultiLangs($user) < 0) {
-                           $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
-                           return -2;
-                    }
-                }
-
-                $action = 'update';
-
-                // Actions on extra fields
-                if (!$error) {
-                    $result = $this->insertExtraFields();
-                    if ($result < 0) {
-                        $error++;
-                    }
-                }
-
-                if (!$error && !$notrigger) {
-                    // Call trigger
-                    $result = $this->call_trigger('PRODUCT_MODIFY', $user);
-                    if ($result < 0) {
-                        $error++;
-                    }
-                    // End call triggers
-                }
-
-                if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref)) {
-                    // We remove directory
-                    if ($conf->product->dir_output) {
-                        $olddir = $conf->product->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);
-                        $newdir = $conf->product->dir_output."/".dol_sanitizeFileName($this->ref);
-                        if (file_exists($olddir)) {
-                            //include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-                            //$res = dol_move($olddir, $newdir);
-                            // do not use dol_move with directory
-                            $res = @rename($olddir, $newdir);
-                            if (!$res) {
-                                $langs->load("errors");
-                                $this->error = $langs->trans('ErrorFailToRenameDir', $olddir, $newdir);
-                                $error++;
-                            }
-                        }
-                    }
-                }
-
-                if (!$error) {
-                    if ($conf->variants->enabled) {
-                        include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
-
-                        $comb = new ProductCombination($this->db);
-
-                        foreach ($comb->fetchAllByFkProductParent($this->id) as $currcomb) {
-                                 $currcomb->updateProperties($this, $user);
-                        }
-                    }
-
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -$error;
-                }
-            }
-            else
-            {
-                if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                    $langs->load("errors");
-                    if (empty($conf->barcode->enabled) || empty($this->barcode)) {
-                        $this->error = $langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists", $this->ref);
-                    } else {
-                        $this->error = $langs->trans("Error")." : ".$langs->trans("ErrorProductBarCodeAlreadyExists", $this->barcode);
-                    }
-                    $this->errors[] = $this->error;
-                    $this->db->rollback();
-                    return -1;
-                }
-                else
-                {
-                    $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
-                    $this->errors[] = $this->error;
-                    $this->db->rollback();
-                    return -2;
-                }
-            }
-        }
-        else
-          {
-            $this->db->rollback();
-            dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
-            return -3;
-        }
-    }
-
-    /**
-     *  Delete a product from database (if not used)
-     *
-     * @param  User $user      User (object) deleting product
-     * @param  int  $notrigger Do not execute trigger
-     * @return int                    < 0 if KO, 0 = Not possible, > 0 if OK
-     */
-    public function delete(User $user, $notrigger = 0)
-    {
-        global $conf, $langs;
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $error = 0;
-
-        // Check parameters
-        if (empty($this->id)) {
-            $this->error = "Object must be fetched before calling delete";
-            return -1;
-        }
-        if (($this->type == Product::TYPE_PRODUCT && empty($user->rights->produit->supprimer)) || ($this->type == Product::TYPE_SERVICE && empty($user->rights->service->supprimer))) {
-            $this->error = "ErrorForbidden";
-            return 0;
-        }
-
-        $objectisused = $this->isObjectUsed($this->id);
-        if (empty($objectisused)) {
-            $this->db->begin();
-
-            if (!$error && empty($notrigger)) {
-                // Call trigger
-                $result = $this->call_trigger('PRODUCT_DELETE', $user);
-                if ($result < 0) {
-                    $error++;
-                }
-                // End call triggers
-            }
-
-            // Delete from product_batch on product delete
-            if (!$error) {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX.'product_batch';
-                $sql .= " WHERE fk_product_stock IN (";
-                $sql .= "SELECT rowid FROM ".MAIN_DB_PREFIX.'product_stock';
-                $sql .= " WHERE fk_product = ".(int) $this->id.")";
-
-                $result = $this->db->query($sql);
-                if (!$result) {
-                    $error++;
-                    $this->errors[] = $this->db->lasterror();
-                }
-            }
-
-            // Delete all child tables
-            if (!$error) {
-                $elements = array('product_fournisseur_price', 'product_price', 'product_lang', 'categorie_product', 'product_stock', 'product_customer_price', 'product_lot'); // product_batch is done before
-                foreach ($elements as $table)
-                {
-                    if (!$error) {
-                        $sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
-                        $sql .= " WHERE fk_product = ".(int) $this->id;
-
-                        $result = $this->db->query($sql);
-                        if (!$result) {
-                            $error++;
-                            $this->errors[] = $this->db->lasterror();
-                        }
-                    }
-                }
-            }
-
-            if (!$error) {
-                include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
-                include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
-
-                //If it is a parent product, then we remove the association with child products
-                $prodcomb = new ProductCombination($this->db);
-
-                if ($prodcomb->deleteByFkProductParent($user, $this->id) < 0) {
-                    $error++;
-                    $this->errors[] = 'Error deleting combinations';
-                }
-
-                //We also check if it is a child product
-                if (!$error && ($prodcomb->fetchByFkProductChild($this->id) > 0) && ($prodcomb->delete($user) < 0)) {
-                    $error++;
-                    $this->errors[] = 'Error deleting child combination';
-                }
-            }
-
-            // Delete from product_association
-            if (!$error) {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
-                $sql .= " WHERE fk_product_pere = ".(int) $this->id." OR fk_product_fils = ".(int) $this->id;
-
-                $result = $this->db->query($sql);
-                if (!$result) {
-                    $error++;
-                    $this->errors[] = $this->db->lasterror();
-                }
-            }
-
-            // Delete product
-            if (!$error) {
-                $sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
-                $sqlz .= " WHERE rowid = ".(int) $this->id;
-
-                $resultz = $this->db->query($sqlz);
-                if (!$resultz) {
-                    $error++;
-                    $this->errors[] = $this->db->lasterror();
-                }
-            }
-
-            if (!$error) {
-                // We remove directory
-                $ref = dol_sanitizeFileName($this->ref);
-                if ($conf->product->dir_output) {
-                    $dir = $conf->product->dir_output."/".$ref;
-                    if (file_exists($dir)) {
-                        $res = @dol_delete_dir_recursive($dir);
-                        if (!$res) {
-                            $this->errors[] = 'ErrorFailToDeleteDir';
-                            $error++;
-                        }
-                    }
-                }
-            }
-
-            // Remove extrafields
-            if (!$error)
-            {
-                $result = $this->deleteExtraFields();
-                if ($result < 0) {
-                    $error++;
-                    dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-                }
-            }
-
-            if (!$error) {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                foreach ($this->errors as $errmsg)
-                {
-                    dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-                }
-                $this->db->rollback();
-                return -$error;
-            }
-        }
-        else
-        {
-            $this->error = "ErrorRecordIsUsedCantDelete";
-            return 0;
-        }
-    }
-
-    /**
-     *    Update or add a translation for a product
-     *
-     * @param  User $user Object user making update
-     * @return int        <0 if KO, >0 if OK
-     */
-    public function setMultiLangs($user)
-    {
-        global $conf, $langs;
-
-        $langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 0, 2);
-        $current_lang = $langs->getDefaultLang();
-
-        foreach ($langs_available as $key => $value)
-        {
-            if ($key == $current_lang) {
-                $sql = "SELECT rowid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-                $sql .= " WHERE fk_product=".$this->id;
-                $sql .= " AND lang='".$this->db->escape($key)."'";
-
-                $result = $this->db->query($sql);
-
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";
-                    $sql2 .= " SET ";
-                    $sql2 .= " label='".$this->db->escape($this->label)."',";
-                    $sql2 .= " description='".$this->db->escape($this->description)."'";
-                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note='".$this->db->escape($this->other)."'";
-                    }
-                    $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
-                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
-                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
-                    }
-                    $sql2 .= ")";
-                    $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
-                    $sql2 .= " '".$this->db->escape($this->description)."'";
-                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
-                        $sql2 .= ", '".$this->db->escape($this->other)."'";
-                    }
-                    $sql2 .= ")";
-                }
-                dol_syslog(get_class($this).'::setMultiLangs key = current_lang = '.$key);
-                if (!$this->db->query($sql2)) {
-                    $this->error = $this->db->lasterror();
-                    return -1;
-                }
-            }
-            elseif (isset($this->multilangs[$key])) {
-                $sql = "SELECT rowid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-                $sql .= " WHERE fk_product=".$this->id;
-                $sql .= " AND lang='".$this->db->escape($key)."'";
-
-                $result = $this->db->query($sql);
-
-                if ($this->db->num_rows($result)) // if there is already a description line for this language
-                {
-                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";
-                    $sql2 .= " SET ";
-                    $sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
-                    $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
-                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
-                        $sql2 .= ", note='".$this->db->escape($this->multilangs["$key"]["other"])."'";
-                    }
-                    $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
-                }
-                else
-                {
-                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
-                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
-                    }
-                    $sql2 .= ")";
-                    $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
-                    $sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
-                    if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
-                        $sql2 .= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";
-                    }
-                    $sql2 .= ")";
-                }
-
-                // We do not save if main fields are empty
-                if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"]) {
-                    if (!$this->db->query($sql2)) {
-                        $this->error = $this->db->lasterror();
-                        return -1;
-                    }
-                }
-            }
-            else
-            {
-                // language is not current language and we didn't provide a multilang description for this language
-            }
-        }
-
-        // Call trigger
-        $result = $this->call_trigger('PRODUCT_SET_MULTILANGS', $user);
-        if ($result < 0) {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-        // End call triggers
-
-        return 1;
-    }
-
-    /**
-     *    Delete a language for this product
-     *
-     * @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)
-    {
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_lang";
-        $sql .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
-
-        dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result) {
-            // Call trigger
-            $result = $this->call_trigger('PRODUCT_DEL_MULTILANGS', $user);
-            if ($result < 0) {
-                $this->error = $this->db->lasterror();
-                dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
-                return -1;
-            }
-            // End call triggers
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
-            return -1;
-        }
-    }
-
-    /**
-     * Sets an accountancy code for a product.
-     * Also calls PRODUCT_MODIFY trigger when modified
-     *
-     * @param 	string $type 	It can be 'buy', 'buy_intra', 'buy_export', 'sell', 'sell_intra' or 'sell_export'
-     * @param 	string $value 	Accountancy code
-     * @return 	int 			<0 KO >0 OK
-     */
-    public function setAccountancyCode($type, $value)
-    {
-        global $user, $langs, $conf;
-
-        $error = 0;
-
-        $this->db->begin();
-
-        if ($type == 'buy') {
-            $field = 'accountancy_code_buy';
-        } elseif ($type == 'buy_intra') {
+	 * @return int                  1 if OK, -1 if ref already exists, -2 if other error
+	 */
+	public function update($id, $user, $notrigger = false, $action = 'update', $updatetype = false)
+	{
+		global $langs, $conf, $hookmanager;
+
+		$error = 0;
+
+		// Check parameters
+		if (!$this->label) { $this->label = 'MISSING LABEL';
+		}
+
+		// Clean parameters
+		$this->ref = dol_string_nospecial(trim($this->ref));
+		$this->label = trim($this->label);
+		$this->description = trim($this->description);
+		$this->note = (isset($this->note) ? trim($this->note) : null);
+		$this->net_measure = price2num($this->net_measure);
+		$this->net_measure_units = trim($this->net_measure_units);
+		$this->weight = price2num($this->weight);
+		$this->weight_units = trim($this->weight_units);
+		$this->length = price2num($this->length);
+		$this->length_units = trim($this->length_units);
+		$this->width = price2num($this->width);
+		$this->width_units = trim($this->width_units);
+		$this->height = price2num($this->height);
+		$this->height_units = trim($this->height_units);
+		// set unit not defined
+		if (is_numeric($this->length_units)) {
+			$this->width_units = $this->length_units; // Not used yet
+		}
+		if (is_numeric($this->length_units)) {
+			$this->height_units = $this->length_units; // Not used yet
+		}
+		// Automated compute surface and volume if not filled
+		if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units) {
+			$this->surface = $this->length * $this->width;
+			$this->surface_units = measuring_units_squared($this->length_units);
+		}
+		if (empty($this->volume) && !empty($this->surface_units) && !empty($this->height) && $this->length_units == $this->height_units) {
+			$this->volume = $this->surface * $this->height;
+			$this->volume_units = measuring_units_cubed($this->height_units);
+		}
+
+		$this->surface = price2num($this->surface);
+		$this->surface_units = trim($this->surface_units);
+		$this->volume = price2num($this->volume);
+		$this->volume_units = trim($this->volume_units);
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->tva_npr)) {
+			$this->tva_npr = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = '0';
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = '0';
+		}
+		if (empty($this->status)) {
+			$this->status = 0;
+		}
+		if (empty($this->status_buy)) {
+			$this->status_buy = 0;
+		}
+
+		if (empty($this->country_id)) {
+			$this->country_id = 0;
+		}
+
+		if (empty($this->state_id)) {
+			$this->state_id = 0;
+		}
+
+		// Barcode value
+		$this->barcode = trim($this->barcode);
+
+		$this->accountancy_code_buy = trim($this->accountancy_code_buy);
+		$this->accountancy_code_buy_intra = trim($this->accountancy_code_buy_intra);
+		$this->accountancy_code_buy_export = trim($this->accountancy_code_buy_export);
+		$this->accountancy_code_sell = trim($this->accountancy_code_sell);
+		$this->accountancy_code_sell_intra = trim($this->accountancy_code_sell_intra);
+		$this->accountancy_code_sell_export = trim($this->accountancy_code_sell_export);
+
+
+		$this->db->begin();
+
+		// Check name is required and codes are ok or unique.
+		// If error, this->errors[] is filled
+		if ($action != 'add') {
+			$result = $this->verify(); // We don't check when update called during a create because verify was already done
+		}
+
+		if ($result >= 0) {
+			if (empty($this->oldcopy)) {
+				$org = new self($this->db);
+				$org->fetch($this->id);
+				$this->oldcopy = $org;
+			}
+
+			// Test if batch management is activated on existing product
+			// If yes, we create missing entries into product_batch
+			if ($this->hasbatch() && !$this->oldcopy->hasbatch()) {
+				//$valueforundefinedlot = 'Undefined';  // In previous version, 39 and lower
+				$valueforundefinedlot = '000000';
+
+				dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");
+
+				$this->load_stock();
+				foreach ($this->stock_warehouse as $idW => $ObjW)   // For each warehouse where we have stocks defined for this product (for each lines in product_stock)
+				{
+					$qty_batch = 0;
+					foreach ($ObjW->detail_batch as $detail)    // Each lines of detail in product_batch of the current $ObjW = product_stock
+					{
+						if ($detail->batch == $valueforundefinedlot || $detail->batch == 'Undefined') {
+							// We discard this line, we will create it later
+							$sqlclean = "DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE batch in('Undefined', '".$this->db->escape($valueforundefinedlot)."') AND fk_product_stock = ".$ObjW->id;
+							$result = $this->db->query($sqlclean);
+							if (!$result) {
+								dol_print_error($this->db);
+								exit;
+							}
+							continue;
+						}
+
+						$qty_batch += $detail->qty;
+					}
+					// Quantities in batch details are not same as stock quantity,
+					// so we add a default batch record to complete and get same qty in parent and child table
+					if ($ObjW->real <> $qty_batch) {
+						$ObjBatch = new Productbatch($this->db);
+						$ObjBatch->batch = $valueforundefinedlot;
+						$ObjBatch->qty = ($ObjW->real - $qty_batch);
+						$ObjBatch->fk_product_stock = $ObjW->id;
+
+						if ($ObjBatch->create($user, 1) < 0) {
+							$error++;
+							$this->errors = $ObjBatch->errors;
+						}
+					}
+				}
+			}
+
+			// For automatic creation
+			if ($this->barcode == -1) { $this->barcode = $this->get_barcode($this, $this->barcode_type_code);
+			}
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."product";
+			$sql .= " SET label = '".$this->db->escape($this->label)."'";
+
+			if ($updatetype && ($this->isProduct() || $this->isService())) {
+				$sql .= ", fk_product_type = ".$this->type;
+			}
+
+			$sql .= ", ref = '".$this->db->escape($this->ref)."'";
+			$sql .= ", ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
+			$sql .= ", default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null");
+			$sql .= ", tva_tx = ".$this->tva_tx;
+			$sql .= ", recuperableonly = ".$this->tva_npr;
+			$sql .= ", localtax1_tx = ".$this->localtax1_tx;
+			$sql .= ", localtax2_tx = ".$this->localtax2_tx;
+			$sql .= ", localtax1_type = ".($this->localtax1_type != '' ? "'".$this->db->escape($this->localtax1_type)."'" : "'0'");
+			$sql .= ", localtax2_type = ".($this->localtax2_type != '' ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'");
+
+			$sql .= ", barcode = ".(empty($this->barcode) ? "null" : "'".$this->db->escape($this->barcode)."'");
+			$sql .= ", fk_barcode_type = ".(empty($this->barcode_type) ? "null" : $this->db->escape($this->barcode_type));
+
+			$sql .= ", tosell = ".(int) $this->status;
+			$sql .= ", tobuy = ".(int) $this->status_buy;
+			$sql .= ", tobatch = ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : (int) $this->status_batch);
+			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0) ? "null" : (int) $this->finished);
+			$sql .= ", net_measure = ".($this->net_measure != '' ? "'".$this->db->escape($this->net_measure)."'" : 'null');
+			$sql .= ", net_measure_units = ".($this->net_measure_units != '' ? "'".$this->db->escape($this->net_measure_units)."'" : 'null');
+			$sql .= ", weight = ".($this->weight != '' ? "'".$this->db->escape($this->weight)."'" : 'null');
+			$sql .= ", weight_units = ".($this->weight_units != '' ? "'".$this->db->escape($this->weight_units)."'" : 'null');
+			$sql .= ", length = ".($this->length != '' ? "'".$this->db->escape($this->length)."'" : 'null');
+			$sql .= ", length_units = ".($this->length_units != '' ? "'".$this->db->escape($this->length_units)."'" : 'null');
+			$sql .= ", width= ".($this->width != '' ? "'".$this->db->escape($this->width)."'" : 'null');
+			$sql .= ", width_units = ".($this->width_units != '' ? "'".$this->db->escape($this->width_units)."'" : 'null');
+			$sql .= ", height = ".($this->height != '' ? "'".$this->db->escape($this->height)."'" : 'null');
+			$sql .= ", height_units = ".($this->height_units != '' ? "'".$this->db->escape($this->height_units)."'" : 'null');
+			$sql .= ", surface = ".($this->surface != '' ? "'".$this->db->escape($this->surface)."'" : 'null');
+			$sql .= ", surface_units = ".($this->surface_units != '' ? "'".$this->db->escape($this->surface_units)."'" : 'null');
+			$sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');
+			$sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');
+			$sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');
+			$sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && is_numeric($this->seuil_stock_alerte)) ? (float) $this->seuil_stock_alerte : 'null');
+			$sql .= ", description = '".$this->db->escape($this->description)."'";
+			$sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');
+			$sql .= ", customcode = '".$this->db->escape($this->customcode)."'";
+			$sql .= ", fk_country = ".($this->country_id > 0 ? (int) $this->country_id : 'null');
+			$sql .= ", fk_state = ".($this->state_id > 0 ? (int) $this->state_id : 'null');
+			$sql .= ", note = ".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : 'null');
+			$sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
+			$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
+			$sql .= ", accountancy_code_buy_intra = '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+			$sql .= ", accountancy_code_buy_export = '".$this->db->escape($this->accountancy_code_buy_export)."'";
+			$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
+			$sql .= ", accountancy_code_sell_intra= '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+			$sql .= ", accountancy_code_sell_export= '".$this->db->escape($this->accountancy_code_sell_export)."'";
+			$sql .= ", desiredstock = ".((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? (float) $this->desiredstock : "null");
+			$sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
+			$sql .= ", fk_unit= ".(!$this->fk_unit ? 'NULL' : (int) $this->fk_unit);
+			$sql .= ", price_autogen = ".(!$this->price_autogen ? 0 : 1);
+			$sql .= ", fk_price_expression = ".($this->fk_price_expression != 0 ? (int) $this->fk_price_expression : 'NULL');
+			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
+
+			// stock field is not here because it is a denormalized value from product_stock.
+			$sql .= " WHERE rowid = ".$id;
+
+			dol_syslog(get_class($this)."::update", LOG_DEBUG);
+
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$this->id = $id;
+
+				// Multilangs
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
+					if ($this->setMultiLangs($user) < 0) {
+						   $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+						   return -2;
+					}
+				}
+
+				$action = 'update';
+
+				// Actions on extra fields
+				if (!$error) {
+					$result = $this->insertExtraFields();
+					if ($result < 0) {
+						$error++;
+					}
+				}
+
+				if (!$error && !$notrigger) {
+					// Call trigger
+					$result = $this->call_trigger('PRODUCT_MODIFY', $user);
+					if ($result < 0) {
+						$error++;
+					}
+					// End call triggers
+				}
+
+				if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref)) {
+					// We remove directory
+					if ($conf->product->dir_output) {
+						$olddir = $conf->product->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);
+						$newdir = $conf->product->dir_output."/".dol_sanitizeFileName($this->ref);
+						if (file_exists($olddir)) {
+							//include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+							//$res = dol_move($olddir, $newdir);
+							// do not use dol_move with directory
+							$res = @rename($olddir, $newdir);
+							if (!$res) {
+								$langs->load("errors");
+								$this->error = $langs->trans('ErrorFailToRenameDir', $olddir, $newdir);
+								$error++;
+							}
+						}
+					}
+				}
+
+				if (!$error) {
+					if ($conf->variants->enabled) {
+						include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
+
+						$comb = new ProductCombination($this->db);
+
+						foreach ($comb->fetchAllByFkProductParent($this->id) as $currcomb) {
+							$currcomb->updateProperties($this, $user);
+						}
+					}
+
+					$this->db->commit();
+					return 1;
+				} else {
+					$this->db->rollback();
+					return -$error;
+				}
+			} else {
+				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+					$langs->load("errors");
+					if (empty($conf->barcode->enabled) || empty($this->barcode)) {
+						$this->error = $langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists", $this->ref);
+					} else {
+						$this->error = $langs->trans("Error")." : ".$langs->trans("ErrorProductBarCodeAlreadyExists", $this->barcode);
+					}
+					$this->errors[] = $this->error;
+					$this->db->rollback();
+					return -1;
+				} else {
+					$this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+					$this->errors[] = $this->error;
+					$this->db->rollback();
+					return -2;
+				}
+			}
+		} else {
+			$this->db->rollback();
+			dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
+			return -3;
+		}
+	}
+
+	/**
+	 *  Delete a product from database (if not used)
+	 *
+	 * @param  User $user      User (object) deleting product
+	 * @param  int  $notrigger Do not execute trigger
+	 * @return int                    < 0 if KO, 0 = Not possible, > 0 if OK
+	 */
+	public function delete(User $user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		// Check parameters
+		if (empty($this->id)) {
+			$this->error = "Object must be fetched before calling delete";
+			return -1;
+		}
+		if (($this->type == Product::TYPE_PRODUCT && empty($user->rights->produit->supprimer)) || ($this->type == Product::TYPE_SERVICE && empty($user->rights->service->supprimer))) {
+			$this->error = "ErrorForbidden";
+			return 0;
+		}
+
+		$objectisused = $this->isObjectUsed($this->id);
+		if (empty($objectisused)) {
+			$this->db->begin();
+
+			if (!$error && empty($notrigger)) {
+				// Call trigger
+				$result = $this->call_trigger('PRODUCT_DELETE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+
+			// Delete from product_batch on product delete
+			if (!$error) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX.'product_batch';
+				$sql .= " WHERE fk_product_stock IN (";
+				$sql .= "SELECT rowid FROM ".MAIN_DB_PREFIX.'product_stock';
+				$sql .= " WHERE fk_product = ".(int) $this->id.")";
+
+				$result = $this->db->query($sql);
+				if (!$result) {
+					$error++;
+					$this->errors[] = $this->db->lasterror();
+				}
+			}
+
+			// Delete all child tables
+			if (!$error) {
+				$elements = array('product_fournisseur_price', 'product_price', 'product_lang', 'categorie_product', 'product_stock', 'product_customer_price', 'product_lot'); // product_batch is done before
+				foreach ($elements as $table)
+				{
+					if (!$error) {
+						$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
+						$sql .= " WHERE fk_product = ".(int) $this->id;
+
+						$result = $this->db->query($sql);
+						if (!$result) {
+							$error++;
+							$this->errors[] = $this->db->lasterror();
+						}
+					}
+				}
+			}
+
+			if (!$error) {
+				include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
+				include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';
+
+				//If it is a parent product, then we remove the association with child products
+				$prodcomb = new ProductCombination($this->db);
+
+				if ($prodcomb->deleteByFkProductParent($user, $this->id) < 0) {
+					$error++;
+					$this->errors[] = 'Error deleting combinations';
+				}
+
+				//We also check if it is a child product
+				if (!$error && ($prodcomb->fetchByFkProductChild($this->id) > 0) && ($prodcomb->delete($user) < 0)) {
+					$error++;
+					$this->errors[] = 'Error deleting child combination';
+				}
+			}
+
+			// Delete from product_association
+			if (!$error) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
+				$sql .= " WHERE fk_product_pere = ".(int) $this->id." OR fk_product_fils = ".(int) $this->id;
+
+				$result = $this->db->query($sql);
+				if (!$result) {
+					$error++;
+					$this->errors[] = $this->db->lasterror();
+				}
+			}
+
+			// Delete product
+			if (!$error) {
+				$sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
+				$sqlz .= " WHERE rowid = ".(int) $this->id;
+
+				$resultz = $this->db->query($sqlz);
+				if (!$resultz) {
+					$error++;
+					$this->errors[] = $this->db->lasterror();
+				}
+			}
+
+			if (!$error) {
+				// We remove directory
+				$ref = dol_sanitizeFileName($this->ref);
+				if ($conf->product->dir_output) {
+					$dir = $conf->product->dir_output."/".$ref;
+					if (file_exists($dir)) {
+						$res = @dol_delete_dir_recursive($dir);
+						if (!$res) {
+							$this->errors[] = 'ErrorFailToDeleteDir';
+							$error++;
+						}
+					}
+				}
+			}
+
+			// Remove extrafields
+			if (!$error)
+			{
+				$result = $this->deleteExtraFields();
+				if ($result < 0) {
+					$error++;
+					dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+				}
+			}
+
+			if (!$error) {
+				$this->db->commit();
+				return 1;
+			} else {
+				foreach ($this->errors as $errmsg)
+				{
+					dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				}
+				$this->db->rollback();
+				return -$error;
+			}
+		} else {
+			$this->error = "ErrorRecordIsUsedCantDelete";
+			return 0;
+		}
+	}
+
+	/**
+	 *    Update or add a translation for a product
+	 *
+	 * @param  User $user Object user making update
+	 * @return int        <0 if KO, >0 if OK
+	 */
+	public function setMultiLangs($user)
+	{
+		global $conf, $langs;
+
+		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 0, 2);
+		$current_lang = $langs->getDefaultLang();
+
+		foreach ($langs_available as $key => $value)
+		{
+			if ($key == $current_lang) {
+				$sql = "SELECT rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+				$sql .= " WHERE fk_product=".$this->id;
+				$sql .= " AND lang='".$this->db->escape($key)."'";
+
+				$result = $this->db->query($sql);
+
+				if ($this->db->num_rows($result)) // if there is already a description line for this language
+				{
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";
+					$sql2 .= " SET ";
+					$sql2 .= " label='".$this->db->escape($this->label)."',";
+					$sql2 .= " description='".$this->db->escape($this->description)."'";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note='".$this->db->escape($this->other)."'";
+					}
+					$sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
+				} else {
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
+					}
+					$sql2 .= ")";
+					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";
+					$sql2 .= " '".$this->db->escape($this->description)."'";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
+						$sql2 .= ", '".$this->db->escape($this->other)."'";
+					}
+					$sql2 .= ")";
+				}
+				dol_syslog(get_class($this).'::setMultiLangs key = current_lang = '.$key);
+				if (!$this->db->query($sql2)) {
+					$this->error = $this->db->lasterror();
+					return -1;
+				}
+			} elseif (isset($this->multilangs[$key])) {
+				$sql = "SELECT rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+				$sql .= " WHERE fk_product=".$this->id;
+				$sql .= " AND lang='".$this->db->escape($key)."'";
+
+				$result = $this->db->query($sql);
+
+				if ($this->db->num_rows($result)) // if there is already a description line for this language
+				{
+					$sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";
+					$sql2 .= " SET ";
+					$sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
+						$sql2 .= ", note='".$this->db->escape($this->multilangs["$key"]["other"])."'";
+					}
+					$sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";
+				} else {
+					$sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) { $sql2 .= ", note";
+					}
+					$sql2 .= ")";
+					$sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";
+					$sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";
+					if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
+						$sql2 .= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";
+					}
+					$sql2 .= ")";
+				}
+
+				// We do not save if main fields are empty
+				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"]) {
+					if (!$this->db->query($sql2)) {
+						$this->error = $this->db->lasterror();
+						return -1;
+					}
+				}
+			} else {
+				// language is not current language and we didn't provide a multilang description for this language
+			}
+		}
+
+		// Call trigger
+		$result = $this->call_trigger('PRODUCT_SET_MULTILANGS', $user);
+		if ($result < 0) {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+		// End call triggers
+
+		return 1;
+	}
+
+	/**
+	 *    Delete a language for this product
+	 *
+	 * @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)
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_lang";
+		$sql .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";
+
+		dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			// Call trigger
+			$result = $this->call_trigger('PRODUCT_DEL_MULTILANGS', $user);
+			if ($result < 0) {
+				$this->error = $this->db->lasterror();
+				dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
+				return -1;
+			}
+			// End call triggers
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+	/**
+	 * Sets an accountancy code for a product.
+	 * Also calls PRODUCT_MODIFY trigger when modified
+	 *
+	 * @param 	string $type 	It can be 'buy', 'buy_intra', 'buy_export', 'sell', 'sell_intra' or 'sell_export'
+	 * @param 	string $value 	Accountancy code
+	 * @return 	int 			<0 KO >0 OK
+	 */
+	public function setAccountancyCode($type, $value)
+	{
+		global $user, $langs, $conf;
+
+		$error = 0;
+
+		$this->db->begin();
+
+		if ($type == 'buy') {
+			$field = 'accountancy_code_buy';
+		} elseif ($type == 'buy_intra') {
 			$field = 'accountancy_code_buy_intra';
 		} elseif ($type == 'buy_export') {
 			$field = 'accountancy_code_buy_export';
 		} elseif ($type == 'sell') {
-            $field = 'accountancy_code_sell';
-        } elseif ($type == 'sell_intra') {
-            $field = 'accountancy_code_sell_intra';
-        } elseif ($type == 'sell_export') {
-            $field = 'accountancy_code_sell_export';
-        } else {
-            return -1;
-        }
+			$field = 'accountancy_code_sell';
+		} elseif ($type == 'sell_intra') {
+			$field = 'accountancy_code_sell_intra';
+		} elseif ($type == 'sell_export') {
+			$field = 'accountancy_code_sell_export';
+		} else {
+			return -1;
+		}
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ";
-        $sql .= "$field = '".$this->db->escape($value)."'";
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ";
+		$sql .= "$field = '".$this->db->escape($value)."'";
+		$sql .= " WHERE rowid = ".$this->id;
 
-        dol_syslog(__METHOD__." sql=".$sql, LOG_DEBUG);
-        $resql = $this->db->query($sql);
+		dol_syslog(__METHOD__." sql=".$sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
 
-        if ($resql) {
-        	// Call trigger
-        	$result = $this->call_trigger('PRODUCT_MODIFY', $user);
-        	if ($result < 0) $error++;
-        	// End call triggers
+		if ($resql) {
+			// Call trigger
+			$result = $this->call_trigger('PRODUCT_MODIFY', $user);
+			if ($result < 0) $error++;
+			// End call triggers
 
-            if ($error) {
-                $this->db->rollback();
-                return -1;
-            }
+			if ($error) {
+				$this->db->rollback();
+				return -1;
+			}
 
-            $this->$field = $value;
+			$this->$field = $value;
 
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *    Load array this->multilangs
-     *
-     * @return int        <0 if KO, >0 if OK
-     */
-    public function getMultiLangs()
-    {
-        global $langs;
+	/**
+	 *    Load array this->multilangs
+	 *
+	 * @return int        <0 if KO, >0 if OK
+	 */
+	public function getMultiLangs()
+	{
+		global $langs;
 
-        $current_lang = $langs->getDefaultLang();
+		$current_lang = $langs->getDefaultLang();
 
-        $sql = "SELECT lang, label, description, note as other";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-        $sql .= " WHERE fk_product=".$this->id;
+		$sql = "SELECT lang, label, description, note as other";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+		$sql .= " WHERE fk_product=".$this->id;
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            while ($obj = $this->db->fetch_object($result))
-            {
-                //print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
-                if ($obj->lang == $current_lang)  // si on a les traduct. dans la langue courante on les charge en infos principales.
-                {
-                    $this->label        = $obj->label;
-                    $this->description = $obj->description;
-                    $this->other        = $obj->other;
-                }
-                $this->multilangs["$obj->lang"]["label"]        = $obj->label;
-                $this->multilangs["$obj->lang"]["description"] = $obj->description;
-                $this->multilangs["$obj->lang"]["other"]        = $obj->other;
-            }
-            return 1;
-        }
-        else
-        {
-            $this->error = "Error: ".$this->db->lasterror()." - ".$sql;
-            return -1;
-        }
-    }
+		$result = $this->db->query($sql);
+		if ($result) {
+			while ($obj = $this->db->fetch_object($result))
+			{
+				//print 'lang='.$obj->lang.' current='.$current_lang.'<br>';
+				if ($obj->lang == $current_lang)  // si on a les traduct. dans la langue courante on les charge en infos principales.
+				{
+					$this->label        = $obj->label;
+					$this->description = $obj->description;
+					$this->other        = $obj->other;
+				}
+				$this->multilangs["$obj->lang"]["label"]        = $obj->label;
+				$this->multilangs["$obj->lang"]["description"] = $obj->description;
+				$this->multilangs["$obj->lang"]["other"]        = $obj->other;
+			}
+			return 1;
+		} else {
+			$this->error = "Error: ".$this->db->lasterror()." - ".$sql;
+			return -1;
+		}
+	}
 
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Insert a track that we changed a customer price
-     *
-     * @param  User $user  User making change
-     * @param  int  $level price level to change
-     * @return int                    <0 if KO, >0 if OK
-     */
-    private function _log_price($user, $level = 0)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Insert a track that we changed a customer price
+	 *
+	 * @param  User $user  User making change
+	 * @param  int  $level price level to change
+	 * @return int                    <0 if KO, >0 if OK
+	 */
+	private function _log_price($user, $level = 0)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Clean parameters
-        if (empty($this->price_by_qty)) {
-            $this->price_by_qty = 0;
-        }
+		// Clean parameters
+		if (empty($this->price_by_qty)) {
+			$this->price_by_qty = 0;
+		}
 
-        // Add new price
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
-        $sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
-        $sql .= " VALUES(".($level ? $level : 1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->db->escape($this->price_base_type)."',".$this->status.",".$this->tva_tx.", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").",".$this->tva_npr.",";
-        $sql .= " ".$this->localtax1_tx.", ".$this->localtax2_tx.", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0 ? $this->fk_price_expression : 'null');
-        $sql .= ")";
+		// Add new price
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";
+		$sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";
+		$sql .= " VALUES(".($level ? $level : 1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->db->escape($this->price_base_type)."',".$this->status.",".$this->tva_tx.", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").",".$this->tva_npr.",";
+		$sql .= " ".$this->localtax1_tx.", ".$this->localtax2_tx.", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0 ? $this->fk_price_expression : 'null');
+		$sql .= ")";
 
-        dol_syslog(get_class($this)."::_log_price", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $this->error = $this->db->lasterror();
-            dol_print_error($this->db);
-            return -1;
-        }
-        else
-        {
-            return 1;
-        }
-    }
+		dol_syslog(get_class($this)."::_log_price", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error = $this->db->lasterror();
+			dol_print_error($this->db);
+			return -1;
+		} else {
+			return 1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Delete a price line
-     *
-     * @param  User $user  Object user
-     * @param  int  $rowid Line id to delete
-     * @return int                <0 if KO, >0 if OK
-     */
-    public function log_price_delete($user, $rowid)
-    {
-        // phpcs:enable
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-        $sql .= " WHERE fk_product_price=".$rowid;
-        $resql = $this->db->query($sql);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Delete a price line
+	 *
+	 * @param  User $user  Object user
+	 * @param  int  $rowid Line id to delete
+	 * @return int                <0 if KO, >0 if OK
+	 */
+	public function log_price_delete($user, $rowid)
+	{
+		// phpcs:enable
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+		$sql .= " WHERE fk_product_price=".$rowid;
+		$resql = $this->db->query($sql);
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price";
-        $sql .= " WHERE rowid=".$rowid;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price";
+		$sql .= " WHERE rowid=".$rowid;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     * Return price of sell of a product for a seller/buyer/product.
-     *
-     * @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
-     * @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()
-     */
-    public function getSellPrice($thirdparty_seller, $thirdparty_buyer, $pqp = 0)
-    {
-    	global $conf, $db;
+	/**
+	 * Return price of sell of a product for a seller/buyer/product.
+	 *
+	 * @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
+	 * @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()
+	 */
+	public function getSellPrice($thirdparty_seller, $thirdparty_buyer, $pqp = 0)
+	{
+		global $conf, $db;
 
-    	// Update if prices fields are defined
-    	$tva_tx = get_default_tva($thirdparty_seller, $thirdparty_buyer, $this->id);
-    	$tva_npr = get_default_npr($thirdparty_seller, $thirdparty_buyer, $this->id);
-    	if (empty($tva_tx)) $tva_npr = 0;
+		// Update if prices fields are defined
+		$tva_tx = get_default_tva($thirdparty_seller, $thirdparty_buyer, $this->id);
+		$tva_npr = get_default_npr($thirdparty_seller, $thirdparty_buyer, $this->id);
+		if (empty($tva_tx)) $tva_npr = 0;
 
-    	$pu_ht = $this->price;
-    	$pu_ttc = $this->price_ttc;
-    	$price_min = $this->price_min;
-    	$price_base_type = $this->price_base_type;
+		$pu_ht = $this->price;
+		$pu_ttc = $this->price_ttc;
+		$price_min = $this->price_min;
+		$price_base_type = $this->price_base_type;
 
-    	// If price per segment
+		// If price per segment
 		if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($thirdparty_buyer->price_level)) {
 			$pu_ht = $this->multiprices[$thirdparty_buyer->price_level];
 			$pu_ttc = $this->multiprices_ttc[$thirdparty_buyer->price_level];
@@ -1652,12 +1608,11 @@ class Product extends CommonObject
 				if (isset($this->multiprices_recuperableonly[$thirdparty_buyer->price_level])) $tva_npr = $this->multiprices_recuperableonly[$thirdparty_buyer->price_level];
 				if (empty($tva_tx)) $tva_npr = 0;
 			}
-		}
-		// If price per customer
-		elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			// If price per customer
 			require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
-			$prodcustprice = new Productcustomerprice($db);
+			$prodcustprice = new Productcustomerprice($this->db);
 
 			$filter = array('t.fk_product' => $this->id, 't.fk_soc' => $thirdparty_buyer->id);
 
@@ -1673,32 +1628,27 @@ class Product extends CommonObject
 					if (empty($tva_tx)) $tva_npr = 0;
 				}
 			}
-		}
-		// If price per quantity
-		elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
-			if ($this->prices_by_qty[0])	// yes, this product has some prices per quantity
-			{
+		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+			// If price per quantity
+			if ($this->prices_by_qty[0]) {
+				// yes, this product has some prices per quantity
 				// Search price into product_price_by_qty from $this->id
-				foreach ($this->prices_by_qty_list[0] as $priceforthequantityarray)
-				{
+				foreach ($this->prices_by_qty_list[0] as $priceforthequantityarray) {
 					if ($priceforthequantityarray['rowid'] != $pqp) continue;
 					// We found the price
 					if ($priceforthequantityarray['price_base_type'] == 'HT')
 					{
 						$pu_ht = $priceforthequantityarray['unitprice'];
-					}
-					else
-					{
+					} else {
 						$pu_ttc = $priceforthequantityarray['unitprice'];
 					}
 					break;
 				}
 			}
-		}
-		// If price per quantity and customer
-		elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-			if ($this->prices_by_qty[$thirdparty_buyer->price_level]) // yes, this product has some prices per quantity
-			{
+		} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+			// If price per quantity and customer
+			if ($this->prices_by_qty[$thirdparty_buyer->price_level]) {
+				// yes, this product has some prices per quantity
 				// Search price into product_price_by_qty from $this->id
 				foreach ($this->prices_by_qty_list[$thirdparty_buyer->price_level] as $priceforthequantityarray)
 				{
@@ -1707,9 +1657,7 @@ class Product extends CommonObject
 					if ($priceforthequantityarray['price_base_type'] == 'HT')
 					{
 						$pu_ht = $priceforthequantityarray['unitprice'];
-					}
-					else
-					{
+					} else {
 						$pu_ttc = $priceforthequantityarray['unitprice'];
 					}
 					break;
@@ -1717,536 +1665,523 @@ class Product extends CommonObject
 			}
 		}
 
-    	return array('pu_ht'=>$pu_ht, 'pu_ttc'=>$pu_ttc, 'price_min'=>$price_min, 'price_base_type'=>$price_base_type, 'tva_tx'=>$tva_tx, 'tva_npr'=>$tva_npr);
-    }
+		return array('pu_ht'=>$pu_ht, 'pu_ttc'=>$pu_ttc, 'price_min'=>$price_min, 'price_base_type'=>$price_base_type, 'tva_tx'=>$tva_tx, 'tva_npr'=>$tva_npr);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Read price used by a provider.
-     * We enter as input couple prodfournprice/qty or triplet qty/product_id/fourn_ref.
-     * This also set some properties on product like ->buyprice, ->fourn_pu, ...
-     *
-     * @param  int    $prodfournprice Id du tarif = rowid table product_fournisseur_price
-     * @param  double $qty            Quantity asked or -1 to get first entry found
-     * @param  int    $product_id     Filter on a particular product id
-     * @param  string $fourn_ref      Filter on a supplier price ref. 'none' to exclude ref in search.
-     * @param  int    $fk_soc         If of supplier
-     * @return int                    <-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...)
-     * @see getSellPrice(), find_min_price_product_fournisseur()
-     */
-    public function get_buyprice($prodfournprice, $qty, $product_id = 0, $fourn_ref = '', $fk_soc = 0)
-    {
-        // phpcs:enable
-        global $conf;
-        $result = 0;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Read price used by a provider.
+	 * We enter as input couple prodfournprice/qty or triplet qty/product_id/fourn_ref.
+	 * This also set some properties on product like ->buyprice, ->fourn_pu, ...
+	 *
+	 * @param  int    $prodfournprice Id du tarif = rowid table product_fournisseur_price
+	 * @param  double $qty            Quantity asked or -1 to get first entry found
+	 * @param  int    $product_id     Filter on a particular product id
+	 * @param  string $fourn_ref      Filter on a supplier price ref. 'none' to exclude ref in search.
+	 * @param  int    $fk_soc         If of supplier
+	 * @return int                    <-1 if KO, -1 if qty not enough, 0 if OK but nothing found, id_product if OK and found. May also initialize some properties like (->ref_supplier, buyprice, fourn_pu, vatrate_supplier...)
+	 * @see getSellPrice(), find_min_price_product_fournisseur()
+	 */
+	public function get_buyprice($prodfournprice, $qty, $product_id = 0, $fourn_ref = '', $fk_soc = 0)
+	{
+		// phpcs:enable
+		global $conf;
+		$result = 0;
 
-        // We do a first seach with a select by searching with couple prodfournprice and qty only (later we will search on triplet qty/product_id/fourn_ref)
-        $sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.remise_percent,";
-        $sql .= " pfp.fk_product, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression";
-        $sql .= " ,pfp.default_vat_code";
-        $sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
+		// We do a first seach with a select by searching with couple prodfournprice and qty only (later we will search on triplet qty/product_id/fourn_ref)
+		$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.remise_percent,";
+		$sql .= " pfp.fk_product, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression";
+		$sql .= " ,pfp.default_vat_code";
+		$sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
 		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 = ".$prodfournprice;
-        if ($qty > 0) { $sql .= " AND pfp.quantity <= ".$qty;
-        }
-        $sql .= " ORDER BY pfp.quantity DESC";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+		$sql .= " WHERE pfp.rowid = ".$prodfournprice;
+		if ($qty > 0) { $sql .= " AND pfp.quantity <= ".$qty;
+		}
+		$sql .= " ORDER BY pfp.quantity DESC";
 
-        dol_syslog(get_class($this)."::get_buyprice first search by prodfournprice/qty", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj && $obj->quantity > 0)        // If we found a supplier prices from the id of supplier price
-            {
-                if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression)) {
-                    include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-                    $prod_supplier = new ProductFournisseur($this->db);
-                    $prod_supplier->product_fourn_price_id = $obj->rowid;
-                    $prod_supplier->id = $obj->fk_product;
-                    $prod_supplier->fourn_qty = $obj->quantity;
-                    $prod_supplier->fourn_tva_tx = $obj->tva_tx;
-                    $prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
-                    $priceparser = new PriceParser($this->db);
-                    $price_result = $priceparser->parseProductSupplier($prod_supplier);
-                    if ($price_result >= 0) {
-                        $obj->price = $price_result;
-                    }
-                }
-                $this->product_fourn_price_id = $obj->rowid;
-                $this->buyprice = $obj->price; // deprecated
-                $this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product of supplier
-                $this->fourn_price_base_type = 'HT'; // Price base type
-                $this->fourn_socid = $obj->fk_soc; // Company that offer this price
-                $this->ref_fourn = $obj->ref_fourn; // deprecated
-                $this->ref_supplier = $obj->ref_fourn; // Ref supplier
-                $this->desc_supplier = $obj->desc_fourn; // desc supplier
-                $this->remise_percent = $obj->remise_percent; // remise percent if present and not typed
-                $this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier
-                $this->default_vat_code = $obj->default_vat_code; // Vat code supplier
-                $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;
+		dol_syslog(get_class($this)."::get_buyprice first search by prodfournprice/qty", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj && $obj->quantity > 0)        // If we found a supplier prices from the id of supplier price
+			{
+				if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression)) {
+					include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
+					$prod_supplier = new ProductFournisseur($this->db);
+					$prod_supplier->product_fourn_price_id = $obj->rowid;
+					$prod_supplier->id = $obj->fk_product;
+					$prod_supplier->fourn_qty = $obj->quantity;
+					$prod_supplier->fourn_tva_tx = $obj->tva_tx;
+					$prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
+					$priceparser = new PriceParser($this->db);
+					$price_result = $priceparser->parseProductSupplier($prod_supplier);
+					if ($price_result >= 0) {
+						$obj->price = $price_result;
+					}
+				}
+				$this->product_fourn_price_id = $obj->rowid;
+				$this->buyprice = $obj->price; // deprecated
+				$this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product of supplier
+				$this->fourn_price_base_type = 'HT'; // Price base type
+				$this->fourn_socid = $obj->fk_soc; // Company that offer this price
+				$this->ref_fourn = $obj->ref_fourn; // deprecated
+				$this->ref_supplier = $obj->ref_fourn; // Ref supplier
+				$this->desc_supplier = $obj->desc_fourn; // desc supplier
+				$this->remise_percent = $obj->remise_percent; // remise percent if present and not typed
+				$this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier
+				$this->default_vat_code = $obj->default_vat_code; // Vat code supplier
+				$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 (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $this->packaging = $obj->packaging;
-                $result = $obj->fk_product;
-                return $result;
-            }
-            else // If not found
-            {
-                // We do a second search by doing a select again but searching with less reliable criteria: couple qty/id product, and if set fourn_ref or fk_soc.
-                $sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,";
-                $sql .= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.desc_fourn as desc_supplier, pfp.tva_tx, pfp.fk_supplier_price_expression";
-                $sql .= " ,pfp.default_vat_code";
-                $sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
+				$result = $obj->fk_product;
+				return $result;
+			} else // If not found
+			{
+				// We do a second search by doing a select again but searching with less reliable criteria: couple qty/id product, and if set fourn_ref or fk_soc.
+				$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.fk_soc,";
+				$sql .= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.desc_fourn as desc_supplier, pfp.tva_tx, pfp.fk_supplier_price_expression";
+				$sql .= " ,pfp.default_vat_code";
+				$sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
-                $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
-                $sql .= " WHERE pfp.fk_product = ".$product_id;
-                if ($fourn_ref != 'none') { $sql .= " AND pfp.ref_fourn = '".$fourn_ref."'";
-                }
-                if ($fk_soc > 0) { $sql .= " AND pfp.fk_soc = ".$fk_soc;
-                }
-                if ($qty > 0) { $sql .= " AND pfp.quantity <= ".$qty;
-                }
-                $sql .= " ORDER BY pfp.quantity DESC";
-                $sql .= " LIMIT 1";
+				$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
+				$sql .= " WHERE pfp.fk_product = ".$product_id;
+				if ($fourn_ref != 'none') { $sql .= " AND pfp.ref_fourn = '".$this->db->escape($fourn_ref)."'";
+				}
+				if ($fk_soc > 0) { $sql .= " AND pfp.fk_soc = ".$fk_soc;
+				}
+				if ($qty > 0) { $sql .= " AND pfp.quantity <= ".$qty;
+				}
+				$sql .= " ORDER BY pfp.quantity DESC";
+				$sql .= " LIMIT 1";
 
-                dol_syslog(get_class($this)."::get_buyprice second search from qty/ref/product_id", LOG_DEBUG);
-                $resql = $this->db->query($sql);
-                if ($resql) {
-                    $obj = $this->db->fetch_object($resql);
-                    if ($obj && $obj->quantity > 0)        // If found
-                    {
-                        if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression)) {
-                            include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-                            $prod_supplier = new ProductFournisseur($this->db);
-                            $prod_supplier->product_fourn_price_id = $obj->rowid;
-                            $prod_supplier->id = $obj->fk_product;
-                            $prod_supplier->fourn_qty = $obj->quantity;
-                            $prod_supplier->fourn_tva_tx = $obj->tva_tx;
-                            $prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
-                            $priceparser = new PriceParser($this->db);
-                            $price_result = $priceparser->parseProductSupplier($prod_supplier);
-                            if ($result >= 0) {
-                                $obj->price = $price_result;
-                            }
-                        }
-                        $this->product_fourn_price_id = $obj->rowid;
-                        $this->buyprice = $obj->price; // deprecated
-                        $this->fourn_qty = $obj->quantity; // min quantity for price for a virtual supplier
-                        $this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product for a virtual supplier
-                        $this->fourn_price_base_type = 'HT'; // Price base type for a virtual supplier
-                        $this->fourn_socid = $obj->fk_soc; // Company that offer this price
-                        $this->ref_fourn = $obj->ref_supplier; // deprecated
-                        $this->ref_supplier = $obj->ref_supplier; // Ref supplier
-                        $this->desc_supplier = $obj->desc_supplier; // desc supplier
-                        $this->remise_percent = $obj->remise_percent; // remise percent if present and not typed
-                        $this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier
-                        $this->default_vat_code = $obj->default_vat_code; // Vat code supplier
-                        $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;
+				dol_syslog(get_class($this)."::get_buyprice second search from qty/ref/product_id", LOG_DEBUG);
+				$resql = $this->db->query($sql);
+				if ($resql) {
+					$obj = $this->db->fetch_object($resql);
+					if ($obj && $obj->quantity > 0)        // If found
+					{
+						if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression)) {
+							include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
+							$prod_supplier = new ProductFournisseur($this->db);
+							$prod_supplier->product_fourn_price_id = $obj->rowid;
+							$prod_supplier->id = $obj->fk_product;
+							$prod_supplier->fourn_qty = $obj->quantity;
+							$prod_supplier->fourn_tva_tx = $obj->tva_tx;
+							$prod_supplier->fk_supplier_price_expression = $obj->fk_supplier_price_expression;
+							$priceparser = new PriceParser($this->db);
+							$price_result = $priceparser->parseProductSupplier($prod_supplier);
+							if ($result >= 0) {
+								$obj->price = $price_result;
+							}
+						}
+						$this->product_fourn_price_id = $obj->rowid;
+						$this->buyprice = $obj->price; // deprecated
+						$this->fourn_qty = $obj->quantity; // min quantity for price for a virtual supplier
+						$this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product for a virtual supplier
+						$this->fourn_price_base_type = 'HT'; // Price base type for a virtual supplier
+						$this->fourn_socid = $obj->fk_soc; // Company that offer this price
+						$this->ref_fourn = $obj->ref_supplier; // deprecated
+						$this->ref_supplier = $obj->ref_supplier; // Ref supplier
+						$this->desc_supplier = $obj->desc_supplier; // desc supplier
+						$this->remise_percent = $obj->remise_percent; // remise percent if present and not typed
+						$this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier
+						$this->default_vat_code = $obj->default_vat_code; // Vat code supplier
+						$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 (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $this->packaging = $obj->packaging;
 						$result = $obj->fk_product;
-                        return $result;
-                    }
-                    else
-                    {
-                        return -1; // Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.
-                    }
-                }
-                else
-                {
-                    $this->error = $this->db->lasterror();
-                    return -3;
-                }
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -2;
-        }
-    }
+						return $result;
+					} else {
+						return -1; // Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.
+					}
+				} else {
+					$this->error = $this->db->lasterror();
+					return -3;
+				}
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -2;
+		}
+	}
 
 
-    /**
-     *    Modify customer price of a product/Service
-     *
-     * @param  double $newprice          New price
-     * @param  string $newpricebase      HT or TTC
-     * @param  User   $user              Object user that make change
-     * @param  double $newvat            New VAT Rate (For example 8.5. Should not be a string)
-     * @param  double $newminprice       New price min
-     * @param  int    $level             0=standard, >0 = level if multilevel prices
-     * @param  int    $newnpr            0=Standard vat rate, 1=Special vat rate for French NPR VAT
-     * @param  int    $newpbq            1 if it has price by quantity
-     * @param  int    $ignore_autogen    Used to avoid infinite loops
-     * @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
-     * @return int                            <0 if KO, >0 if OK
-     */
-    public function updatePrice($newprice, $newpricebase, $user, $newvat = '', $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '')
-    {
-        global $conf, $langs;
+	/**
+	 *    Modify customer price of a product/Service
+	 *
+	 * @param  double $newprice          New price
+	 * @param  string $newpricebase      HT or TTC
+	 * @param  User   $user              Object user that make change
+	 * @param  double $newvat            New VAT Rate (For example 8.5. Should not be a string)
+	 * @param  double $newminprice       New price min
+	 * @param  int    $level             0=standard, >0 = level if multilevel prices
+	 * @param  int    $newnpr            0=Standard vat rate, 1=Special vat rate for French NPR VAT
+	 * @param  int    $newpbq            1 if it has price by quantity
+	 * @param  int    $ignore_autogen    Used to avoid infinite loops
+	 * @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
+	 * @return int                            <0 if KO, >0 if OK
+	 */
+	public function updatePrice($newprice, $newpricebase, $user, $newvat = '', $newminprice = 0, $level = 0, $newnpr = 0, $newpbq = 0, $ignore_autogen = 0, $localtaxes_array = array(), $newdefaultvatcode = '')
+	{
+		global $conf, $langs;
 
-        $id = $this->id;
+		$id = $this->id;
 
-        dol_syslog(get_class($this)."::update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase." newminprice=".$newminprice." level=".$level." npr=".$newnpr." newdefaultvatcode=".$newdefaultvatcode);
+		dol_syslog(get_class($this)."::update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase." newminprice=".$newminprice." level=".$level." npr=".$newnpr." newdefaultvatcode=".$newdefaultvatcode);
 
-        // Clean parameters
-        if (empty($this->tva_tx)) {
-            $this->tva_tx = 0;
-        }
-        if (empty($newnpr)) {
-            $newnpr = 0;
-        }
-        if (empty($newminprice)) {
-        	$newminprice = 0;
-        }
-        if (empty($newminprice)) {
-        	$newminprice = 0;
-        }
+		// Clean parameters
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($newnpr)) {
+			$newnpr = 0;
+		}
+		if (empty($newminprice)) {
+			$newminprice = 0;
+		}
+		if (empty($newminprice)) {
+			$newminprice = 0;
+		}
 
-        // Check parameters
-        if ($newvat == '') {
-            $newvat = $this->tva_tx;
-        }
+		// Check parameters
+		if ($newvat == '') {
+			$newvat = $this->tva_tx;
+		}
 
-        // If multiprices are enabled, then we check if the current product is subject to price autogeneration
-        // Price will be modified ONLY when the first one is the one that is being modified
-        if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !$ignore_autogen && $this->price_autogen && ($level == 1)) {
-            return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpbq);
-        }
+		// If multiprices are enabled, then we check if the current product is subject to price autogeneration
+		// Price will be modified ONLY when the first one is the one that is being modified
+		if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !$ignore_autogen && $this->price_autogen && ($level == 1)) {
+			return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpbq);
+		}
 
-        if (!empty($newminprice) && ($newminprice > $newprice)) {
-            $this->error = 'ErrorPriceCantBeLowerThanMinPrice';
-            return -1;
-        }
+		if (!empty($newminprice) && ($newminprice > $newprice)) {
+			$this->error = 'ErrorPriceCantBeLowerThanMinPrice';
+			return -1;
+		}
 
-        if ($newprice !== '' || $newprice === 0) {
-            if ($newpricebase == 'TTC') {
-                $price_ttc = price2num($newprice, 'MU');
-                $price = price2num($newprice) / (1 + ($newvat / 100));
-                $price = price2num($price, 'MU');
+		if ($newprice !== '' || $newprice === 0) {
+			if ($newpricebase == 'TTC') {
+				$price_ttc = price2num($newprice, 'MU');
+				$price = price2num($newprice) / (1 + ($newvat / 100));
+				$price = price2num($price, 'MU');
 
-                if ($newminprice != '' || $newminprice == 0) {
-                    $price_min_ttc = price2num($newminprice, 'MU');
-                    $price_min = price2num($newminprice) / (1 + ($newvat / 100));
-                    $price_min = price2num($price_min, 'MU');
-                }
-                else
-                {
-                    $price_min = 0;
-                    $price_min_ttc = 0;
-                }
-            }
-            else
-            {
-                $price = price2num($newprice, 'MU');
-                $price_ttc = ($newnpr != 1) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;
-                $price_ttc = price2num($price_ttc, 'MU');
+				if ($newminprice != '' || $newminprice == 0) {
+					$price_min_ttc = price2num($newminprice, 'MU');
+					$price_min = price2num($newminprice) / (1 + ($newvat / 100));
+					$price_min = price2num($price_min, 'MU');
+				} else {
+					$price_min = 0;
+					$price_min_ttc = 0;
+				}
+			} else {
+				$price = price2num($newprice, 'MU');
+				$price_ttc = ($newnpr != 1) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;
+				$price_ttc = price2num($price_ttc, 'MU');
 
-                if ($newminprice !== '' || $newminprice === 0) {
-                    $price_min = price2num($newminprice, 'MU');
-                    $price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100));
-                    $price_min_ttc = price2num($price_min_ttc, 'MU');
-                    //print 'X'.$newminprice.'-'.$price_min;
-                }
-                else
-                {
-                    $price_min = 0;
-                    $price_min_ttc = 0;
-                }
-            }
-            //print 'x'.$id.'-'.$newprice.'-'.$newpricebase.'-'.$price.'-'.$price_ttc.'-'.$price_min.'-'.$price_min_ttc;
+				if ($newminprice !== '' || $newminprice === 0) {
+					$price_min = price2num($newminprice, 'MU');
+					$price_min_ttc = price2num($newminprice) * (1 + ($newvat / 100));
+					$price_min_ttc = price2num($price_min_ttc, 'MU');
+					//print 'X'.$newminprice.'-'.$price_min;
+				} else {
+					$price_min = 0;
+					$price_min_ttc = 0;
+				}
+			}
+			//print 'x'.$id.'-'.$newprice.'-'.$newpricebase.'-'.$price.'-'.$price_ttc.'-'.$price_min.'-'.$price_min_ttc;
 
-            if (count($localtaxes_array) > 0) {
-                $localtaxtype1 = $localtaxes_array['0'];
-                $localtax1 = $localtaxes_array['1'];
-                $localtaxtype2 = $localtaxes_array['2'];
-                $localtax2 = $localtaxes_array['3'];
-            }
-            else     // old method. deprecated because ot can't retreive type
-            {
-                $localtaxtype1 = '0';
-                $localtax1 = get_localtax($newvat, 1);
-                $localtaxtype2 = '0';
-                $localtax2 = get_localtax($newvat, 2);
-            }
-            if (empty($localtax1)) {
-                $localtax1 = 0; // If = '' then = 0
-            }
-            if (empty($localtax2)) {
-                $localtax2 = 0; // If = '' then = 0
-            }
+			if (count($localtaxes_array) > 0) {
+				$localtaxtype1 = $localtaxes_array['0'];
+				$localtax1 = $localtaxes_array['1'];
+				$localtaxtype2 = $localtaxes_array['2'];
+				$localtax2 = $localtaxes_array['3'];
+			} else // old method. deprecated because ot can't retreive type
+			{
+				$localtaxtype1 = '0';
+				$localtax1 = get_localtax($newvat, 1);
+				$localtaxtype2 = '0';
+				$localtax2 = get_localtax($newvat, 2);
+			}
+			if (empty($localtax1)) {
+				$localtax1 = 0; // If = '' then = 0
+			}
+			if (empty($localtax2)) {
+				$localtax2 = 0; // If = '' then = 0
+			}
 
-            $this->db->begin();
+			$this->db->begin();
 
-            // Ne pas mettre de quote sur les numeriques decimaux.
-            // Ceci provoque des stockages avec arrondis en base au lieu des valeurs exactes.
-            $sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
-            $sql .= " price_base_type='".$newpricebase."',";
-            $sql .= " price=".$price.",";
-            $sql .= " price_ttc=".$price_ttc.",";
-            $sql .= " price_min=".$price_min.",";
-            $sql .= " price_min_ttc=".$price_min_ttc.",";
-            $sql .= " localtax1_tx=".($localtax1 >= 0 ? $localtax1 : 'NULL').",";
-            $sql .= " localtax2_tx=".($localtax2 >= 0 ? $localtax2 : 'NULL').",";
-            $sql .= " localtax1_type=".($localtaxtype1 != '' ? "'".$localtaxtype1."'" : "'0'").",";
-            $sql .= " localtax2_type=".($localtaxtype2 != '' ? "'".$localtaxtype2."'" : "'0'").",";
-            $sql .= " default_vat_code=".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
-            $sql .= " tva_tx='".price2num($newvat)."',";
-            $sql .= " recuperableonly='".$newnpr."'";
-            $sql .= " WHERE rowid = ".$id;
+			// Ne pas mettre de quote sur les numeriques decimaux.
+			// Ceci provoque des stockages avec arrondis en base au lieu des valeurs exactes.
+			$sql = "UPDATE ".MAIN_DB_PREFIX."product SET";
+			$sql .= " price_base_type='".$this->db->escape($newpricebase)."',";
+			$sql .= " price=".$price.",";
+			$sql .= " price_ttc=".$price_ttc.",";
+			$sql .= " price_min=".$price_min.",";
+			$sql .= " price_min_ttc=".$price_min_ttc.",";
+			$sql .= " localtax1_tx=".($localtax1 >= 0 ? $localtax1 : 'NULL').",";
+			$sql .= " localtax2_tx=".($localtax2 >= 0 ? $localtax2 : 'NULL').",";
+			$sql .= " localtax1_type=".($localtaxtype1 != '' ? "'".$this->db->escape($localtaxtype1)."'" : "'0'").",";
+			$sql .= " localtax2_type=".($localtaxtype2 != '' ? "'".$this->db->escape($localtaxtype2)."'" : "'0'").",";
+			$sql .= " default_vat_code=".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";
+			$sql .= " tva_tx='".price2num($newvat)."',";
+			$sql .= " recuperableonly='".$this->db->escape($newnpr)."'";
+			$sql .= " WHERE rowid = ".$id;
 
-            dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $this->multiprices[$level] = $price;
-                $this->multiprices_ttc[$level] = $price_ttc;
-                $this->multiprices_min[$level] = $price_min;
-                $this->multiprices_min_ttc[$level] = $price_min_ttc;
-                $this->multiprices_base_type[$level] = $newpricebase;
-                $this->multiprices_default_vat_code[$level] = $newdefaultvatcode;
-                $this->multiprices_tva_tx[$level] = $newvat;
-                $this->multiprices_recuperableonly[$level] = $newnpr;
+			dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$this->multiprices[$level] = $price;
+				$this->multiprices_ttc[$level] = $price_ttc;
+				$this->multiprices_min[$level] = $price_min;
+				$this->multiprices_min_ttc[$level] = $price_min_ttc;
+				$this->multiprices_base_type[$level] = $newpricebase;
+				$this->multiprices_default_vat_code[$level] = $newdefaultvatcode;
+				$this->multiprices_tva_tx[$level] = $newvat;
+				$this->multiprices_recuperableonly[$level] = $newnpr;
 
-                $this->price = $price;
-                $this->price_ttc = $price_ttc;
-                $this->price_min = $price_min;
-                $this->price_min_ttc = $price_min_ttc;
-                $this->price_base_type = $newpricebase;
-                $this->default_vat_code = $newdefaultvatcode;
-                $this->tva_tx = $newvat;
-                $this->tva_npr = $newnpr;
-                //Local taxes
-                $this->localtax1_tx = $localtax1;
-                $this->localtax2_tx = $localtax2;
-                $this->localtax1_type = $localtaxtype1;
-                $this->localtax2_type = $localtaxtype2;
+				$this->price = $price;
+				$this->price_ttc = $price_ttc;
+				$this->price_min = $price_min;
+				$this->price_min_ttc = $price_min_ttc;
+				$this->price_base_type = $newpricebase;
+				$this->default_vat_code = $newdefaultvatcode;
+				$this->tva_tx = $newvat;
+				$this->tva_npr = $newnpr;
+				//Local taxes
+				$this->localtax1_tx = $localtax1;
+				$this->localtax2_tx = $localtax2;
+				$this->localtax1_type = $localtaxtype1;
+				$this->localtax2_type = $localtaxtype2;
 
-                // Price by quantity
-                $this->price_by_qty = $newpbq;
+				// Price by quantity
+				$this->price_by_qty = $newpbq;
 
-                $this->_log_price($user, $level); // Save price for level into table product_price
+				$this->_log_price($user, $level); // Save price for level into table product_price
 
-                $this->level = $level; // Store level of price edited for trigger
+				$this->level = $level; // Store level of price edited for trigger
 
-                // Call trigger
-                $result = $this->call_trigger('PRODUCT_PRICE_MODIFY', $user);
-                if ($result < 0) {
-                    $this->db->rollback();
-                    return -1;
-                }
-                // End call triggers
+				// Call trigger
+				$result = $this->call_trigger('PRODUCT_PRICE_MODIFY', $user);
+				if ($result < 0) {
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
 
-                $this->db->commit();
-            }
-            else
-            {
-                $this->db->rollback();
-                dol_print_error($this->db);
-            }
-        }
+				$this->db->commit();
+			} else {
+				$this->db->rollback();
+				dol_print_error($this->db);
+			}
+		}
 
-        return 1;
-    }
+		return 1;
+	}
 
-    /**
-     *  Sets the supplier price expression
-     *
-     * @param      int $expression_id Expression
-     * @return     int                     <0 if KO, >0 if OK
-     * @deprecated Use Product::update instead
-     */
-    public function setPriceExpression($expression_id)
-    {
-        global $user;
+	/**
+	 *  Sets the supplier price expression
+	 *
+	 * @param      int $expression_id Expression
+	 * @return     int                     <0 if KO, >0 if OK
+	 * @deprecated Use Product::update instead
+	 */
+	public function setPriceExpression($expression_id)
+	{
+		global $user;
 
-        $this->fk_price_expression = $expression_id;
+		$this->fk_price_expression = $expression_id;
 
-        return $this->update($this->id, $user);
-    }
+		return $this->update($this->id, $user);
+	}
 
-    /**
-     *  Load a product in memory from database
-     *
-     * @param  int    $id                Id of product/service to load
-     * @param  string $ref               Ref of product/service to load
-     * @param  string $ref_ext           Ref ext of product/service to load
-     * @param  string $barcode           Barcode of product/service to load
-     * @param  int    $ignore_expression Ignores the math expression for calculating price and uses the db value instead
-     * @param  int    $ignore_price_load Load product without loading prices arrays (when we are sure we don't need them)
-     * @param  int    $ignore_lang_load  Load product without loading language arrays (when we are sure we don't need them)
-     * @return int                       <0 if KO, 0 if not found, >0 if OK
-     */
-    public function fetch($id = '', $ref = '', $ref_ext = '', $barcode = '', $ignore_expression = 0, $ignore_price_load = 0, $ignore_lang_load = 0)
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+	/**
+	 *  Load a product in memory from database
+	 *
+	 * @param  int    $id                Id of product/service to load
+	 * @param  string $ref               Ref of product/service to load
+	 * @param  string $ref_ext           Ref ext of product/service to load
+	 * @param  string $barcode           Barcode of product/service to load
+	 * @param  int    $ignore_expression Ignores the math expression for calculating price and uses the db value instead
+	 * @param  int    $ignore_price_load Load product without loading prices arrays (when we are sure we don't need them)
+	 * @param  int    $ignore_lang_load  Load product without loading language arrays (when we are sure we don't need them)
+	 * @return int                       <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id = '', $ref = '', $ref_ext = '', $barcode = '', $ignore_expression = 0, $ignore_price_load = 0, $ignore_lang_load = 0)
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-        global $langs, $conf;
+		global $langs, $conf;
 
-        dol_syslog(get_class($this)."::fetch id=".$id." ref=".$ref." ref_ext=".$ref_ext);
+		dol_syslog(get_class($this)."::fetch id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-        // Check parameters
-        if (!$id && !$ref && !$ref_ext && !$barcode) {
-            $this->error = 'ErrorWrongParameters';
-            dol_syslog(get_class($this)."::fetch ".$this->error);
-            return -1;
-        }
+		// Check parameters
+		if (!$id && !$ref && !$ref_ext && !$barcode) {
+			$this->error = 'ErrorWrongParameters';
+			dol_syslog(get_class($this)."::fetch ".$this->error);
+			return -1;
+		}
 
-        $sql = "SELECT rowid, ref, ref_ext, label, description, url, note as note_private, customcode, fk_country, price, price_ttc,";
-        $sql .= " price_min, price_min_ttc, price_base_type, cost_price, default_vat_code, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, tosell,";
-        $sql .= " tobuy, fk_product_type, duration, fk_default_warehouse, seuil_stock_alerte, canvas, net_measure, net_measure_units, weight, weight_units,";
-        $sql .= " length, length_units, width, width_units, height, height_units,";
-        $sql .= " surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
-        $sql .= " accountancy_code_buy, accountancy_code_buy_intra, accountancy_code_buy_export,";
-        $sql .= " accountancy_code_sell, accountancy_code_sell_intra, accountancy_code_sell_export, stock, pmp,";
-        $sql .= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit,";
-        $sql .= " fk_price_expression, price_autogen";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product";
-        if ($id) {
-            $sql .= " WHERE rowid = ".(int) $id;
-        } else {
-            $sql .= " WHERE entity IN (".getEntity($this->element).")";
-            if ($ref) {
-                $sql .= " AND ref = '".$this->db->escape($ref)."'";
-            } elseif ($ref_ext) {
-                $sql .= " AND ref_ext = '".$this->db->escape($ref_ext)."'";
-            } elseif ($barcode) {
-                $sql .= " AND barcode = '".$this->db->escape($barcode)."'";
-            }
-        }
+		$sql = "SELECT rowid, ref, ref_ext, label, description, url, note_public, note as note_private, customcode, fk_country, fk_state, price, price_ttc,";
+		$sql .= " price_min, price_min_ttc, price_base_type, cost_price, default_vat_code, tva_tx, recuperableonly as tva_npr, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, tosell,";
+		$sql .= " tobuy, fk_product_type, duration, fk_default_warehouse, seuil_stock_alerte, canvas, net_measure, net_measure_units, weight, weight_units,";
+		$sql .= " length, length_units, width, width_units, height, height_units,";
+		$sql .= " surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,";
+		$sql .= " accountancy_code_buy, accountancy_code_buy_intra, accountancy_code_buy_export,";
+		$sql .= " accountancy_code_sell, accountancy_code_sell_intra, accountancy_code_sell_export, stock, pmp,";
+		$sql .= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit,";
+		$sql .= " fk_price_expression, price_autogen, model_pdf";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		if ($id) {
+			$sql .= " WHERE rowid = ".(int) $id;
+		} else {
+			$sql .= " WHERE entity IN (".getEntity($this->element).")";
+			if ($ref) {
+				$sql .= " AND ref = '".$this->db->escape($ref)."'";
+			} elseif ($ref_ext) {
+				$sql .= " AND ref_ext = '".$this->db->escape($ref_ext)."'";
+			} elseif ($barcode) {
+				$sql .= " AND barcode = '".$this->db->escape($barcode)."'";
+			}
+		}
 
-        $resql = $this->db->query($sql);
-        if ($resql) {
-        	unset($this->oldcopy);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			unset($this->oldcopy);
 
-            if ($this->db->num_rows($resql) > 0) {
-                $obj = $this->db->fetch_object($resql);
+			if ($this->db->num_rows($resql) > 0) {
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id = $obj->rowid;
-                $this->ref                            = $obj->ref;
-                $this->ref_ext                        = $obj->ref_ext;
-                $this->label                          = $obj->label;
-                $this->description                    = $obj->description;
-                $this->url                            = $obj->url;
-                $this->note_private                    = $obj->note_private;
-                $this->note                            = $obj->note_private; // deprecated
+				$this->id = $obj->rowid;
+				$this->ref                            = $obj->ref;
+				$this->ref_ext                        = $obj->ref_ext;
+				$this->label                          = $obj->label;
+				$this->description                    = $obj->description;
+				$this->url                            = $obj->url;
+				$this->note_public                    = $obj->note_public;
+				$this->note_private                   = $obj->note_private;
+				$this->note                           = $obj->note_private; // deprecated
 
-                $this->type                            = $obj->fk_product_type;
-                $this->status                        = $obj->tosell;
-                $this->status_buy                    = $obj->tobuy;
-                $this->status_batch                    = $obj->tobatch;
+				$this->type                            = $obj->fk_product_type;
+				$this->status                        = $obj->tosell;
+				$this->status_buy                    = $obj->tobuy;
+				$this->status_batch                    = $obj->tobatch;
 
-                $this->customcode                    = $obj->customcode;
-                $this->country_id                    = $obj->fk_country;
-                $this->country_code = getCountry($this->country_id, 2, $this->db);
-                $this->price                        = $obj->price;
-                $this->price_ttc                    = $obj->price_ttc;
-                $this->price_min                    = $obj->price_min;
-                $this->price_min_ttc                = $obj->price_min_ttc;
-                $this->price_base_type = $obj->price_base_type;
-                $this->cost_price                    = $obj->cost_price;
-                $this->default_vat_code = $obj->default_vat_code;
-                $this->tva_tx                        = $obj->tva_tx;
-                //! French VAT NPR
-                $this->tva_npr                        = $obj->tva_npr;
-                $this->recuperableonly                = $obj->tva_npr; // For backward compatibility
-                //! Local taxes
-                $this->localtax1_tx                    = $obj->localtax1_tx;
-                $this->localtax2_tx                    = $obj->localtax2_tx;
-                $this->localtax1_type                = $obj->localtax1_type;
-                $this->localtax2_type                = $obj->localtax2_type;
+				$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->price                        = $obj->price;
+				$this->price_ttc                    = $obj->price_ttc;
+				$this->price_min                    = $obj->price_min;
+				$this->price_min_ttc                = $obj->price_min_ttc;
+				$this->price_base_type = $obj->price_base_type;
+				$this->cost_price                    = $obj->cost_price;
+				$this->default_vat_code = $obj->default_vat_code;
+				$this->tva_tx                        = $obj->tva_tx;
+				//! French VAT NPR
+				$this->tva_npr                        = $obj->tva_npr;
+				$this->recuperableonly                = $obj->tva_npr; // For backward compatibility
+				//! Local taxes
+				$this->localtax1_tx                    = $obj->localtax1_tx;
+				$this->localtax2_tx                    = $obj->localtax2_tx;
+				$this->localtax1_type                = $obj->localtax1_type;
+				$this->localtax2_type                = $obj->localtax2_type;
 
-                $this->finished                        = $obj->finished;
-                $this->duration                        = $obj->duration;
-                $this->duration_value                = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
-                $this->duration_unit = substr($obj->duration, -1);
-                $this->canvas                        = $obj->canvas;
-                $this->net_measure = $obj->net_measure;
-                $this->net_measure_units = $obj->net_measure_units;
-                $this->weight                        = $obj->weight;
-                $this->weight_units                    = $obj->weight_units;
-                $this->length                        = $obj->length;
-                $this->length_units                    = $obj->length_units;
-                $this->width = $obj->width;
-                $this->width_units = $obj->width_units;
-                $this->height = $obj->height;
-                $this->height_units = $obj->height_units;
+				$this->finished                        = $obj->finished;
+				$this->duration                        = $obj->duration;
+				$this->duration_value                = substr($obj->duration, 0, dol_strlen($obj->duration) - 1);
+				$this->duration_unit = substr($obj->duration, -1);
+				$this->canvas                        = $obj->canvas;
+				$this->net_measure = $obj->net_measure;
+				$this->net_measure_units = $obj->net_measure_units;
+				$this->weight                        = $obj->weight;
+				$this->weight_units                    = $obj->weight_units;
+				$this->length                        = $obj->length;
+				$this->length_units                    = $obj->length_units;
+				$this->width = $obj->width;
+				$this->width_units = $obj->width_units;
+				$this->height = $obj->height;
+				$this->height_units = $obj->height_units;
 
-                $this->surface = $obj->surface;
-                $this->surface_units = $obj->surface_units;
-                $this->volume = $obj->volume;
-                $this->volume_units                    = $obj->volume_units;
-                $this->barcode = $obj->barcode;
-                $this->barcode_type                    = $obj->fk_barcode_type;
+				$this->surface = $obj->surface;
+				$this->surface_units = $obj->surface_units;
+				$this->volume = $obj->volume;
+				$this->volume_units                    = $obj->volume_units;
+				$this->barcode = $obj->barcode;
+				$this->barcode_type                    = $obj->fk_barcode_type;
 
-                $this->accountancy_code_buy				= $obj->accountancy_code_buy;
-                $this->accountancy_code_buy_intra = $obj->accountancy_code_buy_intra;
-                $this->accountancy_code_buy_export		= $obj->accountancy_code_buy_export;
-                $this->accountancy_code_sell			= $obj->accountancy_code_sell;
-                $this->accountancy_code_sell_intra		= $obj->accountancy_code_sell_intra;
-                $this->accountancy_code_sell_export		= $obj->accountancy_code_sell_export;
+				$this->accountancy_code_buy				= $obj->accountancy_code_buy;
+				$this->accountancy_code_buy_intra = $obj->accountancy_code_buy_intra;
+				$this->accountancy_code_buy_export		= $obj->accountancy_code_buy_export;
+				$this->accountancy_code_sell			= $obj->accountancy_code_sell;
+				$this->accountancy_code_sell_intra		= $obj->accountancy_code_sell_intra;
+				$this->accountancy_code_sell_export		= $obj->accountancy_code_sell_export;
 
-                $this->fk_default_warehouse            = $obj->fk_default_warehouse;
-                $this->seuil_stock_alerte            = $obj->seuil_stock_alerte;
-                $this->desiredstock                    = $obj->desiredstock;
-                $this->stock_reel                    = $obj->stock;
-                $this->pmp = $obj->pmp;
+				$this->fk_default_warehouse            = $obj->fk_default_warehouse;
+				$this->seuil_stock_alerte            = $obj->seuil_stock_alerte;
+				$this->desiredstock                    = $obj->desiredstock;
+				$this->stock_reel                    = $obj->stock;
+				$this->pmp = $obj->pmp;
 
-                $this->date_creation                = $obj->datec;
-                $this->date_modification            = $obj->tms;
-                $this->import_key                    = $obj->import_key;
-                $this->entity                        = $obj->entity;
+				$this->date_creation                = $obj->datec;
+				$this->date_modification            = $obj->tms;
+				$this->import_key                    = $obj->import_key;
+				$this->entity                        = $obj->entity;
 
-                $this->ref_ext                        = $obj->ref_ext;
-                $this->fk_price_expression            = $obj->fk_price_expression;
-                $this->fk_unit                        = $obj->fk_unit;
-                $this->price_autogen = $obj->price_autogen;
+				$this->ref_ext                        = $obj->ref_ext;
+				$this->fk_price_expression            = $obj->fk_price_expression;
+				$this->fk_unit                        = $obj->fk_unit;
+				$this->price_autogen = $obj->price_autogen;
+				$this->model_pdf = $obj->model_pdf;
 
-                $this->db->free($resql);
+				$this->db->free($resql);
 
-                // Retreive all extrafield
-                // fetch optionals attributes and labels
-                $this->fetch_optionals();
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 
-                // multilangs
-                if (!empty($conf->global->MAIN_MULTILANGS) && empty($ignore_lang_load)) {
-                    $this->getMultiLangs();
-                }
+				// multilangs
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($ignore_lang_load)) {
+					$this->getMultiLangs();
+				}
 
-                // Load multiprices array
-                if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($ignore_price_load))                // prices per segment
-                {
-                    for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
-                    {
-                        $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
-                        $sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
-                        $sql .= " FROM ".MAIN_DB_PREFIX."product_price";
-                        $sql .= " WHERE entity IN (".getEntity('productprice').")";
-                        $sql .= " AND price_level=".$i;
-                        $sql .= " AND fk_product = ".$this->id;
-                        $sql .= " ORDER BY date_price DESC, rowid DESC";
-                        $sql .= " LIMIT 1";
-                        $resql = $this->db->query($sql);
-                        if ($resql) {
-                            $result = $this->db->fetch_array($resql);
+				// Load multiprices array
+				if (!empty($conf->global->PRODUIT_MULTIPRICES) && empty($ignore_price_load))                // prices per segment
+				{
+					for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+					{
+						$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
+						$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
+						$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+						$sql .= " WHERE entity IN (".getEntity('productprice').")";
+						$sql .= " AND price_level=".$i;
+						$sql .= " AND fk_product = ".$this->id;
+						$sql .= " ORDER BY date_price DESC, rowid DESC";
+						$sql .= " LIMIT 1";
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							$result = $this->db->fetch_array($resql);
 
-                            $this->multiprices[$i] = $result["price"];
-                            $this->multiprices_ttc[$i] = $result["price_ttc"];
-                            $this->multiprices_min[$i] = $result["price_min"];
-                            $this->multiprices_min_ttc[$i] = $result["price_min_ttc"];
-                            $this->multiprices_base_type[$i] = $result["price_base_type"];
-                            // Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
-                            $this->multiprices_tva_tx[$i] = $result["tva_tx"]; // TODO Add ' ('.$result['default_vat_code'].')'
-                            $this->multiprices_recuperableonly[$i] = $result["recuperableonly"];
+							$this->multiprices[$i] = $result["price"];
+							$this->multiprices_ttc[$i] = $result["price_ttc"];
+							$this->multiprices_min[$i] = $result["price_min"];
+							$this->multiprices_min_ttc[$i] = $result["price_min_ttc"];
+							$this->multiprices_base_type[$i] = $result["price_base_type"];
+							// Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
+							$this->multiprices_tva_tx[$i] = $result["tva_tx"]; // TODO Add ' ('.$result['default_vat_code'].')'
+							$this->multiprices_recuperableonly[$i] = $result["recuperableonly"];
 
-                            // Price by quantity
-                            /*
+							// Price by quantity
+							/*
                             $this->prices_by_qty[$i]=$result["price_by_qty"];
                             $this->prices_by_qty_id[$i]=$result["rowid"];
                             // Récuperation de la liste des prix selon qty si flag positionné
@@ -2280,622 +2215,593 @@ class Product extends CommonObject
                             return -1;
                             }
                             }*/
-                        }
-                        else
-                        {
-                            dol_print_error($this->db);
-                            return -1;
-                        }
-                    }
-                }
-                elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && empty($ignore_price_load))            // prices per customers
-                {
-                    // Nothing loaded by default. List may be very long.
-                }
-                elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) && empty($ignore_price_load))    // prices per quantity
-                {
-                    $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
-                    $sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";
-                    $sql .= " FROM ".MAIN_DB_PREFIX."product_price";
-                    $sql .= " WHERE fk_product = ".$this->id;
-                    $sql .= " ORDER BY date_price DESC, rowid DESC";
-                    $sql .= " LIMIT 1";
-                    $resql = $this->db->query($sql);
-                    if ($resql) {
-                        $result = $this->db->fetch_array($resql);
+						} else {
+							$this->error = $this->db->lasterror;
+							return -1;
+						}
+					}
+				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && empty($ignore_price_load))            // prices per customers
+				{
+					// Nothing loaded by default. List may be very long.
+				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) && empty($ignore_price_load))    // prices per quantity
+				{
+					$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
+					$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";
+					$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+					$sql .= " WHERE fk_product = ".$this->id;
+					$sql .= " ORDER BY date_price DESC, rowid DESC";
+					$sql .= " LIMIT 1";
+					$resql = $this->db->query($sql);
+					if ($resql) {
+						$result = $this->db->fetch_array($resql);
 
-                        // Price by quantity
-                        $this->prices_by_qty[0] = $result["price_by_qty"];
-                        $this->prices_by_qty_id[0] = $result["rowid"];
-                        // Récuperation de la liste des prix selon qty si flag positionné
-                        if ($this->prices_by_qty[0] == 1) {
-                            $sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise, remise, price_base_type";
-                            $sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-                            $sql .= " WHERE fk_product_price = ".$this->prices_by_qty_id[0];
-                            $sql .= " ORDER BY quantity ASC";
-                            $resultat = array();
-                            $resql = $this->db->query($sql);
-                            if ($resql) {
-                                $ii = 0;
-                                while ($result = $this->db->fetch_array($resql)) {
-                                    $resultat[$ii] = array();
-                                    $resultat[$ii]["rowid"] = $result["rowid"];
-                                    $resultat[$ii]["price"] = $result["price"];
-                                    $resultat[$ii]["unitprice"] = $result["unitprice"];
-                                    $resultat[$ii]["quantity"] = $result["quantity"];
-                                    $resultat[$ii]["remise_percent"] = $result["remise_percent"];
-                                    //$resultat[$ii]["remise"]= $result["remise"];                    // deprecated
-                                    $resultat[$ii]["price_base_type"] = $result["price_base_type"];
-                                    $ii++;
-                                }
-                                $this->prices_by_qty_list[0] = $resultat;
-                            }
-                            else
-                            {
-                                    dol_print_error($this->db);
-                                    return -1;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        dol_print_error($this->db);
-                        return -1;
-                    }
-                }
-                elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES) && empty($ignore_price_load))    // prices per customer and quantity
-                {
-                    for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
-                    {
-                        $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
-                        $sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
-                        $sql .= " FROM ".MAIN_DB_PREFIX."product_price";
-                        $sql .= " WHERE entity IN (".getEntity('productprice').")";
-                        $sql .= " AND price_level=".$i;
-                        $sql .= " AND fk_product = ".$this->id;
-                        $sql .= " ORDER BY date_price DESC, rowid DESC";
-                        $sql .= " LIMIT 1";
-                        $resql = $this->db->query($sql);
-                        if ($resql) {
-                            $result = $this->db->fetch_array($resql);
+						// Price by quantity
+						$this->prices_by_qty[0] = $result["price_by_qty"];
+						$this->prices_by_qty_id[0] = $result["rowid"];
+						// Récuperation de la liste des prix selon qty si flag positionné
+						if ($this->prices_by_qty[0] == 1) {
+							$sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise, remise, price_base_type";
+							$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+							$sql .= " WHERE fk_product_price = ".$this->prices_by_qty_id[0];
+							$sql .= " ORDER BY quantity ASC";
+							$resultat = array();
+							$resql = $this->db->query($sql);
+							if ($resql) {
+								$ii = 0;
+								while ($result = $this->db->fetch_array($resql)) {
+									$resultat[$ii] = array();
+									$resultat[$ii]["rowid"] = $result["rowid"];
+									$resultat[$ii]["price"] = $result["price"];
+									$resultat[$ii]["unitprice"] = $result["unitprice"];
+									$resultat[$ii]["quantity"] = $result["quantity"];
+									$resultat[$ii]["remise_percent"] = $result["remise_percent"];
+									//$resultat[$ii]["remise"]= $result["remise"];                    // deprecated
+									$resultat[$ii]["price_base_type"] = $result["price_base_type"];
+									$ii++;
+								}
+								$this->prices_by_qty_list[0] = $resultat;
+							} else {
+								$this->error = $this->db->lasterror;
+								return -1;
+							}
+						}
+					} else {
+						$this->error = $this->db->lasterror;
+						return -1;
+					}
+				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES) && empty($ignore_price_load))    // prices per customer and quantity
+				{
+					for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+					{
+						$sql = "SELECT price, price_ttc, price_min, price_min_ttc,";
+						$sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";
+						$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+						$sql .= " WHERE entity IN (".getEntity('productprice').")";
+						$sql .= " AND price_level=".$i;
+						$sql .= " AND fk_product = ".$this->id;
+						$sql .= " ORDER BY date_price DESC, rowid DESC";
+						$sql .= " LIMIT 1";
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							$result = $this->db->fetch_array($resql);
 
-                            $this->multiprices[$i] = $result["price"];
-                            $this->multiprices_ttc[$i] = $result["price_ttc"];
-                            $this->multiprices_min[$i] = $result["price_min"];
-                            $this->multiprices_min_ttc[$i] = $result["price_min_ttc"];
-                            $this->multiprices_base_type[$i] = $result["price_base_type"];
-                            // Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
-                            $this->multiprices_tva_tx[$i] = $result["tva_tx"]; // TODO Add ' ('.$result['default_vat_code'].')'
-                            $this->multiprices_recuperableonly[$i] = $result["recuperableonly"];
+							$this->multiprices[$i] = $result["price"];
+							$this->multiprices_ttc[$i] = $result["price_ttc"];
+							$this->multiprices_min[$i] = $result["price_min"];
+							$this->multiprices_min_ttc[$i] = $result["price_min_ttc"];
+							$this->multiprices_base_type[$i] = $result["price_base_type"];
+							// Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
+							$this->multiprices_tva_tx[$i] = $result["tva_tx"]; // TODO Add ' ('.$result['default_vat_code'].')'
+							$this->multiprices_recuperableonly[$i] = $result["recuperableonly"];
 
-                            // Price by quantity
-                            $this->prices_by_qty[$i] = $result["price_by_qty"];
-                            $this->prices_by_qty_id[$i] = $result["rowid"];
-                            // Récuperation de la liste des prix selon qty si flag positionné
-                            if ($this->prices_by_qty[$i] == 1) {
-                                $sql = "SELECT rowid, price, unitprice, quantity, remise_percent, remise, price_base_type";
-                                $sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
-                                $sql .= " WHERE fk_product_price = ".$this->prices_by_qty_id[$i];
-                                $sql .= " ORDER BY quantity ASC";
-                                $resultat = array();
-                                $resql = $this->db->query($sql);
-                                if ($resql) {
-                                    $ii = 0;
-                                    while ($result = $this->db->fetch_array($resql)) {
-                                        $resultat[$ii] = array();
-                                        $resultat[$ii]["rowid"] = $result["rowid"];
-                                        $resultat[$ii]["price"] = $result["price"];
-                                        $resultat[$ii]["unitprice"] = $result["unitprice"];
-                                        $resultat[$ii]["quantity"] = $result["quantity"];
-                                        $resultat[$ii]["remise_percent"] = $result["remise_percent"];
-                                        $resultat[$ii]["remise"] = $result["remise"]; // deprecated
-                                        $resultat[$ii]["price_base_type"] = $result["price_base_type"];
-                                        $ii++;
-                                    }
-                                    $this->prices_by_qty_list[$i] = $resultat;
-                                }
-                                else
-                                         {
-                                    dol_print_error($this->db);
-                                    return -1;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            dol_print_error($this->db);
-                            return -1;
-                        }
-                    }
-                }
+							// Price by quantity
+							$this->prices_by_qty[$i] = $result["price_by_qty"];
+							$this->prices_by_qty_id[$i] = $result["rowid"];
+							// Récuperation de la liste des prix selon qty si flag positionné
+							if ($this->prices_by_qty[$i] == 1) {
+								$sql = "SELECT rowid, price, unitprice, quantity, remise_percent, remise, price_base_type";
+								$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
+								$sql .= " WHERE fk_product_price = ".$this->prices_by_qty_id[$i];
+								$sql .= " ORDER BY quantity ASC";
+								$resultat = array();
+								$resql = $this->db->query($sql);
+								if ($resql) {
+									$ii = 0;
+									while ($result = $this->db->fetch_array($resql)) {
+										$resultat[$ii] = array();
+										$resultat[$ii]["rowid"] = $result["rowid"];
+										$resultat[$ii]["price"] = $result["price"];
+										$resultat[$ii]["unitprice"] = $result["unitprice"];
+										$resultat[$ii]["quantity"] = $result["quantity"];
+										$resultat[$ii]["remise_percent"] = $result["remise_percent"];
+										$resultat[$ii]["remise"] = $result["remise"]; // deprecated
+										$resultat[$ii]["price_base_type"] = $result["price_base_type"];
+										$ii++;
+									}
+									$this->prices_by_qty_list[$i] = $resultat;
+								} else {
+									$this->error = $this->db->lasterror;
+									return -1;
+								}
+							}
+						} else {
+							$this->error = $this->db->lasterror;
+							return -1;
+						}
+					}
+				}
 
-                if (!empty($conf->dynamicprices->enabled) && !empty($this->fk_price_expression) && empty($ignore_expression)) {
-                       include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-                    $priceparser = new PriceParser($this->db);
-                       $price_result = $priceparser->parseProduct($this);
-                    if ($price_result >= 0) {
-                        $this->price = $price_result;
-                        // Calculate the VAT
-                        $this->price_ttc = price2num($this->price) * (1 + ($this->tva_tx / 100));
-                        $this->price_ttc = price2num($this->price_ttc, 'MU');
-                    }
-                }
+				if (!empty($conf->dynamicprices->enabled) && !empty($this->fk_price_expression) && empty($ignore_expression)) {
+					   include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
+					$priceparser = new PriceParser($this->db);
+					   $price_result = $priceparser->parseProduct($this);
+					if ($price_result >= 0) {
+						$this->price = $price_result;
+						// Calculate the VAT
+						$this->price_ttc = price2num($this->price) * (1 + ($this->tva_tx / 100));
+						$this->price_ttc = price2num($this->price_ttc, 'MU');
+					}
+				}
 
-                // We should not load stock during the fetch. If someone need stock of product, he must call load_stock after fetching product.
-                // Instead we just init the stock_warehouse array
-                $this->stock_warehouse = array();
+				// We should not load stock during the fetch. If someone need stock of product, he must call load_stock after fetching product.
+				// Instead we just init the stock_warehouse array
+				$this->stock_warehouse = array();
 
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror;
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats propale pour le produit/service
-     *
-     * @param  int $socid Id societe
-     * @return integer      Tableau des stats dans $this->stats_propale, <0 if ko >0 if ok
-     */
-    public function load_stats_propale($socid = 0)
-    {
-        // phpcs:enable
-        global $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats propale pour le produit/service
+	 *
+	 * @param  int $socid Id societe
+	 * @return integer      Tableau des stats dans $this->stats_propale, <0 if ko >0 if ok
+	 */
+	public function load_stats_propale($socid = 0)
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
 
-        $sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_customers, COUNT(DISTINCT p.rowid) as nb,";
-        $sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
-        $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
-        $sql .= ", ".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.rowid = pd.fk_propal";
-        $sql .= " AND p.fk_soc = s.rowid";
-        $sql .= " AND p.entity IN (".getEntity('propal').")";
-        $sql .= " AND pd.fk_product = ".$this->id;
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        //$sql.= " AND pr.fk_statut != 0";
-        if ($socid > 0) {
-            $sql .= " AND p.fk_soc = ".$socid;
-        }
+		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_customers, COUNT(DISTINCT p.rowid) as nb,";
+		$sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
+		$sql .= ", ".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.rowid = pd.fk_propal";
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND p.entity IN (".getEntity('propal').")";
+		$sql .= " AND pd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		//$sql.= " AND pr.fk_statut != 0";
+		if ($socid > 0) {
+			$sql .= " AND p.fk_soc = ".$socid;
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            $this->stats_propale['customers'] = $obj->nb_customers;
-            $this->stats_propale['nb'] = $obj->nb;
-            $this->stats_propale['rows'] = $obj->nb_rows;
-            $this->stats_propale['qty'] = $obj->qty ? $obj->qty : 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_propale['customers'] = $obj->nb_customers;
+			$this->stats_propale['nb'] = $obj->nb;
+			$this->stats_propale['rows'] = $obj->nb_rows;
+			$this->stats_propale['qty'] = $obj->qty ? $obj->qty : 0;
 
-            // if it's a virtual product, maybe it is in proposal by extension
-            if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
-                $TFather = $this->getFather();
-                if (is_array($TFather) && !empty($TFather)) {
-                    foreach ($TFather as &$fatherData) {
-                        $pFather = new Product($this->db);
-                        $pFather->id = $fatherData['id'];
-                        $qtyCoef = $fatherData['qty'];
+			// if it's a virtual product, maybe it is in proposal by extension
+			if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
+				$TFather = $this->getFather();
+				if (is_array($TFather) && !empty($TFather)) {
+					foreach ($TFather as &$fatherData) {
+						$pFather = new Product($this->db);
+						$pFather->id = $fatherData['id'];
+						$qtyCoef = $fatherData['qty'];
 
-                        if ($fatherData['incdec']) {
-                            $pFather->load_stats_propale($socid);
+						if ($fatherData['incdec']) {
+							$pFather->load_stats_propale($socid);
 
-                            $this->stats_propale['customers'] += $pFather->stats_propale['customers'];
-                            $this->stats_propale['nb'] += $pFather->stats_propale['nb'];
-                            $this->stats_propale['rows'] += $pFather->stats_propale['rows'];
-                            $this->stats_propale['qty'] += $pFather->stats_propale['qty'] * $qtyCoef;
-                        }
-                    }
-                }
-            }
+							$this->stats_propale['customers'] += $pFather->stats_propale['customers'];
+							$this->stats_propale['nb'] += $pFather->stats_propale['nb'];
+							$this->stats_propale['rows'] += $pFather->stats_propale['rows'];
+							$this->stats_propale['qty'] += $pFather->stats_propale['qty'] * $qtyCoef;
+						}
+					}
+				}
+			}
 
-            $parameters = array('socid' => $socid);
-            $reshook = $hookmanager->executeHooks('loadStatsCustomerProposal', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_propale = $hookmanager->resArray['stats_propale'];
+			$parameters = array('socid' => $socid);
+			$reshook = $hookmanager->executeHooks('loadStatsCustomerProposal', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_propale = $hookmanager->resArray['stats_propale'];
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats propale pour le produit/service
-     *
-     * @param  int $socid Id thirdparty
-     * @return array               Tableau des stats
-     */
-    public function load_stats_proposal_supplier($socid = 0)
-    {
-        // phpcs:enable
-        global $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats propale pour le produit/service
+	 *
+	 * @param  int $socid Id thirdparty
+	 * @return array               Tableau des stats
+	 */
+	public function load_stats_proposal_supplier($socid = 0)
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
 
-        $sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_suppliers, COUNT(DISTINCT p.rowid) as nb,";
-        $sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
-        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as pd";
-        $sql .= ", ".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.rowid = pd.fk_supplier_proposal";
-        $sql .= " AND p.fk_soc = s.rowid";
-        $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
-        $sql .= " AND pd.fk_product = ".$this->id;
-        if (!$user->rights->societe->client->voir && !$socid) { $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        //$sql.= " AND pr.fk_statut != 0";
-        if ($socid > 0) {    $sql .= " AND p.fk_soc = ".$socid;
-        }
+		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_suppliers, COUNT(DISTINCT p.rowid) as nb,";
+		$sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as pd";
+		$sql .= ", ".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.rowid = pd.fk_supplier_proposal";
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
+		$sql .= " AND pd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) { $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		//$sql.= " AND pr.fk_statut != 0";
+		if ($socid > 0) {    $sql .= " AND p.fk_soc = ".$socid;
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            $this->stats_proposal_supplier['suppliers'] = $obj->nb_suppliers;
-            $this->stats_proposal_supplier['nb'] = $obj->nb;
-            $this->stats_proposal_supplier['rows'] = $obj->nb_rows;
-            $this->stats_proposal_supplier['qty'] = $obj->qty ? $obj->qty : 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_proposal_supplier['suppliers'] = $obj->nb_suppliers;
+			$this->stats_proposal_supplier['nb'] = $obj->nb;
+			$this->stats_proposal_supplier['rows'] = $obj->nb_rows;
+			$this->stats_proposal_supplier['qty'] = $obj->qty ? $obj->qty : 0;
 
-            $parameters = array('socid' => $socid);
-            $reshook = $hookmanager->executeHooks('loadStatsSupplierProposal', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_proposal_supplier = $hookmanager->resArray['stats_proposal_supplier'];
+			$parameters = array('socid' => $socid);
+			$reshook = $hookmanager->executeHooks('loadStatsSupplierProposal', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_proposal_supplier = $hookmanager->resArray['stats_proposal_supplier'];
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats commande client pour le produit/service
-     *
-     * @param  int    $socid           Id societe pour filtrer sur une societe
-     * @param  string $filtrestatut    Id statut pour filtrer sur un statut
-     * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
-     * @return integer                 Array of stats in $this->stats_commande (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
-     */
-    public function load_stats_commande($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
-    {
-        // phpcs:enable
-        global $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats commande client pour le produit/service
+	 *
+	 * @param  int    $socid           Id societe pour filtrer sur une societe
+	 * @param  string $filtrestatut    Id statut pour filtrer sur un statut
+	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @return integer                 Array of stats in $this->stats_commande (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
+	 */
+	public function load_stats_commande($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
 
-        $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
-        $sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-        $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
-        $sql .= ", ".MAIN_DB_PREFIX."commande as c";
-        $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-        if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE c.rowid = cd.fk_commande";
-        $sql .= " AND c.fk_soc = s.rowid";
-        $sql .= " AND c.entity IN (".getEntity('commande').")";
-        $sql .= " AND cd.fk_product = ".$this->id;
-        if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {
-            $sql .= " AND c.fk_soc = ".$socid;
-        }
-        if ($filtrestatut <> '') {
-            $sql .= " AND c.fk_statut in (".$filtrestatut.")";
-        }
+		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
+		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";
+		$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE c.rowid = cd.fk_commande";
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('commande').")";
+		$sql .= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND c.fk_soc = ".$socid;
+		}
+		if ($filtrestatut <> '') {
+			$sql .= " AND c.fk_statut in (".$filtrestatut.")";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            $this->stats_commande['customers'] = $obj->nb_customers;
-            $this->stats_commande['nb'] = $obj->nb;
-            $this->stats_commande['rows'] = $obj->nb_rows;
-            $this->stats_commande['qty'] = $obj->qty ? $obj->qty : 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_commande['customers'] = $obj->nb_customers;
+			$this->stats_commande['nb'] = $obj->nb;
+			$this->stats_commande['rows'] = $obj->nb_rows;
+			$this->stats_commande['qty'] = $obj->qty ? $obj->qty : 0;
 
-            // if it's a virtual product, maybe it is in order by extension
-            if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
-                $TFather = $this->getFather();
-                if (is_array($TFather) && !empty($TFather)) {
-                    foreach ($TFather as &$fatherData) {
-                        $pFather = new Product($this->db);
-                        $pFather->id = $fatherData['id'];
-                        $qtyCoef = $fatherData['qty'];
+			// if it's a virtual product, maybe it is in order by extension
+			if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
+				$TFather = $this->getFather();
+				if (is_array($TFather) && !empty($TFather)) {
+					foreach ($TFather as &$fatherData) {
+						$pFather = new Product($this->db);
+						$pFather->id = $fatherData['id'];
+						$qtyCoef = $fatherData['qty'];
 
-                        if ($fatherData['incdec']) {
-                            $pFather->load_stats_commande($socid, $filtrestatut);
+						if ($fatherData['incdec']) {
+							$pFather->load_stats_commande($socid, $filtrestatut);
 
-                            $this->stats_commande['customers'] += $pFather->stats_commande['customers'];
-                            $this->stats_commande['nb'] += $pFather->stats_commande['nb'];
-                            $this->stats_commande['rows'] += $pFather->stats_commande['rows'];
-                            $this->stats_commande['qty'] += $pFather->stats_commande['qty'] * $qtyCoef;
-                        }
-                    }
-                }
-            }
+							$this->stats_commande['customers'] += $pFather->stats_commande['customers'];
+							$this->stats_commande['nb'] += $pFather->stats_commande['nb'];
+							$this->stats_commande['rows'] += $pFather->stats_commande['rows'];
+							$this->stats_commande['qty'] += $pFather->stats_commande['qty'] * $qtyCoef;
+						}
+					}
+				}
+			}
 
-            // If stock decrease is on invoice validation, the theorical stock continue to
-            // count the orders to ship in theorical stock when some are already removed b invoice validation.
-            // If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation.
-            if (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
-                if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS)) {
-                    $adeduire = 0;
-                    $sql = "SELECT sum(fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
-                    $sql .= " JOIN ".MAIN_DB_PREFIX."facture f ON fd.fk_facture = f.rowid ";
-                    $sql .= " JOIN ".MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
-                    $sql .= " JOIN ".MAIN_DB_PREFIX."commande c ON el.fk_source = c.rowid ";
-                    $sql .= " WHERE c.fk_statut IN (".$filtrestatut.") AND c.facture = 0 AND fd.fk_product = ".$this->id;
-                    dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
+			// If stock decrease is on invoice validation, the theorical stock continue to
+			// count the orders to ship in theorical stock when some are already removed b invoice validation.
+			// If option DECREASE_ONLY_UNINVOICEDPRODUCTS is on, we make a compensation.
+			if (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+				if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS)) {
+					$adeduire = 0;
+					$sql = "SELECT sum(fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";
+					$sql .= " JOIN ".MAIN_DB_PREFIX."facture f ON fd.fk_facture = f.rowid ";
+					$sql .= " JOIN ".MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";
+					$sql .= " JOIN ".MAIN_DB_PREFIX."commande c ON el.fk_source = c.rowid ";
+					$sql .= " WHERE c.fk_statut IN (".$filtrestatut.") AND c.facture = 0 AND fd.fk_product = ".$this->id;
+					dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);
 
-                    $resql = $this->db->query($sql);
-                    if ($resql) {
-                        if ($this->db->num_rows($resql) > 0) {
-                            $obj = $this->db->fetch_object($resql);
-                            $adeduire += $obj->count;
-                        }
-                    }
+					$resql = $this->db->query($sql);
+					if ($resql) {
+						if ($this->db->num_rows($resql) > 0) {
+							$obj = $this->db->fetch_object($resql);
+							$adeduire += $obj->count;
+						}
+					}
 
-                    $this->stats_commande['qty'] -= $adeduire;
-                }
-            }
+					$this->stats_commande['qty'] -= $adeduire;
+				}
+			}
 
-            $parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock);
-            $reshook = $hookmanager->executeHooks('loadStatsCustomerOrder', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_commande = $hookmanager->resArray['stats_commande'];
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			$parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock);
+			$reshook = $hookmanager->executeHooks('loadStatsCustomerOrder', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_commande = $hookmanager->resArray['stats_commande'];
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats commande fournisseur pour le produit/service
-     *
-     * @param  int    $socid           Id societe pour filtrer sur une societe
-     * @param  string $filtrestatut    Id des statuts pour filtrer sur des statuts
-     * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
-     * @return array                     Tableau des stats
-     */
-    public function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
-    {
-        // phpcs:enable
-        global $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats commande fournisseur pour le produit/service
+	 *
+	 * @param  int    $socid           Id societe pour filtrer sur une societe
+	 * @param  string $filtrestatut    Id des statuts pour filtrer sur des statuts
+	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @return array                     Tableau des stats
+	 */
+	public function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
 
-        $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_suppliers, COUNT(DISTINCT c.rowid) as nb,";
-        $sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
-        $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-        $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-        if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE c.rowid = cd.fk_commande";
-        $sql .= " AND c.fk_soc = s.rowid";
-        $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
-        $sql .= " AND cd.fk_product = ".$this->id;
-        if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {
-            $sql .= " AND c.fk_soc = ".$socid;
-        }
-        if ($filtrestatut != '') {
-            $sql .= " AND c.fk_statut in (".$filtrestatut.")"; // Peut valoir 0
-        }
+		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_suppliers, COUNT(DISTINCT c.rowid) as nb,";
+		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";
+		$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE c.rowid = cd.fk_commande";
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
+		$sql .= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND c.fk_soc = ".$socid;
+		}
+		if ($filtrestatut != '') {
+			$sql .= " AND c.fk_statut in (".$filtrestatut.")"; // Peut valoir 0
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            $this->stats_commande_fournisseur['suppliers'] = $obj->nb_suppliers;
-            $this->stats_commande_fournisseur['nb'] = $obj->nb;
-            $this->stats_commande_fournisseur['rows'] = $obj->nb_rows;
-            $this->stats_commande_fournisseur['qty'] = $obj->qty ? $obj->qty : 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_commande_fournisseur['suppliers'] = $obj->nb_suppliers;
+			$this->stats_commande_fournisseur['nb'] = $obj->nb;
+			$this->stats_commande_fournisseur['rows'] = $obj->nb_rows;
+			$this->stats_commande_fournisseur['qty'] = $obj->qty ? $obj->qty : 0;
 
-            $parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock);
-            $reshook = $hookmanager->executeHooks('loadStatsSupplierOrder', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_commande_fournisseur = $hookmanager->resArray['stats_commande_fournisseur'];
+			$parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock);
+			$reshook = $hookmanager->executeHooks('loadStatsSupplierOrder', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_commande_fournisseur = $hookmanager->resArray['stats_commande_fournisseur'];
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error().' sql='.$sql;
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error().' sql='.$sql;
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats expedition client pour le produit/service
-     *
-     * @param   int         $socid                  Id societe pour filtrer sur une societe
-     * @param   string      $filtrestatut           [=''] Ids order status separated by comma
-     * @param   int         $forVirtualStock        Ignore rights filter for virtual stock calculation.
-     * @param   string      $filterShipmentStatus   [=''] Ids shipment status separated by comma
-     * @return  int         <0 if KO, >0 if OK (Tableau des stats)
-     */
-    public function load_stats_sending($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $filterShipmentStatus = '')
-    {
-        // phpcs:enable
-        global $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats expedition client pour le produit/service
+	 *
+	 * @param   int         $socid                  Id societe pour filtrer sur une societe
+	 * @param   string      $filtrestatut           [=''] Ids order status separated by comma
+	 * @param   int         $forVirtualStock        Ignore rights filter for virtual stock calculation.
+	 * @param   string      $filterShipmentStatus   [=''] Ids shipment status separated by comma
+	 * @return  int         <0 if KO, >0 if OK (Tableau des stats)
+	 */
+	public function load_stats_sending($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $filterShipmentStatus = '')
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
 
-        $sql = "SELECT COUNT(DISTINCT e.fk_soc) as nb_customers, COUNT(DISTINCT e.rowid) as nb,";
-        $sql .= " COUNT(ed.rowid) as nb_rows, SUM(ed.qty) as qty";
-        $sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
-        $sql .= ", ".MAIN_DB_PREFIX."commandedet as cd";
-        $sql .= ", ".MAIN_DB_PREFIX."commande as c";
-        $sql .= ", ".MAIN_DB_PREFIX."expedition as e";
-        $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-        if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE e.rowid = ed.fk_expedition";
-        $sql .= " AND c.rowid = cd.fk_commande";
-        $sql .= " AND e.fk_soc = s.rowid";
-        $sql .= " AND e.entity IN (".getEntity('expedition').")";
-        $sql .= " AND ed.fk_origin_line = cd.rowid";
-        $sql .= " AND cd.fk_product = ".$this->id;
-        if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
-            $sql .= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {
-            $sql .= " AND e.fk_soc = ".$socid;
-        }
-        if ($filtrestatut <> '') {
-            $sql .= " AND c.fk_statut in (".$filtrestatut.")";
-        }
-        if (!empty($filterShipmentStatus)) $sql .= " AND e.fk_statut IN (".$filterShipmentStatus.")";
+		$sql = "SELECT COUNT(DISTINCT e.fk_soc) as nb_customers, COUNT(DISTINCT e.rowid) as nb,";
+		$sql .= " COUNT(ed.rowid) as nb_rows, SUM(ed.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";
+		$sql .= ", ".MAIN_DB_PREFIX."commandedet as cd";
+		$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+		$sql .= ", ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE e.rowid = ed.fk_expedition";
+		$sql .= " AND c.rowid = cd.fk_commande";
+		$sql .= " AND e.fk_soc = s.rowid";
+		$sql .= " AND e.entity IN (".getEntity('expedition').")";
+		$sql .= " AND ed.fk_origin_line = cd.rowid";
+		$sql .= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+			$sql .= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND e.fk_soc = ".$socid;
+		}
+		if ($filtrestatut <> '') {
+			$sql .= " AND c.fk_statut in (".$filtrestatut.")";
+		}
+		if (!empty($filterShipmentStatus)) $sql .= " AND e.fk_statut IN (".$filterShipmentStatus.")";
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            $this->stats_expedition['customers'] = $obj->nb_customers;
-            $this->stats_expedition['nb'] = $obj->nb;
-            $this->stats_expedition['rows'] = $obj->nb_rows;
-            $this->stats_expedition['qty'] = $obj->qty ? $obj->qty : 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_expedition['customers'] = $obj->nb_customers;
+			$this->stats_expedition['nb'] = $obj->nb;
+			$this->stats_expedition['rows'] = $obj->nb_rows;
+			$this->stats_expedition['qty'] = $obj->qty ? $obj->qty : 0;
 
-            // if it's a virtual product, maybe it is in sending by extension
-            if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
-                $TFather = $this->getFather();
-                if (is_array($TFather) && !empty($TFather)) {
-                    foreach ($TFather as &$fatherData) {
-                        $pFather = new Product($this->db);
-                        $pFather->id = $fatherData['id'];
-                        $qtyCoef = $fatherData['qty'];
+			// if it's a virtual product, maybe it is in sending by extension
+			if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
+				$TFather = $this->getFather();
+				if (is_array($TFather) && !empty($TFather)) {
+					foreach ($TFather as &$fatherData) {
+						$pFather = new Product($this->db);
+						$pFather->id = $fatherData['id'];
+						$qtyCoef = $fatherData['qty'];
 
-                        if ($fatherData['incdec']) {
-                            $pFather->load_stats_sending($socid, $filtrestatut, $forVirtualStock);
+						if ($fatherData['incdec']) {
+							$pFather->load_stats_sending($socid, $filtrestatut, $forVirtualStock);
 
-                            $this->stats_expedition['customers'] += $pFather->stats_expedition['customers'];
-                            $this->stats_expedition['nb'] += $pFather->stats_expedition['nb'];
-                            $this->stats_expedition['rows'] += $pFather->stats_expedition['rows'];
-                            $this->stats_expedition['qty'] += $pFather->stats_expedition['qty'] * $qtyCoef;
-                        }
-                    }
-                }
-            }
+							$this->stats_expedition['customers'] += $pFather->stats_expedition['customers'];
+							$this->stats_expedition['nb'] += $pFather->stats_expedition['nb'];
+							$this->stats_expedition['rows'] += $pFather->stats_expedition['rows'];
+							$this->stats_expedition['qty'] += $pFather->stats_expedition['qty'] * $qtyCoef;
+						}
+					}
+				}
+			}
 
-            $parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock, 'filterShipmentStatus' => $filterShipmentStatus);
-            $reshook = $hookmanager->executeHooks('loadStatsSending', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_expedition = $hookmanager->resArray['stats_expedition'];
+			$parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock, 'filterShipmentStatus' => $filterShipmentStatus);
+			$reshook = $hookmanager->executeHooks('loadStatsSending', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_expedition = $hookmanager->resArray['stats_expedition'];
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats réception fournisseur pour le produit/service
-     *
-     * @param  int    $socid           Id societe pour filtrer sur une societe
-     * @param  string $filtrestatut    Id statut pour filtrer sur un statut
-     * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
-     * @return array                   Tableau des stats
-     */
-    public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
-    {
-        // phpcs:enable
-        global $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats réception fournisseur pour le produit/service
+	 *
+	 * @param  int    $socid           Id societe pour filtrer sur une societe
+	 * @param  string $filtrestatut    Id statut pour filtrer sur un statut
+	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @return array                   Tableau des stats
+	 */
+	public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
 
-        $sql = "SELECT COUNT(DISTINCT cf.fk_soc) as nb_suppliers, COUNT(DISTINCT cf.rowid) as nb,";
-        $sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
-        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd";
-        $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-        $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-        if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) { $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE cf.rowid = fd.fk_commande";
-        $sql .= " AND cf.fk_soc = s.rowid";
-        $sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
-        $sql .= " AND fd.fk_product = ".$this->id;
-        if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) { $sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {    $sql .= " AND cf.fk_soc = ".$socid;
-        }
-        if ($filtrestatut <> '') { $sql .= " AND cf.fk_statut in (".$filtrestatut.")";
-        }
+		$sql = "SELECT COUNT(DISTINCT cf.fk_soc) as nb_suppliers, COUNT(DISTINCT cf.rowid) as nb,";
+		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd";
+		$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) { $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE cf.rowid = fd.fk_commande";
+		$sql .= " AND cf.fk_soc = s.rowid";
+		$sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
+		$sql .= " AND fd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) { $sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {    $sql .= " AND cf.fk_soc = ".$socid;
+		}
+		if ($filtrestatut <> '') { $sql .= " AND cf.fk_statut in (".$filtrestatut.")";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            $this->stats_reception['suppliers'] = $obj->nb_suppliers;
-            $this->stats_reception['nb'] = $obj->nb;
-            $this->stats_reception['rows'] = $obj->nb_rows;
-            $this->stats_reception['qty'] = $obj->qty ? $obj->qty : 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_reception['suppliers'] = $obj->nb_suppliers;
+			$this->stats_reception['nb'] = $obj->nb;
+			$this->stats_reception['rows'] = $obj->nb_rows;
+			$this->stats_reception['qty'] = $obj->qty ? $obj->qty : 0;
 
-            $parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock);
-            $reshook = $hookmanager->executeHooks('loadStatsReception', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_reception = $hookmanager->resArray['stats_reception'];
+			$parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock);
+			$reshook = $hookmanager->executeHooks('loadStatsReception', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_reception = $hookmanager->resArray['stats_reception'];
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats commande client pour le produit/service
-     *
-     * @param  int    $socid           Id societe pour filtrer sur une societe
-     * @param  string $filtrestatut    Id statut pour filtrer sur un statut
-     * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
-     * @return integer                 Array of stats in $this->stats_commande (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
-     */
-    public function load_stats_inproduction($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
-    {
-    	// phpcs:enable
-    	global $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats commande client pour le produit/service
+	 *
+	 * @param  int    $socid           Id societe pour filtrer sur une societe
+	 * @param  string $filtrestatut    Id statut pour filtrer sur un statut
+	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @return integer                 Array of stats in $this->stats_commande (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
+	 */
+	public function load_stats_inproduction($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
 
-    	$sql = "SELECT COUNT(DISTINCT m.fk_soc) as nb_customers, COUNT(DISTINCT m.rowid) as nb,";
-    	$sql .= " COUNT(mp.rowid) as nb_rows, SUM(mp.qty) as qty, role";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."mrp_production as mp";
-    	$sql .= ", ".MAIN_DB_PREFIX."mrp_mo as m";
-    	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = m.fk_soc";
-    	if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
-    		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    	}
-    	$sql .= " WHERE m.rowid = mp.fk_mo";
-    	$sql .= " AND m.entity IN (".getEntity('mrp').")";
-    	$sql .= " AND mp.fk_product = ".$this->id;
-    	if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
-    		$sql .= " AND m.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-    	}
-    	if ($socid > 0) {
-    		$sql .= " AND m.fk_soc = ".$socid;
-    	}
-    	if ($filtrestatut <> '') {
-    		$sql .= " AND m.status in (".$filtrestatut.")";
-    	}
+		$sql = "SELECT COUNT(DISTINCT m.fk_soc) as nb_customers, COUNT(DISTINCT m.rowid) as nb,";
+		$sql .= " COUNT(mp.rowid) as nb_rows, SUM(mp.qty) as qty, role";
+		$sql .= " FROM ".MAIN_DB_PREFIX."mrp_production as mp";
+		$sql .= ", ".MAIN_DB_PREFIX."mrp_mo as m";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = m.fk_soc";
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE m.rowid = mp.fk_mo";
+		$sql .= " AND m.entity IN (".getEntity('mrp').")";
+		$sql .= " AND mp.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {
+			$sql .= " AND m.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND m.fk_soc = ".$socid;
+		}
+		if ($filtrestatut <> '') {
+			$sql .= " AND m.status in (".$filtrestatut.")";
+		}
 		$sql .= " GROUP BY role";
 
 		$this->stats_mrptoconsume['customers'] = 0;
@@ -2908,1180 +2814,1150 @@ class Product extends CommonObject
 		$this->stats_mrptoproduce['qty'] = 0;
 
 		$result = $this->db->query($sql);
-    	if ($result) {
-    		while ($obj = $this->db->fetch_object($result)) {
-	    		if ($obj->role == 'toconsume') {
-		    		$this->stats_mrptoconsume['customers'] += $obj->nb_customers;
-		    		$this->stats_mrptoconsume['nb'] += $obj->nb;
-		    		$this->stats_mrptoconsume['rows'] += $obj->nb_rows;
-		    		$this->stats_mrptoconsume['qty'] += ($obj->qty ? $obj->qty : 0);
-	    		}
-	    		if ($obj->role == 'consumed') {
-	    			//$this->stats_mrptoconsume['customers'] += $obj->nb_customers;
-	    			//$this->stats_mrptoconsume['nb'] += $obj->nb;
-	    			//$this->stats_mrptoconsume['rows'] += $obj->nb_rows;
-	    			$this->stats_mrptoconsume['qty'] -= ($obj->qty ? $obj->qty : 0);
-	    		}
-	    		if ($obj->role == 'toproduce') {
-	    			$this->stats_mrptoproduce['customers'] += $obj->nb_customers;
-	    			$this->stats_mrptoproduce['nb'] += $obj->nb;
-	    			$this->stats_mrptoproduce['rows'] += $obj->nb_rows;
-	    			$this->stats_mrptoproduce['qty'] += ($obj->qty ? $obj->qty : 0);
-	    		}
-	    		if ($obj->role == 'produced') {
-	    			//$this->stats_mrptoproduce['customers'] += $obj->nb_customers;
-	    			//$this->stats_mrptoproduce['nb'] += $obj->nb;
-	    			//$this->stats_mrptoproduce['rows'] += $obj->nb_rows;
-	    			$this->stats_mrptoproduce['qty'] -= ($obj->qty ? $obj->qty : 0);
-	    		}
-    		}
+		if ($result) {
+			while ($obj = $this->db->fetch_object($result)) {
+				if ($obj->role == 'toconsume') {
+					$this->stats_mrptoconsume['customers'] += $obj->nb_customers;
+					$this->stats_mrptoconsume['nb'] += $obj->nb;
+					$this->stats_mrptoconsume['rows'] += $obj->nb_rows;
+					$this->stats_mrptoconsume['qty'] += ($obj->qty ? $obj->qty : 0);
+				}
+				if ($obj->role == 'consumed') {
+					//$this->stats_mrptoconsume['customers'] += $obj->nb_customers;
+					//$this->stats_mrptoconsume['nb'] += $obj->nb;
+					//$this->stats_mrptoconsume['rows'] += $obj->nb_rows;
+					$this->stats_mrptoconsume['qty'] -= ($obj->qty ? $obj->qty : 0);
+				}
+				if ($obj->role == 'toproduce') {
+					$this->stats_mrptoproduce['customers'] += $obj->nb_customers;
+					$this->stats_mrptoproduce['nb'] += $obj->nb;
+					$this->stats_mrptoproduce['rows'] += $obj->nb_rows;
+					$this->stats_mrptoproduce['qty'] += ($obj->qty ? $obj->qty : 0);
+				}
+				if ($obj->role == 'produced') {
+					//$this->stats_mrptoproduce['customers'] += $obj->nb_customers;
+					//$this->stats_mrptoproduce['nb'] += $obj->nb;
+					//$this->stats_mrptoproduce['rows'] += $obj->nb_rows;
+					$this->stats_mrptoproduce['qty'] -= ($obj->qty ? $obj->qty : 0);
+				}
+			}
 
-    		// Clean data
-    		if ($this->stats_mrptoconsume['qty'] < 0) $this->stats_mrptoconsume['qty'] = 0;
-    		if ($this->stats_mrptoproduce['qty'] < 0) $this->stats_mrptoproduce['qty'] = 0;
+			// Clean data
+			if ($this->stats_mrptoconsume['qty'] < 0) $this->stats_mrptoconsume['qty'] = 0;
+			if ($this->stats_mrptoproduce['qty'] < 0) $this->stats_mrptoproduce['qty'] = 0;
 
-            $parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock);
-            $reshook = $hookmanager->executeHooks('loadStatsInProduction', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_mrptoproduce = $hookmanager->resArray['stats_mrptoproduce'];
+			$parameters = array('socid' => $socid, 'filtrestatut' => $filtrestatut, 'forVirtualStock' => $forVirtualStock);
+			$reshook = $hookmanager->executeHooks('loadStatsInProduction', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_mrptoproduce = $hookmanager->resArray['stats_mrptoproduce'];
 
-    		return 1;
-    	}
-    	else
-    	{
-    		$this->error = $this->db->error();
-    		return -1;
-    	}
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats contrat pour le produit/service
-     *
-     * @param  int $socid Id societe
-     * @return array               Tableau des stats
-     */
-    public function load_stats_contrat($socid = 0)
-    {
-        // phpcs:enable
-        global $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats contrat pour le produit/service
+	 *
+	 * @param  int $socid Id societe
+	 * @return array               Tableau des stats
+	 */
+	public function load_stats_contrat($socid = 0)
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
 
-        $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
-        $sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
-        $sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
-        $sql .= ", ".MAIN_DB_PREFIX."contrat 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.rowid = cd.fk_contrat";
-        $sql .= " AND c.fk_soc = s.rowid";
-        $sql .= " AND c.entity IN (".getEntity('contract').")";
-        $sql .= " AND cd.fk_product = ".$this->id;
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        //$sql.= " AND c.statut != 0";
-        if ($socid > 0) {
-            $sql .= " AND c.fk_soc = ".$socid;
-        }
+		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
+		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
+		$sql .= ", ".MAIN_DB_PREFIX."contrat 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.rowid = cd.fk_contrat";
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('contract').")";
+		$sql .= " AND cd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		//$sql.= " AND c.statut != 0";
+		if ($socid > 0) {
+			$sql .= " AND c.fk_soc = ".$socid;
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            $this->stats_contrat['customers'] = $obj->nb_customers;
-            $this->stats_contrat['nb'] = $obj->nb;
-            $this->stats_contrat['rows'] = $obj->nb_rows;
-            $this->stats_contrat['qty'] = $obj->qty ? $obj->qty : 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_contrat['customers'] = $obj->nb_customers;
+			$this->stats_contrat['nb'] = $obj->nb;
+			$this->stats_contrat['rows'] = $obj->nb_rows;
+			$this->stats_contrat['qty'] = $obj->qty ? $obj->qty : 0;
 
-            // if it's a virtual product, maybe it is in contract by extension
-            if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
-                $TFather = $this->getFather();
-                if (is_array($TFather) && !empty($TFather)) {
-                    foreach ($TFather as &$fatherData) {
-                        $pFather = new Product($this->db);
-                        $pFather->id = $fatherData['id'];
-                        $qtyCoef = $fatherData['qty'];
+			// if it's a virtual product, maybe it is in contract by extension
+			if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
+				$TFather = $this->getFather();
+				if (is_array($TFather) && !empty($TFather)) {
+					foreach ($TFather as &$fatherData) {
+						$pFather = new Product($this->db);
+						$pFather->id = $fatherData['id'];
+						$qtyCoef = $fatherData['qty'];
 
-                        if ($fatherData['incdec']) {
-                            $pFather->load_stats_contrat($socid);
+						if ($fatherData['incdec']) {
+							$pFather->load_stats_contrat($socid);
 
-                            $this->stats_contrat['customers'] += $pFather->stats_contrat['customers'];
-                            $this->stats_contrat['nb'] += $pFather->stats_contrat['nb'];
-                            $this->stats_contrat['rows'] += $pFather->stats_contrat['rows'];
-                            $this->stats_contrat['qty'] += $pFather->stats_contrat['qty'] * $qtyCoef;
-                        }
-                    }
-                }
-            }
+							$this->stats_contrat['customers'] += $pFather->stats_contrat['customers'];
+							$this->stats_contrat['nb'] += $pFather->stats_contrat['nb'];
+							$this->stats_contrat['rows'] += $pFather->stats_contrat['rows'];
+							$this->stats_contrat['qty'] += $pFather->stats_contrat['qty'] * $qtyCoef;
+						}
+					}
+				}
+			}
 
-            $parameters = array('socid' => $socid);
-            $reshook = $hookmanager->executeHooks('loadStatsContract', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_contrat = $hookmanager->resArray['stats_contrat'];
+			$parameters = array('socid' => $socid);
+			$reshook = $hookmanager->executeHooks('loadStatsContract', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_contrat = $hookmanager->resArray['stats_contrat'];
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error().' sql='.$sql;
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error().' sql='.$sql;
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats facture pour le produit/service
-     *
-     * @param  int $socid Id societe
-     * @return array                   Tableau des stats
-     */
-    public function load_stats_facture($socid = 0)
-    {
-        // phpcs:enable
-        global $db, $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats facture pour le produit/service
+	 *
+	 * @param  int $socid Id societe
+	 * @return array                   Tableau des stats
+	 */
+	public function load_stats_facture($socid = 0)
+	{
+		// phpcs:enable
+		global $db, $conf, $user, $hookmanager;
 
-        $sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
-        $sql .= " COUNT(fd.rowid) as nb_rows, SUM(".$db->ifsql('f.type != 2', 'fd.qty', 'fd.qty * -1').") as qty";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
-        $sql .= ", ".MAIN_DB_PREFIX."facture as f";
-        $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE f.rowid = fd.fk_facture";
-        $sql .= " AND f.fk_soc = s.rowid";
-        $sql .= " AND f.entity IN (".getEntity('invoice').")";
-        $sql .= " AND fd.fk_product = ".$this->id;
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        //$sql.= " AND f.fk_statut != 0";
-        if ($socid > 0) {
-            $sql .= " AND f.fk_soc = ".$socid;
-        }
+		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
+		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(".$this->db->ifsql('f.type != 2', 'fd.qty', 'fd.qty * -1').") as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE f.rowid = fd.fk_facture";
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('invoice').")";
+		$sql .= " AND fd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		//$sql.= " AND f.fk_statut != 0";
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".$socid;
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            $this->stats_facture['customers'] = $obj->nb_customers;
-            $this->stats_facture['nb'] = $obj->nb;
-            $this->stats_facture['rows'] = $obj->nb_rows;
-            $this->stats_facture['qty'] = $obj->qty ? $obj->qty : 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_facture['customers'] = $obj->nb_customers;
+			$this->stats_facture['nb'] = $obj->nb;
+			$this->stats_facture['rows'] = $obj->nb_rows;
+			$this->stats_facture['qty'] = $obj->qty ? $obj->qty : 0;
 
-            // if it's a virtual product, maybe it is in invoice by extension
-            if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
-                $TFather = $this->getFather();
-                if (is_array($TFather) && !empty($TFather)) {
-                    foreach ($TFather as &$fatherData) {
-                        $pFather = new Product($this->db);
-                        $pFather->id = $fatherData['id'];
-                        $qtyCoef = $fatherData['qty'];
+			// if it's a virtual product, maybe it is in invoice by extension
+			if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
+				$TFather = $this->getFather();
+				if (is_array($TFather) && !empty($TFather)) {
+					foreach ($TFather as &$fatherData) {
+						$pFather = new Product($this->db);
+						$pFather->id = $fatherData['id'];
+						$qtyCoef = $fatherData['qty'];
 
-                        if ($fatherData['incdec']) {
-                            $pFather->load_stats_facture($socid);
+						if ($fatherData['incdec']) {
+							$pFather->load_stats_facture($socid);
 
-                            $this->stats_facture['customers'] += $pFather->stats_facture['customers'];
-                            $this->stats_facture['nb'] += $pFather->stats_facture['nb'];
-                            $this->stats_facture['rows'] += $pFather->stats_facture['rows'];
-                            $this->stats_facture['qty'] += $pFather->stats_facture['qty'] * $qtyCoef;
-                        }
-                    }
-                }
-            }
+							$this->stats_facture['customers'] += $pFather->stats_facture['customers'];
+							$this->stats_facture['nb'] += $pFather->stats_facture['nb'];
+							$this->stats_facture['rows'] += $pFather->stats_facture['rows'];
+							$this->stats_facture['qty'] += $pFather->stats_facture['qty'] * $qtyCoef;
+						}
+					}
+				}
+			}
 
-            $parameters = array('socid' => $socid);
-            $reshook = $hookmanager->executeHooks('loadStatsCustomerInvoice', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_facture = $hookmanager->resArray['stats_facture'];
+			$parameters = array('socid' => $socid);
+			$reshook = $hookmanager->executeHooks('loadStatsCustomerInvoice', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_facture = $hookmanager->resArray['stats_facture'];
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Charge tableau des stats facture pour le produit/service
-     *
-     * @param  int $socid Id societe
-     * @return array                   Tableau des stats
-     */
-    public function load_stats_facture_fournisseur($socid = 0)
-    {
-        // phpcs:enable
-        global $conf, $user, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats facture pour le produit/service
+	 *
+	 * @param  int $socid Id societe
+	 * @return array                   Tableau des stats
+	 */
+	public function load_stats_facture_fournisseur($socid = 0)
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
 
-        $sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_suppliers, COUNT(DISTINCT f.rowid) as nb,";
-        $sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
-        $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-        $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE f.rowid = fd.fk_facture_fourn";
-        $sql .= " AND f.fk_soc = s.rowid";
-        $sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-        $sql .= " AND fd.fk_product = ".$this->id;
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        //$sql.= " AND f.fk_statut != 0";
-        if ($socid > 0) {
-            $sql .= " AND f.fk_soc = ".$socid;
-        }
+		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_suppliers, COUNT(DISTINCT f.rowid) as nb,";
+		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
+		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE f.rowid = fd.fk_facture_fourn";
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
+		$sql .= " AND fd.fk_product = ".$this->id;
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		//$sql.= " AND f.fk_statut != 0";
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".$socid;
+		}
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $obj = $this->db->fetch_object($result);
-            $this->stats_facture_fournisseur['suppliers'] = $obj->nb_suppliers;
-            $this->stats_facture_fournisseur['nb'] = $obj->nb;
-            $this->stats_facture_fournisseur['rows'] = $obj->nb_rows;
-            $this->stats_facture_fournisseur['qty'] = $obj->qty ? $obj->qty : 0;
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_facture_fournisseur['suppliers'] = $obj->nb_suppliers;
+			$this->stats_facture_fournisseur['nb'] = $obj->nb;
+			$this->stats_facture_fournisseur['rows'] = $obj->nb_rows;
+			$this->stats_facture_fournisseur['qty'] = $obj->qty ? $obj->qty : 0;
 
-            $parameters = array('socid' => $socid);
-            $reshook = $hookmanager->executeHooks('loadStatsSupplierInvoice', $parameters, $this, $action);
-            if ($reshook > 0) $this->stats_facture_fournisseur = $hookmanager->resArray['stats_facture_fournisseur'];
+			$parameters = array('socid' => $socid);
+			$reshook = $hookmanager->executeHooks('loadStatsSupplierInvoice', $parameters, $this, $action);
+			if ($reshook > 0) $this->stats_facture_fournisseur = $hookmanager->resArray['stats_facture_fournisseur'];
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  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
-     */
-    private function _get_stats($sql, $mode, $year = 0)
-    {
-        // phpcs:enable
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num)
-            {
-                $arr = $this->db->fetch_array($resql);
-                if ($mode == 'byunit') {
-                    $tab[$arr[1]] = $arr[0]; // 1st field
-                }
-                if ($mode == 'bynumber') {
-                    $tab[$arr[1]] = $arr[2]; // 3rd field
-                }
-                $i++;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->error().' sql='.$sql;
-            return -1;
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  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
+	 */
+	private function _get_stats($sql, $mode, $year = 0)
+	{
+		// phpcs:enable
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$arr = $this->db->fetch_array($resql);
+				if ($mode == 'byunit') {
+					$tab[$arr[1]] = $arr[0]; // 1st field
+				}
+				if ($mode == 'bynumber') {
+					$tab[$arr[1]] = $arr[2]; // 3rd field
+				}
+				$i++;
+			}
+		} else {
+			$this->error = $this->db->error().' sql='.$sql;
+			return -1;
+		}
 
-        if (empty($year)) {
-            $year = strftime('%Y', time());
-            $month = strftime('%m', time());
-        }
-        else
-        {
-            $month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.
-        }
-        $result = array();
+		if (empty($year)) {
+			$year = strftime('%Y', time());
+			$month = strftime('%m', time());
+		} 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));
+		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));
 
-            $result[$j] = array($idx, isset($tab[$year.$month]) ? $tab[$year.$month] : 0);
-            //            $result[$j] = array($monthnum,isset($tab[$year.$month])?$tab[$year.$month]:0);
+			$result[$j] = array($idx, isset($tab[$year.$month]) ? $tab[$year.$month] : 0);
+			//            $result[$j] = array($monthnum,isset($tab[$year.$month])?$tab[$year.$month]:0);
 
-            $month = "0".($month - 1);
-            if (dol_strlen($month) == 3) {
-                $month = substr($month, 1);
-            }
-            if ($month == 0) {
-                $month = 12;
-                $year = $year - 1;
-            }
-        }
+			$month = "0".($month - 1);
+			if (dol_strlen($month) == 3) {
+				$month = substr($month, 1);
+			}
+			if ($month == 0) {
+				$month = 12;
+				$year = $year - 1;
+			}
+		}
 
-        return array_reverse($result);
-    }
+		return array_reverse($result);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return nb of units or customers invoices 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  string $morefilter          More sql filters
-     * @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 = '')
-    {
-        // phpcs:enable
-        global $conf;
-        global $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return nb of units or customers invoices 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  string $morefilter          More sql filters
+	 * @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 = '')
+	{
+		// phpcs:enable
+		global $conf;
+		global $user;
 
-        $sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
-        if ($mode == 'bynumber') {
-            $sql .= ", count(DISTINCT f.rowid)";
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."product as p";
-        }
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE f.rowid = d.fk_facture";
-        if ($this->id > 0) {
-            $sql .= " AND d.fk_product =".$this->id;
-        } else {
-            $sql .= " AND d.fk_product > 0";
-        }
-        if ($filteronproducttype >= 0) {
-            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-        }
-        $sql .= " AND f.fk_soc = s.rowid";
-        $sql .= " AND f.entity IN (".getEntity('invoice').")";
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {
-            $sql .= " AND f.fk_soc = $socid";
-        }
-        $sql .= $morefilter;
-        $sql .= " GROUP BY date_format(f.datef,'%Y%m')";
-        $sql .= " ORDER BY date_format(f.datef,'%Y%m') DESC";
+		$sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
+		if ($mode == 'bynumber') {
+			$sql .= ", count(DISTINCT f.rowid)";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
+		if ($filteronproducttype >= 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		}
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE f.rowid = d.fk_facture";
+		if ($this->id > 0) {
+			$sql .= " AND d.fk_product =".$this->id;
+		} else {
+			$sql .= " AND d.fk_product > 0";
+		}
+		if ($filteronproducttype >= 0) {
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		}
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('invoice').")";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = $socid";
+		}
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(f.datef,'%Y%m')";
+		$sql .= " ORDER BY date_format(f.datef,'%Y%m') DESC";
 
-        return $this->_get_stats($sql, $mode, $year);
-    }
+		return $this->_get_stats($sql, $mode, $year);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return nb of units or supplier invoices 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  string $morefilter          More sql filters
-     * @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 = '')
-    {
-        // phpcs:enable
-        global $conf;
-        global $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return nb of units or supplier invoices 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  string $morefilter          More sql filters
+	 * @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 = '')
+	{
+		// phpcs:enable
+		global $conf;
+		global $user;
 
-        $sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
-        if ($mode == 'bynumber') {
-            $sql .= ", count(DISTINCT f.rowid)";
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."product as p";
-        }
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE f.rowid = d.fk_facture_fourn";
-        if ($this->id > 0) {
-            $sql .= " AND d.fk_product =".$this->id;
-        } else {
-            $sql .= " AND d.fk_product > 0";
-        }
-        if ($filteronproducttype >= 0) {
-            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-        }
-        $sql .= " AND f.fk_soc = s.rowid";
-        $sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {
-            $sql .= " AND f.fk_soc = $socid";
-        }
-        $sql .= $morefilter;
-        $sql .= " GROUP BY date_format(f.datef,'%Y%m')";
-        $sql .= " ORDER BY date_format(f.datef,'%Y%m') DESC";
+		$sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
+		if ($mode == 'bynumber') {
+			$sql .= ", count(DISTINCT f.rowid)";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
+		if ($filteronproducttype >= 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		}
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE f.rowid = d.fk_facture_fourn";
+		if ($this->id > 0) {
+			$sql .= " AND d.fk_product =".$this->id;
+		} else {
+			$sql .= " AND d.fk_product > 0";
+		}
+		if ($filteronproducttype >= 0) {
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		}
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = $socid";
+		}
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(f.datef,'%Y%m')";
+		$sql .= " ORDER BY date_format(f.datef,'%Y%m') DESC";
 
-        return $this->_get_stats($sql, $mode, $year);
-    }
+		return $this->_get_stats($sql, $mode, $year);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  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  string $morefilter          More sql filters
-     * @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;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  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  string $morefilter          More sql filters
+	 * @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;
 
-        $sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')";
-        if ($mode == 'bynumber') {
-            $sql .= ", count(DISTINCT p.rowid)";
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."product as prod";
-        }
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE p.rowid = d.fk_propal";
-        if ($this->id > 0) {
-            $sql .= " AND d.fk_product =".$this->id;
-        } else {
-            $sql .= " AND d.fk_product > 0";
-        }
-        if ($filteronproducttype >= 0) {
-            $sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
-        }
-        $sql .= " AND p.fk_soc = s.rowid";
-        $sql .= " AND p.entity IN (".getEntity('propal').")";
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {
-            $sql .= " AND p.fk_soc = ".$socid;
-        }
-        $sql .= $morefilter;
-        $sql .= " GROUP BY date_format(p.datep,'%Y%m')";
-        $sql .= " ORDER BY date_format(p.datep,'%Y%m') DESC";
+		$sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')";
+		if ($mode == 'bynumber') {
+			$sql .= ", count(DISTINCT p.rowid)";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
+		if ($filteronproducttype >= 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."product as prod";
+		}
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE p.rowid = d.fk_propal";
+		if ($this->id > 0) {
+			$sql .= " AND d.fk_product =".$this->id;
+		} else {
+			$sql .= " AND d.fk_product > 0";
+		}
+		if ($filteronproducttype >= 0) {
+			$sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
+		}
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND p.entity IN (".getEntity('propal').")";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND p.fk_soc = ".$socid;
+		}
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(p.datep,'%Y%m')";
+		$sql .= " ORDER BY date_format(p.datep,'%Y%m') DESC";
 
-        return $this->_get_stats($sql, $mode, $year);
-    }
+		return $this->_get_stats($sql, $mode, $year);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  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  string $morefilter          More sql filters
-     * @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 = '')
-    {
-        // phpcs:enable
-        global $conf;
-        global $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  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  string $morefilter          More sql filters
+	 * @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 = '')
+	{
+		// phpcs:enable
+		global $conf;
+		global $user;
 
-        $sql = "SELECT sum(d.qty), date_format(p.date_valid, '%Y%m')";
-        if ($mode == 'bynumber') {
-            $sql .= ", count(DISTINCT p.rowid)";
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."product as prod";
-        }
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE p.rowid = d.fk_supplier_proposal";
-        if ($this->id > 0) {
-            $sql .= " AND d.fk_product =".$this->id;
-        } else {
-            $sql .= " AND d.fk_product > 0";
-        }
-        if ($filteronproducttype >= 0) {
-            $sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
-        }
-        $sql .= " AND p.fk_soc = s.rowid";
-        $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {
-            $sql .= " AND p.fk_soc = ".$socid;
-        }
-        $sql .= $morefilter;
-        $sql .= " GROUP BY date_format(p.date_valid,'%Y%m')";
-        $sql .= " ORDER BY date_format(p.date_valid,'%Y%m') DESC";
+		$sql = "SELECT sum(d.qty), date_format(p.date_valid, '%Y%m')";
+		if ($mode == 'bynumber') {
+			$sql .= ", count(DISTINCT p.rowid)";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."societe as s";
+		if ($filteronproducttype >= 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."product as prod";
+		}
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE p.rowid = d.fk_supplier_proposal";
+		if ($this->id > 0) {
+			$sql .= " AND d.fk_product =".$this->id;
+		} else {
+			$sql .= " AND d.fk_product > 0";
+		}
+		if ($filteronproducttype >= 0) {
+			$sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;
+		}
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND p.fk_soc = ".$socid;
+		}
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(p.date_valid,'%Y%m')";
+		$sql .= " ORDER BY date_format(p.date_valid,'%Y%m') DESC";
 
-        return $this->_get_stats($sql, $mode, $year);
-    }
+		return $this->_get_stats($sql, $mode, $year);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return nb of units in orders 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  string $morefilter          More sql filters
-     * @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 = '')
-    {
-        // phpcs:enable
-        global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return nb of units in orders 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  string $morefilter          More sql filters
+	 * @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 = '')
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-        $sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
-        if ($mode == 'bynumber') {
-            $sql .= ", count(DISTINCT c.rowid)";
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."product as p";
-        }
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE c.rowid = d.fk_commande";
-        if ($this->id > 0) {
-            $sql .= " AND d.fk_product =".$this->id;
-        } else {
-            $sql .= " AND d.fk_product > 0";
-        }
-        if ($filteronproducttype >= 0) {
-            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-        }
-        $sql .= " AND c.fk_soc = s.rowid";
-        $sql .= " AND c.entity IN (".getEntity('commande').")";
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {
-            $sql .= " AND c.fk_soc = ".$socid;
-        }
-        $sql .= $morefilter;
-        $sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";
-        $sql .= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
+		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
+		if ($mode == 'bynumber') {
+			$sql .= ", count(DISTINCT c.rowid)";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
+		if ($filteronproducttype >= 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		}
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE c.rowid = d.fk_commande";
+		if ($this->id > 0) {
+			$sql .= " AND d.fk_product =".$this->id;
+		} else {
+			$sql .= " AND d.fk_product > 0";
+		}
+		if ($filteronproducttype >= 0) {
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		}
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('commande').")";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND c.fk_soc = ".$socid;
+		}
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";
+		$sql .= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
 
-        return $this->_get_stats($sql, $mode, $year);
-    }
+		return $this->_get_stats($sql, $mode, $year);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return nb of units in orders 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  string $morefilter          More sql filters
-     * @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 = '')
-    {
-        // phpcs:enable
-        global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return nb of units in orders 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  string $morefilter          More sql filters
+	 * @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 = '')
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-        $sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
-        if ($mode == 'bynumber') {
-            $sql .= ", count(DISTINCT c.rowid)";
-        }
-        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
-        if ($filteronproducttype >= 0) {
-            $sql .= ", ".MAIN_DB_PREFIX."product as p";
-        }
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        }
-        $sql .= " WHERE c.rowid = d.fk_commande";
-        if ($this->id > 0) {
-            $sql .= " AND d.fk_product =".$this->id;
-        } else {
-            $sql .= " AND d.fk_product > 0";
-        }
-        if ($filteronproducttype >= 0) {
-            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-        }
-        $sql .= " AND c.fk_soc = s.rowid";
-        $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
-        if (!$user->rights->societe->client->voir && !$socid) {
-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid > 0) {
-            $sql .= " AND c.fk_soc = ".$socid;
-        }
-        $sql .= $morefilter;
-        $sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";
-        $sql .= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
+		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
+		if ($mode == 'bynumber') {
+			$sql .= ", count(DISTINCT c.rowid)";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
+		if ($filteronproducttype >= 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		}
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE c.rowid = d.fk_commande";
+		if ($this->id > 0) {
+			$sql .= " AND d.fk_product =".$this->id;
+		} else {
+			$sql .= " AND d.fk_product > 0";
+		}
+		if ($filteronproducttype >= 0) {
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		}
+		$sql .= " AND c.fk_soc = s.rowid";
+		$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND c.fk_soc = ".$socid;
+		}
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";
+		$sql .= " ORDER BY date_format(c.date_commande,'%Y%m') DESC";
 
-        return $this->_get_stats($sql, $mode, $year);
-    }
+		return $this->_get_stats($sql, $mode, $year);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return nb of units in orders 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  string $morefilter          More sql filters
-     * @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 = '')
-    {
-    	// phpcs:enable
-    	global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return nb of units in orders 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  string $morefilter          More sql filters
+	 * @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 = '')
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-    	$sql = "SELECT sum(d.qty), date_format(c.date_contrat, '%Y%m')";
-    	if ($mode == 'bynumber') {
-    		$sql .= ", count(DISTINCT c.rowid)";
-    	}
-    	$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as d, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
-    	if ($filteronproducttype >= 0) {
-    		$sql .= ", ".MAIN_DB_PREFIX."product as p";
-    	}
-    	if (!$user->rights->societe->client->voir && !$socid) {
-    		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    	}
+		$sql = "SELECT sum(d.qty), date_format(c.date_contrat, '%Y%m')";
+		if ($mode == 'bynumber') {
+			$sql .= ", count(DISTINCT c.rowid)";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as d, ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
+		if ($filteronproducttype >= 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		}
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 
 		$sql .= " WHERE c.entity IN (".getEntity('contract').")";
 		$sql .= " AND c.rowid = d.fk_contrat";
 
-    	if ($this->id > 0) {
-    		$sql .= " AND d.fk_product =".$this->id;
-    	} else {
-    		$sql .= " AND d.fk_product > 0";
-    	}
-    	if ($filteronproducttype >= 0) {
-    		$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-    	}
-    	$sql .= " AND c.fk_soc = s.rowid";
+		if ($this->id > 0) {
+			$sql .= " AND d.fk_product =".$this->id;
+		} else {
+			$sql .= " AND d.fk_product > 0";
+		}
+		if ($filteronproducttype >= 0) {
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		}
+		$sql .= " AND c.fk_soc = s.rowid";
 
-    	if (!$user->rights->societe->client->voir && !$socid) {
-    		$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-    	}
-    	if ($socid > 0) {
-    		$sql .= " AND c.fk_soc = ".$socid;
-    	}
-    	$sql .= $morefilter;
-    	$sql .= " GROUP BY date_format(c.date_contrat,'%Y%m')";
-    	$sql .= " ORDER BY date_format(c.date_contrat,'%Y%m') DESC";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND c.fk_soc = ".$socid;
+		}
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(c.date_contrat,'%Y%m')";
+		$sql .= " ORDER BY date_format(c.date_contrat,'%Y%m') DESC";
 
-    	return $this->_get_stats($sql, $mode, $year);
-    }
+		return $this->_get_stats($sql, $mode, $year);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return nb of units in orders 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  string $morefilter          More sql filters
-     * @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 = '')
-    {
-    	// phpcs:enable
-    	global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return nb of units in orders 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  string $morefilter          More sql filters
+	 * @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 = '')
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-    	$sql = "SELECT sum(d.qty), date_format(d.date_valid, '%Y%m')";
-    	if ($mode == 'bynumber') {
-    		$sql .= ", count(DISTINCT d.rowid)";
-    	}
-    	$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as d LEFT JOIN  ".MAIN_DB_PREFIX."societe as s ON d.fk_soc = s.rowid";
-    	if ($filteronproducttype >= 0) {
-    		$sql .= ", ".MAIN_DB_PREFIX."product as p";
-    	}
-    	if (!$user->rights->societe->client->voir && !$socid) {
-    		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    	}
+		$sql = "SELECT sum(d.qty), date_format(d.date_valid, '%Y%m')";
+		if ($mode == 'bynumber') {
+			$sql .= ", count(DISTINCT d.rowid)";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as d LEFT JOIN  ".MAIN_DB_PREFIX."societe as s ON d.fk_soc = s.rowid";
+		if ($filteronproducttype >= 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."product as p";
+		}
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 
-    	$sql .= " WHERE d.entity IN (".getEntity('mo').")";
-    	$sql .= " AND d.status > 0";
+		$sql .= " WHERE d.entity IN (".getEntity('mo').")";
+		$sql .= " AND d.status > 0";
 
-    	if ($this->id > 0) {
-    		$sql .= " AND d.fk_product =".$this->id;
-    	} else {
-    		$sql .= " AND d.fk_product > 0";
-    	}
-    	if ($filteronproducttype >= 0) {
-    		$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
-    	}
+		if ($this->id > 0) {
+			$sql .= " AND d.fk_product =".$this->id;
+		} else {
+			$sql .= " AND d.fk_product > 0";
+		}
+		if ($filteronproducttype >= 0) {
+			$sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;
+		}
 
-    	if (!$user->rights->societe->client->voir && !$socid) {
-    		$sql .= " AND d.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-    	}
-    	if ($socid > 0) {
-    		$sql .= " AND d.fk_soc = ".$socid;
-    	}
-    	$sql .= $morefilter;
-    	$sql .= " GROUP BY date_format(d.date_valid,'%Y%m')";
-    	$sql .= " ORDER BY date_format(d.date_valid,'%Y%m') DESC";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND d.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid > 0) {
+			$sql .= " AND d.fk_soc = ".$socid;
+		}
+		$sql .= $morefilter;
+		$sql .= " GROUP BY date_format(d.date_valid,'%Y%m')";
+		$sql .= " ORDER BY date_format(d.date_valid,'%Y%m') DESC";
 
-    	return $this->_get_stats($sql, $mode, $year);
-    }
+		return $this->_get_stats($sql, $mode, $year);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Link a product/service to a parent product/service
-     *
-     * @param  int $id_pere Id of parent product/service
-     * @param  int $id_fils 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                < 0 if KO, > 0 if OK
-     */
-    public function add_sousproduit($id_pere, $id_fils, $qty, $incdec = 1)
-    {
-        // phpcs:enable
-        // Clean parameters
-        if (!is_numeric($id_pere)) {
-            $id_pere = 0;
-        }
-        if (!is_numeric($id_fils)) {
-            $id_fils = 0;
-        }
-        if (!is_numeric($incdec)) {
-            $incdec = 0;
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Link a product/service to a parent product/service
+	 *
+	 * @param  int $id_pere Id of parent product/service
+	 * @param  int $id_fils 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                < 0 if KO, > 0 if OK
+	 */
+	public function add_sousproduit($id_pere, $id_fils, $qty, $incdec = 1)
+	{
+		// phpcs:enable
+		// Clean parameters
+		if (!is_numeric($id_pere)) {
+			$id_pere = 0;
+		}
+		if (!is_numeric($id_fils)) {
+			$id_fils = 0;
+		}
+		if (!is_numeric($incdec)) {
+			$incdec = 0;
+		}
 
-        $result = $this->del_sousproduit($id_pere, $id_fils);
-        if ($result < 0) {
-            return $result;
-        }
+		$result = $this->del_sousproduit($id_pere, $id_fils);
+		if ($result < 0) {
+			return $result;
+		}
 
-        // Check not already father of id_pere (to avoid father -> child -> father links)
-        $sql = 'SELECT fk_product_pere from '.MAIN_DB_PREFIX.'product_association';
-        $sql .= ' WHERE fk_product_pere  = '.$id_fils.' AND fk_product_fils = '.$id_pere;
-        if (!$this->db->query($sql)) {
-            dol_print_error($this->db);
-            return -1;
-        }
-        else
-        {
-            $result = $this->db->query($sql);
-            if ($result) {
-                $num = $this->db->num_rows($result);
-                if ($num > 0) {
-                    $this->error = "isFatherOfThis";
-                    return -1;
-                }
-                else
-                {
-                    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty,incdec)';
-                    $sql .= ' VALUES ('.$id_pere.', '.$id_fils.', '.$qty.', '.$incdec.')';
-                    if (!$this->db->query($sql)) {
-                         dol_print_error($this->db);
-                         return -1;
-                    }
-                    else
-                    {
-                         return 1;
-                    }
-                }
-            }
-        }
-    }
+		// Check not already father of id_pere (to avoid father -> child -> father links)
+		$sql = 'SELECT fk_product_pere from '.MAIN_DB_PREFIX.'product_association';
+		$sql .= ' WHERE fk_product_pere  = '.$id_fils.' AND fk_product_fils = '.$id_pere;
+		if (!$this->db->query($sql)) {
+			dol_print_error($this->db);
+			return -1;
+		} else {
+			$result = $this->db->query($sql);
+			if ($result) {
+				$num = $this->db->num_rows($result);
+				if ($num > 0) {
+					$this->error = "isFatherOfThis";
+					return -1;
+				} else {
+					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty,incdec)';
+					$sql .= ' VALUES ('.$id_pere.', '.$id_fils.', '.$qty.', '.$incdec.')';
+					if (!$this->db->query($sql)) {
+						 dol_print_error($this->db);
+						 return -1;
+					} else {
+						 return 1;
+					}
+				}
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Modify composed product
-     *
-     * @param  int $id_pere Id of parent product/service
-     * @param  int $id_fils 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                < 0 if KO, > 0 if OK
-     */
-    public function update_sousproduit($id_pere, $id_fils, $qty, $incdec = 1)
-    {
-        // phpcs:enable
-        // Clean parameters
-        if (!is_numeric($id_pere)) {
-            $id_pere = 0;
-        }
-        if (!is_numeric($id_fils)) {
-            $id_fils = 0;
-        }
-        if (!is_numeric($incdec)) {
-            $incdec = 1;
-        }
-        if (!is_numeric($qty)) {
-            $qty = 1;
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Modify composed product
+	 *
+	 * @param  int $id_pere Id of parent product/service
+	 * @param  int $id_fils 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                < 0 if KO, > 0 if OK
+	 */
+	public function update_sousproduit($id_pere, $id_fils, $qty, $incdec = 1)
+	{
+		// phpcs:enable
+		// Clean parameters
+		if (!is_numeric($id_pere)) {
+			$id_pere = 0;
+		}
+		if (!is_numeric($id_fils)) {
+			$id_fils = 0;
+		}
+		if (!is_numeric($incdec)) {
+			$incdec = 1;
+		}
+		if (!is_numeric($qty)) {
+			$qty = 1;
+		}
 
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'product_association SET ';
-        $sql .= 'qty='.$qty;
-        $sql .= ',incdec='.$incdec;
-        $sql .= ' WHERE fk_product_pere='.$id_pere.' AND fk_product_fils='.$id_fils;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'product_association SET ';
+		$sql .= 'qty='.$qty;
+		$sql .= ',incdec='.$incdec;
+		$sql .= ' WHERE fk_product_pere='.$id_pere.' AND fk_product_fils='.$id_fils;
 
-        if (!$this->db->query($sql)) {
-            dol_print_error($this->db);
-            return -1;
-        }
-        else
-        {
-            return 1;
-        }
-    }
+		if (!$this->db->query($sql)) {
+			dol_print_error($this->db);
+			return -1;
+		} else {
+			return 1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Retire le lien entre un sousproduit et un produit/service
-     *
-     * @param  int $fk_parent Id du produit auquel ne sera plus lie le produit lie
-     * @param  int $fk_child  Id du produit a ne plus lie
-     * @return int                    < 0 if KO, > 0 if OK
-     */
-    public function del_sousproduit($fk_parent, $fk_child)
-    {
-        // phpcs:enable
-        if (!is_numeric($fk_parent)) {
-            $fk_parent = 0;
-        }
-        if (!is_numeric($fk_child)) {
-            $fk_child = 0;
-        }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Retire le lien entre un sousproduit et un produit/service
+	 *
+	 * @param  int $fk_parent Id du produit auquel ne sera plus lie le produit lie
+	 * @param  int $fk_child  Id du produit a ne plus lie
+	 * @return int                    < 0 if KO, > 0 if OK
+	 */
+	public function del_sousproduit($fk_parent, $fk_child)
+	{
+		// phpcs:enable
+		if (!is_numeric($fk_parent)) {
+			$fk_parent = 0;
+		}
+		if (!is_numeric($fk_child)) {
+			$fk_child = 0;
+		}
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
-        $sql .= " WHERE fk_product_pere  = ".$fk_parent;
-        $sql .= " AND fk_product_fils = ".$fk_child;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";
+		$sql .= " WHERE fk_product_pere  = ".$fk_parent;
+		$sql .= " AND fk_product_fils = ".$fk_child;
 
-        dol_syslog(get_class($this).'::del_sousproduit', LOG_DEBUG);
-        if (!$this->db->query($sql)) {
-            dol_print_error($this->db);
-            return -1;
-        }
+		dol_syslog(get_class($this).'::del_sousproduit', LOG_DEBUG);
+		if (!$this->db->query($sql)) {
+			dol_print_error($this->db);
+			return -1;
+		}
 
-        return 1;
-    }
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Verifie si c'est un sous-produit
-     *
-     * @param  int $fk_parent Id du produit auquel le produit est lie
-     * @param  int $fk_child  Id du produit lie
-     * @return int                    < 0 si erreur, > 0 si ok
-     */
-    public function is_sousproduit($fk_parent, $fk_child)
-    {
-        // phpcs:enable
-        $sql = "SELECT fk_product_pere, qty, incdec";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_association";
-        $sql .= " WHERE fk_product_pere  = '".$fk_parent."'";
-        $sql .= " AND fk_product_fils = '".$fk_child."'";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Verifie si c'est un sous-produit
+	 *
+	 * @param  int $fk_parent Id du produit auquel le produit est lie
+	 * @param  int $fk_child  Id du produit lie
+	 * @return int                    < 0 si erreur, > 0 si ok
+	 */
+	public function is_sousproduit($fk_parent, $fk_child)
+	{
+		// phpcs:enable
+		$sql = "SELECT fk_product_pere, qty, incdec";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_association";
+		$sql .= " WHERE fk_product_pere  = ".((int) $fk_parent);
+		$sql .= " AND fk_product_fils = ".((int) $fk_child);
 
-        $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);
 
-            if ($num > 0) {
-                $obj = $this->db->fetch_object($result);
-                $this->is_sousproduit_qty = $obj->qty;
-                $this->is_sousproduit_incdec = $obj->incdec;
+			if ($num > 0) {
+				$obj = $this->db->fetch_object($result);
+				$this->is_sousproduit_qty = $obj->qty;
+				$this->is_sousproduit_incdec = $obj->incdec;
 
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Add a supplier price for the product.
-     *  Note: Duplicate ref is accepted for different quantity only, or for different companies.
-     *
-     * @param  User   $user      User that make link
-     * @param  int    $id_fourn  Supplier id
-     * @param  string $ref_fourn Supplier ref
-     * @param  float  $quantity  Quantity minimum for price
-     * @return int               < 0 if KO, 0 if link already exists for this product, > 0 if OK
-     */
-    public function add_fournisseur($user, $id_fourn, $ref_fourn, $quantity)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Add a supplier price for the product.
+	 *  Note: Duplicate ref is accepted for different quantity only, or for different companies.
+	 *
+	 * @param  User   $user      User that make link
+	 * @param  int    $id_fourn  Supplier id
+	 * @param  string $ref_fourn Supplier ref
+	 * @param  float  $quantity  Quantity minimum for price
+	 * @return int               < 0 if KO, 0 if link already exists for this product, > 0 if OK
+	 */
+	public function add_fournisseur($user, $id_fourn, $ref_fourn, $quantity)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        dol_syslog(get_class($this)."::add_fournisseur id_fourn = ".$id_fourn." ref_fourn=".$ref_fourn." quantity=".$quantity, LOG_DEBUG);
+		dol_syslog(get_class($this)."::add_fournisseur id_fourn = ".$id_fourn." ref_fourn=".$ref_fourn." quantity=".$quantity, LOG_DEBUG);
 
-        // Clean parameters
-        $quantity = price2num($quantity, 'MS');
+		// Clean parameters
+		$quantity = price2num($quantity, 'MS');
 
-        if ($ref_fourn) {
-            $sql = "SELECT rowid, fk_product";
-            $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-            $sql .= " WHERE fk_soc = ".$id_fourn;
-            $sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
-            $sql .= " AND fk_product != ".$this->id;
-            $sql .= " AND entity IN (".getEntity('productsupplierprice').")";
+		if ($ref_fourn) {
+			$sql = "SELECT rowid, fk_product";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+			$sql .= " WHERE fk_soc = ".$id_fourn;
+			$sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
+			$sql .= " AND fk_product != ".$this->id;
+			$sql .= " AND entity IN (".getEntity('productsupplierprice').")";
 
-            $resql = $this->db->query($sql);
-            if ($resql) {
-                $obj = $this->db->fetch_object($resql);
-                if ($obj) {
-                    // If the supplier ref already exists but for another product (duplicate ref is accepted for different quantity only or different companies)
-                    $this->product_id_already_linked = $obj->fk_product;
-                    return -3;
-                }
-                $this->db->free($resql);
-            }
-        }
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$obj = $this->db->fetch_object($resql);
+				if ($obj) {
+					// If the supplier ref already exists but for another product (duplicate ref is accepted for different quantity only or different companies)
+					$this->product_id_already_linked = $obj->fk_product;
+					return -3;
+				}
+				$this->db->free($resql);
+			}
+		}
 
-        $sql = "SELECT rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-        $sql .= " WHERE fk_soc = ".$id_fourn;
-        if ($ref_fourn) { $sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
-        } else { $sql .= " AND (ref_fourn = '' OR ref_fourn IS NULL)";
-        }
-        $sql .= " AND quantity = ".$quantity;
-        $sql .= " AND fk_product = ".$this->id;
-        $sql .= " AND entity IN (".getEntity('productsupplierprice').")";
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " WHERE fk_soc = ".$id_fourn;
+		if ($ref_fourn) { $sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";
+		} else { $sql .= " AND (ref_fourn = '' OR ref_fourn IS NULL)";
+		}
+		$sql .= " AND quantity = ".$quantity;
+		$sql .= " AND fk_product = ".$this->id;
+		$sql .= " AND entity IN (".getEntity('productsupplierprice').")";
 
-        $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);
 
-            // The reference supplier does not exist, we create it for this product.
-            if (!$obj) {
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
-                $sql .= "datec";
-                $sql .= ", entity";
-                $sql .= ", fk_product";
-                $sql .= ", fk_soc";
-                $sql .= ", ref_fourn";
-                $sql .= ", quantity";
-                $sql .= ", fk_user";
-                $sql .= ", tva_tx";
-                $sql .= ") VALUES (";
-                $sql .= "'".$this->db->idate($now)."'";
-                $sql .= ", ".$conf->entity;
-                $sql .= ", ".$this->id;
-                $sql .= ", ".$id_fourn;
-                $sql .= ", '".$this->db->escape($ref_fourn)."'";
-                $sql .= ", ".$quantity;
-                $sql .= ", ".$user->id;
-                $sql .= ", 0";
-                $sql .= ")";
+			// The reference supplier does not exist, we create it for this product.
+			if (!$obj) {
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
+				$sql .= "datec";
+				$sql .= ", entity";
+				$sql .= ", fk_product";
+				$sql .= ", fk_soc";
+				$sql .= ", ref_fourn";
+				$sql .= ", quantity";
+				$sql .= ", fk_user";
+				$sql .= ", tva_tx";
+				$sql .= ") VALUES (";
+				$sql .= "'".$this->db->idate($now)."'";
+				$sql .= ", ".$conf->entity;
+				$sql .= ", ".$this->id;
+				$sql .= ", ".$id_fourn;
+				$sql .= ", '".$this->db->escape($ref_fourn)."'";
+				$sql .= ", ".$quantity;
+				$sql .= ", ".$user->id;
+				$sql .= ", 0";
+				$sql .= ")";
 
-                if ($this->db->query($sql)) {
-                    $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
-                    return 1;
-                }
-                else
-                {
-                    $this->error = $this->db->lasterror();
-                    return -1;
-                }
-            }
-            // If the supplier price already exists for this product and quantity
-            else
-            {
-                $this->product_fourn_price_id = $obj->rowid;
-                return 0;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -2;
-        }
-    }
+				if ($this->db->query($sql)) {
+					$this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");
+					return 1;
+				} else {
+					$this->error = $this->db->lasterror();
+					return -1;
+				}
+			} else {
+				 // If the supplier price already exists for this product and quantity
+				$this->product_fourn_price_id = $obj->rowid;
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			return -2;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Renvoie la liste des fournisseurs du produit/service
-     *
-     * @return array        Tableau des id de fournisseur
-     */
-    public function list_suppliers()
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Renvoie la liste des fournisseurs du produit/service
+	 *
+	 * @return array        Tableau des id de fournisseur
+	 */
+	public function list_suppliers()
+	{
+		// phpcs:enable
+		global $conf;
 
-        $list = array();
+		$list = array();
 
-        $sql = "SELECT DISTINCT p.fk_soc";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as p";
-        $sql .= " WHERE p.fk_product = ".$this->id;
-        $sql .= " AND p.entity = ".$conf->entity;
+		$sql = "SELECT DISTINCT p.fk_soc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as p";
+		$sql .= " WHERE p.fk_product = ".$this->id;
+		$sql .= " AND p.entity = ".$conf->entity;
 
-        $result = $this->db->query($sql);
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
-                $list[$i] = $obj->fk_soc;
-                $i++;
-            }
-        }
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				$list[$i] = $obj->fk_soc;
+				$i++;
+			}
+		}
 
-        return $list;
-    }
+		return $list;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Recopie les prix d'un produit/service sur un autre
-     *
-     * @param  int $fromId Id product source
-     * @param  int $toId   Id product target
-     * @return int                     < 0 if KO, > 0 if OK
-     */
-    public function clone_price($fromId, $toId)
-    {
-        global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Recopie les prix d'un produit/service sur un autre
+	 *
+	 * @param  int $fromId Id product source
+	 * @param  int $toId   Id product target
+	 * @return int                     < 0 if KO, > 0 if OK
+	 */
+	public function clone_price($fromId, $toId)
+	{
+		global $conf, $user;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // prices
-        $sql  = "INSERT INTO ".MAIN_DB_PREFIX."product_price (";
-        $sql .= " entity";
-        $sql .= ", fk_product";
-        $sql .= ", date_price";
-        $sql .= ", price_level";
-        $sql .= ", price";
-        $sql .= ", price_ttc";
-        $sql .= ", price_min";
-        $sql .= ", price_min_ttc";
-        $sql .= ", price_base_type";
-        $sql .= ", default_vat_code";
-        $sql .= ", tva_tx";
-        $sql .= ", recuperableonly";
-        $sql .= ", localtax1_tx";
-        $sql .= ", localtax1_type";
-        $sql .= ", localtax2_tx";
-        $sql .= ", localtax2_type";
-        $sql .= ", fk_user_author";
-        $sql .= ", tosell";
-        $sql .= ", price_by_qty";
-        $sql .= ", fk_price_expression";
-        $sql .= ", fk_multicurrency";
-        $sql .= ", multicurrency_code";
-        $sql .= ", multicurrency_tx";
-        $sql .= ", multicurrency_price";
-        $sql .= ", multicurrency_price_ttc";
-        $sql .= ")";
-        $sql .= " SELECT";
-        $sql .= " entity";
-        $sql .= ", ".$toId;
-        $sql .= ", '".$this->db->idate($now)."'";
-        $sql .= ", price_level";
-        $sql .= ", price";
-        $sql .= ", price_ttc";
-        $sql .= ", price_min";
-        $sql .= ", price_min_ttc";
-        $sql .= ", price_base_type";
-        $sql .= ", default_vat_code";
-        $sql .= ", tva_tx";
-        $sql .= ", recuperableonly";
-        $sql .= ", localtax1_tx";
-        $sql .= ", localtax1_type";
-        $sql .= ", localtax2_tx";
-        $sql .= ", localtax2_type";
-        $sql .= ", ".$user->id;
-        $sql .= ", tosell";
-        $sql .= ", price_by_qty";
-        $sql .= ", fk_price_expression";
-        $sql .= ", fk_multicurrency";
-        $sql .= ", multicurrency_code";
-        $sql .= ", multicurrency_tx";
-        $sql .= ", multicurrency_price";
-        $sql .= ", multicurrency_price_ttc";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_price";
-        $sql .= " WHERE fk_product = ".$fromId;
-        $sql .= " ORDER BY date_price DESC";
-        if ($conf->global->PRODUIT_MULTIPRICES_LIMIT > 0) {
-            $sql .= " LIMIT ".$conf->global->PRODUIT_MULTIPRICES_LIMIT;
-        }
+		// prices
+		$sql  = "INSERT INTO ".MAIN_DB_PREFIX."product_price (";
+		$sql .= " entity";
+		$sql .= ", fk_product";
+		$sql .= ", date_price";
+		$sql .= ", price_level";
+		$sql .= ", price";
+		$sql .= ", price_ttc";
+		$sql .= ", price_min";
+		$sql .= ", price_min_ttc";
+		$sql .= ", price_base_type";
+		$sql .= ", default_vat_code";
+		$sql .= ", tva_tx";
+		$sql .= ", recuperableonly";
+		$sql .= ", localtax1_tx";
+		$sql .= ", localtax1_type";
+		$sql .= ", localtax2_tx";
+		$sql .= ", localtax2_type";
+		$sql .= ", fk_user_author";
+		$sql .= ", tosell";
+		$sql .= ", price_by_qty";
+		$sql .= ", fk_price_expression";
+		$sql .= ", fk_multicurrency";
+		$sql .= ", multicurrency_code";
+		$sql .= ", multicurrency_tx";
+		$sql .= ", multicurrency_price";
+		$sql .= ", multicurrency_price_ttc";
+		$sql .= ")";
+		$sql .= " SELECT";
+		$sql .= " entity";
+		$sql .= ", ".$toId;
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", price_level";
+		$sql .= ", price";
+		$sql .= ", price_ttc";
+		$sql .= ", price_min";
+		$sql .= ", price_min_ttc";
+		$sql .= ", price_base_type";
+		$sql .= ", default_vat_code";
+		$sql .= ", tva_tx";
+		$sql .= ", recuperableonly";
+		$sql .= ", localtax1_tx";
+		$sql .= ", localtax1_type";
+		$sql .= ", localtax2_tx";
+		$sql .= ", localtax2_type";
+		$sql .= ", ".$user->id;
+		$sql .= ", tosell";
+		$sql .= ", price_by_qty";
+		$sql .= ", fk_price_expression";
+		$sql .= ", fk_multicurrency";
+		$sql .= ", multicurrency_code";
+		$sql .= ", multicurrency_tx";
+		$sql .= ", multicurrency_price";
+		$sql .= ", multicurrency_price_ttc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
+		$sql .= " WHERE fk_product = ".$fromId;
+		$sql .= " ORDER BY date_price DESC";
+		if ($conf->global->PRODUIT_MULTIPRICES_LIMIT > 0) {
+			$sql .= " LIMIT ".$conf->global->PRODUIT_MULTIPRICES_LIMIT;
+		}
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $this->db->rollback();
-            return -1;
-        }
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->db->rollback();
+			return -1;
+		}
 
-        $this->db->commit();
-        return 1;
-    }
+		$this->db->commit();
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Clone links between products
-     *
-     * @param  int $fromId Product id
-     * @param  int $toId   Product id
-     * @return int                  <0 if KO, >0 if OK
-     */
-    public function clone_associations($fromId, $toId)
-    {
-        // phpcs:enable
-        $this->db->begin();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Clone links between products
+	 *
+	 * @param  int $fromId Product id
+	 * @param  int $toId   Product id
+	 * @return int                  <0 if KO, >0 if OK
+	 */
+	public function clone_associations($fromId, $toId)
+	{
+		// phpcs:enable
+		$this->db->begin();
 
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association (fk_product_pere, fk_product_fils, qty)';
-        $sql .= " SELECT ".$toId.", fk_product_fils, qty FROM ".MAIN_DB_PREFIX."product_association";
-        $sql .= " WHERE fk_product_pere = ".$fromId;
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association (fk_product_pere, fk_product_fils, qty)';
+		$sql .= " SELECT ".$toId.", fk_product_fils, qty FROM ".MAIN_DB_PREFIX."product_association";
+		$sql .= " WHERE fk_product_pere = ".$fromId;
 
-        dol_syslog(get_class($this).'::clone_association', LOG_DEBUG);
-        if (!$this->db->query($sql)) {
-            $this->db->rollback();
-            return -1;
-        }
+		dol_syslog(get_class($this).'::clone_association', LOG_DEBUG);
+		if (!$this->db->query($sql)) {
+			$this->db->rollback();
+			return -1;
+		}
 
-        $this->db->commit();
-        return 1;
-    }
+		$this->db->commit();
+		return 1;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Recopie les fournisseurs et prix fournisseurs d'un produit/service sur un autre
-     *
-     * @param  int $fromId Id produit source
-     * @param  int $toId   Id produit cible
-     * @return int                 < 0 si erreur, > 0 si ok
-     */
-    public function clone_fournisseurs($fromId, $toId)
-    {
-        // phpcs:enable
-        $this->db->begin();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Recopie les fournisseurs et prix fournisseurs d'un produit/service sur un autre
+	 *
+	 * @param  int $fromId Id produit source
+	 * @param  int $toId   Id produit cible
+	 * @return int                 < 0 si erreur, > 0 si ok
+	 */
+	public function clone_fournisseurs($fromId, $toId)
+	{
+		// phpcs:enable
+		$this->db->begin();
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // les fournisseurs
-        /*$sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur ("
+		// les fournisseurs
+		/*$sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur ("
         . " datec, fk_product, fk_soc, ref_fourn, fk_user_author )"
         . " SELECT '".$this->db->idate($now)."', ".$toId.", fk_soc, ref_fourn, fk_user_author"
         . " FROM ".MAIN_DB_PREFIX."product_fournisseur"
@@ -4093,792 +3969,769 @@ class Product extends CommonObject
         return -1;
         }*/
 
-        // les prix de fournisseurs.
-        $sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur_price (";
-        $sql .= " datec, fk_product, fk_soc, price, quantity, fk_user)";
-        $sql .= " SELECT '".$this->db->idate($now)."', ".$toId.", fk_soc, price, quantity, fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-        $sql .= " WHERE fk_product = ".$fromId;
+		// les prix de fournisseurs.
+		$sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur_price (";
+		$sql .= " datec, fk_product, fk_soc, price, quantity, fk_user)";
+		$sql .= " SELECT '".$this->db->idate($now)."', ".$toId.", fk_soc, price, quantity, fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+		$sql .= " WHERE fk_product = ".$fromId;
 
-        dol_syslog(get_class($this).'::clone_fournisseurs', LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $this->db->rollback();
-            return -1;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
+		dol_syslog(get_class($this).'::clone_fournisseurs', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Fonction recursive uniquement utilisee par get_arbo_each_prod, recompose l'arborescence des sousproduits
-     *  Define value of this->res
-     *
-     * @param  array  $prod       Products array
-     * @param  string $compl_path Directory path of parents to add before
-     * @param  int    $multiply   Because each sublevel must be multiplicated by parent nb
-     * @param  int    $level      Init level
-     * @param  int    $id_parent  Id parent
-     * @return void
-     */
-    public function fetch_prod_arbo($prod, $compl_path = "", $multiply = 1, $level = 1, $id_parent = 0)
-    {
-        // phpcs:enable
-        global $conf, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Fonction recursive uniquement utilisee par get_arbo_each_prod, recompose l'arborescence des sousproduits
+	 *  Define value of this->res
+	 *
+	 * @param  array  $prod       Products array
+	 * @param  string $compl_path Directory path of parents to add before
+	 * @param  int    $multiply   Because each sublevel must be multiplicated by parent nb
+	 * @param  int    $level      Init level
+	 * @param  int    $id_parent  Id parent
+	 * @return void
+	 */
+	public function fetch_prod_arbo($prod, $compl_path = "", $multiply = 1, $level = 1, $id_parent = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        $tmpproduct = null;
-        //var_dump($prod);
-        foreach ($prod as $id_product => $desc_pere)    // $id_product is 0 (first call starting with root top) or an id of a sub_product
-        {
-            if (is_array($desc_pere))    // If desc_pere is an array, this means it's a child
-            {
-                $id = (!empty($desc_pere[0]) ? $desc_pere[0] : '');
-                $nb = (!empty($desc_pere[1]) ? $desc_pere[1] : '');
-                $type = (!empty($desc_pere[2]) ? $desc_pere[2] : '');
-                $label = (!empty($desc_pere[3]) ? $desc_pere[3] : '');
-                $incdec = !empty($desc_pere[4]) ? $desc_pere[4] : 0;
+		$tmpproduct = null;
+		//var_dump($prod);
+		foreach ($prod as $id_product => $desc_pere)    // $id_product is 0 (first call starting with root top) or an id of a sub_product
+		{
+			if (is_array($desc_pere))    // If desc_pere is an array, this means it's a child
+			{
+				$id = (!empty($desc_pere[0]) ? $desc_pere[0] : '');
+				$nb = (!empty($desc_pere[1]) ? $desc_pere[1] : '');
+				$type = (!empty($desc_pere[2]) ? $desc_pere[2] : '');
+				$label = (!empty($desc_pere[3]) ? $desc_pere[3] : '');
+				$incdec = !empty($desc_pere[4]) ? $desc_pere[4] : 0;
 
-                if ($multiply < 1) { $multiply = 1;
-                }
+				if ($multiply < 1) { $multiply = 1;
+				}
 
-                //print "XXX We add id=".$id." - label=".$label." - nb=".$nb." - multiply=".$multiply." fullpath=".$compl_path.$label."\n";
-                if (is_null($tmpproduct)) $tmpproduct = new Product($this->db); // So we initialize tmpproduct only once for all loop.
-                $tmpproduct->fetch($id); // Load product to get ->ref
-                $tmpproduct->load_stock('nobatch,novirtual'); // Load stock to get true ->stock_reel
-                //$this->fetch($id);        				   // Load product to get ->ref
-                //$this->load_stock('nobatch,novirtual');    // Load stock to get true ->stock_reel
-                $this->res[] = array(
-	                'id'=>$id, // Id product
-	                'id_parent'=>$id_parent,
-                	'ref'=>$tmpproduct->ref, // Ref product
-	                'nb'=>$nb, // Nb of units that compose parent product
-	                'nb_total'=>$nb * $multiply, // Nb of units for all nb of product
-                	'stock'=>$tmpproduct->stock_reel, // Stock
-                	'stock_alert'=>$tmpproduct->seuil_stock_alerte, // Stock alert
-	                'label'=>$label,
-	                'fullpath'=>$compl_path.$label, // Label
-	                'type'=>$type, // Nb of units that compose parent product
-                	'desiredstock'=>$tmpproduct->desiredstock,
-	                'level'=>$level,
-	                'incdec'=>$incdec,
-                	'entity'=>$tmpproduct->entity
-                );
+				//print "XXX We add id=".$id." - label=".$label." - nb=".$nb." - multiply=".$multiply." fullpath=".$compl_path.$label."\n";
+				if (is_null($tmpproduct)) $tmpproduct = new Product($this->db); // So we initialize tmpproduct only once for all loop.
+				$tmpproduct->fetch($id); // Load product to get ->ref
+				$tmpproduct->load_stock('nobatch,novirtual'); // Load stock to get true ->stock_reel
+				//$this->fetch($id);        				   // Load product to get ->ref
+				//$this->load_stock('nobatch,novirtual');    // Load stock to get true ->stock_reel
+				$this->res[] = array(
+					'id'=>$id, // Id product
+					'id_parent'=>$id_parent,
+					'ref'=>$tmpproduct->ref, // Ref product
+					'nb'=>$nb, // Nb of units that compose parent product
+					'nb_total'=>$nb * $multiply, // Nb of units for all nb of product
+					'stock'=>$tmpproduct->stock_reel, // Stock
+					'stock_alert'=>$tmpproduct->seuil_stock_alerte, // Stock alert
+					'label'=>$label,
+					'fullpath'=>$compl_path.$label, // Label
+					'type'=>$type, // Nb of units that compose parent product
+					'desiredstock'=>$tmpproduct->desiredstock,
+					'level'=>$level,
+					'incdec'=>$incdec,
+					'entity'=>$tmpproduct->entity
+				);
 
-                // Recursive call if there is childs to child
-                if (is_array($desc_pere['childs'])) {
-                       //print 'YYY We go down for '.$desc_pere[3]." -> \n";
-                       $this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1] * $multiply, $level + 1, $id);
-                }
-            }
-        }
-    }
+				// Recursive call if there is childs to child
+				if (is_array($desc_pere['childs'])) {
+					   //print 'YYY We go down for '.$desc_pere[3]." -> \n";
+					   $this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1] * $multiply, $level + 1, $id);
+				}
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Build the tree of subproducts into an array
-     *  this->sousprods is loaded by this->get_sousproduits_arbo()
-     *
-     * @param  int $multiply Because each sublevel must be multiplicated by parent nb
-     * @return array                     $this->res
-     */
-    public function get_arbo_each_prod($multiply = 1)
-    {
-        // phpcs:enable
-        $this->res = array();
-        if (isset($this->sousprods) && is_array($this->sousprods)) {
-            foreach ($this->sousprods as $prod_name => $desc_product)
-            {
-                if (is_array($desc_product)) { $this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id);
-                }
-            }
-        }
-        //var_dump($this->res);
-        return $this->res;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Build the tree of subproducts into an array
+	 *  this->sousprods is loaded by this->get_sousproduits_arbo()
+	 *
+	 * @param  int $multiply Because each sublevel must be multiplicated by parent nb
+	 * @return array                     $this->res
+	 */
+	public function get_arbo_each_prod($multiply = 1)
+	{
+		// phpcs:enable
+		$this->res = array();
+		if (isset($this->sousprods) && is_array($this->sousprods)) {
+			foreach ($this->sousprods as $prod_name => $desc_product)
+			{
+				if (is_array($desc_product)) { $this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id);
+				}
+			}
+		}
+		//var_dump($this->res);
+		return $this->res;
+	}
 
-    /**
-     *  Return all parent products for current product (first level only)
-     *
-     * @return int            Nb of father + child
-     */
-    public function hasFatherOrChild()
-    {
-        $nb = 0;
+	/**
+	 *  Return all parent products for current product (first level only)
+	 *
+	 * @return int            Nb of father + child
+	 */
+	public function hasFatherOrChild()
+	{
+		$nb = 0;
 
-        $sql = "SELECT COUNT(pa.rowid) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa";
-        $sql .= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj) { $nb = $obj->nb;
-            }
-        }
-        else
-        {
-            return -1;
-        }
+		$sql = "SELECT COUNT(pa.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa";
+		$sql .= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) { $nb = $obj->nb;
+			}
+		} else {
+			return -1;
+		}
 
-        return $nb;
-    }
+		return $nb;
+	}
 
-    /**
-     * Return if a product has variants or not
-     *
-     * @return int        Number of variants
-     */
-    public function hasVariants()
-    {
-        $nb = 0;
-        $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".$this->id;
-        $sql .= " AND entity IN (".getEntity('product').")";
+	/**
+	 * Return if a product has variants or not
+	 *
+	 * @return int        Number of variants
+	 */
+	public function hasVariants()
+	{
+		$nb = 0;
+		$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".$this->id;
+		$sql .= " AND entity IN (".getEntity('product').")";
 
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj) { $nb = $obj->nb;
-            }
-        }
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) { $nb = $obj->nb;
+			}
+		}
 
-        return $nb;
-    }
+		return $nb;
+	}
 
 
-    /**
-     * Return if loaded product is a variant
-     *
-     * @return int
-     */
-    public function isVariant()
-    {
-        global $conf;
-        if (!empty($conf->variants->enabled)) {
-            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".$this->id." AND entity IN (".getEntity('product').")";
+	/**
+	 * Return if loaded product is a variant
+	 *
+	 * @return int
+	 */
+	public function isVariant()
+	{
+		global $conf;
+		if (!empty($conf->variants->enabled)) {
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".$this->id." AND entity IN (".getEntity('product').")";
 
-            $query = $this->db->query($sql);
+			$query = $this->db->query($sql);
 
-            if ($query) {
-                if (!$this->db->num_rows($query)) {
-                    return false;
-                }
-                return true;
-            } else {
-                dol_print_error($this->db);
-                return -1;
-            }
-        } else {
-            return false;
-        }
-    }
+			if ($query) {
+				if (!$this->db->num_rows($query)) {
+					return false;
+				}
+				return true;
+			} else {
+				dol_print_error($this->db);
+				return -1;
+			}
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     *  Return all parent products for current product (first level only)
-     *
-     * @return array         Array of product
-     */
-    public function getFather()
-    {
-        $sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec, p.entity";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa,";
-        $sql .= " ".MAIN_DB_PREFIX."product as p";
-        $sql .= " WHERE p.rowid = pa.fk_product_pere";
-        $sql .= " AND pa.fk_product_fils = ".$this->id;
+	/**
+	 *  Return all parent products for current product (first level only)
+	 *
+	 * @return array         Array of product
+	 */
+	public function getFather()
+	{
+		$sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec, p.entity";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa,";
+		$sql .= " ".MAIN_DB_PREFIX."product as p";
+		$sql .= " WHERE p.rowid = pa.fk_product_pere";
+		$sql .= " AND pa.fk_product_fils = ".$this->id;
 
-        $res = $this->db->query($sql);
-        if ($res) {
-            $prods = array();
-            while ($record = $this->db->fetch_array($res))
-            {
-                // $record['id'] = $record['rowid'] = id of father
-                $prods[$record['id']]['id'] = $record['rowid'];
-                $prods[$record['id']]['ref'] = $record['ref'];
-                $prods[$record['id']]['label'] = $record['label'];
-                $prods[$record['id']]['qty'] = $record['qty'];
-                $prods[$record['id']]['incdec'] = $record['incdec'];
-                $prods[$record['id']]['fk_product_type'] = $record['fk_product_type'];
-                $prods[$record['id']]['entity'] = $record['entity'];
-            }
-            return $prods;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+		$res = $this->db->query($sql);
+		if ($res) {
+			$prods = array();
+			while ($record = $this->db->fetch_array($res))
+			{
+				// $record['id'] = $record['rowid'] = id of father
+				$prods[$record['id']]['id'] = $record['rowid'];
+				$prods[$record['id']]['ref'] = $record['ref'];
+				$prods[$record['id']]['label'] = $record['label'];
+				$prods[$record['id']]['qty'] = $record['qty'];
+				$prods[$record['id']]['incdec'] = $record['incdec'];
+				$prods[$record['id']]['fk_product_type'] = $record['fk_product_type'];
+				$prods[$record['id']]['entity'] = $record['entity'];
+			}
+			return $prods;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Return childs of product $id
-     *
-     * @param  int $id             Id of product to search childs of
-     * @param  int $firstlevelonly Return only direct child
-     * @param  int $level          Level of recursing call (start to 1)
-     * @return array                       Return array(prodid=>array(0=prodid, 1=>qty, 2=> ...)
-     */
-    public function getChildsArbo($id, $firstlevelonly = 0, $level = 1)
-    {
-        global $alreadyfound;
+	/**
+	 *  Return childs of product $id
+	 *
+	 * @param  int $id             Id of product to search childs of
+	 * @param  int $firstlevelonly Return only direct child
+	 * @param  int $level          Level of recursing call (start to 1)
+	 * @return array                       Return array(prodid=>array(0=prodid, 1=>qty, 2=> ...)
+	 */
+	public function getChildsArbo($id, $firstlevelonly = 0, $level = 1)
+	{
+		global $alreadyfound;
 
-        $sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type, pa.incdec";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-        $sql .= ", ".MAIN_DB_PREFIX."product_association as pa";
-        $sql .= " WHERE p.rowid = pa.fk_product_fils";
-        $sql .= " AND pa.fk_product_pere = ".$id;
-        $sql .= " AND pa.fk_product_fils != ".$id; // This should not happens, it is to avoid infinite loop if it happens
+		$sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type, pa.incdec";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+		$sql .= ", ".MAIN_DB_PREFIX."product_association as pa";
+		$sql .= " WHERE p.rowid = pa.fk_product_fils";
+		$sql .= " AND pa.fk_product_pere = ".$id;
+		$sql .= " AND pa.fk_product_fils != ".$id; // This should not happens, it is to avoid infinite loop if it happens
 
-        dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level, LOG_DEBUG);
+		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level, LOG_DEBUG);
 
-        if ($level == 1) { $alreadyfound = array($id=>1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly
-        }
-        // Protection against infinite loop
-        if ($level > 30) { return array();
-        }
+		if ($level == 1) { $alreadyfound = array($id=>1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly
+		}
+		// Protection against infinite loop
+		if ($level > 30) { return array();
+		}
 
-        $res = $this->db->query($sql);
-        if ($res) {
-            $prods = array();
-            while ($rec = $this->db->fetch_array($res))
-            {
-                if (!empty($alreadyfound[$rec['rowid']])) {
-                    dol_syslog(get_class($this).'::getChildsArbo the product id='.$rec['rowid'].' was already found at a higher level in tree. We discard to avoid infinite loop', LOG_WARNING);
-                    continue;
-                }
-                $alreadyfound[$rec['rowid']] = 1;
-                $prods[$rec['rowid']] = array(
-                 0=>$rec['rowid'],
-                 1=>$rec['qty'],
-                 2=>$rec['fk_product_type'],
-                 3=>$this->db->escape($rec['label']),
-                 4=>$rec['incdec']
-                );
-                //$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
-                //$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
-                if (empty($firstlevelonly)) {
-                       $listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1);
-                    foreach ($listofchilds as $keyChild => $valueChild)
-                       {
-                        $prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
-                    }
-                }
-            }
+		$res = $this->db->query($sql);
+		if ($res) {
+			$prods = array();
+			while ($rec = $this->db->fetch_array($res))
+			{
+				if (!empty($alreadyfound[$rec['rowid']])) {
+					dol_syslog(get_class($this).'::getChildsArbo the product id='.$rec['rowid'].' was already found at a higher level in tree. We discard to avoid infinite loop', LOG_WARNING);
+					continue;
+				}
+				$alreadyfound[$rec['rowid']] = 1;
+				$prods[$rec['rowid']] = array(
+				 0=>$rec['rowid'],
+				 1=>$rec['qty'],
+				 2=>$rec['fk_product_type'],
+				 3=>$this->db->escape($rec['label']),
+				 4=>$rec['incdec']
+				);
+				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
+				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
+				if (empty($firstlevelonly)) {
+					   $listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1);
+					foreach ($listofchilds as $keyChild => $valueChild)
+					   {
+						$prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
+					}
+				}
+			}
 
-            return $prods;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+			return $prods;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *     Return tree of all subproducts for product. Tree contains id, name and quantity.
-     *     Set this->sousprods
-     *
-     * @return void
-     */
-    public function get_sousproduits_arbo()
-    {
-        // phpcs:enable
-        $parent = array();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *     Return tree of all subproducts for product. Tree contains id, name and quantity.
+	 *     Set this->sousprods
+	 *
+	 * @return void
+	 */
+	public function get_sousproduits_arbo()
+	{
+		// phpcs:enable
+		$parent = array();
 
-        foreach ($this->getChildsArbo($this->id) as $keyChild => $valueChild)    // Warning. getChildsArbo can call getChildsArbo recursively. Starting point is $value[0]=id of product
-        {
-            $parent[$this->label][$keyChild] = $valueChild;
-        }
-        foreach ($parent as $key => $value)        // key=label, value is array of childs
-        {
-            $this->sousprods[$key] = $value;
-        }
-    }
+		foreach ($this->getChildsArbo($this->id) as $keyChild => $valueChild)    // Warning. getChildsArbo can call getChildsArbo recursively. Starting point is $value[0]=id of product
+		{
+			$parent[$this->label][$keyChild] = $valueChild;
+		}
+		foreach ($parent as $key => $value)        // key=label, value is array of childs
+		{
+			$this->sousprods[$key] = $value;
+		}
+	}
 
-    /**
-     *    Return clicable link of object (with eventually picto)
-     *
-     * @param  int    $withpicto             Add picto into link
-     * @param  string $option                Where point the link ('stock', 'composition', 'category', 'supplier', '')
-     * @param  int    $maxlength             Maxlength of ref
-     * @param  int    $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     * @param  int    $notooltip			 No tooltip
-     * @return string                                String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $save_lastsearch_value = -1, $notooltip = 0)
-    {
-        global $conf, $langs, $hookmanager;
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+	/**
+	 *    Return clicable link of object (with eventually picto)
+	 *
+	 * @param  int    $withpicto             Add picto into link
+	 * @param  string $option                Where point the link ('stock', 'composition', 'category', 'supplier', '')
+	 * @param  int    $maxlength             Maxlength of ref
+	 * @param  int    $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @param  int    $notooltip			 No tooltip
+	 * @return string                                String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $save_lastsearch_value = -1, $notooltip = 0)
+	{
+		global $conf, $langs, $hookmanager;
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
-        $result = '';
-        $newref = $this->ref;
-        if ($maxlength) { $newref = dol_trunc($newref, $maxlength, 'middle');
-        }
+		$result = '';
+		$newref = $this->ref;
+		if ($maxlength) { $newref = dol_trunc($newref, $maxlength, 'middle');
+		}
 
-        if ($this->type == Product::TYPE_PRODUCT) { $label = '<u>'.$langs->trans("Product").'</u>';
-        }
-        if ($this->type == Product::TYPE_SERVICE) { $label = '<u>'.$langs->trans("Service").'</u>';
-        }
-        if (!empty($this->ref)) {
-            $label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
-        }
-        if (!empty($this->label)) {
-            $label .= '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
-        }
-        if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-        	if (!empty($conf->productbatch->enabled)) {
-        		$langs->load("productbatch");
-        		$label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
-        	}
-        }
-        if (!empty($conf->barcode->enabled)) {
-        	$label .= '<br><b>'.$langs->trans('BarCode').':</b> '.$this->barcode;
-        }
+		if ($this->type == Product::TYPE_PRODUCT) { $label = img_picto('', 'product').' <u>'.$langs->trans("Product").'</u>';
+		}
+		if ($this->type == Product::TYPE_SERVICE) { $label = img_picto('', 'service').' <u>'.$langs->trans("Service").'</u>';
+		}
+		if (!empty($this->ref)) {
+			$label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
+		}
+		if (!empty($this->label)) {
+			$label .= '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
+		}
+		if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			if (!empty($conf->productbatch->enabled)) {
+				$langs->load("productbatch");
+				$label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
+			}
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$label .= '<br><b>'.$langs->trans('BarCode').':</b> '.$this->barcode;
+		}
 
-        if ($this->type == Product::TYPE_PRODUCT)
-        {
-            if ($this->weight) {
-            	$label .= "<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuringUnitString(0, "weight", $this->weight_units);
-            }
-            $labelsize = "";
-            if ($this->length) {
-            	$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Length").'</b>: '.$this->length.' '.measuringUnitString(0, 'size', $this->length_units);
-            }
-            if ($this->width) {
-            	$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Width").'</b>: '.$this->width.' '.measuringUnitString(0, 'size', $this->width_units);
-            }
-            if ($this->height) {
-            	$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Height").'</b>: '.$this->height.' '.measuringUnitString(0, 'size', $this->height_units);
-            }
-            if ($labelsize) $label .= "<br>".$labelsize;
+		if ($this->type == Product::TYPE_PRODUCT)
+		{
+			if ($this->weight) {
+				$label .= "<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuringUnitString(0, "weight", $this->weight_units);
+			}
+			$labelsize = "";
+			if ($this->length) {
+				$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Length").'</b>: '.$this->length.' '.measuringUnitString(0, 'size', $this->length_units);
+			}
+			if ($this->width) {
+				$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Width").'</b>: '.$this->width.' '.measuringUnitString(0, 'size', $this->width_units);
+			}
+			if ($this->height) {
+				$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Height").'</b>: '.$this->height.' '.measuringUnitString(0, 'size', $this->height_units);
+			}
+			if ($labelsize) $label .= "<br>".$labelsize;
 
-            $labelsurfacevolume = "";
-            if ($this->surface) {
-            	$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Surface").'</b>: '.$this->surface.' '.measuringUnitString(0, 'surface', $this->surface_units);
-            }
-            if ($this->volume) {
-            	$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuringUnitString(0, 'volume', $this->volume_units);
-            }
-            if ($labelsurfacevolume) $label .= "<br>".$labelsurfacevolume;
-        }
+			$labelsurfacevolume = "";
+			if ($this->surface) {
+				$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Surface").'</b>: '.$this->surface.' '.measuringUnitString(0, 'surface', $this->surface_units);
+			}
+			if ($this->volume) {
+				$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuringUnitString(0, 'volume', $this->volume_units);
+			}
+			if ($labelsurfacevolume) $label .= "<br>".$labelsurfacevolume;
+		}
 
-        if (!empty($conf->accounting->enabled) && $this->status) {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-            $label .= '<br><b>'.$langs->trans('ProductAccountancySellCode').':</b> '.length_accountg($this->accountancy_code_sell);
-            $label .= '<br><b>'.$langs->trans('ProductAccountancySellIntraCode').':</b> '.length_accountg($this->accountancy_code_sell_intra);
-            $label .= '<br><b>'.$langs->trans('ProductAccountancySellExportCode').':</b> '.length_accountg($this->accountancy_code_sell_export);
-        }
-        if (!empty($conf->accounting->enabled) && $this->status_buy) {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-            $label .= '<br><b>'.$langs->trans('ProductAccountancyBuyCode').':</b> '.length_accountg($this->accountancy_code_buy);
+		if (!empty($conf->accounting->enabled) && $this->status) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			$label .= '<br><b>'.$langs->trans('ProductAccountancySellCode').':</b> '.length_accountg($this->accountancy_code_sell);
+			$label .= '<br><b>'.$langs->trans('ProductAccountancySellIntraCode').':</b> '.length_accountg($this->accountancy_code_sell_intra);
+			$label .= '<br><b>'.$langs->trans('ProductAccountancySellExportCode').':</b> '.length_accountg($this->accountancy_code_sell_export);
+		}
+		if (!empty($conf->accounting->enabled) && $this->status_buy) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyCode').':</b> '.length_accountg($this->accountancy_code_buy);
 			$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 (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;
-            }
-        }
+		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)) {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-                $label = $langs->trans("ShowProduct");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("ShowProduct");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
 
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
-            $linkclose .= ' class="nowraponall classfortooltip"';
-        }
-        else
-        {
-        	$linkclose = ' class="nowraponall"';
-        }
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
+			$linkclose .= ' class="nowraponall classfortooltip"';
+		} else {
+			$linkclose = ' class="nowraponall"';
+		}
 
-        if ($option == 'supplier' || $option == 'category') {
-            $url = DOL_URL_ROOT.'/product/fournisseurs.php?id='.$this->id;
-        } elseif ($option == 'stock') {
-            $url = DOL_URL_ROOT.'/product/stock/product.php?id='.$this->id;
-        } elseif ($option == 'composition') {
-            $url = DOL_URL_ROOT.'/product/composition/card.php?id='.$this->id;
-        } else {
-            $url = DOL_URL_ROOT.'/product/card.php?id='.$this->id;
-        }
+		if ($option == 'supplier' || $option == 'category') {
+			$url = DOL_URL_ROOT.'/product/fournisseurs.php?id='.$this->id;
+		} elseif ($option == 'stock') {
+			$url = DOL_URL_ROOT.'/product/stock/product.php?id='.$this->id;
+		} elseif ($option == 'composition') {
+			$url = DOL_URL_ROOT.'/product/composition/card.php?id='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/product/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.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
-        $result .= $linkstart;
-        if ($withpicto)
-        {
-            if ($this->type == Product::TYPE_PRODUCT) {
-            	$result .= (img_object(($notooltip ? '' : $label), 'product', ($notooltip ? 'class="paddingright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1));
-            }
-            if ($this->type == Product::TYPE_SERVICE) {
-            	$result .= (img_object(($notooltip ? '' : $label), 'service', ($notooltip ? 'class="paddinright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1));
-            }
-        }
-        $result .= $newref;
-        $result .= $linkend;
+		$result .= $linkstart;
+		if ($withpicto)
+		{
+			if ($this->type == Product::TYPE_PRODUCT) {
+				$result .= (img_object(($notooltip ? '' : $label), 'product', ($notooltip ? 'class="paddingright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1));
+			}
+			if ($this->type == Product::TYPE_SERVICE) {
+				$result .= (img_object(($notooltip ? '' : $label), 'service', ($notooltip ? 'class="paddinright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1));
+			}
+		}
+		$result .= $newref;
+		$result .= $linkend;
 
-        global $action;
-        $hookmanager->initHooks(array('productdao'));
-        $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->initHooks(array('productdao'));
+		$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;
+	}
 
 
-    /**
-     *  Create a document onto disk according to template module.
-     *
-     * @param  string    $modele      Force model to use ('' to not force)
-     * @param  Translate $outputlangs Object langs to use for output
-     * @param  int       $hidedetails Hide details of lines
-     * @param  int       $hidedesc    Hide description
-     * @param  int       $hideref     Hide ref
-     * @return int                         0 if KO, 1 if OK
-     */
-    public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 * @param  string    $modele      Force model to use ('' to not force)
+	 * @param  Translate $outputlangs Object langs to use for output
+	 * @param  int       $hidedetails Hide details of lines
+	 * @param  int       $hidedesc    Hide description
+	 * @param  int       $hideref     Hide ref
+	 * @return int                         0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf, $user, $langs;
 
-        $langs->load("products");
+		$langs->load("products");
 		$outputlangs->load("products");
 
-        // Positionne le modele sur le nom du modele a utiliser
-        if (!dol_strlen($modele)) {
-            if (!empty($conf->global->PRODUCT_ADDON_PDF)) {
-                $modele = $conf->global->PRODUCT_ADDON_PDF;
-            }
-            else
-            {
-                $modele = 'strato';
-            }
-        }
+		// Positionne le modele sur le nom du modele a utiliser
+		if (!dol_strlen($modele)) {
+			if (!empty($conf->global->PRODUCT_ADDON_PDF)) {
+				$modele = $conf->global->PRODUCT_ADDON_PDF;
+			} else {
+				$modele = 'strato';
+			}
+		}
 
-        $modelpath = "core/modules/product/doc/";
+		$modelpath = "core/modules/product/doc/";
 
-        return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-    }
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	}
 
-    /**
-     *    Return label of status of object
-     *
-     * @param  int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
-     * @param  int $type 0=Sell, 1=Buy, 2=Batch Number management
-     * @return string          Label of status
-     */
-    public function getLibStatut($mode = 0, $type = 0)
-    {
-        switch ($type)
-        {
+	/**
+	 *    Return label of status of object
+	 *
+	 * @param  int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 * @param  int $type 0=Sell, 1=Buy, 2=Batch Number management
+	 * @return string          Label of status
+	 */
+	public function getLibStatut($mode = 0, $type = 0)
+	{
+		switch ($type)
+		{
 			case 0:
-            return $this->LibStatut($this->status, $mode, $type);
+			return $this->LibStatut($this->status, $mode, $type);
 			case 1:
-            return $this->LibStatut($this->status_buy, $mode, $type);
+			return $this->LibStatut($this->status_buy, $mode, $type);
 			case 2:
-            return $this->LibStatut($this->status_batch, $mode, $type);
+			return $this->LibStatut($this->status_batch, $mode, $type);
 			default:
 				//Simulate previous behavior but should return an error string
-            return $this->LibStatut($this->status_buy, $mode, $type);
-        }
-    }
+			return $this->LibStatut($this->status_buy, $mode, $type);
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return label of a given status
-     *
-     * @param  int 		$status 	Statut
-     * @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-     * @param  int 		$type   	0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
-     * @return string              	Label of status
-     */
-    public function LibStatut($status, $mode = 0, $type = 0)
-    {
-        // phpcs:enable
-        global $conf, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return label of a given status
+	 *
+	 * @param  int 		$status 	Statut
+	 * @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 * @param  int 		$type   	0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
+	 * @return string              	Label of status
+	 */
+	public function LibStatut($status, $mode = 0, $type = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs;
 
-        $labelStatus = $labelStatusShort = '';
+		$labelStatus = $labelStatusShort = '';
 
-        $langs->load('products');
-        if (!empty($conf->productbatch->enabled)) { $langs->load("productbatch");
-        }
+		$langs->load('products');
+		if (!empty($conf->productbatch->enabled)) { $langs->load("productbatch");
+		}
 
-        if ($type == 2) {
-            switch ($mode)
-            {
-                case 0:
-                    $label = ($status == 0 ? $langs->trans('ProductStatusNotOnBatch') : $langs->trans('ProductStatusOnBatch'));
-                    return dolGetStatus($label);
-                case 1:
-                    $label = ($status == 0 ? $langs->trans('ProductStatusNotOnBatchShort') : $langs->trans('ProductStatusOnBatchShort'));
-                    return dolGetStatus($label);
-                case 2:
-                    return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2);
-                case 3:
-                    return dolGetStatus($langs->trans('ProductStatusNotOnBatch'), '', '', empty($status) ? 'status5' : 'status4', 3, 'dot');
-                case 4:
-                    return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2);
-                case 5:
-                    return $this->LibStatut($status, 1, 2).' '.$this->LibStatut($status, 3, 2);
-                default:
-                    return dolGetStatus($langs->trans('Unknown'));
-            }
-        }
+		if ($type == 2) {
+			switch ($mode)
+			{
+				case 0:
+					$label = ($status == 0 ? $langs->trans('ProductStatusNotOnBatch') : $langs->trans('ProductStatusOnBatch'));
+					return dolGetStatus($label);
+				case 1:
+					$label = ($status == 0 ? $langs->trans('ProductStatusNotOnBatchShort') : $langs->trans('ProductStatusOnBatchShort'));
+					return dolGetStatus($label);
+				case 2:
+					return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2);
+				case 3:
+					return dolGetStatus($langs->trans('ProductStatusNotOnBatch'), '', '', empty($status) ? 'status5' : 'status4', 3, 'dot');
+				case 4:
+					return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2);
+				case 5:
+					return $this->LibStatut($status, 1, 2).' '.$this->LibStatut($status, 3, 2);
+				default:
+					return dolGetStatus($langs->trans('Unknown'));
+			}
+		}
 
-        $statuttrans = empty($status) ? 'status5' : 'status4';
+		$statuttrans = empty($status) ? 'status5' : 'status4';
 
-        if ($status == 0) {
-            // $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
-            if ($type == 0) {
-                $labelStatus = $langs->trans('ProductStatusNotOnSellShort');
-                $labelStatusShort = $langs->trans('ProductStatusNotOnSell');
-            }
-            elseif ($type == 1) {
-                $labelStatus = $langs->trans('ProductStatusNotOnBuyShort');
-                $labelStatusShort = $langs->trans('ProductStatusNotOnBuy');
-            }
-            elseif ($type == 2) {
-                $labelStatus = $langs->trans('ProductStatusNotOnBatch');
-                $labelStatusShort = $langs->trans('ProductStatusNotOnBatchShort');
-            }
-        }
-        elseif ($status == 1) {
-            // $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
-            if ($type == 0) {
-                $labelStatus = $langs->trans('ProductStatusOnSellShort');
-                $labelStatusShort = $langs->trans('ProductStatusOnSell');
-            }
-            elseif ($type == 1) {
-                $labelStatus = $langs->trans('ProductStatusOnBuyShort');
-                $labelStatusShort = $langs->trans('ProductStatusOnBuy');
-            }
-            elseif ($type == 2) {
-                $labelStatus = $langs->trans('ProductStatusOnBatch');
-                $labelStatusShort = $langs->trans('ProductStatusOnBatchShort');
-            }
-        }
+		if ($status == 0) {
+			// $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
+			if ($type == 0) {
+				$labelStatus = $langs->trans('ProductStatusNotOnSellShort');
+				$labelStatusShort = $langs->trans('ProductStatusNotOnSell');
+			} elseif ($type == 1) {
+				$labelStatus = $langs->trans('ProductStatusNotOnBuyShort');
+				$labelStatusShort = $langs->trans('ProductStatusNotOnBuy');
+			} elseif ($type == 2) {
+				$labelStatus = $langs->trans('ProductStatusNotOnBatch');
+				$labelStatusShort = $langs->trans('ProductStatusNotOnBatchShort');
+			}
+		} elseif ($status == 1) {
+			// $type   0=Status "to sell", 1=Status "to buy", 2=Status "to Batch"
+			if ($type == 0) {
+				$labelStatus = $langs->trans('ProductStatusOnSellShort');
+				$labelStatusShort = $langs->trans('ProductStatusOnSell');
+			} elseif ($type == 1) {
+				$labelStatus = $langs->trans('ProductStatusOnBuyShort');
+				$labelStatusShort = $langs->trans('ProductStatusOnBuy');
+			} elseif ($type == 2) {
+				$labelStatus = $langs->trans('ProductStatusOnBatch');
+				$labelStatusShort = $langs->trans('ProductStatusOnBatchShort');
+			}
+		}
 
 
-        if ($mode > 6) {
-            return dolGetStatus($langs->trans('Unknown'), '', '', 'status0', 0);
-        } else {
-            return dolGetStatus($labelStatus, $labelStatusShort, '', $statuttrans, $mode);
-        }
-    }
+		if ($mode > 6) {
+			return dolGetStatus($langs->trans('Unknown'), '', '', 'status0', 0);
+		} else {
+			return dolGetStatus($labelStatus, $labelStatusShort, '', $statuttrans, $mode);
+		}
+	}
 
 
-    /**
-     *  Retour label of nature of product
-     *
-     * @return string        Label
-     */
-    public function getLibFinished()
-    {
-        global $langs;
-        $langs->load('products');
+	/**
+	 *  Retour label of nature of product
+	 *
+	 * @return string        Label
+	 */
+	public function getLibFinished()
+	{
+		global $langs;
+		$langs->load('products');
 
-        if ($this->finished == '0') { return $langs->trans("RowMaterial");
-        }
-        if ($this->finished == '1') { return $langs->trans("Finished");
-        }
-        return '';
-    }
+		if ($this->finished == '0') { return $langs->trans("RowMaterial");
+		}
+		if ($this->finished == '1') { return $langs->trans("Finished");
+		}
+		return '';
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Adjust stock in a warehouse for product
-     *
-     * @param  User   $user           user asking change
-     * @param  int    $id_entrepot    id of warehouse
-     * @param  double $nbpiece        nb of units
-     * @param  int    $movement       0 = add, 1 = remove
-     * @param  string $label          Label of stock movement
-     * @param  double $price          Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
-     * @param  string $inventorycode  Inventory code
-     * @param  string $origin_element Origin element type
-     * @param  int    $origin_id      Origin id of element
-     * @return int                     <0 if KO, >0 if OK
-     */
-    public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null)
-    {
-        // phpcs:enable
-        if ($id_entrepot) {
-            $this->db->begin();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Adjust stock in a warehouse for product
+	 *
+	 * @param  User   $user           user asking change
+	 * @param  int    $id_entrepot    id of warehouse
+	 * @param  double $nbpiece        nb of units
+	 * @param  int    $movement       0 = add, 1 = remove
+	 * @param  string $label          Label of stock movement
+	 * @param  double $price          Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed.
+	 * @param  string $inventorycode  Inventory code
+	 * @param  string $origin_element Origin element type
+	 * @param  int    $origin_id      Origin id of element
+	 * @return int                     <0 if KO, >0 if OK
+	 */
+	public function correct_stock($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $inventorycode = '', $origin_element = '', $origin_id = null)
+	{
+		// phpcs:enable
+		if ($id_entrepot) {
+			$this->db->begin();
 
-            include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
-            $op[0] = "+".trim($nbpiece);
-            $op[1] = "-".trim($nbpiece);
+			$op[0] = "+".trim($nbpiece);
+			$op[1] = "-".trim($nbpiece);
 
-            $movementstock = new MouvementStock($this->db);
-            $movementstock->setOrigin($origin_element, $origin_id); // Set ->origin and ->origin->id
-            $result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode);
+			$movementstock = new MouvementStock($this->db);
+			$movementstock->setOrigin($origin_element, $origin_id); // Set ->origin and ->origin->id
+			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode);
 
-            if ($result >= 0) {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->error = $movementstock->error;
-                $this->errors = $movementstock->errors;
+			if ($result >= 0) {
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->error = $movementstock->error;
+				$this->errors = $movementstock->errors;
 
-                $this->db->rollback();
-                return -1;
-            }
-        }
-    }
+				$this->db->rollback();
+				return -1;
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Adjust stock in a warehouse for product with batch number
-     *
-     * @param  User     $user           user asking change
-     * @param  int      $id_entrepot    id of warehouse
-     * @param  double   $nbpiece        nb of units
-     * @param  int      $movement       0 = add, 1 = remove
-     * @param  string   $label          Label of stock movement
-     * @param  double   $price          Price to use for stock eval
-     * @param  integer  $dlc            eat-by date
-     * @param  integer  $dluo           sell-by date
-     * @param  string   $lot            Lot number
-     * @param  string   $inventorycode  Inventory code
-     * @param  string   $origin_element Origin element type
-     * @param  int      $origin_id      Origin id of element
-     * @return int                      <0 if KO, >0 if OK
-     */
-    public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null)
-    {
-        // phpcs:enable
-        if ($id_entrepot) {
-            $this->db->begin();
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Adjust stock in a warehouse for product with batch number
+	 *
+	 * @param  User     $user           user asking change
+	 * @param  int      $id_entrepot    id of warehouse
+	 * @param  double   $nbpiece        nb of units
+	 * @param  int      $movement       0 = add, 1 = remove
+	 * @param  string   $label          Label of stock movement
+	 * @param  double   $price          Price to use for stock eval
+	 * @param  integer  $dlc            eat-by date
+	 * @param  integer  $dluo           sell-by date
+	 * @param  string   $lot            Lot number
+	 * @param  string   $inventorycode  Inventory code
+	 * @param  string   $origin_element Origin element type
+	 * @param  int      $origin_id      Origin id of element
+	 * @return int                      <0 if KO, >0 if OK
+	 */
+	public function correct_stock_batch($user, $id_entrepot, $nbpiece, $movement, $label = '', $price = 0, $dlc = '', $dluo = '', $lot = '', $inventorycode = '', $origin_element = '', $origin_id = null)
+	{
+		// phpcs:enable
+		if ($id_entrepot) {
+			$this->db->begin();
 
-            include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
-            $op[0] = "+".trim($nbpiece);
-            $op[1] = "-".trim($nbpiece);
+			$op[0] = "+".trim($nbpiece);
+			$op[1] = "-".trim($nbpiece);
 
-            $movementstock = new MouvementStock($this->db);
-            $movementstock->setOrigin($origin_element, $origin_id);
-            $result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', $dlc, $dluo, $lot);
+			$movementstock = new MouvementStock($this->db);
+			$movementstock->setOrigin($origin_element, $origin_id);
+			$result = $movementstock->_create($user, $this->id, $id_entrepot, $op[$movement], $movement, $price, $label, $inventorycode, '', $dlc, $dluo, $lot);
 
-            if ($result >= 0) {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->error = $movementstock->error;
-                $this->errors = $movementstock->errors;
+			if ($result >= 0) {
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->error = $movementstock->error;
+				$this->errors = $movementstock->errors;
 
-                $this->db->rollback();
-                return -1;
-            }
-        }
-    }
+				$this->db->rollback();
+				return -1;
+			}
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Load information about stock of a product into ->stock_reel, ->stock_warehouse[] (including stock_warehouse[idwarehouse]->detail_batch for batch products)
-     * This function need a lot of load. If you use it on list, use a cache to execute it once for each product id.
-     * If ENTREPOT_EXTRA_STATUS set, filtering on warehouse status possible.
-     *
-     * @param  	string 	$option 					'' = Load all stock info, also from closed and internal warehouses, 'nobatch', 'novirtual'
-     * @param	int		$includedraftpoforvirtual	Include draft status of PO for virtual stock calculation
-     * @return 	int                  				< 0 if KO, > 0 if OK
-     * @see    	load_virtual_stock(), loadBatchInfo()
-     */
-    public function load_stock($option = '', $includedraftpoforvirtual = null)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Load information about stock of a product into ->stock_reel, ->stock_warehouse[] (including stock_warehouse[idwarehouse]->detail_batch for batch products)
+	 * This function need a lot of load. If you use it on list, use a cache to execute it once for each product id.
+	 * If ENTREPOT_EXTRA_STATUS set, filtering on warehouse status possible.
+	 *
+	 * @param  	string 	$option 					'' = Load all stock info, also from closed and internal warehouses, 'nobatch', 'novirtual'
+	 * @param	int		$includedraftpoforvirtual	Include draft status of PO for virtual stock calculation
+	 * @return 	int                  				< 0 if KO, > 0 if OK
+	 * @see    	load_virtual_stock(), loadBatchInfo()
+	 */
+	public function load_stock($option = '', $includedraftpoforvirtual = null)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $this->stock_reel = 0;
-        $this->stock_warehouse = array();
-        $this->stock_theorique = 0;
+		$this->stock_reel = 0;
+		$this->stock_warehouse = array();
+		$this->stock_theorique = 0;
 
-        $warehouseStatus = array();
+		$warehouseStatus = array();
 
-        if (preg_match('/warehouseclosed/', $option)) {
-            $warehouseStatus[] = Entrepot::STATUS_CLOSED;
-        }
-        if (preg_match('/warehouseopen/', $option)) {
-            $warehouseStatus[] = Entrepot::STATUS_OPEN_ALL;
-        }
-        if (preg_match('/warehouseinternal/', $option)) {
-            $warehouseStatus[] = Entrepot::STATUS_OPEN_INTERNAL;
-        }
+		if (preg_match('/warehouseclosed/', $option)) {
+			$warehouseStatus[] = Entrepot::STATUS_CLOSED;
+		}
+		if (preg_match('/warehouseopen/', $option)) {
+			$warehouseStatus[] = Entrepot::STATUS_OPEN_ALL;
+		}
+		if (preg_match('/warehouseinternal/', $option)) {
+			$warehouseStatus[] = Entrepot::STATUS_OPEN_INTERNAL;
+		}
 
-        $sql = "SELECT ps.rowid, ps.reel, ps.fk_entrepot";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
-        $sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
-        $sql .= " WHERE w.entity IN (".getEntity('stock').")";
-        $sql .= " AND w.rowid = ps.fk_entrepot";
-        $sql .= " AND ps.fk_product = ".$this->id;
-        if ($conf->global->ENTREPOT_EXTRA_STATUS && count($warehouseStatus)) {
-			$sql .= " AND w.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")";
-        }
+		$sql = "SELECT ps.rowid, ps.reel, ps.fk_entrepot";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+		$sql .= ", ".MAIN_DB_PREFIX."entrepot as w";
+		$sql .= " WHERE w.entity IN (".getEntity('stock').")";
+		$sql .= " AND w.rowid = ps.fk_entrepot";
+		$sql .= " AND ps.fk_product = ".$this->id;
+		if ($conf->global->ENTREPOT_EXTRA_STATUS && count($warehouseStatus)) {
+			$sql .= " AND w.statut IN (".$this->db->sanitize($this->db->escape(implode(',', $warehouseStatus))).")";
+		}
 
-        dol_syslog(get_class($this)."::load_stock", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            if ($num > 0) {
-                while ($i < $num)
-                {
-                    $row = $this->db->fetch_object($result);
-                    $this->stock_warehouse[$row->fk_entrepot] = new stdClass();
-                    $this->stock_warehouse[$row->fk_entrepot]->real = $row->reel;
-                    $this->stock_warehouse[$row->fk_entrepot]->id = $row->rowid;
-                    if ((!preg_match('/nobatch/', $option)) && $this->hasbatch()) {
+		dol_syslog(get_class($this)."::load_stock", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			if ($num > 0) {
+				while ($i < $num)
+				{
+					$row = $this->db->fetch_object($result);
+					$this->stock_warehouse[$row->fk_entrepot] = new stdClass();
+					$this->stock_warehouse[$row->fk_entrepot]->real = $row->reel;
+					$this->stock_warehouse[$row->fk_entrepot]->id = $row->rowid;
+					if ((!preg_match('/nobatch/', $option)) && $this->hasbatch()) {
 						$this->stock_warehouse[$row->fk_entrepot]->detail_batch = Productbatch::findAll($this->db, $row->rowid, 1, $this->id);
-                    }
-                    $this->stock_reel += $row->reel;
-                    $i++;
-                }
-            }
-            $this->db->free($result);
+					}
+					$this->stock_reel += $row->reel;
+					$i++;
+				}
+			}
+			$this->db->free($result);
 
-            if (!preg_match('/novirtual/', $option)) {
-                $this->load_virtual_stock($includedraftpoforvirtual); // This also load stats_commande_fournisseur, ...
-            }
+			if (!preg_match('/novirtual/', $option)) {
+				$this->load_virtual_stock($includedraftpoforvirtual); // This also load stats_commande_fournisseur, ...
+			}
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -4911,37 +4764,37 @@ class Product extends CommonObject
 		}
 		if (!empty($conf->expedition->enabled))
 		{
-            require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-            $filterShipmentStatus = '';
-            if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
-                $filterShipmentStatus = Expedition::STATUS_VALIDATED.','.Expedition::STATUS_CLOSED;
-            } elseif (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
-                $filterShipmentStatus = Expedition::STATUS_CLOSED;
-            }
+			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+			$filterShipmentStatus = '';
+			if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+				$filterShipmentStatus = Expedition::STATUS_VALIDATED.','.Expedition::STATUS_CLOSED;
+			} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+				$filterShipmentStatus = Expedition::STATUS_CLOSED;
+			}
 			$result = $this->load_stats_sending(0, '1,2', 1, $filterShipmentStatus);
 			if ($result < 0) dol_print_error($this->db, $this->error);
 			$stock_sending_client = $this->stats_expedition['qty'];
 		}
-		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || ! empty($conf->supplier_order->enabled))
+		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled))
 		{
-		    $filterStatus = '1,2,3,4';
-            if (isset($includedraftpoforvirtual)) $filterStatus = '0,'.$filterStatus;
+			$filterStatus = '1,2,3,4';
+			if (isset($includedraftpoforvirtual)) $filterStatus = '0,'.$filterStatus;
 			$result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1);
 			if ($result < 0) dol_print_error($this->db, $this->error);
 			$stock_commande_fournisseur = $this->stats_commande_fournisseur['qty'];
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && empty($conf->reception->enabled))
 		{
-            $filterStatus = '4';
-            if (isset($includedraftpoforvirtual)) $filterStatus = '0,'.$filterStatus;
+			$filterStatus = '4';
+			if (isset($includedraftpoforvirtual)) $filterStatus = '0,'.$filterStatus;
 			$result = $this->load_stats_reception(0, $filterStatus, 1);
 			if ($result < 0) dol_print_error($this->db, $this->error);
 			$stock_reception_fournisseur = $this->stats_reception['qty'];
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && empty($conf->reception->enabled))
 		{
-            $filterStatus = '4';
-            if (isset($includedraftpoforvirtual)) $filterStatus = '0,'.$filterStatus;
+			$filterStatus = '4';
+			if (isset($includedraftpoforvirtual)) $filterStatus = '0,'.$filterStatus;
 			$result = $this->load_stats_reception(0, $filterStatus, 1); // Use same tables than when module reception is not used.
 			if ($result < 0) dol_print_error($this->db, $this->error);
 			$stock_reception_fournisseur = $this->stats_reception['qty'];
@@ -4958,24 +4811,19 @@ class Product extends CommonObject
 		// Stock decrease mode
 		if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
 			$this->stock_theorique -= ($stock_commande_client - $stock_sending_client);
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)) {
 			$this->stock_theorique += 0;
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 			$this->stock_theorique -= $stock_commande_client;
 		}
 		// Stock Increase mode
-        if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
-            $this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
-        }
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+		if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
 			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
+			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
 			$this->stock_theorique -= $stock_reception_fournisseur;
-		}
-		elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
+		} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
 			$this->stock_theorique += ($stock_commande_fournisseur - $stock_reception_fournisseur);
 		}
 
@@ -4993,649 +4841,640 @@ class Product extends CommonObject
 	}
 
 
-    /**
-     *  Load existing information about a serial
-     *
-     * @param  string $batch Lot/serial number
-     * @return array                    Array with record into product_batch
-     * @see    load_stock(), load_virtual_stock()
-     */
-    public function loadBatchInfo($batch)
-    {
-        $result = array();
-
-        $sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) AS qty FROM ".MAIN_DB_PREFIX."product_batch as pb, ".MAIN_DB_PREFIX."product_stock as ps";
-        $sql .= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".$this->id." AND pb.batch = '".$this->db->escape($batch)."'";
-        $sql .= " GROUP BY pb.batch, pb.eatby, pb.sellby";
-        dol_syslog(get_class($this)."::loadBatchInfo load first entry found for lot/serial = ".$batch, 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);
-                $result[] = array('batch'=>$batch, 'eatby'=>$this->db->jdate($obj->eatby), 'sellby'=>$this->db->jdate($obj->sellby), 'qty'=>$obj->qty);
-                $i++;
-            }
-            return $result;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            $this->db->rollback();
-            return array();
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Move an uploaded file described into $file array into target directory $sdir.
-     *
-     * @param  string $sdir Target directory
-     * @param  string $file Array of file info of file to upload: array('name'=>..., 'tmp_name'=>...)
-     * @return int                    <0 if KO, >0 if OK
-     */
-    public function add_photo($sdir, $file)
-    {
-        // phpcs:enable
-        global $conf;
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $result = 0;
-
-        $dir = $sdir;
-        if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-            $dir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'product').$this->id."/photos";
-        } else {
-            $dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product').dol_sanitizeFileName($this->ref);
-        }
-
-        dol_mkdir($dir);
-
-        $dir_osencoded = $dir;
-
-        if (is_dir($dir_osencoded)) {
-            $originImage = $dir.'/'.$file['name'];
-
-            // Cree fichier en taille origine
-            $result = dol_move_uploaded_file($file['tmp_name'], $originImage, 1);
-
-            if (file_exists(dol_osencode($originImage))) {
-                // Create thumbs
-                $this->addThumbs($originImage);
-            }
-        }
-
-        if (is_numeric($result) && $result > 0) {
-            return 1;
-        } else {
-            return -1;
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return if at least one photo is available
-     *
-     * @param  string $sdir Directory to scan
-     * @return boolean                 True if at least one photo is available, False if not
-     */
-    public function is_photo_available($sdir)
-    {
-        // phpcs:enable
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-        global $conf;
-
-        $dir = $sdir;
-        if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-        	$dir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'product').$this->id."/photos/";
-        } else {
-        	$dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product').dol_sanitizeFileName($this->ref).'/';
-        }
-
-        $nbphoto = 0;
-
-        $dir_osencoded = dol_osencode($dir);
-        if (file_exists($dir_osencoded)) {
-            $handle = opendir($dir_osencoded);
-            if (is_resource($handle)) {
-                while (($file = readdir($handle)) !== false)
-                {
-                    if (!utf8_check($file)) {
-                    	$file = utf8_encode($file); // To be sure data is stored in UTF8 in memory
-                    }
-                    if (dol_is_file($dir.$file) && image_format_supported($file) >= 0) {
-                    	return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Retourne tableau de toutes les photos du produit
-     *
-     * @param  string $dir   Repertoire a scanner
-     * @param  int    $nbmax Nombre maximum de photos (0=pas de max)
-     * @return array                   Tableau de photos
-     */
-    public function liste_photos($dir, $nbmax = 0)
-    {
-        // phpcs:enable
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-        $nbphoto = 0;
-        $tabobj = array();
-
-        $dir_osencoded = dol_osencode($dir);
-        $handle = @opendir($dir_osencoded);
-        if (is_resource($handle)) {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (!utf8_check($file)) { $file = utf8_encode($file); // readdir returns ISO
-                }
-                if (dol_is_file($dir.$file) && image_format_supported($file) >= 0) {
-                    $nbphoto++;
-
-                    // On determine nom du fichier vignette
-                    $photo = $file;
-                    $photo_vignette = '';
-                    if (preg_match('/('.$this->regeximgext.')$/i', $photo, $regs)) {
-                        $photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
-                    }
-
-                    $dirthumb = $dir.'thumbs/';
-
-                    // Objet
-                    $obj = array();
-                    $obj['photo'] = $photo;
-                    if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) { $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
-                    } else { $obj['photo_vignette'] = "";
-                    }
-
-                    $tabobj[$nbphoto - 1] = $obj;
-
-                    // On continue ou on arrete de boucler ?
-                    if ($nbmax && $nbphoto >= $nbmax) { break;
-                    }
-                }
-            }
-
-            closedir($handle);
-        }
-
-        return $tabobj;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Efface la photo du produit et sa vignette
-     *
-     * @param  string $file Chemin de l'image
-     * @return void
-     */
-    public function delete_photo($file)
-    {
-        // phpcs:enable
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-
-        $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
-        $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
-        $filename = preg_replace('/'.preg_quote($dir, '/').'/i', '', $file); // Nom du fichier
-
-        // On efface l'image d'origine
-        dol_delete_file($file, 0, 0, 0, $this); // For triggers
-
-        // Si elle existe, on efface la vignette
-        if (preg_match('/('.$this->regeximgext.')$/i', $filename, $regs)) {
-            $photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_small'.$regs[0];
-            if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
-                dol_delete_file($dirthumb.$photo_vignette);
-            }
-
-            $photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_mini'.$regs[0];
-            if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
-                dol_delete_file($dirthumb.$photo_vignette);
-            }
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load size of image file
-     *
-     * @param  string $file Path to file
-     * @return void
-     */
-    public function get_image_size($file)
-    {
-        // phpcs:enable
-        $file_osencoded = dol_osencode($file);
-        $infoImg = getimagesize($file_osencoded); // Get information on image
-        $this->imgWidth = $infoImg[0]; // Largeur de l'image
-        $this->imgHeight = $infoImg[1]; // Hauteur de l'image
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Load indicators this->nb for the dashboard
-     *
-     * @return int                 <0 if KO, >0 if OK
-     */
-    public function load_state_board()
-    {
-        // phpcs:enable
-        global $conf, $user, $hookmanager;
-
-        $this->nb = array();
-
-        $sql = "SELECT count(p.rowid) as nb, fk_product_type";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-        $sql .= ' WHERE p.entity IN ('.getEntity($this->element, 1).')';
-        // Add where from hooks
-        if (is_object($hookmanager)) {
-            $parameters = array();
-            $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
-            $sql .= $hookmanager->resPrint;
-        }
-        $sql .= ' GROUP BY fk_product_type';
-
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                if ($obj->fk_product_type == 1) { $this->nb["services"] = $obj->nb;
-                } else { $this->nb["products"] = $obj->nb;
-                }
-            }
-            $this->db->free($resql);
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     * Return if object is a product
-     *
-     * @return boolean     True if it's a product
-     */
-    public function isProduct()
-    {
-        return ($this->type == Product::TYPE_PRODUCT ? true : false);
-    }
-
-    /**
-     * Return if object is a product
-     *
-     * @return boolean     True if it's a service
-     */
-    public function isService()
-    {
-        return ($this->type == Product::TYPE_SERVICE ? true : false);
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Get a barcode from the module to generate barcode values.
-     *  Return value is stored into this->barcode
-     *
-     * @param  Product $object Object product or service
-     * @param  string  $type   Barcode type (ean, isbn, ...)
-     * @return string
-     */
-    public function get_barcode($object, $type = '')
-    {
-        // phpcs:enable
-        global $conf;
-
-        $result = '';
-        if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
-            $dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
-            foreach ($dirsociete as $dirroot)
-            {
-                $res = dol_include_once($dirroot.$conf->global->BARCODE_PRODUCT_ADDON_NUM.'.php');
-                if ($res) { break;
-                }
-            }
-            $var = $conf->global->BARCODE_PRODUCT_ADDON_NUM;
-            $mod = new $var;
-
-            $result = $mod->getNextValue($object, $type);
-
-            dol_syslog(get_class($this)."::get_barcode barcode=".$result." module=".$var);
-        }
-        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()
-    {
-        global $user, $langs, $conf, $mysoc;
-
-        $now = dol_now();
-
-        // Initialize parameters
-        $this->specimen = 1;
-        $this->id = 0;
-        $this->ref = 'PRODUCT_SPEC';
-        $this->label = 'PRODUCT SPECIMEN';
-        $this->description = 'This is description of this product specimen that was created the '.dol_print_date($now, 'dayhourlog').'.';
-        $this->specimen = 1;
-        $this->country_id = 1;
-        $this->tosell = 1;
-        $this->tobuy = 1;
-        $this->tobatch = 0;
-        $this->note = 'This is a comment (private)';
-        $this->date_creation = $now;
-        $this->date_modification = $now;
-
-        $this->weight = 4;
-        $this->weight_unit = 1;
-
-        $this->length = 5;
-        $this->length_unit = 1;
-        $this->width = 6;
-        $this->width_unit = 0;
-        $this->height = null;
-        $this->height_unit = null;
-
-        $this->surface = 30;
-        $this->surface_unit = 0;
-        $this->volume = 300;
-        $this->volume_unit = 0;
-
-        $this->barcode = -1; // Create barcode automatically
-    }
-
-    /**
-     * Returns the label, shot_label or code found in units dictionary from ->fk_unit.
-	 * A langs->trans() must be called on result to get translated value.
-     *
-     * @param  string $type Label type (long, short or code)
-     * @return string|int <0 if ko, label if ok
-	 * @see getLabelOfUnit() in CommonObjectLine
-     */
-    public function getLabelOfUnit($type = 'long')
-    {
-        global $langs;
-
-        if (!$this->fk_unit) {
-            return '';
-        }
-
-        $langs->load('products');
-
-        $label_type = 'label';
-        if ($type == 'short') $label_type = 'short_label';
-        elseif ($type == 'code') $label_type = 'code';
-
-        $sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
-        $resql = $this->db->query($sql);
-        if ($resql && $this->db->num_rows($resql) > 0) {
-            $res = $this->db->fetch_array($resql);
-            if ($label_type == 'code') $label = 'unit'.$res['code'];
-            else $label = $res[$label_type];
-            $this->db->free($resql);
-            return $label;
-        }
-        else
-        {
-            $this->error = $this->db->error().' sql='.$sql;
-            dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
-
-    /**
-     * Return if object has a sell-by date or eat-by date
-     *
-     * @return boolean     True if it's has
-     */
-    public function hasbatch()
-    {
-        return ($this->status_batch == 1 ? true : false);
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return minimum product recommended price
-     *
-     * @return int            Minimum recommanded price that is higher price among all suppliers * PRODUCT_MINIMUM_RECOMMENDED_PRICE
-     */
-    public function min_recommended_price()
-    {
-        // phpcs:enable
-        global $conf;
-
-        $maxpricesupplier = 0;
-
-        if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
-            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-            $product_fourn = new ProductFournisseur($this->db);
-            $product_fourn_list = $product_fourn->list_product_fournisseur_price($this->id, '', '');
-
-            if (is_array($product_fourn_list) && count($product_fourn_list) > 0) {
-                foreach ($product_fourn_list as $productfourn)
-                {
-                    if ($productfourn->fourn_unitprice > $maxpricesupplier) {
-                        $maxpricesupplier = $productfourn->fourn_unitprice;
-                    }
-                }
-
-                $maxpricesupplier *= $conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE;
-            }
-        }
-
-        return $maxpricesupplier;
-    }
-
-
-    /**
-     * Sets object to supplied categories.
-     *
-     * Deletes object from existing categories not supplied.
-     * Adds it to non existing supplied categories.
-     * Existing categories are left untouch.
-     *
-     * @param  int[]|int $categories Category or categories IDs
-     * @return void
-     */
-    public function setCategories($categories)
-    {
-        // Handle single category
-        if (!is_array($categories)) {
-            $categories = array($categories);
-        }
-
-        // Get current categories
-        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-        $c = new Categorie($this->db);
-        $existing = $c->containing($this->id, Categorie::TYPE_PRODUCT, 'id');
-
-        // Diff
-        if (is_array($existing)) {
-            $to_del = array_diff($existing, $categories);
-            $to_add = array_diff($categories, $existing);
-        } else {
-            $to_del = array(); // Nothing to delete
-            $to_add = $categories;
-        }
-
-        // Process
-        foreach ($to_del as $del) {
-            if ($c->fetch($del) > 0) {
-            	$c->del_type($this, Categorie::TYPE_PRODUCT);
-            }
-        }
-        foreach ($to_add as $add) {
-            if ($c->fetch($add) > 0) {
-            	$c->add_type($this, Categorie::TYPE_PRODUCT);
-            }
-        }
-
-        return;
-    }
-
-    /**
-     * 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_customer_price',
-        'product_customer_price_log'
-        );
-
-        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-    }
-
-    /**
-     * Generates prices for a product based on product multiprice generation rules
-     *
-     * @param  User   $user       User that updates the prices
-     * @param  float  $baseprice  Base price
-     * @param  string $price_type Base price type
-     * @param  float  $price_vat  VAT % tax
-     * @param  int    $npr        NPR
-     * @param  string $psq        ¿?
-     * @return int -1 KO, 1 OK
-     */
-    public function generateMultiprices(User $user, $baseprice, $price_type, $price_vat, $npr, $psq)
-    {
-        global $conf, $db;
-
-        $sql = "SELECT rowid, level, fk_level, var_percent, var_min_percent FROM ".MAIN_DB_PREFIX."product_pricerules";
-        $query = $db->query($sql);
-
-        $rules = array();
-
-        while ($result = $db->fetch_object($query)) {
-            $rules[$result->level] = $result;
-        }
-
-        //Because prices can be based on other level's prices, we temporarily store them
-        $prices = array(
-        1 => $baseprice
-        );
-
-        for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
-            $price = $baseprice;
-            $price_min = $baseprice;
-
-            //We have to make sure it does exist and it is > 0
-            //First price level only allows changing min_price
-            if ($i > 1 && isset($rules[$i]->var_percent) && $rules[$i]->var_percent) {
-                $price = $prices[$rules[$i]->fk_level] * (1 + ($rules[$i]->var_percent / 100));
-            }
-
-            $prices[$i] = $price;
-
-            //We have to make sure it does exist and it is > 0
-            if (isset($rules[$i]->var_min_percent) && $rules[$i]->var_min_percent) {
-                $price_min = $price * (1 - ($rules[$i]->var_min_percent / 100));
-            }
-
-            //Little check to make sure the price is modified before triggering generation
-            $check_amount = (($price == $this->multiprices[$i]) && ($price_min == $this->multiprices_min[$i]));
-            $check_type = ($baseprice == $this->multiprices_base_type[$i]);
-
-            if ($check_amount && $check_type) {
-                continue;
-            }
-
-            if ($this->updatePrice($price, $price_type, $user, $price_vat, $price_min, $i, $npr, $psq, true) < 0) {
-                return -1;
-            }
-        }
-
-        return 1;
-    }
-
-    /**
-     * Returns the rights used for this class
-     *
-     * @return Object
-     */
-    public function getRights()
-    {
-        global $user;
-
-        if ($this->isProduct()) {
-            return $user->rights->produit;
-        } else {
-            return $user->rights->service;
-        }
-    }
-
-    /**
-     *  Load information for tab info
-     *
-     * @param  int $id Id of thirdparty to load
-     * @return void
-     */
-    public function info($id)
-    {
-        $sql = "SELECT p.rowid, p.ref, p.datec as date_creation, p.tms as date_modification,";
-        $sql .= " p.fk_user_author, p.fk_user_modif";
-        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
-        $sql .= " WHERE p.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_modif) {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
-
-                $this->ref = $obj->ref;
-                $this->date_creation     = $this->db->jdate($obj->date_creation);
-                $this->date_modification = $this->db->jdate($obj->date_modification);
-            }
-
-            $this->db->free($result);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+	/**
+	 *  Load existing information about a serial
+	 *
+	 * @param  string $batch Lot/serial number
+	 * @return array                    Array with record into product_batch
+	 * @see    load_stock(), load_virtual_stock()
+	 */
+	public function loadBatchInfo($batch)
+	{
+		$result = array();
+
+		$sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) AS qty FROM ".MAIN_DB_PREFIX."product_batch as pb, ".MAIN_DB_PREFIX."product_stock as ps";
+		$sql .= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".$this->id." AND pb.batch = '".$this->db->escape($batch)."'";
+		$sql .= " GROUP BY pb.batch, pb.eatby, pb.sellby";
+		dol_syslog(get_class($this)."::loadBatchInfo load first entry found for lot/serial = ".$batch, 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);
+				$result[] = array('batch'=>$batch, 'eatby'=>$this->db->jdate($obj->eatby), 'sellby'=>$this->db->jdate($obj->sellby), 'qty'=>$obj->qty);
+				$i++;
+			}
+			return $result;
+		} else {
+			dol_print_error($this->db);
+			$this->db->rollback();
+			return array();
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Move an uploaded file described into $file array into target directory $sdir.
+	 *
+	 * @param  string $sdir Target directory
+	 * @param  string $file Array of file info of file to upload: array('name'=>..., 'tmp_name'=>...)
+	 * @return int                    <0 if KO, >0 if OK
+	 */
+	public function add_photo($sdir, $file)
+	{
+		// phpcs:enable
+		global $conf;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$result = 0;
+
+		$dir = $sdir;
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+			$dir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'product').$this->id."/photos";
+		} else {
+			$dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product').dol_sanitizeFileName($this->ref);
+		}
+
+		dol_mkdir($dir);
+
+		$dir_osencoded = $dir;
+
+		if (is_dir($dir_osencoded)) {
+			$originImage = $dir.'/'.$file['name'];
+
+			// Cree fichier en taille origine
+			$result = dol_move_uploaded_file($file['tmp_name'], $originImage, 1);
+
+			if (file_exists(dol_osencode($originImage))) {
+				// Create thumbs
+				$this->addThumbs($originImage);
+			}
+		}
+
+		if (is_numeric($result) && $result > 0) {
+			return 1;
+		} else {
+			return -1;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return if at least one photo is available
+	 *
+	 * @param  string $sdir Directory to scan
+	 * @return boolean                 True if at least one photo is available, False if not
+	 */
+	public function is_photo_available($sdir)
+	{
+		// phpcs:enable
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+		global $conf;
+
+		$dir = $sdir;
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+			$dir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'product').$this->id."/photos/";
+		} else {
+			$dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product').dol_sanitizeFileName($this->ref).'/';
+		}
+
+		$nbphoto = 0;
+
+		$dir_osencoded = dol_osencode($dir);
+		if (file_exists($dir_osencoded)) {
+			$handle = opendir($dir_osencoded);
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false)
+				{
+					if (!utf8_check($file)) {
+						$file = utf8_encode($file); // To be sure data is stored in UTF8 in memory
+					}
+					if (dol_is_file($dir.$file) && image_format_supported($file) >= 0) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Retourne tableau de toutes les photos du produit
+	 *
+	 * @param  string $dir   Repertoire a scanner
+	 * @param  int    $nbmax Nombre maximum de photos (0=pas de max)
+	 * @return array                   Tableau de photos
+	 */
+	public function liste_photos($dir, $nbmax = 0)
+	{
+		// phpcs:enable
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+		$nbphoto = 0;
+		$tabobj = array();
+
+		$dir_osencoded = dol_osencode($dir);
+		$handle = @opendir($dir_osencoded);
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false)
+			{
+				if (!utf8_check($file)) { $file = utf8_encode($file); // readdir returns ISO
+				}
+				if (dol_is_file($dir.$file) && image_format_supported($file) >= 0) {
+					$nbphoto++;
+
+					// On determine nom du fichier vignette
+					$photo = $file;
+					$photo_vignette = '';
+					if (preg_match('/('.$this->regeximgext.')$/i', $photo, $regs)) {
+						$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];
+					}
+
+					$dirthumb = $dir.'thumbs/';
+
+					// Objet
+					$obj = array();
+					$obj['photo'] = $photo;
+					if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) { $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
+					} else { $obj['photo_vignette'] = "";
+					}
+
+					$tabobj[$nbphoto - 1] = $obj;
+
+					// On continue ou on arrete de boucler ?
+					if ($nbmax && $nbphoto >= $nbmax) { break;
+					}
+				}
+			}
+
+			closedir($handle);
+		}
+
+		return $tabobj;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Efface la photo du produit et sa vignette
+	 *
+	 * @param  string $file Chemin de l'image
+	 * @return void
+	 */
+	public function delete_photo($file)
+	{
+		// phpcs:enable
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+
+		$dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
+		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
+		$filename = preg_replace('/'.preg_quote($dir, '/').'/i', '', $file); // Nom du fichier
+
+		// On efface l'image d'origine
+		dol_delete_file($file, 0, 0, 0, $this); // For triggers
+
+		// Si elle existe, on efface la vignette
+		if (preg_match('/('.$this->regeximgext.')$/i', $filename, $regs)) {
+			$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_small'.$regs[0];
+			if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
+				dol_delete_file($dirthumb.$photo_vignette);
+			}
+
+			$photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_mini'.$regs[0];
+			if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
+				dol_delete_file($dirthumb.$photo_vignette);
+			}
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load size of image file
+	 *
+	 * @param  string $file Path to file
+	 * @return void
+	 */
+	public function get_image_size($file)
+	{
+		// phpcs:enable
+		$file_osencoded = dol_osencode($file);
+		$infoImg = getimagesize($file_osencoded); // Get information on image
+		$this->imgWidth = $infoImg[0]; // Largeur de l'image
+		$this->imgHeight = $infoImg[1]; // Hauteur de l'image
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Load indicators this->nb for the dashboard
+	 *
+	 * @return int                 <0 if KO, >0 if OK
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
+		global $conf, $user, $hookmanager;
+
+		$this->nb = array();
+
+		$sql = "SELECT count(p.rowid) as nb, fk_product_type";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
+		$sql .= ' WHERE p.entity IN ('.getEntity($this->element, 1).')';
+		// Add where from hooks
+		if (is_object($hookmanager)) {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+			$sql .= $hookmanager->resPrint;
+		}
+		$sql .= ' GROUP BY fk_product_type';
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				if ($obj->fk_product_type == 1) { $this->nb["services"] = $obj->nb;
+				} else { $this->nb["products"] = $obj->nb;
+				}
+			}
+			$this->db->free($resql);
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 * Return if object is a product
+	 *
+	 * @return boolean     True if it's a product
+	 */
+	public function isProduct()
+	{
+		return ($this->type == Product::TYPE_PRODUCT ? true : false);
+	}
+
+	/**
+	 * Return if object is a product
+	 *
+	 * @return boolean     True if it's a service
+	 */
+	public function isService()
+	{
+		return ($this->type == Product::TYPE_SERVICE ? true : false);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Get a barcode from the module to generate barcode values.
+	 *  Return value is stored into this->barcode
+	 *
+	 * @param  Product $object Object product or service
+	 * @param  string  $type   Barcode type (ean, isbn, ...)
+	 * @return string
+	 */
+	public function get_barcode($object, $type = '')
+	{
+		// phpcs:enable
+		global $conf;
+
+		$result = '';
+		if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
+			$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
+			foreach ($dirsociete as $dirroot)
+			{
+				$res = dol_include_once($dirroot.$conf->global->BARCODE_PRODUCT_ADDON_NUM.'.php');
+				if ($res) { break;
+				}
+			}
+			$var = $conf->global->BARCODE_PRODUCT_ADDON_NUM;
+			$mod = new $var;
+
+			$result = $mod->getNextValue($object, $type);
+
+			dol_syslog(get_class($this)."::get_barcode barcode=".$result." module=".$var);
+		}
+		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()
+	{
+		global $user, $langs, $conf, $mysoc;
+
+		$now = dol_now();
+
+		// Initialize parameters
+		$this->specimen = 1;
+		$this->id = 0;
+		$this->ref = 'PRODUCT_SPEC';
+		$this->label = 'PRODUCT SPECIMEN';
+		$this->description = 'This is description of this product specimen that was created the '.dol_print_date($now, 'dayhourlog').'.';
+		$this->specimen = 1;
+		$this->country_id = 1;
+		$this->tosell = 1;
+		$this->tobuy = 1;
+		$this->tobatch = 0;
+		$this->note = 'This is a comment (private)';
+		$this->date_creation = $now;
+		$this->date_modification = $now;
+
+		$this->weight = 4;
+		$this->weight_unit = 1;
+
+		$this->length = 5;
+		$this->length_unit = 1;
+		$this->width = 6;
+		$this->width_unit = 0;
+		$this->height = null;
+		$this->height_unit = null;
+
+		$this->surface = 30;
+		$this->surface_unit = 0;
+		$this->volume = 300;
+		$this->volume_unit = 0;
+
+		$this->barcode = -1; // Create barcode automatically
+	}
+
+	/**
+	 *    Returns the text label from units dictionary
+	 *
+	 * @param  string $type Label type (long or short)
+	 * @return string|int <0 if ko, label if ok
+	 */
+	public function getLabelOfUnit($type = 'long')
+	{
+		global $langs;
+
+		if (!$this->fk_unit) {
+			return '';
+		}
+
+		$langs->load('products');
+
+		$label_type = 'label';
+
+		if ($type == 'short') {
+			$label_type = 'short_label';
+		}
+
+		$sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
+		$resql = $this->db->query($sql);
+		if ($resql && $this->db->num_rows($resql) > 0) {
+			$res = $this->db->fetch_array($resql);
+			$label = ($label_type == 'short_label' ? $res[$label_type] : 'unit'.$res['code']);
+			$this->db->free($resql);
+			return $label;
+		} else {
+			$this->error = $this->db->error().' sql='.$sql;
+			dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+	/**
+	 * Return if object has a sell-by date or eat-by date
+	 *
+	 * @return boolean     True if it's has
+	 */
+	public function hasbatch()
+	{
+		return ($this->status_batch == 1 ? true : false);
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return minimum product recommended price
+	 *
+	 * @return int            Minimum recommanded price that is higher price among all suppliers * PRODUCT_MINIMUM_RECOMMENDED_PRICE
+	 */
+	public function min_recommended_price()
+	{
+		// phpcs:enable
+		global $conf;
+
+		$maxpricesupplier = 0;
+
+		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {
+			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+			$product_fourn = new ProductFournisseur($this->db);
+			$product_fourn_list = $product_fourn->list_product_fournisseur_price($this->id, '', '');
+
+			if (is_array($product_fourn_list) && count($product_fourn_list) > 0) {
+				foreach ($product_fourn_list as $productfourn)
+				{
+					if ($productfourn->fourn_unitprice > $maxpricesupplier) {
+						$maxpricesupplier = $productfourn->fourn_unitprice;
+					}
+				}
+
+				$maxpricesupplier *= $conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE;
+			}
+		}
+
+		return $maxpricesupplier;
+	}
+
+
+	/**
+	 * Sets object to supplied categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param  int[]|int $categories Category or categories IDs
+	 * @return void
+	 */
+	public function setCategories($categories)
+	{
+		// Handle single category
+		if (!is_array($categories)) {
+			$categories = array($categories);
+		}
+
+		// Get current categories
+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		$c = new Categorie($this->db);
+		$existing = $c->containing($this->id, Categorie::TYPE_PRODUCT, 'id');
+
+		// Diff
+		if (is_array($existing)) {
+			$to_del = array_diff($existing, $categories);
+			$to_add = array_diff($categories, $existing);
+		} else {
+			$to_del = array(); // Nothing to delete
+			$to_add = $categories;
+		}
+
+		// Process
+		foreach ($to_del as $del) {
+			if ($c->fetch($del) > 0) {
+				$c->del_type($this, Categorie::TYPE_PRODUCT);
+			}
+		}
+		foreach ($to_add as $add) {
+			if ($c->fetch($add) > 0) {
+				$c->add_type($this, Categorie::TYPE_PRODUCT);
+			}
+		}
+
+		return;
+	}
+
+	/**
+	 * 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_customer_price',
+		'product_customer_price_log'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+
+	/**
+	 * Generates prices for a product based on product multiprice generation rules
+	 *
+	 * @param  User   $user       User that updates the prices
+	 * @param  float  $baseprice  Base price
+	 * @param  string $price_type Base price type
+	 * @param  float  $price_vat  VAT % tax
+	 * @param  int    $npr        NPR
+	 * @param  string $psq        ¿?
+	 * @return int -1 KO, 1 OK
+	 */
+	public function generateMultiprices(User $user, $baseprice, $price_type, $price_vat, $npr, $psq)
+	{
+		global $conf, $db;
+
+		$sql = "SELECT rowid, level, fk_level, var_percent, var_min_percent FROM ".MAIN_DB_PREFIX."product_pricerules";
+		$query = $this->db->query($sql);
+
+		$rules = array();
+
+		while ($result = $this->db->fetch_object($query)) {
+			$rules[$result->level] = $result;
+		}
+
+		//Because prices can be based on other level's prices, we temporarily store them
+		$prices = array(
+			1 => $baseprice
+		);
+
+		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
+			$price = $baseprice;
+			$price_min = $baseprice;
+
+			//We have to make sure it does exist and it is > 0
+			//First price level only allows changing min_price
+			if ($i > 1 && isset($rules[$i]->var_percent) && $rules[$i]->var_percent) {
+				$price = $prices[$rules[$i]->fk_level] * (1 + ($rules[$i]->var_percent / 100));
+			}
+
+			$prices[$i] = $price;
+
+			//We have to make sure it does exist and it is > 0
+			if (isset($rules[$i]->var_min_percent) && $rules[$i]->var_min_percent) {
+				$price_min = $price * (1 - ($rules[$i]->var_min_percent / 100));
+			}
+
+			//Little check to make sure the price is modified before triggering generation
+			$check_amount = (($price == $this->multiprices[$i]) && ($price_min == $this->multiprices_min[$i]));
+			$check_type = ($baseprice == $this->multiprices_base_type[$i]);
+
+			if ($check_amount && $check_type) {
+				continue;
+			}
+
+			if ($this->updatePrice($price, $price_type, $user, $price_vat, $price_min, $i, $npr, $psq, true) < 0) {
+				return -1;
+			}
+		}
+
+		return 1;
+	}
+
+	/**
+	 * Returns the rights used for this class
+	 *
+	 * @return Object
+	 */
+	public function getRights()
+	{
+		global $user;
+
+		if ($this->isProduct()) {
+			return $user->rights->produit;
+		} else {
+			return $user->rights->service;
+		}
+	}
+
+	/**
+	 *  Load information for tab info
+	 *
+	 * @param  int $id Id of thirdparty to load
+	 * @return void
+	 */
+	public function info($id)
+	{
+		$sql = "SELECT p.rowid, p.ref, p.datec as date_creation, p.tms as date_modification,";
+		$sql .= " p.fk_user_author, p.fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";
+		$sql .= " WHERE p.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_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+
+				$this->ref = $obj->ref;
+				$this->date_creation     = $this->db->jdate($obj->date_creation);
+				$this->date_modification = $this->db->jdate($obj->date_modification);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 }
 
 
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 05cfd7523e0..db59efcdfb7 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -119,9 +119,7 @@ class Productbatch extends CommonObject
 		{
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -178,9 +176,7 @@ class Productbatch extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -232,9 +228,7 @@ class Productbatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -274,9 +268,7 @@ class Productbatch extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -330,9 +322,7 @@ class Productbatch extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -424,9 +414,7 @@ class Productbatch extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -494,9 +482,7 @@ class Productbatch extends CommonObject
             $db->free($resql);
 
             return $ret;
-        }
-        else
-        {
+        } else {
             $error = "Error ".$db->lasterror();
             return -1;
         }
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 2e8cd316bc0..25a3c5cd836 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -252,7 +252,6 @@ class Productcustomerprice extends CommonObject
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
-
 		$sql .= " t.entity,";
 		$sql .= " t.datec,";
 		$sql .= " t.tms,";
@@ -330,7 +329,6 @@ class Productcustomerprice extends CommonObject
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
-
 		$sql .= " t.entity,";
 		$sql .= " t.datec,";
 		$sql .= " t.tms,";
@@ -363,15 +361,16 @@ class Productcustomerprice extends CommonObject
 		// Manage filter
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
-				{
-					$sql .= ' AND '.$key.' = \''.$value.'\'';
+				if (strpos($key, 'date')) {				// To allow $filter['YEAR(s.dated)']=>$year
+					$sql .= ' AND '.$key.' = \''.$this->db->escape($value).'\'';
 				} elseif ($key == 'soc.nom') {
-					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
-				} elseif ($key == 'prod.ref') {
-					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				} elseif ($key == 'prod.ref' || $key == 'prod.label') {
+					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				} elseif ($key == 't.price' || $key == 't.price_ttc') {
+					$sql .= ' AND '.$key.' LIKE \'%'.price2num($value).'%\'';
 				} else {
-					$sql .= ' AND '.$key.' = '.$value;
+					$sql .= ' AND '.$key.' = '.((int) $value);
 				}
 			}
 		}
diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php
index 9ca53d167cf..30ed73d8c77 100644
--- a/htdocs/product/class/propalmergepdfproduct.class.php
+++ b/htdocs/product/class/propalmergepdfproduct.class.php
@@ -139,9 +139,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
             return $this->id;
 		}
@@ -198,9 +196,7 @@ class Propalmergepdfproduct extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
       	    $this->error = "Error ".$this->db->lasterror();
             dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
@@ -236,7 +232,7 @@ class Propalmergepdfproduct extends CommonObject
     	$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 = '".$lang."'";
+    		$sql .= " AND t.lang = '".$this->db->escape($lang)."'";
     	}
 
     	dol_syslog(__METHOD__, LOG_DEBUG);
@@ -272,9 +268,7 @@ class Propalmergepdfproduct extends CommonObject
     		$this->db->free($resql);
 
     		return 1;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
     		return -1;
@@ -333,9 +327,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -376,9 +368,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -408,7 +398,7 @@ class Propalmergepdfproduct extends CommonObject
 			$sql .= " WHERE fk_product=".$product_id;
 
 			if ($conf->global->MAIN_MULTILANGS && !empty($lang_id)) {
-				$sql .= " AND lang='".$lang_id."'";
+				$sql .= " AND lang='".$this->db->escape($lang_id)."'";
 			}
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
@@ -426,9 +416,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -469,9 +457,7 @@ class Propalmergepdfproduct extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -525,9 +511,7 @@ class Propalmergepdfproduct extends CommonObject
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 547ebce73f8..843e1e6cb59 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array('bills', 'products', 'stocks'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $key = GETPOST('key');
@@ -81,28 +81,20 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 			{
 				//var_dump($i.' '.GETPOST("prod_id_".$i, 'int'), $qty, GETPOST("prod_incdec_".$i, 'int'));
 				$action = 'edit';
-			}
-			else
-			{
+			} else {
 				$error++;
 				$action = 're-edit';
 				if ($object->error == "isFatherOfThis") {
 					setEventMessages($langs->trans("ErrorAssociationIsFatherOfThis"), null, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-		}
-		else
-		{
+		} else {
 			if ($object->del_sousproduit($id, GETPOST("prod_id_".$i, 'int')) > 0)
 			{
 				$action = 'edit';
-			}
-			else
-			{
+			} else {
 				$error++;
 				$action = 're-edit';
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -115,8 +107,7 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
 	}
-}
-elseif ($action === 'save_composed_product')
+} elseif ($action === 'save_composed_product')
 {
 	$TProduct = GETPOST('TProduct', 'array');
 	if (!empty($TProduct))
@@ -235,9 +226,7 @@ if ($id > 0 || !empty($ref))
     			if ($object->price_base_type == 'TTC')
     			{
     				print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
-    			}
-    			else
-    			{
+    			} else {
     				print price($object->price).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
     			}
     			print '</td></tr>';
@@ -247,9 +236,7 @@ if ($id > 0 || !empty($ref))
     			if ($object->price_base_type == 'TTC')
     			{
     				print price($object->price_min_ttc).' '.$langs->trans($object->price_base_type);
-    			}
-    			else
-    			{
+    			} else {
     				print price($object->price_min).' '.$langs->trans($object->price_base_type ? $object->price_base_type : 'HT');
     			}
     			print '</td></tr>';
@@ -299,9 +286,7 @@ if ($id > 0 || !empty($ref))
 				print '<td>'.$value['qty'].'</td>';
 				print '</tr>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<tr class="oddeven">';
 			print '<td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td>';
 			print '</tr>';
@@ -378,9 +363,7 @@ if ($id > 0 || !empty($ref))
 					if (!empty($conf->global->PRODUIT_MULTIPRICES))
 					{
 						$pricesell = 'Variable';
-					}
-					else
-					{
+					} else {
 						$totallinesell = price2num($value['nb'] * ($pricesell), 'MT');
 						$totalsell += $totallinesell;
 					}
@@ -398,16 +381,13 @@ if ($id > 0 || !empty($ref))
 					{
 						print '<td class="center"><input type="text" value="'.$nb_of_subproduct.'" name="TProduct['.$productstatic->id.'][qty]" size="4" /></td>';
 						print '<td class="center"><input type="checkbox" name="TProduct['.$productstatic->id.'][incdec]" value="1" '.($value['incdec'] == 1 ? 'checked' : '').' /></td>';
-					}
-					else {
+					} else {
 						print '<td>'.$nb_of_subproduct.'</td>';
 						print '<td>'.($value['incdec'] == 1 ? 'x' : '').'</td>';
 					}
 
 					print '</tr>'."\n";
-				}
-				else
-				{
+				} else {
 					$hide = '';
 					if (empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)) $hide = ' hideobject'; // By default, we do not show this. It makes screen very difficult to understand
 
@@ -469,9 +449,7 @@ if ($id > 0 || !empty($ref))
 			}
 			print '</td>';
 			print '</tr>'."\n";
-		}
-		else
-		{
+		} else {
 			$colspan = 8;
 			if (!empty($conf->stock->enabled)) $colspan++;
 
@@ -600,9 +578,7 @@ if ($id > 0 || !empty($ref))
 							//$addchecked = ' checked';
 							$qty = $object->is_sousproduit_qty;
 							$incdec = $object->is_sousproduit_incdec;
-						}
-						else
-						{
+						} else {
 							//$addchecked = '';
 							$qty = 0;
 							$incdec = 0;
@@ -616,8 +592,7 @@ if ($id > 0 || !empty($ref))
 						// Inc Dec
 						print '<td class="center">';
 						if ($qty) print '<input type="checkbox" name="prod_incdec_'.$i.'" value="1" '.($incdec ? 'checked' : '').'>';
-						else
-						{
+						else {
 							// TODO Hide field and show it when setting a qty
 							print '<input type="checkbox" name="prod_incdec_'.$i.'" value="1" checked>';
 							//print '<input type="checkbox" disabled name="prod_incdec_'.$i.'" value="1" checked>';
@@ -636,9 +611,7 @@ if ($id > 0 || !empty($ref))
 					print '<td></td>';
 					print '</tr>';
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 			print '</table>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index e5702078dd2..8d06e211bab 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -42,7 +42,7 @@ $langs->loadLangs(array('other', 'products'));
 
 $id     = GETPOST('id', 'int');
 $ref    = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -313,9 +313,7 @@ if ($object->id)
     						$filename = $filetoadd['name'].' - '.$langs->trans('Language_'.$default_lang);
     						$checked = ' checked ';
     					}
-    				}
-    				else
-    				{
+    				} else {
     					if (array_key_exists($filetoadd['name'], $filetomerge->lines))
     					{
     						$checked = ' checked ';
@@ -337,9 +335,7 @@ if ($object->id)
     		print  '</form>';
     	}
     }
-}
-else
-{
+} 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 420d5aaddb2..cf498d6f998 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -123,9 +123,7 @@ class PriceExpression
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -162,14 +160,10 @@ class PriceExpression
                 $this->title = $obj->title;
                 $this->expression = $obj->expression;
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
               $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -205,9 +199,7 @@ class PriceExpression
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -236,14 +228,10 @@ class PriceExpression
             if ($obj)
             {
                 return (int) $obj->rowid;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
               $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -301,9 +289,7 @@ class PriceExpression
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -359,9 +345,7 @@ class PriceExpression
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
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 acede724da5..f2ab8006b02 100644
--- a/htdocs/product/dynamic_price/class/price_global_variable.class.php
+++ b/htdocs/product/dynamic_price/class/price_global_variable.class.php
@@ -128,9 +128,7 @@ class PriceGlobalVariable
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -162,14 +160,10 @@ class PriceGlobalVariable
                 $this->value		= $obj->value;
                 $this->checkParameters();
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -225,9 +219,7 @@ class PriceGlobalVariable
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -282,9 +274,7 @@ class PriceGlobalVariable
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -349,9 +339,7 @@ class PriceGlobalVariable
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } 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 0c8e25e8751..6706dded094 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
@@ -144,9 +144,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return $this->id;
         }
@@ -182,14 +180,10 @@ class PriceGlobalVariableUpdater
                 $this->last_status		= $obj->last_status;
                 $this->checkParameters();
                 return 1;
-            }
-            else
-            {
+            } else {
                 return 0;
             }
-        }
-        else
-        {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -249,9 +243,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -305,9 +297,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -399,9 +389,7 @@ class PriceGlobalVariableUpdater
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -441,9 +429,7 @@ class PriceGlobalVariableUpdater
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             return -1;
         }
@@ -598,9 +584,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } else {
             $this->db->commit();
             return 1;
         }
@@ -644,9 +628,7 @@ class PriceGlobalVariableUpdater
             }
             $this->db->rollback();
             return -1 * $error;
-        }
-        else
-        {
+        } 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 6659dc56054..7a7dd5aac56 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -103,20 +103,16 @@ class PriceParser
         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
+        } 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
+        } 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
+        } elseif (in_array($code, array(7, 12, 13, 15, 16, 18))) //Internal errors
         {
             return $langs->trans("ErrorPriceExpressionInternal", $code);
-        }
-        else //Unknown errors
+        } else //Unknown errors
         {
             return $langs->trans("ErrorPriceExpressionUnknown", $code);
         }
@@ -276,7 +272,7 @@ class PriceParser
 		if ($res < 0) {
 			$this->error_parser = array(25, null);
 			return -1;
-		}  elseif ($res == 0) {
+		} elseif ($res == 0) {
 			$supplier_min_price = 0;
 		} else {
 			 $supplier_min_price = $productFournisseur->fourn_unitprice;
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index bf2f58f63f3..b59319ad985 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array('products', 'accountancy')); //"Back" translation is on
 
 $id = GETPOST('id', 'int');
 $eid = GETPOST('eid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $title = GETPOST('expression_title', 'alpha');
 $expression = GETPOST('expression');
 $tab = GETPOST('tab', 'alpha');
@@ -54,8 +54,7 @@ $price_globals = new PriceGlobalVariable($db);
 if (empty($eid)) //This also disables fetch when eid == 0
 {
 	$eid = 0;
-}
-elseif ($action != 'delete')
+} elseif ($action != 'delete')
 {
 	$price_expression->fetch($eid);
 }
@@ -77,9 +76,7 @@ if ($action == 'add')
 			$price_result = $priceparser->testExpression($id, $expression);
 			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
-			}
-			else
-			{
+			} else {
 				$price_expression->title = $title;
 				$price_expression->expression = $expression;
 				$result = $price_expression->create($user);
@@ -87,19 +84,14 @@ if ($action == 'add')
 				{
 					$eid = $price_expression->id;
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					setEventMessages("add: ".$price_expression->error, $price_expression->errors, 'errors');
 				}
 			}
-		}
-		elseif ($result < 0)
+		} elseif ($result < 0)
 		{
 			setEventMessages("add find: ".$price_expression->error, $price_expression->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
 		}
 	}
@@ -117,9 +109,7 @@ if ($action == 'update')
 			$price_result = $priceparser->testExpression($id, $expression);
 			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
-			}
-			else
-			{
+			} else {
 				$price_expression->id = $eid;
 				$price_expression->title = $title;
 				$price_expression->expression = $expression;
@@ -127,19 +117,14 @@ if ($action == 'update')
 				if ($result < 0)
 				{
 					setEventMessages("update: ".$price_expression->error, $price_expression->errors, 'errors');
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 				}
 			}
-		}
-		elseif ($result < 0)
+		} elseif ($result < 0)
 		{
 			setEventMessages("update find: ".$price_expression->error, $price_expression->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
 		}
 	}
@@ -220,10 +205,8 @@ print '<span id="back" class="butAction">'.$langs->trans("Back").'</span>';
 if ($eid == 0)
 {
 	print '<div class="inline-block divButAction"><span id="action-delete" class="butActionRefused classfortooltip">'.$langs->trans('Delete').'</span></div>'."\n";
-}
-else
-{
-	print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;tab='.$tab.'&amp;eid='.$eid.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
+} else {
+	print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;tab='.$tab.'&amp;eid='.$eid.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 }
 print '</div>';
 
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 9140de09513..fb1be576ad5 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -47,7 +47,7 @@ $langs->loadLangs(array('products', 'suppliers', 'bills', 'margins', 'stocks'));
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $rowid = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'pricesuppliercard';
 
@@ -127,9 +127,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 		        $action = '';
-			}
-			else
-			{
+			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -210,9 +208,7 @@ if (empty($reshook))
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")), null, 'errors');
-			}
-			else
-			{
+			} else {
 				$_POST["price"] = 0;
 			}
 		}
@@ -255,8 +251,7 @@ if (empty($reshook))
 					$productLink = $object->getNomUrl(1, 'supplier');
 
 					setEventMessages($langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct", $productLink), null, 'errors');
-				}
-				elseif ($ret < 0)
+				} elseif ($ret < 0)
 				{
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
@@ -286,8 +281,8 @@ if (empty($reshook))
                             $sql .= '"'.$value.'", ';
                         }
                         $sql = substr($sql, 0, strlen($sql) - 2).')';
-                    } // else update the existing one
-                    else {
+                    } 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.'", ';
@@ -315,9 +310,7 @@ if (empty($reshook))
 				{
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
-				}
-				else
-				{
+				} else {
 					if (!empty($conf->dynamicprices->enabled) && $price_expression !== '')
 					{
 						//Check the expression validity by parsing it
@@ -346,14 +339,10 @@ if (empty($reshook))
 			{
 				$db->commit();
 				$action = '';
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'add_price';
 		}
 	}
@@ -458,9 +447,7 @@ if ($id > 0 || $ref)
 				{
 					$object->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price
 					print load_fiche_titre($langs->trans("ChangeSupplierPrice"));
-				}
-				else
-				{
+				} else {
 					print load_fiche_titre($langs->trans("AddSupplierPrice"));
 				}
 
@@ -483,9 +470,7 @@ if ($id > 0 || $ref)
 					print '<input type="hidden" name="ref_fourn_price_id" value="'.$rowid.'">';
 					print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 					print '<input type="hidden" name="socid" value="'.$socid.'">';
-				}
-				else
-				{
+				} else {
 					$events = array();
 					$events[] = array('method' => 'getVatRates', 'url' => dol_buildpath('/core/ajax/vatrates.php', 1), 'htmlname' => 'tva_tx', 'params' => array());
 					print $form->select_company(GETPOST("id_fourn", 'alpha'), 'id_fourn', 'fournisseur=1', 'SelectThirdParty', 0, 0, $events);
@@ -508,9 +493,7 @@ if ($id > 0 || $ref)
 				{
                     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
-				{
+				} else {
 					print '<input class="flat" name="ref_fourn" size="12" value="'.(GETPOST("ref_fourn") ?GETPOST("ref_fourn") : '').'">';
 				}
 				print '</td>';
@@ -534,9 +517,7 @@ if ($id > 0 || $ref)
 				{
 					print '<input type="hidden" name="qty" value="'.$object->fourn_qty.'">';
 					print $object->fourn_qty;
-				}
-				else
-				{
+				} else {
 					print '<input class="flat" name="qty" size="5" value="'.$quantity.'">';
 				}
                 // Units
@@ -569,9 +550,7 @@ if ($id > 0 || $ref)
 				    $tmpproductsupplier->fetch_product_fournisseur_price($rowid, 1);
 					$default_vat = $tmpproductsupplier->fourn_tva_tx;
 					$default_npr = $tmpproductsupplier->fourn_tva_npr;
-				}
-				else
-				{
+				} else {
                     if (empty($default_vat))
                     {
                         $default_vat = $object->tva_tx;
@@ -879,6 +858,50 @@ SCRIPT;
 
 				print_barre_liste($langs->trans('SupplierPrices'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit, 1);
 
+				// Definition of fields for lists
+				// Some fields are missing because they are not included in the database query
+				$arrayfields = array(
+					'pfp.datec'=>array('label'=>$langs->trans("AppliedPricesFrom"), 'checked'=>1, 'position'=>1),
+					's.nom'=>array('label'=>$langs->trans("Suppliers"), 'checked'=>1, 'position'=>2),
+					'pfp.fk_availability'=>array('label'=>$langs->trans("Availability"), 'enabled' => !empty($conf->global->FOURN_PRODUCT_AVAILABILITY), 'checked'=>0, 'position'=>4),
+					'pfp.quantity'=>array('label'=>$langs->trans("QtyMin"), 'checked'=>1, 'position'=>5),
+					'pfp.unitprice'=>array('label'=>$langs->trans("UnitPriceHT"), 'checked'=>1, 'position'=>9),
+					'pfp.multicurrency_unitprice'=>array('label'=>$langs->trans("UnitPriceHTCurrency"), 'enabled' => $conf->multicurrency->enabled, 'checked'=>0, 'position'=>10),
+					'pfp.delivery_time_days'=>array('label'=>$langs->trans("NbDaysToDelivery"), 'checked'=>1, 'position'=>13),
+					'pfp.supplier_reputation'=>array('label'=>$langs->trans("ReputationForThisProduct"), 'checked'=>1, 'position'=>14),
+					'pfp.barcode'=>array('label'=>$langs->trans("BarcodeValue"), 'enabled' => $conf->barcode->enabled, 'checked'=>0, 'position'=>15),
+					'pfp.fk_barcode_type'=>array('label'=>$langs->trans("BarcodeType"), 'enabled' => $conf->barcode->enabled, 'checked'=>0, 'position'=>16),
+					'pfp.packaging'=>array('label'=>$langs->trans("PackagingForThisProduct"), 'enabled' => !empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING), 'checked'=>0, 'position'=>17),
+					'pfp.tms'=>array('label'=>$langs->trans("DateModification"), 'enabled' => $conf->barcode->enabled, 'checked'=>1, 'position'=>18),
+				);
+
+				// fetch optionals attributes and labels
+				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
+				$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
+
+				if (!empty($extralabels)) {
+					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) {
+							$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]);
+						}
+					}
+				}
+
+				// Selection of new fields
+				include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+				$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+				$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="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.'">';
+
 				// Suppliers list title
 				print '<div class="div-table-responsive">';
 				print '<table class="liste centpercent">';
@@ -886,42 +909,37 @@ SCRIPT;
 				$param = "&id=".$object->id;
 
 				print '<tr class="liste_titre">';
-				print_liste_field_titre("AppliedPricesFrom", $_SERVER["PHP_SELF"], "pfp.datec", "", $param, "", $sortfield, $sortorder);
-				print_liste_field_titre("Suppliers", $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
+				if (!empty($arrayfields['pfp.datec']['checked']))					print_liste_field_titre("AppliedPricesFrom", $_SERVER["PHP_SELF"], "pfp.datec", "", $param, "", $sortfield, $sortorder);
+				if (!empty($arrayfields['s.nom']['checked']))						print_liste_field_titre("Suppliers", $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
 				print_liste_field_titre("SupplierRef", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
-				if (!empty($conf->global->FOURN_PRODUCT_AVAILABILITY)) print_liste_field_titre("Availability", $_SERVER["PHP_SELF"], "pfp.fk_availability", "", $param, "", $sortfield, $sortorder);
-				print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "pfp.quantity", "", $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($arrayfields['pfp.fk_availability']['checked']))			print_liste_field_titre("Availability", $_SERVER["PHP_SELF"], "pfp.fk_availability", "", $param, "", $sortfield, $sortorder);
+				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 ');
-                }
-                print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
-                if ($conf->multicurrency->enabled) {
-                    print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
-                    print_liste_field_titre("Currency", $_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 (!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 ');
-				print_liste_field_titre("NbDaysToDelivery", $_SERVER["PHP_SELF"], "pfp.delivery_time_days", "", $param, '', $sortfield, $sortorder, 'right ');
-				print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center ');
-				if ($conf->barcode->enabled) {
-                    print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, '', $sortfield, $sortorder, 'center ');
-                    print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center ');
-                }
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) print_liste_field_titre("PackagingForThisProduct", $_SERVER["PHP_SELF"], "pfp.packaging", "", $param, 'align="center"', $sortfield, $sortorder);
-				print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($arrayfields['pfp.delivery_time_days']['checked']))		print_liste_field_titre("NbDaysToDelivery", $_SERVER["PHP_SELF"], "pfp.delivery_time_days", "", $param, '', $sortfield, $sortorder, 'right ');
+				if (!empty($arrayfields['pfp.supplier_reputation']['checked']))		print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center ');
+				if (!empty($arrayfields['pfp.barcode']['checked']))					print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, '', $sortfield, $sortorder, 'center ');
+				if (!empty($arrayfields['pfp.fk_barcode_type']['checked']))			print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center ');
+				if (!empty($arrayfields['pfp.packaging']['checked']))				print_liste_field_titre("PackagingForThisProduct", $_SERVER["PHP_SELF"], "pfp.packaging", "", $param, 'align="center"', $sortfield, $sortorder);
+				if (!empty($arrayfields['pfp.tms']['checked']))						print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right ');
 
 				// fetch optionals attributes and labels
 				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
+
 				if (!empty($extralabels)) {
 					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]));
-                            else $extratitle = $langs->trans($value);
-							print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+							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 ');
 						}
 					}
 				}
@@ -931,7 +949,7 @@ SCRIPT;
 				    $parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
 				    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
 				}
-				print_liste_field_titre('');
+				print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 				print "</tr>\n";
 
 				if (is_array($product_fourn_list))
@@ -941,23 +959,25 @@ SCRIPT;
 						print '<tr class="oddeven">';
 
 						// Date from
-						print '<td>'.dol_print_date(($productfourn->fourn_date_creation ? $productfourn->fourn_date_creation : $productfourn->date_creation), 'dayhour').'</td>';
+						if (!empty($arrayfields['pfp.datec']['checked'])) {
+							print '<td>'.dol_print_date(($productfourn->fourn_date_creation ? $productfourn->fourn_date_creation : $productfourn->date_creation), 'dayhour').'</td>';
+						}
 
 						// Supplier
-						print '<td>'.$productfourn->getSocNomUrl(1, 'supplier').'</td>';
+						if (!empty($arrayfields['s.nom']['checked'])) {
+							print '<td>'.$productfourn->getSocNomUrl(1, 'supplier').'</td>';
+						}
 
 						// Supplier ref
 						if ($usercancreate) // change required right here
 						{
 							print '<td class="left">'.$productfourn->getNomUrl().'</td>';
-						}
-						else
-						{
+						} else {
 							print '<td class="left">'.$productfourn->fourn_ref.'</td>';
 						}
 
 						// Availability
-						if (!empty($conf->global->FOURN_PRODUCT_AVAILABILITY))
+						if (!empty($arrayfields['pfp.fk_availability']['checked']))
 						{
 							$form->load_cache_availability();
                 			$availability = $form->cache_availability[$productfourn->fk_availability]['label'];
@@ -965,16 +985,18 @@ SCRIPT;
 						}
 
 						// Quantity
-						print '<td class="right">';
-						print $productfourn->fourn_qty;
-                        // Units
-                        if ($conf->global->PRODUCT_USE_UNITS) {
-                            $unit = $object->getLabelOfUnit();
-                            if ($unit !== '') {
-                                print '&nbsp;&nbsp;'.$langs->trans($unit);
-                            }
-                        }
-						print '</td>';
+						if (!empty($arrayfields['pfp.quantity']['checked'])) {
+							print '<td class="right">';
+							print $productfourn->fourn_qty;
+							// Units
+							if ($conf->global->PRODUCT_USE_UNITS) {
+								$unit = $object->getLabelOfUnit();
+								if ($unit !== '') {
+									print '&nbsp;&nbsp;'.$langs->trans($unit);
+								}
+							}
+							print '</td>';
+						}
 
 						// VAT rate
 						print '<td class="right">';
@@ -994,18 +1016,21 @@ SCRIPT;
                         }
 
 						// Unit price
-						print '<td class="right">';
-						print price($productfourn->fourn_unitprice);
-						//print $objp->unitprice? price($objp->unitprice) : ($objp->quantity?price($objp->price/$objp->quantity):"&nbsp;");
-						print '</td>';
+						if (!empty($arrayfields['pfp.unitprice']['checked'])) {
+							print '<td class="right">';
+							print price($productfourn->fourn_unitprice);
+							//print $objp->unitprice? price($objp->unitprice) : ($objp->quantity?price($objp->price/$objp->quantity):"&nbsp;");
+							print '</td>';
+						}
 
-                        if ($conf->multicurrency->enabled) {
-                            // Unit price in currency
+						// 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>';}
 
-                            // Currency
+						// Currency
+                        if ($conf->multicurrency->enabled) {
                             print '<td class="right">';
                             print $productfourn->fourn_multicurrency_code ? currency_name($productfourn->fourn_multicurrency_code) : '';
                             print '</td>';
@@ -1017,24 +1042,30 @@ SCRIPT;
 						print '</td>';
 
 						// Delivery delay
-						print '<td class="right">';
-						print $productfourn->delivery_time_days;
-						print '</td>';
+						if (!empty($arrayfields['pfp.delivery_time_days']['checked'])) {
+							print '<td class="right">';
+							print $productfourn->delivery_time_days;
+							print '</td>';
+						}
 
 						// Reputation
-						print '<td class="center">';
-						if (!empty($productfourn->supplier_reputation) && !empty($object->reputations[$productfourn->supplier_reputation])) {
-							print $object->reputations[$productfourn->supplier_reputation];
+						if (!empty($arrayfields['pfp.supplier_reputation']['checked'])) {
+							print '<td class="center">';
+							if (!empty($productfourn->supplier_reputation) && !empty($object->reputations[$productfourn->supplier_reputation])) {
+								print $object->reputations[$productfourn->supplier_reputation];
+							}
+							print'</td>';
 						}
-						print'</td>';
 
-						if ($conf->barcode->enabled) {
-                            // Barcode
+						// Barcode
+						if (!empty($arrayfields['pfp.barcode']['checked'])) {
                             print '<td align="right">';
                             print $productfourn->barcode;
-                            print '</td>';
+							print '</td>';
+						}
 
-                            // Barcode type
+						// 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();
@@ -1043,17 +1074,18 @@ SCRIPT;
 						}
 
 						// Packaging
-						if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
-						{
+						if (!empty($arrayfields['pfp.packaging']['checked'])) {
 							print '<td align="center">';
 							print price2num($productfourn->packaging);
 							print '</td>';
 						}
 
 						// Date
-						print '<td align="right">';
-						print dol_print_date(($productfourn->fourn_date_modification ? $productfourn->fourn_date_modification : $productfourn->date_modification), "dayhour");
-						print '</td>';
+						if (!empty($arrayfields['pfp.tms']['checked'])) {
+							print '<td align="right">';
+							print dol_print_date(($productfourn->fourn_date_modification ? $productfourn->fourn_date_modification : $productfourn->date_modification), "dayhour");
+							print '</td>';
+						}
 
 						// Extrafields
 						if (!empty($extralabels)) {
@@ -1068,14 +1100,14 @@ SCRIPT;
                             if ($resql) {
                                 if ($db->num_rows($resql) != 1) {
                                     foreach ($extralabels as $key => $value) {
-                                        if (!empty($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+                                        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($extrafields->attributes["product_fournisseur_price"]['list'][$key]) && $extrafields->attributes["product_fournisseur_price"]['list'][$key] != 3) {
+                                        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>";
                                         }
                                     }
@@ -1104,20 +1136,17 @@ SCRIPT;
 
 						print '</tr>';
 					}
-				}
-				else
-				{
+				} else {
 				    dol_print_error($db);
 				}
 
 				print '</table>';
 				print '</div>';
+				print '</form>';
 			}
 		}
 	}
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 6c5d1603168..53136237eca 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -224,9 +224,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 				if ($i < $nbmax)
 				{
 					$dataseries[] = array($obj->label, round($obj->nb));
-				}
-				else
-				{
+				} else {
 					$rest += $obj->nb;
 				}
 				$total += $obj->nb;
@@ -246,9 +244,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 			$dolgraph->setHeight('200');
 			$dolgraph->draw('idstatscategproduct');
 			print $dolgraph->show($total ? 0 : 1);
-		}
-		else
-		{
+		} else {
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
@@ -331,7 +327,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 					$sql = "SELECT label";
 					$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 					$sql .= " WHERE fk_product=".$objp->rowid;
-					$sql .= " AND lang='".$langs->getDefaultLang()."'";
+					$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
 
 					$resultd = $db->query($sql);
 					if ($resultd)
@@ -384,9 +380,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 			print '</div>';
 			print '<br>';
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -456,8 +450,7 @@ function activitytrim($product_type)
 
 			if ($product_type == 0)
 				print '<tr class="liste_titre"><td class=left>'.$langs->trans("ProductSellByQuarterHT").'</td>';
-			else
-				print '<tr class="liste_titre"><td class=left>'.$langs->trans("ServiceSellByQuarterHT").'</td>';
+			else print '<tr class="liste_titre"><td class=left>'.$langs->trans("ServiceSellByQuarterHT").'</td>';
 			print '<td class=right>'.$langs->trans("Quarter1").'</td>';
 			print '<td class=right>'.$langs->trans("Quarter2").'</td>';
 			print '<td class=right>'.$langs->trans("Quarter3").'</td>';
diff --git a/htdocs/product/inventory/ajax/ajax.inventory.php b/htdocs/product/inventory/ajax/ajax.inventory.php
index 1ea99480bd6..85dd488df6f 100644
--- a/htdocs/product/inventory/ajax/ajax.inventory.php
+++ b/htdocs/product/inventory/ajax/ajax.inventory.php
@@ -20,9 +20,7 @@ switch ($put)
 			$res = $det->update($user);
 
 			echo $det->qty_view;
-		}
-		else
-		{
+		} else {
 			echo -2;
 		}
 
@@ -40,9 +38,7 @@ switch ($put)
 			$det->update($user);
 
 			echo $det->new_pmp;
-		}
-		else
-		{
+		} else {
 			echo -2;
 		}
 
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 0e8ab8bda55..f7dbc1f6410 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -22,9 +22,11 @@
  */
 
 require '../../main.inc.php';
-include_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-include_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
-include_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
+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.'/product/inventory/class/inventory.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("stocks", "other"));
@@ -35,15 +37,13 @@ $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'inventorycard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $id);
-}
-else
-{
+} else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
 }
 
@@ -51,7 +51,7 @@ else
 $object = new Inventory($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->stock->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('inventorycard')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('inventorycard', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -59,11 +59,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 if (empty($action) && empty($id) && empty($ref)) $action = 'view';
@@ -78,13 +78,19 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
+	$permissiontoread = $user->rights->stock->lire;
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
-}
-else
-{
+	$permissionnote = $user->rights->stock->creer; // Used by the include of actions_setnotes.inc.php
+	$permissiondellink = $user->rights->stock->creer; // Used by the include of actions_dellink.inc.php
+	$upload_dir = $conf->stock->multidir_output[isset($object->entity) ? $object->entity : 1];
+} else {
+	$permissiontoread = $user->rights->stock->inventory_advance->read;
 	$permissiontoadd = $user->rights->stock->inventory_advance->write;
 	$permissiontodelete = $user->rights->stock->inventory_advance->write;
+	$permissionnote = $user->rights->stock->inventory_advance->write; // Used by the include of actions_setnotes.inc.php
+	$permissiondellink = $user->rights->stock->inventory_advance->write; // Used by the include of actions_dellink.inc.php
+	$upload_dir = $conf->stock->multidir_output[isset($object->entity) ? $object->entity : 1];
 }
 
 
@@ -102,7 +108,15 @@ if (empty($reshook))
 
 	$backurlforlist = DOL_URL_ROOT.'/product/inventory/list.php';
 
-	// Actions cancel, add, update, delete or clone
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+			else $backtopage = dol_buildpath('/product/inventory/card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
+	$triggermodname = 'STOCK_INVENTORY_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
 	// Actions when linking object each other
@@ -111,11 +125,26 @@ if (empty($reshook))
 	// Actions when printing a doc from card
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
+
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	/*if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MYOBJECT_MODIFY');
+	}*/
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
+
 	// Actions to send emails
-	/*$triggersendname = 'MYOBJECT_SENTBYMAIL';
-	$autocopy='MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
-	$trackid='myobject'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';*/
+	$triggersendname = 'INVENTORY_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_INVENTORY_TO';
+	$trackid = 'stockinv'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 
@@ -126,8 +155,12 @@ if (empty($reshook))
  */
 
 $form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
 
-llxHeader('', $langs->trans('Inventory'), '');
+$title = $langs->trans("Inventory");
+$help_url = '';
+llxHeader('', $title, $help_url);
 
 // Example : Adding jquery code
 print '<script type="text/javascript" language="javascript">
@@ -153,10 +186,14 @@ if ($action == 'create')
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
 	dol_fiche_head(array(), '');
 
+	// Set some default values
+	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
+
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
@@ -188,12 +225,13 @@ if (($id || $ref) && $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 '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 
 	dol_fiche_head();
 
-	print '<table class="border centpercent tableforfieldcreate">'."\n";
+	print '<table class="border centpercent tableforfieldedit">'."\n";
 
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
@@ -215,20 +253,19 @@ if (($id || $ref) && $action == 'edit')
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-    $res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
-    $head = inventoryPrepareHead($object);
+	$head = inventoryPrepareHead($object);
 	dol_fiche_head($head, 'card', $langs->trans("Inventory"), -1, 'stock');
 
 	$formconfirm = '';
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteInventory'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteInventory'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
-	if ($action == 'deleteline')
-	{
+	if ($action == 'deleteline') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
@@ -236,7 +273,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if ($action == 'clone') {
 		// Create an array for form
 		$formquestion = array();
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneMyObject', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+		$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')
+	{
+		$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(
+		 // '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))
+		 );
+		 */
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
 
 	// Call Hook formConfirm
@@ -265,19 +319,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	{
 	    $langs->load("projects");
 	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->inventory->creer)
+	    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 .= '<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>';
+	                //$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);
 	            }
@@ -286,7 +340,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	        if (! empty($object->fk_project)) {
 	            $proj = new Project($db);
 	            $proj->fetch($object->fk_project);
-	            $morehtmlref.=$proj->getNomUrl();
+	            $morehtmlref .= $proj->getNomUrl();
 	        } else {
 	            $morehtmlref.='';
 	        }
@@ -321,103 +375,118 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
-    	    // Send
-    		if (empty($user->socid)) {
-    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
-    		}
+		if (empty($reshook))
+		{
+			// Send
+			if (empty($user->socid)) {
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
+			}
 
-        	if ($permissiontoadd)
-    		{
-    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-    		}
-    		else
-    		{
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-    		}
+			// 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>';
+				}
+			}
 
-    		if ($permissiontoadd)
-    		{
-    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Validate").'</a>'."\n";
-    		}
-    		else
-    		{
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').'</a>'."\n";
-    		}
+			// Modify
+			if ($object->status == $object::STATUS_DRAFT)
+			{
+				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";
+				}
+			}
 
-    		if ($permissiontodelete)
+			// Validate
+			if ($object->status == $object::STATUS_DRAFT)
+			{
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").' ('.$langs->trans("Start").')</a>';
+				}
+			}
+
+			// Clone
+			/*if ($permissiontoadd)
     		{
-    			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$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";
+    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=myobject">'.$langs->trans("ToClone").'</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';
+		$action = 'presend';
 	}
 
 	if ($action != 'presend')
 	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    // Documents
-	    /*$objref = dol_sanitizeFileName($object->ref);
-	     $relativepath = $comref . '/' . $comref . '.pdf';
-	     $filedir = $conf->mymodule->dir_output . '/' . $objref;
-	     $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-	     $genallowed = $user->rights->mymodule->read;	// If you can read, you can build the PDF to read content
-	     $delallowed = $user->rights->mymodule->create;	// If you can create/edit, you can remove a file on card
-	     print $formfile->showdocuments('mymodule', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-	     */
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$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
+			print $formfile->showdocuments('mymodule:MyObject', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
 
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('inventory'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('inventory'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    $MAXEVENT = 10;
+		$MAXEVENT = 10;
 
-	    $morehtmlright = '<a href="'.dol_buildpath('/product/inventory/inventory_info.php', 1).'?id='.$object->id.'">';
-	    $morehtmlright .= $langs->trans("SeeAll");
-	    $morehtmlright .= '</a>';
+		$morehtmlright = '<a href="'.dol_buildpath('/product/inventory/inventory_info.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'inventory', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'inventory', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 
 	//Select mail models is same action as presend
-	/*
 	if (GETPOST('modelselected')) $action = 'presend';
 
 	// Presend form
-	$modelmail='inventory';
-	$defaulttopic='InformationMessage';
+	$modelmail = 'inventory';
+	$defaulttopic = 'InformationMessage';
 	$diroutput = $conf->product->dir_output.'/inventory';
 	$trackid = 'stockinv'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-	*/
 }
 
 // End of page
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index e24fe4e0ad2..cb9da997d18 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -49,6 +49,11 @@ class Inventory extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
 	/**
 	 * @var string String with name of icon for inventory
 	 */
@@ -120,8 +125,8 @@ class Inventory extends CommonObject
 	public $entity;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_warehouse;
 
 	/**
@@ -151,18 +156,18 @@ class Inventory extends CommonObject
 	public $tms;
 
 	/**
-     * @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_user_valid;
 
 	public $import_key;
@@ -228,7 +233,119 @@ class Inventory extends CommonObject
 	 */
 	public function create(User $user, $notrigger = false)
 	{
-		return $this->createCommon($user, $notrigger);
+		$result = $this->createCommon($user, $notrigger);
+
+		return $result;
+	}
+
+	/**
+	 * Validate inventory (start it)
+	 *
+	 * @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 validate(User $user, $notrigger = false)
+	{
+		$this->db->begin();
+
+		$result = 0;
+
+		if ($this->status == self::STATUS_DRAFT) {
+			// Delete inventory
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'inventorydet WHERE fk_inventory = '.$this->id;
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return -1;
+			}
+
+			// Scan existing stock to prefill the inventory
+			$sql = 'SELECT ps.rowid, ps.fk_entrepot as fk_warehouse, ps.fk_product, ps.reel,';
+			$sql .= ' pb.batch, pb.qty';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'product_stock as ps';
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_batch as pb ON pb.fk_product_stock = ps.rowid,';
+			$sql .= ' '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'entrepot as e';
+			$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
+			$sql .= ' AND ps.fk_product = p.rowid AND ps.fk_entrepot = e.rowid';
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0";
+			if ($this->fk_product > 0) $sql .= ' AND ps.fk_product = '.$this->fk_product;
+			if ($this->fk_warehouse > 0) $sql .= ' AND ps.fk_entrepot = '.$this->fk_warehouse;
+
+			$inventoryline = new InventoryLine($this->db);
+
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$num = $this->db->num_rows($resql);
+
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+
+					$inventoryline->fk_inventory = $this->id;
+					$inventoryline->fk_warehouse = $obj->fk_warehouse;
+					$inventoryline->fk_product = $obj->fk_product;
+					$inventoryline->batch = $obj->batch;
+					$inventoryline->qty_stock = ($obj->batch ? $obj->qty : $obj->reel); // If there is batch detail, we take qty for batch, else global qty
+					$inventoryline->datec = dol_now();
+
+					$resultline = $inventoryline->create($user);
+					if ($resultline <= 0) {
+						$this->error = $inventoryline->error;
+						$this->errors = $inventoryline->errors;
+						$result = -1;
+						break;
+					}
+
+					$i++;
+				}
+			} else {
+				$result = -1;
+				$this->error = $this->db->lasterror();
+			}
+		}
+
+		if ($result >= 0) {
+			$result = $this->setStatut($this::STATUS_VALIDATED, null, '', 'INVENTORY_VALIDATED');
+		}
+
+		if ($result > 0) {
+			$this->db->commit();
+		} else {
+			$this->db->rollback();
+		}
+	}
+
+	/**
+	 * Go back to draft
+	 *
+	 * @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 setDraft(User $user, $notrigger = false)
+	{
+		$this->db->begin();
+
+		// Delete inventory
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'inventorydet WHERE fk_inventory = '.$this->id;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+
+		$result = $this->setStatut($this::STATUS_DRAFT, null, '', 'INVENTORY_DRAFT');
+
+		if ($result > 0) {
+			$this->db->commit();
+		} else {
+			$this->db->rollback();
+		}
 	}
 
 	/**
@@ -334,45 +451,63 @@ class Inventory extends CommonObject
 		return $this->deleteCommon($user, $notrigger);
 	}
 
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0)
+		{
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		return $this->deleteLineCommon($user, $idline, $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
-     *  @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("Inventory").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("Inventory").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/product/inventory/card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/product/inventory/card.php', 1).'?id='.$this->id;
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowInventory");
-                $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("ShowInventory");
+				$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.'>';
@@ -393,12 +528,12 @@ class Inventory 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 			       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
 	 *
@@ -408,15 +543,18 @@ class Inventory extends CommonObject
 	 */
 	public static function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$labelStatus = array();
 		$labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
-		$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+		$labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated').' ('.$langs->trans('Started').')';
 		$labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
+		$labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+		$labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Started');
+		$labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
 
-		return dolGetStatus($labelStatus[$status], $labelStatus[$status], '', 'status'.$status, $mode);
+		return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', 'status'.$status, $mode);
 	}
 
 	/**
@@ -425,7 +563,7 @@ class Inventory extends CommonObject
 	 *	@param  int		$id       Id of order
 	 *	@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';
@@ -465,9 +603,7 @@ class Inventory extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -489,66 +625,92 @@ class Inventory extends CommonObject
  */
 class InventoryLine extends CommonObjectLine
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'inventoryline';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'inventoryline';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'inventorydet';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'inventorydet';
 
-    /**
-     * @var array  Does inventory support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     */
-    public $ismultientitymanaged = 0;
+	/**
+	 * @var array  Does inventory support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 */
+	public $ismultientitymanaged = 0;
 
-    /**
-     * @var string String with name of icon for inventory
-     */
-    public $picto = 'stock';
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 * @var string String with name of icon for inventory
+	 */
+	public $picto = 'stock';
+
+	/**
+	 *  '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).
+	 *  '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).
+	 *  '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.
+	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+	 *  'showoncombobox' if field must be shown into the label of combobox
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property
+	 */
+	public $fields = array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
+		'fk_inventory'  => array('type'=>'integer:Inventory:product/inventory/class/inventory.class.php', 'label'=>'Inventory', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'LinkToInventory'),
+		'fk_warehouse'  => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'LinkToThirparty'),
+		'fk_product'    => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'LinkToProduct'),
+		'batch'         => array('type'=>'string', 'label'=>'Batch', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'LinkToProduct'),
+		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
+		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
+		'qty_stock'     => array('type'=>'double', 'label'=>'QtyFound', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'Qty we found/want (to define during draft edition)'),
+		'qty_view'      => array('type'=>'double', 'label'=>'QtyBefore', 'visible'=>1, 'enabled'=>1, 'position'=>33, 'index'=>1, 'help'=>'Qty before (filled once movements are validated)'),
+		'qty_regulated' => array('type'=>'double', 'label'=>'QtyDelta', 'visible'=>1, 'enabled'=>1, 'position'=>34, 'index'=>1, 'help'=>'Qty aadded or removed (filled once movements are validated)'),
+	);
+
+	/**
+	 * @var int ID
+	 */
+	public $rowid;
+
+	public $fk_inventory;
+	public $fk_warehouse;
+	public $fk_product;
+	public $batch;
+	public $datec;
+	public $tms;
+	public $qty_stock;
+	public $qty_view;
+	public $qty_regulated;
 
 
-    /**
-     *  '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).
-     *  '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).
-     *  '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.
-     *  'default' is a default value for creation (can still be replaced by the global setup of default values)
-     *  'showoncombobox' if field must be shown into the label of combobox
-     */
-
-    // BEGIN MODULEBUILDER PROPERTIES
-    /**
-     * @var array  Array with all fields and their property
-     */
-    public $fields = array(
-        'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
-        'fk_inventory'  => array('type'=>'integer:Inventory:product/inventory/class/inventory.class.php', 'label'=>'Inventory', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'LinkToInventory'),
-        'fk_warehouse'  => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'LinkToThirparty'),
-        'fk_product'    => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'LinkToProduct'),
-        'batch'         => array('type'=>'string', 'label'=>'Batch', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'LinkToProduct'),
-        'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
-        'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
-        'qty_stock'     => array('type'=>'double', 'label'=>'QtyFound', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'Qty we found/want (to define during draft edition)'),
-        'qty_view'      => array('type'=>'double', 'label'=>'QtyBefore', 'visible'=>1, 'enabled'=>1, 'position'=>33, 'index'=>1, 'help'=>'Qty before (filled once movements are validated)'),
-        'qty_regulated' => array('type'=>'double', 'label'=>'QtyDelta', 'visible'=>1, 'enabled'=>1, 'position'=>34, 'index'=>1, 'help'=>'Qty aadded or removed (filled once movements are validated)'),
-    );
-
-    /**
-     * @var int ID
-     */
-    public $rowid;
-
+	/**
+	 * Create object in database
+	 *
+	 * @param User $user       User that creates
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		return $this->createCommon($user, $notrigger);
+	}
 
 	/**
 	 * Load object in memory from the database
@@ -559,9 +721,9 @@ class InventoryLine extends CommonObjectLine
 	 */
 	public function fetch($id, $ref = null)
 	{
-	    $result = $this->fetchCommon($id, $ref);
-	    //if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
-	    return $result;
+		$result = $this->fetchCommon($id, $ref);
+		//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		return $result;
 	}
 
 	/**
@@ -573,7 +735,7 @@ class InventoryLine extends CommonObjectLine
 	 */
 	public function update(User $user, $notrigger = false)
 	{
-	    return $this->updateCommon($user, $notrigger);
+		return $this->updateCommon($user, $notrigger);
 	}
 
 	/**
@@ -585,7 +747,7 @@ class InventoryLine extends CommonObjectLine
 	 */
 	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);
 	}
 }
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 3f0989251b5..37f1cb9721a 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -23,11 +23,13 @@
 
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("stocks", "other"));
+$langs->loadLangs(array("stocks", "other", "productbatch"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -35,15 +37,18 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'inventorycard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 
+$fk_warehouse = GETPOST('fk_warehouse', 'int');
+$fk_product = GETPOST('fk_product', 'int');
+$lineid = GETPOST('lineid', 'int');
+$batch = GETPOST('batch', 'alphanohtml');
+
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $id);
-}
-else
-{
+} else {
 	$result = restrictedArea($user, 'stock', $id, '', 'inventory_advance');
 }
 
@@ -59,11 +64,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 if (empty($action) && empty($id) && empty($ref)) $action = 'view';
@@ -80,13 +85,13 @@ if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$permissiontoadd = $user->rights->stock->creer;
 	$permissiontodelete = $user->rights->stock->supprimer;
-}
-else
-{
+} else {
 	$permissiontoadd = $user->rights->stock->inventory_advance->write;
 	$permissiontodelete = $user->rights->stock->inventory_advance->write;
 }
 
+$now = dol_now();
+
 
 /*
  * Actions
@@ -117,6 +122,50 @@ if (empty($reshook))
 	$autocopy='MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
 	$trackid='myobject'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';*/
+
+	if (GETPOST('addline', 'alpha')) {
+		if ($fk_warehouse <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+		}
+		if ($fk_product <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product")), null, 'errors');
+		}
+
+		if (!$error && !empty($conf->productbatch->enabled)) {
+			$tmpproduct = new Product($db);
+			$result = $tmpproduct->fetch($fk_product);
+
+			if (!$error && $tmpproduct->status_batch && !$batch) {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorProductNeedBatchNumber", $tmpproduct->ref), null, 'errors');
+			}
+			if (!$error && !$tmpproduct->status_batch && $batch) {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("ErrorProductDoesNotNeedBatchNumber", $tmpproduct->ref), null, 'errors');
+			}
+		}
+		if (!$error) {
+			$tmp = new InventoryLine($db);
+			$tmp->fk_inventory = $object->id;
+			$tmp->fk_warehouse = $fk_warehouse;
+			$tmp->fk_product = $fk_product;
+			$tmp->batch = $batch;
+			$tmp->datec = $now;
+
+			$result = $tmp->create($user);
+			if ($result < 0) {
+				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+					setEventMessages($langs->trans("DuplicateRecord"), null, 'errors');
+				} else {
+					dol_print_error($db, $tmp->error, $tmp->errors);
+				}
+			}
+		}
+	}
 }
 
 
@@ -127,6 +176,7 @@ if (empty($reshook))
  */
 
 $form = new Form($db);
+$formproduct = new FormProduct($db);
 
 llxHeader('', $langs->trans('Inventory'), '');
 
@@ -149,16 +199,16 @@ jQuery(document).ready(function() {
 // Part to show record
 if ($object->id > 0)
 {
-    $res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
-    $head = inventoryPrepareHead($object);
+	$head = inventoryPrepareHead($object);
 	dol_fiche_head($head, 'inventory', $langs->trans("Inventory"), -1, 'stock');
 
 	$formconfirm = '';
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteInventory'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteInventory'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
@@ -254,7 +304,7 @@ if ($object->id > 0)
 
 
 	// Buttons for actions
-	if ($action == 'edit') {
+	if ($action == 'record') {
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update">';
@@ -268,40 +318,55 @@ if ($object->id > 0)
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 		print '<br>';
-	}
-	else {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '</form>';
+	} else {
+		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))
-    	{
-    		if ($object->status == Inventory::STATUS_DRAFT)
-    		{
-    			if ($permissiontoadd)
-    			{
-    				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Edit").'</a>'."\n";
-    			}
-    			else
-    			{
-    				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Edit').'</a>'."\n";
-    			}
-    		}
+		if (empty($reshook))
+		{
+			if ($object->status == Inventory::STATUS_DRAFT)
+			{
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_validate&confirm=yes">'.$langs->trans("Validate").' ('.$langs->trans("Start").')</a>'."\n";
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').' ('.$langs->trans("Start").')</a>'."\n";
+				}
+			}
 
-    		if ($object->status == Inventory::STATUS_DRAFT)
-    		{
-	        	if ($permissiontoadd)
-	    		{
-	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans("Validate").'</a>'."\n";
-	    		}
-	    		else
-	    		{
-	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Validate').'</a>'."\n";
-	    		}
-    		}
+			if ($object->status == Inventory::STATUS_VALIDATED)
+			{
+				if ($permissiontoadd)
+				{
+					/*
+    				if ($conf->barcode->enabled) {
+    					print '<a href="#" class="butAction">'.$langs->trans("UpdateByScaningProductBarcode").'</a>';
+    				}
+    				if ($conf->productbatch->enabled) {
+    					print '<a href="#" class="butAction">'.$langs->trans('UpdateByScaningLot').'</a>';
+    				}*/
+					if ($conf->barcode->enabled || $conf->productbatch->enabled) {
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning" class="butAction">'.$langs->trans("UpdateByScaning").'</a>';
+					}
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Save').'</a>'."\n";
+				}
+			}
 
-    		/*if ($object->status == Inventory::STATUS_VALIDATED)
+			if ($object->status == Inventory::STATUS_VALIDATED)
+			{
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=record">'.$langs->trans("Finish").'</a>'."\n";
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Finish').'</a>'."\n";
+				}
+			}
+
+			/*if ($object->status == Inventory::STATUS_VALIDATED)
     		{
 	    		if ($permissiontoadd)
 	    		{
@@ -312,10 +377,24 @@ if ($object->id > 0)
 	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('RecordVerb').'</a>'."\n";
 	    		}
     		}*/
-    	}
-    	print '</div>'."\n";
+		}
+		print '</div>'."\n";
 	}
 
+	if ($action == 'updatebyscaning') {
+		print '<div class="div-for-modal">';
+
+		print 'TODO';
+
+		print '</div>';
+	}
+
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="updateinventorylines">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 	print '<div class="fichecenter">';
 	//print '<div class="fichehalfleft">';
@@ -334,24 +413,51 @@ if ($object->id > 0)
 		print $langs->trans("Batch");
 		print '</td>';
 	}
-	print '<td class="right">'.$langs->trans("RecordedQty").'</td>';
-	print '<td class="right">'.$langs->trans("RealQty").'</td>';
-	print '<td>';
+	print '<td class="right">'.$langs->trans("ExpectedQty").'</td>';
+	print '<td class="center">';
+	print $form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp"));
+	print '</td>';
+	// Actions
+	print '<td class="center">';
 	print '</td>';
 	print '</tr>';
 
+	// Line to add a new line in inventory
+	//if ($action == 'addline') {
+	if ($object->status == $object::STATUS_VALIDATED) {
+		print '<tr>';
+		print '<td>';
+		print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? GETPOST('fk_warehouse', 'int') : $object->fk_warehouse), 'fk_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'maxwidth300');
+		print '</td>';
+		print '<td>';
+		print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOST('fk_product', 'int') : $object->fk_product), 'fk_product', '', 0, 0, 1, 2, '', 0, null, 0, '1', 0, 'maxwidth300');
+		print '</td>';
+		if ($conf->productbatch->enabled) {
+			print '<td>';
+			print '<input type="text" name="batch" class="maxwidth100" value="'.(GETPOSTISSET('batch') ? GETPOST('batch') : '').'">';
+			print '</td>';
+		}
+		print '<td class="right"></td>';
+		print '<td class="center">';
+		print '<input type="submit" class="button paddingrightonly" name="addline" value="'.$langs->trans("Add").'">';
+		//print '<input type="submit" class="button paddingrightonly" name="canceladdline" value="'.$langs->trans("Cancel").'">';
+		print '</td>';
+		// Actions
+		print '<td class="center">';
+		print '</td>';
+		print '</tr>';
+	}
 
-	$sql = 'SELECT ps.rowid, ps.fk_entrepot as fk_warehouse, ps.fk_product';
-	$sql .= ' FROM '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'entrepot as e';
-	$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
-	$sql .= ' AND ps.fk_product = p.rowid AND ps.fk_entrepot = e.rowid';
-	if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0";
-	if ($object->fk_product > 0) $sql .= ' AND ps.fk_product = '.$object->fk_product;
-	if ($object->fk_warehouse > 0) $sql .= ' AND ps.fk_entrepot = '.$object->fk_warehouse;
+	// Request to show lines of inventory (prefilled during creation)
+	$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
+	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
+	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
+	$sql .= ' WHERE id.fk_inventory = '.$object->id;
 
 	$cacheOfProducts = array();
 	$cacheOfWarehouses = array();
 
+	//$sql = '';
 	$resql = $db->query($sql);
 	if ($resql)
 	{
@@ -395,18 +501,18 @@ if ($object->id > 0)
 
 			if ($conf->productbatch->enabled) {
 				print '<td>';
-				print '';
+				print $obj->batch;
 				print '</td>';
 			}
 
-			print '<td>';
-			print '';
+			print '<td class="right">';
+			print 'TODO';
 			print '</td>';
-			print '<td>';
-			print '';
+			print '<td class="center">';
+			print '<input type="text" class="maxwidth75" name="id_'.$obj->rowid.' value="'.GETPOST("id_".$obj->rowid).'">';
 			print '</td>';
-			print '<td>';
-			print '';
+			print '<td class="right">';
+			print '<a class="reposition" href="'.DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id.'&lineid='.$obj->rowid.'&action=deleteline&token='.newToken().'">'.img_delete().'</a>';
 			print '</td>';
 
 			print '</tr>';
@@ -418,14 +524,19 @@ if ($object->id > 0)
 	}
 
 	print '</table>';
-	print '</div>';
 
-	//print '</div>';
-	print '</div>';
-
-	if ($action == 'edit') {
-		print '</form>';
+	// Save
+	if ($object->status == $object::STATUS_VALIDATED) {
+		print '<div class="center">';
+		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+		print '</div>';
 	}
+
+	print '</div>';
+
+	print '</div>';
+
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/product/inventory/lib/inventory.lib.php b/htdocs/product/inventory/lib/inventory.lib.php
index da2b626ab5c..47fa1e53510 100644
--- a/htdocs/product/inventory/lib/inventory.lib.php
+++ b/htdocs/product/inventory/lib/inventory.lib.php
@@ -73,48 +73,3 @@ function inventoryPrepareHead(&$inventory, $title = 'Inventory', $get = '')
 		array(dol_buildpath('/product/inventory/inventory.php?id='.$inventory->id.$get, 1), $langs->trans('Inventory'), 'inventory')
 	);
 }
-
-
-
-/**
- *  Define head array for tabs of inventory tools setup pages
- *
- *  @param   Inventory  $inventory      Object inventory
- *
- *  @return string                      html of products
- */
-function inventorySelectProducts(&$inventory)
-{
-	global $conf, $db, $langs;
-
-	$except_product_id = array();
-
-	foreach ($inventory->Inventorydet as $Inventorydet)
-	{
-		$except_product_id[] = $Inventorydet->fk_product;
-	}
-
-	ob_start();
-	$form = new Form($db);
-	$form->select_produits(-1, 'fk_product');
-
-	$TChildWarehouses = array($inventory->fk_warehouse);
-	$e = new Entrepot($db);
-	$e->fetch($inventory->fk_warehouse);
-	if (method_exists($e, 'get_children_warehouses')) $e->get_children_warehouses($e->id, $TChildWarehouses);
-
-	$Tab = array();
-	$sql = 'SELECT rowid, label
-			FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid IN('.implode(', ', $TChildWarehouses).')';
-	if (method_exists($e, 'get_children_warehouses')) $sql .= ' ORDER BY fk_parent';
-	$resql = $db->query($sql);
-	while ($res = $db->fetch_object($resql)) {
-		$Tab[$res->rowid] = $res->label;
-	}
-	print '&nbsp;&nbsp;&nbsp;';
-	print $langs->trans('Warehouse').' : '.$form::selectarray('fk_warehouse', $Tab);
-
-	$select_html = ob_get_clean();
-
-	return $select_html;
-}
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index f3f7621b821..09947e80ac7 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -45,8 +45,8 @@ $id = GETPOST('id', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -76,14 +76,12 @@ if ($user->socid > 0)	// Protection if external user
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
 	$result = restrictedArea($user, 'stock', $objectid);
-}
-else
-{
+} else {
 	$result = restrictedArea($user, 'stock', $objectid, '', 'inventory_advance');
 }
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -255,9 +253,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -378,8 +374,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		}
-		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index efe63001349..4abf8fd4a8b 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -38,15 +38,16 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 if (!empty($conf->categorie->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('products', 'stocks', 'suppliers', 'companies'));
+$langs->loadLangs(array('products', 'stocks', 'suppliers', 'companies', 'margins'));
 if (!empty($conf->productbatch->enabled)) $langs->load("productbatch");
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -63,6 +64,8 @@ $searchCategoryProductOperator = (GETPOST('search_category_product_operator', 'i
 $searchCategoryProductList = GETPOST('search_category_product_list', 'array');
 $search_tosell = GETPOST("search_tosell", 'int');
 $search_tobuy = GETPOST("search_tobuy", 'int');
+$search_country = GETPOST("search_country", 'int');
+$search_state = GETPOST("state_id", 'int');
 $fourn_id = GETPOST("fourn_id", 'int');
 $catid = GETPOST('catid', 'int');
 $search_tobatch = GETPOST("search_tobatch", 'int');
@@ -105,6 +108,7 @@ $object = new Product($db);
 $hookmanager->initHooks(array('productservicelist'));
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
+$formcompany = new FormCompany($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -123,9 +127,9 @@ if (!empty($canvas))
 }
 
 // Security check
-if ($search_type == '0') $result = restrictedArea($user, 'produit', '', '', '', '', '', $objcanvas);
-elseif ($search_type == '1') $result = restrictedArea($user, 'service', '', '', '', '', '', $objcanvas);
-else $result = restrictedArea($user, 'produit|service', '', '', '', '', '', $objcanvas);
+if ($search_type == '0') $result = restrictedArea($user, 'produit', '', '', '', '', '', 0);
+elseif ($search_type == '1') $result = restrictedArea($user, 'service', '', '', '', '', '', 0);
+else $result = restrictedArea($user, 'produit|service', '', '', '', '', '', 0);
 
 // Define virtualdiffersfromphysical
 $virtualdiffersfromphysical = 0;
@@ -157,7 +161,7 @@ if (!empty($conf->global->MAIN_MULTILANGS))
 }
 if (!empty($conf->barcode->enabled)) {
 	$fieldstosearchall['p.barcode'] = 'Gencod';
-    $fieldstosearchall['pfp.barcode'] = 'GencodBuyPrice';
+	$fieldstosearchall['pfp.barcode'] = 'GencodBuyPrice';
 }
 // Personalized search criterias. Example: $conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS = 'p.ref=ProductRef;p.label=ProductLabel'
 if (!empty($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS)) $fieldstosearchall = dolExplodeIntoArray($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS);
@@ -184,38 +188,58 @@ $arrayfields = array(
 	'p.finished'=>array('label'=>$langs->trans("Nature"), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && $type != '1'), 'position'=>19),
 	'p.weight'=>array('label'=>$langs->trans('Weight'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && $type != '1'), 'position'=>20),
 	'p.weight_units'=>array('label'=>$langs->trans('WeightUnits'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && $type != '1'), 'position'=>21),
-    'p.length'=>array('label'=>$langs->trans('Length'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>22),
+	'p.length'=>array('label'=>$langs->trans('Length'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>22),
 	'p.length_units'=>array('label'=>$langs->trans('LengthUnits'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>23),
 	'p.width'=>array('label'=>$langs->trans('Width'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>24),
 	'p.width_units'=>array('label'=>$langs->trans('WidthUnits'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>25),
-    'p.height'=>array('label'=>$langs->trans('Height'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>26),
+	'p.height'=>array('label'=>$langs->trans('Height'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>26),
 	'p.height_units'=>array('label'=>$langs->trans('HeightUnits'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SIZE) && $type != '1'), 'position'=>27),
-    'p.surface'=>array('label'=>$langs->trans('Surface'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SURFACE) && $type != '1'), 'position'=>28),
+	'p.surface'=>array('label'=>$langs->trans('Surface'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SURFACE) && $type != '1'), 'position'=>28),
 	'p.surface_units'=>array('label'=>$langs->trans('SurfaceUnits'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_SURFACE) && $type != '1'), 'position'=>29),
-    'p.volume'=>array('label'=>$langs->trans('Volume'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_VOLUME) && $type != '1'), 'position'=>30),
+	'p.volume'=>array('label'=>$langs->trans('Volume'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_VOLUME) && $type != '1'), 'position'=>30),
 	'p.volume_units'=>array('label'=>$langs->trans('VolumeUnits'), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && empty($conf->global->PRODUCT_DISABLE_VOLUME) && $type != '1'), 'position'=>31),
-    'cu.label'=>array('label'=>$langs->trans("DefaultUnitToShow"), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && !empty($conf->global->PRODUCT_USE_UNITS)), 'position'=>32),
-    'p.sellprice'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES), 'position'=>40),
+	'cu.label'=>array('label'=>$langs->trans("DefaultUnitToShow"), 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && !empty($conf->global->PRODUCT_USE_UNITS)), 'position'=>32),
+	'p.sellprice'=>array('label'=>$langs->trans("SellingPrice"), 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES), 'position'=>40),
 	'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>41),
 	'p.numbuyprice'=>array('label'=>$langs->trans("BuyingPriceNumShort"), 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>42),
-    'p.tva_tx'=>array('label'=>$langs->trans("VATRate"), 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>43),
-    'p.pmp'=>array('label'=>$langs->trans("PMPValueShort"), 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>44),
+	'p.tva_tx'=>array('label'=>$langs->trans("VATRate"), 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>43),
+	'p.pmp'=>array('label'=>$langs->trans("PMPValueShort"), 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>44),
+	'p.cost_price'=>array('label'=>$langs->trans("CostPrice"), 'checked'=>0, 'enabled'=>(!empty($user->rights->fournisseur->lire)), 'position'=>45),
 	'p.seuil_stock_alerte'=>array('label'=>$langs->trans("StockLimit"), 'checked'=>0, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service'), 'position'=>50),
 	'p.desiredstock'=>array('label'=>$langs->trans("DesiredStock"), 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service'), 'position'=>51),
 	'p.stock'=>array('label'=>$langs->trans("PhysicalStock"), 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service'), 'position'=>52),
 	'stock_virtual'=>array('label'=>$langs->trans("VirtualStock"), 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service' && $virtualdiffersfromphysical), 'position'=>53),
 	'p.tobatch'=>array('label'=>$langs->trans("ManageLotSerial"), 'checked'=>0, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>60),
-	'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),
-    'p.accountancy_code_buy_intra'=>array('label'=>$langs->trans("ProductAccountancyBuyIntraCode"), 'checked'=>0, 'enabled'=>$isInEEC, 'position'=>404),
-    'p.accountancy_code_buy_export'=>array('label'=>$langs->trans("ProductAccountancyBuyExportCode"), 'checked'=>0, 'position'=>405),
+	'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_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),
+	'p.accountancy_code_buy_intra'=>array('label'=>$langs->trans("ProductAccountancyBuyIntraCode"), 'checked'=>0, 'enabled'=>$isInEEC, 'position'=>404),
+	'p.accountancy_code_buy_export'=>array('label'=>$langs->trans("ProductAccountancyBuyExportCode"), 'checked'=>0, 'position'=>405),
 	'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
 	'p.tosell'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Sell").')', 'checked'=>1, 'position'=>1000),
 	'p.tobuy'=>array('label'=>$langs->trans("Status").' ('.$langs->trans("Buy").')', 'checked'=>1, 'position'=>1000)
 );
+
+// MultiPrices
+if ($conf->global->PRODUIT_MULTIPRICES) {
+	for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+	{
+		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
+		if (!empty($conf->global->$keyforlabel)) {
+			$labelp = $i.' - '.$langs->trans($conf->global->$keyforlabel);
+		} else {
+			$labelp = $langs->trans("SellingPrice")." ".$i;
+		}
+		$arrayfields['p.sellprice'.$i] = array('label'=>$labelp, 'checked'=>1, 'enabled'=>$conf->global->PRODUIT_MULTIPRICES, 'position'=>40);
+		$arraypricelevel[$i] = array($i);
+	}
+}
+
+//var_dump($arraypricelevel);
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
 {
@@ -253,10 +277,12 @@ if (empty($reshook))
 		$search_ref = "";
 		$search_label = "";
 		$search_barcode = "";
-        $searchCategoryProductOperator = 0;
-        $searchCategoryProductList = array();
+		$searchCategoryProductOperator = 0;
+		$searchCategoryProductList = array();
 		$search_tosell = "";
 		$search_tobuy = "";
+		$search_country = "";
+		$search_state = "";
 		$search_vatrate = "";
 		$search_tobatch = '';
 		//$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.
@@ -287,8 +313,6 @@ if (empty($reshook))
  * View
  */
 
-$htmlother = new FormOther($db);
-
 $title = $langs->trans("ProductsAndServices");
 
 if ($search_type != '' && $search_type != '-1')
@@ -296,14 +320,10 @@ if ($search_type != '' && $search_type != '-1')
 	if ($search_type == 1)
 	{
 		$texte = $langs->trans("Services");
-	}
-	else
-	{
+	} else {
 		$texte = $langs->trans("Products");
 	}
-}
-else
-{
+} else {
 	$texte = $langs->trans("ProductsAndServices");
 }
 
@@ -311,8 +331,8 @@ $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p
 $sql .= ' p.fk_product_type, p.duration, p.finished, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
 $sql .= ' p.tobatch, 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 .= ' p.datec as date_creation, p.tms as date_update, p.pmp, p.stock,';
-$sql .= ' p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units,';
+$sql .= ' p.datec as date_creation, p.tms as date_update, p.pmp, p.stock, p.cost_price,';
+$sql .= ' p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, fk_country, fk_state,';
 if (!empty($conf->global->PRODUCT_USE_UNITS))   $sql .= ' p.fk_unit, cu.label as cu_label,';
 $sql .= ' MIN(pfp.unitprice) as minsellprice';
 if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts)) {
@@ -331,7 +351,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 if (!empty($searchCategoryProductList) || !empty($catid)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 // multilang
-if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang()."'";
+if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$db->escape($langs->getDefaultLang())."'";
 
 if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts)) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";
@@ -363,30 +383,32 @@ if ($catid > 0)     $sql .= " AND cp.fk_categorie = ".$catid;
 if ($catid == -2)   $sql .= " AND cp.fk_categorie IS NULL";
 $searchCategoryProductSqlList = array();
 if ($searchCategoryProductOperator == 1) {
-    foreach ($searchCategoryProductList as $searchCategoryProduct) {
-        if (intval($searchCategoryProduct) == -2) {
-            $searchCategoryProductSqlList[] = "cp.fk_categorie IS NULL";
-        } elseif (intval($searchCategoryProduct) > 0) {
-            $searchCategoryProductSqlList[] = "cp.fk_categorie = ".$db->escape($searchCategoryProduct);
-        }
-    }
-    if (!empty($searchCategoryProductSqlList)) {
-        $sql .= " AND (".implode(' OR ', $searchCategoryProductSqlList).")";
-    }
+	foreach ($searchCategoryProductList as $searchCategoryProduct) {
+		if (intval($searchCategoryProduct) == -2) {
+			$searchCategoryProductSqlList[] = "cp.fk_categorie IS NULL";
+		} elseif (intval($searchCategoryProduct) > 0) {
+			$searchCategoryProductSqlList[] = "cp.fk_categorie = ".$db->escape($searchCategoryProduct);
+		}
+	}
+	if (!empty($searchCategoryProductSqlList)) {
+		$sql .= " AND (".implode(' OR ', $searchCategoryProductSqlList).")";
+	}
 } else {
-    foreach ($searchCategoryProductList as $searchCategoryProduct) {
-        if (intval($searchCategoryProduct) == -2) {
-            $searchCategoryProductSqlList[] = "cp.fk_categorie IS NULL";
-        } elseif (intval($searchCategoryProduct) > 0) {
-            $searchCategoryProductSqlList[] = "p.rowid IN (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product WHERE fk_categorie = ".$searchCategoryProduct.")";
-        }
-    }
-    if (!empty($searchCategoryProductSqlList)) {
-        $sql .= " AND (".implode(' AND ', $searchCategoryProductSqlList).")";
-    }
+	foreach ($searchCategoryProductList as $searchCategoryProduct) {
+		if (intval($searchCategoryProduct) == -2) {
+			$searchCategoryProductSqlList[] = "cp.fk_categorie IS NULL";
+		} elseif (intval($searchCategoryProduct) > 0) {
+			$searchCategoryProductSqlList[] = "p.rowid IN (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product WHERE fk_categorie = ".$searchCategoryProduct.")";
+		}
+	}
+	if (!empty($searchCategoryProductSqlList)) {
+		$sql .= " AND (".implode(' AND ', $searchCategoryProductSqlList).")";
+	}
 }
 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_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);
@@ -403,8 +425,8 @@ $sql .= $hookmanager->resPrint;
 $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.tva_tx, p.price_ttc, p.price_base_type,";
 $sql .= " p.fk_product_type, p.duration, p.finished, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
 $sql .= ' p.datec, p.tms, p.entity, p.tobatch, 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, p.pmp, p.stock,';
-$sql .= ' p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units';
+$sql .= ' p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export, p.pmp, p.cost_price, p.stock,';
+$sql .= ' p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, p.fk_country, p.fk_state';
 if (!empty($conf->global->PRODUCT_USE_UNITS))   $sql .= ', p.fk_unit, cu.label';
 
 if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts)) {
@@ -457,8 +479,7 @@ if ($resql)
 		if ($search_type == 0)
 		{
 			$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-		}
-		elseif ($search_type == 1)
+		} elseif ($search_type == 1)
 		{
 			$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 		}
@@ -475,17 +496,19 @@ if ($resql)
 	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 ($searchCategoryProductOperator == 1) $param .= "&search_category_product_operator=".urlencode($searchCategoryProductOperator);
-    foreach ($searchCategoryProductList as $searchCategoryProduct) {
-        $param .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
-    }
+	if ($searchCategoryProductOperator == 1) $param .= "&search_category_product_operator=".urlencode($searchCategoryProductOperator);
+	foreach ($searchCategoryProductList as $searchCategoryProduct) {
+		$param .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
+	}
 	if ($search_ref) $param = "&search_ref=".urlencode($search_ref);
 	if ($search_ref_supplier) $param = "&search_ref_supplier=".urlencode($search_ref_supplier);
 	if ($search_barcode) $param .= ($search_barcode ? "&search_barcode=".urlencode($search_barcode) : "");
 	if ($search_label) $param .= "&search_label=".urlencode($search_label);
 	if ($search_tosell != '') $param .= "&search_tosell=".urlencode($search_tosell);
 	if ($search_tobuy != '') $param .= "&search_tobuy=".urlencode($search_tobuy);
-    if ($search_vatrate) $sql .= natural_search('p.tva_tx', $search_vatrate);
+	if ($search_country != '') $param .= "&search_country=".urlencode($search_country);
+	if ($search_state != '') $param .= "&search_state=".urlencode($search_state);
+	if ($search_vatrate) $sql .= natural_search('p.tva_tx', $search_vatrate);
 	if ($fourn_id > 0) $param .= ($fourn_id ? "&fourn_id=".$fourn_id : "");
 	//if ($seach_categ) $param.=($search_categ?"&search_categ=".urlencode($search_categ):"");
 	if ($show_childproducts) $param .= ($show_childproducts ? "&search_show_childproducts=".urlencode($show_childproducts) : "");
@@ -505,10 +528,10 @@ 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"),
 	);
-    $rightskey = 'produit';
+	$rightskey = 'produit';
 	if ($type == Product::TYPE_SERVICE) $rightskey = 'service';
 	if ($user->rights->{$rightskey}->supprimer) $arrayofmassactions['predelete'] = "<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
@@ -518,21 +541,18 @@ if ($resql)
 	if ($type === "") $perm = ($user->rights->produit->creer || $user->rights->service->creer);
 	elseif ($type == Product::TYPE_SERVICE) $perm = $user->rights->service->creer;
 	elseif ($type == Product::TYPE_PRODUCT) $perm = $user->rights->produit->creer;
-	if ($perm)
-	{
-		$oldtype = $type;
-		$params = array();
-		if ($type === "") $params['forcenohideoftext'] = 1;
-		if ($type === "") {
-			$newcardbutton .= dolGetButtonTitle($langs->trans('NewProduct'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0', '', 1, $params);
-			$type = Product::TYPE_SERVICE;
-		}
-		$label = 'NewProduct';
-		if ($type == Product::TYPE_SERVICE) $label = 'NewService';
-		$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type='.$type, '', 1, $params);
+	$oldtype = $type;
+	$params = array();
+	if ($type === "") $params['forcenohideoftext'] = 1;
+	if ($type === "") {
+		$newcardbutton .= dolGetButtonTitle($langs->trans('NewProduct'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type=0', '', $perm, $params);
+		$type = Product::TYPE_SERVICE;
+	}
+	$label = 'NewProduct';
+	if ($type == Product::TYPE_SERVICE) $label = 'NewService';
+	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type='.$type, '', $perm, $params);
 
-        $type = $oldtype;
-    }
+	$type = $oldtype;
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -573,15 +593,15 @@ if ($resql)
 
 	// Filter on categories
 	$moreforfilter = '';
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('Categories').': ';
 		$categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1);
-        $categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
-        $moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300');
-        $moreforfilter .= ' <input type="checkbox" class="valignmiddle" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/> '.$langs->trans('UseOrOperatorForCategories');
-        $moreforfilter .= '</div>';
+		$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
+		$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300');
+		$moreforfilter .= ' <input type="checkbox" class="valignmiddle" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/> <span class="opacitymedium">'.$langs->trans('UseOrOperatorForCategories').'</span>';
+		$moreforfilter .= '</div>';
 	}
 
 	//Show/hide child products. Hidden by default
@@ -634,7 +654,7 @@ if ($resql)
 	// Type
 	if (!empty($arrayfields['p.fk_product_type']['checked']))
 	{
-		print '<td class="liste_titre left">';
+		print '<td class="liste_titre center">';
 		$array = array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
 		print $form->selectarray('search_type', $array, $search_type);
 		print '</td>';
@@ -662,8 +682,8 @@ if ($resql)
 	// Weight
 	if (!empty($arrayfields['p.weight']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Weight units
 	if (!empty($arrayfields['p.weight_units']['checked'])) {
@@ -673,30 +693,30 @@ if ($resql)
 	// Length
 	if (!empty($arrayfields['p.length']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Length units
 	if (!empty($arrayfields['p.length_units']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-    // Width
-    if (!empty($arrayfields['p.width']['checked'])) {
-        print '<td class="liste_titre">';
-        print '</td>';
-    }
+	// Width
+	if (!empty($arrayfields['p.width']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	// Width units
 	if (!empty($arrayfields['p.width_units']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-    // Height
-    if (!empty($arrayfields['p.height']['checked']))
-    {
-        print '<td class="liste_titre">';
-        print '</td>';
-    }
+	// Height
+	if (!empty($arrayfields['p.height']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 	// Height units
 	if (!empty($arrayfields['p.height_units']['checked'])) {
 		print '<td class="liste_titre">';
@@ -705,8 +725,8 @@ if ($resql)
 	// Surface
 	if (!empty($arrayfields['p.surface']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Surface units
 	if (!empty($arrayfields['p.surface_units']['checked'])) {
@@ -716,8 +736,8 @@ if ($resql)
 	// Volume
 	if (!empty($arrayfields['p.volume']['checked']))
 	{
-	    print '<td class="liste_titre">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '</td>';
 	}
 	// Volume units
 	if (!empty($arrayfields['p.volume_units']['checked'])) {
@@ -726,11 +746,11 @@ if ($resql)
 	}
 
 	// Unit
-    if (!empty($arrayfields['cu.label']['checked']))
-    {
-        print '<td class="liste_titre">';
-        print '</td>';
-    }
+	if (!empty($arrayfields['cu.label']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
 
 	// Sell price
 	if (!empty($arrayfields['p.sellprice']['checked']))
@@ -738,6 +758,19 @@ if ($resql)
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
+
+	// Multiprice
+	if ($conf->global->PRODUIT_MULTIPRICES) {
+		foreach ($arraypricelevel as $key => $value)
+		{
+			if (!empty($arrayfields['p.sellprice'.$key]['checked']))
+			{
+				print '<td class="liste_titre right">';
+				print '</td>';
+			}
+		}
+	}
+
 	// Minimum buying Price
 	if (!empty($arrayfields['p.minbuyprice']['checked']))
 	{
@@ -752,13 +785,13 @@ if ($resql)
 		print '&nbsp;';
 		print '</td>';
 	}
-    // Sell price
-    if (!empty($arrayfields['p.tva_tx']['checked']))
-    {
-        print '<td class="liste_titre right">';
-        print '<input class="right flat maxwidth50" placeholder="%" type="text" name="search_vatrate" size="1" value="'.dol_escape_htmltag($search_vatrate).'">';
-        print '</td>';
-    }
+	// Sell price
+	if (!empty($arrayfields['p.tva_tx']['checked']))
+	{
+		print '<td class="liste_titre right">';
+		print '<input class="right flat maxwidth50" placeholder="%" type="text" name="search_vatrate" size="1" value="'.dol_escape_htmltag($search_vatrate).'">';
+		print '</td>';
+	}
 	// WAP
 	if (!empty($arrayfields['p.pmp']['checked']))
 	{
@@ -766,6 +799,13 @@ if ($resql)
 		print '&nbsp;';
 		print '</td>';
 	}
+	// cost_price
+	if (!empty($arrayfields['p.cost_price']['checked']))
+	{
+		print '<td class="liste_titre">';
+		print '&nbsp;';
+		print '</td>';
+	}
 	// Limit for alert
 	if (!empty($arrayfields['p.seuil_stock_alerte']['checked']))
 	{
@@ -786,6 +826,10 @@ if ($resql)
 	if (!empty($arrayfields['stock_virtual']['checked'])) print '<td class="liste_titre">&nbsp;</td>';
 	// To batch
 	if (!empty($arrayfields['p.tobatch']['checked'])) print '<td class="liste_titre center">'.$form->selectyesno($search_tobatch, '', '', '', 1).'</td>';
+	// Country
+	if (!empty($arrayfields['p.fk_country']['checked'])) print '<td class="liste_titre center">'.$form->select_country($search_country, 'search_country', '', 0).'</td>';
+	// State
+	if (!empty($arrayfields['p.fk_state']['checked'])) print '<td class="liste_titre center">'.$formcompany->select_state($search_state, $search_country).'</td>';
 	// Accountancy code sell
 	if (!empty($arrayfields['p.accountancy_code_sell']['checked']))        print '<td class="liste_titre"><input class="flat maxwidth75" type="text" name="search_accountancy_code_sell" value="'.dol_escape_htmltag($search_accountancy_code_sell).'"></td>';
 	if (!empty($arrayfields['p.accountancy_code_sell_intra']['checked']))  print '<td class="liste_titre"><input class="flat maxwidth75" type="text" name="search_accountancy_code_sell_intra" value="'.dol_escape_htmltag($search_accountancy_code_sell_intra).'"></td>';
@@ -833,25 +877,25 @@ if ($resql)
 
 	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['p.ref']['checked'])) {
-        print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {
-        print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"], "pfp.ref_fourn", "", $param, "", $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['p.label']['checked'])) {
-        print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], "p.label", "", $param, "", $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['p.fk_product_type']['checked'])) {
-        print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"], "p.fk_product_type", "", $param, "", $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['p.barcode']['checked'])) {
-        print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"], "p.barcode", "", $param, "", $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['p.duration']['checked'])) {
-        print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"], "p.duration", "", $param, '', $sortfield, $sortorder, 'center ');
-    }
+		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {
+		print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"], "pfp.ref_fourn", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.label']['checked'])) {
+		print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], "p.label", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.fk_product_type']['checked'])) {
+		print_liste_field_titre($arrayfields['p.fk_product_type']['label'], $_SERVER["PHP_SELF"], "p.fk_product_type", "", $param, "", $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['p.barcode']['checked'])) {
+		print_liste_field_titre($arrayfields['p.barcode']['label'], $_SERVER["PHP_SELF"], "p.barcode", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.duration']['checked'])) {
+		print_liste_field_titre($arrayfields['p.duration']['label'], $_SERVER["PHP_SELF"], "p.duration", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
 	if (!empty($arrayfields['p.finished']['checked'])) {
-        print_liste_field_titre($arrayfields['p.finished']['label'], $_SERVER["PHP_SELF"], "p.finished", "", $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre($arrayfields['p.finished']['label'], $_SERVER["PHP_SELF"], "p.finished", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
 
 	if (!empty($arrayfields['p.weight']['checked']))  		print_liste_field_titre($arrayfields['p.weight']['label'], $_SERVER['PHP_SELF'], 'p.weight', '', $param, '', $sortfield, $sortorder, 'center ');
@@ -866,49 +910,70 @@ if ($resql)
 	if (!empty($arrayfields['p.surface_units']['checked'])) print_liste_field_titre($arrayfields['p.surface_units']['label'], $_SERVER['PHP_SELF'], 'p.surface_units', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['p.volume']['checked']))  		print_liste_field_titre($arrayfields['p.volume']['label'], $_SERVER['PHP_SELF'], 'p.volume', '', $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['p.volume_units']['checked']))  print_liste_field_titre($arrayfields['p.volume_units']['label'], $_SERVER['PHP_SELF'], 'p.volume_units', '', $param, '', $sortfield, $sortorder, 'center ');
-    if (!empty($arrayfields['cu.label']['checked']))  		print_liste_field_titre($arrayfields['cu.label']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'center ');
-    if (!empty($arrayfields['p.sellprice']['checked'])) {
-        print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['p.minbuyprice']['checked'])) {
-        print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['p.numbuyprice']['checked'])) {
-        print_liste_field_titre($arrayfields['p.numbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['p.tva_tx']['checked'])) {
-        print_liste_field_titre($arrayfields['p.tva_tx']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['p.pmp']['checked'])) {
-        print_liste_field_titre($arrayfields['p.pmp']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) {
-        print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['p.desiredstock']['checked'])) {
-        print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"], "p.desiredstock", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['p.stock']['checked'])) {
-        print_liste_field_titre($arrayfields['p.stock']['label'], $_SERVER["PHP_SELF"], "p.stock", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
+	if (!empty($arrayfields['cu.label']['checked']))  		print_liste_field_titre($arrayfields['cu.label']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['p.sellprice']['checked'])) {
+		print_liste_field_titre($arrayfields['p.sellprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+
+	// Multiprices
+	if ($conf->global->PRODUIT_MULTIPRICES) {
+		foreach ($arraypricelevel as $key => $value)
+		{
+			if (!empty($arrayfields['p.sellprice'.$key]['checked']))
+			{
+				print_liste_field_titre($arrayfields['p.sellprice'.$key]['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+			}
+		}
+	}
+
+	if (!empty($arrayfields['p.minbuyprice']['checked'])) {
+		print_liste_field_titre($arrayfields['p.minbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['p.numbuyprice']['checked'])) {
+		print_liste_field_titre($arrayfields['p.numbuyprice']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['p.tva_tx']['checked'])) {
+		print_liste_field_titre($arrayfields['p.tva_tx']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['p.pmp']['checked'])) {
+		print_liste_field_titre($arrayfields['p.pmp']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['p.cost_price']['checked'])) {
+		print_liste_field_titre($arrayfields['p.cost_price']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) {
+		print_liste_field_titre($arrayfields['p.seuil_stock_alerte']['label'], $_SERVER["PHP_SELF"], "p.seuil_stock_alerte", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['p.desiredstock']['checked'])) {
+		print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"], "p.desiredstock", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['p.stock']['checked'])) {
+		print_liste_field_titre($arrayfields['p.stock']['label'], $_SERVER["PHP_SELF"], "p.stock", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
 	if (!empty($arrayfields['stock_virtual']['checked'])) {
-        print_liste_field_titre($arrayfields['stock_virtual']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
+		print_liste_field_titre($arrayfields['stock_virtual']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
 	if (!empty($arrayfields['p.tobatch']['checked'])) {
-        print_liste_field_titre($arrayfields['p.tobatch']['label'], $_SERVER["PHP_SELF"], "p.tobatch", "", $param, '', $sortfield, $sortorder, 'center ');
-    }
+		print_liste_field_titre($arrayfields['p.tobatch']['label'], $_SERVER["PHP_SELF"], "p.tobatch", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['p.fk_country']['checked'])) {
+		print_liste_field_titre($arrayfields['p.fk_country']['label'], $_SERVER["PHP_SELF"], "p.fk_country", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.fk_state']['checked'])) {
+		print_liste_field_titre($arrayfields['p.fk_state']['label'], $_SERVER["PHP_SELF"], "p.fk_state", "", $param, '', $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['p.accountancy_code_sell']['checked'])) {
-        print_liste_field_titre($arrayfields['p.accountancy_code_sell']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_sell", "", $param, '', $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['p.accountancy_code_sell_intra']['checked'])) {
-        print_liste_field_titre($arrayfields['p.accountancy_code_sell_intra']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_sell_intra", "", $param, '', $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['p.accountancy_code_sell_export']['checked'])) {
-        print_liste_field_titre($arrayfields['p.accountancy_code_sell_export']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_sell_export", "", $param, '', $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['p.accountancy_code_buy']['checked'])) {
-        print_liste_field_titre($arrayfields['p.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_buy", "", $param, '', $sortfield, $sortorder);
-    }
+		print_liste_field_titre($arrayfields['p.accountancy_code_sell']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_sell", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.accountancy_code_sell_intra']['checked'])) {
+		print_liste_field_titre($arrayfields['p.accountancy_code_sell_intra']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_sell_intra", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.accountancy_code_sell_export']['checked'])) {
+		print_liste_field_titre($arrayfields['p.accountancy_code_sell_export']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_sell_export", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.accountancy_code_buy']['checked'])) {
+		print_liste_field_titre($arrayfields['p.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_buy", "", $param, '', $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['p.accountancy_code_buy_intra']['checked'])) {
 		print_liste_field_titre($arrayfields['p.accountancy_code_buy_intra']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_buy_intra", "", $param, '', $sortfield, $sortorder);
 	}
@@ -921,20 +986,20 @@ if ($resql)
 	$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['p.datec']['checked'])) {
-        print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
-    if (!empty($arrayfields['p.tms']['checked'])) {
-        print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
-    if (!empty($arrayfields['p.tosell']['checked'])) {
-        print_liste_field_titre($arrayfields['p.tosell']['label'], $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['p.tobuy']['checked'])) {
-        print_liste_field_titre($arrayfields['p.tobuy']['label'], $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-    print "</tr>\n";
+	if (!empty($arrayfields['p.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['p.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['p.tosell']['checked'])) {
+		print_liste_field_titre($arrayfields['p.tosell']['label'], $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['p.tobuy']['checked'])) {
+		print_liste_field_titre($arrayfields['p.tobuy']['label'], $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	print "</tr>\n";
 
 
 	$product_static = new Product($db);
@@ -993,9 +1058,9 @@ if ($resql)
 		$product_static->volume_units = $obj->volume_units;
 		$product_static->surface = $obj->surface;
 		$product_static->surface_units = $obj->surface_units;
-        if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-            $product_static->fk_unit = $obj->fk_unit;
-        }
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$product_static->fk_unit = $obj->fk_unit;
+		}
 
 		// STOCK_DISABLE_OPTIM_LOAD can be set to force load_stock whatever is permissions on stock.
 		if ((!empty($conf->stock->enabled) && $user->rights->stock->lire && $search_type != 1) || !empty($conf->global->STOCK_DISABLE_OPTIM_LOAD))	// To optimize call of load_stock
@@ -1038,9 +1103,21 @@ if ($resql)
 		// Type
 		if (!empty($arrayfields['p.fk_product_type']['checked']))
 		{
-			print '<td>';
-			if ($obj->fk_product_type == 0) print $langs->trans("Product");
-			else print $langs->trans("Service");
+			print '<td class="center">';
+			$s = '';
+			if ($obj->fk_product_type == 0)
+			{
+				//$s .= '<a class="product-type-back" title="'.$langs->trans("Product").'">';
+				$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
+				//$s .= dol_substr($langs->trans("Product"), 0, 1);
+				//$s .= '</a>';
+			} else {
+				//$s .= '<span class="service-type-back" title="'.$langs->trans("Service").'">';
+				$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
+				//$s .= dol_substr($langs->trans("Service"), 0, 1);
+				//$s .= '</a>';
+			}
+			print $s;
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
@@ -1064,16 +1141,14 @@ if ($resql)
 
 				if ((float) $duration_value > 1)
 				{
-				    $dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
-				}
-				elseif ((float) $duration_value > 0)
+					$dur = array("i"=>$langs->trans("Minutes"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
+				} elseif ((float) $duration_value > 0)
 				{
-				    $dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
+					$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
 				}
 				print $duration_value;
 				print ((!empty($duration_unit) && isset($dur[$duration_unit]) && $duration_value != '') ? ' '.$langs->trans($dur[$duration_unit]) : '');
-			}
-			elseif (!preg_match('/^[a-z]$/i', $obj->duration))		// If duration is a simple char (like 's' of 'm'), we do not show value
+			} elseif (!preg_match('/^[a-z]$/i', $obj->duration))		// If duration is a simple char (like 's' of 'm'), we do not show value
 			{
 				print $obj->duration;
 			}
@@ -1094,10 +1169,10 @@ if ($resql)
 		// Weight
 		if (!empty($arrayfields['p.weight']['checked']))
 		{
-		    print '<td class="center">';
-		    print $obj->weight;
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">';
+			print $obj->weight;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Weight units
 		if (!empty($arrayfields['p.weight_units']['checked'])) {
@@ -1109,10 +1184,10 @@ if ($resql)
 		// Length
 		if (!empty($arrayfields['p.length']['checked']))
 		{
-		    print '<td class="center">';
-		    print $obj->length;
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">';
+			print $obj->length;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Length units
 		if (!empty($arrayfields['p.length_units']['checked'])) {
@@ -1121,14 +1196,14 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-        // Width
-        if (!empty($arrayfields['p.width']['checked']))
-        {
-            print '<td align="center">';
-            print $obj->width;
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-        }
+		// Width
+		if (!empty($arrayfields['p.width']['checked']))
+		{
+			print '<td align="center">';
+			print $obj->width;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Width units
 		if (!empty($arrayfields['p.width_units']['checked'])) {
 			print '<td class="center">';
@@ -1136,14 +1211,14 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-        // Height
-        if (!empty($arrayfields['p.height']['checked']))
-        {
-            print '<td align="center">';
-            print $obj->height;
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-        }
+		// Height
+		if (!empty($arrayfields['p.height']['checked']))
+		{
+			print '<td align="center">';
+			print $obj->height;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Height units
 		if (!empty($arrayfields['p.height_units']['checked'])) {
 			print '<td class="center">';
@@ -1154,10 +1229,10 @@ if ($resql)
 		// Surface
 		if (!empty($arrayfields['p.surface']['checked']))
 		{
-		    print '<td class="center">';
-		    print $obj->surface;
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">';
+			print $obj->surface;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Surface units
 		if (!empty($arrayfields['p.surface_units']['checked'])) {
@@ -1169,10 +1244,10 @@ if ($resql)
 		// Volume
 		if (!empty($arrayfields['p.volume']['checked']))
 		{
-		    print '<td class="center">';
-		    print $obj->volume;
-		    print '</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td class="center">';
+			print $obj->volume;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Volume units
 		if (!empty($arrayfields['p.volume_units']['checked'])) {
@@ -1181,16 +1256,16 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-        // Unit
-        if (!empty($arrayfields['cu.label']['checked']))
-        {
-            print '<td align="center">';
-            if (!empty($obj->cu_label)) {
-                print $langs->trans($obj->cu_label);
-            }
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-        }
+		// Unit
+		if (!empty($arrayfields['cu.label']['checked']))
+		{
+			print '<td align="center">';
+			if (!empty($obj->cu_label)) {
+				print $langs->trans($obj->cu_label);
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
 		// Sell price
 		if (!empty($arrayfields['p.sellprice']['checked']))
@@ -1205,6 +1280,40 @@ if ($resql)
 			if (!$i) $totalarray['nbfield']++;
 		}
 
+
+		// Multiprices
+		if ($conf->global->PRODUIT_MULTIPRICES) {
+			foreach ($arraypricelevel as $key => $value)
+			{
+				if (!empty($arrayfields['p.sellprice'.$key]['checked']))
+				{
+					print '<td class="right nowraponall">';
+					if ($obj->tosell)
+					{
+						// TODO Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
+						// then reuse the cache array if we need prices for other price levels
+						$resultp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price";
+						$resultp .= " FROM ".MAIN_DB_PREFIX."product_price as p";
+						$resultp .= " WHERE fk_product = ".$obj->rowid;
+						$resultp .= " AND p.price_level = ".$key;
+						$resultp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+						$resultp = $db->query($resultp);
+						if ($resultp)
+						{
+							$objp = $db->fetch_object($resultp);
+								if ($obj->price_base_type == 'TTC') print price($objp->price_ttc).' '.$langs->trans("TTC");
+							else print price($objp->price).' '.$langs->trans("HT");
+								$db->free($resultp);
+						} else {
+							dol_print_error($db);
+						}
+					}
+					print '</td>';
+					if (!$i) $totalarray['nbfield']++;
+				}
+			}
+		}
+
 		// Better buy price
 		if (!empty($arrayfields['p.minbuyprice']['checked']))
 		{
@@ -1220,8 +1329,7 @@ if ($resql)
 						{
 							$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);
 							print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"), $htmltext);
-						}
-						else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
+						} else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");
 					}
 				}
 			}
@@ -1244,14 +1352,14 @@ if ($resql)
 			print '</td>';
 		}
 
-        // Sell Tax Rate
-        if (!empty($arrayfields['p.tva_tx']['checked']))
-        {
-            print '<td class="right">';
-            print vatrate($obj->tva_tx, true);
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-        }
+		// VAT or Sell Tax Rate
+		if (!empty($arrayfields['p.tva_tx']['checked']))
+		{
+			print '<td class="right">';
+			print vatrate($obj->tva_tx, true);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
 		// WAP
 		if (!empty($arrayfields['p.pmp']['checked']))
@@ -1260,6 +1368,14 @@ if ($resql)
 			print price($product_static->pmp, 1, $langs);
 			print '</td>';
 		}
+		// Cost price
+		if (!empty($arrayfields['p.cost_price']['checked']))
+		{
+			print '<td class="nowrap right">';
+			//print $obj->cost_price;
+			print price($obj->cost_price).' '.$langs->trans("HT");
+			print '</td>';
+		}
 
 		// Limit alert
 		if (!empty($arrayfields['p.seuil_stock_alerte']['checked']))
@@ -1315,6 +1431,20 @@ if ($resql)
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+		// Country
+		if (!empty($arrayfields['p.fk_country']['checked']))
+		{
+			print '<td>'.getCountry($obj->fk_country, 0, $db).'</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// State
+		if (!empty($arrayfields['p.fk_state']['checked']))
+		{
+			print '<td>';
+			if (!empty($obj->fk_state)) print  getState($obj->fk_state, 0, $db);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 		// Accountancy code sell
 		if (!empty($arrayfields['p.accountancy_code_sell']['checked']))
 		{
@@ -1323,13 +1453,13 @@ if ($resql)
 		}
 		if (!empty($arrayfields['p.accountancy_code_sell_intra']['checked']))
 		{
-		    print '<td>'.$obj->accountancy_code_sell_intra.'</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td>'.$obj->accountancy_code_sell_intra.'</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		if (!empty($arrayfields['p.accountancy_code_sell_export']['checked']))
 		{
-		    print '<td>'.$obj->accountancy_code_sell_export.'</td>';
-		    if (!$i) $totalarray['nbfield']++;
+			print '<td>'.$obj->accountancy_code_sell_export.'</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 		// Accountancy code buy
 		if (!empty($arrayfields['p.accountancy_code_buy']['checked']))
@@ -1415,9 +1545,7 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 	print '</form>';
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/popucom.php b/htdocs/product/popucom.php
deleted file mode 100644
index 2c28266ad15..00000000000
--- a/htdocs/product/popucom.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file       htdocs/product/popucom.php
- * \ingroup    commande, produit
- * \brief      Liste des produits/services par popularite
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-
-// Load translation files required by the page
-//Required to translate NbOfCommande
-$langs->load('commande');
-
-$type = GETPOST("type", "int");
-
-// Security check
-if (!empty($user->socid)) $socid = $user->socid;
-$result = restrictedArea($user, 'produit|service');
-
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-if (!$sortfield) $sortfield = "c";
-if (!$sortorder) $sortorder = "DESC";
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
-
-$staticproduct = new Product($db);
-
-
-/*
- * View
- */
-
-$helpurl = '';
-if ($type == '0')
-{
-    $helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-}
-elseif ($type == '1')
-{
-    $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-}
-else
-{
-    $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-}
-$title = $langs->trans("Statistics");
-
-
-llxHeader('', $title, $helpurl);
-
-print load_fiche_titre($title, $mesg, 'product');
-
-
-$param = '';
-$title = $langs->trans("ListProductServiceByPopularity");
-if ((string) $type == '1') {
-	$title = $langs->trans("ListServiceByPopularity");
-}
-if ((string) $type == '0') {
-	$title = $langs->trans("ListProductByPopularity");
-}
-
-if ($type != '') $param .= '&type='.$type;
-
-
-$h = 0;
-$head = array();
-
-$head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php?id=all';
-$head[$h][1] = $langs->trans("Chart");
-$head[$h][2] = 'chart';
-$h++;
-
-$head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php';
-$head[$h][1] = $langs->trans("PopuProp");
-$head[$h][2] = 'popularityprop';
-$h++;
-
-$head[$h][0] = DOL_URL_ROOT.'/product/popucom.php';
-$head[$h][1] = $langs->trans("PopuCom");
-$head[$h][2] = 'popularitycommande';
-$h++;
-
-dol_fiche_head($head, 'popularitycommande', $langs->trans("Statistics"), -1);
-
-
-// Array of liens to show
-$infoprod = array();
-
-
-// Add lines for commande
-$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, SUM(pd.qty) as c";
-$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as pd";
-$sql .= ", ".MAIN_DB_PREFIX."product as p";
-$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
-$sql .= " AND p.rowid = pd.fk_product";
-if ($type !== '') {
-	$sql .= " AND fk_product_type = ".$type;
-}
-$sql .= " GROUP BY p.rowid, p.label, p.ref, p.fk_product_type";
-
-$result = $db->query($sql);
-if ($result)
-{
-    $totalnboflines = $db->num_rows($result);
-}
-
-$sql .= $db->order($sortfield, $sortorder);
-$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);
-
-        $infoprod[$objp->rowid] = array('type'=>$objp->type, 'ref'=>$objp->ref, 'label'=>$objp->label);
-        $infoprod[$objp->rowid]['nblinecommande'] = $objp->c;
-
-        $i++;
-    }
-    $db->free($resql);
-}
-else
-{
-    dol_print_error($db);
-}
-//var_dump($infoprod);
-
-
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $totalnboflines, '');
-
-print '<table class="noborder centpercent">';
-
-print "<tr class=\"liste_titre\">";
-print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
-print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'p.fk_product_type', '', $param, '', $sortfield, $sortorder);
-print_liste_field_titre('Label', $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
-print_liste_field_titre('NbOfQtyInOrders', $_SERVER["PHP_SELF"], 'c', '', $param, '', $sortfield, $sortorder, 'right ');
-print "</tr>\n";
-
-foreach ($infoprod as $prodid => $vals)
-{
-	// Multilangs
-	if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-	{
-		$sql = "SELECT label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-		$sql .= " WHERE fk_product=".$prodid;
-		$sql .= " AND lang='".$langs->getDefaultLang()."'";
-		$sql .= " LIMIT 1";
-
-		$resultp = $db->query($sql);
-		if ($resultp)
-		{
-			$objtp = $db->fetch_object($resultp);
-			if (!empty($objtp->label)) $vals['label'] = $objtp->label;
-		}
-	}
-
-	print "<tr>";
-	print '<td><a href="'.DOL_URL_ROOT.'/product/stats/card.php?id='.$prodid.'">';
-	if ($vals['type'] == 1) print img_object($langs->trans("ShowService"), "service");
-	else print img_object($langs->trans("ShowProduct"), "product");
-	print " ";
-	print $vals['ref'].'</a></td>';
-	print '<td>';
-	if ($vals['type'] == 1) print $langs->trans("Service");
-	else print $langs->trans("Product");
-	print '</td>';
-	print '<td>'.$vals['label'].'</td>';
-	print '<td class="right">'.$vals['nblinecommande'].'</td>';
-	print "</tr>\n";
-	$i++;
-}
-
-print "</table>";
-
-
-
-dol_fiche_end();
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index bf2ae9020ec..7e5015b7813 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.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
@@ -22,18 +22,21 @@
 
 /**
  * \file       htdocs/product/popuprop.php
- * \ingroup    propal, produit
- * \brief      Liste des produits/services par popularite
+ * \ingroup    propal, commande, facture, produit
+ * \brief      List of products or services by popularity
  */
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 // Load translation files required by the page
-//Required to translate NbOfProposals
-$langs->load('propal');
+$langs->loadLangs(array('commande', 'propal', 'bills', 'other'));
+
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
 $type = GETPOST("type", "int");
+$mode = GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : '';
 
 // Security check
 if (!empty($user->socid)) $socid = $user->socid;
@@ -58,17 +61,14 @@ $staticproduct = new Product($db);
  * View
  */
 
+$form = new Form($db);
+
 $helpurl = '';
-if ($type == '0')
-{
+if ($type == '0') {
 	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
-}
-elseif ($type == '1')
-{
+} elseif ($type == '1') {
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-}
-else
-{
+} else {
 	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 $title = $langs->trans("Statistics");
@@ -88,8 +88,8 @@ if ((string) $type == '0') {
 	$title = $langs->trans("ListProductByPopularity");
 }
 
-if ($type != '') $param .= '&type='.$type;
-
+if ($type != '') $param .= '&type='.urlencode($type);
+if ($mode != '') $param .= '&mode='.urlencode($mode);
 
 $h = 0;
 $head = array();
@@ -100,25 +100,30 @@ $head[$h][2] = 'chart';
 $h++;
 
 $head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php';
-$head[$h][1] = $langs->trans("PopuProp");
-$head[$h][2] = 'popularityprop';
+$head[$h][1] = $langs->trans("ProductsPerPopularity");
+$head[$h][2] = 'popularity';
 $h++;
 
-$head[$h][0] = DOL_URL_ROOT.'/product/popucom.php';
-$head[$h][1] = $langs->trans("PopuCom");
-$head[$h][2] = 'popularitycommande';
-$h++;
 
-dol_fiche_head($head, 'popularityprop', $langs->trans("Statistics"), -1);
+dol_fiche_head($head, 'popularity', $langs->trans("Statistics"), -1);
 
 
 // Array of liens to show
 $infoprod = array();
 
 
-// Add lines for proposals
+// Add lines for object
 $sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, SUM(pd.qty) as c";
-$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
+$textforqty = 'Qty';
+if ($mode == 'facture') {
+	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as pd";
+} elseif ($mode == 'commande') {
+	$textforqty = 'NbOfQtyInOrders';
+	$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as pd";
+} elseif ($mode == 'propal') {
+	$textforqty = 'NbOfQtyInProposals';
+	$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd";
+}
 $sql .= ", ".MAIN_DB_PREFIX."product as p";
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 $sql .= " AND p.rowid = pd.fk_product";
@@ -127,40 +132,58 @@ if ($type !== '') {
 }
 $sql .= " GROUP BY p.rowid, p.label, p.ref, p.fk_product_type";
 
-$result = $db->query($sql);
-if ($result)
-{
-	$totalnboflines = $db->num_rows($result);
-}
-
-$sql .= $db->order($sortfield, $sortorder);
-$sql .= $db->plimit($limit + 1, $offset);
-
-$resql = $db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	while ($i < $num)
+if (! empty($mode) && $mode != '-1') {
+	$result = $db->query($sql);
+	if ($result)
 	{
-		$objp = $db->fetch_object($resql);
-
-		$infoprod[$objp->rowid] = array('type'=>$objp->type, 'ref'=>$objp->ref, 'label'=>$objp->label);
-		$infoprod[$objp->rowid]['nblineproposal'] = $objp->c;
-
-		$i++;
+		$totalnboflines = $db->num_rows($result);
+	}
+
+	$sql .= $db->order($sortfield, $sortorder);
+	$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);
+
+			$infoprod[$objp->rowid] = array('type'=>$objp->type, 'ref'=>$objp->ref, 'label'=>$objp->label);
+			$infoprod[$objp->rowid]['nbline'] = $objp->c;
+
+			$i++;
+		}
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
 	}
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
 }
 //var_dump($infoprod);
 
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $totalnboflines, '');
+$arrayofmode = array(
+	'propal' => 'Proposals',
+	'commande' => 'Orders',
+	'facture' => 'Facture'
+	);
+$title .= ' '.$form->selectarray('mode', $arrayofmode, $mode, 1);
+$title .= ' <input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
+
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+print '<input type="hidden" name="type" value="'.$type.'">';
+print '<input type="hidden" name="action" value="add">';
+if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $totalnboflines, '', 0, '', '', -1, 0, 0, 1);
 
 print '<table class="noborder centpercent">';
 
@@ -168,47 +191,50 @@ print "<tr class=\"liste_titre\">";
 print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
 print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'p.fk_product_type', '', $param, '', $sortfield, $sortorder);
 print_liste_field_titre('Label', $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
-print_liste_field_titre('NbOfQtyInProposals', $_SERVER["PHP_SELF"], 'c', '', $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre($textforqty, $_SERVER["PHP_SELF"], 'c', '', $param, '', $sortfield, $sortorder, 'right ');
 print "</tr>\n";
 
-foreach ($infoprod as $prodid => $vals)
-{
-	// Multilangs
-	if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
+if ($mode && $mode != '-1') {
+	foreach ($infoprod as $prodid => $vals)
 	{
-		$sql = "SELECT label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-		$sql .= " WHERE fk_product=".$prodid;
-		$sql .= " AND lang='".$langs->getDefaultLang()."'";
-		$sql .= " LIMIT 1";
-
-		$resultp = $db->query($sql);
-		if ($resultp)
+		// Multilangs
+		if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
 		{
-			$objtp = $db->fetch_object($resultp);
-			if (!empty($objtp->label)) $vals['label'] = $objtp->label;
+			$sql = "SELECT label";
+			$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+			$sql .= " WHERE fk_product=".$prodid;
+			$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
+			$sql .= " LIMIT 1";
+
+			$resultp = $db->query($sql);
+			if ($resultp)
+			{
+				$objtp = $db->fetch_object($resultp);
+				if (!empty($objtp->label)) $vals['label'] = $objtp->label;
+			}
 		}
+
+		print "<tr>";
+		print '<td><a href="'.DOL_URL_ROOT.'/product/stats/card.php?id='.$prodid.'">';
+		if ($vals['type'] == 1) print img_object($langs->trans("ShowService"), "service");
+		else print img_object($langs->trans("ShowProduct"), "product");
+		print " ";
+		print $vals['ref'].'</a></td>';
+		print '<td>';
+		if ($vals['type'] == 1) print $langs->trans("Service");
+		else print $langs->trans("Product");
+		print '</td>';
+		print '<td>'.$vals['label'].'</td>';
+		print '<td class="right">'.$vals['nbline'].'</td>';
+		print "</tr>\n";
+		$i++;
 	}
-
-	print "<tr>";
-	print '<td><a href="'.DOL_URL_ROOT.'/product/stats/card.php?id='.$prodid.'">';
-	if ($vals['type'] == 1) print img_object($langs->trans("ShowService"), "service");
-	else print img_object($langs->trans("ShowProduct"), "product");
-	print " ";
-	print $vals['ref'].'</a></td>';
-	print '<td>';
-	if ($vals['type'] == 1) print $langs->trans("Service");
-	else print $langs->trans("Product");
-	print '</td>';
-	print '<td>'.$vals['label'].'</td>';
-	print '<td class="right">'.$vals['nblineproposal'].'</td>';
-	print "</tr>\n";
-	$i++;
+} else {
+	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("SelectTheTypeOfObjectToAnalyze").'</span></td></tr>';
 }
-
 print "</table>";
 
-
+print '</form>';
 
 dol_fiche_end();
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 1bf94b28cde..c97e22b9166 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -53,7 +53,7 @@ $mesg = ''; $error = 0; $errors = array();
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $eid = GETPOST('eid', 'int');
 
@@ -90,96 +90,94 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_soc = '';
-    }
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_soc = '';
+	}
 
-    if ($action == 'setlabelsellingprice' && $user->admin)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-        $keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.GETPOST('pricelevel');
-        dolibarr_set_const($db, $keyforlabel, GETPOST('labelsellingprice', 'alpha'), 'chaine', 0, '', $conf->entity);
-        $action = '';
-    }
+	if ($action == 'setlabelsellingprice' && $user->admin)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.GETPOST('pricelevel');
+		dolibarr_set_const($db, $keyforlabel, GETPOST('labelsellingprice', 'alpha'), 'chaine', 0, '', $conf->entity);
+		$action = '';
+	}
 
 	if (($action == 'update_vat') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
-	    $tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+		$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
-	    // We must define tva_tx, npr and local taxes
-	    $tva_tx = $tva_tx_txt;
-	    $vatratecode = '';
-	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	    {
-	    	$vat_src_code = $reg[1];
-	    	$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx_txt); // Remove code into vatrate.
-	    }
+		// We must define tva_tx, npr and local taxes
+		$tva_tx = $tva_tx_txt;
+		$vatratecode = '';
+		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx_txt); // Remove code into vatrate.
+		}
 
-	    $tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
-	    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-	    $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-	    // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
-	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	    {
-	        // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
-	        $vatratecode = $reg[1];
-	        // Get record from code
-	        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-	        $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-	        $sql .= " AND t.code ='".$vatratecode."'";
-	        $resql = $db->query($sql);
-	        if ($resql)
-	        {
-                $obj = $db->fetch_object($resql);
-                $npr = $obj->recuperableonly;
-                $localtax1 = $obj->localtax1;
-                $localtax2 = $obj->localtax2;
-                $localtax1_type = $obj->localtax1_type;
-                $localtax2_type = $obj->localtax2_type;
-	        }
-	    }
+		$tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
+		$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+		$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+		{
+			// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
+			$vatratecode = $reg[1];
+			// Get record from code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				$npr = $obj->recuperableonly;
+				$localtax1 = $obj->localtax1;
+				$localtax2 = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
+			}
+		}
 
-	    $object->default_vat_code = $vatratecode;
-	    $object->tva_tx = $tva_tx;
-	    $object->tva_npr = $npr;
-	    $object->localtax1_tx = $localtax1;
-	    $object->localtax2_tx = $localtax2;
-	    $object->localtax1_type = $localtax1_type;
-	    $object->localtax2_type = $localtax2_type;
+		$object->default_vat_code = $vatratecode;
+		$object->tva_tx = $tva_tx;
+		$object->tva_npr = $npr;
+		$object->localtax1_tx = $localtax1;
+		$object->localtax2_tx = $localtax2;
+		$object->localtax1_type = $localtax1_type;
+		$object->localtax2_type = $localtax2_type;
 
-	    $db->begin();
+		$db->begin();
 
-	    $resql = $object->update($object->id, $user);
-	    if ($resql <= 0)
-	    {
-	        $error++;
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$resql = $object->update($object->id, $user);
+		if ($resql <= 0)
+		{
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-	    if ($error)
-	    {
-	        //$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
-	        $localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retreive them.
-	        $object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
-	    }
+		if ($error)
+		{
+			//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
+			$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retreive them.
+			$object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
+		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
-	    }
-	    else
-	    {
-	        $db->rollback();
-	    }
+		if (!$error)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
 
-	    $action = '';
+		$action = '';
 	}
 
 	if (($action == 'update_price') && !$cancel && $object->getRights()->creer)
-    {
+	{
 		$error = 0;
 		$pricestoupdate = array();
 
@@ -233,41 +231,41 @@ if (empty($reshook))
 				}
 				$tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
 
-        	    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+				$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
 				$localtax1 = $newlocaltax1_tx[$i];
 				$localtax1_type = $newlocaltax1_type[$i];
 				$localtax2 = $newlocaltax2_tx[$i];
 				$localtax2_type = $newlocaltax2_type[$i];
-        	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-        	    {
-        	        // We look into database using code
-        	        $vatratecode = $reg[1];
-        	        // Get record from code
-        	        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-        	        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-        	        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-        	        $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-        	        $sql .= " AND t.code ='".$vatratecode."'";
-        	        $resql = $db->query($sql);
-        	        if ($resql)
-        	        {
-        	            $obj = $db->fetch_object($resql);
-        	            $npr = $obj->recuperableonly;
-        	            $localtax1 = $obj->localtax1;
-        	            $localtax2 = $obj->localtax2;
-        	            $localtax1_type = $obj->localtax1_type;
-        	            $localtax2_type = $obj->localtax2_type;
-        	        }
-        	    }
+				if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+				{
+					// We look into database using code
+					$vatratecode = $reg[1];
+					// Get record from code
+					$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+					$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+					$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+					$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+					$resql = $db->query($sql);
+					if ($resql)
+					{
+						$obj = $db->fetch_object($resql);
+						$npr = $obj->recuperableonly;
+						$localtax1 = $obj->localtax1;
+						$localtax2 = $obj->localtax2;
+						$localtax1_type = $obj->localtax1_type;
+						$localtax2_type = $obj->localtax2_type;
+					}
+				}
 
 				$pricestoupdate[$i] = array(
 					'price' => $newprice[$i],
 					'price_min' => $newprice_min[$i],
 					'price_base_type' => $newpricebase[$i],
-				    'default_vat_code' => $vatratecode,
+					'default_vat_code' => $vatratecode,
 					'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
 					'npr' => $npr, // default_vat_code should be used in priority in a future
-				    'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)  // default_vat_code should be used in priority in a future
+					'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)  // default_vat_code should be used in priority in a future
 				);
 
 				//If autogeneration is enabled, then we only set the first level
@@ -275,8 +273,7 @@ if (empty($reshook))
 					break;
 				}
 			}
-		}
-		elseif (!$error)
+		} elseif (!$error)
 		{
 			$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
@@ -289,45 +286,45 @@ if (empty($reshook))
 			}
 			$tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
 
-		    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-		    $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-		    // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
-		    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-		    {
-		        // We look into database using code
-		        $vatratecode = $reg[1];
-		        // Get record from code
-		        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-		        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-		        $sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
-		        $sql .= " AND t.code ='".$vatratecode."'";
-		        $resql = $db->query($sql);
-		        if ($resql)
-		        {
-		            $obj = $db->fetch_object($resql);
-		            $npr = $obj->recuperableonly;
-		            $localtax1 = $obj->localtax1;
-		            $localtax2 = $obj->localtax2;
-		            $localtax1_type = $obj->localtax1_type;
-		            $localtax2_type = $obj->localtax2_type;
+			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+			// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+			{
+				// We look into database using code
+				$vatratecode = $reg[1];
+				// Get record from code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
+				$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
 
-		            // If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
-		            if (in_array($mysoc->country_code, array('ES')))
-		            {
-    		            $localtax1 = get_localtax($tva_tx, 1);
-	   	                $localtax2 = get_localtax($tva_tx, 2);
-		            }
-		        }
-		    }
+					// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
+					if (in_array($mysoc->country_code, array('ES')))
+					{
+						$localtax1 = get_localtax($tva_tx, 1);
+	   					$localtax2 = get_localtax($tva_tx, 2);
+					}
+				}
+			}
 			$pricestoupdate[0] = array(
 				'price' => $_POST["price"],
 				'price_min' => $_POST["price_min"],
 				'price_base_type' => $_POST["price_base_type"],
-			    'default_vat_code' => $vatratecode,
+				'default_vat_code' => $vatratecode,
 				'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
 				'npr' => $npr, // default_vat_code should be used in priority in a future
-			    'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)   // default_vat_code should be used in priority in a future
+				'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)   // default_vat_code should be used in priority in a future
 			);
 		}
 
@@ -351,7 +348,7 @@ if (empty($reshook))
 				}
 
 				if ($object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type'])
-       				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
+	   				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
 				else $res = 0;
 
 
@@ -439,7 +436,7 @@ if (empty($reshook))
 			// Ajout / mise à jour
 			if ($rowid > 0) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."product_price_by_qty SET";
-				$sql .= " price='".$price."',";
+				$sql .= " price='".$db->escape($price)."',";
 				$sql .= " unitprice=".$unitPrice.",";
 				$sql .= " quantity=".$quantity.",";
 				$sql .= " remise_percent=".$remise_percent.",";
@@ -523,24 +520,24 @@ if (empty($reshook))
 		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 		{
-		    // We look into database using code
-		    $vatratecode = $reg[1];
-		    // Get record from code
-		    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-		    $sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
-		    $sql .= " AND t.code ='".$vatratecode."'";
-		    $resql = $db->query($sql);
-		    if ($resql)
-		    {
-		        $obj = $db->fetch_object($resql);
-		        $npr = $obj->recuperableonly;
-		        $localtax1 = $obj->localtax1;
-		        $localtax2 = $obj->localtax2;
-		        $localtax1_type = $obj->localtax1_type;
-		        $localtax2_type = $obj->localtax2_type;
-		    }
+			// We look into database using code
+			$vatratecode = $reg[1];
+			// Get record from code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
+			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				$npr = $obj->recuperableonly;
+				$localtax1 = $obj->localtax1;
+				$localtax2 = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
+			}
 		}
 
 		$prodcustprice->default_vat_code = $vatratecode;
@@ -553,14 +550,14 @@ if (empty($reshook))
 
 		if (!($prodcustprice->fk_soc > 0))
 		{
-		    $langs->load("errors");
-		    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
-		    $error++;
-		    $action = 'add_customer_price';
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
+			$error++;
+			$action = 'add_customer_price';
 		}
 		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $prodcustprice->price_min < $maxpricesupplier)
 		{
-		    $langs->load("errors");
+			$langs->load("errors");
 			setEventMessages($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')), null, 'errors');
 			$error++;
 			$action = 'add_customer_price';
@@ -623,24 +620,24 @@ if (empty($reshook))
 		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 		{
-		    // We look into database using code
-		    $vatratecode = $reg[1];
-		    // Get record from code
-		    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-		    $sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
-		    $sql .= " AND t.code ='".$vatratecode."'";
-		    $resql = $db->query($sql);
-		    if ($resql)
-		    {
-		        $obj = $db->fetch_object($resql);
-		        $npr = $obj->recuperableonly;
-		        $localtax1 = $obj->localtax1;
-		        $localtax2 = $obj->localtax2;
-		        $localtax1_type = $obj->localtax1_type;
-		        $localtax2_type = $obj->localtax2_type;
-		    }
+			// We look into database using code
+			$vatratecode = $reg[1];
+			// Get record from code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
+			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				$npr = $obj->recuperableonly;
+				$localtax1 = $obj->localtax1;
+				$localtax2 = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
+			}
 		}
 
 		$prodcustprice->default_vat_code = $vatratecode;
@@ -772,60 +769,54 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
 			//print vatrate($object->multiprices_tva_tx[$soc->price_level], true);
 			print '</td></tr>';
-		}
-		else
-		{
-        	// TVA
-        	print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td>';
+		} else {
+			// TVA
+			print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td>';
 
-        	$positiverates = '';
-        	if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
-        	if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
-        	if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
-        	if (empty($positiverates)) $positiverates = '0';
-        	echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			$positiverates = '';
+			if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+			if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+			if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+			if (empty($positiverates)) $positiverates = '0';
+			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
 			/*
 			if ($object->default_vat_code)
 	        {
 	            print vatrate($object->tva_tx, true) . ' ('.$object->default_vat_code.')';
 	        }
         	else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
-        	print '</td></tr>';
+			print '</td></tr>';
 		}
-	}
-	else
-	{
+	} else {
 		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 		{
 			// We show only vat for level 1
 			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td>';
 			print '<td colspan="2">'.vatrate($object->multiprices_tva_tx[1], true).'</td>';
 			print '</tr>';
-		}
-		else
-		{
-            // TVA
-	        print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
+		} else {
+			// TVA
+			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
-	        $positiverates = '';
-	        if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
-	        if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
-	        if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
-	        if (empty($positiverates)) $positiverates = '0';
-	        echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
-	        /*
+			$positiverates = '';
+			if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+			if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+			if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+			if (empty($positiverates)) $positiverates = '0';
+			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			/*
 	        if ($object->default_vat_code)
 	        {
 	            print vatrate($object->tva_tx, true) . ' ('.$object->default_vat_code.')';
 	        }
 	        else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
-	        print '</td></tr>';
+			print '</td></tr>';
 		}
-	    print '</table>';
+		print '</table>';
 
-	    print '<br>';
+		print '<br>';
 
-	    print '<table class="noborder tableforfield" width="100%">';
+		print '<table class="noborder tableforfield" width="100%">';
 		print '<tr class="liste_titre"><td>';
 		print $langs->trans("PriceLevel");
 		if ($user->admin) print ' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlabelsellingprice&amp;pricelevel='.$i.'&amp;id='.$object->id.'">'.img_edit($langs->trans('EditSellingPriceLabel'), 0).'</a>';
@@ -843,19 +834,17 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
 			if (preg_match('/editlabelsellingprice/', $action))
 			{
-			    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-			    print '<input type="hidden" name="token" value="'.newToken().'">';
-			    print '<input type="hidden" name="action" value="setlabelsellingprice">';
-			    print '<input type="hidden" name="pricelevel" value="'.$i.'">';
-			    print $langs->trans("SellingPrice").' '.$i.' - ';
-			    print '<input size="10" class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
-			    print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-			    print '</form>';
-			}
-			else
-			{
-			    print $langs->trans("SellingPrice").' '.$i;
-			    if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="setlabelsellingprice">';
+				print '<input type="hidden" name="pricelevel" value="'.$i.'">';
+				print $langs->trans("SellingPrice").' '.$i.' - ';
+				print '<input size="10" class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
+				print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				print '</form>';
+			} else {
+				print $langs->trans("SellingPrice").' '.$i;
+				if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 			}
 			print '</td>';
 
@@ -877,9 +866,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			if ($object->multiprices_base_type[$i] == 'TTC')
 			{
 				print price($object->multiprices_min_ttc[$i]).' '.$langs->trans($object->multiprices_base_type[$i]);
-			}
-			else
-			{
+			} else {
 				print price($object->multiprices_min[$i]).' '.$langs->trans($object->multiprices_base_type[$i]);
 			}
 			print '</td></tr>';
@@ -888,7 +875,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))      // TODO Fix the form included into a tr instead of a td
 			{
 				print '<tr><td>'.$langs->trans("PriceByQuantity").' '.$i;
-			    if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+				if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 				print '</td><td colspan="2">';
 
 				if ($object->prices_by_qty[$i] == 1) {
@@ -926,7 +913,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 							if (($user->rights->produit->creer || $user->rights->service->creer)) {
 								print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_price_by_qty&amp;rowid='.$prices["rowid"].'">';
 								print img_edit().'</a>';
-								print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_price_by_qty&amp;rowid='.$prices["rowid"].'">';
+								print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_price_by_qty&amp;token='.newToken().'&amp;rowid='.$prices["rowid"].'">';
 								print img_delete().'</a>';
 							} else {
 								print '&nbsp;';
@@ -961,9 +948,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			}
 		}
 	}
-}
-else
-{
+} else {
 	// TVA
 	print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
@@ -1005,9 +990,7 @@ else
 		print '<tr><td>'.$langs->trans("PriceByQuantity");
 		if ($object->prices_by_qty[0] == 0) {
 			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=activate_price_by_qty&level=1">('.$langs->trans("Activate").')';
-		}
-		else
-		{
+		} else {
 			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable_price_by_qty&level=1">('.$langs->trans("DisablePriceByQty").')';
 		}
 		print '</td><td>';
@@ -1081,7 +1064,7 @@ else
 					{
 						print '<a class="editfielda marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit_price_by_qty&amp;rowid='.$prices["rowid"].'">';
 						print img_edit().'</a>';
-						print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_price_by_qty&amp;rowid='.$prices["rowid"].'">';
+						print '<a class="marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete_price_by_qty&amp;token='.newToken().'&amp;rowid='.$prices["rowid"].'">';
 						print img_delete().'</a>';
 					} else {
 						print '&nbsp;';
@@ -1119,7 +1102,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 {
 	print "\n".'<div class="tabsAction">'."\n";
 
-    if ($object->isVariant()) {
+	if ($object->isVariant()) {
 		if ($user->rights->produit->creer || $user->rights->service->creer) {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEditVariants")).'">'.$langs->trans("UpdateDefaultPrice").'</a></div>';
 		}
@@ -1145,7 +1128,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit_price&amp;id='.$object->id.'">'.$langs->trans("UpdateLevelPrices").'</a></div>';
 			}
 		}
-    }
+	}
 
 	print "\n</div>\n";
 }
@@ -1193,7 +1176,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 	if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
 	{
-	    print '<!-- Edit price -->'."\n";
+		print '<!-- Edit price -->'."\n";
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update_price">';
@@ -1279,7 +1262,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		}
 		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
 		{
-		    print ' &nbsp; '.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
+			print ' &nbsp; '.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
 		}
 		print '</td>';
 		print '</tr>';
@@ -1298,11 +1281,9 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		print '</div>';
 
 		print '<br></form>';
-	}
-	else
-	{
-	    print '<!-- Edit price per level -->'."\n";
-	    ?>
+	} else {
+		print '<!-- Edit price per level -->'."\n";
+		?>
 		<script>
 
 			var showHidePriceRules = function () {
@@ -1366,14 +1347,14 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 			// VAT
 			if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
-			    print '<td>';
-			    print '<input type="hidden" name="tva_tx['.$i.']" value="'.($object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx).'">';
-			    print '<input type="hidden" name="tva_npr['.$i.']" value="'.$object->tva_npr.'">';
-			    print '<input type="hidden" name="localtax1_tx['.$i.']" value="'.$object->localtax1_tx.'">';
-			    print '<input type="hidden" name="localtax1_type['.$i.']" value="'.$object->localtax1_type.'">';
-			    print '<input type="hidden" name="localtax2_tx['.$i.']" value="'.$object->localtax2_tx.'">';
-			    print '<input type="hidden" name="localtax2_type['.$i.']" value="'.$object->localtax2_type.'">';
-			    print '</td>';
+				print '<td>';
+				print '<input type="hidden" name="tva_tx['.$i.']" value="'.($object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx).'">';
+				print '<input type="hidden" name="tva_npr['.$i.']" value="'.$object->tva_npr.'">';
+				print '<input type="hidden" name="localtax1_tx['.$i.']" value="'.$object->localtax1_tx.'">';
+				print '<input type="hidden" name="localtax1_type['.$i.']" value="'.$object->localtax1_type.'">';
+				print '<input type="hidden" name="localtax2_tx['.$i.']" value="'.$object->localtax2_tx.'">';
+				print '<input type="hidden" name="localtax2_type['.$i.']" value="'.$object->localtax2_type.'">';
+				print '</td>';
 			} else {
 				// This option is kept for backward compatibility but has no sense
 				print '<td style="text-align: center">';
@@ -1426,215 +1407,211 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_default_price') && !in_array($action, array('edit_price', 'edit_vat')))
 {
-    $sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
-    $sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
-    $sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
-    $sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
-    $sql .= " ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE fk_product = ".$object->id;
-    $sql .= " AND p.entity IN (".getEntity('productprice').")";
-    $sql .= " AND p.fk_user_author = u.rowid";
-    if (!empty($socid) && !empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = ".$soc->price_level;
-    $sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
-    // $sql .= $db->plimit();
+	$sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
+	$sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
+	$sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
+	$sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
+	$sql .= " ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE fk_product = ".$object->id;
+	$sql .= " AND p.entity IN (".getEntity('productprice').")";
+	$sql .= " AND p.fk_user_author = u.rowid";
+	if (!empty($socid) && !empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = ".$soc->price_level;
+	$sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+	// $sql .= $db->plimit();
 
-    $result = $db->query($sql);
-    if ($result)
-    {
-        print '<div class="divlogofpreviouscustomerprice">';
+	$result = $db->query($sql);
+	if ($result)
+	{
+		print '<div class="divlogofpreviouscustomerprice">';
 
-        $num = $db->num_rows($result);
+		$num = $db->num_rows($result);
 
-    	if (!$num)
-    	{
-    		$db->free($result);
+		if (!$num)
+		{
+			$db->free($result);
 
-    		// Il doit au moins y avoir la ligne de prix initial.
-    		// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
-    		//$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
-            if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-            	$object->updatePrice($object->multiprices[1], $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), $object->multiprices_min[1], 1);
-            } else {
-                $object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
-            }
+			// Il doit au moins y avoir la ligne de prix initial.
+			// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
+			//$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				$object->updatePrice($object->multiprices[1], $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), $object->multiprices_min[1], 1);
+			} else {
+				$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
+			}
 
-    		$result = $db->query($sql);
-    		$num = $db->num_rows($result);
-    	}
+			$result = $db->query($sql);
+			$num = $db->num_rows($result);
+		}
 
-    	if ($num > 0)
-    	{
-    	    // Default prices or
-    	    // Log of previous customer prices
-    	    $backbutton = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
+		if ($num > 0)
+		{
+			// Default prices or
+			// Log of previous customer prices
+			$backbutton = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
 
-    		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
-    		else print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
-    	    //if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"),'','','','','',$backbutton, 0, 0, 'title_accountancy.png');
-    		//else print_barre_liste($langs->trans("PriceByCustomerLog"),'','','','','','', 0, 0, 'title_accountancy.png');
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
+			else print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
+			//if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"),'','','','','',$backbutton, 0, 0, 'title_accountancy.png');
+			//else print_barre_liste($langs->trans("PriceByCustomerLog"),'','','','','','', 0, 0, 'title_accountancy.png');
 
-    		print '<div class="div-table-responsive">';
-    		print '<table class="noborder centpercent">';
+			print '<div class="div-table-responsive">';
+			print '<table class="noborder centpercent">';
 
-    		print '<tr class="liste_titre">';
-    		print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
 
-    		if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-    			print '<td class="center">'.$langs->trans("PriceLevel").'</td>';
-    		}
-    		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-    			print '<td class="center">'.$langs->trans("Type").'</td>';
-    		}
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				print '<td class="center">'.$langs->trans("PriceLevel").'</td>';
+			}
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				print '<td class="center">'.$langs->trans("Type").'</td>';
+			}
 
-    		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
-    		print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
-    		if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
-    		print '<td class="right">'.$langs->trans("HT").'</td>';
-    		print '<td class="right">'.$langs->trans("TTC").'</td>';
-    		if (!empty($conf->dynamicprices->enabled)) {
-    			print '<td class="right">'.$langs->trans("PriceExpressionSelected").'</td>';
-    		}
-    		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
-    		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
-    		print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
-    		if ($user->rights->produit->supprimer)
-    			print '<td class="right">&nbsp;</td>';
-    		print '</tr>';
+			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
+			print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
+			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
+			print '<td class="right">'.$langs->trans("HT").'</td>';
+			print '<td class="right">'.$langs->trans("TTC").'</td>';
+			if (!empty($conf->dynamicprices->enabled)) {
+				print '<td class="right">'.$langs->trans("PriceExpressionSelected").'</td>';
+			}
+			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
+			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+			print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
+			if ($user->rights->produit->supprimer)
+				print '<td class="right">&nbsp;</td>';
+			print '</tr>';
 
-    		$notfirstlineforlevel = array();
+			$notfirstlineforlevel = array();
 
-    		$i = 0;
-    		while ($i < $num)
-    		{
-    			$objp = $db->fetch_object($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($result);
 
-    			print '<tr class="oddeven">';
-    			// Date
-    			print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour")."</td>";
+				print '<tr class="oddeven">';
+				// Date
+				print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour")."</td>";
 
-    			// Price level
-    			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-    				print '<td class="center">'.$objp->price_level."</td>";
-    			}
-    			// Price by quantity
-    			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-    			{
-    				$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
-    				print '<td class="center">'.$langs->trans($type)."</td>";
-    			}
+				// Price level
+				if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+					print '<td class="center">'.$objp->price_level."</td>";
+				}
+				// Price by quantity
+				if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+				{
+					$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
+					print '<td class="center">'.$langs->trans($type)."</td>";
+				}
 
-    			print '<td class="center">';
-    			if (empty($objp->price_by_qty)) {
-	    			print $langs->trans($objp->price_base_type);
-    			}
-    			print "</td>";
+				print '<td class="center">';
+				if (empty($objp->price_by_qty)) {
+					print $langs->trans($objp->price_base_type);
+				}
+				print "</td>";
 
-    			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-    			{
-    			    print '<td class="right">';
+				if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+				{
+					print '<td class="right">';
 
-    			    if (empty($objp->price_by_qty)) {
-	    			    $positiverates = '';
-	    			    if (price2num($objp->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($objp->tva_tx);
-	    			    if (price2num($objp->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax1_tx);
-	    			    if (price2num($objp->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax2_tx);
-	    			    if (empty($positiverates)) $positiverates = '0';
-	    			    echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', $objp->tva_npr);
+					if (empty($objp->price_by_qty)) {
+						$positiverates = '';
+						if (price2num($objp->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($objp->tva_tx);
+						if (price2num($objp->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax1_tx);
+						if (price2num($objp->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax2_tx);
+						if (empty($positiverates)) $positiverates = '0';
+						echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', $objp->tva_npr);
 						/*
 	    			    if ($objp->default_vat_code)
 	    			    {
 	    			        print vatrate($objp->tva_tx, true) . ' ('.$objp->default_vat_code.')';
 	    			    }
 	    			    else print vatrate($objp->tva_tx, true, $objp->recuperableonly);*/
-    			    }
+					}
 
-    			    print "</td>";
-    			}
+					print "</td>";
+				}
 
-    			// Price
-    			if (!empty($objp->fk_price_expression) && !empty($conf->dynamicprices->enabled))
-    			{
-    				$price_expression = new PriceExpression($db);
-    				$res = $price_expression->fetch($objp->fk_price_expression);
-    				$title = $price_expression->title;
-    				print '<td class="right"></td>';
-    				print '<td class="right"></td>';
-    				print '<td class="right">'.$title."</td>";
-    			}
-    			else
-    			{
-    				print '<td class="right">';
-    				if (empty($objp->price_by_qty)) {
-    					print price($objp->price);
-    				}
-    				print "</td>";
-    				print '<td class="right">';
-    				if (empty($objp->price_by_qty)) {
-    					print price($objp->price_ttc);
-    				}
-    				print "</td>";
-    				if (!empty($conf->dynamicprices->enabled)) { //Only if module is enabled
-    					print '<td class="right"></td>';
-    				}
-    			}
+				// Price
+				if (!empty($objp->fk_price_expression) && !empty($conf->dynamicprices->enabled))
+				{
+					$price_expression = new PriceExpression($db);
+					$res = $price_expression->fetch($objp->fk_price_expression);
+					$title = $price_expression->title;
+					print '<td class="right"></td>';
+					print '<td class="right"></td>';
+					print '<td class="right">'.$title."</td>";
+				} else {
+					print '<td class="right">';
+					if (empty($objp->price_by_qty)) {
+						print price($objp->price);
+					}
+					print "</td>";
+					print '<td class="right">';
+					if (empty($objp->price_by_qty)) {
+						print price($objp->price_ttc);
+					}
+					print "</td>";
+					if (!empty($conf->dynamicprices->enabled)) { //Only if module is enabled
+						print '<td class="right"></td>';
+					}
+				}
 
-    			print '<td class="right">';
-    			if (empty($objp->price_by_qty)) {
-    				print price($objp->price_min);
-    			}
-    			print '</td>';
+				print '<td class="right">';
+				if (empty($objp->price_by_qty)) {
+					print price($objp->price_min);
+				}
+				print '</td>';
 
-    			print '<td class="right">';
-    			if (empty($objp->price_by_qty)) {
-    				print price($objp->price_min_ttc);
-    			}
-    			print '</td>';
+				print '<td class="right">';
+				if (empty($objp->price_by_qty)) {
+					print price($objp->price_min_ttc);
+				}
+				print '</td>';
 
-    			// User
-    			print '<td class="right">';
-    			if ($objp->user_id > 0) {
-	    			$userstatic = new User($db);
-	    			$userstatic->fetch($objp->user_id);
-	    			print $userstatic->getNomUrl(1, '', 0, 0, 24, 0, 'login');
-    			}
-    			print '</td>';
+				// User
+				print '<td class="right">';
+				if ($objp->user_id > 0) {
+					$userstatic = new User($db);
+					$userstatic->fetch($objp->user_id);
+					print $userstatic->getNomUrl(1, '', 0, 0, 24, 0, 'login');
+				}
+				print '</td>';
 
-    			// Action
-    			if ($user->rights->produit->supprimer)
-    			{
-    			    $candelete = 0;
-    			    if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-    			    {
-    			        if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level] = 1;
-    			        else $candelete = 1;
-    			    }
-    			    elseif ($i > 0) $candelete = 1;
+				// Action
+				if ($user->rights->produit->supprimer)
+				{
+					$candelete = 0;
+					if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+					{
+						if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level] = 1;
+						else $candelete = 1;
+					} elseif ($i > 0) $candelete = 1;
 
-    				print '<td class="right">';
-    				if ($candelete)
-    				{
-    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
-    					print img_delete();
-    					print '</a>';
-    				} else
-    					print '&nbsp;'; // Can not delete last price (it's current price)
-    				print '</td>';
-    			}
+					print '<td class="right">';
+					if ($candelete)
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
+						print img_delete();
+						print '</a>';
+					} else print '&nbsp;'; // Can not delete last price (it's current price)
+					print '</td>';
+				}
 
-    			print "</tr>\n";
-    			$i++;
-    		}
+				print "</tr>\n";
+				$i++;
+			}
 
-    		$db->free($result);
-    		print "</table>";
-    		print '</div>';
-    		print "<br>";
-    	}
+			$db->free($result);
+			print "</table>";
+			print '</div>';
+			print "<br>";
+		}
 
-    	print '</div>';
-    } else {
-    	dol_print_error($db);
-    }
+		print '</div>';
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
@@ -1744,8 +1721,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</div>';
 
 		print '</form>';
-	}
-	elseif ($action == 'edit_customer_price')
+	} elseif ($action == 'edit_customer_price')
 	{
 		// Edit mode
 		$maxpricesupplier = $object->min_recommended_price();
@@ -1838,13 +1814,12 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</div>';
 
 		print '<br></form>';
-	}
-	elseif ($action == 'showlog_customer_price')
+	} elseif ($action == 'showlog_customer_price')
 	{
 		// List of all log of prices by customers
 		print '<!-- list of all log of prices per customer -->'."\n";
 
-	    $filter = array('t.fk_product' => $object->id, 't.fk_soc' => GETPOST('socid', 'int'));
+		$filter = array('t.fk_product' => $object->id, 't.fk_soc' => GETPOST('socid', 'int'));
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
@@ -1887,9 +1862,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			{
 				//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 				print '<td class="right">'.$langs->trans("INCT").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td class="right">'.$langs->trans("TTC").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
@@ -1900,20 +1873,18 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 			foreach ($prodcustprice->lines as $line)
 			{
-			    // Date
-			    $staticsoc = new Societe($db);
-			    $staticsoc->fetch($line->fk_soc);
+				// Date
+				$staticsoc = new Societe($db);
+				$staticsoc->fetch($line->fk_soc);
 
 				$tva_tx = $line->default_vat_code ? $line->tva_tx.' ('.$line->default_vat_code.')' : $line->tva_tx;
 
 				// Line for default price
 				if ($line->price_base_type == 'HT')
 				{
-				    $pu = $line->price;
-				}
-				else
-				{
-				    $pu = $line->price_ttc;
+					$pu = $line->price;
+				} else {
+					$pu = $line->price_ttc;
 				}
 
 				// Local tax is not saved into table of product. We use value linked to VAT code.
@@ -1931,7 +1902,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 				print "<td>".$staticsoc->getNomUrl(1)."</td>";
 				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
-    		    print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
+				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
 				print '<td class="right">';
 
 				$positiverates = '';
@@ -1950,9 +1921,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
-				}
-				else
-				{
+				} else {
 					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
@@ -1972,11 +1941,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		} else {
 			print $langs->trans('None');
 		}
-	}
-	elseif ($action != 'showlog_default_price' && $action != 'edit_price')
+	} elseif ($action != 'showlog_default_price' && $action != 'edit_price')
 	{
 		// List of all prices by customers
-        print '<!-- list of all prices per customer -->'."\n";
+		print '<!-- list of all prices per customer -->'."\n";
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
@@ -2001,18 +1969,18 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		if (count($prodcustprice->lines) > 0 || $search_soc)
 		{
-		    $colspan = 8;
-		    //if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") $colspan++;
+			$colspan = 8;
+			//if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") $colspan++;
 
-    		print '<tr class="liste_titre">';
-    		print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="'.$search_soc.'" size="20"></td>';
-    		print '<td class="liste_titre" colspan="'.$colspan.'">&nbsp;</td>';
-    		// Print the search button
-            print '<td class="liste_titre maxwidthsearch">';
-            $searchpicto = $form->showFilterAndCheckAddButtons(0);
-            print $searchpicto;
-            print '</td>';
-    		print '</tr>';
+			print '<tr class="liste_titre">';
+			print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="'.$search_soc.'" size="20"></td>';
+			print '<td class="liste_titre" colspan="'.$colspan.'">&nbsp;</td>';
+			// Print the search button
+			print '<td class="liste_titre maxwidthsearch">';
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+			print '</td>';
+			print '</tr>';
 		}
 
 		print '<tr class="liste_titre">';
@@ -2025,9 +1993,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		{
 			//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 			print '<td class="right">'.$langs->trans("INCT").'</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="right">'.$langs->trans("TTC").'</td>';
 		}
 
@@ -2040,11 +2006,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		// Line for default price
 		if ($object->price_base_type == 'HT')
 		{
-		    $pu = $object->price;
-		}
-		else
-		{
-		    $pu = $object->price_ttc;
+			$pu = $object->price;
+		} else {
+			$pu = $object->price_ttc;
 		}
 
 		// Local tax is not saved into table of product. We use value linked to VAT code.
@@ -2082,9 +2046,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		{
 			//print '<td class="right">' . price($object->price_ttc) . "</td>";
 			print '<td class="right">'.price($resultarray[2]).'</td>';
-		}
-		else
-		{
+		} else {
 			print '<td class="right">'.price($object->price_ttc)."</td>";
 		}
 
@@ -2095,16 +2057,16 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</td>';
 		if ($user->rights->produit->supprimer || $user->rights->service->supprimer)
 		{
-		    print '<td class="right">';
-		    print '<a href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&amp;id='.$object->id.'">';
-		    print img_info($langs->trans('PriceByCustomerLog'));
-		    print '</a>';
-		    print ' ';
-		    print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit_price&amp;id='.$object->id.'">';
-		    print img_edit('default', 0, 'style="vertical-align: middle;"');
-		    print '</a>';
-		    print ' &nbsp; ';
-		    print '</td>';
+			print '<td class="right">';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&amp;id='.$object->id.'">';
+			print img_info($langs->trans('PriceByCustomerLog'));
+			print '</a>';
+			print ' ';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit_price&amp;id='.$object->id.'">';
+			print img_edit('default', 0, 'style="vertical-align: middle;"');
+			print '</a>';
+			print ' &nbsp; ';
+			print '</td>';
 		}
 		print "</tr>\n";
 
@@ -2121,11 +2083,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				// Line for default price
 				if ($line->price_base_type == 'HT')
 				{
-				    $pu = $line->price;
-				}
-				else
-				{
-				    $pu = $line->price_ttc;
+					$pu = $line->price;
+				} else {
+					$pu = $line->price_ttc;
 				}
 
 				// Local tax is not saved into table of product. We use value linked to VAT code.
@@ -2161,9 +2121,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				{
 					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
-				}
-				else
-				{
+				} else {
 					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
@@ -2190,7 +2148,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 					print img_edit('default', 0, 'style="vertical-align: middle;"');
 					print '</a>';
 					print ' ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;id='.$object->id.'&amp;lineid='.$line->id.'">';
+					print '<a 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 0b490480c77..f881a429d1a 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -40,7 +40,7 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'produit|service');
 
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -88,6 +88,9 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
     $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
+$hookmanager->initHooks(array('productreassortlist'));
+
 
 
 /*
@@ -126,6 +129,10 @@ $sql .= ' p.fk_product_type, p.tms as datem,';
 $sql .= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
 $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
+$sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON s.fk_entrepot = e.rowid AND e.entity IN ('.getEntity('entrepot').')';
@@ -141,9 +148,7 @@ if (dol_strlen($type))
     if ($type == 1)
     {
         $sql .= " AND p.fk_product_type = '1'";
-    }
-    else
-    {
+    } else {
         $sql .= " AND p.fk_product_type <> '1'";
     }
 }
@@ -159,6 +164,10 @@ if ($fourn_id > 0) $sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".$four
 if ($search_categ) $sql .= " AND cp.fk_categorie = ".$db->escape($search_categ);
 $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
 $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
+$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);
 
@@ -193,8 +202,7 @@ if ($resql)
 
 	if (isset($type))
 	{
-		if ($type == 1) { $texte = $langs->trans("Services"); }
-		else { $texte = $langs->trans("Products"); }
+		if ($type == 1) { $texte = $langs->trans("Services"); } else { $texte = $langs->trans("Products"); }
 	} else {
 		$texte = $langs->trans("ProductsAndServices");
 	}
@@ -303,6 +311,9 @@ if ($resql)
 	print '<td class="liste_titre">&nbsp;</td>';
 	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
+	print $hookmanager->resPrint;
 	print '<td class="liste_titre maxwidthsearch">';
    	$searchpicto = $form->showFilterAndCheckAddButtons(0);
    	print $searchpicto;
@@ -326,7 +337,7 @@ if ($resql)
 	        }
 	    }
 	}
-	if ($virtualdiffersfromphysical) print_liste_field_titre("VirtualStock", $_SERVER["PHP_SELF"], "", $param, "", '', $sortfield, $sortorder, '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);
@@ -334,6 +345,10 @@ if ($resql)
 	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
+	print $hookmanager->resPrint;
 	print_liste_field_titre('');
 	print "</tr>\n";
 
@@ -397,6 +412,10 @@ if ($resql)
 		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>';
+		// Fields from hook
+		$parameters = array('obj'=>$objp);
+		$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";
 		$i++;
@@ -408,9 +427,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 0fec39d1708..cc37d930280 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -42,7 +42,7 @@ if ($user->socid) $socid = $user->socid;
 $result = restrictedArea($user, 'produit|service');
 
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -139,9 +139,7 @@ if (dol_strlen($type))
     if ($type == 1)
     {
         $sql .= " AND p.fk_product_type = '1'";
-    }
-    else
-    {
+    } else {
         $sql .= " AND p.fk_product_type <> '1'";
     }
 }
@@ -197,8 +195,7 @@ if ($resql)
 
 	if (isset($type))
 	{
-		if ($type == 1) { $texte = $langs->trans("Services"); }
-		else { $texte = $langs->trans("Products"); }
+		if ($type == 1) { $texte = $langs->trans("Services"); } else { $texte = $langs->trans("Products"); }
 	} else {
 		$texte = $langs->trans("ProductsAndServices");
 	}
@@ -287,8 +284,12 @@ if ($resql)
 	print '<td class="liste_titre center"><input class="flat" type="text" name="search_batch" size="6" value="'.$search_batch.'"></td>';
 	print '<td class="liste_titre right">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
+	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+		print '<td class="liste_titre">&nbsp;</td>';
+	}
+	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+		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">';
@@ -305,8 +306,12 @@ if ($resql)
 	print_liste_field_titre("Warehouse", $_SERVER["PHP_SELF"], "e.ref", $param, "", '', $sortfield, $sortorder);
 	//print_liste_field_titre("DesiredStock", $_SERVER["PHP_SELF"], "p.desiredstock",$param,"",'',$sortfield,$sortorder, 'right );
 	print_liste_field_titre("Batch", $_SERVER["PHP_SELF"], "pb.batch", $param, "", '', $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("EatByDate", $_SERVER["PHP_SELF"], "pb.eatby", $param, "", '', $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("SellByDate", $_SERVER["PHP_SELF"], "pb.sellby", $param, "", '', $sortfield, $sortorder, 'center ');
+	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+		print_liste_field_titre("EatByDate", $_SERVER["PHP_SELF"], "pb.eatby", $param, "", '', $sortfield, $sortorder, 'center ');
+	}
+	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+		print_liste_field_titre("SellByDate", $_SERVER["PHP_SELF"], "pb.sellby", $param, "", '', $sortfield, $sortorder, 'center ');
+	}
 	print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", $param, "", '', $sortfield, $sortorder, 'right ');
 	// TODO Add info of running suppliers/customers orders
 	//print_liste_field_titre("TheoreticalStock",$_SERVER["PHP_SELF"], "stock_theorique",$param,"",'',$sortfield,$sortorder, 'right ');
@@ -330,7 +335,7 @@ if ($resql)
 			$sql = "SELECT label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 			$sql .= " WHERE fk_product=".$objp->rowid;
-			$sql .= " AND lang='".$langs->getDefaultLang()."'";
+			$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
 			$sql .= " LIMIT 1";
 
 			$result = $db->query($sql);
@@ -403,8 +408,12 @@ if ($resql)
 		}
 		print '</td>';
 
-		print '<td class="center">'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
-		print '<td class="center">'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
+		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+			print '<td class="center">'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
+		}
+		if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+			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")).' ';
 		print $objp->stock_physique;
@@ -422,9 +431,7 @@ if ($resql)
 	print '</form>';
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 4600baa1597..1d61018467a 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -90,15 +90,12 @@ if (!$id && empty($ref))
         $helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
         //$title=$langs->trans("StatisticsOfProducts");
         $title = $langs->trans("Statistics");
-    }
-    elseif ($type == '1')
+    } 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
-    {
+    } else {
         $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
         //$title=$langs->trans("StatisticsOfProductsOrServices");
         $title = $langs->trans("Statistics");
@@ -108,9 +105,7 @@ if (!$id && empty($ref))
     if ($type == 1) $picto = 'service';
 
     print load_fiche_titre($title, $mesg, $picto);
-}
-else
-{
+} else {
     $result = $object->fetch($id, $ref);
 
 	$title = $langs->trans('ProductServiceCard');
@@ -164,13 +159,8 @@ if (empty($id) & empty($ref))
     }
 
     $head[$h][0] = DOL_URL_ROOT.'/product/popuprop.php'.($type != '' ? '?type='.$type : '');
-    $head[$h][1] = $langs->trans("PopuProp");
-    $head[$h][2] = 'popularityprop';
-    $h++;
-
-    $head[$h][0] = DOL_URL_ROOT.'/product/popucom.php'.($type != '' ? '?type='.$type : '');
-    $head[$h][1] = $langs->trans("PopuCom");
-    $head[$h][2] = 'popularitycommande';
+    $head[$h][1] = $langs->trans("ProductsPerPopularity");
+    $head[$h][2] = 'popularity';
     $h++;
 
     dol_fiche_head($head, 'chart', $langs->trans("Statistics"), -1);
@@ -227,18 +217,20 @@ if ($result || empty($id))
 	// Choice of stats mode (byunit or bynumber)
 	if (!empty($conf->dol_use_jmobile)) print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
 
-	if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id') ?GETPOST('id') : $object->id).($type != '' ? '&type='.$type : '').'&mode=byunit&search_year='.$search_year.'">';
-	else print img_picto('', 'tick').' ';
+	if ($mode == 'bynumber') print '<a class="a-mesure-disabled" href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id') ?GETPOST('id') : $object->id).($type != '' ? '&type='.$type : '').'&mode=byunit&search_year='.$search_year.'">';
+	else print '<span class="a-mesure">';
 	print $langs->trans("StatsByNumberOfUnits");
 	if ($mode == 'bynumber') print '</a>';
+	else print '</span>';
 
 	if (!empty($conf->dol_use_jmobile)) print '</div>'."\n".'<div class="nowrap">'."\n";
-	else print ' &nbsp; / &nbsp; ';
+	else print ' &nbsp; ';
 
-	if ($mode == 'byunit') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id') ?GETPOST('id') : $object->id).($type != '' ? '&type='.$type : '').'&mode=bynumber&search_year='.$search_year.'">';
-	else print img_picto('', 'tick').' ';
+	if ($mode == 'byunit') print '<a class="a-mesure-disabled" href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id') ?GETPOST('id') : $object->id).($type != '' ? '&type='.$type : '').'&mode=bynumber&search_year='.$search_year.'">';
+	else print '<span class="a-mesure">';
 	print $langs->trans("StatsByNumberOfEntities");
 	if ($mode == 'byunit') print '</a>';
+	else print '</span>';
 
 	if (!empty($conf->dol_use_jmobile)) print '</div></div>';
 	else print '<br>';
@@ -324,9 +316,7 @@ if ($result || empty($id))
 				if (dol_is_file($dir.'/'.$graphfiles[$key]['file']))
 				{
 					// TODO Load cachefile $graphfiles[$key]['file']
-				}
-				else
-				{
+				} else {
 				    $morefilters = '';
 				    if ($search_categ > 0)
 				    {
@@ -370,9 +360,7 @@ if ($result || empty($id))
 
 					$graphfiles[$key]['total'] = $px->total();
 					$graphfiles[$key]['output'] = $px->show();
-				}
-				else
-				{
+				} else {
 					dol_print_error($db, 'Error for calculating graph on key='.$key.' - '.$object->error);
 				}
 			}
@@ -401,9 +389,7 @@ if ($result || empty($id))
 			if ($i % 2 == 0)
 			{
 				print "\n".'<div class="fichecenter"><div class="fichehalfleft">'."\n";
-			}
-			else
-			{
+			} else {
 				print "\n".'<div class="fichehalfright"><div class="ficheaddleft">'."\n";
 			}
 
@@ -412,9 +398,7 @@ if ($result || empty($id))
 			{
 			    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
-			{
+			} else {
 			    $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>';
@@ -436,9 +420,7 @@ if ($result || empty($id))
 			if ($i % 2 == 0)
 			{
 				print "\n".'</div>'."\n";
-			}
-			else
-			{
+			} else {
 				print "\n".'</div></div></div>';
 				print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 			}
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index c111e075972..162a108029e 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -50,8 +50,8 @@ $mesg = '';
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 8f88044d913..194de1c6ddf 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -220,16 +220,12 @@ if ($id > 0 || !empty($ref))
 			print '</table>';
 			print '</div>';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		$db->free($result);
 	}
-}
-else
-{
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index d4bbe68386c..08b20badbe9 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -143,8 +143,7 @@ if ($id > 0 || !empty($ref))
 		if ($showmessage && $nboflines > 1)
 		{
 			print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
-		}
-        elseif ($user->rights->facture->lire)
+		} 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,";
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 51e91aeaaac..d8dfa9053e8 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -213,16 +213,12 @@ if ($id > 0 || !empty($ref))
 			print '</table>';
 			print '</div>';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 		$db->free($result);
 	}
-}
-else
-{
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index f5b097d0655..6766864b042 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -50,8 +50,8 @@ $mesg = '';
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index 5a59cbb9c83..f4d2a5d4644 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -50,8 +50,8 @@ $mesg = '';
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 6279b17d21a..81ae26390c9 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -67,13 +67,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 if ($id > 0 || !empty($ref)) {
-    $ret = $object->fetch($id, $ref);
-	//    if ($ret > 0)
-	//        $ret = $object->fetch_thirdparty();
-    if ($ret <= 0) {
-        setEventMessages($object->error, $object->errors, 'errors');
-        $action = '';
-    }
+	$ret = $object->fetch($id, $ref);
+	if ($ret <= 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = '';
+	}
 }
 
 
@@ -97,7 +95,7 @@ if (empty($reshook))
 	{
 		$object->ref         = GETPOST("ref");
 		$object->fk_parent   = GETPOST("fk_parent");
-		$object->libelle     = GETPOST("libelle");
+		$object->label = GETPOST("libelle");
 		$object->description = GETPOST("desc");
 		$object->statut      = GETPOST("statut");
 		$object->lieu        = GETPOST("lieu");
@@ -108,37 +106,34 @@ if (empty($reshook))
 		$object->phone = GETPOST("phone");
 		$object->fax = GETPOST("fax");
 
-		if (!empty($object->libelle))
-		{
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost(null, $object);
-	        if ($ret < 0) {
-	            $error++;
-	            $action = 'create';
-	        }
+		if (!empty($object->label)) {
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) {
+				$error++;
+				$action = 'create';
+			}
 
-	        if (!$error) {
-	            $id = $object->create($user);
-	            if ($id > 0) {
-	                setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			if (!$error) {
+				$id = $object->create($user);
+				if ($id > 0) {
+					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 
 					$categories = GETPOST('categories', 'array');
 					$object->setCategories($categories);
-	                if (!empty($backtopage)) {
-	                    header("Location: ".$backtopage);
-	                    exit;
-	                } else {
-	                    header("Location: card.php?id=".$id);
-	                    exit;
-	                }
-	            } else {
-	                $action = 'create';
-	                setEventMessages($object->error, $object->errors, 'errors');
-	            }
-	        }
-		}
-		else
-		{
+					if (!empty($backtopage)) {
+						header("Location: ".$backtopage);
+						exit;
+					} else {
+						header("Location: card.php?id=".$id);
+						exit;
+					}
+				} else {
+					$action = 'create';
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		} else {
 			setEventMessages($langs->trans("ErrorWarehouseRefRequired"), null, 'errors');
 			$action = "create"; // Force retour sur page creation
 		}
@@ -151,12 +146,10 @@ if (empty($reshook))
 		$result = $object->delete($user);
 		if ($result > 0)
 		{
-		    setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 			header("Location: ".DOL_URL_ROOT.'/product/stock/list.php?restore_lastsearch_values=1');
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
@@ -167,7 +160,7 @@ if (empty($reshook))
 	{
 		if ($object->fetch($id))
 		{
-			$object->libelle     = GETPOST("libelle");
+			$object->label = GETPOST("libelle");
 			$object->fk_parent   = GETPOST("fk_parent");
 			$object->description = GETPOST("desc");
 			$object->statut      = GETPOST("statut");
@@ -179,14 +172,14 @@ if (empty($reshook))
 			$object->phone = GETPOST("phone");
 			$object->fax = GETPOST("fax");
 
-	        // 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 (!$error) {
-	            $ret = $object->update($id, $user);
-	            if ($ret < 0)   $error++;
-	        }
+			if (!$error) {
+				$ret = $object->update($id, $user);
+				if ($ret < 0)   $error++;
+			}
 
 			if ($error) {
 				$action = 'edit';
@@ -194,29 +187,26 @@ if (empty($reshook))
 			} else {
 				$categories = GETPOST('categories', 'array');
 				$object->setCategories($categories);
-	            $action = '';
-	        }
-		}
-		else
-		{
+				$action = '';
+			}
+		} else {
 			$action = 'edit';
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	elseif ($action == 'update_extras') {
-	    $object->oldcopy = dol_clone($object);
+	} elseif ($action == 'update_extras') {
+		$object->oldcopy = dol_clone($object);
 
-	    // Fill array 'array_options' with data from update form
-	    $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
-	    if ($ret < 0) $error++;
-	    if (!$error) {
-	        $result = $object->insertExtraFields();
-	        if ($result < 0) {
-	            setEventMessages($object->error, $object->errors, 'errors');
-	            $error++;
-	        }
-	    }
-	    if ($error) $action = 'edit_extras';
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
+		if (!$error) {
+			$result = $object->insertExtraFields();
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		}
+		if ($error) $action = 'edit_extras';
 	}
 
 	if ($cancel == $langs->trans("Cancel"))
@@ -268,7 +258,7 @@ if ($action == 'create')
 
 	// Parent entrepot
 	print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
-	print $formproduct->selectWarehouses('', 'fk_parent', '', 1);
+	print $formproduct->selectWarehouses('ifone', 'fk_parent', '', 1);
 	print '</td></tr>';
 
 	// Description
@@ -315,17 +305,15 @@ if ($action == 'create')
 		if ($key == 1)
 		{
 			print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
-		}
-		else
-		{
+		} else {
 			print '<option value="'.$key.'">'.$langs->trans($value).'</option>';
 		}
 	}
 	print '</select>';
 	print '</td></tr>';
 
-    // Other attributes
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 	if ($conf->categorie->enabled) {
 		// Categories
@@ -345,10 +333,8 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-}
-else
-{
-    $id = GETPOST("id", 'int');
+} else {
+	$id = GETPOST("id", 'int');
 	if ($id > 0 || $ref)
 	{
 		$object = new Entrepot($db);
@@ -390,18 +376,18 @@ else
 
 			$morehtmlref = '<div class="refidno">';
 			$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
-        	$morehtmlref .= '</div>';
+			$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 tableforfield">';
+			print '<table class="border centpercent tableforfield">';
 
 			// Parent entrepot
 			$parentwarehouse = new Entrepot($db);
@@ -424,8 +410,8 @@ else
 
 			// Nb of products
 			print '<tr><td>'.$langs->trans("NumberOfProducts").'</td><td>';
-            $valtoshow = price2num($calcproducts['nb'], 'MS');
-            print empty($valtoshow) ? '0' : $valtoshow;
+			$valtoshow = price2num($calcproducts['nb'], 'MS');
+			print empty($valtoshow) ? '0' : $valtoshow;
 			print "</td></tr>";
 
 			print '</table>';
@@ -446,7 +432,7 @@ else
 			if (!empty($user->rights->stock->mouvement->lire)) {
 				$sql = "SELECT max(m.datem) as datem";
 				$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-				$sql .= " WHERE m.fk_entrepot = '".$object->id."'";
+				$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
 				$resqlbis = $db->query($sql);
 				if ($resqlbis) {
 					$obj = $db->fetch_object($resqlbis);
@@ -464,8 +450,8 @@ else
 				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';
 
 			// Categories
 			if ($conf->categorie->enabled) {
@@ -499,15 +485,19 @@ else
 			{
 				if (empty($action))
 				{
-					if ($user->rights->stock->creer)
-						print "<a class=\"butAction\" href=\"card.php?action=edit&id=".$object->id."\">".$langs->trans("Modify")."</a>";
-					else
-						print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Modify")."</a>";
+					if ($user->rights->stock->creer) {
+						print '<a class="butAction" href="card.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
+					}
+					else {
+						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Modify").'</a>';
+					}
 
-					if ($user->rights->stock->supprimer)
-						print "<a class=\"butActionDelete\" href=\"card.php?action=delete&id=".$object->id."\">".$langs->trans("Delete")."</a>";
-					else
-						print "<a class=\"butActionRefused classfortooltip\" href=\"#\">".$langs->trans("Delete")."</a>";
+					if ($user->rights->stock->supprimer) {
+						print '<a class="butActionDelete" href="card.php?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
+					}
+					else {
+						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete").'</a>';
+					}
 				}
 			}
 
@@ -525,22 +515,22 @@ else
 			print "<tr class=\"liste_titre\">";
 			print_liste_field_titre("Product", "", "p.ref", "&amp;id=".$id, "", "", $sortfield, $sortorder);
 			print_liste_field_titre("Label", "", "p.label", "&amp;id=".$id, "", "", $sortfield, $sortorder);
-            print_liste_field_titre("Units", "", "ps.reel", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
-            if (!empty($conf->global->PRODUCT_USE_UNITS)) print_liste_field_titre("Unit", "", "p.fk_unit", "&amp;id=".$id, "", 'align="left"', $sortfield, $sortorder);
-            print_liste_field_titre("AverageUnitPricePMPShort", "", "p.pmp", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
+			print_liste_field_titre("Units", "", "ps.reel", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) print_liste_field_titre("Unit", "", "p.fk_unit", "&amp;id=".$id, "", 'align="left"', $sortfield, $sortorder);
+			print_liste_field_titre("AverageUnitPricePMPShort", "", "p.pmp", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
 			print_liste_field_titre("EstimatedStockValueShort", "", "", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
-            if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-                print_liste_field_titre("SellPriceMin", "", "p.price", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
-            }
-            if (empty($conf->global->PRODUIT_MULTIPRICES)) {
-                print_liste_field_titre("EstimatedStockValueSellShort", "", "", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
-            }
+			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+				print_liste_field_titre("SellPriceMin", "", "p.price", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
+			}
+			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+				print_liste_field_titre("EstimatedStockValueSellShort", "", "", "&amp;id=".$id, "", '', $sortfield, $sortorder, 'right ');
+			}
 			if ($user->rights->stock->mouvement->creer) {
-                print_liste_field_titre('');
-            }
+				print_liste_field_titre('');
+			}
 			if ($user->rights->stock->creer) {
-                print_liste_field_titre('');
-            }
+				print_liste_field_titre('');
+			}
 			print "</tr>\n";
 
 			$totalunit = 0;
@@ -548,7 +538,7 @@ else
 
 			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc, p.entity,";
 			$sql .= " ps.reel as value";
-            if (!empty($conf->global->PRODUCT_USE_UNITS)) $sql .= ",fk_unit";
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) $sql .= ",fk_unit";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
 			$sql .= " WHERE ps.fk_product = p.rowid";
 			$sql .= " AND ps.reel <> 0"; // We do not show if stock is 0 (no product in this warehouse)
@@ -571,7 +561,7 @@ else
 						$sql = "SELECT label";
 						$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sql .= " WHERE fk_product=".$objp->rowid;
-						$sql .= " AND lang='".$langs->getDefaultLang()."'";
+						$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
 						$sql .= " LIMIT 1";
 
 						$result = $db->query($sql);
@@ -605,35 +595,35 @@ else
 					print '</td>';
 					$totalunit += $objp->value;
 
-                    if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-                        // Units
-                        print '<td align="left">';
-                        if (is_null($productstatic->fk_unit))$productstatic->fk_unit = 1;
-                        print $langs->trans($productstatic->getLabelOfUnit());
-                        print '</td>';
-                    }
-                    // Price buy PMP
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+						// Units
+						print '<td align="left">';
+						if (is_null($productstatic->fk_unit))$productstatic->fk_unit = 1;
+						print $langs->trans($productstatic->getLabelOfUnit());
+						print '</td>';
+					}
+					// Price buy PMP
 					print '<td class="right">'.price(price2num($objp->ppmp, 'MU')).'</td>';
 
-                    // Total PMP
+					// Total PMP
 					print '<td class="right">'.price(price2num($objp->ppmp * $objp->value, 'MT')).'</td>';
 					$totalvalue += price2num($objp->ppmp * $objp->value, 'MT');
 
-                    // Price sell min
-                    if (empty($conf->global->PRODUIT_MULTIPRICES))
-                    {
-                        $pricemin = $objp->price;
-                        print '<td class="right">';
-                        print price(price2num($pricemin, 'MU'), 1);
-                        print '</td>';
-                        // Total sell min
-                        print '<td class="right">';
-                        print price(price2num($pricemin * $objp->value, 'MT'), 1);
-                        print '</td>';
-                    }
-                    $totalvaluesell += price2num($pricemin * $objp->value, 'MT');
+					// Price sell min
+					if (empty($conf->global->PRODUIT_MULTIPRICES))
+					{
+						$pricemin = $objp->price;
+						print '<td class="right">';
+						print price(price2num($pricemin, 'MU'), 1);
+						print '</td>';
+						// Total sell min
+						print '<td class="right">';
+						print price(price2num($pricemin * $objp->value, 'MT'), 1);
+						print '</td>';
+					}
+					$totalvaluesell += price2num($pricemin * $objp->value, 'MT');
 
-                    if ($user->rights->stock->mouvement->creer)
+					if ($user->rights->stock->mouvement->creer)
 					{
 						print '<td class="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&id='.$objp->rowid.'&action=transfert&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id).'">';
 						print img_picto($langs->trans("StockMovement"), 'uparrow.png', 'class="hideonsmartphone"').' '.$langs->trans("StockMovement");
@@ -645,15 +635,15 @@ else
 						print '<td class="center"><a href="'.DOL_URL_ROOT.'/product/stock/product.php?dwid='.$object->id.'&id='.$objp->rowid.'&action=correction&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$id).'">';
 						print $langs->trans("StockCorrection");
 						print "</a></td>";
-                    }
-                    if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-                        if ($i == 0) $units = $productstatic->fk_unit;
-                        elseif ($productstatic->fk_unit != $units) $sameunits = false;
-                    }
-                    print "</tr>";
-                    $i++;
-                }
-                $db->free($resql);
+					}
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+						if ($i == 0) $units = $productstatic->fk_unit;
+						elseif ($productstatic->fk_unit != $units) $sameunits = false;
+					}
+					print "</tr>";
+					$i++;
+				}
+				$db->free($resql);
 
 				print '<tr class="liste_total"><td class="liste_total" colspan="2">'.$langs->trans("Total").'</td>';
 				print '<td class="liste_total right">';
@@ -662,19 +652,17 @@ else
 				print '</td>';
 				print '<td class="liste_total">';
 				if (empty($conf->global->PRODUCT_USE_UNITS) && $sameunits) print $langs->trans($productstatic->getLabelOfUnit());
-                print '</td>';
-                print '<td class="liste_total right">'.price(price2num($totalvalue, 'MT')).'</td>';
-                if (empty($conf->global->PRODUIT_MULTIPRICES))
-                {
-                    print '<td class="liste_total">&nbsp;</td>';
-                    print '<td class="liste_total right">'.price(price2num($totalvaluesell, 'MT')).'</td>';
-                }
-                print '<td class="liste_total">&nbsp;</td>';
+				print '</td>';
+				print '<td class="liste_total right">'.price(price2num($totalvalue, 'MT')).'</td>';
+				if (empty($conf->global->PRODUIT_MULTIPRICES))
+				{
+					print '<td class="liste_total">&nbsp;</td>';
+					print '<td class="liste_total right">'.price(price2num($totalvaluesell, 'MT')).'</td>';
+				}
+				print '<td class="liste_total">&nbsp;</td>';
 				print '<td class="liste_total">&nbsp;</td>';
 				print '</tr>';
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 			print "</table>\n";
@@ -752,23 +740,21 @@ else
 				if ($key == $object->statut)
 				{
 					print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
-				}
-				else
-				{
+				} else {
 					print '<option value="'.$key.'">'.$langs->trans($value).'</option>';
 				}
 			}
 			print '</select>';
 			print '</td></tr>';
 
-            // Other attributes
-            $parameters = array('colspan' => ' colspan="3"', 'cols' => '3');
-            $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('colspan' => ' colspan="3"', 'cols' => '3');
+			$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);
+			}
 
 			// Tags-Categories
 			if ($conf->categorie->enabled)
@@ -801,46 +787,43 @@ else
 }
 
 /*
- * Documents generes
+ * Documents generated
  */
 
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
+$modulepart = 'stock';
+
+if ($action != 'create' && $action != 'edit' && $action != 'delete')
 {
+	print '<br>';
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
+
+	// Documents
+	$objectref = dol_sanitizeFileName($object->ref);
+	$relativepath = $object->ref.'/'.$objectref.'.pdf';
+	$filedir = $conf->stock->dir_output.'/'.$objectref;
+	$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+	$genallowed = $usercanread;
+	$delallowed = $usercancreate;
 	$modulepart = 'stock';
 
-	if ($action != 'create' && $action != 'edit' && $action != 'delete')
-	{
-		print '<br/>';
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+	print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
+	$somethingshown = $formfile->numoffiles;
 
-	    // Documents
-	    $objectref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref.'/'.$objectref.'.pdf';
-	    $filedir = $conf->stock->dir_output.'/'.$objectref;
-	    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-	    $genallowed = $usercanread;
-	    $delallowed = $usercancreate;
-	    $modulepart = 'stock';
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
-	    $somethingshown = $formfile->numoffiles;
+	$MAXEVENT = 10;
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	$morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';
+	$morehtmlright .= $langs->trans("SeeAll");
+	$morehtmlright .= '</a>';
 
-	    $MAXEVENT = 10;
+	// List of actions on element
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	$formactions = new FormActions($db);
+	$somethingshown = $formactions->showactions($object, 'stock', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
 
-	    $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, 'stock', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product
-
-	    print '</div></div></div>';
-	}
+	print '</div></div></div>';
 }
 
 // End of page
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 0c61ae605c0..71f687a1b03 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -118,7 +118,7 @@ class StockMovements extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -126,27 +126,26 @@ class StockMovements extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $i = 0;
-            $num = $db->num_rows($result);
+            $num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $stockmovement_static = new MouvementStock($db);
+            	$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 : '.$db->lasterror());
+        } 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');
@@ -304,7 +303,7 @@ class StockMovements extends DolibarrApi
         unset($object->note_public);
         unset($object->shipping_method_id);
         unset($object->fk_account);
-        unset($object->modelpdf);
+        unset($object->model_pdf);
         unset($object->fk_delivery_address);
         unset($object->cond_reglement);
         unset($object->cond_reglement_id);
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 0d244785479..1c31bbbc2af 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -111,7 +111,7 @@ class Warehouses extends DolibarrApi
         $sql .= ' WHERE t.entity IN ('.getEntity('stock').')';
     	// Select warehouses of given category
     	if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$db->escape($category);
+    		$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_warehouse = t.rowid ";
     	}
         // Add sql filters
@@ -125,7 +125,7 @@ class Warehouses extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -133,27 +133,26 @@ class Warehouses extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $i = 0;
-            $num = $db->num_rows($result);
+            $num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $warehouse_static = new Entrepot($db);
+            	$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 : '.$db->lasterror());
+        } else {
+        	throw new RestException(503, 'Error when retrieve warehouse list : '.$this->db->lasterror());
         }
         if (!count($obj_ret)) {
             throw new RestException(404, 'No warehouse found');
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 76e828dda91..a16b1ee189c 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2008 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011	   Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2016	   Francis Appels       <francis.appels@yahoo.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-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
@@ -48,12 +48,16 @@ class Entrepot extends CommonObject
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
 	public $picto = 'stock';
-	public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+
+	/**
+	 * @var int 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 */
+	public $ismultientitymanaged = 1;
 
 	/**
 	 * @var string	Label
 	 * @deprecated
-     * @see $label
+	 * @see $label
 	 */
 	public $libelle;
 
@@ -69,7 +73,7 @@ class Entrepot extends CommonObject
 
 	public $statut;
 
-    /**
+	/**
 	 * @var string Place
 	 */
 	public $lieu;
@@ -84,7 +88,7 @@ class Entrepot extends CommonObject
 	 */
 	public $zip;
 
-    /**
+	/**
 	 * @var string Town
 	 */
 	public $town;
@@ -100,13 +104,13 @@ class Entrepot extends CommonObject
 	public $fax;
 
 	/**
-     * @var int ID of parent
-     */
+	 * @var int ID of parent
+	 */
 	public $fk_parent;
 
 	/**
-     * @var array List of short language codes for status
-     */
+	 * @var array List of short language codes for status
+	 */
 	public $statuts = array();
 
 	/**
@@ -166,9 +170,7 @@ class Entrepot extends CommonObject
 		{
 			$this->statuts[self::STATUS_OPEN_ALL] = 'OpenAll';
 			$this->statuts[self::STATUS_OPEN_INTERNAL] = 'OpenInternal';
-		}
-		else
-		{
+		} else {
 			$this->statuts[self::STATUS_OPEN_ALL] = 'Opened';
 		}
 	}
@@ -185,11 +187,10 @@ class Entrepot extends CommonObject
 
 		$error = 0;
 
-		if (empty($this->label)) $this->label = $this->libelle; // For backward compatibility
+		$this->label = trim(!empty($this->label) ? $this->label : $this->libelle);
 
-		$this->label = trim($this->label);
-		if ($this->label == '')
-		{
+		// Error if label not defined
+		if ($this->label == '') {
 			$this->error = "ErrorFieldRequired";
 			return 0;
 		}
@@ -219,39 +220,34 @@ class Entrepot extends CommonObject
 					}
 				}
 
-                // Actions on extra fields
-                if (!$error)
-                {
-                    if (!$error)
-                    {
-                        $result = $this->insertExtraFields();
-                        if ($result < 0)
-                        {
-                            $error++;
-                        }
-                    }
-                }
+				// Actions on extra fields
+				if (!$error)
+				{
+					if (!$error)
+					{
+						$result = $this->insertExtraFields();
+						if ($result < 0)
+						{
+							$error++;
+						}
+					}
+				}
 
 				if (!$error)
 				{
 					$this->db->commit();
 					return $id;
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this)."::create return -3");
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else {
+			} else {
 				$this->error = "Failed to get insert id";
 				dol_syslog(get_class($this)."::create return -2");
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::create Error ".$this->db->error());
 			$this->db->rollback();
@@ -268,12 +264,12 @@ class Entrepot extends CommonObject
 	 */
 	public function update($id, $user)
 	{
-	    global $conf;
+		global $conf;
 
-        $error = 0;
+		$error = 0;
 
-	    if (empty($id)) $id = $this->id;
-	    if (empty($this->label)) $this->label = $this->libelle; // For backward compatibility
+		if (empty($id)) $id = $this->id;
+		if (empty($this->label)) $this->label = $this->libelle; // For backward compatibility
 
 		// Check if new parent is already a child of current warehouse
 		if (!empty($this->fk_parent))
@@ -287,7 +283,8 @@ class Entrepot extends CommonObject
 			}
 		}
 
-		$this->label = trim($this->label);
+		$this->label = trim(!empty($this->label) ? $this->label : $this->libelle);
+
 		$this->description = trim($this->description);
 
 		$this->lieu = trim($this->lieu);
@@ -316,18 +313,18 @@ class Entrepot extends CommonObject
 		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) {
-            $result = $this->insertExtraFields();
-            if ($result < 0)
-            {
-                $error++;
-            }
-        }
+		if (!$error) {
+			$result = $this->insertExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+			}
+		}
 
 		if (!$error) {
 			$this->db->commit();
@@ -349,7 +346,7 @@ class Entrepot extends CommonObject
 	 */
 	public function delete($user, $notrigger = 0)
 	{
-	    global $conf;
+		global $conf;
 
 		$error = 0;
 
@@ -359,10 +356,10 @@ class Entrepot extends CommonObject
 
 		if (!$error && empty($notrigger))
 		{
-            // Call trigger
-            $result = $this->call_trigger('WAREHOUSE_DELETE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('WAREHOUSE_DELETE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		$elements = array('stock_mouvement', 'product_stock', 'product_warehouse_properties');
@@ -426,9 +423,7 @@ class Entrepot extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -456,15 +451,13 @@ class Entrepot extends CommonObject
 			return -1;
 		}
 
-		$sql  = "SELECT rowid, fk_parent, ref as label, description, statut, lieu, address, zip, town, fk_pays as country_id, phone, fax";
-		$sql .= ", entity";
+		$sql  = "SELECT rowid, entity, fk_parent, ref as label, description, statut, lieu, address, zip, town, fk_pays as country_id, phone, fax,";
+		$sql .= " model_pdf, import_key";
 		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot";
 		if ($id)
 		{
 			$sql .= " WHERE rowid = '".$id."'";
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE entity = ".$conf->entity;
 			if ($ref) $sql .= " AND ref = '".$this->db->escape($ref)."'";
 		}
@@ -489,28 +482,27 @@ class Entrepot extends CommonObject
 				$this->zip            = $obj->zip;
 				$this->town           = $obj->town;
 				$this->country_id     = $obj->country_id;
-				$this->phone = $obj->phone;
-				$this->fax = $obj->fax;
+				$this->phone          = $obj->phone;
+				$this->fax            = $obj->fax;
 
-                // Retreive all extrafield
-                // fetch optionals attributes and labels
-                $this->fetch_optionals();
+				$this->model_pdf      = $obj->model_pdf;
+				$this->import_key     = $obj->import_key;
+
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
 
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-	            $tmp = getCountry($this->country_id, 'all');
+				$tmp = getCountry($this->country_id, 'all');
 				$this->country = $tmp['label'];
 				$this->country_code = $tmp['code'];
 
 				return 1;
-			}
-			else
-			{
-                $this->error = "Record Not Found";
+			} else {
+				$this->error = "Record Not Found";
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -556,15 +548,13 @@ class Entrepot extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
-	        dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
 		}
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of all warehouses
 	 *
@@ -573,7 +563,7 @@ class Entrepot extends CommonObject
 	 */
 	public function list_array($status = 1)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$liste = array();
 
 		$sql = "SELECT rowid, ref as label";
@@ -597,7 +587,7 @@ class Entrepot extends CommonObject
 		return $liste;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return number of unique different product into a warehouse
 	 *
@@ -605,7 +595,7 @@ class Entrepot extends CommonObject
 	 */
 	public function nb_different_products()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$ret = array();
 
 		$sql = "SELECT count(distinct p.rowid) as nb";
@@ -621,9 +611,7 @@ class Entrepot extends CommonObject
 			$obj = $this->db->fetch_object($result);
 			$ret['nb'] = $obj->nb;
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -631,7 +619,7 @@ class Entrepot extends CommonObject
 		return $ret;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return stock and value of warehosue
 	 *
@@ -639,7 +627,7 @@ class Entrepot extends CommonObject
 	 */
 	public function nb_products()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$ret = array();
 
 		$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
@@ -656,9 +644,7 @@ class Entrepot extends CommonObject
 			$ret['nb'] = $obj->nb;
 			$ret['value'] = $obj->value;
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -677,7 +663,7 @@ class Entrepot extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return label of a given status
 	 *
@@ -687,7 +673,7 @@ class Entrepot extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		$statusType = 'status5';
@@ -707,7 +693,7 @@ class Entrepot extends CommonObject
 	 *	@param		int		$withpicto		with pictogram
 	 *	@param		string	$option			Where the link point to
 	 *  @param      int     $showfullpath   0=Show ref only. 1=Show full path instead of Ref (this->fk_parent must be defined)
-     *  @param	    int   	$notooltip		1=Disable tooltip
+	 *  @param	    int   	$notooltip		1=Disable tooltip
 	 *	@return		string					String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $showfullpath = 0, $notooltip = 0)
@@ -715,86 +701,86 @@ class Entrepot extends CommonObject
 		global $conf, $langs, $hookmanager;
 		$langs->load("stocks");
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) $withpicto = 0;
+		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) $withpicto = 0;
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("Warehouse").'</u>';
-        $label .= '<br><b>'.$langs->trans('Ref').':</b> '.(empty($this->ref) ? (empty($this->label) ? $this->libelle : $this->label) : $this->ref);
-        if (!empty($this->lieu)) {
-            $label .= '<br><b>'.$langs->trans('LocationSummary').':</b> '.$this->lieu;
-        }
-        if (isset($this->statut)) {
-            $label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
-        }
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Warehouse").'</u>';
+		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.(empty($this->ref) ? (empty($this->label) ? $this->libelle : $this->label) : $this->ref);
+		if (!empty($this->lieu)) {
+			$label .= '<br><b>'.$langs->trans('LocationSummary').':</b> '.$this->lieu;
+		}
+		if (isset($this->statut)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		}
 
-        $url = DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/product/stock/card.php?id='.$this->id;
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("Warehouse");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip"';
-        }
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("Warehouse");
+				$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 .= ($showfullpath ? $this->get_full_arbo() : (empty($this->label) ? $this->libelle : $this->label));
-        $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 .= (($showfullpath || !empty($conf->global->STOCK_ALWAYS_SHOW_FULL_ARBO)) ? $this->get_full_arbo() : (empty($this->label) ? $this->libelle : $this->label));
+		$result .= $linkend;
 
-        global $action;
-        $hookmanager->initHooks(array('warehousedao'));
-        $parameters = array('id'=>$this->id, 'getnomurl'=>$result, 'withpicto' => $withpicto, 'option' => $option, 'showfullpath' => $showfullpath, 'notooltip'=> $notooltip);
-        $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->initHooks(array('warehousedao'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result, 'withpicto' => $withpicto, 'option' => $option, 'showfullpath' => $showfullpath, 'notooltip'=> $notooltip);
+		$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;
 	}
 
 	/**
-     *  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;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        // Initialize parameters
-        $this->id = 0;
-        $this->label = 'WAREHOUSE SPECIMEN';
-        $this->description = 'WAREHOUSE SPECIMEN '.dol_print_date($now, 'dayhourlog');
+		// Initialize parameters
+		$this->id = 0;
+		$this->label = 'WAREHOUSE SPECIMEN';
+		$this->description = 'WAREHOUSE SPECIMEN '.dol_print_date($now, 'dayhourlog');
 		$this->statut = 1;
-        $this->specimen = 1;
+		$this->specimen = 1;
 
 		$this->lieu = 'Location test';
-        $this->address = '21 jump street';
-        $this->zip = '99999';
-        $this->town = 'MyTown';
-        $this->country_id = 1;
-        $this->country_code = 'FR';
-    }
+		$this->address = '21 jump street';
+		$this->zip = '99999';
+		$this->town = 'MyTown';
+		$this->country_id = 1;
+		$this->country_code = 'FR';
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Return full path to current warehouse
 	 *
@@ -802,41 +788,39 @@ class Entrepot extends CommonObject
 	 */
 	public function get_full_arbo()
 	{
-        // phpcs:enable
-        global $user, $langs, $conf;
+		// phpcs:enable
+		global $user, $langs, $conf;
 
-        $TArbo = array(empty($this->label) ? $this->libelle : $this->label);
+		$TArbo = array(empty($this->label) ? $this->libelle : $this->label);
 
-        $protection = 100; // We limit depth of warehouses to 100
+		$protection = 100; // We limit depth of warehouses to 100
 
-        $warehousetmp = new Entrepot($this->db);
+		$warehousetmp = new Entrepot($this->db);
 
-        $parentid = $this->fk_parent; // If parent_id not defined on current object, we do not start consecutive searches of parents
-        $i = 0;
-        while ($parentid > 0 && $i < $protection)
-        {
-            $sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid = '.$parentid;
-            $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $objarbo = $this->db->fetch_object($resql);
-                if ($objarbo)
-                {
-                	$warehousetmp->fetch($parentid);
-                	$TArbo[] = $warehousetmp->label;
-                 	$parentid = $objarbo->fk_parent;
-                }
-                else break;
-            }
-            else dol_print_error($this->db);
+		$parentid = $this->fk_parent; // If parent_id not defined on current object, we do not start consecutive searches of parents
+		$i = 0;
+		while ($parentid > 0 && $i < $protection)
+		{
+			$sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'entrepot WHERE rowid = '.$parentid;
+			$resql = $this->db->query($sql);
+			if ($resql)
+			{
+				$objarbo = $this->db->fetch_object($resql);
+				if ($objarbo)
+				{
+					$warehousetmp->fetch($parentid);
+					$TArbo[] = $warehousetmp->label;
+				 	$parentid = $objarbo->fk_parent;
+				} else break;
+			} else dol_print_error($this->db);
 
-            $i++;
-        }
+			$i++;
+		}
 
-        return implode(' >> ', array_reverse($TArbo));
+		return implode(' >> ', array_reverse($TArbo));
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return array of children warehouses ids from $id warehouse (recursive function)
 	 *
@@ -844,9 +828,9 @@ class Entrepot extends CommonObject
 	 * @param   integer[]	$TChildWarehouses	array which will contain all children (param by reference)
 	 * @return  integer[]   $TChildWarehouses	array which will contain all children
 	 */
-    public function get_children_warehouses($id, &$TChildWarehouses)
-    {
-        // phpcs:enable
+	public function get_children_warehouses($id, &$TChildWarehouses)
+	{
+		// phpcs:enable
 
 		$sql = 'SELECT rowid
 				FROM '.MAIN_DB_PREFIX.'entrepot
@@ -861,7 +845,7 @@ class Entrepot extends CommonObject
 		}
 
 		return $TChildWarehouses;
-    }
+	}
 
 	/**
 	 *	Create object on disk
@@ -883,8 +867,8 @@ class Entrepot extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'standard';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->STOCK_ADDON_PDF)) {
 				$modele = $conf->global->STOCK_ADDON_PDF;
 			}
@@ -906,10 +890,10 @@ class Entrepot extends CommonObject
 	 * @return void
 	 */
 	public function setCategories($categories)
-    {
-    	$type_categ = Categorie::TYPE_WAREHOUSE;
+	{
+		$type_categ = Categorie::TYPE_WAREHOUSE;
 
-    	// Handle single category
+		// Handle single category
 		if (!is_array($categories)) {
 			$categories = array($categories);
 		}
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index ffc84f41e92..0252e6a17ce 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -41,7 +41,14 @@ class MouvementStock extends CommonObject
 	public $table_element = 'stock_mouvement';
 
 
+    /**
+     * @var int ID product
+     */
 	public $product_id;
+
+    /**
+     * @var int ID warehouse
+     */
 	public $warehouse_id;
 	public $qty;
 
@@ -58,7 +65,7 @@ class MouvementStock extends CommonObject
 	public $price;
 
 	/**
-     * @var int ID
+     * @var int ID user author
      */
 	public $fk_user_author;
 
@@ -204,6 +211,7 @@ class MouvementStock extends CommonObject
 		{
 			if (empty($batch))
 			{
+				$langs->load("errors");
 				$this->errors[] = $langs->transnoentitiesnoconv("ErrorTryToMakeMoveOnProductRequiringBatchData", $product->ref);
 				dol_syslog("Try to make a movement of a product with status_batch on without any batch data");
 
@@ -411,7 +419,7 @@ class MouvementStock extends CommonObject
 			$sql .= " fk_entrepot, value, type_mouvement, fk_user_author, label, inventorycode, price, fk_origin, origintype, fk_projet";
 			$sql .= ")";
 			$sql .= " VALUES ('".$this->db->idate($now)."', ".$this->product_id.", ";
-			$sql .= " ".($batch ? "'".$batch."'" : "null").", ";
+			$sql .= " ".($batch ? "'".$this->db->escape($batch)."'" : "null").", ";
 			$sql .= " ".($eatby ? "'".$this->db->idate($eatby)."'" : "null").", ";
 			$sql .= " ".($sellby ? "'".$this->db->idate($sellby)."'" : "null").", ";
 			$sql .= " ".$this->entrepot_id.", ".$this->qty.", ".((int) $this->type).",";
@@ -908,13 +916,13 @@ class MouvementStock extends CommonObject
 			}
 			else
 			{
-				dol_syslog(get_class($this)."::createBatch array param dluo must contain at least key fk_product_stock".$error, LOG_ERR);
+				dol_syslog(get_class($this)."::createBatch array param dluo must contain at least key fk_product_stock", LOG_ERR);
 				$result = -1;
 			}
 		}
 		else
 		{
-			dol_syslog(get_class($this)."::createBatch error invalid param dluo".$error, LOG_ERR);
+			dol_syslog(get_class($this)."::createBatch error invalid param dluo", LOG_ERR);
 			$result = -1;
 		}
 
@@ -994,6 +1002,10 @@ class MouvementStock extends CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 				$origin = new Mo($this->db);
 				break;
+			case 'user':
+				require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+				$origin = new User($this->db);
+				break;
 
 			default:
 				if ($origintype)
@@ -1130,20 +1142,16 @@ class MouvementStock extends CommonObject
 		if ($mode == 0 || $mode == 1)
 		{
 			return $langs->trans('StatusNotApplicable');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			return img_picto($langs->trans('StatusNotApplicable'), 'statut9').' '.$langs->trans('StatusNotApplicable');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			return $langs->trans('StatusNotApplicable').' '.img_picto($langs->trans('StatusNotApplicable'), 'statut9');
 		}
@@ -1169,8 +1177,8 @@ class MouvementStock extends CommonObject
 		if (!dol_strlen($modele)) {
 			$modele = 'stdmovement';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->MOUVEMENT_ADDON_PDF)) {
 				$modele = $conf->global->MOUVEMENT_ADDON_PDF;
 			}
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index f0a5c0a48ea..9ff36db3c5b 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -56,17 +56,46 @@ class Productlot extends CommonObject
 	 */
     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.
+     */
+
 	/**
 	 * @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'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'batch'         =>array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>1, 'notnull'=>0, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'comment'=>'Batch'),
-		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
-		'datec'         =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
-		'tms'           =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
-		'fk_user_creat'=>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'),
-		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511)
+		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
+		'fk_product'    => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>15, 'notnull'=>1, 'index'=>1, 'searchall'=>1),
+		'batch'         => array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>1, 'notnull'=>0, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'comment'=>'Batch', 'searchall'=>1),
+		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
+		'sellby'        => array('type'=>'date', 'label'=>'SellByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_SELLBY)?1:0', 'visible'=>5, 'position'=>60),
+		'eatby'         => array('type'=>'date', 'label'=>'EatByDate', 'enabled'=>'empty($conf->global->PRODUCT_DISABLE_EATBY)?1:0', 'visible'=>5, 'position'=>62),
+		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
+		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511)
 	);
 
 	/**
@@ -571,8 +600,7 @@ class Productlot extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.'"';
         $linkstart .= $linkclose.'>';
diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php
index 2b7069c82b5..469cec4a9a2 100644
--- a/htdocs/product/stock/class/productstockentrepot.class.php
+++ b/htdocs/product/stock/class/productstockentrepot.class.php
@@ -532,28 +532,23 @@ class ProductStockEntrepot extends CommonObject
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
diff --git a/htdocs/product/stock/fiche-valo.php b/htdocs/product/stock/fiche-valo.php
index 807d9f36a4f..494f6042ff1 100644
--- a/htdocs/product/stock/fiche-valo.php
+++ b/htdocs/product/stock/fiche-valo.php
@@ -130,9 +130,7 @@ if ($_GET["id"])
 			$url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file=entrepot-'.$entrepot->id.'-'.($year - 1).'.png';
 			print '<br><img src="'.$url.'" alt="Valorisation du stock annee '.($year - 1).'">';
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		print $langs->trans("FeatureNotYetAvailable");
 	}
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 92b68da7d10..1c93d1ee943 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
+/* Copyright (C) 2003-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2019		Nicolas ZABOURI		<info@inovea-conseil.com>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,9 +20,9 @@
  */
 
 /**
- *  \file       htdocs/product/stock/index.php
- *  \ingroup    stock
- *  \brief      Home page of stock area
+ *  \file		htdocs/product/stock/index.php
+ *  \ingroup	stock
+ *  \brief		Home page of stock area
  */
 
 require '../../main.inc.php';
@@ -60,22 +61,22 @@ 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.'/product/stock/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\">";
-    print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print '<tr class="oddevene"><td>';
-    print $langs->trans("Warehouse").':</td><td><input class="flat" type="text" size="18" name="sall"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
-    print "</table></div></form><br>";
+	print '<form method="post" action="'.DOL_URL_ROOT.'/product/stock/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\">";
+	print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
+	print '<tr class="oddevene"><td>';
+	print $langs->trans("Warehouse").':</td><td><input class="flat" type="text" size="18" name="sall"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print "</table></div></form><br>";
 }
 
 $max = 15;
 
 $sql = "SELECT e.rowid, e.ref as label, e.lieu, e.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
-$sql .= " WHERE e.statut in (0,1)";
+$sql .= " WHERE e.statut in (".Entrepot::STATUS_CLOSED.",".Entrepot::STATUS_OPEN_ALL.")";
 $sql .= " AND e.entity IN (".getEntity('stock').")";
 $sql .= $db->order('e.statut', 'DESC');
 $sql .= $db->plimit($max + 1, 0);
@@ -84,47 +85,55 @@ $result = $db->query($sql);
 
 if ($result)
 {
-    $num = $db->num_rows($result);
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="2">';
+	print $langs->trans("Warehouses").' ';
+	print '<a href="'.DOL_URL_ROOT.'/product/stock/list.php">';
+	// TODO: "search_status" on "/product/stock/list.php" currently only accept a single integer value
+	//print '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?search_status='.Entrepot::STATUS_CLOSED.','.Entrepot::STATUS_OPEN_ALL.'">';
+	print '<span class="badge">'.$num.'</span>';
+	print '</a>';
+	print '</th>';
+	print '</tr>';
 
-    print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Warehouses").'</th></tr>';
+	$i = 0;
+	if ($num)
+	{
+		while ($i < min($max, $num))
+		{
+			$objp = $db->fetch_object($result);
 
-    if ($num)
-    {
-        while ($i < min($max, $num))
-        {
-            $objp = $db->fetch_object($result);
+			$warehouse->id = $objp->rowid;
+			$warehouse->statut = $objp->status;
+			$warehouse->label = $objp->label;
+			$warehouse->lieu = $objp->lieu;
 
-            $warehouse->id = $objp->rowid;
-            $warehouse->statut = $objp->status;
-            $warehouse->label = $objp->label;
-            $warehouse->lieu = $objp->lieu;
+			print '<tr class="oddeven">';
+			print '<td>';
+			print $warehouse->getNomUrl(1);
+			print '</td>'."\n";
+			print '<td class="right">';
+			print $warehouse->getLibStatut(5);
+			print '</td>';
+			print "</tr>\n";
+			$i++;
+		}
+		$db->free($result);
+	} else {
+		print '<tr><td>'.$langs->trans("None").'</td><td></td></tr>';
+	}
+	if ($num > $max) {
+		print '<tr><td><span class="opacitymedium">'.$langs->trans("More").'...</span></td><td></td></tr>';
+	}
 
-            print '<tr class="oddeven">';
-            print '<td>';
-            print $warehouse->getNomUrl(1);
-            print '</td>'."\n";
-            print '<td class="right">';
-            print $warehouse->getLibStatut(5);
-            print '</td>';
-            print "</tr>\n";
-            $i++;
-        }
-        $db->free($result);
-    }
-    if ($num > $max) {
-    	print '<tr><td><span class="opacitymedium">'.$langs->trans("More").'...</span></td><td></td></tr>';
-    }
-
-    print "</table>";
-    print '</div>';
-}
-else
-{
-    dol_print_error($db);
+	print "</table>";
+	print '</div>';
+} else {
+	dol_print_error($db);
 }
 
 
@@ -143,7 +152,7 @@ $sql .= ", ".MAIN_DB_PREFIX."product as p";
 $sql .= " WHERE m.fk_product = p.rowid";
 $sql .= " AND m.fk_entrepot = e.rowid";
 $sql .= " AND e.entity IN (".getEntity('stock').")";
-if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0";
+if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = ".Product::TYPE_PRODUCT;
 $sql .= $db->order("datem", "DESC");
 $sql .= $db->plimit($max, 0);
 
@@ -153,7 +162,7 @@ if ($resql)
 {
 	$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("LastMovements", min($num, $max)).'</th>';
@@ -161,8 +170,12 @@ if ($resql)
 	if (!empty($conf->productbatch->enabled))
 	{
 		print '<th>'.$langs->trans("Batch").'</th>';
-		print '<th>'.$langs->trans("SellByDate").'</th>';
-		print '<th>'.$langs->trans("EatByDate").'</th>';
+		if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+			print '<th>'.$langs->trans("SellByDate").'</th>';
+		}
+		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+			print '<th>'.$langs->trans("EatByDate").'</th>';
+		}
 	}
 	print '<th>'.$langs->trans("Warehouse").'</th>';
 	print '<th class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/product/stock/movement_list.php">'.$langs->trans("FullList").'</a></th>';
@@ -193,8 +206,12 @@ if ($resql)
 		if (!empty($conf->productbatch->enabled))
 		{
 			print '<td>'.$objp->batch.'</td>';
-			print '<td>'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
-			print '<td>'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
+			if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+				print '<td>'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
+			}
+			if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+				print '<td>'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
+			}
 		}
 		print '<td class="tdoverflowmax200">';
 		print $warehouse->getNomUrl(1);
@@ -208,7 +225,7 @@ if ($resql)
 	$db->free($resql);
 
 	print "</table>";
-    print '</div>';
+	print '</div>';
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index d73c5e9c907..b6ce237a2b5 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -141,9 +141,7 @@ function ordered($product_id)
 		} else {
 			return null; //img_picto('', 'stcomm-1');
 		}
-	}
-	else
-	{
+	} else {
 		$error = $db->lasterror();
 		dol_print_error($db);
 
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 036fba2be76..f717e541229 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -27,10 +27,10 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 
 if (!empty($conf->categorie->enabled))
 {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -59,8 +59,8 @@ if (!empty($conf->categorie->enabled))
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -97,12 +97,12 @@ $fieldstosearchall = array(
 );
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
 	$search_key = $key;
-	if  ($search_key == 'statut') $search_key = 'status'; // remove this after refactor entrepot.class property statut to status
+	if ($search_key == 'statut') $search_key = 'status'; // remove this after refactor entrepot.class property statut to status
 	if (GETPOST('search_'.$search_key, 'alpha') !== '') $search[$search_key] = GETPOST('search_'.$search_key, 'alpha');
 }
 
@@ -184,7 +184,6 @@ if (empty($reshook))
  */
 
 $form = new Form($db);
-$formcategory = new FormCategory($db);
 $warehouse = new Entrepot($db);
 
 $totalarray = array();
@@ -229,14 +228,14 @@ if (!empty($conf->categorie->enabled))
 foreach ($search as $key => $val)
 {
 	$class_key = $key;
-	if  ($class_key == 'status') $class_key = 'statut'; // remove this after refactor entrepot.class property statut to status
-	if (($key == 'status' && $search[$key] == -1) || $key=='entity') continue;
+	if ($class_key == 'status') $class_key = 'statut'; // remove this after refactor entrepot.class property statut to status
+	if (($key == 'status' && $search[$key] == -1) || $key == 'entity') continue;
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
 		if ($search[$key] == '-1') $search[$key] = '';
 		$mode_search = 2;
 	}
-	if ($search[$key] != '') $sql .= natural_search((($key == 'ref') ? 't.ref' : 't.' . $class_key), $search[$key], (($key == 'status') ? 2 : $mode_search));
+	if ($search[$key] != '') $sql .= natural_search((($key == 'ref') ? 't.ref' : 't.'.$class_key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
@@ -296,9 +295,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -378,8 +375,9 @@ if ($search_all)
 
 $moreforfilter = '';
 
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
+	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_WAREHOUSE, $search_category_list);
 }
 
@@ -424,8 +422,7 @@ foreach ($object->fields as $key => $val)
 		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
 		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]).'">';
+		} 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>';
 	}
 }
@@ -452,7 +449,7 @@ print $hookmanager->resPrint;
 
 // Status
 if (!empty($arrayfields['t.statut']['checked'])) {
-	print '<td class="liste_titre right">';
+	print '<td class="liste_titre center">';
 	print $form->selectarray('search_status', $warehouse->statuts, $search_status, 1, 0, 0, '', 1);
 	print '</td>';
 }
@@ -503,7 +500,7 @@ $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $objec
 print $hookmanager->resPrint;
 
 if (!empty($arrayfields['t.statut']['checked'])) {
-	print_liste_field_titre($arrayfields['t.statut']['label'], $_SERVER["PHP_SELF"], "t.statut", '', $param, '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre($arrayfields['t.statut']['label'], $_SERVER["PHP_SELF"], "t.statut", '', $param, '', $sortfield, $sortorder, 'center ');
 }
 
 // Action column
@@ -555,11 +552,9 @@ if ($num)
 				if ($key == 'statut') print $warehouse->getLibStatut(5);
 				if ($key == 'phone') {
 					print dol_print_phone($obj->phone, '', 0, $obj->rowid, 'AC_TEL');
-				}
-				elseif ($key == 'fax') {
+				} elseif ($key == 'fax') {
 					print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
-				}
-				else {
+				} else {
 					print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
 				}
 				print '</td>';
@@ -611,7 +606,7 @@ if ($num)
 
 		// Status
 		if (!empty($arrayfields['t.statut']['checked'])) {
-			print '<td class="right">'.$warehouse->LibStatut($obj->statut, 5).'</td>';
+			print '<td class="center">'.$warehouse->LibStatut($obj->statut, 5).'</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
 
@@ -663,10 +658,10 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	$urlsource .= str_replace('&amp;', '&', $param);
 
 	$filedir = $diroutputmassaction;
-	$genallowed = $user->rights->stock->read;
-	$delallowed = $user->rights->stock->create;
+	$genallowed = $user->rights->stock->lire;
+	$delallowed = $user->rights->stock->creer;
 
-	print $formfile->showdocuments('massfilesarea_mymodule', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+	print $formfile->showdocuments('massfilesarea_stock', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 890a45aad6d..86458966b34 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2013-2018 Laurent Destaileur	<ely@users.sourceforge.net>
+/* Copyright (C) 2013-2020 Laurent Destaileur	<ely@users.sourceforge.net>
  * Copyright (C) 2014	   Regis Houssin		<regis.houssin@inodbox.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -45,7 +45,7 @@ $result = restrictedArea($user, 'produit|service');
 
 //checks if a product has been ordered
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id_product = GETPOST('productid', 'int');
 $id_sw = GETPOST('id_sw', 'int');
 $id_tw = GETPOST('id_tw', 'int');
@@ -53,8 +53,8 @@ $batch = GETPOST('batch');
 $qty = GETPOST('qty');
 $idline = GETPOST('idline');
 
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 
@@ -122,15 +122,13 @@ if ($action == 'addline')
 	}
 
 	// TODO Check qty is ok for stock move. Note qty may not be enough yet, but we make a check now to report a warning.
-	// What is important is to have qty when doing action 'createmovements'
+	// What is more important is to have qty when doing action 'createmovements'
 	if (!$error)
 	{
 		// Warning, don't forget lines already added into the $_SESSION['massstockmove']
 		if ($producttmp->hasbatch())
 		{
-		}
-		else
-		{
+		} else {
 		}
 	}
 
@@ -141,9 +139,10 @@ if ($action == 'addline')
 		$listofdata[$id] = array('id'=>$id, 'id_product'=>$id_product, 'qty'=>$qty, 'id_sw'=>$id_sw, 'id_tw'=>$id_tw, 'batch'=>$batch);
 		$_SESSION['massstockmove'] = json_encode($listofdata);
 
-		unset($id_product);
 		//unset($id_sw);
 		//unset($id_tw);
+		unset($id_product);
+		unset($batch);
 		unset($qty);
 	}
 }
@@ -228,9 +227,7 @@ if ($action == 'createmovements')
 						$error++;
 						setEventMessages($product->errors, $product->errorss, 'errors');
 					}
-				}
-				else
-				{
+				} else {
 					$arraybatchinfo = $product->loadBatchInfo($batch);
 					if (count($arraybatchinfo) > 0)
 					{
@@ -238,9 +235,7 @@ if ($action == 'createmovements')
 						$dlc = $firstrecord['eatby'];
 						$dluo = $firstrecord['sellby'];
 						//var_dump($batch); var_dump($arraybatchinfo); var_dump($firstrecord); var_dump($dlc); var_dump($dluo); exit;
-					}
-					else
-					{
+					} else {
 						$dlc = '';
 						$dluo = '';
 					}
@@ -283,9 +278,7 @@ if ($action == 'createmovements')
 						setEventMessages($product->errors, $product->errorss, 'errors');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				// dol_print_error('',"Bad value saved into sessions");
 				$error++;
 			}
@@ -300,9 +293,7 @@ if ($action == 'createmovements')
 		setEventMessages($langs->trans("StockMovementRecorded"), null, 'mesgs');
 		header("Location: ".DOL_URL_ROOT.'/product/stock/index.php'); // Redirect to avoid pb when using back
 		exit;
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
@@ -348,31 +339,37 @@ print '<table class="liste centpercent">';
 $param = '';
 
 print '<tr class="liste_titre">';
+print getTitleFieldOfList($langs->trans('WarehouseSource'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
+print getTitleFieldOfList($langs->trans('WarehouseTarget'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
 print getTitleFieldOfList($langs->trans('ProductRef'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
 if ($conf->productbatch->enabled) {
 	print getTitleFieldOfList($langs->trans('Batch'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
 }
-print getTitleFieldOfList($langs->trans('WarehouseSource'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
-print getTitleFieldOfList($langs->trans('WarehouseTarget'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
 print getTitleFieldOfList($langs->trans('Qty'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'center tagtd maxwidthonsmartphone ');
 print getTitleFieldOfList('', 0);
 print '</tr>';
 
 
 print '<tr class="oddeven">';
+// From warehouse
+print '<td>';
+print $formproduct->selectWarehouses($id_sw, 'id_sw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200');
+print '</td>';
+// To warehouse
+print '<td>';
+print $formproduct->selectWarehouses($id_tw, 'id_tw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200');
+print '</td>';
 // Product
 print '<td class="titlefield">';
 $filtertype = 0;
 if (!empty($conf->global->STOCK_SUPPORTS_SERVICES)) $filtertype = '';
 if ($conf->global->PRODUIT_LIMIT_SIZE <= 0) {
 	$limit = '';
-}
-else
-{
+} else {
 	$limit = $conf->global->PRODUIT_LIMIT_SIZE;
 }
 
-$form->select_produits($id_product, 'productid', $filtertype, $limit, 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1);
+$form->select_produits($id_product, 'productid', $filtertype, $limit, 0, -1, 2, '', 1, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1);
 print '</td>';
 // Batch number
 if ($conf->productbatch->enabled)
@@ -381,14 +378,6 @@ if ($conf->productbatch->enabled)
 	print '<input type="text" name="batch" class="flat maxwidth50" value="'.$batch.'">';
 	print '</td>';
 }
-// In warehouse
-print '<td>';
-print $formproduct->selectWarehouses($id_sw, 'id_sw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200');
-print '</td>';
-// Out warehouse
-print '<td>';
-print $formproduct->selectWarehouses($id_tw, 'id_tw', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200');
-print '</td>';
 // Qty
 print '<td class="center"><input type="text" class="flat maxwidth50" name="qty" value="'.$qty.'"></td>';
 // Button to add line
@@ -405,6 +394,12 @@ foreach ($listofdata as $key => $val)
 
 	print '<tr class="oddeven">';
 	print '<td>';
+	print $warehousestatics->getNomUrl(1);
+	print '</td>';
+	print '<td>';
+	print $warehousestatict->getNomUrl(1);
+	print '</td>';
+	print '<td>';
 	print $productstatic->getNomUrl(1).' - '.$productstatic->label;
 	print '</td>';
 	if ($conf->productbatch->enabled)
@@ -413,12 +408,6 @@ foreach ($listofdata as $key => $val)
 		print $val['batch'];
 		print '</td>';
 	}
-	print '<td>';
-	print $warehousestatics->getNomUrl(1);
-	print '</td>';
-	print '<td>';
-	print $warehousestatict->getNomUrl(1);
-	print '</td>';
 	print '<td class="center">'.$val['qty'].'</td>';
 	print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=delline&idline='.$val['id'].'">'.img_delete($langs->trans("Remove")).'</a></td>';
 
@@ -434,31 +423,27 @@ print '</form>';
 print '<br>';
 
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire2">';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire2" class="formconsumeproduce">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="createmovements">';
 
 // Button to record mass movement
-$codemove = (isset($_POST["codemove"]) ?GETPOST("codemove", 'alpha') : dol_print_date(dol_now(), '%Y%m%d%H%M%S'));
-$labelmovement = GETPOST("label") ?GETPOST('label') : $langs->trans("StockTransfer").' '.dol_print_date($now, '%Y-%m-%d %H:%M');
+$codemove = (isset($_POST["codemove"]) ? GETPOST("codemove", 'alpha') : dol_print_date(dol_now(), '%Y%m%d%H%M%S'));
+$labelmovement = GETPOST("label") ? GETPOST('label') : $langs->trans("StockTransfer").' '.dol_print_date($now, '%Y-%m-%d %H:%M');
 
-print '<table class="noborder centpercent">';
-	print '<tr>';
-	print '<td class="titlefield fieldrequired">'.$langs->trans("InventoryCode").'</td>';
-	print '<td>';
-	print '<input type="text" name="codemove" size="15" value="'.dol_escape_htmltag($codemove).'">';
-	print '</td>';
-	print '</tr>';
-	print '<tr>';
-	print '<td>'.$langs->trans("MovementLabel").'</td>';
-	print '<td>';
-	print '<input type="text" name="label" class="quatrevingtpercent" value="'.dol_escape_htmltag($labelmovement).'">';
-	print '</td>';
-	print '</tr>';
-print '</table><br>';
+print '<div class="center">';
+print '<span class="fieldrequired">'.$langs->trans("InventoryCode").':</span> ';
+print '<input type="text" name="codemove" class="maxwidth300" value="'.dol_escape_htmltag($codemove).'"> &nbsp; ';
+print '<span class="clearbothonsmartphone"></span>';
+print $langs->trans("MovementLabel").': ';
+print '<input type="text" name="label" class="minwidth300" value="'.dol_escape_htmltag($labelmovement).'"><br>';
+print '<br>';
 
 print '<div class="center"><input class="button" type="submit" name="valid" value="'.dol_escape_htmltag($buttonrecord).'"></div>';
 
+print '<br>';
+print '</div>';
+
 print '</form>';
 
 // End of page
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index ea72983e810..6d0eb0dc24c 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -207,9 +207,7 @@ if ($action == "correct_stock")
 	        	$origin_element,
 	        	$origin_id
 	        ); // We do not change value of stock for a correction
-        }
-        else
-		{
+        } else {
 	        $result = $product->correct_stock(
 	            $user,
 	            $id,
@@ -227,9 +225,7 @@ if ($action == "correct_stock")
         {
             header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
             exit;
-        }
-        else
-        {
+        } else {
             $error++;
             setEventMessages($product->error, $product->errors, 'errors');
             $action = 'correction';
@@ -312,15 +308,11 @@ if ($action == "transfert_stock" && !$cancel)
                         $batch = $pdluo->batch;
                         $eatby = $pdluo->eatby;
                         $sellby = $pdluo->sellby;
-                    }
-                    else
-                    {
+                    } else {
                         setEventMessages($pdluo->error, $pdluo->errors, 'errors');
                         $error++;
                     }
-                }
-                else
-                {
+                } else {
                     $srcwarehouseid = $id;
                     $batch = GETPOST('batch_number', 'alpha');
                     $eatby = $d_eatby;
@@ -356,9 +348,7 @@ if ($action == "transfert_stock" && !$cancel)
                         GETPOST('inventorycode', 'alpha')
                     );
                 }
-            }
-            else
-            {
+            } else {
                 // Remove stock
                 $result1 = $product->correct_stock(
                     $user,
@@ -389,15 +379,11 @@ if ($action == "transfert_stock" && !$cancel)
                 {
                     header("Location: ".$backtopage);
                     exit;
-                }
-                else
-                {
+                } else {
                     header("Location: movement_list.php?id=".$object->id);
                     exit;
                 }
-            }
-            else
-            {
+            } else {
                 setEventMessages($product->error, $product->errors, 'errors');
                 $db->rollback();
                 $action = 'transfert';
@@ -471,7 +457,7 @@ $sql .= " AND e.entity IN (".getEntity('stock').")";
 if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0";
 if ($id > 0) $sql .= " AND e.rowid ='".$id."'";
 $sql .= dolSqlDateFilter('m.datem', 0, $month, $year);
-if ($idproduct > 0) $sql .= " AND p.rowid = '".$idproduct."'";
+if ($idproduct > 0) $sql .= " AND p.rowid = ".((int) $idproduct);
 if (!empty($search_ref))			$sql .= natural_search('m.rowid', $search_ref, 1);
 if (!empty($search_movement))      $sql .= natural_search('m.label', $search_movement);
 if (!empty($search_inventorycode)) $sql .= natural_search('m.inventorycode', $search_inventorycode);
@@ -532,8 +518,7 @@ if ($resql)
     $i = 0;
     $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
     if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
-	else
-	{
+	else {
 		$texte = $langs->trans("ListOfStockMovements");
 		if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
 	}
@@ -609,9 +594,7 @@ if ($resql)
         {
             $obj = $db->fetch_object($resqlbis);
             $lastmovementdate = $db->jdate($obj->datem);
-        }
-        else
-        {
+        } else {
             dol_print_error($db);
         }
 
@@ -619,9 +602,7 @@ if ($resql)
         if ($lastmovementdate)
         {
             print dol_print_date($lastmovementdate, 'dayhour');
-        }
-        else
-        {
+        } else {
             print $langs->trans("None");
         }
         print "</td></tr>";
@@ -963,7 +944,6 @@ if ($resql)
         $productlot->sellby = $objp->sellby;
 
         $warehousestatic->id = $objp->entrepot_id;
-        $warehousestatic->libelle = $objp->warehouse_ref; // deprecated
         $warehousestatic->label = $objp->warehouse_ref;
         $warehousestatic->lieu = $objp->lieu;
 
@@ -1137,9 +1117,7 @@ if ($resql)
     	print "<br>\n";
         //print '</td></tr>';
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 4db4451a878..b533d4407a6 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -39,8 +39,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.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
@@ -102,25 +102,31 @@ $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))),
-    'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, '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),
+	'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, '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),
 	'm.value'=>array('label'=>$langs->trans("Qty"), 'checked'=>1),
 	'm.price'=>array('label'=>$langs->trans("UnitPurchaseValue"), 'checked'=>0),
 	'm.fk_projet'=>array('label'=>$langs->trans('Project'), '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)
 );
+if (!empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+	unset($arrayfields['pl.eatby']);
+}
+if (!empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+	unset($arrayfields['pl.sellby']);
+}
 
 // Security check
 if (!$user->rights->stock->mouvement->lire) {
@@ -135,6 +141,8 @@ $usercanread = $user->rights->stock->mouvement->lire;
 $usercancreate = $user->rights->stock->mouvement->creer;
 $usercandelete = $user->rights->stock->mouvement->creer;
 
+$error = 0;
+
 
 /*
  * Actions
@@ -154,21 +162,21 @@ if (empty($reshook))
 	// 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();
 	}
 
 	// Mass actions
@@ -178,6 +186,25 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
+if ($action == 'update_extras') {
+	$tmpwarehouse = new Entrepot($db);
+	$tmpwarehouse->fetch($id);
+
+	$tmpwarehouse->oldcopy = dol_clone($tmpwarehouse);
+
+	// Fill array 'array_options' with data from update form
+	$ret = $extrafields->setOptionalsFromPost(null, $tmpwarehouse, GETPOST('attribute', 'restricthtml'));
+	if ($ret < 0) $error++;
+	if (!$error) {
+		$result = $tmpwarehouse->insertExtraFields();
+		if ($result < 0) {
+			setEventMessages($tmpwarehouse->error, $tmpwarehouse->errors, 'errors');
+			$error++;
+		}
+	}
+	if ($error) $action = 'edit_extras';
+}
+
 // Correct stock
 if ($action == "correct_stock")
 {
@@ -200,7 +227,7 @@ if ($action == "correct_stock")
 	}
 
 	if (!$error)
-    {
+	{
 		$origin_element = '';
 		$origin_id = null;
 
@@ -210,57 +237,53 @@ if ($action == "correct_stock")
 			$origin_id = GETPOST('projectid', 'int');
 		}
 
-        if ($product->hasbatch())
-        {
-        	$batch = GETPOST('batch_number', 'alphanohtml');
+		if ($product->hasbatch())
+		{
+			$batch = GETPOST('batch_number', 'alphanohtml');
 
-        	//$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"),
-	            GETPOST("label", 'san_alpha'),
-	            GETPOST('unitprice'),
-	        	$eatby, $sellby, $batch,
+				$user,
+				$id,
+				GETPOST("nbpiece", 'int'),
+				GETPOST("mouvement"),
+				GETPOST("label", 'san_alpha'),
+				GETPOST('unitprice'),
+				$eatby, $sellby, $batch,
 				GETPOST('inventorycode', 'alphanohtml'),
-	        	$origin_element,
-	        	$origin_id
-	        ); // We do not change value of stock for a correction
-        }
-        else
-		{
+				$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"),
-	            GETPOST("label", 'san_alpha'),
-	            GETPOST('unitprice'),
+				$user,
+				$id,
+				GETPOST("nbpiece", 'int'),
+				GETPOST("mouvement"),
+				GETPOST("label", 'san_alpha'),
+				GETPOST('unitprice'),
 				GETPOST('inventorycode', 'alphanohtml'),
-	        	$origin_element,
-	        	$origin_id
-	        ); // We do not change value of stock for a correction
-        }
+				$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
@@ -269,161 +292,151 @@ 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"))
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
-            $error++;
-            $action = 'transfert';
-        }
-    }
+		if ($product->hasbatch() && !GETPOST("batch_number"))
+		{
+			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', 'alphanohtml');
-                    $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', 'alphanohtml');
+					$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')
-                        );
-                    // 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', 'alphanohtml')
-                        );
-                }
-            }
-            else
-            {
-                // Remove stock
-                $result1 = $product->correct_stock(
-                    $user,
-                    $id,
-                    GETPOST("nbpiece"),
-                    1,
-                	GETPOST("label", 'san_alpha'),
-                    $pricesrc,
-                	GETPOST('inventorycode', 'alphanohtml')
-                    );
+				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')
+						);
+					// 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', 'alphanohtml')
+						);
+				}
+			} else {
+				// Remove stock
+				$result1 = $product->correct_stock(
+					$user,
+					$id,
+					GETPOST("nbpiece"),
+					1,
+					GETPOST("label", 'san_alpha'),
+					$pricesrc,
+					GETPOST('inventorycode', 'alphanohtml')
+					);
 
-                // Add stock
-                $result2 = $product->correct_stock(
-                    $user,
-                    GETPOST("id_entrepot_destination"),
-                    GETPOST("nbpiece"),
-                    0,
-                    GETPOST("label", 'san_alpha'),
-                    $pricedest,
-                	GETPOST('inventorycode', 'alphanohtml')
-                    );
-            }
-            if (!$error && $result1 >= 0 && $result2 >= 0)
-            {
-                $db->commit();
+				// Add stock
+				$result2 = $product->correct_stock(
+					$user,
+					GETPOST("id_entrepot_destination"),
+					GETPOST("nbpiece"),
+					0,
+					GETPOST("label", 'san_alpha'),
+					$pricedest,
+					GETPOST('inventorycode', 'alphanohtml')
+					);
+			}
+			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';
+			}
+		}
+	}
 }
 
 
@@ -470,7 +483,7 @@ $sql .= " AND e.entity IN (".getEntity('stock').")";
 if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0";
 if ($id > 0) $sql .= " AND e.rowid ='".$id."'";
 $sql .= dolSqlDateFilter('m.datem', 0, $month, $year);
-if ($idproduct > 0) $sql .= " AND p.rowid = '".$idproduct."'";
+if ($idproduct > 0) $sql .= " AND p.rowid = ".((int) $idproduct);
 if (!empty($search_ref))			$sql .= natural_search('m.rowid', $search_ref, 1);
 if (!empty($search_movement))      $sql .= natural_search('m.label', $search_movement);
 if (!empty($search_inventorycode)) $sql .= natural_search('m.inventorycode', $search_inventorycode);
@@ -479,6 +492,7 @@ if (!empty($search_product))       $sql .= natural_search('p.label', $search_pro
 if ($search_warehouse != '' && $search_warehouse != '-1')          $sql .= natural_search('e.rowid', $search_warehouse, 2);
 if (!empty($search_user))          $sql .= natural_search('u.login', $search_user);
 if (!empty($search_batch))         $sql .= natural_search('m.batch', $search_batch);
+if (!empty($product_id))           $sql .= natural_search('p.rowid', $product_id);
 if ($search_qty != '')				$sql .= natural_search('m.value', $search_qty, 1);
 if ($search_type_mouvement != '' && $search_type_mouvement != '-1')	$sql .= natural_search('m.type_mouvement', $search_type_mouvement, 2);
 // Add where from extra fields
@@ -492,21 +506,19 @@ $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;
+	}
 }
 
 if (empty($search_inventorycode))
 {
 	$sql .= $db->plimit($limit + 1, $offset);
-}
-else
-{
+} else {
 	$limit = 0;
 }
 
@@ -522,140 +534,135 @@ 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);
-        }
-    }
-
-    $num = $db->num_rows($resql);
-
-    $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);
-	else
 	{
+		$product->fetch($idproduct);
+	}
+	if ($id > 0 || $ref)
+	{
+		$result = $object->fetch($id, $ref);
+		if ($result < 0)
+		{
+			dol_print_error($db);
+		}
+	}
+
+	$num = $db->num_rows($resql);
+
+	$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);
+	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);
 
-        dol_fiche_head($head, 'movements', $langs->trans("Warehouse"), -1, 'stock');
+		dol_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 tableforfield">';
+		print '<table class="border centpercent tableforfield">';
 
-        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 tableforfield">';
+		print '<table class="border centpercent tableforfield">';
 
-        // 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 = '".$object->id."'";
-        $resqlbis = $db->query($sql);
-        if ($resqlbis)
-        {
-            $objbis = $db->fetch_object($resqlbis);
-            $lastmovementdate = $db->jdate($objbis->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)
+		{
+			$objbis = $db->fetch_object($resqlbis);
+			$lastmovementdate = $db->jdate($objbis->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>";
 
-        // Other attributes
-        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+		// Other attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-        // Categories
-        if ($conf->categorie->enabled) {
-        	print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
-        	print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 1);
-        	print "</td></tr>";
-        }
+		// Categories
+		if ($conf->categorie->enabled) {
+			print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
+			print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 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();
-    }
+		dol_fiche_end();
+	}
 
 
 	/*
@@ -677,44 +684,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(
@@ -726,34 +733,34 @@ if ($resql)
 	if (GETPOST('nomassaction', 'int') || 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="type" value="'.$type.'">';
-    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="type" value="'.$type.'">';
+	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, 'stock', 0, '', '', $limit, 0, 0, 1);
-    else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'stock', 0, '', '', $limit, 0, 0, 1);
+	if ($id > 0) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'stock', 0, '', '', $limit, 0, 0, 1);
+	else print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'stock', 0, '', '', $limit, 0, 0, 1);
 
-    // Add code for pre mass action (confirmation or email presend form)
-    $topicmail = "SendStockMovement";
-    $modelmail = "movementstock";
-    $objecttmp = new MouvementStock($db);
-    $trackid = 'mov'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+	// Add code for pre mass action (confirmation or email presend form)
+	$topicmail = "SendStockMovement";
+	$modelmail = "movementstock";
+	$objecttmp = new MouvementStock($db);
+	$trackid = 'mov'.$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 = '';
+	$moreforfilter = '';
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -762,101 +769,101 @@ 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']))
-    {
-    	// Date
-    	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']))
+	{
+		// Date
+		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>';
@@ -867,40 +874,40 @@ 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" align="left">';
-    	print '&nbsp; ';
-    	print '</td>';
-    }
-    if (!empty($arrayfields['m.fk_projet']['checked']))
-    {
-    	// fk_project
-    	print '<td class="liste_titre" align="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" align="left">';
+		print '&nbsp; ';
+		print '</td>';
+	}
+	if (!empty($arrayfields['m.fk_projet']['checked']))
+	{
+		// fk_project
+		print '<td class="liste_titre" align="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);
@@ -909,305 +916,302 @@ 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">';
-    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'])) {
-        print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['p.ref']['checked'])) {
-        print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['p.label']['checked'])) {
-        print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['m.batch']['checked'])) {
-        print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, '', $sortfield, $sortorder, 'center ');
-    }
+	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'])) {
+		print_liste_field_titre($arrayfields['m.datem']['label'], $_SERVER["PHP_SELF"], 'm.datem', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.label']['checked'])) {
+		print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['m.batch']['checked'])) {
+		print_liste_field_titre($arrayfields['m.batch']['label'], $_SERVER["PHP_SELF"], 'm.batch', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
 	if (!empty($arrayfields['pl.eatby']['checked'])) {
-        print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, '', $sortfield, $sortorder, 'center ');
-    }
+		print_liste_field_titre($arrayfields['pl.eatby']['label'], $_SERVER["PHP_SELF"], 'pl.eatby', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
 	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);
-    }
-    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'])) {
-        print_liste_field_titre($arrayfields['m.inventorycode']['label'], $_SERVER["PHP_SELF"], "m.inventorycode", "", $param, "", $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['m.label']['checked'])) {
-        print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['m.type_mouvement']['checked'])) {
-        print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
-    }
-    if (!empty($arrayfields['origin']['checked'])) {
-        print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
-    }
-    if (!empty($arrayfields['m.value']['checked'])) {
-        print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['m.price']['checked'])) {
-        print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
-    }
-    if (!empty($arrayfields['m.fk_projet']['checked'])) {
-        print_liste_field_titre($arrayfields['m.fk_projet']['label'], $_SERVER["PHP_SELF"], "m.fk_projet", "", $param, 'align="right"', $sortfield, $sortorder);
-    }
+		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);
+	}
+	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'])) {
+		print_liste_field_titre($arrayfields['m.inventorycode']['label'], $_SERVER["PHP_SELF"], "m.inventorycode", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['m.label']['checked'])) {
+		print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['m.type_mouvement']['checked'])) {
+		print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['origin']['checked'])) {
+		print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['m.value']['checked'])) {
+		print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['m.price']['checked'])) {
+		print_liste_field_titre($arrayfields['m.price']['label'], $_SERVER["PHP_SELF"], "m.price", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['m.fk_projet']['checked'])) {
+		print_liste_field_titre($arrayfields['m.fk_projet']['label'], $_SERVER["PHP_SELF"], "m.fk_projet", "", $param, 'align="right"', $sortfield, $sortorder);
+	}
 
-    // 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();
+	$arrayofuniqueproduct = array();
 
-    $i = 0;
-    $totalarray = array();
-    while ($i < min($num, $limit))
-    {
-        $objp = $db->fetch_object($resql);
+	$i = 0;
+	$totalarray = array();
+	while ($i < min($num, $limit))
+	{
+		$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 = $objp->tosell;
-        $productstatic->status_buy = $objp->tobuy;
-        $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 = $objp->tosell;
+		$productstatic->status_buy = $objp->tobuy;
+		$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->ref = $objp->warehouse_ref;
-        $warehousestatic->libelle = $objp->warehouse_ref; // deprecated
-        $warehousestatic->label = $objp->warehouse_ref;
-        $warehousestatic->lieu = $objp->lieu;
-        $warehousestatic->fk_parent = $objp->fk_parent;
-        $warehousestatic->statut = $objp->statut;
+		$warehousestatic->id = $objp->entrepot_id;
+		$warehousestatic->ref = $objp->warehouse_ref;
+		$warehousestatic->label = $objp->warehouse_ref;
+		$warehousestatic->lieu = $objp->lieu;
+		$warehousestatic->fk_parent = $objp->fk_parent;
+		$warehousestatic->statut = $objp->statut;
 
-        $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']))
-        {
-        	print '<td>'.$objp->mid.'</td>'; // This is primary not movement id
-        }
-        if (!empty($arrayfields['m.datem']['checked']))
-        {
-	        // Date
-	        print '<td class="nowraponall">'.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel').'</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']))
+		{
+			print '<td>'.$objp->mid.'</td>'; // This is primary not movement id
+		}
+		if (!empty($arrayfields['m.datem']['checked']))
+		{
+			// Date
+			print '<td class="nowraponall">'.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel').'</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)
+						.'&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>';
-        }
-        if (!empty($arrayfields['m.fk_projet']['checked']))
-        {
-        	// fk_project
-        	print '<td align="right">';
-        	if ($objp->fk_project != 0) print $movement->get_origin($objp->fk_project, 'project');
-        	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($objp->mid, $arrayofselected)) $selected = 1;
-    		print '<input id="cb'.$objp->mid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objp->mid.'"'.($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>';
+		}
+		if (!empty($arrayfields['m.fk_projet']['checked']))
+		{
+			// fk_project
+			print '<td align="right">';
+			if ($objp->fk_project != 0) print $movement->get_origin($objp->fk_project, 'project');
+			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($objp->mid, $arrayofselected)) $selected = 1;
+			print '<input id="cb'.$objp->mid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objp->mid.'"'.($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>';
-    }
-}
-else
-{
-    dol_print_error($db);
+		//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);
 }
 
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index c648d3f5f4c..64c23814ec2 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
 if (!empty($conf->productbatch->enabled)) {
-    require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
 if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -88,7 +88,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
+	$result = $object->fetch($id, $ref);
 }
 
 if (empty($id) && !empty($object->id)) $id = $object->id;
@@ -100,9 +100,9 @@ $canvas = !empty($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('stockproduct', 'card', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('stockproduct', 'card', $canvas);
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -143,7 +143,7 @@ if ($action == 'addlimitstockwarehouse' && !empty($user->rights->produit->creer)
 			if ($pse->update($user) > 0) setEventMessages($langs->trans('ProductStockWarehouseUpdated'), null, 'mesgs');
 		} else {
 			// Create
-			$pse->fk_entrepot = GETPOST('fk_entrepot');
+			$pse->fk_entrepot = GETPOST('fk_entrepot', 'int');
 			$pse->fk_product  	 	 = $id;
 			$pse->seuil_stock_alerte = GETPOST('seuil_stock_alerte');
 			$pse->desiredstock  	 = GETPOST('desiredstock');
@@ -168,34 +168,34 @@ if ($action == 'delete_productstockwarehouse' && !empty($user->rights->produit->
 // Set stock limit
 if ($action == 'setseuil_stock_alerte' && !empty($user->rights->produit->creer))
 {
-    $object = new Product($db);
-    $result = $object->fetch($id);
-    $object->seuil_stock_alerte = $stocklimit;
-    $result = $object->update($object->id, $user, 0, 'update');
-    if ($result < 0)
-    	setEventMessages($object->error, $object->errors, 'errors');
-    //else
-    //	setEventMessages($lans->trans("SavedRecordSuccessfully"), null, 'mesgs');
-    $action = '';
+	$object = new Product($db);
+	$result = $object->fetch($id);
+	$object->seuil_stock_alerte = $stocklimit;
+	$result = $object->update($object->id, $user, 0, 'update');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
+	//else
+	//	setEventMessages($lans->trans("SavedRecordSuccessfully"), null, 'mesgs');
+	$action = '';
 }
 
 // Set desired stock
 if ($action == 'setdesiredstock' && !empty($user->rights->produit->creer))
 {
-    $object = new Product($db);
-    $result = $object->fetch($id);
-    $object->desiredstock = $desiredstock;
-    $result = $object->update($object->id, $user, 0, 'update');
-    if ($result < 0)
-    	setEventMessages($object->error, $object->errors, 'errors');
-    $action = '';
+	$object = new Product($db);
+	$result = $object->fetch($id);
+	$object->desiredstock = $desiredstock;
+	$result = $object->update($object->id, $user, 0, 'update');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
+	$action = '';
 }
 
 
 // Correct stock
 if ($action == "correct_stock" && !$cancel)
 {
-	if (!(GETPOST("id_entrepot") > 0))
+	if (!(GETPOST("id_entrepot", 'int') > 0))
 	{
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 		$error++;
@@ -256,16 +256,14 @@ if ($action == "correct_stock" && !$cancel)
 					$origin_element,
 					$origin_id
 				); // We do not change value of stock for a correction
-			}
-			else
-			{
+			} else {
 				$result = $object->correct_stock(
-		    		$user,
-		    		GETPOST("id_entrepot", 'int'),
+					$user,
+					GETPOST("id_entrepot", 'int'),
 					$nbpiece,
-		    		GETPOST("mouvement", 'int'),
-		    		GETPOST("label", 'alphanohtml'),
-		    		$priceunit,
+					GETPOST("mouvement", 'int'),
+					GETPOST("label", 'alphanohtml'),
+					$priceunit,
 					GETPOST('inventorycode', 'alphanohtml'),
 					$origin_element,
 					$origin_id
@@ -278,17 +276,13 @@ if ($action == "correct_stock" && !$cancel)
 				{
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else
-				{
-	            	header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+				} else {
+					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 					exit;
 				}
-			}
-			else
-			{
-			    setEventMessages($object->error, $object->errors, 'errors');
-			    $action = 'correction';
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'correction';
 			}
 		}
 	}
@@ -317,15 +311,15 @@ if ($action == "transfert_stock" && !$cancel)
 	}
 	if (!empty($conf->productbatch->enabled))
 	{
-	    $object = new Product($db);
-	    $result = $object->fetch($id);
+		$object = new Product($db);
+		$result = $object->fetch($id);
 
-	    if ($object->hasbatch() && !$batchnumber)
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
-	        $error++;
-	        $action = 'transfert';
-	    }
+		if ($object->hasbatch() && !$batchnumber)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("batch_number")), null, 'errors');
+			$error++;
+			$action = 'transfert';
+		}
 	}
 
 	if (!$error)
@@ -359,21 +353,19 @@ if ($action == "transfert_stock" && !$cancel)
 						$batch = $pdluo->batch;
 						$eatby = $pdluo->eatby;
 						$sellby = $pdluo->sellby;
-					}
-					else
-					{
+					} else {
 						setEventMessages($pdluo->error, $pdluo->errors, 'errors');
 						$error++;
 					}
-				}
-				else
-				{
+				} else {
 					$srcwarehouseid = GETPOST('id_entrepot', 'int');
 					$batch = $batchnumber;
 					$eatby = $d_eatby;
 					$sellby = $d_sellby;
 				}
 
+				$nbpiece = price2num(GETPOST("nbpiece", 'alphanohtml'));
+
 				if (!$error)
 				{
 					// Remove stock
@@ -404,36 +396,34 @@ if ($action == "transfert_stock" && !$cancel)
 					);
 					if ($result2 < 0) $error++;
 				}
-			}
-			else
-			{
+			} else {
 				if (!$error)
 				{
-    			    // Remove stock
-    				$result1 = $object->correct_stock(
-    					$user,
-    					GETPOST("id_entrepot", 'int'),
-    					$nbpiece,
-    					1,
-    					GETPOST("label", 'alphanohtml'),
-    					$pricesrc,
-    					GETPOST('inventorycode', 'alphanohtml')
-    				);
-    				if ($result1 < 0) $error++;
+					// Remove stock
+					$result1 = $object->correct_stock(
+						$user,
+						GETPOST("id_entrepot", 'int'),
+						$nbpiece,
+						1,
+						GETPOST("label", 'alphanohtml'),
+						$pricesrc,
+						GETPOST('inventorycode', 'alphanohtml')
+					);
+					if ($result1 < 0) $error++;
 				}
 				if (!$error)
 				{
-    				// Add stock
-    				$result2 = $object->correct_stock(
-    					$user,
-    					GETPOST("id_entrepot_destination", 'int'),
-    					$nbpiece,
-    					0,
-    					GETPOST("label", 'alphanohtml'),
-    					$pricedest,
-    					GETPOST('inventorycode', 'alphanohtml')
-    				);
-    				if ($result2 < 0) $error++;
+					// Add stock
+					$result2 = $object->correct_stock(
+						$user,
+						GETPOST("id_entrepot_destination", 'int'),
+						$nbpiece,
+						0,
+						GETPOST("label", 'alphanohtml'),
+						$pricedest,
+						GETPOST('inventorycode', 'alphanohtml')
+					);
+					if ($result2 < 0) $error++;
 				}
 			}
 
@@ -446,15 +436,11 @@ if ($action == "transfert_stock" && !$cancel)
 				{
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else
-				{
+				} else {
 					header("Location: product.php?id=".$object->id);
 					exit;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 				$action = 'transfert';
@@ -466,41 +452,35 @@ if ($action == "transfert_stock" && !$cancel)
 // Update batch information
 if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
 {
-    $pdluo = new Productbatch($db);
-    $result = $pdluo->fetch(GETPOST('pdluoid', 'int'));
+	$pdluo = new Productbatch($db);
+	$result = $pdluo->fetch(GETPOST('pdluoid', 'int'));
 
-    if ($result > 0)
-    {
-        if ($pdluo->id)
-        {
-            if ((!GETPOST("sellby")) && (!GETPOST("eatby")) && (!$batchnumber)) {
-                setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
-            }
-            else
-            {
-                $d_eatby = dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
-                $d_sellby = dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
-                $pdluo->batch = $batchnumber;
-                $pdluo->eatby = $d_eatby;
-                $pdluo->sellby = $d_sellby;
-                $result = $pdluo->update($user);
-                if ($result < 0)
-                {
-                    setEventMessages($pdluo->error, $pdluo->errors, 'errors');
-                }
-            }
-        }
-        else
-        {
-            setEventMessages($langs->trans('BatchInformationNotfound'), null, 'errors');
-        }
-    }
-    else
-    {
-        setEventMessages($pdluo->error, null, 'errors');
-    }
-    header("Location: product.php?id=".$id);
-    exit;
+	if ($result > 0)
+	{
+		if ($pdluo->id)
+		{
+			if ((!GETPOST("sellby")) && (!GETPOST("eatby")) && (!$batchnumber)) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
+			} else {
+				$d_eatby = dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
+				$d_sellby = dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+				$pdluo->batch = $batchnumber;
+				$pdluo->eatby = $d_eatby;
+				$pdluo->sellby = $d_sellby;
+				$result = $pdluo->update($user);
+				if ($result < 0)
+				{
+					setEventMessages($pdluo->error, $pdluo->errors, 'errors');
+				}
+			}
+		} else {
+			setEventMessages($langs->trans('BatchInformationNotfound'), null, 'errors');
+		}
+	} else {
+		setEventMessages($pdluo->error, null, 'errors');
+	}
+	header("Location: product.php?id=".$id);
+	exit;
 }
 
 
@@ -548,17 +528,17 @@ if ($id > 0 || $ref)
 
 		dol_htmloutput_events();
 
-        $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('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');
+		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%">';
 
 		if (!$variants) {
 			if ($conf->productbatch->enabled) {
@@ -577,7 +557,7 @@ if ($id > 0 || $ref)
 			print $form->editfieldval($text, 'cost_price', $object->cost_price, $object, $usercancreate, 'amount:6');
 			print '</td></tr>';
 
-			// PMP
+			// AWP
 			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");
@@ -649,13 +629,15 @@ if ($id > 0 || $ref)
 			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) ? $langs->trans("ReStockOnBill").'<br>' : '');
 			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) ? $langs->trans("ReStockOnValidateOrder").'<br>' : '');
 			$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) ? $langs->trans("ReStockOnDispatchOrder").'<br>' : '');
-       		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? $langs->trans("StockOnReception").'<br>' : '');
+	   		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? $langs->trans("StockOnReception").'<br>' : '');
 
 			print '<tr><td>';
 			print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1);
 			print '</td>';
 			print '<td>'.price2num($object->stock_reel, 'MS');
 			if ($object->seuil_stock_alerte != '' && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
+
+			print ' &nbsp; &nbsp;<a href="'.DOL_URL_ROOT.'/product/stock/stockatdate.php?productid='.$object->id.'">'.$langs->trans("StockAtDate").'</a>';
 			print '</td>';
 			print '</tr>';
 
@@ -674,13 +656,13 @@ if ($id > 0 || $ref)
 
 			// Number of product from customer order already sent (partial shipping)
 			if (!empty($conf->expedition->enabled)) {
-                require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-                $filterShipmentStatus = '';
-                if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
-                    $filterShipmentStatus = Expedition::STATUS_VALIDATED.','.Expedition::STATUS_CLOSED;
-                } elseif (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
-                    $filterShipmentStatus = Expedition::STATUS_CLOSED;
-                }
+				require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+				$filterShipmentStatus = '';
+				if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
+					$filterShipmentStatus = Expedition::STATUS_VALIDATED.','.Expedition::STATUS_CLOSED;
+				} elseif (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
+					$filterShipmentStatus = Expedition::STATUS_CLOSED;
+				}
 				if ($found) $helpondiff .= '<br>'; else $found = 1;
 				$result = $object->load_stats_sending(0, '2', 1, $filterShipmentStatus);
 				$helpondiff .= $langs->trans("ProductQtyInShipmentAlreadySent").': '.$object->stats_expedition['qty'];
@@ -719,6 +701,7 @@ if ($id > 0 || $ref)
 			//print (empty($stocktheo)?0:$stocktheo);
 			print $form->textwithpicto((empty($stocktheo) ? 0 : $stocktheo), $helpondiff);
 			if ($object->seuil_stock_alerte != '' && ($object->stock_theorique < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit", $object->seuil_stock_alerte));
+			print ' &nbsp; &nbsp;<a href="'.DOL_URL_ROOT.'/product/stock/stockatdate.php?mode=future&productid='.$object->id.'">'.$langs->trans("VirtualStockAtDate").'</a>';
 			print '</td>';
 			print '</tr>';
 
@@ -727,7 +710,7 @@ if ($id > 0 || $ref)
 			{
 				$sql = "SELECT max(m.datem) as datem";
 				$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-				$sql .= " WHERE m.fk_product = '".$object->id."'";
+				$sql .= " WHERE m.fk_product = ".((int) $object->id);
 				$resqlbis = $db->query($sql);
 				if ($resqlbis) {
 					$obj = $db->fetch_object($resqlbis);
@@ -738,7 +721,7 @@ if ($id > 0 || $ref)
 				print '<tr><td class="tdtop">'.$langs->trans("LastMovement").'</td><td>';
 				if ($lastmovementdate) {
 					print dol_print_date($lastmovementdate, 'dayhour').' ';
-					print '(<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$object->id.'">'.$langs->trans("FullList").'</a>)';
+					print ' &nbsp; &nbsp;<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$object->id.'">'.$langs->trans("FullList").'</a>';
 				} else {
 					print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$object->id.'">'.$langs->trans("None").'</a>';
 				}
@@ -747,8 +730,8 @@ if ($id > 0 || $ref)
 		}
 		print "</table>";
 
-        print '</div>';
-        print '<div style="clear:both"></div>';
+		print '</div>';
+		print '<div style="clear:both"></div>';
 
 		dol_fiche_end();
 	}
@@ -766,9 +749,7 @@ if ($id > 0 || $ref)
 		include DOL_DOCUMENT_ROOT.'/product/stock/tpl/stocktransfer.tpl.php';
 		print '<br><br>';
 	}
-}
-else
-{
+} else {
 	dol_print_error();
 }
 
@@ -782,20 +763,16 @@ if (empty($reshook))
 {
 	if (empty($action) && $object->id)
 	{
-	    print "<div class=\"tabsAction\">\n";
+		print "<div class=\"tabsAction\">\n";
 
 		if ($user->rights->stock->mouvement->creer)
 		{
 			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("CorrectStock").'</a>';
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("CorrectStock").'</a>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CorrectStock").'</a>';
 		}
 
@@ -804,14 +781,10 @@ if (empty($reshook))
 		{
 			if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("TransferStock").'</a>';
-			}
-			else
-			{
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ActionAvailableOnVariantProductOnly").'">'.$langs->trans("TransferStock").'</a>';
 			}
-		}
-		else
-		{
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CorrectStock").'</a>';
 		}
 
@@ -837,11 +810,18 @@ if (!$variants) {
 	print '<td class="right">'.$langs->trans("EstimatedStockValueSellShort").'</td>';
 	print '</tr>';
 	if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
+		$colspan = 3;
 		print '<tr class="liste_titre"><td width="10%"></td>';
 		print '<td class="right" width="10%">'.$langs->trans("batch_number").'</td>';
-		print '<td class="center" width="10%">'.$langs->trans("EatByDate").'</td>';
-		print '<td class="center" width="10%">'.$langs->trans("SellByDate").'</td>';
-		print '<td></td>';
+		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+			$colspan--;
+			print '<td class="center" width="10%">'.$langs->trans("EatByDate").'</td>';
+		}
+		if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+			$colspan--;
+			print '<td class="center" width="10%">'.$langs->trans("SellByDate").'</td>';
+		}
+		print '<td colspan="'.$colspan.'"></td>';
 		print '<td></td>';
 		print '<td></td>';
 		print '<td></td>';
@@ -876,7 +856,6 @@ if (!$variants) {
 
 			$entrepotstatic->id = $obj->rowid;
 			$entrepotstatic->ref = $obj->ref;
-			$entrepotstatic->libelle = $obj->ref;
 			$entrepotstatic->label = $obj->ref;
 			$entrepotstatic->lieu = $obj->lieu;
 			$entrepotstatic->fk_parent = $obj->fk_parent;
@@ -921,13 +900,17 @@ if (!$variants) {
 						print '<input type="hidden" name="token" value="'.newToken().'">';
 						print '<input type="hidden" name="pdluoid" value="'.$pdluo->id.'"><input type="hidden" name="action" value="updateline"><input type="hidden" name="id" value="'.$id.'"><table class="noborder centpercent"><tr><td width="10%"></td>';
 						print '<td class="right" width="10%"><input type="text" name="batch_number" value="'.$pdluo->batch.'"></td>';
-						print '<td class="center" width="10%">';
-						print $form->selectDate($pdluo->eatby, 'eatby', '', '', 1, '', 1, 0);
-						print '</td>';
-						print '<td class="center" width="10%">';
-						print $form->selectDate($pdluo->sellby, 'sellby', '', '', 1, '', 1, 0);
-						print '</td>';
-						print '<td class="right" width="10%">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').'</td>';
+						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+							print '<td class="center" width="10%">';
+							print $form->selectDate($pdluo->eatby, 'eatby', '', '', 1, '', 1, 0);
+							print '</td>';
+						}
+						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+							print '<td class="center" width="10%">';
+							print $form->selectDate($pdluo->sellby, 'sellby', '', '', 1, '', 1, 0);
+							print '</td>';
+						}
+						print '<td class="right" colspan="3">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').'</td>';
 						print '<td colspan="4"><input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
 						print '<input type="submit" class="button" id="cancellinebutton" name="Cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
 						print '</table>';
@@ -944,9 +927,16 @@ if (!$variants) {
 						print '<td class="right">';
 						print $product_lot_static->getNomUrl(1);
 						print '</td>';
-						print '<td class="center">'.dol_print_date($pdluo->eatby, 'day').'</td>';
-						print '<td class="center">'.dol_print_date($pdluo->sellby, 'day').'</td>';
-						print '<td class="right">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').'</td>';
+						$colspan = 3;
+						if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+							$colspan--;
+							print '<td class="center">'.dol_print_date($pdluo->eatby, 'day').'</td>';
+						}
+						if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+							$colspan--;
+							print '<td class="center">'.dol_print_date($pdluo->sellby, 'day').'</td>';
+						}
+						print '<td class="right" colspan="'.$colspan.'">'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').'</td>';
 						print '<td colspan="4"></td>';
 						print '</tr>';
 					}
@@ -1016,7 +1006,7 @@ if (!$variants) {
 				print '<td class="right">'.$line['seuil_stock_alerte'].'</td>';
 				print '<td class="right">'.$line['desiredstock'].'</td>';
 				if (!empty($user->rights->produit->creer)) {
-					print '<td class="right"><a href="?id='.$id.'&fk_productstockwarehouse='.$line['id'].'&action=delete_productstockwarehouse">'.img_delete().'</a></td>';
+					print '<td class="right"><a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&fk_productstockwarehouse='.$line['id'].'&action=delete_productstockwarehouse&token='.newToken().'">'.img_delete().'</a></td>';
 				}
 				print '</tr>';
 			}
@@ -1103,9 +1093,7 @@ if (!$variants) {
 			print '<td class="right">'.$stock_total.'</td>';
 			print '<td></td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		?>
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 17004a39a71..dbedba85d99 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -122,7 +122,7 @@ if (empty($reshook))
     	$object->oldcopy = dol_clone($object);
 
     	// Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
         if ($ret < 0) $error++;
 
         if (!$error)
@@ -180,12 +180,10 @@ if (empty($reshook))
 			{
 				// Creation KO
 				if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
+			else setEventMessages($object->error, null, 'errors');
 				$action = 'create';
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'create';
 		}
 	}
@@ -217,17 +215,13 @@ if (empty($reshook))
 			if ($result > 0)
 			{
 				$action = 'view';
-			}
-			else
-			{
+			} else {
 				// Creation KO
 				if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 				else setEventMessages($object->error, null, 'errors');
 				$action = 'edit';
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'edit';
 		}
 	}
@@ -242,9 +236,7 @@ if (empty($reshook))
 			setEventMessages("RecordDeleted", null, 'mesgs');
 			header("Location: ".dol_buildpath('/stock/list.php', 1));
 			exit;
-		}
-		else
-		{
+		} else {
 			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else setEventMessages($object->error, null, 'errors');
 		}
@@ -331,25 +323,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     print '<tr><td class="titlefield">'.$langs->trans("Product").'</td><td>';
     $producttmp = new Product($db);
     $producttmp->fetch($object->fk_product);
-    print $producttmp->getNomUrl(1, 'stock');
+    print $producttmp->getNomUrl(1, 'stock'). " - " . $producttmp->label;
     print '</td></tr>';
 
     // Eat by
-    print '<tr><td>';
-    print $form->editfieldkey($langs->trans('EatByDate'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
-    print '</td><td>';
-    print $form->editfieldval($langs->trans('EatByDate'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
-    print '</td>';
-    print '</tr>';
+	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');
+		print '</td><td>';
+		print $form->editfieldval($langs->trans('EatByDate'), 'eatby', $object->eatby, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td>';
+		print '</tr>';
+	}
 
     // Sell by
-    print '<tr><td>';
-    print $form->editfieldkey($langs->trans('SellByDate'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
-    print '</td><td>';
-    print $form->editfieldval($langs->trans('SellByDate'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
-    print '</td>';
-    print '</tr>';
-
+	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');
+		print '</td><td>';
+		print $form->editfieldval($langs->trans('SellByDate'), 'sellby', $object->sellby, $object, $user->rights->stock->creer, 'datepicker');
+		print '</td>';
+		print '</tr>';
+	}
     // Other attributes
     $cols = 2;
     include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -376,7 +371,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		if ($user->rights->stock->supprimer)
 		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
 		}
 		*/
 	}
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 1dbb8a900e6..59ab61fb86a 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -42,7 +42,7 @@ $langs->loadLangs(array('other', 'products'));
 
 $id     = GETPOST('id', 'int');
 $ref    = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -154,9 +154,7 @@ if ($object->id)
     $permission = ($user->rights->produit->creer);
     $param = '&id='.$object->id;
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 5977f1854f7..8a02f3a2b41 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -36,9 +36,10 @@ $langs->loadLangs(array('stocks', 'productbatch', 'other', 'users'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
-$toselect = GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'productlotlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $search_entity = GETPOST('search_entity', 'int');
@@ -50,73 +51,82 @@ $search_import_key = GETPOST('search_import_key', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "t.batch"; // Set here default search field
-if (!$sortorder) $sortorder = "ASC";
-
-// Protection if external user
-$socid = 0;
-if ($user->socid > 0)
-{
-	$socid = $user->socid;
-	//accessforbidden();
-}
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $object = new Productlot($db);
-$hookmanager->initHooks(array('product_lotlist'));
 $extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('product_lotlist'));
 
-// fetch optionals attributes and labels
+// Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-// List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-	't.ref'=>'Ref',
-	't.note_public'=>'NotePublic',
-);
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+if (!$sortorder) $sortorder = "ASC";
 
-// Definition of fields for list
-$arrayfields = array(
-	//'t.entity'=>array('label'=>$langs->trans("Fieldentity"), 'checked'=>1),
-	't.batch'=>array('label'=>$langs->trans("Batch"), 'checked'=>1),
-	't.fk_product'=>array('label'=>$langs->trans("Product"), 'checked'=>1),
-	't.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>1),
-	't.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>1),
-	//'t.import_key'=>array('label'=>$langs->trans("ImportId"), 'checked'=>1),
-	//'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))),
-	//'t.fk_user_creat'=>array('label'=>$langs->trans("UserCreationShort"), 'checked'=>0, 'position'=>500),
-	//'t.fk_user_modif'=>array('label'=>$langs->trans("UserModificationShort"), 'checked'=>0, 'position'=>500),
-	't.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500),
-	't.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	//'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-);
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search = array();
+foreach ($object->fields as $key => $val)
+{
+	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'];
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val)
+{
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'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]));
+		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]),
+				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key]
+			);
+		}
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-// Load object if id or ref is provided as parameter
-if (($id > 0 || !empty($ref)) && $action != 'add')
-{
-	$result = $object->fetch($id, $ref);
-	if ($result < 0) dol_print_error($db);
-}
+$permissiontoread = $user->rights->stock->read;
+$permissiontoadd = $user->rights->stock->write;
+$permissiontodelete = $user->rights->stock->delete;
 
 
 
@@ -125,427 +135,416 @@ if (($id > 0 || !empty($ref)) && $action != 'add')
  */
 
 if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'confirm_presend') { $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');
 
-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_entity = '';
-	$search_product = '';
-	$search_batch = '';
-	$search_fk_user_creat = '';
-	$search_fk_user_modif = '';
-	$search_import_key = '';
-	$search_date_creation = '';
-	$search_date_update = '';
-	$toselect = array();
-	$search_array_options = array();
-}
-
-
 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
+	{
+		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 = 'ProductLot';
 	$objectlabel = 'LotSerial';
-	$permissiontoread = $user->rights->stock->read;
-	$permissiontodelete = $user->rights->stock->delete;
-	$uploaddir = $conf->stock->dir_output;
+	$uploaddir = $conf->productbatch->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
-
-
 /*
  * VIEW
  */
 
-$now = dol_now();
 
 $form = new Form($db);
-$productstatic = new Product($db);
 
-//$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
+$now = dol_now();
+
+//$help_url="EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject";
 $help_url = '';
 $title = $langs->trans('LotSerialList');
-llxHeader('', $title, $help_url);
-
-// Put here content of your page
-
-// Example : Adding jquery code
-print '<script type="text/javascript" language="javascript">
-jQuery(document).ready(function() {
-	function init_myfunc()
-	{
-		jQuery("#myid").removeAttr(\'disabled\');
-		jQuery("#myid").attr(\'disabled\',\'disabled\');
-	}
-	init_myfunc();
-	jQuery("#mybutton").click(function() {
-		init_myfunc();
-	});
-});
-</script>';
 
 
-$sql = "SELECT";
-$sql .= " t.rowid,";
-$sql .= " t.entity,";
-$sql .= " t.fk_product,";
-$sql .= " t.batch,";
-$sql .= " t.sellby,";
-$sql .= " t.eatby,";
-$sql .= " t.datec as date_creation,";
-$sql .= " t.tms as date_update,";
-$sql .= " t.fk_user_creat,";
-$sql .= " t.fk_user_modif,";
-$sql .= " t.import_key,";
-$sql .= " p.fk_product_type as product_type,";
-$sql .= " p.ref as product_ref,";
-$sql .= " p.label as product_label,";
-$sql .= " p.tosell,";
-$sql .= " p.tobuy,";
-$sql .= " p.tobatch";
-// Add fields for extrafields
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+foreach ($object->fields as $key => $val)
+{
+	$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();
-$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_lot as t";
+$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 .= " 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)";
-$sql .= ", ".MAIN_DB_PREFIX."product as p";
-$sql .= " WHERE p.rowid = t.fk_product";
-$sql .= " AND p.entity IN (".getEntity('product').")";
-
-if ($search_entity) $sql .= natural_search("entity", $search_entity);
-if ($search_product) $sql .= natural_search("p.ref", $search_product);
-if ($search_batch) $sql .= natural_search("batch", $search_batch);
-if ($search_fk_user_creat) $sql .= natural_search("fk_user_creat", $search_fk_user_creat);
-if ($search_fk_user_modif) $sql .= natural_search("fk_user_modif", $search_fk_user_modif);
-if ($search_import_key) $sql .= natural_search("import_key", $search_import_key);
-
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+else $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 (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+		if ($search[$key] == '-1') $search[$key] = '';
+		$mode_search = 2;
+	}
+	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.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$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
+ $sql.= " GROUP BY ";
+ foreach($object->fields as $key => $val)
+ {
+ $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.', ' : '');
+ }
+ // Add where from hooks
+ $parameters=array();
+ $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 .= $db->order($sortfield, $sortorder);
-//$sql.= $db->plimit($conf->liste_limit+1, $offset);
 
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	$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;
 	}
 }
-
-$sql .= $db->plimit($limit + 1, $offset);
-
-
-dol_syslog($script_file, LOG_DEBUG);
-$resql = $db->query($sql);
-if ($resql)
+// 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 || empty($limit)))
 {
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
 	$num = $db->num_rows($resql);
+}
 
-	$arrayofselected = is_array($toselect) ? $toselect : array();
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page)
+{
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$id);
+	exit;
+}
 
-	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-	if ($search_entity != '') $param .= '&amp;search_entity='.urlencode($search_entity);
-	if ($search_product != '') $param .= '&amp;search_product='.urlencode($search_product);
-	if ($search_batch != '') $param .= '&amp;search_batch='.urlencode($search_batch);
-	if ($search_fk_user_creat != '') $param .= '&amp;search_fk_user_creat='.urlencode($search_fk_user_creat);
-	if ($search_fk_user_modif != '') $param .= '&amp;search_fk_user_modif='.urlencode($search_fk_user_modif);
-	if ($search_import_key != '') $param .= '&amp;search_import_key='.urlencode($search_import_key);
-	if ($optioncss != '') $param .= '&optioncss='.$optioncss;
-	// Add $param from extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	$arrayofmassactions = array(
-		//'presend'=>$langs->trans("SendByMail"),
-		//'builddoc'=>$langs->trans("PDFMerge"),
-	);
-	//if ($user->rights->stock->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
-	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+// Output page
+// --------------------------------------------------------------------
 
-	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.'">';
+llxHeader('', $title, $help_url);
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'lot', 0, '', '', $limit, 0, 0, 1);
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	$topicmail = "Information";
-	$modelmail = "productlot";
-	$objecttmp = new Productlot($db);
-	$trackid = 'lot'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.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);
+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 ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-	if ($sall)
+// List of mass actions available
+$arrayofmassactions = array(
+	//'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();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+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="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/mymodule/myobject_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = '';
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "Information";
+$modelmail = "productlot";
+$objecttmp = new Productlot($db);
+$trackid = 'lot'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all)
+{
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+ $moreforfilter.= '</div>';*/
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+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>';
+}
+
+$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">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val)
+{
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	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';
+	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']))
 	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-	}
-
-	/*$moreforfilter = '';
-    $moreforfilter.='<div class="divsearchfield">';
-    $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
-    $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;
-
-	if (!empty($moreforfilter))
-	{
-		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-		print $moreforfilter;
-		print '</div>';
-	}
-
-	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-	// Fields title search
-	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['t.entity']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_entity" value="'.$search_entity.'" size="8"></td>';
-	if (!empty($arrayfields['t.batch']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_batch" value="'.$search_batch.'" size="8"></td>';
-	if (!empty($arrayfields['t.fk_product']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_product" value="'.$search_product.'" size="8"></td>';
-	if (!empty($arrayfields['t.sellby']['checked'])) print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['t.eatby']['checked'])) print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['t.fk_user_creat']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_fk_user_creat" value="'.$search_fk_user_creat.'" size="10"></td>';
-	if (!empty($arrayfields['t.fk_user_modif']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_fk_user_modif" value="'.$search_fk_user_modif.'" size="10"></td>';
-	if (!empty($arrayfields['t.import_key']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" name="search_import_key" value="'.$search_import_key.'" size="10"></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;
-	if (!empty($arrayfields['t.datec']['checked']))
-	{
-		// Date creation
-		print '<td class="liste_titre">';
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		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]).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['t.tms']['checked']))
+}
+// 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;
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val)
+{
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	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';
+	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']))
 	{
-		// Date modification
-		print '<td class="liste_titre">';
-		print '</td>';
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
-	/*if (! empty($arrayfields['u.statut']['checked']))
-     {
-     // Status
-     print '<td class="liste_titre center">';
-     print $form->selectarray('search_statut', array('-1'=>'','0'=>$langs->trans('Disabled'),'1'=>$langs->trans('Enabled')),$search_statut);
-     print '</td>';
-     }*/
-	// Action column
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
-	print $searchpicto;
-	print '</td>';
-	print '</tr>'."\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);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print '</tr>'."\n";
 
-	// Fields title
-	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['t.entity']['checked']))        print_liste_field_titre($arrayfields['t.entity']['label'], $_SERVER['PHP_SELF'], 't.entity', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['t.batch']['checked']))         print_liste_field_titre($arrayfields['t.batch']['label'], $_SERVER['PHP_SELF'], 't.batch', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['t.fk_product']['checked']))    print_liste_field_titre($arrayfields['t.fk_product']['label'], $_SERVER['PHP_SELF'], 't.fk_product', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['t.sellby']['checked']))        print_liste_field_titre($arrayfields['t.sellby']['label'], $_SERVER['PHP_SELF'], 't.sellby', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['t.eatby']['checked']))         print_liste_field_titre($arrayfields['t.eatby']['label'], $_SERVER['PHP_SELF'], 't.eatby', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['t.fk_user_creat']['checked'])) print_liste_field_titre($arrayfields['t.fk_user_creat']['label'], $_SERVER['PHP_SELF'], 't.fk_user_creat', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['t.fk_user_modif']['checked'])) print_liste_field_titre($arrayfields['t.fk_user_modif']['label'], $_SERVER['PHP_SELF'], 't.fk_user_modif', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['t.import_key']['checked']))    print_liste_field_titre($arrayfields['t.import_key']['label'], $_SERVER['PHP_SELF'], 't.import_key', '', $param, '', $sortfield, $sortorder);
-	// 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['t.datec']['checked'])) {
-        print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
-    if (!empty($arrayfields['t.tms']['checked'])) {
-        print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    }
-    //if (! empty($arrayfields['t.status']['checked'])) {
-    //    print_liste_field_titre($arrayfields['t.status']['label'], $_SERVER["PHP_SELF"], "t.status", "", $param, '', $sortfield, $sortorder, 'center ');
-    //}
-    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-    print '</tr>'."\n";
 
-	$productlot = new Productlot($db);
-
-	$i = 0;
-	$totalarray = array();
-	while ($i < min($num, $limit))
+// 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)
 	{
-		$obj = $db->fetch_object($resql);
-		if ($obj)
+		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+	}
+}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+while ($i < ($limit ? min($num, $limit) : $num))
+{
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break; // Should not happen
+
+	// 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';
+
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		elseif ($key == 'ref' || $key == 'batch') $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 (!empty($arrayfields['t.'.$key]['checked']))
 		{
-			$productlot->id = $obj->rowid;
-			$productlot->status = $obj->tosell;
-			$productlot->batch = $obj->batch;
-
-			// You can use here results
-			print '<tr class="oddeven">';
-			if (!empty($arrayfields['t.entity']['checked']))
-			{
-				print '<td>'.$obj->entity.'</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			if (!empty($arrayfields['t.batch']['checked']))
-			{
-				print '<td>'.$productlot->getNomUrl(1).'</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			if (!empty($arrayfields['t.fk_product']['checked']))
-			{
-				$productstatic->id = $obj->fk_product;
-				$productstatic->type = $obj->product_type;
-				$productstatic->ref = $obj->product_ref;
-				$productstatic->label = $obj->product_label;
-				$productstatic->status = $obj->tosell;
-				$productstatic->status_buy = $obj->tobuy;
-				$productstatic->status_batch = $obj->tobatch;
-
-				print '<td>'.$productstatic->getNomUrl(1).'</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			if (!empty($arrayfields['t.sellby']['checked']))
-			{
-				print '<td>'.dol_print_date($db->jdate($obj->sellby), 'day').'</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			if (!empty($arrayfields['t.eatby']['checked']))
-			{
-				print '<td>'.dol_print_date($db->jdate($obj->eatby), 'day').'</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			if (!empty($arrayfields['t.fk_user_creat']['checked']))
-			{
-				print '<td>'.$obj->fk_user_creat.'</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			if (!empty($arrayfields['t.fk_user_modif']['checked']))
-			{
-				print '<td>'.$obj->fk_user_modif.'</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			if (!empty($arrayfields['t.import_key']['checked']))
-			{
-				print '<td>'.$obj->import_key.'</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			// 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['t.datec']['checked']))
-			{
-				print '<td class="center">';
-				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			// Date modification
-			if (!empty($arrayfields['t.tms']['checked']))
-			{
-				print '<td class="center">';
-				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-			// Status
-			/*
-            if (! empty($arrayfields['u.statut']['checked']))
-            {
-    		  $userstatic->statut=$obj->statut;
-              print '<td class="center">'.$userstatic->getLibStatut(3).'</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'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+			if ($key == 'status') print $object->getLibStatut(5);
+			elseif ($key == 'rowid') print $object->id;
+			else {
+				if ($key == 'batch') {
+					print $object->getNomUrl(1);
+				} else {
+					print $object->showOutputField($val, $key, $object->$key, '');
+				}
 			}
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
-
-			print '</tr>';
+			if (!empty($val['isameasure']))
+			{
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				$totalarray['val']['t.'.$key] += $object->$key;
+			}
 		}
-		$i++;
 	}
-
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-	$db->free($resql);
-
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$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;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	{
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
 
-	print '</table>'."\n";
-	print '</div>';
+	print '</tr>'."\n";
 
-	print '</form>'."\n";
-
-	/*
-	$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);
-
-	$filedir=$diroutputmassaction;
-	$genallowed=$user->rights->facture->lire;
-	$delallowed=$user->rights->facture->creer;
-
-	print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'','','',null,$hidegeneratedfilelistifempty);
-	*/
+	$i++;
 }
-else
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0)
 {
-	$error++;
-	dol_print_error($db);
+	$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);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+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;
+
+	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);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	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/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 34a6f61bbb0..2518f0ee17d 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -48,13 +48,14 @@ $hookmanager->initHooks(array('stockreplenishlist'));
 
 //checks if a product has been ordered
 
-$action = GETPOST('action', 'alpha');
-$sref = GETPOST('sref', 'alpha');
-$snom = GETPOST('snom', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$search_ref = GETPOST('search_ref', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $type = GETPOST('type', 'int');
 $tobuy = GETPOST('tobuy', 'int');
 $salert = GETPOST('salert', 'alpha');
+$includeproductswithoutdesiredqty = GETPOST('includeproductswithoutdesiredqty', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 $draftorder = GETPOST('draftorder', 'alpha');
 
@@ -64,8 +65,8 @@ $fk_supplier = GETPOST('fk_supplier', 'int');
 $fk_entrepot = GETPOST('fk_entrepot', 'int');
 $texte = '';
 
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -106,10 +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
 {
-    $sref = '';
-    $snom = '';
+    $search_ref = '';
+    $search_label = '';
     $sall = '';
     $salert = '';
+    $includeproductswithoutdesiredqty = '';
 	$draftorder = '';
 }
 if ($draftorder == 'on') $draftchecked = "checked";
@@ -179,13 +181,10 @@ if ($action == 'order' && isset($_POST['valid']))
 						$line->fk_unit = $productsupplier->fk_unit;
 	                    $suppliers[$productsupplier->fourn_socid]['lines'][] = $line;
                 	}
-                }
-				elseif ($idprod == -1)
+                } elseif ($idprod == -1)
 				{
 					$errorQty++;
-				}
-                else
-				{
+				} else {
                     $error = $db->lasterror();
                     dol_print_error($db);
                 }
@@ -274,9 +273,7 @@ if ($action == 'order' && isset($_POST['valid']))
             setEventMessages($langs->trans('OrderCreated'), null, 'mesgs');
             header('Location: replenishorders.php');
             exit;
-        }
-        else
-        {
+        } else {
         	$db->rollback();
         }
     }
@@ -295,7 +292,7 @@ $form = new Form($db);
 $formproduct = new FormProduct($db);
 $prod = new Product($db);
 
-$title = $langs->trans('Status');
+$title = $langs->trans('MissingStocks');
 
 if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
 	$sqldesiredtock = $db->ifsql("pse.desiredstock IS NULL", "p.desiredstock", "pse.desiredstock");
@@ -315,6 +312,9 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entre
 $sql .= ' '.$sqldesiredtock.' as desiredstockcombined, '.$sqlalertstock.' as seuil_stock_alertecombined,';
 $sql .= ' s.fk_product,';
 $sql .= ' SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").') as stock_physique';
+if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) {
+	$sql .= ', SUM('.$db->ifsql("s.reel IS NULL OR s.fk_entrepot <> ".$fk_entrepot, "0", "s.reel").') as stock_real_warehouse';
+}
 
 // Add fields from hooks
 $parameters = array();
@@ -346,8 +346,8 @@ if (dol_strlen($type)) {
         $sql .= ' AND p.fk_product_type <> 1';
     }
 }
-if ($sref) $sql .= natural_search('p.ref', $sref);
-if ($snom) $sql .= natural_search('p.label', $snom);
+if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
+if ($search_label) $sql .= natural_search('p.label', $search_label);
 $sql .= ' AND p.tobuy = 1';
 if (!empty($canvas)) $sql .= ' AND p.canvas = "'.$db->escape($canvas).'"';
 $sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price';
@@ -424,8 +424,7 @@ if ($usevirtualstock)
 		$sqlProductionToProduce .= " AND mp5.fk_product = p.rowid";
 		$sqlProductionToProduce .= " AND mp5.role IN ('toproduce', 'produced')";
 		$sqlProductionToProduce .= " AND mm5.status IN (1,2))";
-	} else
-	{
+	} else {
 		$sqlProductionToConsume = '0';
 		$sqlProductionToProduce = '0';
 	}
@@ -434,34 +433,65 @@ if ($usevirtualstock)
 	$sql .= ' ('.$sqldesiredtock.' >= 0 AND ('.$sqldesiredtock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
 	$sql .= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.') + ('.$sqlProductionToProduce.' - '.$sqlProductionToConsume.')))';
 	$sql .= ' OR ';
-	$sql .= ' ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+	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 {
+		$sql .= ' ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+	}
 	$sql .= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.') + ('.$sqlProductionToProduce.' - '.$sqlProductionToConsume.')))';
 	$sql .= ')';
 
 	if ($salert == 'on')	// Option to see when stock is lower than alert
 	{
-		$sql .= ' AND (';
-		$sql .= $sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+            $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 {
+			$sql .= $sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')';
+		}
 		$sql .= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.')  + ('.$sqlProductionToProduce.' - '.$sqlProductionToConsume.'))';
 		$sql .= ')';
 		$alertchecked = 'checked';
 	}
 } else {
 	$sql .= ' HAVING (('.$sqldesiredtock.' >= 0 AND ('.$sqldesiredtock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
-	$sql .= ' OR ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))))';
+	if ($includeproductswithoutdesiredqty == 'on') {
+		$sql .= ' OR (('.$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 {
+		$sql .= ' OR ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").'))))';
+	}
 
 	if ($salert == 'on')	// Option to see when stock is lower than alert
 	{
-		$sql .= ' AND ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
+		if ($includeproductswithoutdesiredqty == 'on') {
+			$sql .= ' AND (('.$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 {
+			$sql .= ' AND ('.$sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')))';
+		}
 		$alertchecked = 'checked';
 	}
 }
 
+$includeproductswithoutdesiredqtychecked = '';
+if ($includeproductswithoutdesiredqty == 'on') {
+    $includeproductswithoutdesiredqtychecked = 'checked';
+}
+
 // 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;
 
+$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;
+    }
+}
+
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
 
@@ -482,9 +512,11 @@ $helpurl .= 'ES:M&oacute;dulo_Stocks';
 llxHeader('', $title, $helpurl, '');
 
 $head = array();
+
 $head[0][0] = DOL_URL_ROOT.'/product/stock/replenish.php';
 $head[0][1] = $title;
 $head[0][2] = 'replenish';
+
 $head[1][0] = DOL_URL_ROOT.'/product/stock/replenishorders.php';
 $head[1][1] = $langs->trans("ReplenishmentOrders");
 $head[1][2] = 'replenishorders';
@@ -501,24 +533,31 @@ if (empty($fk_warhouse) && !empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_
 if ($usevirtualstock == 1)
 {
 	print $langs->trans("CurentSelectionMode").': ';
-	print $langs->trans("CurentlyUsingVirtualStock").' - ';
-	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=physical&fk_supplier='.$fk_supplier.'&fk_entrepot='.$fk_entrepot.'">'.$langs->trans("UsePhysicalStock").'</a><br>';
+	print $langs->trans("CurentlyUsingVirtualStock");
+	print ' (<a href="'.$_SERVER["PHP_SELF"].'?mode=physical&fk_supplier='.$fk_supplier.'&fk_entrepot='.$fk_entrepot.'">'.$langs->trans("UsePhysicalStock").'</a>)';
+	print '<br>';
 }
 if ($usevirtualstock == 0)
 {
 	print $langs->trans("CurentSelectionMode").': ';
-	print $langs->trans("CurentlyUsingPhysicalStock").' - ';
-	print '<a href="'.$_SERVER["PHP_SELF"].'?mode=virtual&fk_supplier='.$fk_supplier.'&fk_entrepot='.$fk_entrepot.'">'.$langs->trans("UseVirtualStock").'</a><br>';
+	print $langs->trans("CurentlyUsingPhysicalStock");
+	print ' (<a href="'.$_SERVER["PHP_SELF"].'?mode=virtual&fk_supplier='.$fk_supplier.'&fk_entrepot='.$fk_entrepot.'">'.$langs->trans("UseVirtualStock").'</a>)';
+	print '<br>';
 }
 print '<br>'."\n";
 
-print '<form name="formFilterWarehouse" method="GET" action="">';
+print '<form name="formFilterWarehouse" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="filter">';
-print '<input type="hidden" name="sref" value="'.$sref.'">';
-print '<input type="hidden" name="snom" value="'.$snom.'">';
+print '<input type="hidden" name="search_ref" value="'.$search_ref.'">';
+print '<input type="hidden" name="search_label" value="'.$search_label.'">';
 print '<input type="hidden" name="salert" value="'.$salert.'">';
+print '<input type="hidden" name="includeproductswithoutdesiredqty" value="'.$includeproductswithoutdesiredqty.'">';
 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.'">';
+}
 if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE))
 {
 	print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
@@ -539,8 +578,20 @@ print '</div>';
 
 print '</form>';
 
-if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alpha')) {
-	$filters = '&sref='.$sref.'&snom='.$snom;
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="fk_supplier" value="'.$fk_supplier.'">';
+print '<input type="hidden" name="fk_entrepot" value="'.$fk_entrepot.'">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="type" value="'.$type.'">';
+print '<input type="hidden" name="linecount" value="'.$num.'">';
+print '<input type="hidden" name="action" value="order">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+
+if ($search_ref || $search_label || $sall || $salert || $draftorder || GETPOST('search', 'alpha')) {
+	$filters = '&search_ref='.$search_ref.'&search_label='.$search_label;
 	$filters .= '&sall='.$sall;
 	$filters .= '&salert='.$salert;
 	$filters .= '&draftorder='.$draftorder;
@@ -558,7 +609,7 @@ if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alph
 		$num
 	);
 } else {
-	$filters = '&sref='.$sref.'&snom='.$snom;
+	$filters = '&search_ref='.$search_ref.'&search_label='.$search_label;
 	$filters .= '&fourn_id='.$fourn_id;
 	$filters .= (isset($type) ? '&type='.$type : '');
 	$filters .= '&='.$salert;
@@ -578,51 +629,89 @@ if ($sref || $snom || $sall || $salert || $draftorder || GETPOST('search', 'alph
 	);
 }
 
-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">';
+if ($limit > 0 && $limit != $conf->liste_limit) {
+    $filters .= '&limit='.urlencode($limit);
+}
 
 $param = (isset($type) ? '&type='.$type : '');
-$param .= '&fourn_id='.$fourn_id.'&snom='.$snom.'&salert='.$salert.'&draftorder='.$draftorder;
-$param .= '&sref='.$sref;
+$param .= '&fourn_id='.$fourn_id.'&search_label='.$search_label.'&includeproductswithoutdesiredqty='.$includeproductswithoutdesiredqty.'&salert='.$salert.'&draftorder='.$draftorder;
+$param .= '&search_ref='.$search_ref;
 $param .= '&mode='.$mode;
 $param .= '&fk_supplier='.$fk_supplier;
 $param .= '&fk_entrepot='.$fk_entrepot;
 
 $stocklabel = $langs->trans('Stock');
+$stocklabelbis = $langs->trans('Stock');
 if ($usevirtualstock == 1) $stocklabel = $langs->trans('VirtualStock');
 if ($usevirtualstock == 0) $stocklabel = $langs->trans('PhysicalStock');
 if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0)
 {
+	$stocklabelbis = $stocklabel.' (Selected warehouse)';
 	$stocklabel .= ' ('.$langs->trans("AllWarehouses").')';
 }
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="fk_supplier" value="'.$fk_supplier.'">';
-print '<input type="hidden" name="fk_entrepot" value="'.$fk_entrepot.'">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="type" value="'.$type.'">';
-print '<input type="hidden" name="linecount" value="'.$num.'">';
-print '<input type="hidden" name="action" value="order">';
-print '<input type="hidden" name="mode" value="'.$mode.'">';
+$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
+    );
+} else {
+    print_barre_liste(
+        $texte,
+        $page,
+        'replenish.php',
+        $filters,
+        $sortfield,
+        $sortorder,
+        '',
+        $num,
+        $nbtotalofrecords,
+        'object_stock.png'
+    );
+}
+
+print '<table class="liste centpercent">';
 
 // Fields title search
 print '<tr class="liste_titre_filter">';
 print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre"><input class="flat" type="text" name="sref" size="8" value="'.dol_escape_htmltag($sref).'"></td>';
-print '<td class="liste_titre"><input class="flat" type="text" name="snom" size="8" value="'.dol_escape_htmltag($snom).'"></td>';
+print '<td class="liste_titre"><input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'"></td>';
+print '<td class="liste_titre"><input class="flat" type="text" name="search_label" size="8" value="'.dol_escape_htmltag($search_label).'"></td>';
 if (!empty($conf->service->enabled) && $type == 1) print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre right">&nbsp;</td>';
+print '<td class="liste_titre right">'.$form->textwithpicto($langs->trans('IncludeEmptyDesiredStock'), $langs->trans('IncludeProductWithUndefinedAlerts')).'&nbsp;<input type="checkbox" id="includeproductswithoutdesiredqty" name="includeproductswithoutdesiredqty" '.(!empty($includeproductswithoutdesiredqtychecked) ? $includeproductswithoutdesiredqtychecked : '').'></td>';
+print '<td class="liste_titre right"></td>';
 print '<td class="liste_titre right">'.$langs->trans('AlertOnly').'&nbsp;<input type="checkbox" id="salert" name="salert" '.(!empty($alertchecked) ? $alertchecked : '').'></td>';
-print '<td class="liste_titre right">'.$langs->trans('IncludeAlsoDraftOrders').'&nbsp;<input type="checkbox" id="draftorder" name="draftorder" '.(!empty($draftchecked) ? $draftchecked : '').'></td>';
+if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0)
+{
+	print '<td class="liste_titre">&nbsp;</td>';
+}
+print '<td class="liste_titre right">';
+if (!empty($conf->global->STOCK_REPLENISH_ADD_CHECKBOX_INCLUDE_DRAFT_ORDER)) {
+	print $langs->trans('IncludeAlsoDraftOrders').'&nbsp;<input type="checkbox" id="draftorder" name="draftorder" '.(!empty($draftchecked) ? $draftchecked : '').'>';
+}
+print '</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 // Fields from hook
 $parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
-print '<td class="liste_titre maxwidthsearch">';
+print '<td class="liste_titre maxwidthsearch right">';
 $searchpicto = $form->showFilterAndCheckAddButtons(0);
 print $searchpicto;
 print '</td>';
@@ -637,6 +726,10 @@ if (!empty($conf->service->enabled) && $type == 1) print_liste_field_titre('Dura
 print_liste_field_titre('DesiredStock', $_SERVER["PHP_SELF"], 'p.desiredstock', $param, '', '', $sortfield, $sortorder, 'right ');
 print_liste_field_titre('StockLimitShort', $_SERVER["PHP_SELF"], 'p.seuil_stock_alerte', $param, '', '', $sortfield, $sortorder, 'right ');
 print_liste_field_titre($stocklabel, $_SERVER["PHP_SELF"], 'stock_physique', $param, '', '', $sortfield, $sortorder, 'right ');
+if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0)
+{
+	print_liste_field_titre($stocklabelbis, $_SERVER["PHP_SELF"], 'stock_real_warehouse', $param, '', '', $sortfield, $sortorder, 'right ');
+}
 print_liste_field_titre('Ordered', $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'right ');
 print_liste_field_titre('StockToBuy', $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'right ');
 print_liste_field_titre('SupplierRef', $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'right ');
@@ -675,14 +768,15 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			}
 		}
 
+		$stockwarehouse = 0;
 		if ($usevirtualstock)
 		{
 			// If option to increase/decrease is not on an object validation, virtual stock may differs from physical stock.
 			$stock = $prod->stock_theorique;
-		}
-		else
-		{
+			//TODO $stockwarehouse = $prod->stock_warehouse[$fk_entrepot]->;
+		} else {
 			$stock = $prod->stock_reel;
+			$stockwarehouse = $prod->stock_warehouse[$fk_entrepot]->real;
 		}
 
 		// Force call prod->load_stats_xxx to choose status to count (otherwise it is loaded by load_stock function)
@@ -698,91 +792,105 @@ while ($i < ($limit ? min($num, $limit) : $num))
 		//print $prod->stats_reception['qty'];
 		$ordered = $prod->stats_commande_fournisseur['qty'] - $prod->stats_reception['qty'];
 
-		$desiredstock = ($objp->desiredstockpse ? $objp->desiredstockpse : $objp->desiredstock);
-		$alertstock = ($objp->seuil_stock_alertepse ? $objp->seuil_stock_alertepse : $objp->seuil_stock_alerte);
+		$desiredstock = $objp->desiredstock;
+		$alertstock = $objp->seuil_stock_alerte;
+		$desiredstockwarehouse = ($objp->desiredstockpse ? $objp->desiredstockpse : 0);
+		$alertstockwarehouse = ($objp->seuil_stock_alertepse ? $objp->seuil_stock_alertepse : 0);
 
 		$warning = '';
 		if ($alertstock && ($stock < $alertstock))
 		{
 			$warning = img_warning($langs->trans('StockTooLow')).' ';
 		}
+		$warningwarehouse = '';
+		if ($alertstockwarehouse && ($stockwarehouse < $alertstockwarehouse))
+		{
+			$warningwarehouse = img_warning($langs->trans('StockTooLow')).' ';
+		}
 
 		//depending on conf, use either physical stock or
 		//virtual stock to compute the stock to buy value
 
 		if (empty($usevirtualstock)) $stocktobuy = max(max($desiredstock, $alertstock) - $stock - $ordered, 0);
 		else $stocktobuy = max(max($desiredstock, $alertstock) - $stock, 0); //ordered is already in $stock in virtual mode
+		if (empty($usevirtualstock)) $stocktobuywarehouse = max(max($desiredstockwarehouse, $alertstockwarehouse) - $stockwarehouse - $ordered, 0);
+		else $stocktobuywarehouse = max(max($desiredstockwarehouse, $alertstockwarehouse) - $stockwarehouse, 0); //ordered is already in $stock in virtual mode
 
-		$disabled = '';
+		$picto = '';
 		if ($ordered > 0)
 		{
-			$stockforcompare = $usevirtualstock ? $stock : $stock + $ordered;
-			if ($stockforcompare >= $desiredstock)
+			$stockforcompare = ($usevirtualstock ? $stock : $stock + $ordered);
+			/*if ($stockforcompare >= $desiredstock)
 			{
-				$picto = img_picto('', './img/yes', '', 1);
-				$disabled = 'disabled';
-			}
-			else {
-				$picto = img_picto('', './img/no', '', 1);
-			}
-		} else {
-			//$picto = img_help('',$langs->trans("NoPendingReceptionOnSupplierOrder"));
-			$picto = img_picto($langs->trans("NoPendingReceptionOnSupplierOrder"), './img/no', '', 1);
-		}
-
-		print '<tr class="oddeven">';
-
-		// Select field
-		//print '<td><input type="checkbox" class="check" name="' . $i . '"' . $disabled . '></td>';
-		print '<td><input type="checkbox" class="check" name="choose'.$i.'"></td>';
-
-		print '<td class="nowrap">'.$prod->getNomUrl(1, '').'</td>';
-
-		print '<td>'.$objp->label;
-		print '<input type="hidden" name="desc'.$i.'" value="'.dol_escape_htmltag($objp->description).'">'; // TODO Remove this and make a fetch to get description when creating order instead of a GETPOST
-		print '</td>';
-
-		if (!empty($conf->service->enabled) && $type == 1)
-		{
-			if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) {
-				$duration = $regs[1].' '.$langs->trans('DurationYear');
-			} elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) {
-				$duration = $regs[1].' '.$langs->trans('DurationMonth');
-			} elseif (preg_match('/([0-9]+)d/i', $objp->duration, $regs)) {
-				$duration = $regs[1].' '.$langs->trans('DurationDay');
+				$picto = img_picto('', 'help');
 			} else {
-				$duration = $objp->duration;
-			}
-			print '<td class="center">'.$duration.'</td>';
+				$picto = img_picto('', 'help');
+			}*/
+		} else {
+			$picto = img_picto($langs->trans("NoPendingReceptionOnSupplierOrder"), 'help');
 		}
 
-		// Desired stock
-		print '<td class="right">'.$desiredstock.'</td>';
+		$variants = $prod->hasVariants();
+		if (!$variants || !empty($conf->global->VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT)) {
+			print '<tr class="oddeven">';
 
-		// Limit stock for alert
-		print '<td class="right">'.$alertstock.'</td>';
+			// Select field
+			print '<td><input type="checkbox" class="check" name="choose'.$i.'"></td>';
 
-		// Current stock (all warehouses)
-		print '<td class="right">'.$warning.$stock.'</td>';
+			print '<td class="nowrap">'.$prod->getNomUrl(1, 'stock').'</td>';
 
-		// Already ordered
-		print '<td class="right"><a href="replenishorders.php?search_product='.$prod->id.'">'.$ordered.'</a> '.$picto.'</td>';
+			print '<td>'.$objp->label;
+			print '<input type="hidden" name="desc'.$i.'" value="'.dol_escape_htmltag($objp->description).'">'; // TODO Remove this and make a fetch to get description when creating order instead of a GETPOST
+			print '</td>';
 
-		// To order
-		//print '<td class="right"><input type="text" name="tobuy'.$i.'" value="'.$stocktobuy.'" '.$disabled.'></td>';
-		print '<td class="right"><input type="text" size="4" name="tobuy'.$i.'" value="'.$stocktobuy.'"></td>';
+			if (!empty($conf->service->enabled) && $type == 1)
+			{
+				$regs = array();
+				if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) {
+					$duration = $regs[1].' '.$langs->trans('DurationYear');
+				} elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) {
+					$duration = $regs[1].' '.$langs->trans('DurationMonth');
+				} elseif (preg_match('/([0-9]+)d/i', $objp->duration, $regs)) {
+					$duration = $regs[1].' '.$langs->trans('DurationDay');
+				} else {
+					$duration = $objp->duration;
+				}
+				print '<td class="center">'.$duration.'</td>';
+			}
 
-		// Supplier
-		print '<td class="right">';
-        print $form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier);
-        print '</td>';
+			// Desired stock
+			print '<td class="right">'.($fk_entrepot > 0 ? $desiredstockwarehouse : $desiredstock).'</td>';
 
-		// Fields from hook
-		$parameters = array('objp'=>$objp);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
+			// Limit stock for alert
+			print '<td class="right">'.($fk_entrepot > 0 ? $alertstockwarehouse : $alertstock).'</td>';
 
-		print '</tr>';
+			// Current stock (all warehouses)
+			print '<td class="right">'.$warning.$stock.'</td>';
+
+			// Current stock (warehouse selected only)
+			if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0)
+			{
+				print '<td class="right">'.$warningwarehouse.$stockwarehouse.'</td>';
+			}
+
+			// Already ordered
+			print '<td class="right"><a href="replenishorders.php?search_product='.$prod->id.'">'.$ordered.'</a> '.$picto.'</td>';
+
+			// To order
+			print '<td class="right"><input type="text" size="4" name="tobuy'.$i.'" value="'.($fk_entrepot > 0 ? $stocktobuywarehouse : $stocktobuy).'"></td>';
+
+			// Supplier
+			print '<td class="right">';
+	        print $form->select_product_fourn_price($prod->id, 'fourn'.$i, $fk_supplier);
+	        print '</td>';
+
+			// Fields from hook
+			$parameters = array('objp'=>$objp);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+
+			print '</tr>';
+		}
 	}
 	$i++;
 }
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 42469b4dd2a..ef8639787b7 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -47,7 +47,7 @@ $snom = GETPOST('search_nom', 'alpha');
 $suser = GETPOST('search_user', 'alpha');
 $sttc = GETPOST('search_ttc', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$sproduct = GETPOST('sproduct', 'int');
+$search_product = GETPOST('search_product', 'int');
 $search_dateyear = GETPOST('search_dateyear', 'int');
 $search_datemonth = GETPOST('search_datemonth', 'int');
 $search_dateday = GETPOST('search_dateday', 'int');
@@ -78,7 +78,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
     $search_datemonth = '';
     $search_dateday = '';
     $search_dateyear = '';
-    $sproduct = 0;
+    $search_product = 0;
 }
 
 
@@ -97,9 +97,11 @@ llxHeader('', $texte, $helpurl, '');
 print load_fiche_titre($langs->trans('Replenishment'), '', 'stock');
 
 $head = array();
+
 $head[0][0] = DOL_URL_ROOT.'/product/stock/replenish.php';
-$head[0][1] = $langs->trans('Status');
+$head[0][1] = $langs->trans('MissingStocks');
 $head[0][2] = 'replenish';
+
 $head[1][0] = DOL_URL_ROOT.'/product/stock/replenishorders.php';
 $head[1][1] = $texte;
 $head[1][2] = 'replenishorders';
@@ -141,7 +143,7 @@ if (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';
 $sql .= $db->order($sortfield, $sortorder);
-if (!$sproduct) {
+if (!$search_product) {
 	$sql .= $db->plimit($limit + 1, $offset);
 }
 
@@ -259,11 +261,11 @@ if ($resql)
 
     $userstatic = new User($db);
 
-	while ($i < min($num, $sproduct ? $num : $conf->liste_limit))
+	while ($i < min($num, $search_product ? $num : $conf->liste_limit))
     {
         $obj = $db->fetch_object($resql);
 
-        $showline = dolDispatchToDo($obj->rowid) && (!$sproduct || in_array($sproduct, getProducts($obj->rowid)));
+        $showline = dolDispatchToDo($obj->rowid) && (!$search_product || in_array($search_product, getProducts($obj->rowid)));
 
         if ($showline)
         {
@@ -314,9 +316,7 @@ if ($resql)
     $db->free($resql);
 
     dol_fiche_end();
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
new file mode 100644
index 00000000000..f581242c9f2
--- /dev/null
+++ b/htdocs/product/stock/stockatdate.php
@@ -0,0 +1,563 @@
+<?php
+/* Copyright (C) 2013		Cédric Salvador		<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013-2020	Laurent Destaileur	<ely@users.sourceforge.net>
+ * Copyright (C) 2014		Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2016		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2016		ATM Consulting		<support@atm-consulting.fr>
+ * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/product/stock/stockatdate.php
+ *  \ingroup    stock
+ *  \brief      Page to list stocks at a given date
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once './lib/replenishment.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('products', 'stocks', 'orders'));
+
+// Security check
+if ($user->socid) {
+    $socid = $user->socid;
+}
+$result = restrictedArea($user, 'produit|service');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('stockreplenishlist'));
+
+//checks if a product has been ordered
+
+$action = GETPOST('action', 'aZ09');
+$type = GETPOST('type', 'int');
+$mode = GETPOST('mode', 'alpha');
+$date = '';
+$dateendofday = '';
+if (GETPOSTISSET('dateday') && GETPOSTISSET('datemonth') && GETPOSTISSET('dateyear')) {
+	$date = dol_mktime(0, 0, 0, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int'));
+	$dateendofday = dol_mktime(23, 59, 59, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int'));
+}
+
+$now = dol_now();
+
+$productid = GETPOST('productid', 'int');
+$fk_warehouse = GETPOST('fk_warehouse', 'int');
+
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$offset = $limit * $page;
+if (!$sortfield) {
+    $sortfield = 'p.ref';
+}
+if (!$sortorder) {
+    $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;
+if ($mode == 'future') {
+	if ($date && $date < $now) {
+		setEventMessages($langs->trans("ErrorDateMustBeInFuture"), null, 'errors');
+		$dateIsValid= false;
+	}
+} else {
+	if ($date && $date > $now) {
+		setEventMessages($langs->trans("ErrorDateMustBeBeforeToday"), null, 'errors');
+		$dateIsValid= false;
+	}
+}
+
+
+/*
+ * Actions
+ */
+
+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
+{
+	$date = '';
+	$productid = 0;
+	$fk_warehouse = 0;
+}
+
+$warehouseStatus = array();
+if ($conf->global->ENTREPOT_EXTRA_STATUS) {
+	//$warehouseStatus[] = Entrepot::STATUS_CLOSED;
+	$warehouseStatus[] = Entrepot::STATUS_OPEN_ALL;
+	$warehouseStatus[] = Entrepot::STATUS_OPEN_INTERNAL;
+}
+
+// Get array with current stock per product, warehouse
+$stock_prod_warehouse = array();
+$stock_prod = array();
+if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
+	$sql = "SELECT ps.fk_product, ps.fk_entrepot as fk_warehouse,";
+	$sql .= " SUM(ps.reel) AS stock";
+	$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
+	$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)) {
+		$sql .= " AND w.statut IN (".$db->sanitize($db->escape(implode(',', $warehouseStatus))).")";
+	}
+	if ($productid > 0) {
+		$sql .= " AND ps.fk_product = ".$productid;
+	}
+	if ($fk_warehouse > 0) {
+		$sql .= " AND ps.fk_entrepot = ".$fk_warehouse;
+	}
+	$sql .= " GROUP BY fk_product, fk_entrepot";
+	//print $sql;
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+
+			$tmp_fk_product   = $obj->fk_product;
+			$tmp_fk_warehouse = $obj->fk_warehouse;
+			$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;
+
+			$i++;
+		}
+
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
+	//var_dump($stock_prod_warehouse);
+} elseif ($action == 'filter') {
+	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+}
+
+// Get array with list of stock movements between date and now (for product/warehouse=
+$movements_prod_warehouse = array();
+$movements_prod = array();
+$movements_prod_warehouse_nb = array();
+$movements_prod_nb = array();
+if ($date && $dateIsValid) {
+	$sql = "SELECT sm.fk_product, sm.fk_entrepot, SUM(sm.value) AS stock, COUNT(sm.rowid) AS nbofmovement";
+	$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as sm";
+	$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)) {
+		$sql .= " AND w.statut IN (".$db->sanitize($db->escape(implode(',', $warehouseStatus))).")";
+	}
+	if ($mode == 'future') {
+		$sql .= " AND sm.datem <= '".$db->idate($dateendofday)."'";
+	} else {
+		$sql .= " AND sm.datem >= '".$db->idate($date)."'";
+	}
+	if ($productid > 0) {
+		$sql .= " AND sm.fk_product = ".$productid;
+	}
+	if ($fk_warehouse > 0) {
+		$sql .= " AND sm.fk_entrepot = ".$fk_warehouse;
+	}
+	$sql .= " GROUP BY sm.fk_product, sm.fk_entrepot";
+	$resql = $db->query($sql);
+
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
+			$fk_product 	= $obj->fk_product;
+			$fk_entrepot 	= $obj->fk_entrepot;
+			$stock 			= $obj->stock;
+			$nbofmovement	= $obj->nbofmovement;
+
+			// Pour llx_product_stock.reel
+			$movements_prod_warehouse[$fk_product][$fk_entrepot] = $stock;
+			$movements_prod_warehouse_nb[$fk_product][$fk_entrepot] = $nbofmovement;
+
+			// Pour llx_product.stock
+			$movements_prod[$fk_product] += $stock;
+			$movements_prod_nb[$fk_product] += $nbofmovement;
+
+			$i++;
+		}
+
+		$db->free($resql);
+	} else {
+		dol_print_error($db);
+	}
+}
+//var_dump($movements_prod_warehouse);
+//var_dump($movements_prod);
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formproduct = new FormProduct($db);
+$prod = new Product($db);
+
+$num = 0;
+
+$title = $langs->trans('StockAtDate');
+
+$sql = 'SELECT p.rowid, p.ref, p.label, p.description, p.price,';
+$sql .= ' p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
+$sql .= ' p.tms as datem, p.duration, p.tobuy, p.stock';
+if ($fk_warehouse > 0) {
+	$sql .= ', SUM(ps.reel) as stock_reel';
+}
+// 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.'product as p';
+if ($fk_warehouse > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '.$fk_warehouse;
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListJoin', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
+if ($productid > 0) {
+	$sql .= " AND p.rowid = ".$productid;
+}
+if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+	$sql .= " AND p.fk_product_type = 0";
+}
+if (!empty($canvas)) $sql .= ' AND p.canvas = "'.$db->escape($canvas).'"';
+if ($fk_warehouse > 0) {
+	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
+	$sql .= ' p.tms, p.duration, p.tobuy, p.stock';
+}
+// 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;
+
+if ($sortfield == 'stock_reel' && $fk_warehouse <= 0) {
+	$sortfield = 'stock';
+}
+if ($sortfield == 'stock' && $fk_warehouse > 0) {
+	$sortfield = 'stock_reel';
+}
+$sql .= $db->order($sortfield, $sortorder);
+
+if ($date && $dateIsValid) {	// We avoid a heavy sql if mandatory parameter date not yet defined
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
+	}
+
+	$sql .= $db->plimit($limit + 1, $offset);
+
+	//print $sql;
+	$resql = $db->query($sql);
+	if (empty($resql))
+	{
+	    dol_print_error($db);
+	    exit;
+	}
+
+	$num = $db->num_rows($resql);
+}
+
+$i = 0;
+//print $sql;
+
+$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|';
+$helpurl .= 'ES:M&oacute;dulo_Stocks';
+
+llxHeader('', $title, $helpurl, '');
+
+$head = array();
+
+$head[0][0] = DOL_URL_ROOT.'/product/stock/stockatdate.php';
+$head[0][1] = $langs->trans("StockAtDateInPast");
+$head[0][2] = 'stockatdatepast';
+
+$head[1][0] = DOL_URL_ROOT.'/product/stock/stockatdate.php?mode=future';
+$head[1][1] = $langs->trans("StockAtDateInFuture");
+$head[1][2] = 'stockatdatefuture';
+
+
+print load_fiche_titre($langs->trans('StockAtDate'), '', 'stock');
+
+dol_fiche_head($head, ($mode == 'future' ? 'stockatdatefuture' : 'stockatdatepast'), '', -1, '');
+
+$desc = $langs->trans("StockAtDatePastDesc");
+if ($mode == 'future') $desc = $langs->trans("StockAtDateFutureDesc");
+print '<span class="opacitymedium">'.$desc.'</span><br>'."\n";
+print '<br>'."\n";
+
+print '<form name="formFilterWarehouse" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="filter">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
+print '<span class="fieldrequired">'.$langs->trans('Date').'</span> '.$form->selectDate(($date ? $date : -1), 'date');
+
+print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddinrightonly">&nbsp;</span> '.$langs->trans('Product').'</span> ';
+$form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
+
+print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddinrightonly">&nbsp;</span> '.$langs->trans('Warehouse').'</span> ';
+print $formproduct->selectWarehouses($fk_warehouse, 'fk_warehouse', '', 1);
+print '</div>';
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) print $hookmanager->resPrint;
+
+print '<div class="inline-block valignmiddle">';
+print '<input class="button" type="submit" name="valid" value="'.$langs->trans('Refresh').'">';
+print '</div>';
+
+//print '</form>';
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+$param .= '&mode='.$mode;
+if ($fk_warehouse > 0) $param .= '&fk_warehouse='.$fk_warehouse;
+if ($productid > 0) $param .= '&productid='.$productid;
+if (GETPOST('dateday', 'int') > 0) $param .= '&dateday='.GETPOST('dateday', 'int');
+if (GETPOST('datemonth', 'int') > 0) $param .= '&datemonth='.GETPOST('datemonth', 'int');
+if (GETPOST('dateyear', 'int') > 0) $param .= '&dateyear='.GETPOST('dateyear', 'int');
+
+// TODO Move this into the title line ?
+print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'stock', 0, '', '', $limit, 0, 0, 1);
+
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="liste centpercent">';
+
+$stocklabel = $langs->trans('StockAtDate');
+if ($mode == 'future') $stocklabel = $langs->trans("VirtualStockAtDate");
+
+//print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">';
+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="type" value="'.$type.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+// Fields title search
+print '<tr class="liste_titre_filter">';
+print '<td class="liste_titre"><input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($sref).'"></td>';
+print '<td class="liste_titre"><input class="flat" type="text" name="search_nom" size="8" value="'.dol_escape_htmltag($snom).'"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+print '<td class="liste_titre"></td>';
+if ($mode == 'future') {
+	print '<td class="liste_titre"></td>';
+}
+// Fields from hook
+$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$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);
+print $searchpicto;
+print '</td>';
+print '</tr>';
+
+$fieldtosortcurrentstock = 'stock';
+if ($fk_warehouse > 0) {
+	$fieldtosortcurrentstock = 'stock_reel';
+}
+
+// Lines of title
+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 ($mode == 'future') {
+	print_liste_field_titre('CurrentStock', $_SERVER["PHP_SELF"], $fieldtosortcurrentstock, $param, '', '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('', $_SERVER["PHP_SELF"]);
+	print_liste_field_titre($stocklabel, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'right ', 'VirtualStockAtDateDesc');
+	print_liste_field_titre('VirtualStock', $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'right ', 'VirtualStockDesc');
+} else {
+	print_liste_field_titre($stocklabel, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre('', $_SERVER["PHP_SELF"]);
+	print_liste_field_titre('CurrentStock', $_SERVER["PHP_SELF"], $fieldtosortcurrentstock, $param, '', '', $sortfield, $sortorder, 'right ');
+}
+print_liste_field_titre('', $_SERVER["PHP_SELF"], '', $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
+print $hookmanager->resPrint;
+
+print "</tr>\n";
+
+$i = 0;
+while ($i < ($limit ? min($num, $limit) : $num))
+{
+	$objp = $db->fetch_object($resql);
+
+	if (!empty($conf->global->STOCK_SUPPORTS_SERVICES) || $objp->fk_product_type == 0)
+	{
+		$prod->fetch($objp->rowid);
+
+		// Multilangs
+		/*if (!empty($conf->global->MAIN_MULTILANGS))
+		{
+			$sql = 'SELECT label,description';
+			$sql .= ' FROM '.MAIN_DB_PREFIX.'product_lang';
+			$sql .= ' WHERE fk_product = '.$objp->rowid;
+			$sql .= ' AND lang = "'.$langs->getDefaultLang().'"';
+			$sql .= ' LIMIT 1';
+
+			$resqlm = $db->query($sql);
+			if ($resqlm)
+			{
+				$objtp = $db->fetch_object($resqlm);
+				if (!empty($objtp->description)) $objp->description = $objtp->description;
+				if (!empty($objtp->label)) $objp->label = $objtp->label;
+			}
+		}*/
+
+		$currentstock = '';
+		if ($fk_warehouse > 0)
+		{
+			//if ($productid > 0) {
+				$currentstock = $stock_prod_warehouse[$objp->rowid][$fk_warehouse];
+			//} else {
+			//	$currentstock = $objp->stock_reel;
+			//}
+		} else {
+			//if ($productid > 0) {
+				$currentstock = $stock_prod[$objp->rowid];
+			//} else {
+			//	$currentstock = $objp->stock;
+			//}
+		}
+
+		if ($mode == 'future') {
+			$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";
+			//print $prod->stats_reception['qty'];
+
+			$stock = '<span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span>';
+			$virtualstock = $prod->stock_theorique;
+		} else {
+			if ($fk_warehouse > 0) {
+				$stock = $currentstock - $movements_prod_warehouse[$objp->rowid][$fk_warehouse];
+				$nbofmovement = $movements_prod_warehouse_nb[$objp->rowid][$fk_warehouse];
+			} else {
+				$stock = $currentstock - $movements_prod[$objp->rowid];
+				$nbofmovement = $movements_prod_nb[$objp->rowid];
+			}
+		}
+
+
+		print '<tr class="oddeven">';
+
+		// Product ref
+		print '<td class="nowrap">'.$prod->getNomUrl(1, '').'</td>';
+
+		// Product label
+		print '<td>'.$objp->label;
+		print '<input type="hidden" name="desc'.$i.'" value="'.dol_escape_htmltag($objp->description).'">'; // TODO Remove this and make a fetch to get description when creating order instead of a GETPOST
+		print '</td>';
+
+		if ($mode == 'future') {
+			// Current stock
+			print '<td class="right">'.$currentstock.'</td>';
+
+			print '<td class="right"></td>';
+
+			// Virtual stock at date
+			print '<td class="right">'.$stock.'</td>';
+
+			// Final virtual stock
+			print '<td class="right">'.$virtualstock.'</td>';
+		} else {
+			// Stock at date
+			print '<td class="right">'.($stock ? $stock : '<span class="opacitymedium">'.$stock.'</span>').'</td>';
+
+			print '<td class="right">';
+			if ($nbofmovement > 0) {
+				print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$objp->rowid.($fk_warehouse > 0 ? '&search_warehouse='.$fk_warehouse : '').'">'.$langs->trans("Movements").'</a>';
+				print ' <span class="tabs"><span class="badge">'.$nbofmovement.'</span></span>';
+			}
+			print '</td>';
+
+			// Current stock
+			print '<td class="right">'.($currentstock ? $currentstock : '<span class="opacitymedium">0</span>').'</td>';
+		}
+
+		// Action
+		print '<td class="right"></td>';
+
+		// Fields from hook
+		$parameters = array('objp'=>$objp);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
+		print '</tr>';
+	}
+	$i++;
+}
+
+$parameters = array('sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>';
+print '</div>';
+
+$db->free($resql);
+
+dol_fiche_end();
+
+print '</form>';
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index 22d92d4211f..88cced3b99d 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -68,7 +68,9 @@ print '<tr>';
 if ($object->element == 'product') {
 	print '<td class="fieldrequired">'.$langs->trans("Warehouse").'</td>';
 	print '<td>';
-	print $formproduct->selectWarehouses((GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ?GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone'))), 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
+	$ident = (GETPOST("dwid") ?GETPOST("dwid", 'int') : (GETPOST('id_entrepot') ? GETPOST('id_entrepot', 'int') : ($object->element == 'product' && $object->fk_default_warehouse ? $object->fk_default_warehouse : 'ifone')));
+	if (empty($ident) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $ident = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+	print $formproduct->selectWarehouses($ident, 'id_entrepot', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'minwidth100');
 	print ' &nbsp; <select class="button buttongen" name="mouvement" id="mouvement">';
 	print '<option value="0">'.$langs->trans("Add").'</option>';
 	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
@@ -101,14 +103,18 @@ if (!empty($conf->productbatch->enabled) &&
 	print '</td>';
 	print '</tr>';
 	print '<tr>';
-	print '<td>'.$langs->trans("EatByDate").'</td><td>';
-	$eatbyselected = dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
-	print $form->selectDate($eatbyselected, 'eatby', '', '', 1, "");
-	print '</td>';
-	print '<td>'.$langs->trans("SellByDate").'</td><td>';
-	$sellbyselected = dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
-	print $form->selectDate($sellbyselected, 'sellby', '', '', 1, "");
-	print '</td>';
+	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+		print '<td>'.$langs->trans("EatByDate").'</td><td>';
+		$eatbyselected = dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
+		print $form->selectDate($eatbyselected, 'eatby', '', '', 1, "");
+		print '</td>';
+	}
+	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+		print '<td>'.$langs->trans("SellByDate").'</td><td>';
+		$sellbyselected = dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
+		print $form->selectDate($sellbyselected, 'sellby', '', '', 1, "");
+		print '</td>';
+	}
 	print '</tr>';
 }
 
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index 9bea4a65070..0164e99bd37 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -46,9 +46,7 @@ if ($pdluoid > 0)
 	if ($result > 0)
 	{
 		$pdluoid = $pdluo->id;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db, $pdluo->error, $pdluo->errors);
 	}
 }
@@ -102,21 +100,23 @@ if (!empty($conf->productbatch->enabled) &&
 		// If form was opened for a specific pdluoid, field is disabled
 		print '<input type="text" name="batch_number_bis" size="40" disabled="disabled" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
 		print '<input type="hidden" name="batch_number" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
-	}
-	else
-	{
+	} else {
 		print '<input type="text" name="batch_number" size="40" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
 	}
 	print '</td>';
 	print '</tr>';
 
 	print '<tr>';
-	print '<td>'.$langs->trans("EatByDate").'</td><td>';
-	print $form->selectDate(($d_eatby ? $d_eatby : $pdluo->eatby), 'eatby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
-	print '</td>';
-	print '<td>'.$langs->trans("SellByDate").'</td><td>';
-	print $form->selectDate(($d_sellby ? $d_sellby : $pdluo->sellby), 'sellby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
-	print '</td>';
+	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+		print '<td>'.$langs->trans("EatByDate").'</td><td>';
+		print $form->selectDate(($d_eatby ? $d_eatby : $pdluo->eatby), 'eatby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
+		print '</td>';
+	}
+	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+		print '<td>'.$langs->trans("SellByDate").'</td><td>';
+		print $form->selectDate(($d_sellby ? $d_sellby : $pdluo->sellby), 'sellby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
+		print '</td>';
+	}
 	print '</tr>';
 }
 
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 816d97351b4..182d78e9cd1 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -149,9 +149,7 @@ if ($result)
         $url = DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
         print '<br><img src="'.$url.'">';
     }
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 5bb816ad42e..c6a5d15a0b0 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('products', 'languages'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
 // Security check
@@ -73,27 +73,21 @@ $cancel != $langs->trans("Cancel") &&
 	$current_lang = $langs->getDefaultLang();
 
 	// update de l'objet
-	if ($_POST["forcelangprod"] == $current_lang)
-	{
+	if ($_POST["forcelangprod"] == $current_lang) {
 		$object->label			= $_POST["libelle"];
 		$object->description = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->other			= dol_htmlcleanlastbr($_POST["other"]);
 		$object->update($object->id, $user);
-	}
-	else
-	{
+	} else {
 		$object->multilangs[$_POST["forcelangprod"]]["label"]		= $_POST["libelle"];
 		$object->multilangs[$_POST["forcelangprod"]]["description"] = dol_htmlcleanlastbr($_POST["desc"]);
 		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
 	}
 
 	// sauvegarde en base
-	if ($object->setMultiLangs($user) > 0)
-	{
+	if ($object->setMultiLangs($user) > 0) {
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'add';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -115,9 +109,7 @@ $cancel != $langs->trans("Cancel") &&
 			$object->label			= $_POST["libelle-".$key];
 			$object->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->other			= dol_htmlcleanlastbr($_POST["other-".$key]);
-		}
-		else
-		{
+		} else {
 			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
 			$object->multilangs[$key]["description"] = dol_htmlcleanlastbr($_POST["desc-".$key]);
 			$object->multilangs[$key]["other"]			= dol_htmlcleanlastbr($_POST["other-".$key]);
@@ -127,9 +119,7 @@ $cancel != $langs->trans("Cancel") &&
 	if ($object->setMultiLangs($user) > 0)
 	{
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -148,9 +138,7 @@ $cancel != $langs->trans("Cancel") &&
 	if ($object->delMultiLangs($langtodelete, $user) > 0)
 	{
 		$action = '';
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -248,7 +236,7 @@ if ($action == 'edit')
 		foreach ($object->multilangs as $key => $value)
 		{
 			$s = picto_from_langcode($key);
-			print "<br>".($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
+			print "<br>".($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"')."</a><br>";
 
 			print '<div class="underbanner clearboth"></div>';
 			print '<table class="border centpercent">';
@@ -277,15 +265,14 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-}
-elseif ($action != 'add')
+} elseif ($action != 'add')
 {
 	if (!empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
 			$s = picto_from_langcode($key);
-			print ($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
+			print ($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'">'.img_delete('', 'class="valigntextbottom"').'</a>';
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 107bcb4e4e3..295f96370f3 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -86,8 +86,7 @@ $morehtml .= '</SELECT>';
 $morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
 
 if ($mine) $tooltiphelp = $langs->trans("MyTasksDesc");
-else
-{
+else {
 	if ($user->rights->projet->all->lire && !$socid) $tooltiphelp = $langs->trans("TasksDesc");
 	else $tooltiphelp = $langs->trans("TasksPublicDesc");
 }
@@ -146,7 +145,7 @@ $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_mktime(0, 0, 0, $month, $day, $year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."'";
-$sql .= " AND p.rowid in (".$projectsListId.")";
+$sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
 $sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 $resql = $db->query($sql);
@@ -170,9 +169,7 @@ if ($resql)
 	}
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 print '<tr class="liste_total">';
@@ -203,7 +200,7 @@ $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_time_plus_duree(dol_mktime(0, 0, 0, $month, $day, $year), -1, 'd'))."' AND '".$db->idate(dol_time_plus_duree(dol_mktime(23, 59, 59, $month, $day, $year), -1, 'd'))."'";
-$sql .= " AND p.rowid in (".$projectsListId.")";
+$sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
 $sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 $resql = $db->query($sql);
@@ -227,9 +224,7 @@ if ($resql)
 	}
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 print '<tr class="liste_total">';
@@ -263,7 +258,7 @@ if ($db->type != 'pgsql')
     $sql.= " AND tt.fk_task = t.rowid";
     $sql.= " AND tt.fk_user = ".$user->id;
     $sql.= " AND task_date >= '".$db->idate(dol_get_first_day($year, $month)).'" AND ...";
-    $sql.= " AND p.rowid in (".$projectsListId.")";
+    $sql.= " AND p.rowid in (".$db->sanitize($projectsListId).")";
     $sql.= " GROUP BY p.rowid, p.ref, p.title";
 
     $resql = $db->query($sql);
@@ -320,7 +315,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
     $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 (".$projectsListId.")";
+    $sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
     $sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
     $resql = $db->query($sql);
@@ -339,9 +334,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_MONTH))
     		print "</tr>\n";
     	}
     	$db->free($resql);
-    }
-    else
-    {
+    } else {
     	dol_print_error($db);
     }
     print '<tr class="liste_total">';
@@ -371,7 +364,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 	$sql .= " AND tt.fk_task = t.rowid";
 	$sql .= " AND tt.fk_user = ".$user->id;
 	$sql .= " AND YEAR(task_date) = '".strftime("%Y", $now)."'";
-	$sql .= " AND p.rowid in (".$projectsListId.")";
+	$sql .= " AND p.rowid in (".$db->sanitize($projectsListId).")";
 	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public";
 
 	$resql = $db->query($sql);
@@ -391,9 +384,7 @@ if (!empty($conf->global->PROJECT_TASK_TIME_YEAR))
 			print "</tr>\n";
 		}
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 	print '<tr class="liste_total">';
@@ -409,7 +400,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
     // 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 = '".$projectstatic->element."'";
+    $sql .= " WHERE ctc.element = '".$db->escape($projectstatic->element)."'";
     $sql .= " AND ctc.source = 'internal'";
     $resql = $db->query($sql);
     if ($resql)
@@ -418,13 +409,12 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
         {
             $listofprojectcontacttype[$obj->rowid] = $obj->code;
         }
-    }
-    else dol_print_error($db);
+    } 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 = '".$taskstatic->element."'";
+    $sql .= " WHERE ctc.element = '".$db->escape($taskstatic->element)."'";
     $sql .= " AND ctc.source = 'internal'";
     $resql = $db->query($sql);
     if ($resql)
@@ -433,8 +423,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
         {
             $listoftaskcontacttype[$obj->rowid] = $obj->code;
         }
-    }
-    else dol_print_error($db);
+    } else dol_print_error($db);
     if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 
@@ -456,7 +445,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 	    $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 (".$projectsListId.")"; // project i have permission on
+	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;
@@ -536,8 +525,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 				$tasktmp->ref = $obj->ref;
 				$tasktmp->label = $obj->label;
 				print $tasktmp->getNomUrl(1, 'withproject', 'task', 1, '<br>');
-			}
-			else print $langs->trans("NoTasks");
+			} else print $langs->trans("NoTasks");
 			print '</td>';
 			print '<td class="center">'.dol_print_date($db->jdate($obj->dateo), 'day').'</td>';
 			print '<td class="center">'.dol_print_date($db->jdate($obj->datee), 'day');
@@ -580,9 +568,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_SH
 
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 2c9de0fa62c..1fb12e7202e 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -93,15 +93,12 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
 {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-}
-elseif ($search_usertoprocessid > 0)
+} elseif ($search_usertoprocessid > 0)
 {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
-}
-else
-{
+} else {
 	$usertoprocess = new User($db);
 }
 
@@ -193,9 +190,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	{
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -231,9 +226,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -246,9 +239,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -307,9 +298,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			{
 				$object->timespent_datehour = dol_mktime(GETPOST($key."hour", 'int'), GETPOST($key."min", 'int'), 0, $monthofday, $dayofday, $yearofday);
 				$object->timespent_withhour = 1;
-			}
-			else
-			{
+			} else {
 				$object->timespent_datehour = dol_mktime(12, 0, 0, $monthofday, $dayofday, $yearofday);
 			}
 			$object->timespent_date = $object->timespent_datehour;
@@ -317,9 +306,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			if ($object->timespent_date > 0)
 			{
 				$result = $object->addTimeSpent($user);
-			}
-			else
-			{
+			} else {
 				setEventMessages("ErrorBadDate", null, 'errors');
 				$error++;
 				break;
@@ -341,9 +328,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 			header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid ? 'id='.$projectid : '').($search_usertoprocessid ? '&search_usertoprocessid='.$search_usertoprocessid : '').($mode ? '&mode='.$mode : '').'&year='.$yearofday.'&month='.$monthofday.'&day='.$dayofday);
 			exit;
 		}
-	}
-	else
-	{
+	} else {
    		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	}
 }
@@ -463,13 +448,12 @@ print '<input type="hidden" name="addtimemonth" value="'.$tmp['mon'].'">';
 print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-dol_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'task');
+dol_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'projecttask');
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
 if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else
-{
+else {
 	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
 	{
 		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
@@ -479,9 +463,7 @@ else
 if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
-}
-else
-{
+} else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -790,9 +772,7 @@ if (count($tasksarray) > 0)
                 <td class="liste_total"></td>
                 </tr>';
 	}
-}
-else
-{
+} else {
 	print '<tr><td colspan="14"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index ae4eed48515..26db00aeeca 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -96,15 +96,12 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
 {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-}
-elseif ($search_usertoprocessid > 0)
+} elseif ($search_usertoprocessid > 0)
 {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
-}
-else
-{
+} else {
 	$usertoprocess = new User($db);
 }
 
@@ -149,9 +146,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	{
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -188,9 +183,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -203,9 +196,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -225,9 +216,7 @@ if ($action == 'addtime' && $user->rights->projet->lire)
 	if (empty($timetoadd))
 	{
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		foreach ($timetoadd as $taskid => $value)     // Loop on each task
 		{
 			$updateoftaskdone = 0;
@@ -376,7 +365,7 @@ $nav .= ' <button type="submit" name="button_search_x" value="x" class="bordertr
 $picto = 'calendarweek';
 
 print '<form name="addtime" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="addtime">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 print '<input type="hidden" name="day" value="'.$day.'">';
@@ -384,13 +373,12 @@ print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'task');
+dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'projecttask');
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
 if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else
-{
+else {
 	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
 	{
 		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
@@ -400,9 +388,7 @@ else
 if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
-}
-else
-{
+} else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -609,9 +595,7 @@ if (count($tasksarray) > 0)
 		print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
     	</tr>';
 	}
-}
-else
-{
+} else {
 	print '<tr><td colspan="15"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 484a93e8631..29f0aa3608d 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -104,15 +104,12 @@ if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id)
 {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
-}
-elseif ($search_usertoprocessid > 0)
+} elseif ($search_usertoprocessid > 0)
 {
 	$usertoprocess = new User($db);
 	$usertoprocess->fetch($search_usertoprocessid);
 	$search_usertoprocessid = $usertoprocess->id;
-}
-else
-{
+} else {
 	$usertoprocess = new User($db);
 }
 
@@ -161,6 +158,7 @@ $search_array_options_task = $extrafields->getOptionalsFromPost('projet_task', '
 /*
  * Actions
  */
+
 $parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -204,9 +202,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 	{
 		$result = $object->fetch($taskid, $ref);
 		if ($result < 0) $error++;
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), '', 'errors');
 		$error++;
 	}
@@ -243,9 +239,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 						$result = $project->add_contact($idfortaskuser, $typeforprojectcontact, 'internal');
 					}
 				}
-			}
-			else
-			{
+			} else {
 				dol_print_error($db);
 			}
 		}
@@ -258,9 +252,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorTaskAlreadyAssigned"), null, 'warnings');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -280,9 +272,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 	if (empty($timetoadd))
 	{
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		foreach ($timetoadd as $taskid => $value)     // Loop on each task
 		{
 			$updateoftaskdone = 0;
@@ -476,13 +466,12 @@ print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-dol_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'task');
+dol_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'projecttask');
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
 if ($mine || ($usertoprocess->id == $user->id)) print $langs->trans("MyTasksDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
-else
-{
+else {
 	if (empty($usertoprocess->id) || $usertoprocess->id < 0)
 	{
 		if ($user->rights->projet->all->lire && !$socid) print $langs->trans("ProjectsDesc").'.'.($onlyopenedproject ? ' '.$langs->trans("OnlyOpenedProject") : '').'<br>';
@@ -492,9 +481,7 @@ else
 if ($mine || ($usertoprocess->id == $user->id))
 {
 	print $langs->trans("OnlyYourTaskAreVisible").'<br>';
-}
-else
-{
+} else {
 	print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'<br>';
 }
 print '</div>';
@@ -836,9 +823,7 @@ if (count($tasksarray) > 0)
                 print '<td class="liste_total center"><div class="totalDayAll">&nbsp;</div></td>
     	</tr>';
 	}
-}
-else
-{
+} else {
 	print '<tr><td colspan="15"><span class="opacitymedium">'.$langs->trans("NoAssignedTasks").'</span></td></tr>';
 }
 print "</table>";
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index cfd10d2c1fa..f66d305f688 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('admin', 'errors', 'other', 'projects'));
 if (!$user->admin) accessforbidden();
 
 $value = GETPOST('value', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'project';
@@ -63,9 +63,7 @@ if ($action == 'updateMask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -82,14 +80,10 @@ if ($action == 'updateMaskTask')
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-}
-
-elseif ($action == 'specimen')
+} elseif ($action == 'specimen')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -120,21 +114,15 @@ elseif ($action == 'specimen')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-elseif ($action == 'specimentask')
+} elseif ($action == 'specimentask')
 {
 	$modele = GETPOST('module', 'alpha');
 
@@ -165,15 +153,11 @@ elseif ($action == 'specimentask')
 		{
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=project_task&file=SPECIMEN.pdf");
 			return;
-		}
-		else
-		{
+		} else {
 			setEventMessages($obj->error, $obj->errors, 'errors');
 			dol_syslog($obj->error, LOG_ERR);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
@@ -188,9 +172,7 @@ elseif ($action == 'set')
 elseif ($action == 'settask')
 {
 	$ret = addDocumentModel($value, 'project_task', $label, $scandir);
-}
-
-elseif ($action == 'del')
+} elseif ($action == 'del')
 {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0)
@@ -218,9 +200,7 @@ elseif ($action == 'setdoc')
 	{
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-elseif ($action == 'setdoctask')
+} elseif ($action == 'setdoctask')
 {
 	if (dolibarr_set_const($db, "PROJECT_TASK_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
 	{
@@ -235,24 +215,19 @@ elseif ($action == 'setdoctask')
 	{
 		$ret = addDocumentModel($value, 'project_task', $label, $scandir);
 	}
-}
-
-elseif ($action == 'setmod')
+} elseif ($action == 'setmod')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-
-elseif ($action == 'setmodtask')
+} elseif ($action == 'setmodtask')
 {
 	// TODO Verifier si module numerotation choisi peut etre active
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROJECT_TASK_ADDON", $value, 'chaine', 0, '', $conf->entity);
-}
-elseif ($action == 'updateoptions')
+} elseif ($action == 'updateoptions')
 {
 	if (GETPOST('PROJECT_USE_SEARCH_TO_SELECT'))
 	{
@@ -384,10 +359,8 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->PROJECT_ADDON == 'mod_'.$classname)
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+						} else {
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&amp;token='.newToken().'&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 						}
 						print '</td>';
 
@@ -404,9 +377,7 @@ foreach ($dirmodels as $reldir)
 							if ($nextval)
 							{
 								$htmltooltip .= $nextval.'<br>';
-							}
-							else
-							{
+							} else {
 								$htmltooltip .= $langs->trans($module->error).'<br>';
 							}
 						}
@@ -485,10 +456,8 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 							if ($conf->global->PROJECT_TASK_ADDON == 'mod_'.$classname)
 							{
 								print img_picto($langs->trans("Activated"), 'switch_on');
-							}
-							else
-							{
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							} else {
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodtask&amp;token='.newToken().'&amp;value=mod_'.$classname.'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
 
@@ -505,9 +474,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 								if ($nextval)
 								{
 									$htmltooltip .= $nextval.'<br>';
-								}
-								else
-								{
+								} else {
 									$htmltooltip .= $langs->trans($module->error).'<br>';
 								}
 							}
@@ -541,7 +508,7 @@ $def = array();
 
 $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql .= " WHERE type = '".$type."'";
+$sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
 
 $resql = $db->query($sql);
@@ -555,9 +522,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -620,15 +585,13 @@ foreach ($dirmodels as $reldir)
 								if (in_array($name, $def))
 								{
 									print "<td class=\"center\">\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">';
+									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
-								{
+								} else {
 									print "<td class=\"center\">\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									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>";
 								}
 
@@ -637,10 +600,8 @@ foreach ($dirmodels as $reldir)
 								if ($conf->global->PROJECT_ADDON_PDF == "$name")
 								{
 									print img_picto($langs->trans("Default"), 'on');
-								}
-								else
-								{
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</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).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
 
@@ -663,9 +624,7 @@ foreach ($dirmodels as $reldir)
 								if ($module->type == 'pdf')
 								{
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-								}
-								else
-								{
+								} else {
 									print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 								}
 								print '</td>';
@@ -698,7 +657,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 
 	$sql = "SELECT nom";
 	$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
-	$sql .= " WHERE type = '".$type."'";
+	$sql .= " WHERE type = '".$db->escape($type)."'";
 	$sql .= " AND entity = ".$conf->entity;
 
 	$resql = $db->query($sql);
@@ -712,9 +671,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 			array_push($def, $array[0]);
 			$i++;
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 
@@ -781,11 +738,9 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 										print img_picto($langs->trans("Enabled"), 'switch_on');
 										print '</a>';
 										print "</td>";
-									}
-									else
-									{
+									} else {
 										print "<td class=\"center\">\n";
-										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=settask&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>";
 									}
 
@@ -794,10 +749,8 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 									if ($conf->global->PROJECT_TASK_ADDON_PDF == "$name")
 									{
 										print img_picto($langs->trans("Default"), 'on');
-									}
-									else
-									{
-										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									} else {
+										print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoctask&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>';
 
@@ -820,9 +773,7 @@ if (empty($conf->global->PROJECT_HIDE_TASKS))
 									if ($module->type == 'pdf')
 									{
 										print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimentask&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-									}
-									else
-									{
+									} else {
 										print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 									}
 									print '</td>';
@@ -862,9 +813,7 @@ if (!$conf->use_javascript_ajax)
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
-{
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 		'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index e9d9e7e6a3f..da54d0bd5e6 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -40,7 +40,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'projet'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index ee64d0721e2..b8d1281986b 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -41,7 +41,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'projet_task';
 
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index f26ecf8da9b..3491ae1e166 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2015 Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2007-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ require '../../main.inc.php';
 
 $htmlname = GETPOST('htmlname', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $discard_closed = GETPOST('discardclosed', 'int');
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 587493709f2..db38e3c02d7 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('projects', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'aZ09');
@@ -102,9 +102,7 @@ if (empty($reshook))
 			{
 				header("Location: index.php");
 				exit;
-			}
-			else
-			{
+			} else {
 				dol_syslog($object->error, LOG_DEBUG);
 				setEventMessages($langs->trans("CantRemoveProject", $langs->transnoentitiesnoconv("ProjectOverview")), null, 'errors');
 			}
@@ -121,12 +119,12 @@ if (empty($reshook))
 	if ($action == 'add' && $user->rights->projet->creer)
 	{
 		$error = 0;
-		if (empty($_POST["ref"]))
+		if (! GETPOST('ref'))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 			$error++;
 		}
-		if (empty($_POST["title"]))
+		if (! GETPOST('title'))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$error++;
@@ -150,13 +148,13 @@ if (empty($reshook))
 
 			$db->begin();
 
-			$object->ref             = GETPOST('ref', 'alpha');
-			$object->title           = GETPOST('title', 'none'); // Do not use 'alpha' here, we want field as it is
+			$object->ref             = GETPOST('ref', 'alphanohtml');
+			$object->title           = GETPOST('title', 'alphanohtml');
 			$object->socid           = GETPOST('socid', 'int');
-			$object->description     = GETPOST('description', 'none'); // Do not use 'alpha' here, we want field as it is
-			$object->public          = GETPOST('public', 'alpha');
-			$object->opp_amount      = price2num(GETPOST('opp_amount', 'alpha'));
-			$object->budget_amount   = price2num(GETPOST('budget_amount', 'alpha'));
+			$object->description     = GETPOST('description', 'restricthtml'); // Do not use 'alpha' here, we want field as it is
+			$object->public          = GETPOST('public', 'alphanohtml');
+			$object->opp_amount      = price2num(GETPOST('opp_amount', 'alphanohtml'));
+			$object->budget_amount   = price2num(GETPOST('budget_amount', 'alphanohtml'));
 			$object->date_c = dol_now();
 			$object->date_start      = $date_start;
 			$object->date_end        = $date_end;
@@ -183,9 +181,7 @@ if (empty($reshook))
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
@@ -212,22 +208,16 @@ if (empty($reshook))
 					$backtopage = $backtopage.'&projectid='.$object->id; // Old method
 					header("Location: ".$backtopage);
 					exit;
-				}
-				else
-				{
+				} else {
 					header("Location:card.php?id=".$object->id);
 					exit;
 				}
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				$action = 'create';
 			}
-		}
-		else
-		{
+		} else {
 			$action = 'create';
 		}
 	}
@@ -258,10 +248,10 @@ if (empty($reshook))
 			$old_start_date = $object->date_start;
 
 			$object->ref          = GETPOST('ref', 'alpha');
-			$object->title        = GETPOST('title', 'none'); // Do not use 'alpha' here, we want field as it is
+			$object->title        = GETPOST('title', 'alphanohtml'); // Do not use 'alpha' here, we want field as it is
 			$object->statut       = GETPOST('status', 'int');
 			$object->socid        = GETPOST('socid', 'int');
-			$object->description  = GETPOST('description', 'none'); // Do not use 'alpha' here, we want field as it is
+			$object->description  = GETPOST('description', 'restricthtml'); // Do not use 'alpha' here, we want field as it is
 			$object->public       = GETPOST('public', 'alpha');
 			$object->date_start   = (!GETPOST('projectstart')) ? '' : $date_start;
 			$object->date_end     = (!GETPOST('projectend')) ? '' : $date_end;
@@ -334,9 +324,7 @@ if (empty($reshook))
 		{
 			$db->rollback();
 			$action = 'edit';
-		}
-		else
-		{
+		} else {
 			$db->commit();
 
 			if (GETPOST('socid', 'int') > 0) $object->fetch_thirdparty(GETPOST('socid', 'int'));
@@ -356,7 +344,7 @@ if (empty($reshook))
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
 		}
-		$result = $object->generateDocument($object->modelpdf, $outputlangs);
+		$result = $object->generateDocument($object->model_pdf, $outputlangs);
 		if ($result <= 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -377,8 +365,7 @@ if (empty($reshook))
 			$ret = dol_delete_file($file, 0, 0, 0, $object);
 			if ($ret)
 				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
-			else
-				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
+			else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 			$action = '';
 		}
 	}
@@ -420,9 +407,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 			header("Location: list.php?restore_lastsearch_values=1");
 			exit;
-		}
-		else
-		{
+		} else {
 			dol_syslog($object->error, LOG_DEBUG);
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -442,9 +427,7 @@ if (empty($reshook))
 		if ($result <= 0)
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
-		{
+		} else {
 			// Load new object
 			$newobject = new Project($db);
 			$newobject->fetch($result);
@@ -546,7 +529,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	print '</td></tr>';
 
 	// Label
-	print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input class="minwidth500" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'none')).'" autofocus></td></tr>';
+	print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input class="minwidth500" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'" autofocus></td></tr>';
 
 	// Usage (opp, task, bill time, ...)
 	print '<tr><td class="tdtop">';
@@ -609,8 +592,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 		{
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 			print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1);
-		}
-		else print $text;
+		} else print $text;
 		if (!GETPOSTISSET('backtopage')) print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 		print '</td></tr>';
 	}
@@ -671,7 +653,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	// Description
 	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 	print '<td>';
-	$doleditor = new DolEditor('description', GETPOST("description", 'none'), '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
+	$doleditor = new DolEditor('description', GETPOST("description", 'restricthtml'), '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
@@ -703,9 +685,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	{
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-	}
-	else
-	{
+	} else {
 		print ' &nbsp; &nbsp; ';
 		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 	}
@@ -743,8 +723,7 @@ if ($action == 'create' && $user->rights->projet->creer)
         	});
         });
         </script>';
-}
-elseif ($object->id > 0)
+} elseif ($object->id > 0)
 {
 	/*
      * Show or edit
@@ -895,8 +874,7 @@ elseif ($object->id > 0)
 			{
 				$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 				print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1, 0, '', '', 2);
-			}
-			else print $text;
+			} else print $text;
 			print '</td></tr>';
 		}
 
@@ -984,9 +962,7 @@ elseif ($object->id > 0)
 		}
 
 		print '</table>';
-	}
-	else
-	{
+	} else {
 		dol_fiche_head($head, 'project', $langs->trans("Project"), -1, ($object->public ? 'projectpub' : 'project'));
 
 		// Project card
@@ -995,7 +971,7 @@ elseif ($object->id > 0)
 
 		$morehtmlref = '<div class="refidno">';
 		// Title
-		$morehtmlref .= $object->title;
+		$morehtmlref .= dol_escape_htmltag($object->title);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : ';
 		if ($object->thirdparty->id > 0)
@@ -1239,9 +1215,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
 				}
 			}
@@ -1252,9 +1226,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Validate').'</a>';
 				}
 			}
@@ -1265,9 +1237,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=close">'.$langs->trans("Close").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Close').'</a>';
 				}
 			}
@@ -1278,9 +1248,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ReOpen').'</a>';
 				}
 			}
@@ -1346,9 +1314,7 @@ elseif ($object->id > 0)
 				if ($userWrite > 0)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&action=clone">'.$langs->trans('ToClone').'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ToClone').'</a>';
 				}
 			}
@@ -1358,10 +1324,8 @@ elseif ($object->id > 0)
 			{
 				if ($userDelete > 0 || ($object->statut == 0 && $user->rights->projet->creer))
 				{
-					print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
-				}
-				else
-				{
+					print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Delete').'</a>';
 				}
 			}
@@ -1388,7 +1352,7 @@ elseif ($object->id > 0)
 		$genallowed = ($user->rights->projet->lire && $userAccess > 0);
 		$delallowed = ($user->rights->projet->creer && $userWrite > 0);
 
-		print $formfile->showdocuments('project', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf);
+		print $formfile->showdocuments('project', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
 
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
@@ -1418,9 +1382,7 @@ elseif ($object->id > 0)
 	// Hook to add more things on page
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('mainCardTabAddMore', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-}
-else
-{
+} else {
 	print $langs->trans("RecordNotFound");
 }
 
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index f8a076c89ee..214cbe96154 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -131,7 +131,7 @@ class Projects extends DolibarrApi
         }
     	// Select projects of given category
     	if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$db->escape($category)." AND c.fk_project = t.rowid ";
+    		$sql .= " AND c.fk_categorie = ".$this->db->escape($category)." AND c.fk_project = t.rowid ";
     	}
         // Add sql filters
         if ($sqlfilters)
@@ -144,7 +144,7 @@ class Projects extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -152,28 +152,27 @@ class Projects extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
         dol_syslog("API Rest request");
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
 
         if ($result)
         {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $project_static = new Project($db);
+            	$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 : '.$db->lasterror());
+        } else {
+        	throw new RestException(503, 'Error when retrieve project list : '.$this->db->lasterror());
         }
         if (!count($obj_ret)) {
             throw new RestException(404, 'No project found');
@@ -452,9 +451,7 @@ class Projects extends DolibarrApi
         if ($this->project->update(DolibarrApiAccess::$user) >= 0)
         {
             return $this->get($id);
-        }
-        else
-        {
+        } else {
             throw new RestException(500, $this->project->error);
         }
     }
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index 65060f4d8ff..5181beb3707 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -30,50 +30,51 @@
 class Tasks extends DolibarrApi
 {
 
-    /**
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'ref',
-        'label'
-    );
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'ref',
+		'label',
+		'fk_project'
+	);
 
-    /**
-     * @var Task $task {@type Task}
-     */
-    public $task;
+	/**
+	 * @var Task $task {@type Task}
+	 */
+	public $task;
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db, $conf;
-        $this->db = $db;
-        $this->task = new Task($this->db);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->task = new Task($this->db);
+	}
 
-    /**
-     * Get properties of a task object
-     *
-     * Return an array with task informations
-     *
-     * @param   int         $id                     ID of task
-     * @param   int         $includetimespent       0=Return only task. 1=Include a summary of time spent, 2=Include details of time spent lines (2 is no implemented yet)
-     * @return 	array|mixed                         data without useless information
+	/**
+	 * Get properties of a task object
 	 *
-     * @throws 	RestException
-     */
-    public function get($id, $includetimespent = 0)
-    {
+	 * Return an array with task informations
+	 *
+	 * @param   int         $id                     ID of task
+	 * @param   int         $includetimespent       0=Return only task. 1=Include a summary of time spent, 2=Include details of time spent lines (2 is no implemented yet)
+	 * @return 	array|mixed                         data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id, $includetimespent = 0)
+	{
 		if (!DolibarrApiAccess::$user->rights->projet->lire) {
 			throw new RestException(401);
 		}
 
-        $result = $this->task->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Task not found');
-        }
+		$result = $this->task->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Task not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('task', $this->task->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
@@ -81,148 +82,147 @@ class Tasks extends DolibarrApi
 
 		if ($includetimespent == 1)
 		{
-		    $timespent = $this->task->getSummaryOfTimeSpent(0);
+			$timespent = $this->task->getSummaryOfTimeSpent(0);
 		}
 		if ($includetimespent == 1)
 		{
-		    // TODO
-		    // Add class for timespent records and loop and fill $line->lines with records of timespent
+			// TODO
+			// Add class for timespent records and loop and fill $line->lines with records of timespent
 		}
 
 		return $this->_cleanObjectDatas($this->task);
-    }
+	}
 
 
 
-    /**
-     * List tasks
-     *
-     * Get a list of tasks
-     *
-     * @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 project objects
-     */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
-    {
-        global $db, $conf;
+	/**
+	 * List tasks
+	 *
+	 * Get a list of tasks
+	 *
+	 * @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 project objects
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 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 : '';
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->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 && !$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_task 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."projet_task 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('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;
-        }
-        // 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;
+		}
+		// 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 .= $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 .= $db->plimit($limit + 1, $offset);
-        }
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
-        dol_syslog("API Rest request");
-        $result = $db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            $i = 0;
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $task_static = new Task($db);
-                if ($task_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($task_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve task list : '.$db->lasterror());
-        }
-        if (!count($obj_ret)) {
-            throw new RestException(404, 'No task 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);
+				$task_static = new Task($this->db);
+				if ($task_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($task_static);
+				}
+				$i++;
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieve task list : '.$this->db->lasterror());
+		}
+		if (!count($obj_ret)) {
+			throw new RestException(404, 'No task found');
+		}
 		return $obj_ret;
-    }
+	}
 
-    /**
-     * Create task 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 task 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->task->$field = $value;
-        }
-        /*if (isset($request_data["lines"])) {
+		foreach ($request_data as $field => $value) {
+			$this->task->$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->task->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating task", array_merge(array($this->task->error), $this->task->errors));
-        }
+		if ($this->task->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating task", array_merge(array($this->task->error), $this->task->errors));
+		}
 
-        return $this->task->id;
-    }
+		return $this->task->id;
+	}
 
-    // /**
-    //  * Get time spent of a task
-    //  *
-    //  * @param int   $id                     Id of task
-    //  * @return int
-    //  *
-    //  * @url	GET {id}/tasks
-    //  */
-    /*
+	// /**
+	//  * Get time spent of a task
+	//  *
+	//  * @param int   $id                     Id of task
+	//  * @return int
+	//  *
+	//  * @url	GET {id}/tasks
+	//  */
+	/*
     public function getLines($id, $includetimespent=0)
     {
         if(! DolibarrApiAccess::$user->rights->projet->lire) {
@@ -256,59 +256,59 @@ class Tasks extends DolibarrApi
     }
     */
 
-    /**
-     * Get roles a user is assigned to a task with
-     *
-     * @param   int   $id             Id of task
-     * @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 task with
+	 *
+	 * @param   int   $id             Id of task
+	 * @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->task->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Task not found');
-        }
+		$result = $this->task->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Task not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('tasks', $this->task->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('tasks', $this->task->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $usert = DolibarrApiAccess::$user;
-        if ($userid > 0)
-        {
-            $usert = new User($this->db);
-            $usert->fetch($userid);
-        }
-        $this->task->roles = $this->task->getUserRolesForProjectsOrTasks(0, $usert, 0, $id);
-        $result = array();
-        foreach ($this->task->roles as $line) {
-            array_push($result, $this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
+		$usert = DolibarrApiAccess::$user;
+		if ($userid > 0)
+		{
+			$usert = new User($this->db);
+			$usert->fetch($userid);
+		}
+		$this->task->roles = $this->task->getUserRolesForProjectsOrTasks(0, $usert, 0, $id);
+		$result = array();
+		foreach ($this->task->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 +360,18 @@ class Tasks 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) {
@@ -420,203 +420,201 @@ class Tasks extends DolibarrApi
     }*/
 
 
-    /**
-     * Update task general fields (won't touch time spent of task)
-     *
-     * @param int   $id             Id of task 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 task general fields (won't touch time spent of task)
+	 *
+	 * @param int   $id             Id of task 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->task->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Task not found');
-        }
+		$result = $this->task->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Task not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('tasks', $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->task->$field = $value;
-        }
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->task->$field = $value;
+		}
 
-        if ($this->task->update(DolibarrApiAccess::$user) > 0)
-        {
-            return $this->get($id);
-        }
-        else
-        {
-            throw new RestException(500, $this->task->error);
-        }
-    }
+		if ($this->task->update(DolibarrApiAccess::$user) > 0)
+		{
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->task->error);
+		}
+	}
 
-    /**
-     * Delete task
-     *
-     * @param   int     $id         Task ID
-     *
-     * @return  array
-     */
-    public function delete($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->supprimer) {
-            throw new RestException(401);
-        }
-        $result = $this->task->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Task not found');
-        }
+	/**
+	 * Delete task
+	 *
+	 * @param   int     $id         Task ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->task->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Task not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('tasks', $this->project->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if (!$this->task->delete(DolibarrApiAccess::$user)) {
-            throw new RestException(500, 'Error when delete task : '.$this->task->error);
-        }
+		if (!$this->task->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when delete task : '.$this->task->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Task deleted'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Task deleted'
+			)
+		);
+	}
 
 
-    /**
-     * Add time spent to a task of a project.
-     * You can test this API with the following input message
-     * { "date": "2016-12-31 23:15:00", "duration": 1800, "user_id": 1, "note": "My time test" }
-     *
-     * @param   int         $id                 Task ID
-     * @param   datetime    $date               Date (YYYY-MM-DD HH:MI:SS in GMT)
-     * @param   int         $duration           Duration in seconds (3600 = 1h)
-     * @param   int         $user_id            User (Use 0 for connected user)
-     * @param   string      $note               Note
-     *
-     * @url POST    {id}/addtimespent
-     *
-     * @return  array
-     */
-    public function addTimeSpent($id, $date, $duration, $user_id = 0, $note = '')
-    {
-        if (!DolibarrApiAccess::$user->rights->projet->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->task->fetch($id);
-        if ($result <= 0) {
-            throw new RestException(404, 'Task not found');
-        }
+	/**
+	 * Add time spent to a task of a project.
+	 * You can test this API with the following input message
+	 * { "date": "2016-12-31 23:15:00", "duration": 1800, "user_id": 1, "note": "My time test" }
+	 *
+	 * @param   int         $id                 Task ID
+	 * @param   datetime    $date               Date (YYYY-MM-DD HH:MI:SS in GMT)
+	 * @param   int         $duration           Duration in seconds (3600 = 1h)
+	 * @param   int         $user_id            User (Use 0 for connected user)
+	 * @param   string      $note               Note
+	 *
+	 * @url POST    {id}/addtimespent
+	 *
+	 * @return  array
+	 */
+	public function addTimeSpent($id, $date, $duration, $user_id = 0, $note = '')
+	{
+		if (!DolibarrApiAccess::$user->rights->projet->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->task->fetch($id);
+		if ($result <= 0) {
+			throw new RestException(404, 'Task not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('project', $this->task->fk_project)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('project', $this->task->fk_project)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $uid = $user_id;
-        if (empty($uid)) $uid = DolibarrApiAccess::$user->id;
+		$uid = $user_id;
+		if (empty($uid)) $uid = DolibarrApiAccess::$user->id;
 
-        $newdate = dol_stringtotime($date, 1);
-        $this->task->timespent_date = $newdate;
-        $this->task->timespent_datehour = $newdate;
-        $this->task->timespent_withhour = 1;
-        $this->task->timespent_duration = $duration;
-        $this->task->timespent_fk_user  = $user_id;
-        $this->task->timespent_note     = $note;
+		$newdate = dol_stringtotime($date, 1);
+		$this->task->timespent_date = $newdate;
+		$this->task->timespent_datehour = $newdate;
+		$this->task->timespent_withhour = 1;
+		$this->task->timespent_duration = $duration;
+		$this->task->timespent_fk_user  = $user_id;
+		$this->task->timespent_note     = $note;
 
-        $result = $this->task->addTimeSpent(DolibarrApiAccess::$user, 0);
-        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 adding time: '.$this->task->error);
-        }
+		$result = $this->task->addTimeSpent(DolibarrApiAccess::$user, 0);
+		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 adding time: '.$this->task->error);
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Time spent added'
-            )
-        );
-    }
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Time spent added'
+			)
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->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->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/project.class.php b/htdocs/projet/class/project.class.php
index a0b6e38423b..8e354f50650 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -114,6 +114,8 @@ class Project extends CommonObject
 	public $opp_status; // opportunity status, into table llx_c_lead_status
 	public $opp_percent; // opportunity probability
 
+	public $email_msgid;
+
 	public $oldcopy;
 
 	public $weekWorkLoad; // Used to store workload details of a projet
@@ -148,6 +150,66 @@ class Project extends CommonObject
 	 */
 	public $lines;
 
+	/**
+	 *  '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.
+	 *  '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")
+	 *  '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.
+	 */
+
+	// 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'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
+		'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>3, 'position'=>15),
+		'datec' =>array('type'=>'datetime', 'label'=>'DateCreationShort', 'enabled'=>1, 'visible'=>1, 'position'=>20),
+		'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>25),
+		'dateo' =>array('type'=>'date', 'label'=>'DateStart', 'enabled'=>1, 'visible'=>1, 'position'=>30),
+		'datee' =>array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>1, 'visible'=>1, 'position'=>35),
+		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>40, 'searchall'=>1),
+		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>45),
+		'title' =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>50, 'showoncombobox'=>1, 'searchall'=>1),
+		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>55, 'searchall'=>1),
+		'fk_user_creat' =>array('type'=>'integer', 'label'=>'Fk user creat', 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>60),
+		'public' =>array('type'=>'integer', 'label'=>'Visibility', 'enabled'=>1, 'visible'=>1, 'position'=>65),
+		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
+		'fk_opp_status' =>array('type'=>'integer', 'label'=>'OpportunityStatusShort', 'enabled'=>1, 'visible'=>1, 'position'=>75),
+		'opp_percent' =>array('type'=>'double(5,2)', 'label'=>'OpportunityProbabilityShort', 'enabled'=>1, 'visible'=>1, 'position'=>80),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>3, 'position'=>85, 'searchall'=>1),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>3, 'position'=>90, 'searchall'=>1),
+		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>3, 'position'=>95),
+		'budget_amount' =>array('type'=>'double(24,8)', 'label'=>'Budget', 'enabled'=>1, 'visible'=>1, 'position'=>100),
+		'date_close' =>array('type'=>'datetime', 'label'=>'Date close', 'enabled'=>1, 'visible'=>3, 'position'=>105),
+		'fk_user_close' =>array('type'=>'integer', 'label'=>'Fk user close', 'enabled'=>1, 'visible'=>3, 'position'=>110),
+		'opp_amount' =>array('type'=>'double(24,8)', 'label'=>'OpportunityAmountShort', 'enabled'=>1, 'visible'=>1, 'position'=>115),
+		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>3, 'position'=>120),
+		'fk_user_modif' =>array('type'=>'integer', 'label'=>'Fk user modif', 'enabled'=>1, 'visible'=>3, 'position'=>125),
+		'usage_bill_time' =>array('type'=>'integer', 'label'=>'UsageBillTimeShort', 'enabled'=>1, 'visible'=>1, 'position'=>130),
+		'usage_opportunity' =>array('type'=>'integer', 'label'=>'UsageOpportunity', 'enabled'=>1, 'visible'=>1, 'position'=>135),
+		'usage_task' =>array('type'=>'integer', 'label'=>'UsageTasks', 'enabled'=>1, 'visible'=>1, 'position'=>140),
+		'usage_organize_event' =>array('type'=>'integer', 'label'=>'Usage organize event', 'enabled'=>1, 'visible'=>3, 'position'=>145),
+	);
+	// END MODULEBUILDER PROPERTIES
+
 	/**
 	 * Draft status
 	 */
@@ -163,39 +225,6 @@ class Project extends CommonObject
 	 */
 	const STATUS_CLOSED = 2;
 
-
-	public $fields=array(
-		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>-1, 'position'=>15),
-		'datec' =>array('type'=>'datetime', 'label'=>'Datec', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-		'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
-		'dateo' =>array('type'=>'date', 'label'=>'Dateo', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'datee' =>array('type'=>'date', 'label'=>'Datee', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>40),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>45),
-		'title' =>array('type'=>'varchar(255)', 'label'=>'Title', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>50, 'showoncombobox'=>1),
-		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'fk_user_creat' =>array('type'=>'integer', 'label'=>'Fk user creat', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>60),
-		'public' =>array('type'=>'integer', 'label'=>'Public', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Fk statut', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
-		'fk_opp_status' =>array('type'=>'integer', 'label'=>'Fk opp status', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'opp_percent' =>array('type'=>'double(5,2)', 'label'=>'Opp percent', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>85),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>90),
-		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>95),
-		'budget_amount' =>array('type'=>'double(24,8)', 'label'=>'Budget amount', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
-		'date_close' =>array('type'=>'datetime', 'label'=>'Date close', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'fk_user_close' =>array('type'=>'integer', 'label'=>'Fk user close', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		'opp_amount' =>array('type'=>'double(24,8)', 'label'=>'Opp amount', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
-		'fk_user_modif' =>array('type'=>'integer', 'label'=>'Fk user modif', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'usage_bill_time' =>array('type'=>'integer', 'label'=>'Usage bill time', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
-		'usage_opportunity' =>array('type'=>'integer', 'label'=>'Usage opportunity', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
-		'usage_task' =>array('type'=>'integer', 'label'=>'Usage task', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'usage_organize_event' =>array('type'=>'integer', 'label'=>'Usage organize event', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
-	);
-
-
 	/**
 	 *  Constructor
 	 *
@@ -207,6 +236,22 @@ class Project extends CommonObject
 
 		$this->statuts_short = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
 		$this->statuts_long = array(0 => 'Draft', 1 => 'Opened', 2 => 'Closed');
+
+		global $conf;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
+
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			$this->fields['fk_opp_status']['enabled'] = 0;
+			$this->fields['opp_percent']['enabled'] = 0;
+			$this->fields['opp_amount']['enabled'] = 0;
+			$this->fields['usage_opportunity']['enabled'] = 0;
+		}
+
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
+			$this->fields['usage_bill_time']['visible'] = 0;
+			$this->fields['usage_task']['visible'] = 0;
+		}
 	}
 
 	/**
@@ -265,6 +310,7 @@ class Project extends CommonObject
 		$sql .= ", usage_task";
 		$sql .= ", usage_bill_time";
 		$sql .= ", usage_organize_event";
+		$sql .= ", email_msgid";
 		$sql .= ", note_private";
 		$sql .= ", note_public";
 		$sql .= ", entity";
@@ -287,6 +333,7 @@ class Project extends CommonObject
 		$sql .= ", ".($this->usage_task ? 1 : 0);
 		$sql .= ", ".($this->usage_bill_time ? 1 : 0);
 		$sql .= ", ".($this->usage_organize_event ? 1 : 0);
+		$sql .= ", ".($this->email_msgid ? "'".$this->db->escape($this->email_msgid)."'" : 'null');
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
 		$sql .= ", ".$conf->entity;
@@ -306,9 +353,7 @@ class Project extends CommonObject
 				if ($result < 0) { $error++; }
 				// End call triggers
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->errno = $this->db->lasterrno();
 			$error++;
@@ -333,9 +378,7 @@ class Project extends CommonObject
 		{
 			$this->db->commit();
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -441,31 +484,23 @@ class Project extends CommonObject
 				{
 					$this->db->commit();
 					$result = 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$result = -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$this->errors[] = $this->error;
 				$this->db->rollback();
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$result = -4;
-				}
-				else
-				{
+				} else {
 					$result = -2;
 				}
 				dol_syslog(get_class($this)."::update error ".$result." ".$this->error, LOG_ERR);
 			}
-		}
-		else
-		{
+		} else {
 			dol_syslog(get_class($this)."::update ref null");
 			$result = -1;
 		}
@@ -476,28 +511,34 @@ class Project extends CommonObject
 	/**
 	 * 	Get object from database
 	 *
-	 * 	@param      int		$id       	Id of object to load
-	 * 	@param		string	$ref		Ref of project
-	 * 	@return     int      		   	>0 if OK, 0 if not found, <0 if KO
+	 * 	@param      int		$id       		Id of object to load
+	 * 	@param		string	$ref			Ref of project
+	 * 	@param		string	$ref_ext		Ref ext of project
+	 *  @param		string	$email_msgid	Email msgid
+	 * 	@return     int      		   		>0 if OK, 0 if not found, <0 if KO
 	 */
-	public function fetch($id, $ref = '')
+	public function fetch($id, $ref = '', $ref_ext = '', $email_msgid = '')
 	{
 		global $conf;
 
 		if (empty($id) && empty($ref)) return -1;
 
-		$sql = "SELECT rowid, ref, title, description, public, datec, opp_amount, budget_amount,";
+		$sql = "SELECT rowid, entity, ref, title, description, public, datec, opp_amount, budget_amount,";
 		$sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
-		$sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, entity";
+		$sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, email_msgid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet";
 		if (!empty($id))
 		{
-			$sql .= " WHERE rowid=".$id;
-		}
-		elseif (!empty($ref))
-		{
-			$sql .= " WHERE ref='".$this->db->escape($ref)."'";
-			$sql .= " AND entity IN (".getEntity('project').")";
+			$sql .= " WHERE rowid = ".$id;
+		} else {
+			$sql .= " WHERE entity IN (".getEntity('project').")";
+			if (!empty($ref)) {
+				$sql .= " AND ref = '".$this->db->escape($ref)."'";
+			} elseif (!empty($ref_ext)) {
+				$sql .= " AND ref_ext = '".$this->db->escape($ref_ext)."'";
+			} else {
+				$sql .= " AND email_msgid = '".$this->db->escape($email_msgid)."'";
+			}
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -511,6 +552,7 @@ class Project extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
 				$this->ref = $obj->ref;
 				$this->title = $obj->title;
 				$this->description = $obj->description;
@@ -534,12 +576,13 @@ class Project extends CommonObject
 				$this->opp_amount	= $obj->opp_amount;
 				$this->opp_percent = $obj->opp_percent;
 				$this->budget_amount = $obj->budget_amount;
-				$this->modelpdf = $obj->model_pdf;
+				$this->model_pdf = $obj->model_pdf;
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->usage_opportunity = (int) $obj->usage_opportunity;
 				$this->usage_task = (int) $obj->usage_task;
 				$this->usage_bill_time = (int) $obj->usage_bill_time;
 				$this->usage_organize_event = (int) $obj->usage_organize_event;
-				$this->entity = $obj->entity;
+				$this->email_msgid = $obj->email_msgid;
 
 				$this->db->free($resql);
 
@@ -553,9 +596,7 @@ class Project extends CommonObject
 			$this->db->free($resql);
 
 			return 0;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -585,46 +626,37 @@ class Project extends CommonObject
 		if ($type == 'agenda')
 		{
 			$sql = "SELECT id as rowid FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project IN (".$ids.") AND entity IN (".getEntity('agenda').")";
-		}
-		elseif ($type == 'expensereport')
+		} elseif ($type == 'expensereport')
 		{
 			$sql = "SELECT ed.rowid FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet IN (".$ids.")";
-		}
-		elseif ($type == 'project_task')
+		} elseif ($type == 'project_task')
 		{
 			$sql = "SELECT DISTINCT pt.rowid FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet IN (".$ids.")";
-		}
-		elseif ($type == 'project_task_time')	// Case we want to duplicate line foreach user
+		} elseif ($type == 'project_task_time')	// Case we want to duplicate line foreach user
 		{
 			$sql = "SELECT DISTINCT pt.rowid, ptt.fk_user FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet IN (".$ids.")";
-		}
-		elseif ($type == 'stock_mouvement')
+		} elseif ($type == 'stock_mouvement')
 		{
 			$sql = 'SELECT ms.rowid, ms.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin IN (".$ids.") AND ms.type_mouvement = 1";
-		}
-		elseif ($type == 'loan')
+		} elseif ($type == 'loan')
 		{
 			$sql = 'SELECT l.rowid, l.fk_user_author as fk_user FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet IN (".$ids.")";
-		}
-		else
-		{
+		} else {
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$ids.") AND entity IN (".getEntity($type).")";
 		}
 
-		if($dates > 0 && $type == 'loan'){
+		if ($dates > 0 && $type == 'loan') {
 			$sql .= " AND (dateend > '".$this->db->idate($dates)."' OR dateend IS NULL)";
-		}
-		elseif ($dates > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
+		} elseif ($dates > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
 		{
 			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
 			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
 		}
 
-		if($datee > 0 && $type == 'loan'){
+		if ($datee > 0 && $type == 'loan') {
 			$sql .= " AND (datestart < '".$this->db->idate($datee)."' OR datestart IS NULL)";
-		}
-		elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
+		} elseif ($datee > 0 && ($type != 'project_task'))	// For table project_taks, we want the filter on date apply on project_time_spent table
 		{
 			if (empty($datefieldname) && !empty($this->table_element_date)) $datefieldname = $this->table_element_date;
 			if (empty($datefieldname)) return 'Error this object has no date field defined';
@@ -654,9 +686,7 @@ class Project extends CommonObject
 
 			/* Return array even if empty*/
 			return $elements;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -806,9 +836,7 @@ class Project extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
@@ -820,6 +848,45 @@ class Project extends CommonObject
 		}
 	}
 
+	/**
+	 * Return the count of a type of linked elements of this project
+	 *
+	 * @param string	$type			The type of the linked elements (e.g. 'propal', 'order', 'invoice', 'order_supplier', 'invoice_supplier')
+	 * @param string	$tablename		The name of table associated of the type
+	 * @param string	$projectkey 	(optional) Equivalent key to fk_projet for actual type
+	 * @return integer					The count of the linked elements (the count is zero on request error too)
+	 */
+	public function getElementCount($type, $tablename, $projectkey = 'fk_projet')
+	{
+		if ($this->id <= 0) return 0;
+
+		if ($type == 'agenda') {
+			$sql = "SELECT COUNT(id) as nb FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project = ".$this->id." AND entity IN (".getEntity('agenda').")";
+		} elseif ($type == 'expensereport') {
+			$sql = "SELECT COUNT(ed.rowid) as nb FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet = ".$this->id;
+		} elseif ($type == 'project_task') {
+			$sql = "SELECT DISTINCT COUNT(pt.rowid) as nb FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet = ".$this->id;
+		} elseif ($type == 'project_task_time') {	// Case we want to duplicate line foreach user
+			$sql = "SELECT DISTINCT COUNT(pt.rowid) as nb FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet = ".$this->id;
+		} elseif ($type == 'stock_mouvement') {
+			$sql = 'SELECT COUNT(ms.rowid) as nb FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin = ".$this->id." AND ms.type_mouvement = 1";
+		} elseif ($type == 'loan') {
+			$sql = 'SELECT COUNT(l.rowid) as nb FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet = ".$this->id;
+		} else {
+			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." = ".$this->id." AND entity IN (".getEntity($type).")";
+		}
+
+		$result = $this->db->query($sql);
+
+		if (!$result) return 0;
+
+		$obj = $this->db->fetch_object($result);
+
+		$this->db->free($result);
+
+		return $obj->nb;
+	}
+
 	/**
 	 * 		Delete tasks with no children first, then task with children recursively
 	 *
@@ -900,17 +967,13 @@ class Project extends CommonObject
 					$this->statut = 1;
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = join(',', $this->errors);
 					dol_syslog(get_class($this)."::setValid ".$this->error, LOG_ERR);
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -960,17 +1023,13 @@ class Project extends CommonObject
 					$this->statut = 2;
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					$this->error = join(',', $this->errors);
 					dol_syslog(get_class($this)."::setClose ".$this->error, LOG_ERR);
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->lasterror();
 				return -1;
@@ -1038,12 +1097,12 @@ class Project extends CommonObject
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-		if (! empty($conf->global->PROJECT_OPEN_ALWAYS_ON_TAB)) {
+		if (!empty($conf->global->PROJECT_OPEN_ALWAYS_ON_TAB)) {
 			$option = $conf->global->PROJECT_OPEN_ALWAYS_ON_TAB;
 		}
 
 		$label = '';
-		if ($option != 'nolink') $label = '<u>'.$langs->trans("Project").'</u>';
+		if ($option != 'nolink') $label = img_picto('', $this->picto).' <u>'.$langs->trans("Project").'</u>';
 		$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)) {
@@ -1068,17 +1127,13 @@ class Project extends CommonObject
 		{
 			if (preg_match('/\.php$/', $option)) {
 				$url = dol_buildpath($option, 1).'?id='.$this->id;
-			}
-			elseif ($option == 'task')
+			} elseif ($option == 'task')
 			{
 				$url = DOL_URL_ROOT.'/projet/tasks.php?id='.$this->id;
-			}
-			elseif ($option == 'preview')
+			} elseif ($option == 'preview')
 			{
 				$url = DOL_URL_ROOT.'/projet/element.php?id='.$this->id;
-			}
-			else
-			{
+			} else {
 				$url = DOL_URL_ROOT.'/projet/card.php?id='.$this->id;
 			}
 			// Add param to save lastsearch_values or not
@@ -1185,13 +1240,10 @@ class Project extends CommonObject
 		if (($mode == 'read' && !empty($user->rights->projet->all->lire)) || ($mode == 'write' && !empty($user->rights->projet->all->creer)) || ($mode == 'delete' && !empty($user->rights->projet->all->supprimer)))
 		{
 			$userAccess = 1;
-		}
-		elseif ($this->public && (($mode == 'read' && !empty($user->rights->projet->lire)) || ($mode == 'write' && !empty($user->rights->projet->creer)) || ($mode == 'delete' && !empty($user->rights->projet->supprimer))))
+		} 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 {
 			foreach (array('internal', 'external') as $source)
 			{
 				$userRole = $this->liste_contact(4, $source);
@@ -1237,61 +1289,56 @@ class Project extends CommonObject
 		$temp = array();
 
 		$sql = "SELECT ".(($mode == 0 || $mode == 1) ? "DISTINCT " : "")."p.rowid, p.ref";
-		$sql.= " FROM " . MAIN_DB_PREFIX . "projet as p";
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 		if ($mode == 0)
 		{
-			$sql.= " LEFT JOIN " . MAIN_DB_PREFIX . "element_contact as ec ON ec.element_id = p.rowid";
-		}
-		elseif ($mode == 1)
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = p.rowid";
+		} elseif ($mode == 1)
 		{
-			$sql.= ", " . MAIN_DB_PREFIX . "element_contact as ec";
-		}
-		elseif ($mode == 2)
+			$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
+		} elseif ($mode == 2)
 		{
 			// No filter. Use this if user has permission to see all project
 		}
-		$sql.= " WHERE p.entity IN (".getEntity('project').")";
+		$sql .= " WHERE p.entity IN (".getEntity('project').")";
 		// Internal users must see project he is contact to even if project linked to a third party he can't see.
 		//if ($socid || ! $user->rights->societe->client->voir)	$sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-		if ($socid > 0) $sql.= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = " . $socid . ")";
+		if ($socid > 0) $sql .= " AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 
 		// Get id of types of contacts for projects (This list never contains a lot of elements)
-		$listofprojectcontacttype=array();
+		$listofprojectcontacttype = array();
 		$sql2 = "SELECT ctc.rowid, ctc.code FROM ".MAIN_DB_PREFIX."c_type_contact as ctc";
-		$sql2.= " WHERE ctc.element = '" . $this->db->escape($this->element) . "'";
-		$sql2.= " AND ctc.source = 'internal'";
+		$sql2 .= " WHERE ctc.element = '".$this->db->escape($this->element)."'";
+		$sql2 .= " AND ctc.source = 'internal'";
 		$resql = $this->db->query($sql2);
 		if ($resql)
 		{
-			while($obj = $this->db->fetch_object($resql))
+			while ($obj = $this->db->fetch_object($resql))
 			{
-				$listofprojectcontacttype[$obj->rowid]=$obj->code;
+				$listofprojectcontacttype[$obj->rowid] = $obj->code;
 			}
-		}
-		else dol_print_error($this->db);
-		if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0]='0';    // To avoid syntax error if not found
+		} else dol_print_error($this->db);
+		if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid syntax error if not found
 
 		if ($mode == 0)
 		{
-			$sql.= " AND ( p.public = 1";
-			$sql.= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
-			$sql.= " )";
-		}
-		elseif ($mode == 1)
+			$sql .= " AND ( p.public = 1";
+			$sql .= " OR ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+			$sql .= " AND ec.fk_socpeople = ".$user->id.")";
+			$sql .= " )";
+		} elseif ($mode == 1)
 		{
-			$sql.= " AND ec.element_id = p.rowid";
-			$sql.= " AND (";
-			$sql.= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
-			$sql.= " AND ec.fk_socpeople = ".$user->id.")";
-			$sql.= " )";
-		}
-		elseif ($mode == 2)
+			$sql .= " AND ec.element_id = p.rowid";
+			$sql .= " AND (";
+			$sql .= "  ( ec.fk_c_type_contact IN (".join(',', array_keys($listofprojectcontacttype)).")";
+			$sql .= " AND ec.fk_socpeople = ".$user->id.")";
+			$sql .= " )";
+		} elseif ($mode == 2)
 		{
 			// No filter. Use this if user has permission to see all project
 		}
 
-		$sql.= $filter;
+		$sql .= $filter;
 		//print $sql;
 
 		$resql = $this->db->query($sql);
@@ -1315,9 +1362,7 @@ class Project extends CommonObject
 				$result = implode(',', $temp);
 				return $result;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1424,9 +1469,7 @@ class Project extends CommonObject
 			{
 				$clone_project->note_private = '';
 				$clone_project->note_public = '';
-			}
-			else
-			{
+			} else {
 				$this->db->begin();
 				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
@@ -1434,9 +1477,7 @@ class Project extends CommonObject
 					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 				}
 
@@ -1447,9 +1488,7 @@ class Project extends CommonObject
 					$this->error .= $clone_project->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 				}
 			}
@@ -1472,9 +1511,7 @@ class Project extends CommonObject
 							$langs->load("errors");
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
-						}
-						else
-						{
+						} else {
 							if ($clone_project->error != '')
 							{
 								$this->error .= $clone_project->error;
@@ -1505,9 +1542,7 @@ class Project extends CommonObject
 							$error++;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error .= $langs->trans('ErrorInternalErrorDetected').':dol_mkdir';
 					$error++;
 				}
@@ -1516,17 +1551,17 @@ class Project extends CommonObject
 			//Duplicate task
 			if ($clone_task)
 			{
-				require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 				$taskstatic = new Task($this->db);
 
 				// Security check
-				$socid=0;
+				$socid = 0;
 				if ($user->socid > 0) $socid = $user->socid;
 
-				$tasksarray=$taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
+				$tasksarray = $taskstatic->getTasksArray(0, 0, $fromid, $socid, 0);
 
-				$tab_conv_child_parent=array();
+				$tab_conv_child_parent = array();
 
 				// Loop on each task, to clone it
 				foreach ($tasksarray as $tasktoclone)
@@ -1536,9 +1571,7 @@ class Project extends CommonObject
 					{
 						$this->error .= $result_clone->error;
 						$error++;
-					}
-					else
-					{
+					} else {
 						$new_task_id = $result_clone;
 						$taskstatic->fetch($tasktoclone->id);
 
@@ -1576,9 +1609,7 @@ class Project extends CommonObject
 		{
 			$this->db->commit();
 			return $clone_project_id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
@@ -1596,30 +1627,30 @@ class Project extends CommonObject
 	{
 		global $user, $langs, $conf;
 
-		$error=0;
+		$error = 0;
 
 		$taskstatic = new Task($this->db);
 
 		// Security check
-		$socid=0;
+		$socid = 0;
 		if ($user->socid > 0) $socid = $user->socid;
 
-		$tasksarray=$taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
+		$tasksarray = $taskstatic->getTasksArray(0, 0, $this->id, $socid, 0);
 
 		foreach ($tasksarray as $tasktoshiftdate)
 		{
-			$to_update=false;
+			$to_update = false;
 			// Fetch only if update of date will be made
 			if ((!empty($tasktoshiftdate->date_start)) || (!empty($tasktoshiftdate->date_end)))
 			{
 				//dol_syslog(get_class($this)."::shiftTaskDate to_update", LOG_DEBUG);
-				$to_update=true;
+				$to_update = true;
 				$task = new Task($this->db);
 				$result = $task->fetch($tasktoshiftdate->id);
 				if (!$result)
 				{
 					$error++;
-					$this->error.=$task->error;
+					$this->error .= $task->error;
 				}
 			}
 			//print "$this->date_start + $tasktoshiftdate->date_start - $old_project_dt_start";exit;
@@ -1671,9 +1702,7 @@ class Project extends CommonObject
 		{
 			$sql .= " SET fk_project=".$this->id;
 			$sql .= " WHERE id=".$elementSelectId;
-		}
-		else
-		{
+		} else {
 			$sql .= " SET fk_projet=".$this->id;
 			$sql .= " WHERE rowid=".$elementSelectId;
 		}
@@ -1707,8 +1736,7 @@ class Project extends CommonObject
 		{
 			$sql .= " SET fk_project=NULL";
 			$sql .= " WHERE id=".$elementSelectId;
-		} else
-		{
+		} else {
 			$sql .= " SET ".$projectfield."=NULL";
 			$sql .= " WHERE rowid=".$elementSelectId;
 		}
@@ -1735,16 +1763,16 @@ class Project extends CommonObject
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("projects");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 			$modele = 'baleine';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->PROJECT_ADDON_PDF)) {
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->PROJECT_ADDON_PDF)) {
 				$modele = $conf->global->PROJECT_ADDON_PDF;
 			}
 		}
@@ -1766,53 +1794,49 @@ class Project extends CommonObject
 	 */
 	public function loadTimeSpent($datestart, $taskid = 0, $userid = 0)
 	{
-		$error=0;
+		$error = 0;
 
-		$this->weekWorkLoad=array();
-		$this->weekWorkLoadPerTask=array();
+		$this->weekWorkLoad = array();
+		$this->weekWorkLoadPerTask = array();
 
 		if (empty($datestart)) dol_print_error('', 'Error datestart parameter is empty');
 
 		$sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.task_datehour, ptt.fk_task";
-		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
-		$sql.= " WHERE ptt.fk_task = pt.rowid";
-		$sql.= " AND pt.fk_projet = ".$this->id;
-		$sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
-		$sql.= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')";
-		if ($taskid) $sql.= " AND ptt.fk_task=".$taskid;
-		if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid;
+		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt";
+		$sql .= " WHERE ptt.fk_task = pt.rowid";
+		$sql .= " AND pt.fk_projet = ".$this->id;
+		$sql .= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' ";
+		$sql .= " AND ptt.task_date <= '".$this->db->idate(dol_time_plus_duree($datestart, 1, 'w') - 1)."')";
+		if ($taskid) $sql .= " AND ptt.fk_task=".$taskid;
+		if (is_numeric($userid)) $sql .= " AND ptt.fk_user=".$userid;
 
 		//print $sql;
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$daylareadyfound=array();
+			$daylareadyfound = array();
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			// Loop on each record found, so each couple (project id, task id)
 			while ($i < $num)
 			{
-				$obj=$this->db->fetch_object($resql);
-				$day=$this->db->jdate($obj->task_date);		// task_date is date without hours
+				$obj = $this->db->fetch_object($resql);
+				$day = $this->db->jdate($obj->task_date); // task_date is date without hours
 				if (empty($daylareadyfound[$day]))
 				{
 					$this->weekWorkLoad[$day] = $obj->task_duration;
 					$this->weekWorkLoadPerTask[$day][$obj->fk_task] = $obj->task_duration;
-				}
-				else
-				{
+				} else {
 					$this->weekWorkLoad[$day] += $obj->task_duration;
 					$this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration;
 				}
-				$daylareadyfound[$day]=1;
+				$daylareadyfound[$day] = 1;
 				$i++;
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -1866,9 +1890,7 @@ class Project extends CommonObject
 				{
 					$this->monthWorkLoad[$week_number] = $obj->task_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_task] = $obj->task_duration;
-				}
-				else
-				{
+				} else {
 					$this->monthWorkLoad[$week_number] += $obj->task_duration;
 					$this->monthWorkLoadPerTask[$week_number][$obj->fk_task] += $obj->task_duration;
 				}
@@ -1877,9 +1899,7 @@ class Project extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
 			return -1;
@@ -1948,9 +1968,7 @@ class Project extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2007,9 +2025,7 @@ class Project extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -2075,9 +2091,7 @@ class Project extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index 22868e96899..cb6150b6dc7 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -92,9 +92,7 @@ class ProjectStats extends Stats
 					$label.' ('.price(price2num($row[0], 'MT'), 1, $langs, 1, -1, -1, $conf->currency).')',
 					$row[0]
 					);
-				}
-				else
-					$other += $row[1];
+				} else $other += $row[1];
 					$i++;
 			}
 			if ($num > $limit)
@@ -281,9 +279,7 @@ class ProjectStats extends Stats
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
-			}
-			else
-			{
+			} 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.");
 			}
 		}
@@ -293,9 +289,7 @@ class ProjectStats extends Stats
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
-		}
-		else
-		{
+		} else {
 			$year = $startyear;
 			while ($year <= $endyear)
 			{
@@ -329,8 +323,7 @@ class ProjectStats extends Stats
 				fclose($fp);
 				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
 				@chmod($newpathofdestfile, octdec($newmask));
-			}
-			else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else dol_syslog("Failed to write cache file", LOG_ERR);
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 41f6a76afb2..8020477702a 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -60,14 +60,14 @@ class Task extends CommonObject
 	protected $childtables = array('projet_task_time');
 
 	/**
-     * @var int ID parent task
-     */
-    public $fk_task_parent;
+	 * @var int ID parent task
+	 */
+	public $fk_task_parent = 0;
 
-    /**
-     * @var string Label of task
-     */
-    public $label;
+	/**
+	 * @var string Label of task
+	 */
+	public $label;
 
 	/**
 	 * @var string description
@@ -82,20 +82,20 @@ class Task extends CommonObject
 	public $progress;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_statut;
 
 	public $priority;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_valid;
 
 	public $rang;
@@ -145,6 +145,9 @@ class Task extends CommonObject
 	{
 		global $conf, $langs;
 
+		//For the date
+		$now = dol_now();
+
 		$error = 0;
 
 		// Clean parameters
@@ -175,7 +178,7 @@ class Task extends CommonObject
 		$sql .= ", ".$this->fk_task_parent;
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->escape($this->description)."'";
-		$sql .= ", '".$this->db->idate($this->date_c)."'";
+		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", ".$user->id;
 		$sql .= ", ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null');
 		$sql .= ", ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null');
@@ -225,9 +228,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return $this->id;
 		}
@@ -328,9 +329,7 @@ class Task extends CommonObject
 			} else {
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -439,9 +438,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -543,9 +540,7 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			//Delete associated link file
 			if ($conf->projet->dir_output)
 			{
@@ -589,9 +584,7 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::hasChildren", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		else
-		{
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $ret = $obj->nb;
 			$this->db->free($resql);
@@ -600,9 +593,7 @@ class Task extends CommonObject
 		if (!$error)
 		{
 			return $ret;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -623,9 +614,7 @@ class Task extends CommonObject
 
 		dol_syslog(get_class($this)."::hasTimeSpent", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
-		else
-		{
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); } else {
 			$obj = $this->db->fetch_object($resql);
 			if ($obj) $ret = $obj->nb;
 			$this->db->free($resql);
@@ -634,9 +623,7 @@ class Task extends CommonObject
 		if (!$error)
 		{
 			return $ret;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -661,7 +648,7 @@ class Task extends CommonObject
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-		$label = '<u>'.$langs->trans("ShowTask").'</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ShowTask").'</u>';
 		if (!empty($this->ref))
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->label))
@@ -789,18 +776,17 @@ class Task extends CommonObject
 			$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 			if ($includebilltime)
 			{
-                $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 ($filterontaskuser > 0)
 			{
 				$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
 			}
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
-            $sql .= " WHERE p.entity IN (".getEntity('project').")";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
+			$sql .= " WHERE p.entity IN (".getEntity('project').")";
 			$sql .= " AND t.fk_projet = p.rowid";
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($filteronprojuser > 0)
 			{
@@ -812,23 +798,20 @@ class Task extends CommonObject
 				$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 				if ($includebilltime)
 				{
-				    $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";
 				}
 				$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2";
 				$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2";
-			}
-			else
-			{
+			} else {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
 				if ($includebilltime)
 				{
-				    $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";
 				}
 			}
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
-            $sql .= " WHERE p.entity IN (".getEntity('project').")";
-		}
-		else return 'BadValueForParameterMode';
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)";
+			$sql .= " WHERE p.entity IN (".getEntity('project').")";
+		} else return 'BadValueForParameterMode';
 
 		if ($filteronprojuser > 0)
 		{
@@ -864,12 +847,12 @@ class Task extends CommonObject
 		$sql .= $hookmanager->resPrint;
 		if ($includebilltime)
 		{
-    		$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public, p.fk_statut, p.usage_bill_time,";
-    		$sql .= " t.datec, t.dateo, t.datee, t.tms,";
-    		$sql .= " t.rowid, t.ref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut,";
-    		$sql .= " t.dateo, t.datee, t.planned_workload, t.rang,";
-    		$sql .= " t.description, ";
-    		$sql .= " s.rowid, s.nom, s.email,";
+			$sql .= " GROUP BY p.rowid, p.ref, p.title, p.public, p.fk_statut, p.usage_bill_time,";
+			$sql .= " t.datec, t.dateo, t.datee, t.tms,";
+			$sql .= " t.rowid, t.ref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress, t.fk_statut,";
+			$sql .= " t.dateo, t.datee, t.planned_workload, t.rang,";
+			$sql .= " t.description, ";
+			$sql .= " s.rowid, s.nom, s.email,";
 			$sql .= " p.fk_opp_status, p.opp_amount, p.opp_percent, p.budget_amount";
 			if (!empty($extrafields->attributes['projet']['label']))
 			{
@@ -946,37 +929,35 @@ class Task extends CommonObject
 					$tasks[$i]->thirdparty_email = $obj->thirdparty_email;
 
 
-                    $tasks[$i]->fk_opp_status = $obj->fk_opp_status;
-                    $tasks[$i]->opp_amount = $obj->opp_amount;
-                    $tasks[$i]->opp_percent = $obj->opp_percent;
-                    $tasks[$i]->budget_amount = $obj->budget_amount;
-                    $tasks[$i]->usage_bill_time = $obj->usage_bill_time;
+					$tasks[$i]->fk_opp_status = $obj->fk_opp_status;
+					$tasks[$i]->opp_amount = $obj->opp_amount;
+					$tasks[$i]->opp_percent = $obj->opp_percent;
+					$tasks[$i]->budget_amount = $obj->budget_amount;
+					$tasks[$i]->usage_bill_time = $obj->usage_bill_time;
 
-                    if (!empty($extrafields->attributes['projet']['label']))
-                    {
-                        foreach ($extrafields->attributes['projet']['label'] as $key => $val)
-                        {
-                            if ($extrafields->attributes['projet']['type'][$key] != 'separate')
-                                $tasks[$i]->{'options_'.$key} = $obj->{'options_'.$key};
-                        }
-                    }
+					if (!empty($extrafields->attributes['projet']['label']))
+					{
+						foreach ($extrafields->attributes['projet']['label'] as $key => $val)
+						{
+							if ($extrafields->attributes['projet']['type'][$key] != 'separate')
+								$tasks[$i]->{'options_'.$key} = $obj->{'options_'.$key};
+						}
+					}
 
-                    if (!empty($extrafields->attributes['projet_task']['label']))
-                    {
-                        foreach ($extrafields->attributes['projet_task']['label'] as $key => $val)
-                        {
-                            if ($extrafields->attributes['projet_task']['type'][$key] != 'separate')
-                                $tasks[$i]->{'options_'.$key} = $obj->{'options_'.$key};
-                        }
-                    }
+					if (!empty($extrafields->attributes['projet_task']['label']))
+					{
+						foreach ($extrafields->attributes['projet_task']['label'] as $key => $val)
+						{
+							if ($extrafields->attributes['projet_task']['type'][$key] != 'separate')
+								$tasks[$i]->{'options_'.$key} = $obj->{'options_'.$key};
+						}
+					}
 				}
 
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1054,9 +1035,7 @@ class Task extends CommonObject
 				$i++;
 			}
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -1080,7 +1059,7 @@ class Task extends CommonObject
 		while ($i < $num)
 		{
 			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else  $contactAlreadySelected[$i] = $tab[$i]['id'];
+			else $contactAlreadySelected[$i] = $tab[$i]['id'];
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -1147,9 +1126,7 @@ class Task extends CommonObject
 				if ($result < 0) { $ret = -1; }
 				// End call triggers
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$ret = -1;
 		}
@@ -1184,9 +1161,7 @@ class Task extends CommonObject
 		if ($ret > 0)
 		{
 			$this->db->commit();
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 		}
 		return $ret;
@@ -1246,9 +1221,7 @@ class Task extends CommonObject
 			$this->timespent_nblines = ($obj->nblines ? $obj->nblines : 0);
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $result;
@@ -1303,9 +1276,7 @@ class Task extends CommonObject
 
 			$this->db->free($resql);
 			return $result;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return $result;
 		}
@@ -1356,9 +1327,7 @@ class Task extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -1443,9 +1412,7 @@ class Task extends CommonObject
 			}
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
@@ -1470,13 +1437,13 @@ class Task extends CommonObject
 		// Check parameters
 		if ($this->timespent_date == '')
 		{
-		    $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Date"));
-		    return -1;
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Date"));
+			return -1;
 		}
 		if (!($this->timespent_fk_user > 0))
 		{
-		    $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("User"));
-		    return -1;
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("User"));
+			return -1;
 		}
 
 		// Clean parameters
@@ -1505,14 +1472,10 @@ class Task extends CommonObject
 				{
 					$this->db->rollback();
 					$ret = -1;
-				}
-				else $ret = 1;
+				} else $ret = 1;
 				// End call triggers
-			}
-			else $ret = 1;
-		}
-		else
-		{
+			} else $ret = 1;
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			$ret = -1;
@@ -1582,9 +1545,7 @@ class Task extends CommonObject
 			if ($this->db->query($sql))
 			{
 				$result = 0;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				$result = -2;
 			}
@@ -1600,16 +1561,14 @@ class Task extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
 	}
 
-    /**	Load an object from its id and create a new one in database
-     *
+	/**	Load an object from its id and create a new one in database
+	 *
 	 *  @param	User	$user		            User making the clone
 	 *  @param	int		$fromid     			Id of object to clone
 	 *  @param	int		$project_id				Id of project to attach clone task
@@ -1621,7 +1580,7 @@ class Task extends CommonObject
 	 *  @param	bool	$clone_note				clone note of project
 	 *  @param	bool	$clone_prog				clone progress of project
 	 *  @return	int								New id of clone
-     */
+	 */
 	public function createFromClone(User $user, $fromid, $project_id, $parent_task_id, $clone_change_dt = false, $clone_affectation = false, $clone_time = false, $clone_file = false, $clone_note = false, $clone_prog = false)
 	{
 		global $langs, $conf;
@@ -1714,9 +1673,7 @@ class Task extends CommonObject
 	   		{
 				$clone_task->note_private = '';
 				$clone_task->note_public = '';
-			}
-			else
-			{
+			} else {
 				$this->db->begin();
 				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES), '_public');
 				if ($res < 0)
@@ -1724,9 +1681,7 @@ class Task extends CommonObject
 					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 				}
 
@@ -1737,9 +1692,7 @@ class Task extends CommonObject
 					$this->error .= $clone_task->error;
 					$error++;
 					$this->db->rollback();
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 				}
 			}
@@ -1758,9 +1711,7 @@ class Task extends CommonObject
 				{
 					$projectstatic->fetch($project_id);
 					$clone_project_ref = $projectstatic->ref;
-				}
-				else
-				{
+				} else {
 					$clone_project_ref = $ori_project_ref;
 				}
 
@@ -1807,9 +1758,7 @@ class Task extends CommonObject
 							$langs->load("errors");
 							$this->error .= $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 							$error++;
-						}
-						else
-						{
+						} else {
 							if ($clone_task->error != '')
 							{
 								$this->error .= $clone_task->error;
@@ -1833,9 +1782,7 @@ class Task extends CommonObject
 		{
 			$this->db->commit();
 			return $clone_task_id;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::createFromClone nbError: ".$error." error : ".$this->error, LOG_ERR);
 			return -1;
@@ -1854,7 +1801,7 @@ class Task extends CommonObject
 		return $this->LibStatut($this->fk_statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return status label for an object
 	 *
@@ -1864,7 +1811,7 @@ class Task extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		// list of Statut of the task
@@ -1882,12 +1829,10 @@ class Task extends CommonObject
 		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]), 'statut1').' '.$langs->trans($this->statuts_short[$status]);
@@ -1895,8 +1840,7 @@ class Task extends CommonObject
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
 			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts_short[$status]);
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1');
@@ -1904,8 +1848,7 @@ class Task extends CommonObject
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
 			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
 			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]);
@@ -1913,8 +1856,7 @@ class Task extends CommonObject
 			elseif ($status == 3) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 4) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
 			elseif ($status == 5) return img_picto($langs->trans($this->statuts_short[$status]), 'statut5').' '.$langs->trans($this->statuts[$status]);
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			/*if ($status==0) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0');
 			elseif ($status==1) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1');
@@ -1925,8 +1867,7 @@ class Task extends CommonObject
 			*/
 			//else return $this->progress.' %';
 			return '&nbsp;';
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			/*if ($status==0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut0');
 			elseif ($status==1) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut1');
@@ -1972,7 +1913,7 @@ class Task extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Load indicators for dashboard (this->nbtodo and this->nbtodolate)
 	 *
@@ -1981,7 +1922,7 @@ class Task extends CommonObject
 	 */
 	public function load_board($user)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		// For external user, no check is done on company because readability is managed by public status of project and assignement.
@@ -2038,16 +1979,14 @@ class Task extends CommonObject
 			}
 
 			return $response;
-		}
-		else
-		{
+		} else {
 			$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
 	 *
@@ -2055,7 +1994,7 @@ class Task extends CommonObject
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $user;
 
 		$mine = 0; $socid = $user->socid;
@@ -2087,9 +2026,7 @@ class Task extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index 12d6395af66..722736fe9b8 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -82,9 +82,7 @@ class TaskStats extends Stats
 						$row[1],
 						$row[0]
 					);
-				}
-				else
-					$other += $row[1];
+				} else $other += $row[1];
 				$i++;
 			}
 			if ($num > $limit)
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index d16dca5ceb1..905b57e875f 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -41,7 +41,7 @@ $id = GETPOST('id', 'int');
 $idcomment = GETPOST('idcomment', 'int');
 $ref = GETPOST("ref", 'alpha', 1); // task ref
 $objectref = GETPOST("taskref", 'alpha'); // task ref
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
@@ -123,8 +123,7 @@ print '<table class="border centpercent">';
 // Visibility
 print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 if ($object->public) print $langs->trans('SharedProject');
-else
-	print $langs->trans('PrivateProject');
+else print $langs->trans('PrivateProject');
 print '</td></tr>';
 
 // Date start - end
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 93ced9392c4..8bbdbed9e6a 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -36,7 +36,7 @@ $id     = GETPOST('id', 'int');
 $ref    = GETPOST('ref', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $socid  = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $mine   = GETPOST('mode') == 'mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
@@ -73,16 +73,12 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -94,9 +90,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -111,9 +105,7 @@ if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->pr
 	{
 		header("Location: contact.php?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 9b4c852100d..9015ef0d4d4 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -157,9 +157,7 @@ if ($object->id > 0)
 	$permission = ($userWrite > 0);
 	$permtoedit = ($userWrite > 0);
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	dol_print_error('', 'NoRecordFound');
 }
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index c513123c9bf..f6bb28edd56 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -72,7 +72,7 @@ if (!empty($conf->mrp->enabled))		$langs->load("mrp");
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $datesrfc = GETPOST('datesrfc');
 $dateerfc = GETPOST('dateerfc');
 $dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST('datesyear'));
@@ -528,24 +528,24 @@ $listofreferent = array(
 
 // Change rules for profit/benefit calculation
 if (! empty($conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN)) {
-	foreach($listofreferent as $key => $element) {
+	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'add') {
 			unset($listofreferent[$key]['margin']);
 		}
 	}
 	$newelementforplusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_PLUS_MARGIN);
-	foreach($newelementforplusmargin as $value) {
+	foreach ($newelementforplusmargin as $value) {
 		$listofreferent[trim($value)]['margin']='add';
 	}
 }
 if (! empty($conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN)) {
-	foreach($listofreferent as $key => $element) {
+	foreach ($listofreferent as $key => $element) {
 		if ($listofreferent[$key]['margin'] == 'minus') {
 			unset($listofreferent[$key]['margin']);
 		}
 	}
 	$newelementforminusmargin = explode(',', $conf->global->PROJECT_ELEMENTS_FOR_MINUS_MARGIN);
-	foreach($newelementforminusmargin as $value) {
+	foreach ($newelementforminusmargin as $value) {
 		$listofreferent[trim($value)]['margin']='minus';
 	}
 }
@@ -568,8 +568,7 @@ if ($action == "addelement")
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-}
-elseif ($action == "unlink")
+} elseif ($action == "unlink")
 {
 	$tablename = GETPOST("tablename", "aZ09");
     $projectField = GETPOSTISSET('projectfield') ? GETPOST('projectfield', 'aZ09') : 'fk_projet';
@@ -627,7 +626,7 @@ print '<tr class="liste_titre">';
 print '<td class="left" width="200">';
 $tooltiponprofit = $langs->trans("ProfitIsCalculatedWith")."<br>\n";
 $tooltiponprofitplus = $tooltiponprofitminus = '';
-foreach($listofreferent as $key => $value)
+foreach ($listofreferent as $key => $value)
 {
 	$name = $langs->trans($value['name']);
 	$qualified = $value['test'];
@@ -708,19 +707,15 @@ foreach ($listofreferent as $key => $value)
 					{
 						$tmp = $element->getSumOfAmount($elementuser, $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
-					}
-					else
-					{
+					} else {
 						$tmp = $element->getSumOfAmount('', $dates, $datee);
 						$total_ht_by_line = price2num($tmp['amount'], 'MT');
 					}
-				}
-                elseif ($key == 'loan') {
+				} 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 {
+                    } else {
                         // Get loan schedule according to date filter
                         $total_ht_by_line = 0;
                         $loanScheduleStatic = new LoanSchedule($element->db);
@@ -739,8 +734,7 @@ foreach ($listofreferent as $key => $value)
                             }
                         }
                     }
-                }
-				else $total_ht_by_line = $element->total_ht;
+                } 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;
@@ -750,11 +744,9 @@ 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') {
+				} 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;
+                } 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')
@@ -888,8 +880,7 @@ foreach ($listofreferent as $key => $value)
 			if ($selectList < 0)
 			{
 				setEventMessages($formproject->error, $formproject->errors, 'errors');
-			}
-			elseif ($selectList)
+			} elseif ($selectList)
 			{
 				// Define form with the combo list of elements to link
 			    $addform .= '<div class="inline-block valignmiddle">';
@@ -996,9 +987,7 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename != 'expensereport_det')
 				{
 					if (method_exists($element, 'fetch_thirdparty')) $element->fetch_thirdparty();
-				}
-				else
-				{
+				} else {
 					$expensereport = new ExpenseReport($db);
 					$expensereport->fetch($element->fk_expensereport);
 				}
@@ -1043,20 +1032,16 @@ foreach ($listofreferent as $key => $value)
 				if ($tablename == 'expensereport_det')
 				{
 					print $expensereport->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					// Show ref with link
 					if ($element instanceof Task)
 					{
 						print $element->getNomUrl(1, 'withproject', 'time');
 						print ' - '.dol_trunc($element->label, 48);
-					}
-					elseif ($key == 'loan') {
+					} elseif ($key == 'loan') {
                         print $element->getNomUrl(1);
                         print ' - '.dol_trunc($element->label, 48);
-                    }
-					else print $element->getNomUrl(1);
+                    } else print $element->getNomUrl(1);
 
 					$element_doc = $element->element;
 					$filename = dol_sanitizeFileName($element->ref);
@@ -1065,8 +1050,7 @@ foreach ($listofreferent as $key => $value)
 					if ($element_doc === 'order_supplier') {
 						$element_doc = 'commande_fournisseur';
 						$filedir = $conf->fournisseur->commande->multidir_output[$element->entity].'/'.dol_sanitizeFileName($element->ref);
-					}
-					elseif ($element_doc === 'invoice_supplier') {
+					} elseif ($element_doc === 'invoice_supplier') {
 						$element_doc = 'facture_fournisseur';
 						$filename = get_exdir($element->id, 2, 0, 0, $element, 'product').dol_sanitizeFileName($element->ref);
 						$filedir = $conf->fournisseur->facture->multidir_output[$element->entity].'/'.get_exdir($element->id, 2, 0, 0, $element, 'invoice_supplier').dol_sanitizeFileName($element->ref);
@@ -1094,12 +1078,10 @@ foreach ($listofreferent as $key => $value)
 				    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 == '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
-					{
+					else {
     					$date = $element->date; // invoice, ...
     					if (empty($date)) $date = $element->date_contrat;
     					if (empty($date)) $date = $element->datev;
@@ -1107,8 +1089,7 @@ foreach ($listofreferent as $key => $value)
     						$date = $element->$datefieldname;
     					}
     				}
-				}
-                elseif ($key == 'loan') {
+				} elseif ($key == 'loan') {
                     $date = $element->datestart;
                 }
 
@@ -1117,16 +1098,14 @@ foreach ($listofreferent as $key => $value)
 				{
 				    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')))
+				} 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'];
-				}
-				else print dol_print_date($date, 'day');
+				} else print dol_print_date($date, 'day');
 				print '</td>';
 
 				// Third party or user
@@ -1137,14 +1116,12 @@ foreach ($listofreferent as $key => $value)
                 	$tmpuser = new User($db);
                 	$tmpuser->fetch($expensereport->fk_user_author);
                 	print $tmpuser->getNomUrl(1, '', 48);
-                }
-				elseif ($tablename == 'payment_salary')
+                } elseif ($tablename == 'payment_salary')
 				{
 					$tmpuser = new User($db);
 					$tmpuser->fetch($element->fk_user);
 					print $tmpuser->getNomUrl(1, '', 48);
-				}
-				elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
+				} elseif ($tablename == 'don' || $tablename == 'stock_mouvement')
                 {
                 	if ($element->fk_user_author > 0)
                 	{
@@ -1152,8 +1129,7 @@ foreach ($listofreferent as $key => $value)
 	                	$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
+                } elseif ($tablename == 'projet_task' && $key == 'project_task_time')	// if $key == 'project_task', we don't want details per user
                 {
                     print $elementuser->getNomUrl(1);
                 }
@@ -1188,15 +1164,11 @@ foreach ($listofreferent as $key => $value)
     							$langs->load("errors");
     							$warning = $langs->trans("WarningSomeLinesWithNullHourlyRate", $conf->currency);
     						}
-					    }
-					    else
-					    {
+					    } else {
 					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 					    }
-					}
-                    elseif ($key == 'loan') $total_ht_by_line = $element->capital;
-					else
-					{
+					} elseif ($key == 'loan') $total_ht_by_line = $element->capital;
+					else {
 						$total_ht_by_line = $element->total_ht;
 					}
 
@@ -1219,8 +1191,7 @@ foreach ($listofreferent as $key => $value)
 					}
 					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
-				}
-				else print '<td></td>';
+				} else print '<td></td>';
 
                 // Amount inc tax
 				if (empty($value['disableamount']))
@@ -1236,15 +1207,11 @@ foreach ($listofreferent as $key => $value)
 					        // 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
-					    {
+					    } else {
 					        $othermessage = $form->textwithpicto($langs->trans("NotAvailable"), $langs->trans("ModuleSalaryToDefineHourlyRateMustBeEnabled"));
 					    }
-					}
-                    elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
-					else
-					{
+					} elseif ($key == 'loan') $total_ttc_by_line = $element->capital - $element->getSumPayment();
+					else {
 						$total_ttc_by_line = $element->total_ttc;
 					}
 
@@ -1267,33 +1234,27 @@ foreach ($listofreferent as $key => $value)
 					}
 					if ($warning) print ' '.img_warning($warning);
 					print '</td>';
-				}
-				else print '<td></td>';
+				} else print '<td></td>';
 
 				// Status
 				print '<td class="right">';
 				if ($tablename == 'expensereport_det')
 				{
 					print $expensereport->getLibStatut(5);
-				}
-				elseif ($element instanceof CommonInvoice)
+				} elseif ($element instanceof CommonInvoice)
 				{
 					//This applies for Facture and FactureFournisseur
 					print $element->getLibStatut(5, $element->getSommePaiement());
-				}
-				elseif ($element instanceof Task)
+				} elseif ($element instanceof Task)
 				{
 					if ($element->progress != '')
 					{
 						print $element->progress.' %';
 					}
-				}
-				elseif ($tablename == 'stock_mouvement')
+				} elseif ($tablename == 'stock_mouvement')
 				{
 					print $element->getLibStatut(3);
-				}
-				else
-				{
+				} else {
 					print $element->getLibStatut(5);
 				}
 				print '</td>';
@@ -1367,9 +1328,7 @@ foreach ($listofreferent as $key => $value)
 			print '</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
-		}
-		else
-		{
+		} else {
 			if (!is_array($elementarray))	// error
 			{
 				print $elementarray;
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index babacbd27bf..457345d2fe3 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -195,9 +195,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	if ($project_id && $level < 0)
 	{
 		$parent = '-'.$project_id;
-	}
-	else
-	{
+	} else {
 		$parent = $task["task_parent_alternate_id"];
 		//$parent = $task["task_parent"];
 	}
@@ -208,9 +206,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	{
 		//$link=DOL_URL_ROOT.'/projet/tasks.php?withproject=1&id='.abs($task["task_id"]);
 		$link = '';
-	}
-	else
-	{
+	} else {
 		$link = DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
 	}
 
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 314f945e604..81b7be12e33 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -235,10 +235,11 @@ if ($user->rights->projet->all->creer || $user->rights->projet->creer) {
 
 $linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id), '', $linktocreatetaskUserRight, $linktocreatetaskParam);
 
-$linktolist = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition'));
+$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition'));
+$linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly btnTitleSelected'));
 
 //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
-print load_fiche_titre($title, $linktolist.' &nbsp; '.$linktocreatetask, 'generic');
+print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'generic');
 
 
 // Get list of tasks in tasksarray and taskarrayfiltered
@@ -281,8 +282,7 @@ if (count($tasksarray) > 0)
             $tasks[$taskcursor]['task_is_group'] = 1;
         	$tasks[$taskcursor]['task_css'] = 'ggroupblack';
             //$tasks[$taskcursor]['task_css'] = 'gtaskblue';
-        }
-        elseif ($task->hasChildren() > 0) {
+        } elseif ($task->hasChildren() > 0) {
             $tasks[$taskcursor]['task_is_group'] = 1;
         	//$tasks[$taskcursor]['task_is_group'] = 0;
             $tasks[$taskcursor]['task_css'] = 'ggroupblack';
@@ -370,7 +370,17 @@ if (count($tasksarray) > 0)
 	    //var_dump($dateformatinput);
   		//var_dump($dateformatinput2);
 
-	    print '<br>';
+	    $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>';
+
+		print $moreforfilter;
 
 	    print '<div class="div-table-responsive">';
 
@@ -379,15 +389,11 @@ if (count($tasksarray) > 0)
 		print '</div>'."\n";
 
 		print '</div>';
-	}
-	else
-	{
+	} else {
 		$langs->load("admin");
 		print $langs->trans("AvailableOnlyIfJavascriptAndAjaxNotDisabled");
 	}
-}
-else
-{
+} else {
 	print '<div class="opacitymedium">'.$langs->trans("NoTasks").'</div>';
 }
 
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index 2bb9332c2ae..0d34db55fa1 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -31,94 +31,92 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 
 	if ($resql)
 	{
-	    $num = $db->num_rows($resql);
-	    $i = 0;
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-	    $totalnb = 0;
-	    $totaloppnb = 0;
-	    $totalamount = 0;
-	    $ponderated_opp_amount = 0;
-	    $valsnb = array();
-	    $valsamount = array();
-	    $dataseries = 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)
-	    {
-	        $obj = $db->fetch_object($resql);
-	        if ($obj)
-	        {
-                $valsnb[$obj->opp_status] = $obj->nb;
-                $valsamount[$obj->opp_status] = $obj->opp_amount;
-                $totalnb += $obj->nb;
-                if ($obj->opp_status) $totaloppnb += $obj->nb;
+		$totalnb = 0;
+		$totaloppnb = 0;
+		$totalamount = 0;
+		$ponderated_opp_amount = 0;
+		$valsnb = array();
+		$valsamount = array();
+		$dataseries = 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)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj)
+			{
+				$valsnb[$obj->opp_status] = $obj->nb;
+				$valsamount[$obj->opp_status] = $obj->opp_amount;
+				$totalnb += $obj->nb;
+				if ($obj->opp_status) $totaloppnb += $obj->nb;
 				if (!in_array($obj->code, array('WON', 'LOST'))) {
 					$totalamount += $obj->opp_amount;
 					$ponderated_opp_amount += $obj->ponderated_opp_amount;
 				}
-	            $total += $obj->nb;
-	        }
-	        $i++;
-	    }
-	    $db->free($resql);
+				$total += $obj->nb;
+			}
+			$i++;
+		}
+		$db->free($resql);
 
-	    $ponderated_opp_amount = $ponderated_opp_amount / 100;
+		$ponderated_opp_amount = $ponderated_opp_amount / 100;
 
 		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("OpportunitiesStatusForOpenedProjects").'</th></tr>'."\n";
-	    $listofstatus = array_keys($listofoppstatus);
-	    foreach ($listofstatus as $status)
-	    {
-	    	$labelStatus = '';
+		print '<table class="noborder nohover centpercent">';
+		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("OpportunitiesStatusForOpenedProjects").'</th></tr>'."\n";
+		$listofstatus = array_keys($listofoppstatus);
+		foreach ($listofstatus as $status)
+		{
+			$labelStatus = '';
 
 			$code = dol_getIdFromCode($db, $status, 'c_lead_status', 'rowid', 'code');
-	        if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code);
-	        if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
+			if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus".$code);
+			if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
 
-	        //$labelStatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')';
-	        //$labelStatus .= ' - '.price2num($listofoppstatus[$status]).'%';
+			//$labelStatus .= ' ('.$langs->trans("Coeff").': '.price2num($listofoppstatus[$status]).')';
+			//$labelStatus .= ' - '.price2num($listofoppstatus[$status]).'%';
 
-	        $dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
-	        if (!$conf->use_javascript_ajax)
-	        {
-	            print '<tr class="oddeven">';
-	            print '<td>'.$labelStatus.'</td>';
-	            print '<td class="right"><a href="list.php?statut='.$status.'">'.price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency).'</a></td>';
-	            print "</tr>\n";
-	        }
-	    }
-	    if ($conf->use_javascript_ajax)
-	    {
-	        print '<tr><td class="center nopaddingleftimp nopaddingrightimp" colspan="2">';
+			$dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
+			if (!$conf->use_javascript_ajax)
+			{
+				print '<tr class="oddeven">';
+				print '<td>'.$labelStatus.'</td>';
+				print '<td class="right"><a href="list.php?statut='.$status.'">'.price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency).'</a></td>';
+				print "</tr>\n";
+			}
+		}
+		if ($conf->use_javascript_ajax)
+		{
+			print '<tr><td class="center nopaddingleftimp nopaddingrightimp" 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->setWidth('100%');
-	        $dolgraph->SetHeight('200');
-	        $dolgraph->draw('idgraphstatus');
-	        print $dolgraph->show($totaloppnb ? 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->setWidth('100%');
+			$dolgraph->SetHeight('200');
+			$dolgraph->draw('idgraphstatus');
+			print $dolgraph->show($totaloppnb ? 0 : 1);
 
-	        print '</td></tr>';
-	    }
-	    //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 class="maxwidth200 tdoverflow">'.$langs->trans("OpportunityTotalAmount").' ('.$langs->trans("WonLostExcluded").')</td><td class="right">'.price($totalamount, 0, '', 1, -1, -1, $conf->currency).'</td></tr>';
-	    print '<tr class="liste_total"><td class="minwidth200 tdoverflow">';
-	    //print $langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')';
-	    print $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1);
-	    print '</td><td class="right">'.price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency).'</td></tr>';
-	    print "</table>";
-	    print "</div>";
+			print '</td></tr>';
+		}
+		//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 class="maxwidth200 tdoverflow">'.$langs->trans("OpportunityTotalAmount").' ('.$langs->trans("WonLostExcluded").')</td><td class="right">'.price($totalamount, 0, '', 1, -1, -1, $conf->currency).'</td></tr>';
+		print '<tr class="liste_total"><td class="minwidth200 tdoverflow">';
+		//print $langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')';
+		print $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1);
+		print '</td><td class="right">'.price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency).'</td></tr>';
+		print "</table>";
+		print "</div>";
 
-	    print "<br>";
-	}
-	else
-	{
-	    dol_print_error($db);
+		print "<br>";
+	} else {
+		dol_print_error($db);
 	}
 }
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index f931354fbac..847d7b03d47 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -39,8 +39,10 @@ $hookmanager->initHooks(array('projectsindex'));
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies'));
 
+$action = GETPOST('action', 'aZ09');
 $search_project_user = GETPOST('search_project_user', 'int');
 $mine = GETPOST('mode', 'aZ09') == 'mine' ? 1 : 0;
+if ($mine == 0 && $search_project_user === '') $search_project_user = $user->conf->MAIN_SEARCH_PROJECT_USER_PROJECTSINDEX;
 if ($search_project_user == $user->id) $mine = 1;
 
 // Security check
@@ -51,7 +53,25 @@ if (!$user->rights->projet->lire) accessforbidden();
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 
-$max = 3;
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+
+
+/*
+ * Actions
+ */
+
+$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)) {
+	if ($action == 'refresh_search_project_user') {
+		$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';
+		$result = dol_set_user_param($db, $conf, $user, $tabparam);
+	}
+}
 
 
 /*
@@ -81,6 +101,7 @@ else $titleall = $langs->trans("AllAllowedProjects").'<br><br>';
 $morehtml = '';
 $morehtml .= '<form name="projectform" method="POST">';
 $morehtml .= '<input type="hidden" name="token" value="'.newToken().'">';
+$morehtml .= '<input type="hidden" name="action" value="refresh_search_project_user">';
 $morehtml .= '<SELECT name="search_project_user">';
 $morehtml .= '<option name="all" value="0"'.($mine ? '' : ' selected').'>'.$titleall.'</option>';
 $morehtml .= '<option name="mine" value="'.$user->id.'"'.(($search_project_user == $user->id) ? ' selected' : '').'>'.$langs->trans("ProjectsImContactFor").'</option>';
@@ -89,8 +110,7 @@ $morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs
 $morehtml .= '</form>';
 
 if ($mine) $tooltiphelp = $langs->trans("MyProjectsDesc");
-else
-{
+else {
 	if (!empty($user->rights->projet->all->lire) && !$socid) $tooltiphelp = $langs->trans("ProjectsDesc");
 	else $tooltiphelp = $langs->trans("ProjectsPublicDesc");
 }
@@ -141,8 +161,7 @@ if ($resql)
 		}
 		$i++;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 //var_dump($listofoppcode);
 
 
@@ -273,8 +292,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 $companystatic = new Societe($db); // We need a clean new object for next loop because current one has some properties set.
@@ -319,17 +337,17 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 		print '<td class="nowraponall tdoverflowmax100">';
-		if ($obj->socid)
+		if ($obj->socid > 0)
 		{
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
 			$companystatic->email = $obj->email;
+			$companystatic->client = $obj->client;
+			$companystatic->fournisseur = $obj->fournisseur;
 			$companystatic->status = $obj->status;
 
 			print $companystatic->getNomUrl(1);
-		}
-		else
-		{
+		} else {
 			print $langs->trans("OthersNotLinkedToThirdParty");
 		}
 		print '</td>';
@@ -344,7 +362,7 @@ if ($resql)
 	if ($othernb) {
 		print '<tr class="oddeven">';
 		print '<td class="nowrap">';
-		print '...';
+		print '<span class="opacitymedium">...</span>';
 		print '</td>';
 		print '<td class="nowrap right">';
 		print $othernb;
@@ -353,9 +371,7 @@ if ($resql)
 	}
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 print "</table>";
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index 8cc6ff87642..b3cebaad913 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -52,9 +52,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 43d0e0b7f7f..42f84c157a8 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2015 	   Claudio Aschieri     <c.aschieri@19.coop>
  * Copyright (C) 2018 	   Ferran Marcet	    <fmarcet@2byte.es>
  * Copyright (C) 2019 	   Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2020		Tobias Sean			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,10 +35,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
+if (!empty($conf->categorie->enabled))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
+
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies', 'commercial'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -72,7 +79,6 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
-$search_categ = GETPOST("search_categ", 'alpha');
 $search_ref = GETPOST("search_ref", 'alpha');
 $search_label = GETPOST("search_label", 'alpha');
 $search_societe = GETPOST("search_societe", 'alpha');
@@ -101,6 +107,11 @@ $search_eyear	= GETPOST('search_eyear', 'int');
 
 if ($search_status == '') $search_status = -1; // -1 or 1
 
+if (!empty($conf->categorie->enabled))
+{
+	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_array", "array");
+}
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Project($db);
 $hookmanager->initHooks(array('projectlist'));
@@ -112,34 +123,43 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-	'p.ref'=>"Ref",
-	'p.title'=>"Label",
-	's.nom'=>"ThirdPartyName",
-	"p.note_public"=>"NotePublic"
-);
-if (empty($user->socid)) $fieldstosearchall["p.note_private"] = "NotePrivate";
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if (empty($val['searchall'])) {
+		continue;
+	}
+
+	// Don't allow search in private notes for external users when doing "search in all"
+	if (!empty($user->socid) && $key == "note_private") {
+		continue;
+	}
+
+	$fieldstosearchall['p.'.$key] = $val['label'];
+}
+
+// Add none object fields to "search in all"
+$fieldstosearchall['s.nom'] = "ThirdPartyName";
+
+// 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'])) {
+		continue;
+	}
+
+	$arrayfields['p.'.$key] = array(
+		'label'=>$val['label'],
+		'checked'=>(($val['visible'] < 0) ? 0 : 1),
+		'enabled'=>($val['enabled'] && ($val['visible'] != 3)),
+		'position'=>$val['position']);
+}
+
+// Add none object fields to fields for list
+$arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>(empty($conf->societe->enabled) ? 0 : 1));
+$arrayfields['commercial'] = array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0);
+$arrayfields['opp_weighted_amount'] = array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'enabled'=>(empty($conf->global->PROJECT_USE_OPPORTUNITIES) ? 0 : 1), 'position'=>106);
 
-$arrayfields = array(
-	'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'p.title'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>(empty($conf->societe->enabled) ? 0 : 1)),
-	'commercial'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0),
-	'p.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>100),
-	'p.datee'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>101),
-	'p.public'=>array('label'=>$langs->trans("Visibility"), 'checked'=>1, 'position'=>102),
-	'p.opp_amount'=>array('label'=>$langs->trans("OpportunityAmountShort"), 'checked'=>1, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES ? 1 : 0), 'position'=>103),
-	'p.fk_opp_status'=>array('label'=>$langs->trans("OpportunityStatusShort"), 'checked'=>1, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES ? 1 : 0), 'position'=>104),
-	'p.opp_percent'=>array('label'=>$langs->trans("OpportunityProbabilityShort"), 'checked'=>1, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES ? 1 : 0), 'position'=>105),
-    'opp_weighted_amount'=>array('label'=>$langs->trans('OpportunityWeightedAmountShort'), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES ? 1 : 0), 'position'=>106),
-    'p.budget_amount'=>array('label'=>$langs->trans("Budget"), 'checked'=>0, 'position'=>110),
-	'p.usage_opportunity'=>array('label'=>$langs->trans("UsageOpportunity"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_USE_OPPORTUNITIES ? 1 : 0), 'position'=>115),
-	'p.usage_task'=>array('label'=>$langs->trans("UsageTasks"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_HIDE_TASKS ? 0 : 1), 'position'=>116),
-	'p.usage_bill_time'=>array('label'=>$langs->trans("UsageBillTimeShort"), 'checked'=>0, 'enabled'=>($conf->global->PROJECT_HIDE_TASKS ? 0 : 1), 'position'=>117),
-	'p.datec'=>array('label'=>$langs->trans("DateCreationShort"), 'checked'=>0, 'position'=>500),
-	'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'p.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)
 {
@@ -149,7 +169,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 			$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');
 
 
@@ -174,7 +194,6 @@ if (empty($reshook))
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
 		$search_all = '';
-		$search_categ = '';
 		$search_ref = "";
 		$search_label = "";
 		$search_societe = "";
@@ -197,6 +216,7 @@ if (empty($reshook))
 		$search_usage_bill_time = '';
 		$toselect = '';
 		$search_array_options = array();
+		$search_category_array = array();
 	}
 
 
@@ -208,51 +228,47 @@ if (empty($reshook))
 	$uploaddir = $conf->projet->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
-    // Close records
-    if (!$error && $massaction == 'close' && $user->rights->projet->creer)
-    {
-        $db->begin();
+	// Close records
+	if (!$error && $massaction == 'close' && $user->rights->projet->creer)
+	{
+		$db->begin();
 
-        $objecttmp = new $objectclass($db);
-        $nbok = 0;
-        foreach ($toselect as $toselectid)
-        {
-            $result = $objecttmp->fetch($toselectid);
-            if ($result > 0)
-            {
-                $userWrite  = $object->restrictedProjectArea($user, 'write');
-                if ($userWrite > 0 && $objecttmp->statut == 1) {
-                    $result = $objecttmp->setClose($user);
-                    if ($result <= 0) {
-                        setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                        $error++;
-                        break;
-                    } else $nbok++;
-                } elseif ($userWrite <= 0) {
-                    setEventMessages($langs->trans("DontHavePermissionForCloseProject", $objecttmp->ref), null, 'warnings');
-                } else {
-                    setEventMessages($langs->trans("DontHaveTheValidateStatus", $objecttmp->ref), null, 'warnings');
-                }
-            }
-            else
-            {
-                setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                $error++;
-                break;
-            }
-        }
+		$objecttmp = new $objectclass($db);
+		$nbok = 0;
+		foreach ($toselect as $toselectid)
+		{
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0)
+			{
+				$userWrite  = $object->restrictedProjectArea($user, 'write');
+				if ($userWrite > 0 && $objecttmp->statut == 1) {
+					$result = $objecttmp->setClose($user);
+					if ($result <= 0) {
+						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+						$error++;
+						break;
+					} else $nbok++;
+				} elseif ($userWrite <= 0) {
+					setEventMessages($langs->trans("DontHavePermissionForCloseProject", $objecttmp->ref), null, 'warnings');
+				} else {
+					setEventMessages($langs->trans("DontHaveTheValidateStatus", $objecttmp->ref), null, 'warnings');
+				}
+			} else {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			}
+		}
 
-        if (!$error)
-        {
-            if ($nbok > 1) setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
-            else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
-            $db->commit();
-        }
-        else
-        {
-            $db->rollback();
-        }
-    }
+		if (!$error)
+		{
+			if ($nbok > 1) setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
+			else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
 }
 
 
@@ -275,7 +291,7 @@ if (!$user->rights->projet->all->lire) $projectsListId = $object->getProjectsAut
 // 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 = '".$object->element."'";
+$sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
 $sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql)
@@ -284,8 +300,7 @@ if ($resql)
 	{
 		$listofprojectcontacttype[$obj->rowid] = $obj->code;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 if (count($listofprojectcontacttype) == 0) $listofprojectcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is only once.
@@ -293,8 +308,6 @@ $sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as statu
 $sql .= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount, p.usage_opportunity, p.usage_task, p.usage_bill_time";
 $sql .= ", s.rowid as socid, s.nom as name, s.email";
 $sql .= ", cls.code as opp_status_code";
-// We'll need these fields in order to filter by categ
-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.' as options_'.$key : '');
@@ -304,11 +317,13 @@ $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."projet as p";
+if (!empty($conf->categorie->enabled))
+{
+	$sql .= Categorie::getFilterJoinQuery(Categorie::TYPE_PROJECT, "p.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 (p.rowid = ef.fk_object)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
-// We'll need this table joined to the select in order to filter by categ
-if (!empty($search_categ)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_project as cs ON p.rowid = cs.fk_project"; // We'll need this table joined to the select in order to filter by categ
 // We'll need this table joined to the select in order to filter by sale
 // No check is done on company permission because readability is managed by public status of project and assignement.
 //if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
@@ -318,11 +333,13 @@ if ($search_project_user > 0)
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ecp";
 }
 $sql .= " WHERE p.entity IN (".getEntity('project').')';
+if (!empty($conf->categorie->enabled))
+{
+	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_PROJECT, "p.rowid", $search_category_array);
+}
 if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
 // No need to check if company is external user, as filtering of projects must be done by getProjectsAuthorizedForUser
 if ($socid > 0) $sql .= " AND (p.fk_soc = ".$socid.")"; // This filter if when we use a hard coded filter on company on url (not related to filter for external users)
-if ($search_categ > 0)    $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ);
-if ($search_categ == -2)  $sql .= " AND cs.fk_categorie IS NULL";
 if ($search_ref) $sql .= natural_search('p.ref', $search_ref);
 if ($search_label) $sql .= natural_search('p.title', $search_label);
 if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
@@ -430,8 +447,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // List of mass actions available
 $arrayofmassactions = array(
 	'generate_doc'=>$langs->trans("ReGeneratePDF"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
-    //'presend'=>$langs->trans("SendByMail"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->projet->creer) $arrayofmassactions['close'] = $langs->trans("Close");
@@ -440,11 +457,9 @@ if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions =
 
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton = '';
-if ($user->rights->projet->creer)
-{
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?action=create');
-}
+$url = DOL_URL_ROOT.'/projet/card.php?action=create';
+if (!empty($socid)) $url .= '&socid='.$socid;
+$newcardbutton = dolGetButtonTitle($langs->trans('NewProject'), '', 'fa fa-plus-circle', $url, '', $user->rights->projet->creer);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -453,16 +468,14 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 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="type" value="'.$type.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 // Show description of content
 $texthelp = '';
 if ($search_project_user == $user->id) $texthelp .= $langs->trans("MyProjectsDesc");
-else
-{
-    if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("ProjectsDesc");
-    else $texthelp .= $langs->trans("ProjectsPublicDesc");
+else {
+	if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("ProjectsDesc");
+	else $texthelp .= $langs->trans("ProjectsPublicDesc");
 }
 
 print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -483,13 +496,10 @@ if ($search_all)
 $moreforfilter = '';
 
 // Filter on categories
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
-	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('ProjectCategories').': ';
-	$moreforfilter .= $formother->select_categories('project', $search_categ, 'search_categ', 1, 1, 'maxwidth300');
-	$moreforfilter .= '</div>';
+	$formcategory = new FormCategory($db);
+	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array);
 }
 
 // If the user can view user other than himself
@@ -606,8 +616,8 @@ if (!empty($arrayfields['p.opp_percent']['checked']))
 }
 if (!empty($arrayfields['opp_weighted_amount']['checked']))
 {
-    print '<td class="liste_titre nowrap right">';
-    print '</td>';
+	print '<td class="liste_titre nowrap right">';
+	print '</td>';
 }
 if (!empty($arrayfields['p.budget_amount']['checked']))
 {
@@ -675,7 +685,7 @@ print '<tr class="liste_titre">';
 if (!empty($arrayfields['p.ref']['checked']))           print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
 if (!empty($arrayfields['p.title']['checked']))         print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $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['commercial']['checked']))      print_liste_field_titre($arrayfields['commercial']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
+if (!empty($arrayfields['commercial']['checked']))      print_liste_field_titre($arrayfields['commercial']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder, 'tdoverflowmax100imp ');
 if (!empty($arrayfields['p.dateo']['checked']))         print_liste_field_titre($arrayfields['p.dateo']['label'], $_SERVER["PHP_SELF"], "p.dateo", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['p.datee']['checked']))         print_liste_field_titre($arrayfields['p.datee']['label'], $_SERVER["PHP_SELF"], "p.datee", "", $param, '', $sortfield, $sortorder, 'center ');
 if (!empty($arrayfields['p.public']['checked']))        print_liste_field_titre($arrayfields['p.public']['label'], $_SERVER["PHP_SELF"], "p.public", "", $param, "", $sortfield, $sortorder);
@@ -701,8 +711,8 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array(
-    'nbfield' => 0,
-    'val' => array(),
+	'nbfield' => 0,
+	'val' => array(),
 );
 while ($i < min($num, $limit))
 {
@@ -722,9 +732,9 @@ while ($i < min($num, $limit))
 	$userAccess = $object->restrictedProjectArea($user); // why this ?
 	if ($userAccess >= 0)
 	{
-	    $socstatic->id = $obj->socid;
-	    $socstatic->name = $obj->name;
-	    $socstatic->email = $obj->email;
+		$socstatic->id = $obj->socid;
+		$socstatic->name = $obj->name;
+		$socstatic->email = $obj->email;
 
 		print '<tr class="oddeven">';
 
@@ -752,9 +762,7 @@ while ($i < min($num, $limit))
 			if ($obj->socid)
 			{
 				print $socstatic->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -773,8 +781,7 @@ while ($i < min($num, $limit))
 				if ($nbofsalesrepresentative > 3)   // We print only number
 				{
 					print $nbofsalesrepresentative;
-				}
-				elseif ($nbofsalesrepresentative > 0)
+				} elseif ($nbofsalesrepresentative > 0)
 				{
 					$userstatic = new User($db);
 					$j = 0;
@@ -794,9 +801,7 @@ while ($i < min($num, $limit))
 					}
 				}
 				//else print $langs->trans("NoSalesRepresentativeAffected");
-			}
-			else
-			{
+			} else {
 				print '&nbsp';
 			}
 			print '</td>';
@@ -857,19 +862,19 @@ while ($i < min($num, $limit))
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-        // Opp weighted amount
-        if (!empty($arrayfields['opp_weighted_amount']['checked']))
-        {
-            if (!isset($totalarray['val']['opp_weighted_amount']))  $totalarray['val']['opp_weighted_amount'] = 0;
-            print '<td align="right">';
-            if ($obj->opp_weighted_amount) {
-                print price($obj->opp_weighted_amount, 1, $langs, 1, -1, -1, '');
-                $totalarray['val']['opp_weighted_amount'] += $obj->opp_weighted_amount;
-            }
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-            if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'opp_weighted_amount';
-        }
+		// Opp weighted amount
+		if (!empty($arrayfields['opp_weighted_amount']['checked']))
+		{
+			if (!isset($totalarray['val']['opp_weighted_amount']))  $totalarray['val']['opp_weighted_amount'] = 0;
+			print '<td align="right">';
+			if ($obj->opp_weighted_amount) {
+				print price($obj->opp_weighted_amount, 1, $langs, 1, -1, -1, '');
+				$totalarray['val']['opp_weighted_amount'] += $obj->opp_weighted_amount;
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'opp_weighted_amount';
+		}
 		// Budget
 		if (!empty($arrayfields['p.budget_amount']['checked']))
 		{
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index 38d12081b4f..6d56b2088e9 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -350,8 +350,7 @@ print '</div>';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $stringtoshow .= '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	$stringtoshow .= $px1->show();
 	$stringtoshow .= "<br>\n";
 	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index ebc6a7dc556..522468257e0 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -36,7 +36,7 @@ if ($conf->categorie->enabled) { require_once DOL_DOCUMENT_ROOT.'/categories/cla
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'users', 'companies'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -95,7 +95,7 @@ $hookmanager->initHooks(array('projecttaskscard', 'globalcard'));
 
 $progress = GETPOST('progress', 'int');
 $label = GETPOST('label', 'alpha');
-$description = GETPOST('description', 'none');
+$description = GETPOST('description', 'restricthtml');
 $planned_workloadhour = (GETPOST('planned_workloadhour', 'int') ?GETPOST('planned_workloadhour', 'int') : 0);
 $planned_workloadmin = (GETPOST('planned_workloadmin', 'int') ?GETPOST('planned_workloadmin', 'int') : 0);
 $planned_workload = $planned_workloadhour * 3600 + $planned_workloadmin * 60;
@@ -236,8 +236,7 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 			$error++;
-		}
-		elseif (empty($_POST['task_parent']))
+		} elseif (empty($_POST['task_parent']))
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ChildOfProjectTask")), null, 'errors');
 			$action = 'create';
@@ -273,17 +272,13 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			if ($taskid > 0)
 			{
 				$result = $task->add_contact($_POST["userid"], 'TASKEXECUTIVE', 'internal');
-			}
-			else
-			{
+			} else {
 				if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$langs->load("projects");
 					setEventMessages($langs->trans('NewTaskRefSuggested'), '', 'warnings');
 					$duplicate_code_error = true;
-				}
-				else
-				{
+				} else {
 					setEventMessages($task->error, $task->errors, 'errors');
 				}
 				$action = 'create';
@@ -297,23 +292,19 @@ if ($action == 'createtask' && $user->rights->projet->creer)
 			{
 				header("Location: ".$backtopage);
 				exit;
-			}
-			elseif (empty($projectid))
+			} elseif (empty($projectid))
 			{
 				header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
 				exit;
 			}
 			$id = $projectid;
 		}
-	}
-	else
-	{
+	} else {
 		if (!empty($backtopage))
 		{
 			header("Location: ".$backtopage);
 			exit;
-		}
-		elseif (empty($id))
+		} elseif (empty($id))
 		{
 			// We go back on task list
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php'.(empty($mode) ? '' : '?mode='.$mode));
@@ -507,9 +498,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		$langs->load("errors");
 		print $langs->trans("WarningProjectClosed");
 		print '</div>';
-	}
-	else
-	{
+	} else {
 		print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="createtask">';
@@ -536,9 +525,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		if (empty($duplicate_code_error))
 		{
 			print (GETPOSTISSET("ref") ?GETPOST("ref", 'alpha') : $defaultref);
-		}
-		else
-		{
+		} else {
 			print $defaultref;
 		}
 		print '<input type="hidden" name="taskref" value="'.($_POST["ref"] ? $_POST["ref"] : $defaultref).'">';
@@ -558,9 +545,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		if (is_array($contactsofproject) && count($contactsofproject))
 		{
 			print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
-		}
-		else
-		{
+		} else {
 			print $langs->trans("NoUserAssignedToTheProject");
 		}
 		print '</td></tr>';
@@ -613,8 +598,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 		print '</form>';
 	}
-}
-elseif ($id > 0 || !empty($ref))
+} elseif ($id > 0 || !empty($ref))
 {
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
@@ -648,7 +632,8 @@ elseif ($id > 0 || !empty($ref))
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	$title = $langs->trans("ListOfTasks");
-	$linktotasks = dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition'));
+	$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition btnTitleSelected'));
+	$linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly'));
 
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
 	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'generic');
@@ -811,9 +796,7 @@ elseif ($id > 0 || !empty($ref))
 		// Show all lines in taskarray (recursive function to go down on tree)
 		$j = 0; $level = 0;
 		$nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields);
-	}
-	else
-	{
+	} else {
 		$colspan = 10;
 		if ($object->usage_bill_time) $colspan += 2;
 		print '<tr class="oddeven nobottom"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoTasks").'</span></td></tr>';
@@ -836,9 +819,7 @@ elseif ($id > 0 || !empty($ref))
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 				cleanCorruptedTree($db, 'projet_task', 'fk_task_parent');
 			}
-		}
-		else
-		{
+		} else {
 			if ($nboftaskshown < count($tasksarray) && !GETPOST('search_user_id', 'int'))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index 82b4d8fdc10..0549710ff25 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -41,7 +41,7 @@ $id = GETPOST('id', 'int');
 $idcomment = GETPOST('idcomment', 'int');
 $ref = GETPOST("ref", 'alpha', 1); // task ref
 $objectref = GETPOST("taskref", 'alpha'); // task ref
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
@@ -74,9 +74,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($objectsarray) > 0)
 		{
 			$id = $objectsarray[0]->id;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -280,8 +278,7 @@ if ($id > 0 || !empty($ref))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		}
-		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
 
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 415859127db..313fec73721 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('projects', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
@@ -68,18 +68,14 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
     		if ($result <= 0)
     		{
     			dol_print_error($db, $projectstatic->error, $projectstatic->errors);
-    		}
-    		else
-    		{
+    		} else {
     			$contactsofproject = $projectstatic->getListContactId('internal');
     			foreach ($contactsofproject as $key => $val)
     			{
     				$result = $object->add_contact($val, GETPOST("type"), GETPOST("source"));
     			}
     		}
-    	}
-    	else
-    	{
+    	} else {
   			$result = $object->add_contact($idfortaskuser, GETPOST("type"), GETPOST("source"));
     	}
     }
@@ -88,16 +84,12 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -109,9 +101,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 	if ($object->fetch($id, $ref))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -126,9 +116,7 @@ if ($action == 'deleteline' && $user->rights->projet->creer)
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : ''));
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -142,9 +130,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($tasksarray) > 0)
 		{
 			$id = $tasksarray[0]->id;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -325,8 +311,7 @@ if ($id > 0 || !empty($ref))
 		{
 		    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		}
-		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
 
@@ -533,7 +518,7 @@ if ($id > 0 || !empty($ref))
 				if ($user->rights->projet->creer)
 				{
 					print '&nbsp;';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&lineid='.$tab[$i]['rowid'].($withproject ? '&withproject=1' : '').'">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&token='.newToken().'&lineid='.$tab[$i]['rowid'].($withproject ? '&withproject=1' : '').'">';
 					print img_picto($langs->trans('Unlink'), 'unlink');
 					print '</a>';
 				}
@@ -545,9 +530,7 @@ if ($id > 0 || !empty($ref))
 			}
 		}
 		print "</table>";
-	}
-	else
-	{
+	} else {
 		print "ErrorRecordNotFound";
 	}
 }
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index bd4335f747f..2a8e3cdd944 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'other'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
@@ -79,9 +79,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -103,9 +101,7 @@ if ($id > 0 || !empty($ref))
 		$object->project = clone $projectstatic;
 
 		$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -271,8 +267,7 @@ if ($object->id > 0)
 	{
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
 
@@ -318,9 +313,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->projet->creer;
 	$relativepathwithnofile = dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref).'/';
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	header('Location: index.php');
 	exit;
 }
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index ac3759df337..f2d455f7a04 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'users', 'companies'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -61,6 +61,7 @@ $search_task_description = GETPOST('search_task_description');
 $search_task_ref_parent = GETPOST('search_task_ref_parent');
 $search_project_user = GETPOST('search_project_user');
 $search_task_user = GETPOST('search_task_user');
+$search_task_progress = GETPOST('search_task_progress');
 $search_societe = GETPOST('search_societe');
 
 $mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
@@ -176,6 +177,7 @@ if (empty($reshook))
 		$search_task_label = "";
 		$search_task_description = "";
 		$search_task_ref_parent = "";
+		$search_task_progress = "";
 		$search_task_user = -1;
 		$search_project_user = -1;
 		$search_sday = '';
@@ -237,7 +239,7 @@ if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProj
 // 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 = '".$projectstatic->element."'";
+$sql .= " WHERE ctc.element = '".$db->escape($projectstatic->element)."'";
 $sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql)
@@ -246,13 +248,12 @@ if ($resql)
 	{
 		$listofprojectcontacttype[$obj->rowid] = $obj->code;
 	}
-}
-else dol_print_error($db);
+} 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 = '".$object->element."'";
+$sql .= " WHERE ctc.element = '".$db->escape($object->element)."'";
 $sql .= " AND ctc.source = 'internal'";
 $resql = $db->query($sql);
 if ($resql)
@@ -261,8 +262,7 @@ if ($resql)
 	{
 		$listoftaskcontacttype[$obj->rowid] = $obj->code;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 if (count($listoftaskcontacttype) == 0) $listoftaskcontacttype[0] = '0'; // To avoid sql syntax error if not found
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is assigned only once.
@@ -312,6 +312,7 @@ if ($search_task_ref)      $sql .= natural_search('t.ref', $search_task_ref);
 if ($search_task_label)    $sql .= natural_search('t.label', $search_task_label);
 if ($search_task_description)    $sql .= natural_search('t.description', $search_task_description);
 if ($search_task_ref_parent)    $sql .= ' AND t.fk_task_parent IN (SELECT ipt.rowid FROM '.MAIN_DB_PREFIX.'projet_task  as ipt WHERE '.natural_search('ipt.ref', $search_task_ref_parent, 0, 1).')';
+if ($search_task_progress) $sql .= natural_search('t.progress', $search_task_progress, 1);
 if ($search_societe)       $sql .= natural_search('s.nom', $search_societe);
 $sql .= dolSqlDateFilter('t.dateo', $search_sday, $search_smonth, $search_syear);
 $sql .= dolSqlDateFilter('t.datee', $search_eday, $search_emonth, $search_eyear);
@@ -399,6 +400,7 @@ if ($search_task_ref != '') 			$param .= '&search_task_ref='.urlencode($search_r
 if ($search_task_label != '') 		$param .= '&search_task_label='.urlencode($search_label);
 if ($search_task_description != '') 		$param .= '&search_task_description='.urlencode($search_description);
 if ($search_task_ref_parent != '') 		$param .= '&search_task_ref_parent='.urlencode($search_task_ref_parent);
+if ($search_task_progress != '') 			$param .= '&search_task_progress='.urlencode($search_task_progress);
 if ($search_societe != '') 		$param .= '&search_societe='.urlencode($search_societe);
 if ($search_projectstatus != '') $param .= '&search_projectstatus='.urlencode($search_projectstatus);
 if ((is_numeric($search_opp_status) && $search_opp_status >= 0) || in_array($search_opp_status, array('all', 'none'))) 	$param .= '&search_opp_status='.urlencode($search_opp_status);
@@ -419,11 +421,7 @@ if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span
 if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton = '';
-if ($user->rights->projet->creer)
-{
-    $newcardbutton .= dolGetButtonTitle($langs->trans('NewTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create');
-}
+$newcardbutton = dolGetButtonTitle($langs->trans('NewTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create', '', $user->rights->projet->creer);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -438,8 +436,7 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 // Show description of content
 $texthelp = '';
 if ($search_task_user == $user->id) $texthelp .= $langs->trans("MyTasksDesc");
-else
-{
+else {
     if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("TasksOnProjectsDesc");
     else $texthelp .= $langs->trans("TasksOnProjectsPublicDesc");
 }
@@ -461,7 +458,7 @@ if ($search_all)
 $morehtmlfilter = '';
 
 // Filter on categories
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -575,7 +572,13 @@ if (!empty($arrayfields['p.fk_statut']['checked']))
 if (!empty($arrayfields['t.planned_workload']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['t.duration_effective']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['t.progress_calculated']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['t.progress']['checked'])) print '<td class="liste_titre"></td>';
+if (!empty($arrayfields['t.progress']['checked']))
+{
+	print '<td class="liste_titre center">';
+	print '<input type="text" class="flat" name="search_task_progress" value="'.$search_task_progress.'" size="4">';
+	print '</td>';
+}
+
 if (!empty($arrayfields['t.progress_summary']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['t.tobill']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['t.billed']['checked'])) print '<td class="liste_titre"></td>';
@@ -754,9 +757,7 @@ while ($i < min($num, $limit))
 				$socstatic->id = $obj->socid;
 				$socstatic->name = $obj->name;
 				print $socstatic->getNomUrl(1);
-			}
-			else
-			{
+			} else {
 				print '&nbsp;';
 			}
 			print '</td>';
@@ -857,9 +858,7 @@ while ($i < min($num, $limit))
 		        print convertSecondToTime($obj->tobill, 'allhourmin');
 		        $totalarray['val']['t.tobill'] += $obj->tobill;
 		        $totalarray['totaltobill'] += $obj->tobill;
-		    }
-		    else
-		    {
+		    } else {
 		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 		    }
 		    print '</td>';
@@ -876,9 +875,7 @@ while ($i < min($num, $limit))
 		        print convertSecondToTime($obj->billed, 'allhourmin');
 		        $totalarray['val']['t.billed'] += $obj->billed;
 		        $totalarray['totalbilled'] += $obj->billed;
-		    }
-		    else
-		    {
+		    } else {
 		        print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 		    }
 		    print '</td>';
@@ -943,8 +940,7 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
 		{
 			if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
 			else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-		}
-		elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).'</td>';
+		} elseif ($totalarray['totalplannedworkloadfield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totalplannedworkload'], $plannedworkloadoutputformat).'</td>';
 		elseif ($totalarray['totaldurationeffectivefield'] == $i) print '<td class="center">'.convertSecondToTime($totalarray['totaldurationeffective'], $timespentoutputformat).'</td>';
 		elseif ($totalarray['totalprogress_calculatedfield'] == $i) print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationeffective'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
 		elseif ($totalarray['totalprogress_declaredfield'] == $i) print '<td class="center">'.($totalarray['totalplannedworkload'] > 0 ? round(100 * $totalarray['totaldurationdeclared'] / $totalarray['totalplannedworkload'], 2).' %' : '').'</td>';
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 4967257570e..c281da3b877 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 // Load translation files required by the page
 $langs->load('projects');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
@@ -57,9 +57,7 @@ if ($id > 0 || !empty($ref))
 		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 
 		$object->project = clone $projectstatic;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -75,9 +73,7 @@ if (!empty($project_ref) && !empty($withproject))
 		{
 			$id = $tasksarray[0]->id;
 			$object->fetch($id);
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -243,8 +239,7 @@ if ($object->id > 0)
 	{
 	    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 	    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-	}
-	else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+	} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 	$morehtmlref = '';
 
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index bbb275ef5df..849650d5473 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -168,7 +168,7 @@ print '<br><br>';
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre" height="24">';
-print '<td class="center">'.$langs->trans("Year").'</td>';
+print '<td>'.$langs->trans("Year").'</td>';
 print '<td class="right">'.$langs->trans("NbOfTasks").'</td>';
 print '</tr>';
 
@@ -181,13 +181,13 @@ foreach ($data_all_year as $val)
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
-		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
+		print '<td><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 '</tr>';
 	}
 
 	print '<tr class="oddeven" height="24">';
-	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
+	print '<td><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
 	print '</tr>';
 	$oldyear = $year;
@@ -199,8 +199,7 @@ print '</div>';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 $stringtoshow .= '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; }
-else {
+if ($mesg) { print $mesg; } else {
 	$stringtoshow .= $px1->show();
 	$stringtoshow .= "<br>\n";
 }
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index da15a73f66f..70caf507412 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -40,7 +40,7 @@ $langs->loadlangs(array('projects', 'companies'));
 $id = GETPOST('id', 'int');
 $ref = GETPOST("ref", 'alpha', 1); // task ref
 $taskref = GETPOST("taskref", 'alpha'); // task ref
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
@@ -86,7 +86,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 	if (!$error)
 	{
 		$object->fetch($id, $ref);
-        $object->oldcopy = clone $object;
+		$object->oldcopy = clone $object;
 
 		$tmparray = explode('_', $_POST['task_parent']);
 		$task_parent = $tmparray[1];
@@ -110,12 +110,10 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 			$result = $object->update($user);
 			if ($result < 0)
 			{
-			    setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$action = 'edit';
 	}
 }
@@ -131,10 +129,8 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 		{
 			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
 			exit;
-		}
-		else
-		{
-		    setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
 	}
@@ -149,9 +145,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($tasksarray) > 0)
 		{
 			$id = $tasksarray[0]->id;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.(empty($mode) ? '' : '&mode='.$mode));
 		}
 	}
@@ -171,11 +165,11 @@ if ($action == 'builddoc' && $user->rights->projet->creer)
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
 	}
-	$result = $object->generateDocument($object->modelpdf, $outputlangs);
+	$result = $object->generateDocument($object->model_pdf, $outputlangs);
 	if ($result <= 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
-        $action = '';
+		$action = '';
 	}
 }
 
@@ -233,115 +227,115 @@ if ($id > 0 || !empty($ref))
 
 			// Project card
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-            $morehtmlref = '<div class="refidno">';
-            // Title
-            $morehtmlref .= $projectstatic->title;
-            // Thirdparty
-            if ($projectstatic->thirdparty->id > 0)
-            {
-                $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-            }
-            $morehtmlref .= '</div>';
+			$morehtmlref = '<div class="refidno">';
+			// Title
+			$morehtmlref .= $projectstatic->title;
+			// Thirdparty
+			if ($projectstatic->thirdparty->id > 0)
+			{
+				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+			}
+			$morehtmlref .= '</div>';
 
-            // Define a complementary filter for search of next/prev ref.
-            if (!$user->rights->projet->all->lire)
-            {
-                $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-                $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-            }
+			// Define a complementary filter for search of next/prev ref.
+			if (!$user->rights->projet->all->lire)
+			{
+				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			}
 
-            dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-            print '<div class="fichecenter">';
-            print '<div class="fichehalfleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border tableforfield centpercent">';
+			print '<table class="border tableforfield centpercent">';
 
-            // Usage
-            print '<tr><td class="tdtop">';
-            print $langs->trans("Usage");
-            print '</td>';
-            print '<td>';
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowOpportunity");
-            	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-            	print '<br>';
-            }
-            if (empty($conf->global->PROJECT_HIDE_TASKS))
-            {
-            	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowTasks");
-            	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-            	print '<br>';
-            }
-            if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-            	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectBillTimeDescription");
-            	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-            	print '<br>';
-            }
-            print '</td></tr>';
+			// Usage
+			print '<tr><td class="tdtop">';
+			print $langs->trans("Usage");
+			print '</td>';
+			print '<td>';
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowOpportunity");
+				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+				print '<br>';
+			}
+			if (empty($conf->global->PROJECT_HIDE_TASKS))
+			{
+				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowTasks");
+				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+				print '<br>';
+			}
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+			{
+				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectBillTimeDescription");
+				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+				print '<br>';
+			}
+			print '</td></tr>';
 
-            // Visibility
-            print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-            if ($projectstatic->public) print $langs->trans('SharedProject');
-            else print $langs->trans('PrivateProject');
-            print '</td></tr>';
+			// Visibility
+			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+			if ($projectstatic->public) print $langs->trans('SharedProject');
+			else print $langs->trans('PrivateProject');
+			print '</td></tr>';
 
-            // Date start - end
-            print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-            $start = dol_print_date($projectstatic->date_start, 'day');
-            print ($start ? $start : '?');
-            $end = dol_print_date($projectstatic->date_end, 'day');
-            print ' - ';
-            print ($end ? $end : '?');
-            if ($projectstatic->hasDelay()) print img_warning("Late");
-            print '</td></tr>';
+			// Date start - end
+			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+			$start = dol_print_date($projectstatic->date_start, 'day');
+			print ($start ? $start : '?');
+			$end = dol_print_date($projectstatic->date_end, 'day');
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($projectstatic->hasDelay()) print img_warning("Late");
+			print '</td></tr>';
 
-            // Budget
-            print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-            if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-            print '</td></tr>';
+			// Budget
+			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print '</td></tr>';
 
-            // Other attributes
-            $cols = 2;
-            //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$cols = 2;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
+			print '</div>';
 
-            print '<div class="fichehalfright">';
-            print '<div class="ficheaddleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Description
-            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-            print nl2br($projectstatic->description);
-            print '</td></tr>';
+			// Description
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+			print nl2br($projectstatic->description);
+			print '</td></tr>';
 
-            // Categories
-            if ($conf->categorie->enabled) {
-                print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id, 'project', 1);
-                print "</td></tr>";
-            }
+			// Categories
+			if ($conf->categorie->enabled) {
+				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+				print $form->showCategories($projectstatic->id, 'project', 1);
+				print "</td></tr>";
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '</div>';
-            print '</div>';
+			print '</div>';
+			print '</div>';
+			print '</div>';
 
-            print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 
 			dol_fiche_end();
 
@@ -446,7 +440,7 @@ if ($id > 0 || !empty($ref))
 			// Other options
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			print $hookmanager->resPrint;
 			if (empty($reshook))
 			{
 				print $object->showOptionals($extrafields, 'edit');
@@ -462,9 +456,7 @@ if ($id > 0 || !empty($ref))
 			print '</div>';
 
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			/*
 			 * Fiche tache en mode visu
 			 */
@@ -480,27 +472,26 @@ 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.")";
-			}
-			else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+				$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+			} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 			$morehtmlref = '';
 
 			// 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);
@@ -524,11 +515,11 @@ if ($id > 0 || !empty($ref))
 			// Date start - Date end
 			print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">';
 			$start = dol_print_date($object->date_start, 'dayhour');
-    		print ($start ? $start : '?');
+			print ($start ? $start : '?');
 			$end = dol_print_date($object->date_end, 'dayhour');
-    		print ' - ';
-    		print ($end ? $end : '?');
-    		if ($object->hasDelay()) print img_warning("Late");
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($object->hasDelay()) print img_warning("Late");
 			print '</td></tr>';
 
 			// Planned workload
@@ -567,8 +558,7 @@ if ($id > 0 || !empty($ref))
 				$tmparray = $object->getSummaryOfTimeSpent();
 				if ($tmparray['total_duration'] > 0 && !empty($object->planned_workload)) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
 				else print '0 %';
-			}
-			else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+			} else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 			print '</td></tr>';
 
 			// Other attributes
@@ -594,45 +584,39 @@ if ($id > 0 || !empty($ref))
 			 * Actions
  			 */
 
-		    print '<div class="tabsAction">';
+			print '<div class="tabsAction">';
 
-		    $parameters = array();
-		    $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		    // modified by hook
-		    if (empty($reshook))
-		    {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+			// modified by hook
+			if (empty($reshook))
+			{
 				// Modify
 				if ($user->rights->projet->creer)
 				{
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&amp;withproject='.$withproject.'">'.$langs->trans('Modify').'</a>';
-				}
-				else
-				{
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 				}
 
 				// Delete
 				if ($user->rights->projet->supprimer)
 				{
-				    if (!$object->hasChildren() && !$object->hasTimeSpent())
-				    {
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
-				    }
-				    else
-				    {
-				        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
-				    }
-				}
-				else
-				{
+					if (!$object->hasChildren() && !$object->hasTimeSpent())
+					{
+						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
+					} else {
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
+					}
+				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 				}
 
 				print '</div>';
-		    }
+			}
 
-    		print '<div class="fichecenter"><div class="fichehalfleft">';
-    		print '<a name="builddoc"></a>'; // ancre
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+			print '<a name="builddoc"></a>'; // ancre
 
 			/*
 			 * Documents generes
@@ -643,7 +627,7 @@ if ($id > 0 || !empty($ref))
 			$genallowed = ($user->rights->projet->lire);
 			$delallowed = ($user->rights->projet->creer);
 
-			print $formfile->showdocuments('project_task', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf);
+			print $formfile->showdocuments('project_task', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf);
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index c0adf0984cc..dfeb73bb3cc 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -44,7 +44,7 @@ $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choi
 $confirm	= GETPOST('confirm', 'alpha');
 $cancel		= GETPOST('cancel', 'alpha');
 $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
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'timespentlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss	= GETPOST('optioncss', 'alpha');
 
@@ -154,17 +154,13 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 		if ($id || $ref)
 		{
 			$object->fetch($id, $ref);
-		}
-		else
-		{
+		} else {
 			if (!GETPOST('taskid', 'int') || GETPOST('taskid', 'int') < 0)
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Task")), null, 'errors');
 				$action = 'createtime';
 				$error++;
-			}
-			else
-			{
+			} else {
 				$object->fetch(GETPOST('taskid', 'int'));
 			}
 		}
@@ -178,9 +174,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				setEventMessages($langs->trans("ProjectMustBeValidatedFirst"), null, 'errors');
 				$action = 'createtime';
 				$error++;
-			}
-			else
-			{
+			} else {
 				$object->timespent_note = $_POST["timespent_note"];
 				if (GETPOST('progress', 'int') > 0) $object->progress = GETPOST('progress', 'int'); // If progress is -1 (not defined), we do not change value
 				$object->timespent_duration = $_POST["timespent_durationhour"] * 60 * 60; // We store duration in seconds
@@ -189,9 +183,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				{
 					$object->timespent_date = dol_mktime(GETPOST("timehour"), GETPOST("timemin"), 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 					$object->timespent_withhour = 1;
-				}
-				else
-				{
+				} else {
 					$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth"), GETPOST("timeday"), GETPOST("timeyear"));
 				}
 				$object->timespent_fk_user = $_POST["userid"];
@@ -199,17 +191,13 @@ if ($action == 'addtimespent' && $user->rights->projet->lire)
 				if ($result >= 0)
 				{
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					setEventMessages($langs->trans($object->error), null, 'errors');
 					$error++;
 				}
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if (empty($id)) $action = 'createtime';
 		else $action = 'createtime';
 	}
@@ -244,9 +232,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			{
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
-			}
-			else
-			{
+			} else {
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = $_POST["userid_line"];
@@ -254,15 +240,11 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			if ($result >= 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			$object->fetch($id, $ref);
 			// TODO Check that ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids))
 
@@ -275,9 +257,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			{
 				$object->timespent_date = dol_mktime(GETPOST("timelinehour"), GETPOST("timelinemin"), 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 				$object->timespent_withhour = 1;
-			}
-			else
-			{
+			} else {
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = $_POST["userid_line"];
@@ -286,16 +266,12 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 			if ($result >= 0)
 			{
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans($object->error), null, 'errors');
 				$error++;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$action = '';
 	}
 }
@@ -312,9 +288,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->l
 		setEventMessages($langs->trans($object->error), null, 'errors');
 		$error++;
 		$action = '';
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 	}
 }
@@ -328,9 +302,7 @@ if (!empty($project_ref) && !empty($withproject))
 		if (count($tasksarray) > 0)
 		{
 			$id = $tasksarray[0]->id;
-		}
-		else
-		{
+		} else {
 			header("Location: ".DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject ? '&withproject=1' : '').(empty($mode) ? '' : '&mode='.$mode));
 			exit;
 		}
@@ -346,14 +318,12 @@ if (GETPOST('projectid', 'int') > 0)
 	$result = $projectstatic->fetch($projectidforalltimes);
 	if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 	$res = $projectstatic->fetch_optionals();
-}
-elseif (GETPOST('project_ref', 'alpha'))
+} elseif (GETPOST('project_ref', 'alpha'))
 {
 	$projectstatic->fetch(0, GETPOST('project_ref', 'alpha'));
 	$projectidforalltimes = $projectstatic->id;
 	$withproject = 1;
-}
-elseif ($id > 0)
+} elseif ($id > 0)
 {
 	$object->fetch($id);
 	$result = $projectstatic->fetch($object->fk_project);
@@ -367,9 +337,7 @@ if ($action == 'confirm_generateinvoice')
 	if (!($projectstatic->thirdparty->id > 0))
 	{
 		setEventMessages($langs->trans("ThirdPartyRequiredToGenerateInvoice"), null, 'errors');
-	}
-	else
-	{
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -407,9 +375,7 @@ if ($action == 'confirm_generateinvoice')
 			$txtva = $dataforprice['tva_tx'];
 			$localtax1 = $dataforprice['localtax1'];
 			$localtax2 = $dataforprice['localtax2'];
-		}
-		else
-		{
+		} else {
 			$pu_ht = 0;
 			$txtva = get_default_tva($mysoc, $projectstatic->thirdparty);
 			$localtax1 = get_default_localtax($mysoc, $projectstatic->thirdparty, 1);
@@ -422,8 +388,7 @@ if ($action == 'confirm_generateinvoice')
 
         if ($invoiceToUse) {
             $tmpinvoice->fetch($invoiceToUse);
-        }
-        else {
+        } else {
 		    $result = $tmpinvoice->create($user);
 		    if ($result <= 0)
 		    {
@@ -474,8 +439,7 @@ if ($action == 'confirm_generateinvoice')
 						break;
 					}
 				}
-			}
-			elseif ($generateinvoicemode == 'onelineperperiod') {
+			} elseif ($generateinvoicemode == 'onelineperperiod') {
 					$arrayoftasks = array();
 				foreach ($toselect as $key => $value)
 					{
@@ -518,8 +482,7 @@ if ($action == 'confirm_generateinvoice')
 						break;
 					}
 				}
-			}
-			elseif ($generateinvoicemode == 'onelinepertask') {
+			} elseif ($generateinvoicemode == 'onelinepertask') {
 					$arrayoftasks = array();
 				foreach ($toselect as $key => $value)
 					{
@@ -569,9 +532,7 @@ if ($action == 'confirm_generateinvoice')
 			//var_dump($tmpinvoice);
 
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
@@ -601,8 +562,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$result = $projectstatic->fetch($projectidforalltimes);
 		if (!empty($projectstatic->socid)) $projectstatic->fetch_thirdparty();
 		$res = $projectstatic->fetch_optionals();
-	}
-	elseif ($object->fetch($id, $ref) >= 0)
+	} elseif ($object->fetch($id, $ref) >= 0)
 	{
 		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
 		$result = $projectstatic->fetch($object->fk_project);
@@ -759,15 +719,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					$backtourl = $_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.($withproject ? '&withproject=1' : '');
 					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
-				}
-				else									// We are on tab 'Time Spent' of task
+				} else // We are on tab 'Time Spent' of task
 				{
 					$backtourl = $_SERVER['PHP_SELF'].'?id='.$object->id.($withproject ? '&withproject=1' : '');
 					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
 				}
-			}
-			else
-			{
+			} else {
 				$linktocreatetimeBtnStatus = -2;
 				$linktocreatetimeHelpText = $langs->trans("NotOwnerOfProject");
 			}
@@ -806,8 +763,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		{
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 			$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
-		}
-		else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+		} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 		$morehtmlref = '';
 
@@ -873,8 +829,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			$tmparray = $object->getSummaryOfTimeSpent();
 			if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %';
 			else print '0 %';
-		}
-		else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
+		} else print '<span class="opacitymedium">'.$langs->trans("WorkloadNotDefined").'</span>';
 		print '</td>';
 
 		print '</tr>';
@@ -955,7 +910,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		else 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="id" value="'.$id.'">';
 		print '<input type="hidden" name="projectid" value="'.$projectidforalltimes.'">';
@@ -1043,7 +997,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
 		if (empty($projectidforalltimes)) $sql .= " AND t.fk_task =".$object->id;
 		else $sql .= " AND pt.fk_projet IN (".$projectidforalltimes.")";
-		if ($search_ref) $sql .= natural_search('c.ref', $search_ref);
 		if ($search_note) $sql .= natural_search('t.note', $search_note);
 		if ($search_task_ref) $sql .= natural_search('pt.ref', $search_task_ref);
 		if ($search_task_label) $sql .= natural_search('pt.label', $search_task_label);
@@ -1069,9 +1022,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 		if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 		{
 			$num = $nbtotalofrecords;
-		}
-		else
-		{
+		} else {
 			$sql .= $db->plimit($limit + 1, $offset);
 
 			$resql = $db->query($sql);
@@ -1092,15 +1043,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 				$title = $langs->trans("ListTaskTimeUserProject");
 
-				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit);
-			}
-			else
-			{
+				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit, 0, 0, 1);
+			} else {
 				print '<!-- List of time spent for project -->'."\n";
 
 				$title = $langs->trans("ListTaskTimeForTask");
 
-				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit);
+				print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, $linktocreatetime, '', $limit, 0, 0, 1);
 			}
 
 			$i = 0;
@@ -1111,9 +1060,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				$i++;
 			}
 			$db->free($resql);
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 
@@ -1171,9 +1118,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 
 				if ($projectstatic->public) $contactsofproject = array();
 				print $form->select_dolusers((GETPOST('userid', 'int') ? GETPOST('userid', 'int') : $userid), 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, $langs->trans("ResourceNotAssignedToProject"), 'maxwidth200');
-			}
-			else
-			{
+			} else {
 				if ($nboftasks) {
 					print img_error($langs->trans('FirstAddRessourceToAllocateTime')).' '.$langs->trans('FirstAddRessourceToAllocateTime');
 				}
@@ -1256,7 +1201,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			if (!empty($arrayfields['t.task_label']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_task_label" value="'.dol_escape_htmltag($search_task_label).'"></td>';
 		}
 		// Author
-		if (!empty($arrayfields['author']['checked'])) print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200').'</td>';
+		if (!empty($arrayfields['author']['checked'])) print '<td class="liste_titre">'.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth150').'</td>';
 		// Note
 		if (!empty($arrayfields['t.note']['checked'])) print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_note" value="'.dol_escape_htmltag($search_note).'"></td>';
 		// Duration
@@ -1332,11 +1277,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if (empty($task_time->task_date_withhour))
 					{
 						print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-					}
-					else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
-				}
-				else
-				{
+					} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+				} else {
 					print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 				}
 				print '</td>';
@@ -1352,9 +1294,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					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, '');
-					}
-					else
-					{
+					} else {
 						$tasktmp->id = $task_time->fk_task;
 						$tasktmp->ref = $task_time->ref;
 						$tasktmp->label = $task_time->label;
@@ -1396,9 +1336,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					} else {
 						print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 					}
-				}
-				else
-				{
+				} else {
 					$userstatic->id = $task_time->fk_user;
 					$userstatic->lastname = $task_time->lastname;
 					$userstatic->firstname = $task_time->firstname;
@@ -1417,15 +1355,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 				{
 					print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-				}
-				else
-				{
+				} else {
 					print dol_nl2br($task_time->note);
 				}
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
-			}
-			elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
+			} elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid)
 			{
 				print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
 			}
@@ -1438,9 +1373,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 					print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
-				}
-				else
-				{
+				} else {
 					print convertSecondToTime($task_time->task_duration, 'allhourmin');
 				}
 				print '</td>';
@@ -1455,7 +1388,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 			if (!empty($arrayfields['value']['checked']))
 			{
 				print '<td class="nowraponall right">';
-				$value = price2num($task_time->thm * $task_time->task_duration / 3600);
+				$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT');
 				print price($value, 1, $langs, 1, -1, -1, $conf->currency);
 				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
@@ -1480,14 +1413,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 							{
 								print $tmpinvoice->getNomUrl(1);
 							}
-						}
-						else
-						{
+						} else {
 							print $langs->trans("No");
 						}
-					}
-					else
-					{
+					} else {
 						print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
 					}
 				}
@@ -1515,8 +1444,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort" name="save" value="'.$langs->trans("Save").'">';
 				print '<br>';
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort" name="cancel" value="'.$langs->trans('Cancel').'">';
-			}
-			elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)	 // Read project and enter time consumed on assigned tasks
+			} elseif ($user->rights->projet->lire || $user->rights->projet->all->creer)	 // Read project and enter time consumed on assigned tasks
 			{
 				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer)
 				{
@@ -1534,7 +1462,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					print '</a>';
 
 					print '&nbsp;';
-					print '<a class="reposition paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=deleteline&amp;lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
+					print '<a class="reposition paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&amp;action=deletelin&amp;token='.newToken().'&amp;lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
 					print img_delete('default', 'class="pictodelete paddingleft"');
 					print '</a>';
 
@@ -1568,11 +1496,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						if (empty($task_time->task_date_withhour))
 						{
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
-						}
-						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
-					}
-					else
-					{
+						} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 1, 1, 2, "timespent_date", 1, 0);
+					} else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
 					print '</td>';
@@ -1597,7 +1522,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					if ((empty($id) && empty($ref)) || !empty($projectidforalltimes))	// Not a dedicated task
 					{
-						print '<td class="nowrap">';
+						print '<td>';
 						print $task_time->label;
 						print '</td>';
 					}
@@ -1620,9 +1545,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						} else {
 							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 						}
-					}
-					else
-					{
+					} else {
 						$userstatic->id = $task_time->fk_user;
 						$userstatic->lastname = $task_time->lastname;
 						$userstatic->firstname = $task_time->firstname;
@@ -1640,14 +1563,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-					}
-					else
-					{
+					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				}
-				elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 				{
 					print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
 				}
@@ -1660,9 +1580,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					{
 						print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 						print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
-					}
-					else
-					{
+					} else {
 						print convertSecondToTime($task_time->task_duration, 'allhourmin');
 					}
 					print '</td>';
@@ -1716,11 +1634,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						if (empty($task_time->task_date_withhour))
 						{
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 3, 3, 2, "timespent_date", 1, 0);
-						}
-						else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
-					}
-					else
-					{
+						} else print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 1, 1, 2, "timespent_date", 1, 0);
+					} else {
 						print dol_print_date(($date2 ? $date2 : $date1), ($task_time->task_date_withhour ? 'dayhour' : 'day'));
 					}
 					print '</td>';
@@ -1768,9 +1683,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 						} else {
 							print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime');
 						}
-					}
-					else
-					{
+					} else {
 						$userstatic->id = $task_time->fk_user;
 						$userstatic->lastname = $task_time->lastname;
 						$userstatic->firstname = $task_time->firstname;
@@ -1788,14 +1701,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 					{
 						print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
-					}
-					else
-					{
+					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				}
-				elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
+				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid)
 				{
 					print '<input type="hidden" name="timespent_note_line_2" value="'.$task_time->note.'">';
 				}
@@ -1808,9 +1718,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 					{
 						print '<input type="hidden" name="old_duration_2" value="0">';
 						print $form->select_duration('new_duration_2', 0, 0, 'text');
-					}
-					else
-					{
+					} else {
 						print convertSecondToTime($task_time->task_duration, 'allhourmin');
 					}
 					print '</td>';
@@ -1867,8 +1775,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
 				{
 					if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
 					else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-				}
-				elseif ($totalarray['totaldurationfield'] == $i) print '<td class="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
+				} elseif ($totalarray['totaldurationfield'] == $i) print '<td class="right">'.convertSecondToTime($totalarray['totalduration'], 'allhourmin').'</td>';
 				elseif ($totalarray['totalvaluefield'] == $i) print '<td class="right">'.price($totalarray['totalvalue']).'</td>';
 				//elseif ($totalarray['totalvaluebilledfield'] == $i) print '<td class="center">'.price($totalarray['totalvaluebilled']).'</td>';
 				else print '<td></td>';
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index a7eef6c2ede..1ab98093984 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -58,6 +58,11 @@ function llxFooterVierge()
 	print '</body></html>';
 }
 
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
@@ -109,8 +114,7 @@ if ($reshook < 0) {
 		print '<div class="error">'.$hookmanager->error.'</div>';
 	}
 	llxFooterVierge();
-}
-elseif (empty($reshook)) {
+} elseif (empty($reshook)) {
 	// Check exportkey
 	if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_GET["exportkey"]) {
 		$user->getrights();
@@ -188,9 +192,7 @@ if ($format == 'ical' || $format == 'vcal')
 
 		//header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else
-	{
+	} else {
 		print 'Error '.$agenda->error;
 
 		exit;
@@ -226,9 +228,7 @@ if ($format == 'rss')
 
 		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
-	}
-	else
-	{
+	} else {
 		print 'Error '.$agenda->error;
 
 		exit;
diff --git a/htdocs/public/cron/cron_run_jobs.php b/htdocs/public/cron/cron_run_jobs.php
index 1cfe1d4b0b3..9eb0579680a 100644
--- a/htdocs/public/cron/cron_run_jobs.php
+++ b/htdocs/public/cron/cron_run_jobs.php
@@ -90,9 +90,7 @@ if ($result < 0)
 	echo "User Error:".$user->error;
 	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 	exit;
-}
-else
-{
+} else {
 	if (empty($user->id))
 	{
 		echo " User login:".$userlogin." do not exists";
@@ -167,9 +165,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 		            echo "\nUser Error: ".$user->error."\n";
 		            dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
 		            exit(-1);
-		        }
-		        else
-		        {
+		        } else {
 		            if ($result == 0)
 		            {
 		                echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
@@ -206,9 +202,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			    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
-			{
+			} else {
 				$nbofjobslaunchedok++;
 			}
 
@@ -225,9 +219,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 			}
 
 			echo " - reprogrammed\n";
-		}
-		else
-		{
+		} else {
 		    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'));
@@ -237,9 +229,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0))
 	$conf = $savconf;
 
 	echo "Result: ".($nbofjobs)." jobs - ".($nbofjobslaunchedok + $nbofjobslaunchedko)." launched = ".$nbofjobslaunchedok." OK + ".$nbofjobslaunchedko." KO";
-}
-else
-{
+} else {
 	echo "Result: No active jobs found.";
 }
 
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 076b378dc87..ebf41e81feb 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -90,12 +90,12 @@ if (empty($reshook))
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-foundation.jpg',
 		'url'=>$url
 		),
-	    // All demo profile
-	    array('default'=>'0', 'key'=>'profdemoall', 'label'=>'ChooseYourDemoProfilMore',
+		// All demo profile
+		array('default'=>'0', 'key'=>'profdemoall', 'label'=>'ChooseYourDemoProfilMore',
 		'disablemodules'=>'adherent,cashdesk,don,externalsite,mailmanspip',
-	    //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
+		//'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'
 		'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-all.jpg'
-	    )
+		)
 	);
 
 
@@ -105,12 +105,12 @@ if (empty($reshook))
 	// Not visible
 	$alwayshiddencheckedmodules = array('accounting', 'api', 'barcode', 'blockedlog', 'bookmark', 'clicktodial', 'comptabilite', 'cron', 'document', 'domain', 'externalrss', 'externalsite', 'fckeditor', 'geoipmaxmind', 'gravatar', 'label', 'ldap',
 									'mailmanspip', 'notification', 'oauth', 'syslog', 'user', 'webservices', 'workflow',
-	                                // Extended modules
-	                                'memcached', 'numberwords', 'zipautofillfr');
-	$alwayshiddenuncheckedmodules = array('dav', 'debugbar', 'emailcollector', 'ftp', 'hrm', 'modulebuilder', 'printing', 'webservicesclient',
-	                                // Extended modules
-	                                'awstats', 'bittorrent', 'bootstrap', 'cabinetmed', 'cmcic', 'concatpdf', 'customfield', 'datapolicy', 'deplacement', 'dolicloud', 'filemanager', 'lightbox', 'mantis', 'monitoring', 'moretemplates', 'multicompany', 'nltechno', 'numberingpack', 'openstreetmap',
-	                                'ovh', 'phenix', 'phpsysinfo', 'pibarcode', 'postnuke', 'dynamicprices', 'receiptprinter', 'selectbank', 'skincoloreditor', 'submiteverywhere', 'survey', 'thomsonphonebook', 'topten', 'tvacerfa', 'voyage', 'webcalendar', 'webmail');
+									// Extended modules
+									'memcached', 'numberwords', 'zipautofillfr');
+	$alwayshiddenuncheckedmodules = array('collab', 'dav', 'debugbar', 'emailcollector', 'ftp', 'hrm', 'modulebuilder', 'printing', 'webservicesclient', 'zappier',
+									// Extended modules
+									'awstats', 'bittorrent', 'bootstrap', 'cabinetmed', 'cmcic', 'concatpdf', 'customfield', 'datapolicy', 'deplacement', 'dolicloud', 'filemanager', 'lightbox', 'mantis', 'monitoring', 'moretemplates', 'multicompany', 'nltechno', 'numberingpack', 'openstreetmap',
+									'ovh', 'phenix', 'phpsysinfo', 'pibarcode', 'postnuke', 'dynamicprices', 'receiptprinter', 'selectbank', 'skincoloreditor', 'submiteverywhere', 'survey', 'thomsonphonebook', 'topten', 'tvacerfa', 'voyage', 'webcalendar', 'webmail');
 }
 
 // Search modules
@@ -131,59 +131,55 @@ $j = 0; // j is module number. Automatically affected if module number not defin
 
 foreach ($modulesdir as $dir)
 {
-    // Charge tableaux modules, nom, numero, orders depuis repertoire dir
-    $handle = @opendir($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);
+	// Charge tableaux modules, nom, numero, orders depuis repertoire dir
+	$handle = @opendir($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)
-                {
-		            try
-		            {
-                        include_once $dir.$file;
-                        $objMod = new $modName($db);
+				if ($modName)
+				{
+					try {
+						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 && empty($conf->global->$const_name)) $modulequalified = 0;
-                        if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && 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 && empty($conf->global->$const_name)) $modulequalified = 0;
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && empty($conf->global->$const_name)) $modulequalified = 0;
 
-                        if ($modulequalified)
-                        {
-                            $modules[$i] = $objMod;
-                            $filename[$i] = $modName;
-                            $orders[$i]  = $objMod->family."_".$j; // Tri par famille puis numero module
-                            //print "x".$modName." ".$orders[$i]."\n<br>";
-                            $dirmod[$i] = $dirroot;
-                            $j++;
-                            $i++;
-                        }
-		            }
-                    catch (Exception $e)
-                    {
-                        dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
-                    }
-                }
-            }
-        }
-    }
+						if ($modulequalified)
+						{
+							$modules[$i] = $objMod;
+							$filename[$i] = $modName;
+							$orders[$i]  = $objMod->family."_".$j; // Tri par famille puis numero module
+							//print "x".$modName." ".$orders[$i]."\n<br>";
+							$dirmod[$i] = $dirroot;
+							$j++;
+							$i++;
+						}
+					} catch (Exception $e)
+					{
+						dol_syslog("Failed to load ".$dir.$file." ".$e->getMessage(), LOG_ERR);
+					}
+				}
+			}
+		}
+	}
 }
 
 asort($orders);
@@ -201,32 +197,32 @@ if (GETPOST('action', 'aZ09') == 'gotodemo')     // Action run when we click on
 	// If we disable modules using a profile choice
 	if (GETPOST("demochoice"))
 	{
-    	foreach ($demoprofiles as $profilearray)
-    	{
-    		if ($profilearray['key'] == GETPOST("demochoice"))
-    		{
-    			$disablestring = $profilearray['disablemodules'];
-    			break;
-    		}
-    	}
+		foreach ($demoprofiles as $profilearray)
+		{
+			if ($profilearray['key'] == GETPOST("demochoice"))
+			{
+				$disablestring = $profilearray['disablemodules'];
+				break;
+			}
+		}
 	}
 	// If we disable modules using personalized list
 	foreach ($modules as $val)
 	{
-	    $modulekeyname = strtolower($val->name);
-	    if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && !in_array($modulekeyname, $alwayscheckedmodules))
-	    {
-	        $disablestring .= $modulekeyname.',';
-	        if ($modulekeyname == 'propale') $disablestring .= 'propal,';
-	    }
+		$modulekeyname = strtolower($val->name);
+		if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && !in_array($modulekeyname, $alwayscheckedmodules))
+		{
+			$disablestring .= $modulekeyname.',';
+			if ($modulekeyname == 'propale') $disablestring .= 'propal,';
+		}
 	}
 
-    // Do redirect to login page
+	// Do redirect to login page
 	if ($disablestring)
 	{
 		if (GETPOST('urlfrom')) $url .= (preg_match('/\?/', $url) ? '&amp;' : '?').'urlfrom='.urlencode(GETPOST('urlfrom', 'alpha'));
 		$url .= (preg_match('/\?/', $url) ? '&amp;' : '?').'disablemodules='.$disablestring;
-        //var_dump($url);exit;
+		//var_dump($url);exit;
 		header("Location: ".$url);
 		exit;
 	}
@@ -294,49 +290,49 @@ foreach ($demoprofiles as $profilearray)
 {
 	if ($profilearray['default'] >= 0)
 	{
-	    //print $profilearray['lang'];
-	    if (!empty($profilearray['lang'])) $langs->load($profilearray['lang']);
+		//print $profilearray['lang'];
+		if (!empty($profilearray['lang'])) $langs->load($profilearray['lang']);
 
 		$url = $_SERVER["PHP_SELF"].'?action=gotodemo';
 		$urlwithmod = $url.'&amp;demochoice='.$profilearray['key'];
 		// Should work with DOL_URL_ROOT='' or DOL_URL_ROOT='/dolibarr'
 		//print "xx".$_SERVER["PHP_SELF"].' '.DOL_URL_ROOT.'<br>';
 
-        $urlfrom = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/i', '', $_SERVER["PHP_SELF"]);
+		$urlfrom = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/i', '', $_SERVER["PHP_SELF"]);
 		//print $urlfrom;
 
 		if (!empty($profilearray['url']))
 		{
-		    $urlwithmod = $profilearray['url'];
-		    $urlwithmod = $urlwithmod.(preg_match('/\?/', $urlwithmod) ? '&amp;' : '?').'urlfrom='.urlencode($urlfrom);
-		    if (!empty($profilearray['disablemodules']))
-		    {
-		          $urlwithmod = $urlwithmod.(preg_match('/\?/', $urlwithmod) ? '&amp;' : '?').'disablemodules='.$profilearray['disablemodules'];
-		    }
+			$urlwithmod = $profilearray['url'];
+			$urlwithmod = $urlwithmod.(preg_match('/\?/', $urlwithmod) ? '&amp;' : '?').'urlfrom='.urlencode($urlfrom);
+			if (!empty($profilearray['disablemodules']))
+			{
+				  $urlwithmod = $urlwithmod.(preg_match('/\?/', $urlwithmod) ? '&amp;' : '?').'disablemodules='.$profilearray['disablemodules'];
+			}
 		}
 
 		if (empty($profilearray['url']))
 		{
-		    print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 		}
 
 		print '<form method="POST" class="valigntop inline-block" name="form'.$profilearray['key'].'" id="form'.$profilearray['key'].'" action="'.$_SERVER["PHP_SELF"].'#a1'.$profilearray['key'].'">'."\n";
 		print '<input type="hidden" name="action" value="gotodemo">'."\n";
-        print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
-        print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
-        print '<input type="hidden" name="username" value="demo">'."\n";
-        print '<input type="hidden" name="dol_hide_topmenu" value="'.$conf->dol_hide_topmenu.'">'."\n";
-        print '<input type="hidden" name="dol_hide_leftmenu" value="'.$conf->dol_hide_leftmenu.'">'."\n";
-        print '<input type="hidden" name="dol_optimize_smallscreen" value="'.$conf->dol_optimize_smallscreen.'">'."\n";
-        print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
-        print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
+		print '<input type="hidden" name="urlfrom" value="'.dol_escape_htmltag($urlfrom).'">'."\n";
+		print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+		print '<input type="hidden" name="username" value="demo">'."\n";
+		print '<input type="hidden" name="dol_hide_topmenu" value="'.$conf->dol_hide_topmenu.'">'."\n";
+		print '<input type="hidden" name="dol_hide_leftmenu" value="'.$conf->dol_hide_leftmenu.'">'."\n";
+		print '<input type="hidden" name="dol_optimize_smallscreen" value="'.$conf->dol_optimize_smallscreen.'">'."\n";
+		print '<input type="hidden" name="dol_no_mouse_hover" value="'.$conf->dol_no_mouse_hover.'">'."\n";
+		print '<input type="hidden" name="dol_use_jmobile" value="'.$conf->dol_use_jmobile.'">'."\n";
 
-        print '<div id="div'.$profilearray['key'].'" summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i % 2 == 0 ? '1' : '0').'">'."\n";
+		print '<div id="div'.$profilearray['key'].'" summary="Dolibarr online demonstration for profile '.$profilearray['label'].'" class="center inline-block CTable CTableRow'.($i % 2 == 0 ? '1' : '0').'">'."\n";
 
 
-        print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url']) ? 'modulelineshow cursorpointer' : 'nomodulelines').'">';
+		print '<div id="a1'.$profilearray['key'].'" class="demobox '.(empty($profilearray['url']) ? 'modulelineshow cursorpointer' : 'nomodulelines').'">';
 
-        print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url']) ? 'modulelineshow' : 'nomodulelines').'">';
+		print '<a href="'.$urlwithmod.'" class="'.(empty($profilearray['url']) ? 'modulelineshow' : 'nomodulelines').'">';
 		print '<div style="padding: 10px;">';
 
 		print '<img class="demothumb" src="'.$profilearray['icon'].'" alt="Demo '.$profilearray['label'].'">';
@@ -344,69 +340,67 @@ foreach ($demoprofiles as $profilearray)
 		print '<div class="clearboth"></div>';
 
 		print '<div class="demothumbtext">';
-    	print $langs->trans($profilearray['label']);
-    	print '</div>';
+		print $langs->trans($profilearray['label']);
+		print '</div>';
 
-    	print '</div>';
-    	print '</a>';
+		print '</div>';
+		print '</a>';
 
 
-        // Modules (a profile you must choose modules)
-        if (empty($profilearray['url']))
-        {
-    		print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
+		// Modules (a profile you must choose modules)
+		if (empty($profilearray['url']))
+		{
+			print '<div id="tr1'.$profilearray['key'].'" class="moduleline hidden" style="margin-left: 8px; margin-right: 8px; text-align: justify; font-size:14px; line-height: 130%; padding-bottom: 8px">';
 
-    		print $langs->trans("ThisIsListOfModules").'<br><br>';
+			print $langs->trans("ThisIsListOfModules").'<br><br>';
 
-    		print '<div class="csscolumns">';
+			print '<div class="csscolumns">';
 
-    		$listofdisabledmodules = explode(',', $profilearray['disablemodules']);
-    		$j = 0;
-    		$nbcolsmod = empty($conf->dol_optimize_smallscreen) ? 4 : 3;
-    		//var_dump($modules);
-    		foreach ($orders as $index => $key) // Loop on qualified (enabled) modules
-    		{
-    			//print $index.' '.$key;
-    			$val = $modules[$index];
-    		    $modulekeyname = strtolower($val->name);
+			$listofdisabledmodules = explode(',', $profilearray['disablemodules']);
+			$j = 0;
+			$nbcolsmod = empty($conf->dol_optimize_smallscreen) ? 4 : 3;
+			//var_dump($modules);
+			foreach ($orders as $index => $key) // Loop on qualified (enabled) modules
+			{
+				//print $index.' '.$key;
+				$val = $modules[$index];
+				$modulekeyname = strtolower($val->name);
 
-    		    $modulequalified = 1;
-                if (!empty($val->always_enabled) || in_array($modulekeyname, $alwayshiddenuncheckedmodules)) $modulequalified = 0;
-                if ($val->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
-                if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
-                if (!$modulequalified) continue;
+				$modulequalified = 1;
+				if (!empty($val->always_enabled) || in_array($modulekeyname, $alwayshiddenuncheckedmodules)) $modulequalified = 0;
+				if ($val->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) $modulequalified = 0;
+				if ($val->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) $modulequalified = 0;
+				if (!$modulequalified) continue;
 
-                if (in_array($modulekeyname, $alwayshiddencheckedmodules))
-                {
-                    print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
-                    print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
-                }
-                else
-                {
-                    $modulo = ($j % $nbcolsmod);
-        		    //if ($modulo == 0) print '<tr>';
-                    print '<!-- id='.$val->numero.' -->';
-                    print '<div class="nowrap">';
-                    print '<input type="checkbox" class="checkbox" id="id'.$modulekeyname.'" name="'.$modulekeyname.'" value="1" title="'.dol_escape_htmltag($val->getName()).'"';
-                    if (in_array($modulekeyname, $alwaysuncheckedmodules)) print ' disabled';
-                    if (!in_array($modulekeyname, $alwaysuncheckedmodules) && (!in_array($modulekeyname, $listofdisabledmodules) || in_array($modulekeyname, $alwayscheckedmodules))) print ' checked';
-                    print '> <label for="id'.$modulekeyname.'" class="inline-block demomaxoveflow" title="'.dol_escape_htmltag($val->getName()).'">'.$val->getName().'</label><br>';
-                    print '</div>';
-                    //if ($modulo == ($nbcolsmod - 1)) print '</tr>';
-                    $j++;
-                }
-    		}
+				if (in_array($modulekeyname, $alwayshiddencheckedmodules))
+				{
+					print "\n".'<!-- Module '.$modulekeyname.' hidden and always checked -->';
+					print '<input type="hidden" name="'.$modulekeyname.'" value="1">';
+				} else {
+					$modulo = ($j % $nbcolsmod);
+					//if ($modulo == 0) print '<tr>';
+					print '<!-- id='.$val->numero.' -->';
+					print '<div class="nowrap">';
+					print '<input type="checkbox" class="checkbox" id="id'.$modulekeyname.'" name="'.$modulekeyname.'" value="1" title="'.dol_escape_htmltag($val->getName()).'"';
+					if (in_array($modulekeyname, $alwaysuncheckedmodules)) print ' disabled';
+					if (!in_array($modulekeyname, $alwaysuncheckedmodules) && (!in_array($modulekeyname, $listofdisabledmodules) || in_array($modulekeyname, $alwayscheckedmodules))) print ' checked';
+					print '> <label for="id'.$modulekeyname.'" class="inline-block demomaxoveflow" title="'.dol_escape_htmltag($val->getName()).'">'.$val->getName().'</label><br>';
+					print '</div>';
+					//if ($modulo == ($nbcolsmod - 1)) print '</tr>';
+					$j++;
+				}
+			}
 
-    		print '</div>';
+			print '</div>';
 
-		    print '<br><div class="center">';
-		    print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
-		    print '</div>';
+			print '<br><div class="center">';
+			print '<input type="submit" value=" &nbsp; &nbsp; '.$langs->trans("Start").' &nbsp; &nbsp; " class="button">';
+			print '</div>';
 
-		    print '</div>';
-        }
+			print '</div>';
+		}
 
-        print '</div></div>';
+		print '</div></div>';
 		print '</form>'."\n";
 
 		$i++;
@@ -423,20 +417,16 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIEN
 	if (empty($conf->dol_use_jmobile))
 	{
 		print '<div align="center">'."\n";
-		print '<script type="text/javascript"><!--'."\n";
+		print '<script><!--'."\n";
 		print 'google_ad_client = "'.$conf->global->MAIN_GOOGLE_AD_CLIENT.'";'."\n";
 		print 'google_ad_slot = "'.$conf->global->MAIN_GOOGLE_AD_SLOT.'";'."\n";
 		print 'google_ad_width = '.$conf->global->MAIN_GOOGLE_AD_WIDTH.';'."\n";
 		print 'google_ad_height = '.$conf->global->MAIN_GOOGLE_AD_HEIGHT.';'."\n";
 		print '//-->'."\n";
 		print '</script>'."\n";
-		print '<script type="text/javascript"'."\n";
-		print 'src="http://pagead2.googlesyndication.com/pagead/show_ads.js">'."\n";
-		print '</script>'."\n";
+		print '<script src="//pagead2.googlesyndication.com/pagead/show_ads.js"></script>'."\n";
 		print '</div>'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- google js advert tag disabled with jmobile -->'."\n";
 	}
 }
@@ -455,13 +445,13 @@ $db->close();
  */
 function llxHeaderVierge($title, $head = "")
 {
-    global $user, $conf, $langs;
+	global $user, $conf, $langs;
 
-    top_httphead();
+	top_httphead();
 
-    top_htmlhead($head, $title, 0, 0, array(), array('public/demo/demo.css'));
+	top_htmlhead($head, $title, 0, 0, array(), array('public/demo/demo.css'));
 
-    print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
+	print '<body class="demobody"><div class="demobackgrounddiv">'."\n";
 }
 
 /**
@@ -471,9 +461,9 @@ function llxHeaderVierge($title, $head = "")
  */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "\n";
-    print "</div></body>\n";
-    print "</html>\n";
+	print "\n";
+	print "</div></body>\n";
+	print "</html>\n";
 }
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index c92108d7723..294167bb574 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -86,11 +86,9 @@ if ($resql)
 			print '<tr class="oddeven">';
 			if ($objp->public)
 			{
-				print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe."</td>\n";
-			}
-			else
-			{
-				print "<td>Anonyme Anonyme</td>\n";
+				print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".dol_escape_htmltag($objp->societe)."</td>\n";
+			} else {
+				print "<td>".$langs->trans("Anonymous")."</td>\n";
 			}
 			print "<td>".dol_print_date($db->jdate($objp->datedon))."</td>\n";
 			print '<td class="right">'.number_format($objp->amount, 2, '.', ' ').' '.$langs->trans("Currency".$conf->currency).'</td>';
@@ -98,14 +96,10 @@ if ($resql)
 			$i++;
 		}
 		print "</table>";
+	} else {
+		print $langs->trans("Donation");
 	}
-	else
-	{
-		print "Aucun don publique";
-	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/public/donations/index.php b/htdocs/public/donations/index.php
index ceb6bb6031e..cd23e8058b6 100644
--- a/htdocs/public/donations/index.php
+++ b/htdocs/public/donations/index.php
@@ -24,3 +24,4 @@
 require '../../master.inc.php';
 
 header("Location: ".DOL_URL_ROOT.'/public/error-404.php');
+exit;
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 7f788a84671..eea293504d2 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -59,7 +59,7 @@ $errmsg = '';
 $num = 0;
 $error = 0;
 $backtopage = GETPOST('backtopage', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Load translation files
 $langs->loadLangs(array("main", "members", "companies", "install", "other"));
@@ -100,23 +100,17 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
     print '<body id="mainbody" class="publicnewmemberform">';
 
     // Define urllogo
-    $width = 0;
     $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);
-        $width = 150;
-    }
-    elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+    } 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);
-        $width = 150;
-    }
-    elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+    } elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
     {
         $urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
-        $width = 150;
     }
 
 	print '<div class="center">';
@@ -126,7 +120,6 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
     	print '<div class="backgreypublicpayment">';
     	print '<div class="logopublicpayment">';
     	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-    	if ($width) print ' width="'.$width.'"';
     	print '>';
     	print '</div>';
     	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
@@ -343,10 +336,8 @@ if ($action == 'add')
             		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;
+            		} else $appli .= " ".DOL_VERSION;
+            	} else $appli .= " ".DOL_VERSION;
 
             	$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
             	$from = $conf->global->ADHERENT_MAIL_FROM;
@@ -375,8 +366,7 @@ if ($action == 'add')
             {
                 $urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
                 // TODO Make replacement of __AMOUNT__, etc...
-            }
-            else $urlback = $_SERVER["PHP_SELF"]."?action=added";
+            } else $urlback = $_SERVER["PHP_SELF"]."?action=added";
 
             if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1')
             {
@@ -390,14 +380,11 @@ if ($action == 'add')
                         if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
                     	    $urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        }
-                        else
-                        {
+                        } else {
                             $urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
-                }
-            	elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paybox')
+                } 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'));
@@ -407,14 +394,11 @@ if ($action == 'add')
                     	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                     	{
                     		$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                    	}
-                    	else
-                    	{
+                    	} else {
                     		$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                     	}
                     }
-                }
-                elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'paypal')
+                } 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'));
@@ -424,14 +408,11 @@ if ($action == 'add')
                     	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
                         	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        }
-                        else
-                        {
+                        } else {
                         	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
-                }
-				elseif ($conf->global->MEMBER_NEWFORM_PAYONLINE == 'stripe')
+                } 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'));
@@ -441,15 +422,11 @@ if ($action == 'add')
                     	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
                         {
                         	$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$adh->ref, 2));
-                        }
-                        else
-                        {
+                        } else {
                         	$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
                         }
                     }
-                }
-                else
-                {
+                } else {
                     dol_print_error('', "Autosubscribe form is setup to ask an online payment for a not managed online payment");
                     exit;
                 }
@@ -457,9 +434,7 @@ if ($action == 'add')
 
             if (!empty($entity)) $urlback .= '&entity='.$entity;
             dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
-        }
-        else
-        {
+        } else {
         	$error++;
             $errmsg .= join('<br>', $adh->errors);
         }
@@ -471,9 +446,7 @@ if ($action == 'add')
 
     	Header("Location: ".$urlback);
     	exit;
-    }
-    else
-    {
+    } else {
     	$db->rollback();
     }
 }
@@ -574,9 +547,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE))
     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
-{
+} else {
     $adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
     print '<input type="hidden" id="type" name="type" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 }
@@ -588,9 +559,7 @@ 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";
-}
-else
-{
+} else {
     print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
     print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
 }
@@ -611,7 +580,7 @@ print '</td></tr>';
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
-print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'none'), 0, 1).'</textarea></td></tr>'."\n";
+print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
 // Zip / Town
 print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
 print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
@@ -667,7 +636,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 // Comments
 print '<tr>';
 print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
-print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'none'), 0, 1).'</textarea></td>';
+print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
 print '</tr>'."\n";
 
 // Add specific fields used by Dolibarr foundation for example
@@ -732,9 +701,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)
     if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT))
     {
         print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">';
-    }
-    else
-    {
+    } 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.'">';
     }
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 04fe1f75fca..c1677b2902b 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -84,9 +84,7 @@ if ($id > 0)
 	if (empty($object->public))
 	{
 		 print $langs->trans("ErrorThisMemberIsNotPublic");
-	}
-	else
-	{
+	} else {
 		print '<table class="public_border" cellspacing="0" width="100%" cellpadding="3">';
 
 		print '<tr><td width="15%">'.$langs->trans("Type").'</td><td class="valeur">'.$object->type."</td></tr>\n";
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 459926707b8..cb5b9308ed4 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -152,18 +152,14 @@ if ($result)
 			print '<td>';
 			print $form->showphoto('memberphoto', $objp, 64);
 			print '</td>'."\n";
-		}
-		else
-		{
+		} else {
 			print "<td>&nbsp;</td>\n";
 		}
 		print "</tr>";
 		$i++;
 	}
 	print "</table>";
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index f0ac4502a94..f97b4c03972 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -39,9 +39,7 @@ 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
-{
+} else {
     $langs->loadLangs(array("error", "other"));
 
     if (GETPOST('transphrase', 'alphanohtml')) print dol_escape_htmltag(GETPOST('transphrase', 'alphanohtml'));
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 2378728a8d3..4408438ceaf 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -45,6 +45,7 @@ $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors",
 // Security check
 // No check on module enabled. Done later according to $validpaymentmethod
 
+// Get parameters
 $action = GETPOST('action', 'aZ09');
 
 // Input are:
@@ -70,9 +71,6 @@ if (!$action)
 }
 
 
-
-
-
 // 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
@@ -132,7 +130,7 @@ $conf->dol_hide_leftmenu = 1;
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
 llxHeader($head, $langs->trans("OnlineSignature"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
 
-// Check link validity
+// Check link validity for param 'source'
 if (!empty($source) && in_array($ref, array('member_ref', 'contractline_ref', 'invoice_ref', 'order_ref', '')))
 {
     $langs->load("errors");
@@ -158,7 +156,6 @@ print '<!-- Form to sign -->'."\n";
 print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
 
 // Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
-$width = 0;
 // Define logo and logosmall
 $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
@@ -173,13 +170,10 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
-	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
-	$width = 150;
 }
 // Output html code for logo
 if ($urllogo)
@@ -187,7 +181,6 @@ if ($urllogo)
 	print '<div class="backgreypublicpayment">';
 	print '<div class="logopublicpayment">';
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-	if ($width) print ' width="'.$width.'"';
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
@@ -201,6 +194,7 @@ $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";
@@ -235,9 +229,7 @@ if ($source == 'proposal')
 	{
 		$mesg = $proposal->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$result = $proposal->fetch_thirdparty($proposal->socid);
 	}
 
@@ -265,9 +257,9 @@ if ($source == 'proposal')
 
 
 
-if (!$found && !$mesg) $mesg = $langs->trans("ErrorBadParameters");
+if (!$found && !$mesg) $mesg = $langs->transonentitiesnoconv("ErrorBadParameters");
 
-if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
 
 print '</table>'."\n";
 print "\n";
@@ -276,14 +268,10 @@ if ($action != 'dosign')
 {
     if ($found && !$error)	// We are in a management option and no error
     {
-    }
-    else
-    {
+    } else {
     	dol_print_error_email('ERRORNEWONLINESIGN');
     }
-}
-else
-{
+} else {
     // Print
 }
 
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index d0ce716bb7d..8b2e8663dac 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -66,7 +66,7 @@ if (GETPOST('ajoutcomment', 'alpha'))
 
 	$error = 0;
 
-	$comment = GETPOST("comment", 'none');
+	$comment = GETPOST("comment", 'restricthtml');
 	$comment_user = GETPOST('commentuser', 'nohtml');
 
 	if (!$comment)
@@ -77,7 +77,7 @@ if (GETPOST('ajoutcomment', 'alpha'))
 	if (!$comment_user)
 	{
 		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors');
 	}
 
 	if (!in_array($comment_user, $listofvoters))
@@ -108,12 +108,10 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 			if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1')
 			{
 				$nouveauchoix .= "1";
-			}
-			elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
+			} elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2')
 			{
 				$nouveauchoix .= "2";
-			}
-			else { // sinon c'est 0
+			} else { // sinon c'est 0
 				$nouveauchoix .= "0";
 			}
 		}
@@ -132,9 +130,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 		{
 			setEventMessages($langs->trans("VoteNameAlreadyExists"), null, 'errors');
 			$error++;
-		}
-		else
-		{
+		} else {
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'opensurvey_user_studs (nom, id_sondage, reponses)';
 			$sql .= " VALUES ('".$db->escape($nom)."', '".$db->escape($numsondage)."','".$db->escape($nouveauchoix)."')";
 			$resql = $db->query($sql);
@@ -165,16 +161,13 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x"))		// bout
 						$body = str_replace('\n', '<br>', $langs->transnoentities('EmailSomeoneVoted', $nom, getUrlSondage($numsondage, true)));
 						//var_dump($body);exit;
 
-						$cmailfile = new CMailFile("[".$application."] ".$langs->trans("Poll").': '.$object->titre, $email, $conf->global->MAIN_MAIL_EMAIL_FROM, $body, null, null, null, '', '', 0, -1);
+						$cmailfile = new CMailFile("[".$application."] ".$langs->trans("Poll").': '.$object->title, $email, $conf->global->MAIN_MAIL_EMAIL_FROM, $body, null, null, null, '', '', 0, -1);
 						$result = $cmailfile->sendfile();
 					}
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name")), null, 'errors');
 	}
 }
@@ -210,12 +203,10 @@ if ($testmodifier)
 		if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '1')
 		{
 			$nouveauchoix .= "1";
-		}
-		elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
+		} elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2')
 		{
 			$nouveauchoix .= "2";
-		}
-		else { // sinon c'est 0
+		} else { // sinon c'est 0
 			$nouveauchoix .= "0";
 		}
 	}
@@ -251,7 +242,7 @@ $form = new Form($db);
 $arrayofjs = array();
 $arrayofcss = array('/opensurvey/css/style.css');
 
-llxHeaderSurvey($object->titre, "", 0, 0, $arrayofjs, $arrayofcss, $numsondage);
+llxHeaderSurvey($object->title, "", 0, 0, $arrayofjs, $arrayofcss, $numsondage);
 
 if (empty($object->ref))     // For survey, id is a hex string
 {
@@ -281,14 +272,14 @@ print $langs->trans("OpenSurveyHowTo").'<br><br>';
 
 print '<div class="corps"> '."\n";
 
-//affichage du titre du sondage
-$titre = str_replace("\\", "", $object->titre);
+// show title of survey
+$titre = str_replace("\\", "", $object->title);
 print '<strong>'.dol_htmlentities($titre).'</strong><br><br>'."\n";
 
-//affichage des commentaires du sondage
-if ($object->commentaires)
+// show description of survey
+if ($object->description)
 {
-	print dol_htmlentitiesbr($object->commentaires);
+	print dol_htmlentitiesbr($object->description);
 	print '<br>'."\n";
 }
 
@@ -391,9 +382,7 @@ if ($object->format == "D")
 
 		print '</tr>'."\n";
 	}
-}
-else
-{
+} else {
 	//display of survey topics
 	print '<tr>'."\n";
 	print '<td></td>'."\n";
@@ -401,7 +390,7 @@ else
 	for ($i = 0; isset($toutsujet[$i]); $i++)
 	{
 		$tmp = explode('@', $toutsujet[$i]);
-		print '<td class="sujet">'.$tmp[0].'</td>'."\n";
+		print '<td class="sujet">'.dol_escape_htmltag($tmp[0]).'</td>'."\n";
 	}
 
 	print '</tr>'."\n";
@@ -480,9 +469,7 @@ while ($compteur < $num)
 				if (((string) $car) == "0") $sumagainst[$i]++;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		//sinon on remplace les choix de l'utilisateur par une ligne de checkbox pour recuperer de nouvelles valeurs
 		if ($compteur == $ligneamodifier)
 		{
@@ -508,9 +495,7 @@ while ($compteur < $num)
 				}
 				print '</td>'."\n";
 			}
-		}
-		else
-		{
+		} else {
 			for ($i = 0; $i < $nbcolonnes; $i++)
 			{
 				$car = substr($ensemblereponses, $i, 1);
@@ -613,7 +598,7 @@ if ($ligneamodifier < 0 && (!isset($_SESSION['nom'])))
 	}
 
 	// Affichage du bouton de formulaire pour inscrire un nouvel utilisateur dans la base
-	print '<td><input type="image" name="boutonp" value="'.$langs->trans("Vote").'" src="'.dol_buildpath('/opensurvey/img/add-24.png', 1).'"></td>'."\n";
+	print '<td><input type="image" class="borderimp" name="boutonp" value="'.$langs->trans("Vote").'" src="'.img_picto('', 'edit_add', '', false, 1).'"></td>'."\n";
 	print '</tr>'."\n";
 }
 
@@ -694,9 +679,7 @@ if ($object->allow_spy) {
 				} else {
 					$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').' ('.dol_print_date($toutsujet[$i], '%A').')';
 				}
-			}
-			else
-			{
+			} else {
 				$tmps = explode('@', $toutsujet[$i]);
 				$meilleursujet .= dol_htmlentities($tmps[0]);
 			}
@@ -733,7 +716,7 @@ $comments = $object->getComments();
 
 if ($comments)
 {
-	print "<br><b>".$langs->trans("CommentsOfVoters").":</b><br>\n";
+	print '<br><u><span class="bold opacitymedium">'.$langs->trans("CommentsOfVoters").':</span></u><br>'."\n";
 
 	foreach ($comments as $obj) {
 		// ligne d'un usager pré-authentifié
@@ -748,9 +731,9 @@ if ($comments)
 
 // Form to add comment
 if ($object->allow_comments) {
-	print '<div class="addcomment">'.$langs->trans("AddACommentForPoll")."<br>\n";
+	print '<div class="addcomment"><span class="opacitymedium">'.$langs->trans("AddACommentForPoll")."</span><br>\n";
 
-	print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent">'.dol_escape_htmltag(GETPOST('comment', 'none'), 0, 1).'</textarea><br>'."\n";
+	print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent">'.dol_escape_htmltag(GETPOST('comment', 'restricthtml'), 0, 1).'</textarea><br>'."\n";
 	print $langs->trans("Name").': ';
 	print '<input type="text" name="commentuser" maxlength="64" value="'.GETPOST('commentuser', 'nohtml').'"> &nbsp; '."\n";
 	print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 82ebed1bd27..3d197296df7 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -68,8 +68,8 @@ $action = GETPOST('action', 'aZ09');
 $suffix = GETPOST("suffix", 'aZ09');
 $amount = price2num(GETPOST("amount", 'alpha'));
 if (!GETPOST("currency", 'alpha')) $currency = $conf->currency;
-else $currency = GETPOST("currency", 'alpha');
-$source = GETPOST("s", 'alpha') ?GETPOST("s", 'alpha') : GETPOST("source", 'alpha');
+else $currency = GETPOST("currency", 'aZ09');
+$source = GETPOST("s", 'aZ09') ?GETPOST("s", 'aZ09') : GETPOST("source", 'aZ09');
 $download = GETPOST('d', 'int') ?GETPOST('d', 'int') : GETPOST('download', 'int');
 
 if (!$action)
@@ -210,9 +210,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 	{
 		if ($source && $REF) $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$source.$REF, 2); // Use the source in the hash to avoid duplicates if the references are identical
 		else $token = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
-	}
-	else
-	{
+	} else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
 	if ($SECUREKEY != $token)
@@ -371,8 +369,7 @@ if ($action == 'dopayment')
 	if ($paymentmethod == 'stripe')
 	{
 		if (GETPOST('newamount', 'alpha')) $amount = price2num(GETPOST('newamount', 'alpha'), 'MT');
-		else
-		{
+		else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 			$action = '';
 		}
@@ -468,9 +465,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	    				dol_syslog('Failed to create card record', LOG_WARNING, 0, '_stripe');
 	    				setEventMessages('Failed to create card record', null, 'errors');
 	    				$action = '';
-	    			}
-	    			else
-	    			{
+	    			} 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;
@@ -496,9 +491,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	    				}
 	    			}
     			}
-    		}
-    		else
-    		{
+    		} else {
     			$vatcleaned = $vatnumber ? $vatnumber : null;
 
     			/*$taxinfo = array('type'=>'vat');
@@ -652,8 +645,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
             } else {
                 $paymentintent = \Stripe\PaymentIntent::retrieve($paymentintent_id, array("stripe_account" => $stripeacc));
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             $error++;
             $errormessage = "CantRetreivePaymentIntent ".$e->getMessage();
@@ -669,9 +661,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
             dol_syslog($errormessage, LOG_WARNING, 0, '_stripe');
             setEventMessages($paymentintent->status, null, 'errors');
             $action = '';
-        }
-        else
-        {
+        } 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');
@@ -700,9 +690,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled))
 	{
 		header("Location: ".$urlko);
 		exit;
-	}
-	else
-	{
+	} else {
 		header("Location: ".$urlok);
 		exit;
 	}
@@ -759,7 +747,6 @@ print "\n";
 
 
 // Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
-$width = 0;
 // Define logo and logosmall
 $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
@@ -774,13 +761,10 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
-	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
-	$width = 150;
 }
 
 // Output html code for logo
@@ -789,7 +773,6 @@ if ($urllogo)
 	print '<div class="backgreypublicpayment">';
 	print '<div class="logopublicpayment">';
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-	if ($width) print ' width="'.$width.'"';
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
@@ -876,8 +859,7 @@ if (!$source)
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -913,9 +895,7 @@ if ($source == 'order')
 	{
 		$mesg = $order->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$result = $order->fetch_thirdparty($order->socid);
 	}
 	$object = $order;
@@ -971,8 +951,7 @@ if ($source == 'order')
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -985,8 +964,8 @@ if ($source == 'order')
 	// Tag
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentCode");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
-	print '<input type="hidden" name="tag" value="'.$tag.'">';
-	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '<input type="hidden" name="tag" value="'.dol_escape_htmltag($tag).'">';
+	print '<input type="hidden" name="fulltag" value="'.dol_escape_htmltag($fulltag).'">';
 	print '</td></tr>'."\n";
 
 	// Shipping address
@@ -1000,22 +979,20 @@ if ($source == 'order')
 	$phoneNum = $order->thirdparty->phone;
 	if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip)
 	{
-		print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
-		print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
-		print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
-		print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
-		print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
-		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
-		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
-		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+		print '<input type="hidden" name="shipToName" value="'.dol_escape_htmltag($shipToName).'">'."\n";
+		print '<input type="hidden" name="shipToStreet" value="'.dol_escape_htmltag($shipToStreet).'">'."\n";
+		print '<input type="hidden" name="shipToCity" value="'.dol_escape_htmltag($shipToCity).'">'."\n";
+		print '<input type="hidden" name="shipToState" value="'.dol_escape_htmltag($shipToState).'">'."\n";
+		print '<input type="hidden" name="shipToCountryCode" value="'.dol_escape_htmltag($shipToCountryCode).'">'."\n";
+		print '<input type="hidden" name="shipToZip" value="'.dol_escape_htmltag($shipToZip).'">'."\n";
+		print '<input type="hidden" name="shipToStreet2" value="'.dol_escape_htmltag($shipToStreet2).'">'."\n";
+		print '<input type="hidden" name="phoneNum" value="'.dol_escape_htmltag($phoneNum).'">'."\n";
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($order->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$order->thirdparty->id.'">'."\n";
 	print '<input type="hidden" name="email" value="'.$order->thirdparty->email.'">'."\n";
-	print '<input type="hidden" name="vatnumber" value="'.$order->thirdparty->tva_intra.'">'."\n";
+	print '<input type="hidden" name="vatnumber" value="'.dol_escape_htmltag($order->thirdparty->tva_intra).'">'."\n";
 	$labeldesc = $langs->trans("Order").' '.$order->ref;
 	if (GETPOST('desc', 'alpha')) $labeldesc = GETPOST('desc', 'alpha');
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
@@ -1036,9 +1013,7 @@ if ($source == 'invoice')
 	{
 		$mesg = $invoice->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$result = $invoice->fetch_thirdparty($invoice->socid);
 	}
 	$object = $invoice;
@@ -1090,26 +1065,25 @@ if ($source == 'invoice')
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentAmount");
 	if (empty($amount) && empty($object->paye)) print ' ('.$langs->trans("ToComplete").')';
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
-	if (empty($object->paye))
-	{
+	if ($object->type == $object::TYPE_CREDIT_NOTE) {
+		print '<b>'.$langs->trans("CreditNote").'</b>';
+	} elseif (empty($object->paye)) {
 		if (empty($amount) || !is_numeric($amount))
 		{
 			print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-		}
-		else {
+		} else {
 			print '<b>'.price($amount).'</b>';
 			print '<input type="hidden" name="amount" value="'.$amount.'">';
 			print '<input type="hidden" name="newamount" value="'.$amount.'">';
 		}
-	}
-	else
-	{
+		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+		print '<input type="hidden" name="currency" value="'.$currency.'">';
+	} else {
 		print '<b>'.price($object->total_ttc, 1, $langs).'</b>';
+		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+		print '<input type="hidden" name="currency" value="'.$currency.'">';
 	}
-	// Currency
-	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
 	// Tag
@@ -1138,9 +1112,7 @@ if ($source == 'invoice')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($invoice->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$invoice->thirdparty->id.'">'."\n";
@@ -1167,24 +1139,18 @@ if ($source == 'contractline')
 	{
 		$mesg = $contractline->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		if ($contractline->fk_contrat > 0)
 		{
 			$result = $contract->fetch($contractline->fk_contrat);
 			if ($result > 0)
 			{
 				$result = $contract->fetch_thirdparty($contract->socid);
-			}
-			else
-			{
+			} else {
 				$mesg = $contract->error;
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			$mesg = 'ErrorRecordNotFound';
 			$error++;
 		}
@@ -1206,9 +1172,7 @@ if ($source == 'contractline')
 				$pu_ht = $product->multiprices[$contract->thirdparty->price_level];
 				$pu_ttc = $product->multiprices_ttc[$contract->thirdparty->price_level];
 				$price_base_type = $product->multiprices_base_type[$contract->thirdparty->price_level];
-			}
-			else
-			{
+			} else {
 				$pu_ht = $product->price;
 				$pu_ttc = $product->price_ttc;
 				$price_base_type = $product->price_base_type;
@@ -1293,9 +1257,7 @@ if ($source == 'contractline')
 			if ($contractline->product->duration_value > 1)
 			{
 				$dur = array("h"=>$langs->trans("Hours"), "d"=>$langs->trans("DurationDays"), "w"=>$langs->trans("DurationWeeks"), "m"=>$langs->trans("DurationMonths"), "y"=>$langs->trans("DurationYears"));
-			}
-			else
-			{
+			} else {
 				$dur = array("h"=>$langs->trans("Hour"), "d"=>$langs->trans("DurationDay"), "w"=>$langs->trans("DurationWeek"), "m"=>$langs->trans("DurationMonth"), "y"=>$langs->trans("DurationYear"));
 			}
 			$duration = $contractline->product->duration_value.' '.$dur[$contractline->product->duration_unit];
@@ -1314,8 +1276,7 @@ if ($source == 'contractline')
 	{
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
-	}
-	else {
+	} else {
 		print '<b>'.price($amount).'</b>';
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
@@ -1351,9 +1312,7 @@ if ($source == 'contractline')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($contract->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$contract->thirdparty->id.'">'."\n";
@@ -1379,9 +1338,7 @@ if ($source == 'membersubscription')
 	{
 		$mesg = $member->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$member->fetch_thirdparty();
 		$subscription = new Subscription($db);
 	}
@@ -1468,8 +1425,7 @@ if ($source == 'membersubscription')
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
-			}
-			else {
+			} else {
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
@@ -1482,8 +1438,7 @@ if ($source == 'membersubscription')
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
+	} else {
 		$valtoshow = $amount;
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<b>'.price($valtoshow).'</b>';
@@ -1522,9 +1477,7 @@ if ($source == 'membersubscription')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($member->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$member->thirdparty->id.'">'."\n";
@@ -1548,9 +1501,7 @@ if ($source == 'donation')
 	{
 		$mesg = $don->error;
 		$error++;
-	}
-	else
-	{
+	} else {
 		$don->fetch_thirdparty();
 	}
 	$object = $don;
@@ -1613,8 +1564,7 @@ if ($source == 'donation')
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
-			}
-			else {
+			} else {
 				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
 				}
@@ -1627,8 +1577,7 @@ if ($source == 'donation')
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<input type="hidden" name="amount" value="'.GETPOST("amount", 'int').'">';
 		print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
-	}
-	else {
+	} else {
 		$valtoshow = $amount;
 		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
 		print '<b>'.price($valtoshow).'</b>';
@@ -1667,9 +1616,7 @@ if ($source == 'donation')
 		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
 		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
 		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
-	}
-	else
-	{
+	} else {
 		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
 	}
 	if (is_object($don->thirdparty)) print '<input type="hidden" name="thirdparty_id" value="'.$don->thirdparty->id.'">'."\n";
@@ -1682,7 +1629,7 @@ if ($source == 'donation')
 
 if (!$found && !$mesg) $mesg = $langs->trans("ErrorBadParameters");
 
-if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.$mesg.'</div></td></tr>'."\n";
+if ($mesg) print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
 
 print '</table>'."\n";
 print "\n";
@@ -1696,23 +1643,19 @@ if ($action != 'dopayment')
 		if ($source == 'order' && $object->billed)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("OrderBilled").'</span>';
-		}
-		elseif ($source == 'invoice' && $object->paye)
+		} elseif ($source == 'invoice' && $object->paye)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("InvoicePaid").'</span>';
-		}
-		elseif ($source == 'donation' && $object->paid)
+		} elseif ($source == 'donation' && $object->paid)
 		{
 			print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("DonationPaid").'</span>';
-		}
-		else
-		{
+		} 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 '<span class="opacitymedium">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</span><br>';
+		        print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>';
 		    }
 
 			// Buttons for all payments registration methods
@@ -1795,14 +1738,10 @@ if ($action != 'dopayment')
 				';
 			}
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error_email('ERRORNEWPAYMENT');
 	}
-}
-else
-{
+} else {
 	// Print
 }
 
@@ -1939,9 +1878,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		    if (empty($paymentintent))
 		    {
                 print '<center>'.$langs->trans("Error").'</center>';
-		    }
-		    else
-		    {
+		    } else {
 		        print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
 		        //$_SESSION["paymentintent_id"] = $paymentintent->id;
 		    }
@@ -1955,9 +1892,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 		{
 			$langs->load("errors");
 			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
-		}
-		else
-		{
+		} else {
 			print '<!-- JS Code for Stripe components -->';
     		print '<script src="https://js.stripe.com/v3/"></script>'."\n";
     		print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
@@ -2019,8 +1954,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
     				$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
     				$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
     				$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     				print $e->getMessage();
     			}
@@ -2068,8 +2002,7 @@ 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
@@ -2174,8 +2107,7 @@ 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
@@ -2242,8 +2174,7 @@ 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 */
diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php
index f84a014d5e5..b3833bd14b5 100644
--- a/htdocs/public/payment/paymentko.php
+++ b/htdocs/public/payment/paymentko.php
@@ -48,10 +48,10 @@ $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox",
 
 if (!empty($conf->paypal->enabled))
 {
-    $PAYPALTOKEN = GETPOST('TOKEN');
-    if (empty($PAYPALTOKEN)) $PAYPALTOKEN = GETPOST('token');
-    $PAYPALPAYERID = GETPOST('PAYERID');
-    if (empty($PAYPALPAYERID)) $PAYPALPAYERID = GETPOST('PayerID');
+	$PAYPALTOKEN = GETPOST('TOKEN');
+	if (empty($PAYPALTOKEN)) $PAYPALTOKEN = GETPOST('token');
+	$PAYPALPAYERID = GETPOST('PAYERID');
+	if (empty($PAYPALPAYERID)) $PAYPALPAYERID = GETPOST('PayerID');
 }
 if (!empty($conf->paybox->enabled))
 {
@@ -71,16 +71,14 @@ $paymentmethod = '';
 $reg = array();
 if (preg_match('/PM=([^\.]+)/', $FULLTAG, $reg))
 {
-    $paymentmethod = $reg[1];
+	$paymentmethod = $reg[1];
 }
 if (empty($paymentmethod))
 {
-    dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
-    exit;
-}
-else
-{
-    dol_syslog("paymentmethod=".$paymentmethod);
+	dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
+	exit;
+} else {
+	dol_syslog("paymentmethod=".$paymentmethod);
 }
 
 
@@ -117,85 +115,81 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
 
 if (!empty($_SESSION['ipaddress']))      // To avoid to make action twice
 {
-    // Get on url call
-    $fulltag            = $FULLTAG;
-    $onlinetoken        = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION['FinalPaymentAmt'];
-    // From env
-    $ipaddress          = $_SESSION['ipaddress'];
-    $errormessage       = $_SESSION['errormessage'];
+	// Get on url call
+	$fulltag            = $FULLTAG;
+	$onlinetoken        = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN;
+	$payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
+	// Set by newpayment.php
+	$paymentType        = $_SESSION['PaymentType'];
+	$currencyCodeType   = $_SESSION['currencyCodeType'];
+	$FinalPaymentAmt    = $_SESSION['FinalPaymentAmt'];
+	// From env
+	$ipaddress          = $_SESSION['ipaddress'];
+	$errormessage       = $_SESSION['errormessage'];
 
-    if (is_object($object) && method_exists($object, 'call_trigger')) {
-    	// Call trigger
-	    $result = $object->call_trigger('PAYMENTONLINE_PAYMENT_KO', $user);
-	    if ($result < 0) $error++;
-	    // End call triggers
-    }
+	if (is_object($object) && method_exists($object, 'call_trigger')) {
+		// Call trigger
+		$result = $object->call_trigger('PAYMENTONLINE_PAYMENT_KO', $user);
+		if ($result < 0) $error++;
+		// End call triggers
+	}
 
-    // Send an email
-    $sendemail = '';
+	// Send an email
+	$sendemail = '';
    	if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL))
    	{
-        $sendemail = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
-    }
+		$sendemail = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
+	}
 
-    // Send warning of error to administrator
-    if ($sendemail)
-    {
-    	$companylangs = new Translate('', $conf);
-    	$companylangs->setDefaultLang($mysoc->default_lang);
-    	$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
+	// Send warning of error to administrator
+	if ($sendemail)
+	{
+		$companylangs = new Translate('', $conf);
+		$companylangs->setDefaultLang($mysoc->default_lang);
+		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
 
-        $from = $conf->global->MAILING_EMAIL_FROM;
-        $sendto = $sendemail;
+		$from = $conf->global->MAILING_EMAIL_FROM;
+		$sendto = $sendemail;
 
-    	// 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;
+		// 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;
 
-    	$urlback = $_SERVER["REQUEST_URI"];
-    	$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentFailed");
-    	$content = "";
-    	$content .= '<font color="orange">'.$companylangs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."</font>\n";
+		$urlback = $_SERVER["REQUEST_URI"];
+		$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentFailed");
+		$content = "";
+		$content .= '<font color="orange">'.$companylangs->transnoentitiesnoconv("ValidationOfOnlinePaymentFailed")."</font>\n";
 
-    	$content .= "<br><br>\n";
-    	$content .= '<u>'.$companylangs->transnoentitiesnoconv("TechnicalInformation").":</u><br>\n";
-    	$content .= $companylangs->transnoentitiesnoconv("OnlinePaymentSystem").': <strong>'.$paymentmethod."</strong><br>\n";
-    	$content .= $companylangs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-    	$content .= $companylangs->transnoentitiesnoconv("Error").': '.$errormessage."<br>\n";
-    	$content .= "<br>\n";
-    	$content .= "tag=".$fulltag." token=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
+		$content .= "<br><br>\n";
+		$content .= '<u>'.$companylangs->transnoentitiesnoconv("TechnicalInformation").":</u><br>\n";
+		$content .= $companylangs->transnoentitiesnoconv("OnlinePaymentSystem").': <strong>'.$paymentmethod."</strong><br>\n";
+		$content .= $companylangs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+		$content .= $companylangs->transnoentitiesnoconv("Error").': '.$errormessage."<br>\n";
+		$content .= "<br>\n";
+		$content .= "tag=".$fulltag." token=".$onlinetoken." paymentType=".$paymentType." currencycodeType=".$currencyCodeType." payerId=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt;
 
-    	$ishtml = dol_textishtml($content); // May contain urls
+		$ishtml = dol_textishtml($content); // May contain urls
 
-    	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    	$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
 
-    	$result = $mailfile->sendfile();
-    	if ($result)
-    	{
-    		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-    	}
-    	else
-    	{
-    		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-    	}
-    }
+		$result = $mailfile->sendfile();
+		if ($result)
+		{
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+		} else {
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+		}
+	}
 
-    unset($_SESSION['ipaddress']);
+	unset($_SESSION['ipaddress']);
 }
 
 $head = '';
@@ -213,7 +207,6 @@ print '<span id="dolpaymentspan"></span>'."\n";
 print '<div id="dolpaymentdiv" align="center">'."\n";
 
 // Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
-$width = 0;
 // Define logo and logosmall
 $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
@@ -228,13 +221,10 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
-	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
-	$width = 150;
 }
 
 // Output html code for logo
@@ -243,7 +233,6 @@ if ($urllogo)
 	print '<div class="backgreypublicpayment">';
 	print '<div class="logopublicpayment">';
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-	if ($width) print ' width="'.$width.'"';
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
@@ -262,7 +251,7 @@ $key = 'ONLINE_PAYMENT_MESSAGE_KO';
 if (!empty($conf->global->$key)) print $conf->global->$key;
 
 $type = GETPOST('s', 'alpha');
-$ref = GETPOST('ref', 'none');
+$ref = GETPOST('ref', 'alphanohtml');
 $tag = GETPOST('tag', 'alpha');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 if ($type || $tag)
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 5203da2284f..3be1af4935e 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -62,10 +62,10 @@ if (!empty($conf->paypal->enabled))
 	$PAYPAL_API_KO = "";
 	if ($urlko) $PAYPAL_API_KO = $urlko;
 
-    $PAYPALTOKEN = GETPOST('TOKEN');
-    if (empty($PAYPALTOKEN)) $PAYPALTOKEN = GETPOST('token');
-    $PAYPALPAYERID = GETPOST('PAYERID');
-    if (empty($PAYPALPAYERID)) $PAYPALPAYERID = GETPOST('PayerID');
+	$PAYPALTOKEN = GETPOST('TOKEN');
+	if (empty($PAYPALTOKEN)) $PAYPALTOKEN = GETPOST('token');
+	$PAYPALPAYERID = GETPOST('PAYERID');
+	if (empty($PAYPALPAYERID)) $PAYPALPAYERID = GETPOST('PayerID');
 }
 
 $FULLTAG = GETPOST('FULLTAG');
@@ -81,12 +81,12 @@ $paymentmethod = '';
 $reg = array();
 if (preg_match('/PM=([^\.]+)/', $FULLTAG, $reg))
 {
-    $paymentmethod = $reg[1];
+	$paymentmethod = $reg[1];
 }
 if (empty($paymentmethod))
 {
-    dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
-    exit;
+	dol_print_error(null, 'The back url does not contains a parameter fulltag that should help us to find the payment method used');
+	exit;
 }
 
 dol_syslog("***** paymentok.php is called paymentmethod=".$paymentmethod." FULLTAG=".$FULLTAG." REQUEST_URI=".$_SERVER["REQUEST_URI"], LOG_DEBUG, 0, '_payment');
@@ -147,7 +147,6 @@ print '<div id="dolpaymentdiv" class="center">'."\n";
 
 
 // Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
-$width = 0;
 // Define logo and logosmall
 $logosmall = $mysoc->logo_small;
 $logo = $mysoc->logo;
@@ -162,13 +161,10 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
-	$width = 150;
-}
-elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
 {
 	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
 	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
-	$width = 150;
 }
 
 // Output html code for logo
@@ -177,7 +173,6 @@ if ($urllogo)
 	print '<div class="backgreypublicpayment">';
 	print '<div class="logopublicpayment">';
 	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-	if ($width) print ' width="'.$width.'"';
 	print '>';
 	print '</div>';
 	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
@@ -187,7 +182,7 @@ if ($urllogo)
 }
 
 
-print '<br><br>';
+print '<br><br><br>';
 
 
 if (!empty($conf->paypal->enabled))
@@ -196,80 +191,72 @@ if (!empty($conf->paypal->enabled))
 	{
 		if ($PAYPALTOKEN)
 		{
-		    // Get on url call
-		    $onlinetoken        = $PAYPALTOKEN;
-		    $fulltag            = $FULLTAG;
-		    $payerID            = $PAYPALPAYERID;
-		    // Set by newpayment.php
-		    $paymentType        = $_SESSION['PaymentType'];
-		    $currencyCodeType   = $_SESSION['currencyCodeType'];
-		    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
-		    // From env
-		    $ipaddress          = $_SESSION['ipaddress'];
+			// Get on url call
+			$onlinetoken        = $PAYPALTOKEN;
+			$fulltag            = $FULLTAG;
+			$payerID            = $PAYPALPAYERID;
+			// Set by newpayment.php
+			$paymentType        = $_SESSION['PaymentType'];
+			$currencyCodeType   = $_SESSION['currencyCodeType'];
+			$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
+			// From env
+			$ipaddress          = $_SESSION['ipaddress'];
 
 			dol_syslog("Call paymentok with token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
 
 			// Validate record
-		    if (!empty($paymentType))
-		    {
-		        dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_payment');
-		        $resArray = getDetails($onlinetoken);
-		        //var_dump($resarray);
+			if (!empty($paymentType))
+			{
+				dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_payment');
+				$resArray = getDetails($onlinetoken);
+				//var_dump($resarray);
 
-		        $ack = strtoupper($resArray["ACK"]);
-		        if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
-		        {
-		        	// Nothing to do
-		        	dol_syslog("Call to GetExpressCheckoutDetails return ".$ack, LOG_DEBUG, 0, '_payment');
-		        }
-		        else
-		        {
-		        	dol_syslog("Call to GetExpressCheckoutDetails return error: ".json_encode($resArray), LOG_WARNING, '_payment');
-		        }
+				$ack = strtoupper($resArray["ACK"]);
+				if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
+				{
+					// Nothing to do
+					dol_syslog("Call to GetExpressCheckoutDetails return ".$ack, LOG_DEBUG, 0, '_payment');
+				} else {
+					dol_syslog("Call to GetExpressCheckoutDetails return error: ".json_encode($resArray), LOG_WARNING, '_payment');
+				}
 
-		        dol_syslog("We call DoExpressCheckoutPayment token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
-		        $resArray2 = confirmPayment($onlinetoken, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
-		        //var_dump($resarray);
+				dol_syslog("We call DoExpressCheckoutPayment token=".$onlinetoken." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_payment');
+				$resArray2 = confirmPayment($onlinetoken, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
+				//var_dump($resarray);
 
-		        $ack = strtoupper($resArray2["ACK"]);
-		        if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
-		        {
-		        	dol_syslog("Call to GetExpressCheckoutDetails return ".$ack, LOG_DEBUG, 0, '_payment');
+				$ack = strtoupper($resArray2["ACK"]);
+				if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
+				{
+					dol_syslog("Call to GetExpressCheckoutDetails return ".$ack, LOG_DEBUG, 0, '_payment');
 
-		        	$object->source		= $source;
-		        	$object->ref = $ref;
-		        	$object->payerID	= $payerID;
-		        	$object->fulltag	= $fulltag;
-		        	$object->resArray = $resArray2;
+					$object->source		= $source;
+					$object->ref = $ref;
+					$object->payerID	= $payerID;
+					$object->fulltag	= $fulltag;
+					$object->resArray = $resArray2;
 
-		            // resArray was built from a string like that
-		            // TOKEN=EC%2d1NJ057703V9359028&TIMESTAMP=2010%2d11%2d01T11%3a40%3a13Z&CORRELATIONID=1efa8c6a36bd8&ACK=Success&VERSION=56&BUILD=1553277&TRANSACTIONID=9B994597K9921420R&TRANSACTIONTYPE=expresscheckout&PAYMENTTYPE=instant&ORDERTIME=2010%2d11%2d01T11%3a40%3a12Z&AMT=155%2e57&FEEAMT=5%2e54&TAXAMT=0%2e00&CURRENCYCODE=EUR&PAYMENTSTATUS=Completed&PENDINGREASON=None&REASONCODE=None
-		            $PAYMENTSTATUS = urldecode($resArray2["PAYMENTSTATUS"]); // Should contains 'Completed'
-		            $TRANSACTIONID = urldecode($resArray2["TRANSACTIONID"]);
-		            $TAXAMT = urldecode($resArray2["TAXAMT"]);
-		            $NOTE = urldecode($resArray2["NOTE"]);
+					// resArray was built from a string like that
+					// TOKEN=EC%2d1NJ057703V9359028&TIMESTAMP=2010%2d11%2d01T11%3a40%3a13Z&CORRELATIONID=1efa8c6a36bd8&ACK=Success&VERSION=56&BUILD=1553277&TRANSACTIONID=9B994597K9921420R&TRANSACTIONTYPE=expresscheckout&PAYMENTTYPE=instant&ORDERTIME=2010%2d11%2d01T11%3a40%3a12Z&AMT=155%2e57&FEEAMT=5%2e54&TAXAMT=0%2e00&CURRENCYCODE=EUR&PAYMENTSTATUS=Completed&PENDINGREASON=None&REASONCODE=None
+					$PAYMENTSTATUS = urldecode($resArray2["PAYMENTSTATUS"]); // Should contains 'Completed'
+					$TRANSACTIONID = urldecode($resArray2["TRANSACTIONID"]);
+					$TAXAMT = urldecode($resArray2["TAXAMT"]);
+					$NOTE = urldecode($resArray2["NOTE"]);
 
-		            $ispaymentok = true;
-		        }
-		        else
-		        {
-		        	dol_syslog("Call to DoExpressCheckoutPayment return error: ".json_encode($resArray2), LOG_WARNING, 0, '_payment');
+					$ispaymentok = true;
+				} else {
+					dol_syslog("Call to DoExpressCheckoutPayment return error: ".json_encode($resArray2), LOG_WARNING, 0, '_payment');
 
-		            //Display a user friendly Error on the page using any of the following error information returned by PayPal
-		            $ErrorCode = urldecode($resArray2["L_ERRORCODE0"]);
-		            $ErrorShortMsg = urldecode($resArray2["L_SHORTMESSAGE0"]);
-		            $ErrorLongMsg = urldecode($resArray2["L_LONGMESSAGE0"]);
-		            $ErrorSeverityCode = urldecode($resArray2["L_SEVERITYCODE0"]);
-		        }
-		    }
-		    else
-		    {
-		        dol_print_error('', 'Session expired');
-		    }
-		}
-		else
-		{
-		    dol_print_error('', '$PAYPALTOKEN not defined');
+					//Display a user friendly Error on the page using any of the following error information returned by PayPal
+					$ErrorCode = urldecode($resArray2["L_ERRORCODE0"]);
+					$ErrorShortMsg = urldecode($resArray2["L_SHORTMESSAGE0"]);
+					$ErrorLongMsg = urldecode($resArray2["L_LONGMESSAGE0"]);
+					$ErrorSeverityCode = urldecode($resArray2["L_SEVERITYCODE0"]);
+				}
+			} else {
+				dol_print_error('', 'Session expired');
+			}
+		} else {
+			dol_print_error('', '$PAYPALTOKEN not defined');
 		}
 	}
 }
@@ -419,9 +406,7 @@ if ($ispaymentok)
 						$errmsg = $object->error;
 						$postactionmessages[] = $errmsg;
 						$ispostactionok = -1;
-					}
-					else
-					{
+					} else {
 						$postactionmessages[] = 'Subscription created';
 						$ispostactionok = 1;
 					}
@@ -442,9 +427,7 @@ if ($ispaymentok)
 						$postactionmessages[] = $object->error;
 						$postactionmessages = array_merge($postactionmessages, $object->errors);
 						$ispostactionok = -1;
-					}
-					else
-					{
+					} else {
 						if ($option == 'bankviainvoice')
 						{
 							$postactionmessages[] = 'Invoice, payment and bank record created';
@@ -508,8 +491,7 @@ if ($ispaymentok)
 									$postactionmessages[] = $errmsg;
 									$ispostactionok = -1;
 								}
-							}
-							catch (Exception $e) {
+							} catch (Exception $e) {
 								$error++;
 								$errmsg = 'Failed to save customer stripe id in database ; '.$e->getMessage();
 								$postactionmessages[] = $errmsg;
@@ -522,9 +504,7 @@ if ($ispaymentok)
 				if (!$error)
 				{
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 				}
 
@@ -589,9 +569,7 @@ if ($ispaymentok)
 							$errmsg = $object->error;
 							$postactionmessages[] = $errmsg;
 							$ispostactionok = -1;
-						}
-						else
-						{
+						} else {
 							if ($file) $postactionmessages[] = 'Email sent to member (with invoice document attached)';
 							else $postactionmessages[] = 'Email sent to member (without any attached document)';
 
@@ -599,20 +577,15 @@ if ($ispaymentok)
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" or "payment type" to record the payment of subscription for member '.$tmptag['MEM'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
-		}
-		else
-		{
+		} else {
 			$postactionmessages[] = 'Member '.$tmptag['MEM'].' for subscription payed was not found';
 			$ispostactionok = -1;
 		}
-	}
-	elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0)
+	} elseif (array_key_exists('INV', $tmptag) && $tmptag['INV'] > 0)
 	{
 		// Record payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -647,9 +620,7 @@ if ($ispaymentok)
 				if ($currencyCodeType == $conf->currency)
 				{
 					$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
-				}
-				else
-				{
+				} else {
 					$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
 
 					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
@@ -657,7 +628,6 @@ if ($ispaymentok)
 					$error++; // Not yet supported
 				}
 				$paiement->paiementid   = $paymentTypeId;
-				$paiement->num_paiement = '';
 				$paiement->num_payment = '';
 				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
 				$paiement->ext_payment_id = $TRANSACTIONID;
@@ -671,9 +641,7 @@ if ($ispaymentok)
 						$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
 						$ispostactionok = -1;
 						$error++;
-					}
-					else
-					{
+					} else {
 						$postactionmessages[] = 'Payment created';
 						$ispostactionok = 1;
 					}
@@ -696,15 +664,11 @@ if ($ispaymentok)
 							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
 							$ispostactionok = -1;
 							$error++;
-						}
-						else
-						{
+						} else {
 							$postactionmessages[] = 'Bank transaction of payment created';
 							$ispostactionok = 1;
 						}
-					}
-					else
-					{
+					} else {
 						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 						$ispostactionok = -1;
 						$error++;
@@ -714,62 +678,54 @@ if ($ispaymentok)
 				if (!$error)
 				{
 					$db->commit();
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 				}
-			}
-			else
-			{
+			} else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
-		}
-		else
-		{
+		} else {
 			$postactionmessages[] = 'Invoice payed '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
-	}
-	else
-	{
+	} else {
 		// Nothing done
 	}
 }
 
 if ($ispaymentok)
 {
-    // Get on url call
-    $onlinetoken        = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
+	// Get on url call
+	$onlinetoken        = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN;
+	$payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
+	// Set by newpayment.php
+	$paymentType        = $_SESSION['PaymentType'];
+	$currencyCodeType   = $_SESSION['currencyCodeType'];
+	$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
 
-    if (is_object($object) && method_exists($object, 'call_trigger')) {
-	    // Call trigger
-	    $result = $object->call_trigger('PAYMENTONLINE_PAYMENT_OK', $user);
-	    if ($result < 0) $error++;
-	    // End call triggers
-    }
+	if (is_object($object) && method_exists($object, 'call_trigger')) {
+		// Call trigger
+		$result = $object->call_trigger('PAYMENTONLINE_PAYMENT_OK', $user);
+		if ($result < 0) $error++;
+		// End call triggers
+	}
 
-    print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
-    if ($TRANSACTIONID) print $langs->trans("ThisIsTransactionId", $TRANSACTIONID)."<br><br>\n";
+	print $langs->trans("YourPaymentHasBeenRecorded")."<br>\n";
+	if ($TRANSACTIONID) print $langs->trans("ThisIsTransactionId", $TRANSACTIONID)."<br><br>\n";
 
-    $key = 'ONLINE_PAYMENT_MESSAGE_OK';
-    if (!empty($conf->global->$key)) print $conf->global->$key;
+	$key = 'ONLINE_PAYMENT_MESSAGE_OK';
+	if (!empty($conf->global->$key)) print $conf->global->$key;
 
-    $sendemail = '';
-    if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
+	$sendemail = '';
+	if (!empty($conf->global->ONLINE_PAYMENT_SENDEMAIL)) $sendemail = $conf->global->ONLINE_PAYMENT_SENDEMAIL;
 
-    $tmptag = dolExplodeIntoArray($fulltag, '.', '=');
+	$tmptag = dolExplodeIntoArray($fulltag, '.', '=');
 
-    dol_syslog("Send email to admins if we have to (sendemail = ".$sendemail.")", LOG_DEBUG, 0, '_payment');
+	dol_syslog("Send email to admins if we have to (sendemail = ".$sendemail.")", LOG_DEBUG, 0, '_payment');
 
 	// Send an email to admins
-    if ($sendemail)
+	if ($sendemail)
 	{
 		$companylangs = new Translate('', $conf);
 		$companylangs->setDefaultLang($mysoc->default_lang);
@@ -786,14 +742,12 @@ if ($ispaymentok)
 		$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;
+			$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;
 
 		$urlback = $_SERVER["REQUEST_URI"];
 		$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived");
@@ -804,17 +758,14 @@ if ($ispaymentok)
 			$content .= '<strong>'.$companylangs->trans("PaymentSubscription")."</strong><br><br>\n";
 			$content .= $companylangs->trans("MemberId").': <strong>'.$tmptag['MEM']."</strong><br>\n";
 			$content .= $companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-		}
-		elseif (array_key_exists('INV', $tmptag))
+		} elseif (array_key_exists('INV', $tmptag))
 		{
 			$url = $urlwithroot."/compta/facture/card.php?id=".$tmptag['INV'];
 			$content .= '<strong>'.$companylangs->trans("Payment")."</strong><br><br>\n";
 			$content .= $companylangs->trans("InvoiceId").': <strong>'.$tmptag['INV']."</strong><br>\n";
 			//$content.=$companylangs->trans("ThirdPartyId").': '.$tmptag['CUS']."<br>\n";
 			$content .= $companylangs->trans("Link").': <a href="'.$url.'">'.$url.'</a>'."<br>\n";
-		}
-		else
-		{
+		} else {
 			$content .= $companylangs->transnoentitiesnoconv("NewOnlinePaymentReceived")."<br>\n";
 		}
 		$content .= $companylangs->transnoentities("PostActionAfterPayment").' : ';
@@ -822,13 +773,10 @@ if ($ispaymentok)
 		{
 			//$topic.=' ('.$companylangs->transnoentitiesnoconv("Status").' '.$companylangs->transnoentitiesnoconv("OK").')';
 			$content .= '<font color="green">'.$companylangs->transnoentitiesnoconv("OK").'</font>';
-		}
-		elseif ($ispostactionok == 0)
+		} elseif ($ispostactionok == 0)
 		{
 			$content .= $companylangs->transnoentitiesnoconv("None");
-		}
-		else
-		{
+		} else {
 			$topic .= ($ispostactionok ? '' : ' ('.$companylangs->trans("WarningPostActionErrorAfterPayment").')');
 			$content .= '<font color="red">'.$companylangs->transnoentitiesnoconv("Error").'</font>';
 		}
@@ -866,101 +814,93 @@ if ($ispaymentok)
 		{
 			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
 			//dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0);
-		}
-		else
-		{
+		} else {
 			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			//dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0);
 		}
 	}
-}
-else
-{
-    // Get on url call
+} else {
+	// Get on url call
 	$onlinetoken = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN;
-    $payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
-    // Set by newpayment.php
-    $paymentType        = $_SESSION['PaymentType'];
-    $currencyCodeType   = $_SESSION['currencyCodeType'];
-    $FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
+	$payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
+	// Set by newpayment.php
+	$paymentType        = $_SESSION['PaymentType'];
+	$currencyCodeType   = $_SESSION['currencyCodeType'];
+	$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
 
-    if (is_object($object) && method_exists($object, 'call_trigger')) {
-    	// Call trigger
-	    $result = $object->call_trigger('PAYMENTONLINE_PAYMENT_KO', $user);
-	    if ($result < 0) $error++;
-	    // End call triggers
-    }
+	if (is_object($object) && method_exists($object, 'call_trigger')) {
+		// Call trigger
+		$result = $object->call_trigger('PAYMENTONLINE_PAYMENT_KO', $user);
+		if ($result < 0) $error++;
+		// End call triggers
+	}
 
-    print $langs->trans('DoExpressCheckoutPaymentAPICallFailed')."<br>\n";
-    print $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
-    print $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
-    print $langs->trans('ErrorCode').": ".$ErrorCode."<br>\n";
-    print $langs->trans('ErrorSeverityCode').": ".$ErrorSeverityCode."<br>\n";
+	print $langs->trans('DoExpressCheckoutPaymentAPICallFailed')."<br>\n";
+	print $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
+	print $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
+	print $langs->trans('ErrorCode').": ".$ErrorCode."<br>\n";
+	print $langs->trans('ErrorSeverityCode').": ".$ErrorSeverityCode."<br>\n";
 
-    if ($mysoc->email) print "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
+	if ($mysoc->email) print "\nPlease, send a screenshot of this page to ".$mysoc->email."<br>\n";
 
-    $sendemail = '';
-    if (!empty($conf->global->PAYMENTONLINE_SENDEMAIL)) $sendemail = $conf->global->PAYMENTONLINE_SENDEMAIL;
-    // TODO Remove local option to keep only the generic one ?
-    if ($paymentmethod == 'paypal' && !empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail = $conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
-    elseif ($paymentmethod == 'paybox' && !empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail = $conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
-    elseif ($paymentmethod == 'stripe' && !empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail = $conf->global->STRIPE_PAYONLINE_SENDEMAIL;
+	$sendemail = '';
+	if (!empty($conf->global->PAYMENTONLINE_SENDEMAIL)) $sendemail = $conf->global->PAYMENTONLINE_SENDEMAIL;
+	// TODO Remove local option to keep only the generic one ?
+	if ($paymentmethod == 'paypal' && !empty($conf->global->PAYPAL_PAYONLINE_SENDEMAIL)) $sendemail = $conf->global->PAYPAL_PAYONLINE_SENDEMAIL;
+	elseif ($paymentmethod == 'paybox' && !empty($conf->global->PAYBOX_PAYONLINE_SENDEMAIL)) $sendemail = $conf->global->PAYBOX_PAYONLINE_SENDEMAIL;
+	elseif ($paymentmethod == 'stripe' && !empty($conf->global->STRIPE_PAYONLINE_SENDEMAIL)) $sendemail = $conf->global->STRIPE_PAYONLINE_SENDEMAIL;
 
-    // Send warning of error to administrator
-    if ($sendemail)
-    {
-    	$companylangs = new Translate('', $conf);
-    	$companylangs->setDefaultLang($mysoc->default_lang);
-    	$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
+	// Send warning of error to administrator
+	if ($sendemail)
+	{
+		$companylangs = new Translate('', $conf);
+		$companylangs->setDefaultLang($mysoc->default_lang);
+		$companylangs->loadLangs(array('main', 'members', 'bills', 'paypal', 'paybox'));
 
-    	$sendto = $sendemail;
-        $from = $conf->global->MAILING_EMAIL_FROM;
-        // 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
+		$sendto = $sendemail;
+		$from = $conf->global->MAILING_EMAIL_FROM;
+		// 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 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;
+		// 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;
 
-        $urlback = $_SERVER["REQUEST_URI"];
-        $topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("ValidationOfPaymentFailed");
-        $content = "";
-        $content .= '<font color="orange">'.$companylangs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."</font>\n";
+		$urlback = $_SERVER["REQUEST_URI"];
+		$topic = '['.$appli.'] '.$companylangs->transnoentitiesnoconv("ValidationOfPaymentFailed");
+		$content = "";
+		$content .= '<font color="orange">'.$companylangs->transnoentitiesnoconv("PaymentSystemConfirmPaymentPageWasCalledButFailed")."</font>\n";
 
-        $content .= "<br><br>\n";
-        $content .= '<u>'.$companylangs->transnoentitiesnoconv("TechnicalInformation").":</u><br>\n";
-        $content .= $companylangs->transnoentitiesnoconv("OnlinePaymentSystem").': <strong>'.$paymentmethod."</strong><br>\n";
-        $content .= $companylangs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
-        $content .= "<br>\n";
-        $content .= "tag=".$fulltag."<br>\ntoken=".$onlinetoken."<br>\npaymentType=".$paymentType."<br>\ncurrencycodeType=".$currencyCodeType."<br>\npayerId=".$payerID."<br>\nipaddress=".$ipaddress."<br>\nFinalPaymentAmt=".$FinalPaymentAmt."<br>\n";
+		$content .= "<br><br>\n";
+		$content .= '<u>'.$companylangs->transnoentitiesnoconv("TechnicalInformation").":</u><br>\n";
+		$content .= $companylangs->transnoentitiesnoconv("OnlinePaymentSystem").': <strong>'.$paymentmethod."</strong><br>\n";
+		$content .= $companylangs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n";
+		$content .= "<br>\n";
+		$content .= "tag=".$fulltag."<br>\ntoken=".$onlinetoken."<br>\npaymentType=".$paymentType."<br>\ncurrencycodeType=".$currencyCodeType."<br>\npayerId=".$payerID."<br>\nipaddress=".$ipaddress."<br>\nFinalPaymentAmt=".$FinalPaymentAmt."<br>\n";
 
 
-        $ishtml = dol_textishtml($content); // May contain urls
+		$ishtml = dol_textishtml($content); // May contain urls
 
-        require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-        $mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
+		require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($topic, $sendto, $from, $content, array(), array(), array(), '', '', 0, $ishtml);
 
-        $result = $mailfile->sendfile();
-        if ($result)
-        {
-            dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
-        }
-        else
-        {
-            dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
-        }
-    }
+		$result = $mailfile->sendfile();
+		if ($result)
+		{
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+		} else {
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+		}
+	}
 }
 
 
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
new file mode 100644
index 00000000000..0797ff20735
--- /dev/null
+++ b/htdocs/public/recruitment/index.php
@@ -0,0 +1,457 @@
+<?php
+/*  Copyright (C) 2013-2016    Jean-François FERRY    <jfefe@aternatik.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/public/recruitment/index.php
+ *       \ingroup    recruitment
+ *       \brief      Public file to list jobs
+ */
+
+if (!defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK', '1');
+}
+// Do not check anti CSRF attack test
+if (!defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU', '1');
+}
+// If there is no need to load and show top and left menu
+if (!defined("NOLOGIN")) {
+    define("NOLOGIN", '1');
+}
+// If this page is public (can be called outside logged session)
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("companies", "other", "recruitment"));
+
+// Get parameters
+$action = GETPOST('action', 'aZ09');
+$email = GETPOST('email', 'alpha');
+
+$object = new RecruitmentJobPosition($db);
+
+
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$user_assign = new User($db);
+$user_create = new User($db);
+
+if (!$conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE) {
+	print '<div class="error">'.$langs->trans('PublicInterfaceForbidden').'</div>';
+	$db->close();
+	exit();
+}
+
+$arrayofjs = array();
+$arrayofcss = array();
+
+llxHeaderTicket($langs->trans("Jobs"), "", 0, 0, $arrayofjs, $arrayofcss);
+
+
+print '<div class="ticketpublicarealist">';
+
+$display_ticket_list = 1;
+
+print '<br>';
+if ($display_ticket_list) {
+	// Filters
+	$search_fk_status = GETPOST("search_fk_status", 'alpha');
+	$search_subject = GETPOST("search_subject", 'alpha');
+	$search_type = GETPOST("search_type", 'alpha');
+	$search_category = GETPOST("search_category", 'alpha');
+	$search_severity = GETPOST("search_severity", 'alpha');
+	$search_fk_user_create = GETPOST("search_fk_user_create", 'int');
+	$search_fk_user_assign = GETPOST("search_fk_user_assign", 'int');
+
+	// Store current page url
+	$url_page_current = dol_buildpath('/public/ticket/list.php', 1);
+
+	// Do we click on purge search criteria ?
+	if (GETPOST("button_removefilter_x")) {
+		$search_fk_status = '';
+		$search_subject = '';
+		$search_type = '';
+		$search_category = '';
+		$search_severity = '';
+		$search_fk_user_create = '';
+		$search_fk_user_assign = '';
+	}
+
+	// fetch optionals attributes and labels
+	$extrafields = new ExtraFields($db);
+	$extrafields->fetch_name_optionals_label($object->table_element);
+
+	$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+	$filter = array();
+	$param = 'action=viewlist';
+
+	// Definition of fields for list
+	$arrayfields = array(
+		't.datec' => array('label' => $langs->trans("Date"), 'checked' => 1),
+		't.date_read' => array('label' => $langs->trans("TicketReadOn"), 'checked' => 0),
+		't.date_close' => array('label' => $langs->trans("TicketCloseOn"), 'checked' => 0),
+		't.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
+		//'t.track_id' => array('label' => $langs->trans("IDTracking"), 'checked' => 0),
+		't.fk_statut' => array('label' => $langs->trans("Status"), 'checked' => 1),
+		't.subject' => array('label' => $langs->trans("Subject"), 'checked' => 1),
+		'type.code' => array('label' => $langs->trans("Type"), 'checked' => 1),
+		'category.code' => array('label' => $langs->trans("Category"), 'checked' => 1),
+		'severity.code' => array('label' => $langs->trans("Severity"), 'checked' => 1),
+		't.progress' => array('label' => $langs->trans("Progression"), 'checked' => 0),
+		//'t.fk_contract' => array('label' => $langs->trans("Contract"), 'checked' => 0),
+		't.fk_user_create' => array('label' => $langs->trans("Author"), 'checked' => 1),
+		't.fk_user_assign' => array('label' => $langs->trans("AssignedTo"), 'checked' => 0),
+
+		//'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+		//'t.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
+		//'t.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 2)
+	//'t.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'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
+				$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]);
+			}
+		}
+	}
+	if (!empty($search_subject)) {
+		$filter['t.subject'] = $search_subject;
+		$param .= '&search_subject='.urlencode($search_subject);
+	}
+	if (!empty($search_type)) {
+		$filter['t.type_code'] = $search_type;
+		$param .= '&search_type='.urlencode($search_type);
+	}
+	if (!empty($search_category)) {
+		$filter['t.category_code'] = $search_category;
+		$param .= '&search_category='.urlencode($search_category);
+	}
+	if (!empty($search_severity)) {
+		$filter['t.severity_code'] = $search_severity;
+		$param .= '&search_severity='.urlencode($search_severity);
+	}
+	if (!empty($search_fk_user_assign)) {
+		// -1 value = all so no filter
+		if ($search_fk_user_assign > 0) {
+			$filter['t.fk_user_assign'] = $search_fk_user_assign;
+			$param .= '&search_fk_user_assign='.urlencode($search_fk_user_assign);
+		}
+	}
+	if (!empty($search_fk_user_create)) {
+		// -1 value = all so no filter
+		if ($search_fk_user_create > 0) {
+			$filter['t.fk_user_create'] = $search_fk_user_create;
+			$param .= '&search_fk_user_create='.urlencode($search_fk_user_create);
+		}
+	}
+	if ((isset($search_fk_status) && $search_fk_status != '') && $search_fk_status != '-1' && $search_fk_status != 'non_closed') {
+		$filter['t.fk_statut'] = $search_fk_status;
+		$param .= '&search_fk_status='.urlencode($search_fk_status);
+	}
+	if (isset($search_fk_status) && $search_fk_status == 'non_closed') {
+		$filter['t.fk_statut'] = array(0, 1, 3, 4, 5, 6);
+		$param .= '&search_fk_status=non_closed';
+	}
+
+	require DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	$sortfield = GETPOST("sortfield", 'alpha');
+	$sortorder = GETPOST("sortorder", 'alpha');
+
+	if (!$sortfield) {
+		$sortfield = 't.datec';
+	}
+	if (!$sortorder) {
+		$sortorder = 'DESC';
+	}
+
+	$limit = $conf->liste_limit;
+
+	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+	$offset = $limit * $page;
+	$pageprev = $page - 1;
+	$pagenext = $page + 1;
+
+	// Request SQL
+	$sql = "SELECT DISTINCT";
+	$sql .= " t.rowid,";
+	$sql .= " t.ref,";
+	$sql .= " t.track_id,";
+	$sql .= " t.fk_soc,";
+	$sql .= " t.fk_project,";
+	$sql .= " t.origin_email,";
+	$sql .= " t.fk_user_create, uc.lastname as user_create_lastname, uc.firstname as user_create_firstname,";
+	$sql .= " t.fk_user_assign, ua.lastname as user_assign_lastname, ua.firstname as user_assign_firstname,";
+	$sql .= " t.subject,";
+	$sql .= " t.message,";
+	$sql .= " t.fk_statut,";
+	$sql .= " t.resolution,";
+	$sql .= " t.progress,";
+	$sql .= " t.timing,";
+	$sql .= " t.type_code,";
+	$sql .= " t.category_code,";
+	$sql .= " t.severity_code,";
+	$sql .= " t.datec,";
+	$sql .= " t.date_read,";
+	$sql .= " t.date_close,";
+	$sql .= " t.tms,";
+	$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
+	// Add fields for extrafields
+	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+	}
+	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as t";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid=t.fk_soc";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as uc ON uc.rowid=t.fk_user_create";
+	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition_extrafields as ef on (t.rowid = ef.fk_object)";
+	}
+	$sql .= " WHERE t.entity IN (".getEntity('recruitmentjobposition').")";
+	// Manage filter
+	if (!empty($filter)) {
+		foreach ($filter as $key => $value) {
+			if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
+				$sql .= ' AND '.$key.' = \''.$value.'\'';
+			} elseif ($key == 't.fk_statut') {
+				if (is_array($value) && count($value) > 0) {
+					$sql .= 'AND '.$key.' IN ('.implode(',', $value).')';
+				} else {
+					$sql .= ' AND '.$key.' = '.$db->escape($value);
+				}
+			} else {
+				$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+			}
+		}
+	}
+	$sql .= " ORDER BY ".$sortfield.' '.$sortorder;
+
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num_total = $db->num_rows($resql);
+		if (!empty($limit)) {
+			$sql .= ' '.$db->plimit($limit + 1, $offset);
+		}
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
+			print_barre_liste($langs->trans('JobList'), $page, 'public/recruitment/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
+
+			// Search bar
+			print '<form method="get" action="'.$url_form.'" id="searchFormList" >'."\n";
+			print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+			print '<input type="hidden" name="action" value="viewlist">';
+			print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+			print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+			$varpage = empty($contextpage) ? $url_page_current : $contextpage;
+			$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+
+			print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
+
+			// Filter bar
+			print '<tr class="liste_titre">';
+
+			if (!empty($arrayfields['t.datec']['checked'])) {
+				print '<td class="liste_titre"></td>';
+			}
+
+			if (!empty($arrayfields['t.ref']['checked'])) {
+				print '<td class="liste_titre"></td>';
+			}
+
+			if (!empty($arrayfields['t.fk_user_create']['checked'])) {
+				print '<td class="liste_titre"></td>';
+			}
+
+			if (!empty($arrayfields['t.tms']['checked'])) {
+				print '<td class="liste_titre"></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, $object); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+
+			// Status
+			if (!empty($arrayfields['t.fk_statut']['checked'])) {
+				print '<td class="liste_titre">';
+				$selected = ($search_fk_status != "non_closed" ? $search_fk_status : '');
+				//$object->printSelectStatus($selected);
+				print '</td>';
+			}
+
+			// Action column
+			print '<td class="liste_titre maxwidthsearch">';
+			$searchpicto = $form->showFilterButtons();
+			print $searchpicto;
+			print '</td>';
+			print '</tr>';
+
+			// Field title
+			print '<tr class="liste_titre">';
+			if (!empty($arrayfields['t.datec']['checked'])) {
+				print_liste_field_titre($arrayfields['t.datec']['label'], $url_page_current, 't.datec', '', $param, '', $sortfield, $sortorder);
+			}
+			if (!empty($arrayfields['t.ref']['checked'])) {
+				print_liste_field_titre($arrayfields['t.ref']['label'], $url_page_current, 't.ref', '', $param, '', $sortfield, $sortorder);
+			}
+			if (!empty($arrayfields['t.fk_user_create']['checked'])) {
+				print_liste_field_titre($arrayfields['t.fk_user_create']['label'], $url_page_current, 't.fk_user_create', '', $param, '', $sortfield, $sortorder);
+			}
+			if (!empty($arrayfields['t.tms']['checked'])) {
+				print_liste_field_titre($arrayfields['t.tms']['label'], $url_page_current, 't.tms', '', $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, $object); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+
+			if (!empty($arrayfields['t.fk_statut']['checked'])) {
+				print_liste_field_titre($arrayfields['t.fk_statut']['label'], $url_page_current, 't.fk_statut', '', $param, '', $sortfield, $sortorder);
+			}
+			print_liste_field_titre($selectedfields, $url_page_current, "", '', '', 'align="right"', $sortfield, $sortorder, 'center maxwidthsearch ');
+			print '</tr>';
+
+			while ($obj = $db->fetch_object($resql))
+			{
+				print '<tr class="oddeven">';
+
+				// Date ticket
+				if (!empty($arrayfields['t.datec']['checked'])) {
+					print '<td>';
+					print dol_print_date($db->jdate($obj->datec), 'dayhour');
+					print '</td>';
+				}
+
+				// Ref
+				if (!empty($arrayfields['t.ref']['checked'])) {
+					print '<td class="nowraponall">';
+					print $obj->ref;
+					print '</td>';
+				}
+
+				// Message author
+				if (!empty($arrayfields['t.fk_user_create']['checked'])) {
+					print '<td>';
+					if ($obj->fk_user_create > 0) {
+						$user_create->firstname = (!empty($obj->user_create_firstname) ? $obj->user_create_firstname : '');
+						$user_create->name = (!empty($obj->user_create_lastname) ? $obj->user_create_lastname : '');
+						$user_create->id = (!empty($obj->fk_user_create) ? $obj->fk_user_create : '');
+						print $user_create->getFullName($langs);
+					} else {
+						print $langs->trans('Email');
+					}
+					print '</td>';
+				}
+
+				if (!empty($arrayfields['t.tms']['checked'])) {
+					print '<td>'.dol_print_date($db->jdate($obj->tms), 'dayhour').'</td>';
+				}
+
+				// Extra fields
+				if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+					foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+						if (!empty($arrayfields["ef.".$key]['checked'])) {
+							print '<td';
+							$align = $extrafields->getAlignFlag($key);
+							if ($align) {
+								print ' align="'.$align.'"';
+							}
+							print '>';
+							$tmpkey = 'options_'.$key;
+							print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+							print '</td>';
+						}
+					}
+				}
+
+				// Statut
+				if (!empty($arrayfields['t.fk_statut']['checked'])) {
+					print '<td class="nowraponall">';
+					$object->fk_statut = $obj->fk_statut;
+					print $object->getLibStatut(2);
+					print '</td>';
+				}
+
+				print '<td></td>';
+
+				$i++;
+				print '</tr>';
+			}
+
+			print '</table>';
+			print '</form>';
+
+			print '<form method="post" id="form_view" name="form_view" enctype="multipart/form-data" action="'.dol_buildpath('/public/recruitment/view.php', 1).'" style="display:none;">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="view">';
+			print '<input type="hidden" name="btn_view_list" value="1">';
+			print '<input type="hidden" name="track_id" value="">';
+			print '<input type="hidden" name="email" value="">';
+			print "</form>";
+			print '<script type="text/javascript">
+                    function viewticket(ticket_id, email) {
+                        var form = $("#form_view");
+                        form.submit();
+                    }
+                </script>';
+		}
+	}
+} else {
+	print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?ref='.$object->ref.'">'.$langs->trans('Back').'</a></div>';
+}
+
+
+print "</div>";
+
+// End of page
+htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix, $object);
+
+llxFooter('', 'public');
+
+$db->close();
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
new file mode 100644
index 00000000000..94f85f911aa
--- /dev/null
+++ b/htdocs/public/recruitment/view.php
@@ -0,0 +1,328 @@
+<?php
+/* Copyright (C) 2020       Laurent Destailleur     <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/public/recruitment/view.php
+ *       \ingroup    recruitment
+ *       \brief      Public file to show on job
+ */
+
+if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("companies", "other", "recruitment"));
+
+// Get parameters
+$action   = GETPOST('action', 'aZ09');
+$cancel   = GETPOST('cancel', 'alpha');
+$email    = GETPOST('email', 'alpha');
+$backtopage = '';
+
+$ref = GETPOST('ref', 'alpha');
+
+if (GETPOST('btn_view')) {
+	unset($_SESSION['email_customer']);
+}
+if (isset($_SESSION['email_customer'])) {
+	$email = $_SESSION['email_customer'];
+}
+
+$object = new RecruitmentJobPosition($db);
+
+if (!$action)
+{
+	if (!$ref)
+	{
+		print $langs->trans('ErrorBadParameters')." - ref missing";
+		exit;
+	} else {
+		$object->fetch('', $ref);
+	}
+}
+
+// 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. For Paypal payment, we can use internal URL like localhost.
+
+
+/*
+ * Actions
+ */
+
+if ($cancel)
+{
+	if (!empty($backtopage))
+	{
+		header("Location: ".$backtopage);
+		exit;
+	}
+	$action = 'view';
+}
+
+if ($action == "view" || $action == "presend" || $action == "close" || $action == "confirm_public_close" || $action == "add_message") {
+	$error = 0;
+	$display_ticket = false;
+	if (!strlen($ref)) {
+		$error++;
+		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")));
+		$action = '';
+	}
+	if (!strlen($email)) {
+		$error++;
+		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Email")));
+		$action = '';
+	} else {
+		if (!isValidEmail($email)) {
+			$error++;
+			array_push($object->errors, $langs->trans("ErrorEmailInvalid"));
+			$action = '';
+		}
+	}
+
+	if (!$error) {
+		$ret = $object->fetch('', $ref);
+	}
+
+	/*
+	if (!$error && $action == "add_message" && $display_ticket && GETPOSTISSET('btn_add_message'))
+	{
+		// TODO Add message...
+		$ret = $object->dao->newMessage($user, $action, 0, 1);
+
+
+
+
+		if (!$error)
+		{
+			$action = 'view';
+		}
+	}
+	*/
+
+	if ($error || $errors) {
+		setEventMessages($object->error, $object->errors, 'errors');
+		if ($action == "add_message")
+		{
+			$action = 'presend';
+		} else {
+			$action = '';
+		}
+	}
+}
+//var_dump($action);
+//$object->doActions($action);
+
+// Actions to send emails (for ticket, we need to manage the addfile and removefile only)
+$triggersendname = 'CANDIDATURE_SENTBYMAIL';
+$paramname = 'id';
+$autocopy = 'MAIN_MAIL_AUTOCOPY_CANDIDATURE_TO'; // used to know the automatic BCC to add
+$trackid = 'can'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$head = '';
+if (!empty($conf->global->MAIN_RECRUITMENT_CSS_URL)) $head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MAIN_RECRUITMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
+
+if (!$conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE) {
+	print '<div class="error">'.$langs->trans('PublicInterfaceForbidden').'</div>';
+	$db->close();
+	exit();
+}
+
+$arrayofjs = array();
+$arrayofcss = array();
+
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+print '<input type="hidden" name="action" value="dosign">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.GETPOST("suffix", 'alpha').'">'."\n";
+print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print "\n";
+print '<!-- Form to sign -->'."\n";
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Show logo (search order: logo defined by ONLINE_SIGN_LOGO_suffix, then ONLINE_SIGN_LOGO_, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_RECRUITMENT_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) $logosmall = $conf->global->$paramlogo;
+elseif (!empty($conf->global->ONLINE_RECRUITMENT_LOGO)) $logosmall = $conf->global->ONLINE_RECRUITMENT_LOGO_;
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall))
+{
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo))
+{
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+}
+// 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>';
+}
+
+// Output introduction text
+$text = '';
+if (!empty($conf->global->RECRUITMENT_NEWFORM_TEXT))
+{
+	$langs->load("recruitment");
+	if (preg_match('/^\((.*)\)$/', $conf->global->RECRUITMENT_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."<br>\n";
+	else $text .= $conf->global->RECRUITMENT_NEWFORM_TEXT."<br>\n";
+	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text))
+{
+	$text .= '<tr><td class="textpublicpayment"><br>'.$langs->trans("JobOfferToBeFilled", $mysoc->name);
+	$text .= ' &nbsp; - &nbsp; <strong>'.$mysoc->name.'</strong>';
+	$text .= ' &nbsp; - &nbsp; <span class="fa fa-calendar secondary"></span> '.dol_print_date($object->date_creation);
+	$text .= '</td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment"><h1>'.$object->label.'</h1><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td class="left">';
+
+print '<div with="100%" id="tablepublicpayment">';
+print '<div class="opacitymedium">'.$langs->trans("ThisIsInformationOnJobPosition").' :</div>'."\n";
+
+$error = 0;
+$found = true;
+
+print '<br>';
+
+// Label
+print $langs->trans("Label").' : ';
+print '<b>'.dol_escape_htmltag($object->label).'</b><br>';
+
+// Date
+print  $langs->trans("DateExpected").' : ';
+print '<b>';
+if ($object->date_planned > $now) {
+	print dol_print_date($object->date_planned, 'day');
+} else {
+	print $langs->trans("ASAP");
+}
+print '</b><br>';
+
+// Remuneration
+print  $langs->trans("Remuneration").' : ';
+print '<b>';
+print dol_escape_htmltag($object->remuneration_suggested);
+print '</b><br>';
+
+// Contact
+$tmpuser = new User($db);
+$tmpuser->fetch($object->fk_user_recruiter);
+
+print  $langs->trans("ContactForRecruitment").' : ';
+$emailforcontact = $object->email_recruiter;
+if (empty($emailforcontact)) {
+	$emailforcontact = $tmpuser->email;
+	if (empty($emailforcontact)) {
+		$emailforcontact = $mysoc->email;
+	}
+}
+print '<b>';
+print $tmpuser->getFullName(-1);
+print ' - '.dol_print_email($emailforcontact, 0, 0, 1, 0, 0, 1);
+print '</b>';
+print '</b><br>';
+
+if ($object->status == RecruitmentJobPosition::STATUS_RECRUITED) {
+	print info_admin($langs->trans("JobClosedTextCandidateFound"), 0, 0, 0, 'warning');
+}
+if ($object->status == RecruitmentJobPosition::STATUS_CANCELED) {
+	print info_admin($langs->trans("JobClosedTextCanceled"), 0, 0, 0, 'warning');
+}
+
+print '<br>';
+
+// Description
+
+$text = $object->description;
+print $text;
+print '<input type="hidden" name="ref" value="'.$object->ref.'">';
+
+print '</div>'."\n";
+print "\n";
+
+
+if ($action != 'dosubmit')
+{
+	if ($found && !$error)	// We are in a management option and no error
+	{
+	} else {
+		dol_print_error_email('ERRORNEWONLINESIGN');
+	}
+} else {
+	// Print
+}
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+htmlPrintOnlinePaymentFooter($mysoc, $langs);
+
+llxFooter('', 'public');
+
+$db->close();
diff --git a/htdocs/public/stripe/confirm_payment.php b/htdocs/public/stripe/confirm_payment.php
index 9a45a2cbeec..683a537fe69 100644
--- a/htdocs/public/stripe/confirm_payment.php
+++ b/htdocs/public/stripe/confirm_payment.php
@@ -48,23 +48,18 @@ if (isset($_GET['connect']))
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else
-	{
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
         $servicestatus = 1;
 	}
-}
-else {
+} else {
 	if (isset($_GET['test']))
 	{
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else
-	{
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
 		$service = 'StripeLive';
 		$servicestatus = 1;
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 16160e94200..cc4d07b0a4b 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -48,23 +48,18 @@ if (isset($_GET['connect']))
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else
-	{
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_CONNECT_KEY;
 		$service = 'StripeLive';
         $servicestatus = 1;
 	}
-}
-else {
+} else {
 	if (isset($_GET['test']))
 	{
 		$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
 		$service = 'StripeTest';
 		$servicestatus = 0;
-	}
-	else
-	{
+	} else {
 		$endpoint_secret = $conf->global->STRIPE_LIVE_WEBHOOK_KEY;
 		$service = 'StripeLive';
 		$servicestatus = 1;
@@ -91,8 +86,7 @@ $error = 0;
 
 try {
 	$event = \Stripe\Webhook::constructEvent($payload, $sig_header, $endpoint_secret);
-}
-catch (\UnexpectedValueException $e) {
+} catch (\UnexpectedValueException $e) {
 	// Invalid payload
 	http_response_code(400); // PHP 5.4 or greater
 	exit();
@@ -125,12 +119,10 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->stripeconnect->enabled
 		{
 			$obj = $db->fetch_object($result);
 			$key = $obj->entity;
-		}
-		else {
+		} else {
 			$key = 1;
 		}
-	}
-	else {
+	} else {
 		$key = 1;
 	}
 	$ret = $mc->switchEntity($key);
@@ -186,15 +178,12 @@ if ($event->type == 'payout.created') {
 
         http_response_code(200); // PHP 5.4 or greater
         return 1;
-	}
-	else
-	{
+	} else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
 		return -1;
 	}
-}
-elseif ($event->type == 'payout.paid') {
+} elseif ($event->type == 'payout.paid') {
 	global $conf;
 	$error = 0;
 	$result = dolibarr_set_const($db, $service."_NEXTPAYOUT", null, 'chaine', 0, '', $conf->entity);
@@ -267,42 +256,32 @@ elseif ($event->type == 'payout.paid') {
 
 		http_response_code(200); // PHP 5.4 or greater
 		return 1;
-	}
-	else
-	{
+	} else {
 		$error++;
 		http_response_code(500); // PHP 5.4 or greater
 		return -1;
 	}
-}
-elseif ($event->type == 'customer.source.created') {
+} elseif ($event->type == 'customer.source.created') {
 	//TODO: save customer's source
-}
-elseif ($event->type == 'customer.source.updated') {
+} elseif ($event->type == 'customer.source.updated') {
 	//TODO: update customer's source
-}
-elseif ($event->type == 'customer.source.delete') {
+} elseif ($event->type == 'customer.source.delete') {
 	//TODO: delete customer's source
-}
-elseif ($event->type == 'customer.deleted') {
+} 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();
-}
-elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
+} 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') {
+} elseif ($event->type == 'payment_intent.payment_failed') {
     // 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).
+} 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
 	// TODO: Redirect to paymentok.php
-}
-elseif ($event->type == 'payment_method.attached') {
+} elseif ($event->type == 'payment_method.attached') {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 	$societeaccount = new SocieteAccount($db);
@@ -341,14 +320,11 @@ elseif ($event->type == 'payment_method.attached') {
 		if (!$error)
 		{
 			$db->commit();
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 		}
 	}
-}
-elseif ($event->type == 'payment_method.updated') {
+} elseif ($event->type == 'payment_method.updated') {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
 	$companypaymentmode = new CompanyPaymentMode($db);
 	$companypaymentmode->fetch(0, '', 0, '', " AND stripe_card_ref = '".$db->escape($event->data->object->id)."'");
@@ -378,26 +354,20 @@ elseif ($event->type == 'payment_method.updated') {
 	if (!$error)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 		$db->rollback();
 	}
-}
-elseif ($event->type == 'payment_method.detached') {
+} elseif ($event->type == 'payment_method.detached') {
 	$db->begin();
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib WHERE ref = '".$db->escape($event->data->object->id)."' and status = ".$servicestatus;
 	$db->query($sql);
 	$db->commit();
-}
-elseif ($event->type == 'charge.succeeded') {
+} elseif ($event->type == 'charge.succeeded') {
     // TODO: create fees
     // TODO: Redirect to paymentok.php
-}
-elseif ($event->type == 'charge.failed') {
+} elseif ($event->type == 'charge.failed') {
     // 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)) {
+} 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/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index c326b4a6bd2..ffa4b24fc59 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -45,9 +45,7 @@ if (empty($usedolheader))
 
 
 	<?php
-}
-else
-{
+} else {
 	$arraycss = array();
 	$arrayjs = array();
 	/*
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 29ec7983930..ed26c881fd7 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -47,7 +47,7 @@ $langs->loadLangs(array('companies', 'other', 'mails', 'ticket'));
 $id = GETPOST('id', 'int');
 $msg_id = GETPOST('msg_id', 'int');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $object = new Ticket($db);
 $extrafields = new ExtraFields($db);
@@ -114,11 +114,11 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 		}
 	}
 
-	if (!GETPOST("subject", "none")) {
+	if (!GETPOST("subject", "restricthtml")) {
 		$error++;
 		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
 		$action = '';
-	} elseif (!GETPOST("message", "none")) {
+	} elseif (!GETPOST("message", "restricthtml")) {
 		$error++;
 		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("message")));
 		$action = '';
@@ -136,8 +136,8 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 
 		$object->track_id = generate_random_id(16);
 
-		$object->subject = GETPOST("subject", "none");
-		$object->message = GETPOST("message", "none");
+		$object->subject = GETPOST("subject", "restricthtml");
+		$object->message = GETPOST("message", "restricthtml");
 		$object->origin_email = $origin_email;
 
 		$object->type_code = GETPOST("type_code", 'aZ09');
@@ -208,14 +208,14 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 				// Send email to customer
 
 				$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubject', $object->ref, $object->track_id);
-				$message .= ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody'))."\n\n";
-				$message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket')."\n";
+				$message  = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'<br><br>';
+				$message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'<br>';
 
 				$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-				$infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'">'.$object->track_id.'</a>')."\n";
-				$infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl')."\n\n";
+				$infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="'.$url_public_ticket.'">'.$object->track_id.'</a>').'<br>';
+				$infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl').'<br><br>';
 
-				$message .= dol_nl2br($infos_new_ticket);
+				$message .= $infos_new_ticket;
 				$message .= $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE ? $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE : $langs->transnoentities('TicketMessageMailSignatureText');
 
 				$sendto = GETPOST('email', 'alpha');
@@ -225,14 +225,12 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 				$sendtocc = '';
 				$deliveryreceipt = 0;
 
-				$message = dol_nl2br($message);
-
 				if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 					$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 					$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 				}
 				include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-				$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+				$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
 				if ($mailfile->error || $mailfile->errors) {
 					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				} else {
@@ -247,34 +245,21 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 				if ($sendto)
 				{
 					$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin', $object->ref, $object->track_id);
-					$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
+					$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'<br><br>';
 					$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
 					$message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
 					$message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
 					$message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
 					$message_admin .= '<li>'.$langs->trans('From').' : '.$object->origin_email.'</li>';
-
-					if (is_array($extrafields->attributes[$object->table_element]['label']))
-					{
-						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-						{
-							$enabled = 1;
-							if ($qualified && isset($extrafields->attributes[$object->table_element]['list'][$key]))
-							{
-								$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);
-							}
-							$perms = 1;
-							if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$key]))
-							{
-								$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$key], 1);
-							}
-
-							$qualified = true;
-							if (empty($enabled) || $enabled == 2) $qualified = false;
-							if (empty($perms)) $qualified = false;
-							if ($qualified) $message_admin .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
+					// Extrafields
+					$extrafields->fetch_name_optionals_label($object->table_element);
+					if (is_array($object->array_options) && count($object->array_options) > 0) {
+						foreach ($object->array_options as $key => $value) {
+							$key = substr($key, 8); // remove "options_"
+							$message_admin .= '<li>'.$langs->trans($extrafields->attributes[$object->element]['label'][$key]).' : '.$extrafields->showOutputField($key, $value).'</li>';
 						}
 					}
+					$message_admin .= '</ul>';
 
 					$message_admin .= '</ul>';
 					$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
@@ -283,14 +268,12 @@ if ($action == 'create_ticket' && GETPOST('add', 'alpha')) {
 					$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 					$replyto = $from;
 
-					$message_admin = dol_nl2br($message_admin);
-
 					if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 						$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 						$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 					}
 					include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-					$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1);
+					$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', 'tic'.$object->id, '', 'ticket');
 					if ($mailfile->error || $mailfile->errors) {
 						setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 					} else {
@@ -370,8 +353,7 @@ if ($action != "infos_success") {
 		print $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketEmailNotificationFrom")).'<br>';
 		print $langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentities("Ticket"));
 		print '<div>';
-	}
-	else {
+	} else {
 		print '<div class="info marginleftonly marginrightonly">'.$langs->trans('TicketPublicInfoCreateTicket').'</div>';
 		$formticket->showForm();
 	}
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index d150d4c2f41..be7c44580cd 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -46,7 +46,7 @@ $langs->loadLangs(array('companies', 'other', 'ticket', 'errors'));
 
 // Get parameters
 $track_id = GETPOST('track_id', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 7d794e99a74..a64c551bba3 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -18,19 +18,19 @@
 /**
  *       \file       htdocs/public/ticket/list.php
  *       \ingroup    ticket
- *       \brief      Public file to add and manage ticket
+ *       \brief      Public file to list tickets
  */
 
 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 this page is public (can be called outside logged session)
 
@@ -52,14 +52,14 @@ $action = GETPOST('action', 'aZ09');
 $email = GETPOST('email', 'alpha');
 
 if (GETPOST('btn_view_ticket_list')) {
-    unset($_SESSION['track_id_customer']);
-    unset($_SESSION['email_customer']);
+	unset($_SESSION['track_id_customer']);
+	unset($_SESSION['email_customer']);
 }
 if (isset($_SESSION['track_id_customer'])) {
-    $track_id = $_SESSION['track_id_customer'];
+	$track_id = $_SESSION['track_id_customer'];
 }
 if (isset($_SESSION['email_customer'])) {
-    $email = $_SESSION['email_customer'];
+	$email = $_SESSION['email_customer'];
 }
 
 $object = new Ticket($db);
@@ -72,77 +72,77 @@ $object = new Ticket($db);
  */
 
 if ($action == "view_ticketlist") {
-    $error = 0;
-    $display_ticket_list = false;
-    if (!strlen($track_id)) {
-        $error++;
-        array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketTrackId")));
-        $action = '';
-    }
+	$error = 0;
+	$display_ticket_list = false;
+	if (!strlen($track_id)) {
+		$error++;
+		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketTrackId")));
+		$action = '';
+	}
 
-    if (!strlen($email)) {
-        $error++;
-        array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Email")));
-        $action = '';
-    } else {
-        if (!isValidEmail($email)) {
-            $error++;
-            array_push($object->errors, $langs->trans("ErrorEmailOrTrackingInvalid"));
-            $action = '';
-        }
-    }
+	if (!strlen($email)) {
+		$error++;
+		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Email")));
+		$action = '';
+	} else {
+		if (!isValidEmail($email)) {
+			$error++;
+			array_push($object->errors, $langs->trans("ErrorEmailOrTrackingInvalid"));
+			$action = '';
+		}
+	}
 
-    if (!$error) {
-    	$ret = $object->fetch('', '', $track_id);
+	if (!$error) {
+		$ret = $object->fetch('', '', $track_id);
 
-        if ($ret && $object->id > 0) {
-        	// vérifie si l'adresse email est bien dans les contacts du ticket
-            $contacts = $object->liste_contact(-1, 'external');
-            foreach ($contacts as $contact) {
-                if ($contact['email'] == $email) {
-                    $display_ticket_list = true;
-                    $_SESSION['email_customer'] = $email;
-                    $_SESSION['track_id_customer'] = $track_id;
-                    break;
-                } else {
-                    $display_ticket_list = false;
-                }
-            }
-            if ($object->fk_soc > 0) {
-                $object->fetch_thirdparty();
-                if ($email == $object->thirdparty->email) {
-                    $display_ticket_list = true;
-                    $_SESSION['email_customer'] = $email;
-                    $_SESSION['track_id_customer'] = $track_id;
-                }
-            }
-            if ($object->fk_user_create > 0) {
-                $tmpuser = new User($db);
-                $tmpuser->fetch($object->fk_user_create);
-                if ($email == $tmpuser->email) {
-                    $display_ticket_list = true;
-                    $_SESSION['email_customer'] = $email;
-                    $_SESSION['track_id_customer'] = $track_id;
-                }
-            }
+		if ($ret && $object->id > 0) {
+			// vérifie si l'adresse email est bien dans les contacts du ticket
+			$contacts = $object->liste_contact(-1, 'external');
+			foreach ($contacts as $contact) {
+				if ($contact['email'] == $email) {
+					$display_ticket_list = true;
+					$_SESSION['email_customer'] = $email;
+					$_SESSION['track_id_customer'] = $track_id;
+					break;
+				} else {
+					$display_ticket_list = false;
+				}
+			}
+			if ($object->fk_soc > 0) {
+				$object->fetch_thirdparty();
+				if ($email == $object->thirdparty->email) {
+					$display_ticket_list = true;
+					$_SESSION['email_customer'] = $email;
+					$_SESSION['track_id_customer'] = $track_id;
+				}
+			}
+			if ($object->fk_user_create > 0) {
+				$tmpuser = new User($db);
+				$tmpuser->fetch($object->fk_user_create);
+				if ($email == $tmpuser->email) {
+					$display_ticket_list = true;
+					$_SESSION['email_customer'] = $email;
+					$_SESSION['track_id_customer'] = $track_id;
+				}
+			}
 
-            $emailorigin = CMailFile::getValidAddress($object->origin_email, 2);
-            if ($email == $emailorigin) {
-                $display_ticket_list = true;
-                $_SESSION['email_customer'] = $email;
-                $_SESSION['track_id_customer'] = $track_id;
-            }
-        } else {
-            $error++;
-            array_push($object->errors, $langs->trans("ErrorTicketNotFound", $track_id));
-            $action = '';
-        }
-    }
+			$emailorigin = CMailFile::getValidAddress($object->origin_email, 2);
+			if ($email == $emailorigin) {
+				$display_ticket_list = true;
+				$_SESSION['email_customer'] = $email;
+				$_SESSION['track_id_customer'] = $track_id;
+			}
+		} else {
+			$error++;
+			array_push($object->errors, $langs->trans("ErrorTicketNotFound", $track_id));
+			$action = '';
+		}
+	}
 
-    if ($error || $errors) {
-        setEventMessages($object->error, $object->errors, 'errors');
-        $action = '';
-    }
+	if ($error || $errors) {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$action = '';
+	}
 }
 
 //$object->doActions($action);
@@ -175,496 +175,496 @@ print '<div class="ticketpublicarealist">';
 if ($action == "view_ticketlist")
 {
 	print '<br>';
-    if ($display_ticket_list) {
-        // Filters
-        $search_fk_status = GETPOST("search_fk_status", 'alpha');
-        $search_subject = GETPOST("search_subject", 'alpha');
-        $search_type = GETPOST("search_type", 'alpha');
-        $search_category = GETPOST("search_category", 'alpha');
-        $search_severity = GETPOST("search_severity", 'alpha');
-        $search_fk_user_create = GETPOST("search_fk_user_create", 'int');
-        $search_fk_user_assign = GETPOST("search_fk_user_assign", 'int');
+	if ($display_ticket_list) {
+		// Filters
+		$search_fk_status = GETPOST("search_fk_status", 'alpha');
+		$search_subject = GETPOST("search_subject", 'alpha');
+		$search_type = GETPOST("search_type", 'alpha');
+		$search_category = GETPOST("search_category", 'alpha');
+		$search_severity = GETPOST("search_severity", 'alpha');
+		$search_fk_user_create = GETPOST("search_fk_user_create", 'int');
+		$search_fk_user_assign = GETPOST("search_fk_user_assign", 'int');
 
-        // Store current page url
-        $url_page_current = dol_buildpath('/public/ticket/list.php', 1);
+		// Store current page url
+		$url_page_current = dol_buildpath('/public/ticket/list.php', 1);
 
-        // Do we click on purge search criteria ?
-        if (GETPOST("button_removefilter_x")) {
-            $search_fk_status = '';
-            $search_subject = '';
-            $search_type = '';
-            $search_category = '';
-            $search_severity = '';
-            $search_fk_user_create = '';
-            $search_fk_user_assign = '';
-        }
+		// Do we click on purge search criteria ?
+		if (GETPOST("button_removefilter_x")) {
+			$search_fk_status = '';
+			$search_subject = '';
+			$search_type = '';
+			$search_category = '';
+			$search_severity = '';
+			$search_fk_user_create = '';
+			$search_fk_user_assign = '';
+		}
 
-        // fetch optionals attributes and labels
-        $extrafields = new ExtraFields($db);
-        $extrafields->fetch_name_optionals_label($object->table_element);
+		// fetch optionals attributes and labels
+		$extrafields = new ExtraFields($db);
+		$extrafields->fetch_name_optionals_label($object->table_element);
 
-        $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+		$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-        $filter = array();
-        $param = 'action=view_ticketlist';
+		$filter = array();
+		$param = 'action=view_ticketlist';
 
-        // Definition of fields for list
-        $arrayfields = array(
-            't.datec' => array('label' => $langs->trans("Date"), 'checked' => 1),
-            't.date_read' => array('label' => $langs->trans("TicketReadOn"), 'checked' => 0),
-            't.date_close' => array('label' => $langs->trans("TicketCloseOn"), 'checked' => 0),
-            't.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
-        	//'t.track_id' => array('label' => $langs->trans("IDTracking"), 'checked' => 0),
-        	't.fk_statut' => array('label' => $langs->trans("Status"), 'checked' => 1),
-            't.subject' => array('label' => $langs->trans("Subject"), 'checked' => 1),
-            'type.code' => array('label' => $langs->trans("Type"), 'checked' => 1),
-            'category.code' => array('label' => $langs->trans("Category"), 'checked' => 1),
-            'severity.code' => array('label' => $langs->trans("Severity"), 'checked' => 1),
-            't.progress' => array('label' => $langs->trans("Progression"), 'checked' => 0),
-            //'t.fk_contract' => array('label' => $langs->trans("Contract"), 'checked' => 0),
-            't.fk_user_create' => array('label' => $langs->trans("Author"), 'checked' => 1),
-            't.fk_user_assign' => array('label' => $langs->trans("AssignedTo"), 'checked' => 0),
+		// Definition of fields for list
+		$arrayfields = array(
+			't.datec' => array('label' => $langs->trans("Date"), 'checked' => 1),
+			't.date_read' => array('label' => $langs->trans("TicketReadOn"), 'checked' => 0),
+			't.date_close' => array('label' => $langs->trans("TicketCloseOn"), 'checked' => 0),
+			't.ref' => array('label' => $langs->trans("Ref"), 'checked' => 1),
+			//'t.track_id' => array('label' => $langs->trans("IDTracking"), 'checked' => 0),
+			't.fk_statut' => array('label' => $langs->trans("Status"), 'checked' => 1),
+			't.subject' => array('label' => $langs->trans("Subject"), 'checked' => 1),
+			'type.code' => array('label' => $langs->trans("Type"), 'checked' => 1),
+			'category.code' => array('label' => $langs->trans("Category"), 'checked' => 1),
+			'severity.code' => array('label' => $langs->trans("Severity"), 'checked' => 1),
+			't.progress' => array('label' => $langs->trans("Progression"), 'checked' => 0),
+			//'t.fk_contract' => array('label' => $langs->trans("Contract"), 'checked' => 0),
+			't.fk_user_create' => array('label' => $langs->trans("Author"), 'checked' => 1),
+			't.fk_user_assign' => array('label' => $langs->trans("AssignedTo"), 'checked' => 0),
 
-            //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
-            //'t.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
-            //'t.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 2)
-            //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
-        );
+			//'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
+			//'t.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),
+			//'t.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 2)
+			//'t.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'])) {
-        	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-        		if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
-        			$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]);
-                }
-            }
-        }
-        if (!empty($search_subject)) {
-            $filter['t.subject'] = $search_subject;
-            $param .= '&search_subject='.urlencode($search_subject);
-        }
-        if (!empty($search_type)) {
-            $filter['t.type_code'] = $search_type;
-            $param .= '&search_type='.urlencode($search_type);
-        }
-        if (!empty($search_category)) {
-            $filter['t.category_code'] = $search_category;
-            $param .= '&search_category='.urlencode($search_category);
-        }
-        if (!empty($search_severity)) {
-            $filter['t.severity_code'] = $search_severity;
-            $param .= '&search_severity='.urlencode($search_severity);
-        }
-        if (!empty($search_fk_user_assign)) {
-            // -1 value = all so no filter
-            if ($search_fk_user_assign > 0) {
-                $filter['t.fk_user_assign'] = $search_fk_user_assign;
-                $param .= '&search_fk_user_assign='.urlencode($search_fk_user_assign);
-            }
-        }
-        if (!empty($search_fk_user_create)) {
-            // -1 value = all so no filter
-            if ($search_fk_user_create > 0) {
-                $filter['t.fk_user_create'] = $search_fk_user_create;
-                $param .= '&search_fk_user_create='.urlencode($search_fk_user_create);
-            }
-        }
-        if ((isset($search_fk_status) && $search_fk_status != '') && $search_fk_status != '-1' && $search_fk_status != 'non_closed') {
-            $filter['t.fk_statut'] = $search_fk_status;
-            $param .= '&search_fk_status='.urlencode($search_fk_status);
-        }
-        if (isset($search_fk_status) && $search_fk_status == 'non_closed') {
-            $filter['t.fk_statut'] = array(0, 1, 3, 4, 5, 6);
-            $param .= '&search_fk_status=non_closed';
-        }
+		// Extra fields
+		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+				if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
+					$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]);
+				}
+			}
+		}
+		if (!empty($search_subject)) {
+			$filter['t.subject'] = $search_subject;
+			$param .= '&search_subject='.urlencode($search_subject);
+		}
+		if (!empty($search_type)) {
+			$filter['t.type_code'] = $search_type;
+			$param .= '&search_type='.urlencode($search_type);
+		}
+		if (!empty($search_category)) {
+			$filter['t.category_code'] = $search_category;
+			$param .= '&search_category='.urlencode($search_category);
+		}
+		if (!empty($search_severity)) {
+			$filter['t.severity_code'] = $search_severity;
+			$param .= '&search_severity='.urlencode($search_severity);
+		}
+		if (!empty($search_fk_user_assign)) {
+			// -1 value = all so no filter
+			if ($search_fk_user_assign > 0) {
+				$filter['t.fk_user_assign'] = $search_fk_user_assign;
+				$param .= '&search_fk_user_assign='.urlencode($search_fk_user_assign);
+			}
+		}
+		if (!empty($search_fk_user_create)) {
+			// -1 value = all so no filter
+			if ($search_fk_user_create > 0) {
+				$filter['t.fk_user_create'] = $search_fk_user_create;
+				$param .= '&search_fk_user_create='.urlencode($search_fk_user_create);
+			}
+		}
+		if ((isset($search_fk_status) && $search_fk_status != '') && $search_fk_status != '-1' && $search_fk_status != 'non_closed') {
+			$filter['t.fk_statut'] = $search_fk_status;
+			$param .= '&search_fk_status='.urlencode($search_fk_status);
+		}
+		if (isset($search_fk_status) && $search_fk_status == 'non_closed') {
+			$filter['t.fk_statut'] = array(0, 1, 3, 4, 5, 6);
+			$param .= '&search_fk_status=non_closed';
+		}
 
-        require DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+		require DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-        $sortfield = GETPOST("sortfield", 'alpha');
-        $sortorder = GETPOST("sortorder", 'alpha');
+		$sortfield = GETPOST("sortfield", 'alpha');
+		$sortorder = GETPOST("sortorder", 'alpha');
 
-        if (!$sortfield) {
-            $sortfield = 't.datec';
-        }
-        if (!$sortorder) {
-            $sortorder = 'DESC';
-        }
+		if (!$sortfield) {
+			$sortfield = 't.datec';
+		}
+		if (!$sortorder) {
+			$sortorder = 'DESC';
+		}
 
-        $limit = $conf->liste_limit;
+		$limit = $conf->liste_limit;
 
-        $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-        if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-        $offset = $limit * $page;
-        $pageprev = $page - 1;
-        $pagenext = $page + 1;
+		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+		if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+		$offset = $limit * $page;
+		$pageprev = $page - 1;
+		$pagenext = $page + 1;
 
-        // Request SQL
-        $sql = "SELECT DISTINCT";
-        $sql .= " t.rowid,";
-        $sql .= " t.ref,";
-        $sql .= " t.track_id,";
-        $sql .= " t.fk_soc,";
-        $sql .= " t.fk_project,";
-        $sql .= " t.origin_email,";
-        $sql .= " t.fk_user_create, uc.lastname as user_create_lastname, uc.firstname as user_create_firstname,";
-        $sql .= " t.fk_user_assign, ua.lastname as user_assign_lastname, ua.firstname as user_assign_firstname,";
-        $sql .= " t.subject,";
-        $sql .= " t.message,";
-        $sql .= " t.fk_statut,";
-        $sql .= " t.resolution,";
-        $sql .= " t.progress,";
-        $sql .= " t.timing,";
-        $sql .= " t.type_code,";
-        $sql .= " t.category_code,";
-        $sql .= " t.severity_code,";
-        $sql .= " t.datec,";
-        $sql .= " t.date_read,";
-        $sql .= " t.date_close,";
-        $sql .= " t.tms,";
-        $sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
-        // Add fields for extrafields
-        if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-        	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-        		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
-        }
-        $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 .= " LEFT JOIN ".MAIN_DB_PREFIX."user as uc ON uc.rowid=t.fk_user_create";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON ua.rowid=t.fk_user_assign";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id=t.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact=tc.rowid";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople=sp.rowid";
-        if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."ticket_extrafields as ef on (t.rowid = ef.fk_object)";
-        }
-        $sql .= " WHERE t.entity IN (".getEntity('ticket').")";
-        $sql .= " AND ((tc.source = 'external'";
-        $sql .= " AND tc.element='".$db->escape($object->dao->element)."'";
-        $sql .= " AND tc.active=1)";
-        $sql .= " OR (sp.email='".$db->escape($_SESSION['email_customer'])."'";
-        $sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'";
-        $sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."'))";
-        // Manage filter
-        if (!empty($filter)) {
-            foreach ($filter as $key => $value) {
-                if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
-                    $sql .= ' AND '.$key.' = \''.$value.'\'';
-                } elseif (($key == 't.fk_user_assign') || ($key == 't.type_code') || ($key == 't.category_code') || ($key == 't.severity_code')) {
-                    $sql .= " AND ".$key." = '".$db->escape($value)."'";
-                } elseif ($key == 't.fk_statut') {
-                    if (is_array($value) && count($value) > 0) {
-                        $sql .= 'AND '.$key.' IN ('.implode(',', $value).')';
-                    } else {
-                        $sql .= ' AND '.$key.' = '.$db->escape($value);
-                    }
-                } else {
-                    $sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
-                }
-            }
-        }
-        //$sql .= " GROUP BY t.track_id";
-        $sql .= " ORDER BY ".$sortfield.' '.$sortorder;
+		// Request SQL
+		$sql = "SELECT DISTINCT";
+		$sql .= " t.rowid,";
+		$sql .= " t.ref,";
+		$sql .= " t.track_id,";
+		$sql .= " t.fk_soc,";
+		$sql .= " t.fk_project,";
+		$sql .= " t.origin_email,";
+		$sql .= " t.fk_user_create, uc.lastname as user_create_lastname, uc.firstname as user_create_firstname,";
+		$sql .= " t.fk_user_assign, ua.lastname as user_assign_lastname, ua.firstname as user_assign_firstname,";
+		$sql .= " t.subject,";
+		$sql .= " t.message,";
+		$sql .= " t.fk_statut,";
+		$sql .= " t.resolution,";
+		$sql .= " t.progress,";
+		$sql .= " t.timing,";
+		$sql .= " t.type_code,";
+		$sql .= " t.category_code,";
+		$sql .= " t.severity_code,";
+		$sql .= " t.datec,";
+		$sql .= " t.date_read,";
+		$sql .= " t.date_close,";
+		$sql .= " t.tms,";
+		$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
+		// Add fields for extrafields
+		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+				$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+		}
+		$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 .= " LEFT JOIN ".MAIN_DB_PREFIX."user as uc ON uc.rowid=t.fk_user_create";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as ua ON ua.rowid=t.fk_user_assign";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id=t.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON ec.fk_c_type_contact=tc.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sp ON ec.fk_socpeople=sp.rowid";
+		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."ticket_extrafields as ef on (t.rowid = ef.fk_object)";
+		}
+		$sql .= " WHERE t.entity IN (".getEntity('ticket').")";
+		$sql .= " AND ((tc.source = 'external'";
+		$sql .= " AND tc.element='".$db->escape($object->dao->element)."'";
+		$sql .= " AND tc.active=1)";
+		$sql .= " OR (sp.email='".$db->escape($_SESSION['email_customer'])."'";
+		$sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'";
+		$sql .= " OR t.origin_email='".$db->escape($_SESSION['email_customer'])."'))";
+		// Manage filter
+		if (!empty($filter)) {
+			foreach ($filter as $key => $value) {
+				if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
+					$sql .= ' AND '.$key.' = \''.$value.'\'';
+				} elseif (($key == 't.fk_user_assign') || ($key == 't.type_code') || ($key == 't.category_code') || ($key == 't.severity_code')) {
+					$sql .= " AND ".$key." = '".$db->escape($value)."'";
+				} elseif ($key == 't.fk_statut') {
+					if (is_array($value) && count($value) > 0) {
+						$sql .= 'AND '.$key.' IN ('.implode(',', $value).')';
+					} else {
+						$sql .= ' AND '.$key.' = '.$db->escape($value);
+					}
+				} else {
+					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
+				}
+			}
+		}
+		//$sql .= " GROUP BY t.track_id";
+		$sql .= " ORDER BY ".$sortfield.' '.$sortorder;
 
-        $resql = $db->query($sql);
-        if ($resql) {
-            $num_total = $db->num_rows($resql);
-            if (!empty($limit)) {
-                $sql .= ' '.$db->plimit($limit + 1, $offset);
-            }
+		$resql = $db->query($sql);
+		if ($resql) {
+			$num_total = $db->num_rows($resql);
+			if (!empty($limit)) {
+				$sql .= ' '.$db->plimit($limit + 1, $offset);
+			}
 
-            $resql = $db->query($sql);
-            if ($resql) {
-                $num = $db->num_rows($resql);
-                print_barre_liste($langs->trans('TicketList'), $page, 'public/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
+			$resql = $db->query($sql);
+			if ($resql) {
+				$num = $db->num_rows($resql);
+				print_barre_liste($langs->trans('TicketList'), $page, 'public/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
 
-                // Search bar
-                print '<form method="get" action="'.$url_form.'" id="searchFormList" >'."\n";
-                print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-                print '<input type="hidden" name="action" value="view_ticketlist">';
-                print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-                print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+				// Search bar
+				print '<form method="get" action="'.$url_form.'" id="searchFormList" >'."\n";
+				print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+				print '<input type="hidden" name="action" value="view_ticketlist">';
+				print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+				print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
-                $varpage = empty($contextpage) ? $url_page_current : $contextpage;
-                $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+				$varpage = empty($contextpage) ? $url_page_current : $contextpage;
+				$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-                print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
+				print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
-                // Filter bar
-                print '<tr class="liste_titre">';
+				// Filter bar
+				print '<tr class="liste_titre">';
 
-                if (!empty($arrayfields['t.datec']['checked'])) {
-                    print '<td class="liste_titre"></td>';
-                }
+				if (!empty($arrayfields['t.datec']['checked'])) {
+					print '<td class="liste_titre"></td>';
+				}
 
-                if (!empty($arrayfields['t.date_read']['checked'])) {
-                    print '<td class="liste_titre"></td>';
-                }
-                if (!empty($arrayfields['t.date_close']['checked'])) {
-                    print '<td class="liste_titre"></td>';
-                }
+				if (!empty($arrayfields['t.date_read']['checked'])) {
+					print '<td class="liste_titre"></td>';
+				}
+				if (!empty($arrayfields['t.date_close']['checked'])) {
+					print '<td class="liste_titre"></td>';
+				}
 
-                if (!empty($arrayfields['t.ref']['checked'])) {
-                    print '<td class="liste_titre"></td>';
-                }
+				if (!empty($arrayfields['t.ref']['checked'])) {
+					print '<td class="liste_titre"></td>';
+				}
 
-                if (!empty($arrayfields['t.subject']['checked'])) {
-                    print '<td class="liste_titre">';
-                    print '<input type="text" class="flat maxwidth100" name="search_subject" value="'.$search_subject.'">';
-                    print '</td>';
-                }
+				if (!empty($arrayfields['t.subject']['checked'])) {
+					print '<td class="liste_titre">';
+					print '<input type="text" class="flat maxwidth100" name="search_subject" value="'.$search_subject.'">';
+					print '</td>';
+				}
 
-                if (!empty($arrayfields['type.code']['checked'])) {
-                    print '<td class="liste_titre">';
-                    $formTicket->selectTypesTickets($search_type, 'search_type', '', 2, 1, 1, 0, 'maxwidth150');
-                    print '</td>';
-                }
+				if (!empty($arrayfields['type.code']['checked'])) {
+					print '<td class="liste_titre">';
+					$formTicket->selectTypesTickets($search_type, 'search_type', '', 2, 1, 1, 0, 'maxwidth150');
+					print '</td>';
+				}
 
-                if (!empty($arrayfields['category.code']['checked'])) {
-                    print '<td class="liste_titre">';
-                    $formTicket->selectGroupTickets($search_category, 'search_category', '', 2, 1, 1);
-                    print '</td>';
-                }
+				if (!empty($arrayfields['category.code']['checked'])) {
+					print '<td class="liste_titre">';
+					$formTicket->selectGroupTickets($search_category, 'search_category', '', 2, 1, 1);
+					print '</td>';
+				}
 
-                if (!empty($arrayfields['severity.code']['checked'])) {
-                    print '<td class="liste_titre">';
-                    $formTicket->selectSeveritiesTickets($search_severity, 'search_severity', '', 2, 1, 1);
-                    print '</td>';
-                }
+				if (!empty($arrayfields['severity.code']['checked'])) {
+					print '<td class="liste_titre">';
+					$formTicket->selectSeveritiesTickets($search_severity, 'search_severity', '', 2, 1, 1);
+					print '</td>';
+				}
 
-                if (!empty($arrayfields['t.progress']['checked'])) {
-                    print '<td class="liste_titre"></td>';
-                }
+				if (!empty($arrayfields['t.progress']['checked'])) {
+					print '<td class="liste_titre"></td>';
+				}
 
-                if (!empty($arrayfields['t.fk_user_create']['checked'])) {
-                    print '<td class="liste_titre"></td>';
-                }
+				if (!empty($arrayfields['t.fk_user_create']['checked'])) {
+					print '<td class="liste_titre"></td>';
+				}
 
-                if (!empty($arrayfields['t.fk_user_assign']['checked'])) {
-                    print '<td class="liste_titre"></td>';
-                }
+				if (!empty($arrayfields['t.fk_user_assign']['checked'])) {
+					print '<td class="liste_titre"></td>';
+				}
 
-                if (!empty($arrayfields['t.tms']['checked'])) {
-                    print '<td class="liste_titre"></td>';
-                }
+				if (!empty($arrayfields['t.tms']['checked'])) {
+					print '<td class="liste_titre"></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);
-                $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
-                print $hookmanager->resPrint;
+				// 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;
 
-                // Status
-                if (!empty($arrayfields['t.fk_statut']['checked'])) {
-                    print '<td class="liste_titre">';
-                    $selected = ($search_fk_status != "non_closed" ? $search_fk_status : '');
-                    //$object->printSelectStatus($selected);
-                    print '</td>';
-                }
+				// Status
+				if (!empty($arrayfields['t.fk_statut']['checked'])) {
+					print '<td class="liste_titre">';
+					$selected = ($search_fk_status != "non_closed" ? $search_fk_status : '');
+					//$object->printSelectStatus($selected);
+					print '</td>';
+				}
 
-                // Action column
-                print '<td class="liste_titre maxwidthsearch">';
-                $searchpicto = $form->showFilterButtons();
-                print $searchpicto;
-                print '</td>';
-                print '</tr>';
+				// Action column
+				print '<td class="liste_titre maxwidthsearch">';
+				$searchpicto = $form->showFilterButtons();
+				print $searchpicto;
+				print '</td>';
+				print '</tr>';
 
-                // Field title
-                print '<tr class="liste_titre">';
-                if (!empty($arrayfields['t.datec']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.datec']['label'], $url_page_current, 't.datec', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['t.date_read']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.date_read']['label'], $url_page_current, 't.date_read', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['t.date_close']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.date_close']['label'], $url_page_current, 't.date_close', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['t.ref']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.ref']['label'], $url_page_current, 't.ref', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['t.subject']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.subject']['label']);
-                }
-                if (!empty($arrayfields['type.code']['checked'])) {
-                	print_liste_field_titre($arrayfields['type.code']['label'], $url_page_current, 'type.code', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['category.code']['checked'])) {
-                	print_liste_field_titre($arrayfields['category.code']['label'], $url_page_current, 'category.code', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['severity.code']['checked'])) {
-                	print_liste_field_titre($arrayfields['severity.code']['label'], $url_page_current, 'severity.code', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['t.progress']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.progress']['label'], $url_page_current, 't.progress', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['t.fk_user_create']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.fk_user_create']['label'], $url_page_current, 't.fk_user_create', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['t.fk_user_assign']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.fk_user_assign']['label'], $url_page_current, 't.fk_user_assign', '', $param, '', $sortfield, $sortorder);
-                }
-                if (!empty($arrayfields['t.tms']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.tms']['label'], $url_page_current, 't.tms', '', $param, '', $sortfield, $sortorder);
-                }
+				// Field title
+				print '<tr class="liste_titre">';
+				if (!empty($arrayfields['t.datec']['checked'])) {
+					print_liste_field_titre($arrayfields['t.datec']['label'], $url_page_current, 't.datec', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['t.date_read']['checked'])) {
+					print_liste_field_titre($arrayfields['t.date_read']['label'], $url_page_current, 't.date_read', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['t.date_close']['checked'])) {
+					print_liste_field_titre($arrayfields['t.date_close']['label'], $url_page_current, 't.date_close', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['t.ref']['checked'])) {
+					print_liste_field_titre($arrayfields['t.ref']['label'], $url_page_current, 't.ref', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['t.subject']['checked'])) {
+					print_liste_field_titre($arrayfields['t.subject']['label']);
+				}
+				if (!empty($arrayfields['type.code']['checked'])) {
+					print_liste_field_titre($arrayfields['type.code']['label'], $url_page_current, 'type.code', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['category.code']['checked'])) {
+					print_liste_field_titre($arrayfields['category.code']['label'], $url_page_current, 'category.code', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['severity.code']['checked'])) {
+					print_liste_field_titre($arrayfields['severity.code']['label'], $url_page_current, 'severity.code', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['t.progress']['checked'])) {
+					print_liste_field_titre($arrayfields['t.progress']['label'], $url_page_current, 't.progress', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['t.fk_user_create']['checked'])) {
+					print_liste_field_titre($arrayfields['t.fk_user_create']['label'], $url_page_current, 't.fk_user_create', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['t.fk_user_assign']['checked'])) {
+					print_liste_field_titre($arrayfields['t.fk_user_assign']['label'], $url_page_current, 't.fk_user_assign', '', $param, '', $sortfield, $sortorder);
+				}
+				if (!empty($arrayfields['t.tms']['checked'])) {
+					print_liste_field_titre($arrayfields['t.tms']['label'], $url_page_current, 't.tms', '', $param, '', $sortfield, $sortorder);
+				}
 
-                // 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, $object); // Note that $action and $object may have been modified by hook
-                print $hookmanager->resPrint;
+				// Hook fields
+				$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['t.fk_statut']['checked'])) {
-                	print_liste_field_titre($arrayfields['t.fk_statut']['label'], $url_page_current, 't.fk_statut', '', $param, '', $sortfield, $sortorder);
-                }
-                print_liste_field_titre($selectedfields, $url_page_current, "", '', '', 'align="right"', $sortfield, $sortorder, 'center maxwidthsearch ');
-                print '</tr>';
+				if (!empty($arrayfields['t.fk_statut']['checked'])) {
+					print_liste_field_titre($arrayfields['t.fk_statut']['label'], $url_page_current, 't.fk_statut', '', $param, '', $sortfield, $sortorder);
+				}
+				print_liste_field_titre($selectedfields, $url_page_current, "", '', '', 'align="right"', $sortfield, $sortorder, 'center maxwidthsearch ');
+				print '</tr>';
 
-                while ($obj = $db->fetch_object($resql))
-                {
-                    print '<tr class="oddeven">';
+				while ($obj = $db->fetch_object($resql))
+				{
+					print '<tr class="oddeven">';
 
-                    // Date ticket
-                    if (!empty($arrayfields['t.datec']['checked'])) {
-                        print '<td>';
-                        print dol_print_date($db->jdate($obj->datec), 'dayhour');
-                        print '</td>';
-                    }
+					// Date ticket
+					if (!empty($arrayfields['t.datec']['checked'])) {
+						print '<td>';
+						print dol_print_date($db->jdate($obj->datec), 'dayhour');
+						print '</td>';
+					}
 
-                    // Date read
-                    if (!empty($arrayfields['t.date_read']['checked'])) {
-                        print '<td>';
-                        print dol_print_date($db->jdate($obj->date_read), 'dayhour');
-                        print '</td>';
-                    }
+					// Date read
+					if (!empty($arrayfields['t.date_read']['checked'])) {
+						print '<td>';
+						print dol_print_date($db->jdate($obj->date_read), 'dayhour');
+						print '</td>';
+					}
 
-                    // Date close
-                    if (!empty($arrayfields['t.date_close']['checked'])) {
-                        print '<td>';
-                        print dol_print_date($db->jdate($obj->date_close), 'dayhour');
-                        print '</td>';
-                    }
+					// Date close
+					if (!empty($arrayfields['t.date_close']['checked'])) {
+						print '<td>';
+						print dol_print_date($db->jdate($obj->date_close), 'dayhour');
+						print '</td>';
+					}
 
-                    // Ref
-                    if (!empty($arrayfields['t.ref']['checked'])) {
-                        print '<td class="nowraponall">';
-                        print $obj->ref;
-                        print '</td>';
-                    }
+					// Ref
+					if (!empty($arrayfields['t.ref']['checked'])) {
+						print '<td class="nowraponall">';
+						print $obj->ref;
+						print '</td>';
+					}
 
-                    // Subject
-                    if (!empty($arrayfields['t.subject']['checked'])) {
-                        print '<td>';
-                        print '<a href="javascript:viewticket(\''.$obj->track_id.'\',\''.$_SESSION['email_customer'].'\');">'.$obj->subject.'</a>';
-                        print '</td>';
-                    }
+					// Subject
+					if (!empty($arrayfields['t.subject']['checked'])) {
+						print '<td>';
+						print '<a href="javascript:viewticket(\''.$obj->track_id.'\',\''.$_SESSION['email_customer'].'\');">'.$obj->subject.'</a>';
+						print '</td>';
+					}
 
-                    // Type
-                    if (!empty($arrayfields['type.code']['checked'])) {
-                        print '<td>';
-                        print $obj->type_label;
-                        print '</td>';
-                    }
+					// Type
+					if (!empty($arrayfields['type.code']['checked'])) {
+						print '<td>';
+						print $obj->type_label;
+						print '</td>';
+					}
 
-                    // Category
-                    if (!empty($arrayfields['category.code']['checked'])) {
-                        print '<td>';
-                        print $obj->category_label;
-                        print '</td>';
-                    }
+					// Category
+					if (!empty($arrayfields['category.code']['checked'])) {
+						print '<td>';
+						print $obj->category_label;
+						print '</td>';
+					}
 
-                    // Severity
-                    if (!empty($arrayfields['severity.code']['checked'])) {
-                        print '<td>';
-                        print $obj->severity_label;
-                        print '</td>';
-                    }
+					// Severity
+					if (!empty($arrayfields['severity.code']['checked'])) {
+						print '<td>';
+						print $obj->severity_label;
+						print '</td>';
+					}
 
-                    // Progression
-                    if (!empty($arrayfields['t.progress']['checked'])) {
-                        print '<td>';
-                        print $obj->progress;
-                        print '</td>';
-                    }
+					// Progression
+					if (!empty($arrayfields['t.progress']['checked'])) {
+						print '<td>';
+						print $obj->progress;
+						print '</td>';
+					}
 
-                    // Message author
-                    if (!empty($arrayfields['t.fk_user_create']['checked'])) {
-                        print '<td>';
-                        if ($obj->fk_user_create > 0) {
-                            $user_create->firstname = (!empty($obj->user_create_firstname) ? $obj->user_create_firstname : '');
-                            $user_create->name = (!empty($obj->user_create_lastname) ? $obj->user_create_lastname : '');
-                            $user_create->id = (!empty($obj->fk_user_create) ? $obj->fk_user_create : '');
-                            print $user_create->getFullName($langs);
-                        } else {
-                            print $langs->trans('Email');
-                        }
-                        print '</td>';
-                    }
+					// Message author
+					if (!empty($arrayfields['t.fk_user_create']['checked'])) {
+						print '<td>';
+						if ($obj->fk_user_create > 0) {
+							$user_create->firstname = (!empty($obj->user_create_firstname) ? $obj->user_create_firstname : '');
+							$user_create->name = (!empty($obj->user_create_lastname) ? $obj->user_create_lastname : '');
+							$user_create->id = (!empty($obj->fk_user_create) ? $obj->fk_user_create : '');
+							print $user_create->getFullName($langs);
+						} else {
+							print $langs->trans('Email');
+						}
+						print '</td>';
+					}
 
-                    // Assigned author
-                    if (!empty($arrayfields['t.fk_user_assign']['checked'])) {
-                        print '<td>';
-                        if ($obj->fk_user_assig > 0) {
-                            $user_assign->firstname = (!empty($obj->user_assign_firstname) ? $obj->user_assign_firstname : '');
-                            $user_assign->lastname = (!empty($obj->user_assign_lastname) ? $obj->user_assign_lastname : '');
-                            $user_assign->id = (!empty($obj->fk_user_assign) ? $obj->fk_user_assign : '');
-                            print $user_assign->getFullName($langs);
-                        }
-                        print '</td>';
-                    }
+					// Assigned author
+					if (!empty($arrayfields['t.fk_user_assign']['checked'])) {
+						print '<td>';
+						if ($obj->fk_user_assig > 0) {
+							$user_assign->firstname = (!empty($obj->user_assign_firstname) ? $obj->user_assign_firstname : '');
+							$user_assign->lastname = (!empty($obj->user_assign_lastname) ? $obj->user_assign_lastname : '');
+							$user_assign->id = (!empty($obj->fk_user_assign) ? $obj->fk_user_assign : '');
+							print $user_assign->getFullName($langs);
+						}
+						print '</td>';
+					}
 
-                    if (!empty($arrayfields['t.tms']['checked'])) {
-                        print '<td>'.dol_print_date($db->jdate($obj->tms), 'dayhour').'</td>';
-                    }
+					if (!empty($arrayfields['t.tms']['checked'])) {
+						print '<td>'.dol_print_date($db->jdate($obj->tms), 'dayhour').'</td>';
+					}
 
-                    // Extra fields
-                    if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-                    	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-                            if (!empty($arrayfields["ef.".$key]['checked'])) {
-                                print '<td';
-                                $align = $extrafields->getAlignFlag($key);
-                                if ($align) {
-                                    print ' align="'.$align.'"';
-                                }
-                                print '>';
-                                $tmpkey = 'options_'.$key;
-                                print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
-                                print '</td>';
-                            }
-                        }
-                    }
+					// Extra fields
+					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+							if (!empty($arrayfields["ef.".$key]['checked'])) {
+								print '<td';
+								$align = $extrafields->getAlignFlag($key);
+								if ($align) {
+									print ' align="'.$align.'"';
+								}
+								print '>';
+								$tmpkey = 'options_'.$key;
+								print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+								print '</td>';
+							}
+						}
+					}
 
-                    // Statut
-                    if (!empty($arrayfields['t.fk_statut']['checked'])) {
-                        print '<td class="nowraponall">';
-                        $object->fk_statut = $obj->fk_statut;
-                        print $object->getLibStatut(2);
-                        print '</td>';
-                    }
+					// Statut
+					if (!empty($arrayfields['t.fk_statut']['checked'])) {
+						print '<td class="nowraponall">';
+						$object->fk_statut = $obj->fk_statut;
+						print $object->getLibStatut(2);
+						print '</td>';
+					}
 
-                    print '<td></td>';
+					print '<td></td>';
 
-                    $i++;
-                    print '</tr>';
-                }
+					$i++;
+					print '</tr>';
+				}
 
-                print '</table>';
-                print '</form>';
+				print '</table>';
+				print '</form>';
 
-                print '<form method="post" id="form_view_ticket" name="form_view_ticket" enctype="multipart/form-data" action="'.dol_buildpath('/public/ticket/view.php', 1).'" style="display:none;">';
-                print '<input type="hidden" name="token" value="'.newToken().'">';
-                print '<input type="hidden" name="action" value="view_ticket">';
-                print '<input type="hidden" name="btn_view_ticket_list" value="1">';
-                print '<input type="hidden" name="track_id" value="">';
-                print '<input type="hidden" name="email" value="">';
-                print "</form>";
-                print '<script type="text/javascript">
+				print '<form method="post" id="form_view_ticket" name="form_view_ticket" enctype="multipart/form-data" action="'.dol_buildpath('/public/ticket/view.php', 1).'" style="display:none;">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="view_ticket">';
+				print '<input type="hidden" name="btn_view_ticket_list" value="1">';
+				print '<input type="hidden" name="track_id" value="">';
+				print '<input type="hidden" name="email" value="">';
+				print "</form>";
+				print '<script type="text/javascript">
                     function viewticket(ticket_id, email) {
                         var form = $("#form_view_ticket");
                         form.find("input[name=\\"track_id\\"]").val(ticket_id);
@@ -672,35 +672,35 @@ if ($action == "view_ticketlist")
                         form.submit();
                     }
                 </script>';
-            }
-        }
-    } else {
-        print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'">'.$langs->trans('Back').'</a></div>';
-    }
+			}
+		}
+	} else {
+		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'">'.$langs->trans('Back').'</a></div>';
+	}
 } else {
-    print '<p class="center">'.$langs->trans("TicketPublicMsgViewLogIn").'</p>';
+	print '<p class="center">'.$langs->trans("TicketPublicMsgViewLogIn").'</p>';
 	print '<br>';
 
-    print '<div id="form_view_ticket">';
-    print '<form method="post" name="form_view_ticketlist"  enctype="multipart/form-data" action="'.$_SERVER['PHP_SELF'].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="view_ticketlist">';
-    //print '<input type="hidden" name="search_fk_status" value="non_closed">';
+	print '<div id="form_view_ticket">';
+	print '<form method="post" name="form_view_ticketlist"  enctype="multipart/form-data" action="'.$_SERVER['PHP_SELF'].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="view_ticketlist">';
+	//print '<input type="hidden" name="search_fk_status" value="non_closed">';
 
-    print '<p><label for="track_id" style="display: inline-block; width: 30%; "><span class="fieldrequired">'.$langs->trans("OneOfTicketTrackId").'</span></label>';
-    print '<input size="30" id="track_id" name="track_id" value="'.(GETPOST('track_id', 'alpha') ? GETPOST('track_id', 'alpha') : '').'" />';
-    print '</p>';
+	print '<p><label for="track_id" style="display: inline-block; width: 30%; "><span class="fieldrequired">'.$langs->trans("OneOfTicketTrackId").'</span></label>';
+	print '<input size="30" id="track_id" name="track_id" value="'.(GETPOST('track_id', 'alpha') ? GETPOST('track_id', 'alpha') : '').'" />';
+	print '</p>';
 
-    print '<p><label for="email" style="display: inline-block; width: 30%; "><span class="fieldrequired">'.$langs->trans('Email').'</span></label>';
-    print '<input size="30" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $_SESSION['customer_email']).'" />';
-    print '</p>';
+	print '<p><label for="email" style="display: inline-block; width: 30%; "><span class="fieldrequired">'.$langs->trans('Email').'</span></label>';
+	print '<input size="30" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $_SESSION['customer_email']).'" />';
+	print '</p>';
 
-    print '<p style="text-align: center; margin-top: 1.5em;">';
-    print '<input class="button" type="submit" name="btn_view_ticket_list" value="'.$langs->trans('ViewMyTicketList').'" />';
-    print "</p>\n";
+	print '<p style="text-align: center; margin-top: 1.5em;">';
+	print '<input class="button" type="submit" name="btn_view_ticket_list" value="'.$langs->trans('ViewMyTicketList').'" />';
+	print "</p>\n";
 
-    print "</form>\n";
-    print "</div>\n";
+	print "</form>\n";
+	print "</div>\n";
 }
 
 print "</div>";
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index af656e69ab0..f8cab9c9b9a 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -19,7 +19,7 @@
 /**
  *       \file       htdocs/public/ticket/view.php
  *       \ingroup    ticket
- *       \brief      Public file to add and manage ticket
+ *       \brief      Public file to show one ticket
  */
 
 if (!defined('NOCSRFCHECK')) {
@@ -162,6 +162,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 			$url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha');
 			header("Location: ".$url);
+			exit;
 		} else {
 			$action = '';
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -171,7 +172,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 	if (!$error && $action == "add_message" && $display_ticket && GETPOSTISSET('btn_add_message'))
 	{
 		// TODO Add message...
-		$ret = $object->dao->newMessage($user, $action, 0);
+		$ret = $object->dao->newMessage($user, $action, 0, 1);
 
 
 
@@ -187,9 +188,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		if ($action == "add_message")
 		{
 			$action = 'presend';
-		}
-		else
-		{
+		} else {
 			$action = '';
 		}
 	}
@@ -240,17 +239,17 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 		// Ref
 		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-		print $object->dao->ref;
+		print dol_escape_htmltag($object->dao->ref);
 		print '</td></tr>';
 
 		// Tracking ID
 		print '<tr><td>'.$langs->trans("TicketTrackId").'</td><td>';
-		print $object->dao->track_id;
+		print dol_escape_htmltag($object->dao->track_id);
 		print '</td></tr>';
 
 		// Subject
 		print '<tr><td>'.$langs->trans("Subject").'</td><td>';
-		print $object->dao->subject;
+		print dol_escape_htmltag($object->dao->subject);
 		print '</td></tr>';
 
 		// Statut
@@ -260,17 +259,17 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 		// Type
 		print '<tr><td>'.$langs->trans("Type").'</td><td>';
-		print $object->dao->type_label;
+		print dol_escape_htmltag($object->dao->type_label);
 		print '</td></tr>';
 
 		// Category
 		print '<tr><td>'.$langs->trans("Category").'</td><td>';
-		print $object->dao->category_label;
+		print dol_escape_htmltag($object->dao->category_label);
 		print '</td></tr>';
 
 		// Severity
 		print '<tr><td>'.$langs->trans("Severity").'</td><td>';
-		print $object->dao->severity_label;
+		print dol_escape_htmltag($object->dao->severity_label);
 		print '</td></tr>';
 
 		// Creation date
@@ -316,7 +315,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 
 		// Progression
 		print '<tr><td>'.$langs->trans("Progression").'</td><td>';
-		print ($object->dao->progress > 0 ? $object->dao->progress : '0').'%';
+		print ($object->dao->progress > 0 ? dol_escape_htmltag($object->dao->progress) : '0').'%';
 		print '</td></tr>';
 
 		print '</table>';
@@ -372,9 +371,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a
 		// Message list
 		print load_fiche_titre($langs->trans('TicketMessagesList'), '', 'object_conversation');
 		$object->viewTicketMessages(false, true, $object->dao);
-	}
-	else
-	{
+	} else {
 		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'">'.$langs->trans('Back').'</a></div>';
 	}
 } else {
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index 95f2efa492a..d09b8e10012 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -95,8 +95,7 @@ if (empty($pageid))
 		if ($result > 0)
 		{
 			$pageid = $objectpage->id;
-		}
-		elseif ($result == 0)
+		} elseif ($result == 0)
 		{
 			// Page not found from ref=pageurl, we try using alternative alias
 			$result = $objectpage->fetch(0, $object->id, null, $pageref);
@@ -105,9 +104,7 @@ if (empty($pageid))
 				$pageid = $objectpage->id;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		if ($object->fk_default_home > 0)
 		{
 			$result = $objectpage->fetch($object->fk_default_home);
@@ -164,9 +161,7 @@ if ($pageid == 'css')   // No more used ?
 	//else
 	header('Cache-Control: no-cache');
 	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
-}
-else
-{
+} else {
 	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
 }
 
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index ce416bdd7b6..8854c13ea52 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -77,9 +77,7 @@ if (empty($pageid))
     {
         $object->fetch($websiteid);
         $website = $object->ref;
-    }
-    else
-    {
+    } else {
         $object->fetch(0, $website);
     }
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 3d8547f9322..d41ce8e6bf4 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -79,7 +79,7 @@ else {
 	$result = restrictedArea($user, 'reception');
 	if ($origin == 'supplierorder') {
 		if (empty($user->rights->fournisseur->commande->lire) && empty($user->rights->fournisseur->commande->read)) accessforbidden();
-	}elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
+	} elseif (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
 }
 
 $action		= GETPOST('action', 'alpha');
@@ -154,7 +154,7 @@ if (empty($reshook))
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
-				$model = $object->modelpdf;
+				$model = $object->model_pdf;
 				$ret = $object->fetch($id); // Reload to get new records
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
@@ -189,7 +189,7 @@ if (empty($reshook))
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
@@ -233,8 +233,7 @@ if (empty($reshook))
 
 		if ($object->origin == "supplierorder")
 			$classname = 'CommandeFournisseur';
-		else
-			$classname = ucfirst($object->origin);
+		else $classname = ucfirst($object->origin);
 		$objectsrc = new $classname($db);
 		$objectsrc->fetch($object->origin_id);
 
@@ -247,9 +246,8 @@ if (empty($reshook))
 		$object->fk_delivery_address = $objectsrc->fk_delivery_address;
 		$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
 		$object->tracking_number = GETPOST('tracking_number', 'alpha');
-		$object->ref_int = GETPOST('ref_int', 'alpha');
-		$object->note_private = GETPOST('note_private', 'none');
-		$object->note_public = GETPOST('note_public', 'none');
+		$object->note_private = GETPOST('note_private', 'restricthtml');
+		$object->note_public = GETPOST('note_public', 'restricthtml');
 		$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 		$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
@@ -353,9 +351,7 @@ if (empty($reshook))
 	                $error++;
 	            }
 	        }
-	    }
-	    else
-	    {
+	    } else {
 	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("QtyToReceive").'/'.$langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 	        $error++;
 	    }
@@ -365,16 +361,12 @@ if (empty($reshook))
 	        $db->commit();
 	        header("Location: card.php?id=".$object->id);
 	        exit;
-	    }
-	    else
-	    {
+	    } else {
 	        $db->rollback();
 	        $_GET["commande_id"] = GETPOST('commande_id', 'int');
 	        $action = 'create';
 	    }
-	}
-
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
+	} 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)))
 	)
@@ -387,9 +379,7 @@ if (empty($reshook))
 	    {
 			$langs->load("errors");
 	        setEventMessages($langs->trans($object->error), null, 'errors');
-	    }
-	    else
-	    {
+	    } else {
 	    	// Define output language
 	    	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	    	{
@@ -401,25 +391,21 @@ if (empty($reshook))
 	    			$outputlangs = new Translate("", $conf);
 	    			$outputlangs->setDefaultLang($newlang);
 	    		}
-	    		$model = $object->modelpdf;
+	    		$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);
 	    	}
 	    }
-	}
-
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->reception->supprimer)
+	} 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
-		{
+	    } else {
 			setEventMessages($object->error, $object->errors, 'errors');
 	    }
 	}
@@ -499,7 +485,7 @@ if (empty($reshook))
 	        $outputlangs = new Translate("", $conf);
 	        $outputlangs->setDefaultLang($newlang);
 	    }
-		$result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	    if ($result <= 0)
 	    {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -517,9 +503,7 @@ if (empty($reshook))
 		$ret = dol_delete_file($file, 0, 0, 0, $object);
 		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
 		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
-	}
-
-	elseif ($action == 'classifybilled')
+	} elseif ($action == 'classifybilled')
 	{
 	    $object->fetch($id);
 	    $result = $object->set_billed();
@@ -527,9 +511,7 @@ if (empty($reshook))
 	    	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 	    	exit();
 	    }
-	}
-
-	elseif ($action == 'classifyclosed')
+	} elseif ($action == 'classifyclosed')
 	{
 	    $object->fetch($id);
 	    $result = $object->setClosed();
@@ -566,9 +548,7 @@ if (empty($reshook))
 		if (!$error) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit();
-		}
-		else
-		{
+		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
 	}
@@ -630,8 +610,7 @@ if (empty($reshook))
 						setEventMessages($line->error, $line->errors, 'errors');
 						$error++;
 					}
-				}
-				else // Product no predefined
+				} else // Product no predefined
 				{
 					$qty = "qtyl".$line_id;
 					$line->id = $line_id;
@@ -664,11 +643,9 @@ if (empty($reshook))
 				}
 
 				$ret = $object->fetch($object->id); // Reload to get new records
-				$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
-		}
-		else
-		{
+		} else {
 			header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 			exit();
 		}
@@ -988,8 +965,12 @@ if ($action == 'create')
 				if (!empty($conf->productbatch->enabled))
 				{
 					print '<td class="left">'.$langs->trans("batch_number").'</td>';
-					print '<td class="left">'.$langs->trans("EatByDate").'</td>';
-					print '<td class="left">'.$langs->trans("SellByDate").'</td>';
+					if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+						print '<td class="left">'.$langs->trans("EatByDate").'</td>';
+					}
+					if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+						print '<td class="left">'.$langs->trans("SellByDate").'</td>';
+					}
 				}
                 print "</tr>\n";
             }
@@ -1048,9 +1029,7 @@ if ($action == 'create')
                     }
 
                     print '</td>';
-                }
-                else
-				{
+                } else {
 				    print "<td>";
                     if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
                     else $text = img_object($langs->trans('Product'), 'product');
@@ -1088,9 +1067,7 @@ if ($action == 'create')
 				if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
 				{
 					$quantityToBeDelivered = 0;
-				}
-				else
-				{
+				} else {
 					$quantityToBeDelivered = $dispatchLines[$indiceAsked]['qty'];
 				}
                 $warehouse_id = $dispatchLines[$indiceAsked]['ent'];
@@ -1111,8 +1088,7 @@ if ($action == 'create')
                         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");
+					} else print $langs->trans("NA");
 					print '</td>';
 
 					// Stock
@@ -1130,9 +1106,7 @@ if ($action == 'create')
 								print '<!-- Show warehouse selection -->';
 								print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 0, 0, $line->fk_product, '', 1);
 							}
-						}
-						else
-						{
+						} else {
 							print $langs->trans("Service");
 						}
 						print '</td>';
@@ -1143,14 +1117,17 @@ if ($action == 'create')
 						if (!empty($product->status_batch))
 						{
 							print '<td><input name="batch'.$indiceAsked.'" value="'.$dispatchLines[$indiceAsked]['lot'].'"></td>';
-							print '<td>';
-							print $form->selectDate($dispatchLines[$indiceAsked]['DLC'], 'dlc'.$indiceAsked, '', '', 1, "");
-							print '</td>';
-							print '<td>';
-							print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, "");
-							print '</td>';
-						}
-						else {
+							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								print '<td>';
+								print $form->selectDate($dispatchLines[$indiceAsked]['DLC'], 'dlc'.$indiceAsked, '', '', 1, "");
+								print '</td>';
+							}
+							if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								print '<td>';
+								print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo'.$indiceAsked, '', '', 1, "");
+								print '</td>';
+							}
+						} else {
 							print '<td colspan="3"></td>';
 						}
 					}
@@ -1194,14 +1171,11 @@ if ($action == 'create')
             print '</form>';
 
             print '<br>';
-        }
-        else
-		{
+        } else {
             dol_print_error($db);
         }
     }
-}
-elseif ($id || $ref)
+} elseif ($id || $ref)
 /* *************************************************************************** */
 /*                                                                             */
 /* Edit and view mode                                                          */
@@ -1246,9 +1220,7 @@ elseif ($id || $ref)
 			if ($objectref == 'PROV')
 			{
 				$numref = $object->getNextNumRef($soc);
-			}
-			else
-			{
+			} else {
 				$numref = $object->ref;
 			}
 
@@ -1412,9 +1384,7 @@ elseif ($id || $ref)
 			print $form->selectDate($object->date_delivery ? $object->date_delivery : -1, 'liv_', 1, 1, '', "setdate_livraison", 1, 0);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->date_delivery ? dol_print_date($object->date_delivery, 'dayhour') : '&nbsp;';
 		}
 		print '</td>';
@@ -1436,9 +1406,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->trueWeight;
 			print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 		}
@@ -1471,9 +1439,7 @@ elseif ($id || $ref)
 			print ' <input class="button" name="modify" value="'.$langs->trans("Modify").'" type="submit">';
 			print ' <input class="button" name="cancel" value="'.$langs->trans("Cancel").'" type="submit">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			print $object->trueHeight;
 			print ($object->trueHeight && $object->height_units != '') ? ' '.measuringUnitString(0, "size", $object->height_units) : '';
 		}
@@ -1504,8 +1470,7 @@ elseif ($id || $ref)
 			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');
-			}
-			else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
+			} else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
 		}
 		if ($totalVolume > 0)
 		{
@@ -1550,9 +1515,7 @@ elseif ($id || $ref)
 			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
-		}
-		else
-		{
+		} else {
 			if ($object->shipping_method_id > 0)
 			{
 				// Get code using getLabelFromKey
@@ -1584,9 +1547,7 @@ elseif ($id || $ref)
 			if ($action != 'editincoterm')
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-			}
-			else
-			{
+			} 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>';
@@ -1639,9 +1600,7 @@ elseif ($id || $ref)
 			if ($object->statut <= 1)
 			{
 				print $langs->trans("QtyToReceive").' - ';
-			}
-			else
-			{
+			} else {
 				print $langs->trans("QtyReceived").' - ';
 			}
 			if (!empty($conf->stock->enabled))
@@ -1653,15 +1612,11 @@ elseif ($id || $ref)
 				print $langs->trans("Batch");
 			}
 			print '</td>';
-		}
-		else
-		{
+		} else {
 			if ($object->statut <= 1)
 			{
 				print '<td class="center">'.$langs->trans("QtyToReceive").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
 			}
 			if (!empty($conf->stock->enabled))
@@ -1768,9 +1723,7 @@ elseif ($id || $ref)
 					$prod = new Product($db);
 					$prod->fetch($lines[$i]->fk_product);
 					$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product->label;
-				}
-				else
-					$label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
+				} else $label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
 
 				print '<td>';
 
@@ -1784,9 +1737,7 @@ elseif ($id || $ref)
 					print (!empty($lines[$i]->product->description) && $lines[$i]->description != $lines[$i]->product->description) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 				}
 				print "</td>\n";
-			}
-			else
-			{
+			} else {
 				print "<td>";
 				if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
 				else $text = img_object($langs->trans('Product'), 'product');
@@ -1805,9 +1756,7 @@ elseif ($id || $ref)
 			if ($action == 'editline' && $lines[$i]->id == $line_id)
 			{
 				print '<td ><textarea name="comment'.$line_id.'" id="comment'.$line_id.'" /> '.$lines[$i]->comment.'</textarea></td>';
-			}
-			else
-			{
+			} else {
 				print '<td style="white-space: pre-wrap;max-width: 200px;" >'.$lines[$i]->comment.'</td>';
 			}
 
@@ -1865,16 +1814,18 @@ elseif ($id || $ref)
 						if ($conf->productbatch->enabled && !empty($lines[$i]->product->status_batch))
 						{
 							print '<td>  <input name="batch'.$line_id.'" id="batch'.$line_id.'" type="text" value="'.$lines[$i]->batch.'"> </br>';
-							print $langs->trans('EatByDate').' : ';
-							print $form->selectDate($lines[$i]->eatby, 'dlc'.$line_id, '', '', 1, "").'</br>';
-							print $langs->trans('SellByDate').' : ';
-							print $form->selectDate($lines[$i]->sellby, 'dluo'.$line_id, '', '', 1, "");
+							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+								print $langs->trans('EatByDate').' : ';
+								print $form->selectDate($lines[$i]->eatby, 'dlc'.$line_id, '', '', 1, "").'</br>';
+							}
+							if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+								print $langs->trans('SellByDate').' : ';
+								print $form->selectDate($lines[$i]->sellby, 'dluo'.$line_id, '', '', 1, "");
+							}
 							print '</td>';
 						}
 						print '</tr>';
-					}
-					else
-					{
+					} else {
 						print '<!-- case edit 2 -->';
 						print '<tr>';
 						// Qty to receive or received
@@ -1887,9 +1838,7 @@ elseif ($id || $ref)
 					}
 				}
 				print '</table></td>';
-			}
-			else
-			{
+			} else {
 				// Qty to receive or received
 				print '<td class="center">'.$lines[$i]->qty.'</td>';
 
@@ -1918,16 +1867,17 @@ elseif ($id || $ref)
 						$detail = '';
 						if ($lines[$i]->product->status_batch)
 						{
-								$detail .= $langs->trans("Batch").': '.$lines[$i]->batch;
+							$detail .= $langs->trans("Batch").': '.$lines[$i]->batch;
+							if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 								$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($lines[$i]->sellby, "day");
+							}
+							if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
 								$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($lines[$i]->eatby, "day");
-
-								$detail .= '<br>';
+							}
+							$detail .= '<br>';
 
 							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"), $detail);
-						}
-						else
-						{
+						} else {
 							print $langs->trans("NA");
 						}
 						print '</td>';
@@ -1955,15 +1905,14 @@ elseif ($id || $ref)
 				print '<td class="center" colspan="2" valign="middle">';
 				print '<input type="submit" class="button" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
 				print '<input type="submit" class="button" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
-			}
-			elseif ($object->statut == Reception::STATUS_DRAFT)
+			} elseif ($object->statut == Reception::STATUS_DRAFT)
 			{
 				// edit-delete buttons
 				print '<td class="linecoledit center">';
-				print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
+				print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;token='.newToken().'&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
 				print '</td>';
 				print '<td class="linecoldelete" width="10">';
-				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
 				print '</td>';
 
 				// Display lines extrafields
@@ -1987,9 +1936,7 @@ elseif ($id || $ref)
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
 					print $line->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
-				}
-				else
-				{
+				} else {
 					print $line->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
 				}
 			}
@@ -2026,9 +1973,7 @@ elseif ($id || $ref)
 	  		     || (!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
-				{
+				} else {
 					print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
 				}
 			}
@@ -2044,9 +1989,7 @@ elseif ($id || $ref)
 				if (!empty($conf->facture->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 ?
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
-				}
-				else
-				{
+				} else {
 			    	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
@@ -2058,8 +2001,7 @@ elseif ($id || $ref)
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->reception->reception_advance->send)
 					{
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'</a>';
-					}
-					else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
+					} else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 				}
 			}
 
@@ -2093,7 +2035,7 @@ elseif ($id || $ref)
 
 			if ($user->rights->reception->supprimer)
 			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
 			}
 		}
 
@@ -2117,7 +2059,7 @@ elseif ($id || $ref)
 		$genallowed = $user->rights->reception->lire;
 		$delallowed = $user->rights->reception->creer;
 
-		print $formfile->showdocuments('reception', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		print $formfile->showdocuments('reception', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
 		// Show links to link elements
 		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
@@ -2148,7 +2090,7 @@ elseif ($id || $ref)
 		// Build document if it not exists
 		if (!$file || !is_readable($file))
 		{
-			$result = $object->generateDocument(GETPOST('model') ?GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$result = $object->generateDocument(GETPOST('model') ?GETPOST('model') : $object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0)
 			{
 				dol_print_error($db, $object->error, $object->errors);
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index a95d6217c1c..8ea45ccd1c8 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -34,6 +34,7 @@
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
@@ -43,6 +44,8 @@ if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/
  */
 class Reception extends CommonObject
 {
+	use CommonIncoterm;
+
 	public $element = "reception";
 	public $fk_element = "fk_reception";
 	public $table_element = "reception";
@@ -178,15 +181,11 @@ class Reception extends CommonObject
 			if ($numref != "")
 			{
 				return $numref;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-        }
-	    else
-	    {
+        } else {
 		    print $langs->trans("Error")." ".$langs->trans("Error_RECEPTION_ADDON_NUMBER_NotDefined");
 		    return "";
 	    }
@@ -324,9 +323,7 @@ class Reception extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					foreach ($this->errors as $errmsg)
 					{
 						dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
@@ -335,17 +332,13 @@ class Reception extends CommonObject
 					$this->db->rollback();
 					return -1 * $error;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
@@ -410,7 +403,8 @@ class Reception extends CommonObject
 				$this->date_reception = $this->db->jdate($obj->date_reception); // Date real
 				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planed
 				$this->fk_delivery_address  = $obj->fk_address;
-				$this->modelpdf             = $obj->model_pdf;
+				$this->model_pdf            = $obj->model_pdf;
+				$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
@@ -472,16 +466,12 @@ class Reception extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this).'::Fetch no reception found', LOG_ERR);
 				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -530,8 +520,7 @@ class Reception extends CommonObject
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
-		}
-		else {
+		} else {
 			$numref = $this->ref;
 		}
 
@@ -601,9 +590,7 @@ class Reception extends CommonObject
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
-					}
-					else
-					{
+					} else {
 						// 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.
@@ -617,9 +604,7 @@ class Reception extends CommonObject
 						}
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
 				return -2;
@@ -693,9 +678,7 @@ class Reception extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
@@ -804,7 +787,7 @@ class Reception extends CommonObject
 		if (isset($this->trueWeight)) $this->weight = trim($this->trueWeight);
 		if (isset($this->note_private)) $this->note = trim($this->note_private);
 		if (isset($this->note_public)) $this->note = trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
+		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
 
 
 		// Check parameters
@@ -866,9 +849,7 @@ class Reception extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -921,9 +902,7 @@ class Reception extends CommonObject
 
 					$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ReceptionDeletedInDolibarr", $this->ref), '', $obj->eatby, $obj->sellby, $obj->batch); // Price is set to 0, because we don't want to see WAP changed
 				}
-			}
-			else
-			{
+			} else {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
@@ -999,36 +978,26 @@ class Reception extends CommonObject
 							}
 
 							return 1;
-						}
-						else
-						{
+						} else {
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1043,21 +1012,20 @@ class Reception extends CommonObject
     public function fetch_lines()
 	{
 		// phpcs:enable
-		global $db;
 		dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch WHERE fk_reception='.$this->id;
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 
 		if (!empty($resql)) {
 			$this->lines = array();
 			while ($obj = $resql->fetch_object()) {
-				$line = new CommandeFournisseurDispatch($db);
+				$line = new CommandeFournisseurDispatch($this->db);
 				$line->fetch($obj->rowid);
 				$line->fetch_product();
 				$sql_commfourndet = 'SELECT qty, ref,  label, tva_tx, vat_src_code, subprice, multicurrency_subprice, remise_percent FROM llx_commande_fournisseurdet WHERE rowid='.$line->fk_commandefourndet;
 				$resql_commfourndet = $db->query($sql_commfourndet);
 				if (!empty($resql_commfourndet)) {
-					$obj = $db->fetch_object($resql_commfourndet);
+					$obj = $this->db->fetch_object($resql_commfourndet);
 					$line->qty_asked = $obj->qty;
 					$line->description = $line->comment;
 					$line->desc = $line->comment;
@@ -1086,8 +1054,7 @@ class Reception extends CommonObject
 			}
 
 			return 1;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -1106,7 +1073,7 @@ class Reception extends CommonObject
 	{
 		global $conf, $langs;
 		$result = '';
-        $label = '<u>'.$langs->trans("Reception").'</u>';
+		$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);
 
@@ -1193,6 +1160,8 @@ class Reception extends CommonObject
 		$sql = "SELECT rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= $this->db->plimit(100);
+
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1273,15 +1242,11 @@ class Reception extends CommonObject
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			return -2;
 		}
 	}
@@ -1364,9 +1329,7 @@ class Reception extends CommonObject
             $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
-        {
+        } 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'])."'";
@@ -1441,9 +1404,7 @@ class Reception extends CommonObject
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
-		}
-		else
-		{
+		} else {
 			$this->tracking_url = $value;
 		}
 	}
@@ -1544,9 +1505,7 @@ class Reception extends CommonObject
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
-						{
+						} else {
 							// 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
@@ -1559,9 +1518,7 @@ class Reception extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1575,9 +1532,7 @@ class Reception extends CommonObject
     			    $error++;
     			}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
             $error++;
 		}
@@ -1586,9 +1541,7 @@ class Reception extends CommonObject
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else
-		{
+		} else {
 		    $this->db->rollback();
 		    return -1;
 		}
@@ -1632,9 +1585,7 @@ class Reception extends CommonObject
 		if (empty($error)) {
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1709,9 +1660,7 @@ class Reception extends CommonObject
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
-						{
+						} else {
 							// 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
@@ -1723,9 +1672,7 @@ class Reception extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1754,9 +1701,7 @@ class Reception extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1845,9 +1790,7 @@ class Reception extends CommonObject
 								$error++;
 								break;
 							}
-						}
-						else
-						{
+						} else {
 							// 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
@@ -1859,9 +1802,7 @@ class Reception extends CommonObject
 							}
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$error++;
 				}
@@ -1911,9 +1852,7 @@ class Reception extends CommonObject
                 $this->db->rollback();
                 return -1;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -1940,8 +1879,8 @@ class Reception extends CommonObject
 		{
 			$modele = 'squille';
 
-			if ($this->modelpdf) {
-				$modele = $this->modelpdf;
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->RECEPTION_ADDON_PDF)) {
 				$modele = $conf->global->RECEPTION_ADDON_PDF;
 			}
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index b2d30bf7c7f..0492c0db1b8 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -41,7 +41,7 @@ $langs->load("companies");
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -90,9 +90,7 @@ if ($action == 'addcontact' && $user->rights->reception->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
@@ -120,8 +118,7 @@ elseif ($action == 'deletecontact' && $user->rights->reception->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index b9786229468..e3951458e40 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -120,8 +120,7 @@ if ($resql)
 			print '</td></tr>';
 			$i++;
 		}
-	}
-	else {
+	} else {
 		print '<tr><td><span class="opacitymedium">'.$langs->trans("None").'</span></td><td></td><td></td></tr>';
 	}
 
@@ -182,16 +181,14 @@ if ($resql)
 				$orderstatic->id = $obj->commande_fournisseur_id;
 				$orderstatic->ref = $obj->commande_fournisseur_ref;
 				print $orderstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
+			} else print '&nbsp;';
 			print '</td></tr>';
 			$i++;
 		}
 		print "</table></div><br>";
 	}
 	$db->free($resql);
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index c6cfcd5264c..891a5630c7f 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -53,7 +53,7 @@ $search_ref_supplier = GETPOST('search_ref_supplier');
 $search_company = GETPOST("search_company");
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
-$search_state = trim(GETPOST("search_state"));
+$search_state = GETPOST("search_state");
 $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_billed = GETPOST("search_billed", 'int');
@@ -61,8 +61,8 @@ $sall = GETPOST('sall', 'alphanohtml');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (!$sortfield) $sortfield = "e.ref";
 if (!$sortorder) $sortorder = "DESC";
@@ -192,8 +192,7 @@ if (empty($reshook))
 							$object->add_object_linked('reception', $value); // add supplier order linked object
 					}
 				}
-			}
-    		else {
+			} else {
     			$object->socid = $rcp->socid;
     			$object->type = FactureFournisseur::TYPE_STANDARD;
     			$object->cond_reglement_id	= $rcp->thirdparty->cond_reglement_supplier_id;
@@ -278,16 +277,12 @@ if (empty($reshook))
 	    					{
 	    						$result = $object->insert_discount($discountid);
 	    						//$result=$discount->link_to_invoice($lineid,$id);
-	    					}
-	    					else
-	    					{
+	    					} else {
 	    						setEventMessages($discount->error, $discount->errors, 'errors');
 	    						$error++;
 	    						break;
 	    					}
-	    				}
-	    				else
-	    				{
+	    				} else {
 	    					// Positive line
 	    					$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 	    					// Date start
@@ -334,9 +329,7 @@ if (empty($reshook))
 	    					if ($result > 0)
 	    					{
 	    						$lineid = $result;
-	    					}
-	    					else
-	    					{
+	    					} else {
 	    						$lineid = 0;
 	    						$error++;
 	    						break;
@@ -390,9 +383,7 @@ if (empty($reshook))
     	{
     		$db->commit();
     		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
-    	}
-    	else
-    	{
+    	} else {
     		$db->rollback();
     		$action = 'create';
     		$_GET["origin"] = $_POST["origin"];
@@ -584,9 +575,7 @@ if ($resql)
 		{
 		    print $form->selectyesno('validate_invoices', 0, 1, 1);
 		    print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
-		}
-		else
-		{
+		} else {
             print $form->selectyesno('validate_invoices', 0, 1);
 		}
 		print '</td>';
@@ -936,9 +925,7 @@ if ($resql)
 	print "</div>";
 	print '</form>';
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index 9e9b6c20f92..ade403ab39b 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -44,7 +44,7 @@ $langs->load('propal');
 
 $id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = '';
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index e7e8ef7e090..5079671dafd 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -77,9 +77,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 if (!$user->rights->societe->client->voir || $user->socid)
 {
     $filenamenb = $dir.'/receptionsnbinyear-'.$user->id.'-'.$year.'.png';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/receptionsnbinyear-'.$year.'.png';
 }
 
@@ -290,8 +288,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     /*print $px2->show();
diff --git a/htdocs/reception/stats/month.php b/htdocs/reception/stats/month.php
index d2cf628e605..dab1a806406 100644
--- a/htdocs/reception/stats/month.php
+++ b/htdocs/reception/stats/month.php
@@ -27,6 +27,8 @@ require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/receptionstats.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
+$year = GETPOST("year", 'int');
+
 
 /*
  * View
@@ -39,10 +41,10 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 $mesg = '';
 
-print load_fiche_titre($langs->trans("StatisticsOfReceptions").' '.$_GET["year"], $mesg);
+print load_fiche_titre($langs->trans("StatisticsOfReceptions").' '.GETPOST("year", 'int'), $mesg);
 
 $stats = new ReceptionStats($db);
-$data = $stats->getNbReceptionByMonth($_GET["year"]);
+$data = $stats->getNbReceptionByMonth(GETPOST("year", 'int'));
 
 dol_mkdir($conf->reception->dir_temp);
 
diff --git a/htdocs/recruitment/ChangeLog.md b/htdocs/recruitment/ChangeLog.md
new file mode 100644
index 00000000000..e1a12aa2f52
--- /dev/null
+++ b/htdocs/recruitment/ChangeLog.md
@@ -0,0 +1,5 @@
+# CHANGELOG RECRUITMENT FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
+
+## 1.0
+
+Initial version
diff --git a/htdocs/recruitment/README.md b/htdocs/recruitment/README.md
new file mode 100644
index 00000000000..190362bafc0
--- /dev/null
+++ b/htdocs/recruitment/README.md
@@ -0,0 +1,5 @@
+# RECRUITMENT FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
+
+## Features
+
+Manage and follow recruitment campaigns for new job positions.
diff --git a/htdocs/recruitment/admin/candidature_extrafields.php b/htdocs/recruitment/admin/candidature_extrafields.php
new file mode 100644
index 00000000000..b81668d6337
--- /dev/null
+++ b/htdocs/recruitment/admin/candidature_extrafields.php
@@ -0,0 +1,108 @@
+<?php
+/* Copyright (C) 2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/recruitement/admin/candidature_extrafields.php
+ *		\ingroup    recruitment
+ *		\brief      Page to setup extra fields of Candidature
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('recruitement', 'admin'));
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+
+$action = GETPOST('action', 'aZ09');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'recruitment_recruitmentcandidature';
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+
+llxHeader('', $langs->trans("RecruitmentSetup"), $help_url);
+
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("RecruitmentSetup"), $linkback, 'title_setup');
+
+
+$head = recruitmentAdminPrepareHead();
+
+dol_fiche_head($head, 'candidature_extrafields', '', -1, '');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/*
+ * Creation of an optional field
+ */
+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';
+}
+
+/*
+ * Edition of an optional field
+ */
+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';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/admin/jobposition_extrafields.php b/htdocs/recruitment/admin/jobposition_extrafields.php
new file mode 100644
index 00000000000..62d6b8418c2
--- /dev/null
+++ b/htdocs/recruitment/admin/jobposition_extrafields.php
@@ -0,0 +1,108 @@
+<?php
+/* Copyright (C) 2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/recruitement/admin/jobposition_extrafields.php
+ *		\ingroup    recruitment
+ *		\brief      Page to setup extra fields of Candidature
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('recruitement', 'admin'));
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+
+$action = GETPOST('action', 'aZ09');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'recruitment_recruitmentjobposition';
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+
+llxHeader('', $langs->trans("RecruitmentSetup"), $help_url);
+
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("RecruitmentSetup"), $linkback, 'title_setup');
+
+
+$head = recruitmentAdminPrepareHead();
+
+dol_fiche_head($head, 'jobposition_extrafields', '', -1, '');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
+}
+
+
+/*
+ * Creation of an optional field
+ */
+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';
+}
+
+/*
+ * Edition of an optional field
+ */
+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';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/admin/public_interface.php b/htdocs/recruitment/admin/public_interface.php
new file mode 100644
index 00000000000..1c943ae1085
--- /dev/null
+++ b/htdocs/recruitment/admin/public_interface.php
@@ -0,0 +1,194 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/recruitment/admin/public_interface.php
+ *		\ingroup    recruitment
+ *		\brief      File of main public page for open job position
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "recruitment"));
+
+$action = GETPOST('action', 'aZ09');
+
+if (!$user->admin) accessforbidden();
+
+$error = 0;
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'setRECRUITMENT_ENABLE_PUBLIC_INTERFACE') {
+	if (GETPOST('value')) dolibarr_set_const($db, 'RECRUITMENT_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'RECRUITMENT_ENABLE_PUBLIC_INTERFACE', 0, 'chaine', 0, '', $conf->entity);
+}
+
+if ($action == 'update') {
+	$public = GETPOST('RECRUITMENT_ENABLE_PUBLIC_INTERFACE');
+
+    $res = dolibarr_set_const($db, "RECRUITMENT_ENABLE_PUBLIC_INTERFACE", $public, 'chaine', 0, '', $conf->entity);
+
+    if (!$res > 0) $error++;
+
+ 	if (!$error) {
+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    } else {
+	    setEventMessages($langs->trans("Error"), null, 'errors');
+    }
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url = 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
+$help_url = '';
+llxHeader('', $langs->trans("RecruitmentSetup"), $help_url);
+
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("RecruitmentSetup"), $linkback, 'title_setup');
+
+$head = recruitmentAdminPrepareHead();
+
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+
+dol_fiche_head($head, 'publicurl', '', -1, '');
+
+
+print '<span class="opacitymedium">'.$langs->trans("PublicInterfaceRecruitmentDesc").'</span><br><br>';
+
+
+$enabledisablehtml = $langs->trans("EnablePublicRecruitmentPages").' ';
+if (empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setRECRUITMENT_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=setRECRUITMENT_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="RECRUITMENT_ENABLE_PUBLIC_INTERFACE" name="RECRUITMENT_ENABLE_PUBLIC_INTERFACE" value="'.(empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE) ? 0 : 1).'">';
+
+
+print '<br>';
+
+/*
+if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
+	print '<br>';
+
+	print '<table class="noborder centpercent">';
+
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Parameter").'</td>';
+	print '<td class="right">'.$langs->trans("Value").'</td>';
+	print "</tr>\n";
+
+	// Force Type
+	$adht = new AdherentType($db);
+	print '<tr class="oddeven drag" id="trforcetype"><td>';
+	print $langs->trans("ForceMemberType");
+	print '</td><td class="right">';
+	$listofval = array();
+	$listofval += $adht->liste_array();
+	$forcetype = $conf->global->MEMBER_NEWFORM_FORCETYPE ?: -1;
+	print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listofval) > 1 ? 1 : 0);
+	print "</td></tr>\n";
+
+	// Amount
+	print '<tr class="oddeven" id="tramount"><td>';
+	print $langs->trans("DefaultAmount");
+	print '</td><td class="right">';
+	print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" size="5" value="'.(!empty($conf->global->MEMBER_NEWFORM_AMOUNT) ? $conf->global->MEMBER_NEWFORM_AMOUNT : '').'">';
+	print "</td></tr>\n";
+
+	// Can edit
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("CanEditAmount");
+	print '</td><td class="right">';
+	print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT", (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) ? $conf->global->MEMBER_NEWFORM_EDITAMOUNT : 0), 1);
+	print "</td></tr>\n";
+
+	// Jump to an online payment page
+	print '<tr class="oddeven" id="trpayment"><td>';
+	print $langs->trans("MEMBER_NEWFORM_PAYONLINE");
+	print '</td><td class="right">';
+	$listofval = array();
+	$listofval['-1'] = $langs->trans('No');
+	$listofval['all'] = $langs->trans('Yes').' ('.$langs->trans("VisitorCanChooseItsPaymentMode").')';
+	if (!empty($conf->paybox->enabled)) $listofval['paybox'] = 'Paybox';
+	if (!empty($conf->paypal->enabled)) $listofval['paypal'] = 'PayPal';
+	if (!empty($conf->stripe->enabled)) $listofval['stripe'] = 'Stripe';
+	print $form->selectarray("MEMBER_NEWFORM_PAYONLINE", $listofval, (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) ? $conf->global->MEMBER_NEWFORM_PAYONLINE : ''), 0);
+	print "</td></tr>\n";
+
+	print '</table>';
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</div>';
+}
+*/
+
+dol_fiche_end();
+
+print '</form>';
+
+/*
+if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
+	print '<br>';
+	//print $langs->trans('FollowingLinksArePublic').'<br>';
+	print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':<br>';
+	if ($conf->multicompany->enabled) {
+		$entity_qr = '?entity='.$conf->entity;
+	} else {
+		$entity_qr = '';
+	}
+
+	// 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
+
+	print '<a target="_blank" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.$urlwithroot.'/public/members/new.php'.$entity_qr.'</a>';
+}
+*/
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
new file mode 100644
index 00000000000..43ffd3af439
--- /dev/null
+++ b/htdocs/recruitment/admin/setup.php
@@ -0,0 +1,523 @@
+<?php
+/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2020 Adminson Alicealalalamdskfldmjgdfgdfhfghgfh <testldr9@dolicloud.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    htdocs/recruitment/admin/setup.php
+ * \ingroup recruitment
+ * \brief   Recruitment setup page.
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+global $langs, $user;
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
+require_once DOL_DOCUMENT_ROOT."/recruitment/class/recruitmentjobposition.class.php";
+
+// Translations
+$langs->loadLangs(array("admin", "recruitment"));
+
+// Access control
+if (!$user->admin) accessforbidden();
+
+// Parameters
+$action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+$value = GETPOST('value', 'alpha');
+
+$arrayofparameters = array(
+//	'RECRUITMENT_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
+//	'RECRUITMENT_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
+);
+
+$error = 0;
+$setupnotempty = 0;
+
+
+/*
+ * Actions
+ */
+
+if ((float) DOL_VERSION >= 6)
+{
+	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+}
+
+if ($action == 'updateMask')
+{
+	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskorder = GETPOST('maskorder', 'alpha');
+
+	if ($maskconstorder) $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+
+	if (!$res > 0) $error++;
+
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen')
+{
+	$modele = GETPOST('module', 'alpha');
+	$tmpobjectkey = GETPOST('object');
+
+	$tmpobject = new $tmpobjectkey($db);
+	$tmpobject->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/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($tmpobject, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+// Activate a model
+elseif ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del')
+{
+	$tmpobjectkey = GETPOST('object');
+
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+	}
+}
+
+// Set default model
+elseif ($action == 'setdoc')
+{
+	$tmpobjectkey = GETPOST('object');
+	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
+	{
+		// The constant that was read before the new set
+		// We therefore requires a variable to have a coherent view
+		$conf->global->$constforval = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+} elseif ($action == 'setmod')
+{
+	// TODO Check if numbering module chosen can be activated
+	// by calling method canBeActivated
+	$tmpobjectkey = GETPOST('object');
+	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
+
+	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+$page_name = "RecruitmentSetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
+
+// Configuration header
+$head = recruitmentAdminPrepareHead();
+dol_fiche_head($head, 'settings', '', -1, '');
+
+// Setup page goes here
+//echo '<span class="opacitymedium">'.$langs->trans("RecruitmentSetupPage").'</span><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 '<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>';
+		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
+		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 '</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>';
+
+		foreach ($arrayofparameters as $key => $val)
+		{
+			$setupnotempty++;
+
+			print '<tr class="oddeven"><td>';
+			$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+			print $form->textwithpicto($langs->trans($key), $tooltiphelp);
+			print '</td><td>'.$conf->global->$key.'</td></tr>';
+		}
+
+		print '</table>';
+
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	}
+}
+
+
+$moduledir = 'recruitment';
+$myTmpObjects = array();
+$myTmpObjects['RecruitmentJobPosition']=array('includerefgeneration'=>1, 'includedocgeneration'=>1);
+
+
+foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
+	if ($myTmpObjectArray['includerefgeneration']) {
+		/*
+		 * Orders Numbering model
+		 */
+		$setupnotempty++;
+
+		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+		print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+		print '</tr>'."\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir)
+		{
+			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
+
+			if (is_dir($dir))
+			{
+				$handle = opendir($dir);
+				if (is_resource($handle))
+				{
+					while (($file = readdir($handle)) !== false)
+					{
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php')
+						{
+							$file = substr($file, 0, dol_strlen($file) - 4);
+
+							require_once $dir.'/'.$file.'.php';
+
+							$module = new $file($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;
+
+							if ($module->isEnabled())
+							{
+								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
+
+								print '<tr class="oddeven"><td>'.$module->name."</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)) 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">';
+								$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
+								if ($conf->global->$constforvar == $file)
+								{
+									print img_picto($langs->trans("Activated"), 'switch_on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
+									print img_picto($langs->trans("Disabled"), 'switch_off');
+									print '</a>';
+								}
+								print '</td>';
+
+								$mytmpinstance = new $myTmpObjectKey($db);
+								$mytmpinstance->initAsSpecimen();
+
+								// Info
+								$htmltooltip = '';
+								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+
+								$nextval = $module->getNextValue($mytmpinstance);
+								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 "</tr>\n";
+							}
+						}
+					}
+					closedir($handle);
+				}
+			}
+		}
+		print "</table><br>\n";
+	}
+
+	if ($myTmpObjectArray['includedocgeneration']) {
+		/*
+		 * Document templates generators
+		 */
+		$setupnotempty++;
+		$type = strtolower($myTmpObjectKey);
+
+		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
+
+		// Load array def with activated templates
+		$def = array();
+		$sql = "SELECT nom";
+		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$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++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+
+		print "<table class=\"noborder\" width=\"100%\">\n";
+		print "<tr class=\"liste_titre\">\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		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="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+		print "</tr>\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir)
+		{
+			foreach (array('', '/doc') as $valdir)
+			{
+				$realpath = $reldir."core/modules/".$moduledir.$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);
+
+						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);
+
+									$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>';
+
+										// 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 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">';
+										$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
+										if ($conf->global->$constforvar == $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;
+
+										$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>';
+
+										// Preview
+										print '<td class="center">';
+										if ($module->type == 'pdf')
+										{
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'generic').'</a>';
+										} else {
+											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+										}
+										print '</td>';
+
+										print "</tr>\n";
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		print '</table>';
+	}
+}
+
+if (empty($setupnotempty)) {
+	print '<br>'.$langs->trans("NothingToSetup");
+}
+
+// Page end
+dol_fiche_end();
+
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
new file mode 100644
index 00000000000..b2b6f25524b
--- /dev/null
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -0,0 +1,523 @@
+<?php
+/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2020 Adminson Alicealalalamdskfldmjgdfgdfhfghgfh <testldr9@dolicloud.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    htdocs/recruitment/admin/setup_candidatures.php
+ * \ingroup recruitment
+ * \brief   Recruitment setup page for candidatures.
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+global $langs, $user;
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
+require_once DOL_DOCUMENT_ROOT."/recruitment/class/recruitmentjobposition.class.php";
+
+// Translations
+$langs->loadLangs(array("admin", "recruitment"));
+
+// Access control
+if (!$user->admin) accessforbidden();
+
+// Parameters
+$action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+$value = GETPOST('value', 'alpha');
+
+$arrayofparameters = array(
+//	'RECRUITMENT_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
+//	'RECRUITMENT_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
+);
+
+$error = 0;
+$setupnotempty = 0;
+
+
+/*
+ * Actions
+ */
+
+if ((float) DOL_VERSION >= 6)
+{
+	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+}
+
+if ($action == 'updateMask')
+{
+	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskorder = GETPOST('maskorder', 'alpha');
+
+	if ($maskconstorder) $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+
+	if (!$res > 0) $error++;
+
+	if (!$error)
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen')
+{
+	$modele = GETPOST('module', 'alpha');
+	$tmpobjectkey = GETPOST('object');
+
+	$tmpobject = new $tmpobjectkey($db);
+	$tmpobject->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/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file))
+		{
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound)
+	{
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($tmpobject, $langs) > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+}
+
+// Activate a model
+elseif ($action == 'set')
+{
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del')
+{
+	$tmpobjectkey = GETPOST('object');
+
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+	}
+}
+
+// Set default model
+elseif ($action == 'setdoc')
+{
+	$tmpobjectkey = GETPOST('object');
+	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
+	{
+		// The constant that was read before the new set
+		// We therefore requires a variable to have a coherent view
+		$conf->global->$constforval = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0)
+	{
+		$ret = addDocumentModel($value, $type, $label, $scandir);
+	}
+} elseif ($action == 'setmod')
+{
+	// TODO Check if numbering module chosen can be activated
+	// by calling method canBeActivated
+	$tmpobjectkey = GETPOST('object');
+	$constforval = 'RECRUITMENT_'.strtoupper($tmpobjectkey)."_ADDON";
+
+	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+$page_name = "RecruitmentSetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
+
+// Configuration header
+$head = recruitmentAdminPrepareHead();
+dol_fiche_head($head, 'settings_candidatures', '', -1, '');
+
+// Setup page goes here
+//echo '<span class="opacitymedium">'.$langs->trans("RecruitmentSetupPage").'</span><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 '<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>';
+		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
+		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 '</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>';
+
+		foreach ($arrayofparameters as $key => $val)
+		{
+			$setupnotempty++;
+
+			print '<tr class="oddeven"><td>';
+			$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+			print $form->textwithpicto($langs->trans($key), $tooltiphelp);
+			print '</td><td>'.$conf->global->$key.'</td></tr>';
+		}
+
+		print '</table>';
+
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	}
+}
+
+
+$moduledir = 'recruitment';
+$myTmpObjects = array();
+$myTmpObjects['RecruitmentCandidature'] = array('includerefgeneration'=>1, 'includedocgeneration'=>0);
+
+
+foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
+	if ($myTmpObjectArray['includerefgeneration']) {
+		/*
+		 * Orders Numbering model
+		 */
+		$setupnotempty++;
+
+		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+		print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+		print '</tr>'."\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir)
+		{
+			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
+
+			if (is_dir($dir))
+			{
+				$handle = opendir($dir);
+				if (is_resource($handle))
+				{
+					while (($file = readdir($handle)) !== false)
+					{
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php')
+						{
+							$file = substr($file, 0, dol_strlen($file) - 4);
+
+							require_once $dir.'/'.$file.'.php';
+
+							$module = new $file($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;
+
+							if ($module->isEnabled())
+							{
+								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
+
+								print '<tr class="oddeven"><td>'.$module->name."</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)) 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">';
+								$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
+								if ($conf->global->$constforvar == $file)
+								{
+									print img_picto($langs->trans("Activated"), 'switch_on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
+									print img_picto($langs->trans("Disabled"), 'switch_off');
+									print '</a>';
+								}
+								print '</td>';
+
+								$mytmpinstance = new $myTmpObjectKey($db);
+								$mytmpinstance->initAsSpecimen();
+
+								// Info
+								$htmltooltip = '';
+								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+
+								$nextval = $module->getNextValue($mytmpinstance);
+								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 "</tr>\n";
+							}
+						}
+					}
+					closedir($handle);
+				}
+			}
+		}
+		print "</table><br>\n";
+	}
+
+	if ($myTmpObjectArray['includedocgeneration']) {
+		/*
+		 * Document templates generators
+		 */
+		$setupnotempty++;
+		$type = strtolower($myTmpObjectKey);
+
+		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
+
+		// Load array def with activated templates
+		$def = array();
+		$sql = "SELECT nom";
+		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$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++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+
+		print "<table class=\"noborder\" width=\"100%\">\n";
+		print "<tr class=\"liste_titre\">\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		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="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+		print "</tr>\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir)
+		{
+			foreach (array('', '/doc') as $valdir)
+			{
+				$realpath = $reldir."core/modules/".$moduledir.$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);
+
+						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);
+
+									$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>';
+
+										// 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 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">';
+										$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON';
+										if ($conf->global->$constforvar == $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;
+
+										$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>';
+
+										// Preview
+										print '<td class="center">';
+										if ($module->type == 'pdf')
+										{
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'generic').'</a>';
+										} else {
+											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+										}
+										print '</td>';
+
+										print "</tr>\n";
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		print '</table>';
+	}
+}
+
+if (empty($setupnotempty)) {
+	print '<br>'.$langs->trans("NothingToSetup");
+}
+
+// Page end
+dol_fiche_end();
+
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
new file mode 100644
index 00000000000..df96744526b
--- /dev/null
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -0,0 +1,1075 @@
+<?php
+/* Copyright (C) 2020  Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        class/recruitmentcandidature.class.php
+ * \ingroup     recruitment
+ * \brief       This file is a CRUD class file for RecruitmentCandidature (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for RecruitmentCandidature
+ */
+class RecruitmentCandidature extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'recruitment';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'recruitmentcandidature';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'recruitment_recruitmentcandidature';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 0;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
+	/**
+	 * @var string String with name of icon for recruitmentcandidature. Must be the part after the 'object_' into object_recruitmentcandidature.png
+	 */
+	public $picto = 'recruitmentcandidature';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	//const STATUS_INTERVIEW_SCHEDULED = 2;
+	const STATUS_CONTRACT_PROPOSED = 3;
+	const STATUS_CONTRACT_SIGNED = 5;
+	const STATUS_REFUSED = 8;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  '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.
+	 */
+
+	// 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', '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 candidature"),
+		'fk_recruitmentjobposition' => array('type'=>'integer:RecruitmentJobPosition:recruitment/class/recruitmentjobposition.class.php', 'label'=>'Job', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>1, 'index'=>1),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
+		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'lastname' => array('type'=>'varchar(128)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>1,),
+		'firstname' => array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,),
+		'email' => array('type'=>'varchar(255)', 'label'=>'EMail', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1,),
+		'phone' => array('type'=>'varchar(64)', 'label'=>'Phone', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1,),
+		'date_birth' => array('type'=>'date', 'label'=>'DateOfBirth', 'enabled'=>'1', 'position'=>70, 'visible'=>-1,),
+		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
+		//'fk_recruitment_origin' => array('type'=>'integer:CRecruitmentOrigin:recruitment/class/crecruitmentorigin.class.php', 'label'=>'Origin', 'enabled'=>'1', 'position'=>45, 'visible'=>1, 'index'=>1),
+		'remuneration_requested' => array('type'=>'integer', 'label'=>'RequestedRemuneration', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1,),
+		'remuneration_proposed' => array('type'=>'integer', 'label'=>'ProposedRemuneration', 'enabled'=>'1', 'position'=>81, 'notnull'=>0, 'visible'=>-1,),
+		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>500, 'notnull'=>0, 'visible'=>3,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'default'=>0, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Received', '3'=>'ContractProposed', '5'=>'ContractSigned', '8'=>'Refused', '9'=>'Canceled')),
+	);
+	public $rowid;
+	public $entity;
+	public $ref;
+	public $fk_recruitmentjobposition;
+	public $description;
+	public $note_public;
+	public $note_private;
+	public $date_creation;
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $lastname;
+	public $firstname;
+	public $email;
+	public $phone;
+	public $date_birth;
+	public $email_msgid;
+	public $remuneration_requested;
+	public $remuneration_proposed;
+	public $fk_recruitment_origin;
+	public $import_key;
+	public $model_pdf;
+	public $status;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	/**
+	 * @var int    Name of subtable line
+	 */
+	//public $table_element_line = 'recruitment_recruitmentcandidatureline';
+
+	/**
+	 * @var int    Field with ID of parent key if this object has a parent
+	 */
+	//public $fk_element = 'fk_recruitmentcandidature';
+
+	/**
+	 * @var int    Name of subtable class that manage subtable lines
+	 */
+	//public $class_element_line = 'RecruitmentCandidatureline';
+
+	/**
+	 * @var array	List of child tables. To test if we can delete object.
+	 */
+	//protected $childtables = array();
+
+	/**
+	 * @var array    List of child tables. To know object to delete on cascade.
+	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	 */
+	//protected $childtablesoncascade = array('recruitment_recruitmentcandidaturedet');
+
+	/**
+	 * @var RecruitmentCandidatureLine[]     Array of subtable lines
+	 */
+	//public $lines = array();
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$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;
+
+		// Example to show how to set values of fields definition dynamically
+		/*if ($user->rights->recruitment->recruitmentcandidature->read) {
+			$this->fields['myfield']['visible'] = 1;
+			$this->fields['myfield']['noteditable'] = 0;
+		}*/
+
+		// 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
+		if (is_object($langs))
+		{
+			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);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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)
+	{
+		return $this->createCommon($user, $notrigger);
+	}
+
+	/**
+	 * Clone an 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, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// 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();
+
+		// 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->table_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;
+		}
+
+		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++;
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// 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
+	 * @param	string	$email_msgid	Email msgid
+	 * @return	int         			<0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null, $email_msgid = '')
+	{
+		$morewhere = '';
+		if ($email_msgid) $morewhere = " AND email_msgid = '".$this->db->escape($email_msgid)."'";
+		$result = $this->fetchCommon($id, $ref, $morewhere);
+		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()
+	{
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+
+	/**
+	 * 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);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList();
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		else $sql .= ' WHERE 1 = 1';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that 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);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0)
+		{
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		return $this->deleteLineCommon($user, $idline, $notrigger);
+	}
+
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 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->recruitment->recruitmentcandidature->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitmentcandidature->recruitmentcandidature_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$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
+		{
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."',";
+			if (!empty($this->fields['fk_user_valid'])) $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++;
+			}
+
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('RECRUITMENTCANDIDATURE_VALIDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
+
+		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 = 'recruitmentcandidature/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'recruitmentcandidature/".$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->recruitment->dir_output.'/recruitmentcandidature/'.$oldref;
+				$dirdest = $conf->recruitment->dir_output.'/recruitmentcandidature/'.$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->recruitment->dir_output.'/recruitmentcandidature/'.$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;
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft 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 if OK
+	 */
+	public function setDraft($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status <= self::STATUS_DRAFT)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'RECRUITMENTCANDIDATURE_UNVALIDATE');
+	}
+
+	/**
+	 *	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 cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'RECRUITMENTCANDIDATURE_CLOSE');
+	}
+
+	/**
+	 *	Set back to validated 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->status != self::STATUS_CANCELED)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'RECRUITMENTCANDIDATURE_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', ...)
+	 *  @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
+
+		$result = '';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("RecruitmentCandidature").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
+		$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->getFullName($langs);
+		if (isset($this->status)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		}
+
+		$url = dol_buildpath('/recruitment/recruitmentcandidature_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';
+		}
+
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowRecruitmentCandidature");
+				$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>';
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			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);
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$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('recruitmentcandidaturedao'));
+		$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 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) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			//$langs->load("recruitment@recruitment");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$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_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_CANCELED] = $langs->trans('Canceled');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_CANCELED) $statusType = 'status6';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@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_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->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();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		$objectline = new RecruitmentCandidatureLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_recruitmentcandidature = '.$this->id));
+
+		if (is_numeric($result))
+		{
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
+	}
+
+	/**
+	 *  Returns the reference to the following non used object depending on the active numbering module.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("recruitment@recruitment");
+
+		if (empty($conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON)) {
+			$conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON = 'mod_recruitmentcandidature_standard';
+		}
+
+		if (!empty($conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON))
+		{
+			$mybool = false;
+
+			$file = $conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON.".php";
+			$classname = $conf->global->RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir)
+			{
+				$dir = dol_buildpath($reldir."core/modules/recruitment/");
+
+				// 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 (class_exists($classname)) {
+				$obj = new $classname();
+				$numref = $obj->getNextValue($this);
+
+				if ($numref != '' && $numref != '-1')
+				{
+					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("ClassNotFound").' '.$classname;
+				return "";
+			}
+		} else {
+			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
+			return "";
+		}
+	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @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
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
+
+		$result = 0;
+		$includedocgeneration = 0;
+
+		$langs->load("recruitment@recruitment");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_recruitmentcandidature';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (!empty($conf->global->RECRUITMENTCANDIDATURE_ADDON_PDF)) {
+				$modele = $conf->global->RECRUITMENTCANDIDATURE_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/recruitment/doc/";
+
+		if ($includedocgeneration) {
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
+
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+
+/**
+ * Class RecruitmentCandidatureLine. You can also remove this and generate a CRUD class for lines objects.
+ */
+class RecruitmentCandidatureLine extends CommonObjectLine
+{
+	// To complete with content of an object RecruitmentCandidatureLine
+	// We should have a field rowid, fk_recruitmentcandidature and position
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+}
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
new file mode 100644
index 00000000000..355cae49c89
--- /dev/null
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -0,0 +1,1124 @@
+<?php
+/* Copyright (C) 2020  Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        class/recruitmentjobposition.class.php
+ * \ingroup     recruitment
+ * \brief       This file is a CRUD class file for RecruitmentJobPosition (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for RecruitmentJobPosition
+ */
+class RecruitmentJobPosition extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'recruitment';
+
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'recruitmentjobposition';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'recruitment_recruitmentjobposition';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 1;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	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';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_RECRUITED = 3;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  '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.
+	 */
+
+	// 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', '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),
+		'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',),
+		'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',),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'1', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner",),
+		'date_planned' => array('type'=>'date', 'label'=>'DateExpected', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
+		'remuneration_suggested' => array('type'=>'varchar(255)', 'label'=>'Remuneration', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>1,),
+		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>3,),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>101, 'notnull'=>0, 'visible'=>0,),
+		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>102, 'notnull'=>0, 'visible'=>0,),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>900, 'notnull'=>0, 'visible'=>0,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '3'=>'Recruited', '9'=>'Canceled'),),
+	);
+	public $rowid;
+	public $ref;
+	public $entity;
+	public $label;
+	public $qty;
+	public $fk_soc;
+	public $fk_project;
+	public $fk_user_recruiter;
+	public $email_recruiter;
+	public $fk_user_supervisor;
+	public $fk_establishment;
+	public $date_planned;
+	public $description;
+	public $note_public;
+	public $note_private;
+	public $date_creation;
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $last_main_doc;
+	public $import_key;
+	public $model_pdf;
+	public $status;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	/**
+	 * @var int    Name of subtable line
+	 */
+	//public $table_element_line = 'recruitment_recruitmentjobpositionline';
+
+	/**
+	 * @var int    Field with ID of parent key if this field has a parent
+	 */
+	//public $fk_element = 'fk_recruitmentjobposition';
+
+	/**
+	 * @var int    Name of subtable class that manage subtable lines
+	 */
+	//public $class_element_line = 'RecruitmentJobPositionline';
+
+	/**
+	 * @var array	List of child tables. To test if we can delete object.
+	 */
+	//protected $childtables=array();
+
+	/**
+	 * @var array	List of child tables. To know object to delete on cascade.
+	 */
+	//protected $childtablesoncascade=array('recruitment_recruitmentjobpositiondet');
+
+	/**
+	 * @var RecruitmentJobPositionLine[]     Array of subtable lines
+	 */
+	//public $lines = array();
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$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;
+
+		// Example to show how to set values of fields definition dynamically
+		/*if ($user->rights->recruitment->recruitmentjobposition->read) {
+			$this->fields['myfield']['visible'] = 1;
+			$this->fields['myfield']['noteditable'] = 0;
+		}*/
+
+		// 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
+		if (is_object($langs))
+		{
+			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);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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)
+	{
+		return $this->createCommon($user, $notrigger);
+	}
+
+	/**
+	 * Clone an 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, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// 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();
+
+		// 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]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$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 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']);
+
+		// 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 lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+
+	/**
+	 * 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);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList();
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		else $sql .= ' WHERE 1 = 1';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that 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);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0)
+		{
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		return $this->deleteLineCommon($user, $idline, $notrigger);
+	}
+
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 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->recruitmentjobposition->create))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitmentjobposition->recruitmentjobposition_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$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
+		{
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."',";
+			if (!empty($this->fields['fk_user_valid'])) $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++;
+			}
+
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('RECRUITMENTJOBPOSITION_VALIDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
+
+		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 = 'recruitmentjobposition/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'recruitmentjobposition/".$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->recruitment->dir_output.'/recruitmentjobposition/'.$oldref;
+				$dirdest = $conf->recruitment->dir_output.'/recruitmentjobposition/'.$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->recruitment->dir_output.'/recruitmentjobposition/'.$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;
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft 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 if OK
+	 */
+	public function setDraft($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status <= self::STATUS_DRAFT)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'RECRUITMENTJOBPOSITION_UNVALIDATE');
+	}
+
+	/**
+	 *	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 cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'RECRUITMENTJOBPOSITION_CLOSE');
+	}
+
+	/**
+	 *	Close the commercial proposal
+	 *
+	 *	@param      User	$user		Object user that close
+	 *	@param      int		$status		Statut
+	 *	@param      string	$note		Complete private note with this note
+	 *  @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)
+	{
+		global $langs, $conf;
+
+		$error = 0;
+		$now = dol_now();
+
+		$this->db->begin();
+
+		$newprivatenote = dol_concatdesc($this->note_private, $note);
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET status = ".$status.", note_private = '".$this->db->escape($newprivatenote)."'";
+		//$sql .= ", date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$modelpdf = $this->model_pdf;
+			$triggerName = 'RECRUITMENTJOB_CLOSE_REFUSED';
+
+			if ($status == self::STATUS_RECRUITED)
+			{
+				$triggerName = 'RECRUITMENTJOB_CLOSE_RECRUITED';
+				$modelpdf = $this->model_pdf;
+
+				if ($result < 0)
+				{
+					$this->error = $this->db->lasterror();
+					$this->db->rollback();
+					return -2;
+				}
+			}
+
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				// Define output language
+				$outputlangs = $langs;
+				if (!empty($conf->global->MAIN_MULTILANGS))
+				{
+					$outputlangs = new Translate("", $conf);
+					$newlang = (GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $this->thirdparty->default_lang);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				//$ret=$object->fetch($id);    // Reload to get new records
+				$this->generateDocument($modelpdf, $outputlangs);
+			}
+
+			if (!$error)
+			{
+				$this->oldcopy = clone $this;
+				$this->status = $status;
+				$this->date_cloture = $now;
+				$this->note_private = $newprivatenote;
+			}
+
+			if (!$notrigger && empty($error))
+			{
+				// Call trigger
+				$result = $this->call_trigger($triggerName, $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->status = $this->oldcopy->status;
+				$this->date_cloture = $this->oldcopy->date_cloture;
+				$this->note_private = $this->oldcopy->note_private;
+
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Set back to validated 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->status != self::STATUS_CANCELED)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->recruitment->recruitment_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'RECRUITMENTJOBPOSITION_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', ...)
+	 *  @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
+
+		$result = '';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("PositionToBeFilled").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+		if (isset($this->status)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		}
+
+		$url = dol_buildpath('/recruitment/recruitmentjobposition_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';
+		}
+
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowRecruitmentJobPosition");
+				$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>';
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			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);
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$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('recruitmentjobpositiondao'));
+		$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 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) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			//$langs->load("recruitment");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
+			$this->labelStatus[self::STATUS_RECRUITED] = $langs->trans('Recruited');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Canceled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
+			$this->labelStatusShort[self::STATUS_RECRUITED] = $langs->trans('Recruited');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Canceled');
+		}
+
+		$statusType = 'status'.$status;
+		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_RECRUITED) $statusType = 'status6';
+		if ($status == self::STATUS_CANCELED) $statusType = 'status9';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@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_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->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();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		return $this->lines;
+	}
+
+	/**
+	 *  Returns the reference to the following non used object depending on the active numbering module.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("recruitment");
+
+		if (empty($conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON)) {
+			$conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON = 'mod_recruitmentjobposition_standard';
+		}
+
+		if (!empty($conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON))
+		{
+			$mybool = false;
+
+			$file = $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON.".php";
+			$classname = $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir)
+			{
+				$dir = dol_buildpath($reldir."core/modules/recruitment/");
+
+				// 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 (class_exists($classname)) {
+				$obj = new $classname();
+				$numref = $obj->getNextValue($this);
+
+				if ($numref != '' && $numref != '-1')
+				{
+					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("ClassNotFound").' '.$classname;
+				return "";
+			}
+		} else {
+			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
+			return "";
+		}
+	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @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
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
+
+		$result = 0;
+		$includedocgeneration = 1;
+
+		$langs->load("recruitment");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_recruitmentjobposition';
+
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF)) {
+				$modele = $conf->global->RECRUITMENTJOBPOSITION_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/recruitment/doc/";
+
+		if ($includedocgeneration) {
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
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
new file mode 100644
index 00000000000..eedc3fbc7c8
--- /dev/null
+++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
@@ -0,0 +1,502 @@
+<?php
+/* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
+ * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
+ * Copyright (C) 2018-2019  Philippe Grand      <philippe.grand@atoo-net.com>
+ * 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/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+ *	\ingroup    recruitment
+ *	\brief      File of class to build ODT documents for recruitmentjobpositions
+ */
+
+dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php');
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosition
+{
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 */
+	public $phpmin = array(5, 5);
+
+	/**
+	 * @var string Dolibarr version of the loaded document
+	 */
+	public $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array("main", "companies"));
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
+
+		// Page size for A4 format
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Affiche logo
+		$this->option_tva = 0; // Gere option tva COMMANDE_TVAOPTION
+		$this->option_modereg = 0; // Affiche mode reglement
+		$this->option_condreg = 0; // Affiche conditions reglement
+		$this->option_codeproduitservice = 0; // Affiche code produit-service
+		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
+
+		// 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;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array("errors", "companies"));
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<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="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		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 {
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+			}
+		}
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
+		$texte .= '<br></div></div>';
+
+		// Scan directories
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH))
+		{
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
+			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+			$texte .= count($listoffiles);
+			//$texte.=$nbofiles?'</a>':'';
+			$texte .= '</b>';
+		}
+
+		if ($nbofiles)
+		{
+			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+			foreach ($listoffiles as $file)
+			{
+				$texte .= $file['name'].'<br>';
+			}
+			$texte .= '</div>';
+		}
+
+		$texte .= '</td>';
+
+		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		Commande	$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
+	 *	@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;
+
+		if (empty($srctemplatepath))
+		{
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			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;
+
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
+
+		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
+
+		if ($conf->commande->dir_output)
+		{
+			// If $object is id instead of object
+			if (!is_object($object))
+			{
+				$id = $object;
+				$object = new Commande($this->db);
+				$result = $object->fetch($id);
+				if ($result < 0)
+				{
+					dol_print_error($this->db, $object->error);
+					return -1;
+				}
+			}
+
+			$dir = $conf->commande->multidir_output[isset($object->entity) ? $object->entity : 1];
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			$file = $dir."/".$objectref.".odt";
+
+			if (!file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+				$newfiletmp = $objectref.'_'.$newfiletmp;
+				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
+				// Get extension (ods or odt)
+				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
+				{
+					$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;
+				}
+				$file = $dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
+
+				dol_mkdir($conf->recruitment->dir_temp);
+
+
+				// If CUSTOMER contact defined on order, we use it
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
+				if (count($arrayidcontact) > 0)
+				{
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// 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;
+					}
+				} else {
+					$socobject = $object->thirdparty;
+				}
+
+				// Make substitution
+				$substitutionarray = array(
+					'__FROM_NAME__' => $this->emetteur->name,
+					'__FROM_EMAIL__' => $this->emetteur->email,
+					'__TOTAL_TTC__' => $object->total_ttc,
+					'__TOTAL_HT__' => $object->total_ht,
+					'__TOTAL_VAT__' => $object->total_vat
+				);
+				complete_substitutions_array($substitutionarray, $langs, $object);
+				// Call the ODTSubstitution hook
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$substitutionarray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				// Line of free text
+				$newfreetext = '';
+				$paramfreetext = 'ORDER_FREE_TEXT';
+				if (!empty($conf->global->$paramfreetext))
+				{
+					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+				}
+
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+						'PATH_TO_TMP'	  => $conf->commande->dir_temp,
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'DELIMITER_LEFT'  => '{',
+						'DELIMITER_RIGHT' => '}'
+						)
+					);
+				} catch (Exception $e)
+				{
+					$this->error = $e->getMessage();
+					dol_syslog($e->getMessage(), LOG_INFO);
+					return -1;
+				}
+				// After construction $odfHandler->contentXml contains content and
+				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+				// [!-- BEGIN lines --]*[!-- END lines --]
+				//print html_entity_decode($odfHandler->__toString());
+				//print exit;
+
+
+				// Make substitutions into odt of freetext
+				try {
+					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
+				} catch (OdfException $e)
+				{
+					dol_syslog($e->getMessage(), LOG_INFO);
+				}
+
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet = $this->get_substitutionarray_object($object, $outputlangs);
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
+				// retrieve contact information for use in object as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+
+				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+
+				// Call the ODTSubstitution hook
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				foreach ($tmparray as $key=>$value)
+				{
+					try {
+						if (preg_match('/logo$/', $key)) {
+							// Image
+							if (file_exists($value)) $odfHandler->setImage($key, $value);
+							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						} else {
+							// Text
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					} catch (OdfException $e)
+					{
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+				}
+				// Replace tags of lines
+				try {
+					$foundtagforlines = 1;
+					try {
+						$listlines = $odfHandler->setSegment('lines');
+					} catch (OdfException $e)
+					{
+						// We may arrive here if tags for lines not present into template
+						$foundtagforlines = 0;
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+					if ($foundtagforlines)
+					{
+						$linenumber = 0;
+						foreach ($object->lines as $line)
+						{
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
+							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
+							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+							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)
+								{
+									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;
+				}
+
+				// Replace labels translated
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key=>$value)
+				{
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					} catch (OdfException $e)
+					{
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+				}
+
+				// Call the beforeODTSave hook
+
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					} catch (Exception $e) {
+						$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);
+						return -1;
+					}
+				}
+
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$odfHandler = null; // Destroy object
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1; // Success
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+}
diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
new file mode 100644
index 00000000000..ee0f63f6c4f
--- /dev/null
+++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
@@ -0,0 +1,1271 @@
+<?php
+/* Copyright (C) 2004-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2008       Raphael Bertrand        <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2014  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cédric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/modulebuilder/template/core/modules/recruitment/doc/pdf_standard.modules.php
+ *  \ingroup    recruitment
+ *  \brief      File of class to generate document from standard template
+ */
+
+dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php');
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+
+/**
+ *	Class to manage PDF template standard_recruitmentjobposition
+ */
+class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPosition
+{
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @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 document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 */
+	public $phpmin = array(5, 5);
+
+	/**
+	 * 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 marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
+	/**
+	 * Issuer
+	 * @var Societe Object that emits
+	 */
+	public $emetteur;
+
+	/**
+	 * @var bool Situation invoice type
+	 */
+	public $situationinvoice;
+
+
+	/**
+	 * @var array of document table collumns
+	 */
+	public $cols;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc;
+
+		// Translations
+		$langs->loadLangs(array("main", "bills"));
+
+		$this->db = $db;
+		$this->name = "standard";
+		$this->description = $langs->trans('DocumentModelStandardPDF');
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
+
+		// Dimension page
+		$this->type = 'pdf';
+		$formatarray = pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 1; // Displays if there has been a discount
+		$this->option_credit_note = 1; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+
+		// Get source company
+		$this->emetteur = $mysoc;
+		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+
+		// Define position of columns
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
+
+
+		$this->tabTitleHeight = 5; // default height
+
+		//  Use new system for position of columns, view  $this->defineColumnField()
+
+		$this->tva = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
+		$this->situationinvoice = false;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
+
+		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
+
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
+
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			global $outputlangsbis;
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		}
+
+		$nblines = (is_array($object->lines) ? count($object->lines) : 0);
+
+		$hidetop = 0;
+		if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
+			$hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
+		}
+
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		$this->atleastonephoto = false;
+		/*
+	    if (!empty($conf->global->MAIN_GENERATE_MYOBJECT_WITH_PICTURE))
+	    {
+	        $objphoto = new Product($this->db);
+
+	        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
+	            }
+
+	            $arephoto = false;
+	            foreach ($pdir as $midir)
+	            {
+	                if (!$arephoto)
+	                {
+	                    $dir = $conf->product->dir_output.'/'.$midir;
+
+	                    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;
+	                    }
+	                }
+	            }
+
+	            if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+	        }
+	    }
+		*/
+
+		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+
+		if ($conf->recruitment->dir_output.'/recruitmentjobposition')
+		{
+			$object->fetch_thirdparty();
+
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->recruitment->dir_output.'/recruitmentjobposition';
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->recruitment->dir_output.'/recruitmentjobposition/'.$objectref;
+				$file = $dir."/".$objectref.".pdf";
+			}
+			if (!file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return 0;
+				}
+			}
+
+			if (file_exists($dir))
+			{
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+
+				// Set nblines with the new facture lines content after hook
+				$nblines = (is_array($object->lines) ? count($object->lines) : 0);
+
+				// Create pdf instance
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
+
+				$heightforinfotot = 50; // Height reserved to output the info and total part and payment part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
+
+				$pdf->Open();
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($object->label);
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$object->label." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+				// Set certificate
+				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
+				// If user has no certificate, we try to take the company one
+				if (!$cert) {
+					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
+				}
+				// If a certificate is found
+				if ($cert) {
+					$info = array(
+						'Name' => $this->emetteur->name,
+						'Location' => getCountry($this->emetteur->country_code, 0),
+						'Reason' => 'MYOBJECT',
+						'ContactInfo' => $this->emetteur->email
+					);
+					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
+				}
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+
+				// New page
+				$pdf->AddPage();
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
+
+				$tab_top = 90 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+				$tab_height = 130 - $top_shift;
+				$tab_height_newpage = 150;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
+
+				$nexY = $tab_top - 1;
+
+				// Display notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote))
+				{
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
+
+				$pagenb = $pdf->getPage();
+				if ($notetoshow)
+				{
+					$tab_top -= 2;
+
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
+
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+
+					$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();
+
+					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);
+						}
+
+						// 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();
+
+						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);
+
+
+							$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);
+
+							$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);
+
+						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;
+						}
+					}
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
+				} else {
+					$height_note = 0;
+				}
+
+				// Use new auto column system
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+				// Table simulation to know the height of the title line
+				$pdf->startTransaction();
+				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+				$pdf->rollbackTransaction(true);
+
+				$nexY = $tab_top + $this->tabTitleHeight;
+
+				// Loop on each lines
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
+
+					// Define size of image if we need it
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
+
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
+
+					if ($this->getColumnStatus('photo'))
+					{
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
+						{
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->setPage($pageposbefore + 1);
+
+							$curY = $tab_top_newpage;
+
+							// 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'];
+						}
+					}
+
+					// Description of product line
+					if ($this->getColumnStatus('desc'))
+					{
+						$pdf->startTransaction();
+
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$pageposafter = $pdf->getPage();
+
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('', '', true);
+									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									$pdf->setPage($pageposafter + 1);
+								}
+							} else {
+								// We found a page break
+								// 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();
+						}
+					}
+
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description or photo were moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+
+
+
+					$parameters = array(
+						'object' => $object,
+						'i' => $i,
+						'pdf' =>& $pdf,
+						'curY' =>& $curY,
+						'nexY' =>& $nexY,
+						'outputlangs' => $outputlangs,
+						'hidedetails' => $hidedetails
+					);
+					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
+
+
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter) {
+						$pdf->setPage($pagenb);
+						if ($pagenb == $pageposbeforeprintlines) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						// New page
+						$pdf->AddPage();
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
+
+				// Show square
+				if ($pagenb == $pageposbeforeprintlines)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+
+				// Display infos area
+				//$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+
+				// Display total zone
+				//$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+				// Display payment area
+				/*
+	            if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
+	            {
+	                $posy = $this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
+	            }
+	            */
+
+				// Pagefoot
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+
+				$pdf->Close();
+
+				$pdf->Output($file, 'F');
+
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0)
+				{
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
+				}
+
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+					$this->result = array('fullpath'=>$file);
+
+					return 1; // No error
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+	// 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
+		return parent::liste_modeles($db, $maxfilenamelength); // TODO: Change the autogenerated stub
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		tcpdf			$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y (not used)
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
+	 *   @param		Translate	$outputlangsbis	Langs object bis
+	 *   @return	void
+	 */
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
+	{
+		global $conf;
+
+		// Force to disable hidetop and hidebottom
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
+
+		$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);
+
+		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, $this->tabTitleHeight, '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->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
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	Tcpdf			$pdf     		Object PDF
+	 *  @param  Object		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
+	 *  @return	void
+	 */
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
+	{
+		global $conf, $langs;
+
+		// Load traductions files required by page
+		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
+
+		// Show Draft Watermark
+		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
+		{
+			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
+		}
+
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+
+		$w = 110;
+
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
+
+		$pdf->SetXY($this->marge_gauche, $posy);
+
+		// Logo
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
+		{
+			if ($this->emetteur->logo)
+			{
+				$logodir = $conf->mycompany->dir_output;
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
+				{
+					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
+				} else {
+					$logo = $logodir.'/logos/'.$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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				}
+			} else {
+				$text = $this->emetteur->name;
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+			}
+		}
+
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $object->label;
+		/*if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			$title .= ' - ';
+			$title .= $outputlangsbis->transnoentities("JobPosition");
+		}*/
+		$pdf->MultiCell($w, 3, $title, '', 'R');
+
+		$pdf->SetFont('', 'B', $default_font_size);
+
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == Facture::STATUS_DRAFT)
+		{
+			$pdf->SetTextColor(128, 0, 0);
+			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
+		$pdf->MultiCell($w, 4, $textref, '', 'R');
+
+		$posy += 1;
+		$pdf->SetFont('', '', $default_font_size - 2);
+
+		if ($object->ref_client)
+		{
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+		}
+
+		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
+		{
+			$object->fetch_projet();
+			if (!empty($object->project->ref))
+			{
+				$posy += 3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : ".(empty($object->project->title) ? '' : $object->projet->title), '', 'R');
+			}
+		}
+
+		if (!empty($conf->global->PDF_SHOW_PROJECT))
+		{
+			$object->fetch_projet();
+			if (!empty($object->project->ref))
+			{
+				$posy += 3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : ".(empty($object->project->ref) ? '' : $object->projet->ref), '', 'R');
+			}
+		}
+
+		$posy += 4;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+
+		$title = $outputlangs->transnoentities("Date");
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			$title .= ' - '.$outputlangsbis->transnoentities("Date");
+		}
+		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date_creation, "day", false, $outputlangs), '', 'R');
+
+		if ($object->thirdparty->code_client)
+		{
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+		}
+
+		$posy += 1;
+
+		$top_shift = 0;
+		// Show list of linked objects
+		$current_y = $pdf->getY();
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
+		if ($current_y < $pdf->getY())
+		{
+			$top_shift = $pdf->getY() - $current_y;
+		}
+
+		if ($showaddress)
+		{
+			// Sender properties
+			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+
+			// Show sender
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+
+			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+
+
+			// Show sender frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
+			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0, 0, 60);
+
+			// Show sender name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$posy = $pdf->getY();
+
+			// Show sender information
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
+
+			// If BILLING contact defined on invoice, we use it
+			$usecontact = false;
+			$arrayidcontact = $object->getIdContact('external', 'BILLING');
+			if (count($arrayidcontact) > 0)
+			{
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
+			}
+
+			// Recipient name
+			/*if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
+				$thirdparty = $object->contact;
+			} else {
+				$thirdparty = $object->thirdparty;
+			}
+
+			if (is_object($thirdparty)) {
+				$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			}
+
+			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
+
+			// Show recipient
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
+			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+
+			// Show recipient frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx + 2, $posy - 5);
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+			// Show recipient name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
+
+			$posy = $pdf->getY();
+
+			// Show recipient information
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			*/
+		}
+
+		$pdf->SetTextColor(0, 0, 0);
+		return $top_shift;
+	}
+
+	// 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
+	 */
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	{
+		global $conf;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
+
+	/**
+	 *  Define Array Column Field
+	 *
+	 *  @param	object			$object    		common object
+	 *  @param	Translate		$outputlangs    langs
+	 *  @param	int			   $hidedetails		Do not show line details
+	 *  @param	int			   $hidedesc		Do not show desc
+	 *  @param	int			   $hideref			Do not show ref
+	 *  @return	null
+	 */
+	public function 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->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
+	        'width' => 20, // the column width in mm
+	        'title' => array(
+	            'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+	            'label' => ' ', // the final label : used fore final generated text
+	            'align' => 'L', // text alignement :  R,C,L
+	            'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        ),
+	        'content' => array(
+	            'align' => 'L', // text alignement :  R,C,L
+	            'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        ),
+	    );
+	    */
+
+		$rank = 0; // do not use negative rank
+		/*
+	    $this->cols['desc'] = array(
+	        'rank' => $rank,
+	        'width' => false, // only for desc
+	        'status' => true,
+	        'title' => array(
+	            'textkey' => 'Designation', // use lang key is usefull in somme case with module
+	            'align' => 'L',
+	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+	            // 'label' => ' ', // the final label
+	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        ),
+	        'content' => array(
+	            'align' => 'L',
+                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+	        ),
+	    );
+
+	    // PHOTO
+        $rank = $rank + 10;
+        $this->cols['photo'] = array(
+            'rank' => $rank,
+            'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+            'status' => false,
+            'title' => array(
+                'textkey' => 'Photo',
+                'label' => ' '
+            ),
+            'content' => array(
+                'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+            ),
+            'border-left' => false, // remove left line separator
+        );
+
+	    if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
+	    {
+	        $this->cols['photo']['status'] = true;
+	    }
+
+
+	    $rank = $rank + 10;
+	    $this->cols['vat'] = array(
+	        'rank' => $rank,
+	        'status' => false,
+	        'width' => 16, // in mm
+	        'title' => array(
+	            'textkey' => 'VAT'
+	        ),
+	        'border-left' => true, // add left line separator
+	    );
+
+	    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['qty'] = array(
+	        'rank' => $rank,
+	        'width' => 16, // in mm
+	        'status' => true,
+	        'title' => array(
+	            'textkey' => 'Qty'
+	        ),
+	        'border-left' => true, // add left line separator
+	    );
+
+	    $rank = $rank + 10;
+	    $this->cols['progress'] = array(
+	        'rank' => $rank,
+	        'width' => 19, // in mm
+	        'status' => false,
+	        'title' => array(
+	            'textkey' => 'Progress'
+	        ),
+	        'border-left' => true, // add left line separator
+	    );
+
+	    if ($this->situationinvoice)
+	    {
+	        $this->cols['progress']['status'] = true;
+	    }
+
+	    $rank = $rank + 10;
+	    $this->cols['unit'] = array(
+	        'rank' => $rank,
+	        'width' => 11, // in mm
+	        'status' => false,
+	        'title' => array(
+	            'textkey' => 'Unit'
+	        ),
+	        'border-left' => true, // add left line separator
+	    );
+	    if ($conf->global->PRODUCT_USE_UNITS) {
+	        $this->cols['unit']['status'] = true;
+	    }
+
+	    $rank = $rank + 10;
+	    $this->cols['discount'] = array(
+	        'rank' => $rank,
+	        'width' => 13, // in mm
+	        'status' => false,
+	        'title' => array(
+	            'textkey' => 'ReductionShort'
+	        ),
+	        'border-left' => true, // add left line separator
+	    );
+	    if ($this->atleastonediscount) {
+	        $this->cols['discount']['status'] = true;
+	    }
+
+	    $rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+	    $this->cols['totalexcltax'] = array(
+	        'rank' => $rank,
+	        'width' => 26, // in mm
+	        'status' => true,
+	        'title' => array(
+	            'textkey' => 'TotalHT'
+	        ),
+	        'border-left' => true, // add left line separator
+	    );
+
+	    // 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
+		);
+
+		$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/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
new file mode 100644
index 00000000000..61e04b9000e
--- /dev/null
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
@@ -0,0 +1,156 @@
+<?php
+/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/modules/recruitment/mod_recruitmentcandidature_standard.php
+ *  \ingroup    recruitment
+ *  \brief      File of class to manage RecruitmentCandidature numbering rules standard
+ */
+dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php');
+
+
+/**
+ *	Class to manage customer order numbering rules standard
+ */
+class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandidature
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	public $prefix = 'JOC';
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'standard';
+
+
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	public function info()
+	{
+		global $langs;
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
+
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		global $conf, $langs, $db;
+
+		$coyymm = ''; $max = '';
+
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$row = $db->fetch_row($resql);
+			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+		}
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
+		{
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * 	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;
+
+		// First we get the max value
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max = 0;
+		} else {
+			dol_syslog("mod_recruitmentcandidature_standard::getNextValue", LOG_DEBUG);
+			return -1;
+		}
+
+		//$date=time();
+		$date = $object->date_creation;
+		$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);
+
+		dol_syslog("mod_recruitmentcandidature_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
+}
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
new file mode 100644
index 00000000000..a86337b288a
--- /dev/null
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
@@ -0,0 +1,150 @@
+<?php
+/* Copyright (C) 2003-2007  Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
+ * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ * \file       htdocs/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
+ * \ingroup    recruitment
+ * \brief      File containing class for advanced numbering model of RecruitmentJobPosition
+ */
+
+dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php');
+
+
+/**
+ *	Class to manage customer Bom numbering rules advanced
+ */
+class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosition
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	/**
+	 * @var string Error message
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'advanced';
+
+
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
+
+		$langs->load("bills");
+
+		$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="maskconstBom" value="RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("RecruitmentJobPosition"), $langs->transnoentities("RecruitmentJobPosition"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("RecruitmentJobPosition"), $langs->transnoentities("RecruitmentJobPosition"));
+		$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="maskRecruitmentJobPosition" value="'.$conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_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 .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $db, $langs, $mysoc;
+
+		$object = new RecruitmentJobPosition($db);
+		$object->initAsSpecimen();
+
+		/*$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';*/
+
+		$numExample = $this->getNextValue($object);
+
+		/*$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;*/
+
+		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;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		// We get cursor rule
+		$mask = $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK;
+
+		if (!$mask)
+		{
+			$this->error = 'NotConfigured';
+			return 0;
+		}
+
+		$date = $object->date;
+
+		$numFinal = get_next_value($db, $mask, 'recruitment_recruitmentjobposition', 'ref', '', null, $date);
+
+		return  $numFinal;
+	}
+}
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
new file mode 100644
index 00000000000..4b3aba946bb
--- /dev/null
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_standard.php
@@ -0,0 +1,156 @@
+<?php
+/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/modules/recruitment/mod_recruitmentjobposition_standard.php
+ *  \ingroup    recruitment
+ *  \brief      File of class to manage RecruitmentJobPosition numbering rules standard
+ */
+dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php');
+
+
+/**
+ *	Class to manage customer order numbering rules standard
+ */
+class mod_recruitmentjobposition_standard extends ModeleNumRefRecruitmentJobPosition
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	public $prefix = 'JOB';
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'standard';
+
+
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	public function info()
+	{
+		global $langs;
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
+
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		global $conf, $langs, $db;
+
+		$coyymm = ''; $max = '';
+
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$row = $db->fetch_row($resql);
+			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+		}
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
+		{
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * 	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;
+
+		// First we get the max value
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max = 0;
+		} else {
+			dol_syslog("mod_recruitmentjobposition_standard::getNextValue", LOG_DEBUG);
+			return -1;
+		}
+
+		//$date=time();
+		$date = $object->date_creation;
+		$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);
+
+		dol_syslog("mod_recruitmentjobposition_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
+}
diff --git a/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php
new file mode 100644
index 00000000000..a4ec3ac75b6
--- /dev/null
+++ b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php
@@ -0,0 +1,150 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file			htdocs/core/modules/recruitment/modules_recruitmentjobposition.php
+ *  \ingroup		recruitment
+ *  \brief			File that contains parent class for recruitmentjobpositions document models and parent class for recruitmentjobpositions numbering models
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // required for use by classes that inherit
+
+
+/**
+ *	Parent class for documents models
+ */
+abstract class ModelePDFRecruitmentCandidature 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
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
+
+		$type = 'recruitmentjobposition';
+		$list = array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+
+		return $list;
+	}
+}
+
+
+
+/**
+ *  Parent class to manage numbering of RecruitmentCandidature
+ */
+abstract class ModeleNumRefRecruitmentCandidature
+{
+	/**
+	 * @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;
+	}
+
+	/**
+	 *	Returns the default description of the numbering template
+	 *
+	 *	@return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $langs;
+		$langs->load("recruitment");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *	Returns an example of numbering
+	 *
+	 *	@return     string      Example
+	 */
+	public function getExample()
+	{
+		global $langs;
+		$langs->load("recruitment");
+		return $langs->trans("NoExample");
+	}
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns next assigned value
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return	string      Valeur
+	 */
+	public function getNextValue($object)
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *	Returns version of numbering module
+	 *
+	 *	@return     string      Valeur
+	 */
+	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");
+	}
+}
diff --git a/htdocs/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php
new file mode 100644
index 00000000000..482964764ef
--- /dev/null
+++ b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php
@@ -0,0 +1,150 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file			htdocs/core/modules/recruitment/modules_recruitmentjobposition.php
+ *  \ingroup		recruitment
+ *  \brief			File that contains parent class for recruitmentjobpositions document models and parent class for recruitmentjobpositions numbering models
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // required for use by classes that inherit
+
+
+/**
+ *	Parent class for documents models
+ */
+abstract class ModelePDFRecruitmentJobPosition 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
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
+
+		$type = 'recruitmentjobposition';
+		$list = array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+
+		return $list;
+	}
+}
+
+
+
+/**
+ *  Parent class to manage numbering of RecruitmentJobPosition
+ */
+abstract class ModeleNumRefRecruitmentJobPosition
+{
+	/**
+	 * @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;
+	}
+
+	/**
+	 *	Returns the default description of the numbering template
+	 *
+	 *	@return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $langs;
+		$langs->load("recruitment");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *	Returns an example of numbering
+	 *
+	 *	@return     string      Example
+	 */
+	public function getExample()
+	{
+		global $langs;
+		$langs->load("recruitment");
+		return $langs->trans("NoExample");
+	}
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns next assigned value
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return	string      Valeur
+	 */
+	public function getNextValue($object)
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *	Returns version of numbering module
+	 *
+	 *	@return     string      Valeur
+	 */
+	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");
+	}
+}
diff --git a/htdocs/recruitment/lib/recruitment.lib.php b/htdocs/recruitment/lib/recruitment.lib.php
new file mode 100644
index 00000000000..97e8895344e
--- /dev/null
+++ b/htdocs/recruitment/lib/recruitment.lib.php
@@ -0,0 +1,74 @@
+<?php
+/* Copyright (C) 2020 Adminson Alicealalalamdskfldmjgdfgdfhfghgfh <testldr9@dolicloud.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    recruitment/lib/recruitment.lib.php
+ * \ingroup recruitment
+ * \brief   Library files with common functions for Recruitment
+ */
+
+/**
+ * Prepare admin pages header
+ *
+ * @return array
+ */
+function recruitmentAdminPrepareHead()
+{
+	global $langs, $conf;
+
+	$langs->load("recruitment");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/recruitment/admin/setup.php", 1);
+	$head[$h][1] = $langs->trans("JobPositions");
+	$head[$h][2] = 'settings';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/recruitment/admin/setup_candidatures.php", 1);
+	$head[$h][1] = $langs->trans("RecruitmentCandidatures");
+	$head[$h][2] = 'settings_candidatures';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/recruitment/admin/public_interface.php", 1);
+	$head[$h][1] = $langs->trans("PublicUrl");
+	$head[$h][2] = 'publicurl';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/recruitment/admin/jobposition_extrafields.php", 1);
+	$head[$h][1] = $langs->trans("ExtrafieldsJobPosition");
+	$head[$h][2] = 'jobposition_extrafields';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/recruitment/admin/candidature_extrafields.php", 1);
+	$head[$h][1] = $langs->trans("ExtrafieldsCandidature");
+	$head[$h][2] = 'candidature_extrafields';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@recruitment:/recruitment/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@recruitment:/recruitment/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'recruitment');
+
+	return $head;
+}
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentcandidature.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentcandidature.lib.php
new file mode 100644
index 00000000000..661f5ccc984
--- /dev/null
+++ b/htdocs/recruitment/lib/recruitment_recruitmentcandidature.lib.php
@@ -0,0 +1,92 @@
+<?php
+/* Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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    lib/recruitment_recruitmentcandidature.lib.php
+ * \ingroup recruitment
+ * \brief   Library files with common functions for RecruitmentCandidature
+ */
+
+/**
+ * Prepare array of tabs for RecruitmentCandidature
+ *
+ * @param	RecruitmentJobPosition	$object		RecruitmentCandidature
+ * @return 	array					Array of tabs
+ */
+function recruitmentCandidaturePrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("recruitment");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/recruitment/recruitmentcandidature_card.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("RecruitmentCandidature");
+	$head[$h][2] = 'card';
+	$h++;
+
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		$head[$h][0] = dol_buildpath("/recruitment/recruitmentrating_card.php", 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans("Rating");
+		$head[$h][2] = 'rating';
+		$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_buildpath('/recruitment/recruitmentcandidature_note.php', 1).'?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->recruitment->dir_output."/recruitmentcandidature/".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_buildpath("/recruitment/recruitmentcandidature_document.php", 1).'?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] = 'document';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/recruitment/recruitmentcandidature_agenda.php", 1).'?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:@recruitment:/recruitment/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@recruitment:/recruitment/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'recruitmentcandidature');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'recruitmentcandidature', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
new file mode 100644
index 00000000000..a5739a53153
--- /dev/null
+++ b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
@@ -0,0 +1,127 @@
+<?php
+/* Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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    lib/recruitment_recruitmentjobposition.lib.php
+ * \ingroup recruitment
+ * \brief   Library files with common functions for RecruitmentJobPosition
+ */
+
+/**
+ * Prepare array of tabs for RecruitmentJobPosition
+ *
+ * @param	RecruitmentJobPosition	$object		RecruitmentJobPosition
+ * @return 	array					Array of tabs
+ */
+function recruitmentjobpositionPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("recruitment");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_card.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("PositionToBeFilled");
+	$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 (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_buildpath('/recruitment/recruitmentjobposition_note.php', 1).'?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->recruitment->dir_output."/recruitmentjobposition/".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_buildpath("/recruitment/recruitmentjobposition_document.php", 1).'?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] = 'document';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_agenda.php", 1).'?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:@recruitment:/recruitment/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@recruitment:/recruitment/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'recruitmentjobposition');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'recruitmentjobposition', 'remove');
+
+	return $head;
+}
+
+
+/**
+ * Return string with full Url
+ *
+ * @param   int		$mode		      0=True url, 1=Url formated with colors
+ * @param	string	$ref		      Ref of object
+ * @param   string  $localorexternal  0=Url for browser, 1=Url for external access
+ * @return	string				      Url string
+ */
+function getPublicJobPositionUrl($mode, $ref = '', $localorexternal = 0)
+{
+	global $conf, $dolibarr_main_url_root;
+
+	$ref = str_replace(' ', '', $ref);
+	$out = '';
+
+	// 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
+
+	$urltouse = DOL_MAIN_URL_ROOT;
+	if ($localorexternal) $urltouse = $urlwithroot;
+
+	$out = $urltouse.'/public/recruitment/view.php?ref='.($mode ? '<font color="#666666">' : '').$ref.($mode ? '</font>' : '');
+	/*if (!empty($conf->global->RECRUITMENT_SECURITY_TOKEN))
+	{
+		if (empty($conf->global->RECRUITMENT_SECURITY_TOKEN)) $out .= '&securekey='.$conf->global->RECRUITMENT_SECURITY_TOKEN;
+		else $out .= '&securekey='.dol_hash($conf->global->RECRUITMENT_SECURITY_TOKEN, 2);
+	}*/
+
+	// For multicompany
+	if (!empty($out) && !empty($conf->multicompany->enabled)) $out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
+
+	return $out;
+}
diff --git a/htdocs/recruitment/modulebuilder.txt b/htdocs/recruitment/modulebuilder.txt
new file mode 100644
index 00000000000..670a1774929
--- /dev/null
+++ b/htdocs/recruitment/modulebuilder.txt
@@ -0,0 +1,3 @@
+# DO NOT DELETE THIS FILE MANUALLY
+# File to flag module built using official module template.
+# When this file is present into a module directory, you can edit it with the module builder tool. 
\ No newline at end of file
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
new file mode 100644
index 00000000000..f8aff07c352
--- /dev/null
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -0,0 +1,254 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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       recruitmentcandidature_agenda.php
+ *  \ingroup    recruitment
+ *  \brief      Page of RecruitmentCandidature events
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.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"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$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));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = 'a.datep,a.id';
+if (!$sortorder) $sortorder = 'DESC,DESC';
+
+// Initialize technical objects
+$object = new RecruitmentCandidature($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentcandidatureagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity]."/".$object->id;
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'recruitment', $object->id);
+
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$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))
+{
+	// 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 = '';
+	}
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0)
+{
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = '';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	$head = recruitmentCandidaturePrepareHead($object);
+
+
+	dol_fiche_head($head, 'agenda', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	*/
+	// Project
+	/*if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$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.=$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 .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
+
+	print '</div>';
+
+	dol_fiche_end();
+
+
+
+	// Actions buttons
+
+	$objthirdparty = $object;
+	$objcon = new stdClass();
+
+	$out = '&origin='.$object->element.'@recruitment&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>';
+		}
+	}
+
+	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);
+
+
+		//print load_fiche_titre($langs->trans("ActionsOnRecruitmentJobPosition"), '', '');
+
+		// 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, 'recruitment');
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
new file mode 100644
index 00000000000..e25de998a36
--- /dev/null
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -0,0 +1,613 @@
+<?php
+/* Copyright (C) 2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       recruitmentcandidature_card.php
+ *		\ingroup    recruitment
+ *		\brief      Page to create/edit/view recruitmentcandidature
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
+
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+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';
+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"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm    = GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'recruitmentcandidaturecard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new RecruitmentCandidature($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentcandidaturecard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$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 (empty($action) && empty($id) && empty($ref)) $action = 'view';
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+
+$permissiontoread = $user->rights->recruitment->recruitmentjobposition->read;
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->recruitment->recruitmentjobposition->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->recruitment->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
+//$result = restrictedArea($user, 'recruitment', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+//if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$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))
+{
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1);
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+			else $backtopage = dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
+	$triggermodname = 'RECRUITMENTCANDIDATURE_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+	// Actions 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';
+
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
+
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
+	if ($action == 'confirm_decline' && $confirm == 'yes' && $permissiontoadd) {
+		$result = $object->setStatut($object::STATUS_REFUSED, null, '', $triggermodname);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
+	// Actions to send emails
+	$triggersendname = 'RECRUITMENTCANDIDATURE_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_RECRUITMENTCANDIDATURE_TO';
+	$trackid = 'recruitmentcandidature'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+}
+
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("RecruitmentCandidature");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+
+// Part to create
+if ($action == 'create')
+{
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("RecruitmentCandidature")), '', 'object_'.$object->picto);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+
+	dol_fiche_head(array(), '');
+
+	// Set some default values
+	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	dol_fiche_end();
+
+	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>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
+{
+	print load_fiche_titre($langs->trans("RecruitmentCandidature"), '', 'object_'.$object->picto);
+
+	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 '<input type="hidden" name="id" value="'.$object->id.'">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+
+	dol_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	dol_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>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+	$res = $object->fetch_optionals();
+
+	$head = recruitmentcandidaturePrepareHead($object);
+	dol_fiche_head($head, 'card', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteRecruitmentCandidature'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}
+	// Confirmation to delete line
+	if ($action == 'deleteline') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+	}
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$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')
+	{
+		$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(
+			// '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))
+		);
+		*/
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$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
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // 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> ';
+	 $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 .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+
+	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 '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	$keyforbreak = 'description'; // We change column just before this field
+	unset($object->fields['email']); // 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';
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	dol_fiche_end();
+
+
+	/*
+	 * Lines
+	 */
+
+	if (!empty($object->table_element_line))
+	{
+		// Show object lines
+		$result = $object->getLinesArray();
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="' . $object->id.'">
+		';
+
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+		}
+
+		print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
+
+		if (!empty($object->lines))
+		{
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines')
+		{
+			if ($action != 'editline')
+			{
+				// Add products/services form
+				$object->formAddObjectLine(1, $mysoc, $soc);
+
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			}
+		}
+
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '</table>';
+		}
+		print '</div>';
+
+		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&sendto='.urlencode($object->email).'#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>';
+					}
+				}
+			}
+
+			// Refuse - Decline
+			if ($object->status >= $object::STATUS_VALIDATED && $object->status < $object::STATUS_REFUSED)
+			{
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_decline&confirm=yes">'.$langs->trans("Decline").'</a>';
+				}
+			}
+
+			// Clone
+			if ($permissiontoadd)
+			{
+				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)
+			{
+				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
+
+		$includedocgeneration = 1;
+
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$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
+			print $formfile->showdocuments('recruitment:RecruitmentCandidature', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('recruitmentcandidature'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+		$MAXEVENT = 10;
+
+		$morehtmlright = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_agenda.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, $object->element.'@recruitment', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+
+		print '</div></div></div>';
+	}
+
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) $action = 'presend';
+
+	// Presend form
+	$modelmail = 'recruitmentcandidature_send';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->recruitment->dir_output;
+	$trackid = 'recruitmentcandidature'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
new file mode 100644
index 00000000000..780447ae804
--- /dev/null
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -0,0 +1,205 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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       recruitmentcandidature_document.php
+ *  \ingroup    recruitment
+ *  \brief      Tab for documents linked to RecruitmentCandidature
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+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/html.formfile.class.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", "companies", "other", "mails"));
+
+
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$ref = GETPOST('ref', 'alpha');
+
+// Get parameters
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new RecruitmentCandidature($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentcandidaturedocument', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity ? $object->entity : $conf->entity]."/recruitmentcandidature/".dol_sanitizeFileName($object->ref);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'recruitment', $object->id);
+
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("RecruitmentJobPosition").' - '.$langs->trans("Files");
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+if ($object->id)
+{
+	/*
+	 * Show tabs
+	 */
+	$head = recruitmentCandidaturePrepareHead($object);
+
+	dol_fiche_head($head, 'document', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
+
+
+	// 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'];
+	}
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	*/
+	// Project
+	/*if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$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.=$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 .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	// Number of files
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+	// Total size
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	dol_fiche_end();
+
+	$modulepart = 'recruitment';
+	$permission = $user->rights->recruitment->recruitmentjobposition->write;
+	$permtoedit = $user->rights->recruitment->recruitmentjobposition->write;
+	$param = '&id='.$object->id;
+
+	$relativepathwithnofile = 'recruitmentcandidature/'.dol_sanitizeFileName($object->ref).'/';
+
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+} else {
+	accessforbidden('', 0, 1);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
new file mode 100644
index 00000000000..1db036f6878
--- /dev/null
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -0,0 +1,601 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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       recruitmentcandidature_list.php
+ *		\ingroup    recruitment
+ *		\brief      List page for recruitmentcandidature
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');					// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');					// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');					// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');			// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');			// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');					// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');					// Do not check style html tag into posted data
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');						// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');					// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');					// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       		  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');						// If this page is public (can be called outside logged session)
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');			// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', '1');		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("XFRAMEOPTIONS_ALLOWALL"))   define('XFRAMEOPTIONS_ALLOWALL', '1');			// Do not add the HTTP header 'X-Frame-Options: SAMEORIGIN' but 'X-Frame-Options: ALLOWALL'
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// load recruitment libraries
+require_once __DIR__.'/class/recruitmentcandidature.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("recruitment@recruitment", "other"));
+
+$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') : 'recruitmentcandidaturelist'; // 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')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$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');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical objects
+$object = new RecruitmentCandidature($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentcandidaturelist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+if (!$sortorder) $sortorder = "ASC";
+
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search = array();
+foreach ($object->fields as $key => $val)
+{
+	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'];
+}
+
+// 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'])) {
+		$visible = dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'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])
+			);
+		}
+	}
+}
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+$permissiontoread = $user->rights->recruitment->recruitmentjobposition->read;
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write;
+$permissiontodelete = $user->rights->recruitment->recruitmentjobposition->delete;
+
+// Security check
+if (empty($conf->recruitment->enabled)) accessforbidden('Module not enabled');
+$socid = 0;
+if ($user->socid > 0)	// Protection if external user
+{
+	//$socid = $user->socid;
+	accessforbidden();
+}
+//$result = restrictedArea($user, 'recruitment', $id, '');
+//if (!$permissiontoread) accessforbidden();
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		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 = 'RecruitmentCandidature';
+	$objectlabel = 'RecruitmentCandidature';
+	$uploaddir = $conf->recruitment->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$now = dol_now();
+
+//$help_url="EN:Module_RecruitmentCandidature|FR:Module_RecruitmentCandidature_FR|ES:Módulo_RecruitmentCandidature";
+$help_url = '';
+$title = $langs->trans('ListOfCandidatures');
+
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+foreach ($object->fields as $key => $val)
+{
+	$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.', ' : '');
+}
+// Add fields from hooks
+$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 .= " 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).")";
+else $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 (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+		if ($search[$key] == '-1') $search[$key] = '';
+		$mode_search = 2;
+	}
+	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.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+/* If a group by is required
+$sql.= " GROUP BY ";
+foreach($object->fields as $key => $val)
+{
+	$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.', ' : '');
+}
+// Add where from hooks
+$parameters=array();
+$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 .= $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;
+	}
+}
+// 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 || empty($limit)))
+{
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	$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 && !$page)
+{
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+$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);
+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 ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+// Add $param from extra fields
+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"),
+);
+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();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+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="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendRecruitmentCandidatureRef";
+$modelmail = "recruitmentcandidature";
+$objecttmp = new RecruitmentCandidature($db);
+$trackid = 'xxxx'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all)
+{
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+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>';
+}
+
+$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">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val)
+{
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	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';
+	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 '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		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]).'">';
+		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, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val)
+{
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	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';
+	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";
+	}
+}
+// 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, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+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)) $needToFetchEachLine++; // There is at least one compute field that use $object
+	}
+}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+while ($i < ($limit ? min($num, $limit) : $num))
+{
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break; // Should not happen
+
+	// 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';
+
+		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 (!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
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$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;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	{
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>'."\n";
+
+	$i++;
+}
+
+// Show total line
+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>';
+}
+
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+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;
+
+	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);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_recruitment', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
new file mode 100644
index 00000000000..81d227c5da6
--- /dev/null
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -0,0 +1,163 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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       recruitmentcandidature_note.php
+ *  \ingroup    recruitment
+ *  \brief      Car with notes on RecruitmentCandidature
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+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", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new RecruitmentCandidature($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentjobpositionnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'recruitment', $id);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity]."/".$object->id;
+
+$permissionnote = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_setnotes.inc.php
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('RecruitmentCandidature'), $help_url);
+
+if ($id > 0 || !empty($ref))
+{
+	$object->fetch_thirdparty();
+
+	$head = recruitmentCandidaturePrepareHead($object);
+
+	dol_fiche_head($head, 'note', $langs->trans("RecruitmentCandidature"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	*/
+	// Project
+	/*if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$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.=$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 .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+
+	$cssclass = "titlefield";
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	print '</div>';
+
+	dol_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
new file mode 100644
index 00000000000..04d50c34eb8
--- /dev/null
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -0,0 +1,452 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.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       recruitment/recruitmentindex.php
+ *	\ingroup    recruitment
+ *	\brief      Home page of recruitment top menu
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("recruitment", "boxes"));
+
+$action = GETPOST('action', 'aZ09');
+
+
+// Security check
+//if (! $user->rights->recruitment->myobject->read) accessforbidden();
+$socid = GETPOST('socid', 'int');
+if (isset($user->socid) && $user->socid > 0)
+{
+	$action = '';
+	$socid = $user->socid;
+}
+
+$max = 5;
+$now = dol_now();
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$staticrecruitmentjobposition = new RecruitmentJobPosition($db);
+$staticrecruitmentcandidature = new RecruitmentCandidature($db);
+
+llxHeader("", $langs->trans("RecruitmentArea"));
+
+print load_fiche_titre($langs->trans("RecruitmentArea"), '', 'object_recruitmentjobposition');
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+
+/*
+ * Statistics
+ */
+
+if ($conf->use_javascript_ajax)
+{
+	$sql = "SELECT COUNT(t.rowid) as nb, status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as t";
+	$sql .= " GROUP BY t.status";
+	$sql .= " ORDER BY t.status ASC";
+	$resql = $db->query($sql);
+
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		$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;
+
+				$totalnb += $obj->nb;
+			}
+			$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("JobPositions").'</th></tr>'."\n";
+		$listofstatus = array(0, 1, 3, 9);
+		foreach ($listofstatus as $status)
+		{
+			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentjobposition->LibStatut($status, 1), ENT_QUOTES), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			if ($status == RecruitmentJobPosition::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+			if ($status == RecruitmentJobPosition::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus4;
+			if ($status == RecruitmentJobPosition::STATUS_RECRUITED) $colorseries[$status] = $badgeStatus6;
+			if ($status == RecruitmentJobPosition::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
+
+			if (empty($conf->use_javascript_ajax))
+			{
+				print '<tr class="oddeven">';
+				print '<td>'.$staticrecruitmentjobposition->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);
+
+			print '</td></tr>';
+		}
+		print "</table>";
+		print "</div>";
+
+		print "<br>";
+	} else {
+		dol_print_error($db);
+	}
+
+	$sql = "SELECT COUNT(t.rowid) as nb, status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as t";
+	$sql .= " GROUP BY t.status";
+	$sql .= " ORDER BY t.status ASC";
+	$resql = $db->query($sql);
+
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		$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;
+
+				$totalnb += $obj->nb;
+			}
+			$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("Candidatures").'</th></tr>'."\n";
+		$listofstatus = array(0, 1, 3, 5, 8, 9);
+		foreach ($listofstatus as $status)
+		{
+			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentcandidature->LibStatut($status, 1), ENT_QUOTES), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			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;
+			if ($status == RecruitmentCandidature::STATUS_CONTRACT_SIGNED) $colorseries[$status] = $badgeStatus5;
+			if ($status == RecruitmentCandidature::STATUS_REFUSED) $colorseries[$status] = $badgeStatus9;
+			if ($status == RecruitmentCandidature::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
+
+			if (empty($conf->use_javascript_ajax))
+			{
+				print '<tr class="oddeven">';
+				print '<td>'.$staticrecruitmentcandidature->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('idgraphstatuscandidature');
+			print $dolgraph->show($totalnb ? 0 : 1);
+
+			print '</td></tr>';
+		}
+		print "</table>";
+		print "</div>";
+
+		print "<br>";
+	} else {
+		dol_print_error($db);
+	}
+}
+
+print '<br>';
+
+/* BEGIN MODULEBUILDER DRAFT MYOBJECT
+// Draft MyObject
+if (! empty($conf->recruitment->enabled) && $user->rights->recruitment->read)
+{
+	$langs->load("orders");
+
+	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
+	$sql.= ", s.code_client";
+	$sql.= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as c";
+	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE c.fk_soc = s.rowid";
+	$sql.= " AND c.fk_statut = 0";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
+	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;
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$total = 0;
+		$num = $db->num_rows($resql);
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("DraftOrders").($num?'<span class="badge marginleftonlyshort">'.$num.'</span>':'').'</th></tr>';
+
+		$var = true;
+		if ($num > 0)
+		{
+			$i = 0;
+			while ($i < $num)
+			{
+
+				$obj = $db->fetch_object($resql);
+				print '<tr class="oddeven"><td class="nowrap">';
+				$orderstatic->id=$obj->rowid;
+				$orderstatic->ref=$obj->ref;
+				$orderstatic->ref_client=$obj->ref_client;
+				$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">';
+				$companystatic->id=$obj->socid;
+				$companystatic->name=$obj->name;
+				$companystatic->client=$obj->client;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->canvas=$obj->canvas;
+				print $companystatic->getNomUrl(1,'customer',16);
+				print '</td>';
+				print '<td class="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
+				$i++;
+				$total += $obj->total_ttc;
+			}
+			if ($total>0)
+			{
+
+				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
+			}
+		}
+		else
+		{
+
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
+		}
+		print "</table><br>";
+
+		$db->free($resql);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+END MODULEBUILDER DRAFT MYOBJECT */
+
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
+$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$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 .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s";
+	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 .= " ORDER BY s.tms DESC";
+	$sql .= $db->plimit($max, 0);
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$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="2">';
+		print $langs->trans("BoxTitleLatestModifiedJobPositions", $max);
+		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)
+		{
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+				$staticrecruitmentjobposition->id = $objp->rowid;
+				$staticrecruitmentjobposition->ref = $objp->ref;
+				$staticrecruitmentjobposition->label = $objp->label;
+				$staticrecruitmentjobposition->status = $objp->status;
+				$staticrecruitmentjobposition->date_creation = $objp->date_creation;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$staticrecruitmentjobposition->getNomUrl(1, '').'</td>';
+				print '<td class="right nowrap">';
+				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);
+				print "</td>";
+				print '</tr>';
+				$i++;
+			}
+
+			$db->free($resql);
+		} else {
+			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print "</table>";
+		print "</div>";
+		print "<br>";
+	} else {
+		dol_print_error($db);
+	}
+}
+
+// Last modified job position
+if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitmentjobposition->read)
+{
+	$sql = "SELECT rc.rowid, rc.ref, rc.email, rc.lastname, rc.firstname, rc.date_creation, rc.tms, rc.status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as s ON rc.fk_recruitmentjobposition = s.rowid";
+	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql .= " WHERE rc.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 .= " ORDER BY rc.tms DESC";
+	$sql .= $db->plimit($max, 0);
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$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="2">';
+		print $langs->trans("BoxTitleLatestModifiedCandidatures", $max);
+		print '</th>';
+		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/recruitment/recruitmentcandidature_list.php?sortfield=t.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
+		print '</tr>';
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+				$staticrecruitmentcandidature->id = $objp->rowid;
+				$staticrecruitmentcandidature->ref = $objp->ref;
+				$staticrecruitmentcandidature->email = $objp->email;
+				$staticrecruitmentcandidature->status = $objp->status;
+				$staticrecruitmentcandidature->date_creation = $objp->date_creation;
+				$staticrecruitmentcandidature->firstname = $objp->firstname;
+				$staticrecruitmentcandidature->lastname = $objp->lastname;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$staticrecruitmentcandidature->getNomUrl(1, '').'</td>';
+				print '<td class="right nowrap">';
+				print "</td>";
+				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
+				print '<td class="right nowrap" width="16">';
+				print $staticrecruitmentcandidature->getLibStatut(3);
+				print "</td>";
+				print '</tr>';
+				$i++;
+			}
+
+			$db->free($resql);
+		} else {
+			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print "</table>";
+		print "</div>";
+		print "<br>";
+	} else {
+		dol_print_error($db);
+	}
+}
+
+print '</div></div></div>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
new file mode 100644
index 00000000000..2984deb0443
--- /dev/null
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -0,0 +1,254 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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       recruitmentjobposition_agenda.php
+ *  \ingroup    recruitment
+ *  \brief      Page of RecruitmentJobPosition events
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
+dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("recruitment", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$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));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = 'a.datep,a.id';
+if (!$sortorder) $sortorder = 'DESC,DESC';
+
+// Initialize technical objects
+$object = new RecruitmentJobPosition($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentjobpositionagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity]."/".$object->id;
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'recruitment', $object->id);
+
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$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))
+{
+	// 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 = '';
+	}
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0)
+{
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = '';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	$head = recruitmentjobpositionPrepareHead($object);
+
+
+	dol_fiche_head($head, 'agenda', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	*/
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$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.=$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 .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
+
+	print '</div>';
+
+	dol_fiche_end();
+
+
+
+	// Actions buttons
+
+	$objthirdparty = $object;
+	$objcon = new stdClass();
+
+	$out = '&origin='.$object->element.'@recruitment&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>';
+		}
+	}
+
+	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);
+
+
+		//print load_fiche_titre($langs->trans("ActionsOnRecruitmentJobPosition"), '', '');
+
+		// 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, 'recruitment');
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentjobposition_candidature.php b/htdocs/recruitment/recruitmentjobposition_candidature.php
new file mode 100644
index 00000000000..a945df25bfc
--- /dev/null
+++ b/htdocs/recruitment/recruitmentjobposition_candidature.php
@@ -0,0 +1,563 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       recruitmentjobposition_candidature.php
+ *		\ingroup    recruitment
+ *		\brief      Page to see/add candidatures
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
+
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+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.'/projet/class/project.class.php';
+dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
+dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("recruitment", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm    = GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'recruitmentjobpositioncard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new RecruitmentJobPosition($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentjobpositioncard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$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 (empty($action) && empty($id) && empty($ref)) $action = 'view';
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+
+$permissiontoread = $user->rights->recruitment->recruitmentjobposition->read;
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->recruitment->recruitmentjobposition->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->recruitment->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
+//$result = restrictedArea($user, 'recruitment', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+//if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$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))
+{
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1);
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+			else $backtopage = dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
+	$triggermodname = 'RECRUITMENT_RECRUITMENTJOBPOSITION_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+	// Actions 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';
+
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
+
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'RECRUITMENTJOBPOSITION_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
+
+	// Actions to send emails
+	$triggersendname = 'RECRUITMENTJOBPOSITION_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_RECRUITMENTJOBPOSITION_TO';
+	$trackid = 'recruitmentjobposition'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+}
+
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("PositionToBeFilled");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Part to create
+if ($action == 'create')
+{
+	print load_fiche_titre($langs->trans("NewPositionToBeFilled"), '', 'object_'.$object->picto);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	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;
+
+	dol_fiche_head(array(), '');
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	dol_fiche_end();
+
+	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>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
+{
+	print load_fiche_titre($langs->trans("PositionToBeFilled"), '', 'object_'.$object->picto);
+
+	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 '<input type="hidden" name="id" value="'.$object->id.'">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+
+	dol_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	dol_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>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+	$res = $object->fetch_optionals();
+
+	$head = recruitmentjobpositionPrepareHead($object);
+	dol_fiche_head($head, 'candidatures', $langs->trans("RecruitmentCandidatures"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteRecruitmentJobPosition'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}
+	// Confirmation to delete line
+	if ($action == 'deleteline')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+	}
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$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')
+	{
+		$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(
+			// '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))
+		);
+		*/
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$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
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	*/
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$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.=$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 .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
+
+
+	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 '<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
+	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	dol_fiche_end();
+
+
+	/*
+	 * Lines
+	 */
+
+	if (!empty($object->table_element_line))
+	{
+		// Show object lines
+		$result = $object->getLinesArray();
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="' . $object->id.'">
+		';
+
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+		}
+
+		print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
+
+		if (!empty($object->lines))
+		{
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines')
+		{
+			if ($action != 'editline')
+			{
+				// Add products/services form
+				$object->formAddObjectLine(1, $mysoc, $soc);
+
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			}
+		}
+
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '</table>';
+		}
+		print '</div>';
+
+		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';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
new file mode 100644
index 00000000000..d4a115962f2
--- /dev/null
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -0,0 +1,630 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       recruitmentjobposition_card.php
+ *		\ingroup    recruitment
+ *		\brief      Page to create/edit/view recruitmentjobposition
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
+
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+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.'/projet/class/project.class.php';
+dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
+dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("recruitment", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm    = GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'recruitmentjobpositioncard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new RecruitmentJobPosition($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentjobpositioncard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$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 (empty($action) && empty($id) && empty($ref)) $action = 'view';
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+
+$permissiontoread = $user->rights->recruitment->recruitmentjobposition->read;
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->recruitment->recruitmentjobposition->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->recruitment->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+$usercanclose = $permissiontoadd;
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
+//$result = restrictedArea($user, 'recruitment', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+//if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$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))
+{
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1);
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+			else $backtopage = dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
+	$triggermodname = 'RECRUITMENT_RECRUITMENTJOBPOSITION_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+	// Actions 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';
+
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
+
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'RECRUITMENTJOBPOSITION_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
+	if ($action == 'confirm_closeas' && $usercanclose && !GETPOST('cancel', 'alpha')) {
+		if (!(GETPOST('status', 'int') > 0)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CloseAs")), null, 'errors');
+			$action = 'closeas';
+		} else {
+			// prevent browser refresh from closing proposal several times
+			if ($object->status == $object::STATUS_VALIDATED)
+			{
+				$db->begin();
+
+				$result = $object->cloture($user, GETPOST('status', 'int'), GETPOST('note_private', 'restricthtml'));
+				if ($result < 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
+
+				if (!$error)
+				{
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+			}
+		}
+	}
+
+	// Actions to send emails
+	$triggersendname = 'RECRUITMENTJOBPOSITION_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_RECRUITMENTJOBPOSITION_TO';
+	$trackid = 'recruitmentjobposition'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+}
+
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("PositionToBeFilled");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Part to create
+if ($action == 'create')
+{
+	print load_fiche_titre($langs->trans("NewPositionToBeFilled"), '', 'object_'.$object->picto);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	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;
+
+	dol_fiche_head(array(), '');
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	dol_fiche_end();
+
+	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>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit')
+{
+	print load_fiche_titre($langs->trans("PositionToBeFilled"), '', 'object_'.$object->picto);
+
+	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 '<input type="hidden" name="id" value="'.$object->id.'">';
+	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+
+	dol_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	dol_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>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
+{
+	$res = $object->fetch_optionals();
+
+	$head = recruitmentjobpositionPrepareHead($object);
+	dol_fiche_head($head, 'card', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteRecruitmentJobPosition'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}
+	// Confirmation to delete line
+	if ($action == 'deleteline')
+	{
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+	}
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	}
+	if ($action == 'closeas')
+	{
+		//Form to close proposal (signed or not)
+		$formquestion = array(
+			array('type' => 'select', 'name' => 'status', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array(3=>$object->LibStatut($object::STATUS_RECRUITED), 9=>$object->LibStatut($object::STATUS_CANCELED))),
+			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
+		);
+
+		/*if (!empty($conf->notification->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
+			$notify = new Notify($db);
+			$formquestion = array_merge($formquestion, array(
+				array('type' => 'onecolumn', 'value' => $notify->confirmMessage('PROPAL_CLOSE_SIGNED', $object->socid, $object)),
+			));
+		}*/
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Close'), $text, 'confirm_closeas', $formquestion, '', 1, 250);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$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
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	*/
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$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.=$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 .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
+
+
+	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 '<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
+	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	dol_fiche_end();
+
+
+	/*
+	 * Lines
+	 */
+
+	if (!empty($object->table_element_line))
+	{
+		// Show object lines
+		$result = $object->getLinesArray();
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="' . $object->id.'">
+		';
+
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+		}
+
+		print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
+
+		if (!empty($object->lines))
+		{
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines')
+		{
+			if ($action != 'editline')
+			{
+				// Add products/services form
+				$object->formAddObjectLine(1, $mysoc, $soc);
+
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			}
+		}
+
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '</table>';
+		}
+		print '</div>';
+
+		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>';
+					}
+				}
+			}
+
+			// Close as recruited/canceled
+			if ($object->status == $object::STATUS_VALIDATED) {
+				if ($usercanclose) {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=closeas'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
+					print '>'.$langs->trans('Close').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Close').'</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_CANCELED) {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$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
+
+		$includedocgeneration = 1;
+
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$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
+			print $formfile->showdocuments('recruitment:RecruitmentJobPosition', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('recruitmentjobposition'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+		// Show link to public job page
+		if ($object->status != RecruitmentJobPosition::STATUS_DRAFT)
+		{
+			print '<br><!-- Link to go on public job page -->'."\n";
+			// Load translation files required by the page
+			$langs->loadLangs(array('recruitment'));
+
+			$out = img_picto('', 'globe').' '.$langs->trans("PublicUrl").'<br>';
+
+			$url = getPublicJobPositionUrl(0, $object->ref);
+			$out .= '<input type="text" id="recruitmentjobpositionurl" class="quatrevingtpercent" value="'.$url.'">';
+			$out .= '<a href="'.$url.'" target="_blank">'.img_picto('', 'globe').'</a>';
+			$out .= ajax_autoselect("recruitmentjobpositionurl", 0);
+
+			print $out;
+		}
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+		$MAXEVENT = 10;
+
+		$morehtmlright = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_agenda.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, $object->element.'@recruitment', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+
+		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';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
new file mode 100644
index 00000000000..e34f5193bd1
--- /dev/null
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -0,0 +1,206 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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       recruitmentjobposition_document.php
+ *  \ingroup    recruitment
+ *  \brief      Tab for documents linked to RecruitmentJobPosition
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+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/html.formfile.class.php';
+dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
+dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("recruitment", "companies", "other", "mails"));
+
+
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$ref = GETPOST('ref', 'alpha');
+
+// Get parameters
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new RecruitmentJobPosition($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentjobpositiondocument', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity ? $object->entity : $conf->entity]."/recruitmentjobposition/".dol_sanitizeFileName($object->ref);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'recruitment', $object->id);
+
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("RecruitmentJobPosition").' - '.$langs->trans("Files");
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+if ($object->id)
+{
+	/*
+	 * Show tabs
+	 */
+	$head = recruitmentjobpositionPrepareHead($object);
+
+	dol_fiche_head($head, 'document', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
+
+
+	// 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'];
+	}
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	*/
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$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.=$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 .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	// Number of files
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+	// Total size
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	dol_fiche_end();
+
+	$modulepart = 'recruitment';
+	$permission = $user->rights->recruitment->recruitmentjobposition->write;
+	$permtoedit = $user->rights->recruitment->recruitmentjobposition->write;
+	$param = '&id='.$object->id;
+
+	//$relativepathwithnofile='recruitmentjobposition/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = 'recruitmentjobposition/'.dol_sanitizeFileName($object->ref).'/';
+
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+} else {
+	accessforbidden('', 0, 1);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
new file mode 100644
index 00000000000..24c98a3fbb9
--- /dev/null
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -0,0 +1,601 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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       recruitmentjobposition_list.php
+ *		\ingroup    recruitment
+ *		\brief      List page for recruitmentjobposition
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');					// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');					// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');					// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');					// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');			// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');			// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');					// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');					// Do not check style html tag into posted data
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');						// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');					// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');					// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       		  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');						// If this page is public (can be called outside logged session)
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');			// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');		// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', '1');		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("XFRAMEOPTIONS_ALLOWALL"))   define('XFRAMEOPTIONS_ALLOWALL', '1');			// Do not add the HTTP header 'X-Frame-Options: SAMEORIGIN' but 'X-Frame-Options: ALLOWALL'
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// load recruitment libraries
+require_once __DIR__.'/class/recruitmentjobposition.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("recruitment", "other"));
+
+$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') : 'recruitmentjobpositionlist'; // 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')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$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');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical objects
+$object = new RecruitmentJobPosition($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentjobpositionlist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+if (!$sortorder) $sortorder = "ASC";
+
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search = array();
+foreach ($object->fields as $key => $val)
+{
+	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'];
+}
+
+// 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'])) {
+		$visible = dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'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])
+			);
+		}
+	}
+}
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+$permissiontoread = $user->rights->recruitment->recruitmentjobposition->read;
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write;
+$permissiontodelete = $user->rights->recruitment->recruitmentjobposition->delete;
+
+// Security check
+if (empty($conf->recruitment->enabled)) accessforbidden('Module not enabled');
+$socid = 0;
+if ($user->socid > 0)	// Protection if external user
+{
+	//$socid = $user->socid;
+	accessforbidden();
+}
+//$result = restrictedArea($user, 'recruitment', $id, '');
+//if (!$permissiontoread) accessforbidden();
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		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 = 'RecruitmentJobPosition';
+	$objectlabel = 'RecruitmentJobPosition';
+	$uploaddir = $conf->recruitment->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$now = dol_now();
+
+//$help_url="EN:Module_RecruitmentJobPosition|FR:Module_RecruitmentJobPosition_FR|ES:Módulo_RecruitmentJobPosition";
+$help_url = '';
+$title = $langs->trans('ListOfPositionsToBeFilled');
+
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+foreach ($object->fields as $key => $val)
+{
+	$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.', ' : '');
+}
+// Add fields from hooks
+$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 .= " 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).")";
+else $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 (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+		if ($search[$key] == '-1') $search[$key] = '';
+		$mode_search = 2;
+	}
+	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.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+/* If a group by is required
+$sql.= " GROUP BY ";
+foreach($object->fields as $key => $val)
+{
+	$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.', ' : '');
+}
+// Add where from hooks
+$parameters=array();
+$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 .= $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;
+	}
+}
+// 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 || empty($limit)))
+{
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	$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 && !$page)
+{
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+$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);
+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 ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+// Add $param from extra fields
+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"),
+);
+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();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+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="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendRecruitmentJobPositionRef";
+$modelmail = "recruitmentjobposition";
+$objecttmp = new RecruitmentJobPosition($db);
+$trackid = 'xxxx'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all)
+{
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+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>';
+}
+
+$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">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val)
+{
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	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';
+	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 '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		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]).'">';
+		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, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val)
+{
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	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';
+	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";
+	}
+}
+// 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, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+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)) $needToFetchEachLine++; // There is at least one compute field that use $object
+	}
+}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+while ($i < ($limit ? min($num, $limit) : $num))
+{
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break; // Should not happen
+
+	// 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';
+
+		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 (!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
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$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;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	{
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>'."\n";
+
+	$i++;
+}
+
+// Show total line
+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>';
+}
+
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+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;
+
+	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);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_recruitment', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
new file mode 100644
index 00000000000..12de0611cdf
--- /dev/null
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -0,0 +1,163 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * 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       recruitmentjobposition_note.php
+ *  \ingroup    recruitment
+ *  \brief      Car with notes on RecruitmentJobPosition
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
+dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("recruitment", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new RecruitmentJobPosition($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('recruitmentjobpositionnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'recruitment', $id);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->recruitment->multidir_output[$object->entity]."/".$object->id;
+
+$permissionnote = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_setnotes.inc.php
+$permissiontoadd = $user->rights->recruitment->recruitmentjobposition->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('RecruitmentJobPosition'), $help_url);
+
+if ($id > 0 || !empty($ref))
+{
+	$object->fetch_thirdparty();
+
+	$head = recruitmentjobpositionPrepareHead($object);
+
+	dol_fiche_head($head, 'note', $langs->trans("RecruitmentJobPosition"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?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') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	*/
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$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.=$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 .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	 $morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+
+	$cssclass = "titlefield";
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	print '</div>';
+
+	dol_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 1035d17d5f9..aaf9b451414 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -40,7 +40,7 @@ $langs->load("companies");
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -48,9 +48,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index b403c0516f9..b6be1fb527e 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -35,12 +35,12 @@ $langs->loadLangs(array('resource', 'companies', 'other', 'main'));
 
 // Get parameters
 $id						= GETPOST('id', 'int');
-$action					= GETPOST('action', 'alpha');
+$action					= GETPOST('action', 'aZ09');
 $cancel					= GETPOST('cancel', 'alpha');
 $ref					= GETPOST('ref', 'alpha');
-$description			= GETPOST('description');
-$confirm				= GETPOST('confirm');
-$fk_code_type_resource = GETPOST('fk_code_type_resource', 'alpha');
+$description			= GETPOST('description', 'restricthtml');
+$confirm				= GETPOST('confirm', 'aZ09');
+$fk_code_type_resource  = GETPOST('fk_code_type_resource', 'alpha');
 $country_id				= GETPOST('country_id', 'int');
 
 // Protection if external user
@@ -99,9 +99,7 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 				$action = 'create';
-			}
-			else
-			{
+			} else {
 				$object->ref                    = $ref;
 				$object->description            = $description;
 				$object->fk_code_type_resource  = $fk_code_type_resource;
@@ -118,17 +116,13 @@ if (empty($reshook))
 					setEventMessages($langs->trans('ResourceCreatedWithSuccess'), null, 'mesgs');
 					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else
-				{
+				} else {
 					// Creation KO
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'create';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			Header("Location: list.php");
 			exit;
 		}
@@ -165,15 +159,11 @@ if (empty($reshook))
 				{
 					Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
@@ -197,14 +187,10 @@ if (empty($reshook))
 				setEventMessages($langs->trans('RessourceSuccessfullyDeleted'), null, 'mesgs');
 				Header('Location: '.DOL_URL_ROOT.'/resource/list.php');
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -227,9 +213,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 	{
 		print load_fiche_titre($title, '', 'object_resource');
 		dol_fiche_head('');
-	}
-	else
-	{
+	} else {
 		$head = resource_prepare_head($object);
 		dol_fiche_head($head, 'resource', $title, -1, 'resource');
 	}
@@ -273,7 +257,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		// Other attributes
 		$parameters = array('objectsrc' => $objectsrc);
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit');
@@ -291,33 +275,31 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		print '</div>';
 
 		print '</form>';
-	}
-	else
-	{
+	} else {
 		$formconfirm = '';
 
 		// Confirm deleting resource line
-	    if ($action == 'delete')
-	    {
-	        $formconfirm = $form->formconfirm("card.php?&id=".$object->id, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResource"), "confirm_delete_resource", '', '', 1);
-	    }
+		if ($action == 'delete')
+		{
+			$formconfirm = $form->formconfirm("card.php?&id=".$object->id, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResource"), "confirm_delete_resource", '', '', 1);
+		}
 
-	    // Print form confirm
-	    print $formconfirm;
+		// Print form confirm
+		print $formconfirm;
 
 
-	    $linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&id='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&id='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-	    $morehtmlref = '<div class="refidno">';
-	    $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		$morehtmlref .= '</div>';
 
 
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	    print '<div class="fichecenter">';
-	    print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
 
 		/*---------------------------------------
 		 * View object
@@ -383,18 +365,17 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		}
 		if ($action != "delete" && $action != "create" && $action != "edit")
 		{
-		    // Delete resource
-		    if ($user->rights->resource->delete)
-		    {
-		        print '<div class="inline-block divButAction">';
-		        print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete" class="butActionDelete">'.$langs->trans('Delete').'</a>';
-		        print '</div>';
-		    }
+			// Delete resource
+			if ($user->rights->resource->delete)
+			{
+				print '<div class="inline-block divButAction">';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete&amp;token='.newToken().'" class="butActionDelete">'.$langs->trans('Delete').'</a>';
+				print '</div>';
+			}
 		}
 	}
 	print '</div>';
-}
-else {
+} else {
 	dol_print_error();
 }
 
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 1b4223e1fff..43756f84405 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -164,9 +164,7 @@ class Dolresource extends CommonObject
     		}
     		$this->db->rollback();
     		return -1 * $error;
-    	}
-    	else
-    	{
+    	} else {
     		$this->db->commit();
     		return $this->id;
     	}
@@ -223,9 +221,7 @@ class Dolresource extends CommonObject
     		$this->db->free($resql);
 
     		return $this->id;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
     		return -1;
@@ -329,9 +325,7 @@ class Dolresource extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -388,9 +382,7 @@ class Dolresource extends CommonObject
     		$this->db->free($resql);
 
     		return $this->id;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = "Error ".$this->db->lasterror();
     		return -1;
     	}
@@ -427,9 +419,7 @@ class Dolresource extends CommonObject
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
@@ -475,9 +465,7 @@ class Dolresource extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -522,11 +510,9 @@ class Dolresource extends CommonObject
     		foreach ($filter as $key => $value) {
     			if (strpos($key, 'date')) {
     				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			}
-    			elseif (strpos($key, 'ef.') !== false) {
+    			} elseif (strpos($key, 'ef.') !== false) {
     				$sql .= $value;
-    			}
-    			else {
+    			} else {
     				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
     			}
     		}
@@ -567,9 +553,7 @@ class Dolresource extends CommonObject
     			$this->db->free($resql);
     		}
     		return $num;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -608,8 +592,7 @@ class Dolresource extends CommonObject
    			foreach ($filter as $key => $value) {
    				if (strpos($key, 'date')) {
    					$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-   				}
-   				else {
+   				} else {
    					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
    				}
    			}
@@ -645,9 +628,7 @@ class Dolresource extends CommonObject
    				$this->db->free($resql);
    			}
    			return $num;
-   		}
-   		else
-   		{
+   		} else {
    			$this->error = $this->db->lasterror();
    			return -1;
    		}
@@ -690,8 +671,7 @@ class Dolresource extends CommonObject
     		foreach ($filter as $key => $value) {
     			if (strpos($key, 'date')) {
     				$sql .= ' AND '.$key.' = \''.$this->db->idate($value).'\'';
-    			}
-    			else {
+    			} else {
     				$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
     			}
     		}
@@ -724,9 +704,7 @@ class Dolresource extends CommonObject
     			$this->db->free($resql);
     		}
     		return $num;
-    	}
-    	else
-    	{
+    	} else {
     		$this->error = $this->db->lasterror();
     		return -1;
     	}
@@ -816,9 +794,7 @@ class Dolresource extends CommonObject
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -924,9 +900,7 @@ class Dolresource extends CommonObject
     			$i++;
     		}
     		return $num;
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($this->db);
     		return -1;
     	}
@@ -948,7 +922,7 @@ class Dolresource extends CommonObject
         global $conf, $langs;
 
         $result = '';
-        $label = '<u>'.$langs->trans("ShowResource").'</u>';
+        $label = img_picto('', $this->picto).' <u>'.$langs->trans("Resource").'</u>';
         $label .= '<br>';
         $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
         /*if (isset($this->status)) {
@@ -978,8 +952,7 @@ class Dolresource extends CommonObject
         	}
         	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
         	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
         $linkstart = '<a href="'.$url.$get_params.'"';
         $linkstart .= $linkclose.'>';
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 4836ed1a0f1..451ca9922b1 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -126,9 +126,7 @@ class FormResource
     				if ($selected > 0 && $selected == $resourcestat->lines[$i]->id)
     				{
     					$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
-    				}
-    				else
-    				{
+    				} else {
     					$out .= '<option value="'.$resourcestat->lines[$i]->id.'">'.$label.'</option>';
     				}
 
@@ -146,9 +144,7 @@ class FormResource
 
         		$out .= '</form>';
     		}
-    	}
-    	else
-    	{
+    	} else {
     		dol_print_error($this->db);
     	}
 
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index cbc94c2e843..de4d0ad3e3f 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('resource', 'sendings', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -62,9 +62,7 @@ if ($action == 'addcontact' && $user->rights->resource->write)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
@@ -91,8 +89,7 @@ elseif ($action == 'deletecontact' && $user->rights->resource->write)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/resource/document.php b/htdocs/resource/document.php
index d0d4e2300d8..0e1e6ba5cc1 100644
--- a/htdocs/resource/document.php
+++ b/htdocs/resource/document.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array('other', 'resource', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -50,8 +50,8 @@ $result = restrictedArea($user, 'resource', $id, 'resource');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -136,9 +136,7 @@ if ($object->id > 0)
     $permission = $user->rights->resource->write;
 
     include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 1ce3957071a..b850a6e2982 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -97,9 +97,7 @@ if (empty($reshook))
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Resource")), null, 'errors');
 			$action = '';
-		}
-		else
-		{
+		} else {
 			$objstat = fetchObjectByElement($element_id, $element, $element_ref);
 			$objstat->element = $element; // For externals module, we need to keep @xx
 
@@ -169,8 +167,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ResourceLinkedWithSuccess'), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF'].'?element='.$element.'&element_id='.$objstat->id);
 			exit;
-		}
-		elseif ($objstat)
+		} elseif ($objstat)
 		{
 			setEventMessages($objstat->error, $objstat->errors, 'errors');
 		}
@@ -265,9 +262,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('RessourceLineSuccessfullyDeleted'), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -297,9 +292,7 @@ if ($ret == -1) {
 }
 if (!$ret) {
     print '<div class="warning">'.$langs->trans('NoResourceInDatabase').'</div>';
-}
-else
-{
+} else {
 	// Confirmation suppression resource line
 	if ($action == 'delete_resource')
 	{
@@ -320,7 +313,7 @@ else
 			dol_fiche_head($head, 'resources', $langs->trans("Action"), -1, 'action');
 
 			$linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
-			$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
+			$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list">'.$langs->trans("BackToList").'</a>';
 
 			// Link to other agenda views
 			$out = '';
@@ -411,9 +404,7 @@ else
 					}
 				}
 				$_SESSION['assignedtouser'] = json_encode($listofuserid);
-			}
-			else
-			{
+			} else {
 				if (!empty($_SESSION['assignedtouser']))
 				{
 					$listofuserid = json_decode($_SESSION['assignedtouser'], true);
@@ -600,9 +591,7 @@ else
 				if (file_exists(dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_add.tpl.php')))
 				{
 					$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_add.tpl.php');
-				}
-				else
-				{
+				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_add.tpl.php';
 				}
 				if (empty($conf->file->strict_mode)) {
@@ -620,9 +609,7 @@ else
 					if (file_exists(dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_view.tpl.php')))
 					{
 						$tpl = dol_buildpath($reldir.'/resource_'.$element_prop['element'].'_view.tpl.php');
-					}
-					else
-					{
+					} else {
 						$tpl = DOL_DOCUMENT_ROOT.$reldir.'/resource_view.tpl.php';
 					}
 					if (empty($conf->file->strict_mode)) {
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 033d49ae8c8..ccf061b50b7 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -39,7 +39,7 @@ $element_id     = GETPOST('element_id', 'int');
 $resource_id    = GETPOST('resource_id', 'int');
 
 $sortorder      = GETPOST('sortorder', 'alpha');
-$sortfield      = GETPOST('sortfield', 'alpha');
+$sortfield      = GETPOST('sortfield', 'aZ09comma');
 
 // Initialize context for list
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'resourcelist';
@@ -108,7 +108,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 if (!$user->rights->resource->read) {
-        accessforbidden();
+		accessforbidden();
 }
 $arrayfields = array(
 		't.ref' => array(
@@ -201,8 +201,8 @@ if ($ret == -1) {
 	$newcardbutton = '';
 	if ($user->rights->resource->write)
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
-    }
+		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
+	}
 
 	print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'object_resource', 0, $newcardbutton, '', $limit, 0, 0, 1);
 }
@@ -246,47 +246,45 @@ print "</tr>\n";
 if ($ret)
 {
 	foreach ($object->lines as $resource)
-    {
-        print '<tr class="oddeven">';
+	{
+		print '<tr class="oddeven">';
 
-        if (!empty($arrayfields['t.ref']['checked']))
-        {
-        	print '<td>';
-        	print $resource->getNomUrl(5);
-        	print '</td>';
-	        if (!$i) $totalarray['nbfield']++;
-        }
+		if (!empty($arrayfields['t.ref']['checked']))
+		{
+			print '<td>';
+			print $resource->getNomUrl(5);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        if (!empty($arrayfields['ty.label']['checked']))
-        {
-        	print '<td>';
-        	print $resource->type_label;
-        	print '</td>';
-	        if (!$i) $totalarray['nbfield']++;
-        }
-        // Extra fields
-        $obj = (Object) $resource->array_options;
-        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		if (!empty($arrayfields['ty.label']['checked']))
+		{
+			print '<td>';
+			print $resource->type_label;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Extra fields
+		$obj = (Object) $resource->array_options;
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-        print '<td class="center">';
-        print '<a class="editfielda" href="./card.php?action=edit&id='.$resource->id.'">';
-        print img_edit();
-        print '</a>';
-        print '&nbsp;';
-        print '<a href="./card.php?action=delete&id='.$resource->id.'">';
-        print img_delete('', 'class="marginleftonly"');
-        print '</a>';
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		print '<td class="center">';
+		print '<a class="editfielda" href="./card.php?action=edit&token='.newToken().'&id='.$resource->id.'">';
+		print img_edit();
+		print '</a>';
+		print '&nbsp;';
+		print '<a href="./card.php?action=delete&token='.newToken().'&id='.$resource->id.'">';
+		print img_delete('', 'class="marginleftonly"');
+		print '</a>';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-        print '</tr>';
-    }
-}
-else
-{
-    $colspan = 1;
-    foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
-    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+		print '</tr>';
+	}
+} else {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 print '</table>';
diff --git a/htdocs/resource/note.php b/htdocs/resource/note.php
index 1162909114e..26038c74d96 100644
--- a/htdocs/resource/note.php
+++ b/htdocs/resource/note.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array('companies', 'interventions'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index 29e3c325ee0..01c2b5c8be6 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array('admin', 'salaries'));
 if (!$user->admin)
     accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Other parameters SALARIES_*
 $list = array(
@@ -62,9 +62,7 @@ if ($action == 'update')
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -114,9 +112,7 @@ foreach ($list as $key)
 	if (!empty($conf->accounting->enabled))
 	{
 		print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-	}
-	else
-	{
+	} else {
 		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
 	}
 	print '</td></tr>';
diff --git a/htdocs/salaries/admin/salaries_extrafields.php b/htdocs/salaries/admin/salaries_extrafields.php
index 48f574557ec..bac3824db53 100644
--- a/htdocs/salaries/admin/salaries_extrafields.php
+++ b/htdocs/salaries/admin/salaries_extrafields.php
@@ -38,7 +38,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'payment_salary'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index ade8924b0d0..ec1184a77e6 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -100,7 +100,7 @@ if ($action == 'add' && empty($cancel))
 	$object->label = GETPOST("label", 'alphanohtml');
 	$object->datesp = $datesp;
 	$object->dateep = $dateep;
-	$object->note = GETPOST("note", 'none');
+	$object->note = GETPOST("note", 'restricthtml');
 	$object->type_payment = ($type_payment > 0 ? $type_payment : 0);
 	$object->num_payment = GETPOST("num_payment", 'alphanohtml');
 	$object->fk_user_author = $user->id;
@@ -158,9 +158,7 @@ if ($action == 'add' && empty($cancel))
 				header("Location: list.php");
 				exit;
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = "create";
@@ -193,22 +191,16 @@ if ($action == 'delete')
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/salaries/list.php');
 				exit;
-			}
-			else
-			{
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	else
-	{
+	} else {
 		setEventMessages('Error try do delete a line linked to a conciliated bank transaction', null, 'errors');
 	}
 }
@@ -492,15 +484,11 @@ if ($id)
 	{
 		if (!empty($user->rights->salaries->delete))
 		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
-		}
-		else
-		{
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("NotAllowed"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
-	}
-	else
-	{
+	} else {
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConciliatedTransaction").'">'.$langs->trans("Delete").'</a></div>';
 	}
 	print "</div>";
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 82cdf3c80ce..34b58a5c0e4 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -182,9 +182,7 @@ class PaymentSalary extends CommonObject
         {
             $this->db->commit();
             return 1;
-        }
-        else
-        {
+        } else {
             $this->db->rollback();
             return -1;
         }
@@ -263,9 +261,7 @@ class PaymentSalary extends CommonObject
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
             $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
@@ -480,9 +476,7 @@ class PaymentSalary extends CommonObject
                     if ($bank_line_id > 0)
                     {
                         $this->update_fk_bank($bank_line_id);
-                    }
-                    else
-                    {
+                    } else {
                         $this->error = $acc->error;
                         $error++;
                     }
@@ -524,22 +518,17 @@ class PaymentSalary extends CommonObject
                 $result = $this->call_trigger('PAYMENT_SALARY_CREATE', $user);
                 if ($result < 0) $error++;
                 // End call triggers
-            }
-            else $error++;
+            } else $error++;
 
             if (!$error)
             {
                 $this->db->commit();
                 return $this->id;
-            }
-            else
-            {
+            } else {
                 $this->db->rollback();
                 return -2;
             }
-        }
-        else
-        {
+        } else {
             $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
@@ -562,9 +551,7 @@ class PaymentSalary extends CommonObject
         if ($result)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
@@ -622,8 +609,7 @@ class PaymentSalary extends CommonObject
              $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.'>';
@@ -675,9 +661,7 @@ class PaymentSalary extends CommonObject
                 $this->date_creation     = $this->db->jdate($obj->datec);
             }
             $this->db->free($result);
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
         }
     }
diff --git a/htdocs/salaries/class/salariesstats.class.php b/htdocs/salaries/class/salariesstats.class.php
index 3601e14bcdc..f20bde818a1 100644
--- a/htdocs/salaries/class/salariesstats.class.php
+++ b/htdocs/salaries/class/salariesstats.class.php
@@ -119,7 +119,7 @@ class SalariesStats extends Stats
     {
         $sql = "SELECT date_format(datep,'%m') as dm, sum(".$this->field.")";
         $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datep,'%Y') = '".$year."'";
+        $sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
         $sql .= " AND ".$this->where;
         $sql .= " GROUP BY dm";
         $sql .= $this->db->order('dm', 'DESC');
@@ -140,7 +140,7 @@ class SalariesStats extends Stats
     {
         $sql = "SELECT date_format(datep,'%m') as dm, avg(".$this->field.")";
         $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datep,'%Y') = '".$year."'";
+        $sql .= " WHERE date_format(datep,'%Y') = '".$this->db->escape($year)."'";
         $sql .= " AND ".$this->where;
         $sql .= " GROUP BY dm";
         $sql .= $this->db->order('dm', 'DESC');
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index ff709816d18..403a5b3af3b 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -40,7 +40,7 @@ $langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm"));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
@@ -51,8 +51,8 @@ $result = restrictedArea($user, 'salaries', '', '', '');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
@@ -128,9 +128,7 @@ if ($object->id)
 	$permission = $user->rights->salaries->write;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index fd6e7a3ec95..9341599ba70 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -56,7 +56,7 @@ if (!$sortfield) $sortfield = "s.datep,s.rowid";
 if (!$sortorder) $sortorder = "DESC,DESC";
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$filtre = GETPOST("filtre", 'none');
+$filtre = GETPOST("filtre", 'restricthtml');
 
 if (!GETPOST('typeid', 'int'))
 {
@@ -67,9 +67,7 @@ if (!GETPOST('typeid', 'int'))
 		$part = explode(':', $val);
 		if ($part[0] == 's.fk_typepayment') $typeid = $part[1];
 	}
-}
-else
-{
+} else {
 	$typeid = GETPOST('typeid', 'int');
 }
 
@@ -155,11 +153,9 @@ if ($result)
 	if ($typeid) $param .= '&amp;typeid='.$typeid;
 	if ($optioncss != '') $param .= '&amp;optioncss='.$optioncss;
 
-	$newcardbutton = '';
-	if (!empty($user->rights->salaries->write))
-	{
-		$newcardbutton .= dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/salaries/card.php?action=create');
-	}
+	$url = DOL_URL_ROOT.'/salaries/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$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.'">';
@@ -188,12 +184,10 @@ if ($result)
 	// Date
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 	print '</div>';
 	print '</td>';
 	// Type
@@ -288,8 +282,7 @@ if ($result)
 				}
 	            $accountstatic->label = $obj->blabel;
 	        	print $accountstatic->getNomUrl(1);
-	        }
-	        else print '&nbsp;';
+	        } else print '&nbsp;';
 	        print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 	    }
@@ -317,9 +310,7 @@ if ($result)
 	print '</form>';
 
     $db->free($result);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index b0023de8b64..06beda8ce41 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -256,8 +256,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/security.txt b/htdocs/security.txt
new file mode 100644
index 00000000000..8ddfd1fab43
--- /dev/null
+++ b/htdocs/security.txt
@@ -0,0 +1,5 @@
+# Security policies of Dolibarr ERP CRM project
+Contact: mailto:security@dolibarr.org
+Preferred-Languages: en
+Policy: https://github.com/Dolibarr/dolibarr/security/policy
+Expires: Sat, 31 Dec 2050 00:00:00 GMT
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 2e657805b96..d8a2ec15c52 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -38,7 +38,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'socpeople'; //Must be the $element of the class that manage extrafield
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index fb6663be951..d27ebd79207 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 $langs->loadLangs(array("admin", "companies", "other"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
 
 if (!$user->admin) accessforbidden();
@@ -53,9 +53,7 @@ if ($action == 'setcodeclient')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -66,9 +64,7 @@ if ($action == 'setcodecompta')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -83,9 +79,7 @@ if ($action == 'updateoptions')
 		if (!$error)
 	    {
 		    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	    }
-	    else
-	    {
+	    } else {
 		    setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -98,9 +92,7 @@ if ($action == 'updateoptions')
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -113,9 +105,7 @@ if ($action == 'updateoptions')
 		if (!$error)
 		{
 			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		}
-		else
-		{
+		} else {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
@@ -129,7 +119,7 @@ if ($action == 'set')
 
 	$type = 'company';
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql .= " VALUES ('".$db->escape($value)."','".$type."',".$conf->entity.", ";
+	$sql .= " VALUES ('".$db->escape($value)."','".$db->escape($type)."',".$conf->entity.", ";
 	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
 	$sql .= (!empty($scandir) ? "'".$db->escape($scandir)."'" : "null");
 	$sql .= ")";
@@ -143,7 +133,7 @@ if ($action == 'del')
 {
 	$type = 'company';
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
-	$sql .= " WHERE nom='".$db->escape($value)."' AND type='".$type."' AND entity=".$conf->entity;
+	$sql .= " WHERE nom='".$db->escape($value)."' AND type='".$db->escape($type)."' AND entity=".$conf->entity;
 	$resql = $db->query($sql);
 	if (!$resql) dol_print_error($db);
 }
@@ -162,13 +152,13 @@ if ($action == 'setdoc')
 	$type = 'company';
 	$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."document_model";
 	$sql_del .= " WHERE nom = '".$db->escape(GETPOST('value', 'alpha'))."'";
-	$sql_del .= " AND type = '".$type."'";
+	$sql_del .= " AND type = '".$db->escape($type)."'";
 	$sql_del .= " AND entity = ".$conf->entity;
     dol_syslog("societe.php ".$sql);
 	$result1 = $db->query($sql_del);
 
 	$sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity, libelle, description)";
-	$sql .= " VALUES ('".$db->escape($value)."', '".$type."', ".$conf->entity.", ";
+	$sql .= " VALUES ('".$db->escape($value)."', '".$db->escape($type)."', ".$conf->entity.", ";
 	$sql .= ($label ? "'".$db->escape($label)."'" : 'null').", ";
 	$sql .= (!empty($scandir) ? "'".$db->escape($scandir)."'" : "null");
 	$sql .= ")";
@@ -177,9 +167,7 @@ if ($action == 'setdoc')
 	if ($result1 && $result2)
 	{
 		$db->commit();
-	}
-	else
-	{
+	} else {
 	    $db->rollback();
 	}
 }
@@ -192,9 +180,7 @@ if ($action == "setaddrefinlist") {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -207,9 +193,7 @@ if ($action == "setaddadressinlist") {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -222,9 +206,7 @@ if ($action == "setaskforshippingmet") {
 	if (!$error)
 	{
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -237,9 +219,7 @@ if ($action == "setdisableprospectcustomer") {
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -254,9 +234,7 @@ if ($action == 'setprofid')
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -271,9 +249,7 @@ if ($action == 'setprofidmandatory')
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -288,9 +264,7 @@ if ($action == 'setprofidinvoicemandatory')
 	{
 		//header("Location: ".$_SERVER["PHP_SELF"]);
 		//exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -304,9 +278,7 @@ if ($action == 'sethideinactivethirdparty')
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -317,9 +289,7 @@ if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
     if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
@@ -378,8 +348,7 @@ foreach ($dirsociete as $dirroot)
 
     			try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -411,12 +380,10 @@ foreach ($arrayofmodules as $file => $modCodeTiers)
 		print '<td class="center">'."\n";
 		print img_picto($langs->trans("Activated"), 'switch_on');
 		print "</td>\n";
-	}
-	else
-	{
+	} else {
 		$disabled = (!empty($conf->multicompany->enabled) && (is_object($mc) && !empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? true : false);
 		print '<td class="center">';
-		if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&value='.$file.'">';
+		if (!$disabled) print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setcodeclient&amp;token='.newToken().'&amp;value='.$file.'">';
 		print img_picto($langs->trans("Disabled"), 'switch_off');
 		if (!$disabled) print '</a>';
 		print '</td>';
@@ -466,8 +433,7 @@ foreach ($dirsociete as $dirroot)
 
     		    try {
         			dol_include_once($dirroot.$file.'.php');
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -497,10 +463,8 @@ foreach ($arrayofmodules as $file => $modCodeCompta)
     	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&value='.$file.'">';
+    } 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>';
     }
@@ -537,9 +501,7 @@ if ($resql)
 		array_push($def, $array[0]);
 		$i++;
 	}
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -569,8 +531,7 @@ foreach ($dirsociete as $dirroot)
 
 			    try {
         			dol_include_once($dirroot.'doc/'.$file);
-    			}
-    			catch (Exception $e)
+    			} catch (Exception $e)
     			{
     			    dol_syslog($e->getMessage(), LOG_ERR);
     			}
@@ -607,17 +568,13 @@ foreach ($dirsociete as $dirroot)
 						//	print img_picto($langs->trans("Enabled"),'on');
 						//}
 						print "</td>";
-					}
-					else
-					{
+					} else {
 						if (versioncompare($module->phpmin, versionphparray()) > 0)
 						{
 							print "<td class=\"center\">\n";
 							print img_picto(dol_escape_htmltag($langs->trans("ErrorModuleRequirePHPVersion", join('.', $module->phpmin))), 'switch_off');
 							print "</td>";
-						}
-						else
-						{
+						} else {
 							print "<td class=\"center\">\n";
 							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							print "</td>";
@@ -643,9 +600,7 @@ foreach ($dirsociete as $dirroot)
 					if ($module->type == 'pdf')
 					{
 						$linkspec = '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
-					}
-					else
-					{
+					} else {
 						$linkspec = img_object($langs->trans("PreviewNotAvailable"), 'generic');
 					}
 					print $linkspec;
@@ -711,39 +666,33 @@ foreach ($profid as $key => $val)
 
 		if ($verif)
 		{
-			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=0">';
+			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&token='.newToken().'&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
-		}
-		else
-		{
-			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.$key.'&status=1">';
+		} else {
+			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofid&token='.newToken().'&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
 		}
 
 		if ($mandatory)
 		{
-			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=0">';
+			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&token='.newToken().'&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
-		}
-		else
-		{
-			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.$key.'&status=1">';
+		} else {
+			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandator&token='.newToken().'&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
 		}
 
 		if ($invoice_mandatory)
 		{
-			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=0">';
+			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&token='.newToken().'&value='.$key.'&status=0">';
 			print img_picto($langs->trans("Activated"), 'switch_on');
 			print '</a></td>';
-		}
-		else
-		{
-			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.$key.'&status=1">';
+		} else {
+			print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&token='.newToken().'&value='.$key.'&status=1">';
 			print img_picto($langs->trans("Disabled"), 'switch_off');
 			print '</a></td>';
 		}
@@ -783,9 +732,7 @@ if (!$conf->use_javascript_ajax)
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
-{
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
@@ -807,9 +754,7 @@ if (!$conf->use_javascript_ajax)
 	print '<td class="nowrap right" colspan="2">';
 	print $langs->trans("NotAvailableWhenAjaxDisabled");
 	print "</td>";
-}
-else
-{
+} else {
 	print '<td width="60" class="right">';
 	$arrval = array('0'=>$langs->trans("No"),
 	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch", 1).')',
@@ -831,12 +776,10 @@ print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->SOCIETE_ADD_REF_IN_LIST))
 {
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=0">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&value=1">';
+} else {
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddrefinlist&token='.newToken().'&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
@@ -848,12 +791,10 @@ print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 {
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=0">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&value=1">';
+} else {
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaddadressinlist&token='.newToken().'&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
@@ -867,12 +808,10 @@ print '<td>&nbsp</td>';
 print '<td class="center">';
 if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
 {
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=0">';
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&value=1">';
+} else {
+	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=1">';
 	print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</a></td>';
@@ -885,12 +824,10 @@ 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&value=0">';
+    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&value=1">';
+} 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></td>';
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index f0812485211..02c7dc51231 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -38,7 +38,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'societe'; //Must be the $element of the class that manage extrafield
 
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index dba483c52eb..77953f73d7c 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -38,9 +38,7 @@ if (GETPOST('actioncode', 'array'))
 {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -141,19 +139,11 @@ if ($socid > 0)
     $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>";
+		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');
 	}
 
-
-	//print '<div class="tabsAction">';
-	//print '</div>';
-
-
 	$newcardbutton = '';
     if (!empty($conf->agenda->enabled))
     {
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 4fe737ca31c..a56fa0d9f81 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -34,7 +34,7 @@ require '../../main.inc.php';
 $htmlname = GETPOST('htmlname', 'alpha');
 $filter = GETPOST('filter', 'alpha');
 $outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $showtype = GETPOST('showtype', 'int');
 
@@ -67,9 +67,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id))
 	}
 
 	echo json_encode($outjson);
-}
-else
-{
+} else {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 	$langs->load("companies");
diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php
index dcf0b1a4483..b98a5f75d5b 100644
--- a/htdocs/societe/ajaxcompanies.php
+++ b/htdocs/societe/ajaxcompanies.php
@@ -71,9 +71,7 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
             $sql .= "nom LIKE '".$db->escape($socid)."%'";
             $sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
             $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
-        }
-        else
-        {
+        } else {
     		$sql .= "nom LIKE '%".$db->escape($socid)."%'";
     		$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
     		$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
@@ -100,13 +98,9 @@ if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 	    }
 
 	    echo json_encode($return_arr);
-	}
-	else
-	{
+	} else {
 	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
-}
-else
-{
+} else {
     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 70ac0577cb9..fa650a4e1fd 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -244,23 +244,19 @@ abstract class ActionsCardCommon
                     $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")
+                } 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")
+                } 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
-        {
+        } else {
             $head = societe_prepare_head($this->object);
 
             $this->tpl['showhead'] = dol_get_fiche_head($head, 'card', '', 0, 'company');
@@ -307,8 +303,7 @@ abstract class ActionsCardCommon
             if ($nbofsalesrepresentative > 3)   // We print only number
             {
             	$this->tpl['sales_representatives'] .= $nbofsalesrepresentative;
-            }
-            elseif ($nbofsalesrepresentative > 0)
+            } elseif ($nbofsalesrepresentative > 0)
             {
             	$userstatic = new User($this->db);
             	$i = 0;
@@ -321,8 +316,7 @@ abstract class ActionsCardCommon
             		$i++;
             		if ($i < $nbofsalesrepresentative) $this->tpl['sales_representatives'] .= ', ';
             	}
-            }
-            else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
+            } else $this->tpl['sales_representatives'] .= $langs->trans("NoSalesRepresentativeAffected");
 
             // Linked member
             if (!empty($conf->adherent->enabled))
@@ -334,9 +328,7 @@ abstract class ActionsCardCommon
                 {
                     $adh->ref = $adh->getFullName($langs);
                     $this->tpl['linked_member'] = $adh->getNomUrl(1);
-                }
-                else
-                {
+                } else {
                     $this->tpl['linked_member'] = $langs->trans("ThirdpartyNotLinkedToMember");
                 }
             }
@@ -353,13 +345,11 @@ abstract class ActionsCardCommon
                     $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")
+                } 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")
+                } 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>';
diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php
index 0601760e34a..73453aff62e 100644
--- a/htdocs/societe/canvas/company/actions_card_company.class.php
+++ b/htdocs/societe/canvas/company/actions_card_company.class.php
@@ -134,19 +134,13 @@ class ActionsCardCompany extends ActionsCardCommon
 				{
 					$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 					$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-				}
-				else
-				{
+				} else {
 					$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 				}
-			}
-			else
-			{
+			} else {
 				$this->tpl['tva_intra'] = $s;
 			}
-		}
-		else
-		{
+		} else {
 			// Confirm delete third party
 			if ($action == 'delete')
 			{
@@ -173,19 +167,13 @@ class ActionsCardCompany extends ActionsCardCommon
 					{
 						$s .= '<a href="#" onclick="javascript: CheckVAT(document.formsoc.tva_intra.value);">'.$langs->trans("VATIntraCheck").'</a>';
 						$this->tpl['tva_intra'] = $form->textwithpicto($s, $langs->trans("VATIntraCheckDesc", $langs->transnoentitiesnoconv("VATIntraCheck")), 1);
-					}
-					else
-					{
+					} else {
 						$this->tpl['tva_intra'] = $s.'<a href="'.$langs->transcountry("VATIntraCheckURL", $this->object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
 					}
-				}
-				else
-				{
+				} else {
 					$this->tpl['tva_intra'] = $s;
 				}
-			}
-			else
-			{
+			} else {
 				$this->tpl['tva_intra'] = '&nbsp;';
 			}
 
@@ -196,9 +184,7 @@ class ActionsCardCompany extends ActionsCardCommon
 				$socm->fetch($this->object->parent);
 				$this->tpl['parent_company'] = $socm->getNomUrl(1).' '.($socm->code_client ? "(".$socm->code_client.")" : "");
 				$this->tpl['parent_company'] .= ($socm->town ? ' - '.$socm->town : '');
-			}
-			else
-			{
+			} else {
 				$this->tpl['parent_company'] = $langs->trans("NoParentCompany");
 			}
 		}
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index d7f06763034..6591e38e1cb 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -246,7 +246,7 @@ for ($i = 1; $i <= 4; $i++) {
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
 	<?php } else { ?>
-		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
+		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;token='.newToken().'&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>
 </div>
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 9f236c8015e..3abb9e9b6f7 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -110,9 +110,7 @@ class ActionsCardIndividual extends ActionsCardCommon
 		if ($action == 'create' || $action == 'edit')
 		{
 			$this->tpl['select_civility'] = $formcompany->select_civility(GETPOST('civility_id'));
-		}
-		else
-		{
+		} else {
 			// Confirm delete third party
 			if ($action == 'delete' || $conf->use_javascript_ajax)
 			{
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 14c8822dc9e..a49dbcde698 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -189,7 +189,7 @@ if ($this->control->tpl['action_delete']) echo $this->control->tpl['action_delet
 	<?php if ($conf->use_javascript_ajax) { ?>
 		<span id="action-delete" class="butActionDelete"><?php echo $langs->trans('Delete'); ?></span>
 	<?php } else { ?>
-		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
+		<a class="butActionDelete" href="<?php echo $_SERVER["PHP_SELF"].'?socid='.$this->control->tpl['id'].'&amp;action=delete&amp;token='.newToken().'&amp;canvas='.$canvas; ?>"><?php echo $langs->trans('Delete'); ?></a>
 	<?php } ?>
 <?php } ?>
 </div>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 8a0f44dc5b4..346ad15bb07 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -85,18 +85,17 @@ if (!($object->id > 0) && $action == 'view')
 }
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$object->getCanvas($socid);
 $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
-$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas);
+$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
 
 $permissiontoread = $user->rights->societe->lire;
 $permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
@@ -116,15 +115,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel)
-    {
-        $action = '';
-        if (!empty($backtopage))
-        {
-            header("Location: ".$backtopage);
-            exit;
-        }
-    }
+	if ($cancel)
+	{
+		$action = '';
+		if (!empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
 
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer)
 	{
@@ -136,9 +135,7 @@ if (empty($reshook))
 		{
 			$langs->load('errors');
 			setEventMessages($langs->trans('ErrorThirdPartyIdIsMandatory', $langs->transnoentitiesnoconv('MergeOriginThirdparty')), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if (!$error && $soc_origin->fetch($soc_origin_id) < 1)
 			{
 				setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
@@ -147,7 +144,7 @@ if (empty($reshook))
 
 			if (!$error)
 			{
-			    // TODO Move the merge function into class of object.
+				// TODO Move the merge function into class of object.
 
 				$db->begin();
 
@@ -169,11 +166,11 @@ if (empty($reshook))
 
 				// Concat some data
 				$listofproperties = array(
-				    'note_public', 'note_private'
+					'note_public', 'note_private'
 				);
 				foreach ($listofproperties as $property)
 				{
-				    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
+					$object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
 				}
 
 				// Merge extrafields
@@ -181,7 +178,7 @@ if (empty($reshook))
 				{
 					foreach ($soc_origin->array_options as $key => $val)
 					{
-					    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+						if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
 					}
 				}
 
@@ -301,10 +298,8 @@ if (empty($reshook))
 				{
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
-				}
-				else
-				{
-				    $langs->load("errors");
+				} else {
+					$langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
 					$db->rollback();
 				}
@@ -312,163 +307,160 @@ if (empty($reshook))
 		}
 	}
 
-    if (GETPOST('getcustomercode'))
-    {
-        // We defined value code_client
-        $_POST["customer_code"] = "Acompleter";
-    }
+	if (GETPOST('getcustomercode'))
+	{
+		// We defined value code_client
+		$_POST["customer_code"] = "Acompleter";
+	}
 
-    if (GETPOST('getsuppliercode'))
-    {
-        // We defined value code_fournisseur
-        $_POST["supplier_code"] = "Acompleter";
-    }
+	if (GETPOST('getsuppliercode'))
+	{
+		// We defined value code_fournisseur
+		$_POST["supplier_code"] = "Acompleter";
+	}
 
-    if ($action == 'set_localtax1')
-    {
-    	//obtidre selected del combobox
-    	$value = GETPOST('lt1');
-    	$object->fetch($socid);
-    	$res = $object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
-    }
-    if ($action == 'set_localtax2')
-    {
-    	//obtidre selected del combobox
-    	$value = GETPOST('lt2');
-    	$object->fetch($socid);
-    	$res = $object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
-    }
+	if ($action == 'set_localtax1')
+	{
+		//obtidre selected del combobox
+		$value = GETPOST('lt1');
+		$object->fetch($socid);
+		$res = $object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+	}
+	if ($action == 'set_localtax2')
+	{
+		//obtidre selected del combobox
+		$value = GETPOST('lt2');
+		$object->fetch($socid);
+		$res = $object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+	}
 
-    if ($action == 'update_extras') {
-        $object->fetch($socid);
+	if ($action == 'update_extras') {
+		$object->fetch($socid);
 
-        $object->oldcopy = dol_clone($object);
+		$object->oldcopy = dol_clone($object);
 
-        // Fill array 'array_options' with data from update form
-        $extrafields->fetch_name_optionals_label($object->table_element);
+		// Fill array 'array_options' with data from update form
+		$extrafields->fetch_name_optionals_label($object->table_element);
 
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
-        if ($ret < 0) $error++;
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
 
-        if (!$error)
-        {
-        	$result = $object->insertExtraFields('COMPANY_MODIFY');
-        	if ($result < 0)
-        	{
-        		setEventMessages($object->error, $object->errors, 'errors');
-        		$error++;
-        	}
-        }
+		if (!$error)
+		{
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		}
 
-        if ($error) $action = 'edit_extras';
-    }
+		if ($error) $action = 'edit_extras';
+	}
 
-    // Add new or update third party
-    if ((!GETPOST('getcustomercode') && !GETPOST('getsuppliercode'))
-    && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	// Add new or update third party
+	if ((!GETPOST('getcustomercode') && !GETPOST('getsuppliercode'))
+	&& ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        if (!GETPOST('name'))
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
-            $error++;
-        }
-        if (GETPOST('client') < 0)
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
-            $error++;
-        }
-        if (GETPOST('fournisseur') < 0)
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
-            $error++;
-        }
+		if (!GETPOST('name'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
+			$error++;
+		}
+		if (GETPOST('client') < 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
+			$error++;
+		}
+		if (GETPOST('fournisseur') < 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
+			$error++;
+		}
 
-        if (!$error)
-        {
-        	if ($action == 'update')
-	        {
-	        	$ret = $object->fetch($socid);
+		if (!$error)
+		{
+			if ($action == 'update')
+			{
+				$ret = $object->fetch($socid);
 				$object->oldcopy = clone $object;
-	        }
-			else $object->canvas = $canvas;
+			} else $object->canvas = $canvas;
 
-	        if (GETPOST("private", 'int') == 1)	// Ask to create a contact
-	        {
-	            $object->particulier		= GETPOST("private", 'int');
+			if (GETPOST("private", 'int') == 1)	// Ask to create a contact
+			{
+				$object->particulier		= GETPOST("private", 'int');
 
-	            $object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
-	            $object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
-	            // Add non official properties
-	            $object->name_bis = GETPOST('name', 'alphanohtml');
-	            $object->firstname = GETPOST('firstname', 'alphanohtml');
-	        }
-	        else
-	        {
-	            $object->name = GETPOST('name', 'alphanohtml');
-	        }
-	        $object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
-	        $object->name_alias = GETPOST('name_alias', 'alphanohtml');
-	        $object->address				= GETPOST('address', 'alphanohtml');
-	        $object->zip = GETPOST('zipcode', 'alphanohtml');
-	        $object->town = GETPOST('town', 'alphanohtml');
-	        $object->country_id = GETPOST('country_id', 'int');
-	        $object->state_id = GETPOST('state_id', 'int');
-	        //$object->skype					= GETPOST('skype', 'alpha');
-	        //$object->twitter				= GETPOST('twitter', 'alpha');
-	        //$object->facebook				= GETPOST('facebook', 'alpha');
-            //$object->linkedin				= GETPOST('linkedin', 'alpha');
-            $object->socialnetworks = array();
-            if (!empty($conf->socialnetworks->enabled)) {
-                foreach ($socialnetworks as $key => $value) {
-                    if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                        $object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
-                    }
-                }
-            }
-            $object->phone = GETPOST('phone', 'alpha');
-	        $object->fax					= GETPOST('fax', 'alpha');
-	        $object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-	        $object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
-	        $object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
-	        $object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
-	        $object->idprof3				= trim(GETPOST('idprof3', 'alphanohtml'));
-	        $object->idprof4				= trim(GETPOST('idprof4', 'alphanohtml'));
-	        $object->idprof5				= trim(GETPOST('idprof5', 'alphanohtml'));
-	        $object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
-	        $object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
-	        $object->code_client			= GETPOSTISSET('customer_code') ?GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
-	        $object->code_fournisseur = GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
-	        $object->capital				= GETPOST('capital', 'alphanohtml');
-	        $object->barcode				= GETPOST('barcode', 'alphanohtml');
+				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
+				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
+				// Add non official properties
+				$object->name_bis = GETPOST('name', 'alphanohtml');
+				$object->firstname = GETPOST('firstname', 'alphanohtml');
+			} else {
+				$object->name = GETPOST('name', 'alphanohtml');
+			}
+			$object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
+			$object->name_alias = GETPOST('name_alias', 'alphanohtml');
+			$object->address				= GETPOST('address', 'alphanohtml');
+			$object->zip = GETPOST('zipcode', 'alphanohtml');
+			$object->town = GETPOST('town', 'alphanohtml');
+			$object->country_id = GETPOST('country_id', 'int');
+			$object->state_id = GETPOST('state_id', 'int');
+			//$object->skype					= GETPOST('skype', 'alpha');
+			//$object->twitter				= GETPOST('twitter', 'alpha');
+			//$object->facebook				= GETPOST('facebook', 'alpha');
+			//$object->linkedin				= GETPOST('linkedin', 'alpha');
+			$object->socialnetworks = array();
+			if (!empty($conf->socialnetworks->enabled)) {
+				foreach ($socialnetworks as $key => $value) {
+					if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
+						$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+					}
+				}
+			}
+			$object->phone = GETPOST('phone', 'alpha');
+			$object->fax					= GETPOST('fax', 'alpha');
+			$object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
+			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
+			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
+			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
+			$object->idprof3				= trim(GETPOST('idprof3', 'alphanohtml'));
+			$object->idprof4				= trim(GETPOST('idprof4', 'alphanohtml'));
+			$object->idprof5				= trim(GETPOST('idprof5', 'alphanohtml'));
+			$object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
+			$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
+			$object->code_client			= GETPOSTISSET('customer_code') ?GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
+			$object->code_fournisseur = GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
+			$object->capital				= GETPOST('capital', 'alphanohtml');
+			$object->barcode				= GETPOST('barcode', 'alphanohtml');
 
-	        $object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
-	        $object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
-	        $object->status = GETPOST('status', 'alpha');
+			$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
+			$object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
+			$object->status = GETPOST('status', 'alpha');
 
-	        // Local Taxes
-	        $object->localtax1_assuj		= GETPOST('localtax1assuj_value', 'alpha');
-	        $object->localtax2_assuj		= GETPOST('localtax2assuj_value', 'alpha');
+			// Local Taxes
+			$object->localtax1_assuj		= GETPOST('localtax1assuj_value', 'alpha');
+			$object->localtax2_assuj		= GETPOST('localtax2assuj_value', 'alpha');
 
-	        $object->localtax1_value		= GETPOST('lt1', 'alpha');
-	        $object->localtax2_value		= GETPOST('lt2', 'alpha');
+			$object->localtax1_value		= GETPOST('lt1', 'alpha');
+			$object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-	        $object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
-	        $object->effectif_id			= GETPOST('effectif_id', 'int');
-	        $object->typent_id = GETPOST('typent_id', 'int');
+			$object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
+			$object->effectif_id			= GETPOST('effectif_id', 'int');
+			$object->typent_id = GETPOST('typent_id', 'int');
 
-	        $object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
+			$object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
 
-	        $object->client = GETPOST('client', 'int');
-	        $object->fournisseur			= GETPOST('fournisseur', 'int');
+			$object->client = GETPOST('client', 'int');
+			$object->fournisseur			= GETPOST('fournisseur', 'int');
 
-	        $object->commercial_id = GETPOST('commercial_id', 'int');
-	        $object->default_lang = GETPOST('default_lang');
+			$object->commercial_id = GETPOST('commercial_id', 'int');
+			$object->default_lang = GETPOST('default_lang');
 
-	        // Webservices url/key
-	        $object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
-	        $object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
+			// Webservices url/key
+			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
 			// Incoterms
 			if (!empty($conf->incoterm->enabled))
@@ -483,8 +475,8 @@ if (empty($reshook))
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 			}
 
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost(null, $object);
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
 			if ($ret < 0)
 			{
 				 $error++;
@@ -498,58 +490,58 @@ if (empty($reshook))
 			}
 			//var_dump($object->array_languages);exit;
 
-	        if (GETPOST('deletephoto')) $object->logo = '';
-	        elseif (!empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+			if (GETPOST('deletephoto')) $object->logo = '';
+			elseif (!empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
 
-	        // Check parameters
-	        if (!GETPOST('cancel', 'alpha'))
-	        {
-	            if (!empty($object->email) && !isValidEMail($object->email))
-	            {
-	                $langs->load("errors");
-	                $error++;
-	                setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
-	            }
-	            if (!empty($object->url) && !isValidUrl($object->url))
-	            {
-	                $langs->load("errors");
-	                setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
-	            }
-	            if (!empty($object->webservices_url)) {
-	                //Check if has transport, without any the soap client will give error
-	                if (strpos($object->webservices_url, "http") === false)
-	                {
-	                    $object->webservices_url = "http://".$object->webservices_url;
-	                }
-	                if (!isValidUrl($object->webservices_url)) {
-	                    $langs->load("errors");
-	                    $error++; $errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
-	                }
-	            }
+			// Check parameters
+			if (!GETPOST('cancel', 'alpha'))
+			{
+				if (!empty($object->email) && !isValidEMail($object->email))
+				{
+					$langs->load("errors");
+					$error++;
+					setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
+				}
+				if (!empty($object->url) && !isValidUrl($object->url))
+				{
+					$langs->load("errors");
+					setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
+				}
+				if (!empty($object->webservices_url)) {
+					//Check if has transport, without any the soap client will give error
+					if (strpos($object->webservices_url, "http") === false)
+					{
+						$object->webservices_url = "http://".$object->webservices_url;
+					}
+					if (!isValidUrl($object->webservices_url)) {
+						$langs->load("errors");
+						$error++; $errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
+					}
+				}
 
-	            // We set country_id, country_code and country for the selected country
-	            $object->country_id = GETPOST('country_id') != '' ?GETPOST('country_id') : $mysoc->country_id;
-	            if ($object->country_id)
-	            {
-	            	$tmparray = getCountry($object->country_id, 'all');
-	            	$object->country_code = $tmparray['code'];
-	            	$object->country = $tmparray['label'];
-	            }
-	        }
-        }
+				// We set country_id, country_code and country for the selected country
+				$object->country_id = GETPOST('country_id') != '' ?GETPOST('country_id') : $mysoc->country_id;
+				if ($object->country_id)
+				{
+					$tmparray = getCountry($object->country_id, 'all');
+					$object->country_code = $tmparray['code'];
+					$object->country = $tmparray['label'];
+				}
+			}
+		}
 
-        if (!$error)
-        {
-            if ($action == 'add')
-            {
-            	$error = 0;
+		if (!$error)
+		{
+			if ($action == 'add')
+			{
+				$error = 0;
 
-                $db->begin();
+				$db->begin();
 
-                if (empty($object->client))      $object->code_client = '';
-                if (empty($object->fournisseur)) $object->code_fournisseur = '';
+				if (empty($object->client))      $object->code_client = '';
+				if (empty($object->fournisseur)) $object->code_fournisseur = '';
 
-                $result = $object->create($user);
+				$result = $object->create($user);
 
 				if ($result >= 0)
 				{
@@ -591,118 +583,106 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 
-                    // Logo/Photo save
-                    $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
-                    $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-                    if ($file_OK)
-                    {
-                        if (image_format_supported($_FILES['photo']['name']))
-                        {
-                            dol_mkdir($dir);
-
-                            if (@is_dir($dir))
-                            {
-                                $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                                $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
-
-                                if (!$result > 0)
-                                {
-                                    $errors[] = "ErrorFailedToSaveFile";
-                                }
-                                else
-                                {
-                                    // Create thumbs
-                                    $object->addThumbs($newfile);
-                                }
-                            }
-                        }
-                    }
-                    else
+					// Logo/Photo save
+					$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
+					$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+					if ($file_OK)
 					{
+						if (image_format_supported($_FILES['photo']['name']))
+						{
+							dol_mkdir($dir);
+
+							if (@is_dir($dir))
+							{
+								$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+								$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+
+								if (!$result > 0)
+								{
+									$errors[] = "ErrorFailedToSaveFile";
+								} else {
+									// Create thumbs
+									$object->addThumbs($newfile);
+								}
+							}
+						}
+					} else {
 						switch ($_FILES['photo']['error'])
 						{
-						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-						    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-						        $errors[] = "ErrorFileSizeTooLarge";
-						        break;
-	      					case 3: //uploaded file was only partially uploaded
-						        $errors[] = "ErrorFilePartiallyUploaded";
-						        break;
+							case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+							case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+								$errors[] = "ErrorFileSizeTooLarge";
+								break;
+		  					case 3: //uploaded file was only partially uploaded
+								$errors[] = "ErrorFilePartiallyUploaded";
+								break;
 						}
-	                }
-                    // Gestion du logo de la société
-                }
-                else
-				{
-				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					}
+					// Gestion du logo de la société
+				} else {
+					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
 						$object->code_fournisseur = null;
 						$object->code_client = null;
 					}
 
-                    setEventMessages($object->error, $object->errors, 'errors');
-                   	$error++;
-                }
+					setEventMessages($object->error, $object->errors, 'errors');
+				   	$error++;
+				}
 
-                if ($result >= 0 && !$error)
-                {
-                    $db->commit();
+				if ($result >= 0 && !$error)
+				{
+					$db->commit();
 
-                    if (!empty($backtopage))
-                	{
-                		$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
-                		if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	}
-                	else
-                	{
-                		$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
-                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
-                    	elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+					if (!empty($backtopage))
+					{
+						$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
+						if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
+			   			header("Location: ".$backtopage);
+						exit;
+					} else {
+						$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
+						if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+						elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
 
-                		header("Location: ".$url);
-                    	exit;
-                	}
-                }
-                else
-                {
-                    $db->rollback();
-                    $action = 'create';
-                }
-            }
+						header("Location: ".$url);
+						exit;
+					}
+				} else {
+					$db->rollback();
+					$action = 'create';
+				}
+			}
 
-            if ($action == 'update')
-            {
-            	$error = 0;
+			if ($action == 'update')
+			{
+				$error = 0;
 
-                if (GETPOST('cancel', 'alpha'))
-                {
-                	if (!empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	}
-                	else
-                	{
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
-                }
+				if (GETPOST('cancel', 'alpha'))
+				{
+					if (!empty($backtopage))
+					{
+			   			header("Location: ".$backtopage);
+						exit;
+					} else {
+			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						exit;
+					}
+				}
 
-                // To not set code if third party is not concerned. But if it had values, we keep them.
-                if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client = '';
-                if (empty($object->fournisseur) && empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur = '';
-                //var_dump($object);exit;
+				// To not set code if third party is not concerned. But if it had values, we keep them.
+				if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client = '';
+				if (empty($object->fournisseur) && empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur = '';
+				//var_dump($object);exit;
 
-                $result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
+				$result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
 
-                if ($result <= 0)
-                {
-                    setEventMessages($object->error, $object->errors, 'errors');
-                    $error++;
-                }
+				if ($result <= 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
 
 				// Links with users
 				$salesreps = GETPOST('commercial', 'array');
@@ -735,163 +715,156 @@ if (empty($reshook))
 					}
 				}
 
-                // Logo/Photo save
-                $dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
-                $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-                if (GETPOST('deletephoto') && $object->logo)
-                {
-                    $fileimg = $dir.'/'.$object->logo;
-                    $dirthumbs = $dir.'/thumbs';
-                    dol_delete_file($fileimg);
-                    dol_delete_dir_recursive($dirthumbs);
-                }
-                if ($file_OK)
-                {
-                    if (image_format_supported($_FILES['photo']['name']) > 0)
-                    {
-                        dol_mkdir($dir);
-
-                        if (@is_dir($dir))
-                        {
-                            $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                            $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
-
-                            if (!$result > 0)
-                            {
-                                $errors[] = "ErrorFailedToSaveFile";
-                            }
-                            else
-                            {
-                            	// Create thumbs
-                            	$object->addThumbs($newfile);
-
-                                // Index file in database
-                                if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
-                                {
-                                	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-                                	// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
-                                	deleteFilesIntoDatabaseIndex(dirname($newfile), '', '');
-                                	// now we index the uploaded logo file
-                                	addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
-                                }
-                            }
-                        }
-                    }
-                    else
+				// Logo/Photo save
+				$dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
+				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+				if (GETPOST('deletephoto') && $object->logo)
+				{
+					$fileimg = $dir.'/'.$object->logo;
+					$dirthumbs = $dir.'/thumbs';
+					dol_delete_file($fileimg);
+					dol_delete_dir_recursive($dirthumbs);
+				}
+				if ($file_OK)
+				{
+					if (image_format_supported($_FILES['photo']['name']) > 0)
 					{
-                        $errors[] = "ErrorBadImageFormat";
-                    }
-                }
-                else
-                {
+						dol_mkdir($dir);
+
+						if (@is_dir($dir))
+						{
+							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+							$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+
+							if (!$result > 0)
+							{
+								$errors[] = "ErrorFailedToSaveFile";
+							} else {
+								// Create thumbs
+								$object->addThumbs($newfile);
+
+								// Index file in database
+								if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
+								{
+									require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+									// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
+									deleteFilesIntoDatabaseIndex(dirname($newfile), '', '');
+									// now we index the uploaded logo file
+									addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
+								}
+							}
+						}
+					} else {
+						$errors[] = "ErrorBadImageFormat";
+					}
+				} else {
 					switch ($_FILES['photo']['error'])
 					{
-					    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-					    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-					        $errors[] = "ErrorFileSizeTooLarge";
-					        break;
-      					case 3: //uploaded file was only partially uploaded
-					        $errors[] = "ErrorFilePartiallyUploaded";
-					        break;
+						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+							$errors[] = "ErrorFileSizeTooLarge";
+							break;
+	  					case 3: //uploaded file was only partially uploaded
+							$errors[] = "ErrorFilePartiallyUploaded";
+							break;
 					}
-                }
-                // Gestion du logo de la société
+				}
+				// Gestion du logo de la société
 
 
-                // Update linked member
-                if (!$error && $object->fk_soc > 0)
-                {
-                	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-                	$sql .= " SET fk_soc = NULL WHERE fk_soc = ".$id;
-                	if (!$object->db->query($sql))
-                	{
-                		$error++;
-                		$object->error .= $object->db->lasterror();
-                		setEventMessages($object->error, $object->errors, 'errors');
-                	}
-                }
+				// Update linked member
+				if (!$error && $object->fk_soc > 0)
+				{
+					$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+					$sql .= " SET fk_soc = NULL WHERE fk_soc = ".$id;
+					if (!$object->db->query($sql))
+					{
+						$error++;
+						$object->error .= $object->db->lasterror();
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
 
-                if (!$error && !count($errors))
-                {
-                	if (!empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	}
-                	else
-                	{
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
-                }
-                else
-                {
-                    $object->id = $socid;
-                    $action = "edit";
-                }
-            }
-        }
-        else
-        {
-        	$action = ($action == 'add' ? 'create' : 'edit');
-        }
-    }
+				if (!$error && !count($errors))
+				{
+					if (!empty($backtopage))
+					{
+			   			header("Location: ".$backtopage);
+						exit;
+					} else {
+			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						exit;
+					}
+				} else {
+					$object->id = $socid;
+					$action = "edit";
+				}
+			}
+		} else {
+			$action = ($action == 'add' ? 'create' : 'edit');
+		}
+	}
 
-    // Delete third party
-    if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
-    {
-        $object->fetch($socid);
-        $object->oldcopy = clone $object;
-        $result = $object->delete($socid, $user);
+	// Delete third party
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
+	{
+		$object->fetch($socid);
+		$object->oldcopy = clone $object;
+		$result = $object->delete($socid, $user);
 
-        if ($result > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
-            exit;
-        }
-        else
-        {
-            $langs->load("errors");
-           	setEventMessages($object->error, $object->errors, 'errors');
-           	$error++;
-            $action = '';
-        }
-    }
+		if ($result > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
+			exit;
+		} else {
+			$langs->load("errors");
+		   	setEventMessages($object->error, $object->errors, 'errors');
+		   	$error++;
+			$action = '';
+		}
+	}
 
-    // Set parent company
-    if ($action == 'set_thirdparty' && $user->rights->societe->creer)
-    {
-    	$object->fetch($socid);
-    	$result = $object->set_parent(GETPOST('editparentcompany', 'int'));
-    }
+	// Set parent company
+	if ($action == 'set_thirdparty' && $user->rights->societe->creer)
+	{
+		$object->fetch($socid);
+		$result = $object->set_parent(GETPOST('editparentcompany', 'int'));
+	}
 
-    // Set incoterm
-    if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-    {
-    	$object->fetch($socid);
-    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-    }
+	// Set incoterm
+	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+	{
+		$object->fetch($socid);
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	}
 
-    $id = $socid;
-    $object->fetch($socid);
+	// Set sales representatives
+	if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer)
+	{
+		$object->fetch($socid);
+		$result = $object->setSalesRep(GETPOST('commercial', 'array'));
+	}
+
+	$id = $socid;
+	$object->fetch($socid);
 
 	// Selection of new fields
 	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD) && (empty($conf->global->SOCIETE_DISABLE_CONTACTS) || !empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))) {
 		include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 	}
 
-    // Actions to send emails
-    $triggersendname = 'COMPANY_SENTBYMAIL';
-    $paramname = 'socid';
-    $mode = 'emailfromthirdparty';
-    $trackid = 'thi'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'COMPANY_SENTBYMAIL';
+	$paramname = 'socid';
+	$mode = 'emailfromthirdparty';
+	$trackid = 'thi'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Actions to build doc
-    $id = $socid;
-    $upload_dir = $conf->societe->dir_output;
-    $permissiontoadd = $user->rights->societe->creer;
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	// Actions to build doc
+	$id = $socid;
+	$upload_dir = $conf->societe->dir_output;
+	$permissiontoadd = $user->rights->societe->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -906,7 +879,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);
 }
 
@@ -919,178 +892,173 @@ $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 {
-    // -----------------------------------------
-    // When used with CANVAS
-    // -----------------------------------------
+	// -----------------------------------------
+	// When used with CANVAS
+	// -----------------------------------------
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
-    $objcanvas->display_canvas($action); // Show template
-}
-else
-{
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
-    if ($action == 'create')
-    {
-        /*
+	$objcanvas->display_canvas($action); // Show template
+} else {
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
+	if ($action == 'create')
+	{
+		/*
          *  Creation
          */
 		$private = GETPOST("private", "int");
 		if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !GETPOSTISSET('private')) $private = 1;
-    	if (empty($private)) $private = 0;
+		if (empty($private)) $private = 0;
 
-        // Load object modCodeTiers
-        $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module) - 4);
-        }
-        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-        foreach ($dirsociete as $dirroot)
-        {
-            $res = dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
-        }
-        $modCodeClient = new $module;
-        // Load object modCodeFournisseur
-        $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module) - 4);
-        }
-        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-        foreach ($dirsociete as $dirroot)
-        {
-            $res = dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
-        }
-        $modCodeFournisseur = new $module;
+		// Load object modCodeTiers
+		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module) - 4);
+		}
+		$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+		foreach ($dirsociete as $dirroot)
+		{
+			$res = dol_include_once($dirroot.$module.'.php');
+			if ($res) break;
+		}
+		$modCodeClient = new $module;
+		// Load object modCodeFournisseur
+		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module) - 4);
+		}
+		$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+		foreach ($dirsociete as $dirroot)
+		{
+			$res = dol_include_once($dirroot.$module.'.php');
+			if ($res) break;
+		}
+		$modCodeFournisseur = new $module;
 
-        // Define if customer/prospect or supplier status is set or not
-        if (GETPOST("type") != 'f')
-        {
-            $object->client = -1;
-            if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) { $object->client = 3; }
-        }
-        // Prospect / Customer
-        if (GETPOST("type") == 'c') {
-        	if (!empty($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT)) {
-        		$object->client = $conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT;
-        	} else {
-        		$object->client = 3;
-        	}
-        }
-        if (GETPOST("type") == 'p') { $object->client = 2; }
-        if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) { $object->fournisseur = 1; }
+		// Define if customer/prospect or supplier status is set or not
+		if (GETPOST("type") != 'f')
+		{
+			$object->client = -1;
+			if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) { $object->client = 3; }
+		}
+		// Prospect / Customer
+		if (GETPOST("type") == 'c') {
+			if (!empty($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT)) {
+				$object->client = $conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT;
+			} else {
+				$object->client = 3;
+			}
+		}
+		if (GETPOST("type") == 'p') { $object->client = 2; }
+		if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) { $object->fournisseur = 1; }
 
-        $object->name = GETPOST('name', 'alphanohtml');
-        $object->name_alias	= GETPOST('name_alias', 'alphanohtml');
-        $object->firstname = GETPOST('firstname', 'alphanohtml');
-        $object->particulier		= $private;
-        $object->prefix_comm		= GETPOST('prefix_comm', 'alphanohtml');
-        $object->client = GETPOST('client', 'int') ?GETPOST('client', 'int') : $object->client;
+		$object->name = GETPOST('name', 'alphanohtml');
+		$object->name_alias	= GETPOST('name_alias', 'alphanohtml');
+		$object->firstname = GETPOST('firstname', 'alphanohtml');
+		$object->particulier		= $private;
+		$object->prefix_comm		= GETPOST('prefix_comm', 'alphanohtml');
+		$object->client = GETPOST('client', 'int') ?GETPOST('client', 'int') : $object->client;
 
-        if (empty($duplicate_code_error)) {
-	        $object->code_client		= GETPOST('customer_code', 'alpha');
-	        $object->fournisseur		= GETPOST('fournisseur') ? GETPOST('fournisseur', 'int') : $object->fournisseur;
-            $object->code_fournisseur = GETPOST('supplier_code', 'alpha');
-        }
-		else {
+		if (empty($duplicate_code_error)) {
+			$object->code_client		= GETPOST('customer_code', 'alpha');
+			$object->fournisseur		= GETPOST('fournisseur') ? GETPOST('fournisseur', 'int') : $object->fournisseur;
+			$object->code_fournisseur = GETPOST('supplier_code', 'alpha');
+		} else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'), '', 'warnings');
 		}
 
 
-        $object->address = GETPOST('address', 'alphanohtml');
-        $object->zip = GETPOST('zipcode', 'alphanohtml');
-        $object->town = GETPOST('town', 'alphanohtml');
-        $object->state_id = GETPOST('state_id', 'int');
-        //$object->skype				= GETPOST('skype', 'alpha');
-        //$object->twitter			= GETPOST('twitter', 'alpha');
-        //$object->facebook			= GETPOST('facebook', 'alpha');
-        //$object->linkedin			= GETPOST('linkedin', 'alpha');
-        $object->socialnetworks = array();
-        if (!empty($conf->socialnetworks->enabled)) {
-            foreach ($socialnetworks as $key => $value) {
-                if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                    $object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
-                }
-            }
-        }
-        $object->phone				= GETPOST('phone', 'alpha');
-        $object->fax				= GETPOST('fax', 'alpha');
-        $object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-        $object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
-        $object->capital			= GETPOST('capital', 'alphanohtml');
-        $object->barcode			= GETPOST('barcode', 'alphanohtml');
-        $object->idprof1			= GETPOST('idprof1', 'alphanohtml');
-        $object->idprof2			= GETPOST('idprof2', 'alphanohtml');
-        $object->idprof3			= GETPOST('idprof3', 'alphanohtml');
-        $object->idprof4			= GETPOST('idprof4', 'alphanohtml');
-        $object->idprof5			= GETPOST('idprof5', 'alphanohtml');
-        $object->idprof6			= GETPOST('idprof6', 'alphanohtml');
-        $object->typent_id = GETPOST('typent_id', 'int');
-        $object->effectif_id		= GETPOST('effectif_id', 'int');
-        $object->civility_id		= GETPOST('civility_id', 'alpha');
+		$object->address = GETPOST('address', 'alphanohtml');
+		$object->zip = GETPOST('zipcode', 'alphanohtml');
+		$object->town = GETPOST('town', 'alphanohtml');
+		$object->state_id = GETPOST('state_id', 'int');
+		//$object->skype				= GETPOST('skype', 'alpha');
+		//$object->twitter			= GETPOST('twitter', 'alpha');
+		//$object->facebook			= GETPOST('facebook', 'alpha');
+		//$object->linkedin			= GETPOST('linkedin', 'alpha');
+		$object->socialnetworks = array();
+		if (!empty($conf->socialnetworks->enabled)) {
+			foreach ($socialnetworks as $key => $value) {
+				if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
+					$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+				}
+			}
+		}
+		$object->phone				= GETPOST('phone', 'alpha');
+		$object->fax				= GETPOST('fax', 'alpha');
+		$object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+		$object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+		$object->capital			= GETPOST('capital', 'alphanohtml');
+		$object->barcode			= GETPOST('barcode', 'alphanohtml');
+		$object->idprof1			= GETPOST('idprof1', 'alphanohtml');
+		$object->idprof2			= GETPOST('idprof2', 'alphanohtml');
+		$object->idprof3			= GETPOST('idprof3', 'alphanohtml');
+		$object->idprof4			= GETPOST('idprof4', 'alphanohtml');
+		$object->idprof5			= GETPOST('idprof5', 'alphanohtml');
+		$object->idprof6			= GETPOST('idprof6', 'alphanohtml');
+		$object->typent_id = GETPOST('typent_id', 'int');
+		$object->effectif_id		= GETPOST('effectif_id', 'int');
+		$object->civility_id		= GETPOST('civility_id', 'alpha');
 
-        $object->tva_assuj = GETPOST('assujtva_value', 'int');
-        $object->status = GETPOST('status', 'int');
+		$object->tva_assuj = GETPOST('assujtva_value', 'int');
+		$object->status = GETPOST('status', 'int');
 
-        //Local Taxes
-        $object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
-        $object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
+		//Local Taxes
+		$object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
+		$object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
 
-        $object->localtax1_value	= GETPOST('lt1', 'int');
-        $object->localtax2_value	= GETPOST('lt2', 'int');
+		$object->localtax1_value	= GETPOST('lt1', 'int');
+		$object->localtax2_value	= GETPOST('lt2', 'int');
 
-        $object->tva_intra = GETPOST('tva_intra', 'alphanohtml');
+		$object->tva_intra = GETPOST('tva_intra', 'alphanohtml');
 
-        $object->commercial_id = GETPOST('commercial_id', 'int');
-        $object->default_lang = GETPOST('default_lang');
+		$object->commercial_id = GETPOST('commercial_id', 'int');
+		$object->default_lang = GETPOST('default_lang');
 
-        $object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
+		$object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
 
-        // Gestion du logo de la société
-        $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
-        $file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
-        if ($file_OK)
-        {
-            if (image_format_supported($_FILES['photo']['name']))
-            {
-                dol_mkdir($dir);
+		// Gestion du logo de la société
+		$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
+		$file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
+		if ($file_OK)
+		{
+			if (image_format_supported($_FILES['photo']['name']))
+			{
+				dol_mkdir($dir);
 
-                if (@is_dir($dir))
-                {
-                    $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                    $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+				if (@is_dir($dir))
+				{
+					$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+					$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                    if (!$result > 0)
-                    {
-                        $errors[] = "ErrorFailedToSaveFile";
-                    }
-                    else
-                    {
-                        // Create thumbs
-                        $object->addThumbs($newfile);
-                    }
-                }
-            }
-        }
+					if (!$result > 0)
+					{
+						$errors[] = "ErrorFailedToSaveFile";
+					} else {
+						// Create thumbs
+						$object->addThumbs($newfile);
+					}
+				}
+			}
+		}
 
-        // We set country_id, country_code and country for the selected country
-        $object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
-        if ($object->country_id)
-        {
-            $tmparray = getCountry($object->country_id, 'all');
-            $object->country_code = $tmparray['code'];
-            $object->country = $tmparray['label'];
-        }
-        $object->forme_juridique_code = GETPOST('forme_juridique_code');
-        /* Show create form */
+		// We set country_id, country_code and country for the selected country
+		$object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
+		if ($object->country_id)
+		{
+			$tmparray = getCountry($object->country_id, 'all');
+			$object->country_code = $tmparray['code'];
+			$object->country = $tmparray['label'];
+		}
+		$object->forme_juridique_code = GETPOST('forme_juridique_code');
+		/* Show create form */
 
-        $linkback = "";
-        print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'building');
+		$linkback = "";
+		print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'building');
 
-        if (!empty($conf->use_javascript_ajax)) {
+		if (!empty($conf->use_javascript_ajax)) {
 			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
 				print "\n".'<script type="text/javascript">';
 				print '$(document).ready(function () {
@@ -1209,18 +1177,16 @@ else
         if ($object->particulier || $private)
         {
 	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName', 'name').'</span>';
-        }
-        else
-		{
+        } else {
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
         }
 	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
-	    print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus">';
+	    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="'.$object->prefix_comm.'"></td>';
+	    	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>';
 
@@ -1231,7 +1197,7 @@ else
         	{
         		// 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="'.$object->firstname.'"></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
@@ -1243,7 +1209,7 @@ else
 
         // 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="'.$object->name_alias.'"></td></tr>';
+        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>';
@@ -1308,7 +1274,7 @@ else
         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="'.$object->barcode.'">';
+	        print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
             print '</td></tr>';
         }
 
@@ -1318,7 +1284,7 @@ else
         print '</td>';
 	    print '<td colspan="3">';
 	    print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft">';
-        print $object->address;
+	    print dol_escape_htmltag($object->address);
         print '</textarea>';
         print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
         print '</td></tr>';
@@ -1336,7 +1302,7 @@ else
         // 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((GETPOST('country_id') != '' ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+        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>';
 
@@ -1346,9 +1312,7 @@ else
             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
-            {
+            } else {
                 print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">';
             }
 
@@ -1436,9 +1400,7 @@ else
                 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
-            {
+            } else {
                 $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
             }
         }
@@ -1457,28 +1419,26 @@ else
             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")
+        } 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")
+        } 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 - Size
+        // Type - Workforce/Staff
         print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'."\n";
         $sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
         print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
         if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td>';
         if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+        print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
         print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
         if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td></tr>';
@@ -1489,22 +1449,20 @@ else
         if ($object->country_id)
         {
             print $formcompany->select_juridicalstatus($object->forme_juridique_code, $object->country_code, '', 'forme_juridique_code');
-        }
-        else
-        {
+        } 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" size="10" value="'.$object->capital.'"> ';
+	    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 $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>';
         }
@@ -1583,17 +1541,14 @@ else
         {
             print ' &nbsp; &nbsp; ';
             print '<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-        }
-        else
-        {
+        } 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')
+    } elseif ($action == 'edit')
     {
         //print load_fiche_titre($langs->trans("EditCompany"));
 
@@ -1700,33 +1655,33 @@ else
 					$object->location_incoterms = GETPOST('lcoation_incoterms', 'alpha');
 				}
 
-                //Local Taxes
-                $object->localtax1_assuj		= GETPOST('localtax1assuj_value');
-                $object->localtax2_assuj		= GETPOST('localtax2assuj_value');
+				//Local Taxes
+				$object->localtax1_assuj		= GETPOST('localtax1assuj_value');
+				$object->localtax2_assuj		= GETPOST('localtax2assuj_value');
 
-                $object->localtax1_value		= GETPOST('lt1');
-                $object->localtax2_value		= GETPOST('lt2');
+				$object->localtax1_value		= GETPOST('lt1');
+				$object->localtax2_value		= GETPOST('lt2');
 
-                // We set country_id, and country_code label of the chosen country
-                if ($object->country_id > 0)
-                {
-                	$tmparray = getCountry($object->country_id, 'all');
-                    $object->country_code = $tmparray['code'];
-                    $object->country = $tmparray['label'];
-                }
-            }
+				// We set country_id, and country_code label of the chosen country
+				if ($object->country_id > 0)
+				{
+					$tmparray = getCountry($object->country_id, 'all');
+					$object->country_code = $tmparray['code'];
+					$object->country = $tmparray['label'];
+				}
+			}
 
-            if ($object->localtax1_assuj == 0) {
-            	$sub = 0;
-            } else {$sub = 1; }
-            if ($object->localtax2_assuj == 0) {
-            	$sub2 = 0;
-            } else {$sub2 = 1; }
+			if ($object->localtax1_assuj == 0) {
+				$sub = 0;
+			} else {$sub = 1; }
+			if ($object->localtax2_assuj == 0) {
+				$sub2 = 0;
+			} else {$sub2 = 1; }
 
-            if ($conf->use_javascript_ajax)
-            {
-            	print "\n".'<script type="text/javascript">';
-            	print '$(document).ready(function () {
+			if ($conf->use_javascript_ajax)
+			{
+				print "\n".'<script type="text/javascript">';
+				print '$(document).ready(function () {
     			var val='.$sub.';
     			var val2='.$sub2.';
     			if("#localtax1assuj_value".value==undefined){
@@ -1841,9 +1796,7 @@ else
                 {
                     print '<input type="hidden" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                     print $object->prefix_comm;
-                }
-                else
-                {
+                } else {
                     print '<input type="text" size="5" maxlength="5" name="prefix_comm" id="prefix" value="'.dol_escape_htmltag($object->prefix_comm).'">';
                 }
                 print '</td>';
@@ -1864,13 +1817,10 @@ else
                 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())
+            } 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
-            {
+            } else {
                 print $object->code_client;
                 print '<input type="hidden" name="customer_code" value="'.dol_escape_htmltag($object->code_client).'">';
             }
@@ -1905,13 +1855,10 @@ else
                     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="'.$object->code_fournisseur.'" maxlength="15">';
-                }
-                else
+                } 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.'">';
                 }
@@ -1926,7 +1873,7 @@ else
             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="'.$object->barcode.'">';
+	            print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.dol_escape_htmltag($object->barcode).'">';
                 print '</td></tr>';
             }
 
@@ -1938,7 +1885,7 @@ else
             // 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 $object->address;
+	        print dol_escape_htmltag($object->address);
             print '</textarea>';
             print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
             print '</td></tr>';
@@ -1966,9 +1913,7 @@ else
                 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
-                {
+                } else {
                     print '<tr><td>'.$form->editfieldkey('State', 'state_id', '', $object, 0).'</td><td colspan="3">';
                 }
 
@@ -2054,8 +1999,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            }
-            elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
+            } 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);
@@ -2066,8 +2010,7 @@ else
                     print '</span>';
                 }
                 print '</td></tr>';
-            }
-            elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
+            } 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);
@@ -2103,9 +2046,7 @@ else
                     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
-                {
+                } else {
                     $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
@@ -2113,13 +2054,13 @@ else
             print '</td>';
             print '</tr>';
 
-            // Type - Size
+            // Type - Workforce/Staff
             print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
             print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td>';
             if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
+            print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
             print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td></tr>';
@@ -2189,8 +2130,8 @@ else
 			{
 				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>';
 			}
 
@@ -2247,9 +2188,7 @@ else
 
             print '</form>';
         }
-    }
-    else
-    {
+    } else {
     	/*
          * View
          */
@@ -2341,7 +2280,7 @@ else
         if (!empty($conf->barcode->enabled))
         {
             print '<tr><td>';
-            print $langs->trans('Gencod').'</td><td>'.$object->barcode;
+            print $langs->trans('Gencod').'</td><td>'.dol_escape_htmltag($object->barcode);
             print '</td>';
             print '</tr>';
         }
@@ -2410,9 +2349,7 @@ else
 			            print '<td class="left">';
 			            $formcompany->select_localtax(1, $object->localtax1_value, "lt1");
 			            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
-			        }
-			        else
-			        {
+			        } else {
 			            print '<td>'.$object->localtax1_value.'</td>';
 			        }
 			        print '</tr></form>';
@@ -2432,8 +2369,7 @@ else
 			        }
 			        print '</tr></form>';
 			    }
-			}
-			elseif ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj != "1")
+			} 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);
@@ -2453,8 +2389,7 @@ else
 			        }
 			        print '</tr></form>';
 			    }
-			}
-			elseif ($mysoc->localtax2_assuj == "1" && $mysoc->localtax1_assuj != "1")
+			} 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);
@@ -2483,7 +2418,7 @@ else
         if ($object->tva_intra)
         {
             $s = '';
-            $s .= $object->tva_intra;
+            $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))
@@ -2504,26 +2439,22 @@ else
                     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
-                {
+                } else {
                     $s .= '<a href="'.$langs->transcountry("VATIntraCheckURL", $object->country_id).'" class="hideonsmartphone" target="_blank">'.img_picto($langs->trans("VATIntraCheckableOnEUSite"), 'help').'</a>';
                 }
             }
             print $s;
-        }
-        else
-        {
+        } else {
             print '&nbsp;';
         }
         print '</td>';
         print '</tr>';
 
-        // Type + Staff
+        // Type + Workforce/Staff
         $arr = $formcompany->typent_array(1);
         $object->typent = $arr[$object->typent_code];
         print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
-        print '<tr><td>'.$langs->trans("Staff").'</td><td>'.$object->effectif.'</td></tr>';
+        print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
 
         print '</table>';
 
@@ -2553,58 +2484,56 @@ else
 			}
 		}
 
-        // Legal
-        print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
+		// Legal
+		print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
 
-        // Capital
-        print '<tr><td>'.$langs->trans('Capital').'</td><td>';
-        if ($object->capital) print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
-        else print '&nbsp;';
-        print '</td></tr>';
+		// Capital
+		print '<tr><td>'.$langs->trans('Capital').'</td><td>';
+		if ($object->capital) print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
+		else print '&nbsp;';
+		print '</td></tr>';
 
-        // Default language
-        if (!empty($conf->global->MAIN_MULTILANGS))
-        {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
-            //$s=picto_from_langcode($object->default_lang);
-            //print ($s?$s.' ':'');
-            $langs->load("languages");
-            $labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
-            print $labellang;
-            print '</td></tr>';
-        }
+		// Default language
+		if (!empty($conf->global->MAIN_MULTILANGS))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
+			//$s=picto_from_langcode($object->default_lang);
+			//print ($s?$s.' ':'');
+			$langs->load("languages");
+			$labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
+			print $labellang;
+			print '</td></tr>';
+		}
 
-        // Incoterms
-        if (!empty($conf->incoterm->enabled))
-        {
-        	print '<tr><td>';
-        	print '<table width="100%" class="nobordernopadding"><tr><td>';
-        	print $langs->trans('IncotermLabel');
-        	print '<td><td class="right">';
-        	if ($user->rights->societe->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a>';
-        	else print '&nbsp;';
-        	print '</td></tr></table>';
-        	print '</td>';
-        	print '<td colspan="3">';
-        	if ($action != 'editincoterm')
-        	{
-        		print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-        	}
-        	else
-        	{
-        		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
-        	}
-        	print '</td></tr>';
-        }
+		// Incoterms
+		if (!empty($conf->incoterm->enabled))
+		{
+			print '<tr><td>';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('IncotermLabel');
+			print '<td><td class="right">';
+			if ($user->rights->societe->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a>';
+			else print '&nbsp;';
+			print '</td></tr></table>';
+			print '</td>';
+			print '<td colspan="3">';
+			if ($action != 'editincoterm')
+			{
+				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
+			} else {
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
+			}
+			print '</td></tr>';
+		}
 
 		// Multicurrency
 		if (!empty($conf->multicurrency->enabled))
 		{
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-	        print '<td>';
-	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code, 1) : '';
+			print '<td>';
+			print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code, 1) : '';
 			print '</td></tr>';
 		}
 
@@ -2612,73 +2541,69 @@ else
 		$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-        // Parent company
-        if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
-        {
-        	print '<tr><td>';
-        	print '<table class="nobordernopadding" width="100%"><tr><td>';
-        	print $langs->trans('ParentCompany');
-        	print '</td>';
-        	if ($action != 'editparentcompany') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-        	print '</tr></table>';
-        	print '</td><td>';
-        	if ($action == 'editparentcompany')
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
-        	}
-        	else
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
-        	}
-        	print '</td>';
-        	print '</tr>';
-        }
+		// Parent company
+		if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
+		{
+			print '<tr><td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('ParentCompany');
+			print '</td>';
+			if ($action != 'editparentcompany') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td>';
+			if ($action == 'editparentcompany')
+			{
+				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
+			} else {
+				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
-        // Sales representative
-        include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
+		// Sales representative
+		include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
-        // Module Adherent
-        if (!empty($conf->adherent->enabled))
-        {
-            $langs->load("members");
-            print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
-            print '<td>';
-            $adh = new Adherent($db);
-            $result = $adh->fetch('', '', $object->id);
-            if ($result > 0)
-            {
-                $adh->ref = $adh->getFullName($langs);
-                print $adh->getNomUrl(1);
-            }
-            else
-            {
-                print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
-            }
-            print '</td>';
-            print "</tr>\n";
-        }
+		// Module Adherent
+		if (!empty($conf->adherent->enabled))
+		{
+			$langs->load("members");
+			print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
+			print '<td>';
+			$adh = new Adherent($db);
+			$result = $adh->fetch('', '', $object->id);
+			if ($result > 0)
+			{
+				$adh->ref = $adh->getFullName($langs);
+				print $adh->getNomUrl(1);
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
+			}
+			print '</td>';
+			print "</tr>\n";
+		}
 
-        // Webservices url/key
-        if (!empty($conf->syncsupplierwebservices->enabled)) {
-            print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
-            print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
-        }
+		// Webservices url/key
+		if (!empty($conf->syncsupplierwebservices->enabled)) {
+			print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
+			print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
+		}
 
-        print '</table>';
+		print '</table>';
 		print '</div>';
 
-        print '</div></div>';
-        print '<div style="clear:both"></div>';
+		print '</div></div>';
+		print '<div style="clear:both"></div>';
 
-        dol_fiche_end();
+		dol_fiche_end();
 
 
-        /*
+		/*
          *  Actions
          */
-        if ($action != 'presend')
-        {
-	        print '<div class="tabsAction">'."\n";
+		if ($action != 'presend')
+		{
+			print '<div class="tabsAction">'."\n";
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -2697,54 +2622,50 @@ else
 
 				if (empty($user->socid)) {
 					if (!empty($object->email) || $at_least_one_email_contact)
-			        {
-			        	$langs->load("mails");
-			        	print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-			        }
-			        else
 					{
-			        	$langs->load("mails");
-			       		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
-			        }
+						$langs->load("mails");
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+					} else {
+						$langs->load("mails");
+				   		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
+					}
 				}
 
-		        if ($user->rights->societe->creer)
-		        {
-		            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-		        }
+				if ($user->rights->societe->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				}
 
-		        if (!empty($conf->adherent->enabled))
-		        {
+				if (!empty($conf->adherent->enabled))
+				{
 					$adh = new Adherent($db);
 					$result = $adh->fetch('', '', $object->id);
 					if ($result == 0 && ($object->client == 1 || $object->client == 3) && !empty($conf->global->MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS))
-            		{
-            			print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?&action=create&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("NewMember")).'">'.$langs->trans("NewMember").'</a>';
-            		}
-            	}
-
-		        if ($user->rights->societe->supprimer)
-		        {
-		        	print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>';
-		        }
-
-		        if ($user->rights->societe->supprimer)
-		        {
-		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
-		            {
-		                print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
-		            }
-		            else
 					{
-		                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-		            }
-		        }
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?&action=create&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("NewMember")).'">'.$langs->trans("NewMember").'</a>';
+					}
+				}
+
+				if ($user->rights->societe->supprimer)
+				{
+					print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>';
+				}
+
+				if ($user->rights->societe->supprimer)
+				{
+					if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+					{
+						print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
+					} else {
+						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+					}
+				}
 			}
 
-	        print '</div>'."\n";
-        }
+			print '</div>'."\n";
+		}
 
-        //Select mail models is same action as presend
+		//Select mail models is same action as presend
 		if (GETPOST('modelselected')) {
 			$action = 'presend';
 		}
@@ -2753,20 +2674,20 @@ else
 		{
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
-	        if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-	        {
+			if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+			{
 				print '<a name="builddoc"></a>'; // ancre
 
-	            /*
+				/*
 	             * Documents generes
 	             */
-	            $filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
-	            $urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
-	            $genallowed = $user->rights->societe->lire;
-	            $delallowed = $user->rights->societe->creer;
+				$filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
+				$urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
+				$genallowed = $user->rights->societe->lire;
+				$delallowed = $user->rights->societe->creer;
 
-	            print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-	        }
+				print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+			}
 
 			// Subsidiaries list
 			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
@@ -2778,7 +2699,7 @@ else
 
 			$MAXEVENT = 10;
 
-            $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
+			$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
@@ -2810,7 +2731,7 @@ else
 		$trackid = 'thi'.$object->id;
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-    }
+	}
 }
 
 // End of page
diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
index 91d0fe9bb1a..725cab96065 100644
--- a/htdocs/societe/checkvat/checkVatPopup.php
+++ b/htdocs/societe/checkvat/checkVatPopup.php
@@ -49,9 +49,7 @@ if (!$vatNumber)
 {
 	print '<br>';
 	print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired", $langs->trans("VATIntraShort")).'</font><br>';
-}
-else
-{
+} else {
 	$vatNumber = preg_replace('/\^\w/', '', $vatNumber);
 	$vatNumber = str_replace(array(' ', '.'), '', $vatNumber);
 	$countryCode = substr($vatNumber, 0, 2);
@@ -102,18 +100,15 @@ else
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	}
-	elseif (preg_match('/TIMEOUT/i', $result['faultstring']))
+	} elseif (preg_match('/TIMEOUT/i', $result['faultstring']))
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	}
-	elseif (preg_match('/SERVER_BUSY/i', $result['faultstring']))
+	} elseif (preg_match('/SERVER_BUSY/i', $result['faultstring']))
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow = $soapclient->response;
-	}
-	elseif ($result['faultstring'])
+	} elseif ($result['faultstring'])
 	{
 		print '<font class="error">'.$langs->trans("Error").'</font><br>';
 		$messagetoshow = $result['faultstring'];
@@ -126,9 +121,7 @@ else
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		print $langs->trans("ValueIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		//$messagetoshow=$soapclient->response;
-	}
-	else
-	{
+	} else {
 		// Syntaxe ok
 		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="ok">'.$langs->trans("Yes").'</font><br>';
@@ -136,18 +129,14 @@ else
 		if (preg_match('/MS_UNAVAILABLE/i', $result['faultstring']))
 		{
 			print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE", $countryCode).'</font><br>';
-		}
-		else
-		{
+		} else {
 			if (!empty($result['valid']) && ($result['valid'] == 1 || $result['valid'] == 'true'))
 			{
 				print '<font class="ok">'.$langs->trans("Yes").'</font>';
 				print '<br>';
 				print $langs->trans("Name").': '.$result['name'].'<br>';
 				print $langs->trans("Address").': '.$result['address'].'<br>';
-			}
-			else
-			{
+			} else {
 				print '<font class="error">'.$langs->trans("No").'</font>';
 				print '<br>'."\n";
 			}
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index bfaed41f21b..d5280ee80dd 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -98,6 +98,48 @@ class Contacts extends DolibarrApi
 		return $this->_cleanObjectDatas($this->contact);
 	}
 
+	/**
+	 * Get properties of a contact object by Email
+	 *
+	 * @param 	string 	$email 					Email of contact
+	 * @param   int    $includecount        Count and return also number of elements the contact is used as a link for
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET email/{email}
+	 *
+	 * @throws RestException 401     Insufficient rights
+	 * @throws RestException 404     User or group not found
+	 */
+    public function getByEmail($email, $includecount = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->societe->contact->lire)
+		{
+			throw new RestException(401, 'No permission to read contacts');
+		}
+		if (empty($email)) {
+			$result = $this->contact->initAsSpecimen();
+		} else {
+			$result = $this->contact->fetch('', '', '', $email);
+		}
+
+		if (!$result)
+		{
+			throw new RestException(404, 'Contact not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('contact', $this->contact->id, 'socpeople&societe'))
+		{
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if ($includecount)
+		{
+		    $this->contact->load_ref_elements();
+		}
+
+		return $this->_cleanObjectDatas($this->contact);
+	}
+
 	/**
 	 * List contacts
 	 *
@@ -160,7 +202,7 @@ class Contacts extends DolibarrApi
 
     	// Select contacts of given category
     	if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$db->escape($category);
+			$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_socpeople = t.rowid ";
     	}
 
@@ -175,7 +217,7 @@ class Contacts extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-		$sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
 		if ($limit)
 		{
@@ -185,18 +227,18 @@ class Contacts extends DolibarrApi
 			}
 			$offset = $limit * $page;
 
-			$sql .= $db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
-		$result = $db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$num = $db->num_rows($result);
+			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
             $i = 0;
 			while ($i < $min)
 			{
-				$obj = $db->fetch_object($result);
-				$contact_static = new Contact($db);
+				$obj = $this->db->fetch_object($result);
+				$contact_static = new Contact($this->db);
 				if ($contact_static->fetch($obj->rowid))
 				{
 		            if ($includecount)
@@ -208,8 +250,7 @@ class Contacts extends DolibarrApi
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve contacts : '.$sql);
 		}
 		if (!count($obj_ret))
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index ab9d52a350d..8551cb61f10 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -67,7 +67,7 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * Return an array with thirdparty informations
 	 *
-	 * @param 	int 	$id ID of thirdparty
+	 * @param 	int 	$id Id of third party to load
 	 * @return 	array|mixed data without useless information
 	 *
 	 * @throws 	RestException
@@ -82,10 +82,10 @@ class Thirdparties extends DolibarrApi
 	 *
 	 * Return an array with thirdparty informations
 	 *
-	 * @param string    $email  Sort field
+	 * @param string    $email  Email of third party to load
 	 * @return array|mixed data without useless information
 	 *
-	 * @url     GET byEmail/{email}
+	 * @url     GET email/{email}
 	 *
 	 * @throws RestException
 	 */
@@ -94,6 +94,23 @@ class Thirdparties extends DolibarrApi
 	    return $this->_fetch('', '', '', '', '', '', '', '', '', '', $email);
 	}
 
+	/**
+	 * Get properties of a thirdparty object by barcode.
+	 *
+	 * Return an array with thirdparty informations
+	 *
+	 * @param string    $barcode  Barcode of third party to load
+	 * @return array|mixed data without useless information
+	 *
+	 * @url     GET barcode/{barcode}
+	 *
+	 * @throws RestException
+	 */
+	public function getByBarcode($barcode)
+	{
+	    return $this->_fetch('', '', '', $barcode);
+	}
+
 	/**
 	 * List thirdparties
 	 *
@@ -143,9 +160,9 @@ class Thirdparties extends DolibarrApi
 
     	// Select thirdparties of given category
     	if ($category > 0) {
-			if (!empty($mode) && $mode != 4) { $sql .= " AND c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid"; }
-			elseif (!empty($mode) && $mode == 4) { $sql .= " AND cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid"; }
-			else { $sql .= " AND ((c.fk_categorie = ".$db->escape($category)." AND c.fk_soc = t.rowid) OR (cc.fk_categorie = ".$db->escape($category)." AND cc.fk_soc = t.rowid))"; }
+    		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";
@@ -168,7 +185,7 @@ class Thirdparties extends DolibarrApi
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-		$sql .= $db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
 		if ($limit) {
 			if ($page < 0)
@@ -177,27 +194,26 @@ class Thirdparties extends DolibarrApi
 			}
 			$offset = $limit * $page;
 
-			$sql .= $db->plimit($limit + 1, $offset);
+			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
-		$result = $db->query($sql);
+		$result = $this->db->query($sql);
 		if ($result)
 		{
-			$num = $db->num_rows($result);
+			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
             $i = 0;
 			while ($i < $min)
 			{
-				$obj = $db->fetch_object($result);
-				$soc_static = new Societe($db);
+				$obj = $this->db->fetch_object($result);
+				$soc_static = new Societe($this->db);
 				if ($soc_static->fetch($obj->rowid)) {
 					$obj_ret[] = $this->_cleanObjectDatas($soc_static);
 				}
 				$i++;
 			}
-		}
-		else {
-			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
+		} else {
+			throw new RestException(503, 'Error when retrieve thirdparties : '.$this->db->lasterror());
 		}
 		if (!count($obj_ret)) {
 			throw new RestException(404, 'Thirdparties not found');
@@ -299,7 +315,7 @@ class Thirdparties extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$this->companytoremove = new Societe($db);
+		$this->companytoremove = new Societe($this->db);
 
 		$result = $this->companytoremove->fetch($idtodelete); // include the fetch of extra fields
 		if (!$result) {
@@ -318,7 +334,7 @@ class Thirdparties extends DolibarrApi
 		// Call same code than into action 'confirm_merge'
 
 
-		$db->begin();
+		$this->db->begin();
 
 		// Recopy some data
 		$object->client = $object->client | $soc_origin->client;
@@ -355,7 +371,7 @@ class Thirdparties extends DolibarrApi
 		}
 
 		// Merge categories
-		$static_cat = new Categorie($db);
+		$static_cat = new Categorie($this->db);
 		$custcats = $static_cat->containing($soc_origin->id, 'customer', 'id');
 		$object->setCategories($custcats, 'customer');
 		$suppcats = $static_cat->containing($soc_origin->id, 'supplier', 'id');
@@ -412,10 +428,10 @@ class Thirdparties extends DolibarrApi
 			{
 				require_once DOL_DOCUMENT_ROOT.$object_file;
 
-				if (!$errors && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id))
+				if (!$errors && !$object_name::replaceThirdparty($this->db, $soc_origin->id, $object->id))
 				{
 					$errors++;
-					//setEventMessages($db->lasterror(), null, 'errors');
+					//setEventMessages($this->db->lasterror(), null, 'errors');
 				}
 			}
 		}
@@ -463,13 +479,11 @@ class Thirdparties extends DolibarrApi
 
 		if ($error)
 		{
-			$db->rollback();
+			$this->db->rollback();
 
 			throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
-		}
-		else
-		{
-			$db->commit();
+		} else {
+			$this->db->commit();
 		}
 
 		return $this->get($id);
@@ -495,6 +509,66 @@ class Thirdparties extends DolibarrApi
 		}
         $this->company->oldcopy = clone $this->company;
 		return $this->company->delete($id);
+    }
+
+	/**
+	 * Set new price level for the given thirdparty
+	 *
+	 * @param	int		$id				ID of thirdparty
+	 * @param	int		$priceLevel		Price level to apply to thirdparty
+	 * @return	object					Thirdparty data without useless information
+	 *
+	 * @url PUT {id}/setpricelevel
+	 *
+	 * @throws RestException 400 Price level out of bounds
+	 * @throws RestException 401 Access not allowed for your login
+	 * @throws RestException 404 Thirdparty not found
+	 * @throws RestException 500 Error fetching/setting price level
+	 * @throws RestException 501 Request needs modules "Thirdparties" and "Products" and setting Multiprices activated
+	 */
+	public function setThirdpartyPriceLevel($id, $priceLevel)
+	{
+		global $conf;
+
+		if (empty($conf->societe->enabled)) {
+			throw new RestException(501, 'Module "Thirdparties" needed for this request');
+		}
+
+		if (empty($conf->product->enabled)) {
+			throw new RestException(501, 'Module "Products" needed for this request');
+		}
+
+		if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+			throw new RestException(501, 'Multiprices features activation needed for this request');
+		}
+
+		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);
+		}
+
+		if (empty(DolibarrApiAccess::$user->rights->societe->creer)) {
+			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');
+		}
+
+		if (empty($result)) {
+			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);
+		}
+
+		$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()));
+		}
+
+		return $this->_cleanObjectDatas($this->company);
 	}
 
 	/**
@@ -1083,7 +1157,7 @@ class Thirdparties extends DolibarrApi
 		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
 
 
-		$result = $db->query($sql);
+		$result = $this->db->query($sql);
 
 		if ($result->num_rows == 0) {
 			throw new RestException(404, 'Account not found');
@@ -1095,18 +1169,17 @@ class Thirdparties extends DolibarrApi
 
 		if ($result)
 		{
-			$num = $db->num_rows($result);
+			$num = $this->db->num_rows($result);
 			while ($i < $num)
 			{
-				$obj = $db->fetch_object($result);
-				$account = new CompanyBankAccount($db);
+				$obj = $this->db->fetch_object($result);
+				$account = new CompanyBankAccount($this->db);
 				if ($account->fetch($obj->rowid)) {
 					$accounts[] = $account;
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(404, 'Account not found');
 		}
 
@@ -1312,9 +1385,7 @@ class Thirdparties extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			throw new RestException(404, 'Bank account not found');
 		}
 
@@ -1330,9 +1401,7 @@ class Thirdparties extends DolibarrApi
 		if ($result > 0)
 		{
 			return array("success" => $result);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500);
 		}
     }
@@ -1368,7 +1437,7 @@ class Thirdparties extends DolibarrApi
 		$sql .= " WHERE fk_soc = $id";
 		if ($site) $sql .= " AND site ='$site'";
 
-		$result = $db->query($sql);
+		$result = $this->db->query($sql);
 
 		if ($result->num_rows == 0) {
 			throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
@@ -1378,11 +1447,11 @@ class Thirdparties extends DolibarrApi
 
 		$accounts = array();
 
-		$num = $db->num_rows($result);
+		$num = $this->db->num_rows($result);
 		while ($i < $num)
 		{
-			$obj = $db->fetch_object($result);
-			$account = new SocieteAccount($db);
+			$obj = $this->db->fetch_object($result);
+			$account = new SocieteAccount($this->db);
 
 			if ($account->fetch($obj->rowid)) {
 				$accounts[] = $account;
@@ -1438,8 +1507,8 @@ class Thirdparties extends DolibarrApi
 			throw new RestException(422, 'Unprocessable Entity: You must pass the site attribute in your request data !');
 		}
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
-		$result = $db->query($sql);
+		$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) {
 			$account = new SocieteAccount($this->db);
@@ -1493,8 +1562,8 @@ class Thirdparties extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		$sql = "SELECT rowid, fk_user_creat, date_creation FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '$site' ";
-		$result = $db->query($sql);
+		$sql = "SELECT rowid, fk_user_creat, date_creation FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '".$this->db->escape($site)."'";
+		$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) {
@@ -1519,15 +1588,15 @@ class Thirdparties extends DolibarrApi
 			// We found an existing SocieteAccount entity, we are replacing it
 		} else {
 			if (isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
-				$result = $db->query($sql);
+				$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) {
 					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.");
 				}
 			}
 
-			$obj = $db->fetch_object($result);
+			$obj = $this->db->fetch_object($result);
 
 			$account = new SocieteAccount($this->db);
 			$account->id = $obj->rowid;
@@ -1577,21 +1646,21 @@ class Thirdparties extends DolibarrApi
 		}
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
-		$result = $db->query($sql);
+		$result = $this->db->query($sql);
 
 		if ($result->num_rows == 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
 			if (isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
-				$result = $db->query($sql);
+				$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)
 					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.");
 			}
 
-			$obj = $db->fetch_object($result);
+			$obj = $this->db->fetch_object($result);
 			$account = new SocieteAccount($this->db);
 			$account->fetch($obj->rowid);
 
@@ -1623,20 +1692,19 @@ class Thirdparties extends DolibarrApi
 	 */
     public function deleteSocieteAccount($id, $site)
     {
-		global /** @var Database $db */
-		$db;
+		global $db;
 
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
-		$result = $db->query($sql);
+		$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) {
 			throw new RestException(404);
 		} else {
-			$obj = $db->fetch_object($result);
+			$obj = $this->db->fetch_object($result);
 			$account = new SocieteAccount($this->db);
 			$account->fetch($obj->rowid);
 
@@ -1660,8 +1728,7 @@ class Thirdparties extends DolibarrApi
 	 */
     public function deleteSocieteAccounts($id)
     {
-		global /** @var Database $db */
-		$db;
+		global $db;
 
 		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
@@ -1672,20 +1739,20 @@ class Thirdparties extends DolibarrApi
 		 */
 
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = ".$id;
 
-		$result = $db->query($sql);
+		$result = $this->db->query($sql);
 
 		if ($result->num_rows == 0) {
 			throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
 		} else {
 			$i = 0;
 
-			$num = $db->num_rows($result);
+			$num = $this->db->num_rows($result);
 			while ($i < $num)
 			{
-				$obj = $db->fetch_object($result);
-				$account = new SocieteAccount($db);
+				$obj = $this->db->fetch_object($result);
+				$account = new SocieteAccount($this->db);
 				$account->fetch($obj->rowid);
 
 				if ($account->delete(DolibarrApiAccess::$user) < 0) {
@@ -1760,7 +1827,7 @@ class Thirdparties extends DolibarrApi
      * @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	$ref_int    Internal reference of third party (not used by dolibarr)
+	 * @param    string	$barcode    Barcode of third party to load
 	 * @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
 	 * @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
 	 * @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
@@ -1773,14 +1840,14 @@ class Thirdparties extends DolibarrApi
      *
      * @throws RestException
     */
-    private function _fetch($rowid, $ref = '', $ref_ext = '', $ref_int = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
+    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, $ref_int, $idprof1, $idprof2, $idprof3, $idprof4, $idprof5, $idprof6, $email, $ref_alias);
+        $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');
         }
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index 06c56b027cd..f3cdd3c805b 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,7 +59,7 @@ class Client extends Societe
         // phpcs:enable
         global $user;
 
-        $this->nb = array("customers" => 0, "prospects" => 0);
+        $this->nb = array("prospects" => 0, "customers" => 0);
         $clause = "WHERE";
 
         $sql = "SELECT count(s.rowid) as nb, s.client";
@@ -83,9 +84,7 @@ class Client extends Societe
             }
             $this->db->free($resql);
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             $this->error = $this->db->lasterror();
             return -1;
@@ -102,14 +101,14 @@ class Client extends Societe
     {
     	global $langs;
 
-   		$sql = "SELECT id, code, libelle as label 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)));
+			$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 7211802721e..283c32573e0 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -111,20 +111,14 @@ class CompanyBankAccount extends Account
 					if (!$error)
 					{
 						return 1;
-					}
-					else
-					{
+					} else {
 						return 0;
 					}
-				}
-				else
-				{
+				} else {
 					return 1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			print $this->db->error();
 			return 0;
 		}
@@ -167,8 +161,7 @@ class CompanyBankAccount extends Account
 		}
 		if (trim($this->label) != '')
 			$sql .= ",label = '".$this->db->escape($this->label)."'";
-		else
-			$sql .= ",label = NULL";
+		else $sql .= ",label = NULL";
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
@@ -183,19 +176,13 @@ class CompanyBankAccount extends Account
 				if (!$error)
 				{
 					return 1;
-				}
-				else
-				{
+				} else {
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				return 1;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -258,9 +245,7 @@ class CompanyBankAccount extends Account
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -307,9 +292,7 @@ class CompanyBankAccount extends Account
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1 * $error;
 		}
@@ -354,9 +337,7 @@ class CompanyBankAccount extends Account
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				$obj = $this->db->fetch_object($result1);
 
 				$this->db->begin();
@@ -376,16 +357,12 @@ class CompanyBankAccount extends Account
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index 5ba268f6687..93f0d13b498 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -404,8 +404,7 @@ class CompanyPaymentMode extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -439,9 +438,7 @@ class CompanyPaymentMode extends CommonObject
 			if ($this->db->num_rows($result1) == 0)
 			{
 				return 0;
-			}
-			else
-			{
+			} else {
 				$obj = $this->db->fetch_object($result1);
 
 				$type = '';
@@ -466,16 +463,12 @@ class CompanyPaymentMode extends CommonObject
 					dol_print_error($this->db);
 					$this->db->rollback();
 					return -1;
-				}
-				else
-				{
+				} else {
 					$this->db->commit();
 					return 1;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -565,9 +558,7 @@ class CompanyPaymentMode extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 30a90a884bd..ba16f61f3b2 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -16,6 +16,7 @@
  * Copyright (C) 2018	    Philippe Grand	        <philippe.grand@atoo-net.com>
  * Copyright (C) 2019-2020  Josep Lluís Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,6 +38,7 @@
  *	\brief      File for third party class
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
@@ -44,6 +46,8 @@ require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
  */
 class Societe extends CommonObject
 {
+	use CommonIncoterm;
+
 	/**
 	 * @var string ID to identify managed object
 	 */
@@ -157,8 +161,8 @@ class Societe extends CommonObject
 		'instagram' =>array('type'=>'varchar(255)', 'label'=>'Instagram', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
 		'facebook' =>array('type'=>'varchar(255)', 'label'=>'Facebook', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
 		'twitter' =>array('type'=>'varchar(255)', 'label'=>'Twitter', 'enabled'=>1, 'visible'=>-1, 'position'=>165),*/
-		'fk_effectif' =>array('type'=>'integer', 'label'=>'Fk effectif', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_typent' =>array('type'=>'integer', 'label'=>'Fk typent', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
+		'fk_effectif' =>array('type'=>'integer', 'label'=>'Workforce', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
+		'fk_typent' =>array('type'=>'integer', 'label'=>'TypeOfCompany', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
 		'fk_forme_juridique' =>array('type'=>'integer', 'label'=>'JuridicalStatus', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
 		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'Currency', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'siren' =>array('type'=>'varchar(128)', 'label'=>'Idprof1', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
@@ -169,7 +173,7 @@ class Societe extends CommonObject
 		'idprof6' =>array('type'=>'varchar(128)', 'label'=>'Idprof6', 'enabled'=>1, 'visible'=>-1, 'position'=>207),
 		'tva_intra' =>array('type'=>'varchar(20)', 'label'=>'Tva intra', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
 		'capital' =>array('type'=>'double(24,8)', 'label'=>'Capital', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'fk_stcomm' =>array('type'=>'integer', 'label'=>'Fk stcomm', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
+		'fk_stcomm' =>array('type'=>'integer', 'label'=>'CommercialStatus', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
 		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>225),
 		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>230),
 		'prefix_comm' =>array('type'=>'varchar(5)', 'label'=>'Prefix comm', 'enabled'=>'$conf->global->SOCIETE_USEPREFIX', 'visible'=>-1, 'position'=>235),
@@ -572,6 +576,12 @@ class Societe extends CommonObject
 	 */
 	public $stcomm_id;
 
+	/**
+	 * Status prospect picto
+	 * @var string
+	 */
+	public $stcomm_picto;
+
 	/**
 	 * Status prospect label
 	 * @var int
@@ -685,20 +695,6 @@ class Societe extends CommonObject
      */
 	public $logo_squarred_mini;
 
-	/**
-     * @var int ID Incoterms
-     */
-	public $fk_incoterms;
-
-	/**
-	 * @var string Incoterms Location
-	 */
-	public $location_incoterms;
-
-    /**
-     * @var string Incoterm label
-     */
-	public $label_incoterms; //Used into tooltip
 
 	// Multicurrency
 	/**
@@ -713,10 +709,39 @@ class Societe extends CommonObject
 
 
 	/**
-	 * @var Account Default BAN account
+	 * @var Account|string Default BAN account
 	 */
 	public $bank_account;
 
+	/**
+	 * Third party is no customer
+	 */
+	const NO_CUSTOMER = 0;
+
+	/**
+	 * Third party is a customer
+	 */
+	const CUSTOMER = 1;
+
+	/**
+	 * Third party is a prospect
+	 */
+	const PROSPECT = 2;
+
+	/**
+	 * Third party is a customer and a prospect
+	 */
+	const CUSTOMER_AND_PROSPECT = 3;
+
+	/**
+	 * Third party is no supplier
+	 */
+	const NO_SUPPLIER = 0;
+
+	/**
+	 * Third party is a supplier
+	 */
+	const SUPPLIER = 1;
 
 	/**
 	 *    Constructor
@@ -752,7 +777,7 @@ class Societe extends CommonObject
 	 *    $this->code_client = -1 and $this->code_fournisseur = -1 means automatic assignement.
 	 *
 	 *    @param	User	$user       Object of user that ask creation
-	 *    @return   int         		>= 0 if OK, < 0 if KO
+	 *    @return   int         		>=0 if OK, <0 if KO
 	 */
     public function create(User $user)
 	{
@@ -795,12 +820,11 @@ class Societe extends CommonObject
 		{
 			$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)";
 			$sql .= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->db->escape($this->entity).", '".$this->db->idate($now)."'";
-			$sql .= ", ".(!empty($user->id) ? "'".$user->id."'" : "null");
+			$sql .= ", ".(!empty($user->id) ? ((int) $user->id) : "null");
 			$sql .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
 			$sql .= ", ".$this->status;
-			$sql .= ", ".(!empty($this->ref_int) ? "'".$this->db->escape($this->ref_int)."'" : "null");
 			$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
 			$sql .= ", 0";
 			$sql .= ", ".(int) $this->fk_incoterms;
@@ -834,40 +858,31 @@ class Societe extends CommonObject
 					$result = $this->call_trigger('COMPANY_CREATE', $user);
 					if ($result < 0) $error++;
 					// End call triggers
-				}
-				else $error++;
+				} else $error++;
 
 				if (!$error)
 				{
 					dol_syslog(get_class($this)."::Create success id=".$this->id);
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					dol_syslog(get_class($this)."::Create echec update ".$this->error." ".join(',', $this->errors), LOG_ERR);
 					$this->db->rollback();
 					return -4;
 				}
-			}
-			else
-			{
+			} else {
 				if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name); // duplicate on a field (code or profid or ...)
 					$result = -1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
@@ -945,19 +960,19 @@ class Societe extends CommonObject
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadCustomerCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorCustomerCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorCustomerCodeAlreadyUsed';
-				}
-				elseif ($rescode == -4)
+				} elseif ($rescode == -4)
 				{
 					$this->errors[] = 'ErrorPrefixRequired';
+				} else {
+					$this->errors[] = 'ErrorUnknownOnCustomerCodeCheck';
 				}
+
 				$result = -3;
 			}
 		}
@@ -970,18 +985,17 @@ class Societe extends CommonObject
 				if ($rescode == -1)
 				{
 					$this->errors[] = 'ErrorBadSupplierCodeSyntax';
-				}
-				elseif ($rescode == -2)
+				} elseif ($rescode == -2)
 				{
 					$this->errors[] = 'ErrorSupplierCodeRequired';
-				}
-				elseif ($rescode == -3)
+				} elseif ($rescode == -3)
 				{
 					$this->errors[] = 'ErrorSupplierCodeAlreadyUsed';
-				}
-				elseif ($rescode == -5)
+				} elseif ($rescode == -4)
 				{
 					$this->errors[] = 'ErrorPrefixRequired';
+				} else {
+					$this->errors[] = 'ErrorUnknownOnSupplierCodeCheck';
 				}
 				$result = -3;
 			}
@@ -1022,9 +1036,7 @@ class Societe extends CommonObject
 						$this->errors[] = $langs->transcountry('ProfId'.$i, $this->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 				}
-			}
-			else
-			{
+			} else {
 				//var_dump($conf->global->SOCIETE_EMAIL_UNIQUE);
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
 				if ($key == 'EMAIL')
@@ -1269,20 +1281,16 @@ class Societe extends CommonObject
 				if ($this->localtax1_value != '')
 				{
 					$sql .= ",localtax1_value =".$this->localtax1_value;
-				}
-				else $sql .= ",localtax1_value =0.000";
-			}
-			else $sql .= ",localtax1_value =0.000";
+				} else $sql .= ",localtax1_value =0.000";
+			} else $sql .= ",localtax1_value =0.000";
 
 			if ($this->localtax2_assuj == 1)
 			{
 				if ($this->localtax2_value != '')
 				{
 					$sql .= ",localtax2_value =".$this->localtax2_value;
-				}
-				else $sql .= ",localtax2_value =0.000";
-			}
-			else $sql .= ",localtax2_value =0.000";
+				} else $sql .= ",localtax2_value =0.000";
+			} else $sql .= ",localtax2_value =0.000";
 
 			$sql .= ",capital = ".($this->capital == '' ? "null" : $this->capital);
 
@@ -1335,6 +1343,7 @@ class Societe extends CommonObject
 			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : "null");
 			$sql .= ", fk_multicurrency = ".(int) $this->fk_multicurrency;
 			$sql .= ", multicurrency_code = '".$this->db->escape($this->multicurrency_code)."'";
+			$sql .= ", model_pdf = '".$this->db->escape($this->model_pdf)."'";
 			$sql .= " WHERE rowid = ".(int) $id;
 
 			$resql = $this->db->query($sql);
@@ -1352,9 +1361,7 @@ class Societe extends CommonObject
 						unset($this->state_code);
 						unset($this->state);
 					}
-				}
-				else
-				{
+				} else {
 					unset($this->country_code); // We clean this, in the doubt, because it may have been changed after an update of country_id
 					unset($this->country);
 					unset($this->state_code);
@@ -1397,8 +1404,7 @@ class Societe extends CommonObject
 								dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 								$error++;
 							}
-						}
-						elseif ($result < 0)
+						} elseif ($result < 0)
 						{
 							$this->error = $lmember->error;
 							$error++;
@@ -1440,32 +1446,24 @@ class Societe extends CommonObject
 					dol_syslog(get_class($this)."::Update success");
 					$this->db->commit();
 					return 1;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
-			{
+			} else {
 				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 				{
 					// Doublon
 					$this->error = $langs->trans("ErrorDuplicateField");
 					$result = -1;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$result = -2;
 				}
 				$this->db->rollback();
 				return $result;
 			}
-		}
-		else
-	    {
+		} else {
 			$this->db->rollback();
 			dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);
 			return -3;
@@ -1478,7 +1476,7 @@ class Societe extends CommonObject
 	 *    @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	$notused       	Not used
+	 *    @param    string	$barcode       	Barcode of third party to load
 	 *    @param    string	$idprof1		Prof id 1 of third party (Warning, this can return several records)
 	 *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
 	 *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
@@ -1489,14 +1487,14 @@ class Societe extends CommonObject
 	 *    @param    string	$ref_alias 		Name_alias of third party (Warning, this can return several records)
 	 *    @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($rowid, $ref = '', $ref_ext = '', $notused = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
+	public function fetch($rowid, $ref = '', $ref_ext = '', $barcode = '', $idprof1 = '', $idprof2 = '', $idprof3 = '', $idprof4 = '', $idprof5 = '', $idprof6 = '', $email = '', $ref_alias = '')
 	{
 		global $langs;
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext) && empty($barcode) && empty($idprof1) && empty($idprof2) && empty($idprof3) && empty($idprof4) && empty($idprof5) && empty($idprof6) && empty($email)) return -1;
 
-		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.ref_int, s.address, s.datec as date_creation, s.prefix_comm';
+		$sql = 'SELECT s.rowid, s.nom as name, s.name_alias, s.entity, s.ref_ext, s.address, s.datec as date_creation, s.prefix_comm';
 		$sql .= ', s.status';
 		$sql .= ', s.price_level';
 		$sql .= ', s.tms as date_modification, s.fk_user_creat, s.fk_user_modif';
@@ -1520,10 +1518,10 @@ class Societe extends CommonObject
 		$sql .= ', e.libelle as effectif';
 		$sql .= ', c.code as country_code, c.label as country';
 		$sql .= ', d.code_departement as state_code, d.nom as state';
-		$sql .= ', st.libelle as stcomm';
+		$sql .= ', st.libelle as stcomm, st.picto as stcomm_picto';
 		$sql .= ', te.code as typent_code';
 		$sql .= ', i.libelle as label_incoterms';
-		$sql .= ', sr.remise_client';
+		$sql .= ', sr.remise_client, model_pdf';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_effectif as e ON s.fk_effectif = e.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
@@ -1539,7 +1537,7 @@ class Societe extends CommonObject
 		if ($ref)       $sql .= " AND s.nom = '".$this->db->escape($ref)."'";
 		if ($ref_alias) $sql .= " AND s.name_alias = '".$this->db->escape($ref_alias)."'";
 		if ($ref_ext)   $sql .= " AND s.ref_ext = '".$this->db->escape($ref_ext)."'";
-		if ($notused)   $sql .= " AND s.ref_int = '".$this->db->escape($notused)."'";
+		if ($barcode)   $sql .= " AND s.barcode = '".$this->db->escape($barcode)."'";
 		if ($idprof1)   $sql .= " AND s.siren = '".$this->db->escape($idprof1)."'";
 		if ($idprof2)   $sql .= " AND s.siret = '".$this->db->escape($idprof2)."'";
 		if ($idprof3)   $sql .= " AND s.ape = '".$this->db->escape($idprof3)."'";
@@ -1557,8 +1555,7 @@ class Societe extends CommonObject
 				$this->error = 'Fetch found several records. Rename one of thirdparties to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 				$result = -2;
-			}
-			elseif ($num)   // $num = 1
+			} elseif ($num)   // $num = 1
 			{
 				$obj = $this->db->fetch_object($resql);
 
@@ -1571,7 +1568,6 @@ class Societe extends CommonObject
 				$this->nom          = $obj->name; // deprecated
 				$this->name_alias = $obj->name_alias;
 				$this->ref_ext      = $obj->ref_ext;
-				$this->ref_int      = $obj->ref_int;
 
 				$this->date_creation     = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
@@ -1594,6 +1590,7 @@ 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->email = $obj->email;
 				$this->socialnetworks = (array) json_decode($obj->socialnetworks, true);
@@ -1660,6 +1657,7 @@ class Societe extends CommonObject
 				$this->note = $obj->note_private; // TODO Deprecated for backward comtability
 				$this->note_private = $obj->note_private;
 				$this->note_public = $obj->note_public;
+				$this->model_pdf = $obj->model_pdf;
 				$this->modelpdf = $obj->model_pdf;
 				$this->default_lang = $obj->default_lang;
 				$this->logo = $obj->logo;
@@ -1685,21 +1683,18 @@ class Societe extends CommonObject
 				// multicurrency
 				$this->fk_multicurrency = $obj->fk_multicurrency;
 				$this->multicurrency_code = $obj->multicurrency_code;
+				$this->model_pdf = $obj->model_pdf;
 
 				$result = 1;
 
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
-			}
-			else
-			{
+			} else {
 				$result = 0;
 			}
 
 			$this->db->free($resql);
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$result = -3;
 		}
@@ -1857,15 +1852,12 @@ class Societe extends CommonObject
 				}
 
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog($this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
+		} else dol_syslog("Can't remove thirdparty with id ".$id.". There is ".$objectisused." childs", LOG_WARNING);
 		return 0;
 	}
 
@@ -1891,8 +1883,7 @@ class Societe extends CommonObject
 			{
 				$this->client = $newclient;
 				return 1;
-			}
-			else return -1;
+			} else return -1;
 		}
 		return 0;
 	}
@@ -2086,14 +2077,11 @@ class Societe extends CommonObject
 			if ($result > 0)
 			{
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = $discount->error;
 				return -3;
 			}
-		}
-		else return 0;
+		} else return 0;
 	}
 
 	/**
@@ -2114,9 +2102,7 @@ class Societe extends CommonObject
 		if ($result >= 0)
 		{
 			return $result;
-		}
-		else
-		{
+		} else {
 			$this->error = $discountstatic->error;
 			return -1;
 		}
@@ -2125,11 +2111,13 @@ class Societe extends CommonObject
 	/**
 	 *  Return array of sales representatives
 	 *
-	 *  @param	User	$user		Object user
-	 *  @param	int		$mode		0=Array with properties, 1=Array of id.
-	 *  @return array       		Array of sales representatives of third party
+	 *  @param	User		$user			Object user
+	 *  @param	int			$mode			0=Array with properties, 1=Array of id.
+	 *  @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
+	 *  @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)
+    public function getSalesRepresentatives(User $user, $mode = 0, $sortfield = null, $sortorder = null)
 	{
 		global $conf;
 
@@ -2143,11 +2131,14 @@ class Societe extends CommonObject
 			$sql .= " WHERE ((ug.fk_user = sc.fk_user";
 			$sql .= " AND ug.entity = ".$conf->entity.")";
 			$sql .= " OR u.admin = 1)";
-		}
-		else
-			$sql .= " WHERE entity in (0, ".$conf->entity.")";
+		} else $sql .= " WHERE entity in (0, ".$conf->entity.")";
 
 		$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
+		if (empty($sortfield) && empty($sortorder)) {
+			$sortfield = 'u.lastname,u.firstname';
+			$sortorder = 'ASC,ASC';
+		}
+		$sql .= $this->db->order($sortfield, $sortorder);
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2171,16 +2162,13 @@ class Societe extends CommonObject
 					$reparray[$i]['entity'] = $obj->entity;
 					$reparray[$i]['login'] = $obj->login;
 					$reparray[$i]['photo'] = $obj->photo;
-				}
-				else
-				{
+				} else {
 					$reparray[] = $obj->rowid;
 				}
 				$i++;
 			}
 			return $reparray;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2284,9 +2272,7 @@ class Societe extends CommonObject
 			{
                 $this->db->commit();
                 return 1;
-			}
-			else
-			{
+			} else {
 			    $this->db->rollback();
 			    return -1;
 			}
@@ -2370,9 +2356,7 @@ class Societe extends CommonObject
 			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
 			{
 				$name = $code.' '.$name;
-			}
-			else
-			{
+			} else {
 				$name = $code;
 			}
 		}
@@ -2387,8 +2371,7 @@ class Societe extends CommonObject
 			$label .= '<div class="photointooltip">';
 			$label .= Form::showphoto('societe', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
 			$label .= '</div><div style="clear: both;"></div>';
-		}
-		elseif (!empty($this->logo_squarred) && class_exists('Form'))
+		} elseif (!empty($this->logo_squarred) && class_exists('Form'))
 		{
 			/*$label.= '<div class="photointooltip">';
 			$label.= Form::showphoto('societe', $this, 0, 40, 0, 'photowithmargin', 'mini', 0);	// Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
@@ -2399,62 +2382,55 @@ class Societe extends CommonObject
 
 		if ($option == 'customer' || $option == 'compta' || $option == 'category')
 		{
-		    $label .= '<u>'.$langs->trans("Customer").'</u>';
+			$label .= img_picto('', $this->picto).' <u>'.$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))
+		} elseif ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
-			$label .= '<u>'.$langs->trans("Prospect").'</u>';
+			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Prospect").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'supplier' || $option == 'category_supplier')
+		} elseif ($option == 'supplier' || $option == 'category_supplier')
 		{
-			$label .= '<u>'.$langs->trans("Supplier").'</u>';
+			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("Supplier").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id;
-		}
-		elseif ($option == 'agenda')
+		} elseif ($option == 'agenda')
 		{
-			$label .= '<u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/agenda.php?socid='.$this->id;
-		}
-		elseif ($option == 'project')
+		} elseif ($option == 'project')
 		{
-			$label .= '<u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/project.php?socid='.$this->id;
-		}
-		elseif ($option == 'margin')
+		} elseif ($option == 'margin')
 		{
-			$label .= '<u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/margin/tabs/thirdpartyMargins.php?socid='.$this->id.'&type=1';
-		}
-		elseif ($option == 'contact')
+		} elseif ($option == 'contact')
 		{
-			$label .= '<u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/contact.php?socid='.$this->id;
-		}
-		elseif ($option == 'ban')
+		} elseif ($option == 'ban')
 		{
-			$label .= '<u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$this->id;
 		}
 
 		// By default
 		if (empty($linkstart))
 		{
-			$label .= '<u>'.$langs->trans("ThirdParty").'</u>';
+			$label .= img_picto('', $this->picto).' <u>'.$langs->trans("ThirdParty").'</u>';
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$this->id;
 		}
 
 		if (!empty($this->name))
 		{
-			$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->name;
-			if (!empty($this->name_alias)) $label .= ' ('.$this->name_alias.')';
+			$label .= '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag($this->name);
+			if (!empty($this->name_alias)) $label .= ' ('.dol_escape_htmltag($this->name_alias).')';
 		}
 		$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
 		if (!empty($this->country_code))
 			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
 		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.$this->tva_intra;
+			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
 		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP))
 		{
 			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) $label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
@@ -2515,7 +2491,7 @@ class Societe extends CommonObject
 
 		$result .= $linkstart;
 		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($name, $maxlen) : $name);
+		if ($withpicto != 2) $result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		$result .= $linkend;
 
 		global $action;
@@ -2672,18 +2648,14 @@ class Societe extends CommonObject
 						if (!empty($obj->poste))
 						{
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).($obj->poste ? " - ".$obj->poste : "").(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
-						}
-						else
-						{
+						} else {
 							$contact_property[$obj->rowid] = trim(dolGetFirstLastname($obj->firstname, $obj->lastname)).(($mode != 'poste' && $property) ? " ".$sepa.$property.$sepb : '');
 						}
 					}
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $contact_property;
@@ -2716,9 +2688,7 @@ class Societe extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $contacts;
@@ -2753,9 +2723,7 @@ class Societe extends CommonObject
 					$i++;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 		return $contacts;
@@ -2778,7 +2746,7 @@ class Societe extends CommonObject
 
 		$sql = "SELECT rowid, email, phone_mobile, lastname, firstname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql .= " WHERE rowid = '".$rowid."'";
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -2793,9 +2761,7 @@ class Societe extends CommonObject
 				elseif ($mode == 'mobile') $contact_property = $obj->phone_mobile;
 			}
 			return $contact_property;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2817,23 +2783,17 @@ class Societe extends CommonObject
 		$bac->fetch(0, $this->id);
 
 		if ($bac->id > 0) {		// If a bank account has been found for company $this->id
-			if ($mode == 'label')
-			{
+			if ($mode == 'label') {
 				return $bac->getRibLabel(true);
-			}
-			elseif ($mode == 'rum')
-			{
-				if (empty($bac->rum))
-				{
+			} elseif ($mode == 'rum') {
+				if (empty($bac->rum)) {
 					require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 					$prelevement = new BonPrelevement($this->db);
 					$bac->fetch_thirdparty();
 					$bac->rum = $prelevement->buildRumNumber($bac->thirdparty->code_client, $bac->datec, $bac->id);
 				}
 				return $bac->rum;
-			}
-			elseif ($mode == 'format')
-			{
+			} elseif ($mode == 'format') {
 				return $bac->frstrecur;
 			} else {
 				return 'BadParameterToFunctionDisplayRib';
@@ -2965,9 +2925,7 @@ class Societe extends CommonObject
 			if ($mod->code_modifiable_invalide && $this->check_codeclient() < 0) return 1;
 			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -3001,9 +2959,7 @@ class Societe extends CommonObject
 			if ($mod->code_modifiable_invalide && $this->check_codefournisseur() < 0) return 1;
 			if ($mod->code_modifiable) return 1; // A mettre en dernier
 			return 0;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -3038,10 +2994,12 @@ class Societe extends CommonObject
 
 		   	dol_syslog(get_class($this)."::check_codeclient code_client=".$this->code_client." module=".$module);
 		   	$result = $mod->verif($this->db, $this->code_client, $this, 0);
+		   	if ($result) {	// If error
+		   		$this->error = $mod->error;
+		   		$this->errors = $mod->errors;
+		   	}
 			return $result;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -3075,10 +3033,12 @@ class Societe extends CommonObject
 
 			dol_syslog(get_class($this)."::check_codefournisseur code_fournisseur=".$this->code_fournisseur." module=".$module);
 			$result = $mod->verif($this->db, $this->code_fournisseur, $this, 1);
+			if ($result) {	// If error
+				$this->error = $mod->error;
+				$this->errors = $mod->errors;
+			}
 			return $result;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 	}
@@ -3119,15 +3079,11 @@ class Societe extends CommonObject
 				elseif ($type == 'supplier') $this->code_compta_fournisseur = $mod->code;
 
 				return $result;
-			}
-			else
-			{
+			} else {
 				$this->error = 'ErrorAccountancyCodeNotDefined';
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			if ($type == 'customer') $this->code_compta = '';
 			elseif ($type == 'supplier') $this->code_compta_fournisseur = '';
 
@@ -3156,13 +3112,10 @@ class Societe extends CommonObject
 			{
 				$this->parent = $id;
 				return 1;
-			}
-			else
-			{
+			} else {
 				return -1;
 			}
-		}
-		else return -1;
+		} else return -1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3245,16 +3198,14 @@ class Societe extends CommonObject
 	 	}
 
 		 //Verify duplicate entries
-		$sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$value."' AND entity IN (".getEntity('societe').")";
+		$sql = "SELECT COUNT(*) as idprof FROM ".MAIN_DB_PREFIX."societe WHERE ".$field." = '".$this->db->escape($value)."' AND entity IN (".getEntity('societe').")";
 		if ($socid) $sql .= " AND rowid <> ".$socid;
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->idprof;
-		}
-		else
-		{
+		} else {
 			$count = 0;
 			print $this->db->error();
 		}
@@ -3354,8 +3305,7 @@ class Societe extends CommonObject
 			if (preg_match('/(^[0-9]{8}[A-Z]{1}$)/', $string))
 				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 0, 8) % 23, 1))
 					return 1;
-			else
-				return -1;
+			else return -1;
 
 			//algorithm checking type code CIF
 			$sum = $num[2] + $num[4] + $num[6];
@@ -3367,29 +3317,25 @@ class Societe extends CommonObject
 			if (preg_match('/^[KLM]{1}/', $string))
 				if ($num[8] == chr(64 + $n) || $num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr($string, 1, 8) % 23, 1))
 					return 1;
-			else
-				return -1;
+			else return -1;
 
 			//Check CIF
 			if (preg_match('/^[ABCDEFGHJNPQRSUVW]{1}/', $string))
 				if ($num[8] == chr(64 + $n) || $num[8] == substr($n, strlen($n) - 1, 1))
 					return 2;
-			else
-				return -2;
+			else return -2;
 
 			//Check NIE T
 			if (preg_match('/^[T]{1}/', $string))
 				if ($num[8] == preg_match('/^[T]{1}[A-Z0-9]{8}$/', $string))
 					return 3;
-			else
-				return -3;
+			else return -3;
 
 			//Check NIE XYZ
 			if (preg_match('/^[XYZ]{1}/', $string))
 				if ($num[8] == substr('TRWAGMYFPDXBNJZSQVHLCKE', substr(str_replace(array('X', 'Y', 'Z'), array('0', '1', '2'), $string), 0, 8) % 23, 1))
 					return 3;
-			else
-				return -3;
+			else return -3;
 
 			//Can not be verified
 			return -4;
@@ -3409,8 +3355,7 @@ class Societe extends CommonObject
 			//Check NIF
 			if (preg_match('/(^[0-9]{9}$)/', $string)) {
 				return 1;
-			}
-			else {
+			} else {
 				return -1;
 			}
 		}
@@ -3464,8 +3409,7 @@ class Societe extends CommonObject
 			if ($url) {
 				return '<a target="_blank" href="'.$url.'">'.$langs->trans("Check").'</a>';
 			}
-		}
-		else {
+		} else {
 			return $hookmanager->resPrint;
 		}
 
@@ -3487,9 +3431,7 @@ class Societe extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
 			$count = $obj->numproj;
-		}
-		else
-		{
+		} else {
 			$count = 0;
 			print $this->db->error();
 		}
@@ -3538,9 +3480,7 @@ class Societe extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3558,11 +3498,9 @@ class Societe extends CommonObject
 		$isacompany = empty($conf->global->MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES) ? 0 : 1; // 0 by default
 		if (!empty($this->tva_intra)) {
 			$isacompany = 1;
-		}
-		elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
+		} elseif (!empty($this->idprof1) || !empty($this->idprof2) || !empty($this->idprof3) || !empty($this->idprof4) || !empty($this->idprof5) || !empty($this->idprof6)) {
 			$isacompany = 1;
-		}
-		elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
+		} elseif (!empty($this->typent_code) && $this->typent_code != 'TE_UNKNOWN')
 		{
 			// TODO Add a field is_a_company into dictionary
 			if (preg_match('/^TE_PRIVATE/', $this->typent_code)) $isacompany = 0;
@@ -3605,9 +3543,7 @@ class Societe extends CommonObject
 				$this->SupplierCategories[$obj->rowid] = $obj->label;
 			}
 			return 0;
-		}
-		else
-		{
+		} else {
 			return -1;
 		}
 	}
@@ -3628,9 +3564,7 @@ class Societe extends CommonObject
 			$sql .= " VALUES (".$categorie_id.", ".$this->id.")";
 
 			if ($resql = $this->db->query($sql)) return 0;
-		}
-		else
-		{
+		} else {
 			return 0;
 		}
 		return -1;
@@ -3692,17 +3626,13 @@ class Societe extends CommonObject
 			{
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_member - 2 - ".$this->error." - ".join(',', $this->errors), LOG_ERR);
 
@@ -3743,8 +3673,7 @@ class Societe extends CommonObject
 			{
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
-			}
-			else                    // For backward compatibility
+			} else // For backward compatibility
 			{
 				dol_syslog("Your country setup use an old syntax. Reedit it using setup area.", LOG_WARNING);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3768,8 +3697,7 @@ class Societe extends CommonObject
 			{
 				$state_code = $tmp[1];
 				$state_label = $tmp[2];
-			}
-			else                    // For backward compatibility
+			} else // For backward compatibility
 			{
 				dol_syslog("Your state setup use an old syntax. Reedit it using setup area.", LOG_ERR);
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -3906,8 +3834,7 @@ class Societe extends CommonObject
 		if ($resql)
 		{
    			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -3927,8 +3854,7 @@ class Societe extends CommonObject
 		if ($resql)
 		{
 			return ($this->db->num_rows($resql) > 0);
-		}
-		else return false;
+		} else return false;
 	}
 
 	/**
@@ -3950,9 +3876,7 @@ class Societe extends CommonObject
 		{
 			$obj = $this->db->fetch_object($resql);
    			return (($obj->nb > 0) ?true:false);
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return false;
 		}
@@ -4013,7 +3937,7 @@ class Societe extends CommonObject
 	 */
     public function getLibProspCommStatut($mode = 0, $label = '')
 	{
-		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label);
+		return $this->LibProspCommStatut($this->stcomm_id, $mode, $label, $this->stcomm_picto);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -4023,48 +3947,45 @@ class Societe extends CommonObject
 	 *  @param	int|string	$status        	Id or code for prospection status
 	 *  @param  int			$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
 	 *  @param	string		$label			Label to use for status for added status
+	 *	@param 	string		$picto      	Name of image file to show ('filenew', ...)
+	 *                                      If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory.
+	 *                                      Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
+	 *                                      Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
+	 *                                      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 = '')
+    public function LibProspCommStatut($status, $mode = 0, $label = '', $picto = '')
 	{
         // phpcs:enable
 		global $langs;
 		$langs->load('customers');
 
-		if ($mode == 2)
-		{
-			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
-			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
-				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
+		if ($mode == 2) {
+			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+			else {
+				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
-		}
-		if ($mode == 3)
-		{
-			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1);
-			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0);
-			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1);
-			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2);
-			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3);
-			else
-			{
-				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0);
+		} elseif ($mode == 3) {
+			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1, $picto);
+			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto);
+			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1, $picto);
+			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2, $picto);
+			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3, $picto);
+			else {
+				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto);
 			}
-		}
-		if ($mode == 4)
-		{
-			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1).' '.$langs->trans("StatusProspect-1");
-			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
-			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
-			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
-			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
-			else
-			{
-				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
+		} elseif ($mode == 4) {
+			if ($status == '-1' || $status == 'ST_NO')         return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			elseif ($status == '0' || $status == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			elseif ($status == '1' || $status == 'ST_TODO')  return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			elseif ($status == '2' || $status == 'ST_PEND')  return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			elseif ($status == '3' || $status == 'ST_DONE')  return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+			else {
+				return img_action(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$status) != "StatusProspect".$status) ? $langs->trans("StatusProspect".$status) : $label);
 			}
 		}
 
@@ -4120,9 +4041,7 @@ class Societe extends CommonObject
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		}
-		else
-			return array();
+		} else return array();
 	}
 
 	/**
@@ -4160,9 +4079,7 @@ class Societe extends CommonObject
 				}
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		}
-		else
-			return array();
+		} else return array();
 	}
 
 	/**
@@ -4203,9 +4120,7 @@ class Societe extends CommonObject
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$tmpobject = new FactureFournisseur($this->db);
-			}
-			else
-			{
+			} else {
 				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$tmpobject = new Facture($this->db);
 			}
@@ -4240,9 +4155,7 @@ class Societe extends CommonObject
                 }
 			}
 			return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
-		}
-		else
-		{
+		} else {
 			return array();
 		}
 	}
@@ -4280,7 +4193,7 @@ class Societe extends CommonObject
 	/**
 	 *  Create a document onto disk according to template module.
 	 *
-	 *	@param	string		$modele			Generator to use. Caller must set it to obj->modelpdf or GETPOST('modelpdf','alpha') for example.
+	 *	@param	string		$modele			Generator to use. Caller must set it to obj->model_pdf or GETPOST('model','alpha') for example.
 	 *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
 	 *  @param  int			$hidedetails    Hide details of lines
 	 *  @param  int			$hidedesc       Hide description
@@ -4301,18 +4214,14 @@ class Societe extends CommonObject
 			$result = $companybankaccount->fetch($moreparams['use_companybankid']);
 			if (!$result) dol_print_error($this->db, $companybankaccount->error, $companybankaccount->errors);
 			$result = $companybankaccount->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		}
-		else
-		{
+		} else {
 			// Positionne le modele sur le nom du modele a utiliser
 			if (!dol_strlen($modele))
 			{
 				if (!empty($conf->global->COMPANY_ADDON_PDF))
 				{
 					$modele = $conf->global->COMPANY_ADDON_PDF;
-				}
-				else
-				{
+				} else {
 					print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined");
 					return 0;
 				}
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 98bdeffa637..ba32086cc4d 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -433,8 +433,7 @@ class SocieteAccount extends CommonObject
             }
             $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
             $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+        } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -477,33 +476,27 @@ class SocieteAccount extends CommonObject
 			$prefix = '';
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 1)
+		} elseif ($mode == 1)
 		{
 			if ($status == 1) return $langs->trans('Enabled');
 			elseif ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+		} elseif ($mode == 2)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+		} elseif ($mode == 3)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 4)
+		} elseif ($mode == 4)
 		{
 			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
 			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+		} elseif ($mode == 5)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
-		}
-		elseif ($mode == 6)
+		} elseif ($mode == 6)
 		{
 			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
 			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
@@ -556,9 +549,7 @@ class SocieteAccount extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 0ce28356d90..9733b870786 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -430,9 +430,7 @@ if ($sql_select)
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
-		}
-		else
-		{
+		} else {
 			print $documentstatic->getLibStatut(2);
 		}
 		print '</td>';
@@ -474,9 +472,7 @@ if ($sql_select)
 				}
 
 				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else
-			{
+			} else {
 				$label = $objp->product_label;
 			}
 
@@ -510,29 +506,23 @@ if ($sql_select)
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
 					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
-				else
-				{
+				} else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
-		}
-		else
-		{
+		} else {
 			if ($objp->fk_product > 0) {
 				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
@@ -610,8 +600,7 @@ if ($sql_select)
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	$db->free($resql);
-}
-elseif (empty($type_element) || $type_element == -1)
+} elseif (empty($type_element) || $type_element == -1)
 {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
@@ -628,8 +617,7 @@ elseif (empty($type_element) || $type_element == -1)
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
-}
-else {
+} else {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
     print '<table class="liste centpercent">'."\n";
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 2b362268c4b..c1761c7f601 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -68,7 +68,7 @@ $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('thirdpartycontact', 'globalcard'));
 
-if ($action == 'view' && $object->fetch($socid) <= 0)
+if ($object->fetch($socid) <= 0 && $action == 'view')
 {
 	$langs->load("errors");
 	print($langs->trans('ErrorRecordNotFound'));
@@ -76,7 +76,6 @@ if ($action == 'view' && $object->fetch($socid) <= 0)
 }
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
-$object->getCanvas($socid);
 $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
 if (!empty($canvas))
@@ -87,12 +86,10 @@ if (!empty($canvas))
 }
 
 // Security check
-$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas);
+$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
 if (empty($user->rights->societe->contact->lire)) accessforbidden();
 
 
-
-
 /*
  * Actions
  */
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index d082ae6baa5..ba0241a90f7 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -166,9 +166,7 @@ if ($object->id)
 	$permtoedit = $user->rights->societe->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 0);
 }
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 0000494a3fe..447f57ee40d 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -58,8 +58,6 @@ $linkback = '';
 print load_fiche_titre($transAreaType, $linkback, 'companies');
 
 
-//print '<table border="0" width="100%" class="notopnoleftnoright">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
@@ -86,31 +84,30 @@ if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur <> 1 OR s.cl
 $result = $db->query($sql);
 if ($result)
 {
-    while ($objp = $db->fetch_object($result))
-    {
-        $found = 0;
-        if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS) && ($objp->client == 2 || $objp->client == 3)) { $found = 1; $third['prospect']++; }
-        if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) { $found = 1; $third['customer']++; }
-        if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) { $found = 1; $third['supplier']++; }
-        if (!empty($conf->societe->enabled) && $objp->client == 0 && $objp->fournisseur == 0) { $found = 1; $third['other']++; }
-        if ($found) $total++;
-    }
-}
-else dol_print_error($db);
+	while ($objp = $db->fetch_object($result))
+	{
+		$found = 0;
+		if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS) && ($objp->client == 2 || $objp->client == 3)) { $found = 1; $third['prospect']++; }
+		if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) { $found = 1; $third['customer']++; }
+		if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) { $found = 1; $third['supplier']++; }
+		if (!empty($conf->societe->enabled) && $objp->client == 0 && $objp->fournisseur == 0) { $found = 1; $third['other']++; }
+		if ($found) $total++;
+	}
+} else dol_print_error($db);
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder nohover centpercent">'."\n";
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
 if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) + (round($third['customer']) ? 1 : 0) + (round($third['supplier']) ? 1 : 0) + (round($third['other']) ? 1 : 0) >= 2))
 {
-    print '<tr><td class="center" colspan="2">';
-    $dataseries = array();
-    if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))     $dataseries[] = array($langs->trans("Prospects"), round($third['prospect']));
-    if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))     $dataseries[] = array($langs->trans("Customers"), round($third['customer']));
-    if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[] = array($langs->trans("Suppliers"), round($third['supplier']));
-    if (!empty($conf->societe->enabled)) $dataseries[] = array($langs->trans("Others"), round($third['other']));
-    include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
-    $dolgraph = new DolGraph();
+	print '<tr><td class="center" colspan="2">';
+	$dataseries = array();
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))     $dataseries[] = array($langs->trans("Prospects"), round($third['prospect']));
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))     $dataseries[] = array($langs->trans("Customers"), round($third['customer']));
+	if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[] = array($langs->trans("Suppliers"), round($third['supplier']));
+	if (!empty($conf->societe->enabled)) $dataseries[] = array($langs->trans("Others"), round($third['other']));
+	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+	$dolgraph = new DolGraph();
 	$dolgraph->SetData($dataseries);
 	$dolgraph->setShowLegend(2);
 	$dolgraph->setShowPercent(1);
@@ -118,30 +115,28 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	$dolgraph->setHeight('200');
 	$dolgraph->draw('idgraphthirdparties');
 	print $dolgraph->show();
-    print '</td></tr>'."\n";
-}
-else
-{
-    if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
-    {
-        $statstring = "<tr>";
-        $statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=p">'.$langs->trans("Prospects").'</a></td><td class="right">'.round($third['prospect']).'</td>';
-        $statstring .= "</tr>";
-    }
-    if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))
-    {
-        $statstring .= "<tr>";
-        $statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=c">'.$langs->trans("Customers").'</a></td><td class="right">'.round($third['customer']).'</td>';
-        $statstring .= "</tr>";
-    }
-    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $user->rights->fournisseur->lire)
-    {
-        $statstring2 = "<tr>";
-        $statstring2 .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=f">'.$langs->trans("Suppliers").'</a></td><td class="right">'.round($third['supplier']).'</td>';
-        $statstring2 .= "</tr>";
-    }
-    print $statstring;
-    print $statstring2;
+	print '</td></tr>'."\n";
+} else {
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
+	{
+		$statstring = "<tr>";
+		$statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=p">'.$langs->trans("Prospects").'</a></td><td class="right">'.round($third['prospect']).'</td>';
+		$statstring .= "</tr>";
+	}
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))
+	{
+		$statstring .= "<tr>";
+		$statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=c">'.$langs->trans("Customers").'</a></td><td class="right">'.round($third['customer']).'</td>';
+		$statstring .= "</tr>";
+	}
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $user->rights->fournisseur->lire)
+	{
+		$statstring2 = "<tr>";
+		$statstring2 .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=f">'.$langs->trans("Suppliers").'</a></td><td class="right">'.round($third['supplier']).'</td>';
+		$statstring2 .= "</tr>";
+	}
+	print $statstring;
+	print $statstring2;
 }
 print '<tr class="liste_total"><td>'.$langs->trans("UniqueThirdParties").'</td><td class="right">';
 print $total;
@@ -185,9 +180,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 				if ($i < $nbmax)
 				{
 					$dataseries[] = array($obj->label, round($obj->nb));
-				}
-				else
-				{
+				} else {
 					$rest += $obj->nb;
 				}
 				$total += $obj->nb;
@@ -206,9 +199,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 			$dolgraph->setHeight('200');
 			$dolgraph->draw('idgraphcateg');
 			print $dolgraph->show();
-		}
-		else
-		{
+		} else {
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($result);
@@ -227,7 +218,6 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 	print '</div>';
 }
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
@@ -256,91 +246,88 @@ $sql .= $db->plimit($max, 0);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
+	$num = $db->num_rows($result);
 
-    $i = 0;
+	$i = 0;
 
-    if ($num > 0)
-    {
-        $transRecordedType = $langs->trans("LastModifiedThirdParties", $max);
+	if ($num > 0)
+	{
+		$transRecordedType = $langs->trans("LastModifiedThirdParties", $max);
 
-        print "\n<!-- last thirdparties modified -->\n";
-        print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder centpercent">';
+		print "\n<!-- last thirdparties modified -->\n";
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
 
-        print '<tr class="liste_titre"><th colspan="2">'.$transRecordedType.'</th>';
-        print '<th>&nbsp;</th>';
-        print '<th class="right"><a href="'.DOL_URL_ROOT.'/societe/list.php?sortfield=s.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
-        print '</tr>'."\n";
+		print '<tr class="liste_titre"><th colspan="2">'.$transRecordedType.'</th>';
+		print '<th>&nbsp;</th>';
+		print '<th class="right"><a href="'.DOL_URL_ROOT.'/societe/list.php?sortfield=s.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
+		print '</tr>'."\n";
 
-        while ($i < $num)
-        {
-            $objp = $db->fetch_object($result);
+		while ($i < $num)
+		{
+			$objp = $db->fetch_object($result);
 
-            $thirdparty_static->id = $objp->rowid;
-            $thirdparty_static->name = $objp->name;
-            $thirdparty_static->client = $objp->client;
-            $thirdparty_static->fournisseur = $objp->fournisseur;
-            $thirdparty_static->logo = $objp->logo;
-            $thirdparty_static->date_modification = $db->jdate($objp->date_modification);
-            $thirdparty_static->status = $objp->status;
-            $thirdparty_static->code_client = $objp->code_client;
-            $thirdparty_static->code_fournisseur = $objp->code_fournisseur;
-            $thirdparty_static->canvas = $objp->canvas;
-            $thirdparty_static->email = $objp->email;
+			$thirdparty_static->id = $objp->rowid;
+			$thirdparty_static->name = $objp->name;
+			$thirdparty_static->client = $objp->client;
+			$thirdparty_static->fournisseur = $objp->fournisseur;
+			$thirdparty_static->logo = $objp->logo;
+			$thirdparty_static->date_modification = $db->jdate($objp->date_modification);
+			$thirdparty_static->status = $objp->status;
+			$thirdparty_static->code_client = $objp->code_client;
+			$thirdparty_static->code_fournisseur = $objp->code_fournisseur;
+			$thirdparty_static->canvas = $objp->canvas;
+			$thirdparty_static->email = $objp->email;
 			$thirdparty_static->entity = $objp->entity;
-            $thirdparty_static->code_compta_fournisseur = $objp->code_compta_fournisseur;
-            $thirdparty_static->code_compta = $objp->code_compta;
+			$thirdparty_static->code_compta_fournisseur = $objp->code_compta_fournisseur;
+			$thirdparty_static->code_compta = $objp->code_compta;
 
-            print '<tr class="oddeven">';
-            // Name
-            print '<td class="nowrap tdoverflowmax200">';
-            print $thirdparty_static->getNomUrl(1);
-            print "</td>\n";
-            // Type
-            print '<td class="center">';
-            if ($thirdparty_static->client == 1 || $thirdparty_static->client == 3)
-            {
-            	$thirdparty_static->name = $langs->trans("Customer");
-            	print $thirdparty_static->getNomUrl(0, 'customer', 0, 1);
-            }
-            if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print " / ";
-            if (($thirdparty_static->client == 2 || $thirdparty_static->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-            {
-            	$thirdparty_static->name = $langs->trans("Prospect");
-            	print $thirdparty_static->getNomUrl(0, 'prospect', 0, 1);
-            }
-            if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $thirdparty_static->fournisseur)
-            {
-                if ($thirdparty_static->client) print " / ";
-            	$thirdparty_static->name = $langs->trans("Supplier");
-            	print $thirdparty_static->getNomUrl(0, 'supplier', 0, 1);
-            }
-            print '</td>';
-            // Last modified date
-            print '<td class="right">';
-            print dol_print_date($thirdparty_static->date_modification, 'day');
-            print "</td>";
-            print '<td class="right nowrap">';
-            print $thirdparty_static->getLibStatut(3);
-            print "</td>";
-            print "</tr>\n";
-            $i++;
-        }
+			print '<tr class="oddeven">';
+			// Name
+			print '<td class="nowrap tdoverflowmax200">';
+			print $thirdparty_static->getNomUrl(1);
+			print "</td>\n";
+			// Type
+			print '<td class="center">';
+			if ($thirdparty_static->client == 1 || $thirdparty_static->client == 3)
+			{
+				$thirdparty_static->name = $langs->trans("Customer");
+				print $thirdparty_static->getNomUrl(0, 'customer', 0, 1);
+			}
+			if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print " / ";
+			if (($thirdparty_static->client == 2 || $thirdparty_static->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+			{
+				$thirdparty_static->name = $langs->trans("Prospect");
+				print $thirdparty_static->getNomUrl(0, 'prospect', 0, 1);
+			}
+			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $thirdparty_static->fournisseur)
+			{
+				if ($thirdparty_static->client) print " / ";
+				$thirdparty_static->name = $langs->trans("Supplier");
+				print $thirdparty_static->getNomUrl(0, 'supplier', 0, 1);
+			}
+			print '</td>';
+			// Last modified date
+			print '<td class="right">';
+			print dol_print_date($thirdparty_static->date_modification, 'day');
+			print "</td>";
+			print '<td class="right nowrap">';
+			print $thirdparty_static->getLibStatut(3);
+			print "</td>";
+			print "</tr>\n";
+			$i++;
+		}
 
-        $db->free($result);
+		$db->free($result);
 
-        print "</table>\n";
-        print '</div>';
-        print "<!-- End last thirdparties modified -->\n";
-    }
-}
-else
-{
-    dol_print_error($db);
+		print "</table>\n";
+		print '</div>';
+		print "<!-- End last thirdparties modified -->\n";
+	}
+} else {
+	dol_print_error($db);
 }
 
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 $parameters = array('user' => $user);
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1df7c38d6c5..ed861220816 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2017       Rui Strecht      	    <rui.strecht@aliartalentos.com>
  * Copyright (C) 2017       Juanjo Menent      	    <jmenent@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
 
  *
  * This program is free software; you can redistribute it and/or modify
@@ -42,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 
 $langs->loadLangs(array("companies", "commercial", "customers", "suppliers", "bills", "compta", "categories", "cashdesk"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -63,9 +64,9 @@ $search_all = trim(GETPOST('search_all', 'alphanohtml') ?GETPOST('search_all', '
 $search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('search_cti', 'alphanohtml'))); // Phone number without any special chars
 
 $search_id = trim(GETPOST("search_id", "int"));
-$search_nom = trim(GETPOST("search_nom", 'none'));
-$search_alias = trim(GETPOST("search_alias", 'none'));
-$search_nom_only = trim(GETPOST("search_nom_only", 'none'));
+$search_nom = trim(GETPOST("search_nom", 'restricthtml'));
+$search_alias = trim(GETPOST("search_alias", 'restricthtml'));
+$search_nom_only = trim(GETPOST("search_nom_only", 'restricthtml'));
 $search_barcode = trim(GETPOST("search_barcode", 'alpha'));
 $search_customer_code = trim(GETPOST('search_customer_code', 'alpha'));
 $search_supplier_code = trim(GETPOST('search_supplier_code', 'alpha'));
@@ -119,6 +120,7 @@ $pagenext = $page + 1;
 
 if ($type == 'c') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'customerlist'; if ($search_type == '') $search_type = '1,3'; }
 if ($type == 'p') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'prospectlist'; if ($search_type == '') $search_type = '2,3'; }
+if ($type == 't') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'customerlist'; if ($search_type == '') $search_type = '1,2,3'; }
 if ($type == 'f') { if (empty($contextpage) || $contextpage == 'thirdpartylist') $contextpage = 'supplierlist'; if ($search_type == '') $search_type = '4'; }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -139,6 +141,8 @@ $fieldstosearchall = array(
 	's.code_fournisseur'=>"SupplierCode",
 	's.code_compta'=>"CustomerAccountancyCodeShort",
 	's.code_compta_fournisseur'=>"SupplierAccountancyCodeShort",
+	's.zip'=>"Zip",
+	's.town'=>"Town",
 	's.email'=>"EMail",
 	's.url'=>"URL",
 	's.tva_intra'=>"VATIntra",
@@ -386,12 +390,11 @@ if ($resql)
 		if ($level == $obj->code) $level = $langs->trans($obj->label);
 		$tab_level[$obj->code] = $level;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 $sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,";
 $sql .= " s.entity,";
-$sql .= " st.libelle as stcomm, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
+$sql .= " st.libelle as stcomm, st.picto as stcomm_picto, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,";
 $sql .= " s.email, s.phone, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,";
 $sql .= " s.tms as date_update, s.datec as date_creation,";
 $sql .= " s.code_compta, s.code_compta_fournisseur, s.parent as fk_parent,";
@@ -431,7 +434,6 @@ if ($search_sale == -2) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciau
 elseif ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql .= " WHERE 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 ($socid)                $sql .= " AND s.rowid = ".$socid;
 if ($search_sale && $search_sale != -2)    $sql .= " AND s.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 if (!$user->rights->fournisseur->lire) $sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
 if ($search_sale == -2)    $sql .= " AND sc.fk_user IS NULL";
@@ -456,7 +458,7 @@ if ($search_town)          $sql .= natural_search("s.town", $search_town);
 if (strlen($search_zip))   $sql .= natural_search("s.zip", $search_zip);
 if ($search_state)         $sql .= natural_search("state.nom", $search_state);
 if ($search_region)        $sql .= natural_search("region.nom", $search_region);
-if ($search_country && $search_country != '-1')       $sql .= " AND s.fk_pays IN (".$db->escape($search_country).')';
+if ($search_country && $search_country != '-1')       $sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
 if ($search_email)         $sql .= natural_search("s.email", $search_email);
 if (strlen($search_phone)) $sql .= natural_search("s.phone", $search_phone);
 if (strlen($search_fax))   $sql .= natural_search("s.fax", $search_fax);
@@ -469,7 +471,7 @@ if (strlen($search_idprof5)) $sql .= natural_search("s.idprof5", $search_idprof5
 if (strlen($search_idprof6)) $sql .= natural_search("s.idprof6", $search_idprof6);
 if (strlen($search_vat))     $sql .= natural_search("s.tva_intra", $search_vat);
 // Filter on type of thirdparty
-if ($search_type > 0 && in_array($search_type, array('1,3', '2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")";
+if ($search_type > 0 && in_array($search_type, array('1,3', '2,3'))) $sql .= " AND s.client IN (".$db->sanitize($db->escape($search_type)).")";
 if ($search_type > 0 && in_array($search_type, array('4')))         $sql .= " AND s.fournisseur = 1";
 if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
 if ($search_status != '' && $search_status >= 0) $sql .= natural_search("s.status", $search_status, 2);
@@ -482,10 +484,12 @@ if ($search_stcomm != '' && $search_stcomm != -2) $sql .= natural_search("s.fk_s
 if ($search_import_key)    $sql .= natural_search("s.import_key", $search_import_key);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-
 // Add where from hooks
-$parameters = array();
+$parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	if ($socid) $sql .= " AND s.rowid = ".$socid;
+}
 $sql .= $hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -595,21 +599,28 @@ if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '<span
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton = '';
-if ($user->rights->societe->creer && $contextpage != 'poslist')
+$typefilter = '';
+$label = 'MenuNewThirdParty';
+
+if (!empty($type))
 {
-	$typefilter = '';
-	$label = 'MenuNewThirdParty';
+	$typefilter = '&amp;type='.$type;
+	if ($type == 'p') $label = 'MenuNewProspect';
+	if ($type == 'c') $label = 'MenuNewCustomer';
+	if ($type == 'f') $label = 'NewSupplier';
+}
 
-	if (!empty($type))
-	{
-		$typefilter = '&amp;type='.$type;
-		if ($type == 'p') $label = 'MenuNewProspect';
-		if ($type == 'c') $label = 'MenuNewCustomer';
-		if ($type == 'f') $label = 'NewSupplier';
-	}
-
-    $newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter);
+// Show the new button only when this page is not opend from the Extended POS (pop-up window)
+// but allow it too, when a user has the rights to create a new customer
+if ($contextpage != 'poslist')
+{
+	$url = DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter;
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url, '', $user->rights->societe->creer);
+} elseif ($user->rights->societe->creer) {
+	$url = DOL_URL_ROOT.'/societe/card.php?action=create&type=t&contextpage=poslist&optioncss=print&backtopage='.$_SERVER["PHP_SELF"].'?type=t&contextpage=poslist&nomassaction=1&optioncss=print&place='.urlencode($place);
+	$label = 'MenuNewCustomer';
+	$newcardbutton .= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', $url);
 }
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formfilter" autocomplete="off">';
@@ -652,7 +663,7 @@ if ($search_all)
 $moreforfilter = '';
 if (empty($type) || $type == 'c' || $type == 'p')
 {
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -663,7 +674,7 @@ if (empty($type) || $type == 'c' || $type == 'p')
 }
 if (empty($type) || $type == 'f')
 {
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -693,6 +704,7 @@ if ($moreforfilter)
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+// Show the massaction checkboxes only when this page is not opend from the Extended POS
 if ($massactionbutton && $contextpage != 'poslist') $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 if (empty($arrayfields['customerorsupplier']['checked'])) print '<input type="hidden" name="type" value="'.$type.'">';
@@ -1045,13 +1057,11 @@ while ($i < min($num, $limit))
 	{
 		$savalias = $obj->name_alias;
 		if (!empty($arrayfields['s.name_alias']['checked'])) $companystatic->name_alias = '';
-		print '<td class="tdoverflowmax200">';
+		print '<td'.(empty($conf->global->MAIN_SOCIETE_SHOW_COMPLETE_NAME) ? ' class="tdoverflowmax200"' : '').'>';
 		if ($contextpage == 'poslist')
 		{
 		    print $obj->name;
-		}
-		else
-		{
+		} else {
 		    print $companystatic->getNomUrl(1, '', 100, 0, 1);
 		}
 		print "</td>\n";
@@ -1122,7 +1132,7 @@ while ($i < min($num, $limit))
 	// Country
 	if (!empty($arrayfields['country.code_iso']['checked']))
 	{
-		print '<td class="center">';
+		print '<td class="center tdoverflowmax100">';
 		$labelcountry = ($obj->country_code && ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code)) ? $langs->trans("Country".$obj->country_code) : $obj->country_label;
 		print $labelcountry;
 		print '</td>';
@@ -1196,6 +1206,7 @@ while ($i < min($num, $limit))
 		print "<td>".$obj->idprof6."</td>\n";
 		if (!$i) $totalarray['nbfield']++;
 	}
+	// VAT
 	if (!empty($arrayfields['s.tva_intra']['checked']))
 	{
 		print "<td>";
@@ -1212,25 +1223,17 @@ while ($i < min($num, $limit))
 	{
 		print '<td class="center">';
 		$s = '';
-		if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
-		{
-	  		$companystatic->name = $langs->trans("Customer");
-	  		$companystatic->name_alias = '';
-			$s .= $companystatic->getNomUrl(0, 'customer', 0, 1);
-		}
 		if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
-			if ($s) $s .= ", ";
-			$companystatic->name = $langs->trans("Prospect");
-	  		$companystatic->name_alias = '';
-			$s .= $companystatic->getNomUrl(0, 'prospect', 0, 1);
+			$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
+		}
+		if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+		{
+			$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
 		{
-			if ($s) $s .= ", ";
-			$companystatic->name = $langs->trans("Supplier");
-	  		$companystatic->name_alias = '';
-			$s .= $companystatic->getNomUrl(0, 'supplier', 0, 1);
+			$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
 		}
 		print $s;
 		print '</td>';
@@ -1250,13 +1253,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']);
+		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'.$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code']).'</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']++;
@@ -1309,7 +1312,7 @@ while ($i < min($num, $limit))
 		if (!$i) $totalarray['nbfield']++;
 	}
 
-	// Action column
+	// Action column (Show the massaction button only when this page is not opend from the Extended POS)
 	print '<td class="nowrap center">';
 	if (($massactionbutton || $massaction) && $contextpage != 'poslist')   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 2e3e3ec4532..866a0e0964f 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -122,9 +122,7 @@ if ($object->id > 0)
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
     dol_fiche_end();
-}
-else
-{
+} else {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 191f9c4bb2c..7ddea52a65a 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -72,61 +72,57 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    // Add a notification
-    if ($action == 'add')
-    {
-        if (empty($contactid))
-        {
-    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
-            $error++;
-        }
-        if ($actionid <= 0)
-        {
-    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
-            $error++;
-        }
+	// Add a notification
+	if ($action == 'add')
+	{
+		if (empty($contactid))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
+			$error++;
+		}
+		if ($actionid <= 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-            $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
-            if ($db->query($sql))
-            {
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
-                $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+			$sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
+			if ($db->query($sql))
+			{
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
+				$sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
 
-                if (!$db->query($sql))
-                {
-                    $error++;
-                    dol_print_error($db);
-                }
-            }
-            else
-            {
-                dol_print_error($db);
-            }
+				if (!$db->query($sql))
+				{
+					$error++;
+					dol_print_error($db);
+				}
+			} else {
+				dol_print_error($db);
+			}
 
-            if (!$error)
-            {
-                $db->commit();
-            }
-            else
-            {
-                $db->rollback();
-            }
-        }
-    }
+			if (!$error)
+			{
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
+		}
+	}
 
-    // Remove a notification
-    if ($action == 'delete')
-    {
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST('actid', 'int');
-        $db->query($sql);
-    }
+	// Remove a notification
+	if ($action == 'delete')
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST('actid', 'int');
+		$db->query($sql);
+	}
 }
 
 
@@ -148,46 +144,46 @@ llxHeader('', $title, $help_url);
 
 if ($result > 0)
 {
-    $langs->load("other");
+	$langs->load("other");
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($object);
 
-    dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"), -1, 'company');
+	dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
 
-    // Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+	// Prefix
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
 
-    if ($object->client)
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        print '</td></tr>';
-    }
+	if ($object->client)
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print '</td></tr>';
+	}
 
-    if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td></tr>';
-    }
+	if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td></tr>';
+	}
 
-    /*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
+	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
     print '<td colspan="3">';
     $nbofrecipientemails=0;
     $notify=new Notify($db);
@@ -199,165 +195,159 @@ if ($result > 0)
     print $nbofrecipientemails;
     print '</td></tr>';*/
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-
-    dol_fiche_end();
-
-    print "\n";
-
-    // Help
-    print '<div class="opacitymedium">';
-    print $langs->trans("NotificationsDesc");
-    print '<br>'.$langs->trans("NotificationsDescUser");
-    print '<br>'.$langs->trans("NotificationsDescContact");
-    print '<br>'.$langs->trans("NotificationsDescGlobal");
 	print '</div>';
 
-    print '<br><br>'."\n";
+	dol_fiche_end();
+
+	print "\n";
+
+	// Help
+	print '<div class="opacitymedium">';
+	print $langs->trans("NotificationsDesc");
+	print '<br>'.$langs->trans("NotificationsDescUser");
+	print '<br>'.$langs->trans("NotificationsDescContact");
+	print '<br>'.$langs->trans("NotificationsDescGlobal");
+	print '</div>';
+
+	print '<br><br>'."\n";
 
 
-    // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
+	// Add notification form
+	print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    $param = "&socid=".$socid;
+	$param = "&socid=".$socid;
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('');
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('');
 	print "</tr>\n";
 
-    $var = false;
-    $listofemails = $object->thirdparty_and_contact_email_array();
-    if (count($listofemails) > 0)
-    {
-        $actions = array();
+	$var = false;
+	$listofemails = $object->thirdparty_and_contact_email_array();
+	if (count($listofemails) > 0)
+	{
+		$actions = array();
 
-        // Load array of available notifications
-        $notificationtrigger = new InterfaceNotification($db);
-        $listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
+		// Load array of available notifications
+		$notificationtrigger = new InterfaceNotification($db);
+		$listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
 
-        foreach ($listofmanagedeventfornotification as $managedeventfornotification)
-        {
+		foreach ($listofmanagedeventfornotification as $managedeventfornotification)
+		{
  			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
-            $actions[$managedeventfornotification['rowid']] = $label;
-        }
-        print '<tr class="oddeven nohover"><td class="maxwidthonsmartphone">';
-        print img_picto('', 'contact', '', false, 0, 0, '', 'paddingright').$form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
-        print '</td>';
-        print '<td class="maxwidthonsmartphone">';
-        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
-        print '</td>';
-        print '<td>';
-        $type = array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid", $type);
-        print '</td>';
-        print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-        print '</tr>';
-    }
-    else
-    {
-        print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
-        print $langs->trans("YouMustCreateContactFirst");
-        print '</td></tr>';
-    }
+			$actions[$managedeventfornotification['rowid']] = $label;
+		}
+		print '<tr class="oddeven nohover"><td class="maxwidthonsmartphone">';
+		print img_picto('', 'contact', '', false, 0, 0, '', 'paddingright').$form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
+		print '</td>';
+		print '<td class="maxwidthonsmartphone">';
+		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
+		print '</td>';
+		print '<td>';
+		$type = array('email'=>$langs->trans("EMail"));
+		print $form->selectarray("typeid", $type);
+		print '</td>';
+		print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+		print '</tr>';
+	} else {
+		print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
+		print $langs->trans("YouMustCreateContactFirst");
+		print '</td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 
 
-    // List of notifications enabled for contacts
-    $sql = "SELECT n.rowid, n.type,";
-    $sql .= " a.code, a.label,";
-    $sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql .= " ".MAIN_DB_PREFIX."socpeople c";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND c.rowid = n.fk_contact";
-    $sql .= " AND c.fk_soc = ".$object->id;
+	// List of notifications enabled for contacts
+	$sql = "SELECT n.rowid, n.type,";
+	$sql .= " a.code, a.label,";
+	$sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+	$sql .= " ".MAIN_DB_PREFIX."socpeople c";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND c.rowid = n.fk_contact";
+	$sql .= " AND c.fk_soc = ".$object->id;
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
+	// List of active notifications
+	print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('', '', '');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('', '', '');
+	print '</tr>';
 
 	$langs->load("errors");
 	$langs->load("other");
 
-    if ($num)
-    {
-        $i = 0;
+	if ($num)
+	{
+		$i = 0;
 
-        $contactstatic = new Contact($db);
+		$contactstatic = new Contact($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $contactstatic->id = $obj->contactid;
-            $contactstatic->lastname = $obj->lastname;
-            $contactstatic->firstname = $obj->firstname;
-            print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
-            if ($obj->type == 'email')
-            {
-                if (isValidEmail($obj->email))
-                {
-                    print ' &lt;'.$obj->email.'&gt;';
-                }
-                else
-                {
-                    $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
-                }
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
-            print '</td>';
-            print '<td class="right"><a href="card.php?socid='.$socid.'&action=delete&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    }
+			$contactstatic->id = $obj->contact_id;
+			$contactstatic->lastname = $obj->lastname;
+			$contactstatic->firstname = $obj->firstname;
+			print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
+			if ($obj->type == 'email')
+			{
+				if (isValidEmail($obj->email))
+				{
+					print ' &lt;'.$obj->email.'&gt;';
+				} else {
+					$langs->load("errors");
+					print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
+				}
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("SMS");
+			print '</td>';
+			print '<td class="right"><a href="card.php?socid='.$socid.'&action=delete&token='.newToken().'&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
+	}
 
-    // List of notifications enabled for fixed email
-    /*
+	// List of notifications enabled for fixed email
+	/*
     foreach($conf->global as $key => $val)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
@@ -399,7 +389,7 @@ if ($result > 0)
 		print '</tr>';
     }*/
 
-    /*if ($user->admin)
+	/*if ($user->admin)
     {
 	    $var = ! $var;
 		print '<tr class="oddeven"><td colspan="4">';
@@ -407,108 +397,104 @@ if ($result > 0)
 		print '</td></tr>';
     }*/
 
-    print '</table>';
+	print '</table>';
 
 
-    print '<br><br>'."\n";
+	print '<br><br>'."\n";
 
 
-    // List
-    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql .= " a.code, a.label";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify as n ";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND n.fk_soc = ".$object->id;
-    $sql .= $db->order($sortfield, $sortorder);
+	// List
+	$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
+	$sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+	$sql .= " a.code, a.label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify as n ";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND n.fk_soc = ".$object->id;
+	$sql .= $db->order($sortfield, $sortorder);
 
-    // Count total nb of records
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    {
-        $result = $db->query($sql);
-        $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-        {
-        	$page = 0;
-        	$offset = 0;
-        }
-    }
+	// Count total nb of records
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
+	}
 
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    $param = '&socid='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$param = '&socid='.$object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="socid" value="'.$object->id.'">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="socid" value="'.$object->id.'">';
 
-    // List of active notifications
-    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	// List of active notifications
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
-    //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
+	print '</tr>';
 
-    if ($num > 0)
-    {
-        $i = 0;
+	if ($num > 0)
+	{
+		$i = 0;
 
-        $contactstatic = new Contact($db);
+		$contactstatic = new Contact($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            print '<tr class="oddeven"><td>';
-            if ($obj->id > 0)
-            {
-	            $contactstatic->id = $obj->id;
-	            $contactstatic->lastname = $obj->lastname;
-	            $contactstatic->firstname = $obj->firstname;
-	            print $contactstatic->getNomUrl(1);
-	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            }
-            else
+			print '<tr class="oddeven"><td>';
+			if ($obj->id > 0)
 			{
+				$contactstatic->id = $obj->id;
+				$contactstatic->lastname = $obj->lastname;
+				$contactstatic->firstname = $obj->firstname;
+				print $contactstatic->getNomUrl(1);
+				print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
+			} else {
 				print $obj->email;
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print $label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("Sms");
-            print '</td>';
-            // TODO Add link to object here for other types
-            /*print '<td>';
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print $label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("Sms");
+			print '</td>';
+			// TODO Add link to object here for other types
+			/*print '<td>';
             if ($obj->object_type == 'order')
             {
 				$orderstatic->id=$obj->object_id;
@@ -516,21 +502,20 @@ if ($result > 0)
 				print $orderstatic->getNomUrl(1);
             }
            	print '</td>';*/
-            // print
-            print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    } else {
-    	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-    }
+			// print
+			print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
+	} else {
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</form>';
-}
-else dol_print_error('', 'RecordNotFound');
+	print '</form>';
+} else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 5894c3245a9..70b0541f4dc 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -175,9 +175,7 @@ if (empty($reshook))
 			if (!$result)
 			{
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				// If this account is the default bank account, we disable others
 				if ($companybankaccount->default_rib)
 				{
@@ -230,9 +228,7 @@ if (empty($reshook))
 			if (!$result)
 			{
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
-			}
-			else
-			{
+			} else {
 				// If this account is the default bank account, we disable others
 				if ($companypaymentmode->default_rib)
 				{
@@ -338,9 +334,7 @@ if (empty($reshook))
 				$url = $_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -407,9 +401,7 @@ if (empty($reshook))
 				$url = $_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -424,9 +416,7 @@ if (empty($reshook))
 			$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 			header('Location: '.$url);
 			exit;
-		}
-		else
-		{
+		} else {
 			setEventMessages($db->lasterror, null, 'errors');
 		}
 	}
@@ -451,14 +441,10 @@ if (empty($reshook))
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 		}
 	}
@@ -473,14 +459,10 @@ if (empty($reshook))
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 		}
 	}
@@ -515,18 +497,14 @@ if (empty($reshook))
 			{
 				$error++;
 				setEventMessages('ThisThirdpartyIsNotACustomer', null, 'errors');
-			}
-			else
-			{
+			} else {
 				// Creation of Stripe customer + update of societe_account
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus, 1);
 				if (!$cu)
 				{
 					$error++;
 					setEventMessages($stripe->error, $stripe->errors, 'errors');
-				}
-				else
-				{
+				} else {
 					$stripecu = $cu->id;
 				}
 			}
@@ -540,9 +518,7 @@ if (empty($reshook))
 			{
 				$error++;
 				setEventMessages('ThisPaymentModeIsNotACard', null, 'errors');
-			}
-			else
-			{
+			} else {
 				// Get the Stripe customer
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				if (!$cu)
@@ -574,12 +550,12 @@ if (empty($reshook))
 
 			$db->begin();
 
-            if (empty($newcu)) {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$site_account."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity;
-            } else {
-                $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."societe_account";
-                $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$site_account."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
-            }
+			if (empty($newcu)) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity;
+			} else {
+				$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."societe_account";
+				$sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+			}
 
 			$resql = $db->query($sql);
 			$num = $db->num_rows($resql); // Note: $num is always 0 on an update and delete, it is defined for select only.
@@ -601,8 +577,8 @@ if (empty($reshook))
 					}
 				} else {
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."societe_account";
-					$sql .= " SET key_account = '".$db->escape(GETPOST('key_account', 'alpha'))."', site_account = '".$site_account."'";
-					$sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$site_account."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+					$sql .= " SET key_account = '".$db->escape(GETPOST('key_account', 'alpha'))."', site_account = '".$db->escape($site_account)."'";
+					$sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
 					$resql = $db->query($sql);
 				}
 			}
@@ -612,9 +588,7 @@ if (empty($reshook))
 			{
 				$stripecu = $newcu;
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -627,21 +601,21 @@ if (empty($reshook))
 
 			$db->begin();
 
-            if (empty($newsup)) {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE fk_soc = ".$object->id." AND service = '".$service."' AND entity = ".$conf->entity;
-                // TODO Add site and site_account on oauth_token table
-                //$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$site_account."') AND fk_soc = ".$object->id." AND service = '".$service."' AND entity = ".$conf->entity;
-            } else {
-                try {
-                    $stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
-                    $tokenstring['stripe_user_id'] = $stripesup->id;
-                    $tokenstring['type'] = $stripesup->type;
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
-                    $sql .= " SET tokenstring = '".dol_json_encode($tokenstring)."'";
-                    $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$site_account."') AND fk_soc = ".$object->id." AND service = '".$service."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
-                    // TODO Add site and site_account on oauth_token table
-                    $sql .= " WHERE fk_soc = ".$object->id." AND service = '".$service."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
-                } catch (Exception $e) {
+			if (empty($newsup)) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
+				// TODO Add site and site_account on oauth_token table
+				//$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
+			} else {
+				try {
+					$stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
+					$tokenstring['stripe_user_id'] = $stripesup->id;
+					$tokenstring['type'] = $stripesup->type;
+					$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
+					$sql .= " SET tokenstring = '".dol_json_encode($tokenstring)."'";
+					$sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+					// TODO Add site and site_account on oauth_token table
+					$sql .= " WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+				} catch (Exception $e) {
 					$error++;
 					setEventMessages($e->getMessage(), null, 'errors');
 				}
@@ -651,14 +625,14 @@ if (empty($reshook))
 			$num = $db->num_rows($resql);
 			if (empty($num) && !empty($newsup))
 			{
-                try {
-                    $stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
-                    $tokenstring['stripe_user_id'] = $stripesup->id;
-                    $tokenstring['type'] = $stripesup->type;
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, fk_soc, entity, tokenstring)";
-                    $sql .= " VALUES ('".$service."', ".$object->id.", ".$conf->entity.", '".dol_json_encode($tokenstring)."')";
-                    // TODO Add site and site_account on oauth_token table
-                } catch (Exception $e) {
+				try {
+					$stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
+					$tokenstring['stripe_user_id'] = $stripesup->id;
+					$tokenstring['type'] = $stripesup->type;
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, fk_soc, entity, tokenstring)";
+					$sql .= " VALUES ('".$db->escape($service)."', ".$object->id.", ".$conf->entity.", '".dol_json_encode($tokenstring)."')";
+					// TODO Add site and site_account on oauth_token table
+				} catch (Exception $e) {
 					$error++;
 					setEventMessages($e->getMessage(), null, 'errors');
 				}
@@ -669,9 +643,7 @@ if (empty($reshook))
 			{
 				$stripesupplieracc = $newsup;
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
 		}
@@ -684,23 +656,19 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		}
-		elseif ($action == 'setassourcedefault')	// Set as default when payment mode defined remotely only
+		} elseif ($action == 'setassourcedefault')	// Set as default when payment mode defined remotely only
 		{
 			try {
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 				if (preg_match('/pm_/', $source))
 				{
 					$cu->invoice_settings->default_payment_method = (string) $source; // New
-				}
-				else
-				{
+				} else {
 					$cu->default_source = (string) $source; // Old
 				}
 				$result = $cu->save();
@@ -708,43 +676,38 @@ if (empty($reshook))
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		}
-		elseif ($action == 'deletecard' && $source)
+		} elseif ($action == 'deletecard' && $source)
 		{
 			try {
 				if (preg_match('/pm_/', $source))
 				{
-                    $payment_method = \Stripe\PaymentMethod::retrieve($source, array("stripe_account" => $stripeacc));
-                    if ($payment_method)
-			        {
-					    $payment_method->detach();
-				    }
-				}
-				else
-				{
-				    $cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				    $card = $cu->sources->retrieve("$source");
-				    if ($card) {
-					    // $card->detach();  Does not work with card_, only with src_
-					    if (method_exists($card, 'detach')) {
+					$payment_method = \Stripe\PaymentMethod::retrieve($source, array("stripe_account" => $stripeacc));
+					if ($payment_method)
+					{
+						$payment_method->detach();
+					}
+				} else {
+					$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
+					$card = $cu->sources->retrieve("$source");
+					if ($card) {
+						// $card->detach();  Does not work with card_, only with src_
+						if (method_exists($card, 'detach')) {
 							$card->detach();
 						} else {
 							$card->delete();
 						}
-				    }
+					}
 				}
 
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
@@ -782,9 +745,7 @@ if (!$id)
 {
 	$companybankaccount->fetch(0, $object->id);
 	$companypaymentmode->fetch(0, null, $object->id, 'card');
-}
-else
-{
+} else {
 	$companybankaccount->fetch($id);
 	$companypaymentmode->fetch($id);
 }
@@ -871,7 +832,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
 			if (!empty($conf->stripe->enabled) && $stripecu && $action != 'editkey_account')
 			{
-			    $connect = '';
+				$connect = '';
 				if (!empty($stripeacc)) $connect = $stripeacc.'/';
 				$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$stripecu;
 				if ($servicestatus)
@@ -887,12 +848,12 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print '<input type="hidden" name="action" value="synccustomertostripe">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="socid" value="'.$object->id.'">';
-				print '<input type="submit" class="button" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
+				print '<input type="submit" class="button buttongen" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
 				print '</form>';
 			}
 			print '</td></tr>';
 		}
-    }
+	}
 
 	if ($object->fournisseur)
 	{
@@ -925,7 +886,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print $form->editfieldval("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
 		if (!empty($conf->stripe->enabled) && $stripesupplieracc && $action != 'editkey_account_supplier')
 		{
-		    $connect = '';
+			$connect = '';
 
 			$url = 'https://dashboard.stripe.com/test/connect/accounts/'.$stripesupplieracc;
 			if ($servicestatus)
@@ -942,7 +903,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="socid" value="'.$object->id.'">';
 			print '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
-			//print '<input type="submit" class="button" name="syncstripecustomer" value="'.$langs->trans("CreateSupplierOnStripe").'">';
+			//print '<input type="submit" class="button buttongen" name="syncstripecustomer" value="'.$langs->trans("CreateSupplierOnStripe").'">';
 			print '</form>';
 		}
 		print '</td></tr>';
@@ -961,7 +922,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$morehtmlright = '';
 		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
 		{
-            $morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
+			$morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
 		}
 		print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
 
@@ -975,9 +936,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
 					{
 						$listofsources = $customerstripe->sources->data;
-					}
-					else
-					{
+					} else {
 						$service = 'StripeTest';
 						$servicestatus = 0;
 						if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
@@ -998,16 +957,14 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							}
 
 							$listofsources = $paymentmethodobjs->data;
-						}
-						catch (Exception $e)
+						} catch (Exception $e)
 						{
 							$error++;
 							setEventMessages($e->getMessage(), null, 'errors');
 						}
 					}
 				}
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				dol_syslog("Error when searching/loading Stripe customer for thirdparty id =".$object->id);
 			}
@@ -1081,9 +1038,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print $companypaymentmodetemp->stripe_card_ref;
 							if ($companypaymentmodetemp->stripe_card_ref)
 							{
-							    $connect = '';
-							    if (!empty($stripeacc)) $connect = $stripeacc.'/';
-							    $url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$companypaymentmodetemp->stripe_card_ref;
+								$connect = '';
+								if (!empty($stripeacc)) $connect = $stripeacc.'/';
+								$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$companypaymentmodetemp->stripe_card_ref;
 								if ($servicestatus)
 								{
 									$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$companypaymentmodetemp->stripe_card_ref;
@@ -1104,14 +1061,13 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								$img = picto_from_langcode($companypaymentmodetemp->country_code);
 								print $img ? $img.' ' : '';
 								print getCountry($companypaymentmodetemp->country_code, 1);
-							}
-							else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+							} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 							print '</td>';
 							// Default
 							print '<td class="center">';
 							if (empty($companypaymentmodetemp->default_rib))
 							{
-								print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=setlocalassourcedefault">';
+								print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=setlocalassourcedefault&token='.newToken().'">';
 								print img_picto($langs->trans("Default"), 'off');
 								print '</a>';
 							} else {
@@ -1138,11 +1094,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 									print '<a href="'.$_SERVER['PHP_SELF'].'?action=synccardtostripe&socid='.$object->id.'&id='.$companypaymentmodetemp->id.'" class="paddingrightonly marginrightonly">'.$langs->trans("CreateCardOnStripe").'</a>';
 								}
 
-								print '<a class="editfielda marginleftonly marginrightonly" href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=editcard">';
+								print '<a class="editfielda marginleftonly marginrightonly" href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=editcard&token='.newToken().'">';
 								print img_picto($langs->trans("Modify"), 'edit');
 								print '</a>';
 								print '&nbsp;';
-								print '<a class="marginleftonly marginrightonly" href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=deletecard">'; // source='.$companypaymentmodetemp->stripe_card_ref.'&
+								print '<a class="marginleftonly marginrightonly" href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&id='.$companypaymentmodetemp->id.'&action=deletecard&token='.newToken().'">'; // source='.$companypaymentmodetemp->stripe_card_ref.'&
 								print img_picto($langs->trans("Delete"), 'delete');
 								print '</a>';
 							}
@@ -1152,8 +1108,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$i++;
 					}
 				}
-			}
-			else dol_print_error($db);
+			} else dol_print_error($db);
 		}
 
 		// Show remote sources (not already shown as local source)
@@ -1183,8 +1138,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$src->id;
 				if ($servicestatus)
 				{
-				    //$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
-				    $url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
+					//$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
+					$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
 				}
 				print " <a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')."</a>";
 				print '</td>';
@@ -1193,20 +1148,16 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				if ($src->object == 'card')
 				{
 					print img_credit_card($src->brand);
-				}
-				elseif ($src->object == 'source' && $src->type == 'card')
+				} elseif ($src->object == 'source' && $src->type == 'card')
 				{
 					print img_credit_card($src->card->brand);
-				}
-				elseif ($src->object == 'source' && $src->type == 'sepa_debit')
+				} elseif ($src->object == 'source' && $src->type == 'sepa_debit')
 				{
 					print '<span class="fa fa-university fa-2x fa-fw"></span>';
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'card')
+				} elseif ($src->object == 'payment_method' && $src->type == 'card')
 				{
 					print img_credit_card($src->card->brand);
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
+				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
 				{
 					print '<span class="fa fa-university fa-2x fa-fw"></span>';
 				}
@@ -1222,10 +1173,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'source' && $src->type == 'card')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'source' && $src->type == 'card')
 				{
 					print '<span class="opacitymedium">'.$src->owner->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
@@ -1235,10 +1184,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'source' && $src->type == 'sepa_debit')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'source' && $src->type == 'sepa_debit')
 				{
 					print 'SEPA debit';
 					print '</td><td>';
@@ -1247,10 +1194,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							$img = picto_from_langcode($src->sepa_debit->country);
 							print $img ? $img.' ' : '';
 							print getCountry($src->sepa_debit->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'card')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'payment_method' && $src->type == 'card')
 				{
 					print '<span class="opacitymedium">'.$src->billing_details->name.'</span><br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
@@ -1260,10 +1205,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->card->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->card->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} elseif ($src->object == 'payment_method' && $src->type == 'sepa_debit')
 				{
 					print 'SEPA debit';
 					print '</td><td>';
@@ -1272,10 +1215,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 						$img = picto_from_langcode($src->sepa_debit->country);
 						print $img ? $img.' ' : '';
 						print getCountry($src->sepa_debit->country, 1);
-					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				else {
+					} else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
+				} else {
 					print '</td><td>';
 				}
 				print '</td>';
@@ -1284,7 +1225,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				if ((empty($customerstripe->invoice_settings) && $customerstripe->default_source != $src->id) ||
 					(!empty($customerstripe->invoice_settings) && $customerstripe->invoice_settings->default_payment_method != $src->id))
 				{
-					print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setassourcedefault">';
+					print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=setassourcedefault&token='.newToken().'">';
 					print img_picto($langs->trans("Default"), 'off');
 					print '</a>';
 				} else {
@@ -1307,7 +1248,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print '<td class="right nowraponall">';
 				if ($user->rights->societe->creer)
 				{
-					print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=deletecard">';
+					print '<a href="'.DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id.'&source='.$src->id.'&action=deletecard&token='.newToken().'">';
 					print img_picto($langs->trans("Delete"), 'delete');
 					print '</a>';
 				}
@@ -1325,30 +1266,30 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 		print "</table>";
 		print "</div>";
-        print '<br>';
+		print '<br>';
 	}
 
   	// List of Stripe payment modes
 	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && !empty($stripesupplieracc))
 	{
-        print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
-        $balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
+		print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
+		$balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
 		print '<table class="liste centpercent">'."\n";
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Currency').'</td>';
 		print '<td>'.$langs->trans('Available').'</td>';
 		print '<td>'.$langs->trans('Pending').'</td>';
-        print '<td>'.$langs->trans('Total').'</td>';
-        print '</tr>';
+		print '<td>'.$langs->trans('Total').'</td>';
+		print '</tr>';
 
-        $currencybalance = array();
+		$currencybalance = array();
 		if (is_array($balance->available) && count($balance->available))
 		{
 			foreach ($balance->available as $cpt)
 			{
-		        $arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-		        if (!in_array($cpt->currency, $arrayzerounitcurrency)) {
-    					$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
+				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+				if (!in_array($cpt->currency, $arrayzerounitcurrency)) {
+						$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
 				} else {
 					$currencybalance[$cpt->currency]['available'] = $cpt->amount;
 				}
@@ -1356,7 +1297,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-        if (is_array($balance->pending) && count($balance->pending))
+		if (is_array($balance->pending) && count($balance->pending))
 		{
 			foreach ($balance->pending as $cpt)
 			{
@@ -1367,7 +1308,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					$currencybalance[$cpt->currency]['pending'] = $currencybalance[$cpt->currency]['available'] + $cpt->amount;
 				}
 			}
-        }
+		}
 
 		if (is_array($currencybalance))
 		{
@@ -1377,13 +1318,13 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-        print '</table>';
-        print '<br>';
+		print '</table>';
+		print '<br>';
 	}
 
 	// List of bank accounts
 
-    $morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create');
+	$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create');
 
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank');
 
@@ -1430,11 +1371,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				} elseif ($val == 'BankAccountNumberKey') {
 					$string .= $rib->cle_rib.' ';
 				}
-                // Already output after
-                // } elseif ($val == 'BIC') {
-                //     $string .= $rib->bic.' ';
-                // } elseif ($val == 'IBAN') {
-                //     $string .= $rib->iban.' ';*/
+				// Already output after
+				// } elseif ($val == 'BIC') {
+				//     $string .= $rib->bic.' ';
+				// } elseif ($val == 'IBAN') {
+				//     $string .= $rib->iban.' ';*/
 				//}
 			}
 			if (!empty($rib->label) && $rib->number) {
@@ -1479,7 +1420,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			// Default
 			print '<td class="center" width="70">';
 			if (!$rib->default_rib) {
-				print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&ribid='.$rib->id.'&action=setasbankdefault">';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&ribid='.$rib->id.'&action=setasbankdefault&token='.newToken().'">';
 				print img_picto($langs->trans("Disabled"), 'off');
 				print '</a>';
 			} else {
@@ -1551,7 +1492,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print img_picto($langs->trans("Modify"), 'edit');
 				print '</a>';
 
-		   		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=delete">';
+		   		print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=delete&token='.newToken().'">';
 		   		print img_picto($langs->trans("Delete"), 'delete');
 		   		print '</a>';
 			}
@@ -1589,7 +1530,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$genallowed = $user->rights->societe->lire;
 		$delallowed = $user->rights->societe->creer;
 
-		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+		print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
 
 		// Show direct download link
 		if (!empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD))
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index df8e966d0ce..d974792ddd4 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -40,9 +40,12 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 $langs->loadLangs(array("products", "companies", "bills"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $search_prod = GETPOST('search_prod', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
+$search_label = GETPOST('search_label', 'alpha');
+$search_price = GETPOST('search_price');
+$search_price_ttc = GETPOST('search_price_ttc');
 
 // Security check
 $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
@@ -68,112 +71,112 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-    {
-        $search_prod = '';
-    }
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
+	{
+		$search_prod = $search_label = $search_price = $search_price_ttc = '';
+	}
 
-    if ($action == 'add_customer_price_confirm' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	if (! (GETPOST('prodid', 'int') > 0)) {
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Product")), null, 'errors');
-    		$action = 'add_customer_price';
-    	}
+	if ($action == 'add_customer_price_confirm' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		if (! (GETPOST('prodid', 'int') > 0)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Product")), null, 'errors');
+			$action = 'add_customer_price';
+		}
 
-    	if (! $error) {
-	    	$update_child_soc = GETPOST('updatechildprice');
+		if (! $error) {
+			$update_child_soc = GETPOST('updatechildprice');
 
-	    	// add price by customer
-	    	$prodcustprice->fk_soc = $socid;
-	    	$prodcustprice->fk_product = GETPOST('prodid', 'int');
-	    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-	    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-	    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+			// add price by customer
+			$prodcustprice->fk_soc = $socid;
+			$prodcustprice->fk_product = GETPOST('prodid', 'int');
+			$prodcustprice->price = price2num(GETPOST("price"), 'MU');
+			$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+			$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
 
-	    	$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+			$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
-	    	// We must define tva_tx, npr and local taxes
-	    	$vatratecode = '';
-	    	$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
-	    	$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-	    	$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-	    	// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
-	    	if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	    	{
-	    	    // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
-	    	    $vatratecode = $reg[1];
-	    	    // Get record from code
-	    	    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	    	    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	    	    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";
-	    	    $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-	    	    $sql .= " AND t.code ='".$vatratecode."'";
-	    	    $resql = $db->query($sql);
-	    	    if ($resql)
-	    	    {
-	    	        $obj = $db->fetch_object($resql);
-	    	        $npr = $obj->recuperableonly;
-	    	        $localtax1 = $obj->localtax1;
-	    	        $localtax2 = $obj->localtax2;
-	    	        $localtax1_type = $obj->localtax1_type;
-	    	        $localtax2_type = $obj->localtax2_type;
-	    	    }
-	    	}
+			// We must define tva_tx, npr and local taxes
+			$vatratecode = '';
+			$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
+			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+			// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
+			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+			{
+				// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
+				$vatratecode = $reg[1];
+				// Get record from code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+				$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+			}
 
-	    	$prodcustprice->default_vat_code = $vatratecode;
-	    	$prodcustprice->tva_tx = $tva_tx;
-	    	$prodcustprice->recuperableonly = $npr;
-	    	$prodcustprice->localtax1_tx = $localtax1;
-	    	$prodcustprice->localtax2_tx = $localtax2;
-	    	$prodcustprice->localtax1_type = $localtax1_type;
-	    	$prodcustprice->localtax2_type = $localtax2_type;
+			$prodcustprice->default_vat_code = $vatratecode;
+			$prodcustprice->tva_tx = $tva_tx;
+			$prodcustprice->recuperableonly = $npr;
+			$prodcustprice->localtax1_tx = $localtax1;
+			$prodcustprice->localtax2_tx = $localtax2;
+			$prodcustprice->localtax1_type = $localtax1_type;
+			$prodcustprice->localtax2_type = $localtax2_type;
 
-	    	$result = $prodcustprice->create($user, 0, $update_child_soc);
+			$result = $prodcustprice->create($user, 0, $update_child_soc);
 
-	    	if ($result < 0) {
-	    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-	    	} else {
-	    		setEventMessages($langs->trans('Save'), null, 'mesgs');
-	    	}
+			if ($result < 0) {
+				setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans('Save'), null, 'mesgs');
+			}
 
-	    	$action = '';
-    	}
-    }
+			$action = '';
+		}
+	}
 
-    if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	// Delete price by customer
-    	$prodcustprice->id = GETPOST('lineid');
-    	$result = $prodcustprice->delete($user);
+	if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		// Delete price by customer
+		$prodcustprice->id = GETPOST('lineid');
+		$result = $prodcustprice->delete($user);
 
-    	if ($result < 0) {
-    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
-    	} else {
-    		setEventMessages($langs->trans('Delete'), null, 'errors');
-    	}
-    	$action = '';
-    }
+		if ($result < 0) {
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
+		} else {
+			setEventMessages($langs->trans('Delete'), null, 'errors');
+		}
+		$action = '';
+	}
 
-    if ($action == 'update_customer_price_confirm' && !$_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	$prodcustprice->fetch(GETPOST('lineid', 'int'));
+	if ($action == 'update_customer_price_confirm' && !$_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		$prodcustprice->fetch(GETPOST('lineid', 'int'));
 
-    	$update_child_soc = GETPOST('updatechildprice');
+		$update_child_soc = GETPOST('updatechildprice');
 
-    	// update price by customer
-    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-    	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
-    	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
+		// update price by customer
+		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
+		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+		$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
+		$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
 
-    	$result = $prodcustprice->update($user, 0, $update_child_soc);
-    	if ($result < 0) {
-    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-    	} else {
-    		setEventMessages($langs->trans('Save'), null, 'mesgs');
-    	}
+		$result = $prodcustprice->update($user, 0, $update_child_soc);
+		if ($result < 0) {
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+		} else {
+			setEventMessages($langs->trans('Save'), null, 'mesgs');
+		}
 
-    	$action = '';
-    }
+		$action = '';
+	}
 }
 
 
@@ -239,7 +242,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 	$sortfield = GETPOST("sortfield", 'alpha');
 	$sortorder = GETPOST("sortorder", 'alpha');
-    $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 	$offset = $limit * $page;
@@ -259,6 +262,18 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		$filter ['prod.ref'] = $search_prod;
 	}
 
+	if (!empty($search_label)) {
+		$filter ['prod.label'] = $search_label;
+	}
+
+	if (!empty($search_price)) {
+		$filter ['t.price'] = $search_price;
+	}
+
+	if (!empty($search_price_ttc)) {
+		$filter ['t.price_ttc'] = $search_price_ttc;
+	}
+
 	if ($action == 'add_customer_price') {
 		// Create mode
 
@@ -414,7 +429,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		print '<br></form>';
 	} elseif ($action == 'showlog_customer_price') {
-	    print '<br>';
+		print '<br>';
 		print '<!-- showlog_customer_price -->'."\n";
 
 		$filter = array(
@@ -480,19 +495,15 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				print '</td>';
 			}
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			print $langs->trans('None');
 		}
 
 		print "\n".'<div class="tabsAction">'."\n";
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'">'.$langs->trans("Ok").'</a></div>';
 		print "\n</div><br>\n";
-	}
-	else
-	{
-        // View mode
+	} else {
+		// View mode
 
 		/* ************************************************************************** */
 		/*                                                                            */
@@ -508,114 +519,118 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print "\n</div>\n";
 
 
-        // Count total nb of records
-        $nbtotalofrecords = '';
-        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-        {
-            $nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-        }
+		// Count total nb of records
+		$nbtotalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+		}
 
-        $result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
-        if ($result < 0)
-        {
-            setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-        }
+		$result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
+		if ($result < 0)
+		{
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+		}
 
-        $option = '&search_prod='.$search_prod.'&id='.$object->id;
+		$option = '&search_prod=' . $search_prod . '&id=' . $object->id . '&label=' . $search_label .'&price=' . $search_price . '&price_ttc=' . $search_price_ttc;
 
-	    print '<!-- view specific price for each product -->'."\n";
+		print '<!-- view specific price for each product -->'."\n";
 
-	    print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVER['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
+		print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVER['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
 
-        print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-        print '<table class="noborder centpercent">';
+		print '<table class="noborder centpercent">';
 
-        print '<tr class="liste_titre">';
-        print '<td>'.$langs->trans("Product").'</td>';
-        print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
-        print '<td class="center">'.$langs->trans("PriceBase").'</td>';
-        print '<td class="right">'.$langs->trans("VAT").'</td>';
-        print '<td class="right">'.$langs->trans("HT").'</td>';
-        print '<td class="right">'.$langs->trans("TTC").'</td>';
-        print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
-        print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
-        print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
-        print '<td>&nbsp;</td>';
-        print '</tr>';
+		print '<tr class="liste_titre">';
+		print '<td>' . $langs->trans("Ref") . '</td>';
+		print '<td>' . $langs->trans("Product") . '</td>';
+		print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
+		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
+		print '<td class="right">'.$langs->trans("VAT").'</td>';
+		print '<td class="right">'.$langs->trans("HT").'</td>';
+		print '<td class="right">'.$langs->trans("TTC").'</td>';
+		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
+		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+		print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
+		print '<td>&nbsp;</td>';
+		print '</tr>';
 
-        if (count($prodcustprice->lines) > 0 || $search_prod)
-        {
-            print '<tr class="liste_titre">';
+		if (count($prodcustprice->lines) > 0 || $search_prod)
+		{
+			print '<tr class="liste_titre">';
 			print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="'.$search_prod.'" size="20"></td>';
-            print '<td class="liste_titre" colspan="8">&nbsp;</td>';
-            // Print the search button
-            print '<td class="liste_titre maxwidthsearch">';
-            $searchpicto = $form->showFilterAndCheckAddButtons(0);
-            print $searchpicto;
-            print '</td>';
-            print '</tr>';
-        }
+			print '<td class="liste_titre" ><input type="text" class="flat" name="search_label" value="' . $search_label . '" size="20"></td>';
+			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price" value="' . $search_price . '" size="10"></td>';
+			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price_ttc" value="' . $search_price_ttc . '" size="10"></td>';
+			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+			// Print the search button
+			print '<td class="liste_titre maxwidthsearch">';
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+			print '</td>';
+			print '</tr>';
+		}
 
-        if (count($prodcustprice->lines) > 0)
-        {
-            foreach ($prodcustprice->lines as $line)
-            {
-                print '<tr class="oddeven">';
+		if (count($prodcustprice->lines) > 0)
+		{
+			foreach ($prodcustprice->lines as $line)
+			{
+				print '<tr class="oddeven">';
 
-                $staticprod = new Product($db);
-                $staticprod->fetch($line->fk_product);
+				$staticprod = new Product($db);
+				$staticprod->fetch($line->fk_product);
 
-                print "<td>".$staticprod->getNomUrl(1)."</td>";
-                print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
+				print "<td>".$staticprod->getNomUrl(1)."</td>";
+				print "<td>" . $staticprod->label ."</td>";
+				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
 
-                print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
-                print '<td class="right">'.vatrate($line->tva_tx.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), true, $line->recuperableonly)."</td>";
-                print '<td class="right">'.price($line->price)."</td>";
-                print '<td class="right">'.price($line->price_ttc)."</td>";
-                print '<td class="right">'.price($line->price_min).'</td>';
-                print '<td class="right">'.price($line->price_min_ttc).'</td>';
+				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
+				print '<td class="right">'.vatrate($line->tva_tx.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), true, $line->recuperableonly)."</td>";
+				print '<td class="right">'.price($line->price)."</td>";
+				print '<td class="right">'.price($line->price_ttc)."</td>";
+				print '<td class="right">'.price($line->price_min).'</td>';
+				print '<td class="right">'.price($line->price_min_ttc).'</td>';
 
-                // User
-                $userstatic = new User($db);
-                $userstatic->fetch($line->fk_user);
-                print '<td class="right">';
-                print $userstatic->getLoginUrl(1);
-                print '</td>';
+				// User
+				$userstatic = new User($db);
+				$userstatic->fetch($line->fk_user);
+				print '<td class="right">';
+				print $userstatic->getLoginUrl(1);
+				print '</td>';
 
-                // Action
-                if ($user->rights->produit->creer || $user->rights->service->creer)
-                {
-                    print '<td class="right nowraponall">';
-                    print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&amp;socid='.$object->id.'&amp;prodid='.$line->fk_product.'">';
-                    print img_info();
-                    print '</a>';
-                    print ' ';
-                    print '<a class="editfielda paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
-                    print img_edit('default', 0, 'style="vertical-align: middle;"');
-                    print '</a>';
-                    print ' ';
-                    print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
-                    print img_delete('default', 'style="vertical-align: middle;"');
-                    print '</a>';
-                    print '</td>';
-                }
+				// Action
+				if ($user->rights->produit->creer || $user->rights->service->creer)
+				{
+					print '<td class="right nowraponall">';
+					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&amp;socid='.$object->id.'&amp;prodid='.$line->fk_product.'">';
+					print img_info();
+					print '</a>';
+					print ' ';
+					print '<a class="editfielda paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
+					print img_edit('default', 0, 'style="vertical-align: middle;"');
+					print '</a>';
+					print ' ';
+					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
+					print img_delete('default', 'style="vertical-align: middle;"');
+					print '</a>';
+					print '</td>';
+				}
 
-                print "</tr>\n";
-            }
-        }
-        else
-        {
-            $colspan = 9;
-            if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
-            print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
-        }
+				print "</tr>\n";
+			}
+		} else {
+			$colspan = 9;
+			if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
+			print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
+		}
 
-        print "</table>";
+		print "</table>";
 
-        print "</form>";
+		print "</form>";
 	}
 }
 
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 5ff86ff0064..20ddbfa4cf7 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("orders", "companies"));
 
 $id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -78,16 +78,12 @@ if ($action == 'addcontact' && $user->rights->societe->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
+		} else {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
 	}
@@ -99,9 +95,7 @@ elseif ($action == 'swapstatut' && $user->rights->societe->creer)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -116,8 +110,7 @@ elseif ($action == 'deletecontact' && $user->rights->societe->creer)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -327,17 +320,13 @@ if ($id > 0 || !empty($ref))
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}
 							print '</td>';
-						}
-						else
-						{
+						} else {
 							print '<td class="left nowrap">';
 							if ($objp->subscription == 'yes')
 							{
 								print $langs->trans("SubscriptionNotReceived");
 								if ($objp->statut > 0) print " ".img_warning();
-							}
-							else
-							{
+							} else {
 								print '&nbsp;';
 							}
 							print '</td>';
@@ -350,9 +339,7 @@ if ($id > 0 || !empty($ref))
 				}
 			}
 		}
-	}
-	else
-	{
+	} else {
 		// Contrat non trouve
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
index 11b2d033b69..039379be8c7 100644
--- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php
+++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php
@@ -23,31 +23,48 @@ if (empty($conf) || !is_object($conf))
 }
 
 // Sale representative
-print '<tr><td class="titlefield">';
+print '<tr><td>';
+print '<table class="nobordernopadding" width="100%"><tr><td>';
 print $langs->trans('SalesRepresentatives');
 print '</td>';
-print '<td>';
-
-$listsalesrepresentatives = $object->getSalesRepresentatives($user);
-$nbofsalesrepresentative = count($listsalesrepresentatives);
-if ($nbofsalesrepresentative > 0)
-{
-	$userstatic = new User($db);
-	foreach ($listsalesrepresentatives as $val)
-	{
-		$userstatic->id = $val['id'];
-		$userstatic->login = $val['login'];
-		$userstatic->lastname = $val['lastname'];
-		$userstatic->firstname = $val['firstname'];
-		$userstatic->statut = $val['statut'];
-		$userstatic->photo = $val['photo'];
-		$userstatic->email = $val['email'];
-		$userstatic->phone = $val['phone'];
-		$userstatic->job = $val['job'];
-		$userstatic->entity = $val['entity'];
-		print $userstatic->getNomUrl(-1);
-		print ' ';
-	}
+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 '</td>';
+}
+print '</tr></table>';
+print '</td><td colspan="3">';
+
+if ($action == 'editsalesrepresentatives') {
+	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 . '" />';
+	$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 '</form>';
+} else {
+	$listsalesrepresentatives = $object->getSalesRepresentatives($user);
+	$nbofsalesrepresentative = count($listsalesrepresentatives);
+	if ($nbofsalesrepresentative > 0 && is_array($listsalesrepresentatives)) {
+		$userstatic = new User($db);
+		foreach ($listsalesrepresentatives as $val) {
+			$userstatic->id = $val['id'];
+			$userstatic->login = $val['login'];
+			$userstatic->lastname = $val['lastname'];
+			$userstatic->firstname = $val['firstname'];
+			$userstatic->statut = $val['statut'];
+			$userstatic->photo = $val['photo'];
+			$userstatic->email = $val['email'];
+			$userstatic->phone = $val['phone'];
+			$userstatic->job = $val['job'];
+			$userstatic->entity = $val['entity'];
+			print $userstatic->getNomUrl(-1);
+			print ' ';
+		}
+	} else print '<span class="opacitymedium">' . $langs->trans("NoSalesRepresentativeAffected") . '</span>';
+	print '</td></tr>';
 }
-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 e7ebae374e2..883908e8d5d 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array("companies", "website"));
 
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $show_files = GETPOST('show_files', 'int');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'websitelist'; // 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')
 
@@ -76,7 +76,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($objectwebsiteaccount
 unset($objectwebsiteaccount->fields['fk_soc']); // Remove this field, we are already on the thirdparty
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($objectwebsiteaccount->fields as $key => $val)
 {
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index a8bca51dda3..efcef759da4 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -39,7 +39,7 @@ $langs->loadLangs(array('admin', 'other', 'paypal', 'paybox', 'stripe'));
 
 if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -136,9 +136,7 @@ if ($action == "setlive")
 	$res = dolibarr_set_const($db, "STRIPE_LIVE", $liveenable, 'yesno', 0, '', $conf->entity);
 	if ($res > 0) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
@@ -159,7 +157,7 @@ print load_fiche_titre($langs->trans("ModuleSetup").' Stripe', $linkback);
 
 $head = stripeadmin_prepare_head();
 
-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 '<input type="hidden" name="action" value="setvalue">';
 
@@ -194,23 +192,23 @@ if (empty($conf->stripeconnect->enabled))
 	print '<tr class="oddeven"><td>';
 	print '<span class="fieldrequired">'.$langs->trans("STRIPE_TEST_PUBLISHABLE_KEY").'</span></td><td>';
 	print '<input class="minwidth300" type="text" name="STRIPE_TEST_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': pk_test_xxxxxxxxxxxxxxxxxxxxxxxx</span>';
 	print '</td><td></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print '<span class="titlefield fieldrequired">'.$langs->trans("STRIPE_TEST_SECRET_KEY").'</span></td><td>';
 	print '<input class="minwidth300" type="text" name="STRIPE_TEST_SECRET_KEY" value="'.$conf->global->STRIPE_TEST_SECRET_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx';
+	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': sk_test_xxxxxxxxxxxxxxxxxxxxxxxx<</span>';
 	print '</td><td></td></tr>';
 
 	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; '.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx<br>';
+        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; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
+	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);
 	$out .= '<input type="text" id="onlinetestwebhookurl" class="minwidth500" value="'.$url.'">';
@@ -237,16 +235,12 @@ if (empty($conf->stripeconnect->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
-            {
+            } 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
-        {
+        } else {
             print img_picto($langs->trans("inactive"), 'statut5');
         }
 	}
@@ -267,23 +261,23 @@ if (empty($conf->stripeconnect->enabled))
 	print '<tr class="oddeven"><td>';
 	print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
 	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx</span>';
 	print '</td><td></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
 	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'">';
-	print ' &nbsp; '.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx';
+	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx</span>';
 	print '</td><td></td></tr>';
 
 	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; '.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx<br>';
+        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; '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx';
+	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 .= '<input type="text" id="onlinelivewebhookurl" class="minwidth500" value="'.$url.'">';
@@ -310,23 +304,17 @@ if (empty($conf->stripeconnect->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
-            {
+            } 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
-        {
+        } else {
             print img_picto($langs->trans("inactive"), 'statut5');
         }
 	}
     print '</td></tr>';
-}
-else
-{
+} else {
 	print '<tr class="oddeven"><td>'.$langs->trans("StripeConnect").'</td>';
 	print '<td>'.$langs->trans("StripeConnect_Mode").'</td><td></td></tr>';
 }
@@ -344,9 +332,9 @@ print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
 print '<tr class="oddeven"><td>';
-print $langs->trans("VendorName").'</td><td>';
-print '<input size="64" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$conf->global->ONLINE_PAYMENT_CREDITOR.'">';
-print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
+print $langs->trans("PublicVendorName").'</td><td>';
+print '<input class="minwidth300" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$conf->global->ONLINE_PAYMENT_CREDITOR.'">';
+print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': '.$mysoc->name.'</span>';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
@@ -395,6 +383,21 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 	print '</td></tr>';
 }
 
+// Activate iDEAL
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
+{
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("STRIPE_IDEAL").'</td><td>';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_IDEAL');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_IDEAL", $arrval, $conf->global->STRIPE_SEPA_DIRECT_DEBIT);
+	}
+	print ' &nbsp; <span class="opacitymedium">'.$langs->trans("ExampleOnlyForNLCustomers").'</span>';
+	print '</td></tr>';
+}
+
 // Warehouse for automatic decrement
 //if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// warehouse to reduce stock for online payment
 //{
@@ -407,7 +410,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)	// TODO Not used by current code
 print '<tr class="oddeven"><td>';
 print $langs->trans("CSSUrlForPaymentForm").'</td><td>';
 print '<input size="64" type="text" name="ONLINE_PAYMENT_CSS_URL" value="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'">';
-print ' &nbsp; '.$langs->trans("Example").': http://mysite/mycss.css';
+print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': http://mysite/mycss.css</span>';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
@@ -430,16 +433,21 @@ print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").'</td><td>';
-print '<input size="32" type="text" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'">';
-print ' &nbsp; '.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;';
+print '<input class="minwidth200" type="text" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'">';
+print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;</span>';
 print '</td></tr>';
 
 // Payment token for URL
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
-print '<input size="48" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
-if (!empty($conf->use_javascript_ajax))
+print '<input class="minwidth300"  type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
+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)) {
+	$langs->load("errors");
+	print img_warning($langs->trans("WarningTheHiddenOptionIsOn", 'PAYMENT_SECURITY_ACCEPT_ANY_TOKEN'), '', 'pictowarning marginleftonly');
+}
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 44c7db306a2..8544417b2e4 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -65,9 +65,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else
-{
+} else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -81,203 +79,207 @@ $stripeacc = $stripe->getStripeAccount($service);
 if (!$rowid)
 {
 	$option = array('limit' => $limit + 1);
+	$num = 0;
+
 	if (GETPOSTISSET('starting_after_'.$page)) $option['starting_after'] = GETPOST('starting_after_'.$page, 'alphanohtml');
-	if ($stripeacc)
-	{
-		$list = \Stripe\Charge::all($option, array("stripe_account" => $stripeacc));
-	}
-	else
-	{
-		$list = \Stripe\Charge::all($option);
-	}
 
-	$num = count($list->data);
-	$totalnboflines = '';
-
-	$param = '';
-	//if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	$param .= '&starting_after_'.($page + 1).'='.$list->data[($limit - 1)]->id;
-	//$param.='&ending_before_'.($page+1).'='.$list->data[($limit-1)]->id;
-
-	$moreforfilter = '';
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-
-    $title = $langs->trans("StripeChargeList");
-    $title .= ($stripeacc ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
-
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', 'hidepaginationprevious', $limit);
-
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("StripeCustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
-    print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
-    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
-    print "</tr>\n";
-
-	//print $list;
-	$i = 0;
-	foreach ($list->data as $charge)
-	{
-		if ($i >= $limit) {
-			break;
-		}
-
-	    if ($charge->refunded == '1') {
-	    	$status = img_picto($langs->trans("refunded"), 'statut6');
-	    } elseif ($charge->paid == '1') {
-            $status = img_picto($langs->trans((string) $charge->status), 'statut4');
-	    } else {
-	    	$label = $langs->trans("Message").": ".$charge->failure_message."<br>";
-	    	$label .= $langs->trans("Network").": ".$charge->outcome->network_status."<br>";
-	    	$label .= $langs->trans("Status").": ".$langs->trans((string) $charge->outcome->seller_message);
-	    	$status = $form->textwithpicto(img_picto($langs->trans((string) $charge->status), 'statut8'), $label, -1);
-	    }
-
-        if ($charge->payment_method_details->type == 'card') {
-		    $type = $langs->trans("card");
-	    } elseif ($charge->source->type == 'card') {
-			$type = $langs->trans("card");
-	    } elseif ($charge->payment_method_details->type == 'three_d_secure') {
-			$type = $langs->trans("card3DS");
-	    } elseif ($charge->payment_method_details->type == 'sepa_debit') {
-			$type = $langs->trans("sepadebit");
-	    } elseif ($charge->payment_method_details->type == 'ideal') {
-			$type = $langs->trans("iDEAL");
-	    }
-
-	    // Why this ?
-        /*if (! empty($charge->payment_intent)) {
-			if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-	    		$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
-			} else {
-				$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent, array("stripe_account" => $stripeacc));
-			}
-        }*/
-
-		// The metadata FULLTAG is defined by the online payment page
-		$FULLTAG = $charge->metadata->FULLTAG;
-
-		// Save into $tmparray all metadata
-		$tmparray = dolExplodeIntoArray($FULLTAG, '.', '=');
-		// Load origin object according to metadata
-		if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0)
+	try {
+		if ($stripeacc)
 		{
-			$societestatic->fetch($tmparray['CUS']);
-		}
-		elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
-		{
-			$societestatic->fetch($charge->metadata->dol_thirdparty_id);
-		}
-		else
-		{
-			$societestatic->id = 0;
-		}
-		if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
-		{
-			$memberstatic->fetch($tmparray['MEM']);
-		}
-		else
-		{
-			$memberstatic->id = 0;
-		}
-
-		print '<tr class="oddeven">';
-
-        if (!empty($stripeacc)) $connect = $stripeacc.'/';
-
-		// Ref
-		$url = 'https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
-        if ($servicestatus)
-        {
-        	$url = 'https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
-        }
-		print "<td>";
-        print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$charge->id."</a>";
-        if ($charge->payment_intent) print '<br><span class="opacitymedium">'.$charge->payment_intent.'</span>';
-		print "</td>\n";
-
-		// Stripe customer
-		print "<td>";
-        if (!empty($conf->stripe->enabled) && !empty($stripeacc)) $connect = $stripeacc.'/';
-		$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$charge->customer;
-		if ($servicestatus)
-		{
-            $url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
-		}
-		if (!empty($charge->customer))
-		{
-    		print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'globe').' '.$charge->customer.'</a>';
-		}
-        print "</td>\n";
-
-		// Link
-		print "<td>";
-		if ($societestatic->id > 0)
-		{
-			print $societestatic->getNomUrl(1);
-		}
-		elseif ($memberstatic->id > 0)
-		{
-			print $memberstatic->getNomUrl(1);
-		}
-		print "</td>\n";
-
-		// Origin
-		print "<td>";
-		if ($charge->metadata->dol_type == "order" || $charge->metadata->dol_type == "commande") {
-			$object = new Commande($db);
-			$object->fetch($charge->metadata->dol_id);
-            if ($object->id > 0) {
-                print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
-            } else {
-                print $FULLTAG;
-            }
-		} elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
-			print $charge->metadata->dol_type.' '.$charge->metadata->dol_id.' - ';
-			$object = new Facture($db);
-			$object->fetch($charge->metadata->dol_id);
-            if ($object->id > 0) {
-		        print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
-            } else {
-				print $FULLTAG;
-			}
+			$list = \Stripe\Charge::all($option, array("stripe_account" => $stripeacc));
 		} else {
-			print $FULLTAG;
+			$list = \Stripe\Charge::all($option);
 		}
-	    print "</td>\n";
 
-		// Date payment
-	    print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
-	    // Type
-	    print '<td>';
-		print $type;
-	    print '</td>';
-	    // Amount
-	    print '<td class="right">'.price(($charge->amount - $charge->amount_refunded) / 100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
-	    // Status
-	    print '<td class="right">';
-	    print $status;
-	    print "</td>\n";
+		$num = count($list->data);
 
+		$totalnboflines = '';
+
+		$param = '';
+		//if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+		$param .= '&starting_after_'.($page + 1).'='.$list->data[($limit - 1)]->id;
+		//$param.='&ending_before_'.($page+1).'='.$list->data[($limit-1)]->id;
+
+		$moreforfilter = '';
+
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	    print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	    print '<input type="hidden" name="action" value="list">';
+	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	    print '<input type="hidden" name="page" value="'.$page.'">';
+
+	    $title = $langs->trans("StripeChargeList");
+	    $title .= ($stripeacc ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
+
+		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', 'hidepaginationprevious', $limit);
+
+	    print '<div class="div-table-responsive">';
+	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	    print '<tr class="liste_titre">';
+	    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	    print_liste_field_titre("StripeCustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	    print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	    print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	    print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
+	    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
+	    print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
+	    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
 	    print "</tr>\n";
 
-	    $i++;
+		//print $list;
+		$i = 0;
+		foreach ($list->data as $charge)
+		{
+			if ($i >= $limit) {
+				break;
+			}
+
+		    if ($charge->refunded == '1') {
+		    	$status = img_picto($langs->trans("refunded"), 'statut6');
+		    } elseif ($charge->paid == '1') {
+	            $status = img_picto($langs->trans((string) $charge->status), 'statut4');
+		    } else {
+		    	$label = $langs->trans("Message").": ".$charge->failure_message."<br>";
+		    	$label .= $langs->trans("Network").": ".$charge->outcome->network_status."<br>";
+		    	$label .= $langs->trans("Status").": ".$langs->trans((string) $charge->outcome->seller_message);
+		    	$status = $form->textwithpicto(img_picto($langs->trans((string) $charge->status), 'statut8'), $label, -1);
+		    }
+
+	        if ($charge->payment_method_details->type == 'card') {
+			    $type = $langs->trans("card");
+		    } elseif ($charge->source->type == 'card') {
+				$type = $langs->trans("card");
+		    } elseif ($charge->payment_method_details->type == 'three_d_secure') {
+				$type = $langs->trans("card3DS");
+		    } elseif ($charge->payment_method_details->type == 'sepa_debit') {
+				$type = $langs->trans("sepadebit");
+		    } elseif ($charge->payment_method_details->type == 'ideal') {
+				$type = $langs->trans("iDEAL");
+		    }
+
+		    // Why this ?
+	        /*if (! empty($charge->payment_intent)) {
+				if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+		    		$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
+				} else {
+					$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent, array("stripe_account" => $stripeacc));
+				}
+	        }*/
+
+			// The metadata FULLTAG is defined by the online payment page
+			$FULLTAG = $charge->metadata->FULLTAG;
+
+			// Save into $tmparray all metadata
+			$tmparray = dolExplodeIntoArray($FULLTAG, '.', '=');
+			// Load origin object according to metadata
+			if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0)
+			{
+				$societestatic->fetch($tmparray['CUS']);
+			} elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
+			{
+				$societestatic->fetch($charge->metadata->dol_thirdparty_id);
+			} else {
+				$societestatic->id = 0;
+			}
+			if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
+			{
+				$memberstatic->fetch($tmparray['MEM']);
+			} else {
+				$memberstatic->id = 0;
+			}
+
+			print '<tr class="oddeven">';
+
+	        if (!empty($stripeacc)) $connect = $stripeacc.'/';
+
+			// Ref
+			$url = 'https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
+	        if ($servicestatus)
+	        {
+	        	$url = 'https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
+	        }
+			print "<td>";
+	        print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$charge->id."</a>";
+	        if ($charge->payment_intent) print '<br><span class="opacitymedium">'.$charge->payment_intent.'</span>';
+			print "</td>\n";
+
+			// Stripe customer
+			print "<td>";
+	        if (!empty($conf->stripe->enabled) && !empty($stripeacc)) $connect = $stripeacc.'/';
+			$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$charge->customer;
+			if ($servicestatus)
+			{
+	            $url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
+			}
+			if (!empty($charge->customer))
+			{
+	    		print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'globe').' '.$charge->customer.'</a>';
+			}
+	        print "</td>\n";
+
+			// Link
+			print "<td>";
+			if ($societestatic->id > 0)
+			{
+				print $societestatic->getNomUrl(1);
+			} elseif ($memberstatic->id > 0)
+			{
+				print $memberstatic->getNomUrl(1);
+			}
+			print "</td>\n";
+
+			// Origin
+			print "<td>";
+			if ($charge->metadata->dol_type == "order" || $charge->metadata->dol_type == "commande") {
+				$object = new Commande($db);
+				$object->fetch($charge->metadata->dol_id);
+	            if ($object->id > 0) {
+	                print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
+	            } else {
+	                print $FULLTAG;
+	            }
+			} elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
+				print $charge->metadata->dol_type.' '.$charge->metadata->dol_id.' - ';
+				$object = new Facture($db);
+				$object->fetch($charge->metadata->dol_id);
+	            if ($object->id > 0) {
+			        print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
+	            } else {
+					print $FULLTAG;
+				}
+			} else {
+				print $FULLTAG;
+			}
+		    print "</td>\n";
+
+			// Date payment
+		    print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
+		    // Type
+		    print '<td>';
+			print $type;
+		    print '</td>';
+		    // Amount
+		    print '<td class="right">'.price(($charge->amount - $charge->amount_refunded) / 100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
+		    // Status
+		    print '<td class="right">';
+		    print $status;
+		    print "</td>\n";
+
+		    print "</tr>\n";
+
+		    $i++;
+		}
+
+		print '</table>';
+		print '</div>';
+		print '</form>';
+	} catch (Exception $e) {
+		print $e->getMessage();
 	}
 }
 
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index 33b19384085..a7a868f7e4a 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -75,9 +75,7 @@ class ActionsStripeconnect
 		{
 			$service = 'StripeTest';
 			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-		}
-		else
-		{
+		} else {
 			$service = 'StripeLive';
 		}
 
@@ -100,17 +98,15 @@ class ActionsStripeconnect
 			$this->resprints .= '</td></tr></table>';
 			$this->resprints .= '</td>';
 			$this->resprints .= '<td colspan="3">';
-			$stripe = new Stripe($db);
+			$stripe = new Stripe($this->db);
 			if ($stripe->getStripeAccount($service) && $object->client != 0) {
 				$customer = $stripe->customerStripe($object, $stripe->getStripeAccount($service));
 				$this->resprints .= $customer->id;
-			}
-			else {
+			} else {
 				$this->resprints .= $langs->trans("NoStripe");
 			}
 			$this->resprints .= '</td></tr>';
-		}
-		elseif (is_object($object) && $object->element == 'member') {
+		} elseif (is_object($object) && $object->element == 'member') {
 			$this->resprints .= '<tr><td>';
 			$this->resprints .= '<table width="100%" class="nobordernopadding"><tr><td>';
 			$this->resprints .= $langs->trans('StripeCustomer');
@@ -118,7 +114,7 @@ class ActionsStripeconnect
 			$this->resprints .= '</td></tr></table>';
 			$this->resprints .= '</td>';
 			$this->resprints .= '<td colspan="3">';
-			$stripe = new Stripe($db);
+			$stripe = new Stripe($this->db);
 			if ($stripe->getStripeAccount($service) && $object->fk_soc > 0) {
 				$object->fetch_thirdparty();
 				$customer = $stripe->customerStripe($object->thirdparty, $stripe->getStripeAccount($service));
@@ -135,7 +131,7 @@ class ActionsStripeconnect
 			$this->resprints .= '</td></tr></table>';
 			$this->resprints .= '</td>';
 			$this->resprints .= '<td colspan="3">';
-			$stripe = new Stripe($db);
+			$stripe = new Stripe($this->db);
 			if (7 == 4) {
 				$object->fetch_thirdparty();
 				$customer = $stripe->customerStripe($object, $stripe->getStripeAccount($service));
@@ -153,7 +149,7 @@ class ActionsStripeconnect
 			$this->resprints .= '</td></tr></table>';
 			$this->resprints .= '</td>';
 			$this->resprints .= '<td colspan="3">';
-			$stripe = new Stripe($db);
+			$stripe = new Stripe($this->db);
 			if (7 == 4) {
 				$object->fetch_thirdparty();
 				$customer = $stripe->customerStripe($object, $stripe->getStripeAccount($service));
@@ -183,50 +179,44 @@ class ActionsStripeconnect
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
 			$sql .= ' WHERE pf.fk_facture = '.$object->id;
 
-			$result = $db->query($sql);
+			$result = $this->db->query($sql);
 			if ($result) {
 				$i = 0;
-				$num = $db->num_rows($result);
+				$num = $this->db->num_rows($result);
 
 				while ($i < $num) {
-					$objp = $db->fetch_object($result);
+					$objp = $this->db->fetch_object($result);
 					$totalpaye += $objp->amount;
 					$i++;
 				}
 			} else {
-				dol_print_error($db, '');
+				dol_print_error($this->db, '');
 			}
 
 			$resteapayer = $object->total_ttc - $totalpaye;
 			// Request a direct debit order
 			if ($object->statut > Facture::STATUS_DRAFT && $object->statut < Facture::STATUS_ABANDONED && $object->paye == 0)
 			{
-				$stripe = new Stripe($db);
+				$stripe = new Stripe($this->db);
 				if ($resteapayer > 0)
 				{
 					if ($stripe->getStripeAccount($conf->entity))  // a modifier avec droit stripe
 					{
 						$langs->load("withdrawals");
 						print '<a class="butActionDelete" href="'.dol_buildpath('/stripeconnect/payment.php?facid='.$object->id.'&action=create', 1).'" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
-					}
-					else
-					{
+					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 					}
-				}
-				elseif ($resteapayer == 0)
+				} elseif ($resteapayer == 0)
 				{
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 				}
-			}
-			else {
+			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("StripeConnectPay").'</a>';
 			}
-		}
-		elseif (is_object($object) && $object->element == 'invoice_supplier') {
+		} elseif (is_object($object) && $object->element == 'invoice_supplier') {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("StripeConnectPay")).'">'.$langs->trans("StripeConnectPay").'</a>';
-		}
-		elseif (is_object($object) && $object->element == 'member') {
+		} elseif (is_object($object) && $object->element == 'member') {
 			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 83b3905de43..a710f092b89 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -36,11 +36,11 @@ class Stripe extends CommonObject
 	/**
 	 * @var int Thirdparty ID
 	 */
-    public $fk_soc;
+	public $fk_soc;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_key;
 
 	/**
@@ -62,9 +62,9 @@ class Stripe extends CommonObject
 	public $code;
 	public $declinecode;
 
-    /**
-     * @var string Message
-     */
+	/**
+	 * @var string Message
+	 */
 	public $message;
 
 	/**
@@ -105,22 +105,21 @@ class Stripe extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-    	if ($result) {
+		if ($result) {
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
-    			$tokenstring = $obj->tokenstring;
+				$tokenstring = $obj->tokenstring;
 
-    			$tmparray = dol_json_decode($tokenstring);
-    			$key = $tmparray->stripe_user_id;
-    		} else {
-    			$tokenstring = '';
-    		}
-    	}
-    	else {
-    		dol_print_error($this->db);
-    	}
+				$tmparray = dol_json_decode($tokenstring);
+				$key = $tmparray->stripe_user_id;
+			} else {
+				$tokenstring = '';
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-    	dol_syslog("No dedicated Stripe Connect account available for entity ".$conf->entity);
+		dol_syslog("No dedicated Stripe Connect account available for entity ".$conf->entity);
 		return $key;
 	}
 
@@ -191,16 +190,14 @@ class Stripe extends CommonObject
 					} else {
 						$customer = \Stripe\Customer::retrieve("$tiers", array("stripe_account" => $key));
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					// For exemple, we may have error: 'No such customer: cus_XXXXX; a similar object exists in live mode, but a test mode key was used to make this request.'
 					$this->error = $e->getMessage();
 				}
-			}
-			elseif ($createifnotlinkedtostripe)
+			} elseif ($createifnotlinkedtostripe)
 			{
-			    $ipaddress = getUserRemoteIP();
+				$ipaddress = getUserRemoteIP();
 
 				$dataforcustomer = array(
 					"email" => $object->email,
@@ -256,15 +253,12 @@ class Stripe extends CommonObject
 					{
 						$this->error = $this->db->lasterror();
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					$this->error = $e->getMessage();
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -292,8 +286,7 @@ class Stripe extends CommonObject
 			} else {
 				$stripepaymentmethod = \Stripe\PaymentMethod::retrieve(''.$paymentmethod->id.'', array("stripe_account" => $key));
 			}
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			$this->error = $e->getMessage();
 		}
@@ -301,11 +294,11 @@ class Stripe extends CommonObject
 		return $stripepaymentmethod;
 	}
 
-    /**
+	/**
 	 * Get the Stripe payment intent. Create it with confirmnow=false
-     * Warning. If a payment was tried and failed, a payment intent was created.
-	 * But if we change something on object to pay (amount or other), reusing same payment intent is not allowed.
-	 * Recommanded solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay),
+	 * Warning. If a payment was tried and failed, a payment intent was created.
+	 * But if we change something on object to pay (amount or other), reusing same payment intent is not allowed by Stripe.
+	 * Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay),
 	 * that's why i comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
 	 * Note: This is used when option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on when making a payment from the public/payment/newpayment.php page
 	 * but not when using the STRIPE_USE_NEW_CHECKOUT.
@@ -343,9 +336,9 @@ class Stripe extends CommonObject
 
 		$fee = $amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE;
 		if ($fee >= $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL && $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL > $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-		    $fee = $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL;
+			$fee = $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL;
 		} elseif ($fee < $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-		    $fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
+			$fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
 		}
 		if (!in_array($currency_code, $arrayzerounitcurrency)) {
 			$stripefee = round($fee * 100);
@@ -355,177 +348,176 @@ class Stripe extends CommonObject
 
 		$paymentintent = null;
 
-		if (is_object($object))
+		if (is_object($object) && !empty($conf->global->STRIPE_REUSE_EXISTING_INTENT_IF_FOUND))
 		{
 			// Warning. If a payment was tried and failed, a payment intent was created.
-			// But if we change someting on object to pay (amount or other that does not change the idempotency key), reusing same payment intent is not allowed.
-			// Recommanded solution is to recreate a new payment intent each time we need one (old one will be automatically closed after a delay), Stripe will
+			// But if we change something on object to pay (amount or other that does not change the idempotency key), reusing same payment intent is not allowed by Stripe.
+			// Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed by Stripe after a delay), Stripe will
 			// automatically return the existing payment intent if idempotency is provided when we try to create the new one.
 			// That's why we can comment the part of code to retreive a payment intent with object id (never mind if we cumulate payment intent with old ones that will not be used)
-			/*
+
 			$sql = "SELECT pi.ext_payment_id, pi.entity, pi.fk_facture, pi.sourcetype, pi.ext_payment_site";
-    		$sql.= " FROM " . MAIN_DB_PREFIX . "prelevement_facture_demande as pi";
-    		$sql.= " WHERE pi.fk_facture = " . $object->id;
-    		$sql.= " AND pi.sourcetype = '" . $object->element . "'";
-    		$sql.= " AND pi.entity IN (".getEntity('societe').")";
-    		$sql.= " AND pi.ext_payment_site = '" . $service . "'";
+			$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pi";
+			$sql .= " WHERE pi.fk_facture = ".$object->id;
+			$sql .= " AND pi.sourcetype = '".$this->db->escape($object->element)."'";
+			$sql .= " AND pi.entity IN (".getEntity('societe').")";
+			$sql .= " AND pi.ext_payment_site = '".$this->db->escape($service)."'";
 
-    		dol_syslog(get_class($this) . "::getPaymentIntent search stripe payment intent for object id = ".$object->id, LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-    		if ($resql) {
-    			$num = $this->db->num_rows($resql);
-    			if ($num)
-    			{
-    				$obj = $this->db->fetch_object($resql);
-    				$intent = $obj->ext_payment_id;
+			dol_syslog(get_class($this)."::getPaymentIntent search stripe payment intent for object id = ".$object->id, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$num = $this->db->num_rows($resql);
+				if ($num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					$intent = $obj->ext_payment_id;
 
-    				dol_syslog(get_class($this) . "::getPaymentIntent found existing payment intent record");
+					dol_syslog(get_class($this)."::getPaymentIntent found existing payment intent record");
 
-    				// Force to use the correct API key
-    				global $stripearrayofkeysbyenv;
-    				\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
+					// Force to use the correct API key
+					global $stripearrayofkeysbyenv;
+					\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
 
-    				try {
-    					if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
-    						$paymentintent = \Stripe\PaymentIntent::retrieve($intent);
-    					} else {
-    						$paymentintent = \Stripe\PaymentIntent::retrieve($intent, array("stripe_account" => $key));
-    					}
-    				}
-    				catch(Exception $e)
-    				{
-    				    $error++;
-    					$this->error = $e->getMessage();
-    				}
-    			}
-    		}*/
+					try {
+						if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
+							$paymentintent = \Stripe\PaymentIntent::retrieve($intent);
+						} else {
+							$paymentintent = \Stripe\PaymentIntent::retrieve($intent, array("stripe_account" => $key));
+						}
+					}
+					catch (Exception $e) {
+						$error++;
+						$this->error = $e->getMessage();
+					}
+				}
+			}
 		}
 
 		if (empty($paymentintent))
 		{
-    		$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;
 				if (is_object($object->thirdparty) && $object->thirdparty->id > 0) $metadata['dol_thirdparty_id'] = $object->thirdparty->id;
-            }
+			}
 
-    		$dataforintent = array(
-    		    "confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
-    		    "confirmation_method" => $mode,
-    		    "amount" => $stripeamount,
-    			"currency" => $currency_code,
-    		    "payment_method_types" => array("card"),
-    		    "description" => $description,
-    		    "statement_descriptor_suffix" => dol_trunc($tag, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
-    			//"save_payment_method" => true,
+			// list of payment method types
+			$paymentmethodtypes = array("card");
+			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) $paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
+			if (!empty($conf->global->STRIPE_IDEAL)) $paymentmethodtypes[] = "ideal"; //&& ($object->thirdparty->isInEEC())
+
+			$dataforintent = array(
+				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
+				"confirmation_method" => $mode,
+				"amount" => $stripeamount,
+				"currency" => $currency_code,
+				"payment_method_types" => $paymentmethodtypes,
+				"description" => $description,
+				"statement_descriptor_suffix" => dol_trunc($tag, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+				//"save_payment_method" => true,
 				"setup_future_usage" => "on_session",
-    			"metadata" => $metadata
-    		);
-    		if (!is_null($customer)) $dataforintent["customer"] = $customer;
-    		// payment_method =
-    		// payment_method_types = array('card')
-            //var_dump($dataforintent);
-    		if ($off_session)
-    		{
-    		    unset($dataforintent['setup_future_usage']);
-    		    $dataforintent["off_session"] = true;
-    		}
-    		if (!is_null($payment_method))
-    		{
-    			$dataforintent["payment_method"] = $payment_method;
-    			$description .= ' - '.$payment_method;
-    		}
+				"metadata" => $metadata
+			);
+			if (!is_null($customer)) $dataforintent["customer"] = $customer;
+			// payment_method =
+			// payment_method_types = array('card')
+			//var_dump($dataforintent);
+			if ($off_session)
+			{
+				unset($dataforintent['setup_future_usage']);
+				$dataforintent["off_session"] = true;
+			}
+			if (!is_null($payment_method))
+			{
+				$dataforintent["payment_method"] = $payment_method;
+				$description .= ' - '.$payment_method;
+			}
 
-    		if ($conf->entity != $conf->global->STRIPECONNECT_PRINCIPAL && $stripefee > 0)
-    		{
-    			$dataforintent["application_fee_amount"] = $stripefee;
-    		}
-    		if ($usethirdpartyemailforreceiptemail && is_object($object) && $object->thirdparty->email)
-    		{
-    		    $dataforintent["receipt_email"] = $object->thirdparty->email;
-    		}
+			if ($conf->entity != $conf->global->STRIPECONNECT_PRINCIPAL && $stripefee > 0)
+			{
+				$dataforintent["application_fee_amount"] = $stripefee;
+			}
+			if ($usethirdpartyemailforreceiptemail && is_object($object) && $object->thirdparty->email)
+			{
+				$dataforintent["receipt_email"] = $object->thirdparty->email;
+			}
 
-    		try {
-    			// Force to use the correct API key
-    			global $stripearrayofkeysbyenv;
-    			\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
+			try {
+				// Force to use the correct API key
+				global $stripearrayofkeysbyenv;
+				\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
 
-    			$arrayofoptions = array();
-    			if (empty($noidempotency_key)) {
-    				$arrayofoptions["idempotency_key"] = $description;
-    			}
-    			// Note: If all data for payment intent are same than a previous on, even if we use 'create', Stripe will return ID of the old existing payment intent.
-    			if (!empty($key)) {				// If the Stripe connect account not set, we use common API usage
-    				$arrayofoptions["stripe_account"] = $key;
-    			}
-    			$paymentintent = \Stripe\PaymentIntent::create($dataforintent, $arrayofoptions);
+				$arrayofoptions = array();
+				if (empty($noidempotency_key)) {
+					$arrayofoptions["idempotency_key"] = $description;
+				}
+				// Note: If all data for payment intent are same than a previous on, even if we use 'create', Stripe will return ID of the old existing payment intent.
+				if (!empty($key)) {				// If the Stripe connect account not set, we use common API usage
+					$arrayofoptions["stripe_account"] = $key;
+				}
+				$paymentintent = \Stripe\PaymentIntent::create($dataforintent, $arrayofoptions);
 
-    			// Store the payment intent
-    			if (is_object($object))
-    			{
-    				$paymentintentalreadyexists = 0;
-    				// Check that payment intent $paymentintent->id is not already recorded.
-    				$sql = "SELECT pi.rowid";
-    				$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pi";
-    				$sql .= " WHERE pi.entity IN (".getEntity('societe').")";
-    				$sql .= " AND pi.ext_payment_site = '".$service."'";
-    				$sql .= " AND pi.ext_payment_id = '".$this->db->escape($paymentintent->id)."'";
+				// Store the payment intent
+				if (is_object($object))
+				{
+					$paymentintentalreadyexists = 0;
+					// Check that payment intent $paymentintent->id is not already recorded.
+					$sql = "SELECT pi.rowid";
+					$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pi";
+					$sql .= " WHERE pi.entity IN (".getEntity('societe').")";
+					$sql .= " AND pi.ext_payment_site = '".$this->db->escape($service)."'";
+					$sql .= " AND pi.ext_payment_id = '".$this->db->escape($paymentintent->id)."'";
 
-    				dol_syslog(get_class($this)."::getPaymentIntent search if payment intent already in prelevement_facture_demande", LOG_DEBUG);
-    				$resql = $this->db->query($sql);
-    				if ($resql) {
-    					$num = $this->db->num_rows($resql);
-    					if ($num)
-    					{
-    						$obj = $this->db->fetch_object($resql);
-    						if ($obj) $paymentintentalreadyexists++;
-    					}
-    				}
-    				else dol_print_error($this->db);
+					dol_syslog(get_class($this)."::getPaymentIntent search if payment intent already in prelevement_facture_demande", LOG_DEBUG);
+					$resql = $this->db->query($sql);
+					if ($resql) {
+						$num = $this->db->num_rows($resql);
+						if ($num)
+						{
+							$obj = $this->db->fetch_object($resql);
+							if ($obj) $paymentintentalreadyexists++;
+						}
+					} else dol_print_error($this->db);
 
-    				// If not, we create it.
-    				if (!$paymentintentalreadyexists)
-    				{
-	    				$now = dol_now();
-	    				$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_facture_demande (date_demande, fk_user_demande, ext_payment_id, fk_facture, sourcetype, entity, ext_payment_site, amount)";
-	    				$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", '".$this->db->escape($paymentintent->id)."', ".$object->id.", '".$this->db->escape($object->element)."', ".$conf->entity.", '".$service."', ".$amount.")";
-	    				$resql = $this->db->query($sql);
-	    				if (!$resql)
-	    				{
-	    				    $error++;
-	    					$this->error = $this->db->lasterror();
-	                        dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.");
-	    				}
-    				}
-    			}
-    			else
-    			{
-    			    $_SESSION["stripe_payment_intent"] = $paymentintent;
-    			}
-    		}
-    		catch (Stripe\Error\Card $e)
-    		{
-    			$error++;
-    			$this->error = $e->getMessage();
-    			$this->code = $e->getStripeCode();
-    			$this->declinecode = $e->getDeclineCode();
-    		}
-    		catch (Exception $e)
-    		{
-    		    /*var_dump($dataforintent);
+					// If not, we create it.
+					if (!$paymentintentalreadyexists)
+					{
+						$now = dol_now();
+						$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_facture_demande (date_demande, fk_user_demande, ext_payment_id, fk_facture, sourcetype, entity, ext_payment_site, amount)";
+						$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", '".$this->db->escape($paymentintent->id)."', ".$object->id.", '".$this->db->escape($object->element)."', ".$conf->entity.", '".$this->db->escape($service)."', ".$amount.")";
+						$resql = $this->db->query($sql);
+						if (!$resql)
+						{
+							$error++;
+							$this->error = $this->db->lasterror();
+							dol_syslog(get_class($this)."::PaymentIntent failed to insert paymentintent with id=".$paymentintent->id." into database.");
+						}
+					}
+				} else {
+					$_SESSION["stripe_payment_intent"] = $paymentintent;
+				}
+			} catch (Stripe\Error\Card $e)
+			{
+				$error++;
+				$this->error = $e->getMessage();
+				$this->code = $e->getStripeCode();
+				$this->declinecode = $e->getDeclineCode();
+			} catch (Exception $e)
+			{
+				/*var_dump($dataforintent);
     		    var_dump($description);
     		    var_dump($key);
     		    var_dump($paymentintent);
     		    var_dump($e->getMessage());
     		    var_dump($e);*/
-    		    $error++;
-    			$this->error = $e->getMessage();
-    			$this->code = '';
-    			$this->declinecode = '';
-    		}
+				$error++;
+				$this->error = $e->getMessage();
+				$this->code = '';
+				$this->declinecode = '';
+			}
 		}
 
 		dol_syslog("getPaymentIntent return error=".$error." this->error=".$this->error, LOG_INFO, -1);
@@ -533,9 +525,7 @@ class Stripe extends CommonObject
 		if (!$error)
 		{
 			return $paymentintent;
-		}
-		else
-		{
+		} else {
 			return null;
 		}
 	}
@@ -583,14 +573,19 @@ class Stripe extends CommonObject
 				if (is_object($object->thirdparty) && $object->thirdparty->id > 0) $metadata['dol_thirdparty_id'] = $object->thirdparty->id;
 			}
 
+			// list of payment method types
+			$paymentmethodtypes = array("card");
+			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) $paymentmethodtypes[] = "sepa_debit"; //&& ($object->thirdparty->isInEEC())
+			// iDEAL not supported with setupIntent
+
 			$dataforintent = array(
 				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
-				"payment_method_types" => array("card"),
-				"description" => $description,
+				"payment_method_types" => $paymentmethodtypes,
 				"usage" => "off_session",
 				"metadata" => $metadata
 			);
 			if (!is_null($customer)) $dataforintent["customer"] = $customer;
+			if (!is_null($description)) $dataforintent["description"] = $description;
 			// payment_method =
 			// payment_method_types = array('card')
 			//var_dump($dataforintent);
@@ -625,7 +620,7 @@ class Stripe extends CommonObject
 					$sql = "SELECT pi.rowid";
 					$sql.= " FROM " . MAIN_DB_PREFIX . "prelevement_facture_demande as pi";
 					$sql.= " WHERE pi.entity IN (".getEntity('societe').")";
-					$sql.= " AND pi.ext_payment_site = '" . $service . "'";
+					$sql.= " AND pi.ext_payment_site = '" . $this->db->escape($service) . "'";
 					$sql.= " AND pi.ext_payment_id = '".$this->db->escape($setupintent->id)."'";
 
 					dol_syslog(get_class($this) . "::getPaymentIntent search if payment intent already in prelevement_facture_demande", LOG_DEBUG);
@@ -645,7 +640,7 @@ class Stripe extends CommonObject
 					{
 						$now=dol_now();
 						$sql = "INSERT INTO " . MAIN_DB_PREFIX . "prelevement_facture_demande (date_demande, fk_user_demande, ext_payment_id, fk_facture, sourcetype, entity, ext_payment_site)";
-						$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", '".$this->db->escape($setupintent->id)."', ".$object->id.", '".$this->db->escape($object->element)."', " . $conf->entity . ", '" . $service . "', ".$amount.")";
+						$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", '".$this->db->escape($setupintent->id)."', ".$object->id.", '".$this->db->escape($object->element)."', " . $conf->entity . ", '" . $this->db->escape($service) . "', ".$amount.")";
 						$resql = $this->db->query($sql);
 						if (! $resql)
 						{
@@ -659,8 +654,7 @@ class Stripe extends CommonObject
 				{
 					$_SESSION["stripe_setup_intent"] = $setupintent;
 				}*/
-			}
-			catch (Exception $e)
+			} catch (Exception $e)
 			{
 				/*var_dump($dataforintent);
 				 var_dump($description);
@@ -676,9 +670,7 @@ class Stripe extends CommonObject
 		{
 			dol_syslog("getSetupIntent ".(is_object($setupintent) ? $setupintent->id : ''), LOG_INFO, -1);
 			return $setupintent;
-		}
-		else
-		{
+		} else {
 			dol_syslog("getSetupIntent return error=".$error, LOG_INFO, -1);
 			return null;
 		}
@@ -722,9 +714,7 @@ class Stripe extends CommonObject
 							if (!preg_match('/^pm_/', $cardref))
 							{
 								$card = $cu->sources->retrieve($cardref);
-							}
-							else
-							{
+							} else {
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						} else {
@@ -732,20 +722,17 @@ class Stripe extends CommonObject
 							{
 								//$card = $cu->sources->retrieve($cardref, array("stripe_account" => $stripeacc));		// this API fails when array stripe_account is provided
 								$card = $cu->sources->retrieve($cardref);
-							}
-							else {
+							} else {
 								//$card = \Stripe\PaymentMethod::retrieve($cardref, array("stripe_account" => $stripeacc));		// Don't know if this works
 								$card = \Stripe\PaymentMethod::retrieve($cardref);
 							}
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
-				}
-				elseif ($createifnotlinkedtostripe)
+				} elseif ($createifnotlinkedtostripe)
 				{
 					$exp_date_month = $obj->exp_date_month;
 					$exp_date_year = $obj->exp_date_year;
@@ -770,9 +757,7 @@ class Stripe extends CommonObject
 								{
 									$this->error = 'Creation of card on Stripe has failed';
 								}
-							}
-							else
-							{
+							} else {
 								$connect = '';
 								if (!empty($stripeacc)) $connect = $stripeacc.'/';
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -794,9 +779,7 @@ class Stripe extends CommonObject
 								{
 									$this->error = 'Creation of card on Stripe has failed';
 								}
-							}
-							else
-							{
+							} else {
 								$connect = '';
 								if (!empty($stripeacc)) $connect = $stripeacc.'/';
 								$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$cu->id;
@@ -825,17 +808,14 @@ class Stripe extends CommonObject
 								$this->error = $this->db->lasterror();
 							}
 						}
-					}
-					catch (Exception $e)
+					} catch (Exception $e)
 					{
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}
 				}
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 
@@ -945,9 +925,7 @@ class Stripe extends CommonObject
 					if ($paymentintent->status == 'succeeded')
 					{
 						$charge->status = 'ok';
-					}
-					else
-					{
+					} else {
 						$charge->status = 'failed';
 						$charge->failure_code = $stripe->code;
 						$charge->failure_message = $stripe->error;
@@ -956,13 +934,12 @@ class Stripe extends CommonObject
 						$stripefailuremessage = $stripe->error;
 						$stripefailuredeclinecode = $stripe->declinecode;
 					}
-				}
-				elseif (preg_match('/acct_/i', $source))
+				} elseif (preg_match('/acct_/i', $source))
 				{
-                    $charge = \Stripe\Charge::create(array(
+					$charge = \Stripe\Charge::create(array(
 						"amount" => "$stripeamount",
 						"currency" => "$currency",
-                        "statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+						"statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
 						"description" => "Stripe payment: ".$description,
 						"capture"  => $capture,
 						"metadata" => $metadata,
@@ -972,7 +949,7 @@ class Stripe extends CommonObject
 					$paymentarray = array(
 						"amount" => "$stripeamount",
 						"currency" => "$currency",
-					    "statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
+						"statement_descriptor_suffix" => dol_trunc($description, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
 						"description" => "Stripe payment: ".$description,
 						"capture"  => $capture,
 						"metadata" => $metadata,
@@ -991,9 +968,9 @@ class Stripe extends CommonObject
 				// With Stripe Connect
 				$fee = $amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE;
 				if ($fee >= $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL && $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL > $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-				    $fee = $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL;
+					$fee = $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL;
 				} elseif ($fee < $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-				    $fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
+					$fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
 				}
 
 				if (!in_array($currency, $arrayzerounitcurrency)) $stripefee = round($fee * 100);
@@ -1040,17 +1017,13 @@ class Stripe extends CommonObject
 					{
 						$charge->status = 'ok';
 						$charge->id = $paymentintent->id;
-					}
-					else
-					{
+					} else {
 						$charge->status = 'failed';
 						$charge->failure_code = $stripe->code;
 						$charge->failure_message = $stripe->error;
 						$charge->failure_declinecode = $stripe->declinecode;
 					}
-				}
-				else
-				{
+				} else {
 					$charge = \Stripe\Charge::create($paymentarray, array("idempotency_key" => "$description", "stripe_account" => "$account"));
 				}
 			}
@@ -1062,9 +1035,7 @@ class Stripe extends CommonObject
 			if (preg_match('/pm_/i', $source))
 			{
 				$return->message = 'Payment retreived by card status = '.$charge->status;
-			}
-			else
-			{
+			} else {
 				if ($charge->source->type == 'card') {
 					$return->message = $charge->source->card->brand." ....".$charge->source->card->last4;
 				} elseif ($charge->source->type == 'three_d_secure') {
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index 730203245f4..e6dc75c04ec 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -47,9 +47,7 @@ $stripearrayofkeys = array();
 if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
 {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[0]; // Test
-}
-else
-{
+} else {
 	$stripearrayofkeys = $stripearrayofkeysbyenv[1]; // Live
 }
 
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 17f2423327f..6cc093417ad 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -64,9 +64,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else
-{
+} else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -111,113 +109,115 @@ if (!$rowid) {
 
 	print "</tr>\n";
 
-	if ($stripeacc)
-	{
-		$payout = \Stripe\Payout::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
-	}
-	else
-	{
-		$payout = \Stripe\Payout::all(array("limit" => $limit));
-	}
-
-	foreach ($payout->data as $payout)
-	{
-		//$charge = $payout;
-		//var_dump($payout);
-
-		// The metadata FULLTAG is defined by the online payment page
-		/*$FULLTAG=$charge->metadata->FULLTAG;
-
-		// Save into $tmparray all metadata
-		$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
-		// Load origin object according to metadata
-		if (! empty($tmparray['CUS']))
+	try {
+		if ($stripeacc)
 		{
-			$societestatic->fetch($tmparray['CUS']);
-		}
-		else
-		{
-			$societestatic->id = 0;
-		}
-		if (! empty($tmparray['MEM']))
-		{
-			$memberstatic->fetch($tmparray['MEM']);
-		}
-		else
-		{
-			$memberstatic->id = 0;
-		}*/
-
-		$societestatic->fetch($charge->metadata->idcustomer);
-		$societestatic->id = $charge->metadata->idcustomer;
-		$societestatic->lastname = $obj->lastname;
-		$societestatic->firstname = $obj->firstname;
-		$societestatic->admin = $obj->admin;
-		$societestatic->login = $obj->login;
-		$societestatic->email = $obj->email;
-		$societestatic->socid = $obj->fk_soc;
-
-		print '<tr class="oddeven">';
-
-		// Ref
-        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;
+			$payout = \Stripe\Payout::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
+		} else {
+			$payout = \Stripe\Payout::all(array("limit" => $limit));
 		}
 
-        print "<td><a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$payout->id."</a></td>\n";
+		foreach ($payout->data as $payout)
+		{
+			//$charge = $payout;
+			//var_dump($payout);
+
+			// The metadata FULLTAG is defined by the online payment page
+			/*$FULLTAG=$charge->metadata->FULLTAG;
+
+			// Save into $tmparray all metadata
+			$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
+			// Load origin object according to metadata
+			if (! empty($tmparray['CUS']))
+			{
+				$societestatic->fetch($tmparray['CUS']);
+			}
+			else
+			{
+				$societestatic->id = 0;
+			}
+			if (! empty($tmparray['MEM']))
+			{
+				$memberstatic->fetch($tmparray['MEM']);
+			}
+			else
+			{
+				$memberstatic->id = 0;
+			}*/
+
+			$societestatic->fetch($charge->metadata->idcustomer);
+			$societestatic->id = $charge->metadata->idcustomer;
+			$societestatic->lastname = $obj->lastname;
+			$societestatic->firstname = $obj->firstname;
+			$societestatic->admin = $obj->admin;
+			$societestatic->login = $obj->login;
+			$societestatic->email = $obj->email;
+			$societestatic->socid = $obj->fk_soc;
+
+			print '<tr class="oddeven">';
+
+			// Ref
+	        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";
 
 
-		// Stripe customer
-		//print "<td>".$charge->customer."</td>\n";
-		// Link
-		/*print "<td>";
-		if ($societestatic->id > 0)
-		{
-			print $societestatic->getNomUrl(1);
+			// Stripe customer
+			//print "<td>".$charge->customer."</td>\n";
+			// Link
+			/*print "<td>";
+			if ($societestatic->id > 0)
+			{
+				print $societestatic->getNomUrl(1);
+			}
+			if ($memberstatic->id > 0)
+			{
+				print $memberstatic->getNomUrl(1);
+			}
+			print "</td>\n";*/
+			// Origine
+			//print "<td>";
+			////if ($charge->metadata->dol_type=="order"){
+			//	$object = new Commande($db);
+			//	$object->fetch($charge->metadata->dol_id);
+			//	print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
+			//} elseif ($charge->metadata->dol_type=="invoice"){
+			//	$object = new Facture($db);
+			//	$object->fetch($charge->metadata->dol_id);
+			//	print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
+			//}
+			//print "</td>\n";
+			// Date payment
+			print '<td class="center">'.dol_print_date($payout->created, '%d/%m/%Y %H:%M')."</td>\n";
+	        // 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>';
+			// Amount
+			print '<td class="right">'.price(($payout->amount) / 100, 0, '', 1, -1, -1, strtoupper($payout->currency))."</td>";
+			// 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 '</td>';
+			print "</tr>\n";
 		}
-		if ($memberstatic->id > 0)
-		{
-			print $memberstatic->getNomUrl(1);
-		}
-		print "</td>\n";*/
-		// Origine
-		//print "<td>";
-		////if ($charge->metadata->dol_type=="order"){
-		//	$object = new Commande($db);
-		//	$object->fetch($charge->metadata->dol_id);
-		//	print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
-		//} elseif ($charge->metadata->dol_type=="invoice"){
-		//	$object = new Facture($db);
-		//	$object->fetch($charge->metadata->dol_id);
-		//	print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
-		//}
-		//print "</td>\n";
-		// Date payment
-		print '<td class="center">'.dol_print_date($payout->created, '%d/%m/%Y %H:%M')."</td>\n";
-        // 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>';
-		// Amount
-		print '<td class="right">'.price(($payout->amount) / 100, 0, '', 1, -1, -1, strtoupper($payout->currency))."</td>";
-		// 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 '</td>';
-		print "</tr>\n";
+	} catch (Exception $e) {
+		print '<tr><td colspan="6">'.$e->getMessage().'</td></td>';
 	}
 	print "</table>";
 	print '</div>';
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 3829eba4d0d..cd75fec476c 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -65,9 +65,7 @@ if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETP
 	$service = 'StripeTest';
 	$servicestatus = '0';
 	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
-}
-else
-{
+} else {
 	$service = 'StripeLive';
 	$servicestatus = '1';
 }
@@ -110,119 +108,121 @@ if (!$rowid) {
 
 	print "</tr>\n";
 
-	if ($stripeacc)
-	{
-		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
-	}
-	else
-	{
-		$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
-	}
-
-	foreach ($txn->data as $txn)
-	{
-		//$charge = $txn;
-		//var_dump($txn);
-
-		// The metadata FULLTAG is defined by the online payment page
-		/*$FULLTAG=$charge->metadata->FULLTAG;
-
-		// Save into $tmparray all metadata
-		$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
-		// Load origin object according to metadata
-		if (! empty($tmparray['CUS']))
+	try {
+		if ($stripeacc)
 		{
-			$societestatic->fetch($tmparray['CUS']);
+			$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc));
+		} else {
+			$txn = \Stripe\BalanceTransaction::all(array("limit" => $limit));
 		}
-		else
+
+		foreach ($txn->data as $txn)
 		{
-			$societestatic->id = 0;
+			//$charge = $txn;
+			//var_dump($txn);
+
+			// The metadata FULLTAG is defined by the online payment page
+			/*$FULLTAG=$charge->metadata->FULLTAG;
+
+			// Save into $tmparray all metadata
+			$tmparray = dolExplodeIntoArray($FULLTAG,'.','=');
+			// Load origin object according to metadata
+			if (! empty($tmparray['CUS']))
+			{
+				$societestatic->fetch($tmparray['CUS']);
+			}
+			else
+			{
+				$societestatic->id = 0;
+			}
+			if (! empty($tmparray['MEM']))
+			{
+				$memberstatic->fetch($tmparray['MEM']);
+			}
+			else
+			{
+				$memberstatic->id = 0;
+			}*/
+
+			$societestatic->fetch($charge->metadata->idcustomer);
+			$societestatic->id = $charge->metadata->idcustomer;
+			$societestatic->lastname = $obj->lastname;
+			$societestatic->firstname = $obj->firstname;
+			$societestatic->admin = $obj->admin;
+			$societestatic->login = $obj->login;
+			$societestatic->email = $obj->email;
+			$societestatic->societe_id = $obj->fk_soc;
+
+			print '<tr class="oddeven">';
+
+			// Ref
+	        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";
+	        }
+
+			$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";
+	        }
+
+			// Stripe customer
+			//print "<td>".$charge->customer."</td>\n";
+			// Link
+			/*print "<td>";
+			if ($societestatic->id > 0)
+			{
+				print $societestatic->getNomUrl(1);
+			}
+			if ($memberstatic->id > 0)
+			{
+				print $memberstatic->getNomUrl(1);
+			}
+			print "</td>\n";*/
+			// Origine
+			//print "<td>";
+			////if ($charge->metadata->dol_type=="order"){
+			//	$object = new Commande($db);
+			//	$object->fetch($charge->metadata->dol_id);
+			//	print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
+			//} elseif ($charge->metadata->dol_type=="invoice"){
+			//	$object = new Facture($db);
+			//	$object->fetch($charge->metadata->dol_id);
+			//	print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
+			//}
+			//print "</td>\n";
+			// Date payment
+			print '<td class="center">'.dol_print_date($txn->created, '%d/%m/%Y %H:%M')."</td>\n";
+			// Type
+			print '<td>'.$txn->type.'</td>';
+			// Amount
+			print '<td class="right">'.price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</td>";
+			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');
+	        }
+			print '</td>';
+			print "</tr>\n";
 		}
-		if (! empty($tmparray['MEM']))
-		{
-			$memberstatic->fetch($tmparray['MEM']);
-		}
-		else
-		{
-			$memberstatic->id = 0;
-		}*/
-
-		$societestatic->fetch($charge->metadata->idcustomer);
-		$societestatic->id = $charge->metadata->idcustomer;
-		$societestatic->lastname = $obj->lastname;
-		$societestatic->firstname = $obj->firstname;
-		$societestatic->admin = $obj->admin;
-		$societestatic->login = $obj->login;
-		$societestatic->email = $obj->email;
-		$societestatic->societe_id = $obj->fk_soc;
-
-		print '<tr class="oddeven">';
-
-		// Ref
-        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";
-        }
-
-		$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";
-        }
-
-		// Stripe customer
-		//print "<td>".$charge->customer."</td>\n";
-		// Link
-		/*print "<td>";
-		if ($societestatic->id > 0)
-		{
-			print $societestatic->getNomUrl(1);
-		}
-		if ($memberstatic->id > 0)
-		{
-			print $memberstatic->getNomUrl(1);
-		}
-		print "</td>\n";*/
-		// Origine
-		//print "<td>";
-		////if ($charge->metadata->dol_type=="order"){
-		//	$object = new Commande($db);
-		//	$object->fetch($charge->metadata->dol_id);
-		//	print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$charge->metadata->dol_id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
-		//} elseif ($charge->metadata->dol_type=="invoice"){
-		//	$object = new Facture($db);
-		//	$object->fetch($charge->metadata->dol_id);
-		//	print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
-		//}
-		//print "</td>\n";
-		// Date payment
-		print '<td class="center">'.dol_print_date($txn->created, '%d/%m/%Y %H:%M')."</td>\n";
-		// Type
-		print '<td>'.$txn->type.'</td>';
-		// Amount
-		print '<td class="right">'.price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</td>";
-		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');
-        }
-		print '</td>';
-		print "</tr>\n";
+	} catch (Exception $e) {
+		print '<tr><td colspan="6">'.$e->getMessage().'</td></td>';
 	}
 	print "</table>";
 	print '</div>';
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 132820e8e09..61077e2c5bd 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -33,7 +33,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'supplier_proposal'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 73ba689f47a..08f17504de9 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -40,7 +40,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 
 $elementtype = 'supplier_proposaldet'; //Must be the $table_element of the class that manage extrafield
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 08479b95871..1190b29aa3c 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -58,7 +58,7 @@ $error = 0;
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $origin = GETPOST('origin', 'alpha');
 $originid = GETPOST('originid', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -96,9 +96,23 @@ if ($id > 0 || !empty($ref)) {
 		dol_print_error('', $object->error);
 }
 
-$permissionnote = $user->rights->supplier_proposal->creer; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->supplier_proposal->creer; // Used by the include of actions_dellink.inc.php
-$permissiontoedit = $user->rights->supplier_proposal->creer; // Used by the include of actions_lineupdown.inc.php
+// Common permissions
+$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);
+
+// Additional area permissions
+$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
 
 
 /*
@@ -133,17 +147,13 @@ if (empty($reshook))
 		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 		{
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			if ($object->id > 0) {
 				$result = $object->createFromClone($user, $socid);
 				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = '';
 				}
@@ -152,7 +162,7 @@ if (empty($reshook))
 	}
 
 	// Delete askprice
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->supplier_proposal->supprimer)
+	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
 	{
 		$result = $object->delete($user);
 		if ($result > 0) {
@@ -165,7 +175,7 @@ if (empty($reshook))
 	}
 
 	// Remove line
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->supplier_proposal->creer)
+	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
 	{
 		$result = $object->deleteline($lineid);
 		// reorder lines
@@ -181,7 +191,7 @@ if (empty($reshook))
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret = $object->fetch($id); // Reload to get new records
-			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -189,10 +199,7 @@ if (empty($reshook))
 	}
 
 	// Validation
-	elseif ($action == 'confirm_validate' && $confirm == 'yes' &&
-		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))
-	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))
-	)
+	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
 	{
 		$result = $object->valid($user);
 		if ($result >= 0)
@@ -210,7 +217,7 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-					$model = $object->modelpdf;
+					$model = $object->model_pdf;
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -221,17 +228,14 @@ if (empty($reshook))
 			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
 			else setEventMessages($langs->trans($object->error), null, 'errors');
 		}
-	}
-
-	elseif ($action == 'setdate_livraison' && $user->rights->supplier_proposal->creer)
-	{
+	} elseif ($action == 'setdate_livraison' && $usercancreate) {
 		$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
 		if ($result < 0)
 			dol_print_error($db, $object->error);
 	}
 
 	// Create supplier proposal
-	elseif ($action == 'add' && $user->rights->supplier_proposal->creer)
+	elseif ($action == 'add' && $usercancreate)
 	{
 		$object->socid = $socid;
 		$object->fetch_thirdparty();
@@ -262,9 +266,10 @@ if (empty($reshook))
 					$object->remise_absolue = GETPOST('remise_absolue');
 					$object->socid = GETPOST('socid');
 					$object->fk_project = GETPOST('projectid', 'int');
-					$object->modelpdf = GETPOST('model');
+					$object->model_pdf = GETPOST('model');
 					$object->author = $user->id; // deprecated
-					$object->note = GETPOST('note', 'none');
+					$object->note = GETPOST('note', 'restricthtml');
+					$object->note_private = GETPOST('note', 'restricthtml');
 					$object->statut = SupplierProposal::STATUS_DRAFT;
 
 					$id = $object->create_from($user);
@@ -280,9 +285,10 @@ if (empty($reshook))
 				$object->mode_reglement_id = GETPOST('mode_reglement_id');
 				$object->fk_account = GETPOST('fk_account', 'int');
 				$object->fk_project = GETPOST('projectid', 'int');
-				$object->modelpdf = GETPOST('model');
+				$object->model_pdf = GETPOST('model');
 				$object->author = $user->id; // deprecated
-				$object->note = GETPOST('note', 'none');
+				$object->note = GETPOST('note', 'restricthtml');
+				$object->note_private = GETPOST('note', 'restricthtml');
 
 				$object->origin = GETPOST('origin');
 				$object->origin_id = GETPOST('originid');
@@ -411,8 +417,7 @@ if (empty($reshook))
 						$error++;
 					}
 				} 			// Standard creation
-				else
-				{
+				else {
 					$id = $object->create($user);
 				}
 
@@ -433,7 +438,7 @@ if (empty($reshook))
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
 							}
-							$model = $object->modelpdf;
+							$model = $object->model_pdf;
 
 							$ret = $object->fetch($id); // Reload to get new records
 							$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -442,15 +447,11 @@ if (empty($reshook))
 
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 						exit();
-					}
-					else
-					{
+					} else {
 						$db->rollback();
 						$action = 'create';
 					}
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$db->rollback();
 					$action = 'create';
@@ -460,7 +461,7 @@ if (empty($reshook))
 	}
 
 	// Reopen proposal
-	elseif ($action == 'confirm_reopen' && $user->rights->supplier_proposal->cloturer && !GETPOST('cancel', 'alpha')) {
+	elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		// prevent browser refresh from reopening proposal several times
 		if ($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) {
 			$object->reopen($user, SupplierProposal::STATUS_VALIDATED);
@@ -468,7 +469,7 @@ if (empty($reshook))
 	}
 
 	// Close proposal
-	elseif ($action == 'close' && $user->rights->supplier_proposal->cloturer && !GETPOST('cancel', 'alpha')) {
+	elseif ($action == 'close' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		// prevent browser refresh from reopening proposal several times
 		if ($object->statut == SupplierProposal::STATUS_SIGNED) {
 			$object->setStatut(SupplierProposal::STATUS_CLOSE);
@@ -476,14 +477,14 @@ if (empty($reshook))
 	}
 
 	// Set accepted/refused
-	elseif ($action == 'setstatut' && $user->rights->supplier_proposal->cloturer && !GETPOST('cancel', 'alpha')) {
+	elseif ($action == 'setstatut' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		if (!GETPOST('statut')) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("CloseAs")), null, 'errors');
 			$action = 'statut';
 		} else {
 			// prevent browser refresh from closing proposal several times
 			if ($object->statut == SupplierProposal::STATUS_VALIDATED) {
-				$object->cloture($user, GETPOST('statut'), GETPOST('note', 'none'));
+				$object->cloture($user, GETPOST('statut'), GETPOST('note', 'restricthtml'));
 			}
 		}
 	}
@@ -499,12 +500,12 @@ if (empty($reshook))
 
 	// Actions to build doc
 	$upload_dir = $conf->supplier_proposal->dir_output;
-	$permissiontoadd = $user->rights->supplier_proposal->creer;
+	$permissiontoadd = $usercancreate;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
 	// Go back to draft
-	if ($action == 'modif' && $user->rights->supplier_proposal->creer)
+	if ($action == 'modif' && $usercancreate)
 	{
 		$object->setDraft($user);
 
@@ -518,11 +519,9 @@ if (empty($reshook))
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret = $object->fetch($id); // Reload to get new records
-			$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
-	}
-
-	elseif ($action == "setabsolutediscount" && $user->rights->supplier_proposal->creer) {
+	}	elseif ($action == "setabsolutediscount" && $usercancreate) {
 		if ($_POST["remise_id"]) {
 			if ($object->id > 0) {
 				$result = $object->insert_discount($_POST["remise_id"]);
@@ -534,7 +533,7 @@ if (empty($reshook))
 	}
 
 	// Add a product line
-	if ($action == 'addline' && $user->rights->supplier_proposal->creer)
+	if ($action == 'addline' && $usercancreate)
 	{
 		$langs->load('errors');
 		$error = 0;
@@ -551,9 +550,7 @@ if (empty($reshook))
 			$idprod = 0;
 			$price_ht = GETPOST('price_ht');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
-		{
+		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$price_ht = '';
 			$tva_tx = '';
@@ -621,14 +618,11 @@ if (empty($reshook))
 						{
 							$productsupplier->ref_supplier = '';
 						}
-					}
-					else
-					{
+					} else {
 						$fksoctosearch = $object->thirdparty->id;
 						$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 					}
-				}
-				elseif (GETPOST('idprodfournprice', 'alpha') > 0)
+				} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
 				{
 					//$qtytosearch=$qty; 	   // Just to see if a price exists for the quantity. Not used to found vat.
 					$qtytosearch = -1; // We force qty to -1 to be sure to find if the supplier price that exists
@@ -715,8 +709,7 @@ if (empty($reshook))
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 				}
-			}
-			elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error))    // Free product.  // $price_ht is already set
+			} elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error))    // Free product.  // $price_ht is already set
 			{
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
@@ -737,9 +730,7 @@ if (empty($reshook))
 				if ($price_ht !== '')
 				{
 					$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
-				}
-				else
-				{
+				} else {
 					$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 					$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 				}
@@ -791,7 +782,7 @@ if (empty($reshook))
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
-					$model = $object->modelpdf;
+					$model = $object->model_pdf;
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -834,9 +825,7 @@ if (empty($reshook))
 				unset($_POST['date_endday']);
 				unset($_POST['date_endmonth']);
 				unset($_POST['date_endyear']);
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -845,7 +834,7 @@ if (empty($reshook))
 	}
 
 	// Mise a jour d'une ligne dans la demande de prix
-	elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('save') == $langs->trans("Save")) {
+	elseif ($action == 'updateline' && $usercancreate && GETPOST('save') == $langs->trans("Save")) {
 		$vat_rate = (GETPOST('tva_tx') ?GETPOST('tva_tx') : 0);
 
 		// Define info_bits
@@ -854,7 +843,7 @@ if (empty($reshook))
 			$info_bits |= 0x01;
 
 		// Clean parameters
-		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'none'));
+		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml'));
 
 		// Define vat_rate
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -976,7 +965,7 @@ if (empty($reshook))
 						$outputlangs->setDefaultLang($newlang);
 					}
 					$ret = $object->fetch($id); // Reload to get new records
-					$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
 				unset($_POST['qty']);
@@ -1011,56 +1000,48 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	elseif ($action == 'updateline' && $user->rights->supplier_proposal->creer && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
+	}	elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans('Cancel')) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
 	}
 
 	// Set project
-	elseif ($action == 'classin' && $user->rights->supplier_proposal->creer) {
+	elseif ($action == 'classin' && $usercancreate) {
 		$object->setProject(GETPOST('projectid'), 'int');
 	}
 
 	// Delivery delay
-	elseif ($action == 'setavailability' && $user->rights->supplier_proposal->creer) {
+	elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->availability($_POST['availability_id']);
 	}
 
 	// Terms of payments
-	elseif ($action == 'setconditions' && $user->rights->supplier_proposal->creer) {
+	elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-	}
-
-	elseif ($action == 'setremisepercent' && $user->rights->supplier_proposal->creer) {
-		$result = $object->set_remise_percent($user, $_POST['remise_percent']);
-	}
-
-	elseif ($action == 'setremiseabsolue' && $user->rights->supplier_proposal->creer) {
-		$result = $object->set_remise_absolue($user, $_POST['remise_absolue']);
+	} elseif ($action == 'setremisepercent' && $usercancreate) {
+		$result = $object->set_remise_percent($user, GETPOST('remise_percent', 'alpha'));
+	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
+		$result = $object->set_remise_absolue($user, GETPOST('remise_absolue', 'alpha'));
 	}
 
 	// Payment mode
-	elseif ($action == 'setmode' && $user->rights->supplier_proposal->creer) {
+	elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 	}
 
 	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $user->rights->supplier_proposal->creer) {
+	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
 	}
 
 	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $user->rights->supplier_proposal->creer) {
+	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
-	}
-
-	elseif ($action == 'update_extras') {
+	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
-		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 		if ($ret < 0) $error++;
 
 		if (!$error)
@@ -1138,9 +1119,7 @@ if ($action == 'create')
 			if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
 			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
 		}
-	}
-	else
-	{
+	} else {
 		$cond_reglement_id 	= $soc->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $soc->mode_reglement_supplier_id;
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
@@ -1480,8 +1459,8 @@ if ($action == 'create')
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref supplier
-	//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', 0, 1);
-	//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->rights->fournisseur->commande->creer, 'string', '', null, null, '', 1);
+	//$morehtmlref.=$form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', 0, 1);
+	//$morehtmlref.=$form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreateorder, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= $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.'/supplier_proposal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
@@ -1490,7 +1469,7 @@ if ($action == 'create')
 	{
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->supplier_proposal->creer)
+		if ($usercancreate)
 		{
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
@@ -1680,7 +1659,7 @@ if ($action == 'create')
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('BankAccount');
 		print '</td>';
-		if ($action != 'editbankaccount' && $user->rights->supplier_proposal->creer)
+		if ($action != 'editbankaccount' && $usercancreate)
 			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">';
@@ -1809,7 +1788,7 @@ if ($action == 'create')
 		$ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, $dateSelector);
 
 	// Form to add new line
-	if ($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer)
+	if ($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate)
 	{
 		if ($action != 'editline')
 		{
@@ -1870,22 +1849,20 @@ if ($action == 'create')
 			if ($action != 'statut' && $action != 'editline')
 			{
 				// Validate
-				if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 &&
-					((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))
-	   				|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))
-				) {
+				if ($object->statut == SupplierProposal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 && $usercanvalidate)
+				{
 					if (count($object->lines) > 0)
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a></div>';
 					// else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
 				}
 
 				// Edit
-				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->creer) {
+				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $usercancreate) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a></div>';
 				}
 
 				// ReOpen
-				if (($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) && $user->rights->supplier_proposal->cloturer) {
+				if (($object->statut == SupplierProposal::STATUS_SIGNED || $object->statut == SupplierProposal::STATUS_NOTSIGNED || $object->statut == SupplierProposal::STATUS_CLOSE) && $usercanclose) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#reopen').'"';
 					print '>'.$langs->trans('ReOpen').'</a></div>';
 				}
@@ -1893,40 +1870,39 @@ if ($action == 'create')
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
-						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {
+						if ($usercansend) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
 					}
 				}
 
 				// Create an order
 				if (!empty($conf->fournisseur->enabled) && $object->statut == SupplierProposal::STATUS_SIGNED) {
-					if ($user->rights->fournisseur->commande->creer) {
+					if ($usercancreateorder) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a></div>';
 					}
 				}
 
 				// Set accepted/refused
-				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->cloturer) {
+				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $usercanclose) {
 					print '<div class="inline-block divButAction"><a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#acceptedrefused').'"';
 					print '>'.$langs->trans('SetAcceptedRefused').'</a></div>';
 				}
 
 				// Close
-				if ($object->statut == SupplierProposal::STATUS_SIGNED && $user->rights->supplier_proposal->cloturer) {
+				if ($object->statut == SupplierProposal::STATUS_SIGNED && $usercanclose) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#close').'"';
 					print '>'.$langs->trans('Close').'</a></div>';
 				}
 
 				// Clone
-				if ($user->rights->supplier_proposal->creer) {
+				if ($usercancreate) {
 					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>';
 				}
 
 				// Delete
-				if (($object->statut == SupplierProposal::STATUS_DRAFT && $user->rights->supplier_proposal->creer) || $user->rights->supplier_proposal->supprimer) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
+				if (($object->statut == SupplierProposal::STATUS_DRAFT && $usercancreate) || $usercandelete) {
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'"';
 					print '>'.$langs->trans('Delete').'</a></div>';
 				}
 			}
@@ -1945,10 +1921,10 @@ if ($action == 'create')
 		$filename = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->supplier_proposal->dir_output."/".dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-		$genallowed = $user->rights->supplier_proposal->lire;
-		$delallowed = $user->rights->supplier_proposal->creer;
+		$genallowed = $usercanread;
+		$delallowed = $usercancreate;
 
-		print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+		print $formfile->showdocuments('supplier_proposal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 
 
 		// Show links to link elements
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index 3fbe3afa021..ba2fa37e1b9 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -133,7 +133,7 @@ class Supplierproposals extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0)
             {
@@ -141,28 +141,27 @@ class Supplierproposals extends DolibarrApi
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
 
         if ($result)
         {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $min = min($num, ($limit <= 0 ? $num : $limit));
             $i = 0;
             while ($i < $min)
             {
-                $obj = $db->fetch_object($result);
-                $propal_static = new SupplierProposal($db);
+            	$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 : '.$db->lasterror());
+        } 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');
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 33c80f9b6b1..92759515ba4 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -41,754 +41,737 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 
 /**
  *	Class to manage price ask supplier
  */
 class SupplierProposal extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'supplier_proposal';
+	use CommonIncoterm;
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'supplier_proposal';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'supplier_proposal';
 
-    /**
-     * @var int    Name of subtable line
-     */
-    public $table_element_line = 'supplier_proposaldet';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'supplier_proposal';
 
-    /**
-     * @var int Field with ID of parent key if this field has a parent
-     */
-    public $fk_element = 'fk_supplier_proposal';
+	/**
+	 * @var int    Name of subtable line
+	 */
+	public $table_element_line = 'supplier_proposaldet';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'supplier_proposal';
+	/**
+	 * @var int Field with ID of parent key if this field has a parent
+	 */
+	public $fk_element = 'fk_supplier_proposal';
 
-    /**
-     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-     * @var int
-     */
-    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 = 'supplier_proposal';
 
-    /**
-     * 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=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int
+	 */
+	public $ismultientitymanaged = 1;
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
+	/**
+	 * 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;
 
-    public $socid; // Id client
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
 
-    /**
-     * @deprecated
-     * @see $user_author_id
-     */
-    public $author;
+	public $socid; // Id client
 
-    public $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande
-    public $ref_supplier; //Reference saisie lors de l'ajout d'une ligne à la demande
-    public $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
+	/**
+	 * @deprecated
+	 * @see $user_author_id
+	 */
+	public $author;
 
-    /**
-     * @var integer|string Date of proposal
-     */
-    public $date;
+	public $ref_fourn; //Reference saisie lors de l'ajout d'une ligne à la demande
+	public $ref_supplier; //Reference saisie lors de l'ajout d'une ligne à la demande
+	public $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (processed/billed)
 
-    /**
-     * @var integer|string date_livraison
-     */
-    public $date_livraison;
+	/**
+	 * @var integer|string Date of proposal
+	 */
+	public $date;
 
-    /**
-     * @deprecated
-     * @see $date_creation
-     */
-    public $datec;
+	/**
+	 * @var integer|string date_livraison
+	 */
+	public $date_livraison;
 
-    /**
+	/**
+	 * @deprecated
+	 * @see $date_creation
+	 */
+	public $datec;
+
+	/**
 	 * @var integer|string date_creation
 	 */
-    public $date_creation;
-
-    /**
-     * @deprecated
-     * @see $date_validation
-     */
-    public $datev;
-
-    /**
-     * @var integer|string date_validation
-     */
-    public $date_validation;
-
-
-    public $user_author_id;
-    public $user_valid_id;
-    public $user_close_id;
-
-    /**
-     * @deprecated
-     * @see $price_ht
-     */
-    public $price;
-
-    /**
-     * @deprecated
-     * @see $total_tva
-     */
-    public $tva;
-
-    /**
-     * @deprecated
-     * @see $total_ttc
-     */
-    public $total;
-
-    public $cond_reglement_code;
-    public $mode_reglement_code;
-    public $remise = 0;
-    public $remise_percent = 0;
-    public $remise_absolue = 0;
-
-    public $products = array();
-    public $extraparams = array();
-
-    public $lines = array();
-    public $line;
-
-    public $labelStatus = array();
-    public $labelStatusShort = array();
-
-    public $nbtodo;
-    public $nbtodolate;
-
-    public $specimen;
-
-    // Multicurrency
-    /**
-     * @var int ID
-     */
-    public $fk_multicurrency;
-
-    public $multicurrency_code;
-    public $multicurrency_tx;
-    public $multicurrency_total_ht;
-    public $multicurrency_total_tva;
-    public $multicurrency_total_ttc;
-
-    /**
-     * Draft status
-     */
-    const STATUS_DRAFT = 0;
-
-    /**
-     * Validated status
-     */
-    const STATUS_VALIDATED = 1;
-
-    /**
-     * Signed quote
-     */
-    const STATUS_SIGNED = 2;
-
-    /**
-     * Not signed quote, canceled
-     */
-    const STATUS_NOTSIGNED = 3;
-
-    /**
-     * Billed or closed/processed quote
-     */
-    const STATUS_CLOSE = 4;
-
-
-
-    /**
-     *	Constructor
-     *
-     *	@param      DoliDB	$db         Database handler
-     *	@param      int		$socid		Id third party
-     *	@param      int		$supplier_proposalid   Id supplier_proposal
-     */
-    public function __construct($db, $socid = "", $supplier_proposalid = 0)
-    {
-        global $conf, $langs;
-
-        $this->db = $db;
-
-        $this->socid = $socid;
-        $this->id = $supplier_proposalid;
-
-        $this->products = array();
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Add line into array products
-     *  $this->client doit etre charge
-     *
-     * 	@param  int		$idproduct       	Product Id to add
-     * 	@param  int		$qty             	Quantity
-     * 	@param  int		$remise_percent  	Discount effected on Product
-     *  @return	int							<0 if KO, >0 if OK
-     *
-     *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
-     *			insere dans tableau $this->products
-     */
-    public function add_product($idproduct, $qty, $remise_percent = 0)
-    {
-        // phpcs:enable
-        global $conf, $mysoc;
-
-        if (!$qty) $qty = 1;
-
-        dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
-        if ($idproduct > 0)
-        {
-            $prod = new Product($this->db);
-            $prod->fetch($idproduct);
-
-            $productdesc = $prod->description;
-
-            $tva_tx = get_default_tva($mysoc, $this->thirdparty, $prod->id);
-            $tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
-            if (empty($tva_tx)) $tva_npr = 0;
-            $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
-            $localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $this->thirdparty, $tva_npr);
-
-            // multiprix
-            if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
-            {
-                $price = $prod->multiprices[$this->thirdparty->price_level];
-            }
-            else
-            {
-                $price = $prod->price;
-            }
-
-            $line = new SupplierProposalLine($this->db);
-
-            $line->fk_product = $idproduct;
-            $line->desc = $productdesc;
-            $line->qty = $qty;
-            $line->subprice = $price;
-            $line->remise_percent = $remise_percent;
-            $line->tva_tx = $tva_tx;
-
-            $this->lines[] = $line;
-        }
-    }
-
-    // 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)
-    {
-        // phpcs:enable
-        global $langs;
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-        $this->db->begin();
-
-        $remise = new DiscountAbsolute($this->db);
-        $result = $remise->fetch($idremise);
-
-        if ($result > 0)
-        {
-            if ($remise->fk_facture)	// Protection against multiple submission
-            {
-                $this->error = $langs->trans("ErrorDiscountAlreadyUsed");
-                $this->db->rollback();
-                return -5;
-            }
-
-            $supplier_proposalligne = new SupplierProposalLine($this->db);
-            $supplier_proposalligne->fk_supplier_proposal = $this->id;
-            $supplier_proposalligne->fk_remise_except = $remise->id;
-            $supplier_proposalligne->desc = $remise->description; // Description ligne
-            $supplier_proposalligne->tva_tx = $remise->tva_tx;
-            $supplier_proposalligne->subprice = -$remise->amount_ht;
-            $supplier_proposalligne->fk_product = 0; // Id produit predefini
-            $supplier_proposalligne->qty = 1;
-            $supplier_proposalligne->remise = 0;
-            $supplier_proposalligne->remise_percent = 0;
-            $supplier_proposalligne->rang = -1;
-            $supplier_proposalligne->info_bits = 2;
-
-            $supplier_proposalligne->total_ht  = -$remise->amount_ht;
-            $supplier_proposalligne->total_tva = -$remise->amount_tva;
-            $supplier_proposalligne->total_ttc = -$remise->amount_ttc;
-
-            $result = $supplier_proposalligne->insert();
-            if ($result > 0)
-            {
-                $result = $this->update_price(1);
-                if ($result > 0)
-                {
-                    $this->db->commit();
-                    return 1;
-                }
-                else
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-            }
-            else
-            {
-                $this->error = $supplier_proposalligne->error;
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
-    /**
-     *    	Add a proposal line into database (linked to product/service or not)
-     * 		Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
-     *		de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
-     *		par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,'',produit)
-     *		et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
-     *
-     * 		@param    	string		$desc				Description de la ligne
-     * 		@param    	double		$pu_ht				Prix unitaire
-     * 		@param    	double		$qty             	Quantite
-     * 		@param    	double		$txtva           	Taux de tva
-     * 		@param		double		$txlocaltax1		Local tax 1 rate
-     *  	@param		double		$txlocaltax2		Local tax 2 rate
-     *		@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    	double		$pu_ttc             Prix unitaire TTC
-     * 		@param    	int			$info_bits			Bits of type of lines
-     *      @param      int			$type               Type of line (product, service)
-     *      @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. If 0, we will take best price. If -1 we keep it empty.
-     *      @param		int			$pa_ht				Buying price without tax
-     *      @param		string		$label				???
-     *      @param		array		$array_options		extrafields array
-     * 		@param		string		$ref_supplier			Supplier price reference
-     * 		@param		int			$fk_unit			Id of the unit to use.
-     * 		@param		string		$origin				'order', 'supplier_proposal', ...
-     * 		@param		int			$origin_id			Id of origin line
-     * 		@param		double		$pu_ht_devise		Amount in currency
-     * 		@param		int			$date_start			Date start
-     * 		@param		int			$date_end			Date end
-     *    	@return    	int         	    			>0 if OK, <0 if KO
-     *
-     *    	@see       	add_product()
-     */
-    public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $pu_ttc = 0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $array_options = 0, $ref_supplier = '', $fk_unit = '', $origin = '', $origin_id = 0, $pu_ht_devise = 0, $date_start = 0, $date_end = 0)
-    {
-        global $mysoc, $conf, $langs;
-
-        dol_syslog(get_class($this)."::addline supplier_proposalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-        // Clean parameters
-        if (empty($remise_percent)) $remise_percent = 0;
-        if (empty($qty)) $qty = 0;
-        if (empty($info_bits)) $info_bits = 0;
-        if (empty($rang)) $rang = 0;
-        if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
-        if (empty($pu_ht)) $pu_ht = 0;
-
-        $remise_percent = price2num($remise_percent);
-        $qty = price2num($qty);
-        $pu_ht = price2num($pu_ht);
-        $pu_ttc = price2num($pu_ttc);
-        $txtva = price2num($txtva);
-        $txlocaltax1 = price2num($txlocaltax1);
-        $txlocaltax2 = price2num($txlocaltax2);
-            $pa_ht = price2num($pa_ht);
-        if ($price_base_type == 'HT')
-        {
-            $pu = $pu_ht;
-        }
-        else
-        {
-            $pu = $pu_ttc;
-        }
-
-        // Check parameters
-        if ($type < 0) return -1;
-
-        if ($this->statut == self::STATUS_DRAFT)
-        {
-            $this->db->begin();
-
-            if ($fk_product > 0)
-            {
-                if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
-                {
-                    // Check quantity is enough
-                    dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_fournprice=".$fk_fournprice." qty=".$qty." ref_supplier=".$ref_supplier);
-                    $prod = new Product($this->db);
-                    if ($prod->fetch($fk_product) > 0)
-                    {
-                        $product_type = $prod->type;
-                        $label = $prod->label;
-                        $fk_prod_fourn_price = $fk_fournprice;
-
-                        // We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
-                        // If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
-                        $result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
-                        if ($result > 0)
-                        {
-                            $pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
-                            $ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
-                            // is remise percent not keyed but present for the product we add it
-                            if ($remise_percent == 0 && $prod->remise_percent != 0)
-                                $remise_percent = $prod->remise_percent;
-                        }
-                        if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
-                        {
-                            $langs->load("errors");
-                            $this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
-                            $this->db->rollback();
-                            dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
-                            //$pu    = $prod->fourn_pu;     // We do not overwrite unit price
-                            //$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
-                            return -1;
-                        }
-                        if ($result == -1)
-                        {
-                            $langs->load("errors");
-                            $this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
-                            $this->db->rollback();
-                            dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
-                            return -1;
-                        }
-                        if ($result < -1)
-                        {
-                            $this->error = $prod->error;
-                            $this->db->rollback();
-                            dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
-                            return -1;
-                        }
-                    }
-                    else
-                    {
-                        $this->error = $prod->error;
-                        $this->db->rollback();
-                        return -1;
-                    }
-                }
-            }
-            else
-            {
-                $product_type = $type;
-            }
-
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et 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);
-            $txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
-
-            if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
-                $pu = 0;
-            }
-
-            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $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 = $pu_ht = $tabprice[3];
-
-            // MultiCurrency
-            $multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
-            $pu_ht_devise = $tabprice[19];
-
-            // Rang to use
-            $ranktouse = $rang;
-            if ($ranktouse == -1)
-            {
-                $rangmax = $this->line_max($fk_parent_line);
-                $ranktouse = $rangmax + 1;
-            }
-
-            // TODO A virer
-            // Anciens indicateurs: $price, $remise (a ne plus utiliser)
-            $price = $pu;
-            $remise = 0;
-            if ($remise_percent > 0)
-            {
-                $remise = round(($pu * $remise_percent / 100), 2);
-                $price = $pu - $remise;
-            }
-
-            // Insert line
-            $this->line = new SupplierProposalLine($this->db);
-
-            $this->line->fk_supplier_proposal = $this->id;
-            $this->line->label = $label;
-            $this->line->desc = $desc;
-            $this->line->qty = $qty;
-            $this->line->tva_tx = $txtva;
-            $this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
-            $this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
-            $this->line->localtax1_type = $localtaxes_type[0];
-            $this->line->localtax2_type = $localtaxes_type[2];
-            $this->line->fk_product = $fk_product;
-            $this->line->remise_percent = $remise_percent;
-            $this->line->subprice = $pu_ht;
-            $this->line->rang = $ranktouse;
-            $this->line->info_bits = $info_bits;
-            $this->line->total_ht = $total_ht;
-            $this->line->total_tva = $total_tva;
-            $this->line->total_localtax1 = $total_localtax1;
-            $this->line->total_localtax2 = $total_localtax2;
-            $this->line->total_ttc = $total_ttc;
-            $this->line->product_type = $type;
-            $this->line->special_code = $special_code;
-            $this->line->fk_parent_line = $fk_parent_line;
-            $this->line->fk_unit = $fk_unit;
-            $this->line->origin = $origin;
-            $this->line->origin_id = $origin_id;
-            $this->line->ref_fourn = $this->db->escape($ref_supplier);
-			$this->line->date_start = $date_start;
-			$this->line->date_end = $date_end;
-
-            // infos marge
-            if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
-                // When fk_fournprice is 0, we take the lowest buying price
-                include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-                $productFournisseur = new ProductFournisseur($this->db);
-                $productFournisseur->find_min_price_product_fournisseur($fk_product);
-                $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
-            } else {
-            	$this->line->fk_fournprice = ($fk_fournprice > 0 ? $fk_fournprice : 0); // If fk_fournprice is -1, we will not use fk_fournprice
-            }
-            $this->line->pa_ht = $pa_ht;
-            //var_dump($this->line->fk_fournprice);exit;
-
-            // Multicurrency
-            $this->line->fk_multicurrency = $this->fk_multicurrency;
-            $this->line->multicurrency_code = $this->multicurrency_code;
-            $this->line->multicurrency_subprice		= $pu_ht_devise;
-            $this->line->multicurrency_total_ht		= $multicurrency_total_ht;
-            $this->line->multicurrency_total_tva	= $multicurrency_total_tva;
-            $this->line->multicurrency_total_ttc	= $multicurrency_total_ttc;
-
-            // Mise en option de la ligne
-            if (empty($qty) && empty($special_code)) $this->line->special_code = 3;
-
-            if (is_array($array_option) && count($array_option) > 0) {
-                $this->line->array_options = $array_option;
-            }
-
-            $result = $this->line->insert();
-            if ($result > 0)
-            {
-                // 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, $this->thirdparty); // 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
-        {
-        	$this->error = 'BadStatusOfObjectToAddLine';
-        	return -5;
-        }
-    }
-
-
-    /**
-     *  Update a proposal line
-     *
-     *  @param      int			$rowid           	Id de la ligne
-     *  @param      double		$pu		     	  	Prix unitaire (HT ou TTC selon price_base_type)
-     *  @param      double		$qty            	Quantity
-     *  @param      double		$remise_percent  	Remise effectuee sur le produit
-     *  @param      double		$txtva	          	Taux de TVA
-     * 	@param	  	double		$txlocaltax1		Local tax 1 rate
-     *  @param	  	double		$txlocaltax2		Local tax 2 rate
-     *  @param      string		$desc            	Description
-     *	@param	  	double		$price_base_type	HT ou TTC
-     *	@param      int			$info_bits        	Miscellaneous informations
-     *	@param		int			$special_code		Special code (also used by externals modules!)
-     * 	@param		int			$fk_parent_line		Id of parent line (0 in most cases, used by modules adding sublevels into lines).
-     * 	@param		int			$skip_update_total	Keep fields total_xxx to 0 (used for special lines by some modules)
-     *  @param		int			$fk_fournprice		Id of origin supplier price
-     *  @param		int			$pa_ht				Price (without tax) of product when it was bought
-     *  @param		string		$label				???
-     *  @param		int			$type				0/1=Product/service
-     *  @param		array		$array_options		extrafields array
-     * 	@param		string		$ref_supplier			Supplier price reference
-     *	@param		int			$fk_unit			Id of the unit to use.
-	 * 	@param		double		$pu_ht_devise		Unit price in currency
-     *  @return     int     		        		0 if OK, <0 if KO
-     */
-    public function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 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, $array_options = 0, $ref_supplier = '', $fk_unit = '', $pu_ht_devise = 0)
-    {
-        global $conf, $user, $langs, $mysoc;
-
-        dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-
-        // Clean parameters
-        $remise_percent = price2num($remise_percent);
-        $qty = price2num($qty);
-        $pu = price2num($pu);
-        $txtva = price2num($txtva);
-        $txlocaltax1 = price2num($txlocaltax1);
-        $txlocaltax2 = price2num($txlocaltax2);
-        $pa_ht = price2num($pa_ht);
-        if (empty($qty) && empty($special_code)) $special_code = 3; // Set option tag
-        if (!empty($qty) && $special_code == 3) $special_code = 0; // Remove option tag
-
-        if ($this->statut == 0)
-        {
-            $this->db->begin();
-
-            // Calcul du total TTC et de la TVA pour la ligne a partir de
-            // qty, pu, remise_percent et 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, $mysoc, $this->thirdparty);
-
-            // 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.
-            }
+	public $date_creation;
+
+	/**
+	 * @deprecated
+	 * @see $date_validation
+	 */
+	public $datev;
+
+	/**
+	 * @var integer|string date_validation
+	 */
+	public $date_validation;
+
+
+	public $user_author_id;
+	public $user_valid_id;
+	public $user_close_id;
+
+	/**
+	 * @deprecated
+	 * @see $price_ht
+	 */
+	public $price;
+
+	/**
+	 * @deprecated
+	 * @see $total_tva
+	 */
+	public $tva;
+
+	/**
+	 * @deprecated
+	 * @see $total_ttc
+	 */
+	public $total;
+
+	public $cond_reglement_code;
+	public $mode_reglement_code;
+	public $remise = 0;
+	public $remise_percent = 0;
+	public $remise_absolue = 0;
+
+	public $products = array();
+	public $extraparams = array();
+
+	public $lines = array();
+	public $line;
+
+	public $labelStatus = array();
+	public $labelStatusShort = array();
+
+	public $nbtodo;
+	public $nbtodolate;
+
+	public $specimen;
+
+	// Multicurrency
+	/**
+	 * @var int ID
+	 */
+	public $fk_multicurrency;
+
+	public $multicurrency_code;
+	public $multicurrency_tx;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
+
+	/**
+	 * Draft status
+	 */
+	const STATUS_DRAFT = 0;
+
+	/**
+	 * Validated status
+	 */
+	const STATUS_VALIDATED = 1;
+
+	/**
+	 * Signed quote
+	 */
+	const STATUS_SIGNED = 2;
+
+	/**
+	 * Not signed quote, canceled
+	 */
+	const STATUS_NOTSIGNED = 3;
+
+	/**
+	 * Billed or closed/processed quote
+	 */
+	const STATUS_CLOSE = 4;
+
+
+
+	/**
+	 *	Constructor
+	 *
+	 *	@param      DoliDB	$db         Database handler
+	 *	@param      int		$socid		Id third party
+	 *	@param      int		$supplier_proposalid   Id supplier_proposal
+	 */
+	public function __construct($db, $socid = "", $supplier_proposalid = 0)
+	{
+		global $conf, $langs;
+
+		$this->db = $db;
+
+		$this->socid = $socid;
+		$this->id = $supplier_proposalid;
+
+		$this->products = array();
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * 	Add line into array products
+	 *  $this->client doit etre charge
+	 *
+	 * 	@param  int		$idproduct       	Product Id to add
+	 * 	@param  int		$qty             	Quantity
+	 * 	@param  int		$remise_percent  	Discount effected on Product
+	 *  @return	int							<0 if KO, >0 if OK
+	 *
+	 *	TODO	Remplacer les appels a cette fonction par generation objet Ligne
+	 *			insere dans tableau $this->products
+	 */
+	public function add_product($idproduct, $qty, $remise_percent = 0)
+	{
+		// phpcs:enable
+		global $conf, $mysoc;
+
+		if (!$qty) $qty = 1;
+
+		dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
+		if ($idproduct > 0)
+		{
+			$prod = new Product($this->db);
+			$prod->fetch($idproduct);
+
+			$productdesc = $prod->description;
+
+			$tva_tx = get_default_tva($mysoc, $this->thirdparty, $prod->id);
+			$tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
+			if (empty($tva_tx)) $tva_npr = 0;
+			$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $this->thirdparty, $tva_npr);
+
+			// multiprix
+			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
+			{
+				$price = $prod->multiprices[$this->thirdparty->price_level];
+			} else {
+				$price = $prod->price;
+			}
+
+			$line = new SupplierProposalLine($this->db);
+
+			$line->fk_product = $idproduct;
+			$line->desc = $productdesc;
+			$line->qty = $qty;
+			$line->subprice = $price;
+			$line->remise_percent = $remise_percent;
+			$line->tva_tx = $tva_tx;
+
+			$this->lines[] = $line;
+		}
+	}
+
+	// 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)
+	{
+		// phpcs:enable
+		global $langs;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+		$this->db->begin();
+
+		$remise = new DiscountAbsolute($this->db);
+		$result = $remise->fetch($idremise);
+
+		if ($result > 0)
+		{
+			if ($remise->fk_facture)	// Protection against multiple submission
+			{
+				$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
+				$this->db->rollback();
+				return -5;
+			}
+
+			$supplier_proposalligne = new SupplierProposalLine($this->db);
+			$supplier_proposalligne->fk_supplier_proposal = $this->id;
+			$supplier_proposalligne->fk_remise_except = $remise->id;
+			$supplier_proposalligne->desc = $remise->description; // Description ligne
+			$supplier_proposalligne->tva_tx = $remise->tva_tx;
+			$supplier_proposalligne->subprice = -$remise->amount_ht;
+			$supplier_proposalligne->fk_product = 0; // Id produit predefini
+			$supplier_proposalligne->qty = 1;
+			$supplier_proposalligne->remise = 0;
+			$supplier_proposalligne->remise_percent = 0;
+			$supplier_proposalligne->rang = -1;
+			$supplier_proposalligne->info_bits = 2;
+
+			$supplier_proposalligne->total_ht  = -$remise->amount_ht;
+			$supplier_proposalligne->total_tva = -$remise->amount_tva;
+			$supplier_proposalligne->total_ttc = -$remise->amount_ttc;
+
+			$result = $supplier_proposalligne->insert();
+			if ($result > 0)
+			{
+				$result = $this->update_price(1);
+				if ($result > 0)
+				{
+					$this->db->commit();
+					return 1;
+				} else {
+					$this->db->rollback();
+					return -1;
+				}
+			} else {
+				$this->error = $supplier_proposalligne->error;
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
+	/**
+	 *    	Add a proposal line into database (linked to product/service or not)
+	 * 		Les parametres sont deja cense etre juste et avec valeurs finales a l'appel
+	 *		de cette methode. Aussi, pour le taux tva, il doit deja avoir ete defini
+	 *		par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,'',produit)
+	 *		et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
+	 *
+	 * 		@param    	string		$desc				Description de la ligne
+	 * 		@param    	double		$pu_ht				Prix unitaire
+	 * 		@param    	double		$qty             	Quantite
+	 * 		@param    	double		$txtva           	Taux de tva
+	 * 		@param		double		$txlocaltax1		Local tax 1 rate
+	 *  	@param		double		$txlocaltax2		Local tax 2 rate
+	 *		@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    	double		$pu_ttc             Prix unitaire TTC
+	 * 		@param    	int			$info_bits			Bits of type of lines
+	 *      @param      int			$type               Type of line (product, service)
+	 *      @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. If 0, we will take best price. If -1 we keep it empty.
+	 *      @param		int			$pa_ht				Buying price without tax
+	 *      @param		string		$label				???
+	 *      @param		array		$array_options		extrafields array
+	 * 		@param		string		$ref_supplier			Supplier price reference
+	 * 		@param		int			$fk_unit			Id of the unit to use.
+	 * 		@param		string		$origin				'order', 'supplier_proposal', ...
+	 * 		@param		int			$origin_id			Id of origin line
+	 * 		@param		double		$pu_ht_devise		Amount in currency
+	 * 		@param		int			$date_start			Date start
+	 * 		@param		int			$date_end			Date end
+	 *    	@return    	int         	    			>0 if OK, <0 if KO
+	 *
+	 *    	@see       	add_product()
+	 */
+	public function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $fk_product = 0, $remise_percent = 0, $price_base_type = 'HT', $pu_ttc = 0, $info_bits = 0, $type = 0, $rang = -1, $special_code = 0, $fk_parent_line = 0, $fk_fournprice = 0, $pa_ht = 0, $label = '', $array_options = 0, $ref_supplier = '', $fk_unit = '', $origin = '', $origin_id = 0, $pu_ht_devise = 0, $date_start = 0, $date_end = 0)
+	{
+		global $mysoc, $conf, $langs;
+
+		dol_syslog(get_class($this)."::addline supplier_proposalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		// Clean parameters
+		if (empty($remise_percent)) $remise_percent = 0;
+		if (empty($qty)) $qty = 0;
+		if (empty($info_bits)) $info_bits = 0;
+		if (empty($rang)) $rang = 0;
+		if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
+		if (empty($pu_ht)) $pu_ht = 0;
+
+		$remise_percent = price2num($remise_percent);
+		$qty = price2num($qty);
+		$pu_ht = price2num($pu_ht);
+		$pu_ttc = price2num($pu_ttc);
+		$txtva = price2num($txtva);
+		$txlocaltax1 = price2num($txlocaltax1);
+		$txlocaltax2 = price2num($txlocaltax2);
+			$pa_ht = price2num($pa_ht);
+		if ($price_base_type == 'HT')
+		{
+			$pu = $pu_ht;
+		} else {
+			$pu = $pu_ttc;
+		}
+
+		// Check parameters
+		if ($type < 0) return -1;
+
+		if ($this->statut == self::STATUS_DRAFT)
+		{
+			$this->db->begin();
+
+			if ($fk_product > 0)
+			{
+				if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY))
+				{
+					// Check quantity is enough
+					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." fk_fournprice=".$fk_fournprice." qty=".$qty." ref_supplier=".$ref_supplier);
+					$prod = new Product($this->db);
+					if ($prod->fetch($fk_product) > 0)
+					{
+						$product_type = $prod->type;
+						$label = $prod->label;
+						$fk_prod_fourn_price = $fk_fournprice;
+
+						// We use 'none' instead of $ref_supplier, because fourn_ref may not exists anymore. So we will take the first supplier price ok.
+						// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
+						$result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
+						if ($result > 0)
+						{
+							$pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+							$ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
+							// is remise percent not keyed but present for the product we add it
+							if ($remise_percent == 0 && $prod->remise_percent != 0)
+								$remise_percent = $prod->remise_percent;
+						}
+						if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
+						{
+							$langs->load("errors");
+							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline we did not found supplier price, so we can't guess unit price");
+							//$pu    = $prod->fourn_pu;     // We do not overwrite unit price
+							//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
+							return -1;
+						}
+						if ($result == -1)
+						{
+							$langs->load("errors");
+							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
+							return -1;
+						}
+						if ($result < -1)
+						{
+							$this->error = $prod->error;
+							$this->db->rollback();
+							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
+							return -1;
+						}
+					} else {
+						$this->error = $prod->error;
+						$this->db->rollback();
+						return -1;
+					}
+				}
+			} else {
+				$product_type = $type;
+			}
+
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et 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);
+			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 
 			if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
 				$pu = 0;
 			}
 
-            $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $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];
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $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 = $pu_ht = $tabprice[3];
 
-            // MultiCurrency
-            $multicurrency_total_ht  = $tabprice[16];
-            $multicurrency_total_tva = $tabprice[17];
-            $multicurrency_total_ttc = $tabprice[18];
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];
 
-            //Fetch current line from the database and then clone the object and set it in $oldline property
-            $line = new SupplierProposalLine($this->db);
-            $line->fetch($rowid);
-            $line->fetch_optionals();
+			// Rang to use
+			$ranktouse = $rang;
+			if ($ranktouse == -1)
+			{
+				$rangmax = $this->line_max($fk_parent_line);
+				$ranktouse = $rangmax + 1;
+			}
 
-            // Stock previous line records
-            $staticline = clone $line;
+			// TODO A virer
+			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
+			$price = $pu;
+			$remise = 0;
+			if ($remise_percent > 0)
+			{
+				$remise = round(($pu * $remise_percent / 100), 2);
+				$price = $pu - $remise;
+			}
 
-            $line->oldline = $staticline;
-            $this->line = $line;
-            $this->line->context = $this->context;
+			// Insert line
+			$this->line = new SupplierProposalLine($this->db);
 
-            // Reorder if fk_parent_line change
-            if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
-            {
-                $rangmax = $this->line_max($fk_parent_line);
-                $this->line->rang = $rangmax + 1;
-            }
+			$this->line->fk_supplier_proposal = $this->id;
+			$this->line->label = $label;
+			$this->line->desc = $desc;
+			$this->line->qty = $qty;
+			$this->line->tva_tx = $txtva;
+			$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
+			$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
+			$this->line->localtax1_type = $localtaxes_type[0];
+			$this->line->localtax2_type = $localtaxes_type[2];
+			$this->line->fk_product = $fk_product;
+			$this->line->remise_percent = $remise_percent;
+			$this->line->subprice = $pu_ht;
+			$this->line->rang = $ranktouse;
+			$this->line->info_bits = $info_bits;
+			$this->line->total_ht = $total_ht;
+			$this->line->total_tva = $total_tva;
+			$this->line->total_localtax1 = $total_localtax1;
+			$this->line->total_localtax2 = $total_localtax2;
+			$this->line->total_ttc = $total_ttc;
+			$this->line->product_type = $type;
+			$this->line->special_code = $special_code;
+			$this->line->fk_parent_line = $fk_parent_line;
+			$this->line->fk_unit = $fk_unit;
+			$this->line->origin = $origin;
+			$this->line->origin_id = $origin_id;
+			$this->line->ref_fourn = $this->db->escape($ref_supplier);
+			$this->line->date_start = $date_start;
+			$this->line->date_end = $date_end;
 
-            $this->line->id					= $rowid;
-            $this->line->label = $label;
-            $this->line->desc = $desc;
-            $this->line->qty				= $qty;
-            $this->line->product_type = $type;
+			// infos marge
+			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+				// When fk_fournprice is 0, we take the lowest buying price
+				include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+				$productFournisseur = new ProductFournisseur($this->db);
+				$productFournisseur->find_min_price_product_fournisseur($fk_product);
+				$this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
+			} else {
+				$this->line->fk_fournprice = ($fk_fournprice > 0 ? $fk_fournprice : 0); // If fk_fournprice is -1, we will not use fk_fournprice
+			}
+			$this->line->pa_ht = $pa_ht;
+			//var_dump($this->line->fk_fournprice);exit;
 
-            $this->line->vat_src_code = $vat_src_code;
-            $this->line->tva_tx = $txtva;
-            $this->line->localtax1_tx		= $txlocaltax1;
-            $this->line->localtax2_tx		= $txlocaltax2;
-            $this->line->localtax1_type		= $localtaxes_type[0];
-            $this->line->localtax2_type		= $localtaxes_type[2];
-            $this->line->remise_percent		= $remise_percent;
-            $this->line->subprice			= $pu;
-            $this->line->info_bits			= $info_bits;
-            $this->line->total_ht			= $total_ht;
-            $this->line->total_tva			= $total_tva;
-            $this->line->total_localtax1	= $total_localtax1;
-            $this->line->total_localtax2	= $total_localtax2;
-            $this->line->total_ttc			= $total_ttc;
-            $this->line->special_code = $special_code;
-            $this->line->fk_parent_line		= $fk_parent_line;
-            $this->line->skip_update_total = $skip_update_total;
-            $this->line->ref_fourn = $ref_supplier;
-            $this->line->fk_unit = $fk_unit;
+			// Multicurrency
+			$this->line->fk_multicurrency = $this->fk_multicurrency;
+			$this->line->multicurrency_code = $this->multicurrency_code;
+			$this->line->multicurrency_subprice		= $pu_ht_devise;
+			$this->line->multicurrency_total_ht		= $multicurrency_total_ht;
+			$this->line->multicurrency_total_tva	= $multicurrency_total_tva;
+			$this->line->multicurrency_total_ttc	= $multicurrency_total_ttc;
 
-            // infos marge
-            if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
-                // by external module, take lowest buying price
-                include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-                $productFournisseur = new ProductFournisseur($this->db);
-                $productFournisseur->find_min_price_product_fournisseur($fk_product);
-                $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
-            } else {
-                $this->line->fk_fournprice = $fk_fournprice;
-            }
-            $this->line->pa_ht = $pa_ht;
+			// Mise en option de la ligne
+			if (empty($qty) && empty($special_code)) $this->line->special_code = 3;
 
-            if (is_array($array_options) && count($array_options) > 0) {
-            	// We replace values in this->line->array_options only for entries defined into $array_options
-            	foreach ($array_options as $key => $value) {
-            		$this->line->array_options[$key] = $array_options[$key];
-            	}
-            }
+			if (is_array($array_option) && count($array_option) > 0) {
+				$this->line->array_options = $array_option;
+			}
+
+			$result = $this->line->insert();
+			if ($result > 0)
+			{
+				// 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, $this->thirdparty); // 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 {
+			$this->error = 'BadStatusOfObjectToAddLine';
+			return -5;
+		}
+	}
+
+
+	/**
+	 *  Update a proposal line
+	 *
+	 *  @param      int			$rowid           	Id de la ligne
+	 *  @param      double		$pu		     	  	Prix unitaire (HT ou TTC selon price_base_type)
+	 *  @param      double		$qty            	Quantity
+	 *  @param      double		$remise_percent  	Remise effectuee sur le produit
+	 *  @param      double		$txtva	          	Taux de TVA
+	 * 	@param	  	double		$txlocaltax1		Local tax 1 rate
+	 *  @param	  	double		$txlocaltax2		Local tax 2 rate
+	 *  @param      string		$desc            	Description
+	 *	@param	  	double		$price_base_type	HT ou TTC
+	 *	@param      int			$info_bits        	Miscellaneous informations
+	 *	@param		int			$special_code		Special code (also used by externals modules!)
+	 * 	@param		int			$fk_parent_line		Id of parent line (0 in most cases, used by modules adding sublevels into lines).
+	 * 	@param		int			$skip_update_total	Keep fields total_xxx to 0 (used for special lines by some modules)
+	 *  @param		int			$fk_fournprice		Id of origin supplier price
+	 *  @param		int			$pa_ht				Price (without tax) of product when it was bought
+	 *  @param		string		$label				???
+	 *  @param		int			$type				0/1=Product/service
+	 *  @param		array		$array_options		extrafields array
+	 * 	@param		string		$ref_supplier			Supplier price reference
+	 *	@param		int			$fk_unit			Id of the unit to use.
+	 * 	@param		double		$pu_ht_devise		Unit price in currency
+	 *  @return     int     		        		0 if OK, <0 if KO
+	 */
+	public function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 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, $array_options = 0, $ref_supplier = '', $fk_unit = '', $pu_ht_devise = 0)
+	{
+		global $conf, $user, $langs, $mysoc;
+
+		dol_syslog(get_class($this)."::updateLine $rowid, $pu, $qty, $remise_percent, $txtva, $desc, $price_base_type, $info_bits");
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		// Clean parameters
+		$remise_percent = price2num($remise_percent);
+		$qty = price2num($qty);
+		$pu = price2num($pu);
+		$txtva = price2num($txtva);
+		$txlocaltax1 = price2num($txlocaltax1);
+		$txlocaltax2 = price2num($txlocaltax2);
+		$pa_ht = price2num($pa_ht);
+		if (empty($qty) && empty($special_code)) $special_code = 3; // Set option tag
+		if (!empty($qty) && $special_code == 3) $special_code = 0; // Remove option tag
+
+		if ($this->statut == 0)
+		{
+			$this->db->begin();
+
+			// Calcul du total TTC et de la TVA pour la ligne a partir de
+			// qty, pu, remise_percent et 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, $mysoc, $this->thirdparty);
+
+			// 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.
+			}
+
+			if ($conf->multicurrency->enabled && $pu_ht_devise > 0) {
+				$pu = 0;
+			}
+
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $this->thirdparty, $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];
+
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+			$pu_ht_devise = $tabprice[19];
+
+			//Fetch current line from the database and then clone the object and set it in $oldline property
+			$line = new SupplierProposalLine($this->db);
+			$line->fetch($rowid);
+			$line->fetch_optionals();
+
+			// Stock previous line records
+			$staticline = clone $line;
+
+			$line->oldline = $staticline;
+			$this->line = $line;
+			$this->line->context = $this->context;
+
+			// Reorder if fk_parent_line change
+			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
+			{
+				$rangmax = $this->line_max($fk_parent_line);
+				$this->line->rang = $rangmax + 1;
+			}
+
+			$this->line->id					= $rowid;
+			$this->line->label = $label;
+			$this->line->desc = $desc;
+			$this->line->qty				= $qty;
+			$this->line->product_type = $type;
+
+			$this->line->vat_src_code = $vat_src_code;
+			$this->line->tva_tx = $txtva;
+			$this->line->localtax1_tx		= $txlocaltax1;
+			$this->line->localtax2_tx		= $txlocaltax2;
+			$this->line->localtax1_type		= $localtaxes_type[0];
+			$this->line->localtax2_type		= $localtaxes_type[2];
+			$this->line->remise_percent		= $remise_percent;
+			$this->line->subprice			= $pu;
+			$this->line->info_bits			= $info_bits;
+			$this->line->total_ht			= $total_ht;
+			$this->line->total_tva			= $total_tva;
+			$this->line->total_localtax1	= $total_localtax1;
+			$this->line->total_localtax2	= $total_localtax2;
+			$this->line->total_ttc			= $total_ttc;
+			$this->line->special_code = $special_code;
+			$this->line->fk_parent_line		= $fk_parent_line;
+			$this->line->skip_update_total = $skip_update_total;
+			$this->line->ref_fourn = $ref_supplier;
+			$this->line->fk_unit = $fk_unit;
+
+			// infos marge
+			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
+				// by external module, take lowest buying price
+				include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+				$productFournisseur = new ProductFournisseur($this->db);
+				$productFournisseur->find_min_price_product_fournisseur($fk_product);
+				$this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
+			} else {
+				$this->line->fk_fournprice = $fk_fournprice;
+			}
+			$this->line->pa_ht = $pa_ht;
+
+			if (is_array($array_options) && count($array_options) > 0) {
+				// We replace values in this->line->array_options only for entries defined into $array_options
+				foreach ($array_options as $key => $value) {
+					$this->line->array_options[$key] = $array_options[$key];
+				}
+			}
 
 			// Multicurrency
 			$this->line->multicurrency_subprice		= $pu_ht_devise;
@@ -796,1969 +779,1900 @@ class SupplierProposal extends CommonObject
 			$this->line->multicurrency_total_tva	= $multicurrency_total_tva;
 			$this->line->multicurrency_total_ttc	= $multicurrency_total_ttc;
 
-            $result = $this->line->update();
-            if ($result > 0)
-            {
-                // Reorder if child line
-                if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+			$result = $this->line->update();
+			if ($result > 0)
+			{
+				// Reorder if child line
+				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
 
-                $this->update_price(1);
+				$this->update_price(1);
 
-                $this->fk_supplier_proposal = $this->id;
+				$this->fk_supplier_proposal = $this->id;
 
-                $this->db->commit();
-                return $result;
-            }
-            else
-            {
-                $this->error = $this->db->error();
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog(get_class($this)."::updateline Erreur -2 SupplierProposal en mode incompatible pour cette action");
-            return -2;
-        }
-    }
+				$this->db->commit();
+				return $result;
+			} else {
+				$this->error = $this->db->error();
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			dol_syslog(get_class($this)."::updateline Erreur -2 SupplierProposal en mode incompatible pour cette action");
+			return -2;
+		}
+	}
 
 
-    /**
-     *  Delete detail line
-     *
-     *  @param		int		$lineid			Id of line to delete
-     *  @return     int         			>0 if OK, <0 if KO
-     */
-    public function deleteline($lineid)
-    {
-        if ($this->statut == 0)
-        {
-            $line = new SupplierProposalLine($this->db);
+	/**
+	 *  Delete detail line
+	 *
+	 *  @param		int		$lineid			Id of line to delete
+	 *  @return     int         			>0 if OK, <0 if KO
+	 */
+	public function deleteline($lineid)
+	{
+		if ($this->statut == 0)
+		{
+			$line = new SupplierProposalLine($this->db);
 
-            // For triggers
-            $line->fetch($lineid);
+			// For triggers
+			$line->fetch($lineid);
 
-            if ($line->delete() > 0)
-            {
-                $this->update_price(1);
+			if ($line->delete() > 0)
+			{
+				$this->update_price(1);
 
-                return 1;
-            }
-            else
-            {
-                return -1;
-            }
-        }
-        else
-        {
-            return -2;
-        }
-    }
+				return 1;
+			} else {
+				return -1;
+			}
+		} else {
+			return -2;
+		}
+	}
 
 
-    /**
-     *  Create commercial proposal into database
-     * 	this->ref can be set or empty. If empty, we will use "(PROVid)"
-     *
-     * 	@param		User	$user		User that create
-     * 	@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)
-    {
-        global $langs, $conf, $mysoc, $hookmanager;
-        $error = 0;
+	/**
+	 *  Create commercial proposal into database
+	 * 	this->ref can be set or empty. If empty, we will use "(PROVid)"
+	 *
+	 * 	@param		User	$user		User that create
+	 * 	@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)
+	{
+		global $langs, $conf, $mysoc, $hookmanager;
+		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        dol_syslog(get_class($this)."::create");
+		dol_syslog(get_class($this)."::create");
 
-        // Check parameters
-        $result = $this->fetch_thirdparty();
-        if ($result < 0)
-        {
-            $this->error = "Failed to fetch company";
-            dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-            return -3;
-        }
+		// Check parameters
+		$result = $this->fetch_thirdparty();
+		if ($result < 0)
+		{
+			$this->error = "Failed to fetch company";
+			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
+			return -3;
+		}
 
-        // Check parameters
-        if (!empty($this->ref))	// We check that ref is not already used
-        {
-            $result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
-            if ($result > 0)
-            {
-                $this->error = 'ErrorRefAlreadyExists';
-                dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
-                $this->db->rollback();
-                return -1;
-            }
-        }
+		// Check parameters
+		if (!empty($this->ref))	// We check that ref is not already used
+		{
+			$result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
+			if ($result > 0)
+			{
+				$this->error = 'ErrorRefAlreadyExists';
+				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
+				$this->db->rollback();
+				return -1;
+			}
+		}
 
-        // Multicurrency
-        if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $now);
-        if (empty($this->fk_multicurrency))
-        {
-            $this->multicurrency_code = $conf->currency;
-            $this->fk_multicurrency = 0;
-            $this->multicurrency_tx = 1;
-        }
+		// Multicurrency
+		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $now);
+		if (empty($this->fk_multicurrency))
+		{
+			$this->multicurrency_code = $conf->currency;
+			$this->fk_multicurrency = 0;
+			$this->multicurrency_tx = 1;
+		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Insert into database
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."supplier_proposal (";
-        $sql .= "fk_soc";
-        $sql .= ", price";
-        $sql .= ", remise";
-        $sql .= ", remise_percent";
-        $sql .= ", remise_absolue";
-        $sql .= ", tva";
-        $sql .= ", total";
-        $sql .= ", datec";
-        $sql .= ", ref";
-        $sql .= ", fk_user_author";
-        $sql .= ", note_private";
-        $sql .= ", note_public";
-        $sql .= ", model_pdf";
-        $sql .= ", fk_cond_reglement";
-        $sql .= ", fk_mode_reglement";
-        $sql .= ", fk_account";
-        $sql .= ", date_livraison";
-        $sql .= ", fk_shipping_method";
-        $sql .= ", fk_projet";
-        $sql .= ", entity";
-        $sql .= ", fk_multicurrency";
-        $sql .= ", multicurrency_code";
-        $sql .= ", multicurrency_tx";
-        $sql .= ") ";
-        $sql .= " VALUES (";
-        $sql .= $this->socid;
-        $sql .= ", 0";
-        $sql .= ", ".$this->remise;
-        $sql .= ", ".($this->remise_percent ? $this->db->escape($this->remise_percent) : 'null');
-        $sql .= ", ".($this->remise_absolue ? $this->db->escape($this->remise_absolue) : 'null');
-        $sql .= ", 0";
-        $sql .= ", 0";
-        $sql .= ", '".$this->db->idate($now)."'";
-        $sql .= ", '(PROV)'";
-        $sql .= ", ".($user->id > 0 ? "'".$user->id."'" : "null");
-        $sql .= ", '".$this->db->escape($this->note_private)."'";
-        $sql .= ", '".$this->db->escape($this->note_public)."'";
-        $sql .= ", '".$this->db->escape($this->modelpdf)."'";
-        $sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
-        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
-        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
-        $sql .= ", ".($this->date_livraison != '' ? "'".$this->db->idate($this->date_livraison)."'" : "null");
-        $sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
-        $sql .= ", ".($this->fk_project ? $this->fk_project : "null");
-        $sql .= ", ".$conf->entity;
-        $sql .= ", ".(int) $this->fk_multicurrency;
-        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql .= ", ".(double) $this->multicurrency_tx;
-        $sql .= ")";
+		// Insert into database
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."supplier_proposal (";
+		$sql .= "fk_soc";
+		$sql .= ", price";
+		$sql .= ", remise";
+		$sql .= ", remise_percent";
+		$sql .= ", remise_absolue";
+		$sql .= ", tva";
+		$sql .= ", total";
+		$sql .= ", datec";
+		$sql .= ", ref";
+		$sql .= ", fk_user_author";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", model_pdf";
+		$sql .= ", fk_cond_reglement";
+		$sql .= ", fk_mode_reglement";
+		$sql .= ", fk_account";
+		$sql .= ", date_livraison";
+		$sql .= ", fk_shipping_method";
+		$sql .= ", fk_projet";
+		$sql .= ", entity";
+		$sql .= ", fk_multicurrency";
+		$sql .= ", multicurrency_code";
+		$sql .= ", multicurrency_tx";
+		$sql .= ") ";
+		$sql .= " VALUES (";
+		$sql .= $this->socid;
+		$sql .= ", 0";
+		$sql .= ", ".$this->remise;
+		$sql .= ", ".($this->remise_percent ? $this->db->escape($this->remise_percent) : 'null');
+		$sql .= ", ".($this->remise_absolue ? $this->db->escape($this->remise_absolue) : 'null');
+		$sql .= ", 0";
+		$sql .= ", 0";
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", '(PROV)'";
+		$sql .= ", ".($user->id > 0 ? ((int) $user->id) : "null");
+		$sql .= ", '".$this->db->escape($this->note_private)."'";
+		$sql .= ", '".$this->db->escape($this->note_public)."'";
+		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
+		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'NULL');
+		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'NULL');
+		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+		$sql .= ", ".($this->date_livraison != '' ? "'".$this->db->idate($this->date_livraison)."'" : "null");
+		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : 'NULL');
+		$sql .= ", ".($this->fk_project ? $this->fk_project : "null");
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".(int) $this->fk_multicurrency;
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".(double) $this->multicurrency_tx;
+		$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."supplier_proposal");
+		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."supplier_proposal");
 
-            if ($this->id)
-            {
-                $this->ref = '(PROV'.$this->id.')';
-                $sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
+			if ($this->id)
+			{
+				$this->ref = '(PROV'.$this->id.')';
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."supplier_proposal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
-                dol_syslog(get_class($this)."::create", LOG_DEBUG);
-                $resql = $this->db->query($sql);
-                if (!$resql) $error++;
+				dol_syslog(get_class($this)."::create", LOG_DEBUG);
+				$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)
-                                {
-                                    dol_print_error($this->db);
-                                    $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)
+								{
+									dol_print_error($this->db);
+									$error++;
+								}
+							}
+						}
+					}
+				}
 
-                /*
+				/*
                  *  Insertion du detail des produits dans la base
                  */
-                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++)
-                    {
-                        // Reset fk_parent_line for no child products and special product
-                        if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
-                            $fk_parent_line = 0;
-                        }
+					for ($i = 0; $i < $num; $i++)
+					{
+						// Reset fk_parent_line for no child products and special product
+						if (($this->lines[$i]->product_type != 9 && empty($this->lines[$i]->fk_parent_line)) || $this->lines[$i]->product_type == 9) {
+							$fk_parent_line = 0;
+						}
 
-                        $result = $this->addline(
-                            $this->lines[$i]->desc,
-                            $this->lines[$i]->subprice,
-                            $this->lines[$i]->qty,
-                            $this->lines[$i]->tva_tx,
-                            $this->lines[$i]->localtax1_tx,
-                            $this->lines[$i]->localtax2_tx,
-                            $this->lines[$i]->fk_product,
-                            $this->lines[$i]->remise_percent,
-                            'HT',
-                            0,
-                            0,
-                            $this->lines[$i]->product_type,
-                            $this->lines[$i]->rang,
-                            $this->lines[$i]->special_code,
-                            $fk_parent_line,
-                            $this->lines[$i]->fk_fournprice,
-                            $this->lines[$i]->pa_ht,
-                            $this->lines[$i]->label,
-                            $this->lines[$i]->array_options,
-                            $this->lines[$i]->ref_fourn,
-                            $this->lines[$i]->fk_unit,
-                            'supplier_proposal',
-                            $this->lines[$i]->rowid
-                        );
+						$result = $this->addline(
+							$this->lines[$i]->desc,
+							$this->lines[$i]->subprice,
+							$this->lines[$i]->qty,
+							$this->lines[$i]->tva_tx,
+							$this->lines[$i]->localtax1_tx,
+							$this->lines[$i]->localtax2_tx,
+							$this->lines[$i]->fk_product,
+							$this->lines[$i]->remise_percent,
+							'HT',
+							0,
+							0,
+							$this->lines[$i]->product_type,
+							$this->lines[$i]->rang,
+							$this->lines[$i]->special_code,
+							$fk_parent_line,
+							$this->lines[$i]->fk_fournprice,
+							$this->lines[$i]->pa_ht,
+							$this->lines[$i]->label,
+							$this->lines[$i]->array_options,
+							$this->lines[$i]->ref_fourn,
+							$this->lines[$i]->fk_unit,
+							'supplier_proposal',
+							$this->lines[$i]->rowid
+						);
 
-                        if ($result < 0)
-                        {
-                            $error++;
-                            $this->error = $this->db->error;
-                            dol_print_error($this->db);
-                            break;
-                        }
-                        // Defined the new fk_parent_line
-                        if ($result > 0 && $this->lines[$i]->product_type == 9) {
-                            $fk_parent_line = $result;
-                        }
-                    }
-                }
+						if ($result < 0)
+						{
+							$error++;
+							$this->error = $this->db->error;
+							dol_print_error($this->db);
+							break;
+						}
+						// Defined the new fk_parent_line
+						if ($result > 0 && $this->lines[$i]->product_type == 9) {
+							$fk_parent_line = $result;
+						}
+					}
+				}
 
-                if (!$error)
-                {
-                    // Mise a jour infos denormalisees
-                    $resql = $this->update_price(1);
-                    if ($resql)
-                    {
-                        $action = 'update';
+				if (!$error)
+				{
+					// Mise a jour infos denormalisees
+					$resql = $this->update_price(1);
+					if ($resql)
+					{
+						$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 && !$notrigger)
-                        {
-                            // Call trigger
-                            $result = $this->call_trigger('PROPOSAL_SUPPLIER_CREATE', $user);
-                            if ($result < 0) { $error++; }
-                            // End call triggers
-                        }
-                    }
-                    else
-                    {
-                        $this->error = $this->db->lasterror();
-                        $error++;
-                    }
-                }
-            }
-            else
-            {
-                $this->error = $this->db->lasterror();
-                $error++;
-            }
+						if (!$error && !$notrigger)
+						{
+							// Call trigger
+							$result = $this->call_trigger('PROPOSAL_SUPPLIER_CREATE', $user);
+							if ($result < 0) { $error++; }
+							// End call triggers
+						}
+					} else {
+						$this->error = $this->db->lasterror();
+						$error++;
+					}
+				}
+			} else {
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
 
-            if (!$error)
-            {
-                $this->db->commit();
-                dol_syslog(get_class($this)."::create done id=".$this->id);
-                return $this->id;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			if (!$error)
+			{
+				$this->db->commit();
+				dol_syslog(get_class($this)."::create done id=".$this->id);
+				return $this->id;
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Insert into DB a supplier_proposal object completely defined by its data members (ex, results from copy).
-     *
-     *	@param 		User	$user	User that create
-     *	@return    	int				Id of the new object if ok, <0 if ko
-     *	@see       	create()
-     */
-    public function create_from($user)
-    {
-        // phpcs:enable
-        $this->products = $this->lines;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Insert into DB a supplier_proposal object completely defined by its data members (ex, results from copy).
+	 *
+	 *	@param 		User	$user	User that create
+	 *	@return    	int				Id of the new object if ok, <0 if ko
+	 *	@see       	create()
+	 */
+	public function create_from($user)
+	{
+		// phpcs:enable
+		$this->products = $this->lines;
 
-        return $this->create($user);
-    }
+		return $this->create($user);
+	}
 
-    /**
-     *		Load an object from its id and create a new one in database
-     *
+	/**
+	 *		Load an object from its id and create a new one in database
+	 *
 	 *      @param	    User	$user		    User making the clone
-     *		@param		int		$fromid			Id of thirdparty
-     * 	 	@return		int						New id of clone
-     */
-    public function createFromClone(User $user, $fromid = 0)
-    {
-        global $conf, $hookmanager;
-
-        $error = 0;
-        $now = dol_now();
-
-        $this->db->begin();
-
-        // get extrafields so they will be clone
-        foreach ($this->lines as $line)
-            $line->fetch_optionals();
-
-        // Load source object
-        $objFrom = clone $this;
-
-        $objsoc = new Societe($this->db);
-
-        // Change socid if needed
-        if (!empty($fromid) && $fromid != $this->socid)
-        {
-            if ($objsoc->fetch($fromid) > 0)
-            {
-                $this->socid = $objsoc->id;
-                $this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-                $this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
-                $this->fk_project = '';
-            }
-
-            // TODO Change product price if multi-prices
-        }
-        else
-        {
-            $objsoc->fetch($this->socid);
-        }
-
-        $this->id = 0;
-        $this->statut = 0;
-
-        if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
-        {
-            $this->error = 'ErrorSetupNotComplete';
-            return -1;
-        }
-
-        // Clear fields
-        $this->user_author = $user->id;
-        $this->user_valid = '';
-        $this->date = $now;
-
-        // Set ref
-        require_once DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php';
-        $obj = $conf->global->SUPPLIER_PROPOSAL_ADDON;
-        $modSupplierProposal = new $obj;
-        $this->ref = $modSupplierProposal->getNextValue($objsoc, $this);
-
-        // Create clone
-        $this->context['createfromclone'] = 'createfromclone';
-        $result = $this->create($user);
-        if ($result < 0) $error++;
-
-        if (!$error)
-        {
-            // Hook of thirdparty module
-            if (is_object($hookmanager))
-            {
-                $parameters = array('objFrom'=>$objFrom);
-                $action = '';
-                $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-                if ($reshook < 0) $error++;
-            }
-        }
-
-        unset($this->context['createfromclone']);
-
-        // End
-        if (!$error)
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Load a proposal from database and its ligne array
-     *
-     *	@param      int			$rowid		id of object to load
-     *	@param		string		$ref		Ref of proposal
-     *	@return     int         			>0 if OK, <0 if KO
-     */
-    public function fetch($rowid, $ref = '')
-    {
-        global $conf;
-
-        $sql = "SELECT p.rowid, p.entity, p.ref, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc";
-        $sql .= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
-        $sql .= ", p.datec";
-        $sql .= ", p.date_valid as datev";
-        $sql .= ", p.date_livraison as date_livraison";
-        $sql .= ", p.model_pdf, p.extraparams";
-        $sql .= ", p.note_private, p.note_public";
-        $sql .= ", p.fk_projet as fk_project, p.fk_statut";
-        $sql .= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
-        $sql .= ", p.fk_cond_reglement";
-        $sql .= ", p.fk_mode_reglement";
-        $sql .= ', p.fk_account';
-        $sql .= ", p.fk_shipping_method";
-        $sql .= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
-        $sql .= ", c.label as statut_label";
-        $sql .= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
-        $sql .= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
-        $sql .= " WHERE p.fk_statut = c.id";
-        $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
-        if ($ref) $sql .= " AND p.ref='".$ref."'";
-        else $sql .= " AND p.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);
-
-                $this->id                   = $obj->rowid;
-                $this->entity               = $obj->entity;
-
-                $this->ref                  = $obj->ref;
-                $this->remise               = $obj->remise;
-                $this->remise_percent       = $obj->remise_percent;
-                $this->remise_absolue       = $obj->remise_absolue;
-                $this->total                = $obj->total; // TODO deprecated
-                $this->total_ht             = $obj->total_ht;
-                $this->total_tva            = $obj->tva;
-                $this->total_localtax1		= $obj->localtax1;
-                $this->total_localtax2		= $obj->localtax2;
-                $this->total_ttc            = $obj->total;
-                $this->socid                = $obj->fk_soc;
-                $this->fk_project           = $obj->fk_project;
-                $this->modelpdf             = $obj->model_pdf;
-                $this->note                 = $obj->note_private; // TODO deprecated
-                $this->note_private         = $obj->note_private;
-                $this->note_public          = $obj->note_public;
-                $this->statut               = (int) $obj->fk_statut;
-                $this->statut_libelle       = $obj->statut_label;
-                $this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
-                $this->datev                = $this->db->jdate($obj->datev); // TODO deprecated
-                $this->date_creation = $this->db->jdate($obj->datec); //Creation date
-                $this->date_validation = $this->db->jdate($obj->datev); //Validation date
-                $this->date_livraison       = $this->db->jdate($obj->date_livraison);
-                $this->shipping_method_id   = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
-
-                $this->mode_reglement_id    = $obj->fk_mode_reglement;
-                $this->mode_reglement_code  = $obj->mode_reglement_code;
-                $this->mode_reglement       = $obj->mode_reglement;
-                $this->fk_account           = ($obj->fk_account > 0) ? $obj->fk_account : null;
-                $this->cond_reglement_id    = $obj->fk_cond_reglement;
-                $this->cond_reglement_code  = $obj->cond_reglement_code;
-                $this->cond_reglement       = $obj->cond_reglement;
-                $this->cond_reglement_doc   = $obj->cond_reglement_libelle_doc;
-
-                $this->extraparams = (array) json_decode($obj->extraparams, true);
-
-                $this->user_author_id = $obj->fk_user_author;
-                $this->user_valid_id  = $obj->fk_user_valid;
-                $this->user_close_id  = $obj->fk_user_cloture;
-
-                // Multicurrency
-                $this->fk_multicurrency 		= $obj->fk_multicurrency;
-                $this->multicurrency_code = $obj->multicurrency_code;
-                $this->multicurrency_tx 		= $obj->multicurrency_tx;
-                $this->multicurrency_total_ht = $obj->multicurrency_total_ht;
-                $this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
-                $this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
-
-                if ($obj->fk_statut == 0)
-                {
-                    $this->brouillon = 1;
-                }
-
-                // Retreive all extrafield
-                // fetch optionals attributes and labels
-                $this->fetch_optionals();
-
-                $this->db->free($resql);
-
-                $this->lines = array();
-
-                // Lines of supplier proposals
-                $sql = "SELECT d.rowid, d.fk_supplier_proposal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
-                $sql .= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
-                $sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
-                $sql .= ' d.ref_fourn as ref_produit_fourn,';
-                $sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc, d.fk_unit';
-                $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
-                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
-                $sql .= " WHERE d.fk_supplier_proposal = ".$this->id;
-                $sql .= " ORDER by d.rang";
-
-                $result = $this->db->query($sql);
-                if ($result)
-                {
-                    $num = $this->db->num_rows($result);
-                    $i = 0;
-
-                    while ($i < $num)
-                    {
-                        $objp                   = $this->db->fetch_object($result);
-
-                        $line                   = new SupplierProposalLine($this->db);
-
-                        $line->rowid = $objp->rowid; // deprecated
-                        $line->id = $objp->rowid;
-                        $line->fk_supplier_proposal = $objp->fk_supplier_proposal;
-                        $line->fk_parent_line = $objp->fk_parent_line;
-                        $line->product_type     = $objp->product_type;
-                        $line->label            = $objp->custom_label;
-                        $line->desc             = $objp->description; // Description ligne
-                        $line->qty              = $objp->qty;
-                        $line->tva_tx           = $objp->tva_tx;
-                        $line->localtax1_tx		= $objp->localtax1_tx;
-                        $line->localtax2_tx		= $objp->localtax2_tx;
-                        $line->subprice         = $objp->subprice;
-                        $line->fk_remise_except = $objp->fk_remise_except;
-                        $line->remise_percent   = $objp->remise_percent;
-
-                        $line->info_bits        = $objp->info_bits;
-                        $line->total_ht         = $objp->total_ht;
-                        $line->total_tva        = $objp->total_tva;
-                        $line->total_localtax1	= $objp->total_localtax1;
-                        $line->total_localtax2	= $objp->total_localtax2;
-                        $line->total_ttc        = $objp->total_ttc;
-                          $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);
-                        $line->pa_ht = $marginInfos[0];
-                        $line->marge_tx			= $marginInfos[1];
-                        $line->marque_tx		= $marginInfos[2];
-                        $line->special_code     = $objp->special_code;
-                        $line->rang             = $objp->rang;
-
-                        $line->fk_product       = $objp->fk_product;
-
-                        $line->ref = $objp->product_ref; // deprecated
-                        $line->product_ref = $objp->product_ref;
-                        $line->libelle = $objp->product_label; // deprecated
-                        $line->product_label = $objp->product_label;
-                        $line->product_desc     = $objp->product_desc; // Description produit
-                        $line->fk_product_type  = $objp->fk_product_type;
-
-                        $line->ref_fourn = $objp->ref_produit_fourn;
-
-                        // Multicurrency
-                        $line->fk_multicurrency = $objp->fk_multicurrency;
-                        $line->multicurrency_code = $objp->multicurrency_code;
-                        $line->multicurrency_subprice 	= $objp->multicurrency_subprice;
-                        $line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
-                        $line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
-                        $line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
-                        $line->fk_unit = $objp->fk_unit;
-
-                        $this->lines[$i] = $line;
-
-                        $i++;
-                    }
-                    $this->db->free($result);
-                }
-                else
-                {
-                    $this->error = $this->db->error();
-                    return -1;
-                }
-
-                // Retreive all extrafield
-                // fetch optionals attributes and labels
-                $this->fetch_optionals();
-
-                return 1;
-            }
-
-            $this->error = "Record Not Found";
-            return 0;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *  Set status to validated
-     *
-     *  @param	User	$user       Object user that validate
-     *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *  @return int         		<0 if KO, >=0 if OK
-     */
-    public function valid($user, $notrigger = 0)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        global $conf, $langs;
-
-        $error = 0;
-        $now = dol_now();
-
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))
-           || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))
-        {
-            $this->db->begin();
-
-            // Numbering module definition
-            $soc = new Societe($this->db);
-            $soc->fetch($this->socid);
-
-            // 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
-            {
-                $num = $this->getNextNumRef($soc);
-            }
-            else
-            {
-                $num = $this->ref;
-            }
-            $this->newref = dol_sanitizeFileName($num);
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-            $sql .= " SET ref = '".$this->db->escape($num)."',";
-            $sql .= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
-            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
-
-            dol_syslog(get_class($this)."::valid", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (!$resql)
-            {
-                dol_print_error($this->db);
-                $error++;
-            }
-
-               // Trigger calls
-            if (!$error && !$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('PROPOSAL_SUPPLIER_VALIDATE', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-
-            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 = 'supplier_proposal/".$this->db->escape($this->newref)."'";
-                	$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'supplier_proposal/".$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->supplier_proposal->dir_output.'/'.$oldref;
-                    $dirdest = $conf->supplier_proposal->dir_output.'/'.$newref;
-                    if (!$error && file_exists($dirsource))
-                    {
-                        dol_syslog(get_class($this)."::valid 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->supplier_proposal->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);
-                            }
-                        }
-                    }
-                }
-
-                $this->ref = $num;
-                $this->brouillon = 0;
-                $this->statut = 1;
-                $this->user_valid_id = $user->id;
-                $this->datev = $now;
-
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            dol_syslog("You don't have permission to validate supplier proposal", LOG_WARNING);
-            return -2;
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Set delivery date
-     *
-     *	@param      User 		$user        		Object user that modify
-     *	@param      int			$date_livraison     Delivery date
-     *	@return     int         					<0 if ko, >0 if ok
-     */
-    public function set_date_livraison($user, $date_livraison)
-    {
-        // phpcs:enable
-        if (!empty($user->rights->supplier_proposal->creer))
-        {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
-            $sql .= " SET date_livraison = ".($date_livraison != '' ? "'".$this->db->idate($date_livraison)."'" : 'null');
-            $sql .= " WHERE rowid = ".$this->id;
-
-            if ($this->db->query($sql))
-            {
-                $this->date_livraison = $date_livraison;
-                return 1;
-            }
-            else
-            {
-                $this->error = $this->db->error();
-                dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
-                return -1;
-            }
-        }
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Set an overall discount on the proposal
-     *
-     *	@param      User	$user       Object user that modify
-     *	@param      double	$remise      Amount discount
-     *	@return     int         		<0 if ko, >0 if ok
-     */
-    public function set_remise_percent($user, $remise)
-    {
-        // phpcs:enable
-        $remise = trim($remise) ?trim($remise) : 0;
-
-        if (!empty($user->rights->supplier_proposal->creer))
-        {
-            $remise = price2num($remise);
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET remise_percent = ".$remise;
-            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
-
-            if ($this->db->query($sql))
-            {
-                $this->remise_percent = $remise;
-                $this->update_price(1);
-                return 1;
-            }
-            else
-            {
-                $this->error = $this->db->error();
-                return -1;
-            }
-        }
-    }
-
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Set an absolute overall discount on the proposal
-     *
-     *	@param      User	$user        Object user that modify
-     *	@param      double	$remise      Amount discount
-     *	@return     int         		<0 if ko, >0 if ok
-     */
-    public function set_remise_absolue($user, $remise)
-    {
-        // phpcs:enable
-        $remise = trim($remise) ?trim($remise) : 0;
-
-        if (!empty($user->rights->supplier_proposal->creer))
-        {
-            $remise = price2num($remise);
-
-            $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
-            $sql .= " SET remise_absolue = ".$remise;
-            $sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
-
-            if ($this->db->query($sql))
-            {
-                $this->remise_absolue = $remise;
-                $this->update_price(1);
-                return 1;
-            }
-            else
-            {
-                $this->error = $this->db->error();
-                return -1;
-            }
-        }
-    }
-
-
-
-    /**
-     *	Reopen the commercial proposal
-     *
-     *	@param      User	$user		Object user that close
-     *	@param      int		$statut		Statut
-     *	@param      string	$note		Comment
-     *  @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)
-    {
-        global $langs, $conf;
-
-        $this->statut = $statut;
-        $error = 0;
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql .= " SET fk_statut = ".$this->statut.",";
-        if (!empty($note)) $sql .= " note_private = '".$this->db->escape($note)."',";
-        $sql .= " date_cloture=NULL, fk_user_cloture=NULL";
-        $sql .= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::reopen", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $error++; $this->errors[] = "Error ".$this->db->lasterror();
-        }
-        if (!$error)
-        {
-            if (!$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('PROPOSAL_SUPPLIER_REOPEN', $user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            if (!empty($this->errors))
-            {
-                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;
-        }
-    }
-
-
-    /**
-     *	Close the askprice
-     *
-     *	@param      User	$user		Object user that close
-     *	@param      int		$status		Status
-     *	@param      string	$note		Comment
-     *	@return     int         		<0 if KO, >0 if OK
-     */
-    public function cloture($user, $status, $note)
-    {
-        global $langs, $conf;
-
-        $this->statut = $status;
-        $error = 0;
-        $now = dol_now();
-
-        $this->db->begin();
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql .= " SET fk_statut = ".$status.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
-        $sql .= " WHERE rowid = ".$this->id;
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
-            $triggerName = 'PROPOSAL_SUPPLIER_CLOSE_REFUSED';
-
-            if ($status == 2)
-            {
-                $triggerName = 'PROPOSAL_SUPPLIER_CLOSE_SIGNED';
-                $modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
-
-                if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
-                {
-                    $result = $this->updateOrCreatePriceFournisseur($user);
-                }
-            }
-            if ($status == 4)
-            {
-                $triggerName = 'PROPOSAL_SUPPLIER_CLASSIFY_BILLED';
-            }
-
-            if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-            {
-                // Define output language
-                $outputlangs = $langs;
-                if (!empty($conf->global->MAIN_MULTILANGS)) {
-                    $outputlangs = new Translate("", $conf);
-                    $newlang = (GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $this->thirdparty->default_lang);
-                    $outputlangs->setDefaultLang($newlang);
-                }
-                //$ret=$object->fetch($id);    // Reload to get new records
-                $this->generateDocument($modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-            }
-
-            // Call trigger
-            $result = $this->call_trigger($triggerName, $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-
-            if (!$error)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
-            {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            $this->errors[] = $this->db->lasterror();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Add or update supplier price according to result of proposal
-     *
-     *	@param     User	    $user       Object user
-     *  @return    int                  > 0 if OK
-     */
-    public function updateOrCreatePriceFournisseur($user)
-    {
-        global $conf;
-
-        dol_syslog(get_class($this)."::updateOrCreatePriceFournisseur", LOG_DEBUG);
-        foreach ($this->lines as $product)
-        {
-            if ($product->subprice <= 0) continue;
-            $productsupplier = new ProductFournisseur($this->db);
-
-            $multicurrency_tx = 1;
-            $fk_multicurrency = 0;
-
-            if (empty($this->thirdparty)) $this->fetch_thirdparty();
-
-            $ref_fourn = $product->ref_fourn;
-            if (empty($ref_fourn)) $ref_fourn = $product->ref_supplier;
-            if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) list($fk_multicurrency, $multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $product->multicurrency_code);
-            $productsupplier->id = $product->fk_product;
-
-            $productsupplier->update_buyprice($product->qty, $product->total_ht, $user, 'HT', $this->thirdparty, '', $ref_fourn, $product->tva_tx, 0, 0, 0, $product->info_bits, '', '', array(), '', $product->multicurrency_total_ht, 'HT', $multicurrency_tx, $product->multicurrency_code, '', '', '');
-        }
-
-        return 1;
-    }
-
-    /**
-     *	Upate ProductFournisseur
-     *
-     * 	@param		int 	$idProductFournPrice	id of llx_product_fournisseur_price
-     * 	@param		Product $product				contain informations to update
-     *	@param      User	$user					Object user
-     *	@return     int         					<0 if KO, >0 if OK
-     */
-    public function updatePriceFournisseur($idProductFournPrice, $product, $user)
-    {
-        $price = price2num($product->subprice * $product->qty, 'MU');
-        $unitPrice = price2num($product->subprice, 'MU');
-
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'product_fournisseur_price SET '.(!empty($product->ref_fourn) ? 'ref_fourn = "'.$product->ref_fourn.'", ' : '').' price ='.$price.', unitprice ='.$unitPrice.' WHERE rowid = '.$idProductFournPrice;
-
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-     /**
-     *	Create ProductFournisseur
-     *
-     *	@param		Product 	$product	Object Product
-     *	@param      User		$user		Object user
-     *	@return     int         			<0 if KO, >0 if OK
-     */
-    public function createPriceFournisseur($product, $user)
-    {
-    	global $conf;
-
-        $price = price2num($product->subprice * $product->qty, 'MU');
-        $qty = price2num($product->qty);
-        $unitPrice = price2num($product->subprice, 'MU');
-
-        $now = dol_now();
-
-        $values = array(
-            "'".$this->db->idate($now)."'",
-            $product->fk_product,
-            $this->thirdparty->id,
-            "'".$product->ref_fourn."'",
-            $price,
-            $qty,
-            $unitPrice,
-            $product->tva_tx,
-            $user->id
-        );
-        if (!empty($conf->multicurrency->enabled)) {
-            if (!empty($product->multicurrency_code)) {
+	 *		@param		int		$fromid			Id of thirdparty
+	 * 	 	@return		int						New id of clone
+	 */
+	public function createFromClone(User $user, $fromid = 0)
+	{
+		global $conf, $hookmanager;
+
+		$error = 0;
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// get extrafields so they will be clone
+		foreach ($this->lines as $line)
+			$line->fetch_optionals();
+
+		// Load source object
+		$objFrom = clone $this;
+
+		$objsoc = new Societe($this->db);
+
+		// Change socid if needed
+		if (!empty($fromid) && $fromid != $this->socid)
+		{
+			if ($objsoc->fetch($fromid) > 0)
+			{
+				$this->socid = $objsoc->id;
+				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
+				$this->fk_project = '';
+			}
+
+			// TODO Change product price if multi-prices
+		} else {
+			$objsoc->fetch($this->socid);
+		}
+
+		$this->id = 0;
+		$this->statut = 0;
+
+		if (empty($conf->global->SUPPLIER_PROPOSAL_ADDON) || !is_readable(DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.".php"))
+		{
+			$this->error = 'ErrorSetupNotComplete';
+			return -1;
+		}
+
+		// Clear fields
+		$this->user_author = $user->id;
+		$this->user_valid = '';
+		$this->date = $now;
+
+		// Set ref
+		require_once DOL_DOCUMENT_ROOT."/core/modules/supplier_proposal/".$conf->global->SUPPLIER_PROPOSAL_ADDON.'.php';
+		$obj = $conf->global->SUPPLIER_PROPOSAL_ADDON;
+		$modSupplierProposal = new $obj;
+		$this->ref = $modSupplierProposal->getNextValue($objsoc, $this);
+
+		// Create clone
+		$this->context['createfromclone'] = 'createfromclone';
+		$result = $this->create($user);
+		if ($result < 0) $error++;
+
+		if (!$error)
+		{
+			// Hook of thirdparty module
+			if (is_object($hookmanager))
+			{
+				$parameters = array('objFrom'=>$objFrom);
+				$action = '';
+				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) $error++;
+			}
+		}
+
+		unset($this->context['createfromclone']);
+
+		// End
+		if (!$error)
+		{
+			$this->db->commit();
+			return $this->id;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Load a proposal from database and its ligne array
+	 *
+	 *	@param      int			$rowid		id of object to load
+	 *	@param		string		$ref		Ref of proposal
+	 *	@return     int         			>0 if OK, <0 if KO
+	 */
+	public function fetch($rowid, $ref = '')
+	{
+		global $conf;
+
+		$sql = "SELECT p.rowid, p.entity, p.ref, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc";
+		$sql .= ", p.total, p.tva, p.localtax1, p.localtax2, p.total_ht";
+		$sql .= ", p.datec";
+		$sql .= ", p.date_valid as datev";
+		$sql .= ", p.date_livraison as date_livraison";
+		$sql .= ", p.model_pdf, p.extraparams";
+		$sql .= ", p.note_private, p.note_public";
+		$sql .= ", p.fk_projet as fk_project, p.fk_statut";
+		$sql .= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
+		$sql .= ", p.fk_cond_reglement";
+		$sql .= ", p.fk_mode_reglement";
+		$sql .= ', p.fk_account';
+		$sql .= ", p.fk_shipping_method";
+		$sql .= ", p.fk_multicurrency, p.multicurrency_code, p.multicurrency_tx, p.multicurrency_total_ht, p.multicurrency_total_tva, p.multicurrency_total_ttc";
+		$sql .= ", c.label as statut_label";
+		$sql .= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
+		$sql .= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_propalst as c, ".MAIN_DB_PREFIX."supplier_proposal as p";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as cp ON p.fk_mode_reglement = cp.id';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as cr ON p.fk_cond_reglement = cr.rowid';
+		$sql .= " WHERE p.fk_statut = c.id";
+		$sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";
+		if ($ref) $sql .= " AND p.ref='".$ref."'";
+		else $sql .= " AND p.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);
+
+				$this->id                   = $obj->rowid;
+				$this->entity               = $obj->entity;
+
+				$this->ref                  = $obj->ref;
+				$this->remise               = $obj->remise;
+				$this->remise_percent       = $obj->remise_percent;
+				$this->remise_absolue       = $obj->remise_absolue;
+				$this->total                = $obj->total; // TODO deprecated
+				$this->total_ht             = $obj->total_ht;
+				$this->total_tva            = $obj->tva;
+				$this->total_localtax1		= $obj->localtax1;
+				$this->total_localtax2		= $obj->localtax2;
+				$this->total_ttc            = $obj->total;
+				$this->socid                = $obj->fk_soc;
+				$this->fk_project           = $obj->fk_project;
+				$this->model_pdf            = $obj->model_pdf;
+				$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;
+				$this->statut               = (int) $obj->fk_statut;
+				$this->statut_libelle       = $obj->statut_label;
+				$this->datec                = $this->db->jdate($obj->datec); // TODO deprecated
+				$this->datev                = $this->db->jdate($obj->datev); // TODO deprecated
+				$this->date_creation = $this->db->jdate($obj->datec); //Creation date
+				$this->date_validation = $this->db->jdate($obj->datev); //Validation date
+				$this->date_livraison       = $this->db->jdate($obj->date_livraison);
+				$this->shipping_method_id   = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
+
+				$this->mode_reglement_id    = $obj->fk_mode_reglement;
+				$this->mode_reglement_code  = $obj->mode_reglement_code;
+				$this->mode_reglement       = $obj->mode_reglement;
+				$this->fk_account           = ($obj->fk_account > 0) ? $obj->fk_account : null;
+				$this->cond_reglement_id    = $obj->fk_cond_reglement;
+				$this->cond_reglement_code  = $obj->cond_reglement_code;
+				$this->cond_reglement       = $obj->cond_reglement;
+				$this->cond_reglement_doc   = $obj->cond_reglement_libelle_doc;
+
+				$this->extraparams = (array) json_decode($obj->extraparams, true);
+
+				$this->user_author_id = $obj->fk_user_author;
+				$this->user_valid_id  = $obj->fk_user_valid;
+				$this->user_close_id  = $obj->fk_user_cloture;
+
+				// Multicurrency
+				$this->fk_multicurrency 		= $obj->fk_multicurrency;
+				$this->multicurrency_code = $obj->multicurrency_code;
+				$this->multicurrency_tx 		= $obj->multicurrency_tx;
+				$this->multicurrency_total_ht = $obj->multicurrency_total_ht;
+				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+
+				if ($obj->fk_statut == 0)
+				{
+					$this->brouillon = 1;
+				}
+
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
+
+				$this->db->free($resql);
+
+				$this->lines = array();
+
+				// Lines of supplier proposals
+				$sql = "SELECT d.rowid, d.fk_supplier_proposal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
+				$sql .= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,";
+				$sql .= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,';
+				$sql .= ' d.ref_fourn as ref_produit_fourn,';
+				$sql .= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc, d.fk_unit';
+				$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
+				$sql .= " WHERE d.fk_supplier_proposal = ".$this->id;
+				$sql .= " ORDER by d.rang";
+
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$num = $this->db->num_rows($result);
+					$i = 0;
+
+					while ($i < $num)
+					{
+						$objp                   = $this->db->fetch_object($result);
+
+						$line                   = new SupplierProposalLine($this->db);
+
+						$line->rowid = $objp->rowid; // deprecated
+						$line->id = $objp->rowid;
+						$line->fk_supplier_proposal = $objp->fk_supplier_proposal;
+						$line->fk_parent_line = $objp->fk_parent_line;
+						$line->product_type     = $objp->product_type;
+						$line->label            = $objp->custom_label;
+						$line->desc             = $objp->description; // Description ligne
+						$line->qty              = $objp->qty;
+						$line->tva_tx           = $objp->tva_tx;
+						$line->localtax1_tx		= $objp->localtax1_tx;
+						$line->localtax2_tx		= $objp->localtax2_tx;
+						$line->subprice         = $objp->subprice;
+						$line->fk_remise_except = $objp->fk_remise_except;
+						$line->remise_percent   = $objp->remise_percent;
+
+						$line->info_bits        = $objp->info_bits;
+						$line->total_ht         = $objp->total_ht;
+						$line->total_tva        = $objp->total_tva;
+						$line->total_localtax1	= $objp->total_localtax1;
+						$line->total_localtax2	= $objp->total_localtax2;
+						$line->total_ttc        = $objp->total_ttc;
+						  $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);
+						$line->pa_ht = $marginInfos[0];
+						$line->marge_tx			= $marginInfos[1];
+						$line->marque_tx		= $marginInfos[2];
+						$line->special_code     = $objp->special_code;
+						$line->rang             = $objp->rang;
+
+						$line->fk_product       = $objp->fk_product;
+
+						$line->ref = $objp->product_ref; // deprecated
+						$line->product_ref = $objp->product_ref;
+						$line->libelle = $objp->product_label; // deprecated
+						$line->product_label = $objp->product_label;
+						$line->product_desc     = $objp->product_desc; // Description produit
+						$line->fk_product_type  = $objp->fk_product_type;
+
+						$line->ref_fourn = $objp->ref_produit_fourn;
+
+						// Multicurrency
+						$line->fk_multicurrency = $objp->fk_multicurrency;
+						$line->multicurrency_code = $objp->multicurrency_code;
+						$line->multicurrency_subprice 	= $objp->multicurrency_subprice;
+						$line->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+						$line->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+						$line->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+						$line->fk_unit = $objp->fk_unit;
+
+						$this->lines[$i] = $line;
+
+						$i++;
+					}
+					$this->db->free($result);
+				} else {
+					$this->error = $this->db->error();
+					return -1;
+				}
+
+				// Retreive all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
+
+				return 1;
+			}
+
+			$this->error = "Record Not Found";
+			return 0;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Set status to validated
+	 *
+	 *  @param	User	$user       Object user that validate
+	 *  @param	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @return int         		<0 if KO, >=0 if OK
+	 */
+	public function valid($user, $notrigger = 0)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		global $conf, $langs;
+
+		$error = 0;
+		$now = dol_now();
+
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->creer))
+		   || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->supplier_proposal->validate_advance)))
+		{
+			$this->db->begin();
+
+			// Numbering module definition
+			$soc = new Societe($this->db);
+			$soc->fetch($this->socid);
+
+			// 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
+			{
+				$num = $this->getNextNumRef($soc);
+			} else {
+				$num = $this->ref;
+			}
+			$this->newref = dol_sanitizeFileName($num);
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id;
+			$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+
+			dol_syslog(get_class($this)."::valid", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				dol_print_error($this->db);
+				$error++;
+			}
+
+			   // Trigger calls
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('PROPOSAL_SUPPLIER_VALIDATE', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+
+			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 = 'supplier_proposal/".$this->db->escape($this->newref)."'";
+					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'supplier_proposal/".$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->supplier_proposal->dir_output.'/'.$oldref;
+					$dirdest = $conf->supplier_proposal->dir_output.'/'.$newref;
+					if (!$error && file_exists($dirsource))
+					{
+						dol_syslog(get_class($this)."::valid 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->supplier_proposal->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);
+							}
+						}
+					}
+				}
+
+				$this->ref = $num;
+				$this->brouillon = 0;
+				$this->statut = 1;
+				$this->user_valid_id = $user->id;
+				$this->datev = $now;
+
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			dol_syslog("You don't have permission to validate supplier proposal", LOG_WARNING);
+			return -2;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Set delivery date
+	 *
+	 *	@param      User 		$user        		Object user that modify
+	 *	@param      int			$date_livraison     Delivery date
+	 *	@return     int         					<0 if ko, >0 if ok
+	 */
+	public function set_date_livraison($user, $date_livraison)
+	{
+		// phpcs:enable
+		if (!empty($user->rights->supplier_proposal->creer))
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
+			$sql .= " SET date_livraison = ".($date_livraison != '' ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
+
+			if ($this->db->query($sql))
+			{
+				$this->date_livraison = $date_livraison;
+				return 1;
+			} else {
+				$this->error = $this->db->error();
+				dol_syslog(get_class($this)."::set_date_livraison Erreur SQL");
+				return -1;
+			}
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Set an overall discount on the proposal
+	 *
+	 *	@param      User	$user       Object user that modify
+	 *	@param      double	$remise      Amount discount
+	 *	@return     int         		<0 if ko, >0 if ok
+	 */
+	public function set_remise_percent($user, $remise)
+	{
+		// phpcs:enable
+		$remise = trim($remise) ?trim($remise) : 0;
+
+		if (!empty($user->rights->supplier_proposal->creer))
+		{
+			$remise = price2num($remise);
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal SET remise_percent = ".$remise;
+			$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+
+			if ($this->db->query($sql))
+			{
+				$this->remise_percent = $remise;
+				$this->update_price(1);
+				return 1;
+			} else {
+				$this->error = $this->db->error();
+				return -1;
+			}
+		}
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Set an absolute overall discount on the proposal
+	 *
+	 *	@param      User	$user        Object user that modify
+	 *	@param      double	$remise      Amount discount
+	 *	@return     int         		<0 if ko, >0 if ok
+	 */
+	public function set_remise_absolue($user, $remise)
+	{
+		// phpcs:enable
+		$remise = trim($remise) ?trim($remise) : 0;
+
+		if (!empty($user->rights->supplier_proposal->creer))
+		{
+			$remise = price2num($remise);
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal ";
+			$sql .= " SET remise_absolue = ".$remise;
+			$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
+
+			if ($this->db->query($sql))
+			{
+				$this->remise_absolue = $remise;
+				$this->update_price(1);
+				return 1;
+			} else {
+				$this->error = $this->db->error();
+				return -1;
+			}
+		}
+	}
+
+
+
+	/**
+	 *	Reopen the commercial proposal
+	 *
+	 *	@param      User	$user		Object user that close
+	 *	@param      int		$statut		Statut
+	 *	@param      string	$note		Comment
+	 *  @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)
+	{
+		global $langs, $conf;
+
+		$this->statut = $statut;
+		$error = 0;
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
+		$sql .= " SET fk_statut = ".$this->statut.",";
+		if (!empty($note)) $sql .= " note_private = '".$this->db->escape($note)."',";
+		$sql .= " date_cloture=NULL, fk_user_cloture=NULL";
+		$sql .= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::reopen", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
+		if (!$error)
+		{
+			if (!$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('PROPOSAL_SUPPLIER_REOPEN', $user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			if (!empty($this->errors))
+			{
+				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;
+		}
+	}
+
+
+	/**
+	 *	Close the askprice
+	 *
+	 *	@param      User	$user		Object user that close
+	 *	@param      int		$status		Status
+	 *	@param      string	$note		Comment
+	 *	@return     int         		<0 if KO, >0 if OK
+	 */
+	public function cloture($user, $status, $note)
+	{
+		global $langs, $conf;
+
+		$this->statut = $status;
+		$error = 0;
+		$now = dol_now();
+
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
+		$sql .= " SET fk_statut = ".$status.", note_private = '".$this->db->escape($note)."', date_cloture='".$this->db->idate($now)."', fk_user_cloture=".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
+			$triggerName = 'PROPOSAL_SUPPLIER_CLOSE_REFUSED';
+
+			if ($status == 2)
+			{
+				$triggerName = 'PROPOSAL_SUPPLIER_CLOSE_SIGNED';
+				$modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
+
+				if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
+				{
+					$result = $this->updateOrCreatePriceFournisseur($user);
+				}
+			}
+			if ($status == 4)
+			{
+				$triggerName = 'PROPOSAL_SUPPLIER_CLASSIFY_BILLED';
+			}
+
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				// Define output language
+				$outputlangs = $langs;
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
+					$outputlangs = new Translate("", $conf);
+					$newlang = (GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $this->thirdparty->default_lang);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				//$ret=$object->fetch($id);    // Reload to get new records
+				$this->generateDocument($modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+
+			// Call trigger
+			$result = $this->call_trigger($triggerName, $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+
+			if (!$error)
+			{
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Add or update supplier price according to result of proposal
+	 *
+	 *	@param     User	    $user       Object user
+	 *  @return    int                  > 0 if OK
+	 */
+	public function updateOrCreatePriceFournisseur($user)
+	{
+		global $conf;
+
+		dol_syslog(get_class($this)."::updateOrCreatePriceFournisseur", LOG_DEBUG);
+		foreach ($this->lines as $product)
+		{
+			if ($product->subprice <= 0) continue;
+			$productsupplier = new ProductFournisseur($this->db);
+
+			$multicurrency_tx = 1;
+			$fk_multicurrency = 0;
+
+			if (empty($this->thirdparty)) $this->fetch_thirdparty();
+
+			$ref_fourn = $product->ref_fourn;
+			if (empty($ref_fourn)) $ref_fourn = $product->ref_supplier;
+			if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) list($fk_multicurrency, $multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $product->multicurrency_code);
+			$productsupplier->id = $product->fk_product;
+
+			$productsupplier->update_buyprice($product->qty, $product->total_ht, $user, 'HT', $this->thirdparty, '', $ref_fourn, $product->tva_tx, 0, 0, 0, $product->info_bits, '', '', array(), '', $product->multicurrency_total_ht, 'HT', $multicurrency_tx, $product->multicurrency_code, '', '', '');
+		}
+
+		return 1;
+	}
+
+	/**
+	 *	Upate ProductFournisseur
+	 *
+	 * 	@param		int 	$idProductFournPrice	id of llx_product_fournisseur_price
+	 * 	@param		Product $product				contain informations to update
+	 *	@param      User	$user					Object user
+	 *	@return     int         					<0 if KO, >0 if OK
+	 */
+	public function updatePriceFournisseur($idProductFournPrice, $product, $user)
+	{
+		$price = price2num($product->subprice * $product->qty, 'MU');
+		$unitPrice = price2num($product->subprice, 'MU');
+
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'product_fournisseur_price SET '.(!empty($product->ref_fourn) ? 'ref_fourn = "'.$product->ref_fourn.'", ' : '').' price ='.$price.', unitprice ='.$unitPrice.' WHERE rowid = '.$idProductFournPrice;
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	 /**
+	  *	Create ProductFournisseur
+	  *
+	  *	@param		Product 	$product	Object Product
+	  *	@param      User		$user		Object user
+	  *	@return     int         			<0 if KO, >0 if OK
+	  */
+	public function createPriceFournisseur($product, $user)
+	{
+		global $conf;
+
+		$price = price2num($product->subprice * $product->qty, 'MU');
+		$qty = price2num($product->qty);
+		$unitPrice = price2num($product->subprice, 'MU');
+
+		$now = dol_now();
+
+		$values = array(
+			"'".$this->db->idate($now)."'",
+			$product->fk_product,
+			$this->thirdparty->id,
+			"'".$product->ref_fourn."'",
+			$price,
+			$qty,
+			$unitPrice,
+			$product->tva_tx,
+			$user->id
+		);
+		if (!empty($conf->multicurrency->enabled)) {
+			if (!empty($product->multicurrency_code)) {
 				include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
-	            $multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
-                $multicurrency->fetch(0, $product->multicurrency_code);
-                if (!empty($multicurrency->id)) {
-                    $values[] = $multicurrency->id;
-                    $values[] = "'".$product->multicurrency_code."'";
-                    $values[] = $product->multicurrency_subprice;
-                    $values[] = $product->multicurrency_total_ht;
-                    $values[] = $multicurrency->rate->rate;
-                }
-                else {
-                    for ($i = 0; $i < 5; $i++) $values[] = 'NULL';
-                }
-            }
-        }
+				$multicurrency = new MultiCurrency($this->db); //need to fetch because empty fk_multicurrency and rate
+				$multicurrency->fetch(0, $product->multicurrency_code);
+				if (!empty($multicurrency->id)) {
+					$values[] = $multicurrency->id;
+					$values[] = "'".$product->multicurrency_code."'";
+					$values[] = $product->multicurrency_subprice;
+					$values[] = $product->multicurrency_total_ht;
+					$values[] = $multicurrency->rate->rate;
+				} else {
+					for ($i = 0; $i < 5; $i++) $values[] = 'NULL';
+				}
+			}
+		}
 
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price ';
-        $sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user';
-        if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) $sql .= ',fk_multicurrency, multicurrency_code, multicurrency_unitprice, multicurrency_price, multicurrency_tx';
-        $sql .= ')  VALUES ('.implode(',', $values).')';
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_fournisseur_price ';
+		$sql .= '(datec, fk_product, fk_soc, ref_fourn, price, quantity, unitprice, tva_tx, fk_user';
+		if (!empty($conf->multicurrency->enabled) && !empty($product->multicurrency_code)) $sql .= ',fk_multicurrency, multicurrency_code, multicurrency_unitprice, multicurrency_price, multicurrency_tx';
+		$sql .= ')  VALUES ('.implode(',', $values).')';
 
-        $resql = $this->db->query($sql);
-        if (!$resql) {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  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;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  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;
 
-        $error = 0;
+		$error = 0;
 
-        if ($this->statut == self::STATUS_DRAFT)
-        {
-            dol_syslog(get_class($this)."::setDraft already draft status", LOG_WARNING);
-            return 0;
-        }
+		if ($this->statut == self::STATUS_DRAFT)
+		{
+			dol_syslog(get_class($this)."::setDraft already draft status", LOG_WARNING);
+			return 0;
+		}
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
-        $sql .= " SET fk_statut = ".self::STATUS_DRAFT;
-        $sql .= " WHERE rowid = ".$this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
+		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+		$sql .= " WHERE rowid = ".$this->id;
 
-        if ($this->db->query($sql))
-        {
-            if (!$error) {
-                $this->oldcopy = clone $this;
-            }
+		if ($this->db->query($sql))
+		{
+			if (!$error) {
+				$this->oldcopy = clone $this;
+			}
 
-            if (!$error) {
-                // Call trigger
-                $result = $this->call_trigger('PROPOSAL_SUPPLIER_UNVALIDATE', $user);
-                if ($result < 0) $error++;
-            }
+			if (!$error) {
+				// Call trigger
+				$result = $this->call_trigger('PROPOSAL_SUPPLIER_UNVALIDATE', $user);
+				if ($result < 0) $error++;
+			}
 
-            if (!$error) {
-                $this->statut = self::STATUS_DRAFT;
-                $this->brouillon = 1;
-                $this->db->commit();
-                return 1;
-            } else {
-                $this->db->rollback();
-                return -1;
-            }
-        }
-        else
-        {
-            return -1;
-        }
-    }
+			if (!$error) {
+				$this->statut = self::STATUS_DRAFT;
+				$this->brouillon = 1;
+				$this->db->commit();
+				return 1;
+			} else {
+				$this->db->rollback();
+				return -1;
+			}
+		} else {
+			return -1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of askprice (eventually filtered on user) into an array
-     *
-     *    @param	int		$shortlist			0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
-     *    @param	int		$draft				0=not draft, 1=draft
-     *    @param	int		$notcurrentuser		0=all user, 1=not current user
-     *    @param    int		$socid				Id third pary
-     *    @param    int		$limit				For pagination
-     *    @param    int		$offset				For pagination
-     *    @param    string	$sortfield			Sort criteria
-     *    @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.datec', $sortorder = 'DESC')
-    {
-        // phpcs:enable
-        global $conf, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of askprice (eventually filtered on user) into an array
+	 *
+	 *    @param	int		$shortlist			0=Return array[id]=ref, 1=Return array[](id=>id,ref=>ref,name=>name)
+	 *    @param	int		$draft				0=not draft, 1=draft
+	 *    @param	int		$notcurrentuser		0=all user, 1=not current user
+	 *    @param    int		$socid				Id third pary
+	 *    @param    int		$limit				For pagination
+	 *    @param    int		$offset				For pagination
+	 *    @param    string	$sortfield			Sort criteria
+	 *    @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.datec', $sortorder = 'DESC')
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-        $ga = array();
+		$ga = array();
 
-        $sql = "SELECT s.rowid, s.nom as name, s.client,";
-        $sql .= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
-        $sql .= " p.datep as dp, p.fin_validite as datelimite";
-        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."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-        if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        $sql .= " WHERE p.entity IN (".getEntity('supplier_proposal').")";
-        $sql .= " AND p.fk_soc = s.rowid";
-        $sql .= " AND p.fk_statut = c.id";
-        if (!$user->rights->societe->client->voir && !$socid) //restriction
-        {
-            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-        }
-        if ($socid) $sql .= " AND s.rowid = ".$socid;
-        if ($draft)	$sql .= " AND p.fk_statut = 0";
-        if ($notcurrentuser > 0) $sql .= " AND p.fk_user_author <> ".$user->id;
-        $sql .= $this->db->order($sortfield, $sortorder);
-        $sql .= $this->db->plimit($limit, $offset);
+		$sql = "SELECT s.rowid, s.nom as name, s.client,";
+		$sql .= " p.rowid as supplier_proposalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
+		$sql .= " p.datep as dp, p.fin_validite as datelimite";
+		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."supplier_proposal as p, ".MAIN_DB_PREFIX."c_propalst as c";
+		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		$sql .= " WHERE p.entity IN (".getEntity('supplier_proposal').")";
+		$sql .= " AND p.fk_soc = s.rowid";
+		$sql .= " AND p.fk_statut = c.id";
+		if (!$user->rights->societe->client->voir && !$socid) //restriction
+		{
+			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($socid) $sql .= " AND s.rowid = ".$socid;
+		if ($draft)	$sql .= " AND p.fk_statut = 0";
+		if ($notcurrentuser > 0) $sql .= " AND p.fk_user_author <> ".$user->id;
+		$sql .= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->plimit($limit, $offset);
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            if ($num)
-            {
-                $i = 0;
-                while ($i < $num)
-                {
-                    $obj = $this->db->fetch_object($result);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			if ($num)
+			{
+				$i = 0;
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($result);
 
-                    if ($shortlist == 1)
-                    {
-                        $ga[$obj->supplier_proposalid] = $obj->ref;
-                    }
-                    elseif ($shortlist == 2)
-                    {
-                        $ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
-                    }
-                    else
-                    {
-                        $ga[$i]['id'] = $obj->supplier_proposalid;
-                        $ga[$i]['ref'] 	= $obj->ref;
-                        $ga[$i]['name'] = $obj->name;
-                    }
+					if ($shortlist == 1)
+					{
+						$ga[$obj->supplier_proposalid] = $obj->ref;
+					} elseif ($shortlist == 2)
+					{
+						$ga[$obj->supplier_proposalid] = $obj->ref.' ('.$obj->name.')';
+					} else {
+						$ga[$i]['id'] = $obj->supplier_proposalid;
+						$ga[$i]['ref'] 	= $obj->ref;
+						$ga[$i]['name'] = $obj->name;
+					}
 
-                    $i++;
-                }
-            }
-            return $ga;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            return -1;
-        }
-    }
+					$i++;
+				}
+			}
+			return $ga;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
-    /**
-     *	Delete askprice
-     *
-     *	@param	User	$user        	Object user that delete
-     *	@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)
-    {
-        global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	/**
+	 *	Delete askprice
+	 *
+	 *	@param	User	$user        	Object user that delete
+	 *	@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)
+	{
+		global $conf, $langs;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $error = 0;
+		$error = 0;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        if (!$notrigger)
-        {
-            // Call trigger
-            $result = $this->call_trigger('PROPOSAL_SUPPLIER_DELETE', $user);
-            if ($result < 0) { $error++; }
-            // End call triggers
-        }
+		if (!$notrigger)
+		{
+			// Call trigger
+			$result = $this->call_trigger('PROPOSAL_SUPPLIER_DELETE', $user);
+			if ($result < 0) { $error++; }
+			// End call triggers
+		}
 
-        if (!$error)
-        {
-            $main = MAIN_DB_PREFIX.'supplier_proposaldet';
-            $ef = $main."_extrafields";
-            $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_supplier_proposal = ".$this->id.")";
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal = ".$this->id;
-            if ($this->db->query($sql))
-            {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposal WHERE rowid = ".$this->id;
-                if ($this->db->query($sqlef) && $this->db->query($sql))
-                {
-                    // Delete linked object
-                    $res = $this->deleteObjectLinked();
-                    if ($res < 0) $error++;
+		if (!$error)
+		{
+			$main = MAIN_DB_PREFIX.'supplier_proposaldet';
+			$ef = $main."_extrafields";
+			$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_supplier_proposal = ".$this->id.")";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE fk_supplier_proposal = ".$this->id;
+			if ($this->db->query($sql))
+			{
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposal WHERE rowid = ".$this->id;
+				if ($this->db->query($sqlef) && $this->db->query($sql))
+				{
+					// Delete linked object
+					$res = $this->deleteObjectLinked();
+					if ($res < 0) $error++;
 
-                    if (!$error)
-                    {
-                    	// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
-                    	$this->deleteEcmFiles();
+					if (!$error)
+					{
+						// 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);
-                        if ($conf->supplier_proposal->dir_output && !empty($this->ref))
-                        {
-                            $dir = $conf->supplier_proposal->dir_output."/".$ref;
-                            $file = $dir."/".$ref.".pdf";
-                            if (file_exists($file))
-                            {
-                                dol_delete_preview($this);
+						// We remove directory
+						$ref = dol_sanitizeFileName($this->ref);
+						if ($conf->supplier_proposal->dir_output && !empty($this->ref))
+						{
+							$dir = $conf->supplier_proposal->dir_output."/".$ref;
+							$file = $dir."/".$ref.".pdf";
+							if (file_exists($file))
+							{
+								dol_delete_preview($this);
 
-                                if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-                                {
-                                    $this->error = 'ErrorFailToDeleteFile';
-                                    $this->errors = array('ErrorFailToDeleteFile');
-                                    $this->db->rollback();
-                                    return 0;
-                                }
-                            }
-                            if (file_exists($dir))
-                            {
-                                $res = @dol_delete_dir_recursive($dir);
-                                if (!$res)
-                                {
-                                    $this->error = 'ErrorFailToDeleteDir';
-                                    $this->errors = array('ErrorFailToDeleteDir');
-                                    $this->db->rollback();
-                                    return 0;
-                                }
-                            }
-                        }
-                    }
+								if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
+								{
+									$this->error = 'ErrorFailToDeleteFile';
+									$this->errors = array('ErrorFailToDeleteFile');
+									$this->db->rollback();
+									return 0;
+								}
+							}
+							if (file_exists($dir))
+							{
+								$res = @dol_delete_dir_recursive($dir);
+								if (!$res)
+								{
+									$this->error = 'ErrorFailToDeleteDir';
+									$this->errors = array('ErrorFailToDeleteDir');
+									$this->db->rollback();
+									return 0;
+								}
+							}
+						}
+					}
 
-                    // Removed extrafields
-                    if (!$error)
-                    {
-                    	$result = $this->deleteExtraFields();
-                    	if ($result < 0)
-                    	{
-                    		$error++;
-                    		$errorflag = -4;
-                    		dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
-                    	}
-                    }
+					// Removed extrafields
+					if (!$error)
+					{
+						$result = $this->deleteExtraFields();
+						if ($result < 0)
+						{
+							$error++;
+							$errorflag = -4;
+							dol_syslog(get_class($this)."::delete erreur ".$errorflag." ".$this->error, LOG_ERR);
+						}
+					}
 
-                    if (!$error)
-                    {
-                        dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
-                        $this->db->commit();
-                        return 1;
-                    }
-                    else
-                    {
-                        $this->error = $this->db->lasterror();
-                        $this->db->rollback();
-                        return 0;
-                    }
-                }
-                else
-                {
-                    $this->error = $this->db->lasterror();
-                    $this->db->rollback();
-                    return -3;
-                }
-            }
-            else
-            {
-                $this->error = $this->db->lasterror();
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-    }
+					if (!$error)
+					{
+						dol_syslog(get_class($this)."::delete ".$this->id." by ".$user->id, LOG_DEBUG);
+						$this->db->commit();
+						return 1;
+					} else {
+						$this->error = $this->db->lasterror();
+						$this->db->rollback();
+						return 0;
+					}
+				} else {
+					$this->error = $this->db->lasterror();
+					$this->db->rollback();
+					return -3;
+				}
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
-    /**
-     *	Object SupplierProposal Information
-     *
-     * 	@param	int		$id		Proposal id
-     *  @return	void
-     */
-    public function info($id)
-    {
-        $sql = "SELECT c.rowid, ";
-        $sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
-        $sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
-        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
-        $sql .= " WHERE c.rowid = ".$id;
+	/**
+	 *	Object SupplierProposal Information
+	 *
+	 * 	@param	int		$id		Proposal id
+	 *  @return	void
+	 */
+	public function info($id)
+	{
+		$sql = "SELECT c.rowid, ";
+		$sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
+		$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
+		$sql .= " WHERE c.rowid = ".$id;
 
-        $result = $this->db->query($sql);
+		$result = $this->db->query($sql);
 
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $this->id                = $obj->rowid;
+				$this->id                = $obj->rowid;
 
-                $this->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_validation   = $this->db->jdate($obj->datev);
-                $this->date_cloture      = $this->db->jdate($obj->dateo);
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_cloture      = $this->db->jdate($obj->dateo);
 
-                $cuser = new User($this->db);
-                $cuser->fetch($obj->fk_user_author);
-                $this->user_creation = $cuser;
+				$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;
-                }
-            }
-            $this->db->free($result);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
+				if ($obj->fk_user_cloture)
+				{
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+			}
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    /**
-     *    	Return label of status of proposal (draft, validated, ...)
-     *
-     *    	@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
-     */
-    public function getLibStatut($mode = 0)
-    {
-        return $this->LibStatut((isset($this->statut) ? $this->statut : $this->status), $mode);
-    }
+	/**
+	 *    	Return label of status of proposal (draft, validated, ...)
+	 *
+	 *    	@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
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut((isset($this->statut) ? $this->statut : $this->status), $mode);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return label of a status (draft, validated, ...)
-     *
-     *  @param      int			$status		Id status
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return label of a status (draft, validated, ...)
+	 *
+	 *  @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
-     */
-    public function LibStatut($status, $mode = 1)
-    {
-        // phpcs:enable
+	 *  @return     string      Label
+	 */
+	public function LibStatut($status, $mode = 1)
+	{
+		// phpcs:enable
 
-    	// Init/load array of translation of status
-    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
-    	{
-    		global $langs;
-    		$langs->load("supplier_proposal");
-    		$this->labelStatus[self::STATUS_DRAFT] = $langs->trans("SupplierProposalStatusDraft");
-    		$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans("SupplierProposalStatusValidated");
-    		$this->labelStatus[self::STATUS_SIGNED] = $langs->trans("SupplierProposalStatusSigned");
-    		$this->labelStatus[self::STATUS_NOTSIGNED] = $langs->trans("SupplierProposalStatusNotSigned");
-    		$this->labelStatus[self::STATUS_CLOSE] = $langs->trans("SupplierProposalStatusClosed");
-    		$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans("SupplierProposalStatusDraftShort");
-    		$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans("Opened");
-    		$this->labelStatusShort[self::STATUS_SIGNED] = $langs->trans("SupplierProposalStatusSignedShort");
-    		$this->labelStatusShort[self::STATUS_NOTSIGNED] = $langs->trans("SupplierProposalStatusNotSignedShort");
-    		$this->labelStatusShort[self::STATUS_CLOSE] = $langs->trans("SupplierProposalStatusClosedShort");
-    	}
+		// Init/load array of translation of status
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			$langs->load("supplier_proposal");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans("SupplierProposalStatusDraft");
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans("SupplierProposalStatusValidated");
+			$this->labelStatus[self::STATUS_SIGNED] = $langs->trans("SupplierProposalStatusSigned");
+			$this->labelStatus[self::STATUS_NOTSIGNED] = $langs->trans("SupplierProposalStatusNotSigned");
+			$this->labelStatus[self::STATUS_CLOSE] = $langs->trans("SupplierProposalStatusClosed");
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans("SupplierProposalStatusDraftShort");
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans("Opened");
+			$this->labelStatusShort[self::STATUS_SIGNED] = $langs->trans("SupplierProposalStatusSignedShort");
+			$this->labelStatusShort[self::STATUS_NOTSIGNED] = $langs->trans("SupplierProposalStatusNotSignedShort");
+			$this->labelStatusShort[self::STATUS_CLOSE] = $langs->trans("SupplierProposalStatusClosedShort");
+		}
 
-    	$statusnew = '';
-    	if ($status == self::STATUS_DRAFT) $statusnew = 'status0';
-    	elseif ($status == self::STATUS_VALIDATED) $statusnew = 'status1';
-    	elseif ($status == self::STATUS_SIGNED) $statusnew = 'status4';
-    	elseif ($status == self::STATUS_NOTSIGNED) $statusnew = 'status9';
-    	elseif ($status == self::STATUS_CLOSE) $statusnew = 'status6';
+		$statusnew = '';
+		if ($status == self::STATUS_DRAFT) $statusnew = 'status0';
+		elseif ($status == self::STATUS_VALIDATED) $statusnew = 'status1';
+		elseif ($status == self::STATUS_SIGNED) $statusnew = 'status4';
+		elseif ($status == self::STATUS_NOTSIGNED) $statusnew = 'status9';
+		elseif ($status == self::STATUS_CLOSE) $statusnew = 'status6';
 
-    	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusnew, $mode);
-    }
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusnew, $mode);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *      @param          User	$user   Object user
-     *      @param          int		$mode   "opened" for askprice to close, "signed" for proposal to invoice
-     *      @return         int             <0 if KO, >0 if OK
-     */
-    public function load_board($user, $mode)
-    {
-        // phpcs:enable
-        global $conf, $user, $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @param          User	$user   Object user
+	 *      @param          int		$mode   "opened" for askprice to close, "signed" for proposal to invoice
+	 *      @return         int             <0 if KO, >0 if OK
+	 */
+	public function load_board($user, $mode)
+	{
+		// phpcs:enable
+		global $conf, $user, $langs;
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $this->nbtodo = $this->nbtodolate = 0;
-        $clause = " WHERE";
+		$this->nbtodo = $this->nbtodolate = 0;
+		$clause = " WHERE";
 
-        $sql = "SELECT p.rowid, p.ref, p.datec as datec";
-        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-        if (!$user->rights->societe->client->voir && !$user->socid)
-        {
-            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
-            $sql .= " WHERE sc.fk_user = ".$user->id;
-            $clause = " AND";
-        }
-        $sql .= $clause." p.entity IN (".getEntity('supplier_proposal').")";
-        if ($mode == 'opened') $sql .= " AND p.fk_statut = 1";
-        if ($mode == 'signed') $sql .= " AND p.fk_statut = 2";
-        if ($user->socid) $sql .= " AND p.fk_soc = ".$user->socid;
+		$sql = "SELECT p.rowid, p.ref, p.datec as datec";
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+		if (!$user->rights->societe->client->voir && !$user->socid)
+		{
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
+			$sql .= " WHERE sc.fk_user = ".$user->id;
+			$clause = " AND";
+		}
+		$sql .= $clause." p.entity IN (".getEntity('supplier_proposal').")";
+		if ($mode == 'opened') $sql .= " AND p.fk_statut = 1";
+		if ($mode == 'signed') $sql .= " AND p.fk_statut = 2";
+		if ($user->socid) $sql .= " AND p.fk_soc = ".$user->socid;
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
 			$label = $labelShort = '';
 			$status = '';
-            if ($mode == 'opened') {
-                $delay_warning = $conf->supplier_proposal->cloture->warning_delay;
-                $status = self::STATUS_VALIDATED;
-                $label = $langs->trans("SupplierProposalsToClose");
-                $labelShort = $langs->trans("ToAcceptRefuse");
-            }
-            if ($mode == 'signed') {
-                $delay_warning = $conf->supplier_proposal->facturation->warning_delay;
-                $status = self::STATUS_SIGNED;
-                $label = $langs->trans("SupplierProposalsToProcess"); // May be billed or ordered
+			if ($mode == 'opened') {
+				$delay_warning = $conf->supplier_proposal->cloture->warning_delay;
+				$status = self::STATUS_VALIDATED;
+				$label = $langs->trans("SupplierProposalsToClose");
+				$labelShort = $langs->trans("ToAcceptRefuse");
+			}
+			if ($mode == 'signed') {
+				$delay_warning = $conf->supplier_proposal->facturation->warning_delay;
+				$status = self::STATUS_SIGNED;
+				$label = $langs->trans("SupplierProposalsToProcess"); // May be billed or ordered
 				$labelShort = $langs->trans("ToClose");
-            }
+			}
 
-            $response = new WorkboardResponse();
-            $response->warning_delay = $delay_warning / 60 / 60 / 24;
-            $response->label = $label;
-            $response->labelShort = $labelShort;
-            $response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?search_status='.$status;
-            $response->img = img_object('', "propal");
+			$response = new WorkboardResponse();
+			$response->warning_delay = $delay_warning / 60 / 60 / 24;
+			$response->label = $label;
+			$response->labelShort = $labelShort;
+			$response->url = DOL_URL_ROOT.'/supplier_proposal/list.php?search_status='.$status;
+			$response->img = img_object('', "propal");
 
-            // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $response->nbtodo++;
-                if ($mode == 'opened')
-                {
-                    $datelimit = $this->db->jdate($obj->datefin);
-                    if ($datelimit < ($now - $delay_warning))
-                    {
-                        $response->nbtodolate++;
-                    }
-                }
-                // TODO Definir regle des propales a facturer en retard
-                // if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
-            }
-            return $response;
-        }
-        else
-        {
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+			// This assignment in condition is not a bug. It allows walking the results.
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$response->nbtodo++;
+				if ($mode == 'opened')
+				{
+					$datelimit = $this->db->jdate($obj->datefin);
+					if ($datelimit < ($now - $delay_warning))
+					{
+						$response->nbtodolate++;
+					}
+				}
+				// TODO Definir regle des propales a facturer en retard
+				// if ($mode == 'signed' && ! count($this->FactureListeArray($obj->rowid))) $this->nbtodolate++;
+			}
+			return $response;
+		} else {
+			$this->error = $this->db->lasterror();
+			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()
-    {
-        global $user, $langs, $conf;
+	/**
+	 *  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
-        $num_prods = 0;
-        $prodids = array();
-        $sql = "SELECT rowid";
-        $sql .= " FROM ".MAIN_DB_PREFIX."product";
-        $sql .= " WHERE entity IN (".getEntity('product').")";
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num_prods = $this->db->num_rows($resql);
-            $i = 0;
-            while ($i < $num_prods)
-            {
-                $i++;
-                $row = $this->db->fetch_row($resql);
-                $prodids[$i] = $row[0];
-            }
-        }
+		// Load array of products prodids
+		$num_prods = 0;
+		$prodids = array();
+		$sql = "SELECT rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= $this->db->plimit(100);
 
-        // Initialise parametres
-        $this->id = 0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen = 1;
-        $this->socid = 1;
-        $this->date = time();
-        $this->cond_reglement_id   = 1;
-        $this->cond_reglement_code = 'RECEP';
-        $this->mode_reglement_id   = 7;
-        $this->mode_reglement_code = 'CHQ';
-        $this->note_public = 'This is a comment (public)';
-        $this->note_private = 'This is a comment (private)';
-        // Lines
-        $nbp = 5;
-        $xnbp = 0;
-        while ($xnbp < $nbp)
-        {
-            $line = new SupplierProposalLine($this->db);
-            $line->desc = $langs->trans("Description")." ".$xnbp;
-            $line->qty = 1;
-            $line->subprice = 100;
-            $line->tva_tx = 19.6;
-            $line->localtax1_tx = 0;
-            $line->localtax2_tx = 0;
-            if ($xnbp == 2)
-            {
-                $line->total_ht = 50;
-                $line->total_ttc = 59.8;
-                $line->total_tva = 9.8;
-                $line->remise_percent = 50;
-            }
-            else
-            {
-                $line->total_ht = 100;
-                $line->total_ttc = 119.6;
-                $line->total_tva = 19.6;
-                $line->remise_percent = 00;
-            }
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$num_prods = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num_prods)
+			{
+				$i++;
+				$row = $this->db->fetch_row($resql);
+				$prodids[$i] = $row[0];
+			}
+		}
 
-            if ($num_prods > 0)
-            {
-                $prodid = mt_rand(1, $num_prods);
-                $line->fk_product = $prodids[$prodid];
-            }
+		// Initialise parametres
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->socid = 1;
+		$this->date = time();
+		$this->cond_reglement_id   = 1;
+		$this->cond_reglement_code = 'RECEP';
+		$this->mode_reglement_id   = 7;
+		$this->mode_reglement_code = 'CHQ';
+		$this->note_public = 'This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
+		// Lines
+		$nbp = 5;
+		$xnbp = 0;
+		while ($xnbp < $nbp)
+		{
+			$line = new SupplierProposalLine($this->db);
+			$line->desc = $langs->trans("Description")." ".$xnbp;
+			$line->qty = 1;
+			$line->subprice = 100;
+			$line->tva_tx = 19.6;
+			$line->localtax1_tx = 0;
+			$line->localtax2_tx = 0;
+			if ($xnbp == 2)
+			{
+				$line->total_ht = 50;
+				$line->total_ttc = 59.8;
+				$line->total_tva = 9.8;
+				$line->remise_percent = 50;
+			} else {
+				$line->total_ht = 100;
+				$line->total_ttc = 119.6;
+				$line->total_tva = 19.6;
+				$line->remise_percent = 00;
+			}
 
-            $this->lines[$xnbp] = $line;
+			if ($num_prods > 0)
+			{
+				$prodid = mt_rand(1, $num_prods);
+				$line->fk_product = $prodids[$prodid];
+			}
 
-            $this->total_ht       += $line->total_ht;
-            $this->total_tva      += $line->total_tva;
-            $this->total_ttc      += $line->total_ttc;
+			$this->lines[$xnbp] = $line;
 
-            $xnbp++;
-        }
-    }
+			$this->total_ht       += $line->total_ht;
+			$this->total_tva      += $line->total_tva;
+			$this->total_ttc      += $line->total_ttc;
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Load indicator this->nb of global stats widget
-     *
-     *      @return     int         <0 if ko, >0 if ok
-     */
-    public function load_state_board()
-    {
-        // phpcs:enable
-        global $conf, $user;
+			$xnbp++;
+		}
+	}
 
-        $this->nb = array();
-        $clause = "WHERE";
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Load indicator this->nb of global stats widget
+	 *
+	 *      @return     int         <0 if ko, >0 if ok
+	 */
+	public function load_state_board()
+	{
+		// phpcs:enable
+		global $conf, $user;
 
-        $sql = "SELECT count(p.rowid) as nb";
-        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-        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." p.entity IN (".getEntity('supplier_proposal').")";
+		$this->nb = array();
+		$clause = "WHERE";
 
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            // This assignment in condition is not a bug. It allows walking the results.
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $this->nb["supplier_proposals"] = $obj->nb;
-            }
-            $this->db->free($resql);
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db);
-            $this->error = $this->db->lasterror();
-            return -1;
-        }
-    }
+		$sql = "SELECT count(p.rowid) as nb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as p";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
+		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." p.entity IN (".getEntity('supplier_proposal').")";
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			// This assignment in condition is not a bug. It allows walking the results.
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$this->nb["supplier_proposals"] = $obj->nb;
+			}
+			$this->db->free($resql);
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Returns the reference to the following non used Proposal used depending on the active numbering module
-     *  defined into SUPPLIER_PROPOSAL_ADDON
-     *
-     *  @param	Societe		$soc  	Object thirdparty
-     *  @return string      		Reference libre pour la propale
-     */
-    public function getNextNumRef($soc)
-    {
-        global $conf, $db, $langs;
-        $langs->load("supplier_proposal");
+	/**
+	 *  Returns the reference to the following non used Proposal used depending on the active numbering module
+	 *  defined into SUPPLIER_PROPOSAL_ADDON
+	 *
+	 *  @param	Societe		$soc  	Object thirdparty
+	 *  @return string      		Reference libre pour la propale
+	 */
+	public function getNextNumRef($soc)
+	{
+		global $conf, $db, $langs;
+		$langs->load("supplier_proposal");
 
-        if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
-        {
-            $mybool = false;
+		if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON))
+		{
+			$mybool = false;
 
-            $file = $conf->global->SUPPLIER_PROPOSAL_ADDON.".php";
-            $classname = $conf->global->SUPPLIER_PROPOSAL_ADDON;
+			$file = $conf->global->SUPPLIER_PROPOSAL_ADDON.".php";
+			$classname = $conf->global->SUPPLIER_PROPOSAL_ADDON;
 
-            // Include file with class
-            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-            foreach ($dirmodels as $reldir) {
-                $dir = dol_buildpath($reldir."core/modules/supplier_proposal/");
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/supplier_proposal/");
 
-                // 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();
-            $numref = "";
-            $numref = $obj->getNextValue($soc, $this);
+			$obj = new $classname();
+			$numref = "";
+			$numref = $obj->getNextValue($soc, $this);
 
-            if ($numref != "")
-            {
-                return $numref;
-            }
-            else
-            {
-                $this->error = $obj->error;
-                return "";
-            }
-        }
-        else
-        {
-            $langs->load("errors");
-            print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("SupplierProposal"));
-            return "";
-        }
-    }
+			if ($numref != "")
+			{
+				return $numref;
+			} else {
+				$this->error = $obj->error;
+				return "";
+			}
+		} else {
+			$langs->load("errors");
+			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("SupplierProposal"));
+			return "";
+		}
+	}
 
-    /**
-     *	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      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *  @param		int		$addlinktonotes				Add link to show notes
-     *	@return     string          					String with URL
-     */
-    public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
-    {
-        global $langs, $conf, $user;
+	/**
+	 *	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      int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param		int		$addlinktonotes				Add link to show notes
+	 *	@return     string          					String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
+	{
+		global $langs, $conf, $user;
 
-        if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
-        $url = '';
-        $result = '';
+		$url = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("SupplierProposal").'</u>';
-        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);
-        }
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SupplierProposal").'</u>';
+		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;
-        }
-        if ($option == 'document') {
-            $url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id.$get_params;
-        }
+		if ($option == '') {
+			$url = DOL_URL_ROOT.'/supplier_proposal/card.php?id='.$this->id.$get_params;
+		}
+		if ($option == 'document') {
+			$url = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$this->id.$get_params;
+		}
 
-        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) && $user->rights->propal->lire)
-        {
-            if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label = $langs->trans("ShowSupplierProposal");
-                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose .= ' class="classfortooltip"';
-        }
+		$linkclose = '';
+		if (empty($notooltip) && $user->rights->propal->lire)
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowSupplierProposal");
+				$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, ($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, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto != 2) $result .= $this->ref;
+		$result .= $linkend;
 
-        if ($addlinktonotes)
-        {
-        	$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-        	if ($txttoshow)
-        	{
-        		$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
-        		$result .= ' <span class="note inline-block">';
-        		$result .= '<a href="'.DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
-        		$result .= img_picto('', 'note');
-        		$result .= '</a>';
-        		//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
-        		//$result.='</a>';
-        		$result .= '</span>';
-        	}
-        }
+		if ($addlinktonotes)
+		{
+			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
+			if ($txttoshow)
+			{
+				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
+				$result .= ' <span class="note inline-block">';
+				$result .= '<a href="'.DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
+				$result .= img_picto('', 'note');
+				$result .= '</a>';
+				//$result.=img_picto($langs->trans("ViewNote"),'object_generic');
+				//$result.='</a>';
+				$result .= '</span>';
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * 	Retrieve an array of supplier proposal lines
-     *
-     * 	@return int		>0 if OK, <0 if KO
-     */
-    public function getLinesArray()
-    {
-        // For other object, here we call fetch_lines. But fetch_lines does not exists on supplier proposal
+	/**
+	 * 	Retrieve an array of supplier proposal lines
+	 *
+	 * 	@return int		>0 if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		// For other object, here we call fetch_lines. But fetch_lines does not exists on supplier proposal
 
-        $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
-        $sql .= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
-        $sql .= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
-        $sql .= ' pt.product_type, pt.rang, pt.fk_parent_line,';
-        $sql .= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
-        $sql .= ' p.description as product_desc, pt.ref_fourn as ref_supplier,';
-        $sql .= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
-        $sql .= ' WHERE pt.fk_supplier_proposal = '.$this->id;
-        $sql .= ' ORDER BY pt.rang ASC, pt.rowid';
+		$sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,';
+		$sql .= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,';
+		$sql .= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,';
+		$sql .= ' pt.product_type, pt.rang, pt.fk_parent_line,';
+		$sql .= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,';
+		$sql .= ' p.description as product_desc, pt.ref_fourn as ref_supplier,';
+		$sql .= ' pt.fk_multicurrency, pt.multicurrency_code, pt.multicurrency_subprice, pt.multicurrency_total_ht, pt.multicurrency_total_tva, pt.multicurrency_total_ttc, pt.fk_unit';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pt';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pt.fk_product=p.rowid';
+		$sql .= ' WHERE pt.fk_supplier_proposal = '.$this->id;
+		$sql .= ' ORDER BY pt.rang ASC, pt.rowid';
 
-        dol_syslog(get_class($this).'::getLinesArray', LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $num = $this->db->num_rows($resql);
-            $i = 0;
+		dol_syslog(get_class($this).'::getLinesArray', 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);
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->lines[$i] = new SupplierProposalLine($this->db);
-                $this->lines[$i]->id = $obj->rowid; // for backward compatibility
-                $this->lines[$i]->rowid				= $obj->rowid;
-                $this->lines[$i]->label 			= $obj->custom_label;
-                $this->lines[$i]->description = $obj->description;
-                $this->lines[$i]->fk_product = $obj->fk_product;
-                $this->lines[$i]->ref = $obj->ref;
-                $this->lines[$i]->product_label = $obj->product_label;
-                $this->lines[$i]->product_desc		= $obj->product_desc;
-                $this->lines[$i]->fk_product_type = $obj->fk_product_type; // deprecated
-                $this->lines[$i]->product_type		= $obj->product_type;
-                $this->lines[$i]->qty = $obj->qty;
-                $this->lines[$i]->subprice = $obj->subprice;
-                $this->lines[$i]->fk_remise_except = $obj->fk_remise_except;
-                $this->lines[$i]->remise_percent = $obj->remise_percent;
-                $this->lines[$i]->tva_tx = $obj->tva_tx;
-                $this->lines[$i]->info_bits			= $obj->info_bits;
-                $this->lines[$i]->total_ht = $obj->total_ht;
-                $this->lines[$i]->total_tva			= $obj->total_tva;
-                $this->lines[$i]->total_ttc			= $obj->total_ttc;
-                $this->lines[$i]->fk_fournprice = $obj->fk_fournprice;
-                $marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
-                $this->lines[$i]->pa_ht = $marginInfos[0];
-                $this->lines[$i]->marge_tx = $marginInfos[1];
-                $this->lines[$i]->marque_tx = $marginInfos[2];
-                $this->lines[$i]->fk_parent_line = $obj->fk_parent_line;
-                $this->lines[$i]->special_code = $obj->special_code;
-                $this->lines[$i]->rang = $obj->rang;
+				$this->lines[$i] = new SupplierProposalLine($this->db);
+				$this->lines[$i]->id = $obj->rowid; // for backward compatibility
+				$this->lines[$i]->rowid				= $obj->rowid;
+				$this->lines[$i]->label 			= $obj->custom_label;
+				$this->lines[$i]->description = $obj->description;
+				$this->lines[$i]->fk_product = $obj->fk_product;
+				$this->lines[$i]->ref = $obj->ref;
+				$this->lines[$i]->product_label = $obj->product_label;
+				$this->lines[$i]->product_desc		= $obj->product_desc;
+				$this->lines[$i]->fk_product_type = $obj->fk_product_type; // deprecated
+				$this->lines[$i]->product_type		= $obj->product_type;
+				$this->lines[$i]->qty = $obj->qty;
+				$this->lines[$i]->subprice = $obj->subprice;
+				$this->lines[$i]->fk_remise_except = $obj->fk_remise_except;
+				$this->lines[$i]->remise_percent = $obj->remise_percent;
+				$this->lines[$i]->tva_tx = $obj->tva_tx;
+				$this->lines[$i]->info_bits			= $obj->info_bits;
+				$this->lines[$i]->total_ht = $obj->total_ht;
+				$this->lines[$i]->total_tva			= $obj->total_tva;
+				$this->lines[$i]->total_ttc			= $obj->total_ttc;
+				$this->lines[$i]->fk_fournprice = $obj->fk_fournprice;
+				$marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->lines[$i]->fk_fournprice, $obj->pa_ht);
+				$this->lines[$i]->pa_ht = $marginInfos[0];
+				$this->lines[$i]->marge_tx = $marginInfos[1];
+				$this->lines[$i]->marque_tx = $marginInfos[2];
+				$this->lines[$i]->fk_parent_line = $obj->fk_parent_line;
+				$this->lines[$i]->special_code = $obj->special_code;
+				$this->lines[$i]->rang = $obj->rang;
 
-                $this->lines[$i]->ref_fourn = $obj->ref_supplier; // deprecated
-                $this->lines[$i]->ref_supplier = $obj->ref_supplier;
+				$this->lines[$i]->ref_fourn = $obj->ref_supplier; // deprecated
+				$this->lines[$i]->ref_supplier = $obj->ref_supplier;
 
-                // Multicurrency
-                $this->lines[$i]->fk_multicurrency = $obj->fk_multicurrency;
-                $this->lines[$i]->multicurrency_code = $obj->multicurrency_code;
-                $this->lines[$i]->multicurrency_subprice 	= $obj->multicurrency_subprice;
-                $this->lines[$i]->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
-                $this->lines[$i]->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
-                $this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
-                $this->lines[$i]->fk_unit = $obj->fk_unit;
+				// Multicurrency
+				$this->lines[$i]->fk_multicurrency = $obj->fk_multicurrency;
+				$this->lines[$i]->multicurrency_code = $obj->multicurrency_code;
+				$this->lines[$i]->multicurrency_subprice 	= $obj->multicurrency_subprice;
+				$this->lines[$i]->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
+				$this->lines[$i]->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
+				$this->lines[$i]->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				$this->lines[$i]->fk_unit = $obj->fk_unit;
 
-                $i++;
-            }
-            $this->db->free($resql);
+				$i++;
+			}
+			$this->db->free($resql);
 
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
 
-    /**
-     *  Create a document onto disk according to template module.
-     *
-     * 	@param	    string		$modele			Force model to use ('' to not force)
-     * 	@param		Translate	$outputlangs	Object langs to use for output
-     *  @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
-     * 	@return     int         				0 if KO, 1 if OK
-     */
-    public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
-    {
-        global $conf, $langs;
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 * 	@param	    string		$modele			Force model to use ('' to not force)
+	 * 	@param		Translate	$outputlangs	Object langs to use for output
+	 *  @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
+	 * 	@return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
 
-        $langs->load("supplier_proposal");
+		$langs->load("supplier_proposal");
 		$outputlangs->load("products");
 
-        if (!dol_strlen($modele)) {
-            $modele = 'aurore';
+		if (!dol_strlen($modele)) {
+			$modele = 'aurore';
 
-            if ($this->modelpdf) {
-                $modele = $this->modelpdf;
-            } elseif (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) {
-                $modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF;
-            }
-        }
+			if ($this->model_pdf) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF)) {
+				$modele = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF;
+			}
+		}
 
-        $modelpath = "core/modules/supplier_proposal/doc/";
+		$modelpath = "core/modules/supplier_proposal/doc/";
 
-        return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-    }
+		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+	}
 
 
-    /**
-     * 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(
-            'supplier_proposal'
-        );
+	/**
+	 * 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(
+			'supplier_proposal'
+		);
 
-        return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
-    }
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
@@ -2767,584 +2681,570 @@ class SupplierProposal extends CommonObject
  */
 class SupplierProposalLine extends CommonObjectLine
 {
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
-
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
-
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'supplier_proposaldet';
-
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'supplier_proposaldet';
-
-    public $oldline;
-
-    /**
-     * @var int ID
-     */
-    public $id;
-
-    /**
-     * @var int ID
-     */
-    public $fk_supplier_proposal;
-
-    /**
-     * @var int ID
-     */
-    public $fk_parent_line;
-
-    public $desc; // Description ligne
-
-    /**
-     * @var int ID
-     */
-    public $fk_product; // Id produit predefini
-
-    /**
-     * @deprecated
-     * @see $product_type
-     */
-    public $fk_product_type;
-    /**
-     * Product type
-     * @var int
-     * @see Product::TYPE_PRODUCT, Product::TYPE_SERVICE
-     */
-    public $product_type = Product::TYPE_PRODUCT;
-
-    public $qty;
-    public $tva_tx;
-    public $subprice;
-    public $remise_percent;
-
-    /**
-     * @var int ID
-     */
-    public $fk_remise_except;
-
-    public $rang = 0;
-
-    /**
-     * @var int ID
-     */
-    public $fk_fournprice;
-
-    public $pa_ht;
-    public $marge_tx;
-    public $marque_tx;
-
-    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; // Liste d'options cumulables:
-    // 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 $date_start;
-    public $date_end;
-
-    // From llx_product
-    /**
-     * @deprecated
-     * @see $product_ref
-     */
-    public $ref;
-
-    /**
-     * Product reference
-     * @var string
-     */
-    public $product_ref;
-
-    /**
-     * @deprecated
-     * @see $product_label
-     */
-    public $libelle;
-
-    /**
-     *  Product label
-     * @var string
-     */
-    public $product_label;
-
-    /**
-     * Product description
-     * @var string
-     */
-    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 $skip_update_total; // Skip update price total for special lines
-
-    public $ref_fourn;
-    public $ref_supplier;
-
-    // Multicurrency
-    /**
-     * @var int ID
-     */
-    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)
-    {
-        $this->db = $db;
-    }
-
-    /**
-     *	Retrieve the propal line object
-     *
-     *	@param	int		$rowid		Propal line id
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function fetch($rowid)
-    {
-        $sql = 'SELECT pd.rowid, pd.fk_supplier_proposal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,';
-        $sql .= ' pd.date_start, pd.date_end,';
-        $sql .= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
-        $sql .= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
-        $sql .= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
-        $sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
-        $sql .= ' pd.product_type, pd.ref_fourn as ref_produit_fourn,';
-        $sql .= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc, pd.fk_unit';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
-        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
-        $sql .= ' WHERE pd.rowid = '.$rowid;
-
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $objp = $this->db->fetch_object($result);
-
-            $this->id = $objp->rowid;
-            $this->fk_supplier_proposal = $objp->fk_supplier_proposal;
-            $this->fk_parent_line = $objp->fk_parent_line;
-            $this->label			= $objp->custom_label;
-            $this->desc				= $objp->description;
-            $this->qty = $objp->qty;
-            $this->subprice = $objp->subprice;
-            $this->tva_tx = $objp->tva_tx;
-            $this->remise_percent = $objp->remise_percent;
-            $this->fk_remise_except = $objp->fk_remise_except;
-            $this->fk_product		= $objp->fk_product;
-            $this->info_bits		= $objp->info_bits;
-            $this->date_start		= $this->db->jdate($objp->date_start);
-            $this->date_end			= $this->db->jdate($objp->date_end);
-
-            $this->total_ht			= $objp->total_ht;
-            $this->total_tva		= $objp->total_tva;
-            $this->total_ttc		= $objp->total_ttc;
-
-            $this->fk_fournprice = $objp->fk_fournprice;
-
-            $marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);
-            $this->pa_ht			= $marginInfos[0];
-            $this->marge_tx			= $marginInfos[1];
-            $this->marque_tx		= $marginInfos[2];
-
-            $this->special_code		= $objp->special_code;
-            $this->product_type		= $objp->product_type;
-            $this->rang = $objp->rang;
-
-            $this->ref = $objp->product_ref; // deprecated
-            $this->product_ref = $objp->product_ref;
-            $this->libelle = $objp->product_label; // deprecated
-            $this->product_label	= $objp->product_label;
-            $this->product_desc		= $objp->product_desc;
-
-            $this->ref_fourn = $objp->ref_produit_forun;
-
-            // Multicurrency
-            $this->fk_multicurrency = $objp->fk_multicurrency;
-            $this->multicurrency_code = $objp->multicurrency_code;
-            $this->multicurrency_subprice 	= $objp->multicurrency_subprice;
-            $this->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
-            $this->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
-            $this->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
-            $this->fk_unit = $objp->fk_unit;
-
-            $this->db->free($result);
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
-
-    /**
-     *  Insert object line propal in database
-     *
-     *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
-     *	@return		int						<0 if KO, >0 if OK
-     */
-    public function insert($notrigger = 0)
-    {
-        global $conf, $langs, $user;
-
-        $error = 0;
-
-        dol_syslog(get_class($this)."::insert rang=".$this->rang);
-
-        // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx = 0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-        if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-        if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-        if (empty($this->rang)) $this->rang = 0;
-        if (empty($this->remise)) $this->remise = 0;
-        if (empty($this->remise_percent)) $this->remise_percent = 0;
-        if (empty($this->info_bits)) $this->info_bits = 0;
-        if (empty($this->special_code)) $this->special_code = 0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
-        if (empty($this->fk_unit)) $this->fk_unit = 0;
-        if (empty($this->subprice)) $this->subprice = 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)
-        {
-            if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-            {
-                return $result;
-            }
-            else
-            {
-                $this->pa_ht = $result;
-            }
-        }
-
-        // Check parameters
-        if ($this->product_type < 0) return -1;
-
-        $this->db->begin();
-
-        // Insert line into database
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'supplier_proposaldet';
-        $sql .= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
-        $sql .= ' date_start, date_end,';
-        $sql .= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-        $sql .= ' subprice, remise_percent, ';
-        $sql .= ' info_bits, ';
-        $sql .= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
-        $sql .= ' ref_fourn,';
-        $sql .= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
-        $sql .= " VALUES (".$this->fk_supplier_proposal.",";
-        $sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
-        $sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
-        $sql .= " '".$this->db->escape($this->desc)."',";
-        $sql .= " ".($this->fk_product ? "'".$this->db->escape($this->fk_product)."'" : "null").",";
-        $sql .= " '".$this->db->escape($this->product_type)."',";
-        $sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
-        $sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
-        $sql .= " ".($this->fk_remise_except ? "'".$this->db->escape($this->fk_remise_except)."'" : "null").",";
-        $sql .= " ".price2num($this->qty).",";
-        $sql .= " ".price2num($this->tva_tx).",";
-        $sql .= " ".price2num($this->localtax1_tx).",";
-        $sql .= " ".price2num($this->localtax2_tx).",";
-        $sql .= " '".$this->db->escape($this->localtax1_type)."',";
-        $sql .= " '".$this->db->escape($this->localtax2_type)."',";
-        $sql .= " ".(!empty($this->subprice) ?price2num($this->subprice) : "null").",";
-        $sql .= " ".price2num($this->remise_percent).",";
-        $sql .= " ".(isset($this->info_bits) ? "'".$this->db->escape($this->info_bits)."'" : "null").",";
-        $sql .= " ".price2num($this->total_ht).",";
-        $sql .= " ".price2num($this->total_tva).",";
-        $sql .= " ".price2num($this->total_localtax1).",";
-        $sql .= " ".price2num($this->total_localtax2).",";
-        $sql .= " ".price2num($this->total_ttc).",";
-        $sql .= " ".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null").",";
-        $sql .= " ".(isset($this->pa_ht) ? "'".price2num($this->pa_ht)."'" : "null").",";
-        $sql .= ' '.$this->special_code.',';
-        $sql .= ' '.$this->rang.',';
-        $sql .= " '".$this->db->escape($this->ref_fourn)."'";
-        $sql .= ", ".($this->fk_multicurrency > 0 ? $this->fk_multicurrency : 'null');
-        $sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
-        $sql .= ", ".$this->multicurrency_subprice;
-        $sql .= ", ".$this->multicurrency_total_ht;
-        $sql .= ", ".$this->multicurrency_total_tva;
-        $sql .= ", ".$this->multicurrency_total_ttc;
-        $sql .= ", ".($this->fk_unit ? $this->fk_unit : 'null');
-        $sql .= ')';
-
-        dol_syslog(get_class($this).'::insert', LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
-
-            if (!$error)
-            {
-                $result = $this->insertExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-
-            if (!$error && !$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT', $user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-                // End call triggers
-            }
-
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error()." sql=".$sql;
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     * 	Delete line in database
-     *
-     *	@return	 int  <0 if ko, >0 if ok
-     */
-    public function delete()
-    {
-        global $conf, $langs, $user;
-
-        $error = 0;
-        $this->db->begin();
-
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".$this->id;
-        dol_syslog("SupplierProposalLine::delete", LOG_DEBUG);
-        if ($this->db->query($sql))
-        {
-            // Remove extrafields
-            if (!$error)
-            {
-                $result = $this->deleteExtraFields();
-                if ($result < 0)
-                {
-                    $error++;
-                    dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-                }
-            }
-
-            // Call trigger
-            $result = $this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE', $user);
-            if ($result < 0)
-            {
-                $this->db->rollback();
-                return -1;
-            }
-            // End call triggers
-
-            $this->db->commit();
-
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error()." sql=".$sql;
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     *	Update propal line object into DB
-     *
-     *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
-     *	@return	int					<0 if ko, >0 if ok
-     */
-    public function update($notrigger = 0)
-    {
-        global $conf, $langs, $user;
-
-        $error = 0;
-
-        // Clean parameters
-        if (empty($this->tva_tx)) $this->tva_tx = 0;
-        if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-        if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-        if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-        if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-        if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-        if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-        if (empty($this->marque_tx)) $this->marque_tx = 0;
-        if (empty($this->marge_tx)) $this->marge_tx = 0;
-        if (empty($this->remise_percent)) $this->remise_percent = 0;
-        if (empty($this->info_bits)) $this->info_bits = 0;
-        if (empty($this->special_code)) $this->special_code = 0;
-        if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-        if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
-        if (empty($this->fk_unit)) $this->fk_unit = 0;
-        if (empty($this->subprice)) $this->subprice = 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)
-        {
-            if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-            {
-                return $result;
-            }
-            else
-            {
-                $this->pa_ht = $result;
-            }
-        }
-
-        $this->db->begin();
-
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
-        $sql .= " description='".$this->db->escape($this->desc)."'";
-        $sql .= " , label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
-        $sql .= " , product_type=".$this->product_type;
-        $sql .= " , date_start=".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null");
-        $sql .= " , date_end=".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
-        $sql .= " , tva_tx='".price2num($this->tva_tx)."'";
-        $sql .= " , localtax1_tx=".price2num($this->localtax1_tx);
-        $sql .= " , localtax2_tx=".price2num($this->localtax2_tx);
-        $sql .= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
-        $sql .= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
-        $sql .= " , qty='".price2num($this->qty)."'";
-        $sql .= " , subprice=".price2num($this->subprice)."";
-        $sql .= " , remise_percent=".price2num($this->remise_percent)."";
-        $sql .= " , info_bits='".$this->db->escape($this->info_bits)."'";
-        if (empty($this->skip_update_total))
-        {
-            $sql .= " , total_ht=".price2num($this->total_ht)."";
-            $sql .= " , total_tva=".price2num($this->total_tva)."";
-            $sql .= " , total_ttc=".price2num($this->total_ttc)."";
-            $sql .= " , total_localtax1=".price2num($this->total_localtax1)."";
-            $sql .= " , total_localtax2=".price2num($this->total_localtax2)."";
-        }
-        $sql .= " , fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
-        $sql .= " , buy_price_ht=".price2num($this->pa_ht);
-        if (strlen($this->special_code)) $sql .= " , special_code=".$this->special_code;
-        $sql .= " , fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
-        if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
-        $sql .= " , ref_fourn=".(!empty($this->ref_fourn) ? "'".$this->db->escape($this->ref_fourn)."'" : "null");
-        $sql .= " , fk_unit=".($this->fk_unit ? $this->fk_unit : 'null');
-
-        // Multicurrency
-        $sql .= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
-        $sql .= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
-        $sql .= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
-        $sql .= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
-
-        $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++;
-                }
-            }
-
-            if (!$error && !$notrigger)
-            {
-                // Call trigger
-                $result = $this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE', $user);
-                if ($result < 0)
-                {
-                    $this->db->rollback();
-                    return -1;
-                }
-                // End call triggers
-            }
-
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
-
-    // 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()
-    {
-        // phpcs:enable
-        $this->db->begin();
-
-        // Mise a jour ligne en base
-        $sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
-        $sql .= " total_ht=".price2num($this->total_ht, 'MT');
-        $sql .= ",total_tva=".price2num($this->total_tva, 'MT');
-        $sql .= ",total_ttc=".price2num($this->total_ttc, 'MT');
-        $sql .= " WHERE rowid = ".$this->id;
-
-        dol_syslog("SupplierProposalLine::update_total", LOG_DEBUG);
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -2;
-        }
-    }
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'supplier_proposaldet';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'supplier_proposaldet';
+
+	public $oldline;
+
+	/**
+	 * @var int ID
+	 */
+	public $id;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_supplier_proposal;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_parent_line;
+
+	public $desc; // Description ligne
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_product; // Id produit predefini
+
+	/**
+	 * @deprecated
+	 * @see $product_type
+	 */
+	public $fk_product_type;
+	/**
+	 * Product type
+	 * @var int
+	 * @see Product::TYPE_PRODUCT, Product::TYPE_SERVICE
+	 */
+	public $product_type = Product::TYPE_PRODUCT;
+
+	public $qty;
+	public $tva_tx;
+	public $subprice;
+	public $remise_percent;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_remise_except;
+
+	public $rang = 0;
+
+	/**
+	 * @var int ID
+	 */
+	public $fk_fournprice;
+
+	public $pa_ht;
+	public $marge_tx;
+	public $marque_tx;
+
+	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; // Liste d'options cumulables:
+	// 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 $date_start;
+	public $date_end;
+
+	// From llx_product
+	/**
+	 * @deprecated
+	 * @see $product_ref
+	 */
+	public $ref;
+
+	/**
+	 * Product reference
+	 * @var string
+	 */
+	public $product_ref;
+
+	/**
+	 * @deprecated
+	 * @see $product_label
+	 */
+	public $libelle;
+
+	/**
+	 *  Product label
+	 * @var string
+	 */
+	public $product_label;
+
+	/**
+	 * Product description
+	 * @var string
+	 */
+	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 $skip_update_total; // Skip update price total for special lines
+
+	public $ref_fourn;
+	public $ref_supplier;
+
+	// Multicurrency
+	/**
+	 * @var int ID
+	 */
+	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)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 *	Retrieve the propal line object
+	 *
+	 *	@param	int		$rowid		Propal line id
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function fetch($rowid)
+	{
+		$sql = 'SELECT pd.rowid, pd.fk_supplier_proposal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,';
+		$sql .= ' pd.date_start, pd.date_end,';
+		$sql .= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
+		$sql .= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,';
+		$sql .= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,';
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
+		$sql .= ' pd.product_type, pd.ref_fourn as ref_produit_fourn,';
+		$sql .= ' pd.fk_multicurrency, pd.multicurrency_code, pd.multicurrency_subprice, pd.multicurrency_total_ht, pd.multicurrency_total_tva, pd.multicurrency_total_ttc, pd.fk_unit';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'supplier_proposaldet as pd';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
+		$sql .= ' WHERE pd.rowid = '.$rowid;
+
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$objp = $this->db->fetch_object($result);
+
+			$this->id = $objp->rowid;
+			$this->fk_supplier_proposal = $objp->fk_supplier_proposal;
+			$this->fk_parent_line = $objp->fk_parent_line;
+			$this->label			= $objp->custom_label;
+			$this->desc				= $objp->description;
+			$this->qty = $objp->qty;
+			$this->subprice = $objp->subprice;
+			$this->tva_tx = $objp->tva_tx;
+			$this->remise_percent = $objp->remise_percent;
+			$this->fk_remise_except = $objp->fk_remise_except;
+			$this->fk_product		= $objp->fk_product;
+			$this->info_bits		= $objp->info_bits;
+			$this->date_start		= $this->db->jdate($objp->date_start);
+			$this->date_end			= $this->db->jdate($objp->date_end);
+
+			$this->total_ht			= $objp->total_ht;
+			$this->total_tva		= $objp->total_tva;
+			$this->total_ttc		= $objp->total_ttc;
+
+			$this->fk_fournprice = $objp->fk_fournprice;
+
+			$marginInfos			= getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $this->fk_fournprice, $objp->pa_ht);
+			$this->pa_ht			= $marginInfos[0];
+			$this->marge_tx			= $marginInfos[1];
+			$this->marque_tx		= $marginInfos[2];
+
+			$this->special_code		= $objp->special_code;
+			$this->product_type		= $objp->product_type;
+			$this->rang = $objp->rang;
+
+			$this->ref = $objp->product_ref; // deprecated
+			$this->product_ref = $objp->product_ref;
+			$this->libelle = $objp->product_label; // deprecated
+			$this->product_label	= $objp->product_label;
+			$this->product_desc		= $objp->product_desc;
+
+			$this->ref_fourn = $objp->ref_produit_forun;
+
+			// Multicurrency
+			$this->fk_multicurrency = $objp->fk_multicurrency;
+			$this->multicurrency_code = $objp->multicurrency_code;
+			$this->multicurrency_subprice 	= $objp->multicurrency_subprice;
+			$this->multicurrency_total_ht 	= $objp->multicurrency_total_ht;
+			$this->multicurrency_total_tva 	= $objp->multicurrency_total_tva;
+			$this->multicurrency_total_ttc 	= $objp->multicurrency_total_ttc;
+			$this->fk_unit = $objp->fk_unit;
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 *  Insert object line propal in database
+	 *
+	 *	@param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function insert($notrigger = 0)
+	{
+		global $conf, $langs, $user;
+
+		$error = 0;
+
+		dol_syslog(get_class($this)."::insert rang=".$this->rang);
+
+		// Clean parameters
+		if (empty($this->tva_tx)) $this->tva_tx = 0;
+		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
+		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
+		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+		if (empty($this->rang)) $this->rang = 0;
+		if (empty($this->remise)) $this->remise = 0;
+		if (empty($this->remise_percent)) $this->remise_percent = 0;
+		if (empty($this->info_bits)) $this->info_bits = 0;
+		if (empty($this->special_code)) $this->special_code = 0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+		if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
+		if (empty($this->fk_unit)) $this->fk_unit = 0;
+		if (empty($this->subprice)) $this->subprice = 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)
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			} else {
+				$this->pa_ht = $result;
+			}
+		}
+
+		// Check parameters
+		if ($this->product_type < 0) return -1;
+
+		$this->db->begin();
+
+		// Insert line into database
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'supplier_proposaldet';
+		$sql .= ' (fk_supplier_proposal, fk_parent_line, label, description, fk_product, product_type,';
+		$sql .= ' date_start, date_end,';
+		$sql .= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
+		$sql .= ' subprice, remise_percent, ';
+		$sql .= ' info_bits, ';
+		$sql .= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
+		$sql .= ' ref_fourn,';
+		$sql .= ' fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, fk_unit)';
+		$sql .= " VALUES (".$this->fk_supplier_proposal.",";
+		$sql .= " ".($this->fk_parent_line > 0 ? "'".$this->db->escape($this->fk_parent_line)."'" : "null").",";
+		$sql .= " ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " '".$this->db->escape($this->desc)."',";
+		$sql .= " ".($this->fk_product ? "'".$this->db->escape($this->fk_product)."'" : "null").",";
+		$sql .= " '".$this->db->escape($this->product_type)."',";
+		$sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
+		$sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
+		$sql .= " ".($this->fk_remise_except ? "'".$this->db->escape($this->fk_remise_except)."'" : "null").",";
+		$sql .= " ".price2num($this->qty).",";
+		$sql .= " ".price2num($this->tva_tx).",";
+		$sql .= " ".price2num($this->localtax1_tx).",";
+		$sql .= " ".price2num($this->localtax2_tx).",";
+		$sql .= " '".$this->db->escape($this->localtax1_type)."',";
+		$sql .= " '".$this->db->escape($this->localtax2_type)."',";
+		$sql .= " ".(!empty($this->subprice) ?price2num($this->subprice) : "null").",";
+		$sql .= " ".price2num($this->remise_percent).",";
+		$sql .= " ".(isset($this->info_bits) ? "'".$this->db->escape($this->info_bits)."'" : "null").",";
+		$sql .= " ".price2num($this->total_ht).",";
+		$sql .= " ".price2num($this->total_tva).",";
+		$sql .= " ".price2num($this->total_localtax1).",";
+		$sql .= " ".price2num($this->total_localtax2).",";
+		$sql .= " ".price2num($this->total_ttc).",";
+		$sql .= " ".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null").",";
+		$sql .= " ".(isset($this->pa_ht) ? "'".price2num($this->pa_ht)."'" : "null").",";
+		$sql .= ' '.$this->special_code.',';
+		$sql .= ' '.$this->rang.',';
+		$sql .= " '".$this->db->escape($this->ref_fourn)."'";
+		$sql .= ", ".($this->fk_multicurrency > 0 ? $this->fk_multicurrency : 'null');
+		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+		$sql .= ", ".$this->multicurrency_subprice;
+		$sql .= ", ".$this->multicurrency_total_ht;
+		$sql .= ", ".$this->multicurrency_total_tva;
+		$sql .= ", ".$this->multicurrency_total_ttc;
+		$sql .= ", ".($this->fk_unit ? $this->fk_unit : 'null');
+		$sql .= ')';
+
+		dol_syslog(get_class($this).'::insert', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'supplier_proposaldet');
+
+			if (!$error)
+			{
+				$result = $this->insertExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINESUPPLIER_PROPOSAL_INSERT', $user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
+			}
+
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->error()." sql=".$sql;
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * 	Delete line in database
+	 *
+	 *	@return	 int  <0 if ko, >0 if ok
+	 */
+	public function delete()
+	{
+		global $conf, $langs, $user;
+
+		$error = 0;
+		$this->db->begin();
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."supplier_proposaldet WHERE rowid = ".$this->id;
+		dol_syslog("SupplierProposalLine::delete", LOG_DEBUG);
+		if ($this->db->query($sql))
+		{
+			// Remove extrafields
+			if (!$error)
+			{
+				$result = $this->deleteExtraFields();
+				if ($result < 0)
+				{
+					$error++;
+					dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+				}
+			}
+
+			// Call trigger
+			$result = $this->call_trigger('LINESUPPLIER_PROPOSAL_DELETE', $user);
+			if ($result < 0)
+			{
+				$this->db->rollback();
+				return -1;
+			}
+			// End call triggers
+
+			$this->db->commit();
+
+			return 1;
+		} else {
+			$this->error = $this->db->error()." sql=".$sql;
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update propal line object into DB
+	 *
+	 *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *	@return	int					<0 if ko, >0 if ok
+	 */
+	public function update($notrigger = 0)
+	{
+		global $conf, $langs, $user;
+
+		$error = 0;
+
+		// Clean parameters
+		if (empty($this->tva_tx)) $this->tva_tx = 0;
+		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
+		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
+		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
+		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
+		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
+		if (empty($this->marque_tx)) $this->marque_tx = 0;
+		if (empty($this->marge_tx)) $this->marge_tx = 0;
+		if (empty($this->remise_percent)) $this->remise_percent = 0;
+		if (empty($this->info_bits)) $this->info_bits = 0;
+		if (empty($this->special_code)) $this->special_code = 0;
+		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
+		if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
+		if (empty($this->fk_unit)) $this->fk_unit = 0;
+		if (empty($this->subprice)) $this->subprice = 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)
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			} else {
+				$this->pa_ht = $result;
+			}
+		}
+
+		$this->db->begin();
+
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
+		$sql .= " description='".$this->db->escape($this->desc)."'";
+		$sql .= " , label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
+		$sql .= " , product_type=".$this->product_type;
+		$sql .= " , date_start=".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null");
+		$sql .= " , date_end=".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null");
+		$sql .= " , tva_tx='".price2num($this->tva_tx)."'";
+		$sql .= " , localtax1_tx=".price2num($this->localtax1_tx);
+		$sql .= " , localtax2_tx=".price2num($this->localtax2_tx);
+		$sql .= " , localtax1_type='".$this->db->escape($this->localtax1_type)."'";
+		$sql .= " , localtax2_type='".$this->db->escape($this->localtax2_type)."'";
+		$sql .= " , qty='".price2num($this->qty)."'";
+		$sql .= " , subprice=".price2num($this->subprice)."";
+		$sql .= " , remise_percent=".price2num($this->remise_percent)."";
+		$sql .= " , info_bits='".$this->db->escape($this->info_bits)."'";
+		if (empty($this->skip_update_total))
+		{
+			$sql .= " , total_ht=".price2num($this->total_ht)."";
+			$sql .= " , total_tva=".price2num($this->total_tva)."";
+			$sql .= " , total_ttc=".price2num($this->total_ttc)."";
+			$sql .= " , total_localtax1=".price2num($this->total_localtax1)."";
+			$sql .= " , total_localtax2=".price2num($this->total_localtax2)."";
+		}
+		$sql .= " , fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
+		$sql .= " , buy_price_ht=".price2num($this->pa_ht);
+		if (strlen($this->special_code)) $sql .= " , special_code=".$this->special_code;
+		$sql .= " , fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
+		if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+		$sql .= " , ref_fourn=".(!empty($this->ref_fourn) ? "'".$this->db->escape($this->ref_fourn)."'" : "null");
+		$sql .= " , fk_unit=".($this->fk_unit ? $this->fk_unit : 'null');
+
+		// Multicurrency
+		$sql .= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
+		$sql .= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
+		$sql .= " , multicurrency_total_tva=".price2num($this->multicurrency_total_tva)."";
+		$sql .= " , multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc)."";
+
+		$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++;
+				}
+			}
+
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE', $user);
+				if ($result < 0)
+				{
+					$this->db->rollback();
+					return -1;
+				}
+				// End call triggers
+			}
+
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
+	// 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()
+	{
+		// phpcs:enable
+		$this->db->begin();
+
+		// Mise a jour ligne en base
+		$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposaldet SET";
+		$sql .= " total_ht=".price2num($this->total_ht, 'MT');
+		$sql .= ",total_tva=".price2num($this->total_tva, 'MT');
+		$sql .= ",total_ttc=".price2num($this->total_ttc, 'MT');
+		$sql .= " WHERE rowid = ".$this->id;
+
+		dol_syslog("SupplierProposalLine::update_total", LOG_DEBUG);
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -2;
+		}
+	}
 }
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index 43c9b91f563..f0d6a62d9c9 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("propal", "facture", "orders", "sendings", "companies"))
 
 $id		= GETPOST('id', 'int');
 $ref	= GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
@@ -65,16 +65,12 @@ if ($action == 'addcontact' && $permissiontoedit)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
-	{
+	} else {
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
+		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
@@ -86,9 +82,7 @@ elseif ($action == 'swapstatut' && $permissiontoedit)
 	if ($object->fetch($id))
 	{
 	    $result = $object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -103,8 +97,7 @@ elseif ($action == 'deletecontact' && $permissiontoedit)
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -194,9 +187,7 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
-	}
-	else
-	{
+	} else {
 		// Contact not found
 		print "ErrorRecordNotFound";
 	}
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index 3f471e28b3f..5b58c7de461 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -166,9 +166,7 @@ if ($object->id > 0)
 	$permtoedit = $user->rights->supplier_proposal->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	print $langs->trans("ErrorUnknown");
 }
 
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index e8432ad8fe4..6ba425f323a 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -162,9 +162,7 @@ if ($resql)
 
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
@@ -294,8 +292,7 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 
 
 /*
@@ -376,16 +373,13 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 			if ($num > $nbofloop)
 			{
 				print '<tr class="liste_total"><td colspan="5">'.$langs->trans("XMoreLines", ($num - $nbofloop))."</td></tr>";
-			}
-			elseif ($total > 0)
+			} elseif ($total > 0)
 			{
 				print '<tr class="liste_total"><td colspan="3">'.$langs->trans("Total").'</td><td class="right">'.price($total)."</td><td>&nbsp;</td></tr>";
 			}
 			print "</table></div><br>";
 		}
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index ded5d9ca2bf..7f2576ca0f6 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -48,7 +48,7 @@ $langs->loadLangs(array('companies', 'propal', 'supplier_proposal', 'compta', 'b
 
 $socid = GETPOST('socid', 'int');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -62,7 +62,7 @@ $search_societe = GETPOST('search_societe', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
-$search_state = trim(GETPOST("search_state"));
+$search_state = GETPOST("search_state");
 $search_country = GETPOST("search_country", 'int');
 $search_type_thirdparty = GETPOST("search_type_thirdparty", 'int');
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
@@ -314,7 +314,7 @@ if ($search_multicurrency_montant_vat != '') $sql .= natural_search('sp.multicur
 if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('sp.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
 if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
 if ($socid) $sql .= ' AND s.rowid = '.$socid;
-if ($search_status >= 0 && $search_status != '') $sql .= ' AND sp.fk_statut IN ('.$db->escape($search_status).')';
+if ($search_status >= 0 && $search_status != '') $sql .= ' AND sp.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
 $sql .= dolSqlDateFilter("sp.date_livraison", $day, $month, $year);
 $sql .= dolSqlDateFilter("sp.date_valid", $dayvalid, $monthvalid, $yearvalid);
 if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
@@ -358,9 +358,7 @@ if ($resql)
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name;
-	}
-	else
-	{
+	} else {
 		$title = $langs->trans('ListOfSupplierProposals');
 	}
 
@@ -416,11 +414,9 @@ if ($resql)
 	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-	$newcardbutton = '';
-	if ($user->rights->supplier_proposal->creer)
-	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('NewAskPrice'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create');
-    }
+	$url = DOL_URL_ROOT.'/supplier_proposal/card.php?action=create';
+	if (!empty($socid)) $url .= '&socid='.$socid;
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewAskPrice'), '', 'fa fa-plus-circle', $url, '', $user->rights->supplier_proposal->creer);
 
 	// Fields title search
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -467,7 +463,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -950,9 +946,7 @@ if ($resql)
 	$delallowed = $user->rights->supplier_proposal->creer;
 
 	print $formfile->showdocuments('massfilesarea_supplier_proposal', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index aaf40288e15..16e3d192547 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array('supplier_proposal', 'compta', 'bills'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->socid) $socid = $user->socid;
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 7e5b6aaf531..43077495238 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -110,14 +110,10 @@ if (!defined('DONOTLOADCONF') && file_exists($conffile) && filesize($conffile) >
 					$includeconferror = 'ErrorBadValueForDolibarrMainDBType';
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$includeconferror = 'ErrorBadValueForDolibarrMainDocumentRoot';
 		}
-	}
-	else
-	{
+	} else {
 		$includeconferror = 'ErrorBadFormatForConfFile';
 	}
 }
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
new file mode 100644
index 00000000000..54e0752736c
--- /dev/null
+++ b/htdocs/takepos/admin/appearance.php
@@ -0,0 +1,130 @@
+<?php
+/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2019-2020 Andreu Bisquerra Gaya		<jove@bisquerra.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/takepos/admin/appearance.php
+ *	\ingroup    takepos
+ *	\brief      Setup page for TakePos module
+ */
+
+require '../../main.inc.php'; // Load $user and permissions
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
+
+// Security check
+if (!$user->admin) accessforbidden();
+
+$langs->loadLangs(array("admin", "cashdesk", "commercial"));
+
+/*
+ * Actions
+ */
+
+if (GETPOST('action', 'alpha') == 'set')
+{
+	$db->begin();
+
+	$res = dolibarr_set_const($db, "TAKEPOS_COLOR_THEME", GETPOST('TAKEPOS_COLOR_THEME', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_LINES_TO_SHOW", GETPOST('TAKEPOS_LINES_TO_SHOW', 'alpha'), 'chaine', 0, '', $conf->entity);
+
+	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
+
+	if (!$res > 0) $error++;
+
+ 	if (!$error)
+    {
+        $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);
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formproduct = new FormProduct($db);
+
+llxHeader('', $langs->trans("CashDeskSetup"));
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
+$head = takepos_admin_prepare_head();
+dol_fiche_head($head, 'appearance', 'TakePOS', -1, 'cash-register');
+
+print '<form action="'.$_SERVER["PHP_SELF"].'?terminal='.(empty($terminal) ? 1 : $terminal).'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="set">';
+
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+print "</tr>\n";
+
+// Color theme
+print '<tr class="oddeven"><td>';
+print $langs->trans("ColorTheme");
+print '<td colspan="2">';
+$array = array(0=>"Eldy", 1=>$langs->trans("Colorful"));
+print $form->selectarray('TAKEPOS_COLOR_THEME', $array, (empty($conf->global->TAKEPOS_COLOR_THEME) ? '0' : $conf->global->TAKEPOS_COLOR_THEME), 0);
+print "</td></tr>\n";
+
+// Hide category images to speed up
+print '<tr class="oddeven"><td>';
+print $langs->trans('HideCategoryImages');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_HIDE_CATEGORY_IMAGES", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
+// Hide category images to speed up
+print '<tr class="oddeven"><td>';
+print $langs->trans('HideProductImages');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_HIDE_PRODUCT_IMAGES", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
+// Lines to show
+print '<tr class="oddeven"><td>';
+print $langs->trans("NumberOfLinesToShow");
+print '<td colspan="2">';
+$array = array(1=>"1", 2=>"2", 3=>"3", 4=>"4", 5=>"5", 6=>"6");
+print $form->selectarray('TAKEPOS_LINES_TO_SHOW', $array, (empty($conf->global->TAKEPOS_LINES_TO_SHOW) ? '2' : $conf->global->TAKEPOS_LINES_TO_SHOW), 0);
+print "</td></tr>\n";
+
+print '</table>';
+
+print '<br>';
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+
+print "</form>\n";
+
+print '<br>';
+
+llxFooter();
+$db->close();
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index c9e53a86664..b026f53ce69 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -34,7 +34,8 @@ if (!$user->admin) accessforbidden();
 
 $langs->loadLangs(array("admin", "cashdesk", "printing"));
 
-global $db;
+$res = 0;
+
 
 /*
  * Actions
@@ -47,21 +48,21 @@ if (GETPOST('action', 'alpha') == 'set')
 	dol_syslog("admin/bar");
 
 	$suplement_category = GETPOST('TAKEPOS_SUPPLEMENTS_CATEGORY', 'alpha');
-	if ($suplement_category < 0) $suplement_category= 0;
+	if ($suplement_category < 0) $suplement_category = 0;
 
 	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS_CATEGORY", $suplement_category, 'chaine', 0, '', $conf->entity);
 	if ($res <= 0) {
-	    $error++;
+		$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');
+	}
 }
 
 
@@ -78,9 +79,8 @@ llxHeader('', $langs->trans("CashDeskSetup"), '', '', 0, 0, $arrayofjs, $arrayof
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
-$head = takepos_prepare_head();
+$head = takepos_admin_prepare_head();
 dol_fiche_head($head, 'bar', 'TakePOS', -1, 'cash-register');
-print '<br>';
 
 
 // Mode
@@ -99,129 +99,138 @@ function Floors() {
 
 <?php
 
-print '<a href="" onclick="Floors(); return false;"><span class="fa fa-glass-cheers"></span> '.$langs->trans("DefineTablePlan").'</a><br>';
-print '<br><br>';
-
-print '<div class="div-table-responsive">';
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre">';
-print '<td class="titlefieldcreate">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
-print "</tr>\n";
-
-if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOS_PRINT_METHOD != "browser") {
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("OrderPrinters").' (<a href="'.DOL_URL_ROOT.'/takepos/admin/orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
-	print '</td>';
-	print '<td>';
-	print ajax_constantonoff("TAKEPOS_ORDER_PRINTERS", array(), $conf->entity, 0, 0, 1, 0);
-	//print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
-	print '</td></tr>';
-
-	print '<tr class="oddeven value"><td>';
-	print $langs->trans("OrderNotes");
-	print '</td>';
-	print '<td>';
-	print ajax_constantonoff("TAKEPOS_ORDER_NOTES", array(), $conf->entity, 0, 0, 1, 0);
-	//print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
-	print '</td></tr>';
-}
-
-print '<tr class="oddeven value"><td>';
-print $langs->trans("BasicPhoneLayout");
-print '</td>';
-print '<td>';
-//print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
-print ajax_constantonoff("TAKEPOS_PHONE_BASIC_LAYOUT", array(), $conf->entity, 0, 0, 1, 0);
-print '</td></tr>';
-
-print '<tr class="oddeven value"><td>';
-print $langs->trans("ProductSupplements");
-print '</td>';
-print '<td>';
-//print $form->selectyesno("TAKEPOS_SUPPLEMENTS", $conf->global->TAKEPOS_SUPPLEMENTS, 1);
-print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
-print '</td></tr>';
-
-if ($conf->global->TAKEPOS_SUPPLEMENTS)
-{
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("SupplementCategory");
-	print '</td>';
-	print '<td>';
-	print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
-	print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
-	print "</td></tr>\n";
-}
-
-print '<tr class="oddeven value"><td>';
-print 'QR - '.$langs->trans("CustomerMenu");
-print '</td>';
-print '<td>';
-print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0);
-print '</td></tr>';
-
-print '<tr class="oddeven value"><td>';
-print 'QR - '.$langs->trans("AutoOrder");
-print '</td>';
-print '<td>';
-print ajax_constantonoff("TAKEPOS_AUTO_ORDER", array(), $conf->entity, 0, 0, 1, 0);
-print '</td></tr>';
-
-print '</table>';
-
-
-if ($conf->global->TAKEPOS_QR_MENU)
-{
-	$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
-	print '<br>';
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
-	print "</tr>\n";
-	print '<tr class="oddeven value"><td>';
-	print "<a target='_blank' href='".$urlwithroot."/takepos/public/menu.php'>".$urlwithroot."/takepos/public/menu.php</a>";
-	print '</td>';
-	print '<td class="right">';
-	print "<a target='_blank' href='printqr.php'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php' height='42' width='42'></a>";
-	print '</td></tr>';
-	print '</table>';
-}
-
-if ($conf->global->TAKEPOS_AUTO_ORDER)
-{
-	print '<br>';
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Table").'</td><td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
-	print "</tr>\n";
-
-	//global $dolibarr_main_url_root;
-	$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
-	$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables";
-	$resql = $db->query($sql);
-	$rows = array();
-	while ($row = $db->fetch_array($resql)) {
-		print '<tr class="oddeven value"><td>';
-		print $langs->trans("Table")." ".$row['label'];
-		print '</td>';
-		print '<td>';
-		print "<a target='_blank' href='".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."'>".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."</a>";
-		print '</td>';
-		print '<td class="right">';
-		print "<a target='_blank' href='printqr.php?id=".$row['rowid']."'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?key=".dol_encode($row['rowid'])."' height='42' width='42'></a>";
-		print '</td></tr>';
-	}
-
-	print '</table>';
-}
-
-print '</div>';
+print $langs->trans("EnableBarOrRestaurantFeatures");
+print ajax_constantonoff("TAKEPOS_BAR_RESTAURANT", array(), $conf->entity, 0, 0, 1, 0);
 
 print '<br>';
 
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+	print '<br>';
+	print '<a href="" onclick="Floors(); return false;"><span class="fa fa-glass-cheers"></span> '.$langs->trans("DefineTablePlan").'</a><br>';
+	print '<br><br>';
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td class="titlefieldcreate">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
+	print "</tr>\n";
+
+	if ($conf->global->TAKEPOS_PRINT_METHOD != "browser") {
+		print '<tr class="oddeven value"><td>';
+		print $langs->trans("OrderPrinters").' (<a href="'.DOL_URL_ROOT.'/takepos/admin/orderprinters.php?leftmenu=setup">'.$langs->trans("Setup").'</a>)';
+		print '</td>';
+		print '<td>';
+		print ajax_constantonoff("TAKEPOS_ORDER_PRINTERS", array(), $conf->entity, 0, 0, 1, 0);
+		//print $form->selectyesno("TAKEPOS_ORDER_PRINTERS", $conf->global->TAKEPOS_ORDER_PRINTERS, 1);
+		print '</td></tr>';
+
+		print '<tr class="oddeven value"><td>';
+		print $langs->trans("OrderNotes");
+		print '</td>';
+		print '<td>';
+		print ajax_constantonoff("TAKEPOS_ORDER_NOTES", array(), $conf->entity, 0, 0, 1, 0);
+		//print $form->selectyesno("TAKEPOS_ORDER_NOTES", $conf->global->TAKEPOS_ORDER_NOTES, 1);
+		print '</td></tr>';
+	}
+
+	print '<tr class="oddeven value"><td>';
+	print $langs->trans("BasicPhoneLayout");
+	print '</td>';
+	print '<td>';
+	//print $form->selectyesno("TAKEPOS_PHONE_BASIC_LAYOUT", $conf->global->TAKEPOS_PHONE_BASIC_LAYOUT, 1);
+	print ajax_constantonoff("TAKEPOS_PHONE_BASIC_LAYOUT", array(), $conf->entity, 0, 0, 1, 0);
+	print '</td></tr>';
+
+	print '<tr class="oddeven value"><td>';
+	print $langs->trans("ProductSupplements");
+	print '</td>';
+	print '<td>';
+	//print $form->selectyesno("TAKEPOS_SUPPLEMENTS", $conf->global->TAKEPOS_SUPPLEMENTS, 1);
+	print ajax_constantonoff("TAKEPOS_SUPPLEMENTS", array(), $conf->entity, 0, 0, 1, 0);
+	print '</td></tr>';
+
+	if ($conf->global->TAKEPOS_SUPPLEMENTS)
+	{
+		print '<tr class="oddeven"><td>';
+		print $langs->trans("SupplementCategory");
+		print '</td>';
+		print '<td>';
+		print $form->select_all_categories(Categorie::TYPE_PRODUCT, $conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, 'TAKEPOS_SUPPLEMENTS_CATEGORY', 64, 0, 0);
+		print ajax_combobox('TAKEPOS_SUPPLEMENTS_CATEGORY');
+		print "</td></tr>\n";
+	}
+
+	print '<tr class="oddeven value"><td>';
+	print 'QR - '.$langs->trans("CustomerMenu");
+	print '</td>';
+	print '<td>';
+	print ajax_constantonoff("TAKEPOS_QR_MENU", array(), $conf->entity, 0, 0, 1, 0);
+	print '</td></tr>';
+
+	print '<tr class="oddeven value"><td>';
+	print 'QR - '.$langs->trans("AutoOrder");
+	print '</td>';
+	print '<td>';
+	print ajax_constantonoff("TAKEPOS_AUTO_ORDER", array(), $conf->entity, 0, 0, 1, 0);
+	print '</td></tr>';
+
+	print '</table>';
+	print '</div>';
+
+	print '<br>';
+
+	print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></div>';
+}
+
+if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
+	if ($conf->global->TAKEPOS_QR_MENU)
+	{
+		$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
+		print '<br>';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
+		print "</tr>\n";
+		print '<tr class="oddeven value"><td>';
+		print "<a target='_blank' href='".$urlwithroot."/takepos/public/menu.php'>".$urlwithroot."/takepos/public/menu.php</a>";
+		print '</td>';
+		print '<td class="right">';
+		print "<a target='_blank' href='printqr.php'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php' height='42' width='42'></a>";
+		print '</td></tr>';
+		print '</table>';
+	}
+
+	if ($conf->global->TAKEPOS_AUTO_ORDER)
+	{
+		print '<br>';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Table").'</td><td>'.$langs->trans("URL").'</td><td class="right">'.$langs->trans("QR").'</td>';
+		print "</tr>\n";
+
+		//global $dolibarr_main_url_root;
+		$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
+		$sql = "SELECT rowid, entity, label, leftpos, toppos, floor FROM ".MAIN_DB_PREFIX."takepos_floor_tables";
+		$resql = $db->query($sql);
+		$rows = array();
+		while ($row = $db->fetch_array($resql)) {
+			print '<tr class="oddeven value"><td>';
+			print $langs->trans("Table")." ".$row['label'];
+			print '</td>';
+			print '<td>';
+			print "<a target='_blank' href='".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."'>".$urlwithroot."/takepos/public/auto_order.php?key=".dol_encode($row['rowid'])."</a>";
+			print '</td>';
+			print '<td class="right">';
+			print "<a target='_blank' href='printqr.php?id=".$row['rowid']."'><img src='".DOL_URL_ROOT."/takepos/genimg/qr.php?key=".dol_encode($row['rowid'])."' height='42' width='42'></a>";
+			print '</td></tr>';
+		}
+
+		print '</table>';
+	}
+}
+
 
 print "</form>\n";
 
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index 566f18ac1a4..b396655dea4 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -39,7 +39,7 @@ if (!$user->rights->categorie->lire) accessforbidden();
 $id = GETPOST('id', 'int');
 $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
 $catname = GETPOST('catname', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $printer1 = GETPOST('printer1', 'alpha');
 $printer2 = GETPOST('printer2', 'alpha');
 
@@ -72,17 +72,39 @@ if ($action == "SavePrinter2") {
 $categstatic = new Categorie($db);
 $form = new Form($db);
 
-if ($type == Categorie::TYPE_PRODUCT) { $title = $langs->trans("ProductsCategoriesArea"); $typetext = 'product'; }
-elseif ($type == Categorie::TYPE_SUPPLIER) { $title = $langs->trans("SuppliersCategoriesArea"); $typetext = 'supplier'; }
-elseif ($type == Categorie::TYPE_CUSTOMER) { $title = $langs->trans("CustomersCategoriesArea"); $typetext = 'customer'; }
-elseif ($type == Categorie::TYPE_MEMBER) { $title = $langs->trans("MembersCategoriesArea"); $typetext = 'member'; }
-elseif ($type == Categorie::TYPE_CONTACT) { $title = $langs->trans("ContactsCategoriesArea"); $typetext = 'contact'; }
-elseif ($type == Categorie::TYPE_ACCOUNT) { $title = $langs->trans("AccountsCategoriesArea"); $typetext = 'bank_account'; }
-elseif ($type == Categorie::TYPE_PROJECT) { $title = $langs->trans("ProjectsCategoriesArea"); $typetext = 'project'; }
-elseif ($type == Categorie::TYPE_USER) { $title = $langs->trans("UsersCategoriesArea"); $typetext = 'user'; }
-else { $title = $langs->trans("CategoriesArea"); $typetext = 'unknown'; }
+if ($type == Categorie::TYPE_PRODUCT) {
+	$title = $langs->trans("ProductsCategoriesArea");
+	$typetext = 'product';
+} elseif ($type == Categorie::TYPE_SUPPLIER) {
+	$title = $langs->trans("SuppliersCategoriesArea");
+	$typetext = 'supplier';
+} elseif ($type == Categorie::TYPE_CUSTOMER) {
+	$title = $langs->trans("CustomersCategoriesArea");
+	$typetext = 'customer';
+} elseif ($type == Categorie::TYPE_MEMBER) {
+	$title = $langs->trans("MembersCategoriesArea");
+	$typetext = 'member';
+} elseif ($type == Categorie::TYPE_CONTACT) {
+	$title = $langs->trans("ContactsCategoriesArea");
+	$typetext = 'contact';
+} elseif ($type == Categorie::TYPE_ACCOUNT) {
+	$title = $langs->trans("AccountsCategoriesArea");
+	$typetext = 'bank_account';
+} elseif ($type == Categorie::TYPE_PROJECT) {
+	$title = $langs->trans("ProjectsCategoriesArea");
+	$typetext = 'project';
+} elseif ($type == Categorie::TYPE_USER) {
+	$title = $langs->trans("UsersCategoriesArea");
+	$typetext = 'user';
+} else {
+	$title = $langs->trans("CategoriesArea");
+	$typetext = 'unknown';
+}
 
-$arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
+$arrayofjs = array(
+	'/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
+	'/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js',
+);
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
 
 llxHeader('', $title, '', '', 0, 0, $arrayofjs, $arrayofcss);
@@ -146,9 +168,7 @@ if ($nbofentries > 0)
 		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer1[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
 	}
 	print '</td></tr>';
-}
-else
-{
+} else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
@@ -176,9 +196,7 @@ if ($nbofentries > 0)
 		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer2[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
 	}
 	print '</td></tr>';
-}
-else
-{
+} else {
 	print '<tr class="pair">';
 	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
 	print '<td valign="middle">';
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index 902bcfc81d4..82940f2296a 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -110,7 +110,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
-$head = takepos_prepare_head();
+$head = takepos_admin_prepare_head();
 dol_fiche_head($head, 'other', 'TakePOS', -1, 'cash-register');
 print '<br>';
 
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index d6d0574e0ed..d7162138fe3 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -48,6 +48,7 @@ if (GETPOST('action', 'alpha') == 'set')
 	$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_PAYMENT_METHOD", GETPOST('TAKEPOS_PRINT_PAYMENT_METHOD', 'alpha'), 'chaine', 0, '', $conf->entity);
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
@@ -57,14 +58,11 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
-}
-elseif (GETPOST('action', 'alpha') == 'setmethod')
+} elseif (GETPOST('action', 'alpha') == 'setmethod')
 {
     dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
 }
@@ -81,7 +79,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
-$head = takepos_prepare_head();
+$head = takepos_admin_prepare_head();
 dol_fiche_head($head, 'receipt', 'TakePOS', -1, 'cash-register');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'?terminal='.(empty($terminal) ? 1 : $terminal).'" method="post">';
@@ -90,6 +88,7 @@ print '<input type="hidden" name="action" value="set">';
 
 print load_fiche_titre($langs->trans("PrintMethod"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td><td>'.$langs->trans("Description").'</td><td class="right">'.$langs->trans("Status").'</td>';
@@ -104,10 +103,8 @@ print '</td><td class="right">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "browser")
 {
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=browser">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+} else {
+    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";
 
@@ -121,13 +118,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 1) {
 	print '<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
 	print '</td><td class="right">';
 	if ($conf->receiptprinter->enabled) {
-		if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter")
-		{
+		if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 			print img_picto($langs->trans("Activated"), 'switch_on');
-		}
-		else
-		{
-			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+		} else {
+			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 		}
 	} else {
 		print '<span class="opacitymedium">';
@@ -146,21 +140,30 @@ print '</td><td class="right">';
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
 {
     print img_picto($langs->trans("Activated"), 'switch_on');
-}
-else
-{
-    print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&value=takeposconnector">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+} else {
+    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>';
+print '</div>';
+
 
 print load_fiche_titre($langs->trans("Setup"), '', '');
 
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
+// VAT Grouped on ticket
+print '<tr class="oddeven"><td>';
+print $langs->trans('TicketVatGrouped');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_TICKET_VAT_GROUPPED", array(), $conf->entity, 0, 0, 1, 0);
+//print $form->selectyesno("TAKEPOS_TICKET_VAT_GROUPPED", $conf->global->TAKEPOS_TICKET_VAT_GROUPPED, 1);
+print "</td></tr>\n";
+
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 	print '<tr class="oddeven value"><td>';
 	print $langs->trans("URL")." / ".$langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector" target="_blank">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
@@ -183,9 +186,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 	{
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-	}
-	else
-	{
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
@@ -199,9 +200,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 	{
 		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
-	}
-	else
-	{
+	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
@@ -218,6 +217,13 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	print '<td colspan="2">';
 	print $form->selectyesno("TAKEPOS_SHOW_CUSTOMER", $conf->global->TAKEPOS_SHOW_CUSTOMER, 1);
 	print "</td></tr>\n";
+
+	// Print payment method
+	print '<tr class="oddeven"><td>';
+	print $langs->trans('PrintPaymentMethodOnReceipts');
+	print '<td colspan="2">';
+	print $form->selectyesno("TAKEPOS_PRINT_PAYMENT_METHOD", $conf->global->TAKEPOS_PRINT_PAYMENT_METHOD, 1);
+	print "</td></tr>\n";
 }
 
 // Auto print tickets
@@ -227,7 +233,16 @@ print '<td colspan="2">';
 print $form->selectyesno("TAKEPOS_AUTO_PRINT_TICKETS", $conf->global->TAKEPOS_AUTO_PRINT_TICKETS, 1);
 print "</td></tr>\n";
 
+if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+	print '<tr class="oddeven"><td>';
+	print $langs->trans('WeighingScale');
+	print '<td colspan="2">';
+	print ajax_constantonoff("TAKEPOS_WEIGHING_SCALE", array(), $conf->entity, 0, 0, 1, 0);
+	print "</td></tr>\n";
+}
+
 print '</table>';
+print '</div>';
 
 print '<br>';
 
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index a6f8b4968cc..9471e9d1ea4 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -57,7 +57,7 @@ if ($resql) {
 	}
 }
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 /*
@@ -75,7 +75,6 @@ if ($action == 'set')
 	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS_CATEGORY", GETPOST('TAKEPOS_SUPPLEMENTS_CATEGORY', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_NUMPAD", GETPOST('TAKEPOS_NUMPAD', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_SORTPRODUCTFIELD", GETPOST('TAKEPOS_SORTPRODUCTFIELD', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_COLOR_THEME", GETPOST('TAKEPOS_COLOR_THEME', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_NUM_TERMINALS", GETPOST('TAKEPOS_NUM_TERMINALS', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_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);
@@ -96,9 +95,7 @@ if ($action == 'set')
  	if (!$error)
     {
         $db->commit();
-    }
-    else
-    {
+    } else {
         $db->rollback();
     }
 } elseif ($action == 'updateMask') {
@@ -133,7 +130,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
-$head = takepos_prepare_head();
+$head = takepos_admin_prepare_head();
 dol_fiche_head($head, 'setup', 'TakePOS', -1, 'cash-register');
 
 // Numbering modules
@@ -196,10 +193,8 @@ foreach ($dirmodels as $reldir)
 						if ($conf->global->TAKEPOS_REF_ADDON == "$file")
 						{
 							print img_picto($langs->trans("Activated"), 'switch_on');
-						}
-						else
-						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&amp;value='.$file.'">';
+						} else {
+							print '<a href="'.$_SERVER["PHP_SELF"].'?action=setrefmod&amp;token='.newToken().'&amp;value='.urlencode($file).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -279,14 +274,6 @@ print img_object('', 'category', 'class="paddingright"').$form->select_all_categ
 print ajax_combobox('TAKEPOS_ROOT_CATEGORY_ID');
 print "</td></tr>\n";
 
-// VAT Grouped on ticket
-print '<tr class="oddeven"><td>';
-print $langs->trans('TicketVatGrouped');
-print '<td colspan="2">';
-print ajax_constantonoff("TAKEPOS_TICKET_VAT_GROUPPED", array(), $conf->entity, 0, 0, 1, 0);
-//print $form->selectyesno("TAKEPOS_TICKET_VAT_GROUPPED", $conf->global->TAKEPOS_TICKET_VAT_GROUPPED, 1);
-print "</td></tr>\n";
-
 // Sort product
 print '<tr class="oddeven"><td>';
 print $langs->trans("SortProductField");
@@ -308,14 +295,6 @@ $htmltext = '<i>'.$langs->trans("AvailableVariables").':<br>';
 foreach ($substitutionarray as $key => $val)	$htmltext .= $key.'<br>';
 $htmltext .= '</i>';
 
-// Color theme
-print '<tr class="oddeven"><td>';
-print $langs->trans("ColorTheme");
-print '<td colspan="2">';
-$array = array(0=>"Eldy", 1=>$langs->trans("Colorful"));
-print $form->selectarray('TAKEPOS_COLOR_THEME', $array, (empty($conf->global->TAKEPOS_COLOR_THEME) ? '0' : $conf->global->TAKEPOS_COLOR_THEME), 0);
-print "</td></tr>\n";
-
 // Payment numpad
 print '<tr class="oddeven"><td>';
 print $langs->trans("Paymentnumpad");
@@ -378,6 +357,20 @@ print '<td colspan="2">';
 print ajax_constantonoff("TAKEPOS_CONTROL_CASH_OPENING", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
+// Gift receipt
+print '<tr class="oddeven"><td>';
+print $langs->trans('GiftReceiptButton');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_GIFT_RECEIPT", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
+// Delayed Pay Button
+print '<tr class="oddeven"><td>';
+print $langs->trans('AllowDelayedPayment');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_DELAYED_PAYMENT", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
 // Numbering module
 //print '<tr class="oddeven"><td>';
 //print $langs->trans("BillsNumberingModule");
@@ -435,14 +428,6 @@ print "</td></tr>\n";
 //print $form->selectarray('TAKEPOS_ADDON', $array, (empty($conf->global->TAKEPOS_ADDON) ? '0' : $conf->global->TAKEPOS_ADDON), 0);
 //print "</td></tr>\n";
 
-print '<tr class="oddeven"><td>';
-print $langs->trans("EnableBarOrRestaurantFeatures");
-print '</td>';
-print '<td colspan="2">';
-print ajax_constantonoff("TAKEPOS_BAR_RESTAURANT", array(), $conf->entity, 0, 0, 1, 0);
-//print $form->selectyesno("TAKEPOS_BAR_RESTAURANT", $conf->global->TAKEPOS_BAR_RESTAURANT, 1);
-print "</td></tr>\n";
-
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index ec3908361fc..384be4f8f13 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -94,6 +94,10 @@ if (GETPOST('action', 'alpha') == 'set')
 
 	$res = dolibarr_set_const($db, "TAKEPOS_ADDON".$terminaltouse, GETPOST('TAKEPOS_ADDON'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 
+	// add free text on each terminal of cash desk
+	$res = dolibarr_set_const($db, 'TAKEPOS_HEADER'.$terminaltouse, GETPOST('TAKEPOS_HEADER'.$terminaltouse, 'restricthtml'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, 'TAKEPOS_FOOTER'.$terminaltouse, GETPOST('TAKEPOS_FOOTER'.$terminaltouse, 'restricthtml'), 'chaine', 0, '', $conf->entity);
+
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
 	if (!$res > 0) $error++;
@@ -102,9 +106,7 @@ if (GETPOST('action', 'alpha') == 'set')
     {
         $db->commit();
 	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
+    } else {
         $db->rollback();
 	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -122,7 +124,7 @@ llxHeader('', $langs->trans("CashDeskSetup"));
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
-$head = takepos_prepare_head();
+$head = takepos_admin_prepare_head();
 dol_fiche_head($head, 'terminal'.$terminal, 'TakePOS', -1, 'cash-register');
 print '<br>';
 
@@ -187,9 +189,7 @@ if (!empty($conf->stock->enabled))
 	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);
-	}
-	else
-	{
+	} else {
 	    if (!$conf->global->{'CASHDESK_NO_DECREASE_STOCK'.$terminal}) {
 	        $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK".$terminal, 1, 'chaine', 0, '', $conf->entity);
 	    }
@@ -202,14 +202,12 @@ if (!empty($conf->stock->enabled))
 
 
 	print '<tr class="oddeven"><td>'.$langs->trans("CashDeskIdWareHouse").'</td>'; // Force warehouse (this is not a default value)
-	print '<td>';
+	print '<td class="minwidth300">';
 	if (!$disabled)
 	{
-		print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled);
-		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"]).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
-	}
-	else
-	{
+		print $formproduct->selectWarehouses($conf->global->{'CASHDESK_ID_WAREHOUSE'.$terminal}, 'CASHDESK_ID_WAREHOUSE'.$terminal, '', 1, $disabled, 0, '', 0, 0, array(), 'maxwidth250');
+		print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?&terminal='.$terminal).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+	} else {
 		print '<span class="opacitymedium">'.$langs->trans("StockDecreaseForPointOfSaleDisabled").'</span>';
 	}
 	print '</td></tr>';
@@ -330,6 +328,57 @@ if ($conf->global->TAKEPOS_ADDON == "terminal") {
 print '</table>';
 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>';
+
+print '<br>';
+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 '</tr>';
+
+// free text on header
+print '<tr class="oddeven">';
+print '<td>';
+print $form->textwithpicto($langs->trans('Header'), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
+print '</td>';
+print '<td>';
+$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>';
+} else {
+	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>';
+
+// free text on footer
+print '<tr class="oddeven">';
+print '<td>';
+print $form->textwithpicto($langs->trans('Footer'), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
+print '</td>';
+print '<td>';
+$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>';
+} else {
+	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>';
+
+print '</table>';
+print '</div>';
+
 if ($atleastonefound == 0 && !empty($conf->banque->enabled))
 {
 	print info_admin($langs->trans("AtLeastOneDefaultBankAccountMandatory"), 0, 0, 'error');
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index d1f59325c1f..531598668a7 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2001-2004	Andreu Bisquerra	<jove@bisquerra.com>
+/* Copyright (C) 2020		Thibault FOUCART	<support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +35,7 @@ require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $category = GETPOST('category', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $term = GETPOST('term', 'alpha');
 $id = GETPOST('id', 'int');
 
@@ -64,13 +65,28 @@ if ($action == 'getProducts') {
 	    	}
 	    }
     	echo json_encode($prods);
-    }
-    else
-    {
+    } else {
     	echo 'Failed to load category with id='.$category;
     }
-}
-elseif ($action == 'search' && $term != '') {
+} elseif ($action == 'search' && $term != '') {
+	// Change thirdparty with barcode
+	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
+	$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'
+	    	);
+			echo json_encode($rows);
+			exit;
+	}
+
 	// Define $filteroncategids, the filter on category ID if there is a Root category defined.
 	$filteroncategids = '';
 	if ($conf->global->TAKEPOS_ROOT_CATEGORY_ID > 0) {	// A root category is defined, we must filter on products inside this category tree
@@ -104,13 +120,13 @@ elseif ($action == 'search' && $term != '') {
 	    		'tosell' => $obj->tosell,
 	    		'tobuy' => $obj->tobuy,
 	    		'barcode' => $obj->barcode,
-	    		'price' => $obj->price
+	    		'price' => $obj->price,
+			'object' => 'product'
 	    		//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
 	    	);
 	    }
 	    echo json_encode($rows);
-	}
-	else {
+	} else {
 		echo 'Failed to search product : '.$db->lasterror();
 	}
 } elseif ($action == "opendrawer" && $term != '') {
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 6871fcbd68b..973bbabba2d 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -102,6 +102,7 @@ button.calcbutton {
     border-width: 0;
     margin: 1px;
 	font-size: 14pt;
+    border-radius: 3px;
 }
 
 button.calcbutton2 {
@@ -121,6 +122,7 @@ button.calcbutton2 {
 	font-weight: bold;
 	font-size: 10pt;
 	margin: 1px;
+    border-radius: 3px;
 }
 
 button.calcbutton3 {
@@ -136,12 +138,35 @@ button.calcbutton3 {
 	height: calc(25% - 2px);
 	font-size: 14pt;
 	margin: 1px;
+    border-radius: 3px;
+}
+
+button.productbutton {
+	display: inline-block;
+	position: relative;
+	padding: 0;
+	line-height: normal;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	overflow: visible; /* removes extra width in IE */
+	width: calc(100% - 2px);
+	height: calc(100% - 2px);
+	font-weight: bold;
+    background-color: #a3a6a3;
+    color: #fff;
+    /* border-color: unset; */
+    border-width: 0;
+    margin: 1px;
+	font-size: 14pt;
+    border-radius: 3px;
 }
 
 button.actionbutton {
     background: #EABCA6;
     border: 2px solid #EEE;
     min-height: 40px;
+    border-radius: 3px;
 }
 
 button.actionbutton {
@@ -153,7 +178,7 @@ button.actionbutton {
 	vertical-align: middle;
 	text-align: center;
 	overflow: visible; /* removes extra width in IE */
-	width: calc(33% - 2px);
+	width: calc(33.33% - 2px);
 	height: calc(25% - 2px);
 	margin: 1px;
    	border-width: 0;
@@ -268,12 +293,18 @@ table.postablelines tr td {
     background-color: var(--colorbacklineimpair1);
 }
 
+.postablelines td.linecolht {
+    line-height: 1.3em !important;
+}
+
 div.paymentbordline
 {
-	width:50%;
+	width:calc(50% - 16px);
 	background-color:#888;
 	border-radius: 8px;
 	margin-bottom: 4px;
+	display: inline-block;
+	padding: 5px;
 }
 
 @media only screen and (max-aspect-ratio: 6/4) {
@@ -423,7 +454,7 @@ p.description_content{
 div.description_content {
 	display: -webkit-box;
     -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
+    -webkit-line-clamp: <?php echo $conf->global->TAKEPOS_LINES_TO_SHOW;?>;
     overflow: hidden;
     padding-left: 2px;
     padding-right: 2px;
@@ -467,6 +498,14 @@ div.description_content {
     margin-left: 4px;
     font-size: 1.3em;
 }
+
+@media screen and (max-width: 767px) {
+	.topnav .login_block_other a {
+		padding: 5px 5px;
+		font-size: 1.2em;
+	}
+}
+
 .topnav-right > a {
 	font-size: 17px;
 }
@@ -568,7 +607,7 @@ div#moreinfo, div#infowarehouse {
 	}
 
 	.topnav input[type="text"] {
-		max-width: 100px;
+		max-width: 90px;
 	}
 
 	.topnav-right {
@@ -630,3 +669,71 @@ div#moreinfo, div#infowarehouse {
 		padding-right: 4px;
 	}
 }
+
+/* Modal box */
+.modal {
+  display: none; /* Hidden by default */
+  position: fixed;
+  z-index: 20;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  background-color: rgb(0,0,0);
+  background-color: rgba(0,0,0,0.4);
+}
+
+/* The Close Button */
+.close {
+  color: #aaa;
+  float: right;
+  font-size: 28px;
+  font-weight: bold;
+}
+
+.close:hover,
+.close:focus {
+  color: black;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.modal-header {
+  padding: 2px 16px;
+  background-color: #2b4161;
+  color: white;
+}
+
+.modal-body {padding: 2px 16px;}
+
+.modal-content {
+  position: relative;
+  background-color: #fefefe;
+  margin: 15% auto; /* 15% from the top and centered */
+  padding: 0;
+  border: 1px solid #888;
+  width: 40%;
+  box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
+  animation-name: animatetop;
+  animation-duration: 0.4s;
+  min-width: 200px;
+}
+
+@keyframes animatetop {
+  from {top: -300px; opacity: 0}
+  to {top: 0; opacity: 1}
+}
+
+.block {
+  display: block;
+  width: 100%;
+  border: none;
+  color: white;
+  background-color: #8c907e;
+  padding: 14px 28px;
+  font-size: 16px;
+  cursor: pointer;
+  text-align: center;
+  margin: 2px;
+}
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 5af2eb1d238..257c8db7fa0 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -38,7 +38,7 @@ $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk"));
 $floor = GETPOST('floor', 'int');
 if ($floor == "") $floor = 1;
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $left = GETPOST('left', 'alpha');
 $top = GETPOST('top', 'alpha');
 
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index 5193e95c7c5..79a638456f2 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
+/* Copyright (C) 2018 Andreu Bisquerra	<jove@bisquerra.com>
+ * Copyright (C) 2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +44,7 @@ $langs->loadLangs(array("bills", "cashdesk"));
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place is id of table for Bar or Restaurant
 
 $idline = GETPOST('idline', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 if (empty($user->rights->takepos->run)) {
 	accessforbidden();
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index ea863374f3c..9ec730bfad8 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -55,9 +55,7 @@ if ($query == "cat")
 		if ($obj['photo_vignette'])
 		{
 			$filename = $obj['photo_vignette'];
-		}
-		else
-		{
+		} else {
 			$filename = $obj['photo'];
 		}
 		$file = DOL_URL_ROOT.'/viewimage.php?cache=1&publictakepos=1&modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename);
@@ -65,8 +63,7 @@ if ($query == "cat")
 		exit;
 	}
 	header('Location: ../../public/theme/common/nophoto.png');
-}
-elseif ($query == "pro")
+} elseif ($query == "pro")
 {
 	require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index d3fc6b7416a..630c49b58a7 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
  * Copyright (C) 2019	Josep Lluís Amador	<joseplluis@lliuretic.cat>
+ * Copyright (C) 2020	Thibault FOUCART	<support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,12 +42,25 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant or multiple sales
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $setterminal = GETPOST('setterminal', 'int');
+$setcurrency = GETPOST('setcurrency', 'aZ09');
+
+if ($_SESSION["takeposterminal"] == "")
+{
+	if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1; // Use terminal 1 if there is only 1 terminal
+	elseif (!empty($_COOKIE["takeposterminal"])) $_SESSION["takeposterminal"] = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE["takeposterminal"]); // Restore takeposterminal from previous session
+}
 
 if ($setterminal > 0)
 {
 	$_SESSION["takeposterminal"] = $setterminal;
+	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, false, true); // Permanent takeposterminal var in a cookie
+}
+
+if ($setcurrency != "")
+{
+	$_SESSION["takeposcustomercurrency"] = $setcurrency;
 }
 
 $_SESSION["urlfrom"] = '/takepos/index.php';
@@ -134,9 +148,7 @@ foreach ($categories as $key => $categorycursor)
     if ($categorycursor['level'] == $levelofmaincategories)
     {
         $maincategories[$key] = $categorycursor;
-    }
-    else
-    {
+    } else {
         $subcategories[$key] = $categorycursor;
     }
 }
@@ -285,12 +297,18 @@ function LoadProducts(position, issubcat) {
 			//console.log("ishow"+ishow+" idata="+idata);
 			console.log(data[idata]);
 			if (typeof (data[idata]) == "undefined") {
-				$("#prodivdesc"+ishow).hide();
-				$("#prodesc"+ishow).text("");
+				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES)
+				{
+					echo '$("#prodivdesc"+ishow).hide();';
+					echo '$("#prodesc"+ishow).text("");';
+					echo '$("#proimg"+ishow).attr("title","");';
+					echo '$("#proimg"+ishow).attr("src","genimg/empty.png");';
+				} else {
+					echo '$("#probutton"+ishow).hide();';
+					echo '$("#probutton"+ishow).text("");';
+				}?>
 				$("#proprice"+ishow).attr("class", "hidden");
 				$("#proprice"+ishow).html("");
-				$("#proimg"+ishow).attr("title","");
-				$("#proimg"+ishow).attr("src","genimg/empty.png");
 				$("#prodiv"+ishow).data("rowid","");
 				$("#prodiv"+ishow).attr("class","wrapper2 divempty");
 				$("#prowatermark"+ishow).hide();
@@ -302,14 +320,22 @@ function LoadProducts(position, issubcat) {
 					$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[idata]['barcode']";
 				?>
 				var titlestring = <?php echo $titlestring; ?>;
-				$("#prodivdesc"+ishow).show();
-				$("#prodesc"+ishow).text(data[parseInt(idata)]['label']);
+				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES)
+				{
+					echo '$("#prodivdesc"+ishow).show();';
+					echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);';
+					echo '$("#proimg"+ishow).attr("title", titlestring);';
+					echo '$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata][\'id\']);';
+				}
+				else {
+					echo '$("#probutton"+ishow).show();';
+					echo '$("#probutton"+ishow).text(data[parseInt(idata)][\'label\']);';
+				}
+				?>
 				if (data[parseInt(idata)]['price_formated']) {
 					$("#proprice"+ishow).attr("class", "productprice");
 					$("#proprice"+ishow).html(data[parseInt(idata)]['price_formated']);
 				}
-				$("#proimg"+ishow).attr("title", titlestring);
-				$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata]['id']);
 				$("#prodiv"+ishow).data("rowid", data[idata]['id']);
 				$("#prodiv"+ishow).data("iscat", 0);
 				$("#prodiv"+ishow).attr("class","wrapper2");
@@ -401,9 +427,18 @@ function ClickProduct(position) {
 	ClearSearch();
 }
 
+function ChangeThirdparty(idcustomer) {
+	 console.log("ChangeThirdparty");
+		// Call page list.php to change customer
+		$("#poslines").load("../societe/list.php?action=change&type=t&contextpage=poslist&idcustomer="+idcustomer+"&place="+place+"", function() {
+		});
+
+	ClearSearch();
+}
+
 function deleteline() {
 	console.log("Delete line");
-	$("#poslines").load("invoice.php?action=deleteline&place="+place+"&idline="+selectedline, function() {
+	$("#poslines").load("invoice.php?action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {
 		//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 	});
 	ClearSearch();
@@ -411,7 +446,7 @@ function deleteline() {
 
 function Customer() {
 	console.log("Open box to select the thirdparty place="+place);
-	$.colorbox({href:"../societe/list.php?contextpage=poslist&nomassaction=1&place="+place, width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Customer"); ?>"});
+	$.colorbox({href:"../societe/list.php?type=t&contextpage=poslist&nomassaction=1&place="+place, width:"90%", height:"80%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("Customer"); ?>"});
 }
 
 function History()
@@ -469,7 +504,8 @@ function New() {
 		}
 
 		if (r == true) {
-			$("#poslines").load("invoice.php?action=delete&place=" + place, function () {
+			// Reload section with invoice lines
+			$("#poslines").load("invoice.php?action=delete&token=<?php echo newToken(); ?>&place=" + place, function () {
 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
 			});
 			ClearSearch();
@@ -525,13 +561,28 @@ function Search2(keyCodeForEnter) {
 			// If there is only 1 answer
 			if ($('#search').val().length > 0 && data.length == 1) {
 				console.log($('#search').val()+' - '+data[0]['barcode']);
-				if ($('#search').val() == data[0]['barcode']) {
+				if ($('#search').val() == data[0]['barcode'] && 'thirdparty' == data[0]['object']) {
+					console.log("There is only 1 answer with barcode matching the search, so we change the thirdparty "+data[0]['rowid']);
+					ChangeThirdparty(data[0]['rowid']);
+				}
+				else if ($('#search').val() == data[0]['barcode'] && 'product' == data[0]['object']) {
 					console.log("There is only 1 answer with barcode matching the search, so we add the product in basket");
 					ClickProduct(0);
 				}
 			}
+			if (eventKeyCode == keyCodeForEnter){
+				if (data.length == 0) {
+					$('#search').val('<?php
+					$langs->load('errors');
+					echo dol_escape_js($langs->trans("ErrorRecordNotFound"));
+					?>');
+					$('#search').select();
+				}
+				else ClearSearch();
+			}
 		});
 	}
+
 }
 
 function Edit(number) {
@@ -680,30 +731,11 @@ function CashReport(rowid)
     $.colorbox({href:"../compta/cashcontrol/report.php?id="+rowid+"&contextpage=takepos", width:"60%", height:"90%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("CashReport"); ?>"});
 }
 
-// Popup to select the terminal to use
-function TerminalsDialog()
+// TakePOS Popup
+function ModalBox(ModalID)
 {
-    jQuery("#dialog-info").dialog({
-	    resizable: false,
-	    height: <?php echo 180 + round($conf->global->TAKEPOS_NUM_TERMINALS / 3 * 20); ?>,
-	    width: <?php echo ($conf->dol_optimize_smallscreen ? 316 : 400); ?>,
-	    modal: true,
-	    buttons: {
-			'<?php echo dol_escape_js($langs->trans("Terminal")) ?> 1': function() {
-				location.href='index.php?setterminal=1';
-			}
-			<?php
-			for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++)
-			{
-				print ",
-				'".dol_escape_js($langs->trans("Terminal"))." ".$i."': function() {
-					location.href='index.php?setterminal=".$i."';
-				}
-				";
-			}
-			?>
-	    }
-	});
+    var modal = document.getElementById(ModalID);
+	modal.style.display = "block";
 }
 
 function DirectPayment(){
@@ -716,6 +748,19 @@ function FullScreen() {
 	document.documentElement.requestFullscreen();
 }
 
+function WeighingScale(){
+	console.log("Weighing Scale");
+    $.ajax({
+        type: "POST",
+        url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/scale/index.php',
+    })
+	.done(function( editnumber ) {
+		$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
+                editnumber="";
+            });
+	});
+}
+
 $( document ).ready(function() {
     PrintCategories(0);
 	LoadProducts(0);
@@ -724,8 +769,7 @@ $( document ).ready(function() {
 	//IF NO TERMINAL SELECTED
 	if ($_SESSION["takeposterminal"] == "")
 	{
-		if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1;
-		else print "TerminalsDialog();";
+		print "ModalBox('ModalTerminal');";
 	}
 	if ($conf->global->TAKEPOS_CONTROL_CASH_OPENING)
 	{
@@ -745,7 +789,6 @@ $( document ).ready(function() {
 
 <body class="bodytakepos" style="overflow: hidden;">
 <?php
-print '<div class="hidden dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
 $keyCodeForEnter = $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} > 0 ? $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} : '';
 ?>
 <div class="container">
@@ -757,7 +800,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 		<div class="topnav">
 			<div class="topnav-left">
 			<div class="inline-block valignmiddle">
-			<a class="topnav-terminalhour" onclick="TerminalsDialog();">
+			<a class="topnav-terminalhour" onclick="ModalBox('ModalTerminal');">
 			<span class="fa fa-cash-register"></span>
 			<span class="hideonsmartphone">
 			<?php echo $langs->trans("Terminal"); ?>
@@ -767,7 +810,13 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			else echo $_SESSION["takeposterminal"];
 			echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
 			?>
-			</a></div>
+			</a>
+			<?php
+			if (!empty($conf->multicurrency->enabled)) {
+				print '<a class="valignmiddle tdoverflowmax100 minwidth75" id="multicurrency" onclick="ModalBox(\'ModalCurrency\');" title=""><span class="fas fa-coins paddingrightonly"></span>'.$langs->trans("Currency").'</a>';
+			}
+			?>
+			</div>
 			<!-- section for customer and open sales -->
 			<div class="inline-block valignmiddle" id="customerandsales">
 			</div>
@@ -779,7 +828,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				<div class="login_block_other">
 				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);"  placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
 				<a onclick="ClearSearch();"><span class="fa fa-backspace"></span></a>
-				<a onclick="window.location.href='<?php echo DOL_URL_ROOT; ?>';"><span class="fas fa-home"></span></a>
+				<a onclick="window.location.href='<?php echo DOL_URL_ROOT.'/'; ?>';"><span class="fas fa-home"></span></a>
 				<?php if (empty($conf->dol_use_jmobile)) { ?>
 				<a onclick="FullScreen();"><span class="fa fa-expand-arrows-alt"></span></a>
 				<?php } ?>
@@ -796,6 +845,49 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 }
 ?>
 
+<!-- Modal terminal box -->
+<div id="ModalTerminal" class="modal">
+	<div class="modal-content">
+		<div class="modal-header">
+		<span class="close" href="#" onclick="document.getElementById('ModalTerminal').style.display = 'none';">&times;</span>
+		<h3><?php print $langs->trans("TerminalSelect"); ?></h3>
+	</div>
+	<div class="modal-body">
+		<button type="button" class="block" onclick="location.href='index.php?setterminal=1'"><?php print $langs->trans("Terminal"); ?> 1</button>
+		<?php
+		for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++)
+		{
+			print '<button type="button" class="block" onclick="location.href=\'index.php?setterminal='.$i.'\'">'.$langs->trans("Terminal").' '.$i.'</button>';
+		}
+		?>
+	</div>
+</div>
+</div>
+
+<!-- Modal multicurrency box -->
+<?php if (!empty($conf->multicurrency->enabled)) { ?>
+<div id="ModalCurrency" class="modal">
+	<div class="modal-content">
+		<div class="modal-header">
+			<span class="close" href="#" onclick="document.getElementById('ModalCurrency').style.display = 'none';">&times;</span>
+			<h3><?php print $langs->trans("SetMultiCurrencyCode"); ?></h3>
+		</div>
+		<div class="modal-body">
+			<?php
+			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';
+			$sql .= " WHERE entity IN ('".getEntity('multicurrency')."')";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				while ($obj = $db->fetch_object($resql))
+				print '<button type="button" class="block" onclick="location.href=\'index.php?setcurrency='.$obj->code.'\'">'.$obj->code.'</button>';
+			}
+			?>
+		</div>
+	</div>
+</div>
+<?php } ?>
+
 	<div class="row1<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) print 'withhead'; ?>">
 
 		<div id="poslines" class="div1">
@@ -857,9 +949,7 @@ $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();');
-}
-else
-{
+} 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();');
 }
@@ -947,6 +1037,11 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	$menus[$r++] = array('title'=>'<span class="fa fa-sign-out-alt paddingrightonly"></span><div class="trunc">'.$langs->trans("Logout").'</div>', 'action'=>'window.location.href=\''.DOL_URL_ROOT.'/user/logout.php\';');
 }
 
+if ($conf->global->TAKEPOS_WEIGHING_SCALE)
+{
+	$menus[$r++] = array('title'=>'<span class="fa fa-balance-scale paddingrightonly"></span><div class="trunc">'.$langs->trans("WeighingScale").'</div>', 'action'=>'WeighingScale();');
+}
+
 ?>
 		<!-- Show buttons -->
 		<div class="div3">
@@ -959,8 +1054,7 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
         	{
         		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>';
+        	} 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>';
         }
 
@@ -989,14 +1083,11 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				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>';
-				}
-				elseif ($count == ($MAXCATEG - 1)) {
+				} 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>';
-				}
-				else
-				{
-				    echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
+				} else {
+				    if (!$conf->global->TAKEPOS_HIDE_CATEGORY_IMAGES) echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
 				}
 				?>
 				<?php if ($count != ($MAXCATEG - 2) && $count != ($MAXCATEG - 1)) { ?>
@@ -1024,18 +1115,18 @@ if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
     				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)) {
+    				} 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
-    				{
-    					print '<div class="" id="proprice'.$count.'"></div>';
-    					print '<img class="imgwrapper" height="100%" title="" id="proimg'.$count.'">';
+    				} else {
+						if ($conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) echo '<button type="button" id="probutton'.$count.'" class="productbutton" style="display: none;"></button>';
+    					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)) { ?>
+					<?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>
     				</div>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 1ff0db279b0..eee4faf9d43 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -39,10 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 global $mysoc;
 
-$langs->loadLangs(array("companies", "commercial", "bills", "cashdesk", "stocks"));
+$langs->loadLangs(array("companies", "commercial", "bills", "cashdesk", "stocks", "banks"));
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $idproduct = GETPOST('idproduct', 'int');
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 $placeid = 0; // $placeid is ID of invoice
@@ -57,8 +57,7 @@ if (($conf->global->TAKEPOS_PHONE_BASIC_LAYOUT == 1 && $conf->browser->layout ==
 	if ($_SESSION["takeposterminal"] == "")
 	{
 		if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") $_SESSION["takeposterminal"] = 1;
-		else
-		{
+		else {
 			header("Location: ".DOL_URL_ROOT."/takepos/index.php");
 			exit;
 		}
@@ -95,8 +94,8 @@ function fail($message)
 $number = GETPOST('number', 'alpha');
 $idline = GETPOST('idline', 'int');
 $selectedline = GETPOST('selectedline', 'int');
-$desc = GETPOST('desc', 'alpha');
-$pay = GETPOST('pay', 'alpha');
+$desc = GETPOST('desc', 'alphanohtml');
+$pay = GETPOST('pay', 'aZ09');
 $amountofpayment = price2num(GETPOST('amount', 'alpha'));
 
 $invoiceid = GETPOST('invoiceid', 'int');
@@ -118,15 +117,13 @@ $paiementid = $codes[0];
 $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
-    $ret = $invoice->fetch($invoiceid);
-}
-else
-{
-    $ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
+	$ret = $invoice->fetch($invoiceid);
+} else {
+	$ret = $invoice->fetch('', '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')');
 }
 if ($ret > 0)
 {
-    $placeid = $invoice->id;
+	$placeid = $invoice->id;
 }
 
 $constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
@@ -140,28 +137,43 @@ else $soc->fetch($conf->global->$constforcompanyid);
  * Actions
  */
 
+// Action to record a payment on a TakePOS invoice
 if ($action == 'valid' && $user->rights->facture->creer)
 {
-    if ($pay == "cash") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
-    elseif ($pay == "card") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility
-    elseif ($pay == "cheque") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
-    else
-    {
-        $accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
-    	$bankaccount = $conf->global->$accountname;
-    }
+	$bankaccount = 0;
+	$error = 0;
+
+	if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+		$bankaccount = GETPOST('accountid', 'int');
+	}
+	else {
+		if ($pay == "cash") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
+		elseif ($pay == "card") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CB'.$_SESSION["takeposterminal"]};          // For backward compatibility
+		elseif ($pay == "cheque") $bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
+		else {
+			$accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
+			$bankaccount = $conf->global->$accountname;
+		}
+	}
+
+	if ($bankaccount <= 0 && $pay != "delayed") {
+		$errormsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount"));
+		$error++;
+	}
+
 	$now = dol_now();
 	$res = 0;
 
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
+
 	if ($invoice->total_ttc < 0) {
 		$invoice->type = $invoice::TYPE_CREDIT_NOTE;
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE ";
-		$sql .= "fk_soc = '".$invoice->socid."' ";
-		$sql .= "AND type <> ".Facture::TYPE_CREDIT_NOTE." ";
-		$sql .= "AND fk_statut >= ".$invoice::STATUS_VALIDATED." ";
-		$sql .= "ORDER BY rowid DESC";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE";
+		$sql .= " fk_soc = ".((int) $invoice->socid);
+		$sql .= " AND type <> ".Facture::TYPE_CREDIT_NOTE;
+		$sql .= " AND fk_statut >= ".$invoice::STATUS_VALIDATED;
+		$sql .= " ORDER BY rowid DESC";
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
@@ -184,21 +196,20 @@ if ($action == 'valid' && $user->rights->facture->creer)
 	//}
 
 	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
-	if ($invoice->statut != Facture::STATUS_DRAFT) {
+	if ($error) {
+		dol_htmloutput_errors($errormsg, null, 1);
+	} elseif ($invoice->statut != Facture::STATUS_DRAFT) {
 		//If invoice is validated but it is not fully paid is not error and make the payment
-		if ($invoice->getRemainToPay() > 0) $res = 1;
-		else {
+		if ($invoice->getRemainToPay() > 0) {
+			$res = 1;
+		} else {
 			dol_syslog("Sale already validated");
 			dol_htmloutput_errors($langs->trans("InvoiceIsAlreadyValidated", "TakePos"), null, 1);
 		}
-	}
-	elseif (count($invoice->lines) == 0)
-	{
+	} elseif (count($invoice->lines) == 0) {
 		dol_syslog("Sale without lines");
 		dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
-	}
-	elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
-	{
+	} elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
 		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
 		$conf->global->STOCK_CALCULATE_ON_BILL = 1;
 
@@ -212,10 +223,8 @@ if ($action == 'valid' && $user->rights->facture->creer)
 		$res = $invoice->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);
 
 		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
-	}
-	else
-	{
-	    $res = $invoice->validate($user);
+	} else {
+		$res = $invoice->validate($user);
 	}
 
 	// Restore save values
@@ -225,13 +234,14 @@ if ($action == 'valid' && $user->rights->facture->creer)
 	//}
 
 	// Add the payment
-	if ($res >= 0) {
+	if (!$error && $res >= 0) {
 		$remaintopay = $invoice->getRemainToPay();
 		if ($remaintopay > 0) {
 			$payment = new Paiement($db);
 			$payment->datepaye = $now;
 			$payment->fk_account = $bankaccount;
 			$payment->amounts[$invoice->id] = $amountofpayment;
+			if ($pay == 'cash') $payment->pos_change = price2num(GETPOST('excess', 'alpha'));
 
 			// If user has not used change control, add total invoice payment
 			// Or if user has used change control and the amount of payment is higher than remain to pay, add the remain to pay
@@ -240,9 +250,11 @@ if ($action == 'valid' && $user->rights->facture->creer)
 			$payment->paiementid = $paiementid;
 			$payment->num_payment = $invoice->ref;
 
-			$payment->create($user);
-			$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
-			$remaintopay = $invoice->getRemainToPay();    // Recalculate remain to pay after the payment is recorded
+			if ($pay != "delayed") {
+				$payment->create($user);
+				$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
+				$remaintopay = $invoice->getRemainToPay(); // Recalculate remain to pay after the payment is recorded
+			}
 		}
 
 		if ($remaintopay == 0) {
@@ -256,14 +268,18 @@ if ($action == 'valid' && $user->rights->facture->creer)
 		}
 	} else {
 		dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
-    }
+	}
 }
 
 if ($action == 'history')
 {
-    $placeid = (int) GETPOST('placeid', 'int');
-    $invoice = new Facture($db);
-    $invoice->fetch($placeid);
+	$placeid = (int) GETPOST('placeid', 'int');
+	$invoice = new Facture($db);
+	$invoice->fetch($placeid);
+}
+
+if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "") {
+	$invoice->setMulticurrencyCode($_SESSION["takeposcustomercurrency"]);
 }
 
 if (($action == "addline" || $action == "freezone") && $placeid == 0)
@@ -272,14 +288,13 @@ if (($action == "addline" || $action == "freezone") && $placeid == 0)
 	$invoice->date = dol_now();
 	$invoice->module_source = 'takepos';
 	$invoice->pos_source = $_SESSION["takeposterminal"];
+	$invoice->entity = !empty($_SESSION["takeposinvoiceentity"])?$_SESSION["takeposinvoiceentity"]:$conf->entity;
 
 	if ($invoice->socid <= 0)
 	{
 		$langs->load('errors');
 		dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
-	}
-	else
-	{
+	} else {
 		$placeid = $invoice->create($user);
 		if ($placeid < 0)
 		{
@@ -293,7 +308,7 @@ if (($action == "addline" || $action == "freezone") && $placeid == 0)
 if ($action == "addline")
 {
 	$prod = new Product($db);
-    $prod->fetch($idproduct);
+	$prod->fetch($idproduct);
 
 	$customer = new Societe($db);
 	$customer->fetch($invoice->socid);
@@ -350,8 +365,8 @@ if ($action == "addline")
 }
 
 if ($action == "freezone") {
-    $customer = new Societe($db);
-    $customer->fetch($invoice->socid);
+	$customer = new Societe($db);
+	$customer->fetch($invoice->socid);
 
 	$tva_tx = GETPOST('tva_tx', 'alpha');
 	if ($tva_tx != '') {
@@ -360,39 +375,43 @@ if ($action == "freezone") {
 		$tva_tx = get_default_tva($mysoc, $customer);
 	}
 
-    // Local Taxes
-    $localtax1_tx = get_localtax($tva_tx, 1, $customer, $mysoc, $tva_npr);
-    $localtax2_tx = get_localtax($tva_tx, 2, $customer, $mysoc, $tva_npr);
+	// Local Taxes
+	$localtax1_tx = get_localtax($tva_tx, 1, $customer, $mysoc, $tva_npr);
+	$localtax2_tx = get_localtax($tva_tx, 2, $customer, $mysoc, $tva_npr);
 
-    $invoice->addline($desc, $number, 1, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', 0, 0, 0, '', 'TTC', $number, 0, -1, 0, '', 0, 0, null, '', '', 0, 100, '', null, 0);
-    $invoice->fetch($placeid);
+	$invoice->addline($desc, $number, 1, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', 0, 0, 0, '', 'TTC', $number, 0, -1, 0, '', 0, 0, null, '', '', 0, 100, '', null, 0);
+	$invoice->fetch($placeid);
 }
 
 if ($action == "addnote") {
-    foreach ($invoice->lines as $line)
-    {
-        if ($line->id == $number)
+	foreach ($invoice->lines as $line)
+	{
+		if ($line->id == $number)
 		{
 			$line->array_options['order_notes'] = $desc;
 			$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
-        }
-    }
-    $invoice->fetch($placeid);
+		}
+	}
+	$invoice->fetch($placeid);
 }
 
 if ($action == "deleteline") {
-    if ($idline > 0 and $placeid > 0) { // If invoice exists and line selected. To avoid errors if deleted from another device or no line selected.
-        $invoice->deleteline($idline);
-        $invoice->fetch($placeid);
-    }
-    elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture='".$placeid."' order by rowid DESC";
-        $resql = $db->query($sql);
-        $row = $db->fetch_array($resql);
-        $deletelineid = $row[0];
-        $invoice->deleteline($deletelineid);
-        $invoice->fetch($placeid);
-    }
+	if ($idline > 0 and $placeid > 0) { // If invoice exists and line selected. To avoid errors if deleted from another device or no line selected.
+		$invoice->deleteline($idline);
+		$invoice->fetch($placeid);
+	} elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".((int) $placeid)." ORDER BY rowid DESC";
+		$resql = $db->query($sql);
+		$row = $db->fetch_array($resql);
+		$deletelineid = $row[0];
+		$invoice->deleteline($deletelineid);
+		$invoice->fetch($placeid);
+	}
+	if (count($invoice->lines) == 0) {
+		$invoice->delete($user);
+		header("Location: ".DOL_URL_ROOT."/takepos/invoice.php");
+		exit;
+	}
 }
 
 if ($action == "delete") {
@@ -406,53 +425,52 @@ if ($action == "delete") {
 	}*/
 
 	if ($placeid > 0) {
-        $result = $invoice->fetch($placeid);
+		$result = $invoice->fetch($placeid);
 
-        if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT)
-        {
-        	$db->begin();
+		if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT)
+		{
+			$db->begin();
 
-        	// We delete the lines
-        	$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_extrafields where fk_object = ".$placeid;
-        	$resql1 = $db->query($sql);
-        	$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".$placeid;
-            $resql2 = $db->query($sql);
+			// We delete the lines
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_extrafields where fk_object = ".$placeid;
+			$resql1 = $db->query($sql);
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".$placeid;
+			$resql2 = $db->query($sql);
 			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
-			$sql .= " WHERE ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+			$sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"])."-".$db->escape($place).")'";
 			$resql3 = $db->query($sql);
 
-            if ($resql1 && $resql2 && $resql3)
-            {
-            	$db->commit();
-            }
-            else
-            {
-            	$db->rollback();
-            }
+			$invoice->update_price(1);
+			if ($resql1 && $resql2 && $resql3)
+			{
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
 
-            $invoice->fetch($placeid);
-        }
-    }
+			$invoice->fetch($placeid);
+		}
+	}
 }
 
 if ($action == "updateqty")
 {
-    foreach ($invoice->lines as $line)
-    {
-        if ($line->id == $idline)
-        {
-            $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
-        }
-    }
+	foreach ($invoice->lines as $line)
+	{
+		if ($line->id == $idline)
+		{
+			$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+		}
+	}
 
-    $invoice->fetch($placeid);
+	$invoice->fetch($placeid);
 }
 
 if ($action == "updateprice")
 {
-    foreach ($invoice->lines as $line)
-    {
-        if ($line->id == $idline)
+	foreach ($invoice->lines as $line)
+	{
+		if ($line->id == $idline)
 		{
 			$prod = new Product($db);
 			$prod->fetch($line->fk_product);
@@ -466,17 +484,16 @@ if ($action == "updateprice")
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min))))
 			{
 				echo $langs->trans("CantBeLessThanMinPrice");
-			}
-			else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
-        }
-    }
-    $invoice->fetch($placeid);
+			} else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+		}
+	}
+	$invoice->fetch($placeid);
 }
 
 if ($action == "updatereduction")
 {
-    foreach ($invoice->lines as $line)
-    {
+	foreach ($invoice->lines as $line)
+	{
 		if ($line->id == $idline)
 		{
 			$prod = new Product($db);
@@ -491,10 +508,9 @@ if ($action == "updatereduction")
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->multicurrency_subprice) * (1 - price2num($number) / 100) < price2num($price_min))))
 			{
 				echo $langs->trans("CantBeLessThanMinPrice");
-			}
-			else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+			} else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 		}
-    }
+	}
 	$invoice->fetch($placeid);
 } elseif ($action == 'update_reduction_global') {
 	foreach ($invoice->lines as $line) {
@@ -506,37 +522,37 @@ if ($action == "updatereduction")
 
 if ($action == "order" and $placeid != 0)
 {
-    include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
 		$printer = new dolReceiptPrinter($db);
 	}
 
-    $headerorder = '<html><br><b>'.$langs->trans('Place').' '.$place.'<br><table width="65%"><thead><tr><th class="left">'.$langs->trans("Label").'</th><th class="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';
-    $footerorder = '</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>';
-    $order_receipt_printer1 = "";
-    $order_receipt_printer2 = "";
-    $catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
-    $catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
-    foreach ($invoice->lines as $line)
-    {
-        if ($line->special_code == "4") {
-        	continue;
-        }
-        $c = new Categorie($db);
-        $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
-        $result = array_intersect($catsprinter1, $existing);
-        $count = count($result);
-        if ($count > 0) {
-            $linestoprint++;
-            $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='1' where rowid=".$line->id; //Set to print on printer 1
-            $db->query($sql);
-            $order_receipt_printer1 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
+	$headerorder = '<html><br><b>'.$langs->trans('Place').' '.$place.'<br><table width="65%"><thead><tr><th class="left">'.$langs->trans("Label").'</th><th class="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';
+	$footerorder = '</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>';
+	$order_receipt_printer1 = "";
+	$order_receipt_printer2 = "";
+	$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
+	$catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
+	foreach ($invoice->lines as $line)
+	{
+		if ($line->special_code == "4") {
+			continue;
+		}
+		$c = new Categorie($db);
+		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
+		$result = array_intersect($catsprinter1, $existing);
+		$count = count($result);
+		if ($count > 0) {
+			$linestoprint++;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='1' where rowid=".$line->id; //Set to print on printer 1
+			$db->query($sql);
+			$order_receipt_printer1 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
 			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer1 .= "<br>(".$line->array_options['options_order_notes'].")";
 			$order_receipt_printer1 .= '</td></tr>';
-        }
-    }
-    if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" && $linestoprint > 0) {
+		}
+	}
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" && $linestoprint > 0) {
 		$invoice->fetch($placeid); //Reload object before send to printer
 		$printer->orderprinter = 1;
 		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 1
@@ -546,25 +562,25 @@ if ($action == "order" and $placeid != 0)
 	$invoice->fetch($placeid); //Reload object after set lines as printed
 	$linestoprint = 0;
 
-    foreach ($invoice->lines as $line)
-    {
-        if ($line->special_code == "4") {
-        	continue;
-        }
-        $c = new Categorie($db);
-        $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
-        $result = array_intersect($catsprinter2, $existing);
-        $count = count($result);
-        if ($count > 0) {
-            $linestoprint++;
-            $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='2' where rowid=".$line->id; //Set to print on printer 2
-            $db->query($sql);
-            $order_receipt_printer2 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
+	foreach ($invoice->lines as $line)
+	{
+		if ($line->special_code == "4") {
+			continue;
+		}
+		$c = new Categorie($db);
+		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
+		$result = array_intersect($catsprinter2, $existing);
+		$count = count($result);
+		if ($count > 0) {
+			$linestoprint++;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='2' where rowid=".$line->id; //Set to print on printer 2
+			$db->query($sql);
+			$order_receipt_printer2 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
 			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer2 .= "<br>(".$line->array_options['options_order_notes'].")";
 			$order_receipt_printer2 .= '</td></tr>';
-        }
-    }
-    if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" && $linestoprint > 0) {
+		}
+	}
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" && $linestoprint > 0) {
 		$invoice->fetch($placeid); //Reload object before send to printer
 		$printer->orderprinter = 2;
 		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 2
@@ -577,34 +593,35 @@ if ($action == "order" and $placeid != 0)
 $sectionwithinvoicelink = '';
 if ($action == "valid" || $action == "history")
 {
-    $sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n";
-    $sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">';
-    $sectionwithinvoicelink .= $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, -1, '_backoffice')." - ";
-    $remaintopay = $invoice->getRemainToPay();
-    if ($remaintopay > 0)
-    {
-        $sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-    }
-    else
-    {
-        if ($invoice->paye) $sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
-        else $sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
-    }
-    $sectionwithinvoicelink .= '</span>';
-    if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+	$sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n";
+	$sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">';
+	$sectionwithinvoicelink .= $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, -1, '_backoffice')." - ";
+	$remaintopay = $invoice->getRemainToPay();
+	if ($remaintopay > 0)
+	{
+		$sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+	} else {
+		if ($invoice->paye) $sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
+		else $sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
+	}
+	$sectionwithinvoicelink .= '</span><br>';
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 		if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
 		else $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
-    } elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
-        $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="DolibarrTakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
-    } else {
-        $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
-    }
-    if ($conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0)
-    {
-    	$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.');">'.$langs->trans('SendTicket').'</button>';
-    }
+	} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="DolibarrTakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+	} else {
+		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+		if ($conf->global->TAKEPOS_GIFT_RECEIPT) {
+			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1);">'.$langs->trans('GiftReceipt').'</button>';
+		}
+	}
+	if ($conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0)
+	{
+		$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.');">'.$langs->trans('SendTicket').'</button>';
+	}
 
-    if ($remaintopay <= 0 && $conf->global->TAKEPOS_AUTO_PRINT_TICKETS) $sectionwithinvoicelink .= '<script language="javascript">$("#buttonprint").click();</script>';
+	if ($remaintopay <= 0 && $conf->global->TAKEPOS_AUTO_PRINT_TICKETS) $sectionwithinvoicelink .= '<script language="javascript">$("#buttonprint").click();</script>';
 }
 
 /*
@@ -629,7 +646,7 @@ $(document).ready(function() {
         else selectedline=this.id;
         selectedtext=$('#'+selectedline).find("td:first").html();
 		<?php
-		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 			print '$("#phonediv1").load("auto_order.php?action=editline&placeid="+placeid+"&selectedline="+selectedline, function() {
 			});';
 		}
@@ -645,48 +662,48 @@ $(document).ready(function() {
 <?php
 
 if ($action == "order" and $order_receipt_printer1 != "") {
-    ?>
+	?>
     $.ajax({
         type: "POST",
         url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
         data: '<?php
-        print $headerorder.$order_receipt_printer1.$footerorder; ?>'
+		print $headerorder.$order_receipt_printer1.$footerorder; ?>'
     });
     <?php
 }
 
 if ($action == "order" and $order_receipt_printer2 != "") {
-    ?>
+	?>
     $.ajax({
         type: "POST",
         url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print2',
         data: '<?php
-        print $headerorder.$order_receipt_printer2.$footerorder; ?>'
+		print $headerorder.$order_receipt_printer2.$footerorder; ?>'
     });
     <?php
 }
 
 // Set focus to search field
 if ($action == "search" || $action == "valid") {
-    ?>
+	?>
 	parent.setFocusOnSearchField();
     <?php
 }
 
 
 if ($action == "temp" and $ticket_printer1 != "") {
-    ?>
+	?>
     $.ajax({
         type: "POST",
         url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
         data: '<?php
-        print $header_soc.$header_ticket.$body_ticket.$ticket_printer1.$ticket_total.$footer_ticket; ?>'
+		print $header_soc.$header_ticket.$body_ticket.$ticket_printer1.$ticket_total.$footer_ticket; ?>'
     });
     <?php
 }
 
 if ($action == "search") {
-    ?>
+	?>
     $('#search').focus();
     <?php
 }
@@ -701,13 +718,14 @@ function SendTicket(id)
     $.colorbox({href:"send.php?facid="+id, width:"70%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("SendTicket"); ?>"});
 }
 
-function Print(id){
-    $.colorbox({href:"receipt.php?facid="+id, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php
-    echo $langs->trans("PrintTicket"); ?>"});
+function Print(id, gift){
+    $.colorbox({href:"receipt.php?facid="+id+"&gift="+gift, width:"40%", height:"90%", transition:"none", iframe:"true", title:"<?php
+	echo $langs->trans("PrintTicket"); ?>"});
 }
 
 function TakeposPrinting(id){
     var receipt;
+	console.log("TakeposPrinting" + id);
     $.get("receipt.php?facid="+id, function(data, status){
         receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');
         $.ajax({
@@ -720,15 +738,12 @@ function TakeposPrinting(id){
 
 function TakeposConnector(id){
 	console.log("TakeposConnector" + id);
-	var invoice='<?php
-	$data = json_encode($invoice);
-	$data = base64_encode($data);
-	echo $data;
-	?>';
-    $.ajax({
-        type: "POST",
-        url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print.php',
-        data: 'invoice='+invoice
+	$.get("ajax/ajax.php?action=printinvoiceticket&term=<?php echo $_SESSION["takeposterminal"]; ?>&id="+id, function(data, status){
+        $.ajax({
+			type: "POST",
+			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',
+			data: 'invoice='+data
+		});
     });
 }
 
@@ -745,11 +760,11 @@ $( document ).ready(function() {
 	console.log("Set customer info and sales in header");
 
     <?php
-    $s = $langs->trans("Customer");
-    if ($invoice->id > 0 && ($invoice->socid != $conf->global->$constforcompanyid)) {
-    	$s = $soc->name;
-    }
-    ?>
+	$s = $langs->trans("Customer");
+	if ($invoice->id > 0 && ($invoice->socid != $conf->global->$constforcompanyid)) {
+		$s = $soc->name;
+	}
+	?>
 
     $("#customerandsales").html('');
 
@@ -782,16 +797,16 @@ $( document ).ready(function() {
 
 	$s = '';
 
-    $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
-    if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
-    {
-    	$s = '<span class="small">';
-    	$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-    	$warehouse = new Entrepot($db);
-    	$warehouse->fetch($conf->global->$constantforkey);
-    	$s .= $langs->trans("Warehouse").'<br>'.$warehouse->ref;
-    	$s .= '</span>';
-    }
+	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
+	if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1")
+	{
+		$s = '<span class="small">';
+		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
+		$warehouse = new Entrepot($db);
+		$warehouse->fetch($conf->global->$constantforkey);
+		$s .= $langs->trans("Warehouse").'<br>'.$warehouse->ref;
+		$s .= '</span>';
+	}
 	?>
 
     $("#infowarehouse").html('<?php print dol_escape_js($s); ?>');
@@ -810,6 +825,7 @@ $( document ).ready(function() {
 		if ($result > 0)
 		{
 			$adh->ref = $adh->getFullName($langs);
+			if (empty($adh->statut)) { $s .= "<s>"; }
 			$s .= $adh->getFullName($langs);
 			$s .= ' - '.$adh->type;
 			if ($adh->datefin)
@@ -818,15 +834,12 @@ $( document ).ready(function() {
 				if ($adh->hasDelay()) {
 					$s .= " ".img_warning($langs->trans("Late"));
 				}
-			}
-			else
-			{
+			} else {
 				$s .= '<br>'.$langs->trans("SubscriptionNotReceived");
 				if ($adh->statut > 0) $s .= " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 			}
-		}
-		else
-		{
+	  		if (empty($adh->statut)) { $s .= "</s>"; }
+		} else {
 			$s .= '<br>'.$langs->trans("ThirdpartyNotLinkedToMember");
 		}
 		$s .= '</span>';
@@ -843,47 +856,63 @@ $( document ).ready(function() {
 // for tooltip and other js beautifiers must be reexecuted too.
 if (!empty($conf->use_javascript_ajax))
 {
-    print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
-    print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
+	print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+	print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 }
 
 print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilepage='.$mobilepage.' $_SESSION["basiclayout"]='.$_SESSION["basiclayout"].' conf->global->TAKEPOS_BAR_RESTAURANT='.$conf->global->TAKEPOS_BAR_RESTAURANT.' -->'."\n";
 print '<div class="div-table-responsive-no-min invoice">';
 print '<table id="tablelines" class="noborder noshadow postablelines" width="100%">';
+if ($mobilepage == "invoice" || $mobilepage == "") {
+	print '<tr><td colspan="4">'.$sectionwithinvoicelink.'</td></tr>';
+}
 print '<tr class="liste_titre nodrag nodrop">';
 print '<td class="linecoldescription">';
-print '<span style="font-size:120%;" class="right">';
+// In phone version only show when it is invoice page
+if ($mobilepage == "invoice" || $mobilepage == "") {
+	print '<input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">';
+}
 if ($conf->global->TAKEPOS_BAR_RESTAURANT)
 {
-    $sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);
-    $resql = $db->query($sql);
-    $obj = $db->fetch_object($resql);
-    if ($obj)
-    {
-        $label = $obj->label;
-        $floor = $obj->floor;
-    }
+	$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);
+	$resql = $db->query($sql);
+	$obj = $db->fetch_object($resql);
+	if ($obj)
+	{
+		$label = $obj->label;
+		$floor = $obj->floor;
+	}
 	// In phone version only show when is invoice page
 	if ($mobilepage == "invoice" || $mobilepage == "") {
-		print $langs->trans('Place')." <b>".$label."</b> - ";
-		print $langs->trans('Floor')." <b>".$floor."</b> - ";
+		print '<span class="opacitymedium">'.$langs->trans('Place')."</span> <b>".$label."</b><br>";
+		print '<span class="opacitymedium">'.$langs->trans('Floor')."</span> <b>".$floor."</b>";
 	}
 	elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) print $mysoc->name;
 	elseif ($mobilepage == "cats") print $langs->trans('Category');
 	elseif ($mobilepage == "products") print $langs->trans('Label');
+} else {
+	print $langs->trans("Products");
 }
-// In phone version only show when is invoice page
-if ($mobilepage == "invoice" || $mobilepage == "") {
-	print $langs->trans('TotalTTC');
-	print ' : <b>'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</b></span>';
-	print '<br><input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">'.$sectionwithinvoicelink;
-	print '</td>';
-}
+print '</td>';
 if ($_SESSION["basiclayout"] != 1)
 {
 	print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
-	print '<td class="linecolht right nowraponall">'.$langs->trans('TotalTTCShort').'</td>';
+	print '<td class="linecolht right nowraponall">';
+	print '<span class="opacitymedium small">'.$langs->trans('TotalTTCShort').'</span><br>';
+	// In phone version only show when it is invoice page
+	if ($mobilepage == "invoice" || $mobilepage == "") {
+		print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</span>';
+		if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+			//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+			include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+			$multicurrency = new MultiCurrency($db);
+			$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+			print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($invoice->total_ttc * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
+		}
+		print '</td>';
+	}
+	print '</td>';
 }
 elseif ($mobilepage == "invoice") print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 print "</tr>\n";
@@ -895,9 +924,9 @@ if ($_SESSION["basiclayout"] == 1)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorie = new Categorie($db);
-        $categories = $categorie->get_full_arbo('product');
+		$categories = $categorie->get_full_arbo('product');
 		$htmlforlines = '';
-        foreach ($categories as $row) {
+		foreach ($categories as $row) {
 			if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) $htmlforlines .= '<div class="leftcat';
 			else $htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
 			$htmlforlines .= '" onclick="LoadProducts('.$row['id'].');">';
@@ -965,12 +994,12 @@ if ($placeid > 0)
 	//In Phone basic layout hide some content depends situation
 	if ($_SESSION["basiclayout"] == 1 && $mobilepage != "invoice" && $action != "order") return;
 
-    if (is_array($invoice->lines) && count($invoice->lines))
-    {
-    	print '<!-- Show lines of invoices -->'."\n";
-        $tmplines = array_reverse($invoice->lines);
-        foreach ($tmplines as $line)
-        {
+	if (is_array($invoice->lines) && count($invoice->lines))
+	{
+		print '<!-- Show lines of invoices -->'."\n";
+		$tmplines = array_reverse($invoice->lines);
+		foreach ($tmplines as $line)
+		{
 			if ($line->fk_parent_line != false)
 			{
 				$htmlsupplements[$line->fk_parent_line] .= '<tr class="drag drop oddeven posinvoiceline';
@@ -986,9 +1015,7 @@ if ($placeid > 0)
 					if ($firstline != $line->desc)
 					{
 						$htmlsupplements[$line->fk_parent_line] .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
-					}
-					else
-					{
+					} else {
 						$htmlsupplements[$line->fk_parent_line] .= $line->desc;
 					}
 				}
@@ -1002,50 +1029,47 @@ if ($placeid > 0)
 				$htmlsupplements[$line->fk_parent_line] .= '</tr>'."\n";
 				continue;
 			}
-            $htmlforlines = '';
+			$htmlforlines = '';
 
-            $htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
-            if ($line->special_code == "4") {
-                $htmlforlines .= ' order';
-            }
-            $htmlforlines .= '" id="'.$line->id.'">';
-            $htmlforlines .= '<td class="left">';
+			$htmlforlines .= '<tr class="drag drop oddeven posinvoiceline';
+			if ($line->special_code == "4") {
+				$htmlforlines .= ' order';
+			}
+			$htmlforlines .= '" id="'.$line->id.'">';
+			$htmlforlines .= '<td class="left">';
 			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '<span class="phoneqty">'.$line->qty."</span> x ";
-            //if ($line->product_label) $htmlforlines.= '<b>'.$line->product_label.'</b>';
-            if (isset($line->product_type))
-            {
-                if (empty($line->product_type)) $htmlforlines .= img_object('', 'product').' ';
-                else $htmlforlines .= img_object('', 'service').' ';
-            }
-            if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) {
-            	$tooltiptext = '';
-            	if ($line->product_ref) {
-            		$tooltiptext .= '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';
-            		$tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>';
-	            	if ($line->product_label != $line->desc) {
-	            		if ($line->desc) $tooltiptext .= '<br>';
-	    	        	$tooltiptext .= $line->desc;
-	            	}
-            	}
-            	$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
-            } else {
-            	if ($line->product_label) $htmlforlines .= $line->product_label;
-            	if ($line->product_label != $line->desc)
-	            {
-	            	if ($line->product_label && $line->desc) $htmlforlines .= '<br>';
-	            	$firstline = dolGetFirstLineOfText($line->desc, $conf->global->TAKEPOS_SHOW_N_FIRST_LINES);
-	                if ($firstline != $line->desc)
-	                {
-	                    $htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
-	                }
-	                else
-	                {
-	                    $htmlforlines .= $line->desc;
-	                }
-	            }
-            }
-            if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";
-            if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty-1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty+1).');" class="publicphonebutton2 phonegreen">+</button>';
+			if (isset($line->product_type))
+			{
+				if (empty($line->product_type)) $htmlforlines .= img_object('', 'product').' ';
+				else $htmlforlines .= img_object('', 'service').' ';
+			}
+			if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) {
+				$tooltiptext = '';
+				if ($line->product_ref) {
+					$tooltiptext .= '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';
+					$tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>';
+					if ($line->product_label != $line->desc) {
+						if ($line->desc) $tooltiptext .= '<br>';
+						$tooltiptext .= $line->desc;
+					}
+				}
+				$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
+			} else {
+				if ($line->product_label) $htmlforlines .= $line->product_label;
+				if ($line->product_label != $line->desc)
+				{
+					if ($line->product_label && $line->desc) $htmlforlines .= '<br>';
+					$firstline = dolGetFirstLineOfText($line->desc, $conf->global->TAKEPOS_SHOW_N_FIRST_LINES);
+					if ($firstline != $line->desc)
+					{
+						$htmlforlines .= $form->textwithpicto(dolGetFirstLineOfText($line->desc), $line->desc);
+					} else {
+						$htmlforlines .= $line->desc;
+					}
+				}
+			}
+			if (!empty($line->array_options['options_order_notes'])) $htmlforlines .= "<br>(".$line->array_options['options_order_notes'].")";
+			if ($_SESSION["basiclayout"] == 1) $htmlforlines .= '</td><td class="right phonetable"><button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty - 1).');" class="publicphonebutton2 phonered">-</button>&nbsp;&nbsp;<button type="button" onclick="SetQty(place, '.$line->rowid.', '.($line->qty + 1).');" class="publicphonebutton2 phonegreen">+</button>';
 			if ($_SESSION["basiclayout"] != 1)
 			{
 				$moreinfo = '';
@@ -1059,22 +1083,51 @@ if ($placeid > 0)
 
 				$htmlforlines .= '</td>';
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
-				$htmlforlines .= '<td class="right">'.$line->qty.'</td>';
-				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">'.price($line->total_ttc).'</td>';
+				$htmlforlines .= '<td class="right">';
+				if (!empty($conf->stock->enabled) && !empty($user->rights->stock->mouvement->lire))
+				{
+					$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
+					$sql = "SELECT e.rowid, e.ref, e.lieu, e.fk_parent, e.statut, ps.reel, ps.rowid as product_stock_id, p.pmp";
+					$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
+					$sql .= " ".MAIN_DB_PREFIX."product_stock as ps";
+					$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = ps.fk_product";
+					$sql .= " WHERE ps.reel != 0";
+					$sql .= " AND ps.fk_entrepot = ".$conf->global->$constantforkey;
+					$sql .= " AND e.entity IN (".getEntity('stock').")";
+					$sql .= " AND ps.fk_product = ".$line->fk_product;
+					$resql = $db->query($sql);
+					if ($resql) {
+						$obj = $db->fetch_object($resql);
+						$stock_real = price2num($obj->reel, 'MS');
+						$htmlforlines .= $line->qty;
+						if ($line->qty && $line->qty > $stock_real) $htmlforlines .= '<span style="color: var(--amountremaintopaycolor)">';
+						$htmlforlines .= ' <span class="posstocktoolow">('.$langs->trans("Stock").' '.$stock_real.')</span>';
+						if ($line->qty && $line->qty > $stock_real) $htmlforlines .= "</span>";
+					}
+				}
+				else $htmlforlines .= $line->qty;
+				$htmlforlines .= '</td>';
+				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
+				$htmlforlines .= price($line->total_ttc, 1, '', 1, -1, -1, $conf->currency);
+				if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+					//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+					include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+					$multicurrency = new MultiCurrency($db);
+					$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+					$htmlforlines .= '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($line->total_ttc * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
+				}
+				$htmlforlines .= '</td>';
 			}
 			$htmlforlines .= '</tr>'."\n";
 			$htmlforlines .= $htmlsupplements[$line->id];
 
-            print $htmlforlines;
-        }
-    }
-    else
-    {
-        print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
-    }
-}
-else {      // No invoice generated yet
-    print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
+			print $htmlforlines;
+		}
+	} else {
+		print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
+	}
+} else {      // No invoice generated yet
+	print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
 }
 
 print '</table>';
@@ -1082,7 +1135,7 @@ print '</table>';
 
 if ($action == "search")
 {
-    print '<center>
+	print '<center>
 	<input type="text" id="search" name="search" onkeyup="Search2();" name="search" style="width:80%;font-size: 150%;" placeholder=' . $langs->trans('Search').'
 	</center>';
 }
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index 031c3cc8f2d..b0e745e2211 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -34,6 +34,8 @@ if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
+$langs->loadLangs(array("main", "bills", "cashdesk", "banks"));
+
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place is id of table for Bar or Restaurant
 
 $invoiceid = GETPOST('invoiceid', 'int');
@@ -50,49 +52,55 @@ if (empty($user->rights->takepos->run)) {
 $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
-    $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);
-    }
+	$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);
+	}
 }
 
 $arrayofcss = array('/takepos/css/pos.css.php');
 $arrayofjs = array();
 
+$head = '';
+$title = '';
+$disablejs = 0;
+$disablehead = 0;
+
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-$langs->loadLangs(array("main", "bills", "cashdesk"));
+// Define list of possible payments
+$arrayOfValidPaymentModes = array();
+$arrayOfValidBankAccount = array();
 
 $sql = "SELECT code, libelle as label FROM ".MAIN_DB_PREFIX."c_paiement";
 $sql .= " WHERE entity IN (".getEntity('c_paiement').")";
 $sql .= " AND active = 1";
 $sql .= " ORDER BY libelle";
 $resql = $db->query($sql);
-$paiements = array();
+
 if ($resql) {
 	while ($obj = $db->fetch_object($resql)) {
-        $paycode = $obj->code;
-        if ($paycode == 'LIQ') $paycode = 'CASH';
-        if ($paycode == 'CB')  $paycode = 'CB';
-        if ($paycode == 'CHQ') $paycode = 'CHEQUE';
+		$paycode = $obj->code;
+		if ($paycode == 'LIQ') $paycode = 'CASH';
+		if ($paycode == 'CB')  $paycode = 'CB';
+		if ($paycode == 'CHQ') $paycode = 'CHEQUE';
 
-        $accountname = "CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
-		if (!empty($conf->global->$accountname) && $conf->global->$accountname > 0) array_push($paiements, $obj);
+		$accountname = "CASHDESK_ID_BANKACCOUNT_".$paycode.$_SESSION["takeposterminal"];
+		if (!empty($conf->global->$accountname) && $conf->global->$accountname > 0) {
+			$arrayOfValidBankAccount[$conf->global->$accountname] = $conf->global->$accountname;
+			$arrayOfValidPaymentModes[] = $obj;
+		}
 	}
 }
 ?>
@@ -108,7 +116,7 @@ if ($conf->global->TAKEPOS_COLOR_THEME == 1) print '<link rel="stylesheet" href=
 $remaintopay = 0;
 if ($invoice->id > 0)
 {
-    $remaintopay = $invoice->getRemainToPay();
+	$remaintopay = $invoice->getRemainToPay();
 }
 $alreadypayed = (is_object($invoice) ? ($invoice->total_ttc - $remaintopay) : 0);
 
@@ -121,9 +129,9 @@ else print "var received=0;";
 	function addreceived(price)
 	{
     	<?php
-    	if (empty($conf->global->TAKEPOS_NUMPAD)) print 'received+=String(price);'."\n";
-    	else print 'received+=parseFloat(price);'."\n";
-    	?>
+		if (empty($conf->global->TAKEPOS_NUMPAD)) print 'received+=String(price);'."\n";
+		else print 'received+=parseFloat(price);'."\n";
+		?>
     	$('.change1').html(pricejs(parseFloat(received), 'MT'));
     	$('.change1').val(parseFloat(received));
 		alreadypaydplusreceived=price2numjs(alreadypayed + parseFloat(received));
@@ -176,12 +184,14 @@ else print "var received=0;";
 	function Validate(payment)
 	{
 		var invoiceid = <?php echo ($invoiceid > 0 ? $invoiceid : 0); ?>;
+		var accountid = $("#selectaccountid").val();
 		var amountpayed = $("#change1").val();
+		var excess = $("#change2").val();
 		if (amountpayed > <?php echo $invoice->total_ttc; ?>) {
 			amountpayed = <?php echo $invoice->total_ttc; ?>;
 		}
 		console.log("We click on the payment mode to pay amount = "+amountpayed);
-		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay="+payment+"&amount="+amountpayed+"&invoiceid="+invoiceid, function() {
+		parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay="+payment+"&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
 		    if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) parent.$.colorbox.close();
 			else location.reload();
 		});
@@ -200,7 +210,7 @@ else print "var received=0;";
         window.open('sumupmerchant://pay/1.0?affiliate-key=<?php echo $conf->global->TAKEPOS_SUMUP_AFFILIATE ?>&app-id=<?php echo $conf->global->TAKEPOS_SUMUP_APPID ?>&total=' + amountpayed + '&currency=EUR&title=' + invoiceid + '&callback=<?php echo DOL_MAIN_URL_ROOT ?>/takepos/smpcb.php');
 
         var loop = window.setInterval(function () {
-            $.ajax('/takepos/smpcb.php?status').done(function (data) {
+            $.ajax('<?php echo DOL_URL_ROOT ?>/takepos/smpcb.php?status').done(function (data) {
                 console.log(data);
                 if (data === "SUCCESS") {
                     parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay=CB&amount=" + amountpayed + "&invoiceid=" + invoiceid, function () {
@@ -218,39 +228,53 @@ else print "var received=0;";
     }
 </script>
 
-<div style="position:relative; padding-top: 10px; left:5%; height:150px; width:91%;">
-<center>
+<div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">
+
 <div class="paymentbordline paymentbordlinetotal">
-<center><span class="takepospay"><font color="white"><?php echo $langs->trans('TotalTTC'); ?>: </font><span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1) ?></span></font></span></center>
+	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('TotalTTC'); ?>: </font><span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span></center>
 </div>
 <?php if ($remaintopay != $invoice->total_ttc) { ?>
 <div class="paymentbordline paymentbordlineremain">
-<center><span class="takepospay"><font color="white"><?php echo $langs->trans('RemainToPay'); ?>: </font><span id="remaintopaydisplay" class="colorwhite"><?php echo price($remaintopay, 1, '', 1, -1, -1) ?></span></font></span></center>
+	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('RemainToPay'); ?>: </font><span id="remaintopaydisplay" class="colorwhite"><?php echo price($remaintopay, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span></center>
 </div>
 <?php } ?>
 <div class="paymentbordline paymentbordlinereceived">
-    <center><span class="takepospay"><font color="white"><?php echo $langs->trans("Received"); ?>: </font><span class="change1 colorred"><?php echo price(0) ?></span><input type="hidden" id="change1" class="change1" value="0"></font></span></center>
+    <center><span class="takepospay"><font color="white"><?php echo $langs->trans("Received"); ?>: </font><span class="change1 colorred"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change1" class="change1" value="0"></span></center>
 </div>
 <div class="paymentbordline paymentbordlinechange">
-<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Change"); ?>: </font><span class="change2 colorwhite"><?php echo price(0) ?></span><input type="hidden" id="change2" class="change2" value="0"></font></span></center>
+	<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Change"); ?>: </font><span class="change2 colorwhite"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change2" class="change2" value="0"></span></center>
 </div>
-</center>
+<?php
+if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+	print '<div class="paymentbordline paddingtop paddingbottom">
+	<center>';
+	$filter = '';
+	$form = new Form($db);
+	print '<span class="takepospay"><font color="white">'.$langs->trans("BankAccount").': </font></span>';
+	$form->select_comptes(0, 'accountid', 0, $filter, 1, '');
+	print ajax_combobox('selectaccountid');
+	print '</center>
+	</div>';
+}
+?>
+
 </div>
 
-<div style="position:absolute; left:5%; height:52%; width:92%;">
+
+<div style="position:absolute; left:5%; height:52%; width:90%;">
 <?php
 $action_buttons = array(
 	array(
 		"function" =>"reset()",
 		"span" => "style='font-size: 150%;'",
 		"text" => "C",
-	    "class" => "poscolorblue"
+		"class" => "poscolorblue"
 	),
 	array(
 		"function" => "parent.$.colorbox.close();",
 		"span" => "id='printtext' style='font-weight: bold; font-size: 18pt;'",
 		"text" => "X",
-	    "class" => "poscolordelete"
+		"class" => "poscolordelete"
 	),
 );
 $numpad = $conf->global->TAKEPOS_NUMPAD;
@@ -259,8 +283,8 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '8' : '20').');">'.($numpad == 0 ? '8' : '20').'</button>';
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '9' : '50').');">'.($numpad == 0 ? '9' : '50').'</button>';
 ?>
-<?php if (count($paiements) > 0) {
-    $paycode = $paiements[0]->code;
+<?php if (count($arrayOfValidPaymentModes) > 0) {
+	$paycode = $arrayOfValidPaymentModes[0]->code;
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
@@ -273,7 +297,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$paiements[0]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[0]->code)).'</button>';
 } else {
 	print '<button type="button" class="calcbutton2">'.$langs->trans("NoPaimementModesDefined").'</button>';
 }
@@ -282,8 +306,8 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '5' : '2').');">'.($numpad == 0 ? '5' : '2').'</button>';
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '6' : '5').');">'.($numpad == 0 ? '6' : '5').'</button>';
 ?>
-<?php if (count($paiements) > 1) {
-    $paycode = $paiements[1]->code;
+<?php if (count($arrayOfValidPaymentModes) > 1) {
+	$paycode = $arrayOfValidPaymentModes[1]->code;
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
@@ -296,7 +320,7 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$paiements[1]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[1]->code)).'</button>';
 } else {
 	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
@@ -306,8 +330,8 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '2' : '0.20').');">'.($numpad == 0 ? '2' : '0.20').'</button>';
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '3' : '0.50').');">'.($numpad == 0 ? '3' : '0.50').'</button>';
 ?>
-<?php if (count($paiements) > 2) {
-    $paycode = $paiements[2]->code;
+<?php if (count($arrayOfValidPaymentModes) > 2) {
+	$paycode = $arrayOfValidPaymentModes[2]->code;
 	$payIcon = '';
 	if ($paycode == 'LIQ') {
 		$paycode = 'cash';
@@ -320,9 +344,9 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 		if (!empty($conf->global->TAKEPOS_NUMPAD_USE_PAYMENT_ICON))	$payIcon = 'money-check';
 	}
 
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$paiements[2]->code)).'</button>';
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paycode).'\');">'.(!empty($payIcon) ? '<span class="fa fa-2x fa-'.$payIcon.'"></span>' : $langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[2]->code)).'</button>';
 } else {
-    $button = array_pop($action_buttons);
+	$button = array_pop($action_buttons);
 	print '<button type="button" class="calcbutton2" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
 }
 
@@ -331,8 +355,8 @@ print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '\'.\'' : '0.05').');">'.($numpad == 0 ? '.' : '0.05').'</button>';
 
 $i = 3;
-while ($i < count($paiements)) {
-	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($paiements[$i]->code).'\');">'.$langs->trans("PaymentTypeShort".$paiements[$i]->code).'</button>';
+while ($i < count($arrayOfValidPaymentModes)) {
+	print '<button type="button" class="calcbutton2" onclick="Validate(\''.$langs->trans($arrayOfValidPaymentModes[$i]->code).'\');">'.$langs->trans("PaymentTypeShort".$arrayOfValidPaymentModes[$i]->code).'</button>';
 	$i = $i + 1;
 }
 
@@ -348,9 +372,13 @@ if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
 
 $class = ($i == 3) ? "calcbutton3" : "calcbutton2";
 foreach ($action_buttons as $button) {
-    $newclass = $class.($button["class"] ? " ".$button["class"] : "");
+	$newclass = $class.($button["class"] ? " ".$button["class"] : "");
 	print '<button type="button" class="'.$newclass.'" onclick="'.$button["function"].'"><span '.$button["span"].'>'.$button["text"].'</span></button>';
 }
+
+if ($conf->global->TAKEPOS_DELAYED_PAYMENT) {
+	print '<button type="button" class="calcbutton2" onclick="Validate(\'delayed\');">'.$langs->trans("Reported").'</button>';
+}
 ?>
 </div>
 
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index 0e49eff4ed5..14ca718740b 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -43,7 +43,7 @@ if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 } else {
 	$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 }
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $setterminal = GETPOST('setterminal', 'int');
 $idproduct = GETPOST('idproduct', 'int');
 
@@ -169,9 +169,7 @@ elseif ($action == "checkplease") {
     	if ($categorycursor['level'] == $levelofmaincategories)
     	{
         	$maincategories[$key] = $categorycursor;
-    	}
-    	else
-    	{
+    	} else {
         	$subcategories[$key] = $categorycursor;
     	}
 	}
@@ -202,11 +200,11 @@ $( document ).ready(function() {
 function LoadPlace(placeid){
     place=placeid;
 	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&place="+place, function() {
 		});';
 	}
-	else{
+	else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&place="+place, function() {
 		});';
 	}
@@ -217,12 +215,12 @@ function LoadPlace(placeid){
 function AddProduct(placeid, productid){
 	<?php
 	// If is a public terminal first show product information
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		print 'place=placeid;
 		$("#phonediv1").load("auto_order.php?action=productinfo&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
-	else{
+	else {
 		print 'AddProductConfirm(placeid, productid);';
 	}
 	?>
@@ -236,11 +234,11 @@ function PublicPreOrder(){
 function AddProductConfirm(placeid, productid){
 	place=placeid;
 	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
-	else{
+	else {
 		echo '$("#phonediv2").load("invoice.php?mobilepage=invoice&action=addline&place="+place+"&idproduct="+productid, function() {
 		});';
 	}
@@ -252,7 +250,7 @@ function SetQty(place, selectedline, qty){
 	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		?>
 	if (qty==0){
-		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
+		$("#phonediv2").load("auto_order.php?mobilepage=invoice&action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {
 		});
 	}
 	else{
@@ -264,7 +262,7 @@ function SetQty(place, selectedline, qty){
 	else {
 		?>
 	if (qty==0){
-		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&place="+place+"&idline="+selectedline, function() {
+		$("#phonediv2").load("invoice.php?mobilepage=invoice&action=deleteline&token=<?php echo newToken(); ?>&place="+place+"&idline="+selectedline, function() {
 		});
 	}
 	else{
@@ -273,7 +271,7 @@ function SetQty(place, selectedline, qty){
 	}
 		<?php
 	}
-	?>	
+	?>
 	LoadCats();
 }
 
@@ -286,11 +284,11 @@ function SetNote(place, selectedline){
 
 function LoadCats(){
 	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=cats&place="+place, function() {
 		});';
 	}
-	else{
+	else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=cats&place="+place, function() {
 		});';
 	}
@@ -298,13 +296,13 @@ function LoadCats(){
 }
 
 function LoadProducts(idcat){
-    
+
 	<?php
-	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+	if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		echo '$("#phonediv1").load("auto_order.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
 	}
-	else{
+	else {
 		echo '$("#phonediv1").load("invoice.php?mobilepage=products&catid="+idcat+"&place="+place, function() {
 		});';
 	}
@@ -357,7 +355,7 @@ function CheckPlease(payment){
 <div class="container">
 	<div class="phonebuttonsrow">
 		<?php
-		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')){
+		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 			print '<button type="button" class="phonebutton" onclick="LoadPlacesList();">'.strtoupper(substr($langs->trans('Floors'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="LoadCats();">'.strtoupper(substr($langs->trans('Categories'), 0, 3)).'</button>';
 			print '<button type="button" class="phonebutton" onclick="TakeposPrintingOrder();">'.strtoupper(substr($langs->trans('Order'), 0, 3)).'</button>';
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 90b3a5c1fee..0773053d4a2 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -34,6 +34,8 @@ $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is
 
 $facid = GETPOST('facid', 'int');
 
+$gift = GETPOST('gift', 'int');
+
 if (empty($user->rights->takepos->run)) {
 	accessforbidden();
 }
@@ -89,12 +91,14 @@ if (!empty($hookmanager->resPrint)) {
 <br>
 <p class="left">
 <?php
-if (!empty($conf->global->TAKEPOS_HEADER))
+$constFreeText = 'TAKEPOS_HEADER'.$_SESSION['takeposterminal'];
+if (!empty($conf->global->TAKEPOS_HEADER) || !empty($conf->global->{$constFreeText}))
 {
+	$newfreetext = '';
 	$substitutionarray = getCommonSubstitutionArray($langs);
-	if (!empty($conf->global->TAKEPOS_HEADER))
-	$newfreetext = make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray);
-	echo $newfreetext;
+	if (!empty($conf->global->TAKEPOS_HEADER))      $newfreetext .= make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray);
+	if (!empty($conf->global->{$constFreeText}))    $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray);
+	print $newfreetext;
 }
 ?>
 </p>
@@ -123,8 +127,8 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 	<tr>
         <th class="center"><?php print $langs->trans("Label"); ?></th>
         <th class="right"><?php print $langs->trans("Qty"); ?></th>
-        <th class="right"><?php print $langs->trans("Price"); ?></th>
-        <th class="right"><?php print $langs->trans("TotalTTC"); ?></th>
+        <th class="right"><?php if ($gift != 1) print $langs->trans("Price"); ?></th>
+        <th class="right"><?php if ($gift != 1) print $langs->trans("TotalTTC"); ?></th>
 	</tr>
     </thead>
     <tbody>
@@ -138,8 +142,8 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
         else echo $line->description; ?>
         </td>
         <td class="right"><?php echo $line->qty; ?></td>
-        <td class="right"><?php echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
-        <td class="right"><?php echo price($line->total_ttc, 1); ?></td>
+        <td class="right"><?php if ($gift != 1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
+        <td class="right"><?php if ($gift != 1) echo price($line->total_ttc, 1); ?></td>
     </tr>
         <?php
     }
@@ -149,8 +153,8 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 <br>
 <table class="right">
 <tr>
-    <th class="right"><?php echo $langs->trans("TotalHT"); ?></th>
-    <td class="right"><?php echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+    <th class="right"><?php if ($gift != 1) echo $langs->trans("TotalHT"); ?></th>
+    <td class="right"><?php if ($gift != 1) echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <?php if ($conf->global->TAKEPOS_TICKET_VAT_GROUPPED) {
 	$vat_groups = array();
@@ -164,30 +168,84 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 	foreach ($vat_groups as $key => $val) {
 	    ?>
 	<tr>
-		<th align="right"><?php echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>
-		<td align="right"><?php echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+		<th align="right"><?php if ($gift != 1) echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>
+		<td align="right"><?php if ($gift != 1) echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 	</tr>
         <?php
 	}
 } else { ?>
 <tr>
-	<th class="right"><?php echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+	<th class="right"><?php if ($gift != 1) echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <?php } ?>
 <tr>
-	<th class="right"><?php echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+	<th class="right"><?php if ($gift != 1) echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
+<?php
+if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+	//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+	include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+	$multicurrency = new MultiCurrency($db);
+	$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+	echo '<tr><th class="right">';
+	if ($gift != 1) echo ''.$langs->trans("TotalTTC").' '.$_SESSION["takeposcustomercurrency"].'</th><td class="right">'.price($object->total_ttc * $multicurrency->rate->rate, 1, '', 1, - 1, - 1, $_SESSION["takeposcustomercurrency"])."\n";
+	echo '</td></tr>';
+}
+
+if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
+	$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,";
+	$sql .= " cp.code";
+	$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON p.fk_paiement = cp.id";
+	$sql .= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$facid;
+	$sql .= " ORDER BY p.datep";
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		while ($i < $num) {
+			$row = $db->fetch_object($resql);
+			echo '<tr>';
+			echo '<td class="right">';
+			echo $langs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
+			echo '</td>';
+			echo '<td class="right">';
+			$amount_payment = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
+			if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
+			echo price($amount_payment, 1, '', 1, - 1, - 1, $conf->currency);
+			echo '</td>';
+			echo '</tr>';
+			if ($row->code == "LIQ" && $row->pos_change > 0) // Print change only in cash payments
+			{
+				echo '<tr>';
+				echo '<td class="right">';
+				echo $langs->trans("Change");
+				echo '</td>';
+				echo '<td class="right">';
+				echo price($row->pos_change, 1, '', 1, - 1, - 1, $conf->currency);
+				echo '</td>';
+				echo '</tr>';
+			}
+			$i++;
+		}
+	}
+}
+?>
 </table>
 <div style="border-top-style: double;">
 <br>
 <br>
 <br>
 <?php
-if (!empty($conf->global->TAKEPOS_FOOTER))
+$constFreeText = 'TAKEPOS_FOOTER'.$_SESSION['takeposterminal'];
+if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeText}))
 {
+	$newfreetext = '';
 	$substitutionarray = getCommonSubstitutionArray($langs);
-	$newfreetext = make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray);
-	echo $newfreetext;
+	if (!empty($conf->global->{$constFreeText}))    $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray);
+	if (!empty($conf->global->TAKEPOS_FOOTER))      $newfreetext .= make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray);
+	print $newfreetext;
 }
 ?>
 
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 7be5ee85938..e882957ad14 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -51,9 +51,7 @@ $invoice = new Facture($db);
 if ($invoiceid > 0)
 {
     $invoice->fetch($invoiceid);
-}
-else
-{
+} 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);
@@ -64,9 +62,7 @@ else
     if (!$invoiceid)
     {
         $invoiceid = 0; // Invoice does not exist yet
-    }
-    else
-    {
+    } else {
         $invoice->fetch($invoiceid);
     }
 }
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index 3f59d4069b5..ea97e6d560b 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $facid = GETPOST('facid', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $email = GETPOST('email', 'alpha');
 
 if (empty($user->rights->takepos->run)) {
@@ -51,29 +51,31 @@ $invoice->fetch($facid);
 $customer = new Societe($db);
 $customer->fetch($invoice->socid);
 
-if ($action=="send")
+if ($action == "send")
 {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-    $formmail = new FormMail($db);
-    $outputlangs = new Translate('', $conf);
-    $model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE;
-    $arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id);
-    $subject = $arraydefaultmessage->topic;
-    ob_start(); // turn on output receipt
-    include 'receipt.php';
-    $receipt = ob_get_contents(); // get the contents of the output buffer
-    ob_end_clean();
-    $msg="<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";
-    $sendto=$email;
-    $from=$mysoc->email;
-    $mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);
-    if ($mail->error || $mail->errors) {
-        setEventMessages($mail->error, $mail->errors, 'errors');
-    } else {
-        $result = $mail->sendfile();
-    }
-    exit;
+	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+	$formmail = new FormMail($db);
+	$outputlangs = new Translate('', $conf);
+	$model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE;
+	$arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id);
+	$subject = $arraydefaultmessage->topic;
+
+	ob_start(); // turn on output receipt
+	include 'receipt.php';
+	$receipt = ob_get_contents(); // get the contents of the output buffer
+	ob_end_clean();
+
+	$msg="<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";
+	$sendto=$email;
+	$from=$mysoc->email;
+	$mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);
+	if ($mail->error || $mail->errors) {
+		setEventMessages($mail->error, $mail->errors, 'errors');
+	} else {
+		$result = $mail->sendfile();
+	}
+	exit;
 }
 $arrayofcss = array('/takepos/css/pos.css.php');
 $arrayofjs  = array();
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index d2a59447bb9..36296bb0b8a 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -24,6 +24,18 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet');
     font-size: 0.95em;
     padding: .19em .35em;			/* more than 0.19 generate a change into heigth of lines */
 }
+.tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
+    font-size: 1.1em;
+    padding: .4em .4em;
+}
+/* Force values for small screen 767 */
+@media only screen and (max-width: 767px)
+{
+	.tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
+	    font-size: 0.95em;
+	    padding: .3em .2em;
+	}
+}
 
 .badge-pill, .tabs .badge {
     padding-right: .5em;
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index a697274dffc..c866b187638 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -7,14 +7,20 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
             --btncolorbg: #fbfbfb;
             --btncolorborderhover: none;
             --btncolorborder: #FFF;
-            --butactionbg:rgb(218, 235, 225);
             --butactiondeletebg: rgb(234,228,225);
+            /* tertiary color */
+            /* --butactionbg:rgb(218, 235, 225); */
+            /* --butactionbg:rgb(228, 218, 235); */
+            --butactionbg:rgb(118, 145, 225);
 }
 
 <?php
-if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) {
+if (!empty($conf->global->THEME_DARKMODEENABLED)) {
+	print "/* For dark mode */\n";
+	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+		print "@media (prefers-color-scheme: dark) {";
+	}
 	print "
-    @media (prefers-color-scheme: dark) {
       :root {
 
             --btncolortext: ;
@@ -24,8 +30,10 @@ if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) {
             --butactionbg:rgb(173,140,79);
             --butactiondeletebg: rgb(252,84,91);
 
-      }
-    }";
+      }\n";
+	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+		print "}";
+	}
 }
 ?>
 
@@ -51,6 +59,8 @@ span.butAction, span.butActionDelete {
 
 .butAction {
     background: var(--butactionbg);
+    color: #FFF !important;
+    border-radius: 3px;
     /* background: rgb(230, 232, 239); */
 }
 .butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
@@ -60,7 +70,6 @@ span.butAction, span.butActionDelete {
 
     margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.9'); ?>em;
     padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;
-    font-family: <?php print $fontlist ?>;
     display: inline-block;
     text-align: center;
     cursor: pointer;
@@ -70,10 +79,10 @@ span.butAction, span.butActionDelete {
     /* border: 1px solid #aaa; */
     /* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */
 
-    border-top-right-radius: 0 !important;
+    /*border-top-right-radius: 0 !important;
     border-bottom-right-radius: 0 !important;
     border-top-left-radius: 0 !important;
-    border-bottom-left-radius: 0 !important;
+    border-bottom-left-radius: 0 !important;*/
 }
 .butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active {
     text-decoration: none;
@@ -102,18 +111,6 @@ span.butActionNewRefused>span.fa-list-alt, span.butActionNewRefused>span.fa-list
 	padding-left: 0px;
 }
 
-/*a.butActionNew>span.fa-plus-circle, a.butActionNew>span.fa-plus-circle:hover,
-span.butActionNew>span.fa-plus-circle, span.butActionNew>span.fa-plus-circle:hover,
-a.butActionNewRefused>span.fa-plus-circle, a.butActionNewRefused>span.fa-plus-circle:hover,
-span.butActionNewRefused>span.fa-plus-circle, span.butActionNewRefused>span.fa-plus-circle:hover,
-a.butActionNew>span.fa-list-alt, a.butActionNew>span.fa-list-alt:hover,
-span.butActionNew>span.fa-list-alt, span.butActionNew>span.fa-list-alt:hover,
-a.butActionNewRefused>span.fa-list-alt, a.butActionNewRefused>span.fa-list-alt:hover,
-span.butActionNewRefused>span.fa-list-alt, span.butActionNewRefused>span.fa-list-alt:hover,
-a.butActionNew>span.fa-comment-dots, a.butActionNew>span.fa-comment-dots:hover,
-span.butActionNew>span.fa-comment-dots, span.butActionNew>span.fa-comment-dots:hover,
-a.butActionNewRefused>span.fa-comment-dots, a.butActionNewRefused>span.fa-comment-dots:hover,
-span.butActionNewRefused>span.fa-comment-dots, span.butActionNewRefused>span.fa-comment-dots:hover,*/
 a.butActionNew>span.fa, a.butActionNew>span.fa:hover,
 span.butActionNew>span.fa, span.butActionNew>span.fa:hover,
 a.butActionNewRefused>span.fa, a.butActionNewRefused>span.fa:hover,
@@ -195,7 +192,7 @@ TITLE BUTTON
 
 .btnTitle, a.btnTitle {
     display: inline-block;
-    padding: 4px 12px 4px 12px;
+    padding: 4px 4px 4px 4px;
     font-weight: 400;
     /* line-height: 1; */
     text-align: center;
@@ -211,8 +208,8 @@ TITLE BUTTON
     box-shadow: var(--btncolorbg);
     text-decoration: none;
     position: relative;
-    margin: 0 0 0 10px;
-    min-width: 80px;
+    /* margin: 0 0 0 8px; */
+    min-width: 72px;
     text-align: center;
     color: var(--btncolortext);
     border: none;
@@ -239,7 +236,6 @@ a.btnTitle.btnTitleSelected {
 	border: 1px solid #bbb;
     border-radius: 3px;
     position: relative;
-    margin: 0 0 0 10px;
     text-align: center;
     /* color: #ffffff;
     background-color: rgb(<?php print $colortextlink; ?>); */
@@ -280,6 +276,9 @@ div.pagination li:first-child a.btnTitle{
 /* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */
 @media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px)	/* reduction 2 */
 {
+	.butAction, .butActionRefused, .butActionDelete {
+		font-size: 0.95em;
+	}
 	.btnTitle, a.btnTitle {
 	    display: inline-block;
 	    padding: 4px 4px 4px 4px;
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index b52fd6f7e51..50bf77c00ff 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -73,7 +73,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['Maximize'],
 	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Format','Font','FontSize'],
+	    ['Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 2944dbe6c61..1140589a2e2 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -9,7 +9,7 @@ button.dropdown-item.global-search-item {
     outline: none;
 }
 
-.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-menu, .dropdown dd ul.open {
+.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-quickadd, .open>.dropdown-menu, .dropdown dd ul.open {
     display: block;
 }
 
@@ -59,6 +59,29 @@ button.dropdown-item.global-search-item {
     -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
     box-shadow: 0 6px 12px rgba(0,0,0,.175);
 }
+.dropdown-quickadd {
+	border-color: #eee;
+
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 240px;
+	margin: 2px 0 0;
+	font-size: 14px;
+	text-align: left;
+	list-style: none;
+	background-color: #fff;
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0,0,0,.15);
+	border-radius: 4px;
+	-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
+	box-shadow: 0 6px 12px rgba(0,0,0,.175);
+}
 .dropdown-menu {
     border-color: #eee;
 
@@ -163,7 +186,7 @@ button.dropdown-item.global-search-item {
     max-width: 100%;
 }
 
-div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown {
+div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown, div#topmenu-quickadd-dropdown {
 	<?php if (empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { ?>
 		line-height: 46px;
 	<?php } ?>
@@ -194,6 +217,7 @@ a.top-menu-dropdown-link {
 }
 
 .dropdown-menu > .user-footer {
+    border-top: 1px solid #f0f0f0;
     background-color: #f9f9f9;
     padding: 10px;
 }
@@ -202,8 +226,9 @@ a.top-menu-dropdown-link {
     clear: both;
 }
 
-
 .dropdown-menu > .bookmark-footer{
+    border-top: 1px solid #f0f0f0;
+    background-color: #f9f9f9;
     padding: 10px;
 }
 
@@ -216,7 +241,6 @@ a.top-menu-dropdown-link {
 }
 
 .dropdown-menu > .bookmark-body, .dropdown-body{
-    padding: 10px 0;
     overflow-y: auto;
     max-height: 60vh ; /* fallback for browsers without support for calc() */
     max-height: calc(90vh - 110px) ;
@@ -310,7 +334,7 @@ a.top-menu-dropdown-link {
     display: block !important;
     box-sizing: border-box;
     width: 100%;
-    padding: .25rem 1.5rem .25rem 1rem;
+    padding: .3em 1.5em .4em 1em;
     clear: both;
     font-weight: 400;
     color: #212529  !important;
@@ -383,6 +407,63 @@ a.top-menu-dropdown-link {
     display: none !important;
 }
 
+/*
+ * QUICK ADD
+ */
+#topmenu-quickadd-dropdown .dropdown-menu {
+	width: 310px !important;
+	color: #444;
+}
+
+.quickadd-body.dropdown-body {
+	padding: unset;
+	padding-top: 15px;
+}
+
+.quickadd-header {
+	color: #444 !important;
+}
+
+div.quickadd {
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-flex-direction: row;
+	-ms-flex-direction: row;
+	flex-direction: row;
+	-webkit-flex-wrap: wrap;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap;
+	-webkit-justify-content: center;
+	-ms-flex-pack: center;
+	justify-content: center;
+	-webkit-align-content: center;
+	-ms-flex-line-pack: center;
+	align-content: center;
+	-webkit-align-items: flex-start;
+	-ms-flex-align: start;
+	align-items: flex-start;
+}
+
+div.quickadd a {
+	color: #444;
+}
+
+div.quickadd a:hover, div.quickadd a:active {
+	color: #000000;
+}
+
+div.quickaddblock {
+	width: 95px;
+	height: 80px;
+}
+
+div.quickaddblock:hover,
+div.quickaddblock:active,
+div.quickaddblock:focus {
+	background: <?php print $colorbacklinepair1; ?>;
+}
+
 /* smartphone */
 @media only screen and (max-width: 767px)
 {
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 3bd0e560ce5..b9519eb50af 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -34,7 +34,7 @@
 	--oddevencolor: #202020;
 	--colorboxstatsborder: #e0e0e0;
 	--dolgraphbg: rgba(255,255,255,0);
-	--fieldrequiredcolor: #000055;
+	--fieldrequiredcolor: #804000;
 	--colortextbacktab: #<?php print $colortextbacktab; ?>;
 	--colorboxiconbg: #eee;
 	--refidnocolor:#444;
@@ -45,10 +45,12 @@
 }
 
 <?php
-if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) {
-	print "@media (prefers-color-scheme: dark) {
-	      :root {
-
+if (!empty($conf->global->THEME_DARKMODEENABLED)) {
+	print "/* For dark mode */\n";
+	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+		print "@media (prefers-color-scheme: dark) {";
+	}
+	print ":root {
 	            --colorbackhmenu1: #1d1e20;
 	            --colorbackvmenu1: #2b2c2e;
 	            --colorbacktitle1: #2b2d2f;
@@ -84,8 +86,10 @@ if (!empty($conf->global->MAIN_THEME_DARKMODEENABLED)) {
 	            --amountremaintopaycolor:rgb(252,84,91);
 	            --amountpaymentcomplete:rgb(101,184,77);
 	            --amountremaintopaybackcolor:rbg(245,130,46);
-	      }
-	    }";
+	      }\n";
+	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+		print "}\n";
+	}
 }
 ?>
 
@@ -114,7 +118,7 @@ body {
 th a { font-weight: <?php echo ($useboldtitle ? 'bold' : 'normal'); ?> !important; }
 a.tab { font-weight: 500 !important; }
 
-a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; color: var(--colortextlink); text-decoration: none;  }
+a:link, a:visited, a:hover, a:active, .classlink { color: var(--colortextlink); text-decoration: none;  }
 a:hover { text-decoration: underline; color: var(--colortextlink); }
 a.commonlink { color: var(--colortextlink) !important; text-decoration: none; }
 th.liste_titre a div div:hover, th.liste_titre_sel a div div:hover { text-decoration: underline; }
@@ -139,7 +143,7 @@ table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.
 .liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
 .liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],
 .liste_titre input[name=search_month_lim], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end], .liste_titre input[name=search_month_create],
-.liste_titre input[name=search_month_create], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end],
+.liste_titre input[name=search_month_update], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end],
 .liste_titre input[name=day_date_when], .liste_titre input[name=dayvalid], .liste_titre input[name=search_orderday], .liste_titre input[name=search_deliveryday],
 .liste_titre input[name=search_sday], .liste_titre input[name=search_day], .liste_titre input[name=search_eday], .liste_titre input[name=sday], .liste_titre input[name=day], .liste_titre select[name=day],
 .liste_titre input[name=day_lim], .liste_titre input[name=day_start], .liste_titre input[name=day_end], .liste_titre input[name=day_create],
@@ -165,7 +169,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
     font-family: <?php print $fontlist ?>;
     outline: none;
     margin: 0px 0px 0px 0px;
-    border<?php echo empty($conf->global->THEME_HIDE_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+    border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 }
 
 input {
@@ -186,9 +190,14 @@ input, select {
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp) {
 	background: var(--butactionbg);
+	color: #FFF !important;
+	border-radius: 3px;
     border-collapse: collapse;
     border: none;
 }
+#mainbody span.websitetools input.button:not(.buttongen):not(.bordertransp) {
+    color: #000 !important;
+}
 #mainbody input.buttongen, #mainbody button.buttongen {
 	padding: 3px 4px;
 }
@@ -207,7 +216,6 @@ input:invalid, select:invalid {
 
 /* Focus definitions must be after standard definition */
 textarea:focus {
-    /* v6 box-shadow: 0 0 4px #8091BF; */
 	border: 1px solid #aaa !important;
 }
 input:focus, select:focus {
@@ -306,6 +314,10 @@ input.buttonpaymentstripe {
 	background-repeat: no-repeat;
 	background-position: 8px 11px;
 }
+.logopublicpayment #dolpaymentlogo {
+	max-height: 100px;
+}
+
 a.buttonticket {
 	padding-left: 5px;
 	padding-right: 5px;
@@ -372,6 +384,9 @@ input.pageplusone {
 .colorwhite {
 	color: #fff;
 }
+.colorgrey {
+    color: #888 !important;
+}
 .colorblack {
 	color: #000;
 }
@@ -392,7 +407,16 @@ input.removedfile {
 	border: 0px !important;
 	vertical-align: text-bottom;
 }
-input[type=file ]    { background-color: transparent; border-top: none; border-left: none; border-right: none; box-shadow: none; }
+input[type=file ]    {
+	background-color: transparent;
+	box-shadow: none;
+	<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
+	border-top: none;
+	border-left: none;
+	border-right: none;
+	<?php } ?>
+    border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+}
 input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; }
 input[type=radio]    { background-color: transparent; border: none; box-shadow: none; }
 input[type=image]    { background-color: transparent; border: none; box-shadow: none; }
@@ -494,10 +518,28 @@ div.floatright
 {
     float:<?php print $right; ?>;
 }
+.block
+{
+	display:block;
+}
 .inline-block
 {
 	display:inline-block;
 }
+.largenumber {
+    font-size: 1.4em;
+}
+button[name='button_search_x'] span.fa.fa-search {
+    font-size: 1.3em;
+}
+button[name='button_removefilter_x'] span.fa.fa-remove {
+    opacity: 0.5;
+    font-size: 1.3em;
+}
+button:focus {
+	outline: none;
+}
+
 
 th .button {
     -webkit-box-shadow: none !important;
@@ -524,6 +566,9 @@ th .button {
 .centpercent {
 	width: 100%;
 }
+.centpercentwithoutmenu {
+	width: calc(100% - 200px);
+}
 .quatrevingtpercent, .inputsearch {
 	width: 80%;
 }
@@ -556,6 +601,9 @@ textarea.centpercent {
     text-align: center;
     margin: 0px auto;
 }
+.alignstart {
+    text-align: start;
+}
 .left {
 	text-align: <?php print $left; ?>;
 }
@@ -598,6 +646,9 @@ textarea.centpercent {
 .nobold {
 	font-weight: normal !important;
 }
+.uppercase {
+	text-transform: uppercase;
+}
 .nounderline {
     text-decoration: none;
 }
@@ -653,10 +704,18 @@ textarea.centpercent {
     font-size: 0.85em;
     opacity: 0.7;
 }
-
+.borderimp {
+	border: 1px solid #888 !important;
+}
 .text-warning{
     color : <?php print $textWarning; ?>
 }
+.longmessagecut {
+    max-height: 250px;
+    max-width: 100%;
+    overflow-y: auto;
+}
+
 body[class*="colorblind-"] .text-warning{
     color : <?php print $colorblind_deuteranopes_textWarning; ?>
 }
@@ -686,9 +745,17 @@ body[class*="colorblind-"] .text-success{
 	float: none !important;
 }
 
+span.fa.fa-plus-circle.paddingleft {
+    padding-right: 4px;
+    padding-top: 3px;
+    padding-bottom: 2px;
+}
+
 .fa-toggle-on, .fa-toggle-off { font-size: 2em; }
 .websiteselectionsection .fa-toggle-on, .websiteselectionsection .fa-toggle-off,
-.asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off {
+.asetresetmodule .fa-toggle-on, .asetresetmodule .fa-toggle-off,
+.tdwebsitesearchresult .fa-toggle-on, .tdwebsitesearchresult .fa-toggle-off
+{
 	font-size: 1.5em; vertical-align: text-bottom;
 }
 
@@ -704,9 +771,15 @@ body[class*="colorblind-"] .text-success{
 #formuserfile {
 	margin-top: 4px;
 }
+#formuserfile input[type='file'] {
+    font-size: 1em;
+}
 #formuserfile_link {
 	margin-left: 1px;
 }
+#formuserfile_link input[type='text'] {
+    font-size: 1em;
+}
 .listofinvoicetype {
 	height: 28px;
 	vertical-align: middle;
@@ -763,6 +836,43 @@ div.divsearchfield {
 	padding: 3px;
 }
 
+.a-filter, .a-mesure {
+    border-radius: 50px;
+    background: var(--colortexttitlenotab);
+    color: #fff;
+    padding: 8px 10px 8px 6px;
+}
+.a-filter:before {
+    content: "\f0b0";
+}
+.a-mesure:before {
+    content: "\f080";
+}
+.a-filter:before, .a-mesure:before {
+	font-family: "Font Awesome 5 Free";
+	font-weight: 600;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+.a-filter-disabled, .a-mesure-disabled {
+    border-radius: 50px;
+    background: var(--colorbacktitle1);
+    padding: 8px;
+    opacity: 0.6;
+}
+
+div.div-for-modal {
+	/* display: none; */
+	position:absolute;
+	top:calc(50% - 200px);
+	left:calc(50% - 250px);
+	width:500px;  /* adjust as per your needs */
+	height:400px;   /* adjust as per your needs */
+	background: #fff;
+    border: 1px solid #bbb;
+    box-shadow: 2px 2px 20px #ddd;
+    z-index: 100;
+}
 
 <?php
 // Add a nowrap on smartphone, so long list of field used for filter are overflowed with clip
@@ -867,6 +977,12 @@ select.flat.selectlimit {
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+.tdoverflowmax100imp {			/* For tdoverflow, the max-midth become a minimum ! */
+    max-width: 100px !important;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 .tdoverflowmax150 {			/* For tdoverflow, the max-midth become a minimum ! */
     max-width: 150px;
     overflow: hidden;
@@ -927,6 +1043,13 @@ select.flat.selectlimit {
 	font-weight: bold;
 	font-size: 1.2em;
 }
+.onlinepaymentbody .amountpaymentcomplete {
+    background-color: var(--amountpaymentcomplete);
+    color: #fff;
+    padding: 5px;
+    border-radius: 5px;
+}
+
 .savingdocmask {
 	margin-top: 6px;
 	margin-bottom: 12px;
@@ -1027,12 +1150,22 @@ table[summary="list_of_modules"] .fa-cog {
 	height: 100px;
 }
 
+.maxscreenheightless200 {
+	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(500, $_SESSION['dol_screenheight'] - 200) : 700; ?>px;	/* we guarantee height of 500 */
+}
+.maxscreenheightless300 {
+	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(400, $_SESSION['dol_screenheight'] - 300) : 700; ?>px;	/* we guarantee height of 500 */
+}
+
+
+
 
 /* ============================================================================== */
 /* Styles to hide objects                                                         */
 /* ============================================================================== */
 
 .clearboth  { clear:both; }
+
 .hideobject { display: none; }
 .minwidth50  { min-width: 50px; }
 .minwidth75  { min-width: 75px; }
@@ -1071,16 +1204,21 @@ table[summary="list_of_modules"] .fa-cog {
 .maxwidth25  { max-width: 25px; }
 .maxwidth50  { max-width: 50px; }
 .maxwidth75  { max-width: 75px; }
+.maxwidthdate  { max-width: 80px; }
 .maxwidth100 { max-width: 100px; }
 .maxwidth125 { max-width: 125px; }
 .maxwidth150 { max-width: 150px; }
 .maxwidth200 { max-width: 200px; }
+.maxwidth250 { max-width: 250px; }
 .maxwidth300 { max-width: 300px; }
 .maxwidth400 { max-width: 400px; }
 .maxwidth500 { max-width: 500px; }
+.maxwidth750 { max-width: 750px; }
+.maxwidth1000 { max-width: 1000px; }
 .maxwidth50imp  { max-width: 50px !important; }
 .maxwidth75imp  { max-width: 75px !important; }
 .minheight20 { min-height: 20px; }
+.minheight30 { min-height: 30px; }
 .minheight40 { min-height: 40px; }
 .titlefieldcreate { width: 20%; }
 .titlefield       { /* width: 25%; */ width: 250px; }
@@ -1133,6 +1271,11 @@ table[summary="list_of_modules"] .fa-cog {
     .minwidth500imp { min-width: 250px !important; }
 }
 
+.widthcentpercentminusx {
+	width: calc(100% - 50px) !important;
+	display: inline-block;
+}
+
 /* Force values for small screen 767 */
 @media only screen and (max-width: 767px)
 {
@@ -1155,11 +1298,12 @@ table[summary="list_of_modules"] .fa-cog {
 		margin-bottom: 15px !important;
 	}
 
-	select.minwidth100imp, select.minwidth100, select.minwidth200, .widthcentpercentminusx {
+	select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth300 {
 		width: calc(100% - 50px) !important;
 		display: inline-block;
 	}
 
+	.clearbothonsmartphone { clear: both; display: block; }
 	/*img.photoref, div.photoref {
 		box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2);
 	}*/
@@ -1344,7 +1488,7 @@ td.showDragHandle {
 #id-left {
 	padding-top: 20px;
 	padding-bottom: 5px;
-	<?php if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_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 } ?>
 }
@@ -1354,11 +1498,22 @@ td.showDragHandle {
 	background: var(--colorbackbody);
 	padding-bottom: 20px;
 }
-#id-left {
-/*	background-color: #fff;
-	border-right: 1px #888 solid;
-	height: calc(100% - 50px);*/
+
+/* DOL_XXX For having horizontal scroll into array (like with smartphone) */
+
+.classforhorizontalscrolloftabs #id-container {
+	width: 100%;
 }
+.classforhorizontalscrolloftabs .side-nav {
+	display: block;
+	float: left;
+}
+.classforhorizontalscrolloftabs #id-right {
+	width:calc(100% - 210px);
+	display: inline-block;
+}
+
+
 
 <?php if (empty($conf->global->THEME_DISABLE_STICKY_TOPMENU)) {  ?>
 .side-nav-vert {
@@ -1369,6 +1524,8 @@ td.showDragHandle {
 <?php } ?>
 
 .side-nav {
+	/*display: block;
+	float: left; */
 	display: table-cell;
 	border-<?php echo $right; ?>: 1px solid #E0E0E0;
 	box-shadow: 3px 0 6px -2px #eee;
@@ -1452,51 +1609,63 @@ div.vmenu, td.vmenu {
 
 .menuhider { display: none !important; }
 
+
 /* rule to reduce top menu - 3rd reduction: The menu for user is on left */
 @media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
-body.sidebar-collapse .side-nav {
-	display: none;
+	body.sidebar-collapse .side-nav {
+		display: none;
+	}
+
+	body.sidebar-collapse .login_block {
+		display: none;
+	}
+
+	.menuhider { display: block !important; }
+	.dropdown-user-image { display: none; }
+	.user-header { height: auto !important; color: var(--colorbackbody); }
+
+	#id-container {
+		width: 100%;
+	}
+	.side-nav {
+		border-bottom: 1px solid #BBB;
+		background: #FFF;
+		padding-left: 20px;
+		padding-right: 20px;
+		position: absolute;
+	    	z-index: 90;
+	}
+	div.blockvmenulogo
+	{
+		border-bottom: 0 !important;
+	}
+	div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend {
+		border-top: none !important;
+		border-left: none !important;
+		border-right: none !important;
+		border-bottom: 1px solid #e0e0e0;
+		padding-left: 0 !important;
+	}
+	div.vmenu, td.vmenu {
+		padding-right: 6px !important;
+	}
+	div.fiche {
+		margin-<?php print $left; ?>: 9px !important;
+		margin-<?php print $right; ?>: 10px !important;
+	}
+
+	.pagination .fa-chevron-left, .pagination .fa-chevron-right {
+		font-size: 1.2em;
+	}
 }
 
-body.sidebar-collapse .login_block {
-	display: none;
-}
-
-.menuhider { display: block !important; }
-.dropdown-user-image { display: none; }
-.user-header { height: auto !important; color: var(--colorbackbody); }
-
-#id-container {
-	width: 100%;
-}
-.side-nav {
-	border-bottom: 1px solid #BBB;
-	background: #FFF;
-	padding-left: 20px;
-	padding-right: 20px;
-	position: absolute;
-    	z-index: 90;
-}
-div.blockvmenulogo
+@media only screen and (min-width: 768px) and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)	/* reduction 3 */
 {
-	border-bottom: 0 !important;
-}
-div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks, div.blockvmenuend {
-	border-top: none !important;
-	border-left: none !important;
-	border-right: none !important;
-	border-bottom: 1px solid #e0e0e0;
-	padding-left: 0 !important;
-}
-div.vmenu, td.vmenu {
-	padding-right: 6px !important;
-}
-div.fiche {
-	margin-<?php print $left; ?>: 9px !important;
-	margin-<?php print $right; ?>: 10px !important;
-}
-<?php //} ?>
+	div.fiche {
+		margin-<?php print $left; ?>: 13px !important;
+		margin-<?php print $right; ?>: 14px !important;
+	}
 }
 
 
@@ -1513,7 +1682,7 @@ div.fiche>table:first-child {
 	margin-bottom: 15px;
 }
 div.fiche>table.table-fiche-title {
-	margin-bottom: 7px;
+	margin-bottom: 12px;
 }
 div.fichecenter {
 	width: 100%;
@@ -1642,8 +1811,8 @@ td.nobordernopadding.widthpictotitle.col-picto {
     color: #999;
 }
 
+/*
 span.widthpictotitle.pictotitle {
-	/* background: rgba(70, 3, 62, 0.5); */
     background: var(--colortexttitlenotab);
     opacity: 0.8;
     color: #fff !important;
@@ -1652,10 +1821,12 @@ span.widthpictotitle.pictotitle {
     min-width: 30px;
     text-align: center;
 }
+*/
 .pictotitle {
 	margin-<?php echo $right; ?>: 8px;
 	/* margin-bottom: 4px; */
 }
+
 .pictoobjectwidth {
 	width: 14px;
 }
@@ -1703,7 +1874,7 @@ div.attacharea {
 }
 div.attachareaformuserfileecm {
 	padding-top: 0;
-	padding-bottom: 0;
+	padding-bottom: 6px;
 }
 
 div.arearef {
@@ -1758,6 +1929,9 @@ img.photoref, div.photoref {
 	width: 80px;
     object-fit: contain;
 }
+div.photoref .fa, div.photoref .fas, div.photoref .far {
+	font-size: 2.5em;
+}
 img.fitcontain {
     object-fit: contain;
 }
@@ -1997,90 +2171,7 @@ a.tmenuimage:hover{
 /* Do not load menu img for other if hidden to save bandwidth */
 
 <?php if (empty($dol_hide_topmenu)) { ?>
-    <?php if (!defined('DISABLE_FONT_AWSOME')) { ?>
-        <?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
-    <?php } else { ?>
-        div.mainmenu.home{
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home_over.png', 1) ?>);
-            background-position-x: center;
-        }
-
-        div.mainmenu.billing {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money_over.png', 1) ?>);
-        }
-
-        div.mainmenu.accountancy {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money_over.png', 1) ?>);
-        }
-
-        div.mainmenu.agenda {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda_over.png', 1) ?>);
-        }
-
-        div.mainmenu.bank {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank_over.png', 1) ?>);
-        }
-
-        div.mainmenu.cashdesk {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale_over.png', 1) ?>);
-        }
-
-        div.mainmenu.takepos {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale_over.png', 1) ?>);
-        }
-
-        div.mainmenu.companies {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company_over.png', 1) ?>);
-        }
-
-        div.mainmenu.commercial {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial_over.png', 1) ?>);
-        }
-
-        div.mainmenu.ecm {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm_over.png', 1) ?>);
-        }
-
-        div.mainmenu.externalsite {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite_over.png', 1) ?>);
-        }
-
-        div.mainmenu.ftp {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools_over.png', 1) ?>);
-        }
-
-        div.mainmenu.hrm {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday_over.png', 1) ?>);
-        }
-
-        div.mainmenu.members {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members_over.png', 1) ?>);
-        }
-
-        div.mainmenu.products {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products_over.png', 1) ?>);
-        }
-
-        div.mainmenu.mrp {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products_over.png', 1) ?>);
-        }
-
-        div.mainmenu.project {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project_over.png', 1) ?>);
-        }
-
-        div.mainmenu.ticket {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ticket_over.png', 1) ?>);
-        }
-
-        div.mainmenu.tools {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools_over.png', 1) ?>);
-        }
-
-        div.mainmenu.website {
-            background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite_over.png', 1) ?>);
-        }
-    <?php } ?>
+    <?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')
@@ -2131,9 +2222,7 @@ a.tmenuimage:hover{
                 print 'div.mainmenu.'.$val.'::before {
                     content: "\f249";
                 }'."\n";
-            }
-            else
-            {
+            } 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";
@@ -2141,9 +2230,7 @@ a.tmenuimage:hover{
                 print "}\n";
             }
             $generic++;
-        }
-        else
-        {
+        } else {
             print "div.mainmenu.".$val." {\n";
             print "	background-image: url(".$url.");\n";
             print "}\n";
@@ -2657,7 +2744,7 @@ li.expanded > a.fmdirlia.jqft.ecmjqft {
 /* ============================================================================== */
 div.tabs {
     text-align: <?php print $left; ?>;
-    padding-top: 10px;
+    margin-top: 10px;
     padding-left: 6px;
     padding-right: 6px;
 	clear:both;
@@ -2886,6 +2973,12 @@ div.tabs.nopaddingleft {
 .nopaddingright {
 	padding-<?php print $right; ?>: 0px;
 }
+.nopaddingtopimp {
+	padding-top: 0px !important;
+}
+.nopaddingbottomimp {
+	padding-bottom: 0px !important;
+}
 .notopnoleft {
 	border-collapse: collapse;
 	border: 0px;
@@ -2979,22 +3072,22 @@ td.border, div.tagtable div div.border {
 }
 table.liste, table.noborder, table.formdoc, div.noborder {
 	width: 100%;
-
 	border-collapse: separate !important;
 	border-spacing: 0px;
-
 	border-top-width: <?php echo $borderwidth ?>px;
 	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>);
 	border-top-style: solid;
-	/* border-top-width: 2px;
-	border-top-color: var(--colorbackhmenu1);
-	border-top-style: solid; */
-
-	/*border-bottom-width: 1px;
-	border-bottom-color: rgb(<?php echo $colortopbordertitle1 ?>);
-	border-bottom-style: solid;*/
-
 	margin: 0px 0px 5px 0px;
+
+	/*width: calc(100% - 7px);
+    border-collapse: separate !important;
+    border-spacing: 0px;
+    border-top-width: 0px;
+    border-top-color: rgb(215,215,215);
+    border-top-style: solid;
+    margin: 0px 0px 5px 2px;
+    box-shadow: 1px 1px 5px #ddd;
+    */
 }
 #tablelines {
 	border-bottom-width: 1px;
@@ -3025,6 +3118,10 @@ table.paddingtopbottomonly tr td {
 .liste_titre_filter {
 	background: var(--colorbacktitle1) !important;
 }
+.liste_titre2 {
+    background: var(--colorbackhmenu1) !important;
+    color: #fff;
+}
 table:not(.listwithfilterbefore) tr.liste_titre_filter:first-of-type td.liste_titre {
     padding-top: 5px;
 }
@@ -3116,6 +3213,7 @@ div.refid  {
 	font-weight: bold;
   	color: var(--colortexttitlenotab);
   	font-size: 1.2em;
+  	word-break: break-word;
 }
 div.refidno  {
 	padding-top: 3px;
@@ -3211,11 +3309,7 @@ div.pagination li:first-child span {
   /*border-top-left-radius: 4px;
   border-bottom-left-radius: 4px;*/
 }
-div.pagination li:last-child a,
-div.pagination li:last-child span {
-  /*border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;*/
-}
+
 div.pagination li a:hover,
 div.pagination li:not(.paginationafterarrows,.title-button) span:hover,
 div.pagination li a:focus,
@@ -3268,7 +3362,17 @@ table.hidepaginationprevious .paginationprevious {
 table.hidepaginationnext .paginationnext {
 	display: none;
 }
-
+.tabBar .arearef .pagination.paginationref {
+    max-width: calc(30%);
+}
+.paginationafterarrows a.btnTitlePlus, .titre_right  a.btnTitlePlus {
+    border: 1px solid var(--btncolorborder);
+}
+.paginationafterarrows a.btnTitlePlus:hover span:before, .titre_right a.btnTitlePlus:hover span:before {
+    /* text-shadow: 0px 0px 5px #ccc; */
+    /* filter: invert(0.3); */
+    font-size: 1.07em;
+}
 
 
 /* Set the color for hover lines */
@@ -3290,9 +3394,6 @@ table.hidepaginationnext .paginationnext {
 }
 <?php } ?>
 
-.nohover:hover {
-	background: unset !important;
-}
 .nohoverborder:hover {
 	border: unset;
 	box-shadow: unset;
@@ -3620,8 +3721,8 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
     /* padding: 3px; */
 }
 .boxstats {
-    padding-left: 3px;
-    padding-right: 3px;
+    padding-left: 6px;
+    padding-right: 6px;
     padding-top: 2px;
     padding-bottom: 2px;
     width: 118px;
@@ -3706,8 +3807,10 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 .boxstats:hover {
 	box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.20);
 }
-span.boxstatstext {
+span.boxstatstext span:not(.fas) {
 	opacity: 0.5;
+}
+span.boxstatstext {
     line-height: 18px;
     color: var(--colortext);
 }
@@ -3938,7 +4041,7 @@ div.boximport {
 .product_line_stock_ok { color: #002200; }
 .product_line_stock_too_low { color: #884400; }
 
-.fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor); }
+.fieldrequired { font-weight: bold; color: var(--fieldrequiredcolor) !important; }
 
 td.widthpictotitle { width: 26px; text-align: <?php echo $left; ?>; }
 span.widthpictotitle { font-size: 1.7em; }
@@ -4004,15 +4107,18 @@ div.titre {
 	text-decoration: none;
 	padding-top: 5px;
     padding-bottom: 5px;
+    /* text-transform: capitalize; */
 }
 div.fiche > table.table-fiche-title:first-of-type div {
     color: var(--colortexttitlenotab);
+    font-size: 1.05em;
+    /* text-transform: uppercase; */
     /* font-weight: 600; */
 }
+
 div.titre {
     color: var(--colortexttitlenotab);
 }
-
 .secondary {
     color: var(--colortexttitlenotab);
 }
@@ -4024,7 +4130,7 @@ table.table-fiche-title .col-title div.titre{
 	line-height: 40px;
 }
 table.table-fiche-title {
-	margin-bottom: 5px;
+	margin-bottom: 12px;
 }
 
 
@@ -4044,6 +4150,9 @@ div.backgreypublicpayment { background-color: #f0f0f0; padding: 20px; border-bot
 #tablepublicpayment .CTableRow1  { background-color: #F0F0F0 !important; }
 #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }
 #tablepublicpayment tr.liste_total td { border-top: none; }
+input#cardholder-name {
+    font-size: 1em;
+}
 
 .divmainbodylarge { margin-left: 40px; margin-right: 40px; }
 #divsubscribe { max-width: 900px; }
@@ -4158,7 +4267,7 @@ div.ui-tooltip {
 div.ui-tooltip.mytooltip {
 	border: none !important;
 	padding: 10px 15px;
-	border-radius: 0;
+	border-radius: 4px;
 	margin: 2px;
 	font-stretch: condensed;
 	-moz-box-shadow:   0.5px 0.5px 4px 0px rgba(0, 0, 0, 0.5);
@@ -4168,6 +4277,8 @@ div.ui-tooltip.mytooltip {
 	filter:progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=134, Strength=5);
 	background: var(--tooltipbgcolor) !important;
 	color : var(--tooltipfontcolor);
+	line-height: 1.6em;
+	min-width: 200px;
 }
 
 
@@ -4315,7 +4426,7 @@ span[phptag] {
 	border-bottom: 1px solid #ccc;
 	background: #e6e6e6;
 	display: inline-block;
-	padding: 4px 0 4px 0;
+	padding: 5px 0 5px 0;
 	z-index: 1000;
 }
 .websitebar .buttonDelete, .websitebar .button {
@@ -4401,7 +4512,7 @@ table.cal_month td { padding-left: 1px !important; padding-right: 1px !important
 .cal_other_month_right   { border-right: solid 1px #C0C0C0; }
 .cal_other_month   { /* opacity: 0.6; */ background: #EAEAEA; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past_month    { /* opacity: 0.6; */ background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px !important; }
 .cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today         { background: #FDFDF0; border-left: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today_peruser { background: #FDFDF0; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
@@ -4418,7 +4529,8 @@ table.cal_month td { padding-left: 1px !important; padding-right: 1px !important
 .cal_today_peruser_impair { background: #F8F8F0; }
 .peruser_busy      { }
 .peruser_notbusy   { opacity: 0.5; }
-table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; min-height: 20px; filter: saturate(0.8); }
+div.event { margin-left: 8px; margin-right: 8px; margin-bottom: 8px; margin-top: 4px; border-radius: 4px; box-shadow: 2px 2px 5px rgba(100, 100, 100, 0.2); }
+table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; min-height: 20px; filter: saturate(0.8); border-radius: 3px; }
 table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event td.cal_event { padding: 4px 4px !important; }
 table.cal_event td.cal_event_right { padding: 4px 4px !important; }
@@ -4426,10 +4538,15 @@ table.cal_event td.cal_event_right { padding: 4px 4px !important; }
 .cal_event a:link       { color: #111111; font-weight: normal !important; }
 .cal_event a:visited    { color: #111111; font-weight: normal !important; }
 .cal_event a:active     { color: #111111; font-weight: normal !important; }
-.cal_event_busy a:hover { color: #111111; font-weight: normal !important; color:rgba(255,255,255,.75); }
+.cal_event_notbusy a.cal_event_title:hover { color: #111111; font-weight: normal !important; color:rgba(255,255,255,.75); }
 .cal_event_busy      { }
-.cal_peruserviewname { max-width: 140px; height: 22px; }
+.cal_peruserviewname { max-width: 140px; height: 30px !important; }
+.cal_event span.badge.badge-status { border: 1px solid #aaa; }
 table.cal_month tr td table.nobordernopadding tr td { padding: 0 2px 0 2px; }
+table.cal_month tr.liste_titre td.tdfordaytitle { min-width: 120px; }
+a.dayevent-aday {
+    padding-left: 8px;
+}
 
 .calendarviewcontainertr { height: 100px; }
 
@@ -4510,7 +4627,7 @@ td.cal_other_month {
 /* ============================================================================== */
 
 /* CSS for treeview */
-.treeview ul { background-color: transparent !important; margin-top: 4px; padding-top: 4px !important; }
+.treeview ul { background-color: transparent !important; margin-bottom: 4px !important; margin-top: 0 !important; padding-top: 4px !important; }
 .treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 26px; }
 .treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; }
 .treeview .hitarea { margin-top: 3px; }
@@ -4992,6 +5109,12 @@ div.ecmjqft {
 	right:4px;
 	clear: both;
 }
+#ecm-layout-north {
+	min-height: 40px;
+}
+#ecm-layout-north div.attachareaformuserfileecm {
+    padding-bottom: 0px;
+}
 div#ecm-layout-west {
     width: 380px;
     vertical-align: top;
@@ -5159,16 +5282,18 @@ span#select2-taskid-container[title^='--'] {
 }
 
 span.select2.select2-container.select2-container--default {
+	<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
     border-left: none;
     border-top: none;
     border-right: none;
+    <?php } ?>
 }
 input.select2-input {
 	border-bottom: none ! important;
 }
 .select2-choice {
 	border: none;
-	border-bottom:  solid 1px rgba(0,0,0,.2) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
+	border-bottom: solid 1px var(--inputbordercolor) !important;	/* required to avoid to lose bottom line when focus is lost on select2. */
 }
 .select2-results .select2-highlighted.optionblue {
 	color: #FFF !important;
@@ -5231,19 +5356,23 @@ input.select2-input {
 	box-shadow: none !important;
 }
 .select2-container--open .select2-dropdown--above {
-    border-bottom: solid 1px rgba(0,0,0,.2);
+    border-bottom: solid 1px var(--inputbordercolor);
 }
 .select2-drop.select2-drop-above.select2-drop-active {
 	border-top: 1px solid #ccc;
-	border-bottom: solid 1px rgba(0,0,0,.2);
+	border-bottom: solid 1px var(--inputbordercolor);
 }
 .select2-container--default .select2-selection--single
 {
 	outline: none;
+	<?php if (empty($conf->global->THEME_SHOW_BORDER_ON_INPUT)) { ?>
 	border-top: none;
 	border-left: none;
 	border-right: none;
-	border-bottom: solid 1px rgba(0,0,0,.2);
+	<?php } ?>
+
+	border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
+
 	-webkit-box-shadow: none !important;
 	box-shadow: none !important;
 	border-radius: 0 !important;
@@ -5254,7 +5383,7 @@ input.select2-input {
 	border-right: none;
 }
 .select2-container--default .select2-selection--multiple {
-	border-bottom: solid 1px rgba(0,0,0,.2);
+	border-bottom: solid 1px var(--inputbordercolor);
 	border-top: none;
 	border-left: none;
 	border-right: none;
@@ -5347,6 +5476,9 @@ a span.select2-chosen
 .select2-results {
 	max-height:	400px;
 }
+.select2-results__option {
+	word-break: break-word;
+}
 .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: var(--colorbackvmenu1);
 	background-image: none;
@@ -5401,7 +5533,7 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
 
 /* To emulate select 2 style */
 .select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
-  padding: 2px 5px 1px 5px;
+  padding: 3px 5px 2px 5px;
   margin: 0 0 2px 3px;
   position: relative;
   line-height: 13px;
@@ -5457,7 +5589,8 @@ span.noborderoncategories a, li.noborderoncategories a {
 	vertical-align: top;
 }
 span.noborderoncategories {
-	padding: 3px 5px 0px 5px;
+	padding: 4px 5px 0px 5px;
+	display: inline-block;
 }
 .categtextwhite, .treeview .categtextwhite.hover {
 	color: #fff !important;
@@ -6235,6 +6368,41 @@ div.tabsElem a.tab {
 }
 
 
+/* ============================================================================== */
+/* CSS style for debugbar                                                         */
+/* ============================================================================== */
+
+span.phpdebugbar-tooltip.phpdebugbar-tooltip-extra-wide, span.phpdebugbar-tooltip.phpdebugbar-tooltip-wide {
+    width: 250px !important;
+}
+.phpdebugbar-indicator span.phpdebugbar-tooltip {
+    opacity: .95 !important;
+}
+a.phpdebugbar-tab.phpdebugbar-active {
+	background-image: unset !important;
+}
+.phpdebugbar-indicator .fa {
+	font-family: "Font Awesome 5 Free";
+	font-weight: 600;
+}
+div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-value.phpdebugbar-widgets-warning:before,
+div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-value.phpdebugbar-widgets-error:before,
+div.phpdebugbar-widgets-exceptions a.phpdebugbar-widgets-editor-link:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-duration:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-memory:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-row-count:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-copy-clipboard:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before,
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-render-time:before,
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-memory:before,
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-param-count:before,
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-type:before,
+div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
+{
+	font-family: "Font Awesome 5 Free" !important;
+}
+
 /* ============================================================================== */
 /* CSS style used for jFlot                                                       */
 /* ============================================================================== */
@@ -6247,7 +6415,6 @@ div.tabsElem a.tab {
 }
 
 
-
 /* ============================================================================== */
 /* CSS style used for small screen                                                */
 /* ============================================================================== */
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index e7c8d388aa0..0d3ee436bf4 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -17,14 +17,18 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 	min-height: 90px;
 	/* background: #fff; */
 	width: 100%;
-	box-shadow: 1px 1px 2px rgba(128, 128, 128, 0.2);
+	box-shadow: 1px 1px 15px rgba(192, 192, 192, 0.2);
     border-radius: 2px;
     border: 1px solid #e9e9e9;
 	margin-bottom: 15px;
 }
-.info-box.info-box-sm{
+.info-box.info-box-sm {
     min-height: 80px;
     margin-bottom: 10px;
+    background: #fff;
+}
+.opened-dash-board-wrap .info-box.info-box-sm {
+    border-radius: 0 0 0 20px;
 }
 .info-box-more {
     float: right;
@@ -74,7 +78,12 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 	text-align: center;
 	font-size: 45px;
 	line-height: 90px;
-	background: rgba(0, 0, 0, 0.08) !important
+	background: rgba(0, 0, 0, 0.08) !important;
+}
+
+.info-box-module .info-box-icon {
+    padding-top: 5px;
+    padding-bottom: 5px;
 }
 .info-box-sm .info-box-icon {
     height: 80px;
@@ -82,6 +91,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     font-size: 25px;
     line-height: 92px;
 }
+.opened-dash-board-wrap .info-box-sm .info-box-icon {
+    border-radius: 0 20px 0 20px;
+}
 .opened-dash-board-wrap .info-box-sm .info-box-icon {
     line-height: 80px;
 }
@@ -167,15 +179,21 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	padding: 5px 10px;
 	margin-left: 84px;
 }
-
 .info-box-sm .info-box-content{
     margin-left: 80px;
 }
-/*.info-box-setup span {
-    color: var(--colortexttitlenotab2);
+.info-box-sm .info-box-module-enabled {
+    /* background: linear-gradient(0.35turn, #fff, #fff, #f6faf8, #e4efe8) */
+    background: linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
 }
-.tdsetuppicto span {
-    color: var(--colortexttitlenotab2);
+.info-box-content-warning span.font-status4 {
+	color: #bc9526 !important;
+}
+/*.info-box-sm .info-box-content-warning {
+	background: #ffd7a3;
+}*/
+/*.info-box-icon.info-box-icon-module-enabled {
+    background: #e4f0e4 !important;
 }*/
 
 .info-box-number {
@@ -213,6 +231,8 @@ a.info-box-text{ text-decoration: none;}
 
 
 
+
+
 /* ICONS INFO BOX */
 <?php
 include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -234,27 +254,47 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
     <?php } ?>
 }
 
+.customer-back {
+	background-color: #55955d !important;
+	color: #FFF !important;
+	padding: 2px;
+	margin: 2px;
+	border-radius: 3px;
+}
+.vendor-back {
+	background-color: #599caf !important;
+	color: #FFF !important;
+	padding: 2px;
+	margin: 2px;
+	border-radius: 3px;
+}
+.user-back {
+	background-color: #79633f !important;
+	color: #FFF !important;
+	padding: 2px;
+	margin: 2px;
+	border-radius: 3px;
+}
+
+
+
 .bg-infobox-project{
 	<?php echo $prefix; ?>color: #6c6aa8 !important;
 }
 .bg-infobox-action{
-	<?php echo $prefix; ?>color: #a47080 !important;
+	<?php echo $prefix; ?>color: #b06080 !important;
 }
-.bg-infobox-propal,
-.bg-infobox-facture,
-.bg-infobox-commande{
-	<?php echo $prefix; ?>color: #99a17d !important;
+.bg-infobox-propal, .bg-infobox-facture, .bg-infobox-commande {
+	<?php echo $prefix; ?>color: #55955d !important;
 }
-.bg-infobox-supplier_proposal,
-.bg-infobox-invoice_supplier,
-.bg-infobox-order_supplier{
+.bg-infobox-supplier_proposal, .bg-infobox-invoice_supplier, .bg-infobox-order_supplier {
 	<?php echo $prefix; ?>color: #599caf !important;
 }
 .bg-infobox-contrat, .bg-infobox-ticket{
-	<?php echo $prefix; ?>color: #46a676 !important;
+	<?php echo $prefix; ?>color: #3bbfa8 !important;
 }
 .bg-infobox-bank_account{
-	<?php echo $prefix; ?>color: #b0a53e !important;
+	<?php echo $prefix; ?>color: #b0bb39 !important;
 }
 .bg-infobox-adherent, .bg-infobox-member {
 	<?php echo $prefix; ?>color: #79633f !important;
@@ -273,23 +313,23 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 	color: #6c6aa8 !important;
 }
 .infobox-action{
-	color: #a47080 !important;
+	color: #b06080 !important;
 }
-.infobox-propal,
-.infobox-facture,
-.infobox-commande{
-	color: #99a17d !important;
+.infobox-propal:not(.pictotitle),
+.infobox-facture:not(.pictotitle),
+.infobox-commande:not(.pictotitle) {
+	color: #65955d !important;
 }
-.infobox-supplier_proposal,
-.infobox-invoice_supplier,
-.infobox-order_supplier{
+.infobox-supplier_proposal:not(.pictotitle),
+.infobox-invoice_supplier:not(.pictotitle),
+.infobox-order_supplier:not(.pictotitle){
 	color: #599caf !important;
 }
 .infobox-contrat, .infobox-ticket{
-	color: #46a676 !important;
+	color: #3bbfa8 !important;
 }
 .infobox-bank_account{
-	color: #b0a53e !important;
+	color: #b0bb39 !important;
 }
 .infobox-adherent, .infobox-member {
 	color: #79633f !important;
@@ -346,23 +386,23 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 }
 .fa-weather-level0:before{
 	content: "\f185";
-	color : #cccccc;
+	color : #cfbf00;
 }
 .fa-weather-level1:before{
 	content: "\f6c4";
-	color : #cccccc;
+	color : #bc9526;
 }
 .fa-weather-level2:before{
-	content: "\f0c2";
-	color : #cccccc;
+	content: "\f743";
+	color : #b16000;
 }
 .fa-weather-level3:before{
 	content: "\f740";
-	color : #cccccc;
+	color : #b04000;
 }
 .fa-weather-level4:before{
 	content: "\f0e7";
-	color : #b91f1f;
+	color : #b01000;
 }
 
 
@@ -409,7 +449,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 
 
 .info-box-module .info-box-content {
-	height: 6.4em;
+	height: 98px;
 }
 /* Disabled. This break the responsive on smartphone
 .box{
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index 2286f19e355..fbccc810fe7 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -16,6 +16,9 @@
 	color: #<?php echo $colortextbackhmenu; ?>;
 }
 
+.fa-15x {
+    font-size: 1.5em;
+}
 
 div.mainmenu.menu {
 	background-image: none;
@@ -149,7 +152,7 @@ div.mainmenu.generic4::before {
 	opacity: 0.7;
 	color: #440;
 }
-.fa-at, .fa-external-link-alt {
+.fa-at, .fa-external-link-alt, .fa-share-alt {
 	opacity: 0.7;
 	color: #304;
 }
diff --git a/htdocs/theme/eldy/manifest.json.php b/htdocs/theme/eldy/manifest.json.php
index bc6262d1a92..d7f01b3375e 100644
--- a/htdocs/theme/eldy/manifest.json.php
+++ b/htdocs/theme/eldy/manifest.json.php
@@ -41,6 +41,8 @@ require_once __DIR__.'/../../main.inc.php';
 $appli = constant('DOL_APPLICATION_TITLE');
 if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
 
+top_httphead('text/json');
+
 ?>
 {
     "name": "<?php echo $appli; ?>",
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 526846f8a19..59aaf0ecc2c 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -31,8 +31,8 @@ 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('NOREQUIREMENU'))   define('NOREQUIREMENU',1);  // We need top menu content
+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');
 
@@ -55,6 +55,10 @@ if (empty($user->id) && !empty($_SESSION['dol_login']))
 {
     $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();
 }
 
 
@@ -66,6 +70,7 @@ else header('Cache-Control: no-cache');
 
 if (GETPOST('theme', 'alpha')) $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
 if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
+if (GETPOST('THEME_DARKMODEENABLED', 'int')) $conf->global->THEME_DARKMODEENABLED = GETPOST('THEME_DARKMODEENABLED', 'int'); // If darkmode was forced on URL
 
 $langs->load("main", 0, 1);
 $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
@@ -154,24 +159,20 @@ else $colortextbackhmenu = '000000';
 $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackvmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; }
-else { $colortextbackvmenu = '000000'; }
+if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; } else { $colortextbackvmenu = '000000'; }
 
 $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
 $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'; }
-}
-else $colorshadowtitle = '888888';
+    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'
 $tmppart = explode(',', $colorbacktabcard1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; }
-else { $colortextbacktab = '000000'; }
+if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; } else { $colortextbacktab = '000000'; }
 
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
@@ -193,6 +194,7 @@ $colortext = join(',', colorStringToArray($colortext));
 $colortextlink = join(',', colorStringToArray($colortextlink));
 
 $nbtopmenuentries = $menumanager->showmenu('topnb');
+
 if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10);
 
 
@@ -203,7 +205,7 @@ $disableimages = 0;
 $maxwidthloginblock = 180;
 if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = $maxwidthloginblock + 50; $minwidthtmenu = 0; }
 
-
+if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
 if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
 if (!empty($conf->bookmark->enabled)) { $maxwidthloginblock = $maxwidthloginblock + 55; }
 
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 18f0cbfa135..293dc6a2c39 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -40,9 +40,7 @@ if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php p
 		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
-		}
-		else
-		{
+		} else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
@@ -67,13 +65,13 @@ $colorbacklinepairhover = '230,237,244'; // line hover
 $colorbacklinepairchecked = '230,237,244'; // line checked
 $colorbacklinebreak = '248,247,244'; // line break
 $colorbackbody = '255,255,255';
-$colortexttitlenotab = '0,123,140'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,123,140, violet: 0,50,120
+$colortexttitlenotab = '10,120,140'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,123,140, violet: 0,50,120
 $colortexttitlenotab2 = '100,0,100'; // 150,90,121 140,80,10 or 10,140,80  #875a7b  green=0,123,140, violet: 0,50,120
 $colortexttitle = '0,0,0';
 $colortexttitlelink = '10, 20, 100';
 $colortext = '0,0,0';
 $colortextlink = '10, 20, 100';
-$fontsize = '0.86em';
+$fontsize = '0.90em';
 $fontsizesmaller = '0.75em';
 $topMenuFontSize = '1.1em';
 $toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
@@ -89,11 +87,11 @@ $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested wit
 
 // Badges colors
 $badgePrimary   = '#007bff';
-$badgeSecondary = '#cccccc';
+$badgeSecondary = '#aaaabb';
+$badgeInfo      = '#aaaabb';
 $badgeSuccess   = '#55a580';
 $badgeWarning   = '#bc9526'; // See $textWarning bc9526
 $badgeDanger    = '#9f4705'; // See $textDanger
-$badgeInfo      = '#aaaabb';
 $badgeDark      = '#343a40';
 $badgeLight     = '#f8f9fa';
 
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
index 22e9dee6917..1ce2d912669 100644
--- a/htdocs/theme/md/badges.inc.php
+++ b/htdocs/theme/md/badges.inc.php
@@ -26,6 +26,18 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     font-size: 1em;
     padding: .19em .35em;			/* more than 0.19 generate a change into heigth of lines */
 }
+.tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
+    font-size: 1.1em;
+    padding: .4em .4em;
+}
+/* Force values for small screen 767 */
+@media only screen and (max-width: 767px)
+{
+	.tabBar .arearef .statusref .badge-status, .tabBar .arearefnobottom .statusref .badge-status {
+	    font-size: 0.95em;
+	    padding: .3em .2em;
+	}
+}
 
 .badge-pill, .tabs .badge {
     padding-right: .5em;
@@ -36,7 +48,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 .badge-dot {
     padding: 0;
     border-radius: 50%;
-    padding: 0.35em;
+    padding: 0.45em;
     vertical-align: unset;
 }
 
@@ -120,6 +132,17 @@ a.badge-warning:focus, a.badge-warning:hover {
     background-color: <?php print colorDarker($badgeWarning, 10); ?>;
 }
 
+/* WARNING colorblind */
+body[class*="colorblind-"] .badge-warning {
+	  background-color: <?php print $colorblind_deuteranopes_badgeWarning; ?>;
+  }
+body[class*="colorblind-"] a.badge-warning.focus,body[class^="colorblind-"] a.badge-warning:focus {
+	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($colorblind_deuteranopes_badgeWarning, 0.5); ?>;
+}
+body[class*="colorblind-"] a.badge-warning:focus, a.badge-warning:hover {
+	background-color: <?php print colorDarker($colorblind_deuteranopes_badgeWarning, 10); ?>;
+}
+
 /* INFO */
 .badge-info {
     color: #fff !important;
@@ -163,10 +186,9 @@ a.badge-dark:focus, a.badge-dark:hover {
 }
 
 
-/*
- * STATUS BADGES
- */
-<?php for ($i = 0; $i <= 9; $i++) {
+/* STATUS BADGES */
+<?php
+for ($i = 0; $i <= 9; $i++) {
 	/* Default Status */
 	_createStatusBadgeCss($i, '', "STATUS".$i);
 
@@ -174,6 +196,9 @@ a.badge-dark:focus, a.badge-dark:hover {
 	_createStatusBadgeCss($i, 'colorblind_deuteranopes_', "COLORBLIND STATUS".$i, 'body[class*="colorblind-"] ');
 }
 
+_createStatusBadgeCss('1b', '', "STATUS1b");
+_createStatusBadgeCss('4b', '', "STATUS4b");
+
 /**
  * Create status badge
  *
@@ -190,27 +215,28 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 	if (!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
 		print "\n/* ".strtoupper($commentLabel)." */\n";
+
 		$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix.'badgeStatus'.$statusName};
 
 
-		$TBadgeBorderOnly = array(0, 3, 5, 7);
+		$TBadgeBorderOnly = array('0', '1b', '3', '4b', '5', '7');
 		$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix.'badgeStatus'.$statusName}) ? '#212529' : '#ffffff';
 
 		if (!empty(${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName})) {
 			$thisBadgeTextColor = ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
 		}
 
-		if (in_array($statusName, $TBadgeBorderOnly)) {
+		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
 			$thisBadgeTextColor = '#212529';
 			$thisBadgeBackgroundColor = "#fff";
 		}
 
-		if (in_array($statusName, array(0, 5, 9))) $thisBadgeTextColor = '#999999';
-		if (in_array($statusName, array(6))) $thisBadgeTextColor = '#777777';
+		if (in_array((string) $statusName, array('0', '5', '9'))) $thisBadgeTextColor = '#999999';
+		if (in_array((string) $statusName, array('6'))) $thisBadgeTextColor = '#777777';
 
 		print $cssPrefix.".badge-status".$statusName." {\n";
 		print "        color: ".$thisBadgeTextColor." !important;\n";
-		if (in_array($statusName, $TBadgeBorderOnly)) {
+		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
 			print "        border-color: ".$thisBadgeBorderColor.";\n";
 		}
 		print "        background-color: ".$thisBadgeBackgroundColor.";\n";
@@ -227,8 +253,8 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 		print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
 		print "    color: ".$thisBadgeTextColor." !important;\n";
-		print "    background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n";
-		if (in_array($statusName, $TBadgeBorderOnly)) {
+		//print "    background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n";
+		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
 			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
 		}
 		print "}\n";
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 06999ae8de8..1982fb113b9 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -2,7 +2,40 @@
 if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 /* <style type="text/css" > */
 
+:root {
+            --btncolortext:rgb(<?php print $colortextlink; ?>);
+            --btncolorbg: #fbfbfb;
+            --btncolorborderhover: none;
+            --btncolorborder: #FFF;
+            --butactiondeletebg: rgb(234,228,225);
+            /* tertiary color */
+            /* --butactionbg:rgb(218, 235, 225); */
+            /* --butactionbg:rgb(228, 218, 235); */
+            --butactionbg:rgb(118, 145, 225);
+}
 
+<?php
+if (!empty($conf->global->THEME_DARKMODEENABLED)) {
+	print "/* For dark mode */\n";
+	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+		print "@media (prefers-color-scheme: dark) {";
+	}
+	print "
+      :root {
+
+            --btncolortext: ;
+            --btncolorbg: rgb(26,27,27);
+            --btncolorborderhover: #ffffff;
+            --btncolorborder: #2b2c2e;
+            --butactionbg:rgb(173,140,79);
+            --butactiondeletebg: rgb(252,84,91);
+
+      }\n";
+	if ($conf->global->THEME_DARKMODEENABLED != 2) {
+		print "}";
+	}
+}
+?>
 
 /* ============================================================================== */
 /* Buttons for actions                                                            */
@@ -11,19 +44,61 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
 
 div.divButAction {
 	margin-bottom: 1.4em;
-	vertical-align: top;
 }
 div.tabsAction > a.butAction, div.tabsAction > a.butActionRefused, div.tabsAction > a.butActionDelete,
 div.tabsAction > span.butAction, div.tabsAction > span.butActionRefused, div.tabsAction > span.butActionDelete {
 	margin-bottom: 1.4em !important;
 }
+div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefused {
+    margin-bottom: 0 !important;
+}
 
 span.butAction, span.butActionDelete {
 	cursor: pointer;
 }
 
+.butAction {
+    background: var(--butactionbg);
+    color: #FFF !important;
+    border-radius: 3px;
+    /* background: rgb(230, 232, 239); */
+}
+.butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
+    text-decoration: none;
+    text-transform: uppercase;
+    font-weight: bold;
 
-.button, .buttonDelete, .butAction, .butActionDelete, .butActionRefused, .butActionNewRefused {
+    margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.9'); ?>em;
+    padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;
+    font-family: <?php print $fontlist ?>;
+    display: inline-block;
+    text-align: center;
+    cursor: pointer;
+    /* color: #fff; */
+    /* background: rgb(<?php echo $colorbackhmenu1 ?>); */
+    color: #444;
+    /* border: 1px solid #aaa; */
+    /* border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); */
+
+    /*border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+    border-top-left-radius: 0 !important;
+    border-bottom-left-radius: 0 !important;*/
+}
+.butActionNew, .butActionNewRefused, .butActionNew:link, .butActionNew:visited, .butActionNew:hover, .butActionNew:active {
+    text-decoration: none;
+    text-transform: uppercase;
+    font-weight: normal;
+
+    margin: 0em 0.3em 0 0.3em !important;
+    padding: 0.2em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em 0.3em;
+    font-family: <?php print $fontlist ?>;
+    display: inline-block;
+    /* text-align: center; New button are on right of screen */
+    cursor: pointer;
+}
+
+.button {
 	border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
 	display: inline-block;
 	padding: 0.4em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
@@ -92,7 +167,7 @@ span.butActionNewRefused>span.fa-list-alt, span.butActionNewRefused>span.fa-list
 	padding-left: 0px;
 }
 
-.button, .butAction {
+.button {
 	color: #ffffff !important;
 	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 	background-color: #006dcc;
@@ -105,7 +180,7 @@ span.butActionNewRefused>span.fa-list-alt, span.butActionNewRefused>span.fa-list
 	border-color: #0044cc #0044cc #002a80;
 	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
 }
-.button:disabled, .butAction:disabled {
+.button:disabled {
 	color: #666 !important;
 	text-shadow: none;
 	border-color: #555;
@@ -124,37 +199,73 @@ button.ui-button {
 	padding-top: 5px;
 }
 
-.butActionDelete, .buttonDelete {
-	color: #ffffff !important;
-	text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	background-color: #cc6d00;
-	background-image: -moz-linear-gradient(top, #cc8800, #cc4400);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400));
-	background-image: -webkit-linear-gradient(top, #cc8800, #cc4400);
-	background-image: -o-linear-gradient(top, #cc8800, #cc4400);
-	background-image: linear-gradient(to bottom, #cc8800, #cc4400);
-	background-repeat: repeat-x;
-	border-color: #cc4400 #cc4400 #802a00;
-	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-}
-a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
-	color: #FFFFFF;
+a.butActionNew>span.fa, a.butActionNew>span.fa:hover,
+span.butActionNew>span.fa, span.butActionNew>span.fa:hover,
+a.butActionNewRefused>span.fa, a.butActionNewRefused>span.fa:hover,
+span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
+{
+	padding-<?php echo $left; ?>: 6px;
+	font-size: 1.5em;
+	border: none;
+	box-shadow: none; webkit-box-shadow: none;
 }
 
-.butActionRefused, .butActionNewRefused {
-	color: #AAAAAA !important;
-	cursor: not-allowed !important;
+.butAction:hover   {
+    -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+    box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+}
+.butActionNew:hover   {
+    text-decoration: underline;
+    box-shadow: unset !important;
 }
 
-a.butAction:hover, a.butActionDelete:hover, a.butActionRefused:hover {
-	text-decoration: none;
+.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete {
+    background: var(--butactiondeletebg);
+    /* border: 1px solid #633; */
+    color: #633;
 }
-a.butActionNewRefused:hover {
-	border-color: unset !important;
-	border: 1px solid #bbbbbb;
+
+.butActionDelete:hover {
+    -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
+    box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1);
 }
-a.butAction:hover, a.butActionNew:hover, a.butActionDelete:hover {
-	opacity: 0.9;
+
+.butActionRefused {
+    text-decoration: none !important;
+    text-transform: uppercase;
+    font-weight: bold !important;
+
+    white-space: nowrap !important;
+    cursor: not-allowed !important;
+    margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.9'); ?>em;
+    padding: 0.6em <?php echo ($dol_optimize_smallscreen ? '0.6' : '0.7'); ?>em;
+    font-family: <?php print $fontlist ?> !important;
+    display: inline-block;
+    text-align: center;
+    cursor: pointer;
+    color: #999 !important;
+    border: 1px solid #ccc;
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+.butActionNewRefused, .butActionNewRefused:link, .butActionNewRefused:visited, .butActionNewRefused:hover, .butActionNewRefused:active {
+    text-decoration: none !important;
+    text-transform: uppercase;
+    font-weight: normal !important;
+
+    white-space: nowrap !important;
+    cursor: not-allowed !important;
+    margin: 0em <?php echo ($dol_optimize_smallscreen ? '0.7' : '0.9'); ?>em;
+    padding: 0.2em <?php echo ($dol_optimize_smallscreen ? '0.4' : '0.7'); ?>em;
+    font-family: <?php print $fontlist ?> !important;
+    display: inline-block;
+    /* text-align: center;  New button are on right of screen */
+    cursor: pointer;
+    color: #999 !important;
+    padding-top: 0.2em;
+    box-shadow: none !important;
+    -webkit-box-shadow: none !important;
 }
 
 .butActionTransparent {
@@ -167,6 +278,10 @@ a.butAction:hover, a.butActionNew:hover, a.butActionDelete:hover {
 TITLE BUTTON
  */
 
+div.pagination li:first-child a.btnTitle {
+    margin-left: 10px;
+}
+
 .btnTitle, a.btnTitle {
     display: inline-block;
     padding: 6px 12px;
@@ -196,6 +311,11 @@ TITLE BUTTON
     background-color: #fbfbfb;
 }
 
+a.btnTitle.btnTitleSelected {
+    border: 1px solid #ccc;
+    border-radius: 3px;
+}
+
 .btnTitle > .btnTitle-icon{
 
 }
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index b86b935c5d1..a8d2f77498d 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -218,7 +218,7 @@ a.top-menu-dropdown-link {
 
 
 .dropdown-menu .dropdown-header{
-    padding: 5px 10px 10px 10px;
+    padding: 8px 10px 10px 10px;
 }
 
 .dropdown-menu > .user-footer {
@@ -232,6 +232,8 @@ a.top-menu-dropdown-link {
 
 
 .dropdown-menu > .bookmark-footer{
+    border-top: 1px solid #f0f0f0;
+    background-color: #f9f9f9;
     padding: 10px;
 }
 
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 966717e3ca8..9b4b0618dd9 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -19,6 +19,29 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 
 ?>
 
+.customer-back {
+	background-color: #99a17d !important;
+	color: #FFF !important;
+	padding: 2px;
+	margin: 2px;
+	border-radius: 3px;
+}
+.vendor-back {
+	background-color: #599caf !important;
+	color: #FFF !important;
+	padding: 2px;
+	margin: 2px;
+	border-radius: 3px;
+}
+.user-back {
+	background-color: #79633f !important;
+	color: #FFF !important;
+	padding: 2px;
+	margin: 2px;
+	border-radius: 3px;
+}
+
+
 .bg-infobox-project{
 	<?php echo $prefix; ?>color: #6c6aa8 !important;
 }
@@ -267,6 +290,9 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	font-weight: bold;
 	margin-bottom: 6px;
 }
+.info-box-title {
+    width: calc(100% - 20px);
+}
 .info-box-text{
 	font-size: 0.92em;
 }
@@ -369,25 +395,26 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 }
 .fa-weather-level0:before{
 	content: "\f185";
-	color : #000000;
+	color : #cfbf00;
 }
 .fa-weather-level1:before{
 	content: "\f6c4";
-	color : #000000;
+	color : #bc9526;
 }
 .fa-weather-level2:before{
-	content: "\f0c2";
-	color : #000000;
+	content: "\f743";
+	color : #b16000;
 }
 .fa-weather-level3:before{
 	content: "\f740";
-	color : #000000;
+	color : #b04000;
 }
 .fa-weather-level4:before{
 	content: "\f0e7";
-	color : #000000;
+	color : #b01000;
 }
 
+
 /* USING IMAGES FOR WEATHER INTEAD OF FONT AWESOME */
 /* For other themes just uncomment this part */
 /*.info-box-weather-level0,
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index a1e9b4d6449..3aa45726975 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -16,7 +16,9 @@
 	color: #<?php echo $colortextbackhmenu; ?>;
 }
 
-
+.fa-15x {
+    font-size: 1.5em;
+}
 
 div.mainmenu.ticket::before {
     content: "\f3ff";
@@ -42,3 +44,56 @@ div.mainmenu.generic3::before {
 div.mainmenu.generic4::before {
     content: "\f249";
 }
+
+/* Define color of some picto */
+
+.fa-phone, .fa-mobile-alt, .fa-fax {
+	opacity: 0.7;
+	color: #440;
+}
+.fa-at, .fa-external-link-alt, .fa-share-alt {
+	opacity: 0.7;
+	color: #304;
+}
+.fa-trash {
+	color: #666;
+}
+.fa-trash:hover:before {
+	color: #800;
+}
+.fa-play {
+	color: #444;
+}
+.fa-unlink {
+	color: #555;
+}
+
+/* Define square Dolibarr logo in pure CSS */
+
+.fa-dolibarr-css{
+	color: #235481;
+	background: currentColor;
+	height: 150px;
+	width: 150px;
+	position: relative;
+}
+.fa-dolibarr-css:before{
+	content: '';
+	position: absolute;
+	left: 19%;
+	top: 17%;
+	width: 25%;
+	height: 25%;
+	border: solid 30px white;
+	border-radius: 0% 200% 200% 0% / 0% 180% 180% 0%;
+}
+.fa-dolibarr-css:after{
+	content: '';
+	position: absolute;
+	left: 19%;
+	top: 17%;
+	width: 5px;
+	height: 25%;
+	border-bottom: solid 60px currentColor;
+	margin-left: 30px;
+}
diff --git a/htdocs/theme/md/manifest.json.php b/htdocs/theme/md/manifest.json.php
index e3423149e30..33a5fcddb52 100644
--- a/htdocs/theme/md/manifest.json.php
+++ b/htdocs/theme/md/manifest.json.php
@@ -41,6 +41,8 @@ require_once __DIR__.'/../../main.inc.php';
 $appli=constant('DOL_APPLICATION_TITLE');
 if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
 
+top_httphead('text/json');
+
 ?>
 {
     "name": "<?php echo $appli; ?>",
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3b690993c5d..fb05def28da 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -56,6 +56,10 @@ if (empty($user->id) && !empty($_SESSION['dol_login']))
 {
 	$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();
 }
 
 
@@ -157,24 +161,20 @@ else $colortextbackhmenu = '000000';
 $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbackvmenu1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; }
-else { $colortextbackvmenu = '000000'; }
+if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; } else { $colortextbackvmenu = '000000'; }
 
 $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
 $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 = '101010'; $colorshadowtitle = 'FFFFFF'; }
-}
-else $colorshadowtitle = '888888';
+	if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF'; }
+} else $colorshadowtitle = '888888';
 
 $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
 $tmppart = explode(',', $colorbacktabcard1);
 $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
-if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; }
-else { $colortextbacktab = '111111'; }
+if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; } else { $colortextbacktab = '111111'; }
 
 // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1));
@@ -456,6 +456,9 @@ input.buttonpaymentstripe {
 	background-repeat: no-repeat;
 	background-position: 8px 7px;
 }
+.logopublicpayment #dolpaymentlogo {
+	max-height: 100px;
+}
 a.buttonticket {
 	padding-left: 5px;
 	padding-right: 5px;
@@ -637,10 +640,17 @@ div.floatright
 {
     float:<?php print $right; ?>;
 }
+.block
+{
+	display:block;
+}
 .inline-block
 {
 	display:inline-block;
 }
+.largenumber {
+    font-size: 1.4em;
+}
 
 th .button {
     -webkit-box-shadow: none !important;
@@ -782,6 +792,11 @@ textarea.centpercent {
     font-size: 0.85em;
     opacity: 0.7;
 }
+.longmessagecut {
+    max-height: 250px;
+    max-width: 100%;
+    overflow-y: auto;
+}
 
 .text-warning{
     color : <?php print $textWarning; ?>
@@ -874,6 +889,34 @@ if ($conf->browser->layout == 'phone') {
    	white-space: nowrap;
 }
 <?php } ?>
+
+
+.a-filter, .a-mesure {
+    border-radius: 50px;
+    background: var(--colortexttitlenotab);
+    color: #fff;
+    padding: 8px 10px 8px 6px;
+}
+.a-filter:before {
+    content: "\f0b0";
+}
+.a-mesure:before {
+    content: "\f080";
+}
+.a-filter:before, .a-mesure:before {
+	font-family: "Font Awesome 5 Free";
+	font-weight: 600;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+.a-filter-disabled, .a-mesure-disabled {
+    border-radius: 50px;
+    background: var(--colorbacktitle1);
+    padding: 8px;
+    opacity: 0.6;
+}
+
+
 div.confirmmessage {
 	padding-top: 6px;
 }
@@ -962,6 +1005,12 @@ select.flat.selectlimit {
     text-overflow: ellipsis;
     white-space: nowrap;
 }
+.tdoverflowmax100imp {			/* For tdoverflow, the max-midth become a minimum ! */
+    max-width: 100px !important;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 .tdoverflowmax150 {			/* For tdoverflow, the max-midth become a minimum ! */
     max-width: 150px;
     overflow: hidden;
@@ -1160,12 +1209,14 @@ table[summary="list_of_modules"] .fa-cog {
 .maxwidth125 { max-width: 125px; }
 .maxwidth150 { max-width: 150px; }
 .maxwidth200 { max-width: 200px; }
+.maxwidth250 { max-width: 250px; }
 .maxwidth300 { max-width: 300px; }
 .maxwidth400 { max-width: 400px; }
 .maxwidth500 { max-width: 500px; }
 .maxwidth50imp  { max-width: 50px !important; }
 .maxwidth75imp  { max-width: 75px !important; }
 .minheight20 { min-height: 20px; }
+.minheight30 { min-height: 30px; }
 .minheight40 { min-height: 40px; }
 .titlefieldcreate { width: 20%; }
 .titlefield       { /* width: 25%; */ width: 250px; }
@@ -1227,6 +1278,8 @@ table[summary="list_of_modules"] .fa-cog {
 	div.refidno {
 		font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?> !important;
 	}
+
+	.clearbothonsmartphone { clear: both; display: block; }
 }
 
 /* Force values for small screen 570 */
@@ -1413,6 +1466,22 @@ td.showDragHandle {
 <?php } ?>
 }
 
+/* DOL_XXX For having horizontal scroll into array (like with smartphone) */
+
+.classforhorizontalscrolloftabs #id-container {
+	width: 100%;
+}
+.classforhorizontalscrolloftabs .side-nav {
+	display: block;
+	float: left;
+}
+.classforhorizontalscrolloftabs #id-right {
+	width:calc(100% - 210px);
+	display: inline-block;
+}
+
+
+
 .side-nav {
 <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
 	display: none;
@@ -1465,9 +1534,10 @@ td.showDragHandle {
 ?>
 }
 
-/*
-*	Slide animation
-*/
+
+/**
+ *	Slide animation
+ */
 .side-nav-vert, #id-right {
 	transition: padding-left 0.5s ease, margin-left 0.5s ease;
 }
@@ -2150,9 +2220,7 @@ div.mainmenu.website {
 		        print 'div.mainmenu.'.$val.'::before {
 	                    content: "\f249";
 	                }';
-		    }
-		    else
-		    {
+		    } 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);
@@ -2161,9 +2229,7 @@ div.mainmenu.website {
 		        print "}\n";
 	    	}
 	    	$generic++;
-		}
-		else
-		{
+		} else {
 			print "div.mainmenu.".$val." {\n";
 			print "	background-image: url(".$url.");\n";
 			print "}\n";
@@ -2889,6 +2955,12 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
 .nopaddingright {
 	padding-<?php print $right; ?>: 0px;
 }
+.nopaddingtopimp {
+	padding-top: 0px !important;
+}
+.nopaddingbottomimp {
+	padding-bottom: 0px !important;
+}
 .notopnoleft {
 	border-collapse: collapse;
 	border: 0px;
@@ -3227,6 +3299,14 @@ table.hidepaginationprevious .paginationprevious {
 table.hidepaginationnext .paginationnext {
 	display: none;
 }
+.paginationafterarrows a.btnTitlePlus {
+    border: 1px solid var(--btncolorborder);
+}
+.paginationafterarrows a.btnTitlePlus:hover span:before {
+    /* text-shadow: 0px 0px 5px #ccc; */
+    /* filter: invert(0.3); */
+    font-size: 1.03em;
+}
 
 
 /* Prepare to remove class pair - impair
@@ -3922,10 +4002,14 @@ div.titre {
 	text-decoration: none;
 	padding-top: 5px;
     padding-bottom: 5px;
+    text-transform: uppercase;
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 	<?php print (empty($conf->dol_optimize_smallscreen) ? '' : 'margin-top: 4px;'); ?>
 }
-.secondary, div.titre {
+div.titre {
+	color: var(--colortexttitlenotab);
+}
+.secondary {
 	color: var(--colortexttitlenotab);
 }
 .tertiary {
@@ -4073,17 +4157,20 @@ div.ui-tooltip {
 	max-width: <?php print dol_size(600, 'width'); ?>px !important;
 }
 
-.mytooltip {
+div.ui-tooltip.mytooltip {
 	width: <?php print dol_size(450, 'width'); ?>px;
 	border-top: solid 1px #BBBBBB;
 	border-<?php print $left; ?>: solid 1px #BBBBBB;
 	border-<?php print $right; ?>: solid 1px #444444;
 	border-bottom: solid 1px #444444;
-	padding: 5px 20px;
+	padding: 10px 20px;
 	border-radius: 0;
 	box-shadow: 0 0 4px grey;
 	margin: 2px;
 	font-stretch: condensed;
+	/*background: var(--tooltipbgcolor) !important;
+	color : var(--tooltipfontcolor);*/
+	line-height: 1.6em;
 }
 
 
@@ -4336,6 +4423,7 @@ table.cal_month td:last-child   { border-right: 0px; }
 .cal_today_peruser_impair { background: #F8F8F0; }
 .peruser_busy      { background: #CC8888; }
 .peruser_notbusy   { background: #EEDDDD; opacity: 0.5; }
+div.event { margin: 8px; border-radius: 4px; box-shadow: 2px 2px 5px rgba(100, 100, 100, 0.2); }
 table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 3px; border-radius: 3px; min-height: 20px;	}
 table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event td.cal_event { padding: 4px 4px !important; }
@@ -5239,6 +5327,9 @@ a span.select2-chosen
 .select2-results {
 	max-height:	400px;
 }
+.select2-results__option {
+	word-break: break-word;
+}
 .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: #FFFFFF;
 	background-image: none;
@@ -6137,6 +6228,41 @@ border-top-right-radius: 6px;
 }
 
 
+/* ============================================================================== */
+/* CSS style for debugbar                                                         */
+/* ============================================================================== */
+
+span.phpdebugbar-tooltip.phpdebugbar-tooltip-extra-wide, span.phpdebugbar-tooltip.phpdebugbar-tooltip-wide {
+    width: 250px !important;
+}
+.phpdebugbar-indicator span.phpdebugbar-tooltip {
+    opacity: .95 !important;
+}
+a.phpdebugbar-tab.phpdebugbar-active {
+	background-image: unset !important;
+}
+.phpdebugbar-indicator .fa {
+	font-family: "Font Awesome 5 Free";
+	font-weight: 600;
+}
+div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-value.phpdebugbar-widgets-warning:before,
+div.phpdebugbar-widgets-messages li.phpdebugbar-widgets-list-item span.phpdebugbar-widgets-value.phpdebugbar-widgets-error:before,
+div.phpdebugbar-widgets-exceptions a.phpdebugbar-widgets-editor-link:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-database:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-duration:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-memory:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-row-count:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-copy-clipboard:before,
+div.phpdebugbar-widgets-sqlqueries span.phpdebugbar-widgets-stmt-id:before,
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-render-time:before,
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-memory:before,
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-param-count:before,
+div.phpdebugbar-widgets-templates span.phpdebugbar-widgets-type:before,
+div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
+{
+	font-family: "Font Awesome 5 Free" !important;
+}
+
 /* ============================================================================== */
 /* CSS style used for jFlot                                                       */
 /* ============================================================================== */
@@ -6328,11 +6454,11 @@ if (is_object($db)) $db->close();
 ::-webkit-scrollbar {
 	width: 12px;
 }
-::-webkit-scrollbar-button {
-	background: #aaa;
-}
+/*::-webkit-scrollbar-button {
+	background: #bbb;
+}*/
 ::-webkit-scrollbar-track-piece {
-	background: #fff;
+	background: #f4f4f4;
 }
 ::-webkit-scrollbar-thumb {
 	background: #ddd;
diff --git a/htdocs/theme/md/theme_vars.inc.php b/htdocs/theme/md/theme_vars.inc.php
index ffad2cc66b5..fdf62ffb1bf 100644
--- a/htdocs/theme/md/theme_vars.inc.php
+++ b/htdocs/theme/md/theme_vars.inc.php
@@ -36,9 +36,7 @@ if (!defined('ISLOADEDBYSTEELSHEET'))	// File is run after an include of a php p
 		if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
 		{
 			$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
-		}
-		else
-		{
+		} else {
 			// for now we use the same configuration for all types of color blind
 			$theme_datacolor = array(array(248, 220, 1), array(9, 85, 187), array(42, 208, 255), array(0, 0, 0), array(169, 169, 169), array(253, 102, 136), array(120, 154, 190), array(146, 146, 55), array(0, 52, 251), array(196, 226, 161), array(222, 160, 41), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
 		}
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 2c473a9de54..13874eb7ecb 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -56,9 +56,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -237,6 +235,8 @@ if (!empty($object->id))
 
 	$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'));
 
     // Show link to add a message (if read and not closed)
     $btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
@@ -248,7 +248,6 @@ if (!empty($object->id))
 	$url = dol_buildpath('/comm/action/card.php', 1).'?action=create&datep='.date('YmdHi').'&origin=ticket&originid='.$object->id.'&projectid='.$object->fk_project.'&backtopage='.urlencode($_SERVER["PHP_SELF"]);
 	$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', $url, 'add-new-ticket-even-button', $btnstatus);
 
-
 	print_barre_liste($langs->trans("ActionsOnTicket"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 
 	// List of all actions
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 076c42867ca..e4474731829 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -55,8 +55,8 @@ $action    = GETPOST('action', 'aZ09');
 
 $notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 
 if (GETPOST('actioncode', 'array')) {
     $actioncode = GETPOST('actioncode', 'array', 3);
@@ -78,7 +78,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
@@ -127,6 +127,7 @@ $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');
 
+$error = 0;
 if (empty($reshook)) {
 	// 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{
@@ -137,7 +138,7 @@ if (empty($reshook)) {
 
 	if ($cancel) {
 		if (!empty($backtopage)) {
-			header("Location: " . $backtopage);
+			header("Location: ".$backtopage);
 			exit;
 		}
 
@@ -157,6 +158,8 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")), null, 'errors');
 			$action = 'create';
 		}
+		$ret = $extrafields->setOptionalsFromPost(null, $object);
+		if ($ret < 0)	$error++;
 
 		if (!$error) {
 			$db->begin();
@@ -167,19 +170,21 @@ if (empty($reshook)) {
 			$object->message = GETPOST("message", 'restricthtml');
 
 			$object->type_code = GETPOST("type_code", 'alpha');
+			$object->type_label = $langs->trans($langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label'));
 			$object->category_code = GETPOST("category_code", 'alpha');
+			$object->category_label = $langs->trans($langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label'));
 			$object->severity_code = GETPOST("severity_code", 'alpha');
+			$object->severity_label = $langs->trans($langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label'));
+			$object->email_from = $user->email;
 			$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 			$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
 
 			$object->fk_project = GETPOST('projectid', 'int');
 
-			$ret = $extrafields->setOptionalsFromPost(null, $object);
-
 			$id = $object->create($user);
 			if ($id <= 0) {
 				$error++;
-				setEventMessage($object->error, $object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'create';
 			}
 
@@ -226,7 +231,7 @@ if (empty($reshook)) {
 					$fichinter->fk_project = GETPOST('projectid', 'int');
 					$fichinter->fk_contrat = $contractid;
 					$fichinter->author = $user->id;
-					$fichinter->modelpdf = 'soleil';
+					$fichinter->model_pdf = 'soleil';
 					$fichinter->origin = $object->element;
 					$fichinter->origin_id = $object->id;
 
@@ -253,10 +258,10 @@ if (empty($reshook)) {
 				if (!empty($backtopage)) {
 					$url = $backtopage;
 				} else {
-					$url = 'card.php?track_id=' . $object->track_id;
+					$url = 'card.php?track_id='.$object->track_id;
 				}
 
-				header("Location: " . $url);
+				header("Location: ".$url);
 				exit;
 			} else {
 				$db->rollback();
@@ -267,53 +272,55 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'edit' && $user->rights->ticket->write) {
+	if ($action == 'update' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
 		$error = 0;
 
-		if ($object->fetch(GETPOST('id', 'int')) < 0) {
-			$error++;
-			array_push($object->errors, $langs->trans("ErrorTicketIsNotValid"));
-			$_GET["action"] = $_POST["action"] = '';
-		}
-	}
-
-	if (GETPOST('update', 'alpha') && GETPOST('id', 'int') && $user->rights->ticket->write) {
-		$error = 0;
-
-		$ret = $object->fetch(GETPOST('id', 'int'));
+		$ret = $object->fetch(GETPOST('id', 'int'), GETPOST('ref', 'alpha'), GETPOST('track_id', 'alpha'));
 		if ($ret < 0) {
 			$error++;
-			array_push($object->errors, $langs->trans("ErrorTicketIsNotValid"));
-			$action = '';
-		} elseif (!GETPOST("label")) {
-			$error++;
-			array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")));
-			$action = 'edit';
-		} elseif (!GETPOST("subject", 'alphanohtml')) {
-			$error++;
-			array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
-			$action = 'edit';
+			array_push($object->errors, $langs->trans('ErrorTicketIsNotValid'));
+		}
+
+		// check fields
+		if (!$error) {
+			if (!GETPOST('subject', 'alpha')) {
+				$error++;
+				array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Subject')));
+			}
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0)	$error++;
 		}
 
 		if (!$error) {
 			$db->begin();
 
-			$object->label = GETPOST("label", 'alphanohtml');
-			$object->description = GETPOST("description", 'restricthtml');
+			$object->subject = GETPOST('subject', 'alpha');
+			$object->type_code = GETPOST('type_code', 'alpha');
+			$object->category_code = GETPOST('category_code', 'alpha');
+			$object->severity_code = GETPOST('severity_code', 'alpha');
 
-			//...
 			$ret = $object->update($user);
-			if ($ret <= 0) {
-				$error++;
-				setEventMessage($object->error, $object->errors, 'errors');
-				$action = 'edit';
+			if ($ret <= 0)  $error++;
+
+			if ($error) {
+				$db->rollback();
+			} else {
+				$db->commit();
+			}
+		}
+
+		if ($error) {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'edit';
+		} else {
+			if (!empty($backtopage)) {
+				$url = $backtopage;
+			} else {
+				$url = 'card.php?track_id='.$object->track_id;
 			}
 
-			if (!$error && $ret > 0) {
-				$db->commit();
-			} else {
-				$db->rollback();
-			}
+			header('Location: '.$url);
+			exit();
 		}
 	}
 
@@ -324,7 +331,7 @@ if (empty($reshook)) {
 		if ($object->markAsRead($user) > 0) {
 			setEventMessages($langs->trans('TicketMarkedAsRead'), null, 'mesgs');
 
-			header("Location: card.php?track_id=" . $object->track_id . "&action=view");
+			header("Location: card.php?track_id=".$object->track_id."&action=view");
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -375,7 +382,7 @@ if (empty($reshook)) {
 
 			setEventMessages($langs->trans('TicketAssigned'), null, 'mesgs');
 
-			header("Location: card.php?track_id=" . $object->track_id . "&action=view");
+			header("Location: card.php?track_id=".$object->track_id."&action=view");
 			exit;
 		} else {
 			array_push($object->errors, $object->error);
@@ -391,10 +398,10 @@ if (empty($reshook)) {
 			if (!empty($backtopage)) {
 				$url = $backtopage;
 			} else {
-				$url = 'card.php?action=view&track_id=' . $object->track_id;
+				$url = 'card.php?action=view&track_id='.$object->track_id;
 			}
 
-			header("Location: " . $url);
+			header("Location: ".$url);
 			exit;
 		} else {
 			setEventMessages($object->error, null, 'errors');
@@ -408,8 +415,8 @@ if (empty($reshook)) {
 		if ($object->close($user)) {
 			setEventMessages($langs->trans('TicketMarkedAsClosed'), null, 'mesgs');
 
-			$url = 'card.php?action=view&track_id=' . GETPOST('track_id', 'alpha');
-			header("Location: " . $url);
+			$url = 'card.php?action=view&track_id='.GETPOST('track_id', 'alpha');
+			header("Location: ".$url);
 		} else {
 			$action = '';
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -424,10 +431,10 @@ if (empty($reshook)) {
 			// Log action in ticket logs table
 			$log_action = $langs->trans('TicketLogClosedBy', $_SESSION['email_customer']);
 
-			setEventMessages('<div class="confirm">' . $langs->trans('TicketMarkedAsClosed') . '</div>', null, 'mesgs');
+			setEventMessages('<div class="confirm">'.$langs->trans('TicketMarkedAsClosed').'</div>', null, 'mesgs');
 
-			$url = 'card.php?action=view_ticket&track_id=' . GETPOST('track_id', 'alpha');
-			header("Location: " . $url);
+			$url = 'card.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha');
+			header("Location: ".$url);
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
@@ -437,12 +444,12 @@ if (empty($reshook)) {
 	if ($action == 'confirm_delete_ticket' && GETPOST('confirm', 'alpha') == "yes" && $user->rights->ticket->delete) {
 		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			if ($object->delete($user) > 0) {
-				setEventMessages('<div class="confirm">' . $langs->trans('TicketDeletedSuccess') . '</div>', null, 'mesgs');
-				Header("Location: " . DOL_URL_ROOT . "/ticket/list.php");
+				setEventMessages('<div class="confirm">'.$langs->trans('TicketDeletedSuccess').'</div>', null, 'mesgs');
+				Header("Location: ".DOL_URL_ROOT."/ticket/list.php");
 				exit;
 			} else {
 				$langs->load("errors");
-				$mesg = '<div class="error">' . $langs->trans($object->error) . '</div>';
+				$mesg = '<div class="error">'.$langs->trans($object->error).'</div>';
 				$action = '';
 			}
 		}
@@ -452,8 +459,8 @@ if (empty($reshook)) {
 	if ($action == 'set_thirdparty' && $user->rights->societe->creer) {
 		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$result = $object->setCustomer(GETPOST('editcustomer', 'int'));
-			$url = 'card.php?action=view&track_id=' . GETPOST('track_id', 'alpha');
-			header("Location: " . $url);
+			$url = 'card.php?action=view&track_id='.GETPOST('track_id', 'alpha');
+			header("Location: ".$url);
 			exit();
 		}
 	}
@@ -462,8 +469,8 @@ if (empty($reshook)) {
 		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$result = $object->setProgression(GETPOST('progress', 'alpha'));
 
-			$url = 'card.php?action=view&track_id=' . $object->track_id;
-			header("Location: " . $url);
+			$url = 'card.php?action=view&track_id='.$object->track_id;
+			header("Location: ".$url);
 			exit();
 		}
 	}
@@ -471,16 +478,16 @@ if (empty($reshook)) {
 	if ($action == 'setsubject') {
 		if ($object->fetch(GETPOST('id', 'int'))) {
 			if ($action == 'setsubject') {
-				$object->subject = trim(GETPOST('subject', 'alphanohtml'));
+				$object->subject = GETPOST('subject', 'alphanohtml');
 			}
 
 			if ($action == 'setsubject' && empty($object->subject)) {
-				$mesg .= ($mesg ? '<br>' : '') . $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject"));
+				$mesg .= ($mesg ? '<br>' : '').$langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject"));
 			}
 
 			if (!$mesg) {
 				if ($object->update($user) >= 0) {
-					header("Location: " . $_SERVER['PHP_SELF'] . "?track_id=" . $object->track_id);
+					header("Location: ".$_SERVER['PHP_SELF']."?track_id=".$object->track_id);
 					exit;
 				}
 				$mesg = $object->error;
@@ -497,8 +504,8 @@ if (empty($reshook)) {
 					// Log action in ticket logs table
 					$log_action = $langs->trans('TicketLogReopen');
 
-					$url = 'card.php?action=view&track_id=' . $object->track_id;
-					header("Location: " . $url);
+					$url = 'card.php?action=view&track_id='.$object->track_id;
+					header("Location: ".$url);
 					exit();
 				}
 			}
@@ -507,16 +514,16 @@ if (empty($reshook)) {
 	elseif ($action == 'classin' && $user->rights->ticket->write) {
 		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$object->setProject(GETPOST('projectid', 'int'));
-			$url = 'card.php?action=view&track_id=' . $object->track_id;
-			header("Location: " . $url);
+			$url = 'card.php?action=view&track_id='.$object->track_id;
+			header("Location: ".$url);
 			exit();
 		}
 	} // Categorisation dans contrat
 	elseif ($action == 'setcontract' && $user->rights->ticket->write) {
 		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			$object->setContract(GETPOST('contractid', 'int'));
-			$url = 'card.php?action=view&track_id=' . $object->track_id;
-			header("Location: " . $url);
+			$url = 'card.php?action=view&track_id='.$object->track_id;
+			header("Location: ".$url);
 			exit();
 		}
 	} elseif ($action == "set_message" && $user->rights->ticket->manage) {
@@ -529,7 +536,7 @@ if (empty($reshook)) {
 			$object->message = $fieldtomodify;
 			$ret = $object->update($user);
 			if ($ret > 0) {
-				$log_action = $langs->trans('TicketInitialMessageModified') . " \n";
+				$log_action = $langs->trans('TicketInitialMessageModified')." \n";
 				// include the Diff class
 				dol_include_once('/ticket/class/utils_diff.class.php');
 				// output the result of comparing two files as plain text
@@ -550,8 +557,8 @@ if (empty($reshook)) {
 				// Log action in ticket logs table
 				$log_action = $langs->trans('TicketLogStatusChanged', $langs->transnoentities($object->statuts_short[$old_status]), $langs->transnoentities($object->statuts_short[$new_status]));
 
-				$url = 'card.php?action=view&track_id=' . $object->track_id;
-				header("Location: " . $url);
+				$url = 'card.php?action=view&track_id='.$object->track_id;
+				header("Location: ".$url);
 				exit();
 			}
 		}
@@ -560,18 +567,22 @@ if (empty($reshook)) {
 	// Action to update one extrafield
 	if ($action == "update_extras" && !empty($permissiontoadd)) {
 		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
-		$attributekey = GETPOST('attribute', 'alpha');
-		$attributekeylong = 'options_' . $attributekey;
-		$object->array_options['options_' . $attributekey] = GETPOST($attributekeylong, ' alpha');
 
-		$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
-		if ($result > 0) {
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			$action = 'view';
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = 'edit_extras';
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
+
+		if (!$error) {
+			$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
+			if ($result > 0) {
+				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+				$action = 'view';
+			} else {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		}
+
+		if ($error) $action = 'edit_extras';
 	}
 
 	if ($action == "change_property" && GETPOST('btn_update_ticket_prop', 'alpha') && $user->rights->ticket->write) {
@@ -592,19 +603,19 @@ if (empty($reshook)) {
 
 
 	$permissiondellink = $user->rights->ticket->write;
-	include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 	// Actions to build doc
 	$upload_dir = $conf->ticket->dir_output;
 	$permissiontoadd = $user->rights->ticket->write;
-	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Actions to send emails
 	$triggersendname = 'TICKET_SENTBYMAIL';
 	$paramname = 'id';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_TICKET_TO'; // used to know the automatic BCC to add
-	$trackid = 'tic' . $object->id;
-	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+	$trackid = 'tic'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	// Set $action to correct value for the case we used presend action to add a message
 	if (GETPOSTISSET('actionbis') && $action == 'presend') $action = 'presend_addmessage';
@@ -634,7 +645,7 @@ if ($action == 'create' || $action == 'presend')
 	$formticket->withfromcontactid = $contactid ? $contactid : '';
 	$formticket->withtitletopic = 1;
 	$formticket->withnotifytiersatcreate = ($notifyTiers ? 1 : 0);
-	$formticket->withusercreate = 1;
+	$formticket->withusercreate = 0;
 	$formticket->withref = 1;
 	$formticket->fk_user_create = $user->id;
 	$formticket->withfile = 2;
@@ -645,9 +656,63 @@ if ($action == 'create' || $action == 'presend')
 	}
 
 	$formticket->showForm(1, 'create');
-}
+} elseif ($action == 'edit' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
+	$formticket = new FormTicket($db);
 
-if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'presend' || $action == 'presend_addmessage' || $action == 'close' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen'
+	$head = ticket_prepare_head($object);
+
+	print '<form method="POST" name="form_ticket" id="form_edit_ticket" action="'.$_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="tack_id" value="'.$object->track_id.'">';
+
+	dol_fiche_head($head, 'card', $langs->trans('Ticket'), 0, 'ticket');
+
+	print '<div class="fichecenter2">';
+	print '<table class="border" width="100%">';
+
+	// Type
+	print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">'.$langs->trans("TicketTypeRequest").'</span></label></td><td>';
+	$formticket->selectTypesTickets((GETPOST('type_code') ? GETPOST('type_code') : $object->type_code), 'type_code', '', '2');
+	print '</td></tr>';
+
+	// Severity
+	print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
+	$formticket->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $object->severity_code), 'severity_code', '', '2');
+	print '</td></tr>';
+
+	// Group
+	print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketGroup").'</span></label></td><td>';
+	$formticket->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $object->category_code), 'category_code', '', '2');
+	print '</td></tr>';
+
+	// Subject
+	print '<tr><td><label for="subject"><span class="fieldrequired">'.$langs->trans("Subject").'</span></label></td><td>';
+	print '<input class="text" size="50" id="subject" name="subject" value="'.(GETPOST('subject', 'alpha') ? GETPOST('subject', 'alpha') : $object->subject).'" />';
+	print '</td></tr>';
+
+	// Other attributes
+	$parameters = array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
+	$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>';
+	print '</div>';
+
+	dol_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 '</form>';
+}
+elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'presend' || $action == 'presend_addmessage' || $action == 'close' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen'
 	|| $action == 'editsubject' || $action == 'edit_extras' || $action == 'update_extras' || $action == 'edit_extrafields' || $action == 'set_extrafields' || $action == 'classify' || $action == 'sel_contract' || $action == 'edit_message_init' || $action == 'set_status' || $action == 'dellink')
 {
 	if ($res > 0)
@@ -894,8 +959,6 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 		if ($object->fk_user_assign > 0) {
 			$userstat->fetch($object->fk_user_assign);
 			print $userstat->getNomUrl(1);
-		} else {
-			print $langs->trans('None');
 		}
 
 		// Show user list to assignate one if status is "read"
@@ -987,8 +1050,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 		print '<td>';
 		if (GETPOST('set', 'alpha') == 'properties' && $user->rights->ticket->write) {
 			print '<input class="button" type="submit" name="btn_update_ticket_prop" value="'.$langs->trans("Modify").'" />';
-		}
-		else {
+		} else {
 			//    Button to edit Properties
 			if ($object->fk_statut < 5 && $user->rights->ticket->write) {
 				print '<a class="editfielda" href="card.php?track_id='.$object->track_id.'&action=view&set=properties">'.img_edit($langs->trans('Modify')).'</a>';
@@ -1025,15 +1087,15 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 		} else {
 			// Type
 			print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>';
-			print $langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label');
+			print $langs->getLabelFromKey($db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code);
 			print '</td></tr>';
 			// Group
-			print '<tr><td>'.$langs->trans("TicketGroup").'</td><td>';
-			print $langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label');
+			print '<tr><td>'.$langs->trans("TicketCategory").'</td><td>';
+			print $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
 			print '</td></tr>';
 			// Severity
 			print '<tr><td>'.$langs->trans("TicketSeverity").'</td><td>';
-			print $langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label');
+			print $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
 			print '</td></tr>';
 		}
 		print '</table>'; // End table actions
@@ -1179,7 +1241,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			{
 				// Show link to add a message (if read and not closed)
 				if ($object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage") {
-					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init">'.$langs->trans('TicketAddMessage').'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butAction reposition" href="card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init">'.$langs->trans('TicketAddMessage').'</a></div>';
 				}
 
 				// Link to create an intervention
@@ -1191,6 +1253,10 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath('/fichinter/card.php', 1).'?action=create&socid='.$object->fk_soc.'&origin=ticket_ticket&originid='.$object->id.'">'.$langs->trans('TicketAddIntervention').'</a></div>';
 				}
 
+				if ($user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?track_id='.$object->track_id.'&action=edit">'.$langs->trans('Modify').'</a></div>';
+				}
+
 				// Close ticket if statut is read
 				if ($object->fk_statut > 0 && $object->fk_statut < Ticket::STATUS_CLOSED && $user->rights->ticket->write) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id='.$object->track_id.'&action=close">'.$langs->trans('CloseTicket').'</a></div>';
@@ -1203,14 +1269,12 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 
 				// Delete ticket
 				if ($user->rights->ticket->delete && !$user->socid) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?track_id='.$object->track_id.'&action=delete">'.$langs->trans('Delete').'</a></div>';
+					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?track_id='.$object->track_id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
 				}
 			}
 			print '</div>'."\n";
-		}
-		else
-		{
-			print '<br>';
+		} else {
+			//print '<br>';
 		}
 
 		// Select mail models is same action as presend
@@ -1234,7 +1298,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 				$object->fetch_thirdparty();
 				$substitutionarray['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
 			}
-			$substitutionarray['__SIGNATURE__'] = $user->signature;
+			$substitutionarray['__USER_SIGNATURE__'] = $user->signature;
 			$substitutionarray['__TICKET_TRACKID__'] = $object->track_id;
 			$substitutionarray['__TICKET_REF__'] = $object->ref;
 			$substitutionarray['__TICKET_SUBJECT__'] = $object->subject;
@@ -1259,6 +1323,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 			$morehtmlright .= $form->textwithpicto('<span class="opacitymedium">'.$langs->trans("TicketMessageSubstitutionReplacedByGenericValues").'</span>', $help, 1, 'helpclickable', '', 0, 3, 'helpsubstitution');
 
 			print '<div>';
+
 			print load_fiche_titre($langs->trans('TicketAddMessage'), $morehtmlright, 'messages@ticket');
 
 			print '<hr>';
@@ -1298,7 +1363,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 		}
 
 		// Show messages on card (Note: this is a duplicate of the view Events/Agenda but on the main tab)
-		if (! empty($conf->global->TICKET_SHOW_MESSAGES_ON_CARD)) {
+		if (!empty($conf->global->TICKET_SHOW_MESSAGES_ON_CARD)) {
 			$param = '&id='.$object->id;
 			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
 			if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
@@ -1307,17 +1372,17 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 
 			$morehtmlright = '';
 
-			$messagingUrl = DOL_URL_ROOT . '/ticket/agenda.php?track_id=' . $object->track_id;
+			$messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
 			$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fal fa-list-alt imgforviewmode', $messagingUrl, '', 1);
 
 			// Show link to add a message (if read and not closed)
 			$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage" && $action != "add_message";
-			$url = 'card.php?track_id=' . $object->track_id . '&action=presend_addmessage&mode=init';
+			$url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init';
 			$morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fal 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" && $action != "add_message";;
-			$url = dol_buildpath('/comm/action/card.php', 1) . '?action=create&datep=' . date('YmdHi') . '&origin=ticket&originid=' . $object->id . '&projectid=' . $object->fk_project . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?track_id=' . $object->track_id);
+			$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage" && $action != "add_message"; ;
+			$url = dol_buildpath('/comm/action/card.php', 1).'?action=create&datep='.date('YmdHi').'&origin=ticket&originid='.$object->id.'&projectid='.$object->fk_project.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?track_id='.$object->track_id);
 			$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fal fa-plus-circle', $url, 'add-new-ticket-even-button', $btnstatus);
 
 			print_barre_liste($langs->trans("ActionsOnTicket"), 0, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
@@ -1351,7 +1416,7 @@ if (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'd
 				$morehtmlcenter .= dolGetButtonTitle($langs->trans('FullList'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/ticket/agenda.php?id='.$object->id);
 
 				// List of actions on element
-				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 				$formactions = new FormActions($db);
 				$somethingshown = $formactions->showactions($object, 'ticket', $socid, 1, 'listactions', $MAXEVENT, '', $morehtmlcenter);
 
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index 0fb5835cb4c..49185f093fc 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -184,7 +184,7 @@ class ActionsTicket
 			// MESSAGE
 
 			print '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="track_id" value="'.$object->track_id.'">';
 			print '<input type="hidden" name="action" value="set_message">';
 		}
@@ -208,14 +208,25 @@ class ActionsTicket
 			$msg = GETPOST('message_initial', 'alpha') ? GETPOST('message_initial', 'alpha') : $object->message;
 			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 			$uselocalbrowser = true;
-			$doleditor = new DolEditor('message_initial', $msg, '100%', 250, 'dolibarr_details', 'In', true, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_TICKET, ROWS_4, '95%');
+			$ckeditorenabledforticket = $conf->global->FCKEDITOR_ENABLE_TICKET;
+			$doleditor = new DolEditor('message_initial', $msg, '100%', 250, 'dolibarr_details', 'In', true, $uselocalbrowser, $ckeditorenabledforticket, ROWS_9, '95%');
 			$doleditor->Create();
 		} else {
 			// Deal with format differences (text / HTML)
 			if (dol_textishtml($object->message)) {
+				print '<div class="longmessagecut">';
 				print $object->message;
+				print '</div>';
+				/*print '<div class="clear center">';
+				print $langs->trans("More").'...';
+				print '</div>';*/
 			} else {
+				print '<div class="longmessagecut">';
 				print dol_nl2br($object->message);
+				print '</div>';
+				/*print '<div class="clear center">';
+				print $langs->trans("More").'...';
+				print '</div>';*/
 			}
 
 			//print '<div>' . $object->message . '</div>';
@@ -253,7 +264,7 @@ class ActionsTicket
 		$ret = $this->dao->loadCacheMsgsTicket();
 		if ($ret < 0) dol_print_error($this->dao->db);
 
-		$action = GETPOST('action', 'alpha');
+		$action = GETPOST('action', 'aZ09');
 
 		$this->viewTicketOriginalMessage($user, $action, $object);
 
@@ -396,10 +407,8 @@ class ActionsTicket
 				if ($status == 1)
 				{
 					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=mark_ticket_read'; // To set as read, we use a dedicated action
-				}
-				else
-				{
-					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=set_status&new_status='.$status;
+				} else {
+					$urlforbutton = $_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'&action=set_status&token='.newToken().'&new_status='.$status;
 				}
 
 				print '<a class="butAction buttonticket marginbottomonly" href="'.$urlforbutton.'">';
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 94b94b33339..4a3c9b66203 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -114,8 +114,7 @@ class Tickets extends DolibarrApi
     {
         try {
             return $this->getCommon(0, '', $ref);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
                throw $e;
         }
@@ -277,7 +276,7 @@ class Tickets extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 
         if ($limit) {
             if ($page < 0) {
@@ -288,13 +287,13 @@ class Tickets extends DolibarrApi
             $sql .= $this->db->plimit($limit, $offset);
         }
 
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
         if ($result) {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             $i = 0;
             while ($i < $num) {
-                $obj = $db->fetch_object($result);
-                $ticket_static = new Ticket($db);
+            	$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);
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index ca312b4f0f8..04abd650032 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1,7 +1,8 @@
 <?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      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
  * it under the terms of the GNU General Public License as published by
@@ -108,7 +109,7 @@ class Ticket extends CommonObject
 	/**
 	 * @var int  Ticket statut
 	 */
-	public $fk_statut;				// deprecated
+	public $fk_statut; // deprecated
 	public $status;
 
 	/**
@@ -141,6 +142,26 @@ class Ticket extends CommonObject
 	 */
 	public $severity_code;
 
+    /**
+     * Type label
+     */
+    public $type_label;
+
+    /**
+     * Category label
+     */
+    public $category_label;
+
+    /**
+     * Severity label
+     */
+    public $severity_label;
+
+        /**
+     * Email from user
+     */
+    public $email_from;
+
 	/**
 	 * @var int Création date
 	 */
@@ -171,6 +192,8 @@ class Ticket extends CommonObject
 	 */
 	public $notify_tiers_at_create;
 
+	public $email_msgid;
+
 	public $lines;
 
 	/**
@@ -178,33 +201,6 @@ class Ticket extends CommonObject
 	 */
 	public $regeximgext = '\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff';
 
-	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'position'=>1, 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id"),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>''),
-		'track_id' => array('type'=>'varchar(255)', 'label'=>'TicketTrackId', 'visible'=>-2, 'enabled'=>1, 'position'=>11, 'notnull'=>-1, 'searchall'=>1, 'help'=>"Help text"),
-		'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>15, 'notnull'=>1, 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
-		'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>-2, 'enabled'=>1, 'position'=>16, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'tdoverflowmax150'),
-		'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>18, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth200', 'autofocusoncreate'=>1),
-		'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth150'),
-		'category_code' => array('type'=>'varchar(32)', 'label'=>'TicketGroup', 'visible'=>-1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
-		'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>22, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"LinkToThirparty", 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
-		'notify_tiers_at_create' => array('type'=>'integer', 'label'=>'NotifyThirdparty', 'visible'=>-1, 'enabled'=>0, 'position'=>51, 'notnull'=>1, 'index'=>1),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php', 'label'=>'Project', 'visible'=>-1, 'enabled'=>1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'help'=>"LinkToProject"),
-		'timing' => array('type'=>'varchar(20)', 'label'=>'Timing', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'help'=>""),
-		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>1, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
-		'date_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>1, 'enabled'=>1, 'position'=>501, 'notnull'=>1),
-		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1),
-		'date_close' => array('type'=>'datetime', 'label'=>'TicketCloseOn', 'visible'=>-1, 'enabled'=>1, 'position'=>510, 'notnull'=>1),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>520, 'notnull'=>1),
-		'message' => array('type'=>'text', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1,),
-		'progress' => array('type'=>'varchar(100)', 'label'=>'Progression', 'visible'=>-1, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'css'=>'right', 'help'=>"", 'isameasure'=>1),
-		'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>1, 'position'=>550, 'notnull'=>1),
-		'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'Answered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'Closed', 9 => 'Deleted')),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
-	);
-
 	/**
 	 * Status
 	 */
@@ -218,6 +214,62 @@ class Ticket extends CommonObject
 	const STATUS_CANCELED = 9;
 
 
+	/**
+	 *  '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' 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'
+	 *  '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.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	public $fields = array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'position'=>1, 'visible'=>-2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id"),
+		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>''),
+		'track_id' => array('type'=>'varchar(255)', 'label'=>'TicketTrackId', 'visible'=>-2, 'enabled'=>1, 'position'=>11, 'notnull'=>-1, 'searchall'=>1, 'help'=>"Help text"),
+		'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>15, 'notnull'=>1, 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
+		'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>-2, 'enabled'=>1, 'position'=>16, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'tdoverflowmax150'),
+		'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>18, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth200', 'autofocusoncreate'=>1),
+		'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth150 tdoverflowmax50'),
+		'category_code' => array('type'=>'varchar(32)', 'label'=>'TicketCategory', 'visible'=>-1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
+		'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>22, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"LinkToThirparty", 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
+		'notify_tiers_at_create' => array('type'=>'integer', 'label'=>'NotifyThirdparty', 'visible'=>-1, 'enabled'=>0, 'position'=>51, 'notnull'=>1, 'index'=>1),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php', 'label'=>'Project', 'visible'=>-1, 'enabled'=>1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'help'=>"LinkToProject"),
+		'timing' => array('type'=>'varchar(20)', 'label'=>'Timing', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'help'=>""),
+		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>1, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
+		'date_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>1, 'enabled'=>1, 'position'=>501, 'notnull'=>1),
+		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1),
+		'date_close' => array('type'=>'datetime', 'label'=>'TicketCloseOn', 'visible'=>-1, 'enabled'=>1, 'position'=>510, 'notnull'=>1),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>520, 'notnull'=>1),
+		'message' => array('type'=>'text', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1,),
+		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
+		'progress' => array('type'=>'varchar(100)', 'label'=>'Progression', 'visible'=>-1, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'css'=>'right', 'help'=>"", 'isameasure'=>1),
+		'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>1, 'position'=>550, 'notnull'=>1),
+		'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'Answered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'Closed', 9 => 'Deleted')),
+		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
+	);
+	// END MODULEBUILDER PROPERTIES
+
+
 	/**
 	 *  Constructor
 	 *
@@ -347,6 +399,7 @@ class Ticket extends CommonObject
 			$sql .= "origin_email,";
 			$sql .= "fk_user_create,";
 			$sql .= "fk_user_assign,";
+			$sql .= "email_msgid,";
 			$sql .= "subject,";
 			$sql .= "message,";
 			$sql .= "fk_statut,";
@@ -369,6 +422,7 @@ class Ticket extends CommonObject
 			$sql .= " ".(!isset($this->origin_email) ? 'NULL' : "'".$this->db->escape($this->origin_email)."'").",";
 			$sql .= " ".($this->fk_user_create > 0 ? $this->fk_user_create : ($user->id > 0 ? $user->id : 'NULL')).",";
 			$sql .= " ".($this->fk_user_assign > 0 ? $this->fk_user_assign : 'NULL').",";
+			$sql .= " ".(empty($this->email_msgid) ? 'NULL' : "'".$this->db->escape($this->email_msgid)."'").",";
 			$sql .= " ".(!isset($this->subject) ? 'NULL' : "'".$this->db->escape($this->subject)."'").",";
 			$sql .= " ".(!isset($this->message) ? 'NULL' : "'".$this->db->escape($this->message)."'").",";
 			$sql .= " ".(!isset($this->fk_statut) ? '0' : "'".$this->db->escape($this->fk_statut)."'").",";
@@ -437,17 +491,18 @@ class Ticket extends CommonObject
 	/**
 	 *  Load object in memory from the database
 	 *
-	 *  @param  int        	$id    		Id object
-	 *  @param	string		$ref		Ref
-	 *  @param	string		$track_id	Track id, a hash like ref
-	 *  @return int              		<0 if KO, >0 if OK
+	 *  @param  int        	$id    			Id object
+	 *  @param	string		$ref			Ref
+	 *  @param	string		$track_id		Track id, a hash like ref
+	 *  @param	string		$email_msgid	Email msgid
+	 *  @return int              			<0 if KO, >0 if OK
 	 */
-	public function fetch($id = '', $ref = '', $track_id = '')
+	public function fetch($id = '', $ref = '', $track_id = '', $email_msgid = '')
 	{
 		global $langs;
 
 		// Check parameters
-		if (!$id && !$track_id && !$ref) {
+		if (!$id && !$track_id && !$ref && !$email_msgid) {
 			$this->error = 'ErrorWrongParameters';
 			dol_print_error(get_class($this)."::fetch ".$this->error);
 			return -1;
@@ -455,6 +510,7 @@ class Ticket extends CommonObject
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
+		$sql .= " t.entity,";
 		$sql .= " t.ref,";
 		$sql .= " t.track_id,";
 		$sql .= " t.fk_soc,";
@@ -462,6 +518,7 @@ class Ticket extends CommonObject
 		$sql .= " t.origin_email,";
 		$sql .= " t.fk_user_create,";
 		$sql .= " t.fk_user_assign,";
+		$sql .= " t.email_msgid,";
 		$sql .= " t.subject,";
 		$sql .= " t.message,";
 		$sql .= " t.fk_statut as status,";
@@ -485,10 +542,12 @@ class Ticket extends CommonObject
 			$sql .= " WHERE t.rowid = ".$this->db->escape($id);
 		} else {
 			$sql .= " WHERE t.entity IN (".getEntity($this->element, 1).")";
-			if ($track_id) {
-				$sql .= " AND t.track_id = '".$this->db->escape($track_id)."'";
-			} elseif ($ref) {
+			if (!empty($ref)) {
 				$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
+			} elseif ($track_id) {
+				$sql .= " AND t.track_id = '".$this->db->escape($track_id)."'";
+			} else {
+				$sql .= " AND t.email_msgid = '".$this->db->escape($email_msgid)."'";
 			}
 		}
 
@@ -508,11 +567,12 @@ class Ticket extends CommonObject
 				$this->origin_email = $obj->origin_email;
 				$this->fk_user_create = $obj->fk_user_create;
 				$this->fk_user_assign = $obj->fk_user_assign;
+				$this->email_msgid = $obj->email_msgid;
 				$this->subject = $obj->subject;
 				$this->message = $obj->message;
 
 				$this->status = $obj->status;
-				$this->fk_statut = $this->status;		// For backward compatibility
+				$this->fk_statut = $this->status; // For backward compatibility
 
 				$this->resolution = $obj->resolution;
 				$this->progress = $obj->progress;
@@ -545,9 +605,7 @@ class Ticket extends CommonObject
 
 				$this->db->free($resql);
 				return 1;
-			}
-			else
-			{
+			} else {
 				return 0;
 			}
 		} else {
@@ -626,7 +684,7 @@ class Ticket extends CommonObject
 		if (!empty($filter)) {
 			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) { // To allow $filter['YEAR(s.dated)']=>$year
-					$sql .= ' AND '.$key.' = \''.$value.'\'';
+					$sql .= ' AND '.$key." = '".$this->db->scape($value)."'";
 				} elseif (($key == 't.fk_user_assign') || ($key == 't.type_code') || ($key == 't.category_code') || ($key == 't.severity_code') || ($key == 't.fk_soc')) {
 					$sql .= " AND ".$key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 't.fk_statut') {
@@ -1186,29 +1244,21 @@ class Ticket extends CommonObject
 
 		if ($status == self::STATUS_NOT_READ) {
 			$statusType = 'status0';
-		}
-		elseif ($status == self::STATUS_READ) {
+		} elseif ($status == self::STATUS_READ) {
 			$statusType = 'status1';
-		}
-		elseif ($status == self::STATUS_ASSIGNED) {
+		} elseif ($status == self::STATUS_ASSIGNED) {
 			$statusType = 'status3';
-		}
-		elseif ($status == self::STATUS_IN_PROGRESS) {
+		} elseif ($status == self::STATUS_IN_PROGRESS) {
 			$statusType = 'status4';
-		}
-		elseif ($status == self::STATUS_WAITING) {
+		} elseif ($status == self::STATUS_WAITING) {
 			$statusType = 'status3';
-		}
-		elseif ($status == self::STATUS_NEED_MORE_INFO) {
+		} elseif ($status == self::STATUS_NEED_MORE_INFO) {
 			$statusType = 'status9';
-		}
-		elseif ($status == self::STATUS_CANCELED) {
+		} elseif ($status == self::STATUS_CANCELED) {
 			$statusType = 'status9';
-		}
-		elseif ($status == self::STATUS_CLOSED) {
+		} elseif ($status == self::STATUS_CLOSED) {
 			$statusType = 'status6';
-		}
-		else {
+		} else {
 			$labelStatus = $langs->trans('Unknown');
 			$labelStatusShort = $langs->trans('Unknown');
 			$statusType = 'status0';
@@ -1238,9 +1288,8 @@ class Ticket extends CommonObject
 		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
 
 		$result = '';
-		$companylink = '';
 
-		$label = '<u>'.$langs->trans("Ticket").'</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Ticket").'</u>';
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
 		$label .= '<b>'.$langs->trans('TicketTrackId').':</b> '.$this->track_id.'<br>';
@@ -1266,8 +1315,7 @@ class Ticket extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -1357,9 +1405,7 @@ class Ticket extends CommonObject
 		if ($id_assign_user > 0)
 		{
 			$sql .= " SET fk_user_assign=".$id_assign_user.", fk_statut = ".Ticket::STATUS_ASSIGNED;
-		}
-		else
-		{
+		} else {
 			$sql .= " SET fk_user_assign=null, fk_statut = ".Ticket::STATUS_READ;
 		}
 		$sql .= " WHERE rowid = ".$this->id;
@@ -1674,24 +1720,27 @@ class Ticket extends CommonObject
 				$error = 0;
 
 				// Valid and close fichinter linked
-				$this->fetchObjectLinked($this->id, $this->element, null, 'fichinter');
-				if ($this->linkedObjectsIds)
-				{
-					foreach ($this->linkedObjectsIds['fichinter'] as $fichinter_id) {
-						$fichinter = new Fichinter($this->db);
-						$fichinter->fetch($fichinter_id);
-						if ($fichinter->statut == 0) {
-							$result = $fichinter->setValid($user);
-							if (!$result) {
-								$this->errors[] = $fichinter->error;
-								$error++;
+				if (!empty($conf->ficheinter->enabled) && !empty($conf->global->WORKFLOW_TICKET_CLOSE_INTERVENTION)) {
+					dol_syslog("We have closed the ticket, so we close all linked interventions");
+					$this->fetchObjectLinked($this->id, $this->element, null, 'fichinter');
+					if ($this->linkedObjectsIds)
+					{
+						foreach ($this->linkedObjectsIds['fichinter'] as $fichinter_id) {
+							$fichinter = new Fichinter($this->db);
+							$fichinter->fetch($fichinter_id);
+							if ($fichinter->statut == 0) {
+								$result = $fichinter->setValid($user);
+								if (!$result) {
+									$this->errors[] = $fichinter->error;
+									$error++;
+								}
 							}
-						}
-						if ($fichinter->statut < 3) {
-							$result = $fichinter->setStatut(3);
-							if (!$result) {
-								$this->errors[] = $fichinter->error;
-								$error++;
+							if ($fichinter->statut < 3) {
+								$result = $fichinter->setStatut(3);
+								if (!$result) {
+									$this->errors[] = $fichinter->error;
+									$error++;
+								}
 							}
 						}
 					}
@@ -2213,7 +2262,7 @@ class Ticket extends CommonObject
 
 		$sql .= " AND tc.active=1";
 		if ($status >= 0) {
-			$sql .= " AND ec.statut = '".$status."'";
+			$sql .= " AND ec.statut = ".((int) $status);
 		}
 
 		$sql .= " ORDER BY t.lastname ASC";
@@ -2409,14 +2458,15 @@ class Ticket extends CommonObject
 
 
 	/**
-	 * Add new message on a ticket (private area). Can also send it be email if GETPOST('send_email', 'int') is set.
+	 * Add new message on a ticket (private/public area). Can also send it be email if GETPOST('send_email', 'int') is set.
 	 *
 	 * @param   User    $user       User for action
 	 * @param   string  $action     Action string
 	 * @param   int     $private    1=Message is private. TODO Implement this. What does this means ?
+	 * @param   int     $public_area    				1=Is the public area
 	 * @return  int
 	 */
-	public function newMessage($user, &$action, $private = 1)
+	public function newMessage($user, &$action, $private = 1, $public_area = 0)
 	{
 		global $mysoc, $conf, $langs;
 
@@ -2443,7 +2493,7 @@ class Ticket extends CommonObject
 
 		if (!$error) {
 			$object->subject = GETPOST('subject', 'alphanohtml');
-			$object->message = GETPOST("message", "none");
+			$object->message = GETPOST("message", "restricthtml");
 			$object->private = GETPOST("private_message", "alpha");
 
 			$send_email = GETPOST('send_email', 'int');
@@ -2469,142 +2519,233 @@ class Ticket extends CommonObject
 				//var_dump($_SESSION); var_dump($listofpaths);exit;
 
 				/*
-                 * Send emails to internal users (linked contacts)
-                 */
-				if ($send_email > 0) {
-					// Retrieve internal contact datas
-					$internal_contacts = $object->getInfosTicketInternalContact();
-
-					$sendto = array();
-					if (is_array($internal_contacts) && count($internal_contacts) > 0) {
-						// altairis: set default subject
-						$label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
-						$subject = GETPOST('subject', 'nohtml') ? GETPOST('subject', 'nohtml') : '['.$label_title.'- ticket #'.$object->track_id.'] '.$langs->trans('TicketNewMessage');
-
-						$message_intro = $langs->trans('TicketNotificationEmailBody', "#".$object->id);
-						$message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
-
-						$message = $langs->trans('TicketMessageMailIntroText');
-						$message .= "\n\n";
-						$message .= GETPOST('message', 'restricthtml');
-
-						//  Coordonnées client
-						$message .= "\n\n";
-						$message .= "==============================================\n";
-						$message .= !empty($object->thirdparty->name) ? $langs->trans('Thirdparty')." : ".$object->thirdparty->name : '';
-						$message .= !empty($object->thirdparty->town) ? "\n".$langs->trans('Town')." : ".$object->thirdparty->town : '';
-						$message .= !empty($object->thirdparty->phone) ? "\n".$langs->trans('Phone')." : ".$object->thirdparty->phone : '';
-
-						// Build array to display recipient list
-						foreach ($internal_contacts as $key => $info_sendto) {
-							// altairis: avoid duplicate notifications
-							if ($info_sendto['id'] == $user->id) {
-								continue;
-							}
-
-							if ($info_sendto['email'] != '') {
-								if (!empty($info_sendto['email'])) $sendto[] = trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">";
-
-								//Contact type
-								$recipient = dolGetFirstLastname($info_sendto['firstname'], $info_sendto['lastname'], '-1').' ('.strtolower($info_sendto['libelle']).')';
-								$message .= (!empty($recipient) ? $langs->trans('TicketNotificationRecipient').' : '.$recipient."\n" : '');
+				 * Public area
+				 */
+				if (!empty($public_area)) {
+					/*
+					 * Send emails to assigned users (public area notification)
+					 */
+					if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED)) {
+						$assigned_user_dont_have_email = '';
+						$sendto = array();
+						if ($this->fk_user_assign > 0) {
+							$assigned_user = new User($this->db);
+							$assigned_user->fetch($this->fk_user_assign);
+							if (!empty($assigned_user->email)) {
+								$sendto[] = $assigned_user->getFullName($langs)." <".$assigned_user->email.">";
+							} else {
+								$assigned_user_dont_have_email = $assigned_user->getFullName($langs);
+							}
+						}
+						if (empty($sendto)) {
+							if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL)) {
+								$sendto[] = $conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL;
+							} elseif (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) {
+								$sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
 							}
 						}
-						$message .= "\n";
-						// URL ticket
-						$url_internal_ticket = dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id;
-
-						// altairis: make html link on url
-						$message .= "\n".$langs->trans('TicketNotificationEmailBodyInfosTrackUrlinternal').' : <a href="'.$url_internal_ticket.'">'.$object->track_id.'</a>'."\n";
 
 						// Add global email address recipient
-						if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
-							if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+						if (!empty($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) &&
+							!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)
+						) {
+							$sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
 						}
 
-						// altairis: dont try to send email if no recipient
 						if (!empty($sendto)) {
+							$label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
+							$subject = '['.$label_title.'- ticket #'.$object->track_id.'] '.$langs->trans('TicketNewMessage');
+
+							// Message send
+							$message = $langs->trans('TicketMessageMailIntroText');
+							$message .= '<br><br>';
+							$messagePost = GETPOST('message', 'restricthtml');
+							if (!dol_textishtml($messagePost)) {
+								$messagePost = dol_nl2br($messagePost);
+							}
+							$message .= $messagePost;
+
+							// Customer company infos
+							$message .= '<br><br>';
+							$message .= "==============================================";
+							$message .= !empty($object->thirdparty->name) ? '<br>'.$langs->trans('Thirdparty')." : ".$object->thirdparty->name : '';
+							$message .= !empty($object->thirdparty->town) ? '<br>'.$langs->trans('Town')." : ".$object->thirdparty->town : '';
+							$message .= !empty($object->thirdparty->phone) ? '<br>'.$langs->trans('Phone')." : ".$object->thirdparty->phone : '';
+
+							// Email send to
+							$message .= '<br><br>';
+							if (!empty($assigned_user_dont_have_email)) {
+								$message .= '<br>'.$langs->trans('NoEMail').' : '.$assigned_user_dont_have_email;
+							}
+							foreach ($sendto as $val) {
+								$message .= '<br>'.$langs->trans('TicketNotificationRecipient').' : '.$val;
+							}
+
+							// URL ticket
+							$url_internal_ticket = dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id;
+							$message .= '<br><br>';
+							$message .= $langs->trans('TicketNotificationEmailBodyInfosTrackUrlinternal').' : <a href="'.$url_internal_ticket.'">'.$object->track_id.'</a>';
+
 							$this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
 						}
 					}
-
+				}
+				/*
+				 * Private area
+				 */
+				else {
 					/*
-                     * Send emails for externals users if not private (linked contacts)
-                     */
-					if (empty($object->private)) {
-						// Retrieve email of all contacts (external)
-						$external_contacts = $object->getInfosTicketExternalContact();
-
-						// If no contact, get email from thirdparty
-						if (is_array($external_contacts) && count($external_contacts) === 0) {
-							if (!empty($object->fk_soc)) {
-								$object->fetch_thirdparty($object->fk_soc);
-								$array_company = array(array('firstname' => '', 'lastname' => $object->thirdparty->name, 'email' => $object->thirdparty->email, 'libelle' => $langs->transnoentities('Customer'), 'socid' => $object->thirdparty->id));
-								$external_contacts = array_merge($external_contacts, $array_company);
-							} elseif (empty($object->fk_soc) && !empty($object->origin_email)) {
-								$array_external = array(array('firstname' => '', 'lastname' => $object->origin_email, 'email' => $object->thirdparty->email, 'libelle' => $langs->transnoentities('Customer'), 'socid' => $object->thirdparty->id));
-								$external_contacts = array_merge($external_contacts, $array_external);
-							}
-						}
+					 * Send emails to internal users (linked contacts)
+					 */
+					if ($send_email > 0) {
+						// Retrieve internal contact datas
+						$internal_contacts = $object->getInfosTicketInternalContact();
 
 						$sendto = array();
-						if (is_array($external_contacts) && count($external_contacts) > 0) {
-							// altairis: get default subject for email to external contacts
+						if (is_array($internal_contacts) && count($internal_contacts) > 0) {
+							// altairis: set default subject
 							$label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
-							$subject = GETPOST('subject') ? GETPOST('subject') : '['.$label_title.'- ticket #'.$object->track_id.'] '.$langs->trans('TicketNewMessage');
+							$subject = GETPOST('subject', 'nohtml') ? GETPOST('subject', 'nohtml') : '['.$label_title.'- ticket #'.$object->track_id.'] '.$langs->trans('TicketNewMessage');
 
-							$message_intro = GETPOST('mail_intro') ? GETPOST('mail_intro') : $conf->global->TICKET_MESSAGE_MAIL_INTRO;
+							$message_intro = $langs->trans('TicketNotificationEmailBody', "#".$object->id);
 							$message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
 
-							// We put intro after
-							$message = GETPOST('message');
-							$message .= "\n\n";
+							$message = $langs->trans('TicketMessageMailIntroText');
+							$message .= '<br><br>';
+							$messagePost = GETPOST('message', 'restricthtml');
+							if (!dol_textishtml($messagePost)) {
+								$messagePost = dol_nl2br($messagePost);
+							}
+							$message .= $messagePost;
 
-							foreach ($external_contacts as $key => $info_sendto) {
-								// altairis: avoid duplicate emails to external contacts
-								if ($info_sendto['id'] == $user->contactid) {
+							//  Coordonnées client
+							$message .= '<br><br>';
+							$message .= "==============================================<br>";
+							$message .= !empty($object->thirdparty->name) ? $langs->trans('Thirdparty')." : ".$object->thirdparty->name : '';
+							$message .= !empty($object->thirdparty->town) ? '<br>'.$langs->trans('Town')." : ".$object->thirdparty->town : '';
+							$message .= !empty($object->thirdparty->phone) ? '<br>'.$langs->trans('Phone')." : ".$object->thirdparty->phone : '';
+
+							// Build array to display recipient list
+							foreach ($internal_contacts as $key => $info_sendto) {
+								// altairis: avoid duplicate notifications
+								if ($info_sendto['id'] == $user->id) {
 									continue;
 								}
 
-								if ($info_sendto['email'] != '' && $info_sendto['email'] != $object->origin_email) {
+								if ($info_sendto['email'] != '') {
 									if (!empty($info_sendto['email'])) $sendto[] = trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">";
 
+									//Contact type
 									$recipient = dolGetFirstLastname($info_sendto['firstname'], $info_sendto['lastname'], '-1').' ('.strtolower($info_sendto['libelle']).')';
-									$message .= (!empty($recipient) ? $langs->trans('TicketNotificationRecipient').' : '.$recipient."\n" : '');
+									$message .= (!empty($recipient) ? $langs->trans('TicketNotificationRecipient').' : '.$recipient.'<br>' : '');
 								}
 							}
+							$message .= '<br>';
+							// URL ticket
+							$url_internal_ticket = dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id;
 
-							// If public interface is not enable, use link to internal page into mail
-							$url_public_ticket = (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) ?
-								(!empty($conf->global->TICKET_URL_PUBLIC_INTERFACE) ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.$object->track_id;
-							$message .= "\n".$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$object->track_id.'</a>'."\n";
+							// altairis: make html link on url
+							$message .= '<br>'.$langs->trans('TicketNotificationEmailBodyInfosTrackUrlinternal').' : <a href="'.$url_internal_ticket.'">'.$object->track_id.'</a><br>';
 
-							// Build final message
-							$message = $message_intro.$message;
-
-							// Add signature
-							$message .= '<br>'.$message_signature;
-
-							if (!empty($object->origin_email)) {
-								$sendto[] = $object->origin_email;
-							}
-
-							if ($object->fk_soc > 0 && !in_array($object->origin_email, $sendto)) {
-								$object->socid = $object->fk_soc;
-								$object->fetch_thirdparty();
-								if (!empty($object->thirdparty->email)) $sendto[] = $object->thirdparty->email;
-							}
-
-							// altairis: Add global email address reciepient
+							// Add global email address recipient
 							if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
 								if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
 							}
 
-							// altairis: dont try to send email when no recipient
+							// altairis: dont try to send email if no recipient
 							if (!empty($sendto)) {
 								$this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
 							}
 						}
+
+						/*
+						 * Send emails for externals users if not private (linked contacts)
+						 */
+						if (empty($object->private)) {
+							// Retrieve email of all contacts (external)
+							$external_contacts = $object->getInfosTicketExternalContact();
+
+							// If no contact, get email from thirdparty
+							if (is_array($external_contacts) && count($external_contacts) === 0) {
+								if (!empty($object->fk_soc)) {
+									$object->fetch_thirdparty($object->fk_soc);
+									$array_company = array(array('firstname' => '', 'lastname' => $object->thirdparty->name, 'email' => $object->thirdparty->email, 'libelle' => $langs->transnoentities('Customer'), 'socid' => $object->thirdparty->id));
+									$external_contacts = array_merge($external_contacts, $array_company);
+								} elseif (empty($object->fk_soc) && !empty($object->origin_email)) {
+									$array_external = array(array('firstname' => '', 'lastname' => $object->origin_email, 'email' => $object->thirdparty->email, 'libelle' => $langs->transnoentities('Customer'), 'socid' => $object->thirdparty->id));
+									$external_contacts = array_merge($external_contacts, $array_external);
+								}
+							}
+
+							$sendto = array();
+							if (is_array($external_contacts) && count($external_contacts) > 0) {
+								// altairis: get default subject for email to external contacts
+								$label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
+								$subject = GETPOST('subject') ? GETPOST('subject') : '['.$label_title.'- ticket #'.$object->track_id.'] '.$langs->trans('TicketNewMessage');
+
+								$message_intro = GETPOST('mail_intro') ? GETPOST('mail_intro', 'restricthtml') : $conf->global->TICKET_MESSAGE_MAIL_INTRO;
+								$message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature', 'restricthtml') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
+								if (!dol_textishtml($message_intro)) {
+									$message_intro = dol_nl2br($message_intro);
+								}
+								if (!dol_textishtml($message_signature)) {
+									$message_signature = dol_nl2br($message_signature);
+								}
+
+								// We put intro after
+								$messagePost = GETPOST('message', 'restricthtml');
+								if (!dol_textishtml($messagePost)) {
+									$messagePost = dol_nl2br($messagePost);
+								}
+								$message = $messagePost;
+								$message .= '<br><br>';
+
+								foreach ($external_contacts as $key => $info_sendto) {
+									// altairis: avoid duplicate emails to external contacts
+									if ($info_sendto['id'] == $user->contact_id) {
+										continue;
+									}
+
+									if ($info_sendto['email'] != '' && $info_sendto['email'] != $object->origin_email) {
+										if (!empty($info_sendto['email'])) $sendto[] = trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email'].">";
+
+										$recipient = dolGetFirstLastname($info_sendto['firstname'], $info_sendto['lastname'], '-1').' ('.strtolower($info_sendto['libelle']).')';
+										$message .= (!empty($recipient) ? $langs->trans('TicketNotificationRecipient').' : '.$recipient.'<br>' : '');
+									}
+								}
+
+								// If public interface is not enable, use link to internal page into mail
+								$url_public_ticket = (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) ?
+										(!empty($conf->global->TICKET_URL_PUBLIC_INTERFACE) ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/view.php' : dol_buildpath('/public/ticket/view.php', 2)) : dol_buildpath('/ticket/card.php', 2)).'?track_id='.$object->track_id;
+								$message .= '<br>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$object->track_id.'</a><br>';
+
+								// Build final message
+								$message = $message_intro.'<br><br>'.$message;
+
+								// Add signature
+								$message .= '<br>'.$message_signature;
+
+								if (!empty($object->origin_email)) {
+									$sendto[] = $object->origin_email;
+								}
+
+								if ($object->fk_soc > 0 && !in_array($object->origin_email, $sendto)) {
+									$object->socid = $object->fk_soc;
+									$object->fetch_thirdparty();
+									if (!empty($object->thirdparty->email)) $sendto[] = $object->thirdparty->email;
+								}
+
+								// altairis: Add global email address reciepient
+								if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
+									if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
+								}
+
+								// altairis: dont try to send email when no recipient
+								if (!empty($sendto)) {
+									$this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
+								}
+							}
+						}
 					}
 				}
 
@@ -2671,8 +2812,6 @@ class Ticket extends CommonObject
 				$filename = $mimefilename_list;
 				$mimetype = $mimetype_list;
 
-				$message_to_send = dol_nl2br($message);
-
 				// Envoi du mail
 				if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 					$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
@@ -2680,7 +2819,7 @@ class Ticket extends CommonObject
 				}
 				include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 				$trackid = "tic".$this->id;
-				$mailfile = new CMailFile($subject, $receiver, $from, $message_to_send, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', $trackid);
+				$mailfile = new CMailFile($subject, $receiver, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', $trackid, '', 'ticket');
 				if ($mailfile->error) {
 					setEventMessages($mailfile->error, null, 'errors');
 				} else {
@@ -2771,9 +2910,7 @@ class Ticket extends CommonObject
 				}
 			}
 			return $response;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -2814,9 +2951,7 @@ class Ticket extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			return -1;
diff --git a/htdocs/ticket/class/ticketstats.class.php b/htdocs/ticket/class/ticketstats.class.php
index a6b4c23e70c..f2fd2155247 100644
--- a/htdocs/ticket/class/ticketstats.class.php
+++ b/htdocs/ticket/class/ticketstats.class.php
@@ -118,7 +118,7 @@ class TicketStats extends Stats
     {
         $sql = "SELECT date_format(datec,'%m') as dm, sum(".$this->field.")";
         $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datec,'%Y') = '".$year."'";
+        $sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
         $sql .= " AND ".$this->where;
         $sql .= " GROUP BY dm";
         $sql .= $this->db->order('dm', 'DESC');
@@ -138,7 +138,7 @@ class TicketStats extends Stats
     {
         $sql = "SELECT date_format(datec,'%m') as dm, avg(".$this->field.")";
         $sql .= " FROM ".$this->from;
-        $sql .= " WHERE date_format(datec,'%Y') = '".$year."'";
+        $sql .= " WHERE date_format(datec,'%Y') = '".$this->db->escape($year)."'";
         $sql .= " AND ".$this->where;
         $sql .= " GROUP BY dm";
         $sql .= $this->db->order('dm', 'DESC');
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index d48001a680e..e37db95c23d 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -195,9 +195,7 @@ if ($object->id)
   	$param = '&id='.$object->id;
 
   	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
     accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index cfd8e3f26f3..a6d9ad3d0b0 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -142,11 +142,11 @@ if (!$user->rights->societe->client->voir && !$socid) {
 
 // External users restriction
 if ($user->socid > 0) {
-    $sql .= " AND t.fk_soc='".$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;
+        $sql .= " AND t.fk_user_assign = ".$user->id;
     }
 }
 $sql .= " GROUP BY t.fk_statut";
@@ -305,7 +305,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
 }
 
 if ($user->socid > 0) {
-    $sql .= " AND t.fk_soc='".$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) {
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 8abacee8f47..d3521b6f5a0 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -61,8 +61,8 @@ $mode = GETPOST('mode', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
@@ -95,16 +95,14 @@ foreach ($object->fields as $key => $val)
 }
 
 // List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-	's.nom'=>"ThirdParty",
-	's.name_alias'=>"AliasNameShort",
-	's.zip'=>"Zip",
-	's.town'=>"Town",
-);
+$fieldstosearchall = array();
 foreach ($object->fields as $key => $val)
 {
 	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
+$fieldstosearchall['s.name_alias'] = "AliasNameShort";
+$fieldstosearchall['s.zip'] = "Zip";
+$fieldstosearchall['s.town'] = "Town";
 
 // Definition of fields for list
 $arrayfields = array();
@@ -387,9 +385,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 {
 	$num = $nbtotalofrecords;
-}
-else
-{
+} else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
@@ -572,8 +568,9 @@ print '<input type="hidden" name="mode" value="'.$mode.'" >';
 if ($socid)     print '<input type="hidden" name="socid" value="'.$socid.'" >';
 if ($projectid) print '<input type="hidden" name="projectid" value="'.$projectid.'" >';
 
-$newcardbutton = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewTicket'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/ticket/card.php?action=create'.($socid ? '&socid='.$socid : '').($projectid ? '&origin=projet_project&originid='.$projectid : ''), '', !empty($user->rights->ticket->write));
+$url = DOL_URL_ROOT.'/ticket/card.php?action=create'.($socid ? '&socid='.$socid : '').($projectid ? '&origin=projet_project&originid='.$projectid : '');
+if (!empty($socid)) $url .= '&socid='.$socid;
+$newcardbutton = dolGetButtonTitle($langs->trans('NewTicket'), '', 'fa fa-plus-circle', $url, '', $user->rights->ticket->write);
 
 $picto = 'ticket';
 if ($socid > 0) $picto = '';
@@ -641,7 +638,7 @@ foreach ($object->fields as $key => $val)
 			$formTicket->selectGroupTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150'));
 			print '</td>';
 		} elseif ($key == 'severity_code') {
-			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+			print '<td class="liste_titre center'.($cssforfield ? ' '.$cssforfield : '').'">';
 			$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') {
@@ -662,13 +659,15 @@ foreach ($object->fields as $key => $val)
 		    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")
-		{
+		} 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 : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+		} else {
+			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+			if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+			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]).'">';
+			print '</td>';
 		}
 	}
 }
@@ -693,7 +692,7 @@ print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val)
 {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'fk_statut') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	if ($key == 'fk_statut' || $key == 'severity_code') $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';
 	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
@@ -727,6 +726,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$cacheofoutputfield = array();
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
@@ -748,7 +748,7 @@ while ($i < min($num, $limit))
 		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($key, array('ref', 'fk_project'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowraponall';
-		if ($key == 'fk_statut') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if ($key == 'fk_statut' || $key == 'severity_code') $cssforfield .= ($cssforfield ? ' ' : '').'center';
 		if (!empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td';
@@ -759,18 +759,38 @@ while ($i < min($num, $limit))
 			if ($cssforfield || $val['css']) print '"';
 			print '>';
 			if ($key == 'fk_statut') print $object->getLibStatut(5);
-			elseif ($key == 'category_code') print $langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label');
-			elseif ($key == 'severity_code') print $langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label');
-			elseif ($key == 'type_code') print $langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label');
+			elseif ($key == 'type_code') {
+				$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code);
+				print '<span title="'.$s.'">';
+				print $s;
+				print '</span>';
+			}
+			elseif ($key == 'category_code') print $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
+			elseif ($key == 'severity_code') print $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
 			elseif ($key == 'tms') print dol_print_date($db->jdate($obj->$key), 'dayhour', 'tzuser');
 			elseif ($key == 'fk_user_create') {
 				if ($object->fk_user_create > 0) {
 					$user_create->fetch($object->fk_user_create);
 					print $user_create->getNomUrl(-1);
 				}
+			} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+			else {	// Example: key=fk_soc, obj->key=123 val=array('type'=>'integer', ...
+				$tmp = explode(':', $val['type']);
+				if ($tmp[0] == 'integer' && !empty($tmp[1]) && class_exists($tmp[1])) {
+					// It is a type of an foreign field. We will try to reduce the number of fetch that the showOutputField is making.
+					//var_dump('eeee-'.$key.'-'.$obj->$key.'-'.$val['type']);
+					if ($key && $obj->$key && $val['type'] && array_key_exists($key.'-'.$obj->$key.'-'.$val['type'], $cacheofoutputfield)) {
+						$result = $cacheofoutputfield[$key.'-'.$obj->$key.'-'.$val['type']];
+					} else {
+						$result = $object->showOutputField($val, $key, $obj->$key, '');
+						$cacheofoutputfield[$key.'-'.$obj->$key.'-'.$val['type']] = $result;
+					}
+				} else {
+					$result = $object->showOutputField($val, $key, $obj->$key, '');
+				}
+				print $result;
 			}
-			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']))
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 0a6c8067db5..fc0bce96cb8 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -56,9 +56,7 @@ if (GETPOST('actioncode', 'array'))
 {
 	$actioncode = GETPOST('actioncode', 'array', 3);
 	if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -234,9 +232,12 @@ if (!empty($object->id))
 
     $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/agenda.php?track_id='.$object->track_id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1);
 
+
 	// 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';
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index b39ba0fd366..fe66b9c2231 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -70,7 +70,7 @@ print load_fiche_titre($title, '', 'ticket');
 dol_mkdir($dir);
 
 $stats = new TicketStats($db, $socid, ($userid > 0 ? $userid : 0));
-if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND fk_statut IN ('.$db->escape($object_status).')';
+if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
 
 
 // Build graphic number of object
@@ -84,9 +84,7 @@ 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';
-}
-else
-{
+} else {
     $filenamenb = $dir.'/ticketsnbinyear-'.$year.'.png';
     $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsnbinyear-'.$year.'.png';
 }
@@ -125,9 +123,7 @@ 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';
-}
-else
-{
+} else {
     $filenameamount = $dir.'/ticketsamountinyear-'.$year.'.png';
     $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsamountinyear-'.$year.'.png';
 }
@@ -164,9 +160,7 @@ 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';
-}
-else
-{
+} else {
     $filename_avg = $dir.'/ticketsaverage-'.$year.'.png';
     $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=ticketstats&file=ticketsaverage-'.$year.'.png';
 }
@@ -309,8 +303,7 @@ 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 {
+if ($mesg) { print $mesg; } else {
     print $px1->show();
     print "<br>\n";
     //print $px2->show();
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 94e2beb985e..6690f6e933e 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -40,7 +40,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'usergroup'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index cd9ecf78390..52e97a48c0a 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -39,7 +39,7 @@ $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'user'; //Must be the $table_element of the class that manage extrafield
 
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 3bdc6b5390c..af7aa162790 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -71,9 +71,7 @@ $account = new UserBankAccount($db);
 if (!$bankid)
 {
 	$account->fetch(0, '', $id);
-}
-else
-{
+} else {
 	$account->fetch($bankid);
 }
 if (empty($account->userid)) $account->userid = $object->id;
@@ -106,9 +104,7 @@ if ($action == 'add' && !$cancel)
 	{
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
-	}
-	else
-	{
+	} else {
         setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
         $action = '';
 	}
@@ -118,6 +114,49 @@ if ($action == 'update' && !$cancel)
 {
     $account->userid = $object->id;
 
+    /*
+    if ($action == 'update' && !$cancel)
+    {
+    	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    	if ($canedituser)    // Case we can edit all field
+    	{
+    		$error = 0;
+
+    		if (!$error)
+    		{
+    			$objectuser->fetch($id);
+
+    			$objectuser->oldcopy = clone $objectuser;
+
+    			$db->begin();
+
+    			$objectuser->default_range = GETPOST('default_range');
+    			$objectuser->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat');
+
+    			if (!$error) {
+    				$ret = $objectuser->update($user);
+    				if ($ret < 0) {
+    					$error++;
+    					if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+    						$langs->load("errors");
+    						setEventMessages($langs->trans("ErrorLoginAlreadyExists", $objectuser->login), null, 'errors');
+    					} else {
+    						setEventMessages($objectuser->error, $objectuser->errors, 'errors');
+    					}
+    				}
+    			}
+
+    			if (!$error && !count($objectuser->errors)) {
+    				setEventMessages($langs->trans("UserModified"), null, 'mesgs');
+    				$db->commit();
+    			} else {
+    				$db->rollback();
+    			}
+    		}
+    	}
+    }*/
+
 	$account->bank            = GETPOST('bank', 'alpha');
 	$account->label           = GETPOST('label', 'alpha');
 	$account->courant         = GETPOST('courant', 'alpha');
@@ -137,9 +176,7 @@ if ($action == 'update' && !$cancel)
 	{
 		setEventMessages($account->error, $account->errors, 'errors');
 		$action = 'edit'; // Force chargement page edition
-	}
-	else
-	{
+	} else {
         setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
         $action = '';
     }
@@ -161,6 +198,23 @@ if ($action == 'setpersonal_mobile')
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
 
+// update default_c_exp_tax_cat
+if ($action == 'setdefault_c_exp_tax_cat')
+{
+	$object->default_c_exp_tax_cat = GETPOST('default_c_exp_tax_cat', 'int');
+	$result = $object->update($user);
+	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+}
+
+// update default range
+if ($action == 'setdefault_range')
+{
+	$object->default_range = GETPOST('default_range', 'int');
+	$result = $object->update($user);
+	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+}
+
+
 
 /*
  *	View
@@ -229,6 +283,51 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 	print '</td>';
 	print '</tr>';
 
+	if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
+	{
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("DefaultCategoryCar", 'default_c_exp_tax_cat', $object->default_c_exp_tax_cat, $object, $user->rights->user->user->creer);
+		print '</td><td>';
+		if ($action == 'editdefault_c_exp_tax_cat') {
+			$ret = '<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam ? '?'.$moreparam : '').'">';
+			$ret .= '<input type="hidden" name="action" value="setdefault_c_exp_tax_cat">';
+			$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$ret .= '<input type="hidden" name="id" value="'.$object->id.'">';
+			$ret .= $form->selectExpenseCategories($object->default_c_exp_tax_cat, 'default_c_exp_tax_cat', 1);
+			$ret .= '<input type="submit" class="button" name="modify" value="'.$langs->trans("Modify").'"> ';
+			$ret .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			$ret .= '</form>';
+			print $ret;
+		} else {
+			print dol_getIdFromCode($db, $object->default_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
+			//print $form->editfieldval("DefaultCategoryCar", 'default_c_exp_tax_cat', $object->default_c_exp_tax_cat, $object, $user->rights->user->user->creer, 'string', ($object->default_c_exp_tax_cat != '' ? $object->default_c_exp_tax_cat : ''));
+		}
+		print '</td>';
+		print '</tr>';
+
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("DefaultRangeNumber", 'default_range', $object->default_range, $object, $user->rights->user->user->creer);
+		print '</td><td>';
+		if ($action == 'editdefault_range') {
+			$ret = '<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam ? '?'.$moreparam : '').'">';
+			$ret .= '<input type="hidden" name="action" value="setdefault_range">';
+			$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$ret .= '<input type="hidden" name="id" value="'.$object->id.'">';
+			$maxRangeNum = ExpenseReportIk::getMaxRangeNumber($object->default_c_exp_tax_cat);
+			$ret .= $form->selectarray('default_range', range(0, $maxRangeNum), $object->default_range);
+			$ret .= '<input type="submit" class="button" name="modify" value="'.$langs->trans("Modify").'"> ';
+			$ret .= '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+			$ret .= '</form>';
+			print $ret;
+		} else {
+			print $object->default_range;
+		}
+		print '</td>';
+		print '</tr>';
+	}
+
     print '</table>';
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
@@ -283,9 +382,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -339,9 +436,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
@@ -394,9 +489,7 @@ if ($action != 'edit' && $action != 'create')		// If not bank account yet, $acco
 
 			if ($num <= 0) print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
 			print "</table>";
-		}
-		else
-		{
+		} else {
 			dol_print_error($db);
 		}
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 40ff6625163..35917eba093 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2018 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
@@ -44,6 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -60,6 +61,12 @@ $group = GETPOST("group", "int", 3);
 $cancel		= GETPOST('cancel', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'useracard'; // To manage different context of search
 
+$dateemployment = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth', 'int'), GETPOST('dateemploymentday', 'int'), GETPOST('dateemploymentyear', 'int'));
+$dateemploymentend = dol_mktime(0, 0, 0, GETPOST('dateemploymentendmonth', 'int'), GETPOST('dateemploymentendday', 'int'), GETPOST('dateemploymentendyear', 'int'));
+$datestartvalidity = dol_mktime(0, 0, 0, GETPOST('datestartvaliditymonth', 'int'), GETPOST('datestartvalidityday', 'int'), GETPOST('datestartvalidityyear', 'int'));
+$dateendvalidity = dol_mktime(0, 0, 0, GETPOST('dateendvaliditymonth', 'int'), GETPOST('dateendvalidityday', 'int'), GETPOST('dateendvalidityyear', 'int'));
+$dateofbirth = dol_mktime(0, 0, 0, GETPOST('dateofbirthmonth', 'int'), GETPOST('dateofbirthday', 'int'), GETPOST('dateofbirthyear', 'int'));
+
 // Define value to know what current user can do on users
 $canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
 $canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
@@ -110,6 +117,7 @@ $hookmanager->initHooks(array('usercard', 'globalcard'));
 /**
  * Actions
  */
+
 $parameters = array('id' => $id, 'socid' => $socid, 'group' => $group, 'caneditgroup' => $caneditgroup);
 $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');
@@ -157,7 +165,7 @@ if (empty($reshook)) {
 
 			$object = new User($db);
 			$object->fetch($id);
-            $object->oldcopy = clone $object;
+			$object->oldcopy = clone $object;
 
 			$result = $object->delete($user);
 			if ($result < 0) {
@@ -201,8 +209,6 @@ if (empty($reshook)) {
 			$object->login = GETPOST("login", 'alphanohtml');
 			$object->api_key = GETPOST("api_key", 'alphanohtml');
 			$object->gender = GETPOST("gender", 'aZ09');
-			$birth = dol_mktime(0, 0, 0, GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
-			$object->birth = $birth;
 			$object->admin = GETPOST("admin", 'int');
 			$object->address = GETPOST('address', 'alphanohtml');
 			$object->zip = GETPOST('zipcode', 'alphanohtml');
@@ -225,10 +231,11 @@ if (empty($reshook)) {
 			}
 
 			$object->email = preg_replace('/\s+/', '', GETPOST("email", 'alphanohtml'));
-			$object->job = GETPOST("job", 'nohtml');
-			$object->signature = GETPOST("signature", 'none');
+			$object->job = GETPOST("job", 'alphanohtml');
+			$object->signature = GETPOST("signature", 'restricthtml');
 			$object->accountancy_code = GETPOST("accountancy_code", 'alphanohtml');
-			$object->note = GETPOST("note", 'none');
+			$object->note = GETPOST("note", 'restricthtml');
+			$object->note_private = GETPOST("note", 'restricthtml');
 			$object->ldap_sid = GETPOST("ldap_sid", 'alphanohtml');
 			$object->fk_user = GETPOST("fk_user", 'int') > 0 ? GETPOST("fk_user", 'int') : 0;
 			$object->fk_user_expense_validator = GETPOST("fk_user_expense_validator", 'int') > 0 ? GETPOST("fk_user_expense_validator", 'int') : 0;
@@ -245,14 +252,17 @@ if (empty($reshook)) {
 			$object->weeklyhours = GETPOST("weeklyhours", 'alphanohtml') != '' ? GETPOST("weeklyhours", 'alphanohtml') : '';
 
 			$object->color = GETPOST("color", 'alphanohtml') != '' ? GETPOST("color", 'alphanohtml') : '';
-			$dateemployment = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth', 'int'), GETPOST('dateemploymentday', 'int'), GETPOST('dateemploymentyear', 'int'));
-			$object->dateemployment = $dateemployment;
 
-			$dateemploymentend = dol_mktime(0, 0, 0, GETPOST('dateemploymentendmonth', 'int'), GETPOST('dateemploymentendday', 'int'), GETPOST('dateemploymentendyear', 'int'));
+			$object->dateemployment = $dateemployment;
 			$object->dateemploymentend = $dateemploymentend;
+			$object->datestartvalidity = $datestartvalidity;
+			$object->dateendvalidity = $dateendvalidity;
+			$object->birth = $dateofbirth;
 
 			$object->fk_warehouse = GETPOST('fk_warehouse', 'int');
 
+			$object->lang = GETPOST('default_lang', 'aZ09');
+
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
 			if ($ret < 0) {
@@ -294,9 +304,7 @@ if (empty($reshook)) {
 
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				$langs->load("errors");
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -325,9 +333,7 @@ if (empty($reshook)) {
 			if ($result > 0) {
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
 				exit;
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -364,8 +370,6 @@ if (empty($reshook)) {
 				$object->firstname = GETPOST("firstname", 'alphanohtml');
 				$object->login = GETPOST("login", 'alphanohtml');
 				$object->gender = GETPOST("gender", 'aZ09');
-				$birth = dol_mktime(0, 0, 0, GETPOST('birthmonth', 'int'), GETPOST('birthday', 'int'), GETPOST('birthyear', 'int'));
-				$object->birth = $birth;
 				$object->pass = GETPOST("password", 'none');
 				$object->api_key = (GETPOST("api_key", 'alphanohtml')) ? GETPOST("api_key", 'alphanohtml') : $object->api_key;
 				if (!empty($user->admin)) $object->admin = GETPOST("admin", "int"); // admin flag can only be set/unset by an admin user. A test is also done later when forging sql request
@@ -388,8 +392,8 @@ if (empty($reshook)) {
 					}
 				}
 				$object->email = preg_replace('/\s+/', '', GETPOST("email", 'alphanohtml'));
-				$object->job = GETPOST("job", 'nohtml');
-				$object->signature = GETPOST("signature", 'none');
+				$object->job = GETPOST("job", 'alphanohtml');
+				$object->signature = GETPOST("signature", 'restricthtml');
 				$object->accountancy_code = GETPOST("accountancy_code", 'alphanohtml');
 				$object->openid = GETPOST("openid", 'alphanohtml');
 				$object->fk_user = GETPOST("fk_user", 'int') > 0 ? GETPOST("fk_user", 'int') : 0;
@@ -409,33 +413,31 @@ if (empty($reshook)) {
 				$object->weeklyhours = price2num($object->weeklyhours);
 
 				$object->color = GETPOST("color", 'alphanohtml') != '' ? GETPOST("color", 'alphanohtml') : '';
-				$dateemployment = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth', 'int'), GETPOST('dateemploymentday', 'int'), GETPOST('dateemploymentyear', 'int'));
 				$object->dateemployment = $dateemployment;
-				$dateemploymentend = dol_mktime(0, 0, 0, GETPOST('dateemploymentendmonth', 'int'), GETPOST('dateemploymentendday', 'int'), GETPOST('dateemploymentendyear', 'int'));
 				$object->dateemploymentend = $dateemploymentend;
+				$object->datestartvalidity = $datestartvalidity;
+				$object->dateendvalidity = $dateendvalidity;
+				$object->birth = $dateofbirth;
 
-                if (!empty($conf->stock->enabled))
-                {
-				    $object->fk_warehouse = GETPOST('fk_warehouse', 'int');
-                }
+				if (!empty($conf->stock->enabled))
+				{
+					$object->fk_warehouse = GETPOST('fk_warehouse', 'int');
+				}
+
+				$object->lang = GETPOST('default_lang', 'aZ09');
 
 				if (!empty($conf->multicompany->enabled))
 				{
 					if (!empty($_POST["superadmin"]))
 					{
 						$object->entity = 0;
-					}
-					elseif (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+					} elseif (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
 					{
 						$object->entity = 1; // all users in master entity
-					}
-					else
-					{
+					} else {
 						$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
 					}
-				}
-				else
-				{
+				} else {
 					$object->entity = (!GETPOST('entity', 'int') ? 0 : GETPOST('entity', 'int'));
 				}
 
@@ -450,18 +452,16 @@ if (empty($reshook)) {
 				}
 				if (!empty($_FILES['photo']['name']))
 				{
-				    $isimage = image_format_supported($_FILES['photo']['name']);
-				    if ($isimage > 0)
-				    {
-    					$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
-				    }
-				    else
-				    {
-				        $error++;
-				        $langs->load("errors");
-				        setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
-				        dol_syslog($langs->transnoentities("ErrorBadImageFormat"), LOG_INFO);
-				    }
+					$isimage = image_format_supported($_FILES['photo']['name']);
+					if ($isimage > 0)
+					{
+						$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
+					} else {
+						$error++;
+						$langs->load("errors");
+						setEventMessages($langs->trans("ErrorBadImageFormat"), null, 'errors');
+						dol_syslog($langs->transnoentities("ErrorBadImageFormat"), LOG_INFO);
+					}
 				}
 
 				if (!$error) {
@@ -471,9 +471,7 @@ if (empty($reshook)) {
 						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 							$langs->load("errors");
 							setEventMessages($langs->trans("ErrorLoginAlreadyExists", $object->login), null, 'errors');
-						}
-						else
-						{
+						} else {
 							setEventMessages($object->error, $object->errors, 'errors');
 						}
 					}
@@ -559,14 +557,11 @@ if (empty($reshook)) {
 						$langs->load("errors");
 						setEventMessages($langs->transnoentitiesnoconv("WarningYourLoginWasModifiedPleaseLogin"), null, 'warnings');
 					}
-				}
-				else {
+				} else {
 					$db->rollback();
 				}
 			}
-		}
-		else
-		{
+		} else {
 			if ($caneditpassword)    // Case we can edit only password
 			{
 				dol_syslog("Not allowed to change fields, only password");
@@ -602,14 +597,10 @@ if (empty($reshook)) {
 				if ($object->send_password($user, $newpassword) > 0)
 				{
 					setEventMessages($langs->trans("PasswordChangedAndSentTo", $object->email), null, 'mesgs');
-				}
-				else
-				{
+				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("PasswordChangedTo", $newpassword), null, 'warnings');
 			}
 		}
@@ -665,9 +656,7 @@ if (empty($reshook)) {
 					$ldap_sid = $attribute[$conf->global->LDAP_FIELD_SID];
 				}
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -693,6 +682,7 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
+$formadmin = new FormAdmin($db);
 $formfile = new FormFile($db);
 if (!empty($conf->stock->enabled)) $formproduct = new FormProduct($db);
 
@@ -764,14 +754,10 @@ if ($action == 'create' || $action == 'adduserldap')
 					}
 					$liste[$key] = $label;
 				}
-			}
-			else
-			{
+			} else {
 				setEventMessages($ldap->error, $ldap->errors, 'errors');
 			}
-		}
-		else
-		{
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 
@@ -821,9 +807,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" id="lastname" name="lastname" value="'.dol_escape_htmltag($ldap_lastname).'">';
 		print $ldap_lastname;
-	}
-	else
-	{
+	} else {
 		print '<input class="minwidth100" type="text" id="lastname" name="lastname" value="'.dol_escape_htmltag(GETPOST('lastname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -835,9 +819,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="firstname" value="'.dol_escape_htmltag($ldap_firstname).'">';
 		print $ldap_firstname;
-	}
-	else
-	{
+	} else {
 		print '<input class="minwidth100" type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST('firstname', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -849,14 +831,11 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="login" value="'.dol_escape_htmltag($ldap_login).'">';
 		print $ldap_login;
-	}
-	elseif (!empty($ldap_loginsmb))
+	} elseif (!empty($ldap_loginsmb))
 	{
 		print '<input type="hidden" name="login" value="'.dol_escape_htmltag($ldap_loginsmb).'">';
 		print $ldap_loginsmb;
-	}
-	else
-	{
+	} else {
 		print '<input class="maxwidth200" maxsize="24" type="text" name="login" value="'.dol_escape_htmltag(GETPOST('login', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -886,9 +865,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		{
 			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input type="hidden" name="password" value="'.$ldap_pass.'">'; // Dolibarr password is preffiled with LDAP known password
 			$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
-		}
-		else
-		{
+		} else {
 			// We do not use a field password but a field text to show new password to use.
 			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input size="30" maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
 		}
@@ -913,9 +890,7 @@ if ($action == 'create' || $action == 'adduserldap')
 		if (!empty($conf->use_javascript_ajax))
 			print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
 		print '</td></tr>';
-	}
-	else
-	{
+	} else {
 		// PARTIAL WORKAROUND
 		$generated_fake_api_key = getRandomPassword(false);
 		print '<input type="hidden" name="api_key" value="'.$generated_fake_api_key.'">';
@@ -974,7 +949,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	// Gender
 	print '<tr><td>'.$langs->trans("Gender").'</td>';
 	print '<td>';
-	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
+	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
 	print $form->selectarray('gender', $arraygender, GETPOST('gender'), 1);
 	print '</td></tr>';
 
@@ -1059,9 +1034,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="office_phone" value="'.dol_escape_htmltag($ldap_phone).'">';
 		print $ldap_phone;
-	}
-	else
-	{
+	} else {
 		print '<input size="20" type="text" name="office_phone" value="'.dol_escape_htmltag(GETPOST('office_phone', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1073,9 +1046,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="user_mobile" value="'.dol_escape_htmltag($ldap_mobile).'">';
 		print $ldap_mobile;
-	}
-	else
-	{
+	} else {
 		print '<input size="20" type="text" name="user_mobile" value="'.dol_escape_htmltag(GETPOST('user_mobile', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1087,9 +1058,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="office_fax" value="'.dol_escape_htmltag($ldap_fax).'">';
 		print $ldap_fax;
-	}
-	else
-	{
+	} else {
 		print '<input size="20" type="text" name="office_fax" value="'.dol_escape_htmltag(GETPOST('office_fax', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1101,9 +1070,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<input type="hidden" name="email" value="'.dol_escape_htmltag($ldap_mail).'">';
 		print $ldap_mail;
-	}
-	else
-	{
+	} else {
 		print '<input size="40" type="text" name="email" value="'.dol_escape_htmltag(GETPOST('email', 'alphanohtml')).'">';
 	}
 	print '</td></tr>';
@@ -1130,73 +1097,6 @@ if ($action == 'create' || $action == 'adduserldap')
 			}
 		}
 	}
-	// // Skype
-	// if (! empty($conf->socialnetworks->enabled))
-	// {
-	// 	print '<tr><td>'.$langs->trans("Skype").'</td>';
-	// 	print '<td>';
-	// 	if (! empty($ldap_skype))
-	// 	{
-	// 		print '<input type="hidden" name="skype" value="'.$ldap_skype.'">';
-	// 		print $ldap_skype;
-	// 	}
-	// 	else
-	// 	{
-	// 		print '<input class="maxwidth200" type="text" name="skype" value="'.GETPOST('skype', 'alpha').'">';
-	// 	}
-	// 	print '</td></tr>';
-	// }
-
-	// // Twitter
-	// if (! empty($conf->socialnetworks->enabled))
-	// {
-	// 	print '<tr><td>'.$langs->trans("Twitter").'</td>';
-	// 	print '<td>';
-	// 	if (! empty($ldap_twitter))
-	// 	{
-	// 		print '<input type="hidden" name="twitter" value="'.$ldap_twitter.'">';
-	// 		print $ldap_twitter;
-	// 	}
-	// 	else
-	// 	{
-	// 		print '<input class="maxwidth200" type="text" name="twitter" value="'.GETPOST('twitter', 'alpha').'">';
-	// 	}
-	// 	print '</td></tr>';
-	// }
-
-	// // Facebook
-	// if (! empty($conf->socialnetworks->enabled))
-	// {
-	// 	print '<tr><td>'.$langs->trans("Facebook").'</td>';
-	// 	print '<td>';
-	// 	if (! empty($ldap_facebook))
-	// 	{
-	// 		print '<input type="hidden" name="facebook" value="'.$ldap_facebook.'">';
-	// 		print $ldap_facebook;
-	// 	}
-	// 	else
-	// 	{
-	// 		print '<input class="maxwidth200" type="text" name="facebook" value="'.GETPOST('facebook', 'alpha').'">';
-	// 	}
-	// 	print '</td></tr>';
-	// }
-
-    // // LinkedIn
-    // if (! empty($conf->socialnetworks->enabled))
-    // {
-    //     print '<tr><td>'.$langs->trans("LinkedIn").'</td>';
-    //     print '<td>';
-    //     if (! empty($ldap_linkedin))
-    //     {
-    //         print '<input type="hidden" name="linkedin" value="'.$ldap_linkedin.'">';
-    //         print $ldap_linkedin;
-    //     }
-    //     else
-    //     {
-    //         print '<input class="maxwidth200" type="text" name="linkedin" value="'.GETPOST('linkedin', 'alpha').'">';
-    //     }
-    //     print '</td></tr>';
-    // }
 
 	// Accountancy code
 	if ($conf->accounting->enabled)
@@ -1221,10 +1121,18 @@ if ($action == 'create' || $action == 'adduserldap')
 	{
 		print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
-        print $form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, null, '90%');
+		print $form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), null, null, null, null, '90%');
 		print "</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->lang ? $object->lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
+		print '</td>';
+		print '</tr>';
+	}
+
 	// Multicompany
 	if (!empty($conf->multicompany->enabled) && is_object($mc))
 	{
@@ -1236,9 +1144,7 @@ if ($action == 'create' || $action == 'adduserldap')
 				 print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
 				 print "<td>".$mc->select_entities($conf->entity);
 				 print "</td></tr>\n";
-			}
-			else
-			{
+			} else {
 				 print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 			}
 		}
@@ -1253,7 +1159,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	print $langs->trans("Note");
 	print '</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('note', GETPOSTISSET('note') ?GETPOST('note', 'none') : '', '', 120, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
+	$doleditor = new DolEditor('note', GETPOSTISSET('note') ? GETPOST('note', 'restricthtml') : '', '', 120, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
 	$doleditor->Create();
 	print "</td></tr>\n";
 
@@ -1261,7 +1167,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	print '<tr><td class="tdtop">'.$langs->trans("Signature").'</td>';
 	print '<td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('signature', GETPOST('signature'), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
+	$doleditor = new DolEditor('signature', GETPOST('signature', 'restricthtml'), '', 138, 'dolibarr_notes', 'In', true, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
 	print $doleditor->Create(1);
 	print '</td></tr>';
 
@@ -1272,8 +1178,8 @@ if ($action == 'create' || $action == 'adduserldap')
 	// TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
 
 	// Default warehouse
-	if (!empty($conf->stock->enabled) && !empty($conf->global->USER_DEFAULT_WAREHOUSE))	// TODO What is goal of this. How it is used ?
-    {
+	if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER))
+	{
 		print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 		print $formproduct->selectWarehouses($object->fk_warehouse, 'fk_warehouse', 'warehouseopen', 1);
 		print '</td></tr>';
@@ -1282,7 +1188,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	// Position/Job
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("PostOrFunction").'</td>';
 	print '<td>';
-	print '<input class="maxwidth200" type="text" name="job" value="'.dol_escape_htmltag(GETPOST('job', 'nohtml')).'">';
+	print '<input class="maxwidth200" type="text" name="job" value="'.dol_escape_htmltag(GETPOST('job', 'alphanohtml')).'">';
 	print '</td></tr>';
 
 	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
@@ -1328,21 +1234,29 @@ if ($action == 'create' || $action == 'adduserldap')
 	// Date employment
 	print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
 	print '<td>';
-	print $form->selectDate(GETPOST('dateemployment'), 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 0);
+	print $form->selectDate($dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 1);
+
+	print ' - ';
+
+	print $form->selectDate($dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
 	print '</td>';
 	print "</tr>\n";
 
-	// Date employment END
-	print '<tr><td>'.$langs->trans("DateEmploymentEnd").'</td>';
+	// Date validity
+	print '<tr><td>'.$langs->trans("RangeOfLoginValidity").'</td>';
 	print '<td>';
-	print $form->selectDate(GETPOST('dateemploymentend'), 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
+	print $form->selectDate($datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 1);
+
+	print ' - ';
+
+	print $form->selectDate($dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0);
 	print '</td>';
 	print "</tr>\n";
 
 	// Date birth
-	print '<tr><td>'.$langs->trans("DateToBirth").'</td>';
+	print '<tr><td>'.$langs->trans("DateOfBirth").'</td>';
 	print '<td>';
-	print $form->selectDate(GETPOST('birth'), 'birth', 0, 0, 1, 'createuser', 1, 0);
+	print $form->selectDate($dateofbirth, 'dateofbirth', 0, 0, 1, 'createuser', 1, 0);
 	print '</td>';
 	print "</tr>\n";
 
@@ -1357,9 +1271,7 @@ if ($action == 'create' || $action == 'adduserldap')
 	print '</div>';
 
 	print "</form>";
-}
-else
-{
+} else {
 	/* ************************************************************************** */
 	/*                                                                            */
 	/* View and edition                                                            */
@@ -1410,9 +1322,7 @@ else
 							$statutUACF = $statut;
 						}
 					}
-				}
-				else
-				{
+				} else {
 					$userDisabled = 1;
 					$statutUACF = "ACCOUNTDISABLE";
 				}
@@ -1429,9 +1339,7 @@ else
 		{
 			$title = $langs->trans("Employee");
 			$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/employee/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-		}
-		else
-		{
+		} else {
 			$title = $langs->trans("User");
 			$linkback = '';
 
@@ -1502,9 +1410,7 @@ else
 			if (!empty($object->ldap_sid) && $object->statut == 0)
 			{
 				print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-			}
-			else
-			{
+			} else {
 				print '<td>'.$object->login.'</td>';
 			}
 			print '</tr>'."\n";
@@ -1521,22 +1427,16 @@ else
 					if ($passDoNotExpire)
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("LdapUacf_".$statutUACF);
-					}
-					elseif ($userChangePassNextLogon)
+					} elseif ($userChangePassNextLogon)
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("UserMustChangePassNextLogon", $ldap->domainFQDN).'</span>';
-					}
-					elseif ($userDisabled)
+					} elseif ($userDisabled)
 					{
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="warning">'.$langs->trans("LdapUacf_".$statutUACF, $ldap->domainFQDN).'</span>';
-					}
-					else
-					{
+					} else {
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
 					}
-				}
-				else
-				{
+				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("PasswordOfUserInLDAP");
 				}
 			}
@@ -1546,10 +1446,17 @@ else
 			}
 			if (preg_match('/dolibarr/', $dolibarr_main_authentication))
 			{
-				if ($object->pass) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
-				else
-				{
-					if ($user->admin) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').$langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
+				if ($object->pass) {
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
+					$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+				} else {
+					if ($user->admin && $user->id == $object->id) {
+						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
+						//$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Crypted").' - </span>';
+						$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+						// TODO Add a feature to reveal the hash
+						$valuetoshow .= '<!-- Crypted into '.$object->pass_indatabase_crypted.' -->';
+					}
 					else $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
 				}
 			}
@@ -1568,7 +1475,10 @@ else
 			if (!empty($conf->api->enabled) && $user->admin) {
 				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 				print '<td>';
-				if (!empty($object->api_key)) print preg_replace('/./', '*', $object->api_key);
+				if (!empty($object->api_key)) print '<span class="opacitymedium">'.preg_replace('/./', '*', $object->api_key).'</span>';
+				if ($user->admin || $user->id == $object->id) {
+					// TODO Add a feature to reveal the hash
+				}
 				print '</td></tr>';
 			}
 
@@ -1577,13 +1487,10 @@ else
 			if (!empty($conf->multicompany->enabled) && $object->admin && !$object->entity)
 			{
 				print $form->textwithpicto(yn($object->admin), $langs->trans("SuperAdministratorDesc"), 1, "superadmin");
-			}
-			elseif ($object->admin)
+			} elseif ($object->admin)
 			{
 				print $form->textwithpicto(yn($object->admin), $langs->trans("AdministratorDesc"), 1, "admin");
-			}
-			else
-			{
+			} else {
 				print yn($object->admin);
 			}
 			print '</td></tr>'."\n";
@@ -1594,7 +1501,7 @@ else
 			print $form->textwithpicto($text, $langs->trans("InternalExternalDesc"));
 			print '</td><td>';
 			$type = $langs->trans("Internal");
-			if ($object->societe_id > 0) $type = $langs->trans("External");
+			if ($object->socid > 0) $type = $langs->trans("External");
 			print $type;
 			if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
 			print '</td></tr>'."\n";
@@ -1625,8 +1532,7 @@ else
 			print '<td>';
 			if (empty($object->fk_user)) {
 				print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
-			}
-			else {
+			} else {
 				$huser = new User($db);
 				$huser->fetch($object->fk_user);
 				print $huser->getNomUrl(1);
@@ -1667,28 +1573,28 @@ else
 			}
 
 			// Default warehouse
-			if (!empty($conf->stock->enabled) && !empty($conf->global->USER_DEFAULT_WAREHOUSE))	// TODO What is goal of this. How it is used ?
-            {
+			if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER))
+			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 				$warehousestatic = new Entrepot($db);
 				$warehousestatic->fetch($object->fk_warehouse);
 				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
 				print $warehousestatic->getNomUrl(1);
 				print '</td></tr>';
-            }
+			}
 
-            // Position/Job
-            print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
-            print '<td>'.$object->job.'</td>';
-            print '</tr>'."\n";
+			// Position/Job
+			print '<tr><td>'.$langs->trans("PostOrFunction").'</td>';
+			print '<td>'.dol_escape_htmltag($object->job).'</td>';
+			print '</tr>'."\n";
 
-            //$childids = $user->getAllChildIds(1);
+			//$childids = $user->getAllChildIds(1);
 
 			if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 				|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read)))
 			{
-            	// Even a superior can't see this info of its subordinates wihtout $user->rights->salaries->read and $user->rights->hrm->employee->read (setting/viewing is reserverd to HR people).
-            	// However, he can see the valuation of timesheet of its subordinates even without these permissions.
+				// Even a superior can't see this info of its subordinates wihtout $user->rights->salaries->read and $user->rights->hrm->employee->read (setting/viewing is reserverd to HR people).
+				// However, he can see the valuation of timesheet of its subordinates even without these permissions.
 				$langs->load("salaries");
 
 				// THM
@@ -1727,21 +1633,35 @@ else
 			print "</tr>\n";
 
 			// Date employment
-			print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
+			print '<tr><td>'.$langs->trans("DateOfEmployment").'</td>';
 			print '<td>';
-			print dol_print_date($object->dateemployment, 'day');
+			if ($object->dateemployment) {
+				print '<span class="opacitymedium">'.$langs->trans("FromDate").'</span> ';
+				print dol_print_date($object->dateemployment, 'day');
+			}
+			if ($object->dateemploymentend) {
+				print '<span class="opacitymedium"> - '.$langs->trans("To").'</span> ';
+				print dol_print_date($object->dateemploymentend, 'day');
+			}
 			print '</td>';
 			print "</tr>\n";
 
-			// Date employment
-			print '<tr><td>'.$langs->trans("DateEmploymentEnd").'</td>';
+			// Date login validity
+			print '<tr><td>'.$langs->trans("RangeOfLoginValidity").'</td>';
 			print '<td>';
-			print dol_print_date($object->dateemploymentend);
+			if ($object->datestartvalidity) {
+				print '<span class="opacitymedium">'.$langs->trans("FromDate").'</span> ';
+				print dol_print_date($object->datestartvalidity, 'day');
+			}
+			if ($object->dateendvalidity) {
+				print '<span class="opacitymedium"> - '.$langs->trans("To").'</span> ';
+				print dol_print_date($object->dateendvalidity, 'day');
+			}
 			print '</td>';
 			print "</tr>\n";
 
 			// Date of birth
-			print '<tr><td>'.$langs->trans("DateToBirth").'</td>';
+			print '<tr><td>'.$langs->trans("DateOfBirth").'</td>';
 			print '<td>';
 			print dol_print_date($object->birth, 'day');
 			print '</td>';
@@ -1781,6 +1701,19 @@ else
 				print '</td></tr>';
 			}
 
+			// Default language
+			if (!empty($conf->global->MAIN_MULTILANGS))
+			{
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+				print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
+				//$s=picto_from_langcode($object->default_lang);
+				//print ($s?$s.' ':'');
+				$langs->load("languages");
+				$labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : '');
+				print $form->textwithpicto($labellang, $langs->trans("WarningNotLangOfInterface", $langs->transnoentitiesnoconv("UserGUISetup")));
+				print '</td></tr>';
+			}
+
 			if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication) && !empty($conf->global->MAIN_OPENIDURL_PERUSER))
 			{
 				print '<tr><td>'.$langs->trans("OpenIDURL").'</td>';
@@ -1796,24 +1729,24 @@ else
 			print '<td>'.dol_print_date($object->datepreviouslogin, "dayhour").'</td>';
 			print "</tr>\n";
 
-		    // Multicompany
+			// Multicompany
 			if (!empty($conf->multicompany->enabled) && is_object($mc))
 			{
 				// This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
 				if (!method_exists($mc, 'formObjectOptions'))
 				{
-				    if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity)
-				    {
-				     	print '<tr><td>'.$langs->trans("Entity").'</td><td>';
-				     	if (empty($object->entity)) {
-				     		print $langs->trans("AllEntities");
-				     	} else {
-				     		$mc->getInfo($object->entity);
-				     		print $mc->label;
-				     	}
-				     	print "</td></tr>\n";
-				    }
-                }
+					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity)
+					{
+					 	print '<tr><td>'.$langs->trans("Entity").'</td><td>';
+					 	if (empty($object->entity)) {
+					 		print $langs->trans("AllEntities");
+					 	} else {
+					 		$mc->getInfo($object->entity);
+					 		print $mc->label;
+					 	}
+					 	print "</td></tr>\n";
+					}
+				}
 			}
 
 			// Other attributes
@@ -1829,15 +1762,13 @@ else
 					$societe = new Societe($db);
 					$societe->fetch($object->socid);
 					print $societe->getNomUrl(1, '');
-				}
-				else
-				{
+				} else {
 					print $langs->trans("ThisUserIsNot");
 				}
-				if (!empty($object->contactid))
+				if (!empty($object->contact_id))
 				{
 					$contact = new Contact($db);
-					$contact->fetch($object->contactid);
+					$contact->fetch($object->contact_id);
 					if ($object->socid > 0) print ' / ';
 					else print '<br>';
 					print $contact->getNomUrl(1, '');
@@ -1858,9 +1789,7 @@ else
 					$adh->fetch($object->fk_member);
 					$adh->ref = $adh->getFullname($langs); // Force to show login instead of id
 					print $adh->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print $langs->trans("UserNotLinkedToMember");
 				}
 				print '</td>';
@@ -1872,6 +1801,15 @@ else
 			print dol_htmlentitiesbr($object->signature);
 			print "</td></tr>\n";
 
+			//VCard
+			print '<tr><td class="tdtop">'.$langs->trans("VCard").'</td>';
+			print '<td>';
+			print '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'">';
+			print img_picto($langs->trans("Download"), 'vcard.png', 'class="paddingrightonly"');
+			print $langs->trans("Download");
+			print '</a>';
+			print "</td></tr>\n";
+
 			print "</table>\n";
 			print '</div>';
 
@@ -1897,9 +1835,7 @@ else
 					{
 						$langs->load("mails");
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-					}
-					else
-					{
+					} else {
 						$langs->load("mails");
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
 					}
@@ -1910,13 +1846,10 @@ else
 					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
-					}
-					else
-					{
+					} else {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
 					}
-				}
-				elseif ($caneditpassword && !$object->ldap_sid &&
+				} elseif ($caneditpassword && !$object->ldap_sid &&
 				(empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a></div>';
@@ -1928,8 +1861,7 @@ else
 					if ($object->statut == 0)
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
-					}
-					elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
 					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 					{
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a></div>';
@@ -1938,8 +1870,7 @@ else
 					if ($object->statut == 0)
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
-					}
-					elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
 					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 					{
 						if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
@@ -1958,13 +1889,11 @@ else
 				((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
 				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
-				}
-				else
-				{
-				    if ($user->id == $id)
-				    {
-				        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CantDisableYourself").'">'.$langs->trans("DisableUser").'</a></div>';
-				    }
+				} else {
+					if ($user->id == $id)
+					{
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CantDisableYourself").'">'.$langs->trans("DisableUser").'</a></div>';
+					}
 				}
 				// Delete
 				if ($user->id <> $id && $candisableuser &&
@@ -1972,10 +1901,8 @@ else
 				{
 					if ($user->admin || !$object->admin) // If user edited is admin, delete is possible on for an admin
 					{
-						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
-					}
-					else
-					{
+						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
+					} else {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
 					}
 				}
@@ -2058,9 +1985,7 @@ else
 								if ($caneditgroup)
 								{
 									print $group->getNomUrl(1);
-								}
-								else
-								{
+								} else {
 									print img_object($langs->trans("ShowGroup"), "group").' '.$group->name;
 								}
 								print '</td>';
@@ -2070,16 +1995,12 @@ else
 									print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removegroup&amp;group='.$group->id.'">';
 									print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 									print '</a>';
-								}
-								else
-								{
+								} else {
 									print "&nbsp;";
 								}
 								print "</td></tr>\n";
 							}
-						}
-						else
-						{
+						} else {
 							print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 						}
 
@@ -2126,9 +2047,7 @@ else
 			if ($caneditfield && !$object->ldap_sid)
 			{
 				print '<input class="minwidth100" type="text" class="flat" name="lastname" value="'.$object->lastname.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="lastname" value="'.$object->lastname.'">';
 				print $object->lastname;
 			}
@@ -2141,9 +2060,7 @@ else
 			if ($caneditfield && !$object->ldap_sid)
 			{
 				print '<input class="minwidth100" type="text" class="flat" name="firstname" value="'.$object->firstname.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="firstname" value="'.$object->firstname.'">';
 				print $object->firstname;
 			}
@@ -2155,9 +2072,7 @@ else
 			if ($user->admin && !$object->ldap_sid)
 			{
 				print '<input maxlength="50" type="text" class="flat" name="login" value="'.$object->login.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="login" value="'.$object->login.'">';
 				print $object->login;
 			}
@@ -2181,9 +2096,7 @@ else
 				if ($caneditpassword)
 				{
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="32" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="new-password">';
-				}
-				else
-				{
+				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
 				}
 			}
@@ -2217,9 +2130,7 @@ else
 				print '<input type="hidden" name="admin" value="'.$object->admin.'">'.yn($object->admin);
 				print ' ('.$langs->trans("ExternalUser").')';
 				print '</td></tr>';
-			}
-			else
-			{
+			} else {
 				print '<td>';
 				$nbAdmin = $user->getNbOfUsers('active', '', 1);
 				$nbSuperAdmin = $user->getNbOfUsers('active', 'superadmin', 1);
@@ -2279,9 +2190,7 @@ else
 						$checked = (($object->admin && !$object->entity) ? ' checked' : '');
 						print '<input type="checkbox" name="superadmin" value="1"'.$checked.' /> '.$langs->trans("SuperAdministrator");
 					}
-				}
-				else
-				{
+				} else {
 					$yn = yn($object->admin);
 					print '<input type="hidden" name="admin" value="'.$object->admin.'">';
 					print '<input type="hidden" name="superadmin" value="'.(empty($object->entity) ? 1 : 0).'">';
@@ -2301,20 +2210,18 @@ else
 			   	if ($object->socid) $type = $langs->trans("External");
 			   	print $form->textwithpicto($type, $langs->trans("InternalExternalDesc"));
 			   	if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
-		   	}
-		   	else
-			{
+		   	} else {
 				// Select mode
 				$type = 0;
-				if ($object->contactid) $type = $object->contactid;
+				if ($object->contact_id) $type = $object->contact_id;
 
-				if ($object->socid > 0 && ! ($object->contactid > 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->contactid > 0) {	// external user with a link to a contact
+				} 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('', 'contact').$form->selectcontacts(0, $object->contactid, 'contactid', 1, '', '', 1, '', false, 1);
+					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
@@ -2326,7 +2233,7 @@ else
 		   	// Gender
 		   	print '<tr><td>'.$langs->trans("Gender").'</td>';
 		   	print '<td>';
-		   	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
+		   	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
 		   	if ($caneditfield) {
 		   		print $form->selectarray('gender', $arraygender, GETPOSTISSET('gender') ?GETPOST('gender') : $object->gender, 1);
 		   	} else {
@@ -2334,11 +2241,11 @@ else
 		   	}
 		   	print '</td></tr>';
 
-            // Employee
-            print '<tr>';
-            print '<td>'.$form->editfieldkey('Employee', 'employee', '', $object, 0).'</td><td>';
-            if ($caneditfield) {
-                 print $form->selectyesno("employee", $object->employee, 1);
+			// Employee
+			print '<tr>';
+			print '<td>'.$form->editfieldkey('Employee', 'employee', '', $object, 0).'</td><td>';
+			if ($caneditfield) {
+				 print $form->selectyesno("employee", $object->employee, 1);
 			} else {
 				if ($object->employee) {
 					print $langs->trans("Yes");
@@ -2346,17 +2253,15 @@ else
 					print $langs->trans("No");
 				}
 			}
-		    print '</td></tr>';
+			print '</td></tr>';
 
-		    // Hierarchy
+			// Hierarchy
 		   	print '<tr><td class="titlefield">'.$langs->trans("HierarchicalResponsible").'</td>';
 		   	print '<td>';
 		   	if ($caneditfield)
 		   	{
 		   		print $form->select_dolusers($object->fk_user, 'fk_user', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
-		   	}
-		   	else
-		   	{
+		   	} else {
 		   		print '<input type="hidden" name="fk_user" value="'.$object->fk_user.'">';
 		   		$huser = new User($db);
 		   		$huser->fetch($object->fk_user);
@@ -2372,10 +2277,11 @@ else
 				print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
 				print '</td>';
 				print '<td>';
-				if ($caneditfield) {
+				if ($caneditfield)
+				{
 					print $form->select_dolusers($object->fk_user_expense_validator, 'fk_user_expense_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
 				} else {
-					print '<input type="hidden" name="fk_user_expense_validator" value="' . $object->fk_user_expense_validator . '">';
+					print '<input type="hidden" name="fk_user_expense_validator" value="'.$object->fk_user_expense_validator.'">';
 					$evuser = new User($db);
 					$evuser->fetch($object->fk_user_expense_validator);
 					print $evuser->getNomUrl(1);
@@ -2391,10 +2297,11 @@ else
 				print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
 				print '</td>';
 				print '<td>';
-				if ($caneditfield) {
+				if ($caneditfield)
+				{
 					print $form->select_dolusers($object->fk_user_holiday_validator, 'fk_user_holiday_validator', 1, array($object->id), 0, '', 0, $object->entity, 0, 0, '', 0, '', 'maxwidth300');
 				} else {
-					print '<input type="hidden" name="fk_user_holiday_validator" value="' . $object->fk_user_holiday_validator . '">';
+					print '<input type="hidden" name="fk_user_holiday_validator" value="'.$object->fk_user_holiday_validator.'">';
 					$hvuser = new User($db);
 					$hvuser->fetch($object->fk_user_holiday_validator);
 					print $hvuser->getNomUrl(1);
@@ -2462,9 +2369,7 @@ else
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input size="20" type="text" name="office_phone" class="flat" value="'.$object->office_phone.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="office_phone" value="'.$object->office_phone.'">';
 				print $object->office_phone;
 			}
@@ -2476,9 +2381,7 @@ else
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input size="20" type="text" name="user_mobile" class="flat" value="'.$object->user_mobile.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="user_mobile" value="'.$object->user_mobile.'">';
 				print $object->user_mobile;
 			}
@@ -2490,9 +2393,7 @@ else
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input size="20" type="text" name="office_fax" class="flat" value="'.$object->office_fax.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="office_fax" value="'.$object->office_fax.'">';
 				print $object->office_fax;
 			}
@@ -2504,9 +2405,7 @@ else
 			if ($caneditfield && empty($object->ldap_sid))
 			{
 				print '<input class="minwidth100" type="text" name="email" class="flat" value="'.$object->email.'">';
-			}
-			else
-			{
+			} else {
 				print '<input type="hidden" name="email" value="'.$object->email.'">';
 				print $object->email;
 			}
@@ -2539,9 +2438,7 @@ else
 				if ($caneditfield)
 				{
 					print '<input class="minwidth100" type="url" name="openid" class="flat" value="'.$object->openid.'">';
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="openid" value="'.$object->openid.'">';
 					print $object->openid;
 				}
@@ -2559,9 +2456,7 @@ else
 				if ($caneditfield)
 				{
 					print '<input size="30" type="text" class="flat" name="accountancy_code" value="'.$object->accountancy_code.'">';
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="accountancy_code" value="'.$object->accountancy_code.'">';
 					print $object->accountancy_code;
 				}
@@ -2611,6 +2506,15 @@ else
 				print "</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->lang, 'default_lang', 0, 0, 1);
+				print '</td>';
+				print '</tr>';
+			}
+
 			// Status
 			print '<tr><td>'.$langs->trans("Status").'</td>';
 			print '<td>';
@@ -2627,15 +2531,13 @@ else
 					$societe = new Societe($db);
 					$societe->fetch($object->socid);
 					print $societe->getNomUrl(1, '');
-					if ($object->contactid)
+					if ($object->contact_id)
 					{
 						$contact = new Contact($db);
-						$contact->fetch($object->contactid);
-						print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contactid.'">'.img_object($langs->trans("ShowContact"), 'contact').' '.dol_trunc($contact->getFullName($langs), 32).'</a>';
+						$contact->fetch($object->contact_id);
+						print ' / <a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$object->contact_id.'">'.img_object($langs->trans("ShowContact"), 'contact').' '.dol_trunc($contact->getFullName($langs), 32).'</a>';
 					}
-				}
-				else
-				{
+				} else {
 					print $langs->trans("ThisUserIsNot");
 				}
 				print ' ('.$langs->trans("UseTypeFieldToChange").')';
@@ -2655,33 +2557,29 @@ else
 					$adh->fetch($object->fk_member);
 					$adh->ref = $adh->login; // Force to show login instead of id
 					print $adh->getNomUrl(1);
-				}
-				else
-				{
+				} else {
 					print $langs->trans("UserNotLinkedToMember");
 				}
 				print '</td>';
 				print "</tr>\n";
 			}
 
-            // Multicompany
-            // TODO check if user not linked with the current entity before change entity (thirdparty, invoice, etc.) !!
-            if (!empty($conf->multicompany->enabled) && is_object($mc))
-            {
-            	// This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
-            	if (!method_exists($mc, 'formObjectOptions'))
-            	{
-            		if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && !$user->entity)
-	            	{
-	            		print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
-	            		print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1, false, false, 1); // last parameter 1 means, show also a choice 0=>'all entities'
-	            		print "</td></tr>\n";
-	            	}
-	            	else
-	            	{
-	            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-	            	}
-	            }
+			// Multicompany
+			// TODO check if user not linked with the current entity before change entity (thirdparty, invoice, etc.) !!
+			if (!empty($conf->multicompany->enabled) && is_object($mc))
+			{
+				// This is now done with hook formObjectOptions. Keep this code for backward compatibility with old multicompany module
+				if (!method_exists($mc, 'formObjectOptions'))
+				{
+					if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && !$user->entity)
+					{
+						print "<tr>".'<td>'.$langs->trans("Entity").'</td>';
+						print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1, false, false, 1); // last parameter 1 means, show also a choice 0=>'all entities'
+						print "</td></tr>\n";
+					} else {
+						print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+					}
+				}
 			}
 
 			// Other attributes
@@ -2706,9 +2604,7 @@ else
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('signature', $object->signature, '', 138, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_USERSIGN) ? 0 : 1, ROWS_4, '90%');
 				print $doleditor->Create(1);
-			}
-			else
-			{
+			} else {
 				print dol_htmlentitiesbr($object->signature);
 			}
 			print '</td></tr>';
@@ -2720,29 +2616,27 @@ else
 			// TODO Move this into tab RH (HierarchicalResponsible must be on both tab)
 
 			// Default warehouse
-            if (!empty($conf->stock->enabled) && !empty($conf->global->USER_DEFAULT_WAREHOUSE))	// TODO What is goal of this. How it is used ?
-            {
-                print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
-                print $formproduct->selectWarehouses($object->fk_warehouse, 'fk_warehouse', 'warehouseopen', 1);
-                print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
-                print '</td></tr>';
-            }
+			if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER))
+			{
+				print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
+				print $formproduct->selectWarehouses($object->fk_warehouse, 'fk_warehouse', 'warehouseopen', 1);
+				print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
+				print '</td></tr>';
+			}
 
-            // Position/Job
-            print '<tr><td class="titlefield">'.$langs->trans("PostOrFunction").'</td>';
-            print '<td>';
-            if ($caneditfield)
-            {
-            	print '<input size="30" type="text" name="job" value="'.$object->job.'">';
-            }
-            else
-            {
-            	print '<input type="hidden" name="job" value="'.$object->job.'">';
-            	print $object->job;
-            }
-            print '</td></tr>';
+			// Position/Job
+			print '<tr><td class="titlefield">'.$langs->trans("PostOrFunction").'</td>';
+			print '<td>';
+			if ($caneditfield)
+			{
+				print '<input size="30" type="text" name="job" value="'.dol_escape_htmltag($object->job).'">';
+			} else {
+				print '<input type="hidden" name="job" value="'.dol_escape_htmltag($object->job).'">';
+				print dol_escape_htmltag($object->job);
+			}
+			print '</td></tr>';
 
-            if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
+			if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 				|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read)))
 			{
 				$langs->load("salaries");
@@ -2801,19 +2695,16 @@ else
 			print '<td>';
 			if ($caneditfield)
 			{
-				print $form->selectDate(GETPOST('dateemployment') ?GETPOST('dateemployment') : $object->dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 0);
+				print $form->selectDate($dateemployment ? $dateemployment : $object->dateemployment, 'dateemployment', 0, 0, 1, 'formdateemployment', 1, 1);
 			} else {
 				print dol_print_date($object->dateemployment, 'day');
 			}
-			print '</td>';
-			print "</tr>\n";
 
-			// Date employmentEnd
-			print '<tr><td>'.$langs->trans("DateEmploymentEnd").'</td>';
-			print '<td>';
+			if ($dateemployment && $dateemploymentend) print ' - ';
+
 			if ($caneditfield)
 			{
-				print $form->selectDate(GETPOST('dateemploymentend') ?GETPOST('dateemploymentend') : $object->dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
+				print $form->selectDate($dateemploymentend ? $dateemploymentend : $object->dateemploymentend, 'dateemploymentend', 0, 0, 1, 'formdateemploymentend', 1, 0);
 			} else {
 				print dol_print_date($object->dateemploymentend, 'day');
 			}
@@ -2821,12 +2712,33 @@ else
 			print "</tr>\n";
 
 
-			// Date birth
-			print '<tr><td>'.$langs->trans("DateToBirth").'</td>';
+			// Date login validity
+			print '<tr><td>'.$langs->trans("RangeOfLoginValidity").'</td>';
 			print '<td>';
 			if ($caneditfield)
 			{
-				echo $form->selectDate(GETPOST('birth') ?GETPOST('birth') : $object->birth, 'birth', 0, 0, 1, 'updateuser', 1, 0);
+				print $form->selectDate($datestartvalidity ? $datestartvalidity : $object->datestartvalidity, 'datestartvalidity', 0, 0, 1, 'formdatestartvalidity', 1, 1);
+			} else {
+				print dol_print_date($object->datestartvalidity, 'day');
+			}
+
+			if ($datestartvalidity && $dateendvalidity) print ' - ';
+
+			if ($caneditfield)
+			{
+				print $form->selectDate($dateendvalidity ? $datendevalidity : $object->dateendvalidity, 'dateendvalidity', 0, 0, 1, 'formdateendvalidity', 1, 0);
+			} else {
+				print dol_print_date($object->dateendvalidity, 'day');
+			}
+			print '</td>';
+			print "</tr>\n";
+
+
+			// Date birth
+			print '<tr><td>'.$langs->trans("DateOfBirth").'</td>';
+			print '<td>';
+			if ($caneditfield) {
+				echo $form->selectDate($dateofbirth ? $dateofbirth : $object->birth, 'dateofbirth', 0, 0, 1, 'updateuser', 1, 0);
 			} else {
 				print dol_print_date($object->birth, 'day');
 			}
@@ -2858,7 +2770,7 @@ else
 			$genallowed = $user->rights->user->user->lire;
 			$delallowed = $user->rights->user->user->creer;
 
-			print $formfile->showdocuments('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+			print $formfile->showdocuments('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
 			$somethingshown = $formfile->numoffiles;
 
 			// Show links to link elements
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 46022d066f3..5245ff0b961 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
-/* Copyright (C) 2030   Thibault FOUCART     	<support@ptibogxiv.net>
+/* Copyright (C) 2020   Thibault FOUCART     	<support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -90,7 +90,7 @@ class Users extends DolibarrApi
 
     	// Select products of given category
     	if ($category > 0) {
-			$sql .= " AND c.fk_categorie = ".$db->escape($category);
+    		$sql .= " AND c.fk_categorie = ".$this->db->escape($category);
 			$sql .= " AND c.fk_user = t.rowid ";
     	}
 
@@ -105,7 +105,7 @@ class Users extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-	    $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 	    if ($limit) {
 	        if ($page < 0)
 	        {
@@ -113,28 +113,27 @@ class Users extends DolibarrApi
 	        }
 	        $offset = $limit * $page;
 
-	        $sql .= $db->plimit($limit + 1, $offset);
+	        $sql .= $this->db->plimit($limit + 1, $offset);
 	    }
 
-	    $result = $db->query($sql);
+	    $result = $this->db->query($sql);
 
 	    if ($result)
 	    {
 	        $i = 0;
-	        $num = $db->num_rows($result);
+	        $num = $this->db->num_rows($result);
 	        $min = min($num, ($limit <= 0 ? $num : $limit));
 	        while ($i < $min)
 	        {
-	            $obj = $db->fetch_object($result);
-	            $user_static = new User($db);
+	        	$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 : '.$db->lasterror());
+	    } else {
+	    	throw new RestException(503, 'Error when retrieve User list : '.$this->db->lasterror());
 	    }
 	    if (!count($obj_ret)) {
 	        throw new RestException(404, 'No User found');
@@ -144,13 +143,13 @@ class Users extends DolibarrApi
 
 	/**
 	 * Get properties of an user object
-	 * Return an array with user informations
 	 *
 	 * @param 	int 	$id 					ID of user
 	 * @param	int		$includepermissions	Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
 	 * @return 	array|mixed data without useless information
 	 *
-	 * @throws 	RestException
+	 * @throws RestException 401     Insufficient rights
+	 * @throws RestException 404     User or group not found
 	 */
     public function get($id, $includepermissions = 0)
     {
@@ -176,6 +175,78 @@ class Users extends DolibarrApi
 		return $this->_cleanObjectDatas($this->useraccount);
 	}
 
+	/**
+	 * Get properties of an user object by login
+	 *
+	 * @param 	string 	$login 					Login of user
+	 * @param	int		$includepermissions	Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET login/{login}
+	 *
+	 * @throws RestException 401     Insufficient rights
+	 * @throws RestException 404     User or group not found
+	 */
+    public function getByLogin($login, $includepermissions = 0)
+    {
+		//if (!DolibarrApiAccess::$user->rights->user->user->lire) {
+			//throw new RestException(401);
+		//}
+
+		$result = $this->useraccount->fetch('', $login);
+		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 ($includepermissions) {
+			$this->useraccount->getRights();
+		}
+
+		return $this->_cleanObjectDatas($this->useraccount);
+	}
+
+	/**
+	 * Get properties of an user object by Email
+	 *
+	 * @param 	string 	$email 					Email of user
+	 * @param	int		$includepermissions	Set this to 1 to have the array of permissions loaded (not done by default for performance purpose)
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET email/{email}
+	 *
+	 * @throws RestException 401     Insufficient rights
+	 * @throws RestException 404     User or group not found
+	 */
+    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)
+		{
+			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 ($includepermissions) {
+			$this->useraccount->getRights();
+		}
+
+		return $this->_cleanObjectDatas($this->useraccount);
+	}
+
     /**
      * Get properties of user connected
      *
@@ -288,9 +359,7 @@ class Users extends DolibarrApi
 		if ($this->useraccount->update(DolibarrApiAccess::$user) >= 0)
 		{
 			return $this->get($id);
-		}
-		else
-		{
+		} else {
 			throw new RestException(500, $this->useraccount->error);
 		}
     }
@@ -363,9 +432,7 @@ class Users extends DolibarrApi
 		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
-		{
+		} 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
 			// hack the security by giving himself permissions on another entity.
 			$entity = (DolibarrApiAccess::$user->entity > 0 ? DolibarrApiAccess::$user->entity : $conf->entity);
@@ -423,7 +490,7 @@ class Users extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-	    $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
 	    if ($limit) {
 	        if ($page < 0)
 	        {
@@ -431,28 +498,27 @@ class Users extends DolibarrApi
 	        }
 	        $offset = $limit * $page;
 
-	        $sql .= $db->plimit($limit + 1, $offset);
+	        $sql .= $this->db->plimit($limit + 1, $offset);
 	    }
 
-	    $result = $db->query($sql);
+	    $result = $this->db->query($sql);
 
 	    if ($result)
 	    {
 	        $i = 0;
-	        $num = $db->num_rows($result);
+	        $num = $this->db->num_rows($result);
 	        $min = min($num, ($limit <= 0 ? $num : $limit));
 	        while ($i < $min)
 	        {
-	            $obj = $db->fetch_object($result);
+	        	$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 : '.$db->lasterror());
+	    } else {
+	    	throw new RestException(503, 'Error when retrieve Group list : '.$this->db->lasterror());
 	    }
 	    if (!count($obj_ret)) {
 	        throw new RestException(404, 'No Group found');
@@ -561,7 +627,7 @@ class Users extends DolibarrApi
 	    unset($object->openid);
 
 	    unset($object->lines);
-	    unset($object->modelpdf);
+	    unset($object->model_pdf);
 	    unset($object->skype);
 	    unset($object->twitter);
 	    unset($object->facebook);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index f9caa1e7798..c82eafb353a 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -77,10 +77,10 @@ class User extends CommonObject
 	public $personal_email;
 
 
-    /**
-     * @var array array of socialnetworks
-     */
-    public $socialnetworks;
+	/**
+	 * @var array array of socialnetworks
+	 */
+	public $socialnetworks;
 
 	public $job; // job position
 	public $signature;
@@ -98,7 +98,7 @@ class User extends CommonObject
 	public $office_phone;
 	public $office_fax;
 	public $user_mobile;
-    public $personal_mobile;
+	public $personal_mobile;
 	public $admin;
 	public $login;
 	public $api_key;
@@ -116,36 +116,27 @@ class User extends CommonObject
 	public $pass_indatabase_crypted;
 
 	/**
-     * 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;
 
 	//! If this is defined, it is an external user
-	/**
-	 * @deprecated
-	 * @see $socid
-	 */
-	public $societe_id;
-	/**
-	 * @deprecated
-	 * @see $contactid
-	 */
-	public $contact_id;
 	public $socid;
-	public $contactid;
+	//! If this is defined, it is a user created from a contact
+	public $contact_id;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_member;
 
 	/**
@@ -153,7 +144,7 @@ class User extends CommonObject
 	 */
 	public $fk_user;
 	public $fk_user_expense_validator;
-    public $fk_user_holiday_validator;
+	public $fk_user_holiday_validator;
 
 	public $clicktodial_url;
 	public $clicktodial_login;
@@ -162,6 +153,8 @@ class User extends CommonObject
 
 	public $datelastlogin;
 	public $datepreviouslogin;
+	public $datestartvalidity;
+	public $dateendvalidity;
 	public $photo;
 	public $lang;
 
@@ -177,7 +170,7 @@ class User extends CommonObject
 
 	public $users = array(); // To store all tree of users hierarchy
 	public $parentof; // To store an array of all parents for all ids.
-	private $cache_childids;
+	private $cache_childids; // Cache array of already loaded childs
 
 	public $accountancy_code; // Accountancy code in prevision of the complete accountancy module
 
@@ -199,10 +192,10 @@ class User extends CommonObject
 	public $fk_warehouse;
 
 	public $fields = array(
-        'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-        'lastname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1, 'comment'=>'Reference of object'),
-        'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
-    );
+		'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'lastname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1, 'comment'=>'Reference of object'),
+		'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
+	);
 
 
 	const STATUS_DISABLED = 0;
@@ -270,6 +263,8 @@ class User extends CommonObject
 		$sql .= " u.tms as datem,";
 		$sql .= " u.datelastlogin as datel,";
 		$sql .= " u.datepreviouslogin as datep,";
+		$sql .= " u.datestartvalidity,";
+		$sql .= " u.dateendvalidity,";
 		$sql .= " u.photo as photo,";
 		$sql .= " u.openid as openid,";
 		$sql .= " u.accountancy_code,";
@@ -294,34 +289,26 @@ class User extends CommonObject
 			if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity)))
 			{
 				$sql .= " WHERE u.entity IN (0,".$conf->entity.")";
-			}
-			else
-			{
+			} 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
+		} 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
 		{
 			$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
-		{
+		} else {
 			$sql .= " AND u.rowid = ".$id;
 		}
 		$sql .= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
@@ -367,7 +354,7 @@ class User extends CommonObject
 				$this->office_phone	= $obj->office_phone;
 				$this->office_fax   = $obj->office_fax;
 				$this->user_mobile  = $obj->user_mobile;
-                $this->personal_mobile = $obj->personal_mobile;
+				$this->personal_mobile = $obj->personal_mobile;
 				$this->email = $obj->email;
 				$this->personal_email = $obj->personal_email;
 				$this->socialnetworks = (array) json_decode($obj->socialnetworks, true);
@@ -396,15 +383,15 @@ class User extends CommonObject
 				$this->datem				= $this->db->jdate($obj->datem);
 				$this->datelastlogin = $this->db->jdate($obj->datel);
 				$this->datepreviouslogin = $this->db->jdate($obj->datep);
+				$this->datestartvalidity = $this->db->jdate($obj->datestartvalidity);
+				$this->dateendvalidity = $this->db->jdate($obj->dateendvalidity);
 
-				$this->societe_id           = $obj->fk_soc; // deprecated
-				$this->contact_id           = $obj->fk_socpeople; // deprecated
 				$this->socid                = $obj->fk_soc;
-				$this->contactid            = $obj->fk_socpeople;
+				$this->contact_id           = $obj->fk_socpeople;
 				$this->fk_member            = $obj->fk_member;
 				$this->fk_user = $obj->fk_user;
-                $this->fk_user_expense_validator = $obj->fk_user_expense_validator;
-                $this->fk_user_holiday_validator = $obj->fk_user_holiday_validator;
+				$this->fk_user_expense_validator = $obj->fk_user_expense_validator;
+				$this->fk_user_holiday_validator = $obj->fk_user_holiday_validator;
 
 				$this->default_range = $obj->default_range;
 				$this->default_c_exp_tax_cat = $obj->default_c_exp_tax_cat;
@@ -419,18 +406,14 @@ class User extends CommonObject
 				$this->fetch_optionals();
 
 				$this->db->free($result);
-			}
-			else
-			{
+			} else {
 				$this->error = "USERNOTFOUND";
 				dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);
 
 				$this->db->free($result);
 				return 0;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -456,9 +439,7 @@ class User extends CommonObject
 					$i++;
 				}
 				$this->db->free($resql);
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->lasterror();
 				return -2;
 			}
@@ -524,9 +505,7 @@ class User extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -570,8 +549,7 @@ class User extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -581,8 +559,7 @@ class User extends CommonObject
 			// Ajout des droits induits
 			if (!empty($subperms))   $whereforadd .= " OR (module='$module' AND perms='$perms' AND (subperms='lire' OR subperms='read'))";
 			elseif (!empty($perms)) $whereforadd .= " OR (module='$module' AND (perms='lire' OR perms='read') AND subperms IS NULL)";
-		}
-		else {
+		} else {
 			// On a pas demande un droit en particulier mais une liste de droits
 			// sur la base d'un nom de module de de perms
 			// Where pour la liste des droits a ajouter
@@ -591,9 +568,7 @@ class User extends CommonObject
 				if ($allmodule == 'allmodules')
 				{
 					$whereforadd = 'allmodules';
-				}
-				else
-				{
+				} else {
 					$whereforadd = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -628,9 +603,7 @@ class User extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -650,8 +623,7 @@ class User extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -693,8 +665,7 @@ class User extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -712,9 +683,7 @@ class User extends CommonObject
 				if ($allmodule == 'allmodules')
 				{
 					$wherefordel = 'allmodules';
-				}
-				else
-				{
+				} else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -732,6 +701,15 @@ class User extends CommonObject
 				$sql .= " AND ".$wherefordel;
 			}
 
+			// avoid admin can remove his own important rights
+			if ($this->admin == 1)
+			{
+				$sql .= " AND id NOT IN (251, 252, 253, 254, 255, 256)"; // other users rights
+				$sql .= " AND id NOT IN (341, 342, 343, 344)"; // own rights
+				$sql .= " AND id NOT IN (351, 352, 353, 354)"; // groups rights
+				$sql .= " AND id NOT IN (358)"; // user export
+			}
+
 			$result = $this->db->query($sql);
 			if ($result)
 			{
@@ -749,9 +727,7 @@ class User extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -771,8 +747,7 @@ class User extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -832,9 +807,7 @@ class User extends CommonObject
 		if (!empty($conf->global->MULTICOMPANY_BACKWARD_COMPATIBILITY))
 		{
 			$sql .= " AND r.entity IN (0,".(!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) ? "1," : "").$conf->entity.")";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND ur.entity = ".$conf->entity;
 		}
 		$sql .= " AND ur.fk_user= ".$this->id;
@@ -865,9 +838,7 @@ class User extends CommonObject
 							if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
 							if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 							$this->rights->$module->$perms->$subperms = 1;
-						}
-						else
-						{
+						} else {
 							if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 							$this->rights->$module->$perms = 1;
 						}
@@ -891,9 +862,7 @@ class User extends CommonObject
 			} else {
 				$sql .= " AND r.entity = ".$conf->entity;
 			}
-		}
-		else
-		{
+		} else {
 			$sql .= " AND gr.entity = ".$conf->entity;
 			$sql .= " AND gu.entity = ".$conf->entity;
 			$sql .= " AND r.entity = ".$conf->entity;
@@ -925,9 +894,7 @@ class User extends CommonObject
 						if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
 						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 						$this->rights->$module->$perms->$subperms = 1;
-					}
-					else
-					{
+					} 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;
@@ -947,9 +914,7 @@ class User extends CommonObject
 			// Si module etait non defini, alors on a tout charge, on peut donc considerer
 			// que les droits sont en cache (car tous charges) pour cet instance de user
 			$this->all_permissions_are_loaded = 1;
-		}
-		else
-		{
+		} else {
 			// If module defined, we flag it as loaded into cache
 			$this->_tab_loaded[$moduletag] = 1;
 		}
@@ -992,9 +957,7 @@ class User extends CommonObject
 		{
 			$this->db->rollback();
 			return -$error;
-		}
-		else
-		{
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -1008,7 +971,7 @@ class User extends CommonObject
 	 * Existing categories are left untouch.
 	 *
 	 * @param int[]|int $categories Category or categories IDs
-     * @return void
+	 * @return void
 	 */
 	public function setCategories($categories)
 	{
@@ -1084,10 +1047,18 @@ class User extends CommonObject
 			$this->error = $this->db->lasterror();
 		}
 
-		// If contact, remove link
-		if ($this->contactid > 0 || $this->contact_id > 0)
+		// Remove params
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_param WHERE fk_user  = ".$this->id;
+		if (!$error && !$this->db->query($sql))
 		{
-			$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".(($this->contactid > 0) ? $this->contactid : $this->contact_id);
+			$error++;
+			$this->error = $this->db->lasterror();
+		}
+
+		// If contact, remove link
+		if ($this->contact_id > 0)
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET fk_user_creat = null WHERE rowid = ".$this->contact_id;
 			if (!$error && !$this->db->query($sql))
 			{
 				$error++;
@@ -1098,12 +1069,12 @@ class User extends CommonObject
 		// Remove extrafields
 		if (!$error)
 		{
-		    $result = $this->deleteExtraFields();
-		    if ($result < 0)
-		    {
-		        $error++;
-		        dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-		    }
+			$result = $this->deleteExtraFields();
+			if ($result < 0)
+			{
+				$error++;
+				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
+			}
 		}
 
 		// Remove user
@@ -1132,9 +1103,7 @@ class User extends CommonObject
 
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -1156,7 +1125,7 @@ class User extends CommonObject
 
 		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);
+		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords($this->firstname);
 
 		$this->login = trim($this->login);
 		if (!isset($this->entity)) $this->entity = $conf->entity; // If not defined, we use default value
@@ -1199,9 +1168,7 @@ class User extends CommonObject
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
 				return -6;
-			}
-			else
-			{
+			} else {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."user (datec,login,ldap_sid,entity)";
 				$sql .= " VALUES('".$this->db->idate($this->datec)."','".$this->db->escape($this->login)."','".$this->db->escape($this->ldap_sid)."',".$this->db->escape($this->entity).")";
 				$result = $this->db->query($sql);
@@ -1219,15 +1186,7 @@ class User extends CommonObject
 						return -5;
 					}
 
-					// Update minor fields
-					$result = $this->update($user, 1, 1);
-					if ($result < 0)
-					{
-						$this->db->rollback();
-						return -4;
-					}
-
-					if (!empty($conf->global->STOCK_USERSTOCK_AUTOCREATE))
+					if (!empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER) && !empty($conf->global->STOCK_USERSTOCK_AUTOCREATE))
 					{
 						require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 						$langs->load("stocks");
@@ -1237,7 +1196,17 @@ class User extends CommonObject
 						$entrepot->description = $langs->trans("ThisWarehouseIsPersonalStock", $this->getFullName($langs));
 						$entrepot->statut = 1;
 						$entrepot->country_id = $mysoc->country_id;
-						$entrepot->create($user);
+						$warehouseid = $entrepot->create($user);
+
+						$this->fk_warehouse = $warehouseid;
+					}
+
+					// Update minor fields
+					$result = $this->update($user, 1, 1);
+					if ($result < 0)
+					{
+						$this->db->rollback();
+						return -4;
 					}
 
 					if (!$notrigger)
@@ -1252,25 +1221,19 @@ class User extends CommonObject
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
-					{
+					} else {
 						//$this->error=$interface->error;
 						dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -2;
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -1278,7 +1241,7 @@ class User extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Create a user from a contact object. User will be internal but if contact is linked to a third party, user will be external
 	 *
@@ -1289,7 +1252,7 @@ class User extends CommonObject
 	 */
 	public function create_from_contact($contact, $login = '', $password = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs;
 
 		$error = 0;
@@ -1338,17 +1301,13 @@ class User extends CommonObject
 
 				$this->db->commit();
 				return $this->id;
-			}
-			else
-			{
+			} else {
 				$this->error = $this->db->error();
 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			// $this->error deja positionne
 			dol_syslog(get_class($this)."::create_from_contact - 0");
 
@@ -1357,7 +1316,7 @@ class User extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Create a user into database from a member object
 	 *
@@ -1367,7 +1326,7 @@ class User extends CommonObject
 	 */
 	public function create_from_member($member, $login = '')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $user, $langs;
 
 		// Set properties on new user
@@ -1423,9 +1382,7 @@ class User extends CommonObject
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
-				{
+				} else {
 					$this->error = $this->db->lasterror();
 
 					$this->db->rollback();
@@ -1438,16 +1395,14 @@ class User extends CommonObject
 		{
 			$this->db->commit();
 			return $this->id;
-		}
-		else
-		{
+		} else {
 			// $this->error deja positionne
 			$this->db->rollback();
 			return -2;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Assign rights by default
 	 *
@@ -1455,7 +1410,7 @@ class User extends CommonObject
 	 */
 	public function set_default_rights()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$sql = "SELECT id FROM ".MAIN_DB_PREFIX."rights_def";
@@ -1514,14 +1469,13 @@ class User extends CommonObject
 
 		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);
+		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;
 		$this->login        = trim($this->login);
 		$this->gender       = trim($this->gender);
-		$this->birth        = trim($this->birth);
 		$this->pass         = trim($this->pass);
 		$this->api_key      = trim($this->api_key);
 		$this->address = $this->address ?trim($this->address) : trim($this->address);
@@ -1532,9 +1486,9 @@ class User extends CommonObject
 		$this->office_phone = trim($this->office_phone);
 		$this->office_fax   = trim($this->office_fax);
 		$this->user_mobile  = trim($this->user_mobile);
-        $this->personal_mobile = trim($this->personal_mobile);
+		$this->personal_mobile = trim($this->personal_mobile);
 		$this->email        = trim($this->email);
-        $this->personal_email = trim($this->personal_email);
+		$this->personal_email = trim($this->personal_email);
 
 		$this->job = trim($this->job);
 		$this->signature    = trim($this->signature);
@@ -1549,6 +1503,9 @@ class User extends CommonObject
 		$this->color = empty($this->color) ? '' : $this->color;
 		$this->dateemployment = empty($this->dateemployment) ? '' : $this->dateemployment;
 		$this->dateemploymentend = empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
+		$this->datestartvalidity = empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
+		$this->dateendvalidity = empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
+		$this->birth        = trim($this->birth);
 		$this->fk_warehouse = trim(empty($this->fk_warehouse) ? '' : $this->fk_warehouse);
 
 		// Check parameters
@@ -1561,7 +1518,7 @@ class User extends CommonObject
 		if (empty($this->login))
 		{
 			$langs->load("errors");
-			$this->error = $langs->trans("ErrorFieldRequired", $this->login);
+			$this->error = $langs->trans("ErrorFieldRequired", 'Login');
 			return -1;
 		}
 
@@ -1585,23 +1542,25 @@ class User extends CommonObject
 		$sql .= ", office_phone = '".$this->db->escape($this->office_phone)."'";
 		$sql .= ", office_fax = '".$this->db->escape($this->office_fax)."'";
 		$sql .= ", user_mobile = '".$this->db->escape($this->user_mobile)."'";
-        $sql .= ", personal_mobile = '".$this->db->escape($this->personal_mobile)."'";
+		$sql .= ", personal_mobile = '".$this->db->escape($this->personal_mobile)."'";
 		$sql .= ", email = '".$this->db->escape($this->email)."'";
-        $sql .= ", personal_email = '".$this->db->escape($this->personal_email)."'";
-        $sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
+		$sql .= ", personal_email = '".$this->db->escape($this->personal_email)."'";
+		$sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
 		$sql .= ", job = '".$this->db->escape($this->job)."'";
 		$sql .= ", signature = '".$this->db->escape($this->signature)."'";
 		$sql .= ", accountancy_code = '".$this->db->escape($this->accountancy_code)."'";
 		$sql .= ", color = '".$this->db->escape($this->color)."'";
 		$sql .= ", dateemployment=".(strval($this->dateemployment) != '' ? "'".$this->db->idate($this->dateemployment)."'" : 'null');
 		$sql .= ", dateemploymentend=".(strval($this->dateemploymentend) != '' ? "'".$this->db->idate($this->dateemploymentend)."'" : 'null');
+		$sql .= ", datestartvalidity=".(strval($this->datestartvalidity) != '' ? "'".$this->db->idate($this->datestartvalidity)."'" : 'null');
+		$sql .= ", dateendvalidity=".(strval($this->dateendvalidity) != '' ? "'".$this->db->idate($this->dateendvalidity)."'" : 'null');
 		$sql .= ", note = '".$this->db->escape($this->note_private)."'";
 		$sql .= ", note_public = '".$this->db->escape($this->note_public)."'";
 		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
 		$sql .= ", openid = ".($this->openid ? "'".$this->db->escape($this->openid)."'" : "null");
 		$sql .= ", fk_user = ".($this->fk_user > 0 ? "'".$this->db->escape($this->fk_user)."'" : "null");
-        $sql .= ", fk_user_expense_validator = ".($this->fk_user_expense_validator > 0 ? "'".$this->db->escape($this->fk_user_expense_validator)."'" : "null");
-        $sql .= ", fk_user_holiday_validator = ".($this->fk_user_holiday_validator > 0 ? "'".$this->db->escape($this->fk_user_holiday_validator)."'" : "null");
+		$sql .= ", fk_user_expense_validator = ".($this->fk_user_expense_validator > 0 ? "'".$this->db->escape($this->fk_user_expense_validator)."'" : "null");
+		$sql .= ", fk_user_holiday_validator = ".($this->fk_user_holiday_validator > 0 ? "'".$this->db->escape($this->fk_user_holiday_validator)."'" : "null");
 		if (isset($this->thm) || $this->thm != '')                 $sql .= ", thm= ".($this->thm != '' ? "'".$this->db->escape($this->thm)."'" : "null");
 		if (isset($this->tjm) || $this->tjm != '')                 $sql .= ", tjm= ".($this->tjm != '' ? "'".$this->db->escape($this->tjm)."'" : "null");
 		if (isset($this->salary) || $this->salary != '')           $sql .= ", salary= ".($this->salary != '' ? "'".$this->db->escape($this->salary)."'" : "null");
@@ -1611,7 +1570,7 @@ class User extends CommonObject
 		$sql .= ", default_range = ".($this->default_range > 0 ? $this->default_range : 'null');
 		$sql .= ", default_c_exp_tax_cat = ".($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');
 		$sql .= ", fk_warehouse = ".($this->fk_warehouse ? "'".$this->db->escape($this->fk_warehouse)."'" : "null");
-
+		$sql .= ", lang = ".($this->lang ? "'".$this->db->escape($this->lang)."'" : "null");
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -1694,8 +1653,7 @@ class User extends CommonObject
 							dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
 							$error++;
 						}
-					}
-					elseif ($result < 0)
+					} elseif ($result < 0)
 					{
 						$this->error = $adh->error;
 						$this->errors = $adh->errors;
@@ -1709,8 +1667,7 @@ class User extends CommonObject
 
 					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-					// This user is linked with a contact, so we also update contact information
-					// if this is an update.
+					// This user is linked with a contact, so we also update contact information if this is an update.
 					$tmpobj = new Contact($this->db);
 					$result = $tmpobj->fetch($this->contact_id);
 
@@ -1751,9 +1708,7 @@ class User extends CommonObject
 							dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
 							$error++;
 						}
-					}
-					else
-					{
+					} else {
 						$this->error = $tmpobj->error;
 						$this->errors = $tmpobj->errors;
 						$error++;
@@ -1785,23 +1740,19 @@ class User extends CommonObject
 			{
 				$this->db->commit();
 				return $nbrowsaffected;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::update error=".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -2;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Mise a jour en base de la date de derniere connexion d'un utilisateur
 	 *  Fonction appelee lors d'une nouvelle connexion
@@ -1810,7 +1761,7 @@ class User extends CommonObject
 	 */
 	public function update_last_login_date()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$now = dol_now();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
@@ -1826,9 +1777,7 @@ class User extends CommonObject
 			$this->datepreviouslogin = $this->datelastlogin;
 			$this->datelastlogin = $now;
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
 			return -1;
 		}
@@ -1876,9 +1825,7 @@ class User extends CommonObject
 			if (!empty($conf->global->DATABASE_PWD_ENCRYPTED))
 			{
 				$sql .= ", pass = null";
-			}
-			else
-			{
+			} else {
 				$sql .= ", pass = '".$this->db->escape($password)."'";
 			}
 			$sql .= " WHERE rowid = ".$this->id;
@@ -1911,9 +1858,7 @@ class User extends CommonObject
 								dol_syslog(get_class($this)."::setPassword ".$this->error, LOG_ERR);
 								$error++;
 							}
-						}
-						else
-						{
+						} else {
 							$this->error = $adh->error;
 							$error++;
 						}
@@ -1931,22 +1876,16 @@ class User extends CommonObject
 
 					$this->db->commit();
 					return $this->pass;
-				}
-				else
-				{
+				} else {
 					$this->db->rollback();
 					return 0;
 				}
-			}
-			else
-			{
+			} else {
 				$this->db->rollback();
 				dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
-		{
+		} else {
 			// We store clear password in password temporary field.
 			// After receiving confirmation link, we will crypt it and store it in pass_crypted
 			$sql = "UPDATE ".MAIN_DB_PREFIX."user";
@@ -1958,9 +1897,7 @@ class User extends CommonObject
 			if ($result)
 			{
 				return $password;
-			}
-			else
-			{
+			} else {
 				dol_print_error($this->db);
 				return -3;
 			}
@@ -1968,7 +1905,7 @@ class User extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Send new password by email
 	 *
@@ -1979,7 +1916,7 @@ class User extends CommonObject
 	 */
 	public function send_password($user, $password = '', $changelater = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 		global $dolibarr_main_url_root;
 
@@ -1999,14 +1936,12 @@ class User extends CommonObject
 		}
 
 		if ($this->conf->MAIN_LANG_DEFAULT) {
-            $outputlangs->setDefaultLang($this->conf->MAIN_LANG_DEFAULT);
-        }
-		else
-		{	// If user has not defined its own language, we used current language
+			$outputlangs->setDefaultLang($this->conf->MAIN_LANG_DEFAULT);
+		} else {	// If user has not defined its own language, we used current language
 			$outputlangs = $langs;
 		}
 
-        // Load translation files required by the page
+		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "errors", "users", "other"));
 
 		$appli = constant('DOL_APPLICATION_TITLE');
@@ -2032,9 +1967,7 @@ class User extends CommonObject
 			$mesg .= $user->getFullName($outputlangs); // Username that send the email (not the user for who we want to reset password)
 
 			dol_syslog(get_class($this)."::send_password changelater is off, url=".$url);
-		}
-		else
-		{
+		} else {
 			$url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword&username='.urlencode($this->login)."&passwordhash=".dol_hash($password);
 
 			$mesg .= $outputlangs->transnoentitiesnoconv("RequestToResetPasswordReceived")."\n";
@@ -2051,8 +1984,8 @@ class User extends CommonObject
 
 		$trackid = 'use'.$this->id;
 
-        $mailfile = new CMailFile(
-            $subject,
+		$mailfile = new CMailFile(
+			$subject,
 			$this->email,
 			$conf->global->MAIN_MAIL_EMAIL_FROM,
 			$mesg,
@@ -2062,18 +1995,16 @@ class User extends CommonObject
 			'',
 			'',
 			0,
-            $msgishtml,
-        	'',
-        	'',
-        	$trackid
-        );
+			$msgishtml,
+			'',
+			'',
+			$trackid
+		);
 
 		if ($mailfile->sendfile())
 		{
 			return 1;
-		}
-		else
-		{
+		} else {
 			$langs->trans("errors");
 			$this->error = $langs->trans("ErrorFailedToSendPassword").' '.$mailfile->error;
 			return -1;
@@ -2091,7 +2022,7 @@ class User extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Read clicktodial information for user
 	 *
@@ -2099,7 +2030,7 @@ class User extends CommonObject
 	 */
 	public function fetch_clicktodial()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT url, login, pass, poste ";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user_clicktodial as u";
 		$sql .= " WHERE u.fk_user = ".$this->id;
@@ -2121,23 +2052,21 @@ class User extends CommonObject
 
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update clicktodial info
 	 *
 	 *  @return	int  <0 if KO, >0 if OK
-     */
-    public function update_clicktodial()
-    {
-        // phpcs:enable
+	 */
+	public function update_clicktodial()
+	{
+		// phpcs:enable
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_clicktodial";
@@ -2160,17 +2089,15 @@ class User extends CommonObject
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->db->rollback();
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
-    }
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Add user into a group
 	 *
@@ -2181,7 +2108,7 @@ class User extends CommonObject
 	 */
 	public function SetInGroup($group, $entity, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $user;
 
 		$error = 0;
@@ -2216,23 +2143,19 @@ class User extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::SetInGroup ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Remove a user from a group
 	 *
@@ -2243,7 +2166,7 @@ class User extends CommonObject
 	 */
 	public function RemoveFromGroup($group, $entity, $notrigger = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs, $user;
 
 		$error = 0;
@@ -2273,16 +2196,12 @@ class User extends CommonObject
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
-			{
+			} else {
 				dol_syslog(get_class($this)."::RemoveFromGroup ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -2330,7 +2249,7 @@ class User extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-        if (!$user->rights->user->user->lire && $user->id != $this->id) $option = 'nolink';
+		if (!$user->rights->user->user->lire && $user->id != $this->id) $option = 'nolink';
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg = 0;
 
@@ -2345,7 +2264,7 @@ class User extends CommonObject
 
 		// Info Login
 		$label .= '<div class="centpercent">';
-		$label .= '<u>'.$langs->trans("User").'</u><br>';
+		$label .= img_picto('', $this->picto).' <u>'.$langs->trans("User").'</u><br>';
 		$label .= '<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;
@@ -2479,7 +2398,7 @@ class User extends CommonObject
 			$linkend = '</a>';
 		}
 
-        if ($option == 'nolink')
+		if ($option == 'nolink')
 		{
 			$linkstart = '';
 			$linkend = '';
@@ -2493,9 +2412,9 @@ class User extends CommonObject
 	}
 
 	/**
-	 *  Return label of status of user (active, inactive)
+	 *  Return the label of the status of user (active, inactive)
 	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return	string 			       Label of status
 	 */
 	public function getLibStatut($mode = 0)
@@ -2503,17 +2422,17 @@ class User extends CommonObject
 		return $this->LibStatut($this->statut, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return label of a status of user (active, inactive)
-     *
-     *  @param  int     $status         Id status
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the label of a status of user (active, inactive)
+	 *
+	 *  @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
+	 *  @return string                  Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
@@ -2546,7 +2465,7 @@ class User 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_USERS."=".$info[$conf->global->LDAP_KEY_USERS].",".$conf->global->LDAP_USER_DN;
@@ -2564,7 +2483,7 @@ class User extends CommonObject
 	 */
 	public function _load_ldap_info()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $langs;
 
 		$info = array();
@@ -2590,7 +2509,7 @@ class User extends CommonObject
 			'LDAP_FIELD_SKYPE'		=> 'skype',
 			'LDAP_FIELD_TWITTER'	=> 'twitter',
 			'LDAP_FIELD_FACEBOOK'	=> 'facebook',
-            'LDAP_FIELD_LINKEDIN'	=> 'linkedin'
+			'LDAP_FIELD_LINKEDIN'	=> 'linkedin'
 		);
 
 		// Champs
@@ -2674,22 +2593,22 @@ class User extends CommonObject
 			if ($this->phone_mobile) $info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
 		}
 
-        if (!empty($conf->global->LDAP_FIELD_USERID))$info[$conf->global->LDAP_FIELD_USERID] = $this->id;
-        if (!empty($info[$conf->global->LDAP_FIELD_GROUPID])) {
-            $usergroup = new UserGroup($this->db);
-            $groupslist = $usergroup->listGroupsForUser($this->id);
-            $info[$conf->global->LDAP_FIELD_GROUPID] = '1';
-            if (!empty($groupslist)) {
-                foreach ($groupslist as $groupforuser) {
-                    $info[$conf->global->LDAP_FIELD_GROUPID] = $groupforuser->id; //Select first group in list
-                    break;
-                }
-            }
-        }
-        if (!empty($this->firstname) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORY) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX)) $info[$conf->global->LDAP_FIELD_HOMEDIRECTORY] = "{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->firstname";
+		if (!empty($conf->global->LDAP_FIELD_USERID))$info[$conf->global->LDAP_FIELD_USERID] = $this->id;
+		if (!empty($info[$conf->global->LDAP_FIELD_GROUPID])) {
+			$usergroup = new UserGroup($this->db);
+			$groupslist = $usergroup->listGroupsForUser($this->id);
+			$info[$conf->global->LDAP_FIELD_GROUPID] = '1';
+			if (!empty($groupslist)) {
+				foreach ($groupslist as $groupforuser) {
+					$info[$conf->global->LDAP_FIELD_GROUPID] = $groupforuser->id; //Select first group in list
+					break;
+				}
+			}
+		}
+		if (!empty($this->firstname) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORY) && !empty($conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX)) $info[$conf->global->LDAP_FIELD_HOMEDIRECTORY] = "{$conf->global->LDAP_FIELD_HOMEDIRECTORYPREFIX}/$this->firstname";
 
-        return $info;
-    }
+		return $info;
+	}
 
 
 	/**
@@ -2716,7 +2635,7 @@ class User extends CommonObject
 		$this->note_public = 'This is a note public';
 		$this->note_private = 'This is a note private';
 		$this->email = 'email@specimen.com';
-        $this->personal_email = 'personalemail@specimen.com';
+		$this->personal_email = 'personalemail@specimen.com';
 		$this->socialnetworks = array(
 			'skype' => 'skypepseudo',
 			'twitter' => 'twitterpseudo',
@@ -2726,7 +2645,7 @@ class User extends CommonObject
 		$this->office_phone = '0999999999';
 		$this->office_fax = '0999999998';
 		$this->user_mobile = '0999999997';
-        $this->personal_mobile = '0999999996';
+		$this->personal_mobile = '0999999996';
 		$this->admin = 0;
 		$this->login = 'dolibspec';
 		$this->pass = 'dolibspec';
@@ -2739,8 +2658,6 @@ class User extends CommonObject
 		$this->datepreviouslogin = $now;
 		$this->statut = 1;
 
-		//$this->societe_id = 1;	For external users
-		//$this->contact_id = 1;	For external users
 		$this->entity = 1;
 	}
 
@@ -2773,9 +2690,7 @@ class User extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -2801,9 +2716,7 @@ class User extends CommonObject
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->error();
 			return -1;
 		}
@@ -2827,9 +2740,7 @@ class User extends CommonObject
 		{
 			$sql .= " WHERE entity = 0";
 			if ($admin >= 0) $sql .= " AND admin = ".$admin;
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE entity IN (".getEntity('user', 0).")";
 			if ($limitTo == 'active') $sql .= " AND statut = 1";
 			if ($admin >= 0) $sql .= " AND admin = ".$admin;
@@ -2843,15 +2754,13 @@ class User extends CommonObject
 
 			$this->db->free($resql);
 			return $nb;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update user using data from the LDAP
 	 *
@@ -2860,7 +2769,7 @@ class User extends CommonObject
 	 */
 	public function update_ldap2dolibarr(&$ldapuser)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		// TODO: Voir pourquoi le update met à jour avec toutes les valeurs vide (global $user écrase ?)
 		global $user, $conf;
 
@@ -2891,7 +2800,7 @@ class User extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Return and array with all instanciated first level children users of current user
 	 *
@@ -2900,7 +2809,7 @@ class User extends CommonObject
 	 */
 	public function get_children()
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user";
 		$sql .= " WHERE fk_user = ".$this->id;
 
@@ -2916,9 +2825,7 @@ class User extends CommonObject
 				$users[] = $user;
 			}
 			return $users;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -2951,15 +2858,13 @@ class User extends CommonObject
 				$this->parentof[$obj->id_son] = $obj->id_parent;
 			}
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * 	Build the hierarchy/tree of users into an array.
 	 *	Set and return this->users that is an array sorted according to tree with arrays of:
@@ -2973,9 +2878,9 @@ class User extends CommonObject
 	 *  @param		string	$filter				SQL filter on users
 	 *	@return		array		      		  	Array of users $this->users. Note: $this->parentof is also set.
 	 */
-    public function get_full_tree($deleteafterid = 0, $filter = '')
-    {
-        // phpcs:enable
+	public function get_full_tree($deleteafterid = 0, $filter = '')
+	{
+		// phpcs:enable
 		global $conf, $user;
 		global $hookmanager;
 
@@ -3022,9 +2927,7 @@ class User extends CommonObject
 				$this->users[$obj->rowid]['photo'] = $obj->photo;
 				$i++;
 			}
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -3075,16 +2978,14 @@ class User extends CommonObject
 	 *	@return		array		      		  	Array of user id lower than user (all levels under user). This overwrite this->users.
 	 *  @see get_children()
 	 */
-    public function getAllChildIds($addcurrentuser = 0)
-    {
+	public function getAllChildIds($addcurrentuser = 0)
+	{
 		$childids = array();
 
 		if (isset($this->cache_childids[$this->id]))
 		{
 			$childids = $this->cache_childids[$this->id];
-		}
-		else
-		{
+		} else {
 			// Init this->users
 			$this->get_full_tree();
 
@@ -3104,7 +3005,7 @@ class User extends CommonObject
 		return $childids;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	For user id_user and its childs available in this->users, define property fullpath and fullname.
 	 *  Function called by get_full_tree().
@@ -3113,10 +3014,10 @@ class User extends CommonObject
 	 * 	@param		int		$protection		Deep counter to avoid infinite loop (no more required, a protection is added with array useridfound)
 	 *	@return		int                     < 0 if KO (infinit loop), >= 0 if OK
 	 */
-    public function build_path_from_id_user($id_user, $protection = 0)
-    {
-        // phpcs:enable
-		dol_syslog(get_class($this)."::build_path_from_id_user id_user=".$id_user." protection=".$protection, LOG_DEBUG);
+	public function build_path_from_id_user($id_user, $protection = 0)
+	{
+		// phpcs:enable
+		//dol_syslog(get_class($this)."::build_path_from_id_user id_user=".$id_user." protection=".$protection, LOG_DEBUG);
 
 		if (!empty($this->users[$id_user]['fullpath']))
 		{
@@ -3168,7 +3069,7 @@ class User extends CommonObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load metrics this->nb for dashboard
 	 *
@@ -3176,7 +3077,7 @@ class User extends CommonObject
 	 */
 	public function load_state_board()
 	{
-        // phpcs:enable
+		// phpcs:enable
 
 		$this->nb = array();
 
@@ -3195,9 +3096,7 @@ class User extends CommonObject
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
 			return -1;
@@ -3212,7 +3111,7 @@ class User 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)
@@ -3227,9 +3126,7 @@ class User extends CommonObject
 			if (!empty($conf->global->USER_ADDON_PDF))
 			{
 				$modele = $conf->global->USER_ADDON_PDF;
-			}
-			else
-			{
+			} else {
 				$modele = 'bluesky';
 			}
 		}
@@ -3239,7 +3136,7 @@ class User extends CommonObject
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return property of user from its id
 	 *
@@ -3249,14 +3146,14 @@ class User extends CommonObject
 	 */
 	public function user_get_property($rowid, $mode)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		$user_property = '';
 
 		if (empty($rowid)) return '';
 
 		$sql = "SELECT rowid, email, user_mobile, civility, lastname, firstname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user";
-		$sql .= " WHERE rowid = '".$rowid."'";
+		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -3271,9 +3168,7 @@ class User extends CommonObject
 				elseif ($mode == 'mobile') $user_property = $obj->user_mobile;
 			}
 			return $user_property;
-		}
-		else
-		{
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -3291,8 +3186,8 @@ class User extends CommonObject
 	 *  @return int							<0 if KO, >0 if OK
 	 */
 	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, $filter = array(), $filtermode = 'AND', $entityfilter = false)
-    {
-        global $conf, $user;
+	{
+		global $conf, $user;
 
 		$sql = "SELECT t.rowid";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t ';
@@ -3309,14 +3204,10 @@ class User extends CommonObject
 					$sql .= " AND ug.entity IN (".getEntity('user')."))";
 					$sql .= " OR t.entity = 0)"; // Show always superadmin
 				}
-			}
-			else
-			{
+			} else {
 				$sql .= " WHERE t.entity IN (".getEntity('user').")";
 			}
-		}
-		else
-		{
+		} else {
 			$sql .= " WHERE 1";
 		}
 
@@ -3326,14 +3217,11 @@ class User extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key.'='.$value;
-				}
-				elseif (strpos($key, 'date') !== false) {
+				} elseif (strpos($key, 'date') !== false) {
 					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-				}
-				elseif ($key == 'customsql') {
+				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
-				}
-				else {
+				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				}
 			}
@@ -3364,11 +3252,69 @@ class User extends CommonObject
 				$this->db->free($resql);
 			}
 			return $num;
+		} else {
+			$this->errors[] = $this->db->lasterror();
+			return -1;
 		}
-		else
+	}
+
+	/**
+	 * Cache the SQL results of the function "findUserIdByEmail($email)"
+	 *
+	 * NOTE: findUserIdByEmailCache[...] === -1 means not found in database
+	 *
+	 * @var array
+	 */
+	private $findUserIdByEmailCache;
+
+	/**
+	 * Find a user by the given e-mail and return it's user id when found
+	 *
+	 * NOTE:
+	 * Use AGENDA_DISABLE_EXACT_USER_EMAIL_COMPARE_FOR_EXTERNAL_CALENDAR
+	 * to disable exact e-mail search
+	 *
+	 * @param string	$email	The full e-mail (or a part of a e-mail)
+	 * @return int				<0 = user was not found, >0 = The id of the user
+	 */
+	public function findUserIdByEmail($email)
+	{
+		if ($this->findUserIdByEmailCache[$email])
 		{
-            $this->errors[] = $this->db->lasterror();
-            return -1;
-        }
-    }
+			return $this->findUserIdByEmailCache[$email];
+		}
+
+		$this->findUserIdByEmailCache[$email] = -1;
+
+		global $conf;
+
+		$sql = 'SELECT rowid';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'user';
+
+		if (!empty($conf->global->AGENDA_DISABLE_EXACT_USER_EMAIL_COMPARE_FOR_EXTERNAL_CALENDAR))
+		{
+			$sql .= ' WHERE email LIKE "%'.$email.'%"';
+		}
+		else {
+			$sql .= ' WHERE email = "'.$email.'"';
+		}
+
+		$sql .= ' LIMIT 1';
+
+		$resql = $this->db->query($sql);
+		if (!$resql)
+		{
+			return -1;
+		}
+
+		$obj = $this->db->fetch_object($resql);
+		if (!$obj)
+		{
+			return -1;
+		}
+
+		$this->findUserIdByEmailCache[$email] = (int) $obj->rowid;
+
+		return $this->findUserIdByEmailCache[$email];
+	}
 }
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index 79df9d287ec..25c751b4cb9 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -104,9 +104,7 @@ class UserBankAccount extends Account
 
                 return $this->update($user);
             }
-        }
-        else
-        {
+        } else {
             print $this->db->error();
             return 0;
         }
@@ -142,17 +140,14 @@ class UserBankAccount extends Account
 
         if (trim($this->label) != '')
             $sql .= ",label = '".$this->db->escape($this->label)."'";
-        else
-            $sql .= ",label = NULL";
+        else $sql .= ",label = NULL";
         $sql .= " WHERE rowid = ".$this->id;
 
         $result = $this->db->query($sql);
         if ($result)
         {
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return 0;
         }
@@ -175,7 +170,7 @@ class UserBankAccount extends Account
         $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 = '".$userid."'";
+        if ($userid) $sql .= " WHERE fk_user = ".((int) $userid);
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -203,9 +198,7 @@ class UserBankAccount extends Account
             $this->db->free($resql);
 
             return 1;
-        }
-        else
-        {
+        } else {
             dol_print_error($this->db);
             return -1;
         }
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 4d858ffbaf9..5b58bd06a41 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -154,9 +154,7 @@ class UserGroup extends CommonObject
 		if (!empty($groupname))
 		{
 			$result = $this->fetchCommon(0, '', ' AND nom = \''.$this->db->escape($groupname).'\'');
-		}
-		else
-		{
+		} else {
 			$result = $this->fetchCommon($id);
 		}
 
@@ -170,9 +168,7 @@ class UserGroup extends CommonObject
 			}
 
 			return 1;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -200,9 +196,7 @@ class UserGroup extends CommonObject
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " AND g.entity IS NOT NULL";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND g.entity IN (0,".$conf->entity.")";
 		}
 		$sql .= " ORDER BY g.nom";
@@ -226,9 +220,7 @@ class UserGroup extends CommonObject
 			$this->db->free($result);
 
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -257,9 +249,7 @@ class UserGroup extends CommonObject
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= " AND u.entity IS NOT NULL";
-		}
-		else
-		{
+		} else {
 			$sql .= " AND u.entity IN (0,".$conf->entity.")";
 		}
 		if (!empty($excludefilter)) $sql .= ' AND ('.$excludefilter.')';
@@ -277,8 +267,7 @@ class UserGroup extends CommonObject
 						$newuser = new User($this->db);
 						$newuser->fetch($obj->rowid);
 						$ret[$obj->rowid] = $newuser;
-					}
-					else $ret[$obj->rowid] = $obj->rowid;
+					} else $ret[$obj->rowid] = $obj->rowid;
 				}
 				if ($mode != 1 && !empty($obj->usergroup_entity))
 				{
@@ -289,9 +278,7 @@ class UserGroup extends CommonObject
 			$this->db->free($resql);
 
 			return $ret;
-		}
-		else
-		{
+		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -333,8 +320,7 @@ class UserGroup extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -348,17 +334,14 @@ class UserGroup extends CommonObject
 			// Pour compatibilite, si lowid = 0, on est en mode ajout de tout
 			// TODO A virer quand sera gere par l'appelant
 			//if (substr($rid,-1,1) == 0) $whereforadd="module='$module'";
-		}
-		else {
+		} else {
 			// Where pour la liste des droits a ajouter
 			if (!empty($allmodule))
 			{
 				if ($allmodule == 'allmodules')
 				{
 					$whereforadd = 'allmodules';
-				}
-				else
-				{
+				} else {
 					$whereforadd = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -393,9 +376,7 @@ class UserGroup extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -415,8 +396,7 @@ class UserGroup extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -458,8 +438,7 @@ class UserGroup extends CommonObject
 				$module = $obj->module;
 				$perms = $obj->perms;
 				$subperms = $obj->subperms;
-			}
-			else {
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -480,9 +459,7 @@ class UserGroup extends CommonObject
 				if ($allmodule == 'allmodules')
 				{
 					$wherefordel = 'allmodules';
-				}
-				else
-				{
+				} else {
 					$wherefordel = "module='".$this->db->escape($allmodule)."'";
 					if (!empty($allperms))  $whereforadd .= " AND perms='".$this->db->escape($allperms)."'";
 				}
@@ -517,9 +494,7 @@ class UserGroup extends CommonObject
 
 					$i++;
 				}
-			}
-			else
-			{
+			} else {
 				$error++;
 				dol_print_error($this->db);
 			}
@@ -539,8 +514,7 @@ class UserGroup extends CommonObject
 		if ($error) {
 			$this->db->rollback();
 			return -$error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -604,9 +578,7 @@ class UserGroup extends CommonObject
 						if (!isset($this->rights->$module->$perms) || !is_object($this->rights->$module->$perms)) $this->rights->$module->$perms = new stdClass();
 						if (empty($this->rights->$module->$perms->$subperms)) $this->nb_rights++;
 						$this->rights->$module->$perms->$subperms = 1;
-					}
-					else
-					{
+					} else {
 						if (empty($this->rights->$module->$perms)) $this->nb_rights++;
 						$this->rights->$module->$perms = 1;
 					}
@@ -622,9 +594,7 @@ class UserGroup extends CommonObject
 			// Si module etait non defini, alors on a tout charge, on peut donc considerer
 			// que les droits sont en cache (car tous charges) pour cet instance de group
 			$this->all_permissions_are_loaded = 1;
-		}
-		else
-		{
+		} else {
 			// If module defined, we flag it as loaded into cache
 		    $this->_tab_loaded[$moduletag] = 1;
 		}
@@ -654,13 +624,11 @@ class UserGroup extends CommonObject
 		global $user, $conf;
 
 		$this->datec = dol_now();
-		if (empty($this->nom) && !empty($this->name)) {
-			$this->nom = $this->name;
+		if (!empty($this->name)) {
+			$this->nom = $this->name; // Field for 'name' is called 'nom' in database
 		}
 
 		if (!isset($this->entity)) $this->entity = $conf->entity; // If not defined, we use default value
-		$entity = $this->entity;
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1) $entity = $this->entity;
 
 		return $this->createCommon($user, $notrigger);
 	}
@@ -675,10 +643,8 @@ class UserGroup extends CommonObject
 	{
 		global $user, $conf;
 
-		$entity = $conf->entity;
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1)
-		{
-			$entity = $this->entity;
+		if (!empty($this->name)) {
+			$this->nom = $this->name; // Field for 'name' is called 'nom' in database
 		}
 
 		return $this->updateCommon($user, $notrigger);
@@ -901,9 +867,7 @@ class UserGroup extends CommonObject
 			if (!empty($conf->global->USERGROUP_ADDON_PDF))
 			{
 				$modele = $conf->global->USERGROUP_ADDON_PDF;
-			}
-			else
-			{
+			} else {
 				$modele = 'grass';
 			}
 		}
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 2b915fbb46f..cebb7824303 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 // Load translation files required by page
 $langs->loadLangs(array('users', 'admin'));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 
 // Security check
@@ -121,9 +121,7 @@ if ($id > 0)
             {
                 $langs->load("errors");
                 print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-            }
-            else
-            {
+            } else {
                 print ' &nbsp; &nbsp; '.$form->textwithpicto($langs->trans("KeepEmptyToUseDefault").': '.$conf->global->CLICKTODIAL_URL, $langs->trans("ClickToDialUrlDesc"));
             }
             print '</td>';
@@ -146,8 +144,7 @@ if ($id > 0)
         print "</tr>\n";
 
         print '</table>';
-    }
-    else	// View mode
+    } else // View mode
     {
         print '<table class="border centpercent tableforfield">';
 
@@ -161,9 +158,7 @@ if ($id > 0)
         	{
         	    $langs->load("errors");
         	    print '<font class="error">'.$langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("ClickToDial")).'</font>';
-        	}
-        	else
-        	{
+        	} else {
         		print $form->textwithpicto((empty($object->clicktodial_url) ? '<span class="opacitymedium">'.$langs->trans("DefaultLink").':</span> ' : '').$url, $langs->trans("ClickToDialUrlDesc"));
         	}
         	print '</td>';
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 2b8c67d7ae6..83b525d03de 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -171,9 +171,7 @@ if ($object->id)
 	$permtoedit = $user->rights->user->user->creer;
 	$param = '&id='.$object->id;
 	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
-{
+} else {
 	accessforbidden('', 0, 1);
 }
 
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index d70827d357f..e8ffbd7c1f7 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -50,7 +50,7 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 $langs->loadLangs(array('users', 'other'));
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'groupcard'; // To manage different context of search
@@ -114,9 +114,7 @@ if (empty($reshook)) {
 			$object->delete($user);
 			header("Location: ".DOL_URL_ROOT."/user/group/list.php?restore_lastsearch_values=1");
 			exit;
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -131,9 +129,8 @@ if (empty($reshook)) {
 				setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
 				$action = "create"; // Go back to create page
 			} else {
-				$object->name	= trim(GETPOST("nom", 'nohtml'));
-				//$object->nom = $object->name; // For backward compatibility
-				$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
+				$object->name	= GETPOST("nom", 'nohtml');
+				$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml')));
 
 				// Fill array 'array_options' with data from add form
 				$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -152,9 +149,7 @@ if (empty($reshook)) {
 
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else
-				{
+				} else {
 					$db->rollback();
 
 					$langs->load("errors");
@@ -162,9 +157,7 @@ if (empty($reshook)) {
 					$action = "create"; // Go back to create page
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -189,15 +182,11 @@ if (empty($reshook)) {
 				{
 					header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 					exit;
-				}
-				else
-				{
+				} else {
 					setEventMessages($edituser->error, $edituser->errors, 'errors');
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'errors');
 		}
@@ -214,9 +203,8 @@ if (empty($reshook)) {
 
 			$object->oldcopy = clone $object;
 
-			$object->name	= trim(GETPOST("nom", 'nohtml'));
-			//$object->nom = $object->name; // For backward compatibility
-			$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'none')));
+			$object->name	= GETPOST("nom", 'nohtml');
+			$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml')));
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -231,15 +219,11 @@ if (empty($reshook)) {
 			{
 				setEventMessages($langs->trans("GroupModified"), null, 'mesgs');
 				$db->commit();
-			}
-			else
-			{
+			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			$langs->load("errors");
 			setEventMessages($langs->trans('ErrorForbidden'), null, 'mesgs');
 		}
@@ -286,9 +270,7 @@ if ($action == 'create')
 			print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 			print "<td>".$mc->select_entities($conf->entity);
 			print "</td></tr>\n";
-		}
-		else
-		{
+		} else {
 			print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 		}
 	}
@@ -318,8 +300,7 @@ if ($action == 'create')
 /* Visu et edition                                                            */
 /*                                                                            */
 /* ************************************************************************** */
-else
-{
+else {
     if ($id)
     {
 		$res = $object->fetch_optionals();
@@ -404,12 +385,12 @@ else
 
 			if ($caneditperms)
 			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&amp;token='.newToken().'">'.$langs->trans("Modify").'</a>';
 			}
 
 			if ($candisableperms)
 			{
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteGroup").'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'&amp;token='.newToken().'">'.$langs->trans("DeleteGroup").'</a>';
 			}
 
 			print "</div>\n";
@@ -487,16 +468,12 @@ else
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'">';
 							print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 							print '</a>';
-						}
-						else
-						{
+						} else {
 							print "-";
 						}
 						print "</td></tr>\n";
 					}
-				}
-				else
-				{
+				} else {
 					print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 				}
 				print "</table>";
@@ -516,7 +493,7 @@ else
 	        $genallowed = $user->rights->user->user->creer;
 	        $delallowed = $user->rights->user->user->supprimer;
 
-	        $somethingshown = $formfile->showdocuments('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 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);
@@ -556,9 +533,7 @@ else
 					print "<tr>".'<td class="tdtop">'.$langs->trans("Entity").'</td>';
 					print "<td>".$mc->select_entities($object->entity);
 					print "</td></tr>\n";
-				}
-				else
-				{
+				} else {
 					print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
 				}
 			}
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index 5462167b4af..d280fe37701 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -46,7 +46,7 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 }
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 $socid = 0;
 if ($user->socid > 0) $socid = $user->socid;
@@ -83,9 +83,7 @@ if ($action == 'dolibarr2ldap')
 	if ($result >= 0)
 	{
 		setEventMessages($langs->trans("GroupSynchronized"), null, 'mesgs');
-	}
-	else
-	{
+	} else {
 		setEventMessages($ldap->error, $ldap->errors, 'errors');
 	}
 }
@@ -195,21 +193,15 @@ if ($result > 0)
 		if (!is_array($records))
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-		}
-		else
-		{
+		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 	$ldap->unbind();
 	$ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 1701d2ae9c1..0b6cdf23d47 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -57,8 +57,8 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
@@ -116,9 +116,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_rights as ugr ON ugr.fk_usergrou
 if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity)))
 {
 	$sql .= " WHERE g.entity IS NOT NULL";
-}
-else
-{
+} else {
 	$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 }
 if (!empty($search_group)) natural_search(array("g.nom", "g.note"), $search_group);
@@ -221,9 +219,7 @@ if ($resql)
     print "</form>\n";
 
     $db->free($resql);
-}
-else
-{
+} else {
     dol_print_error($db);
 }
 
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 70030dbf1af..82e268a6300 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -1,9 +1,10 @@
 <?php
-/* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2017 Regis Houssin        <regis.houssin@inodbox.com>
+/* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2002-2003	Jean-Louis Bergamo		<jlb@j1b.org>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,8 +21,8 @@
  */
 
 /**
- *       \file       htdocs/user/group/perms.php
- *       \brief      Onglet user et permissions de la fiche utilisateur
+ *		\file		htdocs/user/group/perms.php
+ * 		\brief		Onglet user et permissions de la fiche utilisateur
  */
 
 require '../../main.inc.php';
@@ -34,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 $langs->loadLangs(array('users', 'admin'));
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $module = GETPOST('module', 'alpha');
 $rights = GETPOST('rights', 'int');
@@ -48,9 +49,9 @@ $caneditperms = ($user->admin || $user->rights->user->user->creer);
 $advancedpermsactive = false;
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS))
 {
-    $advancedpermsactive = true;
-    $canreadperms = ($user->admin || ($user->rights->user->group_advance->read && $user->rights->user->group_advance->readperms));
-    $caneditperms = ($user->admin || $user->rights->user->group_advance->write);
+	$advancedpermsactive = true;
+	$canreadperms = ($user->admin || ($user->rights->user->group_advance->read && $user->rights->user->group_advance->readperms));
+	$caneditperms = ($user->admin || $user->rights->user->group_advance->write);
 }
 
 if (!$canreadperms) accessforbidden();
@@ -112,257 +113,268 @@ llxHeader('', $langs->trans("Permissions"));
 if ($object->id > 0)
 {
 	/*
-     * Affichage onglets
-     */
+	 * Affichage onglets
+	 */
 	$object->getrights(); // Reload permission
 
-    $head = group_prepare_head($object);
-    $title = $langs->trans("Group");
-    dol_fiche_head($head, 'rights', $title, -1, 'group');
+	$head = group_prepare_head($object);
+	$title = $langs->trans("Group");
+	dol_fiche_head($head, 'rights', $title, -1, 'group');
 
-    // Charge les modules soumis a permissions
-    $modules = array();
-    $modulesdir = dolGetModulesDirs();
+	// Charge les modules soumis a permissions
+	$modules = array();
+	$modulesdir = dolGetModulesDirs();
 
-    $db->begin();
+	$db->begin();
 
-    foreach ($modulesdir as $dir)
-    {
-        $handle = @opendir(dol_osencode($dir));
-        if (is_resource($handle))
-        {
-            while (($file = readdir($handle)) !== false)
-            {
-                if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-                {
-                    $modName = substr($file, 0, dol_strlen($file) - 10);
+	foreach ($modulesdir as $dir)
+	{
+		$handle = @opendir(dol_osencode($dir));
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle)) !== false)
+			{
+				if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
+				{
+					$modName = substr($file, 0, dol_strlen($file) - 10);
 
-                    if ($modName)
-                    {
-                        include_once $dir.$file;
-                        $objMod = new $modName($db);
-                        // Load all lang files of module
-                        if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-                        {
-                            foreach ($objMod->langfiles as $domain)
-                            {
-                                $langs->load($domain);
-                            }
-                        }
-                        // Load all permissions
-                        if ($objMod->rights_class)
-                        {
-                            $ret = $objMod->insert_permissions(0, $entity);
-                            $modules[$objMod->rights_class] = $objMod;
-                        }
-                    }
-                }
-            }
-        }
-    }
+					if ($modName)
+					{
+						include_once $dir.$file;
+						$objMod = new $modName($db);
+						// Load all lang files of module
+						if (isset($objMod->langfiles) && is_array($objMod->langfiles))
+						{
+							foreach ($objMod->langfiles as $domain)
+							{
+								$langs->load($domain);
+							}
+						}
+						// Load all permissions
+						if ($objMod->rights_class)
+						{
+							$ret = $objMod->insert_permissions(0, $entity);
+							$modules[$objMod->rights_class] = $objMod;
+						}
+					}
+				}
+			}
+		}
+	}
 
-    $db->commit();
+	$db->commit();
 
-    // Read permissions of group
-    $permsgroupbyentity = array();
+	// Read permissions of group
+	$permsgroupbyentity = array();
 
-    $sql = "SELECT DISTINCT r.id, r.libelle, r.module, gr.entity";
-    $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
-    $sql .= " ".MAIN_DB_PREFIX."usergroup_rights as gr";
-    $sql .= " WHERE gr.fk_id = r.id";
-    $sql .= " AND gr.entity = ".$entity;
-    $sql .= " AND gr.fk_usergroup = ".$object->id;
+	$sql = "SELECT DISTINCT r.id, r.libelle, r.module, gr.entity";
+	$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r,";
+	$sql .= " ".MAIN_DB_PREFIX."usergroup_rights as gr";
+	$sql .= " WHERE gr.fk_id = r.id";
+	$sql .= " AND gr.entity = ".$entity;
+	$sql .= " AND gr.fk_usergroup = ".$object->id;
 
-    dol_syslog("get user perms", LOG_DEBUG);
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-    	while ($i < $num)
-    	{
-    		$obj = $db->fetch_object($result);
-    		if (!isset($permsgroupbyentity[$obj->entity]))
-    			$permsgroupbyentity[$obj->entity] = array();
-    			array_push($permsgroupbyentity[$obj->entity], $obj->id);
-    			$i++;
-    	}
-    	$db->free($result);
-    }
-    else
-    {
-    	dol_print_error($db);
-    }
+	dol_syslog("get user perms", LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($result);
+			if (!isset($permsgroupbyentity[$obj->entity]))
+				$permsgroupbyentity[$obj->entity] = array();
+				array_push($permsgroupbyentity[$obj->entity], $obj->id);
+				$i++;
+		}
+		$db->free($result);
+	} else {
+		dol_print_error($db);
+	}
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/user/group/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/user/group/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>';
 
-    /*
-     * Ecran ajout/suppression permission
-     */
+	/*
+	 * Ecran ajout/suppression permission
+	 */
 
-    print '<table class="border centpercent tableforfield">';
+	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 colspan="2">'.$object->name.'';
-        if (!$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 colspan="2">'.$object->name.'';
+		if (!$object->entity)
+		{
+			print img_picto($langs->trans("GlobalGroup"), 'redstar');
+		}
+		print "</td></tr>\n";
+	}
 
-    // Note
-    print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td>';
-    print '<td class="valeur sensiblehtmlcontent">';
-    print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note));
-    print '</td>';
-    print "</tr>\n";
+	// Note
+	print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td>';
+	print '<td class="valeur sensiblehtmlcontent">';
+	print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note));
+	print '</td>';
+	print "</tr>\n";
 
-    print '</table><br>';
+	print '</table><br>';
 
-    if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
+	if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
 
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('insertExtraHeader', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    print "\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>';
-    if ($caneditperms)
-    {
-    	print '<td class="center nowrap">';
-    	print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("All")."</a>";
-    	print '/';
-    	print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("None")."</a>";
-    	print '</td>';
-    }
-    print '<td class="center" width="24">&nbsp;</td>';
-    print '<td>'.$langs->trans("Permissions").'</td>';
-    print '</tr>'."\n";
+	print "\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>';
+	if ($caneditperms)
+	{
+		print '<td class="center nowrap">';
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("All")."</a>";
+		print '/';
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("None")."</a>";
+		print '</td>';
+	}
+	print '<td class="center" width="24">&nbsp;</td>';
+	print '<td>'.$langs->trans("Permissions").'</td>';
+	if ($user->admin) print '<td class="right">'.$langs->trans("ID").'</td>';
+	print '</tr>'."\n";
 
-    $sql = "SELECT r.id, r.libelle as label, r.module";
-    $sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
-    $sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
-    $sql .= " AND r.entity = ".$entity;
-    if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is disable
-    $sql .= " ORDER BY r.module, r.id";
+	$sql = "SELECT r.id, r.libelle as label, r.module";
+	$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
+	$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
+	$sql .= " AND r.entity = ".$entity;
+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is disable
+	$sql .= " ORDER BY r.module, r.id";
 
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
-        $oldmod = '';
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$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;
+			}
 
-            if ($oldmod <> $obj->module)
-            {
-                $oldmod = $obj->module;
+			if ($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>';
-                if ($caneditperms)
-                {
-                	print '<td class="center nowrap">';
-                	print '<a class="reposition" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
-                    print '/';
-                    print '<a class="reposition" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
-                    print '</td>';
-                } else {
-                	print '<td>&nbsp;</td>';
-                }
-                print '<td colspan="2">&nbsp;</td>';
-                print '</tr>';
-            }
+				// 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>';
+				if ($caneditperms)
+				{
+					print '<td class="center nowrap">';
+					print '<a class="reposition" title='.$langs->trans("All").' alt='.$langs->trans("All").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
+					print '/';
+					print '<a class="reposition" title='.$langs->trans("None").' alt='.$langs->trans("None").' href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
+					print '</td>';
+				} else {
+					print '<td>&nbsp;</td>';
+				}
+				print '<td colspan="2">&nbsp;</td>';
 
-            print '<!-- '.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '').' -->'."\n";
-            print '<tr class="oddeven">';
+				// Permission id
+				if ($user->admin) print '<td class="right"></td>';
 
-            // Picto and label of module
-            print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
-            //print img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName();
-            print '</td>';
+				print '</tr>';
+			}
 
-            if (is_array($permsgroupbyentity[$entity]))
-            {
-            	if (in_array($obj->id, $permsgroupbyentity[$entity]))
-            	{
-            		// Own permission by group
-            		if ($caneditperms)
-            		{
-            			print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
-            		}
-            		print '<td class="center nowrap">';
-            		print img_picto($langs->trans("Active"), 'tick');
-            		print '</td>';
-            	}
-            	else
-            	{
-            		// Do not own permission
-            		if ($caneditperms)
-            		{
-            			print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-            		}
-            		print '<td>&nbsp</td>';
-            	}
-            }
-            else
-            {
-            	// Do not own permission
-            	if ($caneditperms)
-            	{
-            		print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-            	}
-            	print '<td>&nbsp</td>';
-            }
+			print '<!-- '.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '').' -->'."\n";
+			print '<tr class="oddeven">';
 
-            $permlabel = ($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) : $langs->trans($obj->label)));
-            print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
+			// Picto and label of module
+			print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
+			//print img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName();
+			print '</td>';
 
-            print '</tr>'."\n";
+			if (is_array($permsgroupbyentity[$entity]))
+			{
+				if (in_array($obj->id, $permsgroupbyentity[$entity]))
+				{
+					// Own permission by group
+					if ($caneditperms)
+					{
+						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">';
+						//print img_edit_remove($langs->trans("Remove"));
+						print img_picto($langs->trans("Remove"), 'switch_on');
+						print '</a></td>';
+					}
+					print '<td class="center nowrap">';
+					print img_picto($langs->trans("Active"), 'tick');
+					print '</td>';
+				} else {
+					// Do not own permission
+					if ($caneditperms)
+					{
+						print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">';
+						//print img_edit_add($langs->trans("Add"));
+						print img_picto($langs->trans("Add"), 'switch_off');
+						print '</a></td>';
+					}
+					print '<td>&nbsp</td>';
+				}
+			} else {
+				// Do not own permission
+				if ($caneditperms)
+				{
+					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">';
+					//print img_edit_add($langs->trans("Add"));
+					print img_picto($langs->trans("Add"), 'switch_off');
+					print '</a></td>';
+				}
+				print '<td>&nbsp</td>';
+			}
 
-            $i++;
-        }
-    }
-    print '</table>';
-    print '</div>';
+			$permlabel = ($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) : $langs->trans($obj->label)));
+			print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
 
-    print '</div>';
+			// Permission id
+			if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
 
-    $parameters = array();
-    $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');
+			print '</tr>'."\n";
 
-    dol_fiche_end();
+			$i++;
+		}
+	}
+	print '</table>';
+	print '</div>';
+
+	print '</div>';
+
+	$parameters = array();
+	$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();
 }
 
 // End of page
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 3a05bb3d640..6918d1638e4 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -79,9 +79,7 @@ $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');
-}
-else
-{
+} else {
     // Define fulltree array
     $fulltree = $user_arbo;
     //var_dump($fulltree);
@@ -112,9 +110,7 @@ else
     		if (empty($entity))
     		{
     			$entitystring = $langs->trans("AllEntities");
-    		}
-    		else
-    		{
+    		} else {
     			$mc->getInfo($entity);
     			$entitystring = $mc->label;
     		}
@@ -124,18 +120,19 @@ else
     	if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
     	{
     		$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
-    	}
-    	elseif ($userstatic->admin)
+    	} 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>';
+
     	$data[] = array(
     		'rowid'=>$val['rowid'],
     		'fk_menu'=>$val['fk_user'],
     		'statut'=>$val['statut'],
-    		'entry'=>'<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$userstatic->getLibStatut(3).'</td></tr></table>'
+    		'entry'=>$entry
     	);
     }
 
@@ -151,7 +148,9 @@ else
         $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('ViewList'), '', 'fa fa-list paddingleft', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
+    $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');
 
@@ -191,15 +190,13 @@ else
 
     if ($nbofentries > 0)
     {
-    	print '<tr '.$bc[false].'><td colspan="3">';
+    	print '<tr><td colspan="3">';
     	tree_recur($data, $data[0], 0);
     	print '</td>';
     	print '<td></td>';
     	print '</tr>';
-    }
-    else
-    {
-    	print '<tr '.$bc[true].'>';
+    } 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">';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 4c46c502acc..3e08fc7098a 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -102,7 +102,6 @@ $sql .= ", u.ldap_sid";
 $sql .= ", u.photo";
 $sql .= ", u.admin";
 $sql .= ", u.email";
-$sql .= ", u.skype";
 $sql .= ", s.nom as name";
 $sql .= ", s.code_client";
 $sql .= ", s.canvas";
@@ -144,7 +143,6 @@ if ($resql)
 		$fuserstatic->photo = $obj->photo;
 		$fuserstatic->admin = $obj->admin;
 		$fuserstatic->email = $obj->email;
-		$fuserstatic->skype = $obj->skype;
 		$fuserstatic->socid = $obj->fk_soc;
 
 		$companystatic->id = $obj->fk_soc;
@@ -158,8 +156,7 @@ if ($resql)
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity)
 		{
 			print img_picto($langs->trans("SuperAdministrator"), 'redstar');
-		}
-		elseif ($obj->admin)
+		} elseif ($obj->admin)
 		{
 			print img_picto($langs->trans("Administrator"), 'star');
 		}
@@ -169,9 +166,7 @@ if ($resql)
 		if ($obj->fk_soc)
 		{
             print $companystatic->getNomUrl(1);
-		}
-		else
-		{
+		} else {
 			print $langs->trans("InternalUser");
 		}
 		if ($obj->ldap_sid)
@@ -187,9 +182,7 @@ if ($resql)
 			if (empty($entity))
 			{
 				$entitystring = $langs->trans("AllEntities");
-			}
-			else
-			{
+			} else {
 				$mc->getInfo($entity);
 				$entitystring = $mc->label;
 			}
@@ -209,9 +202,7 @@ if ($resql)
 	print "</div><br>";
 
 	$db->free($resql);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -228,9 +219,7 @@ if ($canreadperms)
 	if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && !$user->entity)))
 	{
 		$sql .= " WHERE g.entity IS NOT NULL";
-	}
-	else
-	{
+	} else {
 		$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 	}
 	$sql .= $db->order("g.datec", "DESC");
@@ -283,9 +272,7 @@ if ($canreadperms)
 		print "</div><br>";
 
 		$db->free($resql);
-	}
-	else
-	{
+	} else {
 		dol_print_error($db);
 	}
 }
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 71410eb223a..eaa3de2c55d 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -75,8 +75,7 @@ if (empty($reshook))
 
 		if ($result >= 0) {
 			setEventMessages($langs->trans("UserSynchronized"), null, 'mesgs');
-		}
-		else {
+		} else {
 			setEventMessages($ldap->error, $ldap->errors, 'errors');
 		}
 	}
@@ -113,9 +112,7 @@ print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
 if ($object->ldap_sid)
 {
 	print '<td class="warning">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-}
-else
-{
+} else {
 	print '<td>'.$object->login.'</td>';
 }
 print '</tr>';
@@ -198,22 +195,16 @@ if ($result > 0)
 		if (!is_array($records))
 		{
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
-		}
-		else
-		{
+		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
 		}
-	}
-	else
-	{
+	} else {
 		print '<tr class="oddeven"><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
 	}
 
 	$ldap->unbind();
 	$ldap->close();
-}
-else
-{
+} else {
 	setEventMessages($ldap->error, $ldap->errors, 'errors');
 }
 
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index ef6e205fd0d..d02d647f96d 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -38,7 +38,15 @@ if (!$user->rights->user->user->lire && !$user->admin) {
 // Load translation files required by page
 $langs->loadLangs(array('users', 'companies', 'hrm'));
 
+$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') : 'userlist'; // 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')
 
 // Security check (for external users)
 $socid = 0;
@@ -51,28 +59,36 @@ $mode = GETPOST("mode", 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "u.login";
-if (!$sortorder) $sortorder = "ASC";
-
-// Define value to know what current user can do on users
-$canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new User($db);
-$hookmanager->initHooks(array('userlist'));
 $extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->mymodule->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('userlist'));
 
-// fetch optionals attributes and labels
+// Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
+
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
+if (!$sortfield) $sortfield = "u.login";
+if (!$sortorder) $sortorder = "ASC";
+
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search = array();
+foreach ($object->fields as $key => $val)
+{
+	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+}
+
 $userstatic = new User($db);
 $companystatic = new Societe($db);
 $form = new Form($db);
@@ -115,8 +131,16 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 {
 	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]));
+		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]),
+				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key],
+				'help'=>$extrafields->attributes[$object->table_element]['help'][$key]
+			);
+		}
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
@@ -144,6 +168,20 @@ $catid = GETPOST('catid', 'int');
 if ($search_statut == '') $search_statut = '1';
 if ($mode == 'employee' && !GETPOSTISSET('search_employee')) $search_employee = 1;
 
+// Define value to know what current user can do on users
+$permissiontoadd = (!empty($user->admin) || $user->rights->user->user->creer);
+$canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
+$canedituser = (!empty($user->admin) || $user->rights->user->user->creer);
+$candisableuser = (!empty($user->admin) || $user->rights->user->user->supprimer);
+$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);
+}
+
+$error = 0;
 
 
 /*
@@ -154,7 +192,7 @@ if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters); // Note that $action and $object may have been modified by some hooks
+$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))
@@ -182,7 +220,73 @@ if (empty($reshook))
 		$search_date_creation = "";
 		$search_date_update = "";
 		$search_array_options = array();
-        $search_categ = 0;
+		$search_categ = 0;
+	}
+
+	// Mass actions
+	$objectclass = 'User';
+	$objectlabel = 'User';
+	$uploaddir = $conf->user->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	// Disable or Enable records
+	if (!$error && ($massaction == 'disable' || $massaction == 'reactivate') && $permissiontoadd)
+	{
+		$objecttmp = new User($db);
+
+		if (!$error)
+		{
+			$db->begin();
+
+			$nbok = 0;
+			foreach ($toselect as $toselectid)
+			{
+				if ($toselectid == $user->id) {
+					setEventMessages($langs->trans($massaction == 0 ? 'CantDisableYourself' : 'CanEnableYourself'), null, 'errors');
+					$error++;
+					break;
+				}
+
+				$result = $objecttmp->fetch($toselectid);
+				if ($result > 0) {
+					if ($objecttmp->admin) {
+						setEventMessages($langs->trans($massaction == 0 ? 'CantDisableAnAdminUserWithMassActions' : 'CantEnableAnAdminUserWithMassActions', $objecttmp->login), null, 'errors');
+						$error++;
+						break;
+					}
+
+					$result = $objecttmp->setstatus($massaction == 'disable' ? 0 : 1);
+					if ($result == 0) {
+						// Nothing is done
+					} elseif ($result < 0) {
+						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+						$error++;
+						break;
+					} else $nbok++;
+				} else {
+					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+					$error++;
+					break;
+				}
+			}
+
+			if (!$error && !empty($conf->file->main_limit_users)) {
+				$nb = $object->getNbOfUsers("active");
+				if ($nb >= $conf->file->main_limit_users) {
+					$error++;
+					setEventMessages($langs->trans("YourQuotaOfUsersIsReached"), null, 'errors');
+				}
+			}
+
+			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();
+			}
+		}
 	}
 }
 
@@ -191,12 +295,14 @@ if (empty($reshook))
  * View
  */
 
-$htmlother = new FormOther($db);
+$formother = new FormOther($db);
+
+//$help_url="EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject";
+$help_url = '';
+$text = $langs->trans("ListOfUsers");
 
 $user2 = new User($db);
 
-$buttonviewhierarchy = '<form action="'.DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : '').'" method="POST"><input type="submit" class="button" style="width:120px" name="viewcal" value="'.dol_escape_htmltag($langs->trans("HierarchicView")).'"></form>';
-
 $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,";
 $sql .= " u.datelastlogin, u.datepreviouslogin,";
 $sql .= " u.ldap_sid, u.statut, u.entity,";
@@ -205,11 +311,13 @@ $sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.la
 $sql .= " s.nom as name, s.canvas";
 // 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();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 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 (u.rowid = ef.fk_object)";
@@ -226,21 +334,21 @@ if ($reshook > 0) {
 }
 if ($socid > 0) $sql .= " AND u.fk_soc = ".$socid;
 //if ($search_user != '')       $sql.=natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
-if ($search_supervisor > 0)   $sql .= " AND u.fk_user IN (".$db->escape($search_supervisor).")";
+if ($search_supervisor > 0)   $sql .= " AND u.fk_user IN (".$db->sanitize($db->escape($search_supervisor)).")";
 if ($search_thirdparty != '') $sql .= natural_search(array('s.nom'), $search_thirdparty);
 if ($search_login != '')      $sql .= natural_search("u.login", $search_login);
 if ($search_lastname != '')   $sql .= natural_search("u.lastname", $search_lastname);
 if ($search_firstname != '')  $sql .= natural_search("u.firstname", $search_firstname);
-if ($search_gender != '' && $search_gender != '-1')     $sql .= " AND u.gender = '".$search_gender."'";
+if ($search_gender != '' && $search_gender != '-1')     $sql .= natural_search("u.gender", $search_gender);
 if (is_numeric($search_employee) && $search_employee >= 0) {
 	$sql .= ' AND u.employee = '.(int) $search_employee;
 }
 if ($search_accountancy_code != '')  $sql .= natural_search("u.accountancy_code", $search_accountancy_code);
 if ($search_email != '')             $sql .= natural_search("u.email", $search_email);
 if ($search_api_key != '')           $sql .= natural_search("u.api_key", $search_api_key);
-if ($search_statut != '' && $search_statut >= 0) $sql .= " AND u.statut IN (".$db->escape($search_statut).")";
+if ($search_statut != '' && $search_statut >= 0) $sql .= " AND u.statut IN (".$db->sanitize($db->escape($search_statut)).")";
 if ($sall)                           $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($catid > 0)     $sql .= " AND cu.fk_categorie = ".$catid;
+if ($catid > 0)     $sql .= " AND cu.fk_categorie = ".((int) $catid);
 if ($catid == -2)   $sql .= " AND cu.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql .= " AND cu.fk_categorie = ".$db->escape($search_categ);
 if ($search_categ == -2) $sql .= " AND cu.fk_categorie IS NULL";
@@ -248,29 +356,41 @@ if ($search_categ == -2) $sql .= " AND cu.fk_categorie IS NULL";
 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
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= $db->order($sortfield, $sortorder);
 
-$nbtotalofrecords = 0;
-$result = $db->query($sql);
-if ($result)
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$nbtotalofrecords = $db->num_rows($result);
+	$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 || empty($limit)))
+{
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+
+	$resql = $db->query($sql);
+	if (!$resql)
+	{
+		dol_print_error($db);
+		exit;
+	}
+
+	$num = $db->num_rows($resql);
 }
 
-$sql .= $db->plimit($limit + 1, $offset);
-
-$result = $db->query($sql);
-if (!$result)
-{
-	dol_print_error($db);
-	exit;
-}
-
-$num = $db->num_rows($result);
-
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page)
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
@@ -278,7 +398,10 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 	exit;
 }
 
-llxHeader('', $langs->trans("ListOfUsers"));
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $langs->trans("ListOfUsers"), $help_url);
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&amp;contextpage='.urlencode($contextpage);
@@ -301,13 +424,14 @@ if ($search_categ > 0) $param .= "&amp;search_categ=".urlencode($search_categ);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-$text = $langs->trans("ListOfUsers");
+// List of mass actions available
+$arrayofmassactions = array();
+if ($permissiontoadd) $arrayofmassactions['disable'] = $langs->trans("DisableUser");
+if ($permissiontoadd) $arrayofmassactions['reactivate'] = $langs->trans("Reactivate");
+//if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 
-$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=');
-}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -318,57 +442,75 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-sitemap paddingleft', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
+$url = DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=';
+if (!empty($socid)) $url .= '&socid='.$socid;
 
-print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $nbtotalofrecords, 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit, 0, 0, 1);
+$newcardbutton = dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
+
+$moreparam = array('morecss'=>'btnTitleSelected');
+$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 : ''), '', 1, $moreparam);
+$moreparam = array('morecss'=>'marginleftonly');
+$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, $moreparam);
+
+print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendUserRef";
+$modelmail = "user";
+$objecttmp = new User($db);
+$trackid = 'use'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if (!empty($catid))
 {
-    print "<div id='ways'>";
-    $c = new Categorie($db);
-    $ways = $c->print_all_ways(' &gt; ', 'user/list.php');
-    print " &gt; ".$ways[0]."<br>\n";
-    print "</div><br>";
+	print "<div id='ways'>";
+	$c = new Categorie($db);
+	$ways = $c->print_all_ways(' &gt; ', 'user/list.php');
+	print " &gt; ".$ways[0]."<br>\n";
+	print "</div><br>";
 }
 
-if ($sall)
+if ($search_all)
 {
 	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+ $moreforfilter.= '</div>';*/
 
 // Filter on categories
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
-    $moreforfilter .= '<div class="divsearchfield">';
-    $moreforfilter .= $langs->trans('Categories').': ';
-    $moreforfilter .= $htmlother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1);
-    $moreforfilter .= '</div>';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans('Categories').': ';
+	$moreforfilter .= $formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1);
+	$moreforfilter .= '</div>';
 }
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
 
-if ($moreforfilter)
+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">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-// Search bar
+// Fields title search
+// --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 if (!empty($arrayfields['u.login']['checked']))
 {
@@ -385,7 +527,7 @@ if (!empty($arrayfields['u.firstname']['checked']))
 if (!empty($arrayfields['u.gender']['checked']))
 {
 	print '<td class="liste_titre">';
-	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
+	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
 }
@@ -434,7 +576,7 @@ if (!empty($arrayfields['u.datepreviouslogin']['checked']))
 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
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['u.datec']['checked']))
 {
@@ -457,11 +599,10 @@ if (!empty($arrayfields['u.statut']['checked']))
 }
 // Action column
 print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterAndCheckAddButtons(0);
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
-
-print "</tr>\n";
+print '</tr>'."\n";
 
 
 print '<tr class="liste_titre">';
@@ -482,21 +623,38 @@ if (!empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_ti
 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
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['u.datec']['checked']))  print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "u.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 if (!empty($arrayfields['u.tms']['checked']))    print_liste_field_titre("DateModificationShort", $_SERVER["PHP_SELF"], "u.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 if (!empty($arrayfields['u.statut']['checked'])) print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "u.statut", "", $param, '', $sortfield, $sortorder, 'center ');
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-print "</tr>\n";
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+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)) $needToFetchEachLine++; // There is at least one compute field that use $object
+	}
+}
 
+
+// Loop on record
+// --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
+while ($i < ($limit ? min($num, $limit) : $num))
 {
-	$obj = $db->fetch_object($result);
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break; // Should not happen
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
 
 	$userstatic->id = $obj->rowid;
 	$userstatic->admin = $obj->admin;
@@ -513,7 +671,7 @@ while ($i < min($num, $limit))
 
 	$li = $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
 
-	print "<tr>";
+	print '<tr class="oddeven">';
 	if (!empty($arrayfields['u.login']['checked']))
 	{
 		print '<td class="nowraponall">';
@@ -521,8 +679,7 @@ while ($i < min($num, $limit))
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity)
 		{
 		  	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-		}
-		elseif ($obj->admin)
+		} elseif ($obj->admin)
 		{
 			print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
 		}
@@ -531,34 +688,34 @@ while ($i < min($num, $limit))
 	}
 	if (!empty($arrayfields['u.lastname']['checked']))
 	{
-		  print '<td>'.$obj->lastname.'</td>';
+		  print '<td class="tdoverflowmax150">'.$obj->lastname.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.firstname']['checked']))
 	{
-	    print '<td>'.$obj->firstname.'</td>';
+		print '<td class="tdoverflowmax150">'.$obj->firstname.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.gender']['checked']))
 	{
-	    print '<td>';
-	    if ($obj->gender) print $langs->trans("Gender".$obj->gender);
-	    print '</td>';
+		print '<td>';
+		if ($obj->gender) print $langs->trans("Gender".$obj->gender);
+		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.employee']['checked']))
 	{
-	    print '<td>'.yn($obj->employee).'</td>';
+		print '<td>'.yn($obj->employee).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.accountancy_code']['checked']))
 	{
-	    print '<td>'.$obj->accountancy_code.'</td>';
+		print '<td>'.$obj->accountancy_code.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.email']['checked']))
 	{
-	    print '<td>'.$obj->email.'</td>';
+		print '<td>'.$obj->email.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.api_key']['checked']))
@@ -575,13 +732,10 @@ while ($i < min($num, $limit))
 			$companystatic->name = $obj->name;
 			$companystatic->canvas = $obj->canvas;
 			print $companystatic->getNomUrl(1);
-		}
-		elseif ($obj->ldap_sid)
+		} elseif ($obj->ldap_sid)
 		{
 			print $langs->trans("DomainUser");
-		}
-		else
-	    {
+		} else {
 			print $langs->trans("InternalUser");
 		}
 		print '</td>';
@@ -596,9 +750,7 @@ while ($i < min($num, $limit))
 			if (!$obj->entity)
 			{
 				print $langs->trans("AllEntities");
-			}
-			else
-			{
+			} else {
 				$mc->getInfo($obj->entity);
 				print $mc->label;
 			}
@@ -622,13 +774,12 @@ while ($i < min($num, $limit))
 			$user2->admin = $obj->admin2;
 			$user2->email = $obj->email2;
 			$user2->socid = $obj->fk_soc2;
-            $user2->statut = $obj->statut2;
+			$user2->statut = $obj->statut2;
 			print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
 			if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2)
 			{
 			  	print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-			}
-			elseif ($obj->admin2)
+			} elseif ($obj->admin2)
 			{
 				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
 			}
@@ -653,8 +804,8 @@ while ($i < min($num, $limit))
 	// 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
+	$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;
 	// Date creation
 	if (!empty($arrayfields['u.datec']['checked']))
@@ -675,28 +826,49 @@ while ($i < min($num, $limit))
 	// Status
 	if (!empty($arrayfields['u.statut']['checked']))
 	{
-	    $userstatic->statut = $obj->statut;
-	    print '<td class="center">'.$userstatic->getLibStatut(5).'</td>';
-	    if (!$i) $totalarray['nbfield']++;
+		$userstatic->statut = $obj->statut;
+		print '<td class="center">'.$userstatic->getLibStatut(5).'</td>';
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Action column
-	print '<td></td>';
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	{
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
 	if (!$i) $totalarray['nbfield']++;
 
-	print "</tr>\n";
+	print '</tr>'."\n";
 
 	$i++;
 }
 
+// Show total line
+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>';
+}
+
+
+$db->free($resql);
+
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
-print "</table>";
-print '</div>';
-print "</form>\n";
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
 
-$db->free($result);
 
 // End of page
 llxFooter();
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index ab4df07e193..955c1f14599 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', 'none'), ENT_QUOTES));
+		$res = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES));
 		if ($res < 0) {
 			$mesg = '<div class="error">'.$adh->error.'</div>';
 			$db->rollback();
@@ -120,9 +120,7 @@ if ($id)
 		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();
-	}
-	else
-	{
+	} else {
 		print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
 	}
 	print "</td></tr>";
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 84fbf2793e3..9d4b5e7a331 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -63,52 +63,48 @@ $now = dol_now();
 // Add a notification
 if ($action == 'add')
 {
-    $error = 0;
+	$error = 0;
 
-    if ($actionid <= 0)
-    {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
-        $error++;
-    }
+	if ($actionid <= 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
+		$error++;
+	}
 
-    if (!$error)
-    {
-        $db->begin();
+	if (!$error)
+	{
+		$db->begin();
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-        $sql .= " WHERE fk_user=".$id." AND fk_action=".$actionid;
-        if ($db->query($sql))
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";
-            $sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+		$sql .= " WHERE fk_user=".$id." AND fk_action=".$actionid;
+		if ($db->query($sql))
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";
+			$sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";
 
-            if (!$db->query($sql))
-            {
-                $error++;
-                dol_print_error($db);
-            }
-        }
-        else
-        {
-            dol_print_error($db);
-        }
+			if (!$db->query($sql))
+			{
+				$error++;
+				dol_print_error($db);
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        if (!$error)
-        {
-            $db->commit();
-        }
-        else
-        {
-            $db->rollback();
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
 }
 
 // Remove a notification
 if ($action == 'delete')
 {
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST("actid", "int");
-    $db->query($sql);
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST("actid", "int");
+	$db->query($sql);
 }
 
 
@@ -131,34 +127,32 @@ llxHeader('', $title, $help_url);
 
 if ($result > 0)
 {
-    $langs->load("other");
+	$langs->load("other");
 
-    $head = user_prepare_head($object);
+	$head = user_prepare_head($object);
 
-    dol_fiche_head($head, 'notify', $langs->trans("User"), -1, 'user');
+	dol_fiche_head($head, 'notify', $langs->trans("User"), -1, 'user');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
-    // Login
-    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
-    if (!empty($object->ldap_sid) && $object->statut == 0)
-    {
-        print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-    }
-    else
-    {
-        print '<td>'.$object->login.'</td>';
-    }
-    print '</tr>'."\n";
+	// Login
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+	if (!empty($object->ldap_sid) && $object->statut == 0)
+	{
+		print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
+	} else {
+		print '<td>'.$object->login.'</td>';
+	}
+	print '</tr>'."\n";
 
-    /*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
+	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
     print '<td colspan="3">';
     $nbofrecipientemails=0;
     $notify=new Notify($db);
@@ -170,172 +164,164 @@ if ($result > 0)
     print $nbofrecipientemails;
     print '</td></tr>';*/
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    print "\n";
+	print "\n";
 
-    // Help
-    print '<span class="opacitymedium">';
-    print '<br>'.$langs->trans("NotificationsDesc");
-    print '<br>'.$langs->trans("NotificationsDescUser");
-    print '<br>'.$langs->trans("NotificationsDescContact");
-    print '<br>'.$langs->trans("NotificationsDescGlobal");
-    print '</span>';
+	// Help
+	print '<span class="opacitymedium">';
+	print '<br>'.$langs->trans("NotificationsDesc");
+	print '<br>'.$langs->trans("NotificationsDescUser");
+	print '<br>'.$langs->trans("NotificationsDescContact");
+	print '<br>'.$langs->trans("NotificationsDescGlobal");
+	print '</span>';
 
-    print '<br><br><br>'."\n";
+	print '<br><br><br>'."\n";
 
 
-    // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
+	// Add notification form
+	print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    $param = "&id=".$id;
+	$param = "&id=".$id;
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('');
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('');
 	print "</tr>\n";
 
 
-    // $listofemails=$object->thirdparty_and_contact_email_array();
-    if ($object->email)
-    {
-        $actions = array();
+	// $listofemails=$object->thirdparty_and_contact_email_array();
+	if ($object->email)
+	{
+		$actions = array();
 
-        // Load array of available notifications
-        $notificationtrigger = new InterfaceNotification($db);
-        $listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();
+		// Load array of available notifications
+		$notificationtrigger = new InterfaceNotification($db);
+		$listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();
 
-        foreach ($listofnotifiedevents as $notifiedevent)
-        {
+		foreach ($listofnotifiedevents as $notifiedevent)
+		{
  			$label = ($langs->trans("Notify_".$notifiedevent['code']) != "Notify_".$notifiedevent['code'] ? $langs->trans("Notify_".$notifiedevent['code']) : $notifiedevent['label']);
-            $actions[$notifiedevent['rowid']] = $label;
-        }
-        print '<tr class="oddeven nohover"><td>';
-        print $object->getNomUrl(1);
-        if (isValidEmail($object->email))
-        {
-            print ' &lt;'.$object->email.'&gt;';
-        }
-        else
-        {
-            $langs->load("errors");
-            print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);
-        }
-        print '</td>';
-        print '<td>';
-        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);
-        print '</td>';
-        print '<td>';
-        $type = array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid", $type);
-        print '</td>';
-        print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-        print '</tr>';
-    }
-    else
-    {
-        print '<tr class="oddeven"><td colspan="4">';
-        print $langs->trans("YouMustAssignUserMailFirst");
-        print '</td></tr>';
-    }
+			$actions[$notifiedevent['rowid']] = $label;
+		}
+		print '<tr class="oddeven nohover"><td>';
+		print $object->getNomUrl(1);
+		if (isValidEmail($object->email))
+		{
+			print ' &lt;'.$object->email.'&gt;';
+		} else {
+			$langs->load("errors");
+			print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);
+		}
+		print '</td>';
+		print '<td>';
+		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);
+		print '</td>';
+		print '<td>';
+		$type = array('email'=>$langs->trans("EMail"));
+		print $form->selectarray("typeid", $type);
+		print '</td>';
+		print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+		print '</tr>';
+	} else {
+		print '<tr class="oddeven"><td colspan="4">';
+		print $langs->trans("YouMustAssignUserMailFirst");
+		print '</td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 
-    // List of notifications enabled for contacts
-    $sql = "SELECT n.rowid, n.type,";
-    $sql .= " a.code, a.label,";
-    $sql .= " c.rowid as userid, c.lastname, c.firstname, c.email";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql .= " ".MAIN_DB_PREFIX."user c";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND c.rowid = n.fk_user";
-    $sql .= " AND c.rowid = ".$object->id;
+	// List of notifications enabled for contacts
+	$sql = "SELECT n.rowid, n.type,";
+	$sql .= " a.code, a.label,";
+	$sql .= " c.rowid as userid, c.lastname, c.firstname, c.email";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+	$sql .= " ".MAIN_DB_PREFIX."user c";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND c.rowid = n.fk_user";
+	$sql .= " AND c.rowid = ".$object->id;
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
+	// List of active notifications
+	print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('', '', '');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('', '', '');
+	print '</tr>';
 
 	$langs->load("errors");
 	$langs->load("other");
 
-    if ($num)
-    {
-        $i = 0;
+	if ($num)
+	{
+		$i = 0;
 
-        $userstatic = new user($db);
+		$userstatic = new user($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $userstatic->id = $obj->userid;
-            $userstatic->lastname = $obj->lastname;
-            $userstatic->firstname = $obj->firstname;
-            print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);
-            if ($obj->type == 'email')
-            {
-                if (isValidEmail($obj->email))
-                {
-                    print ' &lt;'.$obj->email.'&gt;';
-                }
-                else
-                {
-                    $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
-                }
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
-            print '</td>';
-            print '<td class="right"><a href="card.php?id='.$id.'&amp;action=delete&amp;actid='.$obj->rowid.'">'.img_delete().'</a></td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
+			$userstatic->id = $obj->userid;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);
+			if ($obj->type == 'email')
+			{
+				if (isValidEmail($obj->email))
+				{
+					print ' &lt;'.$obj->email.'&gt;';
+				} else {
+					$langs->load("errors");
+					print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
+				}
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("SMS");
+			print '</td>';
+			print '<td class="right"><a href="card.php?id='.$id.'&amp;action=delete&amp;token='.newToken().'&amp;actid='.$obj->rowid.'">'.img_delete().'</a></td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
 	}
 
-    // List of notifications enabled for fixed email
-    /*
+	// List of notifications enabled for fixed email
+	/*
     foreach($conf->global as $key => $val)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
@@ -376,7 +362,7 @@ if ($result > 0)
 		print '<td class="right">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</td>';
 		print '</tr>';
     }*/
-    /*if ($user->admin)
+	/*if ($user->admin)
     {
 	    $var = ! $var;
 		print '<tr class="oddeven"><td colspan="4">';
@@ -384,108 +370,104 @@ if ($result > 0)
 		print '</td></tr>';
     }*/
 
-    print '</table>';
+	print '</table>';
 
 
-    print '<br><br>'."\n";
+	print '<br><br>'."\n";
 
 
-    // List
-    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql .= " a.code, a.label";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify as n";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND n.fk_user = ".$object->id;
-    $sql .= $db->order($sortfield, $sortorder);
+	// List
+	$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
+	$sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+	$sql .= " a.code, a.label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify as n";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND n.fk_user = ".$object->id;
+	$sql .= $db->order($sortfield, $sortorder);
 
-    // Count total nb of records
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    {
-        $result = $db->query($sql);
-        $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-        {
-        	$page = 0;
-        	$offset = 0;
-        }
-    }
+	// Count total nb of records
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
+	}
 
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    $param = '&id='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$param = '&id='.$object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="id" value="'.$object->id.'">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-    // List of notifications done
-    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	// List of notifications done
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
-    //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
+	print '</tr>';
 
-    if ($num)
-    {
-        $i = 0;
+	if ($num)
+	{
+		$i = 0;
 
-        $userstatic = new User($db);
+		$userstatic = new User($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            print '<tr class="oddeven"><td>';
-            if ($obj->id > 0)
-            {
-	            $userstatic->id = $obj->id;
-	            $userstatic->lastname = $obj->lastname;
-	            $userstatic->firstname = $obj->firstname;
-	            print $userstatic->getNomUrl(1);
-	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            }
-            else
+			print '<tr class="oddeven"><td>';
+			if ($obj->id > 0)
 			{
+				$userstatic->id = $obj->id;
+				$userstatic->lastname = $obj->lastname;
+				$userstatic->firstname = $obj->firstname;
+				print $userstatic->getNomUrl(1);
+				print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
+			} else {
 				print $obj->email;
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print $label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("Sms");
-            print '</td>';
-            // TODO Add link to object here for other types
-            /*print '<td>';
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print $label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("Sms");
+			print '</td>';
+			// TODO Add link to object here for other types
+			/*print '<td>';
             if ($obj->object_type == 'order')
             {
 				$orderstatic->id=$obj->object_id;
@@ -493,22 +475,20 @@ if ($result > 0)
 				print $orderstatic->getNomUrl(1);
             }
            	print '</td>';*/
-            // print
-            print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    }
-    else {
-    	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-    }
+			// print
+			print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
+	} else {
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</form>';
-}
-else dol_print_error('', 'RecordNotFound');
+	print '</form>';
+} else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index f9ebd310cfa..b331e6c1cc2 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -35,14 +35,14 @@ $langs->loadLangs(array('companies', 'products', 'admin', 'users', 'languages',
 $canreaduser = ($user->admin || $user->rights->user->user->lire);
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'userihm'; // To manage different context of search
 
 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));
+	// $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));
 }
 
 // Security check
@@ -147,9 +147,9 @@ if (empty($reshook)) {
 			}
 
 			if (GETPOST('MAIN_OPTIMIZEFORTEXTBROWSER')) {
-			    $tabparam["MAIN_OPTIMIZEFORTEXTBROWSER"] = 1;
+				$tabparam["MAIN_OPTIMIZEFORTEXTBROWSER"] = 1;
 			} else {
-			    $tabparam["MAIN_OPTIMIZEFORTEXTBROWSER"] = 0;
+				$tabparam["MAIN_OPTIMIZEFORTEXTBROWSER"] = 0;
 			}
 
 			if (GETPOST('MAIN_OPTIMIZEFORCOLORBLIND')) {
@@ -198,7 +198,7 @@ if ($action == 'edit')
 
 if ($action == 'edit')
 {
-    dol_fiche_head($head, 'guisetup', $title, -1, 'user');
+	dol_fiche_head($head, 'guisetup', $title, -1, 'user');
 
 	$linkback = '';
 
@@ -206,10 +206,10 @@ if ($action == 'edit')
 		$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);
 
-    if (!empty($conf->use_javascript_ajax))
-    {/*
+	if (!empty($conf->use_javascript_ajax))
+	{/*
         print '<script type="text/javascript" language="javascript">
     	jQuery(document).ready(function() {
     		$("#main_lang_default").change(function() {
@@ -221,10 +221,10 @@ if ($action == 'edit')
     		});
     	});
     	</script>';*/
-    }
-    if (!empty($conf->use_javascript_ajax))
-    {
-        print '<script type="text/javascript" language="javascript">
+	}
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print '<script type="text/javascript" language="javascript">
         jQuery(document).ready(function() {
         	function init_myfunc()
         	{
@@ -256,165 +256,158 @@ if ($action == 'edit')
             jQuery("#check_THEME_ELDY_BACKTITLE1").click(function() { init_myfunc(); });
         });
         </script>';
-    }
+	}
 
 
-    clearstatcache();
+	clearstatcache();
 
-    print '<table class="noborder centpercent tableforfield">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
+	print '<table class="noborder centpercent tableforfield">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
 
-    // Landing page
-    print '<tr class="oddeven"><td>'.$langs->trans("LandingPage").'</td>';
-    print '<td>';
-    print (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE);
-    print '</td>';
-    print '<td class="nowrap" width="20%"><input class="oddeven" name="check_MAIN_LANDING_PAGE" id="check_MAIN_LANDING_PAGE" type="checkbox" '.(!empty($object->conf->MAIN_LANDING_PAGE) ? " checked" : "");
-    print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
-    print '> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td>';
-    print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (!empty($object->conf->MAIN_LANDING_PAGE) ? $object->conf->MAIN_LANDING_PAGE : ''), 0, 0, 0, '', 1);
-    //print info_admin($langs->trans("WarningYouMayLooseAccess"), 0, 0, 0);
-    print '</td></tr>';
+	// Language by default
+	print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
+	print '<td>';
+	$s = picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
+	print $s ? $s.' ' : '';
+	print ($conf->global->MAIN_LANG_DEFAULT == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
+	print '</td>';
+	print '<td class="nowrap" width="20%"><input class="oddeven" name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(!empty($object->conf->MAIN_LANG_DEFAULT) ? " checked" : "");
+	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
+	print '> <label for="check_MAIN_LANG_DEFAULT">'.$langs->trans("UsePersonalValue").'</label></td>';
+	print '<td>';
+	print $formadmin->select_language((!empty($object->conf->MAIN_LANG_DEFAULT) ? $object->conf->MAIN_LANG_DEFAULT : ''), 'main_lang_default', 1, null, 0, 0, (!empty($dolibarr_main_demo)));
+	print '</td></tr>';
 
-    // Language by default
-    print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
-    print '<td>';
-    $s = picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
-    print $s ? $s.' ' : '';
-    print ($conf->global->MAIN_LANG_DEFAULT == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
-    print '</td>';
-    print '<td class="nowrap" width="20%"><input class="oddeven" name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(!empty($object->conf->MAIN_LANG_DEFAULT) ? " checked" : "");
-    print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
-    print '> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td>';
-    print $formadmin->select_language((!empty($object->conf->MAIN_LANG_DEFAULT) ? $object->conf->MAIN_LANG_DEFAULT : ''), 'main_lang_default', 1, null, 0, 0, (!empty($dolibarr_main_demo)));
-    print '</td></tr>';
+	// Landing page
+	print '<tr class="oddeven"><td>'.$langs->trans("LandingPage").'</td>';
+	print '<td>';
+	print (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE);
+	print '</td>';
+	print '<td class="nowrap" width="20%"><input class="oddeven" name="check_MAIN_LANDING_PAGE" id="check_MAIN_LANDING_PAGE" type="checkbox" '.(!empty($object->conf->MAIN_LANDING_PAGE) ? " checked" : "");
+	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
+	print '> <label for="check_MAIN_LANDING_PAGE">'.$langs->trans("UsePersonalValue").'</label></td>';
+	print '<td>';
+	print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (!empty($object->conf->MAIN_LANDING_PAGE) ? $object->conf->MAIN_LANDING_PAGE : ''), 0, 0, 0, '', 1);
+	//print info_admin($langs->trans("WarningYouMayLooseAccess"), 0, 0, 0);
+	print '</td></tr>';
 
-    // Max size of lists
-    print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeList").'</td>';
-    print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>';
-    print '<td class="nowrap" width="20%"><input class="oddeven" name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? " checked" : "");
-    print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
-    print '> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td><input class="flat" name="main_size_liste_limit" id="main_size_liste_limit" size="4" value="'.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? $object->conf->MAIN_SIZE_LISTE_LIMIT : '').'"></td></tr>';
+	// Landing page for Agenda - AGENDA_DEFAULT_VIEW
+	print '<tr class="oddeven">'."\n";
+	print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
+	print '<td class="center">&nbsp;</td>'."\n";
+	print '<td class="nowrap" width="20%"><input class="oddeven" name="check_AGENDA_DEFAULT_VIEW" id="check_AGENDA_DEFAULT_VIEW" type="checkbox" '.(!empty($object->conf->AGENDA_DEFAULT_VIEW) ? " checked" : "");
+	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
+	print '> <label for="check_AGENDA_DEFAULT_VIEW">'.$langs->trans("UsePersonalValue").'</label></td>';
+	print '<td>'."\n";
+	$tmplist = array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
+	print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $object->conf->AGENDA_DEFAULT_VIEW, 0, 0, 0, '');
+	print '</td></tr>'."\n";
 
-    // AGENDA_DEFAULT_VIEW
-    print '<tr class="oddeven">'."\n";
-    print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
-    print '<td class="center">&nbsp;</td>'."\n";
-    print '<td class="nowrap" width="20%"><input class="oddeven" name="check_AGENDA_DEFAULT_VIEW" id="check_AGENDA_DEFAULT_VIEW" type="checkbox" '.(!empty($object->conf->AGENDA_DEFAULT_VIEW) ? " checked" : "");
-    print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
-    print '> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td>'."\n";
-    $tmplist = array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
-    print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $object->conf->AGENDA_DEFAULT_VIEW, 0, 0, 0, '');
-    print '</td></tr>'."\n";
+	// Max size of lists
+	print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeList").'</td>';
+	print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>';
+	print '<td class="nowrap" width="20%"><input class="oddeven" name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? " checked" : "");
+	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
+	print '> <label for="check_SIZE_LISTE_LIMIT">'.$langs->trans("UsePersonalValue").'</label></td>';
+	print '<td><input class="flat" name="main_size_liste_limit" id="main_size_liste_limit" size="4" value="'.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? $object->conf->MAIN_SIZE_LISTE_LIMIT : '').'"></td></tr>';
 
-    print '</table><br>';
+	print '</table><br>';
 
-    // Theme
-    showSkins($object, (($user->admin || empty($dolibarr_main_demo)) ? 1 : 0), true);
+	// Theme
+	showSkins($object, (($user->admin || empty($dolibarr_main_demo)) ? 1 : 0), true);
 
-    dol_fiche_end();
+	dol_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>';
-}
-else
-{
-    dol_fiche_head($head, 'guisetup', $title, -1, 'user');
+	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>';
+} else {
+	dol_fiche_head($head, 'guisetup', $title, -1, 'user');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
 
-    print '<table class="noborder centpercent tableforfield">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
+	print '<table class="noborder centpercent tableforfield">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';
 
-    // Landing page
-    print '<tr class="oddeven"><td>'.$langs->trans("LandingPage").'</td>';
-    print '<td>';
-    print (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE);
-    print '</td>';
-    print '<td class="nowrap"><input class="oddeven" name="check_MAIN_LANDING_PAGE" disabled id="check_MAIN_LANDING_PAGE" type="checkbox" '.(!empty($object->conf->MAIN_LANDING_PAGE) ? " checked" : "");
-    print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
-    print '> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td>';
-    if (!empty($tmparray[$object->conf->MAIN_LANDING_PAGE]))
-    {
-        print $langs->trans($tmparray[$object->conf->MAIN_LANDING_PAGE]);
-    }
-    else print $object->conf->MAIN_LANDING_PAGE;
-    //print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (! empty($object->conf->MAIN_LANDING_PAGE)?$object->conf->MAIN_LANDING_PAGE:''), 0, 0, 0, '', 1);
-    print '</td></tr>';
+	// Language
+	print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
+	print '<td>';
+	$s = picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
+	print ($s ? $s.' ' : '');
+	print (isset($conf->global->MAIN_LANG_DEFAULT) && $conf->global->MAIN_LANG_DEFAULT == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
+	print '</td>';
+	print '<td class="nowrap"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->MAIN_LANG_DEFAULT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
+	print '<td>';
+	$s = (isset($object->conf->MAIN_LANG_DEFAULT) ? picto_from_langcode($object->conf->MAIN_LANG_DEFAULT) : '');
+	print ($s ? $s.' ' : '');
+	print (isset($object->conf->MAIN_LANG_DEFAULT) && $object->conf->MAIN_LANG_DEFAULT == 'auto' ? $langs->trans("AutoDetectLang") : (!empty($object->conf->MAIN_LANG_DEFAULT) ? $langs->trans("Language_".$object->conf->MAIN_LANG_DEFAULT) : ''));
+	print '</td></tr>';
 
-    // Language
-    print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
-    print '<td>';
-    $s = picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
-    print ($s ? $s.' ' : '');
-    print (isset($conf->global->MAIN_LANG_DEFAULT) && $conf->global->MAIN_LANG_DEFAULT == 'auto' ? $langs->trans("AutoDetectLang") : $langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT));
-    print '</td>';
-    print '<td class="nowrap"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->MAIN_LANG_DEFAULT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td>';
-    $s = (isset($object->conf->MAIN_LANG_DEFAULT) ? picto_from_langcode($object->conf->MAIN_LANG_DEFAULT) : '');
-    print ($s ? $s.' ' : '');
-    print (isset($object->conf->MAIN_LANG_DEFAULT) && $object->conf->MAIN_LANG_DEFAULT == 'auto' ? $langs->trans("AutoDetectLang") : (!empty($object->conf->MAIN_LANG_DEFAULT) ? $langs->trans("Language_".$object->conf->MAIN_LANG_DEFAULT) : ''));
-    print '</td></tr>';
+	// Landing page
+	print '<tr class="oddeven"><td>'.$langs->trans("LandingPage").'</td>';
+	print '<td>';
+	print (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE);
+	print '</td>';
+	print '<td class="nowrap"><input class="oddeven" name="check_MAIN_LANDING_PAGE" disabled id="check_MAIN_LANDING_PAGE" type="checkbox" '.(!empty($object->conf->MAIN_LANDING_PAGE) ? " checked" : "");
+	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
+	print '> '.$langs->trans("UsePersonalValue").'</td>';
+	print '<td>';
+	if (!empty($tmparray[$object->conf->MAIN_LANDING_PAGE]))
+	{
+		print $langs->trans($tmparray[$object->conf->MAIN_LANDING_PAGE]);
+	} else print $object->conf->MAIN_LANDING_PAGE;
+	//print $form->selectarray('MAIN_LANDING_PAGE', $tmparray, (! empty($object->conf->MAIN_LANDING_PAGE)?$object->conf->MAIN_LANDING_PAGE:''), 0, 0, 0, '', 1);
+	print '</td></tr>';
+
+	// Landing page for Agenda - AGENDA_DEFAULT_VIEW
+	print '<tr class="oddeven">'."\n";
+	print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
+	print '<td class="center">&nbsp;</td>'."\n";
+	print '<td class="nowrap" width="20%"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->AGENDA_DEFAULT_VIEW) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
+	print '<td>'."\n";
+	$tmplist = array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
+	if (!empty($object->conf->AGENDA_DEFAULT_VIEW)) print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $object->conf->AGENDA_DEFAULT_VIEW, 0, 0, 0, '', 0, 0, 1);
+	print '</td></tr>'."\n";
 
 	// Max size for lists
-    print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeList").'</td>';
-    print '<td>'.(!empty($conf->global->MAIN_SIZE_LISTE_LIMIT) ? $conf->global->MAIN_SIZE_LISTE_LIMIT : '&nbsp;').'</td>';
-    print '<td class="nowrap" width="20%"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td>'.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? $object->conf->MAIN_SIZE_LISTE_LIMIT : '&nbsp;').'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeList").'</td>';
+	print '<td>'.(!empty($conf->global->MAIN_SIZE_LISTE_LIMIT) ? $conf->global->MAIN_SIZE_LISTE_LIMIT : '&nbsp;').'</td>';
+	print '<td class="nowrap" width="20%"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
+	print '<td>'.(!empty($object->conf->MAIN_SIZE_LISTE_LIMIT) ? $object->conf->MAIN_SIZE_LISTE_LIMIT : '&nbsp;').'</td></tr>';
 
-    // AGENDA_DEFAULT_VIEW
-    print '<tr class="oddeven">'."\n";
-    print '<td>'.$langs->trans("AGENDA_DEFAULT_VIEW").'</td>'."\n";
-    print '<td class="center">&nbsp;</td>'."\n";
-    print '<td class="nowrap" width="20%"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->AGENDA_DEFAULT_VIEW) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
-    print '<td>'."\n";
-    $tmplist = array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
-    if (!empty($object->conf->AGENDA_DEFAULT_VIEW)) print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $object->conf->AGENDA_DEFAULT_VIEW, 0, 0, 0, '', 0, 0, 1);
-    print '</td></tr>'."\n";
-
-    print '</table><br>';
+	print '</table><br>';
 
 
-    // Skin
-    showSkins($object, 0, true);
+	// Skin
+	showSkins($object, 0, true);
 
-    dol_fiche_end();
+	dol_fiche_end();
 
 
-    print '<div class="tabsAction">';
-    if (empty($user->admin) && !empty($dolibarr_main_demo))
-    {
-        print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify")."</a>";
-    }
-    else
-    {
-        if ($caneditfield || !empty($user->admin))       // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin
-        {
-            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
-        }
-        else
-        {
-            print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("Modify")."</a>";
-        }
-    }
+	print '<div class="tabsAction">';
+	if (empty($user->admin) && !empty($dolibarr_main_demo))
+	{
+		print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("FeatureDisabledInDemo")."\" href=\"#\">".$langs->trans("Modify")."</a>";
+	} else {
+		if ($caneditfield || !empty($user->admin))       // Si utilisateur edite = utilisateur courant (pas besoin de droits particulier car il s'agit d'une page de modif d'output et non de données) ou si admin
+		{
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a>';
+		} else {
+			print "<a class=\"butActionRefused classfortooltip\" title=\"".$langs->trans("NotEnoughPermissions")."\" href=\"#\">".$langs->trans("Modify")."</a>";
+		}
+	}
 
-    print '</div>';
+	print '</div>';
 }
 
 if ($action == 'edit')
 {
-    print '</form>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 83289521538..96497492a15 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -41,12 +41,12 @@ if (!empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
     exit;
 }
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $mode = $dolibarr_main_authentication;
 if (!$mode) $mode = 'http';
 
-$username = trim(GETPOST('username', 'alpha'));
-$passwordhash = trim(GETPOST('passwordhash', 'alpha'));
+$username = GETPOST('username', 'alphanohtml');
+$passwordhash = GETPOST('passwordhash', 'alpha');
 $conf->entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : 1);
 
 // Instantiate hooks of thirdparty module only if not already define
@@ -72,9 +72,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
     if ($result < 0)
     {
         $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
-    }
-    else
-    {
+    } else {
         if (dol_verifyHash($edituser->pass_temp, $passwordhash))
         {
         	// Clear session
@@ -85,9 +83,7 @@ if ($action == 'validatenewpassword' && $username && $passwordhash)
             dol_syslog("passwordforgotten.php new password for user->id=".$edituser->id." validated in database");
             header("Location: ".DOL_URL_ROOT.'/');
             exit;
-        }
-        else
-        {
+        } else {
         	$langs->load("errors");
             $message = '<div class="error">'.$langs->trans("ErrorFailedToValidatePasswordReset").'</div>';
         }
@@ -103,45 +99,50 @@ if ($action == 'buildnewpassword' && $username)
     if (!$ok)
     {
         $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
-    }
-    else
-    {
+    } else {
+    	$isanemail = preg_match('/@/', $username);
+
         $edituser = new User($db);
         $result = $edituser->fetch('', $username, '', 1);
-        if ($result == 0 && preg_match('/@/', $username))
+        if ($result == 0 && $isanemail)
         {
         	$result = $edituser->fetch('', '', '', 1, -1, $username);
         }
 
         if ($result <= 0 && $edituser->error == 'USERNOTFOUND')
         {
-            $message = '<div class="error">'.$langs->trans("ErrorLoginDoesNotExists", $username).'</div>';
+        	$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
-        {
+        } else {
             if (!$edituser->email)
             {
                 $message = '<div class="error">'.$langs->trans("ErrorLoginHasNoEmail").'</div>';
-            }
-            else
-            {
+            } else {
                 $newpassword = $edituser->setPassword($user, '', 1);
                 if ($newpassword < 0)
                 {
                     // Failed
                     $message = '<div class="error">'.$langs->trans("ErrorFailedToChangePassword").'</div>';
-                }
-                else
-                {
+                } else {
                     // Success
                     if ($edituser->send_password($user, $newpassword, 1) > 0)
                     {
-                    	$message = '<div class="ok'.(empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent').'">'.$langs->trans("PasswordChangeRequestSent", $edituser->login, dolObfuscateEmail($edituser->email)).'</div>';
+                    	$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
-                    {
+                    } else {
                         $message .= '<div class="error">'.$edituser->error.'</div>';
                     }
                 }
@@ -165,9 +166,7 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = $conf->global->MAIN_
 if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/passwordforgotten.tpl.php"))
 {
     $template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
-}
-else
-{
+} else {
     $template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 }
 
@@ -186,17 +185,14 @@ $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_small) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
+} elseif (!empty($mysoc->logo_small) && 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);
 	$width = 128;
-}
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg'))
+} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg'))
 {
 	$urllogo = DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/dolibarr_logo.svg';
-}
-elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
+} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg'))
 {
 	$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
 }
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 5d06973abf6..7672a3d8dbb 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2012		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,10 +22,12 @@
  */
 
 /**
- *       \file       htdocs/user/perms.php
- *       \brief      Onglet user et permissions de la fiche utilisateur
+ *		\file		htdocs/user/perms.php
+ *		\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
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -34,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 $langs->loadLangs(array('users', 'admin'));
 
 $id = GETPOST('id', 'int');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $module = GETPOST('module', 'alpha');
 $rights = GETPOST('rights', 'int');
@@ -86,7 +89,7 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-	if ($action == 'addrights' && $caneditperms) {
+	if ($action == 'addrights' && $caneditperms && $confirm == 'yes') {
 		$edituser = new User($db);
 		$edituser->fetch($object->id);
 		$result = $edituser->addrights($rights, $module, '', $entity);
@@ -106,7 +109,7 @@ if (empty($reshook)) {
 		$object->getrights();
 	}
 
-	if ($action == 'delrights' && $caneditperms) {
+	if ($action == 'delrights' && $caneditperms && $confirm == 'yes') {
 		$edituser = new User($db);
 		$edituser->fetch($object->id);
 		$result = $edituser->delrights($rights, $module, '', $entity);
@@ -164,25 +167,25 @@ foreach ($modulesdir as $dir)
 					include_once $dir.$file;
 					$objMod = new $modName($db);
 
-    	            // Load all lang files of module
-    	            if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-    	            {
-    	            	foreach ($objMod->langfiles as $domain)
-    	            	{
-    	            		$langs->load($domain);
-    	            	}
-    	            }
-    	            // Load all permissions
-    	            if ($objMod->rights_class)
-    	            {
-    	                $ret = $objMod->insert_permissions(0, $entity);
-    	                $modules[$objMod->rights_class] = $objMod;
-    	                //print "modules[".$objMod->rights_class."]=$objMod;";
-    	            }
-    	        }
-    	    }
-    	}
-    }
+					// Load all lang files of module
+					if (isset($objMod->langfiles) && is_array($objMod->langfiles))
+					{
+						foreach ($objMod->langfiles as $domain)
+						{
+							$langs->load($domain);
+						}
+					}
+					// Load all permissions
+					if ($objMod->rights_class)
+					{
+						$ret = $objMod->insert_permissions(0, $entity);
+						$modules[$objMod->rights_class] = $objMod;
+						//print "modules[".$objMod->rights_class."]=$objMod;";
+					}
+				}
+			}
+		}
+	}
 }
 
 $db->commit();
@@ -208,9 +211,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -239,9 +240,7 @@ if ($result)
 		$i++;
 	}
 	$db->free($result);
-}
-else
-{
+} else {
 	dol_print_error($db);
 }
 
@@ -281,14 +280,15 @@ if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->ad
 	if ($caneditperms)
 	{
 		print '<td class="center nowrap">';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("All")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module=allmodules&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
 		print ' / ';
-		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules">'.$langs->trans("None")."</a>";
+		print '<a class="reposition commonlink" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module=allmodules&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
 		print '</td>';
 	}
 	print '<td class="center" width="24">&nbsp;</td>';
 }
 print '<td>'.$langs->trans("Permissions").'</td>';
+if ($user->admin) print '<td class="right">'.$langs->trans("ID").'</td>';
 print '</tr>'."\n";
 
 //print "xx".$conf->global->MAIN_USE_ADVANCED_PERMS;
@@ -340,35 +340,39 @@ if ($result)
 			$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>';
-    		if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin))
-    		{
-    			if ($caneditperms)
-    			{
-    				print '<td class="center nowrap">';
-    				print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
-    				print ' / ';
-    				print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("None")."</a>";
-    				print '</td>';
-    			}
-    			print '<td>&nbsp;</td>';
-    		} else {
-    			if ($caneditperms)
-    			{
-			    	print '<td>&nbsp;</td>';
-    			}
-    			print '<td>&nbsp;</td>';
-		    }
-    		print '<td>&nbsp;</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>';
+			if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin))
+			{
+				if ($caneditperms)
+				{
+					print '<td class="center nowrap">';
+					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("All")."</a>";
+					print ' / ';
+					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'&amp;confirm=yes&amp;token='.newToken().'">'.$langs->trans("None")."</a>";
+					print '</td>';
+				}
+				print '<td>&nbsp;</td>';
+			} else {
+				if ($caneditperms)
+				{
+					print '<td>&nbsp;</td>';
+				}
+				print '<td>&nbsp;</td>';
+			}
+			print '<td>&nbsp;</td>';
 
-        print '<!-- '.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '').' -->'."\n";
+			// Permission id
+			if ($user->admin) print '<td class="right"></td>';
+
+			print '</tr>'."\n";
+		}
+
+		print '<!-- '.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '').' -->'."\n";
 		print '<tr class="oddeven">';
 
 		// Picto and label of module
@@ -376,71 +380,76 @@ if ($result)
 		//print img_object('', $picto, 'class="pictoobjectwidth"').' '.$objMod->getName();
 		print '</td>';
 
-        // Permission and tick
-        if (!empty($object->admin) && !empty($objMod->rights_admin_allowed))    // Permission granted because admin
-        {
-        	if ($caneditperms)
-        	{
-        		print '<td class="center">'.img_picto($langs->trans("Administrator"), 'star').'</td>';
-        	}
-        	print '<td class="center nowrap">';
-        	print img_picto($langs->trans("Active"), 'tick');
-        	print '</td>';
-        }
-        elseif (in_array($obj->id, $permsuser))					// Permission granted by user
-        {
-        	if ($caneditperms)
-        	{
-        		print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
-        	}
-        	print '<td class="center nowrap">';
-        	print img_picto($langs->trans("Active"), 'tick');
-        	print '</td>';
-        }
-        elseif (is_array($permsgroupbyentity[$entity]))
-        {
-        	if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission granted by group
-	        {
-	        	if ($caneditperms)
-	        	{
-	        		print '<td class="center">';
-	        		print $form->textwithtooltip($langs->trans("Inherited"), $langs->trans("PermissionInheritedFromAGroup"));
-	        		print '</td>';
-	        	}
-	        	print '<td class="center nowrap">';
-	        	print img_picto($langs->trans("Active"), 'tick');
-	        	print '</td>';
-	        }
-	        else
-	        {
-	        	// Do not own permission
-	        	if ($caneditperms)
-	        	{
-	        		print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-	        	}
-	        	print '<td>&nbsp</td>';
-	        }
-        }
-        else
-        {
-        	// Do not own permission
-        	if ($caneditperms)
-        	{
-        		print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-        	}
-        	print '<td>&nbsp</td>';
-        }
+		// Permission and tick
+		if (!empty($object->admin) && !empty($objMod->rights_admin_allowed))    // Permission granted because admin
+		{
+			if ($caneditperms)
+			{
+				print '<td class="center">'.img_picto($langs->trans("Administrator"), 'star').'</td>';
+			}
+			print '<td class="center nowrap">';
+			print img_picto($langs->trans("Active"), 'tick');
+			print '</td>';
+		} elseif (in_array($obj->id, $permsuser))					// Permission granted by user
+		{
+			if ($caneditperms)
+			{
+				print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
+				//print img_edit_remove($langs->trans("Remove"));
+				print img_picto($langs->trans("Remove"), 'switch_on');
+				print '</a></td>';
+			}
+			print '<td class="center nowrap">';
+			print img_picto($langs->trans("Active"), 'tick');
+			print '</td>';
+		} elseif (is_array($permsgroupbyentity[$entity]))
+		{
+			if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission granted by group
+			{
+				if ($caneditperms)
+				{
+					print '<td class="center">';
+					print $form->textwithtooltip($langs->trans("Inherited"), $langs->trans("PermissionInheritedFromAGroup"));
+					print '</td>';
+				}
+				print '<td class="center nowrap">';
+				print img_picto($langs->trans("Active"), 'tick');
+				print '</td>';
+			} else {
+				// Do not own permission
+				if ($caneditperms)
+				{
+					print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
+					//print img_edit_add($langs->trans("Add"));
+					print img_picto($langs->trans("Add"), 'switch_off');
+					print '</a></td>';
+				}
+				print '<td>&nbsp</td>';
+			}
+		} else {
+			// Do not own permission
+			if ($caneditperms)
+			{
+				print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'&amp;confirm=yes&amp;token='.newToken().'">';
+				//print img_edit_add($langs->trans("Add"));
+				print img_picto($langs->trans("Add"), 'switch_off');
+				print '</a></td>';
+			}
+			print '<td>&nbsp</td>';
+		}
 
-        // Label
+		// Label
 		$permlabel = ($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) : $langs->trans($obj->label)));
 		print '<td class="maxwidthonsmartphone">'.$permlabel.'</td>';
 
+		// Permission id
+		if ($user->admin) print '<td class="right"><span class="opacitymedium">'.$obj->id.'</span></td>';
+
 		print '</tr>'."\n";
 
 		$i++;
 	}
-}
-else dol_print_error($db);
+} else dol_print_error($db);
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
new file mode 100644
index 00000000000..9d8fd6478b4
--- /dev/null
+++ b/htdocs/user/vcard.php
@@ -0,0 +1,139 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * 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>
+ *
+ * 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/user/vcard.php
+ *      \ingroup    societe
+ *		\brief      Onglet vcard d'un user
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/vcard.class.php';
+
+$user2 = new user($db);
+
+
+$id = GETPOST('id', 'int');
+
+// Security check
+$socid = 0;
+if ($user->socid > 0) $socid = $user->socid;
+$feature2 = 'user';
+$result = restrictedArea($user, 'user', $id, 'user', $feature2);
+
+
+$result = $user2->fetch($id);
+if ($result <= 0)
+{
+	dol_print_error($user2->error);
+	exit;
+}
+
+$physicalperson = 1;
+
+$company = new Societe($db);
+if ($user2->socid)
+{
+	$result = $company->fetch($user2->socid);
+}
+
+// We create VCard
+$v = new vCard();
+$v->setProdId('Dolibarr '.DOL_VERSION);
+
+$v->setUid('DOLIBARR-USERID-'.$user2->id);
+$v->setName($user2->lastname, $user2->firstname, "", $user2->civility, "");
+$v->setFormattedName($user2->getFullName($langs, 1));
+
+$v->setPhoneNumber($user2->phone_pro, "TYPE=WORK;VOICE");
+//$v->setPhoneNumber($user2->phone_perso,"TYPE=HOME;VOICE");
+$v->setPhoneNumber($user2->phone_mobile, "TYPE=CELL;VOICE");
+$v->setPhoneNumber($user2->fax, "TYPE=WORK;FAX");
+
+$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");
+
+$v->setEmail($user2->email);
+$v->setNote($user2->note);
+$v->setTitle($user2->poste);
+
+// Data from linked company
+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");
+
+	// when company e-mail is empty, use only user e-mail
+	if (empty(trim($company->email)))
+	{
+		// was set before, don't set twice
+	}
+	// when user e-mail is empty, use only company e-mail
+	elseif (empty(trim($user2->email)))
+	{
+		$v->setEmail($company->email);
+	}
+	// when e-mail domain of user and company are the same, use user e-mail at first (and company e-mail at second)
+	elseif (strtolower(end(explode("@", $user2->email))) == strtolower(end(explode("@", $company->email))))
+	{
+		$v->setEmail($user2->email);
+
+		// support by Microsoft Outlook (2019 and possible earlier)
+		$v->setEmail($company->email, 'INTERNET');
+	}
+	// when e-mail of user and company complete different use company e-mail at first (and user e-mail at second)
+	else {
+		$v->setEmail($company->email);
+
+		// support by Microsoft Outlook (2019 and possible earlier)
+		$v->setEmail($user2->email, 'INTERNET');
+	}
+
+	// Si user lie a un tiers non de type "particulier"
+	if ($user2->typent_code != 'TE_PRIVATE') $v->setOrg($company->name);
+}
+
+// Personal informations
+$v->setPhoneNumber($user2->phone_perso, "TYPE=HOME;VOICE");
+if ($user2->birth) $v->setBirthday($user2->birth);
+
+$db->close();
+
+// Renvoi la VCard au navigateur
+
+$output = $v->getVCard();
+
+$filename = trim(urldecode($v->getFileName()));      // "Nom prenom.vcf"
+$filenameurlencoded = dol_sanitizeFileName(urlencode($filename));
+//$filename = dol_sanitizeFileName($filename);
+
+
+header("Content-Disposition: attachment; filename=\"".$filename."\"");
+header("Content-Length: ".dol_strlen($output));
+header("Connection: close");
+header("Content-Type: text/x-vcard; name=\"".$filename."\"");
+
+print $output;
diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index 86342664c35..d97211d46bf 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -50,7 +50,9 @@ print load_fiche_titre($title, $linkback, 'title_setup');
 
 dol_fiche_head(array(), 'general', $tab, 0, 'product');
 
-print '<form method="post">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<th>'.$langs->trans("Parameters").'</td>'."\n";
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 7ca520c0544..c1bbc6fe6e2 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -22,7 +22,7 @@ require 'class/ProductAttributeValue.class.php';
 
 $id = GETPOST('id', 'int');
 $valueid = GETPOST('valueid', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $label = GETPOST('label', 'alpha');
 $ref = GETPOST('ref', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
@@ -90,9 +90,9 @@ if ($confirm == 'yes') {
 	if ($action == 'confirm_delete') {
 		$db->begin();
 
-		$res = $objectval->deleteByFkAttribute($object->id);
+		$res = $objectval->deleteByFkAttribute($object->id, $user);
 
-		if ($res < 1 || ($object->delete() < 1)) {
+		if ($res < 1 || ($object->delete($user) < 1)) {
 			$db->rollback();
 			setEventMessages($langs->trans('CoreErrorMessage'), $object->errors, 'errors');
 			header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
@@ -102,11 +102,10 @@ if ($confirm == 'yes') {
 			header('Location: '.dol_buildpath('/variants/list.php', 2));
 		}
 		exit();
-	}
-	elseif ($action == 'confirm_deletevalue')
+	} elseif ($action == 'confirm_deletevalue')
 	{
 		if ($objectval->fetch($valueid) > 0) {
-			if ($objectval->delete() < 1) {
+			if ($objectval->delete($user) < 1) {
 				setEventMessages($langs->trans('CoreErrorMessage'), $objectval->errors, 'errors');
 			} else {
 				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
@@ -220,8 +219,8 @@ if ($action == 'edit') {
 
 	<div class="tabsAction">
 		<div class="inline-block divButAction">
-			<a href="card.php?id=<?php echo $object->id ?>&action=edit" class="butAction"><?php echo $langs->trans('Modify') ?></a>
-			<a href="card.php?id=<?php echo $object->id ?>&action=delete" class="butAction"><?php echo $langs->trans('Delete') ?></a>
+			<a href="card.php?id=<?php echo $object->id ?>&action=edit&token=<?php echo newToken(); ?>" class="butAction"><?php echo $langs->trans('Modify') ?></a>
+			<a href="card.php?id=<?php echo $object->id ?>&action=delete&token=<?php echo newToken(); ?>" class="butAction"><?php echo $langs->trans('Delete') ?></a>
 		</div>
 	</div>
 
@@ -264,7 +263,7 @@ if ($action == 'edit') {
 				<td><?php echo dol_htmlentities($attrval->value) ?></td>
 				<td class="right">
 					<a class="editfielda marginrightonly" href="card.php?id=<?php echo $object->id ?>&action=edit_value&valueid=<?php echo $attrval->id ?>"><?php echo img_edit() ?></a>
-					<a href="card.php?id=<?php echo $object->id ?>&action=delete_value&valueid=<?php echo $attrval->id ?>"><?php echo img_delete() ?></a>
+					<a href="card.php?id=<?php echo $object->id ?>&action=delete_value&token=<?php echo newToken(); ?>&valueid=<?php echo $attrval->id ?>"><?php echo img_delete() ?></a>
 				</td>
 			<?php
 		}
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 160504b518b..bbc3a188137 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -16,17 +16,18 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 /**
  * Class ProductAttribute
  * Used to represent a product attribute
  */
-class ProductAttribute
+class ProductAttribute extends CommonObject
 {
 	/**
 	 * Database handler
 	 * @var DoliDB
 	 */
-	private $db;
+	public $db;
 
 	/**
 	 * Id of the product attribute
@@ -40,6 +41,12 @@ class ProductAttribute
 	 */
 	public $ref;
 
+	/**
+	 * External ref of the product attribute
+	 * @var string
+	 */
+	public $ref_ext;
+
 	/**
 	 * Label of the product attribute
 	 * @var string
@@ -53,11 +60,11 @@ class ProductAttribute
 	 */
 	public $rang;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
 	public function __construct(DoliDB $db)
 	{
 		global $conf;
@@ -78,7 +85,7 @@ class ProductAttribute
 			return -1;
 		}
 
-		$sql = "SELECT rowid, ref, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, ref, ref_ext, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $id." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -90,6 +97,7 @@ class ProductAttribute
 
 		$this->id = $obj->rowid;
 		$this->ref = $obj->ref;
+		$this->ref_ext = $obj->ref_ext;
 		$this->label = $obj->label;
 		$this->rang = $obj->rang;
 
@@ -105,20 +113,21 @@ class ProductAttribute
 	{
 		$return = array();
 
-		$sql = 'SELECT rowid, ref, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product').')';
+		$sql = 'SELECT rowid, ref, ref_ext, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product').')';
 		$sql .= $this->db->order('rang', 'asc');
 		$query = $this->db->query($sql);
 		if ($query)
 		{
-    		while ($result = $this->db->fetch_object($query)) {
-    			$tmp = new ProductAttribute($this->db);
-    			$tmp->id = $result->rowid;
-    			$tmp->ref = $result->ref;
-    			$tmp->label = $result->label;
-    			$tmp->rang = $result->rang;
+			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;
 
-    			$return[] = $tmp;
-    		}
+				$return[] = $tmp;
+			}
 		}
 		else dol_print_error($this->db);
 
@@ -128,16 +137,26 @@ class ProductAttribute
 	/**
 	 * Creates a product attribute
 	 *
-	 * @param	User	$user	Object user that create
+	 * @param   User    $user      Object user
+	 * @param   int     $notrigger Do not execute trigger
 	 * @return 					int <0 KO, Id of new variant if OK
 	 */
-	public function create(User $user)
+	public function create(User $user, $notrigger = 0)
 	{
+		if (empty($notrigger)) {
+			// Call trigger
+			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_CREATE', $user);
+			if ($result < 0) {
+				return -1;
+			}
+			// End call triggers
+		}
+
 		//Ref must be uppercase
 		$this->ref = strtoupper($this->ref);
 
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute (ref, label, entity, rang)
-		VALUES ('".$this->db->escape($this->ref)."', '".$this->db->escape($this->label)."', ".(int) $this->entity.", ".(int) $this->rang.")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute (ref, ref_ext, label, entity, rang)
+		VALUES ('".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->escape($this->label)."', ".(int) $this->entity.", ".(int) $this->rang.")";
 
 		$query = $this->db->query($sql);
 		if ($query)
@@ -153,16 +172,26 @@ class ProductAttribute
 	/**
 	 * Updates a product attribute
 	 *
-	 * @param	User	$user		Object user
+	 * @param   User    $user      Object user
+	 * @param   int     $notrigger Do not execute trigger
 	 * @return 	int 				<0 KO, >0 OK
 	 */
-	public function update(User $user)
+	public function update(User $user, $notrigger = 0)
 	{
+		if (empty($notrigger)) {
+			// Call trigger
+			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_MODIFY', $user);
+			if ($result < 0) {
+				return -1;
+			}
+			// End call triggers
+		}
+
 		//Ref must be uppercase
 		$this->ref = trim(strtoupper($this->ref));
 		$this->label = trim($this->label);
 
-		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute SET ref = '".$this->db->escape($this->ref)."', label = '".$this->db->escape($this->label)."', rang = ".(int) $this->rang." WHERE rowid = ".(int) $this->id;
+		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute SET ref = '".$this->db->escape($this->ref)."', ref_ext = '".$this->db->escape($this->ref_ext)."', label = '".$this->db->escape($this->label)."', rang = ".(int) $this->rang." WHERE rowid = ".(int) $this->id;
 
 		if ($this->db->query($sql)) {
 			return 1;
@@ -174,11 +203,21 @@ class ProductAttribute
 	/**
 	 * Deletes a product attribute
 	 *
-	 * @param	User	$user		Object user
-	 * @return 	int 				<0 KO, >0 OK
+	 * @param   User    $user      Object user
+	 * @param   int     $notrigger Do not execute trigger
+	 * @return 	int <0 KO, >0 OK
 	 */
-	public function delete($user = null)
+	public function delete(User $user, $notrigger = 0)
 	{
+		if (empty($notrigger)) {
+			// Call trigger
+			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_DELETE', $user);
+			if ($result < 0) {
+				return -1;
+			}
+			// End call triggers
+		}
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $this->id;
 
 		if ($this->db->query($sql)) {
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 0a26b3eace2..e91542f90c5 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -16,17 +16,18 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 /**
  * Class ProductAttributeValue
  * Used to represent a product attribute value
  */
-class ProductAttributeValue
+class ProductAttributeValue extends CommonObject
 {
 	/**
 	 * Database handler
 	 * @var DoliDB
 	 */
-	private $db;
+	public $db;
 
 	/**
 	 * Attribute value id
@@ -52,18 +53,18 @@ class ProductAttributeValue
 	 */
 	public $value;
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB $db     Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB $db     Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
 		global $conf;
 
 		$this->db = $db;
 		$this->entity = $conf->entity;
-    }
+	}
 
 	/**
 	 * Gets a product attribute value
@@ -144,10 +145,11 @@ class ProductAttributeValue
 	/**
 	 * Creates a value for a product attribute
 	 *
-	 * @param	User	$user		Object user
-	 * @return 	int 				<0 KO >0 OK
+	 * @param  User $user      Object user
+	 * @param  int  $notrigger Do not execute trigger
+	 * @return int <0 KO >0 OK
 	 */
-	public function create(User $user)
+	public function create(User $user, $notrigger = 0)
 	{
 		if (!$this->fk_product_attribute) {
 			return -1;
@@ -155,15 +157,25 @@ class ProductAttributeValue
 
 		// Ref must be uppercase
 		$this->ref = strtoupper($this->ref);
+		$this->value = $this->db->escape($this->value);
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_value (fk_product_attribute, ref, value, entity)
 		VALUES ('".(int) $this->fk_product_attribute."', '".$this->db->escape($this->ref)."',
-		'".$this->db->escape($this->value)."', ".(int) $this->entity.")";
+		'".$this->value."', ".(int) $this->entity.")";
 
 		$query = $this->db->query($sql);
 
 		if ($query) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_value');
+			if (empty($notrigger)) {
+				// Call trigger
+				$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_CREATE', $user);
+				if ($result < 0) {
+					return -1;
+				}
+				// End call triggers
+			}
+
 			return 1;
 		}
 
@@ -173,11 +185,21 @@ class ProductAttributeValue
 	/**
 	 * Updates a product attribute value
 	 *
-	 * @param	User	$user	Object user
-	 * @return 	int				<0 if KO, >0 if OK
+	 * @param  User	$user	   Object user
+	 * @param  int  $notrigger Do not execute trigger
+	 * @return int <0 if KO, >0 if OK
 	 */
-	public function update(User $user)
+	public function update(User $user, $notrigger = 0)
 	{
+		if (empty($notrigger)) {
+			// Call trigger
+			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_MODIFY', $user);
+			if ($result < 0) {
+				return -1;
+			}
+			// End call triggers
+		}
+
 		//Ref must be uppercase
 		$this->ref = trim(strtoupper($this->ref));
 		$this->value = trim($this->value);
@@ -196,12 +218,22 @@ class ProductAttributeValue
 	/**
 	 * Deletes a product attribute value
 	 *
+	 * @param  User $user      Object user
+	 * @param  int  $notrigger Do not execute trigger
 	 * @return int <0 KO, >0 OK
 	 */
-	public function delete()
+	public function delete(User $user, $notrigger = 0)
 	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $this->id;
 
+		if (empty($notrigger)) {
+			// Call trigger
+			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_DELETE', $user);
+			if ($result < 0) {
+				return -1;
+			}
+			// End call triggers
+		}
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $this->id;
 		if ($this->db->query($sql)) {
 			return 1;
 		}
@@ -212,17 +244,36 @@ class ProductAttributeValue
 	/**
 	 * Deletes all product attribute values by a product attribute id
 	 *
-	 * @param int $fk_attribute Product attribute id
+	 * @param int  $fk_attribute Product attribute id
+	 * @param User $user         Object user
 	 * @return int <0 KO, >0 OK
 	 */
-	public function deleteByFkAttribute($fk_attribute)
+	public function deleteByFkAttribute($fk_attribute, User $user)
 	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $fk_attribute;
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $fk_attribute;
 
-		if ($this->db->query($sql)) {
+		$query = $this->db->query($sql);
+
+		if (!$query) {
+			return -1;
+		}
+
+		if (!$this->db->num_rows($query)) {
 			return 1;
 		}
 
-		return -1;
+		while ($obj = $this->db->fetch_object($query)) {
+			$tmp = new ProductAttributeValue($this->db);
+			if ($tmp->fetch($obj->rowid) > 0) {
+				$result = $tmp->delete($user);
+				if ($result < 0) {
+					return -1;
+				}
+			} else {
+				return -1;
+			}
+		}
+
+		return 1;
 	}
 }
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index 3bb4f7312ee..721d31ef3ca 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -27,7 +27,7 @@ class ProductCombination
 	 * Database handler
 	 * @var DoliDB
 	 */
-	private $db;
+	public $db;
 
 	/**
 	 * Rowid of combination
@@ -54,8 +54,8 @@ class ProductCombination
 	public $variation_price;
 
 	/**
-	 * Is the price variation a relative variation?
-	 * @var bool
+	 * Is the price variation a relative variation? Can be an array if multiprice feature per level is enabled.
+	 * @var bool|array
 	 */
 	public $variation_price_percentage = false;
 
@@ -71,6 +71,18 @@ class ProductCombination
 	 */
 	public $entity;
 
+	/**
+	 * Combination price level
+	 * @var ProductCombinationLevel[]
+	 */
+	public $combination_price_levels;
+
+	/**
+     * External ref
+     * @var string
+     */
+    public $variation_ref_ext = '';
+
 	/**
 	 * Constructor
 	 *
@@ -87,12 +99,14 @@ class ProductCombination
 	/**
 	 * Retrieves a combination by its rowid
 	 *
-	 * @param int $rowid Row id
-	 * @return int <0 KO, >0 OK
+	 * @param 	int 	$rowid 		Row id
+	 * @return 	int 				<0 KO, >0 OK
 	 */
 	public function fetch($rowid)
 	{
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getEntity('product').")";
+		global $conf;
+
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight, variation_ref_ext FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $rowid." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -112,19 +126,126 @@ 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;
+
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$this->fetchCombinationPriceLevels();
+		}
+
+		return 1;
+	}
+
+
+	/**
+	 * Retrieves combination price levels
+	 *
+	 * @param 	int 	$fk_price_level The price level to fetch, use 0 for all
+	 * @param 	bool 	$useCache 		To use cache or not
+	 * @return 	int 					<0 KO, >0 OK
+	 */
+	public function fetchCombinationPriceLevels($fk_price_level = 0, $useCache = true)
+	{
+		global $conf;
+
+		// Check cache
+		if (!empty($this->combination_price_levels) && $useCache) {
+			if ((!empty($fk_price_level) && isset($this->combination_price_levels[$fk_price_level])) || empty($fk_price_level)) {
+				return 1;
+			}
+		}
+
+		if (!is_array($this->combination_price_levels)
+			|| empty($fk_price_level) // if fetch an unique level dont erase all already fetched
+		) {
+			$this->combination_price_levels = array();
+		}
+
+		$staticProductCombinationLevel = new ProductCombinationLevel($this->db);
+		$combination_price_levels = $staticProductCombinationLevel->fetchAll($this->id, $fk_price_level);
+
+		if (!is_array($combination_price_levels)) {
+			return -1;
+		}
+
+		if (empty($combination_price_levels)) {
+
+			/**
+			 * for auto retrocompatibility with last behavior
+			 */
+			if ($fk_price_level > 0) {
+				$combination_price_levels[$fk_price_level] = ProductCombinationLevel::createFromParent($this->db, $this, $fk_price_level);
+			}
+			else {
+				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
+					$combination_price_levels[$i] = ProductCombinationLevel::createFromParent($this->db, $this, $i);
+				}
+			}
+		}
+
+		$this->combination_price_levels = $combination_price_levels;
 
 		return 1;
 	}
 
 	/**
-	 * Retrieves a product combination by a child product row id
+	 * Retrieves combination price levels
 	 *
-	 * @param int $fk_child Product row id
-	 * @return int <0 KO, >0 OK
+	 * @param 	int 	$clean 		Levels of PRODUIT_MULTIPRICES_LIMIT
+	 * @return 	int 				<0 KO, >0 OK
 	 */
-	public function fetchByFkProductChild($fk_child)
+	public function saveCombinationPriceLevels($clean = 1)
 	{
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".(int) $fk_child." AND entity IN (".getEntity('product').")";
+		global $conf;
+
+		$error = 0;
+
+		$staticProductCombinationLevel = new ProductCombinationLevel($this->db);
+
+		// Delete all
+		if (empty($this->combination_price_levels)) {
+			return $staticProductCombinationLevel->deleteAllForCombination($this->id);
+		}
+
+		// Clean not needed price levels (level higher than number max defined into setup)
+		if ($clean) {
+			$res = $staticProductCombinationLevel->clean($this->id);
+			if ($res < 0) {
+				$this->errors[] = 'Fail to clean not needed price levels';
+				return -1;
+			}
+		}
+
+		foreach ($this->combination_price_levels as $fk_price_level => $combination_price_level) {
+			$res = $combination_price_level->save();
+			if ($res < 1) {
+				$this->error = 'Error saving combination price level '.$fk_price_level.' : '.$combination_price_level->error;
+				$this->errors[] = $this->error;
+				$error++;
+				break;
+			}
+		}
+
+		if ($error) {
+			return $error * -1;
+		}
+		else {
+			return 1;
+		}
+	}
+
+	/**
+	 * Retrieves information of a variant product and ID of its parent product.
+	 *
+	 * @param 	int 	$productid 				Product ID of variant
+	 * @param	int		$donotloadpricelevel	Avoid loading price impact for each level. If PRODUIT_MULTIPRICES is not set, this has no effect.
+	 * @return 	int 							<0 if KO, 0 if product ID is not ID of a variant product (so parent not found), >0 if OK (ID of parent)
+	 */
+	public function fetchByFkProductChild($productid, $donotloadpricelevel = 0)
+	{
+		global $conf;
+
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".((int) $productid)." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -133,7 +254,7 @@ class ProductCombination
 		}
 
 		if (!$this->db->num_rows($query)) {
-			return -1;
+			return 0;
 		}
 
 		$result = $this->db->fetch_object($query);
@@ -145,7 +266,11 @@ class ProductCombination
 		$this->variation_price_percentage = $result->variation_price_percentage;
 		$this->variation_weight = $result->variation_weight;
 
-		return 1;
+		if (empty($donotloadpricelevel) && !empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$this->fetchCombinationPriceLevels();
+		}
+
+		return (int) $this->fk_product_parent;
 	}
 
 	/**
@@ -156,6 +281,8 @@ class ProductCombination
 	 */
 	public function fetchAllByFkProductParent($fk_product_parent)
 	{
+		global $conf;
+
 		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".(int) $fk_product_parent." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
@@ -174,6 +301,11 @@ 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;
+
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				$tmp->fetchCombinationPriceLevels();
+			}
 
 			$return[] = $tmp;
 		}
@@ -209,19 +341,30 @@ class ProductCombination
 	 */
 	public function create($user)
 	{
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination
-		(fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight, entity)
-		VALUES (".(int) $this->fk_product_parent.", ".(int) $this->fk_product_child.",
-		".(float) $this->variation_price.", ".(int) $this->variation_price_percentage.",
-		".(float) $this->variation_weight.", ".(int) $this->entity.")";
+		global $conf;
 
-		$query = $this->db->query($sql);
+		/* $this->fk_product_child may be empty and will be filled later after subproduct has been created */
 
-		if (!$query) {
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination";
+		$sql .= " (fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight, variation_ref_ext, entity)";
+		$sql .= " VALUES (".((int) $this->fk_product_parent).", ".((int) $this->fk_product_child).",";
+		$sql .= (float) $this->variation_price.", ".(int) $this->variation_price_percentage.",";
+		$sql .= (float) $this->variation_weight.", '".$this->db->escape($this->variation_ref_ext)."', ".(int) $this->entity.")";
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination');
+		} else {
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 
-		$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination');
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$res = $this->saveCombinationPriceLevels();
+			if ($res < 0) {
+				return -2;
+			}
+		}
 
 		return 1;
 	}
@@ -234,17 +377,26 @@ class ProductCombination
 	 */
 	public function update(User $user)
 	{
-		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute_combination
-		SET fk_product_parent = ".(int) $this->fk_product_parent.", fk_product_child = ".(int) $this->fk_product_child.",
-		variation_price = ".(float) $this->variation_price.", variation_price_percentage = ".(int) $this->variation_price_percentage.",
-		variation_weight = ".(float) $this->variation_weight." WHERE rowid = ".(int) $this->id;
+		global $conf;
 
-		$query = $this->db->query($sql);
+		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute_combination";
+		$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);
 
-		if (!$query) {
+		$resql = $this->db->query($sql);
+		if (!$resql) {
 			return -1;
 		}
 
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$res = $this->saveCombinationPriceLevels();
+			if ($res < 0) {
+				return -2;
+			}
+		}
+
 		$parent = new Product($this->db);
 		$parent->fetch($this->fk_product_parent);
 
@@ -266,6 +418,12 @@ class ProductCombination
 		$comb2val = new ProductCombination2ValuePair($this->db);
 		$comb2val->deleteByFkCombination($this->id);
 
+		// remove combination price levels
+		if (!$this->db->query("DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination_price_level WHERE fk_product_attribute_combination = ".(int) $this->id)) {
+			$this->db->rollback();
+			return -1;
+		}
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE rowid = ".(int) $this->id;
 
 		if ($this->db->query($sql)) {
@@ -332,15 +490,16 @@ class ProductCombination
 		if ($this->variation_weight) {	// If we must add a delta on weight
 			$child->weight = ($child->weight ? $child->weight : 0) + $this->variation_weight;
 		}
-		$child->weight_units    = $parent->weight_units;
+		$child->weight_units = $parent->weight_units;
 
 		// Don't update the child label if the user has already modified it.
 		if ($child->label == $parent->label) {
 			// This will trigger only at variant creation time
 			$varlabel               = $this->getCombinationLabel($this->fk_product_child);
-			$child->label           = $parent->label.$varlabel;;
+			$child->label           = $parent->label.$varlabel; ;
 		}
 
+
 		if ($child->update($child->id, $user) > 0) {
 			$new_vat = $parent->tva_tx;
 			$new_npr = $parent->tva_npr;
@@ -349,9 +508,12 @@ class ProductCombination
 			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
 				{
-					if ($parent->multiprices[$i] != '') {
+					if ($parent->multiprices[$i] != '' || isset($this->combination_price_levels[$i]->variation_price)) {
 						$new_type = $parent->multiprices_base_type[$i];
 						$new_min_price = $parent->multiprices_min[$i];
+						$variation_price = doubleval(!isset($this->combination_price_levels[$i]->variation_price) ? $this->variation_price : $this->combination_price_levels[$i]->variation_price);
+						$variation_price_percentage = doubleval(!isset($this->combination_price_levels[$i]->variation_price_percentage) ? $this->variation_price_percentage : $this->combination_price_levels[$i]->variation_price_percentage);
+
 						if ($parent->prices_by_qty_list[$i]) {
 							$new_psq = 1;
 						} else {
@@ -364,12 +526,12 @@ class ProductCombination
 							$new_price = $parent->multiprices[$i];
 						}
 
-						if ($this->variation_price_percentage) {
+						if ($variation_price_percentage) {
 							if ($new_price != 0) {
-								$new_price *= 1 + ($this->variation_price / 100);
+								$new_price *= 1 + ($variation_price / 100);
 							}
 						} else {
-							$new_price += $this->variation_price;
+							$new_price += $variation_price;
 						}
 
 						$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq);
@@ -445,10 +607,10 @@ class ProductCombination
 	}
 
 	/**
-	 * Retrieves all unique attributres for a parent product
+	 * Retrieves all unique attributes for a parent product
 	 *
-	 * @param int $productid Product rowid
-	 * @return ProductAttribute[]
+	 * @param int $productid 			Product rowid
+	 * @return ProductAttribute[]		Array of attributes
 	 */
 	public function getUniqueAttributesAndValuesByFkProductParent($productid)
 	{
@@ -458,13 +620,11 @@ class ProductCombination
 		$variants = array();
 
 		//Attributes
-		$sql = "SELECT DISTINCT fk_prod_attr, a.rang
-FROM ".MAIN_DB_PREFIX."product_attribute_combination2val c2v LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination c
-    ON c2v.fk_prod_combination = c.rowid
-  LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = c.fk_product_child
-  LEFT JOIN ".MAIN_DB_PREFIX."product_attribute a ON a.rowid = fk_prod_attr
-WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
-
+		$sql = "SELECT DISTINCT fk_prod_attr, a.rang";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_attribute_combination2val c2v LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination c ON c2v.fk_prod_combination = c.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = c.fk_product_child";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute a ON a.rowid = fk_prod_attr";
+		$sql .= " WHERE c.fk_product_parent = ".((int) $productid)." AND p.tosell = 1";
 		$sql .= $this->db->order('a.rang', 'asc');
 
 		$query = $this->db->query($sql);
@@ -493,7 +653,6 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 
 	/**
 	 * Creates a product combination. Check usages to find more about its use
-	 *
 	 * Format of $combinations array:
 	 * array(
 	 * 	0 => array(
@@ -504,29 +663,32 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 	 * [...]
 	 * )
 	 *
-	 * @param User $user Object user
-	 * @param Product $product Parent product
-	 * @param array $combinations Attribute and value combinations.
-	 * @param array $variations Price and weight variations
-	 * @param bool $price_var_percent Is the price variation a relative variation?
-	 * @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
-	 * @return int <0 KO, >0 OK
+	 * @param User 			$user 				Object user
+	 * @param Product 		$product 			Parent product
+	 * @param array 		$combinations 		Attribute and value combinations.
+	 * @param array 		$variations 		Price and weight variations
+	 * @param bool|array 	$price_var_percent 	Is the price variation a relative variation?
+	 * @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
+	 * @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)
+	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 = '')
 	{
-		global $db, $conf;
+		global $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
 
-		$db->begin();
+		$this->db->begin();
+
+		$price_impact = array(1=>0); // init level price impact
 
 		$forced_refvar = trim($forced_refvar);
 
 		if (!empty($forced_refvar) && $forced_refvar != $product->ref) {
-			$existingProduct = new Product($db);
+			$existingProduct = new Product($this->db);
 			$result = $existingProduct->fetch('', $forced_refvar);
 			if ($result > 0) {
 				$newproduct = $existingProduct;
@@ -542,26 +704,36 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		}
 
 		//Final weight impact
-		$weight_impact = (float) $forced_weightvar;	// If false, return 0
+		$weight_impact = (float) $forced_weightvar; // If false, return 0
 
 		//Final price impact
-		$price_impact = (float) $forced_pricevar;	// If false, return 0
+		if (!is_array($forced_pricevar)) {
+			$price_impact[1] = (float) $forced_pricevar; // If false, return 0
+		}
+		else {
+			$price_impact = $forced_pricevar;
+		}
 
-		$newcomb = new ProductCombination($db);
+		$newcomb = new ProductCombination($this->db);
 		$existingCombination = $newcomb->fetchByProductCombination2ValuePairs($product->id, $combinations);
 
 		if ($existingCombination) {
 			$newcomb = $existingCombination;
 		} else {
 			$newcomb->fk_product_parent = $product->id;
-			if ($newcomb->create($user) < 0) {		// Create 1 entry into product_attribute_combination (1 entry for all combinations)
-				$db->rollback();
+
+			// Create 1 entry into product_attribute_combination (1 entry for each combinations). This init also $newcomb->id
+			$result = $newcomb->create($user);
+			if ($result < 0) {
+				$this->error = $newcomb->error;
+				$this->errors = $newcomb->errors;
+				$this->db->rollback();
 				return -1;
 			}
 		}
 
-		$prodattr = new ProductAttribute($db);
-		$prodattrval = new ProductAttributeValue($db);
+		$prodattr = new ProductAttribute($this->db);
+		$prodattrval = new ProductAttributeValue($this->db);
 
 		// $combination contains list of attributes pairs key->value. Example: array('id Color'=>id Blue, 'id Size'=>id Small, 'id Option'=>id val a, ...)
 		//var_dump($combinations);
@@ -572,13 +744,15 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 
 			//If there is an existing combination, there is no need to duplicate the valuepair
 			if (!$existingCombination) {
-				$tmp = new ProductCombination2ValuePair($db);
+				$tmp = new ProductCombination2ValuePair($this->db);
 				$tmp->fk_prod_attr = $currcombattr;
 				$tmp->fk_prod_attr_val = $currcombval;
 				$tmp->fk_prod_combination = $newcomb->id;
 
 				if ($tmp->create($user) < 0) {		// Create 1 entry into product_attribute_combination2val
-					$db->rollback();
+					$this->error = $tmp->error;
+					$this->errors = $tmp->errors;
+					$this->db->rollback();
 					return -1;
 				}
 			}
@@ -587,7 +761,15 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				$weight_impact += (float) price2num($variations[$currcombattr][$currcombval]['weight']);
 			}
 			if ($forced_pricevar === false) {
-				$price_impact += (float) price2num($variations[$currcombattr][$currcombval]['price']);
+				$price_impact[1] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
+
+				// Manage Price levels
+				if ($conf->global->PRODUIT_MULTIPRICES) {
+					for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+					{
+						$price_impact[$i] += (float) price2num($variations[$currcombattr][$currcombval]['price']);
+					}
+				}
 			}
 
 			if ($forced_refvar === false) {
@@ -606,8 +788,28 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		}
 
 		$newcomb->variation_price_percentage = $price_var_percent;
-		$newcomb->variation_price = $price_impact;
+		$newcomb->variation_price = $price_impact[1];
 		$newcomb->variation_weight = $weight_impact;
+        $newcomb->variation_ref_ext = $this->db->escape($ref_ext);
+
+		// Init price level
+		if ($conf->global->PRODUIT_MULTIPRICES) {
+			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
+				$productCombinationLevel = new ProductCombinationLevel($this->db);
+				$productCombinationLevel->fk_product_attribute_combination = $newcomb->id;
+				$productCombinationLevel->fk_price_level = $i;
+				$productCombinationLevel->variation_price = $price_impact[$i];
+
+				if (is_array($price_var_percent)) {
+					$productCombinationLevel->variation_price_percentage = (empty($price_var_percent[$i]) ? false : $price_var_percent[$i]);
+				} else {
+					$productCombinationLevel->variation_price_percentage = $price_var_percent;
+				}
+
+				$newcomb->combination_price_levels[$i] = $productCombinationLevel;
+			}
+		}
+		//var_dump($newcomb->combination_price_levels);
 
 		$newproduct->weight += $weight_impact;
 
@@ -630,7 +832,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				if ($newproduct->error != 'ErrorProductAlreadyExists') {
 					$this->error[] = $newproduct->error;
 					$this->errors = $newproduct->errors;
-					$db->rollback();
+					$this->db->rollback();
 					return -1;
 				}
 
@@ -659,7 +861,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 				}
 
 				if ($res < 0) {
-					$db->rollback();
+					$this->db->rollback();
 					return -1;
 				}
 			}
@@ -667,7 +869,7 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 			$result = $newproduct->update($newproduct->id, $user);
 			if ($result < 0)
 			{
-				$db->rollback();
+				$this->db->rollback();
 				return -1;
 			}
 		}
@@ -676,11 +878,13 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 
 		if ($newcomb->update($user) < 0)
 		{
-			$db->rollback();
+			$this->error = $newcomb->error;
+			$this->errors = $newcomb->errors;
+			$this->db->rollback();
 			return -1;
 		}
 
-		$db->commit();
+		$this->db->commit();
 		return $newproduct->id;
 	}
 
@@ -764,3 +968,273 @@ WHERE c.fk_product_parent = ".(int) $productid." AND p.tosell = 1";
 		return $label;
 	}
 }
+
+
+
+/**
+ * Class ProductCombinationLevel
+ * Used to represent a product combination Level
+ */
+class ProductCombinationLevel
+{
+	/**
+	 * Database handler
+	 * @var DoliDB
+	 */
+	public $db;
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'product_attribute_combination_price_level';
+
+	/**
+	 * Rowid of combination
+	 * @var int
+	 */
+	public $id;
+
+	/**
+	 * Rowid of parent product combination
+	 * @var int
+	 */
+	public $fk_product_attribute_combination;
+
+	/**
+	 * Combination price level
+	 * @var int
+	 */
+	public $fk_price_level;
+
+	/**
+	 * Price variation
+	 * @var float
+	 */
+	public $variation_price;
+
+	/**
+	 * Is the price variation a relative variation?
+	 * @var bool
+	 */
+	public $variation_price_percentage = false;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 * Retrieves a combination level by its rowid
+	 *
+	 * @param int $rowid Row id
+	 * @return int <0 KO, >0 OK
+	 */
+	public function fetch($rowid)
+	{
+		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".(int) $rowid;
+
+		$obj = $this->db->getRow($sql);
+
+		if ($obj) {
+			return $this->fetchFormObj($obj);
+		}
+
+		return -1;
+	}
+
+
+	/**
+	 * Retrieves combination price levels
+	 *
+	 * @param 	int 	$fk_product_attribute_combination		Id of product combination
+	 * @param 	int 	$fk_price_level 						The price level to fetch, use 0 for all
+	 * @return  mixed											self[] | -1 on KO
+	 */
+	public function fetchAll($fk_product_attribute_combination, $fk_price_level = 0)
+	{
+
+		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE fk_product_attribute_combination = ".intval($fk_product_attribute_combination);
+
+		if (!empty($fk_price_level)) {
+			$sql .= ' AND fk_price_level = '.intval($fk_price_level);
+		}
+
+		$combination_price_levels = $this->db->getRows($sql);
+
+		if (!is_array($combination_price_levels)) {
+			return -1;
+		}
+
+		$result = array();
+
+		if (!empty($combination_price_levels)) {
+			// For more simple usage set level as array key
+			foreach ($combination_price_levels as $k => $row) {
+				$productCombinationLevel = new ProductCombinationLevel($this->db);
+				$productCombinationLevel->fetchFormObj($row);
+				$result[$row->fk_price_level] = $productCombinationLevel;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * assign vars form an stdclass like sql obj
+	 *
+	 * @param 	int 	$obj		Object resultset
+	 * @return 	int 				<0 KO, >0 OK
+	 */
+	public function fetchFormObj($obj)
+	{
+		if (!$obj) {
+			return -1;
+		}
+
+		$this->id = $obj->rowid;
+		$this->fk_product_attribute_combination = doubleval($obj->fk_product_attribute_combination);
+		$this->fk_price_level = intval($obj->fk_price_level);
+		$this->variation_price = doubleval($obj->variation_price);
+		$this->variation_price_percentage = (bool) $obj->variation_price_percentage;
+
+		return 1;
+	}
+
+
+	/**
+	 * Save a price impact of a product combination for a price level
+	 *
+	 * @return int 		<0 KO, >0 OK
+	 */
+	public function save()
+	{
+		if (($this->id > 0 && empty($this->fk_product_attribute_combination)) || empty($this->fk_price_level)) {
+			return -1;
+		}
+
+		// Check if level exist in DB before add
+		if ($this->fk_product_attribute_combination > 0 && empty($this->id)) {
+			$sql = "SELECT rowid id";
+			$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " WHERE fk_product_attribute_combination = ".(int) $this->fk_product_attribute_combination;
+			$sql .= ' AND fk_price_level = '.intval($this->fk_price_level);
+
+			$existObj = $this->db->getRow($sql);
+			if ($existObj) {
+				$this->id = $existObj->id;
+			}
+		}
+
+		// Update
+		if (!empty($this->id)) {
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET variation_price = '.doubleval($this->variation_price).' , variation_price_percentage = '.intval($this->variation_price_percentage);
+			$sql .= ' WHERE rowid = '.((int) $this->id);
+
+			$res = $this->db->query($sql);
+			if ($res > 0) {
+				return $this->id;
+			} else {
+				$this->error = $this->db->error();
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		} else {
+			// Add
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+			$sql .= "fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage";
+			$sql .= ") VALUES (";
+			$sql .= (int) $this->fk_product_attribute_combination;
+			$sql .= ", ".intval($this->fk_price_level);
+			$sql .= ", ".doubleval($this->variation_price);
+			$sql .= ", ".intval($this->variation_price_percentage);
+			$sql .= ")";
+
+			$res = $this->db->query($sql);
+			if ($res) {
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+			} else {
+				$this->error = $this->db->error();
+				$this->errors[] = $this->error;
+				return -1;
+			}
+		}
+
+		return $this->id;
+	}
+
+
+	/**
+	 * delete
+	 *
+	 * @return int <0 KO, >0 OK
+	 */
+	public function delete()
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".(int) $this->id;
+		$res = $this->db->query($sql);
+
+		return $res ? 1 : -1;
+	}
+
+
+	/**
+	 * delete all for a combination
+	 *
+	 * @param 	int		$fk_product_attribute_combination	Id of combination
+	 * @return 	int 										<0 KO, >0 OK
+	 */
+	public function deleteAllForCombination($fk_product_attribute_combination)
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE fk_product_attribute_combination = ".(int) $fk_product_attribute_combination;
+		$res = $this->db->query($sql);
+
+		return $res ? 1 : -1;
+	}
+
+
+	/**
+	 * Clean not needed price levels for a combination
+	 *
+	 * @param 	int		$fk_product_attribute_combination	Id of combination
+	 * @return 	int 										<0 KO, >0 OK
+	 */
+	public function clean($fk_product_attribute_combination)
+	{
+		global $conf;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE fk_product_attribute_combination = ".(int) $fk_product_attribute_combination;
+		$sql .= " AND fk_price_level > ".intval($conf->global->PRODUIT_MULTIPRICES_LIMIT);
+		$res = $this->db->query($sql);
+
+		return $res ? 1 : -1;
+	}
+
+
+	/**
+	 * Create new Product Combination Price level from Parent
+	 *
+	 * @param DoliDB 				$db						Database handler
+	 * @param ProductCombination 	$productCombination		Product combination
+	 * @param int					$fkPriceLevel			Price level
+	 * @return ProductCombinationLevel
+	 */
+	public static function createFromParent(DoliDB $db, ProductCombination $productCombination, $fkPriceLevel)
+	{
+		$productCombinationLevel = new self($db);
+		$productCombinationLevel->fk_price_level = $fkPriceLevel;
+		$productCombinationLevel->fk_product_attribute_combination = $productCombination->id;
+		$productCombinationLevel->variation_price = $productCombination->variation_price;
+		$productCombinationLevel->variation_price_percentage = (bool) $productCombination->variation_price_percentage;
+
+		return $productCombinationLevel;
+	}
+}
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 15e019dd311..c9835440103 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -33,10 +33,14 @@ $ref = GETPOST('ref', 'alpha');
 $weight_impact = GETPOST('weight_impact', 'alpha');
 $price_impact = GETPOST('price_impact', 'alpha');
 $price_impact_percent = (bool) GETPOST('price_impact_percent');
+
+$level_price_impact = GETPOST('level_price_impact', 'array');
+$level_price_impact_percent = GETPOST('level_price_impact_percent', 'array');
+
 $reference = GETPOST('reference', 'alpha');
 $form = new Form($db);
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
@@ -56,7 +60,7 @@ $prodattr_val = new ProductAttributeValue($db);
 $object = new Product($db);
 if ($id > 0 || $ref)
 {
-    $object->fetch($id, $ref);
+	$object->fetch($id, $ref);
 }
 
 $selectedvariant = $_SESSION['addvariant_'.$object->id];
@@ -67,9 +71,9 @@ $selectedvariant = $_SESSION['addvariant_'.$object->id];
  */
 
 if ($cancel) {
-    $action = '';
-    $massactions = '';
-    unset($_SESSION['addvariant_'.$object->id]);
+	$action = '';
+	$massactions = '';
+	unset($_SESSION['addvariant_'.$object->id]);
 }
 
 if (!$object->isProduct() && !$object->isService()) {
@@ -83,12 +87,12 @@ if ($action == 'add')
 }
 if ($action == 'create' && GETPOST('selectvariant', 'alpha'))	// We click on select combination
 {
-    $action = 'add';
-    if (GETPOST('attribute') != '-1' && GETPOST('value') != '-1')
-    {
-        $selectedvariant[GETPOST('attribute').':'.GETPOST('value')] = GETPOST('attribute').':'.GETPOST('value');
-        $_SESSION['addvariant_'.$object->id] = $selectedvariant;
-    }
+	$action = 'add';
+	if (GETPOST('attribute') != '-1' && GETPOST('value') != '-1')
+	{
+		$selectedvariant[GETPOST('attribute').':'.GETPOST('value')] = GETPOST('attribute').':'.GETPOST('value');
+		$_SESSION['addvariant_'.$object->id] = $selectedvariant;
+	}
 }
 
 
@@ -101,19 +105,27 @@ if ($_POST) {
 	if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST('selectvariant', 'alpha'))	// We click on Create all defined combinations
 	{
 		//$features = GETPOST('features', 'array');
-        $features = $_SESSION['addvariant_'.$object->id];
+		$features = $_SESSION['addvariant_'.$object->id];
 
 		if (!$features) {
 			setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
-		}
-		else
-		{
+		} else {
 			$reference = trim($reference);
-		    if (empty($reference)) {
-		        $reference = false;
-		    }
+			if (empty($reference)) {
+				$reference = false;
+			}
 			$weight_impact = price2num($weight_impact);
 			$price_impact = price2num($price_impact);
+
+			// for conf PRODUIT_MULTIPRICES
+			if ($conf->global->PRODUIT_MULTIPRICES) {
+				$level_price_impact = array_map('price2num', $level_price_impact);
+			}
+			else {
+				$level_price_impact = array(1 => $weight_impact);
+				$level_price_impact_percent = array(1 => $price_impact_percent);
+			}
+
 			$sanit_features = array();
 
 			//First, sanitize
@@ -143,11 +155,9 @@ if ($_POST) {
 			// sanit_feature is an array with 1 (and only 1) value per attribute.
 			// For example:  Color->blue, Size->Small, Option->2
 			//var_dump($sanit_features);
-			//var_dump($productCombination2ValuePairs1); exit;
-
 			if (!$prodcomb->fetchByProductCombination2ValuePairs($id, $sanit_features))
 			{
-				$result = $prodcomb->createProductCombination($user, $object, $sanit_features, array(), $price_impact_percent, $price_impact, $weight_impact, $reference);
+				$result = $prodcomb->createProductCombination($user, $object, $sanit_features, array(), $level_price_impact_percent, $level_price_impact, $weight_impact, $reference);
 				if ($result > 0)
 				{
 					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
@@ -158,7 +168,7 @@ if ($_POST) {
 					exit();
 				} else {
 					$langs->load("errors");
-					setEventMessages('', $prodcomb->errors, 'errors');
+					setEventMessages($prodcomb->error, $prodcomb->errors, 'errors');
 				}
 			} else {
 				setEventMessages($langs->trans('ErrorRecordAlreadyExists'), null, 'errors');
@@ -166,8 +176,7 @@ if ($_POST) {
 
 			$db->rollback();
 		}
-	}
-	elseif (!empty($massaction))
+	} elseif (!empty($massaction))
 	{
 		$bulkaction = $massaction;
 		$error = 0;
@@ -220,17 +229,41 @@ if ($_POST) {
 			$db->commit();
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		}
-	}
-	elseif ($valueid > 0) {
+	} elseif ($valueid > 0) {
 		if ($prodcomb->fetch($valueid) < 0) {
 			dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
 			exit();
 		}
 
-		$prodcomb->variation_price_percentage = $price_impact_percent;
-		$prodcomb->variation_price = $price_impact;
 		$prodcomb->variation_weight = $weight_impact;
 
+		// for conf PRODUIT_MULTIPRICES
+		if ($conf->global->PRODUIT_MULTIPRICES) {
+			$level_price_impact = array_map('price2num', $level_price_impact);
+
+			$prodcomb->variation_price = $level_price_impact[1];
+			$prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1];
+		}
+		else {
+			$level_price_impact = array(1 => $weight_impact);
+			$level_price_impact_percent = array(1 => $price_impact_percent);
+
+			$prodcomb->variation_price = $price_impact;
+			$prodcomb->variation_price_percentage = $price_impact_percent;
+		}
+
+		if ($conf->global->PRODUIT_MULTIPRICES) {
+			$prodcomb->combination_price_levels = array();
+			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
+				$productCombinationLevel = new ProductCombinationLevel($db);
+				$productCombinationLevel->fk_product_attribute_combination = $prodcomb->id;
+				$productCombinationLevel->fk_price_level = $i;
+				$productCombinationLevel->variation_price = $level_price_impact[$i];
+				$productCombinationLevel->variation_price_percentage = (bool) $level_price_impact_percent[$i];
+				$prodcomb->combination_price_levels[$i] = $productCombinationLevel;
+			}
+		}
+
 		if ($prodcomb->update($user) > 0) {
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 			header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2));
@@ -301,68 +334,66 @@ if (!empty($id) || !empty($ref))
 {
 	llxHeader("", "", $langs->trans("CardProduct".$object->type));
 
-    $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
-    if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
+	$showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
 
-    $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');
 
-    dol_fiche_head($head, 'combinations', $titre, -1, $picto);
+	dol_fiche_head($head, 'combinations', $titre, -1, $picto);
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
-    $object->next_prev_filter = " fk_product_type = ".$object->type;
+	$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'">'.$langs->trans("BackToList").'</a>';
+	$object->next_prev_filter = " fk_product_type = ".$object->type;
 
-    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);
 
 	print '<div class="fichecenter">';
 
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border tableforfield" width="100%">';
 
-    // TVA
-    print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
+	// TVA
+	print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
-    $positiverates = '';
-    if (price2num($object->tva_tx))       $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
-    if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
-    if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
-    if (empty($positiverates)) $positiverates = '0';
-    echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
-    /*
+	$positiverates = '';
+	if (price2num($object->tva_tx))       $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+	if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+	if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+	if (empty($positiverates)) $positiverates = '0';
+	echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+	/*
     if ($object->default_vat_code)
     {
         print vatrate($object->tva_tx, true) . ' ('.$object->default_vat_code.')';
     }
     else print vatrate($object->tva_tx, true, $object->tva_npr, true);*/
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Price
-    print '<tr><td>'.$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);
-    }
-    print '</td></tr>';
+	// Price
+	print '<tr><td>'.$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);
+	}
+	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);
-    }
-    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);
+	}
+	print '</td></tr>';
 
 	// Weight
 	print '<tr><td>'.$langs->trans("Weight").'</td><td>';
 	if ($object->weight != '')
 	{
 		print $object->weight." ".measuringUnitString(0, "weight", $object->weight_units);
-	}
-	else
-	{
+	} else {
 		print '&nbsp;';
 	}
 	print "</td></tr>\n";
@@ -433,7 +464,7 @@ if (!empty($id) || !empty($ref))
 
 			<?php
 			foreach ($productCombination2ValuePairs1 as $pc2v) {
-                $prodattr_val->fetch($pc2v->fk_prod_attr_val);
+				$prodattr_val->fetch($pc2v->fk_prod_attr_val);
 				?>
     			variants_selected.index.push(<?php echo $pc2v->fk_prod_attr ?>);
     			variants_selected.info[<?php echo $pc2v->fk_prod_attr ?>] = {
@@ -444,8 +475,8 @@ if (!empty($id) || !empty($ref))
     				}
     			};
 				<?php
-		    }
-		    ?>
+			}
+			?>
 
 			restoreAttributes = function() {
 				jQuery("select[name=attribute]").empty().append('<option value="-1">&nbsp;</option>');
@@ -504,15 +535,15 @@ if (!empty($id) || !empty($ref))
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">'."\n";
 		print '<input type="hidden" name="action" value="'.(($valueid > 0) ? "update" : "create").'">'."\n";
-        if ($valueid > 0) {
-            print '<input type="hidden" name="valueid" value="'.$valueid.'">'."\n";
-        }
+		if ($valueid > 0) {
+			print '<input type="hidden" name="valueid" value="'.$valueid.'">'."\n";
+		}
 
-        dol_fiche_head();
+		dol_fiche_head();
 
 
-		print '<table class="border" style="width: 100%">';
 		if ($action == 'add') {
+			print '<table class="border" style="width: 100%">';
 			print "<!--  Variant -->\n";
 			print '<tr>';
 			print '<td class="titlefieldcreate fieldrequired"><label for="attribute">'.$langs->trans('ProductAttribute').'</label></td>';
@@ -533,9 +564,9 @@ if (!empty($id) || !empty($ref))
 			print $langs->trans("Create");
 			print '</a>';*/
 
+			print '</td>';
+			print '</tr>';
 			?>
-				</td>
-			</tr>
 			<!-- Value -->
 			<tr>
 				<td class="fieldrequired"><label for="value"><?php echo $langs->trans('Value') ?></label></td>
@@ -559,64 +590,117 @@ if (!empty($id) || !empty($ref))
 					<input type="submit" class="button" name="selectvariant" id="selectvariant" value="<?php echo dol_escape_htmltag($langs->trans("SelectCombination")); ?>">
 				</td>
 			</tr>
-			<tr><td></td><td>
-			<?php echo $listofvariantselected;
+			<?php
+			print '<tr><td></td><td>';
+			print $listofvariantselected;
 			print '</td>';
 			print '</tr>';
+
 			print '</table>';
-        }
+			print '<hr>';
+		}
 
 		if (is_array($productCombination2ValuePairs1)) {
-			?>
-		<hr>
-		<table class="border" style="width: 100%">
-			<tr>
-				<td class="titlefieldcreate fieldrequired tdtop"><label for="features"><?php echo $langs->trans('Combination') ?></label></td>
-				<td class="tdtop">
-					<div class="inline-block valignmiddle quatrevingtpercent">
+			print '<table class="border" style="width: 100%">';
+
+			// When in edit mode
+			if (is_array($productCombination2ValuePairs1) && count($productCombination2ValuePairs1))
+			{
+				?>
+				<tr>
+					<td class="titlefieldcreate tdtop"><label for="features"><?php echo $langs->trans('Combination') ?></label></td>
+					<td class="tdtop">
+						<div class="inline-block valignmiddle quatrevingtpercent">
 					<?php
-					if (is_array($productCombination2ValuePairs1))
-					{
-                        foreach ($productCombination2ValuePairs1 as $key => $val) {
-                            $result1 = $prodattr->fetch($val->fk_prod_attr);
-                            $result2 = $prodattr_val->fetch($val->fk_prod_attr_val);
-                            if ($result1 > 0 && $result2 > 0)
-                            {
-                                print $prodattr->label.' - '.$prodattr_val->value.'<br>';
-                                // TODO Add delete link
-                            }
-                        }
+					foreach ($productCombination2ValuePairs1 as $key => $val) {
+						$result1 = $prodattr->fetch($val->fk_prod_attr);
+						$result2 = $prodattr_val->fetch($val->fk_prod_attr_val);
+						//print 'rr'.$result1.' '.$result2;
+						if ($result1 > 0 && $result2 > 0)
+						{
+							print $prodattr->label.' - '.$prodattr_val->value.'<br>';
+							// TODO Add delete link
+						}
 					}
 					?>
-					</div>
-					<!-- <div class="inline-block valignmiddle">
-					<a href="#" class="inline-block valignmiddle button" id="delfeature"><?php echo img_edit_remove() ?></a>
-					</div>-->
-				</td>
-				<td>
-				</td>
-			</tr>
+						</div>
+						<!-- <div class="inline-block valignmiddle">
+						<a href="#" class="inline-block valignmiddle button" id="delfeature"><?php echo img_edit_remove() ?></a>
+						</div>-->
+					</td>
+					<td>
+					</td>
+				</tr>
+				<?php
+			}
+			?>
 			<tr>
 				<td><label for="reference"><?php echo $langs->trans('Reference') ?></label></td>
 				<td><input type="text" id="reference" name="reference" value="<?php echo trim($reference) ?>"></td>
 			</tr>
+			<?php
+			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+				?>
 			<tr>
 				<td><label for="price_impact"><?php echo $langs->trans('PriceImpact') ?></label></td>
 				<td><input type="text" id="price_impact" name="price_impact" value="<?php echo price($price_impact) ?>">
-				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label></td>
+				<input type="checkbox" id="price_impact_percent" name="price_impact_percent" <?php echo $price_impact_percent ? ' checked' : '' ?>> <label for="price_impact_percent"><?php echo $langs->trans('PercentageVariation') ?></label>
+				</td>
 			</tr>
-			<?php
-            if ($object->isProduct()) {
+				<?php
+			} else {
+				$prodcomb->fetchCombinationPriceLevels();
+
+				for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
+				{
+					print '<tr>';
+					print '<td><label for="level_price_impact_'.$i.'">'.$langs->trans('ImpactOnPriceLevel', $i).'</label>';
+					if ($i === 1) {
+						print ' <a id="apply-price-impact-to-all-level" class="classfortooltip" href="#" title="'.$langs->trans('ApplyToAllPriceImpactLevelHelp').'">('.$langs->trans('ApplyToAllPriceImpactLevel').')</a>';
+					}
+					print '</td>';
+					print '<td><input type="text" class="level_price_impact" id="level_price_impact_'.$i.'" name="level_price_impact['.$i.']" value="'.price($prodcomb->combination_price_levels[$i]->variation_price).'">';
+					print '<input type="checkbox" class="level_price_impact_percent" id="level_price_impact_percent_'.$i.'" name="level_price_impact_percent['.$i.']" '.(!empty($prodcomb->combination_price_levels[$i]->variation_price_percentage) ? ' checked' : '').'> <label for="level_price_impact_percent_'.$i.'">'.$langs->trans('PercentageVariation').'</label>';
+
+					print '</td>';
+					print '</tr>';
+				}
+			}
+
+			if ($object->isProduct()) {
 				print '<tr>';
 				print '<td><label for="weight_impact">'.$langs->trans('WeightImpact').'</label></td>';
 				print '<td><input type="text" id="weight_impact" name="weight_impact" value="'.price($weight_impact).'"></td>';
 				print '</tr>';
 			}
+
 			print '</table>';
 		}
 
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			?>
+			<script>
+				$(document).ready(function() {
+					// Apply level 1 impact to all prices impact levels
+					$('body').on('click', '#apply-price-impact-to-all-level', function(e) {
+						e.preventDefault();
+						let priceImpact = $( "#level_price_impact_1" ).val();
+						let priceImpactPrecent = $( "#level_price_impact_percent_1" ).prop("checked");
+
+						var multipricelimit = <?php print intval($conf->global->PRODUIT_MULTIPRICES_LIMIT); ?>
+
+						for (let i = 2; i <= multipricelimit; i++) {
+							$( "#level_price_impact_" + i ).val(priceImpact);
+							$( "#level_price_impact_percent_" + i  ).prop("checked", priceImpactPrecent);
+						}
+					});
+				});
+			</script>
+			<?php
+		}
+
 		dol_fiche_end();
-        ?>
+		?>
 
 		<div style="text-align: center">
 		<input type="submit" name="create" <?php if (!is_array($productCombination2ValuePairs1)) print ' disabled="disabled"'; ?> value="<?php echo $action == 'add' ? $langs->trans('Create') : $langs->trans('Save') ?>" class="button">
@@ -626,10 +710,8 @@ if (!empty($id) || !empty($ref))
 
 		<?php
 
-        print '</form>';
-	}
-	else
-	{
+		print '</form>';
+	} else {
 		if ($action === 'delete') {
 			if ($prodcomb->fetch($valueid) > 0) {
 				$prodstatic->fetch($prodcomb->fk_product_child);
@@ -645,7 +727,7 @@ if (!empty($id) || !empty($ref))
 				);
 			}
 		} elseif ($action === 'copy') {
-            print $form->formconfirm('combinations.php?id='.$id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneProductCombinations'), 'confirm_copycombination', array(array('type' => 'text', 'label' => $langs->trans('CloneDestinationReference'), 'name' => 'dest_product')), 0, 1);
+			print $form->formconfirm('combinations.php?id='.$id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneProductCombinations'), 'confirm_copycombination', array(array('type' => 'text', 'label' => $langs->trans('CloneDestinationReference'), 'name' => 'dest_product')), 0, 1);
 		}
 
 		$comb2val = new ProductCombination2ValuePair($db);
@@ -675,9 +757,10 @@ if (!empty($id) || !empty($ref))
 				});
 			</script>
 
-		<?php }
+			<?php
+		}
 
-        // Buttons
+		// Buttons
 		print '<div class="tabsAction">';
 
 		print '	<div class="inline-block divButAction">';
@@ -724,16 +807,16 @@ if (!empty($id) || !empty($ref))
 		$aaa = '';
 		if (count($productCombinations))
 		{
-    		$aaa = '<label for="massaction">'.$langs->trans('BulkActions').'</label>';
-    		$aaa .= '<select id="bulk_action" name="massaction" class="flat">';
-    		$aaa .= '	<option value="nothing">&nbsp;</option>';
-    		$aaa .= '	<option value="not_buy">'.$langs->trans('ProductStatusNotOnBuy').'</option>';
-    		$aaa .= '	<option value="not_sell">'.$langs->trans('ProductStatusNotOnSell').'</option>';
-    		$aaa .= '	<option value="on_buy">'.$langs->trans('ProductStatusOnBuy').'</option>';
-    		$aaa .= '	<option value="on_sell">'.$langs->trans('ProductStatusOnSell').'</option>';
-    		$aaa .= '	<option value="delete">'.$langs->trans('Delete').'</option>';
-    		$aaa .= '</select>';
-    		$aaa .= '<input type="submit" value="'.dol_escape_htmltag($langs->trans("Apply")).'" class="button">';
+			$aaa = '<label for="massaction">'.$langs->trans('BulkActions').'</label>';
+			$aaa .= '<select id="bulk_action" name="massaction" class="flat">';
+			$aaa .= '	<option value="nothing">&nbsp;</option>';
+			$aaa .= '	<option value="not_buy">'.$langs->trans('ProductStatusNotOnBuy').'</option>';
+			$aaa .= '	<option value="not_sell">'.$langs->trans('ProductStatusNotOnSell').'</option>';
+			$aaa .= '	<option value="on_buy">'.$langs->trans('ProductStatusOnBuy').'</option>';
+			$aaa .= '	<option value="on_sell">'.$langs->trans('ProductStatusOnSell').'</option>';
+			$aaa .= '	<option value="delete">'.$langs->trans('Delete').'</option>';
+			$aaa .= '</select>';
+			$aaa .= '<input type="submit" value="'.dol_escape_htmltag($langs->trans("Apply")).'" class="button">';
 		}
 		$massactionbutton = $aaa;
 
@@ -753,57 +836,55 @@ if (!empty($id) || !empty($ref))
 				<td class="liste_titre center"><?php echo $langs->trans('OnBuy') ?></td>
 				<td class="liste_titre"></td>
         		<?php
-        		print '<td class="liste_titre center">';
-        		$searchpicto = $form->showCheckAddButtons('checkforselect', 1);
-        		print $searchpicto;
-        		print '</td>';
-                ?>
+				print '<td class="liste_titre center">';
+				$searchpicto = $form->showCheckAddButtons('checkforselect', 1);
+				print $searchpicto;
+				print '</td>';
+				?>
 			</tr>
 		<?php
 
 		if (count($productCombinations))
 		{
-    		foreach ($productCombinations as $currcomb)
-    		{
-    			$prodstatic->fetch($currcomb->fk_product_child);
-    			print '<tr class="oddeven">';
-    			print '<td>'.$prodstatic->getNomUrl(1).'</td>';
-    			print '<td>';
+			foreach ($productCombinations as $currcomb)
+			{
+				$prodstatic->fetch($currcomb->fk_product_child);
+				print '<tr class="oddeven">';
+				print '<td>'.$prodstatic->getNomUrl(1).'</td>';
+				print '<td>';
 
-    			$productCombination2ValuePairs = $comb2val->fetchByFkCombination($currcomb->id);
-    			$iMax = count($productCombination2ValuePairs);
+				$productCombination2ValuePairs = $comb2val->fetchByFkCombination($currcomb->id);
+				$iMax = count($productCombination2ValuePairs);
 
-    			for ($i = 0; $i < $iMax; $i++) {
-    				echo dol_htmlentities($productCombination2ValuePairs[$i]);
-    				if ($i !== ($iMax - 1)) {
-    					echo ', ';
-    				}
-    			}
-    			print '</td>';
-    			print '<td class="right">'.($currcomb->variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '').'</td>';
-                if ($object->isProduct()) {
+				for ($i = 0; $i < $iMax; $i++) {
+					echo dol_htmlentities($productCombination2ValuePairs[$i]);
+					if ($i !== ($iMax - 1)) {
+						echo ', ';
+					}
+				}
+				print '</td>';
+				print '<td class="right">'.($currcomb->variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '').'</td>';
+				if ($object->isProduct()) {
 					print '<td class="right">'.($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuringUnitString(0, 'weight', $prodstatic->weight_units).'</td>';
 				}
-    			print '<td class="center">'.$prodstatic->getLibStatut(2, 0).'</td>';
-    			print '<td class="center">'.$prodstatic->getLibStatut(2, 1).'</td>';
-    			print '<td class="right">';
-    			print '<a class="paddingleft paddingright" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=edit&valueid='.$currcomb->id.'">'.img_edit().'</a>';
-    			print '<a class="paddingleft paddingright" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=delete&valueid='.$currcomb->id.'">'.img_delete().'</a>';
-    			print '</td>';
-    			print '<td class="nowrap center">';
-    			if ($productCombinations || $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($prodstatic->id, $arrayofselected)) $selected = 1;
-    			    print '<input id="cb'.$prodstatic->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$prodstatic->id.'"'.($selected ? ' checked="checked"' : '').'>';
-    			}
-    			print '</td>';
-    			print '</tr>';
-		    }
-		}
-		else
-		{
-		     print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+				print '<td class="center">'.$prodstatic->getLibStatut(2, 0).'</td>';
+				print '<td class="center">'.$prodstatic->getLibStatut(2, 1).'</td>';
+				print '<td class="right">';
+				print '<a class="paddingleft paddingright editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=edit&valueid='.$currcomb->id.'">'.img_edit().'</a>';
+				print '<a class="paddingleft paddingright" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=delete&token='.newToken().'&valueid='.$currcomb->id.'">'.img_delete().'</a>';
+				print '</td>';
+				print '<td class="nowrap center">';
+				if ($productCombinations || $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($prodstatic->id, $arrayofselected)) $selected = 1;
+					print '<input id="cb'.$prodstatic->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$prodstatic->id.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+				print '</tr>';
+			}
+		} else {
+			 print '<tr><td colspan="8"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 		print '</table>';
 		print '</div>';
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index 55bf1c81f34..c11f6b5f485 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -42,9 +42,7 @@ if ($_POST) {
 			if ($backtopage)
 			{
 				header('Location: '.$backtopage);
-			}
-			else
-			{
+			} else {
 				header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$resid.'&backtopage='.urlencode($backtopage));
 			}
 			exit;
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index e724b5693c4..b5a57d514ae 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -24,7 +24,7 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $value = GETPOST('value', 'alpha');
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 53fa3ee70ec..7973553f6d0 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -18,7 +18,6 @@
 require '../main.inc.php';
 require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
-$id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $object = new ProductAttribute($db);
 
@@ -66,7 +65,7 @@ print load_fiche_titre($title, $newcardbutton, 'product');
 
 $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
 ?>
-	<script type="text/javascript">
+	<script>
 		$(document).ready(function(){
 			$(".imgupforline, .imgdownforline").hide();
 			$(".lineupdown").removeAttr('href');
@@ -127,7 +126,7 @@ foreach ($variants as $key => $attribute) {
 	print '<td class="right">'.$attribute->countChildProducts().'</td>';
 	print '<td class="right">';
 	print '<a class="editfielda marginrightonly paddingleftonly" href="card.php?id='.$attribute->id.'&action=edit">'.img_edit().'</a>';
-	print '<a class="marginrightonly paddingleftonlyhref="card.php?id='.$attribute->id.'&action=delete">'.img_delete().'</a>';
+	print '<a class="marginrightonly paddingleftonlyhref="card.php?id='.$attribute->id.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
 	print '</td>';
 	print '<td class="center linecolmove tdlineupdown">';
 	if ($key > 0) {
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 3cb23b36fbc..f13b786082a 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -52,7 +52,15 @@ if (isset($_GET["hashp"]) && !defined("NOLOGIN"))
 	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 // Some value of modulepart can be used to get resources that are public so no login are required.
-if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))
+if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias')
+{
+	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);
+	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+
+// Used by TakePOS Auto Order
+if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'product' && isset($_GET["publictakepos"]))
 {
 	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);
 	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
@@ -85,7 +93,7 @@ function llxFooter()
 require 'main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $original_file = GETPOST('file', 'alphanohtml'); // Do not use urldecode here ($_GET are already decoded by PHP).
 $hashp = GETPOST('hashp', 'aZ09');
 $modulepart = GETPOST('modulepart', 'alpha');
@@ -119,8 +127,7 @@ if (GETPOST("cache", 'alpha'))
     {
         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');
+    } else header('Cache-Control: no-cache');
     //print $dolibarr_nocache; exit;
 }
 
@@ -147,20 +154,14 @@ if (!empty($hashp))
 				// We remove first level of directory
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
-			}
-			else
-			{
+			} else {
 				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);
 			}
-		}
-		else
-		{
+		} else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
-	}
-	else
-	{
+	} else {
 		$langs->load("errors");
 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
 	}
@@ -190,13 +191,14 @@ $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
 
-if (!empty($hashp))
-{
+if (!empty($hashp)) {
 	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 	$sqlprotectagainstexternals = '';
-}
-else
-{
+} elseif (isset($_GET["publictakepos"])) {
+	if (! empty($conf->global->TAKEPOS_AUTO_ORDER)) {
+		$accessallowed = 1; // Only if TakePOS Public Auto Order is enabled and received publictakepos variable
+	}
+} else {
 	// Basic protection (against external users only)
 	if ($user->socid > 0)
 	{
@@ -234,7 +236,7 @@ if (!$accessallowed)
 if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file))
 {
 	dol_syslog("Refused to deliver file ".$fullpath_original_file);
-	print "ErrorFileNameInvalid: ".$original_file;
+	print "ErrorFileNameInvalid: ".dol_escape_htmltag($original_file);
 	exit;
 }
 
@@ -276,9 +278,8 @@ if ($modulepart == 'barcode')
     {
         $result = $module->buildBarCode($code, $encoding, $readable);
     }
-}
-else					// Open and return file
-{
+} else {
+    // Open and return file
     clearstatcache();
 
     $filename = basename($fullpath_original_file);
@@ -300,9 +301,7 @@ else					// Open and return file
     {
         top_httphead($type);
         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
-    }
-    else
-    {
+    } else {
         top_httphead('image/png');
         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
     }
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 819694f5041..9017aa40815 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -41,15 +41,14 @@ if ($actionsave)
 
     $db->begin();
 
-    $i += dolibarr_set_const($db, 'WEBSERVICES_KEY', trim(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
-    {
+    else {
         $db->rollback();
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 39ed3b3cdf5..c9e035edc6b 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -300,7 +300,7 @@ function getActionComm($authentication, $id)
 			        	'fulldayevent'=> $actioncomm->fulldayevent,
 			        	'location'=> $actioncomm->location,
 			        	'socid'=> $actioncomm->socid,
-			        	'contactid'=> $actioncomm->contactid,
+			        	'contactid'=> $actioncomm->contact_id,
 			        	'projectid'=> $actioncomm->fk_project,
 			        	'fk_element'=> $actioncomm->fk_element,
 			        	'elementtype'=> $actioncomm->elementtype
@@ -328,14 +328,12 @@ function getActionComm($authentication, $id)
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncomm'=>$actioncomm_result_fields);
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -388,15 +386,11 @@ function getListActionCommType($authentication)
 				 $objectresp = array(
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncommtypes'=>$resultarray);
-			}
-			else
-			{
+			} else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -444,7 +438,7 @@ function createActionComm($authentication, $actioncomm)
 		$newobject->socid = $actioncomm['socid'];
 		$newobject->fk_project = $actioncomm['projectid'];
 		$newobject->note = $actioncomm['note'];
-		$newobject->contactid = $actioncomm['contactid'];
+		$newobject->contact_id = $actioncomm['contactid'];
 		$newobject->userownerid = $actioncomm['userownerid'];
 		$newobject->label = $actioncomm['label'];
 		$newobject->percentage = $actioncomm['percentage'];
@@ -482,8 +476,7 @@ function createActionComm($authentication, $actioncomm)
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id);
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -540,7 +533,7 @@ function updateActionComm($authentication, $actioncomm)
 			$object->datef = $actioncomm['datef'];
 			$object->type_code = $actioncomm['type_code'];
 			$object->socid = $actioncomm['socid'];
-			$object->contactid = $actioncomm['contactid'];
+			$object->contact_id = $actioncomm['contactid'];
 			$object->fk_project = $actioncomm['projectid'];
 			$object->note = $actioncomm['note'];
 			$object->userownerid = $actioncomm['userownerid'];
diff --git a/htdocs/webservices/server_category.php b/htdocs/webservices/server_category.php
index de1fb73d3c0..d7382447749 100644
--- a/htdocs/webservices/server_category.php
+++ b/htdocs/webservices/server_category.php
@@ -262,14 +262,12 @@ function getCategory($authentication, $id)
 					'categorie'=> $cat
 			    );
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php
index 804cb3f7db1..023cdc1c4ac 100644
--- a/htdocs/webservices/server_contact.php
+++ b/htdocs/webservices/server_contact.php
@@ -333,14 +333,12 @@ function getContact($authentication, $id, $ref_ext)
 			        'contact'=>$contact_result_fields
                 );
 	        }
-	        else
-	        {
+	        else {
 	            $error++;
 	            $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 	        }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref_ext='.$ref_ext;
         }
@@ -451,8 +449,7 @@ function createContact($authentication, $contact)
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -584,8 +581,7 @@ function getContactsForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php
index 46590688f88..194a2331b2c 100644
--- a/htdocs/webservices/server_invoice.php
+++ b/htdocs/webservices/server_invoice.php
@@ -370,14 +370,12 @@ function getInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 			        	'lines' => $linesresp
 			        ));
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -511,8 +509,7 @@ function getInvoicesForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
@@ -627,8 +624,7 @@ function createInvoice($authentication, $invoice)
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_invoice->id,
             		'ref'=>$new_invoice->ref, 'ref_ext'=>$new_invoice->ref_ext);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -707,14 +703,12 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 					}
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -724,8 +718,7 @@ function createInvoiceFromOrder($authentication, $id_order = '', $ref_order = ''
 	{
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
-	else
-	{
+	else {
 		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref, 'ref_ext'=>$newobject->ref_ext);
 	}
 
@@ -785,7 +778,7 @@ function updateInvoice($authentication, $invoice)
 					{
 						// Define output language
 						$outputlangs = $langs;
-						$object->generateDocument($object->modelpdf, $outputlangs);
+						$object->generateDocument($object->model_pdf, $outputlangs);
 					}
 				}
 				if ($invoice['status'] == Facture::STATUS_CLOSED)
diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php
index 0b22ea9aab6..98c9be86cfc 100644
--- a/htdocs/webservices/server_order.php
+++ b/htdocs/webservices/server_order.php
@@ -473,15 +473,13 @@ function getOrder($authentication, $id = '', $ref = '', $ref_ext = '')
 					));
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND';
                 $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED';
             $errorlabel = 'User does not have permission for this request';
@@ -640,8 +638,7 @@ function getOrdersForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
@@ -786,8 +783,7 @@ function createOrder($authentication, $order)
 			$db->commit();
 			$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
 		}
-		else
-		{
+		else {
 			dol_syslog("Webservice server_order:: order creation or validation failed, rollback", LOG_ERR);
 			$db->rollback();
 			$error++;
@@ -846,26 +842,23 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 				{
 					// Define output language
 					$outputlangs = $langs;
-					$order->generateDocument($order->modelpdf, $outputlangs);
+					$order->generateDocument($order->model_pdf, $outputlangs);
 				}
-				else
-				{
+				else {
 					$db->rollback();
 					$error++;
 					$errorcode = 'KO';
 					$errorlabel = $order->error;
 				}
 			}
-			else
-			{
+			else {
 				$db->rollback();
 				$error++;
 				$errorcode = 'KO';
 				$errorlabel = $order->error;
 			}
 		}
-		else
-		{
+		else {
 			$db->rollback();
 			$error++;
 			$errorcode = 'KO';
@@ -877,8 +870,7 @@ function validOrder($authentication, $id = '', $id_warehouse = 0)
 	{
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 	}
-	else
-	{
+	else {
 		$db->commit();
 		$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
 	}
@@ -937,7 +929,7 @@ function updateOrder($authentication, $order)
 					{
 						// Define output language
 						$outputlangs = $langs;
-						$object->generateDocument($order->modelpdf, $outputlangs);
+						$object->generateDocument($order->model_pdf, $outputlangs);
 					}
 				}
 				if ($order['status'] == 0)  $result = $object->set_reopen($fuser);
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 4ae702ade15..71ee78d3c4d 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -304,8 +304,7 @@ function getDocument($authentication, $modulepart, $file, $refname = '')
 					'document'=>$objectret
 				);
 			}
-			else
-			{
+			else {
 				dol_syslog("File doesn't exist ".$original_file);
 				$errorcode = 'NOT_FOUND';
 				$errorlabel = '';
diff --git a/htdocs/webservices/server_payment.php b/htdocs/webservices/server_payment.php
index 38dab505bac..5145c4a3b7b 100644
--- a/htdocs/webservices/server_payment.php
+++ b/htdocs/webservices/server_payment.php
@@ -197,8 +197,7 @@ function createPayment($authentication, $payment)
             $db->commit();
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$new_payment->id);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php
index 61bdd03c023..bf29795f0de 100644
--- a/htdocs/webservices/server_productorservice.php
+++ b/htdocs/webservices/server_productorservice.php
@@ -450,14 +450,12 @@ function getProductOrService($authentication, $id = '', $ref = '', $ref_ext = ''
 			        'product'=>$productorservice_result_fields
                 );
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -505,7 +503,7 @@ function createProductOrService($authentication, $product)
 
     if ($product['barcode'] && !$product['barcode_type'])
     {
-        $errror++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
+        $error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
     }
 
 
@@ -595,7 +593,7 @@ function createProductOrService($authentication, $product)
 
 				if ($savstockreal != $getstockreal)
 				{
-					$warehouse = new Entrepot($this->db);
+					$warehouse = new Entrepot($db);
 					$warehouse->fetch(0, $product['warehouse_ref']);
 					if ($warehouse->id > 0)
 					{
@@ -613,8 +611,7 @@ function createProductOrService($authentication, $product)
 							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
 					}
-					else
-					{
+					else {
 						$error++;
 						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
@@ -627,8 +624,7 @@ function createProductOrService($authentication, $product)
             $db->commit();
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -679,7 +675,7 @@ function updateProductOrService($authentication, $product)
 
     if ($product['barcode'] && !$product['barcode_type'])
     {
-        $errror++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
+        $error++; $errorcode = 'KO'; $errorlabel = "You must set a barcode type when setting a barcode.";
     }
 
     if (!$error)
@@ -754,8 +750,7 @@ function updateProductOrService($authentication, $product)
         {
             $error++;
         }
-        else
-		{
+        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))
 			{
@@ -767,7 +762,7 @@ function updateProductOrService($authentication, $product)
 
 				if ($savstockreal != $getstockreal)
 				{
-					$warehouse = new Entrepot($this->db);
+					$warehouse = new Entrepot($db);
 					$warehouse->fetch(0, $product['warehouse_ref']);
 					if ($warehouse->id > 0)
 					{
@@ -785,8 +780,7 @@ function updateProductOrService($authentication, $product)
 							$newobject->error = 'You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
 					}
-					else
-					{
+					else {
 						$error++;
 						$newobject->error = 'You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
 					}
@@ -819,8 +813,7 @@ function updateProductOrService($authentication, $product)
             $db->commit();
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
-        else
-		{
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -848,8 +841,6 @@ function deleteProductOrService($authentication, $listofidstring)
 {
     global $db, $conf, $langs;
 
-    $now = dol_now();
-
     dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
 
     if ($authentication['entity']) $conf->entity = $authentication['entity'];
@@ -890,8 +881,7 @@ function deleteProductOrService($authentication, $listofidstring)
 		        $firsterror = 'Product or service with id '.$id.' not found';
 		        break;
 	        }
-	        else
-			{
+	        else {
 		        $result = $newobject->delete($user);
 		        if ($result <= 0)
 		        {
@@ -910,8 +900,7 @@ function deleteProductOrService($authentication, $listofidstring)
             //$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
 	    }
-	    else
-	    {
+	    else {
 	    	$db->rollback();
 	        $error++;
 	        $errorcode = 'KO';
@@ -945,8 +934,6 @@ function getListOfProductsOrServices($authentication, $filterproduct)
 {
     global $db, $conf, $langs;
 
-    $now = dol_now();
-
     dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
 
     if ($authentication['entity']) $conf->entity = $authentication['entity'];
@@ -983,8 +970,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
          		$i++;
          	}
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = $db->lasterrno();
             $errorlabel = $db->lasterror();
@@ -997,9 +983,7 @@ function getListOfProductsOrServices($authentication, $filterproduct)
 			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
         	'products'=>$arrayproducts
         );
-    }
-    else
-    {
+    } else {
         $objectresp = array(
 			'result'=>array('result_code' => 'OK', 'result_label' => ''),
         	'products'=>$arrayproducts
@@ -1139,21 +1123,18 @@ function getProductsForCategory($authentication, $id, $lang = '')
 					'products'=> $products
 					);
 				}
-				else
-				{
+				else {
 					$errorcode = 'NORECORDS_FOR_ASSOCIATION'; $errorlabel = 'No products associated'.$sql;
 					$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 					dol_syslog("getProductsForCategory:: ".$errorcode, LOG_DEBUG);
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_project.php b/htdocs/webservices/server_project.php
index 5bbaaaf035a..dc8fc81db2c 100644
--- a/htdocs/webservices/server_project.php
+++ b/htdocs/webservices/server_project.php
@@ -298,8 +298,7 @@ function createProject($authentication, $project)
                     $error++;
                 }
             }
-            else
-            {
+            else {
                 $error++;
             }
 
@@ -308,16 +307,14 @@ function createProject($authentication, $project)
                 $db->commit();
                 $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
             }
-            else
-            {
+            else {
                 $db->rollback();
                 $error++;
                 $errorcode = 'KO';
                 $errorlabel = $newobject->error;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -424,14 +421,12 @@ function getProject($authentication, $id = '', $ref = '')
                     'project'=>$project_result_fields
                 );
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 78a00ced40e..ecf2c51fd1f 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -303,14 +303,12 @@ function getSupplierInvoice($authentication, $id = '', $ref = '', $ref_ext = '')
 
 			    ));
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -441,8 +439,7 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 
 			);
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno(); $errorlabel = $db->lasterror();
 		}
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index d69b481323e..1e9f8355d52 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -378,14 +378,12 @@ function getThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'thirdparty'=>$thirdparty_result_fields);
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -515,8 +513,7 @@ function createThirdParty($authentication, $thirdparty)
 
             $objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'id'=>$newobject->id, 'ref'=>$newobject->ref);
         }
-        else
-        {
+        else {
             $db->rollback();
             $error++;
             $errorcode = 'KO';
@@ -750,8 +747,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
                 $i++;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = $db->lasterrno();
             $errorlabel = $db->lasterror();
@@ -765,8 +761,7 @@ function getListOfThirdParties($authentication, $filterthirdparty)
             'thirdparties'=>$arraythirdparties
         );
     }
-    else
-    {
+    else {
         $objectresp = array(
             'result'=>array('result_code' => 'OK', 'result_label' => ''),
             'thirdparties'=>$arraythirdparties
@@ -828,8 +823,7 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 
 					$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>''));
 				}
-				else
-				{
+				else {
 					$db->rollback();
 					$error++;
 					$errorcode = 'KO';
@@ -837,14 +831,12 @@ function deleteThirdParty($authentication, $id = '', $ref = '', $ref_ext = '')
 					dol_syslog("Function: deleteThirdParty cant delete");
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php
index 8793d2f02fa..000bad4b563 100644
--- a/htdocs/webservices/server_user.php
+++ b/htdocs/webservices/server_user.php
@@ -372,14 +372,12 @@ function getUser($authentication, $id, $ref = '', $ref_ext = '')
                     )
                 );
             }
-            else
-            {
+            else {
                 $error++;
                 $errorcode = 'NOT_FOUND'; $errorlabel = 'Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
         }
-        else
-        {
+        else {
             $error++;
             $errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
         }
@@ -426,8 +424,7 @@ function getListOfGroups($authentication)
 		{
 			$sql .= " WHERE g.entity IS NOT NULL";
 		}
-		else
-		{
+		else {
 			$sql .= " WHERE g.entity IN (0,".$conf->entity.")";
 		}
 		$sql .= " GROUP BY g.rowid, g.nom, g.entity, g.datec";
@@ -444,8 +441,7 @@ function getListOfGroups($authentication)
 				$i++;
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = $db->lasterrno();
 			$errorlabel = $db->lasterror();
@@ -459,8 +455,7 @@ function getListOfGroups($authentication)
 		'groups'=>$arraygroups
 		);
 	}
-	else
-	{
+	else {
 		$objectresp = array(
 		'result'=>array('result_code' => 'OK', 'result_label' => ''),
 		'groups'=>$arraygroups
@@ -526,8 +521,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 					$error++;
 					$errorcode = 'ALREADY_EXIST'; $errorlabel = 'Object not create : company or contact exists '.$thirdpartywithuser['email'];
 				}
-				else
-				{
+				else {
 					$db->begin();
 					/*
 					 * Company creation
@@ -546,7 +540,7 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 					$sql = "SELECT rowid";
 					$sql .= " FROM ".MAIN_DB_PREFIX."c_country";
 					$sql .= " WHERE active = 1";
-					$sql .= " AND code='".$thirdparty->country_code."'";
+					$sql .= " AND code='".$db->escape($thirdparty->country_code)."'";
 
 					$resql = $db->query($sql);
 					if ($resql)
@@ -633,14 +627,12 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 								if ($thirdpartywithuser['group_id'] > 0)
 									$edituser->SetInGroup($thirdpartywithuser['group_id'], $conf->entity);
 							}
-							else
-							{
+							else {
 								$error++;
 								$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$edituser->error;
 							}
 						}
-						else
-						{
+						else {
 							$error++;
 							$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create : '.$contact->error;
 						}
@@ -650,23 +642,17 @@ function createUserFromThirdparty($authentication, $thirdpartywithuser)
 							$objectresp = array('result'=>array('result_code'=>'OK', 'result_label'=>'SUCCESS'), 'id'=>$socid_return);
 							$error = 0;
 						}
-					}
-					else
-					{
+					} else {
 						$error++;
 						$errors = ($thirdparty->error ? array($thirdparty->error) : $thirdparty->errors);
 					}
 				}
-			}
-			else
-			{
+			} else {
 				// retour creation KO
 				$error++;
 				$errorcode = 'NOT_CREATE'; $errorlabel = 'Object not create';
 			}
-		}
-		else
-		{
+		} else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
@@ -732,20 +718,17 @@ function setUserPassword($authentication, $shortuser)
 						'groups'=>$arraygroups
 					);
 				}
-				else
-				{
+				else {
 					$error++;
 					$errorcode = 'NOT_MODIFIED'; $errorlabel = 'Error when changing password';
 				}
 			}
-			else
-			{
+			else {
 				$error++;
 				$errorcode = 'NOT_FOUND'; $errorlabel = 'User not found';
 			}
 		}
-		else
-		{
+		else {
 			$error++;
 			$errorcode = 'PERMISSION_DENIED'; $errorlabel = 'User does not have permission for this request';
 		}
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index dc80f2301b4..768ddbdb19c 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -111,6 +111,11 @@ class Website extends CommonObject
 	 */
 	public $use_manifest;
 
+	/**
+	 * @var int
+	 */
+	public $position;
+
 	/**
 	 * List of containers
 	 *
@@ -201,6 +206,7 @@ class Website extends CommonObject
 		$sql .= 'virtualhost,';
 		$sql .= 'fk_user_creat,';
 		$sql .= 'date_creation,';
+		$sql .= 'position,';
 		$sql .= 'tms';
 		$sql .= ') VALUES (';
 		$sql .= ' '.((empty($this->entity) && $this->entity != '0') ? 'NULL' : $this->entity).',';
@@ -213,6 +219,7 @@ class Website extends CommonObject
 		$sql .= ' '.(!isset($this->virtualhost) ? 'NULL' : "'".$this->db->escape($this->virtualhost)."'").",";
 		$sql .= ' '.(!isset($this->fk_user_creat) ? $user->id : $this->fk_user_creat).',';
 		$sql .= ' '.(!isset($this->date_creation) || dol_strlen($this->date_creation) == 0 ? 'NULL' : "'".$this->db->idate($this->date_creation)."'").",";
+		$sql .= ' '.((int) $this->position).",";
 		$sql .= ' '.(!isset($this->date_modification) || dol_strlen($this->date_modification) == 0 ? 'NULL' : "'".$this->db->idate($this->date_modification)."'");
 		$sql .= ')';
 
@@ -283,6 +290,7 @@ class Website extends CommonObject
 		$sql .= ' t.rowid,';
 		$sql .= " t.entity,";
 		$sql .= " t.ref,";
+		$sql .= " t.position,";
 		$sql .= " t.description,";
 		$sql .= " t.lang,";
 		$sql .= " t.otherlang,";
@@ -312,6 +320,7 @@ class Website extends CommonObject
 
 				$this->entity = $obj->entity;
 				$this->ref = $obj->ref;
+				$this->position = $obj->position;
 				$this->description = $obj->description;
 				$this->lang = $obj->lang;
 				$this->otherlang = $obj->otherlang;
@@ -621,7 +630,7 @@ class Website extends CommonObject
 	 */
 	public function createFromClone($user, $fromid, $newref, $newlang = '')
 	{
-        global $conf;
+        global $conf, $langs;
 		global $dolibarr_main_data_root;
 
 		$now = dol_now();
@@ -663,12 +672,16 @@ class Website extends CommonObject
 		$object->virtualhost = '';
 		$object->date_creation = $now;
 		$object->fk_user_creat = $user->id;
+		$object->position = ((int) $object->position) + 1;
+		$object->status = self::STATUS_DRAFT;
+		if (empty($object->lang)) $object->lang = substr($langs->defaultlang, 0, 2); // Should not happen. Protection for corrupted site with no languages
 
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
 		$result = $object->create($user);
 		if ($result < 0) {
 			$error++;
+			$this->error = $object->error;
 			$this->errors = $object->errors;
 			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 		}
@@ -728,8 +741,7 @@ class Website extends CommonObject
 						$newidforhome = $objectpagenew->id;
 					}
 				}
-				else
-				{
+				else {
 					setEventMessages($objectpageold->error, $objectpageold->errors, 'errors');
 					$error++;
 				}
@@ -1090,8 +1102,7 @@ class Website extends CommonObject
 		{
 			return $filename;
 		}
-		else
-		{
+		else {
 			global $errormsg;
 			$this->error = $errormsg;
 			return '';
@@ -1264,8 +1275,7 @@ class Website extends CommonObject
 			$this->db->rollback();
 			return -1;
 		}
-		else
-		{
+		else {
 			$this->db->commit();
 			return $object->id;
 		}
@@ -1342,9 +1352,7 @@ class Website extends CommonObject
 		if ($error)
 		{
 			return -1;
-		}
-		else
-		{
+		} else {
 			return $num;
 		}
 	}
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index eb707e3010d..d92c8690094 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2020 	   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
@@ -51,8 +52,8 @@ class WebsitePage extends CommonObject
 
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_website;
 
 	public $pageurl;
@@ -104,6 +105,15 @@ class WebsitePage extends CommonObject
 	 */
 	public $author_alias;
 
+   	/**
+   	 * @var string path of external object
+   	 */
+	public $object_type;
+
+	/**
+	 * @var string id of external object
+	 */
+	public $fk_object;
 
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
@@ -135,25 +145,25 @@ class WebsitePage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-     */
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
 	public $fields = array(
-	    'rowid'          =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'rowid'          =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
 		'pageurl'        =>array('type'=>'varchar(16)', 'label'=>'WEBSITE_PAGENAME', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Ref/alias of page'),
 		'aliasalt'       =>array('type'=>'varchar(255)', 'label'=>'AliasAlt', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>0, 'position'=>11, 'searchall'=>0, 'comment'=>'Alias alternative of page'),
 		'type_container' =>array('type'=>'varchar(16)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>0, 'position'=>12, 'comment'=>'Type of container'),
 		'title'          =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'help'=>'UseTextBetween5And70Chars'),
-	    'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
+		'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
 		'image'          =>array('type'=>'varchar(255)', 'label'=>'Image', 'enabled'=>1, 'visible'=>1, 'position'=>32, 'searchall'=>0, 'help'=>'Relative path of media. Used if Type is "blogpost"'),
 		'keywords'       =>array('type'=>'varchar(255)', 'label'=>'Keywords', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
 		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'notnull'=>-1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
-	    'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
-	    'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),
-	    'htmlheader'     =>array('type'=>'text', 'label'=>'HtmlHeader', 'enabled'=>1, 'visible'=>0, 'position'=>50, 'searchall'=>0),
-	    'content'        =>array('type'=>'mediumtext', 'label'=>'Content', 'enabled'=>1, 'visible'=>0, 'position'=>51, 'searchall'=>0),
+		'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
+		'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),
+		'htmlheader'     =>array('type'=>'text', 'label'=>'HtmlHeader', 'enabled'=>1, 'visible'=>0, 'position'=>50, 'searchall'=>0),
+		'content'        =>array('type'=>'mediumtext', 'label'=>'Content', 'enabled'=>1, 'visible'=>0, 'position'=>51, 'searchall'=>0),
 		'grabbed_from'   =>array('type'=>'varchar(255)', 'label'=>'GrabbedFrom', 'enabled'=>1, 'visible'=>1, 'index'=>1, 'position'=>400, 'comment'=>'URL page content was grabbed from'),
-	    'date_creation'  =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
+		'date_creation'  =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
 		'tms'            =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>501),
 		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateValidation',     'enabled'=>1, 'visible'=>-1, 'position'=>502),
 		'fk_user_creat'  =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>true, 'position'=>510),
@@ -161,6 +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'=>1, 'position'=>46, 'searchall'=>0, 'help'=>''),
+		'fk_object' => array('type' => 'varchar(255)','label' => 'ObjectId', 'enabled'=>1, 'visible'=>1, 'position'=>47, 'searchall'=>0, 'help'=>'')
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -260,7 +272,9 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_user_creat,";
 		$sql .= " t.author_alias,";
 		$sql .= " t.fk_user_modif,";
-		$sql .= " t.import_key";
+		$sql .= " t.import_key,";
+		$sql .= " t.object_type,";
+		$sql .= " t.fk_object";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		//$sql .= ' WHERE entity IN ('.getEntity('website').')';       // entity is on website level
 		$sql .= ' WHERE 1 = 1';
@@ -268,26 +282,25 @@ class WebsitePage extends CommonObject
 		{
 			$sql .= ' AND t.rowid = '.$id;
 		}
-		else
-		{
+		else {
 			if ($id < 0) $sql .= ' AND t.rowid <> '.abs($id);
 			if (null !== $website_id) {
-			    $sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
-			    if ($page) {
-			    	$pagetouse = $page;
-			    	$langtouse = '';
-			    	$tmppage = explode('/', $page);
-			    	if (!empty($tmppage[1])) {
-			    		$pagetouse = $tmppage[1];
-			    		if (strlen($tmppage[0])) $langtouse = $tmppage[0];
-			    	}
-			    	$sql .= " AND t.pageurl = '".$this->db->escape($pagetouse)."'";
-			    	if ($langtouse) $sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
-			    }
-			    if ($aliasalt)	$sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
+				$sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
+				if ($page) {
+					$pagetouse = $page;
+					$langtouse = '';
+					$tmppage = explode('/', $page);
+					if (!empty($tmppage[1])) {
+						$pagetouse = $tmppage[1];
+						if (strlen($tmppage[0])) $langtouse = $tmppage[0];
+					}
+					$sql .= " AND t.pageurl = '".$this->db->escape($pagetouse)."'";
+					if ($langtouse) $sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
+				}
+				if ($aliasalt)	$sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
 			}
 		}
-        $sql .= $this->db->plimit(1);
+		$sql .= $this->db->plimit(1);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -320,6 +333,8 @@ class WebsitePage extends CommonObject
 				$this->author_alias = $obj->author_alias;
 				$this->fk_user_modif = $obj->fk_user_modif;
 				$this->import_key = $obj->import_key;
+				$this->object_type = $obj->object_type;
+				$this->fk_object = $obj->fk_object;
 			}
 			$this->db->free($resql);
 
@@ -375,7 +390,9 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_user_creat,";
 		$sql .= " t.author_alias,";
 		$sql .= " t.fk_user_modif,";
-		$sql .= " t.import_key";
+		$sql .= " t.import_key,";
+		$sql .= " t.object_type,";
+		$sql .= " t.fk_object";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.fk_website = '.$websiteid;
 		// Manage filter
@@ -383,13 +400,13 @@ class WebsitePage extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid' || $key == 't.fk_website' || $key == 'status') {
-					$sqlwhere[] = $key.'='.$value;
+					$sqlwhere[] = $key.' = '.$value;
 				} elseif ($key == 'type_container') {
-					$sqlwhere[] = $key."='".$value."'";
+					$sqlwhere[] = $key." = '".$this->db->escape($value)."'";
 				} elseif ($key == 'lang' || $key == 't.lang') {
 					$listoflang = array();
 					$foundnull = 0;
-					foreach(explode(',', $value) as $tmpvalue) {
+					foreach (explode(',', $value) as $tmpvalue) {
 						if ($tmpvalue == 'null') {
 							$foundnull++;
 							continue;
@@ -444,6 +461,8 @@ class WebsitePage extends CommonObject
 				$record->author_alias = $obj->author_alias;
 				$record->fk_user_modif = $obj->fk_user_modif;
 				$record->import_key = $obj->import_key;
+				$record->object_type = $obj->object_type;
+				$record->fk_object = $obj->fk_object;
 				//var_dump($record->id);
 				$records[$record->id] = $record;
 			}
@@ -600,7 +619,7 @@ class WebsitePage extends CommonObject
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			return 1;
 		} else {
 			return -1;
@@ -693,43 +712,43 @@ class WebsitePage extends CommonObject
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	integer	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("Page").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
-        $label .= '<b>'.$langs->trans('ID').':</b> '.$this->id.'<br>';
-        $label .= '<b>'.$langs->trans('Title').':</b> '.$this->title.'<br>';
-        $label .= '<b>'.$langs->trans('Language').':</b> '.$this->lang;
+		$label = '<u>'.$langs->trans("Page").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
+		$label .= '<b>'.$langs->trans('ID').':</b> '.$this->id.'<br>';
+		$label .= '<b>'.$langs->trans('Title').':</b> '.$this->title.'<br>';
+		$label .= '<b>'.$langs->trans('Language').':</b> '.$this->lang;
 
-        $url = DOL_URL_ROOT.'/website/index.php?websiteid='.$this->fk_website.'&pageid='.$this->id;
+		$url = DOL_URL_ROOT.'/website/index.php?websiteid='.$this->fk_website.'&pageid='.$this->id;
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		}
+		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		//$linkstart = $linkend = '';
@@ -753,7 +772,7 @@ class WebsitePage extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -763,7 +782,7 @@ class WebsitePage extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
@@ -782,6 +801,21 @@ class WebsitePage extends CommonObject
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
+	/**
+	 * Sets object to given categories.
+	 *
+	 * Deletes object from existing categories not supplied.
+	 * Adds it to non existing supplied categories.
+	 * Existing categories are left untouch.
+	 *
+	 * @param 	int[]|int 	$categories 	Category ID or array of Categories IDs
+	 * @return	int							<0 if KO, >0 if OK
+	 */
+	public function setCategories($categories)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		return $this->setCategoriesCommon($categories, Categorie::TYPE_WEBSITE_PAGE);
+	}
 
 	/**
 	 * Initialise object with example values
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 9c769d45fbe..9f213b3d63a 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2016-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2020 	   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
@@ -39,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formwebsite.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 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.'/categories/class/categorie.class.php';
 
 $langs->loadLangs(array("admin", "other", "website", "errors"));
 
@@ -58,7 +60,7 @@ $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choi
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'websitelist'; // 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')
 
@@ -104,10 +106,10 @@ if (empty($action)) $action = 'preview';
 $object = new Website($db);
 $objectpage = new WebsitePage($db);
 
-$object->fetchAll(); // Init $object->records with list of websites
+$object->fetchAll('ASC', 'position'); // Init $object->records with list of websites
 
 // If website not defined, we take first found
-if (!($websiteid > 0) && empty($websitekey))
+if (!($websiteid > 0) && empty($websitekey) && $action != 'createsite')
 {
 	foreach ($object->records as $key => $valwebsite)
 	{
@@ -128,10 +130,10 @@ if ($pageid < 0) $pageid = 0;
 if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 {
 	$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref);
-    if ($res == 0)
-    {
-        $res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
-    }
+	if ($res == 0)
+	{
+		$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
+	}
 
 	// Check if pageid is inside the new website, if not we reset param pageid
 	if ($res >= 0 && $object->id > 0)
@@ -143,20 +145,19 @@ if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 				$res = $objectpage->fetch($object->fk_default_home, $object->id, ''); // We search first page of web site
 				if ($res > 0) $pageid = $object->fk_default_home;
 			}
-			else
-			{
+			else {
 				$res = $objectpage->fetch(0, $object->id, ''); // We search first page of web site
 				if ($res == 0)	// Page was not found, we reset it
 				{
 					$objectpage = new WebsitePage($db);
 				}
-				else			// We found a page, we set pageid to it.
+				else // We found a page, we set pageid to it.
 				{
 					$pageid = $objectpage->id;
 				}
 			}
 		}
-		else	// We have a valid page. We force pageid for the case we got the page with a fetch on ref.
+		else // We have a valid page. We force pageid for the case we got the page with a fetch on ref.
 		{
 			$pageid = $objectpage->id;
 		}
@@ -278,10 +279,17 @@ if (empty($sortfield)) {
 	}
 }
 
-$searchkey = GETPOST('searchstring', 'none');
+$searchkey = GETPOST('searchstring', 'restricthtml');
 
 if ($action == 'replacesiteconfirm') {
-	$listofpages = getPagesFromSearchCriterias('', $algo, $searchkey, 1000, $sortfield, $sortorder);
+	$containertype = GETPOST('optioncontainertype', 'aZ09') != '-1' ? GETPOST('optioncontainertype', 'aZ09') : '';
+	$langcode = GETPOST('optionlanguage', 'aZ09');
+	$otherfilters = array();
+	if (GETPOST('optioncategory', 'int') > 0) {
+		$otherfilters['category'] = GETPOST('optioncategory', 'int');
+	}
+
+	$listofpages = getPagesFromSearchCriterias($containertype, $algo, $searchkey, 1000, $sortfield, $sortorder, $langcode, $otherfilters, -1);
 }
 
 $usercanedit = $user->rights->website->write;
@@ -295,28 +303,28 @@ $permissiontodelete = $user->rights->website->delete;
 // Protections
 if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
 {
-    $action = 'preview'; // To avoid to make an action on another page or another site when we click on button to select another site or page.
+	$action = 'preview'; // To avoid to make an action on another page or another site when we click on button to select another site or page.
 }
 if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha'))		// If we change the site, we reset the pageid and cancel addsite action.
 {
-    if ($action == 'addsite') $action = 'preview';
-    if ($action == 'updatesource') $action = 'preview';
+	if ($action == 'addsite') $action = 'preview';
+	if ($action == 'updatesource') $action = 'preview';
 
-    $pageid = $object->fk_default_home;
-    if (empty($pageid))
-    {
-    	$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-    	if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
-    	$atleastonepage = (is_array($array) && count($array) > 0);
+	$pageid = $object->fk_default_home;
+	if (empty($pageid))
+	{
+		$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
+		if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+		$atleastonepage = (is_array($array) && count($array) > 0);
 
-    	$firstpageid = 0; $homepageid = 0;
-    	foreach ($array as $key => $valpage)
-    	{
-    		if (empty($firstpageid)) $firstpageid = $valpage->id;
-    		if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
-    	}
-    	$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
-    }
+		$firstpageid = 0; $homepageid = 0;
+		foreach ($array as $key => $valpage)
+		{
+			if (empty($firstpageid)) $firstpageid = $valpage->id;
+			if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
+		}
+		$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
+	}
 }
 if (GETPOST('refreshpage', 'alpha') && !in_array($action, array('updatecss'))) $action = 'preview';
 
@@ -380,6 +388,46 @@ if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && !$searc
 	$massaction = '';
 }
 
+// Set category
+if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $usercanedit)
+{
+	$error = 0;
+	$nbupdate = 0;
+
+	$db->begin();
+
+	$categoryid = GETPOST('setcategory', 'restricthtml');
+	if ($categoryid > 0) {
+		$tmpwebsitepage = new WebsitePage($db);
+		$category = new Categorie($db);
+		$category->fetch($categoryid);
+
+		foreach ($toselect as $tmpid) {
+			$tmpwebsitepage->id = $tmpid;
+			$result = $category->add_type($tmpwebsitepage, 'website_page');
+			if ($result < 0 && $result != -3) {
+				$error++;
+				setEventMessages($category->error, $category->errors, 'errors');
+				break;
+			} else {
+				$nbupdate++;
+			}
+		}
+	}
+
+	if ($error) {
+		$db->rollback();
+	} else {
+		if ($nbupdate) {
+			setEventMessages($langs->trans("RecordsModified", $nbupdate), null, 'mesgs');
+		}
+
+		$db->commit();
+	}
+	// Now we reload list
+	$listofpages = getPagesFromSearchCriterias($containertype, $algo, $searchkey, 1000, $sortfield, $sortorder, $langcode, $otherfilters, -1);
+}
+
 // Replacement of string into pages
 if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha'))
 {
@@ -438,8 +486,15 @@ if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha'))
 			setEventMessages($langs->trans("ReplacementDoneInXPages", $nbreplacement), null, 'mesgs');
 		}
 
+		$containertype = GETPOST('optioncontainertype', 'aZ09') != '-1' ? GETPOST('optioncontainertype', 'aZ09') : '';
+		$langcode = GETPOST('optionlanguage', 'aZ09');
+		$otherfilters = array();
+		if (GETPOST('optioncategory', 'int') > 0) {
+			$otherfilters['category'] = GETPOST('optioncategory', 'int');
+		}
+
 		// Now we reload list
-		$listofpages = getPagesFromSearchCriterias('', $algo, $searchkey, 1000, $sortfield, $sortorder);
+		$listofpages = getPagesFromSearchCriterias($containertype, $algo, $searchkey, 1000, $sortfield, $sortorder, $langcode, $otherfilters);
 	}
 }
 
@@ -474,9 +529,9 @@ if ($action == 'addsite')
 	$db->begin();
 
 	if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
-    {
-        $error++;
-        setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
+	{
+		$error++;
+		setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
 	}
 
 	if (!$error && !GETPOST('WEBSITE_REF', 'alpha'))
@@ -523,8 +578,7 @@ if ($action == 'addsite')
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$tmpobject->ref);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		$action = 'createsite';
 	}
@@ -618,8 +672,7 @@ if ($action == 'addcontainer')
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['http_code'], null, 'errors');
 				$action = 'createcontainer';
 			}
-			else
-			{
+			else {
 				// Remove comments
 				$tmp['content'] = removeHtmlComment($tmp['content']);
 
@@ -707,8 +760,7 @@ if ($action == 'addcontainer')
 					{
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 					}
-					else
-					{
+					else {
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
@@ -776,8 +828,7 @@ if ($action == 'addcontainer')
 					{
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 					}
-					else
-					{
+					else {
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
@@ -812,8 +863,7 @@ if ($action == 'addcontainer')
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
 						$action = 'createcontainer';
 					}
-					else
-					{
+					else {
 						// Clean some comment
 						//$tmpgeturl['content'] = dol_string_is_good_iso($tmpgeturl['content'], 1);
 						//$tmpgeturl['content'] = utf8_encode(utf8_decode($tmpgeturl['content']));
@@ -880,9 +930,7 @@ if ($action == 'addcontainer')
 				$objectpage->grabbed_from = $urltograb;
 			}
 		}
-	}
-	else
-	{
+	} else {
 		$objectpage->title = str_replace(array('<', '>'), '', GETPOST('WEBSITE_TITLE', 'alphanohtml'));
 		$objectpage->type_container = GETPOST('WEBSITE_TYPE_CONTAINER', 'aZ09');
 		$objectpage->pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
@@ -894,7 +942,8 @@ if ($action == 'addcontainer')
 		$objectpage->keywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
 		$objectpage->htmlheader = GETPOST('htmlheader', 'none');
 		$objectpage->author_alias = GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml');
-
+		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS');
+		$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID');
 		$substitutionarray = array();
 		$substitutionarray['__WEBSITE_CREATE_BY__'] = $user->getFullName($langs);
 
@@ -940,23 +989,35 @@ if ($action == 'addcontainer')
 			setEventMessages($objectpage->error, $objectpage->errors, 'errors');
 			$action = 'createcontainer';
 		}
-		else {
-			// If there is no home page yet, this new page will be set as the home page
-			if (empty($object->fk_default_home)) {
-				$object->fk_default_home = $pageid;
-				$res = $object->update($user);
-				if ($res <= 0)
-				{
-					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				} else {
-					$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
+	}
 
-					// Generate the index.php page (to be the home page) and wrapper.php file
-					$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
+	if (!$error) {
+		// Website categories association
+		$categoriesarray = GETPOST('categories', 'array');
+		$result = $objectpage->setCategories($categoriesarray);
+		if ($result < 0)
+		{
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 
-					if ($result <= 0) setEventMessages('Failed to write file '.$fileindex, null, 'errors');
-				}
+	if (!$error) {
+		// If there is no home page yet, this new page will be set as the home page
+		if (empty($object->fk_default_home)) {
+			$object->fk_default_home = $pageid;
+			$res = $object->update($user);
+			if ($res <= 0)
+			{
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
+
+				// Generate the index.php page (to be the home page) and wrapper.php file
+				$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
+
+				if ($result <= 0) setEventMessages('Failed to write file '.$fileindex, null, 'errors');
 			}
 		}
 	}
@@ -981,8 +1042,7 @@ if ($action == 'addcontainer')
 			{
 				setEventMessages($langs->trans("Saved"), null, 'mesgs');
 			}
-			else
-			{
+			else {
 				setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 				$action = 'createcontainer';
 			}
@@ -994,8 +1054,7 @@ if ($action == 'addcontainer')
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action = '';
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 
@@ -1106,8 +1165,7 @@ if ($action == 'confirm_deletesite' && $confirm == 'yes')
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -1122,7 +1180,7 @@ if (GETPOSTISSET('pageid') && $action == 'delete' && $permissiontodelete) {
 	$res = $object->fetch(0, $websitekey);
 	$website = $object;
 
-	$res = $objectpage->fetch($pageid, $object->fk_website);
+	$res = $objectpage->fetch($pageid, $object->id);
 
 	if ($res > 0)
 	{
@@ -1142,8 +1200,7 @@ if (GETPOSTISSET('pageid') && $action == 'delete' && $permissiontodelete) {
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey);
 		exit;
 	}
-	else
-	{
+	else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -1213,8 +1270,7 @@ if ($action == 'updatecss')
 	{
 		$action = 'editcss';
 	}
-	else
-	{
+	else {
 		$res = $object->fetch(0, $websitekey);
 		$website = $object;
 
@@ -1222,54 +1278,54 @@ if ($action == 'updatecss')
 		{
 			$tmpvirtualhost = preg_replace('/\/$/', '', GETPOST('virtualhost', 'alpha'));
 			if ($tmpvirtualhost && !preg_match('/^http/', $tmpvirtualhost))
-    		{
-    		    $error++;
-    		    setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
-    		    $action = 'editcss';
-    		}
+			{
+				$error++;
+				setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
+				$action = 'editcss';
+			}
 
-    		if (!$error)
-    		{
-    			$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
-    			foreach ($arrayotherlang as $key => $val) {
-    				$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
-    			}
+			if (!$error)
+			{
+				$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
+				foreach ($arrayotherlang as $key => $val) {
+					$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
+				}
 
-    			$object->virtualhost = $tmpvirtualhost;
-    		    $object->lang = GETPOST('WEBSITE_LANG', 'aZ09');
-    		    $object->otherlang = join(',', $arrayotherlang);
-    		    $object->use_manifest = GETPOST('use_manifest', 'alpha');
+				$object->virtualhost = $tmpvirtualhost;
+				$object->lang = GETPOST('WEBSITE_LANG', 'aZ09');
+				$object->otherlang = join(',', $arrayotherlang);
+				$object->use_manifest = GETPOST('use_manifest', 'alpha');
 
-    		    $result = $object->update($user);
-        		if ($result < 0)
-        		{
-        		    $error++;
-        		    setEventMessages($object->error, $object->errors, 'errors');
-        		    $action = 'editcss';
-        		}
-    		}
+				$result = $object->update($user);
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+					$action = 'editcss';
+				}
+			}
 		}
 
 		if (!$error)
 		{
-    		// Save master.inc.php file
-    		dol_syslog("Save master file ".$filemaster);
+			// Save master.inc.php file
+			dol_syslog("Save master file ".$filemaster);
 
-    		dol_mkdir($pathofwebsite);
+			dol_mkdir($pathofwebsite);
 
-    		// Now generate the master.inc.php page
-    		$result = dolSaveMasterFile($filemaster);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filemaster, null, 'errors');
-    		}
+			// Now generate the master.inc.php page
+			$result = dolSaveMasterFile($filemaster);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+			}
 
 
-    		// Html header file
-    		$htmlheadercontent = '';
+			// Html header file
+			$htmlheadercontent = '';
 
-    		/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
+			/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
     	    $htmlheadercontent.= "<?php // BEGIN PHP\n";
     	    $htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
     	    $htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
@@ -1279,84 +1335,84 @@ if ($action == 'updatecss')
     	    // $htmlheadercontent.= "header('Content-type: text/html');\n";		// Not required. htmlheader.html is never call as a standalone page
     	    $htmlheadercontent.= "// END PHP ?>\n";*/
 
-    		$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
+			$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
 
-    		/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
+			/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
     	    $htmlheadercontent.= "// END PHP ?>"."\n";*/
 
-    		$htmlheadercontent = trim($htmlheadercontent)."\n";
+			$htmlheadercontent = trim($htmlheadercontent)."\n";
 
-    		$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
-    		}
+			$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
+			}
 
 
-    		// Css file
-    		$csscontent = '';
+			// Css file
+			$csscontent = '';
 
-    		$csscontent .= "<?php // BEGIN PHP\n";
-    		$csscontent .= '$websitekey=basename(__DIR__);'."\n";
-    		$csscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-    		$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$csscontent .= "ob_start();\n";
-    		$csscontent .= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
-    		$csscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$csscontent .= "header('Content-type: text/css');\n";
-    		$csscontent .= "}\n";
-    		$csscontent .= "// END PHP ?>\n";
+			$csscontent .= "<?php // BEGIN PHP\n";
+			$csscontent .= '$websitekey=basename(__DIR__);'."\n";
+			$csscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+			$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$csscontent .= "ob_start();\n";
+			$csscontent .= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
+			$csscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$csscontent .= "header('Content-type: text/css');\n";
+			$csscontent .= "}\n";
+			$csscontent .= "// END PHP ?>\n";
 
-    		$csscontent .= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
+			$csscontent .= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
 
-    		$csscontent .= '<?php // BEGIN PHP'."\n";
-    		$csscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
-    		$csscontent .= "// END PHP ?>\n";
+			$csscontent .= '<?php // BEGIN PHP'."\n";
+			$csscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
+			$csscontent .= "// END PHP ?>\n";
 
-    		dol_syslog("Save css content into ".$filecss);
+			dol_syslog("Save css content into ".$filecss);
 
-    		$result = dolSaveCssFile($filecss, $csscontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filecss, null, 'errors');
-    		}
+			$result = dolSaveCssFile($filecss, $csscontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filecss, null, 'errors');
+			}
 
 
-    		// Js file
-    		$jscontent = '';
+			// Js file
+			$jscontent = '';
 
-    		$jscontent .= "<?php // BEGIN PHP\n";
-    		$jscontent .= '$websitekey=basename(__DIR__);'."\n";
-    		$jscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-    		$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$jscontent .= "ob_start();\n";
-    		$jscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$jscontent .= "header('Content-type: application/javascript');\n";
-    		$jscontent .= "// END PHP ?>\n";
+			$jscontent .= "<?php // BEGIN PHP\n";
+			$jscontent .= '$websitekey=basename(__DIR__);'."\n";
+			$jscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+			$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$jscontent .= "ob_start();\n";
+			$jscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$jscontent .= "header('Content-type: application/javascript');\n";
+			$jscontent .= "// END PHP ?>\n";
 
-    		$jscontent .= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
+			$jscontent .= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
 
-    		$jscontent .= '<?php // BEGIN PHP'."\n";
-    		$jscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
-    		$jscontent .= "// END PHP ?>\n";
+			$jscontent .= '<?php // BEGIN PHP'."\n";
+			$jscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
+			$jscontent .= "// END PHP ?>\n";
 
-    		$result = dolSaveJsFile($filejs, $jscontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filejs, null, 'errors');
-    		}
+			$result = dolSaveJsFile($filejs, $jscontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filejs, null, 'errors');
+			}
 
 
-    		// Robot file
-    		$robotcontent = '';
+			// Robot file
+			$robotcontent = '';
 
-    		/*$robotcontent.= "<?php // BEGIN PHP\n";
+			/*$robotcontent.= "<?php // BEGIN PHP\n";
     	    $robotcontent.= '$websitekey=basename(__DIR__);'."\n";
     	    $robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
     	    $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
@@ -1366,63 +1422,63 @@ if ($action == 'updatecss')
     	    $robotcontent.= "header('Content-type: text/css');\n";
     	    $robotcontent.= "// END PHP ?>\n";*/
 
-    		$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'none'))."\n";
+			$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'restricthtml'))."\n";
 
-    		/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
+			/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
     	    $robotcontent.= "// END PHP ?>"."\n";*/
 
-    		$result = dolSaveRobotFile($filerobot, $robotcontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
-    		}
+			$result = dolSaveRobotFile($filerobot, $robotcontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filerobot, null, 'errors');
+			}
 
 
-    		// Htaccess file
-    		$htaccesscontent = '';
-    		$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'none'))."\n";
+			// Htaccess file
+			$htaccesscontent = '';
+			$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'restricthtml'))."\n";
 
-    		$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
-    		}
+			$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
+			}
 
 
-       		// manifest.json file
-       		$manifestjsoncontent = '';
+	   		// manifest.json file
+	   		$manifestjsoncontent = '';
 
-       		$manifestjsoncontent .= "<?php // BEGIN PHP\n";
-       		$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
-       		$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-       		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-       		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-       		$manifestjsoncontent .= "ob_start();\n";
-       		$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-       		$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
-       		$manifestjsoncontent .= "// END PHP ?>\n";
+	   		$manifestjsoncontent .= "<?php // BEGIN PHP\n";
+	   		$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
+	   		$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+	   		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+	   		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+	   		$manifestjsoncontent .= "ob_start();\n";
+	   		$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+	   		$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
+	   		$manifestjsoncontent .= "// END PHP ?>\n";
 
-       		$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
+	   		$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
 
-       		$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
-       		$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
-       		$manifestjsoncontent .= "// END PHP ?>\n";
+	   		$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
+	   		$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+	   		$manifestjsoncontent .= "// END PHP ?>\n";
 
-       		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
-       		if (!$result)
-       		{
-       			$error++;
-       			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
-       		}
+	   		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+	   		if (!$result)
+	   		{
+	   			$error++;
+	   			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
+	   		}
 
 
-       		// README.md file
-       		$readmecontent = '';
+	   		// README.md file
+	   		$readmecontent = '';
 
-       		/*$readmecontent.= "<?php // BEGIN PHP\n";
+	   		/*$readmecontent.= "<?php // BEGIN PHP\n";
        		$readmecontent.= '$websitekey=basename(__DIR__);'."\n";
        		$readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
        		$readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
@@ -1432,43 +1488,42 @@ if ($action == 'updatecss')
        		$readmecontent.= "header('Content-type: application/manifest+json');\n";
        		$readmecontent.= "// END PHP ?>\n";*/
 
-       		$readmecontent .= trim(GETPOST('WEBSITE_README', 'none'))."\n";
+	   		$readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
 
-       		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
+	   		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
        		$readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
        		$readmecontent.= "// END PHP ?>"."\n";*/
 
-       		$result = dolSaveReadme($filereadme, $readmecontent);
-       		if (!$result)
-       		{
-       			$error++;
-       			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
-       		}
+	   		$result = dolSaveReadme($filereadme, $readmecontent);
+	   		if (!$result)
+	   		{
+	   			$error++;
+	   			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
+	   		}
 
 
-       		// Save wrapper.php
+	   		// Save wrapper.php
 			$result = dolSaveIndexPage($pathofwebsite, '', '', $filewrapper);
 
 
-    		// Message if no error
-    		if (!$error)
-    		{
-    			setEventMessages($langs->trans("Saved"), null, 'mesgs');
-    		}
+			// Message if no error
+			if (!$error)
+			{
+				setEventMessages($langs->trans("Saved"), null, 'mesgs');
+			}
 
-    		if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
-    		{
-    			$action = 'preview';
-    			if ($backtopage)
-	    		{
-	    			header("Location: ".$backtopage);
-	    			exit;
-	    		}
-    		}
-    		else
-    		{
-    			$action = 'editcss';
-    		}
+			if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
+			{
+				$action = 'preview';
+				if ($backtopage)
+				{
+					header("Location: ".$backtopage);
+					exit;
+				}
+			}
+			else {
+				$action = 'editcss';
+			}
 		}
 	}
 }
@@ -1502,8 +1557,7 @@ if ($action == 'setashome')
 
 		$action = 'preview';
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 }
@@ -1605,6 +1659,8 @@ if ($action == 'updatemeta')
 		$objectpage->htmlheader = trim(GETPOST('htmlheader', 'none'));
 		$objectpage->fk_page = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
 		$objectpage->author_alias = trim(GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml'));
+		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS', 'alpha');
+		$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID', 'aZ09');
 
 		$newdatecreation = dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
 		if ($newdatecreation) $objectpage->date_creation = $newdatecreation;
@@ -1620,8 +1676,7 @@ if ($action == 'updatemeta')
 				setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists"), null, 'errors');
 				$action = 'editmeta';
 			}
-			else
-			{
+			else {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($objectpage->error, $objectpage->errors, 'errors');
@@ -1630,12 +1685,22 @@ if ($action == 'updatemeta')
 		}
 	}
 
+	if (!$error) {
+		// Website categories association
+		$categoriesarray = GETPOST('categories', 'array');
+		$result = $objectpage->setCategories($categoriesarray);
+		if ($result < 0)
+		{
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
 	if (!$error)
 	{
 		$db->commit();
 	}
-	else
-	{
+	else {
 		$db->rollback();
 	}
 
@@ -1706,13 +1771,11 @@ if ($action == 'updatemeta')
 				//exit;
 				$action = 'preview';
 			}
-			else
-			{
+			else {
 				$action = 'editmeta';
 			}
 		}
-		else
-		{
+		else {
 			setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
    			//exit;
@@ -1734,6 +1797,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 		$objectnew = new Website($db);
 		$result = $objectnew->createFromClone($user, GETPOST('id', 'int'), GETPOST('siteref', 'aZ09'), (GETPOST('newlang', 'aZ09') ?GETPOST('newlang', 'aZ09') : ''));
+
 		if ($result < 0)
 		{
 			$error++;
@@ -1742,8 +1806,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 			$db->rollback();
 		}
-		else
-		{
+		else {
 			$object = $objectnew;
 			$id = $object->id;
 			$pageid = $object->fk_default_home;
@@ -1785,8 +1848,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 				$tmpwebsite->fetch($newwebsiteid);
 				$pathofwebsitenew = $dolibarr_main_data_root.'/website/'.$tmpwebsite->ref;
 			}
-			else
-			{
+			else {
 				$tmpwebsite = $object;
 			}
 
@@ -1799,9 +1861,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 				$action = 'createpagefromclone';
 
 				$db->rollback();
-			}
-			else
-			{
+			} else {
 				$filetpl = $pathofwebsitenew.'/page'.$resultpage->id.'.tpl.php';
 				$fileindex = $pathofwebsitenew.'/index.php';
 				$filewrapper = $pathofwebsitenew.'/wrapper.php';
@@ -1849,8 +1909,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 		{
 			$res = $objectpage->fetch($pageid);
 		}
-		else
-		{
+		else {
 			$res = 0;
 			if ($object->fk_default_home > 0)
 			{
@@ -1873,35 +1932,35 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 			$objectpage->content = GETPOST('PAGE_CONTENT', 'none');
 
-            // Security analysis
+			// Security analysis
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 			//print dol_escape_htmltag($phpfullcodestring);exit;
-            $forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open");
-            if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
-            {
-                $forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
-            }
-            foreach ($forbiddenphpcommands as $forbiddenphpcommand)
-            {
-                if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
-                {
-                    $error++;
-                    setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
-                }
-            }
+			$forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open");
+			if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
+			{
+				$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
+			}
+			foreach ($forbiddenphpcommands as $forbiddenphpcommand)
+			{
+				if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
+				{
+					$error++;
+					setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
+					if ($action == 'updatesource') $action = 'editsource';
+					if ($action == 'updatecontent') $action = 'editcontent';
+				}
+			}
 
-            if (empty($user->rights->website->writephp))
-            {
-                if ($phpfullcodestringold != $phpfullcodestring)
-                {
-                    $error++;
-                    setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
-                }
-            }
+			if (empty($user->rights->website->writephp))
+			{
+				if ($phpfullcodestringold != $phpfullcodestring)
+				{
+					$error++;
+					setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
+					if ($action == 'updatesource') $action = 'editsource';
+					if ($action == 'updatecontent') $action = 'editcontent';
+				}
+			}
 
 			// Clean data. We remove all the head section.
 			$objectpage->content = preg_replace('/<head>.*<\/head>/ims', '', $objectpage->content);
@@ -1960,41 +2019,29 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 							header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 							exit;
 						}
-					}
-					else
-					{
+					} else {
 						if ($action == 'updatesource') $action = 'editsource';
 						if ($action == 'updatecontent') $action = 'editcontent';
 					}
-				}
-				else
-				{
+				} else {
 					setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 					header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 	   				exit;
 				}
-			}
-			else
-			{
+			} else {
 				$db->rollback();
 			}
-		}
-		else
-		{
+		} else {
 			header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 			exit;
 		}
-	}
-	else
-	{
+	} else {
 		if (!$error)
 		{
 			if (empty($websitekey) || $websitekey == '-1')
 			{
 				setEventMessages($langs->trans("NoWebSiteCreateOneFirst"), null, 'warnings');
-			}
-			else
-			{
+			} else {
 				setEventMessages($langs->trans("NoPageYet"), null, 'warnings');
 				setEventMessages($langs->trans("YouCanCreatePageOrImportTemplate"), null, 'warnings');
 			}
@@ -2018,8 +2065,7 @@ if ($action == 'exportsite')
 		readfile($fileofzip);
 		exit;
 	}
-	else
-	{
+	else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'preview';
 	}
@@ -2033,9 +2079,7 @@ if ($action == 'regeneratesite')
 	{
 		setEventMessages($langs->trans("PagesRegenerated", $result), null, 'mesgs');
 		$action = 'preview';
-	}
-	else
-	{
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'preview';
 	}
@@ -2049,8 +2093,7 @@ if ($action == 'importsiteconfirm')
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 		$action = 'importsite';
 	}
-	else
-	{
+	else {
 		if (!empty($_FILES) || GETPOSTISSET('templateuserfile'))
 		{
 			// Check symlink to medias and restore it if ko
@@ -2119,8 +2162,7 @@ if ($action == 'importsiteconfirm')
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'importsite';
 				}
-				else
-				{
+				else {
 					// Force mode dynamic on
 					dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1, 'chaine', 0, '', $conf->entity);
 
@@ -2144,7 +2186,7 @@ $formadmin = new FormAdmin($db);
 $formwebsite = new FormWebsite($db);
 $formother = new FormOther($db);
 
-$help_url = '';
+$helpurl = 'EN:Module_Website|FR:Module_Website_FR|ES:M&oacute;dulo_Website';
 
 $arrayofjs = array(
 	'/includes/ace/src/ace.js',
@@ -2166,7 +2208,7 @@ $moreheadjs .= '<script type="text/javascript">'."\n";
 $moreheadjs .= 'var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
 $moreheadjs .= '</script>'."\n";
 
-llxHeader($moreheadcss.$moreheadjs, $langs->trans("WebsiteSetup"), $help_url, '', 0, 0, $arrayofjs, $arrayofcss, '', '', '<!-- Begin div class="fiche" -->'."\n".'<div class="fichebutwithotherclass">');
+llxHeader($moreheadcss.$moreheadjs, $langs->trans("WebsiteSetup"), $helpurl, '', 0, 0, $arrayofjs, $arrayofcss, '', '', '<!-- Begin div class="fiche" -->'."\n".'<div class="fichebutwithotherclass">');
 
 print "\n";
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
@@ -2238,46 +2280,6 @@ if (!GETPOST('hide_websitemenu'))
 	$disabled = '';
 	if (empty($user->rights->website->write)) $disabled = ' disabled="disabled"';
 
-	//var_dump($objectpage);exit;
-	print '<div class="centpercent websitebar">';
-
-
-	// ***** Part for web sites
-	print '<!-- Bar for website -->';
-	print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
-	print $langs->trans("Website").' : ';
-	print '</span>';
-
-	print '<span class="websiteselection hideonsmartphoneimp">';
-	print '<a href="'.$_SERVER["PHP_SEFL"].'?action=createsite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("AddWebsite")).'"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"><span></a>';
-	//print ' <input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'" name="createsite">';
-	print '</span>';
-
-	// List of website
-	print '<span class="websiteselection">';
-	$out = '';
-	$out .= '<select name="website" class="minwidth100 maxwidth300 maxwidth150onsmartphone" id="website">';
-	if (empty($object->records)) $out .= '<option value="-1">&nbsp;</option>';
-	// Loop on each sites
-	$i = 0;
-	foreach ($object->records as $key => $valwebsite)
-	{
-		if (empty($websitekey)) $websitekey = $valwebsite->ref;
-
-		$out .= '<option value="'.$valwebsite->ref.'"';
-		if ($websitekey == $valwebsite->ref) $out .= ' selected'; // To preselect a value
-		$out .= '>';
-		$out .= $valwebsite->ref;
-		$out .= '</option>';
-		$i++;
-	}
-	$out .= '</select>';
-	$out .= ajax_combobox('website');
-	print $out;
-	//print '<input type="submit" class="button" name="refreshsite" value="'.$langs->trans("Load").'">';
-	print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshsite" value="'.$langs->trans("Load").'">';
-
-
 	if ($websitekey)
 	{
 		$virtualurl = '';
@@ -2294,66 +2296,129 @@ if (!GETPOST('hide_websitemenu'))
 	if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
 	$atleastonepage = (is_array($array) && count($array) > 0);
 
-	if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
-	{
-		print ' &nbsp; ';
 
-		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
+	//var_dump($objectpage);exit;
+	print '<div class="centpercent websitebar">';
 
-		$importlabel = $langs->trans("ImportSite");
-		$exportlabel = $langs->trans("ExportSite");
-		if (! empty($conf->dol_optimize_smallscreen)) {
-			$importlabel = $langs->trans("Import");
-			$exportlabel = $langs->trans("Export");
+	//
+	// Toolbar for websites
+	//
+
+	print '<!-- Bar for website -->';
+	if ($action != 'file_manager') {
+		print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
+		print $langs->trans("Website").' : ';
+		print '</span>';
+
+		$urltocreatenewwebsite = $_SERVER["PHP_SEFL"].'?action=createsite';
+		if (empty($conf->use_javascript_ajax)) {
+			print '<span class="websiteselection hideonsmartphoneimp">';
+			print '<a href="'.$urltocreatenewwebsite.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("AddWebsite")).'"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"><span></a>';
+			print '</span>';
 		}
 
-		if ($atleastonepage)
+		// List of website
+		print '<span class="websiteselection">';
+		$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)) {
+			$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>';
+		}
+		// Loop on each sites
+		$i = 0;
+		foreach ($object->records as $key => $valwebsite)
 		{
-			print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
+			if (empty($websitekey)) {
+				if ($action != 'createsite') $websitekey = $valwebsite->ref;
+			}
+
+			$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>':'');
+			$out .= ' data-html="'.dol_escape_htmltag($outoption).'"';
+			$out .= '>';
+			$out .= $valwebsite->ref;
+			$out .= '</option>';
+			$i++;
 		}
-		else
+		$out .= '</select>';
+		$out .= ajax_combobox('website');
+
+		if (!empty($conf->use_javascript_ajax)) {
+			$out .= '<script language="javascript">';
+			$out .= 'jQuery(document).ready(function () {';
+			$out .= '	jQuery("#website").change(function () {';
+			$out .= '   	console.log("We select "+jQuery("#website option:selected").val());';
+			$out .= '   	if (jQuery("#website option:selected").val() == \'-2\') {';
+			$out .= '  			window.location.href = "'.$urltocreatenewwebsite.'";';
+			$out .= '		} else {';
+			$out .= '  			window.location.href = "'.$_SERVER["PHP_SEFL"].'?website="+jQuery("#website option:selected").val();';
+			$out .= '       }';
+			$out .= '   });';
+			$out .= '});';
+			$out .= '</script>';
+		}
+		print $out;
+
+		if (empty($conf->use_javascript_ajax)) {
+			print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshsite" value="'.$langs->trans("Load").'">';
+		}
+
+		if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
 		{
-			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
-		}
+			print ' &nbsp; ';
 
-		//print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
-		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($exportlabel).'" name="exportsite">';
-		print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';
+			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
 
-		print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage ? ' disabled="disabled"' : '').'>';
+			$importlabel = $langs->trans("ImportSite");
+			$exportlabel = $langs->trans("ExportSite");
+			if (! empty($conf->dol_optimize_smallscreen)) {
+				$importlabel = $langs->trans("Import");
+				$exportlabel = $langs->trans("Export");
+			}
 
-		print ' &nbsp; ';
+			if ($atleastonepage)
+			{
+				print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
+			}
+			else {
+				print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
+			}
 
-		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 '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
-		/*print '<a class="button button_file_manager"'.$disabled.'>'.dol_escape_htmltag($langs->trans("MediaFiles")).'</a>';
-		print '<script language="javascript">
-			jQuery(document).ready(function () {
-           		jQuery(".button_file_manager").click(function () {
-					var $dialog = $(\'<div></div>\').html(\'<iframe style="border: 0px;" src="'.DOL_URL_ROOT.'/website/index.php?hide_websitemenu=1&dol_hide_topmenu=1&dol_hide_leftmenu=1&file_manager=1&website='.$websitekey.'&pageid='.$pageid.'" width="100%" height="100%"></iframe>\')
-					.dialog({
-						autoOpen: false,
-						modal: true,
-						height: 500,
-						width: \'80%\',
-						title: "'.dol_escape_js($langs->trans("FileManager")).'"
-					});
-					$dialog.dialog(\'open\');
-				});
-			});
-			</script>';
-		*/
+			//print '<input type="submit" class="button"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditMenu")).'" name="editmenu">';
+			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($exportlabel).'" name="exportsite">';
+			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';
+
+			print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage ? ' disabled="disabled"' : '').'>';
+
+			print ' &nbsp; ';
+
+			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
 
-		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
-		if (! empty($conf->global->WEBSITE_ADD_REGENERATE_BUTTON)) {
 			print '<a href="'.$_SERVER["PHP_SEFL"].'?action=regeneratesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="fa fa-cogs"><span></a>';
 		}
+
+		print '</span>';
+
+		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>';
+
+			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);
+			}
+
+			print '</span>';
+		}
+	} else {
+		print '<input type="hidden" name="website" id="website" value="'.$websitekey.'">';
 	}
 
-	print '</span>';
-
-
-	// Toolbar for websites
 
 	print '<span class="websitetools websiteselection">';
 
@@ -2364,35 +2429,33 @@ if (!GETPOST('hide_websitemenu'))
 
 		print '<span class="websiteinputurl valignmiddle" id="websiteinputurl">';
 		$linktotestonwebserver = '<a href="'.($virtualurl ? $virtualurl : '#').'" class="valignmiddle">';
-		$linktotestonwebserver .= '<span class="hideonsmartphone">'.$langs->trans("TestDeployOnWeb", $virtualurl).' </span>'.img_picto('', 'globe');
+		$linktotestonwebserver .= '<span class="hideonsmartphone paddingrightonly">'.$langs->trans("TestDeployOnWeb", $virtualurl).'</span>'.img_picto('', 'globe');
 		$linktotestonwebserver .= '</a>';
 		$htmltext = '';
 		if (empty($object->fk_default_home))
 		{
-		    $htmltext .= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
+			$htmltext .= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
 		}
 		elseif (empty($virtualurl))
 		{
-		    //$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
+			//$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
 		}
-		else
-		{
-		    $htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
+		else {
+			$htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
 		if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
 		{
-		    $htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
+			$htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
 		}
-		else
-		{
-    		$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
-    		$htmltext .= '<br>';
-    		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-    		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+		else {
+			$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
+			$htmltext .= '<br>';
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
-    		$examplewithapache = '#php_admin_value open_basedir /tmp/:'.DOL_DOCUMENT_ROOT.':'.DOL_DATA_ROOT.':/dev/urandom'."\n";
-    		$examplewithapache .= '<Directory "'.DOL_DOCUMENT_ROOT.'">'."\n";
-    		$examplewithapache .= 'AllowOverride FileInfo Options
+			$examplewithapache = '#php_admin_value open_basedir /tmp/:'.DOL_DOCUMENT_ROOT.':'.DOL_DATA_ROOT.':/dev/urandom'."\n";
+			$examplewithapache .= '<Directory "'.DOL_DOCUMENT_ROOT.'">'."\n";
+			$examplewithapache .= 'AllowOverride FileInfo Options
     		Options       -Indexes -MultiViews -FollowSymLinks -ExecCGI
     		Require all granted
     		</Directory>
@@ -2407,14 +2470,14 @@ if (!GETPOST('hide_websitemenu'))
     		Require all granted
     		</Directory>';
 
-    		$htmltext .= '<br>'.$langs->trans("ExampleToUseInApacheVirtualHostConfig").':<br>';
-    		$htmltext .= '<div class="centpercent exampleapachesetup">'.dol_nl2br(dol_escape_htmltag($examplewithapache, 1, 1)).'</div>';
+			$htmltext .= '<br>'.$langs->trans("ExampleToUseInApacheVirtualHostConfig").':<br>';
+			$htmltext .= '<div class="centpercent exampleapachesetup">'.dol_nl2br(dol_escape_htmltag($examplewithapache, 1, 1)).'</div>';
 
-    		$htmltext .= '<br>';
-    		$htmltext .= $langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
-    		$htmltext .= '<br>';
-    		$htmltext .= '<br>';
-    		$htmltext .= $langs->trans("YouCanAlsoDeployToAnotherWHP");
+			$htmltext .= '<br>';
+			$htmltext .= $langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
+			$htmltext .= '<br>';
+			$htmltext .= '<br>';
+			$htmltext .= $langs->trans("YouCanAlsoDeployToAnotherWHP");
 		}
 		print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 3, 'helpvirtualhost');
 		print '</span>';
@@ -2430,8 +2493,10 @@ if (!GETPOST('hide_websitemenu'))
 
 	print '</span>';
 
-
+	//
 	// Toolbar for pages
+	//
+
 	if ($websitekey && $websitekey != '-1' && !in_array($action, array('editcss', 'editmenu', 'importsite', 'file_manager', 'replacesite', 'replacesiteconfirm')) && !$file_manager)
 	{
 		print '</div>'; // Close current websitebar to open a new one
@@ -2444,7 +2509,6 @@ if (!GETPOST('hide_websitemenu'))
 		print '</span>';
 
 		print '<span class="websiteselection hideonsmartphoneimp">';
-		//print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'" name="createcontainer">';
 		print '<a href="'.$_SERVER["PHP_SEFL"].'?action=createcontainer&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("AddPage")).'"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"><span></a>';
 		print '</span>';
 
@@ -2452,10 +2516,30 @@ if (!GETPOST('hide_websitemenu'))
 
 		if ($action != 'addcontainer')
 		{
-			print '<span class="websiteselection">'.$formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone').'</span>';
+			print '<span class="websiteselection">';
+			print $formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone');
+			print '</span>';
+
+			$urltocreatenewpage = $_SERVER["PHP_SEFL"].'?action=createcontainer&website='.$website->ref;
+
+			$out = '';
+			if (!empty($conf->use_javascript_ajax)) {
+				$out .= '<script language="javascript">';
+				$out .= 'jQuery(document).ready(function () {';
+				$out .= '	jQuery("#pageid").change(function () {';
+				$out .= '   	console.log("We select "+jQuery("#pageid option:selected").val());';
+				$out .= '   	if (jQuery("#pgeid option:selected").val() == \'-2\') {';
+				$out .= '  			window.location.href = "'.$urltocreatenewpage.'";';
+				$out .= '		} else {';
+				$out .= '  			window.location.href = "'.$_SERVER["PHP_SEFL"].'?website='.$website->ref.'&pageid="+jQuery("#pageid option:selected").val();';
+				$out .= '       }';
+				$out .= '   });';
+				$out .= '});';
+				$out .= '</script>';
+			}
+			print $out;
 		}
-		else
-		{
+		else {
 			print $langs->trans("New");
 		}
 
@@ -2556,11 +2640,11 @@ if (!GETPOST('hide_websitemenu'))
 					$textifempty = 1;
 					$formquestion = array(
 						array('type' => 'hidden', 'name' => 'sourcepageurl', 'value'=> $objectpage->pageurl),
-						array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0),
-						array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 0, 1, 0, $onlylang, 1)),
-						array('type' => 'other', 'name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
+						array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'newwebsite', 'label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0)),
 						array('type' => 'text', 'tdclass'=>'maxwidth200 fieldrequired', 'name' => 'newtitle', 'label'=> $langs->trans("WEBSITE_TITLE"), 'value'=> $langs->trans("CopyOf").' '.$objectpage->title),
 						array('type' => 'text', 'tdclass'=>'maxwidth200', 'name' => 'newpageurl', 'label'=> $langs->trans("WEBSITE_PAGENAME"), 'value'=> ''),
+						array('type' => 'checkbox', 'tdclass'=>'maxwidth200', 'name' => 'is_a_translation', 'label' => $langs->trans("PageIsANewTranslation"), 'value' => 0, 'morecss'=>'margintoponly'),
+						array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 0, 1, 0, $onlylang, 1)),
 					);
 
 				   	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
@@ -2633,16 +2717,14 @@ if (!GETPOST('hide_websitemenu'))
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'" value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					print '<a class="nobordertransp opacitymedium nohoverborder marginleftonlyshort"'.$disabled.' href="#" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'">'.img_picto($langs->trans("OnlyEditionOfSourceForGrabbedContent"), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
-				else
-				{
+				else {
 					//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					if (empty($conf->global->WEBSITE_EDITINLINE))
 					{
-						print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=seteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
+						print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=seteditinline&token='.newToken().'">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
-					else
-					{
-						print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
+					else {
+						print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline&token='.newToken().'">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
 				}
 
@@ -2651,11 +2733,10 @@ if (!GETPOST('hide_websitemenu'))
 				print $langs->trans("ShowSubcontainers");
 				if (empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
 				{
-					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
+					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
-				else
-				{
-					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
+				else {
+					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
 				/*}*/
 				print '</div>';
@@ -2669,11 +2750,10 @@ if (!GETPOST('hide_websitemenu'))
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 					print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
 				}
-				else
-				{
+				else {
 					//$disabled='';
 					//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
-					print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
+					print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&token='.newToken().'&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
 				}
 				print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("ClonePage")).'" name="createpagefromclone">';
 				print '<input type="submit" class="buttonDelete bordertransp" name="delete" value="'.$langs->trans("Delete").'"'.($atleastonepage ? '' : ' disabled="disabled"').'>';
@@ -2738,15 +2818,14 @@ if (!GETPOST('hide_websitemenu'))
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource2", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourceMore", $url);
 			$htmltext .= '<br>';
-            if ($conf->browser->layout == 'phone')
-            {
-                print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
-            }
-            else
-            {
-            	//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
-            	print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
-            }
+			if ($conf->browser->layout == 'phone')
+			{
+				print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
+			}
+			else {
+				//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
+				print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
+			}
 		}
 		print '</span>'; // end websitehelp
 
@@ -2827,8 +2906,7 @@ if ($action == 'editcss')
 		// Clean the php css file to remove php code and get only css part
 		$csscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $csscontent);
 	}
-	else
-	{
+	else {
 		$csscontent = GETPOST('WEBSITE_CSS_INLINE', 'none');
 	}
 	if (!trim($csscontent)) {
@@ -2841,8 +2919,7 @@ if ($action == 'editcss')
 		// Clean the php js file to remove php code and get only js part
 		$jscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $jscontent);
 	}
-	else
-	{
+	else {
 		$jscontent = GETPOST('WEBSITE_JS_INLINE', 'none');
 	}
 	if (!trim($jscontent)) $jscontent = '/* JS content (all pages) */'."\n";
@@ -2853,8 +2930,7 @@ if ($action == 'editcss')
 		// Clean the php htmlheader file to remove php code and get only html part
 		$htmlheadercontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htmlheadercontent);
 	}
-	else
-	{
+	else {
 		$htmlheadercontent = GETPOST('WEBSITE_HTML_HEADER', 'none');
 	}
 	if (!trim($htmlheadercontent))
@@ -2863,8 +2939,7 @@ if ($action == 'editcss')
 		$htmlheadercontent .= $htmlheadercontentdefault;
 		$htmlheadercontent .= "</html>";
 	}
-	else
-	{
+	else {
 		$htmlheadercontent = preg_replace('/^\s*<html>/ims', '', $htmlheadercontent);
 		$htmlheadercontent = preg_replace('/<\/html>\s*$/ims', '', $htmlheadercontent);
 		$htmlheadercontent = '<html>'."\n".trim($htmlheadercontent)."\n".'</html>';
@@ -2876,8 +2951,7 @@ if ($action == 'editcss')
 		// Clean the php htmlheader file to remove php code and get only html part
 		$robotcontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $robotcontent);
 	}
-	else
-	{
+	else {
 		$robotcontent = GETPOST('WEBSITE_ROBOT', 'nothtml');
 	}
 	if (!trim($robotcontent))
@@ -2894,8 +2968,7 @@ if ($action == 'editcss')
 		// Clean the php htaccesscontent file to remove php code and get only html part
 		$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htaccesscontent);
 	}
-	else
-	{
+	else {
 		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');
 	}
 	if (!trim($htaccesscontent))
@@ -2911,9 +2984,8 @@ if ($action == 'editcss')
 		// Clean the manifestjson file to remove php code and get only html part
 		$manifestjsoncontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $manifestjsoncontent);
 	}
-	else
-	{
-		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'none');
+	else {
+		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'restricthtml');
 	}
 	if (!trim($manifestjsoncontent))
 	{
@@ -2926,8 +2998,7 @@ if ($action == 'editcss')
 		// Clean the readme file to remove php code and get only html part
 		$readmecontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $readmecontent);
 	}
-	else
-	{
+	else {
 		$readmecontent = GETPOST('WEBSITE_README', 'none');
 	}
 	if (!trim($readmecontent))
@@ -2947,6 +3018,15 @@ if ($action == 'editcss')
 	print $websitekey;
 	print '</td></tr>';
 
+	// Status of web site
+	print '<!-- Status of website -->'."\n";
+	print '<tr><td class="fieldrequired">';
+	print $langs->trans('Status');
+	print '</td><td>';
+	print ajax_object_onoff($object, 'status', 'status', 'Enabled', 'Disabled');
+	//print dol_print_date($pagedatecreation, 'dayhour');
+	print '</td></tr>';
+
 	// Main language
 	print '<tr><td class="tdtop fieldrequired">';
 	$htmltext = '';
@@ -3108,7 +3188,7 @@ if ($action == 'createsite')
 	if (GETPOST('WEBSITE_OTHERLANG'))   $siteotherlang = GETPOST('WEBSITE_OTHERLANG', 'aZ09comma');
 
 	print '<tr><td class="titlefieldcreate fieldrequired">';
-	print $langs->trans('Ref');
+	print $form->textwithpicto($langs->trans('WebSite'), $langs->trans("Example").': www.mywebsite.com, myportal, ...');
 	print '</td><td>';
 	print '<input type="text" class="flat maxwidth300" name="WEBSITE_REF" value="'.dol_escape_htmltag($siteref).'" autofocus>';
 	print '</td></tr>';
@@ -3263,15 +3343,16 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 
 	if ($action != 'createcontainer')
 	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('IDOfPage');
+		print '<tr><td class="titlefield fieldrequired">';
+		print $langs->trans('IDOfPage').' - '.$langs->trans('InternalURLOfPage');
 		print '</td><td>';
 		print $pageid;
-		print '</td></tr>';
+		//print '</td></tr>';
 
-		print '<tr><td class="titlefield">';
-		print $langs->trans('InternalURLOfPage');
-		print '</td><td>';
+		//print '<tr><td class="titlefield fieldrequired">';
+		//print $langs->trans('InternalURLOfPage');
+		//print '</td><td>';
+		print ' &nbsp; - &nbsp; ';
 		print '/public/website/index.php?website='.urlencode($websitekey).'&pageid='.urlencode($pageid);
 		//if ($objectpage->grabbed_from) print ' - <span class="opacitymedium">'.$langs->trans('InitiallyGrabbedFrom').' '.$objectpage->grabbed_from.'</span>';
 		print '</td></tr>';
@@ -3290,10 +3371,9 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 		$pageauthorid = $objectpage->fk_user_creat;
 		$pageusermodifid = $objectpage->fk_user_modif;
 		$pageauthoralias = $objectpage->author_alias;
-		$pagestatus = $objectpage->status;
+ 		$pagestatus = $objectpage->status;
 	}
-	else
-	{
+	else {
 		$type_container = 'page';
 		$pagedatecreation = dol_now();
 		$pageauthorid = $user->id;
@@ -3310,11 +3390,23 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	if (GETPOST('WEBSITE_LANG', 'aZ09'))         $pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
 	if (GETPOST('htmlheader', 'none'))			 $pagehtmlheader = GETPOST('htmlheader', 'none');
 
+	if ($action != 'createcontainer')
+	{
+		print '<!-- Status of page -->'."\n";
+		print '<tr><td class="fieldrequired">';
+		print $langs->trans('Status');
+		print '</td><td>';
+		print ajax_object_onoff($objectpage, 'status', 'status', 'Enabled', 'Disabled');
+		//print dol_print_date($pagedatecreation, 'dayhour');
+		print '</td></tr>';
+	}
+
 	// Type of container
 	print '<tr><td class="titlefield fieldrequired">';
 	print $langs->trans('WEBSITE_TYPE_CONTAINER');
 	print '</td><td>';
-	print $formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') ?GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') : $type_container));
+	print img_picto('', 'object_technic', 'class="paddingrightonly"').' ';
+	$formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') ?GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') : $type_container));
 	print '</td></tr>';
 
 	if ($action == 'createcontainer')
@@ -3340,6 +3432,13 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '<input type="text" class="flat minwidth300" name="WEBSITE_PAGENAME" id="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($pageurl).'">';
 	print '</td></tr>';
 
+	print '<tr><td class="titlefieldcreate">';
+	$htmlhelp = $langs->trans("WEBSITE_ALIASALTDesc");
+	print $form->textwithpicto($langs->trans('WEBSITE_ALIASALT'), $htmlhelp, 1, 'help', '', 0, 2, 'aliastooltip');
+	print '</td><td>';
+	print '<input type="text" class="flat minwidth500" name="WEBSITE_ALIASALT" value="'.dol_escape_htmltag($pagealiasalt).'">';
+	print '</td></tr>';
+
 	print '<tr><td>';
 	print $langs->trans('WEBSITE_DESCRIPTION');
 	print '</td><td>';
@@ -3442,13 +3541,43 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	}
 	print '</td></tr>';
 
+	// Categories
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
+	{
+		$langs->load('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);
+			$arrayselected = array();
+			if (is_array($cats)) {
+				foreach ($cats as $cat) {
+					$arrayselected[] = $cat->id;
+				}
+			}
+
+			$cate_arbo = $form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, '', 'parent', null, null, 1);
+		}
+
+		print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('Categories', 'categories', '', $objectpage, 0).'</td><td colspan="3">';
+		print img_picto('', 'category', 'class="paddingright"').$form->multiselectarray('categories', $cate_arbo, (GETPOSTISSET('categories') ? GETPOST('categories', 'array') : $arrayselected), null, null, null, null, "90%");
+		print "</td></tr>";
+	}
+
 	print '<tr><td class="titlefieldcreate">';
-	$htmlhelp = $langs->trans("WEBSITE_ALIASALTDesc");
-	print $form->textwithpicto($langs->trans('WEBSITE_ALIASALT'), $htmlhelp, 1, 'help', '', 0, 2, 'aliastooltip');
+	print 'ObjectClass';
 	print '</td><td>';
-	print '<input type="text" class="flat minwidth300" name="WEBSITE_ALIASALT" value="'.dol_escape_htmltag($pagealiasalt).'">';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTCLASS" placeholder="ClassName::/path/class/ObjectClass.class.php" >';
 	print '</td></tr>';
 
+	print '<tr><td class="titlefieldcreate">';
+	print 'ObjectID';
+	print '</td><td>';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTID" >';
+	print '</td></tr>';
+
+
 	$fuser = new User($db);
 
 	print '<tr><td>';
@@ -3456,8 +3585,8 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '</td><td>';
 	if ($pageauthorid > 0)
 	{
-	    $fuser->fetch($pageauthorid);
-	    print $fuser->getNomUrl(1);
+		$fuser->fetch($pageauthorid);
+		print $fuser->getNomUrl(1);
 	} else {
 		print '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>';
 	}
@@ -3478,17 +3607,17 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 
 	if ($action != 'createcontainer')
 	{
-	    print '<tr><td>';
-	    print $langs->trans('UserModif');
-	    print '</td><td>';
-	    if ($pageusermodifid > 0)
-	    {
-	        $fuser->fetch($pageusermodifid);
-	        print $fuser->getNomUrl(1);
-	    }
-	    print '</td></tr>';
+		print '<tr><td>';
+		print $langs->trans('UserModif');
+		print '</td><td>';
+		if ($pageusermodifid > 0)
+		{
+			$fuser->fetch($pageusermodifid);
+			print $fuser->getNomUrl(1);
+		}
+		print '</td></tr>';
 
-	    print '<tr><td>';
+		print '<tr><td>';
 		print $langs->trans('DateModification');
 		print '</td><td>';
 		print dol_print_date($pagedatemodification, 'dayhour', 'tzuser');
@@ -3637,6 +3766,8 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 	print load_fiche_titre($langs->trans("ReplaceWebsiteContent"), '', 'search');
 
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+
 	print '<div class="tagtable">';
 
 	print '<div class="tagtr">';
@@ -3651,23 +3782,65 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print '</div>';
 
 	print '<div class="tagtr">';
-	print '<div class="tagtd paddingrightonly">';
+	print '<div class="tagtd paddingrightonly opacitymedium" style="padding-right: 10px !important">';
 	print $langs->trans("SearchString");
 	print '</div>';
 	print '<div class="tagtd">';
-
 	print '<input type="text" name="searchstring" value="'.dol_escape_htmltag($searchkey, 0, 0, '', 1).'" autofocus>';
+	print '</div>';
+	print '</div>';
+
+	print '</div>';
+
+	print '</div><div class="fichehalfleft">';
+
+	print '<div class="tagtable">';
+
+	print '<div class="tagtr">';
+	print '<div class="tagtd paddingrightonly opacitymedium" style="padding-right: 10px !important">';
+	print $langs->trans("WEBSITE_TYPE_CONTAINER");
+	print '</div>';
+	print '<div class="tagtd">';
+	print img_picto('', 'object_technic', 'class="paddingrightonly"').' ';
+	$formwebsite->selectTypeOfContainer('optioncontainertype', (GETPOST('optioncontainertype', 'alpha') ? GETPOST('optioncontainertype', 'alpha') : ''), 1);
+	print '</div>';
+	print '</div>';
+
+	print '<div class="tagtr">';
+	print '<div class="tagtd paddingrightonly opacitymedium" style="padding-right: 10px !important">';
+	print $langs->trans("Language");
+	print '</div>';
+	print '<div class="tagtd">';
+	print img_picto('', 'language', 'class="paddingrightonly"').' '.$formadmin->select_language(GETPOSTISSET('optionlanguage') ? GETPOST('optionlanguage') : '', 'optionlanguage', 0, null, '1', 0, 0, 'minwidth300', 2, 0, 0, null, 1);
+	print '</div>';
+	print '</div>';
+
+	// Categories
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
+	{
+		print '<div class="tagtr">';
+		print '<div class="tagtd paddingrightonly marginrightonly opacitymedium" style="padding-right: 10px !important">';
+		print $langs->trans("Category");
+		print '</div>';
+		print '<div class="tagtd">';
+		print img_picto('', 'category', 'class="paddingrightonly"').' '.$form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, GETPOSTISSET('optioncategory') ? GETPOST('optioncategory') : '', 'optioncategory', null, null);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+		print ajax_combobox('optioncategory');
+		print '</div>';
+		print '</div>';
+	}
+
+	print '</div>';
 
 	print '<input type="submit" class="button" name="buttonreplacesitesearch" value="'.dol_escape_htmltag($langs->trans("Search")).'">';
 
-	print '</div>';
-	print '</div>';
-
-	print '</div>';
-
+	print '</div></div>';
 
 	if ($action == 'replacesiteconfirm')
 	{
+		print '<!-- List of search result -->'."\n";
+		print '<div class="rowsearchresult clearboth">';
+
 		print '<br>';
 		print '<br>';
 
@@ -3682,22 +3855,27 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 			// List of mass actions available
 			$arrayofmassactions = array();
 			if ($user->rights->website->writephp && $searchkey) $arrayofmassactions['replace'] = $langs->trans("Replace");
-			//if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+			if ($user->rights->website->write) $arrayofmassactions['setcategory'] = $langs->trans("ClassifyInCategory");
+			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();
+
 			$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 			$massactionbutton .= '<div class="massactionother massactionreplace hidden">';
 			$massactionbutton .= $langs->trans("ReplaceString");
-			$massactionbutton .= '<input type="text" name="replacestring" value="'.dol_escape_htmltag(GETPOST('replacestring', 'none')).'">';
+			$massactionbutton .= ' <input type="text" name="replacestring" value="'.dol_escape_htmltag(GETPOST('replacestring', 'none')).'">';
+			$massactionbutton .= '</div>';
+			$massactionbutton .= '<div class="massactionother massactionsetcategory hidden">';
+			$massactionbutton .= $langs->trans("Category");
+			$massactionbutton .= ' '.$form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, GETPOSTISSET('setcategory') ? GETPOST('setcategory') : '', 'setcategory', 64, 0, 0, 0, 'minwidth300 alignstart');
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$massactionbutton .= ajax_combobox('setcategory');
 			$massactionbutton .= '</div>';
 
 			$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_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit, 1, 1, 1);
-
-			print '<!-- List of search result -->'."\n";
-			print '<div class="rowsearchresult">';
+			print_barre_liste($langs->trans("Results"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit, 1, 1, 1);
 
 			$topicmail = "WebsitePageRef";
 			$modelmail = "websitepage_send";
@@ -3710,27 +3888,39 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 			if (GETPOST('optioncontent')) $param .= '&optioncontent=content';
 			if (GETPOST('optionmeta')) $param .= '&optionmeta=meta';
 			if (GETPOST('optionsitefiles')) $param .= '&optionsitefiles=optionsitefiles';
+			if (GETPOST('optioncontainertype')) $param .= '&optioncontainertype='.GETPOST('optioncontainertype', 'aZ09');
+			if (GETPOST('optionlanguage')) $param .= '&optionlanguage='.GETPOST('optionlanguage', 'aZ09');
+			if (GETPOST('optioncategory')) $param .= '&optioncategory='.GETPOST('optioncategory', 'aZ09');
 
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
 			print getTitleFieldOfList("Type", 0, $_SERVER['PHP_SELF'], 'type_container', '', $param, '', $sortfield, $sortorder, '')."\n";
 			print getTitleFieldOfList("Page", 0, $_SERVER['PHP_SELF'], 'pageurl', '', $param, '', $sortfield, $sortorder, '')."\n";
-			//print getTitleFieldOfList("Description", 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, '')."\n";
+			print getTitleFieldOfList("Categories", 0, $_SERVER['PHP_SELF']);
+			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
+			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
 			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
 			print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 			print '</tr>';
 
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+			$c = new Categorie($db);
+
+			$totalnbwords = 0;
+
 			foreach ($listofpages['list'] as $answerrecord)
 			{
 				if (get_class($answerrecord) == 'WebsitePage')
 				{
 					print '<tr>';
 
+					// Type of container
 					print '<td class="nowraponall">'.$langs->trans("Container").' - ';
 					print $langs->trans($answerrecord->type_container); // TODO Use label of container
 					print '</td>';
 
+					// Container url and label
 					print '<td>';
 					print $answerrecord->getNomUrl(1);
 					print ' <span class="opacitymedium">('.($answerrecord->title ? $answerrecord->title : $langs->trans("NoTitle")).')</span>';
@@ -3740,24 +3930,76 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 					print '<span class="opacitymedium">'.$answerrecord->description.'</span>';
 					print '</td>';
 
+					// Categories - Tags
 					print '<td>';
+					if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
+					{
+						// Get current categories
+						$existing = $c->containing($answerrecord->id, Categorie::TYPE_WEBSITE_PAGE, 'object');
+						if (is_array($existing)) {
+							foreach ($existing as $tmpcategory) {
+								//var_dump($tmpcategory);
+								print img_object($langs->trans("Category").' : '.$tmpcategory->label, 'category', 'style="padding-left: 2px; padding-right: 2px; color: #'.($tmpcategory->color != '' ? $tmpcategory->color : '888').'"');
+							}
+						}
+					}
+					//var_dump($existing);
+					print '</td>';
+
+
 					$param = '?action=replacesiteconfirm';
 					$param .= '&websiteid='.$website->id;
-					$param .= '&optioncontent='.GETPOST('optioncontent');
-					$param .= '&optionmeta='.GETPOST('optionmeta');
-					$param .= '&optionsitefiles='.GETPOST('optionsitefiles');
-					$param .= '&searchstring='.$searchkey;
+					$param .= '&optioncontent='.GETPOST('optioncontent', 'aZ09');
+					$param .= '&optionmeta='.GETPOST('optionmeta', 'aZ09');
+					$param .= '&optionsitefiles='.GETPOST('optionsitefiles', 'aZ09');
+					$param .= '&optioncontainertype='.GETPOST('optioncontainertype', 'aZ09');
+					$param .= '&optionlanguage='.GETPOST('optionlanguage', 'aZ09');
+					$param .= '&optioncategory='.GETPOST('optioncategory', 'aZ09');
+					$param .= '&searchstring='.urlencode($searchkey);
+
+					// Language
+					print '<td>';
+					print $answerrecord->lang;
+					print '</td>';
+
+					// Number of words
+					print '<td class="center nowraponall">';
+					$textwithouthtml = dol_string_nohtmltag(dolStripPhpCode($answerrecord->content));
+					$characterMap = 'áàéèëíóúüñùç0123456789';
+					$nbofwords = str_word_count($textwithouthtml, 0, $characterMap);
+					if ($nbofwords) {
+						print $nbofwords.' '.$langs->trans("words");
+						$totalnbwords += $nbofwords;
+					}
+					print '</td>';
+
+
+					// Edit properties, HTML sources, status
+					print '<td class="tdwebsitesearchresult right nowraponall">';
+					$disabled = '';
+					$urltoedithtmlsource = $_SERVER["PHP_SELF"].'?action=editmeta&websiteid='.$website->id.'&pageid='.$answerrecord->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].$param);
+					if (empty($user->rights->website->write)) {
+						$disabled = ' disabled';
+						$urltoedithtmlsource = '';
+					}
+					print '<a class="editfielda marginleftonly marginrightonly '.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditPageMeta").'">'.img_picto($langs->trans("EditPageMeta"), 'pencil-ruler').'</a>';
+
 					$disabled = '';
 					$urltoedithtmlsource = $_SERVER["PHP_SELF"].'?action=editsource&websiteid='.$website->id.'&pageid='.$answerrecord->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].$param);
 					if (empty($user->rights->website->write)) {
 						$disabled = ' disabled';
 						$urltoedithtmlsource = '';
 					}
-					print '<a class="editfielda '.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditHTMLSource").'">'.img_picto($langs->trans("EditHTMLSource"), 'edit').'</a>';
+					print '<a class="editfielda  marginleftonly marginrightonly '.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditHTMLSource").'">'.img_picto($langs->trans("EditHTMLSource"), 'edit').'</a>';
+
+					print '<span class="marginleftonly marginrightonly"></span>'.ajax_object_onoff($answerrecord, 'status', 'status', 'Enabled', 'Disabled');
+
 					print '</td>';
 
 					// Action column
 					print '<td class="nowrap center">';
+
+					print '<!-- Status of page -->'."\n";
 					if ($massactionbutton || $massaction)
 					{
 						$selected = 0;
@@ -3767,11 +4009,10 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 					print '</td>';
 
 					print '</tr>';
-				}
-				else
-				{
+				} else {
 					print '<tr>';
 
+					// Type of container
 					print '<td>';
 					$translateofrecordtype = array(
 						'website_csscontent'=>'WEBSITE_CSS_INLINE',
@@ -3789,12 +4030,36 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 					}
 					print '</td>';
 
+					$param = '?action=replacesiteconfirm';
+					$param .= '&websiteid='.$website->id;
+					$param .= '&optioncontent='.GETPOST('optioncontent', 'aZ09');
+					$param .= '&optionmeta='.GETPOST('optionmeta', 'aZ09');
+					$param .= '&optionsitefiles='.GETPOST('optionsitefiles', 'aZ09');
+					$param .= '&optioncontainertype='.GETPOST('optioncontainertype', 'aZ09');
+					$param .= '&optionlanguage='.GETPOST('optionlanguage', 'aZ09');
+					$param .= '&optioncategory='.GETPOST('optioncategory', 'aZ09');
+					$param .= '&searchstring='.urlencode($searchkey);
+
+					// Container url and label
 					print '<td>';
-					$backtopageurl = $_SERVER["PHP_SELF"].'?action=replacesiteconfirm&searchstring='.urlencode($searchkey).'&optioncontent='.GETPOST('optioncontent', 'aZ09').'&optionmeta='.GETPOST('optionmeta', 'aZ09').'&optionsitefiles='.GETPOST('optionsitefiles', 'aZ09');
+					$backtopageurl = $_SERVER["PHP_SELF"].$param;
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=editcss&website='.$website->ref.'&backtopage='.urlencode($backtopageurl).'">'.$langs->trans("EditCss").'</a>';
 					print '</td>';
 
-					print '<td class="tdoverflow100">';
+					// Language
+					print '<td>';
+					print '</td>';
+
+					// Categories - Tags
+					print '<td>';
+					print '</td>';
+
+					// Nb of words
+					print '<td>';
+					print '</td>';
+
+					// Edit properties, HTML sources, status
+					print '<td>';
 					print '</td>';
 
 					// Action column
@@ -3804,14 +4069,53 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 					print '</tr>';
 				}
 			}
+
+			if (count($listofpages['list']) >= 2) {
+				// Total
+				print '<tr class="lite_titre">';
+
+				// Type of container
+				print '<td>';
+				print $langs->trans("Total");
+				print '</td>';
+
+				// Container url and label
+				print '<td>';
+				print '</td>';
+
+				// Language
+				print '<td>';
+				print '</td>';
+
+				// Categories - Tags
+				print '<td>';
+				print '</td>';
+
+				// Nb of words
+				print '<td class="center nowraponall">';
+				print $totalnbwords.' '.$langs->trans("words");
+				print '</td>';
+
+				// Edit properties, HTML sources, status
+				print '<td>';
+				print '</td>';
+
+				// Action column
+				print '<td class="nowrap center">';
+				print '</td>';
+
+				print '</tr>';
+			}
+
 			print '</table>';
-			print '</div></div>';
+			print '</div>';
 			print '<br>';
 		}
-		else
-		{
-			print $listofpages['message'];
+		else {
+			print '<div class="warning">'.$listofpages['message'].'</div>';
 		}
+
+		print '</div>';
 	}
 
 	print '</form>';
@@ -3928,11 +4232,10 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		// Change the contenteditable to "true" or "false" when mode Edit Inline is on or off
 		if (empty($conf->global->WEBSITE_EDITINLINE))
 		{
-		    // Remove the contenteditable="true"
+			// Remove the contenteditable="true"
 			$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
 		}
-		else
-		{
+		else {
 			// Keep the contenteditable="true" when mode Edit Inline is on
 		}
 		$out .= dolWebsiteReplacementOfLinks($object, $newcontent, 0, 'html', $objectpage->id)."\n";
@@ -3973,15 +4276,13 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		/*print '<iframe class="websiteiframenoborder centpercent" src="'.DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$pageid.'"/>';
         print '</iframe>';*/
 	}
-	else
-	{
+	else {
 		if (empty($websitekey) || $websitekey == '-1')
 		{
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("NoWebSiteCreateOneFirst").'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';
 		}
-		else
-		{
+		else {
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("PreviewOfSiteNotYetAvailable", $object->ref).'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';
 		}
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index abb2bea0179..24b804058ea 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -43,19 +43,16 @@ if (!empty($hashp))
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
 			}
-			else
-			{
+			else {
 				print 'Bad link. File is from another module part.';
 			}
 		}
-		else
-		{
+		else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
 	}
-	else
-	{
+	else {
 		print "ErrorFileNotFoundWithSharedLink";
 		exit;
 	}
@@ -64,7 +61,7 @@ if (!empty($hashp))
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
 $attachment = true;
 if (preg_match('/\.(html|htm)$/i', $original_file)) $attachment = false;
-if (isset($_GET["attachment"])) $attachment = GETPOST("attachment", 'none') ?true:false;
+if (isset($_GET["attachment"])) $attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
 if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) $attachment = false;
 
 // Define mime type
@@ -76,7 +73,7 @@ else $type = dol_mimetype($original_file);
 $original_file = str_replace("../", "/", $original_file);
 
 // Cache or not
-if (GETPOST("cache", 'none') || image_format_supported($original_file) >= 0)
+if (GETPOST("cache", 'aZ09') || image_format_supported($original_file) >= 0)
 {
 	// Important: Following code is to avoid page request by browser and PHP CPU at
 	// each Dolibarr page access.
@@ -161,8 +158,7 @@ if ($rss) {
 		if ($result >= 0)
 		{
 			if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
-			else
-			{
+			else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 				dol_syslog("build_exportfile ".$error, LOG_ERR);
 				dol_delete_file($outputfiletmp, 0, 1);
@@ -170,8 +166,7 @@ if ($rss) {
 				exit(-1);
 			}
 		}
-		else
-		{
+		else {
 			dol_syslog("build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
 			dol_delete_file($outputfiletmp, 0, 1);
 			$langs->load("errors");
@@ -213,8 +208,7 @@ elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file
 {
 	readfile(dol_osencode($conf->mycompany->dir_output."/".$original_file));
 }
-else
-{
+else {
 	// Find the subdirectory name as the reference
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 54accb48fd3..1c976ecc74b 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -34,7 +34,7 @@ $langs->loadLangs(array("website", "other"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
@@ -51,11 +51,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 if (empty($action) && empty($id) && empty($ref)) $action = 'view';
@@ -198,7 +198,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
 	if ($object->fk_soc > 0 && empty($socid)) $socid = $object->fk_soc;
 
-    $res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
 	$head = websiteaccountPrepareHead($object);
 	dol_fiche_head($head, 'card', $langs->trans("WebsiteAccount"), -1, 'websiteaccount@website');
@@ -207,7 +207,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsiteAccount'), $langs->trans('ConfirmDeleteWebsiteAccount'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsiteAccount'), $langs->trans('ConfirmDeleteWebsiteAccount'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Call Hook formConfirm
@@ -298,24 +298,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
-    	    // Send
-    		if (empty($user->socid)) {
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
-    		}
+		if (empty($reshook))
+		{
+			// Send
+			if (empty($user->socid)) {
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
+			}
 
-    		if ($user->rights->website->write)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-    		}
+			if ($user->rights->website->write)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+			}
 
-    		/*
+			/*
     		if ($user->rights->sellyoursaas->create)
     		{
     			if ($object->status == 1)
@@ -329,52 +329,37 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($user->rights->website->delete)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			if ($user->rights->website->delete)
+			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
 	// Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
-	    $action = 'presend';
+		$action = 'presend';
 	}
 
 	if ($action != 'presend')
 	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    // Documents
-	    /*$objref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $objref . '/' . $objref . '.pdf';
-	    $filedir = $conf->website->dir_output . '/' . $objref;
-	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-	    $genallowed = $user->rights->website->read;	// If you can read, you can build the PDF to read content
-	    $delallowed = $user->rights->website->create;	// If you can create/edit, you can remove a file on card
-	    print $formfile->showdocuments('website', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-		*/
-
-	    // Show links to link elements
-	    /*$linktoelem = $form->showLinkToObjectBlock($object, null, array('websiteaccount'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-		*/
-
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
+		/*
 	    $MAXEVENT = 10;
 
 	    // List of actions on element
-	    /*
 	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
 	    $formactions = new FormActions($db);
 	    $somethingshown = $formactions->showactions($object, 'websiteaccount', $socid, 1, '', $MAXEVENT);
 	    */
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 	// Presend form
diff --git a/htdocs/zapier/admin/about.php b/htdocs/zapier/admin/about.php
index 43eded7ab7c..31d54c35893 100644
--- a/htdocs/zapier/admin/about.php
+++ b/htdocs/zapier/admin/about.php
@@ -37,7 +37,7 @@ $langs->loadLangs(array("errors", "admin", "zapier@zapier"));
 if (!$user->admin) accessforbidden();
 
 // Parameters
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index e608ece5bb7..7077551749e 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -36,7 +36,7 @@ $langs->loadLangs(array("admin", "zapier@zapier"));
 if (!$user->admin) accessforbidden();
 
 // Parameters
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $arrayofparameters = array(
@@ -110,8 +110,7 @@ if ($action == 'edit') {
         print '<div class="tabsAction">';
         print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
         print '</div>';
-    } else
-    {
+    } else {
         print '<br>'.$langs->trans("NothingToSetup");
     }
 }
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index 082ca5a5490..9fbaf56c303 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -174,7 +174,7 @@ class ZapierApi extends DolibarrApi
         //if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
         //if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
 
-        $tmpobject = new Hook($db);
+        $tmpobject = new Hook($this->db);
         if ($tmpobject->ismultientitymanaged) {
             $sql .= ' AND t.entity IN ('.getEntity('hook').')';
         }
@@ -200,23 +200,23 @@ class ZapierApi extends DolibarrApi
             $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql .= $db->order($sortfield, $sortorder);
+        $sql .= $this->db->order($sortfield, $sortorder);
         if ($limit) {
             if ($page < 0) {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql .= $db->plimit($limit + 1, $offset);
+            $sql .= $this->db->plimit($limit + 1, $offset);
         }
 
-		$result = $db->query($sql);
+        $result = $this->db->query($sql);
 		$i = 0;
         if ($result) {
-            $num = $db->num_rows($result);
+        	$num = $this->db->num_rows($result);
             while ($i < $num) {
-                $obj = $db->fetch_object($result);
-                $hook_static = new Hook($db);
+            	$obj = $this->db->fetch_object($result);
+            	$hook_static = new Hook($this->db);
                 if ($hook_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($hook_static);
                 }
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index 4d3d7296b2f..e7ce317096d 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -28,387 +28,387 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
  */
 class Hook extends CommonObject
 {
-    /**
-     * @var string ID to identify managed object
-     */
-    public $element = 'hook';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'hook';
 
-    /**
-     * @var string Name of table without prefix where object is stored
-     */
-    public $table_element = 'zapier_hook';
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'zapier_hook';
 
-    /**
-     * @var int  Does hook 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 hook 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 hook support extrafields ? 0=No, 1=Yes
-     */
-    public $isextrafieldmanaged = 1;
+	/**
+	 * @var int  Does hook support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
 
-    /**
-     * @var string String with name of icon for hook. Must be the part after the 'object_' into object_hook.png
-     */
-    public $picto = 'hook@zapier';
+	/**
+	 * @var string String with name of icon for hook. Must be the part after the 'object_' into object_hook.png
+	 */
+	public $picto = 'hook@zapier';
 
 
-    const STATUS_DRAFT = 0;
-    const STATUS_VALIDATED = 1;
-    const STATUS_DISABLED = -1;
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_DISABLED = -1;
 
 
-    /**
-     *  'type' if the field format ('integer', 'integer:Class:pathtoclass', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float')
-     *  '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, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 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)
-     *  '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 ('integer', 'integer:Class:pathtoclass', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float')
+	 *  '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, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 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)
+	 *  '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")
+	 */
 
-    /**
-     * @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' => -2,
-            'noteditable' => 1,
-            'notnull' => 1,
-            'index' => 1,
-            'position' => 1,
-            'comment' => 'Id',
-        ),
-        'entity' => array(
-            'type' => 'integer',
-            'label' => 'Entity',
-            'enabled' => 1,
-            'visible' => 0,
-            'notnull' => 1,
-            'default' => 1,
-            'index' => 1,
-            'position' => 20,
-        ),
-        'fk_user' => array(
-            'type' => 'integer',
-            'label' => 'UserOwner',
-            'enabled' => 1,
-            'visible' => -2,
-            'notnull' => 1,
-            'position' => 510,
-            'foreignkey' => 'llx_user.rowid',
-        ),
-        'url' => array(
-            'type' => 'varchar(255)',
-            'label' => 'Url',
-            'enabled' => 1,
-            'visible' => 1,
-            'position' => 30,
-            'searchall' => 1,
-            'css' => 'minwidth200',
-            'help' => 'Hook url',
-            'showoncombobox' => 1,
-        ),
-        'module' => array(
-            'type' => 'varchar(128)',
-            'label' => 'Url',
-            'enabled' => 1,
-            'visible' => 1,
-            'position' => 30,
-            'searchall' => 1,
-            'css' => 'minwidth200',
-            'help' => 'Hook module',
-            'showoncombobox' => 1,
-        ),
-        'action' => array(
-            'type' => 'varchar(128)',
-            'label' => 'Url',
-            'enabled' => 1,
-            'visible' => 1,
-            'position' => 30,
-            'searchall' => 1,
-            'css' => 'minwidth200',
-            'help' => 'Hook action trigger',
-            'showoncombobox' => 1,
-        ),
-        'event' => array(
-            'type' => 'varchar(255)',
-            'label' => 'Event',
-            'enabled' => 1,
-            'visible' => 1,
-            'position' => 30,
-            'searchall' => 1,
-            'css' => 'minwidth200',
-            'help' => 'Event',
-            'showoncombobox' => 1,
-        ),
-        'date_creation' => array(
-            'type' => 'datetime',
-            'label' => 'DateCreation',
-            'enabled' => 1,
-            'visible' => -2,
-            'notnull' => 1,
-            'position' => 500,
-        ),
-        'import_key' => array(
-            'type' => 'varchar(14)',
-            'label' => 'ImportId',
-            'enabled' => 1,
-            'visible' => -2,
-            'notnull' => -1,
-            'index' => 0,
-            'position' => 1000,
-        ),
-        'status' => array(
-            'type' => 'integer',
-            'label' => 'Status',
-            'enabled' => 1,
-            'visible' => 1,
-            'notnull' => 1,
-            'default' => 0,
-            'index' => 1,
-            'position' => 1000,
-            'arrayofkeyval' => array(
-                0 => 'Draft',
-                1 => 'Active',
-                -1 => 'Canceled',
-            ),
-        ),
-    );
+	/**
+	 * @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' => -2,
+			'noteditable' => 1,
+			'notnull' => 1,
+			'index' => 1,
+			'position' => 1,
+			'comment' => 'Id',
+		),
+		'entity' => array(
+			'type' => 'integer',
+			'label' => 'Entity',
+			'enabled' => 1,
+			'visible' => 0,
+			'notnull' => 1,
+			'default' => 1,
+			'index' => 1,
+			'position' => 20,
+		),
+		'fk_user' => array(
+			'type' => 'integer',
+			'label' => 'UserOwner',
+			'enabled' => 1,
+			'visible' => -2,
+			'notnull' => 1,
+			'position' => 510,
+			'foreignkey' => 'llx_user.rowid',
+		),
+		'url' => array(
+			'type' => 'varchar(255)',
+			'label' => 'Url',
+			'enabled' => 1,
+			'visible' => 1,
+			'position' => 30,
+			'searchall' => 1,
+			'css' => 'minwidth200',
+			'help' => 'Hook url',
+			'showoncombobox' => 1,
+		),
+		'module' => array(
+			'type' => 'varchar(128)',
+			'label' => 'Url',
+			'enabled' => 1,
+			'visible' => 1,
+			'position' => 30,
+			'searchall' => 1,
+			'css' => 'minwidth200',
+			'help' => 'Hook module',
+			'showoncombobox' => 1,
+		),
+		'action' => array(
+			'type' => 'varchar(128)',
+			'label' => 'Url',
+			'enabled' => 1,
+			'visible' => 1,
+			'position' => 30,
+			'searchall' => 1,
+			'css' => 'minwidth200',
+			'help' => 'Hook action trigger',
+			'showoncombobox' => 1,
+		),
+		'event' => array(
+			'type' => 'varchar(255)',
+			'label' => 'Event',
+			'enabled' => 1,
+			'visible' => 1,
+			'position' => 30,
+			'searchall' => 1,
+			'css' => 'minwidth200',
+			'help' => 'Event',
+			'showoncombobox' => 1,
+		),
+		'date_creation' => array(
+			'type' => 'datetime',
+			'label' => 'DateCreation',
+			'enabled' => 1,
+			'visible' => -2,
+			'notnull' => 1,
+			'position' => 500,
+		),
+		'import_key' => array(
+			'type' => 'varchar(14)',
+			'label' => 'ImportId',
+			'enabled' => 1,
+			'visible' => -2,
+			'notnull' => -1,
+			'index' => 0,
+			'position' => 1000,
+		),
+		'status' => array(
+			'type' => 'integer',
+			'label' => 'Status',
+			'enabled' => 1,
+			'visible' => 1,
+			'notnull' => 1,
+			'default' => 0,
+			'index' => 1,
+			'position' => 1000,
+			'arrayofkeyval' => array(
+				0 => 'Draft',
+				1 => 'Active',
+				-1 => 'Canceled',
+			),
+		),
+	);
 
-    /**
-     * @var int ID
-     */
-    public $rowid;
+	/**
+	 * @var int ID
+	 */
+	public $rowid;
 
-    /**
-     * @var string Ref
-     */
-    public $ref;
+	/**
+	 * @var string Ref
+	 */
+	public $ref;
 
-    /**
-     * @var int Entity
-     */
-    public $entity;
+	/**
+	 * @var int Entity
+	 */
+	public $entity;
 
-    /**
-     * @var string label
-     */
-    public $label;
+	/**
+	 * @var string label
+	 */
+	public $label;
 
-    /**
-     * @var string amount
-     */
-    public $amount;
+	/**
+	 * @var string amount
+	 */
+	public $amount;
 
-    /**
-     * @var int Status
-     */
-    public $status;
+	/**
+	 * @var int Status
+	 */
+	public $status;
 
-    /**
-     * @var integer|string date_creation
-     */
-    public $date_creation;
+	/**
+	 * @var integer|string date_creation
+	 */
+	public $date_creation;
 
-    /**
-     * @var integer tms
-     */
-    public $tms;
+	/**
+	 * @var integer tms
+	 */
+	public $tms;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_creat;
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_creat;
 
-    /**
-     * @var int ID
-     */
-    public $fk_user_modif;
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_modif;
 
-    /**
-     * @var string import_key
-     */
-    public $import_key;
+	/**
+	 * @var string import_key
+	 */
+	public $import_key;
 
 
-    // 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 = 'hookdet';
+	/**
+	 * @var int    Name of subtable line
+	 */
+	//public $table_element_line = 'hookdet';
 
-    /**
-     * @var int    Field with ID of parent key if this field has a parent
-     */
-    //public $fk_element = 'fk_hook';
+	/**
+	 * @var int    Field with ID of parent key if this field has a parent
+	 */
+	//public $fk_element = 'fk_hook';
 
-    /**
-     * @var int    Name of subtable class that manage subtable lines
-     */
-    //public $class_element_line = 'MyObjectline';
+	/**
+	 * @var int    Name of subtable class that manage subtable lines
+	 */
+	//public $class_element_line = 'MyObjectline';
 
-    /**
-     * @var array  Array of child tables (child tables to delete before deleting a record)
-     */
-    //protected $childtables=array('hookdet');
+	/**
+	 * @var array  Array of child tables (child tables to delete before deleting a record)
+	 */
+	//protected $childtables=array('hookdet');
 
-    /**
-     * @var MyObjectLine[]     Array of subtable lines
-     */
-    //public $lines = array();
+	/**
+	 * @var MyObjectLine[]     Array of subtable lines
+	 */
+	//public $lines = array();
 
 
 
-    /**
-     * Constructor
-     *
-     * @param DoliDb $db Database handler
-     */
-    public function __construct(DoliDB $db)
-    {
-        global $conf, $langs, $user;
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs, $user;
 
-        $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($this->fields['status']['arrayofkeyval'])) {
-                foreach ($this->fields['status']['arrayofkeyval'] as $key2 => $val2) {
-                    $this->fields['status']['arrayofkeyval'][$key2] = $langs->trans($val2);
-                }
-            }
-        }
-    }
+		// Translate some data of arrayofkeyval
+		foreach ($this->fields as $key => $val) {
+			if (is_array($this->fields['status']['arrayofkeyval'])) {
+				foreach ($this->fields['status']['arrayofkeyval'] as $key2 => $val2) {
+					$this->fields['status']['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)
-    {
-        return $this->createCommon($user, $notrigger);
-    }
+	/**
+	 * 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)
+	{
+		return $this->createCommon($user, $notrigger);
+	}
 
-    /**
-     * Clone an 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 an 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->table_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->table_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();
 
@@ -417,326 +417,325 @@ class Hook extends CommonObject
         return count($this->lines)?1:0;
     }*/
 
-    /**
-     * 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);
 
-        $records = array();
+		$records = array();
 
-        $sql = 'SELECT';
-        $sql .= ' t.rowid';
-        // TODO Get all fields
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-        $sql .= ' WHERE t.entity = '.$conf->entity;
-        // Manage filter
-        $sqlwhere = array();
-        if (count($filter) > 0) {
-            foreach ($filter as $key => $value) {
-                if ($key == 't.rowid') {
-                    $sqlwhere[] = $key.'='.$value;
-                } elseif (strpos($key, 'date') !== false) {
-                    $sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
-                } elseif ($key == 'customsql') {
-                    $sqlwhere[] = $value;
-                } else {
-                    $sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
-                }
-            }
-        }
-        if (count($sqlwhere) > 0) {
-            $sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
-        }
+		$sql = 'SELECT';
+		$sql .= ' t.rowid';
+		// TODO Get all fields
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.entity = '.$conf->entity;
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (strpos($key, 'date') !== false) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ('.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) {
-            $num = $this->db->num_rows($resql);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
 
-            while ($obj = $this->db->fetch_object($resql)) {
-                $record = new self($this->db);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$record = new self($this->db);
 
-                $record->id = $obj->rowid;
-                // TODO Get other fields
+				$record->id = $obj->rowid;
+				// TODO Get other fields
 
-                //var_dump($record->id);
-                $records[$record->id] = $record;
-            }
-            $this->db->free($resql);
+				//var_dump($record->id);
+				$records[$record->id] = $record;
+			}
+			$this->db->free($resql);
 
-            return $records;
-        } else {
-            $this->errors[] = 'Error '.$this->db->lasterror();
-            dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			return $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 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);
-        //return $this->deleteCommon($user, $notrigger, 1);
-    }
+	/**
+	 *  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 $this->deleteCommon($user, $notrigger, 1);
+	}
 
-    /**
-     *  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, $action;
-        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, $action;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        if (!empty($conf->dol_no_mouse_hover)) {
-            // Force disable tooltips
-            $notooltip = 1;
-        }
+		if (!empty($conf->dol_no_mouse_hover)) {
+			// Force disable tooltips
+			$notooltip = 1;
+		}
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("Hook").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		$label = '<u>'.$langs->trans("Hook").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-        $url = dol_buildpath('/zapier/hook_card.php', 1).'?id='.$this->id;
+		$url = dol_buildpath('/zapier/hook_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("ShowMyObject");
-                $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("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
-            /*
+			/*
              $hookmanager->initHooks(array('hookdao'));
              $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)) : '');
 
-        $hookmanager->initHooks(array('hookdao'));
-        $parameters = array(
-            'id' => $this->id,
-            'getnomurl' => $result,
-        );
-        // Note that $action and $object may have been modified by some hooks
-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);
-        if ($reshook > 0) {
-            $result = $hookmanager->resPrint;
-        } else {
-            $result .= $hookmanager->resPrint;
-        }
+		$hookmanager->initHooks(array('hookdao'));
+		$parameters = array(
+			'id' => $this->id,
+			'getnomurl' => $result,
+		);
+		// Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);
+		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
-    	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, 6=Long label + Picto
+	 *  @return string              Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-    	if (empty($this->labelStatus) || empty($this->labelStatusShort))
-    	{
-    		global $langs;
-    		//$langs->load("mymodule");
-    		$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
-    		$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-    		$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
-    		$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
-    	}
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("mymodule");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+		}
 
-    	$statusType = 'status5';
-    	if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		$statusType = 'status5';
+		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);
+	}
 
-    /**
-     *  Load the info information in the object
-     *
-     *  @param  int     $id       Id of object
-     *  @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;
-                }
+	/**
+	 *  Load the info information in the object
+	 *
+	 *  @param  int     $id       Id of object
+	 *  @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();
+	}
 
 
-    /**
-     * Action executed by scheduler
-     * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-     *
-     * @return  int         0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-     */
-    public function doScheduledJob()
-    {
-        global $conf, $langs;
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 *
+	 * @return  int         0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
 
-        //$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
 
-        $error = 0;
-        $this->output = '';
-        $this->error = '';
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
 
-        dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 
-        $now = dol_now();
+		$now = dol_now();
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // ...
+		// ...
 
-        $this->db->commit();
+		$this->db->commit();
 
-        return $error;
-    }
+		return $error;
+	}
 }
 
 /**
diff --git a/htdocs/zapier/hook_agenda.php b/htdocs/zapier/hook_agenda.php
index ca046392cec..89f2415ad05 100644
--- a/htdocs/zapier/hook_agenda.php
+++ b/htdocs/zapier/hook_agenda.php
@@ -37,17 +37,14 @@ $langs->loadLangs(array("mymodule@mymodule", "other"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
     $actioncode = GETPOST('actioncode', 'array', 3);
     if (!count($actioncode)) $actioncode = '0';
-}
-else
-{
+} 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));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
@@ -91,19 +88,16 @@ $parameters = array('id'=>$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))
-{
+if (empty($reshook)) {
     // Cancel
-    if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-    {
+    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 = '';
+    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 = '';
     }
 }
@@ -118,8 +112,7 @@ $contactstatic = new Contact($db);
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
 	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
@@ -199,8 +192,7 @@ if ($object->id > 0)
 
     $out = '';
     $permok = $user->rights->agenda->myactions->create;
-    if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-    {
+    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';
@@ -212,22 +204,17 @@ if ($object->id > 0)
 
 	print '<div class="tabsAction">';
 
-    if (!empty($conf->agenda->enabled))
-    {
-    	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-    	{
+    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
-    	{
+    	} else {
         	print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
     	}
     }
 
     print '</div>';
 
-    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))) {
         $param = '&socid='.$socid;
         if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
         if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
index c2755892716..b0441c34f06 100644
--- a/htdocs/zapier/hook_card.php
+++ b/htdocs/zapier/hook_card.php
@@ -38,7 +38,7 @@ $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'zapiercard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
@@ -53,10 +53,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
@@ -82,33 +81,32 @@ $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))
-{
-    $error = 0;
+if (empty($reshook)) {
+	$error = 0;
 
-    $permissiontoadd = $user->rights->mymodule->write;
-    $permissiontodelete = $user->rights->mymodule->delete || ($permissiontoadd && $object->status == 0);
-    $backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
-    if (empty($backtopage)) {
-        if (empty($id)) $backtopage = $backurlforlist;
-        else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
-    }
-    $triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record
+	$permissiontoadd = $user->rights->mymodule->write;
+	$permissiontodelete = $user->rights->mymodule->delete || ($permissiontoadd && $object->status == 0);
+	$backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
+	if (empty($backtopage)) {
+		if (empty($id)) $backtopage = $backurlforlist;
+		else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
+	}
+	$triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, delete or clone
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, delete or clone
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'MYOBJECT_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
-    $trackid = 'myobject'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'MYOBJECT_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
+	$trackid = 'myobject'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 
@@ -142,8 +140,7 @@ jQuery(document).ready(function() {
 
 
 // Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("MyObject")));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -175,12 +172,11 @@ if ($action == 'create')
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("MyObject"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
@@ -207,9 +203,8 @@ if (($id || $ref) && $action == 'edit')
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
-    $res = $object->fetch_optionals();
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
 	dol_fiche_head($head, 'card', $langs->trans("MyObject"), -1, 'myobject@mymodule');
@@ -217,9 +212,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$formconfirm = '';
 
 	// Confirmation to delete
-	if ($action == 'delete')
-	{
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Clone confirmation
@@ -230,10 +224,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Confirmation of action xxxx
-	if ($action == 'xxx')
-	{
+	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(
@@ -243,7 +236,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	        // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
         );
 	    */
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
 
 	// Call Hook formConfirm
@@ -327,30 +320,25 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
-            // Modify
-    		if ($user->rights->mymodule->write)
-    		{
-    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-    		}
-    		else
-    		{
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-    		}
+		if (empty($reshook)) {
+			// Modify
+			if ($user->rights->mymodule->write) {
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
+			}
 
-    		// Clone
-    		if ($user->rights->mymodule->write)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
-    		}
+			// Clone
+			if ($user->rights->mymodule->write) {
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
+			}
 
-    		/*
+			/*
     		if ($user->rights->mymodule->write)
     		{
     			if ($object->status == 1)
@@ -364,16 +352,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($user->rights->mymodule->delete)
-    		{
-    			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    		else
-    		{
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			if ($user->rights->mymodule->delete) {
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
@@ -382,40 +367,29 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$action = 'presend';
 	}
 
-	if ($action != 'presend')
-	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+	if ($action != 'presend') {
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    // Documents
-	    /*$objref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $comref . '/' . $comref . '.pdf';
-	    $filedir = $conf->mymodule->dir_output . '/' . $objref;
-	    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
-	    $genallowed = $user->rights->mymodule->read;	// If you can read, you can build the PDF to read content
-	    $delallowed = $user->rights->mymodule->create;	// If you can create/edit, you can remove a file on card
-	    print $formfile->showdocuments('mymodule', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
-		*/
-
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    $MAXEVENT = 10;
+		$MAXEVENT = 10;
 
-	    $morehtmlright = '<a href="'.dol_buildpath('/mymodule/myobject_info.php', 1).'?id='.$object->id.'">';
-	    $morehtmlright .= $langs->trans("SeeAll");
-	    $morehtmlright .= '</a>';
+		$morehtmlright = '<a href="'.dol_buildpath('/mymodule/myobject_info.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'myobject', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'myobject', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/zapier/hook_document.php b/htdocs/zapier/hook_document.php
index cdc5f8c7ddf..9b43ded60c8 100644
--- a/htdocs/zapier/hook_document.php
+++ b/htdocs/zapier/hook_document.php
@@ -92,8 +92,7 @@ $help_url = '';
 //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	/*
 	 * Show tabs
 	 */
@@ -105,8 +104,7 @@ if ($object->id)
 	// 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)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
@@ -132,9 +130,7 @@ if ($object->id)
 	print '</div>';
 
 	dol_fiche_end();
-}
-else
-{
+} else {
 	accessforbidden('', 0, 0);
 }
 
diff --git a/htdocs/zapier/hook_list.php b/htdocs/zapier/hook_list.php
index 8be913c5a8c..d36d909b399 100644
--- a/htdocs/zapier/hook_list.php
+++ b/htdocs/zapier/hook_list.php
@@ -41,7 +41,7 @@ $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk
 $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') : 'hooklist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'zapierlist'; // 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')
 
@@ -49,8 +49,8 @@ $id = GETPOST('id', 'int');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'alpha');
-$sortorder = GETPOST('sortorder', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : 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
@@ -93,7 +93,7 @@ if ($user->socid > 0) {
 //$result = restrictedArea($user, 'mymodule', $id, '');
 
 // Initialize array of search criterias
-$search_all = trim(GETPOST("search_all", 'alpha'));
+$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');
@@ -509,8 +509,7 @@ while ($i < min($num, $limit)) {
             else print $object->showOutputField($val, $key, $obj->$key, '');
             print '</td>';
             if (!$i) $totalarray['nbfield']++;
-            if (!empty($val['isameasure']))
-            {
+            if (!empty($val['isameasure'])) {
                 if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
                 $totalarray['val']['t.'.$key] += $obj->$key;
             }
diff --git a/htdocs/zapier/hook_note.php b/htdocs/zapier/hook_note.php
index af96dfce98c..d8a5404fd3c 100644
--- a/htdocs/zapier/hook_note.php
+++ b/htdocs/zapier/hook_note.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array("mymodule@mymodule", "companies"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
@@ -77,8 +77,7 @@ $form = new Form($db);
 $help_url = '';
 llxHeader('', $langs->trans('MyObject'), $help_url);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = myobjectPrepareHead($object);
diff --git a/htdocs/zapier/lib/zapier_hook.lib.php b/htdocs/zapier/lib/zapier_hook.lib.php
index 9416936e261..114e7753512 100644
--- a/htdocs/zapier/lib/zapier_hook.lib.php
+++ b/htdocs/zapier/lib/zapier_hook.lib.php
@@ -41,8 +41,7 @@ function myobjectPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
-	{
+	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++;
diff --git a/htdocs/zapier/zapierindex.php b/htdocs/zapier/zapierindex.php
index 6986bc8588d..5ecdf24e6cd 100644
--- a/htdocs/zapier/zapierindex.php
+++ b/htdocs/zapier/zapierindex.php
@@ -31,14 +31,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("zapier@zapier"));
 
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
 
 
 // Securite acces client
 if (!$user->rights->zapier->read) accessforbidden();
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -68,156 +67,9 @@ print load_fiche_titre($langs->trans("ZapierForDolibarrArea"), '', 'zapier.png@z
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-/* BEGIN MODULEBUILDER DRAFT MYOBJECT
-// Draft MyObject
-if (! empty($conf->zapier->enabled) && $user->rights->zapier->read)
-{
-	$langs->load("orders");
-
-	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
-    $sql.= ", s.code_client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
-	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE c.fk_soc = s.rowid";
-	$sql.= " AND c.fk_statut = 0";
-	$sql.= " AND c.entity IN (".getEntity('commande').")";
-	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;
-
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$total = 0;
-		$num = $db->num_rows($resql);
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("DraftOrders").($num?'<span class="badge marginleftonlyshort">'.$num.'</span>':'').'</th></tr>';
-
-		$var = true;
-		if ($num > 0)
-		{
-			$i = 0;
-			while ($i < $num)
-			{
-
-				$obj = $db->fetch_object($resql);
-				print '<tr class="oddeven"><td class="nowrap">';
-                $orderstatic->id=$obj->rowid;
-                $orderstatic->ref=$obj->ref;
-                $orderstatic->ref_client=$obj->ref_client;
-                $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">';
-				$companystatic->id=$obj->socid;
-				$companystatic->name=$obj->name;
-				$companystatic->client=$obj->client;
-                $companystatic->code_client = $obj->code_client;
-                $companystatic->code_fournisseur = $obj->code_fournisseur;
-                $companystatic->canvas=$obj->canvas;
-				print $companystatic->getNomUrl(1,'customer',16);
-				print '</td>';
-				print '<td class="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
-				$i++;
-				$total += $obj->total_ttc;
-			}
-			if ($total>0)
-			{
-
-				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
-			}
-		}
-		else
-		{
-
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
-		}
-		print "</table><br>";
-
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-}
-END MODULEBUILDER DRAFT MYOBJECT */
-
-
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
-$NBMAX = 3;
-$max = 3;
-
-/* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
-// Last modified myobject
-if (! empty($conf->zapier->enabled) && $user->rights->zapier->read)
-{
-	$sql = "SELECT s.rowid, s.nom as name, s.client, s.datec, s.tms, s.canvas";
-    $sql.= ", s.code_client";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql.= " WHERE s.client IN (1, 2, 3)";
-	$sql.= " AND s.entity IN (".getEntity($companystatic->element).")";
-	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 s.tms DESC";
-	$sql .= $db->plimit($max, 0);
-
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0;
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="2">';
-		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastCustomersOrProspects",$max);
-        else if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects",$max);
-		else print $langs->trans("BoxTitleLastModifiedCustomers",$max);
-		print '</th>';
-		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
-		print '</tr>';
-		if ($num)
-		{
-			while ($i < $num)
-			{
-				$objp = $db->fetch_object($resql);
-				$companystatic->id=$objp->rowid;
-				$companystatic->name=$objp->name;
-				$companystatic->client=$objp->client;
-                $companystatic->code_client = $objp->code_client;
-                $companystatic->code_fournisseur = $objp->code_fournisseur;
-                $companystatic->canvas=$objp->canvas;
-				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1,'customer',48).'</td>';
-				print '<td class="right nowrap">';
-				print $companystatic->getLibCustProspStatut();
-				print "</td>";
-				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms),'day')."</td>";
-				print '</tr>';
-				$i++;
-
-
-			}
-
-			$db->free($resql);
-		}
-		else
-		{
-			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-		}
-		print "</table><br>";
-	}
-}
-*/
-
 print '</div></div></div>';
 
 // End of page
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
new file mode 100644
index 00000000000..8d92613d638
--- /dev/null
+++ b/nightwatch.conf.js
@@ -0,0 +1,27 @@
+const admin_username = process.env.ADMIN_USERNAME || 'dolibarr';
+const admin_password = process.env.ADMIN_PASSWORD || 'password';
+const launch_url = process.env.LAUNCH_URL || 'http://localhost/dolibarr/htdocs/';
+module.exports = {
+	page_objects_path : './test/acceptance/pageObjects/', // jshint ignore:line
+	src_folders : ['test'],
+
+	test_settings : {
+		default : {
+			selenium_host : '127.0.0.1',
+			launchUrl : launch_url,
+			globals : {
+				backend_url : launch_url,
+				adminUsername : admin_username,
+				adminPassword : admin_password
+			},
+			desiredCapabilities : {
+				browserName : 'chrome',
+				javascriptEnabled : true,
+				chromeOptions : {
+					args : ['disable-gpu'],
+					w3c : false
+				}
+			}
+		}
+	}
+};
diff --git a/package.json b/package.json
new file mode 100644
index 00000000000..67f24dd541a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,14 @@
+{
+  "devDependencies": {
+    "cucumber": "^6.0.5",
+    "nightwatch": "^1.4.1",
+    "nightwatch-api": "^3.0.1"
+  },
+  "scripts": {
+    "test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"
+  },
+  "dependencies": {
+    "cucumber-pretty": "^6.0.0",
+    "node-fetch": "^2.6.1"
+  }
+}
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index e24a460f61e..ba4fe922ab9 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -65,10 +65,8 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			$month_end = $month_start - 1;
 			if ($month_end < 1)
 				$month_end = 12;
-			else
-				$year_end++;
-		} else
-			$month_end = $month_start;
+			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);
 	}
diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php
index 7ddc41752dd..4f2a256275a 100755
--- a/scripts/bank/export-bank-receipts.php
+++ b/scripts/bank/export-bank-receipts.php
@@ -241,8 +241,7 @@ if ($resql) {
 		preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthese on tente recherche de traduction
 		if ($reg[1] && $langs->transnoentitiesnoconv($reg[1]) != $reg[1])
 			$description = $langs->transnoentitiesnoconv($reg[1]);
-		else
-			$description = $objp->label;
+		else $description = $objp->label;
 
 		/*
 		 * Ajout les liens (societe, company...)
diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php
index 8bd3d4a4824..ae449484e7b 100755
--- a/scripts/contracts/email_expire_services_to_customers.php
+++ b/scripts/contracts/email_expire_services_to_customers.php
@@ -137,8 +137,7 @@ if ($resql) {
 					if ($oldemail != 'none') {
 						if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 							print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-						else
-							print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+						else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 					}
 				}
 				$oldemail = $newemail;
@@ -168,8 +167,7 @@ if ($resql) {
 			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
@@ -189,8 +187,7 @@ if ($resql) {
 				if ($oldemail != 'none') {
 					if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 						print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-					else
-						print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+					else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 				}
 			}
 		}
@@ -233,10 +230,8 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldtarget, $
 	if ($duration_value) {
 		if ($duration_value > 0)
 			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDuration", $duration_value);
-		else
-			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
-	} else
-		$title = $newlangs->transnoentities("ListOfServicesToExpire");
+		else $title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
+	} else $title = $newlangs->transnoentities("ListOfServicesToExpire");
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_SUBJECT);
 	$sendto = $oldemail;
diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php
index dcc21de083b..06cb67c99e9 100755
--- a/scripts/contracts/email_expire_services_to_representatives.php
+++ b/scripts/contracts/email_expire_services_to_representatives.php
@@ -133,8 +133,7 @@ if ($resql) {
 			print "Service to expire ".$obj->ref.", label ".dol_concatdesc($obj->plabel, $obj->description).", due date ".dol_print_date($db->jdate($obj->date_fin_validite), 'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email."): ";
 			if (dol_strlen($obj->email))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
@@ -192,10 +191,8 @@ function envoi_mail($mode, $oldemail, $message, $total, $userlang, $oldsalerepre
 	if ($duration_value) {
 		if ($duration_value > 0)
 			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDuration", $duration_value);
-		else
-			$title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
-	} else
-		$title = $newlangs->transnoentities("ListOfServicesToExpire");
+		else $title = $newlangs->transnoentities("ListOfServicesToExpireWithDurationNeg", $duration_value);
+	} else $title = $newlangs->transnoentities("ListOfServicesToExpire");
 
 	$subject = (empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT) ? $title : $conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_SUBJECT);
 	$sendto = $oldemail;
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 40421c3853e..9058577aa21 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -106,8 +106,7 @@ if ($userlogin == 'firstadmin') {
 			$userlogin = $obj->login;
 			echo "First admin user found is login '".$userlogin."', entity ".$obj->entity."\n";
 		}
-	} else
-		dol_print_error($db);
+	} else dol_print_error($db);
 }
 
 // Check user login
@@ -192,9 +191,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
     		        echo "\nUser Error: ".$user->error."\n";
     		        dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
     		        exit(-1);
-    		    }
-    		    else
-    		    {
+    		    } else {
     		        if ($result == 0)
     		        {
     		            echo "\nUser login: ".$userlogin." does not exists for entity ".$conf->entity."\n";
@@ -259,9 +256,7 @@ if (is_array($qualifiedjobs) && (count($qualifiedjobs) > 0)) {
 	}
 
 	$conf = $savconf;
-}
-else
-{
+} else {
 	echo "cron_run_jobs.php no qualified job found\n";
 }
 
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index bc7efec7dba..7cde66db687 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -42,8 +42,7 @@ if (!isset($argv[1]) || !$argv[1]) {
 $id = $argv[1];
 if (isset($argv[2]) || !empty($argv[2]))
 	$login = $argv[2];
-else
-	$login = '';
+else $login = '';
 
 require_once $path."../../htdocs/master.inc.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php";
@@ -206,23 +205,19 @@ if ($resql) {
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
 
 							if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE))
 								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
-							else
-								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
+							else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
 						}
 
 						complete_substitutions_array($substitutionarray, $langs);
diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php
index 19e3e20e156..5617751b58b 100755
--- a/scripts/invoices/email_unpaid_invoices_to_customers.php
+++ b/scripts/invoices/email_unpaid_invoices_to_customers.php
@@ -135,8 +135,7 @@ if ($resql) {
 					if ($oldemail != 'none') {
 						if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 							print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-						else
-							print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+						else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 					}
 				}
 				$oldemail = $newemail;
@@ -166,8 +165,7 @@ if ($resql) {
 			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day').", customer id ".$obj->sid." ".$obj->name.", ".($obj->cid ? "contact id ".$obj->cid." ".$obj->clastname." ".$obj->cfirstname.", " : "")."email ".$newemail.", lang ".$outputlangs->defaultlang.": ";
 			if (dol_strlen($newemail))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
@@ -187,8 +185,7 @@ if ($resql) {
 				if ($oldemail != 'none') {
 					if (empty($trackthirdpartiessent[$oldsid.'|'.$oldemail]))
 						print "- No email sent for '".$oldtarget."', total: ".$total."\n";
-					else
-						print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
+					else print "- No email sent for '".$oldtarget."', total: ".$total." (already sent to ".$trackthirdpartiessent[$oldsid.'|'.$oldemail].")\n";
 				}
 			}
 		}
diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php
index 8ca40581d2a..9bdd37ca599 100755
--- a/scripts/invoices/email_unpaid_invoices_to_representatives.php
+++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php
@@ -137,8 +137,7 @@ if ($resql) {
 			print "Unpaid invoice ".$obj->ref.", price ".price2num($obj->total_ttc).", due date ".dol_print_date($db->jdate($obj->due_date), 'day')." (linked to company ".$obj->name.", sale representative ".dolGetFirstLastname($obj->firstname, $obj->lastname).", email ".$obj->email.", lang ".$outputlangs->defaultlang."): ";
 			if (dol_strlen($obj->email))
 				print "qualified.";
-			else
-				print "disqualified (no email).";
+			else print "disqualified (no email).";
 			print "\n";
 
 			unset($outputlangs);
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index 984305c2727..4166772cb10 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -114,8 +114,7 @@ print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_MEMBER_DN."\n";
 if (!empty($conf->global->LDAP_MEMBER_FILTER))
 	print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n"; // Note: filter is defined into function getRecords
-else
-	print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
+else print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -278,8 +277,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/scripts/members/sync_members_types_ldap2dolibarr.php b/scripts/members/sync_members_types_ldap2dolibarr.php
index b3c22bf65a8..547b2664070 100755
--- a/scripts/members/sync_members_types_ldap2dolibarr.php
+++ b/scripts/members/sync_members_types_ldap2dolibarr.php
@@ -162,8 +162,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index e98097f061e..28c580dce63 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -211,8 +211,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 022cf9a9ed7..c8502cd1f14 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -93,8 +93,7 @@ print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_USER_DN."\n";
 if (!empty($conf->global->LDAP_FILTER_CONNECTION))
 	print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n"; // Note: filter is defined into function getRecords
-else
-	print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+else print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -254,8 +253,7 @@ if ($result >= 0) {
 		if (!$error || $forcecommit) {
 			if (!$error)
 				print $langs->transnoentities("NoErrorCommitIsDone")."\n";
-			else
-				print $langs->transnoentities("ErrorButCommitIsDone")."\n";
+			else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
 			$db->commit();
 		} else {
 			print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone", $error)."\n";
diff --git a/test/acceptance/README.md b/test/acceptance/README.md
new file mode 100644
index 00000000000..b3d550392c4
--- /dev/null
+++ b/test/acceptance/README.md
@@ -0,0 +1,56 @@
+#Run End-to-End Tests
+
+###Run Selenium
+
+Selenium has been used for automating the browser.
+
+We can run selenium by two ways:
+
+* Usually, for running tests using selenium we download `selenium standalone server JAR file` and `chrome driver` and start selenium server with a command which usually looks like:
+
+   `java -jar selenium-server-standalone-<selenium version>.jar -port <port-no>`
+
+* Run selenium in docker with
+
+   `docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
+
+                                       OR
+     
+   `docker run -d --network="host" -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
+
+                                       OR
+
+   `docker run -d --network host -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
+
+###Run the acceptance tests 
+
+ * In `nightwatch.conf.js` file inside the root directory of the project and inside the configuration file following environment variable has been specified. We can change the default values according to our local configuration.
+
+   ```
+    const admin_username = process.env.ADMIN_USERNAME || 'dolibarr';
+
+    const admin_password = process.env.ADMIN_PASSWORD || 'password';
+
+    const launch_url = process.env.LAUNCH_URL || 'http://localhost/dolibarr/htdocs/';
+   ```
+ * You can run test using following commands
+
+   `yarn run test:e2e test/acceptance/features/<feature_file>`
+   
+    For example: `yarn run test:e2e test/acceptance/features/addUsers.feature`
+   
+                                     OR 
+   
+   `LAUNCH_URL='<launch_url>' ADMIN_USERNAME='<admin_username>' ADMIN_PASSWORD='<admin_password>' yarn run test:e2e test/acceptance/features/`
+ 
+    The full script to run the acceptance tests is specified in `scripts` object of `package.json` file inside the project's root directory as :
+ 
+     `"test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"`
+     
+     After you run the above command you can see the test running. For that : 
+  
+     * open `Remmina` (Remmina is a Remote Desktop Client and comes installed with Ubuntu)
+  
+     * choose `VNC` and enter `localhost` on the address bar
+  
+     * enter `secret` as the password
diff --git a/test/acceptance/features/addUsers.feature b/test/acceptance/features/addUsers.feature
new file mode 100644
index 00000000000..918bff771c2
--- /dev/null
+++ b/test/acceptance/features/addUsers.feature
@@ -0,0 +1,86 @@
+Feature: Add user
+  As an admin
+  I want to add users
+  So that the authorized access is possible
+
+  Background:
+    Given the administrator has logged in using the webUI
+    And the administrator has browsed to the new users page
+
+  Scenario: Admin adds user without permission
+    When the admin creates user with following details
+      | last name | Potter                |
+      | login     | harrypotter@gmail.com |
+      | password  | password              |
+    Then new user "Potter" should be created
+    And message "This user has no permissions defined" should be displayed in the webUI
+
+  Scenario Outline: Admin adds user with permission
+    When the admin creates user with following details
+      | last name     | Potter                |
+      | login         | harrypotter@gmail.com |
+      | password      | password              |
+      | administrator | <administrator>       |
+      | gender        | <gender>              |
+    Then message "This user has no permissions defined" <shouldOrShouldNot> be displayed in the webUI
+    And new user "Potter" should be created
+    Examples:
+      | administrator | gender | shouldOrShouldNot |
+      | No            |        | should            |
+      | No            | Man    | should            |
+      | No            | Woman  | should            |
+      | Yes           |        | should not        |
+      | Yes           | Man    | should not        |
+      | Yes           | Woman  | should not        |
+
+  Scenario Outline: Admin adds user with last name as special characters
+    When the admin creates user with following details
+      | last name | <last name> |
+      | login     | harry       |
+      | password  | password    |
+    Then message "This user has no permissions defined" should be displayed in the webUI
+    And new user "<last name>" should be created
+    Examples:
+      | last name                  |
+      | swi@                       |
+      | g!!@%ui                    |
+      | swikriti@h                 |
+      | !@#$%^&*()-_+=[]{}:;,.<>?~ |
+      | $w!kr!t!                   |
+      | España§àôœ€                |
+      | नेपाली                     |
+      | सिमप्ले $%#?&@name.txt     |
+
+  Scenario Outline: Admin adds user with incomplete essential credentials
+    When the admin creates user with following details
+      | last name | <last name> |
+      | login     | <login>     |
+      | password  | <password>  |
+    Then message "<message>" should be displayed in the webUI
+    And new user "<last name>" should not be created
+    Examples:
+      | last name | login          | password | message                                     |
+      |           |                |          | Name is not defined.\nLogin is not defined. |
+      | Joseph    |                |          | Login is not defined.                       |
+      |           | john@gmail.com |          | Name is not defined.                        |
+      | Joseph    |                | hihi     | Login is not defined.                       |
+
+  Scenario: Admin adds user with incomplete essential credentials
+    When the admin creates user with following details
+      | last name | Doe  |
+      | login     | John |
+      | password  |      |
+    Then message "This user has no permissions defined" should be displayed in the webUI
+    And new user "Doe" should be created
+
+  Scenario: Admin tries to add user with pre-existing login credential
+    Given a user has been created with following details
+      | login | last name | password |
+      | Tyler | Joseph    | pass1234 |
+    And the administrator has browsed to the new users page
+    When the admin creates user with following details
+      | last name | Dun      |
+      | login     | Tyler    |
+      | password  | pass1234 |
+    Then message "Login already exists." should be displayed in the webUI
+    And new user "Dun" should not be created
diff --git a/test/acceptance/features/listUsers.feature b/test/acceptance/features/listUsers.feature
new file mode 100644
index 00000000000..e9c0443cdd4
--- /dev/null
+++ b/test/acceptance/features/listUsers.feature
@@ -0,0 +1,29 @@
+Feature: list users
+  As an admin user
+  I want to view the list of users
+  So that I can manage users
+
+  Background:
+    Given the administrator has logged in using the webUI
+
+  Scenario: Admin user should be able to see list of created users when no new users are created
+    When the administrator browses to the list of users page using the webUI
+    Then following users should be displayed in the users list
+      | login    | last name  |
+      | dolibarr | SuperAdmin |
+    And the number of created users should be 1
+
+  Scenario: Admin user should be able to see number of created users
+    Given the admin has created the following users
+      | login    | last name | password |
+      | Harry    | Potter    | hello123 |
+      | Hermoine | Granger   | hello123 |
+      | Ron      | Weasley   | hello123 |
+    When the administrator browses to the list of users page using the webUI
+    Then following users should be displayed in the users list
+      | login    | last name  |
+      | dolibarr | SuperAdmin |
+      | Harry    | Potter     |
+      | Hermoine | Granger    |
+      | Ron      | Weasley    |
+    And the number of created users should be 4
diff --git a/test/acceptance/features/login.feature b/test/acceptance/features/login.feature
new file mode 100644
index 00000000000..fd7058812cf
--- /dev/null
+++ b/test/acceptance/features/login.feature
@@ -0,0 +1,27 @@
+Feature: user login
+  As a user/admin
+  I want to login to my account
+  So that I can have access to my functionality
+
+  Background:
+    Given the user has browsed to the login page
+
+  Scenario: Admin user should be able to login successfully
+    When user logs in with username "dolibarr" and password "password"
+    Then the user should be directed to the homepage
+
+  Scenario: Admin user with empty credentials should not be able to login
+    When user logs in with username "" and password ""
+    Then the user should not be able to login
+
+  Scenario Outline: user logs in with invalid credentials
+    When user logs in with username "<username>" and password "<password>"
+    Then the user should not be able to login
+    And error message "Bad value for login or password" should be displayed in the webUI
+    Examples:
+      | username | password |
+      | dolibar  | pass     |
+      | dolibarr | passw    |
+      | dolibar  |          |
+      | dolibarr |          |
+      | dolibar  | password |
diff --git a/test/acceptance/features/logout.feature b/test/acceptance/features/logout.feature
new file mode 100644
index 00000000000..137c5260008
--- /dev/null
+++ b/test/acceptance/features/logout.feature
@@ -0,0 +1,10 @@
+Feature: user logs out
+  As a user
+  I want to log out of my account
+  So that I can protect my work, identity and be assured of my privacy
+
+  Scenario: User can logout
+    Given the administrator has logged in using the webUI
+    When the user opens the user profile using the webUI
+    And the user logs out using the webUI
+    Then the user should be logged out successfully
diff --git a/test/acceptance/index.js b/test/acceptance/index.js
new file mode 100644
index 00000000000..a9fcda8105a
--- /dev/null
+++ b/test/acceptance/index.js
@@ -0,0 +1,14 @@
+const { setDefaultTimeout, After, Before } = require('cucumber')
+const { createSession, closeSession, startWebDriver, stopWebDriver } = require('nightwatch-api')
+
+setDefaultTimeout(60000)
+
+Before(async () => {
+	await startWebDriver();
+	await createSession();
+})
+
+After(async () => {
+	await closeSession();
+	await stopWebDriver();
+})
diff --git a/test/acceptance/pageObjects/addUsersPage.js b/test/acceptance/pageObjects/addUsersPage.js
new file mode 100644
index 00000000000..7f31523b842
--- /dev/null
+++ b/test/acceptance/pageObjects/addUsersPage.js
@@ -0,0 +1,128 @@
+const util = require('util');
+module.exports = {
+	url: function () {
+		return this.api.launchUrl + 'user/card.php?leftmenu=users&action=create';
+	},
+
+	commands: [
+		{
+			adminCreatesUser: async function (dataTable) {
+				const userDetails = dataTable.rowsHash();
+				let administrator = userDetails['administrator'];
+				let gender = userDetails['gender'];
+				await this.waitForElementVisible('@newUserAddOption')
+					.useXpath()
+					.waitForElementVisible('@lastnameField')
+					.clearValue('@lastnameField')
+					.setValue('@lastnameField', userDetails['last name'])
+					.waitForElementVisible('@loginField')
+					.clearValue('@loginField')
+					.setValue('@loginField', userDetails['login'])
+					.waitForElementVisible('@newUserPasswordField')
+					.clearValue('@newUserPasswordField')
+					.setValue('@newUserPasswordField', userDetails['password']);
+
+				if (userDetails['administrator']) {
+					const admin = util.format(this.elements.administratorSelectOption.selector, administrator);
+					await this.waitForElementVisible('@administratorField')
+						.click('@administratorField')
+						.waitForElementVisible(admin)
+						.click(admin);
+				}
+
+				if (userDetails['gender']) {
+					const genderValue = util.format(this.elements.genderSelectOption.selector, gender)
+					await this.waitForElementVisible('@genderField')
+						.click('@genderField')
+						.waitForElementVisible(genderValue)
+						.click(genderValue);
+				}
+				return this.waitForElementVisible('@submitButton')
+					.click('@submitButton')
+					.useCss();
+			},
+
+			noPermissionMessage: async function (message) {
+				await this.useXpath()
+					.waitForElementVisible('@noPermissionDefinedMessage')
+					.expect.element('@noPermissionDefinedMessage')
+					.text.to.equal(message);
+				return this.useCss();
+			},
+
+			newUserShouldBeCreated: async function (lastname) {
+				await this.useXpath()
+					.waitForElementVisible('@newUserCreated')
+					.expect.element('@newUserCreated')
+					.text.to.equal(lastname);
+				return this.useCss();
+			},
+
+			noPermissionDefinedMessageNotShown: function (message) {
+				return this.useXpath()
+					.waitForElementNotPresent('@noPermissionDefinedMessage')
+					.useCss();
+			},
+
+			userNotCreated: function (lastname) {
+				return this.waitForElementVisible('@newUserAddOption');
+			}
+		}
+	],
+
+	elements: {
+		newUserAddOption: {
+			selector: '.fiche'
+		},
+
+		lastnameField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//input[@id="lastname"]',
+			locateStrategy: 'xpath'
+		},
+
+		loginField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//input[@name="login"]',
+			locateStrategy: 'xpath'
+		},
+
+		newUserPasswordField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//input[@name="password"]',
+			locateStrategy: 'xpath'
+		},
+
+		submitButton: {
+			selector: '//div[@class="center"]/input[@class="button"]',
+			locateStrategy: 'xpath'
+		},
+
+		administratorField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//select[@id="admin"]',
+			locateStrategy: 'xpath'
+		},
+
+		administratorSelectOption: {
+			selector: '//select[@id="admin"]/option[.="%s"]',
+			locateStrategy: 'xpath'
+
+		},
+
+		genderField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//select[@id="gender"]',
+			locateStrategy: 'xpath'
+		},
+		genderSelectOption: {
+			selector: '//select[@id="gender"]/option[.="%s"]',
+			locateStrategy: 'xpath'
+		},
+
+		noPermissionDefinedMessage: {
+			selector: '//div[@class="jnotify-message"]',
+			locateStrategy: 'xpath'
+		},
+
+		newUserCreated: {
+			selector: '//div[contains(@class,"valignmiddle")]//div[contains(@class,"inline-block floatleft valignmiddle")]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/pageObjects/homePage.js b/test/acceptance/pageObjects/homePage.js
new file mode 100644
index 00000000000..7c225e90f5a
--- /dev/null
+++ b/test/acceptance/pageObjects/homePage.js
@@ -0,0 +1,44 @@
+module.exports = {
+	url: function () {
+		return this.api.launchUrl + 'admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete';
+	},
+
+	commands: [
+		{
+			browsedToNewUserPage: function () {
+				return this.useXpath()
+					.waitForElementVisible('@usersAndGroups')
+					.click('@usersAndGroups')
+					.waitForElementVisible('@newUser')
+					.click('@newUser')
+					.useCss();
+			},
+
+			browsedToListOfUsers: function () {
+				return this.useXpath()
+					.waitForElementVisible('@usersAndGroups')
+					.click('@usersAndGroups')
+					.waitForElementVisible('@listOfUsers')
+					.click('@listOfUsers')
+					.useCss();
+			}
+		}
+	],
+
+	elements: {
+		usersAndGroups: {
+			selector: '//div[@class="menu_titre"]/a[@title="Users & Groups"]',
+			locateStrategy: 'xpath'
+		},
+
+		newUser: {
+			selector: '//div[@class="menu_contenu menu_contenu_user_card"]/a[@title="New user"]',
+			locateStrategy: 'xpath'
+		},
+
+		listOfUsers: {
+			selector: '//a[@class="vsmenu"][@title="List of users"]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/pageObjects/listUsersPage.js b/test/acceptance/pageObjects/listUsersPage.js
new file mode 100644
index 00000000000..6f9df509d5f
--- /dev/null
+++ b/test/acceptance/pageObjects/listUsersPage.js
@@ -0,0 +1,47 @@
+const util = require('util');
+module.exports = {
+	url: function () {
+		return this.api.launchUrl + 'user/list.php?leftmenu=users';
+	},
+
+	commands: [
+		{
+			listOfUsersDisplayed: async function (dataTable) {
+				const usersList = dataTable.hashes();
+				this.useXpath();
+				for (const row of usersList) {
+					let login = row['login'];
+					let lastName = row['last name'];
+					const userDetail = util.format(this.elements.userList.selector, login, lastName);
+					await this.waitForElementVisible('@userRow')
+						.waitForElementVisible(userDetail);
+				}
+				return this.useCss();
+			},
+
+			numberOfUsersDisplayed: async function (number) {
+				const userCount = util.format(this.elements.numberOfUsers.selector, number);
+				await this.useXpath()
+					.waitForElementVisible(userCount);
+				return this.useCss();
+			}
+		}
+	],
+
+	elements: {
+		userRow: {
+			selector: '//table[contains(@class,"tagtable liste")]/tbody/tr[position()>2]',
+			locateStrategy: 'xpath'
+		},
+
+		numberOfUsers: {
+			selector: '//div[contains(@class, "titre inline-block") and contains(., "List of users")]/span[.="(%d)"]',
+			locateStrategy: 'xpath'
+		},
+
+		userList: {
+			selector: '//table[contains(@class,"tagtable liste")]/tbody/tr[position()>2]/td/a//span[normalize-space(@class="nopadding usertext")][.="%s"]/../../following-sibling::td[.="%s"]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/pageObjects/loginPage.js b/test/acceptance/pageObjects/loginPage.js
new file mode 100644
index 00000000000..75195cc3746
--- /dev/null
+++ b/test/acceptance/pageObjects/loginPage.js
@@ -0,0 +1,83 @@
+module.exports = {
+	url: function () {
+		return this.api.launchUrl;
+	},
+
+	commands: [
+		{
+			waitForLoginPage: function () {
+				return this.waitForElementVisible('@loginTable');
+			},
+
+			userLogsInWithUsernameAndPassword: function (username, password) {
+				return this.waitForElementVisible('@userNameField')
+					.setValue('@userNameField', username)
+					.waitForElementVisible('@passwordField')
+					.setValue('@passwordField', password)
+					.useXpath()
+					.waitForElementVisible('@loginButton')
+					.click('@loginButton')
+					.useCss();
+			},
+
+			successfulLogin: function () {
+				return this.waitForElementNotPresent('@loginTable')
+					.waitForElementVisible('@userProfileDropdown');
+			},
+
+			userIsLoggedIn: async function (login) {
+				await this.useXpath()
+					.waitForElementVisible('@userLogin')
+					.expect.element('@userLogin')
+					.text.to.equal(login);
+				return this.useCss();
+			},
+
+			unsuccessfulLogin: function () {
+				return this.waitForElementVisible('@loginTable')
+					.waitForElementNotPresent('@userProfileDropdown');
+			},
+
+			loginErrorDisplayed: async function (errorMessage) {
+				await this.useXpath()
+					.waitForElementVisible('@loginError')
+					.expect.element('@loginError')
+					.text.to.equal(errorMessage);
+				return this.useCss();
+			}
+		}
+	],
+
+	elements: {
+		loginButton: {
+			selector: '//div[@id="login-submit-wrapper"]/input[@type="submit"]',
+			locateStrategy: 'xpath'
+		},
+
+		userNameField: {
+			selector: '#username'
+		},
+
+		passwordField: {
+			selector: '#password'
+		},
+
+		loginTable: {
+			selector: '.login_table'
+		},
+
+		userProfileDropdown: {
+			selector: '#topmenu-login-dropdown'
+		},
+
+		userLogin: {
+			selector: '//div[@id="topmenu-login-dropdown"]/a//span[contains(@class,"atoploginusername")]',
+			locateStrategy: 'xpath'
+		},
+
+		loginError: {
+			selector: '//div[@class="center login_main_message"]/div[@class="error"]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/pageObjects/logoutPage.js b/test/acceptance/pageObjects/logoutPage.js
new file mode 100644
index 00000000000..a63b8415238
--- /dev/null
+++ b/test/acceptance/pageObjects/logoutPage.js
@@ -0,0 +1,34 @@
+module.exports = {
+	url: function () {
+		return this.api.launchUrl + 'admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete';
+	},
+
+	commands:
+		[
+			{
+				userOpensProfile: async function () {
+					await this.useXpath()
+						.waitForElementVisible('@userProfileDropdown')
+						.click('@userProfileDropdown')
+					return this.useCss();
+				},
+
+				userLogsOut: function () {
+					return this.waitForElementVisible('@logoutButton')
+						.click('@logoutButton');
+				}
+			}
+		],
+
+	elements: {
+
+		logoutButton: {
+			selector: '.pull-right'
+		},
+
+		userProfileDropdown: {
+			selector: '//div[@id="topmenu-login-dropdown"]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/stepDefinitions/addUsersContext.js b/test/acceptance/stepDefinitions/addUsersContext.js
new file mode 100644
index 00000000000..22dc218d04a
--- /dev/null
+++ b/test/acceptance/stepDefinitions/addUsersContext.js
@@ -0,0 +1,142 @@
+const { Before, Given, When, Then, After } = require('cucumber');
+const { client } = require('nightwatch-api');
+const fetch = require('node-fetch');
+let initialUsers = {};
+let dolApiKey = '';
+
+Given('the administrator has logged in using the webUI', async function () {
+	await client.page.loginPage().navigate().waitForLoginPage();
+	await client.page.loginPage().userLogsInWithUsernameAndPassword(client.globals.adminUsername, client.globals.adminPassword);
+	return client.page.loginPage().userIsLoggedIn(client.globals.adminUsername);
+});
+
+Given('the administrator has browsed to the new users page', function () {
+	return client.page.homePage().browsedToNewUserPage();
+});
+
+When('the admin creates user with following details', function (datatable) {
+	return client.page.addUsersPage().adminCreatesUser(datatable);
+});
+
+Then('new user {string} should be created', function (lastname) {
+	return client.page.addUsersPage().newUserShouldBeCreated(lastname);
+});
+
+Then('message {string} should be displayed in the webUI', function (message) {
+	return client.page.addUsersPage().noPermissionMessage(message);
+});
+
+Then('message {string} should not be displayed in the webUI', function (message) {
+	return client.page.addUsersPage().noPermissionDefinedMessageNotShown(message);
+});
+
+Then('new user {string} should not be created', function (lastname) {
+	return client.page.addUsersPage().userNotCreated(lastname);
+});
+
+Given('a user has been created with following details', function (dataTable) {
+	return adminHasCreatedUser(dataTable);
+});
+
+Given('the admin has created the following users', function (dataTable) {
+	return adminHasCreatedUser(dataTable);
+});
+
+const getUsers = async function () {
+	const header = {};
+	const url = client.globals.backend_url + 'api/index.php/users';
+	const users = {};
+	header['Accept'] = 'application/json';
+	header['DOLAPIKEY'] = dolApiKey;
+	await fetch(url, {
+		method: 'GET',
+		headers: header
+	})
+		.then(async (response) => {
+			const json_response = await response.json();
+			for (const user of json_response) {
+				users[user.id] = user.id;
+			}
+		});
+	return users;
+};
+
+const adminHasCreatedUser = async function (dataTable) {
+	const header = {};
+	const url = client.globals.backend_url + 'api/index.php/users';
+	header['Accept'] = 'application/json';
+	header['DOLAPIKEY'] = dolApiKey;
+	header['Content-Type'] = 'application/json';
+	const userDetails = dataTable.hashes();
+	for (const user of userDetails) {
+		await fetch(url, {
+			method: 'POST',
+			headers: header,
+			body: JSON.stringify(
+				{
+					login: user['login'],
+					lastname: user['last name'],
+					pass: user['password']
+				}
+			)
+		})
+			.then((response) => {
+				if (response.status < 200 || response.status >= 400) {
+					throw new Error('Failed to create user: ' + user['login'] +
+						' ' + response.statusText);
+				}
+				return response.text();
+			});
+	}
+};
+
+Before(async () => {
+	const header = {}
+	const adminUsername = client.globals.adminUsername;
+	const adminPassword = client.globals.adminPassword;
+	const params = new URLSearchParams()
+	params.set('login', adminUsername)
+	params.set('password', adminPassword)
+	const apiKey = `http://localhost/dolibarr/htdocs/api/index.php/login?${params.toString()}`;
+	header['Accept'] = 'application/json'
+	await fetch(apiKey, {
+		method: 'GET',
+		headers: header
+	})
+		.then(async (response) => {
+			const jsonResponse = await response.json()
+			dolApiKey = jsonResponse['success']['token']
+		})
+})
+Before(async () => {
+	initialUsers = await getUsers();
+});
+
+After(async () => {
+	const finalUsers = await getUsers();
+	const header = {};
+	const url = client.globals.backend_url + 'api/index.php/users/';
+	header['Accept'] = 'application/json';
+	header['DOLAPIKEY'] = dolApiKey;
+	let found;
+	for (const finaluser in finalUsers) {
+		for (const initialuser in initialUsers) {
+			found = false;
+			if (initialuser === finaluser) {
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			await fetch(url + finaluser, {
+				method: 'DELETE',
+				headers: header
+			})
+				.then(res => {
+					if (res.status < 200 || res.status >= 400) {
+						throw new Error("Failed to delete user: " + res.statusText);
+					}
+				});
+		}
+	}
+});
diff --git a/test/acceptance/stepDefinitions/listUsersContext.js b/test/acceptance/stepDefinitions/listUsersContext.js
new file mode 100644
index 00000000000..78912abd3a0
--- /dev/null
+++ b/test/acceptance/stepDefinitions/listUsersContext.js
@@ -0,0 +1,14 @@
+const { When, Then } = require('cucumber');
+const { client } = require('nightwatch-api');
+
+When('the administrator browses to the list of users page using the webUI', function () {
+	return client.page.homePage().browsedToListOfUsers();
+});
+
+Then('following users should be displayed in the users list', function (dataTable) {
+	return client.page.listUsersPage().listOfUsersDisplayed(dataTable);
+});
+
+Then('the number of created users should be {int}', function (number) {
+	return client.page.listUsersPage().numberOfUsersDisplayed(number);
+});
diff --git a/test/acceptance/stepDefinitions/loginContext.js b/test/acceptance/stepDefinitions/loginContext.js
new file mode 100644
index 00000000000..428fd7b5dc7
--- /dev/null
+++ b/test/acceptance/stepDefinitions/loginContext.js
@@ -0,0 +1,22 @@
+const { Given, When, Then } = require('cucumber')
+const { client } = require('nightwatch-api')
+
+Given('the user has browsed to the login page', function () {
+	return client.page.loginPage().navigate();
+});
+
+When('user logs in with username {string} and password {string}', function (username, password) {
+	return client.page.loginPage().userLogsInWithUsernameAndPassword(username, password);
+});
+
+Then('the user should be directed to the homepage', function () {
+	return client.page.loginPage().successfulLogin();
+});
+
+Then('the user should not be able to login', function () {
+	return client.page.loginPage().unsuccessfulLogin();
+});
+
+Then('error message {string} should be displayed in the webUI', function (errormessage) {
+	return client.page.loginPage().loginErrorDisplayed(errormessage);
+});
diff --git a/test/acceptance/stepDefinitions/logoutContext.js b/test/acceptance/stepDefinitions/logoutContext.js
new file mode 100644
index 00000000000..018bf566cfb
--- /dev/null
+++ b/test/acceptance/stepDefinitions/logoutContext.js
@@ -0,0 +1,14 @@
+const { When, Then } = require('cucumber');
+const { client } = require('nightwatch-api');
+
+When('the user opens the user profile using the webUI', function () {
+	return client.page.logoutPage().userOpensProfile();
+});
+
+When('the user logs out using the webUI', function () {
+	return client.page.logoutPage().userLogsOut();
+});
+
+Then('the user should be logged out successfully', function () {
+	return client.page.loginPage().waitForLoginPage();
+});
diff --git a/test/phpunit/AccountingAccountTest.php b/test/phpunit/AccountingAccountTest.php
index b4367e96f49..622bd346872 100644
--- a/test/phpunit/AccountingAccountTest.php
+++ b/test/phpunit/AccountingAccountTest.php
@@ -204,7 +204,7 @@ class AccountingAccountTest extends PHPUnit\Framework\TestCase
         $localobject->label='New label';
         $result=$localobject->update($user);
 
-        print __METHOD__." id=".$id." result=".$result."\n";
+        print __METHOD__." id=".$localobject->id." result=".$result."\n";
         $this->assertLessThan($result, 0);
 
         return $localobject->id;
diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php
index 0dd4946f69c..abebfd728bf 100644
--- a/test/phpunit/ActionCommTest.php
+++ b/test/phpunit/ActionCommTest.php
@@ -223,7 +223,7 @@ class ActionCommTest extends PHPUnit\Framework\TestCase
     	$result=$localobject->update($user);
 
     	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
+    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	return $localobject->id;
     }
 
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index 5c3c6d7d54e..b819671578c 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -153,8 +153,9 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
         $filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
+        //$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname');
 
-        foreach($filesarray as $key => $file)
+        foreach ($filesarray as $key => $file)
         {
             if (preg_match('/\/htdocs\/includes\//', $file['fullname'])) continue;
             if (preg_match('/\/htdocs\/custom\//', $file['fullname'])) continue;
@@ -165,25 +166,86 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             print 'Check php file '.$file['fullname']."\n";
             $filecontent=file_get_contents($file['fullname']);
 
+            if (preg_match('/\.class\.php/', $file['relativename'])
+            	|| preg_match('/boxes\/box_/', $file['relativename'])
+            	|| preg_match('/modules\/.*\/doc\/(doc|pdf)_/', $file['relativename'])
+            	|| preg_match('/modules\/(import|mailings|printing)\//', $file['relativename'])
+            	|| in_array($file['name'], array('modules_boxes.php', 'rapport.pdf.php', 'TraceableDB.php'))) {
+            	if (! in_array($file['name'], array(
+            		'api.class.php',
+            		'actioncomm.class.php',
+            		'commonobject.class.php',
+	            	'conf.class.php',
+            		'html.form.class.php',
+            		'html.formmail.class.php',
+            		'infobox.class.php',
+            		'link.class.php',
+            		'translate.class.php',
+            		'utils.class.php',
+            		'modules_product.class.php',
+            		'modules_societe.class.php',
+            		'TraceableDB.php',
+            		'expeditionbatch.class.php',
+            		'expensereport_ik.class.php',
+            		'expensereport_rule.class.php',
+            		'multicurrency.class.php',
+            		'productbatch.class.php',
+            		'reception.class.php',
+            		'societe.class.php'
+            	))) {
+	            	// Must must not found $db->
+	            	$ok=true;
+	            	$matches=array();
+	            	// Check string get_class...
+	            	preg_match_all('/'.preg_quote('$db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
+	            	foreach ($matches as $key => $val)
+	            	{
+	            		$ok=false;
+	            		break;
+	            	}
+	            	//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+	            	$this->assertTrue($ok, 'Found string $db-> into a .class.php file in '.$file['relativename']);
+	            	//exit;
+            	}
+            } else {
+            	if (! in_array($file['name'], array(
+            		'extrafieldsinexport.inc.php',
+            		'DolQueryCollector.php'
+            	))) {
+	            	// Must must not found $this->db->
+	            	$ok=true;
+	            	$matches=array();
+	            	// Check string get_class...
+	            	preg_match_all('/'.preg_quote('$this->db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
+	            	foreach ($matches as $key => $val)
+	            	{
+	            		$ok=false;
+	            		break;
+	            	}
+	            	//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+	            	$this->assertTrue($ok, 'Found string $this->db-> in '.$file['relativename']);
+	            	//exit;
+            	}
+            }
 
             $ok=true;
             $matches=array();
-            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+            // Check string get_class...
             preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
            		$ok=false;
            		break;
             }
             //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-            $this->assertTrue($ok, 'Found string get_class($this)."::".__METHOD__ that must be replaced with __METHOD__ only in '.$file['fullname']);
+            $this->assertTrue($ok, 'Found string get_class($this)."::".__METHOD__ that must be replaced with __METHOD__ only in '.$file['relativename']);
             //exit;
 
             $ok=true;
             $matches=array();
-            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+            // Check string $this->db->idate without quotes
             preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($val[1] != '\'"' && $val[1] != '\'\'')
                 {
@@ -193,17 +255,18 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
                 //if ($reg[0] != 'db') $ok=false;
             }
             //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-            $this->assertTrue($ok, 'Found a $this->db->idate to forge a sql request without quotes around this date field '.$file['fullname'].' :: '.$val[0]);
+            $this->assertTrue($ok, 'Found a $this->db->idate to forge a sql request without quotes around this date field '.$file['relativename'].' :: '.$val[0]);
             //exit;
 
 
             $ok=true;
             $matches=array();
+
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-            preg_match_all('/(=|sql.+)\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            preg_match_all('/=\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
+            foreach ($matches as $key => $val)
             {
-                if ($val[2] != 'db->' && $val[2] != 'esca')
+                if ($val[1] != 'db->' && $val[1] != 'esca')
                 {
                     $ok=false;
                     break;
@@ -211,7 +274,21 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
                 //if ($reg[0] != 'db') $ok=false;
             }
             //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['fullname'].' ('.$val[0].'). Bad.');
+            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['relativename'].': '.$val[0].' - Bad.');
+            //exit;
+
+            // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
+            preg_match_all('/sql.+\s*\'"\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
+            foreach ($matches as $key => $val)
+            {
+            	if (! in_array($val[1], array('this->db-', 'this->esc', 'db->escap', 'db->idate', 'excludeGr', 'includeGr'))) {
+            		$ok=false;
+            		break;
+            	}
+            	//if ($reg[0] != 'db') $ok=false;
+            }
+            //print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+            $this->assertTrue($ok, 'Found non escaped string in building of a sql request '.$file['relativename'].': '.$val[0].' - Bad.');
             //exit;
 
 
@@ -220,7 +297,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(')
                 {
@@ -228,7 +305,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
                     break;
                 }
             }
-            $this->assertTrue($ok, 'Found a $_SERVER[\'QUERY_STRING\'] without dol_escape_htmltag neither dol_string_nohtmltag around it, in file '.$file['fullname'].' ('.$val[1].'$_SERVER[\'QUERY_STRING\']). Bad.');
+            $this->assertTrue($ok, 'Found a $_SERVER[\'QUERY_STRING\'] without dol_escape_htmltag neither dol_string_nohtmltag around it, in file '.$file['relativename'].' ('.$val[1].'$_SERVER[\'QUERY_STRING\']). Bad.');
 
 
             // Test that first param of print_liste_field_titre is a translation key and not the translated value
@@ -236,12 +313,12 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                    $ok=false;
                    break;
             }
-            $this->assertTrue($ok, 'Found a use of print_liste_field_titre with first parameter that is a translated value instead of just the translation key in file '.$file['fullname'].'. Bad.');
+            $this->assertTrue($ok, 'Found a use of print_liste_field_titre with first parameter that is a translated value instead of just the translation key in file '.$file['relativename'].'. Bad.');
 
 
             // Test we don't have <br />
@@ -249,7 +326,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/<br \/>/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 if ($file['name'] != 'functions.lib.php')
                 {
@@ -257,7 +334,23 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
                     break;
                 }
             }
-            $this->assertTrue($ok, 'Found a tag <br /> that is for xml in file '.$file['fullname'].'. You may use html syntax <br> instead.');
+            $this->assertTrue($ok, 'Found a tag <br /> that is for xml in file '.$file['relativename'].'. You must use html syntax <br> instead.');
+
+
+            // Test we don't have name="token" value="'.$_SESSION['newtoken'], we must use name="token" value="'.newToken() instead.
+            $ok=true;
+            $matches=array();
+            // Check string   name="token" value="'.$_SESSINON
+            preg_match_all('/name="token" value="\'\.\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
+            foreach ($matches as $key => $val)
+            {
+            	if ($file['name'] != 'excludefile.php')
+            	{
+            		$ok=false;
+            		break;
+            	}
+            }
+            $this->assertTrue($ok, 'Found a forbidden string sequence into '.$file['relativename'].' : name="token" value="\'.$_SESSION[..., you must use a newToken() instead of $_SESSION[\'newtoken\'].');
 
 
             // Test we don't have @var array(
@@ -265,12 +358,12 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $matches=array();
             // Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
             preg_match_all('/@var\s+array\(/', $filecontent, $matches, PREG_SET_ORDER);
-            foreach($matches as $key => $val)
+            foreach ($matches as $key => $val)
             {
                 $ok=false;
                 break;
             }
-            $this->assertTrue($ok, 'Found a declaration @var array() instead of @var array in file '.$file['fullname'].'.');
+            $this->assertTrue($ok, 'Found a declaration @var array() instead of @var array in file '.$file['relativename'].'.');
         }
 
         return;
diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php
index fccaa4909cc..245a7869811 100644
--- a/test/phpunit/CodingSqlTest.php
+++ b/test/phpunit/CodingSqlTest.php
@@ -158,7 +158,7 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
             print 'Process dir '.$dir."\n";
             $filesarray = scandir($dir);
 
-            foreach($filesarray as $key => $file)
+            foreach ($filesarray as $key => $file)
             {
                 if (! preg_match('/\.sql$/', $file))
                     continue;
@@ -204,19 +204,14 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
                 if ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/migration')
                 {
                     // Test for migration files only
-                }
-                elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
+                } elseif ($dir == DOL_DOCUMENT_ROOT.'/install/mysql/data')
                 {
                     // Test for data files only
-                }
-                else
-                {
+                } else {
                     if (preg_match('/\.key\.sql$/', $file))
                     {
                         // Test for key files only
-                    }
-                    else
-                    {
+                    } 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";
@@ -247,7 +242,7 @@ class CodingSqlTest extends PHPUnit\Framework\TestCase
         $db=$this->savdb;
 
         $filesarray = scandir(DOL_DOCUMENT_ROOT.'/../dev/initdemo');
-        foreach($filesarray as $key => $file) {
+        foreach ($filesarray as $key => $file) {
             if (! preg_match('/\.sql$/', $file))
                 continue;
 
diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php
index 990ef41f0b7..1decbe4e201 100644
--- a/test/phpunit/CommandeTest.php
+++ b/test/phpunit/CommandeTest.php
@@ -196,7 +196,7 @@ class CommandeTest extends PHPUnit\Framework\TestCase
     	$result=$localobject->update($user);
 
     	$this->assertLessThan($result, 0);
-    	print __METHOD__." id=".$id." result=".$result."\n";
+    	print __METHOD__." id=".$localobject->id." result=".$result."\n";
     	return $localobject;
     }
 
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index 062bdb6dd11..2d5598f49b3 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -242,29 +242,6 @@ class DateLibTest extends PHPUnit\Framework\TestCase
         $result=num_public_holiday($date1, $date2, 'XX', 1);
         print __METHOD__." result=".$result."\n";
         $this->assertEquals(2, $result, 'NumPublicHoliday for XX');   // 1 opened day, 2 closed days (even if country unknown)
-
-
-
-        // Add more holiday with constant HOLIDAY_MORE_PUBLIC_HOLIDAYS
-        $conf->global->HOLIDAY_MORE_PUBLIC_HOLIDAYS='12-13,2019-12-14';
-
-        $date1=dol_mktime(0, 0, 0, 12, 13, 2018);
-        $date2=dol_mktime(0, 0, 0, 12, 13, 2018);
-        $result=num_public_holiday($date1, $date2, 'YY', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumPublicHoliday for YY the 2018-12-13');   // 0 opened day, 1 closed days (even if country unknown)
-
-        $date1=dol_mktime(0, 0, 0, 12, 14, 2018);
-        $date2=dol_mktime(0, 0, 0, 12, 14, 2018);
-        $result=num_public_holiday($date1, $date2, 'YY', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(0, $result, 'NumPublicHoliday for YY the 2018-12-14');   // 1 opened day, 0 closed days (even if country unknown)
-
-        $date1=dol_mktime(0, 0, 0, 12, 14, 2019);
-        $date2=dol_mktime(0, 0, 0, 12, 14, 2019);
-        $result=num_public_holiday($date1, $date2, 'YY', 1);
-        print __METHOD__." result=".$result."\n";
-        $this->assertEquals(1, $result, 'NumPublicHoliday for YY the 2019-12-14');   // 0 opened day, 1 closed days (even if country unknown)
     }
 
     /**
diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index 590accccbed..2a3cb079baf 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -141,6 +141,9 @@ class ExportTest extends PHPUnit\Framework\TestCase
 
         $model='csv';
 
+        $conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
+        print 'EXPORT_CSV_SEPARATOR_TO_USE = '.$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+
         // Creation of class to export using model ExportXXX
         $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
         $file = "export_".$model.".modules.php";
@@ -161,7 +164,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         print __METHOD__." valtotest=".$valtotest."\n";
         $result = $objmodel->csvClean($valtotest, $langs->charset_output);
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '"A string with , and ; inside"');
+        $this->assertEquals($result, '"A string with , and ; inside"', 'Error in csvClean for '.$file);
 
         $valtotest='A string with " inside';
         print __METHOD__." valtotest=".$valtotest."\n";
@@ -182,7 +185,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         $this->assertEquals($result, '"A string with <a href=""aaa""><strong>html<br>content</strong></a> inside"');
 
         // Same tests with strict mode
-        $conf->global->USE_STRICT_CSV_RULES=1;
+        $conf->global->USE_STRICT_CSV_RULES = 1;
 
         $valtotest='A simple string';
         print __METHOD__." valtotest=".$valtotest."\n";
@@ -245,7 +248,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         // Build export file
         print "Process build_file for model = ".$model."\n";
         $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
-		$expectedresult=1;
+		$expectedresult = 1;
         $this->assertEquals($expectedresult, $result, 'Error in CSV export');
 
         $model='tsv';
@@ -342,7 +345,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
         $result=$objexport->load_arrays($user, $filterdatatoexport);	// This load ->array_export_xxx properties for datatoexport
 
         // Loop on each dataset
-        foreach($objexport->array_export_code as $key => $datatoexport)
+        foreach ($objexport->array_export_code as $key => $datatoexport)
         {
         	$exportfile=$conf->export->dir_temp.'/'.$user->id.'/export_'.$datatoexport.'.csv';
 	        print "Process export for dataset ".$datatoexport." into ".$exportfile."\n";
@@ -351,7 +354,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
 	        // Generate $array_selected
 	        $i=0;
 	        $array_selected=array();
-			foreach($objexport->array_export_fields[$key] as $key => $val)
+			foreach ($objexport->array_export_fields[$key] as $key => $val)
 			{
 				$array_selected[$key]=$i++;
 			}
@@ -360,7 +363,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
 	        // Build export file
         	$sql = "";
 			$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
-			$expectedresult=1;
+			$expectedresult = 1;
 	        $this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed');
 	        $result=dol_is_file($exportfile);
 	        $this->assertTrue($result, 'File '.$exportfile.' not found');
diff --git a/test/phpunit/FactureRecTest.php b/test/phpunit/FactureRecTest.php
index f89ab4b1f13..3778989945a 100644
--- a/test/phpunit/FactureRecTest.php
+++ b/test/phpunit/FactureRecTest.php
@@ -186,13 +186,11 @@ class FactureRecTest extends PHPUnit\Framework\TestCase
         if (get_class($oA) !== get_class($oB))
         {
             $retAr[]="Supplied objects are not of same class.";
-        }
-        else
-        {
+        } else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey)
+            foreach ($aKeys as $sKey)
             {
                 if (in_array($sKey, $fieldstoignorearray)) continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index 47f3a639b29..dc34b061806 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -365,13 +365,11 @@ class FactureTest extends PHPUnit\Framework\TestCase
         if (get_class($oA) !== get_class($oB))
         {
             $retAr[]="Supplied objects are not of same class.";
-        }
-        else
-        {
+        } else {
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey)
+            foreach ($aKeys as $sKey)
             {
                 if (in_array($sKey, $fieldstoignorearray)) continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey])
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 9d476953381..ae8ea17efb6 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -1,4 +1,6 @@
 <?php
+use Sabre\VObject\Property\Boolean;
+
 /* Copyright (C) 2010-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012		Regis Houssin		<regis.houssin@inodbox.com>
  *
@@ -130,7 +132,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 	/**
      * testDolBasename
      *
-     * @return	int
+     * @return	void
      */
     public function testDolBasename()
     {
@@ -239,7 +241,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
     /**
      * testDolMimeType
      *
-     * @return	string
+     * @return	void
      */
     public function testDolMimeType()
     {
@@ -285,7 +287,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
     /**
      * testDolDeleteDir
      *
-     * @return	int
+     * @return	void
      */
     public function testDolDeleteDir()
     {
@@ -323,10 +325,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
     /**
      * testDolCopyMoveDelete
      *
-     * @return	int
-     *
-     * @depends	testDolDeleteDir
-     * The depends says test is run only if previous is ok
+     * @return	void
      */
     public function testDolCopyMoveDelete()
     {
@@ -362,7 +361,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
         $this->assertTrue($result, 'move with default mask');
 
         // To test a move that should work with forced mask
-        $result=dol_move($conf->admin->dir_temp.'/file2.csv', $conf->admin->dir_temp.'/file3.csv', '0754', 1); // file shoutld be rwxr-wr--
+        $result=dol_move($conf->admin->dir_temp.'/file2.csv', $conf->admin->dir_temp.'/file3.csv', '0754', 1); // file should be rwxr-wr--
         print __METHOD__." result=".$result."\n";
         $this->assertTrue($result, 'move with forced mask');
 
@@ -395,10 +394,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
     /**
      * testDolCompressUnCompress
      *
-     * @return	string
-     *
-     * @depends	testDolCopyMoveDelete
-     * The depends says test is run only if previous is ok
+     * @return	void
      */
     public function testDolCompressUnCompress()
     {
@@ -419,8 +415,13 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 
         $errorstring = '';
 
+        dol_mkdir($conf->admin->dir_temp);
+        $conf->global->MAIN_ENABLE_LOG_TO_HTML=1; $conf->syslog->enabled=1; $_REQUEST['logtohtml']=1;
+        $conf->logbuffer=array();
+
         $result=dol_compress_file($filein, $fileout, $format, $errorstring);
         print __METHOD__." result=".$result."\n";
+        print join(', ', $conf->logbuffer);
         $this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_file on ".$filein." into ".$fileout." : ".$errorstring);
 
         $result=dol_uncompress($fileout, $dirout);
@@ -431,7 +432,7 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
     /**
      * testDolDirList
      *
-     * @return	string
+     * @return	void
      *
      * @depends	testDolCompressUnCompress
      * The depends says test is run only if previous is ok
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index e3dabff6df9..d113cde8035 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1312,4 +1312,32 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 
     	return true;
     }
+
+
+    /**
+     * testGetUserRemoteIP
+     *
+     * @return boolean
+     */
+    public function testGetUserRemoteIP()
+    {
+    	global $conf, $langs;
+
+    	$_SERVER['HTTP_X_FORWARDED_FOR']='1.2.3.4';
+    	$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
+    	$result = getUserRemoteIP();
+    	$this->assertEquals($result, '1.2.3.4');
+
+    	$_SERVER['HTTP_X_FORWARDED_FOR']='1.2.3.4<corrupted>';
+    	$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
+    	$result = getUserRemoteIP();
+    	$this->assertEquals($result, '5.6.7.8');
+
+    	$_SERVER['HTTP_X_FORWARDED_FOR']='[1:2:3:4]';
+    	$_SERVER['HTTP_CLIENT_IP']='5.6.7.8';
+    	$result = getUserRemoteIP();
+    	$this->assertEquals($result, '[1:2:3:4]');
+
+    	return true;
+    }
 }
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index 7802bc57659..c064a03e2f8 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -154,7 +154,7 @@ class LangTest extends PHPUnit\Framework\TestCase
         include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 
 		$filesarray = scandir(DOL_DOCUMENT_ROOT.'/langs');
-		foreach($filesarray as $key => $code)
+		foreach ($filesarray as $key => $code)
 		{
 			if (! preg_match('/^[a-z]+_[A-Z]+$/', $code)) continue;
 
@@ -183,7 +183,7 @@ class LangTest extends PHPUnit\Framework\TestCase
 			unset($tmplangs);
 
 			$filesarray2 = scandir(DOL_DOCUMENT_ROOT.'/langs/'.$code);
-			foreach($filesarray2 as $key => $file) {
+			foreach ($filesarray2 as $key => $file) {
 				if (! preg_match('/\.lang$/', $file)) {
 					continue;
 				}
diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php
index f8feaa8f829..32652200c2c 100755
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@@ -144,7 +144,7 @@ class ModulesTest extends PHPUnit\Framework\TestCase
 		'Mailing','MailmanSpip','Margin','ModuleBuilder','MultiCurrency',
 		'Notification','Oauth','OpenSurvey','Paybox','Paypal','Prelevement','Printing','Product','ProductBatch','Projet','Propale','ReceiptPrinter','Resource',
 		'Salaries','Service','SocialNetworks','Societe','Stock','Stripe','SupplierProposal','Syslog','TakePos','Tax','Ticket','User','Variants','WebServices','WebServicesClient','Website','Workflow');
-		foreach($modulelist as $modlabel)
+		foreach ($modulelist as $modlabel)
 		{
     		require_once DOL_DOCUMENT_ROOT.'/core/modules/mod'.$modlabel.'.class.php';
             $class='mod'.$modlabel;
diff --git a/test/phpunit/PdfDocTest.php b/test/phpunit/PdfDocTest.php
index 276deada0c6..c323c2bb6f8 100644
--- a/test/phpunit/PdfDocTest.php
+++ b/test/phpunit/PdfDocTest.php
@@ -173,7 +173,7 @@ class PdfDocTest extends PHPUnit\Framework\TestCase
         $file=dirname(__FILE__).'/img250x50.jpg';
         $result=pdf_getHeightForLogo($file);
         print __METHOD__." result=".$result."\n";
-    	$this->assertEquals($result, 22);
+    	$this->assertEquals($result, 20);
         $file=dirname(__FILE__).'/img250x20.png';
         $result=pdf_getHeightForLogo($file);
         print __METHOD__." result=".$result."\n";
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 5a248006498..6c4d2270d1a 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -173,9 +173,12 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_GET["param1"]="222";
         $_POST["param1"]="333";
 		$_GET["param2"]='a/b#e(pr)qq-rr\cc';
-        $_GET["param3"]='"a/b#e(pr)qq-rr\cc';    // Same than param2 + "
+        $_GET["param3"]='"&#110;a/b#e(pr)qq-rr\cc';    // Same than param2 + " and &#110;
         $_GET["param4"]='../dir';
         $_GET["param5"]="a_1-b";
+        $_POST["param6"]="&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;";
+        $_GET["param7"]='"c:\this is a path~1\aaa&#110;" abc<bad>def</bad>';
+        $_POST["param8"]="Hacker<svg o&#110;load='console.log(&quot;123&quot;)'";	// html tag is not closed so it is not detected as html tag but is still harmfull
 
         // Test int
         $result=GETPOST('id', 'int');              // Must return nothing
@@ -197,7 +200,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
         $result=GETPOST("param3", 'alpha');  // Must return string sanitized from char "
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, 'a/b#e(pr)qq-rr\cc');
+        $this->assertEquals($result, 'na/b#e(pr)qq-rr\cc');
 
         $result=GETPOST("param4", 'alpha');  // Must return string sanitized from ../
         print __METHOD__." result=".$result."\n";
@@ -218,11 +221,25 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
         $result=GETPOST("param4", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, '');
+        $this->assertEquals('', $result);
 
         $result=GETPOST("param5", 'aZ09');
         print __METHOD__." result=".$result."\n";
-        $this->assertEquals($result, $_GET["param5"]);
+        $this->assertEquals($_GET["param5"], $result);
+
+        $result=GETPOST("param6", 'nohtml');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('">', $result);
+
+        // With restricthtml we must remove html open/close tag and content but not htmlentities like &#110;
+        $result=GETPOST("param7", 'restricthtml');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals('"c:\this is a path~1\aaa&#110;" abcdef', $result);
+
+        // With alphanohtml, we must convert the html entities like &#110;
+        $result=GETPOST("param8", 'alphanohtml');
+        print __METHOD__." result=".$result."\n";
+        $this->assertEquals("Hacker<svg onload='console.log(123)'", $result);
 
         return $result;
     }
@@ -300,9 +317,9 @@ class SecurityTest extends PHPUnit\Framework\TestCase
         $this->assertEquals($genpass2, '');
 
         $conf->global->USER_PASSWORD_GENERATED='Standard';
-        $genpass3=getRandomPassword(false);				// Should return a password of 8 chars
+        $genpass3=getRandomPassword(false);				// Should return a password of 10 chars
         print __METHOD__." genpass3=".$genpass3."\n";
-        $this->assertEquals(strlen($genpass3), 8);
+        $this->assertEquals(strlen($genpass3), 10);
 
         return 0;
     }
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 10b0bd7b0b7..08338de949b 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -339,7 +339,7 @@ class UserTest extends PHPUnit\Framework\TestCase
             $oVarsA=get_object_vars($oA);
             $oVarsB=get_object_vars($oB);
             $aKeys=array_keys($oVarsA);
-            foreach($aKeys as $sKey) {
+            foreach ($aKeys as $sKey) {
                 if (in_array($sKey, $fieldstoignorearray))
                     continue;
                 if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) {
diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php
index 8aada2fc03a..428db9e8ef5 100644
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@@ -255,8 +255,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	}
-    	catch(SoapFault $exception)
+    	} catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -313,8 +312,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	}
-    	catch(SoapFault $exception)
+    	} catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -413,8 +411,7 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	}
-    	catch(SoapFault $exception)
+    	} catch (SoapFault $exception)
     	{
     		echo $exception;
     		$result=0;
@@ -433,7 +430,6 @@ class WebservicesInvoicesTest extends PHPUnit\Framework\TestCase
     	$this->assertEquals('OK', $result['result']['result_code']);
     	$this->assertEquals('ref-phpunit-2', $result['ref_ext']);
 
-
     	return $result;
     }
 }
diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php
index 33d842f6d39..803247e2598 100644
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@@ -169,7 +169,7 @@ class WebservicesOrdersTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php
index 34686cbec92..10c74bb1821 100644
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@@ -170,7 +170,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -198,7 +198,7 @@ class WebservicesOtherTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php
index 70a8c12a498..90911b289bc 100644
--- a/test/phpunit/WebservicesProductsTest.php
+++ b/test/phpunit/WebservicesProductsTest.php
@@ -188,7 +188,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -251,7 +251,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -314,7 +314,7 @@ class WebservicesProductsTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php
index 1106164b4ee..285fc6d5ddb 100644
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@@ -214,7 +214,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->ns, '');
-    	} catch(SoapFault $exception) {
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
@@ -268,7 +268,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
         print __METHOD__." call method ".$WS_METHOD."\n";
         try {
             $result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -330,7 +330,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
-    	} catch(SoapFault $exception) {
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
@@ -390,7 +390,7 @@ class WebservicesThirdpartyTest extends PHPUnit\Framework\TestCase
     	print __METHOD__." call method ".$WS_METHOD."\n";
     	try {
     		$result = $this->soapclient->call($WS_METHOD, $parameters, $this->_ns, '');
-    	} catch(SoapFault $exception) {
+    	} catch (SoapFault $exception) {
     		echo $exception;
     		$result=0;
     	}
diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php
index bb68f413741..f78386fc5bf 100644
--- a/test/phpunit/WebservicesUserTest.php
+++ b/test/phpunit/WebservicesUserTest.php
@@ -170,7 +170,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         print __METHOD__."Call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
@@ -197,7 +197,7 @@ class WebservicesUserTest extends PHPUnit\Framework\TestCase
         print __METHOD__."Call method ".$WS_METHOD."\n";
         try {
             $result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
-        } catch(SoapFault $exception) {
+        } catch (SoapFault $exception) {
             echo $exception;
             $result=0;
         }
diff --git a/test/phpunit/imgsvgwithjs.svg b/test/phpunit/imgsvgwithjs.svg
new file mode 100644
index 00000000000..7c7b8e53198
--- /dev/null
+++ b/test/phpunit/imgsvgwithjs.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid meet" viewBox="0 0 640 640" width="140" height="140"><script>alert('XSS SVG')</script><defs><path d="M77.01 33.36L316.26 33.36L316.26 231.5L77.01 231.5L77.01 33.36Z" id="a8YnqIml8"></path></defs><g><g><g><use xlink:href="#a8YnqIml8" opacity="1" fill="#a462a6" fill-opacity="1"></use></g></g></g></svg>
diff --git a/test/sqlmap/README b/test/sqlmap/README
new file mode 100644
index 00000000000..c07730a48b6
--- /dev/null
+++ b/test/sqlmap/README
@@ -0,0 +1,72 @@
+To test there is no SQL injection, we can use:
+
+-- Installation of sqlmap
+-------------------------
+
+git clone --depth 1 https://github.com/sqlmapproject/sqlmap.git sqlmap
+
+cd sqlmap
+
+./sqlmap.py --update
+
+./sqlmap.py --purge
+
+
+Add, into file ~/git/sqlmap/data/xml/payloads/boolean_blind.xml, the custom rule:
+
+    <!-- Boolean-based blind tests - WHERE/HAVING clause -->
+    <test>
+     <title>Our_ORDERBY_Payload</title>
+        <stype>1</stype>
+        <level>1</level>
+        <risk>1</risk>
+        <clause>1</clause>
+        <where>1</where>
+     <vector>,(select * from(select (CASE WHEN ([INFERENCE]) THEN 1 ELSE exp(710) END))a)</vector>
+     <request>
+         <payload>,(select * from(select (CASE WHEN (1=1) THEN 1 ELSE exp(710) END))a)</payload>
+     </request>
+     <response>
+         <comparison>,(select * from(select (CASE WHEN (1=2) THEN 1 ELSE exp(710) END))a)</comparison>
+     </response>
+     <details>
+         <dbms>mysql</dbms>
+         <os>linux</os>
+     </details>
+ </test>
+
+
+
+
+-- Launch sqlmap on a given url/parameter
+-----------------------------------------
+
+Introduce a vulnerability by changing the GETPOST on parameter search_status into GETPOST('search_status', 'none') and removing $db->sanitize when parameter is used;
+
+./sqlmap.py --fresh-queries -u "http://localhostdev/comm/propal/list.php?search_status=*"
+
+./sqlmap.py -A "securitytest" --threads=4 -u "http://localhostdev/comm/propal/list.php?search_status=*" --dbms=mysql --os=linux --technique=B --batch --skip-waf \
+	--cookie="DOLSESSID_xxxxxx=yyyyyyyy;" --prefix='1' -v 4 > sqlmap.txt
+
+Check vulnerability is found into sqlmap.txt. Scanner is working.
+
+
+
+-- Launch sqlmap on all the application
+---------------------------------------
+
+Set $dolibarr_nocsrfcheck='1' into conf.php file to make access easier.
+
+With prefix (required to have some rules working)
+
+./sqlmap.py -A "securitytest" --threads=4 -u "http://localhostdev/" --crawl=2 --crawl-exclude="logout|user\/card|custom\/" \
+  --skip=sortorder --skip=sortfield --dbms=mysql --os=linux --technique=B --batch --skip-waf \
+  --cookie="DOLSESSID_xxxxxxxxx=yyyyyyyyyyyyyyyy;" --prefix='1' -v
+
+Without prefix
+
+./sqlmap.py -A "securitytest" --threads=4 -u "http://localhostdev/" --crawl=2 --crawl-exclude="logout|user\/card|custom\/" \
+  --skip=sortorder --skip=sortfield --dbms=mysql --os=linux --technique=B --batch --skip-waf \
+  --cookie="DOLSESSID_xxxxxxxxx=yyyyyyyyyyyyyyyy;" -v
+
+